From fedora-cvs-commits at redhat.com  Sat Jul  1 01:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 30 Jun 2006 21:22:59 -0400
Subject: rpms/kernel/devel patch-2.6.17-git17.bz2.sign, NONE, 1.1 .cvsignore,
	1.471, 1.472 kernel-2.6.spec, 1.2340, 1.2341 sources, 1.415,
	1.416 upstream, 1.382, 1.383 patch-2.6.17-git16.bz2.sign, 1.1, NONE
Message-ID: <200607010122.k611MxFH005895@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git17.bz2.sign 
Removed Files:
	patch-2.6.17-git16.bz2.sign 
Log Message:
git17


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

iD8DBQBEpXWsyGugalF9Dw4RAiTMAJ49mYb4r2BDtgN6tMbZREpjrXoW3ACfSLfE
L93NgazhYKjsh1SQMFdF9n8=
=D7V/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- .cvsignore	30 Jun 2006 19:37:12 -0000	1.471
+++ .cvsignore	1 Jul 2006 01:22:53 -0000	1.472
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git16.bz2
+patch-2.6.17-git17.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2340
retrieving revision 1.2341
diff -u -r1.2340 -r1.2341
--- kernel-2.6.spec	30 Jun 2006 19:37:12 -0000	1.2340
+++ kernel-2.6.spec	1 Jul 2006 01:22:53 -0000	1.2341
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git16.bz2
+Patch1: patch-2.6.17-git17.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1563,7 +1563,7 @@
 
 %changelog
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git16
+- 2.6.17-git16 & git17
 
 * Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com>
 - really fix up squashfs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- sources	30 Jun 2006 19:37:12 -0000	1.415
+++ sources	1 Jul 2006 01:22:54 -0000	1.416
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-7bd6a02b79bc5ed2a2e93c407607d88b  patch-2.6.17-git16.bz2
+d3cb1b54465eb43fda556c190869d9dc  patch-2.6.17-git17.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- upstream	30 Jun 2006 19:37:12 -0000	1.382
+++ upstream	1 Jul 2006 01:22:54 -0000	1.383
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git16.bz2
+patch-2.6.17-git17.bz2


--- patch-2.6.17-git16.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul  1 04:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 00:41:54 -0400
Subject: rpms/initscripts/FC-5 .cvsignore, 1.100, 1.101 initscripts.spec,
	1.115, 1.116 sources, 1.110, 1.111
Message-ID: <200607010441.k614fsch018810@cvs.devel.redhat.com>

Author: notting

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	30 Jun 2006 20:16:16 -0000	1.100
+++ .cvsignore	1 Jul 2006 04:41:48 -0000	1.101
@@ -1,2 +1 @@
-initscripts-8.31.2.tar.bz2
-initscripts-8.31.3.tar.bz2
+initscripts-8.31.4.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/initscripts.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- initscripts.spec	30 Jun 2006 20:16:16 -0000	1.115
+++ initscripts.spec	1 Jul 2006 04:41:49 -0000	1.116
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.31.3
+Version: 8.31.4
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -209,8 +209,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
-* Fri Jun 30 2006 Bill Nottingham <notting at redhat.com> 8.31.3-1
+* Fri Jun 30 2006 Bill Nottingham <notting at redhat.com> 8.31.4-1
 - backport bridge fixes (#187100)
+- ignore alias devices in rename_device (#186355)
 
 * Fri Mar 17 2006 Bill Nottingham <notting at redhat.com> 8.31.2-1
 - add udev helper to rename network devices on device creation


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- sources	30 Jun 2006 20:16:16 -0000	1.110
+++ sources	1 Jul 2006 04:41:49 -0000	1.111
@@ -1,2 +1 @@
-8a1cad67e3c57c871492cca6e1460eff  initscripts-8.31.2.tar.bz2
-1a9df49e45b6d06f2349736ec206bb30  initscripts-8.31.3.tar.bz2
+37e9022173a0b407a61ce7e7ef378131  initscripts-8.31.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jul  1 14:07:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 10:07:11 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.95,1.96 nfs.init,1.21,1.22
Message-ID: <200607011407.k61E7BvY021043@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
	nfs-utils.spec nfs.init 
Log Message:
Fixed typos in /etc/rc.d/init.d/nfs file (bz 184486)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- nfs-utils.spec	30 Jun 2006 14:17:52 -0000	1.95
+++ nfs-utils.spec	1 Jul 2006 14:07:04 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 3
+Release: 4
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -224,6 +224,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Sat Jul  1 2006 <SteveD at RedHat.com> 1.0.8-3
+- Fixed typos in /etc/rc.d/init.d/nfs file (bz 184486)
+
 * Fri Jun 30 2006 <SteveD at RedHat.com> 1.0.8-3
 - Split the controlling of nfs version, ports, and protocol 
   into two different patches


Index: nfs.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nfs.init	30 Jun 2006 14:17:52 -0000	1.21
+++ nfs.init	1 Jul 2006 14:07:04 -0000	1.22
@@ -126,7 +126,6 @@
 	;;
   status)
 	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd status
-	echo -n $"Shutting down NFS mountd: "
 	status rpc.mountd
 	status nfsd
 	if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:23:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:23:32 -0400
Subject: rpms/scim-bridge/devel .cvsignore, 1.9, 1.10 scim-bridge.spec, 1.14,
	1.15 sources, 1.9, 1.10
Message-ID: <200607020323.k623NW3o001467@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/scim-bridge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1405

Modified Files:
	.cvsignore scim-bridge.spec sources 
Log Message:
0.2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Jun 2006 07:29:58 -0000	1.9
+++ .cvsignore	2 Jul 2006 03:23:29 -0000	1.10
@@ -1 +1 @@
-scim-bridge-0.2.2.tar.gz
+scim-bridge-0.2.3.tar.gz


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-bridge.spec	23 Jun 2006 07:29:58 -0000	1.14
+++ scim-bridge.spec	2 Jul 2006 03:23:29 -0000	1.15
@@ -3,7 +3,7 @@
 #%%define snapdate 20060621
 
 Name:		scim-bridge
-Version:	0.2.2
+Version:	0.2.3
 Release:	1
 Summary:	SCIM Bridge Gtk IM module
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Jul 01 2006 Warren Togami <wtogami at redhat.com> - 0.2.3-1
+- 0.2.3
+
 * Fri Jun 23 2006 Jens Petersen <petersen at redhat.com> - 0.2.2-1
 - 0.2.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Jun 2006 07:29:58 -0000	1.9
+++ sources	2 Jul 2006 03:23:29 -0000	1.10
@@ -1 +1 @@
-236b2d4cb5edecadad70994288f61530  scim-bridge-0.2.2.tar.gz
+a4db9a20188486b2540eea2e18468567  scim-bridge-0.2.3.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:23:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:23:43 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.209,
	1.210 config-x86-generic, 1.57, 1.58 config-x86_64-generic,
	1.44, 1.45
Message-ID: <200607020323.k623NhpK001604@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
git19


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- config-generic	30 Jun 2006 19:37:13 -0000	1.209
+++ config-generic	2 Jul 2006 03:23:40 -0000	1.210
@@ -250,6 +250,7 @@
 # CONFIG_ACPI_CONTAINER is not set
 # CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
 # CONFIG_ACPI_HOTKEY is not set
+# CONFIG_ACPI_DOCK is not set
 
 #
 # Block devices


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- config-x86-generic	29 Jun 2006 08:27:52 -0000	1.57
+++ config-x86-generic	2 Jul 2006 03:23:40 -0000	1.58
@@ -147,6 +147,7 @@
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
+CONFIG_ACPI_DOCK=m
 
 #
 # CPUFreq processor drivers


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- config-x86_64-generic	29 Jun 2006 08:27:52 -0000	1.44
+++ config-x86_64-generic	2 Jul 2006 03:23:40 -0000	1.45
@@ -81,6 +81,7 @@
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_IBM_DOCK=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_DOCK=m
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:23:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:23:42 -0400
Subject: rpms/kernel/devel patch-2.6.17-git19.bz2.sign, NONE, 1.1 .cvsignore,
	1.472, 1.473 kernel-2.6.spec, 1.2341,
	1.2342 linux-2.6-crash-driver.patch, 1.2,
	1.3 linux-2.6-execshield.patch, 1.25, 1.26 sources, 1.416,
	1.417 upstream, 1.383, 1.384 patch-2.6.17-git17.bz2.sign, 1.1, NONE
Message-ID: <200607020323.k623Ngdv001597@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-crash-driver.patch 
	linux-2.6-execshield.patch sources upstream 
Added Files:
	patch-2.6.17-git19.bz2.sign 
Removed Files:
	patch-2.6.17-git17.bz2.sign 
Log Message:
git19


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

iD8DBQBEpscyyGugalF9Dw4RAloGAJ4w5RMJFAIKQmJHjpNfMouK9HlscACePzKL
iEoV2bwhjDWW4y4BiPmEGDE=
=wypg
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -r1.472 -r1.473
--- .cvsignore	1 Jul 2006 01:22:53 -0000	1.472
+++ .cvsignore	2 Jul 2006 03:23:39 -0000	1.473
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git17.bz2
+patch-2.6.17-git19.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2341
retrieving revision 1.2342
diff -u -r1.2341 -r1.2342
--- kernel-2.6.spec	1 Jul 2006 01:22:53 -0000	1.2341
+++ kernel-2.6.spec	2 Jul 2006 03:23:39 -0000	1.2342
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git17.bz2
+Patch1: patch-2.6.17-git19.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1562,6 +1562,9 @@
 %endif
 
 %changelog
+* Sat Jul  1 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git19
+
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git16 & git17
 

linux-2.6-crash-driver.patch:
 linux-1060/arch/i386/mm/init.c            |    2 
 linux-1060/arch/ia64/kernel/ia64_ksyms.c  |    3 
 linux-1060/arch/x86_64/mm/init.c          |    3 
 linux-1060/drivers/char/Kconfig           |    2 
 linux-1060/drivers/char/crash.c           |  129 ++++++++++++++++++++++++++++++
 linux-1060/include/asm-i386/crash.h       |   75 +++++++++++++++++
 linux-1060/include/asm-ia64/crash.h       |   90 ++++++++++++++++++++
 linux-1060/include/asm-x86_64/crash.h     |   75 +++++++++++++++++
 linux-2.6.16.noarch/drivers/char/Makefile |    1 
 9 files changed, 380 insertions(+)

Index: linux-2.6-crash-driver.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crash-driver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-crash-driver.patch	26 Mar 2006 00:13:38 -0000	1.2
+++ linux-2.6-crash-driver.patch	2 Jul 2006 03:23:40 -0000	1.3
@@ -26,10 +26,9 @@
 diff -urNp --exclude-from=/home/davej/.exclude linux-1050/arch/x86_64/mm/init.c linux-1060/arch/x86_64/mm/init.c
 --- linux-1050/arch/x86_64/mm/init.c
 +++ linux-1060/arch/x86_64/mm/init.c
-@@ -7,6 +7,7 @@
+@@ -6,5 +6,6 @@
   */
  
- #include <linux/config.h>
 +#include <linux/module.h>
  #include <linux/signal.h>
  #include <linux/sched.h>

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/sysenter.c |    3 
 linux-2.6.17.noarch/include/asm-i386/elf.h      |    6 
 linux-2.6.17.noarch/include/asm-i386/mmu.h      |    4 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   98 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   22 ++
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 46 files changed, 793 insertions(+), 134 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linux-2.6-execshield.patch	29 Jun 2006 08:38:20 -0000	1.25
+++ linux-2.6-execshield.patch	2 Jul 2006 03:23:40 -0000	1.26
@@ -452,7 +452,7 @@
 ===================================================================
 --- linux.orig/arch/x86_64/mm/mmap.c
 +++ linux/arch/x86_64/mm/mmap.c
-@@ -1,30 +1,87 @@
+@@ -1,29 +1,87 @@
 -/* Copyright 2005 Andi Kleen, SuSE Labs.
 - * Licensed under GPL, v.2
 +/*
@@ -480,7 +480,6 @@
 + *
 + * Started by Ingo Molnar <mingo at elte.hu>
   */
--#include <linux/config.h>
 +
 +#include <linux/personality.h>
  #include <linux/mm.h>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- sources	1 Jul 2006 01:22:54 -0000	1.416
+++ sources	2 Jul 2006 03:23:40 -0000	1.417
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-d3cb1b54465eb43fda556c190869d9dc  patch-2.6.17-git17.bz2
+ff1394160c5fdcc9a19cb72a8073c438  patch-2.6.17-git19.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- upstream	1 Jul 2006 01:22:54 -0000	1.383
+++ upstream	2 Jul 2006 03:23:40 -0000	1.384
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git17.bz2
+patch-2.6.17-git19.bz2


--- patch-2.6.17-git17.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:29:51 -0400
Subject: rpms/cpuspeed/devel cpuspeed.init,1.9,1.10 cpuspeed.spec,1.34,1.35
Message-ID: <200607020329.k623TpFR004024@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3981

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
Fix sched_mc_power_savings warning on centrino laptops.



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cpuspeed.init	8 Jun 2006 03:25:09 -0000	1.9
+++ cpuspeed.init	2 Jul 2006 03:29:49 -0000	1.10
@@ -40,7 +40,7 @@
 		case "$drv" in
 		centrino)
 			/sbin/modprobe cpufreq-ondemand
-			for i in /sys/devices/system/cpu/*
+			for i in /sys/devices/system/cpu/cpu*
 			do
 				echo ondemand > $i/cpufreq/scaling_governor
 			done


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cpuspeed.spec	8 Jun 2006 03:25:09 -0000	1.34
+++ cpuspeed.spec	2 Jul 2006 03:29:49 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	CPU Frequency adjusting daemon.
 Name:		cpuspeed
 Version:	1.2.1
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Sat Jul  1 2006 Dave Jones <davej at redhat.com>
+- Fix sched_mc_power_savings warning on centrino laptops.
+
 * Wed Jun  7 2006 Dave Jones <davej at redhat.com>
 - Remove a bunch of no-longer needed gunk from the initscript.
 - Use on-demand governor on centrino/core based systems for now,



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:37:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:37:14 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.37,1.38
Message-ID: <200607020337.k623bEgP004884@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	cpufreq-utils.spec 
Log Message:
dist



Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cpufreq-utils.spec	8 Jun 2006 03:12:35 -0000	1.37
+++ cpufreq-utils.spec	2 Jul 2006 03:37:12 -0000	1.38
@@ -1,7 +1,7 @@
 Summary:        CPU Frequency changing related utilities
 Name:           cpufreq-utils
 Version:        002
-Release: 1.%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: 1.%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:37:22 -0400
Subject: rpms/dmidecode/devel dmidecode.spec,1.23,1.24
Message-ID: <200607020337.k623bMLO004951@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/dmidecode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4906

Modified Files:
	dmidecode.spec 
Log Message:
dist



Index: dmidecode.spec
===================================================================
RCS file: /cvs/dist/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dmidecode.spec	9 Feb 2006 06:22:32 -0000	1.23
+++ dmidecode.spec	2 Jul 2006 03:37:20 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data.
 Name:           dmidecode
 Version:        2.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:37:37 -0400
Subject: rpms/irqbalance/devel irqbalance.spec,1.25,1.26
Message-ID: <200607020337.k623bbMQ005033@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4978

Modified Files:
	irqbalance.spec 
Log Message:
dist



Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- irqbalance.spec	26 Feb 2006 23:41:09 -0000	1.25
+++ irqbalance.spec	2 Jul 2006 03:37:34 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.12
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:37:48 -0400
Subject: rpms/rng-utils/devel rng-utils.spec,1.11,1.12
Message-ID: <200607020337.k623bmdS005125@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
dist



Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rng-utils.spec	13 Feb 2006 15:32:25 -0000	1.11
+++ rng-utils.spec	2 Jul 2006 03:37:45 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-utils
 Version:        2.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:37:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:37:54 -0400
Subject: rpms/salinfo/devel salinfo.spec,1.11,1.12
Message-ID: <200607020337.k623bsV8005196@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5153

Modified Files:
	salinfo.spec 
Log Message:
dist



Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- salinfo.spec	9 Feb 2006 06:36:04 -0000	1.11
+++ salinfo.spec	2 Jul 2006 03:37:52 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        SAL info tool.
 Name:           salinfo
 Version:        0.5
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:38:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:38:03 -0400
Subject: rpms/tux/devel tux.spec,1.28,1.29
Message-ID: <200607020338.k623c3nC005267@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5212

Modified Files:
	tux.spec 
Log Message:
dist



Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tux.spec	5 Jun 2006 22:14:42 -0000	1.28
+++ tux.spec	2 Jul 2006 03:38:00 -0000	1.29
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 7
+Release: 7%{dist}
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons



From fedora-cvs-commits at redhat.com  Sun Jul  2 03:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 1 Jul 2006 23:38:09 -0400
Subject: rpms/x86info/devel x86info.spec,1.20,1.21
Message-ID: <200607020338.k623c9UY005323@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/x86info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5288

Modified Files:
	x86info.spec 
Log Message:
dist



Index: x86info.spec
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- x86info.spec	9 Feb 2006 06:29:27 -0000	1.20
+++ x86info.spec	2 Jul 2006 03:38:06 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.17
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Sun Jul  2 14:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 10:36:35 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.96,1.97
Message-ID: <200607021436.k62EaZ1g019536@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	nfs-utils.spec 
Log Message:
adding epoch and dist for upgrade path


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nfs-utils.spec	1 Jul 2006 14:07:04 -0000	1.96
+++ nfs-utils.spec	2 Jul 2006 14:36:32 -0000	1.97
@@ -1,7 +1,8 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 4
+Release: 5%{?dist}
+Epoch: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -224,6 +225,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Sun Jul  2 2006 <jkeating at redhat.com> 1:1.0.8-5
+- Introduce epoch to fix upgrade path
+
 * Sat Jul  1 2006 <SteveD at RedHat.com> 1.0.8-3
 - Fixed typos in /etc/rc.d/init.d/nfs file (bz 184486)
 



From fedora-cvs-commits at redhat.com  Sun Jul  2 14:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 10:40:05 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.93,1.94
Message-ID: <200607021440.k62Ee5tQ020796@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20774

Modified Files:
	nfs-utils.spec 
Log Message:
adding epoch and dist for upgrade path


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- nfs-utils.spec	20 Jun 2006 15:50:17 -0000	1.93
+++ nfs-utils.spec	2 Jul 2006 14:40:03 -0000	1.94
@@ -1,7 +1,8 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 1.FC5
+Release: 2%{?dist}
+Epoch: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -213,6 +214,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Sun Jul  2 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.8-2
+- Introduce epoch for proper upgrade path.
+
 * Fri Jun 16 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8-1
 - Updated to nfs-utils-1.0.8
 



From fedora-cvs-commits at redhat.com  Sun Jul  2 17:56:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 13:56:31 -0400
Subject: rpms/gtk2/FC-5 .cvsignore, 1.52, 1.53 gtk2.spec, 1.139,
	1.140 sources, 1.56, 1.57
Message-ID: <200607021756.k62HuV8G004366@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.8.20



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	13 Jun 2006 02:23:54 -0000	1.52
+++ .cvsignore	2 Jul 2006 17:56:29 -0000	1.53
@@ -35,3 +35,4 @@
 gtk+-2.8.16.tar.bz2
 gtk+-2.8.18.tar.bz2
 gtk+-2.8.19.tar.bz2
+gtk+-2.8.20.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/gtk2.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- gtk2.spec	15 Jun 2006 14:34:08 -0000	1.139
+++ gtk2.spec	2 Jul 2006 17:56:29 -0000	1.140
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.19
+%define base_version 2.8.20
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 2
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -271,6 +271,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sun Jul  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.20-1
+- Update to 2.8.20
+
 * Thu Jun 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.19-2
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-5/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	13 Jun 2006 02:23:54 -0000	1.56
+++ sources	2 Jul 2006 17:56:29 -0000	1.57
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-1a03dbed4b794194a610e9d7eb175b06  gtk+-2.8.19.tar.bz2
+74e7ca98194f1fadfe906e66d763d05d  gtk+-2.8.20.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Jul  2 20:23:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 16:23:18 -0400
Subject: rpms/glib2/devel .cvsignore, 1.54, 1.55 glib2.spec, 1.101,
	1.102 sources, 1.54, 1.55
Message-ID: <200607022023.k62KNI4A006392@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	20 Jun 2006 15:35:36 -0000	1.54
+++ .cvsignore	2 Jul 2006 20:23:15 -0000	1.55
@@ -1 +1 @@
-glib-2.11.4.tar.bz2
+glib-2.12.0.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- glib2.spec	20 Jun 2006 15:35:36 -0000	1.101
+++ glib2.spec	2 Jul 2006 20:23:15 -0000	1.102
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.11.4
+Version: 2.12.0
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jul  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
+- Update to 2.12.0
+
 * Tue Jun 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.4-1
 - Update to 2.11.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	20 Jun 2006 15:35:36 -0000	1.54
+++ sources	2 Jul 2006 20:23:15 -0000	1.55
@@ -1 +1 @@
-9d3a94baa4bfcd9a579b45eea6de3a8c  glib-2.11.4.tar.bz2
+ea8c7733ba443e3db04cf7a84060f408  glib-2.12.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Jul  2 22:20:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:20:12 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-tif-restore-sigmask.patch, 1.2,
	1.3 linux-2.6-x86_64-add-ppoll-pselect.patch, 1.2,
	1.3 kernel-2.6.spec, 1.2342, 1.2343
Message-ID: <200607022220.k62MKCce017447@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-tif-restore-sigmask.patch 
	linux-2.6-x86_64-add-ppoll-pselect.patch 
Log Message:
ppoll and pselect on x86_64 again

linux-2.6-x86_64-tif-restore-sigmask.patch:
 arch/x86_64/ia32/ia32_signal.c   |   28 ++++++++-------------
 arch/x86_64/kernel/signal.c      |   51 ++++++++++++++++++++++++++-------------
 include/asm-x86_64/signal.h      |    4 ---
 include/asm-x86_64/thread_info.h |    2 +
 4 files changed, 48 insertions(+), 37 deletions(-)

Index: linux-2.6-x86_64-tif-restore-sigmask.patch
===================================================================
RCS file: linux-2.6-x86_64-tif-restore-sigmask.patch
diff -N linux-2.6-x86_64-tif-restore-sigmask.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:20:10 -0000	1.3
@@ -0,0 +1,227 @@
+diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c
+index 25e5ca2..549de43 100644
+--- a/arch/x86_64/ia32/ia32_signal.c
++++ b/arch/x86_64/ia32/ia32_signal.c
+@@ -113,25 +113,19 @@ int copy_siginfo_from_user32(siginfo_t *
+ }
+ 
+ asmlinkage long
+-sys32_sigsuspend(int history0, int history1, old_sigset_t mask,
+-		 struct pt_regs *regs)
++sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
+ {
+-	sigset_t saveset;
+-
+ 	mask &= _BLOCKABLE;
+ 	spin_lock_irq(&current->sighand->siglock);
+-	saveset = current->blocked;
++	current->saved_sigmask = current->blocked;
+ 	siginitset(&current->blocked, mask);
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
+ 
+-	regs->rax = -EINTR;
+-	while (1) {
+-		current->state = TASK_INTERRUPTIBLE;
+-		schedule();
+-		if (do_signal(regs, &saveset))
+-			return -EINTR;
+-	}
++	current->state = TASK_INTERRUPTIBLE;
++	schedule();
++	set_thread_flag(TIF_RESTORE_SIGMASK);
++	return -ERESTARTNOHAND;
+ }
+ 
+ asmlinkage long
+@@ -508,11 +502,11 @@ #if DEBUG_SIG
+ 		current->comm, current->pid, frame, regs->rip, frame->pretcode);
+ #endif
+ 
+-	return 1;
++	return 0;
+ 
+ give_sigsegv:
+ 	force_sigsegv(sig, current);
+-	return 0;
++	return -EFAULT;
+ }
+ 
+ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -595,7 +589,7 @@ int ia32_setup_rt_frame(int sig, struct 
+ 	regs->ss = __USER32_DS; 
+ 
+ 	set_fs(USER_DS);
+-    regs->eflags &= ~TF_MASK;
++	regs->eflags &= ~TF_MASK;
+     if (test_thread_flag(TIF_SINGLESTEP))
+         ptrace_notify(SIGTRAP);
+ 
+@@ -604,9 +598,9 @@ #if DEBUG_SIG
+ 		current->comm, current->pid, frame, regs->rip, frame->pretcode);
+ #endif
+ 
+-	return 1;
++	return 0;
+ 
+ give_sigsegv:
+ 	force_sigsegv(sig, current);
+-	return 0;
++	return -EFAULT;
+ }
+diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
+index 2816117..d7e92fb 100644
+--- a/arch/x86_64/kernel/signal.c
++++ b/arch/x86_64/kernel/signal.c
+@@ -341,11 +341,11 @@ #ifdef DEBUG_SIG
+ 		current->comm, current->pid, frame, regs->rip, frame->pretcode);
+ #endif
+ 
+-	return 1;
++	return 0;
+ 
+ give_sigsegv:
+ 	force_sigsegv(sig, current);
+-	return 0;
++	return -EFAULT;
+ }
+ 
+ /*
+@@ -408,7 +408,7 @@ #ifdef CONFIG_IA32_EMULATION
+ #endif
+ 	ret = setup_rt_frame(sig, ka, info, oldset, regs);
+ 
+-	if (ret) {
++	if (ret == 0) {
+ 		spin_lock_irq(&current->sighand->siglock);
+ 		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+ 		if (!(ka->sa.sa_flags & SA_NODEFER))
+@@ -425,11 +425,12 @@ #endif
+  * want to handle. Thus you cannot kill init even with a SIGKILL even by
+  * mistake.
+  */
+-int do_signal(struct pt_regs *regs, sigset_t *oldset)
++static void do_signal(struct pt_regs *regs)
+ {
+ 	struct k_sigaction ka;
+ 	siginfo_t info;
+ 	int signr;
++	sigset_t *oldset;
+ 
+ 	/*
+ 	 * We want the common case to go fast, which
+@@ -438,9 +439,11 @@ int do_signal(struct pt_regs *regs, sigs
+ 	 * if so.
+ 	 */
+ 	if (!user_mode(regs))
+-		return 1;
++		return;
+ 
+-	if (!oldset)
++	if (test_thread_flag(TIF_RESTORE_SIGMASK))
++		oldset = &current->saved_sigmask;
++	else
+ 		oldset = &current->blocked;
+ 
+ 	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+@@ -454,30 +457,46 @@ int do_signal(struct pt_regs *regs, sigs
+ 			set_debugreg(current->thread.debugreg7, 7);
+ 
+ 		/* Whee!  Actually deliver the signal.  */
+-		return handle_signal(signr, &info, &ka, oldset, regs);
++		if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
++			/* a signal was successfully delivered; the saved
++			 * sigmask will have been stored in the signal frame,
++			 * and will be restored by sigreturn, so we can simply
++			 * clear the TIF_RESTORE_SIGMASK flag */
++			clear_thread_flag(TIF_RESTORE_SIGMASK);
++		}
++		return;
+ 	}
+ 
+ 	/* Did we come from a system call? */
+ 	if ((long)regs->orig_rax >= 0) {
+ 		/* Restart the system call - no handlers present */
+ 		long res = regs->rax;
+-		if (res == -ERESTARTNOHAND ||
+-		    res == -ERESTARTSYS ||
+-		    res == -ERESTARTNOINTR) {
++		switch (res) {
++		case -ERESTARTNOHAND:
++		case -ERESTARTSYS:
++		case -ERESTARTNOINTR:
+ 			regs->rax = regs->orig_rax;
+ 			regs->rip -= 2;
+-		}
+-		if (regs->rax == (unsigned long)-ERESTART_RESTARTBLOCK) {
++			break;
++		case -ERESTART_RESTARTBLOCK:
+ 			regs->rax = test_thread_flag(TIF_IA32) ?
+ 					__NR_ia32_restart_syscall :
+ 					__NR_restart_syscall;
+ 			regs->rip -= 2;
++			break;
+ 		}
+ 	}
+-	return 0;
++
++	/* if there's no signal to deliver, we just put the saved sigmask
++	   back. */
++	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
++		clear_thread_flag(TIF_RESTORE_SIGMASK);
++		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
++	}
+ }
+ 
+-void do_notify_resume(struct pt_regs *regs, sigset_t *oldset, __u32 thread_info_flags)
++void
++do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
+ {
+ #ifdef DEBUG_SIG
+ 	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n",
+@@ -491,8 +510,8 @@ #endif
+ 	}
+ 
+ 	/* deal with pending signal delivery */
+-	if (thread_info_flags & _TIF_SIGPENDING)
+-		do_signal(regs,oldset);
++	if (thread_info_flags & (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK))
++		do_signal(regs);
+ }
+ 
+ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
+diff --git a/include/asm-x86_64/signal.h b/include/asm-x86_64/signal.h
+index cef7a7d..00f2d38 100644
+--- a/include/asm-x86_64/signal.h
++++ b/include/asm-x86_64/signal.h
+@@ -24,10 +24,6 @@ typedef struct {
+ } sigset_t;
+ 
+ 
+-struct pt_regs; 
+-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
+-
+-
+ #else
+ /* Here we must cater to libcs that poke about in kernel headers.  */
+ 
+diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h
+index 2029b00..790c512 100644
+--- a/include/asm-x86_64/thread_info.h
++++ b/include/asm-x86_64/thread_info.h
+@@ -114,6 +114,7 @@ #define TIF_SINGLESTEP		4	/* reenable si
+ #define TIF_IRET		5	/* force IRET */
+ #define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */
+ #define TIF_SECCOMP		8	/* secure computing */
++#define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal */
+ /* 16 free */
+ #define TIF_IA32		17	/* 32bit process */ 
+ #define TIF_FORK		18	/* ret_from_fork */
+@@ -128,6 +129,7 @@ #define _TIF_NEED_RESCHED	(1<<TIF_NEED_R
+ #define _TIF_IRET		(1<<TIF_IRET)
+ #define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)
+ #define _TIF_SECCOMP		(1<<TIF_SECCOMP)
++#define _TIF_RESTORE_SIGMASK	(1<<TIF_RESTORE_SIGMASK)
+ #define _TIF_IA32		(1<<TIF_IA32)
+ #define _TIF_FORK		(1<<TIF_FORK)
+ #define _TIF_ABI_PENDING	(1<<TIF_ABI_PENDING)

linux-2.6-x86_64-add-ppoll-pselect.patch:
 arch/x86_64/ia32/ia32entry.S |    4 ++--
 include/asm-x86_64/unistd.h  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6-x86_64-add-ppoll-pselect.patch
===================================================================
RCS file: linux-2.6-x86_64-add-ppoll-pselect.patch
diff -N linux-2.6-x86_64-add-ppoll-pselect.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86_64-add-ppoll-pselect.patch	2 Jul 2006 22:20:10 -0000	1.3
@@ -0,0 +1,31 @@
+diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
+index 5a92fed..07399fe 100644
+--- a/arch/x86_64/ia32/ia32entry.S
++++ b/arch/x86_64/ia32/ia32entry.S
+@@ -687,8 +687,8 @@ #endif
+ 	.quad sys_readlinkat		/* 305 */
+ 	.quad sys_fchmodat
+ 	.quad sys_faccessat
+-	.quad quiet_ni_syscall		/* pselect6 for now */
+-	.quad quiet_ni_syscall		/* ppoll for now */
++	.quad compat_sys_pselect6
++	.quad compat_sys_ppoll
+ 	.quad sys_unshare		/* 310 */
+ 	.quad compat_sys_set_robust_list
+ 	.quad compat_sys_get_robust_list
+diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
+index feb77cb..0a08bbf 100644
+--- a/include/asm-x86_64/unistd.h
++++ b/include/asm-x86_64/unistd.h
+@@ -600,9 +600,9 @@ __SYSCALL(__NR_fchmodat, sys_fchmodat)
+ #define __NR_faccessat		269
+ __SYSCALL(__NR_faccessat, sys_faccessat)
+ #define __NR_pselect6		270
+-__SYSCALL(__NR_pselect6, sys_ni_syscall)	/* for now */
++__SYSCALL(__NR_pselect6, sys_pselect6)
+ #define __NR_ppoll		271
+-__SYSCALL(__NR_ppoll,	sys_ni_syscall)		/* for now */
++__SYSCALL(__NR_ppoll,	sys_ppoll)
+ #define __NR_unshare		272
+ __SYSCALL(__NR_unshare,	sys_unshare)
+ #define __NR_set_robust_list	273


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2342
retrieving revision 1.2343
diff -u -r1.2342 -r1.2343
--- kernel-2.6.spec	2 Jul 2006 03:23:39 -0000	1.2342
+++ kernel-2.6.spec	2 Jul 2006 22:20:10 -0000	1.2343
@@ -256,6 +256,8 @@
 Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 Patch206: linux-2.6-x86-hp-reboot.patch
+Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
+Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
 Patch302: linux-2.6-offb-find-fb.patch
@@ -727,6 +729,10 @@
 %patch205 -p1
 # Reboot through BIOS on HP systems,.
 %patch206 -p1
+# Support TIF_RESTORE_SIGMASK on x86_64
+%patch207 -p1
+# Add ppoll and pselect syscalls
+%patch208 -p1
 
 #
 # ppc64
@@ -1562,6 +1568,9 @@
 %endif
 
 %changelog
+* Sun Jul  2 2006 David Woodhouse <dwmw2 at redhat.com>
+- Add ppoll() and pselect() on x86_64 again
+
 * Sat Jul  1 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git19
 



From fedora-cvs-commits at redhat.com  Sun Jul  2 22:21:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:21:01 -0400
Subject: rpms/kernel/devel linux-2.6-header-install-git.patch,1.25,1.26
Message-ID: <200607022221.k62ML1ak017837@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-header-install-git.patch 
Log Message:
remove tpam.h

linux-2.6-header-install-git.patch:
 Makefile                              |   17 +++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    5 +
 include/asm-arm/Kbuild                |    1 
 include/asm-arm26/Kbuild              |    1 
 include/asm-cris/Kbuild               |    1 
 include/asm-frv/Kbuild                |    1 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 ++
 include/asm-h8300/Kbuild              |    1 
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    1 
 include/asm-m68k/Kbuild               |    1 
 include/asm-m68knommu/Kbuild          |    1 
 include/asm-mips/Kbuild               |    1 
 include/asm-parisc/Kbuild             |    1 
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-s390/Kbuild               |    4 
 include/asm-sh/Kbuild                 |    1 
 include/asm-sh64/Kbuild               |    1 
 include/asm-sparc/Kbuild              |    6 +
 include/asm-sparc64/Kbuild            |   10 ++
 include/asm-um/Kbuild                 |    1 
 include/asm-v850/Kbuild               |    1 
 include/asm-x86_64/Kbuild             |   11 ++
 include/asm-xtensa/Kbuild             |    1 
 include/linux/Kbuild                  |   63 +++++++++++++
 include/linux/byteorder/Kbuild        |    2 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 ++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 
 include/linux/netfilter_ipv4/Kbuild   |   21 ++++
 include/linux/netfilter_ipv6/Kbuild   |    6 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  158 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 +
 49 files changed, 399 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linux-2.6-header-install-git.patch	22 Jun 2006 13:52:58 -0000	1.25
+++ linux-2.6-header-install-git.patch	2 Jul 2006 22:20:58 -0000	1.26
@@ -372,11 +372,11 @@
 +header-y += ioctl.h
 diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
 new file mode 100644
-index 0000000..c1727c8
+index 0000000..991cdb2
 --- /dev/null
 +++ b/include/linux/isdn/Kbuild
 @@ -0,0 +1 @@
-+header-y += capicmd.h tpam.h
++header-y += capicmd.h
 diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
 new file mode 100644
 index 0000000..d06311a



From fedora-cvs-commits at redhat.com  Sun Jul  2 22:30:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:30:42 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-tif-restore-sigmask.patch, 1.3,
	1.4
Message-ID: <200607022230.k62MUgks021470@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-x86_64-tif-restore-sigmask.patch 
Log Message:
build fix

linux-2.6-x86_64-tif-restore-sigmask.patch:
 arch/x86_64/ia32/ia32_signal.c   |   28 ++++++++------------
 arch/x86_64/kernel/signal.c      |   53 +++++++++++++++++++++++++++------------
 include/asm-x86_64/signal.h      |    4 --
 include/asm-x86_64/thread_info.h |    2 +
 4 files changed, 50 insertions(+), 37 deletions(-)

Index: linux-2.6-x86_64-tif-restore-sigmask.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-tif-restore-sigmask.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:20:10 -0000	1.3
+++ linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:30:32 -0000	1.4
@@ -70,10 +70,19 @@
 +	return -EFAULT;
  }
 diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
-index 2816117..d7e92fb 100644
+index 2816117..8b80ba2 100644
 --- a/arch/x86_64/kernel/signal.c
 +++ b/arch/x86_64/kernel/signal.c
-@@ -341,11 +341,11 @@ #ifdef DEBUG_SIG
+@@ -32,6 +32,8 @@ #include <asm/ia32_unistd.h>
+ 
+ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+ 
++static void do_signal(struct pt_regs *regs);
++
+ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+                sigset_t *set, struct pt_regs * regs); 
+ int ia32_setup_frame(int sig, struct k_sigaction *ka,
+@@ -341,11 +343,11 @@ #ifdef DEBUG_SIG
  		current->comm, current->pid, frame, regs->rip, frame->pretcode);
  #endif
  
@@ -87,7 +96,7 @@
  }
  
  /*
-@@ -408,7 +408,7 @@ #ifdef CONFIG_IA32_EMULATION
+@@ -408,7 +410,7 @@ #ifdef CONFIG_IA32_EMULATION
  #endif
  	ret = setup_rt_frame(sig, ka, info, oldset, regs);
  
@@ -96,7 +105,7 @@
  		spin_lock_irq(&current->sighand->siglock);
  		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
  		if (!(ka->sa.sa_flags & SA_NODEFER))
-@@ -425,11 +425,12 @@ #endif
+@@ -425,11 +427,12 @@ #endif
   * want to handle. Thus you cannot kill init even with a SIGKILL even by
   * mistake.
   */
@@ -110,7 +119,7 @@
  
  	/*
  	 * We want the common case to go fast, which
-@@ -438,9 +439,11 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -438,9 +441,11 @@ int do_signal(struct pt_regs *regs, sigs
  	 * if so.
  	 */
  	if (!user_mode(regs))
@@ -124,7 +133,7 @@
  		oldset = &current->blocked;
  
  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-@@ -454,30 +457,46 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -454,30 +459,46 @@ int do_signal(struct pt_regs *regs, sigs
  			set_debugreg(current->thread.debugreg7, 7);
  
  		/* Whee!  Actually deliver the signal.  */
@@ -179,7 +188,7 @@
  {
  #ifdef DEBUG_SIG
  	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n",
-@@ -491,8 +510,8 @@ #endif
+@@ -491,8 +512,8 @@ #endif
  	}
  
  	/* deal with pending signal delivery */



From fedora-cvs-commits at redhat.com  Sun Jul  2 22:32:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:32:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2343,1.2344
Message-ID: <200607022232.k62MWFxk021562@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump release





From fedora-cvs-commits at redhat.com  Sun Jul  2 22:41:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:41:01 -0400
Subject: rpms/kernel/devel linux-2.6-x86_64-tif-restore-sigmask.patch, 1.4,
	1.5
Message-ID: <200607022241.k62Mf15l023861@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-x86_64-tif-restore-sigmask.patch 
Log Message:
Use generic sys_rt_sigsuspend

linux-2.6-x86_64-tif-restore-sigmask.patch:
 arch/x86_64/ia32/ia32_signal.c   |   28 +++++--------
 arch/x86_64/kernel/signal.c      |   82 ++++++++++++++++-----------------------
 include/asm-x86_64/signal.h      |    4 -
 include/asm-x86_64/thread_info.h |    2 
 include/asm-x86_64/unistd.h      |    1 
 5 files changed, 49 insertions(+), 68 deletions(-)

Index: linux-2.6-x86_64-tif-restore-sigmask.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-tif-restore-sigmask.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:30:32 -0000	1.4
+++ linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:40:59 -0000	1.5
@@ -70,19 +70,48 @@
 +	return -EFAULT;
  }
 diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
-index 2816117..8b80ba2 100644
+index 2816117..7f58bc9 100644
 --- a/arch/x86_64/kernel/signal.c
 +++ b/arch/x86_64/kernel/signal.c
-@@ -32,6 +32,8 @@ #include <asm/ia32_unistd.h>
+@@ -38,37 +38,6 @@ int ia32_setup_frame(int sig, struct k_s
+             sigset_t *set, struct pt_regs * regs); 
  
- #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
- 
-+static void do_signal(struct pt_regs *regs);
-+
- int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                sigset_t *set, struct pt_regs * regs); 
- int ia32_setup_frame(int sig, struct k_sigaction *ka,
-@@ -341,11 +343,11 @@ #ifdef DEBUG_SIG
+ asmlinkage long
+-sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *regs)
+-{
+-	sigset_t saveset, newset;
+-
+-	/* XXX: Don't preclude handling different sized sigset_t's.  */
+-	if (sigsetsize != sizeof(sigset_t))
+-		return -EINVAL;
+-
+-	if (copy_from_user(&newset, unewset, sizeof(newset)))
+-		return -EFAULT;
+-	sigdelsetmask(&newset, ~_BLOCKABLE);
+-
+-	spin_lock_irq(&current->sighand->siglock);
+-	saveset = current->blocked;
+-	current->blocked = newset;
+-	recalc_sigpending();
+-	spin_unlock_irq(&current->sighand->siglock);
+-#ifdef DEBUG_SIG
+-	printk("rt_sigsuspend savset(%lx) newset(%lx) regs(%p) rip(%lx)\n",
+-		saveset, newset, regs, regs->rip);
+-#endif 
+-	regs->rax = -EINTR;
+-	while (1) {
+-		current->state = TASK_INTERRUPTIBLE;
+-		schedule();
+-		if (do_signal(regs, &saveset))
+-			return -EINTR;
+-	}
+-}
+-
+-asmlinkage long
+ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
+ 		struct pt_regs *regs)
+ {
+@@ -341,11 +310,11 @@ #ifdef DEBUG_SIG
  		current->comm, current->pid, frame, regs->rip, frame->pretcode);
  #endif
  
@@ -96,7 +125,7 @@
  }
  
  /*
-@@ -408,7 +410,7 @@ #ifdef CONFIG_IA32_EMULATION
+@@ -408,7 +377,7 @@ #ifdef CONFIG_IA32_EMULATION
  #endif
  	ret = setup_rt_frame(sig, ka, info, oldset, regs);
  
@@ -105,7 +134,7 @@
  		spin_lock_irq(&current->sighand->siglock);
  		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
  		if (!(ka->sa.sa_flags & SA_NODEFER))
-@@ -425,11 +427,12 @@ #endif
+@@ -425,11 +394,12 @@ #endif
   * want to handle. Thus you cannot kill init even with a SIGKILL even by
   * mistake.
   */
@@ -119,7 +148,7 @@
  
  	/*
  	 * We want the common case to go fast, which
-@@ -438,9 +441,11 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -438,9 +408,11 @@ int do_signal(struct pt_regs *regs, sigs
  	 * if so.
  	 */
  	if (!user_mode(regs))
@@ -133,7 +162,7 @@
  		oldset = &current->blocked;
  
  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-@@ -454,30 +459,46 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -454,30 +426,46 @@ int do_signal(struct pt_regs *regs, sigs
  			set_debugreg(current->thread.debugreg7, 7);
  
  		/* Whee!  Actually deliver the signal.  */
@@ -188,7 +217,7 @@
  {
  #ifdef DEBUG_SIG
  	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n",
-@@ -491,8 +512,8 @@ #endif
+@@ -491,8 +479,8 @@ #endif
  	}
  
  	/* deal with pending signal delivery */
@@ -234,3 +263,15 @@
  #define _TIF_IA32		(1<<TIF_IA32)
  #define _TIF_FORK		(1<<TIF_FORK)
  #define _TIF_ABI_PENDING	(1<<TIF_ABI_PENDING)
+diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
+index 94387c9..c9db37d 100644
+--- a/include/asm-x86_64/unistd.h
++++ b/include/asm-x86_64/unistd.h
+@@ -658,6 +658,7 @@ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
++#define __ARCH_WANT_SYS_RT_SIGSUSPEND
+ #define __ARCH_WANT_SYS_TIME
+ #define __ARCH_WANT_COMPAT_SYS_TIME
+ 



From fedora-cvs-commits at redhat.com  Sun Jul  2 22:41:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:41:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2344,1.2345
Message-ID: <200607022241.k62MfHCU023975@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump release





From fedora-cvs-commits at redhat.com  Sun Jul  2 22:56:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 2 Jul 2006 18:56:13 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2345,1.2345.2.1
Message-ID: <200607022256.k62MuDeX011759@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
      Tag: private-x86_64-pselect-branch
	kernel-2.6.spec 
Log Message:
ffs. x86_64 only


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2345
retrieving revision 1.2345.2.1
diff -u -r1.2345 -r1.2345.2.1
--- kernel-2.6.spec	2 Jul 2006 22:41:15 -0000	1.2345
+++ kernel-2.6.spec	2 Jul 2006 22:56:06 -0000	1.2345.2.1
@@ -169,7 +169,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Mon Jul  3 05:38:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 01:38:31 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-auth-kerberos-update.patch,
	NONE, 1.1 autofs-5.0.0_beta6-check-return.patch, NONE,
	1.1 autofs-5.0.0_beta6-default-auth-config.patch, NONE,
	1.1 autofs-5.0.0_beta6-gssapi-segfault-exit.patch, NONE,
	1.1 autofs.spec, 1.116, 1.117
Message-ID: <200607030538.k635cV9D026643@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-auth-kerberos-update.patch 
	autofs-5.0.0_beta6-check-return.patch 
	autofs-5.0.0_beta6-default-auth-config.patch 
	autofs-5.0.0_beta6-gssapi-segfault-exit.patch 
Log Message:
* Mon Jul 3 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-2
- merge LDAP authentication update for GSSAPI (Jeff Moyer).
- update default auth config to add options documenetation (Jeff Moyer).
- workaround segfaults at exit after using GSSAPI library.
- fix not checking return in init_ldap_connection (jeff Moyer).


autofs-5.0.0_beta6-auth-kerberos-update.patch:
 CHANGELOG             |    4 
 include/lookup_ldap.h |   18 +-
 modules/cyrus-sasl.c  |  356 +++++++++++++++++++++++++++++++++++++++++++++-----
 modules/lookup_ldap.c |  156 ++++++++++++---------
 4 files changed, 430 insertions(+), 104 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-auth-kerberos-update.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index fb55ec3..df66913 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+?/7/2006 autofs-5.0.0
+---------------------
+- merge LDAP authentication update for GSSAPI (Jeff Moyer).
+
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
 - lookup_init cleanup and fix missed memory leak.
diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
index db6389c..ebff193 100644
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -34,6 +34,14 @@ struct lookup_context {
 	char        *sasl_mech;
 	char        *user;
 	char        *secret;
+	char        *client_princ;
+	int          kinit_done;
+	int          kinit_successful;
+	krb5_principal  krb5_client_princ;
+	krb5_context krb5ctxt;
+	krb5_ccache  krb5_ccache;
+	sasl_conn_t  *sasl_conn;
+	/* keytab file name needs to be added */
 
 	struct parse_mod *parse;
 };
@@ -48,14 +56,14 @@ #define LDAP_TLS_INIT		1
 #define LDAP_TLS_RELEASE	2
 
 /* lookup_ldap.c */
-LDAP *ldap_connection_init(struct lookup_context *ctxt);
-int ldap_unbind_connection(LDAP *ldap, struct lookup_context *ctxt);
+LDAP *init_ldap_connection(struct lookup_context *ctxt);
+int unbind_ldap_connection(LDAP *ldap, struct lookup_context *ctxt);
 int authtype_requires_creds(const char *authtype);
 
 /* cyrus-sasl.c */
-int sasl_init(char *id, char *secret);
-int sasl_choose_mech(struct lookup_context *ctxt, char **mechanism);
-sasl_conn_t *sasl_bind_mech(LDAP *ldap, const char *mech);
+int autofs_sasl_init(LDAP *ldap, struct lookup_context *ctxt);
+int autofs_sasl_bind(LDAP *ldap, struct lookup_context *ctxt);
+void autofs_sasl_unbind(struct lookup_context *ctxt);
 #endif
 
 #endif /* _lookup_ldap_h */
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index 7066113..b89d749 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -35,7 +35,7 @@
  *
  *  This file implements SASL authentication to an LDAP server for the
  *  following mechanisms:
- *    GSSAPI, EXTERNAL, ANONYMOUS, PLAIN, DIGEST-MD5, KERBEROS_V5
+ *    GSSAPI, EXTERNAL, ANONYMOUS, PLAIN, DIGEST-MD5, KERBEROS_V5, LOGIN
  *  The mechanism to use is specified in an external file,
  *  LDAP_AUTH_CONF_FILE.  See the samples directory in the autofs
  *  distribution for an example configuration file.
@@ -43,8 +43,8 @@
  *  This file is written with the intent that it will work with both the
  *  openldap and the netscape ldap client libraries.
  *
- *  Author: Nalin <nalin at redhat.com>
- *  Modified by Jeff <jmoyer at redhat.com> to adapt it to autofs.
+ *  Author: Nalin Dahyabhai <nalin at redhat.com>
+ *  Modified by Jeff Moyer <jmoyer at redhat.com> to adapt it to autofs.
  */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -66,6 +66,13 @@ #error "Could not determine the proper v
 #endif
 #endif
 
+/*
+ *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
+ *  environment variable so that the library knows where to find it.
+ */
+static const char *krb5ccenv = "KRB5CCNAME";
+static const char *krb5ccval = "MEMORY:_autofstkt";
+
 static int sasl_log_func(void *, int, const char *);
 static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **);
 static int getuser_func(void *, int, const char **, unsigned *);
@@ -128,8 +135,8 @@ getuser_func(void *context, int id, cons
 }
 
 /*
- *  This function creates a sasl_secret_t from the credentials
- *  specefied in sasl_init.  sasl_client_auth can return SASL_OK or
+ *  This function creates a sasl_secret_t from the credentials specified in
+ *  the configuration file.  sasl_client_auth can return SASL_OK or
  *  SASL_NOMEM.  We simply propagate this return value to the caller.
  */
 static int
@@ -353,9 +360,182 @@ do_sasl_bind(LDAP *ld, sasl_conn_t *conn
 	return ret;
 }
 
+/*
+ *  Read client credentials from the default keytab, create a credentials
+ *  cache, add the TGT to that cache, and set the environment variable so
+ *  that the sasl/krb5 libraries can find our credentials.
+ *
+ *  Returns 0 upon success.  ctxt->kinit_done and ctxt->kinit_successful
+ *  are set for cleanup purposes.  The krb5 context and ccache entries in
+ *  the lookup_context are also filled in.
+ *
+ *  Upon failure, -1 is returned.
+ */
+int
+sasl_do_kinit(struct lookup_context *ctxt)
+{
+	krb5_error_code ret;
+	krb5_principal tgs_princ, krb5_client_princ = ctxt->krb5_client_princ;
+	krb5_creds my_creds;
+	char *tgs_name;
+
+	if (ctxt->kinit_done)
+		return 0;
+	ctxt->kinit_done = 1;
+
+	debug(LOGOPT_NONE,
+	      "initializing kerberos ticket: client principal %s ",
+	      ctxt->client_princ ?: "autofsclient");
+
+	ret = krb5_init_context(&ctxt->krb5ctxt);
+	if (ret) {
+		error(LOGOPT_ANY, "krb5_init_context failed with %d", ret);
+		return -1;
+	}
+
+	ret = krb5_cc_resolve(ctxt->krb5ctxt, krb5ccval, &ctxt->krb5_ccache);
+	if (ret) {
+		error(LOGOPT_ANY, "krb5_cc_resolve failed with error %d",
+		      ret);
+		krb5_free_context(ctxt->krb5ctxt);
+		return -1;
+	}
+
+	if (ctxt->client_princ) {
+		debug(LOGOPT_NONE,
+		      "calling krb5_parse_name on client principal %s",
+		      ctxt->client_princ);
+
+		ret = krb5_parse_name(ctxt->krb5ctxt, ctxt->client_princ,
+				      &krb5_client_princ);
+		if (ret) {
+			error(LOGOPT_ANY,
+			      "krb5_parse_name failed for "
+			      "specified client principal %s",
+			      ctxt->client_princ);
+			goto out_cleanup_cc;
+		}
+	} else {
+		char *tmp_name = NULL;
+
+		debug(LOGOPT_NONE,
+		      "calling krb5_sname_to_principal using defaults");
+
+		ret = krb5_sname_to_principal(ctxt->krb5ctxt, NULL,
+					"autofsclient", KRB5_NT_SRV_HST, 
+					&krb5_client_princ);
+		if (ret) {
+			error(LOGOPT_ANY,
+			      "krb5_sname_to_principal failed for "
+			      "%s with error %d",
+			      ctxt->client_princ ?: "autofsclient", ret);
+			goto out_cleanup_cc;
+		}
+
+
+		ret = krb5_unparse_name(ctxt->krb5ctxt,
+					krb5_client_princ, &tmp_name);
+		if (ret) {
+			debug(LOGOPT_NONE,
+			      "krb5_unparse_name failed with error %d",
+			      ret);
+			goto out_cleanup_cc;
+		}
+
+		debug(LOGOPT_NONE,
+		      "principal used for authentication: \"%s\"", tmp_name);
+
+		krb5_free_unparsed_name(ctxt->krb5ctxt, tmp_name);
+	}
+
+	/* setup a principal for the ticket granting service */
+	ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
+		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
+		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
+		strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
+		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
+		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
+		0);
+	if (ret) {
+		error(LOGOPT_ANY,
+		      "krb5_build_principal failed with error %d", ret);
+		goto out_cleanup_cc;
+	}
+
+	ret = krb5_unparse_name(ctxt->krb5ctxt, tgs_princ, &tgs_name);
+	if (ret) {
+		error(LOGOPT_ANY, "krb5_unparse_name failed with error %d",
+		      ret);
+		goto out_cleanup_cc;
+	}
+
+	debug(LOGOPT_NONE, "Using tgs name %s", tgs_name);
+
+	memset(&my_creds, 0, sizeof(my_creds));
+	ret = krb5_get_init_creds_keytab(ctxt->krb5ctxt, &my_creds,
+					 krb5_client_princ,
+					 NULL /*keytab*/,
+					 0 /* relative start time */,
+					 tgs_name, NULL);
+	if (ret) {
+		error(LOGOPT_ANY,
+		      "krb5_get_init_creds_keytab failed with error %d",
+		      ret);
+		goto out_cleanup_unparse;
+	}
+
+	/* tell the cache what the default principal is */
+	ret = krb5_cc_initialize(ctxt->krb5ctxt,
+				 ctxt->krb5_ccache, krb5_client_princ);
+	if (ret) {
+		error(LOGOPT_ANY,
+		      "krb5_cc_initialize failed with error %d", ret);
+		goto out_cleanup_unparse;
+	}
+
+	/* and store credentials for that principal */
+	ret = krb5_cc_store_cred(ctxt->krb5ctxt, ctxt->krb5_ccache, &my_creds);
+	if (ret) {
+		error(LOGOPT_ANY,
+		      "krb5_cc_store_cred failed with error %d", ret);
+		goto out_cleanup_unparse;
+	}
+
+	/* finally, set the environment variable to point to our
+	 * credentials cache */
+	if (setenv(krb5ccenv, krb5ccval, 1) != 0) {
+		error(LOGOPT_ANY, "setenv failed with %d", errno);
+		goto out_cleanup_unparse;
+	}
+	ctxt->kinit_successful = 1;
+
+	debug(LOGOPT_NONE, "Kerberos authentication was successful!");
+
+	krb5_free_unparsed_name(ctxt->krb5ctxt, tgs_name);
 
+	return 0;
+
+out_cleanup_unparse:
+	krb5_free_unparsed_name(ctxt->krb5ctxt, tgs_name);
+out_cleanup_cc:
+	ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
+	if (ret)
+		warn(LOGOPT_ANY,
+		     "krb5_cc_destroy failed with non-fatal error %d", ret);
+
+	krb5_free_context(ctxt->krb5ctxt);
+
+	return -1;
+}
+
+/*
+ *  Attempt to bind to the ldap server using a given authentication
+ *  mechanism.  ldap should be a properly initialzed ldap pointer.
+ *
+ *  Returns a valid sasl_conn_t pointer upon success, NULL on failure.
+ */
 sasl_conn_t *
-sasl_bind_mech(LDAP *ldap, const char *mech)
+sasl_bind_mech(LDAP *ldap, struct lookup_context *ctxt, const char *mech)
 {
 	sasl_conn_t *conn;
 	char *tmp, *host = NULL;
@@ -364,17 +544,27 @@ sasl_bind_mech(LDAP *ldap, const char *m
 	const char *chosen_mech;
 	int result;
 
+	if (!strncmp(mech, "GSSAPI", 6)) {
+		if (sasl_do_kinit(ctxt) != 0)
+			return NULL;
+	}
+
+	debug(LOGOPT_NONE, "Attempting sasl bind with mechanism %s", mech);
+
 	result = ldap_get_option(ldap, LDAP_OPT_HOST_NAME, &host);
-	if (result != LDAP_SUCCESS) {
+	if (result != LDAP_SUCCESS || !host) {
 		debug(LOGOPT_NONE, "failed to get hostname for connection");
 		return NULL;
 	}
+
 	if ((tmp = strchr(host, ':')))
 		*tmp = '\0';
 
 	/* Create a new authentication context for the service. */
 	result = sasl_client_new("ldap", host, NULL, NULL, NULL, 0, &conn);
 	if (result != SASL_OK) {
+		error(LOGOPT_ANY, "sasl_client_new failed with error %d",
+		      result);
 		ldap_memfree(host);
 		return NULL;
 	}
@@ -385,10 +575,10 @@ sasl_bind_mech(LDAP *ldap, const char *m
 
 	/* OK and CONTINUE are the only non-fatal return codes here. */
 	if ((result != SASL_OK) && (result != SASL_CONTINUE)) {
-		error(LOGOPT_ANY, "%s", sasl_errdetail(conn));
+		error(LOGOPT_ANY, "sasl_client start failed with error: %s",
+		      sasl_errdetail(conn));
 		ldap_memfree(host);
-		if (conn)
-			sasl_dispose(&conn);
+		sasl_dispose(&conn);
 		return NULL;
 	}
 
@@ -396,12 +586,15 @@ sasl_bind_mech(LDAP *ldap, const char *m
 			 &clientout, &clientoutlen, chosen_mech, result);
 	if (result == 0) {
 		ldap_memfree(host);
+		debug(LOGOPT_NONE, "sasl bind with mechanism %s succeeded",
+		      chosen_mech);
 		return conn;
 	}
 
-	ldap_memfree(host);
+	info(LOGOPT_ANY, "sasl bind with mechanism %s failed", mech);
 
 	/* sasl bind failed */
+	ldap_memfree(host);
 	sasl_dispose(&conn);
 
 	return NULL;
@@ -411,27 +604,17 @@ sasl_bind_mech(LDAP *ldap, const char *m
  *  Returns 0 if a suitable authentication mechanism is available.  Returns
  *  -1 on error or if no mechanism is supported by both client and server.
  */
-int
-sasl_choose_mech(struct lookup_context *ctxt, char **mechanism)
+sasl_conn_t *
+sasl_choose_mech(LDAP *ldap, struct lookup_context *ctxt)
 {
-	LDAP *ldap;
 	sasl_conn_t *conn;
 	int authenticated;
 	int i;
 	char **mechanisms;
 
-	/* TODO: what's this here for ? */
-	*mechanism = NULL;
-
-	ldap = ldap_connection_init(ctxt);
-	if (!ldap)
-		return -1;
-
 	mechanisms = get_server_SASL_mechanisms(ldap);
-	if (!mechanisms) {
-		ldap_unbind_connection(ldap, ctxt);
-		return -1;
-	}
+	if (!mechanisms)
+		return NULL;
 
 	/* Try each supported mechanism in turn. */
 	authenticated = 0;
@@ -440,32 +623,137 @@ sasl_choose_mech(struct lookup_context *
 		 *  This routine is called if there is no configured
 		 *  mechanism.  As such, we can skip over any auth
 		 *  mechanisms that require user credentials.  These include
-		 *  PLAIN and DIGEST-MD5.
+		 *  PLAIN, LOGIN, and DIGEST-MD5.
 		 */
 		if (authtype_requires_creds(mechanisms[i]))
 			continue;
 
-		conn = sasl_bind_mech(ldap, mechanisms[i]);
+		conn = sasl_bind_mech(ldap, ctxt, mechanisms[i]);
 		if (conn) {
-			sasl_dispose(&conn);
+			ctxt->sasl_mech = strdup(mechanisms[i]);
+			if (!ctxt->sasl_mech) {
+				crit(LOGOPT_ANY,
+				     "Successfully authenticated with "
+				     "mechanism %s, but failed to allocate "
+				     "memory to hold the mechanism type.",
+				     mechanisms[i]);
+				sasl_dispose(&conn);
+				ldap_value_free(mechanisms);
+				return NULL;
+			}
 			authenticated = 1;
 			break;
 		}
+		debug(LOGOPT_NONE, "Failed to authenticate with mech %s",
+		      mechanisms[i]);
 	}
 
+	debug(LOGOPT_NONE, "authenticated: %d, sasl_mech: %s",
+	      authenticated, ctxt->sasl_mech);
+
 	ldap_value_free(mechanisms);
-	return (authenticated > 0) ? 0 : -1;
+	return conn;
 }
 
 int
-sasl_init(char *id, char *secret)
+autofs_sasl_bind(LDAP *ldap, struct lookup_context *ctxt)
 {
-	/* Start up Cyrus SASL--only needs to be done once. */
-	if (sasl_client_init(callbacks) != SASL_OK)
+	sasl_conn_t *conn;
+
+	if (!ctxt->sasl_mech)
 		return -1;
 
-	sasl_auth_id = id;
-	sasl_auth_secret = secret;
+	conn = sasl_bind_mech(ldap, ctxt, ctxt->sasl_mech);
+	if (!conn)
+		return -1;
 
+	ctxt->sasl_conn = conn;
 	return 0;
 }
+
+/*
+ *  Routine called when unbinding an ldap connection.
+ */
+void
+autofs_sasl_unbind(struct lookup_context *ctxt)
+{
+	if (ctxt->sasl_conn) {
+		sasl_dispose(&ctxt->sasl_conn);
+		ctxt->sasl_conn = NULL;
+	}
+}
+
+/*
+ *  Given a lookup context that has been initialized with any user-specified
+ *  parameters, figure out which sasl mechanism to use.  Then, initialize
+ *  the necessary parameters to authenticate with the chosen mechanism.
+ *
+ *  Return Values:
+ *  0  -  Success
+ * -1  -  Failure
+ */
+int
+autofs_sasl_init(LDAP *ldap, struct lookup_context *ctxt)
+{
+	sasl_conn_t *conn;
+
+	/* Start up Cyrus SASL--only needs to be done once. */
+	if (sasl_client_init(callbacks) != SASL_OK) {
+		error(LOGOPT_ANY, "sasl_client_init failed");
+		return -1;
+	}
+
+	sasl_auth_id = ctxt->user;
+	sasl_auth_secret = ctxt->secret;
+
+	/*
+	 *  If sasl_mech was not filled in, it means that there was no
+	 *  mechanism specified in the configuration file.  Try to auto-
+	 *  select one.
+	 */
+	if (ctxt->sasl_mech)
+		conn = sasl_bind_mech(ldap, ctxt, ctxt->sasl_mech);
+	else
+		conn = sasl_choose_mech(ldap, ctxt);
+
+	if (conn) {
+		sasl_dispose(&conn);
+		return 0;
+	}
+
+	return -1;
+}
+
+/*
+ *  Destructor routine.  This should be called when finished with an ldap
+ *  session.
+ */
+void
+autofs_sasl_done(struct lookup_context *ctxt)
+{
+	int ret;
+
+	if (ctxt && ctxt->sasl_conn) {
+		sasl_dispose(&ctxt->sasl_conn);
+		ctxt->sasl_conn = NULL;
+	}
+
+	if (ctxt->kinit_successful) {
+
+		ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
+		if (ret)
+			warn(LOGOPT_ANY,
+			     "krb5_cc_destroy failed with non-fatal error %d",
+			     ret);
+
+		krb5_free_context(ctxt->krb5ctxt);
+		if (unsetenv(krb5ccenv) != 0)
+			warn(LOGOPT_ANY,
+			     "unsetenv failed with error %d", errno);
+
+		ctxt->krb5ctxt = NULL;
+		ctxt->krb5_ccache = NULL;
+		ctxt->kinit_done = 0;
+		ctxt->kinit_successful = 0;
+	}
+}
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index adbf13d..3c9c332 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -43,7 +43,7 @@ #define MODPREFIX "lookup(ldap): "
 
 int lookup_version = AUTOFS_LOOKUP_VERSION;	/* Required by protocol */
 
-int ldap_bind_anonymous(LDAP *ldap, struct lookup_context *ctxt)
+int bind_ldap_anonymous(LDAP *ldap, struct lookup_context *ctxt)
 {
 	int rv;
 
@@ -53,7 +53,6 @@ int ldap_bind_anonymous(LDAP *ldap, stru
 		rv = ldap_simple_bind_s(ldap, NULL, NULL);
 
 	if (rv != LDAP_SUCCESS) {
-		ldap_unbind(ldap);
 		crit(LOGOPT_ANY,
 		     MODPREFIX "Unable to bind to the LDAP server: "
 		     "%s, error %s", ctxt->server ?: "(default)",
@@ -64,11 +63,12 @@ int ldap_bind_anonymous(LDAP *ldap, stru
 	return 0;
 }
 
-int ldap_unbind_connection(LDAP *ldap, struct lookup_context *ctxt)
+int unbind_ldap_connection(LDAP *ldap, struct lookup_context *ctxt)
 {
 	int rv;
 
 #if WITH_SASL
+	debug(LOGOPT_NONE, "use_tls: %d", ctxt->use_tls);
 	/*
 	 * The OpenSSL library can't handle having its message and error
 	 * string database loaded multiple times and segfaults if the
@@ -81,9 +81,10 @@ #if WITH_SASL
 		ERR_remove_state(0);
 		ctxt->use_tls = LDAP_TLS_INIT;
 	}
+	autofs_sasl_unbind(ctxt);
 #endif
 
-	rv = ldap_unbind(ldap);
+	rv = ldap_unbind_ext(ldap, NULL, NULL);
 	if (rv != LDAP_SUCCESS)
 		error(LOGOPT_ANY,
 		     "unbind failed: %s", ldap_err2string(rv));
@@ -91,7 +92,7 @@ #endif
 	return rv;
 }
 
-LDAP *ldap_connection_init(struct lookup_context *ctxt)
+LDAP *init_ldap_connection(struct lookup_context *ctxt)
 {
 	LDAP *ldap = NULL;
 	int timeout = 8;
@@ -100,6 +101,12 @@ LDAP *ldap_connection_init(struct lookup
 	ctxt->version = 3;
 
 	/* Initialize the LDAP context. */
+	/* LDAP_PORT should not be hard-coded, here.  If we are going to
+	 * parse ldap strings ourselves, then we can put the port specified
+	 * in the host:port format here.  Otherwise, we can just pass the
+	 * host:port string to the ldap_init call and let the library handle
+	 * it.   -JM
+	 */
 	ldap = ldap_init(ctxt->server, LDAP_PORT);
 	if (!ldap) {
 		crit(LOGOPT_ANY,
@@ -112,7 +119,7 @@ LDAP *ldap_connection_init(struct lookup
 	rv = ldap_set_option(ldap, LDAP_OPT_PROTOCOL_VERSION, &ctxt->version);
 	if (rv != LDAP_OPT_SUCCESS) {
 		/* fall back to LDAPv2 */
-		ldap_unbind(ldap);
+		ldap_unbind_ext(ldap, NULL, NULL);
 		ldap = ldap_init(ctxt->server, LDAP_PORT);
 		if (!ldap) {
 			crit(LOGOPT_ANY, MODPREFIX "couldn't initialize LDAP");
@@ -135,7 +142,7 @@ #if WITH_SASL
 				error(LOGOPT_ANY,
 				    MODPREFIX
 				    "TLS required but connection is version 2");
-				ldap_unbind(ldap);
+				ldap_unbind_ext(ldap, NULL, NULL);
 				return NULL;
 			}
 			return ldap;
@@ -143,7 +150,7 @@ #if WITH_SASL
 
 		rv = ldap_start_tls_s(ldap, NULL, NULL);
 		if (rv != LDAP_SUCCESS) {
-			ldap_unbind_connection(ldap, ctxt);
+			unbind_ldap_connection(ldap, ctxt);
 			if (ctxt->tls_required) {
 				error(LOGOPT_ANY,
 				      MODPREFIX
@@ -152,7 +159,7 @@ #if WITH_SASL
 				return NULL;
 			}
 			ctxt->use_tls = LDAP_TLS_DONT_USE;
-			ldap = ldap_connection_init(ctxt);
+			ldap = init_ldap_connection(ctxt);
 			ctxt->use_tls = LDAP_TLS_INIT;
 			return ldap;
 		}
@@ -168,39 +175,32 @@ static LDAP *do_connect(struct lookup_co
 	LDAP *ldap;
 	int rv;
 
-	ldap = ldap_connection_init(ctxt);
+	ldap = init_ldap_connection(ctxt);
 	if (!ldap)
 		return NULL;
 
 #if WITH_SASL
-	if (ctxt->auth_required && ctxt->sasl_mech) {
-		sasl_conn_t *conn;
+	debug(LOGOPT_NONE, "auth_required: %d, sasl_mech %s",
+	      ctxt->auth_required, ctxt->sasl_mech);
 
-		debug(LOGOPT_NONE,
-		      MODPREFIX
-		      "attempting sasl bind, mechanism %s, user %s",
-		      ctxt->sasl_mech, ctxt->user);
-
-		rv = 0;
-		conn = sasl_bind_mech(ldap, ctxt->sasl_mech);
-		if (!conn) {
-			error(LOGOPT_ANY, MODPREFIX "sasl bind failed");
-			rv = 1;
-		}
-
-		sasl_dispose(&conn);
+	if (ctxt->auth_required || ctxt->sasl_mech) {
+		rv = autofs_sasl_bind(ldap, ctxt);
+		debug(LOGOPT_NONE, MODPREFIX
+		      "autofs_sasl_bind returned %d", rv);
 	} else {
-		rv = ldap_bind_anonymous(ldap, ctxt);
+		rv = bind_ldap_anonymous(ldap, ctxt);
 		debug(LOGOPT_NONE,
-		      MODPREFIX "doing anonymous bind, ret %d", rv);
+		      MODPREFIX "ldap anonymous bind returned %d", rv);
 	}
 #else
-	rv = ldap_bind_anonymous(ldap, ctxt);
-	debug(LOGOPT_NONE, MODPREFIX "doing anonymous bind, ret %d", rv);
+	rv = bind_ldap_anonymous(ldap, ctxt);
+	debug(LOGOPT_NONE, MODPREFIX "ldap anonymous bind returned %d", rv);
 #endif
 
-	if (rv != 0)
+	if (rv != 0) {
+		unbind_ldap_connection(ldap, ctxt);
 		return NULL;
+	}
 
 	return ldap;
 }
@@ -228,13 +228,14 @@ int get_property(xmlNodePtr node, const 
 }
 
 /*
- *  For plain text and digest-md5 authentication types, we need
+ *  For plain text, login and digest-md5 authentication types, we need
  *  user and password credentials.
  */
 int authtype_requires_creds(const char *authtype)
 {
 	if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) ||
-	    !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")))
+	    !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) ||
+	    !strncmp(authtype, "LOGIN", strlen("LOGIN")))
 		return 1;
 	return 0;
 }
@@ -262,6 +263,7 @@ int parse_ldap_config(struct lookup_cont
 	xmlNodePtr   root = NULL;
 	char         *authrequired, *auth_conf, *authtype;
 	char         *user = NULL, *secret = NULL;
+	char         *client_princ = NULL;
 	char	     *usetls, *tlsrequired;
 
 	authtype = user = secret = NULL;
@@ -290,6 +292,7 @@ int parse_ldap_config(struct lookup_cont
 			ctxt->sasl_mech = NULL;
 			ctxt->user = NULL;
 			ctxt->secret = NULL;
+			ctxt->client_princ = NULL;
 			return 0;
 		}
 		error(LOGOPT_ANY,
@@ -444,6 +447,12 @@ int parse_ldap_config(struct lookup_cont
 		}
 	}
 
+	/*
+	 * We allow the admin to specify the principal to use for the
+	 * client.  The default is "autofsclient/hostname at REALM".
+	 */
+	(void)get_property(root, "clientprinc", &client_princ);
+
 	ctxt->auth_conf = auth_conf;
 	ctxt->use_tls = use_tls;
 	ctxt->tls_required = tls_required;
@@ -451,6 +460,22 @@ int parse_ldap_config(struct lookup_cont
 	ctxt->sasl_mech = authtype;
 	ctxt->user = user;
 	ctxt->secret = secret;
+	ctxt->client_princ = client_princ;
+
+	debug(LOGOPT_NONE,
+	      "ldap authentication configured with the following options:\n");
+	debug(LOGOPT_NONE,
+	      "use_tls: %u, "
+	      "tls_required: %u, "
+	      "auth_required: %u, "
+	      "sasl_mech: %s\n",
+	      use_tls, tls_required, auth_required, authtype);
+	debug(LOGOPT_NONE,
+	      "user: %s, "
+	      "secret: %s, "
+	      "client principal: %s\n",
+	      user, secret ? "specified" : "unspecified",
+	      client_princ);
 
 out:
 	xmlFreeDoc(doc);
@@ -470,11 +495,10 @@ out:
  *  Returns 0 on success, with authtype, user and secret filled in as
  *  appropriate.  Returns -1 on failre.
  */
-int ldap_auth_init(struct lookup_context *ctxt)
+int auth_init(struct lookup_context *ctxt)
 {
 	int ret;
-
-	ctxt->sasl_mech = NULL;
+	LDAP *ldap;
 
 	/*
 	 *  First, check to see if a preferred authentication method was
@@ -486,22 +510,23 @@ int ldap_auth_init(struct lookup_context
 	if (ret)
 		return -1;
 
+	ldap = init_ldap_connection(ctxt);
+	if (!ldap)
+		return -1;
+
 	/*
 	 *  Initialize the sasl library.  It is okay if user and secret
 	 *  are NULL, here.
+	 *
+	 *  The autofs_sasl_init routine will figure out which mechamism
+	 *  to use. If kerberos is used, it will also take care to initialize
+	 *  the credential cache and the client and service principals.
 	 */
-	if (sasl_init(ctxt->user, ctxt->secret) != 0)
+	ret = autofs_sasl_init(ldap, ctxt);
+	unbind_ldap_connection(ldap, ctxt);
+	if (ret) {
+		ctxt->sasl_mech = NULL;
 		return -1;
-
-	/*
-	 *  If sasl_mech was not filled in, it means that there was no
-	 *  mechanism specified in the configuration file.  Try to auto-
-	 *  select one if there are credentials.
-	 */
-	if (ctxt->sasl_mech == NULL && ctxt->user != NULL) {
-		ret = sasl_choose_mech(ctxt, &ctxt->sasl_mech);
-		if (ret != 0)
-			return -1;
 	}
 
 	return 0;
@@ -850,9 +875,10 @@ #if WITH_SASL
 	 * Determine which authentication mechanism to use.  We sanity-
 	 * check by binding to the server temporarily.
 	 */
-	ret = ldap_auth_init(ctxt);
-	if (ret) {
-		error(LOGOPT_ANY, MODPREFIX "cannot initialize auth setup");
+	ret = auth_init(ctxt);
+	if (ret && ctxt->auth_required) {
+		error(LOGOPT_ANY, MODPREFIX
+		      "cannot initialize authentication setup");
 		free_context(ctxt);
 		return 1;
 	}
@@ -865,16 +891,14 @@ #endif
 		return 1;
 	}
 
-	if (!get_query_dn(ldap, ctxt)) {
+	ret = get_query_dn(ldap, ctxt);
+	unbind_ldap_connection(ldap, ctxt);
+	if (!ret) {
 		error(LOGOPT_ANY, MODPREFIX "failed to get query dn");
-		ldap_unbind_connection(ldap, ctxt);
 		free_context(ctxt);
 		return 1;
 	}
 
-	/* Okay, we're done here. */
-	ldap_unbind_connection(ldap, ctxt);
-
 	/* Open the parser, if we can. */
 	ctxt->parse = open_parse(mapfmt, MODPREFIX, argc - 1, argv + 1);
 	if (!ctxt->parse) {
@@ -941,7 +965,7 @@ int lookup_read_master(struct master *ma
 		error(LOGOPT_NONE,
 		      MODPREFIX "query failed for %s: %s",
 		      query, ldap_err2string(rv));
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return NSS_STATUS_NOTFOUND;
 	}
 
@@ -951,7 +975,7 @@ int lookup_read_master(struct master *ma
 		      MODPREFIX "query succeeded, no matches for %s",
 		      query);
 		ldap_msgfree(result);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return NSS_STATUS_NOTFOUND;
 	} else
 		debug(LOGOPT_NONE, MODPREFIX "examining entries");
@@ -1026,7 +1050,7 @@ next:
 
 	/* Clean up. */
 	ldap_msgfree(result);
-	ldap_unbind_connection(ldap, ctxt);
+	unbind_ldap_connection(ldap, ctxt);
 
 	return NSS_STATUS_SUCCESS;
 }
@@ -1092,7 +1116,7 @@ static int read_one_map(struct autofs_po
 		debug(ap->logopt,
 		      MODPREFIX "query failed for %s: %s",
 		      query, ldap_err2string(rv));
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		*result_ldap = rv;
 		return NSS_STATUS_NOTFOUND;
 	}
@@ -1102,7 +1126,7 @@ static int read_one_map(struct autofs_po
 		debug(ap->logopt,
 		      MODPREFIX "query succeeded, no matches for %s", query);
 		ldap_msgfree(result);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return NSS_STATUS_NOTFOUND;
 	} else
 		debug(ap->logopt, MODPREFIX "examining entries");
@@ -1216,7 +1240,7 @@ next:
 
 	/* Clean up. */
 	ldap_msgfree(result);
-	ldap_unbind_connection(ldap, ctxt);
+	unbind_ldap_connection(ldap, ctxt);
 
 	return NSS_STATUS_SUCCESS;
 }
@@ -1308,7 +1332,7 @@ static int lookup_one(struct autofs_poin
 
 	if ((rv != LDAP_SUCCESS) || !result) {
 		crit(ap->logopt, MODPREFIX "query failed for %s", query);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return CHE_FAIL;
 	}
 
@@ -1320,7 +1344,7 @@ static int lookup_one(struct autofs_poin
 		debug(ap->logopt,
 		     MODPREFIX "got answer, but no entry for %s", query);
 		ldap_msgfree(result);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return CHE_MISSING;
 	}
 
@@ -1332,7 +1356,7 @@ static int lookup_one(struct autofs_poin
 		      MODPREFIX "key %s has duplicate entries", *keyValue);
 		ldap_value_free(keyValue);
 		ldap_msgfree(result);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return CHE_FAIL;
 	}
 
@@ -1344,7 +1368,7 @@ static int lookup_one(struct autofs_poin
 		      MODPREFIX "no %s defined for %s", info, query);
 		ldap_value_free(keyValue);
 		ldap_msgfree(result);
-		ldap_unbind_connection(ldap, ctxt);
+		unbind_ldap_connection(ldap, ctxt);
 		return CHE_MISSING;
 	}
 
@@ -1405,7 +1429,7 @@ done:
 	/* Clean up. */
 	ldap_value_free(keyValue);
 	ldap_msgfree(result);
-	ldap_unbind_connection(ldap, ctxt);
+	unbind_ldap_connection(ldap, ctxt);
 
 	return ret;
 }
@@ -1564,6 +1588,8 @@ int lookup_done(void *context)
 #if WITH_SASL
 	EVP_cleanup();
 	ERR_free_strings();
+
+	autofs_sasl_done(ctxt);
 #endif
 	free_context(ctxt);
 	return rv;

autofs-5.0.0_beta6-check-return.patch:
 CHANGELOG             |    1 +
 modules/lookup_ldap.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta6-check-return.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 4345c6e..58c8bbc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
 - update default auth config to add options documenetation (Jeff Moyer).
 - workaround segfaults at exit after using GSSAPI library.
+- fix not checking return in init_ldap_connection (jeff Moyer).
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 3c9c332..003b836 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -160,7 +160,8 @@ #if WITH_SASL
 			}
 			ctxt->use_tls = LDAP_TLS_DONT_USE;
 			ldap = init_ldap_connection(ctxt);
-			ctxt->use_tls = LDAP_TLS_INIT;
+			if (ldap)
+				ctxt->use_tls = LDAP_TLS_INIT;
 			return ldap;
 		}
 		ctxt->use_tls = LDAP_TLS_RELEASE;

autofs-5.0.0_beta6-default-auth-config.patch:
 CHANGELOG                     |    1 
 samples/autofs_ldap_auth.conf |   56 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 3 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-default-auth-config.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index df66913..854e1f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 ?/7/2006 autofs-5.0.0
 ---------------------
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
+- update default auth config to add options documenetation (Jeff Moyer).
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/samples/autofs_ldap_auth.conf b/samples/autofs_ldap_auth.conf
index 265571e..1b20c09 100644
--- a/samples/autofs_ldap_auth.conf
+++ b/samples/autofs_ldap_auth.conf
@@ -1,9 +1,59 @@
 <?xml version="1.0" ?>
+<!--
+This files contains a single entry with multiple attributes tied to it.
+The attributes are:
+
+usetls  -  Determines whether an encrypted connection to the ldap server
+	   should be attempted.  Legal values for the entry are:
+	   "yes"
+	   "no"
+
+tlsrequired  -  This flag tells whether the ldap connection must be
+	   encrypted.  If set to "yes", the automounter will fail to start
+	   if an encrypted connection cannot be established.  Legal values
+	   for this option include:
+	   "yes"
+	   "no"
+
+authrequired  -  This is a boolean flag which tells whether an
+	    authenticated connection to the ldap server is required in order
+	    to perform ldap queries.  If this flag is set to yes, then only
+	    authenticated connections to the ldap server will be allowed.
+	    Legal values for this option include:
+	    "yes"
+	    "no"
+
+authtype  -  This attribute can be used to specify a preferred
+	    authentication mechanism.  In normal operations, the
+	    automounter will attempt to authenticate to the ldap server
+	    using the list of supportedSASLmechanisms obtained from the
+	    directory server.  Explicitly setting the authtype will bypass
+	    this selection and only try the mechanism specified.  Legal
+	    values for this attribute include:
+	    "GSSAPI"
+	    "LOGIN"
+	    "PLAIN"
+	    "ANONYMOUS"
+	    "DIGEST-MD5"
+
+user  -  This attribute holds the authentication identity used by
+	    authentication mechanisms that require it.  Legal values for
+	    this attribute include any printable characters that can be
+	    used by the selected authentication mechanism.
+
+secret  -  This attribute holds the secret used by authentication
+	    mechanisms that require it.  Legal values for this attribute
+	    include any printable characters that can be used by the
+	    selected authentication mechanism.
+
+clientprinc  -  When using GSSAPI authentication, this attribute is
+	    consulted to determine the principal name to use when
+	    authenticating to the directory server.  By default, this will
+	    be set to "autofsclient/<fqdn>@<REALM>.
+-->
+
 <autofs_ldap_sasl_conf
 	usetls="no"
 	tlsrequired="no"
 	authrequired="no"
-	authtype="DIGEST-MD5"
-	user="xyz"
-	secret="abc"
 />

autofs-5.0.0_beta6-gssapi-segfault-exit.patch:
 CHANGELOG            |    1 +
 daemon/automount.c   |   21 +++++++++++++++++++--
 modules/cyrus-sasl.c |   47 +++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 61 insertions(+), 8 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-gssapi-segfault-exit.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 854e1f5..4345c6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 ---------------------
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
 - update default auth config to add options documenetation (Jeff Moyer).
+- workaround segfaults at exit after using GSSAPI library.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 38940c7..e0e33fe 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1208,8 +1208,6 @@ static void handle_mounts_cleanup(void *
 	/* If we have been canceled then we may hold the state mutex. */
 	mutex_operation_wait(&ap->state_mutex);
 
-	msg("shut down path %s", ap->path);
-
 	master_remove_mapent(ap->entry);
 	master_free_mapent_sources(ap->entry, 1);
 	master_free_mapent(ap->entry);
@@ -1226,6 +1224,8 @@ static void handle_mounts_cleanup(void *
 		}
 	}
 
+	msg("shut down path %s", ap->path);
+
 	return;
 }
 
@@ -1353,6 +1353,23 @@ void *handle_mounts(void *arg)
 */
 	pthread_cleanup_pop(1);
 
+	/*
+	 * A cowboy .. me!
+	 * That noise yu ear aint spuurs sonny!!
+	 *
+	 * The libkrb5support destructor called indirectly through
+	 * libgssapi_krb5 which is used bt libkrb5 (somehow) must run
+	 * to completion before the last thread using it exits so
+	 * that it's per thread data keys are deleted or we get a
+	 * little segfault at exit. So much for dlclose being
+	 * syncronous.
+	 *
+	 * So, the solution is a recipe for disaster.
+	 * Hope we don't get a really busy system!
+	 */
+	/* sleep(1); */
+	sched_yield();
+
 	return NULL;
 }
 
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index b89d749..8571001 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -72,6 +72,8 @@ #endif
  */
 static const char *krb5ccenv = "KRB5CCNAME";
 static const char *krb5ccval = "MEMORY:_autofstkt";
+static pthread_mutex_t krb5cc_mutex = PTHREAD_MUTEX_INITIALIZER;
+static unsigned int krb5cc_in_use = 0;
 
 static int sasl_log_func(void *, int, const char *);
 static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **);
@@ -378,6 +380,7 @@ sasl_do_kinit(struct lookup_context *ctx
 	krb5_principal tgs_princ, krb5_client_princ = ctxt->krb5_client_princ;
 	krb5_creds my_creds;
 	char *tgs_name;
+	int status;
 
 	if (ctxt->kinit_done)
 		return 0;
@@ -484,9 +487,20 @@ sasl_do_kinit(struct lookup_context *ctx
 		goto out_cleanup_unparse;
 	}
 
-	/* tell the cache what the default principal is */
-	ret = krb5_cc_initialize(ctxt->krb5ctxt,
+
+	status = pthread_mutex_lock(&krb5cc_mutex);
+	if (status)
+		fatal(status);
+
+	if (krb5cc_in_use++ == 0)
+		/* tell the cache what the default principal is */
+		ret = krb5_cc_initialize(ctxt->krb5ctxt,
 				 ctxt->krb5_ccache, krb5_client_princ);
+
+	status = pthread_mutex_unlock(&krb5cc_mutex);
+	if (status)
+		fatal(status);
+
 	if (ret) {
 		error(LOGOPT_ANY,
 		      "krb5_cc_initialize failed with error %d", ret);
@@ -518,11 +532,22 @@ sasl_do_kinit(struct lookup_context *ctx
 out_cleanup_unparse:
 	krb5_free_unparsed_name(ctxt->krb5ctxt, tgs_name);
 out_cleanup_cc:
-	ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
+	status = pthread_mutex_lock(&krb5cc_mutex);
+	if (status)
+		fatal(status);
+
+	if (krb5cc_in_use)
+		ret = krb5_cc_close(ctxt->krb5ctxt, ctxt->krb5_ccache);
+	else
+		ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
 	if (ret)
 		warn(LOGOPT_ANY,
 		     "krb5_cc_destroy failed with non-fatal error %d", ret);
 
+	status = pthread_mutex_unlock(&krb5cc_mutex);
+	if (status)
+		fatal(status);
+
 	krb5_free_context(ctxt->krb5ctxt);
 
 	return -1;
@@ -731,7 +756,7 @@ autofs_sasl_init(LDAP *ldap, struct look
 void
 autofs_sasl_done(struct lookup_context *ctxt)
 {
-	int ret;
+	int status, ret;
 
 	if (ctxt && ctxt->sasl_conn) {
 		sasl_dispose(&ctxt->sasl_conn);
@@ -739,13 +764,23 @@ autofs_sasl_done(struct lookup_context *
 	}
 
 	if (ctxt->kinit_successful) {
-
-		ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
+		status = pthread_mutex_lock(&krb5cc_mutex);
+		if (status)
+			fatal(status);
+
+		if (--krb5cc_in_use)
+			ret = krb5_cc_close(ctxt->krb5ctxt, ctxt->krb5_ccache);
+		else 
+			ret = krb5_cc_destroy(ctxt->krb5ctxt, ctxt->krb5_ccache);
 		if (ret)
 			warn(LOGOPT_ANY,
 			     "krb5_cc_destroy failed with non-fatal error %d",
 			     ret);
 
+		status = pthread_mutex_unlock(&krb5cc_mutex);
+		if (status)
+			fatal(status);
+
 		krb5_free_context(ctxt->krb5ctxt);
 		if (unsetenv(krb5ccenv) != 0)
 			warn(LOGOPT_ANY,


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- autofs.spec	29 Jun 2006 11:06:37 -0000	1.116
+++ autofs.spec	3 Jul 2006 05:38:26 -0000	1.117
@@ -4,13 +4,17 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
+Patch1: autofs-5.0.0_beta6-auth-kerberos-update.patch
+Patch2: autofs-5.0.0_beta6-default-auth-config.patch
+Patch3: autofs-5.0.0_beta6-gssapi-segfault-exit.patch
+Patch4: autofs-5.0.0_beta6-check-return.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -49,6 +53,10 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -105,6 +113,12 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jul 3 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-2
+- merge LDAP authentication update for GSSAPI (Jeff Moyer).
+- update default auth config to add options documenetation (Jeff Moyer).
+- workaround segfaults at exit after using GSSAPI library.
+- fix not checking return in init_ldap_connection (jeff Moyer).
+
 * Thu Jun 29 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-1
 - consolidate to beta6, including:
   - mode change update for config file.



From fedora-cvs-commits at redhat.com  Mon Jul  3 06:32:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 02:32:04 -0400
Subject: rpms/mtr/devel mtr-0.71-ipv6-resolvehostname.patch, NONE,
	1.1 mtr.spec, 1.36, 1.37
Message-ID: <200607030632.k636W4re015169@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/mtr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14624

Modified Files:
	mtr.spec 
Added Files:
	mtr-0.71-ipv6-resolvehostname.patch 
Log Message:
--- mtr-0.71/dns.c.mar  2006-07-03 07:53:28.000000000 +0200
+++ mtr-0.71/dns.c      2006-07-03 07:52:26.000000000 +0200
@@ -1357,7 +1357,7 @@
 #ifdef ENABLE_IPV6
 /* Returns an ip6.arpa character string. */
 void addr2ip6arpa( ip_t * ip, char * buf ) {
-  char * p = (char *) ip;
+  unsigned char * p = (unsigned char *) ip;
   char * b = buf;
   int i;



mtr-0.71-ipv6-resolvehostname.patch:
 dns.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mtr-0.71-ipv6-resolvehostname.patch ---
--- mtr-0.71/dns.c.mar	2006-07-03 07:53:28.000000000 +0200
+++ mtr-0.71/dns.c	2006-07-03 07:52:26.000000000 +0200
@@ -1357,7 +1357,7 @@
 #ifdef ENABLE_IPV6
 /* Returns an ip6.arpa character string. */
 void addr2ip6arpa( ip_t * ip, char * buf ) {
-  char * p = (char *) ip;
+  unsigned char * p = (unsigned char *) ip;
   char * b = buf;
   int i;
 


Index: mtr.spec
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mtr.spec	30 May 2006 08:47:56 -0000	1.36
+++ mtr.spec	3 Jul 2006 06:31:07 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.71
-Release: 2
+Release: 3
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -12,6 +12,7 @@
 Patch1:	mtr-0.69-CVE-2002-0497.patch
 Patch2:	mtr-0.69-format.patch
 Patch3: mtr-0.71-underflow.patch
+Patch4: mtr-0.71-ipv6-resolvehostname.patch 
 BuildRequires: ncurses-devel gtk2-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +38,7 @@
 %patch1 -p1 -b .CVE-2002-0497
 %patch2 -p1 -b .format
 %patch3 -p1 -b .underflow
+%patch4 -p1 -b .resolvehostname
 
 %build
 %configure --enable-gtk2
@@ -93,6 +95,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Mon Jul 3 2006 Marcela Maslanova <mmaslano at redhat.com> - 2:0.71-3
+- bugzilla #195458 ??? reverse-map bug in mtr and patch - resolving ipv6 hostname correctly
+
 * Tue May 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 2:0.71-2
 - underflow solved
 



From fedora-cvs-commits at redhat.com  Mon Jul  3 06:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 02:45:05 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#123315.patch,1.1,1.2
Message-ID: <200607030645.k636j5Ak018944@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs-3.5.3-kde#123315.patch 
Log Message:
cleanup kdelibs-3.5.3-kde#123315.patch


kdelibs-3.5.3-kde#123315.patch:
 kdirwatch.cpp |   75 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 52 insertions(+), 23 deletions(-)

Index: kdelibs-3.5.3-kde#123315.patch
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs-3.5.3-kde#123315.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.3-kde#123315.patch	29 Jun 2006 10:01:04 -0000	1.1
+++ kdelibs-3.5.3-kde#123315.patch	3 Jul 2006 06:45:02 -0000	1.2
@@ -1,7 +1,14 @@
-Index: kio/kio/kdirwatch.cpp
-===================================================================
---- kio/kio/kdirwatch.cpp	(Revision 555363)
-+++ kio/kio/kdirwatch.cpp	(Revision 555364)
+--- kio/kio/kdirwatch.cpp.kde#123315	2006-05-22 20:14:17.000000000 +0200
++++ kio/kio/kdirwatch.cpp	2006-07-03 08:40:04.000000000 +0200
+@@ -340,7 +340,7 @@
+   kdDebug(7001) << "Available methods: " << available << endl;
+ }
+ 
+-/* This should never be called, but doesn't harm */
++/* This is called on app exit (KStaticDeleter) */
+ KDirWatchPrivate::~KDirWatchPrivate()
+ {
+   timer->stop();
 @@ -407,9 +407,6 @@
        if ( event->len )
          path = QFile::decodeName( QCString( event->name, event->len ) );
@@ -22,10 +29,10 @@
 +                addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
 +              else
 +                addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
-             }
++            }
 +            if ( event->mask & IN_IGNORED ) {
 +              e->wd = 0;
-+            }
+             }
              if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
 -              kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl;
 -
@@ -44,20 +51,25 @@
      return true;
    }
  
-@@ -782,6 +785,7 @@
+@@ -782,7 +785,9 @@
         (*it).m_entries.append(sub_entry);
         kdDebug(7001) << "Added already watched Entry " << path
  		     << " (for " << sub_entry->path << ")" << endl;
 +
  #ifdef HAVE_DNOTIFY
++     {
         Entry* e = &(*it);
         if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) {
-@@ -798,6 +802,21 @@
+          int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
+@@ -797,7 +802,25 @@
+            useStat( e );
           }
         }
- #endif
++     }
++#endif
 +
 +#ifdef HAVE_INOTIFY
++     {
 +       Entry* e = &(*it);
 +       if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
 +         int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
@@ -69,12 +81,13 @@
 +         inotify_rm_watch (m_inotify_fd, e->wd);
 +         e->wd = inotify_add_watch( m_inotify_fd, QFile::encodeName( e->path ), mask);
 +       }
-+#endif
++    }
+ #endif
 + 
      }
      else {
         (*it).addClient(instance);
-@@ -928,8 +947,12 @@
+@@ -928,8 +951,12 @@
          m_inotify_fd << ", "  << e->wd <<
          ") for " << e->path << endl;
      }
@@ -89,7 +102,7 @@
    }
  #endif
  
-@@ -1167,15 +1190,6 @@
+@@ -1167,15 +1194,6 @@
        return Changed;
      }
  
@@ -105,7 +118,7 @@
      return NoChange;
    }
  
-@@ -1278,7 +1292,7 @@
+@@ -1278,7 +1296,7 @@
    // removeDir(), when called in slotDirty(), can cause a crash otherwise
    delayRemove = true;
  
@@ -114,7 +127,7 @@
    QPtrList<Entry> dList, cList;
  #endif
  
-@@ -1306,6 +1320,16 @@
+@@ -1306,6 +1324,16 @@
  
      int ev = scanEntry( &(*it) );
  
@@ -131,7 +144,7 @@
  #ifdef HAVE_DNOTIFY
      if ((*it).m_mode == DNotifyMode) {
        if ((*it).isDir && (ev == Deleted)) {
-@@ -1337,7 +1361,7 @@
+@@ -1337,7 +1365,7 @@
    }
  
  
@@ -140,7 +153,7 @@
    // Scan parent of deleted directories for new creation
    Entry* e;
    for(e=dList.first();e;e=dList.next())
-@@ -1542,7 +1566,8 @@
+@@ -1542,7 +1570,8 @@
  	kdDebug(7001) << "    dependent entries:" << endl;
  	Entry* d = e->m_entries.first();
  	for(;d; d = e->m_entries.next()) {



From fedora-cvs-commits at redhat.com  Mon Jul  3 10:55:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 06:55:19 -0400
Subject: rpms/php-pear/FC-5 pear.sh, 1.1, 1.2 pecl.sh, 1.1, 1.2 php-pear.spec,
	1.11, 1.12
Message-ID: <200607031055.k63AtJo8006417@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php-pear/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6392

Modified Files:
	pear.sh pecl.sh php-pear.spec 
Log Message:
* Mon Jul  3 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1.1
- set memory_limit=16M in /usr/bin/{pear,pecl} (#196802)



Index: pear.sh
===================================================================
RCS file: /cvs/dist/rpms/php-pear/FC-5/pear.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pear.sh	1 Dec 2005 17:12:57 -0000	1.1
+++ pear.sh	3 Jul 2006 10:55:16 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
-exec /usr/bin/php -C -d include_path=/usr/share/pear \
+exec /usr/bin/php -C -d include_path=/usr/share/pear -d memory_limit=16M \
     -d output_buffering=1 /usr/share/pear/pearcmd.php "$@"


Index: pecl.sh
===================================================================
RCS file: /cvs/dist/rpms/php-pear/FC-5/pecl.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pecl.sh	4 Dec 2005 16:12:18 -0000	1.1
+++ pecl.sh	3 Jul 2006 10:55:16 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
-exec /usr/bin/php -C -n -q -d include_path=/usr/share/pear \
+exec /usr/bin/php -C -n -q -d include_path=/usr/share/pear -d memory_limit=16M \
     -d output_buffering=1 /usr/share/pear/peclcmd.php "$@"


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/FC-5/php-pear.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-pear.spec	8 May 2006 13:34:11 -0000	1.11
+++ php-pear.spec	3 Jul 2006 10:55:16 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.9
-Release: 1
+Release: 1.1
 Epoch: 1
 License: The PHP License 3.0
 Group: System
@@ -100,6 +100,9 @@
 %doc LICENSE
 
 %changelog
+* Mon Jul  3 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1.1
+- set memory_limit=16M in /usr/bin/{pear,pecl} (#196802)
+
 * Mon May  8 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1
 - update to 1.4.9 (thanks to Remi Collet, #183359)
 - package /usr/share/pear/.pkgxml (#190252)



From fedora-cvs-commits at redhat.com  Mon Jul  3 11:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 07:23:27 -0400
Subject: rpms/openoffice.org/devel sources,1.185,1.186
Message-ID: <200607031123.k63BNRhr000554@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv541

Modified Files:
	sources 
Log Message:
add fedora release to crash reporter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- sources	27 Jun 2006 14:32:17 -0000	1.185
+++ sources	3 Jul 2006 11:23:24 -0000	1.186
@@ -8,6 +8,6 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
-ad337f9c78224e0d7ad2a17f53fd584c  openoffice.org-simple-crash_report.sh
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
 9fdd09e15efe8e356fffbec5abbc39e1  OOC680_m7.tar.bz2
+156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh



From fedora-cvs-commits at redhat.com  Mon Jul  3 11:28:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 07:28:39 -0400
Subject: rpms/ckermit/devel ckermit.spec,1.19,1.20
Message-ID: <200607031128.k63BSdvM000593@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/ckermit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv580

Modified Files:
	ckermit.spec 
Log Message:
fix requires (#195573)



Index: ckermit.spec
===================================================================
RCS file: /cvs/dist/rpms/ckermit/devel/ckermit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ckermit.spec	11 Feb 2006 02:15:59 -0000	1.19
+++ ckermit.spec	3 Jul 2006 11:28:37 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The quintessential all-purpose communications program
 Name: ckermit
 Version: 8.0.211
-Release: 4.2.1
+Release: 5%{?dist}
 License: Special (see COPYING.TXT.gz)
 Group: Applications/Communications
 Source0: ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
@@ -22,6 +22,7 @@
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: lockdev-devel >= 1.0.1-8
+Requires: lockdev >= 1.0.1-8
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gkermit
 
@@ -82,6 +83,9 @@
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Mon Jul 03 2006 Peter Vrabec <pvrabec at redhat.com> - 8.0.211-5
+- fix requires (#195573)
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Mon Jul  3 12:45:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 08:45:16 -0400
Subject: rpms/pam/devel pam-0.99.5.0-access-gai.patch, NONE, 1.1 pam.spec,
	1.120, 1.121
Message-ID: <200607031245.k63CjG8W028421@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28206

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-access-gai.patch 
Log Message:
* Mon Jul  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-2
- fixed network match in pam_access (patch by Dan Yefimov)


pam-0.99.5.0-access-gai.patch:
 pam_access.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE pam-0.99.5.0-access-gai.patch ---
Drop unnecessary AI_ADDRCONF flag. The more that not all systems have support
for it. Also fix loop looking up AF_INET address chain: chain following
expression is relocated to the right place at the end of the loop,
freeaddrinfo() call is relocated to the place right after the end of loop.
--- modules/pam_access/pam_access.c.gai	2006-02-07 10:57:36.000000000 +0300
+++ modules/pam_access/pam_access.c	2006-07-01 21:43:41.000000000 +0400
@@ -535,7 +535,7 @@
       struct addrinfo hint;
 
       memset (&hint, '\0', sizeof (hint));
-      hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+      hint.ai_flags = AI_CANONNAME;
       hint.ai_family = AF_INET;
 
       if (getaddrinfo (string, NULL, &hint, &res) != 0)
@@ -561,10 +561,10 @@
 		      freeaddrinfo (res);
 		      return YES;
 		    }
-		  runp = runp->ai_next;
 		}
-	      freeaddrinfo (res);
+	      runp = runp->ai_next;
 	    }
+	  freeaddrinfo (res);
 	}
     } else  if (isipaddr(string, NULL, NULL) == YES) {
       /* Assume network/netmask with a IP of a host.  */
@@ -576,7 +576,7 @@
       struct addrinfo hint;
 
       memset (&hint, '\0', sizeof (hint));
-      hint.ai_flags = AI_ADDRCONFIG | AI_CANONNAME;
+      hint.ai_flags = AI_CANONNAME;
       hint.ai_family = AF_UNSPEC;
 
       if (getaddrinfo (string, NULL, &hint, &res) != 0)


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- pam.spec	30 Jun 2006 10:06:09 -0000	1.120
+++ pam.spec	3 Jul 2006 12:45:13 -0000	1.121
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -33,6 +33,7 @@
 Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 Patch82: pam-0.99.3.0-tally-fail-close.patch
 Patch83: pam-0.99.4.0-succif-service.patch
+Patch84: pam-0.99.5.0-access-gai.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -94,6 +95,7 @@
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
 %patch83 -p1 -b .service
+%patch84 -p1 -b .gai
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
@@ -361,6 +363,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Mon Jul  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-2
+- fixed network match in pam_access (patch by Dan Yefimov)
+
 * Fri Jun 30 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-1
 - updated to a new upstream release
 - added service as value to be matched and list matching to



From fedora-cvs-commits at redhat.com  Mon Jul  3 13:16:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 09:16:51 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.752,1.753
Message-ID: <200607031316.k63DGphk025573@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24792

Modified Files:
	openoffice.org.spec 
Log Message:
temp test


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -r1.752 -r1.753
--- openoffice.org.spec	30 Jun 2006 09:52:23 -0000	1.752
+++ openoffice.org.spec	3 Jul 2006 13:16:48 -0000	1.753
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 4
+%define rh_rpm_release 4.1
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Mon Jul  3 13:19:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 09:19:38 -0400
Subject: rpms/pam/devel pam.spec,1.121,1.122
Message-ID: <200607031319.k63DJcke002701@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1071

Modified Files:
	pam.spec 
Log Message:
- the patch should be applied with -p0



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- pam.spec	3 Jul 2006 12:45:13 -0000	1.121
+++ pam.spec	3 Jul 2006 13:19:35 -0000	1.122
@@ -95,7 +95,7 @@
 %patch81 -p1 -b .try-first-pass
 %patch82 -p1 -b .fail-close
 %patch83 -p1 -b .service
-%patch84 -p1 -b .gai
+%patch84 -p0 -b .gai
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do



From fedora-cvs-commits at redhat.com  Mon Jul  3 13:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 09:52:01 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.753,1.754
Message-ID: <200607031352.k63Dq1AN004603@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4591

Modified Files:
	openoffice.org.spec 
Log Message:
tum te tum


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- openoffice.org.spec	3 Jul 2006 13:16:48 -0000	1.753
+++ openoffice.org.spec	3 Jul 2006 13:51:58 -0000	1.754
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 4.1
+%define rh_rpm_release 5
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -899,7 +899,7 @@
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64"
+ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
 export ARCH_FLAGS
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed



From fedora-cvs-commits at redhat.com  Mon Jul  3 13:58:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 09:58:27 -0400
Subject: rpms/ckermit/FC-5 ckermit.spec,1.19,1.20
Message-ID: <200607031358.k63DwR0c004630@cvs.devel.redhat.com>

Author: pvrabec

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

Modified Files:
	ckermit.spec 
Log Message:
fix requires (#195573)



Index: ckermit.spec
===================================================================
RCS file: /cvs/dist/rpms/ckermit/FC-5/ckermit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ckermit.spec	11 Feb 2006 02:15:59 -0000	1.19
+++ ckermit.spec	3 Jul 2006 13:58:25 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The quintessential all-purpose communications program
 Name: ckermit
 Version: 8.0.211
-Release: 4.2.1
+Release: 5%{?dist}
 License: Special (see COPYING.TXT.gz)
 Group: Applications/Communications
 Source0: ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
@@ -22,6 +22,7 @@
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: lockdev-devel >= 1.0.1-8
+Requires: lockdev >= 1.0.1-8
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gkermit
 
@@ -82,6 +83,9 @@
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Mon Jul 03 2006 Peter Vrabec <pvrabec at redhat.com> - 8.0.211-5
+- fix requires (#195573)
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Mon Jul  3 14:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 10:42:45 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.78, 1.79 sources,
	1.81, 1.82 system-config-printer.spec, 1.42, 1.43
Message-ID: <200607031442.k63Egjs9007002@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Mon Jul  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.20-1
- 0.7.20.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	30 Jun 2006 17:40:56 -0000	1.78
+++ .cvsignore	3 Jul 2006 14:42:43 -0000	1.79
@@ -58,3 +58,4 @@
 system-config-printer-0.7.17.tar.bz2
 system-config-printer-0.7.18.tar.bz2
 system-config-printer-0.7.19.tar.bz2
+system-config-printer-0.7.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources	30 Jun 2006 17:40:56 -0000	1.81
+++ sources	3 Jul 2006 14:42:43 -0000	1.82
@@ -1,2 +1,2 @@
 c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
-cf0d2ec15a3367fa09f65d910ae8a545  system-config-printer-0.7.19.tar.bz2
+f22ba9b8a5e6657681c49966baa05125  system-config-printer-0.7.20.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-printer.spec	30 Jun 2006 17:40:56 -0000	1.42
+++ system-config-printer.spec	3 Jul 2006 14:42:43 -0000	1.43
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.19
+Version: 0.7.20
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Mon Jul  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.20-1
+- 0.7.20.
+
 * Fri Jun 30 2006 Tim Waugh <twaugh at redhat.com> 0.7.19-1
 - 0.7.19.
 - Remove foomatic pickle file post-install.



From fedora-cvs-commits at redhat.com  Mon Jul  3 14:50:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 10:50:08 -0400
Subject: rpms/libtool/devel libtool-1.5.22-anygcc.patch, NONE,
	1.1 libtool.spec, 1.42, 1.43
Message-ID: <200607031450.k63Eo7SD023984@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23954

Modified Files:
	libtool.spec 
Added Files:
	libtool-1.5.22-anygcc.patch 
Log Message:
- detect gcc path at runtime instead of requiring one specific version

libtool-1.5.22-anygcc.patch:
 libtool.m4 |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE libtool-1.5.22-anygcc.patch ---
--- libtool-1.5.22/libtool.m4.anygcc	2005-12-18 22:53:17.000000000 +0100
+++ libtool-1.5.22/libtool.m4	2006-06-29 14:20:18.000000000 +0200
@@ -4294,6 +4294,9 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP
 
@@ -4427,11 +4430,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -4443,7 +4446,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4523,7 +4526,7 @@
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libtool.spec	29 Jun 2006 10:24:03 -0000	1.42
+++ libtool.spec	3 Jul 2006 14:50:05 -0000	1.43
@@ -1,10 +1,9 @@
 %define upstream_version 1.5.22
-%define gcc_version %(gcc -dumpversion)
 
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:  	5
+Release:  	6
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -15,13 +14,14 @@
 # Remove in libtool-1.5.23:
 Patch2:		libtool-1.5.22-misc.patch
 
+Patch3:		libtool-1.5.22-anygcc.patch
+
 PreReq:		/sbin/install-info
 BuildRequires:	autoconf >= 2.59, automake >= 1.9.2, texinfo
 # make sure we can configure all supported langs
 BuildRequires:	gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java
 # /usr/bin/libtool includes paths within gcc's versioned directories
 # Libtool must be rebuilt whenever a new upstream gcc is built
-Requires:	gcc = %{gcc_version}
 Requires:	autoconf >= 2.50, automake >= 1.4
 
 %description
@@ -77,6 +77,7 @@
 %setup -n libtool-%{upstream_version} -q
 %patch1 -p1 -b .multilib
 %patch2 -p1
+%patch3 -p1 -b .anygcc
 
 %build
 
@@ -146,6 +147,9 @@
 
 
 %changelog
+* Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-6
+- detect gcc path at runtime instead of requiring one specific version
+
 * Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-5
 - miscellaneous upstream fixes
 



From fedora-cvs-commits at redhat.com  Mon Jul  3 14:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 10:57:08 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.7, 1.8 libvirt.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200607031457.k63Ev8Pv026167@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26133

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.1.2 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Jun 2006 12:41:13 -0000	1.7
+++ .cvsignore	3 Jul 2006 14:57:05 -0000	1.8
@@ -3,4 +3,5 @@
 libvirt-0.0.5.tar.gz
 libvirt-0.0.6.tar.gz
 libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
 libvirt-0.1.1.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libvirt.spec	21 Jun 2006 12:41:13 -0000	1.8
+++ libvirt.spec	3 Jul 2006 14:57:05 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.1
+Version: 0.1.2
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -14,7 +14,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 Obsoletes: libvir
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ia64
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -75,6 +75,7 @@
 %doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
+%{_libexecdir}/libvirt_proxy
 
 %files devel
 %defattr(-, root, root)
@@ -103,6 +104,10 @@
 %doc docs/examples/python
 
 %changelog
+* Mon Jul  3 2006 Daniel Veillard <veillard at redhat.com> 0.1.2-1
+- added a proxy mechanism for read only access using httpu
+- fixed header includes paths
+
 * Wed Jun 21 2006 Daniel Veillard <veillard at redhat.com> 0.1.1-1
 - extend and cleanup the driver infrastructure and code
 - python examples


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Jun 2006 12:41:13 -0000	1.7
+++ sources	3 Jul 2006 14:57:05 -0000	1.8
@@ -1 +1 @@
-f5a86d6666ee783510c4896a7337ca9f  libvirt-0.1.1.tar.gz
+bc21aa037148ca48ed4180f63959d760  libvirt-0.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul  3 15:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 11:05:24 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.9,1.10
Message-ID: <200607031505.k63F5OsX028318@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28266

Modified Files:
	libvirt.spec 
Log Message:
Xen not ready on ia64, daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libvirt.spec	3 Jul 2006 14:57:05 -0000	1.9
+++ libvirt.spec	3 Jul 2006 15:05:21 -0000	1.10
@@ -14,7 +14,7 @@
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 Obsoletes: libvir
-ExclusiveArch: i386 x86_64 ia64
+ExclusiveArch: i386 x86_64
 
 %description
 This C library provides an API to use the Xen virtualization framework,



From fedora-cvs-commits at redhat.com  Mon Jul  3 15:20:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 11:20:14 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.10,1.11
Message-ID: <200607031520.k63FKEN6014570@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14372

Modified Files:
	libvirt.spec 
Log Message:
trying to work around bad timestamp in tarball, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libvirt.spec	3 Jul 2006 15:05:21 -0000	1.10
+++ libvirt.spec	3 Jul 2006 15:20:11 -0000	1.11
@@ -46,6 +46,7 @@
 %setup -q
 
 %build
+touch `find .`
 %configure
 make
 



From fedora-cvs-commits at redhat.com  Mon Jul  3 16:33:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 12:33:12 -0400
Subject: rpms/libvirt/devel chown.patch,NONE,1.1 libvirt.spec,1.11,1.12
Message-ID: <200607031633.k63GXCuE008712@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8700

Modified Files:
	libvirt.spec 
Added Files:
	chown.patch 
Log Message:
Work around the build problem with chown, Daniel


chown.patch:
 Makefile.am |    1 -
 Makefile.in |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE chown.patch ---
*** libvirt/proxy/Makefile.am.orig	2006-07-03 18:28:58.000000000 +0200
--- libvirt/proxy/Makefile.am	2006-07-03 18:29:23.000000000 +0200
***************
*** 16,20 ****
  libvirt_proxy_LDADD =
  
  install-exec-hook:
- 	chown root:root $(DESTDIR)$(libexecdir)/libvirt_proxy
  	chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy
--- 16,19 ----
*** libvirt/proxy/Makefile.in.orig	2006-07-03 18:29:07.000000000 +0200
--- libvirt/proxy/Makefile.in	2006-07-03 18:29:31.000000000 +0200
***************
*** 544,550 ****
  
  
  install-exec-hook:
- 	chown root:root $(DESTDIR)$(libexecdir)/libvirt_proxy
  	chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
--- 544,549 ----


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libvirt.spec	3 Jul 2006 15:20:11 -0000	1.11
+++ libvirt.spec	3 Jul 2006 16:33:09 -0000	1.12
@@ -15,6 +15,7 @@
 BuildRequires: readline-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
+Patch0: chown.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 touch `find .`
@@ -76,7 +78,7 @@
 %doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
-%{_libexecdir}/libvirt_proxy
+%attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 
 %files devel
 %defattr(-, root, root)



From fedora-cvs-commits at redhat.com  Mon Jul  3 23:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 19:44:09 -0400
Subject: rpms/evolution-sharp/FC-5 evolution-sharp-evo26.patch, 1.3,
	1.4 evolution-sharp.spec, 1.18, 1.19
Message-ID: <200607032344.k63Ni9D9025768@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-sharp-evo26.patch evolution-sharp.spec 
Log Message:
- Bump ECAL_SOVERSION from 3 to 6 (RH #195759).


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

Index: evolution-sharp-evo26.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp-evo26.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-sharp-evo26.patch	1 Feb 2006 05:45:21 -0000	1.3
+++ evolution-sharp-evo26.patch	3 Jul 2006 23:44:06 -0000	1.4
@@ -1,14 +1,17 @@
---- evolution-sharp-0.10.2/configure.in-	2005-09-12 16:55:58.000000000 -0400
-+++ evolution-sharp-0.10.2/configure.in	2005-10-29 15:10:16.000000000 -0400
-@@ -15,7 +15,7 @@
+--- evolution-sharp-0.10.2/configure.in.evo26	2005-09-12 16:55:58.000000000 -0400
++++ evolution-sharp-0.10.2/configure.in	2006-07-03 19:37:51.000000000 -0400
+@@ -15,9 +15,9 @@
  PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds13=yes, eds13=no)
  if test "x$eds13" = "xyes"; then
  	EDS_VERSION=-1.2
 -	EDS_SOVERSION=4
 +	EDS_SOVERSION=7
  	EBOOK_SOVERSION=5
- 	ECAL_SOVERSION=3
+-	ECAL_SOVERSION=3
++	ECAL_SOVERSION=6
  else
+ 	PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0, eds12=yes, eds12=no)
+ 
 @@ -107,7 +107,7 @@
  AC_MSG_RESULT($IDL_INCLUDES)
  AC_SUBST(IDL_INCLUDES)


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/FC-5/evolution-sharp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- evolution-sharp.spec	15 Jun 2006 22:48:07 -0000	1.18
+++ evolution-sharp.spec	3 Jul 2006 23:44:06 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        9.4
+Release:        9.5
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Mon Jul  3 2006 Matthew Barnes <mbarnes at redhat.com> - 0.10.2-9.5
+- Bump ECAL_SOVERSION from 3 to 6 (RH #195759).
+
 * Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> 0.10.2-9.4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 02:31:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 22:31:21 -0400
Subject: rpms/autofs/devel autofs.spec,1.117,1.118
Message-ID: <200607040231.k642VLuX025413@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Log Message:
* Tue Jul 4 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-3
- correct test for existence of auth config file.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- autofs.spec	3 Jul 2006 05:38:26 -0000	1.117
+++ autofs.spec	4 Jul 2006 02:31:18 -0000	1.118
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -15,6 +15,7 @@
 Patch2: autofs-5.0.0_beta6-default-auth-config.patch
 Patch3: autofs-5.0.0_beta6-gssapi-segfault-exit.patch
 Patch4: autofs-5.0.0_beta6-check-return.patch
+Patch5: autofs-5.0.0_beta6-auth-config-exits.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -57,6 +58,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -113,6 +115,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jul 4 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-3
+- correct test for existence of auth config file.
+
 * Mon Jul 3 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-2
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
 - update default auth config to add options documenetation (Jeff Moyer).



From fedora-cvs-commits at redhat.com  Tue Jul  4 02:36:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 22:36:27 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-auth-config-exits.patch, NONE,
	1.1
Message-ID: <200607040236.k642aRZp025651@cvs.devel.redhat.com>

Author: ikent

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

Added Files:
	autofs-5.0.0_beta6-auth-config-exits.patch 
Log Message:
- add patch refered to in last commit (oops).


autofs-5.0.0_beta6-auth-config-exits.patch:
 CHANGELOG             |    2 ++
 modules/lookup_ldap.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta6-auth-config-exits.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 58c8bbc..5139d78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,8 @@
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
 - update default auth config to add options documenetation (Jeff Moyer).
 - workaround segfaults at exit after using GSSAPI library.
-- fix not checking return in init_ldap_connection (jeff Moyer).
+- fix not checking return in init_ldap_connection (Jeff Moyer).
+- correct test for existence of auth config file.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 003b836..effa038 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -285,7 +285,7 @@ int parse_ldap_config(struct lookup_cont
 	memset(&st, 0, sizeof(st));
 	if (stat(auth_conf, &st) == -1 || st.st_size == 0) {
 		/* Auth config doesn't exist so disable TLS and auth */
-		if (errno == EEXIST) {
+		if (errno == ENOENT) {
 			ctxt->auth_conf = auth_conf;
 			ctxt->use_tls = LDAP_TLS_DONT_USE;
 			ctxt->tls_required = LDAP_TLS_DONT_USE;



From fedora-cvs-commits at redhat.com  Tue Jul  4 03:10:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 23:10:51 -0400
Subject: rpms/cairo/devel .cvsignore, 1.16, 1.17 cairo.spec, 1.51,
	1.52 sources, 1.16, 1.17
Message-ID: <200607040310.k643Apsp026922@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26810

Modified Files:
	.cvsignore cairo.spec sources 
Log Message:
1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	16 Jun 2006 17:37:20 -0000	1.16
+++ .cvsignore	4 Jul 2006 03:10:48 -0000	1.17
@@ -1 +1 @@
-cairo-1.1.10.tar.gz
+cairo-1.2.0.tar.gz


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cairo.spec	16 Jun 2006 17:37:20 -0000	1.51
+++ cairo.spec	4 Jul 2006 03:10:48 -0000	1.52
@@ -3,7 +3,7 @@
 
 Summary:   A vector graphics library
 Name:      cairo
-Version:   1.1.10
+Version:   1.2.0
 Release:   1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Mon Jul  3 2006 Matthias Clasen <mclasen at redhat.com> 1.2.0-1
+- Update to 1.2.0
+
 * Fri Jun 16 2006 Carl Worth <cworth at redhat.com> 1.1.10-1
 - Update to 1.1.10 (fixes crash on 16-bit X servers like Xvnc)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	16 Jun 2006 17:37:20 -0000	1.16
+++ sources	4 Jul 2006 03:10:48 -0000	1.17
@@ -1 +1 @@
-eea93bf15a660a772649eec3fbf51ca5  cairo-1.1.10.tar.gz
+5c9ad71d1b582907eee0497b196689ef  cairo-1.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul  4 03:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 3 Jul 2006 23:53:07 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.56, 1.57 gtk2.spec, 1.159,
	1.160 sources, 1.60, 1.61
Message-ID: <200607040353.k643r7Ac005626@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	22 Jun 2006 03:15:44 -0000	1.56
+++ .cvsignore	4 Jul 2006 03:53:05 -0000	1.57
@@ -39,3 +39,4 @@
 gtk+-2.9.2.tar.bz2
 gtk+-2.9.3.tar.bz2
 gtk+-2.9.4.tar.bz2
+gtk+-2.10.0.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gtk2.spec	22 Jun 2006 03:16:25 -0000	1.159
+++ gtk2.spec	4 Jul 2006 03:53:05 -0000	1.160
@@ -1,16 +1,16 @@
 # Note that this is NOT a relocatable package
 
-%define glib2_base_version 2.11.0
+%define glib2_base_version 2.12.0
 %define glib2_version %{glib2_base_version}-1
 %define pango_base_version 1.13.0
 %define pango_version %{pango_base_version}-1
-%define atk_base_version 1.6.0
+%define atk_base_version 1.9.0
 %define atk_version %{atk_base_version}-1
-%define cairo_base_version 1.1.8
+%define cairo_base_version 1.2.0
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.9.4
+%define base_version 2.10.0
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -274,6 +274,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jul  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1
+- Update to 2.10.0
+
 * Wed Jun 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.4-1
 - Update to 2.9.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	22 Jun 2006 03:15:44 -0000	1.60
+++ sources	4 Jul 2006 03:53:05 -0000	1.61
@@ -1,2 +1,3 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
 c06cf2cfa66485600d90789c9e58f27c  gtk+-2.9.4.tar.bz2
+37cdf73719e8b2af6b0d065df6236542  gtk+-2.10.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul  4 04:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 00:46:13 -0400
Subject: rpms/gtk2/devel sources,1.61,1.62
Message-ID: <200607040446.k644kDlO029939@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	sources 
Log Message:
2.10.0



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	4 Jul 2006 03:53:05 -0000	1.61
+++ sources	4 Jul 2006 04:46:08 -0000	1.62
@@ -1,3 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-c06cf2cfa66485600d90789c9e58f27c  gtk+-2.9.4.tar.bz2
 37cdf73719e8b2af6b0d065df6236542  gtk+-2.10.0.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul  4 05:12:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 01:12:43 -0400
Subject: rpms/paps/devel paps-0.6.6-cpilpi.patch, NONE,
	1.1 paps-0.6.6-wordwrap.patch, 1.1, 1.2 paps-cups.patch, 1.2,
	1.3 paps.spec, 1.7, 1.8
Message-ID: <200607040512.k645ChnN019552@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19507

Modified Files:
	paps-0.6.6-wordwrap.patch paps-cups.patch paps.spec 
Added Files:
	paps-0.6.6-cpilpi.patch 
Log Message:
* Tue Jul  4 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-10
- paps-0.6.6-cpilpi.patch: add --cpi and --lpi option to support the characters
  per inch and the lines per inch.
- paps-cups.patch: add cpi and lpi support.

paps-0.6.6-cpilpi.patch:
 libpaps.c      |   65 +++++++++++++++++-----
 libpaps.h      |   17 +++++
 paps.c         |  166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 test_libpaps.c |    2 
 4 files changed, 230 insertions(+), 20 deletions(-)

--- NEW FILE paps-0.6.6-cpilpi.patch ---
diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/libpaps.c paps-0.6.6/src/libpaps.c
--- paps-0.6.6.orig/src/libpaps.c	2006-04-27 04:09:03.000000000 +0900
+++ paps-0.6.6/src/libpaps.c	2006-07-03 21:37:01.000000000 +0900
@@ -56,12 +56,16 @@
 
 
 // Forward declarations
-static void add_postscript_prologue(GString *ps_string);
+static void add_postscript_prologue(GString *ps_string,
+				    gdouble  scale_x,
+				    gdouble  scale_y);
 static gchar *get_next_char_id_strdup(paps_private_t *paps);
 static void add_line_to_postscript(paps_private_t *paps,
 				   GString *line_str,
 				   double x_pos,
 				   double y_pos,
+				   double scale_x,
+				   double scale_y,
 				   PangoLayoutLine *line);
 
 paps_t *paps_new()
@@ -77,11 +81,21 @@
     paps->last_pos_y = -1e67;
     paps->last_char_idx = 0;
 
-    add_postscript_prologue(paps->header);
+    add_postscript_prologue(paps->header, 1.0, 1.0);
 
     return paps;
 }
 
+void
+paps_set_scale(paps_t  *paps_,
+	       gdouble  scale_x,
+	       gdouble  scale_y)
+{
+	paps_private_t *paps = (paps_private_t *)paps_;
+	g_string_erase(paps->header, 0, -1);
+	add_postscript_prologue(paps->header, scale_x, scale_y);
+}
+
 PangoContext *paps_get_pango_context()
 {
   return pango_ft2_get_context (PAPS_DPI, PAPS_DPI);
@@ -124,14 +138,18 @@
 			 GString *line_str,
 			 PangoLayoutLine *pango_line,
 			 double line_start_pos_x,
-			 double line_start_pos_y
+			 double line_start_pos_y,
+			 double scale_x,
+			 double scale_y
 			 );
 void draw_bezier_outline(paps_private_t *paps,
 			 GString *layout_str,
                          FT_Face face,
                          PangoGlyphInfo *glyph_info,
                          double pos_x,
-                         double pos_y
+                         double pos_y,
+			 double scale_x,
+			 double scale_y
                          );
 /* Countour traveling functions */
 static int paps_ps_move_to( FT_Vector* to,
@@ -166,6 +184,8 @@
 gchar *paps_layout_to_postscript_strdup(paps_t *paps_,
 					double pos_x,
 					double pos_y,
+					double scale_x,
+					double scale_y,
 					PangoLayout *layout)
 {
   paps_private_t *paps = (paps_private_t*)paps_;
@@ -189,6 +209,8 @@
 			     layout_str,
 			     pos_x,
 			     pos_y,
+			     scale_x,
+			     scale_y,
 			     pango_line);
 
       pos_y -= logical_rect.height * scale;
@@ -203,6 +225,8 @@
 gchar *paps_layout_line_to_postscript_strdup(paps_t *paps_,
 					     double pos_x,
 					     double pos_y,
+					     double scale_x,
+					     double scale_y,
 					     PangoLayoutLine *layout_line)
 {
   paps_private_t *paps = (paps_private_t*)paps_;
@@ -213,6 +237,8 @@
 			 layout_str,
 			 pos_x,
 			 pos_y,
+			 scale_x,
+			 scale_y,
 			 layout_line);
 
   ret_str = layout_str->str;
@@ -221,7 +247,9 @@
   return ret_str;
 }
 
-void add_postscript_prologue(GString *ps_string)
+void add_postscript_prologue(GString *ps_string,
+			     gdouble  scale_x,
+			     gdouble  scale_y)
 {
   g_string_append_printf(ps_string,
 			 "%%%%BeginProlog\n"
@@ -249,7 +277,7 @@
 			 "/start_ol { gsave } bind def\n"
 			 "/end_ol { closepath fill grestore } bind def\n"
 			 /* Specify both x and y. */
-			 "/draw_char { fontdict begin gsave %f dup scale last_x last_y translate load exec end grestore} def\n"
+			 "/draw_char { fontdict begin gsave %f dup scale last_x last_y translate %f %f scale load exec end grestore} def\n"
 			 "/goto_xy { fontdict begin /last_y exch def /last_x exch def end } def\n"
 			 "/goto_x { fontdict begin /last_x exch def end } def\n"
 			 "/fwd_x { fontdict begin /last_x exch last_x add def end } def\n"
@@ -261,7 +289,8 @@
 			 // The scaling is a combination of the scaling due
 			 // to the dpi and the difference in the coordinate
 			 // systems of postscript and freetype2.
-			 1.0 / PAPS_DPI
+			 1.0 / PAPS_DPI,
+			 scale_x, scale_y
 			 );
 
   // The following is a dispatcher for an encoded string that contains
@@ -331,6 +360,8 @@
 		       GString *line_str,
 		       double x_pos,
 		       double y_pos,
+		       double scale_x,
+		       double scale_y,
 		       PangoLayoutLine *line)
 {
   PangoRectangle ink_rect, logical_rect;
@@ -349,7 +380,7 @@
   }
 #endif
 
-  draw_contour(paps, line_str, line, x_pos, y_pos);
+  draw_contour(paps, line_str, line, x_pos, y_pos, scale_x, scale_y);
 }
 
 /* draw_contour() draws all of the contours that make up a line.
@@ -359,7 +390,9 @@
 			 GString *layout_str,
 			 PangoLayoutLine *pango_line,
 			 double line_start_pos_x,
-			 double line_start_pos_y
+			 double line_start_pos_y,
+			 double scale_x,
+			 double scale_y
 			 )
 {
   GSList *runs_list;
@@ -389,7 +422,7 @@
           glyph_pos_x = x_pos + 1.0*geometry.x_offset * scale;
           glyph_pos_y = line_start_pos_y - 1.0*geometry.y_offset * scale;
 
-	  x_pos += geometry.width * scale;
+	  x_pos += geometry.width * scale * scale_x;
 
           if (glyphs->glyphs[glyph_idx].glyph == PANGO_GLYPH_EMPTY)
             continue;
@@ -399,7 +432,9 @@
 			      ft_face,
 			      &glyphs->glyphs[glyph_idx],
 			      glyph_pos_x,
-			      glyph_pos_y
+			      glyph_pos_y,
+			      scale_x,
+			      scale_y
 			      );
         }
 
@@ -415,13 +450,15 @@
                          FT_Face face,
                          PangoGlyphInfo *glyph_info,
                          double pos_x,
-                         double pos_y
+                         double pos_y,
+			 double scale_x,
+			 double scale_y
                          )
 {
   static gchar glyph_hash_string[100];
   double scale = 72.0 / PANGO_SCALE  / PAPS_DPI;
   double epsilon = 1e-2;
-  double glyph_width = glyph_info->geometry.width * scale;
+  double glyph_width = glyph_info->geometry.width * scale * scale_x;
   gchar *id = NULL;
 
   /* Output outline */
@@ -480,7 +517,7 @@
           g_string_append_printf(glyph_def_string,
                                  "%.0f fwd_x\n"
                                  "end_ol\n",
-                                 glyph_info->geometry.width * scale * PAPS_DPI
+                                 glyph_info->geometry.width * scale * scale_x * PAPS_DPI
                                  );
           
           // TBD - Check if the glyph_def_string is empty. If so, set the
diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/libpaps.h paps-0.6.6/src/libpaps.h
--- paps-0.6.6.orig/src/libpaps.h	2005-12-21 04:35:39.000000000 +0900
+++ paps-0.6.6/src/libpaps.h	2006-07-03 20:17:13.000000000 +0900
@@ -40,6 +40,19 @@
  */
 void paps_free(paps_t *paps);
 
+/**
+ * Set the scales for characters.
+ *
+ * @param paps Paps object
+ * @param scale_x x-coordinate scale
+ * @param scale_y y-coordinate scale
+ *
+ */
+void
+paps_set_scale(paps_t  *paps,
+	       gdouble  scale_x,
+	       gdouble  scale_y);
+
 /** 
  * libpaps may currently be used only with a PangoContext that it
  * is creating. The context returned may of course be changed though
@@ -78,6 +91,8 @@
 gchar *paps_layout_to_postscript_strdup(paps_t *paps,
 					double pos_x,
 					double pos_y,
+					double scale_x,
+					double scale_y,
 					PangoLayout *layout);
 /** 
  * Create postscript related to a single PangoLayout line at position
@@ -95,6 +110,8 @@
 gchar *paps_layout_line_to_postscript_strdup(paps_t *paps_,
 					     double pos_x,
 					     double pos_y,
+					     double scale_x,
+					     double scale_y,
 					     PangoLayoutLine *layout_line);
 
 /** 
diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
--- paps-0.6.6.orig/src/paps.c	2006-07-04 12:25:33.000000000 +0900
+++ paps-0.6.6/src/paps.c	2006-07-04 13:11:32.000000000 +0900
@@ -22,6 +22,7 @@
 
 
 #include <pango/pango.h>
+#include <pango/pangoft2.h>
 #include "libpaps.h"
 #include <errno.h>
 #include <stdlib.h>
@@ -29,6 +30,7 @@
 #include <string.h>
 #include <time.h>
 #include <locale.h>
+#include <wchar.h>
 
 #define BUFSIZE 1024
 #define DEFAULT_FONT_FAMILY	"Monospace"
@@ -71,6 +73,8 @@
   int header_sep;
   int header_height;
   int footer_height;
+  gdouble scale_x;
+  gdouble scale_y;
   gboolean do_draw_header;
   gboolean do_draw_footer;
   gboolean do_duplex;
@@ -110,7 +114,8 @@
 };
 
 /* Information passed in user data when drawing outlines */
-GList        *split_paragraphs_into_lines  (GList           *paragraphs);
+GList        *split_paragraphs_into_lines  (page_layout_t   *page_layout,
+					    GList           *paragraphs);
 static char  *read_file                    (FILE            *file,
                                             GIConv           handle);
 static GList *split_text_into_paragraphs   (PangoContext    *pango_context,
@@ -136,6 +141,8 @@
 static void   draw_line_to_page            (FILE            *OUT,
                                             int              column_idx,
                                             int              column_pos,
+					    gdouble          scale_x,
+					    gdouble          scale_y,
                                             page_layout_t   *page_layout,
                                             PangoLayoutLine *line);
 static int    draw_page_header_line_to_page(FILE            *OUT,
@@ -158,6 +165,7 @@
 double last_pos_x = -1;
 paps_t *paps;
 paper_type_t paper_type = PAPER_TYPE_A4;
+gdouble lpi = 0.0L, cpi = 0.0L;
 
 #define CASE(s) if (strcmp(S_, s) == 0)
 
@@ -190,6 +198,60 @@
   return retval;
 }
 
+static gboolean
+_paps_arg_lpi_cb(const gchar *option_name,
+		 const gchar *value,
+		 gpointer     data)
+{
+  gboolean retval = TRUE;
+  gchar *p = NULL;
+
+  if (value && *value)
+    {
+      errno = 0;
+      lpi = g_strtod(value, &p);
+      if ((p && *p) || errno == ERANGE)
+        {
+          fprintf(stderr, "given LPI value was invalid.\n");
+          retval = FALSE;
+        }
+    }
+  else
+    {
+      fprintf(stderr, "You must specify the amount of lines per inch.\n");
+      retval = FALSE;
+    }
+
+  return retval;
+}
+
+static gboolean
+_paps_arg_cpi_cb(const gchar *option_name,
+		 const gchar *value,
+		 gpointer     data)
+{
+  gboolean retval = TRUE;
+  gchar *p = NULL;
+
+  if (value && *value)
+    {
+      errno = 0;
+      cpi = g_strtod(value, &p);
+      if ((p && *p) || errno == ERANGE)
+        {
+          fprintf(stderr, "given CPI value was invalid.\n");
+          retval = FALSE;
+        }
+    }
+  else
+    {
+      fprintf(stderr, "You must specify the amount of characters per inch.\n");
+      retval = FALSE;
+    }
+
+  return retval;
+}
+
 static PangoLanguage *
 get_language(void)
 {
@@ -233,6 +295,8 @@
     {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"},
     {"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL},
     {"encoding", 0, 0, G_OPTION_ARG_STRING, &encoding, "Assume the documentation encoding.", "ENCODING"},
+    {"lpi", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_lpi_cb, "Set the amount of lines per inch.", "REAL"},
+    {"cpi", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_cpi_cb, "Set the amount of characters per inch.", "REAL"},
     {NULL}
   };
   GError *error = NULL;
@@ -243,6 +307,9 @@
   PangoContext *pango_context;
   PangoFontDescription *font_description;
   PangoDirection pango_dir = PANGO_DIRECTION_LTR;
+  PangoFontMap *fontmap;
+  PangoFontset *fontset;
+  PangoFontMetrics *metrics;
   int num_pages = 1;
   int gutter_width = 40;
   int total_gutter_width;
@@ -254,6 +321,7 @@
   gchar *header_font_desc = MAKE_FONT_NAME (HEADER_FONT_FAMILY, HEADER_FONT_SCALE);
   gchar *filename_in, *title, *text;
   int header_sep = 20;
+  int max_width = 0, w;
   GIConv cvh = NULL;
 
   /* Prerequisite when using glib. */
@@ -343,6 +411,8 @@
   page_layout.header_height = 0;
   page_layout.footer_height = 0;
   page_layout.do_wordwrap = do_wordwrap;
+  page_layout.scale_x = 1.0L;
+  page_layout.scale_y = 1.0L;
   if (do_draw_header)
     page_layout.header_sep =  header_sep;
   else
@@ -365,7 +435,22 @@
   page_layout.pango_dir = pango_dir;
   page_layout.filename = filename_in;
   page_layout.header_font_desc = header_font_desc;
-  
+
+  /* calculate x-coordinate scale */
+  if (cpi > 0.0L)
+    {
+      fontmap = pango_ft2_font_map_new ();
+      fontset = pango_font_map_load_fontset (fontmap, pango_context, font_description, get_language ());
+      metrics = pango_fontset_get_metrics (fontset);
+      max_width = pango_font_metrics_get_approximate_char_width (metrics);
+      w = pango_font_metrics_get_approximate_digit_width (metrics);
+      if (w > max_width)
+	  max_width = w;
+      page_layout.scale_x = 1 / cpi * 72.0 * PANGO_SCALE / max_width;
+      pango_font_metrics_unref (metrics);
+      g_object_unref (G_OBJECT (fontmap));
+    }
+
   if (encoding != NULL)
     {
       cvh = g_iconv_open ("UTF-8", encoding);
@@ -385,11 +470,12 @@
                                           &page_layout,
                                           page_layout.column_width * page_layout.pt_to_pixel,
                                           text);
-  pango_lines = split_paragraphs_into_lines(paragraphs);
+  pango_lines = split_paragraphs_into_lines(&page_layout, paragraphs);
   
   if (OUT == NULL)
     OUT = stdout;
 
+  paps_set_scale(paps, page_layout.scale_x, page_layout.scale_y);
   print_postscript_header(OUT, title, &page_layout);
   ps_pages_string = g_string_new("");
   
@@ -493,6 +579,58 @@
           para->text = last_para;
           para->length = p - last_para;
           para->layout = pango_layout_new (pango_context);
+
+	  if (cpi > 0.0L && page_layout->do_wordwrap)
+	    {
+	      PangoRectangle ink_rect, logical_rect;
+	      wchar_t *wtext, *wnewtext;
+	      gchar *newtext;
+	      size_t i, len, wwidth = 0, n;
+
+	      wtext = (wchar_t *)g_utf8_to_ucs4 (para->text, para->length, NULL, NULL, NULL);
+	      if (wtext == NULL)
+	        {
+		  fprintf (stderr, "Failed to convert UTF-8 to UCS-4.\n");
+		  return NULL;
+		}
+
+	      len = wcswidth (wtext);
+	      /* the amount of characters to be able to put on the line against CPI */
+	      n = page_layout->column_width / 72.0 * cpi;
+	      if (len > n)
+	        {
+		  wnewtext = g_new (wchar_t, wcslen (wtext) + 1);
+		  if (wnewtext == NULL)
+		    {
+		      fprintf (stderr, "Failed to allocate a memory.\n");
+		      g_free (wtext);
+		      return NULL;
+		    }
+		  for (i = 0; i < len; i++)
+		    {
+		      wwidth += wcwidth (wtext[i]);
+		      if (wwidth > n)
+			  break;
+		      wnewtext[i] = wtext[i];
+		    }
+		  wnewtext[i] = 0L;
+
+		  newtext = g_ucs4_to_utf8 ((const gunichar *)wnewtext, i, NULL, NULL, NULL);
+		  if (newtext == NULL)
+		    {
+		      fprintf (stderr, "Failed to convert UCS-4 to UTF-8.\n");
+		      return NULL;
+		    }
+
+		  pango_layout_set_text (para->layout, newtext, -1);
+		  pango_layout_get_extents (para->layout, &ink_rect, &logical_rect);
+		  /* update paint_width to wrap_against CPI */
+		  paint_width = logical_rect.width / PANGO_SCALE;
+		  g_free (newtext);
+		  g_free (wnewtext);
+		}
+	      g_free (wtext);
+	    }
           pango_layout_set_text (para->layout, para->text, para->length);
           pango_layout_set_justify (para->layout, page_layout->do_justify);
           pango_layout_set_alignment (para->layout,
@@ -523,9 +661,11 @@
 /* Split a list of paragraphs into a list of lines.
  */
 GList *
-split_paragraphs_into_lines(GList *paragraphs)
+split_paragraphs_into_lines(page_layout_t *page_layout,
+			    GList         *paragraphs)
 {
   GList *line_list = NULL;
+  int max_height = 0;
   /* Read the file */
 
   /* Now split all the pagraphs into lines */
@@ -554,10 +694,14 @@
               line_link->formfeed = 1;
           line_link->ink_rect = ink_rect;
           line_list = g_list_prepend(line_list, line_link);
+	  if (logical_rect.height > max_height)
+	      max_height = logical_rect.height;
         }
 
       par_list = par_list->next;
     }
+  if (lpi > 0.0L)
+      page_layout->scale_y = 1 / lpi * 72.0 * page_layout->pt_to_pixel * PANGO_SCALE / max_height;
 
   return g_list_reverse(line_list);
   
@@ -612,9 +756,14 @@
       draw_line_to_page(OUT,
                         column_idx,
                         column_y_pos+line_link->logical_rect.height,
+			page_layout->scale_x, page_layout->scale_y,
                         page_layout,
                         line);
-      column_y_pos += line_link->logical_rect.height;
+
+      if (lpi > 0.0L)
+	  column_y_pos += (1 / lpi * 72.0 * page_layout->pt_to_pixel * PANGO_SCALE);
+      else
+	  column_y_pos += line_link->logical_rect.height;
       
       pango_lines = pango_lines->next;
     }
@@ -840,6 +989,8 @@
 draw_line_to_page(FILE *OUT,
                   int column_idx,
                   int column_pos,
+		  gdouble scale_x,
+		  gdouble scale_y,
                   page_layout_t *page_layout,
                   PangoLayoutLine *line)
 {
@@ -874,6 +1025,7 @@
 
   ps_layout = paps_layout_line_to_postscript_strdup(paps,
                                                     x_pos, y_pos,
+						    scale_x, scale_y,
                                                     line);
 
   g_string_append(ps_pages_string,
@@ -935,6 +1087,7 @@
     }
   ps_layout = paps_layout_line_to_postscript_strdup(paps,
                                                     x_pos, y_pos,
+						    page_layout->scale_x, page_layout->scale_y,
                                                     line);
   g_string_append(ps_pages_string,
                   ps_layout);
@@ -948,6 +1101,7 @@
   x_pos = (page_layout->page_width - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt)) / 2;
   ps_layout = paps_layout_line_to_postscript_strdup(paps,
                                                     x_pos, y_pos,
+						    page_layout->scale_x, page_layout->scale_y,
                                                     line);
   g_string_append(ps_pages_string,
                   ps_layout);
@@ -961,6 +1115,7 @@
   x_pos = page_layout->page_width - page_layout->right_margin - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt);
   ps_layout = paps_layout_line_to_postscript_strdup(paps,
                                                     x_pos, y_pos,
+						    page_layout->scale_x, page_layout->scale_y,
                                                     line);
   g_string_append(ps_pages_string,
                   ps_layout);
@@ -977,4 +1132,3 @@
 
   return logical_rect.height;
 }
-
diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/test_libpaps.c paps-0.6.6/src/test_libpaps.c
--- paps-0.6.6.orig/src/test_libpaps.c	2005-12-21 04:35:39.000000000 +0900
+++ paps-0.6.6/src/test_libpaps.c	2006-07-03 18:48:04.000000000 +0900
@@ -83,6 +83,7 @@
 
   ps_layout = paps_layout_to_postscript_strdup(paps,
 					       0, 0,
+					       1.0, 1.0,
 					       layout);
   g_string_append_printf(ps_text,
 			 "gsave\n"
@@ -110,6 +111,7 @@
 			 );
   ps_layout = paps_layout_to_postscript_strdup(paps,
 					       0, 0,
+					       1.0, 1.0,
 					       layout);
   g_string_append_printf(ps_text,
 			 "gsave\n"

paps-0.6.6-wordwrap.patch:
 paps.c |    5 +++++
 1 files changed, 5 insertions(+)

Index: paps-0.6.6-wordwrap.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-0.6.6-wordwrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paps-0.6.6-wordwrap.patch	27 Jun 2006 07:11:43 -0000	1.1
+++ paps-0.6.6-wordwrap.patch	4 Jul 2006 05:12:40 -0000	1.2
@@ -1,11 +1,36 @@
-diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x 'foo*' -x 'lib*' -x .deps -x .libs -x paps -x '*o' -x '*~' -x 'stamp*' -x 'test*' paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-06-20 20:40:11.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-06-21 01:36:54.000000000 +0900
-@@ -495,6 +495,7 @@
+diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
+--- paps-0.6.6.orig/src/paps.c	2006-07-04 12:16:49.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-07-04 12:19:20.000000000 +0900
+@@ -79,6 +79,7 @@
+   gboolean do_justify;
+   gboolean do_separation_line;
+   gboolean do_draw_contour;
++  gboolean do_wordwrap;
+   PangoDirection pango_dir;
+   gchar *filename;
+   gchar *header_font_desc;
+@@ -212,6 +213,7 @@
+ int main(int argc, char *argv[])
+ {
+   gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE;
++  gboolean do_wordwrap = TRUE;
+   int num_columns = 1;
+   int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36;
+   gchar *font = MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE), *encoding = NULL;
+@@ -340,6 +342,7 @@
+   page_layout.header_ypos = page_layout.top_margin;
+   page_layout.header_height = 0;
+   page_layout.footer_height = 0;
++  page_layout.do_wordwrap = do_wordwrap;
+   if (do_draw_header)
+     page_layout.header_sep =  header_sep;
+   else
+@@ -496,6 +499,8 @@
                                        page_layout->pango_dir == PANGO_DIRECTION_LTR
                                        ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
            pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
-+	  pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
++          if (page_layout->do_wordwrap)
++              pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
            para->height = 0;
  
            if (wc == '\f')

paps-cups.patch:
 configure.in    |   13 ++++++
 src/Makefile.am |    4 -
 src/paps.c      |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 125 insertions(+), 6 deletions(-)

Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paps-cups.patch	29 Jun 2006 13:31:33 -0000	1.2
+++ paps-cups.patch	4 Jul 2006 05:12:40 -0000	1.3
@@ -1,6 +1,6 @@
-unchanged:
+diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
 --- paps-0.6.6.orig/configure.in	2006-04-28 04:41:36.000000000 +0900
-+++ paps-0.6.6/configure.in	2006-06-29 17:45:59.000000000 +0900
++++ paps-0.6.6/configure.in	2006-07-04 13:22:12.000000000 +0900
 @@ -7,4 +7,17 @@
  AC_PROG_CC
  AM_PROG_LIBTOOL
@@ -19,9 +19,9 @@
 +AC_SUBST(CUPS_LIBS)
 +
  AC_OUTPUT(Makefile src/Makefile doc/Makefile)
-unchanged:
---- paps-0.6.6.orig/src/Makefile.am	2006-06-20 20:40:11.000000000 +0900
-+++ paps-0.6.6/src/Makefile.am	2006-06-29 19:09:12.000000000 +0900
+diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
+--- paps-0.6.6.orig/src/Makefile.am	2006-07-04 13:21:56.000000000 +0900
++++ paps-0.6.6/src/Makefile.am	2006-07-04 13:22:12.000000000 +0900
 @@ -5,10 +5,10 @@
  libpaps_a_incdir = $(includedir)
  
@@ -35,26 +35,18 @@
  paps_DEPENDENCIES = $(noinst_LIBRARIES)
  
  EXTRA_DIST = test_libpaps.c paps.1
-diff -u paps-0.6.6/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6/src/paps.c	2006-06-29 19:06:46.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-06-29 14:29:13.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <string.h>
+diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
+--- paps-0.6.6.orig/src/paps.c	2006-07-04 13:21:56.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-07-04 13:23:28.000000000 +0900
+@@ -31,6 +31,7 @@
  #include <time.h>
  #include <locale.h>
+ #include <wchar.h>
 +#include <cups/cups.h>
  
  #define BUFSIZE 1024
  #define DEFAULT_FONT_FAMILY	"Monospace"
-@@ -79,6 +80,7 @@
-   gboolean do_justify;
-   gboolean do_separation_line;
-   gboolean do_draw_contour;
-+  gboolean do_wordwrap;
-   PangoDirection pango_dir;
-   gchar *filename;
-   gchar *header_font_desc;
-@@ -244,8 +246,8 @@
+@@ -313,8 +314,8 @@
    int num_pages = 1;
    int gutter_width = 40;
    int total_gutter_width;
@@ -65,11 +57,11 @@
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -253,12 +255,113 @@
-   gchar *filename_in, *title, *text;
+@@ -323,12 +324,113 @@
    int header_sep = 20;
+   int max_width = 0, w;
    GIConv cvh = NULL;
-+  gboolean cups_mode = FALSE, do_wordwrap = TRUE;
++  gboolean cups_mode = FALSE;
  
    /* Prerequisite when using glib. */
    g_type_init();
@@ -164,10 +156,10 @@
 +			num_columns = atoi(val);
 +		}
 +		if ((val = cupsGetOption("cpi", num_options, options)) != NULL) {
-+			/* XXX */
++			cpi = atof(val);
 +		}
 +		if ((val = cupsGetOption("lpi", num_options, options)) != NULL) {
-+			/* XXX */
++			lpi = atof(val);
 +		}
 +		if (getenv("CHARSET") != NULL)
 +			encoding = getenv("CHARSET");
@@ -179,7 +171,7 @@
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -285,6 +388,8 @@
+@@ -355,6 +457,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -188,7 +180,7 @@
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -303,8 +408,10 @@
+@@ -373,8 +477,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -201,21 +193,3 @@
    
    if (num_columns == 1)
      total_gutter_width = 0;
-@@ -340,6 +447,7 @@
-   page_layout.header_ypos = page_layout.top_margin;
-   page_layout.header_height = 0;
-   page_layout.footer_height = 0;
-+  page_layout.do_wordwrap = do_wordwrap;
-   if (do_draw_header)
-     page_layout.header_sep =  header_sep;
-   else
-@@ -495,7 +603,8 @@
-                                       page_layout->pango_dir == PANGO_DIRECTION_LTR
-                                       ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT);
-           pango_layout_set_width (para->layout, paint_width * PANGO_SCALE);
--	  pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-+	  if (page_layout->do_wordwrap)
-+	      pango_layout_set_wrap (para->layout, PANGO_WRAP_WORD_CHAR);
-           para->height = 0;
- 
-           if (wc == '\f')


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- paps.spec	29 Jun 2006 14:11:58 -0000	1.7
+++ paps.spec	4 Jul 2006 05:12:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -22,6 +22,8 @@
 Patch7:		paps-0.6.6-lcctype.patch
 ## http://sourceforge.net/tracker/index.php?func=detail&aid=1512385&group_id=153049&atid=786239
 Patch8:		paps-0.6.6-wordwrap.patch
+## http://sourceforge.net/tracker/index.php?func=detail&aid=1472021&group_id=153049&atid=786242
+Patch9:		paps-0.6.6-cpilpi.patch
 Patch50:	paps-cups.patch
 
 Summary:	Plain Text to PostScript converter
@@ -40,6 +42,7 @@
 %patch6 -p1 -b .fontopt
 %patch7 -p1 -b .lcctype
 %patch8 -p1 -b .wordwrap
+%patch9 -p1 -b .cpilpi
 %patch50 -p1 -b .cups
 aclocal
 automake
@@ -73,6 +76,11 @@
 
 
 %changelog
+* Tue Jul  4 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-10
+- paps-0.6.6-cpilpi.patch: add --cpi and --lpi option to support the characters
+  per inch and the lines per inch.
+- paps-cups.patch: add cpi and lpi support.
+
 * Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-9
 - Fixed font-option patch.
 - Adjusted CUPS patch: CUPS invokes the filter with the destination



From fedora-cvs-commits at redhat.com  Tue Jul  4 06:53:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 02:53:48 -0400
Subject: rpms/kernel/devel patch-2.6.17-git21.bz2.sign, NONE, 1.1 .cvsignore,
	1.473, 1.474 kernel-2.6.spec, 1.2345, 1.2346 sources, 1.417,
	1.418 upstream, 1.384, 1.385 patch-2.6.17-git19.bz2.sign, 1.1, NONE
Message-ID: <200607040653.k646rmo6026676@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git21.bz2.sign 
Removed Files:
	patch-2.6.17-git19.bz2.sign 
Log Message:
git21



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

iD8DBQBEqMFsyGugalF9Dw4RAi/GAJsFZDf1CTO4FSto3lF90PbEvUJbCwCfWxg0
prEQ959U3QVfWlf8LIISJKU=
=C2SM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -r1.473 -r1.474
--- .cvsignore	2 Jul 2006 03:23:39 -0000	1.473
+++ .cvsignore	4 Jul 2006 06:53:46 -0000	1.474
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git19.bz2
+patch-2.6.17-git21.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2345
retrieving revision 1.2346
diff -u -r1.2345 -r1.2346
--- kernel-2.6.spec	2 Jul 2006 22:41:15 -0000	1.2345
+++ kernel-2.6.spec	4 Jul 2006 06:53:46 -0000	1.2346
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git19.bz2
+Patch1: patch-2.6.17-git21.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -1568,6 +1568,9 @@
 %endif
 
 %changelog
+* Tue Jul  4 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git21
+
 * Sun Jul  2 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add ppoll() and pselect() on x86_64 again
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- sources	2 Jul 2006 03:23:40 -0000	1.417
+++ sources	4 Jul 2006 06:53:46 -0000	1.418
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-ff1394160c5fdcc9a19cb72a8073c438  patch-2.6.17-git19.bz2
+ff50ced0a2ee111b3fd934133e83cc7f  patch-2.6.17-git21.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- upstream	2 Jul 2006 03:23:40 -0000	1.384
+++ upstream	4 Jul 2006 06:53:46 -0000	1.385
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git19.bz2
+patch-2.6.17-git21.bz2


--- patch-2.6.17-git19.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 11:10:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 07:10:30 -0400
Subject: rpms/busybox/devel busybox-1.2.0-anaconda.patch, NONE,
	1.1 busybox-1.2.0-gcc41.patch, NONE,
	1.1 busybox-1.2.0-id_ps.patch, NONE,
	1.1 busybox-1.2.0-page_size.patch, NONE,
	1.1 busybox-1.2.0-selinux.patch, NONE,
	1.1 busybox-1.2.0-static.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 busybox.spec, 1.43, 1.44 sources, 1.12,
	1.13 busybox-1.1.1-anaconda.patch, 1.2,
	NONE busybox-1.1.1-id_ps.patch, 1.1,
	NONE busybox-1.1.1-overfl.patch, 1.1,
	NONE busybox-1.1.1-page_size.patch, 1.1,
	NONE busybox-1.1.1-selinux.patch, 1.3,
	NONE busybox-1.1.1-static.patch, 1.1,
	NONE busybox-1.1.2-gcc111.patch, 1.2, NONE
Message-ID: <200607041110.k64BAUf1005326@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5305

Modified Files:
	.cvsignore busybox.spec sources 
Added Files:
	busybox-1.2.0-anaconda.patch busybox-1.2.0-gcc41.patch 
	busybox-1.2.0-id_ps.patch busybox-1.2.0-page_size.patch 
	busybox-1.2.0-selinux.patch busybox-1.2.0-static.patch 
Removed Files:
	busybox-1.1.1-anaconda.patch busybox-1.1.1-id_ps.patch 
	busybox-1.1.1-overfl.patch busybox-1.1.1-page_size.patch 
	busybox-1.1.1-selinux.patch busybox-1.1.1-static.patch 
	busybox-1.1.2-gcc111.patch 
Log Message:
update to 1.2.0


busybox-1.2.0-anaconda.patch:
 Makefile              |    3 ++-
 util-linux/nfsmount.c |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE busybox-1.2.0-anaconda.patch ---
--- busybox-1.2.0/util-linux/nfsmount.c.anaconda	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/util-linux/nfsmount.c	2006-07-04 12:19:42.000000000 +0200
@@ -412,7 +412,7 @@
 	intr = 0;
 	posix = 0;
 	nocto = 0;
-	nolock = 0;
+	nolock = 1;
 	noac = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 	tcp = 0;
--- busybox-1.2.0/Makefile.anaconda	2006-07-04 12:19:42.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-04 12:37:25.000000000 +0200
@@ -228,7 +228,8 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+	@$(SED) -i -r -e "s/^(CONFIG_FEATURE_UNARCHIVE_TAPE|CONFIG_FEATURE_LS_COLOR|CONFIG_FEATURE_VI_READONLY|CONFIG_FEATURE_SH_IS_NONE|CONFIG_INIT|CONFIG_POWEROFF|CONFIG_REBOOT|CONFIG_HALT|CONFIG_ASH_JOB_CONTROL|CONFIG_SYSLOGD|CONFIG_KLOGD|CONFIG_LOGGER|USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+	@$(SED) -i -r -e "s/^# CONFIG_FEATURE_SH_IS_ASH is not set/CONFIG_FEATURE_SH_IS_ASH=y/" .config
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
 
 

busybox-1.2.0-gcc41.patch:
 Rules.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-gcc41.patch ---
--- busybox-1.2.0/Rules.mak.gcc41	2006-07-04 08:55:30.000000000 +0200
+++ busybox-1.2.0/Rules.mak	2006-07-04 08:57:28.000000000 +0200
@@ -397,7 +397,7 @@
 			-o $@ $(LD_START_GROUP)  \
 			$(APPLETS_DEFINE) $(APPLET_SRC) \
 			$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
-			$(LDBUSYBOX) $(LIBRARIES) -lsepol\
+			$(LDBUSYBOX) $(LIBRARIES) -lsepol \
 			$(LD_END_GROUP)
 cmd_link.so        = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
 			$(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \

busybox-1.2.0-id_ps.patch:
 coreutils/id.c |   35 +++++++++++++++++++++++++++++------
 procps/ps.c    |    4 ++--
 2 files changed, 31 insertions(+), 8 deletions(-)

--- NEW FILE busybox-1.2.0-id_ps.patch ---
--- busybox-1.2.0/coreutils/id.c.id_ps	2006-07-01 00:42:07.000000000 +0200
+++ busybox-1.2.0/coreutils/id.c	2006-07-03 17:12:34.000000000 +0200
@@ -26,6 +26,7 @@
 #define NAME_NOT_NUMBER   2
 #define JUST_USER         4
 #define JUST_GROUP        8
+#define JUST_CONTEXT	 16
 
 static short printf_full(unsigned int id, const char *arg, const char prefix)
 {
@@ -50,9 +51,17 @@
 
 	/* Don't allow -n -r -nr -ug -rug -nug -rnug */
 	/* Don't allow more than one username */
-	bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug";
+#ifdef CONFIG_SELINUX
+       /* Don't allow -gZ, -uZ or -nZ */
+       bb_opt_complementally = "?1:?:u--g:g--u:g--Z:Z--g:u--Z:Z--u:Z--n:n--Z:r?ug:n?ug";
+#else
+       bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug:";
+#endif
+#ifdef CONFIG_SELINUX
+        flags = bb_getopt_ulflags(argc, argv, "rnugZ");
+#else
 	flags = bb_getopt_ulflags(argc, argv, "rnug");
-
+#endif
 	/* This values could be overwritten later */
 	uid = geteuid();
 	gid = getegid();
@@ -81,12 +90,20 @@
 		bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 	}
 
+#ifndef CONFIG_SELINUX
+       if ((flags & JUST_CONTEXT) & (is_selinux_enabled())) {
+               flags -= JUST_CONTEXT;
+       }
+#endif
+
 	/* Print full info like GNU id */
 	/* bb_getpwuid doesn't exit on failure here */
-	status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
-	putchar(' ');
-	/* bb_getgrgid doesn't exit on failure here */
-	status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+       if (!(flags & JUST_CONTEXT))  {
+               status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
+               putchar(' ');
+               /* bb_getgrgid doesn't exit on failure here */
+               status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
+       }
 
 #ifdef CONFIG_SELINUX
 	if ( is_selinux_enabled() ) {
@@ -104,6 +121,12 @@
 					safe_strncpy(context, "unknown",8);
 			}
 		bb_printf(" context=%s", context);
+		if (flags & JUST_CONTEXT) {
+		       bb_printf("%s", context);
+		}
+		else {
+		       bb_printf(" context=%s", context);
+		}              
 	}
 #endif
 
--- busybox-1.2.0/procps/ps.c.id_ps	2006-07-01 00:42:12.000000000 +0200
+++ busybox-1.2.0/procps/ps.c	2006-07-03 17:02:27.000000000 +0200
@@ -44,11 +44,11 @@
 #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
 	/* handle arguments */
 #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX
-	i = bb_getopt_ulflags(argc, argv, "wc", &w_count);
+	i = bb_getopt_ulflags(argc, argv, "wZ", &w_count);
 #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX
 	bb_getopt_ulflags(argc, argv, "w", &w_count);
 #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */
-	i = bb_getopt_ulflags(argc, argv, "c");
+	i = bb_getopt_ulflags(argc, argv, "Z");
 #endif
 #if ENABLE_FEATURE_PS_WIDE
 	/* if w is given once, GNU ps sets the width to 132,

busybox-1.2.0-page_size.patch:
 mkswap.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-page_size.patch ---
--- busybox-1.1.1/util-linux/mkswap.c.ia64	2006-03-22 22:16:26.000000000 +0100
+++ busybox-1.1.1/util-linux/mkswap.c	2006-05-03 11:25:48.000000000 +0200
@@ -42,7 +42,8 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>			/* for _IO */
 #include <sys/utsname.h>
-#include <asm/page.h>			/* for PAGE_SIZE and PAGE_SHIFT */
+//#include <asm/page.h>			
+#include <unistd.h>             /* for syssconf command to get PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */
 #include "busybox.h"
 
@@ -54,6 +55,8 @@
 #define BLKGETSIZE _IO(0x12,96)
 #endif
 
+unsigned long PAGE_SIZE;
+
 static char *device_name = NULL;
 static int DEV = -1;
 static long PAGES = 0;
@@ -84,6 +87,7 @@
 static inline void init_signature_page(void)
 {
 	pagesize = getpagesize();
+        PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
 
 #ifdef PAGE_SIZE
 	if (pagesize != PAGE_SIZE)

busybox-1.2.0-selinux.patch:
 Config.in             |    1 
 Makefile              |    4 +--
 Rules.mak             |    2 -
 include/applets.h     |    1 
 include/usage.h       |   13 ++++++++++-
 selinux/Config.in     |   16 ++++++++++++++
 selinux/Makefile      |   30 +++++++++++++++++++++++++++
 selinux/Makefile.in   |   35 +++++++++++++++++++++++++++++++
 selinux/load_policy.c |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 152 insertions(+), 5 deletions(-)

--- NEW FILE busybox-1.2.0-selinux.patch ---
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Makefile.in	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,35 @@
+# Makefile for busybox
+#
+# Copyright (C) 2003 by Dan Walsh <dwalsh at redhat.com>
+# Copyright (C) 1999-2003 by Erik Andersen <andersen at codepoet.org>
+#
+# 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
+#
+
+SELINUX_AR:=selinux.a
+ifndef $(SELINUX_DIR)
+SELINUX_DIR:=$(TOPDIR)selinux/
+endif
+
+SELINUX-y:=
+SELINUX-$(CONFIG_LOAD_POLICY)		+= load_policy.o
+libraries-y+=$(SELINUX_DIR)$(SELINUX_AR)
+
+$(SELINUX_DIR)$(SELINUX_AR): $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
+	$(AR) -ro $@ $(patsubst %,$(SELINUX_DIR)%, $(SELINUX-y))
+
+$(SELINUX_DIR)%.o: $(SELINUX_DIR)%.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Config.in	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,16 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Selinux Utilities"
+
+if CONFIG_SELINUX
+config CONFIG_LOAD_POLICY
+	bool "load_policy"
+	default n
+	help
+	  Enable support for loading SE Linux into the kernel.
+endif
+endmenu
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/Makefile	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,30 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2003 by Erik Andersen <andersen at codepoet.org>
+#
+# 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
+#
+
+TOPDIR:= ../
+SELINUX_DIR:=./
+include $(TOPDIR).config
+include $(TOPDIR)Rules.mak
+include Makefile.in
+all: $(libraries-y)
+-include $(TOPDIR).depend
+
+clean:
+	rm -f *.o *.a $(AR_TARGET)
+
--- /dev/null	2006-07-03 08:55:05.634219750 +0200
+++ busybox-1.2.0/selinux/load_policy.c	2006-07-03 13:22:00.000000000 +0200
@@ -0,0 +1,55 @@
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/mman.h>
+#include <selinux/selinux.h>
+#include <locale.h>			    /* for setlocale() */
+#include <libintl.h>			    /* for gettext() */
+#define _(msgid) gettext (msgid)
+#ifndef PACKAGE
+#define PACKAGE "policycoreutils"   /* the name of this package lang translation */
+#endif
+
+extern int load_policy_main(int argc, char **argv) 
+{
+	int fd, ret;
+	struct stat sb;
+	void *map;
+
+	if (argc != 2) {
+		fprintf(stderr, _("usage:  %s policyfile\n"), argv[0]);
+		return 1;
+	}
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, _("Can't open '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	if (fstat(fd, &sb) < 0) {
+		fprintf(stderr, _("Can't stat '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	map = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	if (map == MAP_FAILED) {
+		fprintf(stderr, _("Can't map '%s':  %s\n"),
+			argv[1], strerror(errno));
+		return 2;
+	}
+
+	ret = security_load_policy(map, sb.st_size);
+	if (ret < 0) {
+		fprintf(stderr, _("%s:  security_load_policy failed\n"), argv[0]);
+		return 3;
+	}
+	return EXIT_SUCCESS;
+}
--- busybox-1.2.0/include/usage.h.selinux	2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.2.0/include/usage.h	2006-07-03 13:22:00.000000000 +0200
@@ -1133,7 +1133,7 @@
 #define id_full_usage \
 	"Print information for USERNAME or the current user\n\n" \
 	"Options:\n" \
-	USAGE_SELINUX("\t-c\tprints only the security context\n") \
+	USAGE_SELINUX("\t-Z\tprints only the security context\n") \
 	"\t-g\tprints only the group ID\n" \
 	"\t-u\tprints only the user ID\n" \
 	"\t-n\tprint a name instead of a number\n" \
@@ -2326,6 +2326,15 @@
 #else
 #define USAGE_PS "\nOptions:"
 #endif
+
+#define load_policy_trivial_usage \
+        ""
+#define load_policy_full_usage \
+	        "load SELinux policy\n"
+		
+#define load_policy_example_usage \
+        "$ load_policy /etc/selinux/strict/policy/policy.17\n"
+			
 #if ENABLE_FEATURE_PS_WIDE
 #define USAGE_PS_WIDE(a) a
 #else
@@ -2337,7 +2346,7 @@
 #define ps_full_usage \
 	"Report process status\n" \
 	USAGE_PS \
-	USAGE_SELINUX("\n\t-c\tshow SE Linux context") \
+	USAGE_SELINUX("\n\t-Z\tshow SE Linux context") \
 	USAGE_PS_WIDE("\n\tw\twide output")
 
 #define ps_example_usage \
--- busybox-1.2.0/include/applets.h.selinux	2006-07-01 00:42:10.000000000 +0200
+++ busybox-1.2.0/include/applets.h	2006-07-03 13:22:27.000000000 +0200
@@ -166,6 +166,7 @@
 USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER))
 USE_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER))
+USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
--- busybox-1.2.0/Config.in.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Config.in	2006-07-03 13:22:00.000000000 +0200
@@ -473,3 +473,4 @@
 source procps/Config.in
 source shell/Config.in
 source sysklogd/Config.in
+source selinux/Config.in
--- busybox-1.2.0/Rules.mak.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Rules.mak	2006-07-03 13:22:00.000000000 +0200
@@ -397,7 +397,7 @@
 			-o $@ $(LD_START_GROUP)  \
 			$(APPLETS_DEFINE) $(APPLET_SRC) \
 			$(BUSYBOX_DEFINE) $(BUSYBOX_SRC) $(libraries-y) \
-			$(LDBUSYBOX) $(LIBRARIES) \
+			$(LDBUSYBOX) $(LIBRARIES) -lsepol\
 			$(LD_END_GROUP)
 cmd_link.so        = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
 			$(LIB_CFLAGS) $(CFLAGS_COMBINE) $(LIB_LDFLAGS) \
--- busybox-1.2.0/Makefile.selinux	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-03 13:22:00.000000000 +0200
@@ -33,7 +33,7 @@
 
 DIRS:=applets archival archival/libunarchive coreutils console-tools \
 	debianutils editors findutils init miscutils modutils networking \
-	networking/libiproute networking/udhcp procps loginutils shell \
+	networking/libiproute networking/udhcp procps loginutils selinux shell \
 	sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb
 
 SRC_DIRS:=$(patsubst %,$(top_srcdir)/%,$(DIRS))
@@ -228,7 +228,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
 
 

busybox-1.2.0-static.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.2.0-static.patch ---
--- busybox-1.2.0/Makefile.static	2006-07-03 15:37:16.000000000 +0200
+++ busybox-1.2.0/Makefile	2006-07-03 15:38:57.000000000 +0200
@@ -228,7 +228,7 @@
 
 defconfig: scripts/config/conf
 	@./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-	@$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
+	@$(SED) -i -r -e "s/^(CONFIG_FEATURE_LS_COLOR|CONFIG_ASH|CONFIG_FDFLUSH|USING_CROSS_COMPILER|CONFIG_(DEBUG.*|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
 	@./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 May 2006 09:32:21 -0000	1.12
+++ .cvsignore	4 Jul 2006 11:10:22 -0000	1.13
@@ -1 +1 @@
-busybox-1.1.3.tar.bz2
+busybox-1.2.0.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- busybox.spec	9 Jun 2006 02:40:45 -0000	1.43
+++ busybox.spec	4 Jul 2006 11:10:26 -0000	1.44
@@ -1,19 +1,18 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.1.3
-Release: 2
+Version: 1.2.0
+Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-Patch: busybox-1.1.1-static.patch
-Patch1: busybox-1.1.1-anaconda.patch
-Patch2: busybox-1.1.1-selinux.patch
+Patch: busybox-1.2.0-static.patch
+Patch1: busybox-1.2.0-anaconda.patch
+Patch2: busybox-1.2.0-selinux.patch
 Patch4: busybox-1.1.1-ppc64.patch
-Patch5: busybox-1.1.1-page_size.patch
-Patch6: busybox-1.1.1-overfl.patch
-Patch7: busybox-1.1.1-id_ps.patch
-Patch8: busybox-1.1.2-gcc111.patch
+Patch5: busybox-1.2.0-page_size.patch
+Patch7: busybox-1.2.0-id_ps.patch
+Patch8: busybox-1.2.0-gcc41.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -45,7 +44,6 @@
 %patch4 -b .ppc64 -p1
 %endif
 %patch5 -b .ia64 -p1
-%patch6 -b .overfl -p1
 %patch7 -b .id_ps -p1
 %patch8 -b .gcc111 -p1
 
@@ -61,7 +59,7 @@
 done
 
 patch -b --suffix .anaconda -p1 < %{PATCH1}
-patch -b --suffix .gcc111 -p1 <%{PATCH8}
+#patch -b --suffix .gcc111 -p1 <%{PATCH8}
 make DOLFS=y defconfig
 make CONFIG_DEBUG=y CC="gcc $RPM_OPT_FLAGS"
 
@@ -86,6 +84,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Tue Jul  4 2006 Ivana Varekova <varekova at redhat.com> - 1:1.2.0-1
+- update to 1.2.0
+
 * Thu Jun  8 2006 Jeremy Katz <katzj at redhat.com> - 1:1.1.3-2
 - fix so that busybox.anaconda has sh
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 May 2006 09:32:23 -0000	1.12
+++ sources	4 Jul 2006 11:10:26 -0000	1.13
@@ -1 +1 @@
-19a0b475169335f17e421cf644616fe7  busybox-1.1.3.tar.bz2
+0a3e5d47adc4debda22726295f40a6f2  busybox-1.2.0.tar.bz2


--- busybox-1.1.1-anaconda.patch DELETED ---


--- busybox-1.1.1-id_ps.patch DELETED ---


--- busybox-1.1.1-overfl.patch DELETED ---


--- busybox-1.1.1-page_size.patch DELETED ---


--- busybox-1.1.1-selinux.patch DELETED ---


--- busybox-1.1.1-static.patch DELETED ---


--- busybox-1.1.2-gcc111.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 11:55:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 07:55:31 -0400
Subject: rpms/busybox/devel busybox-1.2.0-ppc64.patch, NONE, 1.1 busybox.spec,
	1.44, 1.45 busybox-1.1.1-ppc64.patch, 1.1, NONE
Message-ID: <200607041155.k64BtVft027218@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27029

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.2.0-ppc64.patch 
Removed Files:
	busybox-1.1.1-ppc64.patch 
Log Message:
update ppc64 patch


busybox-1.2.0-ppc64.patch:
 Rules.mak |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE busybox-1.2.0-ppc64.patch ---
--- busybox-1.2.0/Rules.mak.ppc64	2006-07-04 13:39:13.000000000 +0200
+++ busybox-1.2.0/Rules.mak	2006-07-04 13:40:52.000000000 +0200
@@ -139,6 +139,7 @@
 HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-Wstrict-prototypes,)
 HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-O2,)
 HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-fomit-frame-pointer,)
+HOSTCFLAGS+=$(call check_cc,$(HOSTCC),-mminimal-toc,)
 
 LD_WHOLE_ARCHIVE:=$(shell echo "int i;" > conftest.c ; \
 	$(CC) -c -o conftest.o conftest.c ; \


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- busybox.spec	4 Jul 2006 11:10:26 -0000	1.44
+++ busybox.spec	4 Jul 2006 11:55:28 -0000	1.45
@@ -9,7 +9,7 @@
 Patch: busybox-1.2.0-static.patch
 Patch1: busybox-1.2.0-anaconda.patch
 Patch2: busybox-1.2.0-selinux.patch
-Patch4: busybox-1.1.1-ppc64.patch
+Patch4: busybox-1.2.0-ppc64.patch
 Patch5: busybox-1.2.0-page_size.patch
 Patch7: busybox-1.2.0-id_ps.patch
 Patch8: busybox-1.2.0-gcc41.patch


--- busybox-1.1.1-ppc64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 12:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 08:31:42 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#81806.patch, NONE,
	1.1 kdelibs.spec, 1.150, 1.151
Message-ID: <200607041231.k64CVgPb020398@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#81806.patch 
Log Message:
apply upstream patches, fix #128940/#81806


kdelibs-3.5.3-kde#81806.patch:
 dtd.cpp        |  352 ++++++++++++++++++---------------------------------------
 htmlparser.cpp |    5 
 2 files changed, 115 insertions(+), 242 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#81806.patch ---
Index: khtml/html/dtd.cpp
===================================================================
--- khtml/html/dtd.cpp	(Revision 552024)
+++ khtml/html/dtd.cpp	(Revision 552025)
@@ -259,261 +259,111 @@
     REQUIRED   // ID_TEXT
 };
 
-
-static const ushort tag_list_0[] = {
+// This a combination of HTML4.dtd XHTML11.dtd and various extensions
+// and deprecated elements
+static const ushort tag_list_inline[] = {
     ID_TEXT,
+    // %fontstyle
     ID_TT,
     ID_I,
     ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
     ID_BIG,
     ID_SMALL,
+    ID_U,           // legacy
+    ID_S,           // legacy
+    ID_STRIKE,      // legacy
+    ID_FONT,        // legacy
+    ID_BASEFONT,    // legacy
+    // %phrase
     ID_EM,
     ID_STRONG,
     ID_DFN,
     ID_CODE,
+    ID_Q,
     ID_SAMP,
     ID_KBD,
     ID_VAR,
     ID_CITE,
     ID_ABBR,
     ID_ACRONYM,
-    ID_A,
-    ID_IMG,
-    ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
-    ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
     ID_SUB,
     ID_SUP,
-    ID_SPAN,
-    ID_BDO,
-    ID_IFRAME,
+    // %inline.forms
     ID_INPUT,
     ID_SELECT,
     ID_TEXTAREA,
     ID_LABEL,
     ID_BUTTON,
-    ID_INS,
-    ID_DEL,
-    ID_COMMENT,
-    ID_NOBR,
-    ID_WBR,
-    0
-};
-
-static const ushort tag_list_1[] = {
-    ID_TEXT,
-    ID_P,
-    ID_H1,
-    ID_H2,
-    ID_H3,
-    ID_H4,
-    ID_H5,
-    ID_H6,
-    ID_UL,
-    ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
-    ID_DL,
-    ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
-    ID_NOSCRIPT,
-    ID_NOFRAMES,
-    ID_BLOCKQUOTE,
-    ID_FORM,
-    ID_ISINDEX,
-    ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
-    ID_ADDRESS,
-    ID_TT,
-    ID_I,
-    ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
-    ID_BIG,
-    ID_SMALL,
-    ID_EM,
-    ID_STRONG,
-    ID_DFN,
-    ID_CODE,
-    ID_SAMP,
-    ID_KBD,
-    ID_VAR,
-    ID_CITE,
-    ID_ABBR,
-    ID_ACRONYM,
+    // %special
     ID_A,
+    ID_OBJECT,
     ID_IMG,
     ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
+    ID_IFRAME,
+    ID_EMBED,       // ?
+    // %special.pre
     ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
-    ID_SUB,
-    ID_SUP,
     ID_SPAN,
     ID_BDO,
-    ID_IFRAME,
-    ID_INPUT,
-    ID_KEYGEN,
-    ID_SELECT,
-    ID_TEXTAREA,
-    ID_LABEL,
-    ID_BUTTON,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
+    ID_MAP,
+    // %misc.inline
+    ID_SCRIPT,
     ID_INS,
     ID_DEL,
-    ID_NOBR,
-    ID_WBR,
-    ID_MARQUEE,
+    // non-standard:
+    ID_ILAYER,      // deprecated
+    ID_NOBR,        // ?
+    ID_WBR,         // ?
     0
 };
 
-static const ushort tag_list_2[] = {
-    ID_COMMENT,
+static const ushort tag_list_quirk_inline[] = {
+    ID_NOSCRIPT,    // block, but parsed as inline in Mozilla and MSIE
     0
 };
 
-static const ushort tag_list_3[] = {
-    ID_TEXT,
+static const ushort tag_list_block[] = {
+    ID_TEXT, // white-space is allowed
     ID_P,
+    // %headings
     ID_H1,
     ID_H2,
     ID_H3,
     ID_H4,
     ID_H5,
     ID_H6,
+    // %lists
     ID_UL,
     ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
     ID_DL,
-    ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
-    ID_NOSCRIPT,
-    ID_NOFRAMES,
-    ID_BLOCKQUOTE,
-    ID_FORM,
-    ID_ISINDEX,
+    ID_DIR,         // legacy
+    ID_MENU,        // legacy
+    // %blocktext
+    ID_PRE,
     ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
+    ID_BLOCKQUOTE,
     ID_ADDRESS,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
-    ID_MARQUEE,
-    0
-};
-
-static const ushort tag_list_4[] = {
-    ID_TEXT,
-    ID_PARAM,
-    ID_P,
-    ID_H1,
-    ID_H2,
-    ID_H3,
-    ID_H4,
-    ID_H5,
-    ID_H6,
-    ID_UL,
-    ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
-    ID_DL,
+    ID_PLAINTEXT,   // ?
+    ID_XMP,         // ?
+    ID_CENTER,      // legacy
+    // other
     ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
+    ID_FIELDSET,
+    ID_TABLE,
     ID_NOSCRIPT,
     ID_NOFRAMES,
-    ID_BLOCKQUOTE,
     ID_FORM,
-    ID_ISINDEX,
-    ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
-    ID_ADDRESS,
-    ID_TEXT,
-    ID_TT,
-    ID_I,
-    ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
-    ID_BIG,
-    ID_SMALL,
-    ID_EM,
-    ID_STRONG,
-    ID_DFN,
-    ID_CODE,
-    ID_SAMP,
-    ID_KBD,
-    ID_VAR,
-    ID_CITE,
-    ID_ABBR,
-    ID_ACRONYM,
-    ID_A,
-    ID_IMG,
-    ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
-    ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
-    ID_SUB,
-    ID_SUP,
-    ID_SPAN,
-    ID_BDO,
-    ID_IFRAME,
-    ID_INPUT,
-    ID_SELECT,
-    ID_TEXTAREA,
-    ID_LABEL,
-    ID_BUTTON,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
-    ID_MARQUEE,
+    ID_ISINDEX,     // legacy
+    // non-standard:
+    ID_LAYER,       // deprecated
+    ID_MARQUEE,     // extension
     0
 };
 
-static const ushort tag_list_6[] = {
-    ID_DT,
+// block elements allowed for quirky error recovery
+static const ushort tag_list_quirk_block[] = {
+    ID_LI,
     ID_DD,
-    ID_COMMENT,
     0
 };
 
@@ -521,7 +371,6 @@
     ID_TEXT,
     ID_OPTGROUP,
     ID_OPTION,
-    ID_COMMENT,
     ID_SCRIPT,
     0
 };
@@ -530,19 +379,19 @@
     ID_FRAMESET,
     ID_FRAME,
     ID_NOFRAMES,
-    ID_COMMENT,
     0
 };
 
+// %head.content
 static const ushort tag_list_11[] = {
     ID_SCRIPT,
     ID_STYLE,
     ID_META,
     ID_LINK,
+    ID_OBJECT,
     ID_TITLE,
-    ID_ISINDEX,
     ID_BASE,
-    ID_COMMENT,
+    ID_ISINDEX,
     0
 };
 
@@ -557,7 +406,23 @@
     return false;
 }
 
+static bool check_block(ushort childID, bool strict)
+{
+    return check_array(childID, tag_list_block) ||
+           (!strict && check_array(childID, tag_list_quirk_block));
+}
 
+static bool check_inline(ushort childID, bool strict)
+{
+    return check_array(childID, tag_list_inline) ||
+           (!strict && check_array(childID, tag_list_quirk_inline));
+}
+
+static bool check_flow(ushort childID, bool strict)
+{
+    return check_block(childID, strict) || check_inline(childID, strict);
+}
+
 bool DOM::checkChild(ushort tagID, ushort childID, bool strict)
 {
     //kdDebug( 6030 ) << "checkChild: " << tagID << "/" << childID << endl;
@@ -567,6 +432,8 @@
     if (tagID >= 1000 || childID >= 1000)
         return true; // one or both of the elements in an XML element; just allow for now
 
+    if (childID == ID_COMMENT) return true;
+
     switch(tagID)
     {
     case ID_TT:
@@ -593,23 +460,27 @@
     case ID_FONT:
     case ID_LEGEND:
     case ID_Q:
-    case ID_A:
     case ID_NOBR:
     case ID_WBR:
-        // _1 *
-        return check_array(childID, tag_list_1) || check_array(childID, tag_list_6);
+        // %inline *
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true));
+    case ID_A:
+        // A: %inline * (but even strict sites expect %flow)
+        return check_flow(childID, true);
     case ID_P:
-        // P: ( _0 | TABLE | NOSCRIPT) *
-        return check_array(childID, tag_list_0) || (!strict && (childID == ID_TABLE || childID == ID_NOSCRIPT));
+        // P: %inline *
+        return check_inline(childID, strict) || 
+               (!strict && childID == ID_TABLE );
     case ID_H1:
     case ID_H2:
     case ID_H3:
     case ID_H4:
     case ID_H5:
     case ID_H6:
-        // _0 *
-        return check_array(childID, tag_list_0) ||
-               (!strict && check_array(childID, tag_list_3) && (childID < ID_H1 || childID > ID_H6));
+        // %inline *
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true) && (childID < ID_H1 || childID > ID_H6));
     case ID_BASEFONT:
     case ID_BR:
     case ID_AREA:
@@ -627,13 +498,16 @@
         // BASEFONT: EMPTY
         return false;
     case ID_BODY:
-        // BODY: _1 * + _2
-        return check_array(childID, tag_list_1) || check_array(childID, tag_list_2);
+        // BODY: %block | SCRIPT (but even strict sites expect %flow)
+        return check_flow(childID, strict);
     case ID_ADDRESS:
-        // ADDRESS: ( _0 | P ) *
-        return check_array(childID, tag_list_0) || childID == ID_P;
+        // ADDRESS: %inline *
+        return check_inline(childID, strict) || 
+               (!strict && childID == ID_P);
     case ID_DT:
-        if ( childID == ID_DL ) return false;
+        // DT: %inline *
+        return check_inline(childID, strict) || 
+              (!strict && check_block(childID, true) && childID != ID_DL);
     case ID_LI:
     case ID_DIV:
     case ID_SPAN:
@@ -651,47 +525,48 @@
     case ID_NOSCRIPT:
     case ID_CAPTION:
     case ID_MARQUEE:
-        // DIV: _1 *
-        return check_array(childID, tag_list_1);
+        // DIV: %flow *
+        return check_flow(childID, strict);
     case ID_MAP:
-	// We accept SCRIPT in client-side image maps as an extension to the DTD.
-        // MAP: ( _3 + | AREA + | SCRIPT + )
-        return check_array(childID, tag_list_3) ||
-            childID == ID_AREA ||
-            childID == ID_SCRIPT;
+        // MAP: ( %block | AREA ) + 
+        return check_block(childID, true) || childID == ID_AREA ||
+               (!strict && childID == ID_SCRIPT);
     case ID_OBJECT:
     case ID_EMBED:
     case ID_APPLET:
-        // OBJECT: _4 *
-        return check_array(childID, tag_list_4);
+        // OBJECT: %flow | PARAM *
+        return check_flow(childID, true) || childID == ID_PARAM;
     case ID_PRE:
     case ID_XMP:
     case ID_PLAINTEXT:
-        // PRE: _0 * - _5
-        return check_array(childID, tag_list_1);
+        // PRE: %flow * - _5
+        return check_flow(childID, true);
     case ID_DL:
-        // DL: _6 +
-        return check_array(childID, tag_list_6) || check_array(childID, tag_list_1);
+        // DL: DT | DD +
+        return (childID == ID_DT || childID == ID_DD || childID == ID_TEXT) || 
+               (!strict && check_flow(childID, true));
     case ID_OL:
     case ID_UL:
         // OL: LI +
-        return check_array(childID, tag_list_1);
+        return (childID == ID_LI || childID == ID_TEXT) || 
+               (!strict && check_flow(childID, true));
     case ID_DIR:
     case ID_MENU:
         // (DIR|MENU): LI + - _3
         if(childID == ID_LI) return true;
         return false;
     case ID_FORM:
-        // FORM: _1 * - FORM
-        return check_array(childID, tag_list_1);
+        // FORM: %flow * - FORM
+        return check_flow(childID, strict);
     case ID_LABEL:
-        // LABEL: _1 * - LABEL
-        return check_array(childID, tag_list_1);
+        // LABEL: %inline * - LABEL
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true));
+    case ID_KEYGEN:
         // KEYGEN does not really allow any children
         // from outside, just need this to be able
         // to add the keylengths ourself
         // Yes, consider it a hack (Dirk)
-    case ID_KEYGEN:
     case ID_SELECT:
         // SELECT: _7 +
         return check_array(childID, tag_list_7);
@@ -708,13 +583,13 @@
         if(childID == ID_TEXT) return true;
         return false;
     case ID_FIELDSET:
-        // FIELDSET: ( TEXT , LEGEND , _1 * )
+        // FIELDSET: ( TEXT , LEGEND , %flow * )
         if(childID == ID_TEXT) return true;
         if(childID == ID_LEGEND) return true;
-        return check_array(childID, tag_list_1);
+        return check_flow(childID, strict);
     case ID_BUTTON:
-        // BUTTON: _1 * - _8
-        return check_array(childID, tag_list_1);
+        // BUTTON: %flow * - _8
+        return check_flow(childID, strict);
     case ID_TABLE:
         // TABLE: ( CAPTION ? , ( COL * | COLGROUP * ) , THEAD ? , TFOOT ? , TBODY + )
         switch(childID)
@@ -755,7 +630,6 @@
         switch(childID)
         {
         case ID_HEAD:
-        case ID_COMMENT:
         case ID_BODY:
         case ID_FRAMESET:
         case ID_NOFRAMES:
Index: khtml/html/htmlparser.cpp
===================================================================
--- khtml/html/htmlparser.cpp	(Revision 552024)
+++ khtml/html/htmlparser.cpp	(Revision 552025)
@@ -371,12 +371,11 @@
         HTMLElementImpl *e;
         bool handled = false;
 
-        // first switch on current element for a elements with optional end-tag
+        // first switch on current element for elements with optional end-tag and inline-only content
         switch(current->id())
         {
         case ID_P:
-        case ID_DD:
-        case ID_LI:
+        case ID_DT:
             if(!n->isInline())
             {
                 popBlock(current->id());


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- kdelibs.spec	29 Jun 2006 10:01:04 -0000	1.150
+++ kdelibs.spec	4 Jul 2006 12:31:30 -0000	1.151
@@ -19,7 +19,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 5
+Release: 6
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -59,6 +59,7 @@
 Patch107: kdelibs-3.5.3-kde#128842.patch
 Patch108: kdelibs-3.5.3-kde#128902.patch
 Patch109: kdelibs-3.5.3-kde#67849.patch
+Patch110: kdelibs-3.5.3-kde#81806.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -198,6 +199,7 @@
 %patch107 -p0 -b .kde#128842
 %patch108 -p0 -b .kde#128902
 %patch109 -p0 -b .kde#67849
+%patch110 -p0 -b .kde#81806
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -421,6 +423,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
+- apply upstream patches, fix #128940/#81806
+
 * Sat Jun 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - fix #196013, mark kde.sh/kde.csh as config file
 - fix #178323 #196225, typo in kde.sh



From fedora-cvs-commits at redhat.com  Tue Jul  4 12:33:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 08:33:12 -0400
Subject: rpms/openssl097a/devel openssl097a.spec, NONE,
	1.1 libica-1.2-struct.patch, 1.1, NONE openssl.spec, 1.8, NONE
Message-ID: <200607041233.k64CXCw0020666@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20641

Added Files:
	openssl097a.spec 
Removed Files:
	libica-1.2-struct.patch openssl.spec 
Log Message:
* Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-5
- fix a few rpmlint warnings
- fix build if 'rand' or 'passwd' in buildroot path (#178782)



--- NEW FILE openssl097a.spec ---
# For the curious:
# 0.9.5a soversion = 0
# 0.9.6  soversion = 1
# 0.9.6a soversion = 2
# 0.9.6c soversion = 3
# 0.9.7a soversion = 4
%define soversion 4

# Number of threads to spawn when testing some threading fixes.
%define thread_test_threads %{?threads:%{threads}}%{!?threads:1}

# Arches on which we need to prevent arch conflicts on opensslconf.h, must
# also be handled in opensslconf-new.h.
%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64

# Arches for which we don't build subpackages.
%define optimize_arches i686

%define libicaversion 1.3.5-3

Summary: The OpenSSL toolkit
Name: openssl097a
Version: 0.9.7a
Release: 5
Source: openssl-%{version}-usa.tar.bz2
Source1: hobble-openssl
Source2: Makefile.certificate
Source3: ca-bundle.crt
Source4: https://rhn.redhat.com/help/RHNS-CA-CERT
Source5: https://rhn.redhat.com/help/RHNS-CA-CERT.asc
Source6: make-dummy-cert
Source7: libica-%{libicaversion}.tar.gz
Source8: openssl-thread-test.c
Source9: opensslconf-new.h
Source10: opensslconf-new-warning.h
Patch0: openssl-0.9.7a-redhat.patch
Patch1: openssl-0.9.7-beta5-defaults.patch
Patch2: openssl-0.9.7-beta6-ia64.patch
Patch3: openssl-0.9.7a-soversion.patch
Patch4: openssl-0.9.6-x509.patch
Patch5: openssl-0.9.7-beta5-version-add-engines.patch
Patch6: openssl-0.9.7d-ICA_engine-jun142004.patch
Patch7: openssl-0.9.7-ppc64.patch
Patch8: openssl-sec3-blinding-0.9.7.patch
Patch9: openssl-0.9.7a-klima-pokorny-rosa.patch
Patch11: libica-1.2-cleanup.patch
Patch12: openssl-0.9.7a-libica-autoconf.patch
Patch13: openssl-0.9.7a-blinding-threads.patch
Patch14: openssl-0.9.7a-specific-engine.patch
Patch15: openssl-0.9.7a-blinding-rng.patch
Patch16: openssl-0.9.7a-ubsec-stomp.patch
Patch17: openssl-0.9.7a-krb5-leak.patch
Patch18: openssl-0.9.7a-krb5-1.3.patch
Patch19: niscc-097.txt
Patch20: openssl-0.9.6c-ccert.patch
Patch21: openssl-0.9.7a-utf8fix.patch
Patch22: openssl-0.9.7a-no-der_chop.patch
Patch40: libica-1.3.4-urandom.patch
Patch42: openssl-0.9.7a-krb5.patch
Patch43: openssl-0.9.7a-krb5-security.patch
Patch44: openssl-0.9.7a-dccs.patch
Patch45: openssl-0.9.7a-can-2005-0109.patch
Patch46: openssl-0.9.7a-dsa-consttime.patch
Patch47: openssl-0.9.7a-can-2005-2969.patch
License: BSDish
Group: System Environment/Libraries
URL: http://www.openssl.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
BuildRequires: automake14, autoconf, libtool
Requires: mktemp
Conflicts: openssl <= %{version}

%define solibbase %(echo %version | sed 's/[[:alpha:]]//g')

%description
The OpenSSL toolkit provides support for secure communications between
machines. OpenSSL includes a certificate management tool and shared
libraries which provide various cryptographic algorithms and
protocols.

%package devel
Summary: Files for development of applications which will use OpenSSL
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, krb5-devel, zlib-devel

%description devel
OpenSSL is a toolkit for supporting cryptography. The openssl-devel
package contains static libraries and include files needed to develop
applications which support various cryptographic algorithms and
protocols.

%package perl
Summary: Perl scripts provided with OpenSSL
Group: Applications/Internet
Requires: perl
Requires: %{name} = %{version}-%{release}

%description perl
OpenSSL is a toolkit for supporting cryptography. The openssl-perl
package provides Perl scripts for converting certificates and keys
from other formats to the formats used by the OpenSSL toolkit.

%prep
%setup -q -n openssl-%{version} -a 7

%{SOURCE1} > /dev/null
%patch0 -p1 -b .redhat
%patch1 -p1 -b .defaults
%patch2 -p1 -b .ia64
%patch3 -p1 -b .soversion
%patch4 -p1 -b .x509
%patch5 -p1 -b .version-add-engines
%patch6 -p1 -b .ibmca
%patch7 -p1 -b .ppc64
%patch8 -p0 -b .sec3-blinding
pushd ssl
%patch9 -p0 -b .klima-pokorny-rosa
popd

%ifarch s390 s390x
pushd libica-%{libicaversion}
%patch11 -p1 -b .cleanup
if [[ $RPM_BUILD_ROOT  ]] ; then
        export INSROOT=$RPM_BUILD_ROOT
fi
aclocal
touch Makefile.macros
automake --gnu -acf
autoconf
libtoolize --copy --force
popd
%endif

%patch12 -p1 -b .libica-autoconf
%patch13 -p1 -b .blinding-threads
%patch14 -p1 -b .specific-engine
%patch15 -p1 -b .blinding-rng
%patch16 -p1 -b .ubsec-stomp
%patch17 -p1 -b .krb5-leak
%patch18 -p1 -b .krb5-1.3
%patch19 -p1 -b .niscc
%patch20 -p1 -b .ccert
%patch21 -p1 -b .utf8fix
%patch22 -p1 -b .no-der_chop

# Patch for libica to use /dev/urandom instead of internal pseudo random number
# generator.
%patch40 -p1 -b .urandom

# Fix link line for libssl (bug #111154).
%patch42 -p1 -b .krb5

# Security fixes
%patch43 -p1 -b .krb5-security
%patch44 -p1 -b .dccs
%patch45 -p1 -b .modexp-consttime
%patch46 -p1 -b .dsa-consttime
%patch47 -p0 -b .ssl2-rollback

# Modify the various perl scripts to reference perl in the right location.
perl util/perlpath.pl `dirname %{__perl}`

# Generate a table with the compile settings for my perusal.
make TABLE PERL=%{__perl}

%build 
%ifarch s390 s390x
pushd libica-%{libicaversion}
if [[ $RPM_BUILD_ROOT  ]] ; then
        export INSROOT=$RPM_BUILD_ROOT
fi
%configure
make
popd
%endif

# Figure out which flags we want to use.  Set the number of threads to use to
# the maximum we've managed to run without running afoul of the OOM killer.
sslarch=%{_os}-%{_arch}
%ifarch %ix86
sslarch=linux-elf
if ! echo %{_target} | grep -q i686 ; then
	sslflags="no-asm 386"
fi
%endif
%ifarch sparc
sslarch=linux-sparcv9
sslflags=no-asm
%endif
%ifarch ia64
sslarch=linux-ia64
sslflags=no-asm
%endif
%ifarch alpha
sslarch=linux-alpha-gcc
%endif
%ifarch s390
sslarch=linux-s390
%endif
%ifarch s390x
sslarch=linux-s390x
%endif
%ifarch x86_64
sslarch=linux-x86_64
%endif
%ifarch ppc
sslarch=linux-ppc
%endif
%ifarch ppc64
sslarch=linux-ppc64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"
%endif
# Configure the build tree.  Override OpenSSL defaults with known-good defaults
# usable on all platforms.  The Configure script already knows to use -fPIC and
# RPM_OPT_FLAGS, so we can skip specifiying them here.
./Configure \
	--prefix=%{_prefix} --openssldir=%{_datadir}/ssl ${sslflags} \
	zlib no-idea no-mdc2 no-rc5 no-ec shared \
	--with-krb5-flavor=MIT \
	-I%{_prefix}/kerberos/include -L%{_prefix}/kerberos/%{_lib} \
	${sslarch}

# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
# marked as not requiring an executable stack.
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
make depend
make all build-shared

# Generate hashes for the included certs.
make rehash build-shared

# Verify that what was compiled actually works.
LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
make -C test apps tests
%{__cc} -o openssl-thread-test \
	`krb5-config --cflags` \
	-I./include \
	$RPM_OPT_FLAGS \
	%{SOURCE8} \
	libssl.a libcrypto.a \
	`krb5-config --libs` \
	-lpthread -lz -ldl
./openssl-thread-test --threads %{thread_test_threads}

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
# Install OpenSSL.
install -d $RPM_BUILD_ROOT/{%{_lib},%{_bindir},%{_includedir},%{_libdir},%{_mandir}}
make INSTALL_PREFIX=$RPM_BUILD_ROOT install build-shared
mv $RPM_BUILD_ROOT/usr/lib/lib*.so.%{solibbase} $RPM_BUILD_ROOT/%{_lib}/
mv $RPM_BUILD_ROOT%{_datadir}/ssl/man/* $RPM_BUILD_ROOT%{_mandir}/
rmdir $RPM_BUILD_ROOT%{_datadir}/ssl/man
mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/ || :
rename so.%{solibbase} so.%{version} $RPM_BUILD_ROOT/%{_lib}/*.so.%{solibbase}
for lib in $RPM_BUILD_ROOT/%{_lib}/*.so.%{version} ; do
	chmod 755 ${lib}
	ln -s -f ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`
	ln -s -f `basename ${lib}` $RPM_BUILD_ROOT/%{_lib}/`basename ${lib} .%{version}`.%{soversion}
done

# Install a makefile for generating keys and self-signed certs, and a script
# for generating them on the fly.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ssl/certs
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/ssl/certs/Makefile
install -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/ssl/certs/make-dummy-cert

# Make sure we actually include the headers we built against.
for header in $RPM_BUILD_ROOT%{_includedir}/openssl/* ; do
	if [ -f ${header} -a -f include/openssl/$(basename ${header}) ] ; then
		install -m644 include/openssl/`basename ${header}` ${header}
	fi
done

# Rename man pages so that they don't conflict with other system man pages.
pushd $RPM_BUILD_ROOT%{_mandir}
for manpage in man*/* ; do
	if [ -L ${manpage} ]; then
		TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
		ln -snf ${TARGET}ssl ${manpage}ssl
		rm -f ${manpage}
	else
		mv ${manpage} ${manpage}ssl
	fi
done
for conflict in passwd rand ; do
	rename ${conflict} ssl${conflict} man*/${conflict}*
done
popd

# Pick a CA script.
pushd  $RPM_BUILD_ROOT%{_datadir}/ssl/misc
mv CA.sh CA
popd

mkdir -m700 $RPM_BUILD_ROOT%{_datadir}/ssl/CA
mkdir -m700 $RPM_BUILD_ROOT%{_datadir}/ssl/CA/private

# Install root CA stuffs.
cat << EOF > RHNS-blurb.txt
#
#  RHNS CA certificate.  Appended to the ca-bundle at package build-time.
#
EOF
cat %{SOURCE3} RHNS-blurb.txt %{SOURCE4} > ca-bundle.crt
install -m644 ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/certs/
ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem

# Fix libdir.
sed 's,^libdir=${exec_prefix}/lib,libdir=${exec_prefix}/%{_lib},g' \
	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc > \
	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp && \
cat $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp > \
	$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc && \
rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/openssl.pc.tmp

# Determine which arch opensslconf.h is going to try to #include.
basearch=%{_arch}
%ifarch %{ix86}
basearch=i386
%endif

%ifarch %{multilib_arches}
# Do an opensslconf.h switcheroo to avoid file conflicts on systems where you
# can have both a 32- and 64-bit version of the library, and they each need
# their own correct-but-different versions of opensslconf.h to be usable.
install -m644 %{SOURCE10} \
   $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
cat $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h >> \
   $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
install -m644 %{SOURCE9} \
   $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
%endif

%ifarch %{optimize_arches}
# Remove bits which belong in subpackages.
rm -rf $RPM_BUILD_ROOT/%{_prefix}/include/openssl
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.so
rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3/*

rm -rf $RPM_BUILD_ROOT/%{_bindir}/c_rehash
rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1*/*.pl*
rm -rf $RPM_BUILD_ROOT/%{_datadir}/ssl/misc/*.pl
%endif

%ifarch s390 s390x
pushd libica-%{libicaversion}
if [[ $RPM_BUILD_ROOT  ]] ;
then
        export INSROOT=$RPM_BUILD_ROOT
fi
%makeinstall
mkdir -p $RPM_BUILD_ROOT/%{_libdir}
mv $RPM_BUILD_ROOT/%{_bindir}/libica.so $RPM_BUILD_ROOT/%{_libdir}/libica.so
cp -f include/ica_api.h $RPM_BUILD_ROOT%{_includedir}
popd
%endif

# Remove files not used by compatibility packages.
rm -fr $RPM_BUILD_ROOT/%{_bindir}/*
rm -fr $RPM_BUILD_ROOT/%{_datadir}/ssl
rm -fr $RPM_BUILD_ROOT/%{_includedir}
rm -fr $RPM_BUILD_ROOT/%{_libdir}/*.a
rm -fr $RPM_BUILD_ROOT/%{_libdir}/*.so
rm -fr $RPM_BUILD_ROOT/%{_libdir}/*.so.*
rm -fr $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
rm -fr $RPM_BUILD_ROOT/%{_mandir}

%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root)
%doc FAQ LICENSE CHANGES NEWS INSTALL README
%doc doc/README doc/c-indentation.el doc/openssl.txt
%doc doc/openssl_button.html doc/openssl_button.gif
%doc doc/ssleay.txt
%attr(0755,root,root) /%{_lib}/*.so.%{version}
/%{_lib}/*.so.%{soversion}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-5
- fix a few rpmlint warnings
- fix build if 'rand' or 'passwd' in buildroot path (#178782)

* 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

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Wed Oct 12 2005 Tomas Mraz <tmraz at redhat.com> 0.9.7a-4
- fix CAN-2005-2969 - remove SSL_OP_MSIE_SSLV2_RSA_PADDING which
  disables the countermeasure against man in the middle attack in SSLv2
  (#169863)
- more fixes for constant time/memory access for DSA signature algorithm
- updated ICA engine patch

* Fri May 20 2005 Tomas Mraz <tmraz at redhat.com> 0.9.7a-3
- fix CAN-2005-0109 - use constant time/memory access mod_exp
  so bits of private key aren't leaked by cache eviction (#157631)

* Wed Mar 16 2005 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Feb 28 2005 Tomas Mraz <tmraz at redhat.com> 0.9.7a-1
- change to a compatibility package by renaming and cutting the files lists

* Thu Feb 10 2005 Tomas Mraz <tmraz at redhat.com>
- Support UTF-8 charset in the Makefile.certificate (#134944)
- Added cmp to BuildPrereq

* Thu Jan 27 2005 Joe Orton <jorton at redhat.com> 0.9.7a-46
- generate new ca-bundle.crt from Mozilla certdata.txt (revision 1.32)

* Thu Dec 23 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-45
- Fixed and updated libica-1.3.4-urandom.patch patch (#122967)

* Fri Nov 19 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-44
- rebuild

* Fri Nov 19 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-43
- rebuild

* Fri Nov 19 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-42
- rebuild

* Fri Nov 19 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-41
- remove der_chop, as upstream cvs has done (CAN-2004-0975, #140040)

* Tue Oct 05 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-40
- Include latest libica version with important bugfixes

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jun 14 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-38
- Updated ICA engine IBM patch to latest upstream version.

* Mon Jun  7 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-37
- build for linux-alpha-gcc instead of alpha-gcc on alpha (Jeff Garzik)

* Tue May 25 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-36
- handle %%{_arch}=i486/i586/i686/athlon cases in the intermediate
  header (#124303)

* Thu Mar 25 2004 Joe Orton <jorton at redhat.com> 0.9.7a-35
- add security fixes for CAN-2004-0079, CAN-2004-0112

* Tue Mar 16 2004 Phil Knirsch <pknirsch at redhat.com>
- Fixed libica filespec.

* Thu Mar 10 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-34
- ppc/ppc64 define __powerpc__/__powerpc64__, not __ppc__/__ppc64__, fix
  the intermediate header

* Wed Mar 10 2004 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-33
- add an intermediate <openssl/opensslconf.h> which points to the right
  arch-specific opensslconf.h on multilib arches

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu Feb 26 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-32
- Updated libica to latest upstream version 1.3.5.

* Tue Feb 17 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-31
- Update ICA crypto engine patch from IBM to latest version.

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-29
- rebuilt

* Wed Feb 11 2004 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-28
- Fixed libica build.

* Wed Feb  4 2004 Nalin Dahyabhai <nalin at redhat.com>
- add "-ldl" to link flags added for Linux-on-ARM (#99313)

* Wed Feb  4 2004 Joe Orton <jorton at redhat.com> 0.9.7a-27
- updated ca-bundle.crt: removed expired GeoTrust roots, added
  freessl.com root, removed trustcenter.de Class 0 root

* Sun Nov 30 2003 Tim Waugh <twaugh at redhat.com> 0.9.7a-26
- Fix link line for libssl (bug #111154).

* Fri Oct 24 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-25
- add dependency on zlib-devel for the -devel package, which depends on zlib
  symbols because we enable zlib for libssl (#102962)

* Fri Oct 24 2003 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-24
- Use /dev/urandom instead of PRNG for libica.
- Apply libica-1.3.5 fix for /dev/urandom in icalinux.c
- Use latest ICA engine patch from IBM.

* Sat Oct  4 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-22.1
- rebuild

* Wed Oct  1 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-22
- rebuild (22 wasn't actually built, fun eh?)

* Tue Sep 30 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-23
- re-disable optimizations on ppc64

* Tue Sep 30 2003 Joe Orton <jorton at redhat.com>
- add a_mbstr.c fix for 64-bit platforms from CVS

* Tue Sep 30 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-22
- add -Wa,--noexecstack to RPM_OPT_FLAGS so that assembled modules get tagged
  as not needing executable stacks

* Mon Sep 29 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-21
- rebuild

* Thu Sep 25 2003 Nalin Dahyabhai <nalin at redhat.com>
- re-enable optimizations on ppc64

* Thu Sep 25 2003 Nalin Dahyabhai <nalin at redhat.com>
- remove exclusivearch

* Wed Sep 24 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-20
- only parse a client cert if one was requested
- temporarily exclusivearch for %%{ix86}

* Tue Sep 23 2003 Nalin Dahyabhai <nalin at redhat.com>
- add security fixes for protocol parsing bugs (CAN-2003-0543, CAN-2003-0544)
  and heap corruption (CAN-2003-0545)
- update RHNS-CA-CERT files
- ease back on the number of threads used in the threading test

* Wed Sep 17 2003 Matt Wilson <msw at redhat.com> 0.9.7a-19
- rebuild to fix gzipped file md5sums (#91211)

* Mon Aug 25 2003 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-18
- Updated libica to version 1.3.4.

* Thu Jul 17 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-17
- rebuild

* Tue Jul 15 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-10.9
- free the kssl_ctx structure when we free an SSL structure (#99066)

* Fri Jul 10 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-16
- rebuild

* Thu Jul 10 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-15
- lower thread test count on s390x

* Tue Jul  8 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-14
- rebuild

* Thu Jun 26 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-13
- disable assembly on arches where it seems to conflict with threading

* Thu Jun 26 2003 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-12
- Updated libica to latest upstream version 1.3.0

* Wed Jun 11 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-9.9
- rebuild

* Wed Jun 11 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-11
- rebuild

* Tue Jun 10 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-10
- ubsec: don't stomp on output data which might also be input data

* Tue Jun 10 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-9
- temporarily disable optimizations on ppc64

* Mon Jun  9 2003 Nalin Dahyabhai <nalin at redhat.com>
- backport fix for engine-used-for-everything from 0.9.7b
- backport fix for prng not being seeded causing problems, also from 0.9.7b
- add a check at build-time to ensure that RSA is thread-safe
- keep perlpath from stomping on the libica configure scripts

* Fri Jun  6 2003 Nalin Dahyabhai <nalin at redhat.com>
- thread-safety fix for RSA blinding

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com> 0.9.7a-8
- rebuilt

* Fri May 30 2003 Phil Knirsch <pknirsch at redhat.com> 0.9.7a-7
- Added libica-1.2 to openssl (featurerequest).

* Wed Apr 16 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-6
- fix building with incorrect flags on ppc64

* Wed Mar 19 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-5
- add patch to harden against Klima-Pokorny-Rosa extension of Bleichenbacher's
  attack (CAN-2003-0131)

* Mon Mar 17 2003 Nalin Dahyabhai <nalin at redhat.com>  0.9.7a-4
- add patch to enable RSA blinding by default, closing a timing attack
  (CAN-2003-0147)

* Wed Mar  5 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-3
- disable use of BN assembly module on x86_64, but continue to allow inline
  assembly (#83403)

* Thu Feb 27 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-2
- disable EC algorithms

* Wed Feb 19 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7a-1
- update to 0.9.7a

* Wed Feb 19 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7-8
- add fix to guard against attempts to allocate negative amounts of memory
- add patch for CAN-2003-0078, fixing a timing attack

* Thu Feb 13 2003 Elliot Lee <sopwith at redhat.com> 0.9.7-7
- Add openssl-ppc64.patch

* Mon Feb 10 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7-6
- EVP_DecryptInit should call EVP_CipherInit() instead of EVP_CipherInit_ex(),
  to get the right behavior when passed uninitialized context structures
  (#83766)
- build with -mcpu=ev5 on alpha family (#83828)

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Jan 17 2003 Phil Knirsch <pknirsch at redhat.com> 0.9.7-4
- Added IBM hw crypto support patch.

* Wed Jan 15 2003 Nalin Dahyabhai <nalin at redhat.com>
- add missing builddep on sed

* Thu Jan  9 2003 Bill Nottingham <notting at redhat.com> 0.9.7-3
- debloat
- fix broken manpage symlinks

* Wed Jan  8 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7-2
- fix double-free in 'openssl ca'

* Fri Jan  3 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.7-1
- update to 0.9.7 final

* Tue Dec 17 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.7-0
- update to 0.9.7 beta6 (DO NOT USE UNTIL UPDATED TO FINAL 0.9.7)

* Wed Dec 11 2002 Nalin Dahyabhai <nalin at redhat.com>
- update to 0.9.7 beta5 (DO NOT USE UNTIL UPDATED TO FINAL 0.9.7)

* Tue Oct 22 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-30
- add configuration stanza for x86_64 and use it on x86_64
- build for linux-ppc on ppc
- start running the self-tests again

* Wed Oct 02 2002 Elliot Lee <sopwith at redhat.com> 0.9.6b-29hammer.3
- Merge fixes from previous hammer packages, including general x86-64 and
  multilib

* Tue Aug  6 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-29
- rebuild

* Thu Aug  1 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-28
- update asn patch to fix accidental reversal of a logic check

* Wed Jul 31 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-27
- update asn patch to reduce chance that compiler optimization will remove
  one of the added tests

* Wed Jul 31 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-26
- rebuild

* Mon Jul 29 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-25
- add patch to fix ASN.1 vulnerabilities

* Thu Jul 25 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-24
- add backport of Ben Laurie's patches for OpenSSL 0.9.6d

* Wed Jul 17 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-23
- own %{_datadir}/ssl/misc

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Sun May 26 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Fri May 17 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-20
- free ride through the build system (whee!)

* Thu May 16 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-19
- rebuild in new environment

* Thu Apr  4 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-17, 0.9.6b-18
- merge RHL-specific bits into stronghold package, rename

* Tue Apr 02 2002 Gary Benson <gbenson at redhat.com> stronghold-0.9.6c-2
- add support for Chrysalis Luna token

* Tue Mar 26 2002 Gary Benson <gbenson at redhat.com>
- disable AEP random number generation, other AEP fixes

* Fri Mar 15 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-15
- only build subpackages on primary arches

* Thu Mar 14 2002 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-13
- on ia32, only disable use of assembler on i386
- enable assembly on ia64

* Mon Jan  7 2002 Florian La Roche <Florian.LaRoche at redhat.de> 0.9.6b-11
- fix sparcv9 entry

* Mon Jan  7 2002 Gary Benson <gbenson at redhat.com> stronghold-0.9.6c-1
- upgrade to 0.9.6c
- bump BuildArch to i686 and enable assembler on all platforms
- synchronise with shrimpy and rawhide
- bump soversion to 3

* Wed Oct 10 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- delete BN_LLONG for s390x, patch from Oliver Paukstadt

* Mon Sep 17 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-9
- update AEP driver patch

* Mon Sep 10 2001 Nalin Dahyabhai <nalin at redhat.com>
- adjust RNG disabling patch to match version of patch from Broadcom

* Fri Sep  7 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-8
- disable the RNG in the ubsec engine driver

* Tue Aug 28 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-7
- tweaks to the ubsec engine driver

* Fri Aug 24 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-6
- tweaks to the ubsec engine driver

* Thu Aug 23 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-5
- update ubsec engine driver from Broadcom

* Fri Aug 10 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-4
- move man pages back to %%{_mandir}/man?/foo.?ssl from
  %%{_mandir}/man?ssl/foo.?
- add an [ engine ] section to the default configuration file

* Thu Aug  9 2001 Nalin Dahyabhai <nalin at redhat.com>
- add a patch for selecting a default engine in SSL_library_init()

* Mon Jul 23 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-3
- add patches for AEP hardware support
- add patch to keep trying when we fail to load a cert from a file and
  there are more in the file
- add missing prototype for ENGINE_ubsec() in engine_int.h

* Wed Jul 18 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-2
- actually add hw_ubsec to the engine list

* Tue Jul 17 2001 Nalin Dahyabhai <nalin at redhat.com>
- add in the hw_ubsec driver from CVS

* Wed Jul 11 2001 Nalin Dahyabhai <nalin at redhat.com> 0.9.6b-1
- update to 0.9.6b

* Thu Jul  5 2001 Nalin Dahyabhai <nalin at redhat.com>
- move .so symlinks back to %%{_libdir}

* Tue Jul  3 2001 Nalin Dahyabhai <nalin at redhat.com>
- move shared libraries to /lib (#38410)

* Mon Jun 25 2001 Nalin Dahyabhai <nalin at redhat.com>
- switch to engine code base

* Mon Jun 18 2001 Nalin Dahyabhai <nalin at redhat.com>
- add a script for creating dummy certificates
- move man pages from %%{_mandir}/man?/foo.?ssl to %%{_mandir}/man?ssl/foo.?

* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- add s390x support

* Fri Jun  1 2001 Nalin Dahyabhai <nalin at redhat.com>
- change two memcpy() calls to memmove()
- don't define L_ENDIAN on alpha

* Wed May 23 2001 Joe Orton <jorton at redhat.com> stronghold-0.9.6a-1
- Add 'stronghold-' prefix to package names.
- Obsolete standard openssl packages.

* Wed May 16 2001 Joe Orton <jorton at redhat.com>
- Add BuildArch: i586 as per Nalin's advice.

* Tue May 15 2001 Joe Orton <jorton at redhat.com>
- Enable assembler on ix86 (using new .tar.bz2 which does
  include the asm directories).

* Tue May 15 2001 Nalin Dahyabhai <nalin at redhat.com>
- make subpackages depend on the main package

* Tue May  1 2001 Nalin Dahyabhai <nalin at redhat.com>
- adjust the hobble script to not disturb symlinks in include/ (fix from
  Joe Orton)

* Fri Apr 26 2001 Nalin Dahyabhai <nalin at redhat.com>
- drop the m2crypo patch we weren't using

* Tue Apr 24 2001 Nalin Dahyabhai <nalin at redhat.com>
- configure using "shared" as well

* Sun Apr  8 2001 Nalin Dahyabhai <nalin at redhat.com>
- update to 0.9.6a
- use the build-shared target to build shared libraries
- bump the soversion to 2 because we're no longer compatible with
  our 0.9.5a packages or our 0.9.6 packages
- drop the patch for making rsatest a no-op when rsa null support is used
- put all man pages into <section>ssl instead of <section>
- break the m2crypto modules into a separate package

* Tue Mar 13 2001 Nalin Dahyabhai <nalin at redhat.com>
- use BN_LLONG on s390

* Mon Mar 12 2001 Nalin Dahyabhai <nalin at redhat.com>
- fix the s390 changes for 0.9.6 (isn't supposed to be marked as 64-bit)

* Sat Mar  3 2001 Nalin Dahyabhai <nalin at redhat.com>
- move c_rehash to the perl subpackage, because it's a perl script now

* Fri Mar  2 2001 Nalin Dahyabhai <nalin at redhat.com>
- update to 0.9.6
- enable MD2
- use the libcrypto.so and libssl.so targets to build shared libs with
- bump the soversion to 1 because we're no longer compatible with any of
  the various 0.9.5a packages circulating around, which provide lib*.so.0

* Wed Feb 28 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- change hobble-openssl for disabling MD2 again

* Tue Feb 27 2001 Nalin Dahyabhai <nalin at redhat.com>
- re-disable MD2 -- the EVP_MD_CTX structure would grow from 100 to 152
  bytes or so, causing EVP_DigestInit() to zero out stack variables in
  apps built against a version of the library without it

* Mon Feb 26 2001 Nalin Dahyabhai <nalin at redhat.com>
- disable some inline assembly, which on x86 is Pentium-specific
- re-enable MD2 (see http://www.ietf.org/ietf/IPR/RSA-MD-all)

* Thu Feb 08 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- fix s390 patch

* Fri Dec 8 2000 Than Ngo <than at redhat.com>
- added support s390

* Mon Nov 20 2000 Nalin Dahyabhai <nalin at redhat.com>
- remove -Wa,* and -m* compiler flags from the default Configure file (#20656)
- add the CA.pl man page to the perl subpackage

* Thu Nov  2 2000 Nalin Dahyabhai <nalin at redhat.com>
- always build with -mcpu=ev5 on alpha

* Tue Oct 31 2000 Nalin Dahyabhai <nalin at redhat.com>
- add a symlink from cert.pem to ca-bundle.crt

* Wed Oct 25 2000 Nalin Dahyabhai <nalin at redhat.com>
- add a ca-bundle file for packages like Samba to reference for CA certificates

* Tue Oct 24 2000 Nalin Dahyabhai <nalin at redhat.com>
- remove libcrypto's crypt(), which doesn't handle md5crypt (#19295)

* Mon Oct  2 2000 Nalin Dahyabhai <nalin at redhat.com>
- add unzip as a buildprereq (#17662)
- update m2crypto to 0.05-snap4

* Tue Sep 26 2000 Bill Nottingham <notting at redhat.com>
- fix some issues in building when it's not installed

* Wed Sep  6 2000 Nalin Dahyabhai <nalin at redhat.com>
- make sure the headers we include are the ones we built with (aaaaarrgh!)

* Fri Sep  1 2000 Nalin Dahyabhai <nalin at redhat.com>
- add Richard Henderson's patch for BN on ia64
- clean up the changelog

* Tue Aug 29 2000 Nalin Dahyabhai <nalin at redhat.com>
- fix the building of python modules without openssl-devel already installed

* Wed Aug 23 2000 Nalin Dahyabhai <nalin at redhat.com>
- byte-compile python extensions without the build-root
- adjust the makefile to not remove temporary files (like .key files when
  building .csr files) by marking them as .PRECIOUS

* Sat Aug 19 2000 Nalin Dahyabhai <nalin at redhat.com>
- break out python extensions into a subpackage

* Mon Jul 17 2000 Nalin Dahyabhai <nalin at redhat.com>
- tweak the makefile some more

* Tue Jul 11 2000 Nalin Dahyabhai <nalin at redhat.com>
- disable MD2 support

* Thu Jul  6 2000 Nalin Dahyabhai <nalin at redhat.com>
- disable MDC2 support

* Sun Jul  2 2000 Nalin Dahyabhai <nalin at redhat.com>
- tweak the disabling of RC5, IDEA support
- tweak the makefile

* Thu Jun 29 2000 Nalin Dahyabhai <nalin at redhat.com>
- strip binaries and libraries
- rework certificate makefile to have the right parts for Apache

* Wed Jun 28 2000 Nalin Dahyabhai <nalin at redhat.com>
- use %%{_perl} instead of /usr/bin/perl
- disable alpha until it passes its own test suite

* Fri Jun  9 2000 Nalin Dahyabhai <nalin at redhat.com>
- move the passwd.1 man page out of the passwd package's way

* Fri Jun  2 2000 Nalin Dahyabhai <nalin at redhat.com>
- update to 0.9.5a, modified for U.S.
- add perl as a build-time requirement
- move certificate makefile to another package
- disable RC5, IDEA, RSA support
- remove optimizations for now

* Wed Mar  1 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- Bero told me to move the Makefile into this package

* Wed Mar  1 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- add lib*.so symlinks to link dynamically against shared libs

* Tue Feb 29 2000 Florian La Roche <Florian.LaRoche at redhat.de>
- update to 0.9.5
- run ldconfig directly in post/postun
- add FAQ

* Sat Dec 18 1999 Bernhard Rosenkrdnzer <bero at redhat.de>
- Fix build on non-x86 platforms

* Fri Nov 12 1999 Bernhard Rosenkrdnzer <bero at redhat.de>
- move /usr/share/ssl/* from -devel to main package

* Tue Oct 26 1999 Bernhard Rosenkrdnzer <bero at redhat.de>
- inital packaging
- changes from base:
  - Move /usr/local/ssl to /usr/share/ssl for FHS compliance
  - handle RPM_OPT_FLAGS


--- libica-1.2-struct.patch DELETED ---


--- openssl.spec DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 13:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 09:40:01 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.1,1.2
Message-ID: <200607041340.k64De1gx020329@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20236

Modified Files:
	openssl097a.spec 
Log Message:
- make libica build



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl097a.spec	4 Jul 2006 12:32:58 -0000	1.1
+++ openssl097a.spec	4 Jul 2006 13:39:53 -0000	1.2
@@ -170,6 +170,8 @@
 if [[ $RPM_BUILD_ROOT  ]] ; then
         export INSROOT=$RPM_BUILD_ROOT
 fi
+CPPFLAGS=-I../../include
+export CPPFLAGS
 %configure
 make
 popd



From fedora-cvs-commits at redhat.com  Tue Jul  4 13:47:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 09:47:17 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen.patch,1.14,1.15
Message-ID: <200607041347.k64DlHBA004788@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
new xen patch

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  613 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1110 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  123 
 arch/i386/mm/hypervisor.c                           |  468 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  694 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  432 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  376 --
 arch/ia64/kernel/gate.lds.S                         |   96 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   61 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  784 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/fault-xen.c~                         |  692 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   14 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   44 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  546 +++
 drivers/char/tpm/tpm_vtpm.h                         |   38 
 drivers/char/tpm/tpm_xen.c                          |  756 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   39 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |    8 
 drivers/oprofile/event_buffer.h                     |    3 
 drivers/oprofile/oprof.c                            |   19 
 drivers/oprofile/oprof.h                            |    2 
 drivers/oprofile/oprofile_files.c                   |   82 
 drivers/pci/Kconfig                                 |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  248 +
 drivers/xen/Makefile                                |   16 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  609 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  133 
 drivers/xen/blkback/interface.c                     |  165 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  410 ++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  185 +
 drivers/xen/core/evtchn.c                           |  846 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  316 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  255 +
 drivers/xen/netback/netback.c                       | 1039 +++++++
 drivers/xen/netback/xenbus.c                        |  396 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1551 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   82 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       | 1074 +++++++
 drivers/xen/tpmback/xenbus.c                        |  306 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1094 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   25 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  277 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |    8 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  418 +++
 include/xen/interface/arch-x86_32.h                 |  231 +
 include/xen/interface/arch-x86_64.h                 |  297 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  588 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   98 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |   92 
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   67 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |   94 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 lib/Makefile                                        |    3 
 log                                                 | 2293 ++++++++++++++++
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   41 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 403 files changed, 84789 insertions(+), 927 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.14 -r 1.15 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-2.6-xen.patch	18 Jun 2006 04:45:05 -0000	1.14
+++ linux-2.6-xen.patch	4 Jul 2006 13:47:13 -0000	1.15
@@ -1,6 +1,6 @@
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/boot-xen/Makefile	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
+--- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/boot-xen/Makefile	2006-05-09 12:32:33.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig	2006-05-27 02:37:47.000000000 +0200
-+++ merge/arch/i386/Kconfig	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
+--- linux-2.6/arch/i386/Kconfig	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig	2006-05-23 18:37:09.000000000 +0200
 @@ -91,6 +91,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
@@ -315,9 +315,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu merge/arch/i386/Kconfig.cpu
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-04-14 19:01:33.000000000 +0200
-+++ merge/arch/i386/Kconfig.cpu	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
+--- linux-2.6/arch/i386/Kconfig.cpu	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig.cpu	2006-05-09 12:32:33.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -327,9 +327,9 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug merge/arch/i386/Kconfig.debug
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig.debug	2006-04-20 13:58:44.000000000 +0200
-+++ merge/arch/i386/Kconfig.debug	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
+--- linux-2.6/arch/i386/Kconfig.debug	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/Kconfig.debug	2006-05-09 12:32:33.000000000 +0200
 @@ -84,6 +84,7 @@ config X86_MPPARSE
  config DOUBLEFAULT
  	default y
@@ -338,9 +338,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c merge/arch/i386/kernel/acpi/boot-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/acpi/boot-xen.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/acpi/boot-xen.c	2006-05-23 18:37:09.000000000 +0200
 @@ -0,0 +1,1167 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1509,9 +1509,9 @@
 +
 +	return 0;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile merge/arch/i386/kernel/acpi/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-03-10 14:25:05.000000000 +0100
-+++ merge/arch/i386/kernel/acpi/Makefile	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
+--- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/acpi/Makefile	2006-05-09 12:32:33.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1520,9 +1520,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c merge/arch/i386/kernel/apic-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/apic-xen.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
+--- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/apic-xen.c	2006-05-09 12:32:33.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1684,9 +1684,9 @@
 +
 +	return 0;
 +}
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c merge/arch/i386/kernel/asm-offsets.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/asm-offsets.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
+--- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/asm-offsets.c	2006-05-09 12:32:34.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <asm/fixmap.h>
  #include <asm/processor.h>
@@ -1713,9 +1713,9 @@
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c merge/arch/i386/kernel/cpu/common-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/common-xen.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/common-xen.c new/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/cpu/common-xen.c	2006-05-23 18:37:09.000000000 +0200
 @@ -0,0 +1,732 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2449,9 +2449,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile merge/arch/i386/kernel/cpu/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/Makefile	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/cpu/Makefile	2006-05-09 12:32:34.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2461,9 +2461,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c merge/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2662,9 +2662,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile merge/arch/i386/kernel/cpu/mtrr/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2005-11-07 20:02:43.000000000 +0100
-+++ merge/arch/i386/kernel/cpu/mtrr/Makefile	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/cpu/mtrr/Makefile	2006-05-09 12:32:34.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2676,15 +2676,15 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c merge/arch/i386/kernel/early_printk-xen.c
---- ../upstream/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/early_printk-xen.c	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/early_printk-xen.c new/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/early_printk-xen.c	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S merge/arch/i386/kernel/entry.S
---- ../upstream/hg/linux-2.6/arch/i386/kernel/entry.S	2006-04-04 08:17:22.000000000 +0200
-+++ merge/arch/i386/kernel/entry.S	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry.S new/arch/i386/kernel/entry.S
+--- linux-2.6/arch/i386/kernel/entry.S	2006-07-03 14:14:14.000000000 +0200
++++ new/arch/i386/kernel/entry.S	2006-05-09 12:32:34.000000000 +0200
 @@ -177,7 +177,7 @@ need_resched:
  
  	# sysenter call handler stub
@@ -2730,9 +2730,9 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S merge/arch/i386/kernel/entry-xen.S
---- ../upstream/hg/linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/kernel/entry-xen.S	2006-05-30 12:42:43.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry-xen.S new/arch/i386/kernel/entry-xen.S
+--- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
++++ new/arch/i386/kernel/entry-xen.S	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,903 @@
 +/*
 + *  linux/arch/i386/entry.S
@@ -3637,9 +3637,9 @@
 +#include "syscall_table.S"
 +
 +syscall_table_size=(.-sys_call_table)
[...26418 lines suppressed...]
++  LD [M]  net/netfilter/xt_tcpudp.ko
++  CC      net/sunrpc/auth_gss/auth_rpcgss.mod.o
++  LD [M]  net/sunrpc/auth_gss/auth_rpcgss.ko
++  CC      net/sunrpc/auth_gss/rpcsec_gss_krb5.mod.o
++  LD [M]  net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
++  CC      net/sunrpc/auth_gss/rpcsec_gss_spkm3.mod.o
++  LD [M]  net/sunrpc/auth_gss/rpcsec_gss_spkm3.ko
++  CC      net/sunrpc/sunrpc.mod.o
++  LD [M]  net/sunrpc/sunrpc.ko
++  CC      sound/soundcore.mod.o
++  LD [M]  sound/soundcore.ko
+diff -urNp --exclude=.hg linux-2.6/mm/highmem.c new/mm/highmem.c
+--- linux-2.6/mm/highmem.c	2006-07-03 14:15:20.000000000 +0200
++++ new/mm/highmem.c	2006-05-09 12:35:59.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -86374,9 +88927,9 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/Kconfig merge/mm/Kconfig
---- ../upstream/hg/linux-2.6/mm/Kconfig	2006-04-04 08:18:24.000000000 +0200
-+++ merge/mm/Kconfig	2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/Kconfig new/mm/Kconfig
+--- linux-2.6/mm/Kconfig	2006-07-03 14:15:20.000000000 +0200
++++ new/mm/Kconfig	2006-05-09 12:40:16.000000000 +0200
 @@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -86392,9 +88945,9 @@
  	default "4"
  
  #
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/memory.c merge/mm/memory.c
---- ../upstream/hg/linux-2.6/mm/memory.c	2006-04-04 08:18:24.000000000 +0200
-+++ merge/mm/memory.c	2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/memory.c new/mm/memory.c
+--- linux-2.6/mm/memory.c	2006-07-03 14:15:20.000000000 +0200
++++ new/mm/memory.c	2006-06-28 14:32:14.000000000 +0200
 @@ -402,7 +402,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -86405,15 +88958,7 @@
  		return NULL;
  	}
  
-@@ -964,6 +965,7 @@ int get_user_pages(struct task_struct *t
- {
- 	int i;
- 	unsigned int vm_flags;
-+	int xenpage = 0;
- 
- 	/* 
- 	 * Require read or write permissions.
-@@ -1017,6 +1019,27 @@ int get_user_pages(struct task_struct *t
+@@ -1017,6 +1018,26 @@ int get_user_pages(struct task_struct *t
  			continue;
  		}
  
@@ -86421,7 +88966,6 @@
 +		if (vma && (vma->vm_flags & VM_FOREIGN)) {
 +			struct page **map = vma->vm_private_data;
 +			int offset = (start - vma->vm_start) >> PAGE_SHIFT;
-+			xenpage =1;
 +			if (map[offset] != NULL) {
 +			        if (pages) {
 +			                struct page *page = map[offset];
@@ -86441,7 +88985,7 @@
  		if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
  				|| !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1356,6 +1379,102 @@ int remap_pfn_range(struct vm_area_struc
+@@ -1356,6 +1377,102 @@ int remap_pfn_range(struct vm_area_struc
  }
  EXPORT_SYMBOL(remap_pfn_range);
  
@@ -86544,9 +89088,9 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/mmap.c merge/mm/mmap.c
---- ../upstream/hg/linux-2.6/mm/mmap.c	2006-04-14 19:01:47.000000000 +0200
-+++ merge/mm/mmap.c	2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/mmap.c new/mm/mmap.c
+--- linux-2.6/mm/mmap.c	2006-07-03 14:15:20.000000000 +0200
++++ new/mm/mmap.c	2006-05-09 12:35:59.000000000 +0200
 @@ -1942,6 +1942,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -86558,9 +89102,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/mm/page_alloc.c merge/mm/page_alloc.c
---- ../upstream/hg/linux-2.6/mm/page_alloc.c	2006-05-27 02:38:10.000000000 +0200
-+++ merge/mm/page_alloc.c	2006-05-30 12:44:03.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/mm/page_alloc.c new/mm/page_alloc.c
+--- linux-2.6/mm/page_alloc.c	2006-07-03 14:15:20.000000000 +0200
++++ new/mm/page_alloc.c	2006-05-23 18:37:12.000000000 +0200
 @@ -438,7 +438,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -86581,9 +89125,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/dev.c merge/net/core/dev.c
---- ../upstream/hg/linux-2.6/net/core/dev.c	2006-05-27 02:38:11.000000000 +0200
-+++ merge/net/core/dev.c	2006-05-30 12:45:46.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/core/dev.c new/net/core/dev.c
+--- linux-2.6/net/core/dev.c	2006-07-03 14:15:21.000000000 +0200
++++ new/net/core/dev.c	2006-06-05 15:54:33.000000000 +0200
 @@ -116,6 +116,12 @@
  #include <asm/current.h>
  #include <linux/audit.h>
@@ -86682,9 +89226,9 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/core/skbuff.c merge/net/core/skbuff.c
---- ../upstream/hg/linux-2.6/net/core/skbuff.c	2006-04-21 20:21:11.000000000 +0200
-+++ merge/net/core/skbuff.c	2006-05-30 12:44:04.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/core/skbuff.c new/net/core/skbuff.c
+--- linux-2.6/net/core/skbuff.c	2006-07-03 14:15:21.000000000 +0200
++++ new/net/core/skbuff.c	2006-05-09 12:36:02.000000000 +0200
 @@ -140,6 +140,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -86770,9 +89314,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-05-30 12:44:05.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c new/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-05-23 18:37:13.000000000 +0200
 @@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -86792,9 +89336,9 @@
  	return 1;
  }
  
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-05-30 12:44:05.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c new/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-05-23 18:37:13.000000000 +0200
 @@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
  		newport = tuple->dst.u.udp.port;
  		portptr = &hdr->dest;
@@ -86817,9 +89361,9 @@
  	*portptr = newport;
  	return 1;
  }
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
---- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-05-13 02:59:54.000000000 +0200
-+++ merge/net/ipv4/xfrm4_output.c	2006-05-30 12:44:06.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv4/xfrm4_output.c new/net/ipv4/xfrm4_output.c
+--- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv4/xfrm4_output.c	2006-05-09 12:36:06.000000000 +0200
 @@ -17,6 +17,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -86840,9 +89384,28 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
---- ../upstream/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ merge/scripts/Makefile.xen	2006-05-30 12:44:09.000000000 +0200
+diff -urNp --exclude=.hg linux-2.6/net/ipv6/addrconf.c new/net/ipv6/addrconf.c
+--- linux-2.6/net/ipv6/addrconf.c	2006-07-03 14:15:22.000000000 +0200
++++ new/net/ipv6/addrconf.c	2006-06-28 14:32:14.000000000 +0200
+@@ -2461,6 +2461,7 @@ static void addrconf_dad_start(struct in
+ 	spin_lock_bh(&ifp->lock);
+ 
+ 	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
++	    !(dev->flags&IFF_MULTICAST) ||
+ 	    !(ifp->flags&IFA_F_TENTATIVE)) {
+ 		ifp->flags &= ~IFA_F_TENTATIVE;
+ 		spin_unlock_bh(&ifp->lock);
+@@ -2545,6 +2546,7 @@ static void addrconf_dad_completed(struc
+ 	if (ifp->idev->cnf.forwarding == 0 &&
+ 	    ifp->idev->cnf.rtr_solicits > 0 &&
+ 	    (dev->flags&IFF_LOOPBACK) == 0 &&
++	    (dev->flags & IFF_MULTICAST) &&
+ 	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
+ 		struct in6_addr all_routers;
+ 
+diff -urNp --exclude=.hg linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
+--- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ new/scripts/Makefile.xen	2006-05-09 12:40:15.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Tue Jul  4 13:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 09:47:39 -0400
Subject: rpms/kernel/FC-5 Makefile.config, 1.38, 1.39 kernel-2.6.spec, 1.2145,
	1.2146
Message-ID: <200607041347.k64DldXA004928@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
add support for xen unified kernel & PAE support on that kernel


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Makefile.config,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.config	6 Jun 2006 04:35:22 -0000	1.38
+++ Makefile.config	4 Jul 2006 13:47:36 -0000	1.39
@@ -13,7 +13,7 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
-	$(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \
+	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
 	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -129,18 +129,19 @@
 kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE kernel-$(VERSION)-i686-xen0.config
-	perl scripts/merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE kernel-$(VERSION)-i686-xenU.config
-	perl scripts/merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
 kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
+kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen kernel-$(VERSION)-i686-xen0.config
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen kernel-$(VERSION)-x86_64-xen0.config
+	perl scripts/merge.pl $^ x86_64 > $@
+
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2145
retrieving revision 1.2146
diff -u -r1.2145 -r1.2146
--- kernel-2.6.spec	30 Jun 2006 18:47:17 -0000	1.2145
+++ kernel-2.6.spec	4 Jul 2006 13:47:36 -0000	1.2146
@@ -9,7 +9,6 @@
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
-%define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
 
@@ -53,11 +52,6 @@
 %define buildkdump 1
 %endif
 
-# ... and XenPAE only on i686
-%ifnarch i686
-%define buildxenPAE 0
-%endif
-
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch %{all_x86}
@@ -225,10 +219,10 @@
 
 Source35: kernel-%{kversion}-i686-xen0.config
 Source36: kernel-%{kversion}-i686-xenU.config
-Source37: kernel-%{kversion}-i686-xen0-PAE.config
-Source38: kernel-%{kversion}-i686-xenU-PAE.config
-Source39: kernel-%{kversion}-x86_64-xen0.config
-Source40: kernel-%{kversion}-x86_64-xenU.config
+Source37: kernel-%{kversion}-i686-xen.config
+Source38: kernel-%{kversion}-x86_64-xen0.config
+Source49: kernel-%{kversion}-x86_64-xenU.config
+Source40: kernel-%{kversion}-x86_64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -530,42 +524,42 @@
 against the kernel package.
 
 
-%package xen0-PAE
-Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support
+%package xen
+Summary: The Linux kernel compiled for Xen VM operations with PAE support
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
 Prereq: %{kernel_prereq}
 Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
-# the xen0-PAE kernel needs a newer mkinitrd than everything else right now
+# the xen kernel needs a newer mkinitrd than everything else right now
 Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description xen0-PAE
+%description xen
 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
+Xen's VM with PAE support and provides device services to the
 unprivileged guests.
 
 Install this package in your Xen guest0 environment.
 
 
-%package xen0-PAE-devel
+%package xen-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE
+Provides: kernel-xen-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen
+Provides: kernel-devel = %{rpmversion}-%{release}xen
 Prereq: /usr/bin/find
 
-%description xen0-PAE-devel
+%description xen-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
@@ -603,39 +597,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package xenU-PAE
-Summary: The Linux kernel compiled for unprivileged Xen guest VMs with PAE support
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Prereq: %{kernel_prereq}
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xenU-PAE
-This package includes a version of the Linux kernel which runs in Xen
-unprivileged guest VMs with PAE support.  This should be installed
-both inside the unprivileged guest (for the modules) and in the guest0
-domain.
-
-%package xenU-PAE-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE
-Prereq: /usr/bin/find
-
-%description xenU-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
 
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
@@ -1258,12 +1219,11 @@
 %if %{buildxen}
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
-%if %{buildxenPAE}
+# FixMe: Juan Quintela (when no PAE is not needed anymore)
   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}
@@ -1282,11 +1242,7 @@
 %endif
 
 %if %{includexen}
-%if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz xen0-PAE
-BuildKernel vmlinuz vmlinuz xenU-PAE
-%endif
-
+BuildKernel vmlinuz vmlinuz xen
 %if %{buildxen}
 BuildKernel vmlinuz vmlinuz xen0
 BuildKernel vmlinuz vmlinuz xenU
@@ -1406,28 +1362,19 @@
   popd > /dev/null
 fi
 
-%post xen0-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE
-/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen0-PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
+%post xen
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
+if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+else 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
-
-%post xenU-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU-PAE
-/sbin/new-kernel-pkg --package kernel-xenU-PAE --mkinitrd --depmod --install %{KVERREL}xenU-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post xenU-PAE-devel
+%post xen-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} > /dev/null
+  pushd /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
 fi
@@ -1464,13 +1411,9 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xenU
 
-%preun xen0-PAE
+%preun xen
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0-PAE
-
-%preun xenU-PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU-PAE
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
 
 ###
@@ -1555,45 +1498,26 @@
 /usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
-%files xen0-PAE
+%files xen
 %defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE
-/boot/System.map-%{KVERREL}xen0-PAE
-/boot/config-%{KVERREL}xen0-PAE
+/%{image_install_path}/vmlinuz-%{KVERREL}xen
+/boot/System.map-%{KVERREL}xen
+/boot/config-%{KVERREL}xen
 /boot/xen.gz-%{KVERREL}-PAE
 /boot/xen-syms-%{KVERREL}-PAE
-%dir /lib/modules/%{KVERREL}xen0-PAE
-/lib/modules/%{KVERREL}xen0-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0-PAE/build
-/lib/modules/%{KVERREL}xen0-PAE/source
+%dir /lib/modules/%{KVERREL}xen
+/lib/modules/%{KVERREL}xen/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen/build
+/lib/modules/%{KVERREL}xen/source
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0-PAE/extra
-/lib/modules/%{KVERREL}xen0-PAE/updates
+/lib/modules/%{KVERREL}xen/extra
+/lib/modules/%{KVERREL}xen/updates
 
-%files xen0-PAE-devel
+%files xen-devel
 %defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 
-%files xenU-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE
-/boot/System.map-%{KVERREL}xenU-PAE
-/boot/config-%{KVERREL}xenU-PAE
-%dir /lib/modules/%{KVERREL}xenU-PAE
-/lib/modules/%{KVERREL}xenU-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xenU-PAE/build
-/lib/modules/%{KVERREL}xenU-PAE/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU-PAE/extra
-/lib/modules/%{KVERREL}xenU-PAE/updates
-
-%files xenU-PAE-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu}
-%endif
 %endif
 
 %if %{buildkdump}



From fedora-cvs-commits at redhat.com  Tue Jul  4 13:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 09:47:39 -0400
Subject: rpms/kernel/FC-5/configs config-xen-xen,NONE,1.1
Message-ID: <200607041347.k64Dld8o004937@cvs.devel.redhat.com>

Author: quintela

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

Added Files:
	config-xen-xen 
Log Message:
add support for xen unified kernel & PAE support on that kernel


--- NEW FILE config-xen-xen ---
#
# XEN
#

# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HIGHMEM=y

CONFIG_XEN_BLKDEV_BACKEND=m
CONFIG_XEN_NETDEV_BACKEND=m
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m



From fedora-cvs-commits at redhat.com  Tue Jul  4 13:47:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 09:47:41 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.2,1.3
Message-ID: <200607041347.k64DlfMp004949@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4850

Modified Files:
	openssl097a.spec 
Log Message:
- bump release



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openssl097a.spec	4 Jul 2006 13:39:53 -0000	1.2
+++ openssl097a.spec	4 Jul 2006 13:47:38 -0000	1.3
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl097a
 Version: 0.9.7a
-Release: 5
+Release: 6
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -388,7 +388,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-5
+* Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-6
 - fix a few rpmlint warnings
 - fix build if 'rand' or 'passwd' in buildroot path (#178782)
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 14:07:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 10:07:57 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2146,1.2147
Message-ID: <200607041407.k64E7uVJ010706@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
build xen kernel only when xen0/xenU are built


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2146
retrieving revision 1.2147
diff -u -r1.2146 -r1.2147
--- kernel-2.6.spec	4 Jul 2006 13:47:36 -0000	1.2146
+++ kernel-2.6.spec	4 Jul 2006 14:07:52 -0000	1.2147
@@ -1242,8 +1242,8 @@
 %endif
 
 %if %{includexen}
-BuildKernel vmlinuz vmlinuz xen
 %if %{buildxen}
+BuildKernel vmlinuz vmlinuz xen
 BuildKernel vmlinuz vmlinuz xen0
 BuildKernel vmlinuz vmlinuz xenU
 %endif



From fedora-cvs-commits at redhat.com  Tue Jul  4 14:34:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 10:34:13 -0400
Subject: rpms/openssl097a/devel libica-1.3.6-no-config-h.patch, NONE,
	1.1 openssl097a.spec, 1.3, 1.4
Message-ID: <200607041434.k64EYDS2001103@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1043

Modified Files:
	openssl097a.spec 
Added Files:
	libica-1.3.6-no-config-h.patch 
Log Message:
- make libica build in brew


libica-1.3.6-no-config-h.patch:
 icalinux.c |    1 -
 sha1.c     |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE libica-1.3.6-no-config-h.patch ---
--- libica-1.3.6-rc3/src/sha1.c.no-config-h	2005-10-21 17:35:03.000000000 +0200
+++ libica-1.3.6-rc3/src/sha1.c	2006-05-11 14:18:39.000000000 +0200
@@ -355,7 +355,6 @@
 #include <string.h>
 
 #include "platform.h"
-#include <linux/config.h>
 #ifdef __s390__
 #define _LINUX_S390_ 1
 #ifdef _LINUX_S390_
--- libica-1.3.6-rc3/src/icalinux.c.no-config-h	2006-05-11 12:59:23.000000000 +0200
+++ libica-1.3.6-rc3/src/icalinux.c	2006-05-11 14:19:03.000000000 +0200
@@ -384,7 +384,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <linux/config.h>
 
 #ifdef __s390__
 #ifndef _LINUX_S390_


Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openssl097a.spec	4 Jul 2006 13:47:38 -0000	1.3
+++ openssl097a.spec	4 Jul 2006 14:34:10 -0000	1.4
@@ -43,6 +43,7 @@
 Patch7: openssl-0.9.7-ppc64.patch
 Patch8: openssl-sec3-blinding-0.9.7.patch
 Patch9: openssl-0.9.7a-klima-pokorny-rosa.patch
+Patch10: libica-1.3.6-no-config-h.patch
 Patch11: libica-1.2-cleanup.patch
 Patch12: openssl-0.9.7a-libica-autoconf.patch
 Patch13: openssl-0.9.7a-blinding-threads.patch
@@ -120,6 +121,7 @@
 
 %ifarch s390 s390x
 pushd libica-%{libicaversion}
+%patch10 -p1 -b .no-config-h
 %patch11 -p1 -b .cleanup
 if [[ $RPM_BUILD_ROOT  ]] ; then
         export INSROOT=$RPM_BUILD_ROOT
@@ -391,6 +393,7 @@
 * Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-6
 - fix a few rpmlint warnings
 - fix build if 'rand' or 'passwd' in buildroot path (#178782)
+- make libica build in brew
 
 * 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)



From fedora-cvs-commits at redhat.com  Tue Jul  4 14:35:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 10:35:33 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2147,1.2148
Message-ID: <200607041435.k64EZXdV001469@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
build xen kernel only when xen0/xenU are built (take 2)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2147
retrieving revision 1.2148
diff -u -r1.2147 -r1.2148
--- kernel-2.6.spec	4 Jul 2006 14:07:52 -0000	1.2147
+++ kernel-2.6.spec	4 Jul 2006 14:35:20 -0000	1.2148
@@ -1496,7 +1496,6 @@
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
-%endif
 
 %files xen
 %defattr(-,root,root)
@@ -1519,6 +1518,7 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 
 %endif
+%endif
 
 %if %{buildkdump}
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 15:05:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 11:05:10 -0400
Subject: rpms/hplip/devel hplip-libm.patch,NONE,1.1 hplip.spec,1.87,1.88
Message-ID: <200607041505.k64F5A58025591@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25561

Modified Files:
	hplip.spec 
Added Files:
	hplip-libm.patch 
Log Message:
* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-3
- libhpip should link against libm (bug #197599).


hplip-libm.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hplip-libm.patch ---
--- hplip-1.6.6a/Makefile.in.libm	2006-07-04 15:55:53.000000000 +0100
+++ hplip-1.6.6a/Makefile.in	2006-07-04 15:56:36.000000000 +0100
@@ -480,7 +480,7 @@
     ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
 
-libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LDFLAGS = -lm -version-info 0:1:0
 
 # sane backend
 BASENAME = sane-hpaio
--- hplip-1.6.6a/Makefile.am.libm	2006-07-04 15:55:24.000000000 +0100
+++ hplip-1.6.6a/Makefile.am	2006-07-04 15:55:36.000000000 +0100
@@ -151,7 +151,7 @@
     ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
     ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
-libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LDFLAGS = -lm -version-info 0:1:0
 
 # sane backend
 BASENAME=sane-hpaio


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- hplip.spec	28 Jun 2006 07:53:52 -0000	1.87
+++ hplip.spec	4 Jul 2006 15:05:08 -0000	1.88
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.6.6a
-Release: 2
+Release: 3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -15,6 +15,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-compile.patch
+Patch6: hplip-libm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -77,6 +78,9 @@
 # Work around missing linux/compiler.h.
 %patch5 -p1 -b .compile
 
+# libhpip should link against libm (bug #197599).
+%patch6 -p1 -b .libm
+
 autoconf # for patch4
 
 %build
@@ -177,7 +181,10 @@
 exit 0
 
 %changelog
-* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1
+* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-3
+- libhpip should link against libm (bug #197599).
+
+* Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-2
 - 1.6.6a.
 
 * Mon Jun 26 2006 Tim Waugh <twaugh at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jul  4 15:06:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 11:06:15 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.4,1.5
Message-ID: <200607041506.k64F6Fqv025692@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25628

Modified Files:
	openssl097a.spec 
Log Message:
- libica requires openssl to build



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openssl097a.spec	4 Jul 2006 14:34:10 -0000	1.4
+++ openssl097a.spec	4 Jul 2006 15:06:02 -0000	1.5
@@ -68,7 +68,9 @@
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
-BuildRequires: automake14, autoconf, libtool
+%ifarch s390 s390x
+BuildRequires: automake14, autoconf, libtool, openssl
+%endif
 Requires: mktemp
 Conflicts: openssl <= %{version}
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 16:22:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 12:22:30 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2148,1.2149
Message-ID: <200607041622.k64GMU6O012034@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
add changelog entries for xen PAE, xen & upstream rebase


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2148
retrieving revision 1.2149
diff -u -r1.2148 -r1.2149
--- kernel-2.6.spec	4 Jul 2006 14:35:20 -0000	1.2148
+++ kernel-2.6.spec	4 Jul 2006 16:22:27 -0000	1.2149
@@ -1551,6 +1551,11 @@
 %endif
 
 %changelog
+* Tue Jul  4 2006 Juan Quintela <quintela at redhat.com>
+- new merge with xen upstream.
+- new xen kernel (same as rawhide one) with PAE support
+- removed xen0-PAE & xenU-PAE (see xen kernel).
+
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.3
 - 2.6.17.2



From fedora-cvs-commits at redhat.com  Tue Jul  4 16:59:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 12:59:02 -0400
Subject: rpms/cups/devel cups-svn5706.patch, NONE, 1.1 cups-direct-usb.patch,
	1.1, 1.2 cups-relro.patch, 1.5, 1.6 cups-str1705.patch, 1.4,
	1.5 cups.spec, 1.223, 1.224 cups-localhost.patch, 1.1,
	NONE cups-str1736.patch, 1.1, NONE cups-str1740.patch, 1.1,
	NONE cups-str1758.patch, 1.1, NONE cups-str1776.patch, 1.1, NONE
Message-ID: <200607041659.k64Gx22Q006156@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-direct-usb.patch cups-relro.patch cups-str1705.patch 
	cups.spec 
Added Files:
	cups-svn5706.patch 
Removed Files:
	cups-localhost.patch cups-str1736.patch cups-str1740.patch 
	cups-str1758.patch cups-str1776.patch 
Log Message:
* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-17
- Sync with svn5706.
- No longer need localhost, str1740, str1758, str1736, str1776 patches.


cups-svn5706.patch:
 .svn/dir-wcprops                                                                         |    0 
 .svn/entries                                                                             |    0 
 .svn/text-base/CHANGES.txt.svn-base                                                      |    0 
 .svn/text-base/Makedefs.in.svn-base                                                      |    0 
 .svn/text-base/config.h.in.svn-base                                                      |    0 
 .svn/text-base/configure.in.svn-base                                                     |    0 
 .svn/text-base/cups-config.in.svn-base                                                   |    0 
 .svn/wcprops/CHANGES-1.0.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES-1.1.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES.txt.svn-work                                                        |    0 
 .svn/wcprops/CREDITS.txt.svn-work                                                        |    0 
 .svn/wcprops/INSTALL.txt.svn-work                                                        |    0 
 .svn/wcprops/LICENSE.txt.svn-work                                                        |    0 
 .svn/wcprops/Makedefs.in.svn-work                                                        |    0 
 .svn/wcprops/Makefile.svn-work                                                           |    0 
 .svn/wcprops/README.txt.svn-work                                                         |    0 
 .svn/wcprops/config.h.in.svn-work                                                        |    0 
 .svn/wcprops/configure.in.svn-work                                                       |    0 
 .svn/wcprops/cups-config.in.svn-work                                                     |    0 
 .svn/wcprops/install-sh.svn-work                                                         |    0 
 CHANGES.txt                                                                              |   96 +
 Makedefs.in                                                                              |   10 
 backend/.svn/dir-prop-base                                                               |    0 
 backend/.svn/dir-props                                                                   |    0 
 backend/.svn/dir-wcprops                                                                 |    0 
 backend/.svn/entries                                                                     |    0 
 backend/.svn/prop-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/prop-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/prop-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/prop-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/prop-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/prop-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/prop-base/runloop.c.svn-base                                                |    0 
 backend/.svn/props/backend-private.h.svn-work                                            |    0 
 backend/.svn/props/easysw-firewire-design.txt.svn-work                                   |    0 
 backend/.svn/props/easysw-firewire-linux.txt.svn-work                                    |    0 
 backend/.svn/props/ieee1394-linux.c.svn-work                                             |    0 
 backend/.svn/props/ieee1394.c.svn-work                                                   |    0 
 backend/.svn/props/ieee1394.h.svn-work                                                   |    0 
 backend/.svn/props/runloop.c.svn-work                                                    |    0 
 backend/.svn/text-base/Dependencies.svn-base                                             |    0 
 backend/.svn/text-base/Makefile.svn-base                                                 |    0 
 backend/.svn/text-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/text-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/text-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/text-base/ieee1284.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/text-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/text-base/ipp.c.svn-base                                                    |    0 
 backend/.svn/text-base/parallel.c.svn-base                                               |    0 
 backend/.svn/text-base/runloop.c.svn-base                                                |    0 
 backend/.svn/text-base/serial.c.svn-base                                                 |    0 
 backend/.svn/text-base/snmp.c.svn-base                                                   |    0 
 backend/.svn/text-base/socket.c.svn-base                                                 |    0 
 backend/.svn/text-base/test1284.c.svn-base                                               |    0 
 backend/.svn/text-base/usb-darwin.c.svn-base                                             |    0 
 backend/.svn/text-base/usb-unix.c.svn-base                                               |    0 
 backend/.svn/text-base/usb.c.svn-base                                                    |    0 
 backend/.svn/wcprops/Dependencies.svn-work                                               |    0 
 backend/.svn/wcprops/Makefile.svn-work                                                   |    0 
 backend/.svn/wcprops/backend-private.h.svn-work                                          |    0 
 backend/.svn/wcprops/betest.c.svn-work                                                   |    0 
 backend/.svn/wcprops/easysw-firewire-design.txt.svn-work                                 |    0 
 backend/.svn/wcprops/easysw-firewire-linux.txt.svn-work                                  |    0 
 backend/.svn/wcprops/ieee1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394-linux.c.svn-work                                           |    0 
 backend/.svn/wcprops/ieee1394.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394.h.svn-work                                                 |    0 
 backend/.svn/wcprops/ipp.c.svn-work                                                      |    0 
 backend/.svn/wcprops/lpd.c.svn-work                                                      |    0 
 backend/.svn/wcprops/pap.c.svn-work                                                      |    0 
 backend/.svn/wcprops/parallel.c.svn-work                                                 |    0 
 backend/.svn/wcprops/runloop.c.svn-work                                                  |    0 
 backend/.svn/wcprops/scsi-irix.c.svn-work                                                |    0 
 backend/.svn/wcprops/scsi-linux.c.svn-work                                               |    0 
 backend/.svn/wcprops/scsi.c.svn-work                                                     |    0 
 backend/.svn/wcprops/serial.c.svn-work                                                   |    0 
 backend/.svn/wcprops/snmp.c.svn-work                                                     |    0 
 backend/.svn/wcprops/snmp.txt.svn-work                                                   |    0 
 backend/.svn/wcprops/socket.c.svn-work                                                   |    0 
 backend/.svn/wcprops/test1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb-darwin.c.svn-work                                               |    0 
 backend/.svn/wcprops/usb-unix.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb.c.svn-work                                                      |    0 
 backend/Dependencies                                                                     |   39 
 backend/Makefile                                                                         |   40 
 backend/backend-private.h                                                                |   73 
 backend/easysw-firewire-design.txt                                                       |   70 
 backend/easysw-firewire-linux.txt                                                        |   35 
 backend/ieee1284.c                                                                       |   77 
 backend/ieee1394-linux.c                                                                 |  877 ----------
 backend/ieee1394.c                                                                       |  267 ---
 backend/ieee1394.h                                                                       |  103 -
 backend/ipp.c                                                                            |    7 
 backend/parallel.c                                                                       |  207 --
 backend/runloop.c                                                                        |  218 ++
 backend/serial.c                                                                         |  293 +--
 backend/snmp.c                                                                           |   31 
 backend/socket.c                                                                         |  299 +--
 backend/test1284.c                                                                       |    9 
 backend/usb-darwin.c                                                                     |    6 
 backend/usb-unix.c                                                                       |  232 --
 backend/usb.c                                                                            |   25 
 berkeley/.svn/dir-wcprops                                                                |    0 
 berkeley/.svn/entries                                                                    |    0 
 berkeley/.svn/text-base/lpq.c.svn-base                                                   |    0 
 berkeley/.svn/text-base/lprm.c.svn-base                                                  |    0 
 berkeley/.svn/wcprops/Dependencies.svn-work                                              |    0 
 berkeley/.svn/wcprops/Makefile.svn-work                                                  |    0 
 berkeley/.svn/wcprops/lpc.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpq.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpr.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lprm.c.svn-work                                                    |    0 
 berkeley/lpq.c                                                                           |    6 
 berkeley/lprm.c                                                                          |   35 
 cgi-bin/.svn/dir-wcprops                                                                 |    0 
 cgi-bin/.svn/entries                                                                     |    0 
 cgi-bin/.svn/text-base/help-index.c.svn-base                                             |    0 
 cgi-bin/.svn/wcprops/Dependencies.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/Makefile.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/admin.c.svn-work                                                    |    0 
 cgi-bin/.svn/wcprops/cgi-private.h.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/cgi.h.svn-work                                                      |    0 
 cgi-bin/.svn/wcprops/classes.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/help-index.c.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help-index.h.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/html.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/ipp-var.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/jobs.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/multipart.dat.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/printers.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/search.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/template.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/testcgi.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/testhi.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/testhi.html.svn-work                                                |    0 
 cgi-bin/.svn/wcprops/testtemplate.c.svn-work                                             |    0 
 cgi-bin/.svn/wcprops/var.c.svn-work                                                      |    0 
 cgi-bin/help-index.c                                                                     |    6 
 conf/.svn/dir-wcprops                                                                    |    0 
 conf/.svn/entries                                                                        |    0 
 conf/.svn/wcprops/Makefile.svn-work                                                      |    0 
 conf/.svn/wcprops/cupsd.conf.in.svn-work                                                 |    0 
 conf/.svn/wcprops/mime.convs.svn-work                                                    |    0 
 conf/.svn/wcprops/mime.types.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.darwin.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.irix.svn-work                                                      |    0 
 conf/.svn/wcprops/pam.std.in.svn-work                                                    |    0 
 config-scripts/.svn/dir-wcprops                                                          |    0 
 config-scripts/.svn/entries                                                              |    0 
 config-scripts/.svn/text-base/cups-compiler.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-defaults.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-directories.m4.svn-base                               |    0 
 config-scripts/.svn/text-base/cups-image.m4.svn-base                                     |    0 
 config-scripts/.svn/text-base/cups-network.m4.svn-base                                   |    0 
 config-scripts/.svn/text-base/cups-sharedlibs.m4.svn-base                                |    0 
 config-scripts/.svn/text-base/cups-ssl.m4.svn-base                                       |    0 
 config-scripts/.svn/wcprops/cups-common.m4.svn-work                                      |    0 
 config-scripts/.svn/wcprops/cups-compiler.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-defaults.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-directories.m4.svn-work                                 |    0 
 config-scripts/.svn/wcprops/cups-image.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-largefile.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-launchd.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-ldap.m4.svn-work                                        |    0 
 config-scripts/.svn/wcprops/cups-libtool.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-manpages.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-network.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-opsys.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-pam.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pap.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pdf.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-scripting.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-sharedlibs.m4.svn-work                                  |    0 
 config-scripts/.svn/wcprops/cups-slp.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-ssl.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-threads.m4.svn-work                                     |    0 
 config-scripts/cups-compiler.m4                                                          |   66 
 config-scripts/cups-defaults.m4                                                          |   40 
 config-scripts/cups-directories.m4                                                       |    6 
 config-scripts/cups-image.m4                                                             |   24 
 config-scripts/cups-network.m4                                                           |    6 
 config-scripts/cups-sharedlibs.m4                                                        |   48 
 config-scripts/cups-ssl.m4                                                               |    5 
 config.h.in                                                                              |   11 
 configure.in                                                                             |   11 
 cups-config.in                                                                           |   14 
 cups/.svn/dir-prop-base                                                                  |    0 
 cups/.svn/dir-props                                                                      |    0 
 cups/.svn/dir-wcprops                                                                    |    0 
 cups/.svn/entries                                                                        |    0 
 cups/.svn/text-base/Makefile.svn-base                                                    |    0 
 cups/.svn/text-base/adminutil.c.svn-base                                                 |    0 
 cups/.svn/text-base/emit.c.svn-base                                                      |    0 
 cups/.svn/text-base/http-addrlist.c.svn-base                                             |    0 
 cups/.svn/text-base/http.c.svn-base                                                      |    0 
 cups/.svn/text-base/http.h.svn-base                                                      |    0 
 cups/.svn/text-base/ipp.c.svn-base                                                       |    0 
 cups/.svn/text-base/mark.c.svn-base                                                      |    0 
 cups/.svn/text-base/testhttp.c.svn-base                                                  |    0 
 cups/.svn/text-base/testppd.c.svn-base                                                   |    0 
 cups/.svn/text-base/util.c.svn-base                                                      |    0 
 cups/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 cups/.svn/wcprops/Makefile.svn-work                                                      |    0 
 cups/.svn/wcprops/adminutil.c.svn-work                                                   |    0 
 cups/.svn/wcprops/adminutil.h.svn-work                                                   |    0 
 cups/.svn/wcprops/api-array.shtml.svn-work                                               |    0 
 cups/.svn/wcprops/api-cups.shtml.svn-work                                                |    0 
 cups/.svn/wcprops/api-filedir.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-filter.shtml.svn-work                                              |    0 
 cups/.svn/wcprops/api-httpipp.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-ppd.shtml.svn-work                                                 |    0 
 cups/.svn/wcprops/array.c.svn-work                                                       |    0 
 cups/.svn/wcprops/array.h.svn-work                                                       |    0 
 cups/.svn/wcprops/attr.c.svn-work                                                        |    0 
 cups/.svn/wcprops/auth.c.svn-work                                                        |    0 
 cups/.svn/wcprops/backchannel.c.svn-work                                                 |    0 
 cups/.svn/wcprops/backend.c.svn-work                                                     |    0 
 cups/.svn/wcprops/backend.h.svn-work                                                     |    0 
 cups/.svn/wcprops/cups.h.svn-work                                                        |    0 
 cups/.svn/wcprops/custom.c.svn-work                                                      |    0 
 cups/.svn/wcprops/debug.h.svn-work                                                       |    0 
 cups/.svn/wcprops/dest.c.svn-work                                                        |    0 
 cups/.svn/wcprops/dir.c.svn-work                                                         |    0 
 cups/.svn/wcprops/dir.h.svn-work                                                         |    0 
 cups/.svn/wcprops/emit.c.svn-work                                                        |    0 
 cups/.svn/wcprops/encode.c.svn-work                                                      |    0 
 cups/.svn/wcprops/file.c.svn-work                                                        |    0 
 cups/.svn/wcprops/file.h.svn-work                                                        |    0 
 cups/.svn/wcprops/getifaddrs.c.svn-work                                                  |    0 
 cups/.svn/wcprops/getputfile.c.svn-work                                                  |    0 
 cups/.svn/wcprops/globals.c.svn-work                                                     |    0 
 cups/.svn/wcprops/globals.h.svn-work                                                     |    0 
 cups/.svn/wcprops/http-addr.c.svn-work                                                   |    0 
 cups/.svn/wcprops/http-addrlist.c.svn-work                                               |    0 
 cups/.svn/wcprops/http-private.h.svn-work                                                |    0 
 cups/.svn/wcprops/http-support.c.svn-work                                                |    0 
 cups/.svn/wcprops/http.c.svn-work                                                        |    0 
 cups/.svn/wcprops/http.h.svn-work                                                        |    0 
 cups/.svn/wcprops/i18n.h.svn-work                                                        |    0 
 cups/.svn/wcprops/ipp-private.h.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp-support.c.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ipp.h.svn-work                                                         |    0 
 cups/.svn/wcprops/langprintf.c.svn-work                                                  |    0 
 cups/.svn/wcprops/language.c.svn-work                                                    |    0 
 cups/.svn/wcprops/language.h.svn-work                                                    |    0 
 cups/.svn/wcprops/libcups_s.exp.svn-work                                                 |    0 
 cups/.svn/wcprops/localize.c.svn-work                                                    |    0 
 cups/.svn/wcprops/mark.c.svn-work                                                        |    0 
 cups/.svn/wcprops/md5-apple.h.svn-work                                                   |    0 
 cups/.svn/wcprops/md5.c.svn-work                                                         |    0 
 cups/.svn/wcprops/md5.h.svn-work                                                         |    0 
 cups/.svn/wcprops/md5passwd.c.svn-work                                                   |    0 
 cups/.svn/wcprops/notify.c.svn-work                                                      |    0 
 cups/.svn/wcprops/options.c.svn-work                                                     |    0 
 cups/.svn/wcprops/page.c.svn-work                                                        |    0 
 cups/.svn/wcprops/ppd.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ppd.h.svn-work                                                         |    0 
 cups/.svn/wcprops/request.c.svn-work                                                     |    0 
 cups/.svn/wcprops/snprintf.c.svn-work                                                    |    0 
 cups/.svn/wcprops/string.c.svn-work                                                      |    0 
 cups/.svn/wcprops/string.h.svn-work                                                      |    0 
 cups/.svn/wcprops/tempfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/test.ppd.svn-work                                                      |    0 
 cups/.svn/wcprops/testadmin.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testarray.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testhttp.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testi18n.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testipp.c.svn-work                                                     |    0 
 cups/.svn/wcprops/testlang.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testppd.c.svn-work                                                     |    0 
 cups/.svn/wcprops/transcode.c.svn-work                                                   |    0 
 cups/.svn/wcprops/transcode.h.svn-work                                                   |    0 
 cups/.svn/wcprops/usersys.c.svn-work                                                     |    0 
 cups/.svn/wcprops/utf8demo.txt.svn-work                                                  |    0 
 cups/.svn/wcprops/util.c.svn-work                                                        |    0 
 cups/Makefile                                                                            |   10 
 cups/adminutil.c                                                                         |   17 
 cups/emit.c                                                                              |   27 
 cups/http-addrlist.c                                                                     |   20 
 cups/http.c                                                                              |   25 
 cups/http.h                                                                              |   14 
 cups/ipp.c                                                                               |    8 
 cups/mark.c                                                                              |   11 
 cups/testhttp.c                                                                          |   22 
 cups/testppd.c                                                                           |   57 
 cups/util.c                                                                              |   29 
 data/.svn/dir-wcprops                                                                    |    0 
 data/.svn/entries                                                                        |    0 
 data/.svn/wcprops/HPGLprolog.svn-work                                                    |    0 
 data/.svn/wcprops/Makefile.svn-work                                                      |    0 
 data/.svn/wcprops/classified.svn-work                                                    |    0 
 data/.svn/wcprops/confidential.svn-work                                                  |    0 
 data/.svn/wcprops/cups.irix.svn-work                                                     |    0 
 data/.svn/wcprops/cups.pam.svn-work                                                      |    0 
 data/.svn/wcprops/cups.suse.svn-work                                                     |    0 
 data/.svn/wcprops/euc-cn.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-jp.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-kr.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-tw.txt.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-10.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-10.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-11.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-13.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-13.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-14.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-14.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-15.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-15.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-16.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-2.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-2.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-3.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-3.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-4.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-4.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-5.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-5.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-6.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-6.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-7.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-7.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-8.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-8.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-9.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-9.txt.svn-work                                                |    0 
 data/.svn/wcprops/koi8-r.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-r.txt.svn-work                                                    |    0 
 data/.svn/wcprops/koi8-u.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-u.txt.svn-work                                                    |    0 
 data/.svn/wcprops/mac-roman.txt.svn-work                                                 |    0 
 data/.svn/wcprops/psglyphs.svn-work                                                      |    0 
 data/.svn/wcprops/secret.svn-work                                                        |    0 
 data/.svn/wcprops/smiley.ps.svn-work                                                     |    0 
 data/.svn/wcprops/standard.svn-work                                                      |    0 
 data/.svn/wcprops/testprint.ps.svn-work                                                  |    0 
 data/.svn/wcprops/topsecret.svn-work                                                     |    0 
 data/.svn/wcprops/unclassified.svn-work                                                  |    0 
 data/.svn/wcprops/utf-8.svn-work                                                         |    0 
 data/.svn/wcprops/windows-1250.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1250.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1251.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1251.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1252.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1252.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1253.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1253.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1254.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1254.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1255.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1255.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1256.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1256.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1257.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1257.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1258.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1258.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1361.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-874.svn-work                                                   |    0 
 data/.svn/wcprops/windows-874.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-932.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-936.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-949.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-950.txt.svn-work                                               |    0 
 desktop/.svn/dir-wcprops                                                                 |    0 
 desktop/.svn/entries                                                                     |    0 
 desktop/.svn/wcprops/cups-128.png.svn-work                                               |    0 
 desktop/.svn/wcprops/cups-16.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-32.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-64.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups.desktop.svn-work                                               |    0 
 doc/.svn/dir-wcprops                                                                     |    0 
 doc/.svn/entries                                                                         |    0 
 doc/.svn/text-base/Makefile.svn-base                                                     |    0 
 doc/.svn/wcprops/Makefile.svn-work                                                       |    0 
 doc/.svn/wcprops/cups-printable.css.svn-work                                             |    0 
 doc/.svn/wcprops/cups.css.svn-work                                                       |    0 
 doc/.svn/wcprops/favicon.ico.svn-work                                                    |    0 
 doc/.svn/wcprops/idd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/index.html.in.svn-work                                                  |    0 
 doc/.svn/wcprops/printing-overview.shtml.svn-work                                        |    0 
 doc/.svn/wcprops/robots.txt.svn-work                                                     |    0 
 doc/.svn/wcprops/sdd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/sps.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/system-overview.shtml.svn-work                                          |    0 
 doc/Makefile                                                                             |   16 
 doc/es/.svn/dir-wcprops                                                                  |    0 
 doc/es/.svn/entries                                                                      |    0 
 doc/es/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/es/images/.svn/dir-wcprops                                                           |    0 
 doc/es/images/.svn/entries                                                               |    0 
 doc/es/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/es/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/es/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/es/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/es/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/es/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/es/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/es/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/es/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/help/.svn/dir-wcprops                                                                |    0 
 doc/help/.svn/entries                                                                    |    0 
 doc/help/.svn/text-base/spec-raster.html.svn-base                                        |    0 
 doc/help/.svn/wcprops/api-array.html.svn-work                                            |    0 
 doc/help/.svn/wcprops/api-cups.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/api-filedir.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-filter.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/api-httpipp.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-ppd.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/api-raster.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/cgi.html.svn-work                                                  |    0 
 doc/help/.svn/wcprops/glossary.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/license.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/network.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/options.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/overview.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/ref-access_log.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-classes-conf.html.svn-work                                     |    0 
 doc/help/.svn/wcprops/ref-client-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-cupsd-conf.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-error_log.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-page_log.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/ref-printers-conf.html.svn-work                                    |    0 
 doc/help/.svn/wcprops/ref-snmp-conf.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-subscriptions-conf.html.svn-work                               |    0 
 doc/help/.svn/wcprops/security.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-cmp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-command.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/spec-design.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-ipp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-ppd.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-raster.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-stp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/standard.html.in.svn-work                                          |    0 
 doc/help/.svn/wcprops/translation.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/whatsnew.html.svn-work                                             |    0 
 doc/help/spec-raster.html                                                                |   32 
 doc/images/.svn/dir-wcprops                                                              |    0 
 doc/images/.svn/entries                                                                  |    0 
 doc/images/.svn/wcprops/bottom-left.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/bottom-right.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-accept-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-class.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-add-printer.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-this-printer.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-cancel-job.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-change-settings.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-clear.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-continue.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-delete-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-delete-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                      |    0 
 doc/images/.svn/wcprops/button-export-samba.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-help.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/button-hold-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-manage-classes.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-manage-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-manage-printers.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-manage-server.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-modify-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-modify-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-move-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-move-jobs.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                         |    0 
 doc/images/.svn/wcprops/button-print-test-page.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-publish-printer.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-reject-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-release-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-restart-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-save-changes.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-search.gif.svn-work                                       |    0 
 doc/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-set-as-default.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-set-printer-options.gif.svn-work                          |    0 
 doc/images/.svn/wcprops/button-show-active.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-show-all.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-show-completed.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-show-next.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-show-previous.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-sort-ascending.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-sort-descending.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-start-class.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-start-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-stop-class.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-stop-printer.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-use-default-config.gif.svn-work                           |    0 
 doc/images/.svn/wcprops/button-view-access-log.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-view-error-log.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-view-page-log.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-view-printable-version.gif.svn-work                       |    0 
 doc/images/.svn/wcprops/classes.gif.svn-work                                             |    0 
 doc/images/.svn/wcprops/classes.svg.svn-work                                             |    0 
 doc/images/.svn/wcprops/cups-black-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-black-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-block-diagram.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-block-diagram.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-green-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-green-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-large.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-medium.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/cups-red-button-2.2.scm.svn-work                                 |    0 
 doc/images/.svn/wcprops/cups-red-button.scm.svn-work                                     |    0 
 doc/images/.svn/wcprops/cups-small.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-standard-button-2.2.scm.svn-work                            |    0 
 doc/images/.svn/wcprops/cups-standard-button.scm.svn-work                                |    0 
 doc/images/.svn/wcprops/draft.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/esp-logo.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/happy.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/logo.gif.svn-work                                                |    0 
 doc/images/.svn/wcprops/printer-idle.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-idle.svg.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-processing.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-processing.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-stopped.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/printer-stopped.svg.svn-work                                     |    0 
 doc/images/.svn/wcprops/smiley.jpg.svn-work                                              |    0 
 doc/images/.svn/wcprops/tab-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/tab-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/top-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/top-middle.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/top-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/web-add-this-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/web-password.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/web-printer-driver.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-printer-status.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-set-printer-options.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/web-test-page.gif.svn-work                                       |    0 
 doc/ja/.svn/dir-wcprops                                                                  |    0 
 doc/ja/.svn/entries                                                                      |    0 
 doc/ja/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/ja/images/.svn/dir-wcprops                                                           |    0 
 doc/ja/images/.svn/entries                                                               |    0 
 doc/ja/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/ja/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/ja/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/ja/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/ja/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/ja/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/ja/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/show-all-jobs.gif.svn-work                                    |    0 
 doc/pl/.svn/dir-wcprops                                                                  |    0 
 doc/pl/.svn/entries                                                                      |    0 
 doc/pl/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/pl/images/.svn/dir-wcprops                                                           |    0 
 doc/pl/images/.svn/entries                                                               |    0 
 doc/pl/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/pl/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/pl/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/pl/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/pl/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/pl/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/pl/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/pl/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/pl/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/sv/.svn/dir-wcprops                                                                  |    0 
 doc/sv/.svn/entries                                                                      |    0 
 doc/sv/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/sv/images/.svn/dir-wcprops                                                           |    0 
 doc/sv/images/.svn/entries                                                               |    0 
 doc/sv/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/sv/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/sv/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/sv/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/sv/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/sv/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/sv/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/sv/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/sv/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 driver/.svn/dir-wcprops                                                                  |    0 
 driver/.svn/entries                                                                      |    0 
 driver/.svn/wcprops/testdriver.c.svn-work                                                |    0 
 filter/.svn/dir-prop-base                                                                |    0 
 filter/.svn/dir-props                                                                    |    0 
 filter/.svn/dir-wcprops                                                                  |    0 
 filter/.svn/entries                                                                      |    0 
 filter/.svn/prop-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/props/rasterbench.c.svn-work                                                 |    0 
 filter/.svn/text-base/Makefile.svn-base                                                  |    0 
 filter/.svn/text-base/pstops.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.h.svn-base                                                  |    0 
 filter/.svn/text-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/text-base/rastertolabel.c.svn-base                                           |    0 
 filter/.svn/wcprops/Dependencies.svn-work                                                |    0 
 filter/.svn/wcprops/Makefile.svn-work                                                    |    0 
 filter/.svn/wcprops/api-raster.shtml.svn-work                                            |    0 
 filter/.svn/wcprops/common.c.svn-work                                                    |    0 
 filter/.svn/wcprops/common.h.svn-work                                                    |    0 
 filter/.svn/wcprops/form-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form-ps.c.svn-work                                                   |    0 
 filter/.svn/wcprops/form-tree.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form.h.svn-work                                                      |    0 
 filter/.svn/wcprops/gziptoany.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-attr.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-char.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-config.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-input.c.svn-work                                                |    0 
 filter/.svn/wcprops/hpgl-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-polygon.c.svn-work                                              |    0 
 filter/.svn/wcprops/hpgl-prolog.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-vector.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgltops.h.svn-work                                                  |    0 
 filter/.svn/wcprops/image-bmp.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-colorspace.c.svn-work                                          |    0 
 filter/.svn/wcprops/image-gif.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-jpeg.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-photocd.c.svn-work                                             |    0 
 filter/.svn/wcprops/image-pix.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-png.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-pnm.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-private.h.svn-work                                             |    0 
 filter/.svn/wcprops/image-sgi.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgi.h.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgilib.c.svn-work                                              |    0 
 filter/.svn/wcprops/image-sun.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-tiff.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-zoom.c.svn-work                                                |    0 
 filter/.svn/wcprops/image.c.svn-work                                                     |    0 
 filter/.svn/wcprops/image.h.svn-work                                                     |    0 
 filter/.svn/wcprops/imagetops.c.svn-work                                                 |    0 
 filter/.svn/wcprops/imagetoraster.c.svn-work                                             |    0 
 filter/.svn/wcprops/interpret.c.svn-work                                                 |    0 
 filter/.svn/wcprops/libcupsimage_s.exp.svn-work                                          |    0 
 filter/.svn/wcprops/pstops.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.h.svn-work                                                    |    0 
 filter/.svn/wcprops/rasterbench.c.svn-work                                               |    0 
 filter/.svn/wcprops/rastertoepson.c.svn-work                                             |    0 
 filter/.svn/wcprops/rastertohp.c.svn-work                                                |    0 
 filter/.svn/wcprops/rastertolabel.c.svn-work                                             |    0 
 filter/.svn/wcprops/testimage.c.svn-work                                                 |    0 
 filter/.svn/wcprops/testraster.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.h.svn-work                                                |    0 
 filter/.svn/wcprops/texttops.c.svn-work                                                  |    0 
 filter/Makefile                                                                          |   20 
 filter/pstops.c                                                                          |   95 -
 filter/raster.c                                                                          |  683 +++----
 filter/raster.h                                                                          |   11 
 filter/rasterbench.c                                                                     |  355 ++++
 filter/rastertolabel.c                                                                   |   13 
 fonts/.svn/dir-wcprops                                                                   |    0 
 fonts/.svn/entries                                                                       |    0 
 fonts/.svn/wcprops/Courier-Bold.svn-work                                                 |    0 
 fonts/.svn/wcprops/Courier-BoldOblique.svn-work                                          |    0 
 fonts/.svn/wcprops/Courier-Oblique.svn-work                                              |    0 
 fonts/.svn/wcprops/Courier.svn-work                                                      |    0 
 fonts/.svn/wcprops/Makefile.svn-work                                                     |    0 
 fonts/.svn/wcprops/Symbol.svn-work                                                       |    0 
 init/.svn/dir-wcprops                                                                    |    0 
 init/.svn/entries                                                                        |    0 
 init/.svn/wcprops/Localizable.strings.svn-work                                           |    0 
 init/.svn/wcprops/PrintingServices.svn-work                                              |    0 
 init/.svn/wcprops/StartupParameters.plist.svn-work                                       |    0 
 init/.svn/wcprops/cups-lpd.in.svn-work                                                   |    0 
 init/.svn/wcprops/cups.sh.in.svn-work                                                    |    0 
 init/.svn/wcprops/org.cups.cupsd.plist.svn-work                                          |    0 
 locale/.svn/dir-wcprops                                                                  |    0 
 locale/.svn/entries                                                                      |    0 
 locale/.svn/text-base/Makefile.svn-base                                                  |    0 
 locale/.svn/text-base/cups_es.po.svn-base                                                |    0 
 locale/.svn/wcprops/Makefile.svn-work                                                    |    0 
 locale/.svn/wcprops/cups.footer.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.header.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.pot.svn-work                                                    |    0 
 locale/.svn/wcprops/cups_es.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_ja.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_pl.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_sv.po.svn-work                                                  |    0 
 locale/.svn/wcprops/locale.txt.svn-work                                                  |    0 
 locale/.svn/wcprops/translate.c.svn-work                                                 |    0 
 locale/Makefile                                                                          |   14 
 locale/cups_es.po                                                                        |  482 +----
 man/.svn/dir-wcprops                                                                     |    0 
 man/.svn/entries                                                                         |    0 
 man/.svn/text-base/cupsaddsmb.man.in.svn-base                                            |    0 
 man/.svn/text-base/cupsd.conf.man.in.svn-base                                            |    0 
 man/.svn/wcprops/Makefile.svn-work                                                       |    0 
 man/.svn/wcprops/accept.man.svn-work                                                     |    0 
 man/.svn/wcprops/backend.man.svn-work                                                    |    0 
 man/.svn/wcprops/cancel.man.svn-work                                                     |    0 
 man/.svn/wcprops/classes.conf.man.svn-work                                               |    0 
 man/.svn/wcprops/client.conf.man.in.svn-work                                             |    0 
 man/.svn/wcprops/cups-config.man.svn-work                                                |    0 
 man/.svn/wcprops/cups-deviced.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-driverd.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-lpd.man.in.svn-work                                                |    0 
 man/.svn/wcprops/cups-polld.man.svn-work                                                 |    0 
 man/.svn/wcprops/cups-snmp.conf.man.svn-work                                             |    0 
 man/.svn/wcprops/cupsaddsmb.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.conf.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.man.in.svn-work                                                   |    0 
 man/.svn/wcprops/cupsenable.man.svn-work                                                 |    0 
 man/.svn/wcprops/cupstestdsc.man.svn-work                                                |    0 
 man/.svn/wcprops/cupstestppd.man.svn-work                                                |    0 
 man/.svn/wcprops/filter.man.svn-work                                                     |    0 
 man/.svn/wcprops/lp.man.svn-work                                                         |    0 
 man/.svn/wcprops/lpadmin.man.svn-work                                                    |    0 
 man/.svn/wcprops/lpc.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpinfo.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpmove.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpoptions.man.in.svn-work                                               |    0 
 man/.svn/wcprops/lppasswd.man.svn-work                                                   |    0 
 man/.svn/wcprops/lpq.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpr.man.svn-work                                                        |    0 
 man/.svn/wcprops/lprm.man.svn-work                                                       |    0 
 man/.svn/wcprops/lpstat.man.svn-work                                                     |    0 
 man/.svn/wcprops/mantohtml.c.svn-work                                                    |    0 
 man/.svn/wcprops/mime.convs.man.svn-work                                                 |    0 
 man/.svn/wcprops/mime.types.man.svn-work                                                 |    0 
 man/.svn/wcprops/printers.conf.man.svn-work                                              |    0 
 man/.svn/wcprops/subscriptions.conf.man.svn-work                                         |    0 
 man/cupsaddsmb.man.in                                                                    |   21 
 man/cupsd.conf.man.in                                                                    |   10 
 monitor/.svn/dir-wcprops                                                                 |    0 
 monitor/.svn/entries                                                                     |    0 
 monitor/.svn/wcprops/Dependencies.svn-work                                               |    0 
 monitor/.svn/wcprops/Makefile.svn-work                                                   |    0 
 monitor/.svn/wcprops/bcp.c.svn-work                                                      |    0 
 monitor/.svn/wcprops/tbcp.c.svn-work                                                     |    0 
 notifier/.svn/dir-wcprops                                                                |    0 
 notifier/.svn/entries                                                                    |    0 
 notifier/.svn/wcprops/Dependencies.svn-work                                              |    0 
 notifier/.svn/wcprops/Makefile.svn-work                                                  |    0 
 notifier/.svn/wcprops/mailto.c.svn-work                                                  |    0 
 notifier/.svn/wcprops/testnotify.c.svn-work                                              |    0 
 packaging/.svn/dir-wcprops                                                               |    0 
 packaging/.svn/entries                                                                   |    0 
 packaging/.svn/text-base/cups.list.in.svn-base                                           |    0 
 packaging/.svn/text-base/cups.spec.in.svn-base                                           |    0 
 packaging/.svn/wcprops/LICENSE.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/WELCOME.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/cups-dbus.conf.svn-work                                           |    0 
 packaging/.svn/wcprops/cups-desc.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups-info.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups.list.in.svn-work                                             |    0 
 packaging/.svn/wcprops/cups.readme.svn-work                                              |    0 
 packaging/.svn/wcprops/cups.spec.in.svn-work                                             |    0 
 packaging/.svn/wcprops/installer.tif.svn-work                                            |    0 
 packaging/.svn/wcprops/installer.xcf.gz.svn-work                                         |    0 
 packaging/cups.list.in                                                                   |    8 
 packaging/cups.spec.in                                                                   |    6 
 pdftops/.svn/dir-wcprops                                                                 |    0 
 pdftops/.svn/entries                                                                     |    0 
 pdftops/.svn/text-base/PSOutputDev.cxx.svn-base                                          |    0 
 pdftops/.svn/wcprops/Annot.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Annot.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Array.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Array.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/BuiltinFont.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/BuiltinFont.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CMap.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/CMap.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/COPYING.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Catalog.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Catalog.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CharTypes.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/CompactFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/Decrypt.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Decrypt.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Dependencies.svn-work                                               |    0 
 pdftops/.svn/wcprops/Dict.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Dict.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Error.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Error.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/ErrorCodes.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/FoFiEncodings.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/FoFiEncodings.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/FoFiTrueType.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/FoFiTrueType.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/FoFiType1.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/FoFiType1C.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1C.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FontEncodingTables.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/FontEncodingTables.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Function.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/Function.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GHash.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GHash.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GList.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GList.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GMutex.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/GString.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GString.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Gfx.cxx.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Gfx.h.svn-work                                                      |    0 
 pdftops/.svn/wcprops/GfxFont.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GfxFont.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GfxState.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/GfxState.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GlobalParams.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/GlobalParams.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/JBIG2Stream.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/JBIG2Stream.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/Lexer.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Lexer.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Link.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Link.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Makefile.svn-work                                                   |    0 
 pdftops/.svn/wcprops/NameToCharCode.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/NameToCharCode.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/NameToUnicodeTable.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Object.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Object.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Outline.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Outline.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/OutputDev.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/OutputDev.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/PDFDoc.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/PDFDoc.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/PSOutputDev.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSOutputDev.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/PSTokenizer.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSTokenizer.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/Page.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Page.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Parser.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Parser.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/README.svn-work                                                     |    0 
 pdftops/.svn/wcprops/SecurityHandler.cxx.svn-work                                        |    0 
 pdftops/.svn/wcprops/SecurityHandler.h.svn-work                                          |    0 
 pdftops/.svn/wcprops/Stream-CCITT.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/Stream.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Stream.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/UTF8.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/UnicodeMap.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/UnicodeMap.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/UnicodeMapTables.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.cxx.svn-work                                       |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/XRef.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/XRef.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/config.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/gfile.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/gfile.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/gmem.c.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmem.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmempp.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/gtypes.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/parseargs.c.svn-work                                                |    0 
 pdftops/.svn/wcprops/parseargs.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/pdftops.cxx.svn-work                                                |    0 
 pdftops/PSOutputDev.cxx                                                                  |    2 
 ppd/.svn/dir-wcprops                                                                     |    0 
 ppd/.svn/entries                                                                         |    0 
 ppd/.svn/text-base/zebracpl.ppd.svn-base                                                 |    0 
 ppd/.svn/wcprops/Makefile.svn-work                                                       |    0 
 ppd/.svn/wcprops/deskjet.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/deskjet2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/dymo.ppd.svn-work                                                       |    0 
 ppd/.svn/wcprops/epson24.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/epson9.ppd.svn-work                                                     |    0 
 ppd/.svn/wcprops/laserjet.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidat24.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidata9.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stcolor.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stcolor2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stphoto.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stphoto2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebra.ppd.svn-work                                                      |    0 
 ppd/.svn/wcprops/zebracpl.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep1.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep2.ppd.svn-work                                                   |    0 
 ppd/zebracpl.ppd                                                                         |    8 
 scheduler/.svn/dir-wcprops                                                               |    0 
 scheduler/.svn/entries                                                                   |    0 
 scheduler/.svn/text-base/auth.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/client.c.svn-base                                               |    0 
 scheduler/.svn/text-base/conf.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/conf.h.svn-base                                                 |    0 
 scheduler/.svn/text-base/dirsvc.c.svn-base                                               |    0 
 scheduler/.svn/text-base/filter.c.svn-base                                               |    0 
 scheduler/.svn/text-base/ipp.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/job.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/main.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/mime.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/printers.c.svn-base                                             |    0 
 scheduler/.svn/text-base/subscriptions.c.svn-base                                        |    0 
 scheduler/.svn/text-base/subscriptions.h.svn-base                                        |    0 
 scheduler/.svn/text-base/testmime.c.svn-base                                             |    0 
 scheduler/.svn/wcprops/Dependencies.svn-work                                             |    0 
 scheduler/.svn/wcprops/Makefile.svn-work                                                 |    0 
 scheduler/.svn/wcprops/auth.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/auth.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/banners.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/banners.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/cert.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cert.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/classes.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/classes.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/client.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/client.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/conf.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/conf.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cups-deviced.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-driverd.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-lpd.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/cups-polld.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/cups.pam.svn-work                                                 |    0 
 scheduler/.svn/wcprops/cupsd.h.svn-work                                                  |    0 
 scheduler/.svn/wcprops/dirsvc.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/dirsvc.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/env.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/filter.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/ipp.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.h.svn-work                                                    |    0 
 scheduler/.svn/wcprops/listen.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/log.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/main.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/network.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/network.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/policy.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/policy.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/printers.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/printers.h.svn-work                                               |    0 
 scheduler/.svn/wcprops/process.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/quotas.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/server.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/statbuf.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/statbuf.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/subscriptions.c.svn-work                                          |    0 
 scheduler/.svn/wcprops/subscriptions.h.svn-work                                          |    0 
 scheduler/.svn/wcprops/sysman.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/sysman.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/testdirsvc.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/testmime.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/testspeed.c.svn-work                                              |    0 
 scheduler/.svn/wcprops/type.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.h.svn-work                                                   |    0 
 scheduler/auth.c                                                                         |    9 
 scheduler/client.c                                                                       |   42 
 scheduler/conf.c                                                                         |  164 -
 scheduler/conf.h                                                                         |    5 
 scheduler/dirsvc.c                                                                       |   86 
 scheduler/filter.c                                                                       |    8 
 scheduler/ipp.c                                                                          |   56 
 scheduler/job.c                                                                          |  120 -
 scheduler/main.c                                                                         |    8 
 scheduler/mime.c                                                                         |   19 
 scheduler/printers.c                                                                     |   43 
 scheduler/subscriptions.c                                                                |  366 +---
 scheduler/subscriptions.h                                                                |   10 
 scheduler/testmime.c                                                                     |    6 
 scripting/.svn/dir-wcprops                                                               |    0 
 scripting/.svn/entries                                                                   |    0 
 scripting/java/.svn/dir-wcprops                                                          |    0 
 scripting/java/.svn/entries                                                              |    0 
 scripting/java/.svn/wcprops/CUPSPrinter.java.svn-work                                    |    0 
 scripting/java/.svn/wcprops/cups.jar.svn-work                                            |    0 
 scripting/java/classes/.svn/dir-wcprops                                                  |    0 
 scripting/java/classes/.svn/entries                                                      |    0 
 scripting/java/classes/com/.svn/dir-wcprops                                              |    0 
 scripting/java/classes/com/.svn/entries                                                  |    0 
 scripting/java/classes/com/easysw/.svn/dir-wcprops                                       |    0 
 scripting/java/classes/com/easysw/.svn/entries                                           |    0 
 scripting/java/classes/com/easysw/cups/.svn/dir-wcprops                                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/entries                                      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/Cups.class.svn-work                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsJob.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsPrinter.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPP.class.svn-work                   |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPAttribute.class.svn-work          |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPCalendar.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPDefs.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPError.class.svn-work              |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPHttp.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPMD5.class.svn-work                |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPRequest.class.svn-work            |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPStatus.class.svn-work             |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPURLConnection.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPValue.class.svn-work              |    0 
 scripting/java/docs/.svn/dir-wcprops                                                     |    0 
 scripting/java/docs/.svn/entries                                                         |    0 
 scripting/java/docs/.svn/wcprops/allclasses-frame.html.svn-work                          |    0 
 scripting/java/docs/.svn/wcprops/deprecated-list.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/help-doc.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/index-all.html.svn-work                                 |    0 
 scripting/java/docs/.svn/wcprops/index.html.svn-work                                     |    0 
 scripting/java/docs/.svn/wcprops/overview-tree.html.svn-work                             |    0 
 scripting/java/docs/.svn/wcprops/package-list.svn-work                                   |    0 
 scripting/java/docs/.svn/wcprops/packages.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/serialized-form.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/stylesheet.css.svn-work                                 |    0 
 scripting/java/docs/com/.svn/dir-wcprops                                                 |    0 
 scripting/java/docs/com/.svn/entries                                                     |    0 
 scripting/java/docs/com/easysw/.svn/dir-wcprops                                          |    0 
 scripting/java/docs/com/easysw/.svn/entries                                              |    0 
 scripting/java/docs/com/easysw/cups/.svn/dir-wcprops                                     |    0 
 scripting/java/docs/com/easysw/cups/.svn/entries                                         |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/Cups.html.svn-work                      |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsJob.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsPrinter.html.svn-work               |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPP.html.svn-work                       |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPAttribute.html.svn-work              |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPDefs.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPError.html.svn-work                  |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPHttp.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPRequest.html.svn-work                |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPStatus.html.svn-work                 |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPURLConnection.html.svn-work          |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPValue.html.svn-work                  |    0 
 scripting/java/example/.svn/dir-wcprops                                                  |    0 
 scripting/java/example/.svn/entries                                                      |    0 
 scripting/java/example/.svn/wcprops/GLP.class.svn-work                                   |    0 
 scripting/java/example/.svn/wcprops/GLP.java.svn-work                                    |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$1.class.svn-work                          |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$MyTextListener.class.svn-work             |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.class.svn-work                           |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.java.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$1.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$2.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$ButtonListener.class.svn-work |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.class.svn-work                |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.java.svn-work                 |    0 
 scripting/java/example/.svn/wcprops/GLPserver.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPserver.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPtabs$1.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/GLPvars.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPvars.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/buildit.svn-work                                     |    0 
 scripting/java/example/.svn/wcprops/class.list.svn-work                                  |    0 
 scripting/java/example/.svn/wcprops/runit.svn-work                                       |    0 
 scripting/java/example/images/.svn/dir-wcprops                                           |    0 
 scripting/java/example/images/.svn/entries                                               |    0 
 scripting/java/example/images/.svn/wcprops/left.gif.svn-work                             |    0 
 scripting/java/example/images/.svn/wcprops/print-test-page.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/printer-idle.gif.svn-work                     |    0 
 scripting/java/example/images/.svn/wcprops/printer-stopped.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/restart-job.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-active.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-completed.gif.svn-work                   |    0 
 scripting/java/src/.svn/dir-wcprops                                                      |    0 
 scripting/java/src/.svn/entries                                                          |    0 
 scripting/java/src/com/.svn/dir-wcprops                                                  |    0 
 scripting/java/src/com/.svn/entries                                                      |    0 
 scripting/java/src/com/easysw/.svn/dir-wcprops                                           |    0 
 scripting/java/src/com/easysw/.svn/entries                                               |    0 
 scripting/java/src/com/easysw/cups/.svn/dir-wcprops                                      |    0 
 scripting/java/src/com/easysw/cups/.svn/entries                                          |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/Cups.java.svn-work                       |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsJob.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsPrinter.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPP.java.svn-work                        |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPAttribute.java.svn-work               |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPCalendar.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPDefs.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPError.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPHttp.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPMD5.java.svn-work                     |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPRequest.java.svn-work                 |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPStatus.java.svn-work                  |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPURLConnection.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPValue.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/buildit.svn-work                         |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/class.list.svn-work                      |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/cups.nfo.svn-work                        |    0 
 scripting/perl/.svn/dir-wcprops                                                          |    0 
 scripting/perl/.svn/entries                                                              |    0 
 scripting/perl/.svn/wcprops/CUPS.pm.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/CUPS.xs.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/Makefile.PL.svn-work                                         |    0 
 scripting/perl/.svn/wcprops/README.svn-work                                              |    0 
 scripting/perl/.svn/wcprops/test.pl.svn-work                                             |    0 
 scripting/php/.svn/dir-wcprops                                                           |    0 
 scripting/php/.svn/entries                                                               |    0 
 scripting/php/.svn/wcprops/Dependencies.svn-work                                         |    0 
 scripting/php/.svn/wcprops/Makefile.svn-work                                             |    0 
 scripting/php/.svn/wcprops/README.svn-work                                               |    0 
 scripting/php/.svn/wcprops/phpcups.c.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.h.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.php.svn-work                                          |    0 
 standards/.svn/dir-wcprops                                                               |    0 
 standards/.svn/entries                                                                   |    0 
 standards/.svn/wcprops/Makefile.svn-work                                                 |    0 
 standards/.svn/wcprops/X.690-0207.pdf.svn-work                                           |    0 
 standards/.svn/wcprops/pwg5100.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/rfc1155.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1157.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1179.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1213.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1321.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2222.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2246.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2487.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2554.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2567.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2568.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2569.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2578.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2595.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2616.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2617.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2790.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2817.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2818.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2821.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2822.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2910.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2911.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2965.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3196.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3239.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3380.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3381.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3382.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3391.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3510.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3805.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3986.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3995.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3996.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3997.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3998.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc4122.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfctohtml.c.svn-work                                              |    0 
 standards/.svn/wcprops/wake-on-lan.pdf.svn-work                                          |    0 
 standards/.svn/wcprops/wd-ippmailto10-20050519.pdf.svn-work                              |    0 
 systemv/.svn/dir-wcprops                                                                 |    0 
 systemv/.svn/entries                                                                     |    0 
 systemv/.svn/text-base/Makefile.svn-base                                                 |    0 
 systemv/.svn/text-base/cancel.c.svn-base                                                 |    0 
 systemv/.svn/text-base/lpstat.c.svn-base                                                 |    0 
 systemv/.svn/wcprops/Dependencies.svn-work                                               |    0 
 systemv/.svn/wcprops/Makefile.svn-work                                                   |    0 
 systemv/.svn/wcprops/accept.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cancel.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cupsaddsmb.c.svn-work                                               |    0 
 systemv/.svn/wcprops/cupstestdsc.c.svn-work                                              |    0 
 systemv/.svn/wcprops/cupstestppd.c.svn-work                                              |    0 
 systemv/.svn/wcprops/lp.c.svn-work                                                       |    0 
 systemv/.svn/wcprops/lpadmin.c.svn-work                                                  |    0 
 systemv/.svn/wcprops/lpinfo.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpmove.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpoptions.c.svn-work                                                |    0 
 systemv/.svn/wcprops/lppasswd.c.svn-work                                                 |    0 
 systemv/.svn/wcprops/lpstat.c.svn-work                                                   |    0 
 systemv/Makefile                                                                         |    6 
 systemv/cancel.c                                                                         |    7 
 systemv/lpstat.c                                                                         |   59 
 templates/.svn/dir-wcprops                                                               |    0 
 templates/.svn/entries                                                                   |    0 
 templates/.svn/text-base/Makefile.svn-base                                               |    0 
 templates/.svn/wcprops/Makefile.svn-work                                                 |    0 
 templates/.svn/wcprops/add-class.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/add-printer.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/admin.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/choose-device.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-make.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/choose-model.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/choose-serial.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-uri.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/class-added.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/class-confirm.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-deleted.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-jobs-header.tmpl.svn-work                                   |    0 
 templates/.svn/wcprops/class-modified.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes-header.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/edit-config.tmpl.in.svn-work                                      |    0 
 templates/.svn/wcprops/error-op.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/error.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/header.tmpl.in.svn-work                                           |    0 
 templates/.svn/wcprops/help-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/help-printable.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/job-cancel.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/job-hold.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-move.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-moved.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/job-release.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/job-restart.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs.tmpl.svn-work                                                |    0 
 templates/.svn/wcprops/maintenance.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/modify-class.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/modify-printer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-boolean.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-conflict.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-header.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/option-pickmany.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-pickone.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-trailer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/pager.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/printer-accept.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-added.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-configured.tmpl.svn-work                                  |    0 
 templates/.svn/wcprops/printer-confirm.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-default.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-deleted.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work                                 |    0 
 templates/.svn/wcprops/printer-modified.tmpl.svn-work                                    |    0 
 templates/.svn/wcprops/printer-purge.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-reject.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-start.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-stop.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/printers-header.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printers.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/restart.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/samba-export.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/samba-exported.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/search.tmpl.svn-work                                              |    0 
 templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work                          |    0 
 templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                         |    0 
 templates/.svn/wcprops/test-page.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/trailer.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/users.tmpl.svn-work                                               |    0 
 templates/Makefile                                                                       |   14 
 templates/es/.svn/dir-wcprops                                                            |    0 
 templates/es/.svn/entries                                                                |    0 
 templates/es/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/es/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/es/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/es/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/es/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/es/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/es/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/es/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/es/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/es/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/es/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/.svn/dir-wcprops                                                            |    0 
 templates/ja/.svn/entries                                                                |    0 
 templates/ja/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/ja/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/ja/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/ja/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/ja/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/ja/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/ja/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/ja/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/ja/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/pl/.svn/dir-wcprops                                                            |    0 
 templates/pl/.svn/entries                                                                |    0 
 templates/pl/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/pl/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/pl/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/pl/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/pl/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/pl/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/pl/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/sv/.svn/dir-wcprops                                                            |    0 
 templates/sv/.svn/entries                                                                |    0 
 templates/sv/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/sv/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/sv/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/sv/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/sv/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/sv/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 test/.svn/dir-wcprops                                                                    |    0 
 test/.svn/entries                                                                        |    0 
 test/.svn/wcprops/4.1-requests.test.svn-work                                             |    0 
 test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/4.3-job-ops.test.svn-work                                              |    0 
 test/.svn/wcprops/4.4-subscription-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/5.1-lpadmin.sh.svn-work                                                |    0 
 test/.svn/wcprops/5.2-lpc.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.3-lpq.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.4-lpstat.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.5-lp.sh.svn-work                                                     |    0 
 test/.svn/wcprops/5.6-lpr.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.7-lprm.sh.svn-work                                                   |    0 
 test/.svn/wcprops/5.8-cancel.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.9-lpinfo.sh.svn-work                                                 |    0 
 test/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 test/.svn/wcprops/Makefile.svn-work                                                      |    0 
 test/.svn/wcprops/create-job-format.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-sheets.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-timeout.test.svn-work                                       |    0 
 test/.svn/wcprops/create-job.test.svn-work                                               |    0 
 test/.svn/wcprops/get-devices.test.svn-work                                              |    0 
 test/.svn/wcprops/get-job-attributes.test.svn-work                                       |    0 
 test/.svn/wcprops/get-job-attributes2.test.svn-work                                      |    0 
 test/.svn/wcprops/get-ppds.test.svn-work                                                 |    0 
 test/.svn/wcprops/get-printer-attributes.test.svn-work                                   |    0 
 test/.svn/wcprops/get-printers.test.svn-work                                             |    0 
 test/.svn/wcprops/ipptest.c.svn-work                                                     |    0 
 test/.svn/wcprops/print-job-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/print-job.test.svn-work                                                |    0 
 test/.svn/wcprops/run-stp-tests.sh.svn-work                                              |    0 
 test/.svn/wcprops/set-attrs-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/str-header.html.svn-work                                               |    0 
 test/.svn/wcprops/str-trailer.html.svn-work                                              |    0 
 test/.svn/wcprops/testfile.jpg.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.pdf.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.ps.svn-work                                                   |    0 
 test/.svn/wcprops/testfile.txt.svn-work                                                  |    0 
 test/.svn/wcprops/testhp.ppd.svn-work                                                    |    0 
 test/.svn/wcprops/testps.ppd.svn-work                                                    |    0 
 tools/.svn/dir-wcprops                                                                   |    0 
 tools/.svn/entries                                                                       |    0 
 tools/.svn/wcprops/checkglobals.svn-work                                                 |    0 
 tools/.svn/wcprops/listpublic.svn-work                                                   |    0 
 tools/.svn/wcprops/makesrcdist.svn-work                                                  |    0 
 tools/.svn/wcprops/testosx.svn-work                                                      |    0 
 tools/.svn/wcprops/testrpm.svn-work                                                      |    0 
 vcnet/.svn/dir-wcprops                                                                   |    0 
 vcnet/.svn/entries                                                                       |    0 
 vcnet/.svn/wcprops/config.h.svn-work                                                     |    0 
 vcnet/.svn/wcprops/cups.sln.svn-work                                                     |    0 
 vcnet/.svn/wcprops/libcups2.def.svn-work                                                 |    0 
 vcnet/.svn/wcprops/libcups2.vcproj.svn-work                                              |    0 
 1742 files changed, 2782 insertions(+), 3554 deletions(-)

--- NEW FILE cups-svn5706.patch ---
diff -durN release-1.2.1/backend/backend-private.h cups-1.2.x/backend/backend-private.h
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
diff -durN release-1.2.1/backend/Dependencies cups-1.2.x/backend/Dependencies
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
diff -durN release-1.2.1/backend/easysw-firewire-design.txt cups-1.2.x/backend/easysw-firewire-design.txt
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
[...11598 lines suppressed...]
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/dir-wcprops cups-1.2.x/templates/sv/.svn/dir-wcprops
diff -durN release-1.2.1/templates/sv/.svn/entries cups-1.2.x/templates/sv/.svn/entries
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/dir-wcprops cups-1.2.x/templates/.svn/dir-wcprops
diff -durN release-1.2.1/templates/.svn/entries cups-1.2.x/templates/.svn/entries
diff -durN release-1.2.1/templates/.svn/text-base/Makefile.svn-base cups-1.2.x/templates/.svn/text-base/Makefile.svn-base
diff -durN release-1.2.1/templates/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/Makefile.svn-work cups-1.2.x/templates/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/test/.svn/dir-wcprops cups-1.2.x/test/.svn/dir-wcprops
diff -durN release-1.2.1/test/.svn/entries cups-1.2.x/test/.svn/entries
diff -durN release-1.2.1/test/.svn/wcprops/4.1-requests.test.svn-work cups-1.2.x/test/.svn/wcprops/4.1-requests.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.3-job-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.3-job-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.4-subscription-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.4-subscription-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.1-lpadmin.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.1-lpadmin.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.2-lpc.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.2-lpc.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.3-lpq.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.3-lpq.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.4-lpstat.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.4-lpstat.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.5-lp.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.5-lp.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.6-lpr.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.6-lpr.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.7-lprm.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.7-lprm.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.8-cancel.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.8-cancel.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.9-lpinfo.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.9-lpinfo.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-format.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-format.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-sheets.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-sheets.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-timeout.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-timeout.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Dependencies.svn-work cups-1.2.x/test/.svn/wcprops/Dependencies.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-devices.test.svn-work cups-1.2.x/test/.svn/wcprops/get-devices.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes2.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes2.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-ppds.test.svn-work cups-1.2.x/test/.svn/wcprops/get-ppds.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printer-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printer-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printers.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printers.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/ipptest.c.svn-work cups-1.2.x/test/.svn/wcprops/ipptest.c.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Makefile.svn-work cups-1.2.x/test/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/run-stp-tests.sh.svn-work cups-1.2.x/test/.svn/wcprops/run-stp-tests.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/set-attrs-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/set-attrs-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-header.html.svn-work cups-1.2.x/test/.svn/wcprops/str-header.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-trailer.html.svn-work cups-1.2.x/test/.svn/wcprops/str-trailer.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.jpg.svn-work cups-1.2.x/test/.svn/wcprops/testfile.jpg.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.pdf.svn-work cups-1.2.x/test/.svn/wcprops/testfile.pdf.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.ps.svn-work cups-1.2.x/test/.svn/wcprops/testfile.ps.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.txt.svn-work cups-1.2.x/test/.svn/wcprops/testfile.txt.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testhp.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testhp.ppd.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testps.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testps.ppd.svn-work
diff -durN release-1.2.1/tools/.svn/dir-wcprops cups-1.2.x/tools/.svn/dir-wcprops
diff -durN release-1.2.1/tools/.svn/entries cups-1.2.x/tools/.svn/entries
diff -durN release-1.2.1/tools/.svn/wcprops/checkglobals.svn-work cups-1.2.x/tools/.svn/wcprops/checkglobals.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/listpublic.svn-work cups-1.2.x/tools/.svn/wcprops/listpublic.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/makesrcdist.svn-work cups-1.2.x/tools/.svn/wcprops/makesrcdist.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testosx.svn-work cups-1.2.x/tools/.svn/wcprops/testosx.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testrpm.svn-work cups-1.2.x/tools/.svn/wcprops/testrpm.svn-work
diff -durN release-1.2.1/vcnet/.svn/dir-wcprops cups-1.2.x/vcnet/.svn/dir-wcprops
diff -durN release-1.2.1/vcnet/.svn/entries cups-1.2.x/vcnet/.svn/entries
diff -durN release-1.2.1/vcnet/.svn/wcprops/config.h.svn-work cups-1.2.x/vcnet/.svn/wcprops/config.h.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/cups.sln.svn-work cups-1.2.x/vcnet/.svn/wcprops/cups.sln.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.def.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.def.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.vcproj.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.vcproj.svn-work

cups-direct-usb.patch:
 usb-unix.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-direct-usb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-direct-usb.patch	4 Apr 2006 15:10:37 -0000	1.1
+++ cups-direct-usb.patch	4 Jul 2006 16:58:59 -0000	1.2
@@ -1,11 +1,16 @@
---- cups-1.2rc1/backend/usb-unix.c.direct-usb	2006-04-04 15:57:47.000000000 +0100
-+++ cups-1.2rc1/backend/usb-unix.c	2006-04-04 15:58:26.000000000 +0100
-@@ -431,7 +431,7 @@
- 
+--- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
++++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
+@@ -327,12 +327,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
--    return (-1); /* Do not allow direct devices anymore */
+   {
+-   /*
+-    * Do not allow direct devices anymore...
+-    */
+-
+-    errno = ENODEV;
+-    return (-1);
 +    return (open(uri + 4, O_RDWR | O_EXCL));
+   }
    else if (!strncmp(uri, "usb://", 6))
    {
-    /*

cups-relro.patch:
 Makedefs.in                     |    2 +-
 config-scripts/cups-compiler.m4 |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: cups-relro.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-relro.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-relro.patch	28 Apr 2006 13:09:58 -0000	1.5
+++ cups-relro.patch	4 Jul 2006 16:58:59 -0000	1.6
@@ -1,17 +1,17 @@
---- cups-1.2rc3/Makedefs.in.relro	2006-04-28 13:52:04.000000000 +0100
-+++ cups-1.2rc3/Makedefs.in	2006-04-28 13:52:22.000000000 +0100
-@@ -130,7 +130,7 @@
- IMGLIBS		=	@IMGLIBS@ -lm
+--- cups-1.2.1/Makedefs.in.relro	2006-07-04 17:52:05.000000000 +0100
++++ cups-1.2.1/Makedefs.in	2006-07-04 17:52:54.000000000 +0100
+@@ -132,7 +132,7 @@
+ IMGLIBS		=	@IMGLIBS@
  IMGFILTERS	=	@IMGFILTERS@
- LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
+ LDFLAGS		=	-L../cups -L../filter $(ARCHFLAGS) \
 -			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
 +			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
  LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
  LIBS		=	$(LINKCUPS) $(COMMONLIBS)
---- cups-1.2rc3/config-scripts/cups-compiler.m4.relro	2006-04-28 13:51:49.000000000 +0100
-+++ cups-1.2rc3/config-scripts/cups-compiler.m4	2006-04-28 13:51:49.000000000 +0100
-@@ -79,6 +79,9 @@
+--- cups-1.2.1/config-scripts/cups-compiler.m4.relro	2006-07-04 17:52:05.000000000 +0100
++++ cups-1.2.1/config-scripts/cups-compiler.m4	2006-07-04 17:52:05.000000000 +0100
+@@ -89,6 +89,9 @@
  CXXLIBS=""
  AC_SUBST(CXXLIBS)
  
@@ -21,7 +21,7 @@
  PIEFLAGS=""
  AC_SUBST(PIEFLAGS)
  
-@@ -98,6 +101,12 @@
+@@ -108,6 +111,12 @@
  
  	case $uname in
  		Linux*)
@@ -32,5 +32,5 @@
 +	case $uname in
 +		Linux*)
  			if test x$enable_pie = xyes; then
- 				PIEFLAGS="-pie -fpie"
+ 				PIEFLAGS="-pie -fPIE"
  			fi

cups-str1705.patch:
 usb-unix.c |    2 ++
 1 files changed, 2 insertions(+)

Index: cups-str1705.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-str1705.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-str1705.patch	22 May 2006 22:10:13 -0000	1.4
+++ cups-str1705.patch	4 Jul 2006 16:58:59 -0000	1.5
@@ -1,11 +1,11 @@
---- cups-1.2.1/backend/usb-unix.c.str1705	2006-05-22 23:00:11.000000000 +0100
-+++ cups-1.2.1/backend/usb-unix.c	2006-05-22 23:02:14.000000000 +0100
-@@ -90,6 +90,8 @@
+--- cups-1.2.1/backend/usb-unix.c.str1705	2006-07-04 17:47:55.000000000 +0100
++++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:48:43.000000000 +0100
+@@ -81,6 +81,8 @@
    */
  
-   usebc = strcasecmp(hostname, "Canon") != 0;
-+  if (usebc && !strncmp(uri, "usb:/dev/", 9))
-+    usebc = 0;
+   use_bc = strcasecmp(hostname, "Canon") != 0;
++  if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++    use_bc = 0;
  
   /*
    * Open the USB port device...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- cups.spec	29 Jun 2006 21:48:57 -0000	1.223
+++ cups.spec	4 Jul 2006 16:58:59 -0000	1.224
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 16
+Release: 17
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,6 +20,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-svn5706.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -28,13 +29,8 @@
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch8: cups-str1705.patch
-Patch9: cups-localhost.patch
-Patch10: cups-str1740.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
-Patch13: cups-str1758.patch
-Patch14: cups-str1736.patch
-Patch15: cups-str1776.patch
 Patch16: cups-no-export-ssllibs.patch
 Patch17: cups-paps.patch
 Patch18: cups-language.patch
@@ -119,6 +115,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .svn5706
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -127,13 +124,8 @@
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch8 -p1 -b .str1705
-%patch9 -p1 -b .localhost
-%patch10 -p1 -b .str1740
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
-%patch13 -p1 -b .str1758
-%patch14 -p1 -b .str1736
-%patch15 -p1 -b .str1776
 %patch16 -p1 -b .no-export-ssllibs
 %patch17 -p1 -b .paps
 %patch18 -p1 -b .language
@@ -401,6 +393,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-17
+- Sync with svn5706.
+- No longer need localhost, str1740, str1758, str1736, str1776 patches.
+
 * Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-16
 - Bumped paps requirement.
 - Don't use texttopaps for application/* MIME types (bug #197214).


--- cups-localhost.patch DELETED ---


--- cups-str1736.patch DELETED ---


--- cups-str1740.patch DELETED ---


--- cups-str1758.patch DELETED ---


--- cups-str1776.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 17:13:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 13:13:01 -0400
Subject: rpms/cups/FC-5 cups-svn5706.patch, NONE, 1.1 cups-direct-usb.patch,
	1.1, 1.2 cups-relro.patch, 1.3, 1.4 cups-str1705.patch, 1.4,
	1.5 cups.spec, 1.194, 1.195 cups-1.1.17-backend.patch, 1.1,
	NONE cups-localhost.patch, 1.1, NONE cups-str1736.patch, 1.1,
	NONE cups-str1740.patch, 1.1, NONE cups-str1758.patch, 1.1,
	NONE cups-str1776.patch, 1.1, NONE
Message-ID: <200607041713.k64HD1Gt008974@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-direct-usb.patch cups-relro.patch cups-str1705.patch 
	cups.spec 
Added Files:
	cups-svn5706.patch 
Removed Files:
	cups-1.1.17-backend.patch cups-localhost.patch 
	cups-str1736.patch cups-str1740.patch cups-str1758.patch 
	cups-str1776.patch 
Log Message:
* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.11
- Sync with svn5706.
- No longer need localhost, str1740, str1758, str1736, str1776 patches.
- Removed backend patch.
- Use --enable-pie instead of patching it in.


cups-svn5706.patch:
 .svn/dir-wcprops                                                                         |    0 
 .svn/entries                                                                             |    0 
 .svn/text-base/CHANGES.txt.svn-base                                                      |    0 
 .svn/text-base/Makedefs.in.svn-base                                                      |    0 
 .svn/text-base/config.h.in.svn-base                                                      |    0 
 .svn/text-base/configure.in.svn-base                                                     |    0 
 .svn/text-base/cups-config.in.svn-base                                                   |    0 
 .svn/wcprops/CHANGES-1.0.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES-1.1.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES.txt.svn-work                                                        |    0 
 .svn/wcprops/CREDITS.txt.svn-work                                                        |    0 
 .svn/wcprops/INSTALL.txt.svn-work                                                        |    0 
 .svn/wcprops/LICENSE.txt.svn-work                                                        |    0 
 .svn/wcprops/Makedefs.in.svn-work                                                        |    0 
 .svn/wcprops/Makefile.svn-work                                                           |    0 
 .svn/wcprops/README.txt.svn-work                                                         |    0 
 .svn/wcprops/config.h.in.svn-work                                                        |    0 
 .svn/wcprops/configure.in.svn-work                                                       |    0 
 .svn/wcprops/cups-config.in.svn-work                                                     |    0 
 .svn/wcprops/install-sh.svn-work                                                         |    0 
 CHANGES.txt                                                                              |   96 +
 Makedefs.in                                                                              |   10 
 backend/.svn/dir-prop-base                                                               |    0 
 backend/.svn/dir-props                                                                   |    0 
 backend/.svn/dir-wcprops                                                                 |    0 
 backend/.svn/entries                                                                     |    0 
 backend/.svn/prop-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/prop-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/prop-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/prop-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/prop-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/prop-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/prop-base/runloop.c.svn-base                                                |    0 
 backend/.svn/props/backend-private.h.svn-work                                            |    0 
 backend/.svn/props/easysw-firewire-design.txt.svn-work                                   |    0 
 backend/.svn/props/easysw-firewire-linux.txt.svn-work                                    |    0 
 backend/.svn/props/ieee1394-linux.c.svn-work                                             |    0 
 backend/.svn/props/ieee1394.c.svn-work                                                   |    0 
 backend/.svn/props/ieee1394.h.svn-work                                                   |    0 
 backend/.svn/props/runloop.c.svn-work                                                    |    0 
 backend/.svn/text-base/Dependencies.svn-base                                             |    0 
 backend/.svn/text-base/Makefile.svn-base                                                 |    0 
 backend/.svn/text-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/text-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/text-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/text-base/ieee1284.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/text-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/text-base/ipp.c.svn-base                                                    |    0 
 backend/.svn/text-base/parallel.c.svn-base                                               |    0 
 backend/.svn/text-base/runloop.c.svn-base                                                |    0 
 backend/.svn/text-base/serial.c.svn-base                                                 |    0 
 backend/.svn/text-base/snmp.c.svn-base                                                   |    0 
 backend/.svn/text-base/socket.c.svn-base                                                 |    0 
 backend/.svn/text-base/test1284.c.svn-base                                               |    0 
 backend/.svn/text-base/usb-darwin.c.svn-base                                             |    0 
 backend/.svn/text-base/usb-unix.c.svn-base                                               |    0 
 backend/.svn/text-base/usb.c.svn-base                                                    |    0 
 backend/.svn/wcprops/Dependencies.svn-work                                               |    0 
 backend/.svn/wcprops/Makefile.svn-work                                                   |    0 
 backend/.svn/wcprops/backend-private.h.svn-work                                          |    0 
 backend/.svn/wcprops/betest.c.svn-work                                                   |    0 
 backend/.svn/wcprops/easysw-firewire-design.txt.svn-work                                 |    0 
 backend/.svn/wcprops/easysw-firewire-linux.txt.svn-work                                  |    0 
 backend/.svn/wcprops/ieee1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394-linux.c.svn-work                                           |    0 
 backend/.svn/wcprops/ieee1394.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394.h.svn-work                                                 |    0 
 backend/.svn/wcprops/ipp.c.svn-work                                                      |    0 
 backend/.svn/wcprops/lpd.c.svn-work                                                      |    0 
 backend/.svn/wcprops/pap.c.svn-work                                                      |    0 
 backend/.svn/wcprops/parallel.c.svn-work                                                 |    0 
 backend/.svn/wcprops/runloop.c.svn-work                                                  |    0 
 backend/.svn/wcprops/scsi-irix.c.svn-work                                                |    0 
 backend/.svn/wcprops/scsi-linux.c.svn-work                                               |    0 
 backend/.svn/wcprops/scsi.c.svn-work                                                     |    0 
 backend/.svn/wcprops/serial.c.svn-work                                                   |    0 
 backend/.svn/wcprops/snmp.c.svn-work                                                     |    0 
 backend/.svn/wcprops/snmp.txt.svn-work                                                   |    0 
 backend/.svn/wcprops/socket.c.svn-work                                                   |    0 
 backend/.svn/wcprops/test1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb-darwin.c.svn-work                                               |    0 
 backend/.svn/wcprops/usb-unix.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb.c.svn-work                                                      |    0 
 backend/Dependencies                                                                     |   39 
 backend/Makefile                                                                         |   40 
 backend/backend-private.h                                                                |   73 
 backend/easysw-firewire-design.txt                                                       |   70 
 backend/easysw-firewire-linux.txt                                                        |   35 
 backend/ieee1284.c                                                                       |   77 
 backend/ieee1394-linux.c                                                                 |  877 ----------
 backend/ieee1394.c                                                                       |  267 ---
 backend/ieee1394.h                                                                       |  103 -
 backend/ipp.c                                                                            |    7 
 backend/parallel.c                                                                       |  207 --
 backend/runloop.c                                                                        |  218 ++
 backend/serial.c                                                                         |  293 +--
 backend/snmp.c                                                                           |   31 
 backend/socket.c                                                                         |  299 +--
 backend/test1284.c                                                                       |    9 
 backend/usb-darwin.c                                                                     |    6 
 backend/usb-unix.c                                                                       |  232 --
 backend/usb.c                                                                            |   25 
 berkeley/.svn/dir-wcprops                                                                |    0 
 berkeley/.svn/entries                                                                    |    0 
 berkeley/.svn/text-base/lpq.c.svn-base                                                   |    0 
 berkeley/.svn/text-base/lprm.c.svn-base                                                  |    0 
 berkeley/.svn/wcprops/Dependencies.svn-work                                              |    0 
 berkeley/.svn/wcprops/Makefile.svn-work                                                  |    0 
 berkeley/.svn/wcprops/lpc.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpq.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpr.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lprm.c.svn-work                                                    |    0 
 berkeley/lpq.c                                                                           |    6 
 berkeley/lprm.c                                                                          |   35 
 cgi-bin/.svn/dir-wcprops                                                                 |    0 
 cgi-bin/.svn/entries                                                                     |    0 
 cgi-bin/.svn/text-base/help-index.c.svn-base                                             |    0 
 cgi-bin/.svn/wcprops/Dependencies.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/Makefile.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/admin.c.svn-work                                                    |    0 
 cgi-bin/.svn/wcprops/cgi-private.h.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/cgi.h.svn-work                                                      |    0 
 cgi-bin/.svn/wcprops/classes.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/help-index.c.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help-index.h.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/html.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/ipp-var.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/jobs.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/multipart.dat.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/printers.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/search.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/template.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/testcgi.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/testhi.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/testhi.html.svn-work                                                |    0 
 cgi-bin/.svn/wcprops/testtemplate.c.svn-work                                             |    0 
 cgi-bin/.svn/wcprops/var.c.svn-work                                                      |    0 
 cgi-bin/help-index.c                                                                     |    6 
 conf/.svn/dir-wcprops                                                                    |    0 
 conf/.svn/entries                                                                        |    0 
 conf/.svn/wcprops/Makefile.svn-work                                                      |    0 
 conf/.svn/wcprops/cupsd.conf.in.svn-work                                                 |    0 
 conf/.svn/wcprops/mime.convs.svn-work                                                    |    0 
 conf/.svn/wcprops/mime.types.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.darwin.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.irix.svn-work                                                      |    0 
 conf/.svn/wcprops/pam.std.in.svn-work                                                    |    0 
 config-scripts/.svn/dir-wcprops                                                          |    0 
 config-scripts/.svn/entries                                                              |    0 
 config-scripts/.svn/text-base/cups-compiler.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-defaults.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-directories.m4.svn-base                               |    0 
 config-scripts/.svn/text-base/cups-image.m4.svn-base                                     |    0 
 config-scripts/.svn/text-base/cups-network.m4.svn-base                                   |    0 
 config-scripts/.svn/text-base/cups-sharedlibs.m4.svn-base                                |    0 
 config-scripts/.svn/text-base/cups-ssl.m4.svn-base                                       |    0 
 config-scripts/.svn/wcprops/cups-common.m4.svn-work                                      |    0 
 config-scripts/.svn/wcprops/cups-compiler.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-defaults.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-directories.m4.svn-work                                 |    0 
 config-scripts/.svn/wcprops/cups-image.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-largefile.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-launchd.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-ldap.m4.svn-work                                        |    0 
 config-scripts/.svn/wcprops/cups-libtool.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-manpages.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-network.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-opsys.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-pam.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pap.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pdf.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-scripting.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-sharedlibs.m4.svn-work                                  |    0 
 config-scripts/.svn/wcprops/cups-slp.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-ssl.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-threads.m4.svn-work                                     |    0 
 config-scripts/cups-compiler.m4                                                          |   66 
 config-scripts/cups-defaults.m4                                                          |   40 
 config-scripts/cups-directories.m4                                                       |    6 
 config-scripts/cups-image.m4                                                             |   24 
 config-scripts/cups-network.m4                                                           |    6 
 config-scripts/cups-sharedlibs.m4                                                        |   48 
 config-scripts/cups-ssl.m4                                                               |    5 
 config.h.in                                                                              |   11 
 configure.in                                                                             |   11 
 cups-config.in                                                                           |   14 
 cups/.svn/dir-prop-base                                                                  |    0 
 cups/.svn/dir-props                                                                      |    0 
 cups/.svn/dir-wcprops                                                                    |    0 
 cups/.svn/entries                                                                        |    0 
 cups/.svn/text-base/Makefile.svn-base                                                    |    0 
 cups/.svn/text-base/adminutil.c.svn-base                                                 |    0 
 cups/.svn/text-base/emit.c.svn-base                                                      |    0 
 cups/.svn/text-base/http-addrlist.c.svn-base                                             |    0 
 cups/.svn/text-base/http.c.svn-base                                                      |    0 
 cups/.svn/text-base/http.h.svn-base                                                      |    0 
 cups/.svn/text-base/ipp.c.svn-base                                                       |    0 
 cups/.svn/text-base/mark.c.svn-base                                                      |    0 
 cups/.svn/text-base/testhttp.c.svn-base                                                  |    0 
 cups/.svn/text-base/testppd.c.svn-base                                                   |    0 
 cups/.svn/text-base/util.c.svn-base                                                      |    0 
 cups/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 cups/.svn/wcprops/Makefile.svn-work                                                      |    0 
 cups/.svn/wcprops/adminutil.c.svn-work                                                   |    0 
 cups/.svn/wcprops/adminutil.h.svn-work                                                   |    0 
 cups/.svn/wcprops/api-array.shtml.svn-work                                               |    0 
 cups/.svn/wcprops/api-cups.shtml.svn-work                                                |    0 
 cups/.svn/wcprops/api-filedir.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-filter.shtml.svn-work                                              |    0 
 cups/.svn/wcprops/api-httpipp.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-ppd.shtml.svn-work                                                 |    0 
 cups/.svn/wcprops/array.c.svn-work                                                       |    0 
 cups/.svn/wcprops/array.h.svn-work                                                       |    0 
 cups/.svn/wcprops/attr.c.svn-work                                                        |    0 
 cups/.svn/wcprops/auth.c.svn-work                                                        |    0 
 cups/.svn/wcprops/backchannel.c.svn-work                                                 |    0 
 cups/.svn/wcprops/backend.c.svn-work                                                     |    0 
 cups/.svn/wcprops/backend.h.svn-work                                                     |    0 
 cups/.svn/wcprops/cups.h.svn-work                                                        |    0 
 cups/.svn/wcprops/custom.c.svn-work                                                      |    0 
 cups/.svn/wcprops/debug.h.svn-work                                                       |    0 
 cups/.svn/wcprops/dest.c.svn-work                                                        |    0 
 cups/.svn/wcprops/dir.c.svn-work                                                         |    0 
 cups/.svn/wcprops/dir.h.svn-work                                                         |    0 
 cups/.svn/wcprops/emit.c.svn-work                                                        |    0 
 cups/.svn/wcprops/encode.c.svn-work                                                      |    0 
 cups/.svn/wcprops/file.c.svn-work                                                        |    0 
 cups/.svn/wcprops/file.h.svn-work                                                        |    0 
 cups/.svn/wcprops/getifaddrs.c.svn-work                                                  |    0 
 cups/.svn/wcprops/getputfile.c.svn-work                                                  |    0 
 cups/.svn/wcprops/globals.c.svn-work                                                     |    0 
 cups/.svn/wcprops/globals.h.svn-work                                                     |    0 
 cups/.svn/wcprops/http-addr.c.svn-work                                                   |    0 
 cups/.svn/wcprops/http-addrlist.c.svn-work                                               |    0 
 cups/.svn/wcprops/http-private.h.svn-work                                                |    0 
 cups/.svn/wcprops/http-support.c.svn-work                                                |    0 
 cups/.svn/wcprops/http.c.svn-work                                                        |    0 
 cups/.svn/wcprops/http.h.svn-work                                                        |    0 
 cups/.svn/wcprops/i18n.h.svn-work                                                        |    0 
 cups/.svn/wcprops/ipp-private.h.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp-support.c.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ipp.h.svn-work                                                         |    0 
 cups/.svn/wcprops/langprintf.c.svn-work                                                  |    0 
 cups/.svn/wcprops/language.c.svn-work                                                    |    0 
 cups/.svn/wcprops/language.h.svn-work                                                    |    0 
 cups/.svn/wcprops/libcups_s.exp.svn-work                                                 |    0 
 cups/.svn/wcprops/localize.c.svn-work                                                    |    0 
 cups/.svn/wcprops/mark.c.svn-work                                                        |    0 
 cups/.svn/wcprops/md5-apple.h.svn-work                                                   |    0 
 cups/.svn/wcprops/md5.c.svn-work                                                         |    0 
 cups/.svn/wcprops/md5.h.svn-work                                                         |    0 
 cups/.svn/wcprops/md5passwd.c.svn-work                                                   |    0 
 cups/.svn/wcprops/notify.c.svn-work                                                      |    0 
 cups/.svn/wcprops/options.c.svn-work                                                     |    0 
 cups/.svn/wcprops/page.c.svn-work                                                        |    0 
 cups/.svn/wcprops/ppd.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ppd.h.svn-work                                                         |    0 
 cups/.svn/wcprops/request.c.svn-work                                                     |    0 
 cups/.svn/wcprops/snprintf.c.svn-work                                                    |    0 
 cups/.svn/wcprops/string.c.svn-work                                                      |    0 
 cups/.svn/wcprops/string.h.svn-work                                                      |    0 
 cups/.svn/wcprops/tempfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/test.ppd.svn-work                                                      |    0 
 cups/.svn/wcprops/testadmin.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testarray.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testhttp.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testi18n.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testipp.c.svn-work                                                     |    0 
 cups/.svn/wcprops/testlang.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testppd.c.svn-work                                                     |    0 
 cups/.svn/wcprops/transcode.c.svn-work                                                   |    0 
 cups/.svn/wcprops/transcode.h.svn-work                                                   |    0 
 cups/.svn/wcprops/usersys.c.svn-work                                                     |    0 
 cups/.svn/wcprops/utf8demo.txt.svn-work                                                  |    0 
 cups/.svn/wcprops/util.c.svn-work                                                        |    0 
 cups/Makefile                                                                            |   10 
 cups/adminutil.c                                                                         |   17 
 cups/emit.c                                                                              |   27 
 cups/http-addrlist.c                                                                     |   20 
 cups/http.c                                                                              |   25 
 cups/http.h                                                                              |   14 
 cups/ipp.c                                                                               |    8 
 cups/mark.c                                                                              |   11 
 cups/testhttp.c                                                                          |   22 
 cups/testppd.c                                                                           |   57 
 cups/util.c                                                                              |   29 
 data/.svn/dir-wcprops                                                                    |    0 
 data/.svn/entries                                                                        |    0 
 data/.svn/wcprops/HPGLprolog.svn-work                                                    |    0 
 data/.svn/wcprops/Makefile.svn-work                                                      |    0 
 data/.svn/wcprops/classified.svn-work                                                    |    0 
 data/.svn/wcprops/confidential.svn-work                                                  |    0 
 data/.svn/wcprops/cups.irix.svn-work                                                     |    0 
 data/.svn/wcprops/cups.pam.svn-work                                                      |    0 
 data/.svn/wcprops/cups.suse.svn-work                                                     |    0 
 data/.svn/wcprops/euc-cn.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-jp.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-kr.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-tw.txt.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-10.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-10.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-11.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-13.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-13.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-14.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-14.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-15.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-15.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-16.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-2.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-2.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-3.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-3.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-4.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-4.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-5.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-5.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-6.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-6.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-7.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-7.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-8.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-8.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-9.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-9.txt.svn-work                                                |    0 
 data/.svn/wcprops/koi8-r.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-r.txt.svn-work                                                    |    0 
 data/.svn/wcprops/koi8-u.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-u.txt.svn-work                                                    |    0 
 data/.svn/wcprops/mac-roman.txt.svn-work                                                 |    0 
 data/.svn/wcprops/psglyphs.svn-work                                                      |    0 
 data/.svn/wcprops/secret.svn-work                                                        |    0 
 data/.svn/wcprops/smiley.ps.svn-work                                                     |    0 
 data/.svn/wcprops/standard.svn-work                                                      |    0 
 data/.svn/wcprops/testprint.ps.svn-work                                                  |    0 
 data/.svn/wcprops/topsecret.svn-work                                                     |    0 
 data/.svn/wcprops/unclassified.svn-work                                                  |    0 
 data/.svn/wcprops/utf-8.svn-work                                                         |    0 
 data/.svn/wcprops/windows-1250.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1250.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1251.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1251.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1252.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1252.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1253.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1253.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1254.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1254.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1255.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1255.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1256.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1256.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1257.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1257.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1258.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1258.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1361.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-874.svn-work                                                   |    0 
 data/.svn/wcprops/windows-874.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-932.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-936.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-949.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-950.txt.svn-work                                               |    0 
 desktop/.svn/dir-wcprops                                                                 |    0 
 desktop/.svn/entries                                                                     |    0 
 desktop/.svn/wcprops/cups-128.png.svn-work                                               |    0 
 desktop/.svn/wcprops/cups-16.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-32.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-64.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups.desktop.svn-work                                               |    0 
 doc/.svn/dir-wcprops                                                                     |    0 
 doc/.svn/entries                                                                         |    0 
 doc/.svn/text-base/Makefile.svn-base                                                     |    0 
 doc/.svn/wcprops/Makefile.svn-work                                                       |    0 
 doc/.svn/wcprops/cups-printable.css.svn-work                                             |    0 
 doc/.svn/wcprops/cups.css.svn-work                                                       |    0 
 doc/.svn/wcprops/favicon.ico.svn-work                                                    |    0 
 doc/.svn/wcprops/idd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/index.html.in.svn-work                                                  |    0 
 doc/.svn/wcprops/printing-overview.shtml.svn-work                                        |    0 
 doc/.svn/wcprops/robots.txt.svn-work                                                     |    0 
 doc/.svn/wcprops/sdd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/sps.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/system-overview.shtml.svn-work                                          |    0 
 doc/Makefile                                                                             |   16 
 doc/es/.svn/dir-wcprops                                                                  |    0 
 doc/es/.svn/entries                                                                      |    0 
 doc/es/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/es/images/.svn/dir-wcprops                                                           |    0 
 doc/es/images/.svn/entries                                                               |    0 
 doc/es/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/es/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/es/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/es/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/es/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/es/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/es/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/es/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/es/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/help/.svn/dir-wcprops                                                                |    0 
 doc/help/.svn/entries                                                                    |    0 
 doc/help/.svn/text-base/spec-raster.html.svn-base                                        |    0 
 doc/help/.svn/wcprops/api-array.html.svn-work                                            |    0 
 doc/help/.svn/wcprops/api-cups.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/api-filedir.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-filter.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/api-httpipp.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-ppd.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/api-raster.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/cgi.html.svn-work                                                  |    0 
 doc/help/.svn/wcprops/glossary.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/license.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/network.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/options.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/overview.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/ref-access_log.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-classes-conf.html.svn-work                                     |    0 
 doc/help/.svn/wcprops/ref-client-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-cupsd-conf.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-error_log.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-page_log.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/ref-printers-conf.html.svn-work                                    |    0 
 doc/help/.svn/wcprops/ref-snmp-conf.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-subscriptions-conf.html.svn-work                               |    0 
 doc/help/.svn/wcprops/security.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-cmp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-command.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/spec-design.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-ipp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-ppd.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-raster.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-stp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/standard.html.in.svn-work                                          |    0 
 doc/help/.svn/wcprops/translation.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/whatsnew.html.svn-work                                             |    0 
 doc/help/spec-raster.html                                                                |   32 
 doc/images/.svn/dir-wcprops                                                              |    0 
 doc/images/.svn/entries                                                                  |    0 
 doc/images/.svn/wcprops/bottom-left.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/bottom-right.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-accept-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-class.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-add-printer.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-this-printer.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-cancel-job.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-change-settings.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-clear.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-continue.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-delete-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-delete-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                      |    0 
 doc/images/.svn/wcprops/button-export-samba.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-help.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/button-hold-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-manage-classes.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-manage-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-manage-printers.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-manage-server.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-modify-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-modify-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-move-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-move-jobs.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                         |    0 
 doc/images/.svn/wcprops/button-print-test-page.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-publish-printer.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-reject-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-release-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-restart-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-save-changes.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-search.gif.svn-work                                       |    0 
 doc/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-set-as-default.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-set-printer-options.gif.svn-work                          |    0 
 doc/images/.svn/wcprops/button-show-active.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-show-all.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-show-completed.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-show-next.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-show-previous.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-sort-ascending.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-sort-descending.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-start-class.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-start-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-stop-class.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-stop-printer.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-use-default-config.gif.svn-work                           |    0 
 doc/images/.svn/wcprops/button-view-access-log.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-view-error-log.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-view-page-log.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-view-printable-version.gif.svn-work                       |    0 
 doc/images/.svn/wcprops/classes.gif.svn-work                                             |    0 
 doc/images/.svn/wcprops/classes.svg.svn-work                                             |    0 
 doc/images/.svn/wcprops/cups-black-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-black-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-block-diagram.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-block-diagram.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-green-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-green-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-large.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-medium.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/cups-red-button-2.2.scm.svn-work                                 |    0 
 doc/images/.svn/wcprops/cups-red-button.scm.svn-work                                     |    0 
 doc/images/.svn/wcprops/cups-small.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-standard-button-2.2.scm.svn-work                            |    0 
 doc/images/.svn/wcprops/cups-standard-button.scm.svn-work                                |    0 
 doc/images/.svn/wcprops/draft.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/esp-logo.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/happy.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/logo.gif.svn-work                                                |    0 
 doc/images/.svn/wcprops/printer-idle.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-idle.svg.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-processing.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-processing.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-stopped.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/printer-stopped.svg.svn-work                                     |    0 
 doc/images/.svn/wcprops/smiley.jpg.svn-work                                              |    0 
 doc/images/.svn/wcprops/tab-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/tab-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/top-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/top-middle.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/top-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/web-add-this-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/web-password.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/web-printer-driver.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-printer-status.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-set-printer-options.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/web-test-page.gif.svn-work                                       |    0 
 doc/ja/.svn/dir-wcprops                                                                  |    0 
 doc/ja/.svn/entries                                                                      |    0 
 doc/ja/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/ja/images/.svn/dir-wcprops                                                           |    0 
 doc/ja/images/.svn/entries                                                               |    0 
 doc/ja/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/ja/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/ja/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/ja/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/ja/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/ja/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/ja/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/show-all-jobs.gif.svn-work                                    |    0 
 doc/pl/.svn/dir-wcprops                                                                  |    0 
 doc/pl/.svn/entries                                                                      |    0 
 doc/pl/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/pl/images/.svn/dir-wcprops                                                           |    0 
 doc/pl/images/.svn/entries                                                               |    0 
 doc/pl/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/pl/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/pl/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/pl/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/pl/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/pl/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/pl/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/pl/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/pl/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/sv/.svn/dir-wcprops                                                                  |    0 
 doc/sv/.svn/entries                                                                      |    0 
 doc/sv/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/sv/images/.svn/dir-wcprops                                                           |    0 
 doc/sv/images/.svn/entries                                                               |    0 
 doc/sv/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/sv/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/sv/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/sv/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/sv/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/sv/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/sv/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/sv/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/sv/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 driver/.svn/dir-wcprops                                                                  |    0 
 driver/.svn/entries                                                                      |    0 
 driver/.svn/wcprops/testdriver.c.svn-work                                                |    0 
 filter/.svn/dir-prop-base                                                                |    0 
 filter/.svn/dir-props                                                                    |    0 
 filter/.svn/dir-wcprops                                                                  |    0 
 filter/.svn/entries                                                                      |    0 
 filter/.svn/prop-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/props/rasterbench.c.svn-work                                                 |    0 
 filter/.svn/text-base/Makefile.svn-base                                                  |    0 
 filter/.svn/text-base/pstops.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.h.svn-base                                                  |    0 
 filter/.svn/text-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/text-base/rastertolabel.c.svn-base                                           |    0 
 filter/.svn/wcprops/Dependencies.svn-work                                                |    0 
 filter/.svn/wcprops/Makefile.svn-work                                                    |    0 
 filter/.svn/wcprops/api-raster.shtml.svn-work                                            |    0 
 filter/.svn/wcprops/common.c.svn-work                                                    |    0 
 filter/.svn/wcprops/common.h.svn-work                                                    |    0 
 filter/.svn/wcprops/form-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form-ps.c.svn-work                                                   |    0 
 filter/.svn/wcprops/form-tree.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form.h.svn-work                                                      |    0 
 filter/.svn/wcprops/gziptoany.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-attr.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-char.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-config.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-input.c.svn-work                                                |    0 
 filter/.svn/wcprops/hpgl-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-polygon.c.svn-work                                              |    0 
 filter/.svn/wcprops/hpgl-prolog.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-vector.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgltops.h.svn-work                                                  |    0 
 filter/.svn/wcprops/image-bmp.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-colorspace.c.svn-work                                          |    0 
 filter/.svn/wcprops/image-gif.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-jpeg.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-photocd.c.svn-work                                             |    0 
 filter/.svn/wcprops/image-pix.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-png.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-pnm.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-private.h.svn-work                                             |    0 
 filter/.svn/wcprops/image-sgi.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgi.h.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgilib.c.svn-work                                              |    0 
 filter/.svn/wcprops/image-sun.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-tiff.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-zoom.c.svn-work                                                |    0 
 filter/.svn/wcprops/image.c.svn-work                                                     |    0 
 filter/.svn/wcprops/image.h.svn-work                                                     |    0 
 filter/.svn/wcprops/imagetops.c.svn-work                                                 |    0 
 filter/.svn/wcprops/imagetoraster.c.svn-work                                             |    0 
 filter/.svn/wcprops/interpret.c.svn-work                                                 |    0 
 filter/.svn/wcprops/libcupsimage_s.exp.svn-work                                          |    0 
 filter/.svn/wcprops/pstops.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.h.svn-work                                                    |    0 
 filter/.svn/wcprops/rasterbench.c.svn-work                                               |    0 
 filter/.svn/wcprops/rastertoepson.c.svn-work                                             |    0 
 filter/.svn/wcprops/rastertohp.c.svn-work                                                |    0 
 filter/.svn/wcprops/rastertolabel.c.svn-work                                             |    0 
 filter/.svn/wcprops/testimage.c.svn-work                                                 |    0 
 filter/.svn/wcprops/testraster.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.h.svn-work                                                |    0 
 filter/.svn/wcprops/texttops.c.svn-work                                                  |    0 
 filter/Makefile                                                                          |   20 
 filter/pstops.c                                                                          |   95 -
 filter/raster.c                                                                          |  683 +++----
 filter/raster.h                                                                          |   11 
 filter/rasterbench.c                                                                     |  355 ++++
 filter/rastertolabel.c                                                                   |   13 
 fonts/.svn/dir-wcprops                                                                   |    0 
 fonts/.svn/entries                                                                       |    0 
 fonts/.svn/wcprops/Courier-Bold.svn-work                                                 |    0 
 fonts/.svn/wcprops/Courier-BoldOblique.svn-work                                          |    0 
 fonts/.svn/wcprops/Courier-Oblique.svn-work                                              |    0 
 fonts/.svn/wcprops/Courier.svn-work                                                      |    0 
 fonts/.svn/wcprops/Makefile.svn-work                                                     |    0 
 fonts/.svn/wcprops/Symbol.svn-work                                                       |    0 
 init/.svn/dir-wcprops                                                                    |    0 
 init/.svn/entries                                                                        |    0 
 init/.svn/wcprops/Localizable.strings.svn-work                                           |    0 
 init/.svn/wcprops/PrintingServices.svn-work                                              |    0 
 init/.svn/wcprops/StartupParameters.plist.svn-work                                       |    0 
 init/.svn/wcprops/cups-lpd.in.svn-work                                                   |    0 
 init/.svn/wcprops/cups.sh.in.svn-work                                                    |    0 
 init/.svn/wcprops/org.cups.cupsd.plist.svn-work                                          |    0 
 locale/.svn/dir-wcprops                                                                  |    0 
 locale/.svn/entries                                                                      |    0 
 locale/.svn/text-base/Makefile.svn-base                                                  |    0 
 locale/.svn/text-base/cups_es.po.svn-base                                                |    0 
 locale/.svn/wcprops/Makefile.svn-work                                                    |    0 
 locale/.svn/wcprops/cups.footer.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.header.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.pot.svn-work                                                    |    0 
 locale/.svn/wcprops/cups_es.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_ja.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_pl.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_sv.po.svn-work                                                  |    0 
 locale/.svn/wcprops/locale.txt.svn-work                                                  |    0 
 locale/.svn/wcprops/translate.c.svn-work                                                 |    0 
 locale/Makefile                                                                          |   14 
 locale/cups_es.po                                                                        |  482 +----
 man/.svn/dir-wcprops                                                                     |    0 
 man/.svn/entries                                                                         |    0 
 man/.svn/text-base/cupsaddsmb.man.in.svn-base                                            |    0 
 man/.svn/text-base/cupsd.conf.man.in.svn-base                                            |    0 
 man/.svn/wcprops/Makefile.svn-work                                                       |    0 
 man/.svn/wcprops/accept.man.svn-work                                                     |    0 
 man/.svn/wcprops/backend.man.svn-work                                                    |    0 
 man/.svn/wcprops/cancel.man.svn-work                                                     |    0 
 man/.svn/wcprops/classes.conf.man.svn-work                                               |    0 
 man/.svn/wcprops/client.conf.man.in.svn-work                                             |    0 
 man/.svn/wcprops/cups-config.man.svn-work                                                |    0 
 man/.svn/wcprops/cups-deviced.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-driverd.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-lpd.man.in.svn-work                                                |    0 
 man/.svn/wcprops/cups-polld.man.svn-work                                                 |    0 
 man/.svn/wcprops/cups-snmp.conf.man.svn-work                                             |    0 
 man/.svn/wcprops/cupsaddsmb.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.conf.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.man.in.svn-work                                                   |    0 
 man/.svn/wcprops/cupsenable.man.svn-work                                                 |    0 
 man/.svn/wcprops/cupstestdsc.man.svn-work                                                |    0 
 man/.svn/wcprops/cupstestppd.man.svn-work                                                |    0 
 man/.svn/wcprops/filter.man.svn-work                                                     |    0 
 man/.svn/wcprops/lp.man.svn-work                                                         |    0 
 man/.svn/wcprops/lpadmin.man.svn-work                                                    |    0 
 man/.svn/wcprops/lpc.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpinfo.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpmove.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpoptions.man.in.svn-work                                               |    0 
 man/.svn/wcprops/lppasswd.man.svn-work                                                   |    0 
 man/.svn/wcprops/lpq.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpr.man.svn-work                                                        |    0 
 man/.svn/wcprops/lprm.man.svn-work                                                       |    0 
 man/.svn/wcprops/lpstat.man.svn-work                                                     |    0 
 man/.svn/wcprops/mantohtml.c.svn-work                                                    |    0 
 man/.svn/wcprops/mime.convs.man.svn-work                                                 |    0 
 man/.svn/wcprops/mime.types.man.svn-work                                                 |    0 
 man/.svn/wcprops/printers.conf.man.svn-work                                              |    0 
 man/.svn/wcprops/subscriptions.conf.man.svn-work                                         |    0 
 man/cupsaddsmb.man.in                                                                    |   21 
 man/cupsd.conf.man.in                                                                    |   10 
 monitor/.svn/dir-wcprops                                                                 |    0 
 monitor/.svn/entries                                                                     |    0 
 monitor/.svn/wcprops/Dependencies.svn-work                                               |    0 
 monitor/.svn/wcprops/Makefile.svn-work                                                   |    0 
 monitor/.svn/wcprops/bcp.c.svn-work                                                      |    0 
 monitor/.svn/wcprops/tbcp.c.svn-work                                                     |    0 
 notifier/.svn/dir-wcprops                                                                |    0 
 notifier/.svn/entries                                                                    |    0 
 notifier/.svn/wcprops/Dependencies.svn-work                                              |    0 
 notifier/.svn/wcprops/Makefile.svn-work                                                  |    0 
 notifier/.svn/wcprops/mailto.c.svn-work                                                  |    0 
 notifier/.svn/wcprops/testnotify.c.svn-work                                              |    0 
 packaging/.svn/dir-wcprops                                                               |    0 
 packaging/.svn/entries                                                                   |    0 
 packaging/.svn/text-base/cups.list.in.svn-base                                           |    0 
 packaging/.svn/text-base/cups.spec.in.svn-base                                           |    0 
 packaging/.svn/wcprops/LICENSE.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/WELCOME.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/cups-dbus.conf.svn-work                                           |    0 
 packaging/.svn/wcprops/cups-desc.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups-info.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups.list.in.svn-work                                             |    0 
 packaging/.svn/wcprops/cups.readme.svn-work                                              |    0 
 packaging/.svn/wcprops/cups.spec.in.svn-work                                             |    0 
 packaging/.svn/wcprops/installer.tif.svn-work                                            |    0 
 packaging/.svn/wcprops/installer.xcf.gz.svn-work                                         |    0 
 packaging/cups.list.in                                                                   |    8 
 packaging/cups.spec.in                                                                   |    6 
 pdftops/.svn/dir-wcprops                                                                 |    0 
 pdftops/.svn/entries                                                                     |    0 
 pdftops/.svn/text-base/PSOutputDev.cxx.svn-base                                          |    0 
 pdftops/.svn/wcprops/Annot.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Annot.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Array.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Array.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/BuiltinFont.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/BuiltinFont.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CMap.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/CMap.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/COPYING.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Catalog.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Catalog.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CharTypes.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/CompactFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/Decrypt.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Decrypt.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Dependencies.svn-work                                               |    0 
 pdftops/.svn/wcprops/Dict.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Dict.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Error.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Error.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/ErrorCodes.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/FoFiEncodings.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/FoFiEncodings.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/FoFiTrueType.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/FoFiTrueType.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/FoFiType1.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/FoFiType1C.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1C.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FontEncodingTables.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/FontEncodingTables.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Function.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/Function.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GHash.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GHash.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GList.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GList.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GMutex.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/GString.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GString.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Gfx.cxx.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Gfx.h.svn-work                                                      |    0 
 pdftops/.svn/wcprops/GfxFont.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GfxFont.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GfxState.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/GfxState.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GlobalParams.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/GlobalParams.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/JBIG2Stream.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/JBIG2Stream.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/Lexer.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Lexer.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Link.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Link.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Makefile.svn-work                                                   |    0 
 pdftops/.svn/wcprops/NameToCharCode.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/NameToCharCode.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/NameToUnicodeTable.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Object.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Object.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Outline.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Outline.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/OutputDev.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/OutputDev.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/PDFDoc.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/PDFDoc.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/PSOutputDev.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSOutputDev.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/PSTokenizer.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSTokenizer.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/Page.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Page.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Parser.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Parser.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/README.svn-work                                                     |    0 
 pdftops/.svn/wcprops/SecurityHandler.cxx.svn-work                                        |    0 
 pdftops/.svn/wcprops/SecurityHandler.h.svn-work                                          |    0 
 pdftops/.svn/wcprops/Stream-CCITT.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/Stream.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Stream.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/UTF8.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/UnicodeMap.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/UnicodeMap.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/UnicodeMapTables.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.cxx.svn-work                                       |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/XRef.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/XRef.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/config.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/gfile.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/gfile.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/gmem.c.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmem.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmempp.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/gtypes.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/parseargs.c.svn-work                                                |    0 
 pdftops/.svn/wcprops/parseargs.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/pdftops.cxx.svn-work                                                |    0 
 pdftops/PSOutputDev.cxx                                                                  |    2 
 ppd/.svn/dir-wcprops                                                                     |    0 
 ppd/.svn/entries                                                                         |    0 
 ppd/.svn/text-base/zebracpl.ppd.svn-base                                                 |    0 
 ppd/.svn/wcprops/Makefile.svn-work                                                       |    0 
 ppd/.svn/wcprops/deskjet.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/deskjet2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/dymo.ppd.svn-work                                                       |    0 
 ppd/.svn/wcprops/epson24.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/epson9.ppd.svn-work                                                     |    0 
 ppd/.svn/wcprops/laserjet.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidat24.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidata9.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stcolor.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stcolor2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stphoto.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stphoto2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebra.ppd.svn-work                                                      |    0 
 ppd/.svn/wcprops/zebracpl.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep1.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep2.ppd.svn-work                                                   |    0 
 ppd/zebracpl.ppd                                                                         |    8 
 scheduler/.svn/dir-wcprops                                                               |    0 
 scheduler/.svn/entries                                                                   |    0 
 scheduler/.svn/text-base/auth.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/client.c.svn-base                                               |    0 
 scheduler/.svn/text-base/conf.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/conf.h.svn-base                                                 |    0 
 scheduler/.svn/text-base/dirsvc.c.svn-base                                               |    0 
 scheduler/.svn/text-base/filter.c.svn-base                                               |    0 
 scheduler/.svn/text-base/ipp.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/job.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/main.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/mime.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/printers.c.svn-base                                             |    0 
 scheduler/.svn/text-base/subscriptions.c.svn-base                                        |    0 
 scheduler/.svn/text-base/subscriptions.h.svn-base                                        |    0 
 scheduler/.svn/text-base/testmime.c.svn-base                                             |    0 
 scheduler/.svn/wcprops/Dependencies.svn-work                                             |    0 
 scheduler/.svn/wcprops/Makefile.svn-work                                                 |    0 
 scheduler/.svn/wcprops/auth.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/auth.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/banners.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/banners.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/cert.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cert.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/classes.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/classes.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/client.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/client.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/conf.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/conf.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cups-deviced.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-driverd.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-lpd.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/cups-polld.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/cups.pam.svn-work                                                 |    0 
 scheduler/.svn/wcprops/cupsd.h.svn-work                                                  |    0 
 scheduler/.svn/wcprops/dirsvc.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/dirsvc.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/env.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/filter.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/ipp.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.h.svn-work                                                    |    0 
 scheduler/.svn/wcprops/listen.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/log.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/main.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/network.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/network.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/policy.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/policy.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/printers.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/printers.h.svn-work                                               |    0 
 scheduler/.svn/wcprops/process.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/quotas.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/server.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/statbuf.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/statbuf.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/subscriptions.c.svn-work                                          |    0 
 scheduler/.svn/wcprops/subscriptions.h.svn-work                                          |    0 
 scheduler/.svn/wcprops/sysman.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/sysman.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/testdirsvc.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/testmime.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/testspeed.c.svn-work                                              |    0 
 scheduler/.svn/wcprops/type.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.h.svn-work                                                   |    0 
 scheduler/auth.c                                                                         |    9 
 scheduler/client.c                                                                       |   42 
 scheduler/conf.c                                                                         |  164 -
 scheduler/conf.h                                                                         |    5 
 scheduler/dirsvc.c                                                                       |   86 
 scheduler/filter.c                                                                       |    8 
 scheduler/ipp.c                                                                          |   56 
 scheduler/job.c                                                                          |  120 -
 scheduler/main.c                                                                         |    8 
 scheduler/mime.c                                                                         |   19 
 scheduler/printers.c                                                                     |   43 
 scheduler/subscriptions.c                                                                |  366 +---
 scheduler/subscriptions.h                                                                |   10 
 scheduler/testmime.c                                                                     |    6 
 scripting/.svn/dir-wcprops                                                               |    0 
 scripting/.svn/entries                                                                   |    0 
 scripting/java/.svn/dir-wcprops                                                          |    0 
 scripting/java/.svn/entries                                                              |    0 
 scripting/java/.svn/wcprops/CUPSPrinter.java.svn-work                                    |    0 
 scripting/java/.svn/wcprops/cups.jar.svn-work                                            |    0 
 scripting/java/classes/.svn/dir-wcprops                                                  |    0 
 scripting/java/classes/.svn/entries                                                      |    0 
 scripting/java/classes/com/.svn/dir-wcprops                                              |    0 
 scripting/java/classes/com/.svn/entries                                                  |    0 
 scripting/java/classes/com/easysw/.svn/dir-wcprops                                       |    0 
 scripting/java/classes/com/easysw/.svn/entries                                           |    0 
 scripting/java/classes/com/easysw/cups/.svn/dir-wcprops                                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/entries                                      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/Cups.class.svn-work                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsJob.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsPrinter.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPP.class.svn-work                   |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPAttribute.class.svn-work          |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPCalendar.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPDefs.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPError.class.svn-work              |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPHttp.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPMD5.class.svn-work                |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPRequest.class.svn-work            |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPStatus.class.svn-work             |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPURLConnection.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPValue.class.svn-work              |    0 
 scripting/java/docs/.svn/dir-wcprops                                                     |    0 
 scripting/java/docs/.svn/entries                                                         |    0 
 scripting/java/docs/.svn/wcprops/allclasses-frame.html.svn-work                          |    0 
 scripting/java/docs/.svn/wcprops/deprecated-list.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/help-doc.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/index-all.html.svn-work                                 |    0 
 scripting/java/docs/.svn/wcprops/index.html.svn-work                                     |    0 
 scripting/java/docs/.svn/wcprops/overview-tree.html.svn-work                             |    0 
 scripting/java/docs/.svn/wcprops/package-list.svn-work                                   |    0 
 scripting/java/docs/.svn/wcprops/packages.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/serialized-form.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/stylesheet.css.svn-work                                 |    0 
 scripting/java/docs/com/.svn/dir-wcprops                                                 |    0 
 scripting/java/docs/com/.svn/entries                                                     |    0 
 scripting/java/docs/com/easysw/.svn/dir-wcprops                                          |    0 
 scripting/java/docs/com/easysw/.svn/entries                                              |    0 
 scripting/java/docs/com/easysw/cups/.svn/dir-wcprops                                     |    0 
 scripting/java/docs/com/easysw/cups/.svn/entries                                         |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/Cups.html.svn-work                      |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsJob.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsPrinter.html.svn-work               |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPP.html.svn-work                       |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPAttribute.html.svn-work              |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPDefs.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPError.html.svn-work                  |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPHttp.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPRequest.html.svn-work                |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPStatus.html.svn-work                 |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPURLConnection.html.svn-work          |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPValue.html.svn-work                  |    0 
 scripting/java/example/.svn/dir-wcprops                                                  |    0 
 scripting/java/example/.svn/entries                                                      |    0 
 scripting/java/example/.svn/wcprops/GLP.class.svn-work                                   |    0 
 scripting/java/example/.svn/wcprops/GLP.java.svn-work                                    |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$1.class.svn-work                          |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$MyTextListener.class.svn-work             |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.class.svn-work                           |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.java.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$1.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$2.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$ButtonListener.class.svn-work |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.class.svn-work                |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.java.svn-work                 |    0 
 scripting/java/example/.svn/wcprops/GLPserver.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPserver.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPtabs$1.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/GLPvars.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPvars.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/buildit.svn-work                                     |    0 
 scripting/java/example/.svn/wcprops/class.list.svn-work                                  |    0 
 scripting/java/example/.svn/wcprops/runit.svn-work                                       |    0 
 scripting/java/example/images/.svn/dir-wcprops                                           |    0 
 scripting/java/example/images/.svn/entries                                               |    0 
 scripting/java/example/images/.svn/wcprops/left.gif.svn-work                             |    0 
 scripting/java/example/images/.svn/wcprops/print-test-page.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/printer-idle.gif.svn-work                     |    0 
 scripting/java/example/images/.svn/wcprops/printer-stopped.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/restart-job.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-active.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-completed.gif.svn-work                   |    0 
 scripting/java/src/.svn/dir-wcprops                                                      |    0 
 scripting/java/src/.svn/entries                                                          |    0 
 scripting/java/src/com/.svn/dir-wcprops                                                  |    0 
 scripting/java/src/com/.svn/entries                                                      |    0 
 scripting/java/src/com/easysw/.svn/dir-wcprops                                           |    0 
 scripting/java/src/com/easysw/.svn/entries                                               |    0 
 scripting/java/src/com/easysw/cups/.svn/dir-wcprops                                      |    0 
 scripting/java/src/com/easysw/cups/.svn/entries                                          |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/Cups.java.svn-work                       |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsJob.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsPrinter.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPP.java.svn-work                        |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPAttribute.java.svn-work               |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPCalendar.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPDefs.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPError.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPHttp.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPMD5.java.svn-work                     |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPRequest.java.svn-work                 |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPStatus.java.svn-work                  |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPURLConnection.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPValue.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/buildit.svn-work                         |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/class.list.svn-work                      |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/cups.nfo.svn-work                        |    0 
 scripting/perl/.svn/dir-wcprops                                                          |    0 
 scripting/perl/.svn/entries                                                              |    0 
 scripting/perl/.svn/wcprops/CUPS.pm.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/CUPS.xs.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/Makefile.PL.svn-work                                         |    0 
 scripting/perl/.svn/wcprops/README.svn-work                                              |    0 
 scripting/perl/.svn/wcprops/test.pl.svn-work                                             |    0 
 scripting/php/.svn/dir-wcprops                                                           |    0 
 scripting/php/.svn/entries                                                               |    0 
 scripting/php/.svn/wcprops/Dependencies.svn-work                                         |    0 
 scripting/php/.svn/wcprops/Makefile.svn-work                                             |    0 
 scripting/php/.svn/wcprops/README.svn-work                                               |    0 
 scripting/php/.svn/wcprops/phpcups.c.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.h.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.php.svn-work                                          |    0 
 standards/.svn/dir-wcprops                                                               |    0 
 standards/.svn/entries                                                                   |    0 
 standards/.svn/wcprops/Makefile.svn-work                                                 |    0 
 standards/.svn/wcprops/X.690-0207.pdf.svn-work                                           |    0 
 standards/.svn/wcprops/pwg5100.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/rfc1155.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1157.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1179.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1213.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1321.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2222.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2246.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2487.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2554.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2567.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2568.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2569.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2578.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2595.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2616.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2617.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2790.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2817.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2818.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2821.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2822.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2910.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2911.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2965.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3196.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3239.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3380.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3381.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3382.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3391.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3510.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3805.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3986.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3995.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3996.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3997.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3998.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc4122.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfctohtml.c.svn-work                                              |    0 
 standards/.svn/wcprops/wake-on-lan.pdf.svn-work                                          |    0 
 standards/.svn/wcprops/wd-ippmailto10-20050519.pdf.svn-work                              |    0 
 systemv/.svn/dir-wcprops                                                                 |    0 
 systemv/.svn/entries                                                                     |    0 
 systemv/.svn/text-base/Makefile.svn-base                                                 |    0 
 systemv/.svn/text-base/cancel.c.svn-base                                                 |    0 
 systemv/.svn/text-base/lpstat.c.svn-base                                                 |    0 
 systemv/.svn/wcprops/Dependencies.svn-work                                               |    0 
 systemv/.svn/wcprops/Makefile.svn-work                                                   |    0 
 systemv/.svn/wcprops/accept.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cancel.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cupsaddsmb.c.svn-work                                               |    0 
 systemv/.svn/wcprops/cupstestdsc.c.svn-work                                              |    0 
 systemv/.svn/wcprops/cupstestppd.c.svn-work                                              |    0 
 systemv/.svn/wcprops/lp.c.svn-work                                                       |    0 
 systemv/.svn/wcprops/lpadmin.c.svn-work                                                  |    0 
 systemv/.svn/wcprops/lpinfo.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpmove.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpoptions.c.svn-work                                                |    0 
 systemv/.svn/wcprops/lppasswd.c.svn-work                                                 |    0 
 systemv/.svn/wcprops/lpstat.c.svn-work                                                   |    0 
 systemv/Makefile                                                                         |    6 
 systemv/cancel.c                                                                         |    7 
 systemv/lpstat.c                                                                         |   59 
 templates/.svn/dir-wcprops                                                               |    0 
 templates/.svn/entries                                                                   |    0 
 templates/.svn/text-base/Makefile.svn-base                                               |    0 
 templates/.svn/wcprops/Makefile.svn-work                                                 |    0 
 templates/.svn/wcprops/add-class.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/add-printer.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/admin.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/choose-device.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-make.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/choose-model.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/choose-serial.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-uri.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/class-added.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/class-confirm.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-deleted.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-jobs-header.tmpl.svn-work                                   |    0 
 templates/.svn/wcprops/class-modified.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes-header.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/edit-config.tmpl.in.svn-work                                      |    0 
 templates/.svn/wcprops/error-op.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/error.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/header.tmpl.in.svn-work                                           |    0 
 templates/.svn/wcprops/help-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/help-printable.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/job-cancel.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/job-hold.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-move.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-moved.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/job-release.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/job-restart.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs.tmpl.svn-work                                                |    0 
 templates/.svn/wcprops/maintenance.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/modify-class.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/modify-printer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-boolean.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-conflict.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-header.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/option-pickmany.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-pickone.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-trailer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/pager.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/printer-accept.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-added.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-configured.tmpl.svn-work                                  |    0 
 templates/.svn/wcprops/printer-confirm.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-default.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-deleted.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work                                 |    0 
 templates/.svn/wcprops/printer-modified.tmpl.svn-work                                    |    0 
 templates/.svn/wcprops/printer-purge.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-reject.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-start.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-stop.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/printers-header.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printers.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/restart.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/samba-export.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/samba-exported.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/search.tmpl.svn-work                                              |    0 
 templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work                          |    0 
 templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                         |    0 
 templates/.svn/wcprops/test-page.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/trailer.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/users.tmpl.svn-work                                               |    0 
 templates/Makefile                                                                       |   14 
 templates/es/.svn/dir-wcprops                                                            |    0 
 templates/es/.svn/entries                                                                |    0 
 templates/es/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/es/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/es/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/es/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/es/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/es/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/es/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/es/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/es/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/es/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/es/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/.svn/dir-wcprops                                                            |    0 
 templates/ja/.svn/entries                                                                |    0 
 templates/ja/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/ja/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/ja/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/ja/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/ja/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/ja/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/ja/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/ja/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/ja/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/pl/.svn/dir-wcprops                                                            |    0 
 templates/pl/.svn/entries                                                                |    0 
 templates/pl/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/pl/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/pl/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/pl/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/pl/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/pl/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/pl/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/sv/.svn/dir-wcprops                                                            |    0 
 templates/sv/.svn/entries                                                                |    0 
 templates/sv/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/sv/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/sv/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/sv/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/sv/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/sv/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 test/.svn/dir-wcprops                                                                    |    0 
 test/.svn/entries                                                                        |    0 
 test/.svn/wcprops/4.1-requests.test.svn-work                                             |    0 
 test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/4.3-job-ops.test.svn-work                                              |    0 
 test/.svn/wcprops/4.4-subscription-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/5.1-lpadmin.sh.svn-work                                                |    0 
 test/.svn/wcprops/5.2-lpc.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.3-lpq.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.4-lpstat.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.5-lp.sh.svn-work                                                     |    0 
 test/.svn/wcprops/5.6-lpr.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.7-lprm.sh.svn-work                                                   |    0 
 test/.svn/wcprops/5.8-cancel.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.9-lpinfo.sh.svn-work                                                 |    0 
 test/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 test/.svn/wcprops/Makefile.svn-work                                                      |    0 
 test/.svn/wcprops/create-job-format.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-sheets.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-timeout.test.svn-work                                       |    0 
 test/.svn/wcprops/create-job.test.svn-work                                               |    0 
 test/.svn/wcprops/get-devices.test.svn-work                                              |    0 
 test/.svn/wcprops/get-job-attributes.test.svn-work                                       |    0 
 test/.svn/wcprops/get-job-attributes2.test.svn-work                                      |    0 
 test/.svn/wcprops/get-ppds.test.svn-work                                                 |    0 
 test/.svn/wcprops/get-printer-attributes.test.svn-work                                   |    0 
 test/.svn/wcprops/get-printers.test.svn-work                                             |    0 
 test/.svn/wcprops/ipptest.c.svn-work                                                     |    0 
 test/.svn/wcprops/print-job-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/print-job.test.svn-work                                                |    0 
 test/.svn/wcprops/run-stp-tests.sh.svn-work                                              |    0 
 test/.svn/wcprops/set-attrs-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/str-header.html.svn-work                                               |    0 
 test/.svn/wcprops/str-trailer.html.svn-work                                              |    0 
 test/.svn/wcprops/testfile.jpg.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.pdf.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.ps.svn-work                                                   |    0 
 test/.svn/wcprops/testfile.txt.svn-work                                                  |    0 
 test/.svn/wcprops/testhp.ppd.svn-work                                                    |    0 
 test/.svn/wcprops/testps.ppd.svn-work                                                    |    0 
 tools/.svn/dir-wcprops                                                                   |    0 
 tools/.svn/entries                                                                       |    0 
 tools/.svn/wcprops/checkglobals.svn-work                                                 |    0 
 tools/.svn/wcprops/listpublic.svn-work                                                   |    0 
 tools/.svn/wcprops/makesrcdist.svn-work                                                  |    0 
 tools/.svn/wcprops/testosx.svn-work                                                      |    0 
 tools/.svn/wcprops/testrpm.svn-work                                                      |    0 
 vcnet/.svn/dir-wcprops                                                                   |    0 
 vcnet/.svn/entries                                                                       |    0 
 vcnet/.svn/wcprops/config.h.svn-work                                                     |    0 
 vcnet/.svn/wcprops/cups.sln.svn-work                                                     |    0 
 vcnet/.svn/wcprops/libcups2.def.svn-work                                                 |    0 
 vcnet/.svn/wcprops/libcups2.vcproj.svn-work                                              |    0 
 1742 files changed, 2782 insertions(+), 3554 deletions(-)

--- NEW FILE cups-svn5706.patch ---
diff -durN release-1.2.1/backend/backend-private.h cups-1.2.x/backend/backend-private.h
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
diff -durN release-1.2.1/backend/Dependencies cups-1.2.x/backend/Dependencies
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
diff -durN release-1.2.1/backend/easysw-firewire-design.txt cups-1.2.x/backend/easysw-firewire-design.txt
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
[...11598 lines suppressed...]
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/dir-wcprops cups-1.2.x/templates/sv/.svn/dir-wcprops
diff -durN release-1.2.1/templates/sv/.svn/entries cups-1.2.x/templates/sv/.svn/entries
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/dir-wcprops cups-1.2.x/templates/.svn/dir-wcprops
diff -durN release-1.2.1/templates/.svn/entries cups-1.2.x/templates/.svn/entries
diff -durN release-1.2.1/templates/.svn/text-base/Makefile.svn-base cups-1.2.x/templates/.svn/text-base/Makefile.svn-base
diff -durN release-1.2.1/templates/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/Makefile.svn-work cups-1.2.x/templates/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/test/.svn/dir-wcprops cups-1.2.x/test/.svn/dir-wcprops
diff -durN release-1.2.1/test/.svn/entries cups-1.2.x/test/.svn/entries
diff -durN release-1.2.1/test/.svn/wcprops/4.1-requests.test.svn-work cups-1.2.x/test/.svn/wcprops/4.1-requests.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.3-job-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.3-job-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.4-subscription-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.4-subscription-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.1-lpadmin.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.1-lpadmin.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.2-lpc.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.2-lpc.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.3-lpq.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.3-lpq.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.4-lpstat.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.4-lpstat.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.5-lp.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.5-lp.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.6-lpr.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.6-lpr.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.7-lprm.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.7-lprm.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.8-cancel.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.8-cancel.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.9-lpinfo.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.9-lpinfo.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-format.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-format.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-sheets.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-sheets.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-timeout.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-timeout.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Dependencies.svn-work cups-1.2.x/test/.svn/wcprops/Dependencies.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-devices.test.svn-work cups-1.2.x/test/.svn/wcprops/get-devices.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes2.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes2.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-ppds.test.svn-work cups-1.2.x/test/.svn/wcprops/get-ppds.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printer-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printer-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printers.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printers.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/ipptest.c.svn-work cups-1.2.x/test/.svn/wcprops/ipptest.c.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Makefile.svn-work cups-1.2.x/test/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/run-stp-tests.sh.svn-work cups-1.2.x/test/.svn/wcprops/run-stp-tests.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/set-attrs-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/set-attrs-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-header.html.svn-work cups-1.2.x/test/.svn/wcprops/str-header.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-trailer.html.svn-work cups-1.2.x/test/.svn/wcprops/str-trailer.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.jpg.svn-work cups-1.2.x/test/.svn/wcprops/testfile.jpg.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.pdf.svn-work cups-1.2.x/test/.svn/wcprops/testfile.pdf.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.ps.svn-work cups-1.2.x/test/.svn/wcprops/testfile.ps.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.txt.svn-work cups-1.2.x/test/.svn/wcprops/testfile.txt.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testhp.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testhp.ppd.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testps.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testps.ppd.svn-work
diff -durN release-1.2.1/tools/.svn/dir-wcprops cups-1.2.x/tools/.svn/dir-wcprops
diff -durN release-1.2.1/tools/.svn/entries cups-1.2.x/tools/.svn/entries
diff -durN release-1.2.1/tools/.svn/wcprops/checkglobals.svn-work cups-1.2.x/tools/.svn/wcprops/checkglobals.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/listpublic.svn-work cups-1.2.x/tools/.svn/wcprops/listpublic.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/makesrcdist.svn-work cups-1.2.x/tools/.svn/wcprops/makesrcdist.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testosx.svn-work cups-1.2.x/tools/.svn/wcprops/testosx.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testrpm.svn-work cups-1.2.x/tools/.svn/wcprops/testrpm.svn-work
diff -durN release-1.2.1/vcnet/.svn/dir-wcprops cups-1.2.x/vcnet/.svn/dir-wcprops
diff -durN release-1.2.1/vcnet/.svn/entries cups-1.2.x/vcnet/.svn/entries
diff -durN release-1.2.1/vcnet/.svn/wcprops/config.h.svn-work cups-1.2.x/vcnet/.svn/wcprops/config.h.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/cups.sln.svn-work cups-1.2.x/vcnet/.svn/wcprops/cups.sln.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.def.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.def.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.vcproj.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.vcproj.svn-work

cups-direct-usb.patch:
 usb-unix.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-direct-usb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-direct-usb.patch	4 Apr 2006 15:20:26 -0000	1.1
+++ cups-direct-usb.patch	4 Jul 2006 17:12:59 -0000	1.2
@@ -1,11 +1,16 @@
---- cups-1.2rc1/backend/usb-unix.c.direct-usb	2006-04-04 15:57:47.000000000 +0100
-+++ cups-1.2rc1/backend/usb-unix.c	2006-04-04 15:58:26.000000000 +0100
-@@ -431,7 +431,7 @@
- 
+--- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
++++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
+@@ -327,12 +327,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
--    return (-1); /* Do not allow direct devices anymore */
+   {
+-   /*
+-    * Do not allow direct devices anymore...
+-    */
+-
+-    errno = ENODEV;
+-    return (-1);
 +    return (open(uri + 4, O_RDWR | O_EXCL));
+   }
    else if (!strncmp(uri, "usb://", 6))
    {
-    /*

cups-relro.patch:
 Makedefs.in                     |    2 +-
 config-scripts/cups-compiler.m4 |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: cups-relro.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-relro.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-relro.patch	30 Mar 2006 15:15:35 -0000	1.3
+++ cups-relro.patch	4 Jul 2006 17:12:59 -0000	1.4
@@ -1,11 +1,36 @@
---- cups-1.2svn-r4964/pdftops/Makefile.relro	2006-01-25 16:56:03.000000000 +0000
-+++ cups-1.2svn-r4964/pdftops/Makefile	2006-01-25 16:56:40.000000000 +0000
-@@ -9,7 +9,7 @@
+--- cups-1.2.1/Makedefs.in.relro	2006-07-04 17:52:05.000000000 +0100
++++ cups-1.2.1/Makedefs.in	2006-07-04 17:52:54.000000000 +0100
+@@ -132,7 +132,7 @@
+ IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+ LDFLAGS		=	-L../cups -L../filter $(ARCHFLAGS) \
+-			@LDFLAGS@ @PIEFLAGS@ $(OPTIM)
++			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
+ LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+ LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+--- cups-1.2.1/config-scripts/cups-compiler.m4.relro	2006-07-04 17:52:05.000000000 +0100
++++ cups-1.2.1/config-scripts/cups-compiler.m4	2006-07-04 17:52:05.000000000 +0100
+@@ -89,6 +89,9 @@
+ CXXLIBS=""
+ AC_SUBST(CXXLIBS)
  
++RELROFLAG=""
++AC_SUBST(RELROFLAG)
++
+ PIEFLAGS=""
+ AC_SUBST(PIEFLAGS)
  
- include ../Makedefs
--LDFLAGS += -pie
-+LDFLAGS += -pie -Wl,-z,relro
+@@ -108,6 +111,12 @@
  
- #
- # Object files...
+ 	case $uname in
+ 		Linux*)
++			RELROFLAG="-Wl,-z,relro"
++			;;
++	esac
++
++	case $uname in
++		Linux*)
+ 			if test x$enable_pie = xyes; then
+ 				PIEFLAGS="-pie -fPIE"
+ 			fi

cups-str1705.patch:
 usb-unix.c |    2 ++
 1 files changed, 2 insertions(+)

Index: cups-str1705.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-str1705.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-str1705.patch	22 May 2006 22:10:34 -0000	1.4
+++ cups-str1705.patch	4 Jul 2006 17:12:59 -0000	1.5
@@ -1,11 +1,11 @@
---- cups-1.2.1/backend/usb-unix.c.str1705	2006-05-22 23:00:11.000000000 +0100
-+++ cups-1.2.1/backend/usb-unix.c	2006-05-22 23:02:14.000000000 +0100
-@@ -90,6 +90,8 @@
+--- cups-1.2.1/backend/usb-unix.c.str1705	2006-07-04 17:47:55.000000000 +0100
++++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:48:43.000000000 +0100
+@@ -81,6 +81,8 @@
    */
  
-   usebc = strcasecmp(hostname, "Canon") != 0;
-+  if (usebc && !strncmp(uri, "usb:/dev/", 9))
-+    usebc = 0;
+   use_bc = strcasecmp(hostname, "Canon") != 0;
++  if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++    use_bc = 0;
  
   /*
    * Open the USB port device...


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- cups.spec	15 Jun 2006 11:14:04 -0000	1.194
+++ cups.spec	4 Jul 2006 17:12:59 -0000	1.195
@@ -1,12 +1,11 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define build_as_pie 1
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.10
+Release: 1.11
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -21,10 +20,10 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
+Patch0: cups-svn5706.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -34,16 +33,10 @@
 Patch11: cups-str1705.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
-Patch14: cups-localhost.patch
-Patch15: cups-str1740.patch
-Patch16: cups-pie.patch
 Patch17: cups-serverbin-compat.patch
 Patch18: cups-language.patch
-Patch19: cups-str1758.patch
 Patch20: cups-direct-usb.patch
-Patch21: cups-str1736.patch
 Patch22: cups-dest-cache-v2.patch
-Patch23: cups-str1776.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -123,10 +116,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .svn5706
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -136,18 +129,10 @@
 %patch11 -p1 -b .str1705
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
-%patch14 -p1 -b .localhost
-%patch15 -p1 -b .str1740
-%if %build_as_pie
-%patch16 -p1 -b .pie
-%endif
 %patch17 -p1 -b .serverbin-compat
 %patch18 -p1 -b .language
-%patch19 -p1 -b .str1758
 %patch20 -p1 -b .direct-usb
-%patch21 -p1 -b .str1736
 %patch22 -p1 -b .dest-cache-v2
-%patch23 -p1 -b .str1776
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -165,7 +150,8 @@
 %build
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
-	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all"
+	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
+	--enable-pie
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -418,6 +404,12 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.11
+- Sync with svn5706.
+- No longer need localhost, str1740, str1758, str1736, str1776 patches.
+- Removed backend patch.
+- Use --enable-pie instead of patching it in.
+
 * Thu Jun 15 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.10
 - Fixed cupsd network default printer crash (STR #1776).
 


--- cups-1.1.17-backend.patch DELETED ---


--- cups-localhost.patch DELETED ---


--- cups-str1736.patch DELETED ---


--- cups-str1740.patch DELETED ---


--- cups-str1758.patch DELETED ---


--- cups-str1776.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 18:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 14:09:05 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2149,1.2150
Message-ID: <200607041809.k64I955c023004@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
really finish HV with -PAE


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2149
retrieving revision 1.2150
diff -u -r1.2149 -r1.2150
--- kernel-2.6.spec	4 Jul 2006 16:22:27 -0000	1.2149
+++ kernel-2.6.spec	4 Jul 2006 18:09:02 -0000	1.2150
@@ -1365,7 +1365,7 @@
 %post xen
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
 if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then 
-	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen
 else 
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi



From fedora-cvs-commits at redhat.com  Tue Jul  4 18:15:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 14:15:22 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2150,1.2151
Message-ID: <200607041815.k64IFMeZ025387@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
kernel-xen don't require xen userland


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2150
retrieving revision 1.2151
diff -u -r1.2150 -r1.2151
--- kernel-2.6.spec	4 Jul 2006 18:09:02 -0000	1.2150
+++ kernel-2.6.spec	4 Jul 2006 18:15:19 -0000	1.2151
@@ -531,7 +531,6 @@
 Provides: kernel = %{version}
 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
 Prereq: %{kernel_prereq}
-Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
@@ -1553,7 +1552,8 @@
 %changelog
 * Tue Jul  4 2006 Juan Quintela <quintela at redhat.com>
 - new merge with xen upstream.
-- new xen kernel (same as rawhide one) with PAE support
+- xen kernel don't require xen userland.
+- new xen kernel (same as rawhide one) with PAE support.
 - removed xen0-PAE & xenU-PAE (see xen kernel).
 
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Jul  4 19:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 15:12:01 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.5,1.6
Message-ID: <200607041912.k64JC1WM021507@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21346

Modified Files:
	openssl097a.spec 
Log Message:
- build requires openssl-devel for -lcrypto



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openssl097a.spec	4 Jul 2006 15:06:02 -0000	1.5
+++ openssl097a.spec	4 Jul 2006 19:11:58 -0000	1.6
@@ -69,7 +69,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
 %ifarch s390 s390x
-BuildRequires: automake14, autoconf, libtool, openssl
+BuildRequires: automake14, autoconf, libtool, openssl-devel
 %endif
 Requires: mktemp
 Conflicts: openssl <= %{version}



From fedora-cvs-commits at redhat.com  Tue Jul  4 19:24:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 15:24:32 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#128760.patch, NONE,
	1.1 kdelibs.spec, 1.151, 1.152
Message-ID: <200607041924.k64JOWko008445@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#128760.patch 
Log Message:
apply patch to fix #128760


kdelibs-3.5.3-kde#128760.patch:
 dom_textimpl.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdelibs-3.5.3-kde#128760.patch ---
Index: khtml/xml/dom_textimpl.cpp
===================================================================
--- khtml/xml/dom_textimpl.cpp	(Revision 557103)
+++ khtml/xml/dom_textimpl.cpp	(Revision 557104)
@@ -389,6 +389,8 @@
         }
 
         RenderObject *first = par->firstChild();
+        while (first && first->isFloatingOrPositioned())
+            first = first->nextSibling();
         RenderObject *next = nextRenderer();
         if (!first || next == first) {
             // Whitespace at the start of a block just goes away.  Don't even


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdelibs.spec	4 Jul 2006 12:31:30 -0000	1.151
+++ kdelibs.spec	4 Jul 2006 19:24:30 -0000	1.152
@@ -60,6 +60,7 @@
 Patch108: kdelibs-3.5.3-kde#128902.patch
 Patch109: kdelibs-3.5.3-kde#67849.patch
 Patch110: kdelibs-3.5.3-kde#81806.patch
+Patch111: kdelibs-3.5.3-kde#128760.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -200,6 +201,7 @@
 %patch108 -p0 -b .kde#128902
 %patch109 -p0 -b .kde#67849
 %patch110 -p0 -b .kde#81806
+%patch111 -p0 -b .kde#128760
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -424,7 +426,7 @@
 
 %changelog
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
-- apply upstream patches, fix #128940/#81806
+- apply upstream patches, fix #128940/#81806/#128760
 
 * Sat Jun 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - fix #196013, mark kde.sh/kde.csh as config file



From fedora-cvs-commits at redhat.com  Tue Jul  4 20:24:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 16:24:34 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.6,1.7
Message-ID: <200607042024.k64KOY8X022998@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22868

Modified Files:
	openssl097a.spec 
Log Message:
- try for all arches



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openssl097a.spec	4 Jul 2006 19:11:58 -0000	1.6
+++ openssl097a.spec	4 Jul 2006 20:24:31 -0000	1.7
@@ -68,9 +68,7 @@
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
-%ifarch s390 s390x
 BuildRequires: automake14, autoconf, libtool, openssl-devel
-%endif
 Requires: mktemp
 Conflicts: openssl <= %{version}
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 20:29:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 16:29:39 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.7,1.8
Message-ID: <200607042029.k64KTddL024923@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24836

Modified Files:
	openssl097a.spec 
Log Message:
- revert last change



Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openssl097a.spec	4 Jul 2006 20:24:31 -0000	1.7
+++ openssl097a.spec	4 Jul 2006 20:29:37 -0000	1.8
@@ -68,7 +68,9 @@
 URL: http://www.openssl.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: mktemp, krb5-devel, perl, sed, zlib-devel, /usr/bin/cmp
+%ifarch s390 s390x
 BuildRequires: automake14, autoconf, libtool, openssl-devel
+%endif
 Requires: mktemp
 Conflicts: openssl <= %{version}
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:03:15 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.210,
	1.211 config-x86-generic, 1.58, 1.59 config-x86_64-generic,
	1.45, 1.46
Message-ID: <200607042103.k64L3FxX023519@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
git23



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- config-generic	2 Jul 2006 03:23:40 -0000	1.210
+++ config-generic	4 Jul 2006 21:03:12 -0000	1.211
@@ -2554,6 +2554,11 @@
 CONFIG_DEBUG_VM=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_RT_MUTEX_TESTER=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_LOCKDEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value
@@ -2838,3 +2843,4 @@
 
 # CONFIG_UNUSED_SYMBOLS is not set
 
+


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- config-x86-generic	2 Jul 2006 03:23:40 -0000	1.58
+++ config-x86-generic	4 Jul 2006 21:03:12 -0000	1.59
@@ -148,6 +148,7 @@
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
 CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_SBS=m
 
 #
 # CPUFreq processor drivers


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- config-x86_64-generic	2 Jul 2006 03:23:40 -0000	1.45
+++ config-x86_64-generic	4 Jul 2006 21:03:12 -0000	1.46
@@ -82,6 +82,7 @@
 CONFIG_ACPI_IBM_DOCK=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_SBS=m
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:03:15 -0400
Subject: rpms/kernel/devel patch-2.6.17-git23.bz2.sign, NONE, 1.1 .cvsignore,
	1.474, 1.475 kernel-2.6.spec, 1.2346,
	1.2347 linux-2.6-compile-fixes.patch, 1.89,
	1.90 linux-2.6-debug-Wundef.patch, 1.5,
	1.6 linux-2.6-debug-spinlock-taint.patch, 1.5,
	1.6 linux-2.6-execshield.patch, 1.26,
	1.27 linux-2.6-random-patches.patch, 1.15,
	1.16 linux-2.6-sleepon.patch, 1.2, 1.3 sources, 1.418,
	1.419 upstream, 1.385,
	1.386 linux-2.6-debug-spinlock-panic.patch, 1.6,
	NONE linux-2.6-offb-find-fb.patch, 1.1,
	NONE patch-2.6.17-git21.bz2.sign, 1.1, NONE
Message-ID: <200607042103.k64L3FpL023504@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-Wundef.patch 
	linux-2.6-debug-spinlock-taint.patch 
	linux-2.6-execshield.patch linux-2.6-random-patches.patch 
	linux-2.6-sleepon.patch sources upstream 
Added Files:
	patch-2.6.17-git23.bz2.sign 
Removed Files:
	linux-2.6-debug-spinlock-panic.patch 
	linux-2.6-offb-find-fb.patch patch-2.6.17-git21.bz2.sign 
Log Message:
git23



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

iD8DBQBEqrvpyGugalF9Dw4RAuVIAJ9d06wq49CHEgzlaRE5l0A+cDPcBACdFvSq
CFwTYCDgGmlvqG887ygG8h4=
=rOEo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -r1.474 -r1.475
--- .cvsignore	4 Jul 2006 06:53:46 -0000	1.474
+++ .cvsignore	4 Jul 2006 21:03:10 -0000	1.475
@@ -4,3 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.17-git21.bz2
+patch-2.6.17-git23.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2346
retrieving revision 1.2347
diff -u -r1.2346 -r1.2347
--- kernel-2.6.spec	4 Jul 2006 06:53:46 -0000	1.2346
+++ kernel-2.6.spec	4 Jul 2006 21:03:11 -0000	1.2347
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git21.bz2
+Patch1: patch-2.6.17-git23.bz2
 
 #
 # Clean up and export kernel headers to userspace
@@ -260,7 +260,6 @@
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
-Patch302: linux-2.6-offb-find-fb.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
@@ -310,7 +309,6 @@
 Patch1013: linux-2.6-debug-taint-vm.patch
 Patch1015: linux-2.6-debug-singlebiterror.patch
 Patch1016: linux-2.6-debug-spinlock-taint.patch
-Patch1017: linux-2.6-debug-spinlock-panic.patch
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
@@ -737,8 +735,6 @@
 #
 # ppc64
 #
-# Find OF framebuffer more reliably
-%patch302 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
 %patch305 -p1
 # Make HVC console generic; support simulator console device using it.
@@ -821,7 +817,6 @@
 %patch1013 -p1
 %patch1015 -p1
 %patch1016 -p1
-%patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
@@ -1569,7 +1564,7 @@
 
 %changelog
 * Tue Jul  4 2006 Dave Jones <davej at redhat.com>
-- 2.6.17-git21
+- 2.6.17-git21, git22 & git23
 
 * Sun Jul  2 2006 David Woodhouse <dwmw2 at redhat.com>
 - Add ppoll() and pselect() on x86_64 again

linux-2.6-compile-fixes.patch:
 Makefile |    4 ----
 1 files changed, 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- linux-2.6-compile-fixes.patch	29 Jun 2006 21:21:07 -0000	1.89
+++ linux-2.6-compile-fixes.patch	4 Jul 2006 21:03:12 -0000	1.90
@@ -1,13 +1,3 @@
---- linux-2.6.17.noarch/arch/powerpc/platforms/cell/setup.c~	2006-06-29 16:50:23.000000000 -0400
-+++ linux-2.6.17.noarch/arch/powerpc/platforms/cell/setup.c	2006-06-29 16:51:07.000000000 -0400
-@@ -50,6 +50,7 @@
- #include <asm/irq.h>
- #include <asm/spu.h>
- #include <asm/spu_priv1.h>
-+#include <asm/udbg.h>
- 
- #include "interrupt.h"
- #include "iommu.h"
 
 --- linux-2.6.17.noarch/Makefile~	2006-06-29 17:20:17.000000000 -0400
 +++ linux-2.6.17.noarch/Makefile	2006-06-29 17:20:38.000000000 -0400

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-Wundef.patch	27 Jun 2006 00:39:13 -0000	1.5
+++ linux-2.6-debug-Wundef.patch	4 Jul 2006 21:03:12 -0000	1.6
@@ -4,14 +4,14 @@
 
 Signed-off-by: Dave Jones <davej at redhat.com>
 
---- linux-2.6.17.noarch/Makefile~	2006-06-26 19:03:23.564376000 -0400
-+++ linux-2.6.17.noarch/Makefile	2006-06-26 19:03:50.354546000 -0400
-@@ -307,7 +307,7 @@ LINUXINCLUDE    := -Iinclude \
+--- linux-2.6.17.noarch/Makefile~	2006-07-04 16:28:14.000000000 -0400
++++ linux-2.6.17.noarch/Makefile	2006-07-04 16:28:30.000000000 -0400
+@@ -308,7 +308,7 @@ LINUXINCLUDE    := -Iinclude \
  CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
  
  CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 -                   -fno-strict-aliasing -fno-common
 +                   -fno-strict-aliasing -fno-common -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration
- AFLAGS          := -D__ASSEMBLY__
- 
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+ # Force gcc to behave correct even for buggy distributions
+ CFLAGS          += $(call cc-option, -fno-stack-protector-all \
+                                      -fno-stack-protector)

linux-2.6-debug-spinlock-taint.patch:
 spinlock_debug.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

Index: linux-2.6-debug-spinlock-taint.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-spinlock-taint.patch	11 Jan 2006 00:01:29 -0000	1.5
+++ linux-2.6-debug-spinlock-taint.patch	4 Jul 2006 21:03:12 -0000	1.6
@@ -1,18 +1,18 @@
---- linux-2.6.15/lib/spinlock_debug.c~	2006-01-10 20:46:43.000000000 +0000
-+++ linux-2.6.15/lib/spinlock_debug.c	2006-01-10 20:52:49.000000000 +0000
-@@ -19,9 +19,9 @@ static void spin_bug(spinlock_t *lock, c
- 	if (xchg(&print_once, 0)) {
- 		if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
- 			owner = lock->owner;
--		printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
-+		printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
- 			msg, raw_smp_processor_id(),
--			current->comm, current->pid);
-+		       current->comm, current->pid, print_tainted());
- 		printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
- 				".owner_cpu: %d\n",
- 			lock, lock->magic,
-@@ -80,9 +80,9 @@ static void __spin_lock_debug(spinlock_t
+--- linux-2.6.17.noarch/lib/spinlock_debug.c~	2006-07-04 16:23:43.000000000 -0400
++++ linux-2.6.17.noarch/lib/spinlock_debug.c	2006-07-04 16:24:45.000000000 -0400
+@@ -57,9 +57,9 @@ static void spin_bug(spinlock_t *lock, c
+ 
+ 	if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
+ 		owner = lock->owner;
+-	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
++	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
+ 		msg, raw_smp_processor_id(),
+-		current->comm, current->pid);
++		current->comm, current->pid, print_tainted());
+ 	printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+ 			".owner_cpu: %d\n",
+ 		lock, lock->magic,
+@@ -112,9 +112,9 @@ static void __spin_lock_debug(spinlock_t
  		if (print_once) {
  			print_once = 0;
  			printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
@@ -24,19 +24,19 @@
  			dump_stack();
  		}
  	}
-@@ -122,9 +122,9 @@ static void rwlock_bug(rwlock_t *lock, c
- 	static long print_once = 1;
+@@ -154,9 +154,9 @@ static void rwlock_bug(rwlock_t *lock, c
+ 	if (!debug_locks_off())
+ 		return;
+ 
+-	printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
++	printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
+ 		msg, raw_smp_processor_id(), current->comm,
+-		current->pid, lock);
++		current->pid, lock, print_tainted());
+ 	dump_stack();
+ }
  
- 	if (xchg(&print_once, 0)) {
--		printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
-+		printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
- 			msg, raw_smp_processor_id(), current->comm,
--			current->pid, lock);
-+			current->pid, lock, print_tainted());
- 		dump_stack();
- #ifdef CONFIG_SMP
- 		/*
-@@ -152,9 +152,9 @@ static void __read_lock_debug(rwlock_t *
+@@ -177,9 +177,9 @@ static void __read_lock_debug(rwlock_t *
  		if (print_once) {
  			print_once = 0;
  			printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, "
@@ -48,7 +48,7 @@
  			dump_stack();
  		}
  	}
-@@ -225,9 +225,9 @@ static void __write_lock_debug(rwlock_t 
+@@ -250,9 +250,9 @@ static void __write_lock_debug(rwlock_t 
  		if (print_once) {
  			print_once = 0;
  			printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, "

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/sysenter.c |    3 
 linux-2.6.17.noarch/include/asm-i386/elf.h      |    6 
 linux-2.6.17.noarch/include/asm-i386/mmu.h      |    4 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   98 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   22 ++
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   38 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 46 files changed, 793 insertions(+), 134 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- linux-2.6-execshield.patch	2 Jul 2006 03:23:40 -0000	1.26
+++ linux-2.6-execshield.patch	4 Jul 2006 21:03:12 -0000	1.27
@@ -601,8 +601,8 @@
  		.min_coredump	= ELF_EXEC_PAGESIZE
  };
  
--#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE)
-+#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK)
+-#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
++#define BAD_ADDR(x) ((unsigned long)(x) >= PAGE_MASK)
  
  static int set_brk(unsigned long start, unsigned long end)
  {

linux-2.6-random-patches.patch:
 char/watchdog/machzwd.c        |    3 +--
 media/dvb/ttpci/av7110.c       |    2 +-
 media/dvb/ttpci/budget-ci.c    |    2 +-
 media/dvb/ttpci/budget-patch.c |    2 +-
 media/dvb/ttpci/budget.c       |    5 +----
 5 files changed, 5 insertions(+), 9 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-random-patches.patch	30 Jun 2006 04:41:42 -0000	1.15
+++ linux-2.6-random-patches.patch	4 Jul 2006 21:03:12 -0000	1.16
@@ -81,14 +81,3 @@
 # 	}
 # 	if (!ata_dev_present(dev))
 
---- linux-2.6.17.noarch/drivers/scsi/53c700.c~	2006-06-30 00:40:56.000000000 -0400
-+++ linux-2.6.17.noarch/drivers/scsi/53c700.c	2006-06-30 00:41:04.000000000 -0400
-@@ -2044,7 +2044,7 @@ NCR_700_slave_configure(struct scsi_devi
- 	struct NCR_700_Host_Parameters *hostdata = 
- 		(struct NCR_700_Host_Parameters *)SDp->host->hostdata[0];
- 
--	SDp->hostdata = kmalloc(GFP_KERNEL, sizeof(struct NCR_700_sense));
-+	SDp->hostdata = kmalloc(sizeof(struct NCR_700_sense), GFP_KERNEL);
- 
- 	if (!SDp->hostdata)
- 		return -ENOMEM;

linux-2.6-sleepon.patch:
 drivers/block/DAC960.c        |   12 +++++++++++-
 drivers/net/tokenring/ibmtr.c |    9 ++++++++-
 include/linux/wait.h          |    6 +++---
 kernel/sched.c                |   27 +++++++++++++++------------
 4 files changed, 37 insertions(+), 17 deletions(-)

Index: linux-2.6-sleepon.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sleepon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-sleepon.patch	11 Jan 2006 00:01:30 -0000	1.2
+++ linux-2.6-sleepon.patch	4 Jul 2006 21:03:12 -0000	1.3
@@ -114,8 +114,8 @@
  	current->state = TASK_INTERRUPTIBLE;
  
  	SLEEP_ON_HEAD
-@@ -3146,23 +3159,12 @@ long fastcall __sched interruptible_slee
- 
+@@ -3759,22 +3759,12 @@ interruptible_sleep_on_timeout(wait_queu
+ }
  EXPORT_SYMBOL(interruptible_sleep_on_timeout);
  
 -void fastcall __sched sleep_on(wait_queue_head_t *q)
@@ -128,7 +128,6 @@
 -	schedule();
 -	SLEEP_ON_TAIL
 -}
--
 -EXPORT_SYMBOL(sleep_on);
 -
  long fastcall __sched sleep_on_timeout(wait_queue_head_t *q, long timeout)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- sources	4 Jul 2006 06:53:46 -0000	1.418
+++ sources	4 Jul 2006 21:03:12 -0000	1.419
@@ -1,3 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 ff50ced0a2ee111b3fd934133e83cc7f  patch-2.6.17-git21.bz2
+3da20d8dd18eddb843d298808a664fef  patch-2.6.17-git23.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- upstream	4 Jul 2006 06:53:46 -0000	1.385
+++ upstream	4 Jul 2006 21:03:12 -0000	1.386
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git21.bz2
+patch-2.6.17-git23.bz2


--- linux-2.6-debug-spinlock-panic.patch DELETED ---


--- linux-2.6-offb-find-fb.patch DELETED ---


--- patch-2.6.17-git21.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:06:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:06:09 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch, NONE,
	1.1 kernel-2.6.spec, 1.2347, 1.2348
Message-ID: <200607042106.k64L69Dd023606@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
lockdep fixes


linux-2.6-lockdep-fixes.patch:
 include/net/sock.h |    6 +++---
 kernel/lockdep.c   |   14 +++++++++++---
 net/atm/ipcommon.c |   23 ++++++++++++++++++-----
 3 files changed, 32 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-lockdep-fixes.patch ---
>From davej  Tue Jul  4 11:14:48 2006
Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932219AbWGDPNk at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
	nwo.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
	version=3.1.3
Envelope-to: davej at kernelslacker.org
Delivery-date: Tue, 04 Jul 2006 16:14:06 +0100
Received: from testure.choralone.org [194.9.77.134]
	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
	for <davej at localhost> (single-drop); Tue, 04 Jul 2006 11:14:48 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
	by testure.choralone.org with esmtp (Exim 4.62)
	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S932219AbWGDPNk at vger.kernel.org>)
	id 1FxmbF-0005Ps-OM
	for davej at kernelslacker.org; Tue, 04 Jul 2006 16:14:06 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
	id S932219AbWGDPNk (ORCPT <rfc822;davej at kernelslacker.org>);
	Tue, 4 Jul 2006 11:13:40 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932210AbWGDPNj
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 4 Jul 2006 11:13:39 -0400
Received: from pentafluge.infradead.org ([213.146.154.40]:62345 "EHLO
	pentafluge.infradead.org") by vger.kernel.org with ESMTP
	id S932209AbWGDPNi (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
	Tue, 4 Jul 2006 11:13:38 -0400
Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
	id 1Fxmah-00067s-IM; Tue, 04 Jul 2006 16:13:31 +0100
Subject: Re: [BUG] scsi/io-elevator held lock freed.
From:	Arjan van de Ven <arjan at infradead.org>
To:	Daniel Walker <dwalker at mvista.com>
Cc:	mingo at elte.hu, linux-kernel at vger.kernel.org,
	linux-scsi at vger.kernel.org
In-Reply-To: <1152024854.29262.5.camel at c-67-180-134-207.hsd1.ca.comcast.net>
References: <1152024854.29262.5.camel at c-67-180-134-207.hsd1.ca.comcast.net>
Content-Type: text/plain
Date:	Tue, 04 Jul 2006 17:13:30 +0200
Message-Id: <1152026010.3109.66.camel at laptopd505.fenrus.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
Content-Transfer-Encoding: 7bit
X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
	See http://www.infradead.org/rpr.html
Sender:	linux-kernel-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-kernel at vger.kernel.org
Status: RO
Content-Length: 2141
Lines: 64

On Tue, 2006-07-04 at 07:54 -0700, Daniel Walker wrote:
> I got this during boot. I booted the same kernel several times, and only
> saw it once. The kernel was 2.6.17-mm5 .
> 
> Daniel
> 
> 
> =========================
> [ BUG: held lock freed! ]
> -------------------------
> swapper/1 is freeing memory f73a8580-f73a867f, with a lock still held there!
> 2 locks held by swapper/1:
>  #0:  (&shost->scan_mutex){--..}, at: [<c0419098>] mutex_lock+0x8/0x10
>  #1:  (&eq->sysfs_lock){--..}, at: [<c0419098>] mutex_lock+0x8/0x10

blargh.. it'd be more useful if lockdep actually printed which lock it
is that it thinks is about to get freed.....

this patch ought to make it do that; could you at least add this to your
kernel?

Ingo, is this the right approach?

---
 kernel/lockdep.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6.17-mm6/kernel/lockdep.c
===================================================================
--- linux-2.6.17-mm6.orig/kernel/lockdep.c
+++ linux-2.6.17-mm6/kernel/lockdep.c
@@ -2571,7 +2571,7 @@ static inline int in_range(const void *s
 
 static void
 print_freed_lock_bug(struct task_struct *curr, const void *mem_from,
-		     const void *mem_to)
+		     const void *mem_to, struct held_lock *hlock)
 {
 	if (!debug_locks_off())
 		return;
@@ -2583,6 +2583,7 @@ print_freed_lock_bug(struct task_struct 
 	printk(  "-------------------------\n");
 	printk("%s/%d is freeing memory %p-%p, with a lock still held there!\n",
 		curr->comm, curr->pid, mem_from, mem_to-1);
+	print_lock(hlock);
 	lockdep_print_held_locks(curr);
 
 	printk("\nstack backtrace:\n");
@@ -2616,7 +2617,7 @@ void debug_check_no_locks_freed(const vo
 					!in_range(mem_from, lock_to, mem_to))
 			continue;
 
-		print_freed_lock_bug(curr, mem_from, mem_to);
+		print_freed_lock_bug(curr, mem_from, mem_to, hlock);
 		break;
 	}
 	local_irq_restore(flags);


-
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/



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:27:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:27:50 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.2.patch, 1.2,
	1.3 eclipse-tomcat55-build.3.patch, 1.2,
	1.3 eclipse-tomcat55-build.patch, 1.5,
	1.6 eclipse-tomcat55.patch, 1.4,
	1.5 eclipse-webapp-tomcat55.patch, 1.3, 1.4 .cvsignore, 1.21,
	1.22 eclipse-disable-junit4-apt.patch, 1.3, 1.4 eclipse.spec,
	1.282, 1.283 sources, 1.33,
	1.34 eclipse-webapp-jasper-classpath.patch, 1.1, NONE
Message-ID: <200607042127.k64LRoeC022909@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	.cvsignore eclipse-disable-junit4-apt.patch eclipse.spec 
	sources 
Added Files:
	eclipse-tomcat55-build.2.patch eclipse-tomcat55-build.3.patch 
	eclipse-tomcat55-build.patch eclipse-tomcat55.patch 
	eclipse-webapp-tomcat55.patch 
Removed Files:
	eclipse-webapp-jasper-classpath.patch 
Log Message:
* Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- 3.2.0.
- Remove Provides:  eclipse-sdk from eclipse-platform.
- Use build-jar-repository where appropriate.


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

Index: eclipse-tomcat55-build.2.patch
===================================================================
RCS file: eclipse-tomcat55-build.2.patch
diff -N eclipse-tomcat55-build.2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-tomcat55-build.2.patch	4 Jul 2006 21:27:47 -0000	1.3
@@ -0,0 +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	2006-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -769,7 +769,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
+-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
+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-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -746,7 +746,7 @@
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.core_3.1.100.v20060531.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources_3.2.0.v20060603.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"			/>
+-			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.130.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"			/>
++			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.15.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.sdk_3.2.0.v20060605" prefix="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.base_3.2.0.v20060601.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"			/>
+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-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -782,7 +782,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
+-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
+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-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -769,7 +769,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
+-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
+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-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -769,7 +769,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
+-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
+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-07-04 16:22:46.000000000 -0400
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-07-04 16:23:52.000000000 -0400
+@@ -803,7 +803,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
+-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>

eclipse-tomcat55-build.3.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-tomcat55-build.3.patch
===================================================================
RCS file: eclipse-tomcat55-build.3.patch
diff -N eclipse-tomcat55-build.3.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-tomcat55-build.3.patch	4 Jul 2006 21:27:47 -0000	1.3
@@ -0,0 +1,12 @@
+diff -uNr eclipse-3.2.0.orig/features/org.eclipse.platform/build.xml eclipse-3.2.0.withtomcat55/features/org.eclipse.platform/build.xml
+--- eclipse-3.2.0.orig/features/org.eclipse.platform/build.xml	2006-07-04 16:15:59.000000000 -0400
++++ eclipse-3.2.0.withtomcat55/features/org.eclipse.platform/build.xml	2006-07-04 16:21:13.000000000 -0400
+@@ -391,7 +391,7 @@
+ 		<copy todir="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO" 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.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml"  selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
 clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-140!
 0,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.!
 eclipse.
ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0!
 .v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml"  selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
 clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,5.5.15.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-1400!
 ,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.e!
 clipse.u
i.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.!
 v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
+ 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
+ 	</target>
+ 	<target name="copybuiltlauncher" if="libsconfig">

eclipse-tomcat55-build.patch:
 build.xml |  115 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 58 insertions(+), 57 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: eclipse-tomcat55-build.patch
diff -N eclipse-tomcat55-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-tomcat55-build.patch	4 Jul 2006 21:27:47 -0000	1.6
@@ -0,0 +1,165 @@
+--- build.xml.orig	2006-07-04 16:09:31.000000000 -0400
++++ build.xml	2006-07-04 16:14:19.000000000 -0400
+@@ -58,7 +58,7 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${temp.folder}/"/>
+ 		</antcall>
+-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" filesonly="false" whenempty="skip" update="false"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+@@ -144,50 +144,51 @@
+ 			<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="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-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="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"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
+-			<pathelement path="tomcat-util.jar"/>
+-			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
++			<pathelement path="lib/catalina.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
++			<pathelement path="lib/catalina-optional.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina-optional.jar"/>
++			<pathelement path="lib/commons-beanutils.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-beanutils.jar"/>
++			<pathelement path="lib/commons-collections.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-collections.jar"/>
++			<pathelement path="lib/commons-digester.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester.jar"/>
++			<pathelement path="lib/commons-digester-rss.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester-rss.jar"/>
++			<pathelement path="lib/commons-el.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-el.jar"/>
++			<pathelement path="lib/commons-logging-api.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-logging-api.jar"/>
++			<pathelement path="lib/commons-modeler.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-modeler.jar"/>
++			<pathelement path="lib/jasper-compiler.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-compiler.jar"/>
++			<pathelement path="lib/jasper-runtime.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
++			<pathelement path="lib/jmx.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
++			<pathelement path="lib/jsp-api.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
++			<pathelement path="lib/naming-factory.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
++			<pathelement path="lib/naming-resources.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/>
++			<pathelement path="lib/regexp.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/>
++			<pathelement path="lib/servlet-api.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlet-api.jar"/>
++			<pathelement path="lib/servlets-default.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/>
++			<pathelement path="lib/tomcat-coyote.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-coyote.jar"/>
++			<pathelement path="lib/tomcat-http.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-http.jar"/>
++			<pathelement path="lib/tomcat-util.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
++			<pathelement path="lib/servlets-invoker.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
++
+ 		</path>
+ 		<!-- compile the source code -->
+ 		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
+@@ -224,37 +225,37 @@
+ 	</target>
+ 
+ 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
+ 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
+ 		</copy>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
+ 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
+ 		</copy>
+-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
++		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" version="5.5.15.v20060601"/>
+ 	</target>
+ 
+ 	<target name="build.zips" depends="init">
+ 	</target>
+ 
+ 	<target name="gather.sources" depends="init" if="destination.temp.folder">
+-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+-		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
+-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
++		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" 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.130.v20060601"/>
+-		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
++		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" 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.130.v20060601.jar"/>
+-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 
+@@ -277,7 +278,7 @@
+ 		<delete>
+ 			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
+ 		</delete>
+-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ 		<delete dir="${temp.folder}"/>
+ 	</target>
+ 

eclipse-tomcat55.patch:
 .classpath                                                   |   43 
 META-INF/MANIFEST.MF                                         |  116 -
 build.properties                                             |    2 
 src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java |   51 
 src/org/eclipse/tomcat/internal/TomcatAppServer.java         | 1254 +++++------
 src/org/eclipse/tomcat/internal/TomcatPlugin.java            |    3 
 6 files changed, 797 insertions(+), 672 deletions(-)

Index: eclipse-tomcat55.patch
===================================================================
RCS file: eclipse-tomcat55.patch
diff -N eclipse-tomcat55.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-tomcat55.patch	4 Jul 2006 21:27:47 -0000	1.5
@@ -0,0 +1,1598 @@
+Index: .classpath
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.tomcat/.classpath,v
+retrieving revision 1.21
+diff -u -r1.21 .classpath
+--- .classpath	9 May 2006 18:51:41 -0000	1.21
++++ .classpath	4 Jul 2006 18:42:40 -0000
+@@ -1,28 +1,27 @@
+ <?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 exported="true" kind="lib" path="lib/catalina.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/catalina-optional.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-modeler.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jmx.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jsp-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/naming-factory.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/naming-resources.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/servlets-default.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/tomcat-coyote.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/tomcat-http.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/tomcat-util.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-collections.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-digester.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-logging-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/regexp.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-digester-rss.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jasper-compiler.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jasper-runtime.jar"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ 	<classpathentry kind="output" path="bin"/>
+Index: build.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.tomcat/build.properties,v
+retrieving revision 1.16
+diff -u -r1.16 build.properties
+--- build.properties	10 May 2006 17:51:19 -0000	1.16
++++ build.properties	4 Jul 2006 18:42:40 -0000
+@@ -11,7 +11,7 @@
+ bin.includes = conf/,\
+                webapps/,\
+                plugin.xml,\
+-               *.jar,\
++               lib/*.jar,\
+                plugin.properties,\
+                preferences.ini,\
+                about.html,\
+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	4 Jul 2006 18:42:41 -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: 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.46
+diff -u -r1.46 TomcatAppServer.java
+--- src/org/eclipse/tomcat/internal/TomcatAppServer.java	17 Apr 2006 15:24:57 -0000	1.46
++++ src/org/eclipse/tomcat/internal/TomcatAppServer.java	4 Jul 2006 18:42:41 -0000
+@@ -1,604 +1,650 @@
+-/*******************************************************************************
+- * Copyright (c) 2000, 2006 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
+- *******************************************************************************/
+-package org.eclipse.tomcat.internal;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.PrintStream;
+-import java.net.InetAddress;
+-import java.net.URL;
+-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.LifecycleEvent;
+-import org.apache.catalina.LifecycleException;
+-import org.apache.catalina.LifecycleListener;
+-import org.apache.catalina.Realm;
+-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.eclipse.core.runtime.CoreException;
+-import org.eclipse.core.runtime.FileLocator;
+-import org.eclipse.core.runtime.IConfigurationElement;
+-import org.eclipse.core.runtime.IExtension;
+-import org.eclipse.core.runtime.IExtensionPoint;
+-import org.eclipse.core.runtime.IExtensionRegistry;
+-import org.eclipse.core.runtime.IPath;
+-import org.eclipse.core.runtime.IStatus;
+-import org.eclipse.core.runtime.Platform;
+-import org.eclipse.core.runtime.Preferences;
+-import org.eclipse.core.runtime.Status;
+-import org.eclipse.help.internal.appserver.IWebappServer;
+-import org.eclipse.osgi.util.NLS;
+-import org.eclipse.tomcat.internal.extensions.IRealmFactory;
+-
+-/**
+- * Single engine, single host, single connector Tomcat Application Server.
+- */
+-public class TomcatAppServer implements IWebappServer {
+-    /**
+-     * Specify this reserved value for the SSL port # to indicate that SSL
+-     * should not be used
+-     */
+-    public final static int SSL_DISABLED = -1;
+-
+-    private String hostAddress;
+-
+-    private int port;
+-
+-    private int sslPort = SSL_DISABLED;
+-
+-    // false until an attempt to start Tomcat
+-    private boolean isStarted = false;
+-
+-    // true after started without problems
+-    private boolean running = false;
+-
+-    private Embedded embedded = null;
+-
+-    private Engine engine = null;
+-
+-    private Host host = null;
+-
+-    private Connector httpConnector = null;
+-    private Connector sslConnector = null;
+-    // Con
+-    private ArrayList contexts = new ArrayList();
+-
+-    /**
+-     * Constructs this class, but does not instantiates or start Tomcat classes
+-     * until webapp are added.
+-     */
+-    public TomcatAppServer() {
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#start(int,
+-     *      java.lang.String)
+-     */
+-    public synchronized void start(int port, String hostAddress) throws CoreException {
+-        this.hostAddress = hostAddress;
+-        this.port = port;
+-
+-        if (isStarted) {
+-            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 = FileLocator.resolve(installURL);
+-            String home = FileLocator.toFileURL(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(
+-                    TomcatPlugin.PREF_SSL_PORT) >= 0) {
+-                Realm realm = getRealm();
+-                embedded.setRealm(realm);
+-            }
+-
+-            // 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$
+-
+-            // all request go to our only host
+-            engine.setDefaultHost(host.getName());
+-
+-            if (host instanceof StandardHost) {
+-                ((StandardHost) host)
+-                        .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
+-            // its version message there.
+-            System.setOut(new PrintStream(new ByteArrayOutputStream()));
+-            try {
+-                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
+-            // for setting the working directory
+-            if (root instanceof StandardContext) {
+-                ((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
+-                }
+-            }
+-            updateSslPort(iAddress);
+-            if (this.port == 0) {
+-                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, 
+-                                    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;
+-                    }
+-                });
+-            }
+-
+-            // 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;
+-            } 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(
+-                            "Exception occurred starting the embedded application server.", //$NON-NLS-1$
+-                            exc);
+-            if (exc instanceof CoreException) {
+-                throw (CoreException) exc;
+-            }
+-            throw new CoreException(new Status(IStatus.ERROR,
+-            		TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-            		TomcatResources.TomcatAppServer_start, 
+-            		exc));
+-        }
+-        if (!running) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                    TomcatResources.TomcatAppServer_start, null)); 
+-        }
+-    }
+-
+-    /**
+-     * Update {@link sslPort} to refer an appropriate port. If the user set
+-     * sslPort to 0, an arbitrary free port will be used.
+-     * 
+-     * @param iAddress
+-     *            {@link InetAddress} object representing the machine hosting
+-     *            the help system
+-     * @return port number of use for the SSL connection
+-     * @throws CoreException
+-     */
+-    private int updateSslPort(InetAddress iAddress) throws CoreException {
+-        this.sslPort = TomcatPlugin.getDefault().getPluginPreferences().getInt(
+-                TomcatPlugin.PREF_SSL_PORT);
+-        if (this.sslPort == 0) {
+-            this.sslPort = SocketUtil.findUnusedLocalPort(iAddress); 
+-            if (this.sslPort == -1) {
+-                throw new CoreException(new Status(IStatus.ERROR,
+-                        TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                        TomcatResources.TomcatAppServer_start_CannotObtainPort, 
+-                        null));
+-            }
+-        }
+-        return this.sslPort;
+-    }
+-
+-    /**
+-     * @param iAddress
+-     *            InetAddress representing the machine hosting the help system.
+-     * @param sslport
+-     *            port # to use for the SSL connection
+-     * @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
+-     */
+-    private Realm getRealm() {
+-        IExtensionRegistry registry = Platform.getExtensionRegistry();
+-        IExtensionPoint extensionPoint = registry.getExtensionPoint(
+-                TomcatPlugin.PLUGIN_ID, "realmfactory"); //$NON-NLS-1$
+-        Realm realm = null;
+-        if (extensionPoint != null) {
+-            IExtension[] extensions = extensionPoint.getExtensions();
+-            if ((extensions != null) && (extensions.length == 1)) {
+-                IConfigurationElement[] factoryElements = extensions[0]
+-                        .getConfigurationElements();
+-                if ((factoryElements != null) && (factoryElements.length == 1)) {
+-                    try {
+-                        IRealmFactory realmFactory = (IRealmFactory) factoryElements[0]
+-                                .createExecutableExtension("class"); //$NON-NLS-1$
+-                        realm = realmFactory.createRealm();
+-                    } catch (CoreException e) {
+-                        logError(
+-                                TomcatResources.TomcatAppServer_getRealmFactoryFailed,
+-                                e);
+-                    }
+-                } else {
+-                    if ((factoryElements == null)
+-                            || (factoryElements.length == 0)) {
+-                        logError(TomcatResources.TomcatAppServer_missingFactoryElement);
+-                    } else {
+-                        logError(TomcatResources.TomcatAppServer_multipleFactoryElements);
+-                    }
+-                }
+-            } else {
+-                if ((extensions == null) || (extensions.length == 0)) {
+-                    logError(TomcatResources.TomcatAppServer_missingRealmExtension);
+-                } else {
+-                    logError(TomcatResources.TomcatAppServer_multipleRealmExtensions);
+-                }
+-            }
+-        } else {
+-            logError(TomcatResources.TomcatAppServer_missingRealmExtensionPoint);
+-        }
+-        return realm;
+-    }
+-
+-    /**
+-     * Create an error entry in the log
+-     * 
+-     * @param msg
+-     *            error message
+-     */
+-    private void logError(String msg) {
+-        logError(msg, null);
+-    }
+-
+-    /**
+-     * Create an error entry in the log
+-     * 
+-     * @param msg
+-     *            error message
+-     * @param cause
+-     *            {@link Throwable} associated with this error message
+-     */
+-    private void logError(String msg, Throwable cause) {
+-        TomcatPlugin.logError(msg, cause);
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#start(java.lang.String,
+-     *      org.eclipse.core.runtime.IPath, java.lang.ClassLoader)
+-     */
+-    public synchronized void start(String webappName, IPath path, ClassLoader customLoader)
+-            throws CoreException {
+-
+-        if (!isStarted) {
+-            start(port, hostAddress);
+-        }
+-        if (!running) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind(
+-                            TomcatResources.TomcatAppServer_addingWebapp,
+-                            webappName, path.toOSString()), null));
+-        }
+-
+-        String contextPath = webappName;
+-        if (!contextPath.startsWith("/")) { //$NON-NLS-1$
+-            contextPath = "/" + contextPath; //$NON-NLS-1$
+-        }
+-        try {
+-            Context context = embedded.createContext(contextPath, path
+-                    .toOSString());
+-            if (context instanceof StandardContext) {
+-                ((StandardContext) context)
+-                        .setWorkDir(getWorkingDirectory(webappName));
+-            }
+-
+-            WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader);
+-            context.setLoader(embedded.createLoader(webappLoader));
+-
+-            host.addChild(context);
+-            contexts.add(context);
+-        } catch (Exception exc) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind(
+-                            "TomcatAppServer.addingWebapp", webappName, path //$NON-NLS-1$
+-                                    .toOSString()), exc));
+-        }
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#stop(java.lang.String)
+-     */
+-    public synchronized void stop(String webappName) throws CoreException {
+-        if (!running) {
+-            return;
+-        }
+-        Context context = (Context) host.findChild("/" + webappName); //$NON-NLS-1$
+-        if (context != null) {
+-        	contexts.remove(context);
+-            embedded.removeContext(context);
+-        }
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#getHost()
+-     */
+-    public String getHost() {
+-        if (!running) {
+-            return null;
+-        }
+-        return hostAddress;
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#getPort()
+-     */
+-    public int getPort() {
+-        if (!running) {
+-            return 0;
+-        }
+-        return port;
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#isRunning()
+-     */
+-    public boolean isRunning() {
+-        return running;
+-    }
+-
+-    /**
+-     * @see org.eclipse.help.internal.appserver.IWebappServer#stop()
+-     */
+-    public synchronized void stop() throws CoreException {
+-        if (!running) {
+-            return;
+-        }
+-        running = false;
+-        // Remove all contexts
+-        for(int i = 0; i< contexts.size(); i++){
+-            embedded.removeContext((Context)contexts.get(i));
+-           	contexts.remove(contexts.get(i));
+-        }
+-
+-        // Remove the sslConnector, if present.
+-        try {
+-            if (sslConnector != null) {
+-                embedded.removeConnector(this.sslConnector);
+-            }
+-        } catch (Exception exc) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                    TomcatResources.TomcatAppServer_sslConnectorRemove, 
+-                    exc));
+-        }
+-
+-        // Remove the HTTP Connector, if present.
+-        try {
+-            if (httpConnector != null) {
+-                embedded.removeConnector(this.httpConnector);
+-            }
+-        } catch (Exception exc) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                    TomcatResources.TomcatAppServer_httpConnectorRemove, 
+-                    exc));
+-        }
+-
+-        // Remove the engine (which should trigger removing the connector)
+-        try {
+-            embedded.removeEngine(engine);
+-        } catch (Exception exc) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                    TomcatResources.TomcatAppServer_engineRemove, 
+-                    exc));
+-        }
+-        // Shut down this tomcat server (should have nothing left to do)
+-        try {
+-            embedded.stop();
+-        } catch (LifecycleException e) {
+-            throw new CoreException(new Status(IStatus.ERROR,
+-                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
+-                    TomcatResources.TomcatAppServer_embeddedStop, 
+-                    e));
+-        }
+-        isStarted = false;
+-    }
+-
+-    private String getWorkingDirectory(String webApp) {
+-        return TomcatPlugin.getDefault().getStateLocation().append(webApp)
+-                .toOSString();
+-    }
+-}
++/*******************************************************************************
++ * Copyright (c) 2000, 2006 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
++ *******************************************************************************/
++package org.eclipse.tomcat.internal;
++
++import java.io.ByteArrayOutputStream;
++import java.io.PrintStream;
++import java.net.InetAddress;
++import java.net.URL;
++import java.net.UnknownHostException;
++import java.util.ArrayList;
++
++import mx4j.log.FileLogger;
++
++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.realm.MemoryRealm;
++import org.apache.catalina.startup.Embedded;
++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;
++import org.eclipse.core.runtime.IExtensionPoint;
++import org.eclipse.core.runtime.IExtensionRegistry;
++import org.eclipse.core.runtime.IPath;
++import org.eclipse.core.runtime.IStatus;
++import org.eclipse.core.runtime.Platform;
++import org.eclipse.core.runtime.Preferences;
++import org.eclipse.core.runtime.Status;
++import org.eclipse.help.internal.appserver.IWebappServer;
++import org.eclipse.osgi.util.NLS;
++import org.eclipse.tomcat.internal.extensions.IRealmFactory;
++
++/**
++ * Single engine, single host, single connector Tomcat Application Server.
++ */
++public class TomcatAppServer implements IWebappServer {
++    /**
++     * Specify this reserved value for the SSL port # to indicate that SSL
++     * should not be used
++     */
++    public final static int SSL_DISABLED = -1;
++    
++    private final static String NULL = null;
++
++    private String hostAddress;
++
++    private int port;
++
++    private int sslPort = SSL_DISABLED;
++
++    // false until an attempt to start Tomcat
++    private boolean isStarted = false;
++
++    // true after started without problems
++    private boolean running = false;
++
++    private Embedded embedded = null;
++
++    private Engine engine = null;
++
++    private Host host = null;
++
++    private Connector httpConnector = null;
++    private boolean hasConnection = false; 
++    private Connector sslConnector = null;
++    private boolean hasSSLConnection = false;
++    // Con
++    private ArrayList contexts = new ArrayList();
++
++    /**
++     * Constructs this class, but does not instantiates or start Tomcat classes
++     * until webapp are added.
++     */
++    public TomcatAppServer() {
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#start(int,
++     *      java.lang.String)
++     */
++    public synchronized void start(int port, String hostAddress) throws CoreException {
++        // if null passed for hostAddress, use local host
++        if (hostAddress == null) {
++            this.hostAddress = "127.0.0.1"; //$NON-NLS-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;
++        }
++        isStarted = true;
++        try {
++            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(
++                    TomcatPlugin.PREF_SSL_PORT) >= 0) {
++                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(hostname, home + "webapps"); //$NON-NLS-1$
++
++            // all request go to our only host
++            engine.setDefaultHost(host.getName());
++
++            if (host instanceof StandardHost) {
++                ((StandardHost) host)
++                        .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
++            // its version message there.
++            System.setOut(new PrintStream(new ByteArrayOutputStream()));
++            try {
++                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
++            // for setting the working directory
++            if (root instanceof StandardContext) {
++                ((StandardContext) root)
++                        .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
++            }
++            root.setLoader(embedded.createLoader(this.getClass()
++                    .getClassLoader()));
++            
++            host.addChild(root);
++            contexts.add(root);
++ 
++            updateSslPort(iAddress);
++            if (this.port == 0) {
++                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, 
++                                    null));
++                }
++            }
++
++             // Create Connector
++            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); //$NON-NLS-1$ //$NON-NLS-2$
++            }
++
++            int maxProcessors = pref
++                    .getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
++            if (maxProcessors > 0) {
++            	connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$
++            }
++            
++            int minProcessors = pref
++                    .getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
++            if (minProcessors > 0) {
++            	connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$
++            }
++            
++            if (this.sslPort > 0) {
++                connector.setRedirectPort(this.sslPort);
++                connector.setEnableLookups(true);
++                connector.setProperty("soTimeout",""+20000); //$NON-NLS-1$ //$NON-NLS-2$
++                //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); //$NON-NLS-1$
++                }
++            }
++            // 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 {
++            	this.httpConnector = connector;
++                embedded.addConnector(this.httpConnector);
++                httpConnector.start();
++            } finally {
++                System.setErr(sysErr);
++            }
++            if (this.sslPort > 0) {
++                createSSLConnector(iAddress, this.sslPort);
++            }
++
++            // running = true;
++            TomcatPlugin.getDefault().setAppserver(this);
++
++        } catch (Exception exc) {
++            TomcatPlugin
++                    .logError(
++                            "Exception occurred starting the embedded application server.", //$NON-NLS-1$
++                            exc);
++            if (exc instanceof CoreException) {
++                throw (CoreException) exc;
++            }
++            throw new CoreException(new Status(IStatus.ERROR,
++            		TomcatPlugin.PLUGIN_ID, IStatus.OK,
++            		TomcatResources.TomcatAppServer_start, 
++            		exc));
++        }
++        if (!running) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                    TomcatResources.TomcatAppServer_start, null)); 
++        }
++    }
++
++    /**
++     * Update {@link sslPort} to refer an appropriate port. If the user set
++     * sslPort to 0, an arbitrary free port will be used.
++     * 
++     * @param iAddress
++     *            {@link InetAddress} object representing the machine hosting
++     *            the help system
++     * @return port number of use for the SSL connection
++     * @throws CoreException
++     */
++    private int updateSslPort(InetAddress iAddress) throws CoreException {
++        this.sslPort = TomcatPlugin.getDefault().getPluginPreferences().getInt(
++                TomcatPlugin.PREF_SSL_PORT);
++        if (this.sslPort == 0) {
++            this.sslPort = SocketUtil.findUnusedLocalPort(iAddress); 
++            if (this.sslPort == -1) {
++                throw new CoreException(new Status(IStatus.ERROR,
++                        TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                        TomcatResources.TomcatAppServer_start_CannotObtainPort, 
++                        null));
++            }
++        }
++        return this.sslPort;
++    }
++
++    /**
++     * @param iAddress
++     *            InetAddress representing the machine hosting the help system.
++     * @param sslport
++     *            port # to use for the SSL connection
++     * @throws CoreException
++     */
++    private void createSSLConnector(InetAddress iAddress, int sslport)
++            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); //$NON-NLS-1$
++	    }
++	   	String protocols = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOLS);
++	    if ((protocols != null) && (!("".equals(protocols.trim())))) { //$NON-NLS-1$
++	        connector.setProperty("protocols",protocols); //$NON-NLS-1$
++	    }
++        String protocolClassName = Http11Protocol.class.getName(); 
++        connector.setProtocol(protocolClassName);
++        
++        String JSSEImplementationName = JSSEImplementation.class.getName();
++        connector.setProperty("sslImplementation",JSSEImplementationName); //$NON-NLS-1$
++        
++        String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT);
++        if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$
++            connector.setProperty("disableUploadTimeout", disableUploadTimeout); //$NON-NLS-1$
++        }
++        
++        String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM);
++        if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$
++            connector.setProperty("algorithm", algorithm); //$NON-NLS-1$
++        }
++        int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
++        if (maxProcessors > 0) {
++            //connector.setMaxProcessors(maxProcessors);
++        	connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$
++        }
++        int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
++        if (minProcessors > 0) {
++            //connector.setMinProcessors(minProcessors);
++        	connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$
++        }
++        //this is making use of org.apache.tomcat.util.IntrospectionUtils 
++        connector.setProperty("disableUploadTimeout",""+true);  //$NON-NLS-1$ //$NON-NLS-2$
++	   	String clientauth = pref.getString(TomcatPlugin.PREF_CLIENT_AUTHENTICATION);
++	    if ((clientauth != null) && (!("".equals(clientauth.trim())))) { //$NON-NLS-1$
++	        connector.setProperty("clientauth",clientauth); //$NON-NLS-1$
++	    }
++    
++        int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
++        if (acceptCount > 0) {
++            connector.setProperty("backlog",""+acceptCount); //$NON-NLS-1$ //$NON-NLS-2$
++        }
++        
++        String keyStoreFile = pref
++        .getString(TomcatPlugin.PREF_KEY_STORE_FILE);
++		if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$
++			connector.setProperty("keystore", keyStoreFile); //$NON-NLS-1$
++		}
++        String keyStorePassword = pref
++        .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD);
++		if ((keyStorePassword != null)
++		        && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$
++			connector.setProperty("keypass", keyStorePassword); //$NON-NLS-1$
++		}
++        //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 = (PrintStream) 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(
++                TomcatPlugin.PLUGIN_ID, "realmfactory"); //$NON-NLS-1$
++        Realm realm = null;
++        if (extensionPoint != null) {
++            IExtension[] extensions = extensionPoint.getExtensions();
++            if ((extensions != null) && (extensions.length == 1)) {
++                IConfigurationElement[] factoryElements = extensions[0]
++                        .getConfigurationElements();
++                if ((factoryElements != null) && (factoryElements.length == 1)) {
++                    try {
++                        IRealmFactory realmFactory = (IRealmFactory) factoryElements[0]
++                                .createExecutableExtension("class"); //$NON-NLS-1$
++                        realm = realmFactory.createRealm();
++                    } catch (CoreException e) {
++                        logError(
++                                TomcatResources.TomcatAppServer_getRealmFactoryFailed,
++                                e);
++                    }
++                } else {
++                    if ((factoryElements == null)
++                            || (factoryElements.length == 0)) {
++                        logError(TomcatResources.TomcatAppServer_missingFactoryElement);
++                    } else {
++                        logError(TomcatResources.TomcatAppServer_multipleFactoryElements);
++                    }
++                }
++            } else {
++                if ((extensions == null) || (extensions.length == 0)) {
++                    logError(TomcatResources.TomcatAppServer_missingRealmExtension);
++                } else {
++                    logError(TomcatResources.TomcatAppServer_multipleRealmExtensions);
++                }
++            }
++        } else {
++            logError(TomcatResources.TomcatAppServer_missingRealmExtensionPoint);
++        }
++        return realm;
++    }
++
++    /**
++     * Create an error entry in the log
++     * 
++     * @param msg
++     *            error message
++     */
++    private void logError(String msg) {
++        logError(msg, null);
++    }
++
++    /**
++     * Create an error entry in the log
++     * 
++     * @param msg
++     *            error message
++     * @param cause
++     *            {@link Throwable} associated with this error message
++     */
++    private void logError(String msg, Throwable cause) {
++        TomcatPlugin.logError(msg, cause);
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#start(java.lang.String,
++     *      org.eclipse.core.runtime.IPath, java.lang.ClassLoader)
++     */
++    public synchronized void start(String webappName, IPath path, ClassLoader customLoader)
++            throws CoreException {
++    	
++        if (!isStarted) {
++            start(port, hostAddress);
++         }
++        if (!running) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind(
++                            TomcatResources.TomcatAppServer_addingWebapp,
++                            webappName, path.toOSString()), null));
++        }
++        String contextPath = webappName;
++        if (!contextPath.startsWith("/")) { //$NON-NLS-1$
++            contextPath = "/" + contextPath; //$NON-NLS-1$
++        }
++        try {
++            Context context = embedded.createContext(contextPath, path
++                    .toOSString());
++            if (context instanceof StandardContext) {
++                ((StandardContext) context)
++                        .setWorkDir(getWorkingDirectory(webappName));
++            }
++
++            WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader);
++            context.setLoader(embedded.createLoader(webappLoader));
++            host.addChild(context);
++            contexts.add(context);
++        } catch (Exception exc) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind(
++                            "TomcatAppServer.addingWebapp", webappName, path //$NON-NLS-1$
++                                    .toOSString()), exc));
++        }
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#stop(java.lang.String)
++     */
++    public synchronized void stop(String webappName) throws CoreException {
++        if (!running) {
++            return;
++        }
++        Context context = (Context) host.findChild("/" + webappName); //$NON-NLS-1$
++        if (context != null) {
++        	contexts.remove(context);
++            embedded.removeContext(context);
++        }
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#getHost()
++     */
++    public String getHost() {
++        if (!running) {
++            return null;
++        }
++        return hostAddress;
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#getPort()
++     */
++    public int getPort() {
++        if (!running) {
++            return 0;
++        }
++        return port;
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#isRunning()
++     */
++    public boolean isRunning() {
++        return running;
++    }
++
++    /**
++     * @see org.eclipse.help.internal.appserver.IWebappServer#stop()
++     */
++    public synchronized void stop() throws CoreException {
++        if (!running) {
++            return;
++        }
++        running = false;
++        // Remove all contexts
++        for(int i = 0; i< contexts.size(); i++){
++            embedded.removeContext((Context)contexts.get(i));
++           	contexts.remove(contexts.get(i));
++        }
++
++        // Remove the sslConnector, if present.
++        try {
++            if (sslConnector != null) {
++                embedded.removeConnector(this.sslConnector);
++            }
++        } catch (Exception exc) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                    TomcatResources.TomcatAppServer_sslConnectorRemove, 
++                    exc));
++        }
++
++        // Remove the HTTP Connector, if present.
++        try {
++            if (httpConnector != null) {
++                embedded.removeConnector(this.httpConnector);
++            }
++        } catch (Exception exc) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                    TomcatResources.TomcatAppServer_httpConnectorRemove, 
++                    exc));
++        }
++
++        // Remove the engine (which should trigger removing the connector)
++        try {
++            embedded.removeEngine(engine);
++        } catch (Exception exc) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                    TomcatResources.TomcatAppServer_engineRemove, 
++                    exc));
++        }
++        // Shut down this tomcat server (should have nothing left to do)
++        try {
++            embedded.stop();
++        } catch (LifecycleException e) {
++            throw new CoreException(new Status(IStatus.ERROR,
++                    TomcatPlugin.PLUGIN_ID, IStatus.OK,
++                    TomcatResources.TomcatAppServer_embeddedStop, 
++                    e));
++        }
++        isStarted = false;
++    }
++
++    private String getWorkingDirectory(String webApp) {
++        return TomcatPlugin.getDefault().getStateLocation().append(webApp)
++                .toOSString();
++    }
++}
+\ No newline at end of file
+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.9
+diff -u -r1.9 EclipseErrorReportValve.java
+--- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	23 Feb 2006 22:51:14 -0000	1.9
++++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	4 Jul 2006 18:42:41 -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,12 +157,12 @@
+      * @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;
+         Throwable throwable = 
+@@ -220,14 +232,11 @@
+         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());
++        int statusCode = response.getStatus();
++        String message = RequestUtil.filter(response.getMessage());
+         if (message == null)
+             message = ""; //$NON-NLS-1$
+ 
+@@ -373,9 +382,9 @@
+      */
+     protected void log(String message) {
+ 
+-        Logger logger = container.getLogger();
++        Logger logger = (Logger) container.getLogger();
+         if (logger != null)
+-            logger.log(this.toString() + ": " + message); //$NON-NLS-1$
++            logger.info(this.toString() + ": " + message); //$NON-NLS-1$
+         else
+             System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
+ 
+@@ -390,9 +399,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); //$NON-NLS-1$
++            logger.info(this.toString() + ": " + message, throwable); //$NON-NLS-1$
+         else {
+             System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
+             throwable.printStackTrace(System.out);
+Index: META-INF/MANIFEST.MF
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
+retrieving revision 1.21
+diff -u -r1.21 MANIFEST.MF
+--- META-INF/MANIFEST.MF	9 May 2006 20:26:52 -0000	1.21
++++ META-INF/MANIFEST.MF	4 Jul 2006 18:42:40 -0000
+@@ -2,30 +2,30 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
+-Bundle-Version: 4.1.130.qualifier
++Bundle-Version: 5.5.15.qualifier
+ Bundle-ClassPath: tomcatwrapper.jar,
+- catalina.jar,
+- bootstrap.jar,
+- commons-beanutils.jar,
+- commons-collections.jar,
+- commons-digester.jar,
+- commons-logging-api.jar,
+- commons-modeler.jar,
+- jakarta-regexp-1.3.jar,
+- jasper-compiler.jar,
+- jasper-runtime.jar,
+- mx4j-jmx.jar,
+- naming-common.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-util.jar
++ lib/catalina.jar,
++ lib/catalina-optional.jar,
++ lib/commons-beanutils.jar,
++ lib/commons-collections.jar,
++ lib/commons-digester.jar,
++ lib/commons-digester-rss.jar,
++ lib/commons-el.jar,
++ lib/commons-logging-api.jar,
++ lib/commons-modeler.jar,
++ lib/jasper-compiler.jar,
++ lib/jasper-runtime.jar,
++ lib/jmx.jar,
++ lib/jsp-api.jar,
++ lib/naming-factory.jar,
++ lib/naming-resources.jar,
++ lib/regexp.jar,
++ lib/servlet-api.jar,
++ lib/servlets-default.jar,
++ lib/tomcat-coyote.jar,
++ lib/tomcat-http.jar,
++ lib/tomcat-util.jar,
++ lib/servlets-invoker.jar
+ Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+@@ -33,6 +33,74 @@
+  org.apache.ant;bundle-version="[1.6.5,1.7.0)";resolution:=optional,
+  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
+ Eclipse-LazyStart: true
+-Export-Package: org.eclipse.tomcat.internal;x-internal:=true,
++Eclipse-BuddyPolicy: global
++Export-Package: javax.management;x-internal:=true,
++ javax.management.loading;x-internal:=true,
++ javax.management.modelmbean;x-internal:=true,
++ javax.management.monitor;x-internal:=true,
++ javax.management.openmbean;x-internal:=true,
++ javax.management.relation;x-internal:=true,
++ javax.management.timer;x-internal:=true,
++ javax.servlet;x-internal:=true,
++ javax.servlet.http;x-internal:=true,
++ javax.servlet.jsp;x-internal:=true,
++ javax.servlet.jsp.tagext;x-internal:=true,
++ mx4j;x-internal:=true,
++ mx4j.loading;x-internal:=true,
++ mx4j.log;x-internal:=true,
++ mx4j.persist;x-internal:=true,
++ mx4j.server;x-internal:=true,
++ mx4j.server.interceptor;x-internal:=true,
++ mx4j.timer;x-internal:=true,
++ mx4j.util;x-internal:=true,
++ org.apache.catalina;x-internal:=true,
++ org.apache.catalina.connector;x-internal:=true,
++ org.apache.catalina.core;x-internal:=true,
++ org.apache.catalina.realm;x-internal:=true,
++ org.apache.catalina.servlets;x-internal:=true,
++ org.apache.commons.beanutils;x-internal:=true,
++ org.apache.commons.beanutils.converters;x-internal:=true,
++ org.apache.commons.beanutils.locale;x-internal:=true,
++ org.apache.commons.beanutils.locale.converters;x-internal:=true,
++ org.apache.commons.collections;x-internal:=true,
++ org.apache.commons.collections.comparators;x-internal:=true,
++ org.apache.commons.collections.iterators;x-internal:=true,
++ org.apache.commons.digester;x-internal:=true,
++ org.apache.commons.digester.rss;x-internal:=true,
++ org.apache.commons.digester.xmlrules;x-internal:=true,
++ org.apache.commons.logging;x-internal:=true,
++ org.apache.commons.logging.impl;x-internal:=true,
++ org.apache.commons.modeler;x-internal:=true,
++ org.apache.commons.modeler.ant;x-internal:=true,
++ org.apache.commons.modeler.mbeans;x-internal:=true,
++ org.apache.commons.modeler.modules;x-internal:=true,
++ org.apache.commons.modeler.util;x-internal:=true,
++ org.apache.coyote;x-internal:=true,
++ org.apache.coyote.http11;x-internal:=true,
++ org.apache.coyote.http11.filters;x-internal:=true,
++ org.apache.coyote.memory;x-internal:=true,
++ org.apache.jasper;x-internal:=true,
++ org.apache.jasper.compiler;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.xmlparser;x-internal:=true,
++ org.apache.naming;x-internal:=true,
++ org.apache.naming.factory;x-internal:=true,
++ org.apache.naming.java;x-internal:=true,
++ org.apache.naming.resources;x-internal:=true,
++ org.apache.regexp;x-internal:=true,
++ org.apache.tomcat.util;x-internal:=true,
++ org.apache.tomcat.util.buf;x-internal:=true,
++ org.apache.tomcat.util.collections;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.net;x-internal:=true,
++ org.apache.tomcat.util.net.jsse;x-internal:=true,
++ org.apache.tomcat.util.res;x-internal:=true,
++ org.apache.tomcat.util.threads;x-internal:=true,
++ org.eclipse.tomcat.internal;x-internal:=true,
++ org.eclipse.tomcat.internal;x-internal:=true,
+  org.eclipse.tomcat.internal.extensions;x-internal:=true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4

eclipse-webapp-tomcat55.patch:
 build.properties |    4 ++--
 build.xml        |   29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

Index: eclipse-webapp-tomcat55.patch
===================================================================
RCS file: eclipse-webapp-tomcat55.patch
diff -N eclipse-webapp-tomcat55.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-webapp-tomcat55.patch	4 Jul 2006 21:27:47 -0000	1.4
@@ -0,0 +1,87 @@
+Index: build.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
+retrieving revision 1.71
+diff -u -r1.71 build.xml
+--- build.xml	16 Mar 2006 21:57:15 -0000	1.71
++++ build.xml	4 Jul 2006 18:26:11 -0000
+@@ -84,8 +84,8 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
+-				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ 			</classpath>
+ 			<src path="src/"			/>
+ 			<compilerarg line="-log ${temp.folder}/webapp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 
+@@ -141,8 +141,12 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
+-				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/tomcat-util.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/commons-el.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/commons-logging.jar"/>
+ 			</classpath>
+ 			<src path="src_servlets/"			/>
+ 			<compilerarg line="-log ${temp.folder}/WEB-INF/lib/servlets.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 
+@@ -170,21 +174,19 @@
+ 		<!-- generate java code from JSPs -->
+ 		<path id="jasper.classpath" > 
+ 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
+-			<pathelement location="../org.apache.ant/lib/optional.jar"/>
+-			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
+-			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
+-			<pathelement location="../org.eclipse.tomcat/servlet.jar" />
+-			<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />  
++			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
++			<pathelement location="../org.eclipse.tomcat/lib/jasper-compiler.jar" />
++			<pathelement location="../org.eclipse.tomcat/lib/jasper-runtime.jar" />
++			<pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />  
+ 		</path>
+ 		<delete dir="${temp.folder}/jsp.jar.src"/>
+   		<mkdir dir="${temp.folder}/jsp.jar.src"/>
+ 		<java
+ 			classname="org.apache.jasper.JspC"
+ 			fork="true"
+-			failonerror="false"
++			failonerror="true"
+ 			classpathref="jasper.classpath"
+ 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
+-			<arg value="-v3" />
+ 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
+ 			<arg value="-die" />
+ 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
+@@ -222,8 +224,9 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
+-				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
+ 			</classpath>
+ 			<src path="${temp.folder}/jsp.jar.src/"			/>
+ 			<compilerarg line="-log ${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 
+Index: build.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v
+retrieving revision 1.32
+diff -u -r1.32 build.properties
+--- build.properties	18 Mar 2005 08:00:28 -0000	1.32
++++ build.properties	4 Jul 2006 18:26:11 -0000
+@@ -33,5 +33,5 @@
+                      ../org.eclipse.help.appserver/bin,\
+                      ../org.eclipse.help.appserver,\
+                      ../org.eclipse.help.appserver/@dot,\
+-                     ../org.eclipse.tomcat/servlet.jar,\
+-                     ../org.eclipse.tomcat/jasper-runtime.jar
++                     ../org.eclipse.tomcat/lib/servletapi5.jar,\
++                     ../org.eclipse.tomcat/lib/jasper-runtime.jar


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Jun 2006 03:47:07 -0000	1.21
+++ .cvsignore	4 Jul 2006 21:27:47 -0000	1.22
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.2RC7.zip
-eclipse-fedora-splash-3.2rc7.png
+eclipse-sourceBuild-srcIncluded-3.2.zip
+eclipse-fedora-splash-3.2.png

eclipse-disable-junit4-apt.patch:
 assemble.org.eclipse.sdk.linux.gtk.ia64.xml    |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.ppc.xml     |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml   |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.x86.xml     |   24 ----------------------
 assemble.org.eclipse.sdk.linux.gtk.x86_64.xml  |   24 ----------------------
 features/org.eclipse.jdt/build.xml             |   22 --------------------
 features/org.eclipse.jdt/feature.xml           |   27 -------------------------
 plugins/org.eclipse.jdt.doc.isv/buildDoc.xml   |    2 -
 plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt |    4 ---
 9 files changed, 3 insertions(+), 172 deletions(-)

Index: eclipse-disable-junit4-apt.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-disable-junit4-apt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-disable-junit4-apt.patch	9 Jun 2006 22:26:43 -0000	1.3
+++ eclipse-disable-junit4-apt.patch	4 Jul 2006 21:27:47 -0000	1.4
@@ -1,386 +1,386 @@
-diff -ruN eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ia64.xml
---- eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-06-02 13:30:00.000000000 -0400
-+++ eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-06-04 18:52:03.000000000 -0400
-@@ -49,9 +49,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
+diff -uNr assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-07-04 13:40:47.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2006-07-04 13:33:17.000000000 -0400
+@@ -106,9 +106,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -115,9 +112,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts">
+@@ -130,9 +127,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -151,9 +145,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts">
+@@ -295,9 +289,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -277,9 +268,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+@@ -325,9 +316,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -407,10 +395,6 @@
+@@ -471,10 +459,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060602-0010"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -475,10 +459,6 @@
+@@ -495,10 +479,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.expressions_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -667,10 +647,6 @@
+@@ -675,10 +655,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.2.0.v20060601"/>
+ 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  		</antcall>
  		<antcall target="jarUp">
-diff -ruN eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
---- eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-06-04 18:52:51.000000000 -0400
-@@ -49,9 +49,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
+diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-07-04 13:40:47.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-07-04 13:33:54.000000000 -0400
+@@ -106,9 +106,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -115,9 +112,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts">
+@@ -130,9 +127,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -151,9 +145,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts">
+@@ -292,9 +286,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -277,9 +268,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+@@ -322,9 +313,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -398,10 +386,6 @@
+@@ -462,10 +450,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060602-0010"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -466,10 +450,6 @@
+@@ -486,10 +470,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.expressions_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -658,10 +638,6 @@
+@@ -662,10 +642,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.2.0.v20060601"/>
+ 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  		</antcall>
  		<antcall target="jarUp">
-diff -ruN eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
---- eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-06-04 18:54:14.000000000 -0400
-@@ -49,9 +49,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
+diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-07-04 13:40:47.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2006-07-04 13:34:22.000000000 -0400
+@@ -109,9 +109,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts">
+@@ -133,9 +130,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -148,9 +142,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts">
+@@ -298,9 +292,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -277,9 +268,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+@@ -328,9 +319,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -407,10 +395,6 @@
+@@ -471,10 +459,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060602-0010"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -475,10 +459,6 @@
+@@ -495,10 +479,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.expressions_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -667,10 +647,6 @@
+@@ -675,10 +655,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.2.0.v20060601"/>
+ 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  		</antcall>
  		<antcall target="jarUp">
-diff -ruN eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
---- eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-06-04 18:55:50.000000000 -0400
-@@ -49,9 +49,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
+diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-07-04 13:40:47.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2006-07-04 13:34:53.000000000 -0400
+@@ -106,9 +106,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts">
+@@ -130,9 +127,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -151,9 +145,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts">
+@@ -298,9 +292,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -280,9 +271,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+@@ -331,9 +322,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -410,10 +398,6 @@
+@@ -474,10 +462,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060602-0010"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -478,10 +462,6 @@
+@@ -498,10 +482,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.expressions_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -674,10 +654,6 @@
+@@ -678,10 +658,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.2.0.v20060601"/>
+ 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  		</antcall>
  		<antcall target="jarUp">
-diff -ruN eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.x86.xml
---- eclipse-3.2RC7-src.orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-06-04 18:55:08.000000000 -0400
-@@ -49,9 +49,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
+diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-07-04 13:40:47.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.x86.xml	2006-07-04 13:35:31.000000000 -0400
+@@ -112,9 +112,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts">
+@@ -136,9 +133,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -148,9 +142,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts">
+@@ -298,9 +292,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -280,9 +271,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+@@ -331,9 +322,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
--		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -410,10 +398,6 @@
+@@ -474,10 +462,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060602-0010"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -478,10 +462,6 @@
+@@ -498,10 +482,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.core.expressions_3.2.0.v20060602-0010"/>
+ 			<param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -674,10 +654,6 @@
+@@ -678,10 +658,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060601-2020"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.debug.core_3.2.0.v20060601"/>
+ 			<param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  		</antcall>
  		<antcall target="jarUp">
-diff -ruN eclipse-3.2RC7-src.orig/features/org.eclipse.jdt/build.xml eclipse-3.2RC7-src/features/org.eclipse.jdt/build.xml
---- eclipse-3.2RC7-src.orig/features/org.eclipse.jdt/build.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/features/org.eclipse.jdt/build.xml	2006-06-04 18:58:46.000000000 -0400
+diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
+--- features/org.eclipse.jdt/build.xml	2006-07-04 13:40:47.000000000 -0400
++++ features/org.eclipse.jdt/build.xml	2006-07-04 13:38:22.000000000 -0400
 @@ -12,11 +12,6 @@
  			<property name="os" value="win32"/>
  			<property name="ws" value="win32"/>
@@ -423,17 +423,17 @@
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
 @@ -150,7 +130,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060602-0010-F7snq0fulF-UQcP" failonerror="true" overwrite="false">
+ 		<copy todir="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html"			/>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060602-0010-F7snq0fulF-UQcP/feature.xml"  selfVersion="3.2.0.v20060602-0010-F7snq0fulF-UQcP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060602-0010,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.apt.core,3.2.0.v20060601-2020,org.eclipse.jdt.apt.ui,3.2.0.v20060601-2020,org.eclipse.jdt.core,3.2.0.v_670,org.eclipse.jdt.core.manipulation,1.0.0.v20060602-0010,org.eclipse.jdt.debug.ui,3.2.0.v20060517,org.eclipse.jdt.debug,3.2.0.v20060601,org.eclipse.jdt.junit,3.2.0.v20060602-0010,org.eclipse.jdt.junit.runtime,3.2.0.v20060602-0010,org.eclipse.jdt.junit4.runtime,1.0.0.v20060602-0010,org.eclipse.jdt.launching,3.2.0.v20060525,org.eclipse.jdt.ui,3.2.0.v20060602-0010,org.junit,3.8.1,org.junit4,4.1.0,org.eclipse.jdt.doc.user,3.2.0.v20060602-1130,org.eclipse.jdt.launching.macosx,3.1.100.v20060509,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060602-0010-F7snq0fulF-UQcP/feature.xml"  selfVersion="3.2.0.v20060602-0010-F7snq0fulF-UQcP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060602-0010,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.core,3.2.0.v_670,org.eclipse.jdt.core.manipulation,1.0.0.v20060602-0010,org.eclipse.jdt.debug.ui,3.2.0.v20060517,org.eclipse.jdt.debug,3.2.0.v20060601,org.eclipse.jdt.junit,3.2.0.v20060602-0010,org.eclipse.jdt.junit.runtime,3.2.0.v20060602-0010,org.eclipse.jdt.launching,3.2.0.v20060525,org.eclipse.jdt.ui,3.2.0.v20060602-0010,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060602-1130,org.eclipse.jdt.launching.macosx,3.1.100.v20060509,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.apt.core,3.2.0.v20060602-1740,org.eclipse.jdt.apt.ui,3.2.0.v20060602-1740,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.junit4.runtime,1.0.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.junit4,4.1.0,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
-diff -ruN eclipse-3.2RC7-src.orig/features/org.eclipse.jdt/feature.xml eclipse-3.2RC7-src/features/org.eclipse.jdt/feature.xml
---- eclipse-3.2RC7-src.orig/features/org.eclipse.jdt/feature.xml	2006-06-02 13:32:14.000000000 -0400
-+++ eclipse-3.2RC7-src/features/org.eclipse.jdt/feature.xml	2006-06-04 18:56:55.000000000 -0400
+diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
+--- features/org.eclipse.jdt/feature.xml	2006-07-04 13:40:47.000000000 -0400
++++ features/org.eclipse.jdt/feature.xml	2006-07-04 12:05:17.000000000 -0400
 @@ -38,20 +38,6 @@
           unpack="false"/>
  
@@ -482,9 +482,9 @@
           id="org.eclipse.jdt.doc.user"
           download-size="0"
           install-size="0"
-diff -ruN eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
---- eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-06-02 13:29:59.000000000 -0400
-+++ eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-06-08 19:53:27.000000000 -0400
+diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
+--- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:40:47.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-07-04 13:30:48.000000000 -0400
 @@ -75,7 +75,7 @@
  		<exec dir="." executable="${javadoc}" output="doc.bin.log">
  			<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
@@ -494,9 +494,9 @@
  	</target>
  	
  	<target name="generateJdtAptJavadoc">
-diff -ruN eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
---- eclipse-3.2RC7-src.orig/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-06-02 13:29:58.000000000 -0400
-+++ eclipse-3.2RC7-src/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-06-04 21:47:48.000000000 -0400
+diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+--- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:40:47.000000000 -0400
++++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2006-07-04 13:42:37.000000000 -0400
 @@ -22,12 +22,10 @@
  ;../org.eclipse.jdt.ui/ui refactoring
  ;../org.eclipse.jdt.ui/core extension


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- eclipse.spec	13 Jun 2006 22:41:27 -0000	1.282
+++ eclipse.spec	4 Jul 2006 21:27:47 -0000	1.283
@@ -1,3 +1,8 @@
+# TODO:
+#   - migrate compare API patch (patch33) to 3.2 final
+#   - migrate cairo patch (patch43) to 3.2 final
+#   - migrate GNU formatter patches (patch20, patch21) to 3.2 final
+
 Epoch:	1
 
 %define fedora		1
@@ -36,16 +41,16 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0jpp_0fc.3.2RC7.7
+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/S-3.2RC7-200606021317/eclipse-sourceBuild-srcIncluded-3.2RC7.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/eclipse-sourceBuild-srcIncluded-3.2.zip
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
 %if %{fedora}
-Source11:	%{name}-fedora-splash-3.2rc7.png
+Source11:	%{name}-fedora-splash-3.2.png
 %endif
 %if %{redhat}
 Source11:	%{name}-redhat-splash.png
@@ -56,9 +61,6 @@
 Source20:	ecj.sh.in
 Source21:	rebuild-sdk-features
 
-
-
-
 # Build libswt-mozilla and libswt-cairo and use O2
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
 Patch0:         %{name}-libswt-enableallandO2.patch
@@ -83,7 +85,6 @@
 Patch40:	%{name}-usebuiltlauncher.patch
 ## Build cairo native libs
 #Patch43:	%{name}-libswt-cairo1.0-3.patch
-Patch45:	%{name}-webapp-jasper-classpath.patch
 Patch46:	%{name}-libswt-xpcomgcc4.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
@@ -101,13 +102,13 @@
 # We need to disable junit4 and apt until GCJ can handle Java5 code
 Patch55: 	%{name}-disable-junit4-apt.patch
 
-# these patches need to go upstream
+# These patches need to go upstream
 # 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
@@ -122,12 +123,6 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 Patch34:	%{name}-bz162177.patch
 
-# these patches should be in 3.2 final
-Patch100:	customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
-Patch101:	org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch
-
-
-
 %if %{gcj_support}
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
@@ -207,8 +202,7 @@
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Provides:       %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	%{name}-sdk %{name}-ui %{name}-gtk2 %{name}-scripts eclipse
-Provides:	%{name}-sdk = %{epoch}:%{version}-%{release}
+Obsoletes:	%{name}-ui %{name}-gtk2 %{name}-scripts eclipse
 Provides:       %{name}-ui = %{epoch}:%{version}-%{release}
 Provides:       %{name}-scripts = %{epoch}:%{version}-%{release}
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
@@ -386,14 +380,6 @@
 %prep
 %setup -q -c
 
-pushd plugins/org.eclipse.platform.doc.isv
-%patch100 -p0
-%patch101 -p0 
-popd 
-pushd plugins/org.eclipse.platform.doc.user
-%patch100 -p0
-popd
-
 # I hate spaces in paths with patch!
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
@@ -412,14 +398,14 @@
 
 # tomcat patches
 pushd plugins/org.eclipse.tomcat
-#%patch28 -p0
-#%patch29 -p0
+%patch28 -p0
+%patch29 -p0
+popd
+%patch30 -p0
+%patch50 -p1
+pushd plugins/org.eclipse.help.webapp
+%patch31 -p0
 popd
-#%patch30 -p0
-#%patch50 -p1
-#pushd plugins/org.eclipse.help.webapp
-#%patch31 -p0
-#popd
 pushd plugins/org.eclipse.compare
 #%patch33 -p0
 popd
@@ -429,7 +415,6 @@
 %patch38 -p0
 %patch40 -p0
 #%patch43
-%patch45
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
 %patch46
 popd
@@ -466,7 +451,7 @@
 %patch54 
 popd
 
-%patch55 -p1
+%patch55 -p0
 rm plugins/org.junit4/junit-4.1.jar
 
 pushd plugins/org.eclipse.platform
@@ -588,51 +573,50 @@
 popd
 
 ## BEGIN TOMCAT ##
-#rm plugins/org.eclipse.tomcat/commons-beanutils.jar
-#rm plugins/org.eclipse.tomcat/commons-collections.jar
-#rm plugins/org.eclipse.tomcat/commons-digester.jar
-#rm plugins/org.eclipse.tomcat/commons-logging-api.jar
-#rm plugins/org.eclipse.tomcat/commons-modeler.jar
-#rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
-#rm plugins/org.eclipse.tomcat/servlet.jar
-#rm plugins/org.eclipse.tomcat/servlets-manager.jar
-#rm plugins/org.eclipse.tomcat/naming-common.jar
-#rm plugins/org.eclipse.tomcat/servlets-common.jar
-#rm plugins/org.eclipse.tomcat/tomcat-http11.jar
-#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
-#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
-#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
-#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat/jakarta-commons-beanutils.jar
-#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar
-#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat/jakarta-commons-dbcp.jar
-#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat/jakarta-commons-digester.jar
-#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat/jakarta-commons-digester-rss.jar
-#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat/jakarta-commons-el.jar
-#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat/jakarta-commons-fileupload.jar
-#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat/jakarta-commons-launcher.jar
-#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat/jakarta-commons-logging.jar
-#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat/jakarta-commons-modeler.jar
-#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat/jakarta-commons-pool.jar
-#ln -s %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat/jasper-compiler.jar
-#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
-#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.jar
-#ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
-#ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
-#ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
-#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/regexp.jar
-#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+rm plugins/org.eclipse.tomcat/commons-beanutils.jar
+rm plugins/org.eclipse.tomcat/commons-collections.jar
+rm plugins/org.eclipse.tomcat/commons-digester.jar
+rm plugins/org.eclipse.tomcat/commons-logging-api.jar
+rm plugins/org.eclipse.tomcat/commons-modeler.jar
+rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
+rm plugins/org.eclipse.tomcat/servlet.jar
+rm plugins/org.eclipse.tomcat/servlets-manager.jar
+rm plugins/org.eclipse.tomcat/naming-common.jar
+rm plugins/org.eclipse.tomcat/servlets-common.jar
+rm plugins/org.eclipse.tomcat/tomcat-http11.jar
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-logging
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
 ## END TOMCAT ##
-rm plugins/org.junit/junit.jar
-ln -s %{_javadir}/junit.jar plugins/org.junit/junit.jar
+build-jar-repository -s -p plugins/org.junit junit
 
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
@@ -645,7 +629,7 @@
   find plugins -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
 %endif
 
-# nasty hack to get suppport for pcc64 and s390(x)
+# nasty hack to get suppport for ppc64 and s390(x)
 # move all of the ia64 directories to ppc64 or s390(x) dirs and replace the ia64 # strings with ppc64 or s390(x)
 %ifarch ppc64 s390 s390x
   # there is only partial support for ppc64 in 3.2 so we have to remove this 
@@ -1060,52 +1044,50 @@
 #rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 #ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
-#rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
-#rm plugins/org.eclipse.tomcat_*/commons-collections.jar
-#rm plugins/org.eclipse.tomcat_*/commons-digester.jar
-#rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar
-#rm plugins/org.eclipse.tomcat_*/commons-modeler.jar
-#rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
-#rm plugins/org.eclipse.tomcat_*/servlet.jar
-#rm plugins/org.eclipse.tomcat_*/servlets-manager.jar
-#rm plugins/org.eclipse.tomcat_*/naming-common.jar
-#rm plugins/org.eclipse.tomcat_*/servlets-common.jar
-#rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
-#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
-#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
-#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
-#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat_*/jakarta-commons-beanutils.jar
-#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat_*/jakarta-commons-collections.jar
-#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat_*/jakarta-commons-dbcp.jar
-#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester.jar
-#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester-rss.jar
-#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat_*/jakarta-commons-el.jar
-#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat_*/jakarta-commons-fileupload.jar
-#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat_*/jakarta-commons-launcher.jar
-#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat_*/jakarta-commons-logging.jar
-#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat_*/jakarta-commons-modeler.jar
-#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat_*/jakarta-commons-pool.jar
-#ln -s %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat_*/jasper-compiler.jar
-#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
-#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.jar
-#ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
-#ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
-#ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
-#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
-#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/regexp.jar
-#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
-#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
-#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
+rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
+rm plugins/org.eclipse.tomcat_*/commons-collections.jar
+rm plugins/org.eclipse.tomcat_*/commons-digester.jar
+rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar
+rm plugins/org.eclipse.tomcat_*/commons-modeler.jar
+rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
+rm plugins/org.eclipse.tomcat_*/servlet.jar
+rm plugins/org.eclipse.tomcat_*/servlets-manager.jar
+rm plugins/org.eclipse.tomcat_*/naming-common.jar
+rm plugins/org.eclipse.tomcat_*/servlets-common.jar
+rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-logging
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
 ## END TOMCAT ##
-# FIXME rm -f in ln
-#rm plugins/org.junit_*/junit.jar
-ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
+build-jar-repository -s -p plugins/org.junit_* junit
 
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
@@ -1139,7 +1121,7 @@
 %if %{gcj_support}
 %ifarch ia64
 # FIXME: auto get version number; tweak aot-compile-rpm to fix this
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.I200606011710.jar
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar
 %else
 aot-compile-rpm
 %endif
@@ -1630,6 +1612,11 @@
 %endif
 
 %changelog
+* Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
+- 3.2.0.
+- Remove Provides:  eclipse-sdk from eclipse-platform.
+- Use build-jar-repository where appropriate.
+
 * Tue Jun 13 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-0jpp_0fc.3.2RC7.7
 - Rename -devel packages to -sdk to match upstream names.
 - Add Provides eclipse-sdk to platform-sdk. 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Jun 2006 03:47:07 -0000	1.33
+++ sources	4 Jul 2006 21:27:47 -0000	1.34
@@ -1,2 +1,2 @@
-9fa62b56c209713a32296f3ac65cf1d0  eclipse-sourceBuild-srcIncluded-3.2RC7.zip
-f7837f724789b30537d2afe1b8b77161  eclipse-fedora-splash-3.2rc7.png
+67b41802092d4b2f779fb756dcaec85c  eclipse-sourceBuild-srcIncluded-3.2.zip
+5839c46d1080ddd08d3de669e2091189  eclipse-fedora-splash-3.2.png


--- eclipse-webapp-jasper-classpath.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:41:29 -0400
Subject: rpms/kernel/devel/configs config-generic,1.211,1.212
Message-ID: <200607042141.k64LfTMh026340@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable ncpfs for now



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- config-generic	4 Jul 2006 21:03:12 -0000	1.211
+++ config-generic	4 Jul 2006 21:41:26 -0000	1.212
@@ -2440,7 +2440,8 @@
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 # CONFIG_CIFS_DEBUG2 is not set
-CONFIG_NCP_FS=m
+# FIXME: Broken in .17git23
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
 CONFIG_NCPFS_STRONG=y



From fedora-cvs-commits at redhat.com  Tue Jul  4 21:56:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 17:56:05 -0400
Subject: rpms/kdelibs/FC-5 kdelibs-3.5.3-kde#118277.patch, NONE,
	1.1 kdelibs-3.5.3-kde#123315.patch, NONE,
	1.1 kdelibs-3.5.3-kde#128760.patch, NONE,
	1.1 kdelibs-3.5.3-kde#128842.patch, NONE,
	1.1 kdelibs-3.5.3-kde#128902.patch, NONE,
	1.1 kdelibs-3.5.3-kde#57159.patch, NONE,
	1.1 kdelibs-3.5.3-kde#65546.patch, NONE,
	1.1 kdelibs-3.5.3-kde#67849.patch, NONE,
	1.1 kdelibs-3.5.3-kde#81806.patch, NONE,
	1.1 kdelibs-3.5.3-khtml-regression.patch, NONE,
	1.1 kdelibs-3.5.3.diff, NONE, 1.1 kdelibs.spec, 1.133, 1.134
Message-ID: <200607042156.k64Lu51u014076@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#118277.patch kdelibs-3.5.3-kde#123315.patch 
	kdelibs-3.5.3-kde#128760.patch kdelibs-3.5.3-kde#128842.patch 
	kdelibs-3.5.3-kde#128902.patch kdelibs-3.5.3-kde#57159.patch 
	kdelibs-3.5.3-kde#65546.patch kdelibs-3.5.3-kde#67849.patch 
	kdelibs-3.5.3-kde#81806.patch 
	kdelibs-3.5.3-khtml-regression.patch kdelibs-3.5.3.diff 
Log Message:
- apply upstream patches,
   fix #128940/#81806/#57159/#118277/#123315/#65546/#128842/#128902/#67849/#81806
- fix #196013, mark kde.sh/kde.csh as config file
- fix #178323 #196225, typo in kde.sh


kdelibs-3.5.3-kde#118277.patch:
 html/html_baseimpl.cpp      |   25 +++++++++++++++++++++++++
 html/html_baseimpl.h        |    4 ++++
 khtmlview.cpp               |   14 +++++++++-----
 rendering/render_form.h     |    5 -----
 rendering/render_frames.h   |    8 ++++++++
 rendering/render_object.cpp |   10 +++++++---
 rendering/render_replaced.h |    5 +++++
 7 files changed, 58 insertions(+), 13 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#118277.patch ---
Index: khtml/khtmlview.cpp
===================================================================
--- khtml/khtmlview.cpp	(Revision 555344)
+++ khtml/khtmlview.cpp	(Revision 555345)
@@ -660,7 +660,14 @@
 	QWidget *w = it.current();
 	RenderWidget* rw = static_cast<RenderWidget*>( it.currentKey() );
 	if (w && rw && !rw->isKHTMLWidget()) { 
-            QRect g = w->geometry();
+            int x, y;
+            rw->absolutePosition(x, y);
+            contentsToViewport(x, y, x, y);
+            int pbx = rw->borderLeft()+rw->paddingLeft();
+            int pby = rw->borderTop()+rw->paddingTop();
+            QRect g = QRect(x+pbx, y+pby, 
+                            rw->width()-pbx-rw->borderRight()-rw->paddingRight(), 
+                            rw->height()-pby-rw->borderBottom()-rw->paddingBottom());
             if ( !rw->isFrame() && ((g.top() > pt.y()+eh) || (g.bottom() <= pt.y()) ||
                                     (g.right() <= pt.x()) || (g.left() > pt.x()+ew) ))
                 continue;
@@ -673,10 +680,7 @@
                 mask = mask.intersect( QRect(g.x(),g.y(),g.width(),g.height()) );
                 cr -= mask;
             } else {
-                int x, y;
-                rw->absolutePosition(x,y);
-                contentsToViewport(x,y,x,y);
-                cr -= QRect(x,y,rw->width(),rw->height());
+                cr -= g;
             }
         }
     }
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 555344)
+++ khtml/html/html_baseimpl.cpp	(Revision 555345)
@@ -584,6 +584,7 @@
     marginWidth = 0;
     marginHeight = 0;
     needWidgetUpdate = false;
+    m_frame = true;
 }
 
 HTMLIFrameElementImpl::~HTMLIFrameElementImpl()
@@ -615,17 +616,41 @@
         needWidgetUpdate = true; // ### do this for scrolling, margins etc?
         HTMLFrameElementImpl::parseAttribute( attr );
         break;
+    case ATTR_FRAMEBORDER:
+    {
+        m_frame = (!attr->val() || attr->value().toInt() > 0);
+        if (attached()) updateFrame();
+    }
     default:
         HTMLFrameElementImpl::parseAttribute( attr );
     }
 }
 
+void HTMLIFrameElementImpl::updateFrame()
+{
+    if (m_frame) {
+        addCSSProperty(CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_OUTSET);
+        addCSSProperty(CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_OUTSET);
+        addCSSLength(CSS_PROP_BORDER_WIDTH, "2");
+    } else {
+        addCSSProperty(CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_NONE);
+        addCSSProperty(CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_NONE);
+        removeCSSProperty(CSS_PROP_BORDER_WIDTH);
+    }
+
+}
+
 void HTMLIFrameElementImpl::attach()
 {
     assert(!attached());
     assert(!m_render);
     assert(parentNode());
 
+    updateFrame();
     name = getAttribute(ATTR_NAME);
     if (name.isNull())
         name = getAttribute(ATTR_ID);
Index: khtml/html/html_baseimpl.h
===================================================================
--- khtml/html/html_baseimpl.h	(Revision 555344)
+++ khtml/html/html_baseimpl.h	(Revision 555345)
@@ -190,7 +190,11 @@
     virtual void recalcStyle( StyleChange ch );
 
 protected:
+
+    void updateFrame();
+
     bool needWidgetUpdate;
+    bool m_frame;
 };
 
 
Index: khtml/rendering/render_form.h
===================================================================
--- khtml/rendering/render_form.h	(Revision 555344)
+++ khtml/rendering/render_form.h	(Revision 555345)
@@ -78,11 +78,6 @@
 
     virtual bool isFormElement() const { return true; }
 
-    virtual int borderTop() const { return canHaveBorder() ? RenderWidget::borderTop() : 0; }
-    virtual int borderBottom() const { return canHaveBorder() ? RenderWidget::borderBottom() : 0; }
-    virtual int borderLeft() const { return canHaveBorder() ? RenderWidget::borderLeft() : 0; }
-    virtual int borderRight() const { return canHaveBorder() ? RenderWidget::borderRight() : 0; }
-
     // form elements never have padding
     virtual int paddingTop() const { return 0; }
     virtual int paddingBottom() const { return 0; }
Index: khtml/rendering/render_frames.h
===================================================================
--- khtml/rendering/render_frames.h	(Revision 555344)
+++ khtml/rendering/render_frames.h	(Revision 555345)
@@ -130,6 +130,12 @@
     virtual const char *renderName() const { return "RenderFrame"; }
     virtual bool isFrame() const { return true; }
 
+    // frames never have padding
+    virtual int paddingTop() const { return 0; }
+    virtual int paddingBottom() const { return 0; }
+    virtual int paddingLeft() const { return 0; }
+    virtual int paddingRight() const { return 0; }
+
     DOM::HTMLFrameElementImpl *element() const
     { return static_cast<DOM::HTMLFrameElementImpl*>(RenderObject::element()); }
 
@@ -150,6 +156,8 @@
 
     virtual void layout( );
     virtual void updateWidget();
+    
+    virtual bool canHaveBorder() const { return true; }
 
     virtual bool partLoadingErrorNotify( khtml::ChildFrame *childFrame, const KURL& url, const QString& serviceType );
 
Index: khtml/rendering/render_replaced.h
===================================================================
--- khtml/rendering/render_replaced.h	(Revision 555344)
+++ khtml/rendering/render_replaced.h	(Revision 555345)
@@ -146,6 +146,11 @@
     bool m_needsMask;
 
 public:
+    virtual int borderTop() const { return canHaveBorder() ? RenderReplaced::borderTop() : 0; }
+    virtual int borderBottom() const { return canHaveBorder() ? RenderReplaced::borderBottom() : 0; }
+    virtual int borderLeft() const { return canHaveBorder() ? RenderReplaced::borderLeft() : 0; }
+    virtual int borderRight() const { return canHaveBorder() ? RenderReplaced::borderRight() : 0; }
+
     class EventPropagator : public QWidget {
     public:
         void sendEvent(QEvent *e);
Index: khtml/rendering/render_object.cpp
===================================================================
--- khtml/rendering/render_object.cpp	(Revision 555344)
+++ khtml/rendering/render_object.cpp	(Revision 555345)
@@ -2182,9 +2182,13 @@
             QRegion r = l ? l->getMask() : QRegion();
             int x,y;
             if (!r.isNull() && curr->absolutePosition(x,y)) {
-                x+= curr->borderLeft()+curr->paddingLeft();
-                y+= curr->borderBottom()+curr->paddingBottom();
-                r = r.intersect(QRect(x,y,curr->width(),curr->height()));
+                int pbx = curr->borderLeft()+curr->paddingLeft();
+                int pby = curr->borderTop()+curr->paddingTop();
+                x+= pbx;
+                y+= pby;
+                r = r.intersect(QRect(x,y,
+                                  curr->width()-pbx-curr->borderRight()-curr->paddingRight(),
+                                  curr->height()-pby-curr->borderBottom()-curr->paddingBottom()));
 #ifdef MASK_DEBUG
                 QMemArray<QRect> ar = r.rects();
                 kdDebug(6040) << "|| Setting widget mask for " << curr->information() << endl;

kdelibs-3.5.3-kde#123315.patch:
 kdirwatch.cpp |   75 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 52 insertions(+), 23 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#123315.patch ---
--- kio/kio/kdirwatch.cpp.kde#123315	2006-05-22 20:14:17.000000000 +0200
+++ kio/kio/kdirwatch.cpp	2006-07-03 08:40:04.000000000 +0200
@@ -340,7 +340,7 @@
   kdDebug(7001) << "Available methods: " << available << endl;
 }
 
-/* This should never be called, but doesn't harm */
+/* This is called on app exit (KStaticDeleter) */
 KDirWatchPrivate::~KDirWatchPrivate()
 {
   timer->stop();
@@ -407,9 +407,6 @@
       if ( event->len )
         path = QFile::decodeName( QCString( event->name, event->len ) );
 
-      if ( event->mask & IN_IGNORED )
-        continue;
-
       if ( path.length() && isNoisyFile( path.latin1() ) )
         continue;
 
@@ -428,12 +425,15 @@
             if( event->mask & IN_DELETE_SELF) {
               kdDebug(7001) << "-->got deleteself signal for " << e->path << endl;
               e->m_status = NonExistent;
-              //(void) inotify_rm_watch( m_inotify_fd, e->wd );
-              addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+              if (e->isDir)
+                addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+              else
+                addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
+            }
+            if ( event->mask & IN_IGNORED ) {
+              e->wd = 0;
             }
             if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) {
-              kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl;
-
               Entry *sub_entry = e->m_entries.first();
               for(;sub_entry; sub_entry = e->m_entries.next())
                 if (sub_entry->path == e->path + "/" + path) break;
@@ -727,7 +727,10 @@
     return true;
 
   if ( e->m_status == NonExistent ) {
-    addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+    if (e->isDir) 
+      addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true);
+    else
+      addEntry(0, QFileInfo(e->path).dirPath(true), e, true);
     return true;
   }
 
@@ -782,7 +785,9 @@
        (*it).m_entries.append(sub_entry);
        kdDebug(7001) << "Added already watched Entry " << path
 		     << " (for " << sub_entry->path << ")" << endl;
+
 #ifdef HAVE_DNOTIFY
+     {
        Entry* e = &(*it);
        if( (e->m_mode == DNotifyMode) && (e->dn_fd > 0) ) {
          int mask = DN_DELETE|DN_CREATE|DN_RENAME|DN_MULTISHOT;
@@ -797,7 +802,25 @@
            useStat( e );
          }
        }
+     }
+#endif
+
+#ifdef HAVE_INOTIFY
+     {
+       Entry* e = &(*it);
+       if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
+         int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
+         if(!e->isDir)
+           mask |= IN_MODIFY|IN_ATTRIB;
+         else
+           mask |= IN_ONLYDIR;
+
+         inotify_rm_watch (m_inotify_fd, e->wd);
+         e->wd = inotify_add_watch( m_inotify_fd, QFile::encodeName( e->path ), mask);
+       }
+    }
 #endif
+ 
     }
     else {
        (*it).addClient(instance);
@@ -928,8 +951,12 @@
         m_inotify_fd << ", "  << e->wd <<
         ") for " << e->path << endl;
     }
-    else
-      removeEntry( 0, QDir::cleanDirPath( e->path+"/.." ), e );
+    else {
+      if (e->isDir)
+	removeEntry(0, QDir::cleanDirPath(e->path+"/.."), e);
+      else
+	removeEntry(0, QFileInfo(e->path).dirPath(true), e);
+    }
   }
 #endif
 
@@ -1167,15 +1194,6 @@
       return Changed;
     }
 
-#ifdef HAVE_INOTIFY
-    // for inotify we delay the initial stating till the first event in it
-    if ( e->m_status == Normal && e->m_ctime == invalid_ctime )
-    {
-      e->m_ctime = stat_buf.st_ctime;
-      e->m_nlink = stat_buf.st_nlink;
-    }
-#endif
-
     return NoChange;
   }
 
@@ -1278,7 +1296,7 @@
   // removeDir(), when called in slotDirty(), can cause a crash otherwise
   delayRemove = true;
 
-#ifdef HAVE_DNOTIFY
+#if defined(HAVE_DNOTIFY) || defined(HAVE_INOTIFY)
   QPtrList<Entry> dList, cList;
 #endif
 
@@ -1306,6 +1324,16 @@
 
     int ev = scanEntry( &(*it) );
 
+
+#ifdef HAVE_INOTIFY
+    if ((*it).m_mode == INotifyMode && ev == Created && (*it).wd == 0) {
+      cList.append( &(*it) );
+      if (! useINotify( &(*it) )) {
+        useStat( &(*it) );
+      }
+    }
+#endif
+
 #ifdef HAVE_DNOTIFY
     if ((*it).m_mode == DNotifyMode) {
       if ((*it).isDir && (ev == Deleted)) {
@@ -1337,7 +1365,7 @@
   }
 
 
-#ifdef HAVE_DNOTIFY
+#if defined(HAVE_DNOTIFY) || defined(HAVE_INOTIFY)
   // Scan parent of deleted directories for new creation
   Entry* e;
   for(e=dList.first();e;e=dList.next())
@@ -1542,7 +1570,8 @@
 	kdDebug(7001) << "    dependent entries:" << endl;
 	Entry* d = e->m_entries.first();
 	for(;d; d = e->m_entries.next()) {
-	  kdDebug(7001) << "      " << d->path << endl;
+          kdDebug(7001) << "      " << d << endl;
+	  kdDebug(7001) << "      " << d->path << " (" << d << ") " << endl;
 	}
       }
     }

kdelibs-3.5.3-kde#128760.patch:
 dom_textimpl.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdelibs-3.5.3-kde#128760.patch ---
Index: khtml/xml/dom_textimpl.cpp
===================================================================
--- khtml/xml/dom_textimpl.cpp	(Revision 557103)
+++ khtml/xml/dom_textimpl.cpp	(Revision 557104)
@@ -389,6 +389,8 @@
         }
 
         RenderObject *first = par->firstChild();
+        while (first && first->isFloatingOrPositioned())
+            first = first->nextSibling();
         RenderObject *next = nextRenderer();
         if (!first || next == first) {
             // Whitespace at the start of a block just goes away.  Don't even

kdelibs-3.5.3-kde#128842.patch:
 ustring.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#128842.patch ---
Index: kjs/ustring.cpp
===================================================================
--- kjs/ustring.cpp	(Revision 549505)
+++ kjs/ustring.cpp	(Revision 549506)
@@ -131,18 +131,20 @@
 UChar UChar::toLower() const
 {
   // ### properly support unicode tolower
-  if (uc >= 256 || islower(uc))
+  if (uc >= 256)
     return *this;
 
-  return (unsigned char)tolower(uc);
+  // tolower is locale-dependent, don't use it.
+  return static_cast<unsigned char>( ( ( uc >= 'A' ) && ( uc <= 'Z' ) ) ? ( (int)uc + 'a' - 'A' ) : uc );
 }
 
 UChar UChar::toUpper() const
 {
-  if (uc >= 256 || isupper(uc))
+  if (uc >= 256)
     return *this;
 
-  return (unsigned char)toupper(uc);
+  // toupper is locale-dependent, don't use it.
+  return static_cast<unsigned char>( ( ( uc >= 'a' ) && ( uc <= 'z' ) ) ? ( (int)uc + 'A' - 'a' ) : uc );
 }
 
 UCharReference& UCharReference::operator=(UChar c)

kdelibs-3.5.3-kde#128902.patch:
 kjs_window.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.3-kde#128902.patch ---
Index: khtml/ecma/kjs_window.cpp
===================================================================
--- khtml/ecma/kjs_window.cpp	(Revision 549887)
+++ khtml/ecma/kjs_window.cpp	(Revision 549888)
@@ -2464,8 +2464,10 @@
     break;
   case Location::Reload: {
     KHTMLPart *khtmlpart = ::qt_cast<KHTMLPart *>(part);
-    if (part)
+    if (khtmlpart)
       khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
+    else
+      part->openURL(part->url());
     break;
   }
   case Location::ToString:

kdelibs-3.5.3-kde#57159.patch:
 css/css_stylesheetimpl.cpp |    4 ++++
 xml/dom_docimpl.cpp        |   12 ++++++++++--
 xml/dom_docimpl.h          |    6 +++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#57159.patch ---
Index: khtml/css/css_stylesheetimpl.cpp
===================================================================
--- khtml/css/css_stylesheetimpl.cpp	(Revision 555956)
+++ khtml/css/css_stylesheetimpl.cpp	(Revision 555957)
@@ -194,6 +194,8 @@
     // HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the specified index e.g. if an
     //@import rule is inserted after a standard rule set or other at-rule.
     m_lstChildren->insert(index, r);
+    if (m_doc) 
+        m_doc->updateStyleSelector(true /*shallow*/);
     return index;
 }
 
@@ -211,6 +213,8 @@
         return;
     }
     b->deref();
+    if (m_doc)
+        m_doc->updateStyleSelector(true /*shallow*/);
 }
 
 void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri)
Index: khtml/xml/dom_docimpl.cpp
===================================================================
--- khtml/xml/dom_docimpl.cpp	(Revision 555956)
+++ khtml/xml/dom_docimpl.cpp	(Revision 555957)
@@ -1976,7 +1976,7 @@
     if (exceptioncode) *exceptioncode = excode;
 }
 
-void DocumentImpl::updateStyleSelector()
+void DocumentImpl::updateStyleSelector(bool shallow)
 {
 //    kdDebug() << "PENDING " << m_pendingStylesheets << endl;
 
@@ -1984,7 +1984,10 @@
     if (m_pendingStylesheets > 0)
         return;
 
-    recalcStyleSelector();
+    if (shallow)
+        rebuildStyleSelector();
+    else
+        recalcStyleSelector();
     recalcStyle(Force);
 #if 0
 
@@ -2134,6 +2137,11 @@
     for (; it.current(); ++it)
 	it.current()->deref();
 
+    rebuildStyleSelector();
+}
+
+void DocumentImpl::rebuildStyleSelector()
+{
     // Create a new style selector
     delete m_styleSelector;
     QString usersheet = m_usersheet;
Index: khtml/xml/dom_docimpl.h
===================================================================
--- khtml/xml/dom_docimpl.h	(Revision 555956)
+++ khtml/xml/dom_docimpl.h	(Revision 555957)
@@ -258,10 +258,14 @@
      * <LINK>, <STYLE> or <BODY> elements, as well as processing instructions (XML documents only). A list is
      * constructed from these which is used to create the a new style selector which collates all of the stylesheets
      * found and is used to calculate the derived styles for all rendering objects.
+     *
+     * @param shallow If the stylesheet list for the document is unchanged, with only added or removed rules 
+     * in existing sheets, then set this argument to true for efficiency.
      */
-    void updateStyleSelector();
+    void updateStyleSelector(bool shallow=false);
 
     void recalcStyleSelector();
+    void rebuildStyleSelector();
 
     QString nextState();
 

kdelibs-3.5.3-kde#65546.patch:
 dtd.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#65546.patch ---
Index: khtml/html/dtd.cpp
===================================================================
--- khtml/html/dtd.cpp	(Revision 549400)
+++ khtml/html/dtd.cpp	(Revision 549401)
@@ -599,8 +599,8 @@
         // _1 *
         return check_array(childID, tag_list_1) || check_array(childID, tag_list_6);
     case ID_P:
-        // P: ( _0 | TABLE ) *
-        return check_array(childID, tag_list_0) || (!strict && childID == ID_TABLE);
+        // P: ( _0 | TABLE | NOSCRIPT) *
+        return check_array(childID, tag_list_0) || (!strict && (childID == ID_TABLE || childID == ID_NOSCRIPT));
     case ID_H1:
     case ID_H2:
     case ID_H3:

kdelibs-3.5.3-kde#67849.patch:
 table_layout.cpp |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#67849.patch ---
Index: khtml/rendering/table_layout.cpp
===================================================================
--- khtml/rendering/table_layout.cpp	(Revision 552381)
+++ khtml/rendering/table_layout.cpp	(Revision 552382)
@@ -288,8 +288,6 @@
 	int base = tableWidth * totalPercent / 100;
 	if ( base > available )
 	    base = available;
-	else
-	    totalPercent = 100;
 
 #ifdef DEBUG_LAYOUT
     qDebug("FixedTableLayout::layout: assigning percent width, base=%d, totalPercent=%d", base, totalPercent);

kdelibs-3.5.3-kde#81806.patch:
 dtd.cpp        |  352 ++++++++++++++++++---------------------------------------
 htmlparser.cpp |    5 
 2 files changed, 115 insertions(+), 242 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#81806.patch ---
Index: khtml/html/dtd.cpp
===================================================================
--- khtml/html/dtd.cpp	(Revision 552024)
+++ khtml/html/dtd.cpp	(Revision 552025)
@@ -259,261 +259,111 @@
     REQUIRED   // ID_TEXT
 };
 
-
-static const ushort tag_list_0[] = {
+// This a combination of HTML4.dtd XHTML11.dtd and various extensions
+// and deprecated elements
+static const ushort tag_list_inline[] = {
     ID_TEXT,
+    // %fontstyle
     ID_TT,
     ID_I,
     ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
     ID_BIG,
     ID_SMALL,
+    ID_U,           // legacy
+    ID_S,           // legacy
+    ID_STRIKE,      // legacy
+    ID_FONT,        // legacy
+    ID_BASEFONT,    // legacy
+    // %phrase
     ID_EM,
     ID_STRONG,
     ID_DFN,
     ID_CODE,
+    ID_Q,
     ID_SAMP,
     ID_KBD,
     ID_VAR,
     ID_CITE,
     ID_ABBR,
     ID_ACRONYM,
-    ID_A,
-    ID_IMG,
-    ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
-    ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
     ID_SUB,
     ID_SUP,
-    ID_SPAN,
-    ID_BDO,
-    ID_IFRAME,
+    // %inline.forms
     ID_INPUT,
     ID_SELECT,
     ID_TEXTAREA,
     ID_LABEL,
     ID_BUTTON,
-    ID_INS,
-    ID_DEL,
-    ID_COMMENT,
-    ID_NOBR,
-    ID_WBR,
-    0
-};
-
-static const ushort tag_list_1[] = {
-    ID_TEXT,
-    ID_P,
-    ID_H1,
-    ID_H2,
-    ID_H3,
-    ID_H4,
-    ID_H5,
-    ID_H6,
-    ID_UL,
-    ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
-    ID_DL,
-    ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
-    ID_NOSCRIPT,
-    ID_NOFRAMES,
-    ID_BLOCKQUOTE,
-    ID_FORM,
-    ID_ISINDEX,
-    ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
-    ID_ADDRESS,
-    ID_TT,
-    ID_I,
-    ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
-    ID_BIG,
-    ID_SMALL,
-    ID_EM,
-    ID_STRONG,
-    ID_DFN,
-    ID_CODE,
-    ID_SAMP,
-    ID_KBD,
-    ID_VAR,
-    ID_CITE,
-    ID_ABBR,
-    ID_ACRONYM,
+    // %special
     ID_A,
+    ID_OBJECT,
     ID_IMG,
     ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
+    ID_IFRAME,
+    ID_EMBED,       // ?
+    // %special.pre
     ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
-    ID_SUB,
-    ID_SUP,
     ID_SPAN,
     ID_BDO,
-    ID_IFRAME,
-    ID_INPUT,
-    ID_KEYGEN,
-    ID_SELECT,
-    ID_TEXTAREA,
-    ID_LABEL,
-    ID_BUTTON,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
+    ID_MAP,
+    // %misc.inline
+    ID_SCRIPT,
     ID_INS,
     ID_DEL,
-    ID_NOBR,
-    ID_WBR,
-    ID_MARQUEE,
+    // non-standard:
+    ID_ILAYER,      // deprecated
+    ID_NOBR,        // ?
+    ID_WBR,         // ?
     0
 };
 
-static const ushort tag_list_2[] = {
-    ID_COMMENT,
+static const ushort tag_list_quirk_inline[] = {
+    ID_NOSCRIPT,    // block, but parsed as inline in Mozilla and MSIE
     0
 };
 
-static const ushort tag_list_3[] = {
-    ID_TEXT,
+static const ushort tag_list_block[] = {
+    ID_TEXT, // white-space is allowed
     ID_P,
+    // %headings
     ID_H1,
     ID_H2,
     ID_H3,
     ID_H4,
     ID_H5,
     ID_H6,
+    // %lists
     ID_UL,
     ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
     ID_DL,
-    ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
-    ID_NOSCRIPT,
-    ID_NOFRAMES,
-    ID_BLOCKQUOTE,
-    ID_FORM,
-    ID_ISINDEX,
+    ID_DIR,         // legacy
+    ID_MENU,        // legacy
+    // %blocktext
+    ID_PRE,
     ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
+    ID_BLOCKQUOTE,
     ID_ADDRESS,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
-    ID_MARQUEE,
-    0
-};
-
-static const ushort tag_list_4[] = {
-    ID_TEXT,
-    ID_PARAM,
-    ID_P,
-    ID_H1,
-    ID_H2,
-    ID_H3,
-    ID_H4,
-    ID_H5,
-    ID_H6,
-    ID_UL,
-    ID_OL,
-    ID_DIR,
-    ID_MENU,
-    ID_PRE,
-    ID_PLAINTEXT,
-    ID_DL,
+    ID_PLAINTEXT,   // ?
+    ID_XMP,         // ?
+    ID_CENTER,      // legacy
+    // other
     ID_DIV,
-    ID_ILAYER,
-    ID_LAYER,
-    ID_CENTER,
+    ID_FIELDSET,
+    ID_TABLE,
     ID_NOSCRIPT,
     ID_NOFRAMES,
-    ID_BLOCKQUOTE,
     ID_FORM,
-    ID_ISINDEX,
-    ID_HR,
-    ID_TABLE,
-    ID_FIELDSET,
-    ID_ADDRESS,
-    ID_TEXT,
-    ID_TT,
-    ID_I,
-    ID_B,
-    ID_U,
-    ID_S,
-    ID_STRIKE,
-    ID_BIG,
-    ID_SMALL,
-    ID_EM,
-    ID_STRONG,
-    ID_DFN,
-    ID_CODE,
-    ID_SAMP,
-    ID_KBD,
-    ID_VAR,
-    ID_CITE,
-    ID_ABBR,
-    ID_ACRONYM,
-    ID_A,
-    ID_IMG,
-    ID_APPLET,
-    ID_OBJECT,
-    ID_EMBED,
-    ID_FONT,
-    ID_BASEFONT,
-    ID_BR,
-    ID_SCRIPT,
-    ID_MAP,
-    ID_Q,
-    ID_SUB,
-    ID_SUP,
-    ID_SPAN,
-    ID_BDO,
-    ID_IFRAME,
-    ID_INPUT,
-    ID_SELECT,
-    ID_TEXTAREA,
-    ID_LABEL,
-    ID_BUTTON,
-    ID_COMMENT,
-    ID_LI,
-    ID_DD,
-    ID_XMP,
-    ID_MARQUEE,
+    ID_ISINDEX,     // legacy
+    // non-standard:
+    ID_LAYER,       // deprecated
+    ID_MARQUEE,     // extension
     0
 };
 
-static const ushort tag_list_6[] = {
-    ID_DT,
+// block elements allowed for quirky error recovery
+static const ushort tag_list_quirk_block[] = {
+    ID_LI,
     ID_DD,
-    ID_COMMENT,
     0
 };
 
@@ -521,7 +371,6 @@
     ID_TEXT,
     ID_OPTGROUP,
     ID_OPTION,
-    ID_COMMENT,
     ID_SCRIPT,
     0
 };
@@ -530,19 +379,19 @@
     ID_FRAMESET,
     ID_FRAME,
     ID_NOFRAMES,
-    ID_COMMENT,
     0
 };
 
+// %head.content
 static const ushort tag_list_11[] = {
     ID_SCRIPT,
     ID_STYLE,
     ID_META,
     ID_LINK,
+    ID_OBJECT,
     ID_TITLE,
-    ID_ISINDEX,
     ID_BASE,
-    ID_COMMENT,
+    ID_ISINDEX,
     0
 };
 
@@ -557,7 +406,23 @@
     return false;
 }
 
+static bool check_block(ushort childID, bool strict)
+{
+    return check_array(childID, tag_list_block) ||
+           (!strict && check_array(childID, tag_list_quirk_block));
+}
 
+static bool check_inline(ushort childID, bool strict)
+{
+    return check_array(childID, tag_list_inline) ||
+           (!strict && check_array(childID, tag_list_quirk_inline));
+}
+
+static bool check_flow(ushort childID, bool strict)
+{
+    return check_block(childID, strict) || check_inline(childID, strict);
+}
+
 bool DOM::checkChild(ushort tagID, ushort childID, bool strict)
 {
     //kdDebug( 6030 ) << "checkChild: " << tagID << "/" << childID << endl;
@@ -567,6 +432,8 @@
     if (tagID >= 1000 || childID >= 1000)
         return true; // one or both of the elements in an XML element; just allow for now
 
+    if (childID == ID_COMMENT) return true;
+
     switch(tagID)
     {
     case ID_TT:
@@ -593,23 +460,27 @@
     case ID_FONT:
     case ID_LEGEND:
     case ID_Q:
-    case ID_A:
     case ID_NOBR:
     case ID_WBR:
-        // _1 *
-        return check_array(childID, tag_list_1) || check_array(childID, tag_list_6);
+        // %inline *
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true));
+    case ID_A:
+        // A: %inline * (but even strict sites expect %flow)
+        return check_flow(childID, true);
     case ID_P:
-        // P: ( _0 | TABLE | NOSCRIPT) *
-        return check_array(childID, tag_list_0) || (!strict && (childID == ID_TABLE || childID == ID_NOSCRIPT));
+        // P: %inline *
+        return check_inline(childID, strict) || 
+               (!strict && childID == ID_TABLE );
     case ID_H1:
     case ID_H2:
     case ID_H3:
     case ID_H4:
     case ID_H5:
     case ID_H6:
-        // _0 *
-        return check_array(childID, tag_list_0) ||
-               (!strict && check_array(childID, tag_list_3) && (childID < ID_H1 || childID > ID_H6));
+        // %inline *
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true) && (childID < ID_H1 || childID > ID_H6));
     case ID_BASEFONT:
     case ID_BR:
     case ID_AREA:
@@ -627,13 +498,16 @@
         // BASEFONT: EMPTY
         return false;
     case ID_BODY:
-        // BODY: _1 * + _2
-        return check_array(childID, tag_list_1) || check_array(childID, tag_list_2);
+        // BODY: %block | SCRIPT (but even strict sites expect %flow)
+        return check_flow(childID, strict);
     case ID_ADDRESS:
-        // ADDRESS: ( _0 | P ) *
-        return check_array(childID, tag_list_0) || childID == ID_P;
+        // ADDRESS: %inline *
+        return check_inline(childID, strict) || 
+               (!strict && childID == ID_P);
     case ID_DT:
-        if ( childID == ID_DL ) return false;
+        // DT: %inline *
+        return check_inline(childID, strict) || 
+              (!strict && check_block(childID, true) && childID != ID_DL);
     case ID_LI:
     case ID_DIV:
     case ID_SPAN:
@@ -651,47 +525,48 @@
     case ID_NOSCRIPT:
     case ID_CAPTION:
     case ID_MARQUEE:
-        // DIV: _1 *
-        return check_array(childID, tag_list_1);
+        // DIV: %flow *
+        return check_flow(childID, strict);
     case ID_MAP:
-	// We accept SCRIPT in client-side image maps as an extension to the DTD.
-        // MAP: ( _3 + | AREA + | SCRIPT + )
-        return check_array(childID, tag_list_3) ||
-            childID == ID_AREA ||
-            childID == ID_SCRIPT;
+        // MAP: ( %block | AREA ) + 
+        return check_block(childID, true) || childID == ID_AREA ||
+               (!strict && childID == ID_SCRIPT);
     case ID_OBJECT:
     case ID_EMBED:
     case ID_APPLET:
-        // OBJECT: _4 *
-        return check_array(childID, tag_list_4);
+        // OBJECT: %flow | PARAM *
+        return check_flow(childID, true) || childID == ID_PARAM;
     case ID_PRE:
     case ID_XMP:
     case ID_PLAINTEXT:
-        // PRE: _0 * - _5
-        return check_array(childID, tag_list_1);
+        // PRE: %flow * - _5
+        return check_flow(childID, true);
     case ID_DL:
-        // DL: _6 +
-        return check_array(childID, tag_list_6) || check_array(childID, tag_list_1);
+        // DL: DT | DD +
+        return (childID == ID_DT || childID == ID_DD || childID == ID_TEXT) || 
+               (!strict && check_flow(childID, true));
     case ID_OL:
     case ID_UL:
         // OL: LI +
-        return check_array(childID, tag_list_1);
+        return (childID == ID_LI || childID == ID_TEXT) || 
+               (!strict && check_flow(childID, true));
     case ID_DIR:
     case ID_MENU:
         // (DIR|MENU): LI + - _3
         if(childID == ID_LI) return true;
         return false;
     case ID_FORM:
-        // FORM: _1 * - FORM
-        return check_array(childID, tag_list_1);
+        // FORM: %flow * - FORM
+        return check_flow(childID, strict);
     case ID_LABEL:
-        // LABEL: _1 * - LABEL
-        return check_array(childID, tag_list_1);
+        // LABEL: %inline * - LABEL
+        return check_inline(childID, strict) ||
+               (!strict && check_block(childID, true));
+    case ID_KEYGEN:
         // KEYGEN does not really allow any children
         // from outside, just need this to be able
         // to add the keylengths ourself
         // Yes, consider it a hack (Dirk)
-    case ID_KEYGEN:
     case ID_SELECT:
         // SELECT: _7 +
         return check_array(childID, tag_list_7);
@@ -708,13 +583,13 @@
         if(childID == ID_TEXT) return true;
         return false;
     case ID_FIELDSET:
-        // FIELDSET: ( TEXT , LEGEND , _1 * )
+        // FIELDSET: ( TEXT , LEGEND , %flow * )
         if(childID == ID_TEXT) return true;
         if(childID == ID_LEGEND) return true;
-        return check_array(childID, tag_list_1);
+        return check_flow(childID, strict);
     case ID_BUTTON:
-        // BUTTON: _1 * - _8
-        return check_array(childID, tag_list_1);
+        // BUTTON: %flow * - _8
+        return check_flow(childID, strict);
     case ID_TABLE:
         // TABLE: ( CAPTION ? , ( COL * | COLGROUP * ) , THEAD ? , TFOOT ? , TBODY + )
         switch(childID)
@@ -755,7 +630,6 @@
         switch(childID)
         {
         case ID_HEAD:
-        case ID_COMMENT:
         case ID_BODY:
         case ID_FRAMESET:
         case ID_NOFRAMES:
Index: khtml/html/htmlparser.cpp
===================================================================
--- khtml/html/htmlparser.cpp	(Revision 552024)
+++ khtml/html/htmlparser.cpp	(Revision 552025)
@@ -371,12 +371,11 @@
         HTMLElementImpl *e;
         bool handled = false;
 
-        // first switch on current element for a elements with optional end-tag
+        // first switch on current element for elements with optional end-tag and inline-only content
         switch(current->id())
         {
         case ID_P:
-        case ID_DD:
-        case ID_LI:
+        case ID_DT:
             if(!n->isInline())
             {
                 popBlock(current->id());

kdelibs-3.5.3-khtml-regression.patch:
 htmltokenizer.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-khtml-regression.patch ---
--- kdelibs-3.5.3/khtml/html/htmltokenizer.cpp.orig	2006-06-24 15:12:38.000000000 +0200
+++ kdelibs-3.5.3/khtml/html/htmltokenizer.cpp	2006-06-24 15:14:08.000000000 +0200
@@ -388,9 +388,10 @@
 
     // Scripts following a frameset element should not be executed or even loaded in the case of extern scripts.
     bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->id() == ID_FRAMESET);
+    bool effectiveScript = !parser->skipMode() && !followingFrameset; 
     bool deferredScript = false;
 
-    if ( !parser->skipMode() && !followingFrameset) {
+    if ( effectiveScript ) { 
         CachedScript* cs = 0;
 
         // forget what we just got, load from src url instead
@@ -419,7 +420,7 @@
     script = false;
     scriptCodeSize = scriptCodeResync = 0;
 
-    if (parser->skipMode() || followingFrameset)
+    if ( !effectiveScript )
         return;
 
     if ( !m_executingScript && cachedScript.isEmpty() ) {

kdelibs-3.5.3.diff:
 kcrash.cpp   |    7 +++++--
 kprocess.cpp |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.3.diff ---
Patch102: kdelibs-3.5.3.diff
------------------------------------------------------------------------
r549079 | mueller | 2006-06-07 13:18:16 +0200 (Wed, 07 Jun 2006) | 2 lines

add safety checks for set*uid return values

------------------------------------------------------------------------
Index: kdecore/kprocess.cpp
===================================================================
--- kdecore/kprocess.cpp	(revision 549078)
+++ kdecore/kprocess.cpp	(revision 549079)
@@ -387,7 +387,10 @@ bool KProcess::start(RunMode runmode, Co
            if (pw)
               initgroups(pw->pw_name, pw->pw_gid);
 #endif
-           setuid(getuid());
+	   if (geteuid() != getuid())
+	       setuid(getuid());
+	   if (geteuid() != getuid())
+	       _exit(1);
         }
 
         setupEnvironment();
Index: kdecore/kcrash.cpp

===================================================================
--- kdecore/kcrash.cpp	(revision 549078)
+++ kdecore/kcrash.cpp	(revision 549079)
 com
iapply upstream patches
  kdlel	.s	
  pid_t pid = fork();
   - apply upstream patches
if (pid <= 0)
   {
-    setgid(getgid());
-    setuid(getuid());
+    if(!geteuid() && setgid(getgid()) < 0)
+      _exit(253);
+    if(!geteuid() && setuid(getuid()) < 0)
+      _exit(253);
     execvp("drkonqi", const_cast< char** >( argv ));
+    _exit(errno);
   }
   else
   {ireturn-check


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdelibs.spec	14 Jun 2006 10:08:35 -0000	1.133
+++ kdelibs.spec	4 Jul 2006 21:56:02 -0000	1.134
@@ -1,4 +1,4 @@
-%define redhatify 1
+%define distname "Fedora-Core"
 
 %define debug 0
 %define final 1
@@ -7,7 +7,7 @@
 %define arts_epoch 8
 %define cups_epoch 1
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define arts_version 1.5.3
 %define kde_major_version 3
 
@@ -16,22 +16,17 @@
 %define make_cvs 0
 %define fam 1
 %define dnotify 1
-%define pcre 1
-%define alsa 1
-%define pie 1
 %define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 0.2.fc5
+Release: 0.3.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
 Epoch: 6
 Group: System Environment/Libraries
 License: LGPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
@@ -56,6 +51,16 @@
 
 # upstream patches
 Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+Patch101: kdelibs-3.5.3-khtml-regression.patch
+Patch102: kdelibs-3.5.3.diff
+Patch103: kdelibs-3.5.3-kde#57159.patch
+Patch104: kdelibs-3.5.3-kde#118277.patch
+Patch105: kdelibs-3.5.3-kde#123315.patch
+Patch106: kdelibs-3.5.3-kde#65546.patch
+Patch107: kdelibs-3.5.3-kde#128842.patch
+Patch108: kdelibs-3.5.3-kde#128902.patch
+Patch109: kdelibs-3.5.3-kde#67849.patch
+Patch110: kdelibs-3.5.3-kde#81806.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -63,28 +68,22 @@
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: iceauth
-
-%if %{redhatify}
 Requires: desktop-backgrounds-basic
 Requires: redhat-artwork >= 0.239-2
 Requires: hicolor-icon-theme
 Requires: redhat-menus >= 5.0.4
-%endif
-
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): desktop-file-utils
-Requires: fileutils
+Requires(pre): coreutils
+Requires(post): /sbin/ldconfig
+Requires(post): desktop-file-utils
+Requires(postun): /sbin/ldconfig
+Requires(postun): desktop-file-utils
 Requires: shadow-utils
-Requires: dev
 
 %if %{fam}
 BuildRequires: fam-devel
 %endif
 
-%if %{pcre}
 BuildRequires: pcre-devel
-%endif
-
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20
 BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: flex >= 2.5.4a-13
@@ -109,14 +108,18 @@
 BuildRequires: byacc
 BuildRequires: libart_lgpl-devel >= 2.3.8
 BuildRequires: bzip2-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: pkgconfig
-BuildRequires: autoconf automake
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libacl-devel
 BuildRequires: libattr-devel
 BuildRequires: aspell-devel
+BuildRequires: krb5-devel
+BuildRequires: openldap-devel
+BuildRequires: db4-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: pkgconfig
+
 Obsoletes: %{name}2
 Obsoletes: kdesupport
 Obsoletes: kdoc
@@ -148,9 +151,8 @@
 %if %{fam}
 Requires: fam-devel
 %endif
-%if %{pcre}
 Requires: pcre-devel
-%endif
+
 Obsoletes: kdesupport-devel
 
 %description devel
@@ -161,7 +163,7 @@
 Group: Development/Documentation
 Summary: KDE API documentation.
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: kdelibs-docs
+Obsoletes: kdelibs-docs < %{epoch}:%{version}-%{release}
 
 %description apidocs
 This package includes the KDE API documentation in HTML
@@ -190,54 +192,31 @@
 
 # upstream patches
 %patch100 -p1 -b .konqueror-khtml
+%patch101 -p1 -b .khtml-regression
+%patch102 -p0 -b .return-check
+%patch103 -p0 -b .kde#57159
+%patch104 -p0 -b .kde#118277
+%patch105 -p0 -b .kde#123315
+%patch106 -p0 -b .kde#65546
+%patch107 -p0 -b .kde#128842
+%patch108 -p0 -b .kde#128902
+%patch109 -p0 -b .kde#67849
+%patch110 -p0 -b .kde#81806
 
-# add redhat into KDE_VERSION_STRING
-%if %{redhatify}
-   perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
-%endif
+perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
-export QTDOC=%{qtdocdir}
 unset QTDIR && . /etc/profile.d/qt.sh
+
+export QTDOC=%{qtdocdir}
 export libltdl_cv_shlibext=".so"
+export PATH=/usr/kerberos/bin:${PATH}
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
-# set some default FLAGS
-FLAGS="$RPM_OPT_FLAGS"
-
-%if %{debug}
-   FLAGS="-O0"
-%endif
-
-# workaround for compiler bug on ia64, will be removed later
-%ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
-%endif
-
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export QTLIB=$QTDIR/lib
-
-if pkg-config openssl ; then
-   export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
-   export CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`"
-   export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
-   export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
-fi
-
-# Check which version/distribution we are...
-%if %{redhatify}
-   VERSION=`cat /etc/redhat-release 2>/dev/null |awk '{ print $5; }'`
-   if [ -z "$VERSION" -o -z "echo $VERSION |sed -e 's,[0-9]*,,g;s,\.,,g'" ]; then
-      VERSION="A Red Hat Linux-based distribution"
-   else
-      VERSION="Red Hat Linux $VERSION"
-   fi
-%endif
+VERSION=`cat /etc/redhat-release 2>/dev/null`
 
 suffix=""
 if [ "%{_lib}" == "lib64" ] ; then
@@ -252,21 +231,13 @@
    --enable-cups \
    --enable-mitshm \
    --with-xinerama \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{pie}
    --enable-pie \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
-%if %{redhatify}
    --with-distribution="$VERSION" \
-%endif 
-%if %{alsa}
    --with-alsa \
-%endif
    --includedir=%{_includedir}/kde \
 %if %{debug} == 0
    --disable-debug \
@@ -281,9 +252,6 @@
 %if %{dnotify}
    --enable-dnotify \
 %endif
-%if %{pcre} == 0
-   --disable-pcre \
-%endif
    --disable-rpath \
    --with-rgbfile=%{_datadir}/X11/rgb.txt
 
@@ -297,22 +265,22 @@
 make apidox
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/services/
+chmod a+x %{buildroot}%{_libdir}/*
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/
 
-pushd $RPM_BUILD_ROOT%{_docdir}
+pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
 
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
 
 # Make symlinks relative
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en
+pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
@@ -321,17 +289,16 @@
 done
 popd
 
-%if %{redhatify}
-   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
-      mv applications.menu kde-applications.menu
-      ln -s applications-merged kde-applications-merged
-   popd
-   echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
-   rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
-%endif
+mkdir -p %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
+pushd %{buildroot}%{_sysconfdir}/xdg/menus/
+   mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
+   ln -s applications-merged kde-applications-merged
+popd
+echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %pre
 if [ -d /etc/skel/Desktop/Autostart ]; then
@@ -345,7 +312,7 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
@@ -353,19 +320,78 @@
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/crystalsvg || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
-/etc/profile.d/*
-/etc/xdg/menus/*
-%{_bindir}/*
+%dir %{_sysconfdir}/xdg.d
+%dir %{_sysconfdir}/xdg.d/kde
+%dir %{_sysconfdir}/xdg.d/kde/menus
+%config(noreplace) %{_sysconfdir}/profile.d/*
+%{_sysconfdir}/xdg/menus/*
+%{_sysconfdir}/xdg.d/kde/menus/*
+%{_bindir}/artsmessage
+%{_bindir}/checkXML
+%{_bindir}/cupsdconf
+%{_bindir}/cupsdoprint
+%{_bindir}/dcop
+%{_bindir}/dcopclient
+%{_bindir}/dcopfind
+%{_bindir}/dcopobject
+%{_bindir}/dcopquit
+%{_bindir}/dcopref
+%{_bindir}/dcopserver
+%{_bindir}/dcopserver_shutdown
+%{_bindir}/dcopstart
+%{_bindir}/filesharelist
+%{_bindir}/fileshareset
+%{_bindir}/imagetops
+%{_bindir}/kab2kabc
+%{_bindir}/kaddprinterwizard
+%{_bindir}/kbuildsycoca
+%{_bindir}/kcmshell
+%{_bindir}/kconf_update
+%{_bindir}/kconfig_compiler
+%{_bindir}/kcookiejar
+%{_bindir}/kde-config
+%{_bindir}/kde-menu
+%{_bindir}/kded
+%{_bindir}/kdeinit
+%{_bindir}/kdeinit_shutdown
+%{_bindir}/kdeinit_wrapper
+%{_bindir}/kdesu_stub
+%{_bindir}/kdontchangethehostname
+%{_bindir}/kdostartupconfig
+%{_bindir}/kfile
+%{_bindir}/kfmexec
+%{_bindir}/khotnewstuff
+%{_bindir}/kinstalltheme
+%{_bindir}/kio_http_cache_cleaner
+%{_bindir}/kio_uiserver
+%{_bindir}/kioexec
+%{_bindir}/kioslave
+%{_bindir}/klauncher
+%{_bindir}/kmailservice
+%{_bindir}/ksendbugmail
+%{_bindir}/kshell
+%{_bindir}/kstartupconfig
+%{_bindir}/ksvgtopng
+%{_bindir}/ktelnetservice
+%{_bindir}/ktradertest
+%{_bindir}/kunittestmodrunner
+%{_bindir}/kwrapper
+%{_bindir}/lnusertemp
+%{_bindir}/make_driver_db_cups
+%{_bindir}/make_driver_db_lpr
+%{_bindir}/makekdewidgets
+%{_bindir}/meinproc
+%{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %attr(4755,root,root) %{_bindir}/kgrantpty
-%exclude %{_bindir}/dcopidl*
-%{_libdir}/lib*
+%{_libdir}/lib*.so*
+%{_libdir}/lib*.la
 %{_libdir}/kde3
 %{_datadir}/applications
 %{_datadir}/apps
@@ -388,6 +414,7 @@
 %defattr(-,root,root)
 %{_bindir}/dcopidl*
 %{_includedir}/kde
+%{_libdir}/lib*.a
 
 %files apidocs
 %defattr(-,root,root)
@@ -395,6 +422,12 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
+- apply upstream patches,
+   fix #128940/#81806/#57159/#118277/#123315/#65546/#128842/#128902/#67849/#81806
+- fix #196013, mark kde.sh/kde.csh as config file
+- fix #178323 #196225, typo in kde.sh
+
 * Wed Jun 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc5
 - apply patch to fix crash in konqueror
 



From fedora-cvs-commits at redhat.com  Tue Jul  4 22:06:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 18:06:32 -0400
Subject: rpms/kdelibs/FC-5 kde.sh,1.2,1.3
Message-ID: <200607042206.k64M6WLG016375@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde.sh 
Log Message:
- fix #178323 #196225, typo in kde.sh



Index: kde.sh
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kde.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde.sh	23 May 2006 14:15:55 -0000	1.2
+++ kde.sh	4 Jul 2006 22:06:27 -0000	1.3
@@ -1,14 +1,11 @@
 # When/if using prelinking, avoids (some) use of kdeinit
 if [ -f /etc/sysconfig/prelink ] ; then
    source /etc/sysconfig/prelink
-   if [ "$PRELINKING" == yes ] ; then
+   if [ "$PRELINKING" = yes ] ; then
       [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
    fi
 fi
 
-# if not using IP6, speeds DNS operations
-# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
-
 # Make sure KDEDIR is set
 [ -z "$KDEDIR" ] && KDEDIR="/usr"
 export KDEDIR



From fedora-cvs-commits at redhat.com  Tue Jul  4 22:25:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 18:25:54 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.283,1.284
Message-ID: <200607042225.k64MPsUE005269@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Log Message:
Fix tomcat symlinks.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- eclipse.spec	4 Jul 2006 21:27:47 -0000	1.283
+++ eclipse.spec	4 Jul 2006 22:25:52 -0000	1.284
@@ -584,6 +584,17 @@
 rm plugins/org.eclipse.tomcat/naming-common.jar
 rm plugins/org.eclipse.tomcat/servlets-common.jar
 rm plugins/org.eclipse.tomcat/tomcat-http11.jar
+rm plugins/org.eclipse.tomcat/bootstrap.jar
+rm plugins/org.eclipse.tomcat/catalina.jar
+rm plugins/org.eclipse.tomcat/jasper-compiler.jar
+rm plugins/org.eclipse.tomcat/jasper-runtime.jar
+rm plugins/org.eclipse.tomcat/mx4j-jmx.jar
+rm plugins/org.eclipse.tomcat/naming-resources.jar
+rm plugins/org.eclipse.tomcat/naming-factory.jar
+rm plugins/org.eclipse.tomcat/servlets-default.jar
+rm plugins/org.eclipse.tomcat/servlets-invoker.jar
+rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
+rm plugins/org.eclipse.tomcat/tomcat-util.jar
 ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
 ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
 ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
@@ -601,6 +612,7 @@
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+mkdir -p plugins/org.eclipse.tomcat/lib
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
@@ -666,7 +678,7 @@
   fi
 done
 if [ ! -z "$JARS" ]; then
-    echo "These jar should be deleted and syslinked to system jars: $JARS"
+    echo "These jar should be deleted and symlinked to system jars: $JARS"
    #FIXME: enable  exit 1
 fi
 
@@ -1612,6 +1624,9 @@
 %endif
 
 %changelog
+* Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
+- Fix tomcat symlinks. 
+
 * Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - 3.2.0.
 - Remove Provides:  eclipse-sdk from eclipse-platform.



From fedora-cvs-commits at redhat.com  Tue Jul  4 23:17:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 19:17:03 -0400
Subject: rpms/kernel/devel linux-2.6-cell-mambo-drivers.patch,1.3,1.4
Message-ID: <200607042317.k64NH3aE016136@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-cell-mambo-drivers.patch 
Log Message:
devfs is dead.


linux-2.6-cell-mambo-drivers.patch:
 arch/powerpc/Kconfig              |   21 ++
 b/drivers/block/mambo_bd.c        |  285 +++++++++++++++++++++++++++
 b/drivers/net/mambonet.c          |  392 ++++++++++++++++++++++++++++++++++++++
 b/include/asm-powerpc/systemsim.h |  130 ++++++++++++
 drivers/block/Makefile            |    1 
 drivers/net/Makefile              |    1 
 include/asm-powerpc/processor.h   |   17 +
 include/linux/root_dev.h          |    3 
 8 files changed, 850 insertions(+)

Index: linux-2.6-cell-mambo-drivers.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-mambo-drivers.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-cell-mambo-drivers.patch	12 Dec 2005 16:32:56 -0000	1.3
+++ linux-2.6-cell-mambo-drivers.patch	4 Jul 2006 23:17:00 -0000	1.4
@@ -40,7 +40,7 @@
  obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
 --- /dev/null
 +++ b/drivers/block/mambo_bd.c
-@@ -0,0 +1,291 @@
+@@ -0,0 +1,285 @@
 +/*
 + *  Bogus Block Driver for PowerPC Full System Simulator
 + *
@@ -89,8 +89,6 @@
 +
 +#include <asm/systemsim.h>
 +
-+#include <linux/devfs_fs_kernel.h>
-+
 +#include <asm/uaccess.h>
 +#include <asm/types.h>
 +
@@ -291,7 +289,6 @@
 +	printk("mambo bogus disk: compiled in with kernel\n");
 +#endif
 +
-+	devfs_mk_dir("mambobd");
 +	for (i = 0; i < MAX_MBD; i++) {	/* load defaults */
 +		struct gendisk *disk = mbd_dev[i].disk;
 +		mbd_dev[i].initialized = 0;
@@ -302,7 +299,6 @@
 +		disk->fops = &mbd_fops;
 +		disk->private_data = &mbd_dev[i];
 +		sprintf(disk->disk_name, "mambobd%d", i);
-+		sprintf(disk->devfs_name, "mambobd%d", i);
 +		set_capacity(disk, 0x7ffffc00ULL << 1);	/* 2 TB */
 +		add_disk(disk);
 +	}
@@ -319,8 +315,6 @@
 +
 +static void __exit mbd_cleanup(void)
 +{
-+	devfs_remove("mambobd");
-+
 +	if (unregister_blkdev(MAJOR_NR, "mbd") != 0)
 +		printk("mbd: cleanup_module failed\n");
 +	else



From fedora-cvs-commits at redhat.com  Wed Jul  5 02:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 4 Jul 2006 22:24:58 -0400
Subject: rpms/libsepol/devel .cvsignore, 1.101, 1.102 libsepol.spec, 1.133,
	1.134 sources, 1.102, 1.103
Message-ID: <200607050224.k652OwTs031484@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31409

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.12.19-1
- Upgrade to latest from NSA
	* Lindent.
	* Merged optionals in base take 2 patch set from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	5 Jun 2006 18:48:30 -0000	1.101
+++ .cvsignore	5 Jul 2006 02:24:55 -0000	1.102
@@ -101,3 +101,4 @@
 libsepol-1.12.12.tgz
 libsepol-1.12.14.tgz
 libsepol-1.12.17.tgz
+libsepol-1.12.19.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- libsepol.spec	14 Jun 2006 00:41:22 -0000	1.133
+++ libsepol.spec	5 Jul 2006 02:24:55 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.12.17
-Release: 2
+Version: 1.12.19
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -81,6 +81,11 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.12.19-1
+- Upgrade to latest from NSA
+	* Lindent.
+	* Merged optionals in base take 2 patch set from Joshua Brindle.
+
 * Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> 1.12.17-2
 - bump so it's newer than the FC5 version
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	5 Jun 2006 18:48:30 -0000	1.102
+++ sources	5 Jul 2006 02:24:55 -0000	1.103
@@ -1 +1 @@
-82e10111a5b6a0c400e52cdfe500e008  libsepol-1.12.17.tgz
+6526553bc469ddf37e0af1fe2864ceaf  libsepol-1.12.19.tgz



From fedora-cvs-commits at redhat.com  Wed Jul  5 04:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 00:38:59 -0400
Subject: rpms/shared-mime-info/devel .cvsignore, 1.10,
	1.11 shared-mime-info.spec, 1.40, 1.41 sources, 1.10, 1.11
Message-ID: <200607050438.k654cxAP006097@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6084

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Wed Jul  5 2006 Kristian H??gsberg <krh at redhat.com> - 0.18-1
- Update to 0.18 and drop backported patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Mar 2006 21:11:06 -0000	1.10
+++ .cvsignore	5 Jul 2006 04:38:48 -0000	1.11
@@ -1,2 +1 @@
-shared-mime-info-0.16.cvs20060212.tar.gz
-shared-mime-info-0.17.tar.gz
+shared-mime-info-0.18.tar.gz


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- shared-mime-info.spec	29 Jun 2006 20:59:38 -0000	1.40
+++ shared-mime-info.spec	5 Jul 2006 04:38:48 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.17
-Release: 3
+Version: 0.18
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -11,9 +11,6 @@
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4675 
 Patch1: shared-mime-info-0.16-fonts.patch
-# fixed in upstream cvs
-Patch2: shared-mime-info-0.17-postscript.patch
-Patch3: shared-mime-info-0.17-pdf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
@@ -34,8 +31,6 @@
 %setup -q
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
-%patch2 -p1 -b .postscript
-%patch3 -p0 -b .pdf
 %build
 
 %configure --disable-update-mimedb
@@ -68,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul  5 2006 Kristian H??gsberg <krh at redhat.com> - 0.18-1
+- Update to 0.18 and drop backported patches.
+
 * Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.17-3
 - Adding PDF fix backported from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Mar 2006 21:11:06 -0000	1.10
+++ sources	5 Jul 2006 04:38:48 -0000	1.11
@@ -1 +1 @@
-f1014ad243b5245279c0abe1b95d9e38  shared-mime-info-0.17.tar.gz
+63398294a078dd9f72a7c4e122a668c8  shared-mime-info-0.18.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 05:02:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 01:02:45 -0400
Subject: rpms/shared-mime-info/FC-5 .cvsignore, 1.10,
	1.11 shared-mime-info.spec, 1.40, 1.41 sources, 1.10, 1.11
Message-ID: <200607050502.k6552jlV021651@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/shared-mime-info/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21624

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Wed Jul  5 2006 Kristian H??gsberg <krh at redhat.com> - 0.18-1.fc5.1
- Update to 0.18 and drop backported patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Mar 2006 21:11:06 -0000	1.10
+++ .cvsignore	5 Jul 2006 05:02:40 -0000	1.11
@@ -1,2 +1 @@
-shared-mime-info-0.16.cvs20060212.tar.gz
-shared-mime-info-0.17.tar.gz
+shared-mime-info-0.18.tar.gz


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/shared-mime-info.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- shared-mime-info.spec	23 Jun 2006 21:57:53 -0000	1.40
+++ shared-mime-info.spec	5 Jul 2006 05:02:40 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.17
-Release: 1.fc5.2
+Version: 0.18
+Release: 1.fc5.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -10,10 +10,6 @@
 Patch0: shared-mime-info-0.16-cisco-vpn.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4675 
 Patch1: shared-mime-info-0.16-fonts.patch
-# fixed in upstream cvs
-Patch2: shared-mime-info-0.17-postscript.patch
-# Bug #190858
-Patch3: shared-mime-info-0.17-pdf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
@@ -33,8 +29,6 @@
 %setup -q
 %patch0 -p0 -b .cisco-vpn
 %patch1 -p1 -b .fonts
-%patch2 -p1 -b .postscript
-%patch3 -p0 -b .pdf
 
 %build
 
@@ -68,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul  5 2006 Kristian H??gsberg <krh at redhat.com> - 0.18-1.fc5.1
+- Update to 0.18 and drop backported patches.
+
 * Fri Jun 23 2006 Adam Jackson <ajackson at redhat.com> - 0.17-1.fc5.2
 - Backport upstream change to fix PDFs in mozplugger.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Mar 2006 21:11:06 -0000	1.10
+++ sources	5 Jul 2006 05:02:40 -0000	1.11
@@ -1 +1 @@
-f1014ad243b5245279c0abe1b95d9e38  shared-mime-info-0.17.tar.gz
+63398294a078dd9f72a7c4e122a668c8  shared-mime-info-0.18.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 05:34:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 01:34:43 -0400
Subject: rpms/scim-hangul/devel scim-hangul-0.2.2-help.patch, NONE,
	1.1 scim-hangul.spec, 1.18, 1.19
Message-ID: <200607050534.k655YhfX022335@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22296

Modified Files:
	scim-hangul.spec 
Added Files:
	scim-hangul-0.2.2-help.patch 
Log Message:
* Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-5
- add a keybindings documentation into the online help. (#186884)
- use dist tag.

scim-hangul-0.2.2-help.patch:
 scim_hangul_imengine.cpp |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE scim-hangul-0.2.2-help.patch ---
diff -ruN -x Makefile -x Makefile.in -x 'config*' -x autom4te.cache -x .deps -x .libs -x '*a' -x '*o' -x libtool -x 'stamp*' -x '*spec' -x '*~' scim-hangul-0.2.2.orig/src/scim_hangul_imengine.cpp scim-hangul-0.2.2/src/scim_hangul_imengine.cpp
--- scim-hangul-0.2.2.orig/src/scim_hangul_imengine.cpp	2006-07-04 20:18:24.000000000 +0900
+++ scim-hangul-0.2.2/src/scim_hangul_imengine.cpp	2006-07-05 14:22:52.000000000 +0900
@@ -159,7 +159,22 @@
 WideString
 HangulFactory::get_help () const
 {
-    return WideString ();
+    const char *header =
+	_("Key bindings:\n\n");
+    const char *paragraph1 =
+	_("  On/Off toggle key: Alt_R, Shift+space\n"
+	  "    This key binding is to switch the input mode between the ASCII input\n"
+	  "    mode and the hangul input.\n"
+	  "    on the default key bindings, it will be effected by tapping\n"
+	  "    the right Alt key or press the Space key with holding the Shift key.\n\n");
+    const char *paragraph2 =
+	_("  Hangul Hanja key: Control_R, F9\n"
+	  "    This key binding is to convert a hangul character to a hanja character.\n"
+	  "    it will be effected by tapping the right Control key or press F9 key.\n\n");
+
+    return utf8_mbstowcs (header)
+	+ utf8_mbstowcs (paragraph1)
+	+ utf8_mbstowcs (paragraph2);
 }
 
 String


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-hangul.spec	25 Jun 2006 13:21:24 -0000	1.18
+++ scim-hangul.spec	5 Jul 2006 05:34:36 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        4.fc6
+Release:        5{?dist}
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -13,6 +13,7 @@
 %endif
 Source0:        http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz
 Patch0:		scim-hangul-0.2.2-ascii-mode.patch
+Patch1:		scim-hangul-0.2.2-help.patch
 
 
 Summary:        Hangul Input Method Engine for SCIM
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .0-ascii-mode
+%patch1 -p1 -b .1-help
 
 
 %build
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-5
+- add a keybindings documentation into the online help. (#186884)
+- use dist tag.
+
 * Fri Jun  9 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-4
 - gettextized the input layout string on panel. (#194444)
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 05:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 01:36:22 -0400
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.19,1.20
Message-ID: <200607050536.k655aM7h022743@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22707

Modified Files:
	scim-hangul.spec 
Log Message:



Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scim-hangul.spec	5 Jul 2006 05:34:36 -0000	1.19
+++ scim-hangul.spec	5 Jul 2006 05:36:19 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        5{?dist}
+Release:        5%{?dist}
 
 License:        GPL
 URL:            http://www.scim-im.org/



From fedora-cvs-commits at redhat.com  Wed Jul  5 05:57:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 01:57:46 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.16,1.17
Message-ID: <200607050557.k655vkb7012464@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12423

Modified Files:
	redhat-lsb.spec 
Log Message:
new updated spec file for LSB-3.1


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- redhat-lsb.spec	11 Feb 2006 05:31:23 -0000	1.16
+++ redhat-lsb.spec	5 Jul 2006 05:57:43 -0000	1.17
@@ -1,5 +1,5 @@
-# Define this to link to which library version
-%define lsbsover 3
+# Define this to link to which library version  eg. /lib64/ld-lsb-x86-64.so.3
+%define lsbsover 3 
 
 %ifarch %{ix86}
 %define ldso ld-linux.so.2
@@ -43,15 +43,14 @@
 %endif
 
 %define lsbrelver 2.0
-%define srcrelease 1
+%define srcrelease 2
 
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.0
-Release: 9.2
+Release: 10
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
-Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{lsbrelver}.tar.gz
 Patch0: lsb-release-2.0-disable-etc-lsb-release.patch
 License: GPL
 Group: System Environment/Base
@@ -89,100 +88,127 @@
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
+Requires: libz.so.1
+Requires: libutil.so.1
+Requires: libpthread.so.0
+Requires: libncurses.so.5
+Requires: libm.so.6
+Requires: libgcc_s.so.1
+Requires: libdl.so.2
 Requires: libcrypt.so.1
 Requires: libc.so.6
-Requires: libdl.so.2
-Requires: libgcc_s.so.1
-Requires: libm.so.6
-Requires: libpthread.so.0
+Requires: libstdc++.so.6
 %endif
 
 %ifarch ia64
 # archLSB IA64 Base Libraries
+Requires: libz.so.1()(64bit)
+Requires: libutil.so.1()(64bit)
+Requires: libpthread.so.0()(64bit)
+Requires: libncurses.so.5()(64bit)
+Requires: libm.so.6.1()(64bit)
+Requires: libgcc_s.so.1()(64bit)
+Requires: libdl.so.2()(64bit)
 Requires: libcrypt.so.1()(64bit)
 Requires: libc.so.6.1()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libm.so.6.1()(64bit)
-Requires: libpthread.so.0()(64bit)
+Requires: libstdc++.so.6()(64bit)
 %endif
 
 %ifarch ppc
 # archLSB PPC32 Base Libraries
+Requires: libz.so.1
+Requires: libutil.so.1
+Requires: libpthread.so.0
+Requires: libncurses.so.5
+Requires: libm.so.6
+Requires: libgcc_s.so.1
+Requires: libdl.so.2
 Requires: libcrypt.so.1
 Requires: libc.so.6
-Requires: libdl.so.2
-Requires: libgcc_s.so.1
-Requires: libm.so.6
-Requires: libpthread.so.0
+Requires: libstdc++.so.6
 %endif
 
 %ifarch ppc64
 # archLSB PPC64 Base Libraries
+Requires: libz.so.1()(64bit)
+Requires: libutil.so.1()(64bit)
+Requires: libpthread.so.0()(64bit)
+Requires: libncurses.so.5()(64bit)
+Requires: libm.so.6()(64bit)
+Requires: libgcc_s.so.1()(64bit)
+Requires: libdl.so.2()(64bit)
 Requires: libcrypt.so.1()(64bit)
 Requires: libc.so.6()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libm.so.6()(64bit)
-Requires: libpthread.so.0()(64bit)
+Requires: libstdc++.so.6()(64bit)
 %endif
 
 %ifarch s390
 # archLSB S390 Base Libraries
+Requires: libz.so.1
+Requires: libutil.so.1
+Requires: libpthread.so.0
+Requires: libncurses.so.5
+Requires: libm.so.6
+Requires: libgcc_s.so.1
+Requires: libdl.so.2
 Requires: libcrypt.so.1
 Requires: libc.so.6
-Requires: libdl.so.2
-Requires: libgcc_s.so.1
-Requires: libm.so.6
-Requires: libpthread.so.0
+Requires: libstdc++.so.6
 %endif
 
 %ifarch s390x
 # archLSB S390X Base Libraries
+Requires: libz.so.1()(64bit)
+Requires: libutil.so.1()(64bit)
+Requires: libpthread.so.0()(64bit)
+Requires: libncurses.so.5()(64bit)
+Requires: libm.so.6()(64bit)
+Requires: libgcc_s.so.1()(64bit)
+Requires: libdl.so.2()(64bit)
 Requires: libcrypt.so.1()(64bit)
 Requires: libc.so.6()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libm.so.6()(64bit)
-Requires: libpthread.so.0()(64bit)
+Requires: libstdc++.so.6()(64bit)
 %endif
 
 %ifarch x86_64
 # archLSB AMD64 Base Libraries
+Requires: libz.so.1()(64bit)
+Requires: libutil.so.1()(64bit)
+Requires: libpthread.so.0()(64bit)
+Requires: libncurses.so.5()(64bit)
+Requires: libm.so.6()(64bit)
+Requires: libgcc_s.so.1()(64bit)
+Requires: libdl.so.2()(64bit)
 Requires: libcrypt.so.1()(64bit)
 Requires: libc.so.6()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libm.so.6()(64bit)
-Requires: libpthread.so.0()(64bit)
+Requires: libstdc++.so.6()(64bit)
 %endif
 
-# gLSB Base Libraries
+# gLSB Base/Utility/Stdc++/Graphics Libraries
+Requires: libz.so.1%{qual}
+Requires: libutil.so.1%{qual}
+Requires: librt.so.1%{qual}
 Requires: libpthread.so.0%{qual}
+Requires: libpam.so.0%{qual}
+Requires: libncurses.so.5%{qual}
 Requires: libgcc_s.so.1%{qual}
 Requires: libdl.so.2%{qual}
-Requires: librt.so.1%{qual}
 Requires: libcrypt.so.1%{qual}
-Requires: libpam.so.0%{qual}
-
-# LSB Base C++
 Requires: libstdc++.so.6%{qual}
-
-# gLSB Utility Libraries
-Requires: libz.so.1%{qual}
-Requires: libncurses.so.5%{qual}
-Requires: libutil.so.1%{qual}
-
-# gLSB Graphics Libraries
+Requires: libXt.so.6%{qual}
+Requires: libXi.so.6%{qual}
+Requires: libXext.so.6%{qual}
 Requires: libX11.so.6%{qual}
 Requires: libSM.so.6%{qual}
 Requires: libICE.so.6%{qual}
-Requires: libXt.so.6%{qual}
-Requires: libXext.so.6%{qual}
-Requires: libXi.so.6%{qual}
 Requires: libGL.so.1%{qual}
 
+#@GLSB_UTILLIB@
+
+#@GLSB_GRAPHLIB@
+
 # gLSB Command and Utilities
+Requires: /bin/awk
 Requires: /bin/basename
 Requires: /bin/cat
 Requires: /bin/chgrp
@@ -190,6 +216,7 @@
 Requires: /bin/chown
 Requires: /bin/cp
 Requires: /bin/cpio
+Requires: /bin/cut
 Requires: /bin/date
 Requires: /bin/dd
 Requires: /bin/df
@@ -197,14 +224,18 @@
 Requires: /bin/echo
 Requires: /bin/ed
 Requires: /bin/egrep
+Requires: /bin/env
 Requires: /bin/false
 Requires: /bin/fgrep
+Requires: /bin/gettext
 Requires: /bin/grep
+Requires: /bin/gunzip
+Requires: /bin/gzip
 Requires: /bin/hostname
+Requires: /bin/kill
 Requires: /bin/ln
 Requires: /bin/ls
-#Requires: /bin/mailx
-Requires: mailx
+Requires: /bin/mailx
 Requires: /bin/mkdir
 Requires: /bin/mknod
 Requires: /bin/mktemp
@@ -234,7 +265,6 @@
 Requires: /usr/bin/[
 Requires: /usr/bin/ar
 Requires: /usr/bin/at
-Requires: /usr/bin/awk
 Requires: /usr/bin/batch
 Requires: /usr/bin/bc
 Requires: /usr/bin/chfn
@@ -245,11 +275,9 @@
 Requires: /usr/bin/comm
 Requires: /usr/bin/crontab
 Requires: /usr/bin/csplit
-Requires: /usr/bin/cut
 Requires: /usr/bin/diff
 Requires: /usr/bin/dirname
 Requires: /usr/bin/du
-Requires: /usr/bin/env
 Requires: /usr/bin/expand
 Requires: /usr/bin/expr
 Requires: /usr/bin/file
@@ -257,10 +285,7 @@
 Requires: /usr/bin/fold
 Requires: /usr/bin/gencat
 Requires: /usr/bin/getconf
-Requires: /usr/bin/gettext
 Requires: /usr/bin/groups
-Requires: /usr/bin/gunzip
-Requires: /usr/bin/gzip
 Requires: /usr/bin/head
 Requires: /usr/bin/iconv
 Requires: /usr/bin/id
@@ -268,7 +293,6 @@
 Requires: /usr/bin/ipcrm
 Requires: /usr/bin/ipcs
 Requires: /usr/bin/join
-Requires: /usr/bin/kill
 Requires: /usr/bin/killall
 Requires: /usr/bin/locale
 Requires: /usr/bin/localedef
@@ -327,7 +351,7 @@
 
 %prep
 %setup -q -a 1
-%patch0 -p 0 
+%patch0 -p 0
 
 %build
 cd lsb-release-%{lsbrelver}
@@ -342,10 +366,10 @@
 cd lsb-release-%{lsbrelver}
 make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
 cd ..
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.0-%{archname}
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.0-noarch
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.0-%{archname}
-touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.0-noarch 
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-%{archname}
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-noarch
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.1-%{archname}
+touch $RPM_BUILD_ROOT/etc/lsb-release.d/graphics-3.1-noarch
 
 for LSBVER in %{lsbsover}; do
   ln -s %{ldso} $RPM_BUILD_ROOT/%{_lib}/%{lsbldso}.$LSBVER
@@ -362,7 +386,6 @@
 install -m 700 redhat_lsb_trigger.%{_target_cpu} \
   $RPM_BUILD_ROOT/usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -371,6 +394,20 @@
   /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 fi
 
+%ifnarch %{ix86}
+  /sbin/sln %{ldso} /%{_lib}/%{lsbldso} || :
+%else
+  if [ -f /emul/ia32-linux/lib/%{ldso} ]; then
+    for LSBVER in %{lsbsover}; do
+      /sbin/sln /emul/ia32-linux/lib/%{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
+    done
+  else
+    for LSBVER in %{lsbsover}; do
+      /sbin/sln %{ldso} /%{_lib}/%{lsbldso}.$LSBVER || :
+    done
+  fi
+%endif
+
 %ifarch %{ix86}
 %post
 # make this softlink again for /emul
@@ -384,6 +421,8 @@
 %files
 %defattr(-,root,root)
 /etc/redhat-lsb
+%config /etc/lsb-release
+/etc/redhat-lsb
 %dir /etc/lsb-release.d
 /etc/lsb-release.d/*
 %{_mandir}/*/*
@@ -395,6 +434,11 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.1-10
+- Rewrite most part of the mkredhat-lsb to obtain information directly via specdb 
+  rather than sniffing through sgml
+- remove redundent script and bump up tarball version
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.2
 - bump again for double-long bug on ppc(64)
 
@@ -408,21 +452,18 @@
 - Added libstdc++.so.6/libGL.so.1 requirement (RH#154605)
 
 * Wed Aug  3 2005 Leon Ho <llch at redhat.com> 3.0-7.EL
-- Fixed multilib problem on lsb_release not to read /etc/lsb-release and solely 
+- Fixed multilib problem on lsb_release not to read /etc/lsb-release and solely
   depends on /etc/lsb-release.d/ (Advised by LSB committee)
 - Removed /etc/lsb-release (Advised by LSB committee)
 
 * Mon Aug  1 2005 Leon Ho <llch at redhat.com> 3.0-6.EL
 - Made the /etc/lsb-release useful (RH#154605)
 - Added redhat_lsb_trigger to fix RH#160585 (Jakub Jelinek)
-- Fixed AMD64 base libraries requirement parsing (RH#154605) 
+- Fixed AMD64 base libraries requirement parsing (RH#154605)
 
-* Fri Jul 29 2005 Leon Ho <llch at redhat.com> 3.0-5.EL
-- Fixed redhat-lsb's mkredhat-lsb on fetching lib and cmd requirements (RH#154605)
-- Changed explicit mailx command requirement to package requirements (RH#164124)
-- Added mailx symlink to /bin/mail (RH#164124)
-- Added lsb-core-noarch and lsb-graphics-noarch and lsb-graphics-{arch} requirements (RH#164468)
-- Added requirements from lsb_release command on lsb-release.d and deps. (RH#164468)
+* Tue Jul 26 2005 Leon Ho <llch at redhat.com> 3.0-5.EL
+- Fixed redhat-lsb's mkredhat-lsb on fetching lib and 
+  cmd requirements
 
 * Mon Jul 18 2005 Leon Ho <llch at redhat.com> 3.0-4.EL
 - Rebuilt



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:04:45 -0400
Subject: rpms/redhat-lsb/devel sources,1.7,1.8
Message-ID: <200607050604.k6564jgM014309@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14271

Modified Files:
	sources 
Log Message:
uploaded new tarball


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jan 2006 03:50:11 -0000	1.7
+++ sources	5 Jul 2006 06:04:31 -0000	1.8
@@ -1,3 +1,4 @@
 30537ef5a01e0ca94b7b8eb6a36bb1e4  lsb-release-1.4.tar.gz
 f535414957ea3f7810b098f4ac7e4c50  redhat-lsb-1.3.tar.bz2
 6dc78435cc0837d9d75f7298587787bc  redhat-lsb-3.0-1.tar.bz2
+9a56a824d7bc967065f0fed475ebd3e5  redhat-lsb-3.0-2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:12:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:12:49 -0400
Subject: rpms/mesa/devel mesa.spec,1.63,1.64
Message-ID: <200607050612.k656Cmtv016215@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16181

Modified Files:
	mesa.spec 
Log Message:
* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-11
- Added mesa-6.5-glx-use-tls.patch to hopefully get -DGLX_USE_TLS to really
  work this time due to broken upstream linux-dri-* configs. (#193979)
- Pass RPM_OPT_FLAGS via OPT_FLAGS instead of via CFLAGS also for (#193979)



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mesa.spec	19 Jun 2006 17:36:51 -0000	1.63
+++ mesa.spec	5 Jul 2006 06:12:44 -0000	1.64
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 10
+Release: 11
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -268,12 +268,11 @@
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
-rm include/GL/uglglutshapes.h
+rm -f include/GL/uglglutshapes.h
 
 #-- Build ------------------------------------------------------------
 %build
-# Macroize this to simplify things
-export CFLAGS="$RPM_OPT_FLAGS"
+export OPT_FLAGS="$RPM_OPT_FLAGS"
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
 export DRI_DRIVER_DIR="%{_libdir}/dri"
@@ -450,6 +449,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-11
+- Added mesa-6.5-glx-use-tls.patch to hopefully get -DGLX_USE_TLS to really
+  work this time due to broken upstream linux-dri-* configs. (#193979)
+- Pass RPM_OPT_FLAGS via OPT_FLAGS instead of via CFLAGS also for (#193979)
+
 * Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 6.5-10
 - Bump libdrm-devel dep to trigger new ExclusiveArch test with the new package.
 - Use Fedora Extras style BuildRoot tag.
@@ -483,9 +487,9 @@
 - Bump for fc5 build.
 - Bump libdrm requires to 2.0.1.
 
-* Sat Apr  1 2006 Kristian H??gsberg <krh at redhat.com> 6.5-1
+* Sat Apr 01 2006 Kristian H??gsberg <krh at redhat.com> 6.5-1
 - Update to mesa 6.5 snapshot.
-- Use -MG for generating deps and some files aren't yet symlinked at
+- Use -MG for generating deps and some files are not yet symlinked at
   make depend time.
 - Drop mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch and
   mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
@@ -520,7 +524,7 @@
 * 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
+* Tue Feb 07 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)
@@ -534,7 +538,7 @@
 - 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
+* Sat Feb 04 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.
@@ -578,18 +582,18 @@
 - fix directory used for loading dri modules (#173679)
 - install dri drivers as executable so they get stripped (#173292)
 
-* Thu Nov 3 2005 Mike A. Harris <mharris at redhat.com> 6.4-4
+* Thu Nov 03 2005 Mike A. Harris <mharris at redhat.com> 6.4-4
 - Wrote redhat-mesa-source-filelist-generator to dynamically generate the
   files to be included in the mesa-source subpackage, to minimize future
   maintenance.
 - Fixed detection and renaming of software mesa .so version.
 
-* Wed Nov 2 2005 Mike A. Harris <mharris at redhat.com> 6.4-3
+* Wed Nov 02 2005 Mike A. Harris <mharris at redhat.com> 6.4-3
 - Hack: autodetect if libGL was given .so.1.5* and rename it to 1.2 for
   consistency on all architectures, and to avoid upgrade problems if we
   ever disable DRI on an arch and then re-enable it later.
 
-* Wed Nov 2 2005 Mike A. Harris <mharris at redhat.com> 6.4-2
+* Wed Nov 02 2005 Mike A. Harris <mharris at redhat.com> 6.4-2
 - Added mesa-6.4-multilib-fix.patch to instrument and attempt to fix Mesa
   bin/installmesa script to work properly with multilib lib64 architectures.
 - Set and export LIB_DIR and INCLUDE_DIR in spec file 'install' section,
@@ -612,23 +616,23 @@
 - Fix redhat-mesa-driver-install and spec file to work right on multilib
   systems.
   
-* Mon Sep 5 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-5
+* Mon Sep 05 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-5
 - Fix mesa-libGL-devel to depend on mesa-libGL instead of mesa-libGLU.
 - Added virtual "Provides: libGL..." entries for each subpackage as relevant.
 
-* Mon Sep 5 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-4
+* Mon Sep 05 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-4
 - Added the mesa-source subpackage, which contains part of the Mesa source
   code needed by other packages such as the X server to build stuff.
 
-* Mon Sep 5 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-3
+* Mon Sep 05 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-3
 - Added Conflicts/Obsoletes lines to all of the subpackages to make upgrades
   from previous OS releases, and piecemeal upgrades work as nicely as
   possible.
 
-* Mon Sep 5 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-2
+* Mon Sep 05 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-2
 - Wrote redhat-mesa-target script to simplify mesa build target selection.
 - Wrote redhat-mesa-driver-install to install the DRI drivers and simplify
   per-arch conditionalization, etc.
 
-* Sun Sep 4 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-1
+* Sun Sep 04 2005 Mike A. Harris <mharris at redhat.com> 6.3.2-1
 - Initial build.



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:13:14 -0400
Subject: rpms/mesa/devel mesa-6.5-glx-use-tls.patch,NONE,1.1
Message-ID: <200607050613.k656DEfO016341@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16309

Added Files:
	mesa-6.5-glx-use-tls.patch 
Log Message:
add mesa-6.5-glx-use-tls.patch

mesa-6.5-glx-use-tls.patch:
 linux-dri-x86    |    2 +-
 linux-dri-x86-64 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mesa-6.5-glx-use-tls.patch ---
--- configs/linux-dri-x86.glx-use-tls	2006-07-05 01:54:33.000000000 -0400
+++ configs/linux-dri-x86	2006-07-05 01:55:53.000000000 -0400
@@ -9,7 +9,7 @@
 PIC_FLAGS = 
 
 # Add -m32 to CFLAGS:
-ARCH_FLAGS = -m32
+ARCH_FLAGS += -m32
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
--- configs/linux-dri-x86-64.glx-use-tls	2006-07-05 01:54:40.000000000 -0400
+++ configs/linux-dri-x86-64	2006-07-05 01:56:02.000000000 -0400
@@ -5,7 +5,7 @@
 
 CONFIG_NAME = linux-dri-x86-64
 
-ARCH_FLAGS = -m64
+ARCH_FLAGS += -m64
 
 ASM_FLAGS = -DUSE_X86_64_ASM
 ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:14:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:14:11 -0400
Subject: rpms/mesa/devel .cvsignore,1.7,1.8
Message-ID: <200607050614.k656EBQP016938@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16900

Modified Files:
	.cvsignore 
Log Message:
.cvsignore update (it seems that no matter how many of these you update, as if an invisible gremlin is blowing them away and replacing them with static content)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Apr 2006 06:05:02 -0000	1.7
+++ .cvsignore	5 Jul 2006 06:14:08 -0000	1.8
@@ -1,2 +1,3 @@
-MesaDemos-6.5.tar.bz2
-MesaLib-6.5.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog
\ No newline at end of file



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:36:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:36:38 -0400
Subject: rpms/xorg-x11-xinit/devel xinput.sh,1.1,1.2
Message-ID: <200607050636.k656acup006476@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	xinput.sh 
Log Message:
Minor readability suggestion from Jens


Index: xinput.sh
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xinput.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput.sh	1 Nov 2005 02:00:56 -0000	1.1
+++ xinput.sh	5 Jul 2006 06:36:36 -0000	1.2
@@ -14,7 +14,7 @@
 oldterm=$TERM
 unset TERM
 if [ -r /etc/profile.d/lang.sh ]; then
-  . /etc/profile.d/lang.sh
+    source /etc/profile.d/lang.sh
 fi
 [ -n "$oldterm" ] && export TERM=$oldterm
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:46:10 -0400
Subject: rpms/xorg-x11-xinit/devel .cvsignore, 1.9, 1.10 xinput.sh, 1.2,
	1.3 xorg-x11-xinit.spec, 1.22, 1.23
Message-ID: <200607050646.k656kA1k015193@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	.cvsignore xinput.sh xorg-x11-xinit.spec 
Log Message:
* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5.fc6
- Implemented changes to xinput.sh based on suggestions from (#194458)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Apr 2006 22:49:30 -0000	1.9
+++ .cvsignore	5 Jul 2006 06:46:08 -0000	1.10
@@ -1 +1,3 @@
-xinit-1.0.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog


Index: xinput.sh
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xinput.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xinput.sh	5 Jul 2006 06:36:36 -0000	1.2
+++ xinput.sh	5 Jul 2006 06:46:08 -0000	1.3
@@ -10,6 +10,9 @@
 #
 # X Input method setup script
 
+USER_XINPUTRC="$HOME/.xinputrc"
+SYS_XINPUTRC="/etc/X11/xinit/xinputrc"
+
 # Load up the user and system locale settings
 oldterm=$TERM
 unset TERM
@@ -20,18 +23,14 @@
 
 tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
 
-## try to source ~/.xinput.d/ll_CC or /etc/X11/xinit/xinput.d/ll_CC to
-## setup the input method for locale (CC is needed for Chinese for example)
 # unset env vars to be safe
 unset XIM XIM_PROGRAM XIM_ARGS XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
-lang_region=$(echo $tmplang | sed -e 's/\..*//')
-for f in $HOME/.xinput.d/${lang_region} \
-	    $HOME/.xinput.d/default \
-	    /etc/X11/xinit/xinput.d/${lang_region} \
-	    /etc/X11/xinit/xinput.d/default ; do
-    [ -r $f ] && source $f && break
-done
-unset lang_region
+
+if [ -r "$USER_XINPUTRC" ]; then
+    source "$USER_XINPUTRC"
+elif [ -r "$SYS_XINPUTRC" ]; then
+    source "$SYS_XINPUTRC"
+fi
 
 [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE
 [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-xinit.spec	28 Jun 2006 10:17:35 -0000	1.22
+++ xorg-x11-xinit.spec	5 Jul 2006 06:46:08 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 4
+Release: 5%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -96,6 +96,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5.fc6
+- Implemented changes to xinput.sh based on suggestions from (#194458)
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4
 - Added documentation to doc macro.
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 06:53:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 02:53:16 -0400
Subject: rpms/redhat-lsb/devel sources,1.8,1.9
Message-ID: <200607050653.k656rGml027101@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27069

Modified Files:
	sources 
Log Message:
reload tarball


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jul 2006 06:04:31 -0000	1.8
+++ sources	5 Jul 2006 06:53:14 -0000	1.9
@@ -1,4 +1,4 @@
 30537ef5a01e0ca94b7b8eb6a36bb1e4  lsb-release-1.4.tar.gz
 f535414957ea3f7810b098f4ac7e4c50  redhat-lsb-1.3.tar.bz2
 6dc78435cc0837d9d75f7298587787bc  redhat-lsb-3.0-1.tar.bz2
-9a56a824d7bc967065f0fed475ebd3e5  redhat-lsb-3.0-2.tar.bz2
+64518d9c2577e6072df40d7623e22ebc  redhat-lsb-3.0-2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul  5 07:01:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 03:01:40 -0400
Subject: rpms/mesa/devel mesa.spec,1.64,1.65
Message-ID: <200607050701.k6571eCr029883@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29811

Modified Files:
	mesa.spec 
Log Message:
* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-12.fc6
- Maybe actually, you know, apply the mesa-6.5-glx-use-tls.patch as that might
  help to you know, actually solve the problem.  Duh.
- Use {dist} tag in Release field now.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mesa.spec	5 Jul 2006 06:12:44 -0000	1.64
+++ mesa.spec	5 Jul 2006 07:01:13 -0000	1.65
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 11
+Release: 12%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -69,15 +69,19 @@
 Source11: redhat-mesa-driver-install
 Source12: redhat-mesa-source-filelist-generator
 
+# Patches 0-9 reserved for mesa Makefiles/config fixes
 Patch0: mesa-6.5-build-config.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.5-drop-static-inline.patch
-Patch6: mesa-6.5-noexecstack.patch
-Patch7: mesa-6.5-force-r300.patch
-Patch8: mesa-6.5-fix-pbuffer-dispatch.patch
+Patch1: mesa-6.5-glx-use-tls.patch
+
+Patch10: mesa-6.3.2-fix-installmesa.patch
+Patch11: mesa-6.4-multilib-fix.patch
+Patch12: mesa-modular-dri-dir.patch
+Patch13: mesa-6.4.1-libGLw-enable-motif-support.patch
+Patch14: mesa-6.5-drop-static-inline.patch
+Patch15: mesa-6.5-noexecstack.patch
+Patch16: mesa-6.5-force-r300.patch
+Patch17: mesa-6.5-fix-pbuffer-dispatch.patch
+
 # General patches from upstream go here:
 
 
@@ -248,16 +252,18 @@
 install -m 755 %{SOURCE12} ./
 
 %patch0 -p0 -b .build-config
-%patch1 -p0 -b .fix-installmesa
-%patch2 -p0 -b .multilib-fix
-%patch3 -p1 -b .modular
+%patch1 -p0 -b .glx-use-tls
+
+%patch10 -p0 -b .fix-installmesa
+%patch11 -p0 -b .multilib-fix
+%patch12 -p1 -b .modular
 %if %{with_motif}
-%patch4 -p0 -b .libGLw-enable-motif-support
+%patch13 -p0 -b .libGLw-enable-motif-support
 %endif
-%patch5 -p0 -b .drop-static-inline
-%patch6 -p0 -b .noexecstack
-%patch7 -p0 -b .force-r300
-%patch8 -p0 -b .fix-pbuffer-dispatch
+%patch14 -p0 -b .drop-static-inline
+%patch15 -p0 -b .noexecstack
+%patch16 -p0 -b .force-r300
+%patch17 -p0 -b .fix-pbuffer-dispatch
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -449,6 +455,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-12.fc6
+- Maybe actually, you know, apply the mesa-6.5-glx-use-tls.patch as that might
+  help to you know, actually solve the problem.  Duh.
+- Use {dist} tag in Release field now.
+
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-11
 - Added mesa-6.5-glx-use-tls.patch to hopefully get -DGLX_USE_TLS to really
   work this time due to broken upstream linux-dri-* configs. (#193979)



From fedora-cvs-commits at redhat.com  Wed Jul  5 07:59:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 03:59:50 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.17,1.18
Message-ID: <200607050759.k657xonb012036@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12023

Modified Files:
	redhat-lsb.spec 
Log Message:
working version for LSB3.1, yet tested with test suite


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- redhat-lsb.spec	5 Jul 2006 05:57:43 -0000	1.17
+++ redhat-lsb.spec	5 Jul 2006 07:59:47 -0000	1.18
@@ -42,15 +42,17 @@
 %define qual %{nil}
 %endif
 
-%define lsbrelver 2.0
+%define upstreamlsbrelver 2.0
+%define lsbrelver 3.0
 %define srcrelease 2
 
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.0
-Release: 10
+Release: 10.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
+Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
 Patch0: lsb-release-2.0-disable-etc-lsb-release.patch
 License: GPL
 Group: System Environment/Base
@@ -203,10 +205,6 @@
 Requires: libICE.so.6%{qual}
 Requires: libGL.so.1%{qual}
 
-#@GLSB_UTILLIB@
-
-#@GLSB_GRAPHLIB@
-
 # gLSB Command and Utilities
 Requires: /bin/awk
 Requires: /bin/basename
@@ -354,7 +352,7 @@
 %patch0 -p 0
 
 %build
-cd lsb-release-%{lsbrelver}
+cd lsb-release-%{upstreamlsbrelver}
 make
 
 %install
@@ -363,7 +361,7 @@
          $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \
          $RPM_BUILD_ROOT/etc/lsb-release.d/ $RPM_BUILD_ROOT/usr/sbin/
 make DESTDIR=$RPM_BUILD_ROOT install
-cd lsb-release-%{lsbrelver}
+cd lsb-release-%{upstreamlsbrelver}
 make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install
 cd ..
 touch $RPM_BUILD_ROOT/etc/lsb-release.d/core-3.1-%{archname}
@@ -421,8 +419,8 @@
 %files
 %defattr(-,root,root)
 /etc/redhat-lsb
-%config /etc/lsb-release
-/etc/redhat-lsb
+#%config /etc/lsb-release
+#/etc/redhat-lsb
 %dir /etc/lsb-release.d
 /etc/lsb-release.d/*
 %{_mandir}/*/*
@@ -434,9 +432,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
-* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.1-10
-- Rewrite most part of the mkredhat-lsb to obtain information directly via specdb 
-  rather than sniffing through sgml
+* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.0-10.1
+- Attempt to rewrite most part of the mkredhat-lsb to obtain information directly via 
+  specdb rather than sniffing through sgml
 - remove redundent script and bump up tarball version
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.2



From fedora-cvs-commits at redhat.com  Wed Jul  5 08:38:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 04:38:10 -0400
Subject: rpms/mesa/devel mesa-6.5-fix-opt-flags-bug197640.patch, NONE,
	1.1 mesa.spec, 1.65, 1.66 redhat-mesa-driver-install, 1.6, 1.7
Message-ID: <200607050838.k658cApL013002@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12971

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Added Files:
	mesa-6.5-fix-opt-flags-bug197640.patch 
Log Message:
* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-13.fc6
- Added mesa-6.5-fix-opt-flags-bug197640.patch as 2nd attempt to fix OPT_FLAGS
  for (#197640).
- Ensure that redhat-mesa-driver-install creates $DRIMODULE_DESTDIR with
  mode 0755.


mesa-6.5-fix-opt-flags-bug197640.patch:
 linux         |    2 +-
 linux-dri     |    2 +-
 linux-dri-ppc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mesa-6.5-fix-opt-flags-bug197640.patch ---
--- Mesa-6.5/configs/linux-dri.~1~	2006-07-05 00:07:21.000000000 -0700
+++ Mesa-6.5/configs/linux-dri	2006-07-05 00:23:08.000000000 -0700
@@ -13,7 +13,7 @@ CXX = g++
 #MKDEP = gcc -M 
 #MKDEP_OPTIONS = -MF depend
 
-OPT_FLAGS  = -g
+OPT_FLAGS  ?= -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
--- Mesa-6.5/configs/linux.~1~	2006-07-05 00:07:21.000000000 -0700
+++ Mesa-6.5/configs/linux	2006-07-05 00:22:59.000000000 -0700
@@ -11,7 +11,7 @@ CXX = g++
 MKDEP = gcc -M -MG
 MKDEP_OPTIONS = -MF depend
 
-OPT_FLAGS  = -O3 -g
+OPT_FLAGS  ?= -O3 -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
--- Mesa-6.5/configs/linux-dri-ppc.~1~	2005-08-19 15:03:05.000000000 -0700
+++ Mesa-6.5/configs/linux-dri-ppc	2006-07-05 00:22:44.000000000 -0700
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-ppc
 
-OPT_FLAGS = -Os -mcpu=603
+OPT_FLAGS ?= -Os -mcpu=603
 PIC_FLAGS = -fPIC
 
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mesa.spec	5 Jul 2006 07:01:13 -0000	1.65
+++ mesa.spec	5 Jul 2006 08:38:07 -0000	1.66
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -455,6 +455,12 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-13.fc6
+- Added mesa-6.5-fix-opt-flags-bug197640.patch as 2nd attempt to fix OPT_FLAGS
+  for (#197640).
+- Ensure that redhat-mesa-driver-install creates $DRIMODULE_DESTDIR with
+  mode 0755.
+
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-12.fc6
 - Maybe actually, you know, apply the mesa-6.5-glx-use-tls.patch as that might
   help to you know, actually solve the problem.  Duh.


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- redhat-mesa-driver-install	2 Apr 2006 06:13:56 -0000	1.6
+++ redhat-mesa-driver-install	5 Jul 2006 08:38:07 -0000	1.7
@@ -62,7 +62,7 @@
     echo "Error: DRIMODULE_DESTDIR not set in environment"
     exit
 else
-    [ ! -d $DRIMODULE_DESTDIR ] && mkdir -p $DRIMODULE_DESTDIR
+    [ ! -d $DRIMODULE_DESTDIR ] && mkdir -p -m 0755 $DRIMODULE_DESTDIR
 fi
 
 #DRIMODULE_DESTDIR=${1##DRIMODULE_DESTDIR=}



From fedora-cvs-commits at redhat.com  Wed Jul  5 08:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 04:43:23 -0400
Subject: rpms/mesa/devel mesa.spec,1.66,1.67
Message-ID: <200607050843.k658hNit014074@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14049

Modified Files:
	mesa.spec 
Log Message:
uh, apply the patch doofus


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- mesa.spec	5 Jul 2006 08:38:07 -0000	1.66
+++ mesa.spec	5 Jul 2006 08:43:15 -0000	1.67
@@ -72,6 +72,7 @@
 # Patches 0-9 reserved for mesa Makefiles/config fixes
 Patch0: mesa-6.5-build-config.patch
 Patch1: mesa-6.5-glx-use-tls.patch
+Patch2: mesa-6.5-fix-opt-flags-bug197640.patch
 
 Patch10: mesa-6.3.2-fix-installmesa.patch
 Patch11: mesa-6.4-multilib-fix.patch
@@ -253,6 +254,7 @@
 
 %patch0 -p0 -b .build-config
 %patch1 -p0 -b .glx-use-tls
+%patch2 -p1 -b .fix-opt-flags-bug197640
 
 %patch10 -p0 -b .fix-installmesa
 %patch11 -p0 -b .multilib-fix



From fedora-cvs-commits at redhat.com  Wed Jul  5 09:23:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 05:23:41 -0400
Subject: rpms/kernel/devel patch-2.6.17-git24.bz2.sign, NONE,
	1.1 kernel-2.6.spec, 1.2348, 1.2349 sources, 1.419,
	1.420 upstream, 1.386,
	1.387 linux-2.6-header-install-git.patch, 1.26, NONE
Message-ID: <200607050923.k659Nfxj022328@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17-git24.bz2.sign 
Removed Files:
	linux-2.6-header-install-git.patch 
Log Message:
git24


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

iD8DBQBEq2RtyGugalF9Dw4RAnmQAJ9B98Zt0WGOVKiwBRzCdWFGd2bxbQCfU0rZ
pfZtkR14clG4fs9FD6cMJrw=
=zRge
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2348
retrieving revision 1.2349
diff -u -r1.2348 -r1.2349
--- kernel-2.6.spec	4 Jul 2006 21:05:47 -0000	1.2348
+++ kernel-2.6.spec	5 Jul 2006 09:23:38 -0000	1.2349
@@ -238,13 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git23.bz2
-
-#
-# Clean up and export kernel headers to userspace
-#
-# git://git.infradead.org/hdrinstall2-2.6.git
-Patch50: linux-2.6-header-install-git.patch
+Patch1: patch-2.6.17-git24.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -699,9 +693,6 @@
 # Patches 10 through 100 are meant for core subsystem upgrades
 #
 
-# Implement 'make headers_install'
-%patch50 -p1
-
 #
 # Patches to back out
 #
@@ -1567,6 +1558,9 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.17-git24 (yay, headers_install)
+
 * Tue Jul  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git21, git22 & git23
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- sources	4 Jul 2006 21:03:12 -0000	1.419
+++ sources	5 Jul 2006 09:23:39 -0000	1.420
@@ -1,4 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-ff50ced0a2ee111b3fd934133e83cc7f  patch-2.6.17-git21.bz2
-3da20d8dd18eddb843d298808a664fef  patch-2.6.17-git23.bz2
+b4075627531d5deb95691bf05e1ced6d  patch-2.6.17-git24.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- upstream	4 Jul 2006 21:03:12 -0000	1.386
+++ upstream	5 Jul 2006 09:23:39 -0000	1.387
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git23.bz2
+patch-2.6.17-git24.bz2


--- linux-2.6-header-install-git.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 09:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 05:28:45 -0400
Subject: rpms/kernel/devel .cvsignore, 1.475, 1.476 kernel-2.6.spec, 1.2349,
	1.2350 linux-2.6-compile-fixes.patch, 1.90,
	1.91 linux-2.6-lockdep-fixes.patch, 1.1,
	1.2 patch-2.6.17-git23.bz2.sign, 1.1, NONE
Message-ID: <200607050928.k659SjGj024075@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-lockdep-fixes.patch 
Removed Files:
	patch-2.6.17-git23.bz2.sign 
Log Message:
compile fix & lockdep improvements.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -r1.475 -r1.476
--- .cvsignore	4 Jul 2006 21:03:10 -0000	1.475
+++ .cvsignore	5 Jul 2006 09:28:40 -0000	1.476
@@ -5,3 +5,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.17-git21.bz2
 patch-2.6.17-git23.bz2
+patch-2.6.17-git24.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2349
retrieving revision 1.2350
diff -u -r1.2349 -r1.2350
--- kernel-2.6.spec	5 Jul 2006 09:23:38 -0000	1.2349
+++ kernel-2.6.spec	5 Jul 2006 09:28:40 -0000	1.2350
@@ -1558,6 +1558,9 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 Dave Jones <davej at redhat.com>
+- Further lockdep improvements.
+
 * Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.17-git24 (yay, headers_install)
 

linux-2.6-compile-fixes.patch:
 linux-2.6.17.noarch/Makefile                 |    4 ----
 linux-2.6/drivers/cpufreq/cpufreq_ondemand.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- linux-2.6-compile-fixes.patch	4 Jul 2006 21:03:12 -0000	1.90
+++ linux-2.6-compile-fixes.patch	5 Jul 2006 09:28:40 -0000	1.91
@@ -12,3 +12,21 @@
  # Make variables (CC, etc...)
  
  AS		= $(CROSS_COMPILE)as
+[CPUFREQ] Fix implicit declarations in ondemand.
+
+drivers/cpufreq/cpufreq_ondemand.c: In function ???dbs_check_cpu???:
+drivers/cpufreq/cpufreq_ondemand.c:238: error: implicit declaration of function ???jiffies64_to_cputime64???
+drivers/cpufreq/cpufreq_ondemand.c:239: error: implicit declaration of function ???cputime64_sub???
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6/drivers/cpufreq/cpufreq_ondemand.c~	2006-07-05 05:19:26.000000000 -0400
++++ linux-2.6/drivers/cpufreq/cpufreq_ondemand.c	2006-07-05 05:20:01.000000000 -0400
+@@ -18,6 +18,7 @@
+ #include <linux/jiffies.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/mutex.h>
++#include <asm/cputime.h>
+ 
+ /*
+  * dbs is used in this file as a shortform for demandbased switching

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h |    6 +-
 linux-2.6.17-mm6/kernel/lockdep.c   |   14 ++++-
 linux-2.6.17-mm6/net/atm/ipcommon.c |   23 +++++++--
 linux/include/linux/lockdep.h       |    2 
 linux/kernel/lockdep.c              |   87 ++++++++++++++++++++++--------------
 5 files changed, 87 insertions(+), 45 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-lockdep-fixes.patch	4 Jul 2006 21:05:51 -0000	1.1
+++ linux-2.6-lockdep-fixes.patch	5 Jul 2006 09:28:40 -0000	1.2
@@ -363,3 +363,254 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From davej  Wed Jul  5 04:57:59 2006
+Return-Path: <mingo at elte.hu>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Wed, 05 Jul 2006 04:57:59 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Wed, 05 Jul 2006 04:57:07 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k658v7lx024066
+	for <davej at pobox.devel.redhat.com>; Wed, 5 Jul 2006 04:57:07 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k658v6Ru009372
+	for <davej at redhat.com>; Wed, 5 Jul 2006 04:57:06 -0400
+Received: from mx3.mail.elte.hu (mx3.mail.elte.hu [157.181.1.138])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k658v5bS027637
+	for <davej at redhat.com>; Wed, 5 Jul 2006 04:57:06 -0400
+Received: from chiara.elte.hu ([157.181.151.252])
+	by mx3.mail.elte.hu with esmtp (Exim)
+	id 1Fy3Bp-00006f-N2
+	from <mingo at elte.hu>; Wed, 05 Jul 2006 10:56:58 +0200
+Received: by chiara.elte.hu (Postfix, from userid 17806)
+	id 1D2361FC2; Wed,  5 Jul 2006 10:56:59 +0200 (CEST)
+Date: Wed, 5 Jul 2006 10:52:29 +0200
+From: Ingo Molnar <mingo at elte.hu>
+To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
+Cc: linux-kernel at vger.kernel.org, Dave Jones <davej at redhat.com>,
+        Arjan van de Ven <arjan at infradead.org>
+Subject: [patch] lockdep: core, reduce per-lock class-cache size
+Message-ID: <20060705085229.GA8918 at elte.hu>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.4.2.1i
+Received-SPF: softfail (mx3: transitioning domain of elte.hu does not designate 157.181.151.252 as permitted sender) client-ip=157.181.151.252; envelope-from=mingo at elte.hu; helo=chiara.elte.hu;
+X-ELTE-SpamScore: 0.1
+X-ELTE-SpamLevel: 
+X-ELTE-SpamCheck: no
+X-ELTE-SpamVersion: ELTE 2.0 
+X-ELTE-SpamCheck-Details: score=0.1 required=5.9 tests=AWL,BAYES_50 autolearn=no SpamAssassin version=3.0.3
+	0.0 BAYES_50               BODY: Bayesian spam probability is 40 to 60%
+	[score: 0.5007]
+	0.1 AWL                    AWL: From: address is in the auto white-list
+X-ELTE-VirusStatus: clean
+X-RedHat-Spam-Score: 0 
+Status: RO
+Content-Length: 5396
+Lines: 195
+
+Subject: lockdep: core, reduce per-lock class-cache size
+From: Ingo Molnar <mingo at elte.hu>
+
+lockdep_map is embedded into every lock, which blows up data structure
+sizes all around the kernel. Reduce the class-cache to be for the
+default class only - that is used in 99.9% of the cases and even if
+we dont have a class cached, the lookup in the class-hash is lockless.
+
+this change reduces the per-lock dep_map overhead by 56 bytes on 64-bit
+platforms and by 28 bytes on 32-bit platforms.
+
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+---
+ include/linux/lockdep.h |    2 -
+ kernel/lockdep.c        |   87 +++++++++++++++++++++++++++++-------------------
+ 2 files changed, 55 insertions(+), 34 deletions(-)
+
+Index: linux/include/linux/lockdep.h
+===================================================================
+--- linux.orig/include/linux/lockdep.h
++++ linux/include/linux/lockdep.h
+@@ -120,7 +120,7 @@ struct lock_class {
+  */
+ struct lockdep_map {
+ 	struct lock_class_key		*key;
+-	struct lock_class		*class[MAX_LOCKDEP_SUBCLASSES];
++	struct lock_class		*class_cache;
+ 	const char			*name;
+ };
+ 
+Index: linux/kernel/lockdep.c
+===================================================================
+--- linux.orig/kernel/lockdep.c
++++ linux/kernel/lockdep.c
+@@ -1104,7 +1104,7 @@ extern void __error_too_big_MAX_LOCKDEP_
+  * itself, so actual lookup of the hash should be once per lock object.
+  */
+ static inline struct lock_class *
+-register_lock_class(struct lockdep_map *lock, unsigned int subclass)
++look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
+ {
+ 	struct lockdep_subclass_key *key;
+ 	struct list_head *hash_head;
+@@ -1148,7 +1148,26 @@ register_lock_class(struct lockdep_map *
+ 	 */
+ 	list_for_each_entry(class, hash_head, hash_entry)
+ 		if (class->key == key)
+-			goto out_set;
++			return class;
++
++	return NULL;
++}
++
++/*
++ * Register a lock's class in the hash-table, if the class is not present
++ * yet. Otherwise we look it up. We cache the result in the lock object
++ * itself, so actual lookup of the hash should be once per lock object.
++ */
++static inline struct lock_class *
++register_lock_class(struct lockdep_map *lock, unsigned int subclass)
++{
++	struct lockdep_subclass_key *key;
++	struct list_head *hash_head;
++	struct lock_class *class;
++
++	class = look_up_lock_class(lock, subclass);
++	if (likely(class))
++		return class;
+ 
+ 	/*
+ 	 * Debug-check: all keys must be persistent!
+@@ -1163,6 +1182,9 @@ register_lock_class(struct lockdep_map *
+ 		return NULL;
+ 	}
+ 
++	key = lock->key->subkeys + subclass;
++	hash_head = classhashentry(key);
++
+ 	__raw_spin_lock(&hash_lock);
+ 	/*
+ 	 * We have to do the hash-walk again, to avoid races
+@@ -1209,8 +1231,8 @@ register_lock_class(struct lockdep_map *
+ out_unlock_set:
+ 	__raw_spin_unlock(&hash_lock);
+ 
+-out_set:
+-	lock->class[subclass] = class;
++	if (!subclass)
++		lock->class_cache = class;
+ 
+ 	DEBUG_LOCKS_WARN_ON(class->subclass != subclass);
+ 
+@@ -1914,7 +1936,7 @@ void lockdep_init_map(struct lockdep_map
+ 	}
+ 	lock->name = name;
+ 	lock->key = key;
+-	memset(lock->class, 0, sizeof(lock->class[0])*MAX_LOCKDEP_SUBCLASSES);
++	lock->class_cache = NULL;
+ }
+ 
+ EXPORT_SYMBOL_GPL(lockdep_init_map);
+@@ -1928,8 +1950,8 @@ static int __lock_acquire(struct lockdep
+ 			  unsigned long ip)
+ {
+ 	struct task_struct *curr = current;
++	struct lock_class *class = NULL;
+ 	struct held_lock *hlock;
+-	struct lock_class *class;
+ 	unsigned int depth, id;
+ 	int chain_head = 0;
+ 	u64 chain_key;
+@@ -1947,8 +1969,11 @@ static int __lock_acquire(struct lockdep
+ 		return 0;
+ 	}
+ 
+-	class = lock->class[subclass];
+-	/* not cached yet? */
++	if (!subclass)
++		class = lock->class_cache;
++	/*
++	 * Not cached yet or subclass?
++	 */
+ 	if (unlikely(!class)) {
+ 		class = register_lock_class(lock, subclass);
+ 		if (!class)
+@@ -2449,48 +2474,44 @@ void lockdep_free_key_range(void *start,
+ 
+ void lockdep_reset_lock(struct lockdep_map *lock)
+ {
+-	struct lock_class *class, *next, *entry;
++	struct lock_class *class, *next;
+ 	struct list_head *head;
+ 	unsigned long flags;
+ 	int i, j;
+ 
+ 	raw_local_irq_save(flags);
+-	__raw_spin_lock(&hash_lock);
+ 
+ 	/*
+-	 * Remove all classes this lock has:
++	 * Remove all classes this lock might have:
+ 	 */
++	for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
++		/*
++		 * If the class exists we look it up and zap it:
++		 */
++		class = look_up_lock_class(lock, j);
++		if (class)
++			zap_class(class);
++	}
++	/*
++	 * Debug check: in the end all mapped classes should
++	 * be gone.
++	 */
++	__raw_spin_lock(&hash_lock);
+ 	for (i = 0; i < CLASSHASH_SIZE; i++) {
+ 		head = classhash_table + i;
+ 		if (list_empty(head))
+ 			continue;
+ 		list_for_each_entry_safe(class, next, head, hash_entry) {
+-			for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
+-				entry = lock->class[j];
+-				if (class == entry) {
+-					zap_class(class);
+-					lock->class[j] = NULL;
+-					break;
+-				}
++			if (unlikely(class == lock->class_cache)) {
++				__raw_spin_unlock(&hash_lock);
++				DEBUG_LOCKS_WARN_ON(1);
++				goto out_restore;
+ 			}
+ 		}
+ 	}
+-
+-	/*
+-	 * Debug check: in the end all mapped classes should
+-	 * be gone.
+-	 */
+-	for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
+-		entry = lock->class[j];
+-		if (!entry)
+-			continue;
+-		__raw_spin_unlock(&hash_lock);
+-		DEBUG_LOCKS_WARN_ON(1);
+-		raw_local_irq_restore(flags);
+-		return;
+-	}
+-
+ 	__raw_spin_unlock(&hash_lock);
++
++out_restore:
+ 	raw_local_irq_restore(flags);
+ }
+ 
+


--- patch-2.6.17-git23.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:17:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:17:35 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-check-no-creds-required.patch,
	NONE, 1.1 autofs-5.0.0_beta6-shutdown-log-message.patch, NONE,
	1.1 autofs.spec, 1.118, 1.119
Message-ID: <200607051017.k65AHZH5001472@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-check-no-creds-required.patch 
	autofs-5.0.0_beta6-shutdown-log-message.patch 
Log Message:
* Wed Jul 5 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-4
- correct shutdown log message print.
- correct auth init test when no credentials required.


autofs-5.0.0_beta6-check-no-creds-required.patch:
 CHANGELOG             |    1 +
 modules/lookup_ldap.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta6-check-no-creds-required.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 60743b5..1dc3293 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - fix not checking return in init_ldap_connection (Jeff Moyer).
 - correct test for existence of auth config file.
 - correct shutdown log message print.
+- correct auth init test when no credentials required.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index effa038..d105e44 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -420,7 +420,7 @@ int parse_ldap_config(struct lookup_cont
 	}
 
 	ret = get_property(root, "authtype", &authtype);
-	if (ret != 0 || (!authtype && auth_required)) {
+	if (ret != 0) {
 		error(LOGOPT_ANY,
 		      MODPREFIX
 		      "Failed read the authtype property from the "
@@ -511,6 +511,9 @@ int auth_init(struct lookup_context *ctx
 	if (ret)
 		return -1;
 
+	if (!ctxt->auth_required)
+		return 0;
+
 	ldap = init_ldap_connection(ctxt);
 	if (!ldap)
 		return -1;

autofs-5.0.0_beta6-shutdown-log-message.patch:
 CHANGELOG          |    1 +
 daemon/automount.c |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-shutdown-log-message.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 5139d78..60743b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - workaround segfaults at exit after using GSSAPI library.
 - fix not checking return in init_ldap_connection (Jeff Moyer).
 - correct test for existence of auth config file.
+- correct shutdown log message print.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index e0e33fe..673c005 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1192,13 +1192,13 @@ static void handle_mounts_cleanup(void *
 	struct autofs_point *ap;
 	char path[PATH_MAX + 1];
 	char buf[MAX_ERR_BUF];
+	unsigned int clean = 0;
 
 	ap = (struct autofs_point *) arg;
 
+	strcpy(path, ap->path);
 	if (!ap->submount && strcmp(ap->path, "/-") && ap->dir_created)
-		strcpy(path, ap->path);
-	else
-		*path = '\0';
+		clean = 1;
 
 	/* Make sure alarms are cleared */
 	alarm_delete(ap);
@@ -1216,7 +1216,7 @@ static void handle_mounts_cleanup(void *
 	if (master_list_empty(master))
 		kill(getpid(), SIGTERM);
 
-	if (*path) {
+	if (clean) {
 		if (rmdir(path) == -1) {
 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 			warn(LOGOPT_NONE, "failed to remove dir %s: %s",
@@ -1224,7 +1224,7 @@ static void handle_mounts_cleanup(void *
 		}
 	}
 
-	msg("shut down path %s", ap->path);
+	msg("shut down path %s", path);
 
 	return;
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- autofs.spec	4 Jul 2006 02:31:18 -0000	1.118
+++ autofs.spec	5 Jul 2006 10:17:32 -0000	1.119
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -16,6 +16,8 @@
 Patch3: autofs-5.0.0_beta6-gssapi-segfault-exit.patch
 Patch4: autofs-5.0.0_beta6-check-return.patch
 Patch5: autofs-5.0.0_beta6-auth-config-exits.patch
+Patch6: autofs-5.0.0_beta6-shutdown-log-message.patch
+Patch7: autofs-5.0.0_beta6-check-no-creds-required.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -59,6 +61,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -115,6 +119,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 5 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-4
+- correct shutdown log message print.
+- correct auth init test when no credentials required.
+
 * Tue Jul 4 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-3
 - correct test for existence of auth config file.
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:21:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:21:10 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch, NONE,
	1.1 openoffice.org.spec, 1.754, 1.755
Message-ID: <200607051021.k65ALA6W002903@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2846

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch 
Log Message:
recently-used fixes

openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch:
 recently_used_file_handler.cxx |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch ---
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx,v
retrieving revision 1.5
diff -u -p -u -w -r1.5 recently_used_file_handler.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx	7 Sep 2005 19:56:25 -0000	1.5
+++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx	16 Jun 2006 10:40:51 -0000
@@ -49,6 +49,10 @@
 #include "rtl/string.hxx"
 #endif
 
+#ifndef _RTL_STRBUF_HXX_
+#include "rtl/strbuf.hxx"
+#endif
+
 #include "osl/thread.h"
 
 #ifndef INCLUDED_RECENTLY_USED_FILE_HXX
@@ -212,10 +216,33 @@ namespace /* private */ {
             write_xml_end_tag(TAG_RECENT_ITEM, file);            
         }
         
+		static rtl::OString escape_content(const string_t &text)
+		{
+			rtl::OStringBuffer aBuf;
+			for (sal_Int32 i = 0; i < text.length(); i++)
+			{
+#               define MAP(a,b) case a: aBuf.append(b); break
+				switch (text[i])
+				{
+					MAP ('&',  "&amp;");
+					MAP ('<',  "&lt;");
+					MAP ('>',  "&gt;");
+					MAP ('\'', "&apos;");
+					MAP ('"',  "&quot;");
+				default:
+					aBuf.append(text[i]);
+					break;
+				}
+#               undef MAP
+			}
+			return aBuf.makeStringAndClear();
+		}
+        
         void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const
         {            
             write_xml_start_tag(name, file);
-            file.write(value.c_str(), value.length());
+			rtl::OString escaped = escape_content (value);
+            file.write(escaped.getStr(), escaped.getLength());
             write_xml_end_tag(name, file);
         }
         
@@ -541,7 +568,7 @@ const rtl::OUString DEFAULT_CONTEXT = rt
 
 // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
 // to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 {
 	rtl::OUString extUrl;
 		
@@ -572,7 +599,7 @@ extern "C" void add_to_recently_used_fil
         rtl::OUString externalUrl = translateToExternalUrl(file_url);
 	
         read_recently_used_items(ruf, item_list);	
-        recently_used_item_list_add(item_list, (externalUrl.getLength()) ? externalUrl : file_url, mime_type);
+        recently_used_item_list_add(item_list, externalUrl.getLength() ? externalUrl : file_url, mime_type);
         write_recently_used_items(ruf, item_list);                                
     }
     catch(const char* ex)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- openoffice.org.spec	3 Jul 2006 13:51:58 -0000	1.754
+++ openoffice.org.spec	5 Jul 2006 10:21:07 -0000	1.755
@@ -108,6 +108,7 @@
 Patch42: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -843,6 +844,7 @@
 %patch42 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
 %patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 
 tar xzf %{SOURCE1}
 
@@ -3320,6 +3322,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jul 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
+- add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version
 - rh#196123# add openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:23:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:23:51 -0400
Subject: rpms/kernel/devel linux-2.6-ppc-cputime64.patch, NONE,
	1.1 kernel-2.6.spec, 1.2350, 1.2351
Message-ID: <200607051023.k65ANpmE003931@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-cputime64.patch 
Log Message:
fix ppc build

linux-2.6-ppc-cputime64.patch:
 cputime.h |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+)

--- NEW FILE linux-2.6-ppc-cputime64.patch ---
--- linux-2.6.17.ppc64/include/asm-powerpc/cputime.h~	2006-06-18 02:49:35.000000000 +0100
+++ linux-2.6.17.ppc64/include/asm-powerpc/cputime.h	2006-07-05 11:19:35.000000000 +0100
@@ -43,6 +43,7 @@ typedef u64 cputime64_t;
 
 #define cputime64_zero			((cputime64_t)0)
 #define cputime64_add(__a, __b)		((__a) + (__b))
+#define cputime64_sub(__a, __b)		((__a) - (__b))
 #define cputime_to_cputime64(__ct)	(__ct)
 
 #ifdef __KERNEL__
@@ -74,6 +75,23 @@ static inline cputime_t jiffies_to_cputi
 	return ct;
 }
 
+static inline cputime64_t jiffies64_to_cputime64(const u64 jif)
+{
+	cputime_t ct;
+	u64 sec;
+
+	/* have to be a little careful about overflow */
+	ct = jif % HZ;
+	sec = jif / HZ;
+	if (ct) {
+		ct *= tb_ticks_per_sec;
+		do_div(ct, HZ);
+	}
+	if (sec)
+		ct += (cputime_t) sec * tb_ticks_per_sec;
+	return ct;
+}
+
 static inline u64 cputime64_to_jiffies64(const cputime_t ct)
 {
 	return mulhdu(ct, __cputime_jiffies_factor);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2350
retrieving revision 1.2351
diff -u -r1.2350 -r1.2351
--- kernel-2.6.spec	5 Jul 2006 09:28:40 -0000	1.2350
+++ kernel-2.6.spec	5 Jul 2006 10:23:48 -0000	1.2351
@@ -254,6 +254,7 @@
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
+Patch300: linux-2.6-ppc-cputime64.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
@@ -726,8 +727,10 @@
 %patch208 -p1
 
 #
-# ppc64
+# PowerPC
 #
+# Additions to asm-powerpc/cputime.h
+%patch300 -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.
@@ -1558,6 +1561,9 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix asm-powerpc/cputime.h for new cputime64_t stuff
+
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Further lockdep improvements.
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:42:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:42:49 -0400
Subject: rpms/libselinux/devel .cvsignore, 1.112, 1.113 libselinux.spec,
	1.208, 1.209 sources, 1.114, 1.115
Message-ID: <200607051042.k65AgnLP017428@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux.spec sources 
Log Message:
* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-1
- Upgrade to latest from NSA
	* Lindent.
	* Merged {get,set}procattrcon patch set from Eric Paris.
	* Merged re-base of keycreate patch originally by Michael LeMay from Eric Paris.
	* Regenerated Flask headers from refpolicy.
	* Merged patch from Dan Walsh with:
	  - Added selinux_file_context_{cmp,verify}.
	  - Added selinux_lsetfilecon_default.
	  - Delay translation of contexts in matchpathcon.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- .cvsignore	16 Jun 2006 19:16:03 -0000	1.112
+++ .cvsignore	5 Jul 2006 10:42:47 -0000	1.113
@@ -87,3 +87,4 @@
 libselinux-1.30.11.tgz
 libselinux-1.30.12.tgz
 libselinux-1.30.15.tgz
+libselinux-1.30.19.tgz


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- libselinux.spec	21 Jun 2006 20:16:13 -0000	1.208
+++ libselinux.spec	5 Jul 2006 10:42:47 -0000	1.209
@@ -1,12 +1,11 @@
-%define libsepolver 1.12.14-1
+%define libsepolver 1.12.19-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.15
-Release: 5
+Version: 1.30.19
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
-Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver} swig
 Requires: libsepol >= %{libsepolver} setransd
@@ -48,7 +47,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -117,6 +115,17 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-1
+- Upgrade to latest from NSA
+	* Lindent.
+	* Merged {get,set}procattrcon patch set from Eric Paris.
+	* Merged re-base of keycreate patch originally by Michael LeMay from Eric Paris.
+	* Regenerated Flask headers from refpolicy.
+	* Merged patch from Dan Walsh with:
+	  - Added selinux_file_context_{cmp,verify}.
+	  - Added selinux_lsetfilecon_default.
+	  - Delay translation of contexts in matchpathcon.
+
 * Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.15-5
 - Yet another change to matchpathcon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sources	16 Jun 2006 19:16:03 -0000	1.114
+++ sources	5 Jul 2006 10:42:47 -0000	1.115
@@ -1 +1 @@
-029134e11d4d7de697888b2faa0218a1  libselinux-1.30.15.tgz
+dfc39b26d6c61e725bba2cbeae67414a  libselinux-1.30.19.tgz



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:43:00 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2351,
	1.2352 linux-2.6-gfs2-dlm.patch, 1.7,
	1.8 linux-2.6-gfs2-dlm-headers.patch, 1.2, NONE
Message-ID: <200607051043.k65Ah00l017481@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
Removed Files:
	linux-2.6-gfs2-dlm-headers.patch 
Log Message:
Update GFS2



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2351
retrieving revision 1.2352
diff -u -r1.2351 -r1.2352
--- kernel-2.6.spec	5 Jul 2006 10:23:48 -0000	1.2351
+++ kernel-2.6.spec	5 Jul 2006 10:42:56 -0000	1.2352
@@ -342,7 +342,6 @@
 
 # GFS/DLM
 Patch1500: linux-2.6-gfs2-dlm.patch
-Patch1501: linux-2.6-gfs2-dlm-headers.patch
 Patch1502: linux-2.6-gfs2-tux.patch
 
 # Misc bits.
@@ -871,7 +870,6 @@
 
 # GFS2/DLM
 %patch1500 -p1
-%patch1501 -p1
 %patch1502 -p1
 
 #
@@ -1563,6 +1561,7 @@
 %changelog
 * Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix asm-powerpc/cputime.h for new cputime64_t stuff
+- Update GFS2
 
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Further lockdep improvements.

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   29 
 fs/dlm/Makefile                    |   21 
 fs/dlm/ast.c                       |  167 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 ++++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  296 +++
 fs/dlm/device.c                    | 1239 ++++++++++++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  494 +++++
 fs/dlm/lock.c                      | 3547 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   50 
 fs/dlm/lockspace.c                 |  678 +++++++
 fs/dlm/lockspace.h                 |   24 
 fs/dlm/lowcomms.c                  | 1238 ++++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   89 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  106 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  762 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1103 +++++++++++
 fs/gfs2/bmap.h                     |   32 
 fs/gfs2/daemon.c                   |  196 ++
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1980 ++++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++++
 fs/gfs2/eattr.h                    |   97 +
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2282 +++++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  491 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  658 ++++++
 fs/gfs2/inode.c                    | 1357 ++++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 +++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  299 +++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 ++++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 ++++++++
 fs/gfs2/lops.h                     |   96 +
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  888 +++++++++
 fs/gfs2/meta_io.h                  |   89 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  304 +++
 fs/gfs2/ops_address.c              |  673 +++++++
 fs/gfs2/ops_address.h              |   17 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  285 ++
 fs/gfs2/ops_export.h               |   15 
 fs/gfs2/ops_file.c                 |  982 ++++++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  841 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 ++++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  472 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  195 ++
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/page.c                     |  268 ++
 fs/gfs2/page.h                     |   23 
 fs/gfs2/quota.c                    | 1286 +++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1529 +++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  928 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 ++++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 +++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  441 ++++
 include/linux/iflags.h             |  102 +
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   40 
 mm/filemap.c                       |    1 
 mm/readahead.c                     |    1 
 132 files changed, 40795 insertions(+), 20 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-gfs2-dlm.patch	29 Jun 2006 18:39:34 -0000	1.7
+++ linux-2.6-gfs2-dlm.patch	5 Jul 2006 10:42:57 -0000	1.8
@@ -1,8 +1,8 @@
 diff --git a/CREDITS b/CREDITS
-index 9bf714a..3ebb93b 100644
+index 66b9e7a..e7575a2 100644
 --- a/CREDITS
 +++ b/CREDITS
-@@ -3540,11 +3540,11 @@ S: Fargo, North Dakota 58122
+@@ -3541,11 +3541,11 @@ S: Fargo, North Dakota 58122
  S: USA
  
  N: Steven Whitehouse
@@ -67,10 +67,10 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1421f74..50817bf 100644
+index 5f76a4f..801829d 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -840,6 +840,16 @@ M:	jack at suse.cz
+@@ -852,6 +852,16 @@ M:	jack at suse.cz
  L:	linux-kernel at vger.kernel.org
  S:	Maintained
  
@@ -79,7 +79,7 @@
 +M:	pcaulfie at redhat.com
 +P:	David Teigland
 +M:	teigland at redhat.com
-+L:	linux-cluster at redhat.com
++L:	cluster-devel at redhat.com
 +W:	http://sources.redhat.com/cluster/
 +T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
 +S:	Supported
@@ -87,14 +87,14 @@
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:	Tobias Ringstrom
  M:	tori at unhappy.mine.nu
-@@ -1090,6 +1100,14 @@ M:	khc at pm.waw.pl
+@@ -1102,6 +1112,14 @@ M:	khc at pm.waw.pl
  W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
  S:	Maintained
  
 +GFS2 FILE SYSTEM
 +P:	Steven Whitehouse
 +M:	swhiteho at redhat.com
-+L:	linux-cluster at redhat.com
++L:	cluster-devel at redhat.com
 +W:	http://sources.redhat.com/cluster/
 +T:	git kernel.org:/pub/scm/linux/kernel/git/steve/gfs-2.6.git
 +S:	Supported
@@ -103,10 +103,10 @@
  P:	Hansjoerg Lipp
  M:	hjlipp at web.de
 diff --git a/fs/Kconfig b/fs/Kconfig
-index f9b5842..563a59e 100644
+index 53f5c6d..a7cd7db 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -323,6 +323,7 @@ config FS_POSIX_ACL
+@@ -323,6 +323,7 @@ #
  	default n
  
  source "fs/xfs/Kconfig"
@@ -114,7 +114,7 @@
  
  config OCFS2_FS
  	tristate "OCFS2 file system support (EXPERIMENTAL)"
-@@ -1824,6 +1825,7 @@ source "fs/partitions/Kconfig"
+@@ -1929,6 +1930,7 @@ source "fs/partitions/Kconfig"
  endmenu
  
  source "fs/nls/Kconfig"
@@ -123,10 +123,10 @@
  endmenu
  
 diff --git a/fs/Makefile b/fs/Makefile
-index 078d3d1..c731d2c 100644
+index 8913542..64df110 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -49,6 +49,7 @@ obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
+@@ -50,6 +50,7 @@ obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
  obj-y				+= devpts/
  
  obj-$(CONFIG_PROFILING)		+= dcookies.o
@@ -12194,7 +12194,7 @@
 +
 diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
 new file mode 100644
-index 0000000..115f30d
+index 0000000..8c27de8
 --- /dev/null
 +++ b/fs/gfs2/Kconfig
 @@ -0,0 +1,44 @@
@@ -12215,7 +12215,7 @@
 +
 +	To use the GFS2 filesystem, you will need to enable one or more of
 +	the below locking modules. Documentation and utilities for GFS2 can
-+	be found here: http://sources.redhat.com/cluster/gfs/
++	be found here: http://sources.redhat.com/cluster
 +
 +config GFS2_FS_LOCKING_NOLOCK
 +	tristate "GFS2 \"nolock\" locking module"
@@ -18053,10 +18053,10 @@
 +
 diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
 new file mode 100644
-index 0000000..35bac90
+index 0000000..dbeb4ad
 --- /dev/null
 +++ b/fs/gfs2/glock.c
-@@ -0,0 +1,2280 @@
+@@ -0,0 +1,2282 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -18475,7 +18475,7 @@
 + * @gl: the glock
 + * @state: the state we're requesting
 + * @flags: the modifier flags
-+ * @gfp_flags: __GFP_NOFAIL
++ * @gfp_flags:
 + *
 + * Figure out how big an impact this function has.  Either:
 + * 1) Replace it with a cache of structures hanging off the struct gfs2_sbd
@@ -18779,6 +18779,7 @@
 + * @gl: the glock
 + * @state: the state the caller wants us to change to
 + *
++ * Note: This may fail sliently if we are out of memory.
 + */
 +
 +static void handle_callback(struct gfs2_glock *gl, unsigned int state)
@@ -18803,8 +18804,9 @@
 +	} else {
 +		spin_unlock(&gl->gl_spin);
 +
-+		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY,
-+					 GFP_KERNEL | __GFP_NOFAIL),
++		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_KERNEL);
++		if (!new_gh)
++			return;
 +		set_bit(HIF_DEMOTE, &new_gh->gh_iflags);
 +		set_bit(HIF_DEALLOC, &new_gh->gh_iflags);
 +
@@ -21023,10 +21025,10 @@
 +#endif /* __GLOPS_DOT_H__ */
 diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
 new file mode 100644
-index 0000000..034a855
+index 0000000..90e0624
 --- /dev/null
 +++ b/fs/gfs2/incore.h
-@@ -0,0 +1,659 @@
+@@ -0,0 +1,658 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21263,7 +21265,6 @@
 +};
 +
 +enum {
-+	GIF_MIN_INIT		= 0,
 +	GIF_QD_LOCKED		= 1,
 +	GIF_PAGED		= 2,
 +	GIF_SW_PAGED		= 3,
@@ -21688,10 +21689,10 @@
 +
 diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
 new file mode 100644
-index 0000000..c19feb9
+index 0000000..6499c4f
 --- /dev/null
 +++ b/fs/gfs2/inode.c
-@@ -0,0 +1,1358 @@
+@@ -0,0 +1,1357 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -21930,7 +21931,6 @@
 +	}
 +
 +	gfs2_dinode_in(&ip->i_di, dibh->b_data);
-+	set_bit(GIF_MIN_INIT, &ip->i_flags);
 +
 +	brelse(dibh);
 +
@@ -27957,7 +27957,7 @@
 +
 diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
 new file mode 100644
-index 0000000..2523d42
+index 0000000..ddcd4dc
 --- /dev/null
 +++ b/fs/gfs2/meta_io.c
 @@ -0,0 +1,888 @@
@@ -28122,7 +28122,7 @@
 +	return try_to_free_buffers(page);
 +}
 +
-+static struct address_space_operations aspace_aops = {
++static const struct address_space_operations aspace_aops = {
 +	.writepage = gfs2_aspace_writepage,
 +	.releasepage = gfs2_aspace_releasepage,
 +};
@@ -29497,10 +29497,10 @@
 +
 diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
 new file mode 100644
-index 0000000..207363a
+index 0000000..27ce301
 --- /dev/null
 +++ b/fs/gfs2/ops_address.c
-@@ -0,0 +1,669 @@
+@@ -0,0 +1,673 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -30145,6 +30145,7 @@
 +	struct inode *inode = file->f_mapping->host;
 +	struct gfs2_inode *ip = GFS2_I(inode);
 +	struct gfs2_sbd *sdp = GFS2_SB(inode);
++	int ret;
 +
 +	if (rw == WRITE)
 +		return gfs2_direct_IO_write(iocb, iov, offset, nr_segs);
@@ -30153,12 +30154,15 @@
 +	    gfs2_assert_warn(sdp, !gfs2_is_stuffed(ip)))
 +		return -EINVAL;
 +
-+	return __blockdev_direct_IO(READ, iocb, inode, inode->i_sb->s_bdev, iov,
-+			 	    offset, nr_segs, gfs2_get_block, NULL,
-+				    DIO_OWN_LOCKING);
++	mutex_lock(&inode->i_mutex);
++	ret = __blockdev_direct_IO(READ, iocb, inode, inode->i_sb->s_bdev, iov,
++			 	   offset, nr_segs, gfs2_get_block, NULL,
++				   DIO_OWN_LOCKING);
++	mutex_unlock(&inode->i_mutex);
++	return ret;
 +}
 +
-+struct address_space_operations gfs2_file_aops = {
++const struct address_space_operations gfs2_file_aops = {
 +	.writepage = gfs2_writepage,
 +	.readpage = gfs2_readpage,
 +	.readpages = gfs2_readpages,
@@ -30172,7 +30176,7 @@
 +
 diff --git a/fs/gfs2/ops_address.h b/fs/gfs2/ops_address.h
 new file mode 100644
-index 0000000..b88addd
+index 0000000..a7ef3bf
 --- /dev/null
 +++ b/fs/gfs2/ops_address.h
 @@ -0,0 +1,17 @@
@@ -30188,7 +30192,7 @@
 +#ifndef __OPS_ADDRESS_DOT_H__
 +#define __OPS_ADDRESS_DOT_H__
 +
-+extern struct address_space_operations gfs2_file_aops;
++extern const struct address_space_operations gfs2_file_aops;
 +extern int gfs2_get_block(struct inode *inode, sector_t lblock,
 +			  struct buffer_head *bh_result, int create);
 +
@@ -30657,10 +30661,10 @@
 +#endif /* __OPS_EXPORT_DOT_H__ */
 diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
 new file mode 100644
-index 0000000..5e75419
+index 0000000..c8e2c98
 --- /dev/null
 +++ b/fs/gfs2/ops_file.c
-@@ -0,0 +1,1000 @@
+@@ -0,0 +1,982 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -31522,24 +31526,6 @@
 +		return gfs2_lm_plock(sdp, &name, file, cmd, fl);
 +}
 +
-+/**
-+ * gfs2_sendfile - Send bytes to a file or socket
-+ * @in_file: The file to read from
-+ * @out_file: The file to write to
-+ * @count: The amount of data
-+ * @offset: The beginning file offset
-+ *
-+ * Outputs: offset - updated according to number of bytes read
-+ *
-+ * Returns: The number of bytes sent, errno on failure
-+ */
-+
-+static ssize_t gfs2_sendfile(struct file *in_file, loff_t *offset, size_t count,
-+			     read_actor_t actor, void *target)
-+{
-+	return generic_file_sendfile(in_file, offset, count, actor, target);
-+}
-+
 +static int do_flock(struct file *file, int cmd, struct file_lock *fl)
 +{
 +	struct gfs2_file *fp = file->private_data;
@@ -31631,7 +31617,7 @@
 +		return do_flock(file, cmd, fl);
 +}
 +
-+struct file_operations gfs2_file_fops = {
++const struct file_operations gfs2_file_fops = {
 +	.llseek = gfs2_llseek,
 +	.read = gfs2_read,
 +	.readv = gfs2_file_readv,
@@ -31645,13 +31631,13 @@
 +	.release = gfs2_close,
 +	.fsync = gfs2_fsync,
 +	.lock = gfs2_lock,
-+	.sendfile = gfs2_sendfile,
++	.sendfile = generic_file_sendfile,
 +	.flock = gfs2_flock,
 +	.splice_read = generic_file_splice_read,
 +	.splice_write = generic_file_splice_write,
 +};
 +
-+struct file_operations gfs2_dir_fops = {
++const struct file_operations gfs2_dir_fops = {
 +	.readdir = gfs2_readdir,
 +	.unlocked_ioctl = gfs2_ioctl,
 +	.open = gfs2_open,
@@ -31663,7 +31649,7 @@
 +
 diff --git a/fs/gfs2/ops_file.h b/fs/gfs2/ops_file.h
 new file mode 100644
-index 0000000..a2edce3
+index 0000000..46302b5
 --- /dev/null
 +++ b/fs/gfs2/ops_file.h
 @@ -0,0 +1,20 @@
@@ -31683,16 +31669,16 @@
 +			      struct file_ra_state *ra_state,
 +			      char *buf, loff_t *pos, unsigned size);
 +
-+extern struct file_operations gfs2_file_fops;
-+extern struct file_operations gfs2_dir_fops;
++extern const struct file_operations gfs2_file_fops;
++extern const struct file_operations gfs2_dir_fops;
 +
 +#endif /* __OPS_FILE_DOT_H__ */
 diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
 new file mode 100644
-index 0000000..b68eb6b
+index 0000000..a86ce67
 --- /dev/null
 +++ b/fs/gfs2/ops_fstype.c
-@@ -0,0 +1,842 @@
+@@ -0,0 +1,841 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -31752,7 +31738,7 @@
 +	gfs2_tune_init(&sdp->sd_tune);
 +
 +	for (x = 0; x < GFS2_GL_HASH_SIZE; x++) {
-+		sdp->sd_gl_hash[x].hb_lock = RW_LOCK_UNLOCKED;
++		rwlock_init(&sdp->sd_gl_hash[x].hb_lock);
 +		INIT_LIST_HEAD(&sdp->sd_gl_hash[x].hb_list);
 +	}
 +	INIT_LIST_HEAD(&sdp->sd_reclaim_list);
@@ -32507,9 +32493,8 @@
 +	return error;
 +}
 +
-+static struct super_block *gfs2_get_sb(struct file_system_type *fs_type,
-+				       int flags, const char *dev_name,
-+				       void *data, struct vfsmount *mnt)
++static int gfs2_get_sb(struct file_system_type *fs_type, int flags,
++		const char *dev_name, void *data, struct vfsmount *mnt)
 +{
 +	return get_sb_bdev(fs_type, flags, dev_name, data, fill_super, mnt);
 +}
@@ -32559,10 +32544,10 @@
 +#endif /* __OPS_FSTYPE_DOT_H__ */
 diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
 new file mode 100644
-index 0000000..5d5ebbc
+index 0000000..8895baa
 --- /dev/null
 +++ b/fs/gfs2/ops_inode.c
-@@ -0,0 +1,1167 @@
+@@ -0,0 +1,1165 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -33527,10 +33512,8 @@
 +	brelse(dibh);
 +
 +	if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {
-+		gfs2_quota_change(ip, -ip->i_di.di_blocks,
-+				 ouid, ogid);
-+		gfs2_quota_change(ip, ip->i_di.di_blocks,
-+				 nuid, ngid);
++		gfs2_quota_change(ip, -ip->i_di.di_blocks, ouid, ogid);
++		gfs2_quota_change(ip, ip->i_di.di_blocks, nuid, ngid);
 +	}
 +
 + out_end_trans:
@@ -33756,7 +33739,7 @@
 +#endif /* __OPS_INODE_DOT_H__ */
 diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
 new file mode 100644
-index 0000000..5f5fc3c
+index 0000000..50ea7f2
 --- /dev/null
 +++ b/fs/gfs2/ops_super.c
 @@ -0,0 +1,472 @@
@@ -33966,7 +33949,7 @@
 +
 +static int gfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
 +{
-+	struct super_block *sb = dentry->d_sb;
++	struct super_block *sb = dentry->d_inode->i_sb;
 +	struct gfs2_sbd *sdp = sb->s_fs_info;
 +	struct gfs2_statfs_change sc;
 +	int error;
@@ -34781,10 +34764,10 @@
 +#endif /* __PAGE_DOT_H__ */
 diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
 new file mode 100644
-index 0000000..1892b29
+index 0000000..3ca65c3
 --- /dev/null
 +++ b/fs/gfs2/quota.c
-@@ -0,0 +1,1301 @@
+@@ -0,0 +1,1286 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -34828,7 +34811,6 @@
 +#include <linux/spinlock.h>
 +#include <linux/completion.h>
 +#include <linux/buffer_head.h>
-+#include <linux/tty.h>
 +#include <linux/sort.h>
 +#include <linux/fs.h>
 +#include <linux/gfs2_ondisk.h>
@@ -35716,25 +35698,11 @@
 +static int print_message(struct gfs2_quota_data *qd, char *type)
 +{
 +	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;
-+	char *line;
-+	int len;
-+
-+	line = kmalloc(MAX_LINE, GFP_KERNEL);
-+	if (!line)
-+		return -ENOMEM;
-+
-+	len = snprintf(line, MAX_LINE-1,
-+		       "GFS2: fsid=%s: quota %s for %s %u\r\n",
-+		       sdp->sd_fsname, type,
-+		       (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
-+		       qd->qd_id);
-+	line[MAX_LINE-1] = 0;
-+
-+	if (current->signal) { /* Is this test still required? */
-+		tty_write_message(current->signal->tty, line);
-+	}
 +
-+	kfree(line);
++	printk(KERN_INFO "GFS2: fsid=%s: quota %s for %s %u\r\n",
++	       sdp->sd_fsname, type,
++	       (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group",
++	       qd->qd_id);
 +
 +	return 0;
 +}
@@ -40609,6 +40577,64 @@
 +
 +#endif /* __UTIL_DOT_H__ */
 +
+diff --git a/include/linux/Kbuild b/include/linux/Kbuild
+index 2b8a7d6..2121cde 100644
+--- a/include/linux/Kbuild
++++ b/include/linux/Kbuild
+@@ -8,7 +8,7 @@ header-y += affs_fs.h affs_hardblocks.h 
+ 	atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h	\
+ 	awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h		\
+ 	bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h		\
+-	consolemap.h cycx_cfm.h dm-ioctl.h dn.h dqblk_v1.h		\
++	consolemap.h cycx_cfm.h dlm_device.h dm-ioctl.h dn.h dqblk_v1.h	\
+ 	dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h	\
+ 	fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h	\
+ 	fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h	\
+@@ -18,28 +18,29 @@ header-y += affs_fs.h affs_hardblocks.h 
+ 	if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h	\
+ 	in_route.h ioctl.h ip.h ipmi_msgdefs.h ip_mp_alg.h ipsec.h	\
+ 	ipx.h irda.h isdn_divertif.h iso_fs.h ite_gpio.h ixjuser.h	\
+-	jffs2.h keyctl.h limits.h major.h matroxfb.h meye.h minix_fs.h	\
+-	mmtimer.h mqueue.h mtio.h ncp_no.h netfilter_arp.h netrom.h	\
+-	nfs2.h nfs4_mount.h nfs_mount.h openprom_fs.h param.h		\
+-	pci_ids.h pci_regs.h personality.h pfkeyv2.h pg.h pkt_cls.h	\
+-	pkt_sched.h posix_types.h ppdev.h prctl.h ps2esdi.h qic117.h	\
+-	qnxtypes.h quotaio_v1.h quotaio_v2.h radeonfb.h raw.h		\
+-	resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h		\
+-	sound.h stddef.h synclink.h telephony.h termios.h ticable.h	\
+-	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h utime.h	\
+-	utsname.h video_decoder.h video_encoder.h videotext.h vt.h	\
+-	wavefront.h wireless.h xattr.h x25.h zorro_ids.h
++	jffs2.h keyctl.h limits.h lock_dlm_plock.h major.h matroxfb.h	\
++	meye.h minix_fs.h mmtimer.h mqueue.h mtio.h ncp_no.h		\
++	netfilter_arp.h netrom.h nfs2.h nfs4_mount.h nfs_mount.h	\
++	openprom_fs.h param.h pci_ids.h pci_regs.h personality.h	\
++	pfkeyv2.h pg.h pkt_cls.h pkt_sched.h posix_types.h ppdev.h	\
++	prctl.h ps2esdi.h qic117.h qnxtypes.h quotaio_v1.h quotaio_v2.h	\
++	radeonfb.h raw.h resource.h rose.h sctp.h smbno.h snmp.h	\
++	sockios.h som.h sound.h stddef.h synclink.h telephony.h		\
++	termios.h ticable.h times.h tiocl.h tipc.h toshiba.h		\
++	ultrasound.h un.h utime.h utsname.h video_decoder.h		\
++	video_encoder.h videotext.h vt.h wavefront.h wireless.h xattr.h	\
++	x25.h zorro_ids.h
+ 
+ unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h	\
+ 	atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h	\
+ 	capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h		\
+ 	cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h	\
+-	dccp.h dirent.h divert.h elfcore.h errno.h errqueue.h		\
++	dccp.h dirent.h divert.h dlm.h elfcore.h errno.h errqueue.h	\
+ 	ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h		\
+ 	filter.h flat.h fs.h ftape.h gameport.h generic_serial.h	\
+-	genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h	\
+-	i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h			\
+-	if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h		\
++	genhd.h gfs2_ondisk.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h	\
++	hiddev.h hpet.h i2c.h i2o-dev.h icmpv6.h iflags.h if_bridge.h	\
++	if_ec.h if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h	\
+ 	if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h	\
+ 	inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h		\
+ 	ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h		\
 diff --git a/include/linux/dlm.h b/include/linux/dlm.h
 new file mode 100644
 index 0000000..1b1dcb9
@@ -41010,10 +41036,10 @@
 +#define DLM_USER_LSFLG_FORCEFREE  2
 +
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index f813bc8..39e3d11 100644
+index 134b320..8f3ab56 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1330,6 +1330,9 @@ extern struct subsystem fs_subsys;
+@@ -1370,6 +1370,9 @@ extern struct subsystem fs_subsys;
  #define FLOCK_VERIFY_READ  1
  #define FLOCK_VERIFY_WRITE 2
  
@@ -41578,9 +41604,11 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _LINUX_IFLAGS_H */
---- linux-2.6.17.noarch/include/linux/kernel.h~	2006-06-26 19:07:21.865815000 -0400
-+++ linux-2.6.17.noarch/include/linux/kernel.h	2006-06-26 19:07:30.074595000 -0400
-@@ -32,6 +32,7 @@ extern const char linux_banner[];
+diff --git a/include/linux/kernel.h b/include/linux/kernel.h
+index 5c1ec1f..c3958ea 100644
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -32,6 +32,7 @@ #define STACK_MAGIC	0xdeadbeef
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
@@ -41634,32 +41662,20 @@
 +
 +#endif
 +
-diff --git a/kernel/printk.c b/kernel/printk.c
-index 19a9556..416b8f3 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -1023,6 +1023,7 @@ void tty_write_message(struct tty_struct
- 		tty->driver->write(tty, msg, strlen(msg));
- 	return;
- }
-+EXPORT_SYMBOL_GPL(tty_write_message);
- 
- /*
-  * printk rate limiting, lifted from the networking subsystem.
 diff --git a/mm/filemap.c b/mm/filemap.c
-index fd57442..a02a0b2 100644
+index d087fc3..b9c91ab 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -1044,6 +1044,7 @@ success:
+@@ -1122,6 +1122,7 @@ success:
  	desc->arg.buf += size;
  	return size;
  }
 +EXPORT_SYMBOL_GPL(file_read_actor);
  
- /*
-  * This is the "read()" routine for all filesystems
+ /**
+  * __generic_file_aio_read - generic filesystem read routine
 diff --git a/mm/readahead.c b/mm/readahead.c
-index 0f142a4..ba7db81 100644
+index aa7ec42..1ba736a 100644
 --- a/mm/readahead.c
 +++ b/mm/readahead.c
 @@ -38,6 +38,7 @@ file_ra_state_init(struct file_ra_state 


--- linux-2.6-gfs2-dlm-headers.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 10:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 06:43:23 -0400
Subject: rpms/checkpolicy/devel .cvsignore, 1.62, 1.63 checkpolicy.spec,
	1.100, 1.101 sources, 1.63, 1.64
Message-ID: <200607051043.k65AhNqb017582@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17512

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.8-1
- Latest upgrade from NSA
	* Lindent.
	* Merged patch to remove TE rule conflict checking from the parser
	  from Joshua Brindle.  This can only be done properly by the 
	  expander.
	* Merged patch to make checkpolicy/checkmodule handling of
	  duplicate/conflicting TE rules the same as the expander 
	  from Joshua Brindle.
	* Merged optionals in base take 2 patch set from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	24 May 2006 03:11:52 -0000	1.62
+++ .cvsignore	5 Jul 2006 10:43:20 -0000	1.63
@@ -46,3 +46,4 @@
 checkpolicy-1.30.3.tgz
 checkpolicy-1.30.4.tgz
 checkpolicy-1.30.5.tgz
+checkpolicy-1.30.9.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- checkpolicy.spec	24 May 2006 03:11:52 -0000	1.100
+++ checkpolicy.spec	5 Jul 2006 10:43:20 -0000	1.101
@@ -1,7 +1,7 @@
-%define libsepolver 1.12.5-1
+%define libsepolver 1.12.9-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.30.5
+Version: 1.30.9
 Release: 1
 License: GPL
 Group: Development/System
@@ -47,6 +47,17 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.8-1
+- Latest upgrade from NSA
+	* Lindent.
+	* Merged patch to remove TE rule conflict checking from the parser
+	  from Joshua Brindle.  This can only be done properly by the 
+	  expander.
+	* Merged patch to make checkpolicy/checkmodule handling of
+	  duplicate/conflicting TE rules the same as the expander 
+	  from Joshua Brindle.
+	* Merged optionals in base take 2 patch set from Joshua Brindle.
+
 * Wed May 23 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.5-1
 - Latest upgrade from NSA
 	* Merged compiler cleanup patch from Karl MacMillan.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	24 May 2006 03:11:52 -0000	1.63
+++ sources	5 Jul 2006 10:43:21 -0000	1.64
@@ -1 +1 @@
-ec7b2a62668d960e6160239152f20879  checkpolicy-1.30.5.tgz
+84c291d85009265c7d6839fd00d141e7  checkpolicy-1.30.9.tgz



From fedora-cvs-commits at redhat.com  Wed Jul  5 11:50:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 07:50:05 -0400
Subject: rpms/udev/devel udev.spec,1.172,1.173
Message-ID: <200607051150.k65Bo5jj019514@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19475

Modified Files:
	udev.spec 
Log Message:
version 095


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- udev.spec	14 Jun 2006 10:20:50 -0000	1.172
+++ udev.spec	5 Jul 2006 11:50:02 -0000	1.173
@@ -1,10 +1,8 @@
-%define udev_kernel_includes 2.6.6
-
 %define debug false
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 094
+Version: 095
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -327,6 +325,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Jul  5 2006 Harald Hoyer <harald at redhat.com> - 095-1
+- version 095
+
 * Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 094-1
 - version 094
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 11:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 07:50:40 -0400
Subject: rpms/udev/devel .cvsignore,1.37,1.38 sources,1.37,1.38
Message-ID: <200607051150.k65Boe61019769@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19729

Modified Files:
	.cvsignore sources 
Log Message:
version 095


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	14 Jun 2006 10:21:55 -0000	1.37
+++ .cvsignore	5 Jul 2006 11:50:38 -0000	1.38
@@ -1 +1 @@
-udev-094.tar.bz2
+udev-095.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	14 Jun 2006 10:21:55 -0000	1.37
+++ sources	5 Jul 2006 11:50:38 -0000	1.38
@@ -1 +1 @@
-9e525da5c8cce9ed2c6d7812016df1f7  udev-094.tar.bz2
+587e1b43cddb5e71196a38818e8938b0  udev-095.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul  5 11:57:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 07:57:42 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch, NONE,
	1.1 openoffice.org.spec, 1.672, 1.673
Message-ID: <200607051157.k65BvgC4022464@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22398

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch 
Log Message:
recently-used fixes

openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch:
 recently_used_file_handler.cxx |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch ---
Index: shell/source/unix/sysshell/recently_used_file_handler.cxx
===================================================================
RCS file: /cvs/gsl/shell/source/unix/sysshell/recently_used_file_handler.cxx,v
retrieving revision 1.5
diff -u -p -u -w -r1.5 recently_used_file_handler.cxx
--- openoffice.org.orig/shell/source/unix/sysshell/recently_used_file_handler.cxx	7 Sep 2005 19:56:25 -0000	1.5
+++ openoffice.org/shell/source/unix/sysshell/recently_used_file_handler.cxx	16 Jun 2006 10:40:51 -0000
@@ -49,6 +49,10 @@
 #include "rtl/string.hxx"
 #endif
 
+#ifndef _RTL_STRBUF_HXX_
+#include "rtl/strbuf.hxx"
+#endif
+
 #include "osl/thread.h"
 
 #ifndef INCLUDED_RECENTLY_USED_FILE_HXX
@@ -212,10 +216,33 @@ namespace /* private */ {
             write_xml_end_tag(TAG_RECENT_ITEM, file);            
         }
         
+		static rtl::OString escape_content(const string_t &text)
+		{
+			rtl::OStringBuffer aBuf;
+			for (sal_Int32 i = 0; i < text.length(); i++)
+			{
+#               define MAP(a,b) case a: aBuf.append(b); break
+				switch (text[i])
+				{
+					MAP ('&',  "&amp;");
+					MAP ('<',  "&lt;");
+					MAP ('>',  "&gt;");
+					MAP ('\'', "&apos;");
+					MAP ('"',  "&quot;");
+				default:
+					aBuf.append(text[i]);
+					break;
+				}
+#               undef MAP
+			}
+			return aBuf.makeStringAndClear();
+		}
+        
         void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const
         {            
             write_xml_start_tag(name, file);
-            file.write(value.c_str(), value.length());
+			rtl::OString escaped = escape_content (value);
+            file.write(escaped.getStr(), escaped.getLength());
             write_xml_end_tag(name, file);
         }
         
@@ -541,7 +568,7 @@ const rtl::OUString DEFAULT_CONTEXT = rt
 
 // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
 // to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 {
 	rtl::OUString extUrl;
 		
@@ -572,7 +599,7 @@ extern "C" void add_to_recently_used_fil
         rtl::OUString externalUrl = translateToExternalUrl(file_url);
 	
         read_recently_used_items(ruf, item_list);	
-        recently_used_item_list_add(item_list, (externalUrl.getLength()) ? externalUrl : file_url, mime_type);
+        recently_used_item_list_add(item_list, externalUrl.getLength() ? externalUrl : file_url, mime_type);
         write_recently_used_items(ruf, item_list);                                
     }
     catch(const char* ex)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -r1.672 -r1.673
--- openoffice.org.spec	30 Jun 2006 07:30:47 -0000	1.672
+++ openoffice.org.spec	5 Jul 2006 11:57:40 -0000	1.673
@@ -177,6 +177,7 @@
 Patch49: disable-java-applets.diff
 Patch50: sax+source+expatwrap+xml2utf.cxx.diff
 Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch52: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -837,6 +838,7 @@
 %patch49 -p1 -b .disable-java-applets.diff
 %patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
 %patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
+%patch52 -p1 -b .ooo66510.shell.recentlyused.patch
 
 
 %if %{includingexternals}



From fedora-cvs-commits at redhat.com  Wed Jul  5 12:40:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 08:40:09 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.284,1.285
Message-ID: <200607051240.k65Ce99P016557@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Don't require tomcat on ppc64, s390, or s390x until we've got it there.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- eclipse.spec	4 Jul 2006 22:25:52 -0000	1.284
+++ eclipse.spec	5 Jul 2006 12:40:06 -0000	1.285
@@ -572,6 +572,7 @@
 rm com.jcraft.jsch_*.jar
 popd
 
+%ifnarch ppc64 s390 s390x
 ## BEGIN TOMCAT ##
 rm plugins/org.eclipse.tomcat/commons-beanutils.jar
 rm plugins/org.eclipse.tomcat/commons-collections.jar
@@ -628,6 +629,7 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
 ## END TOMCAT ##
+%endif
 build-jar-repository -s -p plugins/org.junit junit
 
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
@@ -1055,6 +1057,8 @@
 # FIXME
 #rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 #ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
+
+%ifnarch ppc64 s390 s390x
 ## BEGIN TOMCAT ##
 rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
 rm plugins/org.eclipse.tomcat_*/commons-collections.jar
@@ -1099,6 +1103,7 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
 ## END TOMCAT ##
+%endif
 build-jar-repository -s -p plugins/org.junit_* junit
 
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
@@ -1624,6 +1629,9 @@
 %endif
 
 %changelog
+* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
+- Don't require tomcat on ppc64, s390, or s390x until we've got it there.
+
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 12:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 08:53:05 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.91,1.92
Message-ID: <200607051253.k65Cr597003561@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
not needed


linux-2.6-compile-fixes.patch:
 Makefile |    4 ----
 1 files changed, 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- linux-2.6-compile-fixes.patch	5 Jul 2006 09:28:40 -0000	1.91
+++ linux-2.6-compile-fixes.patch	5 Jul 2006 12:53:02 -0000	1.92
@@ -12,21 +12,3 @@
  # Make variables (CC, etc...)
  
  AS		= $(CROSS_COMPILE)as
-[CPUFREQ] Fix implicit declarations in ondemand.
-
-drivers/cpufreq/cpufreq_ondemand.c: In function ???dbs_check_cpu???:
-drivers/cpufreq/cpufreq_ondemand.c:238: error: implicit declaration of function ???jiffies64_to_cputime64???
-drivers/cpufreq/cpufreq_ondemand.c:239: error: implicit declaration of function ???cputime64_sub???
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6/drivers/cpufreq/cpufreq_ondemand.c~	2006-07-05 05:19:26.000000000 -0400
-+++ linux-2.6/drivers/cpufreq/cpufreq_ondemand.c	2006-07-05 05:20:01.000000000 -0400
-@@ -18,6 +18,7 @@
- #include <linux/jiffies.h>
- #include <linux/kernel_stat.h>
- #include <linux/mutex.h>
-+#include <asm/cputime.h>
- 
- /*
-  * dbs is used in this file as a shortform for demandbased switching



From fedora-cvs-commits at redhat.com  Wed Jul  5 13:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 09:04:17 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.2,1.3
Message-ID: <200607051304.k65D4HLu006602@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
yet more lockdep goodness.


linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h |    6 +-
 linux-2.6.17-mm6/kernel/lockdep.c   |   14 ++++-
 linux-2.6.17-mm6/net/atm/ipcommon.c |   23 +++++++--
 linux/arch/x86_64/kernel/smpboot.c  |    4 -
 linux/include/linux/completion.h    |    6 +-
 linux/include/linux/lockdep.h       |    2 
 linux/kernel/lockdep.c              |   87 ++++++++++++++++++++++--------------
 7 files changed, 92 insertions(+), 50 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-lockdep-fixes.patch	5 Jul 2006 09:28:40 -0000	1.2
+++ linux-2.6-lockdep-fixes.patch	5 Jul 2006 13:04:01 -0000	1.3
@@ -614,3 +614,125 @@
  }
  
 
+From davej  Wed Jul  5 06:05:34 2006
+Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S964781AbWGEJ7B at vger.kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
+	version=3.1.3
+Envelope-to: davej at kernelslacker.org
+Delivery-date: Wed, 05 Jul 2006 10:59:26 +0100
+Received: from testure.choralone.org [194.9.77.134]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Wed, 05 Jul 2006 06:05:34 -0400 (EDT)
+Received: from vger.kernel.org ([209.132.176.167])
+	by testure.choralone.org with esmtp (Exim 4.62)
+	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S964781AbWGEJ7B at vger.kernel.org>)
+	id 1Fy4AH-0002mo-GQ
+	for davej at kernelslacker.org; Wed, 05 Jul 2006 10:59:26 +0100
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S964781AbWGEJ7B (ORCPT <rfc822;davej at kernelslacker.org>);
+	Wed, 5 Jul 2006 05:59:01 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S964785AbWGEJ7B
+	(ORCPT <rfc822;linux-kernel-outgoing>);
+	Wed, 5 Jul 2006 05:59:01 -0400
+Received: from mx3.mail.elte.hu ([157.181.1.138]:55998 "EHLO mx3.mail.elte.hu")
+	by vger.kernel.org with ESMTP id S964781AbWGEJ7A (ORCPT
+	<rfc822;linux-kernel at vger.kernel.org>);
+	Wed, 5 Jul 2006 05:59:00 -0400
+Received: from chiara.elte.hu ([157.181.151.252])
+	by mx3.mail.elte.hu with esmtp (Exim)
+	id 1Fy49l-0004H2-FQ
+	from <mingo at elte.hu>; Wed, 05 Jul 2006 11:58:53 +0200
+Received: by chiara.elte.hu (Postfix, from userid 17806)
+	id E6E571FC2; Wed,  5 Jul 2006 11:58:54 +0200 (CEST)
+Date:	Wed, 5 Jul 2006 11:54:25 +0200
+From:	Ingo Molnar <mingo at elte.hu>
+To:	Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
+Cc:	linux-kernel at vger.kernel.org,
+	Arjan van de Ven <arjan at infradead.org>
+Subject: [patch] uninline init_waitqueue_*() functions, fix
+Message-ID: <20060705095425.GA13874 at elte.hu>
+References: <20060705084914.GA8798 at elte.hu>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <20060705084914.GA8798 at elte.hu>
+User-Agent: Mutt/1.4.2.1i
+Received-SPF: softfail (mx3: transitioning domain of elte.hu does not designate 157.181.151.252 as permitted sender) client-ip=157.181.151.252; envelope-from=mingo at elte.hu; helo=chiara.elte.hu;
+X-ELTE-SpamScore: 0.1
+X-ELTE-SpamLevel: 
+X-ELTE-SpamCheck: no
+X-ELTE-SpamVersion: ELTE 2.0 
+X-ELTE-SpamCheck-Details: score=0.1 required=5.9 tests=AWL,BAYES_50 autolearn=no SpamAssassin version=3.0.3
+	0.0 BAYES_50               BODY: Bayesian spam probability is 40 to 60%
+	[score: 0.5011]
+	0.1 AWL                    AWL: From: address is in the auto white-list
+X-ELTE-VirusStatus: clean
+Sender:	linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+X-Mailing-List:	linux-kernel at vger.kernel.org
+Status: RO
+Content-Length: 2171
+Lines: 58
+
+Subject: uninline init_waitqueue_*() functions, fix
+From: Ingo Molnar <mingo at elte.hu>
+
+fix lockdep on-stack-completion initializer, now that waitqueue_lock_key 
+is private to kernel/wait.c.
+
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+---
+ arch/x86_64/kernel/smpboot.c |    4 +---
+ include/linux/completion.h   |    5 ++++-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+Index: linux/arch/x86_64/kernel/smpboot.c
+===================================================================
+--- linux.orig/arch/x86_64/kernel/smpboot.c
++++ linux/arch/x86_64/kernel/smpboot.c
+@@ -771,12 +771,10 @@ static int __cpuinit do_boot_cpu(int cpu
+ 	unsigned long start_rip;
+ 	struct create_idle c_idle = {
+ 		.cpu = cpu,
+-		.done = COMPLETION_INITIALIZER(c_idle.done),
++		.done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),
+ 	};
+ 	DECLARE_WORK(work, do_fork_idle, &c_idle);
+ 
+-	lockdep_set_class(&c_idle.done.wait.lock, &waitqueue_lock_key);
+-
+ 	/* allocate memory for gdts of secondary cpus. Hotplug is considered */
+ 	if (!cpu_gdt_descr[cpu].address &&
+ 		!(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) {
+Index: linux/include/linux/completion.h
+===================================================================
+--- linux.orig/include/linux/completion.h
++++ linux/include/linux/completion.h
+@@ -18,6 +18,9 @@ struct completion {
+ #define COMPLETION_INITIALIZER(work) \
+ 	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
+ 
++#define COMPLETION_INITIALIZER_ONSTACK(work) \
++	({ init_completion(&work); work; })
++
+ #define DECLARE_COMPLETION(work) \
+ 	struct completion work = COMPLETION_INITIALIZER(work)
+ 
+@@ -28,7 +31,7 @@ struct completion {
+  */
+ #ifdef CONFIG_LOCKDEP
+ # define DECLARE_COMPLETION_ONSTACK(work) \
+-	struct completion work = ({ init_completion(&work); work; })
++	struct completion work = COMPLETION_INITIALIZER_ONSTACK(work)
+ #else
+ # define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work)
+ #endif
+-
+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/
+



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:15:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:15:12 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.11,1.12
Message-ID: <200607051415.k65EFCrh008152@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	config-powerpc64-iseries 
Log Message:
No I/OAT


Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-powerpc64-iseries	24 Apr 2006 22:13:50 -0000	1.11
+++ config-powerpc64-iseries	5 Jul 2006 14:15:09 -0000	1.12
@@ -84,4 +84,5 @@
 # CONFIG_SOUND is not set
 # CONFIG_MMC is not set
 # CONFIG_INFINIBAND is not set
+# CONFIG_INTEL_IOATDMA is not set
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:29:15 -0400
Subject: rpms/kexec-tools/FC-5 kexec-tools-1.101-commandline-overflow.patch,
	NONE, 1.1 kexec-tools.spec, 1.20, 1.21
Message-ID: <200607051429.k65ETFTU028790@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28763

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-commandline-overflow.patch 
Log Message:
adding patch for bz 197391

kexec-tools-1.101-commandline-overflow.patch:
 kdump.sysconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kexec-tools-1.101-commandline-overflow.patch ---
--- kexec-tools-1.101/kdump.sysconfig.orig	2006-07-05 10:04:14.000000000 -0400
+++ kexec-tools-1.101/kdump.sysconfig	2006-07-05 10:04:25.000000000 -0400
@@ -9,7 +9,7 @@ KDUMP_KERNELVER=""
 #   KDUMP_COMMANDLINE="ro root=LABEL=/"
 # If a command line is not specified, the default will be taken from
 # /proc/cmdline
-KDUMP_COMMANDLINE="REPLACEME"
+KDUMP_COMMANDLINE=""
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kexec-tools.spec	22 Jun 2006 18:39:29 -0000	1.20
+++ kexec-tools.spec	5 Jul 2006 14:29:12 -0000	1.21
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 18
+Release: 19%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -30,7 +30,10 @@
 #
 Patch301: kexec-ppc64-ingnore-args-linux.patch
 
+#
+# Patches 501 forward are general arch-independent patches
 Patch501: kexec-tools-1.101-Makefile.patch
+Patch502: kexec-tools-1.101-commandline-overflow.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -46,6 +49,7 @@
 %patch101 -p1
 %patch301 -p1
 %patch501 -p1
+%patch502 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
@@ -67,10 +71,6 @@
 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
 /sbin/chkconfig --add kdump
 
 %postun
@@ -98,6 +98,10 @@
 %doc TODO
 
 %changelog
+* Wed Jul 05 2006 Neil Horman <nhorman at redhat.com> -1.101-19.fc5
+- Adding command line overflow patch
+- Modifying rev number to include dist
+
 * Thu Jun 22 2006 Neil Horman <nhorman at redhat.com> -1.101-18
 - Bumping revision number
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:35:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:35:19 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.79, 1.80 sources,
	1.82, 1.83 system-config-printer.spec, 1.43, 1.44
Message-ID: <200607051435.k65EZJlg029821@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Wed Jul  5 2006 Tim Waugh <twaugh at redhat.com>
- Updated to pycups-1.9.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	3 Jul 2006 14:42:43 -0000	1.79
+++ .cvsignore	5 Jul 2006 14:35:16 -0000	1.80
@@ -59,3 +59,4 @@
 system-config-printer-0.7.18.tar.bz2
 system-config-printer-0.7.19.tar.bz2
 system-config-printer-0.7.20.tar.bz2
+pycups-1.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources	3 Jul 2006 14:42:43 -0000	1.82
+++ sources	5 Jul 2006 14:35:16 -0000	1.83
@@ -1,2 +1,2 @@
-c00f3b265bc10efcc67561f2ae2e8465  pycups-1.9.11.tar.bz2
 f22ba9b8a5e6657681c49966baa05125  system-config-printer-0.7.20.tar.bz2
+c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- system-config-printer.spec	3 Jul 2006 14:42:43 -0000	1.43
+++ system-config-printer.spec	5 Jul 2006 14:35:16 -0000	1.44
@@ -1,4 +1,4 @@
-%define pycups_version 1.9.11
+%define pycups_version 1.9.12
 
 Summary: A printer administration tool
 Name: system-config-printer
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Wed Jul  5 2006 Tim Waugh <twaugh at redhat.com>
+- Updated to pycups-1.9.12.
+
 * Mon Jul  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.20-1
 - 0.7.20.
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:39:06 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.80, 1.81 sources,
	1.83, 1.84 system-config-printer.spec, 1.44, 1.45
Message-ID: <200607051439.k65Ed69Q030932@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
- 0.7.21.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	5 Jul 2006 14:35:16 -0000	1.80
+++ .cvsignore	5 Jul 2006 14:39:03 -0000	1.81
@@ -60,3 +60,4 @@
 system-config-printer-0.7.19.tar.bz2
 system-config-printer-0.7.20.tar.bz2
 pycups-1.9.12.tar.bz2
+system-config-printer-0.7.21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	5 Jul 2006 14:35:16 -0000	1.83
+++ sources	5 Jul 2006 14:39:03 -0000	1.84
@@ -1,2 +1,2 @@
-f22ba9b8a5e6657681c49966baa05125  system-config-printer-0.7.20.tar.bz2
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
+aee11f6a349821e2b42edc65cfb2588f  system-config-printer-0.7.21.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- system-config-printer.spec	5 Jul 2006 14:35:16 -0000	1.44
+++ system-config-printer.spec	5 Jul 2006 14:39:03 -0000	1.45
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.20
+Version: 0.7.21
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,8 +114,9 @@
 exit 0
 
 %changelog
-* Wed Jul  5 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Jul  5 2006 Tim Waugh <twaugh at redhat.com> 0.7.21-1
 - Updated to pycups-1.9.12.
+- 0.7.21.
 
 * Mon Jul  3 2006 Tim Waugh <twaugh at redhat.com> 0.7.20-1
 - 0.7.20.



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:44:09 -0400
Subject: rpms/kexec-tools/FC-5 kdump.sysconfig, 1.3, 1.4 kexec-tools.spec,
	1.21, 1.22 kexec-tools-1.101-commandline-overflow.patch, 1.1, NONE
Message-ID: <200607051444.k65Ei9bg000420@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv390

Modified Files:
	kdump.sysconfig kexec-tools.spec 
Removed Files:
	kexec-tools-1.101-commandline-overflow.patch 
Log Message:
adjusting command line overflow patch


Index: kdump.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kdump.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdump.sysconfig	27 Feb 2006 09:19:03 -0000	1.3
+++ kdump.sysconfig	5 Jul 2006 14:44:07 -0000	1.4
@@ -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="REPLACEME"
+KDUMP_COMMANDLINE=""
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kexec-tools.spec	5 Jul 2006 14:29:12 -0000	1.21
+++ kexec-tools.spec	5 Jul 2006 14:44:07 -0000	1.22
@@ -33,7 +33,6 @@
 #
 # Patches 501 forward are general arch-independent patches
 Patch501: kexec-tools-1.101-Makefile.patch
-Patch502: kexec-tools-1.101-commandline-overflow.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -49,7 +48,6 @@
 %patch101 -p1
 %patch301 -p1
 %patch501 -p1
-%patch502 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .


--- kexec-tools-1.101-commandline-overflow.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:45:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:45:25 -0400
Subject: rpms/kexec-tools/FC-5 kexec-tools.spec,1.22,1.23
Message-ID: <200607051445.k65EjPiB001023@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv992

Modified Files:
	kexec-tools.spec 
Log Message:
bumping rev number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/FC-5/kexec-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kexec-tools.spec	5 Jul 2006 14:44:07 -0000	1.22
+++ kexec-tools.spec	5 Jul 2006 14:45:23 -0000	1.23
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 19%{dist}
+Release: 20%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:49:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:49:47 -0400
Subject: rpms/rpm/devel rpm.spec,1.207,1.208
Message-ID: <200607051449.k65EnlFP017422@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17385

Modified Files:
	rpm.spec 
Log Message:
ipv6 support


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- rpm.spec	28 Jun 2006 20:36:18 -0000	1.207
+++ rpm.spec	5 Jul 2006 14:49:45 -0000	1.208
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 26
+Release: 27
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -54,6 +54,7 @@
 Patch26: rpm-4.4.2-rpmfc-skip.patch
 Patch27: rpm-4.4.2-noselinux-verify.patch
 Patch28: rpm-4.4.2-python-aslist.patch
+Patch29: rpm-4.4.2-rpmio-ipv6.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -62,6 +63,7 @@
 Requires: popt = 1.10.2
 Obsoletes: rpm-perl < %{version}
 
+BuildRequires: autoconf
 BuildRequires: elfutils-devel >= 0.112
 
 BuildRequires: sed readline-devel zlib-devel
@@ -190,8 +192,12 @@
 %patch25 -p1 -b .develdeps
 %patch26 -p1 -b .fcskip
 %patch27 -p0 -b .nosever
-%patch6 -p1  -b .matchpathcon
+#patch6 -p1  -b .matchpathcon
 %patch28 -p1 -b .aslist
+%patch29 -p1 -b .ipv6
+
+# rebuild configure for ipv6
+autoconf
 
 %build
 
@@ -585,6 +591,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jul 05 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-27
+- IPv4/6 and EPSV support by Arkadiusz Miskiewicz <misiek at pld.org.pl>
+
 * Wed Jun 28 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-26
 - Force CHANGELOGTIME to be a list in rpm-python
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:53:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:53:08 -0400
Subject: rpms/rpm/devel rpm-4.4.2-rpmio-ipv6.patch,NONE,1.1
Message-ID: <200607051453.k65Er8Ln018716@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18667

Added Files:
	rpm-4.4.2-rpmio-ipv6.patch 
Log Message:
Add patch


rpm-4.4.2-rpmio-ipv6.patch:
 configure.ac  |    3 -
 rpmio/rpmio.c |  171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 rpmio/url.c   |   10 +++
 3 files changed, 173 insertions(+), 11 deletions(-)

--- NEW FILE rpm-4.4.2-rpmio-ipv6.patch ---
--- rpm-4.4.2/configure.ac.ipv6	2006-07-05 10:06:54.000000000 -0400
+++ rpm-4.4.2/configure.ac	2006-07-05 10:07:00.000000000 -0400
@@ -858,7 +858,8 @@
 dnl XXX AC_FUNC_FORK([])
 dnl XXX AC_CHECK_FUNCS(gethostname mkdir mkfifo rmdir select uname)
 
-AC_CHECK_FUNCS(basename getcwd getwd inet_aton mtrace putenv realpath setenv)
+AC_CHECK_FUNCS(basename getaddrinfo getcwd getnameinfo getwd inet_aton)
+AC_CHECK_FUNCS(mtrace putenv realpath setenv)
 AC_CHECK_FUNCS(stpcpy stpncpy strcspn)
 AC_CHECK_FUNCS(strdup strndup strerror strtol strtoul strspn strstr)
 
--- rpm-4.4.2/rpmio/rpmio.c.ipv6	2005-01-25 22:39:58.000000000 -0500
+++ rpm-4.4.2/rpmio/rpmio.c	2006-07-05 10:04:15.000000000 -0400
@@ -9,6 +9,10 @@
 # include <machine/types.h>
 #endif
 
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+
 #include <netinet/in.h>
 #include <arpa/inet.h>		/* XXX for inet_aton and HP-UX */
 
@@ -750,6 +754,7 @@
     return retstr;
 }
 
+#if !defined(HAVE_GETADDRINFO)
 #if !defined(USE_ALT_DNS) || !USE_ALT_DNS 
 static int mygethostbyname(const char * host,
 		/*@out@*/ struct in_addr * address)
@@ -800,14 +805,50 @@
 }
 /*@=compdef@*/
 /*@=boundsread@*/
+#endif
 
 static int tcpConnect(FD_t ctrl, const char * host, int port)
 	/*@globals h_errno, fileSystem, internalState @*/
 	/*@modifies ctrl, fileSystem, internalState @*/
 {
-    struct sockaddr_in sin;
     int fdno = -1;
     int rc;
+#ifdef	HAVE_GETADDRINFO
+    struct addrinfo hints, *res, *res0;
+    char pbuf[NI_MAXSERV];
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    sprintf(pbuf, "%d", port);
+    pbuf[sizeof(pbuf)-1] = '\0';
+    rc = FTPERR_FAILED_CONNECT;
+    if (getaddrinfo(host, pbuf, &hints, &res0) == 0) {
+	for (res = res0; res != NULL; res= res->ai_next) {
+	    if ((fdno = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0)
+		continue;
+	    if (connect(fdno, res->ai_addr, res->ai_addrlen) < 0) {
+		close(fdno);
+		continue;
+	    }
+	    /* success */
+	    rc = 0;
+	    if (_ftp_debug) {
+		char hbuf[NI_MAXHOST];
+		getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
+				NULL, 0, NI_NUMERICHOST);
+		fprintf(stderr,"++ connect [%s]:%d on fdno %d\n",
+				/*@-unrecog@*/ hbuf /*@=unrecog@*/, port, fdno);
+	    }
+	    break;
+	}
+	freeaddrinfo(res0);
+    }
+    if (rc < 0)
+	goto errxit;
+
+#else	/* HAVE_GETADDRINFO */			    
+    struct sockaddr_in sin;
 
 /*@-boundswrite@*/
     memset(&sin, 0, sizeof(sin));
@@ -842,6 +883,7 @@
 inet_ntoa(sin.sin_addr)
 /*@=unrecog =moduncon =evalorderuncon @*/ ,
 (int)ntohs(sin.sin_port), fdno);
+#endif	/* HAVE_GETADDRINFO */
 
     fdSetFdno(ctrl, (fdno >= 0 ? fdno : -1));
     return 0;
@@ -1174,12 +1216,17 @@
 int ftpReq(FD_t data, const char * ftpCmd, const char * ftpArg)
 {
     urlinfo u = data->url;
+#if !defined(HAVE_GETADDRINFO)
     struct sockaddr_in dataAddress;
+#endif	/* HAVE_GETADDRINFO */
+    char remoteIP[NI_MAXHOST];
     char * cmd;
     int cmdlen;
     char * passReply;
     char * chptr;
     int rc;
+    int epsv;
+    int port;
 
 /*@-boundswrite@*/
     URLSANE(u);
@@ -1214,8 +1261,35 @@
 	data->contentLength = cl;
     }
 
+    epsv = 0;
     passReply = NULL;
-    rc = ftpCommand(u, &passReply, "PASV", NULL);
+#ifdef HAVE_GETNAMEINFO
+    rc = ftpCommand(u, &passReply, "EPSV", NULL);
+    if (rc==0) {
+#ifdef HAVE_GETADDRINFO
+	struct sockaddr_storage ss;
+#else /* HAVE_GETADDRINFO */
+	struct sockaddr_in ss;
+#endif /* HAVE_GETADDRINFO */
+	int size;
+	/* we need to know IP of remote host */
+	size=sizeof(ss);
+	if ((getpeername(fdFileno(c2f(u->ctrl)), (struct sockaddr *)&ss, &size) == 0) &&
+			(getnameinfo((struct sockaddr *)&ss, size, remoteIP, sizeof(remoteIP),
+				NULL, 0, NI_NUMERICHOST) == 0))
+		epsv++;
+	else {
+		/* abort EPSV and fall back to PASV */
+		rc = ftpCommand(u, &passReply, "ABOR", NULL);
+		if (rc) {
+		    rc = FTPERR_PASSIVE_ERROR;
+		    goto errxit;
+		}
+	}
+    }
+    if (epsv==0)
+#endif /* HAVE_GETNAMEINFO */
+        rc = ftpCommand(u, &passReply, "PASV", NULL);
     if (rc) {
 	rc = FTPERR_PASSIVE_ERROR;
 	goto errxit;
@@ -1230,6 +1304,15 @@
     if (*chptr != ')') return FTPERR_PASSIVE_ERROR;
     *chptr-- = '\0';
 
+    if (epsv) {
+	int i;
+        if(sscanf(passReply,"%*c%*c%*c%d%*c",&i) != 1) {
+	   rc = FTPERR_PASSIVE_ERROR;
+	   goto errxit;
+	}
+	port = i;
+    } else {
+ 
     while (*chptr && *chptr != ',') chptr--;
     if (*chptr != ',') return FTPERR_PASSIVE_ERROR;
     chptr--;
@@ -1241,13 +1324,11 @@
        port number portion */
 
     {	int i, j;
-	memset(&dataAddress, 0, sizeof(dataAddress));
-	dataAddress.sin_family = AF_INET;
 	if (sscanf(chptr, "%d,%d", &i, &j) != 2) {
 	    rc = FTPERR_PASSIVE_ERROR;
 	    goto errxit;
 	}
-	dataAddress.sin_port = htons((((unsigned)i) << 8) + j);
+	port = (((unsigned)i) << 8) + j;
     }
 
     chptr = passReply;
@@ -1255,9 +1336,75 @@
 	if (*chptr == ',') *chptr = '.';
     }
 /*@=boundswrite@*/
+    sprintf(remoteIP, "%s", passReply);
+    } /* if (epsv) */
+
+#ifdef HAVE_GETADDRINFO
+    {
+        struct addrinfo hints, *res, *res0;
+	char pbuf[NI_MAXSERV];
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_flags = AI_NUMERICHOST;
+	sprintf(pbuf, "%d", port);
+	pbuf[sizeof(pbuf)-1] = '\0';
+	if (getaddrinfo(remoteIP, pbuf, &hints, &res0)) {
+	    rc = FTPERR_PASSIVE_ERROR;
+	    goto errxit;
+	}
+
+	for (res = res0; res != NULL; res = res->ai_next) {
+	    rc = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+	    fdSetFdno(data, (rc >= 0 ? rc : -1));
+	    if (rc < 0) {
+	        if (res->ai_next)
+		    continue;
+		else {
+		    rc = FTPERR_FAILED_CONNECT;
+		    freeaddrinfo(res0);
+		    goto errxit;
+		}
+	    }
+	    data = fdLink(data, "open data (ftpReq)");
+
+	    /* XXX setsockopt SO_LINGER */
+	    /* XXX setsockopt SO_KEEPALIVE */
+	    /* XXX setsockopt SO_TOS IPTOS_THROUGHPUT */
+	    
+	    {
+		int criterr = 0;
+	        while (connect(fdFileno(data), res->ai_addr, res->ai_addrlen) < 0) {
+	            if (errno == EINTR)
+		        continue;
+		    criterr++;
+		}
+		if (criterr) {
+		    if (res->ai_addr) {
+		        fdClose(data);
+		        continue;
+		    } else {
+		        rc = FTPERR_PASSIVE_ERROR;
+		        freeaddrinfo(res0);
+		        goto errxit;
+		    }
+		}
+	    }
+	    /* success */
+	    rc = 0;
+	    break;
+	}
+	freeaddrinfo(res0);
+    }
+	    
+#else /* HAVE_GETADDRINFO */
+    memset(&dataAddress, 0, sizeof(dataAddress));
+    dataAddress.sin_family = AF_INET;
+    dataAddress.sin_port = htons(port);
 
     /*@-moduncon@*/
-    if (!inet_aton(passReply, &dataAddress.sin_addr)) {
+    if (!inet_aton(remoteIP, &dataAddress.sin_addr)) {
 	rc = FTPERR_PASSIVE_ERROR;
 	goto errxit;
     }
@@ -1285,6 +1432,7 @@
 	goto errxit;
     }
     /*@=internalglobs@*/
+#endif /* HAVE_GETADDRINFO */
 
 if (_ftp_debug)
 fprintf(stderr, "-> %s", cmd);
@@ -1598,6 +1746,7 @@
     urlinfo u;
     const char * host;
     const char * path;
+    char hthost[NI_MAXHOST];
     int port;
     int rc;
     char * req;
@@ -1610,6 +1759,10 @@
 
     if (((host = (u->proxyh ? u->proxyh : u->host)) == NULL))
 	return FTPERR_BAD_HOSTNAME;
+    if (strchr(host, ':'))
+	sprintf(hthost, "[%s]", host);
+    else
+	strcpy(hthost, host);
 
     if ((port = (u->proxyp > 0 ? u->proxyp : u->port)) < 0) port = 80;
     path = (u->proxyh || u->proxyp > 0) ? u->url : httpArg;
@@ -1639,7 +1792,7 @@
 Accept: text/plain\r\n\
 Transfer-Encoding: chunked\r\n\
 \r\n\
-") + strlen(httpCmd) + strlen(path) + sizeof(VERSION) + strlen(host) + 20;
+") + strlen(httpCmd) + strlen(path) + sizeof(VERSION) + strlen(hthost) + 20;
 
 /*@-boundswrite@*/
     req = alloca(len);
@@ -1653,7 +1806,7 @@
 Accept: text/plain\r\n\
 Transfer-Encoding: chunked\r\n\
 \r\n\
-",	httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, host, port);
+",	httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port);
 } else {
     sprintf(req, "\
 %s %s HTTP/1.%d\r\n\
@@ -1661,7 +1814,7 @@
 Host: %s:%d\r\n\
 Accept: text/plain\r\n\
 \r\n\
-",	httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, host, port);
+",	httpCmd, path, (u->httpVersion ? 1 : 0), VERSION, hthost, port);
 }
 /*@=boundswrite@*/
 
--- rpm-4.4.2/rpmio/url.c.ipv6	2004-11-28 15:41:31.000000000 -0500
+++ rpm-4.4.2/rpmio/url.c	2006-07-05 10:04:15.000000000 -0400
@@ -431,6 +431,8 @@
 /*
  * Split URL into components. The URL can look like
  *	scheme://user:password at host:port/path
+  * or as in RFC2732 for IPv6 address
+  *    service://user:password@[ip:v6:ad:dr:es:s]:port/path
  */
 /*@-bounds@*/
 /*@-modfilesys@*/
@@ -487,8 +489,14 @@
     }
     /*@=branchstate@*/
 
-    /* Look for ...host:port */
+    /* Look for ...host:port or [v6addr]:port*/
     fe = f = s;
+    if (strchr(fe, '[') && strchr(fe, ']'))
+    {
+	    fe = strchr(f, ']');
+	    *f++ = '\0';
+	    *fe++ = '\0';
+    }
     while (*fe && *fe != ':') fe++;
     if (*fe == ':') {
 	*fe++ = '\0';



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:55:04 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.285,1.286
Message-ID: <200607051455.k65Et4oJ019539@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
- org.eclipse.tomcat -> org.eclipse.tomcat/lib.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- eclipse.spec	5 Jul 2006 12:40:06 -0000	1.285
+++ eclipse.spec	5 Jul 2006 14:55:01 -0000	1.286
@@ -596,24 +596,24 @@
 rm plugins/org.eclipse.tomcat/servlets-invoker.jar
 rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
 rm plugins/org.eclipse.tomcat/tomcat-util.jar
-ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
-ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
-ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
-ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
-ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
-ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
-ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
-ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
-ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
-ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
-ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
 mkdir -p plugins/org.eclipse.tomcat/lib
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/lib/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/lib/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/lib/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/lib/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/lib/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/lib/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/lib/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/lib/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/lib/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/lib/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/lib/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/lib/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/lib/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/lib/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/lib/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
@@ -1071,23 +1071,24 @@
 rm plugins/org.eclipse.tomcat_*/naming-common.jar
 rm plugins/org.eclipse.tomcat_*/servlets-common.jar
 rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
-ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
-ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
-ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
-ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
-ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
-ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
-ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
-ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
-ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
-ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
-ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
+mkdir -p plugins/org.eclipse.tomcat_*/lib
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/lib/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/lib/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/lib/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/lib/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/lib/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/lib/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/lib/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/lib/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/lib/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/lib/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/lib/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/lib/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/lib/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/lib/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-collections
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-dbcp
@@ -1631,6 +1632,7 @@
 %changelog
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.
+- org.eclipse.tomcat -> org.eclipse.tomcat/lib.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:57:43 -0400
Subject: rpms/kexec-tools/devel kdump.sysconfig, 1.3, 1.4 kexec-tools.spec,
	1.21, 1.22
Message-ID: <200607051457.k65EvhKj020600@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20574

Modified Files:
	kdump.sysconfig kexec-tools.spec 
Log Message:
updating devel rpm for bz 197391


Index: kdump.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdump.sysconfig	27 Feb 2006 09:19:03 -0000	1.3
+++ kdump.sysconfig	5 Jul 2006 14:57:41 -0000	1.4
@@ -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="REPLACEME"
+KDUMP_COMMANDLINE=""
 
 # 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kexec-tools.spec	28 Jun 2006 14:36:12 -0000	1.21
+++ kexec-tools.spec	5 Jul 2006 14:57:41 -0000	1.22
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 20
+Release: 20%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -68,10 +68,6 @@
 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
 /sbin/chkconfig --add kdump
 
 %postun
@@ -99,6 +95,10 @@
 %doc TODO
 
 %changelog
+* Wed Jul 07 206 Neil Horman <nhorman at redhat.com> 1.101-20.fc6
+- Modify spec/sysconfig to not autobuild kdump kernel command line
+- Add dist to revision tag
+
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 1.101-20
 - Buildrequire zlib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 14:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 10:58:19 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.22,1.23
Message-ID: <200607051458.k65EwJjN020884@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20859

Modified Files:
	kexec-tools.spec 
Log Message:
correcting changelog date


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kexec-tools.spec	5 Jul 2006 14:57:41 -0000	1.22
+++ kexec-tools.spec	5 Jul 2006 14:58:17 -0000	1.23
@@ -95,7 +95,7 @@
 %doc TODO
 
 %changelog
-* Wed Jul 07 206 Neil Horman <nhorman at redhat.com> 1.101-20.fc6
+* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-20.fc6
 - Modify spec/sysconfig to not autobuild kdump kernel command line
 - Add dist to revision tag
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:03:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:03:09 -0400
Subject: rpms/kernel/devel/configs config-x86_64-generic,1.46,1.47
Message-ID: <200607051503.k65F385B021934@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86_64-generic 
Log Message:
Try out sparsemem



Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- config-x86_64-generic	4 Jul 2006 21:03:12 -0000	1.46
+++ config-x86_64-generic	5 Jul 2006 15:03:04 -0000	1.47
@@ -175,3 +175,10 @@
 # CONFIG_DEBUG_STACK_USAGE is not set
 
 CONFIG_PC8736x_GPIO=m
+
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:03:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:03:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2352,1.2353
Message-ID: <200607051503.k65F37bQ021931@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Try out sparsemem



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2352
retrieving revision 1.2353
diff -u -r1.2352 -r1.2353
--- kernel-2.6.spec	5 Jul 2006 10:42:56 -0000	1.2352
+++ kernel-2.6.spec	5 Jul 2006 15:03:03 -0000	1.2353
@@ -1559,6 +1559,9 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 Dave Jones <davej at redhat.com>
+- Try out sparsemem experiment on x86-64.
+
 * Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix asm-powerpc/cputime.h for new cputime64_t stuff
 - Update GFS2



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:12:15 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.23,1.24
Message-ID: <200607051512.k65FCFBk023942@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23918

Modified Files:
	kexec-tools.spec 
Log Message:
building for all arches for bz 197617


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kexec-tools.spec	5 Jul 2006 14:58:17 -0000	1.23
+++ kexec-tools.spec	5 Jul 2006 15:12:12 -0000	1.24
@@ -4,7 +4,6 @@
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
-ExclusiveArch: %{ix86} x86_64
 Source0: %{name}-%{version}.tar.gz
 Source1: kdump.init
 Source2: kdump.sysconfig
@@ -95,9 +94,10 @@
 %doc TODO
 
 %changelog
-* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-20.fc6
+* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-21.fc6
 - Modify spec/sysconfig to not autobuild kdump kernel command line
 - Add dist to revision tag
+- Build for all arches
 
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 1.101-20
 - Buildrequire zlib-devel



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:13:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:13:00 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.24,1.25
Message-ID: <200607051513.k65FD03F024256@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24219

Modified Files:
	kexec-tools.spec 
Log Message:
building for all arches for bz 197617


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kexec-tools.spec	5 Jul 2006 15:12:12 -0000	1.24
+++ kexec-tools.spec	5 Jul 2006 15:12:58 -0000	1.25
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 20%{dist}
+Release: 21%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:49:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:49:06 -0400
Subject: rpms/eclipse/devel eclipse-webapp-tomcat55.patch,1.4,1.5
Message-ID: <200607051549.k65Fn6Q4000754@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-webapp-tomcat55.patch 
Log Message:
Update webapp build patch.

eclipse-webapp-tomcat55.patch:
 build.properties |    4 ++--
 build.xml        |   32 +++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

Index: eclipse-webapp-tomcat55.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-webapp-tomcat55.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-webapp-tomcat55.patch	4 Jul 2006 21:27:47 -0000	1.4
+++ eclipse-webapp-tomcat55.patch	5 Jul 2006 15:49:03 -0000	1.5
@@ -4,7 +4,7 @@
 retrieving revision 1.71
 diff -u -r1.71 build.xml
 --- build.xml	16 Mar 2006 21:57:15 -0000	1.71
-+++ build.xml	4 Jul 2006 18:26:11 -0000
++++ build.xml	5 Jul 2006 15:48:12 -0000
 @@ -84,8 +84,8 @@
  				<pathelement path="../org.eclipse.help"/>
  				<pathelement path="../org.eclipse.help.base"/>
@@ -31,7 +31,7 @@
  			</classpath>
  			<src path="src_servlets/"			/>
  			<compilerarg line="-log ${temp.folder}/WEB-INF/lib/servlets.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/> 
-@@ -170,21 +174,19 @@
+@@ -170,21 +174,22 @@
  		<!-- generate java code from JSPs -->
  		<path id="jasper.classpath" > 
  			<pathelement location="../org.apache.ant/lib/ant.jar"/>
@@ -43,7 +43,10 @@
 +			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
 +			<pathelement location="../org.eclipse.tomcat/lib/jasper-compiler.jar" />
 +			<pathelement location="../org.eclipse.tomcat/lib/jasper-runtime.jar" />
-+			<pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />  
++			<pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />
++			<pathelement location="../org.eclipse.tomcat/lib/commons-logging-api.jar" /> 
++			<pathelement location="../org.eclipse.tomcat/lib/commons-el.jar" />
++			<pathelement location="../org.eclipse.tomcat/lib/jspapi.jar" />
  		</path>
  		<delete dir="${temp.folder}/jsp.jar.src"/>
    		<mkdir dir="${temp.folder}/jsp.jar.src"/>
@@ -58,7 +61,7 @@
  			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
  			<arg value="-die" />
  			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
-@@ -222,8 +224,9 @@
+@@ -222,8 +227,9 @@
  				<pathelement path="../org.eclipse.help"/>
  				<pathelement path="../org.eclipse.help.base"/>
  				<pathelement path="../org.eclipse.help.appserver"/>
@@ -76,7 +79,7 @@
 retrieving revision 1.32
 diff -u -r1.32 build.properties
 --- build.properties	18 Mar 2005 08:00:28 -0000	1.32
-+++ build.properties	4 Jul 2006 18:26:11 -0000
++++ build.properties	5 Jul 2006 15:48:11 -0000
 @@ -33,5 +33,5 @@
                       ../org.eclipse.help.appserver/bin,\
                       ../org.eclipse.help.appserver,\



From fedora-cvs-commits at redhat.com  Wed Jul  5 15:50:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 11:50:01 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.286,1.287
Message-ID: <200607051550.k65Fo1bJ001135@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Use commons-* instead of jakarta-commons-*.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- eclipse.spec	5 Jul 2006 14:55:01 -0000	1.286
+++ eclipse.spec	5 Jul 2006 15:49:58 -0000	1.287
@@ -614,17 +614,17 @@
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/lib/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-logging
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-logging
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-pool
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
@@ -1089,17 +1089,17 @@
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-logging
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-logging-api
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-pool
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
@@ -1633,6 +1633,8 @@
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.
 - org.eclipse.tomcat -> org.eclipse.tomcat/lib.
+- Update webapp build patch.
+- Use commons-* instead of jakarta-commons-*.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 



From fedora-cvs-commits at redhat.com  Wed Jul  5 16:07:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 12:07:12 -0400
Subject: rpms/attr/devel .cvsignore, 1.8, 1.9 attr.spec, 1.21, 1.22 sources,
	1.8, 1.9
Message-ID: <200607051607.k65G7CLD012372@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12356

Modified Files:
	.cvsignore attr.spec sources 
Log Message:
[tw]
- new version 2.4.32
- fixes segmentation fault in attr, which affects #189106




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 12:04:50 -0000	1.8
+++ .cvsignore	5 Jul 2006 16:06:54 -0000	1.9
@@ -2,3 +2,4 @@
 attr-2.4.23.src.tar.gz
 attr-2.4.24.src.tar.gz
 attr-2.4.28.src.tar.gz
+attr_2.4.32-1.tar.gz


Index: attr.spec
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/attr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- attr.spec	7 Jun 2006 22:01:16 -0000	1.21
+++ attr.spec	5 Jul 2006 16:06:54 -0000	1.22
@@ -1,14 +1,14 @@
 Summary: Utilities for managing filesystem extended attributes.
 Name: attr
-Version: 2.4.28
-Release: 2
+Version: 2.4.32
+Release: 1
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 2.0.0
 BuildRoot: %{_tmppath}/%{name}-root
-Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr-%{version}.src.tar.gz
+Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_%{version}-1.tar.gz
 Patch1: attr-2.0.8-docperms.patch
 Patch2: attr-2.2.0-multilib.patch
-Patch3: attr-2.4.24-build.patch
+Patch3: attr-2.4.32-build.patch
 License: GPL
 URL: http://oss.sgi.com/projects/xfs/
 Group: System Environment/Base
@@ -114,6 +114,10 @@
 /%{_lib}/libattr.so.*
 
 %changelog
+* Wed Jul  5 2006 Thomas Woerner <twoerne at redhat.com> 2.4.32-1
+- new version 2.4.32
+- fixes segmentation fault in attr, which affects #189106
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.4.28-2
 - rebuild for -devel deps
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 12:04:50 -0000	1.8
+++ sources	5 Jul 2006 16:06:54 -0000	1.9
@@ -1 +1 @@
-4fe11d4221199e51f6eeeee37d5dd84c  attr-2.4.28.src.tar.gz
+092739e9b944815aecc1f5d8379d5ea5  attr_2.4.32-1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 16:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 12:09:16 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.287,1.288
Message-ID: <200607051609.k65G9GaD012477@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
commons-logging -> commons-logging-api


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- eclipse.spec	5 Jul 2006 15:49:58 -0000	1.287
+++ eclipse.spec	5 Jul 2006 16:09:13 -0000	1.288
@@ -622,7 +622,7 @@
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-el
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-fileupload
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-logging
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-logging-api
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-modeler
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-pool
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
@@ -1590,6 +1590,7 @@
 %{_libdir}/gcj/%{name}/org.eclipse.search_*
 %{_libdir}/gcj/%{name}/org.eclipse.text_*
 %{_libdir}/gcj/%{name}/com.ibm.icu_*
+%ifnarch ppc64 s390 s390x
 # FIXME: take this out when the tomcat patch is updated
 %{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
 %{_libdir}/gcj/%{name}/bootstrap.jar*
@@ -1617,6 +1618,7 @@
 %{_libdir}/gcj/%{name}/tomcat-http11.jar*
 %{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
+%endif
 
 %files platform-sdk
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Wed Jul  5 16:18:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 12:18:36 -0400
Subject: rpms/rhgb/devel rhgb-modularx.patch,1.3,1.4 rhgb.spec,1.53,1.54
Message-ID: <200607051618.k65GIaQn008392@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8326

Modified Files:
	rhgb-modularx.patch rhgb.spec 
Log Message:
- remove erroneous space from x conf filename.  Problem discovered
  from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)


rhgb-modularx.patch:
 main.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Index: rhgb-modularx.patch
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb-modularx.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rhgb-modularx.patch	14 Nov 2005 04:02:42 -0000	1.3
+++ rhgb-modularx.patch	5 Jul 2006 16:18:34 -0000	1.4
@@ -6,7 +6,7 @@
  #define PIPE_NAME TMPPATH"/rhgb-console"
 -#define X_CONFIG "/etc/rhgb/xorg.conf"
 -#define XLOGFILE TMPPATH"/XFree86.0.log"
-+#define X_CONFIG "/etc/rhgb/xorg .conf"
++#define X_CONFIG "/etc/rhgb/xorg.conf"
 +#define XLOGFILE TMPPATH"/xorg.log"
  #define DEBUGFILE TMPPATH"/rhgb.debug"
  #define X_NO_DRI "-extension XFree86-DRI"


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- rhgb.spec	5 Jun 2006 20:03:31 -0000	1.53
+++ rhgb.spec	5 Jul 2006 16:18:34 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.3
-Release: 3
+Release: 4
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,10 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Wed Jul  5 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-4
+- remove erroneous space from x conf filename.  Problem discovered
+  from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-3
 - Require system-logos, not fedora-logos
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 16:19:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 12:19:20 -0400
Subject: rpms/attr/devel attr-2.4.32-build.patch,NONE,1.1
Message-ID: <200607051619.k65GJKQE008721@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8597

Added Files:
	attr-2.4.32-build.patch 
Log Message:
[tw]
- new build patch


attr-2.4.32-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE attr-2.4.32-build.patch ---
--- attr-2.4.32/include/builddefs.in.build	2006-06-20 08:51:25.000000000 +0200
+++ attr-2.4.32/include/builddefs.in	2006-07-05 16:25:44.000000000 +0200
@@ -25,14 +25,14 @@
 PKG_VERSION	= @pkg_version@
 PKG_PLATFORM	= @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR	= @bindir@
-PKG_SBIN_DIR	= @sbindir@
-PKG_LIB_DIR	= @libdir@@libdirsuffix@
-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
-PKG_INC_DIR	= @includedir@/attr
-PKG_MAN_DIR	= @mandir@
-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR	= @datadir@/locale
+PKG_BIN_DIR	= $(DESTDIR)@bindir@
+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
+PKG_INC_DIR	= $(DESTDIR)@includedir@/attr
+PKG_MAN_DIR	= $(DESTDIR)@mandir@
+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name at -@pkg_version@
+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
 
 CC		= @cc@
 AWK		= @awk@
--- attr-2.4.32/include/buildmacros.build	2006-07-05 16:23:30.000000000 +0200
+++ attr-2.4.32/include/buildmacros	2006-07-05 16:23:30.000000000 +0200
@@ -26,7 +26,7 @@
 	  $(LFILES:.l=.o) \
 	  $(YFILES:%.y=%.tab.o)
 
-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL	= $(TOPDIR)/install-sh
 
 SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images



From fedora-cvs-commits at redhat.com  Wed Jul  5 16:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 12:52:40 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch,1.6,1.7
Message-ID: <200607051652.k65GqeFC001479@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.patch 
Log Message:
Add mx4j{,-impl,-jmx} to tomcatwrapper build classpath.

eclipse-tomcat55-build.patch:
 build.xml |  120 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 63 insertions(+), 57 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-tomcat55-build.patch	4 Jul 2006 21:27:47 -0000	1.6
+++ eclipse-tomcat55-build.patch	5 Jul 2006 16:52:38 -0000	1.7
@@ -1,5 +1,5 @@
---- build.xml.orig	2006-07-04 16:09:31.000000000 -0400
-+++ build.xml	2006-07-04 16:14:19.000000000 -0400
+--- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
++++ build.xml	2006-07-05 12:50:49.000000000 -0400
 @@ -58,7 +58,7 @@
  		<antcall target="gather.bin.parts">
  			<param name="destination.temp.folder" value="${temp.folder}/"/>
@@ -9,7 +9,7 @@
  		<delete dir="${temp.folder}"/>
  	</target>
  
-@@ -144,50 +144,51 @@
+@@ -144,50 +144,56 @@
  			<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"/>
@@ -81,6 +81,12 @@
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
 +			<pathelement path="lib/jmx.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
++			<pathelement path="lib/mx4j.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j.jar"/>
++			<pathelement path="lib/mx4j-impl.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
++			<pathelement path="lib/mx4j-jmx.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
 +			<pathelement path="lib/jsp-api.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
 +			<pathelement path="lib/naming-factory.jar"/>
@@ -101,11 +107,10 @@
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
 +			<pathelement path="lib/servlets-invoker.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
-+
  		</path>
  		<!-- compile the source code -->
  		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-@@ -224,37 +225,37 @@
+@@ -224,37 +230,37 @@
  	</target>
  
  	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
@@ -154,7 +159,7 @@
  		<delete dir="${temp.folder}"/>
  	</target>
  
-@@ -277,7 +278,7 @@
+@@ -277,7 +283,7 @@
  		<delete>
  			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
  		</delete>



From fedora-cvs-commits at redhat.com  Wed Jul  5 17:11:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 13:11:27 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch,1.7,1.8
Message-ID: <200607051711.k65HBR5J006515@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.patch 
Log Message:
servlet-api -> servletapi5

eclipse-tomcat55-build.patch:
 build.xml |  120 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 63 insertions(+), 57 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-tomcat55-build.patch	5 Jul 2006 16:52:38 -0000	1.7
+++ eclipse-tomcat55-build.patch	5 Jul 2006 17:11:24 -0000	1.8
@@ -95,8 +95,8 @@
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/>
 +			<pathelement path="lib/regexp.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/>
-+			<pathelement path="lib/servlet-api.jar"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlet-api.jar"/>
++			<pathelement path="lib/servletapi5.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servletapi5.jar"/>
 +			<pathelement path="lib/servlets-default.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/>
 +			<pathelement path="lib/tomcat-coyote.jar"/>



From fedora-cvs-commits at redhat.com  Wed Jul  5 17:23:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 13:23:54 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ia64-fixup.patch, NONE,
	1.1 kexec-tools.spec, 1.25, 1.26
Message-ID: <200607051723.k65HNsrd025891@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25833

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ia64-fixup.patch 
Log Message:
fixing up ia64 build break

kexec-tools-1.101-ia64-fixup.patch:
 kexec-ia64.c |   24 ------------------------
 1 files changed, 24 deletions(-)

--- NEW FILE kexec-tools-1.101-ia64-fixup.patch ---
--- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig	2006-07-05 13:02:12.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c	2006-07-05 13:17:41.000000000 -0400
@@ -87,8 +87,6 @@ int arch_process_options(int argc, char 
 	};
 	static const char short_options[] = KEXEC_ARCH_OPT_STR;
 	int opt;
-	unsigned long value;
-	char *end;
 
 	opterr = 0; /* Don't complain about unrecognized options here */
 	while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
@@ -115,28 +113,6 @@ int arch_compat_trampoline(struct kexec_
 	}
 	if (strcmp(utsname.machine, "ia64") == 0)
 	{
-		info->kexec_flags |= KEXEC_ARCH_X86_64;
-	}
-	else {
-		fprintf(stderr, "Unsupported machine type: %s\n",
-			utsname.machine);
-		return -1;
-	}
-	return 0;
-}
-
-int arch_compat_trampoline(struct kexec_info *info)
-{
-	int result;
-	struct utsname utsname;
-	result = uname(&utsname);
-	if (result < 0) {
-		fprintf(stderr, "uname failed: %s\n",
-			strerror(errno));
-		return -1;
-	}
-	if (strcmp(utsname.machine, "ia64") == 0)
-	{
 		/* For compatibility with older patches 
 		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
 		 */


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kexec-tools.spec	5 Jul 2006 15:12:58 -0000	1.25
+++ kexec-tools.spec	5 Jul 2006 17:23:51 -0000	1.26
@@ -24,6 +24,7 @@
 #
 # Patches 201 through 300 are meant for ia64 kexec-tools enablement
 #
+Patch201: kexec-tools-1.101-ia64-fixup.patch
 
 #
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
@@ -44,6 +45,7 @@
 rm -f ../kexec-tools-1.101.spec
 %patch1 -p1
 %patch101 -p1
+%patch201 -p1
 %patch301 -p1
 %patch501 -p1
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 17:27:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 13:27:01 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.26,1.27
Message-ID: <200607051727.k65HR1Vs027295@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27269

Modified Files:
	kexec-tools.spec 
Log Message:
bumping revision number


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kexec-tools.spec	5 Jul 2006 17:23:51 -0000	1.26
+++ kexec-tools.spec	5 Jul 2006 17:26:58 -0000	1.27
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 21%{dist}
+Release: 22%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -96,7 +96,7 @@
 %doc TODO
 
 %changelog
-* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-21.fc6
+* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-22.fc6
 - Modify spec/sysconfig to not autobuild kdump kernel command line
 - Add dist to revision tag
 - Build for all arches



From fedora-cvs-commits at redhat.com  Wed Jul  5 17:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 13:46:37 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.288,1.289
Message-ID: <200607051746.k65Hkb6i008956@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
http11 -> http


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- eclipse.spec	5 Jul 2006 16:09:13 -0000	1.288
+++ eclipse.spec	5 Jul 2006 17:46:34 -0000	1.289
@@ -612,7 +612,7 @@
 ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/lib/servlets-default.jar
 ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/lib/servlets-invoker.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/lib/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat/lib/tomcat-http.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-collections
@@ -1087,7 +1087,7 @@
 ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/lib/servlets-default.jar
 ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/lib/servlets-invoker.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http11.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-collections
@@ -1615,7 +1615,7 @@
 %{_libdir}/gcj/%{name}/servlets-invoker.jar*
 %{_libdir}/gcj/%{name}/servlets-manager.jar*
 %{_libdir}/gcj/%{name}/tomcat-coyote.jar*
-%{_libdir}/gcj/%{name}/tomcat-http11.jar*
+%{_libdir}/gcj/%{name}/tomcat-http.jar*
 %{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
 %endif



From fedora-cvs-commits at redhat.com  Wed Jul  5 18:46:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 14:46:14 -0400
Subject: rpms/rpm/devel rpm-4.4.2-multi-digest.patch,NONE,1.1
Message-ID: <200607051846.k65IkEYx003071@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2228

Added Files:
	rpm-4.4.2-multi-digest.patch 
Log Message:
Backport configurable file digest support

rpm-4.4.2-multi-digest.patch:
 build/files.c      |   31 +++++++++++-
 lib/cpio.c         |    2 
 lib/cpio.h         |    2 
 lib/fsm.c          |   46 ++++++++++---------
 lib/fsm.h          |    6 +-
 lib/poptI.c        |   10 ++--
 lib/poptQV.c       |   14 +++--
 lib/psm.c          |    3 -
 lib/query.c        |    2 
 lib/rpmcli.h       |   15 +++---
 lib/rpmfi.c        |  128 ++++++++++++++++++++++++++++++++++++++---------------
 lib/rpmfi.h        |   22 ++++++++-
 lib/rpmlib.h       |    7 ++
 lib/signature.c    |    2 
 lib/transaction.c  |   19 +++++--
 lib/verify.c       |   61 +++++++++++++------------
 macros.in          |   11 ++++
 python/rpmmodule.c |    2 
 python/rpmts-py.c  |    2 
 rpmdb/legacy.c     |   23 +++++----
 rpmdb/legacy.h     |   15 +++++-
 rpmio/tdigest.c    |    4 +
 rpmqv.c            |    6 +-
 23 files changed, 295 insertions(+), 138 deletions(-)

--- NEW FILE rpm-4.4.2-multi-digest.patch ---
--- rpm-4.4.2/rpmdb/legacy.h.digests	2003-05-08 16:39:31.000000000 -0400
+++ rpm-4.4.2/rpmdb/legacy.h	2006-07-05 14:18:15.000000000 -0400
@@ -18,7 +18,20 @@
 #endif
 
 /**
- * Return MD5 sum and size of a file.
+ * Return digest and size of a file.
+ * @param fn		file name
+ * @retval digest	address of md5sum
+ * @param asAscii	return md5sum as ascii string?
+ * @retval *fsizep	file size pointer (or NULL)
+ * @return		0 on success, 1 on error
+ */
+int dodigest(int digestalgo, const char * fn, /*@out@*/ unsigned char * digest,
+		int asAscii, /*@null@*/ /*@out@*/ size_t *fsizep)
+	/*@globals h_errno, fileSystem, internalState @*/
+	/*@modifies digest, *fsizep, fileSystem, internalState @*/;
+
+/**
+ * Return MD5 digest and size of a file.
  * @param fn		file name
  * @retval digest	address of md5sum
  * @param asAscii	return md5sum as ascii string?
--- rpm-4.4.2/rpmdb/legacy.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/rpmdb/legacy.c	2006-07-05 14:18:15.000000000 -0400
@@ -145,12 +145,12 @@
     return fdno;
 }
 
-int domd5(const char * fn, unsigned char * digest, int asAscii, size_t *fsizep)
+int dodigest(int digestalgo, const char * fn, unsigned char * digest, int asAscii, size_t *fsizep)
 {
     const char * path;
     urltype ut = urlPath(fn, &path);
-    unsigned char * md5sum = NULL;
-    size_t md5len;
+    unsigned char * dsum = NULL;
+    size_t dlen;
     unsigned char buf[32*BUFSIZ];
     FD_t fd;
     size_t fsize = 0;
@@ -193,10 +193,10 @@
 #endif
 	}
 
-	ctx = rpmDigestInit(PGPHASHALGO_MD5, RPMDIGEST_NONE);
+	ctx = rpmDigestInit(digestalgo, RPMDIGEST_NONE);
 	if (fsize)
 	    xx = rpmDigestUpdate(ctx, mapped, fsize);
-	xx = rpmDigestFinal(ctx, (void **)&md5sum, &md5len, asAscii);
+	xx = rpmDigestFinal(ctx, (void **)&dsum, &dlen, asAscii);
 	if (fsize)
 	    xx = munmap(mapped, fsize);
 	xx = close(fdno);
@@ -219,11 +219,11 @@
 	    break;
 	}
 	
-	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+	fdInitDigest(fd, digestalgo, 0);
 	fsize = 0;
 	while ((rc = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
 	    fsize += rc;
-	fdFiniDigest(fd, PGPHASHALGO_MD5, (void **)&md5sum, &md5len, asAscii);
+	fdFiniDigest(fd, digestalgo, (void **)&dsum, &dlen, asAscii);
 	if (Ferror(fd))
 	    rc = 1;
 
@@ -244,13 +244,18 @@
     if (fsizep)
 	*fsizep = fsize;
     if (!rc)
-	memcpy(digest, md5sum, md5len);
+	memcpy(digest, dsum, dlen);
 /*@=boundswrite@*/
-    md5sum = _free(md5sum);
+    dsum = _free(dsum);
 
     return rc;
 }
 
+int domd5(const char * fn, unsigned char * digest, int asAscii, size_t *fsizep)
+{
+    return dodigest(PGPHASHALGO_MD5, fn, digest, asAscii, fsizep);
+}
+
 /*@-exportheadervar@*/
 /*@unchecked@*/
 int _noDirTokens = 0;
--- rpm-4.4.2/macros.in.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/macros.in	2006-07-05 14:18:15.000000000 -0400
@@ -455,6 +455,17 @@
 #%_fixperms		%{__chmod} -Rf @FIXPERMS@
 #
 
+#
+# Choose metadata file digest algorithm:
+#	1 	MD5
+#	2	SHA1
+#	8	SHA256
+#	9	SHA384
+#	10	SHA512
+#
+# Note: choosing anything but MD5 introduces instant legacy incompatibility.
+%_build_file_digest_algo	1
+
 #==============================================================================
 # ---- Database configuration macros.
 #	Macros used to configure Berkley db parameters.
--- rpm-4.4.2/build/files.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/build/files.c	2006-07-05 14:18:15.000000000 -0400
@@ -30,7 +30,7 @@
 
 #include "buildio.h"
 
-#include "legacy.h"	/* XXX domd5, expandFileList, compressFileList */
+#include "legacy.h"	/* XXX dodigest, expandFileList, compressFileList */
 #include "misc.h"
 #include "debug.h"
 
@@ -1280,12 +1280,37 @@
 	 *		   RPM_INT32_TYPE, &(flp->fl_gid), 1);
 	 */
 	
+      { static uint_32 dalgo = 0;
+	static int oneshot = 0;
+	if (!oneshot) {
+	    dalgo = rpmExpandNumeric("%{?_build_file_digest_algo}");
+	    switch (dalgo) {
+	    case PGPHASHALGO_MD5:
+	    case PGPHASHALGO_SHA1:
+	    case PGPHASHALGO_SHA256:
+	    case PGPHASHALGO_SHA384:
+	    case PGPHASHALGO_SHA512:
+		break;
+	    case PGPHASHALGO_RIPEMD160:
+	    case PGPHASHALGO_MD2:
+	    case PGPHASHALGO_TIGER192:
+	    case PGPHASHALGO_HAVAL_5_160:
+	    default:
+		dalgo = PGPHASHALGO_MD5;
+		break;
+	    }
+	    oneshot++;
+	}
+
 	buf[0] = '\0';
 	if (S_ISREG(flp->fl_mode))
-	    (void) domd5(flp->diskURL, buf, 1, NULL);
+	    (void) dodigest(dalgo, flp->diskURL, (unsigned char *)buf, 1, NULL);
 	s = buf;
-	(void) headerAddOrAppendEntry(h, RPMTAG_FILEMD5S, RPM_STRING_ARRAY_TYPE,
+	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDIGESTS, RPM_STRING_ARRAY_TYPE,
 			       &s, 1);
+	(void) headerAddOrAppendEntry(h, RPMTAG_FILEDIGESTALGOS, RPM_INT32_TYPE,
+			       &dalgo, 1);
+      }
 	
 	buf[0] = '\0';
 	if (S_ISLNK(flp->fl_mode)) {
--- rpm-4.4.2/lib/cpio.c.digests	2003-12-25 18:00:45.000000000 -0500
+++ rpm-4.4.2/lib/cpio.c	2006-07-05 14:18:15.000000000 -0400
@@ -233,7 +233,7 @@
     case CPIOERR_HDR_SIZE:	s = _("Header size too big");	break;
     case CPIOERR_UNKNOWN_FILETYPE: s = _("Unknown file type");	break;
     case CPIOERR_MISSING_HARDLINK: s = _("Missing hard link(s)"); break;
-    case CPIOERR_MD5SUM_MISMATCH: s = _("MD5 sum mismatch");	break;
+    case CPIOERR_DIGEST_MISMATCH: s = _("File digest mismatch");	break;
     case CPIOERR_INTERNAL:	s = _("Internal error");	break;
     case CPIOERR_UNMAPPED_FILE:	s = _("Archive file not in header"); break;
     case CPIOERR_ENOENT:	s = strerror(ENOENT); break;
--- rpm-4.4.2/lib/rpmfi.h.digests	2005-02-10 03:30:28.000000000 -0500
+++ rpm-4.4.2/lib/rpmfi.h	2006-07-05 14:18:15.000000000 -0400
@@ -45,7 +45,9 @@
     const char ** dnl;		/*!< Directory name(s) (from header) */
 
 /*@only@*/ /*@relnull@*/
-    const char ** fmd5s;	/*!< File MD5 sum(s) (from header) */
+    const char ** fdigests;	/*!< File digest(s) (from header) */
+/*@only@*/ /*@null@*/
+    uint_32 * fdigestalgos;	/*!< File digest algorithm(s) (from header) */
 /*@only@*/ /*@relnull@*/
     const char ** flinks;	/*!< File link(s) (from header) */
 /*@only@*/ /*@null@*/
@@ -126,7 +128,9 @@
     int_32 * odil;		/*!< Original dirindex(s) (from header) */
 
 /*@only@*/ /*@relnull@*/
-    unsigned char * md5s;	/*!< File md5 sums in binary. */
+    unsigned char * digests;	/*!< File digest(s) in binary. */
+    uint_32 digestalgo;		/*!< File digest algorithm. */
+    uint_32 digestlen;		/*!< No. bytes in binary digest. */
 
 /*@only@*/ /*@null@*/
     const char * pretrans;
@@ -335,7 +339,21 @@
 	/*@*/;
 
 /**
+ * Return current file (binary) digest from file info set.
+ * @param fi		file info set
+ * @retval *algop	digest algorithm
+ * @retval *lenp	digest length (in bytes)
+ * @return		current file digest, NULL on invalid
+ */
+/*@observer@*/ /*@null@*/
+extern const unsigned char * rpmfiDigest(/*@null@*/ rpmfi fi,
+		/*@out@*/ /*@null@*/ int * algop,
+		/*@out@*/ /*@null@*/ size_t * lenp)
+	/*@modifies *algop, *lenp @*/;
+
+/**
  * Return current file (binary) md5 digest from file info set.
+ * @deprecated Use rpmfiDigest instead.
  * @param fi		file info set
  * @return		current file md5 digest, NULL on invalid
  */
--- rpm-4.4.2/lib/cpio.h.digests	2004-10-20 06:19:34.000000000 -0400
+++ rpm-4.4.2/lib/cpio.h	2006-07-05 14:18:15.000000000 -0400
@@ -46,7 +46,7 @@
 	CPIOERR_HDR_TRAILER	= (24			),
 	CPIOERR_UNKNOWN_FILETYPE= (25			),
 	CPIOERR_MISSING_HARDLINK= (26			),
-	CPIOERR_MD5SUM_MISMATCH	= (27			),
+	CPIOERR_DIGEST_MISMATCH	= (27			),
 	CPIOERR_INTERNAL	= (28			),
 	CPIOERR_UNMAPPED_FILE	= (29			),
 	CPIOERR_ENOENT		= (30			),
--- rpm-4.4.2/lib/fsm.c.digests	2004-10-09 15:40:09.000000000 -0400
+++ rpm-4.4.2/lib/fsm.c	2006-07-05 14:18:15.000000000 -0400
@@ -801,14 +801,18 @@
 	{   rpmts ts = fsmGetTs(fsm);
 
 	    /*
-	     * Set file md5 (if not disabled).
+	     * Set file digest (if not disabled).
 	     */
-	    if (ts != NULL && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOMD5)) {
-		fsm->fmd5sum = (fi->fmd5s ? fi->fmd5s[i] : NULL);
-		fsm->md5sum = (fi->md5s ? (fi->md5s + (16 * i)) : NULL);
+	    if (ts != NULL && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOFDIGESTS)) {
+		fsm->fdigestalgo = fi->digestalgo;
+		fsm->fdigest = (fi->fdigests ? fi->fdigests[i] : NULL);
+		fsm->digestlen = fi->digestlen;
+		fsm->digest = (fi->digests ? (fi->digests + (fsm->digestlen * i)) : NULL);
 	    } else {
-		fsm->fmd5sum = NULL;
-		fsm->md5sum = NULL;
+		fsm->fdigestalgo = 0;
+		fsm->fdigest = NULL;
+		fsm->digestlen = 0;
+		fsm->digest = NULL;
 	    }
 	}
 
@@ -823,7 +827,7 @@
  */
 /*@-compdef@*/
 static int expandRegular(/*@special@*/ FSM_t fsm)
-	/*@uses fsm->fmd5sum, fsm->md5sum, fsm->sb, fsm->wfd  @*/
+	/*@uses fsm->fdigest, fsm->digest, fsm->sb, fsm->wfd  @*/
 	/*@globals h_errno, fileSystem, internalState @*/
 	/*@modifies fsm, fileSystem, internalState @*/
 {
@@ -835,8 +839,8 @@
     if (rc)
 	goto exit;
 
-    if (st->st_size > 0 && (fsm->fmd5sum != NULL || fsm->md5sum != NULL))
-	fdInitDigest(fsm->wfd, PGPHASHALGO_MD5, 0);
+    if (st->st_size > 0 && (fsm->fdigest != NULL || fsm->digest != NULL))
+	fdInitDigest(fsm->wfd, fsm->fdigestalgo, 0);
 
     while (left) {
 
@@ -856,26 +860,26 @@
 	    (void) fsmNext(fsm, FSM_NOTIFY);
     }
 
-    if (st->st_size > 0 && (fsm->fmd5sum || fsm->md5sum)) {
-	void * md5sum = NULL;
-	int asAscii = (fsm->md5sum == NULL ? 1 : 0);
+    if (st->st_size > 0 && (fsm->fdigest || fsm->digest)) {
+	void * digest = NULL;
+	int asAscii = (fsm->digest == NULL ? 1 : 0);
 
 	(void) Fflush(fsm->wfd);
-	fdFiniDigest(fsm->wfd, PGPHASHALGO_MD5, &md5sum, NULL, asAscii);
+	fdFiniDigest(fsm->wfd, fsm->fdigestalgo, &digest, NULL, asAscii);
 
-	if (md5sum == NULL) {
-	    rc = CPIOERR_MD5SUM_MISMATCH;
+	if (digest == NULL) {
+	    rc = CPIOERR_DIGEST_MISMATCH;
 	    goto exit;
 	}
 
-	if (fsm->md5sum != NULL) {
-	    if (memcmp(md5sum, fsm->md5sum, 16))
-		rc = CPIOERR_MD5SUM_MISMATCH;
+	if (fsm->digest != NULL) {
+	    if (memcmp(digest, fsm->digest, fsm->digestlen))
+		rc = CPIOERR_DIGEST_MISMATCH;
 	} else {
-	    if (strcmp(md5sum, fsm->fmd5sum))
-		rc = CPIOERR_MD5SUM_MISMATCH;
+	    if (strcmp(digest, fsm->fdigest))
+		rc = CPIOERR_DIGEST_MISMATCH;
 	}
-	md5sum = _free(md5sum);
+	digest = _free(digest);
     }
 
 exit:
--- rpm-4.4.2/lib/signature.c.digests	2005-06-06 19:33:08.000000000 -0400
+++ rpm-4.4.2/lib/signature.c	2006-07-05 14:18:15.000000000 -0400
@@ -817,7 +817,7 @@
     case RPMSIGTAG_MD5:
 	pktlen = 16;
 	pkt = memset(alloca(pktlen), 0, pktlen);
-	if (domd5(file, pkt, 0, NULL)
+	if (dodigest(PGPHASHALGO_MD5, file, pkt, 0, NULL)
 	 || !headerAddEntry(sigh, sigTag, RPM_BIN_TYPE, pkt, pktlen))
 	    break;
 	ret = 0;
--- rpm-4.4.2/lib/poptI.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/poptI.c	2006-07-05 14:18:15.000000000 -0400
@@ -129,8 +129,8 @@
 	ia->noDeps = 1;
 	break;
 
-    case RPMCLI_POPT_NOMD5:
-	ia->transFlags |= RPMTRANS_FLAG_NOMD5;
+    case RPMCLI_POPT_NOFDIGESTS:
+	ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
 	break;
 
     case RPMCLI_POPT_NOCONTEXTS:
@@ -248,8 +248,10 @@
 	&rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
 	N_("do not install documentation"), NULL},
 
- { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5,
-	N_("don't verify MD5 digest of files"), NULL },
+ { "nomd5", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOFDIGESTS,
+	N_("don't verify file digests"), NULL },
+ { "nofdigests", '\0', 0, NULL, RPMCLI_POPT_NOFDIGESTS,
+	N_("don't verify file digests"), NULL },
  { "nocontexts", '\0',0,  NULL, RPMCLI_POPT_NOCONTEXTS,
 	N_("don't install file security contexts"), NULL},
 
--- rpm-4.4.2/lib/verify.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/verify.c	2006-07-05 14:18:15.000000000 -0400
@@ -11,7 +11,7 @@
 #include "rpmfi.h"
 #include "rpmts.h"
 
-#include "legacy.h"	/* XXX domd5(), uidToUname(), gnameToGid */
+#include "legacy.h"	/* XXX dodigest(), uidToUname(), gnameToGid */
 #include "ugid.h"
 #include "debug.h"
 
@@ -82,32 +82,32 @@
      * Not all attributes of non-regular files can be verified.
      */
     if (S_ISDIR(sb.st_mode))
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 			RPMVERIFY_LINKTO);
     else if (S_ISLNK(sb.st_mode)) {
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 		RPMVERIFY_MODE);
 #if CHOWN_FOLLOWS_SYMLINK
 	    flags &= ~(RPMVERIFY_USER | RPMVERIFY_GROUP);
 #endif
     }
     else if (S_ISFIFO(sb.st_mode))
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 			RPMVERIFY_LINKTO);
     else if (S_ISCHR(sb.st_mode))
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 			RPMVERIFY_LINKTO);
     else if (S_ISBLK(sb.st_mode))
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 			RPMVERIFY_LINKTO);
-    else 
+    else
 	flags &= ~(RPMVERIFY_LINKTO);
 
     /*
      * Content checks of %ghost files are meaningless.
      */
     if (fileAttrs & RPMFILE_GHOST)
-	flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
+	flags &= ~(RPMVERIFY_FDIGEST | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
 			RPMVERIFY_LINKTO);
 
     /*
@@ -117,21 +117,26 @@
 
 /*@=branchstate@*/
 
-    if (flags & RPMVERIFY_MD5) {
-	unsigned char md5sum[16];
-	size_t fsize;
-
-	/* XXX If --nomd5, then prelinked library sizes are not corrected. */
-	rc = domd5(fn, md5sum, 0, &fsize);
-	sb.st_size = fsize;
-	if (rc)
-	    *res |= (RPMVERIFY_READFAIL|RPMVERIFY_MD5);
+    if (flags & RPMVERIFY_FDIGEST) {
+	int dalgo = 0;
+	size_t dlen = 0;
+	const unsigned char * digest = rpmfiDigest(fi, &dalgo, &dlen);
+
+	if (digest == NULL)
+	    *res |= RPMVERIFY_FDIGEST;
 	else {
-	    const unsigned char * MD5 = rpmfiMD5(fi);
-	    if (MD5 == NULL || memcmp(md5sum, MD5, sizeof(md5sum)))
-		*res |= RPMVERIFY_MD5;
+	/* XXX If --nofdigest, then prelinked library sizes fail to verify. */
+	    unsigned char * fdigest = memset(alloca(dlen), 0, dlen);
+	    size_t fsize;
+	    rc = dodigest(dalgo, fn, fdigest, 0, &fsize);
+	    sb.st_size = fsize;
+	    if (rc)
+		*res |= (RPMVERIFY_READFAIL|RPMVERIFY_FDIGEST);
+	    else
+	    if (memcmp(fdigest, digest, dlen))
+		*res |= RPMVERIFY_FDIGEST;
 	}
-    } 
+    }
 
     if (flags & RPMVERIFY_LINKTO) {
 	char linkto[1024+1];
@@ -145,12 +150,12 @@
 	    if (flink == NULL || strcmp(linkto, flink))
 		*res |= RPMVERIFY_LINKTO;
 	}
-    } 
+    }
 
     if (flags & RPMVERIFY_FILESIZE) {
 	if (sb.st_size != rpmfiFSize(fi))
 	    *res |= RPMVERIFY_FILESIZE;
-    } 
+    }
 
     if (flags & RPMVERIFY_MODE) {
 	unsigned short metamode = fmode;
@@ -158,7 +163,7 @@
 
 	/*
 	 * Platforms (like AIX) where sizeof(unsigned short) != sizeof(mode_t)
-	 * need the (unsigned short) cast here. 
+	 * need the (unsigned short) cast here.
 	 */
 	filemode = (unsigned short)sb.st_mode;
 
@@ -184,7 +189,7 @@
 	    uint_16 frdev = (rpmfiFRdev(fi) & 0xffff);
 	    if (st_rdev != frdev)
 		*res |= RPMVERIFY_RDEV;
-	} 
+	}
     }
 
     if (flags & RPMVERIFY_MTIME) {
@@ -301,7 +306,7 @@
 		ec = rc;
 	    }
 	} else if (verifyResult || rpmIsVerbose()) {
-	    const char * size, * MD5, * link, * mtime, * mode;
+	    const char * size, * digest, * link, * mtime, * mode;
 	    const char * group, * user, * rdev;
 	    /*@observer@*/ static const char *const aok = ".";
 	    /*@observer@*/ static const char *const unknown = "?";
@@ -317,7 +322,7 @@
 	((verifyResult & RPMVERIFY_READFAIL) ? unknown : \
 	 (verifyResult & _RPMVERIFY_F) ? _C : aok)
 	
-	    MD5 = _verifyfile(RPMVERIFY_MD5, "5");
+	    digest = _verifyfile(RPMVERIFY_FDIGEST, "5");
 	    size = _verify(RPMVERIFY_FILESIZE, "S");
 	    link = _verifylink(RPMVERIFY_LINKTO, "L");
 	    mtime = _verify(RPMVERIFY_MTIME, "T");
@@ -331,7 +336,7 @@
 #undef _verify
 
 	    sprintf(te, "%s%s%s%s%s%s%s%s %c %s",
-			size, mode, MD5, rdev, link, user, group, mtime,
+			size, mode, digest, rdev, link, user, group, mtime,
 			((fileAttrs & RPMFILE_CONFIG)	? 'c' :
 			 (fileAttrs & RPMFILE_DOC)	? 'd' :
 			 (fileAttrs & RPMFILE_GHOST)	? 'g' :
--- rpm-4.4.2/lib/rpmfi.c.digests	2005-02-10 03:30:28.000000000 -0500
+++ rpm-4.4.2/lib/rpmfi.c	2006-07-05 14:18:15.000000000 -0400
@@ -203,17 +203,36 @@
     return fstate;
 }
 
+const unsigned char * rpmfiDigest(rpmfi fi, int * algop, size_t * lenp)
+{
+    unsigned char * digest = NULL;
+
+    if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) {
+/*@-boundsread@*/
+	if (fi->digests != NULL) {
+	    digest = fi->digests + (fi->digestlen * fi->i);
+	    if (algop != NULL)
+		*algop = (fi->fdigestalgos
+			? fi->fdigestalgos[fi->i] : fi->digestalgo);
+	    if (lenp != NULL)
+		*lenp = fi->digestlen;
+	}
+/*@=boundsread@*/
+    }
+    return digest;
+}
+
 const unsigned char * rpmfiMD5(rpmfi fi)
 {
-    unsigned char * MD5 = NULL;
+    unsigned char * digest = NULL;
 
     if (fi != NULL && fi->i >= 0 && fi->i < fi->fc) {
 /*@-boundsread@*/
-	if (fi->md5s != NULL)
-	    MD5 = fi->md5s + (16 * fi->i);
+	if (fi->digests != NULL)
+	    digest = fi->digests + (fi->digestlen * fi->i);
 /*@=boundsread@*/
     }
-    return MD5;
+    return digest;
 }
 
 const char * rpmfiFLink(rpmfi fi)
@@ -530,12 +549,19 @@
 	if (blink == NULL) return -1;
 	return strcmp(alink, blink);
     } else if (awhat == REG) {
-	const unsigned char * amd5 = rpmfiMD5(afi);
-	const unsigned char * bmd5 = rpmfiMD5(bfi);
-	if (amd5 == bmd5) return 0;
-	if (amd5 == NULL) return 1;
-	if (bmd5 == NULL) return -1;
-	return memcmp(amd5, bmd5, 16);
+	int aalgo = 0;
+	size_t alen = 0;
+	const unsigned char * adigest = rpmfiDigest(afi, &aalgo, &alen);
+	int balgo = 0;
+	size_t blen = 0;
+	const unsigned char * bdigest = rpmfiDigest(bfi, &balgo, &blen);
+	/* XXX W2DO? changing file digest algo may break rpmfiCompare. */
+	if (!(aalgo == balgo && alen == blen))
+	    return -1;
+	if (adigest == bdigest) return 0;
+	if (adigest == NULL) return 1;
+	if (bdigest == NULL) return -1;
+	return memcmp(adigest, bdigest, alen);
     }
 
     return 0;
@@ -592,17 +618,23 @@
      */
     memset(buffer, 0, sizeof(buffer));
     if (dbWhat == REG) {
-	const unsigned char * omd5, * nmd5;
-	/* XXX avoid md5 on sparse /var/log/lastlog file. */
+	int oalgo = 0;
+	size_t olen = 0;
+	const unsigned char * odigest;
+	int nalgo = 0;
+	size_t nlen = 0;
+	const unsigned char * ndigest;
+	odigest = rpmfiDigest(ofi, &oalgo, &olen);
+	/* XXX avoid digest on sparse /var/log/lastlog file. */
 	if (strcmp(fn, "/var/log/lastlog"))
-	if (domd5(fn, buffer, 0, NULL))
+	if (dodigest(oalgo, fn, buffer, 0, NULL))
 	    return FA_CREATE;	/* assume file has been removed */
-	omd5 = rpmfiMD5(ofi);
-	if (omd5 && !memcmp(omd5, buffer, 16))
+	if (odigest && !memcmp(odigest, buffer, olen))
 	    return FA_CREATE;	/* unmodified config file, replace. */
-	nmd5 = rpmfiMD5(nfi);
+	ndigest = rpmfiDigest(nfi, &nalgo, &nlen);
 /*@-nullpass@*/
-	if (omd5 && nmd5 && !memcmp(omd5, nmd5, 16))
+	if (odigest && ndigest && oalgo == nalgo && olen == nlen
+	 && !memcmp(odigest, ndigest, nlen))
 	    return FA_SKIP;	/* identical file, don't bother. */
 /*@=nullpass@*/
     } else /* dbWhat == LINK */ {
@@ -1123,8 +1155,8 @@
 
 	fi->flinks = hfd(fi->flinks, -1);
 	fi->flangs = hfd(fi->flangs, -1);
-	fi->fmd5s = hfd(fi->fmd5s, -1);
-	fi->md5s = _free(fi->md5s);
+	fi->fdigests = hfd(fi->fdigests, -1);
+	fi->digests = _free(fi->digests);
 
 	fi->cdict = hfd(fi->cdict, -1);
 
@@ -1306,27 +1338,53 @@
     xx = hge(h, RPMTAG_FILELINKTOS, NULL, (void **) &fi->flinks, NULL);
     xx = hge(h, RPMTAG_FILELANGS, NULL, (void **) &fi->flangs, NULL);
 
-    fi->fmd5s = NULL;
-    xx = hge(h, RPMTAG_FILEMD5S, NULL, (void **) &fi->fmd5s, NULL);
-
-    fi->md5s = NULL;
-    if (fi->fmd5s) {
-	t = xmalloc(fi->fc * 16);
-	fi->md5s = t;
+    fi->digestalgo = PGPHASHALGO_MD5;
+    fi->digestlen = 16;
+    fi->fdigestalgos = NULL;
+    xx = hge(h, RPMTAG_FILEDIGESTALGOS, NULL, (void **) &fi->fdigestalgos, NULL);
+    if (fi->fdigestalgos) {
+	int dalgo = 0;
+	/* XXX Insure that all algorithms are either 0 or constant. */
+	for (i = 0; i < fi->fc; i++) {
+	    if (fi->fdigestalgos[i] == 0)
+		continue;
+	    if (dalgo == 0)
+		dalgo = fi->fdigestalgos[i];
+	    else
+assert(dalgo == fi->fdigestalgos[i]);
+	}
+	fi->digestalgo = dalgo;
+	switch (dalgo) {
+	case PGPHASHALGO_MD5:		fi->digestlen = 128/8;	break;
+	case PGPHASHALGO_SHA1:		fi->digestlen = 160/8;	break;
+	case PGPHASHALGO_SHA256:	fi->digestlen = 256/8;	break;
+	case PGPHASHALGO_SHA384:	fi->digestlen = 384/8;	break;
+	case PGPHASHALGO_SHA512:	fi->digestlen = 512/8;	break;
+	}
+	fi->fdigestalgos = NULL;
+    }
+
+    fi->fdigests = NULL;
+    xx = hge(h, RPMTAG_FILEDIGESTS, NULL, (void **) &fi->fdigests, NULL);
+
+    fi->digests = NULL;
+    if (fi->fdigests) {
+	t = xmalloc(fi->fc * fi->digestlen);
+	fi->digests = t;
 	for (i = 0; i < fi->fc; i++) {
-	    const char * fmd5;
+	    const char * fdigests;
 	    int j;
 
-	    fmd5 = fi->fmd5s[i];
-	    if (!(fmd5 && *fmd5 != '\0')) {
-		memset(t, 0, 16);
-		t += 16;
+	    fdigests = fi->fdigests[i];
+	    if (!(fdigests && *fdigests != '\0')) {
+		memset(t, 0, fi->digestlen);
+		t += fi->digestlen;
 		continue;
 	    }
-	    for (j = 0; j < 16; j++, t++, fmd5 += 2)
-		*t = (nibble(fmd5[0]) << 4) | nibble(fmd5[1]);
+	    for (j = 0; j < fi->digestlen; j++, t++, fdigests += 2)
+		*t = (nibble(fdigests[0]) << 4) | nibble(fdigests[1]);
 	}
-	fi->fmd5s = hfd(fi->fmd5s, -1);
+	fi->fdigests = hfd(fi->fdigests, -1);
     }
 
     /* XXX TR_REMOVED doesn;t need fmtimes, frdevs, finodes, or fcontexts */
@@ -1401,7 +1459,7 @@
 /* XXX DYING */
 if (fi->actions == NULL)
 	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
-	/*@-compdef@*/ /* FIX: fi-md5s undefined */
+	/*@-compdef@*/ /* FIX: fi->digests undefined */
 	foo = relocateFileList(ts, fi, h, fi->actions);
 	/*@=compdef@*/
 	fi->h = headerFree(fi->h);
--- rpm-4.4.2/lib/rpmcli.h.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/rpmcli.h	2006-07-05 14:18:15.000000000 -0400
@@ -83,7 +83,7 @@
  */
 #define	RPMCLI_POPT_NODEPS		-1025
 #define	RPMCLI_POPT_FORCE		-1026
-#define	RPMCLI_POPT_NOMD5		-1027
+#define	RPMCLI_POPT_NOFDIGESTS		-1027
 #define	RPMCLI_POPT_NOSCRIPTS		-1028
 #define	RPMCLI_POPT_NOSIGNATURE		-1029
 #define	RPMCLI_POPT_NODIGEST		-1030
@@ -111,7 +111,7 @@
     RPMQV_SPECFILE,	/*!< ... from spec file parse (query only). */
     RPMQV_PKGID,	/*!< ... from package id (header+payload MD5). */
     RPMQV_HDRID,	/*!< ... from header id (immutable header SHA1). */
-    RPMQV_FILEID,	/*!< ... from file id (file MD5). */
+    RPMQV_FILEID,	/*!< ... from file id (file digest, usually MD5). */
     RPMQV_TID,		/*!< ... from install transaction id (time stamp). */
     RPMQV_HDLIST,	/*!< ... from system hdlist. */
     RPMQV_FTSWALK	/*!< ... from fts(3) walk. */
@@ -122,7 +122,7 @@
  */
 typedef enum rpmVerifyAttrs_e {
     RPMVERIFY_NONE	= 0,		/*!< */
-    RPMVERIFY_MD5	= (1 << 0),	/*!< from %verify(md5) */
+    RPMVERIFY_FDIGEST	= (1 << 0),	/*!< from %verify(digest) */
     RPMVERIFY_FILESIZE	= (1 << 1),	/*!< from %verify(size) */
     RPMVERIFY_LINKTO	= (1 << 2),	/*!< from %verify(link) */
     RPMVERIFY_USER	= (1 << 3),	/*!< from %verify(user) */
@@ -139,6 +139,7 @@
     RPMVERIFY_LSTATFAIL	= (1 << 30),	/*!< lstat failed */
     RPMVERIFY_LGETFILECONFAIL	= (1 << 31)	/*!< lgetfilecon failed */
 } rpmVerifyAttrs;
+#define	RPMVERIFY_MD5	RPMVERIFY_FDIGEST
 #define	RPMVERIFY_ALL		~(RPMVERIFY_NONE)
 #define	RPMVERIFY_FAILURES	\
   (RPMVERIFY_LSTATFAIL|RPMVERIFY_READFAIL|RPMVERIFY_READLINKFAIL|RPMVERIFY_LGETFILECONFAIL)
@@ -150,7 +151,7 @@
 typedef enum rpmQueryFlags_e {
 /*@-enummemuse@*/
     QUERY_FOR_DEFAULT	= 0,		/*!< */
-    QUERY_MD5		= (1 << 0),	/*!< from --nomd5 */
+    QUERY_FDIGEST	= (1 << 0),	/*!< from --nofdigest */
     QUERY_SIZE		= (1 << 1),	/*!< from --nosize */
     QUERY_LINKTO	= (1 << 2),	/*!< from --nolink */
     QUERY_USER		= (1 << 3),	/*!< from --nouser) */
@@ -193,7 +194,7 @@
 /*@-enummemuse@*/
     VERIFY_DEFAULT	= 0,		/*!< */
 /*@=enummemuse@*/
-    VERIFY_MD5		= (1 << 0),	/*!< from --nomd5 */
+    VERIFY_FDIGEST	= (1 << 0),	/*!< from --nofdigest */
     VERIFY_SIZE		= (1 << 1),	/*!< from --nosize */
     VERIFY_LINKTO	= (1 << 2),	/*!< from --nolinkto */
     VERIFY_USER		= (1 << 3),	/*!< from --nouser */
@@ -221,7 +222,7 @@
 } rpmVerifyFlags;
 
 #define	VERIFY_ATTRS	\
-  ( VERIFY_MD5 | VERIFY_SIZE | VERIFY_LINKTO | VERIFY_USER | VERIFY_GROUP | \
+  ( VERIFY_FDIGEST | VERIFY_SIZE | VERIFY_LINKTO | VERIFY_USER | VERIFY_GROUP | \
     VERIFY_MTIME | VERIFY_MODE | VERIFY_RDEV | VERIFY_CONTEXTS )
 #define	VERIFY_ALL	\
   ( VERIFY_ATTRS | VERIFY_FILES | VERIFY_DEPS | VERIFY_SCRIPT | VERIFY_DIGEST |\
@@ -404,7 +405,7 @@
 		fileSystem, internalState @*/;
 
 /** \ingroup rpmcli
- * Verify file attributes (including MD5 sum).
+ * Verify file attributes (including file digest).
  * @todo gnorpm and python bindings prevent this from being static.
  * @param ts		transaction set
  * @param fi		file info (with linked header and current file index)
--- rpm-4.4.2/lib/fsm.h.digests	2003-12-25 18:00:45.000000000 -0500
+++ rpm-4.4.2/lib/fsm.h	2006-07-05 14:18:15.000000000 -0400
@@ -181,14 +181,16 @@
     int rc;			/*!< External file stage return code. */
     int commit;			/*!< Commit synchronously? */
     cpioMapFlags mapFlags;	/*!< Bit(s) to control mapping. */
+    int fdigestalgo;		/*!< Digest algorithm (~= PGPHASHALGO_MD5) */
+    int digestlen;		/*!< No. of bytes in binary digest (~= 16) */
 /*@shared@*/ /*@relnull@*/
     const char * dirName;	/*!< File directory name. */
 /*@shared@*/ /*@relnull@*/
     const char * baseName;	/*!< File base name. */
 /*@shared@*/ /*@relnull@*/
-    const char * fmd5sum;	/*!< Hex MD5 sum (NULL disables). */
+    const char * fdigest;	/*!< Hex digest (usually MD5, NULL disables). */
 /*@shared@*/ /*@relnull@*/
-    const char * md5sum;	/*!< Binary MD5 sum (NULL disables). */
+    const char * digest;	/*!< Bin digest (usually MD5, NULL disables). */
 /*@dependent@*/ /*@observer@*/ /*@null@*/
     const char * fcontext;	/*!< File security context (NULL disables). */
     
--- rpm-4.4.2/lib/poptQV.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/poptQV.c	2006-07-05 14:18:15.000000000 -0400
@@ -222,8 +222,8 @@
 	qva->qva_flags |= VERIFY_DEPS;
 	break;
 
-    case RPMCLI_POPT_NOMD5:
-	qva->qva_flags |= VERIFY_MD5;
+    case RPMCLI_POPT_NOFDIGESTS:
+	qva->qva_flags |= VERIFY_FDIGEST;
 	break;
 
     case RPMCLI_POPT_NOCONTEXTS:
@@ -315,11 +315,13 @@
  /* Duplicate file verify flags from packages into command line options. */
 /** @todo Add --nomd5 alias to rpmpopt, eliminate. */
 #ifdef	DYING
- { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_MD5,
-	N_("don't verify MD5 digest of files"), NULL },
+ { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FDIGEST,
+	N_("don't verify file digests"), NULL },
 #else
- { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5,
-	N_("don't verify MD5 digest of files"), NULL },
+ { "nomd5", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOFDIGESTS,
+	N_("don't verify file digests"), NULL },
+ { "nofdigests", '\0', 0, NULL, RPMCLI_POPT_NOFDIGESTS,
+	N_("don't verify file digests"), NULL },
 #endif
  { "nosize", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmQVKArgs.qva_flags, VERIFY_SIZE,
--- rpm-4.4.2/lib/psm.c.digests	2005-07-13 07:13:34.000000000 -0400
+++ rpm-4.4.2/lib/psm.c	2006-07-05 14:18:15.000000000 -0400
@@ -321,9 +321,6 @@
 	    *cookie = xstrdup(*cookie);
     }
 
-    /* XXX FIXME: can't do endian neutral MD5 verification yet. */
-/*@i@*/ fi->fmd5s = hfd(fi->fmd5s, -1);
-
     /* XXX FIXME: don't do per-file mapping, force global flags. */
     fi->fmapflags = _free(fi->fmapflags);
     fi->mapflags = CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
--- rpm-4.4.2/lib/rpmlib.h.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/rpmlib.h	2006-07-05 14:34:53.000000000 -0400
@@ -304,7 +304,8 @@
     RPMTAG_FILEGIDS		= 1032, /*!< internal */
     RPMTAG_FILERDEVS		= 1033,	/* h */
     RPMTAG_FILEMTIMES		= 1034, /* i */
-    RPMTAG_FILEMD5S		= 1035,	/* s[] */
+    RPMTAG_FILEDIGESTS		= 1035,	/* s[] */
+#define RPMTAG_FILEMD5S		RPMTAG_FILEDIGESTS /* s[] */
     RPMTAG_FILELINKTOS		= 1036,	/* s[] */
     RPMTAG_FILEFLAGS		= 1037,	/* i */
 /*@-enummemuse@*/
@@ -447,6 +448,8 @@
     RPMTAG_PRIORITY		= 1162, /* i   extension placeholder */
     RPMTAG_CVSID		= 1163, /* s */
 #define	RPMTAG_SVNID	RPMTAG_CVSID	/* s */
+    RPMTAG_FILEDIGESTALGOS	= 1177, /*!< i[] */
+
 
 /*@-enummemuse@*/
     RPMTAG_FIRSTFREE_TAG	/*!< internal */
@@ -997,7 +1000,7 @@
     RPMTRANS_FLAG_APPLYONLY	= (1 << 25),
 
     RPMTRANS_FLAG_ANACONDA	= (1 << 26),	/*!< from --anaconda */
-    RPMTRANS_FLAG_NOMD5		= (1 << 27),	/*!< from --nomd5 */
+    RPMTRANS_FLAG_NOFDIGESTS	= (1 << 27),	/*!< from --nomd5 */
     RPMTRANS_FLAG_NOSUGGEST	= (1 << 28),	/*!< from --nosuggest */
     RPMTRANS_FLAG_ADDINDEPS	= (1 << 29),	/*!< from --aid */
     RPMTRANS_FLAG_NOCONFIGS	= (1 << 30),	/*!< from --noconfigs */
--- rpm-4.4.2/lib/query.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/query.c	2006-07-05 14:18:15.000000000 -0400
@@ -528,7 +528,7 @@
         for (i = 0, t = MD5, s = arg; i < 16; i++, t++, s += 2)
             *t = (nibble(s[0]) << 4) | nibble(s[1]);
 
-	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEMD5S, MD5, sizeof(MD5));
+	qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEDIGESTS, MD5, sizeof(MD5));
 	if (qva->qva_mi == NULL) {
 	    rpmError(RPMERR_QUERYINFO, _("no package matches %s: %s\n"),
 			"fileid", arg);
--- rpm-4.4.2/lib/transaction.c.digests	2006-07-05 14:18:15.000000000 -0400
+++ rpm-4.4.2/lib/transaction.c	2006-07-05 14:18:15.000000000 -0400
@@ -27,7 +27,7 @@
 
 #include "cpio.h"
 #include "fprint.h"
-#include "legacy.h"	/* XXX domd5 */
+#include "legacy.h"	/* XXX dodigest */
 #include "misc.h" /* XXX stripTrailingChar, splitString, currentDirectory */
 
 #include "debug.h"
@@ -641,14 +641,21 @@
 	    }
 		
 	    /* Here is a pre-existing modified config file that needs saving. */
-	    /* XXX avoid md5 on sparse /var/log/lastlog file. */
+	    /* XXX avoid digest on sparse /var/log/lastlog file. */
 	    if (strcmp(fn, "/var/log/lastlog"))
-	    {	char md5sum[50];
-		const unsigned char * MD5 = rpmfiMD5(fi);
-		if (!domd5(fn, md5sum, 0, NULL) && memcmp(MD5, md5sum, 16)) {
-		    fi->actions[i] = FA_BACKUP;
+	    {	int dalgo = 0;
+                size_t dlen = 0;
+		const unsigned char * digest = rpmfiDigest(fi, &dalgo, &dlen);
+                unsigned char * fdigest;
+assert(digest != NULL);
+                fdigest = xcalloc(1, dlen);
+                if (!dodigest(dalgo, fn, fdigest, 0, NULL)) {
+		    if (memcmp(digest, fdigest, dlen))
+		        fi->actions[i] = FA_BACKUP;
+                    fdigest = _free(fdigest);
 		    /*@switchbreak@*/ break;
 		}
+                fdigest = _free(fdigest);
 	    }
 	    fi->actions[i] = FA_ERASE;
 	    /*@switchbreak@*/ break;
--- rpm-4.4.2/rpmio/tdigest.c.digests	2003-03-28 17:47:18.000000000 -0500
+++ rpm-4.4.2/rpmio/tdigest.c	2006-07-05 14:18:15.000000000 -0400
@@ -18,6 +18,9 @@
 static struct poptOption optionsTable[] = {
  { "md5", '\0', POPT_ARG_VAL, 	&hashalgo, PGPHASHALGO_MD5,	NULL, NULL },
  { "sha1",'\0', POPT_ARG_VAL, 	&hashalgo, PGPHASHALGO_SHA1,	NULL, NULL },
+ { "sha256",'\0', POPT_ARG_VAL, &hashalgo, PGPHASHALGO_SHA256,	NULL, NULL },
+ { "sha384",'\0', POPT_ARG_VAL, &hashalgo, PGPHASHALGO_SHA384,	NULL, NULL },
+ { "sha512",'\0', POPT_ARG_VAL, &hashalgo, PGPHASHALGO_SHA512,	NULL, NULL },
 #ifdef	DYING
  { "reverse",'\0', POPT_BIT_SET, &flags, RPMDIGEST_REVERSE,	NULL, NULL },
 #endif
@@ -145,6 +148,7 @@
 	ssize_t nb;
 
 	sdigest = NULL;
+	if (hashalgo == PGPHASHALGO_MD5 || hashalgo == PGPHASHALGO_SHA1)
 	{   char *se;
 	    FILE * sfp;
 
--- rpm-4.4.2/rpmqv.c.digests	2006-07-05 14:35:11.000000000 -0400
+++ rpm-4.4.2/rpmqv.c	2006-07-05 14:36:10.000000000 -0400
@@ -742,7 +742,7 @@
 	if (!poptPeekArg(optCon)) {
 	    if (ia->rbtid == 0)
 		argerror(_("no packages given for erase"));
-ia->transFlags |= RPMTRANS_FLAG_NOMD5;
+ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
 ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
 	    ec += rpmRollback(ts, ia, NULL);
 	} else {
@@ -782,7 +782,7 @@
 	if (!poptPeekArg(optCon)) {
 	    if (ia->rbtid == 0)
 		argerror(_("no packages given for install"));
-ia->transFlags |= RPMTRANS_FLAG_NOMD5;
+ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
 ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
 /*@i@*/	    ec += rpmRollback(ts, ia, NULL);
 	} else {
@@ -821,7 +821,7 @@
 #ifdef IAM_RPMK
     case MODE_CHECKSIG:
     {	rpmVerifyFlags verifyFlags =
-		(VERIFY_MD5|VERIFY_DIGEST|VERIFY_SIGNATURE);
+		(VERIFY_FDIGEST|VERIFY_HDRCHK|VERIFY_DIGEST|VERIFY_SIGNATURE);
 
 	verifyFlags &= ~ka->qva_flags;
 	ka->qva_flags = (rpmQueryFlags) verifyFlags;
--- rpm-4.4.2/python/rpmmodule.c.digests	2005-03-07 07:35:04.000000000 -0500
+++ rpm-4.4.2/python/rpmmodule.c	2006-07-05 14:18:15.000000000 -0400
@@ -376,7 +376,7 @@
     REGISTER_ENUM(RPMTRANS_FLAG_NOPOSTUN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOTRIGGERPOSTUN);
     REGISTER_ENUM(RPMTRANS_FLAG_ANACONDA);
-    REGISTER_ENUM(RPMTRANS_FLAG_NOMD5);
+    REGISTER_ENUM(RPMTRANS_FLAG_NOFDIGESTS);
     REGISTER_ENUM(RPMTRANS_FLAG_NOSUGGEST);
     REGISTER_ENUM(RPMTRANS_FLAG_ADDINDEPS);
     REGISTER_ENUM(RPMTRANS_FLAG_NOCONFIGS);
--- rpm-4.4.2/python/rpmts-py.c.digests	2005-02-12 22:12:07.000000000 -0500
+++ rpm-4.4.2/python/rpmts-py.c	2006-07-05 14:18:15.000000000 -0400
@@ -635,7 +635,7 @@
     memset(ia, 0, sizeof(*ia));
     ia->qva_flags = (VERIFY_DIGEST|VERIFY_SIGNATURE|VERIFY_HDRCHK);
     ia->transFlags |= (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL);
-    ia->transFlags |= RPMTRANS_FLAG_NOMD5;
+    ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
     ia->installInterfaceFlags = (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL);
     ia->rbtid = rbtid;
     ia->relocations = NULL;



From fedora-cvs-commits at redhat.com  Wed Jul  5 18:57:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 14:57:34 -0400
Subject: rpms/netatalk/FC-5 netatalk.spec,1.26,1.27
Message-ID: <200607051857.k65IvYoP018007@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	netatalk.spec 
Log Message:
fix bug 197437


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/FC-5/netatalk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- netatalk.spec	11 Feb 2006 04:43:48 -0000	1.26
+++ netatalk.spec	5 Jul 2006 18:57:31 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 4.2.1
+Release: 5.fc5
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -23,8 +23,8 @@
 Patch4:  netatalk-2.0.3-nodefault.patch
 Url:	 http://netatalk.sourceforge.net/
 Prereq:  /sbin/chkconfig, /sbin/service 
-Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib
-BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel
+Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib, libgssapi
+BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf db4-devel pam-devel libgssapi-devel
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -179,6 +179,9 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* Wed Jul 5 2006 Jason Vas Dias <jvdias at redhat.com> - 4:2.0.3-5.fc5
+- rebuild for broken libgssapi deps (bug 197437)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-4.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:01:52 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ia64-fixup.patch, 1.1,
	1.2 kexec-tools.spec, 1.27, 1.28
Message-ID: <200607051901.k65J1qwH019244@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19184

Modified Files:
	kexec-tools-1.101-ia64-fixup.patch kexec-tools.spec 
Log Message:
adding further fixups for ia64

kexec-tools-1.101-ia64-fixup.patch:
 Makefile                     |    4 ++++
 kexec/arch/ia64/kexec-ia64.c |   24 ------------------------
 kexec_test/Makefile.ia64     |   30 ++++++++++++++++++++++++++++++
 kexec_test/kexec_test_ia64.S |   26 ++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 24 deletions(-)

Index: kexec-tools-1.101-ia64-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-ia64-fixup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 17:23:51 -0000	1.1
+++ kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:01:41 -0000	1.2
@@ -38,3 +38,85 @@
  		/* For compatibility with older patches 
  		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
  		 */
+--- kexec-tools-1.101/kexec_test/Makefile.ia64.orig	2006-07-05 09:52:22.000000000 -0400
++++ kexec-tools-1.101/kexec_test/Makefile.ia64	2006-07-05 09:52:22.000000000 -0400
+@@ -0,0 +1,30 @@
++#
++# kexec_test Debugging payload to be certain the infrastructure works
++#
++RELOC:=0x10000
++KEXEC_TEST_S_SRCS:= kexec_test/kexec_test_ia64.S
++KEXEC_TEST_S_TEMPS:=$(patsubst %.S, $(OBJDIR)/%.s, $(KEXEC_TEST_S_SRCS))
++KEXEC_TEST_S_OBJS:=$(patsubst $(OBJDIR)/%.s, $(OBJDIR)/%.o, $(KEXEC_TEST_S_TEMPS))
++KEXEC_TEST_S_DEPS:=$(patsubst %.S, $(OBJDIR)/%.d, $(KEXEC_TEST_S_SRCS))
++KEXEC_TEST_SRCS:= $(KEXEC_TEST_S_SRCS)
++KEXEC_TEST_OBJS:= $(KEXEC_TEST_S_OBJS)
++KEXEC_TEST_DEPS:= $(KEXEC_TEST_S_DEPS)
++KEXEC_TEST:=$(PKGLIBDIR)/kexec_test
++
++include $(KEXEC_TEST_DEPS)
++
++$(KEXEC_TEST_S_DEPS): $(OBJDIR)/%.d: %.S
++	mkdir -p $(@D)
++	$(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
++
++$(KEXEC_TEST_S_TEMPS): $(OBJDIR)/%.s: %.S 
++	mkdir -p $(@D)
++	$(CPP) $(CPPFLAGS) -DRELOC=$(RELOC) $< > $@
++
++$(KEXEC_TEST_S_OBJS): $(OBJDIR)/%.o: $(OBJDIR)/%.s 
++	mkdir -p $(@D)
++	$(AS) -o $@ $<
++
++$(KEXEC_TEST): $(KEXEC_TEST_OBJS) 
++	mkdir -p $(@D)
++	$(LD) -m elf64_ia64 -e _start -Ttext $(RELOC) $(KEXEC_TEST_OBJS) -o $@
+--- kexec-tools-1.101/kexec_test/kexec_test_ia64.S.orig	2006-07-05 09:52:22.000000000 -0400
++++ kexec-tools-1.101/kexec_test/kexec_test_ia64.S	2006-07-05 09:55:17.000000000 -0400
+@@ -0,0 +1,26 @@
++/*
++ * kexec: Linux boots Linux
++ *
++ * Copyright (C) 2003,2004  Eric Biederman (ebiederm at xmission.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 (version 2 of the License).
++ *
++ * 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.
++ */
++
++	.text
++	.globl _start
++_start:
++	# Jump to self
++	br.few _start
++
++
+--- kexec-tools-1.101/Makefile.orig	2006-07-05 09:52:29.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-05 09:54:24.000000000 -0400
+@@ -45,6 +45,7 @@
+ MAN_PAGES:= kexec/kexec.8
+ BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+ BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
++BINARIES_ia64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+ BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
+ 
+ TARGETS:=$(BINARIES) $(MAN_PAGES)
+@@ -89,6 +90,9 @@
+ ifeq ($(ARCH),x86_64)
+ include kexec_test/Makefile
+ endif
++ifeq ($(ARCH),ia64)
++include kexec_test/Makefile.ia64
++endif
+ 
+ GENERATED_SRCS:= ./configure
+ SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kexec-tools.spec	5 Jul 2006 17:26:58 -0000	1.27
+++ kexec-tools.spec	5 Jul 2006 19:01:41 -0000	1.28
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 22%{dist}
+Release: 23%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:20:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:20:45 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-Makefile.patch, 1.1,
	1.2 kexec-tools-1.101-ia64-fixup.patch, 1.2,
	1.3 kexec-tools.spec, 1.28, 1.29
Message-ID: <200607051920.k65JKj2J006508@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6464

Modified Files:
	kexec-tools-1.101-Makefile.patch 
	kexec-tools-1.101-ia64-fixup.patch kexec-tools.spec 
Log Message:
fixing up patch problems

kexec-tools-1.101-Makefile.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: kexec-tools-1.101-Makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kexec-tools-1.101-Makefile.patch	2 Feb 2006 10:39:56 -0000	1.1
+++ kexec-tools-1.101-Makefile.patch	5 Jul 2006 19:20:43 -0000	1.2
@@ -1,11 +1,11 @@
---- 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 @@
+--- kexec-tools-1.101/Makefile.orig	2006-07-05 15:18:20.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-05 15:19:18.000000000 -0400
+@@ -44,7 +44,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
  
  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_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
  BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
  
- TARGETS:=$(BINARIES) $(MAN_PAGES)

kexec-tools-1.101-ia64-fixup.patch:
 Makefile                     |    4 ++++
 kexec/arch/ia64/kexec-ia64.c |   24 ------------------------
 kexec_test/Makefile.ia64     |   30 ++++++++++++++++++++++++++++++
 kexec_test/kexec_test_ia64.S |   26 ++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 24 deletions(-)

Index: kexec-tools-1.101-ia64-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-ia64-fixup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:01:41 -0000	1.2
+++ kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:20:43 -0000	1.3
@@ -1,5 +1,5 @@
---- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig	2006-07-05 13:02:12.000000000 -0400
-+++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c	2006-07-05 13:17:41.000000000 -0400
+--- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig	2006-07-05 15:16:35.000000000 -0400
++++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c	2006-07-05 15:16:54.000000000 -0400
 @@ -87,8 +87,6 @@ int arch_process_options(int argc, char 
  	};
  	static const char short_options[] = KEXEC_ARCH_OPT_STR;
@@ -38,8 +38,28 @@
  		/* For compatibility with older patches 
  		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
  		 */
---- kexec-tools-1.101/kexec_test/Makefile.ia64.orig	2006-07-05 09:52:22.000000000 -0400
-+++ kexec-tools-1.101/kexec_test/Makefile.ia64	2006-07-05 09:52:22.000000000 -0400
+--- kexec-tools-1.101/Makefile.orig	2006-07-05 15:16:35.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-05 15:17:18.000000000 -0400
+@@ -45,6 +45,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
+ MAN_PAGES:= kexec/kexec.8
+ BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+ BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
++BINARIES_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+ BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
+ 
+ TARGETS:=$(BINARIES) $(MAN_PAGES)
+@@ -89,6 +90,9 @@ endif
+ ifeq ($(ARCH),x86_64)
+ include kexec_test/Makefile
+ endif
++ifeq ($(ARCH),ia64)
++include kexec_test/Makefile.ia64
++endif
+ 
+ GENERATED_SRCS:= ./configure
+ SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec
+--- /dev/null	2006-06-30 11:19:59.592541712 -0400
++++ kexec-tools-1.101/kexec_test/Makefile.ia64	2006-07-05 15:16:54.000000000 -0400
 @@ -0,0 +1,30 @@
 +#
 +# kexec_test Debugging payload to be certain the infrastructure works
@@ -71,8 +91,8 @@
 +$(KEXEC_TEST): $(KEXEC_TEST_OBJS) 
 +	mkdir -p $(@D)
 +	$(LD) -m elf64_ia64 -e _start -Ttext $(RELOC) $(KEXEC_TEST_OBJS) -o $@
---- kexec-tools-1.101/kexec_test/kexec_test_ia64.S.orig	2006-07-05 09:52:22.000000000 -0400
-+++ kexec-tools-1.101/kexec_test/kexec_test_ia64.S	2006-07-05 09:55:17.000000000 -0400
+--- /dev/null	2006-06-30 11:19:59.592541712 -0400
++++ kexec-tools-1.101/kexec_test/kexec_test_ia64.S	2006-07-05 15:16:54.000000000 -0400
 @@ -0,0 +1,26 @@
 +/*
 + * kexec: Linux boots Linux
@@ -100,23 +120,3 @@
 +	br.few _start
 +
 +
---- kexec-tools-1.101/Makefile.orig	2006-07-05 09:52:29.000000000 -0400
-+++ kexec-tools-1.101/Makefile	2006-07-05 09:54:24.000000000 -0400
-@@ -45,6 +45,7 @@
- MAN_PAGES:= kexec/kexec.8
- BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
-+BINARIES_ia64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
- 
- TARGETS:=$(BINARIES) $(MAN_PAGES)
-@@ -89,6 +90,9 @@
- ifeq ($(ARCH),x86_64)
- include kexec_test/Makefile
- endif
-+ifeq ($(ARCH),ia64)
-+include kexec_test/Makefile.ia64
-+endif
- 
- GENERATED_SRCS:= ./configure
- SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kexec-tools.spec	5 Jul 2006 19:01:41 -0000	1.28
+++ kexec-tools.spec	5 Jul 2006 19:20:43 -0000	1.29
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 23%{dist}
+Release: 24%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:32:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:32:15 -0400
Subject: rpms/acl/devel acl-2.2.39-build.patch, NONE,
	1.1 acl-2.2.39-path_max.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 acl.spec, 1.26, 1.27 sources, 1.8, 1.9
Message-ID: <200607051932.k65JWFx6010587@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10550

Modified Files:
	.cvsignore acl.spec sources 
Added Files:
	acl-2.2.39-build.patch acl-2.2.39-path_max.patch 
Log Message:
[tw]
- new version 2.2.39
- fixed usage of long UTF-8 filenames (#183181)
  Thanks to Andrey for the initial patch.



acl-2.2.39-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE acl-2.2.39-build.patch ---
--- acl-2.2.39/include/builddefs.in.build	2006-06-20 02:51:25.000000000 -0400
+++ acl-2.2.39/include/builddefs.in	2006-07-05 12:34:05.000000000 -0400
@@ -26,14 +26,14 @@
 PKG_VERSION	= @pkg_version@
 PKG_PLATFORM	= @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR	= @bindir@
-PKG_SBIN_DIR	= @sbindir@
-PKG_LIB_DIR	= @libdir@@libdirsuffix@
-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
-PKG_INC_DIR	= @includedir@
-PKG_MAN_DIR	= @mandir@
-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR	= @datadir@/locale
+PKG_BIN_DIR	= $(DESTDIR)@bindir@
+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
+PKG_INC_DIR	= $(DESTDIR)@includedir@
+PKG_MAN_DIR	= $(DESTDIR)@mandir@
+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name at -@pkg_version@
+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
 
 CC		= @cc@
 AWK		= @awk@
--- acl-2.2.39/include/buildmacros.build	2006-07-05 12:32:07.000000000 -0400
+++ acl-2.2.39/include/buildmacros	2006-07-05 12:32:07.000000000 -0400
@@ -26,7 +26,7 @@
 	  $(LFILES:.l=.o) \
 	  $(YFILES:%.y=%.tab.o)
 
-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL	= $(TOPDIR)/install-sh
 
 SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images

acl-2.2.39-path_max.patch:
 parse.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE acl-2.2.39-path_max.patch ---
--- acl-2.2.39/setfacl/parse.c.path_max	2006-06-20 02:51:25.000000000 -0400
+++ acl-2.2.39/setfacl/parse.c	2006-07-05 15:27:21.000000000 -0400
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -412,7 +413,12 @@
 	gid_t *gid_p)
 {
 	int c;
-	char linebuf[1024];
+	/*
+	  Max PATH_MAX bytes even for UTF-8 path names and additional 6 
+	  bytes for "#file:". Not a good solution but for now it is the 
+	  best I can do without too much impact on the code. [tw]
+	*/
+	char linebuf[PATH_MAX+6];
 	char *cp;
 	char *p;
 	int comments_read = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 12:01:17 -0000	1.8
+++ .cvsignore	5 Jul 2006 19:32:11 -0000	1.9
@@ -2,3 +2,4 @@
 acl-2.2.31.src.tar.gz
 acl-2.2.32.src.tar.gz
 acl-2.2.34.src.tar.gz
+acl_2.2.39-1.tar.gz


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- acl.spec	7 Jun 2006 21:57:02 -0000	1.26
+++ acl.spec	5 Jul 2006 19:32:12 -0000	1.27
@@ -1,12 +1,13 @@
 Summary: Access control list utilities.
 Name: acl
-Version: 2.2.34
-Release: 2
+Version: 2.2.39
+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
+Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_%{version}-1.tar.gz
 Patch0: acl-2.2.3-multilib.patch
-Patch1: acl-2.2.32-build.patch
+Patch1: acl-2.2.39-build.patch
+Patch2: acl-2.2.39-path_max.patch
 BuildRequires: autoconf, libtool >= 1.5, gettext
 License: GPL
 Group: System Environment/Base
@@ -42,6 +43,7 @@
 %setup -q
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .build
+%patch2 -p1 -b .path_max
 autoconf
 
 %build
@@ -97,6 +99,11 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Wed Jul  5 2006 Thomas Woerner <twoerner at redhat.com> 2.2.39-1
+- new version 2.2.39
+- fixed usage of long UTF-8 filenames (#183181)
+  Thanks to Andrey for the initial patch.
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.2.34-2
 - rebuild for -devel deps
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 12:01:17 -0000	1.8
+++ sources	5 Jul 2006 19:32:12 -0000	1.9
@@ -1 +1 @@
-50f1c271071048539d25ad67f1e8b375  acl-2.2.34.src.tar.gz
+4edd450bbee60d6c4b3c51ae80499b00  acl_2.2.39-1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:33:21 -0400
Subject: rpms/perl-Net-IP/devel perl-Net-IP-1.25-bz197425.patch, NONE,
	1.1 perl-Net-IP.spec, 1.5, 1.6
Message-ID: <200607051933.k65JXLmx010798@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Net-IP.spec 
Added Files:
	perl-Net-IP-1.25-bz197425.patch 
Log Message:
fix bug 197425

perl-Net-IP-1.25-bz197425.patch:
 IP.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-Net-IP-1.25-bz197425.patch ---
--- Net-IP-1.25/IP.pm.bz197425	2006-05-22 12:46:40.000000000 -0400
+++ Net-IP-1.25/IP.pm	2006-07-05 15:20:26.000000000 -0400
@@ -410,7 +410,7 @@
 
     my $int = ip_bintoint($self->binip());
 
-    if (!$int) {
+    if (ref($int) ne "Math::BigInt") {
         $self->{error} = $ERROR;
         $self->{errno} = $ERRNO;
         return;


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-IP.spec	5 Jun 2006 23:59:38 -0000	1.5
+++ perl-Net-IP.spec	5 Jul 2006 19:33:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Net-IP
 Version:        1.25
-Release: 	1.fc6
+Release: 	2.fc6
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@
 BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+Patch0:		perl-Net-IP-1.25-bz197425.patch
+
 %description
 This is the Net::IP module for Perl, designed to allow easy
 manipulation of IPv4 and IPv6 addresses.  Two applications using the
@@ -24,7 +26,7 @@
 
 %prep
 %setup -q -n Net-IP-%{version}
-
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +59,9 @@
 
 
 %changelog
+* Wed Jul 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.25-2
+- fix bug 197925 - make intip handle zero-valued IP addresses
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.25-1
 - upgrade to 1.25
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:36:20 -0400
Subject: rpms/pycairo/devel .cvsignore, 1.3, 1.4 pycairo.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200607051936.k65JaKIk011347@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/pycairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11264

Modified Files:
	.cvsignore pycairo.spec sources 
Log Message:
- Update to upstream 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Oct 2005 18:29:02 -0000	1.3
+++ .cvsignore	5 Jul 2006 19:36:17 -0000	1.4
@@ -1,2 +1,3 @@
 pycairo-0.1.3.tar.gz
 pycairo-1.0.2.tar.gz
+pycairo-1.2.0.tar.gz


Index: pycairo.spec
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pycairo.spec	4 Jul 2006 03:32:29 -0000	1.8
+++ pycairo.spec	5 Jul 2006 19:36:17 -0000	1.9
@@ -2,8 +2,8 @@
 
 Summary: Python bindings for the cairo library
 Name: pycairo
-Version: 1.0.2 
-Release: 3
+Version: 1.2.0 
+Release: 1 
 License: LGPL
 Group: Development/Languages
 URL: http://cairographics.org/
@@ -58,6 +58,9 @@
 %{_includedir}/pycairo/pycairo.h
 
 %changelog
+* Wed Jul 05 2006 John (J5) Palmieri <johnp at redhat.com> - 1.2.0-1
+- Update to upstream 1.2.0
+
 * Mon Jul  3 2006 Jeremy Katz <katzj at redhat.com> - 1.0.2-3
 - require new enough cairo (#197457)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Oct 2005 18:29:02 -0000	1.3
+++ sources	5 Jul 2006 19:36:17 -0000	1.4
@@ -1 +1 @@
-5bb6a202ebc3990712bced1da6dfb7a8  pycairo-1.0.2.tar.gz
+ab531e02fda56a9d6b2b65153fda65f6  pycairo-1.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:36:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:36:59 -0400
Subject: rpms/parted/devel parted-1.7.1-get_exception.patch, NONE,
	1.1 parted.spec, 1.77, 1.78
Message-ID: <200607051936.k65JaxLX011546@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11444

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-get_exception.patch 
Log Message:
- add ped_get_exception_handler()


parted-1.7.1-get_exception.patch:
 include/parted/exception.h |    2 ++
 libparted/exception.c      |   11 +++++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE parted-1.7.1-get_exception.patch ---
--- parted-1.7.1/include/parted/exception.h.get_exception	2006-07-05 15:31:11.000000000 -0400
+++ parted-1.7.1/include/parted/exception.h	2006-07-05 15:31:34.000000000 -0400
@@ -88,6 +88,8 @@
 extern char* ped_exception_get_option_string (PedExceptionOption ex_opt);
 
 extern void ped_exception_set_handler (PedExceptionHandler* handler);
+extern PedExceptionHandler *ped_exception_get_handler(void);
+
 extern PedExceptionOption ped_exception_default_handler (PedException* ex);
 
 extern PedExceptionOption	ped_exception_throw (PedExceptionType ex_type,
--- parted-1.7.1/libparted/exception.c.get_exception	2006-07-05 15:33:33.000000000 -0400
+++ parted-1.7.1/libparted/exception.c	2006-07-05 15:33:36.000000000 -0400
@@ -171,6 +171,17 @@
 }
 
 /**
+ * Get the current exception handler.
+ */
+PedExceptionHandler *
+ped_exception_get_handler (void)
+{
+	if (ex_handler)
+		return ex_handler;
+	return default_handler;
+}
+
+/**
  * Assert that the current exception has been resolved.
  */
 void


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- parted.spec	26 Jun 2006 16:14:18 -0000	1.77
+++ parted.spec	5 Jul 2006 19:36:55 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 8
+Release: 9
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -14,6 +14,7 @@
 Patch6: parted-1.7.0-aix.patch
 Patch7: parted-1.7.0-headers.patch
 Patch8: parted-1.7.1-O_DIRECT.patch
+Patch9: parted-1.7.1-get_exception.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,6 +52,7 @@
 %patch6 -p1 -b .aix
 %patch7 -p1 -b .headers
 %patch8 -p1 -b .o_direct
+%patch9 -p1 -b .get_exception
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -104,7 +106,10 @@
 %{_libdir}/*.so
 
 %changelog
-* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com> - 1.7.1-9
+- add ped_exception_get_handler()
+
+* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com> - 1.7.1-8
 - remove info files in preun
 
 * Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-7



From fedora-cvs-commits at redhat.com  Wed Jul  5 19:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 15:54:52 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-Makefile.patch, 1.2,
	1.3 kexec-tools-1.101-ia64-fixup.patch, 1.3,
	1.4 kexec-tools.spec, 1.29, 1.30
Message-ID: <200607051954.k65JsqmL032698@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32650

Modified Files:
	kexec-tools-1.101-Makefile.patch 
	kexec-tools-1.101-ia64-fixup.patch kexec-tools.spec 
Log Message:
fixing up other arch builds

kexec-tools-1.101-Makefile.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: kexec-tools-1.101-Makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-Makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kexec-tools-1.101-Makefile.patch	5 Jul 2006 19:20:43 -0000	1.2
+++ kexec-tools-1.101-Makefile.patch	5 Jul 2006 19:54:50 -0000	1.3
@@ -1,11 +1,11 @@
---- kexec-tools-1.101/Makefile.orig	2006-07-05 15:18:20.000000000 -0400
-+++ kexec-tools-1.101/Makefile	2006-07-05 15:19:18.000000000 -0400
+--- kexec-tools-1.101/Makefile.orig	2006-07-05 15:42:41.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-05 15:43:09.000000000 -0400
 @@ -44,7 +44,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
  
  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_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
++BINARIES_x86_64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
  BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
  
+ TARGETS:=$(BINARIES) $(MAN_PAGES)

kexec-tools-1.101-ia64-fixup.patch:
 kexec-ia64.c |   24 ------------------------
 1 files changed, 24 deletions(-)

Index: kexec-tools-1.101-ia64-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-ia64-fixup.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:20:43 -0000	1.3
+++ kexec-tools-1.101-ia64-fixup.patch	5 Jul 2006 19:54:50 -0000	1.4
@@ -38,85 +38,3 @@
  		/* For compatibility with older patches 
  		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here.
  		 */
---- kexec-tools-1.101/Makefile.orig	2006-07-05 15:16:35.000000000 -0400
-+++ kexec-tools-1.101/Makefile	2006-07-05 15:17:18.000000000 -0400
-@@ -45,6 +45,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE)
- MAN_PAGES:= kexec/kexec.8
- BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
-+BINARIES_ia64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
- BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
- 
- TARGETS:=$(BINARIES) $(MAN_PAGES)
-@@ -89,6 +90,9 @@ endif
- ifeq ($(ARCH),x86_64)
- include kexec_test/Makefile
- endif
-+ifeq ($(ARCH),ia64)
-+include kexec_test/Makefile.ia64
-+endif
- 
- GENERATED_SRCS:= ./configure
- SPEC=$(OBJDIR)/$(PACKAGE)-$(VERSION).spec
---- /dev/null	2006-06-30 11:19:59.592541712 -0400
-+++ kexec-tools-1.101/kexec_test/Makefile.ia64	2006-07-05 15:16:54.000000000 -0400
-@@ -0,0 +1,30 @@
-+#
-+# kexec_test Debugging payload to be certain the infrastructure works
-+#
-+RELOC:=0x10000
-+KEXEC_TEST_S_SRCS:= kexec_test/kexec_test_ia64.S
-+KEXEC_TEST_S_TEMPS:=$(patsubst %.S, $(OBJDIR)/%.s, $(KEXEC_TEST_S_SRCS))
-+KEXEC_TEST_S_OBJS:=$(patsubst $(OBJDIR)/%.s, $(OBJDIR)/%.o, $(KEXEC_TEST_S_TEMPS))
-+KEXEC_TEST_S_DEPS:=$(patsubst %.S, $(OBJDIR)/%.d, $(KEXEC_TEST_S_SRCS))
-+KEXEC_TEST_SRCS:= $(KEXEC_TEST_S_SRCS)
-+KEXEC_TEST_OBJS:= $(KEXEC_TEST_S_OBJS)
-+KEXEC_TEST_DEPS:= $(KEXEC_TEST_S_DEPS)
-+KEXEC_TEST:=$(PKGLIBDIR)/kexec_test
-+
-+include $(KEXEC_TEST_DEPS)
-+
-+$(KEXEC_TEST_S_DEPS): $(OBJDIR)/%.d: %.S
-+	mkdir -p $(@D)
-+	$(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
-+
-+$(KEXEC_TEST_S_TEMPS): $(OBJDIR)/%.s: %.S 
-+	mkdir -p $(@D)
-+	$(CPP) $(CPPFLAGS) -DRELOC=$(RELOC) $< > $@
-+
-+$(KEXEC_TEST_S_OBJS): $(OBJDIR)/%.o: $(OBJDIR)/%.s 
-+	mkdir -p $(@D)
-+	$(AS) -o $@ $<
-+
-+$(KEXEC_TEST): $(KEXEC_TEST_OBJS) 
-+	mkdir -p $(@D)
-+	$(LD) -m elf64_ia64 -e _start -Ttext $(RELOC) $(KEXEC_TEST_OBJS) -o $@
---- /dev/null	2006-06-30 11:19:59.592541712 -0400
-+++ kexec-tools-1.101/kexec_test/kexec_test_ia64.S	2006-07-05 15:16:54.000000000 -0400
-@@ -0,0 +1,26 @@
-+/*
-+ * kexec: Linux boots Linux
-+ *
-+ * Copyright (C) 2003,2004  Eric Biederman (ebiederm at xmission.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 (version 2 of the License).
-+ *
-+ * 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.
-+ */
-+
-+	.text
-+	.globl _start
-+_start:
-+	# Jump to self
-+	br.few _start
-+
-+


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kexec-tools.spec	5 Jul 2006 19:20:43 -0000	1.29
+++ kexec-tools.spec	5 Jul 2006 19:54:50 -0000	1.30
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 24%{dist}
+Release: 25%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -89,8 +89,9 @@
 /sbin/*
 %config(noreplace,missingok) /etc/sysconfig/kdump
 %config /etc/rc.d/init.d/kdump
-
+%ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
+%endif
 %doc News
 %doc COPYING
 %doc TODO



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:08:28 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-s390-fixup.patch, NONE,
	1.1 kexec-tools.spec, 1.30, 1.31
Message-ID: <200607052008.k65K8ShX002835@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2788

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-s390-fixup.patch 
Log Message:
fixing up 390 build break

kexec-tools-1.101-s390-fixup.patch:
 kexec-s390.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kexec-tools-1.101-s390-fixup.patch ---
--- kexec-tools-1.101/kexec/arch/s390/kexec-s390.c.orig	2006-07-05 16:01:46.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/s390/kexec-s390.c	2006-07-05 16:02:48.000000000 -0400
@@ -36,7 +36,7 @@ static struct memory_range memory_range[
  *  - (-1) if something went wrong.
  */
 
-int get_memory_ranges(struct memory_range **range, int *ranges)
+int get_memory_ranges(struct memory_range **range, int *ranges, unsigned long kexec_flags)
 {
 	char sys_ram[] = "System RAM\n";
 	char iomem[] = "/proc/iomem";
@@ -94,7 +94,7 @@ int arch_process_options(int argc, char 
 	return 0;
 }
 
-int arch_compat_trampoline(struct kexec_info *info, unsigned long *flags)
+int arch_compat_trampoline(struct kexec_info *info)
 {
 	return 0;
 }


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kexec-tools.spec	5 Jul 2006 19:54:50 -0000	1.30
+++ kexec-tools.spec	5 Jul 2006 20:08:23 -0000	1.31
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 25%{dist}
+Release: 27%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -31,6 +31,11 @@
 #
 Patch301: kexec-ppc64-ingnore-args-linux.patch
 
+#
+# Patches 401 through 500 are meant for s390 kexec-tools enablement
+#
+Patch401: http://intranet.corp.redhat.com/ic/intranet/JobBands.html
+
 Patch501: kexec-tools-1.101-Makefile.patch
 
 %description
@@ -47,6 +52,7 @@
 %patch101 -p1
 %patch201 -p1
 %patch301 -p1
+%patch401 -p1
 %patch501 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
@@ -97,7 +103,7 @@
 %doc TODO
 
 %changelog
-* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-22.fc6
+* Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-27.fc6
 - Modify spec/sysconfig to not autobuild kdump kernel command line
 - Add dist to revision tag
 - Build for all arches



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:08:28 -0400
Subject: rpms/perl-Net-IP/FC-5 perl-Net-IP-1.25-bz197425.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 perl-Net-IP.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200607052008.k65K8SLN002848@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-Net-IP.spec sources 
Added Files:
	perl-Net-IP-1.25-bz197425.patch 
Log Message:
fix bugs 197416, 197425

perl-Net-IP-1.25-bz197425.patch:
 IP.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-Net-IP-1.25-bz197425.patch ---
--- Net-IP-1.25/IP.pm.bz197425	2006-05-22 12:46:40.000000000 -0400
+++ Net-IP-1.25/IP.pm	2006-07-05 15:20:26.000000000 -0400
@@ -410,7 +410,7 @@
 
     my $int = ip_bintoint($self->binip());
 
-    if (!$int) {
+    if (ref($int) ne "Math::BigInt") {
         $self->{error} = $ERROR;
         $self->{errno} = $ERRNO;
         return;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Oct 2005 18:19:48 -0000	1.2
+++ .cvsignore	5 Jul 2006 20:08:25 -0000	1.3
@@ -1 +1,2 @@
 Net-IP-1.24.tar.gz
+Net-IP-1.25.tar.gz


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/FC-5/perl-Net-IP.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-IP.spec	3 Feb 2006 19:52:34 -0000	1.4
+++ perl-Net-IP.spec	5 Jul 2006 20:08:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Net-IP
-Version:        1.24
-Release: 	2%{?dist}.2
+Version:        1.25
+Release: 	1.fc5
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@
 BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+Patch0:		perl-Net-IP-1.25-bz197425.patch
+
 %description
 This is the Net::IP module for Perl, designed to allow easy
 manipulation of IPv4 and IPv6 addresses.  Two applications using the
@@ -24,7 +26,7 @@
 
 %prep
 %setup -q -n Net-IP-%{version}
-
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,6 +59,10 @@
 
 
 %changelog
+* Wed Jul 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.25-1.fc5
+- Upgrade to upstream version 1.25 ( fixes bug 197416 )
+- fix 1.25 bug 197425 
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.24-2.2
 - rebuild for new perl-5.8.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Oct 2005 18:19:48 -0000	1.2
+++ sources	5 Jul 2006 20:08:25 -0000	1.3
@@ -1 +1,2 @@
 edc91d262460130f583f3f1c42e041b9  Net-IP-1.24.tar.gz
+a49c0b02a9b793ff60191cdafc0c202e  Net-IP-1.25.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:14:15 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.31,1.32
Message-ID: <200607052014.k65KEF8Y004872@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4842

Modified Files:
	kexec-tools.spec 
Log Message:
fixing typo


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kexec-tools.spec	5 Jul 2006 20:08:23 -0000	1.31
+++ kexec-tools.spec	5 Jul 2006 20:14:13 -0000	1.32
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 27%{dist}
+Release: 28%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -34,7 +34,7 @@
 #
 # Patches 401 through 500 are meant for s390 kexec-tools enablement
 #
-Patch401: http://intranet.corp.redhat.com/ic/intranet/JobBands.html
+Patch401: kexec-tools-1.101-s390-fixup.patch
 
 Patch501: kexec-tools-1.101-Makefile.patch
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:14:58 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353,1.2353.2.1
Message-ID: <200607052014.k65KEwpw005245@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-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.2353
retrieving revision 1.2353.2.1
diff -u -r1.2353 -r1.2353.2.1
--- kernel-2.6.spec	5 Jul 2006 15:03:03 -0000	1.2353
+++ kernel-2.6.spec	5 Jul 2006 20:14:55 -0000	1.2353.2.1
@@ -26,7 +26,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo %${RR%%?})%{dist}_don
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:25:14 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-ppc-fixup.patch, NONE,
	1.1 kexec-tools.spec, 1.32, 1.33
Message-ID: <200607052025.k65KPEHH023781@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23752

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-ppc-fixup.patch 
Log Message:
checking in ppc fixups

kexec-tools-1.101-ppc-fixup.patch:
 kexec-ppc.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE kexec-tools-1.101-ppc-fixup.patch ---
--- kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c.orig	2006-07-05 16:21:50.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c	2006-07-05 16:22:01.000000000 -0400
@@ -33,7 +33,6 @@ int get_memory_ranges(struct memory_rang
 	memory_range[memory_ranges].type = RANGE_RAM;
 	memory_ranges++;
 #else
-#error Please, fix this for your platform
 	const char iomem[] = "/proc/iomem";
 	char line[MAX_LINE];
 	FILE *fp;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kexec-tools.spec	5 Jul 2006 20:14:13 -0000	1.32
+++ kexec-tools.spec	5 Jul 2006 20:25:11 -0000	1.33
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 28%{dist}
+Release: 29%{dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -36,7 +36,15 @@
 #
 Patch401: kexec-tools-1.101-s390-fixup.patch
 
-Patch501: kexec-tools-1.101-Makefile.patch
+#
+# Patches 501 through 600 are meant for ppc kexec-tools enablement
+#
+Patch501: kexec-tools-1.101-ppc-fixup.patch
+
+#
+# Patches 601 onward are generic patches
+#
+Patch601: kexec-tools-1.101-Makefile.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -54,6 +62,7 @@
 %patch301 -p1
 %patch401 -p1
 %patch501 -p1
+%patch601 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .



From fedora-cvs-commits at redhat.com  Wed Jul  5 20:58:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 16:58:11 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.290, 1.291 anaconda.spec, 1.414,
	1.415 sources, 1.412, 1.413
Message-ID: <200607052058.k65KwB6D023863@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- .cvsignore	30 Jun 2006 20:26:23 -0000	1.290
+++ .cvsignore	5 Jul 2006 20:58:09 -0000	1.291
@@ -1 +1 @@
-anaconda-11.1.0.51.tar.bz2
+anaconda-11.1.0.52.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- anaconda.spec	30 Jun 2006 20:26:24 -0000	1.414
+++ anaconda.spec	5 Jul 2006 20:58:09 -0000	1.415
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.51
+Version: 11.1.0.52
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul  5 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.52-1
+- Add Marathi (#194572)
+- Try to let UI fit a little better in LVM dialog (#197334)
+- Give a message if we fail to make teh device node (markmc, #197514)
+- Fix rescue CD
+- Fix minstg2 linking error (#197593)
+- Log the transaction error
+- gfs2 fixes
+
 * Fri Jun 30 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.51-1
 - Remove non-existent paths from LD_LIBRARY_PATH (katzj)
 - Calculate IPv4 broadcast address for static IP config


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- sources	30 Jun 2006 20:26:24 -0000	1.412
+++ sources	5 Jul 2006 20:58:09 -0000	1.413
@@ -1 +1 @@
-49c56c31dd95627cb99cfd2b2f39a3a2  anaconda-11.1.0.51.tar.bz2
+b0da6b44a35249aa67d219001e5c9df6  anaconda-11.1.0.52.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:08:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:08:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.1,1.2353.2.2
Message-ID: <200607052108.k65L8O9t025914@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
trying out the new rhel-config option stuff



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.1
retrieving revision 1.2353.2.2
diff -u -r1.2353.2.1 -r1.2353.2.2
--- kernel-2.6.spec	5 Jul 2006 20:14:55 -0000	1.2353.2.1
+++ kernel-2.6.spec	5 Jul 2006 21:08:21 -0000	1.2353.2.2
@@ -26,7 +26,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo %${RR%%?})%{dist}_don
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}_don
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -208,6 +208,7 @@
 Source12: built-in-where
 Source13: make-symsets
 Source14: find-provides
+Source15: merge.pl
 
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
@@ -235,6 +236,8 @@
 #Source67: kernel-%{kversion}-sparc64.config
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
+Source80: config-rhel-generic
+
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
@@ -641,6 +644,15 @@
 
 
 %prep
+#if a rhel kernel, apply the rhel config options
+%if 0%{?rhel}
+  for i in kernel*.config
+  do
+    mv $i $i.tmp
+    ./merge.pl config-rhel-generic $i.tmp > $i
+  done
+%endif  
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -972,7 +984,6 @@
 
 cp -f %{all_arch_configs} .
 
-
 # now run oldconfig over all the config files
 for i in *.config
 do



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:08:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:08:55 -0400
Subject: rpms/kernel/devel Makefile.config,1.40,1.40.10.1
Message-ID: <200607052108.k65L8tvu025970@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	Makefile.config 
Log Message:
trying out the new rhel-config option stuff



Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.40
retrieving revision 1.40.10.1
diff -u -r1.40 -r1.40.10.1
--- Makefile.config	14 Jun 2006 12:11:06 -0000	1.40
+++ Makefile.config	5 Jul 2006 21:08:53 -0000	1.40.10.1
@@ -30,7 +30,6 @@
 
 temp-generic: configs/config-generic configs/config-rhel-generic Makefile Makefile.config
 	cp configs/config-generic temp-generic
-	if echo $(COLLECTION) | grep -q -e "^dist-[^-]*E\($$\|-\)"; then perl scripts/merge.pl configs/config-rhel-generic configs/config-generic > temp-generic ; fi
 
 temp-x86-generic: configs/config-x86-generic temp-generic
 	perl scripts/merge.pl $^  > $@



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:08:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:08:55 -0400
Subject: rpms/kernel/devel/scripts merge.pl,1.3,1.3.22.1
Message-ID: <200607052108.k65L8tsk025962@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	merge.pl 
Log Message:
trying out the new rhel-config option stuff



Index: merge.pl
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/merge.pl,v
retrieving revision 1.3
retrieving revision 1.3.22.1
diff -u -r1.3 -r1.3.22.1
--- merge.pl	11 May 2006 19:50:03 -0000	1.3
+++ merge.pl	5 Jul 2006 21:08:52 -0000	1.3.22.1
@@ -3,7 +3,6 @@
 my @args=@ARGV;
 my @configoptions;
 my @configvalues;
-my @alreadyprinted;
 my $configcounter = 0;
 
 # optionally print out the architecture as the first line of our output
@@ -20,13 +19,11 @@
 	if (/\# ([\w]+) is not set/) {
 		$configoptions[$configcounter] = $1;
 		$configvalues[$configcounter] = $str;
-		$alreadyprinted[$configcounter] = 0;
 		$configcounter ++;
 	} else {
 		if (/([\w]+)=/) {
 			$configoptions[$configcounter] = $1;
 			$configvalues[$configcounter] = $str;
-			$alreadyprinted[$configcounter] = 0;
 			$configcounter ++;
 		}
 	}
@@ -34,7 +31,7 @@
 
 # now, read and output the entire configfile, except for the overridden
 # parts... for those the new value is printed.
-# O(N^2) algorithm so if this is slow I need to look at it later
+# O(N!) algorithm so if this is slow I need to look at it later
 
 open (FILE2,"$args[1]") || die "Could not open $args[1]";
 while (<FILE2>) {
@@ -55,8 +52,13 @@
 	while ($counter < $configcounter) {
 		if ("$configname" eq "$configoptions[$counter]") {
 			$nooutput = 1;
-			$alreadyprinted[$counter] = 1;
 			print "$configvalues[$counter]";
+
+			#remove this option from the list
+			#assuming no duplicates here
+			splice(@configoptions,$counter,1);
+			splice(@configvalues,$counter,1);
+			$configcounter--;
 			last;
 		}
 		$counter++;
@@ -71,9 +73,7 @@
 my $counter = 0;
 
 while ($counter < $configcounter) {
-	if ($alreadyprinted[$counter]==0) {
-		print "$configvalues[$counter]";
-	}
+	print "$configvalues[$counter]";
 	$counter++;
 }
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:10:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:10:06 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.2,1.2353.2.3
Message-ID: <200607052110.k65LA6dN026024@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
cleanup




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.2
retrieving revision 1.2353.2.3
diff -u -r1.2353.2.2 -r1.2353.2.3
--- kernel-2.6.spec	5 Jul 2006 21:08:21 -0000	1.2353.2.2
+++ kernel-2.6.spec	5 Jul 2006 21:10:04 -0000	1.2353.2.3
@@ -650,6 +650,7 @@
   do
     mv $i $i.tmp
     ./merge.pl config-rhel-generic $i.tmp > $i
+    rm $i.tmp
   done
 %endif  
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:12:04 -0400
Subject: rpms/kernel/devel config-rhel-generic, NONE, 1.6.2.1 merge.pl, NONE,
	1.7.2.1
Message-ID: <200607052112.k65LC4SU026071@cvs.devel.redhat.com>

Author: dzickus

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

Added Files:
      Tag: private-dzickus-branch
	config-rhel-generic merge.pl 
Log Message:
adding in temp new files b/c spec file sux..



--- NEW FILE config-rhel-generic ---
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_ATALK is not set
# CONFIG_DEV_APPLETALK is not set
# CONFIG_LTPC is not set
# CONFIG_COPS is not set
# CONFIG_IPX is not set
# CONFIG_IPDDP is not set
# CONFIG_IRDA is not set
# CONFIG_NCP_FS is not set
# CONFIG_ISAPNP is not set
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_IEEE1394 is not set
# CONFIG_EL2 is not set
# CONFIG_ELPLUS is not set
# CONFIG_WD80x3 is not set
# CONFIG_GAMEPORT is not set
# CONFIG_DVB is not set
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set
# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
# CONFIG_SND_INTERWAVE is not set
# CONFIG_SND_INTERWAVE_STB is not set
# CONFIG_SND_OPTI92X_AD1848 is not set
# CONFIG_SND_OPTI92X_CS4231 is not set
# CONFIG_SND_OPTI93X is not set
# CONFIG_SND_MIRO is not set
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SB16_CSP=y
# CONFIG_SND_WAVEFRONT is not set
# CONFIG_SND_ALS100 is not set
# CONFIG_SND_AZT2320 is not set
# CONFIG_SND_CMI8330 is not set
# CONFIG_SND_DT019X is not set
# CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set
# CONFIG_CODA_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_XFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_BINFMT_AOUT is not set
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_GAMMA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_MWAVE is not set
# CONFIG_ROCKETPORT is not set
# CONFIG_R3964 is not set
# CONFIG_TIPAR is not set
# CONFIG_JOYSTICK_ANALOG is not set
# CONFIG_JOYSTICK_A3D is not set
# CONFIG_JOYSTICK_ADI is not set
# CONFIG_JOYSTICK_COBRA is not set
# CONFIG_JOYSTICK_GF2K is not set
# CONFIG_JOYSTICK_GRIP is not set
# CONFIG_JOYSTICK_GRIP_MP is not set
# CONFIG_JOYSTICK_GUILLEMOT is not set
# CONFIG_JOYSTICK_INTERACT is not set
# CONFIG_JOYSTICK_SIDEWINDER is not set
# CONFIG_JOYSTICK_TMDC is not set
# CONFIG_JOYSTICK_IFORCE is not set
# CONFIG_JOYSTICK_IFORCE_USB=y
# CONFIG_JOYSTICK_IFORCE_232=y
# CONFIG_JOYSTICK_WARRIOR is not set
# CONFIG_JOYSTICK_MAGELLAN is not set
# CONFIG_JOYSTICK_SPACEORB is not set
# CONFIG_JOYSTICK_SPACEBALL is not set
# CONFIG_JOYSTICK_STINGER is not set
# CONFIG_JOYSTICK_TWIDDLER is not set
# CONFIG_JOYSTICK_DB9 is not set
# CONFIG_JOYSTICK_GAMECON is not set
# CONFIG_JOYSTICK_TURBOGRAFX is not set
# CONFIG_RADIO_CADET is not set
# CONFIG_RADIO_RTRACK is not set
# CONFIG_RADIO_RTRACK2 is not set
# CONFIG_RADIO_AZTECH is not set
# CONFIG_RADIO_GEMTEK is not set
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_RADIO_MIROPCM20 is not set
# CONFIG_RADIO_MIROPCM20_RDS is not set
# CONFIG_RADIO_SF16FMI is not set
# CONFIG_RADIO_SF16FMR2 is not set
# CONFIG_RADIO_TERRATEC is not set
# CONFIG_RADIO_TRUST is not set
# CONFIG_RADIO_TYPHOON is not set
# CONFIG_RADIO_TYPHOON_PROC_FS=y
# CONFIG_RADIO_ZOLTRIX is not set
# CONFIG_VIDEO_DEV is not set
# CONFIG_PLIP is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_HGA is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_AHA1542 is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_IN2000 is not set
# CONFIG_SCSI_QLOGIC_FAS is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA_PP is not set
# CONFIG_VIDEO_CPIA_USB is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_ZORAN_BUZ is not set
# CONFIG_VIDEO_ZORAN_DC10 is not set
# CONFIG_VIDEO_ZORAN_DC30 is not set
# CONFIG_VIDEO_ZORAN_LML33 is not set
# CONFIG_VIDEO_ZORAN_LML33R10 is not set
# CONFIG_VIDEO_MEYE is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_VESA is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_I82092 is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_SUNDANCE is not set
# CONFIG_ULTRA is not set
# CONFIG_SKFP is not set
# CONFIG_DE600 is not set
# CONFIG_DE620 is not set
# CONFIG_CS89x0 is not set
# CONFIG_DGRS is not set
# CONFIG_AC3200 is not set
# CONFIG_NI52 is not set
# CONFIG_NI65 is not set
# CONFIG_LANCE is not set
# CONFIG_EL16 is not set
# CONFIG_EL3 is not set
# CONFIG_3C515 is not set
# CONFIG_HAMACHI is not set
# CONFIG_HP100 is not set
# CONFIG_EQUALIZER is not set
# CONFIG_NET_SB1000 is not set
# CONFIG_DEPCA is not set
# CONFIG_ATP is not set
# CONFIG_INFTL is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001PLUS is not set
# CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PCI is not set
# CONFIG_PCMCIA_SYM53C500 is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_HGA_ACCEL is not set
# CONFIG_FB_3DFX_ACCEL is not set
# CONFIG_FB_TRIDENT_ACCEL is not set
# CONFIG_SCSI_DC390T is not set
CONFIG_AUDIT=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_I2C_PCA_ISA is not set
# CONFIG_DECNET is not set
# CONFIG_TCG_TPM is not set


--- NEW FILE merge.pl ---
#! /usr/bin/perl

my @args=@ARGV;
my @configoptions;
my @configvalues;
my $configcounter = 0;

# optionally print out the architecture as the first line of our output
my $arch = $args[2];
if (defined $arch) {
	print "# $arch\n";
}

# first, read the override file

open (FILE,"$args[0]") || die "Could not open $args[0]";
while (<FILE>) {
	my $str = $_;
	if (/\# ([\w]+) is not set/) {
		$configoptions[$configcounter] = $1;
		$configvalues[$configcounter] = $str;
		$configcounter ++;
	} else {
		if (/([\w]+)=/) {
			$configoptions[$configcounter] = $1;
			$configvalues[$configcounter] = $str;
			$configcounter ++;
		}
	}
};

# now, read and output the entire configfile, except for the overridden
# parts... for those the new value is printed.
# O(N!) algorithm so if this is slow I need to look at it later

open (FILE2,"$args[1]") || die "Could not open $args[1]";
while (<FILE2>) {
	my $nooutput;
	my $counter;
	my $configname;

	if (/\# ([\w]+) is not set/) {
		$configname = $1;
	} else {
		if (/([\w]+)=/) {
			$configname  = $1;
		}
	}

	$counter = 0;
	$nooutput = 0;
	while ($counter < $configcounter) {
		if ("$configname" eq "$configoptions[$counter]") {
			$nooutput = 1;
			print "$configvalues[$counter]";

			#remove this option from the list
			#assuming no duplicates here
			splice(@configoptions,$counter,1);
			splice(@configvalues,$counter,1);
			$configcounter--;
			last;
		}
		$counter++;
	}

	if ($nooutput == 0) {
		print "$_";
	}
}

# now print the new values from the overridden configfile
my $counter = 0;

while ($counter < $configcounter) {
	print "$configvalues[$counter]";
	$counter++;
}

1;



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:12:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:12:59 -0400
Subject: rpms/kernel/devel patch-2.6.17-git25.bz2.sign, NONE, 1.1 .cvsignore,
	1.476, 1.477 kernel-2.6.spec, 1.2353,
	1.2354 linux-2.6-xen.patch, 1.32, 1.33 sources, 1.420,
	1.421 upstream, 1.387, 1.388 linux-2.6-ppc-cputime64.patch,
	1.1, NONE
Message-ID: <200607052112.k65LCx1C026099@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.17-git25.bz2.sign 
Removed Files:
	linux-2.6-ppc-cputime64.patch 
Log Message:
git25


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

iD8DBQBErAzwyGugalF9Dw4RAj9ZAJ9/JfgLLcKrIsiBRUQKZeAm8PhzCgCeK0ex
ayO3g78Gb5cD8Y0HaTOU9/U=
=Mw7e
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -r1.476 -r1.477
--- .cvsignore	5 Jul 2006 09:28:40 -0000	1.476
+++ .cvsignore	5 Jul 2006 21:12:56 -0000	1.477
@@ -3,6 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git21.bz2
-patch-2.6.17-git23.bz2
-patch-2.6.17-git24.bz2
+patch-2.6.17-git25.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353
retrieving revision 1.2354
diff -u -r1.2353 -r1.2354
--- kernel-2.6.spec	5 Jul 2006 15:03:03 -0000	1.2353
+++ kernel-2.6.spec	5 Jul 2006 21:12:56 -0000	1.2354
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git24.bz2
+Patch1: patch-2.6.17-git25.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -254,7 +254,6 @@
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
-Patch300: linux-2.6-ppc-cputime64.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
@@ -728,8 +727,6 @@
 #
 # PowerPC
 #
-# Additions to asm-powerpc/cputime.h
-%patch300 -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.
@@ -1560,6 +1557,9 @@
 
 %changelog
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
+- 2.6.17-git25
+
+* Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Try out sparsemem experiment on x86-64.
 
 * Wed Jul  5 2006 David Woodhouse <dwmw2 at redhat.com>

linux-2.6-xen.patch:
 linux-2.6.17.noarch/arch/ia64/kernel/irq_ia64.c           |    4 
 linux-2.6.17.noarch/arch/x86_64/kernel/asm-offsets.c      |    2 
 linux-2.6.17.noarch/drivers/firmware/Kconfig              |    2 
 linux-2.6.17.noarch/include/asm-i386/a.out.h              |    2 
 merge/arch/i386/Kconfig                                   |   91 
 merge/arch/i386/Kconfig.cpu                               |    2 
 merge/arch/i386/Kconfig.debug                             |    1 
 merge/arch/i386/Makefile                                  |   24 
 merge/arch/i386/boot-xen/Makefile                         |   21 
 merge/arch/i386/kernel/Makefile                           |   22 
 merge/arch/i386/kernel/acpi/Makefile                      |    4 
 merge/arch/i386/kernel/acpi/boot-xen.c                    | 1167 +++++
 merge/arch/i386/kernel/apic-xen.c                         |  160 
 merge/arch/i386/kernel/cpu/Makefile                       |    5 
 merge/arch/i386/kernel/cpu/common-xen.c                   |  732 +++
 merge/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 merge/arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 merge/arch/i386/kernel/early_printk-xen.c                 |    2 
 merge/arch/i386/kernel/entry-xen.S                        |  903 ++++
 merge/arch/i386/kernel/entry.S                            |    6 
 merge/arch/i386/kernel/fixup.c                            |   86 
 merge/arch/i386/kernel/head-xen.S                         |  181 
 merge/arch/i386/kernel/init_task-xen.c                    |   51 
 merge/arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++
 merge/arch/i386/kernel/ioport-xen.c                       |  121 
 merge/arch/i386/kernel/irq-xen.c                          |  306 +
 merge/arch/i386/kernel/ldt-xen.c                          |  269 +
 merge/arch/i386/kernel/microcode-xen.c                    |  148 
 merge/arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++
 merge/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 merge/arch/i386/kernel/process-xen.c                      |  812 ++++
 merge/arch/i386/kernel/quirks-xen.c                       |   48 
 merge/arch/i386/kernel/setup-xen.c                        | 1795 +++++++++
 merge/arch/i386/kernel/smp-xen.c                          |  613 +++
 merge/arch/i386/kernel/swiotlb.c                          |  665 +++
 merge/arch/i386/kernel/sysenter.c                         |   17 
 merge/arch/i386/kernel/time-xen.c                         | 1103 +++++
 merge/arch/i386/kernel/traps-xen.c                        | 1136 +++++
 merge/arch/i386/kernel/traps.c                            |    9 
 merge/arch/i386/kernel/vm86.c                             |   12 
 merge/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 merge/arch/i386/mach-xen/Makefile                         |    5 
 merge/arch/i386/mach-xen/setup.c                          |   49 
 merge/arch/i386/mm/Makefile                               |    8 
 merge/arch/i386/mm/fault-xen.c                            |  683 +++
 merge/arch/i386/mm/highmem-xen.c                          |  123 
 merge/arch/i386/mm/hypervisor.c                           |  414 ++
 merge/arch/i386/mm/init-xen.c                             |  850 ++++
 merge/arch/i386/mm/ioremap-xen.c                          |  476 ++
 merge/arch/i386/mm/pageattr.c                             |    2 
 merge/arch/i386/mm/pgtable-xen.c                          |  642 +++
 merge/arch/i386/mm/pgtable.c                              |   12 
 merge/arch/i386/oprofile/Makefile                         |    4 
 merge/arch/i386/oprofile/xenoprof.c                       |  432 ++
 merge/arch/i386/pci/Makefile                              |    9 
 merge/arch/i386/pci/irq-xen.c                             | 1204 ++++++
 merge/arch/i386/pci/pcifront.c                            |   55 
 merge/arch/i386/power/Makefile                            |    4 
 merge/arch/ia64/Kconfig                                   |   65 
 merge/arch/ia64/Makefile                                  |   18 
 merge/arch/ia64/hp/sim/Makefile                           |    2 
 merge/arch/ia64/kernel/entry.S                            |   32 
 merge/arch/ia64/kernel/head.S                             |    6 
 merge/arch/ia64/kernel/iosapic.c                          |   68 
 merge/arch/ia64/kernel/irq_ia64.c                         |  196 
 merge/arch/ia64/kernel/pal.S                              |    5 
 merge/arch/ia64/kernel/setup.c                            |   53 
 merge/arch/ia64/mm/ioremap.c                              |    3 
 merge/arch/ia64/xen/Makefile                              |    8 
 merge/arch/ia64/xen/drivers/README                        |    2 
 merge/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 merge/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 merge/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 merge/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 merge/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 merge/arch/ia64/xen/drivers/xenia64_init.c                |   60 
 merge/arch/ia64/xen/hypercall.S                           |  353 +
 merge/arch/ia64/xen/hypervisor.c                          |  761 +++
 merge/arch/ia64/xen/util.c                                |  115 
 merge/arch/ia64/xen/xenentry.S                            |  883 ++++
 merge/arch/ia64/xen/xenhpski.c                            |   19 
 merge/arch/ia64/xen/xenivt.S                              | 2171 +++++++++++
 merge/arch/ia64/xen/xenminstate.h                         |  369 +
 merge/arch/ia64/xen/xenpal.S                              |   76 
 merge/arch/ia64/xen/xensetup.S                            |   24 
 merge/arch/um/kernel/physmem.c                            |    4 
 merge/arch/x86_64/Kconfig                                 |   60 
 merge/arch/x86_64/Makefile                                |   20 
 merge/arch/x86_64/ia32/Makefile                           |   20 
 merge/arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++
 merge/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 merge/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 merge/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 merge/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 merge/arch/x86_64/kernel/Makefile                         |   19 
 merge/arch/x86_64/kernel/acpi/Makefile                    |    1 
 merge/arch/x86_64/kernel/apic-xen.c                       |  198 +
 merge/arch/x86_64/kernel/e820-xen.c                       |  757 +++
 merge/arch/x86_64/kernel/early_printk-xen.c               |  304 +
 merge/arch/x86_64/kernel/entry-xen.S                      | 1141 +++++
 merge/arch/x86_64/kernel/genapic-xen.c                    |  144 
 merge/arch/x86_64/kernel/genapic_xen.c                    |  162 
 merge/arch/x86_64/kernel/head-xen.S                       |  176 
 merge/arch/x86_64/kernel/head64-xen.c                     |  140 
 merge/arch/x86_64/kernel/init_task.c                      |    3 
 merge/arch/x86_64/kernel/io_apic-xen.c                    | 2232 +++++++++++
 merge/arch/x86_64/kernel/ioport-xen.c                     |   57 
 merge/arch/x86_64/kernel/irq-xen.c                        |  163 
 merge/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 merge/arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++
 merge/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 merge/arch/x86_64/kernel/process-xen.c                    |  791 ++++
 merge/arch/x86_64/kernel/setup-xen.c                      | 1725 ++++++++
 merge/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 merge/arch/x86_64/kernel/smp-xen.c                        |  596 +++
 merge/arch/x86_64/kernel/traps-xen.c                      | 1035 +++++
 merge/arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 merge/arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 
 merge/arch/x86_64/kernel/xen_entry.S                      |   40 
 merge/arch/x86_64/mm/Makefile                             |   10 
 merge/arch/x86_64/mm/fault-xen.c                          |  644 +++
 merge/arch/x86_64/mm/init-xen.c                           | 1179 ++++++
 merge/arch/x86_64/mm/pageattr-xen.c                       |  390 +
 merge/arch/x86_64/oprofile/Makefile                       |    5 
 merge/arch/x86_64/pci/Makefile                            |   12 
 merge/drivers/Makefile                                    |    1 
 merge/drivers/acpi/Kconfig                                |    3 
 merge/drivers/char/mem.c                                  |    6 
 merge/drivers/char/tpm/Kconfig                            |   14 
 merge/drivers/char/tpm/Makefile                           |    2 
 merge/drivers/char/tpm/tpm.c                              |   44 
 merge/drivers/char/tpm/tpm.h                              |    7 
 merge/drivers/char/tpm/tpm_vtpm.c                         |  546 ++
 merge/drivers/char/tpm/tpm_vtpm.h                         |   38 
 merge/drivers/char/tpm/tpm_xen.c                          |  756 +++
 merge/drivers/char/tty_io.c                               |    7 
 merge/drivers/ide/ide-lib.c                               |    8 
 merge/drivers/oprofile/buffer_sync.c                      |   39 
 merge/drivers/oprofile/cpu_buffer.c                       |   26 
 merge/drivers/oprofile/cpu_buffer.h                       |    8 
 merge/drivers/oprofile/event_buffer.h                     |    3 
 merge/drivers/oprofile/oprof.c                            |   19 
 merge/drivers/oprofile/oprof.h                            |    2 
 merge/drivers/oprofile/oprofile_files.c                   |   82 
 merge/drivers/pci/Kconfig                                 |    1 
 merge/drivers/serial/Kconfig                              |    1 
 merge/drivers/xen/Kconfig                                 |  257 +
 merge/drivers/xen/Makefile                                |   17 
 merge/drivers/xen/balloon/Makefile                        |    2 
 merge/drivers/xen/balloon/balloon.c                       |  605 +++
 merge/drivers/xen/blkback/Makefile                        |    3 
 merge/drivers/xen/blkback/blkback.c                       |  580 ++
 merge/drivers/xen/blkback/common.h                        |  136 
 merge/drivers/xen/blkback/interface.c                     |  165 
 merge/drivers/xen/blkback/vbd.c                           |  119 
 merge/drivers/xen/blkback/xenbus.c                        |  410 ++
 merge/drivers/xen/blkfront/Kconfig                        |    6 
 merge/drivers/xen/blkfront/Makefile                       |    5 
 merge/drivers/xen/blkfront/blkfront.c                     |  822 ++++
 merge/drivers/xen/blkfront/block.h                        |  156 
 merge/drivers/xen/blkfront/vbd.c                          |  318 +
 merge/drivers/xen/blktap/Makefile                         |    3 
 merge/drivers/xen/blktap/blktap.c                         |  900 ++++
 merge/drivers/xen/blktap/common.h                         |  100 
 merge/drivers/xen/blktap/interface.c                      |  134 
 merge/drivers/xen/blktap/xenbus.c                         |  223 +
 merge/drivers/xen/char/Makefile                           |    2 
 merge/drivers/xen/char/mem.c                              |  182 
 merge/drivers/xen/console/Makefile                        |    2 
 merge/drivers/xen/console/console.c                       |  640 +++
 merge/drivers/xen/console/xencons_ring.c                  |  141 
 merge/drivers/xen/core/Makefile                           |   14 
 merge/drivers/xen/core/cpu_hotplug.c                      |  185 
 merge/drivers/xen/core/evtchn.c                           |  855 ++++
 merge/drivers/xen/core/features.c                         |   30 
 merge/drivers/xen/core/gnttab.c                           |  460 ++
 merge/drivers/xen/core/hypervisor_sysfs.c                 |   60 
 merge/drivers/xen/core/reboot.c                           |  364 +
 merge/drivers/xen/core/skbuff.c                           |  134 
 merge/drivers/xen/core/smpboot.c                          |  433 ++
 merge/drivers/xen/core/xen_proc.c                         |   19 
 merge/drivers/xen/core/xen_sysfs.c                        |  316 +
 merge/drivers/xen/evtchn/Makefile                         |    2 
 merge/drivers/xen/evtchn/evtchn.c                         |  458 ++
 merge/drivers/xen/netback/Makefile                        |    5 
 merge/drivers/xen/netback/common.h                        |  123 
 merge/drivers/xen/netback/interface.c                     |  314 +
 merge/drivers/xen/netback/loopback.c                      |  255 +
 merge/drivers/xen/netback/netback.c                       | 1039 +++++
 merge/drivers/xen/netback/xenbus.c                        |  396 ++
 merge/drivers/xen/netfront/Kconfig                        |    6 
 merge/drivers/xen/netfront/Makefile                       |    4 
 merge/drivers/xen/netfront/netfront.c                     | 1597 ++++++++
 merge/drivers/xen/pciback/Makefile                        |   13 
 merge/drivers/xen/pciback/conf_space.c                    |  403 ++
 merge/drivers/xen/pciback/conf_space.h                    |  123 
 merge/drivers/xen/pciback/conf_space_capability.c         |   71 
 merge/drivers/xen/pciback/conf_space_capability.h         |   23 
 merge/drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 merge/drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 merge/drivers/xen/pciback/conf_space_header.c             |  299 +
 merge/drivers/xen/pciback/passthrough.c                   |  157 
 merge/drivers/xen/pciback/pci_stub.c                      |  690 +++
 merge/drivers/xen/pciback/pciback.h                       |   91 
 merge/drivers/xen/pciback/pciback_ops.c                   |   95 
 merge/drivers/xen/pciback/vpci.c                          |  204 +
 merge/drivers/xen/pciback/xenbus.c                        |  454 ++
 merge/drivers/xen/pcifront/Makefile                       |    7 
 merge/drivers/xen/pcifront/pci.c                          |   46 
 merge/drivers/xen/pcifront/pci_op.c                       |  272 +
 merge/drivers/xen/pcifront/pcifront.h                     |   40 
 merge/drivers/xen/pcifront/xenbus.c                       |  294 +
 merge/drivers/xen/privcmd/Makefile                        |    2 
 merge/drivers/xen/privcmd/privcmd.c                       |  285 +
 merge/drivers/xen/tpmback/Makefile                        |    4 
 merge/drivers/xen/tpmback/common.h                        |   82 
 merge/drivers/xen/tpmback/interface.c                     |  177 
 merge/drivers/xen/tpmback/tpmback.c                       | 1074 +++++
 merge/drivers/xen/tpmback/xenbus.c                        |  306 +
 merge/drivers/xen/util.c                                  |   70 
 merge/drivers/xen/xenbus/Makefile                         |   12 
 merge/drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 merge/drivers/xen/xenbus/xenbus_client.c                  |  281 +
 merge/drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 merge/drivers/xen/xenbus/xenbus_comms.h                   |   43 
 merge/drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 merge/drivers/xen/xenbus/xenbus_probe.c                   | 1083 +++++
 merge/drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++
 merge/fs/Kconfig                                          |    1 
 merge/include/asm-i386/apic.h                             |    2 
 merge/include/asm-i386/fixmap.h                           |    4 
 merge/include/asm-i386/mach-default/mach_traps.h          |   12 
 merge/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 merge/include/asm-i386/mach-xen/asm/desc.h                |  164 
 merge/include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 
 merge/include/asm-i386/mach-xen/asm/fixmap.h              |  156 
 merge/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 merge/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 merge/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 merge/include/asm-i386/mach-xen/asm/hypercall.h           |  370 +
 merge/include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 merge/include/asm-i386/mach-xen/asm/io.h                  |  390 +
 merge/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 merge/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 merge/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 merge/include/asm-i386/mach-xen/asm/page.h                |  327 +
 merge/include/asm-i386/mach-xen/asm/param.h               |   24 
 merge/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 merge/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 merge/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 merge/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  203 +
 merge/include/asm-i386/mach-xen/asm/pgtable.h             |  509 ++
 merge/include/asm-i386/mach-xen/asm/processor.h           |  753 +++
 merge/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 merge/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 merge/include/asm-i386/mach-xen/asm/segment.h             |  117 
 merge/include/asm-i386/mach-xen/asm/setup.h               |   64 
 merge/include/asm-i386/mach-xen/asm/smp.h                 |  104 
 merge/include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 merge/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 merge/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 merge/include/asm-i386/mach-xen/asm/system.h              |  578 ++
 merge/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 merge/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 merge/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 merge/include/asm-i386/mach-xen/mach_traps.h              |   33 
 merge/include/asm-i386/mach-xen/setup_arch_post.h         |   84 
 merge/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 merge/include/asm-i386/page.h                             |    2 
 merge/include/asm-i386/pgtable-2level-defs.h              |    2 
 merge/include/asm-i386/pgtable-3level-defs.h              |    2 
 merge/include/asm-ia64/agp.h                              |   31 
 merge/include/asm-ia64/dma-mapping.h                      |   71 
 merge/include/asm-ia64/fixmap.h                           |    2 
 merge/include/asm-ia64/gcc_intrin.h                       |   60 
 merge/include/asm-ia64/hypercall.h                        |  533 ++
 merge/include/asm-ia64/hypervisor.h                       |  198 +
 merge/include/asm-ia64/intel_intrin.h                     |   68 
 merge/include/asm-ia64/io.h                               |   52 
 merge/include/asm-ia64/iosapic.h                          |    2 
 merge/include/asm-ia64/irq.h                              |   31 
 merge/include/asm-ia64/machvec.h                          |   15 
 merge/include/asm-ia64/meminit.h                          |    5 
 merge/include/asm-ia64/page.h                             |  112 
 merge/include/asm-ia64/pal.h                              |    1 
 merge/include/asm-ia64/pgalloc.h                          |    2 
 merge/include/asm-ia64/privop.h                           |   60 
 merge/include/asm-ia64/processor.h                        |    1 
 merge/include/asm-ia64/synch_bitops.h                     |   61 
 merge/include/asm-ia64/system.h                           |    4 
 merge/include/asm-ia64/xen/privop.h                       |  280 +
 merge/include/asm-um/page.h                               |    2 
 merge/include/asm-x86_64/apic.h                           |    2 
 merge/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 merge/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 merge/include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 merge/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 merge/include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 merge/include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 merge/include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 merge/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 merge/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 merge/include/asm-x86_64/mach-xen/asm/hypercall.h         |  370 +
 merge/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 merge/include/asm-x86_64/mach-xen/asm/io.h                |  328 +
 merge/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 merge/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 merge/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 merge/include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 merge/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 merge/include/asm-x86_64/mach-xen/asm/page.h              |  319 +
 merge/include/asm-x86_64/mach-xen/asm/param.h             |   23 
 merge/include/asm-x86_64/mach-xen/asm/pci.h               |  174 
 merge/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 merge/include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++
 merge/include/asm-x86_64/mach-xen/asm/processor.h         |  494 ++
 merge/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 merge/include/asm-x86_64/mach-xen/asm/smp.h               |  153 
 merge/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 merge/include/asm-x86_64/mach-xen/asm/system.h            |  411 ++
 merge/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 merge/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 merge/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 merge/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 merge/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 merge/include/asm-x86_64/mach-xen/mach_time.h             |  111 
 merge/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 merge/include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 merge/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 merge/include/linux/gfp.h                                 |    6 
 merge/include/linux/highmem.h                             |    6 
 merge/include/linux/mm.h                                  |   10 
 merge/include/linux/oprofile.h                            |    8 
 merge/include/linux/pfn.h                                 |    2 
 merge/include/linux/skbuff.h                              |   13 
 merge/include/xen/balloon.h                               |   63 
 merge/include/xen/cpu_hotplug.h                           |   44 
 merge/include/xen/driver_util.h                           |   16 
 merge/include/xen/evtchn.h                                |  114 
 merge/include/xen/features.h                              |   20 
 merge/include/xen/foreign_page.h                          |   30 
 merge/include/xen/gnttab.h                                |  150 
 merge/include/xen/hypervisor_sysfs.h                      |   32 
 merge/include/xen/interface/acm.h                         |  187 
 merge/include/xen/interface/acm_ops.h                     |  102 
 merge/include/xen/interface/arch-ia64.h                   |  418 ++
 merge/include/xen/interface/arch-x86_32.h                 |  224 +
 merge/include/xen/interface/arch-x86_64.h                 |  293 +
 merge/include/xen/interface/callback.h                    |   74 
 merge/include/xen/interface/dom0_ops.h                    |  574 ++
 merge/include/xen/interface/event_channel.h               |  233 +
 merge/include/xen/interface/features.h                    |   53 
 merge/include/xen/interface/grant_table.h                 |  317 +
 merge/include/xen/interface/hvm/hvm_info_table.h          |   24 
 merge/include/xen/interface/hvm/ioreq.h                   |   98 
 merge/include/xen/interface/hvm/vmx_assist.h              |   98 
 merge/include/xen/interface/io/blkif.h                    |   87 
 merge/include/xen/interface/io/console.h                  |   33 
 merge/include/xen/interface/io/netif.h                    |   92 
 merge/include/xen/interface/io/pciif.h                    |   55 
 merge/include/xen/interface/io/ring.h                     |  273 +
 merge/include/xen/interface/io/tpmif.h                    |   59 
 merge/include/xen/interface/io/xenbus.h                   |   45 
 merge/include/xen/interface/io/xs_wire.h                  |   97 
 merge/include/xen/interface/memory.h                      |  187 
 merge/include/xen/interface/nmi.h                         |   60 
 merge/include/xen/interface/physdev.h                     |  144 
 merge/include/xen/interface/sched.h                       |  103 
 merge/include/xen/interface/sched_ctl.h                   |   69 
 merge/include/xen/interface/trace.h                       |   86 
 merge/include/xen/interface/vcpu.h                        |  121 
 merge/include/xen/interface/version.h                     |   67 
 merge/include/xen/interface/xen-compat.h                  |   47 
 merge/include/xen/interface/xen.h                         |  505 ++
 merge/include/xen/interface/xenoprof.h                    |   94 
 merge/include/xen/pcifront.h                              |   39 
 merge/include/xen/public/evtchn.h                         |   91 
 merge/include/xen/public/privcmd.h                        |   79 
 merge/include/xen/xen_proc.h                              |   13 
 merge/include/xen/xenbus.h                                |  296 +
 merge/include/xen/xencons.h                               |   14 
 merge/kernel/Kconfig.preempt                              |    1 
 merge/kernel/irq/manage.c                                 |   11 
 merge/lib/Makefile                                        |    3 
 merge/mm/Kconfig                                          |    3 
 merge/mm/highmem.c                                        |   11 
 merge/mm/memory.c                                         |  121 
 merge/mm/mmap.c                                           |    4 
 merge/mm/page_alloc.c                                     |    6 
 merge/net/core/dev.c                                      |   63 
 merge/net/core/skbuff.c                                   |   43 
 merge/net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 merge/net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 merge/net/ipv4/xfrm4_output.c                             |    6 
 merge/scripts/Makefile.xen                                |   14 
 397 files changed, 82723 insertions(+), 211 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- linux-2.6-xen.patch	30 Jun 2006 03:59:51 -0000	1.32
+++ linux-2.6-xen.patch	5 Jul 2006 21:12:56 -0000	1.33
@@ -41946,12 +41946,12 @@
  
  #ifndef __HAVE_PHYS_MEM_ACCESS_PROT
  static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
-@@ -778,6 +780,7 @@ static int open_port(struct inode * inod
+@@ -778,6 +778,7 @@ static int open_port(struct inode * inod
  #define open_kmem	open_mem
  #define open_oldmem	open_mem
  
 +#ifndef ARCH_HAS_DEV_MEM
- static struct file_operations mem_fops = {
+ static const struct file_operations mem_fops = {
  	.llseek		= memory_lseek,
  	.read		= read_mem,
 @@ -785,6 +788,9 @@ static struct file_operations mem_fops =
@@ -85938,60 +85938,31 @@
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/irq/manage.c merge/kernel/irq/manage.c
 --- ../upstream/hg/linux-2.6/kernel/irq/manage.c	2006-05-13 02:59:52.000000000 +0200
 +++ merge/kernel/irq/manage.c	2006-05-30 12:44:02.000000000 +0200
-@@ -232,14 +232,10 @@ int setup_irq(unsigned int irq, struct i
+@@ -231,8 +231,10 @@ int setup_irq(unsigned int irq, struct i
  		 * set the trigger type must match.
  		 */
- 		if (!((old->flags & new->flags) & SA_SHIRQ) ||
--		    ((old->flags ^ new->flags) & SA_TRIGGER_MASK))
+ 		if (!((old->flags & new->flags) & IRQF_SHARED) ||
+-		    ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK))
 -			goto mismatch;
--
--#if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
--		/* All handlers must agree on per-cpuness */
--		if ((old->flags & IRQ_PER_CPU) != (new->flags & IRQ_PER_CPU))
--			goto mismatch;
--#endif
-+		    ((old->flags ^ new->flags) & SA_TRIGGER_MASK)) {
++		    ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK)) {
 +			spin_unlock_irqrestore(&desc->lock,flags);
 +			return -EBUSY;
 +		}
  
- 		/* add new interrupt at end of irq queue */
- 		do {
-@@ -246,10 +246,7 @@ int setup_irq(unsigned int irq, struct i
+ #if defined(CONFIG_IRQ_PER_CPU)
+ 		/* All handlers must agree on per-cpuness */
+@@ -250,10 +252,7 @@ int setup_irq(unsigned int irq, struct i
  	}
  
  	*p = new;
--#if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)
--	if (new->flags & SA_PERCPU_IRQ)
+-#if defined(CONFIG_IRQ_PER_CPU)
+-	if (new->flags & IRQF_PERCPU)
 -		desc->status |= IRQ_PER_CPU;
 -#endif
 +
  	if (!shared) {
  		irq_chip_set_defaults(desc->chip);
  
-@@ -243,14 +236,6 @@ int setup_irq(unsigned int irq, struct i
- 	register_handler_proc(irq, new);
- 
- 	return 0;
--
--mismatch:
--	spin_unlock_irqrestore(&desc->lock, flags);
--	if (!(new->flags & SA_PROBEIRQ)) {
--		printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
--		dump_stack();
--	}
--	return -EBUSY;
- }
- 
- /**
-@@ -273,7 +258,6 @@ void free_irq(unsigned int irq, void *de
- 	struct irqaction **p;
- 	unsigned long flags;
- 
--	WARN_ON(in_interrupt());
- 	if (irq >= NR_IRQS)
- 		return;
- 
 diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/kernel/Kconfig.preempt merge/kernel/Kconfig.preempt
 --- ../upstream/hg/linux-2.6/kernel/Kconfig.preempt	2005-11-07 20:03:01.000000000 +0100
 +++ merge/kernel/Kconfig.preempt	2006-05-30 12:44:02.000000000 +0200


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- sources	5 Jul 2006 09:23:39 -0000	1.420
+++ sources	5 Jul 2006 21:12:57 -0000	1.421
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-b4075627531d5deb95691bf05e1ced6d  patch-2.6.17-git24.bz2
+18054119579dcd9998a75d5350c55f47  patch-2.6.17-git25.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- upstream	5 Jul 2006 09:23:39 -0000	1.387
+++ upstream	5 Jul 2006 21:12:57 -0000	1.388
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git24.bz2
+patch-2.6.17-git25.bz2


--- linux-2.6-ppc-cputime64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:19:25 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.289,1.290
Message-ID: <200607052119.k65LJPoY008639@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
- Don't delete jars in %%install.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- eclipse.spec	5 Jul 2006 17:46:34 -0000	1.289
+++ eclipse.spec	5 Jul 2006 21:19:23 -0000	1.290
@@ -1060,17 +1060,6 @@
 
 %ifnarch ppc64 s390 s390x
 ## BEGIN TOMCAT ##
-rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
-rm plugins/org.eclipse.tomcat_*/commons-collections.jar
-rm plugins/org.eclipse.tomcat_*/commons-digester.jar
-rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar
-rm plugins/org.eclipse.tomcat_*/commons-modeler.jar
-rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
-rm plugins/org.eclipse.tomcat_*/servlet.jar
-rm plugins/org.eclipse.tomcat_*/servlets-manager.jar
-rm plugins/org.eclipse.tomcat_*/naming-common.jar
-rm plugins/org.eclipse.tomcat_*/servlets-common.jar
-rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
 mkdir -p plugins/org.eclipse.tomcat_*/lib
 ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/lib/bootstrap.jar
 ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/lib/catalina.jar
@@ -1637,6 +1626,7 @@
 - org.eclipse.tomcat -> org.eclipse.tomcat/lib.
 - Update webapp build patch.
 - Use commons-* instead of jakarta-commons-*.
+- Don't delete jars in %%install.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:45:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:45:00 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.3,1.2353.2.4
Message-ID: <200607052145.k65Lj0On021594@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
i trying new things to fix brew




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.3
retrieving revision 1.2353.2.4
diff -u -r1.2353.2.3 -r1.2353.2.4
--- kernel-2.6.spec	5 Jul 2006 21:10:04 -0000	1.2353.2.3
+++ kernel-2.6.spec	5 Jul 2006 21:44:57 -0000	1.2353.2.4
@@ -646,7 +646,7 @@
 %prep
 #if a rhel kernel, apply the rhel config options
 %if 0%{?rhel}
-  for i in kernel*.config
+  for i in %{all_arch_configs}
   do
     mv $i $i.tmp
     ./merge.pl config-rhel-generic $i.tmp > $i



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:49:56 -0400
Subject: rpms/mrtg/devel .cvsignore, 1.12, 1.13 mrtg.spec, 1.28, 1.29 sources,
	1.12, 1.13
Message-ID: <200607052149.k65Lnu4p005799@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5710

Modified Files:
	.cvsignore mrtg.spec sources 
Log Message:
* Mon May 15 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.3-1
- Update to mrtg-2.14.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	15 May 2006 02:00:51 -0000	1.12
+++ .cvsignore	5 Jul 2006 21:49:53 -0000	1.13
@@ -1,2 +1,2 @@
-mrtg-2.14.3.tar.gz
-mrtg-2.14.3.tar.gz.md5.pgp
+mrtg-2.14.4.tar.gz
+mrtg-2.14.4.tar.gz.md5.pgp


Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mrtg.spec	15 May 2006 02:00:53 -0000	1.28
+++ mrtg.spec	5 Jul 2006 21:49:53 -0000	1.29
@@ -5,7 +5,7 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.14.3
+Version:   2.14.4
 Release:   1
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz
@@ -111,6 +111,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Wed Jul  5 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.4-1
+- Update to mrtg-2.14.4
+
 * Mon May 15 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.3-1
 - Update to mrtg-2.14.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	15 May 2006 02:00:53 -0000	1.12
+++ sources	5 Jul 2006 21:49:53 -0000	1.13
@@ -1,2 +1,2 @@
-7b45b95302fabe3a7a373723d82464e7  mrtg-2.14.3.tar.gz
-06eedbd26a49572286b9555aee7ebe0a  mrtg-2.14.3.tar.gz.md5.pgp
+4145907cb25a06f57af7b2b9bc4146c1  mrtg-2.14.4.tar.gz
+d0c8d0d5877896152568fe47a3bcf327  mrtg-2.14.4.tar.gz.md5.pgp



From fedora-cvs-commits at redhat.com  Wed Jul  5 21:57:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 17:57:19 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.4,1.2353.2.5
Message-ID: <200607052157.k65LvJ17008609@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
fixing more spec file stuff




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.4
retrieving revision 1.2353.2.5
diff -u -r1.2353.2.4 -r1.2353.2.5
--- kernel-2.6.spec	5 Jul 2006 21:44:57 -0000	1.2353.2.4
+++ kernel-2.6.spec	5 Jul 2006 21:57:16 -0000	1.2353.2.5
@@ -649,7 +649,7 @@
   for i in %{all_arch_configs}
   do
     mv $i $i.tmp
-    ./merge.pl config-rhel-generic $i.tmp > $i
+    $RPM_SOURCE_DIR/merge.pl config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
 %endif  



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:08:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:08:43 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.290,1.291
Message-ID: <200607052208.k65M8h3Y010346@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
- Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- eclipse.spec	5 Jul 2006 21:19:23 -0000	1.290
+++ eclipse.spec	5 Jul 2006 22:08:40 -0000	1.291
@@ -396,6 +396,7 @@
 %patch24 -p0
 popd
 
+%ifnarch ppc64 s390 s390x
 # tomcat patches
 pushd plugins/org.eclipse.tomcat
 %patch28 -p0
@@ -406,6 +407,7 @@
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
+%endif
 pushd plugins/org.eclipse.compare
 #%patch33 -p0
 popd
@@ -1627,6 +1629,7 @@
 - Update webapp build patch.
 - Use commons-* instead of jakarta-commons-*.
 - Don't delete jars in %%install.
+- Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:09:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2354,
	1.2355 linux-2.6-debug-panic-stackdump.patch, 1.1, NONE
Message-ID: <200607052209.k65M9821010492@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-panic-stackdump.patch 
Log Message:
this causes more problems than its worth



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2354
retrieving revision 1.2355
diff -u -r1.2354 -r1.2355
--- kernel-2.6.spec	5 Jul 2006 21:12:56 -0000	1.2354
+++ kernel-2.6.spec	5 Jul 2006 22:09:05 -0000	1.2355
@@ -306,7 +306,6 @@
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1022: linux-2.6-debug-panic-stackdump.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1026: linux-2.6-debug-no-quiet.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
@@ -812,7 +811,6 @@
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1022 -p1
 %patch1025 -p1
 # Disable the 'quiet' boot switch for better bug reports.
 %patch1026 -p1


--- linux-2.6-debug-panic-stackdump.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:09:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.5,1.2353.2.6
Message-ID: <200607052209.k65M95UO010470@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
trying..




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.5
retrieving revision 1.2353.2.6
diff -u -r1.2353.2.5 -r1.2353.2.6
--- kernel-2.6.spec	5 Jul 2006 21:57:16 -0000	1.2353.2.5
+++ kernel-2.6.spec	5 Jul 2006 22:08:54 -0000	1.2353.2.6
@@ -649,7 +649,7 @@
   for i in %{all_arch_configs}
   do
     mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl config-rhel-generic $i.tmp > $i
+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
 %endif  



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:12:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:12:19 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2151,
	1.2152 linux-2.6-debug-panic-stackdump.patch, 1.1, NONE
Message-ID: <200607052212.k65MCJEC011567@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-panic-stackdump.patch 
Log Message:
- Get rid of stack backtrace on panic, which in most
  cases actually caused a loss of info instead of a gain.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2151
retrieving revision 1.2152
diff -u -r1.2151 -r1.2152
--- kernel-2.6.spec	4 Jul 2006 18:15:19 -0000	1.2151
+++ kernel-2.6.spec	5 Jul 2006 22:12:16 -0000	1.2152
@@ -306,7 +306,6 @@
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1022: linux-2.6-debug-panic-stackdump.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
@@ -828,7 +827,6 @@
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1022 -p1
 %patch1025 -p1
 # Slab leak detector.
 #%patch1027 -p1
@@ -1550,6 +1548,10 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 Dave Jones <davej at redhat.com>
+- Get rid of stack backtrace on panic, which in most
+  cases actually caused a loss of info instead of a gain.
+
 * Tue Jul  4 2006 Juan Quintela <quintela at redhat.com>
 - new merge with xen upstream.
 - xen kernel don't require xen userland.


--- linux-2.6-debug-panic-stackdump.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:12:48 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1658,
	1.1659 linux-2.6-debug-panic-stackdump.patch, 1.1, NONE
Message-ID: <200607052212.k65MCmCK011771@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-panic-stackdump.patch 
Log Message:
- Get rid of stack backtrace on panic, which in most
  cases actually caused a loss of info instead of a gain.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- kernel-2.6.spec	30 Jun 2006 18:46:54 -0000	1.1658
+++ kernel-2.6.spec	5 Jul 2006 22:12:45 -0000	1.1659
@@ -265,7 +265,6 @@
 Patch1018: linux-2.6-debug-Wundef.patch
 Patch1019: linux-2.6-debug-disable-builtins.patch
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1022: linux-2.6-debug-panic-stackdump.patch
 Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
@@ -565,7 +564,6 @@
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1022 -p1
 %patch1025 -p1
 # Slab leak detector.
 #%patch1027 -p1
@@ -1078,6 +1076,10 @@
 %endif
 
 %changelog
+* Wed Jul  5 2006 Dave Jones <davej at redhat.com>
+- Get rid of stack backtrace on panic, which in most
+  cases actually caused a loss of info instead of a gain.
+
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2141_FC4]
 - 2.6.17.3
 


--- linux-2.6-debug-panic-stackdump.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul  5 22:50:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 18:50:53 -0400
Subject: rpms/tomcat5/devel .cvsignore, 1.9, 1.10 sources, 1.7,
	1.8 tomcat5-5.5-catalina.sh.patch, 1.1,
	1.2 tomcat5-5.5-http11-build.patch, 1.1,
	1.2 tomcat5-5.5-jasper.sh.patch, 1.1,
	1.2 tomcat5-5.5-javaxssl.patch, 1.1,
	1.2 tomcat5-5.5-jk-build.patch, 1.1,
	1.2 tomcat5-5.5-jspc.sh.patch, 1.1,
	1.2 tomcat5-5.5-jt5-build.patch, 1.1,
	1.2 tomcat5-5.5-jtc-build.patch, 1.1,
	1.2 tomcat5-5.5-jtj-build.patch, 1.1,
	1.2 tomcat5-5.5-setclasspath.sh.patch, 1.1,
	1.2 tomcat5-5.5-skip-build-on-install.patch, 1.1,
	1.2 tomcat5-5.5-skip-native.patch, 1.1,
	1.2 tomcat5-5.5-util-build.patch, 1.1, 1.2 tomcat5-5.5.conf,
	1.1, 1.2 tomcat5-5.5.init, 1.1,
	1.2 tomcat5-5.5.link_admin_jar.patch, 1.1,
	1.2 tomcat5-5.5.relink, 1.1, 1.2 tomcat5.spec, 1.65, 1.66
Message-ID: <200607052250.k65Mor6P021009@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	.cvsignore sources tomcat5-5.5-catalina.sh.patch 
	tomcat5-5.5-http11-build.patch tomcat5-5.5-jasper.sh.patch 
	tomcat5-5.5-javaxssl.patch tomcat5-5.5-jk-build.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.relink 
	tomcat5.spec 
Log Message:
Upgrade




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Feb 2006 00:26:54 -0000	1.9
+++ .cvsignore	5 Jul 2006 22:50:50 -0000	1.10
@@ -1 +1 @@
-apache-tomcat-5.5.15-src.tar.gz
+apache-tomcat-5.5.17-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2006 00:26:54 -0000	1.7
+++ sources	5 Jul 2006 22:50:50 -0000	1.8
@@ -1 +1 @@
-08c7cf1d42971ef893daa4bf4519a537  apache-tomcat-5.5.15-src.tar.gz
+afedf090888029b19a1bebc471264105  apache-tomcat-5.5.17-src.tar.gz

tomcat5-5.5-catalina.sh.patch:
 catalina.sh |   86 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 67 insertions(+), 19 deletions(-)

Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-catalina.sh.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-catalina.sh.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- container/catalina/src/bin/catalina.sh.sav	2006-03-23 17:04:08.000000000 +0100
++++ container/catalina/src/bin/catalina.sh	2006-03-23 17:12:52.000000000 +0100
 @@ -52,6 +52,9 @@
  Darwin*) darwin=true;;
  esac

tomcat5-5.5-http11-build.patch:
 build.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: tomcat5-5.5-http11-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-http11-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-http11-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-http11-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,13 +1,22 @@
---- 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
+--- connectors/http11/build.xml.p13	2006-03-05 02:25:21.000000000 +0100
++++ connectors/http11/build.xml	2006-03-23 19:22:04.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+   <!-- The locations of necessary jar files -->
+   <property name="tomcat-util.jar"  value="${util.home}/build/lib/tomcat-util.jar"/>
+-  <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++  <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+   <property name="tomcat-coyote.jar" value="${coyote.home}/build/lib/tomcat-coyote.jar"/>
+   <property name="tomcat33-coyote.jar" 
+           value="${coyote.home}/build/lib/tomcat33-coyote.jar"/>
 @@ -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"/>
++         <path refid="compile.classpath"/>
++         <pathelement location="${build.home}/../../jakarta-tomcat-5/build/classes"/>
 +      </classpath>
      </javac>
      <copy    todir="${build.home}/classes" filtering="on">

tomcat5-5.5-jasper.sh.patch:
 jasper.sh |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)

Index: tomcat5-5.5-jasper.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jasper.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jasper.sh.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jasper.sh.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,6 +1,6 @@
---- 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/src/bin/jasper.sh.sav	2006-03-23 17:14:58.000000000 +0100
++++ jasper/src/bin/jasper.sh	2006-03-23 17:24:56.000000000 +0100
+@@ -45,34 +45,38 @@
    . "$JASPER_HOME"/bin/setenv.sh
  fi
  
@@ -47,16 +47,18 @@
 +    commons-logging \
 +    jasper-compiler \
 +    jasper-runtime \
-+    eclipse-ecj.jar \
++    jdtcore.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 @@
+@@ -103,7 +107,7 @@
  
  else
  

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

Index: tomcat5-5.5-javaxssl.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-javaxssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-javaxssl.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-javaxssl.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- connectors/jk/java/org/apache/jk/server/JkMain.java.sav	2006-03-23 16:56:20.000000000 +0100
++++ connectors/jk/java/org/apache/jk/server/JkMain.java	2006-03-23 16:57:27.000000000 +0100
 @@ -101,7 +101,7 @@
          return jkMain;
      }
@@ -9,8 +9,8 @@
      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
+--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.sav	2006-03-23 16:58:48.000000000 +0100
++++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java	2006-03-23 17:01:34.000000000 +0100
 @@ -67,13 +67,13 @@
       */
       void init() throws IOException {

tomcat5-5.5-jk-build.patch:
 build.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: tomcat5-5.5-jk-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jk-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jk-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,10 +1,19 @@
---- 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
+--- connectors/jk/build.xml.p14	2006-03-05 02:25:22.000000000 +0100
++++ connectors/jk/build.xml	2006-03-23 19:25:51.000000000 +0100
+@@ -28,7 +28,7 @@
+     <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
+     <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
+     <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
+-    <property name="tomcat-apr.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++    <property name="tomcat-apr.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+ 
+     <!-- default locations, overrident by properties -->
+     <property name="base.path" location="/usr/share/java"/>
 @@ -211,6 +211,7 @@
              <exclude name="org/apache/jk/ant/**" />
  	    <classpath>
  	       <pathelement location="${tomcat-apr.jar}" />
-+               <pathelement location="${jk.build}/../../build/build/classes"/>
++               <pathelement location="${jk.build}/../../jakarta-tomcat-5/build/classes"/>
  	       <path refid="xml-apis.classpath"/>
  	       <path refid="build-main.classpath"/>
  	    </classpath>

tomcat5-5.5-jspc.sh.patch:
 jspc.sh |   27 ++-------------------------
 1 files changed, 2 insertions(+), 25 deletions(-)

Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jspc.sh.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jspc.sh.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- jasper/src/bin/jspc.sh.sav	2006-03-23 17:33:40.000000000 +0100
++++ jasper/src/bin/jspc.sh	2006-03-23 17:35:26.000000000 +0100
 @@ -5,32 +5,9 @@
  # $Id$
  # -----------------------------------------------------------------------------

tomcat5-5.5-jt5-build.patch:
 build.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

Index: tomcat5-5.5-jt5-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jt5-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jt5-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jt5-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- build/build.xml.p2	2006-03-23 19:51:48.000000000 +0100
++++ build/build.xml	2006-03-24 10:18:41.000000000 +0100
 @@ -58,12 +58,14 @@
    <property name="tomcat.release"   value="${basedir}/release"/>
    <property name="webapps.build"    value="${catalina.home}/webapps/build"/>
@@ -9,47 +9,41 @@
    <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 @@
+@@ -159,11 +161,17 @@
+             failonerror="false" />
+ 
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+-            file="${tomcat-native.tar.gz}" />
++            file="${tomcat-native.tar.gz}"
++            failonerror="false" />
  
      <!-- <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"/>
++-->
++<!-- these should be links -->
++       <copy todir="${tomcat.build}/common/lib" file="${base.path}/jdtcore.jar" failonerror="false"/>
++
    </target>
  
    <!-- ====================== Build all components =================== -->
-@@ -953,7 +959,7 @@
+@@ -957,7 +965,9 @@
      <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"/>
++        <!-- <include name="jasper-compiler-jdt.jar"/> -->
++        <include name="jdtcore.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(-)

Index: tomcat5-5.5-jtc-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jtc-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jtc-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jtc-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,16 +1,16 @@
---- 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
+--- container/catalina/build.xml.sav	2006-03-23 16:46:37.000000000 +0100
++++ container/catalina/build.xml	2006-03-23 16:47:44.000000000 +0100
 @@ -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"/>
++           value="${base.path}/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
+--- container/modules/cluster/build.xml.sav	2006-03-23 16:49:04.000000000 +0100
++++ container/modules/cluster/build.xml	2006-03-23 16:49:54.000000000 +0100
 @@ -20,7 +20,7 @@
      <pathelement location="${commons-modeler.jar}"/>
      <pathelement location="${commons-logging.jar}"/>

tomcat5-5.5-jtj-build.patch:
 build.xml |    4 ++++
 1 files changed, 4 insertions(+)

Index: tomcat5-5.5-jtj-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jtj-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jtj-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jtj-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,18 +1,20 @@
---- 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 @@
+--- jasper/build.xml.sav	2006-03-23 16:52:01.000000000 +0100
++++ jasper/build.xml	2006-03-23 16:53:17.000000000 +0100
+@@ -38,6 +38,8 @@
      <pathelement location="${commons-logging.jar}"/>
      <pathelement location="${commons-daemon-launcher.jar}"/>
      <pathelement location="${jasper.build}/shared/classes"/>
-+    <pathelement location="${base.path}/eclipse-ecj.jar"/>
++    <pathelement location="${base.path}/jdtcore.jar"/>
++
    </path>
  
    <!-- Construct unit tests classpath -->
-@@ -54,6 +55,7 @@
+@@ -54,6 +56,8 @@
      <pathelement location="${commons-launcher.jar}"/>
      <pathelement location="${jasper.build}/shared/classes"/>
      <pathelement location="${jasper.build}/tests"/>
-+    <pathelement location="${base.path}/eclipse-ecj.jar"/>
++    <pathelement location="${base.path}/jdtcore.jar"/>
++
    </path>
  
  

tomcat5-5.5-setclasspath.sh.patch:
 setclasspath.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: tomcat5-5.5-setclasspath.sh.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-setclasspath.sh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-setclasspath.sh.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-setclasspath.sh.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- container/catalina/src/bin/setclasspath.sh.sav	2006-03-23 17:37:23.000000000 +0100
++++ container/catalina/src/bin/setclasspath.sh	2006-03-23 17:38:35.000000000 +0100
 @@ -50,7 +50,7 @@
    echo "This environment variable is needed to run this program"
    exit 1

tomcat5-5.5-skip-build-on-install.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

Index: tomcat5-5.5-skip-build-on-install.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-skip-build-on-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-skip-build-on-install.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-skip-build-on-install.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,10 +1,9 @@
---- 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" />
+--- build/build.xml.sav	2006-03-23 16:22:33.000000000 +0100
++++ build/build.xml	2006-03-23 16:23:40.000000000 +0100
+@@ -763,10 +763,12 @@
      <mkdir dir="${tomcat.build}/server/webapps" />
  
--    <!-- The build files are far too difficult to hack - just build it and copy -->
+     <!-- The build files are far too difficult to hack - just build it and copy -->
 +    <!--
      <ant dir="${api.home}/jsr154" target="dist">
      </ant>

tomcat5-5.5-skip-native.patch:
 build.xml |    3 +++
 1 files changed, 3 insertions(+)

Index: tomcat5-5.5-skip-native.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-skip-native.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-skip-native.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-skip-native.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,13 +1,10 @@
---- 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 @@
+--- build/build.xml.sav	2006-03-23 17:54:40.000000000 +0100
++++ build/build.xml	2006-03-23 17:55:58.000000000 +0100
+@@ -160,8 +160,11 @@
      <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
-+-->
++<!-- build native separately -->
 +<!--
      <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
              file="${tomcat-native.tar.gz}" />

tomcat5-5.5-util-build.patch:
 build.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: tomcat5-5.5-util-build.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-util-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-util-build.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-util-build.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,13 +1,22 @@
---- 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
+--- connectors/util/build.xml.sav	2006-03-23 19:16:02.000000000 +0100
++++ connectors/util/build.xml	2006-03-23 19:17:46.000000000 +0100
+@@ -23,7 +23,7 @@
+     <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
+     <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
+     <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
+-    <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++    <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+ 
+     <path id="compile.classpath">
+         <pathelement location="${jmx.jar}" />
 @@ -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"/>
++               <path refid="compile.classpath"/>
++               <pathelement location="${tomcat-util.build}/../../jakarta-tomcat-5/build/classes"/>
 +            </classpath>
              <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
              <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>


Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.conf	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5.conf	5 Jul 2006 22:50:50 -0000	1.2
@@ -8,6 +8,9 @@
 # here if you wish to
 #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
 
+# Use JAVA_OPTS to set java.library.path for libtcnative.so
+#JAVA_OPTS="-Djava.library.path=/usr/lib
+
 # Where your tomcat installation lives
 # That change from previous RPM where TOMCAT_HOME 
 # used to be /var/tomcat.


Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.init	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5.init	5 Jul 2006 22:50:50 -0000	1.2
@@ -131,15 +131,19 @@
 
             until [ `ps --pid $kpid | grep -c $kpid` = '0' ] || [ $count -gt $kwait ]
             do
-                echo "waiting for processes to exit";
+                echo -n -e "\nwaiting 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"
+                echo -n -e "\nkilling processes which didn't stop after $SHUTDOWN_WAIT seconds"
                 kill -9 $kpid
             fi
+
+            if [ $count -gt 0 ]; then
+                echo -n -e "\n"
+            fi
         fi
     
 		rm -f /var/lock/subsys/tomcat5 /var/run/tomcat5.pid

tomcat5-5.5.link_admin_jar.patch:
 admin.xml |    5 +++++
 1 files changed, 5 insertions(+)

Index: tomcat5-5.5.link_admin_jar.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.link_admin_jar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5.link_admin_jar.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5.link_admin_jar.patch	5 Jul 2006 22:50:50 -0000	1.2
@@ -1,10 +1,11 @@
---- 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 @@
+--- container/webapps/admin/admin.xml.sav	2006-03-23 16:16:51.000000000 +0100
++++ container/webapps/admin/admin.xml	2006-03-23 16:17:49.000000000 +0100
+@@ -17,4 +17,9 @@
      allow="127.0.0.1"/>
    -->
  
 +  <!-- Allow linking since JPackage do not install jar as copies -->
++
 +  <Resources className="org.apache.naming.resources.FileDirContext"
 +             allowLinking="true"/>
 +




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tomcat5.spec	19 Jun 2006 19:03:03 -0000	1.65
+++ tomcat5.spec	5 Jul 2006 22:50:50 -0000	1.66
@@ -1,3 +1,46 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# If you want only apis to be built,
+# give rpmbuild option '--with apisonly'
+
+%define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
+%define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
+
+# If you don't want direct ecj support to be built in,
+# while eclipse-ecj isn't available,
+# give rpmbuild option '--without ecj'
+
+%define without_ecj %{?_without_ecj:1}%{!?_without_ecj:0}
+%define with_ecj %{!?_without_ecj:1}%{?_without_ecj:0}
+
 %define full_name jakarta-%{name}
 %define full_jname jasper5
 %define jname jasper
@@ -25,15 +68,15 @@
 
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
-Version: 5.5.15
-Release: 1jpp_7fc
+Version: 5.5.17
+Release: 3jpp_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
+URL: http://tomcat.apache.org/
+Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{packdname}.tar.gz
 Source1: %{name}-%{majversion}.init
 Source2: %{name}-%{majversion}.conf
 Source3: %{name}-%{majversion}.wrapper
@@ -50,7 +93,6 @@
 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
@@ -72,14 +114,21 @@
 # alternatives
 Requires: jndi-ldap
 # And it needs its own API subpackages for running
+Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
+Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
 # And it needs its own API subpackages before being installed
-PreReq: %{name}-common-lib = %{epoch}:%{version}-%{release}
-PreReq: %{name}-server-lib = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-common-lib = %{epoch}:%{version}-%{release}
+Requires(post): %{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
+%if %{with_apisonly}
+BuildRequires: java-devel >= 0:1.4.2
+%endif
+%if %{without_apisonly}
+%if %{with_ecj}
+BuildRequires: eclipse-ecj >= 0:3.1.1
+%endif
 BuildRequires: ant-trax
 BuildRequires: xalan-j2
 BuildRequires: jakarta-commons-beanutils >= 1.7
@@ -110,7 +159,7 @@
 BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
 # formerly non-free stuff
 # geronimo-specs replaces non-free jta
-BuildRequires: jta >= 0:1.0.1
+BuildRequires: geronimo-jta-1.0.1B-api
 # jaf can be provided by classpathx-jaf
 #BuildRequires: jaf >= 0:1.0.2
 BuildRequires: jaf >= 0:1.0.1
@@ -121,6 +170,7 @@
 BuildRequires:    	java-gcj-compat-devel >= 1.0.43
 Requires(post):   	java-gcj-compat >= 1.0.31
 Requires(postun): 	java-gcj-compat >= 1.0.31
+%endif
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -134,6 +184,7 @@
 We invite you to participate in this open development project. To
 learn more about getting involved, click here.
 
+%if %{without_apisonly}
 %package webapps
 Group: System Environment/Applications
 PreReq: %{name} = %{epoch}:%{version}-%{release}
@@ -151,6 +202,7 @@
 
 %description admin-webapps
 The administrative web applications (admin and manager) for Jakarta Tomcat
+%endif
 
 %package servlet-%{servletspec}-api
 Group: Internet/WWW/Dynamic Content
@@ -214,32 +266,51 @@
 Contains the javadoc generated documentation for the implementation classes
 of the Jakarta Tomcat JSP API (packages javax.servlet.jsp).
 
+%if %{without_apisonly}
 %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
+Requires: java >= 0:1.4.2
+Requires(post): jpackage-utils >= 0:1.6.0
+Requires: ant >= 0:1.6
+Requires(post): ant >= 0:1.6
+Requires: jakarta-commons-collections >= 0:3.1
+Requires(post): jakarta-commons-collections >= 0:3.1
+Requires: jakarta-commons-dbcp >= 0:1.2.1
+Requires(post): jakarta-commons-dbcp >= 0:1.2.1
+Requires: jakarta-commons-el >= 0:1.0
+Requires(post): jakarta-commons-el >= 0:1.0
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): 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
+Requires: jakarta-commons-pool >= 0:1.2
+Requires(post): jakarta-commons-pool >= 0:1.2
 # jaf can be provided by classpathx-jaf
-PreReq: jaf >= 0:1.0.1
+Requires: jaf >= 0:1.0.1
+Requires(post): 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
+Requires: javamail >= 0:1.3.1
+Requires(post): javamail >= 0:1.3.1
+Requires: jdbc-stdext
+Requires(post): jdbc-stdext
+Requires: jndi
+Requires(post): jndi
+# geronimo-specs replaces non-free jta
+Requires: geronimo-jta-1.0.1B-api
+Requires(post): geronimo-jta-1.0.1B-api
+Requires: mx4j >= 0:3.0.1
+Requires(post): mx4j >= 0:3.0.1
+%if %{with_ecj}
+Requires: eclipse-ecj >= 0:3.1.1
+Requires(post): eclipse-ecj >= 0:3.1.1
+%endif
 # 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}
+Requires(post): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
+Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
+Requires: %{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
@@ -250,17 +321,28 @@
 %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
+Requires(post): jpackage-utils >= 0:1.6.0
+Requires: jakarta-commons-beanutils >= 0:1.7.0
+Requires(post): jakarta-commons-beanutils >= 0:1.7.0
+Requires: jakarta-commons-digester >= 0:1.6
+Requires(post): jakarta-commons-digester >= 0:1.6
+Requires: jakarta-commons-el >= 0:1.0
+Requires(post): jakarta-commons-el >= 0:1.0
+Requires: jakarta-commons-fileupload >= 0:1.0-1jpp
+Requires(post): jakarta-commons-fileupload >= 0:1.0-1jpp
+Requires: jakarta-commons-logging >= 0:1.0.4
+Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires: jakarta-commons-modeler >= 1.1
+Requires(post): jakarta-commons-modeler >= 1.1
+Requires: jaas
+Requires(post): jaas
+Requires: mx4j >= 0:3.0.1
+Requires(post): mx4j >= 0:3.0.1
+Requires: regexp >= 0:1.3
+Requires(post): regexp >= 0:1.3
 # Other subpackages must go in first
-PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+Requires(post): %{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
@@ -289,34 +371,50 @@
 
 %description %{jname}-javadoc
 Javadoc for generated documentation %{name}-%{jname}
+%endif
 
 %prep
+cat <<EOT
+
+                If you want only apis to be built,
+                give rpmbuild option '--with apisonly'
+
+		If you don''t want direct ecj support to be built in,
+		while eclipse-ecj isn''t available,
+		give rpmbuild option '--without ecj'
+
+
+EOT
+
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 %setup -q -c -T -a 0
 
 cd %{packdname}
-%patch0 -p2
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-%patch4 -p2
-%patch5 -p2
+%patch0 -b .p0
+%patch1 -b .p1
+%patch2 -b .p2
+%patch3 -b .p3
+%patch4 -b .p4
+%patch5 -b .p5
 #%patch6 -p1
-%patch7 -p2
-%patch8 -p2
-%patch9 -p2
-%patch10 -p2
-##%patch11 -p1
-%patch12 -p2
-%patch13 -p2
-%patch14 -p2
-%patch15 -p2
-%patch16 -p2
-%patch17 -p2
+%patch7 -b .p7
+%patch8 -b .p8
+%patch9 -b .p9
+%patch10 -b .p10
+# omit jdtcompilerpatch for eclipse-ecj >= 3.1
+#%patch11 -b .p11
+%patch12 -b .p12
+%patch13 -b .p13
+%patch14 -b .p14
+#%patch15 -b .p15
+
+%if %{without_ecj}
+rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
+%endif
 
 %build
-export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
+#clp#export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
 
 # Remove pre-built jars
 for dir in $RPM_BUILD_DIR/%{name}-%{version}/%{packdname} ; do
@@ -346,10 +444,11 @@
     popd
 popd
 
+%if %{without_apisonly}
 # 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
+#clp#CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
+#clp#export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
     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
@@ -363,6 +462,7 @@
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
 junit.jar=$(build-classpath junit)
+jasper-compiler-jdt.jar=$(build-classpath jdtcore)
 EOBP
     # can't use jikes to build tomcat4 (strange)
     ant -Djava.home=%{java_home} -Dbuild.compiler=modern javadoc
@@ -374,7 +474,7 @@
 ant.jar=%{_javadir}/ant.jar
 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
+%{jname}.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
 commons-beanutils.jar=$(build-classpath commons-beanutils)
 commons-fileupload.jar=$(build-classpath commons-fileupload)
 commons-collections.jar=$(build-classpath commons-collections)
@@ -402,7 +502,7 @@
 struts.lib=%{_datadir}/struts
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath jta)
+jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -419,7 +519,7 @@
 # build the connectors
 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
+export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-tomcat-5/build/server/lib/catalina.jar
     cat > build.properties << EOBP
 activation.jar=$(build-classpath jaf)
 ant.jar=%{_javadir}/ant.jar
@@ -437,34 +537,40 @@
 jmx.jar=$(build-classpath mx4j/mx4j-jmx)
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath jta)
+jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
 jcert.jar=$(build-classpath jsse/jcert)
 jnet.jar=$(build-classpath jsse/jnet)
 jsse.jar=$(build-classpath jsse/jsse)
+tomcat5.home=../../build/build
 EOBP
     ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%if %{without_apisonly}
 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/%{_sysconfdir}/{init.d,logrotate.d}
-install -d -m 755 $RPM_BUILD_ROOT/{%{_bindir},%{_javadir}}
+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%{_sysconfdir}/{init.d,logrotate.d}
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 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
+install %{SOURCE2} $RPM_BUILD_ROOT%{confdir}/%{name}.conf
 pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build
     export usejikes=false
+    export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
     ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
     pushd dist
         mv bin/* $RPM_BUILD_ROOT%{bindir}
@@ -530,22 +636,73 @@
     perl -pi -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g;" $i
 done
 # Remove local JARs (to be replaced with jpp links in post)
-pushd $RPM_BUILD_ROOT/%{serverdir}/lib
+pushd $RPM_BUILD_ROOT%{serverdir}/lib
     find . -name "*.jar" -not -name "catalina*" \
                          -not -name "servlets-*" \
                          -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}
+    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
+    # catalina* jars will be installed in a public repository
+    for i in catalina*.jar; do
+        j=`echo $i | sed 's:\.jar$::'`
+        mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $j-%{version}.jar $j.jar
+        popd
+        ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+    done
+    # servlets* jars will be installed in a public repository
+    for i in servlets-*.jar; do
+        j=`echo $i | sed 's:\.jar$::'`
+        mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $j-%{version}.jar $j.jar
+        popd
+        ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+    done
+    # tomcat* jars will be installed in a public repository
+    for i in tomcat-*.jar; do
+        j=`echo $i | sed 's:\.jar$::'`
+        mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $j-%{version}.jar $j.jar
+        popd
+        ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+    done
 popd
 # Process admin webapp server/webapps/admin
-pushd $RPM_BUILD_ROOT/%{serverdir}/webapps/admin/WEB-INF/lib
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/admin/WEB-INF/lib
     find . -name "*.jar" -not -name 'catalina-admin*' | xargs -t rm -f
+    for i in catalina-admin; do
+        cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $i-%{version}.jar $i.jar
+        popd
+    done
+popd
+# Process manager webapp server/webapps/manager
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/manager/WEB-INF/lib
+    for i in catalina-manager; do
+        cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $i-%{version}.jar $i.jar
+        popd
+    done
+popd
+# Process host-manager webapp server/webapps/host-manager
+pushd $RPM_BUILD_ROOT%{serverdir}/webapps/host-manager/WEB-INF/lib
+    for i in catalina-host-manager; do
+        cp $i.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$i-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $i-%{version}.jar $i.jar
+        popd
+    done
 popd
 # Process common/lib
-pushd $RPM_BUILD_ROOT/%{commondir}/lib
+pushd $RPM_BUILD_ROOT%{commondir}/lib
     find . -name "*.jar" -not -name "%{jname}*" \
                          -not -name "naming*" | xargs -t rm -f
     # jasper's jars will be installed in a public repository
@@ -554,12 +711,20 @@
         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
+    # naming* jars will be installed in a public repository
+    for i in naming-*.jar; do
+        j=`echo $i | sed 's:\.jar$::'`
+        mv $j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$j-%{version}.jar
+        pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+            ln -sf $j-%{version}.jar $j.jar
+        popd
+        ln -sf %{_javadir}/%{name}/$j.jar $j.jar
+    done
 popd
 # Process common/endorsed
-pushd $RPM_BUILD_ROOT/%{commondir}/endorsed
+pushd $RPM_BUILD_ROOT%{commondir}/endorsed
     find . -name "*.jar" | xargs -t rm -f
 popd
 # avoid duplicate servlet.jar
@@ -580,6 +745,7 @@
 cd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}
 find $RPM_BUILD_ROOT%{homedir} -type l -maxdepth 1 | \
     sed s+$RPM_BUILD_ROOT++g > homelinks
+%endif
 # begin servlet api subpackage install
 pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi
     install -m 644 jsr154/dist/lib/servlet-api.jar \
@@ -618,11 +784,12 @@
     ln -s %{name}-jsp-%{jspspec}-api-%{version} \
         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-%{jspspec}-api
 popd
+%if %{without_apisonly}
 # begin jasper subpackage install
 pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
-    install -m755 jasper2/src/bin/jspc.sh \
+    install -m755 src/bin/jspc.sh \
         $RPM_BUILD_ROOT%{_bindir}/jspc5.sh
-    install -m755 jasper2/src/bin/%{jname}.sh \
+    install -m755 src/bin/%{jname}.sh \
         $RPM_BUILD_ROOT%{_bindir}/%{full_jname}.sh
 popd
 pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/container
@@ -632,7 +799,7 @@
 # javadoc
 install -d -m755 $RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
 pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
-    cp -pr jasper2/build/javadoc/* \
+    cp -pr build/javadoc/* \
         $RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
     # ghost symlink
     ln -s %{jname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{jname}
@@ -645,10 +812,12 @@
 # sample.war is a malformed zip file
 aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
 
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{without_apisonly}
 %post
 # install tomcat5 (but don't activate)
 /sbin/chkconfig --add %{name}
@@ -688,11 +857,15 @@
 build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
                                       commons-el commons-logging-api \
                                       commons-pool jaf javamail jdbc-stdext \
-                                      jndi jsp jta \
+                                      jndi jsp geronimo-jta-1.0.1B-api \
                                       mx4j/mx4j \
                                       servlet %{jname}5-compiler \
-                                      eclipse-ecj \
                                       %{jname}5-runtime 2>&1
+%if %{with_ecj}
+pushd %{commondir}/lib
+ln -sf %{_javadir}/jdtcore.jar .
+popd
+%endif
 %{_bindir}/rebuild-gcj-db
 
 %postun common-lib
@@ -715,8 +888,12 @@
                                       commons-digester commons-el \
                                       commons-fileupload commons-logging \
                                       commons-modeler jaas mx4j/mx4j \
-                                      eclipse-ecj \
                                       regexp 2>&1
+%if %{with_ecj}
+pushd %{serverdir}/lib
+ln -sf %{_javadir}/jdtcore.jar .
+popd
+%endif
 %{_bindir}/rebuild-gcj-db
 
 %postun server-lib
@@ -755,6 +932,7 @@
 
 %postun admin-webapps
 %{_bindir}/rebuild-gcj-db
+%endif
 
 %post servlet-%{servletspec}-api
 update-alternatives --install %{_javadir}/servlet.jar servlet \
@@ -793,6 +971,7 @@
 fi
 %{_bindir}/rebuild-gcj-db
 
+%if %{without_apisonly}
 %preun
 # Always clean up workdir and tempdir on upgrade/removal
 rm -fr %{workdir}/* %{tempdir}/*
@@ -841,7 +1020,9 @@
 %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2> /dev/null || :
 %{_sbindir}/useradd -c "Tomcat" -u %{tcuid} -g tomcat \
     -s /bin/sh -r -d %{homedir} tomcat 2> /dev/null || :
+%endif
 
+%if %{without_apisonly}
 %files -f %{packdname}/homelinks
 %defattr(644,root,root,755)
 %doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
@@ -902,12 +1083,23 @@
 
 %files common-lib
 %defattr(644,root,root,755)
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/naming*.jar
 %{commondir}/lib/*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
 
 %files server-lib
 %defattr(644,root,root,755)
 %{_javadir}/catalina*.jar
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/catalina-ant-jmx*.jar
+%{_javadir}/%{name}/catalina-cluster*.jar
+%{_javadir}/%{name}/catalina.jar
+%{_javadir}/%{name}/catalina-%{version}.jar
+%{_javadir}/%{name}/catalina-optional*.jar
+%{_javadir}/%{name}/catalina-storeconfig*.jar
+%{_javadir}/%{name}/servlets*.jar
+%{_javadir}/%{name}/tomcat*.jar
 %{serverdir}/lib/*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
@@ -951,6 +1143,9 @@
 %{appdir}/balancer/*
 %dir %{serverdir}/webapps
 %{serverdir}/webapps/*
+%attr(644,root,root) %{_javadir}/%{name}/catalina-admin*.jar
+%attr(644,root,root) %{_javadir}/%{name}/catalina-manager*.jar
+%attr(644,root,root) %{_javadir}/%{name}/catalina-host-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*
@@ -959,9 +1154,8 @@
 
 %files %{jname}
 %defattr(644,root,root,755)
-%doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2/doc/jspc.html
+%doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/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-*
@@ -970,6 +1164,7 @@
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{jname}-%{version}
 %ghost %doc %{_javadocdir}/%{jname}
+%endif
 
 %files servlet-%{servletspec}-api
 %defattr(-,root,root)
@@ -996,9 +1191,52 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
+- Upgrade
+
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
+- Merge with upstream
+
+* Fri Jun 30 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.17-3jpp
+- Create option --with apisonly to build just tomcat5-servlet-2.4-api,
+  tomcat5-jsp-2.0-api and its -javadoc subpackages
+- Create option --without ecj to build even when eclipse-ecj not available
+- Drop several unnecessary export CLASSPATH=
+
 * Sat Jun 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:5.5.15-1jpp_7fc
 - Re-enable ppc64, s390 and s390x architectures now that eclipse is built there
 
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp_1rh
+- Merge with upstream for upgrade to 5.5.17
+
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp
+- Requires on post things that are linked to at post
+  Merge changes from downstream:
+- Fix line breaks in the tomcat5 init script
+- Split preun section among main package and the two new subpackages
+- Move catalina-ant*.jar to the server-lib subpackage to avoid circular
+  dependency with the main package
+- Remove leading zero from alternative priorities
+- Rebuild with new classpath-mail as javamail alternative
+- Update versions of dependencies and move them to library subpackages
+- Use only jta from geronimo-specs
+
+* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-1jpp
+- Upgrade to 5.5.17
+- Remove jasper2 subdirectory of jasper from patches and this spec file
+
+* Wed Apr 19 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-3jpp
+- Drop jdtCompilerAdapter from build-jar-repository
+- Use ant-trax in static webapp build
+- Duplicate admin-webapps jars in _javadir and make them world readable
+- Direct install of common-lib and server-lib to _javadir and symlink for TC5
+
+* Tue Apr 04 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-2jpp
+- Require eclipse-ecj >= 3.1.1 and adapt to it
+
+* Fri Mar 24 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-1jpp
+- Upgrade to 5.5.16
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.5.15-1jpp_6fc
 - stop scriptlet spew
 
@@ -1021,64 +1259,28 @@
 * Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_1fc
 - Updated to 5.5.15
 
-* 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
-
-* 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
-
-* Tue Nov 15 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_9rh
-- Remove leading zero from alternative priorities
-
-* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_8rh
-- Rebuild with new classpath-mail as javamail alternative
-
-* 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
-
-* 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 Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_5rh
-- Use only jta from geronimo-specs
-
-* 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 Feb 14 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.12-2jpp
+- Fix jta.jar location
 
-* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_3rh
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp
 - Place jsp in its own subpackage
+- Fix alternative links to jsp and servlet
 - Fix alternative priorities to jsp and servlet
 - Create library subpackages: common-lib and server-lib
-
-* Tue Oct 25 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_2rh
-- Fix versions in patch
-
-* 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
-
-* Sat Oct 22 2005 Vadim Nasardinov <vadimn at redhat.com> 0:5.5.12-1jpp
+  From Vadim Nasardinov <vadimn at redhat.com> 0:5.5.12-1jpp
 - Upgrade to 5.5.12
+  From Deepak Bhole <dbhole at redhat.com>
+- Fix init script so it works with SELinux
 
-* 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.
-
-* 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 Jun 17 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_3rh
-- Remove spurious dependency on tyrex (only needed for tomcat4)
-
-* 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
-
-* Wed Jun 08 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_1rh
+* Wed Jun 08 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp
 - Merge for upgrade
 - Change the user to tomcat from tomcat4
 - Relax permissions on appdir directory so jonas package can build
+- Remove spurious links to log4j.jar from common and server/lib
+- Remove spurious dependency on tyrex (only needed for tomcat4)
+- Make sure the main package installs first so user tomcat is created
+- Reinstate ssl code changes so that tomcat can be built with other SDKs
+  and not only with Sun's or BEA's.
 
 * Mon May 09 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp
 - Upgrade to 5.5.9



From fedora-cvs-commits at redhat.com  Wed Jul  5 23:10:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 19:10:01 -0400
Subject: rpms/gaim/devel gaim-2.0.0-beta3-silc-realname.patch, NONE,
	1.1 gaim.spec, 1.126, 1.127
Message-ID: <200607052310.k65NA1hj026016@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25977

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-silc-realname.patch 
Log Message:
SILC blank realname failure fix (#173076)


gaim-2.0.0-beta3-silc-realname.patch:
 silc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE gaim-2.0.0-beta3-silc-realname.patch ---
--- branches/v2_0_0/src/protocols/silc/silc.c	2006/07/01 15:20:58	16384
+++ branches/v2_0_0/src/protocols/silc/silc.c	2006/07/01 15:33:43	16385
@@ -268,6 +268,7 @@
 	GaimConnection *gc;
 	char pkd[256], prd[256];
 	const char *cipher, *hmac;
+	char *realname;
 	int i;
 
 	gc = account->gc;
@@ -298,11 +299,16 @@
 		client->username = silc_get_username();
 		gaim_account_set_username(account, client->username);
 	}
+	realname = silc_get_real_name();
 	if (gaim_account_get_user_info(account)) {
 		client->realname = strdup(gaim_account_get_user_info(account));
-	} else {
-		client->realname = silc_get_real_name();
+		free(realname);
+	} else if ((silc_get_real_name() != NULL) && (*realname != '\0')) {
+		client->realname = realname;
 		gaim_account_set_user_info(account, client->realname);
+	} else {
+		free(realname);
+		client->realname = strdup(_("Gaim User"));
 	}
 	client->hostname = silc_net_localhost();
 


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gaim.spec	29 Jun 2006 17:29:03 -0000	1.126
+++ gaim.spec	5 Jul 2006 23:09:58 -0000	1.127
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.5.%{betaver}%{?dist}
+Release:	0.6.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -48,10 +48,13 @@
 # - Smiley Theme "Default"
 Source1:	gaim-fedora-prefs.xml
 
+
 ## Patches 0-99: Fedora specific or upstream wont accept
-# to be replaced by upstream fix
 Patch5:		gaim2-PIE.patch
 
+## Patches 100+: To be Included in Future Upstream
+Patch181: gaim-2.0.0-beta3-silc-realname.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
 
@@ -145,7 +148,10 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
+## Patches 0-99: Fedora specific or upstream wont accept
 %patch5 -p1
+## Patches 100+: To be Included in Future Upstream
+%patch181 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -283,6 +289,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Wed Jul 05 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.6.beta3
+- SILC blank realname failure fix (#173076)
+
 * Thu Jun 29 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.5.beta3
 - buildreq libSM-devel (#197241)
 



From fedora-cvs-commits at redhat.com  Wed Jul  5 23:36:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 19:36:14 -0400
Subject: rpms/m2crypto/devel .cvsignore, 1.5, 1.6 m2crypto.spec, 1.21,
	1.22 sources, 1.5, 1.6 m2crypto-0.13-SSLServer.patch, 1.2,
	NONE m2crypto-0.15-Connection.patch, 1.1, NONE
Message-ID: <200607052336.k65NaEes016502@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16430

Modified Files:
	.cvsignore m2crypto.spec sources 
Removed Files:
	m2crypto-0.13-SSLServer.patch m2crypto-0.15-Connection.patch 
Log Message:
* Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-1
- Update to m2crypto-0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Aug 2005 00:57:58 -0000	1.5
+++ .cvsignore	5 Jul 2006 23:36:10 -0000	1.6
@@ -1 +1 @@
-m2crypto-0.15.tar.bz2
+m2crypto-0.16.tar.gz


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- m2crypto.spec	19 Apr 2006 16:05:25 -0000	1.21
+++ m2crypto.spec	5 Jul 2006 23:36:12 -0000	1.22
@@ -2,12 +2,9 @@
 
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
-Version: 0.15
-Release: 4
-# http://svn.osafoundation.org/m2crypto/tags/0.15
-Source0: m2crypto-%{version}.tar.bz2
-Patch0: m2crypto-0.13-SSLServer.patch
-Patch1: m2crypto-0.15-Connection.patch
+Version: 0.16
+Release: 1
+Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 License: BSDish
 Group: System Environment/Libraries
 URL: http://sandbox.rulemaker.net/ngps/m2
@@ -22,8 +19,16 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .SSLServer
-%patch1 -p1 -b .Connection
+
+# Red Hat opensslconf.h #includes an architecture-specific file, but SWIG
+# doesn't follow the #include.
+
+# Determine which arch opensslconf.h is going to try to #include.
+basearch=%{_arch}
+%ifarch %{ix86}
+basearch=i386
+%endif
+sed -i -e "s/opensslconf/opensslconf-${basearch}/" SWIG/_ec.i
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS
@@ -50,10 +55,13 @@
 
 %files
 %defattr(-,root,root)
-%doc BUGS CHANGES LIC* README README.Developers demo demo2004 tests
+%doc CHANGES LICENCE README demo tests
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-1
+- Update to m2crypto-0.16
+
 * Wed Apr 19 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-4
 - Fix SSL.Connection.accept (#188742)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Aug 2005 00:57:58 -0000	1.5
+++ sources	5 Jul 2006 23:36:12 -0000	1.6
@@ -1 +1 @@
-befaf54d86eaf13f7591d630f28a10ee  m2crypto-0.15.tar.bz2
+6fc06583a2be56fc2a46872a0540d78e  m2crypto-0.16.tar.gz


--- m2crypto-0.13-SSLServer.patch DELETED ---


--- m2crypto-0.15-Connection.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 00:33:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 20:33:18 -0400
Subject: rpms/nkf/devel .cvsignore, 1.6, 1.7 nkf.spec, 1.19, 1.20 sources,
	1.6, 1.7
Message-ID: <200607060033.k660XIsn013972@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/nkf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13942

Modified Files:
	.cvsignore nkf.spec sources 
Log Message:
* Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com> - 2.07-1
- New upstream release.
- use dist tag.
- clean up the spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 09:17:06 -0000	1.6
+++ .cvsignore	6 Jul 2006 00:33:05 -0000	1.7
@@ -4,3 +4,4 @@
 nkf204.tar.gz
 nkf205.tar.gz
 nkf206a.tar.gz
+nkf207.tar.gz


Index: nkf.spec
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nkf.spec	30 Mar 2006 09:17:06 -0000	1.19
+++ nkf.spec	6 Jul 2006 00:33:05 -0000	1.20
@@ -1,15 +1,15 @@
-%define	nkfver	nkf206a
+%define	nkfver	nkf207
 
 Summary: A Kanji code conversion filter.
 Name: nkf
-Version: 2.06
-Release: 1.fc6
+Version: 2.07
+Release: 1%{?dist}
 License: BSD-like
 Group: Applications/Text
 #Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar
 Source: http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/%{nkfver}.tar.gz
 Source3: nkf.copyright
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Nkf is a Kanji code converter for terminals, hosts, and networks. Nkf
@@ -30,7 +30,7 @@
 %{__mkdir_p}	$RPM_BUILD_ROOT/%{_bindir}
 %{__mkdir_p}	$RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1}
 
-%setup -q -n nkf206
+%setup -q -n %{nkfver}
 
 %build
 make nkf
@@ -56,7 +56,7 @@
 popd
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -73,6 +73,11 @@
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com> - 2.07-1
+- New upstream release.
+- use dist tag.
+- clean up the spec file.
+
 * Thu Mar 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.06-1
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 09:17:06 -0000	1.6
+++ sources	6 Jul 2006 00:33:05 -0000	1.7
@@ -1 +1 @@
-f4b07268b238ac85551e2777fa2c3836  nkf206a.tar.gz
+af11dcd3fe71d67831c020e3bfd5073b  nkf207.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul  6 00:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 20:53:13 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.291, 1.292 anaconda.spec, 1.415,
	1.416 sources, 1.413, 1.414
Message-ID: <200607060053.k660rDGD001711@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- .cvsignore	5 Jul 2006 20:58:09 -0000	1.291
+++ .cvsignore	6 Jul 2006 00:53:10 -0000	1.292
@@ -1 +1 @@
-anaconda-11.1.0.52.tar.bz2
+anaconda-11.1.0.53.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- anaconda.spec	5 Jul 2006 20:58:09 -0000	1.415
+++ anaconda.spec	6 Jul 2006 00:53:10 -0000	1.416
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.52
+Version: 11.1.0.53
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul  5 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.53-1
+- fix typo
+
 * Wed Jul  5 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.52-1
 - Add Marathi (#194572)
 - Try to let UI fit a little better in LVM dialog (#197334)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- sources	5 Jul 2006 20:58:09 -0000	1.413
+++ sources	6 Jul 2006 00:53:10 -0000	1.414
@@ -1 +1 @@
-b0da6b44a35249aa67d219001e5c9df6  anaconda-11.1.0.52.tar.bz2
+94d82f50b557372360d1d2ff48126688  anaconda-11.1.0.53.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul  6 01:11:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 21:11:59 -0400
Subject: rpms/kernel/devel linux-2.6-tux.patch,1.22,1.23
Message-ID: <200607060111.k661BwbL006357@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-tux.patch 
Log Message:
rediff fuzz affected patch.



linux-2.6-tux.patch:
 linux-2.6.16.noarch/include/linux/buffer_head.h |    1 
 linux-2.6.16.noarch/include/linux/sysctl.h      |   50 
 linux-2.6.16.noarch/net/socket.c                |   54 
 linux-2.6.17.noarch/kernel/exit.c               |    9 
 linux-2.6.17.noarch/kernel/fork.c               |    2 
 linux-tux.q/arch/alpha/kernel/systbls.S         |    8 
 linux-tux.q/arch/i386/kernel/syscall_table.S    |   10 
 linux-tux.q/arch/ia64/kernel/entry.S            |    8 
 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c       |    5 
 linux-tux.q/arch/x86_64/ia32/ia32entry.S        |   10 
 linux-tux.q/fs/dcache.c                         |   36 
 linux-tux.q/fs/exec.c                           |    2 
 linux-tux.q/fs/fcntl.c                          |    4 
 linux-tux.q/fs/namei.c                          |   18 
 linux-tux.q/fs/namespace.c                      |    2 
 linux-tux.q/fs/open.c                           |    4 
 linux-tux.q/fs/pipe.c                           |    2 
 linux-tux.q/fs/read_write.c                     |    2 
 linux-tux.q/include/asm-alpha/fcntl.h           |    1 
 linux-tux.q/include/asm-generic/fcntl.h         |    4 
 linux-tux.q/include/asm-i386/unistd.h           |    5 
 linux-tux.q/include/asm-ia64/unistd.h           |    2 
 linux-tux.q/include/asm-sparc/fcntl.h           |    1 
 linux-tux.q/include/asm-sparc64/fcntl.h         |    1 
 linux-tux.q/include/asm-x86_64/unistd.h         |   10 
 linux-tux.q/include/linux/dcache.h              |    8 
 linux-tux.q/include/linux/errno.h               |    3 
 linux-tux.q/include/linux/file.h                |    2 
 linux-tux.q/include/linux/fs.h                  |    7 
 linux-tux.q/include/linux/kmod.h                |    2 
 linux-tux.q/include/linux/namei.h               |    2 
 linux-tux.q/include/linux/net.h                 |    1 
 linux-tux.q/include/linux/sched.h               |    5 
 linux-tux.q/include/linux/skbuff.h              |    2 
 linux-tux.q/include/linux/socket.h              |    4 
 linux-tux.q/include/net/sock.h                  |    8 
 linux-tux.q/include/net/tcp.h                   |    3 
 linux-tux.q/include/net/tux.h                   |  804 ++++++++
 linux-tux.q/include/net/tux_u.h                 |  163 +
 linux-tux.q/kernel/kmod.c                       |   28 
 linux-tux.q/kernel/signal.c                     |    1 
 linux-tux.q/mm/filemap.c                        |   19 
 linux-tux.q/mm/truncate.c                       |    2 
 linux-tux.q/net/Kconfig                         |    1 
 linux-tux.q/net/Makefile                        |    1 
 linux-tux.q/net/core/sock.c                     |    5 
 linux-tux.q/net/ipv4/tcp.c                      |    1 
 linux-tux.q/net/ipv4/tcp_input.c                |    1 
 linux-tux.q/net/ipv4/tcp_output.c               |    3 
 linux-tux.q/net/tux/Kconfig                     |   25 
 linux-tux.q/net/tux/Makefile                    |   12 
 linux-tux.q/net/tux/abuf.c                      |  190 ++
 linux-tux.q/net/tux/accept.c                    |  863 +++++++++
 linux-tux.q/net/tux/cachemiss.c                 |  265 ++
 linux-tux.q/net/tux/cgi.c                       |  171 +
 linux-tux.q/net/tux/directory.c                 |  302 +++
 linux-tux.q/net/tux/extcgi.c                    |  329 +++
 linux-tux.q/net/tux/gzip.c                      |   40 
 linux-tux.q/net/tux/input.c                     |  641 +++++++
 linux-tux.q/net/tux/logger.c                    |  837 +++++++++
 linux-tux.q/net/tux/main.c                      | 1417 +++++++++++++++
 linux-tux.q/net/tux/mod.c                       |  262 ++
 linux-tux.q/net/tux/output.c                    |  352 +++
 linux-tux.q/net/tux/parser.h                    |  102 +
 linux-tux.q/net/tux/postpone.c                  |   77 
 linux-tux.q/net/tux/proc.c                      | 1149 ++++++++++++
 linux-tux.q/net/tux/proto_ftp.c                 | 1555 ++++++++++++++++
 linux-tux.q/net/tux/proto_http.c                | 2197 ++++++++++++++++++++++++
 linux-tux.q/net/tux/redirect.c                  |  172 +
 linux-tux.q/net/tux/times.c                     |  392 ++++
 linux-tux.q/net/tux/times.h                     |   26 
 linux-tux.q/net/tux/userspace.c                 |   27 
 72 files changed, 12699 insertions(+), 31 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-tux.patch	26 Jun 2006 01:38:15 -0000	1.22
+++ linux-2.6-tux.patch	6 Jul 2006 01:11:56 -0000	1.23
@@ -1763,18 +1763,17 @@
  	acct_collect(code, group_dead);
  	if (unlikely(tsk->robust_list))
  		exit_robust_list(tsk);
-Index: linux-tux.q/kernel/fork.c
-===================================================================
---- linux-tux.q.orig/kernel/fork.c
-+++ linux-tux.q/kernel/fork.c
-@@ -944,6 +944,7 @@ static task_t *copy_process(unsigned lon
- 	p = dup_task_struct(current);
+--- linux-2.6.17.noarch/kernel/fork.c~	2006-07-05 21:06:35.000000000 -0400
++++ linux-2.6.17.noarch/kernel/fork.c	2006-07-05 21:06:46.000000000 -0400
+@@ -971,6 +971,8 @@ static struct task_struct *copy_process(
  	if (!p)
  		goto fork_out;
-+	p->tux_info = NULL;
  
- 	retval = -EAGAIN;
- 	if (atomic_read(&p->user->processes) >=
++	p->tux_info = NULL;
++
+ #ifdef CONFIG_TRACE_IRQFLAGS
+ 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
+ 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
 Index: linux-tux.q/kernel/kmod.c
 ===================================================================
 --- linux-tux.q.orig/kernel/kmod.c



From fedora-cvs-commits at redhat.com  Thu Jul  6 01:23:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 21:23:59 -0400
Subject: rpms/m2crypto/devel m2crypto.spec,1.22,1.23
Message-ID: <200607060123.k661NxLf024674@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24627

Modified Files:
	m2crypto.spec 
Log Message:
* Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-2
- Fix build with rawhide swig



Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- m2crypto.spec	5 Jul 2006 23:36:12 -0000	1.22
+++ m2crypto.spec	6 Jul 2006 01:23:57 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.16
-Release: 1
+Release: 2
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 License: BSDish
 Group: System Environment/Libraries
@@ -37,7 +37,8 @@
 	LDFLAGS="$LDFLAGS`pkg-config --libs-only-L openssl`" ; export LDFLAGS
 fi
 
-python%{pythonver} setup.py build
+# -cpperraswarn is necessary for including opensslconf-${basearch} directly
+SWIG_FEATURES=-cpperraswarn python%{pythonver} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +60,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-2
+- Fix build with rawhide swig
+
 * Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-1
 - Update to m2crypto-0.16
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 01:29:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 21:29:47 -0400
Subject: rpms/redhat-lsb/devel .cvsignore, 1.5, 1.6 redhat-lsb.spec, 1.18,
	1.19 sources, 1.9, 1.10
Message-ID: <200607060129.k661Tl6B026931@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26895

Modified Files:
	.cvsignore redhat-lsb.spec sources 
Log Message:
redhat-lsb.spec updated and ready for LSB3.1 conformace test


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jan 2006 03:50:11 -0000	1.5
+++ .cvsignore	6 Jul 2006 01:29:44 -0000	1.6
@@ -1,3 +1,4 @@
 lsb-release-1.4.tar.gz
 redhat-lsb-1.3.tar.bz2
 redhat-lsb-3.0-1.tar.bz2
+redhat-lsb-3.1-1.tar.bz2


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- redhat-lsb.spec	5 Jul 2006 07:59:47 -0000	1.18
+++ redhat-lsb.spec	6 Jul 2006 01:29:44 -0000	1.19
@@ -1,5 +1,5 @@
 # Define this to link to which library version  eg. /lib64/ld-lsb-x86-64.so.3
-%define lsbsover 3 
+%define lsbsover 3.1 
 
 %ifarch %{ix86}
 %define ldso ld-linux.so.2
@@ -44,11 +44,11 @@
 
 %define upstreamlsbrelver 2.0
 %define lsbrelver 3.0
-%define srcrelease 2
+%define srcrelease 1
 
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
-Version: 3.0
+Version: 3.1
 Release: 10.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
@@ -379,6 +379,12 @@
 ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
 ln -snf mail $RPM_BUILD_ROOT/bin/mailx
 
+mkdir -p /usr/X11R6/lib/X11/xserver
+ln -snf /usr/%{_lib}/xserver/SecurityPolicy /usr/X11R6/lib/X11/xserver/SecurityPolicy
+mkdir -p /usr/X11R6/lib/X11/fonts/
+ln -snf /usr/share/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc
+ln -snf /usr/share/X11/rgb.txt /usr/X11R6/lib/X11/rgb.txt
+
 gcc -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
 install -m 700 redhat_lsb_trigger.%{_target_cpu} \
@@ -432,9 +438,13 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
-* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.0-10.1
-- Attempt to rewrite most part of the mkredhat-lsb to obtain information directly via 
-  specdb rather than sniffing through sgml
+* Thu Jul 6 2006 Lawrence Lim <llim at redhat.com> - 3.1-10.1
+- generate spec file on RHEL5-Alpha system
+- fix vsw4 test suite setup by creating symlink for X11 SecurityPolicy and XFontPath
+
+* Thu Jun 22 2006 Lawrence Lim <llim at redhat.com> - 3.0-10
+- Rewrite most part of the mkredhat-lsb to obtain information directly via specdb 
+  rather than sniffing through sgml
 - remove redundent script and bump up tarball version
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jul 2006 06:53:14 -0000	1.9
+++ sources	6 Jul 2006 01:29:44 -0000	1.10
@@ -2,3 +2,4 @@
 f535414957ea3f7810b098f4ac7e4c50  redhat-lsb-1.3.tar.bz2
 6dc78435cc0837d9d75f7298587787bc  redhat-lsb-3.0-1.tar.bz2
 64518d9c2577e6072df40d7623e22ebc  redhat-lsb-3.0-2.tar.bz2
+443f0f6ddfc0bf591225b2158f75b5a4  redhat-lsb-3.1-1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul  6 02:25:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 22:25:30 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.291,1.292
Message-ID: <200607060225.k662PU5W007666@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.
- Use tomcat plugin version instead of org.eclipse.tomcat_*.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- eclipse.spec	5 Jul 2006 22:08:40 -0000	1.291
+++ eclipse.spec	6 Jul 2006 02:25:27 -0000	1.292
@@ -1062,38 +1062,39 @@
 
 %ifnarch ppc64 s390 s390x
 ## BEGIN TOMCAT ##
-mkdir -p plugins/org.eclipse.tomcat_*/lib
-ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/lib/bootstrap.jar
-ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/lib/catalina.jar
-ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/lib/catalina-optional.jar
-ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/lib/jasper-compiler.jar
-ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/lib/jasper-runtime.jar
-ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/lib/mx4j.jar
-ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/lib/mx4j-impl.jar
-ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/lib/mx4j-jmx.jar
-ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/lib/naming-common.jar
-ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/lib/naming-factory.jar
-ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/lib/naming-resources.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/lib/servlets-common.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/lib/servlets-default.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/lib/servlets-invoker.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-logging-api
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-pool
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
+TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
+mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-http.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-util.jar
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-logging-api
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib jspapi
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib regexp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib servletapi5
 ## END TOMCAT ##
 %endif
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1581,9 +1582,12 @@
 %{_libdir}/gcj/%{name}/org.eclipse.search_*
 %{_libdir}/gcj/%{name}/org.eclipse.text_*
 %{_libdir}/gcj/%{name}/com.ibm.icu_*
-%ifnarch ppc64 s390 s390x
-# FIXME: take this out when the tomcat patch is updated
+# FIXME:  we need to symlink these
 %{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
+%{_libdir}/gcj/%{name}/jsp.jar*
+%{_libdir}/gcj/%{name}/parser.jar*
+# FIXME: take this out when tomcat is built on these arches
+%ifarch ppc64 s390 s390x
 %{_libdir}/gcj/%{name}/bootstrap.jar*
 %{_libdir}/gcj/%{name}/catalina.jar*
 %{_libdir}/gcj/%{name}/commons-beanutils.jar*
@@ -1594,12 +1598,10 @@
 %{_libdir}/gcj/%{name}/jakarta-regexp-1.3.jar*
 %{_libdir}/gcj/%{name}/jasper-compiler.jar*
 %{_libdir}/gcj/%{name}/jasper-runtime.jar*
-%{_libdir}/gcj/%{name}/jsp.jar*
 %{_libdir}/gcj/%{name}/mx4j-jmx.jar*
 %{_libdir}/gcj/%{name}/naming-common.jar*
 %{_libdir}/gcj/%{name}/naming-factory.jar*
 %{_libdir}/gcj/%{name}/naming-resources.jar*
-%{_libdir}/gcj/%{name}/parser.jar*
 %{_libdir}/gcj/%{name}/servlet.jar*
 %{_libdir}/gcj/%{name}/servlets-common.jar*
 %{_libdir}/gcj/%{name}/servlets-default.jar*
@@ -1630,6 +1632,8 @@
 - Use commons-* instead of jakarta-commons-*.
 - Don't delete jars in %%install.
 - Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).
+- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.
+- Use tomcat plugin version instead of org.eclipse.tomcat_*.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks. 



From fedora-cvs-commits at redhat.com  Thu Jul  6 03:35:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 5 Jul 2006 23:35:24 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.19,1.20 sources,1.10,1.11
Message-ID: <200607060335.k663ZOmA003376@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3347

Modified Files:
	redhat-lsb.spec sources 
Log Message:
minor adjustment to specfile to work with brew


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- redhat-lsb.spec	6 Jul 2006 01:29:44 -0000	1.19
+++ redhat-lsb.spec	6 Jul 2006 03:35:22 -0000	1.20
@@ -379,11 +379,10 @@
 ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd
 ln -snf mail $RPM_BUILD_ROOT/bin/mailx
 
-mkdir -p /usr/X11R6/lib/X11/xserver
-ln -snf /usr/%{_lib}/xserver/SecurityPolicy /usr/X11R6/lib/X11/xserver/SecurityPolicy
-mkdir -p /usr/X11R6/lib/X11/fonts/
-ln -snf /usr/share/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc
-ln -snf /usr/share/X11/rgb.txt /usr/X11R6/lib/X11/rgb.txt
+mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver
+ln -snf /usr/%{_lib}/xserver/SecurityPolicy $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xserver/SecurityPolicy
+ln -snf /usr/share/X11/fonts $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts
+ln -snf /usr/share/X11/rgb.txt  $RPM_BUILD_ROOT/usr/X11R6/lib/X11/rgb.txt
 
 gcc -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \
   -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE
@@ -423,12 +422,16 @@
 %endif
 
 %files
+/usr/X11R6/lib/X11/fonts
+/usr/X11R6/lib/X11/rgb.txt
 %defattr(-,root,root)
 /etc/redhat-lsb
 #%config /etc/lsb-release
 #/etc/redhat-lsb
 %dir /etc/lsb-release.d
 /etc/lsb-release.d/*
+%dir /usr/X11R6/lib/X11/xserver
+/usr/X11R6/lib/X11/xserver/SecurityPolicy
 %{_mandir}/*/*
 %{_bindir}/*
 /bin/mailx


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jul 2006 01:29:44 -0000	1.10
+++ sources	6 Jul 2006 03:35:22 -0000	1.11
@@ -2,4 +2,4 @@
 f535414957ea3f7810b098f4ac7e4c50  redhat-lsb-1.3.tar.bz2
 6dc78435cc0837d9d75f7298587787bc  redhat-lsb-3.0-1.tar.bz2
 64518d9c2577e6072df40d7623e22ebc  redhat-lsb-3.0-2.tar.bz2
-443f0f6ddfc0bf591225b2158f75b5a4  redhat-lsb-3.1-1.tar.bz2
+f252ed03702b93eb09e9448e48acd767  redhat-lsb-3.1-1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul  6 04:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 00:58:01 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1.bz2.sign, NONE, 1.1 .cvsignore,
	1.477, 1.478 kernel-2.6.spec, 1.2355, 1.2356 sources, 1.421,
	1.422 upstream, 1.388, 1.389 patch-2.6.17-git24.bz2.sign, 1.1,
	NONE patch-2.6.17-git25.bz2.sign, 1.1, NONE
Message-ID: <200607060458.k664w0Kg002174@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1.bz2.sign 
Removed Files:
	patch-2.6.17-git24.bz2.sign patch-2.6.17-git25.bz2.sign 
Log Message:
.18rc1 woo!



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

iD8DBQBErJEhyGugalF9Dw4RAkG3AJ9+S+YS6HYL/nqWH4eQIgD6yfSwBwCfert+
DPWdIvdqtmLSi3ejZZ/EzSA=
=it6x
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- .cvsignore	5 Jul 2006 21:12:56 -0000	1.477
+++ .cvsignore	6 Jul 2006 04:57:57 -0000	1.478
@@ -3,4 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17-git25.bz2
+patch-2.6.18-rc1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2355
retrieving revision 1.2356
diff -u -r1.2355 -r1.2356
--- kernel-2.6.spec	5 Jul 2006 22:09:05 -0000	1.2355
+++ kernel-2.6.spec	6 Jul 2006 04:57:57 -0000	1.2356
@@ -238,7 +238,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17-git25.bz2
+Patch1: patch-2.6.18-rc1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1554,6 +1554,9 @@
 %endif
 
 %changelog
+* Thu Jul  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1
+
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git25
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- sources	5 Jul 2006 21:12:57 -0000	1.421
+++ sources	6 Jul 2006 04:57:57 -0000	1.422
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-18054119579dcd9998a75d5350c55f47  patch-2.6.17-git25.bz2
+c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- upstream	5 Jul 2006 21:12:57 -0000	1.388
+++ upstream	6 Jul 2006 04:57:57 -0000	1.389
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17-git25.bz2
+patch-2.6.18-rc1.bz2


--- patch-2.6.17-git24.bz2.sign DELETED ---


--- patch-2.6.17-git25.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 04:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 00:58:01 -0400
Subject: rpms/kernel/devel/configs config-generic,1.212,1.213
Message-ID: <200607060458.k664w1js002178@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
.18rc1 woo!



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- config-generic	4 Jul 2006 21:41:26 -0000	1.212
+++ config-generic	6 Jul 2006 04:57:58 -0000	1.213
@@ -1091,6 +1091,9 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m



From fedora-cvs-commits at redhat.com  Thu Jul  6 07:17:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 03:17:46 -0400
Subject: rpms/udev/devel start_udev,1.53,1.54 udev.spec,1.173,1.174
Message-ID: <200607060717.k667Hk0R001120@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1062

Modified Files:
	start_udev udev.spec 
Log Message:
- added option to debug udev with kernel cmdline option "udevdebug"



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- start_udev	19 Apr 2006 11:44:47 -0000	1.53
+++ start_udev	6 Jul 2006 07:17:43 -0000	1.54
@@ -149,13 +149,24 @@
 	
 	ret=$[$ret + $?]
 }
+
+# returns OK if $1 contains $2
+strstr() {
+  [ "${1#*$2*}" = "$1" ] && return 1
+  return 0
+}
+
 make_extra_nodes
+cmdline=$(cat /proc/cmdline)
 kill_udevd > "$udev_root/null" 2>&1
 if [ -f "/sys/class/tty/console/uevent" ]; then
 	# trigger the sorted events
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
+	if strstr "$cmdline" debugudev; then
+		/sbin/udevcontrol log_priority=debug
+	fi
 	/sbin/udevtrigger
 	ret=$[$ret + $?]
 	wait_for_queue


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- udev.spec	5 Jul 2006 11:50:02 -0000	1.173
+++ udev.spec	6 Jul 2006 07:17:43 -0000	1.174
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Thu Jul  6 2006 Harald Hoyer <harald at redhat.com> - 095-2
+- added option to debug udev with kernel cmdline option "udevdebug"
+
 * Wed Jul  5 2006 Harald Hoyer <harald at redhat.com> - 095-1
 - version 095
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 07:18:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 03:18:06 -0400
Subject: rpms/udev/devel start_udev,1.54,1.55
Message-ID: <200607060718.k667I6dd001269@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1240

Modified Files:
	start_udev 
Log Message:



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- start_udev	6 Jul 2006 07:17:43 -0000	1.54
+++ start_udev	6 Jul 2006 07:18:04 -0000	1.55
@@ -164,7 +164,7 @@
 	echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 	/sbin/udevd -d
 	ret=$[$ret + $?]
-	if strstr "$cmdline" debugudev; then
+	if strstr "$cmdline" udevdebug; then
 		/sbin/udevcontrol log_priority=debug
 	fi
 	/sbin/udevtrigger



From fedora-cvs-commits at redhat.com  Thu Jul  6 09:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 05:26:40 -0400
Subject: rpms/setup/devel .cvsignore, 1.33, 1.34 setup.spec, 1.38,
	1.39 sources, 1.34, 1.35
Message-ID: <200607060926.k669Qef3008416@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/setup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8312

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
- Lock password for root account by default (#182206)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	21 Mar 2006 12:28:31 -0000	1.33
+++ .cvsignore	6 Jul 2006 09:26:37 -0000	1.34
@@ -1 +1 @@
-setup-2.5.50.tar.bz2
+setup-2.5.52.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- setup.spec	21 Mar 2006 12:28:31 -0000	1.38
+++ setup.spec	6 Jul 2006 09:26:37 -0000	1.39
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files.
 Name: setup
-Version: 2.5.50
+Version: 2.5.52
 Release: 1
 License: public domain
 Group: System Environment/Base
@@ -76,6 +76,12 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Mon Jun 19 2006 Phil Knirsch <pknirsch at redhat.com> 2.5.52-1
+- Lock password for root account by default (#182206)
+
+* Wed May 03 2006 Karsten Hopp <karsten at redhat.de>
+- remove gkrellmd from the reserved uid/gid list (#186974)
+
 * Tue Mar 21 2006 Florian La Roche <laroche at redhat.com> 2.5.50-1
 - use stricter umask of 022 for all logins
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	21 Mar 2006 12:28:31 -0000	1.34
+++ sources	6 Jul 2006 09:26:37 -0000	1.35
@@ -1 +1 @@
-ed528e3feec744b86fa4394d25b2b66c  setup-2.5.50.tar.bz2
+14a22d17fa5077200c7989179f32d0af  setup-2.5.52.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul  6 09:51:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 05:51:59 -0400
Subject: rpms/scim-anthy/devel scim-anthy.spec,1.28,1.29
Message-ID: <200607060951.k669pxPj029802@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	scim-anthy.spec 
Log Message:
* Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com>
- use dist tag.


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- scim-anthy.spec	31 Mar 2006 07:33:54 -0000	1.28
+++ scim-anthy.spec	6 Jul 2006 09:51:57 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           scim-anthy
 Version:        1.0.0
-Release:	2.fc6
+Release:	2%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -13,7 +13,7 @@
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
-Patch1:        scim-anthy-helper-moduledir.patch
+Patch1:		scim-anthy-helper-moduledir.patch
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com>
+- use dist tag.
+
 * Fri Mar 31 2006 Jens Petersen <petersen at redhat.com> - 1.0.0-2
 - rebuild without libstdc++so7
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 12:17:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 08:17:41 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.18, 1.19 m17n-db.spec, 1.25,
	1.26 sources, 1.20, 1.21
Message-ID: <200607061217.k66CHf5M026095@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Added key summaries to various keymaps



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	29 Jun 2006 10:29:20 -0000	1.18
+++ .cvsignore	6 Jul 2006 12:17:39 -0000	1.19
@@ -7,3 +7,4 @@
 m17n-db-indic-0.4.5.tar.gz
 m17n-db-indic-0.4.6.tar.gz
 m17n-db-indic-0.4.7.tar.gz
+m17n-db-indic-0.4.8.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- m17n-db.spec	29 Jun 2006 10:29:20 -0000	1.25
+++ m17n-db.spec	6 Jul 2006 12:17:39 -0000	1.26
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.7
+%define indic_ver 0.4.8
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,9 @@
 
 
 %changelog
+* Thu Jul 6 2006 Mayank Jain <majain at redhat.com>
+- Added key summaries in various keymaps
+
 * Thu Jun 29 2006 Mayank Jain <majain at redhat.com>
 - Added hi-remington keymap - <rranjan at redhat.com>
 - Added hi-remington.png - <aalam at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Jun 2006 10:29:20 -0000	1.20
+++ sources	6 Jul 2006 12:17:39 -0000	1.21
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-c725c5b9130db2de71cdb67d15a2caa9  m17n-db-indic-0.4.7.tar.gz
+f8a77a5aa6d838d89bdb37a69072a764  m17n-db-indic-0.4.8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul  6 12:28:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 08:28:31 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.20,1.21
Message-ID: <200607061228.k66CSVfK030158@cvs.devel.redhat.com>

Author: llim

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30114

Modified Files:
	redhat-lsb.spec 
Log Message:
revert ld-lsb.so version to 3 rather than 3.1


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- redhat-lsb.spec	6 Jul 2006 03:35:22 -0000	1.20
+++ redhat-lsb.spec	6 Jul 2006 12:28:29 -0000	1.21
@@ -1,5 +1,5 @@
 # Define this to link to which library version  eg. /lib64/ld-lsb-x86-64.so.3
-%define lsbsover 3.1 
+%define lsbsover 3 
 
 %ifarch %{ix86}
 %define ldso ld-linux.so.2
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.1
-Release: 10.1
+Release: 10.2
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
@@ -441,6 +441,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Thu Jul 6 2006 Lawrence Lim <llim at redhat.com> - 3.1-10.2
+- for some strange reason, ld-lsb-x86-64.so need to be ld-lsb-x86-64.so.3 (LSB3.0) rather than ld-lsb-x86-64.so.3.1 (LSB3.1)
+
 * Thu Jul 6 2006 Lawrence Lim <llim at redhat.com> - 3.1-10.1
 - generate spec file on RHEL5-Alpha system
 - fix vsw4 test suite setup by creating symlink for X11 SecurityPolicy and XFontPath



From fedora-cvs-commits at redhat.com  Thu Jul  6 12:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 08:54:30 -0400
Subject: rpms/eclipse/devel eclipse-webapp-tomcat55-newarches.patch, NONE,
	1.1 eclipse.spec, 1.292, 1.293
Message-ID: <200607061254.k66CsUJt020220@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-webapp-tomcat55-newarches.patch 
Log Message:
* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Temporarily add webapp patch for ppc64, s390, and s390x.


eclipse-webapp-tomcat55-newarches.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-webapp-tomcat55-newarches.patch ---
--- build.xml.orig	2006-07-06 08:52:15.000000000 -0400
+++ build.xml	2006-07-06 08:52:37.000000000 -0400
@@ -170,6 +170,7 @@
 		<!-- generate java code from JSPs -->
 		<path id="jasper.classpath" > 
 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
+			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
 			<pathelement location="../org.apache.ant/lib/optional.jar"/>
 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
@@ -181,10 +182,9 @@
 		<java
 			classname="org.apache.jasper.JspC"
 			fork="true"
-			failonerror="false"
+			failonerror="true"
 			classpathref="jasper.classpath"
 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
-			<arg value="-v3" />
 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
 			<arg value="-die" />
 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- eclipse.spec	6 Jul 2006 02:25:27 -0000	1.292
+++ eclipse.spec	6 Jul 2006 12:54:28 -0000	1.293
@@ -109,6 +109,7 @@
 Patch30: 	%{name}-tomcat55-build.2.patch
 Patch50:        %{name}-tomcat55-build.3.patch
 Patch31: 	%{name}-webapp-tomcat55.patch
+Patch56: 	%{name}-webapp-tomcat55-newarches.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
@@ -407,6 +408,11 @@
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
+# FIXME:  this is just until tomcat is built on these arches
+%else
+pushd plugins/org.eclipse.help.webapp
+%patch56 -p0
+popd
 %endif
 pushd plugins/org.eclipse.compare
 #%patch33 -p0
@@ -1608,7 +1614,7 @@
 %{_libdir}/gcj/%{name}/servlets-invoker.jar*
 %{_libdir}/gcj/%{name}/servlets-manager.jar*
 %{_libdir}/gcj/%{name}/tomcat-coyote.jar*
-%{_libdir}/gcj/%{name}/tomcat-http.jar*
+%{_libdir}/gcj/%{name}/tomcat-http11.jar*
 %{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
 %endif
@@ -1625,6 +1631,9 @@
 %endif
 
 %changelog
+* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
+- Temporarily add webapp patch for ppc64, s390, and s390x.
+
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.
 - org.eclipse.tomcat -> org.eclipse.tomcat/lib.



From fedora-cvs-commits at redhat.com  Thu Jul  6 13:18:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 09:18:02 -0400
Subject: rpms/kdepim/devel kdepim-3.5.3-kde#118112.patch, NONE,
	1.1 kdepim.spec, 1.88, 1.89
Message-ID: <200607061318.k66DI2CB004072@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.3-kde#118112.patch 
Log Message:
- apply upstream patches,
   fix bugs: 110487, 118112, 119112, 121384, 127210, 130303


kdepim-3.5.3-kde#118112.patch:
 kmaccount.cpp  |    5 ++++-
 popaccount.cpp |   50 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 21 deletions(-)

--- NEW FILE kdepim-3.5.3-kde#118112.patch ---
Index: kmail/kmaccount.cpp
===================================================================
--- kmail/kmaccount.cpp	(Revision 558672)
+++ kmail/kmaccount.cpp	(Revision 558673)
@@ -444,8 +444,11 @@
   if (mTimer)
     mTimer->start(mInterval*60000);
   if ( mMailCheckProgressItem ) {
-    mMailCheckProgressItem->setComplete(); // that will delete it
+    // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
+    // a race condition
+    ProgressItem *savedMailCheckProgressItem = mMailCheckProgressItem;
     mMailCheckProgressItem = 0;
+    savedMailCheckProgressItem->setComplete(); // that will delete it
   }
 
   emit newMailsProcessed( mNewInFolder );
Index: kmail/popaccount.cpp
===================================================================
--- kmail/popaccount.cpp	(Revision 558672)
+++ kmail/popaccount.cpp	(Revision 558673)
@@ -348,8 +348,9 @@
 void PopAccount::slotAbortRequested()
 {
   if (stage == Idle) return;
-  disconnect( mMailCheckProgressItem, SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
-           this, SLOT( slotAbortRequested() ) );
+  if ( mMailCheckProgressItem )
+    disconnect( mMailCheckProgressItem, SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ),
+                this, SLOT( slotAbortRequested() ) );
   stage = Quit;
   if (job) job->kill();
   job = 0;
@@ -655,7 +656,8 @@
     processMsgsTimer.start(processingDelay);
   }
   else if (stage == Retr) {
-    mMailCheckProgressItem->setProgress( 100 );
+    if ( mMailCheckProgressItem )
+      mMailCheckProgressItem->setProgress( 100 );
     processRemainingQueuedMessages();
 
     mHeaderDeleteUids.clear();
@@ -732,20 +734,22 @@
     // If there are messages to delete then delete them
     if ( !idsOfMsgsToDelete.isEmpty() ) {
       stage = Dele;
-      mMailCheckProgressItem->setStatus(
-        i18n( "Fetched 1 message from %1. Deleting messages from server...",
-              "Fetched %n messages from %1. Deleting messages from server...",
-              numMsgs )
-        .arg( mHost ) );
+      if ( mMailCheckProgressItem )
+        mMailCheckProgressItem->setStatus(
+          i18n( "Fetched 1 message from %1. Deleting messages from server...",
+                "Fetched %n messages from %1. Deleting messages from server...",
+                numMsgs )
+          .arg( mHost ) );
       url.setPath("/remove/" + idsOfMsgsToDelete.join(","));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     } else {
       stage = Quit;
-      mMailCheckProgressItem->setStatus(
-        i18n( "Fetched 1 message from %1. Terminating transmission...",
-              "Fetched %n messages from %1. Terminating transmission...",
-              numMsgs )
-        .arg( mHost ) );
+      if ( mMailCheckProgressItem )
+        mMailCheckProgressItem->setStatus(
+          i18n( "Fetched 1 message from %1. Terminating transmission...",
+                "Fetched %n messages from %1. Terminating transmission...",
+                numMsgs )
+          .arg( mHost ) );
       url.setPath(QString("/commit"));
       kdDebug(5006) << "url: " << url.prettyURL() << endl;
     }
@@ -760,11 +764,12 @@
       mUidsOfNextSeenMsgsDict.remove( mUidForIdMap[*it] );
     }
     idsOfMsgsToDelete.clear();
-    mMailCheckProgressItem->setStatus(
-      i18n( "Fetched 1 message from %1. Terminating transmission...",
-            "Fetched %n messages from %1. Terminating transmission...",
-            numMsgs )
-      .arg( mHost ) );
+    if ( mMailCheckProgressItem )
+      mMailCheckProgressItem->setStatus(
+        i18n( "Fetched 1 message from %1. Terminating transmission...",
+              "Fetched %n messages from %1. Terminating transmission...",
+              numMsgs )
+        .arg( mHost ) );
     KURL url = getUrl();
     url.setPath(QString("/commit"));
     job = KIO::get( url, false, false );
@@ -783,8 +788,11 @@
       int numMessages = canceled ? indexOfCurrentMsg : idsOfMsgs.count();
       BroadcastStatus::instance()->setStatusMsgTransmissionCompleted(
         this->name(), numMessages, numBytes, numBytesRead, numBytesToRead, mLeaveOnServer, mMailCheckProgressItem );
-      mMailCheckProgressItem->setComplete();
+      // set mMailCheckProgressItem = 0 before calling setComplete() to prevent
+      // a race condition
+      ProgressItem *savedMailCheckProgressItem = mMailCheckProgressItem;
       mMailCheckProgressItem = 0;
+      savedMailCheckProgressItem->setComplete(); // that will delete it
       checkDone( ( numMessages > 0 ), canceled ? CheckAborted : CheckOK );
     }
   }
@@ -873,7 +881,9 @@
       numMsgBytesRead = curMsgLen;
     numBytesRead += numMsgBytesRead - oldNumMsgBytesRead;
     dataCounter++;
-    if (dataCounter % 5 == 0)
+    if ( mMailCheckProgressItem &&
+         ( dataCounter % 5 == 0 ||
+           ( indexOfCurrentMsg + 1 == numMsgs && numMsgBytesRead == curMsgLen ) ) )
     {
       QString msg;
       if (numBytes != numBytesToRead && mLeaveOnServer)


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdepim.spec	27 Jun 2006 16:36:50 -0000	1.88
+++ kdepim.spec	6 Jul 2006 13:17:57 -0000	1.89
@@ -10,10 +10,8 @@
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 3
+Release: 4
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -37,6 +35,7 @@
 Patch101: kdepim-3.5.3-kmail-typo.patch
 Patch102: kdepim-3.5.3-kmail-encryption.patch
 Patch103: kdepim-3.5.3-kmail-127538.patch
+Patch104: kdepim-3.5.3-kde#11811.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -128,6 +127,7 @@
 %patch101 -p1 -b .kmail-typo
 %patch102 -p1 -b .kmail-encryption
 %patch103 -p1 -b .kmail-127538.patch
+%patch104 -p0 -b .kde#11811
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -142,9 +142,7 @@
    --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
@@ -226,6 +224,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
+- apply upstream patches,
+   fix bugs: 110487, 118112, 119112, 121384, 127210, 130303
+
 * Tue Jun 27 2006 Than Ngo <than at redhat.com> 6:3.5.3-3
 - fix #196741, BR: libXpm-devel libXScrnSaver-devel
 - apply upstream patches



From fedora-cvs-commits at redhat.com  Thu Jul  6 14:41:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 10:41:48 -0400
Subject: rpms/kernel/devel ipsec-flow-41.patch, NONE,
	1.1.2.1 ipsec-lspp-41.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.2293.2.5, 1.2293.2.6 ipsec-lspp-38.patch, 1.1.2.1, NONE
Message-ID: <200607061441.k66EfmDN014737@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	ipsec-flow-41.patch ipsec-lspp-41.patch 
Removed Files:
      Tag: private-lspp-37-branch
	ipsec-lspp-38.patch 
Log Message:
* Thu Jul  6 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 42, add updated ipsec patches from Venkat


ipsec-flow-41.patch:
 Documentation/networking/flow_sid.txt |   12 ++++++++++++
 include/linux/security.h              |   29 +++++++++++++++++++----------
 include/net/route.h                   |    3 +++
 net/dccp/ipv4.c                       |    1 +
 net/dccp/ipv6.c                       |    6 ++++++
 net/ipv4/af_inet.c                    |    1 +
 net/ipv4/icmp.c                       |    2 ++
 net/ipv4/inet_connection_sock.c       |    1 +
 net/ipv4/ip_gre.c                     |    2 ++
 net/ipv4/ip_output.c                  |    2 ++
 net/ipv4/ipip.c                       |    3 +++
 net/ipv4/netfilter/ipt_REJECT.c       |    1 +
 net/ipv4/raw.c                        |    1 +
 net/ipv4/syncookies.c                 |    1 +
 net/ipv4/udp.c                        |    1 +
 net/ipv6/af_inet6.c                   |    1 +
 net/ipv6/datagram.c                   |    2 ++
 net/ipv6/icmp.c                       |    2 ++
 net/ipv6/inet6_connection_sock.c      |    1 +
 net/ipv6/ndisc.c                      |    1 +
 net/ipv6/netfilter/ip6t_REJECT.c      |    1 +
 net/ipv6/raw.c                        |    1 +
 net/ipv6/sit.c                        |    1 +
 net/ipv6/tcp_ipv6.c                   |    7 +++++++
 net/ipv6/udp.c                        |    2 ++
 net/xfrm/xfrm_policy.c                |    3 +--
 security/dummy.c                      |    4 ++--
 security/selinux/hooks.c              |    9 ++++++---
 security/selinux/include/xfrm.h       |    2 +-
 security/selinux/xfrm.c               |   11 +++++++----
 30 files changed, 92 insertions(+), 22 deletions(-)

--- NEW FILE ipsec-flow-41.patch ---
>From vyekkirala at trustedcs.com Wed Jul  5 20:22:29 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 05 Jul 2006 20:23:12 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k660NCel008280;
	Wed, 5 Jul 2006 20:23:12 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k660NBTc022322;
	Wed, 5 Jul 2006 20:23:11 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k660N5Rs028162;
	Wed, 5 Jul 2006 20:23:05 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id AD73972FE8; Wed,  5 Jul 2006 20:23:05 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k660N3hB013957 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 5 Jul 2006 20:23:03 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k660N31v022314; Wed, 5 Jul 2006 20:23:03 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k660N1Bu032310; Wed, 5 Jul 2006 20:23:01 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k660MfQJ001065;
	Wed, 5 Jul 2006 20:22:41 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed Jul  5 20:22:40 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 <B44ac57d00000>; Wed, 05 Jul 2006 20:22:40 -0400
Received: from [10.1.10.204] (VYEKKIRALA-PC [10.1.10.204]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id N4CXJM6B; Wed, 5 Jul 2006 20:22:38 -0400
Message-ID: <44AC57C5.2030007 at trustedcs.com>
Date: Wed, 05 Jul 2006 19:22:29 -0500
From: Venkat Yekkirala <vyekkirala at trustedcs.com>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: redhat-lspp at redhat.com,
 jmorris at redhat.com,
 latten at austin.ibm.com,
 sds at tycho.nsa.gov,
 tjaeger at cse.psu.edu
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-loop: redhat-lspp at redhat.com
Cc: 
Subject: [redhat-lspp] [RFC][PATCH 2/2] MLSXFRM: Flow labeling outside of
	socket context
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-UID: 73261
X-Length: 29464

(WILL BREAK THIS UP FOR UPSTREAM)
The following takes the labeling of flows close to their origination points,
and takes the label from either the socket, if any, or the incoming packet
as the case may be.

This has been done by going thru the code paths for xfrm_lookup, ip_route_output_flow,
and ip_route_output_key, and deriving the sid for the flow from approproiate sources
as described earlier.

The following aren't addressed in this round. These will however still be able to use
single-labeled associations like they currently do as defined by policy, and as such
I currently do not have any plans to add support for them.

ipmr
ip_gre
ipip
igmp
sit
sctp
ip6_tunnel (IPv6 over IPv6 tunnel device)
decnet

A follow up patch in a couple of days will address auto-labeling of TCP child sockets.

This has only barely been tested so I would appreciate review/testing/comments from
the lspp community. Also, anyone interested, please feel free to take on one or more
of the unsupported items listed above.

---

 Documentation/networking/flow_sid.txt |   12 +++++++++
 include/linux/security.h              |   29 +++++++++++++++---------
 include/net/route.h                   |    3 ++
 net/dccp/ipv4.c                       |    1 
 net/dccp/ipv6.c                       |    6 ++++
 net/ipv4/af_inet.c                    |    1 
 net/ipv4/icmp.c                       |    2 +
 net/ipv4/inet_connection_sock.c       |    1 
 net/ipv4/ip_gre.c                     |    2 +
 net/ipv4/ip_output.c                  |    2 +
 net/ipv4/ipip.c                       |    3 ++
 net/ipv4/netfilter/ipt_REJECT.c       |    1 
 net/ipv4/raw.c                        |    1 
 net/ipv4/syncookies.c                 |    1 
 net/ipv4/udp.c                        |    1 
 net/ipv6/af_inet6.c                   |    1 
 net/ipv6/datagram.c                   |    2 +
 net/ipv6/icmp.c                       |    2 +
 net/ipv6/inet6_connection_sock.c      |    1 
 net/ipv6/ndisc.c                      |    1 
 net/ipv6/netfilter/ip6t_REJECT.c      |    1 
 net/ipv6/raw.c                        |    1 
 net/ipv4/syncookies.c                 |    1 
 net/ipv4/udp.c                        |    1 
 net/ipv6/af_inet6.c                   |    1 
 net/ipv6/datagram.c                   |    2 +
 net/ipv6/icmp.c                       |    2 +
 net/ipv6/inet6_connection_sock.c      |    1 
 net/ipv6/ndisc.c                      |    1 
 net/ipv6/netfilter/ip6t_REJECT.c      |    1 
 net/ipv6/raw.c                        |    1 
 net/ipv6/sit.c                        |    1 
 net/ipv6/tcp_ipv6.c                   |    7 +++++
 net/ipv6/udp.c                        |    2 +
 net/xfrm/xfrm_policy.c                |    3 --
 security/dummy.c                      |    4 +--
 security/selinux/hooks.c              |    9 ++++---
 security/selinux/include/xfrm.h       |    2 -
 security/selinux/xfrm.c               |   11 +++++----
 30 files changed, 92 insertions(+), 22 deletions(-)


--- linux-2.6.17.i686.patch11.1/Documentation/networking/flow_sid.txt	1969-12-31 18:00:00.000000000 -0600
+++ linux-2.6.17.i686/Documentation/networking/flow_sid.txt	2006-07-05 17:16:13.000000000 -0500
@@ -0,0 +1,12 @@
+The sid member in the flow structure is used by LSMs (e.g. SELinux) to indicate
+the label of the flow. This label of the flow is currently used in selecting
+matching labeled xfrm(s).
+
+If this is an outbound flow, the label is derived from the socket, if any, or
+the incoming packet this flow is being generated as a response to (e.g. tcp
+resets, timewait ack, etc.). It is also conceivable that the label could be
+derived from other sources such as process context, device, etc., in special
+cases, as may be appropriate.
+
+If this is an inbound flow, the label is derived from the IPSec security
+associations, if any, used by the packet.
--- linux-2.6.17.i686.patch11.1/include/linux/security.h	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/include/linux/security.h	2006-07-05 14:51:16.000000000 -0500
@@ -859,7 +859,8 @@ struct swap_info_struct;
  *	Return 1 if there is a match.
  * @xfrm_decode_session:
  *	@skb points to skb to decode.
- *	@fl points to the flow key to set.
+ *	@sid points to the flow key sid to set.
+ *	@ckall says if all xfrms used should be checked for same sid.
  *	Return 0 if successful decoding.
  *
  * Security hooks affecting all Key Management operations
@@ -1313,7 +1314,7 @@ struct security_operations {
 	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
 	void (*sk_free_security) (struct sock *sk);
 	void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
-	unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
+	void (*sk_getsid) (struct sock *sk, u32 *sid);
 #endif	/* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -1328,7 +1329,7 @@ struct security_operations {
 	int (*xfrm_state_pol_flow_match)(struct xfrm_state *x,
 			struct xfrm_policy *xp, struct flowi *fl);
 	int (*xfrm_flow_state_match)(struct flowi *fl, struct xfrm_state *xfrm);
-	int (*xfrm_decode_session)(struct sk_buff *skb, struct flowi *fl);
+	int (*xfrm_decode_session)(struct sk_buff *skb, u32 *sid, int ckall);
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 	/* key management security hooks */
@@ -2818,9 +2819,9 @@ static inline void security_sk_clone(con
 	return security_ops->sk_clone_security(sk, newsk);
 }
 
-static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
+static inline void security_sk_sid(struct sock *sk, u32 *sid)
 {
-	return security_ops->sk_getsid(sk, fl, dir);
+	security_ops->sk_getsid(sk, sid);
 }
 #else	/* CONFIG_SECURITY_NETWORK */
 static inline int security_unix_stream_connect(struct socket * sock,
@@ -2950,9 +2951,8 @@ static inline void security_sk_clone(con
 {
 }
 
-static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
+static inline void security_sk_sid(struct sock *sk, u32 *sid)
 {
-	return 0;
 }
 #endif	/* CONFIG_SECURITY_NETWORK */
 
@@ -3005,9 +3005,14 @@ static inline int security_xfrm_flow_sta
 	return security_ops->xfrm_flow_state_match(fl, xfrm);
 }
 
-static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *sid)
+{
+	return security_ops->xfrm_decode_session(skb, sid, 1);
+}
+
+static inline void security_xfrm_skb_sid(struct sk_buff *skb, u32 *sid)
 {
-	return security_ops->xfrm_decode_session(skb, fl);
+	BUG_ON(security_ops->xfrm_decode_session(skb, sid, 0));
 }
 #else	/* CONFIG_SECURITY_NETWORK_XFRM */
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
@@ -3057,11 +3062,15 @@ static inline int security_xfrm_flow_sta
 	return 1;
 }
 
-static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *sid)
 {
 	return 0;
 }
 
+static inline void security_xfrm_skb_sid(struct sk_buff *skb, u32 *sid)
+{
+}
+
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 #ifdef CONFIG_KEYS
--- linux-2.6.17.i686.patch11.1/include/net/route.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/include/net/route.h	2006-07-05 14:44:23.000000000 -0500
@@ -33,6 +33,7 @@
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
+#include <linux/security.h>
 
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.
@@ -167,6 +168,7 @@ static inline int ip_route_connect(struc
 		ip_rt_put(*rp);
 		*rp = NULL;
 	}
+	security_sk_sid(sk, &fl.sid);
 	return ip_route_output_flow(rp, &fl, sk, 0);
 }
 
@@ -183,6 +185,7 @@ static inline int ip_route_newports(stru
 		fl.proto = protocol;
 		ip_rt_put(*rp);
 		*rp = NULL;
+		security_sk_sid(sk, &fl.sid);
 		return ip_route_output_flow(rp, &fl, sk, 0);
 	}
 	return 0;
--- linux-2.6.17.i686.patch11.1/security/dummy.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/security/dummy.c	2006-07-05 14:44:23.000000000 -0500
@@ -793,7 +793,7 @@ static inline void dummy_sk_clone_securi
 {
 }
 
-static unsigned int dummy_sk_getsid(struct sock *sk, struct flowi *fl, u8 dir)
+static unsigned int dummy_sk_getsid(struct sock *sk)
 {
 	return 0;
 }
@@ -840,7 +840,7 @@ static int dummy_xfrm_flow_state_match(s
 	return 1;
 }
 
-static int dummy_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+static int dummy_xfrm_decode_session(struct sk_buff *skb, u32 *fl, int ckall)
 {
 	return 0;
 }
--- linux-2.6.17.i686.patch11.1/security/selinux/hooks.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/hooks.c	2006-07-05 14:54:56.000000000 -0500
@@ -3436,13 +3436,13 @@ static void selinux_sk_clone_security(co
 	newssec->peer_sid = ssec->peer_sid;
 }
 
-static unsigned int selinux_sk_getsid_security(struct sock *sk, struct flowi *fl, u8 dir)
+static void selinux_sk_getsid_security(struct sock *sk, u32 *sid)
 {
 	struct inode_security_struct *isec;
 	u32 sock_sid = SECINITSID_ANY_SOCKET;
 
 	if (!sk)
-		return selinux_no_sk_sid(fl);
+		goto out;
 
 	read_lock_bh(&sk->sk_callback_lock);
 	isec = get_sock_isec(sk);
@@ -3455,7 +3455,10 @@ static unsigned int selinux_sk_getsid_se
 	}
 
 	read_unlock_bh(&sk->sk_callback_lock);
-	return sock_sid;
+
+out:
+	*sid = sock_sid;
+	return;
 }
 
 static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
--- linux-2.6.17.i686.patch11.1/security/selinux/include/xfrm.h	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/xfrm.h	2006-07-05 14:44:23.000000000 -0500
@@ -17,7 +17,7 @@ int selinux_xfrm_policy_lookup(struct xf
 int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,
 			struct flowi *fl);
 int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm);
-int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl);
+int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *fl, int ckall);
 
 /*
  * Extract the security blob from the sock (it's actually on the socket)
--- linux-2.6.17.i686.patch11.1/security/selinux/xfrm.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/xfrm.c	2006-07-05 14:44:23.000000000 -0500
@@ -159,11 +159,11 @@ int selinux_xfrm_flow_state_match(struct
  * LSM hook implementation that determines the sid for the session.
  */
 
-int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall)
 {
 	struct sec_path *sp;
 
-	fl->sid = SECSID_NULL;
+	*sid = SECSID_NULL;
 
 	if (skb == NULL)
 		return 0;
@@ -178,10 +178,13 @@ int selinux_xfrm_decode_session(struct s
 				struct xfrm_sec_ctx *ctx = x->security;
 
 				if (!sid_set) {
-					fl->sid = ctx->ctx_sid;
+					*sid = ctx->ctx_sid;
 					sid_set = 1;
+
+					if (!ckall)
+						break;
 				}
-				else if (fl->sid != ctx->ctx_sid)
+				else if (*sid != ctx->ctx_sid)
 					return -EINVAL;
 			}
 		}
--- linux-2.6.17.i686.patch11.1/net/dccp/ipv4.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/dccp/ipv4.c	2006-07-05 14:44:23.000000000 -0500
@@ -680,6 +680,7 @@ static struct dst_entry* dccp_v4_route_s
 			   	     }
 			  };
 
+	security_xfrm_skb_sid(skb, &fl.sid);
 	if (ip_route_output_flow(&rt, &fl, sk, 0)) {
 		IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
 		return NULL;
--- linux-2.6.17.i686.patch11.1/net/dccp/ipv6.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/dccp/ipv6.c	2006-07-05 14:44:23.000000000 -0500
@@ -201,6 +201,7 @@ static int dccp_v6_connect(struct sock *
 	fl.oif = sk->sk_bound_dev_if;
 	fl.fl_ip_dport = usin->sin6_port;
 	fl.fl_ip_sport = inet->sport;
+	security_sk_sid(sk, &fl.sid);
 
 	if (np->opt != NULL && np->opt->srcrt != NULL) {
 		const struct rt0_hdr *rt0 = (struct rt0_hdr *)np->opt->srcrt;
@@ -322,6 +323,7 @@ static void dccp_v6_err(struct sk_buff *
 			fl.oif = sk->sk_bound_dev_if;
 			fl.fl_ip_dport = inet->dport;
 			fl.fl_ip_sport = inet->sport;
+			security_sk_sid(sk, &fl.sid);
 
 			err = ip6_dst_lookup(sk, &dst, &fl);
 			if (err) {
@@ -422,6 +424,7 @@ static int dccp_v6_send_response(struct 
 	fl.oif = ireq6->iif;
 	fl.fl_ip_dport = inet_rsk(req)->rmt_port;
 	fl.fl_ip_sport = inet_sk(sk)->sport;
+	security_sk_sid(sk, &fl.sid);
 
 	if (dst == NULL) {
 		opt = np->opt;
@@ -566,6 +569,7 @@ static void dccp_v6_ctl_send_reset(struc
 	fl.oif = inet6_iif(rxskb);
 	fl.fl_ip_dport = dh->dccph_dport;
 	fl.fl_ip_sport = dh->dccph_sport;
+	security_xfrm_skb_sid(rxskb, &fl.sid);
 
 	/* sk = NULL, but it is safe for now. RST socket required. */
 	if (!ip6_dst_lookup(NULL, &skb->dst, &fl)) {
@@ -622,6 +626,7 @@ static void dccp_v6_reqsk_send_ack(struc
 	fl.oif = inet6_iif(rxskb);
 	fl.fl_ip_dport = dh->dccph_dport;
 	fl.fl_ip_sport = dh->dccph_sport;
+	security_xfrm_skb_sid(rxskb, &fl.sid);
 
 	if (!ip6_dst_lookup(NULL, &skb->dst, &fl)) {
 		if (xfrm_lookup(&skb->dst, &fl, NULL, 0) >= 0) {
@@ -843,6 +848,7 @@ static struct sock *dccp_v6_request_recv
 		fl.oif = sk->sk_bound_dev_if;
 		fl.fl_ip_dport = inet_rsk(req)->rmt_port;
 		fl.fl_ip_sport = inet_sk(sk)->sport;
+		security_sk_sid(sk, &fl.sid);
 
 		if (ip6_dst_lookup(sk, &dst, &fl))
 			goto out;
--- linux-2.6.17.i686.patch11.1/net/ipv4/af_inet.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/af_inet.c	2006-07-05 14:44:23.000000000 -0500
@@ -1076,6 +1076,7 @@ int inet_sk_rebuild_header(struct sock *
 		},
 	};
 						
+	security_sk_sid(sk, &fl.sid);
 	err = ip_route_output_flow(&rt, &fl, sk, 0);
 }
 	if (!err)
--- linux-2.6.17.i686.patch11.1/net/ipv4/icmp.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/icmp.c	2006-07-05 14:44:23.000000000 -0500
@@ -407,6 +407,7 @@ static void icmp_reply(struct icmp_bxm *
 						.saddr = rt->rt_spec_dst,
 						.tos = RT_TOS(skb->nh.iph->tos) } },
 				    .proto = IPPROTO_ICMP };
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl))
 			goto out_unlock;
 	}
@@ -561,6 +562,7 @@ void icmp_send(struct sk_buff *skb_in, i
 				}
 			}
 		};
+		security_xfrm_skb_sid(skb_in, &fl.sid);
 		if (ip_route_output_key(&rt, &fl))
 			goto out_unlock;
 	}
--- linux-2.6.17.i686.patch11.1/net/ipv4/inet_connection_sock.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/inet_connection_sock.c	2006-07-05 14:44:23.000000000 -0500
@@ -328,6 +328,7 @@ struct dst_entry* inet_csk_route_req(str
 				       { .sport = inet_sk(sk)->sport,
 					 .dport = ireq->rmt_port } } };
 
+	security_sk_sid(sk, &fl.sid);
 	if (ip_route_output_flow(&rt, &fl, sk, 0)) {
 		IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);
 		return NULL;
--- linux-2.6.17.i686.patch11.1/net/ipv4/ip_gre.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/ip_gre.c	2006-07-05 14:44:23.000000000 -0500
@@ -479,6 +479,7 @@ out:
 	fl.fl4_dst = eiph->saddr;
 	fl.fl4_tos = RT_TOS(eiph->tos);
 	fl.proto = IPPROTO_GRE;
+	security_xfrm_skb_sid(skb, &fl.sid);
 	if (ip_route_output_key(&rt, &fl)) {
 		kfree_skb(skb2);
 		return;
@@ -492,6 +493,7 @@ out:
 		fl.fl4_dst = eiph->daddr;
 		fl.fl4_src = eiph->saddr;
 		fl.fl4_tos = eiph->tos;
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl) ||
 		    rt->u.dst.dev->type != ARPHRD_IPGRE) {
 			ip_rt_put(rt);
--- linux-2.6.17.i686.patch11.1/net/ipv4/ipip.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/ipip.c	2006-07-05 14:44:23.000000000 -0500
@@ -411,6 +411,7 @@ out:
 	fl.fl4_daddr = eiph->saddr;
 	fl.fl4_tos = RT_TOS(eiph->tos);
 	fl.proto = IPPROTO_IPIP;
+	security_xfrm_skb_sid(skb, &fl.sid);
 	if (ip_route_output_key(&rt, &key)) {
 		kfree_skb(skb2);
 		return 0;
@@ -424,6 +425,7 @@ out:
 		fl.fl4_daddr = eiph->daddr;
 		fl.fl4_src = eiph->saddr;
 		fl.fl4_tos = eiph->tos;
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl) ||
 		    rt->u.dst.dev->type != ARPHRD_TUNNEL) {
 			ip_rt_put(rt);
@@ -556,6 +558,7 @@ static int ipip_tunnel_xmit(struct sk_bu
 						.saddr = tiph->saddr,
 						.tos = RT_TOS(tos) } },
 				    .proto = IPPROTO_IPIP };
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl)) {
 			tunnel->stat.tx_carrier_errors++;
 			goto tx_error_icmp;
--- linux-2.6.17.i686.patch11.1/net/ipv4/ip_output.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/ip_output.c	2006-07-05 14:44:23.000000000 -0500
@@ -330,6 +330,7 @@ int ip_queue_xmit(struct sk_buff *skb, i
 			 * keep trying until route appears or the connection times
 			 * itself out.
 			 */
+			security_sk_sid(sk, &fl.sid);
 			if (ip_route_output_flow(&rt, &fl, sk, 0))
 				goto no_route;
 		}
@@ -1362,6 +1363,7 @@ void ip_send_reply(struct sock *sk, stru
 					       { .sport = skb->h.th->dest,
 					         .dport = skb->h.th->source } },
 				    .proto = sk->sk_protocol };
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl))
 			return;
 	}
--- linux-2.6.17.i686.patch11.1/net/ipv4/netfilter/ipt_REJECT.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/netfilter/ipt_REJECT.c	2006-07-05 14:44:23.000000000 -0500
@@ -91,6 +91,7 @@ static inline struct rtable *route_rever
 	fl.proto = IPPROTO_TCP;
 	fl.fl_ip_sport = tcph->dest;
 	fl.fl_ip_dport = tcph->source;
+	security_xfrm_skb_sid(skb, &fl.sid);
 
 	xfrm_lookup((struct dst_entry **)&rt, &fl, NULL, 0);
 
--- linux-2.6.17.i686.patch11.1/net/ipv4/raw.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/raw.c	2006-07-05 14:44:23.000000000 -0500
@@ -484,6 +484,7 @@ static int raw_sendmsg(struct kiocb *ioc
 		if (!inet->hdrincl)
 			raw_probe_proto_opt(&fl, msg);
 
+		security_sk_sid(sk, &fl.sid);
 		err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
 	}
 	if (err)
--- linux-2.6.17.i686.patch11.1/net/ipv4/syncookies.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/syncookies.c	2006-07-05 14:44:23.000000000 -0500
@@ -259,6 +259,7 @@ struct sock *cookie_v4_check(struct sock
 				    .uli_u = { .ports =
 					       { .sport = skb->h.th->dest,
 						 .dport = skb->h.th->source } } };
+		security_sk_sid(sk, &fl.sid);
 		if (ip_route_output_key(&rt, &fl)) {
 			reqsk_free(req);
 			goto out; 
--- linux-2.6.17.i686.patch11.1/net/ipv4/udp.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv4/udp.c	2006-07-05 14:44:23.000000000 -0500
@@ -604,6 +604,7 @@ int udp_sendmsg(struct kiocb *iocb, stru
 				    .uli_u = { .ports =
 					       { .sport = inet->sport,
 						 .dport = dport } } };
+		security_sk_sid(sk, &fl.sid);
 		err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
 		if (err)
 			goto out;
--- linux-2.6.17.i686.patch11.1/net/ipv6/af_inet6.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/af_inet6.c	2006-07-05 14:44:23.000000000 -0500
@@ -638,6 +638,7 @@ int inet6_sk_rebuild_header(struct sock 
 		fl.oif = sk->sk_bound_dev_if;
 		fl.fl_ip_dport = inet->dport;
 		fl.fl_ip_sport = inet->sport;
+		security_sk_sid(sk, &fl.sid);
 
 		if (np->opt && np->opt->srcrt) {
 			struct rt0_hdr *rt0 = (struct rt0_hdr *) np->opt->srcrt;
--- linux-2.6.17.i686.patch11.1/net/ipv6/datagram.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/datagram.c	2006-07-05 14:44:23.000000000 -0500
@@ -156,6 +156,8 @@ ipv4_connected:
 	if (!fl.oif && (addr_type&IPV6_ADDR_MULTICAST))
 		fl.oif = np->mcast_oif;
 
+	security_sk_sid(sk, &fl.sid);
+
 	if (flowlabel) {
 		if (flowlabel->opt && flowlabel->opt->srcrt) {
 			struct rt0_hdr *rt0 = (struct rt0_hdr *) flowlabel->opt->srcrt;
--- linux-2.6.17.i686.patch11.1/net/ipv6/icmp.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/icmp.c	2006-07-05 14:44:23.000000000 -0500
@@ -358,6 +358,7 @@ void icmpv6_send(struct sk_buff *skb, in
 	fl.oif = iif;
 	fl.fl_icmp_type = type;
 	fl.fl_icmp_code = code;
+	security_xfrm_skb_sid(skb, &fl.sid);
 
 	if (icmpv6_xmit_lock())
 		return;
@@ -472,6 +473,7 @@ static void icmpv6_echo_reply(struct sk_
 		ipv6_addr_copy(&fl.fl6_src, saddr);
 	fl.oif = skb->dev->ifindex;
 	fl.fl_icmp_type = ICMPV6_ECHO_REPLY;
+	security_xfrm_skb_sid(skb, &fl.sid);
 
 	if (icmpv6_xmit_lock())
 		return;
--- linux-2.6.17.i686.patch11.1/net/ipv6/inet6_connection_sock.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/inet6_connection_sock.c	2006-07-05 14:44:23.000000000 -0500
@@ -158,6 +158,7 @@ int inet6_csk_xmit(struct sk_buff *skb, 
 	fl.oif = sk->sk_bound_dev_if;
 	fl.fl_ip_sport = inet->sport;
 	fl.fl_ip_dport = inet->dport;
+	security_sk_sid(sk, &fl.sid);
 
 	if (np->opt && np->opt->srcrt) {
 		struct rt0_hdr *rt0 = (struct rt0_hdr *)np->opt->srcrt;
--- linux-2.6.17.i686.patch11.1/net/ipv6/ndisc.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/ndisc.c	2006-07-05 14:44:23.000000000 -0500
@@ -420,6 +420,7 @@ static inline void ndisc_flow_init(struc
 	fl->proto	 	= IPPROTO_ICMPV6;
 	fl->fl_icmp_type	= type;
 	fl->fl_icmp_code	= 0;
+	security_sk_sid(ndisc_socket->sk, &fl->sid);
 }
 
 static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh,
--- linux-2.6.17.i686.patch11.1/net/ipv6/netfilter/ip6t_REJECT.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/netfilter/ip6t_REJECT.c	2006-07-05 14:44:23.000000000 -0500
@@ -97,6 +97,7 @@ static void send_reset(struct sk_buff *o
 	ipv6_addr_copy(&fl.fl6_dst, &oip6h->saddr);
 	fl.fl_ip_sport = otcph.dest;
 	fl.fl_ip_dport = otcph.source;
+	security_xfrm_skb_sid(oldskb, &fl.sid);
 	dst = ip6_route_output(NULL, &fl);
 	if (dst == NULL)
 		return;
--- linux-2.6.17.i686.patch11.1/net/ipv6/raw.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/raw.c	2006-07-05 14:44:23.000000000 -0500
@@ -758,6 +758,7 @@ static int rawv6_sendmsg(struct kiocb *i
 
 	if (!fl.oif && ipv6_addr_is_multicast(&fl.fl6_dst))
 		fl.oif = np->mcast_oif;
+	security_sk_sid(sk, &fl.sid);
 
 	err = ip6_dst_lookup(sk, &dst, &fl);
 	if (err)
--- linux-2.6.17.i686.patch11.1/net/ipv6/sit.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/sit.c	2006-07-05 14:44:23.000000000 -0500
@@ -483,6 +483,7 @@ static int ipip6_tunnel_xmit(struct sk_b
 						.tos = RT_TOS(tos) } },
 				    .oif = tunnel->parms.link,
 				    .proto = IPPROTO_IPV6 };
+		security_xfrm_skb_sid(skb, &fl.sid);
 		if (ip_route_output_key(&rt, &fl)) {
 			tunnel->stat.tx_carrier_errors++;
 			goto tx_error_icmp;
--- linux-2.6.17.i686.patch11.1/net/ipv6/tcp_ipv6.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/tcp_ipv6.c	2006-07-05 14:44:23.000000000 -0500
@@ -252,6 +252,8 @@ static int tcp_v6_connect(struct sock *s
 		final_p = &final;
 	}
 
+	security_sk_sid(sk, &fl.sid);
+
 	err = ip6_dst_lookup(sk, &dst, &fl);
 	if (err)
 		goto failure;
@@ -376,6 +378,7 @@ static void tcp_v6_err(struct sk_buff *s
 			fl.oif = sk->sk_bound_dev_if;
 			fl.fl_ip_dport = inet->dport;
 			fl.fl_ip_sport = inet->sport;
+			security_xfrm_skb_sid(skb, &fl.sid);
 
 			if ((err = ip6_dst_lookup(sk, &dst, &fl))) {
 				sk->sk_err_soft = -err;
@@ -470,6 +473,7 @@ static int tcp_v6_send_synack(struct soc
 	fl.oif = treq->iif;
 	fl.fl_ip_dport = inet_rsk(req)->rmt_port;
 	fl.fl_ip_sport = inet_sk(sk)->sport;
+	security_sk_sid(sk, &fl.sid);
 
 	if (dst == NULL) {
 		opt = np->opt;
@@ -610,6 +614,7 @@ static void tcp_v6_send_reset(struct sk_
 	fl.oif = inet6_iif(skb);
 	fl.fl_ip_dport = t1->dest;
 	fl.fl_ip_sport = t1->source;
+	security_xfrm_skb_sid(skb, &fl.sid);
 
 	/* sk = NULL, but it is safe for now. RST socket required. */
 	if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
@@ -676,6 +681,7 @@ static void tcp_v6_send_ack(struct sk_bu
 	fl.oif = inet6_iif(skb);
 	fl.fl_ip_dport = t1->dest;
 	fl.fl_ip_sport = t1->source;
+	security_xfrm_skb_sid(skb, &fl.sid);
 
 	if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
 		if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
@@ -909,6 +915,7 @@ static struct sock * tcp_v6_syn_recv_soc
 		fl.oif = sk->sk_bound_dev_if;
 		fl.fl_ip_dport = inet_rsk(req)->rmt_port;
 		fl.fl_ip_sport = inet_sk(sk)->sport;
+		security_sk_sid(sk, &fl.sid);
 
 		if (ip6_dst_lookup(sk, &dst, &fl))
 			goto out;
--- linux-2.6.17.i686.patch11.1/net/ipv6/udp.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/ipv6/udp.c	2006-07-05 14:44:23.000000000 -0500
@@ -783,6 +783,8 @@ do_udp_sendmsg:
 		connected = 0;
 	}
 
+	security_sk_sid(sk, &fl->sid);
+
 	err = ip6_dst_lookup(sk, &dst, fl);
 	if (err)
 		goto out;
--- linux-2.6.17.i686.patch11.1/net/xfrm/xfrm_policy.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_policy.c	2006-07-05 14:44:23.000000000 -0500
@@ -786,7 +786,6 @@ int xfrm_lookup(struct dst_entry **dst_p
 	u16 family;
 	u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
 
-	fl->sid = security_sk_sid(sk, fl, dir);
 restart:
 	genid = atomic_read(&flow_cache_genid);
 	policy = NULL;
@@ -962,7 +961,7 @@ xfrm_decode_session(struct sk_buff *skb,
 		return -EAFNOSUPPORT;
 
 	afinfo->decode_session(skb, fl);
-	err = security_xfrm_decode_session(skb, fl);
+	err = security_xfrm_decode_session(skb, &fl->sid);
 	xfrm_policy_put_afinfo(afinfo);
 	return err;
 }

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


ipsec-lspp-41.patch:
 include/linux/security.h                     |  116 +++++++++++++--
 include/net/flow.h                           |    5 
 include/net/sock.h                           |    9 +
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/key/af_key.c                             |   22 +++
 net/xfrm/xfrm_policy.c                       |   28 ++-
 net/xfrm/xfrm_state.c                        |   12 +
 net/xfrm/xfrm_user.c                         |   45 +++---
 security/dummy.c                             |   28 +++
 security/selinux/hooks.c                     |   34 +++-
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   22 ++-
 security/selinux/ss/mls.c                    |   20 --
 security/selinux/ss/mls.h                    |   20 ++
 security/selinux/ss/services.c               |   48 ++++++
 security/selinux/xfrm.c                      |  198 ++++++++++++++++++++++-----
 20 files changed, 498 insertions(+), 123 deletions(-)

--- NEW FILE ipsec-lspp-41.patch ---
>From vyekkirala at trustedcs.com Wed Jul  5 20:21:59 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 05 Jul 2006 20:22:59 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k660Mwel008253;
	Wed, 5 Jul 2006 20:22:58 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k660MvrH022277;
	Wed, 5 Jul 2006 20:22:57 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k660MqGO028156;
	Wed, 5 Jul 2006 20:22:52 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 2E4A172F0A; Wed,  5 Jul 2006 20:22:52 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k660MocD013943 for <redhat-lspp at listman.util.phx.redhat.com>;
	Wed, 5 Jul 2006 20:22:50 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k660Meta022262; Wed, 5 Jul 2006 20:22:40 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k660MYc2032185; Wed, 5 Jul 2006 20:22:37 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k660M7NB015309;
	Wed, 5 Jul 2006 20:22:07 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Wed Jul  5 20:22:02 2006
Received: from chaos.tcs.tcs-sec.com (Not Verified[192.168.1.4]) by
	trauma.tcs-sec.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B44ac57aa0000>; Wed, 05 Jul 2006 20:22:02 -0400
Received: from [10.1.10.204] (VYEKKIRALA-PC [10.1.10.204]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id N4CXJM50; Wed, 5 Jul 2006 20:22:00 -0400
Message-ID: <44AC57A7.4030301 at trustedcs.com>
Date: Wed, 05 Jul 2006 19:21:59 -0500
From: Venkat Yekkirala <vyekkirala at trustedcs.com>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: redhat-lspp at redhat.com,
 jmorris at redhat.com,
 latten at austin.ibm.com,
 sds at tycho.nsa.gov,
 tjaeger at cse.psu.edu
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-loop: redhat-lspp at redhat.com
Cc: 
Subject: [redhat-lspp] [RFC][PATCH 1/2] MLSXFRM: Granular IPSec associations
	for MLS environments
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-UID: 73260
X-Length: 47669

This piece (relative to lspp.41 kernel) constitutes the patchset submitted upstream
2 weeks back. Has the following minor changes as compared to that upstream version:
(WILL BREAK THIS UP AGAIN WHEN SUBMITTING UPSTREAM)

- Delete debugging statements and fix a BUG_ON in xfrm.c per Stephen's comments
- Optimized sock_copy for the non-security case as suggested by Herbert and James.
- Added a comment for the sid member defined in flowi.

---
 include/linux/security.h                     |  116 ++++++++-
 include/net/flow.h                           |    5 
 include/net/sock.h                           |    9 
 net/core/flow.c                              |    7 
 net/core/sock.c                              |    2 
 net/key/af_key.c                             |   22 +
 net/xfrm/xfrm_policy.c                       |   28 +-
 net/xfrm/xfrm_state.c                        |   12 -
 net/xfrm/xfrm_user.c                         |   45 ++-
 security/dummy.c                             |   28 ++
 security/selinux/hooks.c                     |   34 ++
 security/selinux/include/av_perm_to_string.h |    1 
 security/selinux/include/av_permissions.h    |    1 
 security/selinux/include/objsec.h            |    1 
 security/selinux/include/security.h          |    2 
 security/selinux/include/xfrm.h              |   22 +
 security/selinux/ss/mls.c                    |   20 -
 security/selinux/ss/mls.h                    |   20 +
 security/selinux/ss/services.c               |   48 ++++
 security/selinux/xfrm.c                      |  198 ++++++++++++++---
 20 files changed, 498 insertions(+), 123 deletions(-)

--- linux-2.6.17.i686.vanilla/include/linux/security.h	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/include/linux/security.h	2006-07-05 14:38:51.000000000 -0500
@@ -31,6 +31,7 @@
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
+#include <linux/xfrm.h>
 
 struct ctl_table;
 
@@ -795,6 +796,8 @@ struct swap_info_struct;
  *      which is used to copy security attributes between local stream sockets.
  * @sk_free_security:
  *	Deallocate security structure.
+ * @sk_clone_security:
+ *	Clone/copy security structure.
  * @sk_getsid:
  *	Retrieve the LSM-specific sid for the sock to enable caching of network
  *	authorizations.
@@ -806,9 +809,8 @@ struct swap_info_struct;
  *	used by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level policy update program (e.g., setkey).
- *	Allocate a security structure to the xp->selector.security field.
- *	The security field is initialized to NULL when the xfrm_policy is
- *	allocated.
+ *	Allocate a security structure to the xp->security field; the security
+ *	field is initialized to NULL when the xfrm_policy is allocated.
  *	Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *	@old contains an existing xfrm_policy in the SPD.
@@ -824,9 +826,14 @@ struct swap_info_struct;
  *	Database by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level SA generation program (e.g., setkey or racoon).
- *	Allocate a security structure to the x->sel.security field.  The
- *	security field is initialized to NULL when the xfrm_state is
- *	allocated.
+ *	@polsec contains the security context information associated with a xfrm
+ *	policy rule from which to take the base context. polsec must be NULL
+ *	when sec_ctx is specified.
+ *	@sid contains the sid from which to take the mls portion of the context.
+ *	Allocate a security structure to the x->security field; the security
+ *	field is initialized to NULL when the xfrm_state is allocated. Set the
+ *	context to correspond to either sec_ctx or polsec, with the mls portion
+ *	taken from sid in the latter case.
  *	Return 0 if operation was successful (memory to allocate, legal context).
  * @xfrm_state_free_security:
  *	@x contains the xfrm_state.
@@ -834,13 +841,26 @@ struct swap_info_struct;
  * @xfrm_policy_lookup:
  *	@xp contains the xfrm_policy for which the access control is being
  *	checked.
- *	@sk_sid contains the sock security label that is used to authorize
+ *	@fl_sid contains the flow security label that is used to authorize
  *	access to the policy xp.
  *	@dir contains the direction of the flow (input or output).
- *	Check permission when a sock selects a xfrm_policy for processing
+ *	Check permission when a flow selects a xfrm_policy for processing
  *	XFRMs on a packet.  The hook is called when selecting either a
  *	per-socket policy or a generic xfrm policy.
  *	Return 0 if permission is granted.
+ * @xfrm_state_pol_flow_match:
+ *	@x contains the state to match.
+ *	@xp contains the policy to check for a match.
+ *	@fl contains the flow to check for a match.
+ *	Return 1 if there is a match.
+ * @xfrm_flow_state_match:
+ *	@fl contains the flow key to match.
+ *	@xfrm points to the xfrm_state to match.
+ *	Return 1 if there is a match.
+ * @xfrm_decode_session:
+ *	@skb points to skb to decode.
+ *	@fl points to the flow key to set.
+ *	Return 0 if successful decoding.
  *
  * Security hooks affecting all Key Management operations
  *
@@ -1292,6 +1312,7 @@ struct security_operations {
 	int (*socket_getpeersec_dgram) (struct sk_buff *skb, char **secdata, u32 *seclen);
 	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
 	void (*sk_free_security) (struct sock *sk);
+	void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
 	unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
 #endif	/* CONFIG_SECURITY_NETWORK */
 
@@ -1299,9 +1320,15 @@ struct security_operations {
 	int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
 	int (*xfrm_policy_clone_security) (struct xfrm_policy *old, struct xfrm_policy *new);
 	void (*xfrm_policy_free_security) (struct xfrm_policy *xp);
-	int (*xfrm_state_alloc_security) (struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+	int (*xfrm_state_alloc_security) (struct xfrm_state *x,
+		struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *polsec,
+		u32 sid);
 	void (*xfrm_state_free_security) (struct xfrm_state *x);
-	int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+	int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 fl_sid, u8 dir);
+	int (*xfrm_state_pol_flow_match)(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl);
+	int (*xfrm_flow_state_match)(struct flowi *fl, struct xfrm_state *xfrm);
+	int (*xfrm_decode_session)(struct sk_buff *skb, struct flowi *fl);
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 	/* key management security hooks */
@@ -2786,6 +2813,11 @@ static inline void security_sk_free(stru
 	return security_ops->sk_free_security(sk);
 }
 
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+	return security_ops->sk_clone_security(sk, newsk);
+}
+
 static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return security_ops->sk_getsid(sk, fl, dir);
@@ -2914,6 +2946,10 @@ static inline void security_sk_free(stru
 {
 }
 
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+}
+
 static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return 0;
@@ -2936,9 +2972,16 @@ static inline void security_xfrm_policy_
 	security_ops->xfrm_policy_free_security(xp);
 }
 
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+			struct xfrm_user_sec_ctx *sec_ctx)
+{
+	return security_ops->xfrm_state_alloc_security(x, sec_ctx, NULL, 0);
+}
+
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+				struct xfrm_sec_ctx *polsec, u32 sid)
 {
-	return security_ops->xfrm_state_alloc_security(x, sec_ctx);
+	return security_ops->xfrm_state_alloc_security(x, NULL, polsec, sid);
 }
 
 static inline void security_xfrm_state_free(struct xfrm_state *x)
@@ -2946,9 +2989,25 @@ static inline void security_xfrm_state_f
 	security_ops->xfrm_state_free_security(x);
 }
 
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
+{
+	return security_ops->xfrm_policy_lookup(xp, fl_sid, dir);
+}
+
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl)
 {
-	return security_ops->xfrm_policy_lookup(xp, sk_sid, dir);
+	return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
+}
+
+static inline int security_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	return security_ops->xfrm_flow_state_match(fl, xfrm);
+}
+
+static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return security_ops->xfrm_decode_session(skb, fl);
 }
 #else	/* CONFIG_SECURITY_NETWORK_XFRM */
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
@@ -2965,7 +3024,14 @@ static inline void security_xfrm_policy_
 {
 }
 
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+					struct xfrm_user_sec_ctx *sec_ctx)
+{
+	return 0;
+}
+
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+					struct xfrm_sec_ctx *polsec, u32 sid)
 {
 	return 0;
 }
@@ -2974,10 +3040,28 @@ static inline void security_xfrm_state_f
 {
 }
 
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
 {
 	return 0;
 }
+
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+			struct xfrm_policy *xp, struct flowi *fl)
+{
+	return 1;
+}
+
+static inline int security_xfrm_flow_state_match(struct flowi *fl,
+                                struct xfrm_state *xfrm)
+{
+	return 1;
+}
+
+static inline int security_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return 0;
+}
+
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 
 #ifdef CONFIG_KEYS
--- linux-2.6.17.i686.vanilla/include/net/flow.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/include/net/flow.h	2006-07-05 14:38:51.000000000 -0500
@@ -78,6 +78,7 @@ struct flowi {
 #define fl_icmp_type	uli_u.icmpt.type
 #define fl_icmp_code	uli_u.icmpt.code
 #define fl_ipsec_spi	uli_u.spi
+	__u32           sid;	/* used by xfrm; see flow_sid.txt */
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 #define FLOW_DIR_IN	0
@@ -85,10 +86,10 @@ struct flowi {
 #define FLOW_DIR_FWD	2
 
 struct sock;
-typedef void (*flow_resolve_t)(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+typedef void (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
 			       void **objp, atomic_t **obj_refp);
 
-extern void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
 	 		       flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;
--- linux-2.6.17.i686.vanilla/include/net/sock.h	2006-07-05 14:36:37.000000000 -0500
+++ linux-2.6.17.i686/include/net/sock.h	2006-07-05 14:38:51.000000000 -0500
@@ -968,6 +968,15 @@ static inline void sock_graft(struct soc
 	write_unlock_bh(&sk->sk_callback_lock);
 }
 
+static inline void sock_copy(struct sock *nsk, const struct sock *osk)
+{
+	void *sptr = nsk->sk_security;
+
+	memcpy(nsk, osk, osk->sk_prot->obj_size);
+	nsk->sk_security = sptr;
+	security_sk_clone(osk, nsk);
+}
+
 extern int sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
 
--- linux-2.6.17.i686.vanilla/net/core/flow.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/core/flow.c	2006-07-05 14:38:51.000000000 -0500
@@ -32,7 +32,6 @@ struct flow_cache_entry {
 	u8			dir;
 	struct flowi		key;
 	u32			genid;
-	u32			sk_sid;
 	void			*object;
 	atomic_t		*object_ref;
 };
@@ -165,7 +164,7 @@ static int flow_key_compare(struct flowi
 	return 0;
 }
 
-void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
 			flow_resolve_t resolver)
 {
 	struct flow_cache_entry *fle, **head;
@@ -189,7 +188,6 @@ void *flow_cache_lookup(struct flowi *ke
 	for (fle = *head; fle; fle = fle->next) {
 		if (fle->family == family &&
 		    fle->dir == dir &&
-		    fle->sk_sid == sk_sid &&
 		    flow_key_compare(key, &fle->key) == 0) {
 			if (fle->genid == atomic_read(&flow_cache_genid)) {
 				void *ret = fle->object;
@@ -214,7 +212,6 @@ void *flow_cache_lookup(struct flowi *ke
 			*head = fle;
 			fle->family = family;
 			fle->dir = dir;
-			fle->sk_sid = sk_sid;
 			memcpy(&fle->key, key, sizeof(*key));
 			fle->object = NULL;
 			flow_count(cpu)++;
@@ -226,7 +223,7 @@ nocache:
 		void *obj;
 		atomic_t *obj_ref;
 
-		resolver(key, sk_sid, family, dir, &obj, &obj_ref);
+		resolver(key, family, dir, &obj, &obj_ref);
 
 		if (fle) {
 			fle->genid = atomic_read(&flow_cache_genid);
--- linux-2.6.17.i686.vanilla/net/core/sock.c	2006-07-05 14:36:37.000000000 -0500
+++ linux-2.6.17.i686/net/core/sock.c	2006-07-05 14:38:51.000000000 -0500
@@ -820,7 +820,7 @@ struct sock *sk_clone(struct sock *sk, c
 	if (newsk != NULL) {
 		struct sk_filter *filter;
 
-		memcpy(newsk, sk, sk->sk_prot->obj_size);
+		sock_copy(newsk, sk);
 
 		/* SANITY */
 		sk_node_init(&newsk->sk_node);
--- linux-2.6.17.i686.vanilla/net/key/af_key.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/key/af_key.c	2006-07-05 14:38:51.000000000 -0500
@@ -2704,6 +2704,9 @@ static int pfkey_send_acquire(struct xfr
 #endif
 	int sockaddr_size;
 	int size;
+	struct sadb_x_sec_ctx *sec_ctx;
+	struct xfrm_sec_ctx *xfrm_ctx;
+	int ctx_size = 0;
 	
 	sockaddr_size = pfkey_sockaddr_size(x->props.family);
 	if (!sockaddr_size)
@@ -2719,6 +2722,11 @@ static int pfkey_send_acquire(struct xfr
 	else if (x->id.proto == IPPROTO_ESP)
 		size += count_esp_combs(t);
 
+	if ((xfrm_ctx = x->security)) {
+		ctx_size = PFKEY_ALIGN8(xfrm_ctx->ctx_len);
+		size +=  sizeof(struct sadb_x_sec_ctx) + ctx_size;
+	}
+
 	skb =  alloc_skb(size + 16, GFP_ATOMIC);
 	if (skb == NULL)
 		return -ENOMEM;
@@ -2814,6 +2822,20 @@ static int pfkey_send_acquire(struct xfr
 	else if (x->id.proto == IPPROTO_ESP)
 		dump_esp_combs(skb, t);
 
+	/* security context */
+	if (xfrm_ctx) {
+		sec_ctx = (struct sadb_x_sec_ctx *) skb_put(skb,
+				sizeof(struct sadb_x_sec_ctx) + ctx_size);
+		sec_ctx->sadb_x_sec_len =
+		  (sizeof(struct sadb_x_sec_ctx) + ctx_size) / sizeof(uint64_t);
+		sec_ctx->sadb_x_sec_exttype = SADB_X_EXT_SEC_CTX;
+		sec_ctx->sadb_x_ctx_doi = xfrm_ctx->ctx_doi;
+		sec_ctx->sadb_x_ctx_alg = xfrm_ctx->ctx_alg;
+		sec_ctx->sadb_x_ctx_len = xfrm_ctx->ctx_len;
+		memcpy(sec_ctx + 1, xfrm_ctx->ctx_str,
+		       xfrm_ctx->ctx_len);
+	}
+
 	return pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_REGISTERED, NULL);
 }
 
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_policy.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_policy.c	2006-07-05 14:38:51.000000000 -0500
@@ -520,7 +520,7 @@ EXPORT_SYMBOL(xfrm_policy_walk);
 
 /* Find policy to apply to this flow. */
 
-static void xfrm_policy_lookup(struct flowi *fl, u32 sk_sid, u16 family, u8 dir,
+static void xfrm_policy_lookup(struct flowi *fl, u16 family, u8 dir,
 			       void **objp, atomic_t **obj_refp)
 {
 	struct xfrm_policy *pol;
@@ -536,7 +536,7 @@ static void xfrm_policy_lookup(struct fl
 		match = xfrm_selector_match(sel, fl, family);
 
 		if (match) {
- 			if (!security_xfrm_policy_lookup(pol, sk_sid, dir)) {
+ 			if (!security_xfrm_policy_lookup(pol, fl->sid, dir)) {
 				xfrm_pol_hold(pol);
 				break;
 			}
@@ -564,7 +564,7 @@ static inline int policy_to_flow_dir(int
 	};
 }
 
-static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl, u32 sk_sid)
+static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
 {
 	struct xfrm_policy *pol;
 
@@ -575,7 +575,7 @@ static struct xfrm_policy *xfrm_sk_polic
  		int err = 0;
 
 		if (match)
-		  err = security_xfrm_policy_lookup(pol, sk_sid, policy_to_flow_dir(dir));
+		  err = security_xfrm_policy_lookup(pol, fl->sid, policy_to_flow_dir(dir));
 
  		if (match && !err)
 			xfrm_pol_hold(pol);
@@ -785,19 +785,20 @@ int xfrm_lookup(struct dst_entry **dst_p
 	u32 genid;
 	u16 family;
 	u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
-	u32 sk_sid = security_sk_sid(sk, fl, dir);
+
+	fl->sid = security_sk_sid(sk, fl, dir);
 restart:
 	genid = atomic_read(&flow_cache_genid);
 	policy = NULL;
 	if (sk && sk->sk_policy[1])
-		policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl, sk_sid);
+		policy = xfrm_sk_policy_lookup(sk, XFRM_POLICY_OUT, fl);
 
 	if (!policy) {
 		/* To accelerate a bit...  */
 		if ((dst_orig->flags & DST_NOXFRM) || !xfrm_policy_list[XFRM_POLICY_OUT])
 			return 0;
 
-		policy = flow_cache_lookup(fl, sk_sid, dst_orig->ops->family,
+		policy = flow_cache_lookup(fl, dst_orig->ops->family,
 					   dir, xfrm_policy_lookup);
 	}
 
@@ -955,13 +956,15 @@ int
 xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family)
 {
 	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
+	int err;
 
 	if (unlikely(afinfo == NULL))
 		return -EAFNOSUPPORT;
 
 	afinfo->decode_session(skb, fl);
+	err = security_xfrm_decode_session(skb, fl);
 	xfrm_policy_put_afinfo(afinfo);
-	return 0;
+	return err;
 }
 EXPORT_SYMBOL(xfrm_decode_session);
 
@@ -981,14 +984,11 @@ int __xfrm_policy_check(struct sock *sk,
 	struct xfrm_policy *pol;
 	struct flowi fl;
 	u8 fl_dir = policy_to_flow_dir(dir);
-	u32 sk_sid;
 
 	if (xfrm_decode_session(skb, &fl, family) < 0)
 		return 0;
 	nf_nat_decode_session(skb, &fl, family);
 
-	sk_sid = security_sk_sid(sk, &fl, fl_dir);
-
 	/* First, check used SA against their selectors. */
 	if (skb->sp) {
 		int i;
@@ -1002,10 +1002,10 @@ int __xfrm_policy_check(struct sock *sk,
 
 	pol = NULL;
 	if (sk && sk->sk_policy[dir])
-		pol = xfrm_sk_policy_lookup(sk, dir, &fl, sk_sid);
+		pol = xfrm_sk_policy_lookup(sk, dir, &fl);
 
 	if (!pol)
-		pol = flow_cache_lookup(&fl, sk_sid, family, fl_dir,
+		pol = flow_cache_lookup(&fl, family, fl_dir,
 					xfrm_policy_lookup);
 
 	if (!pol)
@@ -1200,6 +1200,8 @@ int xfrm_bundle_ok(struct xfrm_dst *firs
 
 		if (fl && !xfrm_selector_match(&dst->xfrm->sel, fl, family))
 			return 0;
+		if (fl && !security_xfrm_flow_state_match(fl, dst->xfrm))
+			return 0;
 		if (dst->xfrm->km.state != XFRM_STATE_VALID)
 			return 0;
 
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_state.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_state.c	2006-07-05 14:38:51.000000000 -0500
@@ -366,7 +366,7 @@ xfrm_state_find(xfrm_address_t *daddr, x
 			 */
 			if (x->km.state == XFRM_STATE_VALID) {
 				if (!xfrm_selector_match(&x->sel, fl, family) ||
-				    !xfrm_sec_ctx_match(pol->security, x->security))
+				    !security_xfrm_state_pol_flow_match(x, pol, fl))
 					continue;
 				if (!best ||
 				    best->km.dying > x->km.dying ||
@@ -378,7 +378,7 @@ xfrm_state_find(xfrm_address_t *daddr, x
 			} else if (x->km.state == XFRM_STATE_ERROR ||
 				   x->km.state == XFRM_STATE_EXPIRED) {
  				if (xfrm_selector_match(&x->sel, fl, family) &&
-				    xfrm_sec_ctx_match(pol->security, x->security))
+				    security_xfrm_state_pol_flow_match(x, pol, fl))
 					error = -ESRCH;
 			}
 		}
@@ -402,6 +402,14 @@ xfrm_state_find(xfrm_address_t *daddr, x
 		 * to current session. */
 		xfrm_init_tempsel(x, fl, tmpl, daddr, saddr, family);
 
+		error = security_xfrm_state_alloc_acquire(x, pol->security, fl->sid);
+		if (error) {
+			x->km.state = XFRM_STATE_DEAD;
+			xfrm_state_put(x);
+			x = NULL;
+			goto out;
+		}
+
 		if (km_query(x, tmpl, pol) == 0) {
 			x->km.state = XFRM_STATE_ACQ;
 			list_add_tail(&x->bydst, xfrm_state_bydst+h);
--- linux-2.6.17.i686.vanilla/net/xfrm/xfrm_user.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_user.c	2006-07-05 14:38:51.000000000 -0500
@@ -907,27 +907,40 @@ rtattr_failure:
 	return -1;
 }
 
-static int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *skb)
+static int copy_sec_ctx(struct xfrm_sec_ctx *s, struct sk_buff *skb)
 {
-	if (xp->security) {
-		int ctx_size = sizeof(struct xfrm_sec_ctx) +
-				xp->security->ctx_len;
-		struct rtattr *rt = __RTA_PUT(skb, XFRMA_SEC_CTX, ctx_size);
-		struct xfrm_user_sec_ctx *uctx = RTA_DATA(rt);
-
-		uctx->exttype = XFRMA_SEC_CTX;
-		uctx->len = ctx_size;
-		uctx->ctx_doi = xp->security->ctx_doi;
-		uctx->ctx_alg = xp->security->ctx_alg;
-		uctx->ctx_len = xp->security->ctx_len;
-		memcpy(uctx + 1, xp->security->ctx_str, xp->security->ctx_len);
-	}
-	return 0;
+	int ctx_size = sizeof(struct xfrm_sec_ctx) + s->ctx_len;
+	struct rtattr *rt = __RTA_PUT(skb, XFRMA_SEC_CTX, ctx_size);
+	struct xfrm_user_sec_ctx *uctx = RTA_DATA(rt);
+
+	uctx->exttype = XFRMA_SEC_CTX;
+	uctx->len = ctx_size;
+	uctx->ctx_doi = s->ctx_doi;
+	uctx->ctx_alg = s->ctx_alg;
+	uctx->ctx_len = s->ctx_len;
+	memcpy(uctx + 1, s->ctx_str, s->ctx_len);
+ 	return 0;
 
  rtattr_failure:
 	return -1;
 }
 
+static inline int copy_to_user_state_sec_ctx(struct xfrm_state *x, struct sk_buff *skb)
+{
+	if (x->security) {
+		return copy_sec_ctx(x->security, skb);
+	}
+	return 0;
+}
+
+static inline int copy_to_user_sec_ctx(struct xfrm_policy *xp, struct sk_buff *skb)
+{
+	if (xp->security) {
+		return copy_sec_ctx(xp->security, skb);
+	}
+	return 0;
+}
+
 static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr)
 {
 	struct xfrm_dump_info *sp = ptr;
@@ -1703,7 +1716,7 @@ static int build_acquire(struct sk_buff 
 
 	if (copy_to_user_tmpl(xp, skb) < 0)
 		goto nlmsg_failure;
-	if (copy_to_user_sec_ctx(xp, skb))
+	if (copy_to_user_state_sec_ctx(x, skb))
 		goto nlmsg_failure;
 
 	nlh->nlmsg_len = skb->tail - b;
--- linux-2.6.17.i686.vanilla/security/dummy.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/dummy.c	2006-07-05 14:38:51.000000000 -0500
@@ -789,6 +789,10 @@ static inline void dummy_sk_free_securit
 {
 }
 
+static inline void dummy_sk_clone_security (const struct sock *sk, struct sock *newsk)
+{
+}
+
 static unsigned int dummy_sk_getsid(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	return 0;
@@ -810,7 +814,8 @@ static void dummy_xfrm_policy_free_secur
 {
 }
 
-static int dummy_xfrm_state_alloc_security(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static int dummy_xfrm_state_alloc_security(struct xfrm_state *x,
+	struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	return 0;
 }
@@ -823,6 +828,23 @@ static int dummy_xfrm_policy_lookup(stru
 {
 	return 0;
 }
+
+static int dummy_xfrm_state_pol_flow_match(struct xfrm_state *x,
+				struct xfrm_policy *xp, struct flowi *fl)
+{
+	return 1;
+}
+
+static int dummy_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	return 1;
+}
+
+static int dummy_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	return 0;
+}
+
 #endif /* CONFIG_SECURITY_NETWORK_XFRM */
 static int dummy_register_security (const char *name, struct security_operations *ops)
 {
@@ -1018,6 +1040,7 @@ void security_fixup_ops (struct security
 	set_to_dummy_if_null(ops, socket_getpeersec_dgram);
 	set_to_dummy_if_null(ops, sk_alloc_security);
 	set_to_dummy_if_null(ops, sk_free_security);
+	set_to_dummy_if_null(ops, sk_clone_security);
 	set_to_dummy_if_null(ops, sk_getsid);
  #endif	/* CONFIG_SECURITY_NETWORK */
 #ifdef  CONFIG_SECURITY_NETWORK_XFRM
@@ -1027,6 +1050,9 @@ void security_fixup_ops (struct security
 	set_to_dummy_if_null(ops, xfrm_state_alloc_security);
 	set_to_dummy_if_null(ops, xfrm_state_free_security);
 	set_to_dummy_if_null(ops, xfrm_policy_lookup);
+	set_to_dummy_if_null(ops, xfrm_state_pol_flow_match);
+	set_to_dummy_if_null(ops, xfrm_flow_state_match);
+	set_to_dummy_if_null(ops, xfrm_decode_session);
 #endif	/* CONFIG_SECURITY_NETWORK_XFRM */
 #ifdef CONFIG_KEYS
 	set_to_dummy_if_null(ops, key_alloc);
--- linux-2.6.17.i686.vanilla/security/selinux/hooks.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/hooks.c	2006-07-05 14:38:51.000000000 -0500
@@ -270,15 +270,13 @@ static int sk_alloc_security(struct sock
 {
 	struct sk_security_struct *ssec;
 
-	if (family != PF_UNIX)
-		return 0;
-
 	ssec = kzalloc(sizeof(*ssec), priority);
 	if (!ssec)
 		return -ENOMEM;
 
 	ssec->sk = sk;
 	ssec->peer_sid = SECINITSID_UNLABELED;
+	ssec->sid = SECINITSID_UNLABELED;
 	sk->sk_security = ssec;
 
 	return 0;
@@ -288,9 +286,6 @@ static void sk_free_security(struct sock
 {
 	struct sk_security_struct *ssec = sk->sk_security;
 
-	if (sk->sk_family != PF_UNIX)
-		return;
-
 	sk->sk_security = NULL;
 	kfree(ssec);
 }
@@ -2935,6 +2930,7 @@ static int selinux_socket_post_create(st
 {
 	struct inode_security_struct *isec;
 	struct task_security_struct *tsec;
+	struct sk_security_struct *sksec;
 
 	isec = SOCK_INODE(sock)->i_security;
 
@@ -2943,6 +2939,11 @@ static int selinux_socket_post_create(st
 	isec->sid = kern ? SECINITSID_KERNEL : tsec->sid;
 	isec->initialized = 1;
 
+	if (sock->sk) {
+		sksec = sock->sk->sk_security;
+		sksec->sid = isec->sid;
+	}
+
 	return selinux_netlbl_socket_create(sock, family, isec->sid);
 }
 
@@ -3336,7 +3337,7 @@ static int selinux_socket_sock_rcv_skb(s
 	if (err)
 		goto out;
 
-	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
+	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb, &ad);
 
 out:	
 	return err;
@@ -3426,6 +3427,15 @@ static void selinux_sk_free_security(str
 	sk_free_security(sk);
 }
 
+static void selinux_sk_clone_security(const struct sock *sk, struct sock *newsk)
+{
+	struct sk_security_struct *ssec = sk->sk_security;
+	struct sk_security_struct *newssec = newsk->sk_security;
+
+	newssec->sid = ssec->sid;
+	newssec->peer_sid = ssec->peer_sid;
+}
+
 static unsigned int selinux_sk_getsid_security(struct sock *sk, struct flowi *fl, u8 dir)
 {
 	struct inode_security_struct *isec;
@@ -3439,6 +3449,10 @@ static unsigned int selinux_sk_getsid_se
 
 	if (isec)
 		sock_sid = isec->sid;
+	else {
+		struct sk_security_struct *sksec = sk->sk_security;
+		sock_sid = sksec->sid;
+	}
 
 	read_unlock_bh(&sk->sk_callback_lock);
 	return sock_sid;
@@ -3582,7 +3596,7 @@ static unsigned int selinux_ip_postroute
 	if (err != NF_ACCEPT)
 		goto out;
 
-	err = selinux_xfrm_postroute_last(isec->sid, skb);
+	err = selinux_xfrm_postroute_last(isec->sid, skb, &ad);
 
 out:
 	return err;
@@ -4399,6 +4413,7 @@ static struct security_operations selinu
 	.socket_getpeersec_dgram =	selinux_socket_getpeersec_dgram,
 	.sk_alloc_security =		selinux_sk_alloc_security,
 	.sk_free_security =		selinux_sk_free_security,
+	.sk_clone_security =		selinux_sk_clone_security,
 	.sk_getsid = 			selinux_sk_getsid_security,
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
@@ -4408,6 +4423,9 @@ static struct security_operations selinu
 	.xfrm_state_alloc_security =	selinux_xfrm_state_alloc,
 	.xfrm_state_free_security =	selinux_xfrm_state_free,
 	.xfrm_policy_lookup = 		selinux_xfrm_policy_lookup,
+	.xfrm_state_pol_flow_match =	selinux_xfrm_state_pol_flow_match,
+	.xfrm_flow_state_match =	selinux_xfrm_flow_state_match,
+	.xfrm_decode_session =		selinux_xfrm_decode_session,
 #endif
 };
 
--- linux-2.6.17.i686.vanilla/security/selinux/include/av_permissions.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/av_permissions.h	2006-07-05 14:38:51.000000000 -0500
@@ -909,6 +909,7 @@
 #define ASSOCIATION__SENDTO                       0x00000001UL
 #define ASSOCIATION__RECVFROM                     0x00000002UL
 #define ASSOCIATION__SETCONTEXT                   0x00000004UL
+#define ASSOCIATION__POLMATCH                     0x00000008UL
 
 #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL      0x00000001UL
 #define NETLINK_KOBJECT_UEVENT_SOCKET__READ       0x00000002UL
--- linux-2.6.17.i686.vanilla/security/selinux/include/av_perm_to_string.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/av_perm_to_string.h	2006-07-05 14:39:17.000000000 -0500
@@ -239,3 +239,4 @@
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom")
    S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext")
+   S_(SECCLASS_ASSOCIATION, ASSOCIATION__POLMATCH, "polmatch")
--- linux-2.6.17.i686.vanilla/security/selinux/include/objsec.h	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/objsec.h	2006-07-05 14:38:51.000000000 -0500
@@ -107,6 +107,7 @@ struct netif_security_struct {
 
 struct sk_security_struct {
 	struct sock *sk;		/* back pointer to sk object */
+	u32 sid;			/* SID of this object */
 	u32 peer_sid;			/* SID of peer */
 };
 
--- linux-2.6.17.i686.vanilla/security/selinux/include/security.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/security.h	2006-07-05 14:38:51.000000000 -0500
@@ -78,6 +78,8 @@ int security_node_sid(u16 domain, void *
 int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid,
                                  u16 tclass);
 
+int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid);
+
 #define SECURITY_FS_USE_XATTR		1 /* use xattr */
 #define SECURITY_FS_USE_TRANS		2 /* use transition SIDs, e.g. devpts/tmpfs */
 #define SECURITY_FS_USE_TASK		3 /* use task SIDs, e.g. pipefs/sockfs */
--- linux-2.6.17.i686.vanilla/security/selinux/include/xfrm.h	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/xfrm.h	2006-07-05 14:38:51.000000000 -0500
@@ -2,6 +2,7 @@
  * SELinux support for the XFRM LSM hooks
  *
  * Author : Trent Jaeger, <jaegert at us.ibm.com>
+ * Updated : Venkat Yekkirala, <vyekkirala at TrustedCS.com>
  */
 #ifndef _SELINUX_XFRM_H_
 #define _SELINUX_XFRM_H_
@@ -9,9 +10,14 @@
 int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
 int selinux_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new);
 void selinux_xfrm_policy_free(struct xfrm_policy *xp);
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx,
+			struct xfrm_sec_ctx *pol, u32 sid);
 void selinux_xfrm_state_free(struct xfrm_state *x);
-int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir);
+int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,
+			struct flowi *fl);
+int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm);
+int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl);
 
 /*
  * Extract the security blob from the sock (it's actually on the socket)
@@ -37,17 +43,21 @@ static inline u32 selinux_no_sk_sid(stru
 }
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb);
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb);
+int selinux_xfrm_sock_rcv_skb(u32 sid, struct sk_buff *skb,
+			struct avc_audit_data *ad);
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad);
 u32 selinux_socket_getpeer_stream(struct sock *sk);
 u32 selinux_socket_getpeer_dgram(struct sk_buff *skb);
 #else
-static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad)
 {
 	return 0;
 }
 
-static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+static inline int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+			struct avc_audit_data *ad)
 {
 	return NF_ACCEPT;
 }
--- linux-2.6.17.i686.vanilla/security/selinux/ss/mls.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/mls.c	2006-07-05 14:38:51.000000000 -0500
@@ -219,26 +219,6 @@ int mls_context_isvalid(struct policydb 
 }
 
 /*
- * Copies the MLS range from `src' into `dst'.
- */
-static inline int mls_copy_context(struct context *dst,
-				   struct context *src)
-{
-	int l, rc = 0;
-
-	/* Copy the MLS range from the source context */
-	for (l = 0; l < 2; l++) {
-		dst->range.level[l].sens = src->range.level[l].sens;
-		rc = ebitmap_cpy(&dst->range.level[l].cat,
-				 &src->range.level[l].cat);
-		if (rc)
-			break;
-	}
-
-	return rc;
-}
-
-/*
  * Set the MLS fields in the security context structure
  * `context' based on the string representation in
  * the string `*scontext'.  Update `*scontext' to
--- linux-2.6.17.i686.vanilla/security/selinux/ss/mls.h	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/mls.h	2006-07-05 14:38:51.000000000 -0500
@@ -24,6 +24,26 @@
 #include "context.h"
 #include "policydb.h"
 
+/*
+ * Copies the MLS range from `src' into `dst'.
+ */
+static inline int mls_copy_context(struct context *dst,
+				   struct context *src)
+{
+	int l, rc = 0;
+
+	/* Copy the MLS range from the source context */
+	for (l = 0; l < 2; l++) {
+		dst->range.level[l].sens = src->range.level[l].sens;
+		rc = ebitmap_cpy(&dst->range.level[l].cat,
+				 &src->range.level[l].cat);
+		if (rc)
+			break;
+	}
+
+	return rc;
+}
+
 int mls_compute_context_len(struct context *context);
 void mls_sid_to_context(struct context *context, char **scontext);
 int mls_context_isvalid(struct policydb *p, struct context *c);
--- linux-2.6.17.i686.vanilla/security/selinux/ss/services.c	2006-07-05 14:36:43.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/ss/services.c	2006-07-05 14:38:51.000000000 -0500
@@ -1827,6 +1827,54 @@ out:
 	return rc;
 }
 
+/*
+ * security_sid_mls_copy() - computes a new sid based on the given
+ * sid and the mls portion of mls_sid.
+ */
+int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid)
+{
+	struct context *context1 = NULL;
+	struct context *context2 = NULL;
+	struct context newcon;
+	int rc = 0;
+
+	if (!ss_initialized) {
+		*new_sid = sid;
+		goto out;
+	}
+
+	POLICY_RDLOCK;
+	context1 = sidtab_search(&sidtab, sid);
+	if (!context1) {
+		printk(KERN_ERR "security_sid_mls_copy:  unrecognized SID "
+		       "%d\n", sid);
+		rc = -EINVAL;
+		goto out_unlock;
+	}
+
+	context2 = sidtab_search(&sidtab, mls_sid);
+	if (!context2) {
+		printk(KERN_ERR "security_sid_mls_copy:  unrecognized SID "
+		       "%d\n", mls_sid);
+		rc = -EINVAL;
+		goto out_unlock;
+	}
+
+	newcon.user = context1->user;
+	newcon.role = context1->role;
+	newcon.type = context1->type;
+	rc = mls_copy_context(&newcon, context2);
+	if (rc)
+		goto out_unlock;
+
+	rc = sidtab_context_to_sid(&sidtab, &newcon, new_sid);
+
+out_unlock:
+	POLICY_RDUNLOCK;
+out:
+	return rc;
+}
+
 struct selinux_audit_rule {
 	u32 au_seqno;
 	struct context au_ctxt;
--- linux-2.6.17.i686.vanilla/security/selinux/xfrm.c	2006-06-17 20:49:35.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/xfrm.c	2006-07-05 14:38:51.000000000 -0500
@@ -6,7 +6,12 @@
  *  Authors:  Serge Hallyn <sergeh at us.ibm.com>
  *	      Trent Jaeger <jaegert at us.ibm.com>
  *
+ *  Updated: Venkat Yekkirala <vyekkirala at TrustedCS.com>
+ *
+ *           Granular IPSec Associations for use in MLS environments.
+ *
  *  Copyright (C) 2005 International Business Machines Corporation
+ *  Copyright (C) 2006 Trusted Computer Solutions, Inc.
  *
  *	This program is free software; you can redistribute it and/or modify
  *	it under the terms of the GNU General Public License version 2,
@@ -68,10 +73,10 @@ static inline int selinux_authorizable_x
 }
 
 /*
- * LSM hook implementation that authorizes that a socket can be used
- * with the corresponding xfrm_sec_ctx and direction.
+ * LSM hook implementation that authorizes that a flow can use
+ * a xfrm policy rule.
  */
-int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+int selinux_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_sid, u8 dir)
 {
 	int rc = 0;
 	u32 sel_sid = SECINITSID_UNLABELED;
@@ -85,27 +90,129 @@ int selinux_xfrm_policy_lookup(struct xf
 		sel_sid = ctx->ctx_sid;
 	}
 
-	rc = avc_has_perm(sk_sid, sel_sid, SECCLASS_ASSOCIATION,
-			  ((dir == FLOW_DIR_IN) ? ASSOCIATION__RECVFROM :
-			   ((dir == FLOW_DIR_OUT) ?  ASSOCIATION__SENDTO :
-			    (ASSOCIATION__SENDTO | ASSOCIATION__RECVFROM))),
+	rc = avc_has_perm(fl_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__POLMATCH,
+			  NULL);
+
+	return rc;
+}
+
+/*
+ * LSM hook implementation that authorizes that a state matches
+ * the given policy, flow combo.
+ */
+
+int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,
+			struct flowi *fl)
+{
+	u32 state_sid;
+	u32 pol_sid;
+	int err;
+
+	if (x->security)
+		state_sid = x->security->ctx_sid;
+	else
+		state_sid = SECINITSID_UNLABELED;
+
+	if (xp->security)
+		pol_sid = xp->security->ctx_sid;
+	else
+		pol_sid = SECINITSID_UNLABELED;
+
+	err = avc_has_perm(state_sid, pol_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__POLMATCH,
 			  NULL);
 
+	if (err)
+		return 0;
+
+	return selinux_xfrm_flow_state_match(fl, x);
+}
+
+/*
+ * LSM hook implementation that authorizes that a particular outgoing flow
+ * can use a given security association.
+ */
+
+int selinux_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+	int rc = 0;
+	u32 sel_sid = SECINITSID_UNLABELED;
+	struct xfrm_sec_ctx *ctx;
+
+	/* Context sid is either set to label or ANY_ASSOC */
+	if ((ctx = xfrm->security)) {
+		if (!selinux_authorizable_ctx(ctx))
+			return 0;
+
+		sel_sid = ctx->ctx_sid;
+	}
+
+	rc = avc_has_perm(fl->sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__SENDTO,
+			  NULL)? 0:1;
+
 	return rc;
 }
 
 /*
+ * LSM hook implementation that determines the sid for the session.
+ */
+
+int selinux_xfrm_decode_session(struct sk_buff *skb, struct flowi *fl)
+{
+	struct sec_path *sp;
+
+	fl->sid = SECSID_NULL;
+
+	if (skb == NULL)
+		return 0;
+
+	sp = skb->sp;
+	if (sp) {
+		int i, sid_set = 0;
+
+		for (i = sp->len-1; i >= 0; i--) {
+			struct xfrm_state *x = sp->xvec[i];
+			if (selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+
+				if (!sid_set) {
+					fl->sid = ctx->ctx_sid;
+					sid_set = 1;
+				}
+				else if (fl->sid != ctx->ctx_sid)
+					return -EINVAL;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
  * Security blob allocation for xfrm_policy and xfrm_state
  * CTX does not have a meaningful value on input
  */
-static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *uctx)
+static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp,
+	struct xfrm_user_sec_ctx *uctx, struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int rc = 0;
 	struct task_security_struct *tsec = current->security;
-	struct xfrm_sec_ctx *ctx;
+	struct xfrm_sec_ctx *ctx = NULL;
+	char *ctx_str = NULL;
+	u32 str_len;
+	u32 ctx_sid;
+
+	BUG_ON(uctx && pol);
+
+	if (pol)
+		goto from_policy;
 
 	BUG_ON(!uctx);
-	BUG_ON(uctx->ctx_doi != XFRM_SC_ALG_SELINUX);
+
+	if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
+		return -EINVAL;
 
 	if (uctx->ctx_len >= PAGE_SIZE)
 		return -ENOMEM;
@@ -145,9 +252,40 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	return rc;
 
+from_policy:
+	BUG_ON(!pol);
+	rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
+	if (rc)
+		goto out;
+
+	rc = security_sid_to_context(ctx_sid, &ctx_str, &str_len);
+	if (rc)
+		goto out;
+
+	*ctxp = ctx = kmalloc(sizeof(*ctx) +
+			      str_len,
+			      GFP_ATOMIC);
+
+	if (!ctx) {
+		rc = -ENOMEM;
+		goto out;
+	}
+
+
+	ctx->ctx_doi = XFRM_SC_DOI_LSM;
+	ctx->ctx_alg = XFRM_SC_ALG_SELINUX;
+	ctx->ctx_sid = ctx_sid;
+	ctx->ctx_len = str_len;
+	memcpy(ctx->ctx_str,
+	       ctx_str,
+	       str_len);
+
+	return rc;
+
 out:
 	*ctxp = NULL;
 	kfree(ctx);
+	kfree(ctx_str);
 	return rc;
 }
 
@@ -161,7 +299,7 @@ int selinux_xfrm_policy_alloc(struct xfr
 
 	BUG_ON(!xp);
 
-	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, 0);
 	return err;
 }
 
@@ -204,13 +342,14 @@ void selinux_xfrm_policy_free(struct xfr
  * LSM hook implementation that allocs and transfers sec_ctx spec to
  * xfrm_state.
  */
-int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uctx,
+		struct xfrm_sec_ctx *pol, u32 sid)
 {
 	int err;
 
 	BUG_ON(!x);
 
-	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx);
+	err = selinux_xfrm_sec_ctx_alloc(&x->security, uctx, pol, sid);
 	return err;
 }
 
@@ -299,38 +438,30 @@ u32 selinux_socket_getpeer_dgram(struct 
  * we need to check for unlabelled access since this may not have
  * gone thru the IPSec process.
  */
-int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
+				struct avc_audit_data *ad)
 {
 	int i, rc = 0;
 	struct sec_path *sp;
+	u32 sel_sid = SECINITSID_UNLABELED;
 
 	sp = skb->sp;
 
 	if (sp) {
-		/*
-		 * __xfrm_policy_check does not approve unless xfrm_policy_ok
-		 * says that spi's match for policy and the socket.
-		 *
-		 *  Only need to verify the existence of an authorizable sp.
-		 */
 		for (i = 0; i < sp->len; i++) {
 			struct xfrm_state *x = sp->xvec[i];
 
-			if (x && selinux_authorizable_xfrm(x))
-				goto accept;
+			if (x && selinux_authorizable_xfrm(x)) {
+				struct xfrm_sec_ctx *ctx = x->security;
+				sel_sid = ctx->ctx_sid;
+				break;
+			}
 		}
 	}
 
-	/* check SELinux sock for unlabelled access */
-	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__RECVFROM, NULL);
-	if (rc)
-		goto drop;
+	rc = avc_has_perm(isec_sid, sel_sid, SECCLASS_ASSOCIATION,
+			  ASSOCIATION__RECVFROM, ad);
 
-accept:
-	return 0;
-
-drop:
 	return rc;
 }
 
@@ -341,7 +472,8 @@ drop:
  * If we do have a authorizable security association, then it has already been
  * checked in xfrm_policy_lookup hook.
  */
-int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb)
+int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
+					struct avc_audit_data *ad)
 {
 	struct dst_entry *dst;
 	int rc = 0;
@@ -361,7 +493,7 @@ int selinux_xfrm_postroute_last(u32 isec
 	}
 
 	rc = avc_has_perm(isec_sid, SECINITSID_UNLABELED, SECCLASS_ASSOCIATION,
-			  ASSOCIATION__SENDTO, NULL);
+			  ASSOCIATION__SENDTO, ad);
 	if (rc)
 		goto drop;
 

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



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.5
retrieving revision 1.2293.2.6
diff -u -r1.2293.2.5 -r1.2293.2.6
--- kernel-2.6.spec	29 Jun 2006 23:30:49 -0000	1.2293.2.5
+++ kernel-2.6.spec	6 Jul 2006 14:41:45 -0000	1.2293.2.6
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.41
+%define tag FC6.lspp.42
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -469,9 +469,10 @@
 Patch20108: linux-2.6-net-label_6_8.patch
 Patch20109: linux-2.6-net-label_7_8.patch
 Patch20110: linux-2.6-net-label_8_8.patch
-Patch20120: ipsec-lspp-38.patch
-Patch20121: linux-2.6-audit-rename.patch
-Patch20122: linux-2.6-audit-by-object.patch
+Patch20120: linux-2.6-audit-rename.patch
+Patch20121: linux-2.6-audit-by-object.patch
+Patch20122: ipsec-lspp-41.patch
+Patch20123: ipsec-flow-41.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1123,11 +1124,12 @@
 %patch20108 -p1
 %patch20109 -p1
 %patch20110 -p1
-# ipsec
-#%patch20120 -p1
 # audit by obj
+%patch20120 -p1
 %patch20121 -p1
+# ipsec
 %patch20122 -p1
+%patch20123 -p1
 
 
 # now run oldconfig over all the config files
@@ -1734,6 +1736,9 @@
 %endif
 
 %changelog
+* Thu Jul  6 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp 42, add updated ipsec patches from Venkat
+
 * Thu Jun 29 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp.41, really apply patch 8 of 8 from Paul
 - added improved audit by obj by Darrel


--- ipsec-lspp-38.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 15:02:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 11:02:18 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.66,1.67
Message-ID: <200607061502.k66F2Ijn004043@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Use any JTA for now




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- tomcat5.spec	5 Jul 2006 22:50:50 -0000	1.66
+++ tomcat5.spec	6 Jul 2006 15:02:10 -0000	1.67
@@ -159,7 +159,8 @@
 BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
 # formerly non-free stuff
 # geronimo-specs replaces non-free jta
-BuildRequires: geronimo-jta-1.0.1B-api
+#BuildRequires: geronimo-jta-1.0.1B-api
+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
@@ -296,8 +297,10 @@
 Requires: jndi
 Requires(post): jndi
 # geronimo-specs replaces non-free jta
-Requires: geronimo-jta-1.0.1B-api
-Requires(post): geronimo-jta-1.0.1B-api
+#Requires: geronimo-jta-1.0.1B-api
+Requires: jta >= 0:1.0.1
+#Requires(post): geronimo-jta-1.0.1B-api
+Requires(post): jta >= 0:1.0.1
 Requires: mx4j >= 0:3.0.1
 Requires(post): mx4j >= 0:3.0.1
 %if %{with_ecj}
@@ -502,7 +505,8 @@
 struts.lib=%{_datadir}/struts
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -537,7 +541,8 @@
 jmx.jar=$(build-classpath mx4j/mx4j-jmx)
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
+jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -857,10 +862,12 @@
 build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
                                       commons-el commons-logging-api \
                                       commons-pool jaf javamail jdbc-stdext \
-                                      jndi jsp geronimo-jta-1.0.1B-api \
+                                      jndi jsp \
                                       mx4j/mx4j \
                                       servlet %{jname}5-compiler \
                                       %{jname}5-runtime 2>&1
+#build-jar-repository %{commondir}/lib geronimo-jta-1.0.1B-api 2>&1
+build-jar-repository %{commondir}/lib jta 2>&1
 %if %{with_ecj}
 pushd %{commondir}/lib
 ln -sf %{_javadir}/jdtcore.jar .
@@ -1193,6 +1200,7 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Upgrade
+- Use any JTA for now
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
 - Merge with upstream



From fedora-cvs-commits at redhat.com  Thu Jul  6 15:15:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 11:15:18 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.14,1.15
Message-ID: <200607061515.k66FFIEn007642@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	reiserfs-utils.spec 
Log Message:
Build on all arches


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- reiserfs-utils.spec	5 Jun 2006 23:34:50 -0000	1.14
+++ reiserfs-utils.spec	6 Jul 2006 15:15:16 -0000	1.15
@@ -1,6 +1,6 @@
 Name: reiserfs-utils
 Version: 3.6.19
-Release: 2.3
+Release: 2.4
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
 URL: http://www.namesys.com/
 Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
@@ -9,8 +9,6 @@
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
-# Not big-endian safe as of 2002-12-11 -ECL
-ExclusiveArch: %{ix86} x86_64 ia64
 BuildRequires: e2fsprogs-devel
 Patch1: header-fix.patch
 
@@ -66,6 +64,9 @@
 rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
+* Thu Jul  6 2006 David Woodhouse <dwmw2 at redhat.com>
+- Remove unneeded ExclusiveArch:
+
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Remove broken asm/unaligned include. (#191889)
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 15:25:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 11:25:42 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.67,1.68
Message-ID: <200607061525.k66FPgsx026397@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
- Bootstrap build with apisonly




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- tomcat5.spec	6 Jul 2006 15:02:10 -0000	1.67
+++ tomcat5.spec	6 Jul 2006 15:25:39 -0000	1.68
@@ -28,6 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+#BOOTSTRAP
+%define _with_apisonly 1
+
 # If you want only apis to be built,
 # give rpmbuild option '--with apisonly'
 
@@ -69,7 +72,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_1fc
+Release: 3jpp_0fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1198,9 +1201,10 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
-* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade
 - Use any JTA for now
+- Bootstrap build with apisonly
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
 - Merge with upstream



From fedora-cvs-commits at redhat.com  Thu Jul  6 15:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 11:42:05 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.68,1.69
Message-ID: <200607061542.k66Fg51U031081@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Do aot compiling even if for apisonly




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- tomcat5.spec	6 Jul 2006 15:25:39 -0000	1.68
+++ tomcat5.spec	6 Jul 2006 15:42:03 -0000	1.69
@@ -817,11 +817,11 @@
 # java.util.logging.LogManager is fixed
 rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar
 
+%endif
+
 # sample.war is a malformed zip file
 aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
 
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 16:01:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 12:01:43 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.69,1.70
Message-ID: <200607061601.k66G1hLj020874@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
- Try and remove exclude for sample.war




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- tomcat5.spec	6 Jul 2006 15:42:03 -0000	1.69
+++ tomcat5.spec	6 Jul 2006 16:01:28 -0000	1.70
@@ -820,7 +820,8 @@
 %endif
 
 # sample.war is a malformed zip file
-aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
+#aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
+aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1204,6 +1205,7 @@
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade
 - Use any JTA for now
+- Try and remove exclude for sample.war
 - Bootstrap build with apisonly
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh



From fedora-cvs-commits at redhat.com  Thu Jul  6 16:02:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 12:02:02 -0400
Subject: rpms/evolution/devel evolution-2.7.3-replicated-cjk-input.patch,
	NONE, 1.1 evolution.spec, 1.158, 1.159
Message-ID: <200607061602.k66G22eh020919@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-replicated-cjk-input.patch 
Log Message:
- Add patch for RH bug #166231 (also addresses #131227 and #157391).


evolution-2.7.3-replicated-cjk-input.patch:
 e-text.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE evolution-2.7.3-replicated-cjk-input.patch ---
--- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input	2006-07-06 09:57:22.000000000 -0400
+++ evolution-2.7.3/widgets/text/e-text.c	2006-07-06 09:58:27.000000000 -0400
@@ -1498,7 +1498,8 @@
 	}
 
 
-	insert_preedit_text (text);	
+	if (text->im_context_signals_registered)
+		insert_preedit_text (text);
 
 	if (!pango_layout_get_text (text->layout))
 		return;
@@ -2212,7 +2213,8 @@
 									      G_SIGNAL_MATCH_DATA,
                                                                              0, 0, NULL,
                                                                              NULL, save_text);
-                                       save_text->im_context_signals_registered = FALSE;
+					save_text->im_context_signals_registered = FALSE;
+					reset_layout (save_text);
                                 }
 
 				if (text->im_context) {


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- evolution.spec	30 Jun 2006 14:59:13 -0000	1.158
+++ evolution.spec	6 Jul 2006 16:01:59 -0000	1.159
@@ -131,6 +131,9 @@
 # RH bug #175596 / Gnome.org bug #323952
 Patch905: evolution-2.7.3-mailing-list-menu.patch
 
+# RH bug #166231 / Gnome.org bug #264485
+Patch906: evolution-2.7.3-replicated-cjk-input.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -288,6 +291,7 @@
 %patch903 -p1 -b .candidate-window-position-calendar
 %patch904 -p1 -b .filter-datespec
 %patch905 -p1 -b .mailing-list-menu
+%patch906 -p1 -b .replicated-cjk-input
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -678,6 +682,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jul  6 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-8
+- Add patch for RH bug #166231 (also addresses #131227 and #157391).
+
 * Fri Jun 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-7
 - Add patch for RH bug #157400, reorder some patch #'s.
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 16:06:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 12:06:44 -0400
Subject: rpms/evolution/devel evolution.spec,1.159,1.160
Message-ID: <200607061606.k66G6iOJ021253@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Log Message:
Forgot to bump the release number.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- evolution.spec	6 Jul 2006 16:01:59 -0000	1.159
+++ evolution.spec	6 Jul 2006 16:06:41 -0000	1.160
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 7
+Release: 8
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite



From fedora-cvs-commits at redhat.com  Thu Jul  6 17:08:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 13:08:02 -0400
Subject: rpms/kdebase/FC-5 env.sh, NONE, 1.1 kdebase-3.5.3.diff, NONE,
	1.1 kdebase.spec, 1.175, 1.176
Message-ID: <200607061708.k66H819C011278@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	env.sh kdebase-3.5.3.diff 
Log Message:
- fix #187228, kio_media_mounthelper fails with fuser
- fix #197778, add missing env script
- apply upstream patches



--- NEW FILE env.sh ---
# from http://standards.freedesktop.org/menu-spec/latest/
# XDG_CONFIG_DIRS: where to look for menu config(s)
if [ -z "${XDG_CONFIG_DIRS}" ] ; then
   XDG_CONFIG_DIRS=/etc/xdg.d/kde:/etc/xdg
   export XDG_CONFIG_DIRS
fi

kdebase-3.5.3.diff:
 drkonqi/main.cpp                  |   11 +++++++++--
 ksysguard/ksysguardd/ksysguardd.c |   14 +++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

--- NEW FILE kdebase-3.5.3.diff ---
Index: ksysguard/ksysguardd/ksysguardd.c
===================================================================
--- ksysguard/ksysguardd/ksysguardd.c	(revision 549512)
+++ ksysguard/ksysguardd/ksysguardd.c	(working copy)
@@ -207,15 +207,19 @@ static void dropPrivileges( void )
 {
   struct passwd *pwd;
 
-  if ( ( pwd = getpwnam( "nobody" ) ) != NULL )
-    setuid( pwd->pw_uid );
-	else {
+  if ( ( pwd = getpwnam( "nobody" ) ) != NULL ) {
+    if ( !setgid(pwd->pw_gid) )
+      setuid(pwd->pw_uid);
+    if (!geteuid() && getuid() != pwd->pw_uid)
+      _exit(1);
+  }
+  else {
     log_error( "User 'nobody' does not exist." );
     /**
       We exit here to avoid becoming vulnerable just because
       user nobody does not exist.
      */
-    exit( 1 );
+    _exit(1);
   }
 }
 
@@ -231,7 +235,7 @@ void makeDaemon( void )
       chdir( "/" );
       umask( 0 );
       if ( createLockFile() < 0 )
-        exit( 1 );
+        _exit( 1 );
 
       dropPrivileges();
       installSignalHandler();
Index: drkonqi/main.cpp
===================================================================
--- drkonqi/main.cpp	(revision 549512)
+++ drkonqi/main.cpp	(working copy)
@@ -61,7 +61,8 @@ int main( int argc, char* argv[] )
 {
   // Drop privs.
   setgid(getgid());
-  setuid(getuid());
+  if (setuid(getuid()) < 0 && geteuid() != getuid())
+     exit (255);
 
   // Make sure that DrKonqi doesn't start DrKonqi when it crashes :-]
   setenv("KDE_DEBUG", "true", 1);
--- kdm/kfrontend/kgreeter.cpp	(revision 549445)
+++ kdm/kfrontend/kgreeter.cpp	(working copy)
@@ -251,7 +251,12 @@ KGreeter::insertUsers()
 	// XXX remove seteuid-voodoo when we run as nobody
 	if (!(ps = getpwnam( "nobody" )))
 		return;
-	seteuid( ps->pw_uid );
+        if (setegid( ps->pw_gid )) 
+                return;
+        if (seteuid( ps->pw_uid )) {
+                setegid(0);
+                return;
+        }
 
 	QImage default_pix;
 	if (userView) {
@@ -318,6 +323,7 @@ KGreeter::insertUsers()
 
 	// XXX remove seteuid-voodoo when we run as nobody
 	seteuid( 0 );
+        setegid( 0 );
 }
 
 void


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kdebase.spec	20 Jun 2006 11:00:21 -0000	1.175
+++ kdebase.spec	6 Jul 2006 17:07:51 -0000	1.176
@@ -6,17 +6,14 @@
 %define redhatify 1
 %define include_kappfinder 0
 
-%define qt_version 3.3.5
+%define qt_version 3.3.6
 %define arts_version 1.5.3
-%define kde_version 3.5.3
 %define kdelibs_epoch 6
 %define arts_epoch 8
 %define make_cvs 1
 
 %define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
@@ -35,6 +32,7 @@
 Source5: kde-np
 Source6: logrotate-kdm
 Source7: mailsettings.cc
+Source8: env.sh
 
 Patch0: kde-libtool.patch
 Patch1: kdebase-3.5.3-1-redhat.patch
@@ -62,6 +60,7 @@
 Patch101: kdebase-3.5.3-kicker-panel.patch
 Patch102: kdebase-3.5.3-kscreensaver.patch
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
+Patch104: kdebase-3.5.3.diff
 
 # security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -71,7 +70,7 @@
 Requires(post,postun): desktop-file-utils
 Requires(pre,post): fileutils sh-utils
 Requires(post): xfs
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}-0.3.fc5
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
 Requires: /etc/X11/xdm/Xservers
@@ -90,7 +89,7 @@
 Requires: redhat-artwork >= 0.92
 %endif
 
-BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: kdelibs-devel >= %{version}
 BuildRequires: samba >= 2.2.3a-5
 BuildRequires: pam-devel
 BuildRequires: gettext
@@ -103,6 +102,7 @@
 BuildRequires: pkgconfig
 BuildRequires: doxygen
 BuildRequires: cdparanoia-devel
+BuildRequires: cdparanoia
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5
 BuildRequires: freetype-devel
@@ -179,6 +179,7 @@
 %patch101 -p1 -b .kicker-panel
 %patch102 -p1 -b .kscreensaver
 %patch103 -p1 -b .kxkb-kcmlayout
+%patch104 -p0 -b .setuid-check
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -191,7 +192,7 @@
 %if %redhatify
    cp %{SOURCE1} konsole
    # set Konqueror version
-   perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Red Hat\"," konqueror/version.h
+   perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Fedore Core\"," konqueror/version.h
 %endif
 
 %build
@@ -210,9 +211,7 @@
    --with-kdm-pam=kdm \
    --with-kcp-pam=kcheckpass \
    --with-kss-pam=kscreensaver \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --with-xinerama \
    --without-shadow \
    --disable-shadow \
@@ -375,6 +374,9 @@
    done
 %endif
 
+mkdir -p %{buildroot}/etc/kde/env
+install -m 755 %{SOURCE8} %{buildroot}/etc/kde/env/
+
 # Own Mozilla plugin dir
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
@@ -386,19 +388,19 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || : 
+%{_bindir}/update-desktop-database 2> /dev/null || : 
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 fi
-%{_bindir}/update-desktop-database > /dev/null 2>&1 || : 
+%{_bindir}/update-desktop-database 2> /dev/null || : 
 
 %files
 %defattr(-,root,root)
@@ -429,7 +431,7 @@
 %{_bindir}/kate
 %{_bindir}/kblankscrn.kss
 %{_bindir}/kbookmarkmerger
-%attr(4755,root,root) %{_bindir}/kcheckpass
+%{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
 %{_bindir}/kcminit_startup
@@ -550,8 +552,10 @@
 
 
 %changelog
-* Tue Jun 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
+* Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
 - fix #187228, kio_media_mounthelper fails with fuser
+- fix #197778, add missing env.sh script
+- apply upstream patches
 
 * Thu Jun 15 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - fix BR 



From fedora-cvs-commits at redhat.com  Thu Jul  6 17:51:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 13:51:28 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-kde#87613.patch, NONE,
	1.1 kdebase-3.5.3-kioslave_media_dbus-fuser.patch, NONE,
	1.1 kdebase.spec, 1.193, 1.194
Message-ID: <200607061751.k66HpSXQ023801@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kde#87613.patch 
	kdebase-3.5.3-kioslave_media_dbus-fuser.patch 
Log Message:
- fix #187228, kio_media_mounthelper fails with fuser
- apply upstream patches, fix #87613



kdebase-3.5.3-kde#87613.patch:
 systemtrayapplet.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.3-kde#87613.patch ---
Index: kicker/applets/systemtray/systemtrayapplet.cpp
===================================================================
--- kicker/applets/systemtray/systemtrayapplet.cpp	(Revision 544662)
+++ kicker/applets/systemtray/systemtrayapplet.cpp	(Revision 544663)
@@ -596,7 +596,7 @@
             ((*emb)->kdeTray() &&
              !kwin_module->systemTrayWindows().contains(wid)))
         {
-            delete *emb;
+            (*emb)->deleteLater();
             emb = m_shownWins.erase(emb);
         }
         else
@@ -613,7 +613,7 @@
             ((*emb)->kdeTray() &&
              !kwin_module->systemTrayWindows().contains(wid)))
         {
-            delete *emb;
+            (*emb)->deleteLater();
             emb = m_hiddenWins.erase(emb);
         }
         else

kdebase-3.5.3-kioslave_media_dbus-fuser.patch:
 halbackend.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus-fuser.patch ---
--- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp.tn	2006-06-20 12:51:16.000000000 +0200
+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp	2006-06-20 12:52:55.000000000 +0200
@@ -1210,7 +1210,7 @@
       QString qerror = error.message;
       if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) {
 	qerror = QString("<qt>") + i18n("Device is Busy:");
-	QString cmdline = QString("/bin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+	QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
 	FILE *fuser = popen(cmdline.latin1(), "r");
 	uint counter = 0;
 	if (fuser) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdebase.spec	28 Jun 2006 11:53:05 -0000	1.193
+++ kdebase.spec	6 Jul 2006 17:51:25 -0000	1.194
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 7
+Release: 8
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -53,6 +53,7 @@
 Patch16: kdebase-3.5.2-krdb-xresource.patch
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
+Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
 
 # upstream patches
 Patch100: kdebase-3.5.3-kfind-largefile.patch
@@ -60,6 +61,7 @@
 Patch102: kdebase-3.5.3-kscreensaver.patch
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
 Patch104: kdebase-3.5.3.diff
+Patch105: kdebase-3.5.3-kde#87613.patch
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -168,6 +170,7 @@
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
+%patch19 -p1 -b .fuser
 
 # upstream patches
 %patch100 -p1 -b .kfind-largefile
@@ -175,6 +178,7 @@
 %patch102 -p1 -b .kscreensaver
 %patch103 -p1 -b .kxkb-kcmlayout
 %patch104 -p0 -b .setuid-check
+%patch105 -p0 -b .kde#87613
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -426,7 +430,7 @@
 %{_bindir}/kate
 %{_bindir}/kblankscrn.kss
 %{_bindir}/kbookmarkmerger
-%attr(4755,root,root) %{_bindir}/kcheckpass
+%{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
 %{_bindir}/kcminit_startup
@@ -546,6 +550,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
+- fix #187228, kio_media_mounthelper fails with fuser
+- apply upstream patches, fix #87613
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - apply patch to check return value
 



From fedora-cvs-commits at redhat.com  Thu Jul  6 18:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 14:15:51 -0400
Subject: rpms/samba/devel samba-3.0.23rc2-logfiles.patch, NONE,
	1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.29,
	1.30 samba.spec, 1.65, 1.66 smb.init, 1.5, 1.6 sources, 1.31,
	1.32 samba-3.0.20pre1-passwd.patch, 1.1,
	NONE samba-3.0.21b-logfiles.patch, 1.1,
	NONE samba-3.0.4-install.mount.smbfs.patch, 1.1, NONE
Message-ID: <200607061815.k66IFpbt032580@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30421

Modified Files:
	.cvsignore samba.spec smb.init sources 
Added Files:
	samba-3.0.23rc2-logfiles.patch samba-3.0.23rc3-passwd.patch 
Removed Files:
	samba-3.0.20pre1-passwd.patch samba-3.0.21b-logfiles.patch 
	samba-3.0.4-install.mount.smbfs.patch 
Log Message:
* Thu Jul 6 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-0.RC3
- New upstream RC release.
- Update the -logfiles, and -passwd patches for
  3.0.23rc3
- Include the change to smb.init from Bastien Nocera <bnocera at redhat.com>)
  to close                                                                
  bz#182560 Wrong retval for initscript when smbd is dead
- Update this spec file to build with 3.0.23rc3          
- Remove the -install.mount.smbfs patch, since we don't install
  mount.smbfs any more.



samba-3.0.23rc2-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.11/packaging/Fedora/smb.conf     |    4 ++--
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE samba-3.0.23rc2-logfiles.patch ---
--- samba-3.0.23rc2/source/lib/popt_common.c.logfiles	2006-06-09 15:30:31.000000000 -0400
+++ samba-3.0.23rc2/source/lib/popt_common.c	2006-06-14 12:20:02.000000000 -0400
@@ -54,7 +54,7 @@
 	else 
 		pname++;
 
-	pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+	pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 	lp_set_logfile(logfile);
 }
 
--- 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.23rc3-passwd.patch:
 winbindd_group.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.23rc3-passwd.patch ---
--- samba-3.0.20pre1/source/nsswitch/#winbindd_group.c~	2005-06-22 15:08:05.000000000 -0400
+++ samba-3.0.20pre1/source/nsswitch/winbindd_group.c	2005-06-22 15:08:05.000000000 -0400
@@ -49,7 +49,7 @@
 	/* Group name and password */
     
 	safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1);
-	safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1);
+	safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1);
 
 	return True;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Mar 2006 22:02:15 -0000	1.29
+++ .cvsignore	6 Jul 2006 18:15:48 -0000	1.30
@@ -1 +1 @@
-samba-3.0.22.tar.gz
+samba-3.0.23rc3.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- samba.spec	14 Jun 2006 16:49:42 -0000	1.65
+++ samba.spec	6 Jul 2006 18:15:48 -0000	1.66
@@ -2,16 +2,16 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.22
-Release: 3
+Version: 3.0.23
+Release: 0.RC3
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc1.tar.gz
-Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
+Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz
+#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -33,13 +33,13 @@
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
 Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.21b-logfiles.patch
+Patch103: samba-3.0.23rc2-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
 Patch105: samba-3.0.21b-smb.conf.patch
 Patch106: samba-3.0.20pre1-man.patch
-Patch107: samba-3.0.20pre1-passwd.patch
+# The passwd part has been applied, but not the group part
+Patch107: samba-3.0.23rc3-passwd.patch
 #Patch108: samba-3.0.8-non-ascii-domain.patch
-Patch109: samba-3.0.4-install.mount.smbfs.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch112: samba-3.0.15pre2-bug106483.patch
@@ -100,8 +100,8 @@
 
 %prep
 # TAG: change for non-pre
-# % setup -q -n samba-3.0.21rc1
-%setup -q
+%setup -q -n samba-3.0.23rc3
+# % setup -q
 
 # copy Red Hat specific scripts
 mkdir packaging/Fedora
@@ -123,7 +123,6 @@
 %patch106 -p1 -b .man
 %patch107 -p1 -b .passwd
 #%patch108 -p1 -b .non-ascii-domain
-%patch109 -p1 -b .install.mount.smbfs
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch112 -p1 -b .bug106483
@@ -237,11 +236,10 @@
 
 # pam_smbpass
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 
 # winbind
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -sf /%{_lib}/libnss_winbind.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so
@@ -276,6 +274,10 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
 
+# why are these getting installed in the wrong place?
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -444,6 +446,17 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Thu Jul 6 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-0.RC3
+- New upstream RC release.
+- Update the -logfiles, and -passwd patches for
+  3.0.23rc3
+- Include the change to smb.init from Bastien Nocera <bnocera at redhat.com>)
+  to close
+  bz#182560 Wrong retval for initscript when smbd is dead
+- Update this spec file to build with 3.0.23rc3
+- Remove the -install.mount.smbfs patch, since we don't install
+  mount.smbfs any more.
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.0.21c-3
 - rebuilt with new gnutls
 


Index: smb.init
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/smb.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb.init	9 Sep 2004 12:12:38 -0000	1.5
+++ smb.init	6 Jul 2006 18:15:48 -0000	1.6
@@ -83,7 +83,11 @@
 
 rhstatus() {
 	status smbd
+	RETVAL=$?
 	status nmbd
+	if [ $? -ne 0 -o $RETVAL -ne 0 ] ; then
+		return 1
+	fi
 }	
 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Mar 2006 22:02:31 -0000	1.31
+++ sources	6 Jul 2006 18:15:48 -0000	1.32
@@ -1 +1 @@
-5c39505af17cf5caf3d6ed8bab135036  samba-3.0.22.tar.gz
+b60d5aa92fed3cc06f71ff24a0a81704  samba-3.0.23rc3.tar.gz


--- samba-3.0.20pre1-passwd.patch DELETED ---


--- samba-3.0.21b-logfiles.patch DELETED ---


--- samba-3.0.4-install.mount.smbfs.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 18:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 14:22:21 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.2.patch, 1.3,
	1.4 eclipse-tomcat55-build.3.patch, 1.3,
	1.4 eclipse-tomcat55-build.patch, 1.8,
	1.9 eclipse-tomcat55.patch, 1.5, 1.6 eclipse.spec, 1.293, 1.294
Message-ID: <200607061822.k66IMLAO014520@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.2.patch eclipse-tomcat55-build.3.patch 
	eclipse-tomcat55-build.patch eclipse-tomcat55.patch 
	eclipse.spec 
Log Message:
* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Bump tomcat5 to 5.5.17 both in BR/R and in patches.


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

Index: eclipse-tomcat55-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-tomcat55-build.2.patch	4 Jul 2006 21:27:47 -0000	1.3
+++ eclipse-tomcat55-build.2.patch	6 Jul 2006 18:22:19 -0000	1.4
@@ -6,7 +6,7 @@
  			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -18,7 +18,7 @@
  			<zipfileset file="${eclipse.base}/plugins/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar" fullpath="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"			/>
  			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources_3.2.0.v20060603.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"			/>
 -			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.130.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"			/>
-+			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.15.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"			/>
++			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.17.v20060601" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"			/>
  			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.sdk_3.2.0.v20060605" prefix="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"			/>
  			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ui.forms_3.2.0.v20060602.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"			/>
  			<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.base_3.2.0.v20060601.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"			/>
@@ -30,7 +30,7 @@
  			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -42,7 +42,7 @@
  			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -54,7 +54,7 @@
  			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>
@@ -66,7 +66,7 @@
  			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.0.0.I20060605-1400.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.130.v20060601"/>
-+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15.v20060601"/>
++			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.17.v20060601"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.2.0.v20060605"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
  			<arg line="${pluginArchivePrefix}/org.eclipse.help.base_3.2.0.v20060601.jar"/>

eclipse-tomcat55-build.3.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-tomcat55-build.3.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.3.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-tomcat55-build.3.patch	4 Jul 2006 21:27:47 -0000	1.3
+++ eclipse-tomcat55-build.3.patch	6 Jul 2006 18:22:19 -0000	1.4
@@ -6,7 +6,7 @@
  			<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.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml"  selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
 clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-140!
 0,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.!
 eclipse.
ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0!
 .v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml"  selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
 clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,5.5.15.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-1400!
 ,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.e!
 clipse.u
i.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.!
 v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060609m-BBt47n6hlEUsvBO/feature.xml"  selfVersion="3.2.0.v20060609m-BBt47n6hlEUsvBO" featureIds="org.eclipse.rcp,3.2.0.v20060609m-Swbi2VrNoh-MeGG," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.0.v20060605,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.0.v20060605-1400,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.0.v20060603,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.0.v20060605,org.eclipse.debug.ui,3.2.0.v20060605,org.eclipse.help.webapp,3.2.0.v20060602,org.eclipse.help.base,3.2.0.v20060601,org.e!
 clipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.0.v20060605-1400,org.eclipse.ltk.ui.refactoring,3.2.0.v20060605-1400,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.0.v20060605,org.eclipse.search,3.2.0.v20060605-1400,org.eclipse.team.core,3.2.0.I200606051140,org.eclipse.team.cvs.core,3.2.0.M20060628,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.0.I200606051140,org.eclipse.team.ui,3.2.0.I200606051140,org.eclipse.tomcat,5.5.17.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.0.v20060605-1400,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.0.v20060601,org.eclipse.ui.intro.universal,3.2.0.v20060602,org.eclipse.ui.cheatsheets,3.2.0.v20060602,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.0.I20060605-1400!
 ,org.eclipse.ui.navigator.resources,3.2.0.I20060605-1400,org.e!
 clipse.u
i.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.0.I20060605-1400,org.eclipse.ui.editors,3.2.0.v20060605-1400,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.100.v20060605,org.eclipse.ui.ide,3.2.0.I20060605-1400,org.eclipse.update.core,3.2.0.v20060605,org.eclipse.update.scheduler,3.2.0.v20060605,org.eclipse.update.ui,3.2.0.v20060605,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.!
 v20060605,org.eclipse.update.core.win32,3.2.0.v20060605,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060605-1400,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060603,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="copybuiltlauncher" if="libsconfig">

eclipse-tomcat55-build.patch:
 build.xml |  120 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 63 insertions(+), 57 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-tomcat55-build.patch	5 Jul 2006 17:11:24 -0000	1.8
+++ eclipse-tomcat55-build.patch	6 Jul 2006 18:22:19 -0000	1.9
@@ -5,7 +5,7 @@
  			<param name="destination.temp.folder" value="${temp.folder}/"/>
  		</antcall>
 -		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" filesonly="false" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" filesonly="false" whenempty="skip" update="false"/>
  		<delete dir="${temp.folder}"/>
  	</target>
  
@@ -116,16 +116,16 @@
  	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 -		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
 -		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
  			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
  		</copy>
 -		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="true" overwrite="false">
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
  			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
  		</copy>
 -		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
-+		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" version="5.5.15.v20060601"/>
++		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" version="5.5.17.v20060601"/>
  	</target>
  
  	<target name="build.zips" depends="init">
@@ -135,9 +135,9 @@
 -		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
 -		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
 -		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
-+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false">
  			<fileset dir="${basedir}" includes="about.html,*.license"			/>
  		</copy>
  	</target>
@@ -145,8 +145,8 @@
  	<target name="gather.logs" depends="init" if="destination.temp.folder">
 -		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
 -		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601"/>
-+		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15.v20060601" failonerror="false" overwrite="false"/>
++		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
++		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.">
@@ -154,8 +154,8 @@
  		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
 -		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
 -		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.jar"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar"/>
++		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
  		<delete dir="${temp.folder}"/>
  	</target>
  
@@ -164,7 +164,7 @@
  			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
  		</delete>
 -		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
  		<delete dir="${temp.folder}"/>
  	</target>
  

eclipse-tomcat55.patch:
 .classpath                                                   |   43 
 META-INF/MANIFEST.MF                                         |  116 -
 build.properties                                             |    2 
 src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java |   51 
 src/org/eclipse/tomcat/internal/TomcatAppServer.java         | 1254 +++++------
 src/org/eclipse/tomcat/internal/TomcatPlugin.java            |    3 
 6 files changed, 797 insertions(+), 672 deletions(-)

Index: eclipse-tomcat55.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-tomcat55.patch	4 Jul 2006 21:27:47 -0000	1.5
+++ eclipse-tomcat55.patch	6 Jul 2006 18:22:19 -0000	1.6
@@ -1471,7 +1471,7 @@
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
 -Bundle-Version: 4.1.130.qualifier
-+Bundle-Version: 5.5.15.qualifier
++Bundle-Version: 5.5.17.qualifier
  Bundle-ClassPath: tomcatwrapper.jar,
 - catalina.jar,
 - bootstrap.jar,


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- eclipse.spec	6 Jul 2006 12:54:28 -0000	1.293
+++ eclipse.spec	6 Jul 2006 18:22:19 -0000	1.294
@@ -165,9 +165,9 @@
 %ifnarch ppc64 s390 s390x
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
-BuildRequires: tomcat5 >= 5.5.15
-BuildRequires: tomcat5-jasper >= 5.5.15
-BuildRequires: tomcat5-servlet-2.4-api >= 5.5.15
+BuildRequires: tomcat5 >= 5.5.17
+BuildRequires: tomcat5-jasper >= 5.5.17
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.17
 %endif
 BuildRequires: lucene
 BuildRequires: regexp 
@@ -232,9 +232,9 @@
 %ifnarch ppc64 s390 s390x
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 Requires: mx4j >= 2.1
-Requires: tomcat5 >= 5.5.15
-Requires: tomcat5-jasper >= 5.5.15
-Requires: tomcat5-servlet-2.4-api >= 5.5.15
+Requires: tomcat5 >= 5.5.17
+Requires: tomcat5-jasper >= 5.5.17
+Requires: tomcat5-servlet-2.4-api >= 5.5.17
 %endif
 Requires: lucene 
 Requires: regexp
@@ -1633,6 +1633,7 @@
 %changelog
 * Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Temporarily add webapp patch for ppc64, s390, and s390x.
+- Bump tomcat5 to 5.5.17 both in BR/R and in patches.
 
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.



From fedora-cvs-commits at redhat.com  Thu Jul  6 18:25:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 14:25:42 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.70,1.71
Message-ID: <200607061825.k66IPfvm015501@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Full build




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tomcat5.spec	6 Jul 2006 16:01:28 -0000	1.70
+++ tomcat5.spec	6 Jul 2006 18:25:39 -0000	1.71
@@ -28,9 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-#BOOTSTRAP
-%define _with_apisonly 1
-
 # If you want only apis to be built,
 # give rpmbuild option '--with apisonly'
 
@@ -72,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_0fc
+Release: 3jpp_1fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1202,6 +1199,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
+- Full build
+
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade
 - Use any JTA for now



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:04:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:04:30 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.71,1.72
Message-ID: <200607062004.k66K4U3F020645@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Add servlet-api.jar to CLASSPATH when building catalina-config




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- tomcat5.spec	6 Jul 2006 18:25:39 -0000	1.71
+++ tomcat5.spec	6 Jul 2006 20:04:28 -0000	1.72
@@ -505,7 +505,6 @@
 struts.lib=%{_datadir}/struts
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
-#jta.jar=$(build-classpath geronimo-jta-1.0.1B-api)
 jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
@@ -516,6 +515,7 @@
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 EOBP
+export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
 # can't use jikes to build tomcat4 (strange)
     ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd
@@ -1201,6 +1201,7 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build
+- Add servlet-api.jar to CLASSPATH when building catalina-config
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:04:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:04:49 -0400
Subject: rpms/xorg-x11-drv-mga/devel mga.xinf, 1.1, 1.2 xorg-x11-drv-mga.spec,
	1.12, 1.13
Message-ID: <200607062004.k66K4nQR020783@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	mga.xinf xorg-x11-drv-mga.spec 
Log Message:
- mga.xinf updates.  Add G200SE cards, remove Impression and Mistral IDs
  (since they do not and never have worked), and comment each line with
  the appropriate card name.



Index: mga.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/mga.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mga.xinf	3 Feb 2006 13:35:00 -0000	1.1
+++ mga.xinf	6 Jul 2006 20:04:46 -0000	1.2
@@ -1,31 +1,14 @@
-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
+alias pcivideo:v0000102Bd00000518sv*sd*bc*sc*i* mga	# 2085 (Athena)
+alias pcivideo:v0000102Bd00000519sv*sd*bc*sc*i* mga	# 2064 (Millenium)
+alias pcivideo:v0000102Bd0000051Asv*sd*bc*sc*i* mga	# 1064 (Mystique)
+alias pcivideo:v0000102Bd0000051Bsv*sd*bc*sc*i* mga	# 2164 (Millenium II)
+alias pcivideo:v0000102Bd0000051Esv*sd*bc*sc*i* mga	# 1064 AGP
+alias pcivideo:v0000102Bd0000051Fsv*sd*bc*sc*i* mga	# 2164 AGP
+alias pcivideo:v0000102Bd00000520sv*sd*bc*sc*i* mga	# G200
+alias pcivideo:v0000102Bd00000521sv*sd*bc*sc*i* mga	# G200 AGP
+alias pcivideo:v0000102Bd00000522sv*sd*bc*sc*i* mga	# G200SE A
+alias pcivideo:v0000102Bd00000524sv*sd*bc*sc*i* mga	# G200SE B
+alias pcivideo:v0000102Bd00000525sv*sd*bc*sc*i* mga	# G400 (and 450)
+alias pcivideo:v0000102Bd00001000sv*sd*bc*sc*i* mga	# G100
+alias pcivideo:v0000102Bd00001001sv*sd*bc*sc*i* mga	# G100 PCI
+alias pcivideo:v0000102Bd00002527sv*sd*bc*sc*i* mga	# G550


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-mga.spec	28 Jun 2006 11:07:06 -0000	1.12
+++ xorg-x11-drv-mga.spec	6 Jul 2006 20:04:46 -0000	1.13
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.4.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -72,6 +72,11 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Thu Jul  6 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-4
+- mga.xinf updates.  Add G200SE cards, remove Impression and Mistral IDs
+  (since they do not and never have worked), and comment each line with
+  the appropriate card name.
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.4.1-3
 - Added with_dri conditionalization (not yet working for non-dri case).
 - Added "BuildRequires: libdrm-devel >= 2.0-1" for (#192358).



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:10:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:10:40 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.6,1.2353.2.7
Message-ID: <200607062010.k66KAeIS021759@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
more crap




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.6
retrieving revision 1.2353.2.7
diff -u -r1.2353.2.6 -r1.2353.2.7
--- kernel-2.6.spec	5 Jul 2006 22:08:54 -0000	1.2353.2.6
+++ kernel-2.6.spec	6 Jul 2006 20:10:38 -0000	1.2353.2.7
@@ -17,6 +17,11 @@
 
 # Versions of various parts
 
+# After branching, please hardcode these values as the 
+# %dist and %rhel tags are not reliable yet
+#define dist
+#define rhel
+
 #
 # Polite request for people who spin their own kernel rpms:
 # please modify the "release" field in a way that identifies
@@ -985,6 +990,7 @@
 
 cp -f %{all_arch_configs} .
 
+
 # now run oldconfig over all the config files
 for i in *.config
 do



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:16:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:16:50 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.72,1.73
Message-ID: <200607062016.k66KGoVM009363@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Fix path to servlet-api.jar




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tomcat5.spec	6 Jul 2006 20:04:28 -0000	1.72
+++ tomcat5.spec	6 Jul 2006 20:16:47 -0000	1.73
@@ -515,7 +515,7 @@
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 EOBP
-export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
+export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jsr154/dist/lib/servlet-api.jar
 # can't use jikes to build tomcat4 (strange)
     ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:32:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:32:54 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.73,1.74
Message-ID: <200607062032.k66KWsrQ015644@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Really fix path now




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- tomcat5.spec	6 Jul 2006 20:16:47 -0000	1.73
+++ tomcat5.spec	6 Jul 2006 20:32:49 -0000	1.74
@@ -515,7 +515,7 @@
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
 EOBP
-export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jsr154/dist/lib/servlet-api.jar
+export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
 # can't use jikes to build tomcat4 (strange)
     ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:35:46 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.7,1.2353.2.8
Message-ID: <200607062035.k66KZkMe015747@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
more commit stuff




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.7
retrieving revision 1.2353.2.8
diff -u -r1.2353.2.7 -r1.2353.2.8
--- kernel-2.6.spec	6 Jul 2006 20:10:38 -0000	1.2353.2.7
+++ kernel-2.6.spec	6 Jul 2006 20:35:33 -0000	1.2353.2.8
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}_don
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}_don
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Thu Jul  6 20:54:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 16:54:43 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-blkid-devmapper.patch, NONE,
 1.1 e2fsprogs-1.39-close-on-error.patch, NONE, 1.1 .cvsignore, 1.14,
 1.15 e2fsprogs.spec, 1.58, 1.59 sources, 1.14, 1.15 e2fsprogs-1.1589.patch,
 1.1, NONE e2fsprogs-1.1590.patch, 1.1, NONE e2fsprogs-1.1591.patch, 1.1,
 NONE e2fsprogs-1.36-cramfs-detect.patch, 1.1,
 NONE e2fsprogs-1.36-getsize-wrap.patch, 1.2,
 NONE e2fsprogs-1.37-blkid-ext23.patch, 1.1,
 NONE e2fsprogs-1.37-blkid-nomagicvfat.patch, 1.1,
 NONE e2fsprogs-1.37-blkid-swsuspend.patch, 1.1,
 NONE e2fsprogs-1.38-blkid-devmapper.patch, 1.4,
 NONE e2fsprogs-1.38-blkid-epoch.patch, 1.2,
 NONE e2fsprogs-1.38-blkid-selinux.patch, 1.1,
 NONE e2fsprogs-1.38-close-on-error.patch, 1.1,
 NONE e2fsprogs-1.38-lost+found.patch, 1.1,
 NONE e2fsprogs-1.38-man_no_ext2resize.patch, 1.1,
 NONE e2fsprogs-enable-resize.patch, 1.1, NONE ext2resize-byteorder.patch,
 1.2, NONE ext2resize-canonicalise.patch, 1.1,
 NONE ext2resize-compiler-warning-fixes.patch, 1.1,
 NONE ext2resize-cvs-20040419.patch, 1.1, NONE ext2resize-fixbui!
 ld.patch, 1.1, NONE ext2resize-gcc34-fixes.patch, 1.1,
 NONE ext2resize-nofallback.patch, 1.1, NONE ext2resize-nowrite.patch, 1.1,
 NONE ext2resize-printf-format-fixes.patch, 1.1, NONE
Message-ID: <200607062054.k66Kshj2014348@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14191

Modified Files:
	.cvsignore e2fsprogs.spec sources 
Added Files:
	e2fsprogs-1.39-blkid-devmapper.patch 
	e2fsprogs-1.39-close-on-error.patch 
Removed Files:
	e2fsprogs-1.1589.patch e2fsprogs-1.1590.patch 
	e2fsprogs-1.1591.patch e2fsprogs-1.36-cramfs-detect.patch 
	e2fsprogs-1.36-getsize-wrap.patch 
	e2fsprogs-1.37-blkid-ext23.patch 
	e2fsprogs-1.37-blkid-nomagicvfat.patch 
	e2fsprogs-1.37-blkid-swsuspend.patch 
	e2fsprogs-1.38-blkid-devmapper.patch 
	e2fsprogs-1.38-blkid-epoch.patch 
	e2fsprogs-1.38-blkid-selinux.patch 
	e2fsprogs-1.38-close-on-error.patch 
	e2fsprogs-1.38-lost+found.patch 
	e2fsprogs-1.38-man_no_ext2resize.patch 
	e2fsprogs-enable-resize.patch ext2resize-byteorder.patch 
	ext2resize-canonicalise.patch 
	ext2resize-compiler-warning-fixes.patch 
	ext2resize-cvs-20040419.patch ext2resize-fixbuild.patch 
	ext2resize-gcc34-fixes.patch ext2resize-nofallback.patch 
	ext2resize-nowrite.patch ext2resize-printf-format-fixes.patch 
Log Message:
[tw]
- new version 1.39
- dropped ext2online, because resize2fs is now able to do online resize
- spec file cleanup
- enabled checks for build



e2fsprogs-1.39-blkid-devmapper.patch:
 MCONFIG.in          |    2 ++
 configure.in        |   14 +++++++++-----
 debugfs/Makefile.in |    2 +-
 e2fsck/Makefile.in  |    6 +++---
 misc/Makefile.in    |    2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE e2fsprogs-1.39-blkid-devmapper.patch ---
--- e2fsprogs-1.39/debugfs/Makefile.in.dm	2005-09-06 05:40:13.000000000 -0400
+++ e2fsprogs-1.39/debugfs/Makefile.in	2006-07-06 14:11:32.000000000 -0400
@@ -27,7 +27,7 @@
 
 LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
 	$(LIBUUID) $(DLOPEN_LIB)
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
+DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
 
 .c.o:
 	@echo "	CC $<"
--- e2fsprogs-1.39/MCONFIG.in.dm	2006-03-22 20:19:19.000000000 -0500
+++ e2fsprogs-1.39/MCONFIG.in	2006-07-06 14:11:32.000000000 -0400
@@ -79,6 +79,7 @@
 LIBBLKID = $(LIB)/libblkid at LIB_EXT@ $(DEVMAPPER_LIBS)
 LIBINTL = @LIBINTL@
 DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@
+DEPLIBBLKID = $(LIB)/libblkid at LIB_EXT@
 
 STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@
 STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@
@@ -87,6 +88,7 @@
 STATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@ @SOCKET_LIB@ 
 STATIC_LIBBLKID = $(LIB)/libblkid at STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
 DEPSTATIC_LIBUUID = $(LIB)/libuuid at STATIC_LIB_EXT@
+DEPSTATIC_LIBBLKID = $(LIB)/libblkid at STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss at PROFILED_LIB_EXT@
 PROFILED_LIBCOM_ERR = $(LIB)/libcom_err at PROFILED_LIB_EXT@
--- e2fsprogs-1.39/misc/Makefile.in.dm	2006-07-06 14:13:57.000000000 -0400
+++ e2fsprogs-1.39/misc/Makefile.in	2006-07-06 14:14:27.000000000 -0400
@@ -55,7 +55,7 @@
 STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
 
 LIBS_BLKID= $(LIBBLKID) $(LIBUUID)
-DEPLIBS_BLKID= $(LIBBLKID) $(DEPLIBUUID)
+DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID)
 
 LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
 DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
--- e2fsprogs-1.39/e2fsck/Makefile.in.dm	2006-03-27 00:44:11.000000000 -0500
+++ e2fsprogs-1.39/e2fsck/Makefile.in	2006-07-06 14:11:32.000000000 -0400
@@ -18,11 +18,11 @@
 XTRA_CFLAGS=	-DRESOURCE_TRACK -I.
 
 LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
+DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
 	$(STATIC_LIBUUID) $(LIBINTL)
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \
 	$(DEPSTATIC_LIBUUID)
 
 PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \
@@ -119,7 +119,7 @@
 e2fsck.static: $(OBJS)  $(STATIC_DEPLIBS)
 	@echo "	LD $@"
 	@$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
-		$(STATIC_LIBS) 
+		$(STATIC_LIBS)
 
 e2fsck.shared: $(OBJS)  $(DEPLIBS)
 	@echo "	LD $@"
--- e2fsprogs-1.39/configure.in.dm	2006-04-08 21:36:21.000000000 -0400
+++ e2fsprogs-1.39/configure.in	2006-07-06 14:11:32.000000000 -0400
@@ -494,11 +494,15 @@
 	AC_DEFINE(HAVE_DEVMAPPER)
 	echo "Enabling device-mapper support"
 
-	DEVMAPPER_REQ='libselinux libsepol'
-	DEVMAPPER_PC_LIBS='-ldevmapper'
-	DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol'
-	STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a'
-
+	PKG_PROG_PKG_CONFIG()
+ 
+	AC_CHECK_LIB(devmapper, dm_tree_create,
+		[DEVMAPPER_LIBS=`$PKG_CONFIG --libs devmapper`; 
+		 STATIC_DEVMAPPER_LIBS=`$PKG_CONFIG --static --libs devmapper`;
+		 DEVMAPPER_REQ="devmapper";
+		 DEVMAPPER_PC_LIBS="-ldevmapper"],
+		[AC_MSG_ERROR([device-mapper library not found])],
+		[$DEVMAPPER_LIBS])
 fi]
 ,
 echo "Disabling device-mapper support by default"

e2fsprogs-1.39-close-on-error.patch:
 getsize.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE e2fsprogs-1.39-close-on-error.patch ---
--- e2fsprogs-1.39/lib/ext2fs/getsize.c.close-on-error	2005-09-06 11:40:14.000000000 +0200
+++ e2fsprogs-1.39/lib/ext2fs/getsize.c	2006-06-22 14:46:27.000000000 +0200
@@ -169,8 +169,10 @@
 #ifdef DKIOCGETBLOCKCOUNT	/* For Apple Darwin */
 	if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
 		if ((sizeof(*retblocks) < sizeof(unsigned long long))
-		    && ((size64 / (blocksize / 512)) > 0xFFFFFFFF))
-			return EFBIG;
+		    && ((size64 / (blocksize / 512)) > 0xFFFFFFFF)) {
+			rc = EFBIG;
+			goto out;
+		}
 		*retblocks = size64 / (blocksize / 512);
 		goto out;
 	}
@@ -275,8 +277,10 @@
 	valid_offset (fd, 0);
 	size64 = low + 1;
 	if ((sizeof(*retblocks) < sizeof(unsigned long long))
-	    && ((size64 / blocksize) > 0xFFFFFFFF))
-		return EFBIG;
+	    && ((size64 / blocksize) > 0xFFFFFFFF)) {
+		rc = EFBIG;
+		goto out;
+	}
 	*retblocks = size64 / blocksize;
 out:
 	close(fd);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	8 Sep 2005 16:11:43 -0000	1.14
+++ .cvsignore	6 Jul 2006 20:54:40 -0000	1.15
@@ -1,4 +1 @@
-e2fsprogs-1.36.tar.gz
-ext2resize-1.1.17.tar.bz2
-e2fsprogs-1.37.tar.gz
-e2fsprogs-1.38.tar.gz
+e2fsprogs-1.39.tar.gz


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- e2fsprogs.spec	14 Jun 2006 03:52:44 -0000	1.58
+++ e2fsprogs.spec	6 Jul 2006 20:54:40 -0000	1.59
@@ -3,43 +3,23 @@
 
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
-Version: 1.38
-Release: 15
+Version: 1.39
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
-Source1: http://sourceforge.net/projects/ext2resize/ext2resize-1.1.17.tar.bz2
-Patch9: e2fsprogs-enable-resize.patch
-Patch10: ext2resize-cvs-20040419.patch
-Patch11: ext2resize-gcc34-fixes.patch
-Patch12: ext2resize-printf-format-fixes.patch
-Patch13: ext2resize-compiler-warning-fixes.patch
-Patch14: ext2resize-canonicalise.patch
-Patch19: ext2resize-byteorder.patch
-Patch20: ext2resize-nofallback.patch
-Patch21: ext2resize-nowrite.patch
-Patch22: ext2resize-fixbuild.patch
-Patch26: e2fsprogs-1.37-blkid-swsuspend.patch
-Patch27: e2fsprogs-1.37-blkid-ext23.patch
-Patch28: e2fsprogs-1.37-blkid-nomagicvfat.patch
-Patch29: e2fsprogs-1.38-close-on-error.patch
+Patch29: e2fsprogs-1.39-close-on-error.patch
 Patch30: e2fsprogs-1.38-resize-inode.patch
-Patch31: e2fsprogs-1.38-man_no_ext2resize.patch
 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-epoch.patch
+Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
 Url: http://e2fsprogs.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
 BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel
 BuildRequires: libsepol-devel, gettext-devel, pkgconfig
 BuildRequires: device-mapper >= 1.02.02-3
 
-%define ext2resize_basever 1.1.17
-%define ext2resize_name ext2resize-%{ext2resize_basever}
-
 %description
 The e2fsprogs package contains a number of utilities for creating,
 checking, modifying, and correcting any inconsistencies in second
@@ -78,56 +58,14 @@
 
 %prep
 %setup -q -n e2fsprogs-%{version}
-# Enable the resize inode by default
-%patch9 -p1 -b .resize-on
-# fix swsuspend partition detection (#165863)
-%patch26 -p1 -b .swsuspend
-# fix revalidate from ext2 to ext3 (#162927)
-%patch27 -p1 -b .ext23
-# fix vfat without magic detection (#161873)
-%patch28 -p1 -b .vfatnomagic
-# clode fd's on error
+# close fd's on error
 %patch29 -p1 -b .close-on-error
 # enable tune2fs to set and clear the resize inode
 %patch30 -p1 -b .resize-inode
-
-# Now unpack the ext2resize online resize tarball...
-%setup -T -D -q -a 1
-# And apply the patches we need for that:
-pushd %{ext2resize_name}
-# Update to 20040419 ext2resize CVS
-%patch10 -p1 -b .cvs
-# Fix for gcc34 incompatibilities
-%patch11 -p1 -b .gcc34
-# Fix printk warnings on 64-bit archs
-%patch12 -p1 -b .printf
-# Fix misc compiler warnings
-%patch13 -p1 -b .warnings
-# Canonicalise device names to cope with (eg) LVM symlinks
-%patch14 -p1 -b .canon
-# Fix byte ordering problems on bigendian hosts
-%patch19 -p2 -b .byteorder
-# Disable fallback to old-style online resize
-%patch20 -p2 -b .nofallback
-# Disable the write path used by old-style online
-%patch21 -p2 -b .nowrite
-# Use the kernel prototypes, as they don't cause errors
-%patch22 -p1 -b .fixbuild
-popd
-
-# drop ext2resize, ext2prepare and e2fsadm from man page of ext2online
-%patch31 -p1 -b .man_no_ext2resize
 # drop timestamp from mo files
 %patch32 -p1 -b .pottcdate
-# fixed buffer overflow in mklost+found
-%patch33 -p1 -b .lost+found
-
 # look at device mapper devices
 %patch34 -p1 -b .dm
-
-# disable blkid.tab caching if time is set before epoch
-%patch35 -p1 -b .epoch
-
 # put blkid.tab in /etc/blkid/
 %patch36 -p1 -b .etcblkid
 
@@ -135,48 +73,21 @@
 aclocal
 autoconf
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
-# --enable-dynamic-e2fsck
 make -C po update-po
 make
 
-pushd %{ext2resize_name}
-# The byteorder patch adds a new file to the ext2online source tree, so
-# we need to rebuild the Makefiles from automake.
-aclocal
-automake -a -f
-# There's a new configure test for byte-order, too.
-autoconf
-%configure 
-make
-popd
-
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export PATH=/sbin:$PATH
-make install install-libs DESTDIR="$RPM_BUILD_ROOT" \
+make install install-libs DESTDIR="%{buildroot}" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
-/sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 %find_lang %{name}
 
-pushd %{ext2resize_name}
-make DESTDIR=$RPM_BUILD_ROOT install
-# For now, we only want to package up the ext2online binary.  Delete the
-# others.
-rm -f $RPM_BUILD_ROOT%{_sbindir}/ext2resize
-rm -f $RPM_BUILD_ROOT%{_sbindir}/ext2prepare
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ext2resize*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/ext2prepare*
-# We want some of the ext2resize doc files to be clearly identified as
-# not being part of e2fsprogs!
-mv AUTHORS AUTHORS.ext2resize
-mv COPYING COPYING.ext2resize
-mv NEWS NEWS.ext2resize
-mv README README.ext2resize
-mv doc/HOWTO doc/HOWTO.ext2resize
-popd
+%check
+make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 [ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || :
@@ -201,13 +112,9 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README RELEASE-NOTES
-%doc %{ext2resize_name}/AUTHORS.ext2resize
-%doc %{ext2resize_name}/COPYING.ext2resize
-%doc %{ext2resize_name}/NEWS.ext2resize
-%doc %{ext2resize_name}/README.ext2resize
-%doc %{ext2resize_name}/doc/HOWTO.ext2resize
 
 %dir /etc/blkid
+%config(noreplace) /etc/mke2fs.conf
 %{_root_sbindir}/badblocks
 %{_root_sbindir}/blkid
 %{_root_sbindir}/debugfs
@@ -235,6 +142,9 @@
 %{_mandir}/man1/lsattr.1*
 %{_mandir}/man1/uuidgen.1*
 
+%{_mandir}/man5/e2fsck.conf.5*
+%{_mandir}/man5/mke2fs.conf.5*
+
 %{_mandir}/man8/badblocks.8*
 %{_mandir}/man8/blkid.8*
 %{_mandir}/man8/debugfs.8*
@@ -255,10 +165,6 @@
 %{_mandir}/man8/resize2fs.8*
 %{_mandir}/man8/tune2fs.8*
 
-# ext2resize files
-%{_sbindir}/ext2online
-%{_mandir}/man8/ext2online.8*
-
 %files libs
 %defattr(-,root,root)
 %{_root_libdir}/libblkid.so.*
@@ -313,6 +219,12 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Thu Jul  6 2006 Thomas Woerner <twoerner at redhat.com> - 1.39-1
+- new version 1.39
+- dropped ext2online, because resize2fs is now able to do online resize
+- spec file cleanup
+- enabled checks for build
+
 * Tue Jun 13 2006 Bill Nottingham <notting at redhat.com> - 1.38-15
 - prevent libblkid returning /dev/dm-X
 - fix build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Sep 2005 16:11:43 -0000	1.14
+++ sources	6 Jul 2006 20:54:40 -0000	1.15
@@ -1,2 +1 @@
-439bf19d6520194ca42b942f5b7a0703  ext2resize-1.1.17.tar.bz2
-d774d4412bfb80d12cf3a4fdfd59de5a  e2fsprogs-1.38.tar.gz
+06f7806782e357797fad1d34b7ced0c6  e2fsprogs-1.39.tar.gz


--- e2fsprogs-1.1589.patch DELETED ---


--- e2fsprogs-1.1590.patch DELETED ---


--- e2fsprogs-1.1591.patch DELETED ---


--- e2fsprogs-1.36-cramfs-detect.patch DELETED ---


--- e2fsprogs-1.36-getsize-wrap.patch DELETED ---


--- e2fsprogs-1.37-blkid-ext23.patch DELETED ---


--- e2fsprogs-1.37-blkid-nomagicvfat.patch DELETED ---


--- e2fsprogs-1.37-blkid-swsuspend.patch DELETED ---


--- e2fsprogs-1.38-blkid-devmapper.patch DELETED ---


--- e2fsprogs-1.38-blkid-epoch.patch DELETED ---


--- e2fsprogs-1.38-blkid-selinux.patch DELETED ---


--- e2fsprogs-1.38-close-on-error.patch DELETED ---


--- e2fsprogs-1.38-lost+found.patch DELETED ---


--- e2fsprogs-1.38-man_no_ext2resize.patch DELETED ---


--- e2fsprogs-enable-resize.patch DELETED ---


--- ext2resize-byteorder.patch DELETED ---


--- ext2resize-canonicalise.patch DELETED ---


--- ext2resize-compiler-warning-fixes.patch DELETED ---


--- ext2resize-cvs-20040419.patch DELETED ---


--- ext2resize-fixbuild.patch DELETED ---


--- ext2resize-gcc34-fixes.patch DELETED ---


--- ext2resize-nofallback.patch DELETED ---


--- ext2resize-nowrite.patch DELETED ---


--- ext2resize-printf-format-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:04:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:04:38 -0400
Subject: rpms/cman/devel .cvsignore, 1.6, 1.7 cman.spec, 1.37, 1.38 sources,
	1.13, 1.14
Message-ID: <200607062104.k66L4cpc016823@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16761

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Building for latest sources.




Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cman.spec	19 Jun 2006 15:57:39 -0000	1.37
+++ cman.spec	6 Jul 2006 21:04:20 -0000	1.38
@@ -9,10 +9,12 @@
 ##
 ###############################################################################
 ###############################################################################
+%define cman_major 2
+%define cman_minor 0.1
 
 Name: cman
-Version: 2.0.0
-Release: 0.fc6.10
+Version: %{cman_major}.%{cman_minor}
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -56,8 +58,8 @@
 
 for dir in ccs cman dlm fence group; do
   cd $dir
-  sed -i '/RELEASE_MAJOR/s/= .*/= 2/' make/defines.mk
-  sed -i '/RELEASE_MINOR/s/= .*/= 0.0/' make/defines.mk
+  sed -i '/RELEASE_MAJOR/s/= .*/= %{cman_major}/' make/defines.mk
+  sed -i '/RELEASE_MINOR/s/= .*/= %{cman_minor}/' make/defines.mk
   sed -i '/RELEASE /s/= .*/= %version/' make/defines.mk
   cd ..
 done
@@ -106,7 +108,10 @@
 %{_libdir}/*.a
 
 %changelog
-* Wed Mar 1 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.4
+* Thu Jul 06 2006 Chris Feist <cfeist at redhat.com> - 2.0.1-0.fc6.0
+- Rebuild w/ new upstream sources
+
+* Wed Mar 01 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.4
 - Rebuilt w/ new upstream sources
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.FC5.1.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jun 2006 23:05:27 -0000	1.13
+++ sources	6 Jul 2006 21:04:20 -0000	1.14
@@ -1 +1 @@
-60bb6f7f263b54bed7397c850d1a1b8a  cman-2.0.0.tar.gz
+cb729ea28b39242550ff9148e5ec344c  cman-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:13:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:13:55 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.8,1.2353.2.9
Message-ID: <200607062113.k66LDtx5018831@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
blah blah




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.8
retrieving revision 1.2353.2.9
diff -u -r1.2353.2.8 -r1.2353.2.9
--- kernel-2.6.spec	6 Jul 2006 20:35:33 -0000	1.2353.2.8
+++ kernel-2.6.spec	6 Jul 2006 21:13:52 -0000	1.2353.2.9
@@ -19,8 +19,9 @@
 
 # After branching, please hardcode these values as the 
 # %dist and %rhel tags are not reliable yet
-#define dist
-#define rhel
+# For example dist -> .fc6 and rhel -> 5
+#%define dist .XX
+#%define rhel Y
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -174,7 +175,12 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
+%if 0{?rhel}
+# ppc and s390 are only built for internal use of compiling those arch's apps cleanly
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 s390 s390x
+%else
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+%endif
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:14:07 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.169,1.170
Message-ID: <200607062114.k66LE7W2018919@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- cman-kernel.spec	26 Jun 2006 16:20:35 -0000	1.169
+++ cman-kernel.spec	6 Jul 2006 21:14:04 -0000	1.170
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2139_FC5
+%define kernel_version 2.6.16-1.2122_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.24
+Release: 0.FC5.25
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:16:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:16:45 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.170,1.171
Message-ID: <200607062116.k66LGj8E028800@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- cman-kernel.spec	6 Jul 2006 21:14:04 -0000	1.170
+++ cman-kernel.spec	6 Jul 2006 21:16:42 -0000	1.171
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.16-1.2122_FC5
+%define kernel_version 2.6.17-1.2145
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.25
+Release: 0.FC5.26
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:17:06 -0400
Subject: rpms/pango/FC-5 pango-split.patch, 1.1, NONE private-api.patch, 1.1,
	NONE
Message-ID: <200607062117.k66LH62e030502@cvs.devel.redhat.com>

Author: besfahbo

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

Removed Files:
	pango-split.patch private-api.patch 
Log Message:
Remove unused patches.



--- pango-split.patch DELETED ---


--- private-api.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:17:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:17:15 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.164,1.165
Message-ID: <200607062117.k66LHFVx030878@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gnbd-kernel.spec	26 Jun 2006 16:34:28 -0000	1.164
+++ gnbd-kernel.spec	6 Jul 2006 21:17:12 -0000	1.165
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2139_FC5
+%define kernel_version 2.6.17-1.2145
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.33
+Release: 5.FC5.34
 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 Jul  6 21:17:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:17:32 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.141,1.142
Message-ID: <200607062117.k66LHWIS032174@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- dlm-kernel.spec	26 Jun 2006 18:46:48 -0000	1.141
+++ dlm-kernel.spec	6 Jul 2006 21:17:30 -0000	1.142
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2139_FC5
+%define kernel_version 2.6.17-1.2145
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.23
+Release: 0.FC5.24
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:17:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:17:46 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.162,1.163
Message-ID: <200607062117.k66LHkFM000873@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- GFS-kernel.spec	30 Jun 2006 18:12:24 -0000	1.162
+++ GFS-kernel.spec	6 Jul 2006 21:17:44 -0000	1.163
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2139_FC5
+%define kernel_version 2.6.17-1.2145
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.30
+Release: 5.FC5.31
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Thu Jul  6 21:21:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 17:21:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2353.2.9,1.2353.2.10
Message-ID: <200607062121.k66LLPJx003963@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
      Tag: private-dzickus-branch
	kernel-2.6.spec 
Log Message:
blah blah



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2353.2.9
retrieving revision 1.2353.2.10
diff -u -r1.2353.2.9 -r1.2353.2.10
--- kernel-2.6.spec	6 Jul 2006 21:13:52 -0000	1.2353.2.9
+++ kernel-2.6.spec	6 Jul 2006 21:21:21 -0000	1.2353.2.10
@@ -20,8 +20,8 @@
 # After branching, please hardcode these values as the 
 # %dist and %rhel tags are not reliable yet
 # For example dist -> .fc6 and rhel -> 5
-#%define dist .XX
-#%define rhel Y
+#% define dist .XX
+#% define rhel Y
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -175,7 +175,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-%if 0{?rhel}
+%if 0%{?rhel}
 # ppc and s390 are only built for internal use of compiling those arch's apps cleanly
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 s390 s390x
 %else



From fedora-cvs-commits at redhat.com  Thu Jul  6 22:59:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 18:59:18 -0400
Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-nv.spec, 1.21, 1.22
Message-ID: <200607062259.k66MxIhn011140@cvs.devel.redhat.com>

Author: ajackson

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Jun 2006 08:09:37 -0000	1.8
+++ .cvsignore	6 Jul 2006 22:59:15 -0000	1.9
@@ -1 +1 @@
-xf86-video-nv-1.1.2.tar.bz2
+xf86-video-nv-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 Jun 2006 08:09:37 -0000	1.8
+++ sources	6 Jul 2006 22:59:15 -0000	1.9
@@ -1 +1 @@
-29a6feeccd6b69d91f1443e08c7aacba  xf86-video-nv-1.1.2.tar.bz2
+63923dbec25cedbd2dcc376afea5ca76  xf86-video-nv-1.2.0.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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-nv.spec	28 Jun 2006 11:29:12 -0000	1.21
+++ xorg-x11-drv-nv.spec	6 Jul 2006 22:59:15 -0000	1.22
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   1.1.2
-Release:   2
+Version:   1.2.0
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -65,6 +65,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Thu Jul  6 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1
+- Update to 1.2.0: GeForce 6 and 7 updates and new hardware support.
+
 * Mon Jun 26 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-2
 - Make the message printed when modes are rejected for not fitting in the
   panel size more accurate (and quieter).



From fedora-cvs-commits at redhat.com  Fri Jul  7 00:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 20:13:38 -0400
Subject: rpms/kernel/devel/configs config-generic,1.213,1.214
Message-ID: <200607070013.k670DbHa006385@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Disable rt-mutex tester



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- config-generic	6 Jul 2006 04:57:58 -0000	1.213
+++ config-generic	7 Jul 2006 00:13:35 -0000	1.214
@@ -2556,8 +2556,8 @@
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_RT_MUTEX_TESTER=y
+CONFIG_DEBUG_RT_MUTEXEn=y
+# CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y



From fedora-cvs-commits at redhat.com  Fri Jul  7 00:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 20:13:38 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2356,1.2357
Message-ID: <200607070013.k670DbUT006378@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Disable rt-mutex tester



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2356
retrieving revision 1.2357
diff -u -r1.2356 -r1.2357
--- kernel-2.6.spec	6 Jul 2006 04:57:57 -0000	1.2356
+++ kernel-2.6.spec	7 Jul 2006 00:13:32 -0000	1.2357
@@ -1556,6 +1556,7 @@
 %changelog
 * Thu Jul  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1
+- Disable RT_MUTEX_TESTER
 
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git25



From fedora-cvs-commits at redhat.com  Fri Jul  7 00:20:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 20:20:09 -0400
Subject: rpms/kernel/devel/configs config-generic,1.214,1.215
Message-ID: <200607070020.k670K9D9022643@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
how did that happen?


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- config-generic	7 Jul 2006 00:13:35 -0000	1.214
+++ config-generic	7 Jul 2006 00:20:06 -0000	1.215
@@ -2556,7 +2556,7 @@
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_RT_MUTEXEn=y
+CONFIG_DEBUG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y



From fedora-cvs-commits at redhat.com  Fri Jul  7 01:49:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 6 Jul 2006 21:49:55 -0400
Subject: rpms/openais/devel .cvsignore, 1.3, 1.4 openais.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200607070149.k671ntp5026241@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26208/devel

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
auto-import openais-0.78-1.0 on branch devel from openais-0.78-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2006 23:38:54 -0000	1.3
+++ .cvsignore	7 Jul 2006 01:49:53 -0000	1.4
@@ -1 +1 @@
-openais-0.77.tar.gz
+openais-0.78.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openais.spec	21 Jun 2006 23:38:54 -0000	1.3
+++ openais.spec	7 Jul 2006 01:49:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.77
+Version: 0.78
 Release: 1.0
 License: BSD
 Group: System Environment/Base
@@ -160,6 +160,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Thu Jul 06 2006 Steven Dake <sdake at redhat.com> - 0.78-1.0
+- New upstream release.
+
 * Wed Jun 21 2006 Steven Dake <sdake at redhat.com> - 0.77-1.0
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2006 23:38:54 -0000	1.3
+++ sources	7 Jul 2006 01:49:53 -0000	1.4
@@ -1 +1 @@
-3b1798e5cfec5bddf69d8806d4995995  openais-0.77.tar.gz
+ab116b67d23743946a0a1f3bc77cf609  openais-0.78.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 04:23:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 00:23:25 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.71,1.72
Message-ID: <200607070423.k674NP2b024175@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
	rhythmbox.spec 
Log Message:
don't require eel2



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- rhythmbox.spec	19 Jun 2006 17:21:57 -0000	1.71
+++ rhythmbox.spec	7 Jul 2006 04:22:57 -0000	1.72
@@ -11,7 +11,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk2 >= 2.4.0
 Requires: libgnomeui >= 2.6.0
-Requires: eel2 >= 2.0.0
 Requires: libgpod 
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
@@ -128,6 +127,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Fri Jul  7 2006 Bill Nottingham <notting at redhat.com>
+- don't require eel2
+
 * Mon Jun 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.5-1
 - Update to 0.9.5
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 04:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 00:25:05 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-auth-add-autodetect.patch, NONE,
	1.1 autofs-5.0.0_beta6-correct-auto.smb.patch, NONE,
	1.1 autofs.spec, 1.119, 1.120
Message-ID: <200607070425.k674P5Cs024440@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-auth-add-autodetect.patch 
	autofs-5.0.0_beta6-correct-auto.smb.patch 
Log Message:
* Fri Jul 7 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-5
- correct auto.net installed as auto.smb.
- update LDAP auth - add autodectect option.


autofs-5.0.0_beta6-auth-add-autodetect.patch:
 CHANGELOG                     |    1 +
 include/lookup_ldap.h         |    4 ++++
 modules/lookup_ldap.c         |   27 ++++++++++++++++++---------
 samples/autofs_ldap_auth.conf |   14 ++++++++++----
 4 files changed, 33 insertions(+), 13 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-auth-add-autodetect.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index a4a2fd5..b0fc850 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - correct shutdown log message print.
 - correct auth init test when no credentials required.
 - correct auto.net installed as auto.smb.
+- update LDAP auth - add autodectect option.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
index ebff193..9cc214a 100644
--- a/include/lookup_ldap.h
+++ b/include/lookup_ldap.h
@@ -55,6 +55,10 @@ #define LDAP_TLS_REQUIRED	1
 #define LDAP_TLS_INIT		1
 #define LDAP_TLS_RELEASE	2
 
+#define LDAP_AUTH_NOTREQUIRED	0x0001
+#define LDAP_AUTH_REQUIRED	0x0002
+#define LDAP_AUTH_AUTODETECT	0x0004
+
 /* lookup_ldap.c */
 LDAP *init_ldap_connection(struct lookup_context *ctxt);
 int unbind_ldap_connection(LDAP *ldap, struct lookup_context *ctxt);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index d105e44..ca1258d 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -184,7 +184,8 @@ #if WITH_SASL
 	debug(LOGOPT_NONE, "auth_required: %d, sasl_mech %s",
 	      ctxt->auth_required, ctxt->sasl_mech);
 
-	if (ctxt->auth_required || ctxt->sasl_mech) {
+	if (ctxt->sasl_mech ||
+	   (ctxt->auth_required & (LDAP_AUTH_REQUIRED|LDAP_AUTH_AUTODETECT))) {
 		rv = autofs_sasl_bind(ldap, ctxt);
 		debug(LOGOPT_NONE, MODPREFIX
 		      "autofs_sasl_bind returned %d", rv);
@@ -258,7 +259,8 @@ int authtype_requires_creds(const char *
 int parse_ldap_config(struct lookup_context *ctxt)
 {
 	int          ret = 0, fallback = 0;
-	unsigned int auth_required = 0, tls_required = 0, use_tls = 0;
+	unsigned int auth_required = LDAP_AUTH_NOTREQUIRED;
+	unsigned int tls_required = 0, use_tls = 0;
 	struct stat  st;
 	xmlDocPtr    doc = NULL;
 	xmlNodePtr   root = NULL;
@@ -289,7 +291,7 @@ int parse_ldap_config(struct lookup_cont
 			ctxt->auth_conf = auth_conf;
 			ctxt->use_tls = LDAP_TLS_DONT_USE;
 			ctxt->tls_required = LDAP_TLS_DONT_USE;
-			ctxt->auth_required = 0;
+			ctxt->auth_required = LDAP_AUTH_NOTREQUIRED;
 			ctxt->sasl_mech = NULL;
 			ctxt->user = NULL;
 			ctxt->secret = NULL;
@@ -402,17 +404,19 @@ int parse_ldap_config(struct lookup_cont
 	}
 
 	if (!authrequired)
-		auth_required = 0;
+		auth_required = LDAP_AUTH_NOTREQUIRED;
 	else {
 		if (!strcasecmp(authrequired, "yes"))
-			auth_required = 1;
+			auth_required = LDAP_AUTH_REQUIRED;
 		else if (!strcasecmp(authrequired, "no"))
-			auth_required = 0;
+			auth_required = LDAP_AUTH_NOTREQUIRED;
+		else if (!strcasecmp(authrequired, "autodetect"))
+			auth_required = LDAP_AUTH_AUTODETECT;
 		else {
 			error(LOGOPT_ANY,
 			      MODPREFIX
 			      "The authrequired property must have value "
-			      "\"yes\" or \"no\".");
+			      "\"yes\", \"no\" or \"autodetect\".");
 			ret = -1;
 			goto out;
 		}
@@ -511,7 +515,7 @@ int auth_init(struct lookup_context *ctx
 	if (ret)
 		return -1;
 
-	if (!ctxt->auth_required)
+	if (ctxt->auth_required & LDAP_AUTH_NOTREQUIRED)
 		return 0;
 
 	ldap = init_ldap_connection(ctxt);
@@ -530,6 +534,11 @@ int auth_init(struct lookup_context *ctx
 	unbind_ldap_connection(ldap, ctxt);
 	if (ret) {
 		ctxt->sasl_mech = NULL;
+		if (ctxt->auth_required & LDAP_AUTH_AUTODETECT) {
+			warn(LOGOPT_NONE,
+			     "no authentication mechanisms auto detected.");
+			return 0;
+		}
 		return -1;
 	}
 
@@ -880,7 +889,7 @@ #if WITH_SASL
 	 * check by binding to the server temporarily.
 	 */
 	ret = auth_init(ctxt);
-	if (ret && ctxt->auth_required) {
+	if (ret && (ctxt->auth_required & LDAP_AUTH_REQUIRED)) {
 		error(LOGOPT_ANY, MODPREFIX
 		      "cannot initialize authentication setup");
 		free_context(ctxt);
diff --git a/samples/autofs_ldap_auth.conf b/samples/autofs_ldap_auth.conf
index 1b20c09..e10d1ea 100644
--- a/samples/autofs_ldap_auth.conf
+++ b/samples/autofs_ldap_auth.conf
@@ -15,13 +15,19 @@ tlsrequired  -  This flag tells whether 
 	   "yes"
 	   "no"
 
-authrequired  -  This is a boolean flag which tells whether an
-	    authenticated connection to the ldap server is required in order
-	    to perform ldap queries.  If this flag is set to yes, then only
-	    authenticated connections to the ldap server will be allowed.
+authrequired  -  This option tells whether an authenticated connection to
+	    the ldap server is required in order to perform ldap queries.
+	    If this flag is set to yes, then only authenticated connections
+	    will be allowed. If it is set to no then authentication is not
+	    needed for ldap server connections. Finally, if it is set to
+	    autodetect then the ldap server will be queried to establish
+	    a suitable authentication mechanism. If no suitable mechanism
+	    can be found, connections to the ldap server are made without
+	    authentication.
 	    Legal values for this option include:
 	    "yes"
 	    "no"
+	    "autodetect"
 
 authtype  -  This attribute can be used to specify a preferred
 	    authentication mechanism.  In normal operations, the

autofs-5.0.0_beta6-correct-auto.smb.patch:
 CHANGELOG        |    1 +
 samples/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta6-correct-auto.smb.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 1dc3293..a4a2fd5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - correct test for existence of auth config file.
 - correct shutdown log message print.
 - correct auth init test when no credentials required.
+- correct auto.net installed as auto.smb.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/samples/Makefile b/samples/Makefile
index d68c7b3..2cd90b1 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -166,7 +166,7 @@ auto.smb:
 		echo "Found existing backup of sample map \"auto.smb\"." ; \
 		echo "Installed package sample as \"auto.smb.new\"." ; \
 	else \
-		install -v auto.net -m 755 $(SMB) \
+		install -v auto.smb -m 755 $(SMB) \
 				$(INSTALLROOT)$(autofsmapdir)/auto.smb ; \
 		echo "Installed package sample map as \"auto.smb\"." ; \
 		if test -z "$(SEXISTS)" ; \


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- autofs.spec	5 Jul 2006 10:17:32 -0000	1.119
+++ autofs.spec	7 Jul 2006 04:24:58 -0000	1.120
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -18,6 +18,8 @@
 Patch5: autofs-5.0.0_beta6-auth-config-exits.patch
 Patch6: autofs-5.0.0_beta6-shutdown-log-message.patch
 Patch7: autofs-5.0.0_beta6-check-no-creds-required.patch
+Patch8: autofs-5.0.0_beta6-correct-auto.smb.patch
+Patch9: autofs-5.0.0_beta6-auth-add-autodetect.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -63,6 +65,8 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -119,6 +123,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Jul 7 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-5
+- correct auto.net installed as auto.smb.
+- update LDAP auth - add autodectect option.
+
 * Wed Jul 5 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-4
 - correct shutdown log message print.
 - correct auth init test when no credentials required.



From fedora-cvs-commits at redhat.com  Fri Jul  7 06:06:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 02:06:42 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.108,1.109
Message-ID: <200607070606.k6766g4W028595@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jul  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-26
- Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
  GLX_MESA_copy_sub_buffer extension.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- xorg-x11-server.spec	30 Jun 2006 09:20:24 -0000	1.108
+++ xorg-x11-server.spec	7 Jul 2006 06:06:37 -0000	1.109
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   25%{dist}
+Release:   26%{dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -33,6 +33,7 @@
 Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 Patch102:  xorg-x11-server-1.1.0-convolution-filter-fix.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
+Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -309,6 +310,7 @@
 %patch101 -p0 -b .gl-include-inferiors
 %patch102 -p1 -b .convolution-filter-fix
 %patch103 -p0 -b .tfp-damage
+%patch104 -p0 -b .mesa-copy-sub-buffer
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -651,6 +653,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jul  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-26
+- Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
+  GLX_MESA_copy_sub_buffer extension.
+
 * Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc5
 - Start using the new %%{dist} tag <http://fedoraproject.org/wiki/DistTag>
   experimentally in the package Release field to help prevent problems like



From fedora-cvs-commits at redhat.com  Fri Jul  7 06:08:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 02:08:59 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch, NONE, 1.1
Message-ID: <200607070608.k6768x6m028654@cvs.devel.redhat.com>

Author: krh

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

Added Files:
	xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch 
Log Message:
Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch

xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch:
 g_disptab.h   |    9 +++++
 glxcmds.c     |   91 ++++++++++++++++++++++++++++++++++++++++++----------------
 glxcmdsswap.c |   29 +++++++++++++++++-
 glxdrawable.h |    2 +
 glxdri.c      |   49 +++++++++++++++++++++++++++----
 glxscreens.c  |    1 
 6 files changed, 149 insertions(+), 32 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch ---
--- ./GL/glx/glxdrawable.h.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
+++ ./GL/glx/glxdrawable.h	2006-07-06 21:56:33.000000000 -0400
@@ -58,6 +58,8 @@
     void (*destroy)(__GLXdrawable *private);
     GLboolean (*resize)(__GLXdrawable *private);
     GLboolean (*swapBuffers)(__GLXdrawable *);
+    void      (*copySubBuffer)(__GLXdrawable *drawable,
+			       int x, int y, int w, int h);
 
     /*
     ** list of drawable private structs
--- ./GL/glx/glxcmds.c.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
+++ ./GL/glx/glxcmds.c	2006-07-06 22:30:01.000000000 -0400
@@ -1331,21 +1331,14 @@
 
 /*****************************************************************************/
 
-/*
-** NOTE: There is no portable implementation for swap buffers as of
-** this time that is of value.  Consequently, this code must be
-** implemented by somebody other than SGI.
-*/
-int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
+static __GLXdrawable *
+SyncContextGetDrawable (__GLXclientState *cl, GLXContextTag tag,
+			XID drawId, int *status)
 {
     ClientPtr client = cl->client;
     DrawablePtr pDraw;
-    xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
-    GLXContextTag tag = req->contextTag;
-    XID drawId = req->drawable;
     __GLXpixmap *pGlxPixmap;
     __GLXcontext *glxc = NULL;
-    int error;
     
     /*
     ** Check that the GLX drawable is valid.
@@ -1361,11 +1354,11 @@
 	    ** Drawable is an X pixmap, which is not allowed.
 	    */
 	    client->errorValue = drawId;
-	    return __glXBadDrawable;
+	    *status = __glXBadDrawable;
+	    return NULL;
 	}
     } else {
-	pGlxPixmap = (__GLXpixmap *) LookupIDByType(drawId,
-						    __glXPixmapRes);
+	pGlxPixmap = (__GLXpixmap *) LookupIDByType(drawId, __glXPixmapRes);
 	if (pGlxPixmap) {
 	    /*
 	    ** Drawable is a GLX pixmap.
@@ -1375,21 +1368,23 @@
 	    ** Drawable is neither a X window nor a GLX pixmap.
 	    */
 	    client->errorValue = drawId;
-	    return __glXBadDrawable;
+	    *status = __glXBadDrawable;
+	    return NULL;
 	}
     }
 
     if (tag) {
 	glxc = __glXLookupContextByTag(cl, tag);
 	if (!glxc) {
-	    return __glXBadContextTag;
+	    *status = __glXBadContextTag;
+	    return NULL;
 	}
 	/*
 	** The calling thread is swapping its current drawable.  In this case,
 	** glxSwapBuffers is in both GL and X streams, in terms of
 	** sequentiality.
 	*/
-	if (__glXForceCurrent(cl, tag, &error)) {
+	if (__glXForceCurrent(cl, tag, status)) {
 	    /*
 	    ** Do whatever is needed to make sure that all preceding requests
 	    ** in both streams are completed before the swap is executed.
@@ -1397,33 +1392,53 @@
 	    CALL_Finish( GET_DISPATCH(), () );
 	    __GLX_NOTE_FLUSHED_CMDS(glxc);
 	} else {
-	    return error;
+	    return NULL;
 	}
     }
 
+    *status = Success;
     if (pDraw) {
-	__GLXdrawable *glxPriv;
+        __GLXdrawable *glxPriv;
 
 	if (glxc) {
 	    glxPriv = __glXGetDrawable(glxc, pDraw, drawId);
 	    if (glxPriv == NULL) {
-		return __glXBadDrawable;
+		*status = __glXBadDrawable;
+		return NULL;
 	    }
 	}
 	else {
 	    glxPriv = __glXFindDrawable(drawId);
 	    if (glxPriv == NULL) {
 		/* This is a window we've never seen before, do nothing */
-		return Success;
+		return NULL;
 	    }
 	}
 
-	if ((*glxPriv->swapBuffers)(glxPriv) == GL_FALSE) {
-	    return __glXBadDrawable;
-	}
+	return glxPriv;
     }
 
-    return Success;
+    return NULL;
+}
+
+/*
+** NOTE: There is no portable implementation for swap buffers as of
+** this time that is of value.  Consequently, this code must be
+** implemented by somebody other than SGI.
+*/
+int __glXSwapBuffers(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXSwapBuffersReq *req = (xGLXSwapBuffersReq *) pc;
+    GLXContextTag tag = req->contextTag;
+    __GLXdrawable *glxPriv;
+    int status;
+
+    glxPriv = SyncContextGetDrawable (cl, tag, req->drawable, &status);
+    if (glxPriv && (*glxPriv->swapBuffers)(glxPriv) == GL_FALSE) {
+        return __glXBadDrawable;
+    }
+
+    return status;
 }
 
 
@@ -1544,6 +1559,30 @@
 						       pGlxPixmap);
 }
 
+int __glXCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+    GLXContextTag tag = req->contextTag;
+    __GLXdrawable *glxPriv;
+    GLXDrawable		  drawId;
+    int                   x, y, width, height;
+    int status;
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+
+    drawId = *((CARD32 *) (pc));
+    x      = *((INT32 *)  (pc + 4));
+    y      = *((INT32 *)  (pc + 8));
+    width  = *((INT32 *)  (pc + 12));
+    height = *((INT32 *)  (pc + 16));
+
+    glxPriv = SyncContextGetDrawable (cl, tag, drawId, &status);
+    if (glxPriv)
+	(*glxPriv->copySubBuffer)(glxPriv, x, y, width, height);
+
+    return status;
+}
+
 /*
 ** Get drawable attributes
 */
@@ -2173,7 +2212,9 @@
     case X_GLXvop_BindTexImageEXT:
 	return __glXBindTexImageEXT(cl, pc);
     case X_GLXvop_ReleaseTexImageEXT:
-	return __glXReleaseTexImageEXT(cl, pc);  
+	return __glXReleaseTexImageEXT(cl, pc);
+    case X_GLXvop_CopySubBufferMESA:
+	return __glXCopySubBufferMESA(cl, pc);
     }
 #endif
 
--- ./GL/glx/glxdri.c.mesa-copy-sub-buffer	2006-07-06 21:40:41.000000000 -0400
+++ ./GL/glx/glxdri.c	2006-07-06 21:59:38.000000000 -0400
@@ -112,12 +112,28 @@
  *            months ago. :(
  * 20050727 - Gut all the old interfaces.  This breaks compatability with
  *            any DRI driver built to any previous version.
+ * 20060314 - Added support for GLX_MESA_copy_sub_buffer.
  */
+
 #define INTERNAL_VERSION 20050727
 
 static const char CREATE_NEW_SCREEN_FUNC[] =
     "__driCreateNewScreen_" STRINGIFY (INTERNAL_VERSION);
 
+/* The DRI driver entry point version wasn't bumped when the
+ * copySubBuffer functionality was added to the DRI drivers, but the
+ * functionality is still conditional on the value of the
+ * internal_api_version passed to __driCreateNewScreen.  However, the
+ * screen constructor doesn't fail for a DRI driver that's older than
+ * the passed in version number, so there's no way we can know for
+ * sure that we can actually use the copySubBuffer functionality.  But
+ * since the earliest (and at this point only) released mesa version
+ * (6.5) that uses the 20050727 entry point does have copySubBuffer,
+ * we'll just settle for that.  We still have to pass in a higher to
+ * the screen constructor to enable the functionality.
+ */
+#define COPY_SUB_BUFFER_INTERNAL_VERSION 20060314
+
 static void
 __glXDRIleaveServer(void)
 {
@@ -177,6 +193,27 @@
     return TRUE;
 }
 
+static void
+__glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate,
+			       int x, int y, int w, int h)
+{
+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
+    __GLXDRIscreen *screen;
+
+    /* FIXME: We're jumping through hoops here to get the DRIdrawable
+     * which the dri driver tries to keep to it self...  cf. FIXME in
+     * createDrawable. */
+
+    screen = (__GLXDRIscreen *) __glXgetActiveScreen(private->base.pDraw->pScreen->myNum);
+    private->driDrawable = (screen->driScreen.getDrawable)(NULL,
+							   private->base.drawId,
+							   screen->driScreen.private);
+
+    (*private->driDrawable->copySubBuffer)(NULL,
+					   private->driDrawable->private,
+					   x, y, w, h);
+}
+
 static __GLXdrawable *
 __glXDRIcontextCreateDrawable(__GLXcontext *context,
 			      DrawablePtr pDraw,
@@ -195,10 +232,11 @@
 	return NULL;
     }
 
-    private->base.destroy     = __glXDRIdrawableDestroy;
-    private->base.resize      = __glXDRIdrawableResize;
-    private->base.swapBuffers = __glXDRIdrawableSwapBuffers;
-    
+    private->base.destroy       = __glXDRIdrawableDestroy;
+    private->base.resize        = __glXDRIdrawableResize;
+    private->base.swapBuffers   = __glXDRIdrawableSwapBuffers;
+    private->base.copySubBuffer = __glXDRIdrawableCopySubBuffer;
+
 #if 0
     /* FIXME: It would only be natural that we called
      * driScreen->createNewDrawable here but the DRI drivers manage
@@ -218,7 +256,6 @@
     return &private->base;
 }
 
-
 static void
 __glXDRIcontextDestroy(__GLXcontext *baseContext)
 {
@@ -770,7 +807,7 @@
     __DRIframebuffer  framebuffer;
     int   fd = -1;
     int   status;
-    int api_ver = INTERNAL_VERSION;
+    int api_ver = COPY_SUB_BUFFER_INTERNAL_VERSION;
     drm_magic_t magic;
     drmVersionPtr version;
     char *driverName;
--- ./GL/glx/g_disptab.h.mesa-copy-sub-buffer	2006-03-11 19:11:33.000000000 -0500
+++ ./GL/glx/g_disptab.h	2006-07-06 21:56:33.000000000 -0400
@@ -48,6 +48,7 @@
 extern int __glXSwapBuffers(__GLXclientState*, GLbyte*);
 extern int __glXBindTexImageEXT(__GLXclientState *cl, GLbyte *pc);
 extern int __glXReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
+extern int __glXCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc);
 extern int __glXGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc);
 extern int __glXUseXFont(__GLXclientState*, GLbyte*);
 extern int __glXCreateGLXPixmap(__GLXclientState*, GLbyte*);
@@ -76,6 +77,7 @@
 extern int __glXSwapSwapBuffers(__GLXclientState*, GLbyte*);
 extern int __glXSwapBindTexImageEXT(__GLXclientState *cl, GLbyte *pc);
 extern int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
+extern int __glXSwapReleaseTexImageEXT(__GLXclientState *cl, GLbyte *pc);
 extern int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc);
 extern int __glXSwapUseXFont(__GLXclientState*, GLbyte*);
 extern int __glXSwapCreateGLXPixmap(__GLXclientState*, GLbyte*);
@@ -105,4 +107,11 @@
 extern __GLXdispatchSingleProcPtr __glXSingleTable[__GLX_SINGLE_TABLE_SIZE];
 extern __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE];
 extern __GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE];
+
+/* Copied from mesa src/glx/x11/glxcmds.c
+ *
+ * Apparently there's no standardized opcode for this extension.
+ */
+#define X_GLXvop_CopySubBufferMESA 5154 /* temporary */
+
 #endif /* _GLX_g_disptab_h_ */
--- ./GL/glx/glxscreens.c.mesa-copy-sub-buffer	2006-03-20 15:10:29.000000000 -0500
+++ ./GL/glx/glxscreens.c	2006-07-06 21:56:33.000000000 -0400
@@ -139,6 +139,7 @@
                         "GLX_SGIX_swap_barrier "
 #endif
 			"GLX_SGIX_fbconfig "
+			"GLX_MESA_copy_sub_buffer "
 			;
 
 __GLXscreen **__glXActiveScreens;
--- ./GL/glx/glxcmdsswap.c.mesa-copy-sub-buffer	2006-04-02 22:09:15.000000000 -0400
+++ ./GL/glx/glxcmdsswap.c	2006-07-06 21:56:33.000000000 -0400
@@ -432,6 +432,31 @@
     return __glXReleaseTexImageEXT(cl, (GLbyte *)pc);
 }
 
+int __glXSwapCopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
+{
+    xGLXVendorPrivateReq *req = (xGLXVendorPrivateReq *) pc;
+    GLXDrawable		 *drawId;
+    int			 *buffer;
+
+    (void) drawId;
+    (void) buffer;
+
+    __GLX_DECLARE_SWAP_VARIABLES;
+
+    pc += __GLX_VENDPRIV_HDR_SIZE;
+
+    __GLX_SWAP_SHORT(&req->length);
+    __GLX_SWAP_INT(&req->contextTag);
+    __GLX_SWAP_INT(pc);
+    __GLX_SWAP_INT(pc + 4);
+    __GLX_SWAP_INT(pc + 8);
+    __GLX_SWAP_INT(pc + 12);
+    __GLX_SWAP_INT(pc + 16);
+
+    return __glXCopySubBufferMESA(cl, pc);
+
+}
+
 int __glXSwapGetDrawableAttributesSGIX(__GLXclientState *cl, GLbyte *pc)
 {
     xGLXVendorPrivateWithReplyReq *req = (xGLXVendorPrivateWithReplyReq *)pc;
@@ -899,7 +924,9 @@
     case X_GLXvop_BindTexImageEXT:
 	return __glXSwapBindTexImageEXT(cl, pc);
     case X_GLXvop_ReleaseTexImageEXT:
-	return __glXSwapReleaseTexImageEXT(cl, pc);  
+	return __glXSwapReleaseTexImageEXT(cl, pc);
+    case X_GLXvop_CopySubBufferMESA:
+	return __glXSwapCopySubBufferMESA(cl, pc);
     }
 #endif
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 07:52:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 03:52:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2357,
	1.2358 linux-2.6-lockdep-fixes.patch, 1.3, 1.4
Message-ID: <200607070752.k677qXDX025936@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Log Message:
Add lockdep annotate for bdev warning.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2357
retrieving revision 1.2358
diff -u -r1.2357 -r1.2358
--- kernel-2.6.spec	7 Jul 2006 00:13:32 -0000	1.2357
+++ kernel-2.6.spec	7 Jul 2006 07:52:24 -0000	1.2358
@@ -1554,6 +1554,9 @@
 %endif
 
 %changelog
+* Fri Jul  7 2006 Dave Jones <davej at redhat.com>
+- Add lockdep annotate for bdev warning.
+
 * Thu Jul  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1
 - Disable RT_MUTEX_TESTER

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h |    6 +-
 linux-2.6.17-mm6/kernel/lockdep.c   |   14 ++++-
 linux-2.6.17-mm6/net/atm/ipcommon.c |   23 +++++++--
 linux-2.6.18-rc1/fs/block_dev.c     |    2 
 linux/arch/x86_64/kernel/smpboot.c  |    4 -
 linux/include/linux/completion.h    |   10 +++-
 linux/include/linux/lockdep.h       |    2 
 linux/kernel/lockdep.c              |   87 ++++++++++++++++++++++--------------
 8 files changed, 97 insertions(+), 51 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-lockdep-fixes.patch	5 Jul 2006 13:04:01 -0000	1.3
+++ linux-2.6-lockdep-fixes.patch	7 Jul 2006 07:52:26 -0000	1.4
@@ -736,3 +736,80 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From davej  Fri Jul  7 03:35:19 2006
+Return-Path: <SRS0+ef490921a1c7f4a961d7+1048+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Fri, 07 Jul 2006 03:35:19 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Fri, 07 Jul 2006 03:34:52 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k677YqmA013341;
+	Fri, 7 Jul 2006 03:34:52 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k677YpbI003445;
+	Fri, 7 Jul 2006 03:34:51 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k677Yo2Z026997;
+	Fri, 7 Jul 2006 03:34:50 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1FykrQ-0003Cq-NY; Fri, 07 Jul 2006 08:34:48 +0100
+Subject: Re: lockdep: bdev->bd_mutex deadlock
+From: Arjan van de Ven <arjan at infradead.org>
+To: Peter Jones <pjones at redhat.com>
+Cc: mingo at elte.hu, linux-kernel <linux-kernel at vger.kernel.org>,
+        Dave Jones <davej at redhat.com>
+In-Reply-To: <1152221477.25480.9.camel at localhost.localdomain>
+References: <1152221477.25480.9.camel at localhost.localdomain>
+Content-Type: text/plain
+Date: Fri, 07 Jul 2006 09:34:47 +0200
+Message-Id: <1152257687.3111.23.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+Content-Transfer-Encoding: 7bit
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 2.646 **
+Status: RO
+Content-Length: 838
+Lines: 30
+
+
+> <4> [<c0463f46>] __blkdev_put+0x22/0x123
+> <4> [<c0464060>] blkdev_put+0xa/0xc
+> <4> [<c04644e2>] do_open+0x313/0x385
+> <4> [<c0464759>] blkdev_open+0x1f/0x48
+
+ok this is a missing annotation in the error path
+
+the patch below should fix this, can you verify this?
+
+
+
+---
+ fs/block_dev.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.18-rc1/fs/block_dev.c
+===================================================================
+--- linux-2.6.18-rc1.orig/fs/block_dev.c
++++ linux-2.6.18-rc1/fs/block_dev.c
+@@ -980,7 +980,7 @@ out_first:
+ 	bdev->bd_disk = NULL;
+ 	bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
+ 	if (bdev != bdev->bd_contains)
+-		blkdev_put(bdev->bd_contains);
++		blkdev_put_partition(bdev->bd_contains);
+ 	bdev->bd_contains = NULL;
+ 	put_disk(disk);
+ 	module_put(owner);
+
+



From fedora-cvs-commits at redhat.com  Fri Jul  7 09:32:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 05:32:07 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.124,1.125
Message-ID: <200607070932.k679W7Va032118@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32101

Modified Files:
	util-linux.spec 
Log Message:
include the raw command to RHELs builds


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- util-linux.spec	26 Jun 2006 16:13:09 -0000	1.124
+++ util-linux.spec	7 Jul 2006 09:32:01 -0000	1.125
@@ -4,13 +4,21 @@
 #
 # Notes:
 # 	- upstream maintainer Adrian Bunk <bunk at kernel.org>
-#
-# TODO:
-#	- remove deprecated the arch command (since release 2.13)
-#
+
+### Header 
+Summary: A collection of basic system utilities.
+Name: util-linux
+Version: 2.13
+Release: 0.29
+License: distributable
+Group: System Environment/Base
 
 ### Features
+%if 0%{?rhel}
+%define include_raw 1
+%else
 %define include_raw 0
+%endif
 
 ### Macros
 %define floppyver 0.12
@@ -21,14 +29,6 @@
 BuildRoot: %{_tmppath}/%{name}-root
 # see build section for _prefix
 
-### Header 
-Summary: A collection of basic system utilities.
-Name: util-linux
-Version: 2.13
-Release: 0.28
-License: distributable
-Group: System Environment/Base
-
 ### Dependences
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf
@@ -290,7 +290,7 @@
 %patch221 -p1
 %patch222 -p1
 %patch223 -p1
-%patch224 -p1 -b .selinux
+%patch224 -p1
 %patch225 -p1
 %patch226 -p1
 %patch227 -p1
@@ -698,7 +698,10 @@
 /sbin/losetup
 
 %changelog
-* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>
+* Fri Jul  7 2006 Karel Zak <kzak at redhat.com> 2.13-0.29 
+- include the raw command for RHELs
+
+* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com> 2.13-0.28
 - move install-info parts from postun to preun
 
 * Wed Jun 21 2006 Dan Walsh <dwalsh at RedHat.com> 2.13-0.27



From fedora-cvs-commits at redhat.com  Fri Jul  7 09:35:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 05:35:53 -0400
Subject: rpms/libidn/devel libidn-0.6.4.tar.gz.sig, NONE, 1.1 .cvsignore,
	1.22, 1.23 libidn.spec, 1.33, 1.34 sources, 1.23,
	1.24 upstream, 1.13, 1.14 libidn-0.6.2-configdoth.patch, 1.1,
	NONE libidn-0.6.3.tar.gz.sig, 1.1, NONE
Message-ID: <200607070935.k679ZrtR032174@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore libidn.spec sources upstream 
Added Files:
	libidn-0.6.4.tar.gz.sig 
Removed Files:
	libidn-0.6.2-configdoth.patch libidn-0.6.3.tar.gz.sig 
Log Message:
* Fri Jul  7 2006 Joe Orton <jorton at redhat.com> 0.6.4-1
- update to 0.6.4



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

iOoEAAECADQFAkStlyMtFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz
QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvUEkFALmkQ693Mb7i6RZKpIwPiIaYW2iw
EEkB++8I5c9AwVUx9ObdQGvpIyuCe2iSnlufuAA7ceOx6OsNz5fYir3e2dayxVtF
n+10BbJprB++hjsIYmvxYd7rknPgWo64509ItsPiR3Mgyx8bYFlz5KRObQ5B8Szt
HIeAH2qNsvHQdPIIsDOrVRGkd9PPVBzcfI8iU+3GHQeYji2JFhckZoZBOzw=
=iaHS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	1 Jun 2006 12:13:24 -0000	1.22
+++ .cvsignore	7 Jul 2006 09:35:45 -0000	1.23
@@ -1 +1,4 @@
-libidn-0.6.3.tar.gz
+libidn-0.6.4.tar.gz
+*.rpm
+x86_64
+clog


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


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	1 Jun 2006 12:13:25 -0000	1.23
+++ sources	7 Jul 2006 09:35:46 -0000	1.24
@@ -1 +1 @@
-d240631c93c7d3a0e93cdf66f536073f  libidn-0.6.3.tar.gz
+43b53d7bab03e9b156232850e7ccc5c9  libidn-0.6.4.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/upstream,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- upstream	1 Jun 2006 12:13:25 -0000	1.13
+++ upstream	7 Jul 2006 09:35:46 -0000	1.14
@@ -1 +1 @@
-libidn-0.6.3.tar.gz
+libidn-0.6.4.tar.gz


--- libidn-0.6.2-configdoth.patch DELETED ---


--- libidn-0.6.3.tar.gz.sig DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 09:46:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 05:46:18 -0400
Subject: rpms/libgdiplus/devel .cvsignore, 1.8, 1.9 libgdiplus.spec, 1.15,
	1.16 sources, 1.8, 1.9
Message-ID: <200607070946.k679kIrH002696@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/libgdiplus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2058

Modified Files:
	.cvsignore libgdiplus.spec sources 
Log Message:
* Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
- update to 1.1.16




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Jun 2006 09:47:57 -0000	1.8
+++ .cvsignore	7 Jul 2006 09:46:14 -0000	1.9
@@ -1 +1 @@
-libgdiplus-1.1.15.tar.gz
+libgdiplus-1.1.16.tar.gz


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libgdiplus.spec	7 Jun 2006 09:47:57 -0000	1.15
+++ libgdiplus.spec	7 Jul 2006 09:46:14 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           libgdiplus
-Version:        1.1.15
+Version:        1.1.16
 Release:        1
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
@@ -46,6 +46,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
+- update to 1.1.16
+
 * Wed Jun  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.15-1
 - Update to 1.1.15
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jun 2006 09:47:57 -0000	1.8
+++ sources	7 Jul 2006 09:46:14 -0000	1.9
@@ -1 +1 @@
-e83445aa439545cf31d32a78cf50ffc2  libgdiplus-1.1.15.tar.gz
+f861a70afc88b0d1a56651b4ed423ceb  libgdiplus-1.1.16.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 10:27:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 06:27:14 -0400
Subject: rpms/cups/devel cups.spec,1.224,1.225
Message-ID: <200607071027.k67AREwF011298@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-18
- Ship with an empty classes.conf file.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- cups.spec	4 Jul 2006 16:58:59 -0000	1.224
+++ cups.spec	7 Jul 2006 10:27:09 -0000	1.225
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 17
+Release: 18
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -232,6 +232,7 @@
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/classes.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
 
 # Ship an SSL directory
@@ -311,6 +312,7 @@
 %config(noreplace) %attr(0640,root,lp) /etc/cups/cupsd.conf
 %attr(0640,root,lp) /etc/cups/cupsd.conf.default
 %config(noreplace) %attr(0644,root,lp) /etc/cups/client.conf
+%config(noreplace) %attr(0644,root,lp) /etc/cups/classes.conf
 %config(noreplace) %attr(0600,root,lp) /etc/cups/printers.conf
 %config(noreplace) %attr(0644,root,lp) /etc/cups/pdftops.conf
 %config(noreplace) %attr(0644,root,lp) /etc/cups/snmp.conf
@@ -393,6 +395,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-18
+- Ship with an empty classes.conf file.
+
 * Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-17
 - Sync with svn5706.
 - No longer need localhost, str1740, str1758, str1736, str1776 patches.



From fedora-cvs-commits at redhat.com  Fri Jul  7 11:08:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 07:08:04 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.61, 1.62 libsemanage.spec, 1.95,
	1.96 sources, 1.63, 1.64
Message-ID: <200607071108.k67B84dQ003215@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3180

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.11-1
- Upgrade to latest from NSA
	* Lindent.
	* Merged setfiles location check patch from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	16 Jun 2006 19:14:07 -0000	1.61
+++ .cvsignore	7 Jul 2006 11:08:01 -0000	1.62
@@ -67,3 +67,4 @@
 libsemanage-1.6.7.tgz
 libsemanage-1.6.8.tgz
 libsemanage-1.6.9.tgz
+libsemanage-1.6.11.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- libsemanage.spec	16 Jun 2006 19:14:07 -0000	1.95
+++ libsemanage.spec	7 Jul 2006 11:08:01 -0000	1.96
@@ -1,13 +1,12 @@
-%define libsepolver 1.12.17-1
-%define libselinuxver 1.30.12-1
+%define libsepolver 1.12.19-1
+%define libselinuxver 1.30.19-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.9
+Version: 1.6.11
 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} 
@@ -41,7 +40,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make clean
@@ -77,6 +75,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.11-1
+- Upgrade to latest from NSA
+	* Lindent.
+	* Merged setfiles location check patch from Dan Walsh.
+
 * Fri Jun 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.9-1
 - Upgrade to latest from NSA
 	* Merged several fixes from Serge Hallyn:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	16 Jun 2006 19:14:07 -0000	1.63
+++ sources	7 Jul 2006 11:08:01 -0000	1.64
@@ -1 +1 @@
-747f95cefadd172db85c5060f91d9eb5  libsemanage-1.6.9.tgz
+443cf8d48b5bd31e6f986fd33ab884cd  libsemanage-1.6.11.tgz



From fedora-cvs-commits at redhat.com  Fri Jul  7 11:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 07:12:48 -0400
Subject: rpms/mono/devel .cvsignore, 1.9, 1.10 mono.spec, 1.37, 1.38 sources,
	1.9, 1.10
Message-ID: <200607071112.k67BCmf0004188@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3969

Modified Files:
	.cvsignore mono.spec sources 
Log Message:
* Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
- update to 1.1.16




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Jun 2006 09:59:06 -0000	1.9
+++ .cvsignore	7 Jul 2006 11:12:45 -0000	1.10
@@ -1 +1 @@
-mono-1.1.15.tar.gz
+mono-1.1.16.tar.gz


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mono.spec	7 Jun 2006 11:36:22 -0000	1.37
+++ mono.spec	7 Jul 2006 11:12:45 -0000	1.38
@@ -1,5 +1,5 @@
 Name:           mono
-Version:        1.1.15
+Version:        1.1.16
 Release:        1
 Summary:        a .NET runtime environment
 
@@ -20,9 +20,7 @@
 %endif
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
-# Disabled due to strange build failure:
-# s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
 
 Patch1: mono-1.1.13.4-selinux-ia64.patch
 Patch2: mono-1.1.13.4-ppc-threading.patch
@@ -407,6 +405,7 @@
 %gac_dll nunit.core
 %gac_dll nunit.framework
 %gac_dll nunit.util
+%gac_dll nunit.mocks
 %{_libdir}/pkgconfig/mono-nunit.pc
 
 %files locale-extras
@@ -509,6 +508,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
+- update to 1.1.16
+
 * Wed Jun  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.15-1
 - Disabled s390 & s390x for now due to build failure
 - Update to 1.1.15


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Jun 2006 09:59:06 -0000	1.9
+++ sources	7 Jul 2006 11:12:45 -0000	1.10
@@ -1 +1 @@
-48d93d805c2940e42bcf73d0d38d30fe  mono-1.1.15.tar.gz
+ecfac1ed8bed586b50d1a1820b74b16b  mono-1.1.16.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 11:34:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 07:34:13 -0400
Subject: rpms/policycoreutils/devel .cvsignore, 1.114,
	1.115 policycoreutils.spec, 1.289, 1.290 sources, 1.118, 1.119
Message-ID: <200607071134.k67BYDuE025152@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25121

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:
* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-1
- Update to upstream
	* Lindent.
	* Merged patch from Dan Walsh with:
	  * -p option (progress) for setfiles and restorecon.
	  * disable context translation for setfiles and restorecon.
	  * on/off values for setsebool.
	* Merged setfiles and semodule_link fixes from Joshua Brindle.
	
* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-5
- Add progress indicator on fixfiles/setfiles/restorecon



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- .cvsignore	16 Jun 2006 19:27:55 -0000	1.114
+++ .cvsignore	7 Jul 2006 11:34:10 -0000	1.115
@@ -106,3 +106,4 @@
 policycoreutils-1.30.11.tgz
 policycoreutils-1.30.12.tgz
 policycoreutils-1.30.14.tgz
+policycoreutils-1.30.17.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- policycoreutils.spec	22 Jun 2006 18:37:10 -0000	1.289
+++ policycoreutils.spec	7 Jul 2006 11:34:10 -0000	1.290
@@ -1,15 +1,14 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.12.17-1
-%define libsemanagever 1.6.8-1
-%define libselinuxver 1.30.12-1
+%define libsepolver 1.12.19-1
+%define libsemanagever 1.6.11-1
+%define libselinuxver 1.30.19-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.30.14
-Release: 5
+Version: 1.30.17
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -36,7 +35,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -111,6 +109,15 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-1
+- Update to upstream
+	* Lindent.
+	* Merged patch from Dan Walsh with:
+	  * -p option (progress) for setfiles and restorecon.
+	  * disable context translation for setfiles and restorecon.
+	  * on/off values for setsebool.
+	* Merged setfiles and semodule_link fixes from Joshua Brindle.
+	
 * Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.14-5
 - Add progress indicator on fixfiles/setfiles/restorecon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	16 Jun 2006 19:27:55 -0000	1.118
+++ sources	7 Jul 2006 11:34:10 -0000	1.119
@@ -1 +1 @@
-bf6bcd12e149c60c34c3957df462b1ff  policycoreutils-1.30.14.tgz
+2b8a1ac08f54b82f5842a5e75683d5ce  policycoreutils-1.30.17.tgz



From fedora-cvs-commits at redhat.com  Fri Jul  7 11:56:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 07:56:25 -0400
Subject: rpms/mono/devel mono.spec,1.38,1.39
Message-ID: <200607071156.k67BuPvn014410@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14294

Modified Files:
	mono.spec 
Log Message:
Disable s390* again due to build failures



Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mono.spec	7 Jul 2006 11:12:45 -0000	1.38
+++ mono.spec	7 Jul 2006 11:56:22 -0000	1.39
@@ -20,7 +20,9 @@
 %endif
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
+# Disabled due to strange build failure:
+# s390 s390x
 
 Patch1: mono-1.1.13.4-selinux-ia64.patch
 Patch2: mono-1.1.13.4-ppc-threading.patch



From fedora-cvs-commits at redhat.com  Fri Jul  7 12:03:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 08:03:55 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch, NONE,
	1.1 openoffice.org.spec, 1.755, 1.756
Message-ID: <200607071203.k67C3t4G016017@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15973

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch 
Log Message:
try some KDE fixes

openoffice.org-2.0.3.rh187919.gtkunderkde.patch:
 salnativewidgets-gtk.cxx |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.3.rh187919.gtkunderkde.patch ---
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.14
diff -u -p -u -r1.14 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -392,10 +393,15 @@ void GtkData::initNWF( void )
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
     
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
-        // KDE 3.3 invented a bug in the qt<->gtk theme engine
-        // that makes direct rendering impossible: they totally
-        // ignore the clip rectangle passed to the paint methods
-        GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+	{
+		if( g_type_from_name( "QtEngineStyle" ) )
+		{
+			// KDE 3.3 invented a bug in the qt<->gtk theme engine
+			// that makes direct rendering impossible: they totally
+			// ignore the clip rectangle passed to the paint methods
+			GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+		}
+	}
     
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "GtkPlugin: using %s NWF\n",


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- openoffice.org.spec	5 Jul 2006 10:21:07 -0000	1.755
+++ openoffice.org.spec	7 Jul 2006 12:03:41 -0000	1.756
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 5
+%define rh_rpm_release 4.cmc
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -109,6 +109,7 @@
 Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
 Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -845,6 +846,7 @@
 %patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
 %patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch46 -p1 -b .rh187919.gtkunderkde.patch
 
 tar xzf %{SOURCE1}
 
@@ -3324,6 +3326,7 @@
 %changelog
 * Wed Jul 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+- add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Fri Jul  7 12:05:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 08:05:42 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.756,1.757
Message-ID: <200607071205.k67C5fw8016246@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16191

Modified Files:
	openoffice.org.spec 
Log Message:
bump spec


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -r1.756 -r1.757
--- openoffice.org.spec	7 Jul 2006 12:03:41 -0000	1.756
+++ openoffice.org.spec	7 Jul 2006 12:05:38 -0000	1.757
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 4.cmc
+%define rh_rpm_release 5
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Fri Jul  7 13:48:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 09:48:43 -0400
Subject: rpms/libidn/devel libidn-0.6.5.tar.gz.sig, NONE, 1.1 .cvsignore,
	1.23, 1.24 libidn.spec, 1.34, 1.35 sources, 1.24,
	1.25 upstream, 1.14, 1.15
Message-ID: <200607071348.k67DmhN5021573@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore libidn.spec sources upstream 
Added Files:
	libidn-0.6.5.tar.gz.sig 
Log Message:
* Fri Jul  7 2006 Joe Orton <jorton at redhat.com> 0.6.5-1
- update to 0.6.5



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

iOoEAAECADQFAkSuNFctFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz
QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvqX4E/2ZY2MU1hKPsjDqEU4eWa8A4McNu
dsik2BEvOP5w9DDp0zhkKVsHf1Rh4ezsExvGjrkctmTrj+o7yN/nd1cSoqOu7DeS
GZnO21Fmjh4PcuVt/IWKSPp6/+uzRau6iikRann//sUPnMZoODOwoOUR7zOOa4CX
wxmuBthCXh1vQJaZa8NzzFj7r9VHHBh3HfJ9jzIUtNN/em6TRI39WOmivas=
=QsXl
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Jul 2006 09:35:45 -0000	1.23
+++ .cvsignore	7 Jul 2006 13:48:40 -0000	1.24
@@ -1,4 +1 @@
-libidn-0.6.4.tar.gz
-*.rpm
-x86_64
-clog
+libidn-0.6.5.tar.gz


Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libidn.spec	7 Jul 2006 09:35:46 -0000	1.34
+++ libidn.spec	7 Jul 2006 13:48:40 -0000	1.35
@@ -1,6 +1,6 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
-Version: 0.6.4
+Version: 0.6.5
 Release: 1
 URL: http://www.gnu.org/software/libidn
 License: LGPL
@@ -89,6 +89,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jul  7 2006 Joe Orton <jorton at redhat.com> 0.6.5-1
+- update to 0.6.5
+
 * Fri Jul  7 2006 Joe Orton <jorton at redhat.com> 0.6.4-1
 - update to 0.6.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Jul 2006 09:35:46 -0000	1.24
+++ sources	7 Jul 2006 13:48:40 -0000	1.25
@@ -1 +1 @@
-43b53d7bab03e9b156232850e7ccc5c9  libidn-0.6.4.tar.gz
+86ccf6f9e21753a2d070e44ea3c2c224  libidn-0.6.5.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/upstream,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- upstream	7 Jul 2006 09:35:46 -0000	1.14
+++ upstream	7 Jul 2006 13:48:40 -0000	1.15
@@ -1 +1 @@
-libidn-0.6.4.tar.gz
+libidn-0.6.5.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 13:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 09:49:00 -0400
Subject: rpms/libidn/devel libidn-0.6.4.tar.gz.sig,1.1,NONE
Message-ID: <200607071349.k67Dn0bH021708@cvs.devel.redhat.com>

Author: jorton

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

Removed Files:
	libidn-0.6.4.tar.gz.sig 
Log Message:
- remove old .sig file


--- libidn-0.6.4.tar.gz.sig DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 14:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 10:51:35 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch, NONE,
	1.1 openoffice.org.spec, 1.673, 1.674
Message-ID: <200607071451.k67EpZaq005010@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4941

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch 
Log Message:
rh#197618# make invalid save as folder names safe

openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch:
 sfx2/source/dialog/filedlghelper.cxx |   59 ++++++++++++++++++++++++-----------
 source/dialog/filedlghelper.cxx      |    0 
 2 files changed, 41 insertions(+), 18 deletions(-)

--- NEW FILE openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch ---
Index: source/dialog/filedlghelper.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/filedlghelper.cxx,v
retrieving revision 1.119
diff -u -r1.119 filedlghelper.cxx
--- openoffice.org.orig/sfx2/source/dialog/filedlghelper.cxx	21 Dec 2005 13:45:27 -0000	1.119
+++ openoffice.org/sfx2/source/dialog/filedlghelper.cxx	7 Jul 2006 14:42:24 -0000
@@ -132,6 +132,9 @@
 #ifndef _VOS_MUTEX_HXX_
 #include <vos/mutex.hxx>
 #endif
+#ifndef _VOS_SECURITY_HXX_
+#include <vos/security.hxx>
+#endif
 
 #ifndef _SV_CVTGRF_HXX
 #include <vcl/cvtgrf.hxx>
@@ -2387,6 +2390,24 @@
 }
 
 // ------------------------------------------------------------------------
+static int impl_isFolder( const OUString& rPath )
+{
+	try
+	{
+		::ucb::Content aContent( 
+			rPath, star::uno::Reference< star::ucb::XCommandEnvironment >() );
+		if ( aContent.isFolder() )
+			return 1;
+
+		return 0;
+	}
+    catch ( Exception const & )
+	{
+	}
+
+    return -1;
+}
+
 void FileDialogHelper::SetDisplayDirectory( const String& _rPath )
 {
 	if ( !_rPath.Len() )
@@ -2396,29 +2417,31 @@
 	// and take it as filename and the rest of the path should be
 	// the folder
 
-	::rtl::OUString sPath;
-	::rtl::OUString sFileName;
-
 	INetURLObject aObj( _rPath );
-	try
-	{
-		::ucb::Content aContent( 
-			_rPath, star::uno::Reference< star::ucb::XCommandEnvironment >() );
-		if ( !aContent.isFolder() )
-		{
-			sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET );
-			aObj.removeSegment();
-			mpImp->setFileName( sFileName );
-		}
-	}
-	catch ( star::ucb::ContentCreationException const & )
+
+	::rtl::OUString sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET );
+	aObj.removeSegment();
+	::rtl::OUString sPath = aObj.GetMainURL( INetURLObject::NO_DECODE );
+
+	int nIsFolder = impl_isFolder( _rPath );
+	if ( nIsFolder == 0 ||
+		 ( nIsFolder == -1 && impl_isFolder( sPath ) == 1 ) )
 	{
+		mpImp->setFileName( sFileName );
+		mpImp->displayFolder( sPath );
 	}
-	catch ( star::ucb::InteractiveAugmentedIOException const & )
+	else
 	{
+		INetURLObject aObjPathName( _rPath );
+        ::rtl::OUString sFolder( aObjPathName.GetMainURL( INetURLObject::NO_DECODE ) );
+        if ( sFolder.getLength() == 0 )
+        {
+            // _rPath is not a valid path -> fallback to home directory
+            NAMESPACE_VOS( OSecurity ) aSecurity;
+            aSecurity.getHomeDir( sFolder );
+        }
+        mpImp->displayFolder( sFolder );
 	}
-
-    mpImp->displayFolder( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
 }
 
 // ------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.673
retrieving revision 1.674
diff -u -r1.673 -r1.674
--- openoffice.org.spec	5 Jul 2006 11:57:40 -0000	1.673
+++ openoffice.org.spec	7 Jul 2006 14:51:32 -0000	1.674
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 16
+%define rh_rpm_release 17
 
 %define build_fc5 1
 
@@ -178,6 +178,7 @@
 Patch50: sax+source+expatwrap+xml2utf.cxx.diff
 Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch52: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -839,6 +840,7 @@
 %patch50 -p1 -b .sax+source+expatwrap+xml2utf.cxx.diff
 %patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
 %patch52 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch53 -p1 -b .ooo64206.sfx2.saveas.patch
 
 
 %if %{includingexternals}
@@ -3285,6 +3287,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jul 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.17.UNRELEASED
+- rh#197618# add openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
+- add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make 
+  ~/.recently-used safe
+
 * Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security
 - CVE-2006-2199 java applets



From fedora-cvs-commits at redhat.com  Fri Jul  7 15:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 11:07:32 -0400
Subject: rpms/grub/devel grub-0.97-stderr.patch, NONE, 1.1 grub.spec, 1.43,
	1.44
Message-ID: <200607071507.k67F7Wuo008864@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8836

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-stderr.patch 
Log Message:
- fix bogus error handling

grub-0.97-stderr.patch:
 grub-install.in |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE grub-0.97-stderr.patch ---
--- grub-0.97/util/grub-install.in.stderr	2006-07-07 10:56:37.000000000 -0400
+++ grub-0.97/util/grub-install.in	2006-07-07 11:01:35.000000000 -0400
@@ -207,7 +207,7 @@
 	while test -L $tmp_fname; do
 		tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
 		if test -z "$tmp_new_fname"; then
-			echo "Unrecognized ls output" 2>&1
+			echo "Unrecognized ls output" 1>&2
 			exit 1
 		fi
 
@@ -264,7 +264,7 @@
 stat_device() {
     majmin=`stat -c "%t:%T" "$1" 2>/dev/null`
     if test -z "$majmin"; then
-	echo "Could not find device for $1" 2>&1
+	echo "Could not find device for $1" 1>&2
 	exit 1
     fi
 
@@ -281,7 +281,7 @@
 	dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab`
     fi
     if test -z "$dev"; then
-	echo "Could not find device for $1" 2>&1
+	echo "Could not find device for $1" 1>&2
 	exit 1
     fi
 	
@@ -304,11 +304,11 @@
     tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ 	]*\).*%\1%p'`
 
     if test -z "$tmp_fname"; then
-	echo "Could not find device for $1" 2>&1
+	echo "Could not find device for $1" 1>&2
 	exit 1
     fi
 
-    ret_fname=`resolve_symlink $tmp_fname`
+    ret_fname=`resolve_symlink $tmp_fname` || exit 1
     tmp_fname=`find_mapper_device $ret_fname`
     if test -n "$tmp_fname"; then
 	ret_fname="$tmp_fname"
@@ -325,7 +325,7 @@
     done
     for file in \
 	${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
-	cp -f $file ${grubdir} || exit 1
+	cp -f $file ${grubdir} 1>&2 || exit 1
     done
 }
 
@@ -520,9 +520,9 @@
 # Check for INSTALL_DEVICE.
 case "$install_device" in
 /dev/*)
-    install_device=`resolve_symlink "$install_device"`
+    install_device=`resolve_symlink "$install_device"` || exit 1
     for install_drive in `find_real_devs $install_device` ; do
-	install_drive=`convert $install_drive`
+	install_drive=`convert $install_drive` || exit 1
 	if is_raid1_device $install_device; then
 		install_drive=`echo $install_drive | sed 's/,[0-9]*)/)/'`
 	fi
@@ -550,8 +550,8 @@
 unset install_device
 
 # Get the root drive.
-root_device=`find_device ${rootdir}`
-bootdir_device=`find_device ${bootdir}`
+root_device=`find_device ${rootdir}` || exit 1
+bootdir_device=`find_device ${bootdir}` || exit 1
 
 # Check if the boot directory is in the same device as the root directory.
 if test "x$root_device" != "x$bootdir_device"; then
@@ -561,7 +561,7 @@
 fi
 
 # Check if the root directory exists in the same device as the grub directory.
-grubdir_device=`find_device ${grubdir}`
+grubdir_device=`find_device ${grubdir}` || exit 1
 
 if test "x$grubdir_device" != "x$root_device"; then
     # For now, cannot deal with this situation.
@@ -582,7 +582,7 @@
 fi
 
 # Convert the root deviceto a GRUB drive.
-root_drive=`convert "$root_device"`
+root_drive=`convert "$root_device"` || exit 1
 if [ "x$root_drive" = x ]; then
     exit 1
 fi
@@ -618,7 +618,7 @@
 
 for install_drive in $install_drives; do 
     # Convert the root deviceto a GRUB drive.
-    root_drive=`convert "$root_device"`
+    root_drive=`convert "$root_device"` || exit 1
     if [ "x$root_drive" = x ]; then
 	exit 1
     fi


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- grub.spec	12 Jun 2006 20:49:53 -0000	1.43
+++ grub.spec	7 Jul 2006 15:07:27 -0000	1.44
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 8
+Release: 9
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -101,6 +101,9 @@
 # fix mactel keyboard bugs
 Patch1148: grub-0.97-mactel-kbd.patch
 
+# fix error reporting
+Patch1149: grub-0.97-stderr.patch
+
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
 BuildRequires: automake /usr/lib/crt1.o
@@ -176,6 +179,8 @@
 
 %patch1148 -p1 -b .mactel-kbd
 
+%patch1149 -p1 -b .stderr
+
 %build
 autoreconf --install --force
 GCCVERS=$(gcc --version | head -1 | cut -d\  -f3 | cut -d. -f1)
@@ -227,6 +232,9 @@
 %{_datadir}/grub
 
 %changelog
+* Fri Jul  7 2006 Peter Jones <pjones at redhat.com> - 0.97-9
+- fix broken error reporting from helper functions
+
 * Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 0.97-8
 - Fix BIOS keyboard handler to use extended keyboard interrupts, so the
   Mac Mini works.



From fedora-cvs-commits at redhat.com  Fri Jul  7 15:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 11:09:16 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.81, 1.82 sources,
	1.84, 1.85 system-config-printer.spec, 1.45, 1.46
Message-ID: <200607071509.k67F9Gqp009491@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 0.7.22-1
- 0.7.22.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- .cvsignore	5 Jul 2006 14:39:03 -0000	1.81
+++ .cvsignore	7 Jul 2006 15:09:13 -0000	1.82
@@ -61,3 +61,4 @@
 system-config-printer-0.7.20.tar.bz2
 pycups-1.9.12.tar.bz2
 system-config-printer-0.7.21.tar.bz2
+system-config-printer-0.7.22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	5 Jul 2006 14:39:03 -0000	1.84
+++ sources	7 Jul 2006 15:09:13 -0000	1.85
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-aee11f6a349821e2b42edc65cfb2588f  system-config-printer-0.7.21.tar.bz2
+3026f265515fc756d01359fef8ed3942  system-config-printer-0.7.22.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- system-config-printer.spec	5 Jul 2006 14:39:03 -0000	1.45
+++ system-config-printer.spec	7 Jul 2006 15:09:13 -0000	1.46
@@ -2,7 +2,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.21
+Version: 0.7.22
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 0.7.22-1
+- 0.7.22.
+
 * Wed Jul  5 2006 Tim Waugh <twaugh at redhat.com> 0.7.21-1
 - Updated to pycups-1.9.12.
 - 0.7.21.



From fedora-cvs-commits at redhat.com  Fri Jul  7 15:25:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 11:25:53 -0400
Subject: rpms/evolution/devel evolution-2.7.3-submit-bug-report.patch, NONE,
	1.1 evolution.spec, 1.160, 1.161
Message-ID: <200607071525.k67FPrwW024240@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.3-submit-bug-report.patch 
Log Message:
- Make "Submit Bug Report" menu item work again (RH #197384).


evolution-2.7.3-submit-bug-report.patch:
 e-shell-window-commands.c |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

--- NEW FILE evolution-2.7.3-submit-bug-report.patch ---
--- evolution-2.7.3/shell/e-shell-window-commands.c.submit-bug-report	2006-07-07 09:09:56.000000000 -0400
+++ evolution-2.7.3/shell/e-shell-window-commands.c	2006-07-07 10:47:19.000000000 -0400
@@ -114,26 +114,35 @@
 		    EShellWindow *window,
 		    const char *path)
 {
-        int pid;
-        char *args[] = {
-                "bug-buddy",
-                "--sm-disable",
-                "--package=evolution",
-                "--package-ver="VERSION,
-                NULL
-        };
-
-        args[0] = g_find_program_in_path ("bug-buddy");
-        if (!args[0]) {
-                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy is not installed."));
-		return;
-        }
+	gchar *command_line;
+	GError *error = NULL;
 
-        pid = gnome_execute_async (NULL, 4, args);
-        g_free (args[0]);
+        /* For the --appname option, Bug Buddy does not recognize the true
+         * filename of the application (evolution-2.x, as g_get_prgname()
+         * would return), so we have to use the package name (evolution).
+         * XXX Might be nice to also supply the --name and --email options. */
+	command_line = g_strdup_printf (
+		"bug-buddy"
+		" --sm-disable"
+		" --package=" PACKAGE
+		" --package-ver=" VERSION
+		" --appname=" PACKAGE_NAME
+		" --pid=%ld",
+		getpid ());
+
+	g_debug ("Spawning: %s", command_line);
+
+	if (!g_spawn_command_line_async (command_line, &error)) {
+		if (error->code == G_SPAWN_ERROR_NOENT)
+			e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Bug buddy is not installed."));
+		else
+			e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Bug buddy could not be run."));
+		g_error_free (error);
+	}
 
-        if (pid == -1)
-                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy could not be run."));
+	g_free (command_line);
 }
 
 /* must be in utf8, the weird breaking of escaped strings


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- evolution.spec	6 Jul 2006 16:06:41 -0000	1.160
+++ evolution.spec	7 Jul 2006 15:25:51 -0000	1.161
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 8
+Release: 9
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -134,6 +134,9 @@
 # RH bug #166231 / Gnome.org bug #264485
 Patch906: evolution-2.7.3-replicated-cjk-input.patch
 
+# RH bug #197834 / Gnome.org bug #346797
+Patch907: evolution-2.7.3-submit-bug-report.patch
+
 ### Dependencies ###
 
 Requires: scrollkeeper >= 0.1.4
@@ -292,6 +295,7 @@
 %patch904 -p1 -b .filter-datespec
 %patch905 -p1 -b .mailing-list-menu
 %patch906 -p1 -b .replicated-cjk-input
+%patch907 -p1 -b .submit-bug-report
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -682,6 +686,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Jul  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-9
+- Make "Submit Bug Report" menu item work again (RH #197384).
+
 * Thu Jul  6 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-8
 - Add patch for RH bug #166231 (also addresses #131227 and #157391).
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 15:31:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 11:31:53 -0400
Subject: rpms/initscripts/FC-5 .cvsignore, 1.101, 1.102 initscripts.spec,
	1.116, 1.117 sources, 1.111, 1.112
Message-ID: <200607071531.k67FVr0I008606@cvs.devel.redhat.com>

Author: notting

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	1 Jul 2006 04:41:48 -0000	1.101
+++ .cvsignore	7 Jul 2006 15:31:50 -0000	1.102
@@ -1 +1 @@
-initscripts-8.31.4.tar.bz2
+initscripts-8.31.5.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/initscripts.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- initscripts.spec	1 Jul 2006 04:41:49 -0000	1.116
+++ initscripts.spec	7 Jul 2006 15:31:50 -0000	1.117
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.31.4
+Version: 8.31.5
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -209,6 +209,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Jul  7 2006 Bill Nottingham <notting at redhat.com> 8.31.5-1
+- backport cups startup fix (#189168)
+
 * Fri Jun 30 2006 Bill Nottingham <notting at redhat.com> 8.31.4-1
 - backport bridge fixes (#187100)
 - ignore alias devices in rename_device (#186355)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/FC-5/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sources	1 Jul 2006 04:41:49 -0000	1.111
+++ sources	7 Jul 2006 15:31:50 -0000	1.112
@@ -1 +1 @@
-37e9022173a0b407a61ce7e7ef378131  initscripts-8.31.4.tar.bz2
+a5aba81a69b2836e514eaf38582b84d4  initscripts-8.31.5.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:17:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:17:22 -0400
Subject: rpms/cman/devel cman.spec,1.38,1.39 sources,1.14,1.15
Message-ID: <200607071617.k67GHMnB019463@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19436

Modified Files:
	cman.spec sources 
Log Message:
Build for latest cman.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cman.spec	6 Jul 2006 21:04:20 -0000	1.38
+++ cman.spec	7 Jul 2006 16:17:20 -0000	1.39
@@ -29,8 +29,8 @@
 #ExclusiveArch: %{ix86} x86_64
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
+Patch0: cman-2.0.1.build
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: cman-2.0.0-grouplib.patch
 
 %description
 cman - The Cluster Manager
@@ -45,7 +45,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .grouplib
+%patch0 -p1 -b .build
 
 %build
 TOPDIR=`pwd`
@@ -53,7 +53,7 @@
 cd ccs ; ./configure --libdir=%{_libdir}; cd ..
 cd dlm ; ./configure --kernel_src=/usr/ --libdir=%{_libdir}; cd ..
 cd cman; ./configure --ccsincdir=${TOPDIR}/ccs/lib --ccslibdir=${TOPDIR}/ccs/lib --libdir=%{_libdir}  ; cd ..
-cd group; ./configure --kernel_src=/usr/ --libdir=%{_libdir}; cd ..
+cd group; ./configure --kernel_src=/usr/ --libdir=%{_libdir} --cmanlibdir=${TOPDIR}/cman/lib; cd ..
 cd fence; ./configure -ccslibdir=${TOPDIR}/ccs/lib --ccsincdir=${TOPDIR}/ccs/lib --cmanincdir=${TOPDIR}/cman/lib ; cd ..
 
 for dir in ccs cman dlm fence group; do
@@ -98,7 +98,7 @@
 %defattr(-,root,root,-)
 /sbin/*
 /etc/rc.d/init.d/*
-/usr/libexec/cman/*
+/usr/libexec/*
 %{_libdir}/*.so*
 %{_mandir}/*/*
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Jul 2006 21:04:20 -0000	1.14
+++ sources	7 Jul 2006 16:17:20 -0000	1.15
@@ -1 +1 @@
-cb729ea28b39242550ff9148e5ec344c  cman-2.0.1.tar.gz
+b44217e27d76161ec9a73f201ee7e4ab  cman-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:17:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:17:49 -0400
Subject: rpms/cman/devel cman.spec,1.39,1.40
Message-ID: <200607071617.k67GHnod019665@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19637

Modified Files:
	cman.spec 
Log Message:
Build for latest cman.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cman.spec	7 Jul 2006 16:17:20 -0000	1.39
+++ cman.spec	7 Jul 2006 16:17:47 -0000	1.40
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:20:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:20:35 -0400
Subject: rpms/cman/devel cman.spec,1.40,1.41
Message-ID: <200607071620.k67GKZET020758@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20568

Modified Files:
	cman.spec 
Log Message:
Remove patch.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cman.spec	7 Jul 2006 16:17:47 -0000	1.40
+++ cman.spec	7 Jul 2006 16:20:33 -0000	1.41
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.1
+Release: 0.fc6.2
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -29,7 +29,6 @@
 #ExclusiveArch: %{ix86} x86_64
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
-Patch0: cman-2.0.1.build
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -45,7 +44,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .build
 
 %build
 TOPDIR=`pwd`



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:22:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:22:01 -0400
Subject: rpms/cman/devel cman.spec,1.41,1.42
Message-ID: <200607071622.k67GM1ah021335@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21310

Modified Files:
	cman.spec 
Log Message:
Add /usr/sbin/* to included files.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cman.spec	7 Jul 2006 16:20:33 -0000	1.41
+++ cman.spec	7 Jul 2006 16:21:59 -0000	1.42
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.2
+Release: 0.fc6.3
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -95,6 +95,7 @@
 %files
 %defattr(-,root,root,-)
 /sbin/*
+/usr/sbin/*
 /etc/rc.d/init.d/*
 /usr/libexec/*
 %{_libdir}/*.so*



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:26:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:26:52 -0400
Subject: rpms/cman/devel cman.spec,1.42,1.43
Message-ID: <200607071626.k67GQqVG023261@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23231

Modified Files:
	cman.spec 
Log Message:
Build requires openais-devel.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cman.spec	7 Jul 2006 16:21:59 -0000	1.42
+++ cman.spec	7 Jul 2006 16:26:49 -0000	1.43
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.3
+Release: 0.fc6.4
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -22,10 +22,12 @@
 BuildRequires: glibc-kernheaders
 BuildRequires: libxml-devel
 BuildRequires: libxml2-devel
+BuildRequires: openais-devel
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+Requires: openais
 #ExclusiveArch: %{ix86} x86_64
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:32:31 -0400
Subject: rpms/cman/devel cman.spec,1.43,1.44
Message-ID: <200607071632.k67GWVq7025026@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24994

Modified Files:
	cman.spec 
Log Message:
Temporarily disable ia64.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cman.spec	7 Jul 2006 16:26:49 -0000	1.43
+++ cman.spec	7 Jul 2006 16:32:26 -0000	1.44
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.4
+Release: 0.fc6.5
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -29,6 +29,7 @@
 Requires(preun): /sbin/chkconfig
 Requires: openais
 #ExclusiveArch: %{ix86} x86_64
+ExcludeArch: ia64
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:48:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:48:42 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.74,1.75
Message-ID: <200607071648.k67GmggD012102@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
>From Ralph Apel <rapel at redhat.com>:
- Add mx4j JMX API to classpath




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- tomcat5.spec	6 Jul 2006 20:32:49 -0000	1.74
+++ tomcat5.spec	7 Jul 2006 16:48:39 -0000	1.75
@@ -560,7 +560,7 @@
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 %if %{without_apisonly}
-CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard)
+CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard mx4j/mx4j-jmx)
 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}}
@@ -1201,7 +1201,9 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build
-- Add servlet-api.jar to CLASSPATH when building catalina-config
+- Fix servlet-api.jar path
+From Ralph Apel <rapel at redhat.com>:
+- Add mx4j JMX API to classpath
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade



From fedora-cvs-commits at redhat.com  Fri Jul  7 16:55:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 12:55:07 -0400
Subject: rpms/cman/devel cman.spec,1.44,1.45 sources,1.15,1.16
Message-ID: <200607071655.k67Gt7tm014579@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14551

Modified Files:
	cman.spec sources 
Log Message:
New sources for x86_64 libdir.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cman.spec	7 Jul 2006 16:32:26 -0000	1.44
+++ cman.spec	7 Jul 2006 16:55:05 -0000	1.45
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.5
+Release: 0.fc6.7
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Jul 2006 16:17:20 -0000	1.15
+++ sources	7 Jul 2006 16:55:05 -0000	1.16
@@ -1 +1 @@
-b44217e27d76161ec9a73f201ee7e4ab  cman-2.0.1.tar.gz
+86b8e1d3086a71b9901415b88894eb3d  cman-2.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:03:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:03:35 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.75,1.76
Message-ID: <200607071703.k67H3Yk0016701@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
>From Ralph Apel <rapel at redhat.com>:
- Re-add patch to add rt.jar




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- tomcat5.spec	7 Jul 2006 16:48:39 -0000	1.75
+++ tomcat5.spec	7 Jul 2006 17:03:32 -0000	1.76
@@ -411,6 +411,8 @@
 %patch13 -b .p13
 %patch14 -b .p14
 #%patch15 -b .p15
+%patch16 -b .p16
+#%patch17 -b .p17
 
 %if %{without_ecj}
 rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -1203,6 +1205,7 @@
 - Full build
 - Fix servlet-api.jar path
 From Ralph Apel <rapel at redhat.com>:
+- Re-add patch to add rt.jar
 - Add mx4j JMX API to classpath
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:16:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:16:47 -0400
Subject: rpms/tomcat5/devel tomcat5-5.5-jspc-classpath.patch,1.1,1.2
Message-ID: <200607071716.k67HGlOo030565@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5-5.5-jspc-classpath.patch 
Log Message:
Remove extra elements in ath to file



tomcat5-5.5-jspc-classpath.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

Index: tomcat5-5.5-jspc-classpath.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jspc-classpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.5-jspc-classpath.patch	23 Feb 2006 00:26:54 -0000	1.1
+++ tomcat5-5.5-jspc-classpath.patch	7 Jul 2006 17:16:45 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- build/build.xml.sav	2006-02-21 13:48:51.743828000 -0500
++++ build/build.xml	2006-02-21 13:48:56.499065000 -0500
 @@ -416,6 +416,7 @@
  
      <path id="jspc.classpath">



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:41:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:41:42 -0400
Subject: rpms/dmraid/devel format-handler-dos.patch, NONE,
	1.1 metadata-stride.patch, NONE, 1.1 dmraid.spec, 1.46, 1.47
Message-ID: <200607071741.k67HfgR8010145@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10121

Modified Files:
	dmraid.spec 
Added Files:
	format-handler-dos.patch metadata-stride.patch 
Log Message:
Dos partition discovery fix

format-handler-dos.patch:
 dos.c |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE format-handler-dos.patch ---
--- dmraid/1.0.0.rc11/lib/format/partition/dos.c	2006-01-18 13:55:09.000000000 +0100
+++ dmraid/current/lib/format/partition/dos.c	2006-07-07 16:50:12.000000000 +0200
@@ -143,6 +143,17 @@ static struct raid_set *_alloc_raid_set(
 	return rs;
 }
 
+/* Check sector vs. RAID device end */
+static int rd_check_end(struct lib_context *lc,
+			struct raid_dev *rd, uint64_t sector)
+{
+	if (sector > rd->di->sectors)
+		LOG_ERR(lc, 1, "%s: partition address past end of RAID device",
+		 	handler);
+
+	return 0;
+}
+
 /*
  * Allocate a DOS RAID device and a set.
  * Set the device up and add it to the set.
@@ -173,7 +184,9 @@ static int _create_rs_and_rd(struct lib_
 	r->offset = get_part_start(raw_part, sector);
 	r->sectors = (uint64_t) raw_part->length;
 
-	if (!(rs = _alloc_raid_set(lc, r)))
+	if (rd_check_end(lc, rd, r->offset) ||
+	    rd_check_end(lc, rd, r->offset + r->sectors) ||
+	    !(rs = _alloc_raid_set(lc, r)))
 		goto free_di;
 
 	list_add_tail(&r->devs, &rs->devs);
@@ -238,13 +251,13 @@ static int group_rd_extended(struct lib_
 	 * An entry pointing to the present logical partition.
 	 * It is an offset from the present partition table location.
 	 */
-	p1 = &dos->partitions[0];
+	p1 = dos->partitions;
 	
 	/*
 	 * An entry pointing to the next logical partition table.
 	 * It is an offset from the main extended partition start.
 	 */
-	p2 = &dos->partitions[1];
+	p2 = dos->partitions + 1;
 
 	/* If it is a partition, add it to the set */
 	if (is_partition(p1, start_sector) &&
@@ -301,8 +314,12 @@ static int group_rd(struct lib_context *
 		part_end   = part_start + raw_table_entry->length;
 		
 		/* Avoid infinite recursion (mostly). */
-		if (part_start == start_sector ||
-		    part_end > rd->sectors)
+		if (part_start == start_sector)
+			continue;
+
+		/* Check bogus partition starts + ends */
+		if (rd_check_end(lc, rd, part_start) ||
+		    rd_check_end(lc, rd, part_end))
 			continue;
 
 		/*
@@ -365,7 +382,7 @@ static struct dmraid_format dos_format =
 	.check	= dos_check,
 	.events	= NULL, /* Not supported */
 #ifdef DMRAID_NATIVE_LOG
-	.log	= NULL, /* Not supported */
+	.log	= NULL, /* Not supported; use fdisk and friends */
 #endif
 };
 

metadata-stride.patch:
 metadata.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE metadata-stride.patch ---
--- dmraid/1.0.0.rc11/lib/metadata/metadata.c	2006-03-28 16:03:13.000000000 +0200
+++ dmraid/current/lib/metadata/metadata.c	2006-07-06 17:56:52.000000000 +0200
@@ -120,7 +120,7 @@ const char *get_status(struct lib_contex
 static uint64_t add_sectors(struct raid_set *rs, uint64_t sectors,
 			    uint64_t add)
 {
-	add = round_down(add, rs->stride);
+	add = rs->stride ? round_down(add, rs->stride) : add;
 
 	if (T_RAID1(rs)) {
 		if (!sectors || sectors > add)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dmraid.spec	16 May 2006 17:14:40 -0000	1.46
+++ dmraid.spec	7 Jul 2006 17:41:38 -0000	1.47
@@ -7,13 +7,15 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6
+Release: FC6.1
 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: metadata-stride.patch
+Patch1: format-handler-dos.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -33,7 +35,10 @@
 RAID set activation and display of properties for ATARAID volumes.
 
 %prep
+
 %setup -q -n dmraid/%{version}
+%patch0 -p1
+%patch1 -p1
 
 %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
@@ -89,6 +94,9 @@
 %endif
 
 %changelog
+* Tue July 7 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC6.1
+- rebuilt for FC6 with dos partition discovery fix (#197573)
+
 * Tue May 16 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC6
 - rebuilt for FC6 with better tag
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:44:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:44:46 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.47,1.48
Message-ID: <200607071744.k67HikeB011282@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11184

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- dmraid.spec	7 Jul 2006 17:41:38 -0000	1.47
+++ dmraid.spec	7 Jul 2006 17:44:43 -0000	1.48
@@ -35,7 +35,6 @@
 RAID set activation and display of properties for ATARAID volumes.
 
 %prep
-
 %setup -q -n dmraid/%{version}
 %patch0 -p1
 %patch1 -p1
@@ -94,16 +93,16 @@
 %endif
 
 %changelog
-* Tue July 7 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC6.1
+* Tue July 7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
 - rebuilt for FC6 with dos partition discovery fix (#197573)
 
-* Tue May 16 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC6
+* Tue May 16 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6
 - rebuilt for FC6 with better tag
 
-* Tue May 16 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC5_7.2
+* Tue May 16 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC5_7.2
 - rebuilt for FC5
 
-* Tue May 16 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC5_7.1
+* Tue May 16 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC5_7.1
 - jm.c: checksum() calculation
 - misc.c: support "%d" in p_fmt and fix segfault with wrong format identifier
 - nv.c: size fix in setup_rd()
@@ -119,7 +118,7 @@
 * Mon Mar 27 2006 Milan Broz <mbroz at redhat.com> - 1.0.0.rc10-FC5_6.2
 - fixed /var/lock/dmraid in specfile (#168195)
 
-* Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc10-FC5_6
+* Fri Feb 17 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc10-FC5_6
 - add doc/dmraid_design.txt to %doc (#181885)
 - add --enable-libselinux --enable-libsepol to configure
 - rebuilt



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:46:01 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.48,1.49
Message-ID: <200607071746.k67Hk1vs015117@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14181

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dmraid.spec	7 Jul 2006 17:44:43 -0000	1.48
+++ dmraid.spec	7 Jul 2006 17:45:58 -0000	1.49
@@ -93,7 +93,7 @@
 %endif
 
 %changelog
-* Tue July 7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
+* Fri July  7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
 - rebuilt for FC6 with dos partition discovery fix (#197573)
 
 * Tue May 16 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:47:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:47:48 -0400
Subject: rpms/dmraid/devel format-handler-dos.patch, 1.1,
	NONE metadata-stride.patch, 1.1, NONE
Message-ID: <200607071747.k67Hlmlm027237@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27190

Removed Files:
	format-handler-dos.patch metadata-stride.patch 
Log Message:



--- format-handler-dos.patch DELETED ---


--- metadata-stride.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:49:04 -0400
Subject: rpms/dmraid/devel dmraid-1.0.0.rc11-format-handler-dos.patch, NONE,
	1.1 dmraid-1.0.0.rc11-metadata-stride.patch, NONE,
	1.1 dmraid.spec, 1.49, 1.50
Message-ID: <200607071749.k67Hn4UT027728@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27695

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-format-handler-dos.patch 
	dmraid-1.0.0.rc11-metadata-stride.patch 
Log Message:
DOS partition discovery fix

dmraid-1.0.0.rc11-format-handler-dos.patch:
 dos.c |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE dmraid-1.0.0.rc11-format-handler-dos.patch ---
--- dmraid/1.0.0.rc11/lib/format/partition/dos.c	2006-01-18 13:55:09.000000000 +0100
+++ dmraid/current/lib/format/partition/dos.c	2006-07-07 16:50:12.000000000 +0200
@@ -143,6 +143,17 @@ static struct raid_set *_alloc_raid_set(
 	return rs;
 }
 
+/* Check sector vs. RAID device end */
+static int rd_check_end(struct lib_context *lc,
+			struct raid_dev *rd, uint64_t sector)
+{
+	if (sector > rd->di->sectors)
+		LOG_ERR(lc, 1, "%s: partition address past end of RAID device",
+		 	handler);
+
+	return 0;
+}
+
 /*
  * Allocate a DOS RAID device and a set.
  * Set the device up and add it to the set.
@@ -173,7 +184,9 @@ static int _create_rs_and_rd(struct lib_
 	r->offset = get_part_start(raw_part, sector);
 	r->sectors = (uint64_t) raw_part->length;
 
-	if (!(rs = _alloc_raid_set(lc, r)))
+	if (rd_check_end(lc, rd, r->offset) ||
+	    rd_check_end(lc, rd, r->offset + r->sectors) ||
+	    !(rs = _alloc_raid_set(lc, r)))
 		goto free_di;
 
 	list_add_tail(&r->devs, &rs->devs);
@@ -238,13 +251,13 @@ static int group_rd_extended(struct lib_
 	 * An entry pointing to the present logical partition.
 	 * It is an offset from the present partition table location.
 	 */
-	p1 = &dos->partitions[0];
+	p1 = dos->partitions;
 	
 	/*
 	 * An entry pointing to the next logical partition table.
 	 * It is an offset from the main extended partition start.
 	 */
-	p2 = &dos->partitions[1];
+	p2 = dos->partitions + 1;
 
 	/* If it is a partition, add it to the set */
 	if (is_partition(p1, start_sector) &&
@@ -301,8 +314,12 @@ static int group_rd(struct lib_context *
 		part_end   = part_start + raw_table_entry->length;
 		
 		/* Avoid infinite recursion (mostly). */
-		if (part_start == start_sector ||
-		    part_end > rd->sectors)
+		if (part_start == start_sector)
+			continue;
+
+		/* Check bogus partition starts + ends */
+		if (rd_check_end(lc, rd, part_start) ||
+		    rd_check_end(lc, rd, part_end))
 			continue;
 
 		/*
@@ -365,7 +382,7 @@ static struct dmraid_format dos_format =
 	.check	= dos_check,
 	.events	= NULL, /* Not supported */
 #ifdef DMRAID_NATIVE_LOG
-	.log	= NULL, /* Not supported */
+	.log	= NULL, /* Not supported; use fdisk and friends */
 #endif
 };
 

dmraid-1.0.0.rc11-metadata-stride.patch:
 metadata.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dmraid-1.0.0.rc11-metadata-stride.patch ---
--- dmraid/1.0.0.rc11/lib/metadata/metadata.c	2006-03-28 16:03:13.000000000 +0200
+++ dmraid/current/lib/metadata/metadata.c	2006-07-06 17:56:52.000000000 +0200
@@ -120,7 +120,7 @@ const char *get_status(struct lib_contex
 static uint64_t add_sectors(struct raid_set *rs, uint64_t sectors,
 			    uint64_t add)
 {
-	add = round_down(add, rs->stride);
+	add = rs->stride ? round_down(add, rs->stride) : add;
 
 	if (T_RAID1(rs)) {
 		if (!sectors || sectors > add)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- dmraid.spec	7 Jul 2006 17:45:58 -0000	1.49
+++ dmraid.spec	7 Jul 2006 17:49:01 -0000	1.50
@@ -14,8 +14,8 @@
 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: metadata-stride.patch
-Patch1: format-handler-dos.patch
+Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
+Patch1: dmriad-1.0.0.rc11-format-handler-dos.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:49:39 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.50,1.51
Message-ID: <200607071749.k67HndRw027973@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27949

Modified Files:
	dmraid.spec 
Log Message:
DOS partition discovery fix


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- dmraid.spec	7 Jul 2006 17:49:01 -0000	1.50
+++ dmraid.spec	7 Jul 2006 17:49:36 -0000	1.51
@@ -93,7 +93,7 @@
 %endif
 
 %changelog
-* Fri July  7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
+* Fri Jul  7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
 - rebuilt for FC6 with dos partition discovery fix (#197573)
 
 * Tue May 16 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:52:43 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.51,1.52
Message-ID: <200607071752.k67Hqh4N029148@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29124

Modified Files:
	dmraid.spec 
Log Message:
patch name typu


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- dmraid.spec	7 Jul 2006 17:49:36 -0000	1.51
+++ dmraid.spec	7 Jul 2006 17:52:40 -0000	1.52
@@ -15,7 +15,7 @@
 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.rc11-metadata-stride.patch
-Patch1: dmriad-1.0.0.rc11-format-handler-dos.patch
+Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x



From fedora-cvs-commits at redhat.com  Fri Jul  7 17:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 13:59:03 -0400
Subject: rpms/dmraid/devel dmraid-1.0.0.rc11-format-handler-dos.patch, 1.1,
	1.2 dmraid-1.0.0.rc11-metadata-stride.patch, 1.1, 1.2
Message-ID: <200607071759.k67Hx3Rn031672@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31560

Modified Files:
	dmraid-1.0.0.rc11-format-handler-dos.patch 
	dmraid-1.0.0.rc11-metadata-stride.patch 
Log Message:
Redone patches


dmraid-1.0.0.rc11-format-handler-dos.patch:
 dos.c |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

Index: dmraid-1.0.0.rc11-format-handler-dos.patch
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid-1.0.0.rc11-format-handler-dos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dmraid-1.0.0.rc11-format-handler-dos.patch	7 Jul 2006 17:49:01 -0000	1.1
+++ dmraid-1.0.0.rc11-format-handler-dos.patch	7 Jul 2006 17:59:00 -0000	1.2
@@ -1,6 +1,6 @@
---- dmraid/1.0.0.rc11/lib/format/partition/dos.c	2006-01-18 13:55:09.000000000 +0100
-+++ dmraid/current/lib/format/partition/dos.c	2006-07-07 16:50:12.000000000 +0200
-@@ -143,6 +143,17 @@ static struct raid_set *_alloc_raid_set(
+--- dmraid/1.0.0.rc11/lib/format/partition/dos.c.orig	2006-01-18 13:55:09.000000000 +0100
++++ dmraid/1.0.0.rc11/lib/format/partition/dos.c	2006-07-07 19:55:15.000000000 +0200
+@@ -143,6 +143,17 @@
  	return rs;
  }
  
@@ -18,7 +18,7 @@
  /*
   * Allocate a DOS RAID device and a set.
   * Set the device up and add it to the set.
-@@ -173,7 +184,9 @@ static int _create_rs_and_rd(struct lib_
+@@ -173,7 +184,9 @@
  	r->offset = get_part_start(raw_part, sector);
  	r->sectors = (uint64_t) raw_part->length;
  
@@ -29,7 +29,7 @@
  		goto free_di;
  
  	list_add_tail(&r->devs, &rs->devs);
-@@ -238,13 +251,13 @@ static int group_rd_extended(struct lib_
+@@ -238,13 +251,13 @@
  	 * An entry pointing to the present logical partition.
  	 * It is an offset from the present partition table location.
  	 */
@@ -45,7 +45,7 @@
  
  	/* If it is a partition, add it to the set */
  	if (is_partition(p1, start_sector) &&
-@@ -301,8 +314,12 @@ static int group_rd(struct lib_context *
+@@ -301,8 +314,12 @@
  		part_end   = part_start + raw_table_entry->length;
  		
  		/* Avoid infinite recursion (mostly). */
@@ -60,7 +60,7 @@
  			continue;
  
  		/*
-@@ -365,7 +382,7 @@ static struct dmraid_format dos_format =
+@@ -365,7 +382,7 @@
  	.check	= dos_check,
  	.events	= NULL, /* Not supported */
  #ifdef DMRAID_NATIVE_LOG

dmraid-1.0.0.rc11-metadata-stride.patch:
 metadata.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: dmraid-1.0.0.rc11-metadata-stride.patch
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid-1.0.0.rc11-metadata-stride.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dmraid-1.0.0.rc11-metadata-stride.patch	7 Jul 2006 17:49:01 -0000	1.1
+++ dmraid-1.0.0.rc11-metadata-stride.patch	7 Jul 2006 17:59:00 -0000	1.2
@@ -1,6 +1,6 @@
---- dmraid/1.0.0.rc11/lib/metadata/metadata.c	2006-03-28 16:03:13.000000000 +0200
-+++ dmraid/current/lib/metadata/metadata.c	2006-07-06 17:56:52.000000000 +0200
-@@ -120,7 +120,7 @@ const char *get_status(struct lib_contex
+--- dmraid/1.0.0.rc11/lib/metadata/metadata.c.orig	2006-03-28 16:03:13.000000000 +0200
++++ dmraid/1.0.0.rc11/lib/metadata/metadata.c	2006-07-07 19:55:42.000000000 +0200
+@@ -120,7 +120,7 @@
  static uint64_t add_sectors(struct raid_set *rs, uint64_t sectors,
  			    uint64_t add)
  {



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:00:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:00:03 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.52,1.53
Message-ID: <200607071800.k67I03gY032126@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32080

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- dmraid.spec	7 Jul 2006 17:52:40 -0000	1.52
+++ dmraid.spec	7 Jul 2006 18:00:01 -0000	1.53
@@ -36,8 +36,8 @@
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
+%patch1 -p0
 
 %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



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:02:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:02:24 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.53,1.54
Message-ID: <200607071802.k67I2OZQ032498@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32454

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- dmraid.spec	7 Jul 2006 18:00:01 -0000	1.53
+++ dmraid.spec	7 Jul 2006 18:02:05 -0000	1.54
@@ -36,8 +36,8 @@
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p2
+%patch1 -p2
 
 %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



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:03:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:03:06 -0400
Subject: rpms/cman/devel cman.spec,1.45,1.46
Message-ID: <200607071803.k67I36CE032548@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32510

Modified Files:
	cman.spec 
Log Message:
Remove s390 & s390x from build.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cman.spec	7 Jul 2006 16:55:05 -0000	1.45
+++ cman.spec	7 Jul 2006 18:02:44 -0000	1.46
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.7
+Release: 0.fc6.8
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -29,7 +29,7 @@
 Requires(preun): /sbin/chkconfig
 Requires: openais
 #ExclusiveArch: %{ix86} x86_64
-ExcludeArch: ia64
+ExcludeArch: ia64 s390 s390x
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:03:42 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.76,1.77
Message-ID: <200607071803.k67I3g5f032635@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
>From Ralph Apel <rapel at redhat.com>:
- Add struts to classpath




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- tomcat5.spec	7 Jul 2006 17:03:32 -0000	1.76
+++ tomcat5.spec	7 Jul 2006 18:03:19 -0000	1.77
@@ -562,7 +562,7 @@
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 %if %{without_apisonly}
-CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard mx4j/mx4j-jmx)
+CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard mx4j/mx4j-jmx struts)
 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}}
@@ -1206,7 +1206,7 @@
 - Fix servlet-api.jar path
 From Ralph Apel <rapel at redhat.com>:
 - Re-add patch to add rt.jar
-- Add mx4j JMX API to classpath
+- Add mx4j JMX API and struts to classpath
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
 - Upgrade



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:14:45 -0400
Subject: rpms/gnome-applets/devel/gnome-applets-2.15.1.1 - New directory
Message-ID: <200607071814.k67IEjNA002721@cvs.devel.redhat.com>

Author: mclasen

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

Log Message:
Directory /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.15.1.1 added to the repository




From fedora-cvs-commits at redhat.com  Fri Jul  7 18:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:17:36 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.152,1.153
Message-ID: <200607071817.k67IHa1f018625@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
fix invest



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- gnome-applets.spec	22 Jun 2006 19:15:23 -0000	1.152
+++ gnome-applets.spec	7 Jul 2006 18:17:33 -0000	1.153
@@ -29,7 +29,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release: 2
+Release:  	3
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -40,6 +40,7 @@
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.15.1.1-cpufreq.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
+Patch10:	gnome-applets-2.15.1.1-invest.patch
 
 URL:		http://www.gnome.org/
 
@@ -94,6 +95,9 @@
 Source10:	cpufreq-selector.app
 Source11:	cpufreq-selector.pam
 
+# For invest-applet
+Requires: gnome-python2-applet
+
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
@@ -110,6 +114,7 @@
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch9 -p1 -b .gswitchit-export-dynamic
+%patch10 -p1 -b .invest
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -239,6 +244,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Fri Jul  7 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-3
+- Try to make the invest applet actually work
+
 * Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 1:2.15.1.1-2
 - fix invest applet location
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:23:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:23:18 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.15.1.1-invest.patch, NONE,
	1.1
Message-ID: <200607071823.k67INI6J020845@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	gnome-applets-2.15.1.1-invest.patch 
Log Message:
add patch


gnome-applets-2.15.1.1-invest.patch:
 Makefile.am     |    3 ++-
 art/Makefile.am |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gnome-applets-2.15.1.1-invest.patch ---
--- gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am.invest	2006-07-07 14:08:01.000000000 -0400
+++ gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am	2006-07-07 14:08:08.000000000 -0400
@@ -4,8 +4,6 @@
 pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = invest-big.png
 
-pkgdatadir = $(datadir)/gnome-applets/invest-applet
-
 artdir = $(pkgdatadir)/art
 art_DATA = invest-button.png invest-16.png invest.svg
 
--- gnome-applets-2.15.1.1/invest-applet/data/Makefile.am.invest	2006-07-07 14:06:39.000000000 -0400
+++ gnome-applets-2.15.1.1/invest-applet/data/Makefile.am	2006-07-07 14:17:11.000000000 -0400
@@ -28,6 +28,7 @@
 # Misc data
 # ******************************************************************************
 uidir = $(datadir)/gnome-2.0/ui
+gladedir = $(datadir)/invest-applet/glade
 
 ui_DATA = \
 	Invest_Applet.xml
@@ -45,7 +46,7 @@
 @INTLTOOL_DESKTOP_RULE@
 
 $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	sed -e "s|\@LIBEXECDIR\@|$(investbindir)|" $< > $@
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 #if GCONF_SCHEMAS_INSTALL
 #install-data-local: install-schemas



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:28:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:28:29 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.77,1.78
Message-ID: <200607071828.k67ISTvr032220@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Add jsp-api to the classpath




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- tomcat5.spec	7 Jul 2006 18:03:19 -0000	1.77
+++ tomcat5.spec	7 Jul 2006 18:28:27 -0000	1.78
@@ -563,7 +563,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 %if %{without_apisonly}
 CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard mx4j/mx4j-jmx struts)
-export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
+export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-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}}



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:38:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:38:38 -0400
Subject: rpms/gnome-applets/devel gnome-applets-2.15.1.1-invest.patch, 1.1,
	1.2
Message-ID: <200607071838.k67IccXj000311@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets-2.15.1.1-invest.patch 
Log Message:
fix patch


gnome-applets-2.15.1.1-invest.patch:
 Makefile.am     |    6 +++---
 art/Makefile.am |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

Index: gnome-applets-2.15.1.1-invest.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.15.1.1-invest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.15.1.1-invest.patch	7 Jul 2006 18:23:15 -0000	1.1
+++ gnome-applets-2.15.1.1-invest.patch	7 Jul 2006 18:38:25 -0000	1.2
@@ -1,25 +1,32 @@
---- gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am.invest	2006-07-07 14:08:01.000000000 -0400
-+++ gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am	2006-07-07 14:08:08.000000000 -0400
-@@ -4,8 +4,6 @@
+--- gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am.invest	2006-07-07 14:37:38.000000000 -0400
++++ gnome-applets-2.15.1.1/invest-applet/data/art/Makefile.am	2006-07-07 14:37:48.000000000 -0400
+@@ -4,6 +4,8 @@
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = invest-big.png
  
--pkgdatadir = $(datadir)/gnome-applets/invest-applet
--
++pkgdatadir = $(datadir)/gnome-applets/invest-applet
++
  artdir = $(pkgdatadir)/art
  art_DATA = invest-button.png invest-16.png invest.svg
  
---- gnome-applets-2.15.1.1/invest-applet/data/Makefile.am.invest	2006-07-07 14:06:39.000000000 -0400
-+++ gnome-applets-2.15.1.1/invest-applet/data/Makefile.am	2006-07-07 14:17:11.000000000 -0400
-@@ -28,6 +28,7 @@
- # Misc data
- # ******************************************************************************
+--- gnome-applets-2.15.1.1/invest-applet/data/Makefile.am.invest	2006-07-07 14:37:55.000000000 -0400
++++ gnome-applets-2.15.1.1/invest-applet/data/Makefile.am	2006-07-07 14:39:34.000000000 -0400
+@@ -30,12 +30,12 @@
  uidir = $(datadir)/gnome-2.0/ui
-+gladedir = $(datadir)/invest-applet/glade
- 
  ui_DATA = \
  	Invest_Applet.xml
-@@ -45,7 +46,7 @@
++pkgdatadir = $(datadir)/gnome-applets/invest-applet
++gladedir = $(pkgdatadir)/glade
+ glade_DATA = \
+ 	prefs-dialog.glade \
+ 	financialchart.glade
+ 
+-investbindir = $(libdir)/invest-applet
+-
+ # ******************************************************************************
+ # Build rules
+ # ******************************************************************************
+@@ -44,7 +44,7 @@
  @INTLTOOL_DESKTOP_RULE@
  
  $(server_in_files): $(server_in_files:.server.in=.server.in.in)



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:52:25 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.45, 1.46 authconfig.spec, 1.59,
	1.60 sources, 1.52, 1.53
Message-ID: <200607071852.k67IqPk6015559@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15544

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Fri Jul  7 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.0-1
- added support for smartcard authentication
- fixed parsing kerberos realms



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	18 May 2006 15:35:35 -0000	1.45
+++ .cvsignore	7 Jul 2006 18:52:22 -0000	1.46
@@ -1 +1 @@
-authconfig-5.2.5.tar.bz2
+authconfig-5.3.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- authconfig.spec	18 May 2006 15:35:35 -0000	1.59
+++ authconfig.spec	7 Jul 2006 18:52:22 -0000	1.60
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.2.5
+Version: 5.3.0
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -9,7 +9,7 @@
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
 Source: %{name}-%{version}.tar.bz2
-Requires: rhpl, newt, pam >= 0.77-56, usermode
+Requires: rhpl, newt, pam >= 0.99.5.0-2, usermode
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 BuildRequires: glib2-devel, python, python-devel
@@ -95,6 +95,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Jul  7 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.0-1
+- added support for smartcard authentication
+- fixed parsing kerberos realms
+
 * Thu May 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.5-1
 - write ldap servers as URIs and not HOSTs (#191842)
 - fix a typo in --test output


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	18 May 2006 15:35:35 -0000	1.52
+++ sources	7 Jul 2006 18:52:22 -0000	1.53
@@ -1 +1 @@
-db5acc0857eefe9a92c00c45c26d3776  authconfig-5.2.5.tar.bz2
+835e9abe482ddcf0153c9ff7b2610d00  authconfig-5.3.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul  7 18:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 14:54:53 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.78,1.79
Message-ID: <200607071854.k67IsrxX015641@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Do not build on ppc64




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- tomcat5.spec	7 Jul 2006 18:28:27 -0000	1.78
+++ tomcat5.spec	7 Jul 2006 18:54:51 -0000	1.79
@@ -101,6 +101,8 @@
 Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+# FIXME
+ExcludeArch: ppc64
 
 Requires: jpackage-utils >= 0:1.6.0
 # xml parsing packages
@@ -1203,6 +1205,7 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build
+- Do not build on ppc64
 - Fix servlet-api.jar path
 From Ralph Apel <rapel at redhat.com>:
 - Re-add patch to add rt.jar



From fedora-cvs-commits at redhat.com  Fri Jul  7 19:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 15:07:32 -0400
Subject: rpms/kernel/devel linux-2.6-autofs-revalidate-lookup.patch, NONE,
	1.1 kernel-2.6.spec, 1.2358, 1.2359
Message-ID: <200607071907.k67J7WS8015958@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-autofs-revalidate-lookup.patch 
Log Message:
- Enable autofs4 to return fail for revalidate during lookup


linux-2.6-autofs-revalidate-lookup.patch:
 autofs4/root.c |   38 ++++++++++++++++++++++++++++++--------
 namei.c        |   49 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 64 insertions(+), 23 deletions(-)

--- NEW FILE linux-2.6-autofs-revalidate-lookup.patch ---

--- linux-2.6.17.x86_64/fs/autofs4/root.c.dcache-revalidate-return-fail	2006-06-18 09:49:35.000000000 +0800
+++ linux-2.6.17.x86_64/fs/autofs4/root.c	2006-06-28 09:50:09.000000000 +0800
@@ -137,7 +137,9 @@ static int autofs4_dir_open(struct inode
 		nd.flags = LOOKUP_DIRECTORY;
 		ret = (dentry->d_op->d_revalidate)(dentry, &nd);
 
-		if (!ret) {
+		if (ret <= 0) {
+			if (ret < 0)
+				status = ret;
 			dcache_dir_close(inode, file);
 			goto out;
 		}
@@ -400,13 +402,23 @@ static int autofs4_revalidate(struct den
 	struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
 	int oz_mode = autofs4_oz_mode(sbi);
 	int flags = nd ? nd->flags : 0;
-	int status = 0;
+	int status;
 
 	/* Pending dentry */
 	if (autofs4_ispending(dentry)) {
-		if (!oz_mode)
-			status = try_to_fill_dentry(dentry, flags);
-		return !status;
+		/* The daemon never causes a mount to trigger */
+		if (oz_mode)
+			return 1;
+
+		/*
+		 * A zero status is success otherwise we have a
+		 * negative error code.
+		 */
+		status = try_to_fill_dentry(dentry, flags);
+		if (status == 0)
+			return 1;
+
+		return status;
 	}
 
 	/* Negative dentry.. invalidate if "old" */
@@ -421,9 +433,19 @@ static int autofs4_revalidate(struct den
 		DPRINTK("dentry=%p %.*s, emptydir",
 			 dentry, dentry->d_name.len, dentry->d_name.name);
 		spin_unlock(&dcache_lock);
-		if (!oz_mode)
-			status = try_to_fill_dentry(dentry, flags);
-		return !status;
+		/* The daemon never causes a mount to trigger */
+		if (oz_mode)
+			return 1;
+
+		/*
+		 * A zero status is success otherwise we have a
+		 * negative error code.
+		 */
+		status = try_to_fill_dentry(dentry, flags);
+		if (status == 0)
+			return 1;
+
+		return status;
 	}
 	spin_unlock(&dcache_lock);
 
--- linux-2.6.17.x86_64/fs/namei.c.dcache-revalidate-return-fail	2006-06-28 09:48:54.000000000 +0800
+++ linux-2.6.17.x86_64/fs/namei.c	2006-06-28 09:51:52.000000000 +0800
@@ -365,6 +365,29 @@ void release_open_intent(struct nameidat
 		fput(nd->intent.open.file);
 }
 
+static inline struct dentry *do_revalidate(struct dentry *dentry, struct nameidata *nd)
+{
+	int status = dentry->d_op->d_revalidate(dentry, nd);
+	if (unlikely(status <= 0)) {
+		/*
+		 * The dentry failed validation.
+		 * If d_revalidate returned 0 attempt to invalidate
+		 * the dentry otherwise d_revalidate is asking us
+		 * to return a fail status.
+		 */
+		if (!status) {
+			if (!d_invalidate(dentry)) {
+				dput(dentry);
+				dentry = NULL;
+			}
+		} else {
+			dput(dentry);
+			dentry = ERR_PTR(status);
+		}
+	}
+	return dentry;
+}
+
 /*
  * Internal lookup() using the new generic dcache.
  * SMP-safe
@@ -379,12 +402,9 @@ static struct dentry * cached_lookup(str
 	if (!dentry)
 		dentry = d_lookup(parent, name);
 
-	if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
-		if (!dentry->d_op->d_revalidate(dentry, nd) && !d_invalidate(dentry)) {
-			dput(dentry);
-			dentry = NULL;
-		}
-	}
+	if (dentry && dentry->d_op && dentry->d_op->d_revalidate)
+		dentry = do_revalidate(dentry, nd);
+
 	return dentry;
 }
 
@@ -477,10 +497,9 @@ static struct dentry * real_lookup(struc
 	 */
 	mutex_unlock(&dir->i_mutex);
 	if (result->d_op && result->d_op->d_revalidate) {
-		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
-			dput(result);
+		result = do_revalidate(result, nd);
+		if (!result)
 			result = ERR_PTR(-ENOENT);
-		}
 	}
 	return result;
 }
@@ -764,12 +783,12 @@ need_lookup:
 need_revalidate:
 	if (atomic)
 		return -EWOULDBLOCKIO;
-	if (dentry->d_op->d_revalidate(dentry, nd))
-		goto done;
-	if (d_invalidate(dentry))
-		goto done;
-	dput(dentry);
-	goto need_lookup;
+	dentry = do_revalidate(dentry, nd);
+	if (!dentry)
+		goto need_lookup;
+	if (IS_ERR(dentry))
+		goto fail;
+	goto done;
 
 fail:
 	return PTR_ERR(dentry);




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2358
retrieving revision 1.2359
diff -u -r1.2358 -r1.2359
--- kernel-2.6.spec	7 Jul 2006 07:52:24 -0000	1.2358
+++ kernel-2.6.spec	7 Jul 2006 19:07:15 -0000	1.2359
@@ -347,6 +347,7 @@
 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-autofs-revalidate-lookup.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -880,6 +881,8 @@
 %patch1620 -p1
 # Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
+# Enable autofs4 to return fail for revalidate during lookup
+%patch1640 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
@@ -1556,6 +1559,7 @@
 %changelog
 * Fri Jul  7 2006 Dave Jones <davej at redhat.com>
 - Add lockdep annotate for bdev warning.
+- Enable autofs4 to return fail for revalidate during lookup
 
 * Thu Jul  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1



From fedora-cvs-commits at redhat.com  Fri Jul  7 19:11:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 15:11:52 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.79,1.80
Message-ID: <200607071911.k67JBqxs026665@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Disable s390x




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- tomcat5.spec	7 Jul 2006 18:54:51 -0000	1.79
+++ tomcat5.spec	7 Jul 2006 19:11:49 -0000	1.80
@@ -102,7 +102,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 # FIXME
-ExcludeArch: ppc64
+ExcludeArch: ppc64 s390x
 
 Requires: jpackage-utils >= 0:1.6.0
 # xml parsing packages
@@ -1205,7 +1205,7 @@
 %changelog
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build
-- Do not build on ppc64
+- Do not build on ppc64 and s390x
 - Fix servlet-api.jar path
 From Ralph Apel <rapel at redhat.com>:
 - Re-add patch to add rt.jar



From fedora-cvs-commits at redhat.com  Fri Jul  7 19:24:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 15:24:18 -0400
Subject: rpms/mdadm/devel mdadm-2.5.2-cflags.patch, NONE,
	1.1 mdadm-2.5.2-s390-build.patch, NONE,
	1.1 mdadm-2.5.2-static.patch, NONE, 1.1 mdmpd-0.4-node.patch,
	NONE, 1.1 .cvsignore, 1.12, 1.13 mdadm.spec, 1.30,
	1.31 sources, 1.12, 1.13 mdadm-1.9.0-s390-build.patch, 1.5,
	NONE mdadm-1.9.0-static-make.patch, 1.1,
	NONE mdadm-2.3.1-cflags.patch, 1.2, NONE
Message-ID: <200607071924.k67JOIsg013648@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13615

Modified Files:
	.cvsignore mdadm.spec sources 
Added Files:
	mdadm-2.5.2-cflags.patch mdadm-2.5.2-s390-build.patch 
	mdadm-2.5.2-static.patch mdmpd-0.4-node.patch 
Removed Files:
	mdadm-1.9.0-s390-build.patch mdadm-1.9.0-static-make.patch 
	mdadm-2.3.1-cflags.patch 
Log Message:
Update mdadm to 2.5.2

mdadm-2.5.2-cflags.patch:
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mdadm-2.5.2-cflags.patch ---
--- mdadm-2.5.2/Makefile.cflags	2006-07-07 15:00:32.000000000 -0400
+++ mdadm-2.5.2/Makefile	2006-07-07 15:02:09.000000000 -0400
@@ -89,10 +89,10 @@ everything: all mdadm.static mdadm.uclib
 # mdadm.tcc doesn't work..
 
 mdadm : $(OBJS)
-	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
 
 mdadm.static : $(OBJS) $(STATICOBJS)
-	$(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
 
 mdadm.tcc : $(SRCS) mdadm.h
 	$(TCC) -o mdadm.tcc $(SRCS)
@@ -113,7 +113,7 @@ mdassemble : $(ASSEMBLE_SRCS) mdadm.h
 
 mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
 	rm -f $(OBJS)
-	$(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
+	$(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
 mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h
 	rm -f $(OJS)

mdadm-2.5.2-s390-build.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-2.5.2-s390-build.patch ---
--- mdadm-2.5.2/Makefile.s390	2006-06-19 20:01:17.000000000 -0400
+++ mdadm-2.5.2/Makefile	2006-07-07 14:11:23.000000000 -0400
@@ -39,7 +39,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
 
 CC = $(CROSS_COMPILE)gcc
 CXFLAGS = -ggdb
-CWFLAGS = -Wall -Werror -Wstrict-prototypes
+CWFLAGS = -Wall -Wstrict-prototypes
 
 ifdef DEBIAN
 CPPFLAGS= -DDEBIAN

mdadm-2.5.2-static.patch:
 Makefile |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE mdadm-2.5.2-static.patch ---
--- mdadm-2.5.2/Makefile.static	2006-07-07 14:12:20.000000000 -0400
+++ mdadm-2.5.2/Makefile	2006-07-07 14:17:54.000000000 -0400
@@ -141,20 +141,22 @@ $(OBJS) : mdadm.h bitmap.h
 sha1.o : sha1.c sha1.h md5.h
 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
 
-install : mdadm install-man
-	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
+install : mdadm mdadm.static mdassemble.static install-man
+	$(INSTALL) -D -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
+	$(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
+	$(INSTALL) -D -m 755 mdassemble.static $(DESTDIR)$(BINDIR)/mdassemble.static
 
 install-static : mdadm.static install-man
-	$(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
+	$(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
 
 install-tcc : mdadm.tcc install-man
-	$(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
+	$(INSTALL) -D -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
 
 install-uclibc : mdadm.uclibc install-man
-	$(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
+	$(INSTALL) -D -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
 
 install-klibc : mdadm.klibc install-man
-	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
+	$(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
 
 install-man: mdadm.8 md.4 mdadm.conf.5
 	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8

mdmpd-0.4-node.patch:
 mdctrl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdmpd-0.4-node.patch ---
--- mdadm-2.5.2/mdmpd/mdctrl.c.node	2006-07-07 14:59:10.000000000 -0400
+++ mdadm-2.5.2/mdmpd/mdctrl.c	2006-07-07 14:59:32.000000000 -0400
@@ -48,7 +48,7 @@
 #endif
 
 static char *	revision		= "mdctrl.c ($Revision: 1.5 $)";
-static char 	node_directory[]	= "/var/run/mdmpd";
+char	 	node_directory[]	= "/var/run/mdmpd";
 static char	path[80];
 
 static char *print_number(char *s, long number) {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Mar 2006 23:20:13 -0000	1.12
+++ .cvsignore	7 Jul 2006 19:24:16 -0000	1.13
@@ -1,3 +1,4 @@
 mdmpd-0.4.tgz
 mdadm-2.2.tar.bz2
 mdadm-2.3.1.tgz
+mdadm-2.5.2.tar.bz2


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mdadm.spec	9 Mar 2006 00:01:27 -0000	1.30
+++ mdadm.spec	7 Jul 2006 19:24:16 -0000	1.31
@@ -1,20 +1,20 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
-Version:     2.3.1
-Release: 3
-Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tgz
+Version:     2.5.2
+Release: 1
+Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
 Source3:     mdmpd.init
 Source4:     mdassemble.8
 Patch:	     mdadm-1.5.0-email.patch
-Patch2:      mdadm-1.9.0-s390-build.patch
-Patch3:      mdadm-1.9.0-static-make.patch
-Patch4:      mdadm-1.11.0-default-auto.patch
+Patch1:      mdmpd-0.4-node.patch
+Patch2:      mdadm-2.5.2-s390-build.patch
+Patch3:      mdadm-2.5.2-static.patch
 Patch5:      mdadm-2.2-nodiet.patch
-Patch6:      mdadm-2.3.1-cflags.patch
+Patch6:      mdadm-2.5.2-cflags.patch
 Patch7:	     mdadm-2.3.1-fswab64.patch
-URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
+URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPL
 Group:       System Environment/Base
 BuildRoot:   %{_tmppath}/%{name}-root
@@ -31,19 +31,19 @@
 %prep
 %setup -q -a 2
 %patch -p1 -b .email
+%patch1 -p1 -b .node
 %patch2 -p1 -b .s390
 %patch3 -p1 -b .static
-%patch4 -p1 -b .auto
 %patch5 -p1 -b .nodiet
 %patch6 -p1 -b .cflags
-%patch7 -p1 -b .fswab64
+#%patch7 -p1 -b .fswab64
 
 %build
-make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdadm.static mdassemble.static
+make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static
 make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install.mdadmstatic install.mdassemble
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install
 make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install
 install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd
@@ -87,6 +87,10 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Jul  7 2006 Doug Ledford <dledford at redhat.com> - 2.5.2-1
+- Update to 2.5.2
+- Remove auto default patch as upstream now has a preferred default auto method
+
 * Wed Mar  8 2006 Peter Jones <pjones at redhat.com> - 2.3.1-3
 - fix build on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Mar 2006 23:20:13 -0000	1.12
+++ sources	7 Jul 2006 19:24:16 -0000	1.13
@@ -1,3 +1,2 @@
 d173fc81f2cc11cb84522fac63e876f1  mdmpd-0.4.tgz
-c8df672f809aa4a43a88a2516d421d6e  mdadm-2.2.tar.bz2
-3fef2abf76cf019286db5c465619e39d  mdadm-2.3.1.tgz
+f95d58d3ce8d43c628345d76197ce97b  mdadm-2.5.2.tar.bz2


--- mdadm-1.9.0-s390-build.patch DELETED ---


--- mdadm-1.9.0-static-make.patch DELETED ---


--- mdadm-2.3.1-cflags.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 19:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 15:35:17 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-hesiod-lib.patch, NONE,
	1.1 autofs.spec, 1.120, 1.121
Message-ID: <200607071935.k67JZH2D016623@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-hesiod-lib.patch 
Log Message:
* Sat Jul 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-6
- correct test for libhesiod.


autofs-5.0.0_beta6-hesiod-lib.patch:
 CHANGELOG    |    1 +
 aclocal.m4   |   17 +++++++++++++++++
 configure    |   36 +++++++++++-------------------------
 configure.in |    3 +--
 4 files changed, 30 insertions(+), 27 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-hesiod-lib.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b0fc850..62e3e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - correct auth init test when no credentials required.
 - correct auto.net installed as auto.smb.
 - update LDAP auth - add autodectect option.
+- correct test for libhesiod.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/aclocal.m4 b/aclocal.m4
index 890d689..4816cfe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -171,3 +171,20 @@ else
   XML_FLAGS=`$XML_CONFIG --cflags`
 fi])
 
+dnl --------------------------------------------------------------------------
+dnl AF_CHECK_LIBHESIOD
+dnl
+dnl Check for lib hesiod
+dnl --------------------------------------------------------------------------
+AC_DEFUN([AF_CHECK_LIBHESIOD],
+[AC_MSG_CHECKING(for libhesiod)
+LIBS="$LIBHESIOD -lhesiod -lresolv"
+AC_TRY_LINK(
+  [ #include <hesiod.h> ],
+  [ char *c; hesiod_init(&c); ],
+  [ HAVE_HESIOD=1
+    LIBHESIOD="$LIBHESIOD -lhesiod -lresolv"
+    AC_MSG_RESULT(yes) ],
+  [ AC_MSG_RESULT(no) ])
+])
+
diff --git a/configure b/configure
index ba35cfc..501a46d 100755
--- a/configure
+++ b/configure
@@ -3168,31 +3168,20 @@ fi;
 if test -z "$HAVE_HESIOD"
 then
 	HAVE_HESIOD=0
-	echo "$as_me:$LINENO: checking for hesiod_resolve in -lhesiod" >&5
-echo $ECHO_N "checking for hesiod_resolve in -lhesiod... $ECHO_C" >&6
-if test "${ac_cv_lib_hesiod_hesiod_resolve+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhesiod $LIBRESOLV $LIBS"
+	echo "$as_me:$LINENO: checking for libhesiod" >&5
+echo $ECHO_N "checking for libhesiod... $ECHO_C" >&6
+LIBS="$LIBHESIOD -lhesiod -lresolv"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char hesiod_resolve ();
+ #include <hesiod.h>
 int
 main ()
 {
-hesiod_resolve ();
+ char *c; hesiod_init(&c);
   ;
   return 0;
 }
@@ -3219,22 +3208,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_hesiod_hesiod_resolve=yes
+   HAVE_HESIOD=1
+    LIBHESIOD="$LIBHESIOD -lhesiod -lresolv"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_hesiod_hesiod_resolve=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hesiod_resolve" >&5
-echo "${ECHO_T}$ac_cv_lib_hesiod_hesiod_resolve" >&6
-if test $ac_cv_lib_hesiod_hesiod_resolve = yes; then
-  HAVE_HESIOD=1 LIBHESIOD="$LIBHESIOD -lhesiod"
-fi
 
 	if test "$HAVE_HESIOD" == "1"; then
 
diff --git a/configure.in b/configure.in
index b898ea2..bcdfccf 100644
--- a/configure.in
+++ b/configure.in
@@ -143,8 +143,7 @@ AC_ARG_WITH(hesiod,
 if test -z "$HAVE_HESIOD"
 then
 	HAVE_HESIOD=0
-	AC_CHECK_LIB(hesiod, hesiod_resolve, HAVE_HESIOD=1 LIBHESIOD="$LIBHESIOD -lhesiod", ,
-		     $LIBRESOLV)
+	AF_CHECK_LIBHESIOD()
 	if test "$HAVE_HESIOD" == "1"; then
 		AC_DEFINE(WITH_HESIOD,1,
 			[Define if using Hesiod as a source of automount maps])


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- autofs.spec	7 Jul 2006 04:24:58 -0000	1.120
+++ autofs.spec	7 Jul 2006 19:35:14 -0000	1.121
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -20,6 +20,7 @@
 Patch7: autofs-5.0.0_beta6-check-no-creds-required.patch
 Patch8: autofs-5.0.0_beta6-correct-auto.smb.patch
 Patch9: autofs-5.0.0_beta6-auth-add-autodetect.patch
+Patch10: autofs-5.0.0_beta6-hesiod-lib.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -67,6 +68,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -123,6 +125,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Sat Jul 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-6
+- correct test for libhesiod.
+
 * Fri Jul 7 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-5
 - correct auto.net installed as auto.smb.
 - update LDAP auth - add autodectect option.



From fedora-cvs-commits at redhat.com  Fri Jul  7 19:39:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 15:39:57 -0400
Subject: rpms/kernel/devel/scripts merge.pl,1.3,1.4
Message-ID: <200607071939.k67Jdvom017816@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	merge.pl 
Log Message:
Speed improvement by changing algorithm from O(N^2) to O(N!).
This is done by removing the matching config options out of the compare
list.  The assumption is the config option will only be seen once in the
master list. 




Index: merge.pl
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/merge.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merge.pl	11 May 2006 19:50:03 -0000	1.3
+++ merge.pl	7 Jul 2006 19:39:55 -0000	1.4
@@ -3,7 +3,6 @@
 my @args=@ARGV;
 my @configoptions;
 my @configvalues;
-my @alreadyprinted;
 my $configcounter = 0;
 
 # optionally print out the architecture as the first line of our output
@@ -20,13 +19,11 @@
 	if (/\# ([\w]+) is not set/) {
 		$configoptions[$configcounter] = $1;
 		$configvalues[$configcounter] = $str;
-		$alreadyprinted[$configcounter] = 0;
 		$configcounter ++;
 	} else {
 		if (/([\w]+)=/) {
 			$configoptions[$configcounter] = $1;
 			$configvalues[$configcounter] = $str;
-			$alreadyprinted[$configcounter] = 0;
 			$configcounter ++;
 		}
 	}
@@ -34,7 +31,7 @@
 
 # now, read and output the entire configfile, except for the overridden
 # parts... for those the new value is printed.
-# O(N^2) algorithm so if this is slow I need to look at it later
+# O(N!) algorithm so if this is slow I need to look at it later
 
 open (FILE2,"$args[1]") || die "Could not open $args[1]";
 while (<FILE2>) {
@@ -55,8 +52,13 @@
 	while ($counter < $configcounter) {
 		if ("$configname" eq "$configoptions[$counter]") {
 			$nooutput = 1;
-			$alreadyprinted[$counter] = 1;
 			print "$configvalues[$counter]";
+
+			#remove this option from the list
+			#assuming no duplicates here
+			splice(@configoptions,$counter,1);
+			splice(@configvalues,$counter,1);
+			$configcounter--;
 			last;
 		}
 		$counter++;
@@ -71,9 +73,7 @@
 my $counter = 0;
 
 while ($counter < $configcounter) {
-	if ($alreadyprinted[$counter]==0) {
-		print "$configvalues[$counter]";
-	}
+	print "$configvalues[$counter]";
 	$counter++;
 }
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 20:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 16:04:20 -0400
Subject: rpms/oprofile/devel oprofile-power5p.patch, NONE,
	1.1 oprofile-ppc64evts.patch, NONE, 1.1 oprofile.spec, 1.42, 1.43
Message-ID: <200607072004.k67K4KQR008227@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8157

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-power5p.patch oprofile-ppc64evts.patch 
Log Message:

- Support for power5+. (#197728)
- Fix PPC64 events and groups. (#197895)



oprofile-power5p.patch:
 events/Makefile.am                  |    1 
 events/ppc64/power5+/event_mappings | 1232 +++++++++++++++++++++++++++++++++++
 events/ppc64/power5+/events         | 1242 ++++++++++++++++++++++++++++++++++++
 events/ppc64/power5+/unit_masks     |    4 
 libop/op_cpu_type.c                 |    1 
 libop/op_cpu_type.h                 |    1 
 libop/op_events.c                   |    2 
 utils/opcontrol                     |    2 
 utils/ophelp.c                      |    1 
 9 files changed, 2485 insertions(+), 1 deletion(-)

--- NEW FILE oprofile-power5p.patch ---
diff -paurN oprofile-0.9.1/events/Makefile.am oprof-Build-with-P5+/events/Makefile.am
--- oprofile-0.9.1/events/Makefile.am	2006-07-06 09:45:50.000000000 -0400
+++ oprof-Build-with-P5+/events/Makefile.am	2006-07-06 10:13:08.000000000 -0400
@@ -16,6 +16,7 @@ event_files = \
 	ia64/itanium/events ia64/itanium/unit_masks \
 	ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \
 	ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \
+	ppc64/power5+/events ppc64/power5+/event_mappings ppc64/power5+/unit_masks \
 	ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \
 	rtc/events rtc/unit_masks \
 	x86-64/hammer/events x86-64/hammer/unit_masks \
diff -paurN oprofile-0.9.1/events/ppc64/power5+/event_mappings oprof-Build-with-P5+/events/ppc64/power5+/event_mappings
--- oprofile-0.9.1/events/ppc64/power5+/event_mappings	1969-12-31 19:00:00.000000000 -0500
+++ oprof-Build-with-P5+/events/ppc64/power5+/event_mappings	2006-07-06 10:13:08.000000000 -0400
@@ -0,0 +1,1232 @@
+#Mapping of event groups to MMCR values
+
+#Group Default
+event:0X001 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+
+#Group 0 with random sampling
+event:0X002 mmcr0:0X00000000 mmcr1:0X4000000002341E36 mmcra:0X00000001
+
+
+#Group 1 pm_utilization, CPI and utilization data
+event:0X010 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+event:0X011 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+event:0X012 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+event:0X013 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+event:0X014 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+event:0X015 mmcr0:0X00000000 mmcr1:0X000000000A12121E mmcra:0X00000000
+
+#Group 2 pm_completion, Completion and cycle counts
+event:0X020 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+event:0X021 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+event:0X022 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+event:0X023 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+event:0X024 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+event:0X025 mmcr0:0X00000000 mmcr1:0X000000002608261E mmcra:0X00000000
+
+#Group 3 pm_group_dispatch, Group dispatch events
+event:0X030 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+event:0X031 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+event:0X032 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+event:0X033 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+event:0X034 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+event:0X035 mmcr0:0X00000000 mmcr1:0X4000000EC6C8C212 mmcra:0X00000000
+
+#Group 4 pm_clb1, CLB fullness
+event:0X040 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+event:0X041 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+event:0X042 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+event:0X043 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+event:0X044 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+event:0X045 mmcr0:0X00000000 mmcr1:0X015B000180848C4C mmcra:0X00000001
+
+#Group 5 pm_clb2, CLB fullness
+event:0X050 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+event:0X051 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+event:0X052 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+event:0X053 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+event:0X054 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+event:0X055 mmcr0:0X00000000 mmcr1:0X014300028A8CCC02 mmcra:0X00000001
+
+#Group 6 pm_gct_empty, GCT empty reasons
+event:0X060 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+event:0X061 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+event:0X062 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+event:0X063 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+event:0X064 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+event:0X065 mmcr0:0X00000000 mmcr1:0X4000000008380838 mmcra:0X00000000
+
+#Group 7 pm_gct_usage, GCT Usage
+event:0X070 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+event:0X071 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+event:0X072 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+event:0X073 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+event:0X074 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+event:0X075 mmcr0:0X00000000 mmcr1:0X000000003E3E3E3E mmcra:0X00000000
+
+#Group 8 pm_lsu1, LSU LRQ and LMQ events
+event:0X080 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+event:0X081 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+event:0X082 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+event:0X083 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+event:0X084 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+event:0X085 mmcr0:0X00000000 mmcr1:0X020F000FCECCCCCA mmcra:0X00000000
+
+#Group 9 pm_lsu2, LSU SRQ events
+event:0X090 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+event:0X091 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+event:0X092 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+event:0X093 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+event:0X094 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+event:0X095 mmcr0:0X00000000 mmcr1:0X400E000ECECCCA86 mmcra:0X00000000
+
+#Group 10 pm_lsu3, LSU SRQ and LMQ events
+event:0X0A0 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+event:0X0A1 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+event:0X0A2 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+event:0X0A3 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+event:0X0A4 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+event:0X0A5 mmcr0:0X00000000 mmcr1:0X030F0004EA102A2A mmcra:0X00000000
+
+#Group 11 pm_lsu4, LSU SRQ and LMQ events
+event:0X0B0 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+event:0X0B1 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+event:0X0B2 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+event:0X0B3 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+event:0X0B4 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+event:0X0B5 mmcr0:0X00000000 mmcr1:0X40030000EEA62A2A mmcra:0X00000000
+
+#Group 12 pm_prefetch1, Prefetch stream allocation
+event:0X0C0 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+event:0X0C1 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+event:0X0C2 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+event:0X0C3 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+event:0X0C4 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+event:0X0C5 mmcr0:0X00000000 mmcr1:0X8432000D3AC884CE mmcra:0X00000000
+
+#Group 13 pm_prefetch2, Prefetch events
+event:0X0D0 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+event:0X0D1 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+event:0X0D2 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+event:0X0D3 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+event:0X0D4 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+event:0X0D5 mmcr0:0X00000000 mmcr1:0X8103000602CACE8E mmcra:0X00000001
+
+#Group 14 pm_prefetch3, L2 prefetch and misc events
+event:0X0E0 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+event:0X0E1 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+event:0X0E2 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+event:0X0E3 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+event:0X0E4 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+event:0X0E5 mmcr0:0X00000000 mmcr1:0X047C000482108602 mmcra:0X00000001
+
+#Group 15 pm_prefetch4, Misc prefetch and reject events
+event:0X0F0 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+event:0X0F1 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+event:0X0F2 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+event:0X0F3 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+event:0X0F4 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+event:0X0F5 mmcr0:0X00000000 mmcr1:0X0CF200028088CC86 mmcra:0X00000000
+
+#Group 16 pm_lsu_reject1, LSU reject events
+event:0X100 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+event:0X101 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+event:0X102 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+event:0X103 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+event:0X104 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+event:0X105 mmcr0:0X00000000 mmcr1:0XC8E000022010C610 mmcra:0X00000001
+
+#Group 17 pm_lsu_reject2, LSU rejects due to reload CDF or tag update collision
+event:0X110 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+event:0X111 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+event:0X112 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+event:0X113 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+event:0X114 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+event:0X115 mmcr0:0X00000000 mmcr1:0X88C00001848C02CE mmcra:0X00000001
+
+#Group 18 pm_lsu_reject3, LSU rejects due to ERAT, held instuctions
+event:0X120 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+event:0X121 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+event:0X122 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+event:0X123 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+event:0X124 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+event:0X125 mmcr0:0X00000000 mmcr1:0X48C00003868EC0C8 mmcra:0X00000000
+
+#Group 19 pm_lsu_reject4, LSU0/1 reject LMQ full
+event:0X130 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+event:0X131 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+event:0X132 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+event:0X133 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+event:0X134 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+event:0X135 mmcr0:0X00000000 mmcr1:0X88C00001828A02C8 mmcra:0X00000001
+
+#Group 20 pm_lsu_reject5, LSU misc reject and flush events
+event:0X140 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+event:0X141 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+event:0X142 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+event:0X143 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+event:0X144 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+event:0X145 mmcr0:0X00000000 mmcr1:0X48C0000010208A8E mmcra:0X00000000
+
+#Group 21 pm_flush1, Misc flush events
+event:0X150 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+event:0X151 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+event:0X152 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+event:0X153 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+event:0X154 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+event:0X155 mmcr0:0X00000000 mmcr1:0XC0F000020210C68E mmcra:0X00000001
+
+#Group 22 pm_flush2, Flushes due to scoreboard and sync
+event:0X160 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
+event:0X161 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
+event:0X162 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
+event:0X163 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
+event:0X164 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
+event:0X165 mmcr0:0X00000000 mmcr1:0XC08000038002C4C2 mmcra:0X00000001
[...2166 lines suppressed...]
+
+#Group 138 pm_prefetchX, Prefetch events
+event:0X8A0 counters:0 um:zero minimum:10000 name:PM_CYC_GRP138 : (Group 138 pm_prefetchX) Processor cycles
+event:0X8A1 counters:1 um:zero minimum:1000 name:PM_IC_PREF_REQ_GRP138 : (Group 138 pm_prefetchX) Instruction prefetch requests
+event:0X8A2 counters:2 um:zero minimum:1000 name:PM_L1_PREF_GRP138 : (Group 138 pm_prefetchX) L1 cache data prefetches
+event:0X8A3 counters:3 um:zero minimum:1000 name:PM_L2_PREF_GRP138 : (Group 138 pm_prefetchX) L2 cache prefetches
+event:0X8A4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP138 : (Group 138 pm_prefetchX) Run instructions completed
+event:0X8A5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP138 : (Group 138 pm_prefetchX) Run cycles
+
+#Group 139 pm_branchX, Branch operations
+event:0X8B0 counters:0 um:zero minimum:1000 name:PM_BR_UNCOND_GRP139 : (Group 139 pm_branchX) Unconditional branch
+event:0X8B1 counters:1 um:zero minimum:1000 name:PM_BR_PRED_TA_GRP139 : (Group 139 pm_branchX) A conditional branch was predicted, target prediction
+event:0X8B2 counters:2 um:zero minimum:1000 name:PM_BR_PRED_CR_GRP139 : (Group 139 pm_branchX) A conditional branch was predicted, CR prediction
+event:0X8B3 counters:3 um:zero minimum:1000 name:PM_BR_ISSUED_GRP139 : (Group 139 pm_branchX) Branches issued
+event:0X8B4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP139 : (Group 139 pm_branchX) Run instructions completed
+event:0X8B5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP139 : (Group 139 pm_branchX) Run cycles
+
+#Group 140 pm_fpuX1, Floating point events by unit
+event:0X8C0 counters:0 um:zero minimum:1000 name:PM_FPU0_STALL3_GRP140 : (Group 140 pm_fpuX1) FPU0 stalled in pipe3
+event:0X8C1 counters:1 um:zero minimum:1000 name:PM_FPU1_STALL3_GRP140 : (Group 140 pm_fpuX1) FPU1 stalled in pipe3
+event:0X8C2 counters:2 um:zero minimum:1000 name:PM_FPU0_FIN_GRP140 : (Group 140 pm_fpuX1) FPU0 produced a result
+event:0X8C3 counters:3 um:zero minimum:1000 name:PM_FPU0_FPSCR_GRP140 : (Group 140 pm_fpuX1) FPU0 executed FPSCR instruction
+event:0X8C4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP140 : (Group 140 pm_fpuX1) Run instructions completed
+event:0X8C5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP140 : (Group 140 pm_fpuX1) Run cycles
+
+#Group 141 pm_fpuX2, Floating point events by unit
+event:0X8D0 counters:0 um:zero minimum:1000 name:PM_FPU0_FMA_GRP141 : (Group 141 pm_fpuX2) FPU0 executed multiply-add instruction
+event:0X8D1 counters:1 um:zero minimum:1000 name:PM_FPU1_FMA_GRP141 : (Group 141 pm_fpuX2) FPU1 executed multiply-add instruction
+event:0X8D2 counters:2 um:zero minimum:1000 name:PM_FPU0_FRSP_FCONV_GRP141 : (Group 141 pm_fpuX2) FPU0 executed FRSP or FCONV instructions
+event:0X8D3 counters:3 um:zero minimum:1000 name:PM_FPU1_FRSP_FCONV_GRP141 : (Group 141 pm_fpuX2) FPU1 executed FRSP or FCONV instructions
+event:0X8D4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP141 : (Group 141 pm_fpuX2) Run instructions completed
+event:0X8D5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP141 : (Group 141 pm_fpuX2) Run cycles
+
+#Group 142 pm_fpuX3, Floating point events by unit
+event:0X8E0 counters:0 um:zero minimum:1000 name:PM_FPU0_1FLOP_GRP142 : (Group 142 pm_fpuX3) FPU0 executed add, mult, sub, cmp or sel instruction
+event:0X8E1 counters:1 um:zero minimum:1000 name:PM_FPU1_1FLOP_GRP142 : (Group 142 pm_fpuX3) FPU1 executed add, mult, sub, cmp or sel instruction
+event:0X8E2 counters:2 um:zero minimum:1000 name:PM_FPU0_FIN_GRP142 : (Group 142 pm_fpuX3) FPU0 produced a result
+event:0X8E3 counters:3 um:zero minimum:1000 name:PM_FPU1_FIN_GRP142 : (Group 142 pm_fpuX3) FPU1 produced a result
+event:0X8E4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP142 : (Group 142 pm_fpuX3) Run instructions completed
+event:0X8E5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP142 : (Group 142 pm_fpuX3) Run cycles
+
+#Group 143 pm_fpuX4, Floating point and L1 events
+event:0X8F0 counters:0 um:zero minimum:1000 name:PM_FPU_1FLOP_GRP143 : (Group 143 pm_fpuX4) FPU executed one flop instruction 
+event:0X8F1 counters:1 um:zero minimum:1000 name:PM_FPU_FMA_GRP143 : (Group 143 pm_fpuX4) FPU executed multiply-add instruction
+event:0X8F2 counters:2 um:zero minimum:1000 name:PM_ST_REF_L1_GRP143 : (Group 143 pm_fpuX4) L1 D cache store references
+event:0X8F3 counters:3 um:zero minimum:1000 name:PM_LD_REF_L1_GRP143 : (Group 143 pm_fpuX4) L1 D cache load references
+event:0X8F4 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP143 : (Group 143 pm_fpuX4) Run instructions completed
+event:0X8F5 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP143 : (Group 143 pm_fpuX4) Run cycles
+
+#Group 144 pm_fpuX5, Floating point events
+event:0X900 counters:0 um:zero minimum:1000 name:PM_FPU_SINGLE_GRP144 : (Group 144 pm_fpuX5) FPU executed single precision instruction
+event:0X901 counters:1 um:zero minimum:1000 name:PM_FPU_STF_GRP144 : (Group 144 pm_fpuX5) FPU executed store instruction
+event:0X902 counters:2 um:zero minimum:1000 name:PM_FPU0_FIN_GRP144 : (Group 144 pm_fpuX5) FPU0 produced a result
+event:0X903 counters:3 um:zero minimum:1000 name:PM_FPU1_FIN_GRP144 : (Group 144 pm_fpuX5) FPU1 produced a result
+event:0X904 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP144 : (Group 144 pm_fpuX5) Run instructions completed
+event:0X905 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP144 : (Group 144 pm_fpuX5) Run cycles
+
+#Group 145 pm_fpuX6, Floating point events
+event:0X910 counters:0 um:zero minimum:1000 name:PM_FPU_FDIV_GRP145 : (Group 145 pm_fpuX6) FPU executed FDIV instruction
+event:0X911 counters:1 um:zero minimum:1000 name:PM_FPU_FSQRT_GRP145 : (Group 145 pm_fpuX6) FPU executed FSQRT instruction
+event:0X912 counters:2 um:zero minimum:1000 name:PM_FPU_FRSP_FCONV_GRP145 : (Group 145 pm_fpuX6) FPU executed FRSP or FCONV instructions
+event:0X913 counters:3 um:zero minimum:1000 name:PM_FPU_FIN_GRP145 : (Group 145 pm_fpuX6) FPU produced a result
+event:0X914 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP145 : (Group 145 pm_fpuX6) Run instructions completed
+event:0X915 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP145 : (Group 145 pm_fpuX6) Run cycles
+
+#Group 146 pm_fpuX7, Floating point events
+event:0X920 counters:0 um:zero minimum:1000 name:PM_FPU_1FLOP_GRP146 : (Group 146 pm_fpuX7) FPU executed one flop instruction 
+event:0X921 counters:1 um:zero minimum:1000 name:PM_FPU_FMA_GRP146 : (Group 146 pm_fpuX7) FPU executed multiply-add instruction
+event:0X922 counters:2 um:zero minimum:1000 name:PM_FPU_STF_GRP146 : (Group 146 pm_fpuX7) FPU executed store instruction
+event:0X923 counters:3 um:zero minimum:1000 name:PM_FPU_FIN_GRP146 : (Group 146 pm_fpuX7) FPU produced a result
+event:0X924 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP146 : (Group 146 pm_fpuX7) Run instructions completed
+event:0X925 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP146 : (Group 146 pm_fpuX7) Run cycles
+
+#Group 147 pm_hpmcount1, HPM group for set 1 
+event:0X930 counters:0 um:zero minimum:10000 name:PM_CYC_GRP147 : (Group 147 pm_hpmcount1) Processor cycles
+event:0X931 counters:1 um:zero minimum:1000 name:PM_FXU_FIN_GRP147 : (Group 147 pm_hpmcount1) FXU produced a result
+event:0X932 counters:2 um:zero minimum:10000 name:PM_CYC_GRP147 : (Group 147 pm_hpmcount1) Processor cycles
+event:0X933 counters:3 um:zero minimum:1000 name:PM_FPU_FIN_GRP147 : (Group 147 pm_hpmcount1) FPU produced a result
+event:0X934 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP147 : (Group 147 pm_hpmcount1) Run instructions completed
+event:0X935 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP147 : (Group 147 pm_hpmcount1) Run cycles
+
+#Group 148 pm_hpmcount2, HPM group for set 2
+event:0X940 counters:0 um:zero minimum:10000 name:PM_CYC_GRP148 : (Group 148 pm_hpmcount2) Processor cycles
+event:0X941 counters:1 um:zero minimum:1000 name:PM_FPU_STF_GRP148 : (Group 148 pm_hpmcount2) FPU executed store instruction
+event:0X942 counters:2 um:zero minimum:1000 name:PM_INST_DISP_GRP148 : (Group 148 pm_hpmcount2) Instructions dispatched
+event:0X943 counters:3 um:zero minimum:1000 name:PM_LSU_LDF_GRP148 : (Group 148 pm_hpmcount2) LSU executed Floating Point load instruction
+event:0X944 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP148 : (Group 148 pm_hpmcount2) Run instructions completed
+event:0X945 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP148 : (Group 148 pm_hpmcount2) Run cycles
+
+#Group 149 pm_hpmcount3, HPM group for set 3 
+event:0X950 counters:0 um:zero minimum:10000 name:PM_CYC_GRP149 : (Group 149 pm_hpmcount3) Processor cycles
+event:0X951 counters:1 um:zero minimum:1000 name:PM_INST_DISP_GRP149 : (Group 149 pm_hpmcount3) Instructions dispatched
+event:0X952 counters:2 um:zero minimum:1000 name:PM_LD_MISS_L1_GRP149 : (Group 149 pm_hpmcount3) L1 D cache load misses
+event:0X953 counters:3 um:zero minimum:1000 name:PM_ST_MISS_L1_GRP149 : (Group 149 pm_hpmcount3) L1 D cache store misses
+event:0X954 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP149 : (Group 149 pm_hpmcount3) Run instructions completed
+event:0X955 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP149 : (Group 149 pm_hpmcount3) Run cycles
+
+#Group 150 pm_hpmcount4, HPM group for set 7
+event:0X960 counters:0 um:zero minimum:1000 name:PM_TLB_MISS_GRP150 : (Group 150 pm_hpmcount4) TLB misses
+event:0X961 counters:1 um:zero minimum:10000 name:PM_CYC_GRP150 : (Group 150 pm_hpmcount4) Processor cycles
+event:0X962 counters:2 um:zero minimum:1000 name:PM_ST_REF_L1_GRP150 : (Group 150 pm_hpmcount4) L1 D cache store references
+event:0X963 counters:3 um:zero minimum:1000 name:PM_LD_REF_L1_GRP150 : (Group 150 pm_hpmcount4) L1 D cache load references
+event:0X964 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP150 : (Group 150 pm_hpmcount4) Run instructions completed
+event:0X965 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP150 : (Group 150 pm_hpmcount4) Run cycles
+
+#Group 151 pm_flop, Floating point operations
+event:0X970 counters:0 um:zero minimum:1000 name:PM_FPU_FDIV_GRP151 : (Group 151 pm_flop) FPU executed FDIV instruction
+event:0X971 counters:1 um:zero minimum:1000 name:PM_FPU_FMA_GRP151 : (Group 151 pm_flop) FPU executed multiply-add instruction
+event:0X972 counters:2 um:zero minimum:1000 name:PM_FPU_FSQRT_GRP151 : (Group 151 pm_flop) FPU executed FSQRT instruction
+event:0X973 counters:3 um:zero minimum:1000 name:PM_FPU_1FLOP_GRP151 : (Group 151 pm_flop) FPU executed one flop instruction 
+event:0X974 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP151 : (Group 151 pm_flop) Run instructions completed
+event:0X975 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP151 : (Group 151 pm_flop) Run cycles
+
+#Group 152 pm_eprof1, Group for use with eprof
+event:0X980 counters:0 um:zero minimum:10000 name:PM_INST_CMPL_GRP152 : (Group 152 pm_eprof1) Instructions completed
+event:0X981 counters:1 um:zero minimum:10000 name:PM_CYC_GRP152 : (Group 152 pm_eprof1) Processor cycles
+event:0X982 counters:2 um:zero minimum:1000 name:PM_LD_MISS_L1_GRP152 : (Group 152 pm_eprof1) L1 D cache load misses
+event:0X983 counters:3 um:zero minimum:1000 name:PM_DC_INV_L2_GRP152 : (Group 152 pm_eprof1) L1 D cache entries invalidated from L2
+event:0X984 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP152 : (Group 152 pm_eprof1) Run instructions completed
+event:0X985 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP152 : (Group 152 pm_eprof1) Run cycles
+
+#Group 153 pm_eprof2, Group for use with eprof
+event:0X990 counters:0 um:zero minimum:10000 name:PM_INST_CMPL_GRP153 : (Group 153 pm_eprof2) Instructions completed
+event:0X991 counters:1 um:zero minimum:1000 name:PM_ST_REF_L1_GRP153 : (Group 153 pm_eprof2) L1 D cache store references
+event:0X992 counters:2 um:zero minimum:1000 name:PM_INST_DISP_GRP153 : (Group 153 pm_eprof2) Instructions dispatched
+event:0X993 counters:3 um:zero minimum:1000 name:PM_LD_REF_L1_GRP153 : (Group 153 pm_eprof2) L1 D cache load references
+event:0X994 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP153 : (Group 153 pm_eprof2) Run instructions completed
+event:0X995 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP153 : (Group 153 pm_eprof2) Run cycles
diff -paurN oprofile-0.9.1/events/ppc64/power5+/unit_masks oprof-Build-with-P5+/events/ppc64/power5+/unit_masks
--- oprofile-0.9.1/events/ppc64/power5+/unit_masks	1969-12-31 19:00:00.000000000 -0500
+++ oprof-Build-with-P5+/events/ppc64/power5+/unit_masks	2006-07-06 10:13:09.000000000 -0400
@@ -0,0 +1,4 @@
+# ppc64 Power5+ possible unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
diff -paurN oprofile-0.9.1/libop/op_cpu_type.c oprof-Build-with-P5+/libop/op_cpu_type.c
--- oprofile-0.9.1/libop/op_cpu_type.c	2006-07-06 09:45:51.000000000 -0400
+++ oprof-Build-with-P5+/libop/op_cpu_type.c	2006-07-06 10:13:09.000000000 -0400
@@ -45,6 +45,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ARM/XScale PMU2", "arm/xscale2", CPU_ARM_XSCALE2, 5 },
 	{ "ppc64 POWER4", "ppc64/power4", CPU_PPC64_POWER4, 8 },
 	{ "ppc64 POWER5", "ppc64/power5", CPU_PPC64_POWER5, 6 },
+	{ "ppc64 POWER5+", "ppc64/power5+", CPU_PPC64_POWER5p, 6 },
 	{ "ppc64 970", "ppc64/970", CPU_PPC64_970, 8 },
 	{ "MIPS 24K", "mips/24K", CPU_MIPS_24K, 2},
 	{ "MIPS R10000", "mips/r10000", CPU_MIPS_R10000, 2 },
diff -paurN oprofile-0.9.1/libop/op_cpu_type.h oprof-Build-with-P5+/libop/op_cpu_type.h
--- oprofile-0.9.1/libop/op_cpu_type.h	2006-07-06 09:45:51.000000000 -0400
+++ oprof-Build-with-P5+/libop/op_cpu_type.h	2006-07-06 10:13:09.000000000 -0400
@@ -41,6 +41,7 @@ typedef enum {
 	CPU_ARM_XSCALE2, /**< ARM XScale 2 */
 	CPU_PPC64_POWER4, /**< ppc64 POWER4 family */
 	CPU_PPC64_POWER5, /**< ppc64 POWER5 family */
+	CPU_PPC64_POWER5p, /**< ppc64 Power5+ family */
 	CPU_PPC64_970, /**< ppc64 970 family */
 	CPU_MIPS_24K, /**< MIPS 24K */
 	CPU_MIPS_R10000, /**< MIPS R10000 */
diff -paurN oprofile-0.9.1/libop/op_events.c oprof-Build-with-P5+/libop/op_events.c
--- oprofile-0.9.1/libop/op_events.c	2006-07-06 09:55:58.000000000 -0400
+++ oprof-Build-with-P5+/libop/op_events.c	2006-07-06 10:13:09.000000000 -0400
@@ -648,6 +648,7 @@ char const * find_mapping_for_event(u32 
 		case CPU_PPC64_970:
 		case CPU_PPC64_POWER4:
 		case CPU_PPC64_POWER5:
+	        case CPU_PPC64_POWER5p:
 			if (!fp) {
 				fprintf(stderr, "oprofile: could not open event mapping file %s\n", filename);
 				exit(EXIT_FAILURE);
@@ -787,6 +788,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_PPC64_970:
 		case CPU_PPC64_POWER4:
 		case CPU_PPC64_POWER5:
+		case CPU_PPC64_POWER5p:
 			descr->name = "CYCLES";
 			break;
 
diff -paurN oprofile-0.9.1/utils/opcontrol oprof-Build-with-P5+/utils/opcontrol
--- oprofile-0.9.1/utils/opcontrol	2006-07-06 09:45:51.000000000 -0400
+++ oprof-Build-with-P5+/utils/opcontrol	2006-07-06 10:13:09.000000000 -0400
@@ -967,7 +967,7 @@ set_ctr_param()
 check_event_mapping_data()
 {
 
-	if [ "$CPUTYPE" = "ppc64/power4" -o "$CPUTYPE" = "ppc64/power5" -o "$CPUTYPE" = "ppc64/970" ]; then
+	if [ "$CPUTYPE" = "ppc64/power4" -o "$CPUTYPE" = "ppc64/power5" -o "$CPUTYPE" = "ppc64/power5+" -o "$CPUTYPE" = "ppc64/970" ]; then
 		MMCR0=`echo $EVENT_STR | awk '{print $2}'`
 		MMCR1=`echo $EVENT_STR | awk '{print $3}'`
 		MMCRA=`echo $EVENT_STR | awk '{print $4}'`
diff -paurN oprofile-0.9.1/utils/ophelp.c oprof-Build-with-P5+/utils/ophelp.c
--- oprofile-0.9.1/utils/ophelp.c	2006-07-06 09:45:51.000000000 -0400
+++ oprof-Build-with-P5+/utils/ophelp.c	2006-07-06 10:13:09.000000000 -0400
@@ -413,6 +413,7 @@ int main(int argc, char const * argv[])
 
 	case CPU_PPC64_POWER4:
 	case CPU_PPC64_POWER5:
+	case CPU_PPC64_POWER5p:
 	case CPU_PPC64_970:
 		printf("Obtain PowerPC64 processor documentation at:\n"
 			"http://www-306.ibm.com/chips/techlib/techlib.nsf/productfamilies/PowerPC\n");

oprofile-ppc64evts.patch:
 events/ppc64/970/event_mappings    |  702 +++++++++++++------
 events/ppc64/970/events            |  713 +++++++++++++------
 events/ppc64/power4/event_mappings |  706 +++++++++++++++++--
 events/ppc64/power4/events         |  718 +++++++++++++++++--
 events/ppc64/power5/event_mappings | 1318 +++++++++++++++++++++++++++++++++---
 events/ppc64/power5/events         | 1331 +++++++++++++++++++++++++++++++++----
 gui/oprof_start.h                  |    2 
 libop/op_events.c                  |   12 
 libop/op_events.h                  |    8 
 libpp/op_header.cpp                |    2 
 10 files changed, 4653 insertions(+), 859 deletions(-)

--- NEW FILE oprofile-ppc64evts.patch ---
diff -paurEbNX diff_fileExclusionFilter oprofile-0.9.1/events/ppc64/970/event_mappings oprofile-0.9.1-with-evts-patches/events/ppc64/970/event_mappings
--- oprofile-0.9.1/events/ppc64/970/event_mappings	2004-10-15 12:39:28.000000000 -0500
+++ oprofile-0.9.1-with-evts-patches/events/ppc64/970/event_mappings	2006-11-17 16:07:36.508007592 -0600
@@ -1,212 +1,494 @@
-event:0x1 mmcr0:0x0400C51E mmcr1:0x000000000A46F18C mmcra:0x00002000
+#Mapping of event groups to MMCR values
 
-#Group 0 pm_slice0
-event:0x10 mmcr0:0x0400C51E mmcr1:0x000000000A46F18C mmcra:0x00002000
-event:0x11 mmcr0:0x0400C51E mmcr1:0x000000000A46F18C mmcra:0x00002000
-event:0x13 mmcr0:0x0400C51E mmcr1:0x000000000A46F18C mmcra:0x00002000
-
-#Group 2 pm_basic
-event:0x18 mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x19 mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x1a mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x1b mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x1c mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x1d mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-event:0x1e mmcr0:0x0400C91E mmcr1:0x4003001005F09000 mmcra:0x00002000
-
-#Group 3 pm_lsu
-event:0x20 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x21 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x22 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x23 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x24 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x25 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x26 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-event:0x27 mmcr0:0x0400C000 mmcr1:0x000F00007A400000 mmcra:0x00002000
-
-#Group 4 pm_fpul
-event:0x08 mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x09 mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x0a mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x0b mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x0c mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x0d mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0x0e mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-event:0xof mmcr0:0x0400C000 mmcr1:0x00000000001E0480 mmcra:0x00002000
-
-#Group 15 LSU Load Events
-event:0x28 mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x29 mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2a mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2b mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2c mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2d mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2e mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-event:0x2f mmcr0:0x0400D028 mmcr1:0x000F0000851E9958 mmcra:0x00002000
-
-#Group 16 Store Events
-event:0x30 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x31 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x32 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x33 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x34 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x35 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x36 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-event:0x37 mmcr0:0x0400D12A mmcr1:0x000F00008D5E99DC mmcra:0x00002000
-
-#Group 17 Store Events 2
-event:0x38 mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x39 mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3a mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3b mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3c mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3d mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3e mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-event:0x3f mmcr0:0x0400D838 mmcr1:0x0003C0D08D76F4BC mmcra:0x00002000
-
-#Group 18  Information on the Load Store Unit
-event:0x40 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x41 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x42 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x43 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x44 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x45 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x46 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-event:0x47 mmcr0:0x0400D22C mmcr1:0x000830047BD2FE3C mmcra:0x00002000
-
-#Group 21  PE Benchmarker group for L1 and TLB
-event:0x48 mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x49 mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4a mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4b mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4c mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4d mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4e mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x4f mmcr0:0x0400D420 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-
-#Group 22 Hpmcount group for L1 and TLB behavior
-event:0x50 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x51 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x52 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x53 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x54 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x55 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x56 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-event:0x57 mmcr0:0x0400D404 mmcr1:0x000B000004DE9000 mmcra:0x00002000
-
-#Group 24 L1 miss and branch misspredict
-event:0x58 mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x59 mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5a mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5b mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5c mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5d mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5e mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-event:0x5f mmcr0:0x0400C91E mmcr1:0x8003C01D0636FCE8 mmcra:0x00002000
-
-#Group 26 SLB and branch mis-predict analysis
-event:0x80 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x81 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x82 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x83 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x84 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x85 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x86 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-event:0x87 mmcr0:0x0400C52A mmcr1:0x8008000BC662F4E8 mmcra:0x00002000
-
-#Group 27 Data source and LMQ
-event:0x88 mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x89 mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8a mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8b mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8c mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8d mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8e mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-event:0x8f mmcr0:0x0400C712 mmcr1:0x0000300E3BCE7F74 mmcra:0x00002000
-
-#Group 28 TLB and LRQ plus data prefetch
-event:0x90 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x91 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x92 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x93 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x94 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x95 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x96 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-event:0x97 mmcr0:0x0400D420 mmcr1:0x0008E03C4BFDACEC mmcra:0x00002000
-
-#Group 29 Instruction source and tablewalk
-event:0x98 mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x99 mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9a mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9b mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9c mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9d mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9e mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-event:0x9f mmcr0:0x0400C60C mmcr1:0x800B00C0226EF1DC mmcra:0x00002000
-
-#Group 30 Sync and SRQ
-event:0xa0 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa1 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa2 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa3 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa4 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa5 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-event:0xa6 mmcr0:0x0400DD32 mmcr1:0x0003E0C107529780 mmcra:0x00002000
-
-#Group 31 IERAT
-event:0xa8 mmcr0:0x0400CD3E mmcr1:0x800000C04BD2F4BC mmcra:0x00002000
-event:0xa9 mmcr0:0x0400CD3E mmcr1:0x800000C04BD2F4BC mmcra:0x00002000
-event:0xaa mmcr0:0x0400CD3E mmcr1:0x800000C04BD2F4BC mmcra:0x00002000
-event:0xab mmcr0:0x0400CD3E mmcr1:0x800000C04BD2F4BC mmcra:0x00002000
-
-#Group 32 DERAT
-event:0xb0 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb1 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb2 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb3 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb4 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb5 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb6 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-event:0xb7 mmcr0:0x0400C436 mmcr1:0x100B7052E274003C mmcra:0x00002000
-
-#Group 33 Info on marked instructions
-event:0x60 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x61 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x62 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x63 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x64 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x65 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x66 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-event:0x67 mmcr0:0x0400C006 mmcr1:0x00008080790852A4 mmcra:0x00002001
-
-#Group 34 Marked Stores Processing Flow
-event:0x68 mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x69 mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6a mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6b mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6c mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6d mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6e mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-event:0x6f mmcr0:0x0400C31E mmcr1:0x00203004190A3F24 mmcra:0x00002001
-
-#Group 35 Load Store Unit Marked Events
-event:0x70 mmcr0:0x0400DB34 mmcr1:0x000280C08D5E9850 mmcra:0x00002001
-event:0x71 mmcr0:0x0400DB34 mmcr1:0x000280C08D5E9850 mmcra:0x00002001
[...5264 lines suppressed...]
-#Group 47 L1 store references and 16M Data TLB references and misses
-event:0x04a counters:0 um:zero minimum:1000 name:PM_DTLB_REF_G47 : Data TLB reference for 16M page
-event:0x04b counters:1 um:zero minimum:1000 name:PM_DTLB_MISS_G47 : Data TLB miss for 16M page
-event:0x04c counters:2 um:zero minimum:1000 name:PM_FPU0_FRSP_FCONV_G47 : FPU0 executed FRSP or FCONV instructions
-event:0x04d counters:3 um:zero minimum:1000 name:PM_ST_REF_L1_LSU1_G47 : LSU1 L1 Dcache store references
-event:0x04e counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G47 : PPC instructions completed
-event:0x04f counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G47 : Processor cycles gated by the run latch
-
-#Group 48 L3 cache and memory data access
-event:0x050 counters:0 um:zero minimum:1000 name:PM_DATA_FROM_L3_G48 : Data loaded from L3
-event:0x051 counters:1 um:zero minimum:1000 name:PM_DATA_FROM_LMEM_G48 : Data loaded from local memory
-event:0x052 counters:2 um:zero minimum:1000 name:PM_FLUSH_G48 : Flushes
-event:0x053 counters:3 um:zero minimum:1000 name:PM_EINST_CMPL_G48 : Eligible instructions that completed
-event:0x054 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G48 : PPC instructiions completed
-event:0x055 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G48 : Processor cycles gated by the run latch
-
-#Group 49 L3 cacahe and memory data access
-event:0x05a counters:0 um:zero minimum:1000 name:PM_DATA_FROM_L3_G49 : Data loaded from L3
-event:0x05b counters:1 um:zero minimum:1000 name:PM_DATA_FROM_LMEM_G49 : Data loaded from Memory
-event:0x05c counters:2 um:zero minimum:1000 name:PM_EINST_CMPL_G49 : Eligible instructions completed
-event:0x05d counters:3 um:zero minimum:1000 name:PM_DATA_FROM_RMEM_G49 : Data loaded from remote memory
-event:0x05e counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G49 : PPC instructions compled
-event:0x05f counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G49 : Processor cycles gated by run latch
-
-#Group 50 L2 cache data access
-event:0x060 counters:0 um:zero minimum:1000 name:PM_DATA_FROM_L25_SHR_G50 : Data loaded from L2.5 shared
-event:0x061 counters:1 um:zero minimum:1000 name:PM_DATA_FROM_L25_MOD_G50 : Data loaded from L2.5 modified
-event:0x062 counters:2 um:zero minimum:1000 name:PM_DATA_FROM_L275_SHR_G50 : Data loaded from L2.75 shared
-event:0x063 counters:3 um:zero minimum:1000 name:PM_DATA_FROM_L275_MOD_G50 : Data loaded from L2.75 modified
-event:0x064 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G50 : PPC instructions completed
-event:0x065 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G50 : Processor cycles gated by run latch
-
-#Group 51 L3 cache data access
-event:0x06a counters:0 um:zero minimum:1000 name:PM_DATA_FROM_L35_SHR_G51 : Data loaded from L3.5 shared
-event:0x06b counters:1 um:zero minimum:1000 name:PM_DATA_FROM_L35_MOD_G51 : Data loaded from L3.5 modified
-event:0x06c counters:2 um:zero minimum:1000 name:PM_DATA_FROM_L375_SHR_G51 : Data loaded from L3.75 shared
-event:0x06d counters:3 um:zero minimum:1000 name:PM_DATA_FROM_L375_MOD_G51 : Data loaded from L3.75 modified
-event:0x06e counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G51 : PPC instructions completed
-event:0x06f counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G51 : Processor cycles gated by run latch
-
-#Group 52 Instruction source information
-event:0x070 counters:0 um:zero minimum:1000 name:PM_INST_FROM_L3_G52 : Instruction fetrched from L3
-event:0x071 counters:1 um:zero minimum:1000 name:PM_INST_FROM_L1_G52 : Instruction fetched from L1
-event:0x072 counters:2 um:zero minimum:1000 name:PM_INST_FROM_PREF_G52 : Instructions fetched from prefetch
-event:0x073 counters:3 um:zero minimum:1000 name:PM_INST_FROM_RMEM_G52 : Instruction fetched from remote memory
-event:0x074 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G52 : PPC instructions completed
-event:0x075 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G52 : Processor Cycles gated by the run latch
-
-#Group 54 L2 instruction source information
-event:0x07a counters:0 um:zero minimum:1000 name:PM_INST_FROM_L25_SHR_G54 : Instruction fetched from L2.5 shared
-event:0x07b counters:1 um:zero minimum:1000 name:PM_INST_FROM_L25_MOD_G54 : Instruction fetched from L2.5 modified
-event:0x07c counters:2 um:zero minimum:1000 name:PM_INST_FROM_L275_SHR_G54 : Instruction fetched from L2.75 shared
-event:0x07d counters:3 um:zero minimum:1000 name:PM_INST_FROM_L275_MOD_G54 : Instruction fetched from L2.75 modified
-event:0x07e counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G54 : PPC instructions completed
-event:0x07f counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G54 : Processor cycles gated by the run latch
-
-#Group 55 L3 instruction source information
-event:0x080 counters:0 um:zero minimum:1000 name:PM_INST_FROM_L35_SHR_G55 : Instruction fetched from L3.5 shared
-event:0x081 counters:1 um:zero minimum:1000 name:PM_INST_FROM_L35_MOD_G55 : Instruction fetched from L3.5 modified
-event:0x082 counters:2 um:zero minimum:1000 name:PM_INST_FROM_L375_SHR_G55 : Instruction fetched from L3.75 shared
-event:0x083 counters:3 um:zero minimum:1000 name:PM_INST_FROM_L375_MOD_G55 : Instruction fetched from L3.75 modified
-event:0x084 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G55 : PPC instructions completed
-event:0x085 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G55 : Processor cycles gated by the run latch
-
-#Group 123 Marked TLB and SLB Misses
-event:0x08d counters:3 um:zero minimum:1000 name:PM_MRK_DSLB_MISS_G123 : Marked Data SLB misses
-event:0x08e counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G123 : Instructions completed
-event:0x08f counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G123 : Processor cycles gated by run latch
-
-#Group 126 Mark unaligned load and store flushes
-event:0x093 counters:3 um:zero minimum:1000 name:PM_MRK_LSU_FLUSH_ULD_G126 : A marked load was flushed because it was unaligned (crossed a 64byte boundary or 32 byte if it missed the L1)
-event:0x094 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_G126 : Instructions completed
-event:0x095 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_G126 : Processor cycles gated by run latch
+#Group 148 pm_eprof3, Group for use with eprof
+event:0X940 counters:0 um:zero minimum:1000 name:PM_MRK_ST_MISS_L1_GRP148 : (Group 148 pm_eprof3) Marked L1 D cache store misses
+event:0X941 counters:1 um:zero minimum:10000 name:PM_INST_CMPL_GRP148 : (Group 148 pm_eprof3) Instructions completed
+event:0X942 counters:2 um:zero minimum:1000 name:PM_INST_DISP_GRP148 : (Group 148 pm_eprof3) Instructions dispatched
+event:0X943 counters:3 um:zero minimum:1000 name:PM_ST_MISS_L1_GRP148 : (Group 148 pm_eprof3) L1 D cache store misses
+event:0X944 counters:4 um:zero minimum:10000 name:PM_INST_CMPL_GRP148 : (Group 148 pm_eprof3) Instructions completed
+event:0X945 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP148 : (Group 148 pm_eprof3) Run cycles
diff -paurEbNX diff_fileExclusionFilter oprofile-0.9.1/gui/oprof_start.h oprofile-0.9.1-with-evts-patches/gui/oprof_start.h
--- oprofile-0.9.1/gui/oprof_start.h	2003-11-03 17:48:46.000000000 -0600
+++ oprofile-0.9.1-with-evts-patches/gui/oprof_start.h	2006-11-17 16:04:34.727957584 -0600
@@ -32,7 +32,7 @@ struct op_event_descr {
 	/// bit mask of allowed counters
 	uint counter_mask;
 	/// hardware event number
-	u8 val;
+	u32 val;
 	/// unit mask values if applicable
 	op_unit_mask const * unit;
 	/// name of event
diff -paurEbNX diff_fileExclusionFilter oprofile-0.9.1/libop/op_events.c oprofile-0.9.1-with-evts-patches/libop/op_events.c
--- oprofile-0.9.1/libop/op_events.c	2005-07-11 15:46:23.000000000 -0500
+++ oprofile-0.9.1-with-evts-patches/libop/op_events.c	2006-11-17 16:04:34.728957432 -0600
@@ -519,7 +519,7 @@ void op_free_events(void)
 }
 
 
-static struct op_event * find_event(u8 nr)
+static struct op_event * find_event(u32 nr)
 {
 	struct list_head * pos;
 
@@ -557,7 +557,7 @@ static FILE * open_event_mapping_file(ch
 /**
  *  This function is PPC64-specific.
  */
-static char const * get_mapping(u8 nr, FILE * fp) 
+static char const * get_mapping(u32 nr, FILE * fp) 
 {
 	char * line;
 	char * name;
@@ -587,7 +587,7 @@ static char const * get_mapping(u8 nr, F
 		c = line;
 		while (next_token(&c, &name, &value)) {
 			if (strcmp(name, "event") == 0) {
-				u8 evt;
+				u32 evt;
 				if (seen_event)
 					parse_error("duplicate event tag");
 				seen_event = 1;
@@ -639,7 +639,7 @@ next:
 }
 
 
-char const * find_mapping_for_event(u8 nr, op_cpu cpu_type)
+char const * find_mapping_for_event(u32 nr, op_cpu cpu_type)
 {
 	char const * cpu_name = op_get_cpu_name(cpu_type);
 	FILE * fp = open_event_mapping_file(cpu_name);
@@ -680,7 +680,7 @@ struct op_event * find_event_by_name(cha
 }
 
 
-struct op_event * op_find_event(op_cpu cpu_type, u8 nr)
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr)
 {
 	struct op_event * event;
 
@@ -692,7 +692,7 @@ struct op_event * op_find_event(op_cpu c
 }
 
 
-int op_check_events(int ctr, u8 nr, u16 um, op_cpu cpu_type)
+int op_check_events(int ctr, u32 nr, u16 um, op_cpu cpu_type)
 {
 	int ret = OP_OK_EVENT;
 	struct op_event * event;
diff -paurEbNX diff_fileExclusionFilter oprofile-0.9.1/libop/op_events.h oprofile-0.9.1-with-evts-patches/libop/op_events.h
--- oprofile-0.9.1/libop/op_events.h	2005-04-22 14:29:20.000000000 -0500
+++ oprofile-0.9.1-with-evts-patches/libop/op_events.h	2006-11-17 16:04:34.729957280 -0600
@@ -50,7 +50,7 @@ struct op_unit_mask {
 /** Describe an event. */
 struct op_event {
 	u32 counter_mask;	/**< bitmask of allowed counter  */
-	u8 val;			/**< event number */
+	u32 val;		/**< event number */
 	/** which unit mask if any allowed */
 	struct op_unit_mask * unit;			
 	char * name;		/**< the event name */
@@ -63,7 +63,7 @@ struct op_event {
 struct list_head * op_events(op_cpu cpu_type);
 
 /** Find a given event, returns NULL on error */
-struct op_event * op_find_event(op_cpu cpu_type, u8 nr);
+struct op_event * op_find_event(op_cpu cpu_type, u32 nr);
 
 /** Find a given event by name */
 struct op_event * find_event_by_name(char const * name);
@@ -72,7 +72,7 @@ struct op_event * find_event_by_name(cha
  * Find a mapping for a given event ID for architectures requiring additional information
  * from what is held in the events file. 
  */
-char const * find_mapping_for_event(u8 val, op_cpu cpu_type);
+char const * find_mapping_for_event(u32 val, op_cpu cpu_type);
 
 
 /** op_check_events() return code */
@@ -96,7 +96,7 @@ enum op_event_check {
  *
  * \sa op_cpu, OP_EVENTS_OK
  */
-int op_check_events(int ctr, u8 event, u16 um, op_cpu cpu_type);
+int op_check_events(int ctr, u32 event, u16 um, op_cpu cpu_type);
 
 /**
  * free memory used by any call to above function. Need to be called only once
diff -paurEbNX diff_fileExclusionFilter oprofile-0.9.1/libpp/op_header.cpp oprofile-0.9.1-with-evts-patches/libpp/op_header.cpp
--- oprofile-0.9.1/libpp/op_header.cpp	2005-05-02 10:07:02.000000000 -0500
+++ oprofile-0.9.1-with-evts-patches/libpp/op_header.cpp	2006-11-17 16:04:34.729957280 -0600
@@ -115,7 +115,7 @@ opd_header const read_header(string cons
 
 namespace {
 
-string const op_print_event(op_cpu cpu_type, u8 type, u16 um, u32 count)
+string const op_print_event(op_cpu cpu_type, u32 type, u16 um, u32 count)
 {
 	string str;
 


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- oprofile.spec	26 Jun 2006 14:51:19 -0000	1.42
+++ oprofile.spec	7 Jul 2006 20:03:51 -0000	1.43
@@ -1,6 +1,6 @@
 %define DATE 200511111
 %define oprofile_version 0.9.1
-%define oprofile_release 11
+%define oprofile_release 12
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -20,6 +20,8 @@
 Patch81: oprofile-0.9.1-anon.patch
 Patch82: oprofile_opcontrol.patch
 Patch83: oprofile-0.9.1-xen.patch
+Patch84: oprofile-power5p.patch
+Patch86: oprofile-ppc64evts.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -68,6 +70,8 @@
 %patch81 -p1 -b .anon
 %patch82 -p1 -b .opcontrol
 %patch83 -p1 -b .xen
+%patch84 -p1 -b .power5p
+%patch86 -p1 -b .ppc64evts
 
 ./autogen.sh
 
@@ -201,6 +205,9 @@
 /usr/share/oprofile/ppc64/power5/event_mappings
 /usr/share/oprofile/ppc64/power5/events
 /usr/share/oprofile/ppc64/power5/unit_masks
+/usr/share/oprofile/ppc64/power5+/event_mappings
+/usr/share/oprofile/ppc64/power5+/events
+/usr/share/oprofile/ppc64/power5+/unit_masks
 /usr/share/oprofile/ppc64/970/event_mappings
 /usr/share/oprofile/ppc64/970/events
 /usr/share/oprofile/ppc64/970/unit_masks
@@ -246,6 +253,10 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Fri Jul 7 2006 Will Cohen <wcohen at redhat.com>
+- Support for power5+. (#197728)
+- Fix PPC64 events and groups. (#197895)
+
 * Wed Jun 07 2006 Will Cohen <wcohen at redhat.com>
 - Put oprof_start in to oprofile-gui.
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 20:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 16:46:22 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.292, 1.293 anaconda.spec, 1.416,
	1.417 sources, 1.414, 1.415
Message-ID: <200607072046.k67KkMvr009442@cvs.devel.redhat.com>

Author: dcantrel

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- .cvsignore	6 Jul 2006 00:53:10 -0000	1.292
+++ .cvsignore	7 Jul 2006 20:46:19 -0000	1.293
@@ -1 +1 @@
-anaconda-11.1.0.53.tar.bz2
+anaconda-11.1.0.54.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- anaconda.spec	6 Jul 2006 00:53:10 -0000	1.416
+++ anaconda.spec	7 Jul 2006 20:46:19 -0000	1.417
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.53
+Version: 11.1.0.54
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jul  7 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.54-1
+- Loader changes to support enabling/disabling IPv4 & IPv6
+- Manual IP configuration changes in loader to better support IPv{4,6}
+- Let GFS2 command line option work (katzj)
+- Rescue mode shell fixes (clumens, #197315)
+- Add filesystem label chooser to rescue mode (clumens, #196345)
+- Use configured interface for VNC connections (clumens, #197721)
+- Init process cleanups
+- Log requiring package as well as require name (pnasrat)
+
 * Wed Jul  5 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.53-1
 - fix typo
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- sources	6 Jul 2006 00:53:10 -0000	1.414
+++ sources	7 Jul 2006 20:46:19 -0000	1.415
@@ -1 +1 @@
-94d82f50b557372360d1d2ff48126688  anaconda-11.1.0.53.tar.bz2
+488c9299f4e9ec027679307e385779bf  anaconda-11.1.0.54.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul  7 20:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 16:55:49 -0400
Subject: rpms/kernel/devel/configs config-rhel-generic,1.8,NONE
Message-ID: <200607072055.k67Ktndh021253@cvs.devel.redhat.com>

Author: dzickus

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

Removed Files:
	config-rhel-generic 
Log Message:

Updating packaging to be more in-line with what rel-eng expects.
These changes will create a uniform srpm for all kernel distros.  The
differences will be generated using the %dist and %rhel macros.  To
accomplish this, the rhel config options had to be set at build time, not
before.  

The intent here is to allow the kernel to scale with the introduction of
various new projects.  Everything isn't perfect yet, but neither is our
build system.

Side note, config-rhel-generic and merge.pl had to be moved to accomodate
the spec file.  




--- config-rhel-generic DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 20:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 16:55:48 -0400
Subject: rpms/kernel/devel config-rhel-generic, 1.6, 1.7 merge.pl, 1.7,
	1.8 Makefile.config, 1.40, 1.41 kernel-2.6.spec, 1.2359, 1.2360
Message-ID: <200607072055.k67KtmY1021243@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Added Files:
	config-rhel-generic merge.pl 
Log Message:

Updating packaging to be more in-line with what rel-eng expects.
These changes will create a uniform srpm for all kernel distros.  The
differences will be generated using the %dist and %rhel macros.  To
accomplish this, the rhel config options had to be set at build time, not
before.  

The intent here is to allow the kernel to scale with the introduction of
various new projects.  Everything isn't perfect yet, but neither is our
build system.

Side note, config-rhel-generic and merge.pl had to be moved to accomodate
the spec file.  




Index: config-rhel-generic
===================================================================
RCS file: config-rhel-generic
diff -N config-rhel-generic
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config-rhel-generic	7 Jul 2006 20:55:46 -0000	1.7
@@ -0,0 +1,192 @@
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_ATALK is not set
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_LTPC is not set
+# CONFIG_COPS is not set
+# CONFIG_IPX is not set
+# CONFIG_IPDDP is not set
+# CONFIG_IRDA is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_ISAPNP is not set
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_WD80x3 is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_DVB is not set
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+# CONFIG_SND_MIRO is not set
+# CONFIG_SND_SB8 is not set
+# CONFIG_SND_SB16 is not set
+# CONFIG_SND_SBAWE is not set
+# CONFIG_SND_SB16_CSP=y
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_DT019X is not set
+# CONFIG_SND_OPL3SA2 is not set
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_GAMMA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_ROCKETPORT is not set
+# CONFIG_R3964 is not set
+# CONFIG_TIPAR is not set
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_IFORCE_USB=y
+# CONFIG_JOYSTICK_IFORCE_232=y
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDDLER is not set
+# CONFIG_JOYSTICK_DB9 is not set
+# CONFIG_JOYSTICK_GAMECON is not set
+# CONFIG_JOYSTICK_TURBOGRAFX is not set
+# CONFIG_RADIO_CADET is not set
+# CONFIG_RADIO_RTRACK is not set
+# CONFIG_RADIO_RTRACK2 is not set
+# CONFIG_RADIO_AZTECH is not set
+# CONFIG_RADIO_GEMTEK is not set
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+# CONFIG_RADIO_MIROPCM20 is not set
+# CONFIG_RADIO_MIROPCM20_RDS is not set
+# CONFIG_RADIO_SF16FMI is not set
+# CONFIG_RADIO_SF16FMR2 is not set
+# CONFIG_RADIO_TERRATEC is not set
+# CONFIG_RADIO_TRUST is not set
+# CONFIG_RADIO_TYPHOON is not set
+# CONFIG_RADIO_TYPHOON_PROC_FS=y
+# CONFIG_RADIO_ZOLTRIX is not set
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_PLIP is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_VIDEO_PMS is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_W9966 is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA_PP is not set
+# CONFIG_VIDEO_CPIA_USB is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_ZORAN_BUZ is not set
+# CONFIG_VIDEO_ZORAN_DC10 is not set
+# CONFIG_VIDEO_ZORAN_DC30 is not set
+# CONFIG_VIDEO_ZORAN_LML33 is not set
+# CONFIG_VIDEO_ZORAN_LML33R10 is not set
+# CONFIG_VIDEO_MEYE is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_I82092 is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_ULTRA is not set
+# CONFIG_SKFP is not set
+# CONFIG_DE600 is not set
+# CONFIG_DE620 is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_AC3200 is not set
+# CONFIG_NI52 is not set
+# CONFIG_NI65 is not set
+# CONFIG_LANCE is not set
+# CONFIG_EL16 is not set
+# CONFIG_EL3 is not set
+# CONFIG_3C515 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_HP100 is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_SB1000 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_ATP is not set
+# CONFIG_INFTL is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_HGA_ACCEL is not set
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_SCSI_DC390T is not set
+CONFIG_AUDIT=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_DECNET is not set
+# CONFIG_TCG_TPM is not set


Index: merge.pl
===================================================================
RCS file: merge.pl
diff -N merge.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ merge.pl	7 Jul 2006 20:55:46 -0000	1.8
@@ -0,0 +1,80 @@
+#! /usr/bin/perl
+
+my @args=@ARGV;
+my @configoptions;
+my @configvalues;
+my $configcounter = 0;
+
+# optionally print out the architecture as the first line of our output
+my $arch = $args[2];
+if (defined $arch) {
+	print "# $arch\n";
+}
+
+# first, read the override file
+
+open (FILE,"$args[0]") || die "Could not open $args[0]";
+while (<FILE>) {
+	my $str = $_;
+	if (/\# ([\w]+) is not set/) {
+		$configoptions[$configcounter] = $1;
+		$configvalues[$configcounter] = $str;
+		$configcounter ++;
+	} else {
+		if (/([\w]+)=/) {
+			$configoptions[$configcounter] = $1;
+			$configvalues[$configcounter] = $str;
+			$configcounter ++;
+		}
+	}
+};
+
+# now, read and output the entire configfile, except for the overridden
+# parts... for those the new value is printed.
+# O(N!) algorithm so if this is slow I need to look at it later
+
+open (FILE2,"$args[1]") || die "Could not open $args[1]";
+while (<FILE2>) {
+	my $nooutput;
+	my $counter;
+	my $configname;
+
+	if (/\# ([\w]+) is not set/) {
+		$configname = $1;
+	} else {
+		if (/([\w]+)=/) {
+			$configname  = $1;
+		}
+	}
+
+	$counter = 0;
+	$nooutput = 0;
+	while ($counter < $configcounter) {
+		if ("$configname" eq "$configoptions[$counter]") {
+			$nooutput = 1;
+			print "$configvalues[$counter]";
+
+			#remove this option from the list
+			#assuming no duplicates here
+			splice(@configoptions,$counter,1);
+			splice(@configvalues,$counter,1);
+			$configcounter--;
+			last;
+		}
+		$counter++;
+	}
+
+	if ($nooutput == 0) {
+		print "$_";
+	}
+}
+
+# now print the new values from the overridden configfile
+my $counter = 0;
+
+while ($counter < $configcounter) {
+	print "$configvalues[$counter]";
+	$counter++;
+}
+
+1;


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.config	14 Jun 2006 12:11:06 -0000	1.40
+++ Makefile.config	7 Jul 2006 20:55:46 -0000	1.41
@@ -28,109 +28,108 @@
 clean ::
 	@rm -fv $(CONFIGFILES) $(TEMPFILES) temp-generic kernel-$(VERSION)*config
 
-temp-generic: configs/config-generic configs/config-rhel-generic Makefile Makefile.config
+temp-generic: configs/config-generic Makefile Makefile.config
 	cp configs/config-generic temp-generic
-	if echo $(COLLECTION) | grep -q -e "^dist-[^-]*E\($$\|-\)"; then perl scripts/merge.pl configs/config-rhel-generic configs/config-generic > temp-generic ; fi
 
 temp-x86-generic: configs/config-x86-generic temp-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-x86_64-generic: configs/config-x86_64-generic temp-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-sparc-generic: configs/config-sparc-generic temp-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-sparc64-generic: configs/config-sparc64-generic temp-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-powerpc-generic: configs/config-powerpc-generic temp-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-powerpc64-generic: configs/config-powerpc64-generic temp-powerpc-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-powerpc32-generic: configs/config-powerpc32-generic temp-powerpc-generic
-	perl scripts/merge.pl $^  > $@
+	perl merge.pl $^  > $@
 
 temp-s390-generic: configs/config-s390-generic temp-generic
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 temp-ia64-generic: configs/config-ia64-generic temp-generic
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 temp-x86-xen-generic-temp: configs/config-xen-generic temp-x86-generic
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 temp-x86-xen-generic: configs/config-xen-xen temp-x86-xen-generic-temp
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 temp-x86_64-xen-generic-tmp: configs/config-xen-generic temp-x86_64-generic
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
-	perl scripts/merge.pl $^ > $@
+	perl merge.pl $^ > $@
 
 kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-PAE.config: configs/config-i686-PAE temp-x86-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-kdump.config: configs/config-i686-kdump temp-x86-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic
-	perl scripts/merge.pl $^ x86_64 > $@
+	perl 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 > $@
+	perl merge.pl $^ x86_64 > $@
 
 kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic
-	perl scripts/merge.pl $^ sparc > $@
+	perl merge.pl $^ sparc > $@
 
 kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic
-	perl scripts/merge.pl $^ sparc > $@
+	perl merge.pl $^ sparc > $@
 
 kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic
-	perl scripts/merge.pl $^ sparc64 > $@
+	perl merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic
-	perl scripts/merge.pl $^ sparc64 > $@
+	perl merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic
-	perl scripts/merge.pl $^ powerpc > $@
+	perl merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ppc64iseries.config: configs/config-powerpc64-iseries temp-powerpc64-generic
-	perl scripts/merge.pl $^ powerpc > $@
+	perl merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
-	perl scripts/merge.pl $^ powerpc > $@
+	perl merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
-	perl scripts/merge.pl $^ s390 > $@
+	perl merge.pl $^ s390 > $@
 
 kernel-$(VERSION)-s390x.config: configs/config-s390x temp-s390-generic
-	perl scripts/merge.pl $^ s390 > $@
+	perl merge.pl $^ s390 > $@
 
 kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
-	perl scripts/merge.pl $^ powerpc > $@
+	perl merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ppc-smp.config: configs/config-powerpc32-smp temp-powerpc32-generic
-	perl scripts/merge.pl $^ powerpc > $@
+	perl merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
-	perl scripts/merge.pl $^ ia64 > $@
+	perl merge.pl $^ ia64 > $@
 
 kernel-$(VERSION)-i686-xen.config: configs/config-i686 temp-x86-xen-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic
-	perl scripts/merge.pl $^ i386 > $@
+	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic
-	perl scripts/merge.pl $^ x86_64 > $@
+	perl merge.pl $^ x86_64 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2359
retrieving revision 1.2360
diff -u -r1.2359 -r1.2360
--- kernel-2.6.spec	7 Jul 2006 19:07:15 -0000	1.2359
+++ kernel-2.6.spec	7 Jul 2006 20:55:46 -0000	1.2360
@@ -17,6 +17,12 @@
 
 # Versions of various parts
 
+# After branching, please hardcode these values as the 
+# %dist and %rhel tags are not reliable yet
+# For example dist -> .el5 and rhel -> 5
+#% define dist .XX
+#% define rhel Y
+
 #
 # Polite request for people who spin their own kernel rpms:
 # please modify the "release" field in a way that identifies
@@ -208,6 +214,7 @@
 Source12: built-in-where
 Source13: make-symsets
 Source14: find-provides
+Source15: merge.pl
 
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
@@ -235,6 +242,8 @@
 #Source67: kernel-%{kversion}-sparc64.config
 #Source68: kernel-%{kversion}-sparc64-smp.config
 
+Source80: config-rhel-generic
+
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
@@ -640,6 +649,16 @@
 
 
 %prep
+#if a rhel kernel, apply the rhel config options
+%if 0%{?rhel}
+  for i in %{all_arch_configs}
+  do
+    mv $i $i.tmp
+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
+    rm $i.tmp
+  done
+%endif  
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.



From fedora-cvs-commits at redhat.com  Fri Jul  7 20:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 16:55:49 -0400
Subject: rpms/kernel/devel/scripts merge.pl,1.4,NONE
Message-ID: <200607072055.k67Ktnwu021262@cvs.devel.redhat.com>

Author: dzickus

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

Removed Files:
	merge.pl 
Log Message:

Updating packaging to be more in-line with what rel-eng expects.
These changes will create a uniform srpm for all kernel distros.  The
differences will be generated using the %dist and %rhel macros.  To
accomplish this, the rhel config options had to be set at build time, not
before.  

The intent here is to allow the kernel to scale with the introduction of
various new projects.  Everything isn't perfect yet, but neither is our
build system.

Side note, config-rhel-generic and merge.pl had to be moved to accomodate
the spec file.  




--- merge.pl DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 21:02:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 17:02:12 -0400
Subject: rpms/openais/devel openais-0.78-ia64-build.patch, NONE,
	1.1 openais.spec, 1.4, 1.5
Message-ID: <200607072102.k67L2CVI023152@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23094/devel

Modified Files:
	openais.spec 
Added Files:
	openais-0.78-ia64-build.patch 
Log Message:
auto-import openais-0.78-1.1 on branch devel from openais-0.78-1.1.src.rpm

openais-0.78-ia64-build.patch:
 Makefile |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE openais-0.78-ia64-build.patch ---
Index: Makefile
===================================================================
--- Makefile	(revision 1111)
+++ Makefile	(working copy)
@@ -45,6 +45,9 @@
 else
 LIBDIR=/usr/lib64/openais
 endif
+ifeq (ia64,$(ARCH))
+LIBDIR=/usr/lib/openais
+endif
 
 all:
 	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openais.spec	7 Jul 2006 01:49:53 -0000	1.4
+++ openais.spec	7 Jul 2006 21:01:57 -0000	1.5
@@ -1,14 +1,15 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.78
-Release: 1.0
+Release: 1.1
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
+Patch1: openais-0.78-ia64-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 ppc x86_64 ppc64
+ExclusiveArch: i386 ppc x86_64 ppc64 ia64
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -31,6 +32,7 @@
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 # -O3 required for performance reasons
@@ -160,6 +162,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Fri Jul 07 2006 Steven Dake <sdake at redhat.com> - 0.78-1.1
+- Allow build on ia64.
+
 * Thu Jul 06 2006 Steven Dake <sdake at redhat.com> - 0.78-1.0
 - New upstream release.
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 21:05:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 17:05:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2360,1.2361
Message-ID: <200607072105.k67L5Ugs023372@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Forgot to add in the changelog



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2360
retrieving revision 1.2361
diff -u -r1.2360 -r1.2361
--- kernel-2.6.spec	7 Jul 2006 20:55:46 -0000	1.2360
+++ kernel-2.6.spec	7 Jul 2006 21:05:16 -0000	1.2361
@@ -1576,6 +1576,9 @@
 %endif
 
 %changelog
+* Fri Jul  7 2006 Don Zickus <dzickus at redhat.com>
+- Unified rhel and fedora srpm
+
 * Fri Jul  7 2006 Dave Jones <davej at redhat.com>
 - Add lockdep annotate for bdev warning.
 - Enable autofs4 to return fail for revalidate during lookup



From fedora-cvs-commits at redhat.com  Fri Jul  7 21:26:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 17:26:55 -0400
Subject: rpms/gdm/devel gdm-2.15.5-move-default-message.patch, NONE,
	1.1 gdm-2.15.5-process-all-ops.patch, NONE,
	1.1 gdm-2.15.5-reset-pam.patch, NONE, 1.1 gdm.spec, 1.165,
	1.166 gdm-2.15.3-CVE-2006-2452.patch, 1.1,
	NONE gdm-2.15.3-chown.patch, 1.1,
	NONE gdm-2.15.3-support-xdm-nodaemon-option.patch, 1.2,
	NONE gdm-2.8.0.2-process-all-messages.patch, 1.3, NONE
Message-ID: <200607072126.k67LQt6q011616@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11510

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.5-move-default-message.patch 
	gdm-2.15.5-process-all-ops.patch gdm-2.15.5-reset-pam.patch 
Removed Files:
	gdm-2.15.3-CVE-2006-2452.patch gdm-2.15.3-chown.patch 
	gdm-2.15.3-support-xdm-nodaemon-option.patch 
	gdm-2.8.0.2-process-all-messages.patch 
Log Message:
- add patch to process all operations when more than one comes
  in really quickly
- move default "Please enter your username" message to the
  greeter instead of the slave so that it doesn't get stacked if
  a pam module has a non default message
- add new message for reseting the current login operation
  (like the cancel button does, but accessible via the gdm fifo)


gdm-2.15.5-move-default-message.patch:
 daemon/verify-crypt.c          |    1 -
 daemon/verify-pam.c            |    6 ------
 daemon/verify-shadow.c         |    1 -
 gui/gdmlogin.c                 |   17 ++++++++++++++---
 gui/greeter/greeter_item_pam.c |   25 +++++++++++++++++++++++++
 5 files changed, 39 insertions(+), 11 deletions(-)

--- NEW FILE gdm-2.15.5-move-default-message.patch ---
--- ./daemon/verify-pam.c.move-default-message	2006-07-07 15:20:40.000000000 +0200
+++ ./daemon/verify-pam.c	2006-07-07 15:21:28.000000000 +0200
@@ -517,12 +517,6 @@
 			       then I can afford. */
 			    s = g_strdup (selected_user);
 		    } else {
-			    /* this is an evil hack, but really there is no way we'll
-			    know this is a username prompt.  However we SHOULD NOT
-			    rely on this working.  The pam modules can set their
-			    prompt to whatever they wish to */
-			    gdm_slave_greeter_ctl_no_ret
-				    (GDM_MSG, _("Please enter your username"));
 			    s = gdm_slave_greeter_ctl (GDM_PROMPT, m);
 			    /* this will clear the message */
 			    gdm_slave_greeter_ctl_no_ret (GDM_MSG, "");
--- ./daemon/verify-shadow.c.move-default-message	2006-07-07 15:21:04.000000000 +0200
+++ ./daemon/verify-shadow.c	2006-07-07 15:22:10.000000000 +0200
@@ -114,7 +114,6 @@
 authenticate_again:
 	    /* Ask for the user's login */
 	    gdm_verify_select_user (NULL);
-	    gdm_slave_greeter_ctl_no_ret (GDM_MSG, _("Please enter your username"));
 	    login = gdm_slave_greeter_ctl (GDM_PROMPT, _("Username:"));
 	    if (login == NULL ||
 		gdm_slave_greeter_check_interruption ()) {
--- ./daemon/verify-crypt.c.move-default-message	2006-07-07 15:20:48.000000000 +0200
+++ ./daemon/verify-crypt.c	2006-07-07 15:22:01.000000000 +0200
@@ -115,7 +115,6 @@
 authenticate_again:
 	    /* Ask for the user's login */
 	    gdm_verify_select_user (NULL);
-	    gdm_slave_greeter_ctl_no_ret (GDM_MSG, _("Please enter your username"));
 	    login = gdm_slave_greeter_ctl (GDM_PROMPT, _("Username:"));
 	    if (login == NULL ||
 		gdm_slave_greeter_check_interruption ()) {
--- ./gui/gdmlogin.c.move-default-message	2006-07-07 15:12:01.000000000 +0200
+++ ./gui/gdmlogin.c	2006-07-07 15:28:34.000000000 +0200
@@ -163,6 +163,7 @@
 extern const gchar *current_session;
 extern gboolean session_dir_whacked_out;
 extern gint gdm_timed_delay;
+static gboolean using_fallback_message = FALSE;
 
 static void login_window_resize (gboolean force);
 
@@ -1673,10 +1674,21 @@
 					gdm_config_get_string (GDM_KEY_SOUND_ON_LOGIN_FILE),
 					gdm_config_get_bool   (GDM_KEY_SOUND_ON_LOGIN));
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Username:"));
+
+		if (ve_string_empty (gtk_label_get_text (GTK_LABEL (msg)))) {
+			gtk_label_set_text (GTK_LABEL (msg),
+					    _("Please enter your username"));
+			using_fallback_message = TRUE;
+		}
 		greeter_probably_login_prompt = TRUE;
 	} else {
 		if (tmp != NULL)
 			gtk_label_set_text (GTK_LABEL (label), tmp);
+
+		if (using_fallback_message) {
+			gtk_label_set_text (GTK_LABEL (msg), "");
+			using_fallback_message = FALSE;
+		}
 		greeter_probably_login_prompt = FALSE;
 	}
 	g_free (tmp);
@@ -1764,6 +1776,7 @@
 		g_free (tmp);
 	}
 	replace_msg = FALSE;
+	using_fallback_message = FALSE;
 
 	gtk_widget_show (GTK_WIDGET (msg));
 	printf ("%c\n", STX);
@@ -1891,9 +1904,7 @@
 	if (browser_ok && gdm_config_get_bool (GDM_KEY_BROWSER))
 	    gtk_widget_set_sensitive (GTK_WIDGET (browser), TRUE);
 
-	tmp = ve_locale_to_utf8 (args);
-	gtk_label_set_text (GTK_LABEL (msg), tmp);
-	g_free (tmp);
+	gtk_label_set_text (GTK_LABEL (msg), "");
 	gtk_widget_show (GTK_WIDGET (msg));
 
 	printf ("%c\n", STX);
--- ./gui/greeter/greeter_item_pam.c.move-default-message	2006-07-07 15:11:37.000000000 +0200
+++ ./gui/greeter/greeter_item_pam.c	2006-07-07 15:12:16.000000000 +0200
@@ -46,6 +46,7 @@
 gboolean require_quarter = FALSE;
 
 extern gboolean greeter_probably_login_prompt;
+static gboolean using_fallback_message = FALSE;
 
 static gboolean
 greeter_item_pam_error_set (gboolean display)
@@ -230,13 +231,35 @@
 			 int         entry_len,
 			 gboolean    entry_visible)
 {
+  GreeterItemInfo *message_info;
   GreeterItemInfo *conversation_info;
   GreeterItemInfo *entry_info;
   GtkWidget *entry;
 
+  message_info = greeter_lookup_id ("pam-message");
   conversation_info = greeter_lookup_id ("pam-prompt");
   entry_info = greeter_lookup_id ("user-pw-entry");
 
+  if (strcmp (message, _("Username:")) == 0 && message_info)
+    {
+      gchar *text;
+      text = NULL;
+      g_object_get (G_OBJECT (message_info->item),
+                    "text", &text,
+                    NULL);
+      if (ve_string_empty (text))
+        {
+          set_text (message_info, _("Please enter your username"));
+          using_fallback_message = TRUE;
+        }
+      g_free (text);
+    } 
+  else if (using_fallback_message)
+    {
+      set_text (message_info, "");
+      using_fallback_message = FALSE;
+    }
+
   if (conversation_info)
     {
       set_text (conversation_info, message);
@@ -276,6 +299,7 @@
        * we try to collect them until the next prompt or reset or
        * whatnot */
       if ( ! replace_msg &&
+	   ! using_fallback_message &&
 	   /* empty message is for clearing */
 	   ! ve_string_empty (message))
 	{
@@ -295,6 +319,7 @@
         set_text (message_info, message);
     }
   replace_msg = FALSE;
+  using_fallback_message = FALSE;
 }
 
 

gdm-2.15.5-process-all-ops.patch:
 gdmlogin.c        |  121 +++++++++++++++++++++---------------------------------
 greeter/greeter.c |  119 +++++++++++++++++++++--------------------------------
 2 files changed, 96 insertions(+), 144 deletions(-)

--- NEW FILE gdm-2.15.5-process-all-ops.patch ---
diff -u -p -r1.278 gdmlogin.c
--- gdm-2.15.5/gui/gdmlogin.c	31 May 2006 09:24:08 -0000	1.278
+++ gdm-2.15.5/gui/gdmlogin.c	7 Jul 2006 19:01:46 -0000
@@ -179,6 +179,8 @@ static void back_prog_launch_after_timeo
 static void back_prog_run (void);
 static void back_prog_stop (void);
 
+static void process_operation (guchar op_code, const gchar *args);
+
 /* 
  * This function is called when the background program exits.
  * It will add a timer to restart the program after the
@@ -1607,13 +1609,8 @@ static gboolean
 gdm_login_ctrl_handler (GIOChannel *source, GIOCondition cond, gint fd)
 {
     gchar buf[PIPE_SIZE];
+    gchar *p;
     gsize len;
-    char *tmp;
-    gint i, x, y;
-    GtkWidget *dlg;
-    static gboolean replace_msg = TRUE;
-    static gboolean messages_to_give = FALSE;
-    gboolean greeter_probably_login_prompt = FALSE;
 
     /* If this is not incoming i/o then return */
     if (cond != G_IO_IN) 
@@ -1627,23 +1624,42 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	    return (TRUE);
     } while (buf[0] && buf[0] != STX);
 
+    memset (buf, '\0', sizeof (buf));
+    if (g_io_channel_read_chars (source, buf, sizeof (buf) - 1, &len, NULL) !=
+	G_IO_STATUS_NORMAL)
+      return TRUE;
+
+    p = memchr (buf, STX, len);
+
+    if (p != NULL) {
+      len = p - buf;
+      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
+      memset (buf + len, '\0', sizeof (buf) - len);
+    }
+ 
+    process_operation ((guchar) buf[0], buf + 1);
 
-    /* Read opcode */
-    g_io_channel_read_chars (source, buf, 1, &len, NULL);
+    return TRUE;
+}
 
-    /* If opcode couldn't be read */
-    if (len != 1)
-	return (TRUE);
+static void
+process_operation (guchar       op_code,
+		   const gchar *args)
+{
+    char *tmp;
+    gint i, x, y;
+    GtkWidget *dlg;
+    static gboolean replace_msg = TRUE;
+    static gboolean messages_to_give = FALSE;
+    gboolean greeter_probably_login_prompt = FALSE;
 
     /* Parse opcode */
-    switch (buf[0]) {
+    switch (op_code) {
     case GDM_SETLOGIN:
 	/* somebody is trying to fool us this is the user that
 	 * wants to log in, and well, we are the gullible kind */
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
 	g_free (curuser);
-	curuser = g_strdup (buf);
+	curuser = g_strdup (args);
 	if (browser_ok && gdm_config_get_bool (GDM_KEY_BROWSER))
 		browser_set_user (curuser);
 	printf ("%c\n", STX);
@@ -1651,10 +1667,7 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_PROMPT:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	if (tmp != NULL && strcmp (tmp, _("Username:")) == 0) {
 		gdm_common_login_sound (gdm_config_get_string (GDM_KEY_SOUND_PROGRAM),
 					gdm_config_get_string (GDM_KEY_SOUND_ON_LOGIN_FILE),
@@ -1692,10 +1705,7 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_NOECHO:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	if (tmp != NULL && strcmp (tmp, _("Password:")) == 0) {
 		gtk_label_set_text_with_mnemonic (GTK_LABEL (label), _("_Password:"));
 	} else {
@@ -1725,9 +1735,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_MSG:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
 	/* the user has not yet seen messages */
 	messages_to_give = TRUE;
 
@@ -1736,23 +1743,23 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	 * whatnot */
 	if ( ! replace_msg &&
 	   /* empty message is for clearing */
-	   ! ve_string_empty (buf)) {
+	   ! ve_string_empty (args)) {
 		const char *oldtext;
 		oldtext = gtk_label_get_text (GTK_LABEL (msg));
 		if ( ! ve_string_empty (oldtext)) {
 			char *newtext;
-			tmp = ve_locale_to_utf8 (buf);
+			tmp = ve_locale_to_utf8 (args);
 			newtext = g_strdup_printf ("%s\n%s", oldtext, tmp);
 			g_free (tmp);
 			gtk_label_set_text (GTK_LABEL (msg), newtext);
 			g_free (newtext);
 		} else {
-			tmp = ve_locale_to_utf8 (buf);
+			tmp = ve_locale_to_utf8 (args);
 			gtk_label_set_text (GTK_LABEL (msg), tmp);
 			g_free (tmp);
 		}
 	} else {
-		tmp = ve_locale_to_utf8 (buf);
+		tmp = ve_locale_to_utf8 (args);
 		gtk_label_set_text (GTK_LABEL (msg), tmp);
 		g_free (tmp);
 	}
@@ -1767,14 +1774,12 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_ERRBOX:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	gtk_label_set_text (GTK_LABEL (err_box), tmp);
 	g_free (tmp);
 	if (err_box_clear_handler > 0)
 		g_source_remove (err_box_clear_handler);
-	if (ve_string_empty (buf))
+	if (ve_string_empty (args))
 		err_box_clear_handler = 0;
 	else
 		err_box_clear_handler = g_timeout_add (30000,
@@ -1787,13 +1792,10 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_ERRDLG:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
 	/* we should be now fine for focusing new windows */
 	gdm_wm_focus_new_windows (TRUE);
 
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	dlg = ve_hig_dialog_new (NULL /* parent */,
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
@@ -1814,9 +1816,7 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_SESS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	gdm_login_session_lookup (tmp);
 	g_free (tmp);
 	if (savesess == GTK_RESPONSE_CANCEL) {
@@ -1830,9 +1830,7 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_LANG:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-	gdm_login_language_lookup (buf);
+	gdm_login_language_lookup (args);
 	if (savelang == GTK_RESPONSE_CANCEL)
 	    printf ("%c%s\n", STX, GDM_RESPONSE_CANCEL);
 	else
@@ -1841,8 +1839,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_SSESS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (savesess == GTK_RESPONSE_YES)
 	    printf ("%cY\n", STX);
 	else
@@ -1852,8 +1848,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_SLANG:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (savelang == GTK_RESPONSE_YES)
 	    printf ("%cY\n", STX);
 	else
@@ -1885,9 +1879,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	/* fall thru to reset */
 
     case GDM_RESETOK:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
 	if (curuser != NULL) {
 	    g_free (curuser);
 	    curuser = NULL;
@@ -1900,7 +1891,7 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	if (browser_ok && gdm_config_get_bool (GDM_KEY_BROWSER))
 	    gtk_widget_set_sensitive (GTK_WIDGET (browser), TRUE);
 
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	gtk_label_set_text (GTK_LABEL (msg), tmp);
 	g_free (tmp);
 	gtk_widget_show (GTK_WIDGET (msg));
@@ -1912,8 +1903,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_QUIT:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (timed_handler_id != 0) {
 		g_source_remove (timed_handler_id);
 		timed_handler_id = 0;
@@ -1980,8 +1969,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_STARTTIMER:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	/*
 	 * Timed Login: Start Timer Loop
 	 */
@@ -1998,8 +1985,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_STOPTIMER:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	/*
 	 * Timed Login: Stop Timer Loop
 	 */
@@ -2013,7 +1998,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_DISABLE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	if (clock_label != NULL)
 		GTK_WIDGET_SET_FLAGS (clock_label->parent, GTK_SENSITIVE);
 	gtk_widget_set_sensitive (login, FALSE);
@@ -2022,7 +2006,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_ENABLE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	gtk_widget_set_sensitive (login, TRUE);
 	if (clock_label != NULL)
 		GTK_WIDGET_UNSET_FLAGS (clock_label->parent, GTK_SENSITIVE);
@@ -2034,14 +2017,11 @@ gdm_login_ctrl_handler (GIOChannel *sour
      * back a NULL response so that the daemon quits sending them */
     case GDM_NEEDPIC:
     case GDM_READPIC:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	printf ("%c\n", STX);
 	fflush (stdout);
 	break;
 
     case GDM_NOFOCUS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	gdm_wm_no_login_focus_push ();
 	
 	printf ("%c\n", STX);
@@ -2049,8 +2029,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_FOCUS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	gdm_wm_no_login_focus_pop ();
 	
 	printf ("%c\n", STX);
@@ -2058,8 +2036,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	break;
 
     case GDM_SAVEDIE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	/* Set busy cursor */
 	gdm_common_setup_cursor (GDK_WATCH);
 
@@ -2071,8 +2047,6 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	_exit (EXIT_SUCCESS);
 
     case GDM_QUERY_CAPSLOCK:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (greeter_is_capslock_on ())
 	    printf ("%cY\n", STX);
 	else
@@ -2083,11 +2057,9 @@ gdm_login_ctrl_handler (GIOChannel *sour
 	
     default:
 	gdm_kill_thingies ();
-	gdm_common_fail_greeter ("Unexpected greeter command received: '%c'", buf[0]);
+	gdm_common_fail_greeter ("Unexpected greeter command received: '%c'", op_code);
 	break;
     }
-
-    return (TRUE);
 }
 
 
@@ -3595,7 +3567,10 @@ main (int argc, char *argv[])
     if G_LIKELY ( ! DOING_GDM_DEVELOPMENT) {
 	    ctrlch = g_io_channel_unix_new (STDIN_FILENO);
 	    g_io_channel_set_encoding (ctrlch, NULL, NULL);
-	    g_io_channel_set_buffered (ctrlch, FALSE);
+	    g_io_channel_set_buffered (ctrlch, TRUE);
+	    g_io_channel_set_flags (ctrlch, 
+				    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
+				    NULL);
 	    g_io_add_watch (ctrlch, 
 			    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
 			    (GIOFunc) gdm_login_ctrl_handler,
diff -u -p -r1.125 greeter.c
--- gdm-2.15.5/gui/greeter/greeter.c	9 Jun 2006 21:07:42 -0000	1.125
+++ gdm-2.15.5/gui/greeter/greeter.c	7 Jul 2006 19:01:47 -0000
@@ -81,6 +81,8 @@ extern gint gdm_timed_delay;
 
 gboolean greeter_probably_login_prompt = FALSE;
 
+static void process_operation (guchar opcode, const gchar *args);
+
 void
 greeter_ignore_buttons (gboolean val)
 {
@@ -124,52 +126,64 @@ greeter_ctrl_handler (GIOChannel *source
 		      gint fd)
 {
     gchar buf[PIPE_SIZE];
+    gchar *p;
     gsize len;
-    GtkWidget *dlg;
-    char *tmp;
-    char *session;
-    GreeterItemInfo *conversation_info;
-    static GnomeCanvasItem *disabled_cover = NULL;
-    gchar *language;
-    gchar *selected_user = NULL;
 
     /* If this is not incoming i/o then return */
     if (cond != G_IO_IN) 
       return TRUE;
 
-    /* Read random garbage from i/o channel until STX is found */
+    /* Read random garbage from i/o channel until first STX is found */
     do {
       g_io_channel_read_chars (source, buf, 1, &len, NULL);
       
       if (len != 1)
 	return TRUE;
-    }  while (buf[0] && buf[0] != STX);
+    } while (buf[0] && buf[0] != STX);
 
-    /* Read opcode */
-    g_io_channel_read_chars (source, buf, 1, &len, NULL);
-
-    /* If opcode couldn't be read */
-    if (len != 1)
+    memset (buf, '\0', sizeof (buf));
+    if (g_io_channel_read_chars (source, buf, sizeof (buf) - 1, &len, NULL) !=
+	G_IO_STATUS_NORMAL)
       return TRUE;
 
+    p = memchr (buf, STX, len);
+
+    if (p != NULL) {
+      len = p - buf;
+      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
+      memset (buf + len, '\0', sizeof (buf) - len);
+    }
+      
+    process_operation ((guchar) buf[0], buf + 1);
+    return TRUE;
+}
+
+static void
+process_operation (guchar       op_code,
+		   const gchar *args)
+{
+    GtkWidget *dlg;
+    char *tmp;
+    char *session;
+    GreeterItemInfo *conversation_info;
+    static GnomeCanvasItem *disabled_cover = NULL;
+    gchar *language;
+    gchar *selected_user = NULL;
+
+
     /* Parse opcode */
-    switch (buf[0]) {
+    switch (op_code) {
     case GDM_SETLOGIN:
 	/* somebody is trying to fool us this is the user that
 	 * wants to log in, and well, we are the gullible kind */
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
 	
-	greeter_item_pam_set_user (buf);
+	greeter_item_pam_set_user (args);
 	printf ("%c\n", STX);
 	fflush (stdout);
 	break;
 
     case GDM_PROMPT:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	if (tmp != NULL && strcmp (tmp, _("Username:")) == 0) {
 		gdm_common_login_sound (gdm_config_get_string (GDM_KEY_SOUND_PROGRAM),
 					gdm_config_get_string (GDM_KEY_SOUND_ON_LOGIN_FILE),
@@ -190,9 +204,7 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_NOECHO:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 
 	if (tmp != NULL && strcmp (tmp, _("Password:")) == 0)
 		greeter_probably_login_prompt = FALSE;
@@ -204,9 +216,7 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_MSG:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	greeter_item_pam_message (tmp);
 	g_free (tmp);
 	printf ("%c\n", STX);
@@ -214,10 +224,7 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_ERRBOX:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	greeter_item_pam_error (tmp);
 	g_free (tmp);
 	
@@ -226,13 +233,10 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_ERRDLG:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL);
-	buf[len-1] = '\0';
-
 	/* we should be now fine for focusing new windows */
 	gdm_wm_focus_new_windows (TRUE);
 
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	dlg = ve_hig_dialog_new (NULL /* parent */,
 				 GTK_DIALOG_MODAL /* flags */,
 				 GTK_MESSAGE_ERROR,
@@ -253,10 +257,7 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_SESS:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-	buf[len-1] = '\0';
-
-	tmp = ve_locale_to_utf8 (buf);
+	tmp = ve_locale_to_utf8 (args);
 	session = greeter_session_lookup (tmp);
 	g_free (tmp);
 
@@ -272,9 +273,7 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_LANG:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-	buf[len-1] = '\0';
-	language = greeter_language_get_language (buf);
+	language = greeter_language_get_language (args);
 	if (greeter_language_get_save_language () == GTK_RESPONSE_CANCEL)
 	    printf ("%c%s\n", STX, GDM_RESPONSE_CANCEL);
 	else
@@ -284,8 +283,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_SSESS:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (greeter_save_session () == GTK_RESPONSE_YES)
 	  printf ("%cY\n", STX);
 	else
@@ -295,8 +292,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_SLANG:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (greeter_language_get_save_language () == GTK_RESPONSE_YES)
 	    printf ("%cY\n", STX);
 	else
@@ -309,14 +304,12 @@ greeter_ctrl_handler (GIOChannel *source
 	/* fall thru to reset */
 
     case GDM_RESETOK:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-	buf[len-1] = '\0';
 
 	conversation_info = greeter_lookup_id ("pam-conversation");
 	
 	if (conversation_info)
 	  {
-	    tmp = ve_locale_to_utf8 (buf);
+	    tmp = ve_locale_to_utf8 (args);
 	    g_object_set (G_OBJECT (conversation_info->item),
 			  "text", tmp,
 			  NULL);
@@ -331,8 +324,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_QUIT:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	greeter_item_timed_stop ();
 
 	if (require_quarter) {
@@ -368,8 +359,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_STARTTIMER:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	greeter_item_timed_start ();
 	
 	printf ("%c\n", STX);
@@ -377,8 +366,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_STOPTIMER:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	greeter_item_timed_stop ();
 
 	printf ("%c\n", STX);
@@ -386,7 +373,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_DISABLE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	gtk_widget_set_sensitive (window, FALSE);
 
 	if (disabled_cover == NULL)
@@ -407,7 +393,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_ENABLE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	gtk_widget_set_sensitive (window, TRUE);
 
 	if (disabled_cover != NULL)
@@ -424,14 +409,11 @@ greeter_ctrl_handler (GIOChannel *source
      * back a NULL response so that the daemon quits sending them */
     case GDM_NEEDPIC:
     case GDM_READPIC:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
 	printf ("%c\n", STX);
 	fflush (stdout);
 	break;
 
     case GDM_NOFOCUS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	gdm_wm_no_login_focus_push ();
 	
 	printf ("%c\n", STX);
@@ -439,8 +421,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_FOCUS:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	gdm_wm_no_login_focus_pop ();
 	
 	printf ("%c\n", STX);
@@ -448,8 +428,6 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 
     case GDM_SAVEDIE:
-	g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	/* Set busy cursor */
 	gdm_common_setup_cursor (GDK_WATCH);
 
@@ -460,8 +438,6 @@ greeter_ctrl_handler (GIOChannel *source
 	_exit (EXIT_SUCCESS);
 
     case GDM_QUERY_CAPSLOCK:
-        g_io_channel_read_chars (source, buf, PIPE_SIZE-1, &len, NULL); /* Empty */
-
 	if (greeter_is_capslock_on ())
 	    printf ("%cY\n", STX);
 	else
@@ -471,11 +447,9 @@ greeter_ctrl_handler (GIOChannel *source
 	break;
 	
     default:
-	gdm_common_fail_greeter ("Unexpected greeter command received: '%c'", buf[0]);
+	gdm_common_fail_greeter ("Unexpected greeter command received: '%c'", op_code);
 	break;
     }
-
-    return (TRUE);
 }
 
 static gboolean
@@ -1150,7 +1124,10 @@ main (int argc, char *argv[])
   if G_LIKELY (! DOING_GDM_DEVELOPMENT) {
     ctrlch = g_io_channel_unix_new (STDIN_FILENO);
     g_io_channel_set_encoding (ctrlch, NULL, NULL);
-    g_io_channel_set_buffered (ctrlch, FALSE);
+    g_io_channel_set_buffered (ctrlch, TRUE);
+    g_io_channel_set_flags (ctrlch, 
+			    g_io_channel_get_flags (ctrlch) | G_IO_FLAG_NONBLOCK,
+			    NULL);
     g_io_add_watch (ctrlch, 
 		    G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
 		    (GIOFunc) greeter_ctrl_handler,

gdm-2.15.5-reset-pam.patch:
 daemon/gdm.c          |    8 ++++++++
 daemon/gdm.h          |    4 ++++
 daemon/slave.c        |   34 +++++++++++++++++++++++++++-------
 gui/greeter/greeter.c |   18 +++++-------------
 4 files changed, 44 insertions(+), 20 deletions(-)

--- NEW FILE gdm-2.15.5-reset-pam.patch ---
--- ./daemon/gdm.h.reset-pam	2006-07-07 15:11:37.000000000 +0200
+++ ./daemon/gdm.h	2006-07-07 15:12:37.000000000 +0200
@@ -710,6 +710,9 @@
 /* Start a new standard X flexible server */
 #define GDM_SOP_FLEXI_XSERVER "FLEXI_XSERVER" /* no arguments */
 
+/* Reset any in progress authentication conversations */
+#define GDM_SOP_CANCEL_LOGIN_REQUESTS "CANCEL_LOGIN_REQUESTS" /* no arguments */
+
 /* Notification protocol */
 /* keys */
 #define GDM_NOTIFY_ALLOW_REMOTE_ROOT "AllowRemoteRoot" /* <true/false as int> */
@@ -736,6 +739,7 @@
 #define GDM_NOTIFY_SOFT_RESTART_SERVERS "SOFT_RESTART_SERVERS"
 #define GDM_NOTIFY_GO "GO"
 #define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
+#define GDM_NOTIFY_RESET "RESET"
 
 /* Ack for a slave message */
 /* Note that an extra response can follow an 'ack' */
--- ./daemon/slave.c.reset-pam	2006-07-07 15:11:37.000000000 +0200
+++ ./daemon/slave.c	2006-07-07 15:12:37.000000000 +0200
@@ -128,6 +128,12 @@
 static int greeter_fd_out = -1;
 static int greeter_fd_in = -1;
 
+/* a dup of the other side of greeter_fd_in so that
+ * the slave can talk to itself from its sig handler
+ * using the greeter ipc mechanism
+ */
+static int slave_fd_out = -1;
+
 #ifdef HAVE_TSOL
 static gboolean have_suntsol_extension = FALSE;
 #endif
@@ -618,7 +624,7 @@
 }
 
 static void
-whack_greeter_fds (void)
+whack_greeter_and_slave_fds (void)
 {
 	if (greeter_fd_out > 0)
 		VE_IGNORE_EINTR (close (greeter_fd_out));
@@ -626,6 +632,9 @@
 	if (greeter_fd_in > 0)
 		VE_IGNORE_EINTR (close (greeter_fd_in));
 	greeter_fd_in = -1;
+	if (slave_fd_out > 0)
+		VE_IGNORE_EINTR (close (slave_fd_out));
+	slave_fd_out = -1;
 }
 
 static void
@@ -1076,7 +1085,7 @@
 
 	d->greetpid = 0;
 
-	whack_greeter_fds ();
+	whack_greeter_and_slave_fds ();
 
 	gdm_slave_send_num (GDM_SOP_GREETPID, 0);
 
@@ -1842,7 +1851,7 @@
 
 		d->greetpid = 0;
 
-		whack_greeter_fds ();
+		whack_greeter_and_slave_fds ();
 
 		gdm_slave_send_num (GDM_SOP_GREETPID, 0);
 	}
@@ -2075,6 +2084,12 @@
 			break;
 		}
 
+		if (do_cancel) {
+			gdm_debug ("canceling...");
+			gdm_slave_greeter_ctl_no_ret (GDM_RESETOK, "");
+			continue;
+		}
+
 		if (login == NULL) {
 			char *failuresound = gdm_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FAILURE_FILE);
 
@@ -2673,9 +2688,9 @@
 	
     default:
 	VE_IGNORE_EINTR (close (pipe1[0]));
-	VE_IGNORE_EINTR (close (pipe2[1]));
+	whack_greeter_and_slave_fds ();
 
-	whack_greeter_fds ();
+	slave_fd_out = pipe2[1];
 
 	greeter_fd_out = pipe1[1];
 	greeter_fd_in = pipe2[0];
@@ -4663,7 +4678,7 @@
 
 			greet = FALSE;
 			d->greetpid = 0;
-			whack_greeter_fds ();
+			whack_greeter_and_slave_fds ();
 			gdm_slave_send_num (GDM_SOP_GREETPID, 0);
 
 			do_restart_greeter = TRUE;
@@ -4675,7 +4690,7 @@
 			continue;
 		}
 
-		whack_greeter_fds ();
+		whack_greeter_and_slave_fds ();
 
 		/* if greet is TRUE, then the greeter died outside of our
 		 * control really, so clean up and die, something is wrong
@@ -4818,6 +4833,11 @@
 				gdm_wait_for_go = FALSE;
 			} else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
 				gdm_twiddle_pointer (d);
+			} else if (strcmp (&s[1], GDM_NOTIFY_RESET) == 0) {
+				if (!d->logged_in) {
+					gdm_fdprintf (slave_fd_out, "%c%c%c\n", 
+						      STX, BEL, GDM_INTERRUPT_CANCEL);
+				}
 			}
 		}
 	}
--- ./daemon/gdm.c.reset-pam	2006-07-07 15:11:37.000000000 +0200
+++ ./daemon/gdm.c	2006-07-07 15:12:37.000000000 +0200
@@ -2345,6 +2345,14 @@
 				     TRUE /* handled */,
 				     FALSE /* chooser */,
 				     NULL, 0, NULL, NULL);
+	} else if (strcmp (msg, GDM_SOP_CANCEL_LOGIN_REQUESTS) == 0) {
+		GSList *li;
+		for (li = displays; li != NULL; li = li->next) {
+			GdmDisplay *d = li->data;
+			if (!d->logged_in) {
+				send_slave_command (d, GDM_NOTIFY_RESET);
+			}
+		}
 	}
 }
 
--- ./gui/greeter/greeter.c.reset-pam	2006-07-07 15:12:01.000000000 +0200
+++ ./gui/greeter/greeter.c	2006-07-07 15:14:33.000000000 +0200
@@ -165,7 +165,6 @@
     GtkWidget *dlg;
     char *tmp;
     char *session;
-    GreeterItemInfo *conversation_info;
     static GnomeCanvasItem *disabled_cover = NULL;
     gchar *language;
     gchar *selected_user = NULL;
@@ -304,18 +303,11 @@
 	/* fall thru to reset */
 
     case GDM_RESETOK:
-
-	conversation_info = greeter_lookup_id ("pam-conversation");
-	
-	if (conversation_info)
-	  {
-	    tmp = ve_locale_to_utf8 (args);
-	    g_object_set (G_OBJECT (conversation_info->item),
-			  "text", tmp,
-			  NULL);
-	    g_free (tmp);
-	  }
-
+	greeter_item_ulist_unset_selected_user ();
+	greeter_item_pam_prompt ("", PW_ENTRY_SIZE, TRUE);
+	greeter_item_pam_message ("");
+	greeter_item_pam_error ("");
+ 
 	printf ("%c\n", STX);
 	fflush (stdout);
 	greeter_ignore_buttons (FALSE);


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gdm.spec	13 Jun 2006 19:16:19 -0000	1.165
+++ gdm.spec	7 Jul 2006 21:26:52 -0000	1.166
@@ -27,26 +27,24 @@
 
 Patch1: gdm-2.14.1-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
-Patch6: gdm-2.6.0.7-wait-for-bootup.patch
-Patch7: gdm-2.8.0.2-clean-up-xsession-errors.patch
-Patch8: gdm-2.8.0.2-merge-resources.patch
-Patch9: gdm-2.6.0.8-boot-throbber.patch
-Patch10: gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch
-Patch11: gdm-2.6.0.8-xdmcp.patch
-Patch12: gdm-2.8.0.2-process-all-messages.patch
-Patch13: gdm-2.8.0.2-hide-throbber.patch
-Patch15: gdm-2.13.0.4-audit-login.patch
-Patch16: gdm-2.13.0.4-modularx.patch
-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
-Patch22: gdm-2.13.0.7-pam_stack.patch
-# got upstreamed
-#Patch23: gdm-2.15.3-chown.patch
-#Patch24: gdm-2.15.3-support-xdm-nodaemon-option.patch
-#Patch25: gdm-2.15.3-CVE-2006-2452.patch
+Patch3: gdm-2.8.0.2-session-errors-in-tmp.patch
+Patch4: gdm-2.13.0.4-update-switchdesk-location.patch
+Patch5: gdm-2.6.0.7-wait-for-bootup.patch
+Patch6: gdm-2.8.0.2-clean-up-xsession-errors.patch
+Patch7: gdm-2.8.0.2-merge-resources.patch
+Patch8: gdm-2.6.0.8-boot-throbber.patch
+Patch9: gdm-2.8.0.2-dont-malloc-in-signal-handlers.patch
+Patch10: gdm-2.6.0.8-xdmcp.patch
+Patch11: gdm-2.8.0.2-hide-throbber.patch
+Patch12: gdm-2.13.0.4-audit-login.patch
+Patch13: gdm-2.13.0.4-modularx.patch
+Patch14: gdm-2.8.0.4-call-dbus-launch.patch
+Patch15: gdm-2.8.0.4-dont-call-xsm.patch
+Patch16: gdm-2.13.0.4-add-gnome-cflags.patch
+Patch17: gdm-2.13.0.7-pam_stack.patch
+Patch18: gdm-2.15.5-process-all-ops.patch
+Patch19: gdm-2.15.5-move-default-message.patch
+Patch20: gdm-2.15.5-reset-pam.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -107,24 +105,24 @@
 
 %patch1 -p1 -b .change-defaults
 %patch2 -p1 -b .add-pam-timestamp-module
-%patch4 -p1 -b .session-errors-in-tmp
-%patch5 -p1 -b .update-switchdesk-location
-##%patch6 -p1 -b .wait-for-bootup
-%patch7 -p1 -b .clean-up-xsession-errors
-%patch8 -p1 -b .merge-resources
-##%patch9 -p1 -b .boot-throbber
-%patch10 -p1 -b .dont-malloc-in-signal-handlers
-##%patch11 -p1 -b .xdmcp
-##%patch12 -p1 -b .process-all-messages
-%patch13 -p1 -b .hide-throbber
-%patch15 -p1 -b .audit-login
-%patch16 -p1 -b .modularx
-%patch17 -p1 -b .call-dbus-launch
-%patch18 -p1 -b .dont-call-xsm
-%patch19 -p1 -b .add-gnome-cflags
-%patch22 -p1 -b .pam_stack
-#%patch23 -p1 -b .chown
-#%patch24 -p1 -b .support-xdm-nodaemon-option
+%patch3 -p1 -b .session-errors-in-tmp
+%patch4 -p1 -b .update-switchdesk-location
+##%patch5 -p1 -b .wait-for-bootup
+%patch6 -p1 -b .clean-up-xsession-errors
+%patch7 -p1 -b .merge-resources
+##%patch8 -p1 -b .boot-throbber
+%patch9 -p1 -b .dont-malloc-in-signal-handlers
+##%patch10 -p1 -b .xdmcp
+%patch11 -p1 -b .hide-throbber
+%patch12 -p1 -b .audit-login
+%patch13 -p1 -b .modularx
+%patch14 -p1 -b .call-dbus-launch
+%patch15 -p1 -b .dont-call-xsm
+%patch16 -p1 -b .add-gnome-cflags
+%patch17 -p1 -b .pam_stack
+%patch18 -p1 -b .process-all-ops
+%patch19 -p1 -b .move-default-message
+%patch20 -p1 -b .reset-pam
 
 # 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
@@ -319,6 +317,15 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 7 2006 Ray Strode <rstrode at redhat.com> 1:2.15.5-2
+- add patch to process all operations when more than one comes
+  in really quickly
+- move default "Please enter your username" message to the
+  greeter instead of the slave so that it doesn't get stacked if
+  a pam module has a non default message
+- add new message for reseting the current login operation
+  (like the cancel button does, but accessible via the gdm fifo)
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 1:2.15.5-1
 - Update to 2.15.5
 


--- gdm-2.15.3-CVE-2006-2452.patch DELETED ---


--- gdm-2.15.3-chown.patch DELETED ---


--- gdm-2.15.3-support-xdm-nodaemon-option.patch DELETED ---


--- gdm-2.8.0.2-process-all-messages.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 21:28:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 17:28:37 -0400
Subject: rpms/gdm/devel gdm.spec,1.166,1.167
Message-ID: <200607072128.k67LSbOs024034@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15108

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gdm.spec	7 Jul 2006 21:26:52 -0000	1.166
+++ gdm.spec	7 Jul 2006 21:28:35 -0000	1.167
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.5
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X



From fedora-cvs-commits at redhat.com  Fri Jul  7 21:54:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 17:54:04 -0400
Subject: rpms/kernel/devel linux-2.6.17-cachefiles-memory.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.2253.2.2, 1.2253.2.3
Message-ID: <200607072154.k67Ls4Lq005996@cvs.devel.redhat.com>

Author: steved

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

Modified Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_16-1_2253_FC6_fscache
	linux-2.6.17-cachefiles-memory.patch 
Log Message:
Fixed problem of freeing a NULL pointer


linux-2.6.17-cachefiles-memory.patch:
 cf-interface.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.17-cachefiles-memory.patch ---
--- linux-2.6.16.noarch/fs/cachefiles/cf-interface.c.orig	2006-07-07 17:11:40.471809000 -0400
+++ linux-2.6.16.noarch/fs/cachefiles/cf-interface.c	2006-07-07 17:17:34.103733000 -0400
@@ -634,9 +634,10 @@
 out:
 	if (backpage)
 		page_cache_release(backpage);
-	fscache_put_context(object->fscache.cookie, monitor->context);
-	kfree(monitor);
-
+	if (monitor) {
+		fscache_put_context(object->fscache.cookie, monitor->context);
+		kfree(monitor);
+	}
 	_leave(" = %d", ret);
 	return ret;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2253.2.2
retrieving revision 1.2253.2.3
diff -u -r1.2253.2.2 -r1.2253.2.3
--- kernel-2.6.spec	8 Jun 2006 19:01:26 -0000	1.2253.2.2
+++ kernel-2.6.spec	7 Jul 2006 21:54:02 -0000	1.2253.2.3
@@ -421,8 +421,9 @@
 Patch7005: linux-2.6.17-fscache-fedora.patch
 Patch7006: linux-2.6.17-cachefiles.patch
 Patch7007: linux-2.6.17-cachefiles-misc.patch
-Patch7008: linux-2.6.17-nfs-fscache.patch
-Patch7009: linux-2.6.17-afs-fscache.patch
+Patch7008: linux-2.6.17-cachefiles-memory.patch
+Patch7009: linux-2.6.17-nfs-fscache.patch
+Patch7010: linux-2.6.17-afs-fscache.patch
 
 
 #
@@ -1097,6 +1098,7 @@
 %patch7007 -p1
 %patch7008 -p1
 %patch7009 -p1
+%patch7010 -p1
 
 #
 # final stuff
@@ -1797,6 +1799,9 @@
 %endif
 
 %changelog
+* Fri Jul  7 2006 Steve Dickson <steved at redhat.com>
+* Fixed problem of freeing a NULL pointer
+
 * Thu Jun  8 2006 Steve Dickson <steved at redhat.com>
 - Added cachefs bits to kernel-2_6_16-1_2253_FC6_fscache branch
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 22:01:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 18:01:12 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.80,1.81
Message-ID: <200607072201.k67M1Ctp006161@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
- Add version to catalina .so




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- tomcat5.spec	7 Jul 2006 19:11:49 -0000	1.80
+++ tomcat5.spec	7 Jul 2006 22:01:10 -0000	1.81
@@ -1117,7 +1117,7 @@
 %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}/catalina-%{version}.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*
@@ -1207,6 +1207,7 @@
 - Full build
 - Do not build on ppc64 and s390x
 - Fix servlet-api.jar path
+- Add version to catalina .so
 From Ralph Apel <rapel at redhat.com>:
 - Re-add patch to add rt.jar
 - Add mx4j JMX API and struts to classpath



From fedora-cvs-commits at redhat.com  Fri Jul  7 22:51:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 18:51:51 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.81,1.82
Message-ID: <200607072251.k67MppdI026745@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Re-add sample.war to file list




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- tomcat5.spec	7 Jul 2006 22:01:10 -0000	1.81
+++ tomcat5.spec	7 Jul 2006 22:51:48 -0000	1.82
@@ -1144,6 +1144,7 @@
 %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}/sample*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-examples*
 
 %files admin-webapps



From fedora-cvs-commits at redhat.com  Fri Jul  7 22:58:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 18:58:53 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.19,1.20
Message-ID: <200607072258.k67Mwrtf029543@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29477

Modified Files:
	libXaw.spec 
Log Message:
- Rebuild, brew doesn't pick up buildroot changes fast enough. 



Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXaw.spec	28 Jun 2006 19:42:39 -0000	1.19
+++ libXaw.spec	7 Jul 2006 22:58:51 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 7
+Release: 8
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -101,6 +101,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8
+- Rebuild, brew doesn't pick up buildroot changes fast enough. 
+
 * Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-7
 - Rebuild for libXt pkgconfig fixes.
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 22:59:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 18:59:54 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.15,1.16
Message-ID: <200607072259.k67MxsHv029987@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29922

Modified Files:
	libXmu.spec 
Log Message:
- Rebuild, brew doesn't pick up buildroot changes fast enough.



Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXmu.spec	28 Jun 2006 20:10:10 -0000	1.15
+++ libXmu.spec	7 Jul 2006 22:59:52 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.2
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -109,6 +109,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-4
+- Rebuild, brew doesn't pick up buildroot changes fast enough.
+
 * Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-3
 - Rebuild for libXt pkgconfig fixes.
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:03:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:03:05 -0400
Subject: rpms/xorg-x11-drv-nv/FC-5 .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-drv-nv.spec, 1.12,
	1.13 nv-1.0.1.5-updateto-cvs20050209.patch, 1.1, NONE
Message-ID: <200607072303.k67N35Ic030436@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30416/FC-5

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Removed Files:
	nv-1.0.1.5-updateto-cvs20050209.patch 
Log Message:
auto-import xorg-x11-drv-nv-1.2.0-1.fc5 on branch FC-5 from xorg-x11-drv-nv-1.2.0-1.fc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:36:40 -0000	1.6
+++ .cvsignore	7 Jul 2006 23:03:01 -0000	1.7
@@ -1 +1 @@
-xf86-video-nv-1.0.1.5.tar.bz2
+xf86-video-nv-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:36:40 -0000	1.6
+++ sources	7 Jul 2006 23:03:01 -0000	1.7
@@ -1 +1 @@
-4ba5f719e5a62dabe485f0c5a564d7eb  xf86-video-nv-1.0.1.5.tar.bz2
+63923dbec25cedbd2dcc376afea5ca76  xf86-video-nv-1.2.0.tar.bz2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/xorg-x11-drv-nv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-nv.spec	10 Jun 2006 09:25:24 -0000	1.12
+++ xorg-x11-drv-nv.spec	7 Jul 2006 23:03:01 -0000	1.13
@@ -6,12 +6,11 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   1.0.1.5
-Release:   4
+Version:   1.2.0
+Release:   1%{?dist}
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://www.x.org/releases/individual/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)
@@ -20,6 +19,7 @@
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-proto-devel
 
 Requires:  xorg-x11-server-Xorg
 
@@ -28,7 +28,6 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p2 -b .updateto-cvs20050209
 
 %build
 %configure --disable-static
@@ -60,6 +59,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc5
+- Update to 1.2.0 release.
+
 * Sat Jun 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-4
 - Added 10DE:0184 to nv.xinf, although the driver is not currently aware of
   this specific chip ID, the fallback code appears to work in bug #(186343)


--- nv-1.0.1.5-updateto-cvs20050209.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:08:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:08:43 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.22,1.23
Message-ID: <200607072308.k67N8hcB031226@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc6
- Add %{?dist} and rebuild.



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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drv-nv.spec	6 Jul 2006 22:59:15 -0000	1.22
+++ xorg-x11-drv-nv.spec	7 Jul 2006 23:08:40 -0000	1.23
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   1
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -65,6 +65,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc6
+- Add %{?dist} and rebuild.
+
 * Thu Jul  6 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1
 - Update to 1.2.0: GeForce 6 and 7 updates and new hardware support.
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:09:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:09:03 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.82,1.83
Message-ID: <200607072309.k67N93mo031332@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Re-enable ppc64 and s390x




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- tomcat5.spec	7 Jul 2006 22:51:48 -0000	1.82
+++ tomcat5.spec	7 Jul 2006 23:09:01 -0000	1.83
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_1fc
+Release: 3jpp_2fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -101,8 +101,6 @@
 Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
-# FIXME
-ExcludeArch: ppc64 s390x
 
 Requires: jpackage-utils >= 0:1.6.0
 # xml parsing packages
@@ -1204,6 +1202,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Fri Jul 07 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
+- Re-enable ppc64 and s390x
+
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build
 - Do not build on ppc64 and s390x



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:09:06 -0400
Subject: rpms/kernel/FC-5 .cvsignore, 1.407, 1.408 kernel-2.6.spec, 1.2152,
	1.2153 linux-2.6-devmem-xen.patch, 1.2, 1.3 sources, 1.348, 1.349
Message-ID: <200607072309.k67N96np031346@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-devmem-xen.patch sources 
Log Message:
update xen HV to cset 10508


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- .cvsignore	30 Jun 2006 18:47:17 -0000	1.407
+++ .cvsignore	7 Jul 2006 23:09:01 -0000	1.408
@@ -4,3 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.17.3.bz2
+xen-20060708.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2152
retrieving revision 1.2153
diff -u -r1.2152 -r1.2153
--- kernel-2.6.spec	5 Jul 2006 22:12:16 -0000	1.2152
+++ kernel-2.6.spec	7 Jul 2006 23:09:01 -0000	1.2153
@@ -25,7 +25,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
 %define signmodules 0
-%define xen_version 20060610
+%define xen_version 20060708
 %define make_target bzImage
 %define kernel_image x86
 
@@ -405,8 +405,6 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
-Patch20000: xen-sched-sedf.patch
-
 
 # END OF PATCH DEFINITIONS
 
@@ -671,7 +669,6 @@
 cp -rl xen-%{xen_version} xen
 
 # Any necessary hypervisor patches go here
-%patch20000 -p0
 %endif
 
 cd linux-%{kversion}.%{_target_cpu}
@@ -1548,6 +1545,10 @@
 %endif
 
 %changelog
+* Sat Jul  8 2006 Juan Quintela <quintela at redhat.com>
+- Update to xen-unstable HV cset 10508.
+- xen: credit scheduler is the default now.
+
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Get rid of stack backtrace on panic, which in most
   cases actually caused a loss of info instead of a gain.

linux-2.6-devmem-xen.patch:
 arch/i386/mm/init-xen.c                |   11 +++++++++++
 arch/x86_64/mm/init-xen.c              |   27 +++++++++++++++++++++++++++
 include/asm-i386/mach-xen/asm/page.h   |    1 +
 include/asm-x86_64/mach-xen/asm/page.h |    4 ++++
 4 files changed, 43 insertions(+)

Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem-xen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-devmem-xen.patch	18 Jun 2006 04:45:03 -0000	1.2
+++ linux-2.6-devmem-xen.patch	7 Jul 2006 23:09:02 -0000	1.3
@@ -22,14 +22,15 @@
 diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
 --- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c	2006-04-13 14:19:58.000000000 +0200
 +++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c	2006-04-13 16:16:23.000000000 +0200
-@@ -847,6 +847,10 @@ void __init clear_kernel_mapping(unsigne
+@@ -847,6 +847,11 @@ void __init clear_kernel_mapping(unsigne
  	__flush_tlb_all();
  } 
  
-+static inline int page_is_ram (unsigned long pagenr)
++int page_is_ram (unsigned long pagenr)
 +{
 +	return 1;
 +}
++
  /*
   * Memory hotplug specific functions
   * These are only for non-NUMA machines right now.
@@ -57,7 +58,7 @@
 +}
 +
 +
-+EXPORT_SYMBOL_GPL(devmem_is_allowed);
++EXPORT_SYMBOL_GPL(page_is_ram);
 +
  static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
  			 kcore_vsyscall;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- sources	30 Jun 2006 18:47:17 -0000	1.348
+++ sources	7 Jul 2006 23:09:02 -0000	1.349
@@ -1,3 +1,4 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 2c426ef5e2f02f1a761f150c13a7dac8  patch-2.6.17.3.bz2
+5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:33:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:33:16 -0400
Subject: rpms/sysfsutils/devel sysfsutils.spec,1.16,1.17
Message-ID: <200607072333.k67NXGhh021378@cvs.devel.redhat.com>

Author: dledford

Update of /cvs/dist/rpms/sysfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21354

Modified Files:
	sysfsutils.spec 
Log Message:
Split up into sysfsutils, libsysfs, and libsysfs-devel for multilib reasons.


Index: sysfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sysfsutils.spec	25 May 2006 19:38:53 -0000	1.16
+++ sysfsutils.spec	7 Jul 2006 23:33:14 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: sysfsutils, library interface to sysfs.
 Name: sysfsutils
 Version: 2.0.0
-Release: 2 
+Release: 3 
 Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-redhatify.patch
-License: GPL/LGPL
+License: GPL
 Group: Development/Tools
 Buildroot: %{_tmppath}/%{name}-root
 
@@ -12,16 +12,21 @@
 This package's purpose is to provide a set of utilities for interfacing
 with sysfs.
 
-The library is distributed under LGPL and utilities that come with it are
-under GPL.
+%package -n libsysfs
+Summary: Shared library for interfacing with sysfs
+Group: System Environment/Libraries
+License: LGPL
 
-%package devel
-Summary: Static library and headers for sysfsutils
+%description -n libsysfs
+Library used in handling linux kernel sysfs mounts and their various files.
+
+%package -n libsysfs-devel
+Summary: Static library and headers for libsysfs
 Group: Development/Libraries
-Requires: sysfsutils = %{version}
+Requires: libsysfs = %{version}
 
-%description devel
-sysfsutils-devel provides the header files and static libraries required
+%description -n libsysfs-devel
+libsysfs-devel provides the header files and static libraries required
 to build programs using the libsysfs API.
 
 %prep
@@ -51,12 +56,16 @@
 %defattr(-,root,root)
 %{_bindir}/systool
 %{_bindir}/get_module
+%{_mandir}/man1/systool.1.gz
+%doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt cmd/GPL
+
+%files -n libsysfs
+%defattr(-,root,root)
 %{_libdir}/libsysfs.so.2
 %{_libdir}/libsysfs.so.2.0.0
-%{_mandir}/man1/systool.1.gz
-%doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt cmd/GPL lib/LGPL
+%doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt lib/LGPL
 
-%files devel
+%files -n libsysfs-devel
 %defattr(-,root,root)
 %dir %{_includedir}/sysfs
 %{_includedir}/sysfs/libsysfs.h
@@ -66,6 +75,10 @@
 
 
 %changelog
+* Fri Jul  7 2006 Doug Ledford <dledford at redhat.com> - 2.0.0-3
+- Split the library and devel files out to libsysfs and leave the utils
+  in sysfsutils.  This is for multilib arch requirements.
+
 * Thu May 25 2006 Neil Horman <nhorman at redhat.com> - 2.0.0-2
 - Fixed devel rpm to own sysfs include dir
 - Fixed a typo in changelog



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:55:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:55:52 -0400
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.3,
	1.4 xorg-x11-drv-i810.spec, 1.18, 1.19
Message-ID: <200607072355.k67Ntqec011080@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6
- Update i810.xinf to include entries for E7221 and 945GM.



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i810.xinf	4 Feb 2006 12:35:06 -0000	1.3
+++ i810.xinf	7 Jul 2006 23:55:50 -0000	1.4
@@ -1,11 +1,13 @@
-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: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
-alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* i810
-alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* i810
+alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* i810	# i815
+alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810	# 845G
+alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810	# 865G
+alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810	# 915G
+alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* i810	# E7221G
+alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* i810	# 915GM
+alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810	# 945G
+alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* i810	# 945GM
+alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810	# i830
+alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810	# 855GM
+alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810	# i810
+alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* i810	# i810 DC100
+alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* i810	# i810E


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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-i810.spec	28 Jun 2006 11:03:56 -0000	1.18
+++ xorg-x11-drv-i810.spec	7 Jul 2006 23:55:50 -0000	1.19
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   5
+Release:   6
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -95,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6
+- Update i810.xinf to include entries for E7221 and 945GM.
+
 * Fri Jun 23 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-5
 - Add with_dri macro to spec file, and conditionalize build time DRI support
 



From fedora-cvs-commits at redhat.com  Fri Jul  7 23:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 19:59:09 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-obz5073.patch, NONE,
	1.1 pegasus-2.5.1-obz5090.patch, NONE,
	1.1 pegasus-2.5.1-obz5180.patch, NONE, 1.1 tog-pegasus.spec,
	1.36, 1.37
Message-ID: <200607072359.k67Nx9E6012397@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12364

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-obz5073.patch pegasus-2.5.1-obz5090.patch 
	pegasus-2.5.1-obz5180.patch 
Log Message:
apply upstream bug fixes: 4629, 5073, 5090, 5180

pegasus-2.5.1-obz5073.patch:
 AssocClassCache.cpp |   24 ++++++++++++++++++------
 AssocClassCache.h   |   10 +++++-----
 AssocClassTable.cpp |   14 --------------
 3 files changed, 23 insertions(+), 25 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5073.patch ---
--- pegasus/src/Pegasus/Repository/AssocClassTable.cpp.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassTable.cpp	2006-06-12 13:13:18.000000000 -0400
@@ -218,10 +218,6 @@
     fields.append(toClassName.getString());
     fields.append(toPropertyName.getString());
 
-    for (Uint16 x=0; x<fields.size();x++)
-    {
-        fields[x].toLower();
-    }
 
     _PutRecord(os, fields);
 
@@ -263,10 +259,6 @@
     fields.append(toClassName.getString());
     fields.append(toPropertyName.getString());
 
-    for (Uint16 x=0; x<fields.size();x++)
-    {
-        fields[x].toLower();
-    }
 
     _PutRecord(os, fields);
 
@@ -428,11 +420,6 @@
         // For each line in the associations table:
         while (_GetRecord(is, fields))
         {
-            // The cache key is always expected to be in lowercase
-            // While new association records are added in lowercase,
-            // the following line is required for compatibility
-            // with old repositories.
-            fields[FROM_CLASS_NAME_INDEX].toLower();
             cache->addRecord(fields[FROM_CLASS_NAME_INDEX],
                              fields);
         }
@@ -483,7 +470,6 @@
     for (Uint16 idx=0; idx < classList.size(); idx++)
     {
         String fromClassName = classList[idx].getString();
-        fromClassName.toLower();
         if (cache->getAssocClassEntry(fromClassName, records))
         {
             for (Uint16 rx=0; rx <records.size(); rx++)
--- pegasus/src/Pegasus/Repository/AssocClassCache.h.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassCache.h	2006-06-12 13:13:18.000000000 -0400
@@ -63,24 +63,24 @@
     /** Retrieve an entry for an association class through direct
      * access via the from class name.
     */
-    Boolean getAssocClassEntry(const String& lowerCaseFromClassName,
+    Boolean getAssocClassEntry(const String& fromClassName,
                                Array< Array<String> >& entryList);
 
     /** Add a new entry to the association cache.
     */
-    Boolean addRecord(const String& lowerCaseFromClassName,
+    Boolean addRecord(const String& fromClassName,
                       Array<String> assocClassEntry);
 
     /** Remove an entry from the association cache specified by the given
      * association class name.
     */
-    Boolean removeEntry(const String& lowerCaseFromClassName);
+    Boolean removeEntry(const String& fromClassName);
 
    /** Remove an association record from the association cache specified by the given
     *  from class name and association name.
     */
-    Boolean removeRecord(const String& lowerCaseFromClassName,
-                         const String& lowerCaseAssocClassName);
+    Boolean removeRecord(const String& fromClassName,
+                         const String& assocClassName);
 
     /** Check if the cache is loaded with objects already.
     */
--- pegasus/src/Pegasus/Repository/AssocClassCache.cpp.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassCache.cpp	2006-06-12 13:13:18.000000000 -0400
@@ -86,9 +86,12 @@
 /** Retrieve the list of entries for a from class through direct
  * access via the from class name.
 */
-Boolean AssocClassCache::getAssocClassEntry(const String& lowerCaseFromClassName,
+Boolean AssocClassCache::getAssocClassEntry(const String& fromClassName,
                                             Array< Array<String> >& entryList)
 {
+    String lowerCaseFromClassName = fromClassName;
+    lowerCaseFromClassName.toLower();
+
    return _assocClassCache->lookup(lowerCaseFromClassName,entryList);
 }
 
@@ -97,10 +100,12 @@
  * the new entry is appended to the old entry. Otherwise a new entry
  * is added to the cache.
 */
-Boolean AssocClassCache::addRecord(const String& lowerCaseFromClassName,
+Boolean AssocClassCache::addRecord(const String& fromClassName,
                                    Array<String> assocClassRecord)
 {
    Array< Array<String> > oldAssocClassEntryList;
+   String lowerCaseFromClassName = fromClassName;
+   lowerCaseFromClassName.toLower();
 
    if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList))
    {
@@ -115,18 +120,24 @@
 /** Remove an entry from the association cache specified by the given
  *  from class name.
 */
-Boolean AssocClassCache::removeEntry(const String& lowerCaseFromClassName)
+Boolean AssocClassCache::removeEntry(const String& fromClassName)
 {
+    String lowerCaseFromClassName = fromClassName;
+    lowerCaseFromClassName.toLower();
+
    return _assocClassCache->remove(lowerCaseFromClassName);
 }
 
 /** Remove an association record from the association cache specified by the given
  *  from class name and association name.
 */
-Boolean AssocClassCache::removeRecord(const String& lowerCaseFromClassName,
-                                      const String& lowerCaseAssocClassName)
+Boolean AssocClassCache::removeRecord(const String& fromClassName,
+                                      const String& assocClassName)
 {
    Array< Array<String> > oldAssocClassEntryList;
+   String lowerCaseFromClassName = fromClassName;
+   lowerCaseFromClassName.toLower();
+
    if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList))
    {
       for (Uint16 idx=0; idx < oldAssocClassEntryList.size(); idx++ )
@@ -134,7 +145,8 @@
          // The first entry in each record is the association class
          // name. Find the record for the association class and remove
          // it from the cache entry.
-         if (oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX] == lowerCaseAssocClassName)
+         if (String::equalNoCase(oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX],
+                                 assocClassName))
          {
             _assocClassCache->remove(lowerCaseFromClassName);
             if (oldAssocClassEntryList.size() > 1)

pegasus-2.5.1-obz5090.patch:
 CMPIProvider.cpp |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5090.patch ---
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp.obz5090	2006-01-30 11:18:04.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp	2006-07-07 18:20:48.000000000 -0400
@@ -297,19 +297,6 @@
 */ 
 void CMPIProvider::_terminate(Boolean terminating)
 {
-   {
-      WriteLock writeLock (broker.rwsemClassCache);
-
-      if (broker.clsCache) {
-         ClassCache::Iterator i=broker.clsCache->start();
-         for (; i; i++) {
-            delete i.value();
-         }
-         delete broker.clsCache;
-         broker.clsCache=NULL;
-      }
-   }
-
     const OperationContext opc;
     CMPIStatus rc={CMPI_RC_OK,NULL};
     CMPI_ContextOnStack eCtx(opc);
@@ -350,8 +337,23 @@
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
 	   if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }   
+
     if (noUnload == false) 
     {
+        // Cleanup the class cache
+        {
+           WriteLock writeLock (broker.rwsemClassCache);
+
+           if (broker.clsCache) {
+              ClassCache::Iterator i=broker.clsCache->start();
+              for (; i; i++) {
+                 delete i.value();
+              }
+              delete broker.clsCache;
+              broker.clsCache=NULL;
+           }
+        }
+
 	  // Check the thread list to make sure the thread has been de-allocated
 	  if (_threadWatchList.size() != 0)
 	  {

pegasus-2.5.1-obz5180.patch:
 CIMOperationRequestDispatcher.cpp |   26 ++++++++++++++++++--------
 CIMOperationRequestDispatcher.h   |    2 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5180.patch ---
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz5180	2006-07-07 18:19:11.000000000 -0400
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp	2006-07-07 19:03:51.000000000 -0400
@@ -421,7 +421,18 @@
                                                 CIMResponseMessage *&response)
 {
     static const char func[] = "CIMOperationRequestDispatcher::_enqueueResponse";
-    AutoMutex autoMut(_mut);
+    // Obtain the _enqueueResponseMutex mutex for this chunked request.
+    // This mutex is used to serialize chunked responses from all incoming
+    // provider threads. It is imperative that the sequencing done by the
+    // resequenceResponse() method and the writing of the chunked response
+    // to the connection socket (done as a synchronous enqueue at the end
+    // of this method) are atomic to ensure that the chunk that is marked
+    // as isComplete for the overall response is indeed the last chunk
+    // returned to the client. See PEP 140 for details.
+    // This mutex was moved into the OperationAggregate class as part of
+    // bug 4629 because we only need to serialize on a per-request basis.
+    // This prevents serializing independent requests on separate connections.
+    AutoMutex autoMut(poA->_enqueueResponseMutex);
     Boolean isComplete = false;
 
     try
@@ -550,13 +561,6 @@
                 CIMException(CIM_ERR_FAILED, String(failMsg));
     }
 
-    if (isComplete == true)
-    {
-        // also deletes the copied request attached to it
-        delete poA;
-        poA = 0;
-    }
-
     // after sending, the response has been deleted externally
     response = 0;
 
@@ -1785,6 +1789,12 @@
     // the ENTIRE response to the request.
 
     isComplete = service->_enqueueResponse(poA, response);
+    if (isComplete)
+    {
+        // also deletes the copied request attached to it
+        delete poA;
+        poA = 0;
+    }
 
     PEG_METHOD_EXIT();
 }
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h.obz5180	2006-02-10 14:13:47.000000000 -0500
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h	2006-07-07 19:00:43.000000000 -0400
@@ -159,6 +159,7 @@
 */
 class PEGASUS_SERVER_LINKAGE OperationAggregate
 {
+   friend class CIMOperationRequestDispatcher;
 public:
     /* Operation Aggregate constructor.  Builds an aggregate
         object.
@@ -227,6 +228,7 @@
 
     Array<CIMResponseMessage*> _responseList;
     Mutex _appendResponseMutex;
+    Mutex _enqueueResponseMutex;
     CIMRequestMessage* _request;
     Uint32 _totalIssued;
     Uint32 _magicNumber;


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tog-pegasus.spec	10 Jun 2006 03:16:12 -0000	1.36
+++ tog-pegasus.spec	7 Jul 2006 23:59:07 -0000	1.37
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.5.1
-Release: 		8%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		10%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -94,6 +94,9 @@
 Patch32:		pegasus-2.5.1-obz5083.patch
 Patch33:		pegasus-2.5.1-obz5115.patch
 Patch34:		pegasus-2.5.1-obz5119.patch
+Patch35:		pegasus-2.5.1-obz5073.patch
+Patch36:		pegasus-2.5.1-obz5090.patch
+Patch37:		pegasus-2.5.1-obz5180.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -183,6 +186,9 @@
 %patch32 -p1 -b .obz5083
 %patch33 -p1 -b .obz5115
 %patch34 -p1 -b .obz5119
+%patch35 -p1 -b .obz5073
+%patch36 -p1 -b .obz5090
+%patch37 -p1 -b .obz5180
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -376,6 +382,13 @@
 
 
 %changelog
+* Fri Jul 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.4.1-10
+- More upstream 2.5.2_APPROVED bug fixes:
+  o 4629: Pegasus freezes when it is unable to send out completely, the results of a request
+  o 5073: Class Names on Reference, ReferenceNames, Assoc, AssocNames returned lower case
+  o 5090: cimserver crash on a request after attempting to unload idle CMPI providers
+  o 5180: OperationAggregate deleted in _enqueueResponse while member mutex held
+
 * Fri Jun 09 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.1-8
 - Fix bug 192754: remove multilib conflicts
 - More upstream 2.5.2_APPROVED bug fixes:



From fedora-cvs-commits at redhat.com  Sat Jul  8 00:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 20:08:03 -0400
Subject: rpms/tog-pegasus/FC-5 pegasus-2.5.1-obz5073.patch, NONE,
	1.1 pegasus-2.5.1-obz5090.patch, NONE,
	1.1 pegasus-2.5.1-obz5115.patch, NONE,
	1.1 pegasus-2.5.1-obz5119.patch, NONE,
	1.1 pegasus-2.5.1-obz5180.patch, NONE, 1.1 tog-pegasus.spec,
	1.29, 1.30
Message-ID: <200607080008.k68083Es013894@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13866

Modified Files:
	tog-pegasus.spec 
Added Files:
	pegasus-2.5.1-obz5073.patch pegasus-2.5.1-obz5090.patch 
	pegasus-2.5.1-obz5115.patch pegasus-2.5.1-obz5119.patch 
	pegasus-2.5.1-obz5180.patch 
Log Message:
apply upstream bug fixes: 5073, 5090, 5115, 5119, 5180

pegasus-2.5.1-obz5073.patch:
 AssocClassCache.cpp |   24 ++++++++++++++++++------
 AssocClassCache.h   |   10 +++++-----
 AssocClassTable.cpp |   14 --------------
 3 files changed, 23 insertions(+), 25 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5073.patch ---
--- pegasus/src/Pegasus/Repository/AssocClassTable.cpp.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassTable.cpp	2006-06-12 13:13:18.000000000 -0400
@@ -218,10 +218,6 @@
     fields.append(toClassName.getString());
     fields.append(toPropertyName.getString());
 
-    for (Uint16 x=0; x<fields.size();x++)
-    {
-        fields[x].toLower();
-    }
 
     _PutRecord(os, fields);
 
@@ -263,10 +259,6 @@
     fields.append(toClassName.getString());
     fields.append(toPropertyName.getString());
 
-    for (Uint16 x=0; x<fields.size();x++)
-    {
-        fields[x].toLower();
-    }
 
     _PutRecord(os, fields);
 
@@ -428,11 +420,6 @@
         // For each line in the associations table:
         while (_GetRecord(is, fields))
         {
-            // The cache key is always expected to be in lowercase
-            // While new association records are added in lowercase,
-            // the following line is required for compatibility
-            // with old repositories.
-            fields[FROM_CLASS_NAME_INDEX].toLower();
             cache->addRecord(fields[FROM_CLASS_NAME_INDEX],
                              fields);
         }
@@ -483,7 +470,6 @@
     for (Uint16 idx=0; idx < classList.size(); idx++)
     {
         String fromClassName = classList[idx].getString();
-        fromClassName.toLower();
         if (cache->getAssocClassEntry(fromClassName, records))
         {
             for (Uint16 rx=0; rx <records.size(); rx++)
--- pegasus/src/Pegasus/Repository/AssocClassCache.h.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassCache.h	2006-06-12 13:13:18.000000000 -0400
@@ -63,24 +63,24 @@
     /** Retrieve an entry for an association class through direct
      * access via the from class name.
     */
-    Boolean getAssocClassEntry(const String& lowerCaseFromClassName,
+    Boolean getAssocClassEntry(const String& fromClassName,
                                Array< Array<String> >& entryList);
 
     /** Add a new entry to the association cache.
     */
-    Boolean addRecord(const String& lowerCaseFromClassName,
+    Boolean addRecord(const String& fromClassName,
                       Array<String> assocClassEntry);
 
     /** Remove an entry from the association cache specified by the given
      * association class name.
     */
-    Boolean removeEntry(const String& lowerCaseFromClassName);
+    Boolean removeEntry(const String& fromClassName);
 
    /** Remove an association record from the association cache specified by the given
     *  from class name and association name.
     */
-    Boolean removeRecord(const String& lowerCaseFromClassName,
-                         const String& lowerCaseAssocClassName);
+    Boolean removeRecord(const String& fromClassName,
+                         const String& assocClassName);
 
     /** Check if the cache is loaded with objects already.
     */
--- pegasus/src/Pegasus/Repository/AssocClassCache.cpp.obz5073	2006-01-30 11:18:20.000000000 -0500
+++ pegasus/src/Pegasus/Repository/AssocClassCache.cpp	2006-06-12 13:13:18.000000000 -0400
@@ -86,9 +86,12 @@
 /** Retrieve the list of entries for a from class through direct
  * access via the from class name.
 */
-Boolean AssocClassCache::getAssocClassEntry(const String& lowerCaseFromClassName,
+Boolean AssocClassCache::getAssocClassEntry(const String& fromClassName,
                                             Array< Array<String> >& entryList)
 {
+    String lowerCaseFromClassName = fromClassName;
+    lowerCaseFromClassName.toLower();
+
    return _assocClassCache->lookup(lowerCaseFromClassName,entryList);
 }
 
@@ -97,10 +100,12 @@
  * the new entry is appended to the old entry. Otherwise a new entry
  * is added to the cache.
 */
-Boolean AssocClassCache::addRecord(const String& lowerCaseFromClassName,
+Boolean AssocClassCache::addRecord(const String& fromClassName,
                                    Array<String> assocClassRecord)
 {
    Array< Array<String> > oldAssocClassEntryList;
+   String lowerCaseFromClassName = fromClassName;
+   lowerCaseFromClassName.toLower();
 
    if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList))
    {
@@ -115,18 +120,24 @@
 /** Remove an entry from the association cache specified by the given
  *  from class name.
 */
-Boolean AssocClassCache::removeEntry(const String& lowerCaseFromClassName)
+Boolean AssocClassCache::removeEntry(const String& fromClassName)
 {
+    String lowerCaseFromClassName = fromClassName;
+    lowerCaseFromClassName.toLower();
+
    return _assocClassCache->remove(lowerCaseFromClassName);
 }
 
 /** Remove an association record from the association cache specified by the given
  *  from class name and association name.
 */
-Boolean AssocClassCache::removeRecord(const String& lowerCaseFromClassName,
-                                      const String& lowerCaseAssocClassName)
+Boolean AssocClassCache::removeRecord(const String& fromClassName,
+                                      const String& assocClassName)
 {
    Array< Array<String> > oldAssocClassEntryList;
+   String lowerCaseFromClassName = fromClassName;
+   lowerCaseFromClassName.toLower();
+
    if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList))
    {
       for (Uint16 idx=0; idx < oldAssocClassEntryList.size(); idx++ )
@@ -134,7 +145,8 @@
          // The first entry in each record is the association class
          // name. Find the record for the association class and remove
          // it from the cache entry.
-         if (oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX] == lowerCaseAssocClassName)
+         if (String::equalNoCase(oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX],
+                                 assocClassName))
          {
             _assocClassCache->remove(lowerCaseFromClassName);
             if (oldAssocClassEntryList.size() > 1)

pegasus-2.5.1-obz5090.patch:
 CMPIProvider.cpp |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5090.patch ---
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp.obz5090	2006-01-30 11:18:04.000000000 -0500
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp	2006-07-07 18:20:48.000000000 -0400
@@ -297,19 +297,6 @@
 */ 
 void CMPIProvider::_terminate(Boolean terminating)
 {
-   {
-      WriteLock writeLock (broker.rwsemClassCache);
-
-      if (broker.clsCache) {
-         ClassCache::Iterator i=broker.clsCache->start();
-         for (; i; i++) {
-            delete i.value();
-         }
-         delete broker.clsCache;
-         broker.clsCache=NULL;
-      }
-   }
-
     const OperationContext opc;
     CMPIStatus rc={CMPI_RC_OK,NULL};
     CMPI_ContextOnStack eCtx(opc);
@@ -350,8 +337,23 @@
        if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true;
 	   if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true;
     }   
+
     if (noUnload == false) 
     {
+        // Cleanup the class cache
+        {
+           WriteLock writeLock (broker.rwsemClassCache);
+
+           if (broker.clsCache) {
+              ClassCache::Iterator i=broker.clsCache->start();
+              for (; i; i++) {
+                 delete i.value();
+              }
+              delete broker.clsCache;
+              broker.clsCache=NULL;
+           }
+        }
+
 	  // Check the thread list to make sure the thread has been de-allocated
 	  if (_threadWatchList.size() != 0)
 	  {

pegasus-2.5.1-obz5115.patch:
 SetConfig_EnvVar |   60 +++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5115.patch ---
--- pegasus/SetConfig_EnvVar.obz5115	2006-01-30 11:16:16.000000000 -0500
+++ pegasus/SetConfig_EnvVar	2006-06-07 15:06:18.000000000 -0400
@@ -1,34 +1,34 @@
 #!/usr/bin/perl
-//%2006////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
-// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
-// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
-// IBM Corp.; EMC Corporation, The Open Group.
-// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
-// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
-// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-// EMC Corporation; VERITAS Software Corporation; The Open Group.
-// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-// EMC Corporation; Symantec Corporation; The Open Group.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
-// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
-// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//================================================================================
+#//%2006////////////////////////////////////////////////////////////////////////
+#//
+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
+#// IBM Corp.; EMC Corporation, The Open Group.
+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
+#// EMC Corporation; VERITAS Software Corporation; The Open Group.
+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
+#// EMC Corporation; Symantec Corporation; The Open Group.
+#//
+#// Permission is hereby granted, free of charge, to any person obtaining a copy
+#// of this software and associated documentation files (the "Software"), to
+#// deal in the Software without restriction, including without limitation the
+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+#// sell copies of the Software, and to permit persons to whom the Software is
+#// furnished to do so, subject to the following conditions:
+#// 
+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+#// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#//
+#//================================================================================
 use strict;
 #use warnings;
 my $HELP_FILE = "SetConfig_EnvVar.help";

pegasus-2.5.1-obz5119.patch:
 CmpiImpl.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5119.patch ---
--- pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp.obz5119	2006-01-30 11:18:00.000000000 -0500
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp	2006-06-07 15:13:01.000000000 -0400
@@ -1197,7 +1197,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 };
 
@@ -1386,7 +1386,7 @@
    CMPIString *s;
    d._data=getEnc()->ft->getKeyAt(getEnc(),(int)pos,&s,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 }
 
@@ -1710,7 +1710,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name= CmpiString(s);
    return d;
 }
 

pegasus-2.5.1-obz5180.patch:
 CIMOperationRequestDispatcher.cpp |   26 ++++++++++++++++++--------
 CIMOperationRequestDispatcher.h   |    2 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

--- NEW FILE pegasus-2.5.1-obz5180.patch ---
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz5180	2006-07-07 18:19:11.000000000 -0400
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp	2006-07-07 19:03:51.000000000 -0400
@@ -421,7 +421,18 @@
                                                 CIMResponseMessage *&response)
 {
     static const char func[] = "CIMOperationRequestDispatcher::_enqueueResponse";
-    AutoMutex autoMut(_mut);
+    // Obtain the _enqueueResponseMutex mutex for this chunked request.
+    // This mutex is used to serialize chunked responses from all incoming
+    // provider threads. It is imperative that the sequencing done by the
+    // resequenceResponse() method and the writing of the chunked response
+    // to the connection socket (done as a synchronous enqueue at the end
+    // of this method) are atomic to ensure that the chunk that is marked
+    // as isComplete for the overall response is indeed the last chunk
+    // returned to the client. See PEP 140 for details.
+    // This mutex was moved into the OperationAggregate class as part of
+    // bug 4629 because we only need to serialize on a per-request basis.
+    // This prevents serializing independent requests on separate connections.
+    AutoMutex autoMut(poA->_enqueueResponseMutex);
     Boolean isComplete = false;
 
     try
@@ -550,13 +561,6 @@
                 CIMException(CIM_ERR_FAILED, String(failMsg));
     }
 
-    if (isComplete == true)
-    {
-        // also deletes the copied request attached to it
-        delete poA;
-        poA = 0;
-    }
-
     // after sending, the response has been deleted externally
     response = 0;
 
@@ -1785,6 +1789,12 @@
     // the ENTIRE response to the request.
 
     isComplete = service->_enqueueResponse(poA, response);
+    if (isComplete)
+    {
+        // also deletes the copied request attached to it
+        delete poA;
+        poA = 0;
+    }
 
     PEG_METHOD_EXIT();
 }
--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h.obz5180	2006-02-10 14:13:47.000000000 -0500
+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h	2006-07-07 19:00:43.000000000 -0400
@@ -159,6 +159,7 @@
 */
 class PEGASUS_SERVER_LINKAGE OperationAggregate
 {
+   friend class CIMOperationRequestDispatcher;
 public:
     /* Operation Aggregate constructor.  Builds an aggregate
         object.
@@ -227,6 +228,7 @@
 
     Array<CIMResponseMessage*> _responseList;
     Mutex _appendResponseMutex;
+    Mutex _enqueueResponseMutex;
     CIMRequestMessage* _request;
     Uint32 _totalIssued;
     Uint32 _magicNumber;


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tog-pegasus.spec	31 May 2006 19:12:39 -0000	1.29
+++ tog-pegasus.spec	8 Jul 2006 00:08:01 -0000	1.30
@@ -31,7 +31,7 @@
 %define pegasus_uid	66
 
 Version: 		2.5.1
-Release: 		5%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		6%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -81,6 +81,11 @@
 Patch30:		pegasus-2.5.1-obz5059.patch
 Patch31:		pegasus-2.5.1-obz5072.patch
 Patch32:		pegasus-2.5.1-obz5083.patch
+Patch33:		pegasus-2.5.1-obz5115.patch
+Patch34:		pegasus-2.5.1-obz5119.patch
+Patch35:		pegasus-2.5.1-obz5073.patch
+Patch36:		pegasus-2.5.1-obz5090.patch
+Patch37:		pegasus-2.5.1-obz5180.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -169,6 +174,11 @@
 %patch30 -p1 -b .obz5059
 %patch31 -p1 -b .obz5072
 %patch32 -p1 -b .obz5083
+%patch33 -p1 -b .obz5115
+%patch34 -p1 -b .obz5119
+%patch35 -p1 -b .obz5073
+%patch36 -p1 -b .obz5090
+%patch37 -p1 -b .obz5180
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -308,7 +318,16 @@
 :;
 
 %changelog
-* Wed May 31 2006 JAson Vas Dias <jvdias at redhat.com> - 2:2.5.1-6
+* Fri Jul 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.4.1-6
+- More upstream 2.5.2_APPROVED bug fixes:
+  o 4629: Pegasus freezes when it is unable to send out completely, the results of a request
+  o 5073: Class Names on Reference, ReferenceNames, Assoc, AssocNames returned lower case
+  o 5090: cimserver crash on a request after attempting to unload idle CMPI providers
+  o 5119: memory leak in CMPI implementation
+  o 5115: fix SetConfig_EnvVar comments
+  o 5180: OperationAggregate deleted in _enqueueResponse while member mutex held
+
+* Wed May 31 2006 JAson Vas Dias <jvdias at redhat.com> - 2:2.5.1-5
 - Apply upstream patches for latest 2.5.2_APPROVED bugs:
   o 5046: cimprovider timeout needs to be increased
   o 5047: cimmof timeout needs to be increased



From fedora-cvs-commits at redhat.com  Sat Jul  8 01:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 21:07:04 -0400
Subject: rpms/freetype/devel freetype-2.2.1-enable-valid.patch, NONE,
	1.1 .cvsignore, 1.11, 1.12 freetype.spec, 1.29, 1.30 sources,
	1.11, 1.12 freetype-1.4-ac25.patch, 1.1,
	NONE freetype-1.4-disable-ft1-bci.patch, 1.2,
	NONE freetype-1.4-gcc33.patch, 1.1,
	NONE freetype-2.1.10-cvsfixes.patch, 1.1,
	NONE freetype-2.1.10-fixaliasing.patch, 1.1,
	NONE freetype-2.1.10-fixautofit.patch, 1.1,
	NONE freetype-2.1.10-fixkerning.patch, 1.1,
	NONE freetype-2.1.10-memleak.patch, 1.1,
	NONE freetype-2.1.10-xorgfix.patch, 1.1,
	NONE freetype-2.1.3-enable-ft2-bci.patch, 1.1,
	NONE freetype-2.1.9-lib64-fix.patch, 1.1, NONE
Message-ID: <200607080107.k68174eH027920@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27904

Modified Files:
	.cvsignore freetype.spec sources 
Added Files:
	freetype-2.2.1-enable-valid.patch 
Removed Files:
	freetype-1.4-ac25.patch freetype-1.4-disable-ft1-bci.patch 
	freetype-1.4-gcc33.patch freetype-2.1.10-cvsfixes.patch 
	freetype-2.1.10-fixaliasing.patch 
	freetype-2.1.10-fixautofit.patch 
	freetype-2.1.10-fixkerning.patch freetype-2.1.10-memleak.patch 
	freetype-2.1.10-xorgfix.patch 
	freetype-2.1.3-enable-ft2-bci.patch 
	freetype-2.1.9-lib64-fix.patch 
Log Message:
- Remove upstreamed patches
- Update to 2.2.1
- Remove FreeType 1, to move to extras
- Install new demos ftbench, ftchkwd, ftgamma, and ftvalid
- Enable modules gxvalid and otvalid


freetype-2.2.1-enable-valid.patch:
 modules.cfg |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE freetype-2.2.1-enable-valid.patch ---
--- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
@@ -110,7 +110,7 @@
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
@@ -124,7 +124,7 @@
 
 # OpenType table validation.  Needs ftotval.c below.
 #
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
 
 # Auxiliary PostScript driver component to share common code.
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2005 18:34:21 -0000	1.11
+++ .cvsignore	8 Jul 2006 01:07:01 -0000	1.12
@@ -1,7 +1,3 @@
-freetype-2.1.9.tar.bz2
-freetype-pre1.4.tar.bz2
-ft2demos-2.1.9.tar.bz2
-ftdocs-2.1.9.tar.bz2
-freetype-2.1.10.tar.bz2
-freetype-doc-2.1.10.tar.bz2
-ft2demos-2.1.10.tar.bz2
+freetype-2.2.1.tar.bz2
+ft2demos-2.2.1.tar.bz2
+freetype-doc-2.2.1.tar.bz2


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- freetype.spec	17 May 2006 14:35:22 -0000	1.29
+++ freetype.spec	8 Jul 2006 01:07:01 -0000	1.30
@@ -1,86 +1,50 @@
-# Disables freetype 1 and 2 bytecode interpreter.  Setting to 0 enables
-# the bytecode interpreter in both freetype 1 and 2.
+# Disables patented bytecode interpreter.  Setting to 0 enables
+# the bytecode interpreter.
 %define without_bytecode_interpreter    1
 
-%define with_freetype1	1
-
-%define ft1 freetype-pre1.4
-
 %{!?with_xfree86:%define with_xfree86 1}
 
-Summary: A free and portable TrueType font rendering engine.
+Summary: A free and portable font rendering engine.
 Name: freetype
-Version: 2.1.10
-Release: 6
+Version: 2.2.1
+Release: 1
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
 Source:  freetype-%{version}.tar.bz2
 Source1: freetype-doc-%{version}.tar.bz2
 Source2: ft2demos-%{version}.tar.bz2
-Source3: %{ft1}.tar.bz2
 
-# Fix build of freetype-1.4 with gcc 3.3
-Patch3: freetype-1.4-ac25.patch
-Patch4: freetype-1.4-gcc33.patch
 # Add -lm when linking X demos
 Patch5: ft2demos-2.1.9-mathlib.patch
 Patch20:  freetype-2.1.10-enable-ft2-bci.patch
-Patch21:  freetype-1.4-disable-ft1-bci.patch
 
-# CVS bug fixes, mostly for embolding
-Patch40:  freetype-2.1.10-cvsfixes.patch
-# put back internal API, used by xorg 
-Patch41:  freetype-2.1.10-xorgfix.patch
-# fix autofit render setup
-Patch42:  freetype-2.1.10-fixautofit.patch
-# fix memleak
-Patch43:  freetype-2.1.10-memleak.patch
-# fix kerning wrongly disabled
-Patch44:  freetype-2.1.10-fixkerning.patch
-# fix bad anti-aliasing 
-Patch45:  freetype-2.1.10-fixaliasing.patch
+# Enable otvalid and gxvalid modules
+Patch46:  freetype-2.2.1-enable-valid.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake autoconf >= 2.59 libtool symlinks zlib-devel gettext
 BuildRequires: libX11-devel, libICE-devel, libSM-devel
 
 %description
-The FreeType engine is a free and portable TrueType font rendering
-engine, developed to provide TrueType support for a variety of
+The FreeType engine is a free and portable font rendering
+engine, developed to provide advanced font support for a variety of
 platforms and environments. FreeType is a library which can open and
 manages font files as well as efficiently load, hint and render
 individual glyphs. FreeType is not a font server or a complete
 text-rendering library.
 
 
-%if %{with_freetype1}
-%package utils
-Summary: A collection of FreeType utilities.
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description utils
-The FreeType engine is a free and portable TrueType font rendering
-engine, developed to provide TrueType support for a variety of
-platforms and environments. FreeType is a library which can open and
-manages font files as well as efficiently load, hint and render
-individual glyphs. FreeType is not a font server or a complete
-text-rendering library.
-%endif
-
 %package demos
 Summary: A collection of FreeType demos.
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description demos
-The FreeType engine is a free and portable TrueType font rendering
-engine, developed to provide TrueType support for a variety of
-platforms and environments. FreeType is a library which can open and
-manages font files as well as efficiently load, hint and render
-individual glyphs. FreeType is not a font server or a complete
-text-rendering library.
+The FreeType engine is a free and portable font rendering
+engine, developed to provide advanced font support for a variety of
+platforms and environments.  The demos package includes a set of useful
+small utilities showing various capabilities of the FreeType library.
 
 
 %package devel
@@ -90,27 +54,15 @@
 Requires: zlib-devel
 
 %description devel
-The FreeType engine is a free and portable TrueType font rendering
-engine, developed to provide TrueType support for a variety of
-platforms and environments. FreeType is a library which can open and
-manages font files as well as efficiently load, hint and render
-individual glyphs. FreeType is not a font server or a complete
-text-rendering library.
+The freetype-devel package includes the static libraries and header files
+for the FreeType font rendering engine.
 
+Install freetype-devel if you want to develop programs which will use
+FreeType.
 
-%prep
-%setup -q -b 1 -a 2 -a 3
 
-%if %{with_freetype1}
-pushd %{ft1}
-%patch3   -p1 -b .ac25
-%patch4   -p1 -b .gcc33
-
-%if %{without_bytecode_interpreter}
-%patch21  -p1 -b .disable-ft1-bci
-%endif
-popd
-%endif
+%prep
+%setup -q -b 1 -a 2
 
 pushd ft2demos-%{version}
 %patch5 -p1 -b .mathlib
@@ -120,27 +72,7 @@
 %patch20  -p1 -b .enable-ft2-bci
 %endif
 
-# Need to update libtool to get deplibs right for x86_64
-pushd builds/unix
-libtoolize --force
-aclocal
-autoconf
-popd
-
-pushd %{ft1}
-libtoolize --force
-aclocal
-autoconf
-popd
-
-# Assorted fixes for 2.1.10 (thanks to Frederic Crozat)
-%patch40 -p1 -b .cvsfixes
-%patch41 -p1 -b .xorgfix
-%patch42 -p1 -b .fixautofit
-%patch43 -p1 -b .memleak
-%patch44 -p1 -b .fixkerning
-%patch45 -p1 -b .fixaliasing
-
+%patch46  -p1 -b .enable-valid
 
 %build
 # Work around code generation problem with strict-aliasing
@@ -155,24 +87,6 @@
   make %{?_smp_mflags}
 }
 
-%if %{with_freetype1}
-# Build Freetype 1.4
-{
-  pushd %{ft1}
-  %configure --disable-debug --enable-static --enable-shared \
-             --with-locale-dir=%{_datadir}/locale
-  make
-
-  # Absolute symlinks in the debug output break debuginfo, 
-  # so use 'symlinks' to relativize and shorten; takes
-  # two passes because 'symlinks' is stupid.
-  symlinks -r -c . > /dev/null
-  symlinks -r -s -c . > /dev/null
-
-  popd
-}
-%endif
-
 %if %{with_xfree86}
 # Build freetype 2 demos
 {
@@ -189,24 +103,11 @@
 # Install Freetype 2
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
-%if %{with_freetype1}
-# Install Freetype 1
-{
-  pushd %{ft1}
-  %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
-  libtool --finish $RPM_BUILD_ROOT%{_libdir}
-  popd
-}
-%endif
-%if %{with_freetype1}
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/freetype1
-mv $RPM_BUILD_ROOT/%{_includedir}/freetype $RPM_BUILD_ROOT/%{_includedir}/freetype1
-%endif
-
 %if %{with_xfree86}
 # Install freetype 2 demos
 {
-  for ftdemo in ftdump ftlint ftmemchk ftmulti ftstring fttimer ftview ;do
+  for ftdemo in ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer 
+		ftvalid ftview ;do
       libtool install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
@@ -234,30 +135,17 @@
 %defattr(-,root,root)
 %{_libdir}/libfreetype.so.*
 %doc ChangeLog README
-%if %{with_freetype1}
-%{_libdir}/libttf.so.*
-%doc %{ft1}/README %{ft1}/announce docs
-%endif
-
-%if %{with_freetype1}
-%files utils
-%defattr(-,root,root)
-# 2.0.4 version included in demos package now
-#%{_bindir}/ftdump
-# 2.0.4 version included in demos package now
-#%{_bindir}/ftlint
-%{_bindir}/fterror
-%{_bindir}/ftmetric
-%{_bindir}/ftsbit
-%{_bindir}/ftstrpnm
-%endif
 
 %files demos
 %defattr(-,root,root)
+%{_bindir}/ftbench
+%{_bindir}/ftchkwd
 %{_bindir}/ftdump
 %{_bindir}/ftlint
-%if %{with_xfree86}
 %{_bindir}/ftmemchk
+%{_bindir}/ftvalid
+%if %{with_xfree86}
+%{_bindir}/ftgamma
 %{_bindir}/ftmulti
 %{_bindir}/ftstring
 %{_bindir}/fttimer
@@ -266,19 +154,10 @@
 
 %files devel
 %defattr(-,root,root)
-%if %{with_freetype1}
-%dir %{_includedir}/freetype1
-%{_includedir}/freetype1/*
-%endif
 %dir %{_includedir}/freetype2
 %{_datadir}/aclocal/freetype2.m4
 %{_includedir}/freetype2/*
 %{_includedir}/*.h
-%if %{with_freetype1}
-%{_libdir}/libttf.a
-%{_libdir}/libttf.la
-%{_libdir}/libttf.so
-%endif
 %{_libdir}/libfreetype.a
 %{_libdir}/libfreetype.la
 %{_libdir}/libfreetype.so
@@ -286,6 +165,12 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Fri Jul 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-1
+- Update to 2.2.1
+- Remove FreeType 1, to move to extras
+- Install new demos ftbench, ftchkwd, ftgamma, and ftvalid
+- Enable modules gxvalid and otvalid
+
 * Wed May 17 2006 Karsten Hopp <karsten at redhat.de> 2.1.10-6
 - add buildrequires libICE-devel, libSM-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2005 18:34:22 -0000	1.11
+++ sources	8 Jul 2006 01:07:01 -0000	1.12
@@ -1,4 +1,3 @@
-609f25b80f9e2c25349127813e10386c  freetype-pre1.4.tar.bz2
-a4012e7d1f6400df44a16743b11b8423  freetype-2.1.10.tar.bz2
-10608a55ee9ee12e29ba3d705318e61d  freetype-doc-2.1.10.tar.bz2
-4edaff5721fedcf1932e76935f3029b3  ft2demos-2.1.10.tar.bz2
+5b2f827082c544392a7701f7423f0781  freetype-2.2.1.tar.bz2
+64f5fa4425cd8241b130c0be35ba6760  ft2demos-2.2.1.tar.bz2
+27bcd2540702afe6753c9fd74670f617  freetype-doc-2.2.1.tar.bz2


--- freetype-1.4-ac25.patch DELETED ---


--- freetype-1.4-disable-ft1-bci.patch DELETED ---


--- freetype-1.4-gcc33.patch DELETED ---


--- freetype-2.1.10-cvsfixes.patch DELETED ---


--- freetype-2.1.10-fixaliasing.patch DELETED ---


--- freetype-2.1.10-fixautofit.patch DELETED ---


--- freetype-2.1.10-fixkerning.patch DELETED ---


--- freetype-2.1.10-memleak.patch DELETED ---


--- freetype-2.1.10-xorgfix.patch DELETED ---


--- freetype-2.1.3-enable-ft2-bci.patch DELETED ---


--- freetype-2.1.9-lib64-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul  8 01:35:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 21:35:33 -0400
Subject: rpms/freetype/devel freetype.spec,1.30,1.31
Message-ID: <200607080135.k681ZX7k028315@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28142

Modified Files:
	freetype.spec 
Log Message:
Fix shell syntax error and remove the lang install stuff that were only
used for the freetype 1 lib.



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- freetype.spec	8 Jul 2006 01:07:01 -0000	1.30
+++ freetype.spec	8 Jul 2006 01:35:28 -0000	1.31
@@ -106,13 +106,11 @@
 %if %{with_xfree86}
 # Install freetype 2 demos
 {
-  for ftdemo in ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer 
-		ftvalid ftview ;do
-      libtool install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
+  for ftdemo in ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview ; do
+      libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
 %endif
-%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,7 +129,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %{_libdir}/libfreetype.so.*
 %doc ChangeLog README



From fedora-cvs-commits at redhat.com  Sat Jul  8 02:10:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 22:10:36 -0400
Subject: rpms/freetype/devel freetype.spec,1.31,1.32
Message-ID: <200607080210.k682AalS020032@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19981

Modified Files:
	freetype.spec 
Log Message:
* Fri Jul 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-2
- Remove unused BuildRequires



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- freetype.spec	8 Jul 2006 01:35:28 -0000	1.31
+++ freetype.spec	8 Jul 2006 02:10:31 -0000	1.32
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine.
 Name: freetype
 Version: 2.2.1
-Release: 1
+Release: 2
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -23,8 +23,6 @@
 Patch46:  freetype-2.2.1-enable-valid.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake autoconf >= 2.59 libtool symlinks zlib-devel gettext
-BuildRequires: libX11-devel, libICE-devel, libSM-devel
 
 %description
 The FreeType engine is a free and portable font rendering
@@ -107,7 +105,7 @@
 # Install freetype 2 demos
 {
   for ftdemo in ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview ; do
-      libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
+      builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
   done
 }
 %endif
@@ -163,6 +161,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Fri Jul 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-2
+- Remove unused BuildRequires
+
 * Fri Jul 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-1
 - Update to 2.2.1
 - Remove FreeType 1, to move to extras



From fedora-cvs-commits at redhat.com  Sat Jul  8 02:20:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 22:20:12 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.294,1.295
Message-ID: <200607080220.k682KCSX005581@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
Re-add s390.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- eclipse.spec	6 Jul 2006 18:22:19 -0000	1.294
+++ eclipse.spec	8 Jul 2006 02:20:09 -0000	1.295
@@ -162,7 +162,7 @@
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.28-1jpp
 #FIXME
-%ifnarch ppc64 s390 s390x
+%ifnarch ppc64 s390x
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
 BuildRequires: tomcat5 >= 5.5.17
@@ -229,7 +229,7 @@
 #Requires: ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 #FIXME
-%ifnarch ppc64 s390 s390x
+%ifnarch ppc64 s390x
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 Requires: mx4j >= 2.1
 Requires: tomcat5 >= 5.5.17
@@ -397,7 +397,7 @@
 %patch24 -p0
 popd
 
-%ifnarch ppc64 s390 s390x
+%ifnarch ppc64 s390x
 # tomcat patches
 pushd plugins/org.eclipse.tomcat
 %patch28 -p0
@@ -580,7 +580,7 @@
 rm com.jcraft.jsch_*.jar
 popd
 
-%ifnarch ppc64 s390 s390x
+%ifnarch ppc64 s390x
 ## BEGIN TOMCAT ##
 rm plugins/org.eclipse.tomcat/commons-beanutils.jar
 rm plugins/org.eclipse.tomcat/commons-collections.jar
@@ -1066,7 +1066,7 @@
 #rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 #ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 
-%ifnarch ppc64 s390 s390x
+%ifnarch ppc64 s390x
 ## BEGIN TOMCAT ##
 TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
 mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
@@ -1593,7 +1593,7 @@
 %{_libdir}/gcj/%{name}/jsp.jar*
 %{_libdir}/gcj/%{name}/parser.jar*
 # FIXME: take this out when tomcat is built on these arches
-%ifarch ppc64 s390 s390x
+%ifarch ppc64 s390x
 %{_libdir}/gcj/%{name}/bootstrap.jar*
 %{_libdir}/gcj/%{name}/catalina.jar*
 %{_libdir}/gcj/%{name}/commons-beanutils.jar*
@@ -1632,7 +1632,7 @@
 
 %changelog
 * Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
-- Temporarily add webapp patch for ppc64, s390, and s390x.
+- Temporarily add webapp patch for ppc64 and s390x.
 - Bump tomcat5 to 5.5.17 both in BR/R and in patches.
 
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc



From fedora-cvs-commits at redhat.com  Sat Jul  8 03:35:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 7 Jul 2006 23:35:16 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 xorg-x11-drv-i810.spec, 1.19, 1.20
Message-ID: <200607080335.k683ZG99000562@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-6.modeset20060707 on branch devel from xorg-x11-drv-i810-1.6.0-6.modeset20060707.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 03:19:10 -0000	1.8
+++ .cvsignore	8 Jul 2006 03:35:06 -0000	1.9
@@ -1 +1 @@
-xf86-video-i810-1.6.0.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 03:19:10 -0000	1.8
+++ sources	8 Jul 2006 03:35:06 -0000	1.9
@@ -1 +1 @@
-0d3db819b9617a576927fd1aebe5ab81  xf86-video-i810-1.6.0.tar.bz2
+99af7eb02cbda6b8269d2a48b435370b  xf86-video-intel-1.6.0-git-modesetting-20060707.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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-i810.spec	7 Jul 2006 23:55:50 -0000	1.19
+++ xorg-x11-drv-i810.spec	8 Jul 2006 03:35:06 -0000	1.20
@@ -2,29 +2,30 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvsYYYYMMDD
-
 %ifarch %{ix86} x86_64 ia64
 %define with_dri        1
 %else
 %define with_dri        0
 %endif
 
+# GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   6
+Release:   6.modeset20060707
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
 Source1:   i810.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
+BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2
 BuildRequires: libXvMC-devel
 %if %{with_dri}
@@ -32,9 +33,7 @@
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
-
-#Patch0: more-libcunwrap.patch
+Requires:  xorg-x11-server-Xorg >= 1.1.0-1
 
 %description 
 X.Org X11 i810 video driver.
@@ -48,12 +47,13 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-
-#%patch0 -p1 -b .more-libcunwrap
+#%setup -q -n %{tarball}-%{version}
+%setup -q -n xf86-video-intel
 
 %build
-%configure --disable-static \
+./autogen.sh --disable-static \
+           --libdir=%{_libdir} \
+           --mandir=%{_mandir} \
 %if %{with_dri}
            --enable-dri
 %else
@@ -95,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6.modeset20060707
+- Snapshot of the git modesetting branch.
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6
 - Update i810.xinf to include entries for E7221 and 945GM.
 



From fedora-cvs-commits at redhat.com  Sat Jul  8 07:36:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 03:36:49 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.109,1.110
Message-ID: <200607080736.k687anbB004554@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Sat Jul  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-27%{dist}
- Enable TLS for GLX to match the mesa build config.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- xorg-x11-server.spec	7 Jul 2006 06:06:37 -0000	1.109
+++ xorg-x11-server.spec	8 Jul 2006 07:36:46 -0000	1.110
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   26%{dist}
+Release:   27%{dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -356,6 +356,7 @@
 	--with-fontdir=%(pkg-config --variable=fontdir fontutil) \
 %if %{with_dri}
 	--enable-dri \
+	--enable-glx-tls \
 	--with-mesa-source=%{_datadir}/mesa/source \
 	--with-dri-driver-path=%{drimoduledir} \
 %else
@@ -653,6 +654,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sat Jul  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-27%{dist}
+- Enable TLS for GLX to match the mesa build config.
+
 * Fri Jul  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-26
 - Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
   GLX_MESA_copy_sub_buffer extension.



From fedora-cvs-commits at redhat.com  Sat Jul  8 08:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 04:12:01 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.89,1.90
Message-ID: <200607080812.k688C1vN030228@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdepim.spec 
Log Message:
crypto/certificate manager support



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdepim.spec	6 Jul 2006 13:17:57 -0000	1.89
+++ kdepim.spec	8 Jul 2006 08:11:54 -0000	1.90
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 4
+Release: 5
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -66,40 +66,6 @@
 %description
 A PIM (Personal Information Manager) for KDE.
 
-%package pilot
-Summary: KDE support for synchronizing data with a Palm(tm) or compatible PDA
-Group: Applications/Productivity
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description pilot
-KDE support for synchronizing data with a Palm(tm) or compatible PDA.
-
-%package cellphone
-Summary: KDE support for synchronizing data with cellphones
-Group: Applications/Productivity
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description cellphone
-KDE support for synchronizing data with cellphones.
-Install %{name}-cellphone if you want to use %{name} and have a cellphone.
-
-%package -n karm
-Summary: Time tracking tool
-Group: Applications/Productivity
-
-%description -n karm
-KArm - Punjambi language for "work" - tracks time spent on various tasks.
-It is useful for tracking hours to be billed to different clients.
-
-%package -n knotes
-Summary: Post-It notes on the desktop
-Group: Applications/Productivity
-
-%description -n knotes
-KNotes allows you to place Post-It notes on your desktop.
-In addition to serving as a reminder, KNotes can mail and print your notes,
-and accept drag and drop even from remote sites.
-
 %package devel
 Summary: Development files for kdepim
 Group: Development/Libraries
@@ -155,6 +121,7 @@
 %endif
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \
+   --with-gpgsm=%{_bindir}/gpgsm \
    --with-sasl
 
 make %{?_smp_mflags}
@@ -224,6 +191,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Sat Jul 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
+- fix #136533, crypto/certificate manager support
+
 * Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - apply upstream patches,
    fix bugs: 110487, 118112, 119112, 121384, 127210, 130303



From fedora-cvs-commits at redhat.com  Sat Jul  8 12:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 08:13:30 -0400
Subject: rpms/kernel/devel ipsec-autolabel-42.patch, NONE,
	1.1.2.1 ipsec-bugfix-42.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.2293.2.6, 1.2293.2.7
Message-ID: <200607081213.k68CDUDm001067@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	ipsec-autolabel-42.patch ipsec-bugfix-42.patch 
Log Message:
* Sat Jul  8 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 43, add autolabel & bugfix patches from Venkat


ipsec-autolabel-42.patch:
 include/linux/security.h        |   19 ++++++++++++++++---
 include/net/xfrm.h              |    2 +-
 net/key/af_key.c                |   15 +++++++++++----
 net/xfrm/xfrm_state.c           |    2 +-
 net/xfrm/xfrm_user.c            |   13 +++++++++++--
 security/dummy.c                |    3 ++-
 security/selinux/include/xfrm.h |    3 ++-
 security/selinux/xfrm.c         |   31 ++++++++++++++++++++++---------
 8 files changed, 66 insertions(+), 22 deletions(-)

--- NEW FILE ipsec-autolabel-42.patch ---
>From vyekkirala at trustedcs.com Thu Jul  6 16:58:29 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 16:59:16 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66KxFel011586;
	Thu, 6 Jul 2006 16:59:15 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66KxEot024777;
	Thu, 6 Jul 2006 16:59:14 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k66Kx9gm026528;
	Thu, 6 Jul 2006 16:59:09 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 674B772FC2; Thu,  6 Jul 2006 16:59:09 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k66Kx7AJ020079 for <redhat-lspp at listman.util.phx.redhat.com>;
	Thu, 6 Jul 2006 16:59:07 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k66Kwu55024712; Thu, 6 Jul 2006 16:58:56 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k66Kwt0S011228; Thu, 6 Jul 2006 16:58:55 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k66KwhKg007649;
	Thu, 6 Jul 2006 16:58:43 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Thu Jul  6 16:58:31 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 <B44ad79770000>; Thu, 06 Jul 2006 16:58:31 -0400
Received: from [10.1.10.204] (VYEKKIRALA-PC [10.1.10.204]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id N4CXJN7F; Thu, 6 Jul 2006 16:58:30 -0400
Message-ID: <44AD7975.5090100 at trustedcs.com>
Date: Thu, 06 Jul 2006 15:58:29 -0500
From: Venkat Yekkirala <vyekkirala at trustedcs.com>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: redhat-lspp at redhat.com,
 jmorris at redhat.com,
 latten at austin.ibm.com,
 sds at tycho.nsa.gov,
 tjaeger at cse.psu.edu
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-loop: redhat-lspp at redhat.com
Cc: 
Subject: [redhat-lspp] [RFC][PATCH 3] MLSXFRM: Auto-labeling of
	socket-specifc IPSec policy
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-UID: 73467
X-Length: 13636

This patch automatically labels IPSec policy set on a socket to be
the same as the label of the socket. This would enable applications
that set IPSec policy on their sockets to run without having to be modified
to pass the security context along with the IPSec policy rule.

The next patch will cover auto-labeling of TCP child sockets.

---
 include/linux/security.h        |   19 +++++++++++++++---
 include/net/xfrm.h              |    2 -
 net/key/af_key.c                |   15 ++++++++++----
 net/xfrm/xfrm_state.c           |    2 -
 net/xfrm/xfrm_user.c            |   13 ++++++++++--
 security/dummy.c                |    3 +-
 security/selinux/include/xfrm.h |    3 +-
 security/selinux/xfrm.c         |   31 +++++++++++++++++++++---------
 8 files changed, 66 insertions(+), 22 deletions(-)

--- linux-2.6.17.i686.patch11.2/include/linux/security.h	2006-07-05 14:51:16.000000000 -0500
+++ linux-2.6.17.i686/include/linux/security.h	2006-07-06 10:33:07.000000000 -0500
@@ -809,8 +809,10 @@ struct swap_info_struct;
  *	used by the XFRM system.
  *	@sec_ctx contains the security context information being provided by
  *	the user-level policy update program (e.g., setkey).
+ *	@sk refers to the sock from which to derive the security context.
  *	Allocate a security structure to the xp->security field; the security
- *	field is initialized to NULL when the xfrm_policy is allocated.
+ *	field is initialized to NULL when the xfrm_policy is allocated. Only
+ *	one of sec_ctx or sock can be specified.
  *	Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *	@old contains an existing xfrm_policy in the SPD.
@@ -1318,7 +1320,8 @@ struct security_operations {
 #endif	/* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-	int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
+	int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp,
+			struct xfrm_user_sec_ctx *sec_ctx, struct sock *sk);
 	int (*xfrm_policy_clone_security) (struct xfrm_policy *old, struct xfrm_policy *new);
 	void (*xfrm_policy_free_security) (struct xfrm_policy *xp);
 	int (*xfrm_state_alloc_security) (struct xfrm_state *x,
@@ -2959,7 +2962,12 @@ static inline void security_sk_sid(struc
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
 {
-	return security_ops->xfrm_policy_alloc_security(xp, sec_ctx);
+	return security_ops->xfrm_policy_alloc_security(xp, sec_ctx, NULL);
+}
+
+static inline int security_xfrm_sock_policy_alloc(struct xfrm_policy *xp, struct sock *sk)
+{
+	return security_ops->xfrm_policy_alloc_security(xp, NULL, sk);
 }
 
 static inline int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new)
@@ -3020,6 +3028,11 @@ static inline int security_xfrm_policy_a
 	return 0;
 }
 
+static inline int security_xfrm_sock_policy_alloc(struct xfrm_policy *xp, struct sock *sk)
+{
+	return 0;
+}
+
 static inline int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new)
 {
 	return 0;
--- linux-2.6.17.i686.patch11.2/include/net/xfrm.h	2006-07-06 09:49:35.000000000 -0500
+++ linux-2.6.17.i686/include/net/xfrm.h	2006-07-06 09:51:07.000000000 -0500
@@ -353,7 +353,7 @@ struct xfrm_mgr
 	char			*id;
 	int			(*notify)(struct xfrm_state *x, struct km_event *c);
 	int			(*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
-	struct xfrm_policy	*(*compile_policy)(u16 family, int opt, u8 *data, int len, int *dir);
+	struct xfrm_policy	*(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
 	int			(*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);
 	int			(*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
 };
--- linux-2.6.17.i686.patch11.2/security/dummy.c	2006-07-06 11:01:07.000000000 -0500
+++ linux-2.6.17.i686/security/dummy.c	2006-07-06 11:00:53.000000000 -0500
@@ -799,7 +799,8 @@ static inline void dummy_sk_getsid(struc
 #endif	/* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-static int dummy_xfrm_policy_alloc_security(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
+static int dummy_xfrm_policy_alloc_security(struct xfrm_policy *xp,
+		struct xfrm_user_sec_ctx *sec_ctx, struct sock *sk)
 {
 	return 0;
 }
--- linux-2.6.17.i686.patch11.2/security/selinux/include/xfrm.h	2006-07-05 14:44:23.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/include/xfrm.h	2006-07-06 10:49:09.000000000 -0500
@@ -7,7 +7,8 @@
 #ifndef _SELINUX_XFRM_H_
 #define _SELINUX_XFRM_H_
 
-int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
+int selinux_xfrm_policy_alloc(struct xfrm_policy *xp,
+		struct xfrm_user_sec_ctx *sec_ctx, struct sock *sk);
 int selinux_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new);
 void selinux_xfrm_policy_free(struct xfrm_policy *xp);
 int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx,
--- linux-2.6.17.i686.patch11.2/security/selinux/xfrm.c	2006-07-05 14:44:23.000000000 -0500
+++ linux-2.6.17.i686/security/selinux/xfrm.c	2006-07-06 15:28:53.000000000 -0500
@@ -209,8 +209,8 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	BUG_ON(uctx && pol);
 
-	if (pol)
-		goto from_policy;
+	if (!uctx)
+		goto not_from_user;
 
 	BUG_ON(!uctx);
 
@@ -255,11 +255,14 @@ static int selinux_xfrm_sec_ctx_alloc(st
 
 	return rc;
 
-from_policy:
-	BUG_ON(!pol);
-	rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
-	if (rc)
-		goto out;
+not_from_user:
+	if (pol) {
+		rc = security_sid_mls_copy(pol->ctx_sid, sid, &ctx_sid);
+		if (rc)
+			goto out;
+	}
+	else
+		ctx_sid = sid;
 
 	rc = security_sid_to_context(ctx_sid, &ctx_str, &str_len);
 	if (rc)
@@ -296,13 +299,23 @@ out:
  * LSM hook implementation that allocs and transfers uctx spec to
  * xfrm_policy.
  */
-int selinux_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *uctx)
+int selinux_xfrm_policy_alloc(struct xfrm_policy *xp,
+		struct xfrm_user_sec_ctx *uctx, struct sock *sk)
 {
 	int err;
+	u32 sid;
 
 	BUG_ON(!xp);
+	BUG_ON(uctx && sk);
+
+	if (sk) {
+		struct sk_security_struct *ssec = sk->sk_security;
+		sid = ssec->sid;
+	}
+	else
+		sid = SECSID_NULL;
 
-	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, 0);
+	err = selinux_xfrm_sec_ctx_alloc(&xp->security, uctx, NULL, sid);
 	return err;
 }
 
--- linux-2.6.17.i686.patch11.2/net/key/af_key.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/net/key/af_key.c	2006-07-06 11:06:17.000000000 -0500
@@ -2839,14 +2839,14 @@ static int pfkey_send_acquire(struct xfr
 	return pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_REGISTERED, NULL);
 }
 
-static struct xfrm_policy *pfkey_compile_policy(u16 family, int opt,
+static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt,
                                                 u8 *data, int len, int *dir)
 {
 	struct xfrm_policy *xp;
 	struct sadb_x_policy *pol = (struct sadb_x_policy*)data;
 	struct sadb_x_sec_ctx *sec_ctx;
 
-	switch (family) {
+	switch (sk->sk_family) {
 	case AF_INET:
 		if (opt != IP_IPSEC_POLICY) {
 			*dir = -EOPNOTSUPP;
@@ -2887,7 +2887,7 @@ static struct xfrm_policy *pfkey_compile
 	xp->lft.hard_byte_limit = XFRM_INF;
 	xp->lft.soft_packet_limit = XFRM_INF;
 	xp->lft.hard_packet_limit = XFRM_INF;
-	xp->family = family;
+	xp->family = sk->sk_family;
 
 	xp->xfrm_nr = 0;
 	if (pol->sadb_x_policy_type == IPSEC_POLICY_IPSEC &&
@@ -2903,8 +2903,10 @@ static struct xfrm_policy *pfkey_compile
 		p += pol->sadb_x_policy_len*8;
 		sec_ctx = (struct sadb_x_sec_ctx *)p;
 		if (len < pol->sadb_x_policy_len*8 +
-		    sec_ctx->sadb_x_sec_len)
+		    sec_ctx->sadb_x_sec_len) {
+			*dir = -EINVAL;
 			goto out;
+		}
 		if ((*dir = verify_sec_ctx_len(p)))
 			goto out;
 		uctx = pfkey_sadb2xfrm_user_sec_ctx(sec_ctx);
@@ -2914,6 +2916,11 @@ static struct xfrm_policy *pfkey_compile
 		if (*dir)
 			goto out;
 	}
+	else {
+		*dir = security_xfrm_sock_policy_alloc(xp, sk);
+		if (*dir)
+			goto out;
+	}
 
 	*dir = pol->sadb_x_policy_dir-1;
 	return xp;
--- linux-2.6.17.i686.patch11.2/net/xfrm/xfrm_state.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_state.c	2006-07-06 09:51:22.000000000 -0500
@@ -1025,7 +1025,7 @@ int xfrm_user_policy(struct sock *sk, in
 	err = -EINVAL;
 	read_lock(&xfrm_km_lock);
 	list_for_each_entry(km, &xfrm_km_list, list) {
-		pol = km->compile_policy(sk->sk_family, optname, data,
+		pol = km->compile_policy(sk, optname, data,
 					 optlen, &err);
 		if (err >= 0)
 			break;
--- linux-2.6.17.i686.patch11.2/net/xfrm/xfrm_user.c	2006-07-05 14:38:51.000000000 -0500
+++ linux-2.6.17.i686/net/xfrm/xfrm_user.c	2006-07-06 13:46:13.000000000 -0500
@@ -1750,7 +1750,7 @@ static int xfrm_send_acquire(struct xfrm
 /* User gives us xfrm_user_policy_info followed by an array of 0
  * or more templates.
  */
-static struct xfrm_policy *xfrm_compile_policy(u16 family, int opt,
+static struct xfrm_policy *xfrm_compile_policy(struct sock *sk, int opt,
 					       u8 *data, int len, int *dir)
 {
 	struct xfrm_userpolicy_info *p = (struct xfrm_userpolicy_info *)data;
@@ -1758,7 +1758,7 @@ static struct xfrm_policy *xfrm_compile_
 	struct xfrm_policy *xp;
 	int nr;
 
-	switch (family) {
+	switch (sk->sk_family) {
 	case AF_INET:
 		if (opt != IP_XFRM_POLICY) {
 			*dir = -EOPNOTSUPP;
@@ -1800,6 +1800,15 @@ static struct xfrm_policy *xfrm_compile_
 	copy_from_user_policy(xp, p);
 	copy_templates(xp, ut, nr);
 
+	if (!xp->security) {
+		int err = security_xfrm_sock_policy_alloc(xp, sk);
+		if (err) {
+			kfree(xp);
+			*dir = err;
+			return NULL;
+		}
+	}
+
 	*dir = p->dir;
 
 	return xp;

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


ipsec-bugfix-42.patch:
 include/linux/security.h |    2 ++
 security/selinux/xfrm.c  |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ipsec-bugfix-42.patch ---
>From vyekkirala at trustedcs.com Fri Jul  7 19:42:24 2006
Return-Path: <redhat-lspp-bounces at redhat.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Fri, 07 Jul 2006 19:43:48 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k67NhlKS016627;
	Fri, 7 Jul 2006 19:43:47 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k67NhkW0010756;
	Fri, 7 Jul 2006 19:43:46 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k67Nhfoe021242;
	Fri, 7 Jul 2006 19:43:41 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 7A861731FE; Fri,  7 Jul 2006 19:43:37 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k67NhZXm020572 for <redhat-lspp at listman.util.phx.redhat.com>;
	Fri, 7 Jul 2006 19:43:35 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k67NhO9b010722; Fri, 7 Jul 2006 19:43:24 -0400
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [65.127.223.133])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k67NhMMZ029438; Fri, 7 Jul 2006 19:43:23 -0400
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k67NgoDE024320;
	Fri, 7 Jul 2006 19:42:50 -0400 (EDT)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Fri Jul  7 19:42:34 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 <B44aef16a0000>; Fri, 07 Jul 2006 19:42:34 -0400
Received: from [10.1.10.204] (VYEKKIRALA-PC [10.1.10.204]) by
	chaos.tcs.tcs-sec.com with SMTP (Microsoft Exchange Internet
	Mail Service Version 5.5.2653.13)
	id N4CXJ399; Fri, 7 Jul 2006 19:42:33 -0400
Message-ID: <44AEF160.2000503 at trustedcs.com>
Date: Fri, 07 Jul 2006 18:42:24 -0500
From: Venkat Yekkirala <vyekkirala at trustedcs.com>
User-Agent: Thunderbird 1.5.0.4 (Windows/20060516)
MIME-Version: 1.0
To: redhat-lspp at redhat.com,
 ftmedran at us.ibm.com,
 jmorris at redhat.com,
 latten at austin.ibm.com,
 sds at tycho.nsa.gov,
 tjaeger at cse.psu.edu
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-loop: redhat-lspp at redhat.com
Cc: 
Subject: [redhat-lspp] [RFC][PATCH 4] MLSXFRM: Bug fix involving unlabeled
	IPSec
X-BeenThere: redhat-lspp at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
List-Id: Red Hat LSPP / MLS Discussion <redhat-lspp.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/redhat-lspp>
List-Post: <mailto:redhat-lspp at redhat.com>
List-Help: <mailto:redhat-lspp-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/redhat-lspp>,
	<mailto:redhat-lspp-request at redhat.com?subject=subscribe>
Sender: redhat-lspp-bounces at redhat.com
Errors-To: redhat-lspp-bounces at redhat.com
X-UID: 73751
X-Length: 4874

This should fix the issues encountered today by Joy and Fernando at IBM with not
being able to use unlabeled IPSec policy/associations.

The following mls constraint (modified to allow use of unlabeled IPSec policy rules
if TE policy allowed it) should be used in conjunction with this fix:

mlsconstrain association { polmatch }
         ((( l1 dom l2 ) and ( h1 domby h2 )) or
          ( t2 == unlabeled_t ));

--- linux-2.6.17.i686.patch11.3/include/linux/security.h	2006-07-06 10:33:07.000000000 -0500
+++ linux-2.6.17.i686.patch11.4/include/linux/security.h	2006-07-07 18:10:00.000000000 -0500
@@ -2989,6 +2989,8 @@ static inline int security_xfrm_state_al
 static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
 				struct xfrm_sec_ctx *polsec, u32 sid)
 {
+	if (!polsec)
+		return 0;
 	return security_ops->xfrm_state_alloc_security(x, NULL, polsec, sid);
 }
 
--- linux-2.6.17.i686.patch11.3/security/selinux/xfrm.c	2006-07-06 15:28:53.000000000 -0500
+++ linux-2.6.17.i686.patch11.4/security/selinux/xfrm.c	2006-07-07 18:34:37.000000000 -0500
@@ -212,8 +212,6 @@ static int selinux_xfrm_sec_ctx_alloc(st
 	if (!uctx)
 		goto not_from_user;
 
-	BUG_ON(!uctx);
-
 	if (uctx->ctx_doi != XFRM_SC_ALG_SELINUX)
 		return -EINVAL;
 

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



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.6
retrieving revision 1.2293.2.7
diff -u -r1.2293.2.6 -r1.2293.2.7
--- kernel-2.6.spec	6 Jul 2006 14:41:45 -0000	1.2293.2.6
+++ kernel-2.6.spec	8 Jul 2006 12:13:27 -0000	1.2293.2.7
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.42
+%define tag FC6.lspp.43
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -461,18 +461,20 @@
 Patch20100: linux-2.6-audit-git.patch
 Patch20101: linux-2.6-audit-pending.patch
 Patch20102: netlink-eff_cap-lsm-framework.patch
-Patch20103: linux-2.6-net-label_1_8.patch
-Patch20104: linux-2.6-net-label_2_8.patch
-Patch20105: linux-2.6-net-label_3_8.patch
-Patch20106: linux-2.6-net-label_4_8.patch
-Patch20107: linux-2.6-net-label_5_8.patch
-Patch20108: linux-2.6-net-label_6_8.patch
-Patch20109: linux-2.6-net-label_7_8.patch
-Patch20110: linux-2.6-net-label_8_8.patch
+Patch20110: linux-2.6-net-label_1_8.patch
+Patch20111: linux-2.6-net-label_2_8.patch
+Patch20112: linux-2.6-net-label_3_8.patch
+Patch20113: linux-2.6-net-label_4_8.patch
+Patch20114: linux-2.6-net-label_5_8.patch
+Patch20115: linux-2.6-net-label_6_8.patch
+Patch20116: linux-2.6-net-label_7_8.patch
+Patch20117: linux-2.6-net-label_8_8.patch
 Patch20120: linux-2.6-audit-rename.patch
 Patch20121: linux-2.6-audit-by-object.patch
 Patch20122: ipsec-lspp-41.patch
 Patch20123: ipsec-flow-41.patch
+Patch20124: ipsec-autolabel-42.patch
+Patch20125: ipsec-bugfix-42.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1116,20 +1118,22 @@
 # netlink fix
 %patch20102 -p1
 # netlabel
-%patch20103 -p1
-%patch20104 -p1
-%patch20105 -p1
-%patch20106 -p1
-%patch20107 -p1
-%patch20108 -p1
-%patch20109 -p1
 %patch20110 -p1
+%patch20111 -p1
+%patch20112 -p1
+%patch20113 -p1
+%patch20114 -p1
+%patch20115 -p1
+%patch20116 -p1
+%patch20117 -p1
 # audit by obj
 %patch20120 -p1
 %patch20121 -p1
 # ipsec
 %patch20122 -p1
 %patch20123 -p1
+%patch20124 -p1
+%patch20125 -p1
 
 
 # now run oldconfig over all the config files
@@ -1736,6 +1740,9 @@
 %endif
 
 %changelog
+* Sat Jul  8 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp 43, add autolabel & bugfix patches from Venkat
+
 * Thu Jul  6 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp 42, add updated ipsec patches from Venkat
 



From fedora-cvs-commits at redhat.com  Sat Jul  8 17:07:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 13:07:28 -0400
Subject: rpms/bridge-utils/devel .cvsignore, 1.5, 1.6 bridge-utils.spec, 1.18,
	1.19 sources, 1.5, 1.6
Message-ID: <200607081707.k68H7S8e007990@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore bridge-utils.spec sources 
Log Message:
Bridge-utils 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 12:40:10 -0000	1.5
+++ .cvsignore	8 Jul 2006 17:07:11 -0000	1.6
@@ -1 +1 @@
-bridge-utils-1.0.6.tar.gz
+bridge-utils-1.1.tar.gz


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bridge-utils.spec	7 Jun 2006 22:07:01 -0000	1.18
+++ bridge-utils.spec	8 Jul 2006 17:07:11 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
-Version: 1.0.6
-Release: 2
+Version: 1.1
+Release: 1
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
@@ -42,6 +42,9 @@
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.1-1
+- Update to 1.1
+
 * Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.0.6-2
 - Use sane kernel headers, drop -devel package
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 12:40:12 -0000	1.5
+++ sources	8 Jul 2006 17:07:11 -0000	1.6
@@ -1 +1 @@
-9b7dc52656f5cbec846a7ba3299f73bd  bridge-utils-1.0.6.tar.gz
+43bbd2a67b59cac3e15d545f8b51df68  bridge-utils-1.1.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jul  8 17:14:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 13:14:08 -0400
Subject: rpms/bridge-utils/devel bridge-utils.spec,1.19,1.20
Message-ID: <200607081714.k68HE8vE010474@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	bridge-utils.spec 
Log Message:
Fix BR for new sysfsutils


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bridge-utils.spec	8 Jul 2006 17:07:11 -0000	1.19
+++ bridge-utils.spec	8 Jul 2006 17:14:05 -0000	1.20
@@ -8,7 +8,7 @@
 Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz
 Patch0: bridge-utils-1.0.4-inc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: sysfsutils-devel
+BuildRequires: libsysfs-devel
 BuildRequires: kernel-headers >= 2.6.16
 
 %description
@@ -44,6 +44,7 @@
 %changelog
 * Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.1-1
 - Update to 1.1
+- BR libsysfs-devel instead of sysfsutils-devel
 
 * Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.0.6-2
 - Use sane kernel headers, drop -devel package



From fedora-cvs-commits at redhat.com  Sat Jul  8 18:07:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 14:07:38 -0400
Subject: rpms/kernel/devel linux-2.6-audit-syscall-classes.patch, NONE,
	1.1.2.1 linux-2.6-net-label_1_7.patch, 1.1.2.2,
	1.1.2.3 linux-2.6-net-label_2_7.patch, 1.1.2.2,
	1.1.2.3 linux-2.6-net-label_3_7.patch, 1.1.2.2,
	1.1.2.3 linux-2.6-net-label_4_7.patch, 1.1.2.3,
	1.1.2.4 linux-2.6-net-label_5_7.patch, 1.1.2.2,
	1.1.2.3 linux-2.6-net-label_6_7.patch, 1.1.2.2,
	1.1.2.3 linux-2.6-net-label_7_7.patch, 1.1.2.2,
	1.1.2.3 kernel-2.6.spec, 1.2293.2.7,
	1.2293.2.8 linux-2.6-net-label_1_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_2_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_3_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_4_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_5_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_6_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_7_8.patch, 1.1.2.1,
	NONE linux-2.6-net-label_8_8.patch, 1.1.2.1, NONE
Message-ID: <200607081807.k68I7cPa005544@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-lspp-37-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-37-branch
	linux-2.6-audit-syscall-classes.patch 
	linux-2.6-net-label_1_7.patch linux-2.6-net-label_2_7.patch 
	linux-2.6-net-label_3_7.patch linux-2.6-net-label_4_7.patch 
	linux-2.6-net-label_5_7.patch linux-2.6-net-label_6_7.patch 
	linux-2.6-net-label_7_7.patch 
Removed Files:
      Tag: private-lspp-37-branch
	linux-2.6-net-label_1_8.patch linux-2.6-net-label_2_8.patch 
	linux-2.6-net-label_3_8.patch linux-2.6-net-label_4_8.patch 
	linux-2.6-net-label_5_8.patch linux-2.6-net-label_6_8.patch 
	linux-2.6-net-label_7_8.patch linux-2.6-net-label_8_8.patch 
Log Message:
* Sat Jul  8 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 44, add audit syscall patch from Al
- Switch to the new netlabel patch from Paul


linux-2.6-audit-syscall-classes.patch:
 arch/i386/kernel/Makefile               |    1 
 arch/i386/kernel/audit.c                |   23 ++++++++++++++++++
 arch/ia64/ia32/Makefile                 |    1 
 arch/ia64/ia32/audit.c                  |   11 +++++++++
 arch/ia64/kernel/Makefile               |    1 
 arch/ia64/kernel/audit.c                |   29 +++++++++++++++++++++++
 arch/x86_64/ia32/Makefile               |    3 ++
 arch/x86_64/ia32/audit.c                |   11 +++++++++
 arch/x86_64/kernel/Makefile             |    1 
 arch/x86_64/kernel/audit.c              |   29 +++++++++++++++++++++++
 include/asm-generic/audit_change_attr.h |   18 ++++++++++++++
 include/asm-generic/audit_dir_write.h   |   14 +++++++++++
 include/linux/audit.h                   |    7 +++++
 kernel/auditfilter.c                    |   39 ++++++++++++++++++++++++++++++++
 14 files changed, 188 insertions(+)

--- NEW FILE linux-2.6-audit-syscall-classes.patch ---
>From aviro at redhat.com Sat Jul  1 07:53:43 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; Sat, 01 Jul 2006 07:53:51 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k61Brpel012655;
	Sat, 1 Jul 2006 07:53:51 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k61BrpjF004193;
	Sat, 1 Jul 2006 07:53:51 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k61BrjkL010047;
	Sat, 1 Jul 2006 07:53:45 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id BA04272FB6; Sat,  1 Jul 2006 07:53:45 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k61BrhMO009699 for <linux-audit at listman.util.phx.redhat.com>;
	Sat, 1 Jul 2006 07:53:43 -0400
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com
	[172.16.58.1])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k61Brhnd004191
	for <linux-audit at redhat.com>; Sat, 1 Jul 2006 07:53:43 -0400
Received: from devserv.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k61Brhum013625
	for <linux-audit at redhat.com>; Sat, 1 Jul 2006 07:53:43 -0400
Received: (from aviro at localhost)
	by devserv.devel.redhat.com (8.12.11.20060308/8.12.11/Submit) id
	k61BrhVc013623
	for linux-audit at redhat.com; Sat, 1 Jul 2006 07:53:43 -0400
Date: Sat, 1 Jul 2006 07:53:43 -0400
From: Alexander Viro <aviro at redhat.com>
To: linux-audit at redhat.com
Message-ID: <20060701115343.GN4199 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] audit syscall classes
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: 72786
X-Length: 13682

Allow to tie upper bits of syscall bitmap in audit rules to kernel-defined
sets of syscalls.  Infrastructure, a couple of classes (with 32bit counterparts
for biarch targets) and actual tie-in on i386, amd64 and ia64.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 arch/i386/kernel/Makefile               |    1 +
 arch/i386/kernel/audit.c                |   23 ++++++++++++++++++
 arch/ia64/ia32/Makefile                 |    1 +
 arch/ia64/ia32/audit.c                  |   11 +++++++++
 arch/ia64/kernel/Makefile               |    1 +
 arch/ia64/kernel/audit.c                |   29 +++++++++++++++++++++++
 arch/x86_64/ia32/Makefile               |    3 ++
 arch/x86_64/ia32/audit.c                |   11 +++++++++
 arch/x86_64/kernel/Makefile             |    1 +
 arch/x86_64/kernel/audit.c              |   29 +++++++++++++++++++++++
 include/asm-generic/audit_change_attr.h |   18 ++++++++++++++
 include/asm-generic/audit_dir_write.h   |   14 +++++++++++
 include/linux/audit.h                   |    7 ++++++
 kernel/auditfilter.c                    |   39 +++++++++++++++++++++++++++++++
 14 files changed, 188 insertions(+), 0 deletions(-)
 create mode 100644 arch/i386/kernel/audit.c
 create mode 100644 arch/ia64/ia32/audit.c
 create mode 100644 arch/ia64/kernel/audit.c
 create mode 100644 arch/x86_64/ia32/audit.c
 create mode 100644 arch/x86_64/kernel/audit.c
 create mode 100644 include/asm-generic/audit_change_attr.h
 create mode 100644 include/asm-generic/audit_dir_write.h

b915543b46a2aa599fdd2169e51bcfd88812a12b
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 5e70c2f..cbc1184 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -37,6 +37,7 @@
 obj-$(CONFIG_DOUBLEFAULT)	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+obj-$(CONFIG_AUDIT)		+= audit.o
 
 EXTRA_AFLAGS   := -traditional
 
diff --git a/arch/i386/kernel/audit.c b/arch/i386/kernel/audit.c
new file mode 100644
index 0000000..5a53c6f
--- /dev/null
+++ b/arch/i386/kernel/audit.c
@@ -0,0 +1,23 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+static int __init audit_classes_init(void)
+{
+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+	return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/arch/ia64/ia32/Makefile b/arch/ia64/ia32/Makefile
index 61cb60a..baad8c7 100644
--- a/arch/ia64/ia32/Makefile
+++ b/arch/ia64/ia32/Makefile
@@ -4,6 +4,7 @@ #
 
 obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \
 	 ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o
+obj-$(CONFIG_AUDIT) += audit.o
 
 # Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and
 # restore_ia32_fpstate_live() can be sure the live register contain user-level state.
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
new file mode 100644
index 0000000..ab94f2e
--- /dev/null
+++ b/arch/ia64/ia32/audit.c
@@ -0,0 +1,11 @@
+#include <asm-i386/unistd.h>
+
+unsigned ia32_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned ia32_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 09a0dbc..0e4553f 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o
+obj-$(CONFIG_AUDIT)		+= audit.o
 mca_recovery-y			+= mca_drv.o mca_drv_asm.o
 
 # The gate DSO image is built using a special linker script.
diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
new file mode 100644
index 0000000..f251293
--- /dev/null
+++ b/arch/ia64/kernel/audit.c
@@ -0,0 +1,29 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+static int __init audit_classes_init(void)
+{
+#ifdef CONFIG_IA32_SUPPORT
+	extern __u32 ia32_dir_class[];
+	extern __u32 ia32_chattr_class[];
+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
+#endif
+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+	return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile
index e9263b4..62bc5f5 100644
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86_64/ia32/Makefile
@@ -11,6 +11,9 @@ obj-$(CONFIG_IA32_EMULATION) += $(sysv-y
 
 obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
 
+audit-class-$(CONFIG_AUDIT) := audit.o
+obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)
+
 $(obj)/syscall32_syscall.o: \
 	$(foreach F,sysenter syscall,$(obj)/vsyscall-$F.so)
 
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86_64/ia32/audit.c
new file mode 100644
index 0000000..ab94f2e
--- /dev/null
+++ b/arch/x86_64/ia32/audit.c
@@ -0,0 +1,11 @@
+#include <asm-i386/unistd.h>
+
+unsigned ia32_dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+unsigned ia32_chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index aeb9c56..819e84e 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp.o
+obj-$(CONFIG_AUDIT)		+= audit.o
 
 obj-$(CONFIG_MODULES)		+= module.o
 
diff --git a/arch/x86_64/kernel/audit.c b/arch/x86_64/kernel/audit.c
new file mode 100644
index 0000000..a067aa4
--- /dev/null
+++ b/arch/x86_64/kernel/audit.c
@@ -0,0 +1,29 @@
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/audit.h>
+#include <asm/unistd.h>
+
+static unsigned dir_class[] = {
+#include <asm-generic/audit_dir_write.h>
+~0U
+};
+
+static unsigned chattr_class[] = {
+#include <asm-generic/audit_change_attr.h>
+~0U
+};
+
+static int __init audit_classes_init(void)
+{
+#ifdef CONFIG_IA32_EMULATION
+	extern __u32 ia32_dir_class[];
+	extern __u32 ia32_chattr_class[];
+	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);
+#endif
+	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);
+	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);
+	return 0;
+}
+
+__initcall(audit_classes_init);
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h
new file mode 100644
index 0000000..cb05bf6
--- /dev/null
+++ b/include/asm-generic/audit_change_attr.h
@@ -0,0 +1,18 @@
+__NR_chmod,
+__NR_fchmod,
+__NR_chown,
+__NR_fchown,
+__NR_lchown,
+__NR_setxattr,
+__NR_lsetxattr,
+__NR_fsetxattr,
+__NR_removexattr,
+__NR_lremovexattr,
+__NR_fremovexattr,
+__NR_fchownat,
+__NR_fchmodat,
+#ifdef __NR_chown32
+__NR_chown32,
+__NR_fchown32,
+__NR_lchown32,
+#endif
diff --git a/include/asm-generic/audit_dir_write.h b/include/asm-generic/audit_dir_write.h
new file mode 100644
index 0000000..161a7a5
--- /dev/null
+++ b/include/asm-generic/audit_dir_write.h
@@ -0,0 +1,14 @@
+__NR_rename,
+__NR_mkdir,
+__NR_rmdir,
+__NR_creat,
+__NR_link,
+__NR_unlink,
+__NR_symlink,
+__NR_mknod,
+__NR_mkdirat,
+__NR_mknodat,
+__NR_unlinkat,
+__NR_renameat,
+__NR_linkat,
+__NR_symlinkat,
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c211f0a..b27d7de 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -127,6 +127,12 @@ #define AUDIT_BITMASK_SIZE 64
 #define AUDIT_WORD(nr) ((__u32)((nr)/32))
 #define AUDIT_BIT(nr)  (1 << ((nr) - AUDIT_WORD(nr)*32))
 
+#define AUDIT_SYSCALL_CLASSES 16
+#define AUDIT_CLASS_DIR_WRITE 0
+#define AUDIT_CLASS_DIR_WRITE_32 1
+#define AUDIT_CLASS_CHATTR 2
+#define AUDIT_CLASS_CHATTR_32 3
+
 /* This bitmask is used to validate user input.  It represents all bits that
  * are currently used in an audit field constant understood by the kernel.
  * If you are adding a new #define AUDIT_<whatever>, please ensure that
@@ -307,6 +313,7 @@ #define AUDITSC_INVALID 0
 #define AUDITSC_SUCCESS 1
 #define AUDITSC_FAILURE 2
 #define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS )
+extern int __init audit_register_class(int class, unsigned *list);
 #ifdef CONFIG_AUDITSYSCALL
 /* These are defined in auditsc.c */
 				/* Public API */
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 7f2ea8b..5b4e162 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -279,6 +279,29 @@ static int audit_to_watch(struct audit_k
 	return 0;
 }
 
+static __u32 *classes[AUDIT_SYSCALL_CLASSES];
+
+int __init audit_register_class(int class, unsigned *list)
+{
+	__u32 *p = kzalloc(AUDIT_BITMASK_SIZE * sizeof(__u32), GFP_KERNEL);
+	if (!p)
+		return -ENOMEM;
+	while (*list != ~0U) {
+		unsigned n = *list++;
+		if (n >= AUDIT_BITMASK_SIZE * 32 - AUDIT_SYSCALL_CLASSES) {
+			kfree(p);
+			return -EINVAL;
+		}
+		p[AUDIT_WORD(n)] |= AUDIT_BIT(n);
+	}
+	if (class >= AUDIT_SYSCALL_CLASSES || classes[class]) {
+		kfree(p);
+		return -EINVAL;
+	}
+	classes[class] = p;
+	return 0;
+}
+
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 {
@@ -322,6 +345,22 @@ #endif
 	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
 		entry->rule.mask[i] = rule->mask[i];
 
+	for (i = 0; i < AUDIT_SYSCALL_CLASSES; i++) {
+		int bit = AUDIT_BITMASK_SIZE * 32 - i - 1;
+		__u32 *p = &entry->rule.mask[AUDIT_WORD(bit)];
+		__u32 *class;
+
+		if (!(*p & AUDIT_BIT(bit)))
+			continue;
+		*p &= ~AUDIT_BIT(bit);
+		class = classes[i];
+		if (class) {
+			int j;
+			for (j = 0; j < AUDIT_BITMASK_SIZE; j++)
+				entry->rule.mask[j] |= class[j];
+		}
+	}
+
 	return entry;
 
 exit_err:
-- 
1.3.GIT

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


linux-2.6-net-label_1_7.patch:
 CREDITS                                                   |    7 
 Documentation/00-INDEX                                    |    2 
 Documentation/netlabel/00-INDEX                           |   10 
 Documentation/netlabel/cipso_ipv4.txt                     |   48 
 Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  781 ++++++++++++++
 Documentation/netlabel/introduction.txt                   |   53 
 Documentation/netlabel/lsm_interface.txt                  |   47 
 Documentation/networking/ip-sysctl.txt                    |   28 
 8 files changed, 976 insertions(+)

Index: linux-2.6-net-label_1_7.patch
===================================================================
RCS file: linux-2.6-net-label_1_7.patch
diff -N linux-2.6-net-label_1_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_1_7.patch	8 Jul 2006 18:07:23 -0000	1.1.2.3
@@ -0,0 +1,1105 @@
+From paul.moore at hp.com Thu Jul  6 17:34:07 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:58:57 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lwuel017543
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:58:56 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66Lws9p006909;
+	Thu, 6 Jul 2006 17:58:54 -0400
+Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwoXd029570;
+	Thu, 6 Jul 2006 17:58:50 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel6.hp.com (Postfix) with ESMTP id 7D3C8352AE;
+	Thu,  6 Jul 2006 17:58:45 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id F11173473B;
+	Thu,  6 Jul 2006 21:58:44 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66Lwijd028976;
+	Thu, 6 Jul 2006 17:58:44 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66Lwimk028975;
+	Thu, 6 Jul 2006 17:58:44 -0400
+Message-Id: <20060706215844.237230000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:07 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 1/7] NetLabel: documentation
+Content-Disposition: inline; filename=netlabel-documentation
+X-RedHat-Spam-Score: -99.683 
+Content-Type: 
+X-UID: 73475
+X-Length: 44813
+
+Documentation for the NetLabel system, this includes a basic overview of how
+NetLabel works, how LSM developers can integrate it into their favorite
+LSM, as well as documentation on the CIPSO related sysctl variables.  Also,
+due to the difficulty of finding expired IETF drafts, I am including the IETF
+CIPSO draft that is the basis of the NetLabel CIPSO implementation.
+---
+ CREDITS                                                   |    7 
+ Documentation/00-INDEX                                    |    2 
+ Documentation/netlabel/00-INDEX                           |   10 
+ Documentation/netlabel/cipso_ipv4.txt                     |   48 
+ Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt |  791 ++++++++++++++
+ Documentation/netlabel/introduction.txt                   |   53 
+ Documentation/netlabel/lsm_interface.txt                  |   47 
+ Documentation/networking/ip-sysctl.txt                    |   28 
+ 8 files changed, 986 insertions(+)
+
+Index: linux-2.6.17.i686-quilt/CREDITS
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/CREDITS
++++ linux-2.6.17.i686-quilt/CREDITS
+@@ -2383,6 +2383,13 @@ N: Thomas Molina
+ E: tmolina at cablespeed.com
+ D: bug fixes, documentation, minor hackery
+ 
++N: Paul Moore
++E: paul.moore at hp.com
++D: NetLabel author
++S: Hewlett-Packard
++S: 110 Spit Brook Road
++S: Nashua, NH 03062
++
+ N: James Morris
+ E: jmorris at namei.org
+ W: http://namei.org/
+Index: linux-2.6.17.i686-quilt/Documentation/00-INDEX
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/Documentation/00-INDEX
++++ linux-2.6.17.i686-quilt/Documentation/00-INDEX
+@@ -184,6 +184,8 @@ mtrr.txt
+ 	- how to use PPro Memory Type Range Registers to increase performance.
+ nbd.txt
+ 	- info on a TCP implementation of a network block device.
++netlabel/
++	- directory with information on the NetLabel subsystem.
+ networking/
+ 	- directory with info on various aspects of networking with Linux.
+ nfsroot.txt
+Index: linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/Documentation/netlabel/00-INDEX
+@@ -0,0 +1,10 @@
++00-INDEX
++	- this file.
++cipso_ipv4.txt
++	- documentation on the IPv4 CIPSO protocol engine.
++draft-ietf-cipso-ipsecurity-01.txt
++	- IETF draft of the CIPSO protocol, dated 16 July 1992.
++introduction.txt
++	- NetLabel introduction, READ THIS FIRST.
++lsm_interface.txt
++	- documentation on the NetLabel kernel security module API.
+Index: linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/Documentation/netlabel/cipso_ipv4.txt
+@@ -0,0 +1,48 @@
++NetLabel CIPSO/IPv4 Protocol Engine
++==============================================================================
++Paul Moore, paul.moore at hp.com
++
++May 17, 2006
++
++ * Overview
++
++The NetLabel CIPSO/IPv4 protocol engine is based on the IETF Commercial IP
++Security Option (CIPSO) draft from July 16, 1992.  A copy of this draft can be
++found in this directory, consult '00-INDEX' for the filename.  While the IETF
++draft never made it to an RFC standard it has become a de-facto standard for
++labeled networking and is used in many trusted operating systems.
++
++ * Outbound Packet Processing
++
++The CIPSO/IPv4 protocol engine applies the CIPSO IP option to packets by
++adding the CIPSO label to the socket.  This causes all packets leaving the
++system through the socket to have the CIPSO IP option applied.  The socket's
++CIPSO label can be changed at any point in time, however, it is recommended
++that it is set upon the socket's creation.  The LSM can set the socket's CIPSO
++label by using the NetLabel security module API; if the NetLabel "domain" is
++configured to use CIPSO for packet labeling then a CIPSO IP option will be
++generated and attached to the socket.
++
++ * Inbound Packet Processing
++
++The CIPSO/IPv4 protocol engine validates every CIPSO IP option it finds at the
++IP layer without any special handling required by the LSM.  However, in order
++to decode and translate the CIPSO label on the packet the LSM must use the
++NetLabel security module API to extract the security attributes of the packet.
++This is typically done at the socket layer using the 'socket_sock_rcv_skb()'
++LSM hook.
++
++ * Label Translation
++
++The CIPSO/IPv4 protocol engine contains a mechanism to translate CIPSO security
++attributes such as sensitivity level and category to values which are
++appropriate for the host.  These mappings are defined as part of a CIPSO
++Domain Of Interpretation (DOI) definition and are configured through the
++NetLabel user space communication layer.  Each DOI definition can have a
++different security attribute mapping table.
++
++ * Label Translation Cache
++
++The NetLabel system provides a framework for caching security attribute
++mappings from the network labels to the corresponding LSM identifiers.  The
++CIPSO/IPv4 protocol engine supports this caching mechanism.
+Index: linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
+@@ -0,0 +1,791 @@
++IETF CIPSO Working Group
++16 July, 1992
++
++
++
++                 COMMERCIAL IP SECURITY OPTION (CIPSO 2.2)
++
++
++
++1.    Status
++
++This Internet Draft provides the high level specification for a Commercial
++IP Security Option (CIPSO).  This draft reflects the version as approved by
++the CIPSO IETF Working Group.  Distribution of this memo is unlimited.
++
++This document is an Internet Draft.  Internet Drafts are working documents
++of the Internet Engineering Task Force (IETF), its Areas, and its Working
++Groups. Note that other groups may also distribute working documents as
++Internet Drafts.
++
++Internet Drafts are draft documents valid for a maximum of six months.
++Internet Drafts may be updated, replaced, or obsoleted by other documents
++at any time.  It is not appropriate to use Internet Drafts as reference
++material or to cite them other than as a "working draft" or "work in
++progress."
++
++Please check the I-D abstract listing contained in each Internet Draft
++directory to learn the current status of this or any other Internet Draft.
++
++
++
++
++2.    Background
++
++Currently the Internet Protocol includes two security options.  One of
++these options is the DoD Basic Security Option (BSO) (Type 130) which allows
++IP datagrams to be labeled with security classifications.  This option
++provides sixteen security classifications and a variable number of handling
++restrictions.  To handle additional security information, such as security
++categories or compartments, another security option (Type 133) exists and
++is referred to as the DoD Extended Security Option (ESO).  The values for
++the fixed fields within these two options are administered by the Defense
++Information Systems Agency (DISA).
++
++Computer vendors are now building commercial operating systems with
++mandatory access controls and multi-level security.  These systems are
++no longer built specifically for a particular group in the defense or
++intelligence communities.  They are generally available commercial systems
++for use in a variety of government and civil sector environments.
++
++The small number of ESO format codes can not support all the possible
++applications of a commercial security option.  The BSO and ESO were
++designed to only support the United States DoD.  CIPSO has been designed
++to support multiple security policies.  This Internet Draft provides the
++format and procedures required to support a Mandatory Access Control
++security policy.  Support for additional security policies shall be
++defined in future RFCs.
++
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 1]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++
++3.    CIPSO Format
++
++Option type: 134 (Class 0, Number 6, Copy on Fragmentation)
++Option length: Variable
++
++This option permits security related information to be passed between
++systems within a single Domain of Interpretation (DOI).  A DOI is a
++collection of systems which agree on the meaning of particular values
++in the security option.  An authority that has been assigned a DOI
++identifier will define a mapping between appropriate CIPSO field values
++and their human readable equivalent.  This authority will distribute that
++mapping to hosts within the authority's domain.  These mappings may be
++sensitive, therefore a DOI authority is not required to make these
++mappings available to anyone other than the systems that are included in
++the DOI.
++
++This option MUST be copied on fragmentation.  This option appears at most
++once in a datagram.  All multi-octet fields in the option are defined to be
++transmitted in network byte order.  The format of this option is as follows:
++
+++----------+----------+------//------+-----------//---------+
++| 10000110 | LLLLLLLL | DDDDDDDDDDDD | TTTTTTTTTTTTTTTTTTTT |
+++----------+----------+------//------+-----------//---------+
++
++  TYPE=134    OPTION    DOMAIN OF               TAGS
++              LENGTH    INTERPRETATION
++
++
++                Figure 1. CIPSO Format
++
++
++3.1    Type
++
++This field is 1 octet in length.  Its value is 134.
++
++
++3.2    Length
++
++This field is 1 octet in length.  It is the total length of the option
++including the type and length fields.  With the current IP header length
++restriction of 40 octets the value of this field MUST not exceed 40.
++
++
++3.3    Domain of Interpretation Identifier
++
++This field is an unsigned 32 bit integer.  The value 0 is reserved and MUST
++not appear as the DOI identifier in any CIPSO option.  Implementations
++should assume that the DOI identifier field is not aligned on any particular
++byte boundary.
++
++To conserve space in the protocol, security levels and categories are
++represented by numbers rather than their ASCII equivalent.  This requires
++a mapping table within CIPSO hosts to map these numbers to their
++corresponding ASCII representations.  Non-related groups of systems may
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 2]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++have their own unique mappings.  For example, one group of systems may
++use the number 5 to represent Unclassified while another group may use the
++number 1 to represent that same security level.  The DOI identifier is used
++to identify which mapping was used for the values within the option.
++
++
++3.4    Tag Types
++
++A common format for passing security related information is necessary
++for interoperability.  CIPSO uses sets of "tags" to contain the security
++information relevant to the data in the IP packet.  Each tag begins with
++a tag type identifier followed by the length of the tag and ends with the
++actual security information to be passed.  All multi-octet fields in a tag
++are defined to be transmitted in network byte order.  Like the DOI
++identifier field in the CIPSO header, implementations should assume that
++all tags, as well as fields within a tag, are not aligned on any particular
++octet boundary.   The tag types defined in this document contain alignment
++bytes to assist alignment of some information, however alignment can not
++be guaranteed if CIPSO is not the first IP option.
++
++CIPSO tag types 0 through 127 are reserved for defining standard tag
++formats.  Their definitions will be published in RFCs.  Tag types whose
++identifiers are greater than 127 are defined by the DOI authority and may
++only be meaningful in certain Domains of Interpretation.  For these tag
++types, implementations will require the DOI identifier as well as the tag
++number to determine the security policy and the format associated with the
++tag.  Use of tag types above 127 are restricted to closed networks where
++interoperability with other networks will not be an issue.  Implementations
++that support a tag type greater than 127 MUST support at least one DOI that
++requires only tag types 1 to 127.
++
++Tag type 0 is reserved. Tag types 1, 2, and 5 are defined in this
++Internet Draft.  Types 3 and 4 are reserved for work in progress.
++The standard format for all current and future CIPSO tags is shown below:
++
+++----------+----------+--------//--------+
++| TTTTTTTT | LLLLLLLL | IIIIIIIIIIIIIIII |
+++----------+----------+--------//--------+
++    TAG       TAG         TAG
++    TYPE      LENGTH      INFORMATION
++
++    Figure 2:  Standard Tag Format
++
++In the three tag types described in this document, the length and count
++restrictions are based on the current IP limitation of 40 octets for all
++IP options.  If the IP header is later expanded, then the length and count
++restrictions specified in this document may increase to use the full area
++provided for IP options.
++
++
++3.4.1    Tag Type Classes
++
++Tag classes consist of tag types that have common processing requirements
++and support the same security policy.  The three tags defined in this
++Internet Draft belong to the Mandatory Access Control (MAC) Sensitivity
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 3]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++class and support the MAC Sensitivity security policy.
++
++
++3.4.2    Tag Type 1
++
++This is referred to as the "bit-mapped" tag type.  Tag type 1 is included
++in the MAC Sensitivity tag type class.  The format of this tag type is as
++follows:
++
+++----------+----------+----------+----------+--------//---------+
++| 00000001 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCC |
+++----------+----------+----------+----------+--------//---------+
++
++    TAG       TAG      ALIGNMENT  SENSITIVITY    BIT MAP OF
++    TYPE      LENGTH   OCTET      LEVEL          CATEGORIES
++
++            Figure 3. Tag Type 1 Format
++
++
++3.4.2.1    Tag Type
++
++This field is 1 octet in length and has a value of 1.
++
++
++3.4.2.2    Tag Length
++
++This field is 1 octet in length.  It is the total length of the tag type
++including the type and length fields.  With the current IP header length
++restriction of 40 bytes the value within this field is between 4 and 34.
++
++
++3.4.2.3    Alignment Octet
++
++This field is 1 octet in length and always has the value of 0.  Its purpose
++is to align the category bitmap field on an even octet boundary.  This will
++speed many implementations including router implementations.
++
++
++3.4.2.4    Sensitivity Level
++
++This field is 1 octet in length.  Its value is from 0 to 255.  The values
++are ordered with 0 being the minimum value and 255 representing the maximum
++value.
++
++
++3.4.2.5    Bit Map of Categories
++
++The length of this field is variable and ranges from 0 to 30 octets.  This
++provides representation of categories 0 to 239.  The ordering of the bits
++is left to right or MSB to LSB.  For example category 0 is represented by
++the most significant bit of the first byte and category 15 is represented
++by the least significant bit of the second byte.  Figure 4 graphically
++shows this ordering.  Bit N is binary 1 if category N is part of the label
++for the datagram, and bit N is binary 0 if category N is not part of the
++label.  Except for the optimized tag 1 format described in the next section,
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 4]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++minimal encoding SHOULD be used resulting in no trailing zero octets in the
++category bitmap.
++
++        octet 0  octet 1  octet 2  octet 3  octet 4  octet 5
++        XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX . . .
++bit     01234567 89111111 11112222 22222233 33333333 44444444
++number             012345 67890123 45678901 23456789 01234567
++
++            Figure 4. Ordering of Bits in Tag 1 Bit Map
++
++
++3.4.2.6    Optimized Tag 1 Format
++
++Routers work most efficiently when processing fixed length fields.  To
++support these routers there is an optimized form of tag type 1.  The format
++does not change.  The only change is to the category bitmap which is set to
++a constant length of 10 octets.  Trailing octets required to fill out the 10
++octets are zero filled.  Ten octets, allowing for 80 categories, was chosen
++because it makes the total length of the CIPSO option 20 octets.  If CIPSO
++is the only option then the option will be full word aligned and additional
++filler octets will not be required.
++
++
++3.4.3    Tag Type 2
++
++This is referred to as the "enumerated" tag type.  It is used to describe
++large but sparsely populated sets of categories.  Tag type 2 is in the MAC
++Sensitivity tag type class.  The format of this tag type is as follows:
++
+++----------+----------+----------+----------+-------------//-------------+
++| 00000010 | LLLLLLLL | 00000000 | LLLLLLLL | CCCCCCCCCCCCCCCCCCCCCCCCCC |
+++----------+----------+----------+----------+-------------//-------------+
++
++    TAG       TAG      ALIGNMENT  SENSITIVITY         ENUMERATED
++    TYPE      LENGTH   OCTET      LEVEL               CATEGORIES
++
++                Figure 5. Tag Type 2 Format
++
++
++3.4.3.1     Tag Type
++
++This field is one octet in length and has a value of 2.
++
++
++3.4.3.2    Tag Length
++
++This field is 1 octet in length. It is the total length of the tag type
++including the type and length fields.  With the current IP header length
++restriction of 40 bytes the value within this field is between 4 and 34.
++
++
++3.4.3.3    Alignment Octet
++
++This field is 1 octet in length and always has the value of 0.  Its purpose
++is to align the category field on an even octet boundary.  This will
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 5]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++speed many implementations including router implementations.
++
++
++3.4.3.4    Sensitivity Level
++
++This field is 1 octet in length. Its value is from 0 to 255.  The values
++are ordered with 0 being the minimum value and 255 representing the
++maximum value.
++
++
++3.4.3.5    Enumerated Categories
++
++In this tag, categories are represented by their actual value rather than
++by their position within a bit field.  The length of each category is 2
++octets.  Up to 15 categories may be represented by this tag.  Valid values
++for categories are 0 to 65534.  Category 65535 is not a valid category
++value.  The categories MUST be listed in ascending order within the tag.
++
++
++3.4.4    Tag Type 5
++
++This is referred to as the "range" tag type.  It is used to represent
++labels where all categories in a range, or set of ranges, are included
++in the sensitivity label.  Tag type 5 is in the MAC Sensitivity tag type
++class.  The format of this tag type is as follows:
++
+++----------+----------+----------+----------+------------//-------------+
++| 00000101 | LLLLLLLL | 00000000 | LLLLLLLL |  Top/Bottom | Top/Bottom  |
+++----------+----------+----------+----------+------------//-------------+
++
++    TAG       TAG      ALIGNMENT  SENSITIVITY        CATEGORY RANGES
++    TYPE      LENGTH   OCTET      LEVEL
++
++                     Figure 6. Tag Type 5 Format
++
++
++3.4.4.1     Tag Type
++
++This field is one octet in length and has a value of 5.
++
++
++3.4.4.2    Tag Length
++
++This field is 1 octet in length. It is the total length of the tag type
++including the type and length fields.  With the current IP header length
++restriction of 40 bytes the value within this field is between 4 and 34.
++
++
++3.4.4.3    Alignment Octet
++
++This field is 1 octet in length and always has the value of 0.  Its purpose
++is to align the category range field on an even octet boundary.  This will
++speed many implementations including router implementations.
++
++
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 6]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++3.4.4.4    Sensitivity Level
++
++This field is 1 octet in length. Its value is from 0 to 255.  The values
++are ordered with 0 being the minimum value and 255 representing the maximum
++value.
++
++
++3.4.4.5    Category Ranges
++
++A category range is a 4 octet field comprised of the 2 octet index of the
++highest numbered category followed by the 2 octet index of the lowest
++numbered category.  These range endpoints are inclusive within the range of
++categories.  All categories within a range are included in the sensitivity
++label.  This tag may contain a maximum of 7 category pairs.  The bottom
++category endpoint for the last pair in the tag MAY be omitted and SHOULD be
++assumed to be 0.  The ranges MUST be non-overlapping and be listed in
++descending order.  Valid values for categories are 0 to 65534.  Category
++65535 is not a valid category value.
++
++
++3.4.5     Minimum Requirements
++
++A CIPSO implementation MUST be capable of generating at least tag type 1 in
++the non-optimized form.  In addition, a CIPSO implementation MUST be able
++to receive any valid tag type 1 even those using the optimized tag type 1
++format.
++
++
++4.    Configuration Parameters
++
++The configuration parameters defined below are required for all CIPSO hosts,
++gateways, and routers that support multiple sensitivity labels.  A CIPSO
++host is defined to be the origination or destination system for an IP
++datagram.  A CIPSO gateway provides IP routing services between two or more
++IP networks and may be required to perform label translations between
++networks.  A CIPSO gateway may be an enhanced CIPSO host or it may just
++provide gateway services with no end system CIPSO capabilities.  A CIPSO
++router is a dedicated IP router that routes IP datagrams between two or more
++IP networks.
++
++An implementation of CIPSO on a host MUST have the capability to reject a
++datagram for reasons that the information contained can not be adequately
++protected by the receiving host or if acceptance may result in violation of
++the host or network security policy.  In addition, a CIPSO gateway or router
++MUST be able to reject datagrams going to networks that can not provide
++adequate protection or may violate the network's security policy.  To
++provide this capability the following minimal set of configuration
++parameters are required for CIPSO implementations:
++
++HOST_LABEL_MAX - This parameter contains the maximum sensitivity label that
++a CIPSO host is authorized to handle.  All datagrams that have a label
++greater than this maximum MUST be rejected by the CIPSO host.  This
++parameter does not apply to CIPSO gateways or routers.  This parameter need
++not be defined explicitly as it can be implicitly derived from the
++PORT_LABEL_MAX parameters for the associated interfaces.
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 7]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++
++HOST_LABEL_MIN - This parameter contains the minimum sensitivity label that
++a CIPSO host is authorized to handle.  All datagrams that have a label less
++than this minimum MUST be rejected by the CIPSO host.  This parameter does
++not apply to CIPSO gateways or routers.  This parameter need not be defined
++explicitly as it can be implicitly derived from the PORT_LABEL_MIN
++parameters for the associated interfaces.
++
++PORT_LABEL_MAX - This parameter contains the maximum sensitivity label for
++all datagrams that may exit a particular network interface port.  All
++outgoing datagrams that have a label greater than this maximum MUST be
++rejected by the CIPSO system.  The label within this parameter MUST be
++less than or equal to the label within the HOST_LABEL_MAX parameter.  This
++parameter does not apply to CIPSO hosts that support only one network port.
++
++PORT_LABEL_MIN - This parameter contains the minimum sensitivity label for
++all datagrams that may exit a particular network interface port.  All
++outgoing datagrams that have a label less than this minimum MUST be
++rejected by the CIPSO system.  The label within this parameter MUST be
++greater than or equal to the label within the HOST_LABEL_MIN parameter.
++This parameter does not apply to CIPSO hosts that support only one network
++port.
++
++PORT_DOI - This parameter is used to assign a DOI identifier value to a
++particular network interface port.  All CIPSO labels within datagrams
++going out this port MUST use the specified DOI identifier.  All CIPSO
++hosts and gateways MUST support either this parameter, the NET_DOI
++parameter, or the HOST_DOI parameter.
++
++NET_DOI - This parameter is used to assign a DOI identifier value to a
++particular IP network address.  All CIPSO labels within datagrams destined
++for the particular IP network MUST use the specified DOI identifier.  All
++CIPSO hosts and gateways MUST support either this parameter, the PORT_DOI
++parameter, or the HOST_DOI parameter.
++
++HOST_DOI - This parameter is used to assign a DOI identifier value to a
++particular IP host address.  All CIPSO labels within datagrams destined for
++the particular IP host will use the specified DOI identifier.  All CIPSO
++hosts and gateways MUST support either this parameter, the PORT_DOI
++parameter, or the NET_DOI parameter.
++
++This list represents the minimal set of configuration parameters required
++to be compliant.  Implementors are encouraged to add to this list to
++provide enhanced functionality and control.  For example, many security
++policies may require both incoming and outgoing datagrams be checked against
++the port and host label ranges.
++
++
++4.1    Port Range Parameters
++
++The labels represented by the PORT_LABEL_MAX and PORT_LABEL_MIN parameters
++MAY be in CIPSO or local format.  Some CIPSO systems, such as routers, may
++want to have the range parameters expressed in CIPSO format so that incoming
++labels do not have to be converted to a local format before being compared
++against the range.  If multiple DOIs are supported by one of these CIPSO
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 8]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++systems then multiple port range parameters would be needed, one set for
++each DOI supported on a particular port.
++
++The port range will usually represent the total set of labels that may
++exist on the logical network accessed through the corresponding network
++interface.  It may, however, represent a subset of these labels that are
++allowed to enter the CIPSO system.
++
++
++4.2    Single Label CIPSO Hosts
++
++CIPSO implementations that support only one label are not required to
++support the parameters described above.  These limited implementations are
++only required to support a NET_LABEL parameter.  This parameter contains
++the CIPSO label that may be inserted in datagrams that exit the host.  In
++addition, the host MUST reject any incoming datagram that has a label which
++is not equivalent to the NET_LABEL parameter.
++
++
++5.    Handling Procedures
++
++This section describes the processing requirements for incoming and
++outgoing IP datagrams.  Just providing the correct CIPSO label format
++is not enough.  Assumptions will be made by one system on how a
++receiving system will handle the CIPSO label.  Wrong assumptions may
++lead to non-interoperability or even a security incident.  The
++requirements described below represent the minimal set needed for
++interoperability and that provide users some level of confidence.
++Many other requirements could be added to increase user confidence,
++however at the risk of restricting creativity and limiting vendor
++participation.
++
++
++5.1    Input Procedures
++
++All datagrams received through a network port MUST have a security label
++associated with them, either contained in the datagram or assigned to the
++receiving port.  Without this label the host, gateway, or router will not
++have the information it needs to make security decisions.  This security
++label will be obtained from the CIPSO if the option is present in the
++datagram.  See section 4.1.2 for handling procedures for unlabeled
++datagrams.  This label will be compared against the PORT (if appropriate)
++and HOST configuration parameters defined in section 3.
++
++If any field within the CIPSO option, such as the DOI identifier, is not
++recognized the IP datagram is discarded and an ICMP "parameter problem"
++(type 12) is generated and returned.  The ICMP code field is set to "bad
++parameter" (code 0) and the pointer is set to the start of the CIPSO field
++that is unrecognized.
++
++If the contents of the CIPSO are valid but the security label is
++outside of the configured host or port label range, the datagram is
++discarded and an ICMP "destination unreachable" (type 3) is generated
++and returned.  The code field of the ICMP is set to "communication with
++destination network administratively prohibited" (code 9) or to
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 9]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++"communication with destination host administratively prohibited"
++(code 10).  The value of the code field used is dependent upon whether
++the originator of the ICMP message is acting as a CIPSO host or a CIPSO
++gateway.  The recipient of the ICMP message MUST be able to handle either
++value.  The same procedure is performed if a CIPSO can not be added to an
++IP packet because it is too large to fit in the IP options area.
++
++If the error is triggered by receipt of an ICMP message, the message
++is discarded and no response is permitted (consistent with general ICMP
++processing rules).
++
++
++5.1.1    Unrecognized tag types
++
++The default condition for any CIPSO implementation is that an
++unrecognized tag type MUST be treated as a "parameter problem" and
++handled as described in section 4.1.  A CIPSO implementation MAY allow
++the system administrator to identify tag types that may safely be
++ignored.  This capability is an allowable enhancement, not a
++requirement.
++
++
++5.1.2    Unlabeled Packets
++
++A network port may be configured to not require a CIPSO label for all
++incoming  datagrams.  For this configuration a CIPSO label must be
++assigned to that network port and associated with all unlabeled IP
++datagrams.  This capability might be used for single level networks or
++networks that have CIPSO and non-CIPSO hosts and the non-CIPSO hosts
++all operate at the same label.
++
++If a CIPSO option is required and none is found, the datagram is
++discarded and an ICMP "parameter problem" (type 12) is generated and
++returned to the originator of the datagram.  The code field of the ICMP
++is set to "option missing" (code 1) and the ICMP pointer is set to 134
++(the value of the option type for the missing CIPSO option).
++
++
++5.2    Output Procedures
++
++A CIPSO option MUST appear only once in a datagram.  Only one tag type
++from the MAC Sensitivity class MAY be included in a CIPSO option.  Given
++the current set of defined tag types, this means that CIPSO labels at
++first will contain only one tag.
++
++All datagrams leaving a CIPSO system MUST meet the following condition:
++
++        PORT_LABEL_MIN <= CIPSO label <= PORT_LABEL_MAX
++
++If this condition is not satisfied the datagram MUST be discarded.
++If the CIPSO system only supports one port, the HOST_LABEL_MIN and the
++HOST_LABEL_MAX parameters MAY be substituted for the PORT parameters in
++the above condition.
++
++The DOI identifier to be used for all outgoing datagrams is configured by
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 10]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++the administrator.  If port level DOI identifier assignment is used, then
++the PORT_DOI configuration parameter MUST contain the DOI identifier to
++use.  If network level DOI assignment is used, then the NET_DOI parameter
++MUST contain the DOI identifier to use.  And if host level DOI assignment
++is employed, then the HOST_DOI parameter MUST contain the DOI identifier
++to use.  A CIPSO implementation need only support one level of DOI
++assignment.
++
++
++5.3    DOI Processing Requirements
++
++A CIPSO implementation MUST support at least one DOI and SHOULD support
++multiple DOIs.  System and network administrators are cautioned to
++ensure that at least one DOI is common within an IP network to allow for
++broadcasting of IP datagrams.
++
++CIPSO gateways MUST be capable of translating a CIPSO option from one
++DOI to another when forwarding datagrams between networks.  For
++efficiency purposes this capability is only a desired feature for CIPSO
++routers.
++
++
++5.4    Label of ICMP Messages
++
++The CIPSO label to be used on all outgoing ICMP messages MUST be equivalent
++to the label of the datagram that caused the ICMP message.  If the ICMP was
++generated due to a problem associated with the original CIPSO label then the
++following responses are allowed:
++
++  a.  Use the CIPSO label of the original IP datagram
++  b.  Drop the original datagram with no return message generated
++
++In most cases these options will have the same effect.  If you can not
++interpret the label or if it is outside the label range of your host or
++interface then an ICMP message with the same label will probably not be
++able to exit the system.
++
++
++6.    Assignment of DOI Identifier Numbers                                   =
++
++Requests for assignment of a DOI identifier number should be addressed to
++the Internet Assigned Numbers Authority (IANA).
++
++
++7.    Acknowledgements
++
++Much of the material in this RFC is based on (and copied from) work
++done by Gary Winiger of Sun Microsystems and published as Commercial
++IP Security Option at the INTEROP 89, Commercial IPSO Workshop.
++
++
++8.    Author's Address
++
++To submit mail for distribution to members of the IETF CIPSO Working
++Group, send mail to: cipso at wdl1.wdl.loral.com.
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 11]
++
++
++
++CIPSO INTERNET DRAFT                                         16 July, 1992
++
++
++
++
++To be added to or deleted from this distribution, send mail to:
++cipso-request at wdl1.wdl.loral.com.
++
++
++9.    References
++
++RFC 1038, "Draft Revised IP Security Option", M. St. Johns, IETF, January
++1988.
++
++RFC 1108, "U.S. Department of Defense Security Options
++for the Internet Protocol", Stephen Kent, IAB, 1 March, 1991.
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++Internet Draft, Expires 15 Jan 93                                 [PAGE 12]
++
++
++
+Index: linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/Documentation/netlabel/introduction.txt
+@@ -0,0 +1,53 @@
++NetLabel Introduction
++==============================================================================
++Paul Moore, paul.moore at hp.com
++
++June 27, 2006
++
++ * Overview
++
++NetLabel is a mechanism which can be used by kernel security modules to attach
++security attributes to outgoing network packets generated from user space
++applications and read security attributes from incoming network packets.  It
++is composed of four main components, the protocol engines, the communication
++layer, the kernel security module API, and the network stack operations.
++
++ * Protocol Engines
++
++The protocol engines are responsible for both applying and retrieving the
++network packet's security attributes.  If any translation between the network
++security attributes and those on the host are required then the protocol
++engine will handle those tasks as well.  Other kernel subsystems should
++refrain from calling the protocol engines directly, instead they should use
++the NetLabel kernel security module API described below.
++
++Detailed information about each NetLabel protocol engine can be found in this
++directory, consult '00-INDEX' for filenames.
++
++ * Communication Layer
++
++The communication layer exists to allow NetLabel configuration and monitoring
++from user space.  The NetLabel communication layer uses a message based
++protocol built on top of the Generic NETLINK transport mechanism.  The exact
++formatting of these NetLabel messages as well as the Generic NETLINK family
++names can be found in the the 'net/netlabel/' directory as comments in the
++header files as well as in 'include/net/netlabel.h'.
++
++ * Security Module API
++
++The purpose of the NetLabel security module API is to provide a protocol
++independent interface to the underlying NetLabel protocol engines.  In addition
++to protocol independence, the security module API is designed to be completely
++LSM independent which should allow multiple LSMs to leverage the same code
++base.
++
++Detailed information about the NetLabel security module API can be found in the
++'include/net/netlabel.h' header file as well as the 'lsm_interface.txt' file
++found in this directory.
++
++ * Network Stack Operations
++
++The reason for the network stack operations are to ensure the correct handling
++of the security attributes for kernel generated packets.  In general only the
++core network stack should call these functions.
++
+Index: linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/Documentation/netlabel/lsm_interface.txt
+@@ -0,0 +1,47 @@
++NetLabel Linux Security Module Interface
++==============================================================================
++Paul Moore, paul.moore at hp.com
++
++May 17, 2006
++
++ * Overview
++
++NetLabel is a mechanism which can set and retrieve security attributes from
++network packets.  It is intended to be used by LSM developers who want to make
++use of a common code base for several different packet labeling protocols.
++The NetLabel security module API is defined in 'include/net/netlabel.h' but a
++brief overview is given below.
++
++ * NetLabel Security Attributes
++
++Since NetLabel supports multiple different packet labeling protocols and LSMs
++it uses the concept of security attributes to refer to the packet's security
++labels.  The NetLabel security attributes are defined by the
++'netlbl_lsm_secattr' structure in the NetLabel header file.  Internally the
++NetLabel subsystem converts the security attributes to and from the correct
++low-level packet label depending on the NetLabel build time and run time
++configuration.  It is up to the LSM developer to translate the NetLabel
++security attributes into whatever security identifiers are in use for their
++particular LSM.
++
++ * NetLabel LSM Protocol Operations
++
++These are the functions which allow the LSM developer to manipulate the labels
++on outgoing packets as well as read the labels on incoming packets.  Functions
++exist to operate both on sockets as well as the sk_buffs directly.  These high
++level functions are translated into low level protocol operations based on how
++the administrator has configured the NetLabel subsystem.
++
++ * NetLabel Label Mapping Cache Operations
++
++Depending on the exact configuration, translation between the network packet
++label and the internal LSM security identifier can be time consuming.  The
++NetLabel label mapping cache is a caching mechanism which can be used to
++sidestep much of this overhead once a mapping has been established.  Once the
++LSM has received a packet, used NetLabel to decode it's security attributes,
++and translated the security attributes into a LSM internal identifier the LSM
++can use the NetLabel caching functions to associate the LSM internal
++identifier with the network packet's label.  This means that in the future
++when a incoming packet matches a cached value not only are the internal
++NetLabel translation mechanisms bypassed but the LSM translation mechanisms are
++bypassed as well which should result in a significant reduction in overhead.
+Index: linux-2.6.17.i686-quilt/Documentation/networking/ip-sysctl.txt
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/Documentation/networking/ip-sysctl.txt
++++ linux-2.6.17.i686-quilt/Documentation/networking/ip-sysctl.txt
+@@ -362,6 +362,34 @@ tcp_workaround_signed_windows - BOOLEAN
+ 	not receive a window scaling option from them.
+ 	Default: 0
+ 
++CIPSOv4 Variables:
++
++cipso_cache_enable - BOOLEAN
++	If set, enable additions to and lookups from the CIPSO label mapping
++	cache.  If unset, additions are ignored and lookups always result in a
++	miss.  However, regardless of the setting the cache is still
++	invalidated when required when means you can safely toggle this on and
++	off and the cache will always be "safe".
++
++cipso_cache_bucket_size - INTEGER
++	This is the maximum size of a CIPSO label cache bucket, once the limit
++	is reached the "older" entries inside the bucket are tossed to make
++	room for the new CIPSO labels.
++
++cipso_rbm_optfmt - BOOLEAN
++	Enable the "Optimized Tag 1 Format" as defined in section 3.4.2.6 of
++	the CIPSO draft specification (see Documentation/netlabel for details).
++	This means that when set the CIPSO tag will be padded with empty
++	categories in order to make the packet data 32-bit aligned.
++
++cipso_rbm_structvalid - BOOLEAN
++	If set, do a very strict check of the CIPSO option when
++	ip_options_compile() is called.  If unset, relax the checks done during
++	ip_options_compile().  Either way is "safe" as errors are caught else
++	where in the CIPSO processing code but setting this to 0 (False) should
++	result in less work (i.e. it should be faster) but possibile problems
++	with other implementations that require strict checks.
++
+ IP Variables:
+ 
+ ip_local_port_range - 2 INTEGERS
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_2_7.patch:
 include/linux/ip.h       |    1 
 include/net/cipso_ipv4.h |  262 ++++++++++++++++++++
 include/net/inet_sock.h  |    2 
 include/net/netlabel.h   |  604 +++++++++++++++++++++++++++++++++++++++++++++++
 net/ipv4/Makefile        |    1 
 net/ipv4/af_inet.c       |    3 
 net/ipv4/ah4.c           |    2 
 net/ipv4/ip_options.c    |   19 +
 8 files changed, 892 insertions(+), 2 deletions(-)

Index: linux-2.6-net-label_2_7.patch
===================================================================
RCS file: linux-2.6-net-label_2_7.patch
diff -N linux-2.6-net-label_2_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_2_7.patch	8 Jul 2006 18:07:24 -0000	1.1.2.3
@@ -0,0 +1,1051 @@
+From paul.moore at hp.com Thu Jul  6 17:34:08 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:58:56 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lwtel017542
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:58:56 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66Lws37006910;
+	Thu, 6 Jul 2006 17:58:54 -0400
+Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwpFP029574;
+	Thu, 6 Jul 2006 17:58:51 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel6.hp.com (Postfix) with ESMTP id 12BCC34343;
+	Thu,  6 Jul 2006 17:58:46 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id 887CC3473A;
+	Thu,  6 Jul 2006 21:58:45 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66LwjWn029005;
+	Thu, 6 Jul 2006 17:58:45 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66LwiZW029004;
+	Thu, 6 Jul 2006 17:58:44 -0400
+Message-Id: <20060706215844.756298000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:08 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 2/7] NetLabel: core network changes
+Content-Disposition: inline; filename=netlabel-net_core-2.6.17
+X-RedHat-Spam-Score: -99.715 
+Content-Type: 
+X-UID: 73474
+X-Length: 31296
+
+Changes to the core network stack to support the NetLabel subsystem.  This
+includes changes to the IPv4 option handling to support CIPSO labels, and a new
+NetLabel hook in inet_accept() to handle NetLabel attributes across a
+accept()s done by in-kernel daemons.
+---
+ include/linux/ip.h       |    1 
+ include/net/cipso_ipv4.h |  262 ++++++++++++++++++++
+ include/net/inet_sock.h  |    2 
+ include/net/netlabel.h   |  604 +++++++++++++++++++++++++++++++++++++++++++++++
+ net/ipv4/Makefile        |    1 
+ net/ipv4/af_inet.c       |    3 
+ net/ipv4/ah4.c           |    2 
+ net/ipv4/ip_options.c    |   19 +
+ 8 files changed, 892 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.17.i686-quilt/include/linux/ip.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/include/linux/ip.h
++++ linux-2.6.17.i686-quilt/include/linux/ip.h
+@@ -57,6 +57,7 @@
+ #define IPOPT_SEC	(2 |IPOPT_CONTROL|IPOPT_COPY)
+ #define IPOPT_LSRR	(3 |IPOPT_CONTROL|IPOPT_COPY)
+ #define IPOPT_TIMESTAMP	(4 |IPOPT_MEASUREMENT)
++#define IPOPT_CIPSO	(6 |IPOPT_CONTROL|IPOPT_COPY)
+ #define IPOPT_RR	(7 |IPOPT_CONTROL)
+ #define IPOPT_SID	(8 |IPOPT_CONTROL|IPOPT_COPY)
+ #define IPOPT_SSRR	(9 |IPOPT_CONTROL|IPOPT_COPY)
+Index: linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/include/net/cipso_ipv4.h
+@@ -0,0 +1,262 @@
++/*
++ * CIPSO - Commercial IP Security Option
++ *
++ * This is an implementation of the CIPSO 2.2 protocol as specified in
++ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
++ * FIPS-188, copies of both documents can be found in the Documentation
++ * directory.  While CIPSO never became a full IETF RFC standard many vendors
++ * have chosen to adopt the protocol and over the years it has become a
++ * de-facto standard for labeled networking.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef _CIPSO_IPV4_H
++#define _CIPSO_IPV4_H
++
++#include <linux/types.h>
++#include <linux/rcupdate.h>
++#include <linux/list.h>
++#include <net/netlabel.h>
++
++/* known doi values */
++#define CIPSO_V4_DOI_UNKNOWN          0x00000000
++
++/* tag types */
++#define CIPSO_V4_TAG_INVALID          0
++#define CIPSO_V4_TAG_RBITMAP          1
++#define CIPSO_V4_TAG_ENUM             2
++#define CIPSO_V4_TAG_RANGE            5
++#define CIPSO_V4_TAG_PBITMAP          6
++#define CIPSO_V4_TAG_FREEFORM         7
++
++/* doi mapping types */
++#define CIPSO_V4_MAP_UNKNOWN          0
++#define CIPSO_V4_MAP_STD              1
++#define CIPSO_V4_MAP_PASS             2
++
++/* limits */
++#define CIPSO_V4_MAX_REM_LVLS         256
++#define CIPSO_V4_INV_LVL              0x80000000
++#define CIPSO_V4_MAX_LOC_LVLS         (CIPSO_V4_INV_LVL - 1)
++#define CIPSO_V4_MAX_REM_CATS         65536
++#define CIPSO_V4_INV_CAT              0x80000000
++#define CIPSO_V4_MAX_LOC_CATS         (CIPSO_V4_INV_CAT - 1)
++
++/*
++ * CIPSO DOI definitions
++ */
++
++/* DOI definition struct */
++#define CIPSO_V4_TAG_MAXCNT           5
++struct cipso_v4_doi {
++	u32 doi;
++	u32 type;
++	union {
++		struct cipso_v4_std_map_tbl *std;
++	} map;
++	u8 tags[CIPSO_V4_TAG_MAXCNT];
++
++	u32 valid;
++	struct list_head list;
++	struct rcu_head rcu;
++	struct list_head dom_list;
++};
++
++/* Standard CIPSO mapping table */
++/* NOTE: the highest order bit (i.e. 0x80000000) is an 'invalid' flag, if the
++ *       bit is set then consider that value as unspecified, meaning the
++ *       mapping for that particular level/category is invalid */
++struct cipso_v4_std_map_tbl {
++	struct {
++		u32 *cipso;
++		u32 *local;
++		u32 cipso_size;
++		u32 local_size;
++	} lvl;
++	struct {
++		u32 *cipso;
++		u32 *local;
++		u32 cipso_size;
++		u32 local_size;
++	} cat;
++};
++
++/*
++ * Sysctl Variables
++ */
++
++#ifdef CONFIG_NETLABEL
++extern int cipso_v4_cache_enabled;
++extern int cipso_v4_cache_bucketsize;
++extern int cipso_v4_rbm_optfmt;
++extern int cipso_v4_rbm_strictvalid;
++#endif
++
++/*
++ * Helper Functions
++ */
++
++#define CIPSO_V4_OPTEXIST(x) (IPCB(x)->opt.cipso != 0)
++#define CIPSO_V4_OPTPTR(x) ((x)->nh.raw + IPCB(x)->opt.cipso)
++
++/*
++ * DOI List Functions
++ */
++
++#ifdef CONFIG_NETLABEL
++int cipso_v4_doi_add(struct cipso_v4_doi *doi_def);
++int cipso_v4_doi_remove(const u32 doi,
++			void (*callback) (struct rcu_head * head));
++struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi);
++struct sk_buff *cipso_v4_doi_dump(const u32 doi, const size_t headroom);
++int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain);
++int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
++			       const char *domain);
++#else
++static inline int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_doi_remove(const u32 doi,
++				    void (*callback) (struct rcu_head * head))
++{
++	return 0;
++}
++
++static inline struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi)
++{
++	return NULL;
++}
++
++static inline struct sk_buff *cipso_v4_doi_dump(const u32 doi,
++						const size_t headroom)
++{
++	return NULL;
++}
++
++static inline int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def,
++					  const char *domain)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
++					     const char *domain)
++{
++	return 0;
++}
++#endif /* CONFIG_NETLABEL */
++
++/*
++ * Label Mapping Cache Functions
++ */
++
++#ifdef CONFIG_NETLABEL
++void cipso_v4_cache_invalidate(void);
++int cipso_v4_cache_add(const struct sk_buff *skb,
++		       const struct netlbl_lsm_secattr *secattr);
++#else
++static inline void cipso_v4_cache_invalidate(void)
++{
++	return;
++}
++
++static inline int cipso_v4_cache_add(const struct sk_buff *skb,
++				     const struct netlbl_lsm_secattr *secattr)
++{
++	return 0;
++}
++#endif /* CONFIG_NETLABEL */
++
++/*
++ * Protocol Handling Functions
++ */
++
++#ifdef CONFIG_NETLABEL
++int cipso_v4_error(struct sk_buff *skb,
++		   const int error,
++		   const u32 gateway);
++int cipso_v4_socket_setopt(struct socket *sock,
++			   unsigned char *opt,
++			   u32 opt_len);
++int cipso_v4_socket_setattr(const struct socket *sock,
++			    const struct cipso_v4_doi *doi_def,
++			    const struct netlbl_lsm_secattr *secattr);
++int cipso_v4_socket_getopt(const struct socket *sock,
++			   unsigned char **opt,
++			   u32 *opt_len);
++int cipso_v4_socket_getattr(const struct socket *sock,
++			    struct netlbl_lsm_secattr *secattr);
++int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
++			    struct netlbl_lsm_secattr *secattr);
++int cipso_v4_validate(unsigned char **option);
++#else
++static inline int cipso_v4_error(struct sk_buff *skb,
++				 const int error,
++				 const u32 gateway)
++{
++	return 0;
++}
++
++static inline int cipso_v4_socket_setopt(struct socket *sock,
++					 unsigned char *opt,
++					 u32 opt_len)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_socket_setattr(const struct socket *sock,
++				  const struct cipso_v4_doi *doi_def,
++				  const struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_socket_getopt(const struct socket *sock,
++					 unsigned char **opt,
++					 u32 *opt_len)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_socket_getattr(const struct socket *sock,
++					  struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
++					  struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int cipso_v4_validate(unsigned char **option)
++{
++	return -ENOSYS;
++}
++#endif /* CONFIG_NETLABEL */
++
++#endif /* _CIPSO_IPV4_H */
+Index: linux-2.6.17.i686-quilt/include/net/inet_sock.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/include/net/inet_sock.h
++++ linux-2.6.17.i686-quilt/include/net/inet_sock.h
+@@ -52,7 +52,7 @@ struct ip_options {
+ 			ts_needtime:1,
+ 			ts_needaddr:1;
+ 	unsigned char	router_alert;
+-	unsigned char	__pad1;
++	unsigned char	cipso;
+ 	unsigned char	__pad2;
+ 	unsigned char	__data[0];
+ };
+Index: linux-2.6.17.i686-quilt/include/net/netlabel.h
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/include/net/netlabel.h
+@@ -0,0 +1,604 @@
++/*
++ * NetLabel System
++ *
++ * The NetLabel system manages static and dynamic label mappings for network
++ * protocols such as CIPSO and RIPSO.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef _NETLABEL_H
++#define _NETLABEL_H
++
++#include <linux/types.h>
++#include <linux/skbuff.h>
++#include <net/netlink.h>
++
++/*
++ * NetLabel - A management interface for maintaining network packet label
++ *            mapping tables for explicit packet labling protocols.
++ *
++ * Network protocols such as CIPSO and RIPSO require a label translation layer
++ * to convert the label on the packet into something meaningful on the host
++ * machine.  In the current Linux implementation these mapping tables live
++ * inside the kernel; NetLabel provides a mechanism for user space applications
++ * to manage these mapping tables.
++ *
++ * NetLabel makes use of the Generic NETLINK mechanism as a transport layer to
++ * send messages between kernel and user space.  The general format of a
++ * NetLabel message is shown below:
++ *
++ *  +-----------------+-------------------+--------- --- -- -
++ *  | struct nlmsghdr | struct genlmsghdr | payload
++ *  +-----------------+-------------------+--------- --- -- -
++ *
++ * The 'nlmsghdr' and 'genlmsghdr' structs should be dealt with like normal.
++ * The payload is dependent on the subsystem specified in the
++ * 'nlmsghdr->nlmsg_type' and should be defined below, supporting functions
++ * should be defined in the corresponding net/netlabel/netlabel_<subsys>.h|c
++ * file.  All of the fields in the NetLabel payload should be aligned using
++ * the alignment functions provided.
++ *
++ */
++
++/*
++ * NetLabel NETLINK protocol
++ */
++
++#define NETLBL_PROTO_VERSION            1
++
++/* NetLabel NETLINK types/families */
++#define NETLBL_NLTYPE_NONE              0
++#define NETLBL_NLTYPE_MGMT              1
++#define NETLBL_NLTYPE_MGMT_NAME         "NLBL_MGMT"
++#define NETLBL_NLTYPE_RIPSO             2
++#define NETLBL_NLTYPE_RIPSO_NAME        "NLBL_RIPSO"
++#define NETLBL_NLTYPE_CIPSOV4           3
++#define NETLBL_NLTYPE_CIPSOV4_NAME      "NLBL_CIPSOv4"
++#define NETLBL_NLTYPE_CIPSOV6           4
++#define NETLBL_NLTYPE_CIPSOV6_NAME      "NLBL_CIPSOv6"
++#define NETLBL_NLTYPE_UNLABELED         5
++#define NETLBL_NLTYPE_UNLABELED_NAME    "NLBL_UNLBL"
++
++/* NetLabel return codes */
++#define NETLBL_E_OK                     0
++
++/*
++ * Helper functions
++ */
++
++#define NETLBL_LEN_U8                   netlbl_align(1)
++#define NETLBL_LEN_U16                  netlbl_align(2)
++#define NETLBL_LEN_U32                  netlbl_align(4)
++/**
++ * netlbl_align - Align a NetLabel data chunk
++ * @len: the data chunk length
++ *
++ * Description:
++ * Return the aligned data chunk length.
++ *
++ */
++static inline size_t netlbl_align(const size_t length)
++{
++	return NLMSG_ALIGN(length);
++}
++
++/**
++ * netlbl_put_u8 - Write a u8 value into a buffer
++ * @buffer: the buffer
++ * @val: the value
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer.
++ *
++ */
++static inline void netlbl_put_u8(unsigned char *buffer, const u8 val)
++{
++	*(u8 *)buffer = val;
++}
++
++/**
++ * netlbl_put_u16 - Write a u16 value into a buffer
++ * @buffer: the buffer
++ * @val: the value
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer.
++ *
++ */
++static inline void netlbl_put_u16(unsigned char *buffer, const u16 val)
++{
++	*(u16 *)buffer = val;
++}
++
++/**
++ * netlbl_put_u32 - Write a u32 value into a buffer
++ * @buffer: the buffer
++ * @val: the value
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer.
++ *
++ */
++static inline void netlbl_put_u32(unsigned char *buffer, const u32 val)
++{
++	*(u32 *)buffer = val;
++}
++
++/**
++ * netlbl_put_str - Write a string into a buffer
++ * @buffer: the buffer
++ * @val: the string
++ *
++ * Description:
++ * Write the string specified in @val into the buffer specified by @buffer.
++ *
++ */
++static inline void netlbl_put_str(unsigned char *buffer, const char *val)
++{
++	strcpy((char *)buffer, val);
++}
++
++/**
++ * netlbl_put_hdr - Write a NETLINK header into a buffer
++ * @buffer: the buffer
++ * @msg_type: the NETLINK message type
++ * @msg_len: the NETLINK message length
++ * @msg_flags: the NETLINK message flags
++ * @msg_pid: the NETLINK message PID
++ * @msg_seq: the NETLINK message sequence number
++ *
++ * Description:
++ * Use the given values to write a NETLINK header into the given buffer.
++ *
++ */
++static inline void netlbl_put_hdr(unsigned char *buffer,
++				  const u32 msg_type,
++				  const u16 msg_len,
++				  const u16 msg_flags,
++				  const u32 msg_pid,
++				  const u32 msg_seq)
++{
++	struct nlmsghdr *hdr = (struct nlmsghdr *)buffer;
++	hdr->nlmsg_len = msg_len;
++	hdr->nlmsg_type = msg_type;
++	hdr->nlmsg_flags = msg_flags;
++	hdr->nlmsg_seq = msg_seq;
++	hdr->nlmsg_pid = msg_pid;
++}
++
++/**
++ * netlbl_putinc_u8 - Write a u8 value into a buffer and increment the buffer
++ * @buffer: the buffer
++ * @val: the value
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer
++ * and advance the buffer pointer past the newly written value.  If @rem_len
++ * is not NULL then decrement it by the field length.
++ *
++ */
++static inline void netlbl_putinc_u8(unsigned char **buffer,
++				    const u8 val,
++				    ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u8));
++	netlbl_put_u8(*buffer, val);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++}
++
++/**
++ * netlbl_putinc_u16 - Write a u16 value into a buffer and increment the buffer
++ * @buffer: the buffer
++ * @val: the value
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer
++ * and advance the buffer pointer past the newly written value.  If @rem_len
++ * is not NULL then decrement it by the field length.
++ *
++ */
++static inline void netlbl_putinc_u16(unsigned char **buffer,
++				     const u16 val,
++				     ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u16));
++	netlbl_put_u16(*buffer, val);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++}
++
++/**
++ * netlbl_putinc_u32 - Write a u32 value into a buffer and increment the buffer
++ * @buffer: the buffer
++ * @val: the value
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Write the value specified in @val into the buffer specified by @buffer
++ * and advance the buffer pointer past the newly written value.  If @rem_len
++ * is not NULL then decrement it by the field length.
++ *
++ */
++static inline void netlbl_putinc_u32(unsigned char **buffer,
++				     const u32 val,
++				     ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u32));
++	netlbl_put_u32(*buffer, val);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++}
++
++/**
++ * netlbl_putinc_str - Write a string into a buffer and increment the buffer
++ * @buffer: the buffer
++ * @val: the value
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Write the string specified in @val into the buffer specified by @buffer
++ * and advance the buffer pointer past the newly written value.  If @rem_len
++ * is not NULL then decrement it by the field length.
++ *
++ */
++static inline void netlbl_putinc_str(unsigned char **buffer,
++				     const char *val,
++				     ssize_t *rem_len)
++{
++	size_t len = netlbl_align(strlen(val) + 1);
++	netlbl_put_str(*buffer, val);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++}
++
++/**
++ * netlbl_put_hdr - Write a NETLINK header into a buffer and increment the ptr
++ * @buffer: the buffer
++ * @msg_type: the NETLINK message type
++ * @msg_len: the NETLINK message length
++ * @msg_flags: the NETLINK message flags
++ * @msg_pid: the NETLINK message PID
++ * @msg_seq: the NETLINK message sequence number
++ *
++ * Description:
++ * Use the given values to write a NETLINK header into the given buffer and
++ * then increment the buffer pointer past the header.
++ *
++ */
++static inline void netlbl_putinc_hdr(unsigned char **buffer,
++				     const u32 msg_type,
++				     const u16 msg_len,
++				     const u16 msg_flags,
++				     const u32 msg_pid,
++				     const u32 msg_seq)
++{
++	netlbl_put_hdr(*buffer,
++		       msg_type,
++		       msg_len,
++		       msg_flags,
++		       msg_pid,
++		       msg_seq);
++	*buffer += NLMSG_HDRLEN;
++}
++
++/**
++ * netlbl_get_u8 - Read a u8 value from a buffer
++ * @buffer: the buffer
++ *
++ * Description:
++ * Return a u8 value pointed to by @buffer.
++ *
++ */
++static inline u8 netlbl_get_u8(const unsigned char *buffer)
++{
++	return *(u8 *)buffer;
++}
++
++/**
++ * netlbl_get_u16 - Read a u16 value from a buffer
++ * @buffer: the buffer
++ *
++ * Description:
++ * Return a u16 value pointed to by @buffer.
++ *
++ */
++static inline u16 netlbl_get_u16(const unsigned char *buffer)
++{
++	return *(u16 *)buffer;
++}
++
++/**
++ * netlbl_get_u32 - Read a u32 value from a buffer
++ * @buffer: the buffer
++ *
++ * Description:
++ * Return a u32 value pointed to by @buffer.
++ *
++ */
++static inline u32 netlbl_get_u32(const unsigned char *buffer)
++{
++	return *(u32 *)buffer;
++}
++
++/**
++ * netlbl_getinc_u8 - Read a u8 value from a buffer and increment the buffer
++ * @buffer: the buffer
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Return a u8 value pointed to by @buffer and increment the buffer pointer
++ * past the value.  If @rem_len is not NULL, decrement it by the field size.
++ *
++ */
++static inline u8 netlbl_getinc_u8(unsigned char **buffer, ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u8));
++	u8 val = netlbl_get_u8(*buffer);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++	return val;
++}
++
++/**
++ * netlbl_getinc_u16 - Read a u16 value from a buffer and increment the buffer
++ * @buffer: the buffer
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Return a u16 value pointed to by @buffer and increment the buffer pointer
++ * past the value.  If @rem_len is not NULL, decrement it by the field size.
++ *
++ */
++static inline u16 netlbl_getinc_u16(unsigned char **buffer, ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u16));
++	u16 val = netlbl_get_u16(*buffer);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++	return val;
++}
++
++/**
++ * netlbl_getinc_u32 - Read a u32 value from a buffer and increment the buffer
++ * @buffer: the buffer
++ * @rem_len: remaining length
++ *
++ * Description:
++ * Return a u32 value pointed to by @buffer and increment the buffer pointer
++ * past the value.  If @rem_len is not NULL, decrement it by the field size.
++ *
++ */
++static inline u32 netlbl_getinc_u32(unsigned char **buffer, ssize_t *rem_len)
++{
++	size_t len = netlbl_align(sizeof(u32));
++	u32 val = netlbl_get_u32(*buffer);
++	*buffer += len;
++	if (rem_len != NULL)
++		*rem_len -= len;
++	return val;
++}
++
++/*
++ * NetLabel - Kernel API for accessing the network packet label mappings.
++ *
++ * The following functions are provided for use by other kernel modules,
++ * specifically kernel LSM modules, to provide a consistent, transparent API
++ * for dealing with explicit packet labeling protocols such as CIPSO and
++ * RIPSO.  The functions defined here are implemented in the
++ * net/netlabel/netlabel_kapi.c file.
++ *
++ */
++
++/* Domain mapping definition struct */
++struct netlbl_dom_map;
++
++/* Domain mapping operations */
++int netlbl_domhsh_remove(const char *domain);
++
++/* LSM security attributes */
++struct netlbl_lsm_cache {
++	void (*free) (const void *data);
++	void *data;
++};
++struct netlbl_lsm_secattr {
++	char *domain;
++
++	u32 mls_lvl;
++	unsigned char *mls_cat;
++	u32 mls_cat_len;
++
++	struct netlbl_lsm_cache cache;
++
++	u32 set_domain:1,
++	    set_mls_lvl:1,
++	    set_mls_cat:1,
++	    set_cache:1,
++	    __unused:28;
++};
++
++/*
++ * LSM security attribute operations
++ */
++
++/**
++ * netlbl_secattr_alloc - Allocate and initialize a netlbl_lsm_secattr struct
++ * @flags: the memory allocation flags
++ *
++ * Description:
++ * Allocate and initialize a netlbl_lsm_secattr struct.  Returns a valid
++ * pointer on success, or NULL on failure.
++ *
++ */
++static inline struct netlbl_lsm_secattr *netlbl_secattr_alloc(const int flags)
++{
++	return kzalloc(sizeof(struct netlbl_lsm_secattr), flags);
++}
++
++/**
++ * netlbl_secattr_free - Frees a netlbl_lsm_secattr struct
++ * @secattr: the struct to free
++ *
++ * Description:
++ * Frees @secattr including all of the internal buffers.
++ *
++ */
++static inline void netlbl_secattr_free(struct netlbl_lsm_secattr *secattr)
++{
++	BUG_ON(secattr == NULL);
++	if (secattr->set_domain)
++		kfree(secattr->domain);
++	if (secattr->set_mls_cat)
++		kfree(secattr->mls_cat);
++	if (secattr->set_cache && secattr->cache.free)
++		secattr->cache.free(secattr->cache.data);
++	kfree(secattr);
++}
++
++/**
++ * netlbl_secattr_init - Initialize a netlbl_lsm_secattr struct
++ * @secattr: the struct to initialize
++ *
++ * Description:
++ * Initialize an already allocated netlbl_lsm_secattr struct.  Returns zero on
++ * success, negative values on error.
++ *
++ */
++static inline int netlbl_secattr_init(struct netlbl_lsm_secattr *secattr)
++{
++	BUG_ON(secattr == NULL);
++	memset(secattr, 0, sizeof(*secattr));
++	return 0;
++}
++
++/**
++ * netlbl_secattr_destroy - Clears a netlbl_lsm_secattr struct
++ * @secattr: the struct to clear
++ *
++ * Description:
++ * Destroys the @secattr struct, including freeing all of the internal buffers.
++ * On return the struct is suitable for reuse.
++ *
++ */
++static inline void netlbl_secattr_destroy(struct netlbl_lsm_secattr *secattr)
++{
++	BUG_ON(secattr == NULL);
++	if (secattr->set_domain)
++		kfree(secattr->domain);
++	if (secattr->set_mls_cat)
++		kfree(secattr->mls_cat);
++	if (secattr->set_cache && secattr->cache.free)
++		secattr->cache.free(secattr->cache.data);
++	memset(secattr, 0, sizeof(*secattr));
++}
++
++/*
++ * LSM protocol operations
++ */
++
++#ifdef CONFIG_NETLABEL
++int netlbl_socket_setattr(const struct socket *sock,
++			  const struct netlbl_lsm_secattr *secattr);
++int netlbl_socket_peekattr(const struct socket *sock,
++			   struct netlbl_lsm_secattr *secattr);
++int netlbl_socket_getattr(const struct socket *sock,
++			  struct netlbl_lsm_secattr *secattr);
++int netlbl_skbuff_getattr(const struct sk_buff *skb,
++			  struct netlbl_lsm_secattr *secattr);
++int netlbl_skbuff_err(struct sk_buff *skb, int error);
++#else
++static inline int netlbl_socket_setattr(const struct socket *sock,
++				     const struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int netlbl_socket_peekattr(const struct socket *sock,
++					 struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int netlbl_socket_getattr(const struct socket *sock,
++					struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,
++					struct netlbl_lsm_secattr *secattr)
++{
++	return -ENOSYS;
++}
++
++static inline int netlbl_skbuff_err(struct sk_buff *skb, int error)
++{
++	return 0;
++}
++#endif /* CONFIG_NETLABEL */
++
++/*
++ * LSM label mapping cache operations
++ */
++
++#ifdef CONFIG_NETLABEL
++void netlbl_cache_invalidate(void);
++int netlbl_cache_add(const struct sk_buff *skb,
++		     const struct netlbl_lsm_secattr *secattr);
++#else
++static inline void netlbl_cache_invalidate(void)
++{
++	return;
++}
++
++static inline int netlbl_cache_add(const struct sk_buff *skb,
++				   const struct netlbl_lsm_secattr *secattr)
++{
++	return 0;
++}
++#endif /* CONFIG_NETLABEL */
++
++/*
++ * Network stack operations
++ */
++
++#ifdef CONFIG_NETLABEL
++void netlbl_socket_inet_accept(struct socket *sock, struct socket *newsock);
++#else
++static inline void netlbl_socket_inet_accept(struct socket *sock,
++					     struct socket *newsock)
++{
++	return;
++}
++#endif /* CONFIG_NETLABEL */
++
++#endif /* _NETLABEL_H */
+Index: linux-2.6.17.i686-quilt/net/ipv4/Makefile
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/ipv4/Makefile
++++ linux-2.6.17.i686-quilt/net/ipv4/Makefile
+@@ -42,6 +42,7 @@ obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybl
+ obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
+ obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
+ obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
++obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
+ 
+ obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
+ 		      xfrm4_output.o
+Index: linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/ipv4/af_inet.c
++++ linux-2.6.17.i686-quilt/net/ipv4/af_inet.c
+@@ -114,6 +114,7 @@
+ #ifdef CONFIG_IP_MROUTE
+ #include <linux/mroute.h>
+ #endif
++#include <net/netlabel.h>
+ 
+ DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
+ 
+@@ -616,6 +617,8 @@ int inet_accept(struct socket *sock, str
+ 
+ 	sock_graft(sk2, newsock);
+ 
++	netlbl_socket_inet_accept(sock, newsock);
++
+ 	newsock->state = SS_CONNECTED;
+ 	err = 0;
+ 	release_sock(sk2);
+Index: linux-2.6.17.i686-quilt/net/ipv4/ah4.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/ipv4/ah4.c
++++ linux-2.6.17.i686-quilt/net/ipv4/ah4.c
+@@ -35,7 +35,7 @@ static int ip_clear_mutable_options(stru
+ 		switch (*optptr) {
+ 		case IPOPT_SEC:
+ 		case 0x85:	/* Some "Extended Security" crap. */
+-		case 0x86:	/* Another "Commercial Security" crap. */
++		case IPOPT_CIPSO:
+ 		case IPOPT_RA:
+ 		case 0x80|21:	/* RFC1770 */
+ 			break;
+Index: linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/ipv4/ip_options.c
++++ linux-2.6.17.i686-quilt/net/ipv4/ip_options.c
+@@ -24,6 +24,7 @@
+ #include <net/ip.h>
+ #include <net/icmp.h>
+ #include <net/route.h>
++#include <net/cipso_ipv4.h>
+ 
+ /* 
+  * Write options to IP header, record destination address to
+@@ -194,6 +195,13 @@ int ip_options_echo(struct ip_options * 
+ 			dopt->is_strictroute = sopt->is_strictroute;
+ 		}
+ 	}
++	if (sopt->cipso) {
++		optlen  = sptr[sopt->cipso+1];
++		dopt->cipso = dopt->optlen+sizeof(struct iphdr);
++		memcpy(dptr, sptr+sopt->cipso, optlen);
++		dptr += optlen;
++		dopt->optlen += optlen;
++	}
+ 	while (dopt->optlen & 3) {
+ 		*dptr++ = IPOPT_END;
+ 		dopt->optlen++;
+@@ -435,6 +443,17 @@ int ip_options_compile(struct ip_options
+ 			if (optptr[2] == 0 && optptr[3] == 0)
+ 				opt->router_alert = optptr - iph;
+ 			break;
++		      case IPOPT_CIPSO:
++		        if (opt->cipso) {
++				pp_ptr = optptr;
++				goto error;
++			}
++			opt->cipso = optptr - iph;
++		        if (cipso_v4_validate(&optptr)) {
++				pp_ptr = optptr;
++				goto error;
++			}
++			break;
+ 		      case IPOPT_SEC:
+ 		      case IPOPT_SID:
+ 		      default:
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_3_7.patch:
 include/linux/sysctl.h     |    4 
 net/ipv4/cipso_ipv4.c      | 1761 +++++++++++++++++++++++++++++++++++++++++++++
 net/ipv4/sysctl_net_ipv4.c |   35 
 3 files changed, 1800 insertions(+)

Index: linux-2.6-net-label_3_7.patch
===================================================================
RCS file: linux-2.6-net-label_3_7.patch
diff -N linux-2.6-net-label_3_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_3_7.patch	8 Jul 2006 18:07:24 -0000	1.1.2.3
@@ -0,0 +1,1898 @@
+From paul.moore at hp.com Thu Jul  6 17:34:09 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:59:11 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66LxAel017613
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:59:10 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66Lx9Dp007056;
+	Thu, 6 Jul 2006 17:59:09 -0400
+Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k66Lwpks019716;
+	Thu, 6 Jul 2006 17:58:57 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel8.hp.com (Postfix) with ESMTP id AF9113413D;
+	Thu,  6 Jul 2006 17:58:46 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id 317C13473B;
+	Thu,  6 Jul 2006 21:58:46 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66LwjIF029034;
+	Thu, 6 Jul 2006 17:58:45 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66LwjnO029033;
+	Thu, 6 Jul 2006 17:58:45 -0400
+Message-Id: <20060706215845.411340000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:09 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 3/7] NetLabel: CIPSOv4 engine
+Content-Disposition: inline; filename=netlabel-net_cipsov4-2.6.17
+X-RedHat-Spam-Score: -99.822 
+Content-Type: 
+X-UID: 73482
+X-Length: 55950
+
+Add support for the Commercial IP Security Option (CIPSO) to the IPv4 network
+stack.  CIPSO has become a de-facto standard for trusted/labeled networking
+amongst existing Trusted Operating Systems such as Trusted Solaris, HP-UX CMW,
+etc.  This implementation is designed to be used with the NetLabel subsystem
+to provide explicit packet labeling to LSM developers.
+
+The CIPSO/IPv4 packet labeling works by the LSM calling a NetLabel API function
+which attaches a CIPSO label (IPv4 option) to a given socket; this in turn
+attaches the CIPSO label to every packet leaving the socket without any extra
+processing on the outbound side.  On the inbound side the individual packet's
+sk_buff is examined through a call to a NetLabel API function to determine if a
+CIPSO/IPv4 label is present and if so the security attributes of the CIPSO
+label are returned to the caller of the NetLabel API function.
+---
+ include/linux/sysctl.h     |    4 
+ net/ipv4/cipso_ipv4.c      | 1761 +++++++++++++++++++++++++++++++++++++++++++++
+ net/ipv4/sysctl_net_ipv4.c |   35 
+ 3 files changed, 1800 insertions(+)
+
+Index: linux-2.6.17.i686-quilt/include/linux/sysctl.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/include/linux/sysctl.h
++++ linux-2.6.17.i686-quilt/include/linux/sysctl.h
+@@ -407,6 +407,10 @@ enum
+  	NET_TCP_MTU_PROBING=113,
+ 	NET_TCP_BASE_MSS=114,
+ 	NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
++	NET_CIPSOV4_CACHE_ENABLE=116,
++	NET_CIPSOV4_CACHE_BUCKET_SIZE=117,
++	NET_CIPSOV4_RBM_OPTFMT=118,
++	NET_CIPSOV4_RBM_STRICTVALID=119,
+ };
+ 
+ enum {
+Index: linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/ipv4/cipso_ipv4.c
+@@ -0,0 +1,1761 @@
++/*
++ * CIPSO - Commercial IP Security Option
++ *
++ * This is an implementation of the CIPSO 2.2 protocol as specified in
++ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
++ * FIPS-188, copies of both documents can be found in the Documentation
++ * directory.  While CIPSO never became a full IETF RFC standard many vendors
++ * have chosen to adopt the protocol and over the years it has become a
++ * de-facto standard for labeled networking.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/rcupdate.h>
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/string.h>
++#include <linux/module.h>
++#include <linux/jhash.h>
++#include <net/ip.h>
++#include <net/icmp.h>
++#include <net/tcp.h>
++#include <net/netlabel.h>
++#include <net/cipso_ipv4.h>
++#include <asm/bug.h>
++
++struct cipso_v4_domhsh_entry {
++	char *domain;
++	u32 valid;
++	struct list_head list;
++	struct rcu_head rcu;
++};
++
++/* List of available DOI definitions */
++/* XXX - Updates should be minimal so having a single lock for the
++   cipso_v4_doi_list and the cipso_v4_doi_list->dom_list should be
++   okay. */
++/* XXX - This currently assumes a minimal number of different DOIs in use,
++   if in practice there are a lot of different DOIs this list should
++   probably be turned into a hash table or something similar so we
++   can do quick lookups. */
++DEFINE_SPINLOCK(cipso_v4_doi_list_lock);
++static struct list_head cipso_v4_doi_list = LIST_HEAD_INIT(cipso_v4_doi_list);
++
++/* Label mapping cache */
++int cipso_v4_cache_enabled = 1;
++int cipso_v4_cache_bucketsize = 10;
++#define CIPSO_V4_CACHE_BUCKETBITS     7
++#define CIPSO_V4_CACHE_BUCKETS        (1 << CIPSO_V4_CACHE_BUCKETBITS)
++#define CIPSO_V4_CACHE_REORDERLIMIT   10
++struct cipso_v4_map_cache_bkt {
++	spinlock_t lock;
++	u32 size;
++	struct list_head list;
++};
++struct cipso_v4_map_cache_entry {
++	u32 hash;
++	unsigned char *key;
++	u32 key_len;
++
++	struct netlbl_lsm_cache lsm_data;
++
++	u32 activity;
++	struct list_head list;
++};
++static u32 cipso_v4_cache_size = 0;
++static struct cipso_v4_map_cache_bkt *cipso_v4_cache = NULL;
++#define CIPSO_V4_CACHE_ENABLED (cipso_v4_cache_enabled &&		\
++				cipso_v4_cache_bucketsize > 0 &&	\
++				cipso_v4_cache_size > 0)
++
++/* Restricted bitmap (tag #1) flags */
++int cipso_v4_rbm_optfmt = 0;
++int cipso_v4_rbm_strictvalid = 1;
++
++/*
++ * Helper Functions
++ */
++
++/**
++ * cipso_v4_bitmap_walk - Walk a bitmap looking for a bit
++ * @bitmap: the bitmap
++ * @bitmap_len: length in bits
++ * @offset: starting offset
++ * @state: if non-zero, look for a set (1) bit else look for a cleared (0) bit
++ *
++ * Description:
++ * Starting at @offset, walk the bitmap from left to right until either the
++ * desired bit is found or we reach the end.  Return the bit offset, -1 if
++ * not found, or -2 if error.
++ */
++static int cipso_v4_bitmap_walk(const unsigned char *bitmap,
++				const u32 bitmap_len,
++				const u32 offset,
++				const u8 state)
++{
++	u32 bit_spot;
++	u32 byte_offset;
++	unsigned char bitmask;
++	unsigned char byte;
++
++	/* gcc always rounds to zero when doing integer division */
++	byte_offset = offset / 8;
++	byte = bitmap[byte_offset];
++	bit_spot = offset;
++	bitmask = 0x80 >> offset % 8;
++
++	/* XXX - probably should use include/asm/bitops.h if we can */
++	while (bit_spot < bitmap_len) {
++		if ((state && (byte & bitmask) == bitmask) ||
++		    (state == 0 && (byte & bitmask) == 0))
++			return bit_spot;
++
++		bit_spot++;
++		bitmask >>= 1;
++		if (bitmask == 0) {
++			byte = bitmap[++byte_offset];
++			bitmask = 0x80;
++		}
++	}
++
++	return -1;
++}
++
++/**
++ * cipso_v4_bitmap_setbit - Sets a single bit in a bitmap
++ * @bitmap: the bitmap
++ * @bit: the bit
++ * @state: if non-zero, set the bit (1) else clear the bit (0)
++ *
++ * Description:
++ * Set a single bit in the bitmask.  Returns zero on success, negative values
++ * on error.
++ */
++static void cipso_v4_bitmap_setbit(unsigned char *bitmap,
++				   const u32 bit,
++				   const u8 state)
++{
++	u32 byte_spot;
++	u8 bitmask;
++
++	/* gcc always rounds to zero when doing integer division */
++	byte_spot = bit / 8;
++	bitmask = 0x80 >> bit % 8;
++	if (state)
++		bitmap[byte_spot] |= bitmask;
++	else
++		bitmap[byte_spot] &= ~bitmask;
++}
++
++/**
++ * cipso_v4_doi_domhsh_free - Frees a domain list entry
++ * @entry: the entry's RCU field
++ *
++ * Description:
++ * This function is designed to be used as a callback to the call_rcu()
++ * function so that the memory allocated to a domain list entry can be released
++ * safely.
++ *
++ */
++static void cipso_v4_doi_domhsh_free(struct rcu_head *entry)
++{
++	struct cipso_v4_domhsh_entry *ptr;
++
++	ptr = container_of(entry, struct cipso_v4_domhsh_entry, rcu);
++	if (ptr->domain)
++		kfree(ptr->domain);
++	kfree(ptr);
++}
++
++/**
++ * cipso_v4_cache_entry_free - Frees a cache entry
++ * @entry: the entry to free
++ *
++ * Description:
++ * This function frees the memory associated with a cache entry.
++ *
++ */
++static void cipso_v4_cache_entry_free(struct cipso_v4_map_cache_entry *entry)
++{
++	if (entry->lsm_data.free)
++		entry->lsm_data.free(entry->lsm_data.data);
++	if (entry->key)
++		kfree(entry->key);
++	kfree(entry);
++}
++
++/**
++ * cipso_v4_map_cache_hash - Hashing function for the CIPSO cache
++ * @key: the hash key
++ * @key_len: the length of the key in bytes
++ *
++ * Description:
++ * The CIPSO tag hashing function.  Returns a 32-bit hash value.
++ *
++ */
++static u32 cipso_v4_map_cache_hash(const unsigned char *key, const u32 key_len)
++{
++	return jhash(key, key_len, 0);
++}
++
++/*
++ * Label Mapping Cache Functions
++ */
++
++/**
++ * cipso_v4_cache_init - Initialize the CIPSO cache
++ * @bkt_size: the number of cache buckets
++ *
++ * Description:
++ * Initializes the CIPSO label mapping cache, this function should be called
++ * before any of the other functions defined in this file.  Returns zero on
++ * success, negative values on error.
++ *
++ */
++static int cipso_v4_cache_init(const u32 bkt_size)
++{
++	struct cipso_v4_map_cache_bkt *cache;
++	u32 iter;
++
++	if (bkt_size == 0)
++		return -EINVAL;
++
++	cache = kcalloc(bkt_size,
++			sizeof(struct cipso_v4_map_cache_bkt), GFP_KERNEL);
++	if (cache == NULL)
++		return -ENOMEM;
++
++	for (iter = 0; iter < bkt_size; iter++) {
++		cache[iter].lock = SPIN_LOCK_UNLOCKED;
++		cache[iter].size = 0;
++		INIT_LIST_HEAD(&cache[iter].list);
++	}
++	cipso_v4_cache = cache;
++	cipso_v4_cache_size = bkt_size;
++
++	return 0;
++}
++
++/**
++ * cipso_v4_cache_destroy - Destroy the CIPSO cache
++ *
++ * Description:
++ * Clears the CIPSO cache and frees all the memory.  This function does not
++ * hold any locks and should only be called when the module is being unloaded.
++ *
++ */
++static int cipso_v4_cache_destroy(void)
++{
++	struct cipso_v4_map_cache_bkt *cache;
++	struct cipso_v4_map_cache_entry *entry;
++	u32 cache_size;
++	u32 iter;
++
++	cache = cipso_v4_cache;
++	cache_size = cipso_v4_cache_size;
++	cipso_v4_cache_size = 0;
++	cipso_v4_cache = NULL;
++
++	for (iter = 0; iter < cache_size; iter++)
++		list_for_each_entry(entry, &cache[iter].list, list) {
++			list_del(&entry->list);
++			cipso_v4_cache_entry_free(entry);
++		}
++
++	return 0;
++}
++
++/**
++ * cipso_v4_cache_invalidate - Invalidates the current CIPSO cache
++ *
++ * Description:
++ * Invalidates and frees any entries in the CIPSO cache.  Returns zero on
++ * success and negative values on failure.
++ *
++ */
++void cipso_v4_cache_invalidate(void)
++{
++	struct cipso_v4_map_cache_entry *entry, *tmp_entry;
++	u32 iter;
++
++	if (cipso_v4_cache_size == 0)
++		return;
++
++	for (iter = 0; iter < cipso_v4_cache_size; iter++) {
++		spin_lock(&cipso_v4_cache[iter].lock);
++		list_for_each_entry_safe(entry,
++					 tmp_entry,
++					 &cipso_v4_cache[iter].list, list) {
++			list_del(&entry->list);
++			cipso_v4_cache_entry_free(entry);
++		}
++		cipso_v4_cache[iter].size = 0;
++		spin_unlock(&cipso_v4_cache[iter].lock);
++	}
++
++	return;
++}
++
++/**
++ * cipso_v4_cache_check - Check the CIPSO cache for a label mapping
++ * @key: the buffer to check
++ * @key_len: buffer length in bytes
++ * @secattr: the security attribute struct to use
++ *
++ * Description:
++ * This function checks the cache to see if a label mapping already exists for
++ * the given key.  If there is a match then the cache is adjusted and the
++ * @secattr struct is populated with the correct LSM security attributes.  The
++ * cache is adjusted in the following manner if the entry is not already the
++ * first in the cache bucket:
++ *
++ *  1. The cache entry's activity counter is incremented
++ *  2. The previous (higher ranking) entry's activity counter is decremented
++ *  3. If the difference between the two activity counters is geater than
++ *     CIPSO_V4_CACHE_REORDERLIMIT the two entries are swapped
++ *
++ * Returns zero on success, -ENOENT for a cache miss, and other negative values
++ * on error.
++ *
++ */
++static int cipso_v4_cache_check(const unsigned char *key,
++				const u32 key_len,
++				struct netlbl_lsm_secattr *secattr)
++{
++	u32 bkt;
++	struct cipso_v4_map_cache_entry *entry;
++	struct cipso_v4_map_cache_entry *prev_entry = NULL;
++	u32 hash;
++
++	if (!CIPSO_V4_CACHE_ENABLED)
++		return -ENOENT;
++
++	hash = cipso_v4_map_cache_hash(key, key_len);
++	bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
++	spin_lock(&cipso_v4_cache[bkt].lock);
++	list_for_each_entry(entry, &cipso_v4_cache[bkt].list, list) {
++		if (entry->hash == hash &&
++		    entry->key_len == key_len &&
++		    memcmp(entry->key, key, key_len) == 0) {
++			entry->activity += 1;
++
++			if (prev_entry != NULL) {
++				if (prev_entry->activity > 0)
++					prev_entry->activity -= 1;
++
++				if (entry->activity > prev_entry->activity &&
++				    entry->activity - prev_entry->activity >
++				    CIPSO_V4_CACHE_REORDERLIMIT) {
++					__list_del(entry->list.prev,
++						   entry->list.next);
++					__list_add(&entry->list,
++						   prev_entry->list.prev,
++						   &prev_entry->list);
++				}
++			}
++
++			secattr->cache.free = entry->lsm_data.free;
++			secattr->cache.data = entry->lsm_data.data;
++			spin_unlock(&cipso_v4_cache[bkt].lock);
++
++			secattr->set_cache = 1;
++			return 0;
++		}
++		prev_entry = entry;
++	}
++	spin_unlock(&cipso_v4_cache[bkt].lock);
++
++	return -ENOENT;
++}
++
++/**
++ * cipso_v4_cache_add - Add an entry to the CIPSO cache
++ * @skb: the packet
++ * @secattr: the packet's security attributes
++ *
++ * Description:
++ * Add a new entry into the CIPSO label mapping cache.  Add the new entry to
++ * head of the cache bucket's list, if the cache bucket is out of room remove
++ * the last entry in the list first.  It is important to note that there is
++ * currently no checking for duplicate keys.  Returns zero on success,
++ * negative values on failure.
++ *
++ */
++int cipso_v4_cache_add(const struct sk_buff *skb,
++		       const struct netlbl_lsm_secattr *secattr)
++{
++	int ret_val = -EPERM;
++	u32 bkt;
++	struct cipso_v4_map_cache_entry *entry = NULL;
++	struct cipso_v4_map_cache_entry *old_entry = NULL;
++	unsigned char *cipso_ptr;
++	u32 cipso_ptr_len;
++
++	if (!CIPSO_V4_CACHE_ENABLED)
++		return 0;
++
++	cipso_ptr = CIPSO_V4_OPTPTR(skb);
++	cipso_ptr_len = cipso_ptr[1];
++
++	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
++	if (entry == NULL)
++		return -ENOMEM;
++	entry->key = kmalloc(cipso_ptr_len, GFP_ATOMIC);
++	if (entry->key == NULL) {
++		ret_val = -ENOMEM;
++		goto cache_add_failure;
++	}
++	memcpy(entry->key, cipso_ptr, cipso_ptr_len);
++	entry->key_len = cipso_ptr_len;
++	entry->hash = cipso_v4_map_cache_hash(cipso_ptr, cipso_ptr_len);
++	entry->lsm_data.free = secattr->cache.free;
++	entry->lsm_data.data = secattr->cache.data;
++
++	bkt = entry->hash & (CIPSO_V4_CACHE_BUCKETBITS - 1);
++	spin_lock(&cipso_v4_cache[bkt].lock);
++	if (cipso_v4_cache[bkt].size < cipso_v4_cache_bucketsize) {
++		list_add(&entry->list, &cipso_v4_cache[bkt].list);
++		cipso_v4_cache[bkt].size += 1;
++	} else {
++		old_entry = list_entry(cipso_v4_cache[bkt].list.prev,
++				       struct cipso_v4_map_cache_entry, list);
++		list_del(&old_entry->list);
++		list_add(&entry->list, &cipso_v4_cache[bkt].list);
++		cipso_v4_cache_entry_free(old_entry);
++	}
++	spin_unlock(&cipso_v4_cache[bkt].lock);
++
++	return 0;
++
++cache_add_failure:
++	if (entry)
++		cipso_v4_cache_entry_free(entry);
++	return ret_val;
++}
++
++/*
++ * DOI List Functions
++ */
++
++/**
++ * cipso_v4_doi_search - Searches for a DOI definition
++ * @doi: the DOI to search for
++ *
++ * Description:
++ * Search the DOI definition list for a DOI definition with a DOI value that
++ * matches @doi.  The caller is responsibile for calling rcu_read_[un]lock().
++ * Returns a pointer to the DOI definition on success and NULL on failure.
++ */
++static struct cipso_v4_doi *cipso_v4_doi_search(const u32 doi)
++{
++	struct cipso_v4_doi *iter;
++
++	list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
++		if (iter->doi == doi && iter->valid)
++			return iter;
++	return NULL;
++}
++
++/**
++ * cipso_v4_doi_add - Add a new DOI to the CIPSO protocol engine
++ * @doi_def: the DOI structure
++ *
++ * Description:
++ * The caller defines a new DOI for use by the CIPSO engine and calls this
++ * function to add it to the list of acceptable domains.  The caller must
++ * ensure that the mapping table specified in @doi_def->map meets all of the
++ * requirements of the mapping type (see cipso_ipv4.h for details).  Returns
++ * zero on success and non-zero on failure.
++ *
++ */
++int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
++{
++	if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
++		return -EINVAL;
++
++	doi_def->valid = 1;
++	INIT_RCU_HEAD(&doi_def->rcu);
++	INIT_LIST_HEAD(&doi_def->dom_list);
++
++	rcu_read_lock();
++	if (cipso_v4_doi_search(doi_def->doi) != NULL) {
++		rcu_read_unlock();
++		return -EEXIST;
++	}
++	spin_lock(&cipso_v4_doi_list_lock);
++	list_add_tail_rcu(&doi_def->list, &cipso_v4_doi_list);
++	spin_unlock(&cipso_v4_doi_list_lock);
++	rcu_read_unlock();
++
++	return 0;
++}
++
++/**
++ * cipso_v4_doi_remove - Remove an existing DOI from the CIPSO protocol engine
++ * @doi: the DOI value
++ * @callback: the DOI cleanup/free callback
++ *
++ * Description:
++ * Removes a DOI definition from the CIPSO engine, @callback is called to
++ * free any memory.  The NetLabel routines will be called to release their own
++ * LSM domain mappings as well as our own domain list.  Returns zero on
++ * success and negative values on failure.
++ *
++ */
++int cipso_v4_doi_remove(const u32 doi,
++			void (*callback) (struct rcu_head * head))
++{
++	struct cipso_v4_doi *doi_def;
++	struct cipso_v4_domhsh_entry *dom_iter;
++
++	rcu_read_lock();
++	doi_def = cipso_v4_doi_search(doi);
++	if (doi_def != NULL) {
++		spin_lock(&cipso_v4_doi_list_lock);
++		doi_def->valid = 0;
++		list_del_rcu(&doi_def->list);
++		spin_unlock(&cipso_v4_doi_list_lock);
++		list_for_each_entry_rcu(dom_iter, &doi_def->dom_list, list)
++			if (dom_iter->valid)
++				netlbl_domhsh_remove(dom_iter->domain);
++		cipso_v4_cache_invalidate();
++		rcu_read_unlock();
++
++		call_rcu(&doi_def->rcu, callback);
++		return 0;
++	}
++	rcu_read_unlock();
++
++	return -ENOENT;
++}
++
++/**
++ * cipso_v4_doi_getdef - Returns a pointer to a valid DOI definition
++ * @doi: the DOI value
++ *
++ * Description:
++ * Searches for a valid DOI definition and if one is found it is returned to
++ * the caller.  Otherwise NULL is returned.  The caller must ensure that
++ * rcu_read_lock() is held while accessing the returned definition.
++ *
++ */
++struct cipso_v4_doi *cipso_v4_doi_getdef(const u32 doi)
++{
++	return cipso_v4_doi_search(doi);
++}
++
++/**
++ * cipso_v4_doi_dump - Dump the CIPSO DOI definitions into a sk_buff
++ * @doi: the DOI value
++ * @headroom: the amount of headroom to allocate for the sk_buff
++ *
++ * Description:
++ * If the @doi value is zero then dump a list of all the configured DOI values
++ * into a sk_buff.  If the @doi value is non-zero, lookup the match DOI
++ * definition and dump it's contents into a sk_buff.  The returned sk_buff has
++ * room at the front of the sk_buff for @headroom bytes.  See
++ * netlabel_cipso_v4.h for the LIST message format.  This function may fail if
++ * another process is changing the DOI list at the same time.  Returns a
++ * pointer to a sk_buff on success, NULL on error.
++ *
++ */
++struct sk_buff *cipso_v4_doi_dump(const u32 doi, const size_t headroom)
++{
++	struct sk_buff *skb;
++	unsigned char *buf;
++	struct cipso_v4_doi *iter;
++	u32 doi_cnt = 0;
++	u32 tag_cnt = 0;
++	u32 lvl_cnt = 0;
++	u32 cat_cnt = 0;
++        ssize_t buf_len;
++	ssize_t tmp_len;
++
++	/* XXX - In both cases, this is kinda ugly as we have to go through
++	   the list once to determine how large of a buffer we need,
++	   drop the locks, allocate the buffer, grab the locks, and
++	   finally fill the buffer.  The problem is that there is that
++	   open window where the table could grow and we will end up
++	   short on space. */
++
++	if (doi == 0) {
++		buf_len = NETLBL_LEN_U32;
++		rcu_read_lock();
++		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
++			if (iter->valid) {
++				doi_cnt += 1;
++				buf_len += 2 * NETLBL_LEN_U32;
++			}
++		rcu_read_unlock();
++
++		skb = alloc_skb(NLMSG_ALIGN(headroom + buf_len), GFP_KERNEL);
++		if (skb == NULL)
++			return NULL;
++		skb_reserve(skb, headroom);
++		tmp_len = skb_tailroom(skb);
++		if (tmp_len < buf_len)
++			goto doi_dump_failure;
++		buf = skb_put(skb, buf_len);
++		netlbl_putinc_u32(&buf, doi_cnt, &buf_len);
++
++		rcu_read_lock();
++		list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
++			if (iter->valid) {
++				if (buf_len < 2 * NETLBL_LEN_U32) {
++					rcu_read_unlock();
++					goto doi_dump_failure;
++				}
++				netlbl_putinc_u32(&buf, iter->doi, &buf_len);
++				netlbl_putinc_u32(&buf, iter->type, &buf_len);
++			}
++		rcu_read_unlock();
++	} else {
++		rcu_read_lock();
++		iter = cipso_v4_doi_getdef(doi);
++		if (iter == NULL) {
++			rcu_read_unlock();
++			return NULL;
++		}
++		buf_len = NETLBL_LEN_U32;
++		switch (iter->type) {
++		case CIPSO_V4_MAP_PASS:
++			buf_len += NETLBL_LEN_U32;
++			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
++			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
++				tag_cnt += 1;
++				buf_len += NETLBL_LEN_U8;
++			}
++			break;
++		case CIPSO_V4_MAP_STD:
++			buf_len += 3 * NETLBL_LEN_U32;
++			while (tag_cnt < CIPSO_V4_TAG_MAXCNT &&
++			       iter->tags[tag_cnt] != CIPSO_V4_TAG_INVALID) {
++				tag_cnt += 1;
++				buf_len += NETLBL_LEN_U8;
++			}
++			for (tmp_len = 0;
++			     tmp_len < iter->map.std->lvl.local_size;
++			     tmp_len++)
++				if (iter->map.std->lvl.local[tmp_len] !=
++				    CIPSO_V4_INV_LVL) {
++					lvl_cnt += 1;
++					buf_len += NETLBL_LEN_U32 +
++						NETLBL_LEN_U8;
++				}
++			for (tmp_len = 0;
++			     tmp_len < iter->map.std->cat.local_size;
++			     tmp_len++)
++				if (iter->map.std->cat.local[tmp_len] !=
++				    CIPSO_V4_INV_CAT) {
++					cat_cnt += 1;
++					buf_len += NETLBL_LEN_U32 +
++						NETLBL_LEN_U16;
++				}
++			break;
++		default:
++			rcu_read_unlock();
++			return NULL;
++		}
++		rcu_read_unlock();
++
++		skb = alloc_skb(NLMSG_ALIGN(headroom + buf_len), GFP_KERNEL);
++		if (skb == NULL)
++			return NULL;
++		skb_reserve(skb, headroom);
++		tmp_len = skb_tailroom(skb);
++		if (tmp_len < buf_len)
++			goto doi_dump_failure;
++		buf = skb_put(skb, buf_len);
++		netlbl_putinc_u32(&buf, iter->type, &buf_len);
++
++		rcu_read_lock();
++		if (iter != cipso_v4_doi_getdef(doi)) {
++			rcu_read_unlock();
++			goto doi_dump_failure;
++		}
++		switch (iter->type) {
++		case CIPSO_V4_MAP_PASS:
++			netlbl_putinc_u32(&buf, tag_cnt, &buf_len);
++			for (tmp_len = 0;
++			     tmp_len < CIPSO_V4_TAG_MAXCNT &&
++			     iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID;
++			     tmp_len++) {
++				if (buf_len < NETLBL_LEN_U8) {
++					rcu_read_unlock();
++					goto doi_dump_failure;
++				}
++				netlbl_putinc_u8(&buf,
++						 iter->tags[tmp_len],
++						 &buf_len);
++			}
++			break;
++		case CIPSO_V4_MAP_STD:
++			netlbl_putinc_u32(&buf, tag_cnt, &buf_len);
++			netlbl_putinc_u32(&buf, lvl_cnt, &buf_len);
++			netlbl_putinc_u32(&buf, cat_cnt, &buf_len);
++			for (tmp_len = 0;
++			     tmp_len < CIPSO_V4_TAG_MAXCNT &&
++			     iter->tags[tmp_len] != CIPSO_V4_TAG_INVALID;
++			     tmp_len++) {
++				if (buf_len < NETLBL_LEN_U8) {
++					rcu_read_unlock();
++					goto doi_dump_failure;
++				}
++				netlbl_putinc_u8(&buf,
++						 iter->tags[tmp_len],
++						 &buf_len);
++			}
++			for (tmp_len = 0;
++			     tmp_len < iter->map.std->lvl.local_size;
++			     tmp_len++) {
++				if (iter->map.std->lvl.local[tmp_len] !=
++				    CIPSO_V4_INV_LVL) {
++					if (buf_len < 2 * NETLBL_LEN_U32) {
++						rcu_read_unlock();
++						goto doi_dump_failure;
++					}
++					netlbl_putinc_u32(&buf,
++							  tmp_len,
++							  &buf_len);
++					netlbl_putinc_u8(
++					    &buf,
++					    iter->map.std->lvl.local[tmp_len],
++					    &buf_len);
++				}
++			}
++			for (tmp_len = 0;
++			     tmp_len < iter->map.std->cat.local_size;
++			     tmp_len++) {
++				if (iter->map.std->cat.local[tmp_len] !=
++				    CIPSO_V4_INV_CAT) {
++					if (buf_len < 2 * NETLBL_LEN_U32) {
++						rcu_read_unlock();
++						goto doi_dump_failure;
++					}
++					netlbl_putinc_u32(&buf,
++							  tmp_len,
++							  &buf_len);
++					netlbl_putinc_u16(
++					    &buf,
++					    iter->map.std->cat.local[tmp_len],
++					    &buf_len);
++				}
++			}
++			break;
++		}
++		rcu_read_unlock();
++	}
++
++	return skb;
++
++doi_dump_failure:
++	kfree(skb);
++	return NULL;
++}
++
++/**
++ * cipso_v4_doi_domhsh_add - Adds a domain entry to a DOI definition
++ * @doi_def: the DOI definition
++ * @domain: the domain to add
++ *
++ * Description:
++ * Adds the @domain to the the DOI specified by @doi_def, this function
++ * should only be called by external functions (i.e. NetLabel).  This function
++ * does allocate memory.  Returns zero on success, negative values on failure.
++ *
++ */
++int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain)
++{
++	struct cipso_v4_domhsh_entry *iter;
++	struct cipso_v4_domhsh_entry *new_dom;
++
++	new_dom = kzalloc(sizeof(*new_dom), GFP_KERNEL);
++	if (new_dom == NULL)
++		return -ENOMEM;
++	if (domain) {
++		new_dom->domain = kstrdup(domain, GFP_KERNEL);
++		if (new_dom->domain == NULL) {
++			kfree(new_dom);
++			return -ENOMEM;
++		}
++	}
++	new_dom->valid = 1;
++	INIT_RCU_HEAD(&new_dom->rcu);
++
++	rcu_read_lock();
++	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
++		if (iter->valid &&
++		    ((domain != NULL && iter->domain != NULL &&
++		      strcmp(iter->domain, domain) == 0) ||
++		     (domain == NULL && iter->domain == NULL))) {
++			rcu_read_unlock();
++			if (new_dom->domain != NULL)
++				kfree(new_dom->domain);
++			kfree(new_dom);
++			return -EEXIST;
++		}
++	spin_lock(&cipso_v4_doi_list_lock);
++	list_add_tail_rcu(&new_dom->list, &doi_def->dom_list);
++	spin_unlock(&cipso_v4_doi_list_lock);
++	rcu_read_unlock();
++
++	return 0;
++}
++
++/**
++ * cipso_v4_doi_domhsh_remove - Removes a domain entry from a DOI definition
++ * @doi_def: the DOI definition
++ * @domain: the domain to remove
++ *
++ * Description:
++ * Removes the @domain from the DOI specified by @doi_def, this function
++ * should only be called by external functions (i.e. NetLabel).   Returns zero
++ * on success and negative values on error.
++ *
++ */
++int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
++			       const char *domain)
++{
++	struct cipso_v4_domhsh_entry *iter;
++
++	rcu_read_lock();
++	list_for_each_entry_rcu(iter, &doi_def->dom_list, list)
++		if (iter->valid &&
++		    ((domain != NULL && iter->domain != NULL &&
++		      strcmp(iter->domain, domain) == 0) ||
++		     (domain == NULL && iter->domain == NULL))) {
++			spin_lock(&cipso_v4_doi_list_lock);
++			iter->valid = 0;
++			list_del_rcu(&iter->list);
++			spin_unlock(&cipso_v4_doi_list_lock);
++			rcu_read_unlock();
++
++			call_rcu(&iter->rcu, cipso_v4_doi_domhsh_free);
++			return 0;
++		}
++	rcu_read_unlock();
++
++	return -ENOENT;
++}
++
++/*
++ * Label Mapping Functions
++ */
++
++/**
++ * cipso_v4_map_lvl_valid - Checks to see if the given level is understood
++ * @doi_def: the DOI definition
++ * @level: the level to check
++ *
++ * Description:
++ * Checks the given level against the given DOI definition and returns a
++ * negative value if the level does not have a valid mapping and a zero value
++ * if the level is defined by the DOI.
++ *
++ */
++static int cipso_v4_map_lvl_valid(const struct cipso_v4_doi *doi_def,
++				  const u8 level)
++{
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		return 0;
++	case CIPSO_V4_MAP_STD:
++		if (doi_def->map.std->lvl.cipso[level] < CIPSO_V4_INV_LVL)
++			return 0;
++		break;
++	}
++
++	return -EFAULT;
++}
++
++/**
++ * cipso_v4_map_lvl_hton - Perform a level mapping from the host to the network
++ * @doi_def: the DOI definition
++ * @host_lvl: the host MLS level
++ * @net_lvl: the network/CIPSO MLS level
++ *
++ * Description:
++ * Perform a label mapping to translate a local MLS level to the correct
++ * CIPSO level using the given DOI definition.  Returns zero on success,
++ * negative values otherwise.
++ *
++ */
++static int cipso_v4_map_lvl_hton(const struct cipso_v4_doi *doi_def,
++				 const u32 host_lvl,
++				 u32 *net_lvl)
++{
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		*net_lvl = host_lvl;
++		return 0;
++	case CIPSO_V4_MAP_STD:
++		if (host_lvl < doi_def->map.std->lvl.local_size) {
++			*net_lvl = doi_def->map.std->lvl.local[host_lvl];
++			return 0;
++		}
++		break;
++	}
++
++	return -EINVAL;
++}
++
++/**
++ * cipso_v4_map_lvl_ntoh - Perform a level mapping from the network to the host
++ * @doi_def: the DOI definition
++ * @net_lvl: the network/CIPSO MLS level
++ * @host_lvl: the host MLS level
++ *
++ * Description:
++ * Perform a label mapping to translate a CIPSO level to the correct local MLS
++ * level using the given DOI definition.  Returns zero on success, negative
++ * values otherwise.
++ *
++ */
++static int cipso_v4_map_lvl_ntoh(const struct cipso_v4_doi *doi_def,
++				 const u32 net_lvl,
++				 u32 *host_lvl)
++{
++	struct cipso_v4_std_map_tbl *map_tbl;
++
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		*host_lvl = net_lvl;
++		return 0;
++	case CIPSO_V4_MAP_STD:
++		map_tbl = doi_def->map.std;
++		if (net_lvl < map_tbl->lvl.cipso_size &&
++		    map_tbl->lvl.cipso[net_lvl] < CIPSO_V4_INV_LVL) {
++			*host_lvl = doi_def->map.std->lvl.cipso[net_lvl];
++			return 0;
++		}
++		break;
++	}
++
++	return -EINVAL;
++}
++
++/**
++ * cipso_v4_map_cat_rbm_valid - Checks to see if the category bitmap is valid
++ * @doi_def: the DOI definition
++ * @bitmap: category bitmap
++ * @bitmap_len: bitmap length in bytes
++ *
++ * Description:
++ * Checks the given category bitmap against the given DOI definition and
++ * returns a negative value if any of the categories in the bitmap do not have
++ * a valid mapping and a zero value if all of the categories are valid.
++ *
++ */
++static int cipso_v4_map_cat_rbm_valid(const struct cipso_v4_doi *doi_def,
++				      const unsigned char *bitmap,
++				      const u32 bitmap_len)
++{
++	int cat = -1;
++	u32 bitmap_len_bits = bitmap_len * 8;
++	u32 cipso_cat_size = doi_def->map.std->cat.cipso_size;
++	u32 *cipso_array = doi_def->map.std->cat.cipso;
++
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		return 0;
++	case CIPSO_V4_MAP_STD:
++		for (;;) {
++			cat = cipso_v4_bitmap_walk(bitmap,
++						   bitmap_len_bits,
++						   cat + 1,
++						   1);
++			if (cat < 0)
++				break;
++			if (cat >= cipso_cat_size ||
++			    cipso_array[cat] >= CIPSO_V4_INV_CAT)
++				return -EFAULT;
++		}
++
++		if (cat == -1)
++			return 0;
++		break;
++	}
++
++	return -EFAULT;
++}
++
++/**
++ * cipso_v4_map_cat_rbm_hton - Perform a category mapping from host to network
++ * @doi_def: the DOI definition
++ * @host_cat: the category bitmap in host format
++ * @host_cat_len: the length of the host's category bitmap in bytes
++ * @net_cat: the zero'd out category bitmap in network/CIPSO format
++ * @net_cat_len: the length of the CIPSO bitmap in bytes
++ *
++ * Description:
++ * Perform a label mapping to translate a local MLS category bitmap to the
++ * correct CIPSO bitmap using the given DOI definition.  Returns the minimum
++ * size in bytes of the network bitmap on success, negative values otherwise.
++ *
++ */
++static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def,
++				     const unsigned char *host_cat,
++				     const u32 host_cat_len,
++				     unsigned char *net_cat,
++				     const u32 net_cat_len)
++{
++	int host_spot = -1;
++	u32 net_spot;
++	u32 net_spot_max = 0;
++	u32 host_clen_bits = host_cat_len * 8;
++	u32 net_clen_bits = net_cat_len * 8;
++	u32 host_cat_size = doi_def->map.std->cat.local_size;
++	u32 *host_cat_array = doi_def->map.std->cat.local;
++
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		net_spot_max = host_cat_len - 1;
++		while (net_spot_max > 0 && host_cat[net_spot_max] == 0)
++			net_spot_max--;
++		if (net_spot_max > net_cat_len)
++			return -EINVAL;
++		memcpy(net_cat, host_cat, net_spot_max);
++		return net_spot_max;
++	case CIPSO_V4_MAP_STD:
++		for (;;) {
++			host_spot = cipso_v4_bitmap_walk(host_cat,
++							 host_clen_bits,
++							 host_spot + 1,
++							 1);
++			if (host_spot < 0)
++				break;
++			if (host_spot >= host_cat_size)
++				return -EPERM;
++
++			net_spot = host_cat_array[host_spot];
++			if (net_spot >= net_clen_bits)
++				return -ENOSPC;
++			cipso_v4_bitmap_setbit(net_cat, net_spot, 1);
++
++			if (net_spot > net_spot_max)
++				net_spot_max = net_spot;
++		}
++
++		if (host_spot == -2)
++			return -EFAULT;
++
++		if (++net_spot_max % 8)
++			return net_spot_max / 8 + 1;
++		return net_spot_max / 8;
++	}
++
++	return -EINVAL;
++}
++
++/**
++ * cipso_v4_map_cat_rbm_ntoh - Perform a category mapping from network to host
++ * @doi_def: the DOI definition
++ * @net_cat: the category bitmap in network/CIPSO format
++ * @net_cat_len: the length of the CIPSO bitmap in bytes
++ * @host_cat: the zero'd out category bitmap in host format
++ * @host_cat_len: the length of the host's category bitmap in bytes
++ *
++ * Description:
++ * Perform a label mapping to translate a CIPSO bitmap to the correct local
++ * MLS category bitmap using the given DOI definition.  Returns the minimum
++ * size in bytes of the host bitmap on success, negative values otherwise.
++ *
++ */
++static int cipso_v4_map_cat_rbm_ntoh(const struct cipso_v4_doi *doi_def,
++				     const unsigned char *net_cat,
++				     const u32 net_cat_len,
++				     unsigned char *host_cat,
++				     const u32 host_cat_len)
++{
++	u32 host_spot;
++	u32 host_spot_max = 0;
++	int net_spot = -1;
++	u32 net_clen_bits = net_cat_len * 8;
++	u32 host_clen_bits = host_cat_len * 8;
++	u32 net_cat_size = doi_def->map.std->cat.cipso_size;
++	u32 *net_cat_array = doi_def->map.std->cat.cipso;
++
++	switch (doi_def->type) {
++	case CIPSO_V4_MAP_PASS:
++		if (net_cat_len > host_cat_len)
++			return -EINVAL;
++		memcpy(host_cat, net_cat, net_cat_len);
++		return net_cat_len;
++	case CIPSO_V4_MAP_STD:
++		for (;;) {
++			net_spot = cipso_v4_bitmap_walk(net_cat,
++							net_clen_bits,
++							net_spot + 1,
++							1);
++			if (net_spot < 0)
++				break;
++			if (net_spot >= net_cat_size ||
++			    net_cat_array[net_spot] >= CIPSO_V4_INV_CAT)
++				return -EPERM;
++
++			host_spot = net_cat_array[net_spot];
++			if (host_spot >= host_clen_bits)
++				return -ENOSPC;
++			cipso_v4_bitmap_setbit(host_cat, host_spot, 1);
++
++			if (host_spot > host_spot_max)
++				host_spot_max = host_spot;
++		}
++
++		if (net_spot == -2)
++			return -EFAULT;
++
++		if (++host_spot_max % 8)
++			return host_spot_max / 8 + 1;
++		return host_spot_max / 8;
++	}
++
++	return -EINVAL;
++}
++
++/*
++ * Protocol Handling Functions
++ */
++
++#define CIPSO_V4_HDR_LEN              6
++
++/**
++ * cipso_v4_gentag_hdr - Generate a CIPSO option header
++ * @doi_def: the DOI definition
++ * @len: the total tag length in bytes
++ * @buf: the CIPSO option buffer
++ *
++ * Description:
++ * Write a CIPSO header into the beginning of @buffer.  Return zero on success,
++ * negative values on failure.
++ *
++ */
++static int cipso_v4_gentag_hdr(const struct cipso_v4_doi *doi_def,
++			       const u32 len,
++			       unsigned char *buf)
++{
++	if (CIPSO_V4_HDR_LEN + len > 40)
++		return -ENOSPC;
++
++	buf[0] = IPOPT_CIPSO;
++	buf[1] = CIPSO_V4_HDR_LEN + len;
++	*(u32 *)&buf[2] = htonl(doi_def->doi);
++
++	return 0;
++}
++
++#define CIPSO_V4_TAG1_CAT_LEN         30
++
++/**
++ * cipso_v4_gentag_rbm - Generate a CIPSO restricted bitmap tag (type #1)
++ * @doi_def: the DOI definition
++ * @secattr: the security attributes
++ * @buffer: the option buffer
++ * @buffer_len: length of buffer in bytes
++ *
++ * Description:
++ * Generate a CIPSO option using the restricted bitmap tag, tag type #1.  The
++ * actual buffer length may be larger than the indicated size due to
++ * translation between host and network category bitmaps.  Returns zero on
++ * success, negative values on failure.
++ *
++ */
++static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def,
++			       const struct netlbl_lsm_secattr *secattr,
++			       unsigned char **buffer,
++			       u32 *buffer_len)
++{
++	int ret_val = -EPERM;
++	unsigned char *buf = NULL;
++	u32 buf_len;
++	u32 level;
++
++	if (secattr->set_mls_cat) {
++		buf = kzalloc(CIPSO_V4_HDR_LEN + 4 + CIPSO_V4_TAG1_CAT_LEN,
++			      GFP_ATOMIC);
++		if (buf == NULL)
++			return -ENOMEM;
++
++		ret_val = cipso_v4_map_cat_rbm_hton(doi_def,
++						    secattr->mls_cat,
++						    secattr->mls_cat_len,
++						    &buf[CIPSO_V4_HDR_LEN + 4],
++						    CIPSO_V4_TAG1_CAT_LEN);
++		if (ret_val < 0)
++			goto gentag_failure;
++
++		/* XXX - this will send packets using the "optimized" format
++		   when possibile as specified in  section 3.4.2.6 of the
++		   CIPSO draft */
++		if (cipso_v4_rbm_optfmt && (ret_val > 0 && ret_val < 10))
++			ret_val = 10;
++
++		buf_len = 4 + ret_val;
++	} else {
++		buf = kzalloc(CIPSO_V4_HDR_LEN + 4, GFP_ATOMIC);
++		if (buf == NULL)
++			return -ENOMEM;
++		buf_len = 4;
++	}
++
++	ret_val = cipso_v4_map_lvl_hton(doi_def, secattr->mls_lvl, &level);
++	if (ret_val != 0)
++		goto gentag_failure;
++
++	ret_val = cipso_v4_gentag_hdr(doi_def, buf_len, buf);
++	if (ret_val != 0)
++		goto gentag_failure;
++
++	buf[CIPSO_V4_HDR_LEN] = 0x01;
++	buf[CIPSO_V4_HDR_LEN + 1] = buf_len;
++	buf[CIPSO_V4_HDR_LEN + 3] = level;
++
++	*buffer = buf;
++	*buffer_len = CIPSO_V4_HDR_LEN + buf_len;
++
++	return 0;
++
++gentag_failure:
++	if (buf)
++		kfree(buf);
++	return ret_val;
++}
++
++/**
++ * cipso_v4_parsetag_rbm - Parse a CIPSO restricted bitmap tag
++ * @doi_def: the DOI definition
++ * @tag: the CIPSO tag
++ * @secattr: the security attributes
++ *
++ * Description:
++ * Parse a CIPSO restricted bitmap tag (tag type #1) and return the security
++ * attributes in @secattr.  Return zero on success, negatives values on
++ * failure.
++ *
++ */
++static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def,
++				 const unsigned char *tag,
++				 struct netlbl_lsm_secattr *secattr)
++{
++	int ret_val;
++	u8 tag_len = tag[1];
++	u32 level;
++
++	ret_val = cipso_v4_map_lvl_ntoh(doi_def, tag[3], &level);
++	if (ret_val != 0)
++		return ret_val;
++	secattr->mls_lvl = level;
++	secattr->set_mls_lvl = 1;
++
++	if (tag_len > 4) {
++		switch (doi_def->type) {
++		case CIPSO_V4_MAP_PASS:
++			secattr->mls_cat_len = tag_len - 4;
++			break;
++		case CIPSO_V4_MAP_STD:
++			secattr->mls_cat_len =
++				doi_def->map.std->cat.local_size;
++			break;
++		}
++		secattr->mls_cat = kzalloc(secattr->mls_cat_len, GFP_ATOMIC);
++		if (secattr->mls_cat == NULL)
++			return -ENOMEM;
++
++		ret_val = cipso_v4_map_cat_rbm_ntoh(doi_def,
++						    &tag[4],
++						    tag_len - 4,
++						    secattr->mls_cat,
++						    secattr->mls_cat_len);
++		if (ret_val < 0) {
++			kfree(secattr->mls_cat);
++			return ret_val;
++		}
++		secattr->mls_cat_len = ret_val;
++		secattr->set_mls_cat = 1;
++	}
++
++	return 0;
++}
++
++/**
++ * cipso_v4_validate - Validate a CIPSO option
++ * @option: the start of the option, on error it is set to point to the error
++ *
++ * Description:
++ * This routine is called to validate a CIPSO option, it checks all of the
++ * fields to ensure that they are at least valid, see the draft snippet below
++ * for details.  If the option is valid then a zero value is returned and
++ * the value of @option is unchanged.  If the option is invalid then a
++ * non-zero value is returned and @option is adjusted to point to the
++ * offending portion of the option.  From the IETF draft ...
++ *
++ *  "If any field within the CIPSO options, such as the DOI identifier, is not
++ *   recognized the IP datagram is discarded and an ICMP 'parameter problem'
++ *   (type 12) is generated and returned.  The ICMP code field is set to 'bad
++ *   parameter' (code 0) and the pointer is set to the start of the CIPSO field
++ *   that is unrecognized."
++ *
++ */
++int cipso_v4_validate(unsigned char **option)
++{
++	unsigned char *opt = *option;
++	unsigned char *tag;
++	unsigned char opt_iter;
++	unsigned char err_offset = 0;
++	unsigned char locked = 0;
++	u8 opt_len;
++	u8 tag_len;
++	struct cipso_v4_doi *doi_def = NULL;
++	u32 tag_iter;
++
++	/* XXX - caller already checks for length values that are too large */
++	opt_len = opt[1];
++	if (opt_len < 8) {
++		err_offset = 1;
++		goto validate_return;
++	}
++
++	rcu_read_lock();
++	locked = 1;
++	doi_def = cipso_v4_doi_getdef(ntohl(*((u32 *)&opt[2])));
++	if (doi_def == NULL) {
++		err_offset = 2;
++		goto validate_return;
++	}
++
++	opt_iter = 6;
++	tag = opt + opt_iter;
++	while (opt_iter < opt_len) {
++		for (tag_iter = 0; doi_def->tags[tag_iter] != tag[0];)
++			if (doi_def->tags[tag_iter] == CIPSO_V4_TAG_INVALID ||
++			    ++tag_iter == CIPSO_V4_TAG_MAXCNT) {
++				err_offset = opt_iter;
++				goto validate_return;
++			}
++
++		tag_len = tag[1];
++		if (tag_len > (opt_len - opt_iter)) {
++			err_offset = opt_iter + 1;
++			goto validate_return;
++		}
++
++		switch (tag[0]) {
++		case CIPSO_V4_TAG_RBITMAP:
++			if (tag_len < 4) {
++				err_offset = opt_iter + 1;
++				goto validate_return;
++			}
++
++			/* XXX - we are already going to do all the
++			   verification necessary at the socket layer so from
++			   out point of view it is safe to turn these checks
++			   off (and less work), however, the CIPSO draft says
++			   we should do all the CIPSO validations here but it
++			   doesn't really specify _exactly_ what we need to
++			   validate ... so, just make it a sysctl tunable */
++			if (cipso_v4_rbm_strictvalid) {
++				if (cipso_v4_map_lvl_valid(doi_def,
++							   tag[3]) < 0) {
++					err_offset = opt_iter + 3;
++					goto validate_return;
++				}
++				if (tag_len > 4 &&
++				    cipso_v4_map_cat_rbm_valid(doi_def,
++							    &tag[4],
++							    tag_len - 4) < 0) {
++					err_offset = opt_iter + 4;
++					goto validate_return;
++				}
++			}
++			break;
++		case CIPSO_V4_TAG_ENUM:
++		case CIPSO_V4_TAG_RANGE:
++		case CIPSO_V4_TAG_PBITMAP:
++		case CIPSO_V4_TAG_FREEFORM:
++		default:
++			err_offset = opt_iter;
++			goto validate_return;
++		}
++
++		tag += tag_len;
++		opt_iter += tag_len;
++	}
++
++validate_return:
++	if (locked)
++		rcu_read_unlock();
++	*option = opt + err_offset;
++	return err_offset;
++}
++
++/**
++ * cipso_v4_error - Send the correct reponse for a bad packet
++ * @skb: the packet
++ * @error: the error code
++ * @gateway: CIPSO gateway flag
++ *
++ * Description:
++ * Based on the error code given in @error, send an ICMP error message back to
++ * the originating host.  Returns zero on success, negative values on failure.
++ * From the IETF draft ...
++ *
++ *  "If the contents of the CIPSO [option] are valid but the security label is
++ *   outside of the configured host or port label range, the datagram is
++ *   discarded and an ICMP 'destination unreachable' (type 3) is generated and
++ *   returned.  The code field of the ICMP is set to 'communication with
++ *   destination network administratively prohibited' (code 9) or to
++ *   'communication with destination host administratively prohibited'
++ *   (code 10).  The value of the code is dependent on whether the originator
++ *   of the ICMP message is acting as a CIPSO host or a CIPSO gateway.  The
++ *   recipient of the ICMP message MUST be able to handle either value.  The
++ *   same procedure is performed if a CIPSO [option] can not be added to an
++ *   IP packet because it is too large to fit in the IP options area."
++ *
++ *  "If the error is triggered by receipt of an ICMP message, the message is
++ *   discarded and no response is permitted (consistent with general ICMP
++ *   processing rules)."
++ *
++ */
++int cipso_v4_error(struct sk_buff *skb,
++		   const int error,
++		   const u32 gateway)
++{
++	switch (error) {
++	case -EACCES:
++		break;
++	default:
++		return 0;
++	}
++
++	if (skb->nh.iph->protocol == IPPROTO_ICMP)
++		return 0;
++
++	if (gateway)
++		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_NET_ANO, 0);
++	else
++		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_ANO, 0);
++
++	return 0;
++}
++
++/**
++ * cipso_v4_socket_setopt - Set the CIPSO option string on a socket
++ * @sock: the socket
++ * @opt: the option string
++ * @opt_len: the option string length
++ *
++ * Description:
++ * Attempt to add the given CIPSO option string to the socket.  The caller is
++ * responsibile for locking and releasing the socket.  Returns zero on success,
++ * negative values on failure.
++ *
++ */
++int cipso_v4_socket_setopt(struct socket *sock,
++			   unsigned char *opt,
++			   u32 opt_len)
++{
++	int ret_val;
++	struct ip_options *ip_opt = NULL;
++	struct sock *sk = sock->sk;
++	struct inet_sock *sk_inet;
++	struct inet_connection_sock *sk_conn;
++
++	ret_val = ip_options_get(&ip_opt, opt, opt_len);
++	if (ret_val != 0)
++		goto socket_setopt_return;
++	ip_opt->is_setbyuser = 0;
++	sk_inet = inet_sk(sk);
++	if (sk_inet->is_icsk) {
++		sk_conn = inet_csk(sk);
++		if (sk_inet->opt)
++			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
++		sk_conn->icsk_ext_hdr_len += ip_opt->optlen;
++		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
++	}
++	ip_opt = xchg(&sk_inet->opt, ip_opt);
++
++	ret_val = 0;
++
++socket_setopt_return:
++	if (ip_opt)
++		kfree(opt);
++	return ret_val;
++}
++
++/**
++ * cipso_v4_socket_setattr - Add a CIPSO option to a socket
++ * @sock: the socket
++ * @doi_def: the CIPSO DOI to use
++ * @secattr: the specific security attributes of the socket
++ *
++ * Description:
++ * Set the CIPSO option on the given socket using the DOI definition and
++ * security attributes passed to the function.  Returns zero on success and
++ * negative values on failure.
++ *
++ */
++int cipso_v4_socket_setattr(const struct socket *sock,
++			    const struct cipso_v4_doi *doi_def,
++			    const struct netlbl_lsm_secattr *secattr)
++{
++	int ret_val = -EPERM;
++	u32 iter;
++	unsigned char *buf = NULL;
++	u32 buf_len = 0;
++	struct ip_options *opt = NULL;
++	struct sock *sk;
++	struct inet_sock *sk_inet;
++	struct inet_connection_sock *sk_conn;
++
++	/* In the case of sock_create_lite(), the sock->sk field is not
++	   defined yet but it is not a problem as the only users of these
++	   "lite" PF_INET sockets are functions which do an accept() call
++	   afterwards so we will label the socket as part of the accept(). */
++	sk = sock->sk;
++	if (sk == NULL)
++		return 0;
++
++	/* XXX - this code assumes only one tag per CIPSO option which isnt
++	   really a good assumption to make but since we only support the MAC
++	   tags right now it is a safe assumption */
++	iter = 0;
++	do {
++		switch (doi_def->tags[iter]) {
++		case CIPSO_V4_TAG_RBITMAP:
++			ret_val = cipso_v4_gentag_rbm(doi_def,
++						      secattr,
++						      &buf,
++						      &buf_len);
++			break;
++		case CIPSO_V4_TAG_ENUM:
++		case CIPSO_V4_TAG_RANGE:
++		case CIPSO_V4_TAG_PBITMAP:
++		case CIPSO_V4_TAG_FREEFORM:
++		default:
++			ret_val = -EPERM;
++			goto socket_setattr_failure;
++		}
++
++		iter++;
++	} while (ret_val != 0 &&
++		 iter < CIPSO_V4_TAG_MAXCNT &&
++		 doi_def->tags[iter] != CIPSO_V4_TAG_INVALID);
++	if (ret_val != 0)
++		goto socket_setattr_failure;
++
++	ret_val = ip_options_get(&opt, buf, buf_len);
++	if (ret_val != 0)
++		goto socket_setattr_failure;
++	opt->is_setbyuser = 0;
++
++	kfree(buf);
++	buf = NULL;
++
++	lock_sock(sk);
++	sk_inet = inet_sk(sk);
++	if (sk_inet->is_icsk) {
++		sk_conn = inet_csk(sk);
++		if (sk_inet->opt)
++			sk_conn->icsk_ext_hdr_len -= sk_inet->opt->optlen;
++		sk_conn->icsk_ext_hdr_len += opt->optlen;
++		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);
++	}
++	opt = xchg(&sk_inet->opt, opt);
++	release_sock(sk);
++	if (opt)
++		kfree(opt);
++
++	return 0;
++
++socket_setattr_failure:
++	if (buf)
++		kfree(buf);
++	if (opt)
++		kfree(opt);
++	return ret_val;
++}
++
++/**
++ * cipso_v4_socket_getopt - Get the CIPSO IP option string from the socket
++ * @sock: the socket
++ * @opt: the option string
++ * @opt_len: the option string length in bytes
++ *
++ * Description:
++ * If a CIPSO option is present in the socket's IP options then return a
++ * a pointer to the option string.  The caller is responsibile for locking
++ * and releasing the socket.  Returns zero on success, negative values on
++ * failure.
++ *
++ */
++int cipso_v4_socket_getopt(const struct socket *sock,
++			   unsigned char **opt,
++			   u32 *opt_len)
++{
++	struct ip_options *ip_opt = inet_sk(sock->sk)->opt;
++	unsigned char *cipso_ptr;
++
++	if (ip_opt == NULL || ip_opt->cipso == 0)
++		return -ENOMSG;
++	cipso_ptr = ip_opt->__data + ip_opt->cipso - sizeof(struct iphdr);
++
++	*opt = cipso_ptr;
++	*opt_len = cipso_ptr[1];
++
++	return 0;
++}
++
++/**
++ * cipso_v4_socket_getattr - Get the security attributes from a socket
++ * @sock: the socket
++ * @secattr: the security attributes
++ *
++ * Description:
++ * Query @sock to see if there is a CIPSO option attached to the socket and if
++ * there is return the CIPSO security attributes in @secattr.  Returns zero on
++ * success and negative values on failure.
++ *
++ */
++int cipso_v4_socket_getattr(const struct socket *sock,
++			    struct netlbl_lsm_secattr *secattr)
++{
++	int ret_val = -ENOMSG;
++	struct sock *sk;
++	struct inet_sock *sk_inet;
++	unsigned char *cipso_ptr;
++	u32 doi;
++	struct cipso_v4_doi *doi_def;
++
++	sk = sock->sk;
++	lock_sock(sk);
++	sk_inet = inet_sk(sk);
++	if (sk_inet->opt == NULL || sk_inet->opt->cipso == 0)
++		goto socket_getattr_return;
++	cipso_ptr = sk_inet->opt->__data + sk_inet->opt->cipso -
++		sizeof(struct iphdr);
++	ret_val = cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr);
++	if (ret_val == 0)
++		goto socket_getattr_return;
++
++	doi = ntohl(*(u32 *)&cipso_ptr[2]);
++	rcu_read_lock();
++	doi_def = cipso_v4_doi_getdef(doi);
++	if (doi_def == NULL) {
++		rcu_read_unlock();
++		goto socket_getattr_return;
++	}
++	/* XXX - this code assumes only one tag per CIPSO option, the draft is
++	   a little unclear about supporting multiple tags per option
++	   but this seems safe for now */
++	switch (cipso_ptr[6]) {
++	case CIPSO_V4_TAG_RBITMAP:
++		ret_val = cipso_v4_parsetag_rbm(doi_def,
++						&cipso_ptr[6],
++						secattr);
++		break;
++	}
++	rcu_read_unlock();
++
++socket_getattr_return:
++	release_sock(sk);
++	return ret_val;
++}
++
++/**
++ * cipso_v4_skbuff_getattr - Get the security attributes from the CIPSO option
++ * @skb: the packet
++ * @secattr: the security attributes
++ *
++ * Description:
++ * Parse the given packet's CIPSO option and return the security attributes.
++ * Returns zero on success and negative values on failure.
++ *
++ */
++int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
++			    struct netlbl_lsm_secattr *secattr)
++{
++	int ret_val = -ENOMSG;
++	unsigned char *cipso_ptr;
++	u32 doi;
++	struct cipso_v4_doi *doi_def;
++
++	if (!CIPSO_V4_OPTEXIST(skb))
++		return -ENOMSG;
++	cipso_ptr = CIPSO_V4_OPTPTR(skb);
++	if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0)
++		return 0;
++
++	doi = ntohl(*(u32 *)&cipso_ptr[2]);
++	rcu_read_lock();
++	doi_def = cipso_v4_doi_getdef(doi);
++	if (doi_def == NULL)
++		goto skbuff_getattr_return;
++	/* XXX - this code assumes only one tag per CIPSO option which isnt
++	   really a good assumption to make but since we only support the MAC
++	   tags right now it is a safe assumption */
++	switch (cipso_ptr[6]) {
++	case CIPSO_V4_TAG_RBITMAP:
++		ret_val = cipso_v4_parsetag_rbm(doi_def,
++						&cipso_ptr[6],
++						secattr);
++		break;
++	}
++
++skbuff_getattr_return:
++	rcu_read_unlock();
++	return ret_val;
++}
++
++/*
++ * Setup Functions
++ */
++
++/**
++ * cipso_v4_init - Initialize the CIPSO module
++ *
++ * Description:
++ * Initialize the CIPSO module and prepare it for use.  Returns zero on success
++ * and negative values on failure.
++ *
++ */
++static int __init cipso_v4_init(void)
++{
++	return cipso_v4_cache_init(CIPSO_V4_CACHE_BUCKETS);
++}
++
++/**
++ * cipso_v4_exit - Cleanup after the CIPSO module
++ *
++ * Description:
++ * Perform any necessary cleanup tasks before the CIPSO module goes away.
++ *
++ */
++static void __exit cipso_v4_exit(void)
++{
++	cipso_v4_cache_destroy();
++}
++
++subsys_initcall(cipso_v4_init);
+Index: linux-2.6.17.i686-quilt/net/ipv4/sysctl_net_ipv4.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/ipv4/sysctl_net_ipv4.c
++++ linux-2.6.17.i686-quilt/net/ipv4/sysctl_net_ipv4.c
+@@ -18,6 +18,7 @@
+ #include <net/ip.h>
+ #include <net/route.h>
+ #include <net/tcp.h>
++#include <net/cipso_ipv4.h>
+ 
+ /* From af_inet.c */
+ extern int sysctl_ip_nonlocal_bind;
+@@ -688,6 +689,40 @@ ctl_table ipv4_table[] = {
+ 		.mode		= 0644,
+ 		.proc_handler	= &proc_dointvec
+ 	},
++#ifdef CONFIG_NETLABEL
++	{
++		.ctl_name	= NET_CIPSOV4_CACHE_ENABLE,
++		.procname	= "cipso_cache_enable",
++		.data		= &cipso_v4_cache_enabled,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec,
++	},
++	{
++		.ctl_name	= NET_CIPSOV4_CACHE_BUCKET_SIZE,
++		.procname	= "cipso_cache_bucket_size",
++		.data		= &cipso_v4_cache_bucketsize,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec,
++	},
++	{
++		.ctl_name	= NET_CIPSOV4_RBM_OPTFMT,
++		.procname	= "cipso_rbm_optfmt",
++		.data		= &cipso_v4_rbm_optfmt,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec,
++	},
++	{
++		.ctl_name	= NET_CIPSOV4_RBM_STRICTVALID,
++		.procname	= "cipso_rbm_strictvalid",
++		.data		= &cipso_v4_rbm_strictvalid,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif /* CONFIG_NETLABEL */
+ 	{ .ctl_name = 0 }
+ };
+ 
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_4_7.patch:
 Makefile                       |    1 
 netlabel/Kconfig               |   14 
 netlabel/Makefile              |   16 
 netlabel/netlabel_cipso_v4.h   |  218 ++++++++++++
 netlabel/netlabel_domainhash.c |  580 ++++++++++++++++++++++++++++++++++
 netlabel/netlabel_domainhash.h |   64 +++
 netlabel/netlabel_kapi.c       |  304 +++++++++++++++++
 netlabel/netlabel_mgmt.c       |  699 +++++++++++++++++++++++++++++++++++++++++
 netlabel/netlabel_mgmt.h       |  250 ++++++++++++++
 netlabel/netlabel_unlabeled.h  |   84 ++++
 netlabel/netlabel_user.c       |  131 +++++++
 netlabel/netlabel_user.h       |  174 ++++++++++
 12 files changed, 2535 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1.2.3 -r 1.1.2.4 linux-2.6-net-label_4_7.patch
Index: linux-2.6-net-label_4_7.patch
===================================================================
RCS file: linux-2.6-net-label_4_7.patch
diff -N linux-2.6-net-label_4_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_4_7.patch	8 Jul 2006 18:07:24 -0000	1.1.2.4
@@ -0,0 +1,2668 @@
+From paul.moore at hp.com Thu Jul  6 17:34:10 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:58:59 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lwvel017549
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:58:58 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwuAg006917;
+	Thu, 6 Jul 2006 17:58:56 -0400
+Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66Lwq9I029577;
+	Thu, 6 Jul 2006 17:58:52 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel8.hp.com (Postfix) with ESMTP id 6262335622;
+	Thu,  6 Jul 2006 17:58:47 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id C8F2D3473A;
+	Thu,  6 Jul 2006 21:58:46 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66Lwks4029063;
+	Thu, 6 Jul 2006 17:58:46 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66Lwknb029062;
+	Thu, 6 Jul 2006 17:58:46 -0400
+Message-Id: <20060706215845.969474000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:10 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 4/7] NetLabel: core NetLabel subsystem
+Content-Disposition: inline; filename=netlabel-core
+X-RedHat-Spam-Score: -96.778 
+Content-Type: 
+X-UID: 73478
+X-Length: 81446
+
+Add a new kernel subsystem, NetLabel, to provide explicit packet labeling 
+services (CIPSO, RIPSO, etc.) to LSM developers.  NetLabel is designed to work
+in conjunction with a LSM to intercept and decode security labels on incoming
+network packets as well as ensure that outgoing network packets are labeled
+according to the security mechanism employed by the LSM.  The NetLabel
+subsystem is configured through a Generic NETLINK interface described in the
+header files included in this patch.
+---
+ net/Makefile                       |    1 
+ net/netlabel/Kconfig               |   14 
+ net/netlabel/Makefile              |   16 
+ net/netlabel/netlabel_cipso_v4.h   |  218 +++++++++++
+ net/netlabel/netlabel_domainhash.c |  580 ++++++++++++++++++++++++++++++
+ net/netlabel/netlabel_domainhash.h |   64 +++
+ net/netlabel/netlabel_kapi.c       |  304 ++++++++++++++++
+ net/netlabel/netlabel_mgmt.c       |  699 +++++++++++++++++++++++++++++++++++++
+ net/netlabel/netlabel_mgmt.h       |  250 +++++++++++++
+ net/netlabel/netlabel_unlabeled.h  |   84 ++++
+ net/netlabel/netlabel_user.c       |  131 ++++++
+ net/netlabel/netlabel_user.h       |  174 +++++++++
+ 12 files changed, 2535 insertions(+)
+
+Index: linux-2.6.17.i686-quilt/net/Makefile
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/Makefile
++++ linux-2.6.17.i686-quilt/net/Makefile
+@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_DCCP)		+= dccp/
+ obj-$(CONFIG_IP_SCTP)		+= sctp/
+ obj-$(CONFIG_IEEE80211)		+= ieee80211/
+ obj-$(CONFIG_TIPC)		+= tipc/
++obj-$(CONFIG_NETLABEL)		+= netlabel/
+ 
+ ifeq ($(CONFIG_NET),y)
+ obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
+Index: linux-2.6.17.i686-quilt/net/netlabel/Kconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/Kconfig
+@@ -0,0 +1,14 @@
++#
++# NetLabel configuration
++#
++
++config NETLABEL
++	bool "NetLabel subsystem support"
++	depends on NET && SECURITY
++	default n
++	---help---
++	  NetLabel provides support for explicit network packet labeling
++	  protocols such as CIPSO and RIPSO.  For more information see
++	  Documentation/netlabel.
++
++	  If you are unsure, say N.
+Index: linux-2.6.17.i686-quilt/net/netlabel/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/Makefile
+@@ -0,0 +1,16 @@
++#
++# Makefile for the NetLabel subsystem.
++#
++# Feb 9, 2006, Paul Moore <paul.moore at hp.com>
++#
++
++# base objects
++obj-y	:= netlabel_user.o netlabel_kapi.o netlabel_domainhash.o
++
++# management objects
++obj-y	+= netlabel_mgmt.o
++
++# protocol modules
++obj-y	+= netlabel_unlabeled.o
++obj-y	+= netlabel_cipso_v4.o
++
+Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.h
+@@ -0,0 +1,218 @@
++/*
++ * NetLabel CIPSO/IPv4 Support
++ *
++ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
++ * NetLabel system manages static and dynamic label mappings for network
++ * protocols such as CIPSO and RIPSO.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef _NETLABEL_CIPSO_V4
++#define _NETLABEL_CIPSO_V4
++
++#include <net/netlabel.h>
++
++/*
++ * The following NetLabel payloads are supported by the CIPSO subsystem, all
++ * of which are preceeded by the nlmsghdr struct.
++ *
++ * o ACK:
++ *   Sent by the kernel in response to an applications message, applications
++ *   should never send this message.
++ *
++ *   +----------------------+-----------------------+
++ *   | seq number (32 bits) | return code (32 bits) |
++ *   +----------------------+-----------------------+
++ *
++ *     seq number:  the sequence number of the original message, taken from the
++ *                  nlmsghdr structure
++ *     return code: return value, based on errno values
++ *
++ * o ADD:
++ *   Sent by an application to add a new DOI mapping table, after completion
++ *   of the task the kernel should ACK this message.
++ *
++ *   +---------------+--------------------+---------------------+
++ *   | DOI (32 bits) | map type (32 bits) | tag count (32 bits) | ...
++ *   +---------------+--------------------+---------------------+
++ *
++ *   +-----------------+
++ *   | tag #X (8 bits) | ... repeated
++ *   +-----------------+
++ *
++ *   +-------------- ---- --- -- -
++ *   | mapping data
++ *   +-------------- ---- --- -- -
++ *
++ *     DOI:          the DOI value
++ *     map type:     the mapping table type (defined in the cipso_ipv4.h header
++ *                   as CIPSO_V4_MAP_*)
++ *     tag count:    the number of tags, must be greater than zero
++ *     tag:          the CIPSO tag for the DOI, tags listed first are given
++ *                   higher priorirty when sending packets
++ *     mapping data: specific to the map type (see below)
[...2275 lines suppressed...]
++ * netlbl_netlink_snd - Send a NetLabel message
++ * @skb: NetLabel message
++ * @pid: sending PID
++ * @group: multicast group id
++ *
++ * Description:
++ * Sends a multicast NetLabel message over the NETLINK socket to all members
++ * of @group except @pid.
++ *
++ */
++int netlbl_netlink_snd_multicast(struct sk_buff *skb,
++				 const u32 pid,
++				 const u32 group)
++{
++	return genlmsg_multicast(skb, pid, group);
++}
+Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_user.h
+@@ -0,0 +1,174 @@
++/*
++ * NetLabel NETLINK Interface
++ *
++ * This file defines the NETLINK interface for the NetLabel system.  The
++ * NetLabel system manages static and dynamic label mappings for network
++ * protocols such as CIPSO and RIPSO.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef _NETLABEL_USER_H
++#define _NETLABEL_USER_H
++
++#include <linux/skbuff.h>
++#include <linux/capability.h>
++#include <linux/genetlink.h>
++#include <net/netlabel.h>
++
++/* NetLabel NETLINK helper functions */
++
++/**
++ * netlbl_netlink_cap_check - Check the NETLINK msg capabilities
++ * @skb: the NETLINK buffer
++ * @req_cap: the required capability
++ *
++ * Description:
++ * Check the NETLINK buffer's capabilities against the required capabilities.
++ * Returns zero on success, negative values on failure.
++ *
++ */
++static inline int netlbl_netlink_cap_check(const struct sk_buff *skb,
++					   const kernel_cap_t req_cap)
++{
++	if (cap_raised(NETLINK_CB(skb).eff_cap, req_cap))
++		return 0;
++	return -EPERM;
++}
++
++/**
++ * netlbl_netlink_hdr_put - Write the NETLINK buffers into a buffer
++ * @skb: the buffer
++ * @pid: the PID of the receipient
++ * @seq: the sequence number
++ * @flags: NETLINK message flags
++ * @type: the generic NETLINK message family type
++ * @cmd: command
++ * @len: length
++ *
++ * Description:
++ * Write both a NETLINK nlmsghdr structure and a Generic NETLINK genlmsghdr
++ * struct to a buffer.  Returns a pointer to the start of the payload buffer
++ * on success or NULL on failure.
++ *
++ */
++static inline void __netlbl_netlink_hdr(unsigned char *buffer,
++					const u32 pid,
++					const u32 seq,
++					const int flags,
++					const int type,
++					const u8 cmd,
++					const int len)
++{
++	struct nlmsghdr *nlh;
++	struct genlmsghdr *hdr;
++
++	nlh = (struct nlmsghdr *)buffer;
++	nlh->nlmsg_type = type;
++	nlh->nlmsg_len = len;
++	nlh->nlmsg_flags = flags;
++	nlh->nlmsg_pid = pid;
++	nlh->nlmsg_seq = seq;
++
++	hdr = nlmsg_data(nlh);
++	hdr->cmd = cmd;
++	hdr->version = NETLBL_PROTO_VERSION;
++	hdr->reserved = 0;
++}
++
++/**
++ * netlbl_netlink_hdr_put - Write the NETLINK buffers into a sk_buff
++ * @skb: the packet
++ * @pid: the PID of the receipient
++ * @seq: the sequence number
++ * @flags: NETLINK message flags
++ * @type: the generic NETLINK message family type
++ * @cmd: command
++ * @len: length
++ *
++ * Description:
++ * Write both a NETLINK nlmsghdr structure and a Generic NETLINK genlmsghdr
++ * struct to the packet.  Returns a pointer to the start of the payload buffer
++ * on success or NULL on failure.
++ *
++ */
++static inline unsigned char *netlbl_netlink_hdr_put(struct sk_buff *skb,
++						    const u32 pid,
++						    const u32 seq,
++						    const int flags,
++						    const int type,
++						    const u8 cmd,
++						    const int len)
++{
++	struct nlmsghdr *nlh;
++	struct genlmsghdr *hdr;
++
++	nlh = nlmsg_put(skb, pid, seq, type, len, flags);
++	if (nlh == NULL)
++		return NULL;
++
++	hdr = nlmsg_data(nlh);
++	hdr->cmd = cmd;
++	hdr->version = NETLBL_PROTO_VERSION;
++	hdr->reserved = 0;
++
++	return (unsigned char *)hdr + GENL_HDRLEN;
++}
++
++/**
++ * netlbl_netlink_payload_len - Return the length of the payload
++ * @skb: the NETLINK buffer
++ *
++ * Description:
++ * This function returns the length of the NetLabel payload.
++ *
++ */
++static inline u32 netlbl_netlink_payload_len(const struct sk_buff *skb)
++{
++	return nlmsg_len((struct nlmsghdr *)skb->data) - GENL_HDRLEN;
++}
++
++/**
++ * netlbl_netlink_payload_data - Returns a pointer to the start of the payload
++ * @skb: the NETLINK buffer
++ *
++ * Description:
++ * This function returns a pointer to the start of the NetLabel payload.
++ *
++ */
++static inline unsigned char *netlbl_netlink_payload_data(
++	                                            const struct sk_buff *skb)
++{
++	return nlmsg_data((struct nlmsghdr *)skb->data) + GENL_HDRLEN;
++}
++
++/* NetLabel NETLINK I/O functions */
++
++int netlbl_netlink_init(void);
++void netlbl_netlink_exit(void);
++int netlbl_netlink_snd(struct sk_buff *skb, const u32 pid);
++int netlbl_netlink_snd_multicast(struct sk_buff *skb,
++				 const u32 pid,
++				 const u32 group);
++
++#endif
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_5_7.patch:
 include/linux/security.h                    |   25 -
 net/socket.c                                |   17 
 security/dummy.c                            |    6 
 security/selinux/hooks.c                    |   66 ++-
 security/selinux/include/objsec.h           |   10 
 security/selinux/include/selinux_netlabel.h |   94 ++++
 security/selinux/ss/ebitmap.c               |  152 +++++++
 security/selinux/ss/ebitmap.h               |    6 
 security/selinux/ss/mls.c                   |  160 +++++++
 security/selinux/ss/mls.h                   |   25 +
 security/selinux/ss/services.c              |  565 ++++++++++++++++++++++++++++
 11 files changed, 1087 insertions(+), 39 deletions(-)

Index: linux-2.6-net-label_5_7.patch
===================================================================
RCS file: linux-2.6-net-label_5_7.patch
diff -N linux-2.6-net-label_5_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_5_7.patch	8 Jul 2006 18:07:25 -0000	1.1.2.3
@@ -0,0 +1,1502 @@
+From paul.moore at hp.com Thu Jul  6 17:34:11 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:59:04 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lx3el017580
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:59:03 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66Lx238006960;
+	Thu, 6 Jul 2006 17:59:02 -0400
+Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k66Lwr94019722;
+	Thu, 6 Jul 2006 17:58:53 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel7.hp.com (Postfix) with ESMTP id 040D336FA8;
+	Thu,  6 Jul 2006 17:58:47 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id 673663473B;
+	Thu,  6 Jul 2006 21:58:47 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66Lwk11029092;
+	Thu, 6 Jul 2006 17:58:46 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66Lwkcp029091;
+	Thu, 6 Jul 2006 17:58:46 -0400
+Message-Id: <20060706215846.588483000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:11 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 5/7] NetLabel: SELinux support
+Content-Disposition: inline; filename=netlabel-selinux-2.6.17
+X-RedHat-Spam-Score: -99.822 
+Content-Type: 
+X-UID: 73481
+X-Length: 46144
+
+Add NetLabel support to the SELinux LSM and modify the socket_post_create() LSM
+hook to return an error code.  The most significant part of this patch is the
+addition of NetLabel hooks into the following SELinux LSM hooks:
+
+ * selinux_file_permission()
+ * selinux_socket_sendmsg()
+ * selinux_socket_post_create()
+ * selinux_socket_post_accept() [NEW]
+ * selinux_socket_sock_rcv_skb()
+ * selinux_socket_getpeersec_stream()
+ * selinux_socket_getpeersec_dgram()
+
+The basic reasoning behind this patch is that outgoing packets are "NetLabel'd"
+by labeling their socket and the NetLabel security attributes are checked via
+the additional hook in selinux_socket_sock_rcv_skb().  NetLabel itself is only
+a labeling mechanism, similar to filesystem extended attributes, it is up to
+the SELinux enforcement mechanism to perform the actual access checks.
+
+In addition to the changes outlined above this patch also includes some changes
+to the extended bitmap (ebitmap) and multi-level security (mls) code to import
+and export SELinux TE/MLS attributes into and out of NetLabel.
+---
+ include/linux/security.h                    |   25 -
+ net/socket.c                                |   17 
+ security/dummy.c                            |    6 
+ security/selinux/hooks.c                    |   66 ++-
+ security/selinux/include/objsec.h           |   10 
+ security/selinux/include/selinux_netlabel.h |   94 ++++
+ security/selinux/ss/ebitmap.c               |  152 +++++++
+ security/selinux/ss/ebitmap.h               |    6 
+ security/selinux/ss/mls.c                   |  160 +++++++
+ security/selinux/ss/mls.h                   |   25 +
+ security/selinux/ss/services.c              |  565 ++++++++++++++++++++++++++++
+ 11 files changed, 1087 insertions(+), 39 deletions(-)
+
+Index: linux-2.6.17.i686-quilt/include/linux/security.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/include/linux/security.h
++++ linux-2.6.17.i686-quilt/include/linux/security.h
+@@ -1267,8 +1267,8 @@ struct security_operations {
+ 	int (*unix_may_send) (struct socket * sock, struct socket * other);
+ 
+ 	int (*socket_create) (int family, int type, int protocol, int kern);
+-	void (*socket_post_create) (struct socket * sock, int family,
+-				    int type, int protocol, int kern);
++	int (*socket_post_create) (struct socket * sock, int family,
++				   int type, int protocol, int kern);
+ 	int (*socket_bind) (struct socket * sock,
+ 			    struct sockaddr * address, int addrlen);
+ 	int (*socket_connect) (struct socket * sock,
+@@ -2677,13 +2677,13 @@ static inline int security_socket_create
+ 	return security_ops->socket_create(family, type, protocol, kern);
+ }
+ 
+-static inline void security_socket_post_create(struct socket * sock, 
+-					       int family,
+-					       int type, 
+-					       int protocol, int kern)
++static inline int security_socket_post_create(struct socket * sock,
++					      int family,
++					      int type,
++					      int protocol, int kern)
+ {
+-	security_ops->socket_post_create(sock, family, type,
+-					 protocol, kern);
++	return security_ops->socket_post_create(sock, family, type,
++						protocol, kern);
+ }
+ 
+ static inline int security_socket_bind(struct socket * sock, 
+@@ -2809,11 +2809,12 @@ static inline int security_socket_create
+ 	return 0;
+ }
+ 
+-static inline void security_socket_post_create(struct socket * sock, 
+-					       int family,
+-					       int type, 
+-					       int protocol, int kern)
++static inline int security_socket_post_create(struct socket * sock,
++					      int family,
++					      int type,
++					      int protocol, int kern)
+ {
++	return 0;
+ }
+ 
+ static inline int security_socket_bind(struct socket * sock, 
+Index: linux-2.6.17.i686-quilt/net/socket.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/socket.c
++++ linux-2.6.17.i686-quilt/net/socket.c
+@@ -976,11 +976,18 @@ int sock_create_lite(int family, int typ
+ 		goto out;
+ 	}
+ 
+-	security_socket_post_create(sock, family, type, protocol, 1);
+ 	sock->type = type;
++	err = security_socket_post_create(sock, family, type, protocol, 1);
++	if (err)
++		goto out_release;
++
+ out:
+ 	*res = sock;
+ 	return err;
++out_release:
++	sock_release(sock);
++	sock = NULL;
++	goto out;
+ }
+ 
+ /* No kernel lock held - perfect */
+@@ -1218,7 +1225,9 @@ static int __sock_create(int family, int
+ 	 */
+ 	module_put(net_families[family]->owner);
+ 	*res = sock;
+-	security_socket_post_create(sock, family, type, protocol, kern);
++	err = security_socket_post_create(sock, family, type, protocol, kern);
++	if (err)
++		goto out_release;
+ 
+ out:
+ 	net_family_read_unlock();
+@@ -1448,13 +1457,13 @@ asmlinkage long sys_accept(int fd, struc
+ 			goto out_fd;
+ 	}
+ 
++	security_socket_post_accept(sock, newsock);
++
+ 	/* File flags are not inherited via accept() unlike another OSes. */
+ 
+ 	fd_install(newfd, newfile);
+ 	err = newfd;
+ 
+-	security_socket_post_accept(sock, newsock);
+-
+ out_put:
+ 	fput_light(sock->file, fput_needed);
+ out:
+Index: linux-2.6.17.i686-quilt/security/dummy.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/dummy.c
++++ linux-2.6.17.i686-quilt/security/dummy.c
+@@ -692,10 +692,10 @@ static int dummy_socket_create (int fami
+ 	return 0;
+ }
+ 
+-static void dummy_socket_post_create (struct socket *sock, int family, int type,
+-				      int protocol, int kern)
++static int dummy_socket_post_create (struct socket *sock, int family, int type,
++				     int protocol, int kern)
+ {
+-	return;
++	return 0;
+ }
+ 
+ static int dummy_socket_bind (struct socket *sock, struct sockaddr *address,
+Index: linux-2.6.17.i686-quilt/security/selinux/hooks.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/hooks.c
++++ linux-2.6.17.i686-quilt/security/selinux/hooks.c
+@@ -12,6 +12,8 @@
+  *  Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
+  *  Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
+  *                          <dgoeddel at trustedcs.com>
++ *  Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
++ *                     Paul Moore, <paul.moore at hp.com>
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License version 2,
+@@ -74,6 +76,7 @@
+ #include "objsec.h"
+ #include "netif.h"
+ #include "xfrm.h"
++#include "selinux_netlabel.h"
+ 
+ #define XATTR_SELINUX_SUFFIX "selinux"
+ #define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX
+@@ -2293,6 +2296,7 @@ static int selinux_inode_listsecurity(st
+ 
+ static int selinux_file_permission(struct file *file, int mask)
+ {
++	int rc;
+ 	struct inode *inode = file->f_dentry->d_inode;
+ 
+ 	if (!mask) {
+@@ -2304,8 +2308,12 @@ static int selinux_file_permission(struc
+ 	if ((file->f_flags & O_APPEND) && (mask & MAY_WRITE))
+ 		mask |= MAY_APPEND;
+ 
+-	return file_has_perm(current, file,
+-			     file_mask_to_av(inode->i_mode, mask));
++	rc = file_has_perm(current, file,
++			   file_mask_to_av(inode->i_mode, mask));
++	if (rc)
++		return rc;
++
++	return selinux_netlbl_inode_permission(inode, mask);
+ }
+ 
+ static int selinux_file_alloc_security(struct file *file)
+@@ -2922,8 +2930,8 @@ out:
+ 	return err;
+ }
+ 
+-static void selinux_socket_post_create(struct socket *sock, int family,
+-				       int type, int protocol, int kern)
++static int selinux_socket_post_create(struct socket *sock, int family,
++				      int type, int protocol, int kern)
+ {
+ 	struct inode_security_struct *isec;
+ 	struct task_security_struct *tsec;
+@@ -2935,7 +2943,7 @@ static void selinux_socket_post_create(s
+ 	isec->sid = kern ? SECINITSID_KERNEL : tsec->sid;
+ 	isec->initialized = 1;
+ 
+-	return;
++	return selinux_netlbl_socket_create(sock, family, isec->sid);
+ }
+ 
+ /* Range of port numbers used to automatically bind.
+@@ -3095,28 +3103,35 @@ static int selinux_socket_listen(struct 
+ 
+ static int selinux_socket_accept(struct socket *sock, struct socket *newsock)
+ {
+-	int err;
++	return socket_has_perm(current, sock, SOCKET__ACCEPT);
++}
++
++static void selinux_socket_post_accept(struct socket *sock,
++				       struct socket *newsock)
++{
+ 	struct inode_security_struct *isec;
+ 	struct inode_security_struct *newisec;
+ 
+-	err = socket_has_perm(current, sock, SOCKET__ACCEPT);
+-	if (err)
+-		return err;
+-
+-	newisec = SOCK_INODE(newsock)->i_security;
++	if (selinux_netlbl_socket_accept(sock, newsock) == 0)
++		return;
+ 
+ 	isec = SOCK_INODE(sock)->i_security;
++	newisec = SOCK_INODE(newsock)->i_security;
+ 	newisec->sclass = isec->sclass;
+ 	newisec->sid = isec->sid;
+ 	newisec->initialized = 1;
+-
+-	return 0;
+ }
+ 
+ static int selinux_socket_sendmsg(struct socket *sock, struct msghdr *msg,
+  				  int size)
+ {
+-	return socket_has_perm(current, sock, SOCKET__WRITE);
++	int rc;
++
++	rc = socket_has_perm(current, sock, SOCKET__WRITE);
++	if (rc)
++		return rc;
++
++	return selinux_netlbl_inode_permission(SOCK_INODE(sock), MAY_WRITE);
+ }
+ 
+ static int selinux_socket_recvmsg(struct socket *sock, struct msghdr *msg,
+@@ -3306,10 +3321,15 @@ static int selinux_socket_sock_rcv_skb(s
+ 
+ 		err = avc_has_perm(sock_sid, port_sid,
+ 				   sock_class, recv_perm, &ad);
++		if (err)
++			goto out;
+ 	}
+ 
+-	if (!err)
+-		err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
++	err = selinux_netlbl_sock_rcv_skb(sock_class, sock_sid, skb, &ad);
++	if (err)
++		goto out;
++
++	err = selinux_xfrm_sock_rcv_skb(sock_sid, skb);
+ 
+ out:	
+ 	return err;
+@@ -3333,8 +3353,9 @@ static int selinux_socket_getpeersec_str
+ 		peer_sid = ssec->peer_sid;
+ 	}
+ 	else if (isec->sclass == SECCLASS_TCP_SOCKET) {
+-		peer_sid = selinux_socket_getpeer_stream(sock->sk);
+-
++		err = selinux_netlbl_socket_getpeersec_stream(sock, &peer_sid);
++		if (err || peer_sid == SECSID_NULL)
++			peer_sid = selinux_socket_getpeer_stream(sock->sk);
+ 		if (peer_sid == SECSID_NULL) {
+ 			err = -ENOPROTOOPT;
+ 			goto out;
+@@ -3369,8 +3390,12 @@ out:	
+ 
+ static int selinux_socket_getpeersec_dgram(struct sk_buff *skb, char **secdata, u32 *seclen)
+ {
+-	int err = 0;
+-	u32 peer_sid = selinux_socket_getpeer_dgram(skb);
++	int err;
++	u32 peer_sid;
++
++	err = selinux_netlbl_socket_getpeersec_dgram(skb, &peer_sid);
++	if (err || peer_sid == SECSID_NULL)
++		peer_sid = selinux_socket_getpeer_dgram(skb);
+ 
+ 	if (peer_sid == SECSID_NULL)
+ 		return -EINVAL;
+@@ -4353,6 +4378,7 @@ static struct security_operations selinu
+ 	.socket_connect =		selinux_socket_connect,
+ 	.socket_listen =		selinux_socket_listen,
+ 	.socket_accept =		selinux_socket_accept,
++	.socket_post_accept =		selinux_socket_post_accept,
+ 	.socket_sendmsg =		selinux_socket_sendmsg,
+ 	.socket_recvmsg =		selinux_socket_recvmsg,
+ 	.socket_getsockname =		selinux_socket_getsockname,
+Index: linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/include/objsec.h
++++ linux-2.6.17.i686-quilt/security/selinux/include/objsec.h
+@@ -35,6 +35,13 @@ struct task_security_struct {
+ 	u32 ptrace_sid;      /* SID of ptrace parent */
+ };
+ 
++struct netlbl_security_struct {
++	u32 peer_sid;             /* SID of the connected peer */
++	u32 req_netlbl:1,         /* socket requires a NetLabel label */
++	    labeled:1,            /* socket is labeled with NetLabel */
++	    __unused:30;
++};
++
+ struct inode_security_struct {
+         struct inode *inode;           /* back pointer to inode object */
+ 	struct list_head list;         /* list of inode_security_struct */
+@@ -44,6 +51,9 @@ struct inode_security_struct {
+ 	unsigned char initialized;     /* initialization flag */
+ 	struct semaphore sem;
+ 	unsigned char inherit;         /* inherit SID from parent entry */
++#ifdef CONFIG_NETLABEL
++	struct netlbl_security_struct netlbl;
++#endif
+ };
+ 
+ struct file_security_struct {
+Index: linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/security/selinux/include/selinux_netlabel.h
+@@ -0,0 +1,94 @@
++/*
++ * SELinux interface to the NetLabel subsystem
++ *
++ * Author : Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef _SELINUX_NETLABEL_H_
++#define _SELINUX_NETLABEL_H_
++
++#ifdef CONFIG_NETLABEL
++void selinux_netlbl_cache_invalidate(void);
++int selinux_netlbl_inode_permission(struct inode *inode,
++				    int mask);
++
++int selinux_netlbl_socket_create(struct socket *sock,
++				 const int sock_family,
++				 u32 sid);
++int selinux_netlbl_socket_accept(struct socket *sock, struct socket *newsock);
++int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
++				const u32 sock_sid,
++				struct sk_buff *skb,
++				struct avc_audit_data *ad);
++int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
++					    u32 *peer_sid);
++int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid);
++#else
++static inline void selinux_netlbl_cache_invalidate(void)
++{
++	return;
++}
++
++static inline int selinux_netlbl_inode_permission(struct inode *inode,
++						  int mask)
++{
++	return 0;
++}
++
++static inline int selinux_netlbl_socket_create(struct socket *sock,
++					       const int sock_family,
++					       u32 sid)
++{
++	return 0;
++}
++
++static inline int selinux_netlbl_socket_accept(struct socket *sock,
++					       struct socket *newsock)
++{
++	return -ENOMSG;
++}
++
++static inline int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
++					      const u32 sock_sid,
++					      struct sk_buff *skb,
++					      struct avc_audit_data *ad)
++{
++	return 0;
++}
++
++static inline int selinux_netlbl_socket_getpeersec_stream(struct socket *sock,
++							  u32 *peer_sid)
++{
++	*peer_sid = SECSID_NULL;
++	return 0;
++}
++
++static inline int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb,
++							 u32 *peer_sid)
++{
++	*peer_sid = SECSID_NULL;
++	return 0;
++}
++#endif /* CONFIG_NETLABEL */
++
++#endif
+Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.c
++++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.c
+@@ -3,6 +3,14 @@
+  *
+  * Author : Stephen Smalley, <sds at epoch.ncsc.mil>
+  */
++/*
++ * Updated: Hewlett-Packard <paul.moore at hp.com>
++ *
++ *      Added ebitmap_export() and ebitmap_import()
++ *
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ */
++
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/errno.h>
+@@ -59,6 +67,150 @@ int ebitmap_cpy(struct ebitmap *dst, str
+ 	return 0;
+ }
+ 
++/**
++ * ebitmap_export - Export an ebitmap to a unsigned char bitmap string
++ * @src: the ebitmap to export
++ * @dst: the resulting bitmap string
++ * @dst_len: length of dst in bytes
++ *
++ * Description:
++ * Allocate a buffer at least src->highbit bits long and export the extensible
++ * bitmap into the buffer.  The bitmap string will be in little endian format,
++ * i.e. LSB first.  The value returned in dst_len may not the true size of the
++ * buffer as the length of the buffer is rounded up to a multiple of MAPTYPE.
++ * The caller must free the buffer when finished. Returns zero on success,
++ * negative values on failure.
++ *
++ */
++int ebitmap_export(const struct ebitmap *src,
++		   unsigned char **dst,
++		   u32 *dst_len)
++{
++	u32 bitmap_len;
++	unsigned char *bitmap;
++	struct ebitmap_node *iter_node;
++	MAPTYPE node_val;
++	u32 bitmap_byte;
++	unsigned char bitmask;
++
++	if (src == NULL || dst == NULL || dst_len == NULL)
++		return -EINVAL;
++
++	*dst = NULL;
++	*dst_len = 0;
++
++	bitmap_len = src->highbit / 8;
++	if (src->highbit % 8 > 0)
++		bitmap_len += 1;
++	if (bitmap_len == 0)
++		return -EINVAL;
++
++	bitmap = kzalloc(bitmap_len + sizeof(MAPTYPE) -
++			 (bitmap_len % sizeof(MAPTYPE)),
++			 GFP_ATOMIC);
++	if (bitmap == NULL)
++		return -ENOMEM;
++
++	iter_node = src->node;
++	do {
++		bitmap_byte = iter_node->startbit / 8;
++		bitmask = 0x80;
++		node_val = iter_node->map;
++		do {
++			if (bitmask == 0) {
++				bitmap_byte++;
++				bitmask = 0x80;
++			}
++			if (node_val & (MAPTYPE)0x01)
++				bitmap[bitmap_byte] |= bitmask;
++			node_val >>= 1;
++			bitmask >>= 1;
++		} while (node_val > 0);
++		iter_node = iter_node->next;
++	} while (iter_node);
++
++	*dst = bitmap;
++	*dst_len = bitmap_len;
++	return 0;
++}
++
++/**
++ * ebitmap_import - Import an unsigned char bitmap string into an ebitmap
++ * @src: the bitmap string
++ * @src_len: the bitmap length in bytes
++ * @dst: the empty ebitmap
++ *
++ * Description:
++ * This function takes a little endian bitmap string in src and imports it into
++ * the ebitmap pointed to by dst.  Returns zero on success, negative values on
++ * failure.
++ *
++ */
++int ebitmap_import(const unsigned char *src,
++		   const u32 src_len,
++		   struct ebitmap *dst)
++{
++	u32 src_off = 0;
++	struct ebitmap_node *node_new;
++	struct ebitmap_node *node_last = NULL;
++	u32 src_rem = src_len;
++	MAPTYPE tmp_val;
++	u32 iter;
++	u32 iter_bit;
++	unsigned char src_byte;
++
++	if (src == NULL || dst == NULL || src_len == 0)
++		return -EINVAL;
++
++	do {
++		node_new = kzalloc(sizeof(*node_new), GFP_ATOMIC);
++		if (node_new == NULL) {
++			ebitmap_destroy(dst);
++			return -ENOMEM;
++		}
++
++		if (src_rem >= sizeof(MAPTYPE))
++			iter = sizeof(MAPTYPE);
++		else
++			iter = src_rem;
++		tmp_val = 0;
++		while (iter > 0) {
++			src_byte = src[src_off + --iter];
++			if (src_byte > 0)
++				for (iter_bit = 0; iter_bit < 8; iter_bit++) {
++					tmp_val <<= 1;
++					tmp_val |= src_byte & 0x01;
++					src_byte >>= 1;
++				}
++			else
++				tmp_val <<= 8;
++		}
++		node_new->map = tmp_val;
++		node_new->startbit = src_off * 8;
++
++		if (node_last != NULL)
++			node_last->next = node_new;
++		else
++			dst->node = node_new;
++		node_last = node_new;
++
++		if (src_rem >= sizeof(MAPTYPE)) {
++			src_off += sizeof(MAPTYPE);
++			src_rem -= sizeof(MAPTYPE);
++		} else
++			src_off += src_rem;
++	} while (src_off < src_len);
++
++	tmp_val = node_last->map;
++	dst->highbit = node_last->startbit;
++	while (tmp_val >= 1) {
++		dst->highbit += 1;
++		tmp_val >>= 1;
++	}
++
++	return 0;
++}
++
+ int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2)
+ {
+ 	struct ebitmap_node *n1, *n2;
+Index: linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/ebitmap.h
++++ linux-2.6.17.i686-quilt/security/selinux/ss/ebitmap.h
+@@ -69,6 +69,12 @@ static inline int ebitmap_node_get_bit(s
+ 
+ int ebitmap_cmp(struct ebitmap *e1, struct ebitmap *e2);
+ int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src);
++int ebitmap_export(const struct ebitmap *src,
++		   unsigned char **dst,
++		   u32 *dst_len);
++int ebitmap_import(const unsigned char *src,
++		   const u32 src_len,
++		   struct ebitmap *dst);
+ int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2);
+ int ebitmap_get_bit(struct ebitmap *e, unsigned long bit);
+ int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value);
+Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.c
++++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.c
+@@ -10,6 +10,13 @@
+  *
+  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
+  */
++/*
++ * Updated: Hewlett-Packard <paul.moore at hp.com>
++ *
++ *      Added support to import/export the MLS label
++ *
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ */
+ 
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+@@ -585,3 +592,156 @@ int mls_compute_sid(struct context *scon
+ 	return -EINVAL;
+ }
+ 
++/**
++ * mls_export_lvl - Export the MLS sensitivity levels
++ * @context: the security context
++ * @lvl_low: the low sensitivity level
++ * @lvl_high: the high sensitivity level
++ *
++ * Description:
++ * Given the security context copy the low MLS sensitivity level into lvl_low
++ * and the high sensitivity level in lvl_high.  The MLS levels are only
++ * exported if the pointers are not NULL, if they are NULL then that level is
++ * not exported.  Returns zero on success, negative values on failure.
++ *
++ */
++int mls_export_lvl(const struct context *context, u32 *lvl_low, u32 *lvl_high)
++{
++	if (!selinux_mls_enabled)
++		return 0;
++
++	if (lvl_low != NULL)
++		*lvl_low = context->range.level[0].sens - 1;
++	if (lvl_high != NULL)
++		*lvl_high = context->range.level[1].sens - 1;
++
++	return 0;
++}
++
++/**
++ * mls_import_lvl - Import the MLS sensitivity levels
++ * @context: the security context
++ * @lvl_low: the low sensitivity level
++ * @lvl_high: the high sensitivity level
++ *
++ * Description:
++ * Given the security context and the two sensitivty levels, set the MLS levels
++ * in the context according the two given as parameters.  Returns zero on
++ * success, negative values on failure.
++ *
++ */
++int mls_import_lvl(struct context *context,
++		   const u32 lvl_low,
++		   const u32 lvl_high)
++{
++	if (!selinux_mls_enabled)
++		return 0;
++
++	context->range.level[0].sens = lvl_low + 1;
++	context->range.level[1].sens = lvl_high + 1;
++
++	return 0;
++}
++
++/**
++ * mls_export_cat - Export the MLS categories
++ * @context: the security context
++ * @cat_low: the low category
++ * @cat_low_len: length of the cat_low bitmap in bytes
++ * @cat_high: the high category
++ * @cat_high_len: length of the cat_high bitmap in bytes
++ *
++ * Description:
++ * Given the security context export the low MLS category bitmap into cat_low
++ * and the high category bitmap into cat_high.  The MLS categories are only
++ * exported if the pointers are not NULL, if they are NULL then that level is
++ * not exported.  The caller is responsibile for freeing the memory when
++ * finished.  Returns zero on success, negative values on failure.
++ *
++ */
++int mls_export_cat(const struct context *context,
++		   unsigned char **cat_low,
++		   u32 *cat_low_len,
++		   unsigned char **cat_high,
++		   u32 *cat_high_len)
++{
++	int ret_val = -EPERM;
++
++	if (!selinux_mls_enabled)
++		return 0;
++
++	if (cat_low != NULL && cat_low_len != NULL) {
++		ret_val = ebitmap_export(&context->range.level[0].cat,
++					 cat_low,
++					 cat_low_len);
++		if (ret_val != 0)
++			goto export_cat_failure;
++	}
++	if (cat_high != NULL && cat_high_len != NULL) {
++		ret_val = ebitmap_export(&context->range.level[1].cat,
++					 cat_high,
++					 cat_high_len);
++		if (ret_val != 0)
++			goto export_cat_failure;
++	}
++
++	return 0;
++
++export_cat_failure:
++	if (cat_low != NULL && *cat_low != NULL)
++		kfree(*cat_low);
++	if (cat_high != NULL && *cat_high != NULL)
++		kfree(*cat_high);
++	return ret_val;
++}
++
++/**
++ * mls_import_cat - Import the MLS categories
++ * @context: the security context
++ * @cat_low: the low category
++ * @cat_low_len: length of the cat_low bitmap in bytes
++ * @cat_high: the high category
++ * @cat_high_len: length of the cat_high bitmap in bytes
++ *
++ * Description:
++ * Given the security context and the two category bitmap strings import the
++ * categories into the security context.  The MLS categories are only imported
++ * if the pointers are not NULL, if they are NULL they are skipped.  Returns
++ * zero on success, negative values on failure.
++ *
++ */
++int mls_import_cat(struct context *context,
++		   const unsigned char *cat_low,
++		   const u32 cat_low_len,
++		   const unsigned char *cat_high,
++		   const u32 cat_high_len)
++{
++	int ret_val = -EPERM;
++
++	if (!selinux_mls_enabled)
++		return 0;
++
++	if (cat_low != NULL && cat_low_len > 0) {
++		ret_val = ebitmap_import(cat_low,
++					 cat_low_len,
++					 &context->range.level[0].cat);
++		if (ret_val != 0)
++			goto import_cat_failure;
++	}
++	if (cat_high != NULL && cat_high_len > 0) {
++		ret_val = ebitmap_import(cat_high,
++					 cat_high_len,
++					 &context->range.level[1].cat);
++		if (ret_val != 0)
++			goto import_cat_failure;
++	}
++
++	return 0;
++
++import_cat_failure:
++	if (cat_low)
++		ebitmap_destroy(&context->range.level[0].cat);
++	if (cat_high)
++		ebitmap_destroy(&context->range.level[1].cat);
++	return ret_val;
++}
+Index: linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/mls.h
++++ linux-2.6.17.i686-quilt/security/selinux/ss/mls.h
+@@ -10,6 +10,13 @@
+  *
+  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
+  */
++/*
++ * Updated: Hewlett-Packard <paul.moore at hp.com>
++ *
++ *      Added support to import/export the MLS label
++ *
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ */
+ 
+ #ifndef _SS_MLS_H_
+ #define _SS_MLS_H_
+@@ -42,5 +49,23 @@ int mls_compute_sid(struct context *scon
+ int mls_setup_user_range(struct context *fromcon, struct user_datum *user,
+                          struct context *usercon);
+ 
++int mls_export_lvl(const struct context *context,
++		   u32 *lvl_low,
++		   u32 *lvl_high);
++int mls_import_lvl(struct context *context,
++		   const u32 lvl_low,
++		   const u32 lvl_high);
++
++int mls_export_cat(const struct context *context,
++                   unsigned char **cat_low,
++                   u32 *cat_low_len,
++                   unsigned char **cat_high,
++                   u32 *cat_high_len);
++int mls_import_cat(struct context *context,
++                   const unsigned char *cat_low,
++                   const u32 cat_low_len,
++                   const unsigned char *cat_high,
++                   const u32 cat_high_len);
++
+ #endif	/* _SS_MLS_H */
+ 
+Index: linux-2.6.17.i686-quilt/security/selinux/ss/services.c
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/security/selinux/ss/services.c
++++ linux-2.6.17.i686-quilt/security/selinux/ss/services.c
+@@ -13,6 +13,11 @@
+  *
+  * 	Added conditional policy language extensions
+  *
++ * Updated: Hewlett-Packard <paul.moore at hp.com>
++ *
++ *      Added support for NetLabel
++ *
++ * Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
+  * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
+  * Copyright (C) 2003 - 2004 Tresys Technology, LLC
+  * Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris at redhat.com>
+@@ -29,6 +34,8 @@
+ #include <linux/sched.h>
+ #include <linux/audit.h>
+ #include <linux/mutex.h>
++#include <net/sock.h>
++#include <net/netlabel.h>
+ 
+ #include "flask.h"
+ #include "avc.h"
+@@ -40,6 +47,8 @@
+ #include "services.h"
+ #include "conditional.h"
+ #include "mls.h"
++#include "objsec.h"
++#include "selinux_netlabel.h"
+ 
+ extern void selnl_notify_policyload(u32 seqno);
+ unsigned int policydb_loaded_version;
+@@ -1241,6 +1250,7 @@ int security_load_policy(void *data, siz
+ 		selinux_complete_init();
+ 		avc_ss_reset(seqno);
+ 		selnl_notify_policyload(seqno);
++		selinux_netlbl_cache_invalidate();
+ 		return 0;
+ 	}
+ 
+@@ -1295,6 +1305,7 @@ int security_load_policy(void *data, siz
+ 
+ 	avc_ss_reset(seqno);
+ 	selnl_notify_policyload(seqno);
++	selinux_netlbl_cache_invalidate();
+ 
+ 	return 0;
+ 
+@@ -2048,3 +2059,557 @@ void selinux_audit_set_callback(int (*ca
+ {
+ 	aurule_callback = callback;
+ }
++
++#ifdef CONFIG_NETLABEL
++/*
++ * This is the structure we store inside the NetLabel cache block.
++ */
++#define NETLBL_CACHE(x)           ((struct netlbl_cache *)(x))
++#define NETLBL_CACHE_T_NONE       0
++#define NETLBL_CACHE_T_SID        1
++#define NETLBL_CACHE_T_MLSLBL     2
++struct netlbl_cache {
++	u32 type;
++	union {
++		u32 sid;
++		struct mls_level mls_label;
++	} data;
++};
++
++/**
++ * selinux_netlbl_cache_free - Free the NetLabel cached data
++ * @data: the data to free
++ *
++ * Description:
++ * This function is intended to be used as the free() callback inside the
++ * netlbl_lsm_cache structure.
++ *
++ */
++static void selinux_netlbl_cache_free(const void *data)
++{
++	struct netlbl_cache *cache = NETLBL_CACHE(data);
++	switch (cache->type) {
++	case NETLBL_CACHE_T_MLSLBL:
++		ebitmap_destroy(&cache->data.mls_label.cat);
++		break;
++	}
++	kfree(data);
++}
++
++/**
++ * selinux_netlbl_cache_add - Add an entry to the NetLabel cache
++ * @skb: the packet
++ * @ctx: the SELinux context
++ *
++ * Description:
++ * Attempt to cache the context in @ctx, which was derived from the packet in
++ * @skb, in the NetLabel subsystem cache.
++ *
++ */
++static void selinux_netlbl_cache_add(struct sk_buff *skb, struct context *ctx)
++{
++	struct netlbl_cache *cache = NULL;
++	struct netlbl_lsm_secattr secattr;
++
++	netlbl_secattr_init(&secattr);
++
++	cache = kzalloc(sizeof(*cache),	GFP_ATOMIC);
++	if (cache == NULL)
++		goto netlbl_cache_add_return;
++	secattr.cache.free = selinux_netlbl_cache_free;
++	secattr.cache.data = (void *)cache;
++	secattr.set_cache = 1;
++
++	if (ebitmap_cpy(&cache->data.mls_label.cat,
++			&ctx->range.level[0].cat) != 0)
++		goto netlbl_cache_add_return;
++	cache->data.mls_label.sens = ctx->range.level[0].sens;
++	cache->type = NETLBL_CACHE_T_MLSLBL;
++
++	if (netlbl_cache_add(skb, &secattr) != 0)
++		goto netlbl_cache_add_return;
++	secattr.set_cache = 0;
++
++netlbl_cache_add_return:
++	netlbl_secattr_destroy(&secattr);
++}
++
++/**
++ * selinux_netlbl_cache_invalidate - Invalidate the NetLabel cache
++ *
++ * Description:
++ * Invalidate the NetLabel security attribute mapping cache.
++ *
++ */
++void selinux_netlbl_cache_invalidate(void)
++{
++	netlbl_cache_invalidate();
++}
++
++/**
++ * selinux_netlbl_domain_export - Exports the type of a given context
++ * @context: the security context
++ * @scontext: the resulting type string
++ * @scontext_len: the length of scontext including the NULL byte
++ *
++ * Description:
++ * Allocate a buffer for the type name specified in context and copy the type
++ * name into the buffer.  The caller must free the buffer when finished.  The
++ * caller should also hold the policy read lock while calling this function.
++ * Returns zero on success, negative values on failure.
++ *
++ */
++static int selinux_netlbl_domain_export(const struct context *context,
++					char **scontext,
++					u32 *scontext_len)
++{
++	*scontext = kstrdup(policydb.p_type_val_to_name[context->type - 1],
++			    GFP_ATOMIC);
++	if (*scontext == NULL)
++		return -ENOMEM;
++
++	if (scontext_len != NULL)
++		*scontext_len = strlen(*scontext) + 1;
++
++	return 0;
++}
++
++/**
++ * selinux_netlbl_secattr_to_sid - Convert a NetLabel secattr to a SELinux SID
++ * @skb: the network packet
++ * @secattr: the NetLabel packet security attributes
++ * @base_sid: the SELinux SID to use as a context for MLS only attributes
++ * @sid: the SELinux SID
++ *
++ * Description:
++ * Convert the given NetLabel packet security attributes in @secattr into a
++ * SELinux SID.  If the @secattr field does not contain a full SELinux
++ * SID/context then use the context in @base_sid as the foundation.  If @skb
++ * is not NULL attempt to cache as much data as possibile.  Returns zero on
++ * success, negative values on failure.
++ *
++ */
++static int selinux_netlbl_secattr_to_sid(struct sk_buff *skb,
++					 struct netlbl_lsm_secattr *secattr,
++					 const u32 base_sid,
++					 u32 *sid)
++{
++	int ret_val = -EIDRM;
++	struct context *ctx;
++	struct context ctx_new;
++	struct netlbl_cache *cache;
++	u32 ctx_new_destroy = 0;
++
++	POLICY_RDLOCK;
++
++	if (secattr->set_cache) {
++		cache = NETLBL_CACHE(secattr->cache.data);
++		switch (cache->type) {
++		case NETLBL_CACHE_T_SID:
++			*sid = cache->data.sid;
++			break;
++		case NETLBL_CACHE_T_MLSLBL:
++			ctx = sidtab_search(&sidtab, base_sid);
++			if (ctx == NULL)
++				goto netlbl_secattr_to_sid_return;
++			ret_val = context_cpy(&ctx_new, ctx);
++			if (ret_val != 0)
++				goto netlbl_secattr_to_sid_return;
++			ctx_new_destroy = 1;
++			mls_context_destroy(&ctx_new);
++
++			ctx_new.range.level[0].sens =
++				cache->data.mls_label.sens;
++			ret_val = ebitmap_cpy(&ctx_new.range.level[0].cat,
++					      &cache->data.mls_label.cat);
++			if (ret_val != 0)
++				goto netlbl_secattr_to_sid_return;
++			ctx_new.range.level[1].sens =
++				cache->data.mls_label.sens;
++			ret_val = ebitmap_cpy(&ctx_new.range.level[1].cat,
++					      &cache->data.mls_label.cat);
++			if (ret_val != 0)
++				goto netlbl_secattr_to_sid_return;
++
++			ret_val = sidtab_context_to_sid(&sidtab,
++							&ctx_new,
++							sid);
++			break;
++		default:
++			goto netlbl_secattr_to_sid_return;
++		}
++	} else if (secattr->set_mls_lvl) {
++		ctx = sidtab_search(&sidtab, base_sid);
++		if (ctx == NULL)
++			goto netlbl_secattr_to_sid_return;
++		ret_val = context_cpy(&ctx_new, ctx);
++		if (ret_val != 0)
++			goto netlbl_secattr_to_sid_return;
++		ctx_new_destroy = 1;
++		mls_context_destroy(&ctx_new);
++
++		if (mls_import_lvl(&ctx_new,
++				   secattr->mls_lvl,
++				   secattr->mls_lvl) != 0)
++			goto netlbl_secattr_to_sid_return;
++		if (secattr->set_mls_cat) {
++			if (mls_import_cat(&ctx_new,
++					   secattr->mls_cat,
++					   secattr->mls_cat_len,
++					   secattr->mls_cat,
++					   secattr->mls_cat_len) != 0)
++				goto netlbl_secattr_to_sid_return;
++		}
++
++		ret_val = mls_context_isvalid(&policydb, &ctx_new);
++		if (ret_val != 1)
++			goto netlbl_secattr_to_sid_return;
++
++		if (skb != NULL)
++			selinux_netlbl_cache_add(skb, &ctx_new);
++
++		ret_val = sidtab_context_to_sid(&sidtab, &ctx_new, sid);
++	} else
++		*sid = SECINITSID_UNLABELED;
++
++	ret_val = 0;
++
++netlbl_secattr_to_sid_return:
++	POLICY_RDUNLOCK;
++	if (ctx_new_destroy)
++		context_destroy(&ctx_new);
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
++ * @skb: the packet
++ * @base_sid: the SELinux SID to use as a context for MLS only attributes
++ * @sid: the SID
++ *
++ * Description:
++ * Call the NetLabel mechanism to get the security attributes of the given
++ * packet and use those attributes to determine the correct context/SID to
++ * assign to the packet.  Returns zero on success, negative values on failure.
++ *
++ */
++static int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
++					const u32 base_sid,
++					u32 *sid)
++{
++	int ret_val;
++	struct netlbl_lsm_secattr secattr;
++
++	netlbl_secattr_init(&secattr);
++	ret_val = netlbl_skbuff_getattr(skb, &secattr);
++	if (ret_val == 0)
++		ret_val = selinux_netlbl_secattr_to_sid(skb,
++							&secattr,
++							base_sid,
++							sid);
++
++	secattr.set_cache = 0;
++	netlbl_secattr_destroy(&secattr);
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_setsid - Label a socket using the NetLabel mechanism
++ * @sock: the socket to label
++ * @sock_family: the socket family
++ * @sid: the SID to use
++ *
++ * Description:
++ * Attempt to label a socket using the NetLabel mechanism using the given
++ * SID.  Returns zero values on success, negative values on failure.
++ *
++ */
++static int selinux_netlbl_socket_setsid(struct socket *sock,
++					const int sock_family,
++					u32 sid)
++{
++	int ret_val;
++	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
++	struct netlbl_lsm_secattr secattr;
++	struct context *ctx;
++
++	if (!ss_initialized)
++		return 0;
++
++	POLICY_RDLOCK;
++
++	ctx = sidtab_search(&sidtab, sid);
++	if (ctx != NULL) {
++		netlbl_secattr_init(&secattr);
++
++		if (selinux_netlbl_domain_export(ctx,
++						 &secattr.domain,
++						 NULL) == 0)
++			secattr.set_domain = 1;
++		if (mls_export_lvl(ctx, &secattr.mls_lvl, NULL) == 0)
++			secattr.set_mls_lvl = 1;
++		if (mls_export_cat(ctx,
++				   &secattr.mls_cat,
++				   &secattr.mls_cat_len,
++				   NULL,
++				   NULL) == 0)
++			secattr.set_mls_cat = 1;
++
++		ret_val = netlbl_socket_setattr(sock, &secattr);
++		if (ret_val == 0)
++			isec->netlbl.labeled = 1;
++
++		netlbl_secattr_destroy(&secattr);
++	} else
++		ret_val = -ENOENT;
++
++	POLICY_RDUNLOCK;
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_peeksid - Get the SID of the first queued packet
++ * @sock: the socket to query
++ * @sid: the packet's SID
++ *
++ * Description:
++ * Examine the first incoming packet in the socket's queue and determine the
++ * packet's SELinux SID.  Return zero on success, negative values on failure.
++ *
++ */
++static int selinux_netlbl_socket_peeksid(struct socket *sock,
++					 u32 *sid)
++{
++        int ret_val;
++	struct netlbl_lsm_secattr secattr;
++        struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
++
++        netlbl_secattr_init(&secattr);
++        ret_val = netlbl_socket_peekattr(sock, &secattr);
++        if (ret_val == 0)
++                ret_val = selinux_netlbl_secattr_to_sid(NULL,
++							&secattr,
++							isec->sid,
++							sid);
++
++        secattr.set_cache = 0;
++        netlbl_secattr_destroy(&secattr);
++
++        return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_create - Label a socket using the NetLabel mechanism
++ * @sock: the socket to label
++ * @sock_family: the socket family
++ * @sid: the SID to use
++ *
++ * Description:
++ * Attempt to label a socket using the NetLabel mechanism using the given
++ * SID.  Returns zero values on success, negative values on failure.
++ *
++ */
++int selinux_netlbl_socket_create(struct socket *sock,
++				 const int sock_family,
++				 u32 sid)
++{
++	int ret_val;
++	struct inode_security_struct *isec;
++
++	if (sock_family != PF_INET)
++		return 0;
++
++	isec = SOCK_INODE(sock)->i_security;
++	isec->netlbl.req_netlbl = 1;
++
++	ret_val = selinux_netlbl_socket_setsid(sock,
++					       sock_family,
++					       sid);
++	if (ret_val != 0)
++		printk(KERN_ERR
++		       "security:  failed to set socket's NetLabel, "
++		       "family %d, SID %u\n",
++		       sock_family,
++		       sid);
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_accept - Handle the labeling of an accept()ed socket
++ * @sock: the original socket
++ * @newsock: the new accept()ed socket
++ *
++ * Description:
++ * Attempt to label a socket using the NetLabel mechanism based on the
++ * connection and the original socket's SID.  Returns zero on success,
++ * negative values on failure.
++ *
++ */
++int selinux_netlbl_socket_accept(struct socket *sock,
++				 struct socket *newsock)
++{
++	int ret_val;
++	struct inode_security_struct *isec;
++	struct inode_security_struct *newisec;
++	struct netlbl_lsm_secattr secattr;
++
++	if (newsock->sk == NULL || newsock->sk->sk_family != PF_INET)
++		return -ENOMSG;
++
++	netlbl_secattr_init(&secattr);
++	ret_val = netlbl_socket_getattr(newsock, &secattr);
++	if (ret_val != 0)
++		return ret_val;
++
++	isec = SOCK_INODE(sock)->i_security;
++	newisec = SOCK_INODE(newsock)->i_security;
++	newisec->netlbl.req_netlbl = 1;
++	ret_val = selinux_netlbl_secattr_to_sid(NULL,
++						&secattr,
++						isec->sid,
++						&newisec->netlbl.peer_sid);
++	if (ret_val != 0)
++		return ret_val;
++
++	newisec->sclass = isec->sclass;
++	newisec->sid = newisec->netlbl.peer_sid;
++	newisec->initialized = 1;
++
++	return 0;
++}
++
++/**
++ * selinux_netlbl_file_permission - Verify the file/socket is NetLabel labeled
++ * @inode: the file descriptor's inode
++ * @mask: the permission mask
++ *
++ * Description:
++ * Looks at a file's inode and if it is marked as a socket protected by
++ * NetLabel then verify that the socket has been labeled, if not try to label
++ * the socket now with the task's SID.  Returns zero on success, negative
++ * values on failure.
++ *
++ */
++int selinux_netlbl_inode_permission(struct inode *inode, int mask)
++{
++	int ret_val = 0;
++	struct inode_security_struct *isec = inode->i_security;
++	struct netlbl_security_struct *nlblsec = &isec->netlbl;
++	struct socket *sock;
++
++	down(&isec->sem);
++	if (nlblsec->req_netlbl == 1 && nlblsec->labeled == 0 &&
++	    (mask & (MAY_WRITE | MAY_APPEND))) {
++		sock = SOCKET_I(inode);
++		ret_val = selinux_netlbl_socket_setsid(sock,
++						       sock->sk->sk_family,
++						       isec->sid);
++	}
++	up(&isec->sem);
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
++ * @sock_class: the socket class
++ * @sock_sid: the socket's SID
++ * @skb: the incoming packet
++ * @ad: the audit data
++ *
++ * Description:
++ * Fetch the NetLabel security attributes from @skb and perform an access check
++ * against the receiving socket.  Returns zero on success, negative values on
++ * error.
++ *
++ */
++int selinux_netlbl_sock_rcv_skb(const u16 sock_class,
++				const u32 sock_sid,
++				struct sk_buff *skb,
++				struct avc_audit_data *ad)
++{
++	int ret_val;
++	u32 netlbl_sid;
++	u32 recv_perm;
++
++	ret_val = selinux_netlbl_skbuff_getsid(skb, sock_sid, &netlbl_sid);
++	if (ret_val != 0)
++		return ret_val;
++
++	/* PM - at some point we want to do an unlabeled check here too but
++	   we need a way to enable/disable NetLabel checks at runtime first,
++	   see RH BZ #195238 for more details */
++	if (netlbl_sid != SECINITSID_UNLABELED) {
++		switch (sock_class) {
++		case SECCLASS_UDP_SOCKET:
++			recv_perm = UDP_SOCKET__RECV_MSG;
++			break;
++		case SECCLASS_TCP_SOCKET:
++			recv_perm = TCP_SOCKET__RECV_MSG;
++			break;
++		default:
++			recv_perm = RAWIP_SOCKET__RECV_MSG;
++			break;
++		}
++
++		ret_val = avc_has_perm(sock_sid,
++				       netlbl_sid,
++				       sock_class,
++				       recv_perm,
++				       ad);
++		if (ret_val)
++			netlbl_skbuff_err(skb, ret_val);
++	}
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_peersid - Return the peer SID of a connected socket
++ * @sock: the socket
++ * @peer_sid: the peer SID
++ *
++ * Description:
++ * Examine @sock to find the connected peer's SID, if that is not possibile
++ * check the socket's receive queue and take the SID from the incoming
++ * packets.  Returns zero on success, negative values on error.
++ *
++ */
++int selinux_netlbl_socket_getpeersec_stream(struct socket *sock, u32 *peer_sid)
++{
++	int ret_val = 0;
++	struct inode_security_struct *isec = SOCK_INODE(sock)->i_security;
++
++	if (isec->netlbl.peer_sid == 0)
++		ret_val = selinux_netlbl_socket_peeksid(sock, peer_sid);
++	else
++		*peer_sid = isec->netlbl.peer_sid;
++
++	return ret_val;
++}
++
++/**
++ * selinux_netlbl_socket_getpeersec_dgram - Return the SID of a NetLabel packet
++ * @skb: the packet
++ * @peer_sid: the packet's SID
++ *
++ * Description:
++ * Examine @skb to find the SID assigned to it by NetLabel.  Returns zero on
++ * success, negative values on error.
++ *
++ */
++int selinux_netlbl_socket_getpeersec_dgram(struct sk_buff *skb, u32 *peer_sid)
++{
++	struct inode_security_struct *isec;
++
++	if (skb->sk == NULL || skb->sk->sk_socket == NULL)
++		return -ENOPROTOOPT;
++
++	isec = SOCK_INODE(skb->sk->sk_socket)->i_security;
++
++	return selinux_netlbl_skbuff_getsid(skb, isec->sid, peer_sid);
++}
++#endif /* CONFIG_NETLABEL */
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_6_7.patch:
 netlabel_cipso_v4.c  |  631 +++++++++++++++++++++++++++++++++++++++++++++++++++
 netlabel_unlabeled.c |  256 ++++++++++++++++++++
 2 files changed, 887 insertions(+)

Index: linux-2.6-net-label_6_7.patch
===================================================================
RCS file: linux-2.6-net-label_6_7.patch
diff -N linux-2.6-net-label_6_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_6_7.patch	8 Jul 2006 18:07:25 -0000	1.1.2.3
@@ -0,0 +1,951 @@
+From paul.moore at hp.com Thu Jul  6 17:34:12 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:58:59 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lwwel017551
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:58:58 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwuLP006921;
+	Thu, 6 Jul 2006 17:58:56 -0400
+Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwrkF029588;
+	Thu, 6 Jul 2006 17:58:54 -0400
+Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114])
+	by atlrel7.hp.com (Postfix) with ESMTP id 5B6D634CA8;
+	Thu,  6 Jul 2006 17:58:48 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id E0C143473A;
+	Thu,  6 Jul 2006 21:58:47 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66Lwlke029121;
+	Thu, 6 Jul 2006 17:58:47 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66Lwlht029120;
+	Thu, 6 Jul 2006 17:58:47 -0400
+Message-Id: <20060706215847.068916000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:12 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 6/7] NetLabel: CIPSOv4 and Unlabeled packet integration
+Content-Disposition: inline; filename=netlabel-core_components
+X-RedHat-Spam-Score: -96.778 
+Content-Type: 
+X-UID: 73477
+X-Length: 27290
+
+Add CIPSO/IPv4 and unlabeled packet support and management to the NetLabel
+subsystem.  The CIPSO/IPv4 changes the use/configuration of CIPSO/IPv4 within
+the overall NetLabel framework.  The unlabeled packet changes allows NetLabel
+to pass unlabeled packets without error.
+---
+ net/netlabel/netlabel_cipso_v4.c  |  631 ++++++++++++++++++++++++++++++++++++++
+ net/netlabel/netlabel_unlabeled.c |  256 +++++++++++++++
+ 2 files changed, 887 insertions(+)
+
+Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_cipso_v4.c
+@@ -0,0 +1,631 @@
++/*
++ * NetLabel CIPSO/IPv4 Support
++ *
++ * This file defines the CIPSO/IPv4 functions for the NetLabel system.  The
++ * NetLabel system manages static and dynamic label mappings for network
++ * protocols such as CIPSO and RIPSO.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/socket.h>
++#include <linux/string.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/netlink.h>
++#include <net/genetlink.h>
++#include <net/netlabel.h>
++#include <net/cipso_ipv4.h>
++
++#include "netlabel_user.h"
++#include "netlabel_cipso_v4.h"
++
++/* NetLabel Generic NETLINK CIPSOv4 family */
++static struct genl_family netlbl_cipsov4_gnl_family = {
++	.id = GENL_ID_GENERATE,
++	.hdrsize = 0,
++	.name = NETLBL_NLTYPE_CIPSOV4_NAME,
++	.version = NETLBL_PROTO_VERSION,
++	.maxattr = 0,
++};
++
++
++/*
++ * Local Prototypes
++ */
++
++static void netlbl_cipsov4_send_ack(const struct genl_info *info,
++				    const u32 ret_code);
++
++
++/*
++ * Helper Functions
++ */
++
++/**
++ * netlbl_cipsov4_doi_free - Frees a CIPSO V4 DOI definition
++ * @entry: the entry's RCU field
++ *
++ * Description:
++ * This function is designed to be used as a callback to the call_rcu()
++ * function so that the memory allocated to the DOI definition can be released
++ * safely.
++ *
++ */
++static void netlbl_cipsov4_doi_free(struct rcu_head *entry)
++{
++	struct cipso_v4_doi *ptr;
++
++	ptr = container_of(entry, struct cipso_v4_doi, rcu);
++	switch (ptr->type) {
++	case CIPSO_V4_MAP_STD:
++		if (ptr->map.std->lvl.cipso_size > 0)
++			kfree(ptr->map.std->lvl.cipso);
++		if (ptr->map.std->lvl.local_size > 0)
++			kfree(ptr->map.std->lvl.local);
++		if (ptr->map.std->cat.cipso_size > 0)
++			kfree(ptr->map.std->cat.cipso);
++		if (ptr->map.std->cat.local_size > 0)
++			kfree(ptr->map.std->cat.local);
++		break;
++	}
++	kfree(ptr);
++}
++
++
++/*
++ * NetLabel Command Handlers
++ */
++
++/**
++ * netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition
++ * @doi: the DOI value
++ * @msg: the ADD message data
++ * @msg_size: the size of the ADD message buffer
++ *
++ * Description:
++ * Create a new CIPSO_V4_MAP_STD DOI definition based on the given ADD message
++ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
++ * error.
++ *
++ */
++static int netlbl_cipsov4_add_std(const u32 doi,
++				  const unsigned char *msg,
++				  const size_t msg_size)
++{
++	int ret_val = -EPERM;
++	unsigned char *msg_ptr = (unsigned char *)msg;
++	ssize_t msg_len = msg_size;
++	u32 num_tags;
++	u32 num_lvls;
++	u32 num_cats;
++	struct cipso_v4_doi *doi_def = NULL;
++	u32 iter;
++	u32 tmp_val_a;
++	u32 tmp_val_b;
++
++	if (msg_len < NETLBL_LEN_U32)
++		goto add_std_failure;
++	num_tags = netlbl_getinc_u32(&msg_ptr, &msg_len);
++	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
++		goto add_std_failure;
++
++	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
++	if (doi_def == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++	doi_def->map.std = kzalloc(sizeof(*doi_def->map.std), GFP_KERNEL);
++	if (doi_def->map.std == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++	doi_def->type = CIPSO_V4_MAP_STD;
++
++	for (iter = 0; iter < num_tags; iter++) {
++		if (msg_len < NETLBL_LEN_U8)
++			goto add_std_failure;
++		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr, &msg_len);
++		switch (doi_def->tags[iter]) {
++		case CIPSO_V4_TAG_RBITMAP:
++			break;
++		default:
++			goto add_std_failure;
++		}
++	}
++	if (iter < CIPSO_V4_TAG_MAXCNT)
++		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
++
++	if (msg_len < 6 * NETLBL_LEN_U32)
++		goto add_std_failure;
++
++	num_lvls = netlbl_getinc_u32(&msg_ptr, &msg_len);
++	if (num_lvls == 0)
++		goto add_std_failure;
++	doi_def->map.std->lvl.local_size = netlbl_getinc_u32(&msg_ptr,
++							     &msg_len);
++	if (doi_def->map.std->lvl.local_size > CIPSO_V4_MAX_LOC_LVLS)
++		goto add_std_failure;
++	doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size,
++					      sizeof(u32),
++					      GFP_KERNEL);
++	if (doi_def->map.std->lvl.local == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++	doi_def->map.std->lvl.cipso_size = netlbl_getinc_u8(&msg_ptr,
++							    &msg_len);
++	if (doi_def->map.std->lvl.cipso_size > CIPSO_V4_MAX_REM_LVLS)
++		goto add_std_failure;
++	doi_def->map.std->lvl.cipso = kcalloc(doi_def->map.std->lvl.cipso_size,
++					      sizeof(u32),
++					      GFP_KERNEL);
++	if (doi_def->map.std->lvl.cipso == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++
++	num_cats = netlbl_getinc_u32(&msg_ptr, &msg_len);
++	doi_def->map.std->cat.local_size = netlbl_getinc_u32(&msg_ptr,
++							     &msg_len);
++	if (doi_def->map.std->cat.local_size > CIPSO_V4_MAX_LOC_CATS)
++		goto add_std_failure;
++	doi_def->map.std->cat.local = kcalloc(doi_def->map.std->cat.local_size,
++					      sizeof(u32),
++					      GFP_KERNEL);
++	if (doi_def->map.std->cat.local == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++	doi_def->map.std->cat.cipso_size = netlbl_getinc_u16(&msg_ptr,
++							     &msg_len);
++	if (doi_def->map.std->cat.cipso_size > CIPSO_V4_MAX_REM_CATS)
++		goto add_std_failure;
++	doi_def->map.std->cat.cipso = kcalloc(doi_def->map.std->cat.cipso_size,
++					      sizeof(u32),
++					      GFP_KERNEL);
++	if (doi_def->map.std->cat.cipso == NULL) {
++		ret_val = -ENOMEM;
++		goto add_std_failure;
++	}
++
++	if (msg_len <
++	    num_lvls * (NETLBL_LEN_U32 + NETLBL_LEN_U8) +
++	    num_cats * (NETLBL_LEN_U32 + NETLBL_LEN_U16))
++		goto add_std_failure;
++
++	for (iter = 0; iter < doi_def->map.std->lvl.cipso_size; iter++)
++		doi_def->map.std->lvl.cipso[iter] = CIPSO_V4_INV_LVL;
++	for (iter = 0; iter < doi_def->map.std->lvl.local_size; iter++)
++		doi_def->map.std->lvl.local[iter] = CIPSO_V4_INV_LVL;
++	for (iter = 0; iter < doi_def->map.std->cat.cipso_size; iter++)
++		doi_def->map.std->cat.cipso[iter] = CIPSO_V4_INV_CAT;
++	for (iter = 0; iter < doi_def->map.std->cat.local_size; iter++)
++		doi_def->map.std->cat.local[iter] = CIPSO_V4_INV_CAT;
++
++	for (iter = 0; iter < num_lvls; iter++) {
++		tmp_val_a = netlbl_getinc_u32(&msg_ptr, &msg_len);
++		tmp_val_b = netlbl_getinc_u8(&msg_ptr, &msg_len);
++
++		if (tmp_val_a >= doi_def->map.std->lvl.local_size ||
++		    tmp_val_b >= doi_def->map.std->lvl.cipso_size)
++			goto add_std_failure;
++
++		doi_def->map.std->lvl.cipso[tmp_val_b] = tmp_val_a;
++		doi_def->map.std->lvl.local[tmp_val_a] = tmp_val_b;
++	}
++
++	for (iter = 0; iter < num_cats; iter++) {
++		tmp_val_a = netlbl_getinc_u32(&msg_ptr, &msg_len);
++		tmp_val_b = netlbl_getinc_u16(&msg_ptr, &msg_len);
++
++		if (tmp_val_a >= doi_def->map.std->cat.local_size ||
++		    tmp_val_b >= doi_def->map.std->cat.cipso_size)
++			goto add_std_failure;
++
++		doi_def->map.std->cat.cipso[tmp_val_b] = tmp_val_a;
++		doi_def->map.std->cat.local[tmp_val_a] = tmp_val_b;
++	}
++
++	doi_def->doi = doi;
++	ret_val = cipso_v4_doi_add(doi_def);
++	if (ret_val != 0)
++		goto add_std_failure;
++	return 0;
++
++add_std_failure:
++	if (doi_def)
++		netlbl_cipsov4_doi_free(&doi_def->rcu);
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition
++ * @doi: the DOI value
++ * @msg: the ADD message data
++ * @msg_size: the size of the ADD message buffer
++ *
++ * Description:
++ * Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
++ * and add it to the CIPSO V4 engine.  Return zero on success and non-zero on
++ * error.
++ *
++ */
++static int netlbl_cipsov4_add_pass(const u32 doi,
++				   const unsigned char *msg,
++				   const size_t msg_size)
++{
++	int ret_val = -EPERM;
++	unsigned char *msg_ptr = (unsigned char *)msg;
++	ssize_t msg_len = msg_size;
++	u32 num_tags;
++	struct cipso_v4_doi *doi_def = NULL;
++	u32 iter;
++
++	if (msg_len < NETLBL_LEN_U32)
++		goto add_pass_failure;
++	num_tags = netlbl_getinc_u32(&msg_ptr, &msg_len);
++	if (num_tags == 0 || num_tags > CIPSO_V4_TAG_MAXCNT)
++		goto add_pass_failure;
++
++	doi_def = kmalloc(sizeof(*doi_def), GFP_KERNEL);
++	if (doi_def == NULL) {
++		ret_val = -ENOMEM;
++		goto add_pass_failure;
++	}
++	doi_def->type = CIPSO_V4_MAP_PASS;
++
++	for (iter = 0; iter < num_tags; iter++) {
++		if (msg_len < NETLBL_LEN_U8)
++			goto add_pass_failure;
++		doi_def->tags[iter] = netlbl_getinc_u8(&msg_ptr, &msg_len);
++		switch (doi_def->tags[iter]) {
++		case CIPSO_V4_TAG_RBITMAP:
++			break;
++		default:
++			goto add_pass_failure;
++		}
++	}
++	if (iter < CIPSO_V4_TAG_MAXCNT)
++		doi_def->tags[iter] = CIPSO_V4_TAG_INVALID;
++
++	doi_def->doi = doi;
++	ret_val = cipso_v4_doi_add(doi_def);
++	if (ret_val != 0)
++		goto add_pass_failure;
++	return 0;
++
++add_pass_failure:
++	if (doi_def)
++		netlbl_cipsov4_doi_free(&doi_def->rcu);
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_add - Handle an ADD message
++ * @skb: the NETLINK buffer
++ * @info: the Generic NETLINK info block
++ *
++ * Description:
++ * Create a new DOI definition based on the given ADD message and add it to the
++ * CIPSO V4 engine.  Returns zero on success, negative values on failure.
++ *
++ */
++static int netlbl_cipsov4_add(struct sk_buff *skb, struct genl_info *info)
++
++{
++	int ret_val = -EINVAL;
++	u32 doi;
++	u32 map_type;
++	ssize_t msg_len = netlbl_netlink_payload_len(skb);
++	unsigned char *msg = netlbl_netlink_payload_data(skb);
++
++	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
++	if (ret_val != 0)
++		goto add_return;
++
++	if (msg_len < 2 * NETLBL_LEN_U32)
++		goto add_return;
++
++	doi = netlbl_getinc_u32(&msg, &msg_len);
++	map_type = netlbl_getinc_u32(&msg, &msg_len);
++	switch (map_type) {
++	case CIPSO_V4_MAP_STD:
++		ret_val = netlbl_cipsov4_add_std(doi, msg, msg_len);
++		break;
++	case CIPSO_V4_MAP_PASS:
++		ret_val = netlbl_cipsov4_add_pass(doi, msg, msg_len);
++		break;
++	}
++
++add_return:
++	netlbl_cipsov4_send_ack(info, -ret_val);
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_list - Handle a LIST message
++ * @skb: the NETLINK buffer
++ * @info: the Generic NETLINK info block
++ *
++ * Description:
++ * Process a user generated LIST message and respond accordingly.  Returns
++ * zero on success and negative values on error.
++ *
++ */
++static int netlbl_cipsov4_list(struct sk_buff *skb, struct genl_info *info)
++{
++	int ret_val = -EINVAL;
++	u32 doi;
++	unsigned char *msg = netlbl_netlink_payload_data(skb);
++	struct sk_buff *ans_skb;
++	unsigned char *buf_ptr;
++
++	if (netlbl_netlink_payload_len(skb) != NETLBL_LEN_U32)
++		goto list_failure;
++
++	doi = netlbl_get_u32(msg);
++	ans_skb = cipso_v4_doi_dump(doi, NLMSG_SPACE(GENL_HDRLEN));
++	if (ans_skb == NULL) {
++		ret_val = -ENOMEM;
++		goto list_failure;
++	}
++	buf_ptr = skb_push(ans_skb, NLMSG_SPACE(GENL_HDRLEN));
++	__netlbl_netlink_hdr(buf_ptr,
++			     info->snd_pid,
++			     0,
++			     0,
++			     netlbl_cipsov4_gnl_family.id,
++			     NLBL_CIPSOV4_C_LIST,
++			     ans_skb->len);
++
++	ret_val = netlbl_netlink_snd(ans_skb, info->snd_pid);
++	if (ret_val != 0)
++		goto list_failure;
++
++	return 0;
++
++list_failure:
++	netlbl_cipsov4_send_ack(info, -ret_val);
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_listall - Handle a LISTALL message
++ * @skb: the NETLINK buffer
++ * @info: the Generic NETLINK info block
++ *
++ * Description:
++ * Process a user generated LISTALL message and respond accordingly.  Returns
++ * zero on success and negative values on error.
++ *
++ */
++static int netlbl_cipsov4_listall(struct sk_buff *skb, struct genl_info *info)
++{
++	int ret_val = -EINVAL;
++	struct sk_buff *ans_skb;
++	unsigned char *buf_ptr;
++
++	ans_skb = cipso_v4_doi_dump(0, NLMSG_SPACE(GENL_HDRLEN));
++	if (ans_skb == NULL) {
++		ret_val = -ENOMEM;
++		goto list_failure;
++	}
++	buf_ptr = skb_push(ans_skb, NLMSG_SPACE(GENL_HDRLEN));
++	__netlbl_netlink_hdr(buf_ptr,
++			     info->snd_pid,
++			     0,
++			     0,
++			     netlbl_cipsov4_gnl_family.id,
++			     NLBL_CIPSOV4_C_LISTALL,
++			     ans_skb->len);
++
++	ret_val = netlbl_netlink_snd(ans_skb, info->snd_pid);
++	if (ret_val != 0)
++		goto list_failure;
++
++	return 0;
++
++list_failure:
++	netlbl_cipsov4_send_ack(info, -ret_val);
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_remove - Handle a REMOVE message
++ * @skb: the NETLINK buffer
++ * @info: the Generic NETLINK info block
++ *
++ * Description:
++ * Process a user generated REMOVE message and respond accordingly.  Returns
++ * zero on success, negative values on failure.
++ *
++ */
++static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
++{
++	int ret_val;
++	u32 doi;
++	unsigned char *msg = netlbl_netlink_payload_data(skb);
++
++	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
++	if (ret_val != 0)
++		goto remove_return;
++
++	if (netlbl_netlink_payload_len(skb) != NETLBL_LEN_U32) {
++		ret_val = -EINVAL;
++		goto remove_return;
++	}
++
++	doi = netlbl_get_u32(msg);
++	ret_val = cipso_v4_doi_remove(doi, netlbl_cipsov4_doi_free);
++
++remove_return:
++	netlbl_cipsov4_send_ack(info, -ret_val);
++	return ret_val;
++}
++
++/*
++ * NetLabel Generic NETLINK Command Definitions
++ */
++
++static struct genl_ops netlbl_cipsov4_genl_c_add = {
++	.cmd = NLBL_CIPSOV4_C_ADD,
++	.flags = 0,
++	.doit = netlbl_cipsov4_add,
++	.dumpit = NULL,
++};
++
++static struct genl_ops netlbl_cipsov4_genl_c_remove = {
++	.cmd = NLBL_CIPSOV4_C_REMOVE,
++	.flags = 0,
++	.doit = netlbl_cipsov4_remove,
++	.dumpit = NULL,
++};
++
++static struct genl_ops netlbl_cipsov4_genl_c_list = {
++	.cmd = NLBL_CIPSOV4_C_LIST,
++	.flags = 0,
++	.doit = netlbl_cipsov4_list,
++	.dumpit = NULL,
++};
++
++static struct genl_ops netlbl_cipsov4_genl_c_listall = {
++	.cmd = NLBL_CIPSOV4_C_LISTALL,
++	.flags = 0,
++	.doit = netlbl_cipsov4_listall,
++	.dumpit = NULL,
++};
++
++/*
++ * NetLabel Generic NETLINK Protocol Functions
++ */
++
++/**
++ * netlbl_cipsov4_send_ack - Send an ACK message
++ * @info: the generic NETLINK information
++ * @ret_code: return code to use
++ *
++ * Description:
++ * This function sends an ACK message to the sender of the NETLINK message
++ * specified by @req_skb.
++ *
++ */
++static void netlbl_cipsov4_send_ack(const struct genl_info *info,
++				    const u32 ret_code)
++{
++	size_t msg_size;
++	size_t data_size;
++	struct sk_buff *skb;
++	unsigned char *data;
++
++	data_size = GENL_HDRLEN + 2 * NETLBL_LEN_U32;
++	msg_size = NLMSG_SPACE(data_size);
++
++	skb = alloc_skb(msg_size, GFP_KERNEL);
++	if (skb == NULL)
++		return;
++
++	data = netlbl_netlink_hdr_put(skb,
++				      info->snd_pid,
++				      0,
++				      0,
++				      netlbl_cipsov4_gnl_family.id,
++				      NLBL_CIPSOV4_C_ACK,
++				      data_size);
++	if (data == NULL)
++		goto send_ack_failure;
++
++	netlbl_putinc_u32(&data, info->snd_seq, NULL);
++	netlbl_putinc_u32(&data, ret_code, NULL);
++
++	netlbl_netlink_snd(skb, info->snd_pid);
++	return;
++
++send_ack_failure:
++	kfree_skb(skb);
++}
++
++/**
++ * netlbl_cipsov4_genl_init - Register the CIPSOv4 NetLabel component
++ *
++ * Description:
++ * Register the CIPSOv4 packet NetLabel component with the Generic NETLINK
++ * mechanism.  Returns zero on success, negative values on failure.
++ *
++ */
++int netlbl_cipsov4_genl_init(void)
++{
++	int ret_val;
++
++	ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
++	if (ret_val != 0)
++		return ret_val;
++
++	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
++				    &netlbl_cipsov4_genl_c_add);
++	if (ret_val != 0)
++		goto genl_init_failure;
++	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
++				    &netlbl_cipsov4_genl_c_remove);
++	if (ret_val != 0)
++		goto genl_init_failure;
++	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
++				    &netlbl_cipsov4_genl_c_list);
++	if (ret_val != 0)
++		goto genl_init_failure;
++	ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
++				    &netlbl_cipsov4_genl_c_listall);
++	if (ret_val != 0)
++		goto genl_init_failure;
++
++	return 0;
++
++genl_init_failure:
++	netlbl_cipsov4_genl_exit();
++	return ret_val;
++}
++
++/**
++ * netlbl_cipsov4_genl_exit - Unregister the CIPSOv4 NetLabel component
++ *
++ * Description:
++ * Unregister the CIPSOv4 packet NetLabel component with the Generic NETLINK
++ * mechanism.  Returns zero on success, negative values on failure.
++ *
++ */
++void netlbl_cipsov4_genl_exit(void)
++{
++	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
++			    &netlbl_cipsov4_genl_c_listall);
++	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
++			    &netlbl_cipsov4_genl_c_list);
++	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
++			    &netlbl_cipsov4_genl_c_remove);
++	genl_unregister_ops(&netlbl_cipsov4_gnl_family,
++			    &netlbl_cipsov4_genl_c_add);
++
++	genl_unregister_family(&netlbl_cipsov4_gnl_family);
++	netlbl_cipsov4_gnl_family.id = GENL_ID_GENERATE;
++}
++
+Index: linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
+===================================================================
+--- /dev/null
++++ linux-2.6.17.i686-quilt/net/netlabel/netlabel_unlabeled.c
+@@ -0,0 +1,256 @@
++/*
++ * NetLabel Unlabeled Support
++ *
++ * This file defines functions for dealing with unlabeled packets for the
++ * NetLabel system.  The NetLabel system manages static and dynamic label
++ * mappings for network protocols such as CIPSO and RIPSO.
++ *
++ * Author: Paul Moore <paul.moore at hp.com>
++ *
++ */
++
++/*
++ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
++ *
++ * This program is free software;  you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
++ * the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program;  if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/rcupdate.h>
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/socket.h>
++#include <linux/string.h>
++#include <linux/skbuff.h>
++#include <net/sock.h>
++#include <net/netlink.h>
++#include <net/genetlink.h>
++
++#include <net/netlabel.h>
++#include <asm/bug.h>
++
++#include "netlabel_user.h"
++#include "netlabel_domainhash.h"
++#include "netlabel_unlabeled.h"
++
++/* Accept unlabeled packets flag */
++static atomic_t netlabel_unlabel_accept_flg = ATOMIC_INIT(0);
++
++/* NetLabel Generic NETLINK CIPSOv4 family */
++static struct genl_family netlbl_unlabel_gnl_family = {
++	.id = GENL_ID_GENERATE,
++	.hdrsize = 0,
++	.name = NETLBL_NLTYPE_UNLABELED_NAME,
++	.version = NETLBL_PROTO_VERSION,
++	.maxattr = 0,
++};
++
++
++/*
++ * Local Prototypes
++ */
++
++static void netlbl_unlabel_send_ack(const struct genl_info *info,
++				    const u32 ret_code);
++
++
++/*
++ * NetLabel Command Handlers
++ */
++
++/**
++ * netlbl_unlabel_accept - Handle an ACCEPT message
++ * @skb: the NETLINK buffer
++ * @info: the Generic NETLINK info block
++ *
++ * Description:
++ * Process a user generated ACCEPT message and set the accept flag accordingly.
++ * Returns zero on success, negative values on failure.
++ *
++ */
++static int netlbl_unlabel_accept(struct sk_buff *skb, struct genl_info *info)
++{
++	int ret_val;
++	unsigned char *msg = netlbl_netlink_payload_data(skb);
++	u32 value;
++
++	ret_val = netlbl_netlink_cap_check(skb, CAP_NET_ADMIN);
++	if (ret_val != 0)
++		return ret_val;
++
++	if (netlbl_netlink_payload_len(skb) == NETLBL_LEN_U32) {
++		value = netlbl_get_u32(msg);
++		if (value == 1 || value == 0) {
++			atomic_set(&netlabel_unlabel_accept_flg, value);
++			netlbl_unlabel_send_ack(info, NETLBL_E_OK);
++			return 0;
++		}
++	}
++
++	netlbl_unlabel_send_ack(info, EINVAL);
++	return -EINVAL;
++}
++
++
++/*
++ * NetLabel Generic NETLINK Command Definitions
++ */
++
++static struct genl_ops netlbl_unlabel_genl_c_accept = {
++	.cmd = NLBL_UNLABEL_C_ACCEPT,
++	.flags = 0,
++	.doit = netlbl_unlabel_accept,
++	.dumpit = NULL,
++};
++
++/*
++ * NetLabel Generic NETLINK Protocol Functions
++ */
++
++/**
++ * netlbl_unlabel_send_ack - Send an ACK message
++ * @info: the generic NETLINK information
++ * @ret_code: return code to use
++ *
++ * Description:
++ * This function sends an ACK message to the sender of the NETLINK message
++ * specified by @info.
++ *
++ */
++static void netlbl_unlabel_send_ack(const struct genl_info *info,
++				    const u32 ret_code)
++{
++	size_t msg_size;
++	size_t data_size;
++	struct sk_buff *skb;
++	unsigned char *data;
++
++	data_size = GENL_HDRLEN + 2 * NETLBL_LEN_U32;
++	msg_size = NLMSG_SPACE(data_size);
++
++	skb = alloc_skb(msg_size, GFP_KERNEL);
++	if (skb == NULL)
++		return;
++
++	data = netlbl_netlink_hdr_put(skb,
++				      info->snd_pid,
++				      0,
++				      0,
++				      netlbl_unlabel_gnl_family.id,
++				      NLBL_UNLABEL_C_ACK,
++				      data_size);
++	if (data == NULL)
++		goto send_ack_failure;
++
++	netlbl_putinc_u32(&data, info->snd_seq, NULL);
++	netlbl_putinc_u32(&data, ret_code, NULL);
++
++	netlbl_netlink_snd(skb, info->snd_pid);
++	return;
++
++send_ack_failure:
++	kfree_skb(skb);
++}
++
++/**
++ * netlbl_unlabel_genl_init - Register the Unlabeled NetLabel component
++ *
++ * Description:
++ * Register the unlabeled packet NetLabel component with the Generic NETLINK
++ * mechanism.  Returns zero on success, negative values on failure.
++ *
++ */
++int netlbl_unlabel_genl_init(void)
++{
++	int ret_val;
++
++	ret_val = genl_register_family(&netlbl_unlabel_gnl_family);
++	if (ret_val != 0)
++		return ret_val;
++
++	ret_val = genl_register_ops(&netlbl_unlabel_gnl_family,
++				    &netlbl_unlabel_genl_c_accept);
++	if (ret_val != 0)
++		return ret_val;
++
++	return 0;
++}
++
++/**
++ * netlbl_unlabel_genl_exit - Unregister the Unlabeled NetLabel component
++ *
++ * Description:
++ * Unregister the unlabeled packet NetLabel component with the Generic NETLINK
++ * mechanism.  Returns zero on success, negative values on failure.
++ *
++ */
++void netlbl_unlabel_genl_exit(void)
++{
++	genl_unregister_ops(&netlbl_unlabel_gnl_family,
++			    &netlbl_unlabel_genl_c_accept);
++
++	genl_unregister_family(&netlbl_unlabel_gnl_family);
++	netlbl_unlabel_gnl_family.id = GENL_ID_GENERATE;
++}
++
++/*
++ * NetLabel KAPI Hooks
++ */
++
++/**
++ * netlbl_unlabel_getattr - Get the security attributes for an unlabled packet
++ * @secattr: the security attributes
++ *
++ * Description:
++ * Determine the security attributes, if any, for an unlabled packet and return
++ * them in @secattr.  Returns zero on success and negative values on failure.
++ *
++ */
++int netlbl_unlabel_getattr(struct netlbl_lsm_secattr *secattr)
++{
++	if (atomic_read(&netlabel_unlabel_accept_flg) == 1) {
++		memset(secattr, 0, sizeof(*secattr));
++		return 0;
++	}
++
++	return -ENOMSG;
++}
++
++/**
++ * netlbl_unlabel_defconf - Set the default config to allow unlabeled packets
++ *
++ * Description:
++ * Set the default NetLabel configuration to allow incoming unlabeled packets
++ * and to send unlabeled network traffic by default.
++ *
++ */
++int netlbl_unlabel_defconf(void)
++{
++	int ret_val;
++	struct netlbl_dom_map *entry;
++
++	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
++	if (entry == NULL)
++		return -ENOMEM;
++	entry->type = NETLBL_NLTYPE_UNLABELED;
++	ret_val = netlbl_domhsh_add_default(entry);
++	if (ret_val != 0)
++		return ret_val;
++
++	atomic_set(&netlabel_unlabel_accept_flg, 1);
++
++	return 0;
++}
+
+--
+paul moore
+linux security @ hp
+

linux-2.6-net-label_7_7.patch:
 Kconfig |    2 ++
 1 files changed, 2 insertions(+)

Index: linux-2.6-net-label_7_7.patch
===================================================================
RCS file: linux-2.6-net-label_7_7.patch
diff -N linux-2.6-net-label_7_7.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-net-label_7_7.patch	8 Jul 2006 18:07:25 -0000	1.1.2.3
@@ -0,0 +1,63 @@
+From paul.moore at hp.com Thu Jul  6 17:34:13 2006
+Return-Path: <paul.moore at hp.com>
+Received: from mail.boston.redhat.com ([unix socket])
+	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 06 Jul 2006 17:59:01 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k66Lx0el017567
+	for <sgrubb at boston.redhat.com>; Thu, 6 Jul 2006 17:59:00 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k66LwxPm006941;
+	Thu, 6 Jul 2006 17:58:59 -0400
+Received: from atlrel8.hp.com (atlrel8.hp.com [156.153.255.206])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k66Lwrxm019725;
+	Thu, 6 Jul 2006 17:58:53 -0400
+Received: from smtp2.fc.hp.com (smtp.fc.hp.com [15.11.136.114])
+	by atlrel8.hp.com (Postfix) with ESMTP id A41BC35E98;
+	Thu,  6 Jul 2006 17:58:48 -0400 (EDT)
+Received: from flek.zko.hp.com (flek.zko.hp.com [16.116.96.193])
+	by smtp2.fc.hp.com (Postfix) with ESMTP id 58DB13473B;
+	Thu,  6 Jul 2006 21:58:48 +0000 (UTC)
+Received: from flek.zko.hp.com (localhost.localdomain [127.0.0.1])
+	by flek.zko.hp.com (8.13.6/8.13.6) with ESMTP id k66LwlKi029150;
+	Thu, 6 Jul 2006 17:58:47 -0400
+Received: (from pmoore at localhost)
+	by flek.zko.hp.com (8.13.6/8.13.6/Submit) id k66Lwlkm029149;
+	Thu, 6 Jul 2006 17:58:47 -0400
+Message-Id: <20060706215847.581673000 at hp.com>
+References: <20060706213406.434205000 at hp.com>
+User-Agent: quilt/0.45-1
+Date: Thu, 06 Jul 2006 17:34:13 -0400
+From: paul.moore at hp.com
+To: redhat-lspp at redhat.com
+Cc: sgrubb at redhat.com
+Subject: [RFC 7/7] NetLabel: tie NetLabel into the Kconfig system
+Content-Disposition: inline; filename=netlabel-net_kconfig-2.6.17
+X-RedHat-Spam-Score: -99.822 
+Content-Type: 
+X-UID: 73480
+X-Length: 2335
+
+Modify the net/Kconfig file to enable selecting the NetLabel Kconfig options.
+---
+ net/Kconfig |    2 ++
+ 1 files changed, 2 insertions(+)
+
+Index: linux-2.6.17.i686-quilt/net/Kconfig
+===================================================================
+--- linux-2.6.17.i686-quilt.orig/net/Kconfig
++++ linux-2.6.17.i686-quilt/net/Kconfig
+@@ -228,6 +228,8 @@ source "net/tux/Kconfig"
+ config WIRELESS_EXT
+ 	bool
+ 
++source "net/netlabel/Kconfig"
++
+ endif   # if NET
+ endmenu # Networking
+ 
+
+--
+paul moore
+linux security @ hp
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2293.2.7
retrieving revision 1.2293.2.8
diff -u -r1.2293.2.7 -r1.2293.2.8
--- kernel-2.6.spec	8 Jul 2006 12:13:27 -0000	1.2293.2.7
+++ kernel-2.6.spec	8 Jul 2006 18:07:22 -0000	1.2293.2.8
@@ -28,7 +28,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define tag FC6.lspp.43
+%define tag FC6.lspp.44
 %if %{rhelbuild}
 %define tag EL
 %endif
@@ -461,14 +461,14 @@
 Patch20100: linux-2.6-audit-git.patch
 Patch20101: linux-2.6-audit-pending.patch
 Patch20102: netlink-eff_cap-lsm-framework.patch
-Patch20110: linux-2.6-net-label_1_8.patch
-Patch20111: linux-2.6-net-label_2_8.patch
-Patch20112: linux-2.6-net-label_3_8.patch
-Patch20113: linux-2.6-net-label_4_8.patch
-Patch20114: linux-2.6-net-label_5_8.patch
-Patch20115: linux-2.6-net-label_6_8.patch
-Patch20116: linux-2.6-net-label_7_8.patch
-Patch20117: linux-2.6-net-label_8_8.patch
+Patch20103: linux-2.6-audit-syscall-classes.patch
+Patch20110: linux-2.6-net-label_1_7.patch
+Patch20111: linux-2.6-net-label_2_7.patch
+Patch20112: linux-2.6-net-label_3_7.patch
+Patch20113: linux-2.6-net-label_4_7.patch
+Patch20114: linux-2.6-net-label_5_7.patch
+Patch20115: linux-2.6-net-label_6_7.patch
+Patch20116: linux-2.6-net-label_7_7.patch
 Patch20120: linux-2.6-audit-rename.patch
 Patch20121: linux-2.6-audit-by-object.patch
 Patch20122: ipsec-lspp-41.patch
@@ -1115,6 +1115,7 @@
 # Audit patches
 %patch20100 -p1
 %patch20101 -p1
+%patch20103 -p1
 # netlink fix
 %patch20102 -p1
 # netlabel
@@ -1125,7 +1126,6 @@
 %patch20114 -p1
 %patch20115 -p1
 %patch20116 -p1
-%patch20117 -p1
 # audit by obj
 %patch20120 -p1
 %patch20121 -p1
@@ -1741,6 +1741,10 @@
 
 %changelog
 * Sat Jul  8 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp 44, add audit syscall patch from Al
+- Switch to the new netlabel patch from Paul
+
+* Sat Jul  8 2006 Steve Grubb <sgrubb at redhat.com>
 - lspp 43, add autolabel & bugfix patches from Venkat
 
 * Thu Jul  6 2006 Steve Grubb <sgrubb at redhat.com>


--- linux-2.6-net-label_1_8.patch DELETED ---


--- linux-2.6-net-label_2_8.patch DELETED ---


--- linux-2.6-net-label_3_8.patch DELETED ---


--- linux-2.6-net-label_4_8.patch DELETED ---


--- linux-2.6-net-label_5_8.patch DELETED ---


--- linux-2.6-net-label_6_8.patch DELETED ---


--- linux-2.6-net-label_7_8.patch DELETED ---


--- linux-2.6-net-label_8_8.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul  8 19:19:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 15:19:03 -0400
Subject: rpms/libpfm/devel libpfm.spec,1.15,1.16
Message-ID: <200607081919.k68JJ3xq007568@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7328

Modified Files:
	libpfm.spec 
Log Message:
- Avoid pulling in the example ELF executable into /usr/share. (#198001)
- Mark man pages as documentation.




Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libpfm.spec	27 Jun 2006 16:34:03 -0000	1.15
+++ libpfm.spec	8 Jul 2006 19:19:00 -0000	1.16
@@ -1,5 +1,5 @@
 %define DATE 060621
-%define libpfm_release 7
+%define libpfm_release 8
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
@@ -63,12 +63,15 @@
 %files devel
 %defattr(-,root,root)
 %doc README
-%doc examples/*
+%doc %{_mandir}/man3/*
 %{_prefix}/lib/libpfm.a
 %{_prefix}/include/*
-%{_mandir}/man3/*
 
 %changelog
+* Sat Jul 8 2006 Will Cohen <wcohen at redhat.com>
+- Avoid pulling in the example ELF executable into /usr/share. (#198001)
+- Mark man pages as documentation.
+
 * Tue Jun 27 2006 Will Cohen <wcohen at redhat.com>
 - Add ncurses requires.
 - Add ncurses-devel buildprereq.



From fedora-cvs-commits at redhat.com  Sun Jul  9 00:06:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 20:06:13 -0400
Subject: rpms/hwdata/devel hwdata.spec,1.67,1.68
Message-ID: <200607090006.k6906DCa030823@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30792

Modified Files:
	hwdata.spec 
Log Message:
* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> - 0.181-1
- Updated videodrivers to mention i945
- New monitors: Sony CPD-G420 (#145902), Compaq P1110 (#155120).



Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- hwdata.spec	23 Jun 2006 01:04:15 -0000	1.67
+++ hwdata.spec	9 Jul 2006 00:06:10 -0000	1.68
@@ -1,7 +1,7 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.180
-Release: 2
+Version: 0.181
+Release: 1
 License: GPL/MIT
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.gz
@@ -33,6 +33,10 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> - 0.181-1
+- Updated videodrivers to mention i945
+- New monitors: Sony CPD-G420 (#145902), Compaq P1110 (#155120).
+
 * Thu Jun 22 2006 Adam Jackson <ajackson at redhat.com> - 0.180-2
 - Bump.
 



From fedora-cvs-commits at redhat.com  Sun Jul  9 00:08:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 20:08:41 -0400
Subject: rpms/hwdata/devel .cvsignore,1.66,1.67 sources,1.69,1.70
Message-ID: <200607090008.k6908f6w031402@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31364/devel

Modified Files:
	.cvsignore sources 
Log Message:
auto-import hwdata-0.181-1 on branch devel from hwdata-0.181-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	23 Jun 2006 01:04:15 -0000	1.66
+++ .cvsignore	9 Jul 2006 00:08:39 -0000	1.67
@@ -1 +1 @@
-hwdata-0.180.tar.gz
+hwdata-0.181.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	23 Jun 2006 01:04:16 -0000	1.69
+++ sources	9 Jul 2006 00:08:39 -0000	1.70
@@ -1 +1 @@
-0e02b7d5d80f14f4994e8209c561535e  hwdata-0.180.tar.gz
+ec92b67296ee3c2b8e72509b6c61d6d5  hwdata-0.181.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jul  9 00:29:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 8 Jul 2006 20:29:58 -0400
Subject: rpms/kbd/devel kbd-1.12-sparc.patch, NONE, 1.1 kbd.spec, 1.32,
	1.33 kbd-1.08-sparc.patch, 1.1, NONE
Message-ID: <200607090029.k690TwmL021797@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21663

Modified Files:
	kbd.spec 
Added Files:
	kbd-1.12-sparc.patch 
Removed Files:
	kbd-1.08-sparc.patch 
Log Message:
* Sun Jul  9 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-16
- Don't include <asm/kbdio.h> on SPARC (#198040, patch by Dennis Gilmore
  <dennis at ausil.us>)


kbd-1.12-sparc.patch:
 kbd-1.08/man/man8/kbdrate.8 |    4 +++-
 kbd-1.12/src/kbdrate.c      |   16 ++++++++++++----
 src/setleds.c               |    4 ----
 3 files changed, 15 insertions(+), 9 deletions(-)

--- NEW FILE kbd-1.12-sparc.patch ---
--- kbd-1.08/man/man8/kbdrate.8	2002-10-11 07:08:58.000000000 -0400
+++ kbd-1.08/man/man8/kbdrate.8	2002-11-22 17:28:15.000000000 -0500
@@ -22,7 +22,7 @@
 without any options will reset the repeat rate to 10.9 characters per second (cps)
 and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
 These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
-to 5 cps and the delay to 200 ms.
+to 20 cps and the delay to 200 ms.
 
 .SH OPTIONS
 .TP
@@ -69,3 +69,5 @@
 .I /etc/rc.local
 .br
 .I /dev/port
+.br
+.I /dev/kbd
diff -u kbd-1.08/src/kbdrate.c kbd-1.12/src/kbdrate.c
--- kbd-1.08/src/kbdrate.c	2002-11-22 17:34:48.000000000 -0500
+++ kbd-1.12/src/kbdrate.c	2006-07-08 05:16:33.000000000 -0500
@@ -77,7 +77,6 @@
 
 #ifdef __sparc__
 #include <asm/param.h>
-#include <asm/kbio.h>
 #endif
 
 #ifndef KDKBDREP
@@ -104,8 +103,11 @@
 
 static int
 KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
+#if defined(KDKBDREP) && !defined(__sparc__)
 	/* This ioctl is defined in <linux/kd.h> but is not
-	   implemented anywhere - must be in some m68k patches. */
+	   implemented anywhere - must be in some m68k patches.
+	   We cannot blindly try unimplemented ioctls on sparc64 -
+	   the 32<->64bit transition layer does not like it. */
 	struct kbd_repeat kbdrep_s;
 
 	/* don't change, just test */
@@ -150,6 +152,9 @@
 			rate, kbdrep_s.delay );
 
 	return 1;			/* success! */
+#else /* no KDKBDREP or __sparc__ */
+	return 0;
+#endif /* KDKBDREP */
 }
 
 static int
@@ -188,7 +193,7 @@
 int
 main( int argc, char **argv ) {
 #ifdef __sparc__
-	double      rate = 5.0;      /* Default rate */
+	double      rate = 20.0;      /* Default rate */
 	int         delay = 200;     /* Default delay */
 #else
 	double      rate = 10.9;     /* Default rate */
@@ -238,8 +243,9 @@
 		return 0;
 
 
-	/* The ioport way */
+	/* The ioport way - will crash on sparc */
 
+#ifndef __sparc__
 	for (i = 0; i < RATE_COUNT; i++)
 		if (rate * 10 >= valid_rates[i]) {
 			value &= 0x60;
@@ -286,4 +292,6 @@
 			valid_delays[ (value & 0x60) >> 5 ] );
 
+#endif
+
 	return 0;
 }
--- kbd-1.12-orig/src/setleds.c	2006-07-08 05:10:08.000000000 -0500
+++ kbd-1.12/src/setleds.c	2006-07-08 05:10:36.000000000 -0500
@@ -14,10 +14,6 @@
 #include "nls.h"
 #include "version.h"
 
-#ifdef __sparc__
-#include <asm/kbio.h>
-#endif
-
 static void
 usage(void)
 {


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kbd.spec	29 May 2006 02:35:22 -0000	1.32
+++ kbd.spec	9 Jul 2006 00:29:56 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -12,7 +12,7 @@
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
 BuildRequires: bison, flex, gettext
 BuildRoot: %{_tmppath}/%{name}-root
-Patch0: kbd-1.08-sparc.patch
+Patch0: kbd-1.12-sparc.patch
 Patch1: kbd-1.08-compose.patch
 Patch2: kbd-1.08-terminal.patch
 Patch3: kbd-1.08-rukbd.patch
@@ -124,6 +124,10 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sun Jul  9 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-16
+- Don't include <asm/kbdio.h> on SPARC (#198040, patch by Dennis Gilmore
+  <dennis at ausil.us>)
+
 * Mon May 29 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-15
 - Fix missing BuildRequires (#193406)
 


--- kbd-1.08-sparc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul  9 09:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 05:51:35 -0400
Subject: rpms/selinux-policy/devel .cvsignore, 1.74,
	1.75 booleans-targeted.conf, 1.12, 1.13 policy-20060608.patch,
	1.16, 1.17 selinux-policy.spec, 1.219, 1.220 sources, 1.78, 1.79
Message-ID: <200607090951.k699pZWR004501@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore booleans-targeted.conf policy-20060608.patch 
	selinux-policy.spec sources 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1
- Update to upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	22 Jun 2006 19:16:49 -0000	1.74
+++ .cvsignore	9 Jul 2006 09:51:33 -0000	1.75
@@ -75,3 +75,4 @@
 serefpolicy-2.2.48.tgz
 serefpolicy-2.2.49.tgz
 serefpolicy-2.3.1.tgz
+serefpolicy-2.3.2.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- booleans-targeted.conf	13 Jun 2006 18:26:00 -0000	1.12
+++ booleans-targeted.conf	9 Jul 2006 09:51:33 -0000	1.13
@@ -190,10 +190,6 @@
 # 
 read_untrusted_content = false
 
-# Allow user spamassassin clients to use the network.
-# 
-spamassassin_can_network = false
-
 # Allow spamd to write to users homedirs
 # 
 spamd_enable_home_dirs = true

policy-20060608.patch:
 global_tunables               |    7 +
 modules/admin/consoletype.te  |    7 +
 modules/kernel/files.fc       |    1 
 modules/kernel/kernel.if      |   38 +++++++
 modules/services/automount.te |    1 
 modules/services/bluetooth.if |   23 ++++
 modules/services/bluetooth.te |    2 
 modules/services/cyrus.te     |    1 
 modules/services/hal.fc       |    1 
 modules/services/hal.te       |    5 +
 modules/services/pegasus.if   |   31 ++++++
 modules/services/pegasus.te   |    5 -
 modules/services/squid.te     |    2 
 modules/services/tftp.te      |    1 
 modules/services/xserver.if   |   22 ++++
 modules/system/hostname.te    |    5 -
 modules/system/init.if        |    7 -
 modules/system/selinuxutil.te |    2 
 modules/system/userdomain.if  |  201 ++++++++++++++++++++++++++----------------
 modules/system/userdomain.te  |   32 ++----
 20 files changed, 286 insertions(+), 108 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policy-20060608.patch	22 Jun 2006 19:16:49 -0000	1.16
+++ policy-20060608.patch	9 Jul 2006 09:51:33 -0000	1.17
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.49/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.49/policy/global_tunables	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/global_tunables	2006-07-07 07:37:00.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.49/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/admin/consoletype.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-07 07:37:00.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -32,10 +32,21 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.49/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/kernel/kernel.if	2006-06-22 15:13:37.000000000 -0400
-@@ -2096,3 +2096,41 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-07 07:37:00.000000000 -0400
+@@ -11,6 +11,7 @@
+ ifdef(`distro_redhat',`
+ /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /\.autorelabel		--	gen_context(system_u:object_r:etc_runtime_t,s0)
++/\.suspended		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-07 07:37:00.000000000 -0400
+@@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
  ')
@@ -77,9 +88,107 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.49/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-07 07:37:00.000000000 -0400
+@@ -40,6 +40,7 @@
+ allow automount_t automount_etc_t:file { getattr read };
+ # because config files can be shell scripts
+ can_exec(automount_t, automount_etc_t)
++can_exec(automount_t, automount_exec_t)
+ 
+ allow automount_t automount_lock_t:file create_file_perms;
+ files_lock_filetrans(automount_t,automount_lock_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-07 07:37:00.000000000 -0400
+@@ -111,3 +111,26 @@
+ 	dontaudit $1 bluetooth_helper_t:dir search;
+ 	dontaudit $1 bluetooth_helper_t:file { read getattr };
+ ')
++
++########################################
++## <summary>
++##	Execute bluetooth_exec_t in the bluetooth domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`bluetooth_domtrans',`
++	gen_require(`
++		type bluetooth_t, bluetooth_exec_t;
++	') 
++	domain_auto_trans($1,bluetooth_exec_t,bluetooth_t)
++
++	allow $1 bluetooth_t:fd use;
++	allow bluetooth_t $1:fd use;
++	allow bluetooth_t $1:fifo_file rw_file_perms;
++	allow bluetooth_t $1:process sigchld;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-07 07:37:00.000000000 -0400
+@@ -173,6 +173,7 @@
+ allow bluetooth_helper_t self:shm create_shm_perms;
+ allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow bluetooth_helper_t self:tcp_socket create_socket_perms;
++allow bluetooth_helper_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow bluetooth_helper_t bluetooth_t:socket { read write };
+ 
+@@ -227,6 +228,7 @@
+ 		xserver_rw_xdm_pipes(bluetooth_helper_t)
+ 		# when started via startx 
+ 		xserver_stream_connect_xdm_xserver(bluetooth_helper_t)
++	        corenet_tcp_connect_xserver_port(bluetooth_helper_t)
+ 	')
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-08 15:28:24.000000000 -0400
+@@ -41,6 +41,7 @@
+ allow cyrus_t self:unix_stream_socket connectto;
+ allow cyrus_t self:tcp_socket create_stream_socket_perms;
+ allow cyrus_t self:udp_socket create_socket_perms;
++allow cyrus_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
+ allow cyrus_t cyrus_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
+--- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-07 07:37:00.000000000 -0400
+@@ -1,4 +1,3 @@
+-
+ /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
+ /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-07 07:37:00.000000000 -0400
+@@ -163,6 +163,10 @@
+ ')
+ 
+ optional_policy(`
++	bluetooth_domtrans(hald_t)
++')
++
++optional_policy(`
+ 	clock_domtrans(hald_t)
+ ')
+ 
+@@ -238,3 +242,4 @@
+ optional_policy(`
+ 	vbetool_domtrans(hald_t)
+ ')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/services/pegasus.if	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-07 07:37:00.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -113,9 +222,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.49/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/services/pegasus.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-07 07:37:00.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -132,9 +241,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.2.49/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/services/squid.te	2006-06-22 15:13:37.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-07 07:37:00.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -146,9 +255,9 @@
  corenet_tcp_connect_ftp_port(squid_t)
  corenet_tcp_connect_gopher_port(squid_t)
  corenet_tcp_connect_http_port(squid_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.2.49/policy/modules/services/tftp.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/services/tftp.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-07 07:37:00.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -157,9 +266,48 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.49/policy/modules/system/hostname.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-07 07:37:00.000000000 -0400
+@@ -317,7 +317,6 @@
+ 	')
+ 
+ 	ifdef(`TODO',`
+-	allow $1_t xdm_xserver_tmp_t:dir r_dir_perms;
+ 	allow $1_t xdm_xserver_t:unix_stream_socket connectto;
+ 
+ 	ifdef(`xdm.te', `
+@@ -1126,6 +1125,27 @@
+ 	')
+ 
+ 	files_search_tmp($1)
++	xserver_search_xdm_xserver_tmp_dir($1)
+ 	allow $1 xdm_xserver_tmp_t:sock_file write;
+ 	allow $1 xdm_xserver_t:unix_stream_socket connectto;
+ ')
++
++
++########################################
++## <summary>
++##	search xdm temporary directory
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_search_xdm_xserver_tmp_dir',`
++	gen_require(`
++		type xdm_xserver_tmp_t;
++	')
++
++	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.49/policy/modules/system/hostname.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-07 07:37:00.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -172,9 +320,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.2.49/policy/modules/system/init.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/system/init.if	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-07 07:37:00.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -189,9 +337,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.49/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/system/selinuxutil.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-07 07:37:00.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -201,9 +349,9 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.49/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/system/userdomain.if	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-07 07:37:00.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -508,7 +656,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4789,34 @@
+@@ -4789,3 +4811,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -543,9 +691,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.49/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.2.49/policy/modules/system/userdomain.te	2006-06-22 15:13:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-07 07:37:00.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- selinux-policy.spec	22 Jun 2006 19:16:49 -0000	1.219
+++ selinux-policy.spec	9 Jul 2006 09:51:33 -0000	1.220
@@ -15,7 +15,7 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.1
+Version: 2.3.2
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -107,8 +107,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 \
+%verify(not mtime) %{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
+%verify(not mtime) %{_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/ \
@@ -342,6 +342,9 @@
 %endif
 
 %changelog
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1
+- Update to upstream
+
 * Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.1-1
 - Update to upstream
 - Add new class for kernel key ring


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- sources	22 Jun 2006 19:16:49 -0000	1.78
+++ sources	9 Jul 2006 09:51:33 -0000	1.79
@@ -1 +1 @@
-ea51e2652a0d30a9a043cca14c4523fe  serefpolicy-2.3.1.tgz
+de57afb1e83b5110b90f2aaeeca0c535  serefpolicy-2.3.2.tgz



From fedora-cvs-commits at redhat.com  Sun Jul  9 10:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 06:46:59 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.57,
	1.58 booleans-targeted.conf, 1.9, 1.10 policy-20060608.patch,
	1.2, 1.3 selinux-policy.spec, 1.175, 1.176 sources, 1.61, 1.62
Message-ID: <200607091046.k69Akx8E016630@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	.cvsignore booleans-targeted.conf policy-20060608.patch 
	selinux-policy.spec sources 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1.fc5
- Bump for FC-5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	15 Jun 2006 14:12:52 -0000	1.57
+++ .cvsignore	9 Jul 2006 10:46:56 -0000	1.58
@@ -69,3 +69,4 @@
 serefpolicy-2.2.42.tgz
 serefpolicy-2.2.43.tgz
 serefpolicy-2.2.47.tgz
+serefpolicy-2.3.2.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/booleans-targeted.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- booleans-targeted.conf	15 Jun 2006 14:12:52 -0000	1.9
+++ booleans-targeted.conf	9 Jul 2006 10:46:56 -0000	1.10
@@ -10,6 +10,14 @@
 # 
 allow_execstack = true
 
+# Allow ftpd to read cifs directories.
+# 
+allow_ftpd_use_cifs = false
+
+# Allow ftpd to read nfs directories.
+# 
+allow_ftpd_use_nfs = false
+
 # Allow ftp servers to modify public filesused for public file transfer services.
 # 
 allow_ftpd_anon_write = false

policy-20060608.patch:
 global_tunables               |    7 +
 modules/admin/consoletype.te  |    7 +
 modules/kernel/files.fc       |    1 
 modules/kernel/kernel.if      |   38 +++++++
 modules/services/automount.te |    1 
 modules/services/bluetooth.if |   23 ++++
 modules/services/bluetooth.te |    2 
 modules/services/cyrus.te     |    1 
 modules/services/hal.fc       |    1 
 modules/services/hal.te       |    5 +
 modules/services/pegasus.if   |   31 ++++++
 modules/services/pegasus.te   |    5 -
 modules/services/squid.te     |    2 
 modules/services/tftp.te      |    1 
 modules/services/xserver.if   |   22 ++++
 modules/system/hostname.te    |    5 -
 modules/system/init.if        |    7 -
 modules/system/selinuxutil.te |    2 
 modules/system/userdomain.if  |  201 ++++++++++++++++++++++++++----------------
 modules/system/userdomain.te  |   32 ++----
 20 files changed, 286 insertions(+), 108 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060608.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060608.patch	16 Jun 2006 03:11:03 -0000	1.2
+++ policy-20060608.patch	9 Jul 2006 10:46:56 -0000	1.3
@@ -1,27 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/example.if serefpolicy-2.2.47/doc/example.if
---- nsaserefpolicy/doc/example.if	2006-02-01 10:22:19.000000000 -0500
-+++ serefpolicy-2.2.47/doc/example.if	2006-06-15 21:54:22.000000000 -0400
-@@ -25,7 +25,7 @@
- ## </param>
- #
- interface(`myapp_domtrans',`
--	gen_requires(`
-+	gen_require(`
- 		type myapp_t, myapp_exec_t;
- 	')
- 
-@@ -46,7 +46,7 @@
- ## </param>
- #
- interface(`myapp_read_log',`
--	gen_requires(`
-+	gen_require(`
- 		type myapp_log_t;
- 	')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.47/policy/global_tunables
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/global_tunables	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/global_tunables	2006-07-07 07:37:00.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -36,21 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.47/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/bootloader.te	2006-06-15 21:54:22.000000000 -0400
-@@ -49,7 +49,7 @@
- #
- 
- allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
--allow bootloader_t self:process { sigkill sigstop signull signal };
-+allow bootloader_t self:process { sigkill sigstop signull signal execmem };
- allow bootloader_t self:fifo_file rw_file_perms;
- 
- allow bootloader_t bootloader_etc_t:file r_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.2.47/policy/modules/admin/consoletype.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/consoletype.te	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-07 07:37:00.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -65,81 +32,21 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.47/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2006-06-06 22:21:51.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/netutils.te	2006-06-15 21:54:22.000000000 -0400
-@@ -54,6 +54,7 @@
- corenet_udp_sendrecv_all_ports(netutils_t)
- corenet_tcp_connect_all_ports(netutils_t)
- corenet_sendrecv_all_client_packets(netutils_t)
-+corenet_udp_bind_generic_node(netutils_t)
- 
- fs_getattr_xattr_fs(netutils_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.47/policy/modules/admin/prelink.fc
---- nsaserefpolicy/policy/modules/admin/prelink.fc	2006-06-13 07:03:39.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/admin/prelink.fc	2006-06-15 21:54:22.000000000 -0400
-@@ -3,6 +3,5 @@
- 
- /usr/sbin/prelink(\.bin)?	--	gen_context(system_u:object_r:prelink_exec_t,s0)
- 
--/var/lib/misc/prelink\..*	--	gen_context(system_u:object_r:prelink_cache_t,s0)
--
- /var/log/prelink\.log		--	gen_context(system_u:object_r:prelink_log_t,s0)
-+/var/log/prelink(/.*)?			gen_context(system_u:object_r:prelink_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.47/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-06-08 23:00:29.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/files.if	2006-06-15 21:54:22.000000000 -0400
-@@ -1931,6 +1931,21 @@
- ')
- 
- ########################################
-+#
-+# files_unlink_boot_flag(domain)
-+#
-+# /halt, /.autofsck, etc
-+#
-+interface(`files_unlink_boot_flag',`
-+	gen_require(`
-+		type root_t;
-+	')
-+
-+	allow $1 root_t:file unlink;
-+')
-+
-+
-+########################################
- ## <summary>
- ##	Read files in /etc that are dynamically
- ##	created on boot, such as mtab.
-@@ -4379,3 +4394,23 @@
- 
- 	typeattribute $1 files_unconfined_type;
- ')
-+
-+########################################
-+## <summary>
-+##	Mount a filesystem on all files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`files_mounton_all_files',`
-+	gen_require(`
-+		attribute file_type, security_file_type;
-+	')
-+
-+	allow $1 { file_type -security_file_type }:dir mounton;
-+	allow $1 { file_type -security_file_type }:file mounton;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.47/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/kernel/kernel.if	2006-06-15 21:54:22.000000000 -0400
-@@ -2096,3 +2096,41 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-07 07:37:00.000000000 -0400
+@@ -11,6 +11,7 @@
+ ifdef(`distro_redhat',`
+ /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /\.autorelabel		--	gen_context(system_u:object_r:etc_runtime_t,s0)
++/\.suspended		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+ /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-07 07:37:00.000000000 -0400
+@@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
  ')
@@ -181,158 +88,107 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.47/policy/modules/services/apache.fc
---- nsaserefpolicy/policy/modules/services/apache.fc	2006-05-02 18:59:59.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.fc	2006-06-15 22:21:54.000000000 -0400
-@@ -78,3 +78,4 @@
- /var/www/icons(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/www/perl(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
- /usr/share/selinux-policy([^/]*)?/html(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
-+/usr/sbin/rotatelogs		--	gen_context(system_u:object_r:httpd_rotatelogs_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.47/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.if	2006-06-15 22:21:14.000000000 -0400
-@@ -955,3 +955,27 @@
- 	allow $2 httpd_$1_content_t:file r_file_perms;
- 	allow $2 httpd_$1_content_t:lnk_file { getattr read };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-07 07:37:00.000000000 -0400
+@@ -40,6 +40,7 @@
+ allow automount_t automount_etc_t:file { getattr read };
+ # because config files can be shell scripts
+ can_exec(automount_t, automount_etc_t)
++can_exec(automount_t, automount_exec_t)
+ 
+ allow automount_t automount_lock_t:file create_file_perms;
+ files_lock_filetrans(automount_t,automount_lock_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-07 07:37:00.000000000 -0400
+@@ -111,3 +111,26 @@
+ 	dontaudit $1 bluetooth_helper_t:dir search;
+ 	dontaudit $1 bluetooth_helper_t:file { read getattr };
  ')
 +
-+
 +########################################
 +## <summary>
-+##	Execute a domain transition to run httpd_rotatelogs.
++##	Execute bluetooth_exec_t in the bluetooth domain.
 +## </summary>
 +## <param name="domain">
-+## <summary>
-+##	Domain allowed to transition.
-+## </summary>
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
 +## </param>
 +#
-+interface(`apache_domtrans_rotatelogs',`
++interface(`bluetooth_domtrans',`
 +	gen_require(`
-+		type httpd_rotatelogs_t, httpd_rotatelogs_exec_t;
-+	')
-+
-+	domain_auto_trans($1,httpd_rotatelogs_exec_t,httpd_rotatelogs_t)
-+
-+	allow $1 httpd_rotatelogs_t:fd use;
-+	allow httpd_rotatelogs_t $1:fd use;
-+	allow httpd_rotatelogs_t $1:fifo_file rw_file_perms;
-+	allow httpd_rotatelogs_t $1:process sigchld;
++		type bluetooth_t, bluetooth_exec_t;
++	') 
++	domain_auto_trans($1,bluetooth_exec_t,bluetooth_t)
++
++	allow $1 bluetooth_t:fd use;
++	allow bluetooth_t $1:fd use;
++	allow bluetooth_t $1:fifo_file rw_file_perms;
++	allow bluetooth_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.47/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/apache.te	2006-06-15 22:23:20.000000000 -0400
-@@ -109,13 +109,10 @@
- type squirrelmail_spool_t;
- files_tmp_file(squirrelmail_spool_t)
- 
--# mod_jk2 creates /var/log/httpd/jk2.shm to communicate with tomcat
--# This is a bug but it still exists in FC2
--# cjp: probably can remove this
--ifdef(`distro_redhat',`
--	typealias httpd_log_t alias httpd_runtime_t;
--	dontaudit httpd_t httpd_runtime_t:file ioctl;
--')
-+type httpd_rotatelogs_t;
-+type httpd_rotatelogs_exec_t;
-+domain_type(httpd_rotatelogs_t)
-+init_daemon_domain(httpd_rotatelogs_t, httpd_rotatelogs_exec_t)
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-07 07:37:00.000000000 -0400
+@@ -173,6 +173,7 @@
+ allow bluetooth_helper_t self:shm create_shm_perms;
+ allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow bluetooth_helper_t self:tcp_socket create_socket_perms;
++allow bluetooth_helper_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow bluetooth_helper_t bluetooth_t:socket { read write };
+ 
+@@ -227,6 +228,7 @@
+ 		xserver_rw_xdm_pipes(bluetooth_helper_t)
+ 		# when started via startx 
+ 		xserver_stream_connect_xdm_xserver(bluetooth_helper_t)
++	        corenet_tcp_connect_xserver_port(bluetooth_helper_t)
+ 	')
+ ')
  
- ifdef(`targeted_policy',`
- 	typealias httpd_sys_content_t alias httpd_user_content_t;
-@@ -293,6 +290,15 @@
- 	miscfiles_manage_public_files(httpd_t)
- ') 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-08 15:28:24.000000000 -0400
+@@ -41,6 +41,7 @@
+ allow cyrus_t self:unix_stream_socket connectto;
+ allow cyrus_t self:tcp_socket create_stream_socket_perms;
+ allow cyrus_t self:udp_socket create_socket_perms;
++allow cyrus_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
+ allow cyrus_t cyrus_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
+--- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-07 07:37:00.000000000 -0400
+@@ -1,4 +1,3 @@
+-
+ /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
+ /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
  
-+ifdef(`TODO', `
-+#
-+# We need optionals to be able to be within booleans to make this work
-+#
-+tunable_policy(`allow_httpd_mod_auth_pam',`
-+	auth_domtrans_chk_passwd(httpd_t)
-+')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-07 07:37:00.000000000 -0400
+@@ -163,6 +163,10 @@
+ ')
+ 
+ optional_policy(`
++	bluetooth_domtrans(hald_t)
 +')
 +
- tunable_policy(`httpd_can_network_connect',`
- 	corenet_tcp_connect_all_ports(httpd_t)
++optional_policy(`
+ 	clock_domtrans(hald_t)
  ')
-@@ -692,3 +698,28 @@
+ 
+@@ -238,3 +242,4 @@
  optional_policy(`
- 	nscd_socket_use(httpd_unconfined_script_t)
+ 	vbetool_domtrans(hald_t)
  ')
 +
-+########################################
-+#
-+# httpd_rotatelogs local policy
-+#
-+# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.
-+
-+# Some common macros (you might be able to remove some)
-+files_read_etc_files(httpd_rotatelogs_t)
-+libs_use_ld_so(httpd_rotatelogs_t)
-+libs_use_shared_libs(httpd_rotatelogs_t)
-+miscfiles_read_localization(httpd_rotatelogs_t)
-+kernel_read_kernel_sysctls(httpd_rotatelogs_t)
-+kernel_dontaudit_list_proc(httpd_rotatelogs_t)
-+kernel_dontaudit_read_proc_symlinks(httpd_rotatelogs_t)
-+term_dontaudit_use_generic_ptys(httpd_rotatelogs_t)
-+
-+allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms;
-+allow httpd_rotatelogs_t httpd_log_t:file create_file_perms;
-+
-+#
-+# Should we add a boolean?
-+#
-+apache_domtrans_rotatelogs(httpd_sys_script_t)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.47/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-06-13 07:03:42.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/automount.te	2006-06-15 21:54:22.000000000 -0400
-@@ -28,7 +28,7 @@
- # Local policy
- #
- 
--allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override };
-+allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override sys_admin };
- dontaudit automount_t self:capability sys_tty_config;
- allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit };
- allow automount_t self:fifo_file rw_file_perms;
-@@ -64,9 +64,20 @@
- kernel_read_system_state(automount_t)
- kernel_read_network_state(automount_t)
- kernel_list_proc(automount_t)
-+kernel_dontaudit_search_xen_state(automount_t)
- 
- files_search_boot(automount_t)
- 
-+#
-+# Automount is slowly adding all mount functionality internally
-+#
-+files_search_all(automount_t)
-+files_mounton_all_mountpoints(automount_t)
-+files_mount_all_file_type_fs(automount_t)
-+files_unmount_all_file_type_fs(automount_t)
-+fs_mount_all_fs(automount_t)
-+fs_unmount_all_fs(automount_t)
-+
- corecmd_exec_sbin(automount_t)
- corecmd_exec_bin(automount_t)
- corecmd_exec_shell(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.2.47/policy/modules/services/ntp.te
---- nsaserefpolicy/policy/modules/services/ntp.te	2006-06-13 07:03:44.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ntp.te	2006-06-15 21:54:22.000000000 -0400
-@@ -62,6 +62,7 @@
- 
- kernel_read_kernel_sysctls(ntpd_t)
- kernel_read_system_state(ntpd_t)
-+kernel_read_network_state(ntpd_t)
- 
- corenet_non_ipsec_sendrecv(ntpd_t)
- corenet_tcp_sendrecv_all_if(ntpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.2.47/policy/modules/services/pegasus.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.if	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-07 07:37:00.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -366,9 +222,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.47/policy/modules/services/pegasus.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/pegasus.te	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-07 07:37:00.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -385,43 +241,73 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.2.47/policy/modules/services/ppp.te
---- nsaserefpolicy/policy/modules/services/ppp.te	2006-06-06 22:21:55.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/services/ppp.te	2006-06-15 21:55:46.000000000 -0400
-@@ -68,6 +68,7 @@
- allow pppd_t self:tcp_socket create_stream_socket_perms;
- allow pppd_t self:udp_socket { connect connected_socket_perms };
- allow pppd_t self:packet_socket create_socket_perms;
-+allow pppd_t self:process signal;
- 
- domain_auto_trans(pppd_t, pptp_exec_t, pptp_t)
- allow pppd_t pptp_t:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tor.if serefpolicy-2.2.47/policy/modules/services/tor.if
---- nsaserefpolicy/policy/modules/services/tor.if	2006-03-07 13:08:46.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/services/tor.if	2006-06-15 21:54:22.000000000 -0400
-@@ -11,7 +11,7 @@
- ## </param>
- #
- interface(`tor_domtrans',`
--	gen_requires(`
-+	gen_require(`
- 		type tor_t, tor_exec_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-07 07:37:00.000000000 -0400
+@@ -80,8 +80,10 @@
+ corenet_tcp_bind_all_nodes(squid_t)
+ corenet_udp_bind_all_nodes(squid_t)
+ corenet_tcp_bind_http_cache_port(squid_t)
++corenet_udp_bind_http_cache_port(squid_t)
+ corenet_tcp_bind_ftp_port(squid_t)
+ corenet_tcp_bind_gopher_port(squid_t)
++corenet_udp_bind_gopher_port(squid_t)
+ corenet_tcp_connect_ftp_port(squid_t)
+ corenet_tcp_connect_gopher_port(squid_t)
+ corenet_tcp_connect_http_port(squid_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
+--- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-07 07:37:00.000000000 -0400
+@@ -78,6 +78,7 @@
+ miscfiles_read_localization(tftpd_t)
+ 
+ sysnet_read_config(tftpd_t)
++sysnet_use_ldap(tftpd_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
+ userdom_dontaudit_use_sysadm_ttys(tftpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-07 07:37:00.000000000 -0400
+@@ -317,7 +317,6 @@
+ 	')
+ 
+ 	ifdef(`TODO',`
+-	allow $1_t xdm_xserver_tmp_t:dir r_dir_perms;
+ 	allow $1_t xdm_xserver_t:unix_stream_socket connectto;
+ 
+ 	ifdef(`xdm.te', `
+@@ -1126,6 +1125,27 @@
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.2.47/policy/modules/system/authlogin.if
---- nsaserefpolicy/policy/modules/system/authlogin.if	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/authlogin.if	2006-06-15 22:39:05.000000000 -0400
-@@ -1292,6 +1292,7 @@
- 
- 	sysnet_dns_name_resolve($1)
- 	sysnet_use_ldap($1)
-+	miscfiles_read_certs($1)
- 
- 	optional_policy(`
- 		nis_use_ypbind($1)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.2.47/policy/modules/system/hostname.te
+ 	files_search_tmp($1)
++	xserver_search_xdm_xserver_tmp_dir($1)
+ 	allow $1 xdm_xserver_tmp_t:sock_file write;
+ 	allow $1 xdm_xserver_t:unix_stream_socket connectto;
+ ')
++
++
++########################################
++## <summary>
++##	search xdm temporary directory
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit
++##	</summary>
++## </param>
++#
++interface(`xserver_search_xdm_xserver_tmp_dir',`
++	gen_require(`
++		type xdm_xserver_tmp_t;
++	')
++
++	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.2.47/policy/modules/system/hostname.te	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-07 07:37:00.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -434,43 +320,26 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.47/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-06-08 23:00:33.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/init.te	2006-06-15 21:54:22.000000000 -0400
-@@ -345,6 +345,7 @@
- files_mounton_isid_type_dirs(initrc_t)
- files_list_default(initrc_t)
- files_mounton_default(initrc_t)
-+files_unlink_boot_flag(initrc_t)
- 
- libs_rw_ld_so_cache(initrc_t)
- libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.47/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/libraries.fc	2006-06-15 21:55:03.000000000 -0400
-@@ -121,7 +121,7 @@
- 
- /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
--/usr/lib(64)?/xorg/modules/drivers/fglx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/xorg/modules/drivers/fglrx_drv\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
- ifdef(`distro_redhat',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.47/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/mount.te	2006-06-15 21:54:22.000000000 -0400
-@@ -111,6 +111,7 @@
- 	tunable_policy(`allow_mount_anyfile',`
- 		auth_read_all_dirs_except_shadow(mount_t)
- 		auth_read_all_files_except_shadow(mount_t)
-+		files_mounton_all_files(mount_t)
- 	')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-07 07:37:00.000000000 -0400
+@@ -158,13 +158,6 @@
+ 	allow $1 initrc_t:fifo_file rw_file_perms;
+ 	allow $1 initrc_t:process sigchld;
+ 
+-	ifdef(`hide_broken_symptoms',`
+-		# RHEL4 systems seem to have a stray
+-		# fds open from the initrd
+-		ifdef(`distro_rhel4',`
+-			kernel_dontaudit_use_fds($1)
+-		')
+-	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.47/policy/modules/system/selinuxutil.te
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/selinuxutil.te	2006-06-15 21:54:22.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-07 07:37:00.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -480,96 +349,410 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.2.47/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/unconfined.fc	2006-06-15 21:54:22.000000000 -0400
-@@ -7,4 +7,6 @@
- ifdef(`targeted_policy',`
- /usr/lib/openoffice.org.*/program/.*\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
-+/usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.47/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-13 07:03:49.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/userdomain.if	2006-06-15 21:54:22.000000000 -0400
-@@ -4145,7 +4145,7 @@
- 	gen_require(`
- 		type user_home_dir_t;
- 	')
--
-+	allow $1 user_home_dir_t:dir manage_dir_perms;
- 	files_home_filetrans($1,user_home_dir_t,dir)
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.2.47/policy/modules/system/xen.if
---- nsaserefpolicy/policy/modules/system/xen.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.if	2006-06-15 21:54:22.000000000 -0400
-@@ -11,7 +11,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-07 07:37:00.000000000 -0400
+@@ -8,11 +8,10 @@
+ ## <desc>
+ ##	<p>
+ ##	This template creates a user domain, types, and
+-##	rules for the user's tty, pty, home directories,
+-##	tmp, and tmpfs files.
++##	rules for the user's tty, pty, tmp, and tmpfs files.
+ ##	</p>
+ ##	<p>
+-##	This generally should not be used, rather the
++##	This should only be used for new non login user roles, rather the
+ ##	unpriv_user_template or admin_user_template should
+ ##	be used.
+ ##	</p>
+@@ -25,7 +24,9 @@
  ## </param>
  #
- interface(`xen_domtrans',`
--	gen_requires(`
+ template(`base_user_template',`
+-
 +	gen_require(`
- 		type xend_t, xend_exec_t;
- 	')
++		attribute userdomain, unpriv_userdomain;
++	')
+ 	attribute $1_file_type;
  
-@@ -118,7 +118,7 @@
- ## </param>
- #
- interface(`xen_domtrans_xm',`
--	gen_requires(`
-+	gen_require(`
- 		type xm_t, xm_exec_t;
+ 	type $1_t, userdomain;
+@@ -42,44 +43,17 @@
+ 	term_user_pty($1_t,$1_devpts_t)
+ 	files_type($1_devpts_t)
+ 
+-	# type for contents of home directory
+-	type $1_home_t, $1_file_type, home_type;
+-	files_type($1_home_t)
+-	files_associate_tmp($1_home_t)
+-	fs_associate_tmpfs($1_home_t)
+-
+-	# type of home directory
+-	type $1_home_dir_t, home_dir_type, home_type;
+-	files_type($1_home_dir_t)
+-	files_associate_tmp($1_home_dir_t)
+-	fs_associate_tmpfs($1_home_dir_t)
+-
+ 	type $1_tmp_t, $1_file_type;
+ 	files_tmp_file($1_tmp_t)
+ 
+ 	type $1_tmpfs_t;
+ 	files_tmpfs_file($1_tmpfs_t)
+ 
+-	# types for network-obtained content
+-	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
+-	files_type($1_untrusted_content_t)
+-	files_poly_member($1_untrusted_content_t)
+-
+-	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
+-	files_tmp_file($1_untrusted_content_tmp_t)
+-
+ 	type $1_tty_device_t; 
+ 	term_tty($1_t,$1_tty_device_t)
+ 
+ 	##############################
+ 	#
+-	# User home directory file rules
+-	#
+-
+-	allow $1_file_type $1_home_t:filesystem associate;
+-
+-	##############################
+-	#
+ 	# User domain Local policy
+ 	#
+ 
+@@ -103,19 +77,6 @@
+ 	dontaudit $1_t self:netlink_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown };
+ 	dontaudit $1_t self:netlink_route_socket { create ioctl read getattr write setattr append bind connect getopt setopt shutdown nlmsg_read nlmsg_write };
+ 
+-	# execute files in the home directory
+-	can_exec($1_t,$1_home_t)
+-
+-	# full control of the home directory
+-	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
+-	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
+-	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
+-	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
+-	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+-	files_search_home($1_t)
+-
+ 	can_exec($1_t,$1_tmp_t)
+ 
+ 	# user temporary files
+@@ -138,13 +99,13 @@
+ 	fs_tmpfs_filetrans($1_t,$1_tmpfs_t, { dir notdevfile_class_set } )
+ 
+ 	allow $1_t $1_tty_device_t:chr_file { setattr rw_file_perms };
+-
+-	# Allow user to relabel untrusted content
+-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
+-	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
++	allow $1_t $1_devpts_t:chr_file { setattr rw_file_perms };
++	term_create_pty($1_t,$1_devpts_t)
+ 
+ 	allow $1_t unpriv_userdomain:fd use;
+ 
++	kernel_read_system_state($1_t)
++	kernel_read_network_state($1_t)
+ 	kernel_read_kernel_sysctls($1_t)
+ 	kernel_read_net_sysctls($1_t)
+ 	kernel_dontaudit_list_unlabeled($1_t)
+@@ -165,8 +126,10 @@
+ 
+ 	corenet_non_ipsec_sendrecv($1_t)
+ 	corenet_tcp_sendrecv_all_if($1_t)
++	corenet_raw_sendrecv_all_if($1_t)
+ 	corenet_udp_sendrecv_all_if($1_t)
+ 	corenet_tcp_sendrecv_all_nodes($1_t)
++	corenet_raw_sendrecv_all_nodes($1_t)
+ 	corenet_udp_sendrecv_all_nodes($1_t)
+ 	corenet_tcp_sendrecv_all_ports($1_t)
+ 	corenet_udp_sendrecv_all_ports($1_t)
+@@ -234,6 +197,10 @@
+ 	files_dontaudit_getattr_non_security_sockets($1_t)
+ 	files_dontaudit_getattr_non_security_blk_files($1_t)
+ 	files_dontaudit_getattr_non_security_chr_files($1_t)
++	files_read_etc_files($1_t)
++	files_read_etc_runtime_files($1_t)
++	files_read_usr_files($1_t)
++	files_exec_usr_files($1_t)
+ 
+ 	# Caused by su - init scripts
+ 	init_dontaudit_use_script_ptys($1_t)
+@@ -254,16 +221,86 @@
+ 	seutil_read_default_contexts($1_t)
+ 	seutil_run_newrole($1_t,$1_r,{ $1_devpts_t $1_tty_device_t })
+ 
+-	tunable_policy(`allow_execmem',`
+-		# Allow loading DSOs that require executable stack.
+-		allow $1_t self:process execmem;
+-	')
++')
++#######################################
++## <summary>
++##	The template containing rules common to unprivileged
++##	users and administrative users.
++## </summary>
++## <desc>
++##	<p>
++##	This template creates a user home directories,
++##	</p>
++##	<p>
++##	This generally should not be used, rather the
++##	unpriv_user_template or admin_user_template should
++##	be used.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	The prefix of the user domain (e.g., user
++##	is the prefix for user_t).
++##	</summary>
++## </param>
++#
++template(`base_login_user_template',`
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1_t self:process execstack;
++	gen_require(`
++		attribute $1_file_type;
++		attribute home_dir_type, home_type;
++		attribute untrusted_content_type;
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.2.47/policy/modules/system/xen.te
---- nsaserefpolicy/policy/modules/system/xen.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.2.47/policy/modules/system/xen.te	2006-06-15 21:54:22.000000000 -0400
-@@ -68,7 +68,8 @@
- # xend local policy
- #
++	# type for contents of home directory
++	type $1_home_t, $1_file_type, home_type;
++	files_type($1_home_t)
++	files_associate_tmp($1_home_t)
++	fs_associate_tmpfs($1_home_t)
++
++	# type of home directory
++	type $1_home_dir_t, home_dir_type, home_type;
++	files_type($1_home_dir_t)
++	files_associate_tmp($1_home_dir_t)
++	fs_associate_tmpfs($1_home_dir_t)
++
++	# types for network-obtained content
++	type $1_untrusted_content_t, $1_file_type, untrusted_content_type; #, customizable
++	files_type($1_untrusted_content_t)
++	files_poly_member($1_untrusted_content_t)
++
++	type $1_untrusted_content_tmp_t, $1_file_type, untrusted_content_tmp_type; # customizable
++	files_tmp_file($1_untrusted_content_tmp_t)
++
++	##############################
++	#
++	# User home directory file rules
++	#
++
++	allow $1_file_type $1_home_t:filesystem associate;
++
++	##############################
++	#
++	# User domain Local policy
++	#
++
++	# execute files in the home directory
++	can_exec($1_t,$1_home_t)
++
++	# full control of the home directory
++	allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto entrypoint };
++	allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:dir { create_dir_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:sock_file { create_file_perms relabelfrom relabelto };
++	allow $1_t $1_home_t:fifo_file { create_file_perms relabelfrom relabelto };
++	allow $1_t $1_home_dir_t:dir { create_dir_perms relabelfrom relabelto };
++	type_transition $1_t $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
++	files_search_home($1_t)
++
++	# Allow user to relabel untrusted content
++	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:dir { create_dir_perms relabelto relabelfrom };
++	allow $1_t { $1_untrusted_content_t $1_untrusted_content_tmp_t }:file { getattr unlink relabelto relabelfrom rename };
++
+ 	tunable_policy(`read_default_t',`
+ 		files_list_default($1_t)
+ 		files_read_default_files($1_t)
+@@ -501,6 +538,7 @@
+ 
+ 	# Inherit rules for ordinary users.
+ 	base_user_template($1)
++	base_login_user_template($1)
+ 
+ 	typeattribute $1_t unpriv_userdomain;
+ 	domain_interactive_fd($1_t)
+@@ -521,9 +559,6 @@
+ 	# Local policy
+ 	#
  
--allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config };
-+allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
-+
- allow xend_t self:process { signal sigkill };
- # internal communication is often done using fifo and unix sockets.
- allow xend_t self:fifo_file rw_file_perms;
-@@ -168,6 +169,8 @@
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+ 	# Rules used to associate a homedir as a mountpoint
+ 	allow $1_home_t self:filesystem associate;
+ 	allow $1_file_type $1_home_t:filesystem associate;
+@@ -535,10 +570,6 @@
+ 	allow privhome $1_home_t:sock_file create_file_perms;
+ 	allow privhome $1_home_t:fifo_file create_file_perms;
+ 	type_transition privhome $1_home_dir_t:{ dir notdevfile_class_set } $1_home_t;
+-
+-	kernel_read_system_state($1_t)
+-	kernel_read_network_state($1_t)
+-
+ 	dev_read_sysfs($1_t)
  
- xen_stream_connect_xenstore(xend_t)
+ 	corecmd_exec_all_executables($1_t)
+@@ -546,11 +577,8 @@
+ 	# port access is audited even if dac would not have allowed it, so dontaudit it here
+ 	corenet_dontaudit_tcp_bind_all_reserved_ports($1_t)
+ 
+-	files_read_etc_files($1_t)
+-	files_read_etc_runtime_files($1_t)
++
+ 	files_list_home($1_t)
+-	files_read_usr_files($1_t)
+-	files_exec_usr_files($1_t)
+ 	# Read directories and files with the readable_t type.
+ 	# This type is a general type for "world"-readable files.
+ 	files_list_world_readable($1_t)
+@@ -558,8 +586,6 @@
+ 	files_read_world_readable_symlinks($1_t)
+ 	files_read_world_readable_pipes($1_t)
+ 	files_read_world_readable_sockets($1_t)
+-	# cjp: why?
+-	files_read_kernel_symbol_table($1_t)
+ 
+ 	init_read_utmp($1_t)
+ 	# The library functions always try to open read-write first,
+@@ -748,6 +774,7 @@
+ 
+ 	# Inherit rules for ordinary users.
+ 	base_user_template($1)
++	base_login_user_template($1)
+ 
+ 	typeattribute $1_t privhome;
+ 	domain_obj_id_change_exemption($1_t)
+@@ -783,11 +810,6 @@
  
-+netutils_domtrans(xend_t)
-+
- optional_policy(`
- 	consoletype_domtrans(xend_t)
+ 	allow $1_t self:netlink_audit_socket nlmsg_readpriv;
+ 
+-	allow $1_t $1_devpts_t:chr_file { setattr ioctl read getattr lock write append };
+-	term_create_pty($1_t,$1_devpts_t)
+-
+-	kernel_read_system_state($1_t)
+-	kernel_read_network_state($1_t)
+ 	kernel_read_software_raid_state($1_t)
+ 	kernel_getattr_core_if($1_t)
+ 	kernel_getattr_message_if($1_t)
+@@ -4128,7 +4150,7 @@
+ 	gen_require(`
+ 		type user_home_dir_t;
+ 	')
+-
++	allow $1 user_home_dir_t:dir manage_dir_perms;
+ 	files_home_filetrans($1,user_home_dir_t,dir)
  ')
-@@ -255,7 +258,8 @@
- # xm local policy
- #
  
--allow xm_t self:capability { dac_override ipc_lock };
-+allow xm_t self:capability { dac_override ipc_lock sys_tty_config };
+@@ -4789,3 +4811,34 @@
+ 	allow $1 user_home_dir_t:dir create_dir_perms;
+ 	files_home_filetrans($1,user_home_dir_t,dir)
+ ')
 +
- # internal communication is often done using fifo and unix sockets.
- allow xm_t self:fifo_file { read write };
- allow xm_t self:unix_stream_socket create_stream_socket_perms;
-@@ -265,6 +269,9 @@
- allow xm_t xend_var_lib_t:file create_file_perms;
- files_search_var_lib(xm_t)
- 
-+allow xm_t xen_image_t:dir rw_dir_perms;
-+allow xm_t xen_image_t:file r_file_perms;
-+
- kernel_read_system_state(xm_t)
- kernel_read_kernel_sysctls(xm_t)
- kernel_read_xen_state(xm_t)
-@@ -284,6 +291,7 @@
- term_use_all_terms(xm_t)
++########################################
++## <summary>
++##	The template containing rules for changing from one role to another
++## </summary>
++## <desc>
++##	<p>
++##	This should only be used for new non login user roles, rather the
++##	unpriv_user_template or admin_user_template should
++##	be used.
++##	</p>
++## </desc>
++## <param name="userdomain_prefix">
++##	<summary>
++##	userdomain changing from 
++##	</summary>
++## </param>
++## <param name="userdomain_prefix">
++##	<summary>
++##	userdomain changing to
++##	</summary>
++## </param>
++#
++template(`role_change_template',`
++        allow $1_r $2_r;
++        type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
++        type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
++        # avoid annoying messages on terminal hangup
++        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-07 07:37:00.000000000 -0400
+@@ -56,14 +56,6 @@
+ # Local policy
+ #
  
- init_rw_script_stream_sockets(xm_t)
-+init_use_fds(xm_t)
+-define(`role_change',`
+-	allow $1_r $2_r;
+-	type_change $2_t $1_devpts_t:chr_file $2_devpts_t;
+-	type_change $2_t $1_tty_device_t:chr_file $2_tty_device_t;
+-	# avoid annoying messages on terminal hangup
+-	dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
+-')
+-
+ ifdef(`targeted_policy',`
+ 	# Define some type aliases to help with compatibility with
+ 	# macros and domains from the "strict" policy.
+@@ -124,34 +116,34 @@
+ 
+ 	# user role change rules:
+ 	# sysadm_r can change to user roles
+-	role_change(sysadm, user)
+-	role_change(sysadm, staff)
++	role_change_template(sysadm, user)
++	role_change_template(sysadm, staff)
+ 
+ 	# only staff_r can change to sysadm_r
+-	role_change(staff, sysadm)
++	role_change_template(staff, sysadm)
+ 
+ 	ifdef(`enable_mls',`
+ 		unpriv_user_template(secadm)
+ 		unpriv_user_template(auditadm)
+ 
+-		role_change(staff,auditadm)
+-		role_change(staff,secadm)
++		role_change_template(staff,auditadm)
++		role_change_template(staff,secadm)
+ 
+-		role_change(sysadm,secadm)
+-		role_change(sysadm,auditadm)
++		role_change_template(sysadm,secadm)
++		role_change_template(sysadm,auditadm)
+ 
+-		role_change(auditadm,secadm)
+-		role_change(auditadm,sysadm)
++		role_change_template(auditadm,secadm)
++		role_change_template(auditadm,sysadm)
+ 
+-		role_change(secadm,auditadm)
+-		role_change(secadm,sysadm)
++		role_change_template(secadm,auditadm)
++		role_change_template(secadm,sysadm)
+ 	')
+ 
+ 	# this should be tunable_policy, but
+ 	# currently type_change and RBAC allow
+ 	# do not work in conditionals
+ 	ifdef(`user_canbe_sysadm',`
+-		role_change(user,sysadm)
++		role_change_template(user,sysadm)
+ 	')
  
- libs_use_ld_so(xm_t)
- libs_use_shared_libs(xm_t)
+ 	allow privhome home_root_t:dir { getattr search };


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- selinux-policy.spec	16 Jun 2006 03:11:03 -0000	1.175
+++ selinux-policy.spec	9 Jul 2006 10:46:56 -0000	1.176
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.47
-Release: 3.fc5
+Version: 2.3.2
+Release: 1.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -97,8 +97,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 \
+%verify(not mtime) %{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
+%verify(not mtime) %{_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/ \
@@ -122,7 +122,6 @@
 %define saveFileContext() \
 if [ -s /etc/selinux/config ]; then \
 	. %{_sysconfdir}/selinux/config; \
-	restorecon -R %{_sysconfdir}/selinux/%1; \
 	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
 	if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
 		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
@@ -324,6 +323,28 @@
 %endif
 
 %changelog
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1.fc5
+- Bump for FC-5
+
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1
+- Update to upstream
+
+* Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.1-1
+- Update to upstream
+- Add new class for kernel key ring
+
+* Wed Jun 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.49-1
+- Update to upstream
+
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.48-1
+- Update to upstream
+
+* Tue Jun 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-5
+- Break out selinux-devel package
+
+* Fri Jun 16 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-4
+- Add ibmasmfs
+
 * Thu Jun 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.47-3.fc5
 - Bump for fc5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	15 Jun 2006 14:12:52 -0000	1.61
+++ sources	9 Jul 2006 10:46:56 -0000	1.62
@@ -1 +1 @@
-f8f313db16a432e3d20b771ab1823346  serefpolicy-2.2.47.tgz
+de57afb1e83b5110b90f2aaeeca0c535  serefpolicy-2.3.2.tgz



From fedora-cvs-commits at redhat.com  Sun Jul  9 18:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 14:50:43 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.38,1.39
Message-ID: <200607091850.k69Iohh9003825@cvs.devel.redhat.com>

Author: davej

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

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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cpufreq-utils.spec	2 Jul 2006 03:37:12 -0000	1.38
+++ cpufreq-utils.spec	9 Jul 2006 18:50:41 -0000	1.39
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Wed Jul  9 2006 Dave Jones <davej at redhat.com>
+- Rebuild against new libsysfs
+
 * Wed Jun  7 2006 Dave Jones <davej at redhat.com>
 - Upstream -002 release.
 



From fedora-cvs-commits at redhat.com  Sun Jul  9 20:50:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 16:50:26 -0400
Subject: rpms/squirrelmail/devel squirrelmail-1.4.7-check-mail.ja.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 squirrelmail-1.4.6-japanese-multibyte-view-body.patch,
	1.1, 1.2 squirrelmail-1.4.6-japanese-multibyte-view-text.patch,
	1.1, 1.2 squirrelmail.spec, 1.37,
	1.38 squirrelmail-1.4.6-CVE-2006-2842.patch, 1.1, NONE
Message-ID: <200607092050.k69KoQCo007990@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7915

Modified Files:
	.cvsignore sources 
	squirrelmail-1.4.6-japanese-multibyte-view-body.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.7-check-mail.ja.patch 
Removed Files:
	squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
- 1.4.7 with CVE-2006-3174
- Reduce patch for body text (#194457)
- Better JP translation for "Check mail" (#196117)


squirrelmail-1.4.7-check-mail.ja.patch:
 squirrelmail.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.7-check-mail.ja.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig	2006-03-03 17:02:20.000000000 -0500
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po	2006-07-07 15:09:08.000000000 -0400
@@ -398,7 +398,7 @@
 msgstr "??????????????"
 
 msgid "Check mail"
-msgstr "????????????????????"
+msgstr "????????????"
 
 msgid "Login"
 msgstr "????????"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Mar 2006 10:16:46 -0000	1.14
+++ .cvsignore	9 Jul 2006 20:50:24 -0000	1.15
@@ -1,2 +1,2 @@
-all_locales-1.4.6-20060221.tar.bz2
-squirrelmail-1.4.6.tar.bz2
+squirrelmail-1.4.7.tar.bz2
+all_locales-1.4.7-20060702.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Mar 2006 10:16:46 -0000	1.14
+++ sources	9 Jul 2006 20:50:24 -0000	1.15
@@ -1,2 +1,2 @@
-29dfec2e0f71fba368a89c36c51881c2  all_locales-1.4.6-20060221.tar.bz2
-300ddcf66b7907a61b6e9404840e35de  squirrelmail-1.4.6.tar.bz2
+08301f14d71e4452e93f21b5e6747a4a  squirrelmail-1.4.7.tar.bz2
+4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2

squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
 mime.php |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

Index: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-body.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrelmail-1.4.6-japanese-multibyte-view-body.patch	23 Jun 2006 20:39:43 -0000	1.1
+++ squirrelmail-1.4.6-japanese-multibyte-view-body.patch	9 Jul 2006 20:50:24 -0000	1.2
@@ -1,53 +1,26 @@
-diff -urN squirrelmail-1.4.6.orig/functions/mime.php squirrelmail-1.4.6/functions/mime.php
---- squirrelmail-1.4.6.orig/functions/mime.php	2006-06-23 16:29:07.000000000 -0400
-+++ squirrelmail-1.4.6/functions/mime.php	2006-06-23 16:31:17.000000000 -0400
-@@ -243,12 +243,18 @@
-  * Extracted from strings.php 23/03/2002
-  */
- 
--function translateText(&$body, $wrap_at, $charset) {
-+function translateText(&$body, $wrap_at, $charset, $transfer_encoding) {
-     global $where, $what;   /* from searching */
-     global $color;          /* color theme */
-+    global $default_charset;
- 
-     require_once(SM_PATH . 'functions/url_parser.php');
- 
-+    if ($default_charset == 'iso-2022-jp' && $transfer_encoding == 'base64' ||
-+        $transfer_encoding == 'quoted-printable' ||  $transfer_encoding == 'quoted_printable'){
-+            $charset = $default_charset;
-+    }
-+
-     $body_ary = explode("\n", $body);
-     for ($i=0; $i < count($body_ary); $i++) {
-         $line = $body_ary[$i];
-@@ -347,14 +353,26 @@
-                 $body = strip_tags($body);
-                 $body = trim($body);
-                 translateText($body, $wrap_at,
--                        $body_message->header->getParameter('charset'));
-+                        $body_message->header->getParameter('charset'),$body_message->header->encoding);
-             } else {
-                 $body = magicHTML($body, $id, $message, $mailbox);
+diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
+--- squirrelmail-1.4.6.org/functions/mime.php	2006-06-29 08:23:58.000000000 +0900
++++ squirrelmail-1.4.6/functions/mime.php	2006-06-29 08:34:26.000000000 +0900
+@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
                  $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
              }
          } else {
 -            translateText($body, $wrap_at,
 -                    $body_message->header->getParameter('charset'));
-+                if($squirrelmail_language != 'ja_JP'){
-+                        translateText($body, $wrap_at,
-+                                      $body_message->header->getParameter('charset'),$body_message->header->encoding);
-+                } else {
-+                        if($body_message->header->encoding == 'base64' ||
-+                           $body_message->header->encoding == 'quoted-printable' ||
-+                           $body_message->header->encoding == 'quoted_printable'){
-+                                translateText($body, $wrap_at, $default_charset);
-+                        } else {
-+				// it may never call here.
-+                                translateText($body, $wrap_at,
-+					      $body_message->header->getParameter('charset'));
-+                        }
-+                }
++	    if($squirrelmail_language != 'ja_JP'){
++		    translateText($body, $wrap_at,
++				  $body_message->header->getParameter('charset'));
++	    } else {
++		    if($body_message->header->encoding == 'base64' ||
++		       $body_message->header->encoding == 'quoted-printable' ||
++		       $body_message->header->encoding == 'quoted_printable'){
++			    translateText($body, $wrap_at, $default_charset);
++		    } else {
++			    // it may never call here.
++			    translateText($body, $wrap_at,
++					  $body_message->header->getParameter('charset'));
++		    }
++	    }
          }
  
          // if this is the clean display (i.e. printer friendly), stop here.

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
 view_text.php |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squirrelmail-1.4.6-japanese-multibyte-view-text.patch	23 Jun 2006 20:39:43 -0000	1.1
+++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch	9 Jul 2006 20:50:24 -0000	1.2
@@ -1,21 +1,22 @@
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195452
-squirrelmail view_text.php cannot handle handle multibyte characters in attachment
-viewing text of the attachment within squirrelmail itself.
-
---- src/view_text.php.org	2006-06-14 13:44:28.000000000 +0900
-+++ src/view_text.php	2006-06-14 13:44:47.000000000 +0900
-@@ -58,8 +58,13 @@ if ($passed_ent_id) {
- $header   = $message_ent->header;
- $type0    = $header->type0;
- $type1    = $header->type1;
--$charset  = $header->getParameter('charset');
- $encoding = strtolower($header->encoding);
-+if($squirrelmail_language == 'ja_JP' && $encoding == 'base64' ||
-+   $encoding == 'quoted-printable' || $encoding == 'quoted_printable'){
-+        $charset  = $default_charset;
-+} else {
-+        $charset  = $header->getParameter('charset');
-+}
+diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
+--- squirrelmail-1.4.6.org/src/view_text.php	2006-02-04 07:27:55.000000000 +0900
++++ squirrelmail-1.4.6/src/view_text.php	2006-06-29 08:30:04.000000000 +0900
+@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
+     if (! empty($charset))
+         $body = charset_decode($charset,$body,false,true);
+ } else {
+-    translateText($body, $wrap_at, $charset);
++    if($squirrelmail_language != 'ja_JP'){
++        translateText($body, $wrap_at, $charset);
++    } else {
++        if($encoding == 'base64' || $encoding == 'quoted-printable' || 
++	   $encoding == 'quoted_printable'){
++           translateText($body, $wrap_at, $default_charset);
++        } else {
++            // it may never call here.
++            translateText($body, $wrap_at, $charset);
++        }
++    }
+ }
  
- $msg_url   = 'read_body.php?' . $QUERY_STRING;
- $msg_url   = set_url_var($msg_url, 'ent_id', 0);
+ displayPageHeader($color, 'None');


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- squirrelmail.spec	23 Jun 2006 20:39:43 -0000	1.37
+++ squirrelmail.spec	9 Jul 2006 20:50:24 -0000	1.38
@@ -5,8 +5,8 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.6
-Release: 8.fc6
+Version: 1.4.7
+Release: 1.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -15,12 +15,12 @@
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
-Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+Patch5:  squirrelmail-1.4.7-check-mail.ja.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -39,17 +39,16 @@
 address books, and folder manipulation.
 
 %prep
-#%setup -q
 %setup -q -n squirrelmail-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p0
+%patch3 -p1
 %patch4 -p1
 
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
+%patch5 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -243,6 +242,11 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-9
+- 1.4.7 with CVE-2006-3174
+- Reduce patch for body text (#194457)
+- Better JP translation for "Check mail" (#196117)
+
 * Fri Jun 23 2006 Warren Togami <wtogami at redhat.com> 1.4.6-8
 - Japanese zenkaku subject conversion      (#196017)
 - Japanese MSIE garbled download ugly hack (#195639)


--- squirrelmail-1.4.6-CVE-2006-2842.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 02:01:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 22:01:31 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.478, 1.479 kernel-2.6.spec, 1.2361,
	1.2362 sources, 1.422, 1.423 upstream, 1.389, 1.390
Message-ID: <200607100201.k6A21VKk019136@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1-git2.bz2.sign 
Log Message:
git2



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

iD8DBQBEsVNhyGugalF9Dw4RAi1BAJ9jfbCkB4ZgVi7RzX3tUn/6goBXlgCfZs2e
YPrs8VWN1IR7CZGtI4F/ULM=
=PiOq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- .cvsignore	6 Jul 2006 04:57:57 -0000	1.478
+++ .cvsignore	10 Jul 2006 02:01:02 -0000	1.479
@@ -4,3 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
+patch-2.6.18-rc1-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2361
retrieving revision 1.2362
diff -u -r1.2361 -r1.2362
--- kernel-2.6.spec	7 Jul 2006 21:05:16 -0000	1.2361
+++ kernel-2.6.spec	10 Jul 2006 02:01:03 -0000	1.2362
@@ -248,6 +248,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
+Patch2: patch-2.6.18-rc1-git2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -706,6 +707,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1576,6 +1578,9 @@
 %endif
 
 %changelog
+* Sun Jul  9 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git2
+
 * Fri Jul  7 2006 Don Zickus <dzickus at redhat.com>
 - Unified rhel and fedora srpm
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- sources	6 Jul 2006 04:57:57 -0000	1.422
+++ sources	10 Jul 2006 02:01:13 -0000	1.423
@@ -1,3 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
+59c17c8b222f647cd586894839edb49b  patch-2.6.18-rc1-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- upstream	6 Jul 2006 04:57:57 -0000	1.389
+++ upstream	10 Jul 2006 02:01:14 -0000	1.390
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
+patch-2.6.18-rc1-git2.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 02:34:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 22:34:59 -0400
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.38,1.39
Message-ID: <200607100234.k6A2Yx0C018222@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18207

Modified Files:
	lm_sensors.spec 
Log Message:
attempt a rebuild, hopefully this will fix the broken dep



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- lm_sensors.spec	5 Jun 2006 21:53:11 -0000	1.38
+++ lm_sensors.spec	10 Jul 2006 02:34:56 -0000	1.39
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.10.0
-Release: 2
+Release: 3
 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
+* Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 2.10.0-3
+- rebuild
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 2.10.0-2
 - Fix BuildRequires, added flex. (#193511)  Changed to Requires(post) and 
   (postun)



From fedora-cvs-commits at redhat.com  Mon Jul 10 02:42:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 22:42:26 -0400
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.39,1.40
Message-ID: <200607100242.k6A2gQ82029698@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29655

Modified Files:
	lm_sensors.spec 
Log Message:
change buildreq from sysfsutils-devel to libsysfs-devel (#198055)



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- lm_sensors.spec	10 Jul 2006 02:34:56 -0000	1.39
+++ lm_sensors.spec	10 Jul 2006 02:42:23 -0000	1.40
@@ -20,7 +20,7 @@
 Requires: /usr/sbin/dmidecode
 Requires(preun): chkconfig
 Requires(post): chkconfig
-BuildRequires: kernel-headers >= 2.2.16, bison, sysfsutils-devel, flex
+BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex
 ExclusiveArch: alpha %{ix86} x86_64
 
 %description
@@ -108,7 +108,7 @@
 
 %changelog
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 2.10.0-3
-- rebuild
+- change buildreq from sysfsutils-devel to libsysfs-devel (#198055)
 
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 2.10.0-2
 - Fix BuildRequires, added flex. (#193511)  Changed to Requires(post) and 



From fedora-cvs-commits at redhat.com  Mon Jul 10 03:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 9 Jul 2006 23:18:50 -0400
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.38,1.39
Message-ID: <200607100318.k6A3IoWN007254@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7214

Modified Files:
	squirrelmail.spec 
Log Message:
Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- squirrelmail.spec	9 Jul 2006 20:50:24 -0000	1.38
+++ squirrelmail.spec	10 Jul 2006 03:18:48 -0000	1.39
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 1.fc6
+Release: 2.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -205,6 +205,13 @@
 install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
+# move sqspell plugin config to /etc
+rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+install -m 0644 plugins/squirrelspell/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/sqspell_config.php
+ln -s ../../../../..%{_sysconfdir}/squirrelmail/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+
 cd locale_tempdir
 cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/
 cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/
@@ -220,6 +227,7 @@
 %config %dir %{_sysconfdir}/squirrelmail
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/*.php
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/default_pref
+%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/sqspell_config.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %doc doc/*
 %dir %{_datadir}/squirrelmail
@@ -242,7 +250,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
-* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-9
+* Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
+- Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
+
+* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.7-1
 - 1.4.7 with CVE-2006-3174
 - Reduce patch for body text (#194457)
 - Better JP translation for "Check mail" (#196117)



From fedora-cvs-commits at redhat.com  Mon Jul 10 06:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 02:30:02 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-blkid-gfs.patch, NONE,
	1.1 e2fsprogs.spec, 1.59, 1.60
Message-ID: <200607100630.k6A6U2oY030644@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30604

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.39-blkid-gfs.patch 
Log Message:
add GFS/GFS2 support

e2fsprogs-1.39-blkid-gfs.patch:
 ChangeLog |    4 ++++
 probe.c   |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 probe.h   |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+)

--- NEW FILE e2fsprogs-1.39-blkid-gfs.patch ---
--- e2fsprogs-1.39/lib/blkid/probe.c.gfs	2006-05-14 23:24:09.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/probe.c	2006-07-10 08:15:11.000000000 +0200
@@ -646,6 +646,50 @@
 	return 0;
 }
 
+static int probe_gfs(struct blkid_probe *probe,
+		     struct blkid_magic *id __BLKID_ATTR((unused)),
+		     unsigned char *buf)
+{
+	struct gfs2_sb *sbd;
+	const char *label = 0;
+
+	sbd = (struct gfs2_sb *)buf;
+
+	if (blkid_be32(sbd->sb_fs_format) == GFS_FORMAT_FS &&
+	    blkid_be32(sbd->sb_multihost_format) == GFS_FORMAT_MULTI)
+	{	
+		blkid_set_tag(probe->dev, "UUID", 0, 0);
+	
+		if (strlen(sbd->sb_locktable))
+			label = sbd->sb_locktable;
+		blkid_set_tag(probe->dev, "LABEL", label, sizeof(sbd->sb_locktable));
+		return 0;
+	}
+	return 1;
+}
+
+static int probe_gfs2(struct blkid_probe *probe,
+		     struct blkid_magic *id __BLKID_ATTR((unused)),
+		     unsigned char *buf)
+{
+	struct gfs2_sb *sbd;
+	const char *label = 0;
+
+	sbd = (struct gfs2_sb *)buf;
+
+	if (blkid_be32(sbd->sb_fs_format) == GFS2_FORMAT_FS &&
+	    blkid_be32(sbd->sb_multihost_format) == GFS2_FORMAT_MULTI)
+	{	
+		blkid_set_tag(probe->dev, "UUID", 0, 0);
+	
+		if (strlen(sbd->sb_locktable))
+			label = sbd->sb_locktable;
+		blkid_set_tag(probe->dev, "LABEL", label, sizeof(sbd->sb_locktable));
+		return 0;
+	}
+	return 1;
+}
+
 /*
  * BLKID_BLK_OFFS is at least as large as the highest bim_kboff defined
  * in the type_array table below + bim_kbalign.
@@ -673,6 +717,8 @@
   { "reiserfs", 64,   0x34,  8, "ReIsErFs",		probe_reiserfs },
   { "reiserfs",	 8,	20,  8, "ReIsErFs",		probe_reiserfs },
   { "reiser4",  64,	 0,  7, "ReIsEr4",		probe_reiserfs4 },
+  { "gfs2",     64,      0,  4, "\x01\x16\x19\x70",     probe_gfs2 },
+  { "gfs",      64,      0,  4, "\x01\x16\x19\x70",     probe_gfs },
   { "vfat",      0,   0x52,  5, "MSWIN",                probe_fat },
   { "vfat",      0,   0x52,  8, "FAT32   ",             probe_fat },
   { "vfat",      0,   0x36,  5, "MSDOS",                probe_fat },
--- e2fsprogs-1.39/lib/blkid/probe.h.gfs	2006-03-10 21:43:35.000000000 +0100
+++ e2fsprogs-1.39/lib/blkid/probe.h	2006-07-07 13:45:43.000000000 +0200
@@ -345,6 +345,54 @@
 	unsigned char	escape_sequences[8];
 };
 
+/* Common gfs/gfs2 constants: */
+#define GFS_MAGIC               0x01161970
+#define GFS_DEFAULT_BSIZE       4096
+#define GFS_SUPERBLOCK_OFFSET	(0x10 * GFS_DEFAULT_BSIZE)
+#define GFS_METATYPE_SB         1
+#define GFS_FORMAT_SB           100
+#define GFS_LOCKNAME_LEN        64
+
+/* gfs1 constants: */
+#define GFS_FORMAT_FS           1309
+#define GFS_FORMAT_MULTI        1401
+/* gfs2 constants: */
+#define GFS2_FORMAT_FS          1801
+#define GFS2_FORMAT_MULTI       1900
+
+struct gfs2_meta_header {
+	__u32 mh_magic;
+	__u32 mh_type;
+	__u64 __pad0;          /* Was generation number in gfs1 */
+	__u32 mh_format;
+	__u32 __pad1;          /* Was incarnation number in gfs1 */
+};
+
+struct gfs2_inum {
+	__u64 no_formal_ino;
+	__u64 no_addr;
+};
+
+struct gfs2_sb {
+	struct gfs2_meta_header sb_header;
+
+	__u32 sb_fs_format;
+	__u32 sb_multihost_format;
+	__u32  __pad0;  /* Was superblock flags in gfs1 */
+	
+	__u32 sb_bsize;
+	__u32 sb_bsize_shift;
+	__u32 __pad1;   /* Was journal segment size in gfs1 */
+	
+	struct gfs2_inum sb_master_dir; /* Was jindex dinode in gfs1 */
+	struct gfs2_inum __pad2; /* Was rindex dinode in gfs1 */
+	struct gfs2_inum sb_root_dir;
+	
+	char sb_lockproto[GFS_LOCKNAME_LEN];
+	char sb_locktable[GFS_LOCKNAME_LEN];
+	/* In gfs1, quota and license dinodes followed */
+} PACKED;
+
 /*
  * Byte swap functions
  */
--- e2fsprogs-1.39/lib/blkid/ChangeLog.gfs	2006-05-14 23:25:12.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/ChangeLog	2006-07-10 08:16:22.000000000 +0200
@@ -0,0 +1,4 @@
+2006-07-10  Karel Zak  <kzak at redhat.com>
+
+	* probe.c (probe_gfs, _gfs2), probe.h: Add support for GFS/GFS2 
+


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- e2fsprogs.spec	6 Jul 2006 20:54:40 -0000	1.59
+++ e2fsprogs.spec	10 Jul 2006 06:29:59 -0000	1.60
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
+Patch37: e2fsprogs-1.39-blkid-gfs.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -68,6 +69,8 @@
 %patch34 -p1 -b .dm
 # put blkid.tab in /etc/blkid/
 %patch36 -p1 -b .etcblkid
+# GFS/GFS2 detection
+%patch37 -p1 -b .gfs
 
 %build
 aclocal
@@ -219,6 +222,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> - 1.39-2
+- add GFS abd GFS2 support to libblkid
+
 * Thu Jul  6 2006 Thomas Woerner <twoerner at redhat.com> - 1.39-1
 - new version 1.39
 - dropped ext2online, because resize2fs is now able to do online resize



From fedora-cvs-commits at redhat.com  Mon Jul 10 06:56:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 02:56:27 -0400
Subject: rpms/net-snmp/devel .cvsignore, 1.19, 1.20 net-snmp.spec, 1.77,
	1.78 sources, 1.19, 1.20
Message-ID: <200607100656.k6A6uR00021267@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	.cvsignore net-snmp.spec sources 
Log Message:
 - update to release candidate 4
 - fix lib dependencies on 64bit archs
 - supress perl build




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	2 Jun 2006 11:42:53 -0000	1.19
+++ .cvsignore	10 Jul 2006 06:56:25 -0000	1.20
@@ -1 +1 @@
-net-snmp-5.3.1.pre3.tar.gz
+net-snmp-5.3.1.rc4.tar.gz


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- net-snmp.spec	13 Jun 2006 09:19:55 -0000	1.77
+++ net-snmp.spec	10 Jul 2006 06:56:25 -0000	1.78
@@ -5,8 +5,8 @@
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: 5.3.1.pre3
-Release: 2
+Version: 5.3.1.rc4
+Release: 1
 
 License: BSDish
 Group: System Environment/Daemons
@@ -141,7 +141,7 @@
 %patch23 -p1 -b .proc_if
 %patch24 -p1 -b .size_t
 %patch25 -p1 -b .retrans_ms
-%patch26 -p0
+#%patch26 -p0
 %patch27 -p1 -b .multilib
 
 # Do this patch with a perl hack...
@@ -159,7 +159,7 @@
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
 %ifarch %{ix86} x86_64
-	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib tcp-mib" \
+	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib tcp-mib udp-mib" \
 %else
 	--with-mib-modules="host agentx smux "	\
 %endif
@@ -181,6 +181,7 @@
 
 pushd perl
 # Use just built libs for perl module building, not the system libs.
+export NETSNMP_DONT_CHECK_VERSION=1
 perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor -NET-SNMP-CONFIG="sh ../../net-snmp-config"
 perl -pi -e 's/^LD_RUN_PATH.*//;s/LD_RUN_PATH=\".*\" //;' default_store/Makefile OID/Makefile agent/Makefile agent/default_store/Makefile ASN/Makefile SNMP/Makefile
 make
@@ -343,6 +344,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.rc4-1
+- update to release candidate 4
+- fix lib dependencies on 64bit archs
+- supress perl build
+
 * Tue Jun 13 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre3-2
 - add tcp-mib (#194856)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	2 Jun 2006 11:42:53 -0000	1.19
+++ sources	10 Jul 2006 06:56:25 -0000	1.20
@@ -1 +1 @@
-0e593e2fad7f2a0432a7c9548c898f35  net-snmp-5.3.1.pre3.tar.gz
+e4962fc9bf170872d8ea830371dd1cef  net-snmp-5.3.1.rc4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:33:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:33:25 -0400
Subject: rpms/iputils/devel iputils-20020927-trace_stop.patch, NONE,
	1.1 iputils.spec, 1.38, 1.39
Message-ID: <200607100733.k6A7XPu0014174@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14146

Modified Files:
	iputils.spec 
Added Files:
	iputils-20020927-trace_stop.patch 
Log Message:
 - tracepath doesn't continue past destination host (#174032) <mildew at gmail.com>

iputils-20020927-trace_stop.patch:
 tracepath.c |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

--- NEW FILE iputils-20020927-trace_stop.patch ---
--- iputils/tracepath.c.orig-mildew	2006-06-24 03:18:31.000000000 +0200
+++ iputils/tracepath.c	2006-06-24 16:25:14.000000000 +0200
@@ -76,6 +76,7 @@
 	int sndhops;
 	int progress = -1;
 	int broken_router;
+	int target_answ = 0;
 	
 restart:
 	memset(&rcvbuf, -1, sizeof(rcvbuf));
@@ -141,6 +142,9 @@
 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
 
 		inet_ntop(AF_INET, &sin->sin_addr, abuf, sizeof(abuf));
+		
+		if (sin->sin_addr.s_addr == target.sin_addr.s_addr)
+			target_answ = 1;
 
 		if (sndhops>0)
 			printf("%2d:  ", sndhops);
@@ -188,6 +192,17 @@
 		mtu = e->ee_info;
 		progress = mtu;
 		break;
+	case EHOSTUNREACH:
+		if (!target_answ) {
+			if (e->ee_origin == SO_EE_ORIGIN_ICMP &&
+			    e->ee_type == 11 &&
+		   	    e->ee_code == 0) {
+		   	    	printf("\n");
+		   	    	break;
+			}
+			printf("!H\n");
+			return 0;
+		}
 	case ECONNREFUSED:
 		printf("reached\n");
 		hops_to = sndhops<0 ? ttl : sndhops;
@@ -196,15 +211,7 @@
 	case EPROTO:
 		printf("!P\n");
 		return 0;
-	case EHOSTUNREACH:
-		if (e->ee_origin == SO_EE_ORIGIN_ICMP &&
-		    e->ee_type == 11 &&
-		    e->ee_code == 0) {
-			printf("\n");
-			break;
-		}
-		printf("!H\n");
-		return 0;
+
 	case ENETUNREACH:
 		printf("!N\n");
 		return 0;
@@ -319,7 +326,7 @@
 	if (p) 
 		base_port = atoi(p+1);
 	else
-		base_port = 44444;
+		base_port = 33434; // IANA assigned port
 
 	on = IP_PMTUDISC_DO;
 	if (setsockopt(fd, SOL_IP, IP_MTU_DISCOVER, &on, sizeof(on))) {


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- iputils.spec	29 Mar 2006 13:13:29 -0000	1.38
+++ iputils.spec	10 Jul 2006 07:33:23 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 37
+Release: 38
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -30,6 +30,8 @@
 Patch20: iputils-gcc41.patch
 Patch21: iputils-ping_cleanup.patch
 Patch22: iputils-ifenslave.patch
+Patch23: iputils-20020927-trace_stop.patch
+
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
@@ -68,6 +70,7 @@
 %patch20 -p1 -b .gcc41
 %patch21 -p1 -b .cleanup
 %patch22 -p1 -b .addr
+%patch23 -p1 -b .trace_stop
 
 %build
 %ifarch s390 s390x
@@ -167,6 +170,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> - 20020927-38
+- tracepath doesn't continue past destination host (#174032) <mildew at gmail.com>
+
 * Wed Mar 29 2006 Radek Vok??l <rvokal at redhat.com> - 20020927-37
 - fix ifenslave, shows interface addresses
 - add RPM_OPT_FLAGS to ifenslave



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:42:53 -0400
Subject: rpms/gawk/devel gawk.spec,1.38,1.39
Message-ID: <200607100742.k6A7grEQ016940@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16911

Modified Files:
	gawk.spec 
Log Message:
numeric conversion bug fix


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gawk.spec	23 Jun 2006 16:16:32 -0000	1.38
+++ gawk.spec	10 Jul 2006 07:42:50 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 8
+Release: 9
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -23,6 +23,8 @@
 Patch7: gawk-3.1.5-internal.patch
 # 194214 - gawk coredumps on syntax error
 Patch8: gawk-3.1.5-syntaxerror.patch
+# http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
+Patch9: gawk-3.1.5-numflags.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -90,6 +92,10 @@
 %{_datadir}/awk
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-9
+- fix numeric conversion problem (patch by Aharon Robbins)
+  http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
+
 * Fri Jun 23 2006 Karel Zak <kzak at redhat.com> 3.1.5-8
 - fix #194214 - gawk coredumps on syntax error (patch by Aharon Robbins)
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:43:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:43:12 -0400
Subject: rpms/gawk/devel gawk-3.1.5-numflags.patch,NONE,1.1
Message-ID: <200607100743.k6A7hCUP017088@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17059

Added Files:
	gawk-3.1.5-numflags.patch 
Log Message:
numeric conversion bug fix

gawk-3.1.5-numflags.patch:
 eval.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gawk-3.1.5-numflags.patch ---
Tue Jul  4 22:43:05 2006  Arnold D. Robbins  <arnold at skeeve.com>

    * eval.c (interpret): Node_assign_concat case: Turn off NUMBER and NUMCUR
    flags in result.  Sheesh. Thanks to <Heiner.Marxen at DrB.Insel.DE> for finding
    the problem.

--- gawk-3.1.5/eval.c.numflags	2006-07-10 09:36:26.000000000 +0200
+++ gawk-3.1.5/eval.c	2006-07-10 09:36:41.000000000 +0200
@@ -1193,6 +1193,7 @@
 			unref(*lhs);
 			*lhs = make_str_node(nval, l->stlen + r->stlen, ALREADY_MALLOCED);
 		}
+		(*lhs)->flags &= ~(NUMCUR|NUMBER);
 		free_temp(r);
 
 		if (after_assign)



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:47:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:47:52 -0400
Subject: rpms/gawk/devel gawk.spec,1.39,1.40
Message-ID: <200607100747.k6A7lqWC002493@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31639

Modified Files:
	gawk.spec 
Log Message:
fix previous incomplete commit...


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gawk.spec	10 Jul 2006 07:42:50 -0000	1.39
+++ gawk.spec	10 Jul 2006 07:47:49 -0000	1.40
@@ -44,6 +44,7 @@
 %patch6 -p1 -b .wconcat
 %patch7 -p1 -b .internal
 %patch8 -p1 -b .syntaxerror
+%patch9 -p1 -b .numflag
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:52:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:52:31 -0400
Subject: rpms/nc/devel nc-1.84-upd_stop.patch,NONE,1.1 nc.spec,1.26,1.27
Message-ID: <200607100752.k6A7qVaK011690@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11676

Modified Files:
	nc.spec 
Added Files:
	nc-1.84-upd_stop.patch 
Log Message:
- stop hanging when used as a UDP client (#188976) <varmojfekoj at gmail.com>

nc-1.84-upd_stop.patch:
 netcat.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE nc-1.84-upd_stop.patch ---
--- nc/netcat.c.udp_stop	2006-07-10 09:46:00.000000000 +0200
+++ nc/netcat.c	2006-07-10 09:49:16.000000000 +0200
@@ -714,6 +714,9 @@
 			pfd[0].fd = -1;
 			pfd[0].events = 0;
 		}
+		else if (pfd[0].revents & POLLERR)
+			if (write(nfd, "", 1) == -1)
+			    warn("Write error");
 
 		if (!dflag) {
 		    if(pfd[1].revents & POLLIN) {


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nc.spec	6 Mar 2006 16:22:02 -0000	1.26
+++ nc.spec	10 Jul 2006 07:52:28 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 4
+Release: 5
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -9,6 +9,7 @@
 Patch2: nc-1.82-reuseaddr.patch
 Patch3: nc-gcc_signess.patch
 Patch4: nc-1.84-connect_with_timeout.patch
+Patch5: nc-1.84-upd_stop.patch
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-root
@@ -35,6 +36,7 @@
 %patch2 -p1 -b .reuseaddr
 %patch3 -p1 -b .gcc
 %patch4 -p1 -b .timeout
+%patch5 -p1 -b .udp_stop
 
 %build
 gcc $RPM_OPT_FLAGS -Werror `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
@@ -56,6 +58,9 @@
 %doc README scripts
 
 %changelog
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 1.84-5
+- stop hanging when used as a UDP client (#188976) <varmojfekoj at gmail.com>
+
 * Mon Mar 06 2006 Radek Vok??l <rvokal at redhat.com> 1.84-4
 - timeout works also for connect (#182736)
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 07:58:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 03:58:23 -0400
Subject: rpms/gawk/FC-5 gawk-3.1.5-numflags.patch, NONE,
	1.1 gawk-3.1.5-syntaxerror.patch, NONE, 1.1 gawk.spec, 1.35, 1.36
Message-ID: <200607100758.k6A7wN09011795@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.5-numflags.patch gawk-3.1.5-syntaxerror.patch 
Log Message:
port important patches from FC6 to FC5

gawk-3.1.5-numflags.patch:
 eval.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gawk-3.1.5-numflags.patch ---
Tue Jul  4 22:43:05 2006  Arnold D. Robbins  <arnold at skeeve.com>

    * eval.c (interpret): Node_assign_concat case: Turn off NUMBER and NUMCUR
    flags in result.  Sheesh. Thanks to <Heiner.Marxen at DrB.Insel.DE> for finding
    the problem.

--- gawk-3.1.5/eval.c.numflags	2006-07-10 09:36:26.000000000 +0200
+++ gawk-3.1.5/eval.c	2006-07-10 09:36:41.000000000 +0200
@@ -1193,6 +1193,7 @@
 			unref(*lhs);
 			*lhs = make_str_node(nval, l->stlen + r->stlen, ALREADY_MALLOCED);
 		}
+		(*lhs)->flags &= ~(NUMCUR|NUMBER);
 		free_temp(r);
 
 		if (after_assign)

gawk-3.1.5-syntaxerror.patch:
 awkgram.y |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gawk-3.1.5-syntaxerror.patch ---
Fri Jun 23 15:48:34 2006  Arnold D. Robbins  <arnold at skeeve.com>

    * awkgram.y (subn): At end for `do_sprintf' check, verify that lnode is not NULL
    before using it assign through.

--- gawk-3.1.5/awkgram.y.syntaxerror	2005-07-26 20:07:43.000000000 +0200
+++ gawk-3.1.5/awkgram.y	2006-06-23 17:43:55.000000000 +0200
@@ -2399,7 +2399,8 @@
 	r->subnode = subn;
 	if (r->builtin == do_sprintf) {
 		count_args(r);
-		r->lnode->printf_count = r->printf_count; /* hack */
+		if (r->lnode != NULL)	/* r->lnode set from subn. guard against syntax errors & check it's valid */
+			r->lnode->printf_count = r->printf_count; /* hack */
 	}
 	return r;
 }


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/FC-5/gawk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gawk.spec	14 Feb 2006 08:47:27 -0000	1.35
+++ gawk.spec	10 Jul 2006 07:58:21 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 6.2
+Release: 6.3
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -16,6 +16,10 @@
 Patch4:	gawk-3.1.5-binmode.patch
 Patch5: gawk-3.1.5-num2str.patch
 Patch6: gawk-3.1.5-wconcat.patch
+# 194214 - gawk coredumps on syntax error
+Patch7: gawk-3.1.5-syntaxerror.patch
+# http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
+Patch8: gawk-3.1.5-numflags.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -33,6 +37,8 @@
 %patch4 -p1 -b .binmode
 %patch5 -p1 -b .num2str
 %patch6 -p1 -b .wconcat
+%patch7 -p1 -b .syntaxerror
+%patch8 -p1 -b .numflag
 
 %build
 %configure
@@ -81,6 +87,11 @@
 %{_datadir}/awk
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-6.3
+- fix numeric conversion problem (patch by Aharon Robbins)
+  http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
+- fix #194214 - gawk coredumps on syntax error (patch by Aharon Robbins)
+
 * Tue Feb 14 2006 Karel Zak <kzak at redhat.com> 3.1.5-6.2
 - new version of the gawk-3.1.5-wconcat.patch patch
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 08:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 04:46:17 -0400
Subject: rpms/nc/devel nc-1.84-udp_port_scan.patch, NONE,
	1.1 nc-1.84-udp_stop.patch, NONE, 1.1 nc.spec, 1.27,
	1.28 nc-1.84-upd_stop.patch, 1.1, NONE
Message-ID: <200607100846.k6A8kHkh019367@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18886

Modified Files:
	nc.spec 
Added Files:
	nc-1.84-udp_port_scan.patch nc-1.84-udp_stop.patch 
Removed Files:
	nc-1.84-upd_stop.patch 
Log Message:
- improve UDP port scanning (#159119) <varmojfekoj at gmail.com>

nc-1.84-udp_port_scan.patch:
 netcat.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE nc-1.84-udp_port_scan.patch ---
--- netcat.c.orig	2006-06-27 20:16:41.000000000 +0200
+++ netcat.c	2006-07-02 20:38:45.000000000 +0200
@@ -68,6 +68,8 @@
 #define CONNECTION_FAILED 1
 #define CONNECTION_TIMEOUT 2
 
+#define UDP_SCAN_TIMEOUT 3			/* Seconds */
+
 /* Command Line Options */
 int	dflag;					/* detached, no stdin */
 int	iflag;					/* Interval Flag */
@@ -370,7 +372,7 @@
 				continue;
 
 			ret = 0;
-			if (vflag || zflag) {
+			if ((vflag && !uflag) || zflag) {
 				/* For UDP, make sure we are connected. */
 				if (uflag) {
 					if (udptest(s) == -1) {
@@ -842,15 +844,20 @@
 int
 udptest(int s)
 {
-	int i, ret;
+	int i, t;
 
-	for (i = 0; i <= 3; i++) {
-		if (write(s, "X", 1) == 1)
-			ret = 1;
-		else
-			ret = -1;
+	if ((write(s, "X", 1) != 1) ||
+	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
+		return -1;
+
+	/* Give the remote host some time to reply. */
+	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
+	     i < t; i++) {
+		sleep(1);
+		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
+			return -1;
 	}
-	return (ret);
+	return 1;
 }
 
 void

nc-1.84-udp_stop.patch:
 netcat.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE nc-1.84-udp_stop.patch ---
--- nc/netcat.c.udp_stop	2006-07-10 09:46:00.000000000 +0200
+++ nc/netcat.c	2006-07-10 09:49:16.000000000 +0200
@@ -714,6 +714,9 @@
 			pfd[0].fd = -1;
 			pfd[0].events = 0;
 		}
+		else if (pfd[0].revents & POLLERR)
+			if (write(nfd, "", 1) == -1)
+			    warn("Write error");
 
 		if (!dflag) {
 		    if(pfd[1].revents & POLLIN) {


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nc.spec	10 Jul 2006 07:52:28 -0000	1.27
+++ nc.spec	10 Jul 2006 08:46:14 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 5
+Release: 6
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -9,7 +9,8 @@
 Patch2: nc-1.82-reuseaddr.patch
 Patch3: nc-gcc_signess.patch
 Patch4: nc-1.84-connect_with_timeout.patch
-Patch5: nc-1.84-upd_stop.patch
+Patch5: nc-1.84-udp_stop.patch
+Patch6: nc-1.84-udp_port_scan.patch
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-root
@@ -37,6 +38,7 @@
 %patch3 -p1 -b .gcc
 %patch4 -p1 -b .timeout
 %patch5 -p1 -b .udp_stop
+%patch6 -p0 -b .port_scan
 
 %build
 gcc $RPM_OPT_FLAGS -Werror `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc
@@ -58,10 +60,13 @@
 %doc README scripts
 
 %changelog
-* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 1.84-5
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> - 1.84-6
+- improve UDP port scanning (#159119) <varmojfekoj at gmail.com>
+
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> - 1.84-5
 - stop hanging when used as a UDP client (#188976) <varmojfekoj at gmail.com>
 
-* Mon Mar 06 2006 Radek Vok??l <rvokal at redhat.com> 1.84-4
+* Mon Mar 06 2006 Radek Vok??l <rvokal at redhat.com> - 1.84-4
 - timeout works also for connect (#182736)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.84-3.2


--- nc-1.84-upd_stop.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:11:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:11:25 -0400
Subject: rpms/file/devel file-4.17-powerpoint.patch, NONE, 1.1 file.spec,
	1.50, 1.51
Message-ID: <200607100911.k6A9BOL7005653@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5622

Modified Files:
	file.spec 
Added Files:
	file-4.17-powerpoint.patch 
Log Message:
- fix powerpoint mine (#190373) <vonsch at gmail.com>


file-4.17-powerpoint.patch:
 magic.mime |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE file-4.17-powerpoint.patch ---
--- file-4.17/magic/magic.mime.ppt	2006-06-26 08:57:42.000000000 +0200
+++ file-4.17/magic/magic.mime	2006-07-10 11:05:19.000000000 +0200
@@ -833,7 +833,7 @@
 
 0	string	PO^Q`			application/msword
 
-0	string	\320\317\021\340\241\261\032\341
+0	string	\320\317\021\340\241\261\032\341 application/msword
 >546	string	bjbj			application/msword
 >546	string	jbjb			application/msword
 
@@ -844,7 +844,6 @@
 2112	string	MSWordDoc			application/msword
 
 #0	string	\320\317\021\340\241\261\032\341	application/powerpoint
-0	string	\320\317\021\340\241\261\032\341	application/msword
 
 0       string  #\ PaCkAgE\ DaTaStReAm  application/x-svr4-package
 


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- file.spec	24 May 2006 14:37:33 -0000	1.50
+++ file.spec	10 Jul 2006 09:11:22 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 4
+Release: 5
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -20,6 +20,7 @@
 Patch15: file-4.17-mp3_flac.patch
 Patch16: file-4.17-oracle.patch
 Patch17: file-4.17-clamav.patch
+Patch18: file-4.17-powerpoint.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -46,6 +47,7 @@
 %patch15 -p1 -b .mp3
 %patch16 -p1 -b .oracle
 %patch17 -p1 -b .clamav
+%patch18 -p1 -b .powerpoint
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -91,6 +93,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 4.17-5
+- fix powerpoint mine (#190373) <vonsch at gmail.com>
+
 * Wed May 24 2006 Radek Vok??l <rvokal at redhat.com> 4.17-4
 - /usr/share/file is owned by package (#192858)
 - fix magic for Clamav files (#192406)



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:14:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:14:33 -0400
Subject: rpms/libX11/devel .cvsignore, 1.7, 1.8 libX11.spec, 1.21,
	1.22 sources, 1.7, 1.8 libX11-1.0.1-setuid.diff, 1.1, NONE
Message-ID: <200607100914.k6A9EXRI006704@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6670

Modified Files:
	.cvsignore libX11.spec sources 
Removed Files:
	libX11-1.0.1-setuid.diff 
Log Message:
* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6
- Updated libX11 to version 1.0.3
- Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release.
- Added 'dist' tag to "Release:"



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Jun 2006 07:16:40 -0000	1.7
+++ .cvsignore	10 Jul 2006 09:14:31 -0000	1.8
@@ -1,2 +1,3 @@
 libX11-1.0.1.tar.bz2
 libX11-1.0.2.tar.bz2
+libX11-1.0.3.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libX11.spec	28 Jun 2006 10:38:30 -0000	1.21
+++ libX11.spec	10 Jul 2006 09:14:31 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.0.2
+Version: 1.0.3%{?dist}
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -10,7 +10,6 @@
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
-Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -49,10 +48,6 @@
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
 
-# FIXME: For some reason, upstream supplies this patch, but hasn't checked it
-# into CVS/git/whatever yet it seems, so upstream is potentially insecure.
-%patch1 -p1 -b .setuid
-
 # Disable static library creation by default.
 %define with_static 0
 
@@ -244,6 +239,11 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6
+- Updated libX11 to version 1.0.3
+- Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release.
+- Added 'dist' tag to "Release:"
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
 - Updated libX11 to version 1.0.2
 - Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jun 2006 07:16:40 -0000	1.7
+++ sources	10 Jul 2006 09:14:31 -0000	1.8
@@ -1,2 +1 @@
-58f0537f21183e27149cf906a1b6bef9  libX11-1.0.1.tar.bz2
-86a16bdc09b42b2e018dd665c23ca21c  libX11-1.0.2.tar.bz2
+60b787a812c92d33f71860e4e19cb59d  libX11-1.0.3.tar.bz2


--- libX11-1.0.1-setuid.diff DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:23:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:23:38 -0400
Subject: rpms/libXfont/devel .cvsignore, 1.7, 1.8 libXfont.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200607100923.k6A9NcCp024378@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24337

Modified Files:
	.cvsignore libXfont.spec sources 
Log Message:
* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1
- Update to 1.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Apr 2006 23:12:51 -0000	1.7
+++ .cvsignore	10 Jul 2006 09:23:36 -0000	1.8
@@ -1 +1,2 @@
 libXfont-1.1.0.tar.bz2
+libXfont-1.2.0.tar.bz2


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libXfont.spec	28 Jun 2006 10:42:19 -0000	1.18
+++ libXfont.spec	10 Jul 2006 09:23:36 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
-Version: 1.1.0
-Release: 3
+Version: 1.2.0
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -66,7 +66,7 @@
 %files
 %defattr(-,root,root,-)
 # FIXME:  Missing README/INSTALL - should file bug upstream.
-#%doc AUTHORS COPYING README INSTALL ChangeLog
+#%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXfont.so.1
 %{_libdir}/libXfont.so.1.4.1
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1
+- Update to 1.2.0
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
 - Remove package ownership of mandir/libdir/etc.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Apr 2006 23:12:51 -0000	1.8
+++ sources	10 Jul 2006 09:23:36 -0000	1.9
@@ -1 +1 @@
-d40f0da6cb2b3017ec0f5c44d5dc9821  libXfont-1.1.0.tar.bz2
+038315ade283d8da92422baebac553a2  libXfont-1.2.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:25:05 -0400
Subject: rpms/libX11/devel libX11.spec,1.22,1.23
Message-ID: <200607100925.k6A9P53M024969@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24933

Modified Files:
	libX11.spec 
Log Message:
oops, move dist tag from Version to Release


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libX11.spec	10 Jul 2006 09:14:31 -0000	1.22
+++ libX11.spec	10 Jul 2006 09:25:03 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.0.3%{?dist}
-Release: 1
+Version: 1.0.3
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:28:03 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.19,1.20
Message-ID: <200607100928.k6A9S3Tt026121@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26089

Modified Files:
	libXfont.spec 
Log Message:
fix changelog


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXfont.spec	10 Jul 2006 09:23:36 -0000	1.19
+++ libXfont.spec	10 Jul 2006 09:28:01 -0000	1.20
@@ -98,7 +98,7 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
-* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1.fc6
 - Update to 1.2.0
 
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:29:15 -0400
Subject: rpms/libX11/devel libX11.spec,1.23,1.24
Message-ID: <200607100929.k6A9TF4D026640@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26606

Modified Files:
	libX11.spec 
Log Message:
fix changelog date after the fact... oops


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libX11.spec	10 Jul 2006 09:25:03 -0000	1.23
+++ libX11.spec	10 Jul 2006 09:29:13 -0000	1.24
@@ -239,7 +239,7 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
-* Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6
 - Updated libX11 to version 1.0.3
 - Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release.
 - Added 'dist' tag to "Release:"



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:30:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:30:31 -0400
Subject: rpms/procps/devel procps-3.2.7-selinux.patch, NONE,
	1.1 procps-3.2.7-top-remcpu.patch, NONE,
	1.1 procps-3.2.7-vmstat-cpusteal.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 procps.spec, 1.47, 1.48 sources, 1.12,
	1.13 procps-3.2.3-slabtop-man.patch, 1.1,
	NONE procps-3.2.5-selinux.patch, 1.1,
	NONE procps-3.2.5-top-remcpu.patch, 1.2,
	NONE procps-3.2.6-cpu-steal.patch, 1.1,
	NONE procps-3.2.6-watch-timing.patch, 1.1, NONE
Message-ID: <200607100930.k6A9UVoL027093@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	.cvsignore procps.spec sources 
Added Files:
	procps-3.2.7-selinux.patch procps-3.2.7-top-remcpu.patch 
	procps-3.2.7-vmstat-cpusteal.patch 
Removed Files:
	procps-3.2.3-slabtop-man.patch procps-3.2.5-selinux.patch 
	procps-3.2.5-top-remcpu.patch procps-3.2.6-cpu-steal.patch 
	procps-3.2.6-watch-timing.patch 
Log Message:
upgrade to 3.2.7

procps-3.2.7-selinux.patch:
 parser.c |    2 +-
 ps.1     |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-selinux.patch ---
--- procps-3.2.7/ps/parser.c.selinux	2006-06-25 09:14:58.000000000 +0200
+++ procps-3.2.7/ps/parser.c	2006-07-10 10:14:22.000000000 +0200
@@ -231,7 +231,7 @@
     // In the meantime, please do not add to it. The list is
     // intended to ONLY contain flags defined by the POSIX and UNIX
     // standards published by The Open Group, IEEE, and ISO.
-    if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1;  // dude, -Z ain't in POSIX
+    if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1;  // dude, -Z ain't in POSIX
 
     switch(*flagptr){
     case 'A':
--- procps-3.2.7/ps/ps.1.selinux	2005-10-30 03:44:03.000000000 +0100
+++ procps-3.2.7/ps/ps.1	2006-07-10 10:08:12.000000000 +0200
@@ -450,6 +450,9 @@
 Do not show flags; show rss in place of addr.
 This option can only be used with \fB\-l\fR.
 
+.opt \-Z
+display security context format (SELinux, etc.)
+
 .opt \-\-format \ format
 user\-defined format.  Identical to \fB\-o\fR and \fBo\fR.
 

procps-3.2.7-top-remcpu.patch:
 top.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 deletions(-)

--- NEW FILE procps-3.2.7-top-remcpu.patch ---
--- procps-3.2.7/top.c.remcpu	2006-07-10 10:41:11.000000000 +0200
+++ procps-3.2.7/top.c	2006-07-10 10:41:35.000000000 +0200
@@ -912,6 +912,7 @@
 static CPU_t *cpus_refresh (CPU_t *cpus)
 {
    static FILE *fp = NULL;
+   static int cpu_max;
    int i;
    int num;
    // enough for a /proc/stat CPU line (not the intr line)
@@ -926,24 +927,29 @@
                can hold tics representing the /proc/stat cpu summary (the first
                line read) -- that slot supports our View_CPUSUM toggle */
       cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
+      cpu_max = Cpu_tot;
    }
+   else if (cpu_max > Cpu_tot)
+      /* move saved CUPs summary to cpu_max possition */
+      memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t));
+   
    rewind(fp);
    fflush(fp);
 
    // first value the last slot with the cpu summary line
    if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
-   cpus[Cpu_tot].x = 0;  // FIXME: can't tell by kernel version number
-   cpus[Cpu_tot].y = 0;  // FIXME: can't tell by kernel version number
-   cpus[Cpu_tot].z = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].x = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].y = 0;  // FIXME: can't tell by kernel version number
+   cpus[cpu_max].z = 0;  // FIXME: can't tell by kernel version number
    num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
-      &cpus[Cpu_tot].u,
-      &cpus[Cpu_tot].n,
-      &cpus[Cpu_tot].s,
-      &cpus[Cpu_tot].i,
-      &cpus[Cpu_tot].w,
-      &cpus[Cpu_tot].x,
-      &cpus[Cpu_tot].y,
-      &cpus[Cpu_tot].z
+      &cpus[cpu_max].u,
+      &cpus[cpu_max].n,
+      &cpus[cpu_max].s,
+      &cpus[cpu_max].i,
+      &cpus[cpu_max].w,
+      &cpus[cpu_max].x,
+      &cpus[cpu_max].y,
+      &cpus[cpu_max].z
    );
    if (num < 4)
          std_err("failed /proc/stat read");
@@ -955,7 +961,7 @@
    }
 
    // now value each separate cpu's tics
-   for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) {
+   for (i = 0; ; i++) {
       if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
       cpus[i].x = 0;  // FIXME: can't tell by kernel version number
       cpus[i].y = 0;  // FIXME: can't tell by kernel version number
@@ -964,9 +970,35 @@
          &cpus[i].id,
          &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z
       );
-      if (num < 4)
-            std_err("failed /proc/stat read");
+      if (num < 4) {
+	 Cpu_tot = i;
+	 break;
+      }
+      if (i == cpu_max - 1) {
+	 // Bump cpu_max and extend cpus
+	 cpu_max++;
+	 cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t));
+	 if (!cpus) std_err("realloc failed");
+	 memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t));
+      }
+   }
+
+   if (cpu_max > Cpu_tot)
+      memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t));
+
+   // and just in case we're 2.2.xx compiled without SMP support...
+   if (Cpu_tot == 1) {
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
+      cpus[0].z = cpus[1].z;
    }
+   
    return cpus;
 }
 

procps-3.2.7-vmstat-cpusteal.patch:
 vmstat.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE procps-3.2.7-vmstat-cpusteal.patch ---
--- procps-3.2.7/vmstat.c.steal	2006-07-10 10:49:49.000000000 +0200
+++ procps-3.2.7/vmstat.c	2006-07-10 10:54:03.000000000 +0200
@@ -150,15 +150,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_header(void){
-  printf("procs -----------memory---------- ---swap-- -----io---- -system-- ----cpu----\n");
+  printf("procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------\n");
   printf(
-    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s\n",
+    "%2s %2s %6s %6s %6s %6s %4s %4s %5s %5s %4s %4s %2s %2s %2s %2s %2s\n",
     "r","b",
     "swpd", "free", a_option?"inact":"buff", a_option?"active":"cache",
     "si","so",
     "bi","bo",
     "in","cs",
-    "us","sy","id","wa"
+    "us","sy","id","wa", "st"
   );
 }
 
@@ -173,7 +173,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static void new_format(void) {
-  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u\n";
+  const char format[]="%2u %2u %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u %2u\n";
   unsigned int tog=0; /* toggle switch for cleaner code */
   unsigned int i;
   unsigned int hz = Hertz;
@@ -217,8 +217,8 @@
 	 (unsigned)( (100*duse                    + divo2) / Div ),
 	 (unsigned)( (100*dsys                    + divo2) / Div ),
 	 (unsigned)( (100*didl                    + divo2) / Div ),
-	 (unsigned)( (100*diow                    + divo2) / Div ) /* ,
-	 (unsigned)( (100*dstl                    + divo2) / Div ) */
+	 (unsigned)( (100*diow                    + divo2) / Div ),
+	 (unsigned)( (100*dstl                    + divo2) / Div )
   );
 
   for(i=1;i<num_updates;i++) { /* \\\\\\\\\\\\\\\\\\\\ main loop ////////////////// */
@@ -266,8 +266,8 @@
 	   (unsigned)( (100*duse+divo2)/Div ), /*us*/
 	   (unsigned)( (100*dsys+divo2)/Div ), /*sy*/
 	   (unsigned)( (100*didl+divo2)/Div ), /*id*/
-	   (unsigned)( (100*diow+divo2)/Div )/*, //wa
-	   (unsigned)( (100*dstl+divo2)/Div )  //st  */
+	   (unsigned)( (100*diow+divo2)/Div ), //wa
+	   (unsigned)( (100*dstl+divo2)/Div )  //st
     );
   }
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Nov 2005 10:37:33 -0000	1.12
+++ .cvsignore	10 Jul 2006 09:30:28 -0000	1.13
@@ -1 +1 @@
-procps-3.2.6.tar.gz
+procps-3.2.7.tar.gz


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- procps.spec	1 Jun 2006 11:24:50 -0000	1.47
+++ procps.spec	10 Jul 2006 09:30:28 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
-Version: 3.2.6
-Release: 4
+Version: 3.2.7
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -9,7 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /bin/rm /sbin/ldconfig
 
-Patch1: procps-3.2.5-selinux.patch
+Patch1: procps-3.2.7-selinux.patch
 Patch2: procps-3.1.15-misc.patch
 Patch3: procps-3.2.3-FAQ.patch
 Patch4: procps-3.2.1-selinux-workaround.patch
@@ -22,19 +22,15 @@
 Patch10: procps-3.2.5-top-rc.patch
 # 161303 - 'top' failed when remove cpus
 # 186017 - Top "Cpu0" line never updates on single processor machine
-Patch11: procps-3.2.5-top-remcpu.patch
+Patch11: procps-3.2.7-top-remcpu.patch
 # Selinux
 Patch12: procps-3.2.6-libselinux.patch
-# 168444 - Memory usage conflicts with /proc/meminfo 
-Patch13: procps-3.2.3-slabtop-man.patch
 # 177453 - for VIRT use proc->vm_size rather then proc->size (workaround)
 Patch14: procps-3.2.6-top-env-vmsize.patch
 # 174619 - workaround for reliable Cpu(s) data in the first loop
 Patch15: procps-3.2.6-top-env-cpuloop.patch
 # 185299 - cpu steal time support
-Patch16: procps-3.2.6-cpu-steal.patch
-# 191493 - watch -n doesn't handle large integers properly
-Patch17: procps-3.2.6-watch-timing.patch
+Patch16: procps-3.2.7-vmstat-cpusteal.patch
 
 BuildRequires: ncurses-devel
 
@@ -73,11 +69,9 @@
 %patch10 -p1 -b .rc
 %patch11 -p1 -b .remcpu
 %patch12 -p1 -b .libselinux
-%patch13 -p1 -b .slabman
 %patch14 -p1 -b .env-vmsize
 %patch15 -p1 -b .env-cpuloop
 %patch16 -p1 -b .steal
-%patch17 -p1 -b .timing
 
 cp %SOURCE1 .
 
@@ -115,6 +109,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.7-1
+- upgrade to 3.2.7 (and sync patches)
+
 * Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.6-4
 - fix #191493 - watch -n doesn't handle large integers properly
 - fix #186017 - top "Cpu0" line never updates on single processor machine


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Nov 2005 10:37:33 -0000	1.12
+++ sources	10 Jul 2006 09:30:28 -0000	1.13
@@ -1 +1 @@
-7ce39ea27d7b3da0e8ad74dd41d06783  procps-3.2.6.tar.gz
+f490bca772b16472962c7b9f23b1e97d  procps-3.2.7.tar.gz


--- procps-3.2.3-slabtop-man.patch DELETED ---


--- procps-3.2.5-selinux.patch DELETED ---


--- procps-3.2.5-top-remcpu.patch DELETED ---


--- procps-3.2.6-cpu-steal.patch DELETED ---


--- procps-3.2.6-watch-timing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:30:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:30:41 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.38,1.39
Message-ID: <200607100930.k6A9UfZQ027189@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27141

Modified Files:
	openhpi.spec 
Log Message:
- Rebuilt due to missing libsysfs



Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openhpi.spec	7 Jun 2006 14:29:28 -0000	1.38
+++ openhpi.spec	10 Jul 2006 09:30:38 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.4.1
-Release: 4
+Release: 5
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
+- Rebuilt due to missing libsysfs
+
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-4
 - Rebuilt with final memset patch
 - Added missing pkgconfig buildprereq (#191935)



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:32:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:32:46 -0400
Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.7,1.8
Message-ID: <200607100932.k6A9WkBZ027612@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	xorg-x11-filesystem.spec 
Log Message:
* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
- Reword package description for (#189648)



Index: xorg-x11-filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-filesystem.spec	28 Jun 2006 10:33:16 -0000	1.7
+++ xorg-x11-filesystem.spec	10 Jul 2006 09:32:35 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: X.Org X11 filesystem layout
 Name: xorg-x11-filesystem
 Version: 7.1
-Release: 1
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Base
 URL: http://www.redhat.com
@@ -17,7 +17,7 @@
 release.  This package must be installed during OS installation
 or upgrade, in order to force the creation of these directories,
 and replace any legacy symbolic links that might be present in old
-locations, which could prevent proper upgrade from occuring.
+locations, which could result in upgrade failures.
 
 %prep
 %install
@@ -82,6 +82,9 @@
 %{_bindir}/xorg-x11-filesystem-upgrade
 
 %changelog
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
+- Reword package description for (#189648)
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bumped version to 7.1-1 and rebuilt for X11R7.1.
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:36:54 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#106795.patch, NONE,
	1.1 kdelibs-3.5.3-kde#123307.patch, NONE, 1.1 kdelibs.spec,
	1.152, 1.153
Message-ID: <200607100936.k6A9assD028350@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#106795.patch kdelibs-3.5.3-kde#123307.patch 
Log Message:
- apply upstream patches,
    #123307 - Find previous does nothing sometimes
    #106795 - konqueror crash



kdelibs-3.5.3-kde#106795.patch:
 html_baseimpl.cpp |   19 +++++++++++++++----
 html_baseimpl.h   |    3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#106795.patch ---
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 559959)
+++ khtml/html/html_baseimpl.cpp	(Revision 559960)
@@ -445,10 +445,21 @@
     noresize = false;
 
     m_resizing = false;
+
+    m_onLoad = m_onUnLoad = 0;
 }
 
 HTMLFrameSetElementImpl::~HTMLFrameSetElementImpl()
 {
+    //### this is likely not quite right since we may be effectively "overriding" some old value,
+    //which needs to be recomputed, but this is better than crashing...
+    if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+
+    if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+
+
     delete [] m_rows;
     delete [] m_cols;
 }
@@ -491,12 +502,12 @@
             frameborder = false;
         break;
     case ATTR_ONLOAD:
-        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT,
-	    getDocument()->createHTMLEventListener(attr->value().string(), "onload", this));
+        m_onLoad = getDocument()->createHTMLEventListener(attr->value().string(), "onload", this);
+        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, m_onLoad);
         break;
     case ATTR_ONUNLOAD:
-        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT,
-	    getDocument()->createHTMLEventListener(attr->value().string(), "onunload", this));
+        m_onUnLoad = getDocument()->createHTMLEventListener(attr->value().string(), "onunload", this);
+        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, m_onUnLoad);
         break;
     default:
         HTMLElementImpl::parseAttribute(attr);
Index: khtml/html/html_baseimpl.h
===================================================================
--- khtml/html/html_baseimpl.h	(Revision 559959)
+++ khtml/html/html_baseimpl.h	(Revision 559960)
@@ -149,6 +149,9 @@
     bool frameBorderSet : 1;
     bool noresize : 1;
     bool m_resizing : 1;  // is the user resizing currently
+    
+    EventListener* m_onLoad;
+    EventListener* m_onUnLoad;
 };
 
 // -------------------------------------------------------------------------

kdelibs-3.5.3-kde#123307.patch:
 katesearch.cpp |   36 ++++++++++++++++++++++++++++++------
 katesearch.h   |    4 ++--
 2 files changed, 32 insertions(+), 8 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#123307.patch ---
Index: kate/part/katesearch.cpp
===================================================================
--- kate/part/katesearch.cpp	(Revision 558716)
+++ kate/part/katesearch.cpp	(Revision 558717)
@@ -216,7 +216,7 @@
   search( searchFlags );
 }
 
-void KateSearch::findAgain( bool back )
+void KateSearch::findAgain( bool reverseDirection )
 {
   SearchFlags searchFlags;
   searchFlags.caseSensitive = KateViewConfig::global()->searchFlags() & KFindDialog::CaseSensitive;
@@ -231,7 +231,9 @@
   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
   searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
 
-  searchFlags.backward = searchFlags.backward != back;
+  if (reverseDirection)
+    searchFlags.backward = !searchFlags.backward;
+
   searchFlags.fromBeginning = false;
   searchFlags.prompt = true; // ### why is the above assignment there?
   s.cursor = getCursor();
Index: kate/part/katesearch.h
===================================================================
--- kate/part/katesearch.h	(Revision 558716)
+++ kate/part/katesearch.h	(Revision 558717)
@@ -113,7 +113,7 @@
      * @param flags OR'd combination of KFindDialog::Options
      */
     void replace( const QString &pattern, const QString &replacement, long flags );
-    void findAgain( bool back );
+    void findAgain( bool reverseDirection );
 
   private slots:
     void replaceSlot();
Index: kate/part/katesearch.cpp
===================================================================
--- kate/part/katesearch.cpp	(Revision 559492)
+++ kate/part/katesearch.cpp	(Revision 559493)
@@ -141,7 +141,7 @@
     s.selEnd   = KateTextCursor( m_view->selEndLine(),   m_view->selEndCol()   );
     s.cursor   = s.flags.backward ? s.selEnd : s.selBegin;
   } else {
-    s.cursor = getCursor();
+    s.cursor = getCursor( searchFlags );
   }
 
   s.wrappedEnd = s.cursor;
@@ -207,7 +207,7 @@
     s.selEnd   = KateTextCursor( m_view->selEndLine(), m_view->selEndCol()   );
     s.cursor   = s.flags.backward ? s.selEnd : s.selBegin;
   } else {
-    s.cursor = getCursor();
+    s.cursor = getCursor( searchFlags );
   }
 
   s.wrappedEnd = s.cursor;
@@ -236,8 +236,8 @@
 
   searchFlags.fromBeginning = false;
   searchFlags.prompt = true; // ### why is the above assignment there?
-  s.cursor = getCursor();
 
+  s.cursor = getCursor( searchFlags );
   search( searchFlags );
 }
 
@@ -547,8 +547,15 @@
   return str;
 }
 
-KateTextCursor KateSearch::getCursor()
+KateTextCursor KateSearch::getCursor( SearchFlags flags )
 {
+  if (flags.backward && !flags.selected && view()->hasSelection())
+  {
+    // We're heading backwards (and not within a selection),
+    // the selection might start before the cursor.
+    return KMIN( KateTextCursor(view()->selStartLine(), view()->selStartCol()),
+                 KateTextCursor(view()->cursorLine(), view()->cursorColumnReal()));
+  }
   return KateTextCursor(view()->cursorLine(), view()->cursorColumnReal());
 }
 
@@ -586,6 +593,21 @@
   //kdDebug() << "Searching at " << line << ", " << col << endl;
 //   kdDebug()<<"KateSearch::doSearch: "<<line<<", "<<col<<", "<<backward<<endl;
 
+  if (backward)
+  {
+    KateDocCursor docCursor(line, col, doc());
+
+    // If we're at the top of the document, we're not gonna find anything, so bail.
+    if (docCursor.line() == 0 && docCursor.col() == 0)
+      return false;
+
+    // Move one step backward before searching, if this is a "find again", we don't
+    // want to find the same match.
+    docCursor.moveBackward(1);
+    line = docCursor.line();
+    col = docCursor.col();
+  }
+
   do {
       if( regExp ) {
         m_re = QRegExp( text, caseSensitive );
Index: kate/part/katesearch.h
===================================================================
--- kate/part/katesearch.h	(Revision 559492)
+++ kate/part/katesearch.h	(Revision 559493)
@@ -139,7 +139,7 @@
     void skipOne();
 
     QString getSearchText();
-    KateTextCursor getCursor();
+    KateTextCursor getCursor( SearchFlags flags );
     bool doSearch( const QString& text );
     void exposeFound( KateTextCursor &cursor, int slen );
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdelibs.spec	4 Jul 2006 19:24:30 -0000	1.152
+++ kdelibs.spec	10 Jul 2006 09:36:50 -0000	1.153
@@ -19,7 +19,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 6
+Release: 7
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -61,6 +61,8 @@
 Patch109: kdelibs-3.5.3-kde#67849.patch
 Patch110: kdelibs-3.5.3-kde#81806.patch
 Patch111: kdelibs-3.5.3-kde#128760.patch
+Patch112: kdelibs-3.5.3-kde#123307.patch
+Patch113: kdelibs-3.5.3-kde#106795.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -202,6 +204,8 @@
 %patch109 -p0 -b .kde#67849
 %patch110 -p0 -b .kde#81806
 %patch111 -p0 -b .kde#128760
+%patch112 -p0 -b .kde#130252
+%patch113 -p0 -b .kde#106795
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -425,6 +429,11 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Mon Jul 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
+- apply upstream patches,
+    #123307 - Find previous does nothing sometimes
+    #106795 - konqueror crash
+
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
 - apply upstream patches, fix #128940/#81806/#128760
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:37:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:37:19 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.39,1.40
Message-ID: <200607100937.k6A9bJhg028468@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28237

Modified Files:
	openhpi.spec 
Log Message:
- Rebuilt due to switch from sysfsutils to libsysfs



Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- openhpi.spec	10 Jul 2006 09:30:38 -0000	1.39
+++ openhpi.spec	10 Jul 2006 09:37:16 -0000	1.40
@@ -11,7 +11,7 @@
 Patch3: openhpi-2.4.1-memset.patch
 Patch4: openhpi-2.4.1-install.patch
 BuildRoot: /var/tmp/%{name}-root
-BuildRequires: sysfsutils-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
+BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel
 BuildRequires: OpenIPMI-devel, pkgconfig
 ExcludeArch: ia64
@@ -96,7 +96,7 @@
 
 %changelog
 * Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
-- Rebuilt due to missing libsysfs
+- Rebuilt due to switch from sysfsutils to libsysfs
 
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-4
 - Rebuilt with final memset patch



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:41:24 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xorg-x11-xtrans-devel.spec, 1.15,
	1.16 xtrans-1.0.0-setuid.diff, 1.1, NONE
Message-ID: <200607100941.k6A9fOlw029859@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	.cvsignore sources xorg-x11-xtrans-devel.spec 
Removed Files:
	xtrans-1.0.0-setuid.diff 
Log Message:
* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1.fc6
- Update to xtrans-1.0.1
- Remove xtrans-1.0.0-setuid.diff as it is included in 1.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Dec 2005 10:22:03 -0000	1.6
+++ .cvsignore	10 Jul 2006 09:41:22 -0000	1.7
@@ -1 +1,2 @@
 xtrans-1.0.0.tar.bz2
+xtrans-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 19:11:39 -0000	1.6
+++ sources	10 Jul 2006 09:41:22 -0000	1.7
@@ -1 +1 @@
-da1628280f945e8d48a4c2e80ee28873  xtrans-1.0.0.tar.bz2
+9b2515bf5ff632cf07bc9901e7274d0f  xtrans-1.0.1.tar.bz2


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xtrans-devel.spec	28 Jun 2006 10:22:04 -0000	1.15
+++ xorg-x11-xtrans-devel.spec	10 Jul 2006 09:41:22 -0000	1.16
@@ -5,8 +5,8 @@
 
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
-Version: 1.0.0
-Release: 4
+Version: 1.0.1
+Release: 1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -14,11 +14,6 @@
 
 Source0: ftp://ftp.x.org/pub/individual/lib/xtrans-%{version}.tar.bz2
 
-# NOTE: Fix for http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195555 which
-# at the time I'm committing this to Fedora development, is only a "potential"
-# security issue, and does not yet have any known exploit vector.
-Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xtrans-1.0.0-setuid.diff
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 
@@ -29,7 +24,6 @@
 
 %prep
 %setup -q -n xtrans-%{version}
-%patch0 -p0 -b .setuid
 
 %build
 
@@ -63,6 +57,10 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1.fc6
+- Update to xtrans-1.0.1
+- Remove xtrans-1.0.0-setuid.diff as it is included in 1.0.1
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
 - Added xtrans-1.0.0-setuid.diff to fix potential security issue (#195555)
 - Use setup -n instead of -c, and remove extraneous calls to cd from build


--- xtrans-1.0.0-setuid.diff DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:45:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:45:19 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.125,1.126
Message-ID: <200607100945.k6A9jJFD031367@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31216

Modified Files:
	util-linux.spec 
Log Message:
- silence install in minimal buildroot without /var/log

matchpathcon(/var/log/lastlog) failed: No such file or directory
error: %post(util-linux-2.13-0.29.x86_64) scriptlet failed, exit status 1



Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- util-linux.spec	7 Jul 2006 09:32:01 -0000	1.125
+++ util-linux.spec	10 Jul 2006 09:45:16 -0000	1.126
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.29
+Release: 0.30
 License: distributable
 Group: System Environment/Base
 
@@ -497,6 +497,8 @@
 
 %post
 /sbin/install-info %{_infodir}/ipc.info* %{_infodir}/dir
+# only for minimal buildroots without /var/log
+[ -d /var/log ] || mkdir -p /var/log
 touch /var/log/lastlog
 chown root:root /var/log/lastlog
 chmod 0644 /var/log/lastlog
@@ -698,6 +700,9 @@
 /sbin/losetup
 
 %changelog
+* Mon Jul 10 2006 Karsten Hopp <karsten at redhat.de> 2.13-0.30
+- silence install in minimal buildroot without /var/log
+
 * Fri Jul  7 2006 Karel Zak <kzak at redhat.com> 2.13-0.29 
 - include the raw command for RHELs
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:47:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:47:36 -0400
Subject: rpms/php-pear/FC-5 macros.pear,NONE,1.1 php-pear.spec,1.12,1.13
Message-ID: <200607100947.k6A9lawh014570@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php-pear/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14548

Modified Files:
	php-pear.spec 
Added Files:
	macros.pear 
Log Message:
* Mon Jul 10 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1.2
- add /etc/rpm/macros.pear (Christopher Stone)



--- NEW FILE macros.pear ---
#
# Define full path to pear/pecl commands to be used in post/postun scriptlets
#
%__pear %{_bindir}/pear
%__pecl %{_bindir}/pecl

#
# Define pear directories used in php-pear-* spec files
#
%pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)
%pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)
%pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)
%pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)

#
# Define pecl directories used in php-pecl-* spec files
#
%pecl_phpdir  %(%{__pecl} config-get php_dir  2> /dev/null || echo undefined)
%pecl_docdir  %(%{__pecl} config-get doc_dir  2> /dev/null || echo undefined)
%pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo undefined)
%pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined)

#
# Define XML directories to store package registration information
#
%pear_xmldir %{pear_phpdir}/.pkgxml
%pecl_xmldir %{pecl_phpdir}/.pkgxml


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/FC-5/php-pear.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-pear.spec	3 Jul 2006 10:55:16 -0000	1.12
+++ php-pear.spec	10 Jul 2006 09:47:34 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.9
-Release: 1.1
+Release: 1.2
 Epoch: 1
 License: The PHP License 3.0
 Group: System
@@ -18,6 +18,7 @@
 Source10: pear.sh
 Source11: pecl.sh
 Source12: peardev.sh
+Source13: macros.pear
 Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz
 Patch0: php-pear-1.4.8-template.patch
 Patch1: php-pear-1.4.8-package.patch
@@ -62,7 +63,8 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir} \
            $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
-           $RPM_BUILD_ROOT%{peardir}/.pkgxml
+           $RPM_BUILD_ROOT%{peardir}/.pkgxml \
+           $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 
 # Relocate everything:
 sed -si "s,$RPM_BUILD_ROOT,,g" \
@@ -81,6 +83,9 @@
 
 install -m 644 -c $RPM_SOURCE_DIR/LICENSE .
 
+install -m 644 -c $RPM_SOURCE_DIR/macros.pear \
+           $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear        
+
 %check
 # 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
@@ -96,10 +101,14 @@
 %{peardir}
 %{_bindir}/*
 %config %{_sysconfdir}/pear.conf
+%config %{_sysconfdir}/rpm/macros.*
 %dir %{_localstatedir}/cache/php-pear
 %doc LICENSE
 
 %changelog
+* Mon Jul 10 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1.2
+- add /etc/rpm/macros.pear (Christopher Stone)
+
 * Mon Jul  3 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-1.1
 - set memory_limit=16M in /usr/bin/{pear,pecl} (#196802)
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:54:25 -0400
Subject: rpms/procps/FC-5 procps-3.2.6-cpu-steal.patch, 1.1, 1.2 procps.spec,
	1.49, 1.50
Message-ID: <200607100954.k6A9sPMX017132@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps-3.2.6-cpu-steal.patch procps.spec 
Log Message:
fix typos in cpu steal time patch

procps-3.2.6-cpu-steal.patch:
 proc/sysinfo.c |    4 ++--
 proc/sysinfo.h |    2 +-
 top.c          |   23 ++++++++++++++++-------
 top.h          |    7 +++++--
 vmstat.8       |    1 +
 vmstat.c       |   37 +++++++++++++++++++++----------------
 6 files changed, 46 insertions(+), 28 deletions(-)

Index: procps-3.2.6-cpu-steal.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps-3.2.6-cpu-steal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.6-cpu-steal.patch	20 Apr 2006 22:37:08 -0000	1.1
+++ procps-3.2.6-cpu-steal.patch	10 Jul 2006 09:54:22 -0000	1.2
@@ -57,7 +57,7 @@
        &cpus[cpu_max].x,
 -      &cpus[cpu_max].y
 +      &cpus[cpu_max].y,
-+      &cpus[Cpu_tot].z
++      &cpus[cpu_max].z
     );
     if (num < 4)
           std_err("failed /proc/stat read");
@@ -66,7 +66,7 @@
        cpus[i].x = 0;  // FIXME: can't tell by kernel version number
        cpus[i].y = 0;  // FIXME: can't tell by kernel version number
 -      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
-+      cpus[i].y = 0;  // FIXME: can't tell by kernel version number
++      cpus[i].z = 0;  // FIXME: can't tell by kernel version number
 +      num = sscanf(buf, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
           &cpus[i].id,
 -         &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- procps.spec	1 Jun 2006 10:49:39 -0000	1.49
+++ procps.spec	10 Jul 2006 09:54:22 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3.4
+Release: 3.5
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -115,6 +115,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.6-3.5
+- fix bugs in cpu steal time patch
+
 * Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.6-3.4
 - fix #191493 - watch -n doesn't handle large integers properly
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:55:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:55:31 -0400
Subject: rpms/gimp/devel .cvsignore, 1.26, 1.27 gimp.spec, 1.98, 1.99 sources,
	1.26, 1.27
Message-ID: <200607100955.k6A9tVm2017599@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17429

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.2.12
use %dist/%fedora/%redhat
remove gcc4 patch as upstream has different solution



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Apr 2006 06:33:28 -0000	1.26
+++ .cvsignore	10 Jul 2006 09:55:29 -0000	1.27
@@ -1 +1 @@
-gimp-2.2.11.tar.bz2
+gimp-2.2.12.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gimp.spec	31 May 2006 14:13:37 -0000	1.98
+++ gimp.spec	10 Jul 2006 09:55:29 -0000	1.99
@@ -1,17 +1,35 @@
-%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:1}
-%define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1}
-%define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1}
-%define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1}
-%define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0}
-%define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1}
-%define _with_lcms %{?with_lcms:%{with_lcms}}%{?!with_lcms:1}
+#### options:
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+# 
+# modular_x:   modular X deps
+# lcms:        lcms support
+# python:      python support
+# mp:          multi processor support
+# static:      build static libraries
+# print:       build the print plugin (if you don't build it externally)
+# convenience: install convenience symlinks
+
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%define _enable_modularX 0%{!?_without_modular_x:1}
+%define _enable_lcms 0%{!?_without_lcms:1}
+%else
+%define _enable_modularX 0%{?_with_modular_x:1}
+%define _enable_lcms 0%{?_with_lcms:1}
+%endif
+
+%define _enable_python 0%{!?_without_python:1}
+%define _enable_mp 0%{!?_without_mp:1}
+%define _enable_static 0%{!?_without_static:1}
+%define _enable_print 0%{?_with_print:1}
+%define _enable_convenience %{!?_without_convenience:1}
 
 #
 #
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.11
+Version: 	2.2.12
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -19,7 +37,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}5
+Release: %{?prever:0.0.%{prever}.}5%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -58,7 +76,7 @@
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
 BuildRequires:  findutils
-%if %_with_lcms
+%if %_enable_lcms
 BuildRequires:	lcms-devel
 %endif
 Requires:	desktop-file-utils >= 0.9
@@ -77,7 +95,6 @@
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
-Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
@@ -111,7 +128,6 @@
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
-%patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
@@ -151,7 +167,7 @@
 %else
 	--disable-print \
 %endif
-%if %_with_lcms
+%if %_enable_lcms
 	--with-lcms \
 %else
 	--without-lcms \
@@ -363,6 +379,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul 07 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
+- version 2.2.12
+- use %%dist/%%fedora/%%redhat
+- remove gcc4 patch as upstream has different solution
+
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
 - cope with pygobject2/-devel being split off (#193368)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 Apr 2006 06:33:29 -0000	1.26
+++ sources	10 Jul 2006 09:55:29 -0000	1.27
@@ -1 +1 @@
-0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2
+6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:56:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:56:17 -0400
Subject: rpms/gimp/devel gimp.spec,1.99,1.100
Message-ID: <200607100956.k6A9uH9w017915@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17814

Modified Files:
	gimp.spec 
Log Message:
bump down release



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- gimp.spec	10 Jul 2006 09:55:29 -0000	1.99
+++ gimp.spec	10 Jul 2006 09:56:15 -0000	1.100
@@ -37,7 +37,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}5%{?dist}
+Release: %{?prever:0.0.%{prever}.}1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia



From fedora-cvs-commits at redhat.com  Mon Jul 10 09:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 05:59:16 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.40,1.41
Message-ID: <200607100959.k6A9xGU9019088@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18997

Modified Files:
	openhpi.spec 
Log Message:
- Added missing ncurses-devel buildrequires



Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openhpi.spec	10 Jul 2006 09:37:16 -0000	1.40
+++ openhpi.spec	10 Jul 2006 09:59:13 -0000	1.41
@@ -13,7 +13,7 @@
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: libsysfs-devel, net-snmp-devel, OpenIPMI-devel, glib2-devel
 BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel
-BuildRequires: OpenIPMI-devel, pkgconfig
+BuildRequires: OpenIPMI-devel, ncurses-devel, pkgconfig
 ExcludeArch: ia64
 
 %description
@@ -97,6 +97,7 @@
 %changelog
 * Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
 - Rebuilt due to switch from sysfsutils to libsysfs
+- Added missing ncurses-devel buildrequires
 
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-4
 - Rebuilt with final memset patch



From fedora-cvs-commits at redhat.com  Mon Jul 10 10:10:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 06:10:35 -0400
Subject: rpms/gimp/devel gimp.spec,1.100,1.101
Message-ID: <200607101010.k6AAAZor021273@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21188

Modified Files:
	gimp.spec 
Log Message:
remove obsolete libpng patch



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gimp.spec	10 Jul 2006 09:56:15 -0000	1.100
+++ gimp.spec	10 Jul 2006 10:10:33 -0000	1.101
@@ -98,7 +98,6 @@
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
-Patch7:		gimp-2.2.11-libpng.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -131,7 +130,6 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
-%patch7 -p1 -b .libpng
 
 %build
 libtoolize --copy --force
@@ -382,7 +380,7 @@
 * Fri Jul 07 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
 - version 2.2.12
 - use %%dist/%%fedora/%%redhat
-- remove gcc4 patch as upstream has different solution
+- remove obsolete gcc4, libpng patches
 
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
 - cope with pygobject2/-devel being split off (#193368)



From fedora-cvs-commits at redhat.com  Mon Jul 10 10:12:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 06:12:09 -0400
Subject: rpms/iprutils/devel iprutils.spec,1.18,1.19
Message-ID: <200607101012.k6AAC9fG021879@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21850

Modified Files:
	iprutils.spec 
Log Message:
New sysfsutils


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- iprutils.spec	26 Jun 2006 17:26:13 -0000	1.18
+++ iprutils.spec	10 Jul 2006 10:12:07 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.1.4
-Release: 1
+Release: 2
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -10,7 +10,7 @@
 URL: http://sourceforge.net/projects/iprdd/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ipr-utils
-BuildRequires: sysfsutils-devel
+BuildRequires: libsysfs-devel
 BuildRequires: pciutils-devel
 BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
@@ -55,6 +55,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Jul 10 2006 David Woodhouse <dwmw2 at redhat.com> - 2.1.4-2
+- Rebuild against new sysfsutils
+
 * Mon Jun 26 2006 Paul Nasrat <pnasrat at redhat.com> - 2.1.4-1
 - Update to 2.1.4
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 10:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 06:17:18 -0400
Subject: rpms/gimp/devel gimp.spec,1.101,1.102
Message-ID: <200607101017.k6AAHItU006139@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6088

Modified Files:
	gimp.spec 
Log Message:
show build options in %prep



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- gimp.spec	10 Jul 2006 10:10:33 -0000	1.101
+++ gimp.spec	10 Jul 2006 10:17:16 -0000	1.102
@@ -123,6 +123,20 @@
 extensions.
 
 %prep
+cat << EOF
+
+Build options:
+modular X:                    %_enable_modularX
+LCMS support:                 %_enable_lcms
+Python support:               %_enable_python
+MP support:                   %_enable_mp
+build static libs:            %_enable_static
+build print plugin:           %_enable_print
+include convenience symlinks: %_enable_convenience
+
+
+EOF
+
 %setup -q -n gimp-%{version}%{?prever:-%{prever}}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
@@ -381,6 +395,7 @@
 - version 2.2.12
 - use %%dist/%%fedora/%%redhat
 - remove obsolete gcc4, libpng patches
+- show build options in %%prep
 
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
 - cope with pygobject2/-devel being split off (#193368)



From fedora-cvs-commits at redhat.com  Mon Jul 10 11:35:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 07:35:07 -0400
Subject: rpms/gimp/devel gimp.spec,1.102,1.103
Message-ID: <200607101135.k6ABZ7RQ011208@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11177

Modified Files:
	gimp.spec 
Log Message:
require gettext for building
fix changelog date



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gimp.spec	10 Jul 2006 10:17:16 -0000	1.102
+++ gimp.spec	10 Jul 2006 11:35:03 -0000	1.103
@@ -75,6 +75,7 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  gettext
 BuildRequires:  findutils
 %if %_enable_lcms
 BuildRequires:	lcms-devel
@@ -391,11 +392,12 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Jul 07 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
+* Mon Jul 10 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
 - version 2.2.12
 - use %%dist/%%fedora/%%redhat
 - remove obsolete gcc4, libpng patches
 - show build options in %%prep
+- require gettext for building
 
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
 - cope with pygobject2/-devel being split off (#193368)



From fedora-cvs-commits at redhat.com  Mon Jul 10 11:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 07:46:38 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen.patch, 1.15,
	1.16 linux-2.6-xen-compile-fixes.patch, 1.4,
	1.5 kernel-2.6.spec, 1.2153, 1.2154
Message-ID: <200607101146.k6ABkcPI023936@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch linux-2.6-xen-compile-fixes.patch 
	kernel-2.6.spec 
Log Message:
rebase xen patch

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1109 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  694 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  376 --
 arch/ia64/kernel/gate.lds.S                         |   96 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   61 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  784 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   10 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    2 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   70 
 drivers/oprofile/buffer_sync.h                      |    5 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |   12 
 drivers/oprofile/event_buffer.h                     |    5 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  201 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    5 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  248 +
 drivers/xen/Makefile                                |   16 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1107 ++++++++
 drivers/xen/netback/xenbus.c                        |  404 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1599 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1107 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   25 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  277 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   72 
 include/linux/oprofile.h                            |    9 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   53 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    2 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    6 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  420 +++
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  148 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  283 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  179 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   51 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 459 files changed, 83287 insertions(+), 1257 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.15 -r 1.16 linux-2.6-xen.patch
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-xen.patch	4 Jul 2006 13:47:13 -0000	1.15
+++ linux-2.6-xen.patch	10 Jul 2006 11:46:34 -0000	1.16
@@ -1,4 +1,4 @@
-diff -urNp --exclude=.hg linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
+diff --exclude=.hg -urNp linux-2.6/arch/i386/boot-xen/Makefile new/arch/i386/boot-xen/Makefile
 --- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/boot-xen/Makefile	2006-05-09 12:32:33.000000000 +0200
 @@ -0,0 +1,21 @@
@@ -23,7 +23,7 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
+diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig new/arch/i386/Kconfig
 --- linux-2.6/arch/i386/Kconfig	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/Kconfig	2006-05-23 18:37:09.000000000 +0200
 @@ -91,6 +91,15 @@ config X86_PC
@@ -315,7 +315,7 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
+diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.cpu new/arch/i386/Kconfig.cpu
 --- linux-2.6/arch/i386/Kconfig.cpu	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/Kconfig.cpu	2006-05-09 12:32:33.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
@@ -327,7 +327,7 @@
  	default y
  
  config X86_WP_WORKS_OK
-diff -urNp --exclude=.hg linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
+diff --exclude=.hg -urNp linux-2.6/arch/i386/Kconfig.debug new/arch/i386/Kconfig.debug
 --- linux-2.6/arch/i386/Kconfig.debug	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/Kconfig.debug	2006-05-09 12:32:33.000000000 +0200
 @@ -84,6 +84,7 @@ config X86_MPPARSE
@@ -338,7 +338,7 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/boot-xen.c new/arch/i386/kernel/acpi/boot-xen.c
 --- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/acpi/boot-xen.c	2006-05-23 18:37:09.000000000 +0200
 @@ -0,0 +1,1167 @@
@@ -1509,7 +1509,7 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/acpi/Makefile new/arch/i386/kernel/acpi/Makefile
 --- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/acpi/Makefile	2006-05-09 12:32:33.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
@@ -1520,7 +1520,7 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/apic-xen.c new/arch/i386/kernel/apic-xen.c
 --- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/apic-xen.c	2006-05-09 12:32:33.000000000 +0200
 @@ -0,0 +1,160 @@
@@ -1684,7 +1684,7 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/asm-offsets.c new/arch/i386/kernel/asm-offsets.c
 --- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/asm-offsets.c	2006-05-09 12:32:34.000000000 +0200
 @@ -13,6 +13,7 @@
@@ -1713,7 +1713,7 @@
 -	DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
  }
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/common-xen.c new/arch/i386/kernel/cpu/common-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/cpu/common-xen.c new/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/cpu/common-xen.c	2006-05-23 18:37:09.000000000 +0200
 @@ -0,0 +1,732 @@
@@ -2449,7 +2449,7 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/cpu/Makefile new/arch/i386/kernel/cpu/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/cpu/Makefile	2006-05-09 12:32:34.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
@@ -2461,7 +2461,7 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/arch/i386/kernel/cpu/mtrr/main-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c new/arch/i386/kernel/cpu/mtrr/main-xen.c
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,197 @@
@@ -2662,7 +2662,7 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/arch/i386/kernel/cpu/mtrr/Makefile
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile new/arch/i386/kernel/cpu/mtrr/Makefile
 --- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/cpu/mtrr/Makefile	2006-05-09 12:32:34.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
@@ -2676,13 +2676,13 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/early_printk-xen.c new/arch/i386/kernel/early_printk-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/early_printk-xen.c new/arch/i386/kernel/early_printk-xen.c
 --- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/early_printk-xen.c	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry.S new/arch/i386/kernel/entry.S
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/entry.S new/arch/i386/kernel/entry.S
 --- linux-2.6/arch/i386/kernel/entry.S	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/entry.S	2006-05-09 12:32:34.000000000 +0200
 @@ -177,7 +177,7 @@ need_resched:
@@ -2730,7 +2730,7 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/entry-xen.S new/arch/i386/kernel/entry-xen.S
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/entry-xen.S new/arch/i386/kernel/entry-xen.S
 --- linux-2.6/arch/i386/kernel/entry-xen.S	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/entry-xen.S	2006-05-09 12:32:34.000000000 +0200
 @@ -0,0 +1,903 @@
@@ -3637,7 +3637,7 @@
 +#include "syscall_table.S"
 +
 +syscall_table_size=(.-sys_call_table)
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/fixup.c new/arch/i386/kernel/fixup.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/fixup.c new/arch/i386/kernel/fixup.c
 --- linux-2.6/arch/i386/kernel/fixup.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/fixup.c	2006-05-23 18:42:17.000000000 +0200
 @@ -0,0 +1,86 @@
@@ -3727,7 +3727,7 @@
 +	return 0;
 +}
 +__initcall(fixup_init);
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/head-xen.S new/arch/i386/kernel/head-xen.S
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/head-xen.S new/arch/i386/kernel/head-xen.S
 --- linux-2.6/arch/i386/kernel/head-xen.S	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/head-xen.S	2006-06-07 13:15:16.000000000 +0200
 @@ -0,0 +1,181 @@
@@ -3912,7 +3912,7 @@
 +#endif
 +	.ascii	",LOADER=generic"
 +	.byte	0
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/init_task-xen.c new/arch/i386/kernel/init_task-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/init_task-xen.c new/arch/i386/kernel/init_task-xen.c
 --- linux-2.6/arch/i386/kernel/init_task-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/init_task-xen.c	2006-05-09 12:32:35.000000000 +0200
 @@ -0,0 +1,51 @@
@@ -3967,7 +3967,7 @@
 +DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
 +#endif
 +
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/io_apic-xen.c new/arch/i386/kernel/io_apic-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/io_apic-xen.c new/arch/i386/kernel/io_apic-xen.c
 --- linux-2.6/arch/i386/kernel/io_apic-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/io_apic-xen.c	2006-05-23 18:37:09.000000000 +0200
 @@ -0,0 +1,2751 @@
@@ -6722,7 +6722,7 @@
 +}
 +
 +#endif /* CONFIG_ACPI */
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/ioport-xen.c new/arch/i386/kernel/ioport-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/ioport-xen.c new/arch/i386/kernel/ioport-xen.c
 --- linux-2.6/arch/i386/kernel/ioport-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/ioport-xen.c	2006-05-09 12:32:35.000000000 +0200
 @@ -0,0 +1,121 @@
@@ -6847,7 +6847,7 @@
 +	set_iopl_mask(t->iopl);
 +	return 0;
 +}
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/irq.c new/arch/i386/kernel/irq.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/irq.c new/arch/i386/kernel/irq.c
 --- linux-2.6/arch/i386/kernel/irq.c	2006-07-03 14:14:14.000000000 +0200
 +++ new/arch/i386/kernel/irq.c	2006-05-09 12:32:35.000000000 +0200
 @@ -53,8 +53,8 @@ static union irq_ctx *softirq_ctx[NR_CPU
@@ -6861,7 +6861,7 @@
  #ifdef CONFIG_4KSTACKS
  	union irq_ctx *curctx, *irqctx;
  	u32 *isp;
-diff -urNp --exclude=.hg linux-2.6/arch/i386/kernel/irq-xen.c new/arch/i386/kernel/irq-xen.c
+diff --exclude=.hg -urNp linux-2.6/arch/i386/kernel/irq-xen.c new/arch/i386/kernel/irq-xen.c
 --- linux-2.6/arch/i386/kernel/irq-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ new/arch/i386/kernel/irq-xen.c	2006-05-09 12:32:35.000000000 +0200
[...13109 lines suppressed...]
+ 
+-   dev->xmit_lock serializes accesses to device driver.
++   netif_tx_lock serializes accesses to device driver.
+ 
+-   dev->queue_lock and dev->xmit_lock are mutually exclusive,
++   dev->queue_lock and netif_tx_lock are mutually exclusive,
+    if one is grabbed, another must be free.
+  */
+ 
+@@ -90,14 +90,17 @@ void qdisc_unlock_tree(struct net_device
+    NOTE: Called under dev->queue_lock with locally disabled BH.
+ */
+ 
+-int qdisc_restart(struct net_device *dev)
++static inline int qdisc_restart(struct net_device *dev)
+ {
+ 	struct Qdisc *q = dev->qdisc;
+ 	struct sk_buff *skb;
+ 
+ 	/* Dequeue packet */
+-	if ((skb = q->dequeue(q)) != NULL) {
++	if (((skb = dev->gso_skb)) || ((skb = q->dequeue(q)))) {
+ 		unsigned nolock = (dev->features & NETIF_F_LLTX);
++
++		dev->gso_skb = NULL;
++
+ 		/*
+ 		 * When the driver has LLTX set it does its own locking
+ 		 * in start_xmit. No need to add additional overhead by
+@@ -108,7 +111,7 @@ int qdisc_restart(struct net_device *dev
+ 		 * will be requeued.
+ 		 */
+ 		if (!nolock) {
+-			if (!spin_trylock(&dev->xmit_lock)) {
++			if (!netif_tx_trylock(dev)) {
+ 			collision:
+ 				/* So, someone grabbed the driver. */
+ 				
+@@ -126,8 +129,6 @@ int qdisc_restart(struct net_device *dev
+ 				__get_cpu_var(netdev_rx_stat).cpu_collision++;
+ 				goto requeue;
+ 			}
+-			/* Remember that the driver is grabbed by us. */
+-			dev->xmit_lock_owner = smp_processor_id();
+ 		}
+ 		
+ 		{
+@@ -136,14 +137,11 @@ int qdisc_restart(struct net_device *dev
+ 
+ 			if (!netif_queue_stopped(dev)) {
+ 				int ret;
+-				if (netdev_nit)
+-					dev_queue_xmit_nit(skb, dev);
+ 
+-				ret = dev->hard_start_xmit(skb, dev);
++				ret = dev_hard_start_xmit(skb, dev);
+ 				if (ret == NETDEV_TX_OK) { 
+ 					if (!nolock) {
+-						dev->xmit_lock_owner = -1;
+-						spin_unlock(&dev->xmit_lock);
++						netif_tx_unlock(dev);
+ 					}
+ 					spin_lock(&dev->queue_lock);
+ 					return -1;
+@@ -157,8 +155,7 @@ int qdisc_restart(struct net_device *dev
+ 			/* NETDEV_TX_BUSY - we need to requeue */
+ 			/* Release the driver */
+ 			if (!nolock) { 
+-				dev->xmit_lock_owner = -1;
+-				spin_unlock(&dev->xmit_lock);
++				netif_tx_unlock(dev);
+ 			} 
+ 			spin_lock(&dev->queue_lock);
+ 			q = dev->qdisc;
+@@ -175,7 +172,10 @@ int qdisc_restart(struct net_device *dev
+ 		 */
+ 
+ requeue:
+-		q->ops->requeue(skb, q);
++		if (skb->next)
++			dev->gso_skb = skb;
++		else
++			q->ops->requeue(skb, q);
+ 		netif_schedule(dev);
+ 		return 1;
+ 	}
+@@ -183,11 +183,23 @@ requeue:
+ 	return q->q.qlen;
+ }
+ 
++void __qdisc_run(struct net_device *dev)
++{
++	if (unlikely(dev->qdisc == &noop_qdisc))
++		goto out;
++
++	while (qdisc_restart(dev) < 0 && !netif_queue_stopped(dev))
++		/* NOTHING */;
++
++out:
++	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
++}
++
+ static void dev_watchdog(unsigned long arg)
+ {
+ 	struct net_device *dev = (struct net_device *)arg;
+ 
+-	spin_lock(&dev->xmit_lock);
++	netif_tx_lock(dev);
+ 	if (dev->qdisc != &noop_qdisc) {
+ 		if (netif_device_present(dev) &&
+ 		    netif_running(dev) &&
+@@ -203,7 +215,7 @@ static void dev_watchdog(unsigned long a
+ 				dev_hold(dev);
+ 		}
+ 	}
+-	spin_unlock(&dev->xmit_lock);
++	netif_tx_unlock(dev);
+ 
+ 	dev_put(dev);
+ }
+@@ -227,17 +239,17 @@ void __netdev_watchdog_up(struct net_dev
+ 
+ static void dev_watchdog_up(struct net_device *dev)
+ {
+-	spin_lock_bh(&dev->xmit_lock);
++	netif_tx_lock_bh(dev);
+ 	__netdev_watchdog_up(dev);
+-	spin_unlock_bh(&dev->xmit_lock);
++	netif_tx_unlock_bh(dev);
+ }
+ 
+ static void dev_watchdog_down(struct net_device *dev)
+ {
+-	spin_lock_bh(&dev->xmit_lock);
++	netif_tx_lock_bh(dev);
+ 	if (del_timer(&dev->watchdog_timer))
+ 		dev_put(dev);
+-	spin_unlock_bh(&dev->xmit_lock);
++	netif_tx_unlock_bh(dev);
+ }
+ 
+ void netif_carrier_on(struct net_device *dev)
+@@ -579,10 +591,17 @@ void dev_deactivate(struct net_device *d
+ 
+ 	dev_watchdog_down(dev);
+ 
+-	while (test_bit(__LINK_STATE_SCHED, &dev->state))
++	/* Wait for outstanding dev_queue_xmit calls. */
++	synchronize_rcu();
++
++	/* Wait for outstanding qdisc_run calls. */
++	while (test_bit(__LINK_STATE_QDISC_RUNNING, &dev->state))
+ 		yield();
+ 
+-	spin_unlock_wait(&dev->xmit_lock);
++	if (dev->gso_skb) {
++		kfree_skb(dev->gso_skb);
++		dev->gso_skb = NULL;
++	}
+ }
+ 
+ void dev_init_scheduler(struct net_device *dev)
+@@ -624,6 +643,5 @@ EXPORT_SYMBOL(qdisc_create_dflt);
+ EXPORT_SYMBOL(qdisc_alloc);
+ EXPORT_SYMBOL(qdisc_destroy);
+ EXPORT_SYMBOL(qdisc_reset);
+-EXPORT_SYMBOL(qdisc_restart);
+ EXPORT_SYMBOL(qdisc_lock_tree);
+ EXPORT_SYMBOL(qdisc_unlock_tree);
+diff --exclude=.hg -urNp linux-2.6/net/sched/sch_teql.c new/net/sched/sch_teql.c
+--- linux-2.6/net/sched/sch_teql.c	2006-07-03 14:15:23.000000000 +0200
++++ new/net/sched/sch_teql.c	2006-07-07 15:10:03.000000000 +0200
+@@ -302,20 +302,17 @@ restart:
+ 
+ 		switch (teql_resolve(skb, skb_res, slave)) {
+ 		case 0:
+-			if (spin_trylock(&slave->xmit_lock)) {
+-				slave->xmit_lock_owner = smp_processor_id();
++			if (netif_tx_trylock(slave)) {
+ 				if (!netif_queue_stopped(slave) &&
+ 				    slave->hard_start_xmit(skb, slave) == 0) {
+-					slave->xmit_lock_owner = -1;
+-					spin_unlock(&slave->xmit_lock);
++					netif_tx_unlock(slave);
+ 					master->slaves = NEXT_SLAVE(q);
+ 					netif_wake_queue(dev);
+ 					master->stats.tx_packets++;
+ 					master->stats.tx_bytes += len;
+ 					return 0;
+ 				}
+-				slave->xmit_lock_owner = -1;
+-				spin_unlock(&slave->xmit_lock);
++				netif_tx_unlock(slave);
+ 			}
+ 			if (netif_queue_stopped(dev))
+ 				busy = 1;
+diff --exclude=.hg -urNp linux-2.6/scripts/Makefile.xen new/scripts/Makefile.xen
 --- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
 +++ new/scripts/Makefile.xen	2006-05-09 12:40:15.000000000 +0200
 @@ -0,0 +1,14 @@

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h   |    3 +-
 15 files changed, 49 insertions(+), 11 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-xen-compile-fixes.patch	18 Jun 2006 04:45:05 -0000	1.4
+++ linux-2.6-xen-compile-fixes.patch	10 Jul 2006 11:46:35 -0000	1.5
@@ -215,3 +215,15 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
+--- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h.orig	2006-07-08 12:35:36.000000000 +0200
++++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h	2006-07-08 12:36:25.000000000 +0200
+@@ -47,7 +47,8 @@
+ extern unsigned long e820_end_of_ram(void);
+ extern void e820_reserve_resources(struct e820entry *e820, int nr_map);
+ extern void e820_print_map(char *who);
+-extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);
++extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
++extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
+ 
+ extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);
+ extern void e820_setup_gap(struct e820entry *e820, int nr_map);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2153
retrieving revision 1.2154
diff -u -r1.2153 -r1.2154
--- kernel-2.6.spec	7 Jul 2006 23:09:01 -0000	1.2153
+++ kernel-2.6.spec	10 Jul 2006 11:46:35 -0000	1.2154
@@ -1546,6 +1546,7 @@
 
 %changelog
 * Sat Jul  8 2006 Juan Quintela <quintela at redhat.com>
+- rebase with linux-2.6-xen-fedora 28918.
 - Update to xen-unstable HV cset 10508.
 - xen: credit scheduler is the default now.
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 11:49:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 07:49:14 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2154,1.2155
Message-ID: <200607101149.k6ABnE3J030834@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
enable CRASH, XEN_PCI_BACKEND & make a module of blkfront


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2154
retrieving revision 1.2155
diff -u -r1.2154 -r1.2155
--- kernel-2.6.spec	10 Jul 2006 11:46:35 -0000	1.2154
+++ kernel-2.6.spec	10 Jul 2006 11:49:12 -0000	1.2155
@@ -1546,6 +1546,9 @@
 
 %changelog
 * Sat Jul  8 2006 Juan Quintela <quintela at redhat.com>
+- enable CONFIG_CRASH on xen kernels.
+- enable CONFIG_PCIDEV_BACKEND on xen kernels.
+- make BLKDEV_FRONTEND a module on xen kernels.
 - rebase with linux-2.6-xen-fedora 28918.
 - Update to xen-unstable HV cset 10508.
 - xen: credit scheduler is the default now.



From fedora-cvs-commits at redhat.com  Mon Jul 10 11:49:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 07:49:15 -0400
Subject: rpms/kernel/FC-5/configs config-xen-generic, 1.15,
	1.16 config-xen-xen, 1.1, 1.2 config-xen-xen0, 1.6, 1.7
Message-ID: <200607101149.k6ABnFeH030842@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic config-xen-xen config-xen-xen0 
Log Message:
enable CRASH, XEN_PCI_BACKEND & make a module of blkfront


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-xen-generic	18 Jun 2006 04:45:12 -0000	1.15
+++ config-xen-generic	10 Jul 2006 11:49:12 -0000	1.16
@@ -13,13 +13,15 @@
 # CONFIG_XEN_BLKDEV_TAP is not set
 # 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
 CONFIG_XEN_NETDEV_LOOPBACK=y
 CONFIG_XEN_BACKEND=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
 
 #
 # X86 Processor Configuration
@@ -118,14 +120,5 @@
 # kexec does not work with Xen right now.
 #
 # CONFIG_KEXEC is not set
-# CONFIG_CRASH is not set
 CONFIG_XEN_SYSFS=y
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-CONFIG_PCI_GODIRECT=y
-# CONFIG_PCI_GOXEN_FE is not set
-# CONFIG_PCI_GOANY is not set
-CONFIG_PCI_DIRECT=y
-CONFIG_PCIEPORTBUS=y
 # CONFIG_TCG_TPM is not set


Index: config-xen-xen
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-xen,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-xen	4 Jul 2006 13:47:37 -0000	1.1
+++ config-xen-xen	10 Jul 2006 11:49:12 -0000	1.2
@@ -9,5 +9,5 @@
 
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_FRONTEND=m


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-xen0,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-xen-xen0	18 Jun 2006 04:45:12 -0000	1.6
+++ config-xen-xen0	10 Jul 2006 11:49:12 -0000	1.7
@@ -10,12 +10,6 @@
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
 # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
 
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GOANY is not set
 
 # Microcode driver in Xen won't work as a module - should be upgraded
 CONFIG_MICROCODE=y
@@ -72,8 +66,3 @@
 #
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
-CONFIG_PCI=y
-CONFIG_PCI_GODIRECT=y
-# CONFIG_PCI_GOXEN_FE is not set
-CONFIG_PCI_DIRECT=y
-CONFIG_PCIEPORTBUS=y



From fedora-cvs-commits at redhat.com  Mon Jul 10 11:56:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 07:56:39 -0400
Subject: rpms/libXp/devel libXp.spec,1.13,1.14
Message-ID: <200607101156.k6ABudsl001268@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1237

Modified Files:
	libXp.spec 
Log Message:
* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
- Renamed libXp_deprecated rpm macro to "with_devel" to avoid confusion.  This
  library is still deprecated, we just decided to remove the word "deprecated"
  from the package name for library naming consistency.



Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXp.spec	28 Jun 2006 10:43:40 -0000	1.13
+++ libXp.spec	10 Jul 2006 11:56:37 -0000	1.14
@@ -1,9 +1,18 @@
-%define libXp_deprecated	0
+# NOTE: This library has been deprecated in RHEL and Fedora Core for some
+# time now.  While we have removed the word "deprecated" from the package
+# name in modular X, the library does remain deprecated and will be
+# removed from a future OS release at some point.  Developers should
+# refrain from using this library in new software, and should migrate
+# software which currently uses libXp to another printing interface such
+# as gnome-print.  We may decide to stop shipping the development headers
+# prior to removing libXp from the OS, which is what "without_devel"
+# is for.  
+%define without_devel	0
 
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -23,7 +32,7 @@
 %description
 X.Org X11 libXp runtime library
 
-%if ! %{libXp_deprecated}
+%if ! %{without_devel}
 %package devel
 Summary: X.Org X11 libXp development package
 Group: Development/Libraries
@@ -57,7 +66,7 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%if %{libXp_deprecated}
+%if %{without_devel}
 {
    rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.a
    rm -f $RPM_BUILD_ROOT%{_libdir}/libXp.so
@@ -83,7 +92,7 @@
 %{_libdir}/libXp.so.6
 %{_libdir}/libXp.so.6.2.0
 
-%if ! %{libXp_deprecated}
+%if ! %{without_devel}
 %files devel
 %defattr(-,root,root,-)
 %if %{with_static}
@@ -99,6 +108,11 @@
 %endif
 
 %changelog
+* Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
+- Renamed libXp_deprecated rpm macro to "with_devel" to avoid confusion.  This
+  library is still deprecated, we just decided to remove the word "deprecated"
+  from the package name for library naming consistency.
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Added "Requires: xorg-x11-proto-devel" to devel for xp.pc



From fedora-cvs-commits at redhat.com  Mon Jul 10 12:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 08:17:39 -0400
Subject: rpms/gimp/FC-5 .cvsignore, 1.26, 1.27 gimp.spec, 1.95, 1.96 sources,
	1.26, 1.27 gimp-2.2.7-gcc4.patch, 1.2, NONE
Message-ID: <200607101217.k6ACHds4021831@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.2.7-gcc4.patch 
Log Message:
version 2.2.12
use %dist/%fedora/%redhat
remove obsolete gcc4, libpng patches
show build options in %prep
require gettext for building
cope with pygobject2/-devel being split off (#193368)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	18 Apr 2006 06:39:47 -0000	1.26
+++ .cvsignore	10 Jul 2006 12:17:36 -0000	1.27
@@ -1 +1 @@
-gimp-2.2.11.tar.bz2
+gimp-2.2.12.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gimp.spec	20 Apr 2006 12:59:55 -0000	1.95
+++ gimp.spec	10 Jul 2006 12:17:36 -0000	1.96
@@ -1,17 +1,35 @@
-%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:1}
-%define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1}
-%define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1}
-%define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1}
-%define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0}
-%define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1}
-%define _with_lcms %{?with_lcms:%{with_lcms}}%{?!with_lcms:1}
+#### options:
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+# 
+# modular_x:   modular X deps
+# lcms:        lcms support
+# python:      python support
+# mp:          multi processor support
+# static:      build static libraries
+# print:       build the print plugin (if you don't build it externally)
+# convenience: install convenience symlinks
+
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%define _enable_modularX 0%{!?_without_modular_x:1}
+%define _enable_lcms 0%{!?_without_lcms:1}
+%else
+%define _enable_modularX 0%{?_with_modular_x:1}
+%define _enable_lcms 0%{?_with_lcms:1}
+%endif
+
+%define _enable_python 0%{!?_without_python:1}
+%define _enable_mp 0%{!?_without_mp:1}
+%define _enable_static 0%{!?_without_static:1}
+%define _enable_print 0%{?_with_print:1}
+%define _enable_convenience %{!?_without_convenience:1}
 
 #
 #
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.11
+Version: 	2.2.12
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -19,7 +37,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc5.%{?prever:0.0.%{prever}.}3
+Release: %{?prever:0.0.%{prever}.}1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -34,6 +52,8 @@
 BuildRequires:	gtkhtml2-devel
 BuildRequires:	python-devel
 BuildRequires:	pygtk2-devel
+# cope with pygobject2/-devel being split off as well:
+BuildRequires:  %{_libdir}/pkgconfig/pygobject-2.0.pc
 BuildRequires:	librsvg2-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
@@ -55,8 +75,9 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  gettext
 BuildRequires:  findutils
-%if %_with_lcms
+%if %_enable_lcms
 BuildRequires:	lcms-devel
 %endif
 Requires:	desktop-file-utils >= 0.9
@@ -75,7 +96,6 @@
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
-Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
@@ -104,11 +124,24 @@
 extensions.
 
 %prep
+cat << EOF
+
+Build options:
+modular X:                    %_enable_modularX
+LCMS support:                 %_enable_lcms
+Python support:               %_enable_python
+MP support:                   %_enable_mp
+build static libs:            %_enable_static
+build print plugin:           %_enable_print
+include convenience symlinks: %_enable_convenience
+
+
+EOF
+
 %setup -q -n gimp-%{version}%{?prever:-%{prever}}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
-%patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
@@ -147,7 +180,7 @@
 %else
 	--disable-print \
 %endif
-%if %_with_lcms
+%if %_enable_lcms
 	--with-lcms \
 %else
 	--without-lcms \
@@ -359,7 +392,20 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.3
+* Mon Jul 10 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
+- version 2.2.12
+- use %%dist/%%fedora/%%redhat
+- remove obsolete gcc4, libpng patches
+- show build options in %%prep
+- require gettext for building
+
+* Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
+- cope with pygobject2/-devel being split off (#193368)
+
+* Tue May 09 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-4
+- don't use long deprecated libpng API (#191027, patch by Manish Singh)
+
+* Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-3
 - only use pkgconfig if needed in gimptool, require pkgconfig in devel
   subpackage (#189314, #189371)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 Apr 2006 06:39:47 -0000	1.26
+++ sources	10 Jul 2006 12:17:36 -0000	1.27
@@ -1 +1 @@
-0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2
+6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2


--- gimp-2.2.7-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 12:23:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 08:23:59 -0400
Subject: rpms/qt/devel 0069-fix-minsize.patch, NONE,
	1.1 0070-fix-broken-fonts.patch, NONE, 1.1 qt.spec, 1.119,
	1.120 qt-x11-free-3.3.6-arabic_fonts.patch, 1.1, NONE
Message-ID: <200607101223.k6ACNxjH024272@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24187

Modified Files:
	qt.spec 
Added Files:
	0069-fix-minsize.patch 0070-fix-broken-fonts.patch 
Removed Files:
	qt-x11-free-3.3.6-arabic_fonts.patch 
Log Message:
- apply upstream patches, fix arabic fonts issue, and
  problems with missing minimum size when richtext
  labels are used


0069-fix-minsize.patch:
 qlayout.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0069-fix-minsize.patch ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: yes
author: TT
This patch fixes problems with missing minimum size when richtext
labels are used.

--- src/kernel/qlayout.cpp.sav	2006-03-17 14:33:44.000000000 +0100
+++ src/kernel/qlayout.cpp	2006-03-21 11:53:13.000000000 +0100
@@ -275,7 +275,7 @@ void QGridLayoutData::recalcHFW( int w, 
 
     hfw_width = w;
     hfw_height = QMIN( QLAYOUTSIZE_MAX, h );
-    hfw_minheight = QMIN( QLAYOUTSIZE_MAX, h );
+    hfw_minheight = QMIN( QLAYOUTSIZE_MAX, mh );
 }
 
 int QGridLayoutData::heightForWidth( int w, int margin, int spacing )

0070-fix-broken-fonts.patch:
 qfontengine_p.h       |    6 ++--
 qfontengine_x11.cpp   |   31 ++++++++++++---------
 qscriptengine.cpp     |   71 ++++++++++++++++++++++++++++----------------------
 qscriptengine_x11.cpp |    7 ++++
 4 files changed, 68 insertions(+), 47 deletions(-)

--- NEW FILE 0070-fix-broken-fonts.patch ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: yes
author: TT
Some arabic fonts seem to contain broken open type
tables (esp. some fonts used on Ubuntu).

To fix this we now check the return values of the open
type code, and fall back to non open type shaping
if the code fails.

Index: src/kernel/qscriptengine.cpp
===================================================================
--- src/kernel/qscriptengine.cpp	(revision 546857)
+++ src/kernel/qscriptengine.cpp	(working copy)
@@ -289,7 +289,7 @@
     unsigned short *logClusters = item->log_clusters;
 
     int i;
-    for (i = 0; i < length; ++i) 
+    for (i = 0; i < length; ++i)
         logClusters[i] = i;
 
     // first char in a run is never (treated as) a mark
@@ -304,7 +304,7 @@
     } else {
         item->attributes[0].zeroWidth = FALSE;
     }
-    
+
     int lastCat = ::category(uc[0]);
     for (i = 1; i < length; ++i) {
         int cat = ::category(uc[i]);
@@ -381,7 +381,7 @@
 
 static bool basic_shape(QShaperItem *item)
 {
-    if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances, 
+    if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
                                  &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
         return FALSE;
 
@@ -421,7 +421,7 @@
 
     if (openType && openType->supportsScript(item->script)) {
         openType->selectScript(item->script, hebrew_features);
-        
+
         if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
                                      &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
             return FALSE;
@@ -437,7 +437,7 @@
         ShinDot = 0x5c1,
         SinDot = 0x5c2,
         Patah = 0x5b7,
-        Qamats = 0x5b8, 
+        Qamats = 0x5b8,
         Holam = 0x5b9,
         Rafe = 0x5bf
     };
@@ -446,7 +446,7 @@
 
     const QChar *uc = item->string->unicode() + item->from;
     unsigned short *logClusters = item->log_clusters;
-    
+
     *shapedChars = *uc;
     logClusters[0] = 0;
     int slen = 1;
@@ -460,9 +460,9 @@
             if (base >= 0x5d0
                 && base <= 0x5ea
                 && base != 0x5d7
-                && base != 0x5dd 
-                && base != 0x5df 
-                && base != 0x5e2 
+                && base != 0x5dd
+                && base != 0x5df
+                && base != 0x5e2
                 && base != 0x5e5) {
                 shaped = base - 0x5d0 + 0xfb30;
             } else if (base == 0xfb2a || base == 0xfb2b /* Shin with Shin or Sin dot */) {
@@ -532,12 +532,12 @@
         }
         logClusters[i] = cluster_start;
     }
-    
+
     if (item->font->stringToCMap(shapedChars, slen, item->glyphs, item->advances,
                                  &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
         return FALSE;
     for (i = 0; i < item->num_glyphs; ++i) {
-        if (item->attributes[i].mark) 
+        if (item->attributes[i].mark)
             item->advances[i] = 0;
     }
     qt_heuristicPosition(item);
@@ -1461,12 +1461,12 @@
 
 enum {
     InitProperty = 0x2,
-    IsolProperty = 0x4, 
+    IsolProperty = 0x4,
     FinaProperty = 0x8,
     MediProperty = 0x10,
-    RligProperty = 0x20, 
-    CaltProperty = 0x40, 
-    LigaProperty = 0x80, 
+    RligProperty = 0x20,
+    CaltProperty = 0x40,
+    LigaProperty = 0x80,
     DligProperty = 0x100,
     CswhProperty = 0x200,
     MsetProperty = 0x400
@@ -1477,14 +1477,14 @@
     { FT_MAKE_TAG('i', 's', 'o', 'l'), IsolProperty },
     { FT_MAKE_TAG('f', 'i', 'n', 'a'), FinaProperty },
     { FT_MAKE_TAG('m', 'e', 'd', 'i'), MediProperty },
-    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty }, 
-    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty }, 
-    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty }, 
-    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty }, 
-    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty }, 
+    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
+    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty },
+    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty },
+    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty },
+    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty },
     { FT_MAKE_TAG('c', 's', 'w', 'h'), CswhProperty },
     // mset is used in old Win95 fonts that don't have a 'mark' positioning table.
-    { FT_MAKE_TAG('m', 's', 'e', 't'), MsetProperty }, 
+    { FT_MAKE_TAG('m', 's', 'e', 't'), MsetProperty },
     {0, 0}
 };
 
@@ -1496,16 +1496,18 @@
     { FT_MAKE_TAG('f', 'i', 'n', '3'), FinaProperty },
     { FT_MAKE_TAG('m', 'e', 'd', 'i'), MediProperty },
     { FT_MAKE_TAG('m', 'e', 'd', '2'), MediProperty },
-    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty }, 
-    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty }, 
-    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty }, 
-    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty }, 
-    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty }, 
+    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
+    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty },
+    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty },
+    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty },
+    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty },
     {0, 0}
 };
 
-static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item)
+static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item, bool *ot_ok)
 {
+    *ot_ok = true;
+
     openType->selectScript(item->script, item->script == QFont::Arabic ? arabic_features : syriac_features);
     int nglyphs = item->num_glyphs;
     if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
@@ -1562,7 +1564,10 @@
             apply[i] |= IsolProperty|MediProperty|FinaProperty;
     }
 
-    openType->shape(item, apply.data());
+    if (!openType->shape(item, apply.data())) {
+        *ot_ok = false;
+        return false;
+    }
     item->num_glyphs = nglyphs;
     return openType->positionAndAdd(item);
 }
@@ -1577,8 +1582,14 @@
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     QOpenType *openType = item->font->openType();
 
-    if (openType && openType->supportsScript(QFont::Arabic))
-        return arabicSyriacOpenTypeShape(openType, item);
+    if (openType && openType->supportsScript(QFont::Arabic)) {
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
+    }
 #endif
 
     QVarLengthArray<ushort> shapedChars(item->length);
Index: src/kernel/qfontengine_p.h
===================================================================
--- src/kernel/qfontengine_p.h	(revision 546857)
+++ src/kernel/qfontengine_p.h	(working copy)
@@ -490,8 +490,8 @@
         return supported_scripts[script];
     }
     void selectScript(unsigned int script, const Features *features = 0);
-    
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }
@@ -499,7 +499,7 @@
     void setProperty(int index, uint property) { otl_buffer->in_string[index].properties = property; }
 
 
-private: 
+private:
     bool checkScript(unsigned int script);
     QFontEngine *fontEngine;
     FT_Face face;
Index: src/kernel/qfontengine_x11.cpp
===================================================================
--- src/kernel/qfontengine_x11.cpp	(revision 546857)
+++ src/kernel/qfontengine_x11.cpp	(working copy)
@@ -154,7 +154,7 @@
         return;
 
     w += h; // add some pixels to width because of italic correction
-    QBitmap bm( w, h, TRUE );     // create bitmap 
+    QBitmap bm( w, h, TRUE );     // create bitmap
     QPainter paint;
     paint.begin( &bm );             // draw text in bitmap
     fe->draw( &paint, 0, si->ascent, engine, si, textFlags );
@@ -2396,7 +2396,7 @@
         qDebug("error loading gpos table: %d", error);
 #endif
     }
-    
+
     for (uint i = 0; i < QFont::NScripts; ++i)
         supported_scripts[i] = checkScript(i);
 }
@@ -2427,7 +2427,7 @@
     if (requirements & RequiresGsub) {
         if (!gsub)
             return FALSE;
-        
+
         FT_UShort script_index;
         FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index);
         if (error) {
@@ -2437,11 +2437,11 @@
             return FALSE;
         }
     }
-    
+
     if (requirements & RequiresGpos) {
         if (!gpos)
             return FALSE;
-        
+
         FT_UShort script_index;
         FT_Error error = TT_GPOS_Select_Script(gpos, script, &script_index);
         if (error) {
@@ -2460,7 +2460,7 @@
 {
     if (current_script == script)
         return;
-    
+
     assert(script < QFont::NScripts);
     // find script in our list of supported scripts.
     uint tag = ot_scripts[script].tag;
@@ -2497,7 +2497,7 @@
             }
         }
     }
-    
+
     if (gpos) {
         TT_GPOS_Clear_Features(gpos);
         FT_UShort script_index;
@@ -2544,7 +2544,7 @@
 
 extern void qt_heuristicPosition(QShaperItem *item);
 
-void QOpenType::shape(QShaperItem *item, const unsigned int *properties)
+bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
 {
     length = item->num_glyphs;
 
@@ -2571,8 +2571,11 @@
 
     loadFlags = FT_LOAD_DEFAULT;
 
-    if (gsub)
-        TT_GSUB_Apply_String(gsub, otl_buffer);
+    if (gsub) {
+        uint error = TT_GSUB_Apply_String(gsub, otl_buffer);
+        if (error && error != TTO_Err_Not_Covered)
+            return false;
+    }
 
 #ifdef OT_DEBUG
 //     qDebug("log clusters before shaping:");
@@ -2584,6 +2587,8 @@
     qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
+
+    return true;
 }
 
 bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
@@ -2600,7 +2605,7 @@
         unlockFTFace(static_cast<QFontEngineXft *>(fontEngine)->font());
 #endif
     }
-    
+
     // make sure we have enough space to write everything back
     if (item->num_glyphs < (int)otl_buffer->in_length) {
         item->num_glyphs = otl_buffer->in_length;
@@ -2654,11 +2659,11 @@
             // ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
             if (positions[i].new_advance) {
                 item->advances[i] = item->flags & QTextEngine::RightToLeft
-                                    ? -qRound((positions[i].x_advance >> 6)*scale) 
+                                    ? -qRound((positions[i].x_advance >> 6)*scale)
                                     :  qRound((positions[i].x_advance >> 6)*scale);
             } else {
                 item->advances[i] += item->flags & QTextEngine::RightToLeft
-                                     ? -qRound((positions[i].x_advance >> 6)*scale) 
+                                     ? -qRound((positions[i].x_advance >> 6)*scale)
                                      :  qRound((positions[i].x_advance >> 6)*scale);
             }
 	    item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale);
Index: src/kernel/qscriptengine_x11.cpp
===================================================================
--- src/kernel/qscriptengine_x11.cpp	(revision 546857)
+++ src/kernel/qscriptengine_x11.cpp	(working copy)
@@ -45,7 +45,12 @@
 #ifndef QT_NO_XFTFREETYPE
     QOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(QFont::Syriac)) {
-        return arabicSyriacOpenTypeShape(openType, item);
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
     }
 #endif
     return basic_shape(item);


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- qt.spec	29 Jun 2006 07:05:32 -0000	1.119
+++ qt.spec	10 Jul 2006 12:23:57 -0000	1.120
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 10
+Release: 11
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -39,10 +39,11 @@
 Patch101: 0047-fix-kmenu-width.diff
 Patch102: 0048-qclipboard_hack_80072.patch
 Patch103: 0056-khotkeys_input_84434.patch
+Patch104: 0069-fix-minsize.patch
+Patch105: 0070-fix-broken-fonts.patch
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
-Patch201: qt-x11-free-3.3.6-arabic_fonts.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -248,9 +249,9 @@
 %patch101 -p0 -b .0047-fix-kmenu-width
 %patch102 -p0 -b .0048-qclipboard_hack_80072
 %patch103 -p0 -b .0056-khotkeys_input_84434
-
+%patch104 -p0 -b .0069-fix-minsize
+%patch105 -p0 -b .0070-fix-broken-fonts
 %patch200 -p1 -b .fullscreen
-%patch201 -p1 -b .arabic_fonts
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -279,12 +280,7 @@
 # don't use rpath
 perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
 
-# set correct FLAGS
-%if ! %{debug}
-  disable_warning="-DQT_NO_CHECK"
-%endif
-
-perl -pi -e "s|-O2|$INCLUDES %{optflags} $disable_warning|g" mkspecs/*/qmake.conf
+perl -pi -e "s|-O2|$INCLUDES %{optflags}|g" mkspecs/*/qmake.conf
 
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
@@ -499,6 +495,11 @@
 
 
 %changelog
+* Mon Jul 10 2006 Than Ngo <than at redhat.com> 1:3.3.6-11
+- apply upstream patches, fix arabic fonts issue, and
+  problems with missing minimum size when richtext
+  labels are used
+
 * Thu Jun 29 2006 Than Ngo <than at redhat.com> 1:3.3.6-10
 - apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts
 


--- qt-x11-free-3.3.6-arabic_fonts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 12:25:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 08:25:30 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen-compile-fixes.patch,1.5,1.6
Message-ID: <200607101225.k6ACPULZ024947@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fix xen mismerge

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 drivers/block/aoe/aoenet.c                                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h         |    7 +++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/e820.h   |    3 +-
 16 files changed, 50 insertions(+), 13 deletions(-)

Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-xen-compile-fixes.patch	10 Jul 2006 11:46:35 -0000	1.5
+++ linux-2.6-xen-compile-fixes.patch	10 Jul 2006 12:25:28 -0000	1.6
@@ -227,3 +227,15 @@
  
  extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);
  extern void e820_setup_gap(struct e820entry *e820, int nr_map);
+--- linux-2.6.17.work/drivers/block/aoe/aoenet.c	2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17.noarch/drivers/block/aoe/aoenet.c	2006-07-10 14:23:12.000000000 +0200
+@@ -116,8 +116,7 @@
+ 	skb = skb_share_check(skb, GFP_ATOMIC);
+ 	if (skb == NULL)
+ 		return 0;
+-	if (skb_is_nonlinear(skb))
+-	if (skb_linearize(skb, GFP_ATOMIC) < 0)
++	if (skb_linearize(skb))
+ 		goto exit;
+ 	if (!is_aoe_netif(ifp))
+ 		goto exit;



From fedora-cvs-commits at redhat.com  Mon Jul 10 12:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 08:36:03 -0400
Subject: rpms/qt/FC-5 0069-fix-minsize.patch, NONE,
	1.1 0070-fix-broken-fonts.patch, NONE, 1.1 qt.spec, 1.107,
	1.108 qt-x11-free-3.3.6-arabic_fonts.patch, 1.1, NONE
Message-ID: <200607101236.k6ACa3cq027607@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	qt.spec 
Added Files:
	0069-fix-minsize.patch 0070-fix-broken-fonts.patch 
Removed Files:
	qt-x11-free-3.3.6-arabic_fonts.patch 
Log Message:
- apply upstream patches, fix arabic fonts issue, and
  problems with missing minimum size when richtext
  labels are used


0069-fix-minsize.patch:
 qlayout.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0069-fix-minsize.patch ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: yes
author: TT
This patch fixes problems with missing minimum size when richtext
labels are used.

--- src/kernel/qlayout.cpp.sav	2006-03-17 14:33:44.000000000 +0100
+++ src/kernel/qlayout.cpp	2006-03-21 11:53:13.000000000 +0100
@@ -275,7 +275,7 @@ void QGridLayoutData::recalcHFW( int w, 
 
     hfw_width = w;
     hfw_height = QMIN( QLAYOUTSIZE_MAX, h );
-    hfw_minheight = QMIN( QLAYOUTSIZE_MAX, h );
+    hfw_minheight = QMIN( QLAYOUTSIZE_MAX, mh );
 }
 
 int QGridLayoutData::heightForWidth( int w, int margin, int spacing )

0070-fix-broken-fonts.patch:
 qfontengine_p.h       |    6 ++--
 qfontengine_x11.cpp   |   31 ++++++++++++---------
 qscriptengine.cpp     |   71 ++++++++++++++++++++++++++++----------------------
 qscriptengine_x11.cpp |    7 ++++
 4 files changed, 68 insertions(+), 47 deletions(-)

--- NEW FILE 0070-fix-broken-fonts.patch ---
qt-bugs@ issue : none
bugs.kde.org number : none
applied: yes
author: TT
Some arabic fonts seem to contain broken open type
tables (esp. some fonts used on Ubuntu).

To fix this we now check the return values of the open
type code, and fall back to non open type shaping
if the code fails.

Index: src/kernel/qscriptengine.cpp
===================================================================
--- src/kernel/qscriptengine.cpp	(revision 546857)
+++ src/kernel/qscriptengine.cpp	(working copy)
@@ -289,7 +289,7 @@
     unsigned short *logClusters = item->log_clusters;
 
     int i;
-    for (i = 0; i < length; ++i) 
+    for (i = 0; i < length; ++i)
         logClusters[i] = i;
 
     // first char in a run is never (treated as) a mark
@@ -304,7 +304,7 @@
     } else {
         item->attributes[0].zeroWidth = FALSE;
     }
-    
+
     int lastCat = ::category(uc[0]);
     for (i = 1; i < length; ++i) {
         int cat = ::category(uc[i]);
@@ -381,7 +381,7 @@
 
 static bool basic_shape(QShaperItem *item)
 {
-    if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances, 
+    if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
                                  &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
         return FALSE;
 
@@ -421,7 +421,7 @@
 
     if (openType && openType->supportsScript(item->script)) {
         openType->selectScript(item->script, hebrew_features);
-        
+
         if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
                                      &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
             return FALSE;
@@ -437,7 +437,7 @@
         ShinDot = 0x5c1,
         SinDot = 0x5c2,
         Patah = 0x5b7,
-        Qamats = 0x5b8, 
+        Qamats = 0x5b8,
         Holam = 0x5b9,
         Rafe = 0x5bf
     };
@@ -446,7 +446,7 @@
 
     const QChar *uc = item->string->unicode() + item->from;
     unsigned short *logClusters = item->log_clusters;
-    
+
     *shapedChars = *uc;
     logClusters[0] = 0;
     int slen = 1;
@@ -460,9 +460,9 @@
             if (base >= 0x5d0
                 && base <= 0x5ea
                 && base != 0x5d7
-                && base != 0x5dd 
-                && base != 0x5df 
-                && base != 0x5e2 
+                && base != 0x5dd
+                && base != 0x5df
+                && base != 0x5e2
                 && base != 0x5e5) {
                 shaped = base - 0x5d0 + 0xfb30;
             } else if (base == 0xfb2a || base == 0xfb2b /* Shin with Shin or Sin dot */) {
@@ -532,12 +532,12 @@
         }
         logClusters[i] = cluster_start;
     }
-    
+
     if (item->font->stringToCMap(shapedChars, slen, item->glyphs, item->advances,
                                  &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
         return FALSE;
     for (i = 0; i < item->num_glyphs; ++i) {
-        if (item->attributes[i].mark) 
+        if (item->attributes[i].mark)
             item->advances[i] = 0;
     }
     qt_heuristicPosition(item);
@@ -1461,12 +1461,12 @@
 
 enum {
     InitProperty = 0x2,
-    IsolProperty = 0x4, 
+    IsolProperty = 0x4,
     FinaProperty = 0x8,
     MediProperty = 0x10,
-    RligProperty = 0x20, 
-    CaltProperty = 0x40, 
-    LigaProperty = 0x80, 
+    RligProperty = 0x20,
+    CaltProperty = 0x40,
+    LigaProperty = 0x80,
     DligProperty = 0x100,
     CswhProperty = 0x200,
     MsetProperty = 0x400
@@ -1477,14 +1477,14 @@
     { FT_MAKE_TAG('i', 's', 'o', 'l'), IsolProperty },
     { FT_MAKE_TAG('f', 'i', 'n', 'a'), FinaProperty },
     { FT_MAKE_TAG('m', 'e', 'd', 'i'), MediProperty },
-    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty }, 
-    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty }, 
-    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty }, 
-    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty }, 
-    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty }, 
+    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
+    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty },
+    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty },
+    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty },
+    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty },
     { FT_MAKE_TAG('c', 's', 'w', 'h'), CswhProperty },
     // mset is used in old Win95 fonts that don't have a 'mark' positioning table.
-    { FT_MAKE_TAG('m', 's', 'e', 't'), MsetProperty }, 
+    { FT_MAKE_TAG('m', 's', 'e', 't'), MsetProperty },
     {0, 0}
 };
 
@@ -1496,16 +1496,18 @@
     { FT_MAKE_TAG('f', 'i', 'n', '3'), FinaProperty },
     { FT_MAKE_TAG('m', 'e', 'd', 'i'), MediProperty },
     { FT_MAKE_TAG('m', 'e', 'd', '2'), MediProperty },
-    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty }, 
-    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty }, 
-    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty }, 
-    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty }, 
-    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty }, 
+    { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
+    { FT_MAKE_TAG('r', 'l', 'i', 'g'), RligProperty },
+    { FT_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty },
+    { FT_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty },
+    { FT_MAKE_TAG('d', 'l', 'i', 'g'), DligProperty },
     {0, 0}
 };
 
-static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item)
+static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item, bool *ot_ok)
 {
+    *ot_ok = true;
+
     openType->selectScript(item->script, item->script == QFont::Arabic ? arabic_features : syriac_features);
     int nglyphs = item->num_glyphs;
     if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
@@ -1562,7 +1564,10 @@
             apply[i] |= IsolProperty|MediProperty|FinaProperty;
     }
 
-    openType->shape(item, apply.data());
+    if (!openType->shape(item, apply.data())) {
+        *ot_ok = false;
+        return false;
+    }
     item->num_glyphs = nglyphs;
     return openType->positionAndAdd(item);
 }
@@ -1577,8 +1582,14 @@
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     QOpenType *openType = item->font->openType();
 
-    if (openType && openType->supportsScript(QFont::Arabic))
-        return arabicSyriacOpenTypeShape(openType, item);
+    if (openType && openType->supportsScript(QFont::Arabic)) {
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
+    }
 #endif
 
     QVarLengthArray<ushort> shapedChars(item->length);
Index: src/kernel/qfontengine_p.h
===================================================================
--- src/kernel/qfontengine_p.h	(revision 546857)
+++ src/kernel/qfontengine_p.h	(working copy)
@@ -490,8 +490,8 @@
         return supported_scripts[script];
     }
     void selectScript(unsigned int script, const Features *features = 0);
-    
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }
@@ -499,7 +499,7 @@
     void setProperty(int index, uint property) { otl_buffer->in_string[index].properties = property; }
 
 
-private: 
+private:
     bool checkScript(unsigned int script);
     QFontEngine *fontEngine;
     FT_Face face;
Index: src/kernel/qfontengine_x11.cpp
===================================================================
--- src/kernel/qfontengine_x11.cpp	(revision 546857)
+++ src/kernel/qfontengine_x11.cpp	(working copy)
@@ -154,7 +154,7 @@
         return;
 
     w += h; // add some pixels to width because of italic correction
-    QBitmap bm( w, h, TRUE );     // create bitmap 
+    QBitmap bm( w, h, TRUE );     // create bitmap
     QPainter paint;
     paint.begin( &bm );             // draw text in bitmap
     fe->draw( &paint, 0, si->ascent, engine, si, textFlags );
@@ -2396,7 +2396,7 @@
         qDebug("error loading gpos table: %d", error);
 #endif
     }
-    
+
     for (uint i = 0; i < QFont::NScripts; ++i)
         supported_scripts[i] = checkScript(i);
 }
@@ -2427,7 +2427,7 @@
     if (requirements & RequiresGsub) {
         if (!gsub)
             return FALSE;
-        
+
         FT_UShort script_index;
         FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index);
         if (error) {
@@ -2437,11 +2437,11 @@
             return FALSE;
         }
     }
-    
+
     if (requirements & RequiresGpos) {
         if (!gpos)
             return FALSE;
-        
+
         FT_UShort script_index;
         FT_Error error = TT_GPOS_Select_Script(gpos, script, &script_index);
         if (error) {
@@ -2460,7 +2460,7 @@
 {
     if (current_script == script)
         return;
-    
+
     assert(script < QFont::NScripts);
     // find script in our list of supported scripts.
     uint tag = ot_scripts[script].tag;
@@ -2497,7 +2497,7 @@
             }
         }
     }
-    
+
     if (gpos) {
         TT_GPOS_Clear_Features(gpos);
         FT_UShort script_index;
@@ -2544,7 +2544,7 @@
 
 extern void qt_heuristicPosition(QShaperItem *item);
 
-void QOpenType::shape(QShaperItem *item, const unsigned int *properties)
+bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
 {
     length = item->num_glyphs;
 
@@ -2571,8 +2571,11 @@
 
     loadFlags = FT_LOAD_DEFAULT;
 
-    if (gsub)
-        TT_GSUB_Apply_String(gsub, otl_buffer);
+    if (gsub) {
+        uint error = TT_GSUB_Apply_String(gsub, otl_buffer);
+        if (error && error != TTO_Err_Not_Covered)
+            return false;
+    }
 
 #ifdef OT_DEBUG
 //     qDebug("log clusters before shaping:");
@@ -2584,6 +2587,8 @@
     qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
+
+    return true;
 }
 
 bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
@@ -2600,7 +2605,7 @@
         unlockFTFace(static_cast<QFontEngineXft *>(fontEngine)->font());
 #endif
     }
-    
+
     // make sure we have enough space to write everything back
     if (item->num_glyphs < (int)otl_buffer->in_length) {
         item->num_glyphs = otl_buffer->in_length;
@@ -2654,11 +2659,11 @@
             // ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
             if (positions[i].new_advance) {
                 item->advances[i] = item->flags & QTextEngine::RightToLeft
-                                    ? -qRound((positions[i].x_advance >> 6)*scale) 
+                                    ? -qRound((positions[i].x_advance >> 6)*scale)
                                     :  qRound((positions[i].x_advance >> 6)*scale);
             } else {
                 item->advances[i] += item->flags & QTextEngine::RightToLeft
-                                     ? -qRound((positions[i].x_advance >> 6)*scale) 
+                                     ? -qRound((positions[i].x_advance >> 6)*scale)
                                      :  qRound((positions[i].x_advance >> 6)*scale);
             }
 	    item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale);
Index: src/kernel/qscriptengine_x11.cpp
===================================================================
--- src/kernel/qscriptengine_x11.cpp	(revision 546857)
+++ src/kernel/qscriptengine_x11.cpp	(working copy)
@@ -45,7 +45,12 @@
 #ifndef QT_NO_XFTFREETYPE
     QOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(QFont::Syriac)) {
-        return arabicSyriacOpenTypeShape(openType, item);
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
     }
 #endif
     return basic_shape(item);


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/FC-5/qt.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- qt.spec	29 Jun 2006 07:03:03 -0000	1.107
+++ qt.spec	10 Jul 2006 12:36:01 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 0.3.fc5
+Release: 0.4.fc5
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -39,10 +39,11 @@
 Patch101: 0047-fix-kmenu-width.diff
 Patch102: 0048-qclipboard_hack_80072.patch
 Patch103: 0056-khotkeys_input_84434.patch
+Patch104: 0069-fix-minsize.patch
+Patch105: 0070-fix-broken-fonts.patch
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
-Patch201: qt-x11-free-3.3.6-arabic_fonts.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -239,9 +240,10 @@
 %patch101 -p0 -b .0047-fix-kmenu-width
 %patch102 -p0 -b .0048-qclipboard_hack_80072
 %patch103 -p0 -b .0056-khotkeys_input_84434
+%patch104 -p0 -b .0069-fix-minsize
+%patch105 -p0 -b .0070-fix-broken-fonts
 
 %patch200 -p1 -b .fullscreen
-%patch201 -p1 -b .arabic_fonts
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -270,12 +272,7 @@
 # don't use rpath
 perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
 
-# set correct FLAGS
-%if ! %{debug}
-  disable_warning="-DQT_NO_CHECK"
-%endif
-
-perl -pi -e "s|-O2|$INCLUDES %{optflags} $disable_warning|g" mkspecs/*/qmake.conf
+perl -pi -e "s|-O2|$INCLUDES %{optflags}|g" mkspecs/*/qmake.conf
 
 # set correct lib path
 if [ "%{_lib}" == "lib64" ] ; then
@@ -512,6 +509,11 @@
 
 
 %changelog
+* Mon Jul 10 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.4.fc5
+- apply upstream patches, fix arabic fonts issue, and
+  problems with missing minimum size when richtext
+  labels are used
+
 * Thu Jun 29 2006 Than Ngo <than at redhat.com> 1:3.3.6-0.3.fc5
 - fix #183302, IM preedit issue in kbabel
 - apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts


--- qt-x11-free-3.3.6-arabic_fonts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 12:48:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 08:48:57 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch, NONE,
	1.1 openoffice.org.spec, 1.674, 1.675
Message-ID: <200607101248.k6ACmvbs024128@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24114

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch 
Log Message:
add openoffice.org-2.0.3.rh187919.gtkunderkde.patch

openoffice.org-2.0.3.rh187919.gtkunderkde.patch:
 salnativewidgets-gtk.cxx |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.3.rh187919.gtkunderkde.patch ---
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.14
diff -u -p -u -r1.14 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -392,10 +393,15 @@ void GtkData::initNWF( void )
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
     
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
-        // KDE 3.3 invented a bug in the qt<->gtk theme engine
-        // that makes direct rendering impossible: they totally
-        // ignore the clip rectangle passed to the paint methods
-        GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+	{
+		if( g_type_from_name( "QtEngineStyle" ) )
+		{
+			// KDE 3.3 invented a bug in the qt<->gtk theme engine
+			// that makes direct rendering impossible: they totally
+			// ignore the clip rectangle passed to the paint methods
+			GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+		}
+	}
     
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "GtkPlugin: using %s NWF\n",


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -r1.674 -r1.675
--- openoffice.org.spec	7 Jul 2006 14:51:32 -0000	1.674
+++ openoffice.org.spec	10 Jul 2006 12:48:55 -0000	1.675
@@ -179,6 +179,7 @@
 Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch52: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
+Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -841,6 +842,7 @@
 %patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
 %patch52 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch53 -p1 -b .ooo64206.sfx2.saveas.patch
+%patch54 -p1 -b .rh187919.gtkunderkde.patch
 
 
 %if %{includingexternals}
@@ -3291,6 +3293,7 @@
 - rh#197618# add openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make 
   ~/.recently-used safe
+- add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 * Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security



From fedora-cvs-commits at redhat.com  Mon Jul 10 13:00:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 09:00:58 -0400
Subject: rpms/sysfsutils/devel sysfsutils.spec,1.17,1.18
Message-ID: <200607101300.k6AD0wsT024208@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/sysfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24195

Modified Files:
	sysfsutils.spec 
Log Message:
fixing spec file for bz 198054


Index: sysfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sysfsutils.spec	7 Jul 2006 23:33:14 -0000	1.17
+++ sysfsutils.spec	10 Jul 2006 13:00:56 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: sysfsutils, library interface to sysfs.
 Name: sysfsutils
 Version: 2.0.0
-Release: 3 
+Release: 4 
 Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-redhatify.patch
 License: GPL
@@ -24,6 +24,7 @@
 Summary: Static library and headers for libsysfs
 Group: Development/Libraries
 Requires: libsysfs = %{version}
+Obsoletes: sysfsutils-devel
 
 %description -n libsysfs-devel
 libsysfs-devel provides the header files and static libraries required
@@ -75,6 +76,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Neil Horman  <nhorman at redhat.com> - 2.0.0-4
+- Obsoleting old sysfsutil-devel package for upgrade path (bz 198054)
+
 * Fri Jul  7 2006 Doug Ledford <dledford at redhat.com> - 2.0.0-3
 - Split the library and devel files out to libsysfs and leave the utils
   in sysfsutils.  This is for multilib arch requirements.



From fedora-cvs-commits at redhat.com  Mon Jul 10 13:25:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 09:25:53 -0400
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.30,1.31
Message-ID: <200607101325.k6ADPqLO022288@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22194

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Add missing BR for jsp (API)




Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-el.spec	19 May 2006 22:52:18 -0000	1.30
+++ jakarta-commons-el.spec	10 Jul 2006 13:25:49 -0000	1.31
@@ -51,9 +51,11 @@
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif
-BuildRequires:  ant, junit
-BuildRequires:  jpackage-utils >= 0:1.5.30
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant
+BuildRequires:  jsp
 BuildRequires:  servletapi5
+BuildRequires:  junit
 
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
@@ -161,6 +163,7 @@
 %changelog
 * Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_2fc
 - Build with gcj_support enabled
+- Add missing BR for jsp (API)
 
 * Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_1fc
 - First build for FC6



From fedora-cvs-commits at redhat.com  Mon Jul 10 13:27:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 09:27:07 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen.patch,1.16,1.17
Message-ID: <200607101327.k6ADR7EW022788@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6-xen.patch 
Log Message:
everything is xen, and then ia64 didn't work

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1109 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  694 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  376 --
 arch/ia64/kernel/gate.lds.S                         |   96 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   61 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  784 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   10 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    2 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   70 
 drivers/oprofile/buffer_sync.h                      |    5 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |   12 
 drivers/oprofile/event_buffer.h                     |    5 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  205 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    5 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  248 +
 drivers/xen/Makefile                                |   16 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1107 ++++++++
 drivers/xen/netback/xenbus.c                        |  404 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1599 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1107 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   25 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  277 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   72 
 include/linux/oprofile.h                            |    9 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   53 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    2 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    6 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  420 +++
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  148 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  283 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  179 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   51 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 459 files changed, 83291 insertions(+), 1257 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-xen.patch	10 Jul 2006 11:46:34 -0000	1.16
+++ linux-2.6-xen.patch	10 Jul 2006 13:27:04 -0000	1.17
@@ -45783,7 +45783,7 @@
  unsigned long fs_buffer_size = 131072;
  unsigned long fs_cpu_buffer_size = 8192;
  unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
-@@ -117,11 +123,202 @@ static ssize_t dump_write(struct file * 
+@@ -117,11 +123,206 @@ static ssize_t dump_write(struct file * 
  static struct file_operations dump_fops = {
  	.write		= dump_write,
  };
@@ -45791,6 +45791,10 @@
 +
 +#define TMPBUFSIZE 512
 +
++#ifndef MAX_OPROF_DOMAINS
++#define MAX_OPROF_DOMAINS   25	
++#endif
++
 +static unsigned int adomains = 0;
 +static int active_domains[MAX_OPROF_DOMAINS + 1];
 +static DEFINE_MUTEX(adom_mutex);



From fedora-cvs-commits at redhat.com  Mon Jul 10 13:31:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 09:31:02 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch, NONE,
	1.1 openoffice.org.spec, 1.757, 1.758
Message-ID: <200607101331.k6ADV2lQ024252@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24051

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch 
Log Message:
add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch

openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch:
 source/filter/html/swhtml.hxx    |    0 
 sw/source/filter/html/swhtml.hxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch ---
Index: source/filter/html/swhtml.hxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/html/swhtml.hxx,v
retrieving revision 1.12
diff -u -r1.12 swhtml.hxx
--- openoffice.org.orig/sw/source/filter/html/swhtml.hxx	16 Mar 2006 12:36:56 -0000	1.12
+++ openoffice.org/sw/source/filter/html/swhtml.hxx	10 Jul 2006 13:27:35 -0000
@@ -450,7 +450,7 @@
 
 	sal_uInt32 	aFontHeights[7];	// die Font-Hoehen 1-7
 	sal_uInt32	nScriptStartLineNr;	// Zeilennummer eines Script-Blocks
-	sal_uInt32					nEventId;
+	ULONG		nEventId;
 
 	sal_uInt16	nBaseFontStMin;		//
 	sal_uInt16	nFontStMin; 		//


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- openoffice.org.spec	7 Jul 2006 12:05:38 -0000	1.757
+++ openoffice.org.spec	10 Jul 2006 13:30:59 -0000	1.758
@@ -110,6 +110,7 @@
 Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -847,6 +848,7 @@
 %patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
+%patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 
 tar xzf %{SOURCE1}
 
@@ -3327,6 +3329,7 @@
 * Wed Jul 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+- add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:12:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:12:31 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.55, 1.56 firstboot.spec, 1.76,
	1.77 sources, 1.72, 1.73
Message-ID: <200607101412.k6AECVVk018078@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18020

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	21 Jun 2006 15:46:49 -0000	1.55
+++ .cvsignore	10 Jul 2006 14:12:28 -0000	1.56
@@ -27,3 +27,4 @@
 firstboot-1.4.10.tar.bz2
 firstboot-1.4.11.tar.bz2
 firstboot-1.4.12.tar.bz2
+firstboot-1.4.13.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- firstboot.spec	21 Jun 2006 15:46:49 -0000	1.76
+++ firstboot.spec	10 Jul 2006 14:12:28 -0000	1.77
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.12
+Version: 1.4.13
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Fri Jul 10 2006 Chris Lumens <clumens at redhat.com> 1.4.13-1
+- Better fix for the no display hardware case (#192808).
+
 * Wed Jun 21 2006 Chris Lumens <clumens at redhat.com> 1.4.12-1
 - Update translation files (#195010).
 - Fix traceback on exiting (#196128).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	21 Jun 2006 15:46:49 -0000	1.72
+++ sources	10 Jul 2006 14:12:28 -0000	1.73
@@ -1 +1 @@
-b7ea5d58b5b5e5d41864af6913772d1d  firstboot-1.4.12.tar.bz2
+cf55d4ceb618c246677501e155780541  firstboot-1.4.13.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:20:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:20:25 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.56,
	1.57 sources, 1.69, 1.70 system-config-securitylevel.spec,
	1.80, 1.81
Message-ID: <200607101420.k6AEKPGZ003253@cvs.devel.redhat.com>

Author: clumens

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

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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	5 Jun 2006 20:41:25 -0000	1.56
+++ .cvsignore	10 Jul 2006 14:20:22 -0000	1.57
@@ -44,3 +44,4 @@
 system-config-securitylevel-1.6.18.tar.bz2
 system-config-securitylevel-1.6.19.tar.bz2
 system-config-securitylevel-1.6.20.tar.bz2
+system-config-securitylevel-1.6.21.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	5 Jun 2006 20:41:25 -0000	1.69
+++ sources	10 Jul 2006 14:20:22 -0000	1.70
@@ -1 +1 @@
-8b0db7eea079338b39c20b87c117b3cf  system-config-securitylevel-1.6.20.tar.bz2
+7e45e0a91a474854461c868d01b940c1  system-config-securitylevel-1.6.21.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- system-config-securitylevel.spec	5 Jun 2006 20:41:25 -0000	1.80
+++ system-config-securitylevel.spec	10 Jul 2006 14:20:22 -0000	1.81
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.20
+Version: 1.6.21
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -99,6 +99,10 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Mon Jul 10 2006 Chris Lumens <clumens at redhat.com> 1.6.21-1
+- Correctly mark messages for translation (#195013).
+- Remove /etc/sysconfig/ip6tables when firewall is disabled (#195786).
+
 * Mon Jun 05 2006 Chris Lumens <clumens at redhat.com> 1.6.20-1
 - Be more careful when determining if something is a range or service with
   a dash in it (#192933).



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:24:20 -0400
Subject: rpms/agg/devel agg-2.4-depends.patch,NONE,1.1 agg.spec,1.11,1.12
Message-ID: <200607101424.k6AEOKxK004953@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4919

Modified Files:
	agg.spec 
Added Files:
	agg-2.4-depends.patch 
Log Message:
rh#198174# add some runtime ldd depends

agg-2.4-depends.patch:
 font_freetype/Makefile.am    |    3 ++-
 src/platform/X11/Makefile.am |    2 +-
 src/platform/sdl/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE agg-2.4-depends.patch ---
diff -ru agg-2.4.orig/font_freetype/Makefile.am agg-2.4/font_freetype/Makefile.am
--- agg-2.4.orig/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
+++ agg-2.4/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -4,8 +4,9 @@
 agginclude_HEADERS = agg_font_freetype.h
 lib_LTLIBRARIES = libaggfontfreetype.la
 
-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ 
+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@
 libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
 libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ 
+libaggfontfreetype_la_LIBADD = ../src/libagg.la
 endif
 
diff -ru agg-2.4.orig/src/platform/sdl/Makefile.am agg-2.4/src/platform/sdl/Makefile.am
--- agg-2.4.orig/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
+++ agg-2.4/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -5,6 +5,6 @@
 libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
 libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
+libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ../../libagg.la
 endif
 
diff -ru agg-2.4.orig/src/platform/X11/Makefile.am agg-2.4/src/platform/X11/Makefile.am
--- agg-2.4.orig/src/platform/X11/Makefile.am	2005-10-19 19:11:35.000000000 +0100
+++ agg-2.4/src/platform/X11/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -4,5 +4,5 @@
 libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L at x_libraries@
 libaggplatformX11_la_SOURCES = agg_platform_support.cpp
 libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include @x_includes@
-libaggplatformX11_la_LIBADD = -lX11
+libaggplatformX11_la_LIBADD = -lX11 ../../libagg.la
 endif


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- agg.spec	11 May 2006 07:04:10 -0000	1.11
+++ agg.spec	10 Jul 2006 14:24:17 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.4
-Release: 1
+Release: 2
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
@@ -9,6 +9,8 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel
 
+Patch0: agg-2.4-depends.patch
+
 %description
 A High Quality Rendering Engine for C++
 
@@ -22,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .agg-2.4-depends
 
 %build
 sh ./autogen.sh --disable-gpc
@@ -54,6 +57,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 10 2006 Caolan McNamara <caolanm at redhat.com> - 2.4-2
+- rh#198174# add extra links from libs to their runtime requirements
+
 * Wed May 10 2006 Caolan McNamara <caolanm at redhat.com> - 2.4-1
 - next version
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:32:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:32:18 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.29, 1.30 sources,
	1.36, 1.37 system-config-kickstart.spec, 1.41, 1.42
Message-ID: <200607101432.k6AEWIT3007378@cvs.devel.redhat.com>

Author: clumens

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

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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	5 Jun 2006 20:31:23 -0000	1.29
+++ .cvsignore	10 Jul 2006 14:32:16 -0000	1.30
@@ -22,3 +22,4 @@
 system-config-kickstart-2.6.9.tar.bz2
 system-config-kickstart-2.6.10.tar.bz2
 system-config-kickstart-2.6.11.tar.bz2
+system-config-kickstart-2.6.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	5 Jun 2006 20:31:39 -0000	1.36
+++ sources	10 Jul 2006 14:32:16 -0000	1.37
@@ -1 +1 @@
-567eb8b5de741db55a47cc96cba36a21  system-config-kickstart-2.6.11.tar.bz2
+e066f5ec35fb97c5ccd783d353401b1f  system-config-kickstart-2.6.12.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-kickstart.spec	6 Jun 2006 02:01:45 -0000	1.41
+++ system-config-kickstart.spec	10 Jul 2006 14:32:16 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.11
-Release: 2
+Version: 2.6.12
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -79,6 +79,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Mon Jul 10 2006 Chris Lumens <clumens at redhat.com> 2.6.12-1
+- Fix for yum config API changes (#196841).
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 2.6.11-2
 - Add gettext as a BR
 - Fix up requires(post) and (postun)



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:39:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:39:22 -0400
Subject: rpms/oprofile/devel oprofile-power6.patch, NONE, 1.1 oprofile.spec,
	1.43, 1.44
Message-ID: <200607101439.k6AEdM29009192@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8894

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-power6.patch 
Log Message:
- Add power6 support. (#196505)



oprofile-power6.patch:
 events/Makefile.am                 |    1 
 events/ppc64/power6/event_mappings |  949 ++++++++++++++++++++++++++++++++++++
 events/ppc64/power6/events         |  960 +++++++++++++++++++++++++++++++++++++
 events/ppc64/power6/unit_masks     |    4 
 libop/op_cpu_type.c                |    1 
 libop/op_cpu_type.h                |    1 
 libop/op_events.c                  |    2 
 utils/opcontrol                    |    2 
 utils/ophelp.c                     |    1 
 9 files changed, 1920 insertions(+), 1 deletion(-)

--- NEW FILE oprofile-power6.patch ---
diff -paurN oprof-cvs-05.05.2006/events/Makefile.am oprof-cvs-power6-ver-2/events/Makefile.am
--- oprof-cvs-05.05.2006/events/Makefile.am	2006-02-22 08:36:36.000000000 -0600
+++ oprof-cvs-power6-ver-2/events/Makefile.am	2006-06-22 10:12:09.000000000 -0500
@@ -17,6 +17,7 @@ event_files = \
 	ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \
 	ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \
 	ppc64/power5+/events ppc64/power5+/event_mappings ppc64/power5+/unit_masks \
+        ppc64/power6/events ppc64/power6/event_mappings ppc64/power6/unit_masks \
 	ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \
 	rtc/events rtc/unit_masks \
 	x86-64/hammer/events x86-64/hammer/unit_masks \
diff -paurN oprof-cvs-05.05.2006/events/ppc64/power6/event_mappings oprof-cvs-power6-ver-2/events/ppc64/power6/event_mappings
--- oprof-cvs-05.05.2006/events/ppc64/power6/event_mappings	1969-12-31 18:00:00.000000000 -0600
+++ oprof-cvs-power6-ver-2/events/ppc64/power6/event_mappings	2006-06-22 11:52:25.000000000 -0500
@@ -0,0 +1,949 @@
+#Mapping of event groups to MMCR values
+
+#Group Default
+event:0X001 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+
+#Group 0 with random sampling
+event:0X002 mmcr0:0X00000000 mmcr1:0X000000001E1E021A mmcra:0X00000001
+
+#Group 1 pm_utilization, CPI and utilization data
+event:0X0010 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+event:0X0011 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+event:0X0012 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+event:0X0013 mmcr0:0X00000000 mmcr1:0X000000000A02121E mmcra:0X00000000
+
+#Group 2 pm_dcache, D cache
+event:0X0020 mmcr0:0X00000000 mmcr1:0X000000000C0E0C06 mmcra:0X00000000
+event:0X0021 mmcr0:0X00000000 mmcr1:0X000000000C0E0C06 mmcra:0X00000000
+event:0X0022 mmcr0:0X00000000 mmcr1:0X000000000C0E0C06 mmcra:0X00000000
+event:0X0023 mmcr0:0X00000000 mmcr1:0X000000000C0E0C06 mmcra:0X00000000
+
+#Group 3 pm_branch, Branch operations
+event:0X0030 mmcr0:0X00000000 mmcr1:0X04000000A2A8808A mmcra:0X00000000
+event:0X0031 mmcr0:0X00000000 mmcr1:0X04000000A2A8808A mmcra:0X00000000
+event:0X0032 mmcr0:0X00000000 mmcr1:0X04000000A2A8808A mmcra:0X00000000
+event:0X0033 mmcr0:0X00000000 mmcr1:0X04000000A2A8808A mmcra:0X00000000
+
+#Group 4 pm_branch2, Branch operations
+event:0X0040 mmcr0:0X00000000 mmcr1:0X04000000A4A68E8C mmcra:0X00000000
+event:0X0041 mmcr0:0X00000000 mmcr1:0X04000000A4A68E8C mmcra:0X00000000
+event:0X0042 mmcr0:0X00000000 mmcr1:0X04000000A4A68E8C mmcra:0X00000000
+event:0X0043 mmcr0:0X00000000 mmcr1:0X04000000A4A68E8C mmcra:0X00000000
+
+#Group 5 pm_branch3, Branch operations
+event:0X0050 mmcr0:0X00000000 mmcr1:0X04000000A0A28486 mmcra:0X00000000
+event:0X0051 mmcr0:0X00000000 mmcr1:0X04000000A0A28486 mmcra:0X00000000
+event:0X0052 mmcr0:0X00000000 mmcr1:0X04000000A0A28486 mmcra:0X00000000
+event:0X0053 mmcr0:0X00000000 mmcr1:0X04000000A0A28486 mmcra:0X00000000
+
+#Group 6 pm_branch4, Branch operations
+event:0X0060 mmcr0:0X00000000 mmcr1:0X04000000A8AA8C8E mmcra:0X00000000
+event:0X0061 mmcr0:0X00000000 mmcr1:0X04000000A8AA8C8E mmcra:0X00000000
+event:0X0062 mmcr0:0X00000000 mmcr1:0X04000000A8AA8C8E mmcra:0X00000000
+event:0X0063 mmcr0:0X00000000 mmcr1:0X04000000A8AA8C8E mmcra:0X00000000
+
+#Group 7 pm_branch5, Branch operations
+event:0X0070 mmcr0:0X00000000 mmcr1:0X04040000A052C652 mmcra:0X00000000
+event:0X0071 mmcr0:0X00000000 mmcr1:0X04040000A052C652 mmcra:0X00000000
+event:0X0072 mmcr0:0X00000000 mmcr1:0X04040000A052C652 mmcra:0X00000000
+event:0X0073 mmcr0:0X00000000 mmcr1:0X04040000A052C652 mmcra:0X00000000
+
+#Group 8 pm_dsource, Data source
+event:0X0080 mmcr0:0X00000000 mmcr1:0X0000000058585656 mmcra:0X00000000
+event:0X0081 mmcr0:0X00000000 mmcr1:0X0000000058585656 mmcra:0X00000000
+event:0X0082 mmcr0:0X00000000 mmcr1:0X0000000058585656 mmcra:0X00000000
+event:0X0083 mmcr0:0X00000000 mmcr1:0X0000000058585656 mmcra:0X00000000
+
+#Group 9 pm_dsource2, Data sources
+event:0X0090 mmcr0:0X00000000 mmcr1:0X000000005A5A5856 mmcra:0X00000000
+event:0X0091 mmcr0:0X00000000 mmcr1:0X000000005A5A5856 mmcra:0X00000000
+event:0X0092 mmcr0:0X00000000 mmcr1:0X000000005A5A5856 mmcra:0X00000000
+event:0X0093 mmcr0:0X00000000 mmcr1:0X000000005A5A5856 mmcra:0X00000000
+
+#Group 10 pm_dsource3, Data sources
+event:0X00A0 mmcr0:0X00000000 mmcr1:0X000000005A5A5A5A mmcra:0X00000000
+event:0X00A1 mmcr0:0X00000000 mmcr1:0X000000005A5A5A5A mmcra:0X00000000
+event:0X00A2 mmcr0:0X00000000 mmcr1:0X000000005A5A5A5A mmcra:0X00000000
+event:0X00A3 mmcr0:0X00000000 mmcr1:0X000000005A5A5A5A mmcra:0X00000000
+
+#Group 11 pm_dsource4, Data sources
+event:0X00B0 mmcr0:0X00000000 mmcr1:0X000000005C5C5C5C mmcra:0X00000000
+event:0X00B1 mmcr0:0X00000000 mmcr1:0X000000005C5C5C5C mmcra:0X00000000
+event:0X00B2 mmcr0:0X00000000 mmcr1:0X000000005C5C5C5C mmcra:0X00000000
+event:0X00B3 mmcr0:0X00000000 mmcr1:0X000000005C5C5C5C mmcra:0X00000000
+
+#Group 12 pm_dsource4, Data sources
+event:0X00C0 mmcr0:0X00000000 mmcr1:0X000000005E5E5E5E mmcra:0X00000000
+event:0X00C1 mmcr0:0X00000000 mmcr1:0X000000005E5E5E5E mmcra:0X00000000
+event:0X00C2 mmcr0:0X00000000 mmcr1:0X000000005E5E5E5E mmcra:0X00000000
+event:0X00C3 mmcr0:0X00000000 mmcr1:0X000000005E5E5E5E mmcra:0X00000000
+
+#Group 13 pm_dlatencies, Data latencies
+event:0X00D0 mmcr0:0X00000000 mmcr1:0X000000000C281E24 mmcra:0X00000000
+event:0X00D1 mmcr0:0X00000000 mmcr1:0X000000000C281E24 mmcra:0X00000000
+event:0X00D2 mmcr0:0X00000000 mmcr1:0X000000000C281E24 mmcra:0X00000000
+event:0X00D3 mmcr0:0X00000000 mmcr1:0X000000000C281E24 mmcra:0X00000000
+
+#Group 14 pm_dlatencies2, Data latencies
+event:0X00E0 mmcr0:0X00000000 mmcr1:0X00000000022C1E2A mmcra:0X00000000
+event:0X00E1 mmcr0:0X00000000 mmcr1:0X00000000022C1E2A mmcra:0X00000000
+event:0X00E2 mmcr0:0X00000000 mmcr1:0X00000000022C1E2A mmcra:0X00000000
+event:0X00E3 mmcr0:0X00000000 mmcr1:0X00000000022C1E2A mmcra:0X00000000
+
+#Group 15 pm_dlatencies3, Data latencies
+event:0X00F0 mmcr0:0X00000000 mmcr1:0X00000000022E5E2C mmcra:0X00000000
+event:0X00F1 mmcr0:0X00000000 mmcr1:0X00000000022E5E2C mmcra:0X00000000
+event:0X00F2 mmcr0:0X00000000 mmcr1:0X00000000022E5E2C mmcra:0X00000000
+event:0X00F3 mmcr0:0X00000000 mmcr1:0X00000000022E5E2C mmcra:0X00000000
+
+#Group 16 pm_dlatencies4, Data latencies
+event:0X0100 mmcr0:0X00000000 mmcr1:0X000000005A2A5C26 mmcra:0X00000000
+event:0X0101 mmcr0:0X00000000 mmcr1:0X000000005A2A5C26 mmcra:0X00000000
+event:0X0102 mmcr0:0X00000000 mmcr1:0X000000005A2A5C26 mmcra:0X00000000
+event:0X0103 mmcr0:0X00000000 mmcr1:0X000000005A2A5C26 mmcra:0X00000000
+
+#Group 17 pm_dlatencies5, Data latencies
+event:0X0110 mmcr0:0X00000000 mmcr1:0X000000005C225828 mmcra:0X00000000
+event:0X0111 mmcr0:0X00000000 mmcr1:0X000000005C225828 mmcra:0X00000000
+event:0X0112 mmcr0:0X00000000 mmcr1:0X000000005C225828 mmcra:0X00000000
+event:0X0113 mmcr0:0X00000000 mmcr1:0X000000005C225828 mmcra:0X00000000
+
+#Group 18 pm_dlatencies6, Data latencies
+event:0X0120 mmcr0:0X00000000 mmcr1:0X000000005E245A2E mmcra:0X00000000
+event:0X0121 mmcr0:0X00000000 mmcr1:0X000000005E245A2E mmcra:0X00000000
+event:0X0122 mmcr0:0X00000000 mmcr1:0X000000005E245A2E mmcra:0X00000000
+event:0X0123 mmcr0:0X00000000 mmcr1:0X000000005E245A2E mmcra:0X00000000
+
+#Group 19 pm_dlatencies7, Data latencies
+event:0X0130 mmcr0:0X00000000 mmcr1:0X000000005820120E mmcra:0X00000000
+event:0X0131 mmcr0:0X00000000 mmcr1:0X000000005820120E mmcra:0X00000000
+event:0X0132 mmcr0:0X00000000 mmcr1:0X000000005820120E mmcra:0X00000000
+event:0X0133 mmcr0:0X00000000 mmcr1:0X000000005820120E mmcra:0X00000000
+
+#Group 20 pm_dlatencies8, Data latencies
+event:0X0140 mmcr0:0X00000000 mmcr1:0X0000000010581E20 mmcra:0X00000000
+event:0X0141 mmcr0:0X00000000 mmcr1:0X0000000010581E20 mmcra:0X00000000
+event:0X0142 mmcr0:0X00000000 mmcr1:0X0000000010581E20 mmcra:0X00000000
+event:0X0143 mmcr0:0X00000000 mmcr1:0X0000000010581E20 mmcra:0X00000000
+
+#Group 21 pm_dlatencies9, Data latencies
+event:0X0150 mmcr0:0X00000000 mmcr1:0X00000000122C125E mmcra:0X00000000
+event:0X0151 mmcr0:0X00000000 mmcr1:0X00000000122C125E mmcra:0X00000000
+event:0X0152 mmcr0:0X00000000 mmcr1:0X00000000122C125E mmcra:0X00000000
+event:0X0153 mmcr0:0X00000000 mmcr1:0X00000000122C125E mmcra:0X00000000
+
+#Group 22 pm_dlatencies10, Data latencies
+event:0X0160 mmcr0:0X00000000 mmcr1:0X000000005A261E26 mmcra:0X00000000
+event:0X0161 mmcr0:0X00000000 mmcr1:0X000000005A261E26 mmcra:0X00000000
+event:0X0162 mmcr0:0X00000000 mmcr1:0X000000005A261E26 mmcra:0X00000000
+event:0X0163 mmcr0:0X00000000 mmcr1:0X000000005A261E26 mmcra:0X00000000
+
+#Group 23 pm_isource, Instruction sources
+event:0X0170 mmcr0:0X00000000 mmcr1:0X0040000040404654 mmcra:0X00000000
+event:0X0171 mmcr0:0X00000000 mmcr1:0X0040000040404654 mmcra:0X00000000
+event:0X0172 mmcr0:0X00000000 mmcr1:0X0040000040404654 mmcra:0X00000000
+event:0X0173 mmcr0:0X00000000 mmcr1:0X0040000040404654 mmcra:0X00000000
+
+#Group 24 pm_isource2, Instruction sources
+event:0X0180 mmcr0:0X00000000 mmcr1:0X0040000046464046 mmcra:0X00000000
+event:0X0181 mmcr0:0X00000000 mmcr1:0X0040000046464046 mmcra:0X00000000
+event:0X0182 mmcr0:0X00000000 mmcr1:0X0040000046464046 mmcra:0X00000000
+event:0X0183 mmcr0:0X00000000 mmcr1:0X0040000046464046 mmcra:0X00000000
+
+#Group 25 pm_isource3, Instruction sources
+event:0X0190 mmcr0:0X00000000 mmcr1:0X0040000044444444 mmcra:0X00000000
+event:0X0191 mmcr0:0X00000000 mmcr1:0X0040000044444444 mmcra:0X00000000
+event:0X0192 mmcr0:0X00000000 mmcr1:0X0040000044444444 mmcra:0X00000000
+event:0X0193 mmcr0:0X00000000 mmcr1:0X0040000044444444 mmcra:0X00000000
+
+#Group 26 pm_isource4, Instruction sources
+event:0X01A0 mmcr0:0X00000000 mmcr1:0X0040000042424242 mmcra:0X00000000
+event:0X01A1 mmcr0:0X00000000 mmcr1:0X0040000042424242 mmcra:0X00000000
+event:0X01A2 mmcr0:0X00000000 mmcr1:0X0040000042424242 mmcra:0X00000000
+event:0X01A3 mmcr0:0X00000000 mmcr1:0X0040000042424242 mmcra:0X00000000
+
+#Group 27 pm_isource5, Instruction sources
+event:0X01B0 mmcr0:0X00000000 mmcr1:0X0040000040405454 mmcra:0X00000000
+event:0X01B1 mmcr0:0X00000000 mmcr1:0X0040000040405454 mmcra:0X00000000
+event:0X01B2 mmcr0:0X00000000 mmcr1:0X0040000040405454 mmcra:0X00000000
+event:0X01B3 mmcr0:0X00000000 mmcr1:0X0040000040405454 mmcra:0X00000000
+
+#Group 28 pm_pteg, PTEG sources
+event:0X01C0 mmcr0:0X00000000 mmcr1:0X0001000048484E4E mmcra:0X00000000
+event:0X01C1 mmcr0:0X00000000 mmcr1:0X0001000048484E4E mmcra:0X00000000
+event:0X01C2 mmcr0:0X00000000 mmcr1:0X0001000048484E4E mmcra:0X00000000
+event:0X01C3 mmcr0:0X00000000 mmcr1:0X0001000048484E4E mmcra:0X00000000
+
+#Group 29 pm_pteg2, PTEG sources
+event:0X01D0 mmcr0:0X00000000 mmcr1:0X000100002848484C mmcra:0X00000000
+event:0X01D1 mmcr0:0X00000000 mmcr1:0X000100002848484C mmcra:0X00000000
+event:0X01D2 mmcr0:0X00000000 mmcr1:0X000100002848484C mmcra:0X00000000
+event:0X01D3 mmcr0:0X00000000 mmcr1:0X000100002848484C mmcra:0X00000000
+
+#Group 30 pm_pteg3, PTEG sources
+event:0X01E0 mmcr0:0X00000000 mmcr1:0X000100004E4E284A mmcra:0X00000000
[...1601 lines suppressed...]
+event:0X0882 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP136 : (Group 136 pm_mrk_dsource5) Instructions completed
+event:0X0883 counters:3 um:zero minimum:1000 name:PM_MRK_DATA_FROM_LMEM_GRP136 : (Group 136 pm_mrk_dsource5) Marked data loaded from local memory
+
+#Group 137 pm_mrk_dsource6, Marked data sources
+event:0X0890 counters:0 um:zero minimum:1000 name:PM_MRK_DATA_FROM_RL2L3_MOD_GRP137 : (Group 137 pm_mrk_dsource6) Marked data loaded from remote L2 or L3 modified
+event:0X0891 counters:1 um:zero minimum:1000 name:PM_MRK_DATA_FROM_RL2L3_SHR_GRP137 : (Group 137 pm_mrk_dsource6) Marked data loaded from remote L2 or L3 shared
+event:0X0892 counters:2 um:zero minimum:1000 name:PM_MRK_DATA_FROM_RMEM_GRP137 : (Group 137 pm_mrk_dsource6) Marked data loaded from remote memory
+event:0X0893 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP137 : (Group 137 pm_mrk_dsource6) Instructions completed
+
+#Group 138 pm_mrk_rejects, Marked rejects
+event:0X08A0 counters:0 um:zero minimum:1000 name:PM_MRK_LSU_REJECT_ULD_GRP138 : (Group 138 pm_mrk_rejects) Marked unaligned load reject
+event:0X08A1 counters:1 um:zero minimum:1000 name:PM_MRK_LSU_REJECT_UST_GRP138 : (Group 138 pm_mrk_rejects) Marked unaligned store reject
+event:0X08A2 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP138 : (Group 138 pm_mrk_rejects) Instructions completed
+event:0X08A3 counters:3 um:zero minimum:1000 name:PM_MRK_LSU_REJECT_LHS_GRP138 : (Group 138 pm_mrk_rejects) Marked load hit store reject
+
+#Group 139 pm_mrk_rejects2, Marked rejects LSU0
+event:0X08B0 counters:0 um:zero minimum:1000 name:PM_MRK_LSU0_REJECT_LHS_GRP139 : (Group 139 pm_mrk_rejects2) LSU0 marked load hit store reject
+event:0X08B1 counters:1 um:zero minimum:1000 name:PM_MRK_LSU0_REJECT_ULD_GRP139 : (Group 139 pm_mrk_rejects2) LSU0 marked unaligned load reject
+event:0X08B2 counters:2 um:zero minimum:1000 name:PM_MRK_LSU0_REJECT_UST_GRP139 : (Group 139 pm_mrk_rejects2) LSU0 marked unaligned store reject
+event:0X08B3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP139 : (Group 139 pm_mrk_rejects2) Instructions completed
+
+#Group 140 pm_mrk_rejects3, Marked rejects LSU1
+event:0X08C0 counters:0 um:zero minimum:1000 name:PM_MRK_LSU1_REJECT_LHS_GRP140 : (Group 140 pm_mrk_rejects3) LSU1 marked load hit store reject
+event:0X08C1 counters:1 um:zero minimum:1000 name:PM_MRK_LSU1_REJECT_ULD_GRP140 : (Group 140 pm_mrk_rejects3) LSU1 marked unaligned load reject
+event:0X08C2 counters:2 um:zero minimum:1000 name:PM_MRK_LSU1_REJECT_UST_GRP140 : (Group 140 pm_mrk_rejects3) LSU1 marked unaligned store reject
+event:0X08C3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP140 : (Group 140 pm_mrk_rejects3) Instructions completed
+
+#Group 141 pm_mrk_inst, Marked instruction events
+event:0X08D0 counters:0 um:zero minimum:1000 name:PM_MRK_INST_ISSUED_GRP141 : (Group 141 pm_mrk_inst) Marked instruction issued
+event:0X08D1 counters:1 um:zero minimum:1000 name:PM_MRK_INST_DISP_GRP141 : (Group 141 pm_mrk_inst) Marked instruction dispatched
+event:0X08D2 counters:2 um:zero minimum:1000 name:PM_MRK_INST_FIN_GRP141 : (Group 141 pm_mrk_inst) Marked instruction finished
+event:0X08D3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP141 : (Group 141 pm_mrk_inst) Instructions completed
+
+#Group 142 pm_mrk_fpu_fin, Marked Floating Point instructions finished
+event:0X08E0 counters:0 um:zero minimum:1000 name:PM_MRK_FPU0_FIN_GRP142 : (Group 142 pm_mrk_fpu_fin) Marked instruction FPU0 processing finished
+event:0X08E1 counters:1 um:zero minimum:1000 name:PM_MRK_FPU1_FIN_GRP142 : (Group 142 pm_mrk_fpu_fin) Marked instruction FPU1 processing finished
+event:0X08E2 counters:2 um:zero minimum:1000 name:PM_MRK_FPU_FIN_GRP142 : (Group 142 pm_mrk_fpu_fin) Marked instruction FPU processing finished
+event:0X08E3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP142 : (Group 142 pm_mrk_fpu_fin) Instructions completed
+
+#Group 143 pm_mrk_misc, Marked misc events
+event:0X08F0 counters:0 um:zero minimum:1000 name:PM_MRK_LSU_REJECT_ULD_GRP143 : (Group 143 pm_mrk_misc) Marked unaligned load reject
+event:0X08F1 counters:1 um:zero minimum:1000 name:PM_MRK_FXU_FIN_GRP143 : (Group 143 pm_mrk_misc) Marked instruction FXU processing finished
+event:0X08F2 counters:2 um:zero minimum:1000 name:PM_MRK_DFU_FIN_GRP143 : (Group 143 pm_mrk_misc) DFU marked instruction finish
+event:0X08F3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP143 : (Group 143 pm_mrk_misc) Instructions completed
+
+#Group 144 pm_mrk_misc2, Marked misc events
+event:0X0900 counters:0 um:zero minimum:1000 name:PM_MRK_STCX_FAIL_GRP144 : (Group 144 pm_mrk_misc2) Marked STCX failed
+event:0X0901 counters:1 um:zero minimum:1000 name:PM_MRK_IFU_FIN_GRP144 : (Group 144 pm_mrk_misc2) Marked instruction IFU processing finished
+event:0X0902 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP144 : (Group 144 pm_mrk_misc2) Instructions completed
+event:0X0903 counters:3 um:zero minimum:1000 name:PM_MRK_INST_TIMEO_GRP144 : (Group 144 pm_mrk_misc2) Marked Instruction finish timeout 
+
+#Group 145 pm_mrk_misc3, Marked misc events
+event:0X0910 counters:0 um:zero minimum:1000 name:PM_MRK_VMX_ST_ISSUED_GRP145 : (Group 145 pm_mrk_misc3) Marked VMX store issued
+event:0X0911 counters:1 um:zero minimum:1000 name:PM_MRK_LSU0_REJECT_L2MISS_GRP145 : (Group 145 pm_mrk_misc3) LSU0 marked L2 miss reject
+event:0X0912 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP145 : (Group 145 pm_mrk_misc3) Instructions completed
+event:0X0913 counters:3 um:zero minimum:1000 name:PM_MRK_LSU_DERAT_MISS_GRP145 : (Group 145 pm_mrk_misc3) Marked DERAT miss
+
+#Group 146 pm_mrk_misc4, Marked misc events
+event:0X0920 counters:0 um:zero minimum:10000 name:PM_CYC_GRP146 : (Group 146 pm_mrk_misc4) Processor cycles
+event:0X0921 counters:1 um:zero minimum:10000 name:PM_CYC_GRP146 : (Group 146 pm_mrk_misc4) Processor cycles
+event:0X0922 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP146 : (Group 146 pm_mrk_misc4) Instructions completed
+event:0X0923 counters:3 um:zero minimum:1000 name:PM_MRK_LSU_FIN_GRP146 : (Group 146 pm_mrk_misc4) Marked instruction LSU processing finished
+
+#Group 147 pm_mrk_st, Marked stores events
+event:0X0930 counters:0 um:zero minimum:1000 name:PM_MRK_ST_CMPL_GRP147 : (Group 147 pm_mrk_st) Marked store instruction completed
+event:0X0931 counters:1 um:zero minimum:1000 name:PM_MRK_ST_GPS_GRP147 : (Group 147 pm_mrk_st) Marked store sent to GPS
+event:0X0932 counters:2 um:zero minimum:1000 name:PM_MRK_ST_CMPL_INT_GRP147 : (Group 147 pm_mrk_st) Marked store completed with intervention
+event:0X0933 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP147 : (Group 147 pm_mrk_st) Instructions completed
+
+#Group 148 pm_mrk_pteg, Marked PTEG
+event:0X0940 counters:0 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L2_GRP148 : (Group 148 pm_mrk_pteg) Marked PTEG loaded from L2.5 modified
+event:0X0941 counters:1 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_DMEM_GRP148 : (Group 148 pm_mrk_pteg) Marked PTEG loaded from distant memory
+event:0X0942 counters:2 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_DL2L3_SHR_GRP148 : (Group 148 pm_mrk_pteg) Marked PTEG loaded from distant L2 or L3 shared
+event:0X0943 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP148 : (Group 148 pm_mrk_pteg) Instructions completed
+
+#Group 149 pm_mrk_pteg2, Marked PTEG
+event:0X0950 counters:0 um:zero minimum:10000 name:PM_INST_CMPL_GRP149 : (Group 149 pm_mrk_pteg2) Instructions completed
+event:0X0951 counters:1 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L21_GRP149 : (Group 149 pm_mrk_pteg2) Marked PTEG loaded from private L2 other core
+event:0X0952 counters:2 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L25_SHR_GRP149 : (Group 149 pm_mrk_pteg2) Marked PTEG loaded from L2.5 shared
+event:0X0953 counters:3 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_DL2L3_MOD_GRP149 : (Group 149 pm_mrk_pteg2) Marked PTEG loaded from distant L2 or L3 modified
+
+#Group 150 pm_mrk_pteg3, Marked PTEG
+event:0X0960 counters:0 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L35_MOD_GRP150 : (Group 150 pm_mrk_pteg3) Marked PTEG loaded from L3.5 modified
+event:0X0961 counters:1 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L35_SHR_GRP150 : (Group 150 pm_mrk_pteg3) Marked PTEG loaded from L3.5 shared
+event:0X0962 counters:2 um:zero minimum:10000 name:PM_INST_CMPL_GRP150 : (Group 150 pm_mrk_pteg3) Instructions completed
+event:0X0963 counters:3 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L25_MOD_GRP150 : (Group 150 pm_mrk_pteg3) Marked PTEG loaded from L2.5 modified
+
+#Group 151 pm_mrk_pteg4, Marked PTEG
+event:0X0970 counters:0 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_MEM_DP_GRP151 : (Group 151 pm_mrk_pteg4) Marked PTEG loaded from double pump memory
+event:0X0971 counters:1 um:zero minimum:10000 name:PM_INST_CMPL_GRP151 : (Group 151 pm_mrk_pteg4) Instructions completed
+event:0X0972 counters:2 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L3_GRP151 : (Group 151 pm_mrk_pteg4) Marked PTEG loaded from L3
+event:0X0973 counters:3 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L2MISS_GRP151 : (Group 151 pm_mrk_pteg4) Marked PTEG loaded from L2 miss
+
+#Group 152 pm_mrk_pteg5, Marked PTEG
+event:0X0980 counters:0 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_RL2L3_MOD_GRP152 : (Group 152 pm_mrk_pteg5) Marked PTEG loaded from remote L2 or L3 modified
+event:0X0981 counters:1 um:zero minimum:10000 name:PM_INST_CMPL_GRP152 : (Group 152 pm_mrk_pteg5) Instructions completed
+event:0X0982 counters:2 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_L3MISS_GRP152 : (Group 152 pm_mrk_pteg5) Marked PTEG loaded from L3 miss
+event:0X0983 counters:3 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_LMEM_GRP152 : (Group 152 pm_mrk_pteg5) Marked PTEG loaded from local memory
+
+#Group 153 pm_mrk_pteg6, Marked PTEG
+event:0X0990 counters:0 um:zero minimum:10000 name:PM_CYC_GRP153 : (Group 153 pm_mrk_pteg6) Processor cycles
+event:0X0991 counters:1 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_RL2L3_SHR_GRP153 : (Group 153 pm_mrk_pteg6) Marked PTEG loaded from remote L2 or L3 shared
+event:0X0992 counters:2 um:zero minimum:1000 name:PM_MRK_PTEG_FROM_RMEM_GRP153 : (Group 153 pm_mrk_pteg6) Marked PTEG loaded from remote memory
+event:0X0993 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP153 : (Group 153 pm_mrk_pteg6) Instructions completed
+
+#Group 154 pm_mrk_vmx, Marked VMX
+event:0X09A0 counters:0 um:zero minimum:1000 name:PM_MRK_VMX_COMPLEX_ISSUED_GRP154 : (Group 154 pm_mrk_vmx) Marked VMX instruction issued to complex
+event:0X09A1 counters:1 um:zero minimum:1000 name:PM_MRK_VMX_FLOAT_ISSUED_GRP154 : (Group 154 pm_mrk_vmx) Marked VMX instruction issued to float
+event:0X09A2 counters:2 um:zero minimum:1000 name:PM_MRK_VMX_PERMUTE_ISSUED_GRP154 : (Group 154 pm_mrk_vmx) Marked VMX instruction issued to permute
+event:0X09A3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP154 : (Group 154 pm_mrk_vmx) Instructions completed
+
+#Group 155 pm_mrk_vmx2, Marked VMX
+event:0X09B0 counters:0 um:zero minimum:1000 name:PM_MRK_VMX0_LD_WRBACK_GRP155 : (Group 155 pm_mrk_vmx2) Marked VMX0 load writeback valid
+event:0X09B1 counters:1 um:zero minimum:1000 name:PM_MRK_VMX1_LD_WRBACK_GRP155 : (Group 155 pm_mrk_vmx2) Marked VMX1 load writeback valid
+event:0X09B2 counters:2 um:zero minimum:1000 name:PM_MRK_DTLB_REF_GRP155 : (Group 155 pm_mrk_vmx2) Marked Data TLB reference
+event:0X09B3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP155 : (Group 155 pm_mrk_vmx2) Instructions completed
+
+#Group 156 pm_mrk_vmx3, Marked VMX
+event:0X09C0 counters:0 um:zero minimum:1000 name:PM_MRK_VMX_SIMPLE_ISSUED_GRP156 : (Group 156 pm_mrk_vmx3) Marked VMX instruction issued to simple
+event:0X09C1 counters:1 um:zero minimum:1000 name:PM_VMX_SIMPLE_ISSUED_GRP156 : (Group 156 pm_mrk_vmx3) VMX instruction issued to simple
+event:0X09C2 counters:2 um:zero minimum:10000 name:PM_CYC_GRP156 : (Group 156 pm_mrk_vmx3) Processor cycles
+event:0X09C3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP156 : (Group 156 pm_mrk_vmx3) Instructions completed
+
+#Group 157 pm_mrk_fp , Marked FP events
+event:0X09D0 counters:0 um:zero minimum:1000 name:PM_MRK_FPU0_FIN_GRP157 : (Group 157 pm_mrk_fp ) Marked instruction FPU0 processing finished
+event:0X09D1 counters:1 um:zero minimum:1000 name:PM_MRK_FPU_FIN_GRP157 : (Group 157 pm_mrk_fp ) Marked instruction FPU processing finished
+event:0X09D2 counters:2 um:zero minimum:1000 name:PM_MRK_FPU1_FIN_GRP157 : (Group 157 pm_mrk_fp ) Marked instruction FPU1 processing finished
+event:0X09D3 counters:3 um:zero minimum:10000 name:PM_INST_CMPL_GRP157 : (Group 157 pm_mrk_fp ) Instructions completed
diff -paurN oprof-cvs-05.05.2006/events/ppc64/power6/unit_masks oprof-cvs-power6-ver-2/events/ppc64/power6/unit_masks
--- oprof-cvs-05.05.2006/events/ppc64/power6/unit_masks	1969-12-31 18:00:00.000000000 -0600
+++ oprof-cvs-power6-ver-2/events/ppc64/power6/unit_masks	2006-06-22 10:12:09.000000000 -0500
@@ -0,0 +1,4 @@
+# ppc64 POWER6 possible unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
diff -paurN oprof-cvs-05.05.2006/libop/op_cpu_type.c oprof-cvs-power6-ver-2/libop/op_cpu_type.c
--- oprof-cvs-05.05.2006/libop/op_cpu_type.c	2006-02-22 08:36:40.000000000 -0600
+++ oprof-cvs-power6-ver-2/libop/op_cpu_type.c	2006-06-22 10:12:09.000000000 -0500
@@ -46,6 +46,7 @@ static struct cpu_descr const cpu_descrs
 	{ "ppc64 POWER4", "ppc64/power4", CPU_PPC64_POWER4, 8 },
 	{ "ppc64 POWER5", "ppc64/power5", CPU_PPC64_POWER5, 6 },
 	{ "ppc64 POWER5+", "ppc64/power5+", CPU_PPC64_POWER5p, 6 },
+        { "ppc64 POWER6", "ppc64/power6", CPU_PPC64_POWER6, 4 },
 	{ "ppc64 970", "ppc64/970", CPU_PPC64_970, 8 },
 	{ "MIPS 24K", "mips/24K", CPU_MIPS_24K, 2},
 	{ "MIPS R10000", "mips/r10000", CPU_MIPS_R10000, 2 },
diff -paurN oprof-cvs-05.05.2006/libop/op_cpu_type.h oprof-cvs-power6-ver-2/libop/op_cpu_type.h
--- oprof-cvs-05.05.2006/libop/op_cpu_type.h	2006-02-22 08:36:40.000000000 -0600
+++ oprof-cvs-power6-ver-2/libop/op_cpu_type.h	2006-06-22 10:12:09.000000000 -0500
@@ -42,6 +42,7 @@ typedef enum {
 	CPU_PPC64_POWER4, /**< ppc64 POWER4 family */
 	CPU_PPC64_POWER5, /**< ppc64 POWER5 family */
 	CPU_PPC64_POWER5p, /**< ppc64 Power5+ family */
+        CPU_PPC64_POWER6, /**< ppc64 POWER6 family */
 	CPU_PPC64_970, /**< ppc64 970 family */
 	CPU_MIPS_24K, /**< MIPS 24K */
 	CPU_MIPS_R10000, /**< MIPS R10000 */
diff -paurN oprof-cvs-05.05.2006/libop/op_events.c oprof-cvs-power6-ver-2/libop/op_events.c
--- oprof-cvs-05.05.2006/libop/op_events.c	2006-02-22 08:36:40.000000000 -0600
+++ oprof-cvs-power6-ver-2/libop/op_events.c	2006-06-22 10:12:09.000000000 -0500
@@ -643,6 +643,7 @@ char const * find_mapping_for_event(u32 
 		case CPU_PPC64_970:
 		case CPU_PPC64_POWER4:
 		case CPU_PPC64_POWER5:
+                case CPU_PPC64_POWER6:
 	        case CPU_PPC64_POWER5p:
 			if (!fp) {
 				fprintf(stderr, "oprofile: could not open event mapping file %s\n", filename);
@@ -783,6 +784,7 @@ void op_default_event(op_cpu cpu_type, s
 		case CPU_PPC64_970:
 		case CPU_PPC64_POWER4:
 		case CPU_PPC64_POWER5:
+                case CPU_PPC64_POWER6:
 		case CPU_PPC64_POWER5p:
 			descr->name = "CYCLES";
 			break;
diff -paurN oprof-cvs-05.05.2006/utils/opcontrol oprof-cvs-power6-ver-2/utils/opcontrol
--- oprof-cvs-05.05.2006/utils/opcontrol	2006-03-29 15:54:07.000000000 -0600
+++ oprof-cvs-power6-ver-2/utils/opcontrol	2006-06-22 10:12:09.000000000 -0500
@@ -1007,7 +1007,7 @@ set_ctr_param()
 check_event_mapping_data()
 {
 
-	if [ "$CPUTYPE" = "ppc64/power4" -o "$CPUTYPE" = "ppc64/power5" -o "$CPUTYPE" = "ppc64/power5+" -o "$CPUTYPE" = "ppc64/970" ]; then
+	if [ "$CPUTYPE" = "ppc64/power4" -o "$CPUTYPE" = "ppc64/power5" -o "$CPUTYPE" = "ppc64/power5+" -o "$CPUTYPE" = "ppc64/970"  -o "$CPUTYPE" = "ppc64/power6" ]; then
 		MMCR0=`echo $EVENT_STR | awk '{print $2}'`
 		MMCR1=`echo $EVENT_STR | awk '{print $3}'`
 		MMCRA=`echo $EVENT_STR | awk '{print $4}'`
diff -paurN oprof-cvs-05.05.2006/utils/ophelp.c oprof-cvs-power6-ver-2/utils/ophelp.c
--- oprof-cvs-05.05.2006/utils/ophelp.c	2006-02-22 08:36:41.000000000 -0600
+++ oprof-cvs-power6-ver-2/utils/ophelp.c	2006-06-22 10:12:09.000000000 -0500
@@ -411,6 +411,7 @@ int main(int argc, char const * argv[])
 
 	case CPU_PPC64_POWER4:
 	case CPU_PPC64_POWER5:
+        case CPU_PPC64_POWER6:
 	case CPU_PPC64_POWER5p:
 	case CPU_PPC64_970:
 		printf("Obtain PowerPC64 processor documentation at:\n"


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- oprofile.spec	7 Jul 2006 20:03:51 -0000	1.43
+++ oprofile.spec	10 Jul 2006 14:39:19 -0000	1.44
@@ -1,6 +1,6 @@
-%define DATE 200511111
+%define DATE 20060710
 %define oprofile_version 0.9.1
-%define oprofile_release 12
+%define oprofile_release 13
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -22,6 +22,7 @@
 Patch83: oprofile-0.9.1-xen.patch
 Patch84: oprofile-power5p.patch
 Patch86: oprofile-ppc64evts.patch
+Patch87: oprofile-power6.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -72,6 +73,7 @@
 %patch83 -p1 -b .xen
 %patch84 -p1 -b .power5p
 %patch86 -p1 -b .ppc64evts
+%patch87 -p1 -b .power6
 
 ./autogen.sh
 
@@ -208,6 +210,9 @@
 /usr/share/oprofile/ppc64/power5+/event_mappings
 /usr/share/oprofile/ppc64/power5+/events
 /usr/share/oprofile/ppc64/power5+/unit_masks
+/usr/share/oprofile/ppc64/power6/event_mappings
+/usr/share/oprofile/ppc64/power6/events
+/usr/share/oprofile/ppc64/power6/unit_masks
 /usr/share/oprofile/ppc64/970/event_mappings
 /usr/share/oprofile/ppc64/970/events
 /usr/share/oprofile/ppc64/970/unit_masks
@@ -253,6 +258,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Mon Jul 10 2006 Will Cohen <wcohen at redhat.com>
+- Add power6 support. (#196505)
+
 * Fri Jul 7 2006 Will Cohen <wcohen at redhat.com>
 - Support for power5+. (#197728)
 - Fix PPC64 events and groups. (#197895)



From fedora-cvs-commits at redhat.com  Mon Jul 10 14:57:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 10:57:52 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.41,1.42
Message-ID: <200607101457.k6AEvqaC030412@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30359

Modified Files:
	openhpi.spec 
Log Message:
- Had to disable sysfs support due to new libsysfs and incompatible API.



Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openhpi.spec	10 Jul 2006 09:59:13 -0000	1.41
+++ openhpi.spec	10 Jul 2006 14:57:49 -0000	1.42
@@ -48,7 +48,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --disable-dummy
+%configure --disable-dummy --disable-sysfs
 make
 
 %install
@@ -95,8 +95,9 @@
 
 
 %changelog
+
 * Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
-- Rebuilt due to switch from sysfsutils to libsysfs
+- Had to disable sysfs support due to new libsysfs and incompatible API.
 - Added missing ncurses-devel buildrequires
 
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-4



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:01:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:01:29 -0400
Subject: rpms/dos2unix/devel dos2unix.spec,1.22,1.23
Message-ID: <200607101501.k6AF1ToH031382@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	dos2unix.spec 
Log Message:
* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
- Re-encoded spec file in UTF-8 (bug #197817).



Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dos2unix.spec	5 Jun 2006 08:39:37 -0000	1.22
+++ dos2unix.spec	10 Jul 2006 15:00:59 -0000	1.23
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+- Re-encoded spec file in UTF-8 (bug #197817).
+
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 3.1-26
 - Rebuilt.
 
@@ -119,7 +122,7 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Thu Feb 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.1-10
+* Thu Feb 28 2002 Trond Eivind Glomsr??d <teg at redhat.com> 3.1-10
 - Build in new environment
 
 * Thu Jan 17 2002 Bernhard Rosenkraenzer <bero at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:03:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:03:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2362,
	1.2363 linux-2.6-lockdep-fixes.patch, 1.4, 1.5
Message-ID: <200607101503.k6AF35ub031494@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Log Message:
* Mon Jul 10 2006 Dave Jones <davej at redhat.com>
- Big bunch o' lockdep patches from Arjan.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2362
retrieving revision 1.2363
diff -u -r1.2362 -r1.2363
--- kernel-2.6.spec	10 Jul 2006 02:01:03 -0000	1.2362
+++ kernel-2.6.spec	10 Jul 2006 15:02:45 -0000	1.2363
@@ -1578,6 +1578,9 @@
 %endif
 
 %changelog
+* Mon Jul 10 2006 Dave Jones <davej at redhat.com>
+- Big bunch o' lockdep patches from Arjan.
+
 * Sun Jul  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git2
 

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h     |    6 +-
 linux-2.6.17-mm6/kernel/lockdep.c       |   14 ++++-
 linux-2.6.17-mm6/net/atm/ipcommon.c     |   23 ++++++--
 linux-2.6.18-rc1/fs/block_dev.c         |    2 
 linux-2.6.18-rc1/fs/sysfs/inode.c       |   12 ++++
 linux-2.6.18-rc1/include/linux/skbuff.h |    9 ++-
 linux-2.6.18-rc1/kernel/panic.c         |    2 
 linux-2.6.18-rc1/net/bluetooth/l2cap.c  |   18 +++---
 linux/arch/x86_64/kernel/smpboot.c      |    4 -
 linux/include/linux/completion.h        |   10 ++-
 linux/include/linux/lockdep.h           |    2 
 linux/kernel/lockdep.c                  |   87 +++++++++++++++++++-------------
 12 files changed, 128 insertions(+), 61 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-lockdep-fixes.patch	7 Jul 2006 07:52:26 -0000	1.4
+++ linux-2.6-lockdep-fixes.patch	10 Jul 2006 15:02:48 -0000	1.5
@@ -813,3 +813,311 @@
  	module_put(owner);
 
 
+From davej  Mon Jul 10 07:52:23 2006
+Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Mon, 10 Jul 2006 07:52:23 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Mon, 10 Jul 2006 07:51:55 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6ABps7v003580
+	for <davej at pobox.devel.redhat.com>; Mon, 10 Jul 2006 07:51:54 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6ABpsGG020974
+	for <davej at redhat.com>; Mon, 10 Jul 2006 07:51:54 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6ABprOh027001
+	for <Davej at redhat.com>; Mon, 10 Jul 2006 07:51:53 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1FzuIl-0004cv-It
+	for Davej at redhat.com; Mon, 10 Jul 2006 12:51:47 +0100
+Subject: a few lockdep patches for rawhide
+From: Arjan van de Ven <arjan at infradead.org>
+To: Davej at redhat.com
+Content-Type: multipart/mixed; boundary="=-bGjXZLP5LdReK7Mxtci4"
+Date: Mon, 10 Jul 2006 13:51:46 +0200
+Message-Id: <1152532306.4874.28.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 2.646 **
+Status: RO
+X-Status: A
+Content-Length: 5441
+Lines: 174
+
+
+--=-bGjXZLP5LdReK7Mxtci4
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+Hi,
+
+please stick these into rawhide even before akpm sends them to linus..
+just to cut down the false positives
+
+Greetings,
+   Arjan van de Ven
+
+--=-bGjXZLP5LdReK7Mxtci4
+Content-Disposition: attachment; filename=bt2.patch
+Content-Type: text/x-patch; name=bt2.patch; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Index: linux-2.6.18-rc1/net/bluetooth/l2cap.c
+===================================================================
+--- linux-2.6.18-rc1.orig/net/bluetooth/l2cap.c
++++ linux-2.6.18-rc1/net/bluetooth/l2cap.c
+@@ -185,7 +185,7 @@ static inline void l2cap_chan_unlink(str
+ {
+ 	struct sock *next = l2cap_pi(sk)->next_c, *prev = l2cap_pi(sk)->prev_c;
+ 
+-	write_lock(&l->lock);
++	write_lock_bh(&l->lock);
+ 	if (sk == l->head)
+ 		l->head = next;
+ 
+@@ -193,7 +193,7 @@ static inline void l2cap_chan_unlink(str
+ 		l2cap_pi(next)->prev_c = prev;
+ 	if (prev)
+ 		l2cap_pi(prev)->next_c = next;
+-	write_unlock(&l->lock);
++	write_unlock_bh(&l->lock);
+ 
+ 	__sock_put(sk);
+ }
+@@ -313,9 +313,9 @@ static void l2cap_conn_del(struct hci_co
+ static inline void l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent)
+ {
+ 	struct l2cap_chan_list *l = &conn->chan_list;
+-	write_lock(&l->lock);
++	write_lock_bh(&l->lock);
+ 	__l2cap_chan_add(conn, sk, parent);
+-	write_unlock(&l->lock);
++	write_unlock_bh(&l->lock);
+ }
+ 
+ static inline u8 l2cap_get_ident(struct l2cap_conn *conn)
+@@ -328,14 +328,14 @@ static inline u8 l2cap_get_ident(struct 
+ 	 *  200 - 254 are used by utilities like l2ping, etc.
+ 	 */
+ 
+-	spin_lock(&conn->lock);
++	spin_lock_bh(&conn->lock);
+ 
+ 	if (++conn->tx_ident > 128)
+ 		conn->tx_ident = 1;
+ 
+ 	id = conn->tx_ident;
+ 
+-	spin_unlock(&conn->lock);
++	spin_unlock_bh(&conn->lock);
+ 
+ 	return id;
+ }
+@@ -1416,11 +1416,11 @@ static inline int l2cap_connect_req(stru
+ 	if (!sk)
+ 		goto response;
+ 
+-	write_lock(&list->lock);
++	write_lock_bh(&list->lock);
+ 
+ 	/* Check if we already have channel with that dcid */
+ 	if (__l2cap_get_chan_by_dcid(list, scid)) {
+-		write_unlock(&list->lock);
++		write_unlock_bh(&list->lock);
+ 		sock_set_flag(sk, SOCK_ZAPPED);
+ 		l2cap_sock_kill(sk);
+ 		goto response;
+@@ -1458,7 +1458,7 @@ static inline int l2cap_connect_req(stru
+ 	result = status = 0;
+ 
+ done:
+-	write_unlock(&list->lock);
++	write_unlock_bh(&list->lock);
+ 
+ response:
+ 	bh_unlock_sock(parent);
+
+--=-bGjXZLP5LdReK7Mxtci4
+Content-Disposition: attachment; filename=lockdep-off-on-oops.patch
+Content-Type: message/rfc822; name=lockdep-off-on-oops.patch
+
+From: Arjan van de Ven <arjan at linux.intel.com>
+Subject: lockdep: disable lock debugging when kernel state becomes untrusted
+Date: Mon, 10 Jul 2006 13:51:43 +0200
+Message-Id: <1152532303.4874.27.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+This patch disables lockdep debugging in two situations where the integrity
+of the kernel no longer is guaranteed: when oopsing and when hitting a
+tainting-condition. The goal is to not get weird lockdep traces that don't
+make sense or are otherwise undebuggable, to not waste time.
+
+Lockdep assumes that the previous state it knows about is valid to operate,
+which is why lockdep turns itself off after the first violation it reports,
+after that point it can no longer make that assumption.
+
+A kernel oops means that the integrity of the kernel compromised; in addition
+anything lockdep would report is of lesser importance than the oops.
+
+All the tainting conditions are of similar integrity-violating nature and also
+make debugging/diagnosing more difficult.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+
+
+Index: linux-2.6.18-rc1/kernel/panic.c
+===================================================================
+--- linux-2.6.18-rc1.orig/kernel/panic.c
++++ linux-2.6.18-rc1/kernel/panic.c
+@@ -172,6 +172,7 @@ const char *print_tainted(void)
+ 
+ void add_taint(unsigned flag)
+ {
++	debug_locks_off(); /* can't trust the integrity of the kernel anymore */
+ 	tainted |= flag;
+ }
+ EXPORT_SYMBOL(add_taint);
+@@ -256,6 +257,7 @@ int oops_may_print(void)
+  */
+ void oops_enter(void)
+ {
++	debug_locks_off(); /* can't trust the integrity of the kernel anymore */
+ 	do_oops_enter_exit();
+ }
+ 
+
+--=-bGjXZLP5LdReK7Mxtci4
+Content-Disposition: attachment; filename=skbuff.patch
+Content-Type: text/x-patch; name=skbuff.patch; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Index: linux-2.6.18-rc1/include/linux/skbuff.h
+===================================================================
+--- linux-2.6.18-rc1.orig/include/linux/skbuff.h
++++ linux-2.6.18-rc1/include/linux/skbuff.h
+@@ -606,10 +606,17 @@ static inline __u32 skb_queue_len(const 
+ 
+ extern struct lock_class_key skb_queue_lock_key;
+ 
++/*
++ * This function creates a split out lock class for each invocation;
++ * this is needed for now since a whole lot of users of the skb-queue
++ * infrastructure in drivers have different locking usage (in hardirq)
++ * than the networking core (in softirq only). In the long run either the
++ * network layer or drivers should need annotation to consolidate the
++ * main types of usage into 3 classes.
++ */
+ static inline void skb_queue_head_init(struct sk_buff_head *list)
+ {
+ 	spin_lock_init(&list->lock);
+-	lockdep_set_class(&list->lock, &skb_queue_lock_key);
+ 	list->prev = list->next = (struct sk_buff *)list;
+ 	list->qlen = 0;
+ }
+
+--=-bGjXZLP5LdReK7Mxtci4--
+
+From davej  Mon Jul 10 10:08:02 2006
+Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Mon, 10 Jul 2006 10:08:02 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Mon, 10 Jul 2006 10:07:48 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6AE7mWA014897
+	for <davej at pobox.devel.redhat.com>; Mon, 10 Jul 2006 10:07:48 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AE7mpu024718
+	for <davej at redhat.com>; Mon, 10 Jul 2006 10:07:48 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6AE7aKY016927
+	for <Davej at redhat.com>; Mon, 10 Jul 2006 10:07:41 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1FzwQB-0007x3-Ad; Mon, 10 Jul 2006 15:07:35 +0100
+Subject: fix for the mc thing
+From: Arjan van de Ven <arjan at infradead.org>
+To: mingo at elte.hu, Davej at redhat.com
+Content-Type: text/plain
+Date: Mon, 10 Jul 2006 16:07:34 +0200
+Message-Id: <1152540454.4874.52.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+Content-Transfer-Encoding: 7bit
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 0 
+Status: RO
+Content-Length: 1945
+Lines: 47
+
+this patch fixes the "mc" bug for me (but which also hits gnome)
+
+please give it a ride in rawhide while it's also being sent to
+akpm/linus
+
+From: Arjan van de Ven <arjan at linux.intel.com>
+Subject: fix false positives by giving sysfs inodes their own lock class
+
+sysfs has a different i_mutex lock order behavior for i_mutex than the other
+filesystems; sysfs i_mutex is called in many places with subsystem locks
+held. At the same time, many of the VFS locking rules do not apply to sysfs
+at all (cross directory rename for example). To untangle this mess (which
+gives false positives in lockdep), we're giving sysfs inodes their own class
+for i_mutex.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+Index: linux-2.6.18-rc1/fs/sysfs/inode.c
+===================================================================
+--- linux-2.6.18-rc1.orig/fs/sysfs/inode.c
++++ linux-2.6.18-rc1/fs/sysfs/inode.c
+@@ -109,6 +109,17 @@ static inline void set_inode_attr(struct
+ 	inode->i_ctime = iattr->ia_ctime;
+ }
+ 
++
++/*
++ * sysfs has a different i_mutex lock order behavior for i_mutex than other
++ * filesystems; sysfs i_mutex is called in many places with subsystem locks
++ * held. At the same time, many of the VFS locking rules do not apply to
++ * sysfs at all (cross directory rename for example). To untangle this mess
++ * (which gives false positives in lockdep), we're giving sysfs inodes their
++ * own class for i_mutex.
++ */
++static struct lock_class_key sysfs_inode_imutex_key;
++
+ struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent * sd)
+ {
+ 	struct inode * inode = new_inode(sysfs_sb);
+@@ -118,6 +129,7 @@ struct inode * sysfs_new_inode(mode_t mo
+ 		inode->i_mapping->a_ops = &sysfs_aops;
+ 		inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
+ 		inode->i_op = &sysfs_inode_operations;
++		lockdep_set_class(&inode->i_mutex, &sysfs_inode_imutex_key);
+ 
+ 		if (sd->s_iattr) {
+ 			/* sysfs_dirent has non-default attributes
+
+



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:07:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:07:45 -0400
Subject: rpms/procps/devel procps-3.2.7-longcmd.patch, NONE, 1.1 procps.spec,
	1.48, 1.49
Message-ID: <200607101507.k6AF7jgW032278@cvs.devel.redhat.com>

Author: kzak

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-longcmd.patch 
Log Message:
fix pretty old bug ... procps doesn't read correctly /proc/#/cmdline in 3.x and 2.x versions

procps-3.2.7-longcmd.patch:
 readproc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-longcmd.patch ---
--- procps-3.2.7/proc/readproc.c.longcmd	2006-07-10 16:54:10.000000000 +0200
+++ procps-3.2.7/proc/readproc.c	2006-07-10 16:54:39.000000000 +0200
@@ -432,7 +432,7 @@
     if(fd==-1) return NULL;
 
     /* read whole file into a memory buffer, allocating as we go */
-    while ((n = read(fd, buf, sizeof buf - 1)) > 0) {
+    while ((n = read(fd, buf, sizeof buf - 1)) >= 0) {
 	if (n < (int)(sizeof buf - 1))
 	    end_of_file = 1;
 	if (n == 0 && rbuf == 0)


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- procps.spec	10 Jul 2006 09:30:28 -0000	1.48
+++ procps.spec	10 Jul 2006 15:07:43 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -31,6 +31,8 @@
 Patch15: procps-3.2.6-top-env-cpuloop.patch
 # 185299 - cpu steal time support
 Patch16: procps-3.2.7-vmstat-cpusteal.patch
+# 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
+Patch17: procps-3.2.7-longcmd.patch
 
 BuildRequires: ncurses-devel
 
@@ -58,20 +60,21 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .selinux
-%patch2 -p1 -b .misc
-%patch3 -p1 -b .FAQ
-%patch4 -p1 -b .selinux-workaround
-%patch6 -p1 -b .noproc
-%patch7 -p1 -b .pseudo
-%patch8 -p1 -b .0x9b
-%patch9 -p1 -b .writeonly
-%patch10 -p1 -b .rc
-%patch11 -p1 -b .remcpu
-%patch12 -p1 -b .libselinux
-%patch14 -p1 -b .env-vmsize
-%patch15 -p1 -b .env-cpuloop
-%patch16 -p1 -b .steal
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 cp %SOURCE1 .
 
@@ -109,6 +112,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.7-2
+- fix #134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
+
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.7-1
 - upgrade to 3.2.7 (and sync patches)
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:08:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:08:29 -0400
Subject: rpms/dos2unix/devel dos2unix.spec,1.23,1.24
Message-ID: <200607101508.k6AF8TZc032447@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	dos2unix.spec 
Log Message:
3.1-27


Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dos2unix.spec	10 Jul 2006 15:00:59 -0000	1.23
+++ dos2unix.spec	10 Jul 2006 15:08:25 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 26
+Release: 27
 Group: Applications/Text
 License: Freely distributable
 Source: %{name}-%{version}.tar.bz2
@@ -56,7 +56,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 3.1-27
 - Re-encoded spec file in UTF-8 (bug #197817).
 
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 3.1-26



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:18:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:18:22 -0400
Subject: rpms/squirrelmail/FC-5
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-text.patch,
	NONE, 1.1 squirrelmail-1.4.6-zenkaku-subject-convert.patch,
	NONE, 1.1 squirrelmail-1.4.7-check-mail.ja.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 squirrelmail.spec, 1.35, 1.36 compilelocales, 1.1,
	NONE squirrelmail-1.4.6-CVE-2006-2842.patch, 1.1, NONE
Message-ID: <200607101518.k6AFIM3f015838@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore sources squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-body.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail-1.4.6-zenkaku-subject-convert.patch 
	squirrelmail-1.4.7-check-mail.ja.patch 
Removed Files:
	compilelocales squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
auto-import squirrelmail-1.4.7-2.fc5 on branch FC-5 from squirrelmail-1.4.7-2.fc5.src.rpm

squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch:
 mime.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195639

--- functions/mime.php.org	2006-06-16 13:47:27.000000000 +0900
+++ functions/mime.php	2006-06-16 13:48:23.000000000 +0900
@@ -2151,7 +2151,10 @@ function SendDownloadHeaders($type0, $ty
     // version
     //set all the Cache Control Headers for IE
     if ($isIE) {
-        $filename=rawurlencode($filename);
+        if($squirrelmail_language != 'ja_JP' &&
+	    $_SERVER['HTTP_ACCEPT_LANGUAGE'] != 'ja'){
+                $filename=rawurlencode($filename);
+	 }
         header ("Pragma: public");
         header ("Cache-Control: no-store, max-age=0, no-cache, must-revalidate"); // HTTP/1.1
         header ("Cache-Control: post-check=0, pre-check=0", false);

squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
 mime.php |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-body.patch ---
diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
--- squirrelmail-1.4.6.org/functions/mime.php	2006-06-29 08:23:58.000000000 +0900
+++ squirrelmail-1.4.6/functions/mime.php	2006-06-29 08:34:26.000000000 +0900
@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
                 $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
             }
         } else {
-            translateText($body, $wrap_at,
-                    $body_message->header->getParameter('charset'));
+	    if($squirrelmail_language != 'ja_JP'){
+		    translateText($body, $wrap_at,
+				  $body_message->header->getParameter('charset'));
+	    } else {
+		    if($body_message->header->encoding == 'base64' ||
+		       $body_message->header->encoding == 'quoted-printable' ||
+		       $body_message->header->encoding == 'quoted_printable'){
+			    translateText($body, $wrap_at, $default_charset);
+		    } else {
+			    // it may never call here.
+			    translateText($body, $wrap_at,
+					  $body_message->header->getParameter('charset'));
+		    }
+	    }
         }
 
         // if this is the clean display (i.e. printer friendly), stop here.

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
 view_text.php |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-text.patch ---
diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
--- squirrelmail-1.4.6.org/src/view_text.php	2006-02-04 07:27:55.000000000 +0900
+++ squirrelmail-1.4.6/src/view_text.php	2006-06-29 08:30:04.000000000 +0900
@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
     if (! empty($charset))
         $body = charset_decode($charset,$body,false,true);
 } else {
-    translateText($body, $wrap_at, $charset);
+    if($squirrelmail_language != 'ja_JP'){
+        translateText($body, $wrap_at, $charset);
+    } else {
+        if($encoding == 'base64' || $encoding == 'quoted-printable' || 
+	   $encoding == 'quoted_printable'){
+           translateText($body, $wrap_at, $default_charset);
+        } else {
+            // it may never call here.
+            translateText($body, $wrap_at, $charset);
+        }
+    }
 }
 
 displayPageHeader($color, 'None');

squirrelmail-1.4.6-zenkaku-subject-convert.patch:
 i18n.php |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE squirrelmail-1.4.6-zenkaku-subject-convert.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196017
The latest squirrelmail did not convert convert Subject to "zen-kaku
kata-kana". Usually, if a user used "han-kaku kata-kana" in the body
or header, any mail application would convert it to "zen-kaku kata-kana".
The squirrelmail also should convert.

diff -urN squirrelmail-1.4.6.orig/functions/i18n.php squirrelmail-1.4.6/functions/i18n.php
--- squirrelmail-1.4.6.orig/functions/i18n.php	2006-02-10 15:30:31.000000000 -0500
+++ squirrelmail-1.4.6/functions/i18n.php	2006-06-23 15:49:06.000000000 -0400
@@ -487,6 +487,7 @@
             break;
         case 'encodeheader':
             $result = '';
+            $ret = mb_convert_kana($ret, "KV");
             if (strlen($ret) > 0) {
                 $tmpstr = mb_substr($ret, 0, 1);
                 $prevcsize = strlen($tmpstr);

squirrelmail-1.4.7-check-mail.ja.patch:
 squirrelmail.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.7-check-mail.ja.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig	2006-03-03 17:02:20.000000000 -0500
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po	2006-07-07 15:09:08.000000000 -0400
@@ -398,7 +398,7 @@
 msgstr "??????????????"
 
 msgid "Check mail"
-msgstr "????????????????????"
+msgstr "????????????"
 
 msgid "Login"
 msgstr "????????"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Mar 2006 10:16:46 -0000	1.14
+++ .cvsignore	10 Jul 2006 15:18:19 -0000	1.15
@@ -1,2 +1,2 @@
-all_locales-1.4.6-20060221.tar.bz2
-squirrelmail-1.4.6.tar.bz2
+all_locales-1.4.7-20060702.tar.bz2
+squirrelmail-1.4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Mar 2006 10:16:46 -0000	1.14
+++ sources	10 Jul 2006 15:18:19 -0000	1.15
@@ -1,2 +1,2 @@
-29dfec2e0f71fba368a89c36c51881c2  all_locales-1.4.6-20060221.tar.bz2
-300ddcf66b7907a61b6e9404840e35de  squirrelmail-1.4.6.tar.bz2
+4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2
+08301f14d71e4452e93f21b5e6747a4a  squirrelmail-1.4.7.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- squirrelmail.spec	7 Jun 2006 17:04:58 -0000	1.35
+++ squirrelmail.spec	10 Jul 2006 15:18:19 -0000	1.36
@@ -5,8 +5,8 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.6
-Release: 7.fc5
+Version: 1.4.7
+Release: 2.fc5
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -15,8 +15,12 @@
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
-Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
+Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
+Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+Patch5:  squirrelmail-1.4.7-check-mail.ja.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -35,12 +39,16 @@
 address books, and folder manipulation.
 
 %prep
-#%setup -q
 %setup -q -n squirrelmail-%{version}
-%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
+%patch5 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -127,6 +135,7 @@
 
     if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
 	for a in `ls help/$LOCALE/ 2>/dev/null` ; do
+            if [ "$LOCALE" == "ja_JP" ]; then continue; fi
 	    iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
 	done
 	sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
@@ -196,6 +205,13 @@
 install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
+# move sqspell plugin config to /etc
+rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+install -m 0644 plugins/squirrelspell/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/sqspell_config.php
+ln -s ../../../../..%{_sysconfdir}/squirrelmail/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+
 cd locale_tempdir
 cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/
 cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/
@@ -211,6 +227,7 @@
 %config %dir %{_sysconfdir}/squirrelmail
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/*.php
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/default_pref
+%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/sqspell_config.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %doc doc/*
 %dir %{_datadir}/squirrelmail
@@ -233,6 +250,21 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
+- Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
+
+* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.7-1
+- 1.4.7 with CVE-2006-3174
+- Reduce patch for body text (#194457)
+- Better JP translation for "Check mail" (#196117)
+
+* Fri Jun 23 2006 Warren Togami <wtogami at redhat.com> 1.4.6-8
+- Japanese zenkaku subject conversion      (#196017)
+- Japanese MSIE garbled download ugly hack (#195639)
+- Japanese multibyte attachment view text  (#195452)
+- Japanese multibyte attachment body text  (#194457)
+- Do not convert Japanese Help to UTF-8    (#194599)
+
 * Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
 - CVE-2006-2842 File Inclusion Vulnerability
 


--- compilelocales DELETED ---


--- squirrelmail-1.4.6-CVE-2006-2842.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:20:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:20:14 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.479, 1.480 kernel-2.6.spec, 1.2363,
	1.2364 sources, 1.423, 1.424 upstream, 1.390, 1.391
Message-ID: <200607101520.k6AFKEJP018899@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1-git3.bz2.sign 
Log Message:
2.6.18-rc1-git3


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

iD8DBQBEsfx1yGugalF9Dw4RAgWRAJ0QrZhVTgd6U1z1ayibTZKXOoYGkACfSs2a
FTOJLr3m6w1UNs8RWYZbFQY=
=m30N
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- .cvsignore	10 Jul 2006 02:01:02 -0000	1.479
+++ .cvsignore	10 Jul 2006 15:20:10 -0000	1.480
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git2.bz2
+patch-2.6.18-rc1-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2363
retrieving revision 1.2364
diff -u -r1.2363 -r1.2364
--- kernel-2.6.spec	10 Jul 2006 15:02:45 -0000	1.2363
+++ kernel-2.6.spec	10 Jul 2006 15:20:10 -0000	1.2364
@@ -248,7 +248,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git2.bz2
+Patch2: patch-2.6.18-rc1-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1579,6 +1579,7 @@
 
 %changelog
 * Mon Jul 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git3
 - Big bunch o' lockdep patches from Arjan.
 
 * Sun Jul  9 2006 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- sources	10 Jul 2006 02:01:13 -0000	1.423
+++ sources	10 Jul 2006 15:20:11 -0000	1.424
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-59c17c8b222f647cd586894839edb49b  patch-2.6.18-rc1-git2.bz2
+405f71057c99366d8ca309e44340cbbe  patch-2.6.18-rc1-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- upstream	10 Jul 2006 02:01:14 -0000	1.390
+++ upstream	10 Jul 2006 15:20:11 -0000	1.391
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git2.bz2
+patch-2.6.18-rc1-git3.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:21:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:21:36 -0400
Subject: rpms/squirrelmail/FC-4
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-body.patch, NONE,
	1.1 squirrelmail-1.4.6-japanese-multibyte-view-text.patch,
	NONE, 1.1 squirrelmail-1.4.6-zenkaku-subject-convert.patch,
	NONE, 1.1 squirrelmail-1.4.7-check-mail.ja.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 squirrelmail.spec, 1.26, 1.27 compilelocales, 1.1,
	NONE squirrelmail-1.4.6-CVE-2006-2842.patch, 1.1, NONE
Message-ID: <200607101521.k6AFLaR6019414@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	.cvsignore sources squirrelmail.spec 
Added Files:
	squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-body.patch 
	squirrelmail-1.4.6-japanese-multibyte-view-text.patch 
	squirrelmail-1.4.6-zenkaku-subject-convert.patch 
	squirrelmail-1.4.7-check-mail.ja.patch 
Removed Files:
	compilelocales squirrelmail-1.4.6-CVE-2006-2842.patch 
Log Message:
auto-import squirrelmail-1.4.7-2.fc4 on branch FC-4 from squirrelmail-1.4.7-2.fc4.src.rpm

squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch:
 mime.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=195639

--- functions/mime.php.org	2006-06-16 13:47:27.000000000 +0900
+++ functions/mime.php	2006-06-16 13:48:23.000000000 +0900
@@ -2151,7 +2151,10 @@ function SendDownloadHeaders($type0, $ty
     // version
     //set all the Cache Control Headers for IE
     if ($isIE) {
-        $filename=rawurlencode($filename);
+        if($squirrelmail_language != 'ja_JP' &&
+	    $_SERVER['HTTP_ACCEPT_LANGUAGE'] != 'ja'){
+                $filename=rawurlencode($filename);
+	 }
         header ("Pragma: public");
         header ("Cache-Control: no-store, max-age=0, no-cache, must-revalidate"); // HTTP/1.1
         header ("Cache-Control: post-check=0, pre-check=0", false);

squirrelmail-1.4.6-japanese-multibyte-view-body.patch:
 mime.php |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-body.patch ---
diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
--- squirrelmail-1.4.6.org/functions/mime.php	2006-06-29 08:23:58.000000000 +0900
+++ squirrelmail-1.4.6/functions/mime.php	2006-06-29 08:34:26.000000000 +0900
@@ -353,8 +353,20 @@ function formatBody($imap_stream, $messa
                 $body = charset_decode($body_message->header->getParameter('charset'),$body,false,true);
             }
         } else {
-            translateText($body, $wrap_at,
-                    $body_message->header->getParameter('charset'));
+	    if($squirrelmail_language != 'ja_JP'){
+		    translateText($body, $wrap_at,
+				  $body_message->header->getParameter('charset'));
+	    } else {
+		    if($body_message->header->encoding == 'base64' ||
+		       $body_message->header->encoding == 'quoted-printable' ||
+		       $body_message->header->encoding == 'quoted_printable'){
+			    translateText($body, $wrap_at, $default_charset);
+		    } else {
+			    // it may never call here.
+			    translateText($body, $wrap_at,
+					  $body_message->header->getParameter('charset'));
+		    }
+	    }
         }
 
         // if this is the clean display (i.e. printer friendly), stop here.

squirrelmail-1.4.6-japanese-multibyte-view-text.patch:
 view_text.php |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.6-japanese-multibyte-view-text.patch ---
diff -ruNp squirrelmail-1.4.6.org/src/view_text.php squirrelmail-1.4.6/src/view_text.php
--- squirrelmail-1.4.6.org/src/view_text.php	2006-02-04 07:27:55.000000000 +0900
+++ squirrelmail-1.4.6/src/view_text.php	2006-06-29 08:30:04.000000000 +0900
@@ -81,7 +81,17 @@ if ($type1 == 'html' || (isset($override
     if (! empty($charset))
         $body = charset_decode($charset,$body,false,true);
 } else {
-    translateText($body, $wrap_at, $charset);
+    if($squirrelmail_language != 'ja_JP'){
+        translateText($body, $wrap_at, $charset);
+    } else {
+        if($encoding == 'base64' || $encoding == 'quoted-printable' || 
+	   $encoding == 'quoted_printable'){
+           translateText($body, $wrap_at, $default_charset);
+        } else {
+            // it may never call here.
+            translateText($body, $wrap_at, $charset);
+        }
+    }
 }
 
 displayPageHeader($color, 'None');

squirrelmail-1.4.6-zenkaku-subject-convert.patch:
 i18n.php |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE squirrelmail-1.4.6-zenkaku-subject-convert.patch ---
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196017
The latest squirrelmail did not convert convert Subject to "zen-kaku
kata-kana". Usually, if a user used "han-kaku kata-kana" in the body
or header, any mail application would convert it to "zen-kaku kata-kana".
The squirrelmail also should convert.

diff -urN squirrelmail-1.4.6.orig/functions/i18n.php squirrelmail-1.4.6/functions/i18n.php
--- squirrelmail-1.4.6.orig/functions/i18n.php	2006-02-10 15:30:31.000000000 -0500
+++ squirrelmail-1.4.6/functions/i18n.php	2006-06-23 15:49:06.000000000 -0400
@@ -487,6 +487,7 @@
             break;
         case 'encodeheader':
             $result = '';
+            $ret = mb_convert_kana($ret, "KV");
             if (strlen($ret) > 0) {
                 $tmpstr = mb_substr($ret, 0, 1);
                 $prevcsize = strlen($tmpstr);

squirrelmail-1.4.7-check-mail.ja.patch:
 squirrelmail.po |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squirrelmail-1.4.7-check-mail.ja.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig	2006-03-03 17:02:20.000000000 -0500
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po	2006-07-07 15:09:08.000000000 -0400
@@ -398,7 +398,7 @@
 msgstr "??????????????"
 
 msgid "Check mail"
-msgstr "????????????????????"
+msgstr "????????????"
 
 msgid "Login"
 msgstr "????????"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Mar 2006 17:10:41 -0000	1.13
+++ .cvsignore	10 Jul 2006 15:21:33 -0000	1.14
@@ -1,2 +1,2 @@
-all_locales-1.4.6-20060221.tar.bz2
-squirrelmail-1.4.6.tar.bz2
+all_locales-1.4.7-20060702.tar.bz2
+squirrelmail-1.4.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Mar 2006 17:10:41 -0000	1.13
+++ sources	10 Jul 2006 15:21:33 -0000	1.14
@@ -1,2 +1,2 @@
-29dfec2e0f71fba368a89c36c51881c2  all_locales-1.4.6-20060221.tar.bz2
-300ddcf66b7907a61b6e9404840e35de  squirrelmail-1.4.6.tar.bz2
+4b78f4612ef0a68e5a81a818a113497c  all_locales-1.4.7-20060702.tar.bz2
+08301f14d71e4452e93f21b5e6747a4a  squirrelmail-1.4.7.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- squirrelmail.spec	7 Jun 2006 17:15:42 -0000	1.26
+++ squirrelmail.spec	10 Jul 2006 15:21:34 -0000	1.27
@@ -5,8 +5,8 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.6
-Release: 7.fc4
+Version: 1.4.7
+Release: 2.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -15,8 +15,12 @@
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2
-Patch0:  squirrelmail-1.4.6-CVE-2006-2842.patch
+Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
+Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
+Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+Patch5:  squirrelmail-1.4.7-check-mail.ja.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -35,12 +39,16 @@
 address books, and folder manipulation.
 
 %prep
-#%setup -q
 %setup -q -n squirrelmail-%{version}
-%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+
 mkdir locale_tempdir
 cd locale_tempdir
 tar xfj %SOURCE4
+%patch5 -p2
 
 %build
 rm -f plugins/make_archive.pl
@@ -127,6 +135,7 @@
 
     if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
 	for a in `ls help/$LOCALE/ 2>/dev/null` ; do
+            if [ "$LOCALE" == "ja_JP" ]; then continue; fi
 	    iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
 	done
 	sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
@@ -196,6 +205,13 @@
 install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
+# move sqspell plugin config to /etc
+rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+install -m 0644 plugins/squirrelspell/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/sqspell_config.php
+ln -s ../../../../..%{_sysconfdir}/squirrelmail/sqspell_config.php \
+    $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
+
 cd locale_tempdir
 cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/
 cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/
@@ -211,6 +227,7 @@
 %config %dir %{_sysconfdir}/squirrelmail
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/*.php
 %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/default_pref
+%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/squirrelmail/sqspell_config.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 %doc doc/*
 %dir %{_datadir}/squirrelmail
@@ -233,6 +250,21 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
+- Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
+
+* Fri Jul 07 2006 Warren Togami <wtogami at redhat.com> 1.4.7-1
+- 1.4.7 with CVE-2006-3174
+- Reduce patch for body text (#194457)
+- Better JP translation for "Check mail" (#196117)
+
+* Fri Jun 23 2006 Warren Togami <wtogami at redhat.com> 1.4.6-8
+- Japanese zenkaku subject conversion      (#196017)
+- Japanese MSIE garbled download ugly hack (#195639)
+- Japanese multibyte attachment view text  (#195452)
+- Japanese multibyte attachment body text  (#194457)
+- Do not convert Japanese Help to UTF-8    (#194599)
+
 * Wed Jun 07 2006 Warren Togami <wtogami at redhat.com> 1.4.6-7
 - CVE-2006-2842 File Inclusion Vulnerability
 


--- compilelocales DELETED ---


--- squirrelmail-1.4.6-CVE-2006-2842.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:22:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:22:11 -0400
Subject: rpms/hplip/FC-5 hplip.spec,1.74,1.75
Message-ID: <200607101522.k6AFMBwT019684@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
- Fixed libsane-hpaio %post scriptlet (bug #196663).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- hplip.spec	28 Jun 2006 08:05:05 -0000	1.74
+++ hplip.spec	10 Jul 2006 15:22:08 -0000	1.75
@@ -183,11 +183,15 @@
 
 %post -n libsane-hpaio
 /sbin/ldconfig
-if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
+if [ -f /etc/sane.d/dll.conf ] && \
+   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
         echo hpaio >> /etc/sane.d/dll.conf; \
 fi
 
 %changelog
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed libsane-hpaio %%post scriptlet (bug #196663).
+
 * Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1.1
 - 1.6.6a.
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:24:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:24:14 -0400
Subject: rpms/xorg-x11-server/devel .cvsignore, 1.18, 1.19 sources, 1.13,
	1.14 xorg-x11-server.spec, 1.110,
	1.111 xorg-x11-server-1.1.0-convolution-filter-fix.patch, 1.1,
	NONE xorg-x11-server-1.1.0-cw-crash-fix.patch, 1.1,
	NONE xorg-x11-server-1.1.0-fix-default-mouse-device.patch, 1.1,
	NONE xorg-x11-server-1.1.0-hush-crash-message.patch, 1.1,
	NONE xorg-x11-server-1.1.0-input-autoconfig-2.patch, 1.2,
	NONE xorg-x11-server-1.1.0-loader-diet.patch, 1.2,
	NONE xorg-x11-server-1.1.0-ppc64-build-fix.patch, 1.1,
	NONE xorg-xserver-1.1.0-setuid.diff, 1.1,
	NONE xserver-1.0.1-randr-sdk.patch, 1.1, NONE
Message-ID: <200607101524.k6AFOEpt020457@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.1.0-convolution-filter-fix.patch 
	xorg-x11-server-1.1.0-cw-crash-fix.patch 
	xorg-x11-server-1.1.0-fix-default-mouse-device.patch 
	xorg-x11-server-1.1.0-hush-crash-message.patch 
	xorg-x11-server-1.1.0-input-autoconfig-2.patch 
	xorg-x11-server-1.1.0-loader-diet.patch 
	xorg-x11-server-1.1.0-ppc64-build-fix.patch 
	xorg-xserver-1.1.0-setuid.diff xserver-1.0.1-randr-sdk.patch 
Log Message:
auto-import xorg-x11-server-1.1.1-0 on branch devel from xorg-x11-server-1.1.1-0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Jun 2006 11:44:02 -0000	1.18
+++ .cvsignore	10 Jul 2006 15:24:12 -0000	1.19
@@ -1,3 +1 @@
-*.tar.bz2
-*.tar.gz
-clog
+xorg-server-1.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	23 May 2006 18:28:31 -0000	1.13
+++ sources	10 Jul 2006 15:24:12 -0000	1.14
@@ -1 +1 @@
-d070c58a598fb52c5cb86344725c4ad6  xorg-server-1.1.0.tar.bz2
+a8ed678677af8ebb2fba5624602f6b2e  xorg-server-1.1.1.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- xorg-x11-server.spec	8 Jul 2006 07:36:46 -0000	1.110
+++ xorg-x11-server.spec	10 Jul 2006 15:24:12 -0000	1.111
@@ -3,13 +3,13 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.1.0
+Version:   1.1.1
 # NOTE: Now using the 'dist' tag as per http://fedoraproject.org/wiki/DistTag
 # For rawhide builds, bump the number /before/ the dist tag.  For package
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   27%{dist}
+Release:   0%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -23,15 +23,10 @@
 Patch1:    xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=6010
-Patch6:    xserver-1.0.1-randr-sdk.patch
-Patch7:	   xorg-x11-server-1.1.0-ppc64-build-fix.patch
-Patch8:    ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xorg-xserver-1.1.0-setuid.diff
 
 # Spiffiffity/compiz feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
 Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
-Patch102:  xorg-x11-server-1.1.0-convolution-filter-fix.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 
@@ -43,20 +38,15 @@
 Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
 # Backports of post-1.1 stuff.
-Patch2000:  xorg-x11-server-1.1.0-cw-crash-fix.patch
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
-Patch2002:  xorg-x11-server-1.1.0-hush-crash-message.patch
-#Patch2003:  xorg-x11-server-1.1.0-loader-diet.patch
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 
 # autoconfiguration feature patches
-#Patch3000:  xorg-x11-server-1.1.0-input-autoconfig-2.patch
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
 Patch3002:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
 Patch3003:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
-Patch3006:  xorg-x11-server-1.1.0-fix-default-mouse-device.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -302,13 +292,9 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .init-origins-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
-%patch6 -p1 -b .randrsdk
-%patch7 -p1 -b .ppc64
-%patch8 -p0 -b .setuid
 
 %patch100 -p0 -b .spiffiffity
 %patch101 -p0 -b .gl-include-inferiors
-%patch102 -p1 -b .convolution-filter-fix
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 
@@ -317,10 +303,7 @@
 %patch1002 -p1 -b .xephyr
 %patch1003 -p1 -b .fpic
 
-%patch2000 -p1 -b .cw-crash
 %patch2001 -p1 -b .pci-scan
-%patch2002 -p1 -b .crash-message
-#%patch2003 -p1 -b .loader-diet
 %patch2004 -p1 -b .zlib
 
 %patch3001 -p1 -b .edid1
@@ -328,7 +311,6 @@
 %patch3003 -p1 -b .cvt
 %patch3004 -p1 -b .targetrefresh
 %patch3005 -p1 -b .pci-loader
-%patch3006 -p1 -b .mice
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -654,6 +636,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-0.fc6
+- Update to 1.1.1.
+
 * Sat Jul  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-27%{dist}
 - Enable TLS for GLX to match the mesa build config.
 


--- xorg-x11-server-1.1.0-convolution-filter-fix.patch DELETED ---


--- xorg-x11-server-1.1.0-cw-crash-fix.patch DELETED ---


--- xorg-x11-server-1.1.0-fix-default-mouse-device.patch DELETED ---


--- xorg-x11-server-1.1.0-hush-crash-message.patch DELETED ---


--- xorg-x11-server-1.1.0-input-autoconfig-2.patch DELETED ---


--- xorg-x11-server-1.1.0-loader-diet.patch DELETED ---


--- xorg-x11-server-1.1.0-ppc64-build-fix.patch DELETED ---


--- xorg-xserver-1.1.0-setuid.diff DELETED ---


--- xserver-1.0.1-randr-sdk.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:29:15 -0400
Subject: rpms/hplip/FC-5 hplip-libm.patch,NONE,1.1 hplip.spec,1.75,1.76
Message-ID: <200607101529.k6AFTFvo032554@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-libm.patch 
Log Message:
* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
- libhpip should link against libm (bug #197599).

hplip-libm.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hplip-libm.patch ---
--- hplip-1.6.6a/Makefile.in.libm	2006-07-04 15:55:53.000000000 +0100
+++ hplip-1.6.6a/Makefile.in	2006-07-04 15:56:36.000000000 +0100
@@ -480,7 +480,7 @@
     ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
 
-libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LDFLAGS = -lm -version-info 0:1:0
 
 # sane backend
 BASENAME = sane-hpaio
--- hplip-1.6.6a/Makefile.am.libm	2006-07-04 15:55:24.000000000 +0100
+++ hplip-1.6.6a/Makefile.am	2006-07-04 15:55:36.000000000 +0100
@@ -151,7 +151,7 @@
     ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
     ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
     ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
-libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LDFLAGS = -lm -version-info 0:1:0
 
 # sane backend
 BASENAME=sane-hpaio


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- hplip.spec	10 Jul 2006 15:22:08 -0000	1.75
+++ hplip.spec	10 Jul 2006 15:29:13 -0000	1.76
@@ -15,6 +15,7 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-compile.patch
+Patch6: hplip-libm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -76,6 +77,9 @@
 # Work around missing linux/compiler.h.
 %patch5 -p1 -b .compile
 
+# libhpip should link against libm (bug #197599).
+%patch6 -p1 -b .libm
+
 autoconf # for patch4
 
 %build
@@ -190,6 +194,7 @@
 
 %changelog
 * Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+- libhpip should link against libm (bug #197599).
 - Fixed libsane-hpaio %%post scriptlet (bug #196663).
 
 * Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-1.1



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:30:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:30:27 -0400
Subject: rpms/iprutils/devel iprutils.spec,1.19,1.20
Message-ID: <200607101530.k6AFUR6j032663@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32650

Modified Files:
	iprutils.spec 
Log Message:
add redhat-lsb


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- iprutils.spec	10 Jul 2006 10:12:07 -0000	1.19
+++ iprutils.spec	10 Jul 2006 15:30:16 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.1.4
-Release: 2
+Release: 3
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -14,6 +14,7 @@
 BuildRequires: pciutils-devel
 BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
+Requires: redhat-lsb
 
 %description
 Provides a suite of utilities to manage and configure SCSI devices
@@ -55,6 +56,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Jul 10 2006 Paul Nasrat <pnasrat at redhat.com> - 2.1.4-3
+- Add redhat-lsb requires
+
 * Mon Jul 10 2006 David Woodhouse <dwmw2 at redhat.com> - 2.1.4-2
 - Rebuild against new sysfsutils
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 15:32:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 11:32:53 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.5,1.6
Message-ID: <200607101532.k6AFWrZW000341@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
more lockdep fixy fixy

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |    6 -
 linux-2.6.17-mm6/kernel/lockdep.c             |   15 +++-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 -
 linux-2.6.18-rc1/fs/block_dev.c               |    2 
 linux-2.6.18-rc1/fs/sysfs/inode.c             |   39 +++++++++++
 linux-2.6.18-rc1/include/linux/libps2.h       |    7 +-
 linux-2.6.18-rc1/include/linux/skbuff.h       |    9 ++
 linux-2.6.18-rc1/kernel/panic.c               |    2 
 linux-2.6.18-rc1/net/bluetooth/l2cap.c        |   18 ++---
 linux/arch/x86_64/kernel/smpboot.c            |    4 -
 linux/include/linux/completion.h              |   10 ++
 linux/include/linux/lockdep.h                 |    2 
 linux/kernel/lockdep.c                        |   87 ++++++++++++++++----------
 13 files changed, 147 insertions(+), 60 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-lockdep-fixes.patch	10 Jul 2006 15:02:48 -0000	1.5
+++ linux-2.6-lockdep-fixes.patch	10 Jul 2006 15:32:49 -0000	1.6
@@ -115,125 +115,6 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
-From davej  Tue Jul  4 12:14:37 2006
-Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932258AbWGDQNH at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
-	version=3.1.3
-Envelope-to: davej at kernelslacker.org
-Delivery-date: Tue, 04 Jul 2006 17:13:34 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Tue, 04 Jul 2006 12:14:37 -0400 (EDT)
-Received: from vger.kernel.org ([209.132.176.167])
-	by testure.choralone.org with esmtp (Exim 4.62)
-	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S932258AbWGDQNH at vger.kernel.org>)
-	id 1FxnWo-0005lk-9O
-	for davej at kernelslacker.org; Tue, 04 Jul 2006 17:13:34 +0100
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S932258AbWGDQNH (ORCPT <rfc822;davej at kernelslacker.org>);
-	Tue, 4 Jul 2006 12:13:07 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932252AbWGDQNH
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Tue, 4 Jul 2006 12:13:07 -0400
-Received: from pentafluge.infradead.org ([213.146.154.40]:32170 "EHLO
-	pentafluge.infradead.org") by vger.kernel.org with ESMTP
-	id S932232AbWGDQNF (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
-	Tue, 4 Jul 2006 12:13:05 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1FxnWJ-0007NJ-9e; Tue, 04 Jul 2006 17:13:03 +0100
-Subject: Re: possible recursive locking in ATM layer
-From:	Arjan van de Ven <arjan at infradead.org>
-To:	Duncan Sands <duncan.sands at math.u-psud.fr>
-Cc:	netdev at vger.kernel.org, linux-kernel at vger.kernel.org,
-	Ingo Molnar <mingo at elte.hu>, chas at cmf.nrl.navy.mil
-In-Reply-To: <200607041759.43064.duncan.sands at math.u-psud.fr>
-References: <200607041759.43064.duncan.sands at math.u-psud.fr>
-Content-Type: text/plain
-Date:	Tue, 04 Jul 2006 18:13:02 +0200
-Message-Id: <1152029582.3109.70.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-Sender:	linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-kernel at vger.kernel.org
-Status: RO
-Content-Length: 2497
-Lines: 66
-
-
-From: Arjan van de Ven <arjan at linux.intel.com>
-
-> Linux version 2.6.17-git22 (duncan at baldrick) (gcc version 4.0.3 (Ubuntu 4.0.3-1ubuntu5)) #20 PREEMPT Tue Jul 4 10:35:04 CEST 2006
-> 
-> [ 2381.598609] =============================================
-> [ 2381.619314] [ INFO: possible recursive locking detected ]
-> [ 2381.635497] ---------------------------------------------
-> [ 2381.651706] atmarpd/2696 is trying to acquire lock:
-> [ 2381.666354]  (&skb_queue_lock_key){-+..}, at: [<c028c540>] skb_migrate+0x24/0x6c
-> [ 2381.688848]
-
-
-ok this is a real potential deadlock in a way, it takes two locks of 2
-skbuffs without doing any kind of lock ordering; I think the following
-patch should fix it. Just sort the lock taking order by address of the
-skb.. it's not pretty but it's the best this can do in a minimally
-invasive way.
-
-I still agree with the comment that this code shouldn't live in the atm
-layer...
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-
----
- net/atm/ipcommon.c |   13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-Index: linux-2.6.17-mm6/net/atm/ipcommon.c
-===================================================================
---- linux-2.6.17-mm6.orig/net/atm/ipcommon.c
-+++ linux-2.6.17-mm6/net/atm/ipcommon.c
-@@ -25,8 +25,8 @@
- /*
-  * skb_migrate appends the list at "from" to "to", emptying "from" in the
-  * process. skb_migrate is atomic with respect to all other skb operations on
-- * "from" and "to". Note that it locks both lists at the same time, so beware
-- * of potential deadlocks.
-+ * "from" and "to". Note that it locks both lists at the same time, so to deal
-+ * with the lock ordering, the locks are taken in address order.
-  *
-  * This function should live in skbuff.c or skbuff.h.
-  */
-@@ -39,8 +39,13 @@ void skb_migrate(struct sk_buff_head *fr
- 	struct sk_buff *skb_to = (struct sk_buff *) to;
- 	struct sk_buff *prev;
- 
--	spin_lock_irqsave(&from->lock,flags);
--	spin_lock(&to->lock);
-+	if (from<to) {
-+		spin_lock_irqsave(&from->lock,flags);
-+		spin_lock_nested(&to->lock, SINGLE_DEPTH_NESTING);
-+	} else {
-+		spin_lock_irqsave(&to->lock, flags);
-+		spin_lock_nested(&from->lock, SINGLE_DEPTH_NESTING);
-+	}
- 	prev = from->prev;
- 	from->next->prev = to->prev;
- 	prev->next = skb_to;
-
-
--
-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/
-
 From davej  Tue Jul  4 14:33:56 2006
 Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932295AbWGDSc4 at vger.kernel.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
@@ -1121,3 +1002,138 @@
  			/* sysfs_dirent has non-default attributes
 
 
+From davej  Mon Jul 10 11:13:32 2006
+Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Mon, 10 Jul 2006 11:13:32 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Mon, 10 Jul 2006 11:12:55 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6AFCtN4021006;
+	Mon, 10 Jul 2006 11:12:55 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AFCtPL011743;
+	Mon, 10 Jul 2006 11:12:55 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AFCr4C009817;
+	Mon, 10 Jul 2006 11:12:53 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1FzxRM-0000xQ-Cp; Mon, 10 Jul 2006 16:12:52 +0100
+Subject: Re: lockdep input layer warnings.
+From: Arjan van de Ven <arjan at infradead.org>
+To: Dmitry Torokhov <dmitry.torokhov at gmail.com>
+Cc: Dave Jones <davej at redhat.com>, mingo at redhat.com,
+        Linux Kernel <linux-kernel at vger.kernel.org>
+In-Reply-To: <d120d5000607061329t4868d265h6f8285c798a0e3b7 at mail.gmail.com>
+References: <20060706173411.GA2538 at redhat.com>
+	 <d120d5000607061137r605a08f9ie6cd45a389285c4a at mail.gmail.com>
+	 <1152212575.3084.88.camel at laptopd505.fenrus.org>
+	 <d120d5000607061329t4868d265h6f8285c798a0e3b7 at mail.gmail.com>
+Content-Type: text/plain
+Date: Mon, 10 Jul 2006 17:12:51 +0200
+Message-Id: <1152544371.4874.66.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+Content-Transfer-Encoding: 7bit
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 2.646 **
+Status: RO
+Content-Length: 3434
+Lines: 85
+
+On Thu, 2006-07-06 at 16:29 -0400, Dmitry Torokhov wrote:
+> On 7/6/06, Arjan van de Ven <arjan at infradead.org> wrote:
+> > On Thu, 2006-07-06 at 14:37 -0400, Dmitry Torokhov wrote:
+> > > On 7/6/06, Dave Jones <davej at redhat.com> wrote:
+> > > > One of our Fedora-devel users picked up on this this morning
+> > > > in an 18rc1 based kernel.
+> > > >
+> > > >                Dave
+> > > >
+> > > >
+> > > >  Synaptics Touchpad, model: 1, fw: 5.9, id: 0x2c6ab1, caps: 0x884793/0x0
+> > > >  serio: Synaptics pass-through port at isa0060/serio1/input0
+> > > >  input: SynPS/2 Synaptics TouchPad as /class/input/input1
+> > > >  PM: Adding info for serio:serio2
+> > > >
+> > > >  =============================================
+> > > >  [ INFO: possible recursive locking detected ]
+> > > >  ---------------------------------------------
+> > >
+> > > False alarm, there was a lockdep annotating patch for it in -mm.
+> > not so sure; that patch is supposed to be in -rc1 already; investigating
+> >
+> 
+> Well, you are right, the patch is in -rc1 and I see mutex_lock_nested
+> in the backtrace but for some reason it is still not happy. Again,
+> this is with pass-through Synaptics port and we first taking mutex of
+> the child device and then (going through pass-through port) trying to
+> take mutex of the parent.
+
+Ok it seems more drastic measures are needed; and a split of the
+cmd_mutex class on a per driver basis. The easiest way to do that is to
+inline the lock initialization (patch below) but to be honest I think
+the patch is a bit ugly; I considered inlining the entire function
+instead, any opinions on that?
+
+Index: linux-2.6.18-rc1/drivers/input/serio/libps2.c
+===================================================================
+--- linux-2.6.18-rc1.orig/drivers/input/serio/libps2.c
++++ linux-2.6.18-rc1/drivers/input/serio/libps2.c
+@@ -27,7 +27,7 @@ MODULE_AUTHOR("Dmitry Torokhov <dtor at mai
+ MODULE_DESCRIPTION("PS/2 driver library");
+ MODULE_LICENSE("GPL");
+ 
+-EXPORT_SYMBOL(ps2_init);
++EXPORT_SYMBOL(__ps2_init);
+ EXPORT_SYMBOL(ps2_sendbyte);
+ EXPORT_SYMBOL(ps2_drain);
+ EXPORT_SYMBOL(ps2_command);
+@@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, u
+ 		return -1;
+ 	}
+ 
+-	mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING);
++	mutex_lock(&ps2dev->cmd_mutex);
+ 
+ 	serio_pause_rx(ps2dev->serio);
+ 	ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0;
+@@ -279,7 +279,7 @@ int ps2_schedule_command(struct ps2dev *
+  * ps2_init() initializes ps2dev structure
+  */
+ 
+-void ps2_init(struct ps2dev *ps2dev, struct serio *serio)
++void __ps2_init(struct ps2dev *ps2dev, struct serio *serio)
+ {
+ 	mutex_init(&ps2dev->cmd_mutex);
+ 	init_waitqueue_head(&ps2dev->wait);
+Index: linux-2.6.18-rc1/include/linux/libps2.h
+===================================================================
+--- linux-2.6.18-rc1.orig/include/linux/libps2.h
++++ linux-2.6.18-rc1/include/linux/libps2.h
+@@ -39,7 +39,12 @@ struct ps2dev {
+ 	unsigned char nak;
+ };
+ 
+-void ps2_init(struct ps2dev *ps2dev, struct serio *serio);
++void __ps2_init(struct ps2dev *ps2dev, struct serio *serio);
++static inline void ps2_init(struct ps2dev *ps2dev, struct serio *serio)
++{
++	__ps2_init(ps2dev, serio);
++	mutex_init(&ps2dev->cmd_mutex);
++}
+ int ps2_sendbyte(struct ps2dev *ps2dev, unsigned char byte, int timeout);
+ void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout);
+ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
+
+



From fedora-cvs-commits at redhat.com  Mon Jul 10 16:13:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 12:13:33 -0400
Subject: rpms/cman/devel cman.spec,1.46,1.47
Message-ID: <200607101613.k6AGDXJM027176@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27132

Modified Files:
	cman.spec 
Log Message:
Build cman for ia64.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cman.spec	7 Jul 2006 18:02:44 -0000	1.46
+++ cman.spec	10 Jul 2006 16:13:26 -0000	1.47
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.8
+Release: 0.fc6.9
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -29,7 +29,7 @@
 Requires(preun): /sbin/chkconfig
 Requires: openais
 #ExclusiveArch: %{ix86} x86_64
-ExcludeArch: ia64 s390 s390x
+ExcludeArch: s390 s390x
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Mon Jul 10 16:14:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 12:14:24 -0400
Subject: rpms/openjade/devel openjade-deplibs.patch, NONE, 1.1 openjade.spec,
	1.34, 1.35
Message-ID: <200607101614.k6AGEOlM027559@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27516

Modified Files:
	openjade.spec 
Added Files:
	openjade-deplibs.patch 
Log Message:
* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
- Fix dependent libs for libogrove (bug #198232).


openjade-deplibs.patch:
 Makefile.sub |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openjade-deplibs.patch ---
--- openjade-1.3.2/grove/Makefile.sub.deplibs	2006-07-10 16:35:38.000000000 +0100
+++ openjade-1.3.2/grove/Makefile.sub	2006-07-10 16:35:46.000000000 +0100
@@ -1,4 +1,4 @@
 LTVERSION=0:1:0
 LIB=ogrove
-DEPLIBS=-lm
+DEPLIBS=-lm -lstdc++
 OBJS=Node.o LocNode.o


Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openjade.spec	26 Jun 2006 17:23:33 -0000	1.34
+++ openjade.spec	10 Jul 2006 16:14:21 -0000	1.35
@@ -6,6 +6,7 @@
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
 Patch1: openjade-1.3.1-nsl.patch
+Patch2: openjade-deplibs.patch
 License: Distributable
 Group: Applications/Text
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -29,6 +30,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .deplibs
 
 
 %build
@@ -90,6 +92,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+- Fix dependent libs for libogrove (bug #198232).
+
 * Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>
 - add redirection to /dev/null for preun
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 16:17:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 12:17:31 -0400
Subject: rpms/openjade/devel openjade.spec,1.35,1.36
Message-ID: <200607101617.k6AGHV6K004216@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4086

Modified Files:
	openjade.spec 
Log Message:
1.3.2-25


Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- openjade.spec	10 Jul 2006 16:14:21 -0000	1.35
+++ openjade.spec	10 Jul 2006 16:17:29 -0000	1.36
@@ -92,7 +92,7 @@
 %{_libdir}/*.la
 
 %changelog
-* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com>
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-25
 - Fix dependent libs for libogrove (bug #198232).
 
 * Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Jul 10 16:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 12:18:08 -0400
Subject: rpms/openjade/devel openjade.spec,1.36,1.37
Message-ID: <200607101618.k6AGI8NH007882@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7488

Modified Files:
	openjade.spec 
Log Message:
1.3.2-26


Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- openjade.spec	10 Jul 2006 16:17:29 -0000	1.36
+++ openjade.spec	10 Jul 2006 16:18:06 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 25
+Release: 26
 Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
@@ -92,10 +92,10 @@
 %{_libdir}/*.la
 
 %changelog
-* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-25
+* Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-26
 - Fix dependent libs for libogrove (bug #198232).
 
-* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>
+* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com> 1.3.2-25
 - add redirection to /dev/null for preun
 
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-24



From fedora-cvs-commits at redhat.com  Mon Jul 10 16:32:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 12:32:00 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.215,
	1.216 config-ia64-generic, 1.31, 1.32 config-x86-generic, 1.59,
	1.60 config-x86_64-generic, 1.47, 1.48
Message-ID: <200607101632.k6AGW0Qk015649@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:
disable broken driver



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- config-generic	7 Jul 2006 00:20:06 -0000	1.215
+++ config-generic	10 Jul 2006 16:31:29 -0000	1.216
@@ -252,6 +252,10 @@
 # CONFIG_ACPI_HOTKEY is not set
 # CONFIG_ACPI_DOCK is not set
 
+# FIXME: Broken in 2.6.18rc1git3
+# CONFIG_HOTPLUG_PCI_ACPI is not set
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+
 #
 # Block devices
 #


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-ia64-generic	27 Jun 2006 00:39:24 -0000	1.31
+++ config-ia64-generic	10 Jul 2006 16:31:44 -0000	1.32
@@ -128,8 +128,6 @@
 # CONFIG_PM_DEBUG is not set
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HPET is not set
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- config-x86-generic	4 Jul 2006 21:03:12 -0000	1.59
+++ config-x86-generic	10 Jul 2006 16:31:44 -0000	1.60
@@ -225,8 +225,6 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_ACPI_IBM_DOCK=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- config-x86_64-generic	5 Jul 2006 15:03:04 -0000	1.47
+++ config-x86_64-generic	10 Jul 2006 16:31:44 -0000	1.48
@@ -88,8 +88,6 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set



From fedora-cvs-commits at redhat.com  Mon Jul 10 18:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 14:16:14 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.111,1.112
Message-ID: <200607101816.k6AIGE25031424@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
- Update to 1.1.1.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xorg-x11-server.spec	10 Jul 2006 15:24:12 -0000	1.111
+++ xorg-x11-server.spec	10 Jul 2006 18:16:11 -0000	1.112
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   0%{?dist}
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -636,7 +636,7 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-0.fc6
+* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
 - Update to 1.1.1.
 
 * Sat Jul  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-27%{dist}



From fedora-cvs-commits at redhat.com  Mon Jul 10 18:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 14:23:40 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 xorg-x11-drv-i810.spec, 1.20, 1.21
Message-ID: <200607101823.k6AINexh019898@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
* Mon Jul 10 2006 Kristian H??gsberg <krh at redhat.com> - 1.6.0-7
- Roll back modesetting changes and build for fc5 aiglx repo.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Jul 2006 03:35:06 -0000	1.9
+++ .cvsignore	10 Jul 2006 18:23:37 -0000	1.10
@@ -1 +1 @@
-xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+xf86-video-i810-1.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Jul 2006 03:35:06 -0000	1.9
+++ sources	10 Jul 2006 18:23:37 -0000	1.10
@@ -1 +1 @@
-99af7eb02cbda6b8269d2a48b435370b  xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+0d3db819b9617a576927fd1aebe5ab81  xf86-video-i810-1.6.0.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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-i810.spec	8 Jul 2006 03:35:06 -0000	1.20
+++ xorg-x11-drv-i810.spec	10 Jul 2006 18:23:37 -0000	1.21
@@ -2,30 +2,29 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
+%define cvsdate cvsYYYYMMDD
+
 %ifarch %{ix86} x86_64 ia64
 %define with_dri        1
 %else
 %define with_dri        0
 %endif
 
-# GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   6.modeset20060707
+Release:   7{%dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:   xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
-BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2
 BuildRequires: libXvMC-devel
 %if %{with_dri}
@@ -33,7 +32,9 @@
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.1.0-1
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+
+#Patch0: more-libcunwrap.patch
 
 %description 
 X.Org X11 i810 video driver.
@@ -47,13 +48,12 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-#%setup -q -n %{tarball}-%{version}
-%setup -q -n xf86-video-intel
+%setup -q -n %{tarball}-%{version}
+
+#%patch0 -p1 -b .more-libcunwrap
 
 %build
-./autogen.sh --disable-static \
-           --libdir=%{_libdir} \
-           --mandir=%{_mandir} \
+%configure --disable-static \
 %if %{with_dri}
            --enable-dri
 %else
@@ -95,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Jul 10 2006 Kristian H??gsberg <krh at redhat.com> - 1.6.0-7
+- Roll back modesetting changes and build for fc5 aiglx repo.
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6.modeset20060707
 - Snapshot of the git modesetting branch.
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 18:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 14:26:48 -0400
Subject: rpms/cman/devel .cvsignore, 1.7, 1.8 cman.spec, 1.47, 1.48 sources,
	1.16, 1.17
Message-ID: <200607101826.k6AIQmEc022006@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21990

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Updated sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jul 2006 21:04:20 -0000	1.7
+++ .cvsignore	10 Jul 2006 18:26:46 -0000	1.8
@@ -1 +1 @@
-cman-2.0.1.tar.gz
+cman-2.0.2.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cman.spec	10 Jul 2006 16:13:26 -0000	1.47
+++ cman.spec	10 Jul 2006 18:26:46 -0000	1.48
@@ -10,11 +10,11 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.1
+%define cman_minor 0.2
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.9
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Jul 2006 16:55:05 -0000	1.16
+++ sources	10 Jul 2006 18:26:46 -0000	1.17
@@ -1 +1 @@
-86b8e1d3086a71b9901415b88894eb3d  cman-2.0.1.tar.gz
+3c1e3115cb45fdb1089a49809702229a  cman-2.0.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 10 18:57:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 14:57:18 -0400
Subject: rpms/gnucash/devel .cvsignore, 1.20, 1.21 gnucash.spec, 1.46,
	1.47 sources, 1.22, 1.23
Message-ID: <200607101857.k6AIvImR021874@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21822

Modified Files:
	.cvsignore gnucash.spec sources 
Log Message:
2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	19 Jun 2006 16:47:28 -0000	1.20
+++ .cvsignore	10 Jul 2006 18:57:16 -0000	1.21
@@ -1,3 +1,5 @@
 gnucash-1.9.7.tar.gz
 gnucash-docs-1.9.0.tar.gz
 gnucash-1.9.8.tar.gz
+gnucash-2.0.0.tar.gz
+gnucash-docs-2.0.0.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnucash.spec	19 Jun 2006 16:47:28 -0000	1.46
+++ gnucash.spec	10 Jul 2006 18:57:16 -0000	1.47
@@ -1,11 +1,11 @@
 %define svnrev 14285
 
 %define buildsvn 0
-%define docver 1.9.0
+%define docver 2.0.0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.8
+Version: 2.0.0
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1
+- update to 2.0.0. Woo.
+
 * Mon Jun 19 2006 Bill Nottingham <notting at redhat.com> - 1.9.8-1
 - update to 1.9.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	19 Jun 2006 16:47:28 -0000	1.22
+++ sources	10 Jul 2006 18:57:16 -0000	1.23
@@ -1,2 +1,2 @@
-d50b193f8a89dcff56cf11c95e838d2e  gnucash-docs-1.9.0.tar.gz
-e2d5c4e5068150efb216ebed4fbf6a04  gnucash-1.9.8.tar.gz
+d5802c398825500ec322bb2b3229aadd  gnucash-2.0.0.tar.gz
+9a84f681330aa61ea1aa7448b87e86a4  gnucash-docs-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 10 19:02:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 15:02:23 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.171,1.172
Message-ID: <200607101902.k6AJ2Nrt023235@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- cman-kernel.spec	6 Jul 2006 21:16:42 -0000	1.171
+++ cman-kernel.spec	10 Jul 2006 19:02:20 -0000	1.172
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145
+%define kernel_version 2.6.17-1.2145_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.26
+Release: 0.FC5.27
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Jul 10 19:03:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 15:03:30 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.165,1.166
Message-ID: <200607101903.k6AJ3U9S023393@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gnbd-kernel.spec	6 Jul 2006 21:17:12 -0000	1.165
+++ gnbd-kernel.spec	10 Jul 2006 19:03:27 -0000	1.166
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145
+%define kernel_version 2.6.17-1.2145_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.34
+Release: 5.FC5.35
 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 Jul 10 19:04:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 15:04:23 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.142,1.143
Message-ID: <200607101904.k6AJ4N9R023528@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- dlm-kernel.spec	6 Jul 2006 21:17:30 -0000	1.142
+++ dlm-kernel.spec	10 Jul 2006 19:04:07 -0000	1.143
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145
+%define kernel_version 2.6.17-1.2145_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.24
+Release: 0.FC5.25
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Jul 10 19:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 15:05:00 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.163,1.164
Message-ID: <200607101905.k6AJ50oo023702@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- GFS-kernel.spec	6 Jul 2006 21:17:44 -0000	1.163
+++ GFS-kernel.spec	10 Jul 2006 19:04:47 -0000	1.164
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145
+%define kernel_version 2.6.17-1.2145_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.31
+Release: 5.FC5.32
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Jul 10 20:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 16:52:25 -0400
Subject: rpms/tcsh/devel tcsh-6.14.00-wide-seeks.patch, NONE, 1.1 tcsh.spec,
	1.38, 1.39
Message-ID: <200607102052.k6AKqPxI028087@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28072

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-wide-seeks.patch 
Log Message:
* Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-9
- Fix seeking over multibyte characters (#195972)
- Don't ship obsolete eight-bit.txt


tcsh-6.14.00-wide-seeks.patch:
 sh.h                  |    9 ++++++++-
 tcsh-6.14.00/sh.lex.c |   16 ++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

--- NEW FILE tcsh-6.14.00-wide-seeks.patch ---
--- tcsh/sh.h	2005-03-25 19:46:41.000000000 +0100
+++ tcsh-6.14.00/sh.h	2006-07-03 03:45:30.000000000 +0200
@@ -801,6 +801,13 @@
  * exactly one if the input is seekable and tell is available.
  * In other cases, the shell buffers enough blocks to keep all loops
  * in the buffer.
+ *
+ * If (WIDE_STRINGS && cantell), fbobp is always a byte offset, but
+ * (fseekp - fbobp) and (feobp - fbobp) are character offsets (usable for
+ * fbuf indexing).
+ *
+ * If (!cantell), all offsets are character offsets; if (!WIDE_STRINGS), there
+ * is no difference between byte and character offsets.
  */
 EXTERN struct Bin {
     off_t   Bfseekp;		/* Seek pointer, generally != lseek() value */
@@ -824,7 +831,7 @@
 #define TCSH_F_SEEK	 2		/* File seek */
 #define TCSH_E_SEEK	 3		/* Eval seek */
     union {
-	off_t _f_seek;
+	off_t _f_seek;		/* A byte offset if (cantell) */
 	Char* _c_seek;
     } fc;
 #define f_seek fc._f_seek
diff -u tcsh-6.14.00/sh.lex.c tcsh-6.14.00/sh.lex.c
--- tcsh-6.14.00/sh.lex.c	2006-07-03 03:46:11.000000000 +0200
+++ tcsh-6.14.00/sh.lex.c	2006-07-05 16:31:51.000000000 +0200
@@ -1736,7 +1736,9 @@
 	    memmove(cbuf, cbuf + i, partial - i);
 	partial -= i;
     } while (partial != 0 && nchars != 0);
-    /* Throwing away possible partial multibyte characters on error */
+    /* Throwing away possible partial multibyte characters on error if the
+       stream is not seekable */
+    lseek(fildes, -(off_t)partial, L_INCR);
     return res != 0 ? res : r;
 }
 
@@ -1753,7 +1755,13 @@
 	    (void) lseek(SHIN, fseekp, L_SET);
 	}
 	if (fseekp == feobp) {
-	    fbobp = feobp;
+ 	    off_t bytes;
+ 	    size_t i;
+
+ 	    bytes = fbobp;
+ 	    for (i = 0; i < (size_t)(feobp - fbobp); i++)
+ 		bytes += fclens[i];
+ 	    fbobp = fseekp = feobp = bytes;
 	    do
 		c = wide_read(SHIN, fbuf[0], BUFSIZE, 1);
 	    while (c < 0 && errno == EINTR);
@@ -1926,9 +1934,9 @@
 	return;
     case TCSH_F_SEEK:
 #ifdef WIDE_STRINGS
-	if (cantell && fseekp >= fbobp && fseekp < feobp) {
+	if (cantell && fseekp >= fbobp && fseekp <= feobp) {
 	    size_t i;
-	    
+
 	    l->f_seek = fbobp;
 	    for (i = 0; i < fseekp - fbobp; i++)
 		l->f_seek += fclens[i];


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tcsh.spec	23 Mar 2006 02:09:08 -0000	1.38
+++ tcsh.spec	10 Jul 2006 20:52:23 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 8
+Release: 9
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -16,6 +16,7 @@
 Patch6: tcsh-6.14.00-sigint.patch
 Patch7: tcsh-6.14.00-wide-crash.patch
 Patch8: tcsh-6.14.00-colors.patch
+Patch9: tcsh-6.14.00-wide-seeks.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -41,8 +42,7 @@
 %patch6 -p1 -b .sigint
 %patch7 -p1 -b .wide-crash
 %patch8 -p1 -b .colors
-
-nroff -me eight-bit.me > eight-bit.txt
+%patch9 -p1 -b .wide-seeks
 
 %build
 %configure --without-hesiod
@@ -102,12 +102,16 @@
 
 %files -f tcsh.lang
 %defattr(-,root,root)
-%doc FAQ Fixes NewThings complete.tcsh eight-bit.txt
+%doc FAQ Fixes NewThings complete.tcsh
 %{_bindir}/tcsh
 %{_bindir}/csh
 %{_mandir}/*/*
 
 %changelog
+* Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-9
+- Fix seeking over multibyte characters (#195972)
+- Don't ship obsolete eight-bit.txt
+
 * Thu Mar 23 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-8
 - Backport a patch to ignore LS_COLOR codes introduced in newer coreutils
   (#186037)



From fedora-cvs-commits at redhat.com  Mon Jul 10 20:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 16:59:23 -0400
Subject: rpms/tcsh/FC-5 tcsh-6.14.00-wide-seeks.patch, NONE, 1.1 tcsh.spec,
	1.38, 1.39
Message-ID: <200607102059.k6AKxNAI028234@cvs.devel.redhat.com>

Author: mitr

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

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-wide-seeks.patch 
Log Message:
* Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.2
- Fix seeking over multibyte characters (#195972)


tcsh-6.14.00-wide-seeks.patch:
 sh.h                  |    9 ++++++++-
 tcsh-6.14.00/sh.lex.c |   16 ++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

--- NEW FILE tcsh-6.14.00-wide-seeks.patch ---
--- tcsh/sh.h	2005-03-25 19:46:41.000000000 +0100
+++ tcsh-6.14.00/sh.h	2006-07-03 03:45:30.000000000 +0200
@@ -801,6 +801,13 @@
  * exactly one if the input is seekable and tell is available.
  * In other cases, the shell buffers enough blocks to keep all loops
  * in the buffer.
+ *
+ * If (WIDE_STRINGS && cantell), fbobp is always a byte offset, but
+ * (fseekp - fbobp) and (feobp - fbobp) are character offsets (usable for
+ * fbuf indexing).
+ *
+ * If (!cantell), all offsets are character offsets; if (!WIDE_STRINGS), there
+ * is no difference between byte and character offsets.
  */
 EXTERN struct Bin {
     off_t   Bfseekp;		/* Seek pointer, generally != lseek() value */
@@ -824,7 +831,7 @@
 #define TCSH_F_SEEK	 2		/* File seek */
 #define TCSH_E_SEEK	 3		/* Eval seek */
     union {
-	off_t _f_seek;
+	off_t _f_seek;		/* A byte offset if (cantell) */
 	Char* _c_seek;
     } fc;
 #define f_seek fc._f_seek
diff -u tcsh-6.14.00/sh.lex.c tcsh-6.14.00/sh.lex.c
--- tcsh-6.14.00/sh.lex.c	2006-07-03 03:46:11.000000000 +0200
+++ tcsh-6.14.00/sh.lex.c	2006-07-05 16:31:51.000000000 +0200
@@ -1736,7 +1736,9 @@
 	    memmove(cbuf, cbuf + i, partial - i);
 	partial -= i;
     } while (partial != 0 && nchars != 0);
-    /* Throwing away possible partial multibyte characters on error */
+    /* Throwing away possible partial multibyte characters on error if the
+       stream is not seekable */
+    lseek(fildes, -(off_t)partial, L_INCR);
     return res != 0 ? res : r;
 }
 
@@ -1753,7 +1755,13 @@
 	    (void) lseek(SHIN, fseekp, L_SET);
 	}
 	if (fseekp == feobp) {
-	    fbobp = feobp;
+ 	    off_t bytes;
+ 	    size_t i;
+
+ 	    bytes = fbobp;
+ 	    for (i = 0; i < (size_t)(feobp - fbobp); i++)
+ 		bytes += fclens[i];
+ 	    fbobp = fseekp = feobp = bytes;
 	    do
 		c = wide_read(SHIN, fbuf[0], BUFSIZE, 1);
 	    while (c < 0 && errno == EINTR);
@@ -1926,9 +1934,9 @@
 	return;
     case TCSH_F_SEEK:
 #ifdef WIDE_STRINGS
-	if (cantell && fseekp >= fbobp && fseekp < feobp) {
+	if (cantell && fseekp >= fbobp && fseekp <= feobp) {
 	    size_t i;
-	    
+
 	    l->f_seek = fbobp;
 	    for (i = 0; i < fseekp - fbobp; i++)
 		l->f_seek += fclens[i];


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/FC-5/tcsh.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tcsh.spec	18 Mar 2006 03:17:04 -0000	1.38
+++ tcsh.spec	10 Jul 2006 20:59:21 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 6.fc5.1
+Release: 6.fc5.2
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -15,6 +15,7 @@
 Patch5: tcsh-6.14.00-read.patch
 Patch6: tcsh-6.14.00-sigint.patch
 Patch7: tcsh-6.14.00-wide-crash.patch
+Patch8: tcsh-6.14.00-wide-seeks.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -39,6 +40,7 @@
 %patch5 -p1 -b .read
 %patch6 -p1 -b .sigint
 %patch7 -p1 -b .wide-crash
+%patch8 -p1 -b .wide-seeks
 
 nroff -me eight-bit.me > eight-bit.txt
 
@@ -106,6 +108,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.2
+- Fix seeking over multibyte characters (#195972)
+
 * Sat Mar 18 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-6.fc5.1
 - Fix a crash when reading scripts with multibyte characters (#183267)
 - Block SIGINT while waiting for children (#177366)



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:05:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:05:39 -0400
Subject: rpms/nano/devel .cvsignore, 1.7, 1.8 nano.spec, 1.12, 1.13 sources,
	1.7, 1.8
Message-ID: <200607102205.k6AM5d77019012@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/nano/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18981

Modified Files:
	.cvsignore nano.spec sources 
Log Message:
update to 1.3.12


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 May 2006 16:17:03 -0000	1.7
+++ .cvsignore	10 Jul 2006 22:05:36 -0000	1.8
@@ -1 +1 @@
-nano-1.3.11.tar.gz
+nano-1.3.12.tar.gz


Index: nano.spec
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/nano.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nano.spec	16 May 2006 16:17:03 -0000	1.12
+++ nano.spec	10 Jul 2006 22:05:36 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: A small text editor
 Name:		nano
-Version:	1.3.11
+Version:	1.3.12
 Release:	1
 License:	GPL
 Group:		Applications/Editors
@@ -51,6 +51,9 @@
 %{_infodir}/nano.info*
 
 %changelog
+* Mon Jul 10 2006 David Woodhouse <dwmw2 at redhat.com> - 1.3.12-1
+- Update to 1.3.12
+
 * Tue May 16 2006 David Woodhouse <dwmw2 at redhat.com> - 1.3.11-1
 - Update to 1.3.11
 - BuildRequires: groff (#191946)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 May 2006 16:17:03 -0000	1.7
+++ sources	10 Jul 2006 22:05:36 -0000	1.8
@@ -1 +1 @@
-ad6c2270fd674065ef994a58d3a8a7b7  nano-1.3.11.tar.gz
+1450892aac7ae31d00817d42636d9a0d  nano-1.3.12.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:05:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:05:41 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.2-hash-style.patch, NONE,
	1.1 binutils.spec, 1.84, 1.85
Message-ID: <200607102205.k6AM5fSb019040@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.17.50.0.2-hash-style.patch 
Log Message:
2.17.50.0.2-5

binutils-2.17.50.0.2-hash-style.patch:
 bfd/elf-bfd.h                      |    7 
 bfd/elf.c                          |   23 +
 bfd/elf32-i386.c                   |   13 +
 bfd/elf64-x86-64.c                 |   15 +
 bfd/elflink.c                      |  466 +++++++++++++++++++++++++++++++------
 bfd/elfxx-target.h                 |    5 
 binutils/readelf.c                 |  175 +++++++++++++
 include/bfdlink.h                  |    6 
 include/elf/common.h               |    2 
 ld/emultempl/elf32.em              |   21 +
 ld/ld.texinfo                      |    8 
 ld/ldmain.c                        |    2 
 ld/scripttempl/elf.sc              |    1 
 ld/testsuite/ld-powerpc/tlsso.g    |    2 
 ld/testsuite/ld-powerpc/tlsso.r    |    6 
 ld/testsuite/ld-powerpc/tlsso32.d  |    2 
 ld/testsuite/ld-powerpc/tlsso32.g  |    2 
 ld/testsuite/ld-powerpc/tlsso32.r  |    6 
 ld/testsuite/ld-powerpc/tlstocso.g |    2 
 19 files changed, 687 insertions(+), 77 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-hash-style.patch ---
2006-07-10  Jakub Jelinek  <jakub at redhat.com>

include/
	* bfdlink.h (struct bfd_link_info): Add emit_hash and
	emit_gnu_hash bitfields.
include/elf/
	* common.h (SHT_GNU_HASH, DT_GNU_HASH): Define.
ld/
	* scripttempl/elf.sc: Add .gnu.hash section.
	* emultempl/elf32.em (OPTION_HASH_STYLE): Define.
	(gld${EMULATION_NAME}_add_options): Register --hash-style option.
	(gld${EMULATION_NAME}_handle_option): Handle it.
	(gld${EMULATION_NAME}_list_options): Document it.
	* ldmain.c (main): Initialize emit_hash and emit_gnu_hash.
	* ld.texinfo: Document --hash-style option.
ld/testsuite/
	* ld-powerpc/tlsso32.r: Adjust.
	* ld-powerpc/tlsso32.d: Adjust.
	* ld-powerpc/tlsso32.g: Adjust.
	* ld-powerpc/tlsso.r: Adjust.
	* ld-powerpc/tlsso.g: Adjust.
	* ld-powerpc/tlstocso.g: Adjust.
bfd/
	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_GNU_HASH.
	(bfd_section_from_shdr, elf_fake_sections, assign_section_numbers):
	Handle SHT_GNU_HASH.
	(special_sections_g): Include .gnu.hash section.
	(bfd_elf_gnu_hash): New function.
	* elf-bfd.h (bfd_elf_gnu_hash, _bfd_elf_hash_symbol): New prototypes.
	(struct elf_backend_data): Add elf_hash_symbol method.
	* elflink.c (_bfd_elf_link_create_dynamic_sections): Create .hash
	only if info->emit_hash, create .gnu.hash section if
	info->emit_gnu_hash.
	(struct collect_gnu_hash_codes): New type.
	(elf_collect_gnu_hash_codes, elf_renumber_gnu_hash_syms,
	_bfd_elf_hash_symbol): New functions.
	(compute_bucket_count): Don't compute HASHCODES array, instead add
	that and NSYMS as arguments.  Use bed->s->sizeof_hash_entry
	instead of bed->s->arch_size / 8.  Fix .hash size estimation.
	When not optimizing, use the number of hashed symbols rather than
	dynsymcount.
	(bfd_elf_size_dynamic_sections): Only add DT_HASH if info->emit_hash,
	and ADD DT_GNU_HASH if info->emit_gnu_hash.
	(bfd_elf_size_dynsym_hash_dynstr): Size .hash only if info->emit_hash,
	adjust compute_bucket_count caller.  Create and populate .gnu.hash
	section if info->emit_gnu_hash.
	(elf_link_output_extsym): Only populate .hash section if
	finfo->hash_sec != NULL.
	(bfd_elf_final_link): Adjust assertion.  Handle DT_GNU_HASH.
	* elfxx-target.h (elf_backend_hash_symbol): Define if not yet defined.
	(elfNN_bed): Add elf_backend_hash_symbol.
	* elf64-x86-64.c (elf64_x86_64_hash_symbol): New function.
	(elf_backend_hash_symbol): Define.
	* elf32-i386.c (elf_i386_hash_symbol): New function.
	(elf_backend_hash_symbol): Define.
binutils/
	* readelf.c (get_dynamic_type): Handle DT_GNU_HASH.
	(get_section_type_name): Handle SHT_GNU_HASH.
	(dynamic_info_DT_GNU_HASH): New variable.
	(process_dynamic_section): Handle DT_GNU_HASH.
	(process_symbol_table): Print also DT_GNU_HASH histogram.

--- ld/scripttempl/elf.sc.jj	2006-01-01 01:02:16.000000000 +0100
+++ ld/scripttempl/elf.sc	2006-06-22 11:11:53.000000000 +0200
@@ -260,6 +260,7 @@ SECTIONS
   ${INITIAL_READONLY_SECTIONS}
   ${TEXT_DYNAMIC+${DYNAMIC}}
   .hash         ${RELOCATING-0} : { *(.hash) }
+  .gnu.hash     ${RELOCATING-0} : { *(.gnu.hash) }
   .dynsym       ${RELOCATING-0} : { *(.dynsym) }
   .dynstr       ${RELOCATING-0} : { *(.dynstr) }
   .gnu.version  ${RELOCATING-0} : { *(.gnu.version) }
--- ld/ldmain.c.jj	2006-06-01 15:50:33.000000000 +0200
+++ ld/ldmain.c	2006-06-22 11:21:11.000000000 +0200
@@ -304,6 +304,8 @@ main (int argc, char **argv)
   link_info.create_object_symbols_section = NULL;
   link_info.gc_sym_list = NULL;
   link_info.base_file = NULL;
+  link_info.emit_hash = TRUE;
+  link_info.emit_gnu_hash = FALSE;
   /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init
      and _fini symbols.  We are compatible.  */
   link_info.init_function = "_init";
--- ld/ld.texinfo.jj	2006-06-15 14:31:06.000000000 +0200
+++ ld/ld.texinfo	2006-06-22 14:03:21.000000000 +0200
@@ -1883,6 +1883,14 @@ time it takes the linker to perform its 
 increasing the linker's memory requirements.  Similarly reducing this
 value can reduce the memory requirements at the expense of speed.
 
+ at kindex --hash-style=@var{style}
+ at item --hash-style=@var{style}
+Set the type of linker's hash table(s).  @var{style} can be either
+ at code{sysv} for classic ELF @code{.hash} section, @code{gnu} for
+new style GNU @code{.gnu.hash} section or @code{both} for both
+the classic ELF @code{.hash} and new style GNU @code{.gnu.hash}
+hash tables.  The default is @code{sysv}.
+
 @kindex --reduce-memory-overheads
 @item --reduce-memory-overheads
 This option reduces memory requirements at ld runtime, at the expense of
--- ld/emultempl/elf32.em.jj	2006-06-20 18:34:24.000000000 +0200
+++ ld/emultempl/elf32.em	2006-06-22 14:39:25.000000000 +0200
@@ -1725,7 +1725,8 @@ cat >>e${EMULATION_NAME}.c <<EOF
 #define OPTION_GROUP			(OPTION_ENABLE_NEW_DTAGS + 1)
 #define OPTION_EH_FRAME_HDR		(OPTION_GROUP + 1)
 #define OPTION_EXCLUDE_LIBS		(OPTION_EH_FRAME_HDR + 1)
-  
+#define OPTION_HASH_STYLE		(OPTION_EXCLUDE_LIBS + 1)
+
 static void
 gld${EMULATION_NAME}_add_options
   (int ns, char **shortopts, int nl, struct option **longopts,
@@ -1741,6 +1742,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
     {"enable-new-dtags", no_argument, NULL, OPTION_ENABLE_NEW_DTAGS},
     {"eh-frame-hdr", no_argument, NULL, OPTION_EH_FRAME_HDR},
     {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS},
+    {"hash-style", required_argument, NULL, OPTION_HASH_STYLE},
     {"Bgroup", no_argument, NULL, OPTION_GROUP},
 EOF
 fi
@@ -1797,6 +1799,22 @@ cat >>e${EMULATION_NAME}.c <<EOF
       add_excluded_libs (optarg);
       break;
 
+    case OPTION_HASH_STYLE:
+      link_info.emit_hash = FALSE;
+      link_info.emit_gnu_hash = FALSE;
+      if (strcmp (optarg, "sysv") == 0)
+	link_info.emit_hash = TRUE;
+      else if (strcmp (optarg, "gnu") == 0)
+	link_info.emit_gnu_hash = TRUE;
+      else if (strcmp (optarg, "both") == 0)
+	{
+	  link_info.emit_hash = TRUE;
+	  link_info.emit_gnu_hash = TRUE;
+	}
+      else
+	einfo (_("%P%F: invalid hash style \`%s'\n"), optarg);
+      break;
+
     case 'z':
       if (strcmp (optarg, "initfirst") == 0)
 	link_info.flags_1 |= (bfd_vma) DF_1_INITFIRST;
@@ -1895,6 +1913,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
   fprintf (file, _("  --disable-new-dtags\tDisable new dynamic tags\n"));
   fprintf (file, _("  --enable-new-dtags\tEnable new dynamic tags\n"));
   fprintf (file, _("  --eh-frame-hdr\tCreate .eh_frame_hdr section\n"));
+  fprintf (file, _("  --hash-style=STYLE\tSet hash style to sysv, gnu or both\n"));
   fprintf (file, _("  -z combreloc\t\tMerge dynamic relocs into one section and sort\n"));
   fprintf (file, _("  -z defs\t\tReport unresolved symbols in object files.\n"));
   fprintf (file, _("  -z execstack\t\tMark executable as requiring executable stack\n"));
--- bfd/elf-bfd.h.jj	2006-06-20 18:34:24.000000000 +0200
+++ bfd/elf-bfd.h	2006-07-06 15:48:12.000000000 +0200
@@ -1038,6 +1038,9 @@ struct elf_backend_data
 			       bfd_boolean *, bfd_boolean *,
 			       bfd *, asection **);
 
+  /* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+  bfd_boolean (*elf_hash_symbol) (struct elf_link_hash_entry *);
+
   /* Used to handle bad SHF_LINK_ORDER input.  */
   bfd_error_handler_type link_order_error_handler;
 
@@ -1481,6 +1484,8 @@ extern bfd_vma _bfd_elf_section_offset
 
 extern unsigned long bfd_elf_hash
   (const char *);
+extern unsigned long bfd_elf_gnu_hash
+  (const char *);
 
 extern bfd_reloc_status_type bfd_elf_generic_reloc
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
@@ -1651,6 +1656,8 @@ extern bfd_boolean _bfd_elf_merge_symbol
    struct elf_link_hash_entry **, bfd_boolean *,
    bfd_boolean *, bfd_boolean *, bfd_boolean *);
 
+extern bfd_boolean _bfd_elf_hash_symbol (struct elf_link_hash_entry *);
+
 extern bfd_boolean _bfd_elf_add_default_symbol
   (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
    const char *, Elf_Internal_Sym *, asection **, bfd_vma *,
--- bfd/elf64-x86-64.c.jj	2006-06-20 11:57:19.000000000 +0200
+++ bfd/elf64-x86-64.c	2006-07-06 16:54:21.000000000 +0200
@@ -3615,6 +3615,19 @@ elf64_x86_64_additional_program_headers 
   return count;
 }
 
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf64_x86_64_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
+
 static const struct bfd_elf_special_section 
   elf64_x86_64_special_sections[]=
 {
@@ -3688,5 +3701,7 @@ static const struct bfd_elf_special_sect
   elf64_x86_64_special_sections
 #define elf_backend_additional_program_headers \
   elf64_x86_64_additional_program_headers
+#define elf_backend_hash_symbol \
+  elf64_x86_64_hash_symbol
 
 #include "elf64-target.h"
--- bfd/elf.c.jj	2006-06-20 18:34:24.000000000 +0200
+++ bfd/elf.c	2006-07-10 19:10:40.000000000 +0200
@@ -206,6 +206,21 @@ bfd_elf_hash (const char *namearg)
   return h & 0xffffffff;
 }
 
+/* DT_GNU_HASH hash function.  Do not change this function; you will
+   cause invalid hash tables to be generated.  */
+
+unsigned long
+bfd_elf_gnu_hash (const char *namearg)
+{
+  const unsigned char *name = (const unsigned char *) namearg;
+  unsigned long h = 5381;
+  unsigned char ch;
+
+  while ((ch = *name++) != '\0')
+    h = (h << 5) + h + ch;
+  return h & 0xffffffff;
+}
+
 bfd_boolean
 bfd_elf_mkobject (bfd *abfd)
 {
@@ -1239,6 +1254,7 @@ _bfd_elf_print_private_bfd_data (bfd *ab
 	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = TRUE; break;
 	    case DT_USED: name = "USED"; break;
 	    case DT_FILTER: name = "FILTER"; stringp = TRUE; break;
+	    case DT_GNU_HASH: name = "GNU_HASH"; break;
 	    }
 
 	  fprintf (f, "  %-11s ", name);
@@ -1823,6 +1839,7 @@ bfd_section_from_shdr (bfd *abfd, unsign
     case SHT_FINI_ARRAY:	/* .fini_array section.  */
     case SHT_PREINIT_ARRAY:	/* .preinit_array section.  */
     case SHT_GNU_LIBLIST:	/* .gnu.liblist section.  */
+    case SHT_GNU_HASH:		/* .gnu.hash section.  */
       return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
 
     case SHT_DYNAMIC:	/* Dynamic linking information.  */
@@ -2295,6 +2312,7 @@ static const struct bfd_elf_special_sect
   { ".gnu.version_r", 14,  0, SHT_GNU_verneed, 0 },
   { ".gnu.liblist",   12,  0, SHT_GNU_LIBLIST, SHF_ALLOC },
   { ".gnu.conflict",  13,  0, SHT_RELA,     SHF_ALLOC },
+  { ".gnu.hash",       9,  0, SHT_GNU_HASH, SHF_ALLOC },
   { NULL,              0,  0, 0,            0 }
 };
 
@@ -2811,6 +2829,10 @@ elf_fake_sections (bfd *abfd, asection *
     case SHT_GROUP:
       this_hdr->sh_entsize = 4;
       break;
+
+    case SHT_GNU_HASH:
+      this_hdr->sh_entsize = bed->s->arch_size == 64 ? 0 : 4;
+      break;
     }
 
   if ((asect->flags & SEC_ALLOC) != 0)
@@ -3256,6 +3278,7 @@ assign_section_numbers (bfd *abfd, struc
 	  break;
 
 	case SHT_HASH:
+	case SHT_GNU_HASH:
 	case SHT_GNU_versym:
 	  /* sh_link is the section header index of the symbol table
 	     this hash table or version table is for.  */
--- bfd/elf32-i386.c.jj	2006-06-23 15:32:34.000000000 +0200
+++ bfd/elf32-i386.c	2006-07-06 16:56:24.000000000 +0200
@@ -3835,6 +3835,18 @@ elf_i386_plt_sym_val (bfd_vma i, const a
   return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
 }
 
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf_i386_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
 
 #define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
 #define TARGET_LITTLE_NAME		"elf32-i386"
@@ -3875,6 +3887,7 @@ elf_i386_plt_sym_val (bfd_vma i, const a
 #define elf_backend_size_dynamic_sections     elf_i386_size_dynamic_sections
 #define elf_backend_always_size_sections      elf_i386_always_size_sections
 #define elf_backend_plt_sym_val		      elf_i386_plt_sym_val
+#define elf_backend_hash_symbol		      elf_i386_hash_symbol
 
 #include "elf32-target.h"
 
--- bfd/elflink.c.jj	2006-06-20 18:34:53.000000000 +0200
+++ bfd/elflink.c	2006-07-10 19:01:44.000000000 +0200
@@ -240,12 +240,30 @@ _bfd_elf_link_create_dynamic_sections (b
   if (!_bfd_elf_define_linkage_sym (abfd, info, s, "_DYNAMIC"))
     return FALSE;
 
-  s = bfd_make_section_with_flags (abfd, ".hash",
-				   flags | SEC_READONLY);
-  if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
-    return FALSE;
-  elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
+  if (info->emit_hash)
+    {
+      s = bfd_make_section_with_flags (abfd, ".hash", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
+    }
+
+  if (info->emit_gnu_hash)
+    {
+      s = bfd_make_section_with_flags (abfd, ".gnu.hash",
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      /* For 64-bit ELF, .gnu.hash is a non-uniform entity size section:
+	 4 32-bit words followed by variable count of 64-bit words, then
+	 variable count of 32-bit words.  */
+      if (bed->s->arch_size == 64)
+	elf_section_data (s)->this_hdr.sh_entsize = 0;
+      else
+	elf_section_data (s)->this_hdr.sh_entsize = 4;
+    }
 
   /* Let the backend create the rest of the sections.  This lets the
      backend set the right flags.  The backend will normally create
@@ -4811,6 +4829,131 @@ elf_collect_hash_codes (struct elf_link_
   return TRUE;
 }
 
+struct collect_gnu_hash_codes
+{
+  bfd *output_bfd;
+  const struct elf_backend_data *bed;
+  unsigned long int nsyms;
+  unsigned long int maskbits;
+  unsigned long int *hashcodes;
+  unsigned long int *hashval;
+  unsigned long int *indx;
+  unsigned long int *counts;
+  bfd_vma *bitmask;
+  bfd_byte *contents;
+  long int min_dynindx;
+  unsigned long int bucketcount;
+  unsigned long int symindx;
+  long int local_indx;
+  long int shift1, shift2;
+  unsigned long int mask;
+};
+
+/* This function will be called though elf_link_hash_traverse to store
+   all hash value of the exported symbols in an array.  */
+
+static bfd_boolean
+elf_collect_gnu_hash_codes (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = data;
+  const char *name;
+  char *p;
+  unsigned long ha;
+  char *alc = NULL;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    return TRUE;
+
+  name = h->root.root.string;
+  p = strchr (name, ELF_VER_CHR);
+  if (p != NULL)
+    {
+      alc = bfd_malloc (p - name + 1);
+      memcpy (alc, name, p - name);
+      alc[p - name] = '\0';
+      name = alc;
+    }
+
+  /* Compute the hash value.  */
+  ha = bfd_elf_gnu_hash (name);
+
+  /* Store the found hash value in the array for compute_bucket_count,
+     and also for .dynsym reordering purposes.  */
+  s->hashcodes[s->nsyms] = ha;
+  s->hashval[h->dynindx] = ha;
+  ++s->nsyms;
+  if (s->min_dynindx < 0 || s->min_dynindx > h->dynindx)
+    s->min_dynindx = h->dynindx;
+
+  if (alc != NULL)
+    free (alc);
+
+  return TRUE;
+}
+
+/* This function will be called though elf_link_hash_traverse to do
+   final dynaminc symbol renumbering.  */
+
+static bfd_boolean
+elf_renumber_gnu_hash_syms (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = data;
+  unsigned long int bucket;
+  unsigned long int val;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* Ignore indirect symbols.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    {
+      if (h->dynindx >= s->min_dynindx)
+	h->dynindx = s->local_indx++;
+      return TRUE;
+    }
+
+  bucket = s->hashval[h->dynindx] % s->bucketcount;
+  val = (s->hashval[h->dynindx] >> s->shift1)
+	& ((s->maskbits >> s->shift1) - 1);
+  s->bitmask[val] |= ((bfd_vma) 1) << (s->hashval[h->dynindx] & s->mask);
+  s->bitmask[val]
+    |= ((bfd_vma) 1) << ((s->hashval[h->dynindx] >> s->shift2) & s->mask);
+  val = s->hashval[h->dynindx] & ~(unsigned long int) 1;
+  if (s->counts[bucket] == 1)
+    /* Last element terminates the chain.  */
+    val |= 1;
+  bfd_put_32 (s->output_bfd, val,
+	      s->contents + (s->indx[bucket] - s->symindx) * 4);
+  --s->counts[bucket];
+  h->dynindx = s->indx[bucket]++;
+  return TRUE;
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+bfd_boolean
+_bfd_elf_hash_symbol (struct elf_link_hash_entry *h)
+{
+  return !(h->forced_local
+	   || h->root.type == bfd_link_hash_undefined
+	   || h->root.type == bfd_link_hash_undefweak
+	   || ((h->root.type == bfd_link_hash_defined
+		|| h->root.type == bfd_link_hash_defweak)
+	       && h->root.u.def.section->output_section == NULL));
+}
+
 /* Array used to determine the number of hash table buckets to use
    based on the number of symbols there are.  If there are fewer than
    3 symbols we use 1 bucket, fewer than 17 symbols we use 3 buckets,
@@ -4832,42 +4975,26 @@ static const size_t elf_buckets[] =
    Therefore the result is always a good payoff between few collisions
    (= short chain lengths) and table size.  */
 static size_t
-compute_bucket_count (struct bfd_link_info *info)
+compute_bucket_count (struct bfd_link_info *info, unsigned long int *hashcodes,
+		      unsigned long int nsyms, int gnu_hash)
 {
   size_t dynsymcount = elf_hash_table (info)->dynsymcount;
   size_t best_size = 0;
-  unsigned long int *hashcodes;
-  unsigned long int *hashcodesp;
   unsigned long int i;
   bfd_size_type amt;
 
-  /* Compute the hash values for all exported symbols.  At the same
-     time store the values in an array so that we could use them for
-     optimizations.  */
-  amt = dynsymcount;
-  amt *= sizeof (unsigned long int);
-  hashcodes = bfd_malloc (amt);
-  if (hashcodes == NULL)
-    return 0;
-  hashcodesp = hashcodes;
-
-  /* Put all hash values in HASHCODES.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_collect_hash_codes, &hashcodesp);
-
   /* We have a problem here.  The following code to optimize the table
      size requires an integer type with more the 32 bits.  If
      BFD_HOST_U_64_BIT is set we know about such a type.  */
 #ifdef BFD_HOST_U_64_BIT
   if (info->optimize)
     {
-      unsigned long int nsyms = hashcodesp - hashcodes;
       size_t minsize;
       size_t maxsize;
       BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
-      unsigned long int *counts ;
       bfd *dynobj = elf_hash_table (info)->dynobj;
       const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
+      unsigned long int *counts;
 
       /* Possible optimization parameters: if we have NSYMS symbols we say
 	 that the hashing table must at least have NSYMS/4 and at most
@@ -4876,6 +5003,13 @@ compute_bucket_count (struct bfd_link_in
       if (minsize == 0)
 	minsize = 1;
       best_size = maxsize = nsyms * 2;
+      if (gnu_hash)
+	{
+	  if (minsize < 2)
+	    minsize = 2;
+	  if ((best_size & 31) == 0)
+	    ++best_size;
+	}
 
       /* Create array where we count the collisions in.  We must use bfd_malloc
 	 since the size could be large.  */
@@ -4883,10 +5017,7 @@ compute_bucket_count (struct bfd_link_in
       amt *= sizeof (unsigned long int);
       counts = bfd_malloc (amt);
       if (counts == NULL)
-	{
-	  free (hashcodes);
-	  return 0;
-	}
+	return 0;
 
       /* Compute the "optimal" size for the hash table.  The criteria is a
 	 minimal chain length.  The minor criteria is (of course) the size
@@ -4898,6 +5029,9 @@ compute_bucket_count (struct bfd_link_in
 	  unsigned long int j;
 	  unsigned long int fact;
 
+	  if (gnu_hash && (i & 31) == 0)
+	    continue;
+
 	  memset (counts, '\0', i * sizeof (unsigned long int));
 
 	  /* Determine how often each hash bucket is used.  */
@@ -4913,9 +5047,9 @@ compute_bucket_count (struct bfd_link_in
 #  define BFD_TARGET_PAGESIZE	(4096)
 # endif
 
-	  /* We in any case need 2 + NSYMS entries for the size values and
-	     the chains.  */
-	  max = (2 + nsyms) * (bed->s->arch_size / 8);
+	  /* We in any case need 2 + DYNSYMCOUNT entries for the size values
+	     and the chains.  */
+	  max = (2 + dynsymcount) * bed->s->sizeof_hash_entry;
 
 # if 1
 	  /* Variant 1: optimize for short chains.  We add the squares
@@ -4925,7 +5059,7 @@ compute_bucket_count (struct bfd_link_in
 	    max += counts[j] * counts[j];
 
 	  /* This adds penalties for the overall size of the table.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
 	  max *= fact * fact;
 # else
 	  /* Variant 2: Optimize a lot more for small table.  Here we
@@ -4936,7 +5070,7 @@ compute_bucket_count (struct bfd_link_in
 
 	  /* The overall size of the table is considered, but not as
 	     strong as in variant 1, where it is squared.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
 	  max *= fact;
 # endif
 
@@ -4959,14 +5093,13 @@ compute_bucket_count (struct bfd_link_in
       for (i = 0; elf_buckets[i] != 0; i++)
 	{
 	  best_size = elf_buckets[i];
-	  if (dynsymcount < elf_buckets[i + 1])
+	  if (nsyms < elf_buckets[i + 1])
 	    break;
 	}
+      if (gnu_hash && best_size < 2)
+	best_size = 2;
     }
 
-  /* Free the arrays we needed.  */
-  free (hashcodes);
-
   return best_size;
 }
 
@@ -5324,7 +5457,10 @@ bfd_elf_size_dynamic_sections (bfd *outp
 	  bfd_size_type strsize;
 
 	  strsize = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
-	  if (!_bfd_elf_add_dynamic_entry (info, DT_HASH, 0)
+	  if ((info->emit_hash
+	       && !_bfd_elf_add_dynamic_entry (info, DT_HASH, 0))
+	      || (info->emit_gnu_hash
+		  && !_bfd_elf_add_dynamic_entry (info, DT_GNU_HASH, 0))
 	      || !_bfd_elf_add_dynamic_entry (info, DT_STRTAB, 0)
 	      || !_bfd_elf_add_dynamic_entry (info, DT_SYMTAB, 0)
 	      || !_bfd_elf_add_dynamic_entry (info, DT_STRSZ, strsize)
@@ -5726,8 +5862,6 @@ bfd_elf_size_dynsym_hash_dynstr (bfd *ou
       asection *s;
       bfd_size_type dynsymcount;
       unsigned long section_sym_count;
-      size_t bucketcount = 0;
-      size_t hash_entry_size;
       unsigned int dtagcount;
 
       dynobj = elf_hash_table (info)->dynobj;
@@ -5778,23 +5912,215 @@ bfd_elf_size_dynsym_hash_dynstr (bfd *ou
 	  memset (s->contents, 0, section_sym_count * bed->s->sizeof_sym);
 	}
 
+      elf_hash_table (info)->bucketcount = 0;
+
       /* Compute the size of the hashing table.  As a side effect this
 	 computes the hash values for all the names we export.  */
-      bucketcount = compute_bucket_count (info);
+      if (info->emit_hash)
+	{
+	  unsigned long int *hashcodes;
+	  unsigned long int *hashcodesp;
+	  bfd_size_type amt;
+	  unsigned long int nsyms;
+	  size_t bucketcount;
+	  size_t hash_entry_size;
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * sizeof (unsigned long int);
+	  hashcodes = bfd_malloc (amt);
+	  if (hashcodes == NULL)
+	    return FALSE;
+	  hashcodesp = hashcodes;
 
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-      hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
-      s->size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
-      s->contents = bfd_zalloc (output_bfd, s->size);
-      if (s->contents == NULL)
-	return FALSE;
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_hash_codes, &hashcodesp);
 
-      bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
-      bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
-	       s->contents + hash_entry_size);
+	  nsyms = hashcodesp - hashcodes;
+	  bucketcount
+	    = compute_bucket_count (info, hashcodes, nsyms, 0);
+	  free (hashcodes);
 
-      elf_hash_table (info)->bucketcount = bucketcount;
+	  if (bucketcount == 0)
+	    return FALSE;
+
+	  elf_hash_table (info)->bucketcount = bucketcount;
+
+	  s = bfd_get_section_by_name (dynobj, ".hash");
+	  BFD_ASSERT (s != NULL);
+	  hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
+	  s->size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
+	  s->contents = bfd_zalloc (output_bfd, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+
+	  bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
+	  bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
+		   s->contents + hash_entry_size);
+	}
+
+      if (info->emit_gnu_hash)
+	{
+	  size_t i, cnt;
+	  unsigned char *contents;
+	  struct collect_gnu_hash_codes cinfo;
+	  bfd_size_type amt;
+	  size_t bucketcount;
+
+	  memset (&cinfo, 0, sizeof (cinfo));
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * 2 * sizeof (unsigned long int);
+	  cinfo.hashcodes = bfd_malloc (amt);
+	  if (cinfo.hashcodes == NULL)
+	    return FALSE;
+
+	  cinfo.hashval = cinfo.hashcodes + dynsymcount;
+	  cinfo.min_dynindx = -1;
+	  cinfo.output_bfd = output_bfd;
+	  cinfo.bed = bed;
+
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_gnu_hash_codes, &cinfo);
+
+	  bucketcount
+	    = compute_bucket_count (info, cinfo.hashcodes, cinfo.nsyms, 1);
+
+	  if (bucketcount == 0)
+	    {
+	      free (cinfo.hashcodes);
+	      return FALSE;
+	    }
+
+	  s = bfd_get_section_by_name (dynobj, ".gnu.hash");
+	  BFD_ASSERT (s != NULL);
+
+	  if (cinfo.nsyms == 0)
+	    {
+	      /* Empty .gnu.hash section is special.  */
+	      BFD_ASSERT (cinfo.min_dynindx == -1);
+	      free (cinfo.hashcodes);
+	      s->size = 5 * 4 + bed->s->arch_size / 8;
+	      contents = bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		return FALSE;
+	      s->contents = contents;
+	      /* 1 empty bucket.  */
+	      bfd_put_32 (output_bfd, 1, contents);
+	      /* SYMIDX above the special symbol 0.  */
+	      bfd_put_32 (output_bfd, 1, contents + 4);
+	      /* Just one word for bitmask.  */
+	      bfd_put_32 (output_bfd, 1, contents + 8);
+	      /* Only hash fn bloom filter.  */
+	      bfd_put_32 (output_bfd, 0, contents + 12);
+	      /* No hashes are valid - empty bitmask.  */
+	      bfd_put (bed->s->arch_size, output_bfd, 0, contents + 16);
+	      /* No hashes in the only bucket.  */
+	      bfd_put_32 (output_bfd, 0,
+			  contents + 16 + bed->s->arch_size / 8);
+	    }
+	  else
+	    {
+	      BFD_ASSERT (cinfo.min_dynindx != -1);
+	      unsigned long int maskwords, maskbitslog2;
+
+	      maskbitslog2 = bfd_log2 (cinfo.nsyms) + 1;
+	      if (maskbitslog2 < 3)
+		maskbitslog2 = 5;
+	      else if ((1 << (maskbitslog2 - 2)) & cinfo.nsyms)
+		maskbitslog2 = maskbitslog2 + 3;
+	      else
+		maskbitslog2 = maskbitslog2 + 2;
+	      if (bed->s->arch_size == 64)
+		{
+		  if (maskbitslog2 == 5)
+		    maskbitslog2 = 6;
+		  cinfo.shift1 = 6;
+		}
+	      else
+		cinfo.shift1 = 5;
+	      cinfo.mask = (1 << cinfo.shift1) - 1;
+	      cinfo.shift2 = maskbitslog2 + cinfo.shift1;
+	      cinfo.maskbits = 1 << maskbitslog2;
+	      maskwords = 1 << (maskbitslog2 - cinfo.shift1);
+	      amt = bucketcount * sizeof (unsigned long int) * 2;
+	      amt += maskwords * sizeof (bfd_vma);
+	      cinfo.bitmask = bfd_malloc (amt);
+	      if (cinfo.bitmask == NULL)
+		{
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      cinfo.counts = (void *) (cinfo.bitmask + maskwords);
+	      cinfo.indx = cinfo.counts + bucketcount;
+	      cinfo.symindx = dynsymcount - cinfo.nsyms;
+	      memset (cinfo.bitmask, 0, maskwords * sizeof (bfd_vma));
+
+	      /* Determine how often each hash bucket is used.  */
+	      memset (cinfo.counts, 0, bucketcount * sizeof (cinfo.counts[0]));
+	      for (i = 0; i < cinfo.nsyms; ++i)
+		++cinfo.counts[cinfo.hashcodes[i] % bucketcount];
+
+	      for (i = 0, cnt = cinfo.symindx; i < bucketcount; ++i)
+		if (cinfo.counts[i] != 0)
+		  {
+		    cinfo.indx[i] = cnt;
+		    cnt += cinfo.counts[i];
+		  }
+	      BFD_ASSERT (cnt == dynsymcount);
+	      cinfo.bucketcount = bucketcount;
+	      cinfo.local_indx = cinfo.min_dynindx;
+
+	      s->size = (4 + bucketcount + cinfo.nsyms) * 4;
+	      s->size += cinfo.maskbits / 8;
+	      contents = bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		{
+		  free (cinfo.bitmask);
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      s->contents = contents;
+	      bfd_put_32 (output_bfd, bucketcount, contents);
+	      bfd_put_32 (output_bfd, cinfo.symindx, contents + 4);
+	      bfd_put_32 (output_bfd, maskwords, contents + 8);
+	      bfd_put_32 (output_bfd, cinfo.shift2, contents + 12);
+	      contents += 16 + cinfo.maskbits / 8;
+
+	      for (i = 0; i < bucketcount; ++i)
+		{
+		  if (cinfo.counts[i] == 0)
+		    bfd_put_32 (output_bfd, 0, contents);
+		  else
+		    bfd_put_32 (output_bfd, cinfo.indx[i], contents);
+		  contents += 4;
+		}
+
+	      cinfo.contents = contents;
+
+	      /* Renumber dynamic symbols, populate .gnu.hash section.  */
+	      elf_link_hash_traverse (elf_hash_table (info),
+				      elf_renumber_gnu_hash_syms, &cinfo);
+
+	      contents = s->contents + 16;
+	      for (i = 0; i < maskwords; ++i)
+		{
+		  bfd_put (bed->s->arch_size, output_bfd, cinfo.bitmask[i],
+			   contents);
+		  contents += bed->s->arch_size / 8;
+		}
+
+	      free (cinfo.bitmask);
+	      free (cinfo.hashcodes);
+	    }
+	}
 
       s = bfd_get_section_by_name (dynobj, ".dynstr");
       BFD_ASSERT (s != NULL);
@@ -6663,9 +6989,6 @@ elf_link_output_extsym (struct elf_link_
     {
       size_t bucketcount;
       size_t bucket;
-      size_t hash_entry_size;
-      bfd_byte *bucketpos;
-      bfd_vma chain;
       bfd_byte *esym;
 
       sym.st_name = h->dynstr_index;
@@ -6679,15 +7002,23 @@ elf_link_output_extsym (struct elf_link_
 
       bucketcount = elf_hash_table (finfo->info)->bucketcount;
       bucket = h->u.elf_hash_value % bucketcount;
-      hash_entry_size
-	= elf_section_data (finfo->hash_sec)->this_hdr.sh_entsize;
-      bucketpos = ((bfd_byte *) finfo->hash_sec->contents
-		   + (bucket + 2) * hash_entry_size);
-      chain = bfd_get (8 * hash_entry_size, finfo->output_bfd, bucketpos);
-      bfd_put (8 * hash_entry_size, finfo->output_bfd, h->dynindx, bucketpos);
-      bfd_put (8 * hash_entry_size, finfo->output_bfd, chain,
-	       ((bfd_byte *) finfo->hash_sec->contents
-		+ (bucketcount + 2 + h->dynindx) * hash_entry_size));
+
+      if (finfo->hash_sec != NULL)
+	{
+	  size_t hash_entry_size;
+	  bfd_byte *bucketpos;
+	  bfd_vma chain;
+
+	  hash_entry_size
+	    = elf_section_data (finfo->hash_sec)->this_hdr.sh_entsize;
+	  bucketpos = ((bfd_byte *) finfo->hash_sec->contents
+		       + (bucket + 2) * hash_entry_size);
+	  chain = bfd_get (8 * hash_entry_size, finfo->output_bfd, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, h->dynindx, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, chain,
+		   ((bfd_byte *) finfo->hash_sec->contents
+		    + (bucketcount + 2 + h->dynindx) * hash_entry_size));
+	}
 
       if (finfo->symver_sec != NULL && finfo->symver_sec->contents != NULL)
 	{
@@ -7861,7 +8192,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
     {
       finfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
       finfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (finfo.dynsym_sec != NULL && finfo.hash_sec != NULL);
+      BFD_ASSERT (finfo.dynsym_sec != NULL);
       finfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
       /* Note that it is OK if symver_sec is NULL.  */
     }
@@ -8621,6 +8952,9 @@ bfd_elf_final_link (bfd *abfd, struct bf
 	    case DT_HASH:
 	      name = ".hash";
 	      goto get_vma;
+	    case DT_GNU_HASH:
+	      name = ".gnu.hash";
+	      goto get_vma;
 	    case DT_STRTAB:
 	      name = ".dynstr";
 	      goto get_vma;
--- bfd/elfxx-target.h.jj	2006-06-20 18:34:24.000000000 +0200
+++ bfd/elfxx-target.h	2006-07-06 15:38:39.000000000 +0200
@@ -563,6 +563,10 @@
 #define elf_backend_merge_symbol NULL
 #endif
 
+#ifndef elf_backend_hash_symbol
+#define elf_backend_hash_symbol _bfd_elf_hash_symbol
+#endif
+
 extern const struct elf_size_info _bfd_elfNN_size_info;
 
 #ifndef INCLUDED_TARGET_FILE
@@ -643,6 +647,7 @@ static struct elf_backend_data elfNN_bed
   elf_backend_common_section_index,
   elf_backend_common_section,
   elf_backend_merge_symbol,
+  elf_backend_hash_symbol,
   elf_backend_link_order_error_handler,
   elf_backend_relplt_name,
   ELF_MACHINE_ALT1,
--- include/elf/common.h.jj	2006-02-17 15:36:26.000000000 +0100
+++ include/elf/common.h	2006-06-22 10:43:21.000000000 +0200
@@ -338,6 +338,7 @@
 #define SHT_LOOS	0x60000000	/* First of OS specific semantics */
 #define SHT_HIOS	0x6fffffff	/* Last of OS specific semantics */
 
+#define SHT_GNU_HASH	0x6ffffff6	/* GNU style symbol hash table */
 #define SHT_GNU_LIBLIST	0x6ffffff7	/* List of prelink dependencies */
 
 /* The next three section types are defined by Solaris, and are named
@@ -577,6 +578,7 @@
 #define DT_VALRNGHI	0x6ffffdff
 
 #define DT_ADDRRNGLO	0x6ffffe00
+#define DT_GNU_HASH	0x6ffffef5
 #define DT_TLSDESC_PLT	0x6ffffef6
 #define DT_TLSDESC_GOT	0x6ffffef7
 #define DT_GNU_CONFLICT	0x6ffffef8
--- include/bfdlink.h.jj	2006-04-07 17:17:29.000000000 +0200
+++ include/bfdlink.h	2006-06-22 11:11:20.000000000 +0200
@@ -324,6 +324,12 @@ struct bfd_link_info
   /* TRUE if unreferenced sections should be removed.  */
   unsigned int gc_sections: 1;
 
+  /* TRUE if .hash section should be created.  */
+  unsigned int emit_hash: 1;
+
+  /* TRUE if .gnu.hash section should be created.  */
+  unsigned int emit_gnu_hash: 1;
+
   /* What to do with unresolved symbols in an object file.
      When producing executables the default is GENERATE_ERROR.
      When producing shared libraries the default is IGNORE.  The
--- binutils/readelf.c.jj	2006-05-30 16:13:54.000000000 +0200
+++ binutils/readelf.c	2006-07-10 18:56:00.000000000 +0200
@@ -135,6 +135,7 @@ static unsigned long dynamic_syminfo_off
 static unsigned int dynamic_syminfo_nent;
 static char program_interpreter[64];
 static bfd_vma dynamic_info[DT_JMPREL + 1];
+static bfd_vma dynamic_info_DT_GNU_HASH;
 static bfd_vma version_info[16];
 static Elf_Internal_Ehdr elf_header;
 static Elf_Internal_Shdr *section_headers;
@@ -1501,6 +1502,7 @@ get_dynamic_type (unsigned long type)
     case DT_GNU_CONFLICTSZ: return "GNU_CONFLICTSZ";
     case DT_GNU_LIBLIST: return "GNU_LIBLIST";
     case DT_GNU_LIBLISTSZ: return "GNU_LIBLISTSZ";
+    case DT_GNU_HASH:	return "GNU_HASH";
 
     default:
       if ((type >= DT_LOPROC) && (type <= DT_HIPROC))
@@ -2571,6 +2573,7 @@ get_section_type_name (unsigned int sh_t
     case SHT_INIT_ARRAY:	return "INIT_ARRAY";
     case SHT_FINI_ARRAY:	return "FINI_ARRAY";
     case SHT_PREINIT_ARRAY:	return "PREINIT_ARRAY";
+    case SHT_GNU_HASH:		return "GNU_HASH";
     case SHT_GROUP:		return "GROUP";
     case SHT_SYMTAB_SHNDX:	return "SYMTAB SECTION INDICIES";
     case SHT_GNU_verdef:	return "VERDEF";
@@ -6228,6 +6231,15 @@ process_dynamic_section (FILE *file)
 	    }
 	  break;
 
+	case DT_GNU_HASH:
+	  dynamic_info_DT_GNU_HASH = entry->d_un.d_val;
+	  if (do_dynamic)
+	    {
+	      print_vma (entry->d_un.d_val, PREFIX_HEX);
+	      putchar ('\n');
+	    }
+	  break;
+
 	default:
 	  if ((entry->d_tag >= DT_VERSYM) && (entry->d_tag <= DT_VERNEEDNUM))
 	    version_info[DT_VERSIONTAGIDX (entry->d_tag)] =
@@ -6903,6 +6915,9 @@ process_symbol_table (FILE *file)
   bfd_vma nchains = 0;
   bfd_vma *buckets = NULL;
   bfd_vma *chains = NULL;
+  bfd_vma ngnubuckets = 0;
+  bfd_vma *gnubuckets = NULL;
+  bfd_vma *gnuchains = NULL;
 
   if (! do_syms && !do_histogram)
     return 1;
@@ -7282,6 +7297,166 @@ process_symbol_table (FILE *file)
       free (chains);
     }
 
+  if (do_histogram && dynamic_info_DT_GNU_HASH)
+    {
+      unsigned char nb[16];
+      bfd_vma i, maxchain = 0xffffffff, symidx, bitmaskwords;
+      unsigned long *lengths;
+      unsigned long *counts;
+      unsigned long hn;
+      unsigned long maxlength = 0;
+      unsigned long nzero_counts = 0;
+      unsigned long nsyms = 0;
+      bfd_vma buckets_vma;
+
+      if (fseek (file,
+		 (archive_file_offset
+		  + offset_from_vma (file, dynamic_info_DT_GNU_HASH,
+				     sizeof nb)),
+		 SEEK_SET))
+	{
+	  error (_("Unable to seek to start of dynamic information"));
+	  return 0;
+	}
+
+      if (fread (nb, 16, 1, file) != 1)
+	{
+	  error (_("Failed to read in number of buckets\n"));
+	  return 0;
+	}
+
+      ngnubuckets = byte_get (nb, 4);
+      symidx = byte_get (nb + 4, 4);
+      bitmaskwords = byte_get (nb + 8, 4);
+      buckets_vma = dynamic_info_DT_GNU_HASH + 16;
+      if (is_32bit_elf)
+	buckets_vma += bitmaskwords * 4;
+      else
+	buckets_vma += bitmaskwords * 8;
+
+      if (fseek (file,
+		 (archive_file_offset
+		  + offset_from_vma (file, buckets_vma, 4)),
+		 SEEK_SET))
+	{
+	  error (_("Unable to seek to start of dynamic information"));
+	  return 0;
+	}
+
+      gnubuckets = get_dynamic_data (file, ngnubuckets, 4);
+
+      if (gnubuckets == NULL)
+	return 0;
+
+      for (i = 0; i < ngnubuckets; i++)
+	if (gnubuckets[i] != 0)
+	  {
+	    if (gnubuckets[i] < symidx)
+	      return 0;
+
+	    if (maxchain == 0xffffffff || gnubuckets[i] > maxchain)
+	      maxchain = gnubuckets[i];
+	  }
+
+      if (maxchain == 0xffffffff)
+	return 0;
+
+      maxchain -= symidx;
+
+      if (fseek (file,
+		 (archive_file_offset
+		  + offset_from_vma (file, buckets_vma
+					   + 4 * (ngnubuckets + maxchain), 4)),
+		 SEEK_SET))
+	{
+	  error (_("Unable to seek to start of dynamic information"));
+	  return 0;
+	}
+
+      do
+	{
+	  if (fread (nb, 4, 1, file) != 1)
+	    {
+	      error (_("Failed to determine last chain length\n"));
+	      return 0;
+	    }
+
+	  if (maxchain + 1 == 0)
+	    return 0;
+
+	  ++maxchain;
+	}
+      while ((byte_get (nb, 4) & 1) == 0);
+
+      if (fseek (file,
+		 (archive_file_offset
+		  + offset_from_vma (file, buckets_vma + 4 * ngnubuckets, 4)),
+		 SEEK_SET))
+	{
+	  error (_("Unable to seek to start of dynamic information"));
+	  return 0;
+	}
+
+      gnuchains = get_dynamic_data (file, maxchain, 4);
+
+      if (gnuchains == NULL)
+	return 0;
+
+      lengths = calloc (ngnubuckets, sizeof (*lengths));
+      if (lengths == NULL)
+	{
+	  error (_("Out of memory"));
+	  return 0;
+	}
+
+      printf (_("\nHistogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"),
+	      (unsigned long) ngnubuckets);
+      printf (_(" Length  Number     %% of total  Coverage\n"));
+
+      for (hn = 0; hn < ngnubuckets; ++hn)
+	if (gnubuckets[hn] != 0)
+	  {
+	    bfd_vma off, length = 1;
+
+	    for (off = gnubuckets[hn] - symidx;
+		 (gnuchains[off] & 1) == 0; ++off)
+	      ++length;
+	    lengths[hn] = length;
+	    if (length > maxlength)
+	      maxlength = length;
+	    nsyms += length;
+	  }
+
+      counts = calloc (maxlength + 1, sizeof (*counts));
+      if (counts == NULL)
+	{
+	  error (_("Out of memory"));
+	  return 0;
+	}
+
+      for (hn = 0; hn < ngnubuckets; ++hn)
+	++counts[lengths[hn]];
+
+      if (ngnubuckets > 0)
+	{
+	  unsigned long j;
+	  printf ("      0  %-10lu (%5.1f%%)\n",
+		  counts[0], (counts[0] * 100.0) / ngnubuckets);
+	  for (j = 1; j <= maxlength; ++j)
+	    {
+	      nzero_counts += counts[j] * j;
+	      printf ("%7lu  %-10lu (%5.1f%%)    %5.1f%%\n",
+		      j, counts[j], (counts[j] * 100.0) / ngnubuckets,
+		      (nzero_counts * 100.0) / nsyms);
+	    }
+	}
+
+      free (counts);
+      free (lengths);
+      free (gnubuckets);
+      free (gnuchains);
+    }
+
   return 1;
 }
 
--- ld/testsuite/ld-powerpc/tlsso32.r.jj	2006-06-29 14:25:12.000000000 +0200
+++ ld/testsuite/ld-powerpc/tlsso32.r	2006-07-10 23:16:16.000000000 +0200
@@ -52,9 +52,9 @@ Relocation section '\.rela\.dyn' at offs
 [0-9a-f ]+R_PPC_TPREL16 +0+30 +le0 \+ 0
 [0-9a-f ]+R_PPC_TPREL16_HA +0+34 +le1 \+ 0
 [0-9a-f ]+R_PPC_TPREL16_LO +0+34 +le1 \+ 0
-[0-9a-f ]+R_PPC_TPREL16 +0+1041c +\.tdata \+ 10430
-[0-9a-f ]+R_PPC_TPREL16_HA +0+1041c +\.tdata \+ 10434
-[0-9a-f ]+R_PPC_TPREL16_LO +0+1041c +\.tdata \+ 10434
+[0-9a-f ]+R_PPC_TPREL16 +0+103e4 +\.tdata \+ 103f8
+[0-9a-f ]+R_PPC_TPREL16_HA +0+103e4 +\.tdata \+ 103fc
+[0-9a-f ]+R_PPC_TPREL16_LO +0+103e4 +\.tdata \+ 103fc
 [0-9a-f ]+R_PPC_DTPMOD32 +0+
 [0-9a-f ]+R_PPC_DTPREL32 +0+
 [0-9a-f ]+R_PPC_DTPMOD32 +0+
--- ld/testsuite/ld-powerpc/tlsso32.d.jj	2005-12-30 13:33:50.000000000 +0100
+++ ld/testsuite/ld-powerpc/tlsso32.d	2006-07-10 23:19:43.000000000 +0200
@@ -42,5 +42,5 @@ Disassembly of section \.got:
 .* <\.got>:
 	\.\.\.
 .*:	4e 80 00 21 	blrl
-.*:	00 01 04 38 	.*
+.*:	00 01 04 00 	.*
 	\.\.\.
--- ld/testsuite/ld-powerpc/tlsso32.g.jj	2005-12-30 13:33:50.000000000 +0100
+++ ld/testsuite/ld-powerpc/tlsso32.g	2006-07-10 23:22:06.000000000 +0200
@@ -9,5 +9,5 @@
 Contents of section \.got:
 .* 00000000 00000000 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
-.* 00000000 4e800021 00010438 00000000  .*
+.* 00000000 4e800021 00010400 00000000  .*
 .* 00000000                             .*
--- ld/testsuite/ld-powerpc/tlsso.r.jj	2006-06-29 14:25:12.000000000 +0200
+++ ld/testsuite/ld-powerpc/tlsso.r	2006-07-10 23:32:22.000000000 +0200
@@ -49,9 +49,9 @@ Relocation section '\.rela\.dyn' at offs
 [0-9a-f ]+R_PPC64_TPREL16 +0+60 le0 \+ 0
 [0-9a-f ]+R_PPC64_TPREL16_HA +0+68 le1 \+ 0
 [0-9a-f ]+R_PPC64_TPREL16_LO +0+68 le1 \+ 0
-[0-9a-f ]+R_PPC64_TPREL16_DS +0+10668 \.tdata \+ 28
-[0-9a-f ]+R_PPC64_TPREL16_HA +0+10668 \.tdata \+ 30
-[0-9a-f ]+R_PPC64_TPREL16_LO +0+10668 \.tdata \+ 30
+[0-9a-f ]+R_PPC64_TPREL16_DS +0+10630 \.tdata \+ 28
+[0-9a-f ]+R_PPC64_TPREL16_HA +0+10630 \.tdata \+ 30
+[0-9a-f ]+R_PPC64_TPREL16_LO +0+10630 \.tdata \+ 30
 [0-9a-f ]+R_PPC64_DTPMOD64 +0+
 [0-9a-f ]+R_PPC64_DTPMOD64 +0+
 [0-9a-f ]+R_PPC64_DTPREL64 +0+
--- ld/testsuite/ld-powerpc/tlsso.g.jj	2005-12-30 13:33:50.000000000 +0100
+++ ld/testsuite/ld-powerpc/tlsso.g	2006-07-10 23:34:21.000000000 +0200
@@ -7,7 +7,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.got:
-.* 00000000 000187f0 00000000 00000000  .*
+.* 00000000 000187b8 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
--- ld/testsuite/ld-powerpc/tlstocso.g.jj	2005-12-30 13:33:50.000000000 +0100
+++ ld/testsuite/ld-powerpc/tlstocso.g	2006-07-10 23:34:48.000000000 +0200
@@ -7,7 +7,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.got:
-.* 00000000 00018738 00000000 00000000  .*
+.* 00000000 00018700 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*
 .* 00000000 00000000 00000000 00000000  .*


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- binutils.spec	29 Jun 2006 13:46:30 -0000	1.84
+++ binutils.spec	10 Jul 2006 22:05:38 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 4
+Release: 5
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -20,6 +20,7 @@
 Patch11: binutils-2.17.50.0.2-perturb.patch
 Patch12: binutils-2.17.50.0.2-tls_common.patch
 Patch13: binutils-2.17.50.0.2-bz2513.patch
+Patch14: binutils-2.17.50.0.2-hash-style.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -63,6 +64,7 @@
 %patch11 -p0 -b .perturb~
 %patch12 -p0 -b .tls_common~
 %patch13 -p0 -b .bz2513~
+%patch14 -p0 -b .hash-style~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -173,6 +175,10 @@
 %{_infodir}/*info*
 
 %changelog
+* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-5
+- add DT_GNU_HASH support (--hash-style=gnu and --hash-style=both
+  ld options)
+
 * Thu Jun 29 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-4
 - fix i?86 TLS GD->IE transition in executables (#196157, BZ#2513)
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:19:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:19:35 -0400
Subject: rpms/nano/devel nano.spec,1.13,1.14
Message-ID: <200607102219.k6AMJZO8004860@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/nano/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4832

Modified Files:
	nano.spec 
Log Message:
include /usr/share/nano


Index: nano.spec
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/nano.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nano.spec	10 Jul 2006 22:05:36 -0000	1.13
+++ nano.spec	10 Jul 2006 22:19:32 -0000	1.14
@@ -49,6 +49,7 @@
 %{_mandir}/man*/*
 %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
+%{_datadir}/nano
 
 %changelog
 * Mon Jul 10 2006 David Woodhouse <dwmw2 at redhat.com> - 1.3.12-1



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:33:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:33:50 -0400
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.27, 1.28
Message-ID: <200607102233.k6AMXoCM009581@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18371

Modified Files:
	device-mapper-multipath.spec 
Log Message:
updated the spec file to use libsysfs-devel. not sysfsutils-devel



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- device-mapper-multipath.spec	28 Jun 2006 22:20:47 -0000	1.27
+++ device-mapper-multipath.spec	10 Jul 2006 22:33:48 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 2.0
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -9,7 +9,7 @@
 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: libsysfs-devel, device-mapper >= 1.02.02-2
 BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel
 
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Mon Jul 10 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.1
+- changed BuildRequires from sysfsutils-devel to libsysfs-devel
+
 * Wed Jun 28 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.0
 - Updated to latest upstream source, fixes kpartx udev rule issue
 



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:38:36 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.16, 1.17 eclipse-cdt.spec, 1.40,
	1.41 sources, 1.17, 1.18
Message-ID: <200607102238.k6AMcZxe010546@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:
* Mon Jul 10 2006 Andrew Overholt <overholt at redhat.com> 3.1.0-1jpp_1fc
- 3.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Jun 2006 03:13:37 -0000	1.16
+++ .cvsignore	10 Jul 2006 22:38:32 -0000	1.17
@@ -1 +1 @@
-eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2
+eclipse-cdt-fetched-src-3.1.0.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- eclipse-cdt.spec	13 Jun 2006 03:13:37 -0000	1.40
+++ eclipse-cdt.spec	10 Jul 2006 22:38:32 -0000	1.41
@@ -21,29 +21,28 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	0jpp_0fc.3.1.0RC2
+Release: 	1jpp_1fc
 License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
 Group: 		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.eclipse.org/cdt
 Requires:	eclipse-platform
 
 # This tarball was generated like this:
-# (I got the tag by looking at the Callisto update site)
 # 
 # mkdir temp && cd temp
 # mkdir home
 # cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co \
 #   org.eclipse.cdt-releng/org.eclipse.cdt.releng 
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/v200605290500/' maps/cdt.map
+# sed --in-place 's/@cdtTag@/cdt_3_1/' maps/cdt.map
 # java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \
 #   org.eclipse.core.launcher.Main \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
 #   -DdontUnzip=true fetch
-# cd .. && tar zcf eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2 org.eclipse.cdt.releng
-Source0: %{name}-fetched-src-%{version}RC2.tar.bz2
+# cd .. && tar zcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng
+Source0: %{name}-fetched-src-%{version}.tar.bz2
 
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
@@ -164,6 +163,10 @@
 done
 )
 
+# These are in the SDK packages
+rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
+rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
+
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -228,6 +231,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Andrew Overholt <overholt at redhat.com> 3.1.0-1jpp_1fc
+- 3.1.0.
+
 * Thu Jun 08 2006 Andrew Overholt <overholt at redhat.com> 3.1.0-0jpp_0fc.3.1.0RC2 
 - 3.1.0 RC2.
 - Remove unused hover patch.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Jun 2006 03:13:37 -0000	1.17
+++ sources	10 Jul 2006 22:38:32 -0000	1.18
@@ -1 +1 @@
-f06ae8cdb66ac2fa8749c5d47f0522a0  eclipse-cdt-fetched-src-3.1.0RC2.tar.bz2
+25eebd7f854faf0bccf091afa8232118  eclipse-cdt-fetched-src-3.1.0.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 10 22:50:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 18:50:07 -0400
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.28, 1.29
Message-ID: <200607102250.k6AMo7Bv029730@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29646

Modified Files:
	device-mapper-multipath.spec 
Log Message:
fix a tagging issue



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- device-mapper-multipath.spec	10 Jul 2006 22:33:48 -0000	1.28
+++ device-mapper-multipath.spec	10 Jul 2006 22:50:04 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Mon Jul 11 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.2
+- fix tagging issue.
+
 * Mon Jul 10 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.1
 - changed BuildRequires from sysfsutils-devel to libsysfs-devel
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:24:29 -0400
Subject: rpms/openais/devel openais-0.78-s390-build.patch, NONE,
	1.1 openais-0.78-timer-thread-fix.patch, NONE,
	1.1 openais.spec, 1.5, 1.6
Message-ID: <200607110124.k6B1OTgW030527@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30490/devel

Modified Files:
	openais.spec 
Added Files:
	openais-0.78-s390-build.patch 
	openais-0.78-timer-thread-fix.patch 
Log Message:
auto-import openais-0.78-1.2 on branch devel from openais-0.78-1.2.src.rpm

openais-0.78-s390-build.patch:
 Makefile |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE openais-0.78-s390-build.patch ---
diff -uNr openais-0.78.orig/Makefile openais-0.78/Makefile
--- openais-0.78.orig/Makefile	2006-07-10 20:28:11.000000000 -0400
+++ openais-0.78/Makefile	2006-07-10 20:29:07.000000000 -0400
@@ -48,6 +48,12 @@
 ifeq (ia64,$(ARCH))
 LIBDIR=/usr/lib/openais
 endif
+ifeq (s390,$(ARCH))
+LIBDIR=/usr/lib/openais
+endif
+ifeq (s390x,$(ARCH))
+LIBDIR=/usr/lib64/openais
+endif
 
 all:
 	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);

openais-0.78-timer-thread-fix.patch:
 main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openais-0.78-timer-thread-fix.patch ---
Index: exec/main.c
===================================================================
--- exec/main.c	(revision 1111)
+++ exec/main.c	(working copy)
@@ -375,6 +375,8 @@
  	int totem_log_service;
  	log_init ("MAIN");
 
+	aisexec_tty_detach ();
+
 	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service RELEASE '%s'\n", RELEASE_VERSION);
 	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2002-2006 MontaVista Software, Inc and contributors.\n");
 	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2006 Red Hat, Inc.\n");
@@ -554,8 +556,6 @@
 		gid_valid,
 		&this_non_loopback_ip);
 
-	aisexec_tty_detach ();
-
 	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service: started and ready to provide service.\n");
 
 	/*


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openais.spec	7 Jul 2006 21:01:57 -0000	1.5
+++ openais.spec	11 Jul 2006 01:24:26 -0000	1.6
@@ -1,15 +1,17 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.78
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
 Patch1: openais-0.78-ia64-build.patch
+Patch2: openais-0.78-s390-build.patch
+Patch3: openais-0.78-timer-thread-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 ppc x86_64 ppc64 ia64
+ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -33,6 +35,8 @@
 %setup -q -n openais-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p0
 
 %build
 # -O3 required for performance reasons
@@ -162,6 +166,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Mon Jul 10 2006 Steven Dake <sdake at redhat.com> - 0.78-1.2
+- Allow build on s390 and s390x.
+
 * Fri Jul 07 2006 Steven Dake <sdake at redhat.com> - 0.78-1.1
 - Allow build on ia64.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:31:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:31:40 -0400
Subject: rpms/vte/devel .cvsignore, 1.41, 1.42 sources, 1.41, 1.42 vte.spec,
	1.83, 1.84 vte-0.13.0-real-transparency.patch, 1.1, NONE
Message-ID: <200607110131.k6B1Ve88000616@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv530

Modified Files:
	.cvsignore sources vte.spec 
Removed Files:
	vte-0.13.0-real-transparency.patch 
Log Message:
- Update to 0.13.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	15 Jun 2006 18:35:10 -0000	1.41
+++ .cvsignore	11 Jul 2006 01:31:37 -0000	1.42
@@ -1 +1 @@
-vte-0.13.2.tar.bz2
+vte-0.13.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	15 Jun 2006 18:35:10 -0000	1.41
+++ sources	11 Jul 2006 01:31:38 -0000	1.42
@@ -1 +1 @@
-aa21fbf815faa986ebea8f3189ac4f94  vte-0.13.2.tar.bz2
+f61fce149c8f3b4db1bd5cbcec8d664b  vte-0.13.3.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- vte.spec	15 Jun 2006 18:35:10 -0000	1.83
+++ vte.spec	11 Jul 2006 01:31:38 -0000	1.84
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.13.2
+Version: 0.13.3
 Release: 1
 Summary: A terminal emulator
 License: LGPL
@@ -15,8 +15,6 @@
 # initscripts creates the utmp group
 Prereq: initscripts 
 
-Patch0: vte-0.13.0-real-transparency.patch
-
 %description
 VTE is a terminal emulator widget for use with GTK+ 2.0.
 
@@ -31,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .real-transparency
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -104,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jul 10 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.3-1
+- Update to 0.13.3
+
 * Thu Jun 15 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.2-1
 - Update to 0.13.2
 


--- vte-0.13.0-real-transparency.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:34:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:34:28 -0400
Subject: rpms/pango/devel .cvsignore, 1.35, 1.36 pango.spec, 1.72,
	1.73 sources, 1.35, 1.36
Message-ID: <200607110134.k6B1YSdj001357@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1204

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
- Update to 1.13.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	15 Jun 2006 21:58:33 -0000	1.35
+++ .cvsignore	11 Jul 2006 01:34:22 -0000	1.36
@@ -1 +1 @@
-pango-1.13.2.tar.bz2
+pango-1.13.3.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- pango.spec	15 Jun 2006 21:58:33 -0000	1.72
+++ pango.spec	11 Jul 2006 01:34:25 -0000	1.73
@@ -7,7 +7,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.13.2
+Version: 1.13.3
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.3-1
+- Update to 1.13.3
+
 * Thu Jun 15 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.2-1
 - Update to 1.13.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	15 Jun 2006 21:58:33 -0000	1.35
+++ sources	11 Jul 2006 01:34:26 -0000	1.36
@@ -1 +1 @@
-28a6ea9d43c4cd398e7352032f775401  pango-1.13.2.tar.bz2
+9441c965bbf50d637a3e8016c628ee7e  pango-1.13.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:36:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:36:11 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.293, 1.294 anaconda.spec, 1.417,
	1.418 sources, 1.415, 1.416
Message-ID: <200607110136.k6B1aB9W001829@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- .cvsignore	7 Jul 2006 20:46:19 -0000	1.293
+++ .cvsignore	11 Jul 2006 01:35:56 -0000	1.294
@@ -1 +1 @@
-anaconda-11.1.0.54.tar.bz2
+anaconda-11.1.0.55.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- anaconda.spec	7 Jul 2006 20:46:19 -0000	1.417
+++ anaconda.spec	11 Jul 2006 01:35:56 -0000	1.418
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.54
+Version: 11.1.0.55
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 10 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.55-1
+- Fix findExistingRoots (clumens, #197900)
+- Add smartctl to rescue image (dcantrel, #198052)
+- Allow relative --rootpath (markmc, #197669)
+- Try to fix up RAID6 (#197844)
+- Fix keymap generation with serial console (Alexander Dupuy, #198310)
+
 * Fri Jul  7 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.54-1
 - Loader changes to support enabling/disabling IPv4 & IPv6
 - Manual IP configuration changes in loader to better support IPv{4,6}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- sources	7 Jul 2006 20:46:19 -0000	1.415
+++ sources	11 Jul 2006 01:35:56 -0000	1.416
@@ -1 +1 @@
-488c9299f4e9ec027679307e385779bf  anaconda-11.1.0.54.tar.bz2
+b53c6df052c143c60992f0ae5521059c  anaconda-11.1.0.55.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:39:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:39:53 -0400
Subject: rpms/squirrelmail/devel config_local.php, NONE,
	1.1 squirrelmail.spec, 1.39, 1.40
Message-ID: <200607110139.k6B1drKH002574@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2534

Modified Files:
	squirrelmail.spec 
Added Files:
	config_local.php 
Log Message:
Fix fatal typo in config_local.php (#198306)



***** Error reading new file: [Errno 2] No such file or directory: 'config_local.php'

Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- squirrelmail.spec	10 Jul 2006 03:18:48 -0000	1.39
+++ squirrelmail.spec	11 Jul 2006 01:39:47 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 2.fc6
+Release: 3.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,6 +16,7 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
@@ -175,7 +176,7 @@
 mkdir -p -m0755 $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config
 install -m 0644 config/*.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
-install -m 0644 config/config_local.php \
+install -m 0644 %{SOURCE5} \
     $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
 ln -s ../../../..%{_sysconfdir}/squirrelmail/config_local.php \
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
@@ -185,9 +186,6 @@
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config.php
 install -m 0755 config/*.pl $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 
-# set default_folder_prefix to be dovecot compatible
-echo -e "\n\$default_folder_prefix		= '';" >> $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
-
 # install index.php
 install -m 0644 index.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/
 
@@ -250,6 +248,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+- Fix fatal typo in config_local.php (#198306)
+
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
 - Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:44:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:44:02 -0400
Subject: rpms/squirrelmail/devel squirrelmail.spec,1.40,1.41
Message-ID: <200607110144.k6B1i2xf003557@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3501

Modified Files:
	squirrelmail.spec 
Log Message:
correct disttag



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- squirrelmail.spec	11 Jul 2006 01:39:47 -0000	1.40
+++ squirrelmail.spec	11 Jul 2006 01:44:00 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 3.fc4
+Release: 3.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:44:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:44:58 -0400
Subject: rpms/squirrelmail/FC-5 config_local.php, NONE, 1.1 squirrelmail.spec,
	1.36, 1.37
Message-ID: <200607110144.k6B1iwEi003969@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	squirrelmail.spec 
Added Files:
	config_local.php 
Log Message:
Fix fatal typo in config_local.php (#198306)



***** Error reading new file: [Errno 2] No such file or directory: 'config_local.php'

Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- squirrelmail.spec	10 Jul 2006 15:18:19 -0000	1.36
+++ squirrelmail.spec	11 Jul 2006 01:44:56 -0000	1.37
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,6 +16,7 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
@@ -175,7 +176,7 @@
 mkdir -p -m0755 $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config
 install -m 0644 config/*.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
-install -m 0644 config/config_local.php \
+install -m 0644 %{SOURCE5} \
     $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
 ln -s ../../../..%{_sysconfdir}/squirrelmail/config_local.php \
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
@@ -185,9 +186,6 @@
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config.php
 install -m 0755 config/*.pl $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 
-# set default_folder_prefix to be dovecot compatible
-echo -e "\n\$default_folder_prefix		= '';" >> $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
-
 # install index.php
 install -m 0644 index.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/
 
@@ -250,6 +248,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+- Fix fatal typo in config_local.php (#198306)
+
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
 - Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:45:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:45:58 -0400
Subject: rpms/squirrelmail/FC-4 config_local.php, NONE, 1.1 squirrelmail.spec,
	1.27, 1.28
Message-ID: <200607110145.k6B1jwnj007818@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	squirrelmail.spec 
Added Files:
	config_local.php 
Log Message:
Fix fatal typo in config_local.php (#198306)



***** Error reading new file: [Errno 2] No such file or directory: 'config_local.php'

Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- squirrelmail.spec	10 Jul 2006 15:21:34 -0000	1.27
+++ squirrelmail.spec	11 Jul 2006 01:45:56 -0000	1.28
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 2.fc4
+Release: 3.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,6 +16,7 @@
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2
+Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
@@ -175,7 +176,7 @@
 mkdir -p -m0755 $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config
 install -m 0644 config/*.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
-install -m 0644 config/config_local.php \
+install -m 0644 %{SOURCE5} \
     $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
 ln -s ../../../..%{_sysconfdir}/squirrelmail/config_local.php \
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config_local.php
@@ -185,9 +186,6 @@
     $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/config.php
 install -m 0755 config/*.pl $RPM_BUILD_ROOT%{_datadir}/squirrelmail/config/
 
-# set default_folder_prefix to be dovecot compatible
-echo -e "\n\$default_folder_prefix		= '';" >> $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail/config_local.php
-
 # install index.php
 install -m 0644 index.php $RPM_BUILD_ROOT%{_datadir}/squirrelmail/
 
@@ -250,6 +248,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+- Fix fatal typo in config_local.php (#198306)
+
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2
 - Move sqspell_config.php to /etc and mark it %%config(noreplace) (#192236)
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 01:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 21:46:54 -0400
Subject: rpms/squirrelmail/FC-4 squirrelmail.spec,1.28,1.29
Message-ID: <200607110146.k6B1ksnl016216@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	squirrelmail.spec 
Log Message:
screwed up tagging



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- squirrelmail.spec	11 Jul 2006 01:45:56 -0000	1.28
+++ squirrelmail.spec	11 Jul 2006 01:46:52 -0000	1.29
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 3.fc4
+Release: 3.fc4.1
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet



From fedora-cvs-commits at redhat.com  Tue Jul 11 03:33:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 23:33:53 -0400
Subject: rpms/squirrelmail/devel config_local.php, 1.1, 1.2 squirrelmail.spec,
	1.41, 1.42
Message-ID: <200607110333.k6B3XrsU007516@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7434

Modified Files:
	config_local.php squirrelmail.spec 
Log Message:
Checkin actual file that I want...



Index: config_local.php
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/config_local.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_local.php	11 Jul 2006 01:39:47 -0000	1.1
+++ config_local.php	11 Jul 2006 03:33:47 -0000	1.2
@@ -14,8 +14,5 @@
  * @subpackage config
  */
 
-// RHEL3  uw-imap default
-$default_folder_prefix		= '';
-// RHEL4+ dovecot default
 $default_folder_prefix		= '';
 ?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- squirrelmail.spec	11 Jul 2006 01:44:00 -0000	1.41
+++ squirrelmail.spec	11 Jul 2006 03:33:47 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 3.fc6
+Release: 4.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -248,7 +248,7 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
-* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-4
 - Fix fatal typo in config_local.php (#198306)
 
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2



From fedora-cvs-commits at redhat.com  Tue Jul 11 03:58:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 23:58:08 -0400
Subject: rpms/squirrelmail/FC-4 config_local.php, 1.1, 1.2 squirrelmail.spec,
	1.29, 1.30
Message-ID: <200607110358.k6B3w8GV029976@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	config_local.php squirrelmail.spec 
Log Message:
*plonk*



Index: config_local.php
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/config_local.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_local.php	11 Jul 2006 01:45:56 -0000	1.1
+++ config_local.php	11 Jul 2006 03:58:05 -0000	1.2
@@ -14,8 +14,5 @@
  * @subpackage config
  */
 
-// RHEL3  uw-imap default
-$default_folder_prefix		= '';
-// RHEL4+ dovecot default
 $default_folder_prefix		= '';
 ?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- squirrelmail.spec	11 Jul 2006 01:46:52 -0000	1.29
+++ squirrelmail.spec	11 Jul 2006 03:58:05 -0000	1.30
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 3.fc4.1
+Release: 4.fc4
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -248,7 +248,7 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
-* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-4
 - Fix fatal typo in config_local.php (#198306)
 
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2



From fedora-cvs-commits at redhat.com  Tue Jul 11 03:58:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 10 Jul 2006 23:58:51 -0400
Subject: rpms/squirrelmail/FC-5 config_local.php, 1.1, 1.2 squirrelmail.spec,
	1.37, 1.38
Message-ID: <200607110358.k6B3wpCN030287@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	config_local.php squirrelmail.spec 
Log Message:
*zing*



Index: config_local.php
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/config_local.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_local.php	11 Jul 2006 01:44:56 -0000	1.1
+++ config_local.php	11 Jul 2006 03:58:49 -0000	1.2
@@ -14,8 +14,5 @@
  * @subpackage config
  */
 
-// RHEL3  uw-imap default
-$default_folder_prefix		= '';
-// RHEL4+ dovecot default
 $default_folder_prefix		= '';
 ?>


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- squirrelmail.spec	11 Jul 2006 01:44:56 -0000	1.37
+++ squirrelmail.spec	11 Jul 2006 03:58:49 -0000	1.38
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 3.fc5
+Release: 4.fc5
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -248,7 +248,7 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
-* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-3
+* Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-4
 - Fix fatal typo in config_local.php (#198306)
 
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 1.4.7-2



From fedora-cvs-commits at redhat.com  Tue Jul 11 04:10:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 00:10:26 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.6,1.7
Message-ID: <200607110410.k6B4AQMQ032167@cvs.devel.redhat.com>

Author: ashah

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32082

Modified Files:
	ldapjdk.spec 
Log Message:
add java-devel BuildRequires (bug #192530)


Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldapjdk.spec	9 Dec 2005 22:41:15 -0000	1.6
+++ ldapjdk.spec	11 Jul 2006 04:10:17 -0000	1.7
@@ -9,7 +9,7 @@
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}.2
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -41,6 +41,7 @@
 BuildRequires:	jaas
 BuildRequires:	jsse
 %endif
+BuildRequires:  java-devel
 BuildRequires:  java-sasl
 Provides:	jndi-ldap = 1.3.0
 BuildArch:	noarch
@@ -138,6 +139,9 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Tue Jul 11 2006 Archit Shah <ashah at redhat.com>
+- add java-devel BuildRequires (bug #192530)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 05:50:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 01:50:11 -0400
Subject: rpms/binutils/devel binutils.spec,1.85,1.86
Message-ID: <200607110550.k6B5oBHZ014965@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-5


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- binutils.spec	10 Jul 2006 22:05:38 -0000	1.85
+++ binutils.spec	11 Jul 2006 05:50:09 -0000	1.86
@@ -67,6 +67,7 @@
 %patch14 -p0 -b .hash-style~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
+sed -ie 's/\$(CC_FOR_BUILD)/& $(CFLAGS)/' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
 touch */configure



From fedora-cvs-commits at redhat.com  Tue Jul 11 05:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 01:59:38 -0400
Subject: rpms/binutils/devel binutils.spec,1.86,1.87
Message-ID: <200607110559.k6B5xcGP018496@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-5


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- binutils.spec	11 Jul 2006 05:50:09 -0000	1.86
+++ binutils.spec	11 Jul 2006 05:59:36 -0000	1.87
@@ -68,6 +68,7 @@
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 sed -ie 's/\$(CC_FOR_BUILD)/& $(CFLAGS)/' opcodes/Makefile.{am,in}
+sed -ie 's,\./s390-mkopc /LD_PRELOAD=libSegFault.so SEGFAULT_SIGNALS=all &/' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
 touch */configure



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:04:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:04:26 -0400
Subject: rpms/ipv6calc/devel .cvsignore, 1.8, 1.9 ipv6calc.spec, 1.19,
	1.20 sources, 1.8, 1.9
Message-ID: <200607110604.k6B64QlZ019199@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19158

Modified Files:
	.cvsignore ipv6calc.spec sources 
Log Message:
 - upgrade to 0.60.1 - fix for big endian archs


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	25 Jun 2006 21:41:11 -0000	1.8
+++ .cvsignore	11 Jul 2006 06:04:21 -0000	1.9
@@ -1 +1 @@
-ipv6calc-0.60.0.tar.gz
+ipv6calc-0.60.1.tar.gz


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ipv6calc.spec	25 Jun 2006 21:41:11 -0000	1.19
+++ ipv6calc.spec	11 Jul 2006 06:04:21 -0000	1.20
@@ -1,6 +1,6 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
-Version: 	0.60.0
+Version: 	0.60.1
 Release: 	1
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jul 11 2006 Radek Vok??l <rvokal at redhat.com> 0.60.1-1
+- upgrade to 0.60.1 - fix for big endian archs
+
 * Sun Jun 25 2006 Radek Vok??l <rvokal at redhat.com> 0.60.0-1
 - upgrade to 0.60.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jun 2006 21:41:11 -0000	1.8
+++ sources	11 Jul 2006 06:04:21 -0000	1.9
@@ -1 +1 @@
-894f67ad3883bd0153ede1946d9dc4cb  ipv6calc-0.60.0.tar.gz
+68449cae97cda68fccbda7468485d7c4  ipv6calc-0.60.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:05:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:05:41 -0400
Subject: rpms/binutils/devel binutils.spec,1.87,1.88
Message-ID: <200607110605.k6B65fTj019480@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-5


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- binutils.spec	11 Jul 2006 05:59:36 -0000	1.87
+++ binutils.spec	11 Jul 2006 06:05:38 -0000	1.88
@@ -68,7 +68,7 @@
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 sed -ie 's/\$(CC_FOR_BUILD)/& $(CFLAGS)/' opcodes/Makefile.{am,in}
-sed -ie 's,\./s390-mkopc /LD_PRELOAD=libSegFault.so SEGFAULT_SIGNALS=all &/' opcodes/Makefile.{am,in}
+sed -ie 's,\./s390-mkopc ,LD_PRELOAD=libSegFault.so SEGFAULT_SIGNALS=all &,' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
 touch */configure



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:17:11 -0400
Subject: rpms/binutils/devel s390-opc.tab,NONE,1.1 binutils.spec,1.88,1.89
Message-ID: <200607110617.k6B6HB2U014503@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Added Files:
	s390-opc.tab 
Log Message:
2.17.50.0.2-5


--- NEW FILE s390-opc.tab ---
/* The opcode table. This file was generated by s390-mkopc.

   The format of the opcode table is:

   NAME	     OPCODE	MASK	OPERANDS

   Name is the name of the instruction.
   OPCODE is the instruction opcode.
   MASK is the opcode mask; this is used to tell the disassembler
     which bits in the actual opcode must match OPCODE.
   OPERANDS is the list of operands.

   The disassembler reads the table in order and prints the first
   instruction which matches.  */

const struct s390_opcode s390_opcodes[] =
  {
  { "dp", OP8(0xfdLL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "mp", OP8(0xfcLL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "sp", OP8(0xfbLL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "ap", OP8(0xfaLL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "cp", OP8(0xf9LL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "zap", OP8(0xf8LL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "unpk", OP8(0xf3LL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "pack", OP8(0xf2LL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "mvo", OP8(0xf1LL), MASK_SS_LLRDRD, INSTR_SS_LLRDRD, 3, 0},
  { "srp", OP8(0xf0LL), MASK_SS_LIRDRD, INSTR_SS_LIRDRD, 3, 0},
  { "lmd", OP8(0xefLL), MASK_SS_RRRDRD3, INSTR_SS_RRRDRD3, 2, 2},
  { "plo", OP8(0xeeLL), MASK_SS_RRRDRD2, INSTR_SS_RRRDRD2, 3, 0},
  { "stdy", OP48(0xed0000000067LL), MASK_RXY_FRRD, INSTR_RXY_FRRD, 2, 3},
  { "stey", OP48(0xed0000000066LL), MASK_RXY_FRRD, INSTR_RXY_FRRD, 2, 3},
  { "ldy", OP48(0xed0000000065LL), MASK_RXY_FRRD, INSTR_RXY_FRRD, 2, 3},
  { "ley", OP48(0xed0000000064LL), MASK_RXY_FRRD, INSTR_RXY_FRRD, 2, 3},
  { "msd", OP48(0xed000000003fLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 3},
  { "mad", OP48(0xed000000003eLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 3},
  { "myh", OP48(0xed000000003dLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "mayh", OP48(0xed000000003cLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "my", OP48(0xed000000003bLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "may", OP48(0xed000000003aLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "myl", OP48(0xed0000000039LL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "mayl", OP48(0xed0000000038LL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 2, 4},
  { "mee", OP48(0xed0000000037LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "sqe", OP48(0xed0000000034LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "mse", OP48(0xed000000002fLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 3},
  { "mae", OP48(0xed000000002eLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 3},
  { "lxe", OP48(0xed0000000026LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "lxd", OP48(0xed0000000025LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "lde", OP48(0xed0000000024LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "msdb", OP48(0xed000000001fLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 0},
  { "madb", OP48(0xed000000001eLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 0},
  { "ddb", OP48(0xed000000001dLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "mdb", OP48(0xed000000001cLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "sdb", OP48(0xed000000001bLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "adb", OP48(0xed000000001aLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "cdb", OP48(0xed0000000019LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "kdb", OP48(0xed0000000018LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "meeb", OP48(0xed0000000017LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "sqdb", OP48(0xed0000000015LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "sqeb", OP48(0xed0000000014LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "tcxb", OP48(0xed0000000012LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "tcdb", OP48(0xed0000000011LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "tceb", OP48(0xed0000000010LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "mseb", OP48(0xed000000000fLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 0},
  { "maeb", OP48(0xed000000000eLL), MASK_RXF_FRRDF, INSTR_RXF_FRRDF, 3, 0},
  { "deb", OP48(0xed000000000dLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "mdeb", OP48(0xed000000000cLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "seb", OP48(0xed000000000bLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "aeb", OP48(0xed000000000aLL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "ceb", OP48(0xed0000000009LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "keb", OP48(0xed0000000008LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "mxdb", OP48(0xed0000000007LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "lxeb", OP48(0xed0000000006LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "lxdb", OP48(0xed0000000005LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "ldeb", OP48(0xed0000000004LL), MASK_RXE_FRRD, INSTR_RXE_FRRD, 3, 0},
  { "brxlg", OP48(0xec0000000045LL), MASK_RIE_RRP, INSTR_RIE_RRP, 2, 2},
  { "brxhg", OP48(0xec0000000044LL), MASK_RIE_RRP, INSTR_RIE_RRP, 2, 2},
  { "tp", OP48(0xeb00000000c0LL), MASK_RSL_R0RD, INSTR_RSL_R0RD, 3, 0},
  { "stamy", OP48(0xeb000000009bLL), MASK_RSY_AARD, INSTR_RSY_AARD, 2, 3},
  { "lamy", OP48(0xeb000000009aLL), MASK_RSY_AARD, INSTR_RSY_AARD, 2, 3},
  { "lmy", OP48(0xeb0000000098LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "lmh", OP48(0xeb0000000096LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "lmh", OP48(0xeb0000000096LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "stmy", OP48(0xeb0000000090LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "clclu", OP48(0xeb000000008fLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "mvclu", OP48(0xeb000000008eLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 3, 3},
  { "mvclu", OP48(0xeb000000008eLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 3, 0},
  { "icmy", OP48(0xeb0000000081LL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "icmh", OP48(0xeb0000000080LL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "icmh", OP48(0xeb0000000080LL), MASK_RSE_RURD, INSTR_RSE_RURD, 2, 2},
  { "xiy", OP48(0xeb0000000057LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "oiy", OP48(0xeb0000000056LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "cliy", OP48(0xeb0000000055LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "niy", OP48(0xeb0000000054LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "mviy", OP48(0xeb0000000052LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "tmy", OP48(0xeb0000000051LL), MASK_SIY_URD, INSTR_SIY_URD, 2, 3},
  { "bxleg", OP48(0xeb0000000045LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "bxleg", OP48(0xeb0000000045LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "bxhg", OP48(0xeb0000000044LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "bxhg", OP48(0xeb0000000044LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "cdsg", OP48(0xeb000000003eLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "cdsg", OP48(0xeb000000003eLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "cdsy", OP48(0xeb0000000031LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "csg", OP48(0xeb0000000030LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "csg", OP48(0xeb0000000030LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "lctlg", OP48(0xeb000000002fLL), MASK_RSY_CCRD, INSTR_RSY_CCRD, 2, 3},
  { "lctlg", OP48(0xeb000000002fLL), MASK_RSE_CCRD, INSTR_RSE_CCRD, 2, 2},
  { "stcmy", OP48(0xeb000000002dLL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "stcmh", OP48(0xeb000000002cLL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "stcmh", OP48(0xeb000000002cLL), MASK_RSE_RURD, INSTR_RSE_RURD, 2, 2},
  { "stmh", OP48(0xeb0000000026LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "stmh", OP48(0xeb0000000026LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "stctg", OP48(0xeb0000000025LL), MASK_RSY_CCRD, INSTR_RSY_CCRD, 2, 3},
  { "stctg", OP48(0xeb0000000025LL), MASK_RSE_CCRD, INSTR_RSE_CCRD, 2, 2},
  { "stmg", OP48(0xeb0000000024LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "stmg", OP48(0xeb0000000024LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "clmy", OP48(0xeb0000000021LL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "clmh", OP48(0xeb0000000020LL), MASK_RSY_RURD, INSTR_RSY_RURD, 2, 3},
  { "clmh", OP48(0xeb0000000020LL), MASK_RSE_RURD, INSTR_RSE_RURD, 2, 2},
  { "rll", OP48(0xeb000000001dLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 3, 3},
  { "rll", OP48(0xeb000000001dLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 3, 2},
  { "rllg", OP48(0xeb000000001cLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "rllg", OP48(0xeb000000001cLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "csy", OP48(0xeb0000000014LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "tracg", OP48(0xeb000000000fLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "tracg", OP48(0xeb000000000fLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "sllg", OP48(0xeb000000000dLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "sllg", OP48(0xeb000000000dLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "srlg", OP48(0xeb000000000cLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "srlg", OP48(0xeb000000000cLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "slag", OP48(0xeb000000000bLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "slag", OP48(0xeb000000000bLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "srag", OP48(0xeb000000000aLL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "srag", OP48(0xeb000000000aLL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "lmg", OP48(0xeb0000000004LL), MASK_RSY_RRRD, INSTR_RSY_RRRD, 2, 3},
  { "lmg", OP48(0xeb0000000004LL), MASK_RSE_RRRD, INSTR_RSE_RRRD, 2, 2},
  { "unpka", OP8(0xeaLL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "pka", OP8(0xe9LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvcin", OP8(0xe8LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvcdk", OP16(0xe50fLL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0},
  { "mvcsk", OP16(0xe50eLL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0},
  { "tprot", OP16(0xe501LL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0},
  { "strag", OP48(0xe50000000002LL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 2, 2},
  { "lasp", OP16(0xe500LL), MASK_SSE_RDRD, INSTR_SSE_RDRD, 3, 0},
  { "slb", OP48(0xe30000000099LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "slb", OP48(0xe30000000099LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "alc", OP48(0xe30000000098LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "alc", OP48(0xe30000000098LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "dl", OP48(0xe30000000097LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "dl", OP48(0xe30000000097LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "ml", OP48(0xe30000000096LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "ml", OP48(0xe30000000096LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "llh", OP48(0xe30000000095LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 4},
  { "llc", OP48(0xe30000000094LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 4},
  { "llgh", OP48(0xe30000000091LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "llgh", OP48(0xe30000000091LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "llgc", OP48(0xe30000000090LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "llgc", OP48(0xe30000000090LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lpq", OP48(0xe3000000008fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lpq", OP48(0xe3000000008fLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "stpq", OP48(0xe3000000008eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "stpq", OP48(0xe3000000008eLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "slbg", OP48(0xe30000000089LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "slbg", OP48(0xe30000000089LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "alcg", OP48(0xe30000000088LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "alcg", OP48(0xe30000000088LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "dlg", OP48(0xe30000000087LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "dlg", OP48(0xe30000000087LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "mlg", OP48(0xe30000000086LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "mlg", OP48(0xe30000000086LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "xg", OP48(0xe30000000082LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "xg", OP48(0xe30000000082LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "og", OP48(0xe30000000081LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "og", OP48(0xe30000000081LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "ng", OP48(0xe30000000080LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ng", OP48(0xe30000000080LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "shy", OP48(0xe3000000007bLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ahy", OP48(0xe3000000007aLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "chy", OP48(0xe30000000079LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lhy", OP48(0xe30000000078LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lgb", OP48(0xe30000000077LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lb", OP48(0xe30000000076LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "icy", OP48(0xe30000000073LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "stcy", OP48(0xe30000000072LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lay", OP48(0xe30000000071LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sthy", OP48(0xe30000000070LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sly", OP48(0xe3000000005fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "aly", OP48(0xe3000000005eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sy", OP48(0xe3000000005bLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ay", OP48(0xe3000000005aLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cy", OP48(0xe30000000059LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ly", OP48(0xe30000000058LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "xy", OP48(0xe30000000057LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "oy", OP48(0xe30000000056LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cly", OP48(0xe30000000055LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ny", OP48(0xe30000000054LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "msy", OP48(0xe30000000051LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sty", OP48(0xe30000000050LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "bctg", OP48(0xe30000000046LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "bctg", OP48(0xe30000000046LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "strvh", OP48(0xe3000000003fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "strvh", OP48(0xe3000000003fLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "strv", OP48(0xe3000000003eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "strv", OP48(0xe3000000003eLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "clgf", OP48(0xe30000000031LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "clgf", OP48(0xe30000000031LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cgf", OP48(0xe30000000030LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cgf", OP48(0xe30000000030LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "strvg", OP48(0xe3000000002fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "strvg", OP48(0xe3000000002fLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cvdg", OP48(0xe3000000002eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cvdg", OP48(0xe3000000002eLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cvdy", OP48(0xe30000000026LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "stg", OP48(0xe30000000024LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "stg", OP48(0xe30000000024LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "clg", OP48(0xe30000000021LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "clg", OP48(0xe30000000021LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cg", OP48(0xe30000000020LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cg", OP48(0xe30000000020LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lrvh", OP48(0xe3000000001fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "lrvh", OP48(0xe3000000001fLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "lrv", OP48(0xe3000000001eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 3, 3},
  { "lrv", OP48(0xe3000000001eLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 3, 2},
  { "dsgf", OP48(0xe3000000001dLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "dsgf", OP48(0xe3000000001dLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "msgf", OP48(0xe3000000001cLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "msgf", OP48(0xe3000000001cLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "slgf", OP48(0xe3000000001bLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "slgf", OP48(0xe3000000001bLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "algf", OP48(0xe3000000001aLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "algf", OP48(0xe3000000001aLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "sgf", OP48(0xe30000000019LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sgf", OP48(0xe30000000019LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "agf", OP48(0xe30000000018LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "agf", OP48(0xe30000000018LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "llgt", OP48(0xe30000000017LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "llgt", OP48(0xe30000000017LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "llgf", OP48(0xe30000000016LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "llgf", OP48(0xe30000000016LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lgh", OP48(0xe30000000015LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lgh", OP48(0xe30000000015LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lgf", OP48(0xe30000000014LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lgf", OP48(0xe30000000014LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lray", OP48(0xe30000000013LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lt", OP48(0xe30000000012LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 4},
  { "lrvg", OP48(0xe3000000000fLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lrvg", OP48(0xe3000000000fLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cvbg", OP48(0xe3000000000eLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "cvbg", OP48(0xe3000000000eLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "dsg", OP48(0xe3000000000dLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "dsg", OP48(0xe3000000000dLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "msg", OP48(0xe3000000000cLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "msg", OP48(0xe3000000000cLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "slg", OP48(0xe3000000000bLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "slg", OP48(0xe3000000000bLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "alg", OP48(0xe3000000000aLL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "alg", OP48(0xe3000000000aLL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "sg", OP48(0xe30000000009LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "sg", OP48(0xe30000000009LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "ag", OP48(0xe30000000008LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "ag", OP48(0xe30000000008LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "cvby", OP48(0xe30000000006LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lg", OP48(0xe30000000004LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lg", OP48(0xe30000000004LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "lrag", OP48(0xe30000000003LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 3},
  { "lrag", OP48(0xe30000000003LL), MASK_RXE_RRRD, INSTR_RXE_RRRD, 2, 2},
  { "ltg", OP48(0xe30000000002LL), MASK_RXY_RRRD, INSTR_RXY_RRRD, 2, 4},
  { "unpku", OP8(0xe2LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "pku", OP8(0xe1LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "edmk", OP8(0xdfLL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "ed", OP8(0xdeLL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "trt", OP8(0xddLL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "tr", OP8(0xdcLL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvcs", OP8(0xdbLL), MASK_SS_RRRDRD, INSTR_SS_RRRDRD, 3, 0},
  { "mvcp", OP8(0xdaLL), MASK_SS_RRRDRD, INSTR_SS_RRRDRD, 3, 0},
  { "mvck", OP8(0xd9LL), MASK_SS_RRRDRD, INSTR_SS_RRRDRD, 3, 0},
  { "xc", OP8(0xd7LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "oc", OP8(0xd6LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "clc", OP8(0xd5LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "nc", OP8(0xd4LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvz", OP8(0xd3LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvc", OP8(0xd2LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvn", OP8(0xd1LL), MASK_SS_L0RDRD, INSTR_SS_L0RDRD, 3, 0},
  { "mvcos", OP16(0xc800LL), MASK_SSF_RRDRD, INSTR_SSF_RRDRD, 2, 4},
  { "clfi", OP16(0xc20fLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "clgfi", OP16(0xc20eLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "cfi", OP16(0xc20dLL), MASK_RIL_RI, INSTR_RIL_RI, 2, 4},
  { "cgfi", OP16(0xc20cLL), MASK_RIL_RI, INSTR_RIL_RI, 2, 4},
  { "alfi", OP16(0xc20bLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "algfi", OP16(0xc20aLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "afi", OP16(0xc209LL), MASK_RIL_RI, INSTR_RIL_RI, 2, 4},
  { "agfi", OP16(0xc208LL), MASK_RIL_RI, INSTR_RIL_RI, 2, 4},
  { "slfi", OP16(0xc205LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "slgfi", OP16(0xc204LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "jg", OP16(0xc0f4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgno", OP16(0xc0e4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnh", OP16(0xc0d4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnp", OP16(0xc0d4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgle", OP16(0xc0c4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnl", OP16(0xc0b4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnm", OP16(0xc0b4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jghe", OP16(0xc0a4LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnlh", OP16(0xc094LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jge", OP16(0xc084LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgz", OP16(0xc084LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgne", OP16(0xc074LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnz", OP16(0xc074LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jglh", OP16(0xc064LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnhe", OP16(0xc054LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgl", OP16(0xc044LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgm", OP16(0xc044LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgnle", OP16(0xc034LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgh", OP16(0xc024LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgp", OP16(0xc024LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "jgo", OP16(0xc014LL), MASK_RIL_0P, INSTR_RIL_0P, 3, 2},
  { "llilf", OP16(0xc00fLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "llihf", OP16(0xc00eLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "oilf", OP16(0xc00dLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "oihf", OP16(0xc00cLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "nilf", OP16(0xc00bLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "nihf", OP16(0xc00aLL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "iilf", OP16(0xc009LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "iihf", OP16(0xc008LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "xilf", OP16(0xc007LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "xihf", OP16(0xc006LL), MASK_RIL_RU, INSTR_RIL_RU, 2, 4},
  { "brasl", OP16(0xc005LL), MASK_RIL_RP, INSTR_RIL_RP, 3, 2},
  { "brcl", OP16(0xc004LL), MASK_RIL_UP, INSTR_RIL_UP, 3, 2},
  { "lgfi", OP16(0xc001LL), MASK_RIL_RI, INSTR_RIL_RI, 2, 4},
  { "larl", OP16(0xc000LL), MASK_RIL_RP, INSTR_RIL_RP, 3, 2},
  { "icm", OP8(0xbfLL), MASK_RS_RURD, INSTR_RS_RURD, 3, 0},
  { "stcm", OP8(0xbeLL), MASK_RS_RURD, INSTR_RS_RURD, 3, 0},
  { "clm", OP8(0xbdLL), MASK_RS_RURD, INSTR_RS_RURD, 3, 0},
  { "cds", OP8(0xbbLL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "cs", OP8(0xbaLL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "cu42", OP16(0xb9b3LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cu41", OP16(0xb9b2LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cu24", OP16(0xb9b1LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cu14", OP16(0xb9b0LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "lptea", OP16(0xb9aaLL), MASK_RRF_RURR, INSTR_RRF_RURR, 2, 4},
  { "esea", OP16(0xb99dLL), MASK_RRE_R0, INSTR_RRE_R0, 2, 2},
  { "slbr", OP16(0xb999LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "alcr", OP16(0xb998LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "dlr", OP16(0xb997LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "mlr", OP16(0xb996LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "llhr", OP16(0xb995LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "llcr", OP16(0xb994LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "troo", OP16(0xb993LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 3, 4},
  { "troo", OP16(0xb993LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "trot", OP16(0xb992LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 3, 4},
  { "trot", OP16(0xb992LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "trto", OP16(0xb991LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 3, 4},
  { "trto", OP16(0xb991LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "trtt", OP16(0xb990LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 3, 4},
  { "trtt", OP16(0xb990LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "idte", OP16(0xb98eLL), MASK_RRF_R0RR, INSTR_RRF_R0RR, 2, 3},
  { "epsw", OP16(0xb98dLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "cspg", OP16(0xb98aLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 3},
  { "slbgr", OP16(0xb989LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "alcgr", OP16(0xb988LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "dlgr", OP16(0xb987LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "mlgr", OP16(0xb986LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "llghr", OP16(0xb985LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "llgcr", OP16(0xb984LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "flogr", OP16(0xb983LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "xgr", OP16(0xb982LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "ogr", OP16(0xb981LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "ngr", OP16(0xb980LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "bctgr", OP16(0xb946LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "klmd", OP16(0xb93fLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 3},
  { "kimd", OP16(0xb93eLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 3},
  { "clgfr", OP16(0xb931LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cgfr", OP16(0xb930LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "kmc", OP16(0xb92fLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 3},
  { "km", OP16(0xb92eLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 3},
  { "lhr", OP16(0xb927LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "lbr", OP16(0xb926LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "sturg", OP16(0xb925LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "clgr", OP16(0xb921LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cgr", OP16(0xb920LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lrvr", OP16(0xb91fLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 2},
  { "kmac", OP16(0xb91eLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 3},
  { "dsgfr", OP16(0xb91dLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "msgfr", OP16(0xb91cLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "slgfr", OP16(0xb91bLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "algfr", OP16(0xb91aLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "sgfr", OP16(0xb919LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "agfr", OP16(0xb918LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "llgtr", OP16(0xb917LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "llgfr", OP16(0xb916LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lgfr", OP16(0xb914LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lcgfr", OP16(0xb913LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "ltgfr", OP16(0xb912LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lngfr", OP16(0xb911LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lpgfr", OP16(0xb910LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lrvgr", OP16(0xb90fLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "eregg", OP16(0xb90eLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "dsgr", OP16(0xb90dLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "msgr", OP16(0xb90cLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "slgr", OP16(0xb90bLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "algr", OP16(0xb90aLL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "sgr", OP16(0xb909LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "agr", OP16(0xb908LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lghr", OP16(0xb907LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "lgbr", OP16(0xb906LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 4},
  { "lurag", OP16(0xb905LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lgr", OP16(0xb904LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lcgr", OP16(0xb903LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "ltgr", OP16(0xb902LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lngr", OP16(0xb901LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lpgr", OP16(0xb900LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "lctl", OP8(0xb7LL), MASK_RS_CCRD, INSTR_RS_CCRD, 3, 0},
  { "stctl", OP8(0xb6LL), MASK_RS_CCRD, INSTR_RS_CCRD, 3, 0},
  { "cgxr", OP16(0xb3caLL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cgdr", OP16(0xb3c9LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cger", OP16(0xb3c8LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cxgr", OP16(0xb3c6LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cdgr", OP16(0xb3c5LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cegr", OP16(0xb3c4LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cfxr", OP16(0xb3baLL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cfdr", OP16(0xb3b9LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cfer", OP16(0xb3b8LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cxfr", OP16(0xb3b6LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "cdfr", OP16(0xb3b5LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "cefr", OP16(0xb3b4LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "cgxbr", OP16(0xb3aaLL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cgdbr", OP16(0xb3a9LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cgebr", OP16(0xb3a8LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 2, 2},
  { "cxgbr", OP16(0xb3a6LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cdgbr", OP16(0xb3a5LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cegbr", OP16(0xb3a4LL), MASK_RRE_RR, INSTR_RRE_RR, 2, 2},
  { "cfxbr", OP16(0xb39aLL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 3, 0},
  { "cfdbr", OP16(0xb399LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 3, 0},
  { "cfebr", OP16(0xb398LL), MASK_RRF_U0FR, INSTR_RRF_U0FR, 3, 0},
  { "cxfbr", OP16(0xb396LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "cdfbr", OP16(0xb395LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "cefbr", OP16(0xb394LL), MASK_RRE_RF, INSTR_RRE_RF, 3, 0},
  { "efpc", OP16(0xb38cLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "sfpc", OP16(0xb384LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "fidr", OP16(0xb37fLL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "fier", OP16(0xb377LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "lzxr", OP16(0xb376LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "lzdr", OP16(0xb375LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "lzer", OP16(0xb374LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "cxr", OP16(0xb369LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "fixr", OP16(0xb367LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "lexr", OP16(0xb366LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lxr", OP16(0xb365LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "lcxr", OP16(0xb363LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ltxr", OP16(0xb362LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lnxr", OP16(0xb361LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lpxr", OP16(0xb360LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "fidbr", OP16(0xb35fLL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "didbr", OP16(0xb35bLL), MASK_RRF_FUFF, INSTR_RRF_FUFF, 3, 0},
  { "thdr", OP16(0xb359LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "thder", OP16(0xb358LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "fiebr", OP16(0xb357LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "diebr", OP16(0xb353LL), MASK_RRF_FUFF, INSTR_RRF_FUFF, 3, 0},
  { "tbdr", OP16(0xb351LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "tbedr", OP16(0xb350LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "dxbr", OP16(0xb34dLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "mxbr", OP16(0xb34cLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sxbr", OP16(0xb34bLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "axbr", OP16(0xb34aLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "cxbr", OP16(0xb349LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "kxbr", OP16(0xb348LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "fixbr", OP16(0xb347LL), MASK_RRF_U0FF, INSTR_RRF_U0FF, 3, 0},
  { "lexbr", OP16(0xb346LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ldxbr", OP16(0xb345LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ledbr", OP16(0xb344LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lcxbr", OP16(0xb343LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ltxbr", OP16(0xb342LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lnxbr", OP16(0xb341LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lpxbr", OP16(0xb340LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "msdr", OP16(0xb33fLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 3},
  { "madr", OP16(0xb33eLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 3},
  { "myhr", OP16(0xb33dLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "mayhr", OP16(0xb33cLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "myr", OP16(0xb33bLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "mayr", OP16(0xb33aLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "mylr", OP16(0xb339LL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "maylr", OP16(0xb338LL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 2, 4},
  { "meer", OP16(0xb337LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sqxr", OP16(0xb336LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "mser", OP16(0xb32fLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 3},
  { "maer", OP16(0xb32eLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 3},
  { "lxer", OP16(0xb326LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lxdr", OP16(0xb325LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lder", OP16(0xb324LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "msdbr", OP16(0xb31fLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 0},
  { "madbr", OP16(0xb31eLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 0},
  { "ddbr", OP16(0xb31dLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "mdbr", OP16(0xb31cLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sdbr", OP16(0xb31bLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "adbr", OP16(0xb31aLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "cdbr", OP16(0xb319LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "kdbr", OP16(0xb318LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "meebr", OP16(0xb317LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sqxbr", OP16(0xb316LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sqdbr", OP16(0xb315LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sqebr", OP16(0xb314LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lcdbr", OP16(0xb313LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ltdbr", OP16(0xb312LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lndbr", OP16(0xb311LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lpdbr", OP16(0xb310LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "msebr", OP16(0xb30fLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 0},
  { "maebr", OP16(0xb30eLL), MASK_RRF_F0FF, INSTR_RRF_F0FF, 3, 0},
  { "debr", OP16(0xb30dLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "mdebr", OP16(0xb30cLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "sebr", OP16(0xb30bLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "aebr", OP16(0xb30aLL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "cebr", OP16(0xb309LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "kebr", OP16(0xb308LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "mxdbr", OP16(0xb307LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lxebr", OP16(0xb306LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lxdbr", OP16(0xb305LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ldebr", OP16(0xb304LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lcebr", OP16(0xb303LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "ltebr", OP16(0xb302LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lnebr", OP16(0xb301LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "lpebr", OP16(0xb300LL), MASK_RRE_FF, INSTR_RRE_FF, 3, 0},
  { "trap4", OP16(0xb2ffLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "lpswe", OP16(0xb2b2LL), MASK_S_RD, INSTR_S_RD, 2, 2},
  { "stfl", OP16(0xb2b1LL), MASK_S_RD, INSTR_S_RD, 3, 2},
  { "stfle", OP16(0xb2b0LL), MASK_S_RD, INSTR_S_RD, 2, 4},
  { "cu12", OP16(0xb2a7LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cutfu", OP16(0xb2a7LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cutfu", OP16(0xb2a7LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "cu21", OP16(0xb2a6LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cuutf", OP16(0xb2a6LL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "cuutf", OP16(0xb2a6LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "tre", OP16(0xb2a5LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "lfpc", OP16(0xb29dLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stfpc", OP16(0xb29cLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "srnm", OP16(0xb299LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stsi", OP16(0xb27dLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stckf", OP16(0xb27cLL), MASK_S_RD, INSTR_S_RD, 2, 4},
  { "sacf", OP16(0xb279LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stcke", OP16(0xb278LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "rp", OP16(0xb277LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "xsch", OP16(0xb276LL), MASK_S_00, INSTR_S_00, 3, 0},
  { "siga", OP16(0xb274LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "cmpsc", OP16(0xb263LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "cmpsc", OP16(0xb263LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "srst", OP16(0xb25eLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "clst", OP16(0xb25dLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "bsa", OP16(0xb25aLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "bsg", OP16(0xb258LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "cuse", OP16(0xb257LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "mvst", OP16(0xb255LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "mvpg", OP16(0xb254LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "msr", OP16(0xb252LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "csp", OP16(0xb250LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "ear", OP16(0xb24fLL), MASK_RRE_RA, INSTR_RRE_RA, 3, 0},
  { "sar", OP16(0xb24eLL), MASK_RRE_AR, INSTR_RRE_AR, 3, 0},
  { "cpya", OP16(0xb24dLL), MASK_RRE_AA, INSTR_RRE_AA, 3, 0},
  { "tar", OP16(0xb24cLL), MASK_RRE_AR, INSTR_RRE_AR, 3, 0},
  { "lura", OP16(0xb24bLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "esta", OP16(0xb24aLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "ereg", OP16(0xb249LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "palb", OP16(0xb248LL), MASK_RRE_00, INSTR_RRE_00, 3, 0},
  { "msta", OP16(0xb247LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "stura", OP16(0xb246LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "sqer", OP16(0xb245LL), MASK_RRE_F0, INSTR_RRE_F0, 3, 0},
  { "sqdr", OP16(0xb244LL), MASK_RRE_F0, INSTR_RRE_F0, 3, 0},
  { "cksm", OP16(0xb241LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "bakr", OP16(0xb240LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "schm", OP16(0xb23cLL), MASK_S_00, INSTR_S_00, 3, 0},
  { "rchp", OP16(0xb23bLL), MASK_S_00, INSTR_S_00, 3, 0},
  { "stcps", OP16(0xb23aLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stcrw", OP16(0xb239LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "rsch", OP16(0xb238LL), MASK_S_00, INSTR_S_00, 3, 0},
  { "sal", OP16(0xb237LL), MASK_S_00, INSTR_S_00, 3, 0},
  { "tpi", OP16(0xb236LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "tsch", OP16(0xb235LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stsch", OP16(0xb234LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "ssch", OP16(0xb233LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "msch", OP16(0xb232LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "hsch", OP16(0xb231LL), MASK_S_00, INSTR_S_00, 3, 0},
  { "csch", OP16(0xb230LL), MASK_S_00, INSTR_S_00, 3, 0},
  { "pgout", OP16(0xb22fLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "pgin", OP16(0xb22eLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "dxr", OP16(0xb22dLL), MASK_RRE_F0, INSTR_RRE_F0, 3, 0},
  { "tb", OP16(0xb22cLL), MASK_RRE_0R, INSTR_RRE_0R, 3, 0},
  { "sske", OP16(0xb22bLL), MASK_RRF_M0RR, INSTR_RRF_M0RR, 2, 4},
  { "sske", OP16(0xb22bLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "rrbe", OP16(0xb22aLL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "iske", OP16(0xb229LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "pt", OP16(0xb228LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "esar", OP16(0xb227LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "epar", OP16(0xb226LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "ssar", OP16(0xb225LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "iac", OP16(0xb224LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "ivsk", OP16(0xb223LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "ipm", OP16(0xb222LL), MASK_RRE_R0, INSTR_RRE_R0, 3, 0},
  { "ipte", OP16(0xb221LL), MASK_RRE_RR, INSTR_RRE_RR, 3, 0},
  { "cfc", OP16(0xb21aLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "sac", OP16(0xb219LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "pc", OP16(0xb218LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "sie", OP16(0xb214LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stap", OP16(0xb212LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stpx", OP16(0xb211LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "spx", OP16(0xb210LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "ptlb", OP16(0xb20dLL), MASK_S_00, INSTR_S_00, 3, 0},
  { "ipk", OP16(0xb20bLL), MASK_S_00, INSTR_S_00, 3, 0},
  { "spka", OP16(0xb20aLL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stpt", OP16(0xb209LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "spt", OP16(0xb208LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stckc", OP16(0xb207LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "sckc", OP16(0xb206LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stck", OP16(0xb205LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "sck", OP16(0xb204LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "stidp", OP16(0xb202LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "lra", OP8(0xb1LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "mc", OP8(0xafLL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "sigp", OP8(0xaeLL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "stosm", OP8(0xadLL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "stnsm", OP8(0xacLL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "clcle", OP8(0xa9LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "mvcle", OP8(0xa8LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "j", OP16(0xa7f4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jno", OP16(0xa7e4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnh", OP16(0xa7d4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnp", OP16(0xa7d4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jle", OP16(0xa7c4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnl", OP16(0xa7b4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnm", OP16(0xa7b4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jhe", OP16(0xa7a4LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnlh", OP16(0xa794LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "je", OP16(0xa784LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jz", OP16(0xa784LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jne", OP16(0xa774LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnz", OP16(0xa774LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jlh", OP16(0xa764LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnhe", OP16(0xa754LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jl", OP16(0xa744LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jm", OP16(0xa744LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jnle", OP16(0xa734LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jh", OP16(0xa724LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jp", OP16(0xa724LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "jo", OP16(0xa714LL), MASK_RI_0P, INSTR_RI_0P, 3, 0},
  { "cghi", OP16(0xa70fLL), MASK_RI_RI, INSTR_RI_RI, 2, 2},
  { "chi", OP16(0xa70eLL), MASK_RI_RI, INSTR_RI_RI, 3, 0},
  { "mghi", OP16(0xa70dLL), MASK_RI_RI, INSTR_RI_RI, 2, 2},
  { "mhi", OP16(0xa70cLL), MASK_RI_RI, INSTR_RI_RI, 3, 0},
  { "aghi", OP16(0xa70bLL), MASK_RI_RI, INSTR_RI_RI, 2, 2},
  { "ahi", OP16(0xa70aLL), MASK_RI_RI, INSTR_RI_RI, 3, 0},
  { "lghi", OP16(0xa709LL), MASK_RI_RI, INSTR_RI_RI, 2, 2},
  { "lhi", OP16(0xa708LL), MASK_RI_RI, INSTR_RI_RI, 3, 0},
  { "brctg", OP16(0xa707LL), MASK_RI_RP, INSTR_RI_RP, 2, 2},
  { "brct", OP16(0xa706LL), MASK_RI_RP, INSTR_RI_RP, 3, 0},
  { "bras", OP16(0xa705LL), MASK_RI_RP, INSTR_RI_RP, 3, 0},
  { "brc", OP16(0xa704LL), MASK_RI_UP, INSTR_RI_UP, 3, 0},
  { "tmhl", OP16(0xa703LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "tmhh", OP16(0xa702LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "tml", OP16(0xa701LL), MASK_RI_RU, INSTR_RI_RU, 3, 0},
  { "tmll", OP16(0xa701LL), MASK_RI_RU, INSTR_RI_RU, 3, 0},
  { "tmh", OP16(0xa700LL), MASK_RI_RU, INSTR_RI_RU, 3, 0},
  { "tmlh", OP16(0xa700LL), MASK_RI_RU, INSTR_RI_RU, 3, 0},
  { "llill", OP16(0xa50fLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "llilh", OP16(0xa50eLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "llihl", OP16(0xa50dLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "llihh", OP16(0xa50cLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "oill", OP16(0xa50bLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "oilh", OP16(0xa50aLL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "oihl", OP16(0xa509LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "oihh", OP16(0xa508LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "nill", OP16(0xa507LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "nilh", OP16(0xa506LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "nihl", OP16(0xa505LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "nihh", OP16(0xa504LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "iill", OP16(0xa503LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "iilh", OP16(0xa502LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "iihl", OP16(0xa501LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "iihh", OP16(0xa500LL), MASK_RI_RU, INSTR_RI_RU, 2, 2},
  { "stam", OP8(0x9bLL), MASK_RS_AARD, INSTR_RS_AARD, 3, 0},
  { "lam", OP8(0x9aLL), MASK_RS_AARD, INSTR_RS_AARD, 3, 0},
  { "trace", OP8(0x99LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "lm", OP8(0x98LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "xi", OP8(0x97LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "oi", OP8(0x96LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "cli", OP8(0x95LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "ni", OP8(0x94LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "ts", OP8(0x93LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "mvi", OP8(0x92LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "tm", OP8(0x91LL), MASK_SI_URD, INSTR_SI_URD, 3, 0},
  { "stm", OP8(0x90LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "slda", OP8(0x8fLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "srda", OP8(0x8eLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "sldl", OP8(0x8dLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "srdl", OP8(0x8cLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "sla", OP8(0x8bLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "sra", OP8(0x8aLL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "sll", OP8(0x89LL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "srl", OP8(0x88LL), MASK_RS_R0RD, INSTR_RS_R0RD, 3, 0},
  { "bxle", OP8(0x87LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "bxh", OP8(0x86LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "brxle", OP8(0x85LL), MASK_RSI_RRP, INSTR_RSI_RRP, 3, 0},
  { "brxh", OP8(0x84LL), MASK_RSI_RRP, INSTR_RSI_RRP, 3, 0},
  { "diag", OP8(0x83LL), MASK_RS_RRRD, INSTR_RS_RRRD, 3, 0},
  { "lpsw", OP8(0x82LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "ssm", OP8(0x80LL), MASK_S_RD, INSTR_S_RD, 3, 0},
  { "su", OP8(0x7fLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "au", OP8(0x7eLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "de", OP8(0x7dLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "me", OP8(0x7cLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "mde", OP8(0x7cLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "se", OP8(0x7bLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "ae", OP8(0x7aLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "ce", OP8(0x79LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "le", OP8(0x78LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "ms", OP8(0x71LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "ste", OP8(0x70LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "sw", OP8(0x6fLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "aw", OP8(0x6eLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "dd", OP8(0x6dLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "md", OP8(0x6cLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "sd", OP8(0x6bLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "ad", OP8(0x6aLL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "cd", OP8(0x69LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "ld", OP8(0x68LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "mxd", OP8(0x67LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "std", OP8(0x60LL), MASK_RX_FRRD, INSTR_RX_FRRD, 3, 0},
  { "sl", OP8(0x5fLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "al", OP8(0x5eLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "d", OP8(0x5dLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "m", OP8(0x5cLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "s", OP8(0x5bLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "a", OP8(0x5aLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "c", OP8(0x59LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "l", OP8(0x58LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "x", OP8(0x57LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "o", OP8(0x56LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "cl", OP8(0x55LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "n", OP8(0x54LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "lae", OP8(0x51LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "st", OP8(0x50LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "cvb", OP8(0x4fLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "cvd", OP8(0x4eLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "bas", OP8(0x4dLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "mh", OP8(0x4cLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "sh", OP8(0x4bLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "ah", OP8(0x4aLL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "ch", OP8(0x49LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "lh", OP8(0x48LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "b", OP16(0x47f0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bno", OP16(0x47e0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnh", OP16(0x47d0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnp", OP16(0x47d0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "ble", OP16(0x47c0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnl", OP16(0x47b0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnm", OP16(0x47b0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bhe", OP16(0x47a0LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnlh", OP16(0x4790LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "be", OP16(0x4780LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bz", OP16(0x4780LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bne", OP16(0x4770LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnz", OP16(0x4770LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "blh", OP16(0x4760LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnhe", OP16(0x4750LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bl", OP16(0x4740LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bm", OP16(0x4740LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bnle", OP16(0x4730LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bh", OP16(0x4720LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bp", OP16(0x4720LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bo", OP16(0x4710LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bc", OP8(0x47LL), MASK_RX_URRD, INSTR_RX_URRD, 3, 0},
  { "nop", OP16(0x4700LL), MASK_RX_0RRD, INSTR_RX_0RRD, 3, 0},
  { "bct", OP8(0x46LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "bal", OP8(0x45LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "ex", OP8(0x44LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "ic", OP8(0x43LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "stc", OP8(0x42LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "la", OP8(0x41LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "sth", OP8(0x40LL), MASK_RX_RRRD, INSTR_RX_RRRD, 3, 0},
  { "sur", OP8(0x3fLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "aur", OP8(0x3eLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "der", OP8(0x3dLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "mer", OP8(0x3cLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "mder", OP8(0x3cLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ser", OP8(0x3bLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "aer", OP8(0x3aLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "cer", OP8(0x39LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ler", OP8(0x38LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "sxr", OP8(0x37LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "axr", OP8(0x36LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lrer", OP8(0x35LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ledr", OP8(0x35LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "her", OP8(0x34LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lcer", OP8(0x33LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lter", OP8(0x32LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lner", OP8(0x31LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lper", OP8(0x30LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "swr", OP8(0x2fLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "awr", OP8(0x2eLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ddr", OP8(0x2dLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "mdr", OP8(0x2cLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "sdr", OP8(0x2bLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "adr", OP8(0x2aLL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "cdr", OP8(0x29LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ldr", OP8(0x28LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "mxdr", OP8(0x27LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "mxr", OP8(0x26LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lrdr", OP8(0x25LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ldxr", OP8(0x25LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "hdr", OP8(0x24LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lcdr", OP8(0x23LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "ltdr", OP8(0x22LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lndr", OP8(0x21LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "lpdr", OP8(0x20LL), MASK_RR_FF, INSTR_RR_FF, 3, 0},
  { "slr", OP8(0x1fLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "alr", OP8(0x1eLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "dr", OP8(0x1dLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "mr", OP8(0x1cLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "sr", OP8(0x1bLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "ar", OP8(0x1aLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "cr", OP8(0x19LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "lr", OP8(0x18LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "xr", OP8(0x17LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "or", OP8(0x16LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "clr", OP8(0x15LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "nr", OP8(0x14LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "lcr", OP8(0x13LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "ltr", OP8(0x12LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "lnr", OP8(0x11LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "lpr", OP8(0x10LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "clcl", OP8(0x0fLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "mvcl", OP8(0x0eLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "basr", OP8(0x0dLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "bassm", OP8(0x0cLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "bsm", OP8(0x0bLL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "svc", OP8(0x0aLL), MASK_RR_U0, INSTR_RR_U0, 3, 0},
  { "br", OP16(0x07f0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnor", OP16(0x07e0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnhr", OP16(0x07d0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnpr", OP16(0x07d0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bler", OP16(0x07c0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnlr", OP16(0x07b0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnmr", OP16(0x07b0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bher", OP16(0x07a0LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnlhr", OP16(0x0790LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "ber", OP16(0x0780LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bzr", OP16(0x0780LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bner", OP16(0x0770LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnzr", OP16(0x0770LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "blhr", OP16(0x0760LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnher", OP16(0x0750LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "blr", OP16(0x0740LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bmr", OP16(0x0740LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bnler", OP16(0x0730LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bhr", OP16(0x0720LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bpr", OP16(0x0720LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bor", OP16(0x0710LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bcr", OP8(0x07LL), MASK_RR_UR, INSTR_RR_UR, 3, 0},
  { "nopr", OP16(0x0700LL), MASK_RR_0R, INSTR_RR_0R, 3, 0},
  { "bctr", OP8(0x06LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "balr", OP8(0x05LL), MASK_RR_RR, INSTR_RR_RR, 3, 0},
  { "spm", OP8(0x04LL), MASK_RR_R0, INSTR_RR_R0, 3, 0},
  { "trap2", OP16(0x01ffLL), MASK_E, INSTR_E, 3, 0},
  { "sam64", OP16(0x010eLL), MASK_E, INSTR_E, 2, 2},
  { "sam31", OP16(0x010dLL), MASK_E, INSTR_E, 3, 2},
  { "sam24", OP16(0x010cLL), MASK_E, INSTR_E, 3, 2},
  { "tam", OP16(0x010bLL), MASK_E, INSTR_E, 3, 2},
  { "sckpf", OP16(0x0107LL), MASK_E, INSTR_E, 3, 0},
  { "upt", OP16(0x0102LL), MASK_E, INSTR_E, 3, 0},
  { "pr", OP16(0x0101LL), MASK_E, INSTR_E, 3, 0}
};

const int s390_num_opcodes =
  sizeof (s390_opcodes) / sizeof (s390_opcodes[0]);



Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- binutils.spec	11 Jul 2006 06:05:38 -0000	1.88
+++ binutils.spec	11 Jul 2006 06:17:09 -0000	1.89
@@ -6,6 +6,7 @@
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
+Source2: s390-opc.tab
 Patch0: binutils-2.17.50.0.2-20060601.patch
 Patch1: binutils-2.17.50.0.2-ltconfig-multilib.patch
 Patch2: binutils-2.17.50.0.2-ppc64-pie.patch
@@ -65,10 +66,10 @@
 %patch12 -p0 -b .tls_common~
 %patch13 -p0 -b .bz2513~
 %patch14 -p0 -b .hash-style~
+touch opcodes/s390-mkopc
+cp %{SOURCE2} opcodes/s390-opc.tab; touch opcodes/s390-opc.tab
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
-sed -ie 's/\$(CC_FOR_BUILD)/& $(CFLAGS)/' opcodes/Makefile.{am,in}
-sed -ie 's,\./s390-mkopc ,LD_PRELOAD=libSegFault.so SEGFAULT_SIGNALS=all &,' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
 touch */configure



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:33:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:33:04 -0400
Subject: rpms/gdb/devel .cvsignore, 1.19,
 1.20 gdb-6.3-attach-stop-20051011.patch, 1.2,
 1.3 gdb-6.3-augmS-20060303.patch, 1.3,
 1.4 gdb-6.3-bt-past-zero-20051201.patch, 1.1,
 1.2 gdb-6.3-cfaval-20060303.patch, 1.4, 1.5 gdb-6.3-ctorline-20050120.patch,
 1.1, 1.2 gdb-6.3-dtorfix-20050121.patch, 1.2,
 1.3 gdb-6.3-gcore-thread-20050204.patch, 1.3,
 1.4 gdb-6.3-ia64-corefile-fix-20050127.patch, 1.1,
 1.2 gdb-6.3-ia64-gcore-page0-20050421.patch, 1.1,
 1.2 gdb-6.3-ia64-gcore-speedup-20050714.patch, 1.1,
 1.2 gdb-6.3-ia64-sigill-20051115.patch, 1.1,
 1.2 gdb-6.3-ia64-sigtramp-fp-20050926.patch, 1.1,
 1.2 gdb-6.3-ia64-vsyscall-20050330.patch, 1.1,
 1.2 gdb-6.3-inferior-notification-20050721.patch, 1.1,
 1.2 gdb-6.3-inheritance-20050324.patch, 1.1,
 1.2 gdb-6.3-large-core-20051206.patch, 1.1,
 1.2 gdb-6.3-linespec-20041213.patch, 1.1,
 1.2 gdb-6.3-lwp-cache-20041216.patch, 1.1,
 1.2 gdb-6.3-nonthreaded-wp-20050117.patch, 1.2,
 1.3 gdb-6.3-pie-20050110.patch, 1.1, 1.2 gdb-6.3-ppc64syscall-20040622.patch,
 1.1, 1.2 gdb-6.3-ppccfi-20041104.patch, 1.!
 1, 1.2 gdb-6.3-security-errata-20050610.patch, 1.2,
 1.3 gdb-6.3-step-thread-exit-20050211.patch, 1.1,
 1.2 gdb-6.3-terminal-fix-20050214.patch, 1.1,
 1.2 gdb-6.3-test-pie-20050107.patch, 1.1,
 1.2 gdb-6.3-threaded-watchpoints-20041213.patch, 1.3,
 1.4 gdb-6.3-threaded-watchpoints2-20050225.patch, 1.1,
 1.2 gdb-6.3-warnings-20050317.patch, 1.1, 1.2 gdb.spec, 1.186, 1.187 sources,
 1.19, 1.20 gdb-6.3-addsymfilemem-20050209.patch, 1.1,
 NONE gdb-6.3-attach-dso-20050929.patch, 1.1,
 NONE gdb-6.3-backtrace-20041216.patch, 1.1,
 NONE gdb-6.3-dwoppieceread-20050407.patch, 1.1,
 NONE gdb-6.3-follow-vfork-20050303.patch, 1.1,
 NONE gdb-6.3-ia64-backtrace-20041213.patch, 1.1,
 NONE gdb-6.3-ia64-sigtramp-20050427.patch, 1.1,
 NONE gdb-6.3-ia64fix-20050121.patch, 1.1,
 NONE gdb-6.3-movedir-20050125.patch, 1.2,
 NONE gdb-6.3-partial-die-20050503.patch, 1.1,
 NONE gdb-6.3-ppc64abi-20040621.patch, 1.2,
 NONE gdb-6.3-ppc64fpscrhack-20041026.patch, 1.2,
 NONE gdb-6.3-ppcdotsym-20050126.patch, 1.1,
 NONE gdb-6.3-ppcmalloc-20041124.patch, 1.2, NONE gdb-6.3-!
 ppcreggroups-20041124.patch,1.2,NONE gdb-6.3-ppcsignals-200406!
 21.patch
Message-ID: <200607110633.k6B6X4Mk014650@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14631

Modified Files:
	.cvsignore gdb-6.3-attach-stop-20051011.patch 
	gdb-6.3-augmS-20060303.patch 
	gdb-6.3-bt-past-zero-20051201.patch 
	gdb-6.3-cfaval-20060303.patch gdb-6.3-ctorline-20050120.patch 
	gdb-6.3-dtorfix-20050121.patch 
	gdb-6.3-gcore-thread-20050204.patch 
	gdb-6.3-ia64-corefile-fix-20050127.patch 
	gdb-6.3-ia64-gcore-page0-20050421.patch 
	gdb-6.3-ia64-gcore-speedup-20050714.patch 
	gdb-6.3-ia64-sigill-20051115.patch 
	gdb-6.3-ia64-sigtramp-fp-20050926.patch 
	gdb-6.3-ia64-vsyscall-20050330.patch 
	gdb-6.3-inferior-notification-20050721.patch 
	gdb-6.3-inheritance-20050324.patch 
	gdb-6.3-large-core-20051206.patch 
	gdb-6.3-linespec-20041213.patch 
	gdb-6.3-lwp-cache-20041216.patch 
	gdb-6.3-nonthreaded-wp-20050117.patch 
	gdb-6.3-pie-20050110.patch gdb-6.3-ppc64syscall-20040622.patch 
	gdb-6.3-ppccfi-20041104.patch 
	gdb-6.3-security-errata-20050610.patch 
	gdb-6.3-step-thread-exit-20050211.patch 
	gdb-6.3-terminal-fix-20050214.patch 
	gdb-6.3-test-pie-20050107.patch 
	gdb-6.3-threaded-watchpoints-20041213.patch 
	gdb-6.3-threaded-watchpoints2-20050225.patch 
	gdb-6.3-warnings-20050317.patch gdb.spec sources 
Removed Files:
	gdb-6.3-addsymfilemem-20050209.patch 
	gdb-6.3-attach-dso-20050929.patch 
	gdb-6.3-backtrace-20041216.patch 
	gdb-6.3-dwoppieceread-20050407.patch 
	gdb-6.3-follow-vfork-20050303.patch 
	gdb-6.3-ia64-backtrace-20041213.patch 
	gdb-6.3-ia64-sigtramp-20050427.patch 
	gdb-6.3-ia64fix-20050121.patch gdb-6.3-movedir-20050125.patch 
	gdb-6.3-partial-die-20050503.patch 
	gdb-6.3-ppc64abi-20040621.patch 
	gdb-6.3-ppc64fpscrhack-20041026.patch 
	gdb-6.3-ppcdotsym-20050126.patch 
	gdb-6.3-ppcmalloc-20041124.patch 
	gdb-6.3-ppcreggroups-20041124.patch 
	gdb-6.3-ppcsignals-20040621.patch 
	gdb-6.3-prelink-core-20060223.patch 
	gdb-6.3-pstack-20041215.patch gdb-6.3-sarestart-20050518.patch 
	gdb-6.3-sigrepeats-20050121.patch 
	gdb-6.3-sigsymtramp-20040621.patch 
	gdb-6.3-support-fopen64-20060413.patch 
	gdb-6.3-test-sigrepeats-20050121.patch 
	gdb-6.3-type-punning-20060214.patch 
	gdb-6.3-unload-test-20050216.patch 
	gdb-6.3-vsyscall-20041216.patch 
Log Message:
* Tue Jul 11 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-1
- Upgrade to GDB 6.5.  Drop redundant patches, forward-port remaining
ones.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 May 2006 07:34:28 -0000	1.19
+++ .cvsignore	11 Jul 2006 06:33:02 -0000	1.20
@@ -1 +1,2 @@
 gdb-6.3.tar.bz2
+gdb-6.5.tar.bz2

gdb-6.3-attach-stop-20051011.patch:
 inferior.h                        |    4 
 infptrace.c                       |   37 +++++++
 infrun.c                          |    5 +
 target.c                          |    7 +
 testsuite/gdb.base/attachstop.c   |   29 ++++++
 testsuite/gdb.base/attachstop.exp |  177 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 259 insertions(+)

Index: gdb-6.3-attach-stop-20051011.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-attach-stop-20051011.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-attach-stop-20051011.patch	20 Oct 2005 15:48:27 -0000	1.2
+++ gdb-6.3-attach-stop-20051011.patch	11 Jul 2006 06:33:02 -0000	1.3
@@ -16,8 +16,10 @@
 	* gdb.base/attachstop.exp: New test.
 	* gdb.base/attachstop.c: Ditto.
 
---- gdb-6.3/gdb/testsuite/gdb.base/attachstop.c.fix	2005-10-18 17:24:26.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.c	2005-10-18 17:23:17.000000000 -0400
+Index: gdb-6.5/gdb/testsuite/gdb.base/attachstop.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.base/attachstop.c	2006-07-07 03:13:48.000000000 -0300
 @@ -0,0 +1,29 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -48,8 +50,10 @@
 +  sleep (10000);  /* Second sleep.  */
 +  return 0;
 +}
---- gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp.fix	2005-10-18 17:24:31.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/attachstop.exp	2005-10-18 17:24:19.000000000 -0400
+Index: gdb-6.5/gdb/testsuite/gdb.base/attachstop.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.base/attachstop.exp	2006-07-07 03:13:48.000000000 -0300
 @@ -0,0 +1,177 @@
 +# Copyright 2005
 +
@@ -228,9 +232,11 @@
 +remote_exec build "kill -9 ${testpid}"
 +
 +return 0
---- gdb-6.3/gdb/infrun.c.fix	2005-10-18 17:22:41.000000000 -0400
-+++ gdb-6.3/gdb/infrun.c	2005-10-18 17:23:17.000000000 -0400
-@@ -794,6 +794,11 @@ proceed (CORE_ADDR addr, enum target_sig
+Index: gdb-6.5/gdb/infrun.c
+===================================================================
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-07 02:26:54.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-07 03:13:48.000000000 -0300
+@@ -814,6 +814,11 @@ proceed (CORE_ADDR addr, enum target_sig
       updated correctly when the inferior is stopped.  */
    prev_pc = read_pc ();
  
@@ -242,8 +248,10 @@
    /* Resume inferior.  */
    resume (oneproc || step || bpstat_should_step (), stop_signal);
  
---- gdb-6.3/gdb/infptrace.c.fix	2005-10-18 17:22:49.000000000 -0400
-+++ gdb-6.3/gdb/infptrace.c	2005-10-18 17:25:30.000000000 -0400
+Index: gdb-6.5/gdb/infptrace.c
+===================================================================
+--- gdb-6.5.orig/gdb/infptrace.c	2005-12-17 20:34:01.000000000 -0200
++++ gdb-6.5/gdb/infptrace.c	2006-07-07 03:15:30.000000000 -0300
 @@ -35,6 +35,8 @@
  #include <sys/param.h>
  #include "gdb_dirent.h"
@@ -253,13 +261,13 @@
  #include <sys/ioctl.h>
  
  #include "gdb_ptrace.h"
-@@ -232,8 +234,40 @@ attach (int pid)
+@@ -157,8 +159,40 @@ attach (int pid)
  #ifdef PT_ATTACH
    errno = 0;
    ptrace (PT_ATTACH, pid, (PTRACE_TYPE_ARG3) 0, 0);
 +  attach_stopped_flag = 0;
    if (errno != 0)
-     perror_with_name ("ptrace");
+     perror_with_name (("ptrace"));
 +  else
 +    {
 +      FILE *fp;
@@ -284,7 +292,7 @@
 +	      if (strstr (buf, "T (stopped)"))
 +		{
 +		  attach_stopped_flag = 1;
-+                  ptrace (PT_CONTINUE, pid, (PTRACE_TYPE_ARG3)1, 
++                  ptrace (PT_CONTINUE, pid, (PTRACE_TYPE_ARG3)1,
 +		          target_signal_to_host (TARGET_SIGNAL_STOP));
 +		}
 +	    }
@@ -294,7 +302,7 @@
    attach_flag = 1;
    return pid;
  #else
-@@ -251,6 +285,9 @@ detach (int signal)
+@@ -176,6 +210,9 @@ detach (int signal)
    int pid = PIDGET (inferior_ptid);
  
    errno = 0;
@@ -303,10 +311,12 @@
 +  attach_stopped_flag = 0;
    ptrace (PT_DETACH, pid, (PTRACE_TYPE_ARG3) 1, signal);
    if (errno != 0)
-     perror_with_name ("ptrace");
---- gdb-6.3/gdb/inferior.h.fix	2005-10-18 17:22:56.000000000 -0400
-+++ gdb-6.3/gdb/inferior.h	2005-10-18 17:23:17.000000000 -0400
-@@ -426,6 +426,10 @@ extern struct regcache *stop_registers;
+     perror_with_name (("ptrace"));
+Index: gdb-6.5/gdb/inferior.h
+===================================================================
+--- gdb-6.5.orig/gdb/inferior.h	2006-01-24 20:34:34.000000000 -0200
++++ gdb-6.5/gdb/inferior.h	2006-07-07 03:13:48.000000000 -0300
+@@ -428,6 +428,10 @@ extern struct regcache *stop_registers;
     than forked.  */
  
  extern int attach_flag;
@@ -317,9 +327,11 @@
  
  /* Possible values for CALL_DUMMY_LOCATION.  */
  #define ON_STACK 1
---- gdb-6.3/gdb/target.c.fix	2005-10-18 17:23:01.000000000 -0400
-+++ gdb-6.3/gdb/target.c	2005-10-18 17:23:17.000000000 -0400
-@@ -201,6 +201,13 @@ static struct cmd_list_element *targetli
+Index: gdb-6.5/gdb/target.c
+===================================================================
+--- gdb-6.5.orig/gdb/target.c	2006-05-05 17:08:45.000000000 -0300
++++ gdb-6.5/gdb/target.c	2006-07-07 03:13:48.000000000 -0300
+@@ -195,6 +195,13 @@ static struct cmd_list_element *targetli
  
  int attach_flag;
  

gdb-6.3-augmS-20060303.patch:
 dwarf2-frame.c |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

Index: gdb-6.3-augmS-20060303.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-augmS-20060303.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-augmS-20060303.patch	27 May 2006 07:34:28 -0000	1.3
+++ gdb-6.3-augmS-20060303.patch	11 Jul 2006 06:33:02 -0000	1.4
@@ -1,3 +1,5 @@
+Installed upstream after GDB 6.5 branched.
+
 for gdb/ChangeLog
 2006-03-03  Alexandre Oliva  <aoliva at redhat.com>
 
@@ -5,18 +7,10 @@
 	(dwarf2_frame_sniffer): Use it.
 	(decode_frame_entry_1): Set it according to augmentation "S".
 
-2004-11-07  Daniel Jacobowitz  <dan at debian.org>
-
-	* dwarf2-frame.c (struct dwarf2_frame_ops): Add signal_frame_p.
-	(dwarf2_frame_set_signal_frame_p, dwarf2_frame_signal_frame_p)
-	(dwarf2_signal_frame_unwind): New.
-	(dwarf2_frame_sniffer): Use dwarf2_frame_signal_frame_p.
-	* dwarf2-frame.h (dwarf2_frame_set_signal_frame_p): New prototype.
-
-Index: gdb-6.3/gdb/dwarf2-frame.c
+Index: gdb-6.5/gdb/dwarf2-frame.c
 ===================================================================
---- gdb-6.3.orig/gdb/dwarf2-frame.c	2006-02-14 17:21:07.000000000 -0200
-+++ gdb-6.3/gdb/dwarf2-frame.c	2006-03-03 13:48:20.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2-frame.c	2006-07-11 02:08:30.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.c	2006-07-11 02:09:19.000000000 -0300
 @@ -69,6 +69,9 @@ struct dwarf2_cie
    /* True if a 'z' augmentation existed.  */
    unsigned char saw_z_augmentation;
@@ -27,31 +21,28 @@
    struct dwarf2_cie *next;
  };
  
-@@ -849,10 +852,20 @@ dwarf2_frame_sniffer (struct frame_info 
+@@ -1053,15 +1056,17 @@ dwarf2_frame_sniffer (struct frame_info 
       function.  frame_pc_unwind(), for a no-return next function, can
       end up returning something past the end of this function's body.  */
    CORE_ADDR block_addr = frame_unwind_address_in_block (next_frame);
--  if (dwarf2_frame_find_fde (&block_addr))
--    return &dwarf2_frame_unwind;
+-  if (!dwarf2_frame_find_fde (&block_addr))
 +  struct dwarf2_fde *fde = dwarf2_frame_find_fde (&block_addr);
 +  if (!fde)
-+    return NULL;
+     return NULL;
  
--  return NULL;
-+  /* On some targets, signal trampolines may have unwind information.
-+     We need to recognize them so that we set the frame type
-+     correctly.  */
-+
+   /* On some targets, signal trampolines may have unwind information.
+      We need to recognize them so that we set the frame type
+      correctly.  */
+ 
+-  if (dwarf2_frame_signal_frame_p (get_frame_arch (next_frame),
+-				   next_frame))
 +  if (fde->cie->signal_frame
 +      || dwarf2_frame_signal_frame_p (get_frame_arch (next_frame),
 +				      next_frame))
-+    return &dwarf2_signal_frame_unwind;
-+
-+  return &dwarf2_frame_unwind;
- }
- 
+     return &dwarf2_signal_frame_unwind;
  
-@@ -1296,6 +1309,10 @@ decode_frame_entry_1 (struct comp_unit *
+   return &dwarf2_frame_unwind;
+@@ -1521,6 +1526,10 @@ decode_frame_entry_1 (struct comp_unit *
           depends on the target address size.  */
        cie->encoding = DW_EH_PE_absptr;
  
@@ -62,7 +53,7 @@
        /* Check version number.  */
        cie_version = read_1_byte (unit->abfd, buf);
        if (cie_version != 1 && cie_version != 3)
-@@ -1373,6 +1390,17 @@ decode_frame_entry_1 (struct comp_unit *
+@@ -1604,6 +1613,17 @@ decode_frame_entry_1 (struct comp_unit *
  	      augmentation++;
  	    }
  
@@ -80,22 +71,3 @@
  	  /* Otherwise we have an unknown augmentation.
  	     Bail out unless we saw a 'z' prefix.  */
  	  else
-Index: gdb-6.3/gdb/dwarf2-frame.h
-===================================================================
---- gdb-6.3.orig/gdb/dwarf2-frame.h	2006-02-14 17:21:06.000000000 -0200
-+++ gdb-6.3/gdb/dwarf2-frame.h	2006-03-03 13:45:42.000000000 -0300
-@@ -84,6 +84,14 @@ extern void dwarf2_frame_set_init_reg (s
- 				       void (*init_reg) (struct gdbarch *, int,
- 					     struct dwarf2_frame_state_reg *));
- 
-+/* Set the architecture-specific signal trampoline recognition
-+   function for GDBARCH to SIGNAL_FRAME_P.  */
-+
-+extern void
-+  dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch,
-+				   int (*signal_frame_p) (struct gdbarch *,
-+							  struct frame_info *));
-+
- /* Return the frame unwind methods for the function that contains PC,
-    or NULL if it can't be handled by DWARF CFI frame unwinder.  */
- 

gdb-6.3-bt-past-zero-20051201.patch:
 frame.c                        |   25 ++++++++++++++++++++++---
 testsuite/gdb.base/setshow.exp |   12 +++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

Index: gdb-6.3-bt-past-zero-20051201.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-bt-past-zero-20051201.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-bt-past-zero-20051201.patch	1 Dec 2005 21:07:06 -0000	1.1
+++ gdb-6.3-bt-past-zero-20051201.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -11,8 +11,10 @@
 
 	* setshow.exp: Add testing of "set backtrace past-zero-pc" option.
 
---- gdb-6.3/gdb/testsuite/gdb.base/setshow.exp.fix	2005-12-01 14:43:02.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.base/setshow.exp	2005-12-01 14:43:20.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.base/setshow.exp
+===================================================================
+--- gdb-6.5.orig/gdb/testsuite/gdb.base/setshow.exp	2006-07-11 02:46:50.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.base/setshow.exp	2006-07-11 02:47:24.000000000 -0300
 @@ -1,4 +1,4 @@
 -# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 2003
 +# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 2003, 2005
@@ -36,17 +38,28 @@
  #test set check range on
  gdb_test "set check range on" "" "set check range on" 
  #test show check range on
---- gdb-6.3/gdb/frame.c.fix	2005-12-01 14:42:47.000000000 -0500
-+++ gdb-6.3/gdb/frame.c	2005-12-01 14:44:08.000000000 -0500
-@@ -115,6 +115,7 @@ static int frame_debug;
- /* Flag to indicate whether backtraces should stop at main et.al.  */
+Index: gdb-6.5/gdb/frame.c
+===================================================================
+--- gdb-6.5.orig/gdb/frame.c	2006-07-11 02:46:50.000000000 -0300
++++ gdb-6.5/gdb/frame.c	2006-07-11 02:51:20.000000000 -0300
+@@ -131,6 +131,16 @@ Whether backtraces should continue past 
+ 		    value);
+ }
  
- static int backtrace_past_main;
 +static int backtrace_past_zero_pc;
- static unsigned int backtrace_limit = UINT_MAX;
- 
++static void
++show_backtrace_past_zero_pc (struct ui_file *file, int from_tty,
++			     struct cmd_list_element *c, const char *value)
++{
++  fprintf_filtered (file, _("\
++Whether backtraces should continue past a zero pc value is %s.\n"),
++		    value);
++}
++
+ static int backtrace_past_entry;
  static void
-@@ -1236,9 +1237,7 @@ get_prev_frame (struct frame_info *this_
+ show_backtrace_past_entry (struct ui_file *file, int from_tty,
+@@ -1313,9 +1323,7 @@ get_prev_frame (struct frame_info *this_
      }
  
    if (this_frame->level > 0
@@ -57,20 +70,21 @@
        && get_frame_type (this_frame) == NORMAL_FRAME
        && get_frame_type (get_next_frame (this_frame)) == NORMAL_FRAME
        && get_frame_pc (this_frame) == 0)
-@@ -1537,6 +1536,16 @@ Whether backtraces should continue past 
- 			   NULL, NULL, &set_backtrace_cmdlist,
+@@ -1629,6 +1637,17 @@ the rest of the stack trace."),
+ 			   &set_backtrace_cmdlist,
  			   &show_backtrace_cmdlist);
  
 +  add_setshow_boolean_cmd ("past-zero-pc", class_obscure,
-+			   &backtrace_past_zero_pc, "\
-+Set whether backtraces should continue past a zero pc value.", "\
-+Show whether backtraces should continue past a zero pc value..", "\
++ 			   &backtrace_past_zero_pc, _("\
++Set whether backtraces should continue past a zero pc value."), _("\
++Show whether backtraces should continue past a zero pc value."), _("\
 +Normally GDB stops backtracing when it finds a zero pc.\n\
-+Set this variable if you need to see the rest of the stack trace.", "\
-+Whether backtraces should continue past a zero pc value is %s.",
-+			   NULL, NULL, &set_backtrace_cmdlist,
-+			   &show_backtrace_cmdlist);
++Set this variable if you need to see the rest of the stack trace."), 
++ 			   NULL,
++			   show_backtrace_past_zero_pc,
++			   &set_backtrace_cmdlist,
++ 			   &show_backtrace_cmdlist);
 +
-   add_setshow_uinteger_cmd ("limit", class_obscure,
- 			    &backtrace_limit, "\
- Set an upper bound on the number of backtrace levels.", "\
+   add_setshow_integer_cmd ("limit", class_obscure,
+ 			   &backtrace_limit, _("\
+ Set an upper bound on the number of backtrace levels."), _("\

gdb-6.3-cfaval-20060303.patch:
 dwarf2-frame.c |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 dwarf2-frame.h |    4 ++++
 2 files changed, 54 insertions(+)

Index: gdb-6.3-cfaval-20060303.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-cfaval-20060303.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdb-6.3-cfaval-20060303.patch	27 May 2006 07:34:28 -0000	1.4
+++ gdb-6.3-cfaval-20060303.patch	11 Jul 2006 06:33:02 -0000	1.5
@@ -1,32 +1,4 @@
-for include/elf/ChangeLog
-2006-03-02  Ben Elliston  <bje at au.ibm.com>
-
-	Import from the GCC tree:
-	2006-03-01  Jakub Jelinek  <jakub at redhat.com>
-
-	* dwarf2.h (DW_TAG_condition, DW_TAG_shared_type): New constants
-	from DWARF 3.
-	(DW_AT_description, DW_AT_binary_scale, DW_AT_decimal_scale,
-	DW_AT_small, DW_AT_decimal_sign, DW_AT_digit_count,
-	DW_AT_picture_string, DW_AT_mutable, DW_AT_threads_scaled,
-	DW_AT_explicit, DW_AT_object_pointer, DW_AT_endianity,
-	DW_AT_elemental, DW_AT_pure, DW_AT_recursive): New.
-	(DW_OP_form_tls_address, DW_OP_call_frame_cfa, DW_OP_bit_piece): New.
-	(DW_ATE_packed_decimal, DW_ATE_numeric_string, DW_ATE_edited,
-	DW_ATE_signed_fixed, DW_ATE_unsigned_fixed): New.
-	(DW_DS_unsigned, DW_DS_leading_overpunch, DW_DS_trailing_overpunch,
-	DW_DS_leading_separate, DW_DS_trailing_separate): New.
-	(DW_END_default, DW_END_big, DW_END_little): New.
-	(DW_END_lo_user, DW_END_hi_user): Define.
-	(DW_LNE_lo_user, DW_LNE_hi_user): Define.
-	(DW_CFA_val_offset, DW_CFA_val_offset_sf, DW_CFA_val_expression): New.
-	(DW_LANG_PLI, DW_LANG_ObjC, DW_LANG_ObjC_plus_plus, DW_LANG_UPC,
-	DW_LANG_D): New.
-
-2005-07-18  Ben Elliston  <bje at au.ibm.com>
-
-	* dwarf2.h (enum dwarf_type): Add DW_ATE_decimal_float (now in
-	DWARF 3).
+Installed upstream after GDB 6.5 branched.
 
 for gdb/ChangeLog
 2006-03-07  Alexandre Oliva  <aoliva at redhat.com>
@@ -39,17 +11,11 @@
 	(dwarf2_frame_prev_register): Handle the new reg rules.
 	(dwarf2_frame_this_id): Use pc instead of function entry point.
 
-2005-08-11  Andreas Schwab  <schwab at suse.de>
-
-	PR exp/1978
-	* valarith.c (value_binop): Fix result type for the shift
-	operators.
-
-Index: gdb-6.3/gdb/dwarf2-frame.c
+Index: gdb-6.5/gdb/dwarf2-frame.c
 ===================================================================
---- gdb-6.3.orig/gdb/dwarf2-frame.c	2006-03-07 01:45:13.000000000 -0300
-+++ gdb-6.3/gdb/dwarf2-frame.c	2006-03-08 18:01:37.000000000 -0300
-@@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_
+--- gdb-6.5.orig/gdb/dwarf2-frame.c	2006-07-07 03:31:56.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.c	2006-07-07 03:32:04.000000000 -0300
+@@ -474,6 +474,34 @@ bad CFI data; mismatched DW_CFA_restore_
  	      fs->regs.reg[reg].loc.offset = offset;
  	      break;
  
@@ -83,53 +49,8 @@
 +
  	    case DW_CFA_def_cfa_sf:
  	      insn_ptr = read_uleb128 (insn_ptr, insn_end, &fs->cfa_reg);
- 	      insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset);
-@@ -474,6 +502,10 @@ struct dwarf2_frame_ops
- {
-   /* Pre-initialize the register state REG for register REGNUM.  */
-   void (*init_reg) (struct gdbarch *, int, struct dwarf2_frame_state_reg *);
-+
-+  /* Check whether the frame preceding NEXT_FRAME will be a signal
-+     trampoline.  */
-+  int (*signal_frame_p) (struct gdbarch *, struct frame_info *);
- };
- 
- /* Default architecture-specific register state initialization
-@@ -550,6 +582,33 @@ dwarf2_frame_init_reg (struct gdbarch *g
- 
-   ops->init_reg (gdbarch, regnum, reg);
- }
-+
-+/* Set the architecture-specific signal trampoline recognition
-+   function for GDBARCH to SIGNAL_FRAME_P.  */
-+
-+void
-+dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch,
-+				 int (*signal_frame_p) (struct gdbarch *,
-+							struct frame_info *))
-+{
-+  struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data);
-+
-+  ops->signal_frame_p = signal_frame_p;
-+}
-+
-+/* Query the architecture-specific signal frame recognizer for
-+   NEXT_FRAME.  */
-+
-+static int
-+dwarf2_frame_signal_frame_p (struct gdbarch *gdbarch,
-+			     struct frame_info *next_frame)
-+{
-+  struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data);
-+
-+  if (ops->signal_frame_p == NULL)
-+    return 0;
-+  return ops->signal_frame_p (gdbarch, next_frame);
-+}
- 
- 
- struct dwarf2_frame_cache
-@@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame
+ 	      if (eh_frame_p)
+@@ -992,6 +1020,28 @@ dwarf2_frame_prev_register (struct frame
  	}
        break;
  
@@ -158,24 +79,10 @@
      case DWARF2_FRAME_REG_UNSPECIFIED:
        /* GCC, in its infinite wisdom decided to not provide unwind
  	 information for registers that are "same value".  Since
-@@ -845,6 +926,13 @@ static const struct frame_unwind dwarf2_
-   dwarf2_frame_prev_register
- };
- 
-+static const struct frame_unwind dwarf2_signal_frame_unwind =
-+{
-+  SIGTRAMP_FRAME,
-+  dwarf2_frame_this_id,
-+  dwarf2_frame_prev_register
-+};
-+
- const struct frame_unwind *
- dwarf2_frame_sniffer (struct frame_info *next_frame)
- {
-Index: gdb-6.3/gdb/dwarf2-frame.h
+Index: gdb-6.5/gdb/dwarf2-frame.h
 ===================================================================
---- gdb-6.3.orig/gdb/dwarf2-frame.h	2006-03-07 01:45:13.000000000 -0300
-+++ gdb-6.3/gdb/dwarf2-frame.h	2006-03-07 01:45:13.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2-frame.h	2006-07-07 03:31:56.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.h	2006-07-07 03:32:04.000000000 -0300
 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule
       register.  */
    DWARF2_FRAME_REG_INDIRECT,
@@ -187,160 +94,3 @@
    /* These aren't defined by the DWARF2 CFI specification, but are
       used internally by GDB.  These should be superseeded by
       REG_INDIRECT.  */
-Index: gdb-6.3/include/elf/dwarf2.h
-===================================================================
---- gdb-6.3.orig/include/elf/dwarf2.h	2006-03-07 01:45:08.000000000 -0300
-+++ gdb-6.3/include/elf/dwarf2.h	2006-03-07 01:45:13.000000000 -0300
-@@ -1,7 +1,7 @@
--/* Declarations and definitions of codes relating to the DWARF2 symbolic
--   debugging information format.
-+/* Declarations and definitions of codes relating to the DWARF2 and
-+   DWARF3 symbolic debugging information formats.
-    Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
--   2003 Free Software Foundation, Inc.
-+   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- 
-    Written by Gary Funck (gary at intrepid.com) The Ada Joint Program
-    Office (AJPO), Florida State University and Silicon Graphics Inc.
-@@ -187,6 +187,8 @@ enum dwarf_tag
-     DW_TAG_unspecified_type = 0x3b,
-     DW_TAG_partial_unit = 0x3c,
-     DW_TAG_imported_unit = 0x3d,
-+    DW_TAG_condition = 0x3f,
-+    DW_TAG_shared_type = 0x40,
-     /* SGI/MIPS Extensions.  */
-     DW_TAG_MIPS_loop = 0x4081,
-     /* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */
-@@ -317,6 +319,21 @@ enum dwarf_attribute
-     DW_AT_call_column   = 0x57,
-     DW_AT_call_file     = 0x58,
-     DW_AT_call_line     = 0x59,
-+    DW_AT_description   = 0x5a,
-+    DW_AT_binary_scale  = 0x5b,
-+    DW_AT_decimal_scale = 0x5c,
-+    DW_AT_small         = 0x5d,
-+    DW_AT_decimal_sign  = 0x5e,
-+    DW_AT_digit_count   = 0x5f,
-+    DW_AT_picture_string = 0x60,
-+    DW_AT_mutable       = 0x61,
-+    DW_AT_threads_scaled = 0x62,
-+    DW_AT_explicit      = 0x63,
-+    DW_AT_object_pointer = 0x64,
-+    DW_AT_endianity     = 0x65,
-+    DW_AT_elemental     = 0x66,
-+    DW_AT_pure          = 0x67,
-+    DW_AT_recursive     = 0x68,
-     /* SGI/MIPS extensions.  */
-     DW_AT_MIPS_fde = 0x2001,
-     DW_AT_MIPS_loop_begin = 0x2002,
-@@ -518,6 +535,9 @@ enum dwarf_location_atom
-     DW_OP_call2 = 0x98,
-     DW_OP_call4 = 0x99,
-     DW_OP_call_ref = 0x9a,
-+    DW_OP_form_tls_address = 0x9b,
-+    DW_OP_call_frame_cfa = 0x9c,
-+    DW_OP_bit_piece = 0x9d,
-     /* GNU extensions.  */
-     DW_OP_GNU_push_tls_address = 0xe0,
-     /* HP extensions.  */
-@@ -547,6 +567,12 @@ enum dwarf_type
-     DW_ATE_unsigned_char = 0x8,
-     /* DWARF 3.  */
-     DW_ATE_imaginary_float = 0x9,
-+    DW_ATE_packed_decimal = 0xa,
-+    DW_ATE_numeric_string = 0xb,
-+    DW_ATE_edited = 0xc,
-+    DW_ATE_signed_fixed = 0xd,
-+    DW_ATE_unsigned_fixed = 0xe,
-+    DW_ATE_decimal_float = 0xf,
-     /* HP extensions.  */
-     DW_ATE_HP_float80            = 0x80, /* Floating-point (80 bit).  */
-     DW_ATE_HP_complex_float80    = 0x81, /* Complex floating-point (80 bit).  */
-@@ -560,6 +586,29 @@ enum dwarf_type
- #define	DW_ATE_lo_user 0x80
- #define	DW_ATE_hi_user 0xff
- 
-+/* Decimal sign encodings.  */
-+enum dwarf_decimal_sign_encoding
-+  {
-+    /* DWARF 3.  */
-+    DW_DS_unsigned = 0x01,
-+    DW_DS_leading_overpunch = 0x02,
-+    DW_DS_trailing_overpunch = 0x03,
-+    DW_DS_leading_separate = 0x04,
-+    DW_DS_trailing_separate = 0x05
-+  };
-+
-+/* Endianity encodings.  */
-+enum dwarf_endianity_encoding
-+  {
-+    /* DWARF 3.  */
-+    DW_END_default = 0x00,
-+    DW_END_big = 0x01,
-+    DW_END_little = 0x02
-+  };
-+
-+#define DW_END_lo_user 0x40
-+#define DW_END_hi_user 0xff
-+
- /* Array ordering names and codes.  */
- enum dwarf_array_dim_ordering
-   {
-@@ -666,6 +715,9 @@ enum dwarf_line_number_x_ops
-     DW_LNE_HP_define_proc              = 0x20
-   };
- 
-+#define DW_LNE_lo_user 0x80
-+#define DW_LNE_hi_user 0xff
-+
- /* Call frame information.  */
- enum dwarf_call_frame_info
-   {
-@@ -693,6 +745,9 @@ enum dwarf_call_frame_info
-     DW_CFA_offset_extended_sf = 0x11,
-     DW_CFA_def_cfa_sf = 0x12,
-     DW_CFA_def_cfa_offset_sf = 0x13,
-+    DW_CFA_val_offset = 0x14,
-+    DW_CFA_val_offset_sf = 0x15,
-+    DW_CFA_val_expression = 0x16,
-     /* SGI/MIPS specific.  */
-     DW_CFA_MIPS_advance_loc8 = 0x1d,
-     /* GNU extensions.  */
-@@ -726,11 +781,16 @@ enum dwarf_source_language
-     DW_LANG_Fortran90 = 0x0008,
-     DW_LANG_Pascal83 = 0x0009,
-     DW_LANG_Modula2 = 0x000a,
--    DW_LANG_Java = 0x000b,
-     /* DWARF 3.  */
-+    DW_LANG_Java = 0x000b,
-     DW_LANG_C99 = 0x000c,
-     DW_LANG_Ada95 = 0x000d,
-     DW_LANG_Fortran95 = 0x000e,
-+    DW_LANG_PLI = 0x000f,
-+    DW_LANG_ObjC = 0x0010,
-+    DW_LANG_ObjC_plus_plus = 0x0011,
-+    DW_LANG_UPC = 0x0012,
-+    DW_LANG_D = 0x0013,
-     /* MIPS.  */
-     DW_LANG_Mips_Assembler = 0x8001,
-     /* UPC.  */
-Index: gdb-6.3/gdb/valarith.c
-===================================================================
---- gdb-6.3.orig/gdb/valarith.c	2006-03-07 01:45:08.000000000 -0300
-+++ gdb-6.3/gdb/valarith.c	2006-03-07 01:45:13.000000000 -0300
-@@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct 
-          Use the signedness of the operand with the greater length.
-          If both operands are of equal length, use unsigned operation
-          if one of the operands is unsigned.  */
--      if (promoted_len1 > promoted_len2)
-+      if (op == BINOP_RSH || op == BINOP_LSH)
-+	{
-+	  /* In case of the shift operators the type of the result only
-+	     depends on the type of the left operand.  */
-+	  unsigned_operation = is_unsigned1;
-+	  result_len = promoted_len1;
-+	}
-+      else if (promoted_len1 > promoted_len2)
- 	{
- 	  unsigned_operation = is_unsigned1;
- 	  result_len = promoted_len1;

gdb-6.3-ctorline-20050120.patch:
 breakpoint.c        |  103 +++++++++++++++++++++++++++++++++----
 mi/mi-cmd-disas.c   |   11 +++-
 symtab.c            |  142 +++++++++++++++++++++++++++++++++++++++++++++++-----
 symtab.h            |    7 +-
 tui/tui-layout.c    |   12 ++--
 tui/tui-win.c       |   12 +++-
 tui/tui-winsource.c |   20 +++++--
 7 files changed, 270 insertions(+), 37 deletions(-)

Index: gdb-6.3-ctorline-20050120.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ctorline-20050120.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ctorline-20050120.patch	21 Jan 2005 00:20:17 -0000	1.1
+++ gdb-6.3-ctorline-20050120.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -21,41 +21,46 @@
 	* tui/tui-win.c (make_visible_with_new_height): Ditto.
 	* tui/tui-winsource.c (tui_update_source_windows_with_addr): Ditto.
 
---- gdb-6.3/gdb/mi/mi-cmd-disas.c.fix	Thu Jan 20 18:45:16 2005
-+++ gdb-6.3/gdb/mi/mi-cmd-disas.c	Thu Jan 20 19:08:00 2005
+Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
+===================================================================
+--- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-cmd-disas.c	2006-07-11 02:16:07.000000000 -0300
 @@ -1,5 +1,5 @@
  /* MI Command Set - disassemble commands.
--   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
-+   Copyright 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
++   Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
     Contributed by Cygnus Solutions (a Red Hat company).
  
     This file is part of GDB.
-@@ -145,11 +145,17 @@ mi_cmd_disassemble (char *command, char 
+@@ -145,11 +145,18 @@ mi_cmd_disassemble (char *command, char 
  
    if (line_seen && file_seen)
      {
 +      CORE_ADDR *pc_list;
 +      int num_pc_values;
++
        s = lookup_symtab (file_string);
        if (s == NULL)
- 	error ("mi_cmd_disassemble: Invalid filename.");
+ 	error (_("mi_cmd_disassemble: Invalid filename."));
 -      if (!find_line_pc (s, line_num, &start))
 +      if (!find_line_pc (s, line_num, &pc_list, &num_pc_values))
- 	error ("mi_cmd_disassemble: Invalid line number");
+ 	error (_("mi_cmd_disassemble: Invalid line number"));
 +      /* FIXME: What do we do with multiple pc values for ctors/dtors
 +                under mi?  */
 +      start = pc_list[0];
 +      xfree (pc_list);
        if (find_pc_partial_function (start, NULL, &low, &high) == 0)
- 	error ("mi_cmd_disassemble: No function contains specified address");
+ 	error (_("mi_cmd_disassemble: No function contains specified address"));
      }
---- gdb-6.3/gdb/tui/tui-layout.c.fix	Thu Jan 20 18:44:53 2005
-+++ gdb-6.3/gdb/tui/tui-layout.c	Thu Jan 20 19:08:16 2005
+Index: gdb-6.5/gdb/tui/tui-layout.c
+===================================================================
+--- gdb-6.5.orig/gdb/tui/tui-layout.c	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/tui/tui-layout.c	2006-07-11 02:16:07.000000000 -0300
 @@ -1,6 +1,6 @@
  /* TUI layout window management.
  
--   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
++   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
     Foundation, Inc.
  
     Contributed by Hewlett-Packard Company.
@@ -72,7 +77,7 @@
 @@ -520,8 +521,11 @@ extract_display_start_addr (void)
      case SRC_DATA_COMMAND:
        find_line_pc (cursal.symtab,
- 		    TUI_SRC_WIN->detail.source_info.start_line_or_addr.line_no,
+ 		    TUI_SRC_WIN->detail.source_info.start_line_or_addr.u.line_no,
 -		    &pc);
 -      addr = pc;
 +		    &pc_list, &num_pc_values);
@@ -83,44 +88,49 @@
        break;
      case DISASSEM_COMMAND:
      case SRC_DISASSEM_COMMAND:
---- gdb-6.3/gdb/tui/tui-win.c.fix	Thu Jan 20 18:44:58 2005
-+++ gdb-6.3/gdb/tui/tui-win.c	Thu Jan 20 19:08:24 2005
+Index: gdb-6.5/gdb/tui/tui-win.c
+===================================================================
+--- gdb-6.5.orig/gdb/tui/tui-win.c	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/tui/tui-win.c	2006-07-11 02:16:12.000000000 -0300
 @@ -1,6 +1,6 @@
  /* TUI window generic functions.
  
--   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-    Foundation, Inc.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
++   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
  
     Contributed by Hewlett-Packard Company.
-@@ -1313,7 +1313,15 @@ make_visible_with_new_height (struct tui
- 	    line.line_no = cursal.line;
+@@ -1342,8 +1342,16 @@ make_visible_with_new_height (struct tui
+ 	    }
  	  else
  	    {
--	      find_line_pc (s, cursal.line, &line.addr);
 +              CORE_ADDR *pc_list;
 +              int num_pc_values;
+ 	      line.loa = LOA_ADDRESS;
+-	      find_line_pc (s, cursal.line, &line.u.addr);
 +	      if (find_line_pc (s, cursal.line, &pc_list, &num_pc_values))
 +                {
 +                  /* FIXME: What do we do with multiple pc values for
 +                            ctors/dtors and inlined functions?  */
-+                  line.addr = pc_list[0];
++                  line.u.addr = pc_list[0];
 +                  xfree (pc_list);
 +                }
  	    }
  	  tui_update_source_window (win_info, s, line, TRUE);
  	}
---- gdb-6.3/gdb/tui/tui-winsource.c.fix	Thu Jan 20 18:45:04 2005
-+++ gdb-6.3/gdb/tui/tui-winsource.c	Thu Jan 20 19:08:34 2005
+Index: gdb-6.5/gdb/tui/tui-winsource.c
+===================================================================
+--- gdb-6.5.orig/gdb/tui/tui-winsource.c	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/tui/tui-winsource.c	2006-07-11 01:39:20.000000000 -0300
 @@ -1,6 +1,6 @@
  /* TUI display source/assembly window.
  
--   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-    Foundation, Inc.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
++   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
  
     Contributed by Hewlett-Packard Company.
-@@ -171,14 +171,21 @@ tui_update_source_windows_with_addr (COR
+@@ -173,14 +173,21 @@ tui_update_source_windows_with_addr (COR
  void
  tui_update_source_windows_with_line (struct symtab *s, int line)
  {
@@ -128,7 +138,7 @@
 +  CORE_ADDR pc = 0;
 +  CORE_ADDR *pc_list;
 +  int num_pc_values;
-   union tui_line_or_address l;
+   struct tui_line_or_address l;
    
    switch (tui_current_layout ())
      {
@@ -144,7 +154,7 @@
        tui_update_source_windows_with_addr (pc);
        break;
      default:
-@@ -186,7 +193,12 @@ tui_update_source_windows_with_line (str
+@@ -189,7 +196,12 @@ tui_update_source_windows_with_line (str
        tui_show_symtab_source (s, l, FALSE);
        if (tui_current_layout () == SRC_DISASSEM_COMMAND)
  	{
@@ -158,18 +168,20 @@
  	  tui_show_disassem (pc);
  	}
        break;
---- gdb-6.3/gdb/symtab.c.fix	Thu Jan 20 18:44:33 2005
-+++ gdb-6.3/gdb/symtab.c	Thu Jan 20 19:07:26 2005
+Index: gdb-6.5/gdb/symtab.c
+===================================================================
+--- gdb-6.5.orig/gdb/symtab.c	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/symtab.c	2006-07-11 02:16:05.000000000 -0300
 @@ -1,7 +1,7 @@
  /* Symbol table lookup for the GNU debugger, GDB.
  
-    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+    Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 -   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 +   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
     Free Software Foundation, Inc.
  
     This file is part of GDB.
-@@ -72,7 +72,9 @@ static void sources_info (char *, int);
+@@ -73,7 +73,9 @@ static void sources_info (char *, int);
  
  static void output_source_filename (const char *, int *);
  
@@ -180,7 +192,7 @@
  
  /* This one is used by linespec.c */
  
-@@ -2230,6 +2232,9 @@ find_pc_line (CORE_ADDR pc, int notcurre
+@@ -2233,6 +2235,9 @@ find_pc_line (CORE_ADDR pc, int notcurre
  /* Find line number LINE in any symtab whose name is the same as
     SYMTAB.
  
@@ -190,7 +202,7 @@
     If found, return the symtab that contains the linetable in which it was
     found, set *INDEX to the index in the linetable of the best entry
     found, and set *EXACT_MATCH nonzero if the value returned is an
-@@ -2246,13 +2251,19 @@ find_line_symtab (struct symtab *symtab,
+@@ -2249,13 +2254,19 @@ find_line_symtab (struct symtab *symtab,
       so far seen.  */
  
    int best_index;
@@ -211,7 +223,7 @@
    if (best_index < 0 || !exact)
      {
        /* Didn't find an exact match.  So we better keep looking for
-@@ -2283,7 +2294,7 @@ find_line_symtab (struct symtab *symtab,
+@@ -2286,7 +2297,7 @@ find_line_symtab (struct symtab *symtab,
  	if (strcmp (symtab->filename, s->filename) != 0)
  	  continue;
  	l = LINETABLE (s);
@@ -220,7 +232,7 @@
  	if (ind >= 0)
  	  {
  	    if (exact)
-@@ -2319,13 +2330,23 @@ done:
+@@ -2322,13 +2333,23 @@ done:
     Returns zero for invalid line number (and sets the PC to 0).
     The source file is specified with a struct symtab.  */
  
@@ -247,7 +259,7 @@
    if (symtab == 0)
      return 0;
  
-@@ -2333,7 +2354,50 @@ find_line_pc (struct symtab *symtab, int
+@@ -2336,7 +2357,50 @@ find_line_pc (struct symtab *symtab, int
    if (symtab != NULL)
      {
        l = LINETABLE (symtab);
@@ -299,7 +311,7 @@
        return 1;
      }
    else
-@@ -2351,12 +2415,22 @@ find_line_pc_range (struct symtab_and_li
+@@ -2354,12 +2418,22 @@ find_line_pc_range (struct symtab_and_li
  		    CORE_ADDR *endptr)
  {
    CORE_ADDR startaddr;
@@ -323,7 +335,7 @@
    /* This whole function is based on address.  For example, if line 10 has
       two parts, one from 0x100 to 0x200 and one from 0x300 to 0x400, then
       "info line *0x123" should say the line goes from 0x100 to 0x200
-@@ -2386,7 +2460,7 @@ find_line_pc_range (struct symtab_and_li
+@@ -2389,7 +2463,7 @@ find_line_pc_range (struct symtab_and_li
     Set *EXACT_MATCH nonzero if the value returned is an exact match.  */
  
  static int
@@ -332,7 +344,7 @@
  		  int *exact_match)
  {
    int i;
-@@ -2405,7 +2479,7 @@ find_line_common (struct linetable *l, i
+@@ -2408,7 +2482,7 @@ find_line_common (struct linetable *l, i
      return -1;
  
    len = l->nitems;
@@ -341,7 +353,7 @@
      {
        struct linetable_entry *item = &(l->item[i]);
  
-@@ -2429,6 +2503,52 @@ find_line_common (struct linetable *l, i
+@@ -2432,6 +2506,52 @@ find_line_common (struct linetable *l, i
    return best_index;
  }
  
@@ -394,12 +406,14 @@
  int
  find_pc_line_pc_range (CORE_ADDR pc, CORE_ADDR *startptr, CORE_ADDR *endptr)
  {
---- gdb-6.3/gdb/symtab.h.fix	Thu Jan 20 18:44:38 2005
-+++ gdb-6.3/gdb/symtab.h	Thu Jan 20 19:07:41 2005
+Index: gdb-6.5/gdb/symtab.h
+===================================================================
+--- gdb-6.5.orig/gdb/symtab.h	2006-07-11 01:30:43.000000000 -0300
++++ gdb-6.5/gdb/symtab.h	2006-07-11 01:39:20.000000000 -0300
 @@ -1,7 +1,7 @@
  /* Symbol table definitions for GDB.
  
-    Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+    Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
 -   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
 +   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
     Foundation, Inc.
@@ -423,18 +437,11 @@
  /* Given a string, return the line specified by it.  For commands like "list"
     and "breakpoint".  */
  
---- gdb-6.3/gdb/breakpoint.c.fix	Thu Jan 20 18:44:42 2005
-+++ gdb-6.3/gdb/breakpoint.c	Thu Jan 20 19:07:48 2005
-@@ -1,7 +1,7 @@
- /* Everything about breakpoints, for GDB.
- 
-    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
--   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-    Free Software Foundation, Inc.
- 
-    This file is part of GDB.
-@@ -5231,10 +5231,40 @@ static void
+Index: gdb-6.5/gdb/breakpoint.c
+===================================================================
+--- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 01:30:53.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.c	2006-07-11 01:39:20.000000000 -0300
+@@ -5268,10 +5268,40 @@ static void
  breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
  		       char *address)
  {    
@@ -479,7 +486,7 @@
  
        /* It's possible for the PC to be nonzero, but still an illegal
           value on some targets.
-@@ -5364,6 +5394,10 @@ break_command_1 (char *arg, int flag, in
+@@ -5406,6 +5436,10 @@ break_command_1 (char *arg, int flag, in
  
    if (!pending)
      {
@@ -490,7 +497,7 @@
        /* Make sure that all storage allocated to SALS gets freed.  */
        make_cleanup (xfree, sals.sals);
        
-@@ -5394,11 +5428,6 @@ break_command_1 (char *arg, int flag, in
+@@ -5436,11 +5470,6 @@ break_command_1 (char *arg, int flag, in
  	make_cleanup (xfree, addr_string[i]);
      }
  
@@ -502,7 +509,7 @@
    /* Verify that condition can be parsed, before setting any
       breakpoints.  Allocate a separate condition expression for each
       breakpoint. */
-@@ -5629,14 +5658,16 @@ gdb_breakpoint (char *address, char *con
+@@ -5670,14 +5699,16 @@ gdb_breakpoint (char *address, char *con
  void
  resolve_sal_pc (struct symtab_and_line *sal)
  {
@@ -514,7 +521,7 @@
      {
 -      if (!find_line_pc (sal->symtab, sal->line, &pc))
 +      if (!find_line_pc (sal->symtab, sal->line, &pc_list, &num_pc_values))
- 	error ("No line %d in file \"%s\".",
+ 	error (_("No line %d in file \"%s\"."),
  	       sal->line, sal->symtab->filename);
 -      sal->pc = pc;
 +      sal->pc = pc_list[0];
@@ -522,7 +529,7 @@
      }
  
    if (sal->section == 0 && sal->symtab != NULL)
-@@ -5673,6 +5704,54 @@ resolve_sal_pc (struct symtab_and_line *
+@@ -5714,6 +5745,54 @@ resolve_sal_pc (struct symtab_and_line *
      }
  }
  

gdb-6.3-dtorfix-20050121.patch:
 linespec.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

Index: gdb-6.3-dtorfix-20050121.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-dtorfix-20050121.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-dtorfix-20050121.patch	4 Feb 2005 21:01:48 -0000	1.2
+++ gdb-6.3-dtorfix-20050121.patch	11 Jul 2006 06:33:02 -0000	1.3
@@ -4,9 +4,11 @@
 	destructors as this will be handled in find_methods.
 	(find_methods): Fix ctor check to also check for dtor.
 
---- gdb-6.3/gdb/linespec.c.fix	Fri Jan 21 17:03:18 2005
-+++ gdb-6.3/gdb/linespec.c	Fri Jan 21 17:04:39 2005
-@@ -375,12 +375,14 @@ add_matching_methods (int method_counter
+Index: gdb-6.5/gdb/linespec.c
+===================================================================
+--- gdb-6.5.orig/gdb/linespec.c	2006-07-07 01:04:56.000000000 -0300
++++ gdb-6.5/gdb/linespec.c	2006-07-07 02:05:35.000000000 -0300
+@@ -377,12 +377,14 @@ add_matching_methods (int method_counter
  
        /* Check for special case of looking for member that
  	 doesn't have a mangled name provided.  This will happen
@@ -15,16 +17,16 @@
  	 Since we don't have a mangled name to work with, if we
 -	 look for the symbol, we can only find the class itself.
 +	 look for the symbol, we can at best find the class itself.
- 	 We can find the information we need in the minimal symbol 
+ 	 We can find the information we need in the minimal symbol
  	 table which has the full member name information we need.  */
 -      if (strlen (phys_name) <= strlen (class_name))
-+      if (strlen (phys_name) <= strlen (class_name)
-+          || (strlen (phys_name) == strlen (class_name) + 1
-+              && phys_name[0] == '~'))
++     if (strlen (phys_name) <= strlen (class_name)
++         || (strlen (phys_name) == strlen (class_name) + 1
++             && phys_name[0] == '~'))
  	return add_minsym_members (class_name, phys_name, msym_arr);
  		
        /* Destructor is handled by caller, don't add it to
-@@ -1707,6 +1709,11 @@ collect_methods (char *copy, struct type
+@@ -1709,6 +1711,11 @@ collect_methods (char *copy, struct type
  {
    int i1 = 0;	/*  Counter for the symbol array.  */
  
@@ -36,7 +38,7 @@
    if (destructor_name_p (copy, t))
      {
        /* Destructors are a special case.  */
-@@ -1725,6 +1732,7 @@ collect_methods (char *copy, struct type
+@@ -1727,6 +1734,7 @@ collect_methods (char *copy, struct type
  	}
      }
    else

gdb-6.3-gcore-thread-20050204.patch:
 linux-nat.c |    5 +++++
 1 files changed, 5 insertions(+)

Index: gdb-6.3-gcore-thread-20050204.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-gcore-thread-20050204.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-gcore-thread-20050204.patch	8 Feb 2005 21:02:35 -0000	1.3
+++ gdb-6.3-gcore-thread-20050204.patch	11 Jul 2006 06:33:02 -0000	1.4
@@ -3,28 +3,23 @@
         * linux-nat.c (linux_nat_xfer_memory): Don't use
         linux_proc_xfer_memory for ia64.
 
---- gdb-6.3/gdb/linux-nat.c.fix	Fri Feb  4 22:52:40 2005
-+++ gdb-6.3/gdb/linux-nat.c	Tue Feb  8 15:49:09 2005
-@@ -2381,12 +2381,22 @@ linux_nat_xfer_memory (CORE_ADDR memaddr
-   struct cleanup *old_chain = save_inferior_ptid ();
-   int xfer;
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 00:57:56.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-07 02:24:51.000000000 -0300
+@@ -3152,10 +3152,15 @@ linux_xfer_partial (struct target_ops *o
+     return procfs_xfer_auxv (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);
  
-+#ifdef NATIVE_XFER_UNWIND_TABLE
++#ifndef NATIVE_XFER_UNWIND_TABLE
 +  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory
 +            for accessing thread storage.  Revert when Bugzilla 147436
 +	    is fixed.  */
-+  if (is_lwp (inferior_ptid))
-+    inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid));
-+
-+  xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-+#else
-   if (is_lwp (inferior_ptid))
-     inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid));
- 
-   xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-   if (xfer == 0)
-     xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target);
+   xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 				  offset, len);
+   if (xfer != 0)
+     return xfer;
 +#endif
  
-   do_cleanups (old_chain);
-   return xfer;
+   return super_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);

gdb-6.3-ia64-corefile-fix-20050127.patch:
 ia64-tdep.c |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: gdb-6.3-ia64-corefile-fix-20050127.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-corefile-fix-20050127.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-corefile-fix-20050127.patch	27 Jan 2005 19:51:15 -0000	1.1
+++ gdb-6.3-ia64-corefile-fix-20050127.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -4,20 +4,23 @@
 	unwind table syscall to support backtracing from syscalls in
 	a corefile.
 
---- gdb-6.3/gdb/ia64-tdep.c.fix	Thu Jan 27 12:03:40 2005
-+++ gdb-6.3/gdb/ia64-tdep.c	Thu Jan 27 12:06:23 2005
-@@ -2357,8 +2357,14 @@ static int
- getunwind_table (void *buf, size_t len)
- {
-   LONGEST x;
--  x = target_read_partial (&current_target, TARGET_OBJECT_UNWIND_TABLE, NULL,
--			   buf, 0, len);
-+
+Index: gdb-6.5/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.5.orig/gdb/ia64-tdep.c	2006-04-18 16:20:06.000000000 -0300
++++ gdb-6.5/gdb/ia64-tdep.c	2006-07-07 02:18:40.000000000 -0300
+@@ -2470,8 +2470,17 @@ getunwind_table (void *buf, size_t len)
+      we want to preserve fall back to the running kernel's table, then
+      we should find a way to override the corefile layer's
+      xfer_partial method.  */
++#if 0
+   x = target_read_partial (&current_target, TARGET_OBJECT_UNWIND_TABLE, NULL,
+ 			   buf, 0, len);
++#endif
 +  /* FIXME: This is a temporary solution to backtracing syscalls in corefiles.
 +            To do this properly, the AUXV section should be used.  This
 +	    fix will work as long as the kernel used to generate the corefile
 +	    is equivalent to the kernel used to debug the corefile.  */
-+  x = ia64_linux_xfer_unwind_table (&current_target, 
++  x = ia64_linux_xfer_unwind_table (&current_target,
 +		  		    TARGET_OBJECT_UNWIND_TABLE, NULL,
 +			   	    buf, NULL, 0, len);
  

gdb-6.3-ia64-gcore-page0-20050421.patch:
 gcore.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: gdb-6.3-ia64-gcore-page0-20050421.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-gcore-page0-20050421.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-gcore-page0-20050421.patch	21 Apr 2005 20:10:16 -0000	1.1
+++ gdb-6.3-ia64-gcore-page0-20050421.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,7 +1,9 @@
---- gdb-6.3/gdb/gcore.c.fix	2005-04-21 15:13:23.000000000 -0400
-+++ gdb-6.3/gdb/gcore.c	2005-04-21 15:16:48.000000000 -0400
+Index: gdb-6.5/gdb/gcore.c
+===================================================================
+--- gdb-6.5.orig/gdb/gcore.c	2005-12-17 20:33:59.000000000 -0200
++++ gdb-6.5/gdb/gcore.c	2006-07-07 02:41:33.000000000 -0300
 @@ -462,8 +462,13 @@ gcore_copy_callback (bfd *obfd, asection
-     error ("Not enough memory to create corefile.");
+     error (_("Not enough memory to create corefile."));
    old_chain = make_cleanup (xfree, memhunk);
  
 +  /* Warn if read error occurs except if we were trying to read the
@@ -12,6 +14,6 @@
 +			  memhunk, size) != 0
 +      && (strcmp (TARGET_ARCHITECTURE->arch_name, "ia64")
 +          || bfd_section_vma (obfd, osec) != 0))
-     warning ("Memory read failed for corefile section, %s bytes at 0x%s\n",
+     warning (_("Memory read failed for corefile section, %s bytes at 0x%s."),
  	     paddr_d (size), paddr (bfd_section_vma (obfd, osec)));
    if (!bfd_set_section_contents (obfd, osec, memhunk, 0, size))

gdb-6.3-ia64-gcore-speedup-20050714.patch:
 ia64-linux-nat.c |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 linux-nat.c      |   33 +++++++++++++++++++++++++------
 2 files changed, 85 insertions(+), 6 deletions(-)

Index: gdb-6.3-ia64-gcore-speedup-20050714.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-gcore-speedup-20050714.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-gcore-speedup-20050714.patch	15 Jul 2005 00:48:56 -0000	1.1
+++ gdb-6.3-ia64-gcore-speedup-20050714.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -7,58 +7,68 @@
 	(ia64_rse_skip_regs): Ditto.
 	(ia64_linux_check_stack_region): New function.
 	
---- gdb-6.3/gdb/linux-nat.c.fix	2005-07-14 17:53:13.000000000 -0400
-+++ gdb-6.3/gdb/linux-nat.c	2005-07-14 19:31:00.000000000 -0400
-@@ -2438,7 +2438,9 @@ linux_nat_mourn_inferior (void)
- 
-   deprecated_child_ops.to_mourn_inferior ();
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 02:29:12.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-07 03:03:55.000000000 -0300
+@@ -2473,7 +2473,9 @@ linux_nat_xfer_partial (struct target_op
+   do_cleanups (old_chain);
+   return xfer;
  }
 -
 +#ifdef NATIVE_XFER_UNWIND_TABLE
 +extern int ia64_linux_check_stack_region(struct lwp_info *lwp, void *range);
 +#endif
  static int
- linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
- 		     struct mem_attrib *attrib, struct target_ops *target)
-@@ -2446,14 +2448,29 @@ linux_nat_xfer_memory (CORE_ADDR memaddr
-   struct cleanup *old_chain = save_inferior_ptid ();
-   int xfer;
+ linux_nat_thread_alive (ptid_t ptid)
+ {
+@@ -3214,15 +3216,34 @@ linux_xfer_partial (struct target_ops *o
+     return procfs_xfer_auxv (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);
  
--#ifdef NATIVE_XFER_UNWIND_TABLE
+-#ifndef NATIVE_XFER_UNWIND_TABLE
 -  /* FIXME: For ia64, we cannot currently use linux_proc_xfer_memory
 -            for accessing thread storage.  Revert when Bugzilla 147436
+-	    is fixed.  */
+   xfer = linux_proc_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 				  offset, len);
+   if (xfer != 0)
+-    return xfer;
++    {
 +#ifdef NATIVE_XFER_UNWIND_TABLE
-+  struct mem_region range;
-+  range.lo = memaddr;
-+  range.hi = memaddr + len;
-+
-+  /* FIXME: For ia64, we cannot currently trust linux_proc_xfer_memory
-+            for accessing rse register storage.  Revert when Bugzilla 147436
- 	    is fixed.  */
-   if (is_lwp (inferior_ptid))
-     inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid));
- 
--  xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-+  xfer = linux_proc_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-+  if (xfer == 0)
-+    xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-+  else if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) 
-+    { /* This region contains ia64 rse registers, we have to re-read.  */
-+      int xxfer;
-+      /* Re-read register stack area.  */
-+      xxfer = child_xfer_memory (range.lo, myaddr + (range.lo - memaddr),
-+                                 range.hi - range.lo, write, attrib, target);
-+      if (xxfer == 0)
-+        xfer = 0;
++      struct mem_region range;
++      range.lo = memaddr;
++      range.hi = memaddr + len;
++
++      /* FIXME: For ia64, we cannot currently use
++	 linux_proc_xfer_partial for accessing rse register storage.
++	 Revert when Bugzilla 147436 is fixed.  */
++      if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL)
++	{ /* This region contains ia64 rse registers, we have to re-read.  */
++	  int xxfer;
++
++	  /* Re-read register stack area.  */
++	  xxfer = super_xfer_partial (ops, object, annex,
++				      readbuf + (range.lo - memaddr),
++				      writebuf + (range.lo - memaddr),
++				      offset + (range.lo - memaddr),
++				      range.hi - range.lo);
++	  if (xxfer == 0)
++	    xfer = 0;
++	}
+ #endif
++      return xfer;
 +    }
- #else
-   if (is_lwp (inferior_ptid))
-     inferior_ptid = pid_to_ptid (GET_LWP (inferior_ptid));
---- gdb-6.3/gdb/ia64-linux-nat.c.fix	2005-07-14 17:54:43.000000000 -0400
-+++ gdb-6.3/gdb/ia64-linux-nat.c	2005-07-14 17:55:19.000000000 -0400
-@@ -784,6 +784,64 @@ ia64_linux_save_sigtrap_info (void *queu
-           lp->saved_trap_data);
- }
+ 
+   return super_xfer_partial (ops, object, annex, readbuf, writebuf,
+ 			     offset, len);
+Index: gdb-6.5/gdb/ia64-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-03-24 20:08:16.000000000 -0300
++++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-07 02:52:25.000000000 -0300
+@@ -687,6 +687,64 @@ ia64_linux_xfer_partial (struct target_o
+ 
+ void _initialize_ia64_linux_nat (void);
  
 +/*
 + * Note: taken from ia64_tdep.c

gdb-6.3-ia64-sigill-20051115.patch:
 linux-nat.c                        |    7 +++-
 linux-thread-db.c                  |    3 +
 testsuite/gdb.arch/ia64-sigill.c   |    8 +++++
 testsuite/gdb.arch/ia64-sigill.exp |   59 +++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 3 deletions(-)

Index: gdb-6.3-ia64-sigill-20051115.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-sigill-20051115.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-sigill-20051115.patch	16 Nov 2005 19:19:42 -0000	1.1
+++ gdb-6.3-ia64-sigill-20051115.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,6 +1,6 @@
 2005-11-15  Jeff Johnston  <jjohnstn at redhat.com>
 
-	* thread-db.c (thread_db_wait): Don't bother continuing if
+	* linux-thread-db.c (thread_db_wait): Don't bother continuing if
 	the wait result indicates the program terminated with a signal.
 	* linux-nat.c (linux_nat_wait): For SIGILL and SIGTRAP, don't
 	throw away the event if the user has specified nostop noprint.
@@ -12,8 +12,10 @@
 	* gdb.arch/ia64-sigill.c: New test.
 	* gdb.arch/ia64-sigill.exp: Ditto.
 
---- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.exp.fix	2005-11-15 17:52:56.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.exp	2005-11-15 17:52:10.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp	2006-07-07 03:16:54.000000000 -0300
 @@ -0,0 +1,59 @@
 +#   Copyright 2005 Free Software Foundation, Inc.
 +
@@ -74,8 +76,10 @@
 +gdb_test "handle SIGILL nostop noprint" "SIGILL.*No.*No.*Yes.*" "handle sigill"
 +gdb_test "run" "Starting program.*ia64-sigill.*\[New thread.*\].*hello world.*Program exited normally." "run to exit"
 + 
---- gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.c.fix	2005-11-15 17:53:02.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.arch/ia64-sigill.c	2005-11-15 17:52:05.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c	2006-07-07 03:16:54.000000000 -0300
 @@ -0,0 +1,8 @@
 +#include <stdio.h>
 +
@@ -85,9 +89,11 @@
 +  return 0;
 +}
 +
---- gdb-6.3/gdb/thread-db.c.fix	2005-11-15 17:51:09.000000000 -0500
-+++ gdb-6.3/gdb/thread-db.c	2005-11-15 17:51:50.000000000 -0500
-@@ -930,7 +930,8 @@ thread_db_wait (ptid_t ptid, struct targ
+Index: gdb-6.5/gdb/linux-thread-db.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-07 01:06:36.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-07-07 03:16:54.000000000 -0300
+@@ -926,7 +926,8 @@ thread_db_wait (ptid_t ptid, struct targ
         post-processing and bail out early.  */
      return ptid;
  
@@ -97,9 +103,11 @@
      return pid_to_ptid (-1);
  
    if (ourstatus->kind == TARGET_WAITKIND_STOPPED
---- gdb-6.3/gdb/linux-nat.c.fix	2005-11-15 17:51:14.000000000 -0500
-+++ gdb-6.3/gdb/linux-nat.c	2005-11-15 17:51:46.000000000 -0500
-@@ -2216,7 +2216,8 @@ retry:
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 03:03:55.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-07 03:16:54.000000000 -0300
+@@ -2209,7 +2209,8 @@ retry:
       threads can be a bit time-consuming so if we want decent
       performance with heavily multi-threaded programs, especially when
       they're using a high frequency timer, we'd better avoid it if we
@@ -109,9 +117,9 @@
  
    if (WIFSTOPPED (status))
      {
-@@ -2224,7 +2225,9 @@ retry:
- 
-       if (signal_stop_state (signo) == 0
+@@ -2220,7 +2221,9 @@ retry:
+       if (!lp->step
+ 	  && signal_stop_state (signo) == 0
  	  && signal_print_state (signo) == 0
 -	  && signal_pass_state (signo) == 1)
 +	  && signal_pass_state (signo) == 1

gdb-6.3-ia64-sigtramp-fp-20050926.patch:
 ia64-tdep.c       |   12 +++++++++---
 libunwind-frame.c |   47 +++++++++++++++++++++++++++++++++++++++++++----
 libunwind-frame.h |    3 +++
 3 files changed, 55 insertions(+), 7 deletions(-)

Index: gdb-6.3-ia64-sigtramp-fp-20050926.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-sigtramp-fp-20050926.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-sigtramp-fp-20050926.patch	27 Sep 2005 16:07:52 -0000	1.1
+++ gdb-6.3-ia64-sigtramp-fp-20050926.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -12,8 +12,10 @@
 	the base address using the current stack pointer plus a fixed
 	offset.
 	
---- gdb-6.3/gdb/libunwind-frame.c.fix	2005-09-26 14:45:45.000000000 -0400
-+++ gdb-6.3/gdb/libunwind-frame.c	2005-09-26 14:46:27.000000000 -0400
+Index: gdb-6.5/gdb/libunwind-frame.c
+===================================================================
+--- gdb-6.5.orig/gdb/libunwind-frame.c	2006-07-07 03:04:32.000000000 -0300
++++ gdb-6.5/gdb/libunwind-frame.c	2006-07-07 03:07:33.000000000 -0300
 @@ -62,6 +62,7 @@ static unw_word_t (*unw_find_dyn_list_p)
  struct libunwind_frame_cache
  {
@@ -56,7 +58,7 @@
 -  uw_sp_regnum = descr->gdb2uw (SP_REGNUM);
    ret = unw_get_reg_p (&cache->cursor, uw_sp_regnum, &fp);
    if (ret < 0)
-     error ("Can't get libunwind sp register.");
+     error (_("Can't get libunwind sp register."));
  
 +  cache->sp = (CORE_ADDR)sp;
    cache->base = (CORE_ADDR)fp;
@@ -103,8 +105,10 @@
  
    return NULL;
  }
---- gdb-6.3/gdb/libunwind-frame.h.fix	2005-09-26 14:45:57.000000000 -0400
-+++ gdb-6.3/gdb/libunwind-frame.h	2005-09-26 14:46:30.000000000 -0400
+Index: gdb-6.5/gdb/libunwind-frame.h
+===================================================================
+--- gdb-6.5.orig/gdb/libunwind-frame.h	2006-07-07 02:51:32.000000000 -0300
++++ gdb-6.5/gdb/libunwind-frame.h	2006-07-07 03:05:49.000000000 -0300
 @@ -49,6 +49,9 @@ void libunwind_frame_set_descr (struct g
  
  void libunwind_frame_this_id (struct frame_info *next_frame, void **this_cache,
@@ -115,9 +119,11 @@
  void libunwind_frame_prev_register (struct frame_info *next_frame, void **this_cache,
  				    int regnum, int *optimizedp,
  				    enum lval_type *lvalp, CORE_ADDR *addrp,
---- gdb-6.3/gdb/ia64-tdep.c.fix	2005-09-26 14:46:04.000000000 -0400
-+++ gdb-6.3/gdb/ia64-tdep.c	2005-09-26 14:46:22.000000000 -0400
-@@ -3035,7 +3035,7 @@ ia64_libunwind_sigtramp_frame_this_id (s
+Index: gdb-6.5/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.5.orig/gdb/ia64-tdep.c	2006-07-07 02:51:32.000000000 -0300
++++ gdb-6.5/gdb/ia64-tdep.c	2006-07-07 03:05:49.000000000 -0300
+@@ -3031,7 +3031,7 @@ ia64_libunwind_sigtramp_frame_this_id (s
    struct frame_id id;
    CORE_ADDR prev_ip;
  
@@ -126,7 +132,7 @@
    if (frame_id_eq (id, null_frame_id))
      {
        (*this_id) = null_frame_id;
-@@ -3047,8 +3047,14 @@ ia64_libunwind_sigtramp_frame_this_id (s
+@@ -3043,8 +3043,14 @@ ia64_libunwind_sigtramp_frame_this_id (s
    frame_unwind_register (next_frame, IA64_BSP_REGNUM, buf);
    bsp = extract_unsigned_integer (buf, 8);
  

gdb-6.3-ia64-vsyscall-20050330.patch:
 elfcode.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: gdb-6.3-ia64-vsyscall-20050330.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-vsyscall-20050330.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ia64-vsyscall-20050330.patch	30 Mar 2005 23:40:51 -0000	1.1
+++ gdb-6.3-ia64-vsyscall-20050330.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,64 +1,13 @@
 2005-03-30  Jeff Johnston  <jjohnstn at redhat.com>
 
-	* gdb/ia64-tdep.c (ia64_find_unwind_table): Change code to
-	allow for idiosyncrasies of ia64 vsyscall page.
-	* bfd/elfcode.h: Ditto.
+	* bfd/elfcode.h: Change code to allow for idiosyncrasies of
+	ia64 vsyscall page.
 
---- gdb-6.3/gdb/ia64-tdep.c.fix	2005-03-30 13:34:00.000000000 -0500
-+++ gdb-6.3/gdb/ia64-tdep.c	2005-03-30 13:36:45.000000000 -0500
-@@ -2449,16 +2449,35 @@ ia64_find_unwind_table (struct objfile *
- 	}
-     }
- 
--  if (!p_text || !p_unwind
--      /* Verify that the segment that contains the IP also contains
--	 the static unwind table.  If not, we are dealing with
--	 runtime-generated code, for which we have no info here.  */
--      || (p_unwind->p_vaddr - p_text->p_vaddr) >= p_text->p_memsz)
-+  if (!p_text || !p_unwind)
-     return -UNW_ENOINFO;
- 
-+  /* Verify that the segment that contains the IP also contains
-+     the static unwind table.  If not, we may be in the Linux kernel's
-+     DSO gate page in which case the unwind table is another segment. 
-+     Otherwise, we are dealing with runtime-generated code, for which we 
-+     have no info here.  */
-   segbase = p_text->p_vaddr + load_base;
- 
--  dip->start_ip = segbase;
-+  if ((p_unwind->p_vaddr - p_text->p_vaddr) >= p_text->p_memsz)
-+    {
-+      int ok = 0;
-+      for (i = 0; i < ehdr->e_phnum; ++i)
-+        {
-+          if (phdr[i].p_type == PT_LOAD
-+	      && (p_unwind->p_vaddr - phdr[i].p_vaddr) < phdr[i].p_memsz)
-+	    {
-+              ok = 1;
-+	      /* Get the segbase from the section containing the
-+		 libunwind table.  */
-+	      segbase = phdr[i].p_vaddr + load_base;
-+	    }
-+	}
-+      if (!ok)
-+        return -UNW_ENOINFO;
-+    }
-+
-+  dip->start_ip = p_text->p_vaddr + load_base;
-   dip->end_ip = dip->start_ip + p_text->p_memsz;
-   dip->gp = FIND_GLOBAL_POINTER (ip);
-   dip->format = UNW_INFO_FORMAT_REMOTE_TABLE;
---- gdb-6.3/bfd/elfcode.h.fix	2005-03-30 13:34:53.000000000 -0500
-+++ gdb-6.3/bfd/elfcode.h	2005-03-30 13:37:48.000000000 -0500
-@@ -1,6 +1,6 @@
- /* ELF executable support for BFD.
-    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-    Written by Fred Fish @ Cygnus Support, from information published
-    in "UNIX System V Release 4, Programmers Guide: ANSI C and
-@@ -1619,7 +1619,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
+Index: gdb-6.5/bfd/elfcode.h
+===================================================================
+--- gdb-6.5.orig/bfd/elfcode.h	2006-05-11 05:57:08.000000000 -0300
++++ gdb-6.5/bfd/elfcode.h	2006-07-07 02:36:03.000000000 -0300
+@@ -1625,7 +1625,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
  	  if (segment_end > (bfd_vma) contents_size)
  	    contents_size = segment_end;
  

gdb-6.3-inferior-notification-20050721.patch:
 attach-32.c   |   20 ++++
 attach-32.exp |  247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 attach-32b.c  |   24 +++++
 3 files changed, 291 insertions(+)

Index: gdb-6.3-inferior-notification-20050721.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-inferior-notification-20050721.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-inferior-notification-20050721.patch	23 Jul 2005 01:41:19 -0000	1.1
+++ gdb-6.3-inferior-notification-20050721.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,11 +1,3 @@
-2004-11-07  Andrew Cagney  <cagney at redhat.com>
-            Daniel Jacobowitz  <dan at debian.org>
-            Roland McGrath  <roland at redhat.com>
-
-        * inftarg.c (child_attach): Notify any observers of
-        inferior creation.
-        * inf-ptrace.c (inf_ptrace_attach): Ditto.
-
 2005-07-21  Jeff Johnston  <jjohnstn at redhat.com>
 
         * gdb.base/attach-32.exp: New test for attaching in 32-bit
@@ -13,19 +5,6 @@
         * gdb.base/attach-32.c: Ditto.
         * gdb.base/attach-32b.c: Ditto.
 
---- gdb-6.3/gdb/inftarg.c.fix3	2005-07-21 13:43:05.000000000 -0400
-+++ gdb-6.3/gdb/inftarg.c	2005-07-21 13:45:17.000000000 -0400
-@@ -211,6 +211,10 @@ child_attach (char *args, int from_tty)
-   
-   inferior_ptid = pid_to_ptid (pid);
-   push_target (&deprecated_child_ops);
-+
-+  /* Do this first, before anything has had a chance to query the
-+     inferior's symbol table or similar.  */
-+  observer_notify_inferior_created (&current_target, from_tty);
- }
- 
- #if !defined(CHILD_POST_ATTACH)
 --- gdb-6.3/gdb/testsuite/gdb.base/attach-32.c.fix3	2005-07-21 14:23:50.000000000 -0400
 +++ gdb-6.3/gdb/testsuite/gdb.base/attach-32.c	2005-07-21 14:05:56.000000000 -0400
 @@ -0,0 +1,20 @@
@@ -326,16 +305,3 @@
 +    }
 +  return (0);
 +}
---- gdb-6.3/gdb/inf-ptrace.c.fix3	2005-07-21 13:44:34.000000000 -0400
-+++ gdb-6.3/gdb/inf-ptrace.c	2005-07-21 13:45:59.000000000 -0400
-@@ -220,6 +220,10 @@ inf_ptrace_attach (char *args, int from_
- 
-   inferior_ptid = pid_to_ptid (pid);
-   push_target (ptrace_ops_hack);
-+
-+  /* Do this first, before anything has had a chance to query the
-+     inferior's symbol table or similar.  */
-+  observer_notify_inferior_created (&current_target, from_tty);
- }
- 
- static void

gdb-6.3-inheritance-20050324.patch:
 valops.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Index: gdb-6.3-inheritance-20050324.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-inheritance-20050324.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-inheritance-20050324.patch	25 Mar 2005 00:17:33 -0000	1.1
+++ gdb-6.3-inheritance-20050324.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -3,24 +3,18 @@
 	* valops.c (check_field_in): Use check_typedef for base classes
 	to avoid problems with opaque type references.
 
---- gdb-6.3/gdb/valops.c.fix	2005-03-24 19:07:09.000000000 -0500
-+++ gdb-6.3/gdb/valops.c	2005-03-24 19:08:31.000000000 -0500
-@@ -1,6 +1,6 @@
- /* Perform non-arithmetic operations on values, for GDB.
-    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
--   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-    Free Software Foundation, Inc.
- 
-    This file is part of GDB.
-@@ -2315,8 +2315,13 @@ check_field_in (struct type *type, const
+Index: gdb-6.5/gdb/valops.c
+===================================================================
+--- gdb-6.5.orig/gdb/valops.c	2005-12-17 20:34:03.000000000 -0200
++++ gdb-6.5/gdb/valops.c	2006-07-07 02:35:09.000000000 -0300
+@@ -2257,8 +2257,13 @@ check_field_in (struct type *type, const
      }
  
    for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
 -    if (check_field_in (TYPE_BASECLASS (type, i), name))
 -      return 1;
 +    {
-+      /* Check the base classes.  Make sure we have the real type for 
++      /* Check the base classes.  Make sure we have the real type for
 +         each base class as opposed to an opaque declaration.  */
 +      struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
 +      if (check_field_in (baseclass, name))

gdb-6.3-large-core-20051206.patch:
 dcache.c      |    4 ++--
 dcache.h      |    4 ++--
 exec.c        |    4 ++--
 infptrace.c   |   12 ++++++------
 linux-nat.c   |    2 +-
 remote-sim.c  |   21 ++++++++++++---------
 remote.c      |   17 +++++++++++++----
 symfile-mem.c |   10 +++++++++-
 target.c      |   51 ++++++++++++++++++++++++++-------------------------
 target.h      |   34 ++++++++++++++++++----------------
 10 files changed, 91 insertions(+), 68 deletions(-)

Index: gdb-6.3-large-core-20051206.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-large-core-20051206.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-large-core-20051206.patch	14 Apr 2006 05:52:53 -0000	1.1
+++ gdb-6.3-large-core-20051206.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -21,66 +21,61 @@
 	* remote.h: Ditto.
 	* dcache.h: Ditto.
 
---- gdb-6.3/gdb/symfile-mem.c.fix	2005-12-14 17:57:05.000000000 -0500
-+++ gdb-6.3/gdb/symfile-mem.c	2005-12-14 18:10:19.000000000 -0500
-@@ -57,6 +57,14 @@
+Index: gdb-6.5/gdb/symfile-mem.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile-mem.c	2006-07-11 02:35:34.000000000 -0300
++++ gdb-6.5/gdb/symfile-mem.c	2006-07-11 02:35:49.000000000 -0300
+@@ -58,6 +58,14 @@
  #include "elf/common.h"
  
  
 +/* Local callback routine to pass to bfd to read from target memory,
 +   using a len constrained to INT_MAX.  */
 +static int
-+read_target_memory (CORE_ADDR addr, char *buf, int len)
++read_target_memory (bfd_vma addr, bfd_byte *buf, int len)
 +{
 +  return target_read_memory (addr, buf, (LONGEST)len);
 +}
 +
  /* Read inferior memory at ADDR to find the header of a loaded object file
     and read its in-core symbols out of inferior memory.  TEMPL is a bfd
-    representing the target's format.  */
-@@ -74,7 +82,7 @@ symbol_file_add_from_memory (struct bfd 
-     error ("add-symbol-file-from-memory not supported for this target");
+    representing the target's format.  NAME is the name to use for this
+@@ -78,7 +86,7 @@ symbol_file_add_from_memory (struct bfd 
+     error (_("add-symbol-file-from-memory not supported for this target"));
  
    nbfd = bfd_elf_bfd_from_remote_memory (templ, addr, &loadbase,
 -					 target_read_memory);
 +					 read_target_memory);
    if (nbfd == NULL)
-     error ("Failed to read a valid object file image from memory.");
+     error (_("Failed to read a valid object file image from memory."));
  
---- gdb-6.3/gdb/target.c.fix	2005-12-06 16:16:29.000000000 -0500
-+++ gdb-6.3/gdb/target.c	2005-12-14 18:16:06.000000000 -0500
-@@ -82,7 +82,7 @@ static LONGEST default_xfer_partial (str
+Index: gdb-6.5/gdb/target.c
+===================================================================
+--- gdb-6.5.orig/gdb/target.c	2006-07-11 02:35:49.000000000 -0300
++++ gdb-6.5/gdb/target.c	2006-07-11 02:35:49.000000000 -0300
+@@ -83,8 +83,8 @@ static LONGEST default_xfer_partial (str
     partial transfers, try either target_read_memory_partial or
     target_write_memory_partial).  */
  
--static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
-+static int target_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
- 			       int write);
+-static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
+-			       int write);
++static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
++			       LONGEST len, int write);
  
  static void init_dummy_target (void);
-@@ -109,9 +109,9 @@ static void debug_to_store_registers (in
  
- static void debug_to_prepare_to_store (void);
- 
--static int deprecated_debug_xfer_memory (CORE_ADDR, char *, int, int,
--					 struct mem_attrib *,
--					 struct target_ops *);
-+static LONGEST deprecated_debug_xfer_memory (CORE_ADDR, char *, LONGEST, int,
-+					    struct mem_attrib *,
-+					    struct target_ops *);
- 
- static void debug_to_files_info (struct target_ops *);
- 
-@@ -514,7 +514,7 @@ update_current_target (void)
+@@ -511,8 +511,8 @@ update_current_target (void)
+   de_fault (to_prepare_to_store, 
  	    (void (*) (void)) 
  	    noprocess);
-   de_fault (deprecated_xfer_memory, 
--	    (int (*) (CORE_ADDR, char *, int, int, struct mem_attrib *, struct target_ops *)) 
-+	    (LONGEST (*) (CORE_ADDR, char *, LONGEST, int, struct mem_attrib *, struct target_ops *)) 
+-  de_fault (deprecated_xfer_memory, 
+-	    (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) 
++  de_fault (deprecated_xfer_memory,
++	    (LONGEST (*) (CORE_ADDR, gdb_byte *, LONGEST, int, struct mem_attrib *, struct target_ops *))
  	    nomemory);
    de_fault (to_files_info, 
  	    (void (*) (struct target_ops *)) 
-@@ -945,7 +945,7 @@ target_xfer_partial (struct target_ops *
+@@ -940,7 +940,7 @@ target_xfer_partial (struct target_ops *
     implementing another singluar mechanism (for instance, a generic
     object:annex onto inferior:object:annex say).  */
  
@@ -89,32 +84,32 @@
  xfer_using_stratum (enum target_object object, const char *annex,
  		    ULONGEST offset, LONGEST len, void *readbuf,
  		    const void *writebuf)
-@@ -1010,7 +1010,7 @@ xfer_using_stratum (enum target_object o
+@@ -1005,7 +1005,7 @@ xfer_using_stratum (enum target_object o
     deal with partial reads should call target_read_memory_partial. */
  
  int
--target_read_memory (CORE_ADDR memaddr, char *myaddr, int len)
-+target_read_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len)
+-target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
++target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len)
  {
    if (target_xfer_partial_p ())
      return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
-@@ -1020,7 +1020,7 @@ target_read_memory (CORE_ADDR memaddr, c
+@@ -1015,7 +1015,7 @@ target_read_memory (CORE_ADDR memaddr, g
  }
  
  int
--target_write_memory (CORE_ADDR memaddr, char *myaddr, int len)
-+target_write_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len)
+-target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
++target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, LONGEST len)
  {
-   if (target_xfer_partial_p ())
-     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
-@@ -1051,11 +1051,11 @@ static int trust_readonly = 0;
+   gdb_byte *bytes = alloca (len);
+   memcpy (bytes, myaddr, len);
+@@ -1056,11 +1056,11 @@ Mode for reading from readonly sections 
  
     Result is -1 on error, or the number of bytes transfered.  */
  
 -int
--do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+-do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
 +LONGEST
-+do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
++do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write,
  		struct mem_attrib *attrib)
  {
 -  int res;
@@ -122,12 +117,13 @@
    int done = 0;
    struct target_ops *t;
  
-@@ -1113,10 +1113,10 @@ do_xfer_memory (CORE_ADDR memaddr, char 
+@@ -1118,10 +1118,11 @@ do_xfer_memory (CORE_ADDR memaddr, gdb_b
     Result is 0 or errno value.  */
  
  static int
--target_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write)
-+target_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write)
+-target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write)
++target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
++		    LONGEST len, int write)
  {
 -  int res;
 -  int reg_len;
@@ -136,14 +132,14 @@
    struct mem_region *region;
  
    /* Zero length requests are ok and require no work.  */
-@@ -1186,12 +1186,12 @@ target_xfer_memory (CORE_ADDR memaddr, c
- 
-    Result is -1 on error, or the number of bytes transfered.  */
+@@ -1192,12 +1193,12 @@ target_xfer_memory (CORE_ADDR memaddr, g
+    If we succeed, set *ERR to zero and return the number of bytes transferred.
+    If we fail, set *ERR to a non-zero errno value, and return -1.  */
  
 -static int
--target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, int len,
+-target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
 +static LONGEST
-+target_xfer_memory_partial (CORE_ADDR memaddr, char *myaddr, LONGEST len,
++target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len,
  			    int write_p, int *err)
  {
 -  int res;
@@ -153,41 +149,42 @@
    struct mem_region *region;
  
    /* Zero length requests are ok and require no work.  */
-@@ -1250,8 +1250,8 @@ target_xfer_memory_partial (CORE_ADDR me
+@@ -1256,9 +1257,9 @@ target_xfer_memory_partial (CORE_ADDR me
    return res;
  }
  
 -int
--target_read_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err)
 +LONGEST
-+target_read_memory_partial (CORE_ADDR memaddr, char *buf, LONGEST len, int *err)
+ target_read_memory_partial (CORE_ADDR memaddr, gdb_byte *buf,
+-			    int len, int *err)
++			    LONGEST len, int *err)
  {
    if (target_xfer_partial_p ())
-     return target_xfer_partial (target_stack, TARGET_OBJECT_MEMORY, NULL,
-@@ -1260,8 +1260,9 @@ target_read_memory_partial (CORE_ADDR me
+     {
+@@ -1285,9 +1286,9 @@ target_read_memory_partial (CORE_ADDR me
      return target_xfer_memory_partial (memaddr, buf, len, 0, err);
  }
  
 -int
--target_write_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err)
 +LONGEST
-+target_write_memory_partial (CORE_ADDR memaddr, char *buf, LONGEST len, 
-+			     int *err)
+ target_write_memory_partial (CORE_ADDR memaddr, gdb_byte *buf,
+-			     int len, int *err)
++			     LONGEST len, int *err)
  {
    if (target_xfer_partial_p ())
-     return target_xfer_partial (target_stack, TARGET_OBJECT_MEMORY, NULL,
-@@ -1985,8 +1986,8 @@ debug_to_prepare_to_store (void)
+     {
+@@ -2044,8 +2045,8 @@ debug_to_prepare_to_store (void)
    fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n");
  }
  
 -static int
--deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
+-deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len,
 +static LONGEST
-+deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
++deprecated_debug_xfer_memory (CORE_ADDR memaddr, bfd_byte *myaddr, LONGEST len,
  			      int write, struct mem_attrib *attrib,
  			      struct target_ops *target)
  {
-@@ -1996,9 +1997,9 @@ deprecated_debug_xfer_memory (CORE_ADDR 
+@@ -2055,9 +2056,9 @@ deprecated_debug_xfer_memory (CORE_ADDR 
  						attrib, target);
  
    fprintf_unfiltered (gdb_stdlog,
@@ -199,74 +196,85 @@
  
    if (retval > 0)
      {
---- gdb-6.3/gdb/target.h.fix	2005-12-06 16:16:33.000000000 -0500
-+++ gdb-6.3/gdb/target.h	2005-12-14 17:56:47.000000000 -0500
-@@ -330,8 +330,8 @@ struct target_ops
+Index: gdb-6.5/gdb/target.h
+===================================================================
+--- gdb-6.5.orig/gdb/target.h	2006-07-11 02:35:48.000000000 -0300
++++ gdb-6.5/gdb/target.h	2006-07-11 02:35:49.000000000 -0300
+@@ -332,10 +332,10 @@ struct target_ops
         NOTE: cagney/2004-10-01: This has been entirely superseeded by
         to_xfer_partial and inferior inheritance.  */
  
--    int (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
+-    int (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr,
 -				   int len, int write,
-+    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
-+				   LONGEST len, int write,
- 				   struct mem_attrib *attrib,
- 				   struct target_ops *target);
+-				   struct mem_attrib *attrib,
+-				   struct target_ops *target);
++    LONGEST (*deprecated_xfer_memory) (CORE_ADDR memaddr, gdb_byte *myaddr,
++				       LONGEST len, int write,
++				       struct mem_attrib *attrib,
++				       struct target_ops *target);
  
-@@ -533,20 +533,20 @@ extern void target_disconnect (char *, i
+     void (*to_files_info) (struct target_ops *);
+     int (*to_insert_breakpoint) (struct bp_target_info *);
+@@ -535,21 +535,23 @@ extern void target_disconnect (char *, i
  
  extern DCACHE *target_dcache;
  
--extern int do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
--			   struct mem_attrib *attrib);
-+extern LONGEST do_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
-+			       int write, struct mem_attrib *attrib);
+-extern int do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
+-			   int write, struct mem_attrib *attrib);
++extern LONGEST do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
++			       LONGEST len, int write,
++			       struct mem_attrib *attrib);
  
  extern int target_read_string (CORE_ADDR, char **, int, int *);
  
--extern int target_read_memory (CORE_ADDR memaddr, char *myaddr, int len);
-+extern int target_read_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len);
- 
--extern int target_write_memory (CORE_ADDR memaddr, char *myaddr, int len);
-+extern int target_write_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len);
+-extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
++extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
++			       LONGEST len);
+ 
+ extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
+-				int len);
++				LONGEST len);
  
--extern int xfer_memory (CORE_ADDR, char *, int, int,
+-extern int xfer_memory (CORE_ADDR, gdb_byte *, int, int,
 -			struct mem_attrib *, struct target_ops *);
-+extern LONGEST xfer_memory (CORE_ADDR, char *, LONGEST, int,
++extern LONGEST xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int,
 +			    struct mem_attrib *, struct target_ops *);
  
--extern int child_xfer_memory (CORE_ADDR, char *, int, int,
+-extern int child_xfer_memory (CORE_ADDR, gdb_byte *, int, int,
 -			      struct mem_attrib *, struct target_ops *);
-+extern LONGEST child_xfer_memory (CORE_ADDR, char *, LONGEST, int,
-+			          struct mem_attrib *, struct target_ops *);
++extern LONGEST child_xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int,
++				  struct mem_attrib *, struct target_ops *);
  
  /* Make a single attempt at transfering LEN bytes.  On a successful
     transfer, the number of bytes actually transfered is returned and
-@@ -554,11 +554,11 @@ extern int child_xfer_memory (CORE_ADDR,
+@@ -557,11 +559,11 @@ extern int child_xfer_memory (CORE_ADDR,
     of bytes actually transfered is not defined) and ERR is set to a
     non-zero error indication.  */
  
--extern int target_read_memory_partial (CORE_ADDR addr, char *buf, int len,
--				       int *err);
-+extern LONGEST target_read_memory_partial (CORE_ADDR addr, char *buf, LONGEST len,
-+					   int *err);
- 
--extern int target_write_memory_partial (CORE_ADDR addr, char *buf, int len,
--					int *err);
-+extern LONGEST target_write_memory_partial (CORE_ADDR addr, char *buf, LONGEST len,
-+					    int *err);
+-extern int target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf,
+-				       int len, int *err);
++extern LONGEST target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf,
++					   LONGEST len, int *err);
+ 
+-extern int target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf,
+-					int len, int *err);
++extern LONGEST target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf,
++					    LONGEST len, int *err);
  
  extern char *child_pid_to_exec_file (int);
  
---- gdb-6.3/gdb/infptrace.c.fix	2005-12-06 16:16:38.000000000 -0500
-+++ gdb-6.3/gdb/infptrace.c	2005-12-14 14:22:10.000000000 -0500
-@@ -443,17 +443,17 @@ store_inferior_registers (int regnum)
+Index: gdb-6.5/gdb/infptrace.c
+===================================================================
+--- gdb-6.5.orig/gdb/infptrace.c	2006-07-11 02:35:49.000000000 -0300
++++ gdb-6.5/gdb/infptrace.c	2006-07-11 02:35:49.000000000 -0300
+@@ -368,17 +368,17 @@ store_inferior_registers (int regnum)
     deprecated_child_ops doesn't allow memory operations to cross below
     us in the target stack anyway.  */
  
 -int
--child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+-child_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
 +LONGEST
-+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
++child_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write,
  		   struct mem_attrib *attrib, struct target_ops *target)
  {
 -  int i;
@@ -275,109 +283,76 @@
    CORE_ADDR addr = memaddr & -(CORE_ADDR) sizeof (PTRACE_TYPE_RET);
    /* Round ending address up; get number of longwords that makes.  */
 -  int count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1)
-+  LONGEST count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1)
- 	       / sizeof (PTRACE_TYPE_RET));
+-	       / sizeof (PTRACE_TYPE_RET));
 -  int alloc = count * sizeof (PTRACE_TYPE_RET);
++  LONGEST count = ((((memaddr + len) - addr) + sizeof (PTRACE_TYPE_RET) - 1)
++		   / sizeof (PTRACE_TYPE_RET));
 +  LONGEST alloc = count * sizeof (PTRACE_TYPE_RET);
    PTRACE_TYPE_RET *buffer;
    struct cleanup *old_chain = NULL;
  
---- gdb-6.3/gdb/dcache.c.fix	2005-12-06 16:16:44.000000000 -0500
-+++ gdb-6.3/gdb/dcache.c	2005-12-14 15:18:22.000000000 -0500
-@@ -524,9 +524,9 @@ dcache_free (DCACHE *dcache)
+Index: gdb-6.5/gdb/dcache.c
+===================================================================
+--- gdb-6.5.orig/gdb/dcache.c	2006-07-11 02:35:34.000000000 -0300
++++ gdb-6.5/gdb/dcache.c	2006-07-11 02:35:49.000000000 -0300
+@@ -527,9 +527,9 @@ dcache_free (DCACHE *dcache)
  
     This routine is indended to be called by remote_xfer_ functions. */
  
 -int
--dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, char *myaddr, int len,
--		    int should_write)
 +LONGEST
-+dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, char *myaddr,
+ dcache_xfer_memory (DCACHE *dcache, CORE_ADDR memaddr, gdb_byte *myaddr,
+-		    int len, int should_write)
 +		    LONGEST len, int should_write)
  {
    int i;
-   int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, char *ptr);
---- gdb-6.3/gdb/dcache.h.fix	2005-12-06 16:16:50.000000000 -0500
-+++ gdb-6.3/gdb/dcache.h	2005-12-14 15:18:47.000000000 -0500
+   int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr);
+Index: gdb-6.5/gdb/dcache.h
+===================================================================
+--- gdb-6.5.orig/gdb/dcache.h	2006-07-11 02:35:34.000000000 -0300
++++ gdb-6.5/gdb/dcache.h	2006-07-11 02:35:49.000000000 -0300
 @@ -37,7 +37,7 @@ void dcache_free (DCACHE *);
  
  /* Simple to call from <remote>_xfer_memory */
  
--int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, char *my, int len,
--			int should_write);
-+LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, char *my, LONGEST len,
-+			    int should_write);
+-int dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
+-			int len, int should_write);
++LONGEST dcache_xfer_memory (DCACHE *cache, CORE_ADDR mem, gdb_byte *my,
++			    LONGEST len, int should_write);
  
  #endif /* DCACHE_H */
---- gdb-6.3/gdb/exec.c.fix	2005-12-06 16:16:56.000000000 -0500
-+++ gdb-6.3/gdb/exec.c	2005-12-14 15:06:30.000000000 -0500
-@@ -444,8 +444,8 @@ map_vmap (bfd *abfd, bfd *arch)
+Index: gdb-6.5/gdb/exec.c
+===================================================================
+--- gdb-6.5.orig/gdb/exec.c	2006-07-11 02:35:34.000000000 -0300
++++ gdb-6.5/gdb/exec.c	2006-07-11 02:35:49.000000000 -0300
+@@ -447,8 +447,8 @@ map_vmap (bfd *abfd, bfd *arch)
     The same routine is used to handle both core and exec files;
     we just tail-call it with more arguments to select between them.  */
  
 -int
--xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+-xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write,
 +LONGEST
-+xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
- 	     struct mem_attrib *attrib,
- 	     struct target_ops *target)
- {
---- gdb-6.3/gdb/linux-nat.c.fix	2005-12-06 16:17:02.000000000 -0500
-+++ gdb-6.3/gdb/linux-nat.c	2005-12-14 14:26:41.000000000 -0500
-@@ -2444,12 +2444,12 @@ linux_nat_mourn_inferior (void)
- #ifdef NATIVE_XFER_UNWIND_TABLE
- extern int ia64_linux_check_stack_region(struct lwp_info *lwp, void *range);
- #endif
--static int
--linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-+static LONGEST
-+linux_nat_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
- 		     struct mem_attrib *attrib, struct target_ops *target)
++xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write,
+ 	     struct mem_attrib *attrib, struct target_ops *target)
  {
-   struct cleanup *old_chain = save_inferior_ptid ();
--  int xfer;
-+  LONGEST xfer;
- 
- #ifdef NATIVE_XFER_UNWIND_TABLE
-   struct mem_region range;
-@@ -2467,7 +2467,7 @@ linux_nat_xfer_memory (CORE_ADDR memaddr
-     xfer = child_xfer_memory (memaddr, myaddr, len, write, attrib, target);
-   else if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) 
-     { /* This region contains ia64 rse registers, we have to re-read.  */
--      int xxfer;
-+      LONGEST xxfer;
-       /* Re-read register stack area.  */
-       xxfer = child_xfer_memory (range.lo, myaddr + (range.lo - memaddr),
-                                  range.hi - range.lo, write, attrib, target);
-@@ -3091,8 +3091,8 @@ linux_nat_info_proc_cmd (char *args, int
-     }
- }
- 
--int
--linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, int len, int write,
-+LONGEST
-+linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, LONGEST len, int write,
- 			struct mem_attrib *attrib, struct target_ops *target)
- {
-   int fd, ret;
---- gdb-6.3/gdb/linux-nat.h.fix	2005-12-06 16:17:07.000000000 -0500
-+++ gdb-6.3/gdb/linux-nat.h	2005-12-14 14:27:44.000000000 -0500
-@@ -80,9 +80,10 @@ struct linux_watchpoint
- struct mem_attrib;
- struct target_ops;
- 
--extern int linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr, int len,
--				   int write, struct mem_attrib *attrib,
--				   struct target_ops *target);
-+extern LONGEST linux_proc_xfer_memory (CORE_ADDR addr, char *myaddr,
-+				       LONGEST len,
-+				       int write, struct mem_attrib *attrib,
-+				       struct target_ops *target);
- 
- /* Find process PID's pending signal set from /proc/pid/status.  */
- void linux_proc_pending_signals (int pid, sigset_t *pending, sigset_t *blocked, sigset_t *ignored);
---- gdb-6.3/gdb/remote.c.fix	2005-12-06 16:17:17.000000000 -0500
-+++ gdb-6.3/gdb/remote.c	2005-12-14 15:14:39.000000000 -0500
+   int res;
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-11 02:35:49.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-11 02:36:39.000000000 -0300
+@@ -3264,7 +3264,7 @@ linux_xfer_partial (struct target_ops *o
+ 	 Revert when Bugzilla 147436 is fixed.  */
+       if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL)
+ 	{ /* This region contains ia64 rse registers, we have to re-read.  */
+-	  int xxfer;
++	  LONGEST xxfer;
+ 
+ 	  /* Re-read register stack area.  */
+ 	  xxfer = super_xfer_partial (ops, object, annex,
+Index: gdb-6.5/gdb/remote.c
+===================================================================
+--- gdb-6.5.orig/gdb/remote.c	2006-07-11 02:35:48.000000000 -0300
++++ gdb-6.5/gdb/remote.c	2006-07-11 02:37:02.000000000 -0300
 @@ -27,6 +27,7 @@
  #include "gdb_string.h"
  #include <ctype.h>
@@ -386,29 +361,14 @@
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
-@@ -69,10 +70,10 @@ static void build_remote_gdbarch_data (v
- 
- static void remote_files_info (struct target_ops *ignore);
- 
--static int remote_xfer_memory (CORE_ADDR memaddr, char *myaddr,
--			       int len, int should_write,
--			       struct mem_attrib *attrib,
--			       struct target_ops *target);
-+static LONGEST remote_xfer_memory (CORE_ADDR memaddr, char *myaddr,
-+			           LONGEST len, int should_write,
-+			           struct mem_attrib *attrib,
-+			           struct target_ops *target);
- 
- static void remote_prepare_to_store (void);
- 
-@@ -3791,18 +3792,25 @@ remote_read_bytes (CORE_ADDR memaddr, ch
-    SHOULD_WRITE is nonzero.  Returns length of data written or read; 0
-    for error.  TARGET is unused.  */
+@@ -3701,19 +3702,27 @@ remote_read_bytes (CORE_ADDR memaddr, gd
+    if SHOULD_WRITE is nonzero.  Returns length of data written or
+    read; 0 for error.  TARGET is unused.  */
  
 -static int
--remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, int mem_len,
+-remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, int mem_len,
 +static LONGEST
-+remote_xfer_memory (CORE_ADDR mem_addr, char *buffer, LONGEST mem_len,
++remote_xfer_memory (CORE_ADDR mem_addr, gdb_byte *buffer, LONGEST mem_len,
  		    int should_write, struct mem_attrib *attrib,
  		    struct target_ops *target)
  {
@@ -417,6 +377,7 @@
    int res;
 +  int len;
 +
++
 +  /* This routine is not set up to handle > INT_MAX bytes.  */
 +  if (mem_len >= (LONGEST)INT_MAX)
 +    return 0;
@@ -424,13 +385,14 @@
 +  len = (int)mem_len;
  
    /* Should this be the selected frame?  */
-   gdbarch_remote_translate_xfer_address (current_gdbarch, current_regcache,
+   gdbarch_remote_translate_xfer_address (current_gdbarch, 
+ 					 current_regcache,
 -					 mem_addr, mem_len,
 +					 mem_addr, len,
  					 &targ_addr, &targ_len);
    if (targ_len <= 0)
      return 0;
-@@ -3812,7 +3820,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
+@@ -3723,7 +3732,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, 
    else
      res = remote_read_bytes (targ_addr, buffer, targ_len);
  
@@ -439,49 +401,18 @@
  }
  
  static void
---- gdb-6.3/gdb/thread-db.c.fix	2005-12-06 16:17:22.000000000 -0500
-+++ gdb-6.3/gdb/thread-db.c	2005-12-14 14:42:28.000000000 -0500
-@@ -955,12 +955,12 @@ thread_db_wait (ptid_t ptid, struct targ
-   return ptid;
- }
- 
--static int
--thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-+static LONGEST
-+thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len, int write,
- 		       struct mem_attrib *attrib, struct target_ops *target)
- {
-   struct cleanup *old_chain = save_inferior_ptid ();
--  int xfer;
-+  LONGEST xfer;
- 
-   if (is_thread (inferior_ptid))
-     {
---- gdb-6.3/gdb/remote-sim.c.fix	2005-12-07 16:02:02.000000000 -0500
-+++ gdb-6.3/gdb/remote-sim.c	2005-12-14 15:15:53.000000000 -0500
-@@ -93,10 +93,10 @@ static ptid_t gdbsim_wait (ptid_t ptid, 
- 
- static void gdbsim_prepare_to_store (void);
- 
--static int gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, 
--					int len, int write,
--					struct mem_attrib *attrib,
--					struct target_ops *target);
-+static LONGEST gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, 
-+					    LONGEST len, int write,
-+					    struct mem_attrib *attrib,
-+					    struct target_ops *target);
- 
- static void gdbsim_files_info (struct target_ops *target);
- 
-@@ -741,11 +741,14 @@ gdbsim_prepare_to_store (void)
+Index: gdb-6.5/gdb/remote-sim.c
+===================================================================
+--- gdb-6.5.orig/gdb/remote-sim.c	2006-07-11 02:35:34.000000000 -0300
++++ gdb-6.5/gdb/remote-sim.c	2006-07-11 02:35:49.000000000 -0300
+@@ -742,11 +742,14 @@ gdbsim_prepare_to_store (void)
  
     Returns the number of bytes transferred. */
  
 -static int
--gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
 +static LONGEST
-+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, LONGEST len,
++gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len,
  			     int write, struct mem_attrib *attrib,
  			     struct target_ops *target)
  {
@@ -489,9 +420,9 @@
 +  int xfer_len = (int)len;
 +
    if (!program_loaded)
-     error ("No program loaded.");
+     error (_("No program loaded."));
  
-@@ -755,22 +758,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m
+@@ -756,22 +759,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m
        printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x");
        gdb_print_host_address (myaddr, gdb_stdout);
        printf_filtered (", memaddr 0x%s, len %d, write %d\n",

gdb-6.3-linespec-20041213.patch:
 linespec.c |  289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 264 insertions(+), 25 deletions(-)

Index: gdb-6.3-linespec-20041213.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-linespec-20041213.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-linespec-20041213.patch	14 Dec 2004 01:07:04 -0000	1.1
+++ gdb-6.3-linespec-20041213.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,6 +1,8 @@
---- gdb-6.3/gdb/linespec.c.fix	Mon Dec 13 19:55:27 2004
-+++ gdb-6.3/gdb/linespec.c	Mon Dec 13 19:59:05 2004
-@@ -73,7 +73,8 @@ static struct symtabs_and_lines find_met
+Index: gdb-6.5/gdb/linespec.c
+===================================================================
+--- gdb-6.5.orig/gdb/linespec.c	2006-01-10 20:14:43.000000000 -0200
++++ gdb-6.5/gdb/linespec.c	2006-07-07 01:04:56.000000000 -0300
+@@ -75,7 +75,8 @@ static struct symtabs_and_lines find_met
  					     struct symbol *sym_class);
  
  static int collect_methods (char *copy, struct type *t,
@@ -10,7 +12,7 @@
  
  static NORETURN void cplusplus_error (const char *name,
  				      const char *fmt, ...)
-@@ -81,10 +82,12 @@ static NORETURN void cplusplus_error (co
+@@ -83,10 +84,12 @@ static NORETURN void cplusplus_error (co
  
  static int total_number_of_methods (struct type *type);
  
@@ -25,7 +27,7 @@
  
  static int add_constructors (int method_counter, struct type *t,
  			     struct symbol **sym_arr);
-@@ -99,6 +102,9 @@ static int is_objc_method_format (const 
+@@ -101,6 +104,9 @@ static int is_objc_method_format (const 
  static struct symtabs_and_lines decode_line_2 (struct symbol *[],
  					       int, int, char ***);
  
@@ -35,7 +37,7 @@
  static struct symtab *symtab_from_filename (char **argptr,
  					    char *p, int is_quote_enclosed,
  					    int *not_found_ptr);
-@@ -189,12 +195,18 @@ total_number_of_methods (struct type *ty
+@@ -191,12 +197,18 @@ total_number_of_methods (struct type *ty
  /* Recursive helper function for decode_line_1.
     Look for methods named NAME in type T.
     Return number of matches.
@@ -56,7 +58,7 @@
  {
    int i1 = 0;
    int ibase;
-@@ -237,7 +249,8 @@ find_methods (struct type *t, char *name
+@@ -239,7 +251,8 @@ find_methods (struct type *t, char *name
  	  if (strcmp_iw (name, method_name) == 0)
  	    /* Find all the overloaded methods with that name.  */
  	    i1 += add_matching_methods (method_counter, t,
@@ -66,7 +68,7 @@
  	  else if (strncmp (class_name, name, name_len) == 0
  		   && (class_name[name_len] == '\0'
  		       || class_name[name_len] == '<'))
-@@ -259,21 +272,83 @@ find_methods (struct type *t, char *name
+@@ -261,21 +274,83 @@ find_methods (struct type *t, char *name
  
    if (i1 == 0)
      for (ibase = 0; ibase < TYPE_N_BASECLASSES (t); ibase++)
@@ -78,8 +80,8 @@
  }
  
 +static int
-+add_minsym_members (const char *class_name, 
-+		    const char *member_name, 
++add_minsym_members (const char *class_name,
++		    const char *member_name,
 +		    struct minimal_symbol **msym_arr)
 +{
 +  char *completion_name;
@@ -129,7 +131,7 @@
 +      ++counter;
 +    }
 +  xfree (list);
-+  xfree (completion_name); 
++  xfree (completion_name);
 +
 +  return counter;
 +}
@@ -152,7 +154,7 @@
  
    for (field_counter = TYPE_FN_FIELDLIST_LENGTH (t, method_counter) - 1;
         field_counter >= 0;
-@@ -297,6 +372,16 @@ add_matching_methods (int method_counter
+@@ -299,6 +374,16 @@ add_matching_methods (int method_counter
  	}
        else
  	phys_name = TYPE_FN_FIELD_PHYSNAME (f, field_counter);
@@ -162,14 +164,14 @@
 +	 when we have in-charge and not-in-charge constructors.
 +	 Since we don't have a mangled name to work with, if we
 +	 look for the symbol, we can only find the class itself.
-+	 We can find the information we need in the minimal symbol 
++	 We can find the information we need in the minimal symbol
 +	 table which has the full member name information we need.  */
 +      if (strlen (phys_name) <= strlen (class_name))
 +	return add_minsym_members (class_name, phys_name, msym_arr);
  		
        /* Destructor is handled by caller, don't add it to
  	 the list.  */
-@@ -322,6 +407,9 @@ add_matching_methods (int method_counter
+@@ -324,6 +409,9 @@ add_matching_methods (int method_counter
  	}
      }
  
@@ -179,7 +181,7 @@
    return i1;
  }
  
-@@ -601,6 +689,146 @@ decode_line_2 (struct symbol *sym_arr[],
+@@ -603,6 +691,146 @@ decode_line_2 (struct symbol *sym_arr[],
    discard_cleanups (old_chain);
    return return_values;
  }
@@ -224,9 +226,9 @@
 +      init_sal (&values.sals[i]);
 +      if (msym_arr[i])
 +	{
-+	  struct symtabs_and_lines msal = minsym_found (funfirstline, 
++	  struct symtabs_and_lines msal = minsym_found (funfirstline,
 +						        msym_arr[i]);
-+	  memcpy (&values.sals[i], &msal.sals[0], 
++	  memcpy (&values.sals[i], &msal.sals[0],
 +		  sizeof (struct symtab_and_line));
 +	  if (values.sals[i].symtab)
 +	    printf_unfiltered ("[%d] %s at %s:%d\n",
@@ -326,7 +328,7 @@
  
  /* The parser of linespec itself. */
  
-@@ -1404,35 +1632,46 @@ find_method (int funfirstline, char ***c
+@@ -1406,36 +1634,46 @@ find_method (int funfirstline, char ***c
    int i1;	/*  Counter for the symbol array.  */
    struct symbol **sym_arr =  alloca (total_number_of_methods (t)
  				     * sizeof (struct symbol *));
@@ -358,6 +360,7 @@
 +	return minsym_found (funfirstline, msym_arr[0]);
        else
  	{
+-	  values.sals = NULL;
 -	  values.nelts = 0;
 +          sym = sym_arr[0];
 +
@@ -386,7 +389,7 @@
        return decode_line_2 (sym_arr, i1, funfirstline, canonical);
      }
    else
-@@ -1459,11 +1698,12 @@ find_method (int funfirstline, char ***c
+@@ -1462,11 +1700,12 @@ find_method (int funfirstline, char ***c
  }
  
  /* Find all methods named COPY in the class whose type is T, and put
@@ -401,7 +404,7 @@
  {
    int i1 = 0;	/*  Counter for the symbol array.  */
  
-@@ -1485,7 +1725,7 @@ collect_methods (char *copy, struct type
+@@ -1488,7 +1727,7 @@ collect_methods (char *copy, struct type
  	}
      }
    else

gdb-6.3-lwp-cache-20041216.patch:
 linux-thread-db.c |   16 ----------------
 1 files changed, 16 deletions(-)

Index: gdb-6.3-lwp-cache-20041216.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-lwp-cache-20041216.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-lwp-cache-20041216.patch	16 Dec 2004 21:36:54 -0000	1.1
+++ gdb-6.3-lwp-cache-20041216.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,11 +1,11 @@
 2004-12-16  Jeff Johnston  <jjohnstn at redhat.com>
 
-	* thread-db.c (clear_lwp_callback): Removed.
+	* linux-thread-db.c (clear_lwpip_callback): Removed.
 	(thread_db_resume): Do not iterate and call
 	clear_lwp_callback.
 
---- gdb-6.3/gdb/thread-db.c.fix	Thu Dec 16 16:32:13 2004
-+++ gdb-6.3/gdb/thread-db.c	Thu Dec 16 16:32:30 2004
+--- gdb-6.3/gdb/linux-thread-db.c.fix	Thu Dec 16 16:32:13 2004
++++ gdb-6.3/gdb/linux-thread-db.c	Thu Dec 16 16:32:30 2004
 @@ -822,19 +822,6 @@ thread_db_detach (char *args, int from_t
    target_beneath->to_detach (args, from_tty);
  }

gdb-6.3-nonthreaded-wp-20050117.patch:
 doc/observer.texi |    4 ++++
 linux-nat.c       |   32 +++++++++++++++++++++++++++++---
 target.c          |    8 ++++++++
 target.h          |    3 +--
 4 files changed, 42 insertions(+), 5 deletions(-)

Index: gdb-6.3-nonthreaded-wp-20050117.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-nonthreaded-wp-20050117.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-nonthreaded-wp-20050117.patch	19 Jan 2005 23:29:48 -0000	1.2
+++ gdb-6.3-nonthreaded-wp-20050117.patch	11 Jul 2006 06:33:02 -0000	1.3
@@ -1,7 +1,9 @@
---- gdb-6.3/gdb/doc/observer.texi.fix	Tue Jan 18 16:51:56 2005
-+++ gdb-6.3/gdb/doc/observer.texi	Tue Jan 18 17:38:57 2005
-@@ -91,6 +91,10 @@ at the entry-point instruction.  For @sa
- inferior, and before any information on the inferior has been printed.
+Index: gdb-6.5/gdb/doc/observer.texi
+===================================================================
+--- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-07 04:08:37.000000000 -0300
++++ gdb-6.5/gdb/doc/observer.texi	2006-07-07 04:19:00.000000000 -0300
+@@ -119,6 +119,10 @@ when @value{GDBN} calls this observer, t
+ haven't been loaded yet.
  @end deftypefun
  
 + at deftypefun void mourn_inferior (struct target_ops *@var{target})
@@ -9,18 +11,12 @@
 + at end deftypefun
 +
  @deftypefun void solib_unloaded (struct so_list *@var{solib})
- The specified shared library has been discovered to be unloaded.
+ The shared library specified by @var{solib} has been unloaded.
  @end deftypefun
---- gdb-6.3/gdb/linux-nat.c.fix	Tue Jan 18 16:52:24 2005
-+++ gdb-6.3/gdb/linux-nat.c	Tue Jan 18 17:14:01 2005
-@@ -1,6 +1,6 @@
- /* GNU/Linux native-dependent code common to multiple platforms.
- 
--   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-    This file is part of GDB.
- 
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 04:00:05.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-07 04:20:40.000000000 -0300
 @@ -802,11 +802,23 @@ iterate_over_lwps (int (*callback) (stru
  {
    struct lwp_info *lp, *lpnext;
@@ -48,8 +44,8 @@
      }
  
    return NULL;
-@@ -3103,6 +3115,18 @@ linux_proc_pending_signals (int pid, sig
-   fclose (procfile);
+@@ -3262,6 +3274,18 @@ linux_nat_add_target (struct target_ops 
+   thread_db_init (t);
  }
  
 +/* Observer function for a mourn inferior event.  This is needed
@@ -67,29 +63,20 @@
  void
  _initialize_linux_nat (void)
  {
-@@ -3120,7 +3144,9 @@ Specify any of the following keywords fo
-   stat     -- list a bunch of random process info.\n\
+@@ -3276,6 +3300,8 @@ Specify any of the following keywords fo
    status   -- list a different bunch of random process info.\n\
-   all      -- list all available /proc info.");
--
-+  
-+  observer_attach_mourn_inferior (linux_nat_mourn_inferior_observer);
-+  
-   init_linux_nat_ops ();
-   add_target (&linux_nat_ops);
-   thread_db_init (&linux_nat_ops);
---- gdb-6.3/gdb/target.c.fix	Tue Jan 18 17:02:37 2005
-+++ gdb-6.3/gdb/target.c	Tue Jan 18 17:39:43 2005
-@@ -1,7 +1,7 @@
- /* Select target systems and architectures at runtime for GDB.
- 
-    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
--   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   all      -- list all available /proc info."));
  
-    Contributed by Cygnus Support.
++  observer_attach_mourn_inferior (linux_nat_mourn_inferior_observer);
++
+   /* Save the original signal mask.  */
+   sigprocmask (SIG_SETMASK, NULL, &normal_mask);
  
-@@ -38,6 +38,7 @@
+Index: gdb-6.5/gdb/target.c
+===================================================================
+--- gdb-6.5.orig/gdb/target.c	2006-07-07 03:52:38.000000000 -0300
++++ gdb-6.5/gdb/target.c	2006-07-07 04:19:00.000000000 -0300
+@@ -39,6 +39,7 @@
  #include "regcache.h"
  #include "gdb_assert.h"
  #include "gdbcore.h"
@@ -97,7 +84,7 @@
  
  static void target_info (char *, int);
  
-@@ -266,6 +267,13 @@ target_load (char *arg, int from_tty)
+@@ -267,6 +268,13 @@ target_load (char *arg, int from_tty)
    (*current_target.to_load) (arg, from_tty);
  }
  
@@ -111,18 +98,11 @@
  static int
  nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write,
  	  struct target_ops *t)
---- gdb-6.3/gdb/target.h.fix	Tue Jan 18 17:02:42 2005
-+++ gdb-6.3/gdb/target.h	Tue Jan 18 17:15:30 2005
-@@ -1,7 +1,7 @@
- /* Interface between GDB and target environments, including files and processes
- 
-    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
--   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-    Contributed by Cygnus Support.  Written by John Gilmore.
- 
-@@ -779,8 +779,7 @@ extern void target_load (char *arg, int 
+Index: gdb-6.5/gdb/target.h
+===================================================================
+--- gdb-6.5.orig/gdb/target.h	2006-07-07 03:52:40.000000000 -0300
++++ gdb-6.5/gdb/target.h	2006-07-07 04:19:00.000000000 -0300
+@@ -783,8 +783,7 @@ int target_follow_fork (int follow_child
  
  /* The inferior process has died.  Do what is right.  */
  

gdb-6.3-pie-20050110.patch:
 auxv.c        |   20 ++-
 auxv.h        |    4 
 breakpoint.c  |   91 +++++++++++++---
 breakpoint.h  |    5 
 dwarf2read.c  |    2 
 elfread.c     |    2 
 infrun.c      |    5 
 objfiles.c    |   17 ++-
 solib-svr4.c  |  317 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 solib.c       |  107 ++++++++++++++-----
 solist.h      |   10 +
 symfile-mem.c |    2 
 symfile.c     |   22 +++-
 varobj.c      |   56 ++++++++++
 varobj.h      |    2 
 15 files changed, 576 insertions(+), 86 deletions(-)

Index: gdb-6.3-pie-20050110.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-pie-20050110.patch	11 Jan 2005 00:15:58 -0000	1.1
+++ gdb-6.3-pie-20050110.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,6 +1,8 @@
---- gdb-6.3/gdb/dwarf2read.c.fix	Mon Jan 10 14:36:22 2005
-+++ gdb-6.3/gdb/dwarf2read.c	Mon Jan 10 14:39:34 2005
-@@ -1201,7 +1201,7 @@ dwarf2_build_psymtabs (struct objfile *o
+Index: gdb-6.5/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.5.orig/gdb/dwarf2read.c	2006-07-11 02:47:11.000000000 -0300
++++ gdb-6.5/gdb/dwarf2read.c	2006-07-11 02:56:58.000000000 -0300
+@@ -1208,7 +1208,7 @@ dwarf2_build_psymtabs (struct objfile *o
    else
      dwarf2_per_objfile->loc_buffer = NULL;
  
@@ -9,17 +11,19 @@
        || (objfile->global_psymbols.size == 0
  	  && objfile->static_psymbols.size == 0))
      {
---- gdb-6.3/gdb/auxv.c.fix	Mon Jan 10 14:36:34 2005
-+++ gdb-6.3/gdb/auxv.c	Mon Jan 10 14:39:34 2005
+Index: gdb-6.5/gdb/auxv.c
+===================================================================
+--- gdb-6.5.orig/gdb/auxv.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/auxv.c	2006-07-11 02:47:11.000000000 -0300
 @@ -119,7 +119,7 @@ target_auxv_read (struct target_ops *ops
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  int
- target_auxv_parse (struct target_ops *ops, char **readptr, char *endptr,
--		   CORE_ADDR *typep, CORE_ADDR *valp)
-+		   ULONGEST *typep, CORE_ADDR *valp)
+ target_auxv_parse (struct target_ops *ops, gdb_byte **readptr,
+-		   gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp)
++		   gdb_byte *endptr, ULONGEST *typep, CORE_ADDR *valp)
  {
    const int sizeof_auxv_field = TYPE_LENGTH (builtin_type_void_data_ptr);
-   char *ptr = *readptr;
+   gdb_byte *ptr = *readptr;
 @@ -144,9 +144,10 @@ target_auxv_parse (struct target_ops *op
     an error getting the information.  On success, return 1 after
     storing the entry's value field in *VALP.  */
@@ -30,9 +34,9 @@
 -  CORE_ADDR type, val;
 +  CORE_ADDR val;
 +  ULONGEST at_type;
-   char *data;
+   gdb_byte *data;
    int n = target_auxv_read (ops, &data);
-   char *ptr = data;
+   gdb_byte *ptr = data;
 @@ -156,10 +157,10 @@ target_auxv_search (struct target_ops *o
      return n;
  
@@ -53,9 +57,9 @@
 -  CORE_ADDR type, val;
 +  CORE_ADDR val;
 +  ULONGEST at_type;
-   char *data;
+   gdb_byte *data;
    int len = target_auxv_read (ops, &data);
-   char *ptr = data;
+   gdb_byte *ptr = data;
 @@ -191,14 +193,14 @@ fprint_target_auxv (struct ui_file *file
    if (len <= 0)
      return len;
@@ -82,12 +86,14 @@
        switch (flavor)
  	{
  	case dec:
---- gdb-6.3/gdb/auxv.h.fix	Mon Jan 10 14:36:39 2005
-+++ gdb-6.3/gdb/auxv.h	Mon Jan 10 14:39:34 2005
+Index: gdb-6.5/gdb/auxv.h
+===================================================================
+--- gdb-6.5.orig/gdb/auxv.h	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/auxv.h	2006-07-11 02:47:11.000000000 -0300
 @@ -43,14 +43,14 @@ extern LONGEST target_auxv_read (struct 
     Return 1 if an entry was read into *TYPEP and *VALP.  */
  extern int target_auxv_parse (struct target_ops *ops,
- 			      char **readptr, char *endptr,
+ 			      gdb_byte **readptr, gdb_byte *endptr,
 -			      CORE_ADDR *typep, CORE_ADDR *valp);
 +			      ULONGEST *typep, CORE_ADDR *valp);
  
@@ -101,8 +107,10 @@
  
  /* Print the contents of the target's AUXV on the specified file. */
  extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops);
---- gdb-6.3/gdb/breakpoint.h.fix	Mon Jan 10 14:36:45 2005
-+++ gdb-6.3/gdb/breakpoint.h	Mon Jan 10 14:39:34 2005
+Index: gdb-6.5/gdb/breakpoint.h
+===================================================================
+--- gdb-6.5.orig/gdb/breakpoint.h	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.h	2006-07-11 02:47:11.000000000 -0300
 @@ -159,6 +159,7 @@ enum enable_state
  			   automatically enabled and reset when the call 
  			   "lands" (either completes, or stops at another 
@@ -111,7 +119,7 @@
      bp_permanent	/* There is a breakpoint instruction hard-wired into
  			   the target's code.  Don't try to write another
  			   breakpoint instruction on top of it, or restore
-@@ -778,8 +779,12 @@ extern void remove_thread_event_breakpoi
+@@ -807,8 +808,12 @@ extern void remove_thread_event_breakpoi
  
  extern void disable_breakpoints_in_shlibs (int silent);
  
@@ -124,9 +132,11 @@
  extern void create_solib_load_event_breakpoint (char *, int, char *, char *);
  
  extern void create_solib_unload_event_breakpoint (char *, int,
---- gdb-6.3/gdb/symfile-mem.c.fix	Mon Jan 10 14:36:15 2005
-+++ gdb-6.3/gdb/symfile-mem.c	Mon Jan 10 14:39:34 2005
-@@ -103,7 +103,7 @@ symbol_file_add_from_memory (struct bfd 
+Index: gdb-6.5/gdb/symfile-mem.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile-mem.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/symfile-mem.c	2006-07-11 02:56:55.000000000 -0300
+@@ -110,7 +110,7 @@ symbol_file_add_from_memory (struct bfd 
        }
  
    objf = symbol_file_add_from_bfd (nbfd, from_tty,
@@ -135,9 +145,11 @@
  
    /* This might change our ideas about frames already looked at.  */
    reinit_frame_cache ();
---- gdb-6.3/gdb/infrun.c.fix	Mon Jan 10 14:36:50 2005
-+++ gdb-6.3/gdb/infrun.c	Mon Jan 10 14:39:34 2005
-@@ -2203,6 +2203,11 @@ process_event_stop_test:
+Index: gdb-6.5/gdb/infrun.c
+===================================================================
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-11 02:56:58.000000000 -0300
+@@ -2230,6 +2230,11 @@ process_event_stop_test:
  	     code segments in shared libraries might be mapped in now. */
  	  re_enable_breakpoints_in_shlibs ();
  
@@ -149,18 +161,21 @@
  	  /* If requested, stop when the dynamic linker notifies
  	     gdb of events.  This allows the user to get control
  	     and place breakpoints in initializer routines for
---- gdb-6.3/gdb/objfiles.c.fix	Mon Jan 10 14:37:04 2005
-+++ gdb-6.3/gdb/objfiles.c	Mon Jan 10 14:39:34 2005
-@@ -46,6 +46,8 @@
- #include "block.h"
+Index: gdb-6.5/gdb/objfiles.c
+===================================================================
+--- gdb-6.5.orig/gdb/objfiles.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/objfiles.c	2006-07-11 02:47:11.000000000 -0300
+@@ -47,6 +47,9 @@
  #include "dictionary.h"
+ #include "source.h"
  
++#include "auxv.h"
 +#include "elf/common.h"
 +
  /* Prototypes for local functions */
  
  static void objfile_alloc_data (struct objfile *objfile);
-@@ -257,7 +259,19 @@ init_entry_point_info (struct objfile *o
+@@ -258,7 +261,19 @@ init_entry_point_info (struct objfile *o
  CORE_ADDR
  entry_point_address (void)
  {
@@ -181,17 +196,20 @@
  }
  
  /* Create the terminating entry of OBJFILE's minimal symbol table.
---- gdb-6.3/gdb/solib-svr4.c.fix	Mon Jan 10 14:37:15 2005
-+++ gdb-6.3/gdb/solib-svr4.c	Mon Jan 10 14:39:34 2005
-@@ -34,6 +34,7 @@
+Index: gdb-6.5/gdb/solib-svr4.c
+===================================================================
+--- gdb-6.5.orig/gdb/solib-svr4.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/solib-svr4.c	2006-07-11 02:47:11.000000000 -0300
+@@ -34,6 +34,8 @@
  #include "gdbcore.h"
  #include "target.h"
  #include "inferior.h"
++#include "auxv.h"
 +#include "command.h"
  
- #include "solist.h"
- #include "solib-svr4.h"
-@@ -168,7 +169,9 @@ static CORE_ADDR breakpoint_addr;	/* Add
+ #include "gdb_assert.h"
+ 
+@@ -254,7 +256,9 @@ static CORE_ADDR breakpoint_addr;	/* Add
  
  /* Local function prototypes */
  
@@ -201,14 +219,14 @@
  
  static CORE_ADDR bfd_lookup_symbol (bfd *, char *, flagword);
  
-@@ -290,22 +293,79 @@ elf_locate_base (void)
+@@ -376,22 +380,79 @@ elf_locate_base (void)
  {
    struct bfd_section *dyninfo_sect;
    int dyninfo_sect_size;
 -  CORE_ADDR dyninfo_addr;
 +  CORE_ADDR dyninfo_addr, relocated_dyninfo_addr, entry_addr;
-   char *buf;
-   char *bufend;
+   gdb_byte *buf;
+   gdb_byte *bufend;
    int arch_size;
 +  int ret;
 +
@@ -285,7 +303,7 @@
  
    /* Find the DT_DEBUG entry in the the .dynamic section.
       For mips elf we look for DT_MIPS_RLD_MAP, mips elf apparently has
-@@ -332,6 +392,10 @@ elf_locate_base (void)
+@@ -418,6 +479,10 @@ elf_locate_base (void)
  	    {
  	      dyn_ptr = bfd_h_get_32 (exec_bfd, 
  				      (bfd_byte *) x_dynp->d_un.d_ptr);
@@ -296,29 +314,30 @@
  	      return dyn_ptr;
  	    }
  	  else if (dyn_tag == DT_MIPS_RLD_MAP)
-@@ -470,6 +534,10 @@ first_link_map_member (void)
-   char *r_map_buf = xmalloc (lmo->r_map_size);
-   struct cleanup *cleanups = make_cleanup (xfree, r_map_buf);
+@@ -543,6 +608,10 @@ solib_svr4_r_map (void)
+ {
+   struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
  
 +  if (debug_solib)
 +    fprintf_unfiltered (gdb_stdlog, 
-+                        "first_link_map_member: read at 0x%s\n",
++                        "solib_svr4_r_map: read at 0x%s\n",
 +                        paddr_nz (debug_base + lmo->r_map_offset));
-   read_memory (debug_base + lmo->r_map_offset, r_map_buf, lmo->r_map_size);
- 
-   /* Assume that the address is unsigned.  */
-@@ -583,6 +651,10 @@ svr4_current_sos (void)
-   CORE_ADDR lm;
-   struct so_list *head = 0;
+   return read_memory_typed_address (debug_base + lmo->r_map_offset,
+ 				    builtin_type_void_data_ptr);
+ }
+@@ -669,6 +738,11 @@ svr4_current_sos (void)
    struct so_list **link_ptr = &head;
+   CORE_ADDR ldsomap = 0;
+ 
 +  if (debug_solib)
 +    fprintf_unfiltered (gdb_stdlog, 
 +                        "svr4_current_sos: exec_bfd %s\n",
 +                        exec_bfd->filename);
- 
++
    /* Make sure we've looked up the inferior's dynamic linker's base
       structure.  */
-@@ -593,12 +665,22 @@ svr4_current_sos (void)
+   if (! debug_base)
+@@ -678,11 +752,21 @@ svr4_current_sos (void)
        /* If we can't find the dynamic linker's base structure, this
  	 must not be a dynamically linked executable.  Hmm.  */
        if (! debug_base)
@@ -334,18 +353,16 @@
  
    /* Walk the inferior's link map list, and build our list of
       `struct so_list' nodes.  */
--  lm = first_link_map_member ();  
 +  if (debug_solib)
 +    fprintf_unfiltered (gdb_stdlog, 
 +                        "svr4_current_sos: walk link map in %s\n",
 +                        exec_bfd->filename);
-+  lm = first_link_map_member (); 
+   lm = solib_svr4_r_map ();
    while (lm)
      {
-       struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
-@@ -615,54 +697,156 @@ svr4_current_sos (void)
+@@ -697,23 +781,103 @@ svr4_current_sos (void)
+       new->lm_info->lm = xzalloc (lmo->link_map_size);
        make_cleanup (xfree, new->lm_info->lm);
-       memset (new->lm_info->lm, 0, lmo->link_map_size);
  
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog, 
@@ -364,7 +381,7 @@
           SVR4, it has no name.  For others (Solaris 2.3 for example), it
           does have a name, so we can no longer use a missing name to
           decide when to ignore it. */
-       if (IGNORE_FIRST_LINK_MAP_ENTRY (new))
+       if (IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0)
 -	free_so (new);
 +	{
 +          /* It is the first link map entry, i.e. it is the main executable.  */
@@ -448,13 +465,26 @@
  	  target_read_string (LM_NAME (new), &buffer,
  			      SO_NAME_MAX_PATH_SIZE - 1, &errcode);
  	  if (errcode != 0)
- 	    {
--	      warning ("current_sos: Can't read pathname for load map: %s\n",
-+	      warning ("svr4_current_sos: Can't read pathname for load map: %s\n",
- 		       safe_strerror (errcode));
- 	    }
+@@ -721,22 +885,37 @@ svr4_current_sos (void)
+ 		     safe_strerror (errcode));
  	  else
  	    {
+-	      strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
+-	      new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
+-	      xfree (buffer);
+-	      strcpy (new->so_original_name, new->so_name);
+-	    }
+-
+-	  /* If this entry has no name, or its name matches the name
+-	     for the main executable, don't include it in the list.  */
+-	  if (! new->so_name[0]
+-	      || match_main (new->so_name))
+-	    free_so (new);
+-	  else
+-	    {
+-	      new->next = 0;
+-	      *link_ptr = new;
+-	      link_ptr = &new->next;
 +              if (debug_solib)
 +                fprintf_unfiltered (gdb_stdlog, 
 +                                    "svr4_current_sos: LM_NAME is <%s>\n",
@@ -462,47 +492,34 @@
 +              /* The name could be empty, in which case it is the
 +                 system supplied DSO.  */
 +              if (strcmp (buffer, "") == 0)
-+               {
++		{
 +                 xfree (buffer);
 +                 free_so (new);
-+               }
-+
++		}
 +              else
 +                {
- 	      strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
- 	      new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
- 	      xfree (buffer);
- 	      strcpy (new->so_original_name, new->so_name);
--	    }
-+	      if (debug_solib)
-+		{
-+		  fprintf_unfiltered (gdb_stdlog, 
-+				      "svr4_current_sos: Processing DSO: %s\n",
-+				      new->so_name);
-+		  fprintf_unfiltered (gdb_stdlog,
-+				      "svr4_current_sos: first link entry %d\n",
-+				      IGNORE_FIRST_LINK_MAP_ENTRY (new));
-+		}
++		  strncpy (new->so_name, buffer, SO_NAME_MAX_PATH_SIZE - 1);
++		  new->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
++		  xfree (buffer);
++		  strcpy (new->so_original_name, new->so_name);
++		  if (debug_solib)
++		    {
++		      fprintf_unfiltered (gdb_stdlog, 
++					  "svr4_current_sos: Processing DSO: %s\n",
++					  new->so_name);
++		      fprintf_unfiltered (gdb_stdlog,
++					  "svr4_current_sos: first link entry %d\n",
++					  IGNORE_FIRST_LINK_MAP_ENTRY (new));
++		    }
 +
-+	  new->next = 0;
-+	  *link_ptr = new;
-+	  link_ptr = &new->next;
- 
--	  /* If this entry has no name, or its name matches the name
--	     for the main executable, don't include it in the list.  */
--	  if (! new->so_name[0]
--	      || match_main (new->so_name))
--	    free_so (new);
--	  else
--	    {
--	      new->next = 0;
--	      *link_ptr = new;
--	      link_ptr = &new->next;
--	    }
-+            }
-+          }
++		  new->next = 0;
++		  *link_ptr = new;
++		  link_ptr = &new->next;
++		}
+ 	    }
  	}
  
+@@ -750,6 +929,11 @@ svr4_current_sos (void)
        discard_cleanups (old_chain);
      }
  
@@ -514,16 +531,7 @@
    return head;
  }
  
-@@ -681,7 +865,7 @@ svr4_fetch_objfile_link_map (struct objf
-     return 0;   /* failed somehow... */
- 
-   /* Position ourselves on the first link map.  */
--  lm = first_link_map_member ();  
-+  lm = first_link_map_member ();
-   while (lm)
-     {
-       /* Get info on the layout of the r_debug and link_map structures. */
-@@ -742,7 +926,7 @@ svr4_fetch_objfile_link_map (struct objf
+@@ -826,7 +1010,7 @@ svr4_fetch_objfile_link_map (struct objf
  /* On some systems, the only way to recognize the link map entry for
     the main executable file is by looking at its name.  Return
     non-zero iff SONAME matches one of the known main executable names.  */
@@ -532,7 +540,7 @@
  static int
  match_main (char *soname)
  {
-@@ -756,6 +940,7 @@ match_main (char *soname)
+@@ -840,6 +1024,7 @@ match_main (char *soname)
  
    return (0);
  }
@@ -540,7 +548,7 @@
  
  /* Return 1 if PC lies in the dynamic symbol resolution code of the
     SVR4 run time loader.  */
-@@ -855,6 +1040,11 @@ enable_break (void)
+@@ -939,6 +1124,11 @@ enable_break (void)
    /* Find the .interp section; if not found, warn the user and drop
       into the old breakpoint at symbol code.  */
    interp_sect = bfd_get_section_by_name (exec_bfd, ".interp");
@@ -552,9 +560,9 @@
    if (interp_sect)
      {
        unsigned int interp_sect_size;
-@@ -888,6 +1078,9 @@ enable_break (void)
+@@ -972,6 +1162,9 @@ enable_break (void)
        if (tmp_fd >= 0)
- 	tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd);
+ 	tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd);
  
 +      if (debug_solib)
 +         fprintf_unfiltered (gdb_stdlog,
@@ -562,7 +570,7 @@
        if (tmp_bfd == NULL)
  	goto bkpt_at_symbol;
  
-@@ -968,6 +1161,9 @@ enable_break (void)
+@@ -1052,6 +1245,9 @@ enable_break (void)
        if (sym_addr != 0)
  	{
  	  create_solib_event_breakpoint (load_addr + sym_addr);
@@ -572,7 +580,7 @@
  	  return 1;
  	}
  
-@@ -1227,6 +1423,8 @@ svr4_solib_create_inferior_hook (void)
+@@ -1311,6 +1507,8 @@ svr4_solib_create_inferior_hook (void)
    while (stop_signal != TARGET_SIGNAL_TRAP);
    stop_soon = NO_STOP_QUIETLY;
  #endif /* defined(_SCO_DS) */
@@ -581,7 +589,7 @@
  }
  
  static void
-@@ -1430,6 +1628,75 @@ svr4_lp64_fetch_link_map_offsets (void)
+@@ -1493,6 +1691,75 @@ svr4_lp64_fetch_link_map_offsets (void)
  
    return lmp;
  }
@@ -610,36 +618,36 @@
 +                                                                                
 +  /* Walk the inferior's link map list, and print the info.  */
 + 
-+  lm = first_link_map_member ();
++  lm = solib_svr4_r_map ();
 +  while (lm)
 +    {
 +      int errcode;
 +      char *buffer;
 +      CORE_ADDR load_addr;
 +
-+      struct link_map_offsets *lmo = SVR4_FETCH_LINK_MAP_OFFSETS ();
++      struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
 +      struct so_list *new
 +        = (struct so_list *) xmalloc (sizeof (struct so_list));
 +      struct cleanup *old_chain = make_cleanup (xfree, new);
-+                                                                                
++
 +      memset (new, 0, sizeof (*new));
 +
 +      new->lm_info = xmalloc (sizeof (struct lm_info));
 +      make_cleanup (xfree, new->lm_info);
-+                                                                                
++
 +      new->lm_info->lm = xmalloc (lmo->link_map_size);
 +      make_cleanup (xfree, new->lm_info->lm);
 +      memset (new->lm_info->lm, 0, lmo->link_map_size);
-+                                                                                
++
 +      if (debug_solib)
 +        fprintf_unfiltered (gdb_stdlog,
 +                            "svr4_print_linkmap: read lm at 0x%s\n", paddr_nz(lm));
 +      read_memory (lm, new->lm_info->lm, lmo->link_map_size);
-+                                                                                
++
 +      lm = LM_NEXT (new);
-+                                                                                
++
 +      /* Load address.  */
-+      load_addr = LM_ADDR (new);
++      load_addr = LM_ADDR_CHECK (new, NULL);
 +      /* Shared object's name.  */
 +      target_read_string (LM_NAME (new), &buffer,
 +			  SO_NAME_MAX_PATH_SIZE - 1, &errcode);
@@ -657,7 +665,7 @@
  
  
  static struct target_so_ops svr4_so_ops;
-@@ -1453,4 +1720,8 @@ _initialize_svr4_solib (void)
+@@ -1515,4 +1782,8 @@ _initialize_svr4_solib (void)
  
    /* FIXME: Don't do this here.  *_gdbarch_init() should set so_ops. */
    current_target_so_ops = &svr4_so_ops;
@@ -666,9 +674,11 @@
 +            "Display the inferior's linkmap.");
 +
  }
---- gdb-6.3/gdb/varobj.c.fix	Mon Jan 10 14:38:00 2005
-+++ gdb-6.3/gdb/varobj.c	Mon Jan 10 14:39:35 2005
-@@ -854,6 +854,62 @@ varobj_list (struct varobj ***varlist)
+Index: gdb-6.5/gdb/varobj.c
+===================================================================
+--- gdb-6.5.orig/gdb/varobj.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/varobj.c	2006-07-11 02:56:57.000000000 -0300
+@@ -870,6 +870,62 @@ varobj_list (struct varobj ***varlist)
    return rootcount;
  }
  
@@ -679,17 +689,17 @@
 +  struct varobj_root *croot;
 +  int mycount = rootcount;
 +  char * name;
-+                                                                                
++
 +  croot = rootlist;
 +  while ((croot != NULL) && (mycount > 0))
 +    {
 +      var = croot->rootvar;
-+                                                                                
++
 +      /* 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;
 +
@@ -701,7 +711,7 @@
 +        {
 +          return;
 +        }
-+                                                                                
++
 +      /* We definitively need to catch errors here.
 +         If evaluate_expression succeeds we got the value we wanted.
 +         But if it fails, we still go on with a call to evaluate_type()  */
@@ -709,30 +719,32 @@
 +        {
 +          /* no error */
 +          release_value (var->value);
-+          if (VALUE_LAZY (var->value))
++          if (value_lazy (var->value))
 +            gdb_value_fetch_lazy (var->value);
 +        }
 +      else
 +        var->value = evaluate_type (var->root->exp);
-+                                                                                
-+      var->type = VALUE_TYPE (var->value);
-+                                                                                
++
++      var->type = value_type (var->value);
++
 +      mycount--;
 +      croot = croot->next;
 +    }
-+                                                                                
++
 +  if (mycount || (croot != NULL))
 +    warning
 +      ("varobj_refresh: assertion failed - wrong tally of root vars (%d:%d)",
 +       rootcount, mycount);
 +}
-+                                                                                
++
 +
  /* Update the values for a variable and its children.  This is a
     two-pronged attack.  First, re-parse the value for the root's
     expression to see if it's changed.  Then go all the way
---- gdb-6.3/gdb/solist.h.fix	Mon Jan 10 14:37:45 2005
-+++ gdb-6.3/gdb/solist.h	Mon Jan 10 14:39:35 2005
+Index: gdb-6.5/gdb/solist.h
+===================================================================
+--- gdb-6.5.orig/gdb/solist.h	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/solist.h	2006-07-11 02:47:11.000000000 -0300
 @@ -62,6 +62,8 @@ struct so_list
      bfd *abfd;
      char symbols_loaded;	/* flag: symbols read in yet? */
@@ -758,33 +770,37 @@
  /* FIXME: gdbarch needs to control this variable */
  extern struct target_so_ops *current_target_so_ops;
  
-@@ -135,4 +143,6 @@ extern struct target_so_ops *current_tar
- #define TARGET_SO_FIND_AND_OPEN_SOLIB \
-   (current_target_so_ops->find_and_open_solib)
+@@ -126,4 +134,6 @@ extern struct target_so_ops *current_tar
+ #define TARGET_SO_IN_DYNSYM_RESOLVE_CODE \
+   (current_target_so_ops->in_dynsym_resolve_code)
  
 +/* Controls the printing of debugging output.  */
 +extern int debug_solib;
  #endif
---- gdb-6.3/gdb/varobj.h.fix	Mon Jan 10 14:38:06 2005
-+++ gdb-6.3/gdb/varobj.h	Mon Jan 10 14:39:35 2005
-@@ -97,4 +97,6 @@ extern int varobj_list (struct varobj **
+Index: gdb-6.5/gdb/varobj.h
+===================================================================
+--- gdb-6.5.orig/gdb/varobj.h	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/varobj.h	2006-07-11 02:47:11.000000000 -0300
+@@ -99,4 +99,6 @@ extern int varobj_list (struct varobj **
  
  extern int varobj_update (struct varobj **varp, struct varobj ***changelist);
  
 +extern void varobj_refresh(void);
 +
  #endif /* VAROBJ_H */
---- gdb-6.3/gdb/symfile.c.fix	Mon Jan 10 14:38:16 2005
-+++ gdb-6.3/gdb/symfile.c	Mon Jan 10 14:39:35 2005
-@@ -48,6 +48,7 @@
+Index: gdb-6.5/gdb/symfile.c
+===================================================================
+--- gdb-6.5.orig/gdb/symfile.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-07-11 02:56:57.000000000 -0300
+@@ -49,6 +49,7 @@
  #include "readline/readline.h"
  #include "gdb_assert.h"
  #include "block.h"
 +#include "varobj.h"
+ #include "observer.h"
+ #include "exec.h"
  
- #include <sys/types.h>
- #include <fcntl.h>
-@@ -558,7 +559,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -658,7 +659,7 @@ syms_from_objfile (struct objfile *objfi
  
    /* Now either addrs or offsets is non-zero.  */
  
@@ -793,7 +809,7 @@
      {
        /* We will modify the main symbol table, make sure that all its users
           will be cleaned up if an error occurs during symbol reading.  */
-@@ -586,7 +587,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -686,7 +687,7 @@ syms_from_objfile (struct objfile *objfi
  
       We no longer warn if the lowest section is not a text segment (as
       happens for the PA64 port.  */
@@ -802,7 +818,7 @@
      {
        asection *lower_sect;
        asection *sect;
-@@ -755,17 +756,21 @@ new_symfile_objfile (struct objfile *obj
+@@ -855,17 +856,21 @@ new_symfile_objfile (struct objfile *obj
    /* If this is the main symbol file we have to clean up all users of the
       old main symbol file. Otherwise it is sufficient to fixup all the
       breakpoints that may have been redefined by this symbol file.  */
@@ -826,7 +842,7 @@
  
    /* We're done reading the symbol file; finish off complaints.  */
    clear_complaints (&symfile_complaints, 0, verbo);
-@@ -808,7 +813,7 @@ symbol_file_add_with_addrs_or_offsets (b
+@@ -908,7 +913,7 @@ symbol_file_add_with_addrs_or_offsets (b
       interactively wiping out any existing symbols.  */
  
    if ((have_full_symbols () || have_partial_symbols ())
@@ -834,11 +850,11 @@
 +      && (mainline == 1)
        && from_tty
        && !query ("Load new symbol table from \"%s\"? ", name))
-     error ("Not confirmed.");
-@@ -987,6 +992,10 @@ symbol_file_clear (int from_tty)
-       && !query ("Discard symbol table from `%s'? ",
- 		 symfile_objfile->name))
-     error ("Not confirmed.");
+     error (_("Not confirmed."));
+@@ -1089,6 +1094,10 @@ symbol_file_clear (int from_tty)
+ 		    symfile_objfile->name)
+ 	  : !query (_("Discard symbol table? "))))
+     error (_("Not confirmed."));
 +#ifdef CLEAR_SOLIB
 +      CLEAR_SOLIB ();
 +#endif
@@ -846,7 +862,7 @@
      free_all_objfiles ();
  
      /* solib descriptors may have handles to objfiles.  Since their
-@@ -1979,6 +1988,8 @@ reread_symbols (void)
+@@ -2154,6 +2163,8 @@ reread_symbols (void)
  	      /* Discard cleanups as symbol reading was successful.  */
  	      discard_cleanups (old_cleanups);
  
@@ -855,7 +871,7 @@
  	      /* If the mtime has changed between the time we set new_modtime
  	         and now, we *want* this to be out of date, so don't call stat
  	         again now.  */
-@@ -2338,6 +2349,7 @@ clear_symtab_users (void)
+@@ -2529,6 +2540,7 @@ clear_symtab_users (void)
    clear_pc_function_cache ();
    if (deprecated_target_new_objfile_hook)
      deprecated_target_new_objfile_hook (NULL);
@@ -863,9 +879,101 @@
  }
  
  static void
---- gdb-6.3/gdb/breakpoint.c.fix	Mon Jan 10 14:38:20 2005
-+++ gdb-6.3/gdb/breakpoint.c	Mon Jan 10 14:39:35 2005
-@@ -3900,6 +3900,7 @@ describe_other_breakpoints (CORE_ADDR pc
+Index: gdb-6.5/gdb/breakpoint.c
+===================================================================
+--- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 02:47:11.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.c	2006-07-11 02:56:59.000000000 -0300
+@@ -782,15 +782,15 @@ insert_watchpoints_for_new_thread (ptid_
+ 	  struct value *v = b->owner->val_chain;
+ 
+ 	  /* Look at each value on the value chain.  */
+-	  for (; v; v = v->next)
++	  for (; v; v = value_next (v))
+ 	    {
+ 	      /* If it's a memory location, and GDB actually needed
+ 		 its contents to evaluate the expression, then we
+ 		 must watch it.  */
+ 	      if (VALUE_LVAL (v) == lval_memory
+-		  && ! VALUE_LAZY (v))
++		  && ! value_lazy (v))
+ 		{
+-		  struct type *vtype = check_typedef (VALUE_TYPE (v));
++		  struct type *vtype = check_typedef (value_type (v));
+ 		  
+ 		  /* We only watch structs and arrays if user asked
+ 		     for it explicitly, never if they just happen to
+@@ -802,8 +802,8 @@ insert_watchpoints_for_new_thread (ptid_
+ 		      CORE_ADDR addr;
+ 		      int len, type;
+ 		      
+-		      addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
+-		      len = TYPE_LENGTH (VALUE_TYPE (v));
++		      addr = VALUE_ADDRESS (v) + value_offset (v);
++		      len = TYPE_LENGTH (value_type (v));
+ 		      type = hw_write;
+ 		      if (b->owner->type == bp_read_watchpoint)
+ 			type = hw_read;
+@@ -2680,12 +2680,12 @@ mark_triggered_watchpoints (CORE_ADDR st
+ 	|| b->type == bp_read_watchpoint
+ 	|| b->type == bp_access_watchpoint)
+       {
+-	for (v = b->val_chain; v; v = v->next)
++	for (v = b->val_chain; v; v = value_next (v))
+ 	  {
+ 	    if (VALUE_LVAL (v) == lval_memory
+-	        && ! VALUE_LAZY (v))
++	        && ! value_lazy (v))
+ 	      {
+-	        struct type *vtype = check_typedef (VALUE_TYPE (v));
++	        struct type *vtype = check_typedef (value_type (v));
+ 		    
+ 		if (v == b->val_chain
+ 		    || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT
+@@ -2693,11 +2693,11 @@ mark_triggered_watchpoints (CORE_ADDR st
+ 		  {
+ 		    CORE_ADDR vaddr;
+ 			
+-		    vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
++		    vaddr = VALUE_ADDRESS (v) + value_offset (v);
+ 		    /* Exact match not required.  Within range is
+ 		       sufficient.  */
+ 		    if (addr >= vaddr &&
+-		        addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v)))
++		        addr < vaddr + TYPE_LENGTH (value_type (v)))
+ 		      b->watchpoint_triggered = 1;
+ 		  }
+ 	      }
+@@ -2867,12 +2867,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+ 		bs->stop = 0;
+ 		continue;
+ 	      }
+-	    for (v = b->val_chain; v; v = v->next)
++	    for (v = b->val_chain; v; v = value_next (v))
+ 	      {
+ 		if (VALUE_LVAL (v) == lval_memory
+-		    && ! VALUE_LAZY (v))
++		    && ! value_lazy (v))
+ 		  {
+-		    struct type *vtype = check_typedef (VALUE_TYPE (v));
++		    struct type *vtype = check_typedef (value_type (v));
+ 		    
+ 		    if (v == b->val_chain
+ 			|| (TYPE_CODE (vtype) != TYPE_CODE_STRUCT
+@@ -2880,11 +2880,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+ 		      {
+ 			CORE_ADDR vaddr;
+ 			
+-			vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
++			vaddr = VALUE_ADDRESS (v) + value_offset (v);
+ 			/* Exact match not required.  Within range is
+ 			   sufficient.  */
+ 			if (addr >= vaddr &&
+-			    addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v)))
++			    addr < vaddr + TYPE_LENGTH (value_type (v)))
+ 			  must_check_value = 1;
+ 		      }
+ 		  }
+@@ -3931,6 +3931,7 @@ describe_other_breakpoints (CORE_ADDR pc
  			       b->number,
  			       ((b->enable_state == bp_disabled || 
  				 b->enable_state == bp_shlib_disabled || 
@@ -873,9 +981,9 @@
  				 b->enable_state == bp_call_disabled) 
  				? " (disabled)" 
  				: b->enable_state == bp_permanent 
-@@ -4575,6 +4576,62 @@ re_enable_breakpoints_in_shlibs (void)
- 
- #endif
+@@ -4609,6 +4610,62 @@ re_enable_breakpoints_in_shlibs (void)
+   }
+ }
  
 +void
 +disable_breakpoints_at_startup (int silent)
@@ -936,7 +1044,7 @@
  static void
  solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname,
  		     char *cond_string, enum bptype bp_kind)
-@@ -6915,6 +6972,7 @@ delete_breakpoint (struct breakpoint *bp
+@@ -6955,6 +7012,7 @@ delete_breakpoint (struct breakpoint *bp
  	    && !b->loc->duplicate
  	    && b->enable_state != bp_disabled
  	    && b->enable_state != bp_shlib_disabled
@@ -944,7 +1052,7 @@
  	    && !b->pending
  	    && b->enable_state != bp_call_disabled)
  	{
-@@ -7128,7 +7186,8 @@ breakpoint_re_set_one (void *bint)
+@@ -7170,7 +7228,8 @@ breakpoint_re_set_one (void *bint)
  	break;
  
        save_enable = b->enable_state;
@@ -954,9 +1062,11 @@
          b->enable_state = bp_disabled;
        else
  	/* If resetting a shlib-disabled breakpoint, we don't want to
---- gdb-6.3/gdb/solib.c.fix	Mon Jan 10 14:38:26 2005
-+++ gdb-6.3/gdb/solib.c	Mon Jan 10 15:04:59 2005
-@@ -47,6 +47,8 @@
+Index: gdb-6.5/gdb/solib.c
+===================================================================
+--- gdb-6.5.orig/gdb/solib.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/solib.c	2006-07-11 02:47:11.000000000 -0300
+@@ -72,6 +72,8 @@ solib_ops (struct gdbarch *gdbarch)
  
  /* external data declarations */
  
@@ -965,16 +1075,16 @@
  /* FIXME: gdbarch needs to control this variable */
  struct target_so_ops *current_target_so_ops;
  
-@@ -69,6 +71,8 @@ static char *solib_absolute_prefix = NUL
-    and LD_LIBRARY_PATH.  */
- static char *solib_search_path = NULL;
+@@ -102,6 +104,8 @@ The search path for loading non-absolute
+ 		    value);
+ }
  
 +void add_to_target_sections (int, struct target_ops *, struct so_list *);
 +
  /*
  
     GLOBAL FUNCTION
-@@ -335,7 +339,6 @@ free_so (struct so_list *so)
+@@ -372,7 +376,6 @@ free_so (struct so_list *so)
    xfree (so);
  }
  
@@ -982,7 +1092,7 @@
  /* Return address of first so_list entry in master shared object list.  */
  struct so_list *
  master_so_list (void)
-@@ -343,7 +346,6 @@ master_so_list (void)
+@@ -380,7 +383,6 @@ master_so_list (void)
    return so_list_head;
  }
  
@@ -990,7 +1100,7 @@
  /* A small stub to get us past the arg-passing pinhole of catch_errors.  */
  
  static int
-@@ -355,15 +357,40 @@ symbol_add_stub (void *arg)
+@@ -392,15 +394,40 @@ symbol_add_stub (void *arg)
    /* Have we already loaded this shared object?  */
    ALL_OBJFILES (so->objfile)
      {
@@ -1034,7 +1144,7 @@
    free_section_addr_info (sap);
  
    return (1);
-@@ -458,6 +485,10 @@ update_solib_list (int from_tty, struct 
+@@ -523,6 +550,10 @@ update_solib_list (int from_tty, struct 
  	 the inferior's current list.  */
        while (i)
  	{
@@ -1045,7 +1155,7 @@
  	  if (! strcmp (gdb->so_original_name, i->so_original_name))
  	    break;
  
-@@ -511,32 +542,46 @@ update_solib_list (int from_tty, struct 
+@@ -576,28 +607,7 @@ update_solib_list (int from_tty, struct 
        /* Fill in the rest of each of the `struct so_list' nodes.  */
        for (i = inferior; i; i = i->next)
  	{
@@ -1072,7 +1182,10 @@
 -		}
 -	    }
 +   	  add_to_target_sections (from_tty, target, i);
- 	}
+ 
+ 	  /* Notify any observer that the shared object has been
+              loaded now that we've added it to GDB's tables.  */
+@@ -606,6 +616,41 @@ update_solib_list (int from_tty, struct 
      }
  }
  
@@ -1114,20 +1227,24 @@
  
  /* GLOBAL FUNCTION
  
-@@ -917,4 +962,10 @@ This takes precedence over the environme
-   deprecated_add_show_from_set (c, &showlist);
-   set_cmd_cfunc (c, reload_shared_libraries);
-   set_cmd_completer (c, filename_completer);
-+
-+  c = add_set_cmd ("solib", no_class, var_zinteger,
-+                   (char *) &debug_solib,
-+                   "Set debugging of GNU/Linux shlib module.\n\
-+Enables printf debugging output.\n", &setdebuglist);
-+  deprecated_add_show_from_set (c, &showdebuglist);
+@@ -978,4 +1023,12 @@ This takes precedence over the environme
+ 				     reload_shared_libraries,
+ 				     show_solib_search_path,
+ 				     &setlist, &showlist);
++
++  add_setshow_boolean_cmd ("solib", no_class, &debug_solib,
++			   _("\
++Set debugging of GNU/Linux shlib module.\n"), _("\
++Show debugging status of GNU/Linux shlib module.\n"), _("\
++Enables printf debugging output of GNU/Linux shlib module.\n"),
++			   NULL, NULL,
++			   &setdebuglist, &showdebuglist);
  }
---- gdb-6.3/gdb/elfread.c.fix	Mon Jan 10 14:38:32 2005
-+++ gdb-6.3/gdb/elfread.c	Mon Jan 10 14:39:35 2005
-@@ -528,7 +528,7 @@ elf_symfile_read (struct objfile *objfil
+Index: gdb-6.5/gdb/elfread.c
+===================================================================
+--- gdb-6.5.orig/gdb/elfread.c	2006-07-11 02:47:06.000000000 -0300
++++ gdb-6.5/gdb/elfread.c	2006-07-11 02:47:11.000000000 -0300
+@@ -556,7 +556,7 @@ elf_symfile_read (struct objfile *objfil
    /* If we are reinitializing, or if we have never loaded syms yet,
       set table to empty.  MAINLINE is cleared so that *_read_psymtab
       functions do not all also re-initialize the psymbol table. */

gdb-6.3-ppc64syscall-20040622.patch:
 rs6000-tdep.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 53 insertions(+), 2 deletions(-)

Index: gdb-6.3-ppc64syscall-20040622.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ppc64syscall-20040622.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ppc64syscall-20040622.patch	2 Dec 2004 18:30:25 -0000	1.1
+++ gdb-6.3-ppc64syscall-20040622.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -6,14 +6,11 @@
 	use to skip over first half of a GNU/Linux syscall and update
 	"func_start".
 
-Index: ./gdb/rs6000-tdep.c
+Index: gdb-6.5/gdb/rs6000-tdep.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/rs6000-tdep.c,v
-retrieving revision 1.215
-diff -p -u -r1.215 rs6000-tdep.c
---- ./gdb/rs6000-tdep.c	20 Jun 2004 17:18:06 -0000	1.215
-+++ ./gdb/rs6000-tdep.c	22 Jun 2004 19:06:46 -0000
-@@ -71,6 +71,7 @@
+--- gdb-6.5.orig/gdb/rs6000-tdep.c	2006-04-23 11:15:01.000000000 -0300
++++ gdb-6.5/gdb/rs6000-tdep.c	2006-07-07 00:54:50.000000000 -0300
+@@ -76,6 +76,7 @@
  
  struct rs6000_framedata
    {
@@ -21,15 +18,15 @@
      int offset;			/* total size of frame --- the distance
  				   by which we decrement sp to allocate
  				   the frame */
-@@ -694,7 +695,6 @@ store_param_on_stack_p (unsigned long op
+@@ -905,7 +906,6 @@ store_param_on_stack_p (unsigned long op
  static CORE_ADDR
  skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
  {
 -  CORE_ADDR orig_pc = pc;
    CORE_ADDR last_prologue_pc = pc;
    CORE_ADDR li_found_pc = 0;
-   char buf[4];
-@@ -712,6 +712,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+   gdb_byte buf[4];
+@@ -923,6 +923,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
    int minimal_toc_loaded = 0;
    int prev_insn_was_prologue_insn = 1;
    int num_skip_non_prologue_insns = 0;
@@ -37,7 +34,7 @@
    int r0_contains_arg = 0;
    const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (current_gdbarch);
    struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
-@@ -732,6 +733,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -943,6 +944,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
      lim_pc = refine_prologue_limit (pc, lim_pc);
  
    memset (fdata, 0, sizeof (struct rs6000_framedata));
@@ -45,7 +42,7 @@
    fdata->saved_gpr = -1;
    fdata->saved_fpr = -1;
    fdata->saved_vr = -1;
-@@ -760,6 +762,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -971,6 +973,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
  	break;
        op = extract_signed_integer (buf, 4);
  
@@ -101,12 +98,12 @@
        if ((op & 0xfc1fffff) == 0x7c0802a6)
  	{			/* mflr Rx */
  	  /* Since shared library / PIC code, which needs to get its
-@@ -913,7 +964,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
- 	  fdata->frameless = 0;
- 	  /* Don't skip over the subroutine call if it is not within
- 	     the first three instructions of the prologue.  */
+@@ -1138,7 +1189,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+ 	     we have no line table information or the line info tells
+ 	     us that the subroutine call is not part of the line
+ 	     associated with the prologue.  */
 -	  if ((pc - orig_pc) > 8)
 +	  if ((pc - fdata->func_start) > 8)
- 	    break;
- 
- 	  op = read_memory_integer (pc + 4, 4);
+ 	    {
+ 	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
+ 	      struct symtab_and_line this_sal = find_pc_line (pc, 0);

gdb-6.3-ppccfi-20041104.patch:
 dwarf2-frame.c   |    7 +++++++
 dwarf2-frame.h   |    7 ++++++-
 ppc-linux-tdep.c |   36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

Index: gdb-6.3-ppccfi-20041104.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ppccfi-20041104.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-ppccfi-20041104.patch	17 Jan 2005 17:28:54 -0000	1.1
+++ gdb-6.3-ppccfi-20041104.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -2,65 +2,17 @@
 
 	* dwarf2-frame.c (dwarf2_frame_prev_register): Handle
 	DWARF2_FRAME_REG_INDIRECT.
-	(dwarf2_frame_cache): Only complain when both COLUMN and REGNUM
-	are unspecified.
 	* dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add
 	DWARF2_FRAME_REG_INDIRECT.
 	* ppc-linux-tdep.c (ppc_linux_init_reg): New function.
 	(ppc_linux_init_abi): Enable dwarf2 frame sniffer.
 
-Index: ./gdb/dwarf2-frame.c
+Index: gdb-6.5/gdb/dwarf2-frame.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/dwarf2-frame.c,v
-retrieving revision 1.38
-diff -p -u -r1.38 dwarf2-frame.c
---- ./gdb/dwarf2-frame.c	23 Jul 2004 22:05:20 -0000	1.38
-+++ ./gdb/dwarf2-frame.c	4 Nov 2004 21:55:10 -0000
-@@ -662,22 +662,27 @@ dwarf2_frame_cache (struct frame_info *n
- 	if (regnum < 0 || regnum >= num_regs)
- 	  continue;
- 
--	/* NOTE: cagney/2003-09-05: CFI should specify the disposition
--	   of all debug info registers.  If it doesn't, complain (but
--	   not too loudly).  It turns out that GCC assumes that an
--	   unspecified register implies "same value" when CFI (draft
--	   7) specifies nothing at all.  Such a register could equally
--	   be interpreted as "undefined".  Also note that this check
--	   isn't sufficient; it only checks that all registers in the
--	   range [0 .. max column] are specified, and won't detect
--	   problems when a debug info register falls outside of the
--	   table.  We need a way of iterating through all the valid
--	   DWARF2 register numbers.  */
- 	if (fs->regs.reg[column].how == DWARF2_FRAME_REG_UNSPECIFIED)
--	  complaint (&symfile_complaints,
--		     "Incomplete CFI data; unspecified registers at 0x%s",
--		     paddr (fs->pc));
--	else
-+	  {
-+	    /* NOTE: cagney/2003-09-05: CFI should specify the
-+	       disposition of all debug info registers.  If it
-+	       doesn't, complain (but not too loudly).  It turns out
-+	       that GCC assumes that an unspecified register implies
-+	       "same value" when CFI (draft 7) specifies nothing at
-+	       all.  Such a register could equally be interpreted as
-+	       "undefined".  Also note that this check isn't
-+	       sufficient; it only checks that all registers in the
-+	       range [0 .. max column] are specified, and won't detect
-+	       problems when a debug info register falls outside of
-+	       the table.  We need a way of iterating through all the
-+	       valid DWARF2 register numbers.  */
-+	    if (cache->reg[regnum].how == DWARF2_FRAME_REG_UNSPECIFIED)
-+	      complaint (&symfile_complaints,
-+			 "Incomplete CFI data; unspecified register %s at 0x%s",
-+			 gdbarch_register_name (gdbarch, regnum),
-+			 paddr (fs->pc));
-+	  }
-+	else 
- 	  cache->reg[regnum] = fs->regs.reg[column];
-       }
-   }
-@@ -818,6 +823,13 @@ dwarf2_frame_prev_register (struct frame
- 	}
+--- gdb-6.5.orig/gdb/dwarf2-frame.c	2006-07-11 02:35:38.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.c	2006-07-11 02:41:33.000000000 -0300
+@@ -1020,6 +1020,13 @@ dwarf2_frame_prev_register (struct frame
+         }
        break;
  
 +    case DWARF2_FRAME_REG_INDIRECT:
@@ -71,15 +23,12 @@
 +      break;
 +
      default:
-       internal_error (__FILE__, __LINE__, "Unknown register rule.");
+       internal_error (__FILE__, __LINE__, _("Unknown register rule."));
      }
-Index: ./gdb/dwarf2-frame.h
+Index: gdb-6.5/gdb/dwarf2-frame.h
 ===================================================================
-RCS file: /cvs/src/src/gdb/dwarf2-frame.h,v
-retrieving revision 1.6
-diff -p -u -r1.6 dwarf2-frame.h
---- ./gdb/dwarf2-frame.h	28 Feb 2004 16:59:32 -0000	1.6
-+++ ./gdb/dwarf2-frame.h	4 Nov 2004 21:55:10 -0000
+--- gdb-6.5.orig/gdb/dwarf2-frame.h	2006-07-11 02:35:38.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.h	2006-07-11 02:40:26.000000000 -0300
 @@ -51,8 +51,13 @@ enum dwarf2_frame_reg_rule
    DWARF2_FRAME_REG_SAVED_EXP,
    DWARF2_FRAME_REG_SAME_VALUE,
@@ -93,16 +42,13 @@
 +     used internally by GDB.  These should be superseeded by
 +     REG_INDIRECT.  */
    DWARF2_FRAME_REG_RA,		/* Return Address.  */
-   DWARF2_FRAME_REG_CFA		/* Call Frame Address.  */
- };
-Index: ./gdb/ppc-linux-tdep.c
+   DWARF2_FRAME_REG_RA_OFFSET,	/* Return Address with offset.  */
+   DWARF2_FRAME_REG_CFA,		/* Call Frame Address.  */
+Index: gdb-6.5/gdb/ppc-linux-tdep.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/ppc-linux-tdep.c,v
-retrieving revision 1.66
-diff -p -u -r1.66 ppc-linux-tdep.c
---- ./gdb/ppc-linux-tdep.c	31 Jul 2004 21:53:17 -0000	1.66
-+++ ./gdb/ppc-linux-tdep.c	4 Nov 2004 21:55:10 -0000
-@@ -38,6 +38,7 @@
+--- gdb-6.5.orig/gdb/ppc-linux-tdep.c	2006-07-11 02:35:38.000000000 -0300
++++ gdb-6.5/gdb/ppc-linux-tdep.c	2006-07-11 02:35:47.000000000 -0300
+@@ -39,6 +39,7 @@
  #include "trad-frame.h"
  #include "frame-unwind.h"
  #include "tramp-frame.h"
@@ -110,8 +56,8 @@
  
  /* The following instructions are used in the signal trampoline code
     on GNU/Linux PPC. The kernel used to use magic syscalls 0x6666 and
-@@ -1057,6 +1058,39 @@ ppc_linux_regset_from_core_section (stru
- }
+@@ -1019,6 +1020,39 @@ static struct tramp_frame ppc64_linux_si
+ };
  
  static void
 +ppc_linux_init_reg (struct gdbarch *gdbarch, int regnum,
@@ -150,12 +96,12 @@
  ppc_linux_init_abi (struct gdbarch_info info,
                      struct gdbarch *gdbarch)
  {
-@@ -1180,6 +1181,8 @@
+@@ -1076,6 +1110,8 @@ ppc_linux_init_abi (struct gdbarch_info 
        tramp_frame_prepend_unwinder (gdbarch, &ppc64_linux_sighandler_tramp_frame);
      }
    set_gdbarch_regset_from_core_section (gdbarch, ppc_linux_regset_from_core_section);
 +  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
 +  dwarf2_frame_set_init_reg (gdbarch, ppc_linux_init_reg);
- }
  
- void
+   /* Enable TLS support.  */
+   set_gdbarch_fetch_tls_load_module_address (gdbarch,

gdb-6.3-security-errata-20050610.patch:
 Makefile.in                       |    2 
 cli/cli-cmds.c                    |   22 ++++++++
 main.c                            |    4 -
 testsuite/gdb.base/gdbinit.exp    |   98 ++++++++++++++++++++++++++++++++++++++
 testsuite/gdb.base/gdbinit.sample |    1 
 5 files changed, 123 insertions(+), 4 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 gdb-6.3-security-errata-20050610.patch
Index: gdb-6.3-security-errata-20050610.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-security-errata-20050610.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-security-errata-20050610.patch	8 Jul 2005 18:42:25 -0000	1.2
+++ gdb-6.3-security-errata-20050610.patch	11 Jul 2006 06:33:02 -0000	1.3
@@ -16,114 +16,10 @@
         (source_command): Update documentation.  Check permissions if
         FROM_TTY is -1.
 
-bfd changes:
-
-2005-05-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-        * elf.c (group_signature): Check if the symbol table section is
-        correct.
-
-2005-05-25  Jakub Jelinek  <jakub at redhat.com>
-
-        * elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and
-        first shdr has sh_size == 0.  Fail if e_shnum is large to cause
-        arithmetic overflow when allocating the i_shdr array.
-        Sanity check sh_link and sh_info fields.  Fix e_shstrndx sanity check.
-
-2005-05-07  Mike Frysinger  <vapier at gentoo.org>
-
-        * elfcode.h (elf_object_p): Add more sanity checks on elf header.
-
-2005-06-21  Jakub Jelinek  <jakub at redhat.com>
-
-	* libbfd-in.h (struct artdata): Add extended_names_size field.
-	* libbfd.h: Rebuilt.
-	* coff-rs600.c (_bfd_xcoff_archive_p): Don't clear fields in freshly
-	allocated object by bfd_zalloc.
-	* coff64-rs6000.c (xcoff64_archive_p): Likewise.
-	* ecoff.c (_bfd_ecoff_archive_p): Likewise.
-	* archive.c (_bfd_generic_mkarchive, bfd_generic_archive_p): Likewise.
-	(get_extended_arelt_filename): Fail if index is bigger or equal to
-	extended_names_size.
-	(_bfd_generic_read_ar_hdr_mag): Don't set bfd_error_malformed_archive,
-	get_extended_arelt_filename already did that.
-	(_bfd_slurp_extended_name_table): Initialize extended_names_size field.
-	Allocate one extra byte and clear it, in case extended names table
-	is not terminated.
-
-2005-06-15  Jakub Jelinek  <jakub at redhat.com>
-
-	* libbfd-in.h (bfd_malloc2, bfd_realloc2, bfd_zmalloc2, bfd_alloc2,
-	bfd_zalloc2): New prototypes.
-	* bfd-in.h (HALF_BFD_SIZE_TYPE): Define.
-	* libbfd.c (bfd_malloc2, bfd_realloc2, bfd_zmalloc2): New functions.
-	* opncls.c (bfd_alloc2, bfd_zalloc2): New functions.
-	* elf.c (bfd_elf_get_elf_syms, setup_group, assign_section_numbers,
-	elf_map_symbols, map_sections_to_segments,
-	assign_file_positions_for_segments, copy_private_bfd_data,
-	swap_out_syms, _bfd_elf_slurp_version_tables): Use bfd_*alloc2
-	where appropriate.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-
-	* elf.c (_bfd_elf_print_private_bfd_data): Don't crash on bogus
-	verdef or verneed section.
-	(_bfd_elf_slurp_version_tables): Handle corrupt verdef and/or
-	verneed sections gracefully.
-	* elf32-sparc.c (elf32_sparc_info_to_howto): Don't crash on
-	bogus relocation values.
-	* elf64-sparc.c (sparc64_elf_info_to_howto): Likewise.
-	* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
-	* elf64-s390.c (elf_s390_info_to_howto): Likewise.
-	* elf32-s390.c (elf_s390_info_to_howto): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_info_to_howto): Likewise.
-	* elfxx-ia64.c (lookup_howto): Likewise.
-
-2005-06-14  Jakub Jelinek  <jakub at redhat.com>
-
-	* elf.c (bfd_elf_get_str_section): Allocate an extra byte after
-	the end of strtab and clear it.
-	(elf_read): Remove.
-
-	* elf.c (bfd_section_from_shdr): Fail if name is NULL.
-	Prevent endless recursion on broken objects.
-
-	* archive.c (do_slurp_coff_armap): Check for overflows.
-
-2005-05-26  Jakub Jelinek  <jakub at redhat.com>
-
-	* elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and
-	first shdr has sh_size == 0.  Fail if e_shnum is large to cause
-	arithmetic overflow when allocating the i_shdr array.
-	Sanity check sh_link and sh_info fields.  Fix e_shstrndx sanity check.
-
-2005-05-18  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (group_signature): Check if the symbol table section is
-	correct.
-
-2005-05-17  Tavis Ormandy <taviso at gentoo.org>
-
-	* elf.c (bfd_section_from_shdr): Add sanity check when parsing
-	dynamic sections.
-
-2005-05-09  Alan Modra  <amodra at bigpond.net.au>
-
-	* elfcode.h (elf_object_p): Add more sanity checks on elf header.
-
---- gdb-6.3/include/elf/external.h.fix	2005-07-07 19:14:08.000000000 -0400
-+++ gdb-6.3/include/elf/external.h	2005-07-07 19:18:27.000000000 -0400
-@@ -272,5 +272,8 @@ typedef struct
-   unsigned char		a_val[8];
- } Elf64_External_Auxv;
- 
-+/* Size of SHT_GROUP section entry.  */
-+
-+#define GRP_ENTRY_SIZE		4
- 
- #endif /* _ELF_EXTERNAL_H */
---- gdb-6.3/gdb/cli/cli-cmds.c.fix	2005-07-07 19:16:17.000000000 -0400
-+++ gdb-6.3/gdb/cli/cli-cmds.c	2005-07-07 19:18:27.000000000 -0400
+Index: gdb-6.5/gdb/cli/cli-cmds.c
+===================================================================
+--- gdb-6.5.orig/gdb/cli/cli-cmds.c	2006-07-11 03:22:45.000000000 -0300
++++ gdb-6.5/gdb/cli/cli-cmds.c	2006-07-11 03:26:36.000000000 -0300
 @@ -38,6 +38,7 @@
  #include "objfiles.h"
  #include "source.h"
@@ -132,18 +28,9 @@
  
  #include "ui-out.h"
  
-@@ -55,6 +56,8 @@
- #define GDBINIT_FILENAME        ".gdbinit"
- #endif
+@@ -453,12 +454,31 @@ source_command (char *args, int from_tty
  
-+#include <fcntl.h>
-+
- /* Prototypes for local command functions */
- 
- static void complete_command (char *, int);
-@@ -442,12 +445,32 @@ source_command (char *args, int from_tty
-   stream = fopen (file, FOPEN_RT);
-   if (!stream)
+   if (fd == -1)
      {
 -      if (from_tty)
 +      if (from_tty > 0)
@@ -156,27 +43,28 @@
 +  if (from_tty == -1)
 +    {
 +      struct stat statbuf;
-+      int fd = fileno (stream);
 +      if (fstat (fd, &statbuf) < 0)
 +	{
 +	  perror_with_name (file);
-+	  fclose (stream);
++	  close (fd);
 +	  return;
 +	}
 +      if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH))
 +	{
 +          warning (_("not using untrusted file \"%s\""), file);
-+	  fclose (stream);
++	  close (fd);
 +	  return;
 +	}
 +    }
 +#endif
 +
+   stream = fdopen (fd, FOPEN_RT);
    script_from_file (stream, file);
  
-   do_cleanups (old_cleanups);
---- gdb-6.3/gdb/testsuite/gdb.base/gdbinit.exp.fix	2005-07-07 19:19:30.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/gdbinit.exp	2005-07-07 19:18:27.000000000 -0400
+Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp	2006-07-11 03:22:48.000000000 -0300
 @@ -0,0 +1,98 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
@@ -276,13 +164,17 @@
 +}
 +
 +remote_exec build "rm .gdbinit"
---- gdb-6.3/gdb/testsuite/gdb.base/gdbinit.sample.fix	2005-07-07 19:19:34.000000000 -0400
-+++ gdb-6.3/gdb/testsuite/gdb.base/gdbinit.sample	2005-07-07 19:18:27.000000000 -0400
+Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample	2006-07-11 03:22:48.000000000 -0300
 @@ -0,0 +1 @@
 +echo "\nin gdbinit"
---- gdb-6.3/gdb/main.c.fix	2005-07-07 19:14:26.000000000 -0400
-+++ gdb-6.3/gdb/main.c	2005-07-07 19:18:55.000000000 -0400
-@@ -609,7 +609,7 @@ extern int gdbtk_test (char *);
+Index: gdb-6.5/gdb/main.c
+===================================================================
[...3115 lines suppressed...]
-@@ -350,7 +350,8 @@ elf_s390_info_to_howto (abfd, cache_ptr,
-      arelent *cache_ptr;
-      Elf_Internal_Rela *dst;
- {
--  switch (ELF32_R_TYPE(dst->r_info))
-+  unsigned int r_type = ELF32_R_TYPE(dst->r_info);
-+  switch (r_type)
-     {
-     case R_390_GNU_VTINHERIT:
-       cache_ptr->howto = &elf32_s390_vtinherit_howto;
-@@ -361,8 +362,13 @@ elf_s390_info_to_howto (abfd, cache_ptr,
-       break;
- 
-     default:
--      BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_390_max);
--      cache_ptr->howto = &elf_howto_table[ELF32_R_TYPE(dst->r_info)];
-+      if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
-+	{
-+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
-+				 abfd, (int) r_type);
-+	  r_type = R_390_NONE;
-+	}
-+      cache_ptr->howto = &elf_howto_table[r_type];
-     }
- }
- 
---- gdb-6.3/bfd/elf64-s390.c.fix	2005-07-07 19:11:09.000000000 -0400
-+++ gdb-6.3/bfd/elf64-s390.c	2005-07-07 19:18:55.000000000 -0400
-@@ -372,7 +372,8 @@ elf_s390_info_to_howto (abfd, cache_ptr,
-      arelent *cache_ptr;
-      Elf_Internal_Rela *dst;
- {
--  switch (ELF64_R_TYPE(dst->r_info))
-+  unsigned int r_type = ELF64_R_TYPE(dst->r_info);
-+  switch (r_type)
-     {
-     case R_390_GNU_VTINHERIT:
-       cache_ptr->howto = &elf64_s390_vtinherit_howto;
-@@ -383,8 +384,13 @@ elf_s390_info_to_howto (abfd, cache_ptr,
-       break;
- 
-     default:
--      BFD_ASSERT (ELF64_R_TYPE(dst->r_info) < (unsigned int) R_390_max);
--      cache_ptr->howto = &elf_howto_table[ELF64_R_TYPE(dst->r_info)];
-+      if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
-+	{
-+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
-+				 abfd, (int) r_type);
-+	  r_type = R_390_NONE;
-+	}
-+      cache_ptr->howto = &elf_howto_table[r_type];
-     }
- }
- 
---- gdb-6.3/bfd/elfxx-ia64.c.fix	2005-07-07 19:11:16.000000000 -0400
-+++ gdb-6.3/bfd/elfxx-ia64.c	2005-07-07 19:18:55.000000000 -0400
-@@ -479,7 +479,8 @@ lookup_howto (rtype)
- 	elf_code_to_howto_index[ia64_howto_table[i].type] = i;
-     }
- 
--  BFD_ASSERT (rtype <= R_IA64_MAX_RELOC_CODE);
-+  if (rtype > R_IA64_MAX_RELOC_CODE)
-+    return 0;
-   i = elf_code_to_howto_index[rtype];
-   if (i >= NELEMS (ia64_howto_table))
-     return 0;
---- gdb-6.3/bfd/coffcode.h.fix	2005-07-07 19:11:23.000000000 -0400
-+++ gdb-6.3/bfd/coffcode.h	2005-07-07 19:18:55.000000000 -0400
-@@ -5060,7 +5060,7 @@ coff_slurp_reloc_table (abfd, asect, sym
-   amt = (bfd_size_type) asect->reloc_count * sizeof (arelent);
-   reloc_cache = (arelent *) bfd_alloc (abfd, amt);
- 
--  if (reloc_cache == NULL)
-+  if (reloc_cache == NULL || native_relocs == NULL)
-     return FALSE;
- 
-   for (idx = 0; idx < asect->reloc_count; idx++)
---- gdb-6.3/bfd/peXXigen.c.fix	2005-07-07 19:11:29.000000000 -0400
-+++ gdb-6.3/bfd/peXXigen.c	2005-07-07 19:18:55.000000000 -0400
-@@ -1167,7 +1167,7 @@ pe_print_idata (abfd, vfile)
-       bfd_vma toc_address;
-       bfd_vma start_address;
-       bfd_byte *data;
--      int offset;
-+      bfd_vma offset;
- 
-       if (!bfd_malloc_and_get_section (abfd, rel_section, &data))
- 	{
-@@ -1178,6 +1178,13 @@ pe_print_idata (abfd, vfile)
- 
-       offset = abfd->start_address - rel_section->vma;
- 
-+      if (offset >= rel_section->size || offset + 8 > rel_section->size)
-+        {
-+          if (data != NULL)
-+            free (data);
-+          return FALSE;
-+        }
-+
-       start_address = bfd_get_32 (abfd, data + offset);
-       loadable_toc_address = bfd_get_32 (abfd, data + offset + 4);
-       toc_address = loadable_toc_address - 32768;
-@@ -1251,6 +1258,9 @@ pe_print_idata (abfd, vfile)
-       if (hint_addr == 0 && first_thunk == 0)
- 	break;
- 
-+      if (dll_name - adj >= section->size)
-+        break;
-+
-       dll = (char *) data + dll_name - adj;
-       fprintf (file, _("\n\tDLL Name: %s\n"), dll);
- 
---- gdb-6.3/bfd/coff-rs6000.c.fix	2005-07-07 19:11:38.000000000 -0400
-+++ gdb-6.3/bfd/coff-rs6000.c	2005-07-07 19:18:55.000000000 -0400
-@@ -1294,10 +1294,12 @@ _bfd_xcoff_archive_p (abfd)
-   if (bfd_ardata (abfd) == (struct artdata *) NULL)
-     goto error_ret_restore;
- 
--  bfd_ardata (abfd)->cache = NULL;
--  bfd_ardata (abfd)->archive_head = NULL;
--  bfd_ardata (abfd)->symdefs = NULL;
--  bfd_ardata (abfd)->extended_names = NULL;
-+  /* Cleared by bfd_zalloc above.
-+     bfd_ardata (abfd)->cache = NULL;
-+     bfd_ardata (abfd)->archive_head = NULL;
-+     bfd_ardata (abfd)->symdefs = NULL;
-+     bfd_ardata (abfd)->extended_names = NULL;
-+     bfd_ardata (abfd)->extended_names_size = 0;  */
- 
-   /* Now handle the two formats.  */
-   if (magic[1] != 'b')
---- gdb-6.3/bfd/coff64-rs6000.c.fix	2005-07-07 19:11:46.000000000 -0400
-+++ gdb-6.3/bfd/coff64-rs6000.c	2005-07-07 19:18:55.000000000 -0400
-@@ -1983,10 +1983,12 @@ xcoff64_archive_p (abfd)
-   if (bfd_ardata (abfd) == (struct artdata *) NULL)
-     goto error_ret_restore;
- 
--  bfd_ardata (abfd)->cache = NULL;
--  bfd_ardata (abfd)->archive_head = NULL;
--  bfd_ardata (abfd)->symdefs = NULL;
--  bfd_ardata (abfd)->extended_names = NULL;
-+  /* Already cleared by bfd_zalloc above.
-+     bfd_ardata (abfd)->cache = NULL;
-+     bfd_ardata (abfd)->archive_head = NULL;
-+     bfd_ardata (abfd)->symdefs = NULL;
-+     bfd_ardata (abfd)->extended_names = NULL;
-+     bfd_ardata (abfd)->extended_names_size = 0;  */
-   bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff,
- 							(const char **) NULL,
- 							10);
---- gdb-6.3/bfd/ecoff.c.fix	2005-07-07 19:11:51.000000000 -0400
-+++ gdb-6.3/bfd/ecoff.c	2005-07-07 19:18:55.000000000 -0400
-@@ -3329,11 +3329,13 @@ _bfd_ecoff_archive_p (abfd)
-     }
- 
-   bfd_ardata (abfd)->first_file_filepos = SARMAG;
--  bfd_ardata (abfd)->cache = NULL;
--  bfd_ardata (abfd)->archive_head = NULL;
--  bfd_ardata (abfd)->symdefs = NULL;
--  bfd_ardata (abfd)->extended_names = NULL;
--  bfd_ardata (abfd)->tdata = NULL;
-+  /* Already cleared by bfd_zalloc above.
-+     bfd_ardata (abfd)->cache = NULL;
-+     bfd_ardata (abfd)->archive_head = NULL;
-+     bfd_ardata (abfd)->symdefs = NULL;
-+     bfd_ardata (abfd)->extended_names = NULL;
-+     bfd_ardata (abfd)->extended_names_size = 0;
-+     bfd_ardata (abfd)->tdata = NULL;  */
- 
-   if (! _bfd_ecoff_slurp_armap (abfd)
-       || ! _bfd_ecoff_slurp_extended_name_table (abfd))
---- gdb-6.3/bfd/elf64-x86-64.c.fix	2005-07-07 19:17:31.000000000 -0400
-+++ gdb-6.3/bfd/elf64-x86-64.c	2005-07-07 19:18:55.000000000 -0400
-@@ -176,16 +176,19 @@ elf64_x86_64_info_to_howto (bfd *abfd AT
-   unsigned r_type, i;
- 
-   r_type = ELF64_R_TYPE (dst->r_info);
--  if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT)
-+  if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT
-+      || r_type >= (unsigned int) R_X86_64_max)
-     {
--      BFD_ASSERT (r_type <= (unsigned int) R_X86_64_TPOFF32);
-+      if (r_type > (unsigned int) R_X86_64_TPOFF32)
-+	{
-+	  (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
-+				 abfd, (int) r_type);
-+	  r_type = R_X86_64_NONE;
-+	}
-       i = r_type;
-     }
-   else
--    {
--      BFD_ASSERT (r_type < (unsigned int) R_X86_64_max);
--      i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_TPOFF32 - 1);
--    }
-+    i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_TPOFF32 - 1);
-   cache_ptr->howto = &x86_64_elf_howto_table[i];
-   BFD_ASSERT (r_type == cache_ptr->howto->type);
- }
+ 	$(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \

gdb-6.3-step-thread-exit-20050211.patch:
 infrun.c                                   |   22 ++++--
 linux-nat.c                                |   98 +++++++++++++++++++++++-----
 target.h                                   |    1 
 testsuite/gdb.threads/step-thread-exit.c   |   43 ++++++++++++
 testsuite/gdb.threads/step-thread-exit.exp |  100 +++++++++++++++++++++++++++++
 5 files changed, 241 insertions(+), 23 deletions(-)

Index: gdb-6.3-step-thread-exit-20050211.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-step-thread-exit-20050211.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-step-thread-exit-20050211.patch	11 Feb 2005 23:48:53 -0000	1.1
+++ gdb-6.3-step-thread-exit-20050211.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -20,8 +20,10 @@
 	* testsuite/gdb.threads/step-thread-exit.c: New testcase.
 	* testsuite/gdb.threads/step-thread-exit.exp: Ditto.
 	
---- gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.c.fix	2005-02-11 16:51:43.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.c	2005-02-11 18:27:55.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c	2006-07-07 02:26:54.000000000 -0300
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -66,8 +68,10 @@
 +}
 +
 +
---- gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.exp.fix	2005-02-11 16:51:47.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.threads/step-thread-exit.exp	2005-02-11 18:28:23.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp	2006-07-07 02:26:54.000000000 -0300
 @@ -0,0 +1,100 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -169,9 +173,11 @@
 +  }
 +}
 +
---- gdb-6.3/gdb/infrun.c.fix	2005-02-11 16:50:08.000000000 -0500
-+++ gdb-6.3/gdb/infrun.c	2005-02-11 16:52:45.000000000 -0500
-@@ -1072,6 +1072,7 @@ init_execution_control_state (struct exe
+Index: gdb-6.5/gdb/infrun.c
+===================================================================
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-07 01:17:35.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-07 02:26:54.000000000 -0300
+@@ -1088,6 +1088,7 @@ init_execution_control_state (struct exe
    ecs->current_symtab = ecs->sal.symtab;
    ecs->infwait_state = infwait_normal_state;
    ecs->waiton_ptid = pid_to_ptid (-1);
@@ -179,7 +185,7 @@
    ecs->wp = &(ecs->ws);
  }
  
-@@ -1296,6 +1297,16 @@ handle_inferior_event (struct execution_
+@@ -1307,6 +1308,16 @@ handle_inferior_event (struct execution_
        ui_out_text (uiout, "]\n");
      }
  
@@ -196,7 +202,7 @@
    switch (ecs->ws.kind)
      {
      case TARGET_WAITKIND_LOADED:
-@@ -2665,11 +2676,12 @@ process_event_stop_test:
+@@ -2651,11 +2662,12 @@ process_event_stop_test:
  static int
  currently_stepping (struct execution_control_state *ecs)
  {
@@ -214,9 +220,11 @@
  }
  
  /* Subroutine call with source code we should not step over.  Do step
---- gdb-6.3/gdb/linux-nat.c.fix	2005-02-11 16:50:14.000000000 -0500
-+++ gdb-6.3/gdb/linux-nat.c	2005-02-11 17:02:54.000000000 -0500
-@@ -1032,17 +1032,20 @@ linux_nat_detach (char *args, int from_t
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 02:24:51.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-07 02:29:12.000000000 -0300
+@@ -1121,18 +1121,21 @@ linux_nat_detach (char *args, int from_t
  static int
  resume_callback (struct lwp_info *lp, void *data)
  {
@@ -226,8 +234,9 @@
      {
        struct thread_info *tp;
  
--      child_resume (pid_to_ptid (GET_LWP (lp->ptid)), 0, TARGET_SIGNAL_0);
-+      child_resume (pid_to_ptid (GET_LWP (lp->ptid)), step, TARGET_SIGNAL_0);
+       linux_ops->to_resume (pid_to_ptid (GET_LWP (lp->ptid)),
+-			    0, TARGET_SIGNAL_0);
++			    step, TARGET_SIGNAL_0);
        if (debug_linux_nat)
  	fprintf_unfiltered (gdb_stdlog,
 -			    "RC:  PTRACE_CONT %s, 0, 0 (resume sibling)\n",
@@ -240,11 +249,11 @@
      }
  
    return 0;
-@@ -1110,13 +1113,17 @@ linux_nat_resume (ptid_t ptid, int step,
+@@ -1243,13 +1246,17 @@ linux_nat_resume (ptid_t ptid, int step,
    if (resume_all)
      iterate_over_lwps (resume_callback, NULL);
  
--  child_resume (ptid, step, signo);
+-  linux_ops->to_resume (ptid, step, signo);
 -  if (debug_linux_nat)
 -    fprintf_unfiltered (gdb_stdlog,
 -			"LLR: %s %s, %s (resume event thread)\n",
@@ -253,10 +262,10 @@
 -			signo ? strsignal (signo) : "0");
 +  if (lp)
 +    {
-+      child_resume (ptid, step, signo);
++      linux_ops->to_resume (ptid, step, signo);
 +
 +      if (debug_linux_nat)
-+        fprintf_unfiltered (gdb_stdlog,
++	fprintf_unfiltered (gdb_stdlog,
 +			    "LLR: %s %s, %s (resume event thread)\n",
 +			    step ? "PTRACE_SINGLESTEP" : "PTRACE_CONT",
 +			    target_pid_to_str (ptid),
@@ -265,7 +274,7 @@
  }
  
  /* Issue kill to specified lwp.  */
-@@ -1826,7 +1833,7 @@ stop_and_resume_callback (struct lwp_inf
+@@ -1840,7 +1847,7 @@ stop_and_resume_callback (struct lwp_inf
        for (ptr = lwp_list; ptr; ptr = ptr->next)
  	if (lp == ptr)
  	  {
@@ -274,7 +283,7 @@
  	    resume_set_callback (lp, NULL);
  	  }
      }
-@@ -1837,8 +1844,10 @@ static ptid_t
+@@ -1851,8 +1858,10 @@ static ptid_t
  linux_nat_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
  {
    struct lwp_info *lp = NULL;
@@ -285,7 +294,7 @@
    pid_t pid = PIDGET (ptid);
    sigset_t flush_mask;
  
-@@ -1864,14 +1873,12 @@ retry:
+@@ -1890,14 +1899,12 @@ retry:
       gets the expected trap so we don't want to wait on any LWP.
       This has ramifications when adjustment of the PC is required which can be
       different after a breakpoint vs a step (e.g. x86).  */
@@ -303,7 +312,7 @@
    }
  
    /* If any pid, check if there is a LWP with a wait status pending.  */
-@@ -2134,8 +2141,9 @@ retry:
+@@ -2130,8 +2137,9 @@ retry:
  	    }
  
  	  /* Make sure we don't report a SIGSTOP that we sent
@@ -315,7 +324,7 @@
  	      && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP)
  	    {
  	      if (debug_linux_nat)
-@@ -2169,6 +2177,20 @@ retry:
+@@ -2165,6 +2173,20 @@ retry:
  
        if (pid == -1)
  	{
@@ -379,7 +388,7 @@
    /* Now stop all other LWP's ...  */
    iterate_over_lwps (stop_callback, NULL);
  
-@@ -2278,6 +2336,10 @@ retry:
+@@ -2275,6 +2333,10 @@ retry:
    else
      store_waitstatus (ourstatus, status);
  
@@ -387,12 +396,14 @@
 +  if (step_lp && step_lp != lp)
 +    ourstatus->step_thread_exit = 1;
 +
-   return (threaded ? lp->ptid : pid_to_ptid (GET_LWP (lp->ptid)));
+   return lp->ptid;
  }
  
---- gdb-6.3/gdb/target.h.fix	2005-02-11 16:50:19.000000000 -0500
-+++ gdb-6.3/gdb/target.h	2005-02-11 16:52:52.000000000 -0500
-@@ -134,6 +134,7 @@ enum target_waitkind
+Index: gdb-6.5/gdb/target.h
+===================================================================
+--- gdb-6.5.orig/gdb/target.h	2006-05-05 17:08:45.000000000 -0300
++++ gdb-6.5/gdb/target.h	2006-07-07 02:26:54.000000000 -0300
+@@ -136,6 +136,7 @@ enum target_waitkind
  struct target_waitstatus
    {
      enum target_waitkind kind;

gdb-6.3-terminal-fix-20050214.patch:
 top.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: gdb-6.3-terminal-fix-20050214.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-terminal-fix-20050214.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-terminal-fix-20050214.patch	14 Feb 2005 22:10:53 -0000	1.1
+++ gdb-6.3-terminal-fix-20050214.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -3,18 +3,11 @@
 	* top.c (gdb_readline_wrapper): Ensure terminal is gdb's before calling
 	readline.
 
---- gdb-6.3/gdb/top.c.fix	2005-02-14 16:28:56.000000000 -0500
-+++ gdb-6.3/gdb/top.c	2005-02-14 16:30:20.000000000 -0500
-@@ -1,7 +1,7 @@
- /* Top level stuff for GDB, the GNU debugger.
- 
-    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
--   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-    Free Software Foundation, Inc.
- 
-    This file is part of GDB.
-@@ -982,6 +982,14 @@ gdb_readline_wrapper (char *prompt)
+Index: gdb-6.5/gdb/top.c
+===================================================================
+--- gdb-6.5.orig/gdb/top.c	2006-03-29 19:53:33.000000000 -0300
++++ gdb-6.5/gdb/top.c	2006-07-07 02:29:42.000000000 -0300
+@@ -728,6 +728,14 @@ gdb_readline_wrapper (char *prompt)
        after_char_processing_hook = NULL;
      }
  

gdb-6.3-test-pie-20050107.patch:
 configure            |    3 
 configure.ac         |    2 
 gdb.pie/Makefile.in  |   19 
 gdb.pie/attach.c     |   20 +
 gdb.pie/attach.exp   |  432 ++++++++++++++++++++++
 gdb.pie/attach2.c    |   24 +
 gdb.pie/break.c      |  146 +++++++
 gdb.pie/break.exp    |  973 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gdb.pie/break1.c     |   44 ++
 gdb.pie/corefile.exp |  243 ++++++++++++
 gdb.pie/coremaker.c  |  142 +++++++
 11 files changed, 2046 insertions(+), 2 deletions(-)

Index: gdb-6.3-test-pie-20050107.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-test-pie-20050107.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-test-pie-20050107.patch	11 Jan 2005 00:15:58 -0000	1.1
+++ gdb-6.3-test-pie-20050107.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,33 +1,38 @@
---- gdb-6.3/gdb/testsuite/configure.in.fix	Fri Jan  7 19:32:06 2005
-+++ gdb-6.3/gdb/testsuite/configure.in	Fri Jan  7 19:33:29 2005
-@@ -123,4 +123,4 @@ AC_OUTPUT([Makefile \
-   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
+Index: gdb-6.5/gdb/testsuite/configure.ac
+===================================================================
+--- gdb-6.5.orig/gdb/testsuite/configure.ac	2006-07-07 01:12:31.000000000 -0300
++++ gdb-6.5/gdb/testsuite/configure.ac	2006-07-07 01:13:23.000000000 -0300
+@@ -114,4 +114,4 @@ AC_OUTPUT([Makefile \
    gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
-   gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \
+   gdb.fortran/Makefile gdb.server/Makefile \
+   gdb.java/Makefile gdb.mi/Makefile \
 -  gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile])
 +  gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile])
---- gdb-6.3/gdb/testsuite/configure.fix	Fri Jan  7 19:32:11 2005
-+++ gdb-6.3/gdb/testsuite/configure	Fri Jan  7 19:33:54 2005
-@@ -1054,7 +1054,7 @@ trap 'rm -fr `echo "Makefile \
-   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-   gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
-   gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \
--  gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+  gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
+Index: gdb-6.5/gdb/testsuite/configure
+===================================================================
+--- gdb-6.5.orig/gdb/testsuite/configure	2006-07-07 01:12:31.000000000 -0300
++++ gdb-6.5/gdb/testsuite/configure	2006-07-07 01:13:23.000000000 -0300
+@@ -3075,7 +3075,7 @@ done
  
-@@ -1151,7 +1151,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile \
-   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-   gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
-   gdb.fortran/Makefile gdb.java/Makefile gdb.mi/Makefile \
--  gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"}
-+  gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- gdb-6.3/gdb/testsuite/gdb.pie/attach.c.fix	Fri Jan  7 19:35:04 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/attach.c	Fri Jan  7 19:32:33 2005
+ 
+ 
+-                                                                                                                                                      ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
++                                                                                                                                                                ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.pie/Makefile gdb.threads/Makefile gdb.trace/Makefile"
+ 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
+@@ -3639,6 +3639,7 @@ do
+   "gdb.java/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.java/Makefile" ;;
+   "gdb.mi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;;
+   "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
++  "gdb.pie/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;;
+   "gdb.threads/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;;
+   "gdb.trace/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.trace/Makefile" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+Index: gdb-6.5/gdb/testsuite/gdb.pie/attach.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/attach.c	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,20 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -49,8 +54,10 @@
 +    }
 +  return 0;
 +}
---- gdb-6.3/gdb/testsuite/gdb.pie/attach2.c.fix	Fri Jan  7 19:35:04 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/attach2.c	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/attach2.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/attach2.c	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,24 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -76,8 +83,10 @@
 +    }
 +  return (0);
 +}
---- gdb-6.3/gdb/testsuite/gdb.pie/break.c.fix	Fri Jan  7 19:35:04 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/break.c	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/break.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/break.c	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,146 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -225,8 +234,10 @@
 +    }
 +  return 0;
 +}
---- gdb-6.3/gdb/testsuite/gdb.pie/break1.c.fix	Fri Jan  7 19:35:04 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/break1.c	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/break1.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/break1.c	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,44 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -272,8 +283,10 @@
 +void marker3 (a, b) char *a, *b; {}	/* set breakpoint 18 here */
 +void marker4 (d) long d; {}		/* set breakpoint 13 here */
 +#endif
---- gdb-6.3/gdb/testsuite/gdb.pie/coremaker.c.fix	Fri Jan  7 19:35:04 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/coremaker.c	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/coremaker.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/coremaker.c	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,142 @@
 +/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
 +   Free Software Foundation, Inc.
@@ -417,8 +430,10 @@
 +  return 0;
 +}
 +
---- gdb-6.3/gdb/testsuite/gdb.pie/attach.exp.fix	Fri Jan  7 19:35:13 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/attach.exp	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/attach.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/attach.exp	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,432 @@
 +#   Copyright 1997, 1999, 2002 Free Software Foundation, Inc.
 +
@@ -852,8 +867,10 @@
 +do_call_attach_tests
 +
 +return 0
---- gdb-6.3/gdb/testsuite/gdb.pie/break.exp.fix	Fri Jan  7 19:35:13 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/break.exp	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/break.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/break.exp	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,973 @@
 +#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2002, 2003, 2004
@@ -1828,8 +1845,10 @@
 +    send_gdb "set args main\n"
 +    gdb_expect -re ".*$gdb_prompt $" {}
 +}
---- gdb-6.3/gdb/testsuite/gdb.pie/corefile.exp.fix	Fri Jan  7 19:35:13 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/corefile.exp	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/corefile.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/corefile.exp	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,243 @@
 +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 +# Free Software Foundation, Inc.
@@ -2074,8 +2093,10 @@
 +gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(\\).*" "up in corefile.exp (reinit)"
 +
 +gdb_test "core" "No core file now."
---- gdb-6.3/gdb/testsuite/gdb.pie/Makefile.in.fix	Fri Jan  7 19:35:19 2005
-+++ gdb-6.3/gdb/testsuite/gdb.pie/Makefile.in	Fri Jan  7 19:32:33 2005
+Index: gdb-6.5/gdb/testsuite/gdb.pie/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.pie/Makefile.in	2006-07-07 01:13:23.000000000 -0300
 @@ -0,0 +1,19 @@
 +VPATH = @srcdir@
 +srcdir = @srcdir@

gdb-6.3-threaded-watchpoints-20041213.patch:
 Makefile.in       |    4 
 amd64-linux-nat.c |   14 +-
 breakpoint.c      |  269 +++++++++++++++++++++++++++++++++++++++---------------
 breakpoint.h      |   13 ++
 doc/observer.texi |   10 ++
 i386-linux-nat.c  |   14 +-
 ia64-linux-nat.c  |  131 ++++++++++++++++++++++++--
 infrun.c          |   66 +++++++++++--
 linux-nat.c       |   19 +++
 linux-nat.h       |   12 ++
 linux-thread-db.c |   14 ++
 s390-nat.c        |   63 ++++++++++--
 12 files changed, 510 insertions(+), 119 deletions(-)

Index: gdb-6.3-threaded-watchpoints-20041213.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints-20041213.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-threaded-watchpoints-20041213.patch	7 Jan 2005 22:49:23 -0000	1.3
+++ gdb-6.3-threaded-watchpoints-20041213.patch	11 Jul 2006 06:33:02 -0000	1.4
@@ -1,19 +1,17 @@
 2004-12-13  Jeff Johnston  <jjohnstn at redhat.com>
 
-        * linux-nat.c: Add latest vfork fixes. 
-	(stop_wait_callback, linux-nat-wait): Notify observers of a sigtrap.
+        * linux-nat.c: (stop_wait_callback, linux-nat-wait): Notify
+	observers of a sigtrap.
 	(delete_lwp): Free the saved_trap_data if present.
 	* linux-nat.h (struct lwp_info): Add saved_trap_data field.
 	(struct linux_watchpoint): New struct.
-	* thread-db.c: Add support to always keep lwp info in ptids.
+	* linux-thread-db.c: Add support to always keep lwp info in ptids.
 	(attach_thread): Notify observers of a linux
 	new thread.
 	(thread_db_wait): Call check_event if SIGILL occurs.
-	* infrun.c: Add debug statement support.
-	(handle_inferior_event): For platforms that
+	* infrun.c: (handle_inferior_event): For platforms that
 	hit watchpoints prior to the data write, mark the watchpoints
 	so we know to check them after we step through the write.
-	k
 	* breakpoint.c (bpstat_stop_status): Fix up watchpoint code.
 	(insert_watchpoints_for_new_thread): New function.
 	(mark_triggered_watchpoints): Ditto.
@@ -27,18 +25,18 @@
 	* s390-nat.c: Ditto.
 	* Makefile.in: Add observer.h and linux-nat.h to ia64-linux-nat.o
 	and s390-nat.o.
-	* gdbarch.sh (single_step_through_delay): New directive.
-	* gdbarch.h: Regenerated.
-	* gdbarch.c: Ditto.
 	* doc/observer.texi: Add two new observers for linux_new_thread
 	and sigtrap.
 
---- gdb-6.3/gdb/doc/observer.texi.fix	Fri Jan  7 16:59:57 2005
-+++ gdb-6.3/gdb/doc/observer.texi	Fri Jan  7 17:04:07 2005
-@@ -95,3 +95,14 @@ inferior, and before any information on 
- The specified shared library has been discovered to be unloaded.
+Index: gdb-6.5/gdb/doc/observer.texi
+===================================================================
+--- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/doc/observer.texi	2006-07-11 02:29:49.000000000 -0300
+@@ -122,3 +122,13 @@ haven't been loaded yet.
+ @deftypefun void solib_unloaded (struct so_list *@var{solib})
+ The shared library specified by @var{solib} has been unloaded.
  @end deftypefun
- 
++
 + at deftypefun void linux_new_thread (ptid_t @var{ptid})
 +A new linux thread described by @var{ptid} has been officially attached
 +to by gdb.
@@ -48,303 +46,19 @@
 +A low-level SIGTRAP has been discovered.  This notification can be used to save
 +additional state necessary if the trap is deferred for later handling.
 + at end deftypefun
-+
-+
---- gdb-6.3/gdb/infrun.c.fix	Fri Jan  7 16:55:54 2005
-+++ gdb-6.3/gdb/infrun.c	Fri Jan  7 17:04:37 2005
-@@ -106,6 +106,8 @@ static ptid_t previous_inferior_ptid;
- 
- static int may_follow_exec = MAY_FOLLOW_EXEC;
- 
-+static int debug_infrun = 0;
-+
- /* If the program uses ELF-style shared libraries, then calls to
-    functions in shared libraries go through stubs, which live in a
-    table called the PLT (Procedure Linkage Table).  The first time the
-@@ -161,16 +163,6 @@ static int may_follow_exec = MAY_FOLLOW_
- #define SOLIB_IN_DYNAMIC_LINKER(pid,pc) 0
- #endif
- 
--/* On some systems, the PC may be left pointing at an instruction that  won't
--   actually be executed.  This is usually indicated by a bit in the PSW.  If
--   we find ourselves in such a state, then we step the target beyond the
--   nullified instruction before returning control to the user so as to avoid
--   confusion. */
--
--#ifndef INSTRUCTION_NULLIFIED
--#define INSTRUCTION_NULLIFIED 0
--#endif
--
- /* We can't step off a permanent breakpoint in the ordinary way, because we
-    can't remove it.  Instead, we have to advance the PC to the next
-    instruction.  This macro should expand to a pointer to a function that
-@@ -517,6 +509,9 @@ resume (int step, enum target_signal sig
-   struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
-   QUIT;
- 
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: resume (step=%d, signal=%d)\n", step, sig);
-+
-   /* FIXME: calling breakpoint_here_p (read_pc ()) three times! */
- 
- 
-@@ -714,24 +709,17 @@ proceed (CORE_ADDR addr, enum target_sig
- 
-   if (addr == (CORE_ADDR) -1)
-     {
--      /* If there is a breakpoint at the address we will resume at,
--         step one instruction before inserting breakpoints
--         so that we do not stop right away (and report a second
--         hit at this breakpoint).  */
--
-       if (read_pc () == stop_pc && breakpoint_here_p (read_pc ()))
-+	/* There is a breakpoint at the address we will resume at,
-+	   step one instruction before inserting breakpoints so that
-+	   we do not stop right away (and report a second hit at this
-+	   breakpoint).  */
- 	oneproc = 1;
--
--#ifndef STEP_SKIPS_DELAY
--#define STEP_SKIPS_DELAY(pc) (0)
--#define STEP_SKIPS_DELAY_P (0)
--#endif
--      /* Check breakpoint_here_p first, because breakpoint_here_p is fast
--         (it just checks internal GDB data structures) and STEP_SKIPS_DELAY
--         is slow (it needs to read memory from the target).  */
--      if (STEP_SKIPS_DELAY_P
--	  && breakpoint_here_p (read_pc () + 4)
--	  && STEP_SKIPS_DELAY (read_pc ()))
-+      else if (gdbarch_single_step_through_delay_p (current_gdbarch)
-+              && gdbarch_single_step_through_delay (current_gdbarch,
-+                                                    get_current_frame ()))
-+	/* We stepped onto an instruction that needs to be stepped
-+	   again before re-inserting the breakpoint, do so.  */
- 	oneproc = 1;
-     }
-   else
-@@ -739,6 +727,10 @@ proceed (CORE_ADDR addr, enum target_sig
-       write_pc (addr);
-     }
- 
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: proceed (addr=0x%s, signal=%d, step=%d)\n",
-+		       paddr_nz (addr), siggnal, step);
-+
-   /* In a multi-threaded task we may select another thread
-      and then continue or step.
- 
-@@ -878,7 +870,6 @@ enum infwait_states
- {
-   infwait_normal_state,
-   infwait_thread_hop_state,
--  infwait_nullified_state,
-   infwait_nonstep_watch_state
- };
- 
-@@ -957,6 +948,9 @@ wait_for_inferior (void)
-   struct execution_control_state ecss;
-   struct execution_control_state *ecs;
- 
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: wait_for_inferior\n");
-+
-   old_cleanups = make_cleanup (delete_step_resume_breakpoint,
- 			       &step_resume_breakpoint);
- 
-@@ -1241,6 +1235,8 @@ handle_inferior_event (struct execution_
-   switch (ecs->infwait_state)
-     {
-     case infwait_thread_hop_state:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: infwait_thread_hop_state\n");
-       /* Cancel the waiton_ptid. */
-       ecs->waiton_ptid = pid_to_ptid (-1);
-       /* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event
-@@ -1254,6 +1250,8 @@ handle_inferior_event (struct execution_
-       break;
- 
-     case infwait_normal_state:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: infwait_normal_state\n");
-       /* See comments where a TARGET_WAITKIND_SYSCALL_RETURN event
-          is serviced in this loop, below. */
-       if (ecs->enable_hw_watchpoints_after_wait)
-@@ -1264,11 +1262,9 @@ handle_inferior_event (struct execution_
-       stepped_after_stopped_by_watchpoint = 0;
-       break;
- 
--    case infwait_nullified_state:
--      stepped_after_stopped_by_watchpoint = 0;
--      break;
--
-     case infwait_nonstep_watch_state:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: infwait_nonstep_watch_state\n");
-       insert_breakpoints ();
- 
-       /* FIXME-maybe: is this cleaner than setting a flag?  Does it
-@@ -1303,6 +1299,8 @@ handle_inferior_event (struct execution_
-   switch (ecs->ws.kind)
-     {
-     case TARGET_WAITKIND_LOADED:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_LOADED\n");
-       /* Ignore gracefully during startup of the inferior, as it
-          might be the shell which has just loaded some objects,
-          otherwise add the symbols for the newly loaded objects.  */
-@@ -1347,11 +1345,15 @@ handle_inferior_event (struct execution_
-       return;
- 
-     case TARGET_WAITKIND_SPURIOUS:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_SPURIOUS\n");
-       resume (0, TARGET_SIGNAL_0);
-       prepare_to_wait (ecs);
-       return;
- 
-     case TARGET_WAITKIND_EXITED:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_EXITED\n");
-       target_terminal_ours ();	/* Must do this before mourn anyway */
-       print_stop_reason (EXITED, ecs->ws.value.integer);
- 
-@@ -1368,6 +1370,8 @@ handle_inferior_event (struct execution_
-       return;
- 
-     case TARGET_WAITKIND_SIGNALLED:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_SIGNALLED\n");
-       stop_print_frame = 0;
-       stop_signal = ecs->ws.value.sig;
-       target_terminal_ours ();	/* Must do this before mourn anyway */
-@@ -1388,6 +1392,8 @@ handle_inferior_event (struct execution_
-          the above cases end in a continue or goto. */
-     case TARGET_WAITKIND_FORKED:
-     case TARGET_WAITKIND_VFORKED:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_FORKED\n");
-       stop_signal = TARGET_SIGNAL_TRAP;
-       pending_follow.kind = ecs->ws.kind;
- 
-@@ -1410,6 +1416,8 @@ handle_inferior_event (struct execution_
-       goto process_event_stop_test;
- 
-     case TARGET_WAITKIND_EXECD:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_EXECED\n");
-       stop_signal = TARGET_SIGNAL_TRAP;
- 
-       /* NOTE drow/2002-12-05: This code should be pushed down into the
-@@ -1477,6 +1485,8 @@ handle_inferior_event (struct execution_
-          Also, be careful not to try to gather much state about a thread
-          that's in a syscall.  It's frequently a losing proposition. */
-     case TARGET_WAITKIND_SYSCALL_ENTRY:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_SYSCALL_ENTRY\n");
-       number_of_threads_in_syscalls++;
-       if (number_of_threads_in_syscalls == 1)
- 	{
-@@ -1501,6 +1511,8 @@ handle_inferior_event (struct execution_
-          here, which will be serviced immediately after the target
-          is waited on. */
-     case TARGET_WAITKIND_SYSCALL_RETURN:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_SYSCALL_RETURN\n");
-       target_resume (ecs->ptid, 1, TARGET_SIGNAL_0);
- 
-       if (number_of_threads_in_syscalls > 0)
-@@ -1513,6 +1525,8 @@ handle_inferior_event (struct execution_
-       return;
- 
-     case TARGET_WAITKIND_STOPPED:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_STOPPED\n");
-       stop_signal = ecs->ws.value.sig;
-       break;
- 
-@@ -1526,6 +1540,8 @@ handle_inferior_event (struct execution_
-          circumstance is any event which the lower level knows will be
-          reported multiple times without an intervening resume.  */
-     case TARGET_WAITKIND_IGNORE:
-+      if (debug_infrun)
-+        printf_unfiltered ("infrun: TARGET_WAITKIND_IGNORE\n");
-       prepare_to_wait (ecs);
-       return;
-     }
-@@ -1546,6 +1562,9 @@ handle_inferior_event (struct execution_
- 
-   stop_pc = read_pc_pid (ecs->ptid);
- 
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: stop_pc = 0x%s\n", paddr_nz (stop_pc));
-+
-   if (stepping_past_singlestep_breakpoint)
-     {
-       gdb_assert (SOFTWARE_SINGLE_STEP_P ()
-@@ -1560,6 +1579,8 @@ handle_inferior_event (struct execution_
-          we could tell, but we can't reliably.  */
-       if (stop_signal == TARGET_SIGNAL_TRAP)
- 	{
-+	  if (debug_infrun)
-+	    printf_unfiltered ("infrun: stepping_past_singlestep_breakpoint\n");
- 	  /* Pull the single step breakpoints out of the target.  */
- 	  SOFTWARE_SINGLE_STEP (0, 0);
- 	  singlestep_breakpoints_inserted_p = 0;
-@@ -1616,6 +1637,9 @@ handle_inferior_event (struct execution_
- 	{
- 	  int remove_status;
- 
-+	  if (debug_infrun)
-+	    printf_unfiltered ("infrun: thread_hop_needed\n");
-+
- 	  /* Saw a breakpoint, but it was hit by the wrong thread.
- 	     Just continue. */
- 
-@@ -1681,6 +1705,9 @@ handle_inferior_event (struct execution_
-      so, then switch to that thread.  */
-   if (!ptid_equal (ecs->ptid, inferior_ptid))
-     {
-+      if (debug_infrun)
-+	printf_unfiltered ("infrun: context switch\n");
-+
-       context_switch (ecs);
- 
-       if (deprecated_context_hook)
-@@ -1696,33 +1723,24 @@ handle_inferior_event (struct execution_
-       singlestep_breakpoints_inserted_p = 0;
-     }
- 
--  /* If PC is pointing at a nullified instruction, then step beyond
--     it so that the user won't be confused when GDB appears to be ready
--     to execute it. */
--
--  /*      if (INSTRUCTION_NULLIFIED && currently_stepping (ecs)) */
--  if (INSTRUCTION_NULLIFIED)
--    {
--      registers_changed ();
--      target_resume (ecs->ptid, 1, TARGET_SIGNAL_0);
--
--      /* We may have received a signal that we want to pass to
--         the inferior; therefore, we must not clobber the waitstatus
--         in WS. */
--
--      ecs->infwait_state = infwait_nullified_state;
--      ecs->waiton_ptid = ecs->ptid;
--      ecs->wp = &(ecs->tmpstatus);
--      prepare_to_wait (ecs);
--      return;
--    }
--
-   /* It may not be necessary to disable the watchpoint to stop over
-      it.  For example, the PA can (with some kernel cooperation)
+Index: gdb-6.5/gdb/infrun.c
+===================================================================
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-11 02:29:55.000000000 -0300
+@@ -1703,9 +1703,19 @@ handle_inferior_event (struct execution_
       single step over a watchpoint without disabling the watchpoint.  */
    if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
      {
--      resume (1, 0);
 +      CORE_ADDR addr = 0;
 +
-+      if (debug_infrun)
-+	printf_unfiltered ("infrun: STOPPED_BY_WATCHPOINT\n");
+       if (debug_infrun)
+ 	fprintf_unfiltered (gdb_stdlog, "infrun: STOPPED_BY_WATCHPOINT\n");
+-      resume (1, 0);
 +
 +      target_stopped_data_address (&current_target, &addr);
 +      mark_triggered_watchpoints (addr);
@@ -357,7 +71,7 @@
        prepare_to_wait (ecs);
        return;
      }
-@@ -1732,6 +1750,8 @@ handle_inferior_event (struct execution_
+@@ -1715,6 +1725,8 @@ handle_inferior_event (struct execution_
       register or page protection watchpoint scheme need here?  */
    if (HAVE_NONSTEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
      {
@@ -366,7 +80,7 @@
        /* At this point, we are stopped at an instruction which has
           attempted to write to a piece of memory under control of
           a watchpoint.  The instruction hasn't actually executed
-@@ -1739,15 +1759,15 @@ handle_inferior_event (struct execution_
+@@ -1722,15 +1734,12 @@ handle_inferior_event (struct execution_
           now, we would get the old value, and therefore no change
           would seem to have occurred.
  
@@ -383,17 +97,14 @@
 +	 triggered watchpoints so that after we single step,
 +	 we will check for a value change.  */
 +
-+      if (debug_infrun)
-+	printf_unfiltered ("infrun: STOPPED_BY_WATCHPOINT\n");
-+
 +      target_stopped_data_address (&current_target, &addr);
 +      mark_triggered_watchpoints (addr);
  
-       remove_breakpoints ();
-       registers_changed ();
-@@ -1781,6 +1801,41 @@ handle_inferior_event (struct execution_
-   stopped_by_random_signal = 0;
-   breakpoints_failed = 0;
+       if (debug_infrun)
+ 	fprintf_unfiltered (gdb_stdlog, "infrun: STOPPED_BY_WATCHPOINT\n");
+@@ -1801,6 +1810,41 @@ handle_inferior_event (struct execution_
+ 	}
+     }
  
 +  if (stop_signal == TARGET_SIGNAL_TRAP
 +      && trap_expected
@@ -409,7 +120,7 @@
 +	= gdbarch_single_step_through_delay (current_gdbarch,
 +					     get_current_frame ());
 +      if (debug_infrun && step_through_delay)
-+	printf_unfiltered ("infrun: step through delay\n");
++	fprintf_unfiltered (gdb_stdlog, "infrun: step through delay\n");
 +      if (step_range_end == 0 && step_through_delay)
 +	{
 +	  /* The user issued a continue when stopped at a breakpoint.
@@ -433,364 +144,21 @@
    /* Look at the cause of the stop, and decide what to do.
       The alternatives are:
       1) break; to really stop and return to the debugger,
-@@ -1809,6 +1864,8 @@ handle_inferior_event (struct execution_
-     {
-       if (stop_signal == TARGET_SIGNAL_TRAP && stop_after_trap)
+@@ -1852,6 +1896,8 @@ handle_inferior_event (struct execution_
+          See more comments in inferior.h.  */
+       if (stop_soon == STOP_QUIETLY_NO_SIGSTOP)
  	{
 +          if (debug_infrun)
-+	    printf_unfiltered ("infrun: stopped\n");
- 	  stop_print_frame = 0;
++	    fprintf_unfiltered (gdb_stdlog, "infrun: quietly stopped\n");
  	  stop_stepping (ecs);
- 	  return;
-@@ -1818,6 +1875,8 @@ handle_inferior_event (struct execution_
-          shared libraries hook functions.  */
-       if (stop_soon == STOP_QUIETLY)
- 	{
-+          if (debug_infrun)
-+	    printf_unfiltered ("infrun: quietly stopped\n");
- 	  stop_stepping (ecs);
- 	  return;
- 	}
-@@ -1837,7 +1896,11 @@ handle_inferior_event (struct execution_
-       /* Don't even think about breakpoints if just proceeded over a
-          breakpoint.  */
-       if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected)
--	bpstat_clear (&stop_bpstat);
-+	{
-+          if (debug_infrun)
-+	    printf_unfiltered ("infrun: trap expected\n");
-+	  bpstat_clear (&stop_bpstat);
-+	}
-       else
- 	{
- 	  /* See if there is a breakpoint at the current PC.  */
-@@ -1898,6 +1961,9 @@ process_event_stop_test:
-       /* Signal not for debugging purposes.  */
-       int printed = 0;
- 
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: random signal %d\n", stop_signal);
-+
-       stopped_by_random_signal = 1;
- 
-       if (signal_print[stop_signal])
-@@ -1977,6 +2043,8 @@ process_event_stop_test:
- 	/* If we hit the breakpoint at longjmp, disable it for the
- 	   duration of this command.  Then, install a temporary
- 	   breakpoint at the target of the jmp_buf. */
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_SET_LONGJMP_RESUME\n");
- 	disable_longjmp_breakpoint ();
- 	remove_breakpoints ();
- 	breakpoints_inserted = 0;
-@@ -2000,6 +2068,8 @@ process_event_stop_test:
- 
-       case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME:
-       case BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE:
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_CLEAR_LONGJMP_RESUME\n");
- 	remove_breakpoints ();
- 	breakpoints_inserted = 0;
- 	disable_longjmp_breakpoint ();
-@@ -2009,6 +2079,8 @@ process_event_stop_test:
- 	/* else fallthrough */
- 
-       case BPSTAT_WHAT_SINGLE:
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_SINGLE\n");
- 	if (breakpoints_inserted)
- 	  {
- 	    remove_breakpoints ();
-@@ -2020,6 +2092,8 @@ process_event_stop_test:
- 	break;
- 
-       case BPSTAT_WHAT_STOP_NOISY:
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_STOP_NOISY\n");
- 	stop_print_frame = 1;
- 
- 	/* We are about to nuke the step_resume_breakpointt via the
-@@ -2029,6 +2103,8 @@ process_event_stop_test:
- 	return;
- 
-       case BPSTAT_WHAT_STOP_SILENT:
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_STOP_SILENT\n");
- 	stop_print_frame = 0;
- 
- 	/* We are about to nuke the step_resume_breakpoin via the
-@@ -2055,6 +2131,9 @@ process_event_stop_test:
- 	   step-resume bp, but it makes no effort to ensure that
- 	   the one deleted is the one currently stopped at.  MVS  */
- 
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_STEP_RESUME\n");
-+
- 	if (step_resume_breakpoint == NULL)
- 	  {
- 	    step_resume_breakpoint =
-@@ -2076,6 +2155,8 @@ process_event_stop_test:
- 	break;
- 
-       case BPSTAT_WHAT_THROUGH_SIGTRAMP:
-+        if (debug_infrun)
-+	  printf_unfiltered ("infrun: BPSTATE_WHAT_THROUGH_SIGTRAMP\n");
- 	/* If were waiting for a trap, hitting the step_resume_break
- 	   doesn't count as getting it.  */
- 	if (trap_expected)
-@@ -2086,6 +2167,8 @@ process_event_stop_test:
-       case BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK:
- #ifdef SOLIB_ADD
- 	{
-+          if (debug_infrun)
-+	    printf_unfiltered ("infrun: BPSTATE_WHAT_CHECK_SHLIBS\n");
- 	  /* Remove breakpoints, we eventually want to step over the
- 	     shlib event breakpoint, and SOLIB_ADD might adjust
- 	     breakpoint addresses via breakpoint_re_set.  */
-@@ -2198,11 +2281,15 @@ process_event_stop_test:
-       /* Have we reached our destination?  If not, keep going. */
-       if (SOLIB_IN_DYNAMIC_LINKER (PIDGET (ecs->ptid), stop_pc))
- 	{
-+          if (debug_infrun)
-+	    printf_unfiltered ("infrun: stepping in dynamic linker\n");
- 	  ecs->another_trap = 1;
- 	  keep_going (ecs);
- 	  return;
- 	}
- #endif
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: step past dynamic linker\n");
-       /* Else, stop and report the catchpoint(s) whose triggering
-          caused us to begin stepping. */
-       ecs->stepping_through_solib_after_catch = 0;
-@@ -2216,6 +2303,9 @@ process_event_stop_test:
- 
-   if (step_resume_breakpoint)
-     {
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: step-resume breakpoint\n");
-+
-       /* Having a step-resume breakpoint overrides anything
-          else having to do with stepping commands until
-          that breakpoint is reached.  */
-@@ -2225,6 +2315,8 @@ process_event_stop_test:
- 
-   if (step_range_end == 0)
-     {
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: no stepping, continue\n");
-       /* Likewise if we aren't even stepping.  */
-       keep_going (ecs);
-       return;
-@@ -2237,6 +2329,10 @@ process_event_stop_test:
-      within it! */
-   if (stop_pc >= step_range_start && stop_pc < step_range_end)
-     {
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepping inside range [0x%s-0x%s]\n",
-+			    paddr_nz (step_range_start),
-+			    paddr_nz (step_range_end));
-       keep_going (ecs);
-       return;
+ 	  if (stop_signal == TARGET_SIGNAL_STOP)
+ 	    stop_signal = TARGET_SIGNAL_0;
+Index: gdb-6.5/gdb/breakpoint.c
+===================================================================
+--- gdb-6.5.orig/gdb/breakpoint.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.c	2006-07-11 02:29:50.000000000 -0300
+@@ -748,6 +748,90 @@ insert_catchpoint (struct ui_out *uo, vo
      }
-@@ -2253,6 +2349,9 @@ process_event_stop_test:
-       CORE_ADDR pc_after_resolver =
- 	gdbarch_skip_solib_resolver (current_gdbarch, stop_pc);
- 
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped into dynsym resolve code\n");
-+
-       if (pc_after_resolver)
- 	{
- 	  /* Set up a step-resume breakpoint at the address
-@@ -2273,6 +2372,8 @@ process_event_stop_test:
- 	  || step_over_calls == STEP_OVER_ALL)
-       && get_frame_type (get_current_frame ()) == SIGTRAMP_FRAME)
-     {
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped into signal trampoline\n");
-       /* The inferior, while doing a "step" or "next", has ended up in
-          a signal trampoline (either by a signal being delivered or by
-          the signal handler returning).  Just single-step until the
-@@ -2287,6 +2388,9 @@ process_event_stop_test:
-       /* It's a subroutine call.  */
-       CORE_ADDR real_stop_pc;
- 
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped into subroutine\n");
-+
-       if ((step_over_calls == STEP_OVER_NONE)
- 	  || ((step_range_end == 1)
- 	      && in_prologue (prev_pc, ecs->stop_func_start)))
-@@ -2303,27 +2407,6 @@ process_event_stop_test:
- 	  return;
- 	}
- 
--#ifdef DEPRECATED_IGNORE_HELPER_CALL
--      /* On MIPS16, a function that returns a floating point value may
--         call a library helper function to copy the return value to a
--         floating point register.  The DEPRECATED_IGNORE_HELPER_CALL
--         macro returns non-zero if we should ignore (i.e. step over)
--         this function call.  */
--      /* FIXME: cagney/2004-07-21: These custom ``ignore frame when
--         stepping'' function attributes (SIGTRAMP_FRAME,
--         DEPRECATED_IGNORE_HELPER_CALL, SKIP_TRAMPOLINE_CODE,
--         skip_language_trampoline frame, et.al.) need to be replaced
--         with generic attributes bound to the frame's function.  */
--      if (DEPRECATED_IGNORE_HELPER_CALL (stop_pc))
--	{
--	  /* We're doing a "next", set a breakpoint at callee's return
--	     address (the address at which the caller will
--	     resume).  */
--	  insert_step_resume_breakpoint_at_frame (get_prev_frame (get_current_frame ()));
--	  keep_going (ecs);
--	  return;
--	}
--#endif
-       if (step_over_calls == STEP_OVER_ALL)
- 	{
- 	  /* We're doing a "next", set a breakpoint at callee's return
-@@ -2398,6 +2481,9 @@ process_event_stop_test:
-       /* Determine where this trampoline returns.  */
-       CORE_ADDR real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
- 
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped into solib return tramp\n");
-+
-       /* Only proceed through if we know where it's going.  */
-       if (real_stop_pc)
- 	{
-@@ -2426,6 +2512,9 @@ process_event_stop_test:
-   if (step_over_calls == STEP_OVER_UNDEBUGGABLE
-       && ecs->stop_func_name == NULL)
-     {
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped into undebuggable function\n");
-+
-       /* The inferior just stepped into, or returned to, an
-          undebuggable function (where there is no symbol, not even a
-          minimal symbol, corresponding to the address where the
-@@ -2456,6 +2545,8 @@ process_event_stop_test:
-     {
-       /* It is stepi or nexti.  We always want to stop stepping after
-          one instruction.  */
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepi/nexti\n");
-       stop_step = 1;
-       print_stop_reason (END_STEPPING_RANGE, 0);
-       stop_stepping (ecs);
-@@ -2470,6 +2561,8 @@ process_event_stop_test:
-          stepping (does this always happen right after one instruction,
-          when we do "s" in a function with no line numbers,
-          or can this happen as a result of a return or longjmp?).  */
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: no line number info\n");
-       stop_step = 1;
-       print_stop_reason (END_STEPPING_RANGE, 0);
-       stop_stepping (ecs);
-@@ -2484,6 +2577,8 @@ process_event_stop_test:
-          we don't stop if we step into the middle of a different line.
-          That is said to make things like for (;;) statements work
-          better.  */
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped to a different line\n");
-       stop_step = 1;
-       print_stop_reason (END_STEPPING_RANGE, 0);
-       stop_stepping (ecs);
-@@ -2504,6 +2599,8 @@ process_event_stop_test:
-          This is particularly necessary for a one-line function,
-          in which after skipping the prologue we better stop even though
-          we will be in mid-line.  */
-+      if (debug_infrun)
-+	 printf_unfiltered ("infrun: stepped to a different function\n");
-       stop_step = 1;
-       print_stop_reason (END_STEPPING_RANGE, 0);
-       stop_stepping (ecs);
-@@ -2540,6 +2637,8 @@ process_event_stop_test:
-       step_frame_id = current_frame;
-   }
- 
-+  if (debug_infrun)
-+     printf_unfiltered ("infrun: keep going\n");
-   keep_going (ecs);
- }
- 
-@@ -2676,6 +2775,9 @@ insert_step_resume_breakpoint_at_frame (
- static void
- stop_stepping (struct execution_control_state *ecs)
- {
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: stop_stepping\n");
-+
-   /* Let callers know we don't want to wait for the inferior anymore.  */
-   ecs->wait_some_more = 0;
- }
-@@ -2753,6 +2855,8 @@ keep_going (struct execution_control_sta
- static void
- prepare_to_wait (struct execution_control_state *ecs)
- {
-+  if (debug_infrun)
-+    printf_unfiltered ("infrun: prepare_to_wait\n");
-   if (ecs->infwait_state == infwait_normal_state)
-     {
-       overlay_cache_invalid = 1;
-@@ -3790,6 +3894,10 @@ Pass and Stop may be combined.", NULL));
- This allows you to set a list of commands to be run each time execution\n\
- of the program stops.", &cmdlist);
- 
-+  add_set_cmd ("infrun", class_maintenance, var_zinteger,
-+		  &debug_infrun, "Set inferior debugging.\n\
-+When non-zero, inferior specific debugging is enabled.", &setdebuglist);
-+
-   numsigs = (int) TARGET_SIGNAL_LAST;
-   signal_stop = (unsigned char *) xmalloc (sizeof (signal_stop[0]) * numsigs);
-   signal_print = (unsigned char *)
---- gdb-6.3/gdb/gdbarch.h.fix	Fri Jan  7 17:08:19 2005
-+++ gdb-6.3/gdb/gdbarch.h	Fri Jan  7 17:09:12 2005
-@@ -1218,6 +1218,15 @@ extern void set_gdbarch_software_single_
- #define SOFTWARE_SINGLE_STEP(sig, insert_breakpoints_p) (gdbarch_software_single_step (current_gdbarch, sig, insert_breakpoints_p))
- #endif
- 
-+/* Return non-zero if the processor is executing a delay slot and a
-+ *    further single-step is needed before the instruction finishes. */
-+                                                                                
-+extern int gdbarch_single_step_through_delay_p (struct gdbarch *gdbarch);
-+                                                                                
-+typedef int (gdbarch_single_step_through_delay_ftype) (struct gdbarch *gdbarch, struct frame_info *frame);
-+extern int gdbarch_single_step_through_delay (struct gdbarch *gdbarch, struct frame_info *frame);
-+extern void set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch, gdbarch_single_step_through_delay_ftype *single_step_through_delay);
-+                                                                                
- /* FIXME: cagney/2003-08-28: Need to find a better way of selecting the
-    disassembler.  Perhaps objdump can handle it? */
- 
---- gdb-6.3/gdb/breakpoint.c.fix	Fri Jan  7 16:58:12 2005
-+++ gdb-6.3/gdb/breakpoint.c	Fri Jan  7 17:04:07 2005
-@@ -86,11 +86,6 @@ static void watch_command (char *, int);
- 
- static int can_use_hardware_watchpoint (struct value *);
- 
--extern void break_at_finish_command (char *, int);
--extern void break_at_finish_at_depth_command (char *, int);
--
--extern void tbreak_at_finish_command (char *, int);
--
- static int break_command_1 (char *, int, int, struct breakpoint *);
- 
- static void mention (struct breakpoint *);
-@@ -181,11 +176,6 @@ static void create_fork_vfork_event_catc
- 						char *cond_string,
- 						enum bptype bp_kind);
- 
--static void break_at_finish_at_depth_command_1 (char *arg,
--						int flag, int from_tty);
--
--static void break_at_finish_command_1 (char *arg, int flag, int from_tty);
--
- static void stop_command (char *arg, int from_tty);
- 
- static void stopin_command (char *arg, int from_tty);
-@@ -748,6 +738,90 @@ insert_catchpoint (struct ui_out *uo, vo
-   return 0;
  }
  
 +/* External function to insert all existing watchpoints on a newly
@@ -880,7 +248,7 @@
  /* Helper routine: free the value chain for a breakpoint (watchpoint).  */
  
  static void free_valchain (struct bp_location *b)
-@@ -1179,6 +1253,7 @@ remove_breakpoints (void)
+@@ -1190,6 +1274,7 @@ remove_breakpoints (void)
  {
    struct bp_location *b;
    int val;
@@ -888,7 +256,7 @@
  
    ALL_BP_LOCATIONS (b)
    {
-@@ -1186,10 +1261,10 @@ remove_breakpoints (void)
+@@ -1197,10 +1282,10 @@ remove_breakpoints (void)
        {
  	val = remove_breakpoint (b, mark_uninserted);
  	if (val != 0)
@@ -901,7 +269,7 @@
  }
  
  int
-@@ -2122,8 +2197,13 @@ print_it_typical (bpstat bs)
+@@ -2126,8 +2211,13 @@ print_it_typical (bpstat bs)
        break;
  
      case bp_thread_event:
@@ -914,10 +282,10 @@
 +      if (bs->next)
 +        return PRINT_UNKNOWN;
 +
-       printf_filtered ("Thread Event Breakpoint: gdb should not stop!\n");
+       printf_filtered (_("Thread Event Breakpoint: gdb should not stop!\n"));
        return PRINT_NOTHING;
        break;
-@@ -2560,6 +2640,54 @@ which its expression is valid.\n");     
+@@ -2567,6 +2657,54 @@ which its expression is valid.\n");     
      }
  }
  
@@ -972,7 +340,7 @@
  /* Get a bpstat associated with having just stopped at address
     BP_ADDR in thread PTID.  STOPPED_BY_WATCHPOINT is 1 if the
     target thinks we stopped due to a hardware watchpoint, 0 if we
-@@ -2690,82 +2818,61 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2697,82 +2835,61 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
      bs->stop = 1;
      bs->print = 1;
  
@@ -1009,7 +377,7 @@
 -	    /* FALLTHROUGH */
 -	  case 0:
 -	    /* Error from catch_errors.  */
--	    printf_filtered ("Watchpoint %d deleted.\n", b->number);
+-	    printf_filtered (_("Watchpoint %d deleted.\n"), b->number);
 -	    if (b->related_breakpoint)
 -	      b->related_breakpoint->disposition = disp_del_at_next_stop;
 -	    b->disposition = disp_del_at_next_stop;
@@ -1034,14 +402,14 @@
  
 -	if (!target_stopped_data_address (&current_target, &addr))
 -	  continue;
--	for (v = b->val_chain; v; v = v->next)
-+	if (b->type == bp_watchpoint
+-	for (v = b->val_chain; v; v = value_next (v))
++ 	if (b->type == bp_watchpoint
 +	    || b->watchpoint_triggered
 +	    || (b->type == bp_hardware_watchpoint
 +		&& !target_stopped_data_address_p (&current_target)))
  	  {
 -	    if (VALUE_LVAL (v) == lval_memory
--		&& ! VALUE_LAZY (v))
+-		&& ! value_lazy (v))
 +	    /* We either have a software watchpoint, a triggered watchpoint 
 +	       which we have stepped over, or we cannot ascertain what data 
 +	       address causes a write watchpoint.  In all these
@@ -1055,7 +423,7 @@
 +	       we have a read or access watchpoint and have no alternatives.  */
 +	    if (!target_stopped_data_address (&current_target, &addr))
  	      {
--		struct type *vtype = check_typedef (VALUE_TYPE (v));
+-		struct type *vtype = check_typedef (value_type (v));
 -
 -		if (v == b->val_chain
 -		    || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT
@@ -1071,11 +439,11 @@
  		  {
 -		    CORE_ADDR vaddr;
 -
--		    vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
+-		    vaddr = VALUE_ADDRESS (v) + value_offset (v);
 -		    /* Exact match not required.  Within range is
 -                       sufficient.  */
 -		    if (addr >= vaddr &&
--			addr < vaddr + TYPE_LENGTH (VALUE_TYPE (v)))
+-			addr < vaddr + TYPE_LENGTH (value_type (v)))
 -		      found = 1;
 +		    struct type *vtype = check_typedef (VALUE_TYPE (v));
 +		    
@@ -1096,11 +464,11 @@
  	      }
  	  }
 -	if (found)
-+	if (must_check_value)
++ 	if (must_check_value)
  	  {
  	    char *message = xstrprintf ("Error evaluating expression for watchpoint %d\n",
  					b->number);
-@@ -2794,6 +2901,15 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2801,6 +2918,15 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  		break;
  	      case WP_VALUE_NOT_CHANGED:
  		/* Stop.  */
@@ -1116,7 +484,7 @@
  		++(b->hit_count);
  		break;
  	      default:
-@@ -2809,7 +2925,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2816,7 +2942,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  		break;
  	      }
  	  }
@@ -1125,7 +493,7 @@
  	  {
  	    /* This is a case where some watchpoint(s) triggered,
  	       but not at the address of this watchpoint (FOUND
-@@ -4091,6 +4207,7 @@ set_raw_breakpoint (struct symtab_and_li
+@@ -4112,6 +4238,7 @@ set_raw_breakpoint (struct symtab_and_li
    b->exec_pathname = NULL;
    b->ops = NULL;
    b->pending = 0;
@@ -1133,279 +501,11 @@
  
    /* Add this breakpoint to the end of the chain
       so that a list of breakpoints will come out in order
-@@ -5449,169 +5566,6 @@ gdb_breakpoint (char *address, char *con
- }
- 
- 
--static void
--break_at_finish_at_depth_command_1 (char *arg, int flag, int from_tty)
--{
--  struct frame_info *frame;
--  CORE_ADDR low, high, selected_pc = 0;
--  char *extra_args = NULL;
--  char *level_arg;
--  int extra_args_len = 0, if_arg = 0;
--
--  if (!arg ||
--      (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t')))
--    {
--
--      if (default_breakpoint_valid)
--	{
--	  if (deprecated_selected_frame)
--	    {
--	      selected_pc = get_frame_pc (deprecated_selected_frame);
--	      if (arg)
--		if_arg = 1;
--	    }
--	  else
--	    error ("No selected frame.");
--	}
--      else
--	error ("No default breakpoint address now.");
--    }
--  else
--    {
--      extra_args = strchr (arg, ' ');
--      if (extra_args)
--	{
--	  extra_args++;
--	  extra_args_len = strlen (extra_args);
--	  level_arg = (char *) xmalloc (extra_args - arg);
--	  strncpy (level_arg, arg, extra_args - arg - 1);
--	  level_arg[extra_args - arg - 1] = '\0';
--	}
--      else
--	{
--	  level_arg = (char *) xmalloc (strlen (arg) + 1);
--	  strcpy (level_arg, arg);
--	}
--
--      frame = parse_frame_specification (level_arg);
--      if (frame)
--	selected_pc = get_frame_pc (frame);
--      else
--	selected_pc = 0;
--    }
--  if (if_arg)
--    {
--      extra_args = arg;
--      extra_args_len = strlen (arg);
--    }
--
--  if (selected_pc)
--    {
--      if (find_pc_partial_function (selected_pc, (char **) NULL, &low, &high))
--	{
--	  char *addr_string;
--	  if (extra_args_len)
--	    addr_string = xstrprintf ("*0x%s %s", paddr_nz (high), extra_args);
--	  else
--	    addr_string = xstrprintf ("*0x%s", paddr_nz (high));
--	  break_command_1 (addr_string, flag, from_tty, NULL);
--	  xfree (addr_string);
--	}
--      else
--	error ("No function contains the specified address");
--    }
--  else
--    error ("Unable to set breakpoint at procedure exit");
--}
--
--
--static void
--break_at_finish_command_1 (char *arg, int flag, int from_tty)
--{
--  char *addr_string, *break_string, *beg_addr_string;
--  CORE_ADDR low, high;
--  struct symtabs_and_lines sals;
--  struct symtab_and_line sal;
--  struct cleanup *old_chain;
--  char *extra_args = NULL;
--  int extra_args_len = 0;
--  int i, if_arg = 0;
--
--  if (!arg ||
--      (arg[0] == 'i' && arg[1] == 'f' && (arg[2] == ' ' || arg[2] == '\t')))
--    {
--      if (default_breakpoint_valid)
--	{
--	  if (deprecated_selected_frame)
--	    {
--	      addr_string = xstrprintf ("*0x%s",
--					paddr_nz (get_frame_pc (deprecated_selected_frame)));
--	      if (arg)
--		if_arg = 1;
--	    }
--	  else
--	    error ("No selected frame.");
--	}
--      else
--	error ("No default breakpoint address now.");
--    }
--  else
--    {
--      addr_string = (char *) xmalloc (strlen (arg) + 1);
--      strcpy (addr_string, arg);
--    }
--
--  if (if_arg)
--    {
--      extra_args = arg;
--      extra_args_len = strlen (arg);
--    }
--  else if (arg)
--    {
--      /* get the stuff after the function name or address */
--      extra_args = strchr (arg, ' ');
--      if (extra_args)
--	{
--	  extra_args++;
--	  extra_args_len = strlen (extra_args);
--	}
--    }
--
--  sals.sals = NULL;
--  sals.nelts = 0;
--
--  beg_addr_string = addr_string;
--  sals = decode_line_1 (&addr_string, 1, (struct symtab *) NULL, 0,
--			(char ***) NULL, NULL);
--
--  xfree (beg_addr_string);
--  old_chain = make_cleanup (xfree, sals.sals);
--  for (i = 0; (i < sals.nelts); i++)
--    {
--      sal = sals.sals[i];
--      if (find_pc_partial_function (sal.pc, (char **) NULL, &low, &high))
--	{
--	  break_string;
--	  if (extra_args_len)
--	    break_string = xstrprintf ("*0x%s %s", paddr_nz (high),
--				       extra_args);
--	  else
--	    break_string = xstrprintf ("*0x%s", paddr_nz (high));
--	  break_command_1 (break_string, flag, from_tty, NULL);
--	  xfree (break_string);
--	}
--      else
--	error ("No function contains the specified address");
--    }
--  if (sals.nelts > 1)
--    {
--      warning ("Multiple breakpoints were set.\n");
--      warning ("Use the \"delete\" command to delete unwanted breakpoints.");
--    }
--  do_cleanups (old_chain);
--}
--
--
- /* Helper function for break_command_1 and disassemble_command.  */
- 
- void
-@@ -5668,29 +5622,11 @@ break_command (char *arg, int from_tty)
- }
- 
- void
--break_at_finish_command (char *arg, int from_tty)
--{
--  break_at_finish_command_1 (arg, 0, from_tty);
--}
--
--void
--break_at_finish_at_depth_command (char *arg, int from_tty)
--{
--  break_at_finish_at_depth_command_1 (arg, 0, from_tty);
--}
--
--void
- tbreak_command (char *arg, int from_tty)
- {
-   break_command_1 (arg, BP_TEMPFLAG, from_tty, NULL);
- }
- 
--void
--tbreak_at_finish_command (char *arg, int from_tty)
--{
--  break_at_finish_command_1 (arg, BP_TEMPFLAG, from_tty);
--}
--
- static void
- hbreak_command (char *arg, int from_tty)
- {
---- gdb-6.3/gdb/gdbarch.c.fix	Fri Jan  7 17:09:18 2005
-+++ gdb-6.3/gdb/gdbarch.c	Fri Jan  7 17:36:36 2005
-@@ -211,6 +211,7 @@ struct gdbarch
-   gdbarch_addr_bits_remove_ftype *addr_bits_remove;
-   gdbarch_smash_text_address_ftype *smash_text_address;
-   gdbarch_software_single_step_ftype *software_single_step;
-+  gdbarch_single_step_through_delay_ftype *single_step_through_delay;
-   gdbarch_print_insn_ftype *print_insn;
-   gdbarch_skip_trampoline_code_ftype *skip_trampoline_code;
-   gdbarch_skip_solib_resolver_ftype *skip_solib_resolver;
-@@ -337,6 +338,7 @@ struct gdbarch startup_gdbarch =
-   0,  /* addr_bits_remove */
-   0,  /* smash_text_address */
-   0,  /* software_single_step */
-+  0,  /* single_step_through_delay */
-   0,  /* print_insn */
-   0,  /* skip_trampoline_code */
-   generic_skip_solib_resolver,  /* skip_solib_resolver */
-@@ -591,6 +593,7 @@ verify_gdbarch (struct gdbarch *current_
-   /* Skip verify of addr_bits_remove, invalid_p == 0 */
-   /* Skip verify of smash_text_address, invalid_p == 0 */
-   /* Skip verify of software_single_step, has predicate */
-+  /* Skip verify of single_step_through_delay, has predicate */
-   if (current_gdbarch->print_insn == 0)
-     fprintf_unfiltered (log, "\n\tprint_insn");
-   /* Skip verify of skip_trampoline_code, invalid_p == 0 */
-@@ -1516,6 +1519,12 @@ gdbarch_dump (struct gdbarch *current_gd
-   fprintf_unfiltered (file,
-                       "gdbarch_dump: short_bit = %s\n",
-                       paddr_d (current_gdbarch->short_bit));
-+  fprintf_unfiltered (file,
-+                      "gdbarch_dump: gdbarch_single_step_through_delay_p() = %d\n",
-+                      gdbarch_single_step_through_delay_p (current_gdbarch));
-+  fprintf_unfiltered (file,
-+                      "gdbarch_dump: single_step_through_delay = <0x%lx>\n",
-+                      (long) current_gdbarch->single_step_through_delay);
- #ifdef SKIP_PROLOGUE
-   fprintf_unfiltered (file,
-                       "gdbarch_dump: %s # %s\n",
-@@ -3346,6 +3355,30 @@ set_gdbarch_software_single_step (struct
- }
- 
- int
-+gdbarch_single_step_through_delay_p (struct gdbarch *gdbarch)
-+{
-+  gdb_assert (gdbarch != NULL);
-+  return gdbarch->single_step_through_delay != NULL;
-+}
-+
-+int
-+gdbarch_single_step_through_delay (struct gdbarch *gdbarch, struct frame_info *frame)
-+{
-+  gdb_assert (gdbarch != NULL);
-+  gdb_assert (gdbarch->single_step_through_delay != NULL);
-+  if (gdbarch_debug >= 2)
-+    fprintf_unfiltered (gdb_stdlog, "gdbarch_single_step_through_delay called\n");
-+  return gdbarch->single_step_through_delay (gdbarch, frame);
-+}
-+
-+void
-+set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch,
-+                                       gdbarch_single_step_through_delay_ftype single_step_through_delay)
-+{
-+  gdbarch->single_step_through_delay = single_step_through_delay;
-+}
-+
-+int
- gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info)
- {
-   gdb_assert (gdbarch != NULL);
---- gdb-6.3/gdb/breakpoint.h.fix	Fri Jan  7 16:58:19 2005
-+++ gdb-6.3/gdb/breakpoint.h	Fri Jan  7 17:04:07 2005
-@@ -397,6 +397,11 @@ struct breakpoint
+Index: gdb-6.5/gdb/breakpoint.h
+===================================================================
+--- gdb-6.5.orig/gdb/breakpoint.h	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.h	2006-07-11 02:29:49.000000000 -0300
+@@ -426,6 +426,11 @@ struct breakpoint
  
      /* Is breakpoint pending on shlib loads?  */
      int pending;
@@ -1417,7 +517,7 @@
    };
  
  /* The following stuff is an abstract data type "bpstat" ("breakpoint
-@@ -663,6 +668,14 @@ extern void tbreak_command (char *, int)
+@@ -692,6 +697,14 @@ extern void tbreak_command (char *, int)
  
  extern int insert_breakpoints (void);
  
@@ -1432,244 +532,19 @@
  extern int remove_breakpoints (void);
  
  /* This function can be used to physically insert eventpoints from the
---- gdb-6.3/gdb/linux-nat.c.fix	Fri Jan  7 16:58:27 2005
-+++ gdb-6.3/gdb/linux-nat.c	Fri Jan  7 17:04:07 2005
-@@ -34,6 +34,7 @@
+Index: gdb-6.5/gdb/linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 04:24:57.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-11 02:29:49.000000000 -0300
+@@ -36,6 +36,7 @@
  #include "gdbthread.h"
  #include "gdbcmd.h"
  #include "regcache.h"
 +#include "observer.h"
- #include <sys/param.h>		/* for MAXPATHLEN */
- #include <sys/procfs.h>		/* for elf_gregset etc. */
- #include "elf-bfd.h"		/* for elfcore_write_* */
-@@ -69,7 +70,7 @@
- #define PTRACE_EVENT_VFORK	2
- #define PTRACE_EVENT_CLONE	3
- #define PTRACE_EVENT_EXEC	4
--#define PTRACE_EVENT_VFORKDONE	5
-+#define PTRACE_EVENT_VFORK_DONE	5
- #define PTRACE_EVENT_EXIT	6
- 
- #endif /* PTRACE_EVENT_FORK */
-@@ -147,21 +148,50 @@ linux_tracefork_child (void)
-   ptrace (PTRACE_TRACEME, 0, 0, 0);
-   kill (getpid (), SIGSTOP);
-   fork ();
--  exit (0);
-+  _exit (0);
- }
- 
--/* Determine if PTRACE_O_TRACEFORK can be used to follow fork events.  We
-+/* Wrapper function for waitpid which handles EINTR.  */
-+
-+static int
-+my_waitpid (int pid, int *status, int flags)
-+{
-+  int ret;
-+  do
-+    {
-+      ret = waitpid (pid, status, flags);
-+    }
-+  while (ret == -1 && errno == EINTR);
-+
-+  return ret;
-+}
-+
-+/* Determine if PTRACE_O_TRACEFORK can be used to follow fork events.
-+
-+   First, we try to enable fork tracing on ORIGINAL_PID.  If this fails,
-+   we know that the feature is not available.  This may change the tracing
-+   options for ORIGINAL_PID, but we'll be setting them shortly anyway.
-+
-+   However, if it succeeds, we don't know for sure that the feature is
-+   available; old versions of PTRACE_SETOPTIONS ignored unknown options.  We
-    create a child process, attach to it, use PTRACE_SETOPTIONS to enable
--   fork tracing, and let it fork.  If the process exits, we assume that
--   we can't use TRACEFORK; if we get the fork notification, and we can
--   extract the new child's PID, then we assume that we can.  */
-+   fork tracing, and let it fork.  If the process exits, we assume that we
-+   can't use TRACEFORK; if we get the fork notification, and we can extract
-+   the new child's PID, then we assume that we can.  */
- 
- static void
--linux_test_for_tracefork (void)
-+linux_test_for_tracefork (int original_pid)
- {
-   int child_pid, ret, status;
-   long second_pid;
- 
-+  linux_supports_tracefork_flag = 0;
-+  linux_supports_tracevforkdone_flag = 0;
-+
-+  ret = ptrace (PTRACE_SETOPTIONS, original_pid, 0, PTRACE_O_TRACEFORK);
-+  if (ret != 0)
-+    return;
-+
-   child_pid = fork ();
-   if (child_pid == -1)
-     perror_with_name ("linux_test_for_tracefork: fork");
-@@ -169,7 +199,7 @@ linux_test_for_tracefork (void)
-   if (child_pid == 0)
-     linux_tracefork_child ();
- 
--  ret = waitpid (child_pid, &status, 0);
-+  ret = my_waitpid (child_pid, &status, 0);
-   if (ret == -1)
-     perror_with_name ("linux_test_for_tracefork: waitpid");
-   else if (ret != child_pid)
-@@ -177,13 +207,23 @@ linux_test_for_tracefork (void)
-   if (! WIFSTOPPED (status))
-     error ("linux_test_for_tracefork: waitpid: unexpected status %d.", status);
- 
--  linux_supports_tracefork_flag = 0;
--
-   ret = ptrace (PTRACE_SETOPTIONS, child_pid, 0, PTRACE_O_TRACEFORK);
-   if (ret != 0)
-     {
--      ptrace (PTRACE_KILL, child_pid, 0, 0);
--      waitpid (child_pid, &status, 0);
-+      ret = ptrace (PTRACE_KILL, child_pid, 0, 0);
-+      if (ret != 0)
-+	{
-+	  warning ("linux_test_for_tracefork: failed to kill child");
-+	  return;
-+	}
-+
-+      ret = my_waitpid (child_pid, &status, 0);
-+      if (ret != child_pid)
-+	warning ("linux_test_for_tracefork: failed to wait for killed child");
-+      else if (!WIFSIGNALED (status))
-+	warning ("linux_test_for_tracefork: unexpected wait status 0x%x from "
-+		 "killed child", status);
-+
-       return;
-     }
- 
-@@ -192,8 +232,12 @@ linux_test_for_tracefork (void)
- 		PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORKDONE);
-   linux_supports_tracevforkdone_flag = (ret == 0);
- 
--  ptrace (PTRACE_CONT, child_pid, 0, 0);
--  ret = waitpid (child_pid, &status, 0);
-+  ret = ptrace (PTRACE_CONT, child_pid, 0, 0);
-+  if (ret != 0)
-+    warning ("linux_test_for_tracefork: failed to resume child");
-+
-+  ret = my_waitpid (child_pid, &status, 0);
-+
-   if (ret == child_pid && WIFSTOPPED (status)
-       && status >> 16 == PTRACE_EVENT_FORK)
-     {
-@@ -204,34 +248,38 @@ linux_test_for_tracefork (void)
- 	  int second_status;
- 
- 	  linux_supports_tracefork_flag = 1;
--	  waitpid (second_pid, &second_status, 0);
--	  ptrace (PTRACE_DETACH, second_pid, 0, 0);
-+	  my_waitpid (second_pid, &second_status, 0);
-+	  ret = ptrace (PTRACE_KILL, second_pid, 0, 0);
-+	  if (ret != 0)
-+	    warning ("linux_test_for_tracefork: failed to kill second child");
- 	}
-     }
-+  else
-+    warning ("linux_test_for_tracefork: unexpected result from waitpid "
-+	     "(%d, status 0x%x)", ret, status);
- 
--  if (WIFSTOPPED (status))
--    {
--      ptrace (PTRACE_DETACH, child_pid, 0, 0);
--      waitpid (child_pid, &status, 0);
--    }
-+  ret = ptrace (PTRACE_KILL, child_pid, 0, 0);
-+  if (ret != 0)
-+    warning ("linux_test_for_tracefork: failed to kill child");
-+  my_waitpid (child_pid, &status, 0);
- }
- 
- /* Return non-zero iff we have tracefork functionality available.
-    This function also sets linux_supports_tracefork_flag.  */
- 
- static int
--linux_supports_tracefork (void)
-+linux_supports_tracefork (int pid)
- {
-   if (linux_supports_tracefork_flag == -1)
--    linux_test_for_tracefork ();
-+    linux_test_for_tracefork (pid);
-   return linux_supports_tracefork_flag;
- }
- 
- static int
--linux_supports_tracevforkdone (void)
-+linux_supports_tracevforkdone (int pid)
- {
-   if (linux_supports_tracefork_flag == -1)
--    linux_test_for_tracefork ();
-+    linux_test_for_tracefork (pid);
-   return linux_supports_tracevforkdone_flag;
- }
- 
-@@ -242,12 +290,12 @@ linux_enable_event_reporting (ptid_t pti
-   int pid = ptid_get_pid (ptid);
-   int options;
- 
--  if (! linux_supports_tracefork ())
-+  if (! linux_supports_tracefork (pid))
-     return;
- 
-   options = PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK | PTRACE_O_TRACEEXEC
-     | PTRACE_O_TRACECLONE;
--  if (linux_supports_tracevforkdone ())
-+  if (linux_supports_tracevforkdone (pid))
-     options |= PTRACE_O_TRACEVFORKDONE;
- 
-   /* Do not enable PTRACE_O_TRACEEXIT until GDB is more prepared to support
-@@ -308,13 +356,14 @@ child_follow_fork (int follow_child)
- 
-       if (has_vforked)
- 	{
--	  if (linux_supports_tracevforkdone ())
-+	  gdb_assert (linux_supports_tracefork_flag >= 0);
-+	  if (linux_supports_tracevforkdone (0))
- 	    {
- 	      int status;
- 
- 	      ptrace (PTRACE_CONT, parent_pid, 0, 0);
- 	      waitpid (parent_pid, &status, __WALL);
--	      if ((status >> 16) != PTRACE_EVENT_VFORKDONE)
-+	      if ((status >> 16) != PTRACE_EVENT_VFORK_DONE)
- 		warning ("Unexpected waitpid result %06x when waiting for "
- 			 "vfork-done", status);
- 	    }
-@@ -476,7 +525,7 @@ linux_handle_extended_wait (int pid, int
- int
- child_insert_fork_catchpoint (int pid)
- {
--  if (! linux_supports_tracefork ())
-+  if (! linux_supports_tracefork (pid))
-     error ("Your system does not support fork catchpoints.");
- 
-   return 0;
-@@ -485,7 +534,7 @@ child_insert_fork_catchpoint (int pid)
- int
- child_insert_vfork_catchpoint (int pid)
- {
--  if (!linux_supports_tracefork ())
-+  if (!linux_supports_tracefork (pid))
-     error ("Your system does not support vfork catchpoints.");
- 
-   return 0;
-@@ -494,7 +543,7 @@ child_insert_vfork_catchpoint (int pid)
- int
- child_insert_exec_catchpoint (int pid)
- {
--  if (!linux_supports_tracefork ())
-+  if (!linux_supports_tracefork (pid))
-     error ("Your system does not support exec catchpoints.");
- 
-   return 0;
-@@ -716,6 +765,9 @@ delete_lwp (ptid_t ptid)
+ #include "regset.h"
+ #include "inf-ptrace.h"
+ #include "auxv.h"
+@@ -764,6 +765,9 @@ delete_lwp (ptid_t ptid)
    else
      lwp_list = lp->next;
  
@@ -1679,7 +554,7 @@
    xfree (lp);
  }
  
-@@ -1285,6 +1337,13 @@ stop_wait_callback (struct lwp_info *lp,
+@@ -1478,6 +1482,13 @@ stop_wait_callback (struct lwp_info *lp,
  	         user will delete or disable the breakpoint, but the
  	         thread will have already tripped on it.  */
  
@@ -1693,8 +568,8 @@
  	      /* Now resume this LWP and get the SIGSTOP event. */
  	      errno = 0;
  	      ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0, 0);
-@@ -1960,6 +2019,14 @@ retry:
- 		}
+@@ -2054,6 +2065,14 @@ retry:
+ 				 target_pid_to_str (lp->ptid));
  	    }
  
 +          /* For platforms such as ia64, a hardware watchpoint is
@@ -1708,9 +583,11 @@
  	  /* Handle GNU/Linux's extended waitstatus for trace events.  */
  	  if (WIFSTOPPED (status) && WSTOPSIG (status) == SIGTRAP && status >> 16 != 0)
  	    {
---- gdb-6.3/gdb/linux-nat.h.fix	Fri Jan  7 16:58:33 2005
-+++ gdb-6.3/gdb/linux-nat.h	Fri Jan  7 17:04:07 2005
-@@ -61,6 +61,18 @@ struct lwp_info
+Index: gdb-6.5/gdb/linux-nat.h
+===================================================================
+--- gdb-6.5.orig/gdb/linux-nat.h	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.h	2006-07-07 04:24:57.000000000 -0300
+@@ -63,6 +63,18 @@ struct lwp_info
  
    /* Next LWP in list.  */
    struct lwp_info *next;
@@ -1728,82 +605,42 @@
 +  int type;
  };
  
- /* Read/write to target memory via the Linux kernel's "proc file
---- gdb-6.3/gdb/Makefile.in.fix	Fri Jan  7 16:58:42 2005
-+++ gdb-6.3/gdb/Makefile.in	Fri Jan  7 17:04:07 2005
-@@ -2055,7 +2055,8 @@ ia64-aix-nat.o: ia64-aix-nat.c $(defs_h)
- 	$(objfiles_h) $(gdb_stat_h)
- ia64-aix-tdep.o: ia64-aix-tdep.c $(defs_h)
+ /* Attempt to initialize libthread_db.  */
+Index: gdb-6.5/gdb/Makefile.in
+===================================================================
+--- gdb-6.5.orig/gdb/Makefile.in	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/Makefile.in	2006-07-11 02:29:50.000000000 -0300
+@@ -2113,7 +2113,7 @@ i387-tdep.o: i387-tdep.c $(defs_h) $(dou
+ 	$(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h)
  ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \
--	$(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h)
-+	$(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) \
-+	$(observer_h) $(linux_nat_h)
+ 	$(target_h) $(gdbcore_h) $(regcache_h) $(ia64_tdep_h) $(gdb_wait_h) \
+-	$(gregset_h) $(linux_nat_h)
++	$(gregset_h) $(observer_h) $(linux_nat_h)
  ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(ia64_tdep_h) \
- 	$(arch_utils_h) $(gdbcore_h) $(regcache_h)
+ 	$(arch_utils_h) $(gdbcore_h) $(regcache_h) $(osabi_h) $(solib_svr4_h)
  ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
-@@ -2437,7 +2438,7 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $
- 	$(ppc_tdep_h) $(gdb_assert_h) $(dis_asm_h) $(trad_frame_h) \
- 	$(frame_unwind_h) $(frame_base_h)
+@@ -2518,7 +2518,7 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $
+ 	$(frame_unwind_h) $(frame_base_h) $(rs6000_tdep_h)
+ rs6000-aix-tdep.o: rs6000-aix-tdep.c $(defs_h) $(osabi_h) $(rs6000_tdep_h)
  s390-nat.o: s390-nat.c $(defs_h) $(tm_h) $(regcache_h) $(inferior_h) \
--	$(s390_tdep_h)
-+	$(s390_tdep_h) $(observer_h) $(linux_nat_h)
+-	$(s390_tdep_h) $(target_h) $(linux_nat_h)
++	$(s390_tdep_h) $(target_h) $(observer_h) $(linux_nat_h)
  s390-tdep.o: s390-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) $(inferior_h) \
  	$(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_h) \
- 	$(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \
---- gdb-6.3/gdb/thread-db.c.fix	Fri Jan  7 16:58:49 2005
-+++ gdb-6.3/gdb/thread-db.c	Fri Jan  7 17:04:07 2005
-@@ -34,6 +34,7 @@
+ 	$(floatformat_h) $(regcache_h) $(trad_frame_h) $(frame_base_h) \
+Index: gdb-6.5/gdb/linux-thread-db.c
+===================================================================
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-07-11 02:29:49.000000000 -0300
+@@ -36,6 +36,7 @@
  #include "target.h"
  #include "regcache.h"
  #include "solib-svr4.h"
 +#include "observer.h"
+ #include "gdbcore.h"
+ #include "linux-nat.h"
  
- #ifdef HAVE_GNU_LIBC_VERSION_H
- #include <gnu/libc-version.h>
-@@ -143,7 +144,6 @@ static void detach_thread (ptid_t ptid, 
- #define is_thread(ptid)		(GET_THREAD (ptid) != 0)
- 
- #define BUILD_LWP(lwp, pid)	ptid_build (pid, lwp, 0)
--#define BUILD_THREAD(tid, pid)	ptid_build (pid, 0, tid)
- 
- 
- /* Use "struct private_thread_info" to cache thread state.  This is
-@@ -267,7 +267,7 @@ thread_get_info_callback (const td_thrha
- 	   thread_db_err_str (err));
- 
-   /* Fill the cache.  */
--  thread_ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid));
-+  thread_ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid);
-   thread_info = find_thread_pid (thread_ptid);
- 
-   /* In the case of a zombie thread, don't continue.  We don't want to
-@@ -385,22 +385,14 @@ thread_from_lwp (ptid_t ptid)
- 
-   gdb_assert (thread_info && thread_info->private->ti_valid);
- 
--  return BUILD_THREAD (thread_info->private->ti.ti_tid, GET_PID (ptid));
-+  return ptid_build (GET_PID (ptid), GET_LWP (ptid),
-+		     thread_info->private->ti.ti_tid);
- }
- 
- static ptid_t
- lwp_from_thread (ptid_t ptid)
- {
--  struct thread_info *thread_info;
--  ptid_t thread_ptid;
--
--  if (!is_thread (ptid))
--    return ptid;
--
--  thread_info = find_thread_pid (ptid);
--  thread_db_get_info (thread_info);
--
--  return BUILD_LWP (thread_info->private->ti.ti_lid, GET_PID (ptid));
-+  return BUILD_LWP (GET_LWP (ptid), GET_PID (ptid));
- }
- 
- 
-@@ -722,6 +714,7 @@ attach_thread (ptid_t ptid, const td_thr
+@@ -718,6 +719,7 @@ attach_thread (ptid_t ptid, const td_thr
  {
    struct thread_info *tp;
    td_err_e err;
@@ -1811,7 +648,7 @@
  
    /* If we're being called after a TD_CREATE event, we may already
       know about this thread.  There are two ways this can happen.  We
-@@ -757,11 +750,18 @@ attach_thread (ptid_t ptid, const td_thr
+@@ -753,11 +755,18 @@ attach_thread (ptid_t ptid, const td_thr
    if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE)
      return;			/* A zombie thread -- do not attach.  */
  
@@ -1831,16 +668,7 @@
    /* Enable thread event reporting for this thread.  */
    err = td_thr_event_enable_p (th_p, 1);
    if (err != TD_OK)
-@@ -903,7 +903,7 @@ check_event (ptid_t ptid)
-       if (err != TD_OK)
- 	error ("Cannot get thread info: %s", thread_db_err_str (err));
- 
--      ptid = BUILD_THREAD (ti.ti_tid, GET_PID (ptid));
-+      ptid = ptid_build (GET_PID (ptid), ti.ti_lid, ti.ti_tid);
- 
-       switch (msg.event)
- 	{
-@@ -950,7 +950,8 @@ thread_db_wait (ptid_t ptid, struct targ
+@@ -946,7 +955,8 @@ thread_db_wait (ptid_t ptid, struct targ
      return pid_to_ptid (-1);
  
    if (ourstatus->kind == TARGET_WAITKIND_STOPPED
@@ -1850,18 +678,11 @@
      /* Check for a thread event.  */
      check_event (ptid);
  
-@@ -1175,7 +1176,7 @@ find_new_threads_callback (const td_thrh
-   if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE)
-     return 0;			/* A zombie -- ignore.  */
- 
--  ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid));
-+  ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid);
- 
-   if (!in_thread_list (ptid))
-     attach_thread (ptid, th_p, &ti, 1);
---- gdb-6.3/gdb/i386-linux-nat.c.fix	Fri Jan  7 16:59:02 2005
-+++ gdb-6.3/gdb/i386-linux-nat.c	Fri Jan  7 17:04:07 2005
-@@ -617,10 +617,9 @@ i386_linux_dr_get (int regnum)
+Index: gdb-6.5/gdb/i386-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 02:29:47.000000000 -0300
+@@ -619,10 +619,9 @@ i386_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
  
@@ -1875,7 +696,7 @@
  
    /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
       ptrace call fails breaks debugging remote targets.  The correct
-@@ -645,10 +644,9 @@ i386_linux_dr_set (int regnum, unsigned 
+@@ -647,10 +646,9 @@ i386_linux_dr_set (int regnum, unsigned 
  {
    int tid;
  
@@ -1889,9 +710,11 @@
  
    errno = 0;
    ptrace (PTRACE_POKEUSER, tid,
---- gdb-6.3/gdb/ia64-linux-nat.c.fix	Fri Jan  7 16:59:11 2005
-+++ gdb-6.3/gdb/ia64-linux-nat.c	Fri Jan  7 17:04:07 2005
-@@ -39,6 +39,8 @@
+Index: gdb-6.5/gdb/ia64-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-11 02:29:46.000000000 -0300
+@@ -41,6 +41,8 @@
  
  #include <asm/ptrace_offsets.h>
  #include <sys/procfs.h>
@@ -1900,7 +723,7 @@
  
  /* Prototypes for supply_gregset etc. */
  #include "gregset.h"
-@@ -559,8 +561,9 @@ is_power_of_2 (int val)
+@@ -561,8 +563,9 @@ is_power_of_2 (int val)
    return onecount <= 1;
  }
  
@@ -1912,7 +735,7 @@
  {
    int idx;
    long dbr_addr, dbr_mask;
-@@ -606,8 +609,38 @@ ia64_linux_insert_watchpoint (ptid_t pti
+@@ -608,8 +611,38 @@ ia64_linux_insert_watchpoint (ptid_t pti
    return 0;
  }
  
@@ -1952,7 +775,7 @@
  {
    int idx;
    long dbr_addr, dbr_mask;
-@@ -630,23 +663,74 @@ ia64_linux_remove_watchpoint (ptid_t pti
+@@ -632,23 +665,74 @@ ia64_linux_remove_watchpoint (ptid_t pti
    return -1;
  }
  
@@ -2030,7 +853,7 @@
      return 0;
  
    psr = read_register_pid (IA64_PSR_REGNUM, ptid);
-@@ -654,7 +738,7 @@ ia64_linux_stopped_data_address (CORE_AD
+@@ -656,7 +740,7 @@ ia64_linux_stopped_data_address (CORE_AD
                             for the next instruction */
    write_register_pid (IA64_PSR_REGNUM, psr, ptid);
  
@@ -2039,9 +862,9 @@
    return 1;
  }
  
-@@ -674,3 +758,36 @@ ia64_linux_xfer_unwind_table (struct tar
- {
-   return syscall (__NR_getunwind, readbuf, len);
+@@ -702,3 +786,36 @@ _initialize_ia64_linux_nat (void)
+   /* Register the target.  */
+   linux_nat_add_target (t);
  }
 +
 +/* Observer function for a new thread attach.  We need to insert
@@ -2076,9 +899,11 @@
 +  observer_attach_sigtrap (ia64_linux_save_sigtrap_info);
 +}
 +    
---- gdb-6.3/gdb/amd64-linux-nat.c.fix	Fri Jan  7 16:59:21 2005
-+++ gdb-6.3/gdb/amd64-linux-nat.c	Fri Jan  7 17:04:07 2005
-@@ -233,10 +233,9 @@ amd64_linux_dr_get (int regnum)
+Index: gdb-6.5/gdb/amd64-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 02:29:47.000000000 -0300
+@@ -234,10 +234,9 @@ amd64_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
  
@@ -2092,7 +917,7 @@
  
    /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
       ptrace call fails breaks debugging remote targets.  The correct
-@@ -261,10 +260,9 @@ amd64_linux_dr_set (int regnum, unsigned
+@@ -262,10 +261,9 @@ amd64_linux_dr_set (int regnum, unsigned
  {
    int tid;
  
@@ -2106,10 +931,12 @@
  
    errno = 0;
    ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value);
---- gdb-6.3/gdb/s390-nat.c.fix	Fri Jan  7 16:59:28 2005
-+++ gdb-6.3/gdb/s390-nat.c	Fri Jan  7 17:04:07 2005
-@@ -27,6 +27,8 @@
- #include "inferior.h"
+Index: gdb-6.5/gdb/s390-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/s390-nat.c	2006-07-07 04:24:43.000000000 -0300
++++ gdb-6.5/gdb/s390-nat.c	2006-07-07 04:24:57.000000000 -0300
+@@ -30,6 +30,8 @@
+ #include "linux-nat.h"
  
  #include "s390-tdep.h"
 +#include "linux-nat.h"
@@ -2117,7 +944,7 @@
  
  #include <asm/ptrace.h>
  #include <sys/ptrace.h>
-@@ -112,14 +114,14 @@ fill_fpregset (fpregset_t *regp, int reg
+@@ -114,14 +116,14 @@ fill_fpregset (fpregset_t *regp, int reg
  			      ((char *)regp) + regmap_fpregset[i]);
  }
  
@@ -2136,34 +963,34 @@
  
    return tid;
  }
-@@ -203,7 +205,7 @@ store_fpregs (int tid, int regnum)
- void
- fetch_inferior_registers (int regnum)
+@@ -205,7 +207,7 @@ store_fpregs (int tid, int regnum)
+ static void
+ s390_linux_fetch_inferior_registers (int regnum)
  {
 -  int tid = s390_inferior_tid ();
 +  int tid = s390_tid (inferior_ptid);
  
    if (regnum == -1 
        || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
-@@ -219,7 +221,7 @@ fetch_inferior_registers (int regnum)
- void
- store_inferior_registers (int regnum)
+@@ -221,7 +223,7 @@ s390_linux_fetch_inferior_registers (int
+ static void
+ s390_linux_store_inferior_registers (int regnum)
  {
 -  int tid = s390_inferior_tid ();
 +  int tid = s390_tid (inferior_ptid);
  
    if (regnum == -1 
        || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
-@@ -261,7 +263,7 @@ s390_stopped_by_watchpoint (void)
+@@ -263,7 +265,7 @@ s390_stopped_by_watchpoint (void)
    parea.len = sizeof (per_lowcore);
    parea.process_addr = (addr_t) & per_lowcore;
    parea.kernel_addr = offsetof (struct user_regs_struct, per_info.lowcore);
 -  if (ptrace (PTRACE_PEEKUSR_AREA, s390_inferior_tid (), &parea) < 0)
 +  if (ptrace (PTRACE_PEEKUSR_AREA, s390_tid (inferior_ptid), &parea) < 0)
-     perror_with_name ("Couldn't retrieve watchpoint status");
+     perror_with_name (_("Couldn't retrieve watchpoint status"));
  
    return per_lowcore.perc_storage_alteration == 1
-@@ -269,9 +271,9 @@ s390_stopped_by_watchpoint (void)
+@@ -271,9 +273,9 @@ s390_stopped_by_watchpoint (void)
  }
  
  static void
@@ -2175,8 +1002,8 @@
  
    per_struct per_info;
    ptrace_area parea;
-@@ -308,6 +310,16 @@ s390_fix_watch_points (void)
-     perror_with_name ("Couldn't modify watchpoint status");
+@@ -310,6 +312,16 @@ s390_fix_watch_points (void)
+     perror_with_name (_("Couldn't modify watchpoint status"));
  }
  
 +/* Callback routine to use with iterate_over_lwps to insert a specified
@@ -2189,10 +1016,10 @@
 +}
 +
 +/* Insert a specified watchpoint on all threads.  */
- int
- s390_insert_watchpoint (CORE_ADDR addr, int len)
+ static int
+ s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -321,10 +333,24 @@ s390_insert_watchpoint (CORE_ADDR addr, 
+@@ -323,10 +335,24 @@ s390_insert_watchpoint (CORE_ADDR addr, 
    area->next = watch_base;
    watch_base = area;
  
@@ -2202,23 +1029,23 @@
 +  if (iterate_over_lwps (&s390_insert_watchpoint_callback, NULL))
 +    return -1;
 +
-   return 0;
- }
- 
++  return 0;
++}
++
 +/* Callback routine to use with iterate_over_lwps to remove a specified
 +   watchpoint from all threads.  */
 +static int
 +s390_remove_watchpoint_callback (struct lwp_info *lwp, void *data)
 +{
 +  s390_fix_watch_points (lwp->ptid);
-+  return 0;
-+}
-+
+   return 0;
+ }
+ 
 +/* Remove a specified watchpoint from all threads.  */
- int
- s390_remove_watchpoint (CORE_ADDR addr, int len)
+ static int
+ s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -346,7 +372,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
+@@ -348,7 +374,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
    *parea = area->next;
    xfree (area);
  
@@ -2231,8 +1058,8 @@
    return 0;
  }
  
-@@ -357,3 +387,17 @@ kernel_u_size (void)
-   return sizeof (struct user);
+@@ -364,6 +394,15 @@ s390_region_ok_for_hw_watchpoint (CORE_A
+   return 1;
  }
  
 +/* New thread observer that inserts all existing watchpoints on the
@@ -2244,20 +1071,13 @@
 +  s390_fix_watch_points (ptid);
 +}
 +
-+void
-+_initialize_s390_nat (void)
-+{
+ 
+ void _initialize_s390_nat (void);
+ 
+@@ -389,4 +428,6 @@ _initialize_s390_nat (void)
+ 
+   /* Register the target.  */
+   linux_nat_add_target (t);
++
 +  observer_attach_linux_new_thread (s390_linux_new_thread);
-+}
---- gdb-6.3/gdb/gdbarch.sh.fix	Fri Jan  7 17:30:46 2005
-+++ gdb-6.3/gdb/gdbarch.sh	Fri Jan  7 17:32:28 2005
-@@ -611,6 +611,9 @@ f:=:CORE_ADDR:smash_text_address:CORE_AD
- # FIXME/cagney/2001-01-18: The logic is backwards.  It should be asking if the target can
- # single step.  If not, then implement single step using breakpoints.
- F:=:void:software_single_step:enum target_signal sig, int insert_breakpoints_p:sig, insert_breakpoints_p
-+# Return non-zero if the processor is executing a delay slot and a
-+# further single-step is needed before the instruction finishes.
-+M::int:single_step_through_delay:struct frame_info *frame:frame
- # FIXME: cagney/2003-08-28: Need to find a better way of selecting the
- # disassembler.  Perhaps objdump can handle it?
- f:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info::0:
+ }

gdb-6.3-threaded-watchpoints2-20050225.patch:
 amd64-linux-nat.c                       |  155 ++++++++++++++++++++++++++++---
 config/i386/nm-linux.h                  |   54 +++++++++-
 config/i386/nm-linux64.h                |   53 +++++++++-
 i386-linux-nat.c                        |  160 +++++++++++++++++++++++++++++---
 i386-nat.c                              |    1 
 testsuite/gdb.threads/watchthreads2.c   |   66 +++++++++++++
 testsuite/gdb.threads/watchthreads2.exp |  133 ++++++++++++++++++++++++++
 7 files changed, 578 insertions(+), 44 deletions(-)

Index: gdb-6.3-threaded-watchpoints2-20050225.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints2-20050225.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-threaded-watchpoints2-20050225.patch	3 Mar 2005 20:42:47 -0000	1.1
+++ gdb-6.3-threaded-watchpoints2-20050225.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -35,16 +35,10 @@
 	* testsuite/gdb.threads/watchthreads2.c: New test case.
 	* testsuite/gdb.threads/watchthreads2.exp: Ditto.
 
---- gdb-6.3/gdb/config/i386/nm-linux64.h.fix	2004-08-15 12:10:23.000000000 -0400
-+++ gdb-6.3/gdb/config/i386/nm-linux64.h	2005-02-28 17:36:09.000000000 -0500
-@@ -1,6 +1,6 @@
- /* Native support for GNU/Linux x86-64.
- 
--   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-    Contributed by Jiri Smid, SuSE Labs.
- 
+Index: gdb-6.5/gdb/config/i386/nm-linux64.h
+===================================================================
+--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h	2006-07-11 02:44:36.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux64.h	2006-07-11 02:45:16.000000000 -0300
 @@ -35,22 +35,59 @@
  
  /* Provide access to the i386 hardware debugging registers.  */
@@ -87,11 +81,11 @@
 +
 +/* Insert a hardware-assisted breakpoint at address ADDR.  SHADOW is
 + *  *    unused.  Return 0 on success, EBUSY on failure.  */
-+extern int amd64_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow);
++extern int amd64_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt);
 +
 +/* Remove a hardware-assisted breakpoint at address ADDR.  SHADOW is
 + *  *    unused. Return 0 on success, -1 on failure.  */
-+extern int  amd64_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow);
++extern int  amd64_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt);
 +
 +/* Override basic amd64 macros for watchpoint and hardware breakpoint 
 + *    insertion/removal to support threads.  */
@@ -104,27 +98,20 @@
 +  amd64_linux_remove_watchpoint (addr, len, type)
 +
 +#undef target_insert_hw_breakpoint
-+#define target_insert_hw_breakpoint(addr, shadow) \
-+  amd64_linux_insert_hw_breakpoint (addr, shadow)
++#define target_insert_hw_breakpoint(bp_tgt) \
++  amd64_linux_insert_hw_breakpoint (bp_tgt)
 +
 +#undef target_remove_hw_breakpoint
-+#define target_remove_hw_breakpoint(addr, shadow) \
-+  amd64_linux_remove_hw_breakpoint (addr, shadow)
++#define target_remove_hw_breakpoint(bp_tgt) \
++  amd64_linux_remove_hw_breakpoint (bp_tgt)
  
  /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
  #define FETCH_INFERIOR_REGISTERS
---- gdb-6.3/gdb/config/i386/nm-linux.h.fix	2004-09-20 12:39:35.000000000 -0400
-+++ gdb-6.3/gdb/config/i386/nm-linux.h	2005-02-28 17:36:00.000000000 -0500
-@@ -1,7 +1,7 @@
- /* Native support for GNU/Linux x86.
- 
-    Copyright 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
--   1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+   1998, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
- 
-    This file is part of GDB.
- 
-@@ -45,23 +45,61 @@ extern CORE_ADDR register_u_addr (CORE_A
+Index: gdb-6.5/gdb/config/i386/nm-linux.h
+===================================================================
+--- gdb-6.5.orig/gdb/config/i386/nm-linux.h	2006-07-11 02:44:36.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux.h	2006-07-11 02:45:16.000000000 -0300
+@@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A
  
  /* Provide access to the i386 hardware debugging registers.  */
  
@@ -167,11 +154,11 @@
 +
 +/* Insert a hardware-assisted breakpoint at address ADDR.  SHADOW is
 + *    unused.  Return 0 on success, EBUSY on failure.  */
-+extern int i386_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow);
++extern int i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt);
 +
 +/* Remove a hardware-assisted breakpoint at address ADDR.  SHADOW is
 + *    unused. Return 0 on success, -1 on failure.  */
-+extern int  i386_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow);
++extern int  i386_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt);
 +
 +/* Override basic i386 macros for watchpoint and hardware breakpoint 
 +   insertion/removal to support threads.  */
@@ -184,26 +171,20 @@
 +  i386_linux_remove_watchpoint (addr, len, type)
 +
 +#undef target_insert_hw_breakpoint
-+#define target_insert_hw_breakpoint(addr, shadow) \
-+  i386_linux_insert_hw_breakpoint (addr, shadow)
++#define target_insert_hw_breakpoint(bp_tgt) \
++  i386_linux_insert_hw_breakpoint (bp_tgt)
 +
 +#undef target_remove_hw_breakpoint
-+#define target_remove_hw_breakpoint(addr, shadow) \
-+  i386_linux_remove_hw_breakpoint (addr, shadow)
++#define target_remove_hw_breakpoint(bp_tgt) \
++  i386_linux_remove_hw_breakpoint (bp_tgt)
 +
  /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
  #define FETCH_INFERIOR_REGISTERS
  
---- gdb-6.3/gdb/i386-nat.c.fix	2005-02-25 16:53:44.000000000 -0500
-+++ gdb-6.3/gdb/i386-nat.c	2005-02-28 17:33:11.000000000 -0500
-@@ -1,6 +1,6 @@
- /* Native-dependent code for the i386.
- 
--   Copyright 2001, 2004 Free Software Foundation, Inc.
-+   Copyright 2001, 2004, 2005 Free Software Foundation, Inc.
- 
-    This file is part of GDB.
- 
+Index: gdb-6.5/gdb/i386-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/i386-nat.c	2006-07-11 02:44:36.000000000 -0300
++++ gdb-6.5/gdb/i386-nat.c	2006-07-11 02:45:16.000000000 -0300
 @@ -21,6 +21,7 @@
  
  #include "defs.h"
@@ -212,8 +193,10 @@
  #include "command.h"
  #include "gdbcmd.h"
  
---- gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.c.fix	2005-02-28 17:33:54.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.c	2005-02-28 17:35:37.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-11 02:45:16.000000000 -0300
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -281,8 +264,10 @@
 +    pthread_exit(NULL);
 +}
 +
---- gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.exp.fix	2005-02-28 17:33:57.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.threads/watchthreads2.exp	2005-02-28 17:35:33.000000000 -0500
+Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-11 02:45:16.000000000 -0300
 @@ -0,0 +1,133 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -417,26 +402,19 @@
 +} else {
 +  fail $message 
 +}
---- gdb-6.3/gdb/i386-linux-nat.c.fix	2005-02-24 19:36:12.000000000 -0500
-+++ gdb-6.3/gdb/i386-linux-nat.c	2005-02-28 17:33:01.000000000 -0500
-@@ -1,6 +1,7 @@
- /* Native-dependent code for GNU/Linux i386.
- 
--   Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 
-+   Free Software Foundation, Inc.
- 
-    This file is part of GDB.
- 
-@@ -23,6 +24,7 @@
+Index: gdb-6.5/gdb/i386-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 02:44:36.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 02:45:16.000000000 -0300
+@@ -24,6 +24,7 @@
  #include "inferior.h"
  #include "gdbcore.h"
  #include "regcache.h"
 +#include "observer.h"
+ #include "target.h"
  #include "linux-nat.h"
  
- #include "gdb_assert.h"
-@@ -612,14 +614,14 @@ store_inferior_registers (int regno)
+@@ -614,14 +615,14 @@ i386_linux_store_inferior_registers (int
  /* Support for debug registers.  */
  
  static unsigned long
@@ -454,7 +432,7 @@
  
    /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
       ptrace call fails breaks debugging remote targets.  The correct
-@@ -640,13 +642,13 @@ i386_linux_dr_get (int regnum)
+@@ -642,13 +643,13 @@ i386_linux_dr_get (int regnum)
  }
  
  static void
@@ -471,7 +449,7 @@
  
    errno = 0;
    ptrace (PTRACE_POKEUSER, tid,
-@@ -656,34 +658,158 @@ i386_linux_dr_set (int regnum, unsigned 
+@@ -658,34 +659,158 @@ i386_linux_dr_set (int regnum, unsigned 
  }
  
  void
@@ -599,10 +577,10 @@
 +/* Insert a hardware-assisted breakpoint at address ADDR.  SHADOW is
 +   unused.  Return 0 on success, EBUSY on failure.  */
 +int
-+i386_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow)
++i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
 +{
 +  int rc;
-+  rc = i386_insert_hw_breakpoint (addr, shadow);
++  rc = i386_insert_hw_breakpoint (bt_tgt);
 +  if (!rc)
 +    i386_linux_sync_debug_registers_across_threads ();
 +  return rc;
@@ -611,10 +589,10 @@
 +/* Remove a hardware-assisted breakpoint at address ADDR.  SHADOW is
 +   unused.  Return 0 on success, -1 on failure.  */
 +int
-+i386_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow)
++i386_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt)
 +{
 +  int rc;
-+  rc = i386_remove_hw_breakpoint (addr, shadow);
++  rc = i386_remove_hw_breakpoint (bp_tgt);
 +  if (!rc)
 +    i386_linux_sync_debug_registers_across_threads ();
 +  return rc;
@@ -638,9 +616,9 @@
  /* Called by libthread_db.  Returns a pointer to the thread local
     storage (or its descriptor).  */
  
-@@ -817,3 +943,10 @@ child_post_startup_inferior (ptid_t ptid
-   i386_cleanup_dregs ();
-   linux_child_post_startup_inferior (ptid);
+@@ -844,3 +969,10 @@ _initialize_i386_linux_nat (void)
+   /* Register the target.  */
+   linux_nat_add_target (t);
  }
 +
 +void
@@ -649,17 +627,11 @@
 +  observer_attach_linux_new_thread (i386_linux_new_thread);
 +}
 +    
---- gdb-6.3/gdb/amd64-linux-nat.c.fix	2005-02-24 19:37:56.000000000 -0500
-+++ gdb-6.3/gdb/amd64-linux-nat.c	2005-02-28 17:32:44.000000000 -0500
-@@ -1,6 +1,6 @@
- /* Native-dependent code for GNU/Linux x86-64.
- 
--   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+   Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-    Contributed by Jiri Smid, SuSE Labs.
- 
-    This file is part of GDB.
-@@ -24,6 +24,7 @@
+Index: gdb-6.5/gdb/amd64-linux-nat.c
+===================================================================
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 02:44:36.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 02:45:16.000000000 -0300
+@@ -25,6 +25,7 @@
  #include "inferior.h"
  #include "gdbcore.h"
  #include "regcache.h"
@@ -667,7 +639,7 @@
  #include "linux-nat.h"
  
  #include "gdb_assert.h"
-@@ -228,14 +229,14 @@ store_inferior_registers (int regnum)
+@@ -229,14 +230,14 @@ amd64_linux_store_inferior_registers (in
  
  
  static unsigned long
@@ -685,7 +657,7 @@
  
    /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the
       ptrace call fails breaks debugging remote targets.  The correct
-@@ -256,13 +257,13 @@ amd64_linux_dr_get (int regnum)
+@@ -257,13 +258,13 @@ amd64_linux_dr_get (int regnum)
  }
  
  static void
@@ -702,7 +674,7 @@
  
    errno = 0;
    ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value);
-@@ -271,34 +272,158 @@ amd64_linux_dr_set (int regnum, unsigned
+@@ -272,34 +273,158 @@ amd64_linux_dr_set (int regnum, unsigned
  }
  
  void
@@ -830,10 +802,10 @@
 +/* Insert a hardware-assisted breakpoint at address ADDR.  SHADOW is
 +   unused.  Return 0 on success, EBUSY on failure.  */
 +int
-+amd64_linux_insert_hw_breakpoint (CORE_ADDR addr, void *shadow)
++amd64_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
 +{
 +  int rc;
-+  rc = i386_insert_hw_breakpoint (addr, shadow);
++  rc = i386_insert_hw_breakpoint (bp_tgt);
 +  if (!rc)
 +    amd64_linux_sync_debug_registers_across_threads ();
 +  return rc;
@@ -842,10 +814,10 @@
 +/* Remove a hardware-assisted breakpoint at address ADDR.  SHADOW is
 +   unused.  Return 0 on success, -1 on failure.  */
 +int
-+amd64_linux_remove_hw_breakpoint (CORE_ADDR addr, void *shadow)
++amd64_linux_remove_hw_breakpoint (struct bp_target_info *bp_tgt)
 +{
 +  int rc;
-+  rc = i386_remove_hw_breakpoint (addr, shadow);
++  rc = i386_remove_hw_breakpoint (bp_tgt);
 +  if (!rc)
 +    amd64_linux_sync_debug_registers_across_threads ();
 +  return rc;
@@ -869,10 +841,10 @@
  /* This function is called by libthread_db as part of its handling of
     a request for a thread's local storage address.  */
  
-@@ -380,4 +505,6 @@ _initialize_amd64_linux_nat (void)
- 	      == amd64_native_gregset32_num_regs);
-   gdb_assert (ARRAY_SIZE (amd64_linux_gregset64_reg_offset)
- 	      == amd64_native_gregset64_num_regs);
+@@ -399,4 +524,6 @@ _initialize_amd64_linux_nat (void)
+ 
+   /* Register the target.  */
+   linux_nat_add_target (t);
 +
 +  observer_attach_linux_new_thread (amd64_linux_new_thread);
  }

gdb-6.3-warnings-20050317.patch:
 configure                      |    2 ++
 configure.ac                   |    2 ++
 cp-valprint.c                  |    4 ++--
 doublest.c                     |   13 ++++---------
 dwarf2expr.c                   |    2 ++
 dwarf2read.c                   |   14 +++++++++-----
 f-exp.y                        |    2 ++
 gdb-events.c                   |    2 ++
 linespec.c                     |    2 +-
 macroscope.c                   |    9 ++++-----
 mi/mi-cmd-break.c              |    4 ++--
 mi/mi-cmd-disas.c              |    2 +-
 mi/mi-cmd-env.c                |    4 ++--
 mi/mi-getopt.c                 |    2 +-
 mi/mi-main.c                   |    4 ++--
 p-valprint.c                   |    4 ++--
 remote-fileio.c                |   26 +++++++++++++-------------
 remote.c                       |    4 ++--
 s390-tdep.c                    |    3 +++
 source.c                       |    4 ++--
 stabsread.c                    |    3 ++-
 symfile.c                      |    2 ++
 target.c                       |    6 ++++++
 testsuite/gdb.base/move-dir.h  |    2 +-
 testsuite/gdb.base/sigrepeat.c |    1 +
 tui/tui-layout.c               |    8 ++++----
 varobj.c                       |   16 ++++++----------
 27 files changed, 82 insertions(+), 65 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 gdb-6.3-warnings-20050317.patch
Index: gdb-6.3-warnings-20050317.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-warnings-20050317.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-warnings-20050317.patch	22 Mar 2005 23:25:26 -0000	1.1
+++ gdb-6.3-warnings-20050317.patch	11 Jul 2006 06:33:02 -0000	1.2
@@ -1,4595 +1,21 @@
---- gdb-6.3/gdb/configure.fix	2005-03-21 18:12:23.000000000 -0500
-+++ gdb-6.3/gdb/configure	2005-03-21 18:13:32.000000000 -0500
-@@ -79,7 +79,6 @@ program_suffix=NONE
- program_transform_name=s,x,x,
- silent=
- site=
--sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -194,7 +193,6 @@ Configuration:
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
--  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -365,11 +363,6 @@ EOF
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
--  -site-file | --site-file | --site-fil | --site-fi | --site-f)
--    ac_prev=sitefile ;;
--  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
--    sitefile="$ac_optarg" ;;
--
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -535,16 +528,12 @@ fi
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$sitefile"; then
--  if test -z "$CONFIG_SITE"; then
--    if test "x$prefix" != xNONE; then
--      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--    else
--      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--    fi
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-   fi
--else
--  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -585,7 +574,7 @@ fi
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:589: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:578: checking whether to enable maintainer-specific portions of Makefiles" >&5
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval="$enable_maintainer_mode"
-@@ -611,7 +600,7 @@ fi
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:615: checking for $ac_word" >&5
-+echo "configure:604: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -641,7 +630,7 @@ if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:645: checking for $ac_word" >&5
-+echo "configure:634: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -692,7 +681,7 @@ fi
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:696: checking for $ac_word" >&5
-+echo "configure:685: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -724,7 +713,7 @@ fi
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:717: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -735,12 +724,12 @@ cross_compiling=$ac_cv_prog_cc_cross
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 739 "configure"
-+#line 728 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -766,12 +755,12 @@ if test $ac_cv_prog_cc_works = no; then
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:759: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:775: checking whether we are using GNU C" >&5
-+echo "configure:764: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -780,7 +769,7 @@ else
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -799,7 +788,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:803: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:792: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -836,7 +825,7 @@ EOF
- 
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:840: checking how to run the C preprocessor" >&5
-+echo "configure:829: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -851,13 +840,13 @@ else
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 855 "configure"
-+#line 844 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -868,13 +857,13 @@ else
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 872 "configure"
-+#line 861 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -885,13 +874,13 @@ else
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 889 "configure"
[...4968 lines suppressed...]
 -          /* A zero macinfo type indicates the end of the macro
@@ -5152,19 +451,10 @@
          case DW_MACINFO_define:
          case DW_MACINFO_undef:
            {
---- gdb-6.3/gdb/stabsread.c.fix	2005-03-17 19:24:48.000000000 -0500
-+++ gdb-6.3/gdb/stabsread.c	2005-03-21 11:53:40.000000000 -0500
-@@ -1,8 +1,8 @@
- /* Support routines for decoding "stabs" debugging information format.
- 
-    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
--   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
--   Software Foundation, Inc.
-+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+   Free Software Foundation, Inc.
- 
-    This file is part of GDB.
- 
+Index: gdb-6.5/gdb/stabsread.c
+===================================================================
+--- gdb-6.5.orig/gdb/stabsread.c	2006-07-11 02:46:52.000000000 -0300
++++ gdb-6.5/gdb/stabsread.c	2006-07-11 02:47:24.000000000 -0300
 @@ -1794,7 +1794,8 @@ again:
  	  struct type *domain = read_type (pp, objfile);
  	  struct type *return_type;
@@ -5175,16 +465,11 @@
  
  	  if (**pp != ',')
  	    /* Invalid member type data format.  */
---- gdb-6.3/gdb/dwarf2expr.c.fix	2005-03-17 19:25:46.000000000 -0500
-+++ gdb-6.3/gdb/dwarf2expr.c	2005-03-21 11:51:42.000000000 -0500
-@@ -1,5 +1,5 @@
- /* Dwarf2 Expression Evaluator
--   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
-+   Copyright 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-    Contributed by Daniel Berlin (dan at dberlin.org)
- 
-    This file is part of GDB.
-@@ -560,6 +560,8 @@ execute_stack_op (struct dwarf_expr_cont
+Index: gdb-6.5/gdb/dwarf2expr.c
+===================================================================
+--- gdb-6.5.orig/gdb/dwarf2expr.c	2006-07-11 02:46:52.000000000 -0300
++++ gdb-6.5/gdb/dwarf2expr.c	2006-07-11 02:47:24.000000000 -0300
+@@ -559,6 +559,8 @@ execute_stack_op (struct dwarf_expr_cont
  	      op_ptr = read_uleb128 (op_ptr, op_end, &reg);
  	      result += reg;
  	      break;
@@ -5193,54 +478,11 @@
  	    }
  	  break;
  
---- gdb-6.3/gdb/dwarf2-frame.c.fix	2005-03-17 19:27:00.000000000 -0500
-+++ gdb-6.3/gdb/dwarf2-frame.c	2005-03-21 16:50:11.000000000 -0500
-@@ -1,6 +1,6 @@
- /* Frame unwinder for frames with DWARF Call Frame Information.
- 
--   Copyright 2003, 2004 Free Software Foundation, Inc.
-+   Copyright 2003, 2004, 2005 Free Software Foundation, Inc.
- 
-    Contributed by Mark Kettenis.
- 
-@@ -1368,7 +1368,8 @@ decode_frame_entry_1 (struct comp_unit *
- 	  else if (*augmentation == 'P')
- 	    {
- 	      /* Skip.  */
--	      buf += size_of_encoded_value (*buf++);
-+	      buf += size_of_encoded_value (*buf);
-+	      ++buf;
- 	      augmentation++;
- 	    }
- 
---- gdb-6.3/gdb/ada-lang.h.fix	2005-03-17 19:34:31.000000000 -0500
-+++ gdb-6.3/gdb/ada-lang.h	2005-03-21 11:51:19.000000000 -0500
-@@ -1,5 +1,5 @@
- /* Ada language support definitions for GDB, the GNU debugger.
--   Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+   Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-    Free Software Foundation, Inc.
- 
- This file is part of GDB.
-@@ -171,7 +171,7 @@ extern struct task_entry *task_list;
-    least M objects, updating V and S as necessary. */
- 
- #define GROW_VECT(v, s, m)                                              \
--   if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v)));
-+   if ((s) < (m)) grow_vect ((void**)(char *) &(v), &(s), (m), sizeof(*(v)));
- 
- extern void grow_vect (void **, size_t *, size_t, int);
- 
---- gdb-6.3/gdb/varobj.c.fix	2005-03-17 19:35:38.000000000 -0500
-+++ gdb-6.3/gdb/varobj.c	2005-03-22 16:29:10.000000000 -0500
-@@ -1,5 +1,5 @@
- /* Implementation of the GDB variable objects API.
--   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-+   Copyright 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -315,10 +315,9 @@ struct language_specific
+Index: gdb-6.5/gdb/varobj.c
+===================================================================
+--- gdb-6.5.orig/gdb/varobj.c	2006-07-11 02:47:21.000000000 -0300
++++ gdb-6.5/gdb/varobj.c	2006-07-11 02:47:24.000000000 -0300
+@@ -325,10 +325,9 @@ struct language_specific
  
  /* Array of known source language routines. */
  static struct language_specific
@@ -5253,7 +495,7 @@
     c_number_of_children,
     c_name_of_variable,
     c_name_of_child,
-@@ -329,8 +328,7 @@ static struct language_specific
+@@ -339,8 +338,7 @@ static struct language_specific
     c_value_of_variable}
    ,
    /* C */
@@ -5263,7 +505,7 @@
     c_number_of_children,
     c_name_of_variable,
     c_name_of_child,
-@@ -341,8 +339,7 @@ static struct language_specific
+@@ -351,8 +349,7 @@ static struct language_specific
     c_value_of_variable}
    ,
    /* C++ */
@@ -5273,7 +515,7 @@
     cplus_number_of_children,
     cplus_name_of_variable,
     cplus_name_of_child,
-@@ -353,8 +350,7 @@ static struct language_specific
+@@ -363,8 +360,7 @@ static struct language_specific
     cplus_value_of_variable}
    ,
    /* Java */
@@ -5283,7 +525,7 @@
     java_number_of_children,
     java_name_of_variable,
     java_name_of_child,
-@@ -509,7 +505,7 @@ varobj_create (char *objname,
+@@ -519,7 +515,7 @@ varobj_create (char *objname,
  
        /* Set language info */
        lang = variable_language (var);
@@ -5292,22 +534,41 @@
  
        /* Set ourselves as our root */
        var->root->rootvar = var;
---- gdb-6.3/gdb/configure.in.fix	2005-03-21 17:59:50.000000000 -0500
-+++ gdb-6.3/gdb/configure.in	2005-03-21 18:00:42.000000000 -0500
-@@ -1,5 +1,5 @@
- dnl Autoconf configure script for GDB, the GNU debugger.
--dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- dnl Free Software Foundation, Inc.
- dnl
- dnl This file is part of GDB.
-@@ -1132,7 +1132,8 @@ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+Index: gdb-6.5/gdb/configure.ac
+===================================================================
+--- gdb-6.5.orig/gdb/configure.ac	2006-07-11 02:46:52.000000000 -0300
++++ gdb-6.5/gdb/configure.ac	2006-07-11 02:47:24.000000000 -0300
+@@ -1133,7 +1133,8 @@ fi
  # gdb/doc/gdbint.texinfo.
  build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
- -Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \
---Wunused-label -Wunused-function"
+ -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \
+--Wunused-label -Wunused-function -Wno-pointer-sign"
 +-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \
 +-Wp,-U_FORTIFY_SOURCE"
- # Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs
- # -Wunused-function -Wunused-variable -Wunused-value
- # -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual
+ 
+ # GCC supports -Wuninitialized only with -O or -On, n != 0.
+ if test x${CFLAGS+set} = xset; then
+Index: gdb-6.5/gdb/doublest.c
+===================================================================
+--- gdb-6.5.orig/gdb/doublest.c	2005-12-17 20:33:59.000000000 -0200
++++ gdb-6.5/gdb/doublest.c	2006-07-11 02:55:55.000000000 -0300
+@@ -94,15 +94,10 @@ get_field (const bfd_byte *data, enum fl
+     {
+       result |= (unsigned long)*(data + cur_byte) << cur_bitshift;
+       cur_bitshift += FLOATFORMAT_CHAR_BIT;
+-      switch (order)
+-	{
+-	case floatformat_little:
+-	  ++cur_byte;
+-	  break;
+-	case floatformat_big:
+-	  --cur_byte;
+-	  break;
+-	}
++      if (order == floatformat_little)
++	++cur_byte;
++      else
++	--cur_byte;
+     }
+   if (len < sizeof(result) * FLOATFORMAT_CHAR_BIT)
+     /* Mask out bits which are not part of the field */


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gdb.spec	15 Jun 2006 11:34:42 -0000	1.186
+++ gdb.spec	11 Jul 2006 06:33:02 -0000	1.187
@@ -8,19 +8,19 @@
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 6.3.0.0
+Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.132.FC6
+Release: 1%{?dist}
 
 License: GPL
 Group: Development/Debuggers
-Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.5.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 URL: http://gnu.org/software/gdb/
 
 # For our convenience
-%define gdb_src gdb-6.3
+%define gdb_src gdb-6.5
 %define gdb_build %{gdb_src}/build-%{_target_platform}
 
 # Make sure we get rid of the old package gdb64, now that we have unified
@@ -56,14 +56,6 @@
 # frames are identified as signal frames.
 Patch101: gdb-6.3-sigx86-20040621.patch
 
-# Don't reject signal trampoline frames that have a [data] symbol
-# associated with them as occures when backtracing through an
-# alt-stack in the data address space.
-Patch102: gdb-6.3-sigsymtramp-20040621.patch
-
-# Add unwinders for PPC and PPC64 signal trampolines.
-Patch103: gdb-6.3-ppcsignals-20040621.patch
-
 # Use convert_from_func_ptr_addr on the solib breakpoint address;
 # simplifies and makes more consistent the logic.
 Patch104: gdb-6.3-ppcdotsolib-20041022.patch
@@ -74,23 +66,10 @@
 # Stop a backtrace when a zero PC is encountered.
 Patch106: gdb-6.3-framepczero-20040927.patch
 
-# Hack around broken header files that incorrectly define the FPSCR
-# macro.
-Patch107: gdb-6.3-ppc64fpscrhack-20041026.patch
-
 # Pass the pc's section into the symbol search code; stops the lookup
 # finding a symbol from the wrong section.
 Patch108: gdb-6.3-ppc64section-20041026.patch
 
-# Add PPC register groups so that info registers et.al.; along with
-# register save and restore; work better.  On PPC-64 it was restoring
-# the PS register setting the break-on-branch bit!
-Patch109: gdb-6.3-ppcreggroups-20041124.patch
-
-# Fix up 64-bit PPC inferior function calls so that function
-# parameters are passed correctly.
-Patch110: gdb-6.3-ppc64abi-20040621.patch
-
 # Include the pc's section when doing a symbol lookup so that the
 # correct symbol is found.
 Patch111: gdb-6.3-ppc64displaysymbol-20041124.patch
@@ -101,9 +80,6 @@
 # Threaded watchpoint support
 Patch113: gdb-6.3-threaded-watchpoints-20041213.patch
 
-# Multiple patches to ia64 backtrace
-Patch114: gdb-6.3-ia64-backtrace-20041213.patch
-
 # Fix to expose multiple constructors to end-user
 Patch115: gdb-6.3-constructor-20041216.patch
 
@@ -123,46 +99,28 @@
 # Fix to ensure types are visible
 Patch120: gdb-6.3-type-fix-20041213.patch
 
-# Fix for allowing macros to continue after backtrace errors
-Patch121: gdb-6.3-backtrace-20041216.patch
-
 # VSYSCALL and PIE
 Patch122: gdb-6.3-test-pie-20050107.patch
-Patch123: gdb-6.3-vsyscall-20041216.patch
 Patch124: gdb-6.3-pie-20050110.patch
 
 # Get selftest working with sep-debug-info
 Patch125: gdb-6.3-test-self-20050110.patch
 
-# No longer a need to set .malloc on ppc64.
-Patch126: gdb-6.3-ppcmalloc-20041124.patch
-
 # Enable PPC CFI support.
 Patch127: gdb-6.3-ppccfi-20041104.patch
 
 # Fix for non-threaded watchpoints.
 Patch128: gdb-6.3-nonthreaded-wp-20050117.patch
 
-# Add synthetic symbols (esp PPC-64 .symbols) to min symtab
-Patch129: gdb-6.3-ppcdotsym-20050126.patch
-
 # Add PPC .symbols to min-symtable.
 Patch130: gdb-6.3-ctorline-20050120.patch
 
-# Handle nested, and back-to-back signals when stepping.
-Patch131: gdb-6.3-sigrepeats-20050121.patch
-Patch132: gdb-6.3-test-sigrepeats-20050121.patch
-
 # Fix to support multiple destructors just like multiple constructors
 Patch133: gdb-6.3-test-dtorfix-20050121.patch
 Patch134: gdb-6.3-dtorfix-20050121.patch
 
-# Fix for ia64 to prevent SIGSEGV in debugger
-Patch135: gdb-6.3-ia64fix-20050121.patch
-
 # Fix to support executable moving
 Patch136: gdb-6.3-test-movedir-20050125.patch
-Patch137: gdb-6.3-movedir-20050125.patch
 
 # Fix to support unwinding syscalls in ia64 corefiles
 Patch138: gdb-6.3-ia64-corefile-fix-20050127.patch
@@ -179,18 +137,9 @@
 # Prevent gdb from being pushed into background
 Patch142: gdb-6.3-terminal-fix-20050214.patch
 
-# Fix for unload.exp testcase
-Patch143: gdb-6.3-unload-test-20050216.patch
-
-# Backport addition symfile-mem.o to all GNU/Linux systems.
-Patch144: gdb-6.3-addsymfilemem-20050209.patch
-
 # Allow sibling threads to set threaded watchpoints for x86 and x86-64
 Patch145: gdb-6.3-threaded-watchpoints2-20050225.patch
 
-# Follow vfork fix from mainline sources
-Patch146: gdb-6.3-follow-vfork-20050303.patch
-
 # Fix unexpected compiler warning messages.
 Patch147: gdb-6.3-warnings-20050317.patch
 
@@ -204,22 +153,10 @@
 Patch150: gdb-6.3-test-sepcrc-20050402.patch
 Patch151: gdb-6.3-sepcrc-20050402.patch
 
-# Handle read side of DW_OP_piece.
-Patch152: gdb-6.3-dwoppieceread-20050407.patch
-
 # Do not issue warning message about first page of storage for ia64 gcore
 Patch153: gdb-6.3-ia64-gcore-page0-20050421.patch
 
-# Ia64 patch for added libunwind support
-Patch154: gdb-6.3-ia64-sigtramp-20050427.patch
-
-# Partial die in cache fix
-Patch155: gdb-6.3-partial-die-20050503.patch
-
-# SA_RESTART patch
-Patch156: gdb-6.3-sarestart-20050518.patch
-
-# Security errata for bfd overflow and untrusted .gdbinit
+# Security errata for untrusted .gdbinit
 Patch157: gdb-6.3-security-errata-20050610.patch
 
 # IA64 sigtramp prev register patch
@@ -249,9 +186,6 @@
 # Fix frame pointer for ia64 sigtramp frame
 Patch166: gdb-6.3-ia64-sigtramp-fp-20050926.patch
 
-# Fix DSO read logic for attached process
-Patch167: gdb-6.3-attach-dso-20050929.patch
-
 # Support gdb attaching to a stopped process
 Patch168: gdb-6.3-attach-stop-20051011.patch
 
@@ -261,23 +195,12 @@
 # Allow option to continue backtracing past a zero pc value
 Patch170: gdb-6.3-bt-past-zero-20051201.patch
 
-# Silence type-punning warnings that cause compilation errors because
-# of -Werror.
-Patch171: gdb-6.3-type-punning-20060214.patch
-
-# Enable gdb to debug using executables and core files with different
-# prelink base addresses.
-Patch172: gdb-6.3-prelink-core-20060223.patch
-
 # Enable gdb to recognize stack frames annotated with the "S" augmentation.
 Patch173: gdb-6.3-augmS-20060303.patch
 
 # Enable gdb to recognize CFA value expressions introduced in Dwarf3.
 Patch174: gdb-6.3-cfaval-20060303.patch
 
-# Use fopen64 where available.
-Patch175: gdb-6.3-support-fopen64-20060413.patch
-
 # Use bigger numbers than int.
 Patch176: gdb-6.3-large-core-20051206.patch
 
@@ -323,61 +246,40 @@
 %patch4 -p1
 
 %patch101 -p1
-%patch102 -p1
-%patch103 -p1
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
-%patch107 -p1
 %patch108 -p1
-%patch109 -p1
-%patch110 -p1
 %patch111 -p1
 %patch112 -p1
 %patch113 -p1
-%patch114 -p1
 %patch115 -p1
 %patch116 -p1
 %patch117 -p1
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
-%patch121 -p1
 %patch122 -p1
-%patch123 -p1
 %patch124 -p1
 %patch125 -p1
-%patch126 -p1
 %patch127 -p1
 %patch128 -p1
-%patch129 -p1
 %patch130 -p1
-%patch131 -p1
-%patch132 -p1
 %patch133 -p1
 %patch134 -p1
-%patch135 -p1
 %patch136 -p1
-%patch137 -p1
 %patch138 -p1
 %patch139 -p1
 %patch140 -p1
 %patch141 -p1
 %patch142 -p1
-%patch143 -p1
-%patch144 -p1
 %patch145 -p1
-%patch146 -p1
 %patch147 -p1
 %patch148 -p1
 %patch149 -p1
 %patch150 -p1
 %patch151 -p1
-%patch152 -p1
 %patch153 -p1
-%patch154 -p1
-%patch155 -p1
-%patch156 -p1
 %patch157 -p1
 %patch158 -p1
 %patch159 -p1
@@ -388,15 +290,11 @@
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
-%patch167 -p1
 %patch168 -p1
 %patch169 -p1
 %patch170 -p1
-%patch171 -p1
-%patch172 -p1
 %patch173 -p1
 %patch174 -p1
-%patch175 -p1
 %patch176 -p1
 %patch177 -p1
 %patch178 -p1
@@ -569,6 +467,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Jul 11 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-1
+- Upgrade to GDB 6.5.  Drop redundant patches, forward-port remaining
+ones.
+
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
 - Require flex and bison at build time.
 - Additional patch for BZ 175083, to cope with waitpid setting status


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	27 May 2006 07:34:28 -0000	1.19
+++ sources	11 Jul 2006 06:33:02 -0000	1.20
@@ -1 +1 @@
-05b928f41fa5b482e49ca2c24762a0ae  gdb-6.3.tar.bz2
+af6c8335230d7604aee0803b1df14f54  gdb-6.5.tar.bz2


--- gdb-6.3-addsymfilemem-20050209.patch DELETED ---


--- gdb-6.3-attach-dso-20050929.patch DELETED ---


--- gdb-6.3-backtrace-20041216.patch DELETED ---


--- gdb-6.3-dwoppieceread-20050407.patch DELETED ---


--- gdb-6.3-follow-vfork-20050303.patch DELETED ---


--- gdb-6.3-ia64-backtrace-20041213.patch DELETED ---


--- gdb-6.3-ia64-sigtramp-20050427.patch DELETED ---


--- gdb-6.3-ia64fix-20050121.patch DELETED ---


--- gdb-6.3-movedir-20050125.patch DELETED ---


--- gdb-6.3-partial-die-20050503.patch DELETED ---


--- gdb-6.3-ppc64abi-20040621.patch DELETED ---


--- gdb-6.3-ppc64fpscrhack-20041026.patch DELETED ---


--- gdb-6.3-ppcdotsym-20050126.patch DELETED ---


--- gdb-6.3-ppcmalloc-20041124.patch DELETED ---


--- gdb-6.3-ppcreggroups-20041124.patch DELETED ---


--- gdb-6.3-ppcsignals-20040621.patch DELETED ---


--- gdb-6.3-prelink-core-20060223.patch DELETED ---


--- gdb-6.3-pstack-20041215.patch DELETED ---


--- gdb-6.3-sarestart-20050518.patch DELETED ---


--- gdb-6.3-sigrepeats-20050121.patch DELETED ---


--- gdb-6.3-sigsymtramp-20040621.patch DELETED ---


--- gdb-6.3-support-fopen64-20060413.patch DELETED ---


--- gdb-6.3-test-sigrepeats-20050121.patch DELETED ---


--- gdb-6.3-type-punning-20060214.patch DELETED ---


--- gdb-6.3-unload-test-20050216.patch DELETED ---


--- gdb-6.3-vsyscall-20041216.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:46:49 -0400
Subject: rpms/binutils/devel binutils.spec,1.89,1.90 s390-opc.tab,1.1,NONE
Message-ID: <200607110646.k6B6kndq006347@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Removed Files:
	s390-opc.tab 
Log Message:
2.17.50.0.2-5


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- binutils.spec	11 Jul 2006 06:17:09 -0000	1.89
+++ binutils.spec	11 Jul 2006 06:46:46 -0000	1.90
@@ -6,7 +6,6 @@
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
 Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2
-Source2: s390-opc.tab
 Patch0: binutils-2.17.50.0.2-20060601.patch
 Patch1: binutils-2.17.50.0.2-ltconfig-multilib.patch
 Patch2: binutils-2.17.50.0.2-ppc64-pie.patch
@@ -66,12 +65,11 @@
 %patch12 -p0 -b .tls_common~
 %patch13 -p0 -b .bz2513~
 %patch14 -p0 -b .hash-style~
-touch opcodes/s390-mkopc
-cp %{SOURCE2} opcodes/s390-opc.tab; touch opcodes/s390-opc.tab
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
+sed -i -e 's/%{version}/%{version}gnu_hash/g' bfd/configure{.in,}
 touch */configure
 
 %build


--- s390-opc.tab DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 06:58:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 02:58:29 -0400
Subject: rpms/kernel/devel linux-2.6-debug-sizeof-structs.patch, NONE,
	1.1 kernel-2.6.spec, 1.2364, 1.2365
Message-ID: <200607110658.k6B6wTDL014795@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-sizeof-structs.patch 
Log Message:
dopey patch to monitor size of various structs as some experiments are tried.



linux-2.6-debug-sizeof-structs.patch:
 main.c |   11 +++++++++++
 1 files changed, 11 insertions(+)

--- NEW FILE linux-2.6-debug-sizeof-structs.patch ---
--- linux-2.6/init/main.c~	2006-07-11 02:35:10.000000000 -0400
+++ linux-2.6/init/main.c	2006-07-11 02:49:01.000000000 -0400
@@ -350,6 +350,9 @@ static void __init setup_per_cpu_areas(v
 }
 #endif /* !__GENERIC_PER_CPU */
 
+#include <linux/ext3_fs_i.h>
+#include <linux/skbuff.h>
+
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)
 {
@@ -371,6 +374,14 @@ static void __init smp_init(void)
 
 	smp_commence();
 #endif
+
+	printk(KERN_DEBUG "sizeof(vma)=%ld bytes\n", sizeof(struct vm_area_struct));
+	printk(KERN_DEBUG "sizeof(page)=%ld bytes\n", sizeof(struct page));
+	printk(KERN_DEBUG "sizeof(inode)=%ld bytes\n", sizeof(struct inode));
+	printk(KERN_DEBUG "sizeof(dentry)=%ld bytes\n", sizeof(struct dentry));
+	printk(KERN_DEBUG "sizeof(ext3inode)=%ld bytes\n", sizeof(struct ext3_inode_info));
+	printk(KERN_DEBUG "sizeof(buffer_head)=%ld bytes\n", sizeof(struct buffer_head));
+	printk(KERN_DEBUG "sizeof(skbuff)=%ld bytes\n", sizeof(struct sk_buff));
 }
 
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2364
retrieving revision 1.2365
diff -u -r1.2364 -r1.2365
--- kernel-2.6.spec	10 Jul 2006 15:20:10 -0000	1.2364
+++ kernel-2.6.spec	11 Jul 2006 06:58:26 -0000	1.2365
@@ -308,22 +308,24 @@
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
 
+Patch1010: linux-2.6-debug-sizeof-structs.patch
 Patch1011: linux-2.6-debug-slab-backtrace.patch
 Patch1012: linux-2.6-debug-list_head.patch
 Patch1013: linux-2.6-debug-taint-vm.patch
-Patch1015: linux-2.6-debug-singlebiterror.patch
-Patch1016: linux-2.6-debug-spinlock-taint.patch
-Patch1018: linux-2.6-debug-Wundef.patch
-Patch1019: linux-2.6-debug-disable-builtins.patch
-Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch
-Patch1026: linux-2.6-debug-no-quiet.patch
+Patch1014: linux-2.6-debug-singlebiterror.patch
+Patch1015: linux-2.6-debug-spinlock-taint.patch
+Patch1016: linux-2.6-debug-Wundef.patch
+Patch1017: linux-2.6-debug-disable-builtins.patch
+Patch1018: linux-2.6-debug-sleep-in-irq-warning.patch
+Patch1019: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch1020: linux-2.6-debug-no-quiet.patch
+Patch1021: linux-2.6-debug-boot-delay.patch
+Patch1022: linux-2.6-debug-must_check.patch
+
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
 Patch1029: linux-2.6-debug-account-kmalloc.patch
 Patch1030: linux-2.6-debug-periodic-slab-check.patch
-Patch1031: linux-2.6-debug-boot-delay.patch
-Patch1032: linux-2.6-debug-must_check.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -823,27 +825,28 @@
 #
 
 
-
 # Various low-impact patches to aid debugging.
+%patch1010 -p1
 %patch1011 -p1
 %patch1012 -p1
 %patch1013 -p1
+%patch1014 -p1
 %patch1015 -p1
 %patch1016 -p1
+%patch1017 -p1
 %patch1018 -p1
 %patch1019 -p1
-%patch1020 -p1
-%patch1025 -p1
 # Disable the 'quiet' boot switch for better bug reports.
-%patch1026 -p1
+%patch1020 -p1
+%patch1021 -p1
+%patch1022 -p1
+
 # Slab leak detector.
 #%patch1027 -p1
 # Pause on oops.
 #%patch1028 -p1
 #%patch1029 -p1
 #%patch1030 -p1
-%patch1031 -p1
-%patch1032 -p1
 
 #
 # Make /dev/mem a need-to-know function



From fedora-cvs-commits at redhat.com  Tue Jul 11 07:05:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 03:05:17 -0400
Subject: rpms/gdb/devel gdb.spec,1.187,1.188
Message-ID: <200607110705.k6B75HRH015828@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15788

Modified Files:
	gdb.spec 
Log Message:
Do not remove unsupported Ada and ObjC tests in a way that breaks the
build.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- gdb.spec	11 Jul 2006 06:33:02 -0000	1.187
+++ gdb.spec	11 Jul 2006 07:05:14 -0000	1.188
@@ -311,14 +311,6 @@
 rm -f gdb/doc/*.info
 rm -f gdb/doc/*.info-*
 
-# ... and remove the objective-c testcases -- no objective-c
-rm -fr gdb/testsuite/gdb.objc                                                                                
-# ... and remove the ada testcases -- no ada support at all.
-rm -fr gdb/testsuite/gdb.ada                                                                                
-# FIXME: remove gdb/gdbserver/config.h from the snapshot. Suspect a bug
-# in the FSF snapshot process.
-rm -f gdb/gdbserver/config.h
-
 %build
 
 # Initially we're in the %{gdb_src} directory.



From fedora-cvs-commits at redhat.com  Tue Jul 11 07:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 03:18:57 -0400
Subject: rpms/wireshark/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wireshark.spec, 1.1, 1.2 wireshark-dialog-close.patch, 1.1, NONE
Message-ID: <200607110718.k6B7IvYg002244@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2211

Modified Files:
	.cvsignore sources wireshark.spec 
Removed Files:
	wireshark-dialog-close.patch 
Log Message:
- upgrade to 0.99.2pre1, fixes (#198242)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jun 2006 13:27:16 -0000	1.2
+++ .cvsignore	11 Jul 2006 07:18:55 -0000	1.3
@@ -1 +1 @@
-wireshark-0.99.1pre1.tar.gz
+wireshark-0.99.2pre1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jun 2006 13:27:16 -0000	1.2
+++ sources	11 Jul 2006 07:18:55 -0000	1.3
@@ -1 +1 @@
-3f3bfed8727cb24d41fd4f10f7b91d9f  wireshark-0.99.1pre1.tar.gz
+ee8607dc6d8307fbac5082c3d823a88f  wireshark-0.99.2pre1.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark.spec	15 Jun 2006 13:27:16 -0000	1.1
+++ wireshark.spec	11 Jul 2006 07:18:55 -0000	1.2
@@ -3,7 +3,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	0.99.1
+Version:	0.99.2
 Release: 	0.pre1
 License: 	GPL
 Group: 		Applications/Internet
@@ -13,7 +13,6 @@
 Source3:	wireshark.desktop
 Patch1:		wireshark-0.99.1-pie.patch
 Patch3:		wireshark-nfsv4-opts.patch
-Patch4:		wireshark-dialog-close.patch
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpcap-devel
@@ -57,7 +56,6 @@
 %setup -q -n %{name}-%{version}pre1
 %patch1 -p1 -b .pie
 %patch3 -p1 
-%patch4 -p1 -b .close
 
 %build
 %ifarch s390 s390x
@@ -175,6 +173,9 @@
 
 
 %changelog
+* Tue Jul 11 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-0.pre1
+- upgrade to 0.99.2pre1, fixes (#198242)
+
 * Tue Jun 13 2006 Radek Vokal <rvokal at redhat.com> 0.99.1-0.pre1
 - spec file changes
 


--- wireshark-dialog-close.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 08:05:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 04:05:51 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-ldap-lookup-update.patch, NONE,
	1.1 autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch, NONE,
	1.1 autofs.spec, 1.121, 1.122
Message-ID: <200607110805.k6B85pW8031557@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-ldap-lookup-update.patch 
	autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch 
Log Message:
* Tue Jul 11 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-7
- correct directory cleanup in mount modules.
- merge key and wildcard LDAP query for lookups (bz 197746).


autofs-5.0.0_beta6-ldap-lookup-update.patch:
 CHANGELOG             |    1 
 modules/lookup_ldap.c |  174 ++++++++++++++++++++++++++------------------------
 2 files changed, 93 insertions(+), 82 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-ldap-lookup-update.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index b581411..c2f04f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - update LDAP auth - add autodectect option.
 - correct test for libhesiod.
 - correct directory cleanup in mount modules.
+- merge key and wildcard LDAP query for lookups.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index ca1258d..82df7f8 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1281,6 +1281,7 @@ static int lookup_one(struct autofs_poin
 {
 	struct map_source *source = ap->entry->current;
 	struct mapent_cache *mc = source->mc;
+	struct mapent me;
 	int rv, i, l, ql, count;
 	char buf[MAX_ERR_BUF];
 	time_t age = time(NULL);
@@ -1293,7 +1294,8 @@ static int lookup_one(struct autofs_poin
 	int scope = LDAP_SCOPE_SUBTREE;
 	LDAP *ldap;
 	char *mapent = NULL;
-	int ret = CHE_OK;
+	unsigned int wild = 0;
+	int ret = CHE_MISSING;
 
 	if (ctxt == NULL) {
 		crit(ap->logopt, MODPREFIX "context was NULL");
@@ -1312,7 +1314,7 @@ static int lookup_one(struct autofs_poin
 		*qKey = '/';
 
 	/* Build a query string. */
-	l = strlen(class) + strlen(entry) + strlen(qKey) + 21;
+	l = strlen(class) + 2*strlen(entry) + strlen(qKey) + 29;
 
 	query = alloca(l);
 	if (query == NULL) {
@@ -1325,7 +1327,8 @@ static int lookup_one(struct autofs_poin
 	 * Look for an entry in class under ctxt-base
 	 * whose entry is equal to qKey.
 	 */
-	ql = sprintf(query, "(&(objectclass=%s)(%s=%s))", class, entry, qKey);
+	ql = sprintf(query,
+	      "(&(objectclass=%s)(|(%s=%s)(%s=/)))", class, entry, qKey, entry);
 	if (ql >= l) {
 		error(ap->logopt,
 		      MODPREFIX "error forming query string");
@@ -1361,89 +1364,102 @@ static int lookup_one(struct autofs_poin
 		return CHE_MISSING;
 	}
 
-	keyValue = ldap_get_values(ldap, e, entry);
+	while (e) {
+		keyValue = ldap_get_values(ldap, e, entry);
 
-	/* By definition keys must be unique within each map entry */
-	if (ldap_count_values(keyValue) > 1) {
-		error(ap->logopt,
-		      MODPREFIX "key %s has duplicate entries", *keyValue);
-		ldap_value_free(keyValue);
-		ldap_msgfree(result);
-		unbind_ldap_connection(ldap, ctxt);
-		return CHE_FAIL;
-	}
+		if (!keyValue || !*keyValue) {
+			e = ldap_next_entry(ldap, e);
+			continue;
+		}
 
-	debug(ap->logopt, MODPREFIX "examining first entry");
+		/* By definition keys must be unique within each map entry */
+		if (ldap_count_values(keyValue) > 1) {
+			error(ap->logopt,
+			      MODPREFIX "key %s has duplicate entries",
+			      *keyValue);
+			ret = CHE_FAIL;
+			goto next;
+		}
 
-	values = ldap_get_values(ldap, e, info);
-	if (!values || !*values) {
-		debug(ap->logopt,
-		      MODPREFIX "no %s defined for %s", info, query);
-		ldap_value_free(keyValue);
-		ldap_msgfree(result);
-		unbind_ldap_connection(ldap, ctxt);
-		return CHE_MISSING;
-	}
+		debug(ap->logopt, MODPREFIX "examining first entry");
 
-	count = ldap_count_values(values);
-	for (i = 0; i < count; i++) {
-		int v_len = strlen(values[i]);
+		values = ldap_get_values(ldap, e, info);
+		if (!values || !*values) {
+			debug(ap->logopt,
+			      MODPREFIX "no %s defined for %s", info, query);
+			goto next;
+		}
+
+		count = ldap_count_values(values);
+		for (i = 0; i < count; i++) {
+			int v_len = strlen(values[i]);
 
-		if (!mapent) {
-			mapent = malloc(v_len + 1);
 			if (!mapent) {
-				char *estr;
-				estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt,
-				      MODPREFIX "malloc: %s", estr);
-				continue;
-			}
-			strcpy(mapent, values[i]);
-		} else {
-			int new_size = strlen(mapent) + v_len + 2;
-			char *new_me;
-			new_me = realloc(mapent, new_size);
-			if (new_me) {
-				mapent = new_me;
-				strcat(mapent, " ");
-				strcat(mapent, values[i]);
+				mapent = malloc(v_len + 1);
+				if (!mapent) {
+					char *estr;
+					estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt,
+					      MODPREFIX "malloc: %s", estr);
+					continue;
+				}
+				strcpy(mapent, values[i]);
 			} else {
-				char *estr;
-				estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt,
-				      MODPREFIX "realloc: %s", estr);
+				int new_size = strlen(mapent) + v_len + 2;
+				char *new_me;
+				new_me = realloc(mapent, new_size);
+				if (new_me) {
+					mapent = new_me;
+					strcat(mapent, " ");
+					strcat(mapent, values[i]);
+				} else {
+					char *estr;
+					estr = strerror_r(errno, buf, MAX_ERR_BUF);
+					error(ap->logopt,
+					      MODPREFIX "realloc: %s", estr);
+				}
 			}
 		}
-	}
-	ldap_value_free(values);
-
-	if (**keyValue == '/' && strlen(*keyValue) == 1)
-		**keyValue = '*';
+		ldap_value_free(values);
 
-	if (ap->type == LKP_INDIRECT && **keyValue == '/') {
-		ret = CHE_MISSING;
-		goto done;
-	}
+		if (**keyValue == '/') {
+			if (ap->type == LKP_INDIRECT) {
+				if (strlen(*keyValue) == 1) {
+					wild = 1;
+					**keyValue = '*';
+					cache_writelock(mc);
+					cache_update(mc,
+						source, *keyValue, mapent, age);
+					cache_unlock(mc);
+				}
+				goto next;
+			}
+		} else {
+			if (ap->type == LKP_DIRECT)
+				goto next;
+		}
 
-	if (ap->type == LKP_DIRECT && **keyValue != '/') {
-		ret = CHE_MISSING;
-		goto done;
-	}
+		cache_writelock(mc);
+		ret = cache_update(mc, source, *keyValue, mapent, age);
+		cache_unlock(mc);
+next:
+		if (mapent) {
+			free(mapent);
+			mapent = NULL;
+		}
 
-	cache_writelock(mc);
-	ret = cache_update(mc, source, *keyValue, mapent, age);
-	cache_unlock(mc);
-done:
-	if (mapent) {
-		free(mapent);
-		mapent = NULL;
+		ldap_value_free(keyValue);
+		e = ldap_next_entry(ldap, e);
 	}
 
-	/* Clean up. */
-	ldap_value_free(keyValue);
 	ldap_msgfree(result);
 	unbind_ldap_connection(ldap, ctxt);
 
+	cache_writelock(mc);
+	if (!wild && cache_lookup(mc, "*"))
+		cache_delete(mc, "*");
+	cache_unlock(mc);
+
 	return ret;
 }
 
@@ -1480,19 +1496,9 @@ static int check_map_indirect(struct aut
 	}
 
 	if (ret == CHE_MISSING) {
-		char *wkey = "/";
-		int wild = CHE_MISSING;
-
-		wild = lookup_one(ap, wkey, 1, ctxt);
-		if (wild == CHE_UPDATED || CHE_OK)
-			return NSS_STATUS_SUCCESS;
-
-		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_writelock(mc);
-		if (wild == CHE_MISSING)
-			cache_delete(mc, "*");
-
-		if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL))
+		pthread_cleanup_push(cache_lock_cleanup, mc);
+		if (cache_delete(mc, key))
 			rmdir_path(ap, key);
 		pthread_cleanup_pop(1);
 	}
@@ -1514,8 +1520,12 @@ static int check_map_indirect(struct aut
 			fatal(status);
 	}
 
-	if (ret == CHE_MISSING)
+	cache_readlock(mc);
+	if (ret == CHE_MISSING && !cache_lookup(mc, "*")) {
+		cache_unlock(mc);
 		return NSS_STATUS_NOTFOUND;
+	}
+	cache_unlock(mc);
 
 	return NSS_STATUS_SUCCESS;
 }

autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch:
 CHANGELOG               |    1 +
 modules/mount_bind.c    |   15 ++++++++++-----
 modules/mount_changer.c |    8 +++++---
 modules/mount_ext2.c    |    7 +++++--
 modules/mount_generic.c |    8 +++++---
 modules/mount_nfs.c     |   10 ++++++----
 6 files changed, 32 insertions(+), 17 deletions(-)

--- NEW FILE autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 62e3e5b..b581411 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - correct auto.net installed as auto.smb.
 - update LDAP auth - add autodectect option.
 - correct test for libhesiod.
+- correct directory cleanup in mount modules.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/modules/mount_bind.c b/modules/mount_bind.c
index 07c3c3b..3d292a6 100644
--- a/modules/mount_bind.c
+++ b/modules/mount_bind.c
@@ -155,8 +155,11 @@ int mount_mount(struct autofs_point *ap,
 			     what, fullpath, NULL);
 
 		if (err) {
-			if ((!ap->ghost && name_len) || !existed)
-				rmdir_path(ap, name);
+			if ((!ap->ghost && name_len) || !existed) {
+				if (!chdir(ap->path))
+					rmdir_path(ap, name);
+				err = chdir("/");
+			}
 			return 1;
 		} else {
 			debug(ap->logopt,
@@ -199,9 +202,11 @@ int mount_mount(struct autofs_point *ap,
 			      fullpath, what);
 			if (ap->ghost && !status)
 				mkdir_path(fullpath, 0555);
-			else
-				rmdir_path(ap, fullpath);
-
+			else {
+				if (!chdir(ap->path))
+					rmdir_path(ap, name);
+				err = chdir("/");
+			}
 			return 1;
 		} else {
 			debug(ap->logopt,
diff --git a/modules/mount_changer.c b/modules/mount_changer.c
index 40a3d5f..06e2032 100644
--- a/modules/mount_changer.c
+++ b/modules/mount_changer.c
@@ -130,9 +130,11 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed)
-			rmdir_path(ap, name);
-
+		if ((!ap->ghost && name_len) || !existed) {
+			if (!chdir(ap->path))
+				rmdir_path(ap, name);
+			chdir("/");
+		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c
index 16effdd..976d23a 100644
--- a/modules/mount_ext2.c
+++ b/modules/mount_ext2.c
@@ -146,8 +146,11 @@ #endif
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed)
-			rmdir_path(ap, name);
+		if ((!ap->ghost && name_len) || !existed) {
+			if (!chdir(ap->path))
+				rmdir_path(ap, name);
+			err = chdir("/");
+		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
diff --git a/modules/mount_generic.c b/modules/mount_generic.c
index 290ccc0..e744813 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -106,9 +106,11 @@ int mount_mount(struct autofs_point *ap,
 	}
 
 	if (err) {
-		if ((!ap->ghost && name_len) || !existed)
-			rmdir_path(ap, name);
-
+		if ((!ap->ghost && name_len) || !existed) {
+			if (!chdir(ap->path))
+				rmdir_path(ap, name);
+			err = chdir("/");
+		}
 		error(ap->logopt,
 		      MODPREFIX "failed to mount %s (type %s) on %s",
 		      what, fstype, fullpath);
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index a67d01c..b4df2f2 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -63,7 +63,7 @@ int mount_mount(struct autofs_point *ap,
 	struct host *this, *hosts = NULL;
 	unsigned int vers;
 	char *nfsoptions = NULL;
-	int len, rlen, status, existed = 1;
+	int len, rlen, status, err, existed = 1;
 	int nosymlink = 0;
 	int ro = 0;            /* Set if mount bind should be read-only */
 
@@ -182,7 +182,6 @@ int mount_mount(struct autofs_point *ap,
 
 	this = hosts;
 	while (this) {
-		int err;
 		char *loc;
 
 		if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
@@ -255,8 +254,11 @@ int mount_mount(struct autofs_point *ap,
 	free_host_list(&hosts);
 
 	/* If we get here we've failed to complete the mount */
-	if ((!ap->ghost && name_len) || !existed)
-		rmdir_path(ap, name);
+	if ((!ap->ghost && name_len) || !existed) {
+		if (!chdir(ap->path))
+			rmdir_path(ap, name);
+		err = chdir("/");
+	}
 
 	error(ap->logopt,
 	      MODPREFIX "nfs: mount failure %s on %s", what, fullpath);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- autofs.spec	7 Jul 2006 19:35:14 -0000	1.121
+++ autofs.spec	11 Jul 2006 08:05:48 -0000	1.122
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -21,6 +21,8 @@
 Patch8: autofs-5.0.0_beta6-correct-auto.smb.patch
 Patch9: autofs-5.0.0_beta6-auth-add-autodetect.patch
 Patch10: autofs-5.0.0_beta6-hesiod-lib.patch
+Patch11: autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch
+Patch12: autofs-5.0.0_beta6-ldap-lookup-update.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -69,6 +71,8 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -125,6 +129,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Jul 11 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-7
+- correct directory cleanup in mount modules.
+- merge key and wildcard LDAP query for lookups (bz 197746).
+
 * Sat Jul 8 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-6
 - correct test for libhesiod.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 08:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 04:07:00 -0400
Subject: rpms/gdb/devel .cvsignore, 1.20,
	1.21 gdb-6.3-threaded-watchpoints-20041213.patch, 1.4,
	1.5 gdb.spec, 1.188, 1.189
Message-ID: <200607110807.k6B870MZ031802@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31763

Modified Files:
	.cvsignore gdb-6.3-threaded-watchpoints-20041213.patch 
	gdb.spec 
Log Message:
Fix ia64 build, remove gdb-6.3.tar.bz2 from .cvsignore.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 Jul 2006 06:33:02 -0000	1.20
+++ .cvsignore	11 Jul 2006 08:06:55 -0000	1.21
@@ -1,2 +1 @@
-gdb-6.3.tar.bz2
 gdb-6.5.tar.bz2

gdb-6.3-threaded-watchpoints-20041213.patch:
 Makefile.in       |    4 
 amd64-linux-nat.c |   14 +-
 breakpoint.c      |  269 +++++++++++++++++++++++++++++++++++++++---------------
 breakpoint.h      |   13 ++
 doc/observer.texi |   10 ++
 i386-linux-nat.c  |   14 +-
 ia64-linux-nat.c  |  125 +++++++++++++++++++++++--
 infrun.c          |   66 +++++++++++--
 linux-nat.c       |   19 +++
 linux-nat.h       |   12 ++
 linux-thread-db.c |   14 ++
 s390-nat.c        |   63 ++++++++++--
 12 files changed, 504 insertions(+), 119 deletions(-)

Index: gdb-6.3-threaded-watchpoints-20041213.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints-20041213.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdb-6.3-threaded-watchpoints-20041213.patch	11 Jul 2006 06:33:02 -0000	1.4
+++ gdb-6.3-threaded-watchpoints-20041213.patch	11 Jul 2006 08:06:55 -0000	1.5
@@ -30,8 +30,8 @@
 
 Index: gdb-6.5/gdb/doc/observer.texi
 ===================================================================
---- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/doc/observer.texi	2006-07-11 02:29:49.000000000 -0300
+--- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/doc/observer.texi	2006-07-11 05:04:06.000000000 -0300
 @@ -122,3 +122,13 @@ haven't been loaded yet.
  @deftypefun void solib_unloaded (struct so_list *@var{solib})
  The shared library specified by @var{solib} has been unloaded.
@@ -48,8 +48,8 @@
 + at end deftypefun
 Index: gdb-6.5/gdb/infrun.c
 ===================================================================
---- gdb-6.5.orig/gdb/infrun.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/infrun.c	2006-07-11 02:29:55.000000000 -0300
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-11 05:04:07.000000000 -0300
 @@ -1703,9 +1703,19 @@ handle_inferior_event (struct execution_
       single step over a watchpoint without disabling the watchpoint.  */
    if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
@@ -155,8 +155,8 @@
  	    stop_signal = TARGET_SIGNAL_0;
 Index: gdb-6.5/gdb/breakpoint.c
 ===================================================================
---- gdb-6.5.orig/gdb/breakpoint.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/breakpoint.c	2006-07-11 02:29:50.000000000 -0300
+--- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.c	2006-07-11 05:04:08.000000000 -0300
 @@ -748,6 +748,90 @@ insert_catchpoint (struct ui_out *uo, vo
      }
  }
@@ -503,8 +503,8 @@
       so that a list of breakpoints will come out in order
 Index: gdb-6.5/gdb/breakpoint.h
 ===================================================================
---- gdb-6.5.orig/gdb/breakpoint.h	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/breakpoint.h	2006-07-11 02:29:49.000000000 -0300
+--- gdb-6.5.orig/gdb/breakpoint.h	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.h	2006-07-11 05:04:07.000000000 -0300
 @@ -426,6 +426,11 @@ struct breakpoint
  
      /* Is breakpoint pending on shlib loads?  */
@@ -534,8 +534,8 @@
  /* This function can be used to physically insert eventpoints from the
 Index: gdb-6.5/gdb/linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 04:24:57.000000000 -0300
-+++ gdb-6.5/gdb/linux-nat.c	2006-07-11 02:29:49.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-11 02:57:28.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-11 05:04:06.000000000 -0300
 @@ -36,6 +36,7 @@
  #include "gdbthread.h"
  #include "gdbcmd.h"
@@ -585,8 +585,8 @@
  	    {
 Index: gdb-6.5/gdb/linux-nat.h
 ===================================================================
---- gdb-6.5.orig/gdb/linux-nat.h	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/linux-nat.h	2006-07-07 04:24:57.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-nat.h	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.h	2006-07-11 02:57:28.000000000 -0300
 @@ -63,6 +63,18 @@ struct lwp_info
  
    /* Next LWP in list.  */
@@ -608,8 +608,8 @@
  /* Attempt to initialize libthread_db.  */
 Index: gdb-6.5/gdb/Makefile.in
 ===================================================================
---- gdb-6.5.orig/gdb/Makefile.in	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/Makefile.in	2006-07-11 02:29:50.000000000 -0300
+--- gdb-6.5.orig/gdb/Makefile.in	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/Makefile.in	2006-07-11 05:04:08.000000000 -0300
 @@ -2113,7 +2113,7 @@ i387-tdep.o: i387-tdep.c $(defs_h) $(dou
  	$(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h)
  ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \
@@ -630,8 +630,8 @@
  	$(floatformat_h) $(regcache_h) $(trad_frame_h) $(frame_base_h) \
 Index: gdb-6.5/gdb/linux-thread-db.c
 ===================================================================
---- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/linux-thread-db.c	2006-07-11 02:29:49.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-07-11 05:04:08.000000000 -0300
 @@ -36,6 +36,7 @@
  #include "target.h"
  #include "regcache.h"
@@ -680,8 +680,8 @@
  
 Index: gdb-6.5/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 02:29:47.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 05:04:03.000000000 -0300
 @@ -619,10 +619,9 @@ i386_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
@@ -712,18 +712,17 @@
    ptrace (PTRACE_POKEUSER, tid,
 Index: gdb-6.5/gdb/ia64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-11 02:29:46.000000000 -0300
-@@ -41,6 +41,8 @@
- 
- #include <asm/ptrace_offsets.h>
- #include <sys/procfs.h>
+--- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-11 05:05:36.000000000 -0300
+@@ -29,6 +29,7 @@
+ #include "regcache.h"
+ #include "ia64-tdep.h"
+ #include "linux-nat.h"
 +#include "observer.h"
-+#include "linux-nat.h"
  
- /* Prototypes for supply_gregset etc. */
- #include "gregset.h"
-@@ -561,8 +563,9 @@ is_power_of_2 (int val)
+ #include <signal.h>
+ #include <sys/ptrace.h>
+@@ -561,8 +562,9 @@ is_power_of_2 (int val)
    return onecount <= 1;
  }
  
@@ -735,7 +734,7 @@
  {
    int idx;
    long dbr_addr, dbr_mask;
-@@ -608,8 +611,38 @@ ia64_linux_insert_watchpoint (ptid_t pti
+@@ -608,8 +610,38 @@ ia64_linux_insert_watchpoint (ptid_t pti
    return 0;
  }
  
@@ -775,7 +774,7 @@
  {
    int idx;
    long dbr_addr, dbr_mask;
-@@ -632,23 +665,74 @@ ia64_linux_remove_watchpoint (ptid_t pti
+@@ -632,23 +664,74 @@ ia64_linux_remove_watchpoint (ptid_t pti
    return -1;
  }
  
@@ -853,7 +852,7 @@
      return 0;
  
    psr = read_register_pid (IA64_PSR_REGNUM, ptid);
-@@ -656,7 +740,7 @@ ia64_linux_stopped_data_address (CORE_AD
+@@ -656,7 +739,7 @@ ia64_linux_stopped_data_address (CORE_AD
                             for the next instruction */
    write_register_pid (IA64_PSR_REGNUM, psr, ptid);
  
@@ -862,11 +861,10 @@
    return 1;
  }
  
-@@ -702,3 +786,36 @@ _initialize_ia64_linux_nat (void)
-   /* Register the target.  */
-   linux_nat_add_target (t);
+@@ -685,6 +768,31 @@ ia64_linux_xfer_partial (struct target_o
+ 			     offset, len);
  }
-+
+ 
 +/* Observer function for a new thread attach.  We need to insert
 +   existing watchpoints on the new thread.  */
 +static void
@@ -892,17 +890,21 @@
 +          lp->saved_trap_data);
 +}
 +
-+void
-+_initialize_ia64_linux_nat (void)
-+{
+ void _initialize_ia64_linux_nat (void);
+ 
+ void
+@@ -701,4 +809,7 @@ _initialize_ia64_linux_nat (void)
+ 
+   /* Register the target.  */
+   linux_nat_add_target (t);
++
 +  observer_attach_linux_new_thread (ia64_linux_new_thread);
 +  observer_attach_sigtrap (ia64_linux_save_sigtrap_info);
-+}
-+    
+ }
 Index: gdb-6.5/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 02:29:47.000000000 -0300
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 05:04:03.000000000 -0300
 @@ -234,10 +234,9 @@ amd64_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
@@ -933,8 +935,8 @@
    ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value);
 Index: gdb-6.5/gdb/s390-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/s390-nat.c	2006-07-07 04:24:43.000000000 -0300
-+++ gdb-6.5/gdb/s390-nat.c	2006-07-07 04:24:57.000000000 -0300
+--- gdb-6.5.orig/gdb/s390-nat.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/s390-nat.c	2006-07-11 02:57:28.000000000 -0300
 @@ -30,6 +30,8 @@
  #include "linux-nat.h"
  


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- gdb.spec	11 Jul 2006 07:05:14 -0000	1.188
+++ gdb.spec	11 Jul 2006 08:06:56 -0000	1.189
@@ -123,7 +123,7 @@
 Patch136: gdb-6.3-test-movedir-20050125.patch
 
 # Fix to support unwinding syscalls in ia64 corefiles
-Patch138: gdb-6.3-ia64-corefile-fix-20050127.patch
+# Patch138: gdb-6.3-ia64-corefile-fix-20050127.patch
 
 # Tolerate DW_AT_type referencing <0>.
 Patch139: gdb-6.3-dwattype0-20050201.patch
@@ -268,7 +268,6 @@
 %patch133 -p1
 %patch134 -p1
 %patch136 -p1
-%patch138 -p1
 %patch139 -p1
 %patch140 -p1
 %patch141 -p1



From fedora-cvs-commits at redhat.com  Tue Jul 11 08:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 04:13:52 -0400
Subject: rpms/binutils/devel binutils.spec,1.90,1.91
Message-ID: <200607110813.k6B8DqCY003375@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-6


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- binutils.spec	11 Jul 2006 06:46:46 -0000	1.90
+++ binutils.spec	11 Jul 2006 08:13:49 -0000	1.91
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 5
+Release: 6
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -176,7 +176,7 @@
 %{_infodir}/*info*
 
 %changelog
-* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-5
+* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-6
 - add DT_GNU_HASH support (--hash-style=gnu and --hash-style=both
   ld options)
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 08:26:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 04:26:01 -0400
Subject: rpms/gdb/devel gdb-6.3-catch-debug-registers-error-20060527.patch,
	1.1, 1.2 gdb-6.3-threaded-watchpoints2-20050225.patch, 1.2, 1.3
Message-ID: <200607110826.k6B8Q1Mf022151@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22108

Modified Files:
	gdb-6.3-catch-debug-registers-error-20060527.patch 
	gdb-6.3-threaded-watchpoints2-20050225.patch 
Log Message:
Fix i386 build.

gdb-6.3-catch-debug-registers-error-20060527.patch:
 i386-linux-nat.c |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

Index: gdb-6.3-catch-debug-registers-error-20060527.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-catch-debug-registers-error-20060527.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-catch-debug-registers-error-20060527.patch	27 May 2006 07:34:28 -0000	1.1
+++ gdb-6.3-catch-debug-registers-error-20060527.patch	11 Jul 2006 08:25:57 -0000	1.2
@@ -6,11 +6,19 @@
 	(i386_linux_set_debug_regs_for_thread): ... this, and
 	add new function to catch exceptions in the old one.
 
-Index: gdb-6.3/gdb/i386-linux-nat.c
+Index: gdb-6.5/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.3.orig/gdb/i386-linux-nat.c	2006-04-14 03:22:47.000000000 -0300
-+++ gdb-6.3/gdb/i386-linux-nat.c	2006-05-27 03:48:47.000000000 -0300
-@@ -694,14 +694,33 @@ struct i386_debug_register_state
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 05:21:58.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 05:24:29.000000000 -0300
+@@ -27,6 +27,7 @@
+ #include "observer.h"
+ #include "target.h"
+ #include "linux-nat.h"
++#include "exceptions.h"
+ 
+ #include "gdb_assert.h"
+ #include "gdb_string.h"
+@@ -695,14 +696,33 @@ struct i386_debug_register_state
    unsigned long control;
  };
  

gdb-6.3-threaded-watchpoints2-20050225.patch:
 amd64-linux-nat.c                       |  155 +++++++++++++++++++++++++++++---
 config/i386/nm-linux.h                  |   54 +++++++++--
 config/i386/nm-linux64.h                |   53 +++++++++-
 i386-linux-nat.c                        |  155 +++++++++++++++++++++++++++++---
 i386-nat.c                              |    1 
 testsuite/gdb.threads/watchthreads2.c   |   66 +++++++++++++
 testsuite/gdb.threads/watchthreads2.exp |  133 +++++++++++++++++++++++++++
 7 files changed, 573 insertions(+), 44 deletions(-)

Index: gdb-6.3-threaded-watchpoints2-20050225.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints2-20050225.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-threaded-watchpoints2-20050225.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-threaded-watchpoints2-20050225.patch	11 Jul 2006 08:25:57 -0000	1.3
@@ -37,8 +37,8 @@
 
 Index: gdb-6.5/gdb/config/i386/nm-linux64.h
 ===================================================================
---- gdb-6.5.orig/gdb/config/i386/nm-linux64.h	2006-07-11 02:44:36.000000000 -0300
-+++ gdb-6.5/gdb/config/i386/nm-linux64.h	2006-07-11 02:45:16.000000000 -0300
+--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h	2006-07-11 05:20:42.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux64.h	2006-07-11 05:20:44.000000000 -0300
 @@ -35,22 +35,59 @@
  
  /* Provide access to the i386 hardware debugging registers.  */
@@ -109,8 +109,8 @@
  #define FETCH_INFERIOR_REGISTERS
 Index: gdb-6.5/gdb/config/i386/nm-linux.h
 ===================================================================
---- gdb-6.5.orig/gdb/config/i386/nm-linux.h	2006-07-11 02:44:36.000000000 -0300
-+++ gdb-6.5/gdb/config/i386/nm-linux.h	2006-07-11 02:45:16.000000000 -0300
+--- gdb-6.5.orig/gdb/config/i386/nm-linux.h	2006-07-11 05:20:42.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux.h	2006-07-11 05:20:44.000000000 -0300
 @@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A
  
  /* Provide access to the i386 hardware debugging registers.  */
@@ -183,8 +183,8 @@
  
 Index: gdb-6.5/gdb/i386-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-nat.c	2006-07-11 02:44:36.000000000 -0300
-+++ gdb-6.5/gdb/i386-nat.c	2006-07-11 02:45:16.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-nat.c	2006-07-11 05:20:42.000000000 -0300
++++ gdb-6.5/gdb/i386-nat.c	2006-07-11 05:20:44.000000000 -0300
 @@ -21,6 +21,7 @@
  
  #include "defs.h"
@@ -196,7 +196,7 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-11 02:45:16.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-11 05:20:44.000000000 -0300
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -267,7 +267,7 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-11 02:45:16.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-11 05:20:44.000000000 -0300
 @@ -0,0 +1,133 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -404,8 +404,8 @@
 +}
 Index: gdb-6.5/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 02:44:36.000000000 -0300
-+++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 02:45:16.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 05:20:42.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 05:21:58.000000000 -0300
 @@ -24,6 +24,7 @@
  #include "inferior.h"
  #include "gdbcore.h"
@@ -580,7 +580,7 @@
 +i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
 +{
 +  int rc;
-+  rc = i386_insert_hw_breakpoint (bt_tgt);
++  rc = i386_insert_hw_breakpoint (bp_tgt);
 +  if (!rc)
 +    i386_linux_sync_debug_registers_across_threads ();
 +  return rc;
@@ -616,21 +616,17 @@
  /* Called by libthread_db.  Returns a pointer to the thread local
     storage (or its descriptor).  */
  
-@@ -844,3 +969,10 @@ _initialize_i386_linux_nat (void)
+@@ -843,4 +968,6 @@ _initialize_i386_linux_nat (void)
+ 
    /* Register the target.  */
    linux_nat_add_target (t);
- }
 +
-+void
-+_initialize_i386_linux_nat (void)
-+{
 +  observer_attach_linux_new_thread (i386_linux_new_thread);
-+}
-+    
+ }
 Index: gdb-6.5/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 02:44:36.000000000 -0300
-+++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 02:45:16.000000000 -0300
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 05:20:42.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 05:20:44.000000000 -0300
 @@ -25,6 +25,7 @@
  #include "inferior.h"
  #include "gdbcore.h"



From fedora-cvs-commits at redhat.com  Tue Jul 11 08:52:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 04:52:10 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.126,1.127
Message-ID: <200607110852.k6B8qAPX011303@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11255

Modified Files:
	util-linux.spec 
Log Message:
cleanup Requires


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- util-linux.spec	10 Jul 2006 09:45:16 -0000	1.126
+++ util-linux.spec	11 Jul 2006 08:52:07 -0000	1.127
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.30
+Release: 0.31
 License: distributable
 Group: System Environment/Base
 
@@ -64,7 +64,9 @@
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth
 Requires: audit-libs >= 1.0.6
 Conflicts: kernel < 2.2.12-7, 
-Prereq: /sbin/install-info
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(post): coreutils
 Provides: mount = %{version}
 Provides: losetup = %{version}
 Provides: schedutils
@@ -498,10 +500,10 @@
 %post
 /sbin/install-info %{_infodir}/ipc.info* %{_infodir}/dir
 # only for minimal buildroots without /var/log
-[ -d /var/log ] || mkdir -p /var/log
-touch /var/log/lastlog
-chown root:root /var/log/lastlog
-chmod 0644 /var/log/lastlog
+[ -d /var/log ] || /bin/mkdir -p /var/log
+/bin/touch /var/log/lastlog
+/bin/chown root:root /var/log/lastlog
+/bin/chmod 0644 /var/log/lastlog
 # Fix the file context, do not use restorecon
 if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 	chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
@@ -700,6 +702,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Jul 11 2006 Karel Zak <kzak at redhat.com> 2.13-0.31
+- cleanup dependences for post and preun scriptlets
+
 * Mon Jul 10 2006 Karsten Hopp <karsten at redhat.de> 2.13-0.30
 - silence install in minimal buildroot without /var/log
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 09:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 05:42:53 -0400
Subject: rpms/binutils/devel binutils.spec,1.91,1.92
Message-ID: <200607110942.k6B9grmR016429@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-7


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- binutils.spec	11 Jul 2006 08:13:49 -0000	1.91
+++ binutils.spec	11 Jul 2006 09:42:50 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 6
+Release: 7
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -176,7 +176,7 @@
 %{_infodir}/*info*
 
 %changelog
-* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-6
+* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-7
 - add DT_GNU_HASH support (--hash-style=gnu and --hash-style=both
   ld options)
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 10:26:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 06:26:04 -0400
Subject: rpms/glibc/devel .cvsignore, 1.157, 1.158 glibc-fedora.patch, 1.161,
	1.162 glibc.spec, 1.247, 1.248 sources, 1.181, 1.182
Message-ID: <200607111026.k6BAQ4et026592@cvs.devel.redhat.com>

Author: jakub

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- .cvsignore	30 Jun 2006 09:31:41 -0000	1.157
+++ .cvsignore	11 Jul 2006 10:26:01 -0000	1.158
@@ -1,2 +1,2 @@
-glibc-20060630T0858.tar.bz2
-glibc-fedora-20060630T0858.tar.bz2
+glibc-20060710T2206.tar.bz2
+glibc-fedora-20060710T2206.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- glibc-fedora.patch	30 Jun 2006 09:31:41 -0000	1.161
+++ glibc-fedora.patch	11 Jul 2006 10:26:01 -0000	1.162
@@ -1,5 +1,5 @@
---- glibc-20060630T0858/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060630T0858-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060710T2206/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060710T2206-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -49,8 +49,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20060630T0858/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060630T0858-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060710T2206/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060710T2206-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -77,8 +77,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060630T0858/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060630T0858-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060710T2206/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060710T2206-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -159,8 +159,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060630T0858/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060630T0858-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20060710T2206/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060710T2206-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -332,8 +332,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060630T0858/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060630T0858-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060710T2206/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060710T2206-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -358,8 +358,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060630T0858/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
-+++ glibc-20060630T0858-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
+--- glibc-20060710T2206/debug/tst-chk1.c	24 Apr 2006 17:00:18 -0000	1.15
++++ glibc-20060710T2206-fedora/debug/tst-chk1.c	24 Apr 2006 20:31:49 -0000	1.1.2.16
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -388,8 +388,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060630T0858/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
-+++ glibc-20060630T0858-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
+--- glibc-20060710T2206/elf/ldconfig.c	7 Apr 2006 06:57:49 -0000	1.54
++++ glibc-20060710T2206-fedora/elf/ldconfig.c	24 Apr 2006 08:55:38 -0000	1.47.2.9
 @@ -964,17 +964,19 @@ search_dirs (void)
  
  
@@ -471,8 +471,8 @@
      }
  
    search_dirs ();
---- glibc-20060630T0858/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060630T0858-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060710T2206/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060710T2206-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -497,8 +497,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060630T0858/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060630T0858-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060710T2206/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060710T2206-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -575,8 +575,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060630T0858/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
-+++ glibc-20060630T0858-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
+--- glibc-20060710T2206/include/features.h	25 Apr 2006 20:34:32 -0000	1.43
++++ glibc-20060710T2206-fedora/include/features.h	26 Apr 2006 20:18:17 -0000	1.35.2.12
 @@ -275,7 +275,13 @@
  #endif
  
@@ -592,16 +592,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060630T0858/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060710T2206/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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-20060630T0858/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060710T2206/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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-20060630T0858/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060630T0858-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060710T2206/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060710T2206-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -611,8 +611,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060630T0858/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060630T0858-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060710T2206/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060710T2206-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -626,8 +626,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060630T0858/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060630T0858-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060710T2206/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060710T2206-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -658,8 +658,8 @@
  
  #endif
  
---- glibc-20060630T0858/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
-+++ glibc-20060630T0858-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
+--- glibc-20060710T2206/locale/iso-4217.def	26 Apr 2006 07:14:53 -0000	1.19
++++ glibc-20060710T2206-fedora/locale/iso-4217.def	26 Apr 2006 20:18:17 -0000	1.15.2.4
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -751,8 +751,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060630T0858/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060630T0858-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060710T2206/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060710T2206-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -796,8 +796,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060630T0858/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
-+++ glibc-20060630T0858-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
+--- glibc-20060710T2206/localedata/Makefile	26 Apr 2006 05:14:03 -0000	1.103
++++ glibc-20060710T2206-fedora/localedata/Makefile	26 Apr 2006 20:18:17 -0000	1.101.2.3
 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -806,8 +806,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060630T0858/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
-+++ glibc-20060630T0858-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
+--- glibc-20060710T2206/localedata/SUPPORTED	26 May 2006 17:02:50 -0000	1.94
++++ glibc-20060710T2206-fedora/localedata/SUPPORTED	31 May 2006 15:10:34 -0000	1.71.2.11
 @@ -76,6 +76,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -849,8 +849,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060630T0858/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060630T0858-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060710T2206/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060710T2206-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -865,8 +865,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060630T0858/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060630T0858-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060710T2206/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060710T2206-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
 @@ -112,8 +112,8 @@ mon         "<U004A><U0061><U006E><U0075
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -878,8 +878,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-20060630T0858/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060710T2206/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -950,8 +950,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060630T0858/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060630T0858-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060710T2206/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060710T2206-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -979,8 +979,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060630T0858/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060630T0858-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060710T2206/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060710T2206-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1056,8 +1056,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060630T0858/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060630T0858-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060710T2206/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060710T2206-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1113,17 +1113,17 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060630T0858/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20060630T0858-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20060710T2206/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20060710T2206-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -25,4 +25,4 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
  #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
---- glibc-20060630T0858/nptl/ChangeLog	4 Jun 2006 23:59:07 -0000	1.898
-+++ glibc-20060630T0858-fedora/nptl/ChangeLog	30 Jun 2006 09:16:34 -0000	1.706.2.90
-@@ -855,6 +855,15 @@
+--- glibc-20060710T2206/nptl/ChangeLog	1 Jul 2006 07:31:09 -0000	1.899
++++ glibc-20060710T2206-fedora/nptl/ChangeLog	11 Jul 2006 08:13:11 -0000	1.706.2.91
+@@ -860,6 +860,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1139,7 +1139,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1591,6 +1600,11 @@
+@@ -1596,6 +1605,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1151,7 +1151,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3665,6 +3679,11 @@
+@@ -3670,6 +3684,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1163,8 +1163,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060630T0858/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
-+++ glibc-20060630T0858-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
+--- glibc-20060710T2206/nptl/Makefile	28 Mar 2006 04:13:27 -0000	1.180
++++ glibc-20060710T2206-fedora/nptl/Makefile	28 Mar 2006 09:36:22 -0000	1.157.2.20
 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1187,8 +1187,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060630T0858/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060630T0858-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060710T2206/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060710T2206-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1213,8 +1213,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1222,8 +1222,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	9 Apr 2006 02:42:29 -0000	1.30
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	24 Apr 2006 08:55:42 -0000	1.25.2.5
 @@ -65,6 +65,88 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -1559,8 +1559,8 @@
  			      : "=m" (futex), "=&a" (ignore)		      \
  			      : "m" (futex),				      \
  				"i" (offsetof (tcbhead_t, multiple_threads))  \
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	9 Apr 2006 02:42:29 -0000	1.15
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S	24 Apr 2006 08:55:43 -0000	1.13.2.3
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
@@ -1706,8 +1706,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	2 Mar 2006 00:25:56 -0000	1.2
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S	6 Mar 2006 07:34:44 -0000	1.1.2.3
 @@ -44,9 +44,16 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -1808,8 +1808,8 @@
 -	ret
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	31 Mar 2005 10:00:15 -0000	1.14
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S	6 Mar 2006 07:33:30 -0000	1.11.2.4
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1951,8 +1951,8 @@
  	.size	__lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
  
  
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	17 Feb 2006 08:06:14 -0000	1.26
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	6 Mar 2006 07:33:30 -0000	1.23.2.3
 @@ -46,6 +46,110 @@
  #define BUSY_WAIT_NOP          asm ("rep; nop")
  
@@ -2340,8 +2340,8 @@
  			      : "=m" (futex), "=&D" (ignore)		      \
  			      : "m" (futex)				      \
  			      : "ax", "cx", "r11", "cc", "memory"); })
---- glibc-20060630T0858/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
-+++ glibc-20060630T0858-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
+--- glibc-20060710T2206/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	2 Mar 2006 00:26:55 -0000	1.2
++++ glibc-20060710T2206-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S	6 Mar 2006 07:33:30 -0000	1.1.2.3
 @@ -46,8 +46,13 @@
  	.hidden	__lll_robust_mutex_lock_wait
  	.align	16
@@ -2436,8 +2436,8 @@
 -	retq
 +	cfi_endproc
  	.size	__lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait
---- glibc-20060630T0858/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
-+++ glibc-20060630T0858-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
+--- glibc-20060710T2206/nscd/connections.c	30 May 2006 17:31:43 -0000	1.90
++++ glibc-20060710T2206-fedora/nscd/connections.c	31 May 2006 15:10:34 -0000	1.55.2.25
 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void)
    install_real_capabilities (new_caps);
  #endif
@@ -2460,8 +2460,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX, -1);
 +}
 +
---- glibc-20060630T0858/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
-+++ glibc-20060630T0858-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
+--- glibc-20060710T2206/nscd/nscd.c	30 May 2006 17:29:36 -0000	1.53
++++ glibc-20060710T2206-fedora/nscd/nscd.c	31 May 2006 15:10:34 -0000	1.38.2.13
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -2480,8 +2480,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060630T0858/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
-+++ glibc-20060630T0858-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
+--- glibc-20060710T2206/nscd/nscd.conf	27 Apr 2006 14:46:36 -0000	1.13
++++ glibc-20060710T2206-fedora/nscd/nscd.conf	27 Apr 2006 21:29:54 -0000	1.8.2.5
 @@ -33,8 +33,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -2493,8 +2493,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060630T0858/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060630T0858-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060710T2206/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060710T2206-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2535,8 +2535,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060630T0858/posix/Makefile	4 Jun 2006 04:59:05 -0000	1.191
-+++ glibc-20060630T0858-fedora/posix/Makefile	30 Jun 2006 09:16:34 -0000	1.171.2.19
+--- glibc-20060710T2206/posix/Makefile	4 Jun 2006 04:59:05 -0000	1.191
++++ glibc-20060710T2206-fedora/posix/Makefile	30 Jun 2006 09:16:34 -0000	1.171.2.19
 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -2570,8 +2570,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060630T0858/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060710T2206/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -2588,8 +2588,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060630T0858/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060630T0858-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060710T2206/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060710T2206-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -2605,8 +2605,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-20060630T0858/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20060630T0858-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20060710T2206/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20060710T2206-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -2620,8 +2620,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20060630T0858/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060630T0858-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060710T2206/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060710T2206-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))
@@ -2633,8 +2633,8 @@
  endif
  endif
  
---- glibc-20060630T0858/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060630T0858-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060710T2206/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060710T2206-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.  */
@@ -2986,8 +2986,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060630T0858/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060710T2206/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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.
@@ -3073,8 +3073,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060630T0858/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060630T0858-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060710T2206/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060710T2206-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);
      }
@@ -3089,8 +3089,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060710T2206-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.  */
  
@@ -3139,8 +3139,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060710T2206-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;
@@ -3183,8 +3183,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060710T2206-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"
@@ -3194,8 +3194,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060710T2206-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;
@@ -3241,8 +3241,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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.
@@ -3303,8 +3303,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060710T2206-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)
@@ -3337,24 +3337,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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-20060630T0858/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060710T2206-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-20060630T0858/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060630T0858-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060710T2206-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.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- glibc.spec	30 Jun 2006 09:31:42 -0000	1.247
+++ glibc.spec	11 Jul 2006 10:26:01 -0000	1.248
@@ -1,9 +1,9 @@
-%define glibcdate 20060630T0858
+%define glibcdate 20060710T2206
 %define glibcname glibc
-%define glibcsrcdir glibc-20060630T0858
+%define glibcsrcdir glibc-20060710T2206
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 12
+%define glibcrelease 13
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -68,7 +68,8 @@
 %define nptl_target_cpu %{_target_cpu}
 %endif
 # Need AS_NEEDED directive
-BuildRequires: binutils >= 2.15.94.0.2-1
+# Need --hash-style=* support
+BuildRequires: binutils >= 2.17.50.0.2-5
 BuildRequires: gcc >= 3.2.1-5
 %ifarch ppc s390 s390x
 BuildRequires: gcc >= 4.1.0-0.17
@@ -1435,6 +1436,9 @@
 %endif
 
 %changelog
+* Tue Jul 10 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-13
+- DT_GNU_HASH support
+
 * Fri Jun 30 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-12
 - buildrequire gettext
 - enable fstatat64/newfstatat syscalls even on ppc*/s390*/ia64 (#196494)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	30 Jun 2006 09:31:42 -0000	1.181
+++ sources	11 Jul 2006 10:26:01 -0000	1.182
@@ -1,2 +1,2 @@
-fa8f2d610bd59e032ad364ca48e7e453  glibc-20060630T0858.tar.bz2
-f3027df3c27c70d10e9769c5bc0dc86a  glibc-fedora-20060630T0858.tar.bz2
+d48cb02a9c07b6940feab23bf6ce72d5  glibc-20060710T2206.tar.bz2
+47e8329d9e086afac35c36375c91014d  glibc-fedora-20060710T2206.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 10:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 06:43:24 -0400
Subject: rpms/gimp/FC-4 .cvsignore, 1.25, 1.26 gimp.spec, 1.81, 1.82 sources,
	1.25, 1.26 gimp-2.2.7-gcc4.patch, 1.2, NONE
Message-ID: <200607111043.k6BAhOm5031559@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.2.7-gcc4.patch 
Log Message:
version 2.2.12
remove obsolete gcc4 patch
require gettext for building



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	18 Apr 2006 06:46:54 -0000	1.25
+++ .cvsignore	11 Jul 2006 10:43:21 -0000	1.26
@@ -1 +1 @@
-gimp-2.2.11.tar.bz2
+gimp-2.2.12.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gimp.spec	20 Apr 2006 13:08:27 -0000	1.81
+++ gimp.spec	11 Jul 2006 10:43:21 -0000	1.82
@@ -11,7 +11,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.11
+Version: 	2.2.12
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc4.%{?prever:0.0.%{prever}.}3
+Release: %{?prever:0.0.%{prever}.}1.fc4
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -55,6 +55,7 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  gettext
 BuildRequires:  findutils
 %if %_with_lcms
 BuildRequires:	lcms-devel
@@ -75,7 +76,6 @@
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
-Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
@@ -108,7 +108,6 @@
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
-%patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
@@ -353,6 +352,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jul 11 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1.fc4
+- version 2.2.12
+- remove obsolete gcc4 patch
+- require gettext for building
+
 * Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.3
 - only use pkgconfig if needed in gimptool, require pkgconfig in devel
   subpackage (#189314, #189371)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Apr 2006 06:46:54 -0000	1.25
+++ sources	11 Jul 2006 10:43:21 -0000	1.26
@@ -1 +1 @@
-0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2
+6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2


--- gimp-2.2.7-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 10:51:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 06:51:01 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-kde#127971.patch, NONE,
	1.1 kdebase.spec, 1.194, 1.195
Message-ID: <200607111051.k6BAp1Vq016685@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kde#127971.patch 
Log Message:
- upstream patches,
    #kde127971 hard Drive device icons do not show on desktop


kdebase-3.5.3-kde#127971.patch:
 mediamanager.desktop |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.5.3-kde#127971.patch ---
Index: kioslave/media/mediamanager/mediamanager.desktop
===================================================================
--- kioslave/media/mediamanager/mediamanager.desktop	(Revision 560583)
+++ kioslave/media/mediamanager/mediamanager.desktop	(Revision 560584)
@@ -120,3 +120,4 @@
 X-KDE-FactoryName=mediamanager
 X-KDE-Kded-autoload=true
 X-KDE-Kded-load-on-demand=true
+X-KDE-Kded-phase=1


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- kdebase.spec	6 Jul 2006 17:51:25 -0000	1.194
+++ kdebase.spec	11 Jul 2006 10:50:58 -0000	1.195
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 8
+Release: 9
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -62,6 +62,7 @@
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
 Patch104: kdebase-3.5.3.diff
 Patch105: kdebase-3.5.3-kde#87613.patch
+Patch106: kdebase-3.5.3-kde#127971.patch
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -179,6 +180,7 @@
 %patch103 -p1 -b .kxkb-kcmlayout
 %patch104 -p0 -b .setuid-check
 %patch105 -p0 -b .kde#87613
+%patch106 -p0 -b .kde#127971
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -550,6 +552,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-9
+- upstream patches,
+    #kde127971 hard Drive device icons do not show on desktop
+
 * Thu Jul 06 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
 - fix #187228, kio_media_mounthelper fails with fuser
 - apply upstream patches, fix #87613



From fedora-cvs-commits at redhat.com  Tue Jul 11 11:28:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 07:28:17 -0400
Subject: rpms/gcc/devel gcc41-hash-style-gnu.patch, NONE,
	1.1 gcc41-visibility.patch, NONE, 1.1 .cvsignore, 1.158,
	1.159 gcc41.spec, 1.77, 1.78 sources, 1.160,
	1.161 gcc41-pr26991.patch, 1.1, NONE gcc41-rh195924.patch, 1.1, NONE
Message-ID: <200607111128.k6BBSHPZ010657@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-hash-style-gnu.patch gcc41-visibility.patch 
Removed Files:
	gcc41-pr26991.patch gcc41-rh195924.patch 
Log Message:
4.1.1-7

gcc41-hash-style-gnu.patch:
 alpha/linux-elf.h |    2 +-
 i386/linux.h      |    2 +-
 i386/linux64.h    |    2 +-
 ia64/linux.h      |    2 +-
 rs6000/linux64.h  |    4 ++--
 rs6000/sysv4.h    |    2 +-
 s390/linux.h      |    2 +-
 sparc/linux.h     |    2 +-
 sparc/linux64.h   |    6 +++---
 9 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE gcc41-hash-style-gnu.patch ---
2006-07-11  Jakub Jelinek  <jakub at redhat.com>

	* config/i386/linux.h (LINK_SPEC): Add --hash-style=gnu.
	* config/i386/linux64.h (LINK_SPEC): Likewise.
	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
	LINK_OS_LINUX_SPEC64): Likewise.
	* config/s390/linux.h (LINK_SPEC): Likewise.
	* config/ia64/linux.h (LINK_SPEC): Likewise.
	* config/sparc/linux.h (LINK_SPEC): Likewise.
	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
	LINK_ARCH64_SPEC): Likewise.
	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.

--- gcc/config/rs6000/sysv4.h.jj	2006-07-11 10:54:00.000000000 +0200
+++ gcc/config/rs6000/sysv4.h	2006-07-11 12:51:39.000000000 +0200
@@ -1039,7 +1039,7 @@ extern int fixuplabelno;
 
 #define LINK_START_LINUX_SPEC ""
 
-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
 
--- gcc/config/rs6000/linux64.h.jj	2006-07-11 10:54:00.000000000 +0200
+++ gcc/config/rs6000/linux64.h	2006-07-11 12:52:14.000000000 +0200
@@ -337,11 +337,11 @@ extern int dot_symbols;
 #undef	LINK_OS_DEFAULT_SPEC
 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
 
-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
 
-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=gnu %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
   %{!dynamic-linker:-dynamic-linker /lib64/ld64.so.1}}}"
 
--- gcc/config/alpha/linux-elf.h.jj	2006-07-11 10:54:01.000000000 +0200
+++ gcc/config/alpha/linux-elf.h	2006-07-11 12:53:48.000000000 +0200
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.  */
 
 #define ELF_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
 
-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
+#define LINK_SPEC "-m elf64alpha --hash-style=gnu %{G*} %{relax:-relax}	\
   %{O*:-O3} %{!O*:-O1}						\
   %{shared:-shared}						\
   %{!shared:							\
--- gcc/config/s390/linux.h.jj	2006-07-11 10:54:02.000000000 +0200
+++ gcc/config/s390/linux.h	2006-07-11 12:52:39.000000000 +0200
@@ -79,7 +79,7 @@ Software Foundation, 51 Franklin Street,
 
 #undef  LINK_SPEC
 #define LINK_SPEC \
-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=gnu \
    %{shared:-shared} \
    %{!shared: \
       %{static:-static} \
--- gcc/config/sparc/linux.h.jj	2006-07-11 10:54:03.000000000 +0200
+++ gcc/config/sparc/linux.h	2006-07-11 12:54:16.000000000 +0200
@@ -127,7 +127,7 @@ Boston, MA 02110-1301, USA.  */
 /* If ELF is the default format, we should not use /lib/elf.  */
 
 #undef  LINK_SPEC
-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#define LINK_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \
   %{!mno-relax:%{!r:-relax}} \
   %{!shared: \
     %{!ibcs: \
--- gcc/config/sparc/linux64.h.jj	2006-07-11 10:54:03.000000000 +0200
+++ gcc/config/sparc/linux64.h	2006-07-11 12:55:10.000000000 +0200
@@ -157,7 +157,7 @@ Boston, MA 02110-1301, USA.  */
   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
   { "link_arch",	 LINK_ARCH_SPEC },
     
-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \
   %{!shared: \
     %{!ibcs: \
       %{!static: \
@@ -166,7 +166,7 @@ Boston, MA 02110-1301, USA.  */
         %{static:-static}}} \
 "
 
-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \
   %{!shared: \
     %{!ibcs: \
       %{!static: \
@@ -247,7 +247,7 @@ Boston, MA 02110-1301, USA.  */
 #else /* !SPARC_BI_ARCH */
 
 #undef LINK_SPEC
-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
+#define LINK_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \
   %{!shared: \
     %{!ibcs: \
       %{!static: \
--- gcc/config/i386/linux.h.jj	2006-07-11 10:54:05.000000000 +0200
+++ gcc/config/i386/linux.h	2006-07-11 12:44:45.000000000 +0200
@@ -113,7 +113,7 @@ Boston, MA 02110-1301, USA.  */
   { "dynamic_linker", DYNAMIC_LINKER }
 
 #undef	LINK_SPEC
-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
+#define LINK_SPEC "-m %(link_emulation) --hash-style=gnu %{shared:-shared} \
   %{!shared: \
     %{!ibcs: \
       %{!static: \
--- gcc/config/i386/linux64.h.jj	2006-07-11 10:54:04.000000000 +0200
+++ gcc/config/i386/linux64.h	2006-07-11 12:45:02.000000000 +0200
@@ -55,7 +55,7 @@ Boston, MA 02110-1301, USA.  */
    done.  */
 
 #undef	LINK_SPEC
-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=gnu \
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
--- gcc/config/ia64/linux.h.jj	2006-07-11 10:54:06.000000000 +0200
+++ gcc/config/ia64/linux.h	2006-07-11 12:48:19.000000000 +0200
@@ -40,7 +40,7 @@ do {						\
    linux.h file.  */
 
 #undef LINK_SPEC
-#define LINK_SPEC "\
+#define LINK_SPEC "--hash-style=gnu \
   %{shared:-shared} \
   %{!shared: \
     %{!static: \

gcc41-visibility.patch:
 attribs.c                                               |    8 
 c-common.c                                              |   64 ++-
 c-decl.c                                                |   10 
 cp/class.c                                              |    3 
 cp/cp-tree.h                                            |    5 
 cp/decl.c                                               |   13 
 cp/decl2.c                                              |  322 ++++++++++++----
 cp/method.c                                             |    3 
 cp/name-lookup.c                                        |   11 
 cp/parser.c                                             |   76 ++-
 cp/pt.c                                                 |   30 -
 cp/rtti.c                                               |    4 
 cp/semantics.c                                          |    5 
 cp/tree.c                                               |   27 +
 doc/extend.texi                                         |   72 ++-
 doc/invoke.texi                                         |   26 -
 flags.h                                                 |    7 
 objcp/objcp-decl.c                                      |    2 
 testsuite/g++.dg/ext/attrib14.C                         |    4 
 testsuite/g++.dg/ext/attrib9.C                          |   13 
 testsuite/g++.dg/ext/visibility/anon1.C                 |   10 
 testsuite/g++.dg/ext/visibility/anon2.C                 |   11 
 testsuite/g++.dg/ext/visibility/assign1.C               |    7 
 testsuite/g++.dg/ext/visibility/class1.C                |   20 
 testsuite/g++.dg/ext/visibility/fvisibility-override2.C |    2 
 testsuite/g++.dg/ext/visibility/prop1.C                 |   23 +
 testsuite/g++.dg/ext/visibility/redecl1.C               |    7 
 testsuite/g++.dg/ext/visibility/template1.C             |   35 +
 testsuite/g++.dg/ext/visibility/template2.C             |   35 +
 testsuite/g++.dg/ext/visibility/template3.C             |   22 +
 testsuite/g++.dg/ext/visibility/template4.C             |   39 +
 testsuite/g++.dg/ext/visibility/typeinfo1.C             |   19 
 testsuite/g++.dg/ext/visibility/virtual.C               |   10 
 testsuite/g++.dg/ext/visibility/warn1.C                 |   13 
 testsuite/g++.dg/ext/visibility/warn2.C                 |   19 
 testsuite/g++.dg/ext/visibility/warn3.C                 |   11 
 testsuite/g++.dg/ext/visibility/warn4.C                 |   10 
 testsuite/g++.dg/template/anon2.C                       |   15 
 testsuite/g++.old-deja/g++.pt/enum5.C                   |    4 
 tree.c                                                  |    8 
 tree.h                                                  |    6 
 varasm.c                                                |    2 
 42 files changed, 841 insertions(+), 192 deletions(-)

--- NEW FILE gcc41-visibility.patch ---
2006-07-06  Jason Merrill  <jason at redhat.com>

cp/
	PR c++/28279
	* decl2.c (finish_static_data_member_decl): Don't assert
	TREE_PUBLIC.

2006-07-01  Jason Merrill  <jason at redhat.com>

cp/
	PR c++/28215
	* method.c (make_thunk): Unset DECL_USE_TEMPLATE and 
	DECL_TEMPLATE_INFO.

2006-06-30  Jason Merrill  <jason at redhat.com>

objcp/
	* objcp-decl.c (objcp_start_struct): Pass null attributes argument
	to begin_class_definition.

2006-06-29  Jason Merrill  <jason at redhat.com>

	PR c++/26905
	PR c++/26612
	PR c++/27000
	PR c++/26984
	PR c++/19134
	* tree.c (build_decl_stat): Don't hande #pragma visibility here.
	* c-common.c (c_determine_visibility): Handle it here.
	* c-decl.c (finish_decl): Call c_determine_visibility for 
	functions, too.
	* flags.h (enum symbol_visibility): Sort from most to least visibility.
	* tree.h: Likewise.
	* varasm.c (default_assemble_visibility): Likewise.
	* c-common.c (handle_visibility_attribute): Complain about trying
	to give visibility to an already defined class, or trying to change
	declared visibility. Always attach the attribute.

	PR c++/26905
	PR c++/21675
	PR c++/17470
	* attribs.c (decl_attributes): Ignore type-in-place attributes
	once the type has been defined.
cp/
	PR c++/26905
	PR c++/26612
	PR c++/27000
	PR c++/26984
	PR c++/19134
	* decl2.c (determine_visibility): Overhaul.
	(determine_visibility_from_class): Likewise.
	(min_vis_r, type_visibility, constrain_visibility): New fns.
	(constrain_visibility_for_template): Likewise.
	(constrain_class_visibility): Likewise.
	* decl.c (cp_finish_decl): Call determine_visibility for function
	decls, too.
	* name-lookup.c (pushtag): Call determine_visibility.
	* decl.c (duplicate_decls): Don't copy visibility from template to
	specialization.
	* pt.c (check_explicit_specialization): Likewise.
	(lookup_template_class, tsubst_decl): Call determine_visibility.
	* class.c (finish_struct_1): Call constrain_class_visibility.

	PR c++/26905
	PR c++/21675
	PR c++/17470
	* parser.c (cp_parser_explicit_instantiation): Pass the attributes
	to grokdeclarator.
	(cp_parser_type_specifier): Allow 'enum __attribute ((...)) E'.
	(cp_parser_enum_specifier): Likewise.
	(cp_parser_elaborated_type_specifier): Apply attributes if this
	declares only the class.
	(cp_parser_class_specifier): Apply leading attributes immediately.
	* semantics.c (begin_class_definition): Add attributes parameter,
	apply them to the type.

	PR c++/21581
	PR c++/25915
	* tree.c (decl_anon_ns_mem_p): New function.
	* cp-tree.h: Declare it.
	* decl2.c (determine_visibility): Make anonymous namespace
	members static.
	(min_vis_r, constrain_visibility): Likewise.
	* rtti.c (create_pseudo_type_info): Set TREE_PUBLIC on
	pseudo-types.
	* decl.c (cxx_init_decl_processing): Set TREE_PUBLIC on
	global_namespace.
	* name-lookup.c (push_namespace_with_attribs): Don't set TREE_PUBLIC
	on anonymous namespaces.

--- gcc/tree.h.jj	2006-07-11 10:54:12.000000000 +0200
+++ gcc/tree.h	2006-07-11 10:59:16.000000000 +0200
@@ -1050,7 +1050,7 @@ extern void omp_clause_range_check_faile
    expressions.  */
 #define TREE_OVERFLOW(NODE) ((NODE)->common.public_flag)
 
-/* In a VAR_DECL or FUNCTION_DECL,
+/* In a VAR_DECL, FUNCTION_DECL, NAMESPACE_DECL or TYPE_DECL,
    nonzero means name is to be accessible from outside this module.
    In an IDENTIFIER_NODE, nonzero means an external declaration
    accessible from outside this module was previously seen
@@ -2260,9 +2260,9 @@ struct tree_binfo GTY (())
 enum symbol_visibility
 {
   VISIBILITY_DEFAULT,
-  VISIBILITY_INTERNAL,
+  VISIBILITY_PROTECTED,
   VISIBILITY_HIDDEN,
-  VISIBILITY_PROTECTED
+  VISIBILITY_INTERNAL
 };
 #endif
 
--- gcc/flags.h.jj	2006-07-11 10:55:07.000000000 +0200
+++ gcc/flags.h	2006-07-11 10:59:16.000000000 +0200
@@ -58,15 +58,16 @@ extern enum debug_info_level debug_info_
    debugging information.  */
 extern bool use_gnu_debug_info_extensions;
 
-/* Enumerate visibility settings.  */
+/* Enumerate visibility settings.  This is deliberately ordered from most
+   to least visibility.  */
 #ifndef SYMBOL_VISIBILITY_DEFINED
 #define SYMBOL_VISIBILITY_DEFINED
 enum symbol_visibility
 {
   VISIBILITY_DEFAULT,
-  VISIBILITY_INTERNAL,
+  VISIBILITY_PROTECTED,
   VISIBILITY_HIDDEN,
-  VISIBILITY_PROTECTED
+  VISIBILITY_INTERNAL
 };
 #endif
 
--- gcc/cp/parser.c.jj	2006-07-11 10:59:02.000000000 +0200
+++ gcc/cp/parser.c	2006-07-11 11:09:48.000000000 +0200
@@ -9384,7 +9384,7 @@ cp_parser_explicit_instantiation (cp_par
       if (declarator != cp_error_declarator)
 	{
 	  decl = grokdeclarator (declarator, &decl_specifiers,
-				 NORMAL, 0, NULL);
+				 NORMAL, 0, &decl_specifiers.attributes);
 	  /* Turn access control back on for names used during
 	     template instantiation.  */
 	  pop_deferring_access_checks ();
@@ -9533,22 +9533,11 @@ cp_parser_type_specifier (cp_parser* par
   switch (keyword)
     {
     case RID_ENUM:
-      /* 'enum' [identifier] '{' introduces an enum-specifier;
-	 'enum' <anything else> introduces an elaborated-type-specifier.  */
-      if (cp_lexer_peek_nth_token (parser->lexer, 2)->type == CPP_OPEN_BRACE
-	  || (cp_lexer_peek_nth_token (parser->lexer, 2)->type == CPP_NAME
-	      && cp_lexer_peek_nth_token (parser->lexer, 3)->type
-		 == CPP_OPEN_BRACE))
+      /* Look for the enum-specifier.  */
+      type_spec = cp_parser_enum_specifier (parser);
+      /* If that worked, we're done.  */
+      if (type_spec)
 	{
-	  if (parser->num_template_parameter_lists)
-	    {
-	      error ("template declaration of %qs", "enum");
-	      cp_parser_skip_to_end_of_block_or_statement (parser);
-	      type_spec = error_mark_node;
-	    }
-	  else
-	    type_spec = cp_parser_enum_specifier (parser);
-
 	  if (declares_class_or_enum)
 	    *declares_class_or_enum = 2;
 	  if (decl_specs)
@@ -10050,6 +10039,7 @@ cp_parser_elaborated_type_specifier (cp_
 					 /*type_p=*/true,
 					 is_declaration);
   /* For everything but enumeration types, consider a template-id.  */
+  /* For an enumeration type, consider only a plain identifier.  */
   if (tag_type != enum_type)
     {
       bool template_p = false;
@@ -10081,7 +10071,6 @@ cp_parser_elaborated_type_specifier (cp_
 	type = TREE_TYPE (decl);
     }
 
-  /* For an enumeration type, consider only a plain identifier.  */
   if (!type)
     {
       identifier = cp_parser_identifier (parser);
@@ -10209,11 +10198,6 @@ cp_parser_elaborated_type_specifier (cp_
 	  else
 	    ts = ts_global;
 
-	  /* Warn about attributes. They are ignored.  */
-	  if (attributes)
-	    warning (OPT_Wattributes,
-		     "type attributes are honored only at type definition");
-
 	  template_p = 
 	    (parser->num_template_parameter_lists
 	     && (cp_parser_next_token_starts_class_definition_p (parser)
@@ -10226,6 +10210,21 @@ cp_parser_elaborated_type_specifier (cp_
 	  type = xref_tag (tag_type, identifier, ts, template_p);
 	}
     }
+
+  /* Allow attributes on forward declarations of classes.  */
+  if (attributes)
+    {
+      if (tag_type != enum_type && CLASSTYPE_TEMPLATE_INSTANTIATION (type)
+	  && ! processing_explicit_instantiation)
+	warning (OPT_Wattributes,
+		 "attributes ignored on template instantiation");
+      else if (is_declaration && cp_parser_declares_only_class_p (parser))
+	cplus_decl_attributes (&type, attributes, (int) ATTR_FLAG_TYPE_IN_PLACE);
+      else
+	warning (OPT_Wattributes,
+		 "attributes ignored on elaborated-type-specifier that is not a forward declaration");
+    }
+
   if (tag_type != enum_type)
     cp_parser_check_class_key (tag_type, type);
 
@@ -10242,15 +10241,22 @@ cp_parser_elaborated_type_specifier (cp_
      enum identifier [opt] { enumerator-list [opt] }
 
    GNU Extensions:
-     enum identifier [opt] { enumerator-list [opt] } attributes
+     enum attributes[opt] identifier [opt] { enumerator-list [opt] }
+       attributes[opt]
 
-   Returns an ENUM_TYPE representing the enumeration.  */
+   Returns an ENUM_TYPE representing the enumeration, or NULL_TREE
+   if the token stream isn't an enum-specifier after all.  */
 
 static tree
 cp_parser_enum_specifier (cp_parser* parser)
 {
   tree identifier;
   tree type;
+  tree attributes;
+
+  /* Parse tentatively so that we can back up if we don't find a
+     enum-specifier.  */
+  cp_parser_parse_tentatively (parser);
 
   /* Caller guarantees that the current token is 'enum', an identifier
      possibly follows, and the token after that is an opening brace.
@@ -10258,11 +10264,20 @@ cp_parser_enum_specifier (cp_parser* par
      the enumeration being defined.  */
   cp_lexer_consume_token (parser->lexer);
 
+  attributes = cp_parser_attributes_opt (parser);
+
   if (cp_lexer_next_token_is (parser->lexer, CPP_NAME))
     identifier = cp_parser_identifier (parser);
   else
     identifier = make_anon_name ();
 
+  /* Look for the `{' but don't consume it yet.  */
+  if (!cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
+    cp_parser_simulate_error (parser);
+
+  if (!cp_parser_parse_definitely (parser))
+    return NULL_TREE;
+
   /* Issue an error message if type-definitions are forbidden here.  */
   cp_parser_check_type_definition (parser);
 
@@ -10274,6 +10289,12 @@ cp_parser_enum_specifier (cp_parser* par
   /* Consume the opening brace.  */
   cp_lexer_consume_token (parser->lexer);
 
+  if (type == error_mark_node)
+    {
+      cp_parser_skip_to_end_of_block_or_statement (parser);
+      return error_mark_node;
+    }
+
   /* If the next token is not '}', then there are some enumerators.  */
   if (cp_lexer_next_token_is_not (parser->lexer, CPP_CLOSE_BRACE))
     cp_parser_enumerator_list (parser, type);
@@ -12882,7 +12903,7 @@ cp_parser_class_specifier (cp_parser* pa
       scope = CP_DECL_CONTEXT (TYPE_MAIN_DECL (type));
       old_scope = push_inner_scope (scope);
     }
-  type = begin_class_definition (type);
+  type = begin_class_definition (type, attributes);
 
   if (type == error_mark_node)
     /* If the type is erroneous, skip the entire body of the class.  */
@@ -12899,10 +12920,7 @@ cp_parser_class_specifier (cp_parser* pa
   has_trailing_semicolon = (token->type == CPP_SEMICOLON);
   /* Look for trailing attributes to apply to this class.  */
   if (cp_parser_allow_gnu_extensions_p (parser))
-    {
-      tree sub_attr = cp_parser_attributes_opt (parser);
-      attributes = chainon (attributes, sub_attr);
-    }
+    attributes = cp_parser_attributes_opt (parser);
   if (type != error_mark_node)
     type = finish_struct (type, attributes);
   if (nested_name_specifier_p)
--- gcc/cp/name-lookup.c.jj	2006-07-11 10:59:02.000000000 +0200
+++ gcc/cp/name-lookup.c	2006-07-11 10:59:21.000000000 +0200
@@ -3012,7 +3012,12 @@ push_namespace_with_attribs (tree name, 
       /* Make a new namespace, binding the name to it.  */
       d = build_lang_decl (NAMESPACE_DECL, name, void_type_node);
       DECL_CONTEXT (d) = FROB_CONTEXT (current_namespace);
-      TREE_PUBLIC (d) = 1;
+      /* The name of this namespace is not visible to other translation
+	 units if it is an anonymous namespace or member thereof.  */
+      if (anon || decl_anon_ns_mem_p (current_namespace))
+	TREE_PUBLIC (d) = 0;
+      else
+	TREE_PUBLIC (d) = 1;
       pushdecl (d);
       if (anon)
 	{
@@ -4954,6 +4959,10 @@ pushtag (tree name, tree type, tag_scope
   gcc_assert (TREE_CODE (decl) == TYPE_DECL);
   TYPE_STUB_DECL (type) = decl;
 
+  /* Set type visibility now if this is a forward declaration.  */
+  TREE_PUBLIC (decl) = 1;
+  determine_visibility (decl);
+
   POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, type);
 }
 
--- gcc/cp/pt.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/pt.c	2006-07-11 10:59:21.000000000 +0200
@@ -2147,13 +2147,7 @@ check_explicit_specialization (tree decl
 	     template it specializes.  */
 	  TREE_PRIVATE (decl) = TREE_PRIVATE (gen_tmpl);
 	  TREE_PROTECTED (decl) = TREE_PROTECTED (gen_tmpl);
-	  /* The specialization has the same visibility as the
-	     template it specializes.  */
-	  if (DECL_VISIBILITY_SPECIFIED (gen_tmpl))
-	    {
-	      DECL_VISIBILITY_SPECIFIED (decl) = 1;
-	      DECL_VISIBILITY (decl) = DECL_VISIBILITY (gen_tmpl);
-	    }
+
 	  /* If DECL is a friend declaration, declared using an
 	     unqualified name, the namespace associated with DECL may
 	     have been set incorrectly.  For example, in:
@@ -3596,9 +3590,9 @@ convert_nontype_argument (tree type, tre
 
       if (!constant_address_p)
 	{
-	    error ("%qE is not a valid template argument for type %qT "
-		  "because it is not a constant pointer", expr, type);
-	    return NULL_TREE;
+	  error ("%qE is not a valid template argument for type %qT "
+		 "because it is not a constant pointer", expr, type);
+	  return NULL_TREE;
 	}
     }
   /* [temp.arg.nontype]/5, bullet 3
@@ -4784,6 +4778,10 @@ lookup_template_class (tree d1,
 	   code that generates debugging information will crash.  */
 	DECL_IGNORED_P (TYPE_STUB_DECL (t)) = 1;
 
+      /* Possibly limit visibility based on template args.  */
+      TREE_PUBLIC (type_decl) = 1;
+      determine_visibility (type_decl);
+
       POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, t);
     }
   timevar_pop (TV_NAME_LOOKUP);
@@ -6586,6 +6584,11 @@ tsubst_decl (tree t, tree args, tsubst_f
 	  SET_DECL_FRIEND_CONTEXT (r,
 				   tsubst (DECL_FRIEND_CONTEXT (t),
 					    args, complain, in_decl));
+
+	/* Possibly limit visibility based on template args.  */
+	DECL_VISIBILITY (r) = VISIBILITY_DEFAULT;
+	DECL_VISIBILITY_SPECIFIED (r) = 0;
+	determine_visibility (r);
       }
       break;
 
@@ -6758,6 +6761,13 @@ tsubst_decl (tree t, tree args, tsubst_f
 	if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL))
 	  SET_DECL_RTL (r, NULL_RTX);
 	DECL_SIZE (r) = DECL_SIZE_UNIT (r) = 0;
+	if (TREE_CODE (r) == VAR_DECL)
+	  {
+	    /* Possibly limit visibility based on template args.  */
+	    DECL_VISIBILITY (r) = VISIBILITY_DEFAULT;
+	    DECL_VISIBILITY_SPECIFIED (r) = 0;
+	    determine_visibility (r);
+	  }
 
 	if (!local_p)
 	  {
--- gcc/cp/decl2.c.jj	2006-07-11 10:59:02.000000000 +0200
+++ gcc/cp/decl2.c	2006-07-11 11:21:20.000000000 +0200
@@ -752,8 +752,6 @@ finish_static_data_member_decl (tree dec
 				tree asmspec_tree,
 				int flags)
 {
-  gcc_assert (TREE_PUBLIC (decl));
-
   DECL_CONTEXT (decl) = current_class_type;
 
   /* We cannot call pushdecl here, because that would fill in the
@@ -763,7 +761,7 @@ finish_static_data_member_decl (tree dec
   if (!asmspec_tree && current_class_type)
     DECL_INITIAL (decl) = error_mark_node;
 
-  if (! processing_template_decl)
+  if (! processing_template_decl && TREE_PUBLIC (decl))
     note_vague_linkage_var (decl);
 
   if (LOCAL_CLASS_P (current_class_type))
@@ -1576,6 +1574,110 @@ maybe_emit_vtables (tree ctype)
   return true;
 }
 
+/* A special return value from type_visibility meaning internal
+   linkage.  */
+
+enum { VISIBILITY_STATIC = VISIBILITY_INTERNAL+1 };
+
+/* walk_tree helper function for type_visibility.  */
+
+static tree
+min_vis_r (tree *tp, int *walk_subtrees, void *data)
+{
+  int *vis_p = (int *)data;
+  if (! TYPE_P (*tp))
+    {
+      *walk_subtrees = 0;
+    }
+  else if (CLASS_TYPE_P (*tp))
+    {
+      if (!TREE_PUBLIC (TYPE_MAIN_DECL (*tp)))
+	{
+	  *vis_p = VISIBILITY_STATIC;
+	  return *tp;
+	}
+      else if (CLASSTYPE_VISIBILITY (*tp) > *vis_p)
+	*vis_p = CLASSTYPE_VISIBILITY (*tp);
+    }
+  return NULL;
+}
+
+/* Returns the visibility of TYPE, which is the minimum visibility of its
+   component types.  */
+
+static int
+type_visibility (tree type)
+{
+  int vis = VISIBILITY_DEFAULT;
+  walk_tree_without_duplicates (&type, min_vis_r, &vis);
+  return vis;
+}
+
+/* Limit the visibility of DECL to VISIBILITY.  SPECIFIED is true if the
+   constraint comes from an attribute or pragma; REASON is the source of
+   the constraint.  */
+
+static bool
+constrain_visibility (tree decl, int visibility, bool specified,
+		      const char *reason)
+{
+  if (visibility == VISIBILITY_STATIC)
+    {
+      TREE_PUBLIC (decl) = 0;
+      DECL_INTERFACE_KNOWN (decl) = 1;
+      if (DECL_LANG_SPECIFIC (decl))
+	DECL_NOT_REALLY_EXTERN (decl) = 1;
+    }
+  else if (visibility > DECL_VISIBILITY (decl))
+    {
+      if (lookup_attribute ("visibility", DECL_ATTRIBUTES (decl)))
+	warning (OPT_Wattributes, "%q+D: visibility attribute requests "
+		 "greater visibility than its %s allows", decl, reason);
+      DECL_VISIBILITY (decl) = visibility;
+      if (!DECL_VISIBILITY_SPECIFIED (decl))
+	DECL_VISIBILITY_SPECIFIED (decl) = specified;
+      return true;
+    }
+  return false;
+}
+
+/* Constrain the visibility of DECL based on the visbility of its template
+   arguments.  */
+
+static void
+constrain_visibility_for_template (tree decl, tree targs)
+{
+  /* If this is a template instantiation, check the innermost
+     template args for visibility constraints.  The outer template
+     args are covered by the class check.  */
+  tree args = INNERMOST_TEMPLATE_ARGS (targs);
+  int i;
+  for (i = TREE_VEC_LENGTH (args); i > 0; --i)
+    {
+      int vis = 0;
+
+      tree arg = TREE_VEC_ELT (args, i-1);
+      if (TYPE_P (arg))
+	vis = type_visibility (arg);
+      else if (TREE_TYPE (arg) && POINTER_TYPE_P (TREE_TYPE (arg)))
+	{
+	  STRIP_NOPS (arg);
+	  if (TREE_CODE (arg) == ADDR_EXPR)
+	    arg = TREE_OPERAND (arg, 0);
+	  if (TREE_CODE (arg) == VAR_DECL
+	      || TREE_CODE (arg) == FUNCTION_DECL)
+	    {
+	      if (! TREE_PUBLIC (arg))
+		vis = VISIBILITY_STATIC;
+	      else
+		vis = DECL_VISIBILITY (arg);
+	    }
+	}
+      if (vis)
+	constrain_visibility (decl, vis, false, "template parameter");
+    }
+}
+
 /* Like c_determine_visibility, but with additional C++-specific
    behavior.
 
@@ -1587,12 +1689,18 @@ maybe_emit_vtables (tree ctype)
 
    Note that because namespaces have multiple independent definitions,
    namespace visibility is handled elsewhere using the #pragma visibility
-   machinery rather than by decorating the namespace declaration.  */
+   machinery rather than by decorating the namespace declaration.
+
+   The goal is for constraints from the type to give a diagnostic, and
+   other constraints to be applied silently.  */
 
 void
 determine_visibility (tree decl)
 {
-  tree class_type;
+  tree class_type = NULL_TREE;
+  bool use_template;
+
+  /* Remember that all decls get VISIBILITY_DEFAULT when built.  */
 
   /* Only relevant for names with external linkage.  */
   if (!TREE_PUBLIC (decl))
@@ -1603,9 +1711,30 @@ determine_visibility (tree decl)
      maybe_clone_body.  */
   gcc_assert (!DECL_CLONED_FUNCTION_P (decl));
 
-  /* Give the common code a chance to make a determination.  */
-  if (c_determine_visibility (decl))
-    return;
+  if (TREE_CODE (decl) == TYPE_DECL)
+    {
+      if (CLASS_TYPE_P (TREE_TYPE (decl)))
+	use_template = CLASSTYPE_USE_TEMPLATE (TREE_TYPE (decl));
+      else if (TYPE_TEMPLATE_INFO (TREE_TYPE (decl)))
+	use_template = 1;
+      else
+	use_template = 0;
+    }
+  else if (DECL_LANG_SPECIFIC (decl))
+    use_template = DECL_USE_TEMPLATE (decl);
+  else
+    use_template = 0;
+
+  /* Anything that is exported must have default visibility.  */
+  if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
+      && lookup_attribute ("dllexport",
+			   TREE_CODE (decl) == TYPE_DECL
+			   ? TYPE_ATTRIBUTES (TREE_TYPE (decl))
+			   : DECL_ATTRIBUTES (decl)))
+    {
+      DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+      DECL_VISIBILITY_SPECIFIED (decl) = 1;
+    }
 
   /* If DECL is a member of a class, visibility specifiers on the
      class can influence the visibility of the DECL.  */
@@ -1617,6 +1746,8 @@ determine_visibility (tree decl)
     class_type = TREE_TYPE (DECL_NAME (decl));
   else
     {
+      /* Not a class member.  */
+
       /* Virtual tables have DECL_CONTEXT set to their associated class,
 	 so they are automatically handled above.  */
       gcc_assert (TREE_CODE (decl) != VAR_DECL
@@ -1624,77 +1755,138 @@ determine_visibility (tree decl)
 
       if (DECL_FUNCTION_SCOPE_P (decl))
 	{
+	  /* Local statics and classes get the visibility of their
+	     containing function.  */
 	  tree fn = DECL_CONTEXT (decl);
 	  DECL_VISIBILITY (decl) = DECL_VISIBILITY (fn);
 	  DECL_VISIBILITY_SPECIFIED (decl) = DECL_VISIBILITY_SPECIFIED (fn);
+
+	  /* Local classes in templates have CLASSTYPE_USE_TEMPLATE set,
+	     but have no TEMPLATE_INFO, so don't try to check it.  */
+	  use_template = 0;
+	}
+      else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl))
+	{
+	  /* tinfo visibility is based on the type it's for.  */
+	  constrain_visibility
+	    (decl, type_visibility (TREE_TYPE (DECL_NAME (decl))),
+	     false, "type");
 	}
+      else if (use_template)
+	/* Template instantiations and specializations get visibility based
+	   on their template unless they override it with an attribute.  */;
+      else if (! DECL_VISIBILITY_SPECIFIED (decl))
+	{
+	  /* Set default visibility to whatever the user supplied with
+	     #pragma GCC visibility or a namespace visibility attribute.  */
+	  DECL_VISIBILITY (decl) = default_visibility;
+	  DECL_VISIBILITY_SPECIFIED (decl) = visibility_options.inpragma;
+	}
+    }
 
-      /* Entities not associated with any class just get the
-	 visibility specified by their attributes.  */
-      return;
+  if (use_template)
+    {
+      tree tinfo = (TREE_CODE (decl) == TYPE_DECL
+		    ? TYPE_TEMPLATE_INFO (TREE_TYPE (decl))
+		    : DECL_TEMPLATE_INFO (decl));
+      tree args = TI_ARGS (tinfo);
+      int depth = TMPL_ARGS_DEPTH (args);
+
+      /* If the template has explicit visibility and the specialization
+	 doesn't, use the visibility from the template.  */
+      if (!DECL_VISIBILITY_SPECIFIED (decl))
+	{
+	  tree pattern = DECL_TEMPLATE_RESULT (TI_TEMPLATE (tinfo));
+	  DECL_VISIBILITY (decl) = DECL_VISIBILITY (pattern);
+	}
+
+      /* FIXME should TMPL_ARGS_DEPTH really return 1 for null input? */
+      if (args && depth > template_class_depth (class_type))
+	/* Don't let it have more visibility than its template type
+	   arguments.  */
+	constrain_visibility_for_template (decl, args);
     }
 
-  /* By default, static data members and function members receive
-     the visibility of their containing class.  */
   if (class_type)
-    {
-      determine_visibility_from_class (decl, class_type);
+    determine_visibility_from_class (decl, class_type);
 
-      /* Give the target a chance to override the visibility associated
-	 with DECL.  */
-      if (TREE_CODE (decl) == VAR_DECL
-	  && (DECL_TINFO_P (decl)
-	      || (DECL_VTABLE_OR_VTT_P (decl)
-		  /* Construction virtual tables are not exported because
-		     they cannot be referred to from other object files;
-		     their name is not standardized by the ABI.  */
-		  && !DECL_CONSTRUCTION_VTABLE_P (decl)))
-	  && TREE_PUBLIC (decl)
-	  && !DECL_REALLY_EXTERN (decl)
-	  && DECL_VISIBILITY_SPECIFIED (decl)
-	  && (!class_type || !CLASSTYPE_VISIBILITY_SPECIFIED (class_type)))
-	targetm.cxx.determine_class_data_visibility (decl);
-    }      
+  /* Don't let it have more visibility than its type.  */
+  if (TREE_CODE (decl) != TYPE_DECL)
+    if (constrain_visibility (decl, type_visibility (TREE_TYPE (decl)),
+			      false, "type"))
+      warning (OPT_Wattributes, "\
+%q+D declared with greater visibility than its type",
+	       decl);
+
+  if (decl_anon_ns_mem_p (decl))
+    /* Names in an anonymous namespace get internal linkage.
+       This might change once we implement export.  */
+    constrain_visibility (decl, VISIBILITY_STATIC,
+			  false, "namespace");
 }
 
+/* By default, static data members and function members receive
+   the visibility of their containing class.  */
+
 static void
 determine_visibility_from_class (tree decl, tree class_type)
 {
-  if (TARGET_DLLIMPORT_DECL_ATTRIBUTES
-      && lookup_attribute ("dllexport", TYPE_ATTRIBUTES (class_type)))
-    {
-      DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
-      DECL_VISIBILITY_SPECIFIED (decl) = 1;
-    }
-  else if (TREE_CODE (decl) == FUNCTION_DECL
-	   && DECL_DECLARED_INLINE_P (decl)
-	   && visibility_options.inlines_hidden)
-    {
-      /* Don't change it if it has been set explicitly by user.  */
-      if (!DECL_VISIBILITY_SPECIFIED (decl))
-	{
-	  DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN;
-	  DECL_VISIBILITY_SPECIFIED (decl) = 1;
-	}
-    }
-  else if (CLASSTYPE_VISIBILITY_SPECIFIED (class_type))
-    {
-      DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type);
-      DECL_VISIBILITY_SPECIFIED (decl) = 1;
-    }
-  else if (TYPE_CLASS_SCOPE_P (class_type))
-    determine_visibility_from_class (decl, TYPE_CONTEXT (class_type));
-  else if (TYPE_FUNCTION_SCOPE_P (class_type))
-    {
-      tree fn = TYPE_CONTEXT (class_type);
-      DECL_VISIBILITY (decl) = DECL_VISIBILITY (fn);
-      DECL_VISIBILITY_SPECIFIED (decl) = DECL_VISIBILITY_SPECIFIED (fn);
-    }
-  else if (!DECL_VISIBILITY_SPECIFIED (decl))
-    {
-      DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type);
-      DECL_VISIBILITY_SPECIFIED (decl) = 0;
-    }
+  if (visibility_options.inlines_hidden
+      /* Don't do this for inline templates; specializations might not be
+	 inline, and we don't want them to inherit the hidden
+	 visibility.  We'll set it here for all inline instantiations.  */
+      && !processing_template_decl
+      && ! DECL_VISIBILITY_SPECIFIED (decl)
+      && TREE_CODE (decl) == FUNCTION_DECL
+      && DECL_DECLARED_INLINE_P (decl))
+    DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN;
+
+  /* The decl can't have more visibility than its class.  */
+  constrain_visibility (decl, CLASSTYPE_VISIBILITY (class_type),
+			CLASSTYPE_VISIBILITY_SPECIFIED (class_type),
+			"class");
+
+  /* Give the target a chance to override the visibility associated
+     with DECL.  */
+  if (TREE_CODE (decl) == VAR_DECL
+      && (DECL_TINFO_P (decl)
+	  || (DECL_VTABLE_OR_VTT_P (decl)
+	      /* Construction virtual tables are not exported because
+		 they cannot be referred to from other object files;
+		 their name is not standardized by the ABI.  */
+	      && !DECL_CONSTRUCTION_VTABLE_P (decl)))
+      && TREE_PUBLIC (decl)
+      && !DECL_REALLY_EXTERN (decl)
+      && DECL_VISIBILITY_SPECIFIED (decl)
+      && (!class_type || !CLASSTYPE_VISIBILITY_SPECIFIED (class_type)))
+    targetm.cxx.determine_class_data_visibility (decl);
+}
+
+/* Constrain the visibility of a class TYPE based on the visibility of its
+   field types.  Warn if any fields require lesser visibility.  */
+
+void
+constrain_class_visibility (tree type)
+{
+  tree decl = TYPE_MAIN_DECL (type);
+  tree binfo = TYPE_BINFO (type);
+  tree t;
+  int i;
+
+  for (t = TYPE_FIELDS (type); t; t = TREE_CHAIN (t))
+    if (TREE_CODE (t) == FIELD_DECL)
+      if (constrain_visibility (decl, type_visibility (TREE_TYPE (t)),
+				false, "field type"))
+	warning (OPT_Wattributes, "\
+%qT declared with greater visibility than the type of its field %qD",
+		 type, t);
+
+  for (i = 0; BINFO_BASE_ITERATE (binfo, i, t); ++i)
+    if (constrain_visibility (decl, type_visibility (TREE_TYPE (t)),
+			      false, "base type"))
+      warning (OPT_Wattributes, "\
+%qT declared with greater visibility than its base %qT",
+	       type, TREE_TYPE (t));
 }
 
 /* DECL is a FUNCTION_DECL or VAR_DECL.  If the object file linkage
--- gcc/cp/rtti.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/rtti.c	2006-07-11 10:59:21.000000000 +0200
@@ -1145,6 +1145,10 @@ create_pseudo_type_info (int tk, const c
   ti->name = get_identifier (real_name);
   ti->vtable = NULL_TREE;
 
+  /* Pretend this is public so determine_visibility doesn't give vtables
+     internal linkage.  */
+  TREE_PUBLIC (TYPE_MAIN_DECL (ti->type)) = 1;
+
   va_end (ap);
 }
 
--- gcc/cp/method.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/method.c	2006-07-11 10:59:21.000000000 +0200
@@ -163,6 +163,9 @@ make_thunk (tree function, bool this_adj
   DECL_DECLARED_INLINE_P (thunk) = 0;
   /* Nor has it been deferred.  */
   DECL_DEFERRED_FN (thunk) = 0;
+  /* Nor is it a template instantiation.  */
+  DECL_USE_TEMPLATE (thunk) = 0;
+  DECL_TEMPLATE_INFO (thunk) = NULL;
 
   /* Add it to the list of thunks associated with FUNCTION.  */
   TREE_CHAIN (thunk) = DECL_THUNKS (function);
--- gcc/cp/class.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/class.c	2006-07-11 10:59:21.000000000 +0200
@@ -5047,6 +5047,9 @@ finish_struct_1 (tree t)
       DECL_SORTED_FIELDS (TYPE_MAIN_DECL (t)) = field_vec;
     }
 
+  /* Complain if one of the field types requires lower visibility.  */
+  constrain_class_visibility (t);
+
   /* Make the rtl for any new vtables we have created, and unmark
      the base types we marked.  */
   finish_vtbls (t);
--- gcc/cp/tree.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/tree.c	2006-07-11 10:59:21.000000000 +0200
@@ -1394,6 +1394,30 @@ decl_namespace_context (tree decl)
     }
 }
 
+/* Returns true if decl is within an anonymous namespace, however deeply
+   nested, or false otherwise.  */
+
+bool
+decl_anon_ns_mem_p (tree decl)
+{
+  while (1)
+    {
+      if (decl == NULL_TREE)
+	return false;
+      if (TREE_CODE (decl) == NAMESPACE_DECL
+	  && DECL_NAME (decl) == NULL_TREE)
+	return true;
+      /* Classes and namespaces inside anonymous namespaces have
+         TREE_PUBLIC == 0, so we can shortcut the search.  */
+      else if (TYPE_P (decl))
+	return (TREE_PUBLIC (TYPE_NAME (decl)) == 0);
+      else if (TREE_CODE (decl) == NAMESPACE_DECL)
+	return (TREE_PUBLIC (decl) == 0);
+      else
+	decl = DECL_CONTEXT (decl);
+    }
+}
+
 /* Return truthvalue of whether T1 is the same tree structure as T2.
    Return 1 if they are the same. Return 0 if they are different.  */
 
@@ -2176,7 +2200,8 @@ decl_linkage (tree decl)
      template instantiations have internal linkage (in the object
      file), but the symbols should still be treated as having external
      linkage from the point of view of the language.  */
-  if (TREE_CODE (decl) != TYPE_DECL && DECL_LANG_SPECIFIC (decl) && DECL_COMDAT (decl))
+  if (TREE_CODE (decl) != TYPE_DECL && DECL_LANG_SPECIFIC (decl)
+      && DECL_COMDAT (decl))
     return lk_external;
 
   /* Things in local scope do not have linkage, if they don't have
--- gcc/cp/semantics.c.jj	2006-07-11 10:54:09.000000000 +0200
+++ gcc/cp/semantics.c	2006-07-11 10:59:21.000000000 +0200
@@ -2160,7 +2160,7 @@ check_template_template_default_arg (tre
 /* Begin a class definition, as indicated by T.  */
 
 tree
-begin_class_definition (tree t)
+begin_class_definition (tree t, tree attributes)
 {
   if (t == error_mark_node)
     return error_mark_node;
@@ -2199,6 +2199,9 @@ begin_class_definition (tree t)
   maybe_process_partial_specialization (t);
   pushclass (t);
   TYPE_BEING_DEFINED (t) = 1;
+
+  cplus_decl_attributes (&t, attributes, (int) ATTR_FLAG_TYPE_IN_PLACE);
+
   if (flag_pack_struct)
     {
       tree v;
--- gcc/cp/cp-tree.h.jj	2006-07-11 10:59:02.000000000 +0200
+++ gcc/cp/cp-tree.h	2006-07-11 10:59:21.000000000 +0200
@@ -3969,6 +3969,8 @@ extern tree coerce_new_type			(tree);
 extern tree coerce_delete_type			(tree);
 extern void comdat_linkage			(tree);
 extern void determine_visibility		(tree);
+extern void constrain_class_visibility		(tree);
+extern void update_member_visibility		(tree);
 extern void import_export_decl			(tree);
 extern tree build_cleanup			(tree);
 extern tree build_offset_ref_call_from_tree	(tree, tree);
@@ -4284,7 +4286,7 @@ extern tree finish_fname			(tree);
 extern void finish_translation_unit		(void);
 extern tree finish_template_type_parm		(tree, tree);
 extern tree finish_template_template_parm       (tree, tree);
-extern tree begin_class_definition		(tree);
+extern tree begin_class_definition		(tree, tree);
 extern void finish_template_decl		(tree);
 extern tree finish_template_type		(tree, tree, int);
 extern tree finish_base_specifier		(tree, tree, bool);
@@ -4366,6 +4368,7 @@ extern tree array_type_nelts_top		(tree)
 extern tree break_out_target_exprs		(tree);
 extern tree get_type_decl			(tree);
 extern tree decl_namespace_context		(tree);
+extern bool decl_anon_ns_mem_p			(tree);
 extern tree lvalue_type				(tree);
 extern tree error_type				(tree);
 extern int varargs_function_p			(tree);
--- gcc/cp/decl.c.jj	2006-07-11 10:59:02.000000000 +0200
+++ gcc/cp/decl.c	2006-07-11 10:59:21.000000000 +0200
@@ -1860,6 +1860,11 @@ duplicate_decls (tree newdecl, tree oldd
 
 	  SET_DECL_TEMPLATE_SPECIALIZATION (olddecl);
 
+	  /* Don't propagate visibility from the template to the
+	     specialization here.  We'll do that in determine_visibility if
+	     appropriate.  */
+	  DECL_VISIBILITY_SPECIFIED (olddecl) = 0;
+
 	  /* [temp.expl.spec/14] We don't inline explicit specialization
 	     just because the primary template says so.  */
 	}
@@ -3125,6 +3130,7 @@ cxx_init_decl_processing (void)
   gcc_assert (global_namespace == NULL_TREE);
   global_namespace = build_lang_decl (NAMESPACE_DECL, global_scope_name,
 				      void_type_node);
+  TREE_PUBLIC (global_namespace) = 1;
   begin_scope (sk_namespace, global_namespace);
 
   current_lang_name = NULL_TREE;
@@ -5260,6 +5266,9 @@ cp_finish_decl (tree decl, tree init, bo
       else
 	abstract_virtuals_error (decl, type);
 
+      /* This needs to happen after the linkage is set. */
+      determine_visibility (decl);
+
       if (TREE_CODE (decl) == FUNCTION_DECL
 	  || TREE_TYPE (decl) == error_mark_node)
 	/* No initialization required.  */
@@ -5286,10 +5295,6 @@ cp_finish_decl (tree decl, tree init, bo
 		initialize_local_var (decl, init);
 	    }
 
-	  /* The variable is being defined, so determine its visibility.
-	     This needs to happen after the linkage is set. */
-	  determine_visibility (decl);
-
 	  /* If a variable is defined, and then a subsequent
 	     definition with external linkage is encountered, we will
 	     get here twice for the same variable.  We want to avoid
--- gcc/varasm.c.jj	2006-07-11 10:54:13.000000000 +0200
+++ gcc/varasm.c	2006-07-11 10:59:21.000000000 +0200
@@ -4952,7 +4952,7 @@ void
 default_assemble_visibility (tree decl, int vis)
 {
   static const char * const visibility_types[] = {
-    NULL, "internal", "hidden", "protected"
+    NULL, "protected", "hidden", "internal"
   };
 
   const char *name, *type;
--- gcc/tree.c.jj	2006-07-11 10:54:10.000000000 +0200
+++ gcc/tree.c	2006-07-11 10:59:16.000000000 +0200
@@ -3136,14 +3136,6 @@ build_decl_stat (enum tree_code code, tr
   else if (code == FUNCTION_DECL)
     DECL_MODE (t) = FUNCTION_MODE;
 
-  if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
-    {
-      /* Set default visibility to whatever the user supplied with
-	 visibility_specified depending on #pragma GCC visibility.  */
-      DECL_VISIBILITY (t) = default_visibility;
-      DECL_VISIBILITY_SPECIFIED (t) = visibility_options.inpragma;
-    }
-
   return t;
 }
 
--- gcc/attribs.c.jj	2006-07-11 10:53:46.000000000 +0200
+++ gcc/attribs.c	2006-07-11 10:59:16.000000000 +0200
@@ -250,6 +250,14 @@ decl_attributes (tree *node, tree attrib
 	    }
 	}
 
+      if (TYPE_P (*anode)
+	  && (flags & (int) ATTR_FLAG_TYPE_IN_PLACE)
+	  && TYPE_SIZE (*anode) != NULL_TREE)
+	{
+	  warning (OPT_Wattributes, "type attributes ignored after type is already defined");
+	  continue;
+	}
+
       if (spec->handler != NULL)
 	returned_attrs = chainon ((*spec->handler) (anode, name, args,
 						    flags, &no_add_attrs),
--- gcc/objcp/objcp-decl.c.jj	2006-07-11 10:54:12.000000000 +0200
+++ gcc/objcp/objcp-decl.c	2006-07-11 10:59:21.000000000 +0200
@@ -59,7 +59,7 @@ objcp_start_struct (enum tree_code code 
   CLASSTYPE_DECLARED_CLASS (s) = 0;  /* this is a 'struct', not a 'class'.  */
   xref_basetypes (s, NULL_TREE);     /* no base classes here!  */
 
-  return begin_class_definition (s);
+  return begin_class_definition (s, NULL_TREE);
 }
 
 tree 
--- gcc/doc/extend.texi.jj	2006-07-11 10:54:13.000000000 +0200
+++ gcc/doc/extend.texi	2006-07-11 11:35:05.000000000 +0200
@@ -2335,6 +2335,17 @@ by another module.
 
 Not all ELF targets support this attribute.
 
+A C++ namespace declaration can also have the visibility attribute.
+This attribute applies only to the particular namespace body, not to
+other definitions of the same namespace; it is equivalent to using
+ at samp{#pragma GCC visibility} before and after the namespace
+definition (@pxref{Visibility Pragmas}).
+
+In C++, if a template argument has limited visibility, this
+restriction is implicitly propagated to the template instantiation.
+Otherwise, template instantiations and specializations default to the
+visibility of their template.
+
 @item warn_unused_result
 @cindex @code{warn_unused_result} attribute
 The @code{warn_unused_result} attribute causes a warning to be emitted
@@ -2513,10 +2524,7 @@ does not arise there.
 An attribute specifier list may appear as part of a @code{struct},
 @code{union} or @code{enum} specifier.  It may go either immediately
 after the @code{struct}, @code{union} or @code{enum} keyword, or after
-the closing brace.  It is ignored if the content of the structure, union
-or enumerated type is not defined in the specifier in which the
-attribute specifier list is used---that is, in usages such as
- at code{struct __attribute__((foo)) bar} with no following opening brace.
+the closing brace.  The former syntax is preferred.
 Where attribute specifiers follow the closing brace, they are considered
 to relate to the structure, union or enumerated type defined, not to any
 enclosing declaration the type specifier appears in, and the type
@@ -3180,13 +3188,14 @@ placed in either the @code{.bss_below100
 @cindex type attributes
 
 The keyword @code{__attribute__} allows you to specify special
-attributes of @code{struct} and @code{union} types when you define such
-types.  This keyword is followed by an attribute specification inside
-double parentheses.  Six attributes are currently defined for types:
- at code{aligned}, @code{packed}, @code{transparent_union}, @code{unused},
- at code{deprecated} and @code{may_alias}.  Other attributes are defined for
-functions (@pxref{Function Attributes}) and for variables
-(@pxref{Variable Attributes}).
+attributes of @code{struct} and @code{union} types when you define
+such types.  This keyword is followed by an attribute specification
+inside double parentheses.  Seven attributes are currently defined for
+types: @code{aligned}, @code{packed}, @code{transparent_union},
+ at code{unused}, @code{deprecated}, @code{visibility}, and
+ at code{may_alias}.  Other attributes are defined for functions
+(@pxref{Function Attributes}) and for variables (@pxref{Variable
+Attributes}).
 
 You may also specify any one of these attributes with @samp{__}
 preceding and following its keyword.  This allows you to use these
@@ -3194,14 +3203,13 @@ attributes in header files without being
 macro of the same name.  For example, you may use @code{__aligned__}
 instead of @code{aligned}.
 
-You may specify the @code{aligned} and @code{transparent_union}
-attributes either in a @code{typedef} declaration or just past the
-closing curly brace of a complete enum, struct or union type
- at emph{definition} and the @code{packed} attribute only past the closing
-brace of a definition.
+You may specify type attributes either in a @code{typedef} declaration
+or in an enum, struct or union type declaration or definition.
 
-You may also specify attributes between the enum, struct or union
-tag and the name of the type rather than after the closing brace.
+For an enum, struct or union type, you may specify attributes either
+between the enum, struct or union tag and the name of the type, or
+just past the closing curly brace of the @emph{definition}.  The
+former syntax is preferred.
 
 @xref{Attribute Syntax}, for details of the exact syntax for using
 attributes.
@@ -3450,6 +3458,13 @@ declaration, the above program would abo
 @option{-fstrict-aliasing}, which is on by default at @option{-O2} or
 above in recent GCC versions.
 
+ at item visibility
+
+In C++, attribute visibility (@pxref{Function Attributes}) can also be
+applied to class, struct, union and enum types.  Unlike other type
+attributes, the attribute must appear between the initial keyword and
+the name of the type; it cannot appear after the body of the type.
+
 @subsection ARM Type Attributes
 
 On those ARM targets that support @code{dllimport} (such as Symbian
@@ -9226,6 +9241,7 @@ for further explanation.
 * Symbol-Renaming Pragmas::
 * Structure-Packing Pragmas::
 * Weak Pragmas::
+* Visibility Pragmas::
 @end menu
 
 @node ARM Pragmas
@@ -9466,6 +9482,26 @@ It is an error if @var{symbol2} is not d
 translation unit.
 @end table
 
+ at node Visibility Pragmas
+ at subsection Visibility Pragmas
+
+ at table @code
+ at item #pragma GCC visibility push(@var{visibility})
+ at itemx #pragma GCC visibility pop
+ at cindex pragma, visibility
+
+This pragma allows the user to set the visibility for multiple
+declarations without having to give each a visibility attribute
+ at xref{Function Attributes}, for more information about visibility and
+the attribute syntax.
+
+In C++, @samp{#pragma GCC visibility} affects only namespace-scope
+declarations.  Class members and template specializations are not
+affected; if you want to override the visibility for a particular
+member or instantiation, you must use an attribute.
+
+ at end table
+
 @node Unnamed Fields
 @section Unnamed struct/union fields within structs/unions
 @cindex struct
--- gcc/doc/invoke.texi.jj	2006-07-11 10:54:13.000000000 +0200
+++ gcc/doc/invoke.texi	2006-07-11 11:23:41.000000000 +0200
@@ -1586,12 +1586,12 @@ Causes all inlined methods to be marked 
 appear in the export table of a DSO and do not require a PLT indirection
 when used within the DSO at .  Enabling this option can have a dramatic effect
 on load and link times of a DSO as it massively reduces the size of the
-dynamic export table when the library makes heavy use of templates.  While
-it can cause bloating through duplication of code within each DSO where
-it is used, often the wastage is less than the considerable space occupied
-by a long symbol name in the export table which is typical when using
-templates and namespaces.  For even more savings, combine with the
- at option{-fvisibility=hidden} switch.
+dynamic export table when the library makes heavy use of templates.
+
+You may mark a method as having a visibility explicitly to negate the
+effect of the switch for that method.  For example, if you do want to
+compare pointers to a particular inline method, or the method has
+local static data, you might mark it as having default visibility.
 
 @item -fno-weak
 @opindex fno-weak
@@ -13156,6 +13156,20 @@ abundantly clear also aids readability a
 Note that due to ISO C++ specification requirements, operator new and
 operator delete must always be of default visibility.
 
+ at samp{extern} declarations are not affected by @samp{-fvisibility}, so
+a lot of code can be recompiled with @samp{-fvisibility=hidden} with
+no modifications.  However, this means that calls to @samp{extern}
+functions with no explicit visibility will use the PLT, so it is more
+effective to use @samp{__attribute ((visibility))} and/or
+ at samp{#pragma GCC visibility} to tell the compiler which @samp{extern}
+declarations should be treated as hidden.
+
+Note that @samp{-fvisibility} does affect C++ vague linkage
+entities. This means that, for instance, an exception class that will
+be thrown between DSOs must be explicitly marked with default
+visibility so that the @samp{type_info} nodes will be unified between
+the DSOs.
+
 An overview of these techniques, their benefits and how to use them
 is at @w{@uref{http://gcc.gnu.org/wiki/Visibility}}.
 
--- gcc/c-decl.c.jj	2006-07-11 10:54:16.000000000 +0200
+++ gcc/c-decl.c	2006-07-11 11:05:36.000000000 +0200
@@ -3448,18 +3448,16 @@ finish_decl (tree decl, tree init, tree 
   /* If #pragma weak was used, mark the decl weak now.  */
   maybe_apply_pragma_weak (decl);
 
-  /* If this is a variable definition, determine its ELF visibility.  */
-  if (TREE_CODE (decl) == VAR_DECL 
-      && TREE_STATIC (decl) 
-      && !DECL_EXTERNAL (decl))
-    c_determine_visibility (decl);
-
   /* Output the assembler code and/or RTL code for variables and functions,
      unless the type is an undefined structure or union.
      If not, it will get done when the type is completed.  */
 
   if (TREE_CODE (decl) == VAR_DECL || TREE_CODE (decl) == FUNCTION_DECL)
     {
+      /* Determine the ELF visibility.  */
+      if (TREE_PUBLIC (decl))
+	c_determine_visibility (decl);
+
       /* This is a no-op in c-lang.c or something real in objc-act.c.  */
       if (c_dialect_objc ())
 	objc_check_decl (decl);
--- gcc/c-common.c.jj	2006-07-11 10:53:45.000000000 +0200
+++ gcc/c-common.c	2006-07-11 11:04:23.000000000 +0200
@@ -4795,21 +4795,28 @@ handle_weakref_attribute (tree *node, tr
 static tree
 handle_visibility_attribute (tree *node, tree name, tree args,
 			     int ARG_UNUSED (flags),
-			     bool *no_add_attrs)
+			     bool *ARG_UNUSED (no_add_attrs))
 {
   tree decl = *node;
   tree id = TREE_VALUE (args);
-
-  *no_add_attrs = true;
+  enum symbol_visibility vis;
 
   if (TYPE_P (*node))
     {
-      if (TREE_CODE (*node) != RECORD_TYPE && TREE_CODE (*node) != UNION_TYPE)
-       {
-         warning (OPT_Wattributes, "%qE attribute ignored on non-class types",
-		  name);
-         return NULL_TREE;
-       }
+      if (TREE_CODE (*node) == ENUMERAL_TYPE)
+	/* OK */;
+      else if (TREE_CODE (*node) != RECORD_TYPE && TREE_CODE (*node) != UNION_TYPE)
+	{
+	  warning (OPT_Wattributes, "%qE attribute ignored on non-class types",
+		   name);
+	  return NULL_TREE;
+	}
+      else if (TYPE_FIELDS (*node))
+	{
+	  error ("%qE attribute ignored because %qT is already defined",
+		 name, *node);
+	  return NULL_TREE;
+	}
     }
   else if (decl_function_context (decl) != 0 || !TREE_PUBLIC (decl))
     {
@@ -4838,23 +4845,33 @@ handle_visibility_attribute (tree *node,
     }
 
   if (strcmp (TREE_STRING_POINTER (id), "default") == 0)
-    DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+    vis = VISIBILITY_DEFAULT;
   else if (strcmp (TREE_STRING_POINTER (id), "internal") == 0)
-    DECL_VISIBILITY (decl) = VISIBILITY_INTERNAL;
+    vis = VISIBILITY_INTERNAL;
   else if (strcmp (TREE_STRING_POINTER (id), "hidden") == 0)
-    DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN;
+    vis = VISIBILITY_HIDDEN;
   else if (strcmp (TREE_STRING_POINTER (id), "protected") == 0)
-    DECL_VISIBILITY (decl) = VISIBILITY_PROTECTED;
+    vis = VISIBILITY_PROTECTED;
   else
-    error ("visibility argument must be one of \"default\", \"hidden\", \"protected\" or \"internal\"");
+    {
+      error ("visibility argument must be one of \"default\", \"hidden\", \"protected\" or \"internal\"");
+      vis = VISIBILITY_DEFAULT;
+    }
+
+  if (DECL_VISIBILITY_SPECIFIED (decl)
+      && vis != DECL_VISIBILITY (decl)
+      && lookup_attribute ("visibility", (TYPE_P (*node)
+					  ? TYPE_ATTRIBUTES (*node)
+					  : DECL_ATTRIBUTES (decl))))
+    error ("%qD redeclared with different visibility", decl);
+
+  DECL_VISIBILITY (decl) = vis;
   DECL_VISIBILITY_SPECIFIED (decl) = 1;
 
-  /* For decls only, go ahead and attach the attribute to the node as well.
-     This is needed so we can determine whether we have VISIBILITY_DEFAULT
-     because the visibility was not specified, or because it was explicitly
-     overridden from the class visibility.  */
-  if (DECL_P (*node))
-    *no_add_attrs = false;
+  /* Go ahead and attach the attribute to the node as well.  This is needed
+     so we can determine whether we have VISIBILITY_DEFAULT because the
+     visibility was not specified, or because it was explicitly overridden
+     from the containing scope.  */
 
   return NULL_TREE;
 }
@@ -4891,6 +4908,13 @@ c_determine_visibility (tree decl)
       return true;
     }
 
+  /* Set default visibility to whatever the user supplied with
+     visibility_specified depending on #pragma GCC visibility.  */
+  if (!DECL_VISIBILITY_SPECIFIED (decl))
+    {
+      DECL_VISIBILITY (decl) = default_visibility;
+      DECL_VISIBILITY_SPECIFIED (decl) = visibility_options.inpragma;
+    }
   return false;
 }
 
--- gcc/testsuite/g++.dg/ext/attrib14.C.jj	2006-07-11 10:54:46.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/attrib14.C	2006-07-11 10:59:16.000000000 +0200
@@ -3,11 +3,11 @@
 // parsing of the class, causing some variants to have it and some not.
 
 struct __attribute__((bogus)) A
-{
+{				// { dg-warning "ignored" "" }
     virtual ~A();
     void foo(const A&);
     void bar(const A&);
-};				// { dg-warning "ignored" "" }
+};
 
 void A::foo(const A&)   {}
 void A::bar(const A& a) { foo(a); }
--- gcc/testsuite/g++.dg/ext/visibility/warn3.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/warn3.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,11 @@
+// Warn when a class member is specified to have greater visibility than
+// its class.
+
+// { dg-require-visibility "" }
+
+struct __attribute ((visibility ("hidden"))) A
+{
+  __attribute ((visibility ("default"))) void f (); // { dg-warning "visibility" }
+};
+
+void A::f() { }
--- gcc/testsuite/g++.dg/ext/visibility/class1.C.jj	2006-07-11 10:59:20.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/class1.C	2006-07-11 10:59:20.000000000 +0200
@@ -0,0 +1,20 @@
+// PR c++/26905
+// Init should not be hidden, so calling it should use the PLT.
+
+// { dg-require-visibility "" }
+// { dg-options "-fpic" }
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-final { scan-assembler "InitEv at PLT" } }
+
+#pragma GCC visibility push(hidden)
+struct __attribute__ ((visibility ("default"))) nsINIParser
+{
+    static void Init();
+};
+
+__attribute__ ((visibility ("default")))
+void
+CheckCompatibility(void)
+{
+  nsINIParser::Init();
+}
--- gcc/testsuite/g++.dg/ext/visibility/virtual.C.jj	2006-07-11 10:54:46.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/virtual.C	2006-07-11 10:59:21.000000000 +0200
@@ -1,9 +1,15 @@
-/* Test that setting visibility for class affects virtual table. */
+/* Test that setting visibility for class affects virtual table, VTT and
+   type_info name and node. */
 /* { dg-do compile } */
 /* { dg-require-visibility "" } */
 /* { dg-final { scan-hidden "ZTV3Foo" } } */
+/* { dg-final { scan-hidden "ZTT3Foo" } } */
+/* { dg-final { scan-hidden "ZTS3Foo" } } */
+/* { dg-final { scan-hidden "ZTI3Foo" } } */
 
-class __attribute__ ((visibility ("hidden"))) Foo
+struct A { };
+
+class __attribute__ ((visibility ("hidden"))) Foo: virtual public A
 {
   virtual void method();
 };
--- gcc/testsuite/g++.dg/ext/visibility/typeinfo1.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/typeinfo1.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,19 @@
+// PR c++/26984
+// lazily generated typeinfos should not be affected by #pragma vis, but
+// they should be affected by the visibility of the type they describe.
+
+// { dg-require-visibility "" }
+// { dg-options "-fvisibility-inlines-hidden" }
+// { dg-final { scan-not-hidden "_ZTIPPi" } }
+// { dg-final { scan-not-hidden "_ZTSPPi" } }
+// { dg-final { scan-hidden "_ZTIP1A" } }
+// { dg-final { scan-hidden "_ZTSP1A" } }
+
+#include <typeinfo>
+
+#pragma GCC visibility push(hidden)
+const std::type_info* t = &(typeid(int **));
+struct A { };
+#pragma GCC visibility pop
+
+const std::type_info* t2 = &(typeid(A *));
--- gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C.jj	2006-07-11 10:54:46.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/fvisibility-override2.C	2006-07-11 10:59:20.000000000 +0200
@@ -6,7 +6,7 @@
 
 class Foo
 {
-  __attribute__ ((visibility ("default"))) void method();
+  __attribute__ ((visibility ("internal"))) void method();
 };
 
 void Foo::method() { }
--- gcc/testsuite/g++.dg/ext/visibility/template4.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/template4.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,39 @@
+// Test for explicit visibility on template vs. #pragma vis at explicit
+// instantiation/specialization point for plain function templates.
+
+// { dg-require-visibility "" }
+// { dg-final { scan-hidden "_Z3fooIdEvT_" } }
+// { dg-final { scan-hidden "_Z3fooIlEvT_" } }
+// { dg-final { scan-hidden "_Z3fooIcEvT_" } }
+// { dg-final { scan-hidden "_Z3fooIiEvT_" } }
+// { dg-final { scan-not-hidden "_Z3fooIfEvT_" } }
+// { dg-final { scan-not-hidden "_Z3fooIsEvT_" } }
+
+// { dg-final { scan-hidden "_Z3barIdEvT_" } }
+// { dg-final { scan-hidden "_Z3barIlEvT_" } }
+// { dg-final { scan-hidden "_Z3barIiEvT_" } }
+// { dg-final { scan-hidden "_Z3barIcEvT_" } }
+// { dg-final { scan-not-hidden "_Z3barIfEvT_" } }
+// { dg-final { scan-not-hidden "_Z3barIsEvT_" } }
+
+#pragma GCC visibility push(hidden)
+template <class T> void bar(T) { }
+#pragma GCC visibility pop
+template void bar (long);
+template<> void bar (double) { }
+template __attribute ((visibility ("default"))) void bar (short);
+template<> __attribute ((visibility ("default"))) void bar (float) { }
+#pragma GCC visibility push(default)
+template<> void bar(char) { }
+template void bar(int);
+#pragma GCC visibility pop
+
+template <class T> __attribute ((visibility ("hidden"))) void foo(T) { }
+template void foo (long);
+template<> void foo (double) { }
+template __attribute ((visibility ("default"))) void foo (short);
+template<> __attribute ((visibility ("default"))) void foo (float) { }
+#pragma GCC visibility push(default)
+template<> void foo(char) { }
+template void foo(int);
+#pragma GCC visibility pop
--- gcc/testsuite/g++.dg/ext/visibility/warn4.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/warn4.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,10 @@
+// Error if we try to give an instantiation visibility after it's already
+// been instantiated.
+
+// { dg-require-visibility "" }
+
+template <class T> struct A { void f (T); };
+template <class T> void A<T>::f (T) { }
+
+A<double> ad;
+template struct __attribute ((visibility ("hidden"))) A<double>; // { dg-error "already defined" }
--- gcc/testsuite/g++.dg/ext/visibility/template1.C.jj	2006-07-11 10:59:20.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/template1.C	2006-07-11 10:59:20.000000000 +0200
@@ -0,0 +1,35 @@
+// PR c++/19134
+// -fvisibility-inlines-hidden doesn't apply to non-inline specializations
+
+// { dg-require-visibility "" }
+// { dg-options "-fvisibility-inlines-hidden" }
+// { dg-final { scan-not-hidden "_ZN1AIiE3fooEv" } }
+// { dg-final { scan-not-hidden "_ZN1AIiE3barEv" } }
+// { dg-final { scan-hidden "_ZN1AIlE3fooEv" } }
+// { dg-final { scan-hidden "_ZN1AIlE3barEv" } }
+// { dg-final { scan-hidden "_ZN1AIcE3barEv" } }
+
+template<class T>
+struct A {
+  void foo() {};
+  __attribute ((visibility ("hidden"))) void bar();
+};
+
+// This has default visibility.
+template<> void A<int>::foo() {}
+
+// This has hidden visibility because of -fvisibility-inlines-hidden.
+template<> inline void A<long>::foo() {}
+// Force the inline out.
+void f () { A<long> a; a.foo(); }
+
+// This has default visibility.
+template<> __attribute ((visibility ("default"))) void A<int>::bar() {}
+
+// This inherits hidden visibility from its template.
+template<> void A<long>::bar() { }
+
+// This also has hidden visibility; #pragma vis doesn't affect class members.
+#pragma GCC visibility push(default)
+template<> void A<char>::bar() { }
+#pragma GCC visibility pop
--- gcc/testsuite/g++.dg/ext/visibility/redecl1.C.jj	2006-07-11 10:59:20.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/redecl1.C	2006-07-11 10:59:20.000000000 +0200
@@ -0,0 +1,7 @@
+// Test that we complain about redeclaration with different visibility
+
+struct __attribute((visibility("hidden"))) B;
+struct __attribute((visibility("default"))) B;	// { dg-warning "visibility" }
+
+__attribute ((visibility ("hidden"))) void f();	// { dg-warning "previous" }
+__attribute ((visibility ("default"))) void f(); // { dg-warning "visibility" }
--- gcc/testsuite/g++.dg/ext/visibility/warn1.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/warn1.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,13 @@
+// Warn when a declaration is specified with greater visibility than that
+// of its type.
+
+// { dg-do compile }
+// { dg-require-visibility "" }
+// { dg-final { scan-hidden "_Z1fv" } }
+
+namespace N __attribute ((__visibility__ ("hidden")))
+{
+  struct A { };
+}
+
+N::A f() { } // { dg-warning "visibility" "" }
--- gcc/testsuite/g++.dg/ext/visibility/template3.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/template3.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,22 @@
+// PR c++/17470
+// Test that we can give visibility to explicit template instantiations
+
+// { dg-require-visibility "" }
+// { dg-final { scan-hidden "_ZN1AIlE1fEl" } }
+// { dg-final { scan-hidden "_ZN1AIiE1fEi" } }
+// { dg-final { scan-not-hidden "_ZN1AIcE1fEc" } }
+// { dg-final { scan-hidden "_Z8identityIdET_S0_" } }
+// { dg-final { scan-not-hidden "_Z8identityIiET_S0_" } }
+
+template <class T> T identity(T t) { return t; }
+template  __attribute__((visibility("hidden"))) double identity(double);
+template int identity(int);
+
+
+template <class T> struct A { void f (T); };
+template <class T> void A<T>::f (T) { }
+template struct __attribute ((visibility ("hidden"))) A<int>;
+template<> struct  __attribute ((visibility ("hidden"))) A<long> { void f(long); };
+// inherits hidden visibility from its class
+void A<long>::f (long) { }
+template struct A<char>;
--- gcc/testsuite/g++.dg/ext/visibility/prop1.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/prop1.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,23 @@
+// Test for propagation of visibility through template arguments
+
+// { dg-do compile }
+// { dg-require-visibility "" }
+// { dg-final { scan-hidden "_Z1fIN1N1AEEvT_" } }
+// { dg-final { scan-hidden "_Z1hIXadL_ZN1N1iEEEEvv" } }
+
+namespace N __attribute ((__visibility__ ("hidden")))
+{
+  struct A { };
+  int i;
+}
+
+template <class T> void f (T) { }
+template <int *I> void h() { }
+
+void g()
+{
+  N::A a;
+  f(a);
+  h<&N::i>();
+}
+
--- gcc/testsuite/g++.dg/ext/visibility/assign1.C.jj	2006-07-11 10:54:46.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/assign1.C	2006-07-11 10:59:21.000000000 +0200
@@ -6,11 +6,12 @@ struct B {
   B& operator=(const B&);
 };
 
-struct D : public B {
+struct __attribute__((visibility("hidden"))) D : public B {
   // The implicit assignment operator should be hidden.
-} __attribute__((visibility("hidden")));
+};
 
-D d1, d2;
+__attribute__((visibility("hidden"))) D d1;
+__attribute__((visibility("hidden"))) D d2;
 
 void f() {
   d1 = d2;
--- gcc/testsuite/g++.dg/ext/visibility/anon2.C.jj	2006-07-11 10:59:20.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/anon2.C	2006-07-11 10:59:20.000000000 +0200
@@ -0,0 +1,11 @@
+// Test for propagation of anonymous namespace internal linkage
+
+// { dg-do compile }
+// { dg-final { scan-assembler-not "globl.*_Z1fv" } }
+
+namespace
+{
+  struct A { };
+}
+
+A f () { }
--- gcc/testsuite/g++.dg/ext/visibility/anon1.C.jj	2006-07-11 11:26:23.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/anon1.C	2006-07-11 11:23:38.000000000 +0200
@@ -0,0 +1,10 @@
+// PR c++/21581
+// Test for anonymous namespace internal linkage
+
+// { dg-do compile }
+// { dg-final { scan-assembler-not "globl.*_ZN.*1fEv" } }
+
+namespace
+{
+  int f() { }
+}
--- gcc/testsuite/g++.dg/ext/visibility/template2.C.jj	2006-07-11 10:59:20.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/template2.C	2006-07-11 10:59:20.000000000 +0200
@@ -0,0 +1,35 @@
+// PR c++/27000
+// Implicitly instantiated templates should not be affected by
+// #pragma visibility.
+
+/* { dg-do compile } */
+/* { dg-require-visibility "" } */
+/* { dg-final { scan-not-hidden "_ZN1SIiED1Ev" } } */
+/* { dg-final { scan-not-hidden "_ZN1SIiEC1ERKi" } } */
+
+template <class T>
+struct S
+{
+  S (const T &);
+  ~S ();
+  T t;
+};
+
+template <class T>
+S<T>::S (const T &x)
+{
+  t = x;
+}
+
+template <class T>
+S<T>::~S ()
+{
+}
+
+#pragma GCC visibility push(hidden)
+struct U
+{
+  S<int> s;
+  U () : s (6) { }
+} u;
+#pragma GCC visibility pop
--- gcc/testsuite/g++.dg/ext/visibility/warn2.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/visibility/warn2.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,19 @@
+// Complain when a class is specified with greater visibility than one of
+// its members' types or bases, and when a declaration has greater
+// visibility than its type.
+
+// { dg-require-visibility "" }
+
+namespace N __attribute ((__visibility__ ("hidden")))
+{
+  struct A { };
+}
+
+struct B
+{				// { dg-warning "visibility" }
+  N::A a;
+};
+
+B f () { }			// { dg-warning "visibility" }
+
+struct C: public N::A { };	// { dg-warning "visibility" }
--- gcc/testsuite/g++.dg/ext/attrib9.C.jj	2006-07-11 10:54:45.000000000 +0200
+++ gcc/testsuite/g++.dg/ext/attrib9.C	2006-07-11 10:59:16.000000000 +0200
@@ -1,5 +1,10 @@
-class __attribute__((unused)) C;	//  { dg-warning "type attributes" }
-struct __attribute__((unused)) S;	//  { dg-warning "type attributes" }
-union __attribute__((unused)) U;	//  { dg-warning "type attributes" }
+class __attribute__((unused)) C;
+struct __attribute__((unused)) S;
+union __attribute__((unused)) U;
 enum e {};
-enum __attribute__((unused)) e;		//  { dg-warning "type attributes" }
+enum __attribute__((unused)) e;	// { dg-warning "already defined" }
+
+struct __attribute((unused)) B *p;	//  { dg-warning "attributes" }
+
+template <class T> struct A { };
+struct __attribute((unused)) A<int>;	//  { dg-warning "attributes" }
--- gcc/testsuite/g++.dg/template/anon2.C.jj	2006-07-11 10:59:21.000000000 +0200
+++ gcc/testsuite/g++.dg/template/anon2.C	2006-07-11 10:59:21.000000000 +0200
@@ -0,0 +1,15 @@
+// PR c++/28279
+// finish_static_data_member_decl was confused by the anonymous
+// namespace causing TREE_PUBLIC to be unset
+
+template<typename T>
+struct is_pointer_impl {
+    static const bool value = true;
+};
+
+namespace {
+  class prefix_name_mapper {};
+}
+
+static const bool val = is_pointer_impl<prefix_name_mapper>::value;
+
--- gcc/testsuite/g++.old-deja/g++.pt/enum5.C.jj	2006-07-11 10:55:06.000000000 +0200
+++ gcc/testsuite/g++.old-deja/g++.pt/enum5.C	2006-07-11 10:59:16.000000000 +0200
@@ -1,4 +1,4 @@
 // { dg-do assemble  }
 
-template <> // { dg-error "" } template declaration of enum
-enum E {e};
+template <>
+enum E {e}; // { dg-error "" } template declaration of enum


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- .cvsignore	29 Jun 2006 12:14:29 -0000	1.158
+++ .cvsignore	11 Jul 2006 11:28:14 -0000	1.159
@@ -1 +1 @@
-gcc-4.1.1-20060629.tar.bz2
+gcc-4.1.1-20060711.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gcc41.spec	29 Jun 2006 12:14:29 -0000	1.77
+++ gcc41.spec	11 Jul 2006 11:28:14 -0000	1.78
@@ -1,6 +1,6 @@
-%define DATE 20060629
+%define DATE 20060711
 %define gcc_version 4.1.1
-%define gcc_release 6
+%define gcc_release 7
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -35,11 +35,13 @@
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
 # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
 # Need binutils which support .weakref >= 2.16.91.0.3-1
-BuildRequires: binutils >= 2.16.91.0.3-1
+# Need binutils which support --hash-style=gnu >= 2.17.50.0.2-7
+BuildRequires: binutils >= 2.17.50.0.2-7
 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
 # Make sure pthread.h doesn't contain __thread tokens
 # Make sure glibc supports stack protector
-BuildRequires: glibc-devel >= 2.3.90-2
+# Make sure glibc supports DT_GNU_HASH
+BuildRequires: glibc-devel >= 2.4.90-13
 BuildRequires: elfutils-devel >= 0.72
 %ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
 # Make sure glibc supports TFmode long double
@@ -64,7 +66,8 @@
 # On ppc64, need omit dot symbols support and --non-overlapping-opd
 # Need binutils that owns /usr/bin/c++filt
 # Need binutils that support .weakref
-Requires: binutils >= 2.16.91.0.3-1
+# Need binutils that supports --hash-style=gnu
+Requires: binutils >= 2.17.50.0.2-7
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
@@ -123,8 +126,8 @@
 Patch22: gcc41-pr26881.patch
 Patch23: gcc41-pr27793.patch
 Patch24: gcc41-pr26885.patch
-Patch25: gcc41-pr26991.patch
-Patch26: gcc41-rh195924.patch
+Patch25: gcc41-hash-style-gnu.patch
+Patch26: gcc41-visibility.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -427,8 +430,8 @@
 %patch22 -p0 -b .pr26881~
 %patch23 -p0 -b .pr27793~
 %patch24 -p0 -b .pr26885~
-%patch25 -p0 -b .pr26991~
-%patch26 -p0 -b .rh195924~
+%patch25 -p0 -b .hash-style-gnu~
+%patch26 -p0 -b .visibility~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1470,6 +1473,19 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-7
+- update from gcc-4_1-branch (-r115058:115330)
+  - PRs c++/13983, c++/17519, c++/18681, c++/18698, c++/26577, c++/27019,
+	c++/27424, c++/27768, c++/27820, c++/28114, fortran/23420,
+	fortran/23862, fortran/24748, fortran/26801, fortran/27965,
+	fortran/28081, fortran/28094, fortran/28167, fortran/28174,
+	fortran/28213, fortran/28237, middle-end/27428, target/28084,
+	target/28207, tree-optimization/28218
+- C++ visibility fixes (Jason Merrill, PRs c++/17470, c++/19134,
+  c++/21581, c++/21675, c++/25915, c++/26612, c++/26905, c++/26984,
+  c++/27000, c++/28215, c++/28279)
+- use --hash-style=gnu by default
+
 * Thu Jun 29 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-6
 - update from gcc-4_1-branch (-r114766:115058)
   - PRs c++/27821, c++/28109, c++/28110, c++/28112, fortran/16206,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- sources	29 Jun 2006 12:14:29 -0000	1.160
+++ sources	11 Jul 2006 11:28:15 -0000	1.161
@@ -1 +1 @@
-3e0f03bd8a9307f7dd0d5af2d71378ab  gcc-4.1.1-20060629.tar.bz2
+226d8504785cdba0168b11e61c64286a  gcc-4.1.1-20060711.tar.bz2


--- gcc41-pr26991.patch DELETED ---


--- gcc41-rh195924.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 11:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 07:44:27 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.124,1.125 su.pamd,1.8,1.9
Message-ID: <200607111144.k6BBiRjV014939@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	coreutils.spec su.pamd 
Log Message:
* Tue Jul 11 2006 Tomas Mraz <tmraz at redhat.com> 5.97-3
- allow root to su to expired user (#152420)



Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- coreutils.spec	29 Jun 2006 09:06:14 -0000	1.124
+++ coreutils.spec	11 Jul 2006 11:44:24 -0000	1.125
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 2
+Release: 3
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -272,6 +272,9 @@
 /sbin/runuser
 
 %changelog
+* Tue Jul 11 2006 Tomas Mraz <tmraz at redhat.com> 5.97-3
+- allow root to su to expired user (#152420)
+
 * Thu Jun 29 2006 Tim Waugh <twaugh at redhat.com> 5.97-2
 - Allow 'sort +1 -2' (patch from upstream).
 


Index: su.pamd
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/su.pamd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- su.pamd	2 Jan 2006 14:37:54 -0000	1.8
+++ su.pamd	11 Jul 2006 11:44:24 -0000	1.9
@@ -5,6 +5,7 @@
 # Uncomment the following line to require a user to be in the "wheel" group.
 #auth		required	pam_wheel.so use_uid
 auth		include		system-auth
+account		sufficient	pam_succeed_if.so uid = 0 use_uid quiet
 account		include		system-auth
 password	include		system-auth
 session		include		system-auth



From fedora-cvs-commits at redhat.com  Tue Jul 11 12:53:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 08:53:52 -0400
Subject: rpms/apmd/devel apmd.spec,1.23,1.24
Message-ID: <200607111253.k6BCrq2x032750@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/apmd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32646

Modified Files:
	apmd.spec 
Log Message:
- Added missing buildrequires: libtool



Index: apmd.spec
===================================================================
RCS file: /cvs/dist/rpms/apmd/devel/apmd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apmd.spec	7 Feb 2006 10:53:19 -0000	1.23
+++ apmd.spec	11 Jul 2006 12:53:49 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops.
 Name: apmd
 Version: 3.2.2
-Release: 3.2
+Release: 4
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -15,6 +15,7 @@
 Group: System Environment/Daemons
 Prereq: chkconfig
 Requires: pm-utils
+BuildRequires: libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: %{ix86}
 
@@ -95,6 +96,9 @@
 %config /etc/sysconfig/apm-scripts/*
 
 %changelog
+* Tue Jul 11 2006 Phil Knirsch <pknirsch at redhat.com> - 1:3.2.2-4
+- Added missing buildrequires: libtool (#197095)
+
 * 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
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 13:13:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 09:13:05 -0400
Subject: rpms/kdebase/devel .cvsignore, 1.49, 1.50 kdebase.spec, 1.195,
	1.196 sources, 1.68, 1.69
Message-ID: <200607111313.k6BDD56O005478@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
- cleanup config files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	1 Jun 2006 15:53:36 -0000	1.49
+++ .cvsignore	11 Jul 2006 13:13:02 -0000	1.50
@@ -23,3 +23,4 @@
 kde-redhat-config-3.5-fc5-0.2.tar.bz2
 kdebase-3.5.2.tar.bz2
 kdebase-3.5.3.tar.bz2
+kde-redhat-config-3.5-fc5-0.3.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- kdebase.spec	11 Jul 2006 10:50:58 -0000	1.195
+++ kdebase.spec	11 Jul 2006 13:13:02 -0000	1.196
@@ -29,7 +29,7 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
+Source4: kde-redhat-config-3.5-fc5-0.3.tar.bz2
 Source5: kde-np
 Source6: logrotate-kdm
 Source7: mailsettings.cc
@@ -553,6 +553,7 @@
 
 %changelog
 * Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-9
+- cleanup config files
 - upstream patches,
     #kde127971 hard Drive device icons do not show on desktop
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	1 Jun 2006 15:53:36 -0000	1.68
+++ sources	11 Jul 2006 13:13:02 -0000	1.69
@@ -1,2 +1,2 @@
-a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2
 9cb6b8291c4f3f986e16f72129e8fcd0  kdebase-3.5.3.tar.bz2
+fcd1283fbdc542b1d484bbb4aa273980  kde-redhat-config-3.5-fc5-0.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 13:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 09:34:56 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.39,1.40
Message-ID: <200607111334.k6BDYuQe026897@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	cpufreq-utils.spec 
Log Message:
- buildrequire libsysfs-devel


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cpufreq-utils.spec	9 Jul 2006 18:50:41 -0000	1.39
+++ cpufreq-utils.spec	11 Jul 2006 13:34:53 -0000	1.40
@@ -8,7 +8,7 @@
 Source:         cpufrequtils-%{version}.tar.bz2
 Patch0:         disable-gsic.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:  sysfsutils-devel gettext
+BuildRequires:  libsysfs-devel gettext
 # pulls in automake and autoconf
 BuildRequires:  libtool
 ExclusiveArch:  %{ix86} x86_64 ppc ppc64
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Tue Jul 11 2006 Karsten Hopp <karsten at redhat.de>
+- buildrequire libsysfs-devel
+
 * Wed Jul  9 2006 Dave Jones <davej at redhat.com>
 - Rebuild against new libsysfs
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 13:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 09:52:55 -0400
Subject: rpms/xen/devel xen-3.0.2-config-allow-unix-server.patch, NONE,
	1.1 xen.spec, 1.118, 1.119
Message-ID: <200607111352.k6BDqttJ014655@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	xen.spec 
Added Files:
	xen-3.0.2-config-allow-unix-server.patch 
Log Message:
Added require to use libvirt >= 0.1.2 and stop the httpd server, use the 
safer unix socket based one instead, Daniel


xen-3.0.2-config-allow-unix-server.patch:
 xend-config.sxp |    4 !!!!
 1 files changed, 4 modifications(!)

--- NEW FILE xen-3.0.2-config-allow-unix-server.patch ---
*** xen-3.0.2/tools/examples/xend-config.sxp.orig	2006-06-07 12:53:18.000000000 +0200
--- xen-3.0.2/tools/examples/xend-config.sxp	2006-07-11 15:43:47.000000000 +0200
***************
*** 15,27 ****
  #(loglevel DEBUG)
  
  #(xend-http-server no)
! #(xend-unix-server no)
  #(xend-tcp-xmlrpc-server no)
  #(xend-unix-xmlrpc-server yes)
  #(xend-relocation-server no)
  (xend-relocation-server yes)
  
! #(xend-unix-path /var/lib/xend/xend-socket)
  
  # Port xend should use for the HTTP interface, if xend-http-server is set.
  #(xend-port            8000)
--- 15,27 ----
  #(loglevel DEBUG)
  
  #(xend-http-server no)
! (xend-unix-server yes)
  #(xend-tcp-xmlrpc-server no)
  #(xend-unix-xmlrpc-server yes)
  #(xend-relocation-server no)
  (xend-relocation-server yes)
  
! (xend-unix-path /var/lib/xend/xend-socket)
  
  # Port xend should use for the HTTP interface, if xend-http-server is set.
  #(xend-port            8000)


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- xen.spec	11 Jul 2006 01:39:10 -0000	1.118
+++ xen.spec	11 Jul 2006 13:52:53 -0000	1.119
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 11
+Release: 12
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -21,7 +21,7 @@
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
-Patch101: xen-config-allow-http.patch
+Patch102: xen-3.0.2-config-allow-unix-server.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
@@ -38,6 +38,7 @@
 Requires: bridge-utils
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires: udev >= 059
+Requires: libvirt >= 0.1.2
 Requires: libvirt-python
 Requires: xen-libs = %{version}-%{release}
 Prereq: chkconfig
@@ -85,7 +86,7 @@
 
 # config patches
 %patch100 -p1
-%patch101 -p1
+%patch102 -p1
 
 cp %{SOURCE2} .
 
@@ -197,6 +198,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Jul 11 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-12
+- bump libvirt requires to 0.1.2
+- drop xend httpd localhost server and use the unix socket instead
+
 * Mon Jul 10 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-11
 - split into main packages + -libs and -devel subpackages for #198260
 - add patch from jfautley to allow specifying other bridge for 



From fedora-cvs-commits at redhat.com  Tue Jul 11 14:09:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 10:09:23 -0400
Subject: rpms/kdelibs/FC-5 kdelibs-3.5.3-kde#106795.patch, NONE,
	1.1 kdelibs-3.5.3-kde#123307.patch, NONE, 1.1 kdelibs.spec,
	1.134, 1.135
Message-ID: <200607111409.k6BE9N07018800@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#106795.patch kdelibs-3.5.3-kde#123307.patch 
Log Message:
- fix #198333 ??? KDE update loses Control Centre
- upstream patches:
     kde#123307 - Find previous does nothing sometimes
     kde#106795 - konqueror crash
     kde#128760 - Mistake in picture placing on page


kdelibs-3.5.3-kde#106795.patch:
 html_baseimpl.cpp |   19 +++++++++++++++----
 html_baseimpl.h   |    3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#106795.patch ---
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 559959)
+++ khtml/html/html_baseimpl.cpp	(Revision 559960)
@@ -445,10 +445,21 @@
     noresize = false;
 
     m_resizing = false;
+
+    m_onLoad = m_onUnLoad = 0;
 }
 
 HTMLFrameSetElementImpl::~HTMLFrameSetElementImpl()
 {
+    //### this is likely not quite right since we may be effectively "overriding" some old value,
+    //which needs to be recomputed, but this is better than crashing...
+    if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+
+    if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+
+
     delete [] m_rows;
     delete [] m_cols;
 }
@@ -491,12 +502,12 @@
             frameborder = false;
         break;
     case ATTR_ONLOAD:
-        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT,
-	    getDocument()->createHTMLEventListener(attr->value().string(), "onload", this));
+        m_onLoad = getDocument()->createHTMLEventListener(attr->value().string(), "onload", this);
+        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, m_onLoad);
         break;
     case ATTR_ONUNLOAD:
-        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT,
-	    getDocument()->createHTMLEventListener(attr->value().string(), "onunload", this));
+        m_onUnLoad = getDocument()->createHTMLEventListener(attr->value().string(), "onunload", this);
+        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, m_onUnLoad);
         break;
     default:
         HTMLElementImpl::parseAttribute(attr);
Index: khtml/html/html_baseimpl.h
===================================================================
--- khtml/html/html_baseimpl.h	(Revision 559959)
+++ khtml/html/html_baseimpl.h	(Revision 559960)
@@ -149,6 +149,9 @@
     bool frameBorderSet : 1;
     bool noresize : 1;
     bool m_resizing : 1;  // is the user resizing currently
+    
+    EventListener* m_onLoad;
+    EventListener* m_onUnLoad;
 };
 
 // -------------------------------------------------------------------------

kdelibs-3.5.3-kde#123307.patch:
 katesearch.cpp |   36 ++++++++++++++++++++++++++++++------
 katesearch.h   |    4 ++--
 2 files changed, 32 insertions(+), 8 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#123307.patch ---
Index: kate/part/katesearch.cpp
===================================================================
--- kate/part/katesearch.cpp	(Revision 558716)
+++ kate/part/katesearch.cpp	(Revision 558717)
@@ -216,7 +216,7 @@
   search( searchFlags );
 }
 
-void KateSearch::findAgain( bool back )
+void KateSearch::findAgain( bool reverseDirection )
 {
   SearchFlags searchFlags;
   searchFlags.caseSensitive = KateViewConfig::global()->searchFlags() & KFindDialog::CaseSensitive;
@@ -231,7 +231,9 @@
   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
   searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
 
-  searchFlags.backward = searchFlags.backward != back;
+  if (reverseDirection)
+    searchFlags.backward = !searchFlags.backward;
+
   searchFlags.fromBeginning = false;
   searchFlags.prompt = true; // ### why is the above assignment there?
   s.cursor = getCursor();
Index: kate/part/katesearch.h
===================================================================
--- kate/part/katesearch.h	(Revision 558716)
+++ kate/part/katesearch.h	(Revision 558717)
@@ -113,7 +113,7 @@
      * @param flags OR'd combination of KFindDialog::Options
      */
     void replace( const QString &pattern, const QString &replacement, long flags );
-    void findAgain( bool back );
+    void findAgain( bool reverseDirection );
 
   private slots:
     void replaceSlot();
Index: kate/part/katesearch.cpp
===================================================================
--- kate/part/katesearch.cpp	(Revision 559492)
+++ kate/part/katesearch.cpp	(Revision 559493)
@@ -141,7 +141,7 @@
     s.selEnd   = KateTextCursor( m_view->selEndLine(),   m_view->selEndCol()   );
     s.cursor   = s.flags.backward ? s.selEnd : s.selBegin;
   } else {
-    s.cursor = getCursor();
+    s.cursor = getCursor( searchFlags );
   }
 
   s.wrappedEnd = s.cursor;
@@ -207,7 +207,7 @@
     s.selEnd   = KateTextCursor( m_view->selEndLine(), m_view->selEndCol()   );
     s.cursor   = s.flags.backward ? s.selEnd : s.selBegin;
   } else {
-    s.cursor = getCursor();
+    s.cursor = getCursor( searchFlags );
   }
 
   s.wrappedEnd = s.cursor;
@@ -236,8 +236,8 @@
 
   searchFlags.fromBeginning = false;
   searchFlags.prompt = true; // ### why is the above assignment there?
-  s.cursor = getCursor();
 
+  s.cursor = getCursor( searchFlags );
   search( searchFlags );
 }
 
@@ -547,8 +547,15 @@
   return str;
 }
 
-KateTextCursor KateSearch::getCursor()
+KateTextCursor KateSearch::getCursor( SearchFlags flags )
 {
+  if (flags.backward && !flags.selected && view()->hasSelection())
+  {
+    // We're heading backwards (and not within a selection),
+    // the selection might start before the cursor.
+    return KMIN( KateTextCursor(view()->selStartLine(), view()->selStartCol()),
+                 KateTextCursor(view()->cursorLine(), view()->cursorColumnReal()));
+  }
   return KateTextCursor(view()->cursorLine(), view()->cursorColumnReal());
 }
 
@@ -586,6 +593,21 @@
   //kdDebug() << "Searching at " << line << ", " << col << endl;
 //   kdDebug()<<"KateSearch::doSearch: "<<line<<", "<<col<<", "<<backward<<endl;
 
+  if (backward)
+  {
+    KateDocCursor docCursor(line, col, doc());
+
+    // If we're at the top of the document, we're not gonna find anything, so bail.
+    if (docCursor.line() == 0 && docCursor.col() == 0)
+      return false;
+
+    // Move one step backward before searching, if this is a "find again", we don't
+    // want to find the same match.
+    docCursor.moveBackward(1);
+    line = docCursor.line();
+    col = docCursor.col();
+  }
+
   do {
       if( regExp ) {
         m_re = QRegExp( text, caseSensitive );
Index: kate/part/katesearch.h
===================================================================
--- kate/part/katesearch.h	(Revision 559492)
+++ kate/part/katesearch.h	(Revision 559493)
@@ -139,7 +139,7 @@
     void skipOne();
 
     QString getSearchText();
-    KateTextCursor getCursor();
+    KateTextCursor getCursor( SearchFlags flags );
     bool doSearch( const QString& text );
     void exposeFound( KateTextCursor &cursor, int slen );
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdelibs.spec	4 Jul 2006 21:56:02 -0000	1.134
+++ kdelibs.spec	11 Jul 2006 14:09:20 -0000	1.135
@@ -19,7 +19,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 0.3.fc5
+Release: 0.4.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -61,6 +61,9 @@
 Patch108: kdelibs-3.5.3-kde#128902.patch
 Patch109: kdelibs-3.5.3-kde#67849.patch
 Patch110: kdelibs-3.5.3-kde#81806.patch
+Patch111: kdelibs-3.5.3-kde#128760.patch
+Patch112: kdelibs-3.5.3-kde#123307.patch
+Patch113: kdelibs-3.5.3-kde#106795.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -202,6 +205,9 @@
 %patch108 -p0 -b .kde#128902
 %patch109 -p0 -b .kde#67849
 %patch110 -p0 -b .kde#81806
+%patch111 -p0 -b .kde#128760
+%patch112 -p0 -b .kde#130252
+%patch113 -p0 -b .kde#106795
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -293,6 +299,7 @@
 pushd %{buildroot}%{_sysconfdir}/xdg/menus/
    mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
    ln -s applications-merged kde-applications-merged
+   ln -s ../../xdg.d/kde/menus/applications.menu kde-applications.menu
 popd
 echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
 rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
@@ -422,6 +429,13 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.4.fc5
+- fix #198333 ??? KDE update loses Control Centre
+- upstream patches:
+     kde#123307 - Find previous does nothing sometimes
+     kde#106795 - konqueror crash
+     kde#128760 - Mistake in picture placing on page
+
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - apply upstream patches,
    fix #128940/#81806/#57159/#118277/#123315/#65546/#128842/#128902/#67849/#81806



From fedora-cvs-commits at redhat.com  Tue Jul 11 15:12:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 11:12:06 -0400
Subject: rpms/evolution/devel evolution-2.7.3-filter-datespec.patch, 1.1,
	1.2 evolution.spec, 1.161, 1.162
Message-ID: <200607111512.k6BFC6xH019463@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution-2.7.3-filter-datespec.patch evolution.spec 
Log Message:
- Update patch for RH bug #190359.


evolution-2.7.3-filter-datespec.patch:
 filter-datespec.c |   68 +++++++++++++++++++++++++++++--------
 filter-datespec.h |    3 +
 filter.glade      |   99 +++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 143 insertions(+), 27 deletions(-)

Index: evolution-2.7.3-filter-datespec.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.3-filter-datespec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.3-filter-datespec.patch	27 Jun 2006 20:44:47 -0000	1.1
+++ evolution-2.7.3-filter-datespec.patch	11 Jul 2006 15:12:03 -0000	1.2
@@ -1,16 +1,428 @@
---- evolution-2.7.3/filter/filter-datespec.c.filter-datespec	2005-08-09 19:29:27.000000000 -0400
-+++ evolution-2.7.3/filter/filter-datespec.c	2006-06-27 15:56:18.000000000 -0400
-@@ -82,6 +82,13 @@
- 	{ 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 },
- 	{ 2419200, ngettext("1 month ago", "%d months ago"), 12.0 },
- 	{ 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 },
-+	{ -1, ngettext("1 second in the future", "%d seconds in the future"), 59.0 },
-+	{ -60, ngettext("1 minute in the future", "%d minutes in the future"), 59.0 },
-+	{ -3600, ngettext("1 hour in the future", "%d hours in the future"), 23.0 },
-+	{ -86400, ngettext("1 day in the future", "%d days in the future"), 31.0 },
-+	{ -604800, ngettext("1 week in the future", "%d weeks in the future"), 52.0 },
-+	{ -2419200, ngettext("1 month in the future", "%d months in the future"), 12.0 },
-+	{ -31557600, ngettext("1 year in the future", "%d years in the future"), 1000.0 },
+diff -ur evolution-2.7.3/filter/filter-datespec.c my-evolution-2.7.3/filter/filter-datespec.c
+--- evolution-2.7.3/filter/filter-datespec.c	2005-08-09 17:29:27.000000000 -0600
++++ my-evolution-2.7.3/filter/filter-datespec.c	2006-06-28 20:51:01.000000000 -0600
+@@ -61,8 +61,10 @@
+ 
+ typedef struct _timespan {
+ 	guint32 seconds;
+-	const char *singular;
+-	const char *plural;
++	const char *past_singular;
++	const char *past_plural;
++	const char *future_singular;
++	const char *future_plural;
+ 	float max;
+ } timespan;
+ 
+@@ -75,13 +77,13 @@
+ #define ngettext(a, b)  a, b
+ 
+ static const timespan timespans[] = {
+-	{ 1, ngettext("1 second ago", "%d seconds ago"), 59.0 },
+-	{ 60, ngettext("1 minute ago", "%d minutes ago"), 59.0 },
+-	{ 3600, ngettext("1 hour ago", "%d hours ago"), 23.0 },
+-	{ 86400, ngettext("1 day ago", "%d days ago"), 31.0 },
+-	{ 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 },
+-	{ 2419200, ngettext("1 month ago", "%d months ago"), 12.0 },
+-	{ 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 },
++	{ 1, ngettext("1 second ago", "%d seconds ago"), ngettext("1 second in the future", "%d seconds in the future"), 59.0 },
++	{ 60, ngettext("1 minute ago", "%d minutes ago"), ngettext("1 minute in the future", "%d minutes in the future"), 59.0 },
++	{ 3600, ngettext("1 hour ago", "%d hours ago"), ngettext("1 hour in the future", "%d hours in the future"), 23.0 },
++	{ 86400, ngettext("1 day ago", "%d days ago"), ngettext("1 day in the future", "%d days in the future"), 31.0 },
++	{ 604800, ngettext("1 week ago", "%d weeks ago"), ngettext("1 week in the future", "%d weeks in the future"), 52.0 },
++	{ 2419200, ngettext("1 month ago", "%d months ago"), ngettext("1 month in the future", "%d months in the future"), 12.0 },
++	{ 31557600, ngettext("1 year ago", "%d years ago"), ngettext("1 year in the future", "%d years in the future"), 1000.0 },
  };
  
  /* now we let the compiler see the real function call */
+@@ -92,7 +94,7 @@
+ 
+ struct _FilterDatespecPrivate {
+ 	GtkWidget *label_button;
+-	GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative;
++	GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative, *option_past_future;
+ 	FilterDatespec_type type;
+ 	int span;
+ };
+@@ -264,7 +266,7 @@
+ get_best_span (time_t val)
+ {
+ 	int i;
+-	
++
+ 	for (i=N_TIMESPANS-1;i>=0;i--) {
+ 		if (val % timespans[i].seconds == 0)
+ 			return i;
+@@ -302,8 +304,18 @@
+ 			
+ 			span = get_best_span(fds->value);
+ 			count = fds->value / timespans[span].seconds;
++			sprintf(buf, ngettext(timespans[span].past_singular, timespans[span].past_plural, count), count);
++		}
++		break;
++	case FDST_X_FUTURE:
++		if (fds->value == 0)
++			label = _("now");
++		else {
++			int span, count;
+ 			
+-			sprintf(buf, ngettext(timespans[span].singular, timespans[span].plural, count), count);
++			span = get_best_span(fds->value);
++			count = fds->value / timespans[span].seconds;
++			sprintf(buf, ngettext(timespans[span].future_singular, timespans[span].future_plural, count), count);
+ 		}
+ 		break;
+ 	}
+@@ -329,6 +341,7 @@
+ 		fds->value = mktime(&tm);
+ 		/* what about timezone? */
+ 		break; }
++	case FDST_X_FUTURE:
+ 	case FDST_X_AGO: {
+ 		int val;
+ 		
+@@ -349,6 +362,8 @@
+ 	struct _FilterDatespecPrivate *p = PRIV(fds);
+ 	
+ 	p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type;
++
++	int note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc.
+ 	
+ 	switch (p->type) {
+ 	case FDST_NOW:
+@@ -368,11 +383,18 @@
+ 		p->span = get_best_span(fds->value);
+ 		gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds);
+ 		gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span);
++		gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 0);
++		break;
++	case FDST_X_FUTURE:
++		p->span = get_best_span(fds->value);
++		gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds);
++		gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span);
++		gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 1);
+ 		break;
+ 	}
+ 	
+-	gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, p->type);
+-	gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, p->type);
++	gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, note_type);
++	gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, note_type);
+ }
+ 
+ 
+@@ -397,6 +419,18 @@
+ }
+ 
+ static void
++set_option_past_future (GtkMenu *menu, FilterDatespec *fds)
++{
++	GtkWidget *w;
++	
++	w = gtk_menu_get_active (menu);
++	if(g_list_index (GTK_MENU_SHELL (menu)->children, w) == 0)
++		fds->type = fds->priv->type = FDST_X_AGO;
++	else
++		fds->type = fds->priv->type = FDST_X_FUTURE;
++}
++
++static void
+ button_clicked (GtkButton *button, FilterDatespec *fds)
+ {
+ 	struct _FilterDatespecPrivate *p = PRIV(fds);
+@@ -424,6 +458,7 @@
+ 	p->calendar_specify = glade_xml_get_widget (gui, "calendar_specify");
+ 	p->spin_relative = glade_xml_get_widget (gui, "spin_relative");
+ 	p->option_relative = glade_xml_get_widget (gui, "option_relative");
++	p->option_past_future = glade_xml_get_widget (gui, "option_past_future");
+ 	
+ 	set_values (fds);
+ 	
+@@ -431,6 +466,8 @@
+ 			  G_CALLBACK (set_option_type), fds);
+ 	g_signal_connect (GTK_OPTION_MENU (p->option_relative)->menu, "deactivate",
+ 			  G_CALLBACK (set_option_relative), fds);
++	g_signal_connect (GTK_OPTION_MENU (p->option_past_future)->menu, "deactivate",
++			  G_CALLBACK (set_option_past_future), fds);
+ 	
+ 	gtk_box_pack_start ((GtkBox *) dialog->vbox, toplevel, TRUE, TRUE, 3);
+ 	
+@@ -486,5 +523,8 @@
+ 	case FDST_X_AGO:
+ 		g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value);
+ 		break;
++	case FDST_X_FUTURE:
++		g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value);
++		break;
+ 	}
+ }
+diff -ur evolution-2.7.3/filter/filter-datespec.h my-evolution-2.7.3/filter/filter-datespec.h
+--- evolution-2.7.3/filter/filter-datespec.h	2002-11-01 16:22:57.000000000 -0700
++++ my-evolution-2.7.3/filter/filter-datespec.h	2006-06-28 17:25:55.000000000 -0600
+@@ -42,6 +42,7 @@
+ 	FDST_NOW,
+ 	FDST_SPECIFIED,
+ 	FDST_X_AGO,
++	FDST_X_FUTURE,
+ } FilterDatespec_type;
+ 
+ struct _FilterDatespec {
+@@ -52,7 +53,7 @@
+ 	
+ 	/* either a timespan, an absolute time, or 0
+ 	 * depending on type -- the above mapping to
+-	 * (X_AGO, SPECIFIED, NOW)
++	 * (X_FUTURE, X_AGO, SPECIFIED, NOW)
+ 	 */
+ 	
+ 	time_t value;
+diff -ur evolution-2.7.3/filter/filter.glade my-evolution-2.7.3/filter/filter.glade
+--- evolution-2.7.3/filter/filter.glade	2005-12-20 11:21:51.000000000 -0700
++++ my-evolution-2.7.3/filter/filter.glade	2006-06-28 17:26:00.000000000 -0600
+@@ -12,6 +12,13 @@
+   <property name="modal">False</property>
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
+ 
+   <child>
+     <widget class="GtkVBox" id="rule_editor">
+@@ -21,7 +28,7 @@
+       <property name="spacing">6</property>
+ 
+       <child>
+-        <widget class="GtkLabel" id="label17">
++	<widget class="GtkLabel" id="label17">
+ 	  <property name="visible">True</property>
+ 	  <property name="label" translatable="yes">Show filters for mail:</property>
+ 	  <property name="use_underline">False</property>
+@@ -33,6 +40,10 @@
+ 	  <property name="yalign">0.5</property>
+ 	  <property name="xpad">0</property>
+ 	  <property name="ypad">0</property>
++	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	  <property name="width_chars">-1</property>
++	  <property name="single_line_mode">False</property>
++	  <property name="angle">0</property>
+ 	</widget>
+ 	<packing>
+ 	  <property name="padding">0</property>
+@@ -86,6 +97,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="padding">0</property>
+@@ -113,6 +128,10 @@
+ 		  <property name="yalign">0.5</property>
+ 		  <property name="xpad">0</property>
+ 		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+@@ -162,6 +181,7 @@
+ 			      <property name="label">gtk-add</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -173,6 +193,7 @@
+ 			      <property name="label" translatable="yes">_Edit</property>
+ 			      <property name="use_underline">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -184,6 +205,7 @@
+ 			      <property name="label">gtk-remove</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -195,6 +217,7 @@
+ 			      <property name="label">gtk-goto-top</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -206,6 +229,7 @@
+ 			      <property name="label">gtk-go-up</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -217,6 +241,7 @@
+ 			      <property name="label">gtk-go-down</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 
+@@ -228,6 +253,7 @@
+ 			      <property name="label">gtk-goto-bottom</property>
+ 			      <property name="use_stock">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			    </widget>
+ 			  </child>
+ 			</widget>
+@@ -278,6 +304,13 @@
+   <property name="modal">False</property>
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
+ 
+   <child>
+     <widget class="GtkVBox" id="filter_datespec">
+@@ -305,6 +338,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="padding">0</property>
+@@ -403,6 +440,10 @@
+ 		  <property name="yalign">0.5</property>
+ 		  <property name="xpad">0</property>
+ 		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+@@ -430,6 +471,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>
+@@ -456,6 +501,10 @@
+ 		  <property name="yalign">0.5</property>
+ 		  <property name="xpad">0</property>
+ 		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+@@ -496,6 +545,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>
+@@ -522,6 +575,10 @@
+ 		  <property name="yalign">0.5</property>
+ 		  <property name="xpad">0</property>
+ 		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+@@ -631,18 +688,32 @@
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkLabel" id="label8">
++		    <widget class="GtkOptionMenu" id="option_past_future">
+ 		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">ago</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">7.45058e-09</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
++		      <property name="can_focus">True</property>
++		      <property name="history">0</property>
++
++		      <child internal-child="menu">
++			<widget class="GtkMenu" id="convertwidget31">
++			  <property name="visible">True</property>
++
++			  <child>
++			    <widget class="GtkMenuItem" id="convertwidget32">
++			      <property name="visible">True</property>
++			      <property name="label" translatable="yes">ago</property>
++			      <property name="use_underline">True</property>
++			    </widget>
++			  </child>
++
++			  <child>
++			    <widget class="GtkMenuItem" id="convertwidget33">
++			      <property name="visible">True</property>
++			      <property name="label" translatable="yes">in the future</property>
++			      <property name="use_underline">True</property>
++			    </widget>
++			  </child>
++			</widget>
++		      </child>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="padding">0</property>
+@@ -677,6 +748,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- evolution.spec	7 Jul 2006 15:25:51 -0000	1.161
+++ evolution.spec	11 Jul 2006 15:12:03 -0000	1.162
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 9
+Release: 10
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -125,7 +125,7 @@
 # RH bug #157505 / Gnome.org bug #303878
 Patch903: evolution-2.7.3-candidate-window-position-calendar.patch
 
-# Gnome.org #211058 - for Trever Adams to test
+# RH bug #190359 / Gnome.org bug #211058
 Patch904: evolution-2.7.3-filter-datespec.patch
 
 # RH bug #175596 / Gnome.org bug #323952
@@ -686,6 +686,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jul 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-10
+- Update patch for RH bug #190359.
+
 * Fri Jul  7 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-9
 - Make "Submit Bug Report" menu item work again (RH #197384).
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 15:23:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 11:23:45 -0400
Subject: rpms/glibc/devel glibc.spec,1.248,1.249
Message-ID: <200607111523.k6BFNjU0006455@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Log Message:
2.4.90-13


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- glibc.spec	11 Jul 2006 10:26:01 -0000	1.248
+++ glibc.spec	11 Jul 2006 15:23:42 -0000	1.249
@@ -35,6 +35,8 @@
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
 Provides: ldconfig
+# The dynamic linker supports DT_GNU_HASH
+Provides: rtld(GNU_HASH)
 Autoreq: false
 Requires: glibc-common = %{version}-%{release}
 %ifarch sparc



From fedora-cvs-commits at redhat.com  Tue Jul 11 15:36:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 11:36:47 -0400
Subject: rpms/gdb/devel gdb-6.3-ppc64syscall-20040622.patch, 1.2,
	1.3 gdb-6.3-ppccfi-20041104.patch, 1.2, 1.3
Message-ID: <200607111536.k6BFalVA010373@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10337

Modified Files:
	gdb-6.3-ppc64syscall-20040622.patch 
	gdb-6.3-ppccfi-20041104.patch 
Log Message:
Fix ppc build.

gdb-6.3-ppc64syscall-20040622.patch:
 rs6000-tdep.c |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 deletions(-)

Index: gdb-6.3-ppc64syscall-20040622.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ppc64syscall-20040622.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-ppc64syscall-20040622.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-ppc64syscall-20040622.patch	11 Jul 2006 15:36:44 -0000	1.3
@@ -8,8 +8,8 @@
 
 Index: gdb-6.5/gdb/rs6000-tdep.c
 ===================================================================
---- gdb-6.5.orig/gdb/rs6000-tdep.c	2006-04-23 11:15:01.000000000 -0300
-+++ gdb-6.5/gdb/rs6000-tdep.c	2006-07-07 00:54:50.000000000 -0300
+--- gdb-6.5.orig/gdb/rs6000-tdep.c	2006-07-11 02:57:24.000000000 -0300
++++ gdb-6.5/gdb/rs6000-tdep.c	2006-07-11 12:32:05.000000000 -0300
 @@ -76,6 +76,7 @@
  
  struct rs6000_framedata
@@ -98,12 +98,15 @@
        if ((op & 0xfc1fffff) == 0x7c0802a6)
  	{			/* mflr Rx */
  	  /* Since shared library / PIC code, which needs to get its
-@@ -1138,7 +1189,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -1138,9 +1189,9 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
  	     we have no line table information or the line info tells
  	     us that the subroutine call is not part of the line
  	     associated with the prologue.  */
 -	  if ((pc - orig_pc) > 8)
 +	  if ((pc - fdata->func_start) > 8)
  	    {
- 	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
+-	      struct symtab_and_line prologue_sal = find_pc_line (orig_pc, 0);
++	      struct symtab_and_line prologue_sal = find_pc_line (fdata->func_start, 0);
  	      struct symtab_and_line this_sal = find_pc_line (pc, 0);
+ 
+ 	      if ((prologue_sal.line == 0) || (prologue_sal.line != this_sal.line))

gdb-6.3-ppccfi-20041104.patch:
 dwarf2-frame.c   |    7 +++++++
 dwarf2-frame.h   |    7 ++++++-
 ppc-linux-tdep.c |   37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

Index: gdb-6.3-ppccfi-20041104.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ppccfi-20041104.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-ppccfi-20041104.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-ppccfi-20041104.patch	11 Jul 2006 15:36:44 -0000	1.3
@@ -9,8 +9,8 @@
 
 Index: gdb-6.5/gdb/dwarf2-frame.c
 ===================================================================
---- gdb-6.5.orig/gdb/dwarf2-frame.c	2006-07-11 02:35:38.000000000 -0300
-+++ gdb-6.5/gdb/dwarf2-frame.c	2006-07-11 02:41:33.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2-frame.c	2006-07-11 12:30:21.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.c	2006-07-11 12:34:43.000000000 -0300
 @@ -1020,6 +1020,13 @@ dwarf2_frame_prev_register (struct frame
          }
        break;
@@ -27,8 +27,8 @@
      }
 Index: gdb-6.5/gdb/dwarf2-frame.h
 ===================================================================
---- gdb-6.5.orig/gdb/dwarf2-frame.h	2006-07-11 02:35:38.000000000 -0300
-+++ gdb-6.5/gdb/dwarf2-frame.h	2006-07-11 02:40:26.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2-frame.h	2006-07-11 12:30:21.000000000 -0300
++++ gdb-6.5/gdb/dwarf2-frame.h	2006-07-11 12:34:43.000000000 -0300
 @@ -51,8 +51,13 @@ enum dwarf2_frame_reg_rule
    DWARF2_FRAME_REG_SAVED_EXP,
    DWARF2_FRAME_REG_SAME_VALUE,
@@ -46,8 +46,8 @@
    DWARF2_FRAME_REG_CFA,		/* Call Frame Address.  */
 Index: gdb-6.5/gdb/ppc-linux-tdep.c
 ===================================================================
---- gdb-6.5.orig/gdb/ppc-linux-tdep.c	2006-07-11 02:35:38.000000000 -0300
-+++ gdb-6.5/gdb/ppc-linux-tdep.c	2006-07-11 02:35:47.000000000 -0300
+--- gdb-6.5.orig/gdb/ppc-linux-tdep.c	2006-07-11 12:30:21.000000000 -0300
++++ gdb-6.5/gdb/ppc-linux-tdep.c	2006-07-11 12:36:03.000000000 -0300
 @@ -39,6 +39,7 @@
  #include "trad-frame.h"
  #include "frame-unwind.h"
@@ -56,12 +56,13 @@
  
  /* The following instructions are used in the signal trampoline code
     on GNU/Linux PPC. The kernel used to use magic syscalls 0x6666 and
-@@ -1019,6 +1020,39 @@ static struct tramp_frame ppc64_linux_si
+@@ -1019,6 +1020,40 @@ static struct tramp_frame ppc64_linux_si
  };
  
  static void
 +ppc_linux_init_reg (struct gdbarch *gdbarch, int regnum,
-+		    struct dwarf2_frame_state_reg *state)
++		    struct dwarf2_frame_state_reg *state,
++		    struct frame_info *frame)
 +{
 +  /* NOTE: REGNUM is a GDB register number and not a DWARF 2 register
 +     number.  */
@@ -96,7 +97,7 @@
  ppc_linux_init_abi (struct gdbarch_info info,
                      struct gdbarch *gdbarch)
  {
-@@ -1076,6 +1110,8 @@ ppc_linux_init_abi (struct gdbarch_info 
+@@ -1076,6 +1111,8 @@ ppc_linux_init_abi (struct gdbarch_info 
        tramp_frame_prepend_unwinder (gdbarch, &ppc64_linux_sighandler_tramp_frame);
      }
    set_gdbarch_regset_from_core_section (gdbarch, ppc_linux_regset_from_core_section);



From fedora-cvs-commits at redhat.com  Tue Jul 11 15:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 11:37:58 -0400
Subject: rpms/rpm/devel rpm-4.4.2-gnuhash.patch, NONE, 1.1 rpm.spec, 1.208,
	1.209
Message-ID: <200607111537.k6BFbwHi010613@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10578

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-gnuhash.patch 
Log Message:
Detect and provide a requirement for DT_GNU_HASH


rpm-4.4.2-gnuhash.patch:
 build/rpmfc.c  |   18 ++++++++++++++++++
 rpmdb/legacy.c |    3 +++
 2 files changed, 21 insertions(+)

--- NEW FILE rpm-4.4.2-gnuhash.patch ---
--- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-11 07:05:43.000000000 -0400
+++ rpm-4.4.2/build/rpmfc.c	2006-07-11 07:09:08.000000000 -0400
@@ -879,6 +879,8 @@
     int isDSO;
     int gotSONAME = 0;
     int gotDEBUG = 0;
+    int gotHASH = 0;
+    int gotGNUHASH = 0;
     static int filter_GLIBC_PRIVATE = 0;
     static int oneshot = 0;
 
@@ -1051,6 +1053,12 @@
 		    default:
 			/*@innercontinue@*/ continue;
 			/*@notreached@*/ /*@switchbreak@*/ break;
+                    case DT_HASH:    
+			gotHASH= 1;
+			/*@innercontinue@*/ continue;
+                    case DT_GNU_HASH:
+			gotGNUHASH= 1;
+			/*@innercontinue@*/ continue;
                     case DT_DEBUG:    
 			gotDEBUG = 1;
 			/*@innercontinue@*/ continue;
@@ -1107,6 +1115,16 @@
     }
     /*@=branchstate =uniondef @*/
 
+    /* For DSOs which use the .gnu_hash section and don't have a .hash
+     * section, we need to ensure that we have a new enough glibc. */ 
+    if (gotGNUHASH && !gotHASH) {
+        ds = rpmdsSingle(RPMTAG_REQUIRENAME, "rtld(GNU_HASH)", "", 
+                         RPMSENSE_FIND_REQUIRES);
+        rpmdsMerge(&fc->requires, ds);
+        rpmfcSaveArg(&fc->ddict, rpmfcFileDep(t, fc->ix, ds));
+        ds = rpmdsFree(ds);
+    }
+
     /* For DSO's, provide the basename of the file if DT_SONAME not found. */
     if (!fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) {
 	depsp = &fc->provides;
--- rpm-4.4.2/rpmdb/legacy.c.gnuhash	2006-07-11 07:07:18.000000000 -0400
+++ rpm-4.4.2/rpmdb/legacy.c	2006-07-11 07:07:44.000000000 -0400
@@ -14,6 +14,9 @@
 #if !defined(DT_GNU_LIBLIST)
 #define	DT_GNU_LIBLIST		0x6ffffef9
 #endif
+#if !defined(DT_GNU_HASH)
+#define	DT_GNU_HASH		0x6ffffef5
+#endif
 
 #endif
 


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- rpm.spec	5 Jul 2006 14:49:45 -0000	1.208
+++ rpm.spec	11 Jul 2006 15:37:56 -0000	1.209
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 27
+Release: 28
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -55,6 +55,7 @@
 Patch27: rpm-4.4.2-noselinux-verify.patch
 Patch28: rpm-4.4.2-python-aslist.patch
 Patch29: rpm-4.4.2-rpmio-ipv6.patch
+Patch30: rpm-4.4.2-gnuhash.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -195,6 +196,7 @@
 #patch6 -p1  -b .matchpathcon
 %patch28 -p1 -b .aslist
 %patch29 -p1 -b .ipv6
+%patch30 -p1 -b .gnuhash
 
 # rebuild configure for ipv6
 autoconf
@@ -591,6 +593,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Tue Jul 11 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-28
+- Detect and provide a requirement for DT_GNU_HASH 
+
 * Wed Jul 05 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-27
 - IPv4/6 and EPSV support by Arkadiusz Miskiewicz <misiek at pld.org.pl>
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 15:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 11:56:16 -0400
Subject: rpms/rpm/devel rpm-4.4.2-gnuhash.patch,1.1,1.2
Message-ID: <200607111556.k6BFuGi9031931@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31861

Modified Files:
	rpm-4.4.2-gnuhash.patch 
Log Message:
Update


rpm-4.4.2-gnuhash.patch:
 rpmfc.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: rpm-4.4.2-gnuhash.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-gnuhash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-gnuhash.patch	11 Jul 2006 15:37:56 -0000	1.1
+++ rpm-4.4.2-gnuhash.patch	11 Jul 2006 15:56:14 -0000	1.2
@@ -1,6 +1,18 @@
---- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-11 07:05:43.000000000 -0400
-+++ rpm-4.4.2/build/rpmfc.c	2006-07-11 07:09:08.000000000 -0400
-@@ -879,6 +879,8 @@
+--- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-11 07:32:22.000000000 -0400
++++ rpm-4.4.2/build/rpmfc.c	2006-07-11 07:53:46.000000000 -0400
+@@ -12,6 +12,11 @@
+ 
+ #if HAVE_GELF_H
+ #include <gelf.h>
++
++#if !defined(DT_GNU_HASH)
++#define	DT_GNU_HASH		0x6ffffef5
++#endif
++
+ #endif
+ 
+ #include "debug.h"
+@@ -879,6 +884,8 @@
      int isDSO;
      int gotSONAME = 0;
      int gotDEBUG = 0;
@@ -9,7 +21,7 @@
      static int filter_GLIBC_PRIVATE = 0;
      static int oneshot = 0;
  
-@@ -1051,6 +1053,12 @@
+@@ -1051,6 +1058,12 @@
  		    default:
  			/*@innercontinue@*/ continue;
  			/*@notreached@*/ /*@switchbreak@*/ break;
@@ -22,7 +34,7 @@
                      case DT_DEBUG:    
  			gotDEBUG = 1;
  			/*@innercontinue@*/ continue;
-@@ -1107,6 +1115,16 @@
+@@ -1107,6 +1120,16 @@
      }
      /*@=branchstate =uniondef @*/
  
@@ -39,15 +51,3 @@
      /* For DSO's, provide the basename of the file if DT_SONAME not found. */
      if (!fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) {
  	depsp = &fc->provides;
---- rpm-4.4.2/rpmdb/legacy.c.gnuhash	2006-07-11 07:07:18.000000000 -0400
-+++ rpm-4.4.2/rpmdb/legacy.c	2006-07-11 07:07:44.000000000 -0400
-@@ -14,6 +14,9 @@
- #if !defined(DT_GNU_LIBLIST)
- #define	DT_GNU_LIBLIST		0x6ffffef9
- #endif
-+#if !defined(DT_GNU_HASH)
-+#define	DT_GNU_HASH		0x6ffffef5
-+#endif
- 
- #endif
- 



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:00:41 -0400
Subject: rpms/gcc/devel gcc41-pr28150.patch, NONE, 1.1 gcc41-pr28170.patch,
	NONE, 1.1 gcc41.spec, 1.78, 1.79
Message-ID: <200607111600.k6BG0fYd001183@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr28150.patch gcc41-pr28170.patch 
Log Message:
4.1.1-7

gcc41-pr28150.patch:
 0 files changed

--- NEW FILE gcc41-pr28150.patch ---
2006-07-06  David Edelsohn  <edelsohn at gnu.org>

	PR target/28150
	* config/rs6000/rs6000.c (rs6000_legitimate_address): Do not allow
	PRE_{INC,DEC} of TFmode.

--- gcc/config/rs6000/rs6000.c	(revision 115228)
+++ gcc/config/rs6000/rs6000.c	(revision 115229)
@@ -3522,6 +3522,7 @@ rs6000_legitimate_address (enum machine_
   if ((GET_CODE (x) == PRE_INC || GET_CODE (x) == PRE_DEC)
       && !ALTIVEC_VECTOR_MODE (mode)
       && !SPE_VECTOR_MODE (mode)
+      && mode != TFmode
       /* Restrict addressing for DI because of our SUBREG hackery.  */
       && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == DImode))
       && TARGET_UPDATE

gcc41-pr28170.patch:
 0 files changed

--- NEW FILE gcc41-pr28170.patch ---
2006-07-06  David Edelsohn  <edelsohn at gnu.org>
	    Alan Modra  <amodra at bigpond.net.au>

	PR target/28170
	* config/rs6000/rs6000.c (insvdi_rshift_rlwimi_p): Correct shiftop
	bounds. Simplify.

--- gcc/config/rs6000/rs6000.c	(revision 115228)
+++ gcc/config/rs6000/rs6000.c	(revision 115229)
@@ -9799,12 +9799,12 @@ effects of instruction do not correspond
 int
 insvdi_rshift_rlwimi_p (rtx sizeop, rtx startop, rtx shiftop)
 {
-  if (INTVAL (startop) < 64
-      && INTVAL (startop) > 32
-      && (INTVAL (sizeop) + INTVAL (startop) < 64)
-      && (INTVAL (sizeop) + INTVAL (startop) > 33)
-      && (INTVAL (sizeop) + INTVAL (startop) + INTVAL (shiftop) < 96)
-      && (INTVAL (sizeop) + INTVAL (startop) + INTVAL (shiftop) >= 64)
+  if (INTVAL (startop) > 32
+      && INTVAL (startop) < 64
+      && INTVAL (sizeop) > 1
+      && INTVAL (sizeop) + INTVAL (startop) < 64
+      && INTVAL (shiftop) > 0
+      && INTVAL (sizeop) + INTVAL (shiftop) < 32
       && (64 - (INTVAL (shiftop) & 63)) >= INTVAL (sizeop))
     return 1;
 


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gcc41.spec	11 Jul 2006 11:28:14 -0000	1.78
+++ gcc41.spec	11 Jul 2006 16:00:29 -0000	1.79
@@ -128,6 +128,8 @@
 Patch24: gcc41-pr26885.patch
 Patch25: gcc41-hash-style-gnu.patch
 Patch26: gcc41-visibility.patch
+Patch27: gcc41-pr28150.patch
+Patch28: gcc41-pr28170.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -432,6 +434,8 @@
 %patch24 -p0 -b .pr26885~
 %patch25 -p0 -b .hash-style-gnu~
 %patch26 -p0 -b .visibility~
+%patch27 -p0 -b .pr28150~
+%patch28 -p0 -b .pr28170~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1481,10 +1485,13 @@
 	fortran/28081, fortran/28094, fortran/28167, fortran/28174,
 	fortran/28213, fortran/28237, middle-end/27428, target/28084,
 	target/28207, tree-optimization/28218
+- use --hash-style=gnu by default
 - C++ visibility fixes (Jason Merrill, PRs c++/17470, c++/19134,
   c++/21581, c++/21675, c++/25915, c++/26612, c++/26905, c++/26984,
   c++/27000, c++/28215, c++/28279)
-- use --hash-style=gnu by default
+- fix ppc insvdi_internal2/3 (David Edelsohn, Alan Modra, #197755,
+  PR target/28170)
+- avoid TFmode PRE_INC/PRE_DEC on ppc (David Edelsohn, PR target/28150)
 
 * Thu Jun 29 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-6
 - update from gcc-4_1-branch (-r114766:115058)



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:03:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:03:01 -0400
Subject: rpms/samba/devel samba-3.0.23-logfiles.patch, NONE,
	1.1 samba-3.0.23-smb.conf.patch, NONE, 1.1 .cvsignore, 1.30,
	1.31 filter-requires-samba.sh, 1.3, 1.4 samba.spec, 1.66,
	1.67 sources, 1.32, 1.33 samba-3.0.21b-smb.conf.patch, 1.1,
	NONE samba-3.0.23rc2-logfiles.patch, 1.1, NONE
Message-ID: <200607111603.k6BG31gA001546@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1491

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec sources 
Added Files:
	samba-3.0.23-logfiles.patch samba-3.0.23-smb.conf.patch 
Removed Files:
	samba-3.0.21b-smb.conf.patch samba-3.0.23rc2-logfiles.patch 
Log Message:
3.0.23


samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE samba-3.0.23-logfiles.patch ---
--- samba-3.0.23rc2/source/lib/popt_common.c.logfiles	2006-06-09 15:30:31.000000000 -0400
+++ samba-3.0.23rc2/source/lib/popt_common.c	2006-06-14 12:20:02.000000000 -0400
@@ -54,7 +54,7 @@
 	else 
 		pname++;
 
-	pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+	pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 	lp_set_logfile(logfile);
 }
 
--- 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.23/packaging/Fedora/smb.conf.logfiles	2006-07-11 11:23:52.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:27:00.000000000 -0400
@@ -63,7 +63,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/local/samba/var/log.%m
+   log file = /usr/local/samba/var/%m.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50

samba-3.0.23-smb.conf.patch:
 smb.conf |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE samba-3.0.23-smb.conf.patch ---
--- samba-3.0.23/packaging/Fedora/smb.conf.upstream	2006-07-11 11:29:05.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:30:45.000000000 -0400
@@ -57,6 +57,9 @@
 # bsd, cups, sysv, plp, lprng, aix, hpux, qnx
 ;   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
 ;  guest account = pcguest


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	6 Jul 2006 18:15:48 -0000	1.30
+++ .cvsignore	11 Jul 2006 16:02:58 -0000	1.31
@@ -1 +1 @@
-samba-3.0.23rc3.tar.gz
+samba-3.0.23.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/filter-requires-samba.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-requires-samba.sh	24 Feb 2005 19:14:18 -0000	1.3
+++ filter-requires-samba.sh	11 Jul 2006 16:02:58 -0000	1.4
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
 


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- samba.spec	6 Jul 2006 18:15:48 -0000	1.66
+++ samba.spec	11 Jul 2006 16:02:58 -0000	1.67
@@ -3,15 +3,15 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.23
-Release: 0.RC3
+Release: 2
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz
-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
+#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz
+Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -33,9 +33,9 @@
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
 Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.23rc2-logfiles.patch
+Patch103: samba-3.0.23-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch105: samba-3.0.21b-smb.conf.patch
+Patch105: samba-3.0.23-smb.conf.patch
 Patch106: samba-3.0.20pre1-man.patch
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.0.23rc3-passwd.patch
@@ -100,8 +100,8 @@
 
 %prep
 # TAG: change for non-pre
-%setup -q -n samba-3.0.23rc3
-# % setup -q
+# % setup -q -n samba-3.0.23rc3
+%setup -q
 
 # copy Red Hat specific scripts
 mkdir packaging/Fedora
@@ -446,6 +446,12 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Tue Jul 11 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-2
+- New upstream release.
+- Use modified filter-requires-samba.sh from packaging/RHEL/setup/
+  to get rid of bogus dependency on perl(Unicode::MapUTF8)
+- Update the -logfiles and -smb.conf patches to work with 3.0.23
+
 * Thu Jul 6 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-0.RC3
 - New upstream RC release.
 - Update the -logfiles, and -passwd patches for


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	6 Jul 2006 18:15:48 -0000	1.32
+++ sources	11 Jul 2006 16:02:58 -0000	1.33
@@ -1 +1 @@
-b60d5aa92fed3cc06f71ff24a0a81704  samba-3.0.23rc3.tar.gz
+f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz


--- samba-3.0.21b-smb.conf.patch DELETED ---


--- samba-3.0.23rc2-logfiles.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:08:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:08:57 -0400
Subject: rpms/libvirt/devel .cvsignore, 1.8, 1.9 libvirt.spec, 1.12,
	1.13 sources, 1.8, 1.9 chown.patch, 1.1, NONE
Message-ID: <200607111608.k6BG8v3S002498@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2421

Modified Files:
	.cvsignore libvirt.spec sources 
Removed Files:
	chown.patch 
Log Message:
Release of 0.1.3, daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jul 2006 14:57:05 -0000	1.8
+++ .cvsignore	11 Jul 2006 16:08:41 -0000	1.9
@@ -5,3 +5,4 @@
 libvirt-0.1.0.tar.gz
 libvirt-0.1.2.tar.gz
 libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libvirt.spec	3 Jul 2006 16:33:09 -0000	1.12
+++ libvirt.spec	11 Jul 2006 16:08:41 -0000	1.13
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.1.2
+Version: 0.1.3
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -15,7 +15,6 @@
 BuildRequires: readline-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
-Patch0: chown.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -45,10 +44,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-touch `find .`
 %configure
 make
 
@@ -107,6 +104,10 @@
 %doc docs/examples/python
 
 %changelog
+* Tue Jul 11 2006 Daniel Veillard <veillard at redhat.com> 0.1.3-1
+- support for HVM Xen guests
+- various bugfixes
+
 * Mon Jul  3 2006 Daniel Veillard <veillard at redhat.com> 0.1.2-1
 - added a proxy mechanism for read only access using httpu
 - fixed header includes paths


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jul 2006 14:57:05 -0000	1.8
+++ sources	11 Jul 2006 16:08:41 -0000	1.9
@@ -1 +1 @@
-bc21aa037148ca48ed4180f63959d760  libvirt-0.1.2.tar.gz
+e820776aec5c51aa527aca1a848a1dc9  libvirt-0.1.3.tar.gz


--- chown.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:11:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:11:02 -0400
Subject: rpms/kdelibs/FC-5 kdelibs-3.5.3-kde#130605.patch, NONE,
	1.1 kdelibs.spec, 1.135, 1.136
Message-ID: <200607111611.k6BGB2PD003099@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#130605.patch 
Log Message:
kde#130605 - konqueror crash


kdelibs-3.5.3-kde#130605.patch:
 html_baseimpl.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#130605.patch ---
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 559990)
+++ khtml/html/html_baseimpl.cpp	(Revision 559991)
@@ -453,13 +453,14 @@
 {
     //### this is likely not quite right since we may be effectively "overriding" some old value,
     //which needs to be recomputed, but this is better than crashing...
-    if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
-        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+    if (getDocument()) {
+        if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+            getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
 
-    if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
-        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+        if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+            getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+    }
 
-
     delete [] m_rows;
     delete [] m_cols;
 }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kdelibs.spec	11 Jul 2006 14:09:20 -0000	1.135
+++ kdelibs.spec	11 Jul 2006 16:10:59 -0000	1.136
@@ -435,6 +435,7 @@
      kde#123307 - Find previous does nothing sometimes
      kde#106795 - konqueror crash
      kde#128760 - Mistake in picture placing on page
+     kde#130605 - konqueror crash
 
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - apply upstream patches,



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:14:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:14:40 -0400
Subject: rpms/kdelibs/FC-5 kdelibs.spec,1.136,1.137
Message-ID: <200607111614.k6BGEe3O004414@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
apply kdelibs-3.5.3-kde#130605.patch



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kdelibs.spec	11 Jul 2006 16:10:59 -0000	1.136
+++ kdelibs.spec	11 Jul 2006 16:14:37 -0000	1.137
@@ -64,6 +64,7 @@
 Patch111: kdelibs-3.5.3-kde#128760.patch
 Patch112: kdelibs-3.5.3-kde#123307.patch
 Patch113: kdelibs-3.5.3-kde#106795.patch
+Patch114: kdelibs-3.5.3-kde#130605.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -208,6 +209,7 @@
 %patch111 -p0 -b .kde#128760
 %patch112 -p0 -b .kde#130252
 %patch113 -p0 -b .kde#106795
+%patch114 -p0 -b .kde#130605
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:23:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:23:49 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#130605.patch, NONE,
	1.1 kdelibs.spec, 1.153, 1.154
Message-ID: <200607111623.k6BGNneX022281@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#130605.patch 
Log Message:
- upstream patches,
    kde#130605 - konqueror crash


kdelibs-3.5.3-kde#130605.patch:
 html_baseimpl.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#130605.patch ---
Index: khtml/html/html_baseimpl.cpp
===================================================================
--- khtml/html/html_baseimpl.cpp	(Revision 559990)
+++ khtml/html/html_baseimpl.cpp	(Revision 559991)
@@ -453,13 +453,14 @@
 {
     //### this is likely not quite right since we may be effectively "overriding" some old value,
     //which needs to be recomputed, but this is better than crashing...
-    if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
-        getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
+    if (getDocument()) {
+        if (m_onLoad && getDocument()->getHTMLEventListener(EventImpl::LOAD_EVENT) == m_onLoad)
+            getDocument()->setHTMLEventListener(EventImpl::LOAD_EVENT, 0);
 
-    if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
-        getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+        if (m_onUnLoad && getDocument()->getHTMLEventListener(EventImpl::UNLOAD_EVENT) == m_onUnLoad)
+            getDocument()->setHTMLEventListener(EventImpl::UNLOAD_EVENT, 0);
+    }
 
-
     delete [] m_rows;
     delete [] m_cols;
 }


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdelibs.spec	10 Jul 2006 09:36:50 -0000	1.153
+++ kdelibs.spec	11 Jul 2006 16:23:46 -0000	1.154
@@ -19,7 +19,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 7
+Release: 8
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -63,6 +63,7 @@
 Patch111: kdelibs-3.5.3-kde#128760.patch
 Patch112: kdelibs-3.5.3-kde#123307.patch
 Patch113: kdelibs-3.5.3-kde#106795.patch
+Patch114: kdelibs-3.5.3-kde#130605.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -206,6 +207,7 @@
 %patch111 -p0 -b .kde#128760
 %patch112 -p0 -b .kde#130252
 %patch113 -p0 -b .kde#106795
+%patch114 -p0 -b .kde#130605
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -429,6 +431,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
+- upstream patches,
+    kde#130605 - konqueror crash
+
 * Mon Jul 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - apply upstream patches,
     #123307 - Find previous does nothing sometimes



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:38:59 -0400
Subject: rpms/rpm/devel rpm-4.4.2-with-neon.patch, NONE, 1.1.2.1 rpm.spec,
	1.207, 1.207.2.1
Message-ID: <200607111638.k6BGcxgZ025876@cvs.devel.redhat.com>

Author: jwhiter

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25724

Modified Files:
      Tag: private-jwhiter-withneon
	rpm.spec 
Added Files:
      Tag: private-jwhiter-withneon
	rpm-4.4.2-with-neon.patch 
Log Message:
-added conditionalization of neon
-updated spec file to include patch


rpm-4.4.2-with-neon.patch:
 rpmdav.c |    8 +++++++
 rpmio.c  |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 rpmrpc.c |   36 ++++++++++++++++++++++++++++++++--
 3 files changed, 106 insertions(+), 4 deletions(-)

--- NEW FILE rpm-4.4.2-with-neon.patch ---
--- rpm-4.4.2/rpmio/rpmio.c.orig	2006-06-30 16:59:29.000000000 -0400
+++ rpm-4.4.2/rpmio/rpmio.c	2006-06-30 17:26:13.000000000 -0400
@@ -455,9 +455,13 @@ static int fdClose( /*@only@*/ void * co
     fdstat_enter(fd, FDSTAT_CLOSE);
     /* HACK: flimsy wiring for davClose */
 /*@-branchstate@*/
-    if (fd->req != NULL)
+    if (fd->req != NULL) {
+#ifdef WITH_NEON
 	rc = davClose(fd);
-    else
+#else
+	return -1;
+#endif
+    } else
 	rc = ((fdno >= 0) ? close(fdno) : -2);
 /*@=branchstate@*/
     fdstat_exit(fd, FDSTAT_CLOSE, rc);
@@ -2029,6 +2033,56 @@ exit:
 }
 /*@=nullstate@*/
 
+#ifndef WITH_NEON
+/*@-nullstate@*/        /* FIX: u->{ctrl,data}->url undef after XurlLink. */
+static /*@null@*/ FD_t httpOpen(const char * url, /*@unused@*/ int flags,
+                /*@unused@*/ mode_t mode, /*@out@*/ urlinfo * uret)
+        /*@globals internalState @*/
+        /*@modifies *uret, internalState @*/
+{
+    urlinfo u = NULL;
+    FD_t fd = NULL;
+
+#if 0   /* XXX makeTempFile() heartburn */
+    assert(!(flags & O_RDWR));
+#endif
+    if (urlSplit(url, &u))
+        goto exit;
+
+    if (u->ctrl == NULL)
+        u->ctrl = fdNew("persist ctrl (httpOpen)");
+    if (u->ctrl->nrefs > 2 && u->data == NULL)
+        u->data = fdNew("persist data (httpOpen)");
+
+    if (u->ctrl->url == NULL)
+        fd = fdLink(u->ctrl, "grab ctrl (httpOpen persist ctrl)");
+    else if (u->data->url == NULL)
+        fd = fdLink(u->data, "grab ctrl (httpOpen persist data)");
+    else
+        fd = fdNew("grab ctrl (httpOpen)");
+
+    if (fd) {
+        fdSetIo(fd, ufdio);
+        fd->ftpFileDoneNeeded = 0;
+        fd->rd_timeoutsecs = httpTimeoutSecs;
+        fd->contentLength = fd->bytesRemain = -1;
+        fd->url = urlLink(u, "url (httpOpen)");
+        fd = fdLink(fd, "grab data (httpOpen)");
+        fd->urlType = URL_IS_HTTP;
+    }
+
+exit:
+/*@-boundswrite@*/
+    if (uret)
+        *uret = u;
+/*@=boundswrite@*/
+    /*@-refcounttrans@*/
+    return fd;
+    /*@=refcounttrans@*/
+}
+/*@=nullstate@*/
+#endif
+
 static /*@null@*/ FD_t ufdOpen(const char * url, int flags, mode_t mode)
 	/*@globals h_errno, fileSystem, internalState @*/
 	/*@modifies fileSystem, internalState @*/
@@ -2067,7 +2121,11 @@ fprintf(stderr, "*** ufdOpen(%s,0x%x,0%o
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
     case URL_IS_HKP:
+#ifdef WITH_NEON
 	fd = davOpen(url, flags, mode, &u);
+#else
+	fd = httpOpen(url, flags, mode, &u);
+#endif
 	if (fd == NULL || u == NULL)
 	    break;
 
@@ -2075,7 +2133,11 @@ fprintf(stderr, "*** ufdOpen(%s,0x%x,0%o
 		?  ((flags & O_APPEND) ? "PUT" :
 		   ((flags & O_CREAT) ? "PUT" : "PUT"))
 		: "GET");
+#ifdef WITH_NEON
 	u->openError = davReq(fd, cmd, path);
+#else
+	u->openError = httpReq(fd, cmd, path);
+#endif
 	if (u->openError < 0) {
 	    /* XXX make sure that we can exit through ufdClose */
 	    fd = fdLink(fd, "error ctrl (ufdOpen HTTP)");
--- rpm-4.4.2/rpmio/rpmdav.c.orig	2006-06-30 16:59:36.000000000 -0400
+++ rpm-4.4.2/rpmio/rpmdav.c	2006-06-30 17:01:55.000000000 -0400
@@ -61,6 +61,8 @@ _free(/*@only@*/ /*@null@*/ /*@out@*/ co
     return NULL;
 }
 
+#ifdef WITH_NEON
+
 /* =============================================================== */
 static int davFree(urlinfo u)
 	/*@globals internalState @*/
@@ -1370,6 +1372,8 @@ fprintf(stderr, "*** davReadlink(%s) rc 
 }
 #endif	/* NOTYET */
 
+#endif /* WITH_NEON */
+
 /* =============================================================== */
 /*@unchecked@*/
 int avmagicdir = 0x3607113;
@@ -1494,6 +1498,8 @@ fprintf(stderr, "*** avOpendir(%s)\n", p
 }
 /*@=boundswrite@*/
 
+#ifdef WITH_NEON
+
 /* =============================================================== */
 /*@unchecked@*/
 int davmagicdir = 0x8440291;
@@ -1661,4 +1667,6 @@ fprintf(stderr, "*** davOpendir(%s)\n", 
     return (DIR *) avdir;
 /*@=kepttrans@*/
 }
+
+#endif /* WITH_NEON */
 /*@=modfilesys@*/
--- rpm-4.4.2/rpmio/rpmrpc.c.orig	2006-06-30 16:58:05.000000000 -0400
+++ rpm-4.4.2/rpmio/rpmrpc.c	2006-07-06 11:01:06.000000000 -0400
@@ -93,7 +93,11 @@ int Mkdir (const char * path, mode_t mod
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davMkdir(path, mode);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -120,7 +124,7 @@ int Chdir (const char * path)
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
-#ifdef	NOTYET
+#ifdef	WITH_NEON
 	return davChdir(path);
 #else
 	return -2;
@@ -151,7 +155,11 @@ int Rmdir (const char * path)
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davRmdir(path);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -182,7 +190,11 @@ int Rename (const char * oldpath, const 
     switch (oldut) {
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davRename(oldpath, newpath);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_FTP:		/* XXX WRONG WRONG WRONG */
     case URL_IS_PATH:
@@ -280,7 +292,11 @@ int Unlink(const char * path) {
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davUnlink(path);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -1282,7 +1298,11 @@ fprintf(stderr, "*** Stat(%s,%p)\n", pat
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davStat(path, st);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -1311,7 +1331,11 @@ fprintf(stderr, "*** Lstat(%s,%p)\n", pa
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davLstat(path, st);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -1338,7 +1362,7 @@ int Readlink(const char * path, char * b
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:
     case URL_IS_HTTP:
-#ifdef	NOTYET
+#ifdef	WITH_NEON
 	return davReadlink(path, buf, bufsiz);
 #else
 	return -2;
@@ -1489,7 +1513,11 @@ fprintf(stderr, "*** Opendir(%s)\n", pat
 	/*@notreached@*/ break;
     case URL_IS_HTTPS:	
     case URL_IS_HTTP:
+#ifdef WITH_NEON
 	return davOpendir(path);
+#else
+	return -2;
+#endif
 	/*@notreached@*/ break;
     case URL_IS_PATH:
 	path = lpath;
@@ -1515,8 +1543,10 @@ fprintf(stderr, "*** Readdir(%p)\n", (vo
 	return NULL;
     if (ISAVMAGIC(dir))
 	return avReaddir(dir);
+#ifdef WITH_NEON
     if (ISDAVMAGIC(dir))
 	return davReaddir(dir);
+#endif
     return readdir(dir);
 }
 
@@ -1528,7 +1558,9 @@ fprintf(stderr, "*** Closedir(%p)\n", (v
 	return 0;
     if (ISAVMAGIC(dir))
 	return avClosedir(dir);
+#ifdef WITH_NEON
     if (ISDAVMAGIC(dir))
 	return davClosedir(dir);
+#endif
     return closedir(dir);
 }


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.207
retrieving revision 1.207.2.1
diff -u -r1.207 -r1.207.2.1
--- rpm.spec	28 Jun 2006 20:36:18 -0000	1.207
+++ rpm.spec	11 Jul 2006 16:38:44 -0000	1.207.2.1
@@ -54,6 +54,8 @@
 Patch26: rpm-4.4.2-rpmfc-skip.patch
 Patch27: rpm-4.4.2-noselinux-verify.patch
 Patch28: rpm-4.4.2-python-aslist.patch
+Patch39: rpm-4.4.2-with-neon.patch
+
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -192,6 +194,7 @@
 %patch27 -p0 -b .nosever
 %patch6 -p1  -b .matchpathcon
 %patch28 -p1 -b .aslist
+%patch29 -p1 -b .with_neon
 
 %build
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:41:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:41:57 -0400
Subject: rpms/rpm/devel rpm.spec,1.207.2.1,1.207.2.2
Message-ID: <200607111641.k6BGfv8c026749@cvs.devel.redhat.com>

Author: jwhiter

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26655

Modified Files:
      Tag: private-jwhiter-withneon
	rpm.spec 
Log Message:
- fixing typo in spec file



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.207.2.1
retrieving revision 1.207.2.2
diff -u -r1.207.2.1 -r1.207.2.2
--- rpm.spec	11 Jul 2006 16:38:44 -0000	1.207.2.1
+++ rpm.spec	11 Jul 2006 16:41:54 -0000	1.207.2.2
@@ -54,7 +54,7 @@
 Patch26: rpm-4.4.2-rpmfc-skip.patch
 Patch27: rpm-4.4.2-noselinux-verify.patch
 Patch28: rpm-4.4.2-python-aslist.patch
-Patch39: rpm-4.4.2-with-neon.patch
+Patch29: rpm-4.4.2-with-neon.patch
 
 License: GPL
 Conflicts: patch < 2.5



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:44:11 -0400
Subject: rpms/rpm/devel rpm.spec,1.207.2.2,1.207.2.3
Message-ID: <200607111644.k6BGiB7k027613@cvs.devel.redhat.com>

Author: jwhiter

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27417

Modified Files:
      Tag: private-jwhiter-withneon
	rpm.spec 
Log Message:
- fixing release



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.207.2.2
retrieving revision 1.207.2.3
diff -u -r1.207.2.2 -r1.207.2.3
--- rpm.spec	11 Jul 2006 16:41:54 -0000	1.207.2.2
+++ rpm.spec	11 Jul 2006 16:44:09 -0000	1.207.2.3
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 26
+Release: 26.with_neon
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:46:01 -0400
Subject: rpms/libofx/devel libofx.spec,1.15,1.16
Message-ID: <200607111646.k6BGk1RO031931@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30304

Modified Files:
	libofx.spec 
Log Message:
own %{_datadir}/libofx



Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libofx.spec	16 May 2006 20:23:06 -0000	1.15
+++ libofx.spec	11 Jul 2006 16:45:58 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.0
-Release: 2.3
+Release: 3
 Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 Patch: libofx-0.7.0-gcc4.patch
 Requires: openjade >= 1.3.1
@@ -54,7 +54,7 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README totest.txt
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_datadir}/libofx/dtd/*
+%{_datadir}/libofx
 
 %files devel
 %defattr(-,root,root)
@@ -63,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 0.8.0-3
+- own %{_datadir}/libofx
+
 * Mon May 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8.0-2.3
 - Add BR for curl-devel.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:46:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:46:28 -0400
Subject: rpms/libofx/devel libofx.spec,1.16,1.17
Message-ID: <200607111646.k6BGkSvi003665@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1870

Modified Files:
	libofx.spec 
Log Message:
add bug ref


Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libofx.spec	11 Jul 2006 16:45:58 -0000	1.16
+++ libofx.spec	11 Jul 2006 16:46:25 -0000	1.17
@@ -64,7 +64,7 @@
 
 %changelog
 * Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 0.8.0-3
-- own %{_datadir}/libofx
+- own %{_datadir}/libofx (#169336)
 
 * Mon May 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8.0-2.3
 - Add BR for curl-devel.



From fedora-cvs-commits at redhat.com  Tue Jul 11 16:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 12:59:19 -0400
Subject: rpms/rpm/devel rpm.spec,1.209,1.210
Message-ID: <200607111659.k6BGxJt6025697@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25684

Modified Files:
	rpm.spec 
Log Message:
Fix br



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- rpm.spec	11 Jul 2006 15:37:56 -0000	1.209
+++ rpm.spec	11 Jul 2006 16:59:16 -0000	1.210
@@ -76,6 +76,8 @@
 BuildRequires: sqlite-devel
 BuildRequires: gettext-devel
 BuildRequires: libselinux-devel
+#XXX: lua fix this
+BuildRequires: ncurses-devel
 
 # XXX Red Hat 5.2 has not bzip2 or python
 %if %{with_bzip2}



From fedora-cvs-commits at redhat.com  Tue Jul 11 17:24:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 13:24:08 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch, NONE,
	1.1 xorg-x11-server.spec, 1.112, 1.113
Message-ID: <200607111724.k6BHO8xn008687@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch 
Log Message:
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2.fc6
- Remove nonsensical runtime perl dependency.


xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch:
 xf86AutoConfig.c |  167 +++++++++++++++++--------------------------------------
 1 files changed, 54 insertions(+), 113 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86AutoConfig.c.getconfig-pl-die-die-die	2006-07-11 11:05:09.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86AutoConfig.c	2006-07-11 11:10:25.000000000 -0400
@@ -170,6 +170,57 @@
     AppendToList(s, &builtinConfig, &builtinLines);
 }
 
+static const char *
+_xorgVideoPtrToDriverName(pciVideoPtr info)
+{
+    /* the amd/cyrix/nsc mess isn't handled yet */
+
+    switch (info->vendor)
+    {
+	case 0x1142:		    return "apm";
+	case 0xedd8:		    return "ark";
+	case 0x1a03:		    return "ast";
+	case 0x1002:		    return "ati";
+	case 0x102c:		    return "chips";
+	case 0x1013:		    return "cirrus";
+	case 0x8086:
+	    if ((info->chipType == 0x00d1) || (info->chipType == 0x7800))
+		return "i740";
+	    else return "i810";
+	case 0x102b:		    return "mga";
+	case 0x10c8:		    return "neomagic";
+	case 0x105d:		    return "i128";
+	case 0x10de: case 0x12d2:   return "nv";
+	case 0x1163:		    return "rendition";
+	case 0x5333:
+	    switch (info->chipType)
+	    {
+		case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811:
+		case 0x8812: case 0x8814: case 0x8901:
+		    return "s3";
+		case 0x5631: case 0x883d: case 0x8a01: case 0x8a10:
+		case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13:
+		    return "s3virge";
+		default:
+		    return "savage";
+	    }
+	case 0x1039:		    return "sis";
+	case 0x126f:		    return "siliconmotion";
+	case 0x121a:
+	    if (info->chipType < 0x0003)
+	        return "voodoo";
+	    else
+	        return "tdfx";
+	case 0x3d3d:		    return "glint";
+	case 0x1023:		    return "trident";
+	case 0x100c:		    return "tseng";
+	case 0x1106:		    return "via";
+	case 0x15ad:		    return "vmware";
+	default: break;
+    }
+    return NULL;
+}
+
 Bool
 xf86AutoConfig(void)
 {
@@ -177,7 +228,6 @@
     char buf[1024];
     pciVideoPtr *pciptr, info = NULL;
     char *driver = NULL;
-    FILE *gp = NULL;
     ConfigStatus ret;
 
     /* Find the primary device, and get some information about it. */
@@ -194,108 +244,9 @@
 	ErrorF("xf86PciVideoInfo is not set\n");
     }
 
-    if (info) {
-	char *tmp;
-	char *path = NULL, *a, *b;
-	char *searchPath = NULL;
-
-	/*
-	 * Look for the getconfig program first in the xf86ModulePath
-	 * directories, then in GETCONFIG_DIR, then in BINDIR.  If it
-	 * isn't found in any of those locations, just use the normal
-	 * search path.
-	 */
-
-	if (xf86ModulePath) {
-	    a = xnfstrdup(xf86ModulePath);
-	    b = strtok(a, ",");
-	    while (b) {
-		path = xnfrealloc(path,
-				  strlen(b) + 1 + strlen(GET_CONFIG_CMD) + 1);
-		sprintf(path, "%s/%s", b, GET_CONFIG_CMD);
-		if (access(path, X_OK) == 0)
-		    break;
-		b = strtok(NULL, ",");
-	    }
-	    if (!b) {
-		xfree(path);
-		path = NULL;
-	    }
-	    xfree(a);
-	}
-
-	if (!path) {
-	    path = xnfstrdup(GETCONFIG_DIR "/" GET_CONFIG_CMD);
-	    if (access(path, X_OK) != 0) {
-		xfree(path);
-		path = NULL;
-	    }
-	}
-
-#ifdef BINDIR
-	if (!path) {
-	    path = xnfstrdup(BINDIR "/" GET_CONFIG_CMD);
-	    if (access(path, X_OK) != 0) {
-		xfree(path);
-		path = NULL;
-	    }
-	}
-#endif
-
-	if (!path)
-	    path = xnfstrdup(GET_CONFIG_CMD);
-
-	/*
-	 * Build up the config file directory search path:
-	 *
-	 * /etc/X11
-	 * PROJECTROOT/etc/X11
-	 * xf86ModulePath
-	 * PROJECTROOT/lib/X11/getconfig  (GETCONFIG_DIR)
-	 */
-
-	searchPath = xnfalloc(strlen("/etc/X11") + 1 +
-			      strlen(PROJECTROOT "/etc/X11") + 1 +
-			      (xf86ModulePath ? strlen(xf86ModulePath) : 0)
-				+ 1 +
-			      strlen(GETCONFIG_DIR) + 1);
-	strcpy(searchPath, "/etc/X11," PROJECTROOT "/etc/X11,");
-	if (xf86ModulePath && *xf86ModulePath) {
-	    strcat(searchPath, xf86ModulePath);
-	    strcat(searchPath, ",");
-	}
-	strcat(searchPath, GETCONFIG_DIR);
-
-	ErrorF("xf86AutoConfig: Primary PCI is %d:%d:%d\n",
-	       info->bus, info->device, info->func);
-
-	snprintf(buf, sizeof(buf), "%s"
-#ifdef DEBUG
-		 " -D"
-#endif
-		 " -X %d"
-		 " -I %s"
-		 " -v 0x%04x -d 0x%04x -r 0x%02x -s 0x%04x"
-		 " -b 0x%04x -c 0x%04x",
-		 path,
-		 (unsigned int)xorgGetVersion(),
-		 searchPath,
-		 info->vendor, info->chipType, info->chipRev,
-		 info->subsysVendor, info->subsysCard,
-		 info->class << 8 | info->subclass);
-	ErrorF("Running \"%s\"\n", buf);
-	gp = Popen(buf, "r");
-	if (gp) {
-	    if (fgets(buf, sizeof(buf) - 1, gp)) {
-		buf[strlen(buf) - 1] = '\0';
-		tmp = strtok(buf, GETCONFIG_WHITESPACE);
-		if (tmp)
-		    driver = xnfstrdup(tmp);
-	    }
-	}
-	xfree(path);
-	xfree(searchPath);
-    }
+    /* hack to remove the perl dependency at runtime */
+    if (info)
+	driver = _xorgVideoPtrToDriverName(info);
 
     AppendToConfig(BUILTIN_MODULE_SECTION);
     AppendToConfig(BUILTIN_MONITOR_SECTION);
@@ -306,19 +257,12 @@
 	AppendToConfig(buf);
 	ErrorF("New driver is \"%s\"\n", driver);
 	buf[0] = '\t';
-	while (fgets(buf + 1, sizeof(buf) - 2, gp)) {
-	    AppendToConfig(buf);
-	    ErrorF("Extra line: %s", buf);
-	}
 	AppendToConfig(BUILTIN_DEVICE_SECTION_POST);
 	snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION,
 		 driver, 0, driver, 0);
 	AppendToConfig(buf);
     }
 
-    if (gp)
-	Pclose(gp);
-
     for (p = deviceList; *p; p++) {
 	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
 	AppendToConfig(buf);
@@ -341,9 +285,6 @@
     AppendToConfig(BUILTIN_EXTRA);
 #endif
 
-    if (driver)
-	xfree(driver);
-
     xf86MsgVerb(X_DEFAULT, 0,
 		"Using default built-in configuration (%d lines)\n",
 		builtinLines);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xorg-x11-server.spec	10 Jul 2006 18:16:11 -0000	1.112
+++ xorg-x11-server.spec	11 Jul 2006 17:24:06 -0000	1.113
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -46,7 +46,7 @@
 Patch3002:  xorg-x11-server-1.1.0-edid-mode-injection-2.patch
 Patch3003:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
-Patch3005:  xorg-x11-server-1.1.0-pci-driver-detection.patch
+Patch3005:  xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -310,7 +310,7 @@
 %patch3002 -p1 -b .edid2
 %patch3003 -p1 -b .cvt
 %patch3004 -p1 -b .targetrefresh
-%patch3005 -p1 -b .pci-loader
+%patch3005 -p1 -b .getconfig-pl-die-die-die
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -377,6 +377,8 @@
     rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options
     rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample
     rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg
+    rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig
+    rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig.pl
 %if ! %{with_developer_utils}
     rm -f $RPM_BUILD_ROOT%{_bindir}/inb
     rm -f $RPM_BUILD_ROOT%{_bindir}/inl
@@ -387,6 +389,8 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/outw
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
 %endif
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1x*
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5x*
     # Remove all libtool archives (*.la)
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
@@ -472,8 +476,6 @@
 #%doc ChangeLog
 %{_bindir}/X
 %attr(4711, root, root) %{_bindir}/Xorg
-%{_bindir}/getconfig
-%{_bindir}/getconfig.pl
 %{_bindir}/gtf
 %{_bindir}/cvt
 %if %{with_developer_utils}
@@ -547,7 +549,6 @@
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/getconfig.1x*
 %{_mandir}/man1/gtf.1x*
 %{_mandir}/man1/pcitweak.1x*
 %{_mandir}/man1/scanpci.1x*
@@ -558,7 +559,6 @@
 #%{_mandir}/man4/fbdevhw.4x*
 %{_mandir}/man4/fbdevhw.4*
 #%dir %{_mandir}/man5x
-%{_mandir}/man5/getconfig.5x*
 %{_mandir}/man5/xorg.conf.5x*
 %dir %{_localstatedir}/lib/xkb
 %{_localstatedir}/lib/xkb/README.compiled
@@ -636,6 +636,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2.fc6
+- Remove nonsensical runtime perl dependency.
+
 * Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
 - Update to 1.1.1.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 17:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 13:41:15 -0400
Subject: rpms/kdelibs/FC-5 kdelibs-3.5.3-kde#129187.patch, NONE,
	1.1 kdelibs.spec, 1.137, 1.138
Message-ID: <200607111741.k6BHfFPl021002@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#129187.patch 
Log Message:
kde#129187 - konqueror crash when modifying address bar address


kdelibs-3.5.3-kde#129187.patch:
 khtml_part.cpp |   29 ++++++++++++++++++-----------
 khtmlpart_p.h  |    2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#129187.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 556325)
+++ khtml/khtml_part.cpp	(Revision 556326)
@@ -1876,10 +1876,14 @@
     removeJSErrorExtension();
     setSuppressedPopupIndicator( false );
     d->m_openableSuppressedPopups = 0;
-    for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
-       KJS::Window *w = KJS::Window::retrieveWindow( part );
-       if (w)
-           w->forgetSuppressedWindows();
+    for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+          i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+       
+      if (KHTMLPart* part = *i) {
+        KJS::Window *w = KJS::Window::retrieveWindow( part );
+        if (w)
+          w->forgetSuppressedWindows();
+      }
     }
   }
 
@@ -7360,7 +7364,7 @@
 
     if ( enable && originPart ) {
         d->m_openableSuppressedPopups++;
-        if ( d->m_suppressedPopupOriginParts.find( originPart ) == -1 )
+        if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 )
             d->m_suppressedPopupOriginParts.append( originPart );
     }
 
@@ -7405,12 +7409,15 @@
 }
 
 void KHTMLPart::showSuppressedPopups() {
-    for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
-       KJS::Window *w = KJS::Window::retrieveWindow( part );
-       if (w) {
-           w->showSuppressedWindows();
-           w->forgetSuppressedWindows();
-       }
+    for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+          i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+      if (KHTMLPart* part = *i) {
+        KJS::Window *w = KJS::Window::retrieveWindow( part );
+        if (w) {
+            w->showSuppressedWindows();
+            w->forgetSuppressedWindows();
+        }
+      }
     }
     setSuppressedPopupIndicator( false );
     d->m_openableSuppressedPopups = 0;
Index: khtml/khtmlpart_p.h
===================================================================
--- khtml/khtmlpart_p.h	(Revision 556325)
+++ khtml/khtmlpart_p.h	(Revision 556326)
@@ -316,7 +316,7 @@
   KURLLabel* m_statusBarUALabel;
   KURLLabel* m_statusBarJSErrorLabel;
   KURLLabel* m_statusBarPopupLabel;
-  QPtrList<KHTMLPart> m_suppressedPopupOriginParts;
+  QValueList<QGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts;
   int m_openableSuppressedPopups;
   DOM::DocumentImpl *m_doc;
   khtml::Decoder *m_decoder;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kdelibs.spec	11 Jul 2006 16:14:37 -0000	1.137
+++ kdelibs.spec	11 Jul 2006 17:41:13 -0000	1.138
@@ -65,6 +65,7 @@
 Patch112: kdelibs-3.5.3-kde#123307.patch
 Patch113: kdelibs-3.5.3-kde#106795.patch
 Patch114: kdelibs-3.5.3-kde#130605.patch
+Patch115: kdelibs-3.5.3-kde#129187.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -210,6 +211,7 @@
 %patch112 -p0 -b .kde#130252
 %patch113 -p0 -b .kde#106795
 %patch114 -p0 -b .kde#130605
+%patch115 -p0 -b .kde#129187
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -438,6 +440,7 @@
      kde#106795 - konqueror crash
      kde#128760 - Mistake in picture placing on page
      kde#130605 - konqueror crash
+     kde#129187 - konqueror crash when modifying address bar address
 
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc5
 - apply upstream patches,



From fedora-cvs-commits at redhat.com  Tue Jul 11 18:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 14:04:45 -0400
Subject: rpms/gdb/devel gdb-6.3-threaded-watchpoints-20041213.patch, 1.5,
	1.6 gdb-6.3-warnings-20050317.patch, 1.2, 1.3
Message-ID: <200607111804.k6BI4jIJ010842@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10810

Modified Files:
	gdb-6.3-threaded-watchpoints-20041213.patch 
	gdb-6.3-warnings-20050317.patch 
Log Message:
Fix s390x build.

gdb-6.3-threaded-watchpoints-20041213.patch:
 Makefile.in       |    4 
 amd64-linux-nat.c |   14 +-
 breakpoint.c      |  269 +++++++++++++++++++++++++++++++++++++++---------------
 breakpoint.h      |   13 ++
 doc/observer.texi |   10 ++
 i386-linux-nat.c  |   14 +-
 ia64-linux-nat.c  |  125 +++++++++++++++++++++++--
 infrun.c          |   66 +++++++++++--
 linux-nat.c       |   19 +++
 linux-nat.h       |   12 ++
 linux-thread-db.c |   14 ++
 s390-nat.c        |   62 ++++++++++--
 12 files changed, 503 insertions(+), 119 deletions(-)

Index: gdb-6.3-threaded-watchpoints-20041213.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints-20041213.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdb-6.3-threaded-watchpoints-20041213.patch	11 Jul 2006 08:06:55 -0000	1.5
+++ gdb-6.3-threaded-watchpoints-20041213.patch	11 Jul 2006 18:04:20 -0000	1.6
@@ -30,8 +30,8 @@
 
 Index: gdb-6.5/gdb/doc/observer.texi
 ===================================================================
---- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/doc/observer.texi	2006-07-11 05:04:06.000000000 -0300
+--- gdb-6.5.orig/gdb/doc/observer.texi	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/doc/observer.texi	2006-07-11 15:00:15.000000000 -0300
 @@ -122,3 +122,13 @@ haven't been loaded yet.
  @deftypefun void solib_unloaded (struct so_list *@var{solib})
  The shared library specified by @var{solib} has been unloaded.
@@ -48,8 +48,8 @@
 + at end deftypefun
 Index: gdb-6.5/gdb/infrun.c
 ===================================================================
---- gdb-6.5.orig/gdb/infrun.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/infrun.c	2006-07-11 05:04:07.000000000 -0300
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-11 15:00:17.000000000 -0300
 @@ -1703,9 +1703,19 @@ handle_inferior_event (struct execution_
       single step over a watchpoint without disabling the watchpoint.  */
    if (HAVE_STEPPABLE_WATCHPOINT && STOPPED_BY_WATCHPOINT (ecs->ws))
@@ -155,8 +155,8 @@
  	    stop_signal = TARGET_SIGNAL_0;
 Index: gdb-6.5/gdb/breakpoint.c
 ===================================================================
---- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/breakpoint.c	2006-07-11 05:04:08.000000000 -0300
+--- gdb-6.5.orig/gdb/breakpoint.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.c	2006-07-11 15:00:19.000000000 -0300
 @@ -748,6 +748,90 @@ insert_catchpoint (struct ui_out *uo, vo
      }
  }
@@ -503,8 +503,8 @@
       so that a list of breakpoints will come out in order
 Index: gdb-6.5/gdb/breakpoint.h
 ===================================================================
---- gdb-6.5.orig/gdb/breakpoint.h	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/breakpoint.h	2006-07-11 05:04:07.000000000 -0300
+--- gdb-6.5.orig/gdb/breakpoint.h	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/breakpoint.h	2006-07-11 15:00:17.000000000 -0300
 @@ -426,6 +426,11 @@ struct breakpoint
  
      /* Is breakpoint pending on shlib loads?  */
@@ -534,8 +534,8 @@
  /* This function can be used to physically insert eventpoints from the
 Index: gdb-6.5/gdb/linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/linux-nat.c	2006-07-11 02:57:28.000000000 -0300
-+++ gdb-6.5/gdb/linux-nat.c	2006-07-11 05:04:06.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-11 12:32:29.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-11 15:00:15.000000000 -0300
 @@ -36,6 +36,7 @@
  #include "gdbthread.h"
  #include "gdbcmd.h"
@@ -585,8 +585,8 @@
  	    {
 Index: gdb-6.5/gdb/linux-nat.h
 ===================================================================
---- gdb-6.5.orig/gdb/linux-nat.h	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/linux-nat.h	2006-07-11 02:57:28.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-nat.h	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.h	2006-07-11 12:32:29.000000000 -0300
 @@ -63,6 +63,18 @@ struct lwp_info
  
    /* Next LWP in list.  */
@@ -608,8 +608,8 @@
  /* Attempt to initialize libthread_db.  */
 Index: gdb-6.5/gdb/Makefile.in
 ===================================================================
---- gdb-6.5.orig/gdb/Makefile.in	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/Makefile.in	2006-07-11 05:04:08.000000000 -0300
+--- gdb-6.5.orig/gdb/Makefile.in	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/Makefile.in	2006-07-11 15:00:19.000000000 -0300
 @@ -2113,7 +2113,7 @@ i387-tdep.o: i387-tdep.c $(defs_h) $(dou
  	$(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h)
  ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \
@@ -630,8 +630,8 @@
  	$(floatformat_h) $(regcache_h) $(trad_frame_h) $(frame_base_h) \
 Index: gdb-6.5/gdb/linux-thread-db.c
 ===================================================================
---- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/linux-thread-db.c	2006-07-11 05:04:08.000000000 -0300
+--- gdb-6.5.orig/gdb/linux-thread-db.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/linux-thread-db.c	2006-07-11 15:00:18.000000000 -0300
 @@ -36,6 +36,7 @@
  #include "target.h"
  #include "regcache.h"
@@ -680,8 +680,8 @@
  
 Index: gdb-6.5/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 05:04:03.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 15:00:09.000000000 -0300
 @@ -619,10 +619,9 @@ i386_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
@@ -712,8 +712,8 @@
    ptrace (PTRACE_POKEUSER, tid,
 Index: gdb-6.5/gdb/ia64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-11 05:05:36.000000000 -0300
+--- gdb-6.5.orig/gdb/ia64-linux-nat.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/ia64-linux-nat.c	2006-07-11 15:00:00.000000000 -0300
 @@ -29,6 +29,7 @@
  #include "regcache.h"
  #include "ia64-tdep.h"
@@ -903,8 +903,8 @@
  }
 Index: gdb-6.5/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 05:04:03.000000000 -0300
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 15:00:09.000000000 -0300
 @@ -234,10 +234,9 @@ amd64_linux_dr_get (int regnum)
    int tid;
    unsigned long value;
@@ -935,18 +935,17 @@
    ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value);
 Index: gdb-6.5/gdb/s390-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/s390-nat.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/s390-nat.c	2006-07-11 02:57:28.000000000 -0300
-@@ -30,6 +30,8 @@
+--- gdb-6.5.orig/gdb/s390-nat.c	2006-07-11 12:30:23.000000000 -0300
++++ gdb-6.5/gdb/s390-nat.c	2006-07-11 15:00:26.000000000 -0300
+@@ -30,6 +30,7 @@
  #include "linux-nat.h"
  
  #include "s390-tdep.h"
-+#include "linux-nat.h"
 +#include "observer.h"
  
  #include <asm/ptrace.h>
  #include <sys/ptrace.h>
-@@ -114,14 +116,14 @@ fill_fpregset (fpregset_t *regp, int reg
+@@ -114,14 +115,14 @@ fill_fpregset (fpregset_t *regp, int reg
  			      ((char *)regp) + regmap_fpregset[i]);
  }
  
@@ -965,7 +964,7 @@
  
    return tid;
  }
-@@ -205,7 +207,7 @@ store_fpregs (int tid, int regnum)
+@@ -205,7 +206,7 @@ store_fpregs (int tid, int regnum)
  static void
  s390_linux_fetch_inferior_registers (int regnum)
  {
@@ -974,7 +973,7 @@
  
    if (regnum == -1 
        || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
-@@ -221,7 +223,7 @@ s390_linux_fetch_inferior_registers (int
+@@ -221,7 +222,7 @@ s390_linux_fetch_inferior_registers (int
  static void
  s390_linux_store_inferior_registers (int regnum)
  {
@@ -983,7 +982,7 @@
  
    if (regnum == -1 
        || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
-@@ -263,7 +265,7 @@ s390_stopped_by_watchpoint (void)
+@@ -263,7 +264,7 @@ s390_stopped_by_watchpoint (void)
    parea.len = sizeof (per_lowcore);
    parea.process_addr = (addr_t) & per_lowcore;
    parea.kernel_addr = offsetof (struct user_regs_struct, per_info.lowcore);
@@ -992,7 +991,7 @@
      perror_with_name (_("Couldn't retrieve watchpoint status"));
  
    return per_lowcore.perc_storage_alteration == 1
-@@ -271,9 +273,9 @@ s390_stopped_by_watchpoint (void)
+@@ -271,9 +272,9 @@ s390_stopped_by_watchpoint (void)
  }
  
  static void
@@ -1004,7 +1003,7 @@
  
    per_struct per_info;
    ptrace_area parea;
-@@ -310,6 +312,16 @@ s390_fix_watch_points (void)
+@@ -310,6 +311,16 @@ s390_fix_watch_points (void)
      perror_with_name (_("Couldn't modify watchpoint status"));
  }
  
@@ -1021,7 +1020,7 @@
  static int
  s390_insert_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -323,10 +335,24 @@ s390_insert_watchpoint (CORE_ADDR addr, 
+@@ -323,10 +334,24 @@ s390_insert_watchpoint (CORE_ADDR addr, 
    area->next = watch_base;
    watch_base = area;
  
@@ -1031,23 +1030,23 @@
 +  if (iterate_over_lwps (&s390_insert_watchpoint_callback, NULL))
 +    return -1;
 +
-+  return 0;
-+}
-+
+   return 0;
+ }
+ 
 +/* Callback routine to use with iterate_over_lwps to remove a specified
 +   watchpoint from all threads.  */
 +static int
 +s390_remove_watchpoint_callback (struct lwp_info *lwp, void *data)
 +{
 +  s390_fix_watch_points (lwp->ptid);
-   return 0;
- }
- 
++  return 0;
++}
++
 +/* Remove a specified watchpoint from all threads.  */
  static int
  s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
  {
-@@ -348,7 +374,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
+@@ -348,7 +373,11 @@ s390_remove_watchpoint (CORE_ADDR addr, 
    *parea = area->next;
    xfree (area);
  
@@ -1060,7 +1059,7 @@
    return 0;
  }
  
-@@ -364,6 +394,15 @@ s390_region_ok_for_hw_watchpoint (CORE_A
+@@ -364,6 +393,15 @@ s390_region_ok_for_hw_watchpoint (CORE_A
    return 1;
  }
  
@@ -1076,7 +1075,7 @@
  
  void _initialize_s390_nat (void);
  
-@@ -389,4 +428,6 @@ _initialize_s390_nat (void)
+@@ -389,4 +427,6 @@ _initialize_s390_nat (void)
  
    /* Register the target.  */
    linux_nat_add_target (t);

gdb-6.3-warnings-20050317.patch:
 configure                      |    2 ++
 configure.ac                   |    2 ++
 cp-valprint.c                  |    4 ++--
 doublest.c                     |   13 ++++---------
 dwarf2expr.c                   |    2 ++
 dwarf2read.c                   |   14 +++++++++-----
 f-exp.y                        |    2 ++
 gdb-events.c                   |    2 ++
 linespec.c                     |    2 +-
 macroscope.c                   |    9 ++++-----
 mi/mi-cmd-break.c              |    4 ++--
 mi/mi-cmd-disas.c              |    2 +-
 mi/mi-cmd-env.c                |    4 ++--
 mi/mi-getopt.c                 |    2 +-
 mi/mi-main.c                   |    4 ++--
 p-valprint.c                   |    4 ++--
 remote-fileio.c                |   26 +++++++++++++-------------
 remote.c                       |    4 ++--
 s390-tdep.c                    |    6 ++++++
 source.c                       |    4 ++--
 stabsread.c                    |    3 ++-
 symfile.c                      |    2 ++
 target.c                       |    6 ++++++
 testsuite/gdb.base/move-dir.h  |    2 +-
 testsuite/gdb.base/sigrepeat.c |    1 +
 tui/tui-layout.c               |    8 ++++----
 varobj.c                       |   16 ++++++----------
 27 files changed, 85 insertions(+), 65 deletions(-)

Index: gdb-6.3-warnings-20050317.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-warnings-20050317.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-warnings-20050317.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-warnings-20050317.patch	11 Jul 2006 18:04:22 -0000	1.3
@@ -1,7 +1,7 @@
 Index: gdb-6.5/gdb/configure
 ===================================================================
---- gdb-6.5.orig/gdb/configure	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/configure	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/configure	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/configure	2006-07-11 15:01:23.000000000 -0300
 @@ -20125,7 +20125,8 @@ fi
  # gdb/doc/gdbint.texinfo.
  build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
@@ -14,8 +14,8 @@
  if test x${CFLAGS+set} = xset; then
 Index: gdb-6.5/gdb/mi/mi-cmd-env.c
 ===================================================================
---- gdb-6.5.orig/gdb/mi/mi-cmd-env.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/mi/mi-cmd-env.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/mi/mi-cmd-env.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-cmd-env.c	2006-07-11 15:01:23.000000000 -0300
 @@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **a
    static struct mi_opt opts[] =
    {
@@ -36,8 +36,8 @@
    dont_repeat ();
 Index: gdb-6.5/gdb/mi/mi-getopt.c
 ===================================================================
---- gdb-6.5.orig/gdb/mi/mi-getopt.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/mi/mi-getopt.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/mi/mi-getopt.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-getopt.c	2006-07-11 15:01:23.000000000 -0300
 @@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int
    char *optarg;
    static struct mi_opt opts[] =
@@ -49,8 +49,8 @@
    if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1)
 Index: gdb-6.5/gdb/mi/mi-cmd-break.c
 ===================================================================
---- gdb-6.5.orig/gdb/mi/mi-cmd-break.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/mi/mi-cmd-break.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/mi/mi-cmd-break.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-cmd-break.c	2006-07-11 15:01:23.000000000 -0300
 @@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char
      {"c", CONDITION_OPT, 1},
      {"i", IGNORE_COUNT_OPT, 1},
@@ -71,8 +71,8 @@
    /* Parse arguments. */
 Index: gdb-6.5/gdb/mi/mi-cmd-disas.c
 ===================================================================
---- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/mi/mi-cmd-disas.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c	2006-07-11 15:01:22.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-cmd-disas.c	2006-07-11 15:01:23.000000000 -0300
 @@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char 
      {"n", NUM_OPT, 1},
      {"s", START_OPT, 1},
@@ -84,8 +84,8 @@
    /* Get the options with their arguments. Keep track of what we
 Index: gdb-6.5/gdb/mi/mi-main.c
 ===================================================================
---- gdb-6.5.orig/gdb/mi/mi-main.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/mi/mi-main.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/mi/mi-main.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/mi/mi-main.c	2006-07-11 15:01:23.000000000 -0300
 @@ -773,7 +773,7 @@ mi_cmd_data_read_memory (char *command, 
    static struct mi_opt opts[] =
    {
@@ -106,8 +106,8 @@
    while (1)
 Index: gdb-6.5/gdb/p-valprint.c
 ===================================================================
---- gdb-6.5.orig/gdb/p-valprint.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/p-valprint.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/p-valprint.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/p-valprint.c	2006-07-11 15:01:23.000000000 -0300
 @@ -753,7 +753,7 @@ pascal_object_print_value_fields (struct
  				  int dont_print_statmem)
  {
@@ -128,8 +128,8 @@
    int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 Index: gdb-6.5/gdb/cp-valprint.c
 ===================================================================
---- gdb-6.5.orig/gdb/cp-valprint.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/cp-valprint.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/cp-valprint.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/cp-valprint.c	2006-07-11 15:01:23.000000000 -0300
 @@ -265,7 +265,7 @@ cp_print_value_fields (struct type *type
  		       struct type **dont_print_vb,int dont_print_statmem)
  {
@@ -150,8 +150,8 @@
    int i, n_baseclasses = TYPE_N_BASECLASSES (type);
 Index: gdb-6.5/gdb/tui/tui-layout.c
 ===================================================================
---- gdb-6.5.orig/gdb/tui/tui-layout.c	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/tui/tui-layout.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/tui/tui-layout.c	2006-07-11 15:01:22.000000000 -0300
++++ gdb-6.5/gdb/tui/tui-layout.c	2006-07-11 15:01:23.000000000 -0300
 @@ -755,7 +755,7 @@ show_source_disasm_command (void)
  	  if (TUI_DISASM_WIN == NULL)
  	    {
@@ -190,8 +190,8 @@
  			   tui_term_width (),
 Index: gdb-6.5/gdb/testsuite/gdb.base/move-dir.h
 ===================================================================
---- gdb-6.5.orig/gdb/testsuite/gdb.base/move-dir.h	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/testsuite/gdb.base/move-dir.h	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/testsuite/gdb.base/move-dir.h	2006-07-11 15:01:23.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.base/move-dir.h	2006-07-11 15:01:23.000000000 -0300
 @@ -1,4 +1,4 @@
 -#include <stdlib.h>
 +#include <stdio.h>
@@ -200,8 +200,8 @@
    const char* ostring = "other";
 Index: gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c
 ===================================================================
---- gdb-6.5.orig/gdb/testsuite/gdb.base/sigrepeat.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c	2006-07-11 02:47:23.000000000 -0300
+--- gdb-6.5.orig/gdb/testsuite/gdb.base/sigrepeat.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c	2006-07-11 15:01:23.000000000 -0300
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -212,9 +212,19 @@
  static volatile int done[2];
 Index: gdb-6.5/gdb/s390-tdep.c
 ===================================================================
---- gdb-6.5.orig/gdb/s390-tdep.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/s390-tdep.c	2006-07-11 02:47:23.000000000 -0300
-@@ -2309,6 +2309,9 @@ s390_return_value (struct gdbarch *gdbar
+--- gdb-6.5.orig/gdb/s390-tdep.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/s390-tdep.c	2006-07-11 15:02:37.000000000 -0300
+@@ -2277,6 +2277,9 @@ s390_return_value (struct gdbarch *gdbar
+ 	case RETURN_VALUE_STRUCT_CONVENTION:
+ 	  error (_("Cannot set function return value."));
+ 	  break;
++
++        default:
++      	  break;
+ 	}
+     }
+   else if (out)
+@@ -2309,6 +2312,9 @@ s390_return_value (struct gdbarch *gdbar
  	case RETURN_VALUE_STRUCT_CONVENTION:
  	  error (_("Function return value unknown."));
  	  break;
@@ -226,8 +236,8 @@
  
 Index: gdb-6.5/gdb/remote.c
 ===================================================================
---- gdb-6.5.orig/gdb/remote.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/remote.c	2006-07-11 02:49:02.000000000 -0300
+--- gdb-6.5.orig/gdb/remote.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/remote.c	2006-07-11 15:02:32.000000000 -0300
 @@ -2523,10 +2523,10 @@ cleanup_sigint_signal_handler (void *dum
  {
    signal (SIGINT, handle_sigint);
@@ -243,8 +253,8 @@
  
 Index: gdb-6.5/gdb/f-exp.y
 ===================================================================
---- gdb-6.5.orig/gdb/f-exp.y	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/f-exp.y	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/f-exp.y	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/f-exp.y	2006-07-11 15:01:23.000000000 -0300
 @@ -567,6 +567,8 @@ ptype	:	typebase
  		      case tp_function:
  			follow_type = lookup_function_type (follow_type);
@@ -256,8 +266,8 @@
  		}
 Index: gdb-6.5/gdb/remote-fileio.c
 ===================================================================
---- gdb-6.5.orig/gdb/remote-fileio.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/remote-fileio.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/remote-fileio.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/remote-fileio.c	2006-07-11 15:01:23.000000000 -0300
 @@ -1317,19 +1317,19 @@ static struct {
    char *name;
    void (*func)(char *);
@@ -293,8 +303,8 @@
  static int
 Index: gdb-6.5/gdb/source.c
 ===================================================================
---- gdb-6.5.orig/gdb/source.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/source.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/source.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/source.c	2006-07-11 15:01:23.000000000 -0300
 @@ -160,7 +160,7 @@ get_current_source_symtab_and_line (void
  void
  set_default_source_symtab_and_line (void)
@@ -315,8 +325,8 @@
  
 Index: gdb-6.5/gdb/symfile.c
 ===================================================================
---- gdb-6.5.orig/gdb/symfile.c	2006-07-11 02:47:11.000000000 -0300
-+++ gdb-6.5/gdb/symfile.c	2006-07-11 02:52:26.000000000 -0300
+--- gdb-6.5.orig/gdb/symfile.c	2006-07-11 15:01:22.000000000 -0300
++++ gdb-6.5/gdb/symfile.c	2006-07-11 15:02:34.000000000 -0300
 @@ -2877,6 +2877,8 @@ add_psymbol_with_dem_name_to_list (char 
  	deprecated_bcache (buf, dem_namelength + 1, objfile->psymbol_cache);
        break;
@@ -328,8 +338,8 @@
    /* val and coreaddr are mutually exclusive, one of them *will* be zero */
 Index: gdb-6.5/gdb/linespec.c
 ===================================================================
---- gdb-6.5.orig/gdb/linespec.c	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/linespec.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/linespec.c	2006-07-11 15:01:23.000000000 -0300
++++ gdb-6.5/gdb/linespec.c	2006-07-11 15:01:23.000000000 -0300
 @@ -1631,7 +1631,7 @@ static struct symtabs_and_lines
  find_method (int funfirstline, char ***canonical, char *saved_arg,
  	     char *copy, struct type *t, struct symbol *sym_class)
@@ -341,8 +351,8 @@
    struct symbol **sym_arr =  alloca (total_number_of_methods (t)
 Index: gdb-6.5/gdb/macroscope.c
 ===================================================================
---- gdb-6.5.orig/gdb/macroscope.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/macroscope.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/macroscope.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/macroscope.c	2006-07-11 15:01:23.000000000 -0300
 @@ -33,7 +33,7 @@
  struct macro_scope *
  sal_macro_scope (struct symtab_and_line sal)
@@ -382,8 +392,8 @@
    /* If there's a selected frame, use its PC.  */ 
 Index: gdb-6.5/gdb/target.c
 ===================================================================
---- gdb-6.5.orig/gdb/target.c	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/target.c	2006-07-11 02:52:25.000000000 -0300
+--- gdb-6.5.orig/gdb/target.c	2006-07-11 15:01:22.000000000 -0300
++++ gdb-6.5/gdb/target.c	2006-07-11 15:02:33.000000000 -0300
 @@ -1142,6 +1142,9 @@ target_xfer_memory (CORE_ADDR memaddr, g
  	  if (!write)
  	    return EIO;
@@ -406,8 +416,8 @@
    if (region->attrib.cache)
 Index: gdb-6.5/gdb/gdb-events.c
 ===================================================================
---- gdb-6.5.orig/gdb/gdb-events.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/gdb-events.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/gdb-events.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/gdb-events.c	2006-07-11 15:01:23.000000000 -0300
 @@ -321,6 +321,8 @@ gdb_events_deliver (struct gdb_events *v
  	case architecture_changed:
  	  vector->architecture_changed ();
@@ -419,8 +429,8 @@
        xfree (event);
 Index: gdb-6.5/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.5.orig/gdb/dwarf2read.c	2006-07-11 02:47:12.000000000 -0300
-+++ gdb-6.5/gdb/dwarf2read.c	2006-07-11 02:52:25.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2read.c	2006-07-11 15:01:23.000000000 -0300
++++ gdb-6.5/gdb/dwarf2read.c	2006-07-11 15:02:33.000000000 -0300
 @@ -9179,6 +9179,7 @@ dwarf_decode_macros (struct line_header 
    for (;;)
      {
@@ -453,8 +463,8 @@
            {
 Index: gdb-6.5/gdb/stabsread.c
 ===================================================================
---- gdb-6.5.orig/gdb/stabsread.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/stabsread.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/stabsread.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/stabsread.c	2006-07-11 15:01:23.000000000 -0300
 @@ -1794,7 +1794,8 @@ again:
  	  struct type *domain = read_type (pp, objfile);
  	  struct type *return_type;
@@ -467,8 +477,8 @@
  	    /* Invalid member type data format.  */
 Index: gdb-6.5/gdb/dwarf2expr.c
 ===================================================================
---- gdb-6.5.orig/gdb/dwarf2expr.c	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/dwarf2expr.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/dwarf2expr.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/dwarf2expr.c	2006-07-11 15:01:23.000000000 -0300
 @@ -559,6 +559,8 @@ execute_stack_op (struct dwarf_expr_cont
  	      op_ptr = read_uleb128 (op_ptr, op_end, &reg);
  	      result += reg;
@@ -480,8 +490,8 @@
  
 Index: gdb-6.5/gdb/varobj.c
 ===================================================================
---- gdb-6.5.orig/gdb/varobj.c	2006-07-11 02:47:21.000000000 -0300
-+++ gdb-6.5/gdb/varobj.c	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/varobj.c	2006-07-11 15:01:22.000000000 -0300
++++ gdb-6.5/gdb/varobj.c	2006-07-11 15:01:23.000000000 -0300
 @@ -325,10 +325,9 @@ struct language_specific
  
  /* Array of known source language routines. */
@@ -536,8 +546,8 @@
        var->root->rootvar = var;
 Index: gdb-6.5/gdb/configure.ac
 ===================================================================
---- gdb-6.5.orig/gdb/configure.ac	2006-07-11 02:46:52.000000000 -0300
-+++ gdb-6.5/gdb/configure.ac	2006-07-11 02:47:24.000000000 -0300
+--- gdb-6.5.orig/gdb/configure.ac	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/configure.ac	2006-07-11 15:01:23.000000000 -0300
 @@ -1133,7 +1133,8 @@ fi
  # gdb/doc/gdbint.texinfo.
  build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
@@ -550,8 +560,8 @@
  if test x${CFLAGS+set} = xset; then
 Index: gdb-6.5/gdb/doublest.c
 ===================================================================
---- gdb-6.5.orig/gdb/doublest.c	2005-12-17 20:33:59.000000000 -0200
-+++ gdb-6.5/gdb/doublest.c	2006-07-11 02:55:55.000000000 -0300
+--- gdb-6.5.orig/gdb/doublest.c	2006-07-11 15:00:08.000000000 -0300
++++ gdb-6.5/gdb/doublest.c	2006-07-11 15:01:23.000000000 -0300
 @@ -94,15 +94,10 @@ get_field (const bfd_byte *data, enum fl
      {
        result |= (unsigned long)*(data + cur_byte) << cur_bitshift;



From fedora-cvs-commits at redhat.com  Tue Jul 11 18:49:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 14:49:24 -0400
Subject: rpms/kdelibs/devel kdelibs-3.4.0-menu.patch, 1.2,
	1.3 kdelibs-3.5.3-kde#129187.patch, NONE, 1.1 kdelibs.spec,
	1.154, 1.155
Message-ID: <200607111849.k6BInOZi021938@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.4.0-menu.patch kdelibs-3.5.3-kde#129187.patch 
Log Message:
kde#129187 - konqueror crash when modifying address bar address


kdelibs-3.4.0-menu.patch:
 kbuildsycoca.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: kdelibs-3.4.0-menu.patch
===================================================================
RCS file: kdelibs-3.4.0-menu.patch
diff -N kdelibs-3.4.0-menu.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kdelibs-3.4.0-menu.patch	11 Jul 2006 18:49:22 -0000	1.3
@@ -0,0 +1,15 @@
+--- 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.5.3-kde#129187.patch:
 khtml_part.cpp |   29 ++++++++++++++++++-----------
 khtmlpart_p.h  |    2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE kdelibs-3.5.3-kde#129187.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 556325)
+++ khtml/khtml_part.cpp	(Revision 556326)
@@ -1876,10 +1876,14 @@
     removeJSErrorExtension();
     setSuppressedPopupIndicator( false );
     d->m_openableSuppressedPopups = 0;
-    for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
-       KJS::Window *w = KJS::Window::retrieveWindow( part );
-       if (w)
-           w->forgetSuppressedWindows();
+    for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+          i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+       
+      if (KHTMLPart* part = *i) {
+        KJS::Window *w = KJS::Window::retrieveWindow( part );
+        if (w)
+          w->forgetSuppressedWindows();
+      }
     }
   }
 
@@ -7360,7 +7364,7 @@
 
     if ( enable && originPart ) {
         d->m_openableSuppressedPopups++;
-        if ( d->m_suppressedPopupOriginParts.find( originPart ) == -1 )
+        if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 )
             d->m_suppressedPopupOriginParts.append( originPart );
     }
 
@@ -7405,12 +7409,15 @@
 }
 
 void KHTMLPart::showSuppressedPopups() {
-    for ( KHTMLPart* part = d->m_suppressedPopupOriginParts.first(); part; part = d->m_suppressedPopupOriginParts.next() ) {
-       KJS::Window *w = KJS::Window::retrieveWindow( part );
-       if (w) {
-           w->showSuppressedWindows();
-           w->forgetSuppressedWindows();
-       }
+    for ( QValueListIterator<QGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin();
+          i != d->m_suppressedPopupOriginParts.end(); ++i ) {
+      if (KHTMLPart* part = *i) {
+        KJS::Window *w = KJS::Window::retrieveWindow( part );
+        if (w) {
+            w->showSuppressedWindows();
+            w->forgetSuppressedWindows();
+        }
+      }
     }
     setSuppressedPopupIndicator( false );
     d->m_openableSuppressedPopups = 0;
Index: khtml/khtmlpart_p.h
===================================================================
--- khtml/khtmlpart_p.h	(Revision 556325)
+++ khtml/khtmlpart_p.h	(Revision 556326)
@@ -316,7 +316,7 @@
   KURLLabel* m_statusBarUALabel;
   KURLLabel* m_statusBarJSErrorLabel;
   KURLLabel* m_statusBarPopupLabel;
-  QPtrList<KHTMLPart> m_suppressedPopupOriginParts;
+  QValueList<QGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts;
   int m_openableSuppressedPopups;
   DOM::DocumentImpl *m_doc;
   khtml::Decoder *m_decoder;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdelibs.spec	11 Jul 2006 16:23:46 -0000	1.154
+++ kdelibs.spec	11 Jul 2006 18:49:22 -0000	1.155
@@ -37,6 +37,7 @@
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
+Patch7: kdelibs-3.4.0-menu.patch
 Patch15: kdelibs-3.4.91-buildroot.patch
 Patch16: kdelibs-3.1-ssl-krb5.patch
 Patch20: kdelibs-3.3.92-defaultstyle.patch
@@ -64,6 +65,7 @@
 Patch112: kdelibs-3.5.3-kde#123307.patch
 Patch113: kdelibs-3.5.3-kde#106795.patch
 Patch114: kdelibs-3.5.3-kde#130605.patch
+Patch115: kdelibs-3.5.3-kde#129187.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -181,6 +183,7 @@
 %endif
 %patch4 -p1 -b .ksyscoca
 %patch5 -p1 -b .openssl
+%patch7 -p1 -b .menu
 %patch15 -p1 -b .buildroot
 %patch16 -p1 -b .ssl-krb5
 %patch20 -p1 -b .defaultstyle
@@ -208,6 +211,7 @@
 %patch112 -p0 -b .kde#130252
 %patch113 -p0 -b .kde#106795
 %patch114 -p0 -b .kde#130605
+%patch115 -p0 -b .kde#129187
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -299,6 +303,7 @@
 pushd %{buildroot}%{_sysconfdir}/xdg/menus/
    mv applications.menu %{buildroot}%{_sysconfdir}/xdg.d/kde/menus
    ln -s applications-merged kde-applications-merged
+   ln -s ../../xdg.d/kde/menus/applications.menu kde-applications.menu
 popd
 echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
 rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
@@ -434,11 +439,12 @@
 * Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
 - upstream patches,
     kde#130605 - konqueror crash
+    kde#129187 - konqueror crash when modifying address bar address
 
 * Mon Jul 10 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - apply upstream patches,
-    #123307 - Find previous does nothing sometimes
-    #106795 - konqueror crash
+    kde#123307 - Find previous does nothing sometimes
+    kde#106795 - konqueror crash
 
 * Tue Jul 04 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
 - apply upstream patches, fix #128940/#81806/#128760



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:04:03 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-dpms-on-by-default.patch, NONE,
	1.1 xorg-x11-server.spec, 1.113, 1.114
Message-ID: <200607111904.k6BJ43Lj026729@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-dpms-on-by-default.patch 
Log Message:
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3.fc6
- Enable DPMS by default.


xorg-x11-server-1.1.1-dpms-on-by-default.patch:
 globals.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-dpms-on-by-default.patch ---
--- xorg-server-1.1.1/dix/globals.c.dpms	2006-07-05 14:31:36.000000000 -0400
+++ xorg-server-1.1.1/dix/globals.c	2006-07-11 14:40:22.000000000 -0400
@@ -108,7 +108,7 @@
 #  define DEFAULT_OFF_TIME DEFAULT_SCREEN_SAVER_TIME * 4
 # endif
 # ifndef DEFAULT_DPMS_ENABLED
-#  define DEFAULT_DPMS_ENABLED FALSE
+#  define DEFAULT_DPMS_ENABLED TRUE
 # endif
 CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
 CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xorg-x11-server.spec	11 Jul 2006 17:24:06 -0000	1.113
+++ xorg-x11-server.spec	11 Jul 2006 19:04:00 -0000	1.114
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -47,6 +47,7 @@
 Patch3003:  xorg-x11-server-1.1.0-cvt-generator-in-core.patch
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch
+Patch3006:  xorg-x11-server-1.1.1-dpms-on-by-default.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -311,6 +312,7 @@
 %patch3003 -p1 -b .cvt
 %patch3004 -p1 -b .targetrefresh
 %patch3005 -p1 -b .getconfig-pl-die-die-die
+%patch3006 -p1 -b .dpms-on-by-default
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -636,6 +638,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3.fc6
+- Enable DPMS by default.
+
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2.fc6
 - Remove nonsensical runtime perl dependency.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:05:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:05:42 -0400
Subject: rpms/cman/devel cman.spec,1.48,1.49
Message-ID: <200607111905.k6BJ5gdK027215@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27184

Modified Files:
	cman.spec 
Log Message:
Build for all archs.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cman.spec	10 Jul 2006 18:26:46 -0000	1.48
+++ cman.spec	11 Jul 2006 19:05:39 -0000	1.49
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -28,8 +28,6 @@
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires: openais
-#ExclusiveArch: %{ix86} x86_64
-ExcludeArch: s390 s390x
 URL: http://sources.redhat.com/cluster/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:18:24 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-default-theme.patch, NONE,
	1.1 gnome-screensaver-2.15.4-shrink-em.patch, NONE,
	1.1 .cvsignore, 1.23, 1.24 gnome-screensaver.spec, 1.81,
	1.82 sources, 1.26, 1.27
Message-ID: <200607111918.k6BJIOWh013108@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Added Files:
	gnome-screensaver-2.15.4-default-theme.patch 
	gnome-screensaver-2.15.4-shrink-em.patch 
Log Message:
2.15.4


gnome-screensaver-2.15.4-default-theme.patch:
 gnome-screensaver.schemas.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-screensaver-2.15.4-default-theme.patch ---
--- gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in.use-floaters-by-default	2006-06-08 16:37:39.000000000 -0400
+++ gnome-screensaver-2.15.4/data/gnome-screensaver.schemas.in	2006-07-11 10:15:54.000000000 -0400
@@ -36,7 +36,7 @@
       <applyto>/apps/gnome-screensaver/mode</applyto>
       <owner>gnome-screensaver</owner>
       <type>string</type>
-      <default>blank-only</default>
+      <default>single</default>
       <locale name="C">
         <short>Screensaver theme selection mode</short>
         <long>
@@ -55,7 +55,7 @@
       <owner>gnome-screensaver</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[system]</default>
       <locale name="C">
         <short>Screensaver themes</short>
         <long>

gnome-screensaver-2.15.4-shrink-em.patch:
 floaters.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE gnome-screensaver-2.15.4-shrink-em.patch ---
--- gnome-screensaver-2.15.4/savers/floaters.c.shrink-em	2006-06-08 21:57:34.000000000 -0400
+++ gnome-screensaver-2.15.4/savers/floaters.c	2006-07-11 10:03:37.000000000 -0400
@@ -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,10 +984,14 @@
   for (tmp = screen_saver->floaters; tmp != NULL; tmp = tmp->next)
     {
       ScreenSaverFloater *floater;
-#ifdef CULL_FLOATERS
       GdkRectangle rect;
       gint size;
 
+      floater = (ScreenSaverFloater *) tmp->data;
+
+      size = CLAMP ((int) (FLOATER_MAX_SIZE * floater->scale),
+		    FLOATER_MIN_SIZE, FLOATER_MAX_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;
@@ -995,9 +999,6 @@
 
       if (!gdk_region_rect_in (event->region, &rect))
         continue;
-#endif
-
-      floater = (ScreenSaverFloater *) tmp->data;
 
       if (!screen_saver_floater_do_draw (screen_saver, floater, context))
         {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	19 Jun 2006 21:26:10 -0000	1.23
+++ .cvsignore	11 Jul 2006 19:18:21 -0000	1.24
@@ -1,2 +1,3 @@
 gnome-screensaver-2.15.3.tar.bz2
 lock-dialog-fedoralogo-floaters.tar.gz
+gnome-screensaver-2.15.4.tar.bz2


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gnome-screensaver.spec	19 Jun 2006 21:26:10 -0000	1.81
+++ gnome-screensaver.spec	11 Jul 2006 19:18:21 -0000	1.82
@@ -11,20 +11,17 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.15.3
-Release: 2
+Version: 2.15.4
+Release: 1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
-Source2: lock-dialog-fedoralogo-floaters.tar.gz
-Source3: gnome-compiler-flags.m4
-Source4: fedoralogo-floaters.desktop
-Source5: gnome-logo-white.svg
-
-Patch1: gnome-screensaver-2.15.1-use-floaters-by-default.patch
-Patch2: gnome-screensaver-2.13.91-shrink-em.patch
-Patch5: gnome-screensaver-2.15.1-invisible-char.patch
+
+Patch1: gnome-screensaver-2.15.4-default-theme.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=331145
+Patch2: gnome-screensaver-2.15.4-shrink-em.patch
+Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -53,23 +50,22 @@
 Requires: GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
+Requires: /usr/share/gnome-screensaver/lock-dialog-system.glade
 
 %description
 gnome-screensaver is a screen saver and locker that aims to have
 simple, sane, secure defaults and be well integrated with the desktop.
 
 %prep
-%setup -q -a2
+%setup -q 
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
-%patch5 -p1 -b .invisible-char
-
-tar xzf %{SOURCE2}
+%patch3 -p1 -b .invisible-char
 
 %build
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
            --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
-           --with-gdm-config=/etc/X11/gdm/gdm.conf               \
+           --with-gdm-config=/usr/share/gdm/defaults.conf        \
 	   --with-mit-screensaver=no
 make
 
@@ -89,10 +85,6 @@
 
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
-# install floaters lock dialog
-cp lock-dialog-fedoralogo-floaters.{gtkrc,glade} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
-
-install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
 
 sed -ie 's at XSL=${DIST_BIN}/xscreensaver-config.xsl at XSL=%{_datadir}/gnome-screensaver/xscreensaver-config.xsl@' \
         data/migrate-xscreensaver-config.sh
@@ -102,9 +94,6 @@
 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
@@ -160,6 +149,11 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 2.15.4-1
+- Update to 2.15.4
+- Rename the branded screensaver to "system" and move
+  it to fedora-logos
+
 * Mon Jun 19 2006 Ray Strode <rstrode at redhat.com> 2.15.3-2
 - rename widget in glade file to allow unlocking to work
   again (bug 195317)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	19 Jun 2006 21:26:10 -0000	1.26
+++ sources	11 Jul 2006 19:18:21 -0000	1.27
@@ -1,2 +1 @@
-d2e0550ef59b8701e08d45955330404f  gnome-screensaver-2.15.3.tar.bz2
-b8d23b049231d57dec24cad4cfdeee5d  lock-dialog-fedoralogo-floaters.tar.gz
+819b0b66bc4b55e0ac21639dd9b99a63  gnome-screensaver-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:21:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:21:41 -0400
Subject: rpms/fedora-logos/devel fedora-logos.spec,1.31,1.32
Message-ID: <200607111921.k6BJLfFE014451@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14360

Modified Files:
	fedora-logos.spec 
Log Message:
1.1.44



Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fedora-logos.spec	28 Jun 2006 19:08:06 -0000	1.31
+++ fedora-logos.spec	11 Jul 2006 19:21:39 -0000	1.32
@@ -1,7 +1,7 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.43
-Release: 5%{?dist}
+Version: 1.1.44
+Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright ? 1999-2006 Red Hat, Inc.  All rights reserved.
@@ -65,6 +65,11 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 done
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
+for i in applications/screensavers/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
+done
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 for i in backgrounds/images/* ; do
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
@@ -132,6 +137,7 @@
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/icons
 %{_datadir}/gnome-screensaver/*
+%{_datadir}/applications/screensavers/*
 %{_datadir}/backgrounds/images/*
 
 /usr/lib/anaconda-runtime/boot/*png
@@ -141,6 +147,9 @@
 # end i386 bits
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 1.1.44-1
+- Move the complete lock dialog theme here
+
 * Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-5
 - Test build using dist tag
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:25:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:25:59 -0400
Subject: rpms/fedora-logos/devel .cvsignore,1.25,1.26 sources,1.27,1.28
Message-ID: <200607111925.k6BJPx2p016280@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16237

Modified Files:
	.cvsignore sources 
Log Message:
1.1.44



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Jun 2006 19:27:28 -0000	1.25
+++ .cvsignore	11 Jul 2006 19:25:57 -0000	1.26
@@ -1 +1,2 @@
 fedora-logos-1.1.43.tar.bz2
+fedora-logos-1.1.44.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	5 Jun 2006 19:31:44 -0000	1.27
+++ sources	11 Jul 2006 19:25:57 -0000	1.28
@@ -1 +1 @@
-5305694e311b1dad7f30ca609cc7d7d4  fedora-logos-1.1.43.tar.bz2
+7fcc24120809c44babb36239b3e819e8  fedora-logos-1.1.44.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:26:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:26:10 -0400
Subject: rpms/libselinux/devel libselinux.spec,1.209,1.210
Message-ID: <200607111926.k6BJQAWw016379@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux.spec 
Log Message:
* Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-2
- Fix libselinux to not telinit during installs



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- libselinux.spec	5 Jul 2006 10:42:47 -0000	1.209
+++ libselinux.spec	11 Jul 2006 19:26:08 -0000	1.210
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.19
-Release: 1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -83,7 +83,8 @@
 
 %post
 /sbin/ldconfig
-[ -x /sbin/telinit ] && /sbin/telinit U
+[ -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root ] &&
+/sbin/telinit u
 exit 0
 
 %postun -p /sbin/ldconfig
@@ -115,6 +116,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-2
+- Fix libselinux to not telinit during installs
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-1
 - Upgrade to latest from NSA
 	* Lindent.



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:29:32 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.208,
	1.209 policycoreutils.spec, 1.290, 1.291
Message-ID: <200607111929.k6BJTWbl018040@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17849

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jul 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-2
- Add verbose flag to restorecond and update translations


policycoreutils-rhat.patch:
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |   96 +++---
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  143 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.c |   16 -
 73 files changed, 4944 insertions(+), 4629 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.208 -r 1.209 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- policycoreutils-rhat.patch	22 Jun 2006 18:37:08 -0000	1.208
+++ policycoreutils-rhat.patch	11 Jul 2006 19:29:29 -0000	1.209
@@ -1,1177 +1,27379 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.14/audit2allow/audit2allow.1
---- nsapolicycoreutils/audit2allow/audit2allow.1	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.14/audit2allow/audit2allow.1	2006-06-20 09:11:30.000000000 -0400
-@@ -66,7 +66,7 @@
- Generate require output syntax for loadable modules.
- .TP
- .B "\-R" | "\-\-reference"
--Generate reference policy using installed macros
-+Generate reference policy using installed macros.  Requires the selinux-policy-devel package.
- .TP
- .B "\-t "  | "\-\-tefile"
- Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.14/audit2allow/avc.py
---- nsapolicycoreutils/audit2allow/avc.py	2006-05-23 06:19:30.000000000 -0400
-+++ policycoreutils-1.30.14/audit2allow/avc.py	2006-06-20 09:12:47.000000000 -0400
-@@ -66,7 +66,7 @@
- 	try:
- 		fd = open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt")
- 	except IOError, error:
--		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
-+		raise IOError("Reference policy generation requires the policy development package selinux-policy-devel.\n%s" % error)
-         records = fd.read().split("\n")
-         regexp = "^define *\(`([^']*)' *, *` *\{([^}]*)}'"
-         for r in records:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.14/po/hi.po
---- nsapolicycoreutils/po/hi.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/hi.po	2006-06-19 10:34:57.000000000 -0400
-@@ -7,15 +7,15 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.17/po/af.po
+--- nsapolicycoreutils/po/af.po	2006-07-03 07:52:45.000000000 -0400
++++ policycoreutils-1.30.17/po/af.po	2006-07-10 13:09:18.000000000 -0400
+@@ -8,7 +8,7 @@
  msgstr ""
- "Project-Id-Version: hi\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-06-16 09:51-0400\n"
--"PO-Revision-Date: 2006-05-09 15:25+0530\n"
+-"POT-Creation-Date: 2006-06-29 15:53-0400\n"
 +"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"PO-Revision-Date: 2006-06-19 11:09+0530\n"
- "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
- "Language-Team: Hindi <fedora-trans-hi at redhat.com>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.9.1\n"
--"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
- "\n"
- 
- #: ../load_policy/load_policy.c:22
-@@ -361,42 +361,40 @@
- msgstr "chcat -l +CompanyConfidential juser"
- 
- #: ../semanage/semanage:122
--#, fuzzy
- msgid "Requires 2 or more arguments"
--msgstr "?????????????????? ?????? ?????????????????? ???????????????"
-+msgstr "2 ?????????????????? ???????????? ???????????????"
- 
- #: ../semanage/semanage:127
--#, fuzzy, c-format
-+#, c-format
- msgid "%s not defined"
--msgstr "??????????????? %s/%s ???????????????????????? ???????????? ??????"
-+msgstr "%s ???????????????????????? ????????????"
- 
- #: ../semanage/semanage:151
--#, fuzzy, c-format
-+#, c-format
- msgid "%s not valid for %s objects\n"
--msgstr "%s ?????? ????????? ?????????????????? ???????????? ??????\n"
-+msgstr "%s ????????? ???????????? ?????? %s ??????????????? ?????? ????????????\n"
- 
- #: ../semanage/semanage:178 ../semanage/semanage:186
--#, fuzzy
- msgid "range not supported on Non MLS machines"
--msgstr "?????????-MLS ???????????? ?????? ?????????????????? ????????????????????? ????????????"
-+msgstr "?????????-MLS ???????????? ?????? ??????????????? ????????????????????? ????????????"
- 
- #: ../semanage/semanage:244
- msgid "You must specify a role"
--msgstr ""
-+msgstr "?????? ???????????? ?????? ?????????????????? ??????????????????????????? ????????????"
- 
- #: ../semanage/semanage:246
- msgid "You must specify a prefix"
--msgstr ""
-+msgstr "?????? ???????????? ?????? ?????????????????? ??????????????????????????? ????????????"
- 
- #: ../semanage/semanage:295
--#, fuzzy, c-format
-+#, c-format
- msgid "Options Error %s "
--msgstr "?????????????????? ??????????????????: %s "
-+msgstr "?????????????????? ?????????????????? %s"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -21,7 +21,7 @@
+ msgid "usage:  %s [-bq]\n"
+ msgstr ""
  
- #: ../semanage/semanage:299
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid value %s"
--msgstr "???????????? ???????????? '%s' "
-+msgstr "???????????? ????????? %s"
+-#: ../load_policy/load_policy.c:66
++#: ../load_policy/load_policy.c:62
+ #, c-format
+ msgid "%s:  Can't load policy:  %s\n"
+ msgstr ""
+@@ -31,26 +31,26 @@
+ msgid "Out of memory!\n"
+ msgstr ""
  
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
-@@ -971,3 +969,4 @@
+-#: ../newrole/newrole.c:199 ../run_init/run_init.c:126
++#: ../newrole/newrole.c:201 ../run_init/run_init.c:126
  #, c-format
- msgid "Options Error: %s "
- msgstr "?????????????????? ??????????????????: %s "
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.14/po/mr.po
---- nsapolicycoreutils/po/mr.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/mr.po	2006-06-19 10:31:00.000000000 -0400
-@@ -1,20 +1,21 @@
--# SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# translation of mr.po to Marathi
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-+# Rahul Bhalerao <rbhalera at redhat.com>, 2006.
- #
--#, fuzzy
- msgid ""
+ msgid "failed to initialize PAM\n"
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: mr\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-06-16 09:51-0400\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
--"Language-Team: LANGUAGE <LL at li.org>\n"
-+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"PO-Revision-Date: 2006-06-13 14:36+0530\n"
-+"Last-Translator: Rahul Bhalerao <rbhalera at redhat.com>\n"
-+"Language-Team: Marathi\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
  
- #: ../load_policy/load_policy.c:22
+-#: ../newrole/newrole.c:210
++#: ../newrole/newrole.c:212
  #, c-format
-@@ -42,8 +43,9 @@
+ msgid "failed to set PAM_TTY\n"
  msgstr ""
  
- #: ../newrole/newrole.c:250 ../run_init/run_init.c:155
-+#, fuzzy
+-#: ../newrole/newrole.c:246 ../run_init/run_init.c:154
++#: ../newrole/newrole.c:250 ../run_init/run_init.c:155
  msgid "Password:"
--msgstr ""
-+msgstr "???????????????????????????:"
+ msgstr ""
  
- #: ../newrole/newrole.c:282 ../run_init/run_init.c:187
+-#: ../newrole/newrole.c:281 ../run_init/run_init.c:189
++#: ../newrole/newrole.c:282 ../run_init/run_init.c:187
  #, c-format
-@@ -57,28 +59,33 @@
+ msgid "Cannot find your entry in the shadow passwd file.\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:354
+-#: ../newrole/newrole.c:287 ../run_init/run_init.c:195
++#: ../newrole/newrole.c:288 ../run_init/run_init.c:193
  #, c-format
-+#, fuzzy
[...27982 lines suppressed...]
---- nsapolicycoreutils/scripts/fixfiles	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/scripts/fixfiles	2006-06-22 14:21:55.000000000 -0400
-@@ -28,7 +28,7 @@
- DIRS=""
- RPMILES=""
- OUTFILES=""
--LOGFILE=/dev/null
-+LOGFILE=`tty`
- SYSLOGFLAG="-l"
- LOGGER=/usr/sbin/logger
- SETFILES=/sbin/setfiles
-@@ -118,7 +118,7 @@
- fi
- if [ ! -z "$RPMFILES" ]; then
-     for i in `echo $RPMFILES | sed 's/,/ /g'`; do
--	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE
-+	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
-     done
-     exit $?
- fi
-@@ -126,16 +126,16 @@
-     if [ -x /usr/bin/find ]; then
- 	for d in ${DIRS} ; do find $d \
- 	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o -print | \
--	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE
-+	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE
- 	done
-     else
--	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
-     fi
- 
-     exit $?
- fi
- LogReadOnly
--${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- exit $?
- }
+@@ -364,7 +367,7 @@
  
-@@ -234,8 +234,8 @@
- # Make sure they specified one of the three valid commands
- #
- case "$command" in
--    restore) restore ;;
--    check) restore -n ;;
-+    restore) restore -p -q ;;
-+    check) restore -n -v ;;
-     relabel) relabel;;
-     *)
-     usage
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/setfiles/setfiles.c	2006-06-22 14:32:43.000000000 -0400
-@@ -20,6 +20,7 @@
-  * -d   Show what specification matched each file.
-  * -l   Log changes in files labels to syslog.
-  * -n	Do not change any file labels.
-+ * -p   Show progress.  Prints * for every 1000 files
-  * -q   Be quiet (suppress non-error output).
-  * -r   Use an alternate root path
-  * -s   Use stdin for a list of files instead of searching a partition.
-@@ -88,6 +89,8 @@
- static int force=0;
- #define STAT_BLOCK_SIZE 1
- static int pipe_fds[2] = { -1, -1 };
-+static int progress=0;
-+static unsigned long long count=0;
- 
- #define MAX_EXCLUDES 100
- static int excludeCtr=0;
-@@ -208,7 +211,7 @@
- void usage(const char * const name)
+ static void usage(char *program)
  {
- 	fprintf(stderr,
--		"usage:  %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
-+		"usage:  %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
- 		"usage:  %s -c policyfile spec_file\n"
- 		"usage:  %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name);
- 	exit(1);
-@@ -278,6 +281,18 @@
- 		/* No matching specification. */
- 		return 0;
- 
-+	if (progress) {
-+		count++;
-+		if (count % 80000 == 0) {
-+			fprintf(stdout, "\n");
-+			fflush(stdout);
-+		}
-+		if (count % 1000 == 0) {
-+			fprintf(stdout, "*");
-+			fflush(stdout);
-+		}
-+	}
-+
- 	/*
- 	 * Try to add an association between this inode and
- 	 * this specification.  If there is already an association
-@@ -301,7 +316,7 @@
- 	}
+-	printf("%s [-d] \n", program);
++	printf("%s [-d] [-v] \n", program);
+ 	exit(0);
+ }
  
- 	/* Get the current context of the file. */
--	ret = lgetfilecon(my_file, &context);
-+	ret = lgetfilecon_raw(my_file, &context);
- 	if (ret < 0) {
- 		if (errno == ENODATA) {
- 			context = NULL;
-@@ -414,7 +429,7 @@
- 
- 	if (policyfile) {
- 		valid = (sepol_check_context (context) >= 0);
--	} else if (security_canonicalize_context(context, &tmpcon) < 0) {
-+	} else if (security_canonicalize_context_raw(context, &tmpcon) < 0) {
- 		if (errno != ENOENT) {
- 			valid = 0;
- 			inc_err();
-@@ -485,10 +500,10 @@
- 	memset(excludeArray,0, sizeof(excludeArray));
- 
- 	/* Validate all file contexts during matchpathcon_init. */
--	set_matchpathcon_flags(MATCHPATHCON_VALIDATE);
-+	set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
- 
- 	/* Process any options. */
--	while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
-+	while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o:")) > 0) {
+@@ -449,11 +452,14 @@
+ 	if (master_fd < 0)
+ 		exitApp("inotify_init");
+ 
+-	while ((opt = getopt(argc, argv, "d")) > 0) {
++	while ((opt = getopt(argc, argv, "dv")) > 0) {
  		switch (opt) {
- 		case 'c':
- 		{
-@@ -566,8 +581,19 @@
- 			add_assoc = 0;
+ 		case 'd':
+ 			debug_mode = 1;
  			break;
- 		case 'v':
-+			if (progress) {
-+				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
-+				exit(1);
-+			}
- 			verbose++;
- 			break;
-+		case 'p':
-+			if (verbose) {
-+				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
-+				usage(argv[0]);
-+			}
-+			progress = 1;
++		case 'v':
++			verbose_mode = 1;
 +			break;
- 		case 'W':
- 			warn_no_match = 1;
- 			break;
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
---- nsapolicycoreutils/setsebool/setsebool.8	2006-05-15 09:42:58.000000000 -0400
-+++ policycoreutils-1.30.14/setsebool/setsebool.8	2006-06-19 10:32:36.000000000 -0400
-@@ -9,8 +9,7 @@
- .SH "DESCRIPTION"
- .B setsebool 
- sets the current state of a particular SELinux boolean or a list of booleans 
--to a given value. The value may be 1 or true to enable the boolean, or 0 or 
--false to disable it. 
-+to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it. 
- 
- Without the -P option, only the current boolean value is 
- affected; the boot-time default settings 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.30.14/setsebool/setsebool.c
---- nsapolicycoreutils/setsebool/setsebool.c	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/setsebool/setsebool.c	2006-06-19 10:32:04.000000000 -0400
-@@ -197,10 +197,12 @@
- 		*value_ptr = 0;
- 		value_ptr++;
- 		if (strcmp(value_ptr, "1") == 0 || 
--				strcasecmp(value_ptr, "true") == 0)
-+		    strcasecmp(value_ptr, "true") == 0 ||
-+		    strcasecmp(value_ptr, "on") == 0)
- 			value = 1;
- 		else if (strcmp(value_ptr, "0") == 0 || 
--				strcasecmp(value_ptr, "false") == 0)
-+			 strcasecmp(value_ptr, "false") == 0 ||
-+			 strcasecmp(value_ptr, "off") == 0)
- 			value = 0;
- 		else {
- 			fprintf(stderr, "setsebool: illegal value "
+ 		case '?':
+ 			usage(argv[0]);
+ 		}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- policycoreutils.spec	7 Jul 2006 11:34:10 -0000	1.290
+++ policycoreutils.spec	11 Jul 2006 19:29:29 -0000	1.291
@@ -5,10 +5,11 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat 
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -109,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jul 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-2
+- Add verbose flag to restorecond and update translations
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-1
 - Update to upstream
 	* Lindent.



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:47:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:47:22 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.480, 1.481 kernel-2.6.spec, 1.2365,
	1.2366 sources, 1.424, 1.425 upstream, 1.391,
	1.392 patch-2.6.18-rc1-git2.bz2.sign, 1.1, NONE
Message-ID: <200607111947.k6BJlMAl003506@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1-git4.bz2.sign 
Removed Files:
	patch-2.6.18-rc1-git2.bz2.sign 
Log Message:
git4



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

iD8DBQBEs03byGugalF9Dw4RAoXUAJ4iTaFCJCI40uk5CADAr5Pwp7q/cACdGbZZ
+2twBXpLiDb6MPyhndmAHgU=
=o7Hq
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- .cvsignore	10 Jul 2006 15:20:10 -0000	1.480
+++ .cvsignore	11 Jul 2006 19:47:20 -0000	1.481
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git3.bz2
+patch-2.6.18-rc1-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2365
retrieving revision 1.2366
diff -u -r1.2365 -r1.2366
--- kernel-2.6.spec	11 Jul 2006 06:58:26 -0000	1.2365
+++ kernel-2.6.spec	11 Jul 2006 19:47:20 -0000	1.2366
@@ -248,7 +248,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git3.bz2
+Patch2: patch-2.6.18-rc1-git4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1581,6 +1581,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git4
+
 * Mon Jul 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git3
 - Big bunch o' lockdep patches from Arjan.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- sources	10 Jul 2006 15:20:11 -0000	1.424
+++ sources	11 Jul 2006 19:47:20 -0000	1.425
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-405f71057c99366d8ca309e44340cbbe  patch-2.6.18-rc1-git3.bz2
+2791811fbe1ea3e9da75096144f4d67c  patch-2.6.18-rc1-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -r1.391 -r1.392
--- upstream	10 Jul 2006 15:20:11 -0000	1.391
+++ upstream	11 Jul 2006 19:47:20 -0000	1.392
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git3.bz2
+patch-2.6.18-rc1-git4.bz2


--- patch-2.6.18-rc1-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 11 19:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 15:55:30 -0400
Subject: rpms/kernel/devel/configs config-generic,1.216,1.217
Message-ID: <200607111955.k6BJtUtR018691@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable for testing


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- config-generic	10 Jul 2006 16:31:29 -0000	1.216
+++ config-generic	11 Jul 2006 19:55:27 -0000	1.217
@@ -2563,8 +2563,11 @@
 CONFIG_DEBUG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
+
+# Reenable
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# Reenable
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
@@ -2572,7 +2575,8 @@
 # They aren't that much of a performance impact, and the value
 # from getting out-of-tree modules fixed is worth the trade-off.
 CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SPINLOCK=y
+# Reenable
+# CONFIG_DEBUG_SPINLOCK is not set
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y



From fedora-cvs-commits at redhat.com  Tue Jul 11 20:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 16:09:52 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.6,1.7
Message-ID: <200607112009.k6BK9qqW019112@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
hmm, cvs wierds me out.


linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   10 ++++--
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/fs/block_dev.c               |    2 -
 linux-2.6.18-rc1/fs/sysfs/inode.c             |   39 ++++++++++++++++++++++++++
 linux-2.6.18-rc1/include/linux/libps2.h       |    7 ++++
 5 files changed, 56 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-lockdep-fixes.patch	10 Jul 2006 15:32:49 -0000	1.6
+++ linux-2.6-lockdep-fixes.patch	11 Jul 2006 20:09:47 -0000	1.7
@@ -1,120 +1,3 @@
-From davej  Tue Jul  4 11:14:48 2006
-Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932219AbWGDPNk at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
-	version=3.1.3
-Envelope-to: davej at kernelslacker.org
-Delivery-date: Tue, 04 Jul 2006 16:14:06 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Tue, 04 Jul 2006 11:14:48 -0400 (EDT)
-Received: from vger.kernel.org ([209.132.176.167])
-	by testure.choralone.org with esmtp (Exim 4.62)
-	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S932219AbWGDPNk at vger.kernel.org>)
-	id 1FxmbF-0005Ps-OM
-	for davej at kernelslacker.org; Tue, 04 Jul 2006 16:14:06 +0100
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S932219AbWGDPNk (ORCPT <rfc822;davej at kernelslacker.org>);
-	Tue, 4 Jul 2006 11:13:40 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932210AbWGDPNj
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Tue, 4 Jul 2006 11:13:39 -0400
-Received: from pentafluge.infradead.org ([213.146.154.40]:62345 "EHLO
-	pentafluge.infradead.org") by vger.kernel.org with ESMTP
-	id S932209AbWGDPNi (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
-	Tue, 4 Jul 2006 11:13:38 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1Fxmah-00067s-IM; Tue, 04 Jul 2006 16:13:31 +0100
-Subject: Re: [BUG] scsi/io-elevator held lock freed.
-From:	Arjan van de Ven <arjan at infradead.org>
-To:	Daniel Walker <dwalker at mvista.com>
-Cc:	mingo at elte.hu, linux-kernel at vger.kernel.org,
-	linux-scsi at vger.kernel.org
-In-Reply-To: <1152024854.29262.5.camel at c-67-180-134-207.hsd1.ca.comcast.net>
-References: <1152024854.29262.5.camel at c-67-180-134-207.hsd1.ca.comcast.net>
-Content-Type: text/plain
-Date:	Tue, 04 Jul 2006 17:13:30 +0200
-Message-Id: <1152026010.3109.66.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-Sender:	linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-kernel at vger.kernel.org
-Status: RO
-Content-Length: 2141
-Lines: 64
-
-On Tue, 2006-07-04 at 07:54 -0700, Daniel Walker wrote:
-> I got this during boot. I booted the same kernel several times, and only
-> saw it once. The kernel was 2.6.17-mm5 .
-> 
-> Daniel
-> 
-> 
-> =========================
-> [ BUG: held lock freed! ]
-> -------------------------
-> swapper/1 is freeing memory f73a8580-f73a867f, with a lock still held there!
-> 2 locks held by swapper/1:
->  #0:  (&shost->scan_mutex){--..}, at: [<c0419098>] mutex_lock+0x8/0x10
->  #1:  (&eq->sysfs_lock){--..}, at: [<c0419098>] mutex_lock+0x8/0x10
-
-blargh.. it'd be more useful if lockdep actually printed which lock it
-is that it thinks is about to get freed.....
-
-this patch ought to make it do that; could you at least add this to your
-kernel?
-
-Ingo, is this the right approach?
-
----
- kernel/lockdep.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: linux-2.6.17-mm6/kernel/lockdep.c
-===================================================================
---- linux-2.6.17-mm6.orig/kernel/lockdep.c
-+++ linux-2.6.17-mm6/kernel/lockdep.c
-@@ -2571,7 +2571,7 @@ static inline int in_range(const void *s
- 
- static void
- print_freed_lock_bug(struct task_struct *curr, const void *mem_from,
--		     const void *mem_to)
-+		     const void *mem_to, struct held_lock *hlock)
- {
- 	if (!debug_locks_off())
- 		return;
-@@ -2583,6 +2583,7 @@ print_freed_lock_bug(struct task_struct 
- 	printk(  "-------------------------\n");
- 	printk("%s/%d is freeing memory %p-%p, with a lock still held there!\n",
- 		curr->comm, curr->pid, mem_from, mem_to-1);
-+	print_lock(hlock);
- 	lockdep_print_held_locks(curr);
- 
- 	printk("\nstack backtrace:\n");
-@@ -2616,7 +2617,7 @@ void debug_check_no_locks_freed(const vo
- 					!in_range(mem_from, lock_to, mem_to))
- 			continue;
- 
--		print_freed_lock_bug(curr, mem_from, mem_to);
-+		print_freed_lock_bug(curr, mem_from, mem_to, hlock);
- 		break;
- 	}
- 	local_irq_restore(flags);
-
-
--
-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/
-
 From davej  Tue Jul  4 14:33:56 2006
 Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S932295AbWGDSc4 at vger.kernel.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
@@ -244,379 +127,6 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
-From davej  Wed Jul  5 04:57:59 2006
-Return-Path: <mingo at elte.hu>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Wed, 05 Jul 2006 04:57:59 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Wed, 05 Jul 2006 04:57:07 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k658v7lx024066
-	for <davej at pobox.devel.redhat.com>; Wed, 5 Jul 2006 04:57:07 -0400
-Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k658v6Ru009372
-	for <davej at redhat.com>; Wed, 5 Jul 2006 04:57:06 -0400
-Received: from mx3.mail.elte.hu (mx3.mail.elte.hu [157.181.1.138])
-	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k658v5bS027637
-	for <davej at redhat.com>; Wed, 5 Jul 2006 04:57:06 -0400
-Received: from chiara.elte.hu ([157.181.151.252])
-	by mx3.mail.elte.hu with esmtp (Exim)
-	id 1Fy3Bp-00006f-N2
-	from <mingo at elte.hu>; Wed, 05 Jul 2006 10:56:58 +0200
-Received: by chiara.elte.hu (Postfix, from userid 17806)
-	id 1D2361FC2; Wed,  5 Jul 2006 10:56:59 +0200 (CEST)
-Date: Wed, 5 Jul 2006 10:52:29 +0200
-From: Ingo Molnar <mingo at elte.hu>
-To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
-Cc: linux-kernel at vger.kernel.org, Dave Jones <davej at redhat.com>,
-        Arjan van de Ven <arjan at infradead.org>
-Subject: [patch] lockdep: core, reduce per-lock class-cache size
-Message-ID: <20060705085229.GA8918 at elte.hu>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.4.2.1i
-Received-SPF: softfail (mx3: transitioning domain of elte.hu does not designate 157.181.151.252 as permitted sender) client-ip=157.181.151.252; envelope-from=mingo at elte.hu; helo=chiara.elte.hu;
-X-ELTE-SpamScore: 0.1
-X-ELTE-SpamLevel: 
-X-ELTE-SpamCheck: no
-X-ELTE-SpamVersion: ELTE 2.0 
-X-ELTE-SpamCheck-Details: score=0.1 required=5.9 tests=AWL,BAYES_50 autolearn=no SpamAssassin version=3.0.3
-	0.0 BAYES_50               BODY: Bayesian spam probability is 40 to 60%
-	[score: 0.5007]
-	0.1 AWL                    AWL: From: address is in the auto white-list
-X-ELTE-VirusStatus: clean
-X-RedHat-Spam-Score: 0 
-Status: RO
-Content-Length: 5396
-Lines: 195
-
-Subject: lockdep: core, reduce per-lock class-cache size
-From: Ingo Molnar <mingo at elte.hu>
-
-lockdep_map is embedded into every lock, which blows up data structure
-sizes all around the kernel. Reduce the class-cache to be for the
-default class only - that is used in 99.9% of the cases and even if
-we dont have a class cached, the lookup in the class-hash is lockless.
-
-this change reduces the per-lock dep_map overhead by 56 bytes on 64-bit
-platforms and by 28 bytes on 32-bit platforms.
-
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
----
- include/linux/lockdep.h |    2 -
- kernel/lockdep.c        |   87 +++++++++++++++++++++++++++++-------------------
- 2 files changed, 55 insertions(+), 34 deletions(-)
-
-Index: linux/include/linux/lockdep.h
-===================================================================
---- linux.orig/include/linux/lockdep.h
-+++ linux/include/linux/lockdep.h
-@@ -120,7 +120,7 @@ struct lock_class {
-  */
- struct lockdep_map {
- 	struct lock_class_key		*key;
--	struct lock_class		*class[MAX_LOCKDEP_SUBCLASSES];
-+	struct lock_class		*class_cache;
- 	const char			*name;
- };
- 
-Index: linux/kernel/lockdep.c
-===================================================================
---- linux.orig/kernel/lockdep.c
-+++ linux/kernel/lockdep.c
-@@ -1104,7 +1104,7 @@ extern void __error_too_big_MAX_LOCKDEP_
-  * itself, so actual lookup of the hash should be once per lock object.
-  */
- static inline struct lock_class *
--register_lock_class(struct lockdep_map *lock, unsigned int subclass)
-+look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
- {
- 	struct lockdep_subclass_key *key;
- 	struct list_head *hash_head;
-@@ -1148,7 +1148,26 @@ register_lock_class(struct lockdep_map *
- 	 */
- 	list_for_each_entry(class, hash_head, hash_entry)
- 		if (class->key == key)
--			goto out_set;
-+			return class;
-+
-+	return NULL;
-+}
-+
-+/*
-+ * Register a lock's class in the hash-table, if the class is not present
-+ * yet. Otherwise we look it up. We cache the result in the lock object
-+ * itself, so actual lookup of the hash should be once per lock object.
-+ */
-+static inline struct lock_class *
-+register_lock_class(struct lockdep_map *lock, unsigned int subclass)
-+{
-+	struct lockdep_subclass_key *key;
-+	struct list_head *hash_head;
-+	struct lock_class *class;
-+
-+	class = look_up_lock_class(lock, subclass);
-+	if (likely(class))
-+		return class;
- 
- 	/*
- 	 * Debug-check: all keys must be persistent!
-@@ -1163,6 +1182,9 @@ register_lock_class(struct lockdep_map *
- 		return NULL;
- 	}
- 
-+	key = lock->key->subkeys + subclass;
-+	hash_head = classhashentry(key);
-+
- 	__raw_spin_lock(&hash_lock);
- 	/*
- 	 * We have to do the hash-walk again, to avoid races
-@@ -1209,8 +1231,8 @@ register_lock_class(struct lockdep_map *
- out_unlock_set:
- 	__raw_spin_unlock(&hash_lock);
- 
--out_set:
--	lock->class[subclass] = class;
-+	if (!subclass)
-+		lock->class_cache = class;
- 
- 	DEBUG_LOCKS_WARN_ON(class->subclass != subclass);
- 
-@@ -1914,7 +1936,7 @@ void lockdep_init_map(struct lockdep_map
- 	}
- 	lock->name = name;
- 	lock->key = key;
--	memset(lock->class, 0, sizeof(lock->class[0])*MAX_LOCKDEP_SUBCLASSES);
-+	lock->class_cache = NULL;
- }
- 
- EXPORT_SYMBOL_GPL(lockdep_init_map);
-@@ -1928,8 +1950,8 @@ static int __lock_acquire(struct lockdep
- 			  unsigned long ip)
- {
- 	struct task_struct *curr = current;
-+	struct lock_class *class = NULL;
- 	struct held_lock *hlock;
--	struct lock_class *class;
- 	unsigned int depth, id;
- 	int chain_head = 0;
- 	u64 chain_key;
-@@ -1947,8 +1969,11 @@ static int __lock_acquire(struct lockdep
- 		return 0;
- 	}
- 
--	class = lock->class[subclass];
--	/* not cached yet? */
-+	if (!subclass)
-+		class = lock->class_cache;
-+	/*
-+	 * Not cached yet or subclass?
-+	 */
- 	if (unlikely(!class)) {
- 		class = register_lock_class(lock, subclass);
- 		if (!class)
-@@ -2449,48 +2474,44 @@ void lockdep_free_key_range(void *start,
- 
- void lockdep_reset_lock(struct lockdep_map *lock)
- {
--	struct lock_class *class, *next, *entry;
-+	struct lock_class *class, *next;
- 	struct list_head *head;
- 	unsigned long flags;
- 	int i, j;
- 
- 	raw_local_irq_save(flags);
--	__raw_spin_lock(&hash_lock);
- 
- 	/*
--	 * Remove all classes this lock has:
-+	 * Remove all classes this lock might have:
- 	 */
-+	for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
-+		/*
-+		 * If the class exists we look it up and zap it:
-+		 */
-+		class = look_up_lock_class(lock, j);
-+		if (class)
-+			zap_class(class);
-+	}
-+	/*
-+	 * Debug check: in the end all mapped classes should
-+	 * be gone.
-+	 */
-+	__raw_spin_lock(&hash_lock);
- 	for (i = 0; i < CLASSHASH_SIZE; i++) {
- 		head = classhash_table + i;
- 		if (list_empty(head))
- 			continue;
- 		list_for_each_entry_safe(class, next, head, hash_entry) {
--			for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
--				entry = lock->class[j];
--				if (class == entry) {
--					zap_class(class);
--					lock->class[j] = NULL;
--					break;
--				}
-+			if (unlikely(class == lock->class_cache)) {
-+				__raw_spin_unlock(&hash_lock);
-+				DEBUG_LOCKS_WARN_ON(1);
-+				goto out_restore;
- 			}
- 		}
- 	}
--
--	/*
--	 * Debug check: in the end all mapped classes should
--	 * be gone.
--	 */
--	for (j = 0; j < MAX_LOCKDEP_SUBCLASSES; j++) {
--		entry = lock->class[j];
--		if (!entry)
--			continue;
--		__raw_spin_unlock(&hash_lock);
--		DEBUG_LOCKS_WARN_ON(1);
--		raw_local_irq_restore(flags);
--		return;
--	}
--
- 	__raw_spin_unlock(&hash_lock);
-+
-+out_restore:
- 	raw_local_irq_restore(flags);
- }
- 
-
-From davej  Wed Jul  5 06:05:34 2006
-Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S964781AbWGEJ7B at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
-	version=3.1.3
-Envelope-to: davej at kernelslacker.org
-Delivery-date: Wed, 05 Jul 2006 10:59:26 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Wed, 05 Jul 2006 06:05:34 -0400 (EDT)
-Received: from vger.kernel.org ([209.132.176.167])
-	by testure.choralone.org with esmtp (Exim 4.62)
-	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S964781AbWGEJ7B at vger.kernel.org>)
-	id 1Fy4AH-0002mo-GQ
-	for davej at kernelslacker.org; Wed, 05 Jul 2006 10:59:26 +0100
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S964781AbWGEJ7B (ORCPT <rfc822;davej at kernelslacker.org>);
-	Wed, 5 Jul 2006 05:59:01 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S964785AbWGEJ7B
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Wed, 5 Jul 2006 05:59:01 -0400
-Received: from mx3.mail.elte.hu ([157.181.1.138]:55998 "EHLO mx3.mail.elte.hu")
-	by vger.kernel.org with ESMTP id S964781AbWGEJ7A (ORCPT
-	<rfc822;linux-kernel at vger.kernel.org>);
-	Wed, 5 Jul 2006 05:59:00 -0400
-Received: from chiara.elte.hu ([157.181.151.252])
-	by mx3.mail.elte.hu with esmtp (Exim)
-	id 1Fy49l-0004H2-FQ
-	from <mingo at elte.hu>; Wed, 05 Jul 2006 11:58:53 +0200
-Received: by chiara.elte.hu (Postfix, from userid 17806)
-	id E6E571FC2; Wed,  5 Jul 2006 11:58:54 +0200 (CEST)
-Date:	Wed, 5 Jul 2006 11:54:25 +0200
-From:	Ingo Molnar <mingo at elte.hu>
-To:	Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
-Cc:	linux-kernel at vger.kernel.org,
-	Arjan van de Ven <arjan at infradead.org>
-Subject: [patch] uninline init_waitqueue_*() functions, fix
-Message-ID: <20060705095425.GA13874 at elte.hu>
-References: <20060705084914.GA8798 at elte.hu>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <20060705084914.GA8798 at elte.hu>
-User-Agent: Mutt/1.4.2.1i
-Received-SPF: softfail (mx3: transitioning domain of elte.hu does not designate 157.181.151.252 as permitted sender) client-ip=157.181.151.252; envelope-from=mingo at elte.hu; helo=chiara.elte.hu;
-X-ELTE-SpamScore: 0.1
-X-ELTE-SpamLevel: 
-X-ELTE-SpamCheck: no
-X-ELTE-SpamVersion: ELTE 2.0 
-X-ELTE-SpamCheck-Details: score=0.1 required=5.9 tests=AWL,BAYES_50 autolearn=no SpamAssassin version=3.0.3
-	0.0 BAYES_50               BODY: Bayesian spam probability is 40 to 60%
-	[score: 0.5011]
-	0.1 AWL                    AWL: From: address is in the auto white-list
-X-ELTE-VirusStatus: clean
-Sender:	linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-kernel at vger.kernel.org
-Status: RO
-Content-Length: 2171
-Lines: 58
-
-Subject: uninline init_waitqueue_*() functions, fix
-From: Ingo Molnar <mingo at elte.hu>
-
-fix lockdep on-stack-completion initializer, now that waitqueue_lock_key 
-is private to kernel/wait.c.
-
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
----
- arch/x86_64/kernel/smpboot.c |    4 +---
- include/linux/completion.h   |    5 ++++-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-Index: linux/arch/x86_64/kernel/smpboot.c
-===================================================================
---- linux.orig/arch/x86_64/kernel/smpboot.c
-+++ linux/arch/x86_64/kernel/smpboot.c
-@@ -771,12 +771,10 @@ static int __cpuinit do_boot_cpu(int cpu
- 	unsigned long start_rip;
- 	struct create_idle c_idle = {
- 		.cpu = cpu,
--		.done = COMPLETION_INITIALIZER(c_idle.done),
-+		.done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),
- 	};
- 	DECLARE_WORK(work, do_fork_idle, &c_idle);
- 
--	lockdep_set_class(&c_idle.done.wait.lock, &waitqueue_lock_key);
--
- 	/* allocate memory for gdts of secondary cpus. Hotplug is considered */
- 	if (!cpu_gdt_descr[cpu].address &&
- 		!(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) {
-Index: linux/include/linux/completion.h
-===================================================================
---- linux.orig/include/linux/completion.h
-+++ linux/include/linux/completion.h
-@@ -18,6 +18,9 @@ struct completion {
- #define COMPLETION_INITIALIZER(work) \
- 	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
- 
-+#define COMPLETION_INITIALIZER_ONSTACK(work) \
-+	({ init_completion(&work); work; })
-+
- #define DECLARE_COMPLETION(work) \
- 	struct completion work = COMPLETION_INITIALIZER(work)
- 
-@@ -28,7 +31,7 @@ struct completion {
-  */
- #ifdef CONFIG_LOCKDEP
- # define DECLARE_COMPLETION_ONSTACK(work) \
--	struct completion work = ({ init_completion(&work); work; })
-+	struct completion work = COMPLETION_INITIALIZER_ONSTACK(work)
- #else
- # define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work)
- #endif
--
-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/
-
 From davej  Fri Jul  7 03:35:19 2006
 Return-Path: <SRS0+ef490921a1c7f4a961d7+1048+infradead.org+arjan at pentafluge.srs.infradead.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
@@ -694,224 +204,6 @@
  	module_put(owner);
 
 
-From davej  Mon Jul 10 07:52:23 2006
-Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Mon, 10 Jul 2006 07:52:23 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Mon, 10 Jul 2006 07:51:55 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6ABps7v003580
-	for <davej at pobox.devel.redhat.com>; Mon, 10 Jul 2006 07:51:54 -0400
-Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6ABpsGG020974
-	for <davej at redhat.com>; Mon, 10 Jul 2006 07:51:54 -0400
-Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
-	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6ABprOh027001
-	for <Davej at redhat.com>; Mon, 10 Jul 2006 07:51:53 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1FzuIl-0004cv-It
-	for Davej at redhat.com; Mon, 10 Jul 2006 12:51:47 +0100
-Subject: a few lockdep patches for rawhide
-From: Arjan van de Ven <arjan at infradead.org>
-To: Davej at redhat.com
-Content-Type: multipart/mixed; boundary="=-bGjXZLP5LdReK7Mxtci4"
-Date: Mon, 10 Jul 2006 13:51:46 +0200
-Message-Id: <1152532306.4874.28.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-X-RedHat-Spam-Score: 2.646 **
-Status: RO
-X-Status: A
-Content-Length: 5441
-Lines: 174
-
-
---=-bGjXZLP5LdReK7Mxtci4
-Content-Type: text/plain
-Content-Transfer-Encoding: 7bit
-
-Hi,
-
-please stick these into rawhide even before akpm sends them to linus..
-just to cut down the false positives
-
-Greetings,
-   Arjan van de Ven
-
---=-bGjXZLP5LdReK7Mxtci4
-Content-Disposition: attachment; filename=bt2.patch
-Content-Type: text/x-patch; name=bt2.patch; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-Index: linux-2.6.18-rc1/net/bluetooth/l2cap.c
-===================================================================
---- linux-2.6.18-rc1.orig/net/bluetooth/l2cap.c
-+++ linux-2.6.18-rc1/net/bluetooth/l2cap.c
-@@ -185,7 +185,7 @@ static inline void l2cap_chan_unlink(str
- {
- 	struct sock *next = l2cap_pi(sk)->next_c, *prev = l2cap_pi(sk)->prev_c;
- 
--	write_lock(&l->lock);
-+	write_lock_bh(&l->lock);
- 	if (sk == l->head)
- 		l->head = next;
- 
-@@ -193,7 +193,7 @@ static inline void l2cap_chan_unlink(str
- 		l2cap_pi(next)->prev_c = prev;
- 	if (prev)
- 		l2cap_pi(prev)->next_c = next;
--	write_unlock(&l->lock);
-+	write_unlock_bh(&l->lock);
- 
- 	__sock_put(sk);
- }
-@@ -313,9 +313,9 @@ static void l2cap_conn_del(struct hci_co
- static inline void l2cap_chan_add(struct l2cap_conn *conn, struct sock *sk, struct sock *parent)
- {
- 	struct l2cap_chan_list *l = &conn->chan_list;
--	write_lock(&l->lock);
-+	write_lock_bh(&l->lock);
- 	__l2cap_chan_add(conn, sk, parent);
--	write_unlock(&l->lock);
-+	write_unlock_bh(&l->lock);
- }
- 
- static inline u8 l2cap_get_ident(struct l2cap_conn *conn)
-@@ -328,14 +328,14 @@ static inline u8 l2cap_get_ident(struct 
- 	 *  200 - 254 are used by utilities like l2ping, etc.
- 	 */
- 
--	spin_lock(&conn->lock);
-+	spin_lock_bh(&conn->lock);
- 
- 	if (++conn->tx_ident > 128)
- 		conn->tx_ident = 1;
- 
- 	id = conn->tx_ident;
- 
--	spin_unlock(&conn->lock);
-+	spin_unlock_bh(&conn->lock);
- 
- 	return id;
- }
-@@ -1416,11 +1416,11 @@ static inline int l2cap_connect_req(stru
- 	if (!sk)
- 		goto response;
- 
--	write_lock(&list->lock);
-+	write_lock_bh(&list->lock);
- 
- 	/* Check if we already have channel with that dcid */
- 	if (__l2cap_get_chan_by_dcid(list, scid)) {
--		write_unlock(&list->lock);
-+		write_unlock_bh(&list->lock);
- 		sock_set_flag(sk, SOCK_ZAPPED);
- 		l2cap_sock_kill(sk);
- 		goto response;
-@@ -1458,7 +1458,7 @@ static inline int l2cap_connect_req(stru
- 	result = status = 0;
- 
- done:
--	write_unlock(&list->lock);
-+	write_unlock_bh(&list->lock);
- 
- response:
- 	bh_unlock_sock(parent);
-
---=-bGjXZLP5LdReK7Mxtci4
-Content-Disposition: attachment; filename=lockdep-off-on-oops.patch
-Content-Type: message/rfc822; name=lockdep-off-on-oops.patch
-
-From: Arjan van de Ven <arjan at linux.intel.com>
-Subject: lockdep: disable lock debugging when kernel state becomes untrusted
-Date: Mon, 10 Jul 2006 13:51:43 +0200
-Message-Id: <1152532303.4874.27.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-Content-Transfer-Encoding: 7bit
-
-This patch disables lockdep debugging in two situations where the integrity
-of the kernel no longer is guaranteed: when oopsing and when hitting a
-tainting-condition. The goal is to not get weird lockdep traces that don't
-make sense or are otherwise undebuggable, to not waste time.
-
-Lockdep assumes that the previous state it knows about is valid to operate,
-which is why lockdep turns itself off after the first violation it reports,
-after that point it can no longer make that assumption.
-
-A kernel oops means that the integrity of the kernel compromised; in addition
-anything lockdep would report is of lesser importance than the oops.
-
-All the tainting conditions are of similar integrity-violating nature and also
-make debugging/diagnosing more difficult.
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-Signed-off-by: Ingo Molnar <mingo at elte.hu>
-
-
-Index: linux-2.6.18-rc1/kernel/panic.c
-===================================================================
---- linux-2.6.18-rc1.orig/kernel/panic.c
-+++ linux-2.6.18-rc1/kernel/panic.c
-@@ -172,6 +172,7 @@ const char *print_tainted(void)
- 
- void add_taint(unsigned flag)
- {
-+	debug_locks_off(); /* can't trust the integrity of the kernel anymore */
- 	tainted |= flag;
- }
- EXPORT_SYMBOL(add_taint);
-@@ -256,6 +257,7 @@ int oops_may_print(void)
-  */
- void oops_enter(void)
- {
-+	debug_locks_off(); /* can't trust the integrity of the kernel anymore */
- 	do_oops_enter_exit();
- }
- 
-
---=-bGjXZLP5LdReK7Mxtci4
-Content-Disposition: attachment; filename=skbuff.patch
-Content-Type: text/x-patch; name=skbuff.patch; charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-Index: linux-2.6.18-rc1/include/linux/skbuff.h
-===================================================================
---- linux-2.6.18-rc1.orig/include/linux/skbuff.h
-+++ linux-2.6.18-rc1/include/linux/skbuff.h
-@@ -606,10 +606,17 @@ static inline __u32 skb_queue_len(const 
- 
- extern struct lock_class_key skb_queue_lock_key;
- 
-+/*
-+ * This function creates a split out lock class for each invocation;
-+ * this is needed for now since a whole lot of users of the skb-queue
-+ * infrastructure in drivers have different locking usage (in hardirq)
-+ * than the networking core (in softirq only). In the long run either the
-+ * network layer or drivers should need annotation to consolidate the
-+ * main types of usage into 3 classes.
-+ */
- static inline void skb_queue_head_init(struct sk_buff_head *list)
- {
- 	spin_lock_init(&list->lock);
--	lockdep_set_class(&list->lock, &skb_queue_lock_key);
- 	list->prev = list->next = (struct sk_buff *)list;
- 	list->qlen = 0;
- }
-
---=-bGjXZLP5LdReK7Mxtci4--
-
 From davej  Mon Jul 10 10:08:02 2006
 Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 



From fedora-cvs-commits at redhat.com  Tue Jul 11 20:34:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 16:34:23 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.8, 1.9 libdhcp.spec, 1.26,
	1.27 sources, 1.20, 1.21
Message-ID: <200607112034.k6BKYNXr002430@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2415

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Jun 2006 19:11:47 -0000	1.8
+++ .cvsignore	11 Jul 2006 20:34:21 -0000	1.9
@@ -1 +1 @@
-libdhcp-1.6.tar.gz
+libdhcp-1.7.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libdhcp.spec	28 Jun 2006 19:38:39 -0000	1.26
+++ libdhcp.spec	11 Jul 2006 20:34:21 -0000	1.27
@@ -1,6 +1,6 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.6
+Version: 	1.7
 Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
@@ -76,6 +76,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Tue Jul 11 2006 David Cantrell <dcantrell at redhat.com> - 1.7-1
+- Poll nic_get_links() until NLMSG_DONE is received (#197172)
+
 * Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 1.6-1
 - fix two memory leaks in dhcpv4_control_va
 - fix memory leaks in dhcp_nic_va


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	28 Jun 2006 19:38:39 -0000	1.20
+++ sources	11 Jul 2006 20:34:21 -0000	1.21
@@ -1 +1 @@
-1a78ad19dc203562541f030e38c1d6fb  libdhcp-1.6.tar.gz
+73c782ab52e98a6f6f33f3cb9233d6a4  libdhcp-1.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 11 20:38:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 16:38:57 -0400
Subject: rpms/gwenhywfar/devel .cvsignore, 1.3, 1.4 gwenhywfar.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200607112038.k6BKcvJR002563@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gwenhywfar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2542

Modified Files:
	.cvsignore gwenhywfar.spec sources 
Log Message:
update to 2.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Dec 2005 07:35:22 -0000	1.3
+++ .cvsignore	11 Jul 2006 20:38:55 -0000	1.4
@@ -1 +1,2 @@
 gwenhywfar-1.99.2.tar.gz
+gwenhywfar-2.3.0.tar.gz


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gwenhywfar.spec	11 Feb 2006 03:23:56 -0000	1.9
+++ gwenhywfar.spec	11 Jul 2006 20:38:55 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
-Version: 1.99.2
-Release: 1.2
+Version: 2.3.0
+Release: 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 Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.3.0-1
+- update to 2.3.0
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.99.2-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2005 07:35:22 -0000	1.3
+++ sources	11 Jul 2006 20:38:55 -0000	1.4
@@ -1 +1,2 @@
 d50cb7d35c5778c3d442b581b98a8162  gwenhywfar-1.99.2.tar.gz
+0f7cf7d0efa6719f85c00d6d8ccec2b3  gwenhywfar-2.3.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 11 20:41:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 16:41:23 -0400
Subject: rpms/hwdata/devel hwdata.spec,1.68,1.69
Message-ID: <200607112041.k6BKfNEc013767@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13742

Modified Files:
	hwdata.spec 
Log Message:
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 0.182-1
- Added ast driver description to videodrivers
- Numerous Dell monitor additions (#196734)
- Numerous Belinea monitor additions (#198087)



Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- hwdata.spec	9 Jul 2006 00:06:10 -0000	1.68
+++ hwdata.spec	11 Jul 2006 20:41:20 -0000	1.69
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.181
+Version: 0.182
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,11 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 0.182-1
+- Added ast driver description to videodrivers
+- Numerous Dell monitor additions (#196734)
+- Numerous Belinea monitor additions (#198087)
+
 * Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> - 0.181-1
 - Updated videodrivers to mention i945
 - New monitors: Sony CPD-G420 (#145902), Compaq P1110 (#155120).



From fedora-cvs-commits at redhat.com  Tue Jul 11 20:55:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 16:55:07 -0400
Subject: rpms/aqbanking/devel .cvsignore, 1.3, 1.4 aqbanking-aclocal.patch,
	1.1, 1.2 aqbanking.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200607112055.k6BKt7ON001293@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1212

Modified Files:
	.cvsignore aqbanking-aclocal.patch aqbanking.spec sources 
Log Message:
update to 2.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Dec 2005 07:44:46 -0000	1.3
+++ .cvsignore	11 Jul 2006 20:55:05 -0000	1.4
@@ -1,2 +1,3 @@
 aqbanking-1.8.1beta.tar.gz
 aqbanking-1.8.1beta-gladesrc.tar.gz
+aqbanking-2.1.0.tar.gz

aqbanking-aclocal.patch:
 aclocal.m4 |   37 +++++++++----------------------------
 m4/qt3.m4  |    2 +-
 2 files changed, 10 insertions(+), 29 deletions(-)

Index: aqbanking-aclocal.patch
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking-aclocal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aqbanking-aclocal.patch	22 Dec 2005 07:44:46 -0000	1.1
+++ aqbanking-aclocal.patch	11 Jul 2006 20:55:05 -0000	1.2
@@ -1,22 +1,5 @@
 --- aqbanking-1.8.1beta/aclocal.m4.foo	2005-12-20 16:50:39.000000000 -0500
 +++ aqbanking-1.8.1beta/aclocal.m4	2005-12-20 16:50:43.000000000 -0500
-@@ -1,16 +1,3 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--# PARTICULAR PURPOSE.
--
- # $Id$
- # (c) 2002 Martin Preuss<martin at libchipcard.de>
- # This function checks for libgwenhywfar
 @@ -62,7 +49,7 @@
               /"])
  


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aqbanking.spec	12 Jun 2006 18:15:43 -0000	1.16
+++ aqbanking.spec	11 Jul 2006 20:55:05 -0000	1.17
@@ -1,15 +1,13 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
-Version: 1.8.1beta
-Release: 5
+Version: 2.1.0
+Release: 1
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
-Source1: aqbanking-%{version}-gladesrc.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqbanking
 Patch: aqbanking-libdir.patch
 Patch2: aqbanking-aclocal.patch
-Patch3: aqbanking-1.8.1beta-noglade.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
 BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool
@@ -38,9 +36,8 @@
 compiling programs using Aqbanking.
 
 %prep
-%setup -q -b 1
+%setup -q
 %patch -p1
-%patch3 -p1
 %patch2 -p1
 
 %build
@@ -82,6 +79,7 @@
 /usr/lib/python2.4/site-packages/%{name}
 %{_datadir}/aqhbci
 %{_bindir}/*-tool
+%{_bindir}/qb-help
 
 %files devel
 %defattr(-,root,root)
@@ -93,6 +91,9 @@
 
 
 %changelog
+* Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-1
+- update to 2.1.0
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 1.8.1beta-5
 - buildreq autoconf, libtool
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Dec 2005 07:44:46 -0000	1.3
+++ sources	11 Jul 2006 20:55:05 -0000	1.4
@@ -1,2 +1,3 @@
 8d1ac71e00763fdba69ef438508bbd6e  aqbanking-1.8.1beta.tar.gz
 6a8518ae5685b09cc3e9cc4cdb26e5e0  aqbanking-1.8.1beta-gladesrc.tar.gz
+712b21f0354d4f890a02da4f8763768b  aqbanking-2.1.0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:09:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:09:46 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2366,1.2367
Message-ID: <200607112109.k6BL9kDv004373@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Build iSeries again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2366
retrieving revision 1.2367
diff -u -r1.2366 -r1.2367
--- kernel-2.6.spec	11 Jul 2006 19:47:20 -0000	1.2366
+++ kernel-2.6.spec	11 Jul 2006 21:09:43 -0000	1.2367
@@ -89,7 +89,7 @@
 #define signmodules 1
 %endif
 
-%ifarch ppc64
+%ifarch ppc64 ppc64iseries
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
 %define image_install_path boot
 #define signmodules 1
@@ -175,7 +175,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1581,6 +1581,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 David Woodhouse <dwmw2 at redhat.com>
+- Build iSeries again
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git4
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:10:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:10:58 -0400
Subject: rpms/kernel/devel linux-2.6-gfs2-dlm.patch,1.8,1.9
Message-ID: <200607112110.k6BLAwjc004988@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-gfs2-dlm.patch 
Log Message:
GFS2 update

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   29 
 fs/dlm/Makefile                    |   21 
 fs/dlm/ast.c                       |  167 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 ++++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  296 +++
 fs/dlm/device.c                    | 1239 ++++++++++++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  494 +++++
 fs/dlm/lock.c                      | 3547 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   50 
 fs/dlm/lockspace.c                 |  678 +++++++
 fs/dlm/lockspace.h                 |   24 
 fs/dlm/lowcomms.c                  | 1238 ++++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   89 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  106 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  762 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1103 +++++++++++
 fs/gfs2/bmap.h                     |   32 
 fs/gfs2/daemon.c                   |  196 ++
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1980 ++++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++++
 fs/gfs2/eattr.h                    |   97 +
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2285 +++++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  491 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  658 ++++++
 fs/gfs2/inode.c                    | 1357 ++++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 +++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  299 +++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 ++++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 ++++++++
 fs/gfs2/lops.h                     |   96 +
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  888 +++++++++
 fs/gfs2/meta_io.h                  |   89 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  304 +++
 fs/gfs2/ops_address.c              |  673 +++++++
 fs/gfs2/ops_address.h              |   17 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  285 ++
 fs/gfs2/ops_export.h               |   15 
 fs/gfs2/ops_file.c                 |  982 ++++++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  841 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 ++++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  472 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  195 ++
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/page.c                     |  268 ++
 fs/gfs2/page.h                     |   23 
 fs/gfs2/quota.c                    | 1286 +++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1529 +++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  928 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 ++++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 +++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  441 ++++
 include/linux/iflags.h             |  102 +
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   40 
 mm/filemap.c                       |    1 
 mm/readahead.c                     |    1 
 132 files changed, 40798 insertions(+), 20 deletions(-)

Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-gfs2-dlm.patch	5 Jul 2006 10:42:57 -0000	1.8
+++ linux-2.6-gfs2-dlm.patch	11 Jul 2006 21:10:56 -0000	1.9
@@ -18053,10 +18053,10 @@
 +
 diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
 new file mode 100644
-index 0000000..dbeb4ad
+index 0000000..7f362d0
 --- /dev/null
 +++ b/fs/gfs2/glock.c
-@@ -0,0 +1,2282 @@
+@@ -0,0 +1,2285 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -20026,8 +20026,11 @@
 +	if (gfs2_glmutex_trylock(gl)) {
 +		if (gl->gl_ops == &gfs2_inode_glops) {
 +			struct gfs2_inode *ip = gl->gl_object;
-+			if (ip)
++			if (ip == NULL) {
++				struct gfs2_sbd *sdp = gl->gl_sbd;
++				gfs2_assert_withdraw(sdp, gl->gl_state == LM_ST_UNLOCKED);
 +				goto out_schedule;
++			}
 +		}
 +		if (queue_empty(gl, &gl->gl_holders) &&
 +		    gl->gl_state != LM_ST_UNLOCKED &&
@@ -20041,7 +20044,7 @@
 +
 +	return;
 +
-+ out_schedule:
++out_schedule:
 +	gfs2_glmutex_unlock(gl);
 +	gfs2_glock_schedule_for_reclaim(gl);
 +	gfs2_glock_put(gl);
@@ -26166,7 +26169,7 @@
 +
 diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
 new file mode 100644
-index 0000000..483d4fa
+index 0000000..1596e94
 --- /dev/null
 +++ b/fs/gfs2/log.c
 @@ -0,0 +1,601 @@
@@ -26386,7 +26389,7 @@
 +
 +	error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy);
 +	if (!(!error && dbn)) {
-+		printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, dbn, lbn);
++		printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, (unsigned long long)dbn, lbn);
 +	}
 +	gfs2_assert_withdraw(sdp, !error && dbn);
 +



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:11:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2367,1.2368
Message-ID: <200607112111.k6BLBpeY005395@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
GFS2 update


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2367
retrieving revision 1.2368
diff -u -r1.2367 -r1.2368
--- kernel-2.6.spec	11 Jul 2006 21:09:43 -0000	1.2367
+++ kernel-2.6.spec	11 Jul 2006 21:11:49 -0000	1.2368
@@ -1583,6 +1583,7 @@
 %changelog
 * Tue Jul 11 2006 David Woodhouse <dwmw2 at redhat.com>
 - Build iSeries again
+- Minor GFS2 update
 
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git4



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:14:17 -0400
Subject: rpms/libXt/devel libXt.spec,1.21,1.22
Message-ID: <200607112114.k6BLEHDD006339@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6247

Modified Files:
	libXt.spec 
Log Message:
* Tue Jul 11 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3.fc6
- Add the {_datadir}/X11/app-defaults directory to the file manifest, as
  libXt is the canonical owner of the directory.  Discovered in (#198025).



Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libXt.spec	28 Jun 2006 19:29:32 -0000	1.21
+++ libXt.spec	11 Jul 2006 21:14:15 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.2
-Release: 2
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -60,6 +60,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# NOTE: Create app-defaults directory so this package can be the canonical
+# owner of the directory.
+mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -75,6 +78,7 @@
 %doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
+%dir %{_datadir}/X11/app-defaults
 
 %files devel
 %defattr(-,root,root,-)
@@ -127,6 +131,10 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Jul 11 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3.fc6
+- Add the {_datadir}/X11/app-defaults directory to the file manifest, as
+  libXt is the canonical owner of the directory.  Discovered in (#198025).
+
 * Wed Jun 28 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-2
 - Added libXt-1.0.2-libsm-fix.patch to remove libSM from the Requires: line
   in the installed pkgconfig file.  Apps should link against libSM if they



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:16:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:16:19 -0400
Subject: rpms/xterm/devel xterm.spec,1.43,1.44
Message-ID: <200607112116.k6BLGJDY012064@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11760

Modified Files:
	xterm.spec 
Log Message:
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 213-2.fc6
- Use correct dist tag in Release string.



Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xterm.spec	31 May 2006 21:59:18 -0000	1.43
+++ xterm.spec	11 Jul 2006 21:16:16 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 213
-Release: 1.FC6
+Release: 2%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -140,6 +140,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 213-2.fc6
+- Use correct dist tag in Release string.
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 213-1
 - Upgrade to upstream version 213 (fixes bug 192627)
 - fix bug 189161 : make -r/-rv do reverseVideo with or without



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:27:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:27:34 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia-3.5.3-noatun.patch, NONE,
	1.1 kdemultimedia.spec, 1.68, 1.69
Message-ID: <200607112127.k6BLRYeZ026665@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.3-noatun.patch 
Log Message:
fix #197999 ??? install kconf_update applications in $(libdir)/kconf_update_bin



kdemultimedia-3.5.3-noatun.patch:
 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kdemultimedia-3.5.3-noatun.patch ---
--- kdemultimedia-3.5.3/noatun/Makefile.am.tn	2006-07-11 22:46:50.000000000 +0200
+++ kdemultimedia-3.5.3/noatun/Makefile.am	2006-07-11 23:12:32.000000000 +0200
@@ -9,9 +9,11 @@
 presetsdir = $(kde_datadir)/noatun/eq.preset
 presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
 
+kconf_PROGRAMS = noatun20update
+kconfdir = $(libdir)/kconf_update_bin
+
 updatedir = $(kde_datadir)/kconf_update
 update_DATA = noatun.upd
-update_PROGRAMS = noatun20update
 
 noatun20update_SOURCES  = noatun20update.cpp
 noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdemultimedia.spec	26 Jun 2006 14:57:48 -0000	1.68
+++ kdemultimedia.spec	11 Jul 2006 21:27:32 -0000	1.69
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 5
+Release: 6
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -29,6 +29,7 @@
 
 # upstream patches
 Patch100: kdemultimedia.diff
+Patch101: kdemultimedia-3.5.3-noatun.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -88,6 +89,7 @@
 
 # upstream patches
 %patch100 -p0 -b .setuid-check
+%patch101 -p1 -b .noatun
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -175,6 +177,7 @@
 %{_libdir}/*.la
 %{_libdir}/libkdeinit_*
 %{_libdir}/kde3/*
+%{_libdir}/kconf_update_bin/*
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/*
@@ -193,6 +196,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
+- fix #197999 ??? install kconf_update applications in $(libdir)/kconf_update_bin
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - apply patch to check return value
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:29:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:29:12 -0400
Subject: rpms/kernel/devel/configs config-generic,1.217,1.218
Message-ID: <200607112129.k6BLTCsK027331@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
turn spinlock debug back on



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- config-generic	11 Jul 2006 19:55:27 -0000	1.217
+++ config-generic	11 Jul 2006 21:29:10 -0000	1.218
@@ -2575,8 +2575,7 @@
 # They aren't that much of a performance impact, and the value
 # from getting out-of-tree modules fixed is worth the trade-off.
 CONFIG_DEBUG_HIGHMEM=y
-# Reenable
-# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:32:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:32:43 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.294, 1.295 anaconda.spec, 1.418,
	1.419 sources, 1.416, 1.417
Message-ID: <200607112132.k6BLWhGw027947@cvs.devel.redhat.com>

Author: dcantrel

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- .cvsignore	11 Jul 2006 01:35:56 -0000	1.294
+++ .cvsignore	11 Jul 2006 21:32:40 -0000	1.295
@@ -1 +1 @@
-anaconda-11.1.0.55.tar.bz2
+anaconda-11.1.0.56.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- anaconda.spec	11 Jul 2006 01:35:56 -0000	1.418
+++ anaconda.spec	11 Jul 2006 21:32:40 -0000	1.419
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.55
+Version: 11.1.0.56
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -101,6 +101,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jul 11 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.56-1
+- Many changes and fixes in the loader2 network configuration, both
+  dhcp and manual IP entry
+- Fix stdin/stdout on VNC shells (clumens)
+- Check all bootloader entries for Windows (clumens)
+- Set UTC box in text install based on Windows existing or not (clumens)
+- Remove standalone argument for rhpxl call (clumens)
+- Remove call to deprecated method in yuminstall (clumens)
+- Fix group selection traceback in text mode (katzj, #197858)
+
 * Mon Jul 10 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.55-1
 - Fix findExistingRoots (clumens, #197900)
 - Add smartctl to rescue image (dcantrel, #198052)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- sources	11 Jul 2006 01:35:56 -0000	1.416
+++ sources	11 Jul 2006 21:32:40 -0000	1.417
@@ -1 +1 @@
-b53c6df052c143c60992f0ae5521059c  anaconda-11.1.0.55.tar.bz2
+bd9f71381a8a7d905e80a5fd14301ab6  anaconda-11.1.0.56.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:34:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:34:10 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.21,1.22
Message-ID: <200607112134.k6BLYAE5028143@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
Fix type in use of %{dist}


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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-i810.spec	10 Jul 2006 18:23:37 -0000	1.21
+++ xorg-x11-drv-i810.spec	11 Jul 2006 21:33:56 -0000	1.22
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   7{%dist}
+Release:   7%{dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:40:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:40:54 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.69,1.70
Message-ID: <200607112140.k6BLesRV030107@cvs.devel.redhat.com>

Author: than

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

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



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdemultimedia.spec	11 Jul 2006 21:27:32 -0000	1.69
+++ kdemultimedia.spec	11 Jul 2006 21:40:51 -0000	1.70
@@ -173,9 +173,8 @@
 %doc %{_docdir}/HTML/en/kscd
 %doc %{_docdir}/HTML/en/noatun
 %{_libdir}/mcop/*
-%{_libdir}/*.so.*
 %{_libdir}/*.la
-%{_libdir}/libkdeinit_*
+%{_libdir}/libkdeinit_*.so.*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*



From fedora-cvs-commits at redhat.com  Tue Jul 11 21:47:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 17:47:30 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.10, 1.11 sources, 1.10,
	1.11 xorg-x11-drv-i810.spec, 1.22, 1.23
Message-ID: <200607112147.k6BLlUFj014939@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
* Tue Jul 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-8.modeset20060707
- Add back modesetting changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jul 2006 18:23:37 -0000	1.10
+++ .cvsignore	11 Jul 2006 21:47:27 -0000	1.11
@@ -1 +1 @@
-xf86-video-i810-1.6.0.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jul 2006 18:23:37 -0000	1.10
+++ sources	11 Jul 2006 21:47:27 -0000	1.11
@@ -1 +1 @@
-0d3db819b9617a576927fd1aebe5ab81  xf86-video-i810-1.6.0.tar.bz2
+99af7eb02cbda6b8269d2a48b435370b  xf86-video-intel-1.6.0-git-modesetting-20060707.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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-drv-i810.spec	11 Jul 2006 21:33:56 -0000	1.22
+++ xorg-x11-drv-i810.spec	11 Jul 2006 21:47:27 -0000	1.23
@@ -2,29 +2,30 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvsYYYYMMDD
-
 %ifarch %{ix86} x86_64 ia64
 %define with_dri        1
 %else
 %define with_dri        0
 %endif
 
+# GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   7%{dist}
+Release:   8.modeset20060707%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:   xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
 Source1:   i810.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
+BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-2
 BuildRequires: libXvMC-devel
 %if %{with_dri}
@@ -32,9 +33,7 @@
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
-
-#Patch0: more-libcunwrap.patch
+Requires:  xorg-x11-server-Xorg >= 1.1.0-1
 
 %description 
 X.Org X11 i810 video driver.
@@ -48,12 +47,13 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-
-#%patch0 -p1 -b .more-libcunwrap
+#%setup -q -n %{tarball}-%{version}
+%setup -q -n xf86-video-intel
 
 %build
-%configure --disable-static \
+./autogen.sh --disable-static \
+           --libdir=%{_libdir} \
+           --mandir=%{_mandir} \
 %if %{with_dri}
            --enable-dri
 %else
@@ -95,7 +95,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
-* Mon Jul 10 2006 Kristian H??gsberg <krh at redhat.com> - 1.6.0-7
+* Tue Jul 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-8.modeset20060707
+- Add back modesetting changes.
+
+* Mon Jul 10 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-7
 - Roll back modesetting changes and build for fc5 aiglx repo.
 
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6.modeset20060707



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:00:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:00:43 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.13,1.14
Message-ID: <200607112200.k6BM0ZNO019798@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19723

Modified Files:
	libvirt.spec 
Log Message:
Adding missing curses requires, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libvirt.spec	11 Jul 2006 16:08:41 -0000	1.13
+++ libvirt.spec	11 Jul 2006 22:00:24 -0000	1.14
@@ -11,8 +11,10 @@
 Requires: xen
 Requires: libxml2
 Requires: readline
+Requires: ncurses
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
+BuildRequires: ncurses-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:06:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:06:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2368,1.2369
Message-ID: <200607112206.k6BM6Hui020222@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Update headers package


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2368
retrieving revision 1.2369
diff -u -r1.2368 -r1.2369
--- kernel-2.6.spec	11 Jul 2006 21:11:49 -0000	1.2368
+++ kernel-2.6.spec	11 Jul 2006 22:05:49 -0000	1.2369
@@ -73,6 +73,10 @@
 
 # Second, per-architecture exclusions (ifarch)
 
+%ifarch ppc64iseries i686
+%define buildheaders 0
+%endif
+	
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
@@ -1299,6 +1303,9 @@
 make INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
 # glibc provides scsi headers for itself, for now
 rm -rf $RPM_BUILD_ROOT/usr/include/scsi
+rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h
+rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h
+rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h
 %endif
 ###
 ### clean



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:07:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:07:07 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.23,1.24
Message-ID: <200607112207.k6BM77qO020307@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-9.20060707modeset
- Fix Revision number to match naming policy.



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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-i810.spec	11 Jul 2006 21:47:27 -0000	1.23
+++ xorg-x11-drv-i810.spec	11 Jul 2006 22:07:05 -0000	1.24
@@ -12,7 +12,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   8.modeset20060707%{?dist}
+Release:   9.20060707modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -95,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-9.20060707modeset
+- Fix Revision number to match naming policy.
+
 * Tue Jul 11 2006 Kristian H??gsberg <krh at redhat.com> 1.6.0-8.modeset20060707
 - Add back modesetting changes.
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:13:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:13:18 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2369,1.2370
Message-ID: <200607112213.k6BMDIbQ022474@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Provide glibc-kernheaders for a while


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2369
retrieving revision 1.2370
diff -u -r1.2369 -r1.2370
--- kernel-2.6.spec	11 Jul 2006 22:05:49 -0000	1.2369
+++ kernel-2.6.spec	11 Jul 2006 22:13:15 -0000	1.2370
@@ -467,6 +467,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Group: Development/System
 Obsoletes: glibc-kernheaders
+Provides: glibc-kernheaders = 3.0-46
 
 %description headers
 Kernel-headers includes the C header files that specify the interface



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:35:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:35:38 -0400
Subject: rpms/kdelibs/FC-5 kdelibs.spec,1.138,1.139
Message-ID: <200607112235.k6BMZcA1011749@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
- workaround for gcc



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- kdelibs.spec	11 Jul 2006 17:41:13 -0000	1.138
+++ kdelibs.spec	11 Jul 2006 22:35:36 -0000	1.139
@@ -222,6 +222,12 @@
 export libltdl_cv_shlibext=".so"
 export PATH=/usr/kerberos/bin:${PATH}
 
+# workaround for gcc
+%ifarch s390 s390x
+export CXXFLAGS="%{optflags} -O0"
+export CFLAGS="%{optflags} -O0"
+%endif
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif



From fedora-cvs-commits at redhat.com  Tue Jul 11 22:38:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 18:38:43 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.70,1.71
Message-ID: <200607112238.k6BMchqs012486@cvs.devel.redhat.com>

Author: than

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

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



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdemultimedia.spec	11 Jul 2006 21:40:51 -0000	1.70
+++ kdemultimedia.spec	11 Jul 2006 22:38:40 -0000	1.71
@@ -173,8 +173,9 @@
 %doc %{_docdir}/HTML/en/kscd
 %doc %{_docdir}/HTML/en/noatun
 %{_libdir}/mcop/*
+%{_libdir}/lib*.so.*
 %{_libdir}/*.la
-%{_libdir}/libkdeinit_*.so.*
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*



From fedora-cvs-commits at redhat.com  Tue Jul 11 23:12:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 19:12:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2370,1.2371
Message-ID: <200607112312.k6BNCaYK022502@cvs.devel.redhat.com>

Author: dwmw2

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2370
retrieving revision 1.2371
diff -u -r1.2370 -r1.2371
--- kernel-2.6.spec	11 Jul 2006 22:13:15 -0000	1.2370
+++ kernel-2.6.spec	11 Jul 2006 23:12:33 -0000	1.2371
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 0
+%define buildheaders 1
 
 # Versions of various parts
 
@@ -1592,6 +1592,7 @@
 * Tue Jul 11 2006 David Woodhouse <dwmw2 at redhat.com>
 - Build iSeries again
 - Minor GFS2 update
+- Enable kernel-headers subpackage
 
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git4



From fedora-cvs-commits at redhat.com  Tue Jul 11 23:38:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 19:38:37 -0400
Subject: rpms/kernel/devel/configs config-generic,1.218,1.219
Message-ID: <200607112338.k6BNcbUN012938@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
reenable lockdep



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- config-generic	11 Jul 2006 21:29:10 -0000	1.218
+++ config-generic	11 Jul 2006 23:38:35 -0000	1.219
@@ -2564,10 +2564,8 @@
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
 
-# Reenable
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# Reenable
-# CONFIG_PROVE_LOCKING is not set
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 



From fedora-cvs-commits at redhat.com  Tue Jul 11 23:44:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 19:44:55 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2371,1.2372
Message-ID: <200607112344.k6BNitxC015290@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
include iSeries config


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2371
retrieving revision 1.2372
diff -u -r1.2371 -r1.2372
--- kernel-2.6.spec	11 Jul 2006 23:12:33 -0000	1.2371
+++ kernel-2.6.spec	11 Jul 2006 23:44:53 -0000	1.2372
@@ -231,6 +231,7 @@
 Source26: kernel-%{kversion}-ppc-smp.config
 Source27: kernel-%{kversion}-ppc64.config
 Source28: kernel-%{kversion}-ppc64-kdump.config
+Source29: kernel-%{kversion}-ppc64iseries.config
 
 Source30: kernel-%{kversion}-s390.config
 Source31: kernel-%{kversion}-s390x.config



From fedora-cvs-commits at redhat.com  Tue Jul 11 23:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 19:45:01 -0400
Subject: rpms/kernel/devel/configs config-generic,1.219,1.220
Message-ID: <200607112345.k6BNj1nV015397@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
gah, try again



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- config-generic	11 Jul 2006 23:38:35 -0000	1.219
+++ config-generic	11 Jul 2006 23:44:58 -0000	1.220
@@ -2564,8 +2564,8 @@
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
 
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 00:20:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 20:20:33 -0400
Subject: rpms/irqbalance/devel irqbalance-norebalance-zeroints.patch, 1.1,
	1.2 irqbalance.spec, 1.26, 1.27
Message-ID: <200607120020.k6C0KXe1022745@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22587

Modified Files:
	irqbalance-norebalance-zeroints.patch irqbalance.spec 
Log Message:
be lazier


irqbalance-norebalance-zeroints.patch:
 procinterrupts.c |    2 ++
 1 files changed, 2 insertions(+)

Index: irqbalance-norebalance-zeroints.patch
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance-norebalance-zeroints.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- irqbalance-norebalance-zeroints.patch	26 Feb 2006 23:41:09 -0000	1.1
+++ irqbalance-norebalance-zeroints.patch	12 Jul 2006 00:20:29 -0000	1.2
@@ -1,12 +1,11 @@
 --- 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)
+@@ -134,6 +134,8 @@ void activate_irqtable(void)
  			continue;
  		if (interrupts[i].type == IRQ_INACTIVE)
  			continue;
-+		if (interrupts[i].count == interrupts[i].oldcount)
++		if (interrupts[i].delta == 0)
 +			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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- irqbalance.spec	2 Jul 2006 03:37:34 -0000	1.26
+++ irqbalance.spec	12 Jul 2006 00:20:29 -0000	1.27
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jul 11 2006 Dave Jones <davej at redhat.com>
+- Further lazy rebalancing tweaks.
+
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - Don't rebalance IRQs where no interrupts have occured.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 00:54:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 20:54:19 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.47,1.48
Message-ID: <200607120054.k6C0sJhk013999@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13956

Modified Files:
	gnucash.spec 
Log Message:
bump



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnucash.spec	10 Jul 2006 18:57:16 -0000	1.47
+++ gnucash.spec	12 Jul 2006 00:54:16 -0000	1.48
@@ -9,7 +9,7 @@
 %if %{buildsvn}
 Release: 1.svn%{svnrev}.1
 %else
-Release: 1
+Release: 2
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-2
+- rebuild against new aqbanking
+
 * Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1
 - update to 2.0.0. Woo.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 01:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 21:04:17 -0400
Subject: rpms/anthy/devel anthy-7900-fix-undef-non-weak-symbol.patch, NONE,
	1.1 .cvsignore, 1.19, 1.20 anthy.spec, 1.30, 1.31 sources,
	1.19, 1.20
Message-ID: <200607120104.k6C14HuR016900@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore anthy.spec sources 
Added Files:
	anthy-7900-fix-undef-non-weak-symbol.patch 
Log Message:
* Tue Jul 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
- New upstream release.
- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
  symbols issue. (#198180)
- use dist tag.

anthy-7900-fix-undef-non-weak-symbol.patch:
 src-main/Makefile.am |    2 +-
 src-util/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE anthy-7900-fix-undef-non-weak-symbol.patch ---
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-main/Makefile.am anthy-7900/src-main/Makefile.am
--- anthy-7900.orig/src-main/Makefile.am	2006-05-13 18:29:05.000000000 +0900
+++ anthy-7900/src-main/Makefile.am	2006-07-12 09:50:52.000000000 +0900
@@ -4,7 +4,7 @@
 
 lib_LTLIBRARIES = libanthy.la
 
-libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm
+libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm ../src-diclib/libdiclib.la ../src-worddic/libanthydic.la
 libanthy_la_LDFLAGS = -version-info 1:0:1
 
 libanthy_la_SOURCES = \
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-util/Makefile.am anthy-7900/src-util/Makefile.am
--- anthy-7900.orig/src-util/Makefile.am	2006-06-02 00:10:55.000000000 +0900
+++ anthy-7900/src-util/Makefile.am	2006-07-12 09:49:05.000000000 +0900
@@ -22,5 +22,6 @@
 lib_LTLIBRARIES = libanthyinput.la
 libanthyinput_la_SOURCES = input.c rkconv.c rkhelper.c\
  rkconv.h rkmap.h rkhelper.h
+libanthyinput_la_LIBADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
 
 pkgdata_DATA = typetab dic-tool-usage.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	26 Jun 2006 01:14:46 -0000	1.19
+++ .cvsignore	12 Jul 2006 01:04:03 -0000	1.20
@@ -22,3 +22,4 @@
 anthy-7811.tar.gz
 anthy-7818.tar.gz
 anthy-7824.tar.gz
+anthy-7900.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- anthy.spec	26 Jun 2006 01:14:46 -0000	1.30
+++ anthy.spec	12 Jul 2006 01:04:03 -0000	1.31
@@ -1,13 +1,13 @@
-%define	version		7824
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
 Name:		anthy
-Version:	%{version}
-Release:	1.fc6
+Version:	7900
+Release:	1%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake autoconf
 %ifnarch ppc64
 BuildRequires:	emacs
 %endif
@@ -17,6 +17,7 @@
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
 Patch2:		anthy-gcanna-nakaguro.patch
+Patch3:		anthy-7900-fix-undef-non-weak-symbol.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -61,6 +62,10 @@
 %prep
 %setup -q -a 2
 %patch2 -p1
+%patch3 -p1 -b .non-weak
+# need to regenerate Makefile for patch3
+automake
+autoconf
 
 %build
 %configure
@@ -127,6 +132,12 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
+- New upstream release.
+- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
+  symbols issue. (#198180)
+- use dist tag.
+
 * Mon Jun 26 2006 Akira TAGOH <tagoh at redhat.com> - 7824-1
 - New upstream snapshot release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	26 Jun 2006 01:14:46 -0000	1.19
+++ sources	12 Jul 2006 01:04:03 -0000	1.20
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-bf4cce0a20f53cc7813a3f2d90c5a52c  anthy-7824.tar.gz
+356467305997191acd353d1c7e4e5d92  anthy-7900.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 01:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 21:09:50 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.220,
	1.221 config-ia64-generic, 1.32, 1.33 config-s390-generic,
	1.16, 1.17
Message-ID: <200607120109.k6C19oVB017937@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-s390-generic 
Log Message:
Add utrace

http://people.redhat.com/roland/utrace



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- config-generic	11 Jul 2006 23:44:58 -0000	1.220
+++ config-generic	12 Jul 2006 01:09:47 -0000	1.221
@@ -2852,4 +2852,6 @@
 
 # CONFIG_UNUSED_SYMBOLS is not set
 
+CONFIG_UTRACE=y
+CONFIG_PTRACE=y
 


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-ia64-generic	10 Jul 2006 16:31:44 -0000	1.32
+++ config-ia64-generic	12 Jul 2006 01:09:47 -0000	1.33
@@ -174,3 +174,7 @@
 
 CONFIG_HW_RANDOM_INTEL=m
 
+# FIXME
+# CONFIG_UTRACE is not set
+# CONFIG_PTRACE is not set
+


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-s390-generic	24 Jun 2006 07:10:20 -0000	1.16
+++ config-s390-generic	12 Jul 2006 01:09:47 -0000	1.17
@@ -184,3 +184,7 @@
 # CONFIG_DETECT_SOFTLOCKUP is not set
 
 CONFIG_S390_HYPFS_FS=y
+
+# FIXME
+# CONFIG_UTRACE is not set
+# CONFIG_PTRACE is not set



From fedora-cvs-commits at redhat.com  Wed Jul 12 01:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 21:09:50 -0400
Subject: rpms/kernel/devel linux-2.6-utrace.patch, NONE, 1.1 kernel-2.6.spec,
	1.2372, 1.2373 linux-2.6-execshield.patch, 1.27,
	1.28 linux-2.6-proc-self-maps-fix.patch, 1.5,
	1.6 linux-2.6-x86_64-tif-restore-sigmask.patch, 1.5, 1.6
Message-ID: <200607120109.k6C19o8C017926@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-execshield.patch 
	linux-2.6-proc-self-maps-fix.patch 
	linux-2.6-x86_64-tif-restore-sigmask.patch 
Added Files:
	linux-2.6-utrace.patch 
Log Message:
Add utrace

http://people.redhat.com/roland/utrace


linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/ptrace.c               |   36 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    2 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  843 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   51 -
 arch/s390/kernel/traps.c                |    4 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   26 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 77 files changed, 6827 insertions(+), 3167 deletions(-)

--- NEW FILE linux-2.6-utrace.patch ---
[PATCH 4] utrace: ptrace compatibility

ptrace compatibility on top of <linux/utrace.h> interfaces.
This attempts to be precisely compatible with existing ptrace behavior.
It does not extend, improve, or change it.

The ptrace support is made an option, CONFIG_PTRACE.  For now, noone will
want to turn this off except maybe a bizarre embedded configuration.  But
it looks forward to a day when we can punt the ptrace system call completely.

Signed-off-by: Roland McGrath <roland at redhat.com>

---

 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 -
 arch/arm26/kernel/ptrace.c              |   32 -
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 ++-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 -
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/ptrace.c               |   36 -
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    2 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  843 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   51 -
 arch/s390/kernel/traps.c                |    4 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 ++
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  699 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 -
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 ++
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 +-
 include/linux/sched.h                   |   26 -
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 ++++++++++
 init/Kconfig                            |   29 +
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 +---
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 77 files changed, 6822 insertions(+), 3162 deletions(-)
 create mode 100644 Documentation/utrace.txt
 delete arch/powerpc/kernel/ptrace-common.h
 delete arch/powerpc/kernel/ptrace32.c
 create mode 100644 include/asm-i386/tracehook.h
 create mode 100644 include/asm-powerpc/tracehook.h
 create mode 100644 include/asm-x86_64/tracehook.h
 create mode 100644 include/linux/tracehook.h
 create mode 100644 include/linux/utrace.h
 create mode 100644 kernel/utrace.c

--- linux-2.6/include/asm-powerpc/tracehook.h.utrace-ptrace-compat
+++ linux-2.6/include/asm-powerpc/tracehook.h
@@ -0,0 +1,302 @@
+/*
+ * Tracing hooks, PowerPC CPU support
+ */
+
+#ifndef _ASM_TRACEHOOK_H
+#define _ASM_TRACEHOOK_H	1
+
+#include <linux/sched.h>
+#include <asm/ptrace.h>
+
+/*
+ * See linux/tracehook.h for the descriptions of what these need to do.
+ */
+
+
+static inline void tracehook_enable_single_step(struct task_struct *task)
+{
+	struct pt_regs *regs = task->thread.regs;
+	if (regs != NULL) {
+#if defined(CONFIG_PPC32) && (defined(CONFIG_40x) || defined(CONFIG_BOOKE))
+		task->thread.dbcr0 = DBCR0_IDM | DBCR0_IC;
+		regs->msr |= MSR_DE;
+#else
+		regs->msr |= MSR_SE;
+#endif
+	}
+	set_tsk_thread_flag(task, TIF_SINGLESTEP);
+}
+
+static inline void tracehook_disable_single_step(struct task_struct *task)
+{
+	struct pt_regs *regs = task->thread.regs;
+	if (regs != NULL) {
+#if defined(CONFIG_PPC32) && (defined(CONFIG_40x) || defined(CONFIG_BOOKE))
+		task->thread.dbcr0 = 0;
+		regs->msr &= ~MSR_DE;
+#else
+		regs->msr &= ~MSR_SE;
+#endif
+	}
+	clear_tsk_thread_flag(task, TIF_SINGLESTEP);
+}
+
+static inline int tracehook_single_step_enabled(struct task_struct *tsk)
+{
+	return test_tsk_thread_flag(tsk, TIF_SINGLESTEP);
+}
+
+static inline void tracehook_enable_syscall_trace(struct task_struct *tsk)
+{
+	set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
+}
+
+static inline void tracehook_disable_syscall_trace(struct task_struct *tsk)
+{
+	clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
+}
+
+static inline void tracehook_abort_syscall(struct pt_regs *regs)
+{
+	regs->orig_gpr3 = -1L;
+}
+
+
+extern const struct utrace_regset_view utrace_ppc_native_view;
+static inline const struct utrace_regset_view *
+utrace_native_view(struct task_struct *tsk)
+{
+#ifdef CONFIG_PPC64
+	extern const struct utrace_regset_view utrace_ppc32_view;
+
+	if (test_tsk_thread_flag(tsk, TIF_32BIT))
+		return &utrace_ppc32_view;
+#endif
+	return &utrace_ppc_native_view;
+}
+
+
+#ifdef CONFIG_PTRACE
+#include <linux/mm.h>
+#include <asm/uaccess.h>
+
+static inline int arch_ptrace(long request, struct task_struct *child,
+			      unsigned long addr, long data,
+			      const struct utrace_regset_view **view,
+			      int *regset, int *rw,
+			      void __user **uaddr, int *nregs)
+{
+	switch (request) {
+	case PPC_PTRACE_GETREGS: /* Get GPRs 0 - 31. */
+	case PPC_PTRACE_SETREGS: /* Set GPRs 0 - 31. */
+		*regset = 0;
+		*rw = request == PPC_PTRACE_SETREGS;
+		*nregs = 32;
[...11847 lines suppressed...]
 
-static inline unsigned long twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave)
+static inline unsigned long
+twd_fxsr_to_i387(const struct i387_fxsave_struct *fxsave)
 {
 	struct _fpxreg *st = NULL;
 	unsigned long tos = (fxsave->swd >> 11) & 7;
@@ -71,16 +73,11 @@ static inline unsigned long twd_fxsr_to_
 }
 
 
-static inline int convert_fxsr_from_user(struct i387_fxsave_struct *fxsave,
-					 struct _fpstate_ia32 __user *buf)
+static inline void
+convert_fxsr_env_from_i387(struct i387_fxsave_struct *fxsave, const u32 env[7])
 {
-	struct _fpxreg *to;
-	struct _fpreg __user *from;
-	int i;
 	u32 v;
-	int err = 0;
-
-#define G(num,val) err |= __get_user(val, num + (u32 __user *)buf)
+#define G(num,val) val = env[num]
 	G(0, fxsave->cwd);
 	G(1, fxsave->swd);
 	G(2, fxsave->twd);
@@ -91,9 +88,21 @@ static inline int convert_fxsr_from_user
 	G(5, fxsave->rdp);
 	/* 6: ds ignored */
 #undef G
-	if (err) 
+}
+
+static inline int convert_fxsr_from_user(struct i387_fxsave_struct *fxsave,
+					 struct _fpstate_ia32 __user *buf)
+{
+	u32 env[7];
+	struct _fpxreg *to;
+	struct _fpreg __user *from;
+	int i;
+
+	if (__copy_from_user(env, buf, sizeof(env)))
 		return -1; 
 
+	convert_fxsr_env_from_i387(fxsave, env);
+
 	to = (struct _fpxreg *)&fxsave->st_space[0];
 	from = &buf->_st[0];
 	for (i = 0 ; i < 8 ; i++, to++, from++) {
@@ -104,16 +113,11 @@ static inline int convert_fxsr_from_user
 }
 
 
-static inline int convert_fxsr_to_user(struct _fpstate_ia32 __user *buf,
-				       struct i387_fxsave_struct *fxsave,
-				       struct pt_regs *regs,
-				       struct task_struct *tsk)
+static inline void
+convert_fxsr_env_to_i387(struct task_struct *tsk, struct pt_regs *regs,
+			 u32 env[7], const struct i387_fxsave_struct *fxsave)
 {
-	struct _fpreg __user *to;
-	struct _fpxreg *from;
-	int i;
 	u16 cs,ds; 
-	int err = 0; 
 
 	if (tsk == current) {
 		/* should be actually ds/cs at fpu exception time,
@@ -125,7 +129,7 @@ static inline int convert_fxsr_to_user(s
 		cs = regs->cs;
 	} 
 
-#define P(num,val) err |= __put_user(val, num + (u32 __user *)buf)
+#define P(num,val) env[num] = val
 	P(0, (u32)fxsave->cwd | 0xffff0000);
 	P(1, (u32)fxsave->swd | 0xffff0000);
 	P(2, twd_fxsr_to_i387(fxsave));
@@ -134,8 +138,21 @@ static inline int convert_fxsr_to_user(s
 	P(5, fxsave->rdp);
 	P(6, 0xffff0000 | ds);
 #undef P
+}
+
+
+static inline int convert_fxsr_to_user(struct _fpstate_ia32 __user *buf,
+				       struct i387_fxsave_struct *fxsave,
+				       struct pt_regs *regs,
+				       struct task_struct *tsk)
+{
+	struct _fpreg __user *to;
+	struct _fpxreg *from;
+	int i;
+	u32 env[7];
 
-	if (err) 
+	convert_fxsr_env_to_i387(tsk, regs, env, fxsave);
+	if (__copy_to_user(buf, env, sizeof(env)))
 		return -1; 
 
 	to = &buf->_st[0];
@@ -181,3 +198,38 @@ int save_i387_ia32(struct task_struct *t
 			      sizeof(struct i387_fxsave_struct));
 	return err ? -1 : 1;
 }
+
+int get_fpregs32(struct user_i387_ia32_struct *buf, struct task_struct *tsk)
+{
+	struct pt_regs *regs = ((struct pt_regs *)tsk->thread.rsp0) - 1;
+	struct _fpreg *to;
+	const struct _fpxreg *from;
+	unsigned int i;
+
+	convert_fxsr_env_to_i387(tsk, regs,
+				 (u32 *) buf, &tsk->thread.i387.fxsave);
+
+	to = (struct _fpreg *) buf->st_space;
+	from = (const struct _fpxreg *) &tsk->thread.i387.fxsave.st_space[0];
+	for (i = 0; i < 8; i++, to++, from++)
+		*to = *(const struct _fpreg *) from;
+
+	return 0;
+}
+
+int
+set_fpregs32(struct task_struct *tsk, const struct user_i387_ia32_struct *buf)
+{
+	struct _fpxreg *to;
+	const struct _fpreg *from;
+	unsigned int i;
+
+	convert_fxsr_env_from_i387(&tsk->thread.i387.fxsave, (u32 *) buf);
+
+	to = (struct _fpxreg *) &tsk->thread.i387.fxsave.st_space[0];
+	from = (const struct _fpreg *) buf->st_space;
+	for (i = 0; i < 8; i++, to++, from++)
+		*(struct _fpreg *) to = *from;
+
+	return 0;
+}
--- linux-2.6/arch/x86_64/ia32/ia32entry.S.utrace-ptrace-compat
+++ linux-2.6/arch/x86_64/ia32/ia32entry.S
@@ -417,7 +417,7 @@ ia32_sys_call_table:
 	.quad sys_setuid16
 	.quad sys_getuid16
 	.quad compat_sys_stime	/* stime */		/* 25 */
-	.quad sys32_ptrace	/* ptrace */
+	.quad compat_sys_ptrace	/* ptrace */
 	.quad sys_alarm
 	.quad sys_fstat	/* (old)fstat */
 	.quad sys_pause
--- linux-2.6/arch/x86_64/mm/fault.c.utrace-ptrace-compat
+++ linux-2.6/arch/x86_64/mm/fault.c
@@ -11,7 +11,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -252,7 +252,7 @@ int unhandled_signal(struct task_struct 
 {
 	if (tsk->pid == 1)
 		return 1;
-	if (tsk->ptrace & PT_PTRACED)
+	if (tracehook_consider_fatal_signal(tsk, sig))
 		return 0;
 	return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) ||
 		(tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL);
--- linux-2.6/arch/frv/kernel/ptrace.c.utrace-ptrace-compat
+++ linux-2.6/arch/frv/kernel/ptrace.c
@@ -700,24 +700,11 @@ asmlinkage void do_syscall_trace(int lea
 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
 		return;
 
-	if (!(current->ptrace & PT_PTRACED))
-		return;
-
 	/* we need to indicate entry or exit to strace */
 	if (leaving)
 		__frame->__status |= REG__STATUS_SYSC_EXIT;
 	else
 		__frame->__status |= REG__STATUS_SYSC_ENTRY;
 
-	ptrace_notify(SIGTRAP);
-
-	/*
-	 * this isn't the same as continuing with a signal, but it will do
-	 * for normal use.  strace only continues with a signal if the
-	 * stopping signal is not SIGTRAP.  -brl
-	 */
-	if (current->exit_code) {
-		send_sig(current->exit_code, current, 1);
-		current->exit_code = 0;
-	}
+	tracehook_report_syscall(regs, leaving);
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2372
retrieving revision 1.2373
diff -u -r1.2372 -r1.2373
--- kernel-2.6.spec	11 Jul 2006 23:44:53 -0000	1.2372
+++ kernel-2.6.spec	12 Jul 2006 01:09:46 -0000	1.2373
@@ -255,6 +255,9 @@
 Patch1: patch-2.6.18-rc1.bz2
 Patch2: patch-2.6.18-rc1-git4.bz2
 
+# Patches 10 through 99 are for things that are going upstream really soon.
+Patch10: linux-2.6-utrace.patch
+
 # Patches 100 through 500 are meant for architecture patches
 
 # 200 - 299   x86(-64)
@@ -288,7 +291,7 @@
 
 # Exec-shield.
 Patch810: linux-2.6-execshield.patch
-Patch813: linux-2.6-warn-c-p-a.patch
+Patch811: linux-2.6-warn-c-p-a.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -406,6 +409,7 @@
 
 Patch2400: linux-2.6-lockdep-fixes.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.
@@ -717,17 +721,13 @@
 %patch1 -p1
 %patch2 -p1
 
-#
 # Patches 10 through 100 are meant for core subsystem upgrades
-#
 
-#
-# Patches to back out
-#
+# Rolands utrace ptrace replacement.
+%patch10 -p1
+
 
-#
 # Architecture patches
-#
 
 #
 # x86(-64)
@@ -780,7 +780,7 @@
 
 # Exec shield 
 %patch810 -p1
-#%patch813 -p1
+#%patch811 -p1
 
 #
 # GPG signed kernel modules
@@ -1590,6 +1590,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Dave Jones <davej at redhat.com>
+- Add utrace. (ptrace replacement).
+
 * Tue Jul 11 2006 David Woodhouse <dwmw2 at redhat.com>
 - Build iSeries again
 - Minor GFS2 update

linux-2.6-execshield.patch:
 linux-2.6.16.noarch/include/asm-powerpc/elf.h   |    3 
 linux-2.6.17.noarch/arch/i386/kernel/sysenter.c |    3 
 linux-2.6.17.noarch/include/asm-i386/elf.h      |    6 
 linux-2.6.17.noarch/include/asm-i386/mmu.h      |    4 
 linux/arch/i386/kernel/cpu/common.c             |    7 
 linux/arch/i386/kernel/process.c                |   59 +++++++
 linux/arch/i386/kernel/smp.c                    |    3 
 linux/arch/i386/kernel/traps.c                  |   93 +++++++++++-
 linux/arch/i386/mm/init.c                       |    6 
 linux/arch/i386/mm/mmap.c                       |    6 
 linux/arch/ia64/ia32/binfmt_elf32.c             |    2 
 linux/arch/powerpc/kernel/vdso.c                |    3 
 linux/arch/x86_64/ia32/ia32_binfmt.c            |    6 
 linux/arch/x86_64/ia32/syscall32.c              |    4 
 linux/arch/x86_64/kernel/process.c              |    6 
 linux/arch/x86_64/kernel/setup64.c              |   23 ---
 linux/arch/x86_64/mm/fault.c                    |    2 
 linux/arch/x86_64/mm/mmap.c                     |   98 ++++++++++--
 linux/drivers/char/random.c                     |    7 
 linux/fs/binfmt_elf.c                           |  147 ++++++++++++++-----
 linux/fs/proc/array.c                           |    8 -
 linux/fs/proc/base.c                            |    8 -
 linux/fs/proc/task_mmu.c                        |   22 ++
 linux/include/asm-i386/a.out.h                  |    2 
 linux/include/asm-i386/desc.h                   |   14 +
 linux/include/asm-i386/page.h                   |    5 
 linux/include/asm-i386/pgalloc.h                |    1 
 linux/include/asm-i386/processor.h              |    8 -
 linux/include/asm-ia64/pgalloc.h                |    4 
 linux/include/asm-powerpc/pgalloc.h             |    5 
 linux/include/asm-ppc/pgalloc.h                 |    5 
 linux/include/asm-s390/pgalloc.h                |    4 
 linux/include/asm-sparc/pgalloc.h               |    4 
 linux/include/asm-sparc64/pgalloc.h             |    4 
 linux/include/asm-x86_64/pgalloc.h              |    7 
 linux/include/asm-x86_64/pgtable.h              |    2 
 linux/include/linux/mm.h                        |   16 +-
 linux/include/linux/resource.h                  |    5 
 linux/include/linux/sched.h                     |    9 +
 linux/include/linux/sysctl.h                    |    3 
 linux/kernel/signal.c                           |   33 ++++
 linux/kernel/sysctl.c                           |   57 +++++++
 linux/mm/fremap.c                               |   16 +-
 linux/mm/mmap.c                                 |  183 ++++++++++++++++++++++--
 linux/mm/mprotect.c                             |    5 
 linux/mm/mremap.c                               |    4 
 46 files changed, 788 insertions(+), 134 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linux-2.6-execshield.patch	4 Jul 2006 21:03:12 -0000	1.27
+++ linux-2.6-execshield.patch	12 Jul 2006 01:09:47 -0000	1.28
@@ -1396,18 +1396,6 @@
  
  static int
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
-@@ -1936,6 +1967,11 @@ relock:
- 		if (!signr)
- 			break; /* will return 0 */
- 
-+		if ((signr == SIGSEGV) && print_fatal_signals) {
-+			spin_unlock_irq(&current->sighand->siglock);
-+			print_fatal_signal(regs, signr);
-+			spin_lock_irq(&current->sighand->siglock);
-+		}
- 		if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) {
- 			ptrace_signal_deliver(regs, cookie);
- 
 @@ -2031,6 +2067,8 @@ relock:
  		 * Anything else is fatal, maybe with a core dump.
  		 */

linux-2.6-proc-self-maps-fix.patch:
 b/fs/proc/base.c                       |   20 ++++++++++++++++++++
 b/fs/proc/internal.h                   |    2 ++
 linux-2.6.17.noarch/fs/proc/task_mmu.c |    3 +--
 3 files changed, 23 insertions(+), 2 deletions(-)

Index: linux-2.6-proc-self-maps-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-proc-self-maps-fix.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-proc-self-maps-fix.patch	27 Jun 2006 01:57:48 -0000	1.5
+++ linux-2.6-proc-self-maps-fix.patch	12 Jul 2006 01:09:47 -0000	1.6
@@ -18,7 +18,7 @@
 +	task_lock(task);
 +	if (task->mm != mm)
 +		goto out;
-+	if (task->mm != current->mm && __ptrace_may_attach(task))
++	if (task->mm != current->mm && tracehook_allow_access_process_vm(task))
 +		goto out;
 +	task_unlock(task);
 +	return mm;
@@ -61,50 +61,3 @@
  
  	/* Start with last addr hint */
  	if (last_addr && (vma = find_vma(mm, last_addr))) {
-diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
-diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index 0d36750..578c28e 100644
---- a/include/linux/ptrace.h
-+++ b/include/linux/ptrace.h
-@@ -94,6 +94,7 @@ extern void __ptrace_link(struct task_st
- extern void __ptrace_unlink(struct task_struct *child);
- extern void ptrace_untrace(struct task_struct *child);
- extern int ptrace_may_attach(struct task_struct *task);
-+extern int __ptrace_may_attach(struct task_struct *task);
- 
- static inline void ptrace_link(struct task_struct *child,
- 			       struct task_struct *new_parent)
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 0eeb7e6..443f77e 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -121,7 +121,7 @@ int ptrace_check_attach(struct task_stru
- 	return ret;
- }
- 
--static int may_attach(struct task_struct *task)
-+int __ptrace_may_attach(struct task_struct *task)
- {
- 	if (!task->mm)
- 		return -EPERM;
-@@ -143,7 +143,7 @@ int ptrace_may_attach(struct task_struct
- {
- 	int err;
- 	task_lock(task);
--	err = may_attach(task);
-+	err = __ptrace_may_attach(task);
- 	task_unlock(task);
- 	return !err;
- }
-
---- linux-2.6.16.noarch/kernel/ptrace.c~	2006-04-10 14:36:15.000000000 -0500
-+++ linux-2.6.16.noarch/kernel/ptrace.c	2006-04-10 14:36:30.000000000 -0500
-@@ -160,7 +160,7 @@ int ptrace_attach(struct task_struct *ta
- 	/* the same process cannot be attached many times */
- 	if (task->ptrace & PT_PTRACED)
- 		goto bad;
--	retval = may_attach(task);
-+	retval = __ptrace_may_attach(task);
- 	if (retval)
- 		goto bad;
- 

linux-2.6-x86_64-tif-restore-sigmask.patch:
 arch/x86_64/ia32/ia32_signal.c   |   26 ++++--------
 arch/x86_64/kernel/signal.c      |   82 ++++++++++++++++-----------------------
 include/asm-x86_64/signal.h      |    4 -
 include/asm-x86_64/thread_info.h |    2 
 include/asm-x86_64/unistd.h      |    1 
 5 files changed, 48 insertions(+), 67 deletions(-)

Index: linux-2.6-x86_64-tif-restore-sigmask.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-tif-restore-sigmask.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:40:59 -0000	1.5
+++ linux-2.6-x86_64-tif-restore-sigmask.patch	12 Jul 2006 01:09:47 -0000	1.6
@@ -48,15 +48,6 @@
  }
  
  int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-@@ -595,7 +589,7 @@ int ia32_setup_rt_frame(int sig, struct 
- 	regs->ss = __USER32_DS; 
- 
- 	set_fs(USER_DS);
--    regs->eflags &= ~TF_MASK;
-+	regs->eflags &= ~TF_MASK;
-     if (test_thread_flag(TIF_SINGLESTEP))
-         ptrace_notify(SIGTRAP);
- 
 @@ -604,9 +598,9 @@ #if DEBUG_SIG
  		current->comm, current->pid, frame, regs->rip, frame->pretcode);
  #endif



From fedora-cvs-commits at redhat.com  Wed Jul 12 01:42:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 21:42:32 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.7,1.8
Message-ID: <200607120142.k6C1gWeF016828@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
lockdep input layer fix

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   10 ++++--
 linux-2.6.18-rc1/block/ioctl.c                |    4 +-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/fs/block_dev.c               |    2 -
 linux-2.6.18-rc1/fs/sysfs/inode.c             |   39 ++++++++++++++++++++++++++
 linux-2.6.18-rc1/include/linux/libps2.h       |   10 ++++++
 6 files changed, 61 insertions(+), 10 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-lockdep-fixes.patch	11 Jul 2006 20:09:47 -0000	1.7
+++ linux-2.6-lockdep-fixes.patch	12 Jul 2006 01:42:28 -0000	1.8
@@ -429,3 +429,89 @@
  int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 
 
+From davej  Tue Jul 11 07:15:05 2006
+Return-Path: <SRS0+44288eb707b17e403147+1052+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Tue, 11 Jul 2006 07:15:05 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Tue, 11 Jul 2006 07:14:55 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6BBEteU025672;
+	Tue, 11 Jul 2006 07:14:55 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6BBEtjx032653;
+	Tue, 11 Jul 2006 07:14:55 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6BBEmSs006593;
+	Tue, 11 Jul 2006 07:14:51 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1G0GCV-0005jk-Au; Tue, 11 Jul 2006 12:14:47 +0100
+Subject: Re: lockdep: bdev->bd_mutex deadlock
+From: Arjan van de Ven <arjan at infradead.org>
+To: Peter Jones <pjones at redhat.com>
+Cc: mingo at elte.hu, linux-kernel <linux-kernel at vger.kernel.org>,
+        Dave Jones <davej at redhat.com>
+In-Reply-To: <1152287003.14409.2.camel at localhost.localdomain>
+References: <1152221477.25480.9.camel at localhost.localdomain>
+	 <1152257687.3111.23.camel at laptopd505.fenrus.org>
+	 <1152287003.14409.2.camel at localhost.localdomain>
+Content-Type: text/plain
+Date: Tue, 11 Jul 2006 13:14:46 +0200
+Message-Id: <1152616486.3128.34.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+Content-Transfer-Encoding: 7bit
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 2.646 **
+Status: RO
+Content-Length: 1333
+Lines: 37
+
+On Fri, 2006-07-07 at 11:43 -0400, Peter Jones wrote:
+> <4> [<c05ebd9d>] mutex_lock+0x21/0x24
+> <4> [<c04c4acf>] blkdev_ioctl+0x5dd/0x732
+> <4> [<c046323b>] block_ioctl+0x16/0x1b
+
+
+From: Arjan van de Ven <arjan at linux.intel.com>
+Subject: lockdep: annotate the BLKPG_DEL_PARTITION ioctl
+
+The delete partition IOCTL takes the bd_mutex for both the disk and the partition;
+these have an obvious hierarchical relationship and this patch annotates this
+relationship for lockdep.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+Index: linux-2.6.18-rc1/block/ioctl.c
+===================================================================
+--- linux-2.6.18-rc1.orig/block/ioctl.c
++++ linux-2.6.18-rc1/block/ioctl.c
+@@ -72,7 +72,7 @@ static int blkpg_ioctl(struct block_devi
+ 			bdevp = bdget_disk(disk, part);
+ 			if (!bdevp)
+ 				return -ENOMEM;
+-			mutex_lock(&bdevp->bd_mutex);
++			mutex_lock_nested(&bdevp->bd_mutex, BD_MUTEX_PARTITION);
+ 			if (bdevp->bd_openers) {
+ 				mutex_unlock(&bdevp->bd_mutex);
+ 				bdput(bdevp);
+@@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_devi
+ 			fsync_bdev(bdevp);
+ 			invalidate_bdev(bdevp, 0);
+ 
+-			mutex_lock(&bdev->bd_mutex);
++			mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_WHOLE);
+ 			delete_partition(disk, part);
+ 			mutex_unlock(&bdev->bd_mutex);
+ 			mutex_unlock(&bdevp->bd_mutex);
+
+



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:26:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:26:44 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.30,
	1.31 gnome-system-monitor.spec, 1.52, 1.53 sources, 1.30, 1.31
Message-ID: <200607120226.k6C2Qi1t030636@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28320

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	17 May 2006 18:21:10 -0000	1.30
+++ .cvsignore	12 Jul 2006 02:26:41 -0000	1.31
@@ -1 +1 @@
-gnome-system-monitor-2.14.3.tar.bz2
+gnome-system-monitor-2.15.0.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-system-monitor.spec	13 Jun 2006 03:01:51 -0000	1.52
+++ gnome-system-monitor.spec	12 Jul 2006 02:26:41 -0000	1.53
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.14.3
-Release: 4
+Version: 2.15.0
+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
@@ -94,6 +94,9 @@
 %{_datadir}/omf
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1
+- Update to 2.15.0
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 2.14.3-4
 - don't buildreq libtool/automake/autoconf, they're not called during
   the build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	17 May 2006 18:21:10 -0000	1.30
+++ sources	12 Jul 2006 02:26:41 -0000	1.31
@@ -1 +1 @@
-8d690176629b8b2b3e4d4f93d98d57f0  gnome-system-monitor-2.14.3.tar.bz2
+918008502532998c8c4961a39027d7df  gnome-system-monitor-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:29:15 -0400
Subject: rpms/kernel/FC-4 .cvsignore, 1.195, 1.196 kernel-2.6.spec, 1.1659,
	1.1660 sources, 1.179, 1.180 upstream, 1.120, 1.121
Message-ID: <200607120229.k6C2TFPM031676@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
.17.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- .cvsignore	30 Jun 2006 18:46:54 -0000	1.195
+++ .cvsignore	12 Jul 2006 02:29:12 -0000	1.196
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.3.bz2
+patch-2.6.17.4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -r1.1659 -r1.1660
--- kernel-2.6.spec	5 Jul 2006 22:12:45 -0000	1.1659
+++ kernel-2.6.spec	12 Jul 2006 02:29:12 -0000	1.1660
@@ -202,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.3.bz2
+Patch1: patch-2.6.17.4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1076,6 +1076,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2142_FC4]
+- 2.6.17.4
+
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Get rid of stack backtrace on panic, which in most
   cases actually caused a loss of info instead of a gain.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- sources	30 Jun 2006 18:46:55 -0000	1.179
+++ sources	12 Jul 2006 02:29:13 -0000	1.180
@@ -1,2 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-2c426ef5e2f02f1a761f150c13a7dac8  patch-2.6.17.3.bz2
+c3b9e8e7b63d6273c5476a999a3b6280  patch-2.6.17.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- upstream	30 Jun 2006 18:46:55 -0000	1.120
+++ upstream	12 Jul 2006 02:29:13 -0000	1.121
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.3.bz2
+patch-2.6.17.4.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:30:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:30:50 -0400
Subject: rpms/kernel/FC-4 linux-2.6-defaults-disable-split-ptlock.patch, NONE,
	1.1 kernel-2.6.spec, 1.1660, 1.1661
Message-ID: <200607120230.k6C2Uo0u032098@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
disable split pt lock


linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-disable-split-ptlock.patch ---
--- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
+++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
@@ -132,7 +132,7 @@ config SPLIT_PTLOCK_CPUS
 	int
 	default "4096" if ARM && !CPU_CACHE_VIPT
 	default "4096" if PARISC && !PA20
-	default "4"
+	default "4096"
 
 #
 # support for page migration


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -r1.1660 -r1.1661
--- kernel-2.6.spec	12 Jul 2006 02:29:12 -0000	1.1660
+++ kernel-2.6.spec	12 Jul 2006 02:30:41 -0000	1.1661
@@ -339,6 +339,7 @@
 Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch
 Patch2103: linux-2.6-defaults-phys-start.patch
 Patch2104: linux-2.6-defaults-unicode-vt.patch
+Patch2105: linux-2.6-defaults-disable-split-ptlock.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -690,6 +691,8 @@
 %patch2103 -p1
 # Use unicode VT's by default.
 %patch2104 -p1
+# Disable split pagetable lock
+%patch2105 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
@@ -1078,6 +1081,7 @@
 %changelog
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2142_FC4]
 - 2.6.17.4
+- Disable split pagetable lock.
 
 * Wed Jul  5 2006 Dave Jones <davej at redhat.com>
 - Get rid of stack backtrace on panic, which in most



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:32:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:32:29 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.4.bz2.sign, NONE, 1.1 .cvsignore,
	1.408, 1.409 kernel-2.6.spec, 1.2155, 1.2156 sources, 1.349,
	1.350 upstream, 1.318, 1.319 patch-2.6.17.3.bz2.sign, 1.1, NONE
Message-ID: <200607120232.k6C2WTQK032258@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.4.bz2.sign 
Removed Files:
	patch-2.6.17.3.bz2.sign 
Log Message:
17.4



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

iD8DBQBErYggyGugalF9Dw4RAsLIAJ4qPvAcNzbwu2Oe5basJA5ylCovKwCfZyOA
4fir2LdnuhA1+GQ3JSnvrIg=
=vICw
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- .cvsignore	7 Jul 2006 23:09:01 -0000	1.408
+++ .cvsignore	12 Jul 2006 02:32:17 -0000	1.409
@@ -1,7 +1,6 @@
 kernel-2.6.*.config
 temp-*
 kernel-2.6.17
-xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.17.3.bz2
 xen-20060708.tar.bz2
+patch-2.6.17.4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2155
retrieving revision 1.2156
diff -u -r1.2155 -r1.2156
--- kernel-2.6.spec	10 Jul 2006 11:49:12 -0000	1.2155
+++ kernel-2.6.spec	12 Jul 2006 02:32:17 -0000	1.2156
@@ -231,7 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.3.bz2
+Patch1: patch-2.6.17.4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1545,6 +1545,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.4
+
 * Sat Jul  8 2006 Juan Quintela <quintela at redhat.com>
 - enable CONFIG_CRASH on xen kernels.
 - enable CONFIG_PCIDEV_BACKEND on xen kernels.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- sources	7 Jul 2006 23:09:02 -0000	1.349
+++ sources	12 Jul 2006 02:32:17 -0000	1.350
@@ -1,4 +1,3 @@
-7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-2c426ef5e2f02f1a761f150c13a7dac8  patch-2.6.17.3.bz2
 5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
+c3b9e8e7b63d6273c5476a999a3b6280  patch-2.6.17.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- upstream	30 Jun 2006 18:47:17 -0000	1.318
+++ upstream	12 Jul 2006 02:32:17 -0000	1.319
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.3.bz2
+patch-2.6.17.4.bz2


--- patch-2.6.17.3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:32:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:32:33 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.4.bz2.sign, NONE,
	1.1 patch-2.6.17.3.bz2.sign, 1.1, NONE
Message-ID: <200607120232.k6C2WWQw032289@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.17.4.bz2.sign 
Removed Files:
	patch-2.6.17.3.bz2.sign 
Log Message:
signs



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

iD8DBQBErYggyGugalF9Dw4RAsLIAJ4qPvAcNzbwu2Oe5basJA5ylCovKwCfZyOA
4fir2LdnuhA1+GQ3JSnvrIg=
=vICw
-----END PGP SIGNATURE-----


--- patch-2.6.17.3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:34:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:34:03 -0400
Subject: rpms/kernel/FC-5 linux-2.6-defaults-disable-split-ptlock.patch, NONE,
	1.1 kernel-2.6.spec, 1.2156, 1.2157
Message-ID: <200607120234.k6C2Y3Al032499@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
disable split pt lock


linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-disable-split-ptlock.patch ---
--- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
+++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
@@ -132,7 +132,7 @@ config SPLIT_PTLOCK_CPUS
 	int
 	default "4096" if ARM && !CPU_CACHE_VIPT
 	default "4096" if PARISC && !PA20
-	default "4"
+	default "4096"
 
 #
 # support for page migration


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2156
retrieving revision 1.2157
diff -u -r1.2156 -r1.2157
--- kernel-2.6.spec	12 Jul 2006 02:32:17 -0000	1.2156
+++ kernel-2.6.spec	12 Jul 2006 02:34:00 -0000	1.2157
@@ -381,6 +381,7 @@
 Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch
 Patch2103: linux-2.6-defaults-phys-start.patch
 Patch2104: linux-2.6-defaults-unicode-vt.patch
+Patch2105: linux-2.6-defaults-disable-split-ptlock.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -953,6 +954,8 @@
 %patch2103 -p1
 # Use unicode VT's by default.
 %patch2104 -p1
+# Disable split pagetable lock
+%patch2105 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
@@ -1547,6 +1550,7 @@
 %changelog
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.4
+- Disable split pagetable lock
 
 * Sat Jul  8 2006 Juan Quintela <quintela at redhat.com>
 - enable CONFIG_CRASH on xen kernels.



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:45:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:45:06 -0400
Subject: rpms/kernel/FC-5 linux-2.6-defaults-disable-split-ptlock.patch, 1.1,
	1.2
Message-ID: <200607120245.k6C2j6rc003604@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
rediff


linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 02:34:00 -0000	1.1
+++ linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 02:45:03 -0000	1.2
@@ -1,9 +1,10 @@
---- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
-+++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
-@@ -132,7 +132,7 @@ config SPLIT_PTLOCK_CPUS
- 	int
+
+--- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 22:44:36.615338000 -0400
++++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 22:44:41.992952000 -0400
+@@ -134,7 +134,7 @@ config SPLIT_PTLOCK_CPUS
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
+ 	default "4096" if X86_XEN || X86_64_XEN
 -	default "4"
 +	default "4096"
  



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:50:33 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.13,
	1.14 policy-20060608.patch, 1.17, 1.18 selinux-policy.spec,
	1.220, 1.221
Message-ID: <200607120250.k6C2oXVg020444@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	booleans-targeted.conf policy-20060608.patch 
	selinux-policy.spec 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-2
- Multiple fixes



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- booleans-targeted.conf	9 Jul 2006 09:51:33 -0000	1.13
+++ booleans-targeted.conf	12 Jul 2006 02:50:30 -0000	1.14
@@ -22,14 +22,6 @@
 # 
 allow_ftpd_anon_write = false
 
-# Allow ftpd to read cifs directories.
-# 
-allow_ftpd_use_cifs = false
-
-# Allow ftpd to read nfs directories.
-# 
-allow_ftpd_use_nfs = false
-
 # Allow gssd to read temp directory.
 # 
 allow_gssd_read_tmp = true

policy-20060608.patch:
 global_tunables                  |    7 +
 modules/admin/bootloader.te      |    3 
 modules/admin/consoletype.te     |    7 +
 modules/bgp.mod                  |binary
 modules/bgp.pp                   |binary
 modules/bgp.te                   |   12 ++
 modules/kernel/corenetwork.te.in |    4 
 modules/kernel/files.fc          |    1 
 modules/kernel/kernel.if         |   38 +++++++
 modules/services/automount.te    |    8 +
 modules/services/avahi.te        |    1 
 modules/services/bluetooth.if    |   23 ++++
 modules/services/bluetooth.te    |    2 
 modules/services/cyrus.te        |    1 
 modules/services/hal.fc          |    1 
 modules/services/hal.te          |    5 
 modules/services/pegasus.if      |   31 ++++++
 modules/services/pegasus.te      |    5 
 modules/services/squid.te        |    2 
 modules/services/tftp.te         |    1 
 modules/services/xserver.if      |   22 ++++
 modules/services/zebra.te        |    2 
 modules/system/getty.fc          |    1 
 modules/system/getty.te          |    3 
 modules/system/hostname.te       |    5 
 modules/system/init.if           |    7 -
 modules/system/selinuxutil.te    |   11 ++
 modules/system/setrans.te        |    2 
 modules/system/unconfined.fc     |    1 
 modules/system/unconfined.te     |    8 -
 modules/system/userdomain.if     |  201 ++++++++++++++++++++++++---------------
 modules/system/userdomain.te     |   32 ++----
 32 files changed, 331 insertions(+), 116 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policy-20060608.patch	9 Jul 2006 09:51:33 -0000	1.17
+++ policy-20060608.patch	12 Jul 2006 02:50:30 -0000	1.18
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/global_tunables	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/global_tunables	2006-07-09 05:52:17.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,29 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.2/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-06-21 16:21:01.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/bootloader.te	2006-07-11 16:07:29.000000000 -0400
+@@ -48,7 +48,7 @@
+ # bootloader local policy
+ #
+ 
+-allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
++allow bootloader_t self:capability { dac_override dac_read_search fsetid sys_rawio sys_admin mknod chown };
+ allow bootloader_t self:process { sigkill sigstop signull signal execmem };
+ allow bootloader_t self:fifo_file rw_file_perms;
+ 
+@@ -86,6 +86,7 @@
+ dev_read_raw_memory(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
++fs_getattr_tmpfs(bootloader_t)
+ fs_read_tmpfs_symlinks(bootloader_t)
+ 
+ mls_file_read_up(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-09 05:52:17.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -32,9 +52,48 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+Binary files nsaserefpolicy/policy/modules/bgp.mod and serefpolicy-2.3.2/policy/modules/bgp.mod differ
+Binary files nsaserefpolicy/policy/modules/bgp.pp and serefpolicy-2.3.2/policy/modules/bgp.pp differ
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/bgp.te serefpolicy-2.3.2/policy/modules/bgp.te
+--- nsaserefpolicy/policy/modules/bgp.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/bgp.te	2006-07-10 10:52:30.000000000 -0400
+@@ -0,0 +1,12 @@
++module bgp 1.0;
++
++require {
++	class tcp_socket { name_bind name_connect }; 
++	type bgp_port_t; 
++	type port_t; 
++	type zebra_t; 
++	role system_r; 
++};
++
++allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect };
++allow zebra_t port_t:tcp_socket name_bind;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-06-06 22:21:53.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in	2006-07-11 16:31:56.000000000 -0400
+@@ -62,7 +62,7 @@
+ network_port(amavisd_send, tcp,10025,s0)
+ network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
+ network_port(auth, tcp,113,s0)
+-network_port(bgp, tcp,179,s0, udp,179,s0)
++network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0)
+ type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict
+ network_port(clamd, tcp,3310,s0)
+ network_port(clockspeed, udp,4041,s0)
+@@ -145,7 +145,7 @@
+ network_port(vnc, tcp,5900,s0)
+ network_port(xen, tcp,8002,s0)
+ network_port(xserver, tcp, 6000, s0, 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(zebra, tcp,2601,s0)
++network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
+ network_port(zope, tcp,8021,s0)
+ 
+ # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-09 05:52:17.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -45,7 +104,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-09 05:52:17.000000000 -0400
 @@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -90,8 +149,13 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-07 07:37:00.000000000 -0400
-@@ -40,6 +40,7 @@
++++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-10 09:06:39.000000000 -0400
+@@ -36,10 +36,12 @@
+ allow automount_t self:unix_dgram_socket create_socket_perms;
+ allow automount_t self:tcp_socket create_stream_socket_perms;
+ allow automount_t self:udp_socket create_socket_perms;
++allow automount_t self:netlink_route_socket r_netlink_socket_perms;
+ 
  allow automount_t automount_etc_t:file { getattr read };
  # because config files can be shell scripts
  can_exec(automount_t, automount_etc_t)
@@ -99,9 +163,30 @@
  
  allow automount_t automount_lock_t:file create_file_perms;
  files_lock_filetrans(automount_t,automount_lock_t,file)
+@@ -183,3 +185,9 @@
+ optional_policy(`
+ 	udev_read_db(automount_t)
+ ')
++
++optional_policy(`
++	kerberos_read_config(automount_t)
++	kerberos_read_keytab(automount_t)
++	kerberos_dontaudit_write_config(automount_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.2/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-05-26 14:02:27.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/avahi.te	2006-07-11 14:26:07.000000000 -0400
+@@ -78,6 +78,7 @@
+ miscfiles_read_localization(avahi_t)
+ 
+ sysnet_read_config(avahi_t)
++sysnet_use_ldap(avahi_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(avahi_t)
+ userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-09 05:52:17.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -131,7 +216,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-09 05:52:17.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -150,7 +235,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-08 15:28:24.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-09 05:52:17.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -161,7 +246,7 @@
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-09 05:52:17.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
@@ -169,7 +254,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-09 05:52:17.000000000 -0400
 @@ -163,6 +163,10 @@
  ')
  
@@ -188,7 +273,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-09 05:52:17.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -224,7 +309,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-09 05:52:17.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -243,7 +328,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-09 05:52:17.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -257,7 +342,7 @@
  corenet_tcp_connect_http_port(squid_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-09 05:52:17.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -268,7 +353,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-09 05:52:17.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -305,9 +390,52 @@
 +	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.2/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-06-06 22:21:56.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/zebra.te	2006-07-10 10:43:24.000000000 -0400
+@@ -73,9 +73,11 @@
+ corenet_tcp_bind_all_nodes(zebra_t)
+ corenet_udp_bind_all_nodes(zebra_t)
+ corenet_tcp_bind_zebra_port(zebra_t)
++corenet_tcp_bind_bgp_port(zebra_t)
+ corenet_udp_bind_router_port(zebra_t)
+ corenet_sendrecv_zebra_server_packets(zebra_t)
+ corenet_sendrecv_router_server_packets(zebra_t)
++corenet_tcp_connect_bgp_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/getty.fc serefpolicy-2.3.2/policy/modules/system/getty.fc
+--- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-07 07:35:32.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/getty.fc	2006-07-11 14:09:16.000000000 -0400
+@@ -9,3 +9,4 @@
+ /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
+ 
+ /var/spool/fax		--	gen_context(system_u:object_r:getty_var_run_t,s0)
++/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.2/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-04-12 12:59:10.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/getty.te	2006-07-11 14:07:15.000000000 -0400
+@@ -37,7 +37,7 @@
+ #
+ 
+ # Use capabilities.
+-allow getty_t self:capability { dac_override chown sys_resource sys_tty_config fowner fsetid };
++allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid };
+ dontaudit getty_t self:capability sys_tty_config;
+ allow getty_t self:process { getpgid getsession signal_perms };
+ 
+@@ -90,6 +90,7 @@
+ files_rw_generic_pids(getty_t)
+ files_read_etc_runtime_files(getty_t)
+ files_read_etc_files(getty_t)
++files_search_spool(getty_t)
+ 
+ init_rw_utmp(getty_t)
+ init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-09 05:52:17.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -322,7 +450,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-09 05:52:17.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -339,7 +467,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-11 16:22:45.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -349,9 +477,86 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
+@@ -431,6 +433,8 @@
+ auth_read_all_files_except_shadow(restorecond_t)
+ fs_relabelfrom_noxattr_fs(restorecond_t)
+ 
++init_dontaudit_use_script_ptys(restorecond_t)
++
+ kernel_use_fds(restorecond_t)
+ kernel_rw_pipes(restorecond_t)
+ kernel_read_system_state(restorecond_t)
+@@ -538,16 +542,23 @@
+ allow semanage_t self:unix_stream_socket create_stream_socket_perms;
+ allow semanage_t self:unix_dgram_socket create_socket_perms;
+ allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow semanage_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow semanage_t policy_config_t:file { read write };
+ 
+ allow semanage_t semanage_tmp_t:dir create_dir_perms;
+ allow semanage_t semanage_tmp_t:file create_file_perms;
++
++# Running genhomedircon requires this for finding all users
++auth_use_nsswitch(semanage_t)
++
+ files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
+ 
+ kernel_read_system_state(semanage_t)
+ kernel_read_kernel_sysctls(semanage_t)
+ 
++locallogin_use_fds(semanage_t)
++
+ corecmd_exec_bin(semanage_t)
+ corecmd_exec_sbin(semanage_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.2/policy/modules/system/setrans.te
+--- nsaserefpolicy/policy/modules/system/setrans.te	2006-05-19 10:07:51.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-11 14:37:40.000000000 -0400
+@@ -67,4 +67,6 @@
+ 
+ miscfiles_read_localization(setrans_t)
+ 
++rpm_use_script_fds(setrans_t)
++
+ seutil_read_config(setrans_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.2/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-21 16:21:04.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-11 15:59:13.000000000 -0400
+@@ -9,4 +9,5 @@
+ /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.2/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-22 15:12:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/unconfined.te	2006-07-10 11:50:54.000000000 -0400
+@@ -56,10 +56,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		amanda_domtrans_recover(unconfined_t)
+-	')
+-
+-	optional_policy(`
+ 		apache_domtrans_helper(unconfined_t)
+ 	')
+ 
+@@ -98,6 +94,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		bootloader_domtrans(unconfined_t)
++	')
++
++	optional_policy(`
+ 		dmidecode_domtrans(unconfined_t)
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-09 05:52:17.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -693,7 +898,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-07 07:37:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-09 05:52:17.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- selinux-policy.spec	9 Jul 2006 09:51:33 -0000	1.220
+++ selinux-policy.spec	12 Jul 2006 02:50:30 -0000	1.221
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.2
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -332,7 +332,6 @@
 x=`ls *.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`
 semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init -r libraries -r locallogin -r logging -r lvm -r miscfiles -r modutils -r mount -r mta -r netutils -r selinuxutil -r storage -r sysnetwork -r udev -r userdomain -r vpnc -r xend $x -s strict
 
-
 %triggerpostun strict -- strict <= 2.0.7
 %{rebuildpolicy} strict 
 
@@ -342,6 +341,9 @@
 %endif
 
 %changelog
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-2
+- Multiple fixes
+
 * Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 02:53:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 22:53:50 -0400
Subject: rpms/libsemanage/devel .cvsignore, 1.62, 1.63 libsemanage.spec, 1.96,
	1.97 sources, 1.64, 1.65
Message-ID: <200607120253.k6C2rogS021733@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21696

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-1
- Upgrade to latest from NSA
	* Merged support for read operations on read-only fs from 
	  Caleb Case (Tresys Technology).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	7 Jul 2006 11:08:01 -0000	1.62
+++ .cvsignore	12 Jul 2006 02:53:48 -0000	1.63
@@ -68,3 +68,4 @@
 libsemanage-1.6.8.tgz
 libsemanage-1.6.9.tgz
 libsemanage-1.6.11.tgz
+libsemanage-1.6.12.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- libsemanage.spec	7 Jul 2006 11:08:01 -0000	1.96
+++ libsemanage.spec	12 Jul 2006 02:53:48 -0000	1.97
@@ -2,7 +2,7 @@
 %define libselinuxver 1.30.19-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6.11
+Version: 1.6.12
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-1
+- Upgrade to latest from NSA
+	* Merged support for read operations on read-only fs from 
+	  Caleb Case (Tresys Technology).
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.11-1
 - Upgrade to latest from NSA
 	* Lindent.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	7 Jul 2006 11:08:01 -0000	1.64
+++ sources	12 Jul 2006 02:53:48 -0000	1.65
@@ -1 +1 @@
-443cf8d48b5bd31e6f986fd33ab884cd  libsemanage-1.6.11.tgz
+73ac0f49a67e67792c9712b6f5a4ec19  libsemanage-1.6.12.tgz



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:00:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:00:12 -0400
Subject: rpms/anthy/FC-5 anthy-7900-fix-undef-non-weak-symbol.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 anthy.spec, 1.20, 1.21 sources,
	1.12, 1.13
Message-ID: <200607120300.k6C30CcP024157@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	.cvsignore anthy.spec sources 
Added Files:
	anthy-7900-fix-undef-non-weak-symbol.patch 
Log Message:
* Wed Jul 12 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
- New upstream release.
- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
  symbols issue. (#198180)
- use dist tag.
- use make install DESTDIR=... instead of %%makeinstall.

anthy-7900-fix-undef-non-weak-symbol.patch:
 src-main/Makefile.am |    2 +-
 src-util/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE anthy-7900-fix-undef-non-weak-symbol.patch ---
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-main/Makefile.am anthy-7900/src-main/Makefile.am
--- anthy-7900.orig/src-main/Makefile.am	2006-05-13 18:29:05.000000000 +0900
+++ anthy-7900/src-main/Makefile.am	2006-07-12 09:50:52.000000000 +0900
@@ -4,7 +4,7 @@
 
 lib_LTLIBRARIES = libanthy.la
 
-libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm
+libanthy_la_LIBADD = ../src-splitter/libsplit.la ../src-ordering/libordering.la -lm ../src-diclib/libdiclib.la ../src-worddic/libanthydic.la
 libanthy_la_LDFLAGS = -version-info 1:0:1
 
 libanthy_la_SOURCES = \
diff -ruN -x autom4te.cache -x '*a' -x '*o' -x 'config*' -x .libs -x .deps -x Makefile -x Makefile.in -x 'anthy*' -x '*elc' -x depgraph -x test anthy-7900.orig/src-util/Makefile.am anthy-7900/src-util/Makefile.am
--- anthy-7900.orig/src-util/Makefile.am	2006-06-02 00:10:55.000000000 +0900
+++ anthy-7900/src-util/Makefile.am	2006-07-12 09:49:05.000000000 +0900
@@ -22,5 +22,6 @@
 lib_LTLIBRARIES = libanthyinput.la
 libanthyinput_la_SOURCES = input.c rkconv.c rkhelper.c\
  rkconv.h rkmap.h rkhelper.h
+libanthyinput_la_LIBADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la
 
 pkgdata_DATA = typetab dic-tool-usage.txt


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Apr 2006 01:42:50 -0000	1.12
+++ .cvsignore	12 Jul 2006 03:00:10 -0000	1.13
@@ -15,3 +15,4 @@
 anthy-7100b.tar.gz
 anthy-7500.tar.gz
 anthy-7500b.tar.gz
+anthy-7900.tar.gz


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/anthy.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- anthy.spec	24 Apr 2006 01:42:50 -0000	1.20
+++ anthy.spec	12 Jul 2006 03:00:10 -0000	1.21
@@ -1,13 +1,13 @@
-%define	version		7500b
 %define	gcanna_ver	20051002
 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}}
 
 Name:		anthy
-Version:	%{version}
-Release:	1.fc5
+Version:	7900
+Release:	1%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
-Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake autoconf
 BuildRequires:	emacs
 %{?_with_xemacs:BuildRequires:	xemacs}
 
@@ -15,6 +15,7 @@
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
 Patch2:		anthy-gcanna-nakaguro.patch
+Patch3:		anthy-7900-fix-undef-non-weak-symbol.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -57,16 +58,20 @@
 %prep
 %setup -q -a 2
 %patch2 -p1
+%patch3 -p1 -b .non-weak
+# need to regenerate Makefile for patch3
+automake
+autoconf
 
 %build
 %configure
 cp anthy_gcanna_ut-%{gcanna_ver}/gcanna.ctd cannadic/
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ## for anthy-el
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
@@ -119,6 +124,13 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
+- New upstream release.
+- anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak
+  symbols issue. (#198180)
+- use dist tag.
+- use make install DESTDIR=... instead of %%makeinstall.
+
 * Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7500b-1
 - New upstream release.
   - removed unnecessary patches:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Apr 2006 01:42:50 -0000	1.12
+++ sources	12 Jul 2006 03:00:10 -0000	1.13
@@ -1,2 +1,2 @@
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
-ed3ce5d4332751ee3f4befe843c8ebb8  anthy-7500b.tar.gz
+356467305997191acd353d1c7e4e5d92  anthy-7900.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:05:55 -0400
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.19,
	1.20 gnome-power-manager.spec, 1.49, 1.50 sources, 1.19, 1.20
Message-ID: <200607120305.k6C35tx1024857@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24811

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	14 Jun 2006 03:56:24 -0000	1.19
+++ .cvsignore	12 Jul 2006 03:05:50 -0000	1.20
@@ -1 +1 @@
-gnome-power-manager-2.15.3.tar.bz2
+gnome-power-manager-2.15.4.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-power-manager.spec	14 Jun 2006 03:56:24 -0000	1.49
+++ gnome-power-manager.spec	12 Jul 2006 03:05:50 -0000	1.50
@@ -1,10 +1,10 @@
 
-%define hal_version  0.5.5.1.cvs
+%define hal_version  0.5.6
 %define dbus_version 0.60
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.15.3
+Version: 2.15.4
 Release: 1
 License: GPL
 Group: Applications/System
@@ -22,6 +22,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libtool
+BuildRequires: cairo-devel
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
@@ -102,6 +103,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	14 Jun 2006 03:56:24 -0000	1.19
+++ sources	12 Jul 2006 03:05:50 -0000	1.20
@@ -1 +1 @@
-7c0634be8699156d9546fc92ba8c7ccf  gnome-power-manager-2.15.3.tar.bz2
+0fa269fc8c91b5ff6152b6753b3fa61d  gnome-power-manager-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:09:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:09:30 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.48,1.49
Message-ID: <200607120309.k6C39UQk025550@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25485

Modified Files:
	gnucash.spec 
Log Message:
flip svn rev



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnucash.spec	12 Jul 2006 00:54:16 -0000	1.48
+++ gnucash.spec	12 Jul 2006 03:09:28 -0000	1.49
@@ -7,7 +7,7 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.0
 %if %{buildsvn}
-Release: 1.svn%{svnrev}.1
+Release: 2.%{svnrev}svn
 %else
 Release: 2
 %endif



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:13:30 -0400
Subject: rpms/anthy/FC-5 anthy.spec,1.21,1.22
Message-ID: <200607120313.k6C3DU5K027010@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	anthy.spec 
Log Message:
exclude ppc64


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/FC-5/anthy.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- anthy.spec	12 Jul 2006 03:00:10 -0000	1.21
+++ anthy.spec	12 Jul 2006 03:13:27 -0000	1.22
@@ -8,7 +8,9 @@
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	automake autoconf
+%ifnarch ppc64
 BuildRequires:	emacs
+%endif
 %{?_with_xemacs:BuildRequires:	xemacs}
 
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
@@ -35,6 +37,7 @@
 The anthy-devel package contains the development files which is needed to build
 the programs which uses Anthy.
 
+%ifnarch ppc64
 %package	el
 Summary:	Emacs Lisp files to use Anthy on Emacs
 Group:		System Environment/Libraries
@@ -43,6 +46,7 @@
 %description	el
 The anthy-el package contains the emacs lisp to be able to input Japanese
 character set on Emacs.
+%endif
 
 %if %{build_with_xemacs}
 %package	el-xemacs
@@ -73,9 +77,11 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%ifnarch ppc64
 ## for anthy-el
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+%endif
 
 ## for anthy-el-xemacs
 %if %{build_with_xemacs}
@@ -111,10 +117,12 @@
 %{_libdir}/lib*.la
 %{_libdir}/pkgconfig
 
+%ifnarch ppc64
 %files el
 %defattr (-, root, root)
 %{_datadir}/emacs/site-lisp/anthy/
 %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el
+%endif
 
 %if %{build_with_xemacs}
 %files el-xemacs
@@ -130,6 +138,8 @@
   symbols issue. (#198180)
 - use dist tag.
 - use make install DESTDIR=... instead of %%makeinstall.
+- exclude ppc64 to make anthy-el package. right now emacs.ppc64 isn't provided
+  and buildsys became much stricter.
 
 * Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> 7500b-1
 - New upstream release.



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:14:17 -0400
Subject: rpms/kernel/devel/configs config-generic,1.221,1.222
Message-ID: <200607120314.k6C3EHae027361@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
reenable lockdep


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- config-generic	12 Jul 2006 01:09:47 -0000	1.221
+++ config-generic	12 Jul 2006 03:14:15 -0000	1.222
@@ -2566,8 +2566,8 @@
 
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_LOCKDEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_DEBUG_LOCKDEP=y
+CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:14:43 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-disable-split-ptlock.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2373, 1.2374
Message-ID: <200607120314.k6C3EhXc027538@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
disable split page table lock

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-disable-split-ptlock.patch ---
--- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
+++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
@@ -132,7 +132,7 @@ config SPLIT_PTLOCK_CPUS
 	int
 	default "4096" if ARM && !CPU_CACHE_VIPT
 	default "4096" if PARISC && !PA20
-	default "4"
+	default "4096"
 
 #
 # support for page migration


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2373
retrieving revision 1.2374
diff -u -r1.2373 -r1.2374
--- kernel-2.6.spec	12 Jul 2006 01:09:46 -0000	1.2373
+++ kernel-2.6.spec	12 Jul 2006 03:14:40 -0000	1.2374
@@ -399,6 +399,7 @@
 Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch
 Patch2103: linux-2.6-defaults-phys-start.patch
 Patch2104: linux-2.6-defaults-unicode-vt.patch
+Patch2105: linux-2.6-defaults-disable-split-ptlock.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -963,6 +964,8 @@
 %patch2103 -p1
 # Use unicode VT's by default.
 %patch2104 -p1
+# Disable split page table lock
+%patch2105 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:25:38 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.18,1.19
Message-ID: <200607120325.k6C3Pc5b014179@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-2
- Multiple fixes


policy-20060608.patch:
 global_tunables                  |    7 +
 modules/admin/bootloader.te      |    3 
 modules/admin/consoletype.te     |    7 +
 modules/bgp.mod                  |binary
 modules/bgp.pp                   |binary
 modules/bgp.te                   |   12 ++
 modules/kernel/corenetwork.te.in |    4 
 modules/kernel/files.fc          |    1 
 modules/kernel/kernel.if         |   38 +++++++
 modules/services/automount.te    |    8 +
 modules/services/avahi.te        |    1 
 modules/services/bluetooth.if    |   23 ++++
 modules/services/bluetooth.te    |    2 
 modules/services/cyrus.te        |    1 
 modules/services/hal.fc          |    1 
 modules/services/hal.te          |    5 
 modules/services/pegasus.if      |   31 ++++++
 modules/services/pegasus.te      |    5 
 modules/services/squid.te        |    2 
 modules/services/tftp.te         |    1 
 modules/services/xserver.if      |   22 ++++
 modules/services/zebra.te        |    2 
 modules/system/getty.fc          |    1 
 modules/system/getty.te          |    3 
 modules/system/hostname.te       |    5 
 modules/system/init.if           |    7 -
 modules/system/selinuxutil.te    |   11 ++
 modules/system/setrans.te        |    5 
 modules/system/unconfined.fc     |    1 
 modules/system/unconfined.te     |    8 -
 modules/system/userdomain.if     |  201 ++++++++++++++++++++++++---------------
 modules/system/userdomain.te     |   32 ++----
 32 files changed, 334 insertions(+), 116 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policy-20060608.patch	12 Jul 2006 02:50:30 -0000	1.18
+++ policy-20060608.patch	12 Jul 2006 03:25:36 -0000	1.19
@@ -512,14 +512,16 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.2/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-11 14:37:40.000000000 -0400
-@@ -67,4 +67,6 @@
- 
++++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-11 23:15:28.000000000 -0400
+@@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
-+rpm_use_script_fds(setrans_t)
-+
  seutil_read_config(setrans_t)
++
++optional_policy(`
++	rpm_use_script_fds(setrans_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.2/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-21 16:21:04.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-11 15:59:13.000000000 -0400



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:26:51 -0400
Subject: rpms/nautilus-sendto/devel .cvsignore, 1.3, 1.4 nautilus-sendto.spec,
	1.12, 1.13 sources, 1.3, 1.4
Message-ID: <200607120326.k6C3Qp7w014701@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14639

Modified Files:
	.cvsignore nautilus-sendto.spec sources 
Log Message:
0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 May 2006 07:05:51 -0000	1.3
+++ .cvsignore	12 Jul 2006 03:26:49 -0000	1.4
@@ -1 +1 @@
-nautilus-sendto-0.5.tar.bz2
+nautilus-sendto-0.7.tar.bz2


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nautilus-sendto.spec	14 Jun 2006 09:19:21 -0000	1.12
+++ nautilus-sendto.spec	12 Jul 2006 03:26:49 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
-Version:        0.5
-Release: 	4
+Version:        0.7
+Release: 	1
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -76,6 +76,9 @@
 %endif
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen  <mclasen at redhat.com> - 0.7-1
+- Update to 0.7
+
 * Wed Jun 14 2006 Alexander Larsson <alexl at redhat.com> - 0.5-4
 - Rebuild again, hopefully fixing libbluetooth issue
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 May 2006 07:05:51 -0000	1.3
+++ sources	12 Jul 2006 03:26:49 -0000	1.4
@@ -1 +1 @@
-e43a5e51270ef3e0f4743ed4d23f7409  nautilus-sendto-0.5.tar.bz2
+c6988b7b10cf2350ed4db03c57136928  nautilus-sendto-0.7.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:41:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:41:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2374,1.2375
Message-ID: <200607120341.k6C3fBYA018397@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
borken archs for now



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2374
retrieving revision 1.2375
diff -u -r1.2374 -r1.2375
--- kernel-2.6.spec	12 Jul 2006 03:14:40 -0000	1.2374
+++ kernel-2.6.spec	12 Jul 2006 03:41:09 -0000	1.2375
@@ -179,7 +179,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:41:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:41:39 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.50,1.51
Message-ID: <200607120341.k6C3fdXt018583@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18498

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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-power-manager.spec	12 Jul 2006 03:05:50 -0000	1.50
+++ gnome-power-manager.spec	12 Jul 2006 03:41:37 -0000	1.51
@@ -97,7 +97,7 @@
 %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf
 %{_datadir}/dbus-1/services/gnome-power-manager.service
 %{_datadir}/gnome/help/gnome-power-manager/*
-%{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf
+%{_datadir}/omf/gnome-power-manager/*
 %{_datadir}/gnome/autostart/*
 %{_datadir}/applications/gnome-power-preferences.desktop
 %{_datadir}/icons/hicolor/*/apps/*



From fedora-cvs-commits at redhat.com  Wed Jul 12 03:50:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 11 Jul 2006 23:50:22 -0400
Subject: rpms/gnome-speech/devel .cvsignore, 1.12, 1.13 gnome-speech.spec,
	1.27, 1.28 sources, 1.12, 1.13
Message-ID: <200607120350.k6C3oMR8004200@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-speech.spec sources 
Log Message:
0.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 May 2006 17:36:21 -0000	1.12
+++ .cvsignore	12 Jul 2006 03:50:19 -0000	1.13
@@ -1 +1 @@
-gnome-speech-0.4.0.tar.bz2
+gnome-speech-0.4.1.tar.bz2


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-speech.spec	10 Jun 2006 04:03:39 -0000	1.27
+++ gnome-speech.spec	12 Jul 2006 03:50:19 -0000	1.28
@@ -2,8 +2,8 @@
 
 Summary: GNOME Text to Speech
 Name: gnome-speech
-Version: 0.4.0
-Release: 2
+Version: 0.4.1
+Release: 1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1
+- Update to 0.4.1
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.0-2
 - Add missing BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 May 2006 17:36:21 -0000	1.12
+++ sources	12 Jul 2006 03:50:19 -0000	1.13
@@ -1 +1 @@
-c27f3eb262b8a66a756872d25c716517  gnome-speech-0.4.0.tar.bz2
+1e42617a404449476cfe150d406e8349  gnome-speech-0.4.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:12:22 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.13,1.14
Message-ID: <200607120412.k6C4CMdB009571@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9509

Modified Files:
	nautilus-sendto.spec 
Log Message:
buildrequire gaim-devel



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nautilus-sendto.spec	12 Jul 2006 03:26:49 -0000	1.13
+++ nautilus-sendto.spec	12 Jul 2006 04:12:18 -0000	1.14
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, libglade2-devel, evolution-data-server-devel, libgnomeui-devel
-BuildRequires:	nautilus >= 2.5.4, gaim >= 1.0
+BuildRequires:	nautilus >= 2.5.4, gaim-devel >= 1.0
 BuildRequires:  gettext
 
 # For compat with old nautilus-sendto packaging



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:14:15 -0400
Subject: rpms/evince/devel .cvsignore, 1.24, 1.25 evince.spec, 1.52,
	1.53 sources, 1.23, 1.24
Message-ID: <200607120414.k6C4EFLZ009924@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9894

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
0.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	17 May 2006 15:59:15 -0000	1.24
+++ .cvsignore	12 Jul 2006 04:14:10 -0000	1.25
@@ -1 +1 @@
-evince-0.5.3.tar.bz2
+evince-0.5.4.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- evince.spec	29 Jun 2006 19:09:33 -0000	1.52
+++ evince.spec	12 Jul 2006 04:14:10 -0000	1.53
@@ -3,8 +3,8 @@
 %define dbus_version 0.60
 
 Name:		evince
-Version:	0.5.3
-Release:	4
+Version:	0.5.4
+Release:	1
 Summary:	Document viewer
 
 License: 	GPL
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-1
+- Update to 0.5.4
+
 * Thu Jun 29 2006 Kristian H??gsberg <krh at redhat.com> - 0.5.3-4
 - Bump gtk2 dependency to 2.9.4.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 May 2006 15:59:15 -0000	1.23
+++ sources	12 Jul 2006 04:14:10 -0000	1.24
@@ -1 +1 @@
-94be73485eeb8584b4aeaa8ac87699f0  evince-0.5.3.tar.bz2
+82ea2cc4ae080aa5cbc2b1c7739ccb96  evince-0.5.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:26:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:26:06 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto-0.7-gaim.patch, NONE,
	1.1 nautilus-sendto.spec, 1.14, 1.15
Message-ID: <200607120426.k6C4Q6SJ026388@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26335

Modified Files:
	nautilus-sendto.spec 
Added Files:
	nautilus-sendto-0.7-gaim.patch 
Log Message:
make it build against gaim-2.0.0


nautilus-sendto-0.7-gaim.patch:
 nautilus-sendto-plugin.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE nautilus-sendto-0.7-gaim.patch ---
--- nautilus-sendto-0.7/gaim_plugin/nautilus-sendto-plugin.c.gaim	2006-07-12 00:26:51.000000000 -0400
+++ nautilus-sendto-0.7/gaim_plugin/nautilus-sendto-plugin.c	2006-07-12 00:27:00.000000000 -0400
@@ -37,7 +37,6 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#include "internal.h"
 #include "conversation.h"
 #include "core.h"
 #include "debug.h"


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nautilus-sendto.spec	12 Jul 2006 04:12:18 -0000	1.14
+++ nautilus-sendto.spec	12 Jul 2006 04:26:01 -0000	1.15
@@ -13,6 +13,8 @@
 BuildRequires:	nautilus >= 2.5.4, gaim-devel >= 1.0
 BuildRequires:  gettext
 
+Patch0:		nautilus-sendto-0.7-gaim.patch
+
 # For compat with old nautilus-sendto packaging
 Provides: nautilus-sendto-gaim
 
@@ -38,6 +40,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .gaim
+
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:40:32 -0400
Subject: rpms/cairo/devel cairo.spec,1.52,1.53
Message-ID: <200607120440.k6C4eWhL028354@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28324

Modified Files:
	cairo.spec 
Log Message:
bumped for rebuild


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cairo.spec	4 Jul 2006 03:10:48 -0000	1.52
+++ cairo.spec	12 Jul 2006 04:40:29 -0000	1.53
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.2.0
-Release:   1
+Release:   1.1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.1
+- rebuild
+
 * Mon Jul  3 2006 Matthias Clasen <mclasen at redhat.com> 1.2.0-1
 - Update to 1.2.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:41:54 -0400
Subject: rpms/dasher/devel .cvsignore, 1.14, 1.15 dasher.spec, 1.44,
	1.45 sources, 1.14, 1.15
Message-ID: <200607120441.k6C4fsgg028459@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28442

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
4.1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Jun 2006 03:09:59 -0000	1.14
+++ .cvsignore	12 Jul 2006 04:41:37 -0000	1.15
@@ -1 +1 @@
-dasher-4.1.4.tar.bz2
+dasher-4.1.7.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- dasher.spec	13 Jun 2006 03:52:16 -0000	1.44
+++ dasher.spec	12 Jul 2006 04:41:37 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.1.4
-Release: 2
+Version: 4.1.7
+Release: 1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -98,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.7-1
+- Update t0 4.1.7
+
 * Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.4-2
 - Update to 4.1.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Jun 2006 03:09:59 -0000	1.14
+++ sources	12 Jul 2006 04:41:37 -0000	1.15
@@ -1 +1 @@
-690393b537de95df59388b18772a7a3f  dasher-4.1.4.tar.bz2
+ca65b0903b8e7448900bdea6b0fb41cc  dasher-4.1.7.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:45:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:45:04 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.32,1.33
Message-ID: <200607120445.k6C4j4Hg015539@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15518

Modified Files:
	cairo-java.spec 
Log Message:
bumped for rebuild


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cairo-java.spec	17 Jun 2006 16:54:12 -0000	1.32
+++ cairo-java.spec	12 Jul 2006 04:45:01 -0000	1.33
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.4
-Release: 	0
+Release: 	0.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.1
+- rebuild
+
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
 - Use *.tar.bz2, not *.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:45:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:45:30 -0400
Subject: rpms/ccid/devel ccid.spec,1.2,1.3
Message-ID: <200607120445.k6C4jUkl031530@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ccid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29244

Modified Files:
	ccid.spec 
Log Message:
bumped for rebuild


Index: ccid.spec
===================================================================
RCS file: /cvs/dist/rpms/ccid/devel/ccid.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ccid.spec	10 Jul 2006 22:03:11 -0000	1.2
+++ ccid.spec	12 Jul 2006 04:45:27 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           ccid
 Version:        1.0.1
-Release:        3
+Release:        3.1
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-3
 - remove s390 from the build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:46:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:46:03 -0400
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.26,1.27
Message-ID: <200607120446.k6C4k3km007175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdparanoia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6272

Modified Files:
	cdparanoia.spec 
Log Message:
bumped for rebuild


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/dist/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cdparanoia.spec	11 Feb 2006 02:14:18 -0000	1.26
+++ cdparanoia.spec	12 Jul 2006 04:45:59 -0000	1.27
@@ -3,7 +3,7 @@
 
 Name: cdparanoia
 Version: %{realver}
-Release: 27.1
+Release: 27.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - alpha9.8-27.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - alpha9.8-27.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:46:37 -0400
Subject: rpms/cdrdao/devel cdrdao.spec,1.34,1.35
Message-ID: <200607120446.k6C4kb5W009685@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdrdao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9293

Modified Files:
	cdrdao.spec 
Log Message:
bumped for rebuild


Index: cdrdao.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cdrdao.spec	9 Mar 2006 13:29:55 -0000	1.34
+++ cdrdao.spec	12 Jul 2006 04:46:34 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
 Name: cdrdao
 Version: 1.2.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://cdrdao.sourceforge.net/
@@ -52,6 +52,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1-1.1
+- rebuild
+
 * Wed Mar 08 2006 Harald Hoyer <harald at redhat.com> - 1.2.1-1
 - version 1.2.1 (1.2.0 was not functional)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:46:59 -0400
Subject: rpms/cdrtools/devel cdrtools.spec,1.50,1.51
Message-ID: <200607120446.k6C4kxwJ011749@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cdrtools.spec 
Log Message:
bumped for rebuild


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cdrtools.spec	6 Jun 2006 14:22:56 -0000	1.50
+++ cdrtools.spec	12 Jul 2006 04:46:55 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a10
-Release: 1
+Release: 1.1
 %define tarversion 2.01.01a10
 License: CDDL
 Group: Applications/System
@@ -240,6 +240,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a10-1.1
+- rebuild
+
 * Tue Jun  6 2006 Harald Hoyer <harald at redhat.com> - 8:2.01.01.0.a10-1
 - version 2.01.01a10
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:47:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:47:54 -0400
Subject: rpms/checkpolicy/devel checkpolicy.spec,1.101,1.102
Message-ID: <200607120447.k6C4lsqE014141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13983

Modified Files:
	checkpolicy.spec 
Log Message:
bumped for rebuild


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- checkpolicy.spec	5 Jul 2006 10:43:20 -0000	1.101
+++ checkpolicy.spec	12 Jul 2006 04:47:50 -0000	1.102
@@ -2,7 +2,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 1.30.9
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.30.9-1.1
+- rebuild
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.30.8-1
 - Latest upgrade from NSA
 	* Lindent.



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:48:25 -0400
Subject: rpms/chkconfig/devel chkconfig.spec,1.38,1.39
Message-ID: <200607120448.k6C4mPgq015740@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15401

Modified Files:
	chkconfig.spec 
Log Message:
bumped for rebuild


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- chkconfig.spec	24 Feb 2006 22:22:45 -0000	1.38
+++ chkconfig.spec	12 Jul 2006 04:48:23 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
 Version: 1.3.29
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.29-1.1
+- rebuild
+
 * Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> 1.3.29-1
 - fix accidental enabling of services on --add (#182729)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:48:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:48:48 -0400
Subject: rpms/chkfontpath/devel chkfontpath.spec,1.15,1.16
Message-ID: <200607120448.k6C4mmmt016540@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkfontpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16420

Modified Files:
	chkfontpath.spec 
Log Message:
bumped for rebuild


Index: chkfontpath.spec
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/chkfontpath.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- chkfontpath.spec	16 Feb 2006 14:05:46 -0000	1.15
+++ chkfontpath.spec	12 Jul 2006 04:48:45 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Simple interface for editing the font path for the X font server.
 Name: chkfontpath
 Version: 1.10.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -41,6 +41,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-1.1
+- rebuild
+
 * 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).



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:49:13 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.18, 1.19 gnome-mag.spec, 1.34,
	1.35 sources, 1.18, 1.19
Message-ID: <200607120449.k6C4nDSS018018@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.12.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 May 2006 04:30:43 -0000	1.18
+++ .cvsignore	12 Jul 2006 04:49:10 -0000	1.19
@@ -1 +1 @@
-gnome-mag-0.12.5.tar.bz2
+gnome-mag-0.12.6.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-mag.spec	13 Jun 2006 02:27:40 -0000	1.34
+++ gnome-mag.spec	12 Jul 2006 04:49:10 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.12.5
-Release: 2
+Version: 0.12.6
+Release: 1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -69,6 +69,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 0.12.6-1
+- Update to 0.12.6
+
 * Mon Jun 12 2006 Bill Nottingham  <notting at redhat.com> 0.12.5-2
 - we don't call automake, don't buildreq it
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	18 May 2006 04:30:49 -0000	1.18
+++ sources	12 Jul 2006 04:49:10 -0000	1.19
@@ -1 +1 @@
-5872f8f5f985cc476f1ea8adf0e4518d  gnome-mag-0.12.5.tar.bz2
+c402b06408d3b40843720ae09ad74234  gnome-mag-0.12.6.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:49:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:49:24 -0400
Subject: rpms/ckermit/devel ckermit.spec,1.20,1.21
Message-ID: <200607120449.k6C4nO6f018054@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ckermit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17871

Modified Files:
	ckermit.spec 
Log Message:
bumped for rebuild


Index: ckermit.spec
===================================================================
RCS file: /cvs/dist/rpms/ckermit/devel/ckermit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ckermit.spec	3 Jul 2006 11:28:37 -0000	1.20
+++ ckermit.spec	12 Jul 2006 04:49:11 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The quintessential all-purpose communications program
 Name: ckermit
 Version: 8.0.211
-Release: 5%{?dist}
+Release: 5.1%{?dist}
 License: Special (see COPYING.TXT.gz)
 Group: Applications/Communications
 Source0: ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
@@ -83,6 +83,9 @@
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.0.211-5.1
+- rebuild
+
 * Mon Jul 03 2006 Peter Vrabec <pvrabec at redhat.com> - 8.0.211-5
 - fix requires (#195573)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:49:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:49:37 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.13,1.14
Message-ID: <200607120449.k6C4nbRM019287@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19209

Modified Files:
	classpathx-jaf.spec 
Log Message:
bumped for rebuild


Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- classpathx-jaf.spec	6 Mar 2006 21:55:13 -0000	1.13
+++ classpathx-jaf.spec	12 Jul 2006 04:49:35 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release: 	2jpp_5fc
+Release: 	2jpp_6fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-2jpp_5fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:50:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:50:24 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.18,1.19
Message-ID: <200607120450.k6C4oOr1022534@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20874

Modified Files:
	classpathx-mail.spec 
Log Message:
bumped for rebuild


Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- classpathx-mail.spec	6 Mar 2006 21:50:34 -0000	1.18
+++ classpathx-mail.spec	12 Jul 2006 04:50:22 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:           classpathx-mail
 Version:        1.0
-Release: 	4jpp_5fc
+Release: 	4jpp_6fc
 Epoch:          0
 Summary:        GNU JavaMail(tm)
 
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-4jpp_5fc
 - stop the scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:50:59 -0400
Subject: rpms/cleanfeed/devel cleanfeed.spec,1.10,1.11
Message-ID: <200607120450.k6C4owUT022601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cleanfeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22588

Modified Files:
	cleanfeed.spec 
Log Message:
bumped for rebuild


Index: cleanfeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cleanfeed/devel/cleanfeed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cleanfeed.spec	9 Dec 2005 22:40:03 -0000	1.10
+++ cleanfeed.spec	12 Jul 2006 04:50:56 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A spam filter for Usenet news servers.
 Name: cleanfeed
 Version: 0.95.7b
-Release: 21.1
+Release: 21.1.1
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.exit109.com/users/jeremy/cleanfeed-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %attr(-,news,news) /usr/lib/news/bin/filter/filter_innd.pl
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.95.7b-21.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:51:08 -0400
Subject: rpms/cman/devel cman.spec,1.49,1.50
Message-ID: <200607120451.k6C4p8rJ022686@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22673

Modified Files:
	cman.spec 
Log Message:
bumped for rebuild


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cman.spec	11 Jul 2006 19:05:39 -0000	1.49
+++ cman.spec	12 Jul 2006 04:51:06 -0000	1.50
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.1
+Release: 0.fc6.1.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -108,6 +108,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jul 06 2006 Chris Feist <cfeist at redhat.com> - 2.0.1-0.fc6.0
 - Rebuild w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:51:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:51:17 -0400
Subject: rpms/compat-db/devel compat-db.spec,1.19,1.20
Message-ID: <200607120451.k6C4pHCY022743@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-db.spec 
Log Message:
bumped for rebuild


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- compat-db.spec	10 Jul 2006 08:31:41 -0000	1.19
+++ compat-db.spec	12 Jul 2006 04:51:15 -0000	1.20
@@ -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: 5
+Release: 5.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
@@ -174,6 +174,9 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-5.1
+- rebuild
+
 * Mon Jul 10 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-5
 - package libdb_cxx, which is a dependency for OpenOffice.org-1.x and
   other legacy software (#198130), thanks to Sivasankar Chander



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:51:35 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.12,1.13
Message-ID: <200607120451.k6C4pZNh022806@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-gcc-296.spec 
Log Message:
bumped for rebuild


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compat-gcc-296.spec	13 Feb 2006 07:41:31 -0000	1.12
+++ compat-gcc-296.spec	12 Jul 2006 04:51:33 -0000	1.13
@@ -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
@@ -1089,6 +1089,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.96-135.1
+- rebuild
+
 * 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



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:51:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:51:52 -0400
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.20,1.21
Message-ID: <200607120451.k6C4pq4u022863@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-gcc-32.spec 
Log Message:
bumped for rebuild


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- compat-gcc-32.spec	11 Feb 2006 09:19:33 -0000	1.20
+++ compat-gcc-32.spec	12 Jul 2006 04:51:50 -0000	1.21
@@ -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
@@ -636,6 +636,9 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-55.fc5.1
+- rebuild
+
 * 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



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:52:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:52:08 -0400
Subject: rpms/compat-slang/devel compat-slang.spec,1.13,1.14
Message-ID: <200607120452.k6C4q831022957@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22944

Modified Files:
	compat-slang.spec 
Log Message:
bumped for rebuild


Index: compat-slang.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-slang/devel/compat-slang.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compat-slang.spec	11 Feb 2006 02:18:50 -0000	1.13
+++ compat-slang.spec	12 Jul 2006 04:52:06 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: compat-slang
 Version: 1.4.9
-Release: 27.2.1
+Release: 27.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.9-27.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:52:20 -0400
Subject: rpms/comps-extras/devel comps-extras.spec,1.18,1.19
Message-ID: <200607120452.k6C4qKLE023013@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/comps-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22999

Modified Files:
	comps-extras.spec 
Log Message:
bumped for rebuild


Index: comps-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- comps-extras.spec	2 Mar 2006 19:36:27 -0000	1.18
+++ comps-extras.spec	12 Jul 2006 04:52:18 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Images for components and tools for working with the comps file
 Name: comps-extras
 Version: 11.1
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -31,6 +31,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 11.1-1.1
+- rebuild
+
 * Thu Mar  2 2006 Bill Nottingham <notting at redhat.com> - 11.1-1
 - new education icon from Diana Fong
 - update XFCE icon



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:52:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:52:38 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.6,1.7
Message-ID: <200607120452.k6C4qcAd023068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23055

Modified Files:
	concurrent.spec 
Log Message:
bumped for rebuild


Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- concurrent.spec	6 Mar 2006 22:24:13 -0000	1.6
+++ concurrent.spec	12 Jul 2006 04:52:36 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           concurrent
 Version:        1.3.2
-Release: 2jpp_2fc
+Release: 2jpp_3fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -70,6 +70,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.2-2jpp_3fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3.2-2jpp_2fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:53:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:53:02 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.125,1.126
Message-ID: <200607120453.k6C4r2qh023190@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	coreutils.spec 
Log Message:
bumped for rebuild


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- coreutils.spec	11 Jul 2006 11:44:24 -0000	1.125
+++ coreutils.spec	12 Jul 2006 04:52:59 -0000	1.126
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 3
+Release: 3.1
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -272,6 +272,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.97-3.1
+- rebuild
+
 * Tue Jul 11 2006 Tomas Mraz <tmraz at redhat.com> 5.97-3
 - allow root to su to expired user (#152420)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:53:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:53:12 -0400
Subject: rpms/cpio/devel cpio.spec,1.40,1.41
Message-ID: <200607120453.k6C4rCKG023245@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23231

Modified Files:
	cpio.spec 
Log Message:
bumped for rebuild


Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cpio.spec	10 Jun 2006 12:31:51 -0000	1.40
+++ cpio.spec	12 Jul 2006 04:53:10 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 18
+Release: 18.1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -106,6 +106,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6-18.1
+- rebuild
+
 * Sat Jun 10 2006 Peter Vrabec <pvrabec at redhat.com> 2.6-18
 - autoconf was added to BuildRequires, because autoheader is 
   used in prep phase (#194737)



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:53:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:53:27 -0400
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.35,1.36
Message-ID: <200607120453.k6C4rR8k023333@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23319

Modified Files:
	cpuspeed.spec 
Log Message:
bumped for rebuild


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cpuspeed.spec	2 Jul 2006 03:29:49 -0000	1.35
+++ cpuspeed.spec	12 Jul 2006 04:53:24 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:	CPU Frequency adjusting daemon.
 Name:		cpuspeed
 Version:	1.2.1
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.1-1.35%{dist}.1
+- rebuild
+
 * Sat Jul  1 2006 Dave Jones <davej at redhat.com>
 - Fix sched_mc_power_savings warning on centrino laptops.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:53:40 -0400
Subject: rpms/cracklib/devel cracklib.spec,1.31,1.32
Message-ID: <200607120453.k6C4reKD023392@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cracklib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23376

Modified Files:
	cracklib.spec 
Log Message:
bumped for rebuild


Index: cracklib.spec
===================================================================
RCS file: /cvs/dist/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cracklib.spec	20 Jun 2006 18:10:47 -0000	1.31
+++ cracklib.spec	12 Jul 2006 04:53:38 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.8.9
-Release: 3
+Release: 3.1
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
@@ -147,6 +147,9 @@
 %{_sbindir}/packer
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.9-3.1
+- rebuild
+
 * Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.9-3
 - Add missing br, automake, libtool (#194738)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:03 -0400
Subject: rpms/createrepo/devel createrepo.spec,1.16,1.17
Message-ID: <200607120454.k6C4s3Sg023490@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/createrepo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23471

Modified Files:
	createrepo.spec 
Log Message:
bumped for rebuild


Index: createrepo.spec
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/createrepo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- createrepo.spec	17 Apr 2006 20:36:14 -0000	1.16
+++ createrepo.spec	12 Jul 2006 04:54:00 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.4.4
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -34,6 +34,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.4-1.1
+- rebuild
+
 * Mon Apr 17 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.4-1
 - Update to latest upstream
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:15 -0400
Subject: rpms/cryptix-asn1/devel cryptix-asn1.spec,1.4,1.5
Message-ID: <200607120454.k6C4sFdo023614@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cryptix-asn1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23599

Modified Files:
	cryptix-asn1.spec 
Log Message:
bumped for rebuild


Index: cryptix-asn1.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cryptix-asn1.spec	9 Dec 2005 22:40:07 -0000	1.4
+++ cryptix-asn1.spec	12 Jul 2006 04:54:13 -0000	1.5
@@ -2,12 +2,12 @@
 %define name		cryptix-asn1
 %define version		20011119
 %define snapshot	20011119
-%define release 4jpp_2fc.1
+%define release 4jpp_2fc.1.1
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}.1.1
 Epoch:		0
 Summary:	Cryptix ASN1 implementation
 License:	BSD style
@@ -62,6 +62,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:20011119-4jpp_2fc.1.1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:22 -0400
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.24,1.25
Message-ID: <200607120454.k6C4sMfJ023675@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	crypto-utils.spec 
Log Message:
bumped for rebuild


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- crypto-utils.spec	11 Feb 2006 02:20:13 -0000	1.24
+++ crypto-utils.spec	12 Jul 2006 04:54:20 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.2
-Release: 9.2.1
+Release: 9.2.2
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -101,6 +101,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:28 -0400
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.28,1.29
Message-ID: <200607120454.k6C4sSVp023747@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23734

Modified Files:
	cryptsetup-luks.spec 
Log Message:
bumped for rebuild


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cryptsetup-luks.spec	7 Jun 2006 21:45:54 -0000	1.28
+++ cryptsetup-luks.spec	12 Jul 2006 04:54:26 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.3
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
@@ -67,6 +67,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.0.3-2
 - put shared libs in the right subpackages
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:44 -0400
Subject: rpms/cups/devel cups.spec,1.225,1.226
Message-ID: <200607120454.k6C4sit4023868@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cups.spec 
Log Message:
bumped for rebuild


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- cups.spec	7 Jul 2006 10:27:09 -0000	1.225
+++ cups.spec	12 Jul 2006 04:54:42 -0000	1.226
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 18
+Release: 18.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -395,6 +395,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.1-18.1
+- rebuild
+
 * Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-18
 - Ship with an empty classes.conf file.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:54:53 -0400
Subject: rpms/cvs/devel cvs.spec,1.46,1.47
Message-ID: <200607120454.k6C4srsp023946@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cvs.spec 
Log Message:
bumped for rebuild


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cvs.spec	28 Jun 2006 14:50:58 -0000	1.46
+++ cvs.spec	12 Jul 2006 04:54:51 -0000	1.47
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 3
+Release: 3.1
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -143,6 +143,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.11.22-3.1
+- rebuild
+
 * Wed Jun 28 2006 Maros Barabas <mbarabas at redhat.com> - 1.11.22-3
 - fix for #196848 - double free coruption
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 04:59:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 00:59:27 -0400
Subject: rpms/curl/devel curl.spec,1.36,1.37
Message-ID: <200607120459.k6C4xRns024138@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24125

Modified Files:
	curl.spec 
Log Message:
fix spec typo


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- curl.spec	30 Jun 2006 06:56:45 -0000	1.36
+++ curl.spec	12 Jul 2006 04:59:25 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Name: curl 
 Version: 7.15.4
-Release: 1
+Release: 1.1
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -94,7 +94,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Fri Jul 30 2006 Ivana Varekova <varekova at redhat.com> - 7.15.4-1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7.15.4-1.1
+- rebuild
+
+* Fri Jun 30 2006 Ivana Varekova <varekova at redhat.com> - 7.15.4-1
 - update to 7.15.4
 
 * Mon Mar 20 2006 Ivana Varekova <varekova at redhat.com> - 7.15.3-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:03:22 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto-0.7-gaim.patch,1.1,1.2
Message-ID: <200607120503.k6C53MJC024327@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24093

Modified Files:
	nautilus-sendto-0.7-gaim.patch 
Log Message:
try to make the gaim plugin compile


nautilus-sendto-0.7-gaim.patch:
 nautilus-sendto-plugin.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: nautilus-sendto-0.7-gaim.patch
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto-0.7-gaim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-sendto-0.7-gaim.patch	12 Jul 2006 04:26:01 -0000	1.1
+++ nautilus-sendto-0.7-gaim.patch	12 Jul 2006 05:03:19 -0000	1.2
@@ -1,10 +1,12 @@
 --- nautilus-sendto-0.7/gaim_plugin/nautilus-sendto-plugin.c.gaim	2006-07-12 00:26:51.000000000 -0400
-+++ nautilus-sendto-0.7/gaim_plugin/nautilus-sendto-plugin.c	2006-07-12 00:27:00.000000000 -0400
-@@ -37,7 +37,6 @@
++++ nautilus-sendto-0.7/gaim_plugin/nautilus-sendto-plugin.c	2006-07-12 01:00:11.000000000 -0400
+@@ -37,7 +37,8 @@
  #include <unistd.h>
  #include <dirent.h>
  
 -#include "internal.h"
++#define N_(s) s
++
  #include "conversation.h"
  #include "core.h"
  #include "debug.h"



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:04:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:04:00 -0400
Subject: rpms/gdm/devel gdm-2.15.5-security-tokens.patch, NONE, 1.1 gdm.spec,
	1.167, 1.168
Message-ID: <200607120504.k6C5403X024365@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24344

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.5-security-tokens.patch 
Log Message:
- add initial support for smart card security tokens


gdm-2.15.5-security-tokens.patch:
 config/Makefile.am              |    4 
 config/gdm                      |   16 
 config/gdm-securitytokens       |   10 
 config/gdm.conf.in              |    7 
 configure.ac                    |    3 
 daemon/Makefile.am              |    7 
 daemon/gdm.c                    |   99 ++++
 daemon/gdm.h                    |    5 
 daemon/gdmconfig.c              |   35 +
 daemon/gdmconfig.h              |    3 
 daemon/securitytoken.c          |  579 ++++++++++++++++++++++++++++
 daemon/securitytoken.h          |   98 ++++
 daemon/securitytokenmonitor.c   |  817 +++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h   |   81 +++
 daemon/verify-pam.c             |    5 
 utils/gdmsecuritytokenmonitor.c |  197 +++++++++
 utils/securitytoken.c           |  573 +++++++++++++++++++++++++++
 utils/securitytoken.h           |   97 ++++
 utils/securitytokenmonitor.c    |  819 ++++++++++++++++++++++++++++++++++++++++
 utils/securitytokenmonitor.h    |   82 ++++
 20 files changed, 3526 insertions(+), 11 deletions(-)

--- NEW FILE gdm-2.15.5-security-tokens.patch ---
--- /dev/null	2006-07-12 00:29:29.434343750 +0200
+++ gdm-2.15.5/config/gdm-securitytokens	2006-07-12 01:01:58.000000000 +0200
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required	pam_env.so
+auth       sufficient   pam_pkcs11.so
+auth       required     pam_deny.so
+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.15.5/config/gdm.security-tokens	2003-08-04 18:24:21.000000000 +0200
+++ gdm-2.15.5/config/gdm	2006-07-12 01:01:58.000000000 +0200
@@ -1,8 +1,10 @@
 #%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
-session    optional     pam_console.so
+auth       required    pam_env.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_console.so
+
--- gdm-2.15.5/config/Makefile.am.security-tokens	2006-05-18 20:39:13.000000000 +0200
+++ gdm-2.15.5/config/Makefile.am	2006-07-12 01:01:58.000000000 +0200
@@ -26,6 +26,7 @@
 	Xsession.in \
 	gdm \
 	gdm-autologin \
+	gdm-securitytokens \
 	locale.alias \
 	Init.in \
 	PreSession.in \
@@ -237,6 +238,9 @@
 	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \
 		$(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
 	   fi; \
+	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; then \
+		$(INSTALL_DATA) gdm-securitytokens $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; \
+	   fi; \
 	   if test $$system = SunOS; then \
 		echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
 	   fi; \
--- gdm-2.15.5/config/gdm.conf.in.security-tokens	2006-07-12 01:01:57.000000000 +0200
+++ gdm-2.15.5/config/gdm.conf.in	2006-07-12 01:01:58.000000000 +0200
@@ -193,6 +193,10 @@
 # kills it.  10 seconds should be long enough for X, but Xgl may need 20 or 25. 
 GdmXserverTimeout=10
 
+# Whether or not to listen for smart card insertion/removal events
+SecurityTokensEnable=true
+SecurityTokensDriver=
+
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
@@ -239,6 +243,9 @@
 # Specifies the PAM Stack to use, "gdm" by default.
 PamStack=gdm
 
+# Specifies the PAM Stack to use when smart cards are inserted
+SecurityTokensPamStack=gdm-securitytokens
+
 # XDMCP is the protocol that allows remote login.  If you want to log into GDM
 # remotely (I'd never turn this on on open network, use ssh for such remote
 # usage that).  You can then run X with -query <thishost> to log in, or
--- /dev/null	2006-07-12 00:29:29.434343750 +0200
+++ gdm-2.15.5/utils/securitytokenmonitor.c	2006-07-12 01:01:58.000000000 +0200
@@ -0,0 +1,819 @@
+/* securitytokenmonitor.c - monitor for security token insertion and
+ *                          removal events
+ * 
+ * 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.  
+ *
+ * TODO:     - doing this per project is a bad idea i think.
+ *             We should probably make this a system service 
+ *             and use dbus.
+ *
+ *           - We hardcode a driver right now.  We should probably
+ *             look up the default list and go from there. 
+ */
+#include "securitytokenmonitor.h"
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <prerror.h>
+#include <nss.h>
+#include <pk11func.h>
+#include <secmod.h>
+#include <secerr.h>
+
+#include "marshal.h"
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
+#include "misc.h"
+#endif
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_DRIVER
+#define SC_SECURITY_TOKEN_MONITOR_DRIVER LIBDIR"/pkcs11/libcoolkeypk11.so"
+#endif
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_NSS_DB
+#define SC_SECURITY_TOKEN_MONITOR_NSS_DB SYSCONFDIR"/pki/nssdb"
+#endif 
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL
+#define SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL 100	/* ms */
+#endif
+
+#ifndef sc_debug
+#ifdef gdm_debug
+#define sc_debug(fmt, args...) gdm_debug(fmt, ##args)
+#elif defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
+#define sc_debug(fmt, args...) g_printerr(fmt "\n", ##args)
+#else
+#define sc_debug(fmt, args...) 
+#endif
+#endif
+
+typedef enum _ScSecurityTokenMonitorState ScSecurityTokenMonitorState;
+
+enum _ScSecurityTokenMonitorState {
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED = 0,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTING,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTED,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING,
+};
+
+struct _ScSecurityTokenMonitorPrivate {
+	ScSecurityTokenMonitorState state;
+
+	gchar        *module_path;
+	SECMODModule *module;
+	GHashTable *security_tokens;
+
+	guint32 nss_is_loaded : 1;
+	guint32 is_unstoppable : 1;
+
+	guint poll_timeout_id;
+};
+
+static void sc_security_token_monitor_finalize (GObject *object);
+static void sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_set_property (GObject       *object,
+						    guint          prop_id,
+						    const GValue  *value,
+						    GParamSpec    *pspec);
+static void sc_security_token_monitor_get_property (GObject    *object,
+						    guint       prop_id,
+						    GValue     *value,
+						    GParamSpec *pspec);
+
+static void
+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
+					   const gchar            *module_path);
+
+
+static void sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
+							     ScSecurityToken        *token);
+static void sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor_class,
+							      ScSecurityToken        *token);
+static gboolean sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor);
+
+static void sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor);
+
[...3377 lines suppressed...]
+	    GdmDisplay *d = li->data;
+
+	    if (SERVER_IS_LOCAL (d)) {
+		    gdm_debug ("notifying display '%s'", d->name);
+		    gchar *pam_stack;
+		    pam_stack = gdm_get_value_string (GDM_KEY_SECURITY_TOKENS_PAM_STACK);
+
+		    if (ve_string_empty (pam_stack))
+			    pam_stack = gdm_get_value_string (GDM_KEY_PAM_STACK);
+		    gdm_set_value_string_per_display (d->name,
+						      GDM_KEY_PAM_STACK,
+						      pam_stack);
+		    send_slave_command (d, GDM_NOTIFY_RESET);
+	    } else {
+		    gdm_debug ("display '%s' is not local", d->name);
+	    }
+    }
+}
+
+static void
+gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
+				   ScSecurityToken        *token)
+{
+    GSList *li;
+
+    gdm_debug ("notifying local displays about token removal");
+    for (li = displays; li != NULL; li = li->next) {
+	    GdmDisplay *d = li->data;
+
+	    if (SERVER_IS_LOCAL (d)) {
+		    gdm_debug ("notifying display '%s'", d->name);
+		    gchar *pam_stack;
+		    pam_stack = gdm_get_value_string (GDM_KEY_SECURITY_TOKENS_PAM_STACK);
+
+		    if (ve_string_empty (pam_stack))
+			    pam_stack = gdm_get_value_string (GDM_KEY_PAM_STACK);
+		    gdm_set_value_string_per_display (d->name,
+						      GDM_KEY_PAM_STACK,
+						      pam_stack);
+		    send_slave_command (d, GDM_NOTIFY_RESET);
+
+	    } else {
+		    gdm_debug ("display '%s' is not local", d->name);
+	    }
+    }
+}
+
+static void
+gdm_watch_for_security_tokens (void)
+{
+    GError *error;
+    ScSecurityTokenMonitor *monitor;
+
+    gdm_debug ("watching for security token insertion and removal events");
+
+    monitor = sc_security_token_monitor_new (gdm_get_value_string (GDM_KEY_SECURITY_TOKENS_DRIVER));
+    g_signal_connect (monitor,
+		      "security-token-inserted",
+		      G_CALLBACK (gdm_handle_security_token_insertion), NULL);
+
+    g_signal_connect (monitor,
+		      "security-token-removed",
+		      G_CALLBACK (gdm_handle_security_token_removal), NULL);
+    error = NULL;
+    if (!sc_security_token_monitor_start (monitor, 
+					  &error)) {
+	    if (error != NULL) {
+		    syslog (LOG_ERR, "%s", error->message);
+		    g_error_free (error);
+	    } else {
+		    syslog (LOG_ERR, "could not start security token monitor");
+
+	    }
+    }
+}
 /* EOF */
--- gdm-2.15.5/daemon/verify-pam.c.security-tokens	2006-07-12 01:01:58.000000000 +0200
+++ gdm-2.15.5/daemon/verify-pam.c	2006-07-12 01:01:58.000000000 +0200
@@ -55,6 +55,8 @@
 #define log_to_audit_system(l,h,d,s)	do { ; } while (0)
 #endif
 
+gboolean gdm_should_use_security_tokens_pam_stack (void);
+
 /* Evil, but this way these things are passed to the child session */
 static pam_handle_t *pamh = NULL;
 
@@ -78,7 +80,6 @@
 
 static	adt_session_data_t      *adt_ah = NULL;    /* audit session handle */
 
-
 /*
  * audit_success_login - audit successful login
  *
@@ -902,6 +903,8 @@
      */
     pam_stack = gdm_get_value_string_per_display (display, GDM_KEY_PAM_STACK);
 
+    gdm_debug ("using pam stack '%s'", pam_stack);
+
     if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
 	    if (started_timer)
 		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
--- gdm-2.15.5/daemon/gdmconfig.h.security-tokens	2006-05-20 00:07:17.000000000 +0200
+++ gdm-2.15.5/daemon/gdmconfig.h	2006-07-12 01:01:58.000000000 +0200
@@ -41,6 +41,9 @@
                                          gboolean value);
 void           gdm_set_value_int        (gchar *key,
                                          gint value);
+void           gdm_set_value_string_per_display (gchar *display,
+						 gchar *key,
+                                                 gchar *value);
 void           gdm_config_key_to_string_per_display
                                         (gchar *file,
                                          gchar *key,
--- /dev/null	2006-07-12 00:29:29.434343750 +0200
+++ gdm-2.15.5/daemon/securitytokenmonitor.h	2006-07-12 01:01:58.000000000 +0200
@@ -0,0 +1,81 @@
+/* securitytokenmonitor.h - monitor for security token insertion and
+ *                          removal events
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * 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 SC_SECURITY_TOKEN_MONITOR_H
+#define SC_SECURITY_TOKEN_MONITOR_H
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN_MONITOR            (sc_security_token_monitor_get_type ())
+#define SC_SECURITY_TOKEN_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor))
+#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_IS_SECURITY_TOKEN_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_SECURITY_TOKEN_MONITOR_ERROR           (sc_security_token_monitor_error_quark ())
+typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor;
+typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass;
+typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate;
+typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError;
+
+struct _ScSecurityTokenMonitor {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenMonitorPrivate *priv;
+};
+
+struct _ScSecurityTokenMonitorClass {
+    GObjectClass parent_class;
+
+    /* Signals */
+    void (*security_token_inserted) (ScSecurityTokenMonitor *monitor,
+				     ScSecurityToken *token);
+    void (*security_token_removed) (ScSecurityTokenMonitor *monitor,
+				    ScSecurityToken *token);
+    void (*error) (ScSecurityTokenMonitor *monitor, 
+		   GError                 *error);
+};
+
+enum _ScSecurityTokenMonitorError {
+    SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+};
+
+GType sc_security_token_monitor_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST;
+
+ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module);
+
+gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor, 
+				 	  GError                 **error);
+
+void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor);
+
+gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor);
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_MONITOR_H */


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gdm.spec	7 Jul 2006 21:28:35 -0000	1.167
+++ gdm.spec	12 Jul 2006 05:03:57 -0000	1.168
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.5
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -45,6 +45,7 @@
 Patch18: gdm-2.15.5-process-all-ops.patch
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
+Patch21: gdm-2.15.5-security-tokens.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -119,10 +120,11 @@
 %patch14 -p1 -b .call-dbus-launch
 %patch15 -p1 -b .dont-call-xsm
 %patch16 -p1 -b .add-gnome-cflags
-%patch17 -p1 -b .pam_stack
+#%patch17 -p1 -b .pam_stack
 %patch18 -p1 -b .process-all-ops
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
+%patch21 -p1 -b .security-tokens
 
 # 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
@@ -294,6 +296,7 @@
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdmsetup
 %config %{_sysconfdir}/pam.d/gdm-autologin
+%config %{_sysconfdir}/pam.d/gdm-securitytokens
 %config %{_sysconfdir}/security/console.apps/gdmsetup
 #%config %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/gdm/Init
@@ -317,6 +320,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Jul 11 2006 Ray Strode <rstrode at redhat.com> 1:2.15.5-3
+- add initial support for smart card security tokens
+
 * Fri Jul 7 2006 Ray Strode <rstrode at redhat.com> 1:2.15.5-2
 - add patch to process all operations when more than one comes
   in really quickly



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:05:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:05:59 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.34,1.35
Message-ID: <200607120505.k6C55xDO024494@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24481

Modified Files:
	a2ps.spec 
Log Message:
bumped for rebuild


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- a2ps.spec	30 May 2006 12:40:11 -0000	1.34
+++ a2ps.spec	12 Jul 2006 05:05:56 -0000	1.35
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 	51
+%define rel 	51.1
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -232,6 +232,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-51.1
+- rebuild
+
 * Tue May 30 2006 Tim Waugh <twaugh at redhat.com> 4.13b-51
 - Build requires gettext (bug #193346).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:06:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:06:46 -0400
Subject: rpms/acl/devel acl.spec,1.27,1.28
Message-ID: <200607120506.k6C56k4o024555@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24541

Modified Files:
	acl.spec 
Log Message:
bumped for rebuild


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- acl.spec	5 Jul 2006 19:32:12 -0000	1.27
+++ acl.spec	12 Jul 2006 05:06:38 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Access control list utilities.
 Name: acl
 Version: 2.2.39
-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}-1.tar.gz
@@ -99,6 +99,9 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.39-1.1
+- rebuild
+
 * Wed Jul  5 2006 Thomas Woerner <twoerner at redhat.com> 2.2.39-1
 - new version 2.2.39
 - fixed usage of long UTF-8 filenames (#183181)



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:07:00 -0400
Subject: rpms/acpid/devel acpid.spec,1.11,1.12
Message-ID: <200607120507.k6C570BB024614@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/acpid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24601

Modified Files:
	acpid.spec 
Log Message:
bumped for rebuild


Index: acpid.spec
===================================================================
RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- acpid.spec	1 Mar 2006 15:41:27 -0000	1.11
+++ acpid.spec	12 Jul 2006 05:06:58 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -88,6 +88,9 @@
 fi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.1
+- rebuild
+
 * Wed Mar 01 2006 Phil Knirsch <pknirsch at redhat.com> - 1.0.4-2
 - Added video.conf file to turn on DPMS when opening the laptop lid. Disabled
   by default.



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:07:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:07:19 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.7,1.8
Message-ID: <200607120507.k6C57JPv024670@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24656

Modified Files:
	adaptx.spec 
Log Message:
bumped for rebuild


Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- adaptx.spec	6 Mar 2006 22:43:02 -0000	1.7
+++ adaptx.spec	12 Jul 2006 05:07:17 -0000	1.8
@@ -1,11 +1,11 @@
 %define	name	adaptx
 %define	version	0.9.6
-%define release 1jpp_3fc
+%define release 1jpp_4fc
 %define	section	free
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}.1.1
 Epoch:		0
 Summary:	AdaptX
 License:	Exolab Software License
@@ -90,6 +90,9 @@
 %doc build/doc/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.6-1jpp_4fc.1.1
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9.6-1jpp_3fc.1
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:07:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:07:28 -0400
Subject: rpms/adjtimex/devel adjtimex.spec,1.19,1.20
Message-ID: <200607120507.k6C57SxV024724@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/adjtimex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24711

Modified Files:
	adjtimex.spec 
Log Message:
bumped for rebuild


Index: adjtimex.spec
===================================================================
RCS file: /cvs/dist/rpms/adjtimex/devel/adjtimex.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- adjtimex.spec	22 May 2006 15:37:07 -0000	1.19
+++ adjtimex.spec	12 Jul 2006 05:07:26 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A utility for adjusting kernel time variables.
 Name: adjtimex
 Version: 1.20
-Release: 2
+Release: 2.1
 ExclusiveOS: Linux
 License: distributable
 Group: System Environment/Base
@@ -44,6 +44,9 @@
 %{_mandir}/man8/adjtimex.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.20-2.1
+- rebuild
+
 * Mon May 22 2006 Miroslav Lichvar <mlichvar at redhat.com> 1.20-2
 - fix segfault when parsing -s option
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:07:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:07:43 -0400
Subject: rpms/agg/devel agg.spec,1.12,1.13
Message-ID: <200607120507.k6C57hJu024780@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24766

Modified Files:
	agg.spec 
Log Message:
bumped for rebuild


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- agg.spec	10 Jul 2006 14:24:17 -0000	1.12
+++ agg.spec	12 Jul 2006 05:07:41 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.4
-Release: 2
+Release: 2.1
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
@@ -57,6 +57,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4-2.1
+- rebuild
+
 * Mon Jul 10 2006 Caolan McNamara <caolanm at redhat.com> - 2.4-2
 - rh#198174# add extra links from libs to their runtime requirements
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:07:56 -0400
Subject: rpms/alchemist/devel alchemist.spec,1.19,1.20
Message-ID: <200607120507.k6C57ufB024837@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/alchemist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24823

Modified Files:
	alchemist.spec 
Log Message:
bumped for rebuild


Index: alchemist.spec
===================================================================
RCS file: /cvs/dist/rpms/alchemist/devel/alchemist.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- alchemist.spec	11 Feb 2006 01:33:06 -0000	1.19
+++ alchemist.spec	12 Jul 2006 05:07:54 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A multi-sourced configuration back-end.
 Name: alchemist
 Version: 1.0.36
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %doc src/doc/html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.36-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:08:08 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.43,1.44
Message-ID: <200607120508.k6C5884k024892@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-lib.spec 
Log Message:
bumped for rebuild


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- alsa-lib.spec	11 Feb 2006 01:33:41 -0000	1.43
+++ alsa-lib.spec	12 Jul 2006 05:08:06 -0000	1.44
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3.rc2.2
+Release: 3.rc2.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:08:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:08:20 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.40,1.41
Message-ID: <200607120508.k6C58K5n024947@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-utils.spec 
Log Message:
bumped for rebuild


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- alsa-utils.spec	30 May 2006 08:15:21 -0000	1.40
+++ alsa-utils.spec	12 Jul 2006 05:08:17 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	7
+Release: 	7.1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -65,6 +65,9 @@
 /usr/share/locale/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 30 2006 Martin Stransky <stransky at redhat.com> 1.0.11-7
 - new upstream
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:08:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:08:37 -0400
Subject: rpms/amanda/devel amanda.spec,1.31,1.32
Message-ID: <200607120508.k6C58bIv025001@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24988

Modified Files:
	amanda.spec 
Log Message:
bumped for rebuild


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- amanda.spec	9 Jun 2006 16:06:40 -0000	1.31
+++ amanda.spec	12 Jul 2006 05:08:34 -0000	1.32
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.5.0p2
-Release: 2
+Release: 2.1
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -348,6 +348,9 @@
 %{_libdir}/librestore.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0p2-2.1
+- rebuild
+
 * Thu Jun 8 2006 Jay Fenlason <fenlason at redhat.com> 2.5.0p2-2
 - New upstream version
 - Make the BuildRequires on /usr/bin/Mail rather than mailx, because we



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:08:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:08:52 -0400
Subject: rpms/amtu/devel amtu.spec,1.14,1.15
Message-ID: <200607120508.k6C58qQZ025058@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amtu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25043

Modified Files:
	amtu.spec 
Log Message:
bumped for rebuild


Index: amtu.spec
===================================================================
RCS file: /cvs/dist/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amtu.spec	12 Jun 2006 21:07:05 -0000	1.14
+++ amtu.spec	12 Jul 2006 05:08:50 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.4
-Release: 3
+Release: 3.1
 License: Common Public License
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-3.1
+- rebuild
+
 * Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-3
 - Fix missing BR on automake
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:09:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:09:12 -0400
Subject: rpms/am-utils/devel am-utils.spec,1.36,1.37
Message-ID: <200607120509.k6C59CVq025140@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	am-utils.spec 
Log Message:
bumped for rebuild


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- am-utils.spec	1 Jun 2006 13:30:44 -0000	1.36
+++ am-utils.spec	12 Jul 2006 05:09:10 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.5
-Release: 2
+Release: 2.1
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -129,6 +129,9 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.5-2.1
+- rebuild
+
 * Thu Jun 01 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-2
 - force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h 
   check in configure fails on s390x



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:09:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:09:35 -0400
Subject: rpms/anacron/devel anacron.spec,1.19,1.20
Message-ID: <200607120509.k6C59ZxU025201@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25185

Modified Files:
	anacron.spec 
Log Message:
bumped for rebuild


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- anacron.spec	14 Apr 2006 00:51:34 -0000	1.19
+++ anacron.spec	12 Jul 2006 05:09:21 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 38.FC6
+Release: 38.FC6.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -112,6 +112,9 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3-38.FC6.1
+- rebuild
+
 * Thu Apr 13 2006 Jason Vas Dias <jvdias at redhat.com> - 2.3-38.1
 - fix bug 188403: anacron SysVinit locking:
   Since anacron just exits when it has no more work to do, the



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:09:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:09:44 -0400
Subject: rpms/ant/devel ant.spec,1.73,1.74
Message-ID: <200607120509.k6C59iVT025257@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ant.spec 
Log Message:
bumped for rebuild


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ant.spec	1 Jun 2006 18:44:25 -0000	1.73
+++ ant.spec	12 Jul 2006 05:09:42 -0000	1.74
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_9fc
+Release: 	%{jpprelease}_10fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -755,6 +755,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_10fc
+- rebuild
+
 * Thu Jun 1 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.6.5-1jpp_9fc
 - actually apply the patch added in 8fc!
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:09:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:09:57 -0400
Subject: rpms/anthy/devel anthy.spec,1.31,1.32
Message-ID: <200607120509.k6C59vYW025316@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	anthy.spec 
Log Message:
bumped for rebuild


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- anthy.spec	12 Jul 2006 01:04:03 -0000	1.31
+++ anthy.spec	12 Jul 2006 05:09:55 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name:		anthy
 Version:	7900
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,6 +132,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Akira TAGOH <tagoh at redhat.com> - 7900-1
 - New upstream release.
 - anthy-7900-fix-undef-non-weak-symbol.patch: fixed the undefined non-weak



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:11:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:11:13 -0400
Subject: rpms/antlr/devel antlr.spec,1.17,1.18
Message-ID: <200607120511.k6C5BDRp003319@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3285

Modified Files:
	antlr.spec 
Log Message:
bumped for rebuild


Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- antlr.spec	6 Mar 2006 22:29:02 -0000	1.17
+++ antlr.spec	12 Jul 2006 05:11:00 -0000	1.18
@@ -5,7 +5,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.4
-Release: 	2jpp_6fc
+Release: 	2jpp_7fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -195,6 +195,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.7.4-2jpp_7fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.7.4-2jpp_6fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:11:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:11:46 -0400
Subject: rpms/apmd/devel apmd.spec,1.24,1.25
Message-ID: <200607120511.k6C5BksS003472@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apmd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3447

Modified Files:
	apmd.spec 
Log Message:
bumped for rebuild


Index: apmd.spec
===================================================================
RCS file: /cvs/dist/rpms/apmd/devel/apmd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apmd.spec	11 Jul 2006 12:53:49 -0000	1.24
+++ apmd.spec	12 Jul 2006 05:11:43 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops.
 Name: apmd
 Version: 3.2.2
-Release: 4
+Release: 4.1
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -96,6 +96,9 @@
 %config /etc/sysconfig/apm-scripts/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.2-4.1
+- rebuild
+
 * Tue Jul 11 2006 Phil Knirsch <pknirsch at redhat.com> - 1:3.2.2-4
 - Added missing buildrequires: libtool (#197095)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:12:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:12:10 -0400
Subject: rpms/apr/devel apr.spec,1.58,1.59
Message-ID: <200607120512.k6C5CAih003612@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3588

Modified Files:
	apr.spec 
Log Message:
bumped for rebuild


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- apr.spec	19 Jun 2006 11:28:27 -0000	1.58
+++ apr.spec	12 Jul 2006 05:12:08 -0000	1.59
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.7
-Release: 9
+Release: 9.1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -128,6 +128,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: gcc: command not found
+- rebuild
+
 * Mon Jun 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-9
 - add fix for use of %%pI with psprintf
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:12:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:12:23 -0400
Subject: rpms/apr-util/devel apr-util.spec,1.26,1.27
Message-ID: <200607120512.k6C5CNOJ003738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3706

Modified Files:
	apr-util.spec 
Log Message:
bumped for rebuild


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- apr-util.spec	2 May 2006 10:52:38 -0000	1.26
+++ apr-util.spec	12 Jul 2006 05:12:20 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.7
-Release: 2
+Release: 2.1
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -106,6 +106,9 @@
 %doc --parents html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.7-2.1
+- rebuild
+
 * Tue May  2 2006 Joe Orton <jorton at redhat.com> 1.2.7-2
 - update to 1.2.7
 - use pkg-config in apu-1-config to make it libdir-agnostic



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:12:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:12:45 -0400
Subject: rpms/aqbanking/devel aqbanking.spec,1.17,1.18
Message-ID: <200607120512.k6C5CjqA003869@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3841

Modified Files:
	aqbanking.spec 
Log Message:
bumped for rebuild


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aqbanking.spec	11 Jul 2006 20:55:05 -0000	1.17
+++ aqbanking.spec	12 Jul 2006 05:12:42 -0000	1.18
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 2.1.0
-Release: 1
+Release: 1.1
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
@@ -91,6 +91,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.0-1.1
+- rebuild
+
 * Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-1
 - update to 2.1.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:12:48 -0400
Subject: rpms/gdm/devel gdm.spec,1.168,1.169
Message-ID: <200607120512.k6C5Cmhl003895@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3816

Modified Files:
	gdm.spec 
Log Message:
add missing buildrequires



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gdm.spec	12 Jul 2006 05:03:57 -0000	1.168
+++ gdm.spec	12 Jul 2006 05:12:45 -0000	1.169
@@ -11,6 +11,7 @@
 %define pam_version 0.75
 %define desktop_file_utils_version 0.2.90
 %define gail_version 1.2.0
+%define nss_version 3.11.1
 
 Summary: The GNOME Display Manager.
 Name: gdm
@@ -92,6 +93,7 @@
 %ifnarch s390 s390x ppc64
 BuildRequires: xorg-x11-server-Xorg
 %endif
+BuildRequires: nss-devel >= %{nss_version}
 Requires: libselinux >= %{libselinuxver}
 Requires: audit-libs >= %{libauditver}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:13:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:13:12 -0400
Subject: rpms/arptables_jf/devel arptables_jf.spec,1.12,1.13
Message-ID: <200607120513.k6C5DCOL004041@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/arptables_jf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4017

Modified Files:
	arptables_jf.spec 
Log Message:
bumped for rebuild


Index: arptables_jf.spec
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/arptables_jf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- arptables_jf.spec	26 May 2006 21:21:38 -0000	1.12
+++ arptables_jf.spec	12 Jul 2006 05:13:09 -0000	1.13
@@ -4,7 +4,7 @@
 
 Epoch: 0
 Version: 0.0.8
-Release: 7
+Release: 7.1
 Source: %{name}-%{version}.tbz
 #Source1: Makefile
 #Source2: arptables.h
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-7.1
+- rebuild
+
 * Fri May 26 2006 Jay Fenlason <fenlason at redhat.com> 0:0.0.8-7
 - Add warnings patch to close
   bz#191688 arptables_jf fails to build in mock



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:13:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:13:12 -0400
Subject: rpms/kernel/devel linux-2.6-x86-sleazy-fpu.patch, NONE,
	1.1 kernel-2.6.spec, 1.2375, 1.2376
Message-ID: <200607120513.k6C5DC90004023@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86-sleazy-fpu.patch 
Log Message:
Add Arjan's sleazy-fpu hack

linux-2.6-x86-sleazy-fpu.patch:
 arch/i386/kernel/process.c   |   12 ++++++++++++
 arch/i386/kernel/traps.c     |    3 ++-
 arch/x86_64/kernel/process.c |   10 ++++++++++
 arch/x86_64/kernel/traps.c   |    1 +
 include/asm-i386/i387.h      |    5 ++++-
 include/asm-x86_64/i387.h    |    5 ++++-
 include/linux/sched.h        |    9 +++++++++
 7 files changed, 42 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-x86-sleazy-fpu.patch ---
From: Chuck Ebbert <76306.1226 at compuserve.com>

i386 port of the sLeAZY-fpu feature.  Chuck reports that this gives him a +/-
0.4% improvement on his simple benchmark

x86_64 description follows:

Right now the kernel on x86-64 has a 100% lazy fpu behavior: after *every*
context switch a trap is taken for the first FPU use to restore the FPU
context lazily.  This is of course great for applications that have very
sporadic or no FPU use (since then you avoid doing the expensive save/restore
all the time).  However for very frequent FPU users...  you take an extra trap
every context switch.

The patch below adds a simple heuristic to this code: After 5 consecutive
context switches of FPU use, the lazy behavior is disabled and the context
gets restored every context switch.  If the app indeed uses the FPU, the trap
is avoided.  (the chance of the 6th time slice using FPU after the previous 5
having done so are quite high obviously).

After 256 switches, this is reset and lazy behavior is returned (until there
are 5 consecutive ones again).  The reason for this is to give apps that do
longer bursts of FPU use still the lazy behavior back after some time.

Signed-off-by: Chuck Ebbert <76306.1226 at compuserve.com>
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/process.c |   12 ++++++++++++
 arch/i386/kernel/traps.c   |    3 ++-
 include/asm-i386/i387.h    |    5 ++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/process.c~sleazy-fpu-feature-i386-support arch/i386/kernel/process.c
--- a/arch/i386/kernel/process.c~sleazy-fpu-feature-i386-support
+++ a/arch/i386/kernel/process.c
@@ -630,6 +630,11 @@ struct task_struct fastcall * __switch_t
 
 	__unlazy_fpu(prev_p);
 
+
+	/* we're going to use this soon, after a few expensive things */
+	if (next_p->fpu_counter > 5)
+		prefetch(&next->i387.fxsave);
+
 	/*
 	 * Reload esp0.
 	 */
@@ -688,6 +693,13 @@ struct task_struct fastcall * __switch_t
 
 	disable_tsc(prev_p, next_p);
 
+	/* If the task has used fpu the last 5 timeslices, just do a full
+	 * restore of the math state immediately to avoid the trap; the
+	 * chances of needing FPU soon are obviously high now
+	 */
+	if (next_p->fpu_counter > 5)
+		math_state_restore();
+
 	return prev_p;
 }
 
diff -puN arch/i386/kernel/traps.c~sleazy-fpu-feature-i386-support arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c~sleazy-fpu-feature-i386-support
+++ a/arch/i386/kernel/traps.c
@@ -1048,7 +1048,7 @@ fastcall unsigned char * fixup_x86_bogus
  * Must be called with kernel preemption disabled (in this case,
  * local interrupts are disabled at the call-site in entry.S).
  */
-asmlinkage void math_state_restore(struct pt_regs regs)
+asmlinkage void math_state_restore(void)
 {
 	struct thread_info *thread = current_thread_info();
 	struct task_struct *tsk = thread->task;
@@ -1058,6 +1058,7 @@ asmlinkage void math_state_restore(struc
 		init_fpu(tsk);
 	restore_fpu(tsk);
 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
+	tsk->fpu_counter++;
 }
 
 #ifndef CONFIG_MATH_EMULATION
diff -puN include/asm-i386/i387.h~sleazy-fpu-feature-i386-support include/asm-i386/i387.h
--- a/include/asm-i386/i387.h~sleazy-fpu-feature-i386-support
+++ a/include/asm-i386/i387.h
@@ -76,7 +76,9 @@ static inline void __save_init_fpu( stru
 
 #define __unlazy_fpu( tsk ) do { \
 	if (task_thread_info(tsk)->status & TS_USEDFPU) \
-		save_init_fpu( tsk ); \
+		save_init_fpu( tsk ); 			\
+	else						\
+		tsk->fpu_counter = 0;			\
 } while (0)
 
 #define __clear_fpu( tsk )					\
@@ -118,6 +120,7 @@ static inline void save_init_fpu( struct
 extern unsigned short get_fpu_cwd( struct task_struct *tsk );
 extern unsigned short get_fpu_swd( struct task_struct *tsk );
 extern unsigned short get_fpu_mxcsr( struct task_struct *tsk );
+extern asmlinkage void math_state_restore(void);
 
 /*
  * Signal frame handlers...
_
From: Arjan van de Ven <arjan at linux.intel.com>

Right now the kernel on x86-64 has a 100% lazy fpu behavior: after *every*
context switch a trap is taken for the first FPU use to restore the FPU
context lazily.  This is of course great for applications that have very
sporadic or no FPU use (since then you avoid doing the expensive
save/restore all the time).  However for very frequent FPU users...  you
take an extra trap every context switch.

The patch below adds a simple heuristic to this code: After 5 consecutive
context switches of FPU use, the lazy behavior is disabled and the context
gets restored every context switch.  If the app indeed uses the FPU, the
trap is avoided.  (the chance of the 6th time slice using FPU after the
previous 5 having done so are quite high obviously).

After 256 switches, this is reset and lazy behavior is returned (until
there are 5 consecutive ones again).  The reason for this is to give apps
that do longer bursts of FPU use still the lazy behavior back after some
time.

[akpm at osdl.org: place new task_struct field next to jit_keyring to save space]
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Cc: Andi Kleen <ak at muc.de>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/x86_64/kernel/process.c |   10 ++++++++++
 arch/x86_64/kernel/traps.c   |    1 +
 include/asm-x86_64/i387.h    |    5 ++++-
 include/linux/sched.h        |    9 +++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff -puN arch/x86_64/kernel/process.c~sleazy-fpu-feature-x86_64-support arch/x86_64/kernel/process.c
--- a/arch/x86_64/kernel/process.c~sleazy-fpu-feature-x86_64-support
+++ a/arch/x86_64/kernel/process.c
@@ -515,6 +515,10 @@ __switch_to(struct task_struct *prev_p, 
 	int cpu = smp_processor_id();  
 	struct tss_struct *tss = &per_cpu(init_tss, cpu);
 
+	/* we're going to use this soon, after a few expensive things */
+	if (next_p->fpu_counter>5)
+		prefetch(&next->i387.fxsave);
+
 	/*
 	 * Reload esp0, LDT and the page table pointer:
 	 */
@@ -618,6 +622,12 @@ __switch_to(struct task_struct *prev_p, 
 		}
 	}
 
+	/* If the task has used fpu the last 5 timeslices, just do a full
+	 * restore of the math state immediately to avoid the trap; the
+	 * chances of needing FPU soon are obviously high now
+	 */
+	if (next_p->fpu_counter>5)
+		math_state_restore();
 	return prev_p;
 }
 
diff -puN arch/x86_64/kernel/traps.c~sleazy-fpu-feature-x86_64-support arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c~sleazy-fpu-feature-x86_64-support
+++ a/arch/x86_64/kernel/traps.c
@@ -1073,6 +1073,7 @@ asmlinkage void math_state_restore(void)
 		init_fpu(me);
 	restore_fpu_checking(&me->thread.i387.fxsave);
 	task_thread_info(me)->status |= TS_USEDFPU;
+	me->fpu_counter++;
 }
 
 void __init trap_init(void)
diff -puN include/asm-x86_64/i387.h~sleazy-fpu-feature-x86_64-support include/asm-x86_64/i387.h
--- a/include/asm-x86_64/i387.h~sleazy-fpu-feature-x86_64-support
+++ a/include/asm-x86_64/i387.h
@@ -24,6 +24,7 @@ extern unsigned int mxcsr_feature_mask;
 extern void mxcsr_feature_mask_init(void);
 extern void init_fpu(struct task_struct *child);
 extern int save_i387(struct _fpstate __user *buf);
+extern asmlinkage void math_state_restore(void);
 
 /*
  * FPU lazy state save handling...
@@ -31,7 +32,9 @@ extern int save_i387(struct _fpstate __u
 
 #define unlazy_fpu(tsk) do { \
 	if (task_thread_info(tsk)->status & TS_USEDFPU) \
-		save_init_fpu(tsk); \
+		save_init_fpu(tsk); 			\
+	else						\
+		tsk->fpu_counter = 0;			\
 } while (0)
 
 /* Ignore delayed exceptions from user space */
diff -puN include/linux/sched.h~sleazy-fpu-feature-x86_64-support include/linux/sched.h
--- a/include/linux/sched.h~sleazy-fpu-feature-x86_64-support
+++ a/include/linux/sched.h
@@ -817,6 +817,15 @@ struct task_struct {
 	struct key *thread_keyring;	/* keyring private to this thread */
 	unsigned char jit_keyring;	/* default keyring to attach requested keys to */
 #endif
+	/*
+	 * fpu_counter contains the number of consecutive context switches
+	 * that the FPU is used. If this is over a threshold, the lazy fpu
+	 * saving becomes unlazy to save the trap. This is an unsigned char
+	 * so that after 256 times the counter wraps and the behavior turns
+	 * lazy again; this to deal with bursty apps that only use FPU for
+	 * a short time
+	 */
+	unsigned char fpu_counter;
 	int oomkilladj; /* OOM kill score adjustment (bit shift). */
 	char comm[TASK_COMM_LEN]; /* executable name excluding path
 				     - access with [gs]et_task_comm (which lock
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2375
retrieving revision 1.2376
diff -u -r1.2375 -r1.2376
--- kernel-2.6.spec	12 Jul 2006 03:41:09 -0000	1.2375
+++ kernel-2.6.spec	12 Jul 2006 05:13:04 -0000	1.2376
@@ -271,6 +271,7 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
+Patch209: linux-2.6-x86-sleazy-fpu.patch
 
 # 300 - 399   ppc(64)
 Patch305: linux-2.6-cell-mambo-drivers.patch
@@ -754,6 +755,8 @@
 %patch207 -p1
 # Add ppoll and pselect syscalls
 %patch208 -p1
+# Arjan's sleazy fpu trick.
+%patch209 -p1
 
 #
 # PowerPC
@@ -1594,6 +1597,10 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Dave Jones <davej at redhat.com>
+- Add sleazy fpu optimisation.   Apps that heavily
+  use floating point in theory should get faster.
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - Add utrace. (ptrace replacement).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:13:40 -0400
Subject: rpms/arts/devel arts.spec,1.60,1.61
Message-ID: <200607120513.k6C5DeRt004230@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	arts.spec 
Log Message:
bumped for rebuild


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- arts.spec	31 May 2006 12:35:24 -0000	1.60
+++ arts.spec	12 Jul 2006 05:13:37 -0000	1.61
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 1.5.3
-Release: 1
+Release: 1.1
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -175,6 +175,9 @@
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.3-1.1
+- rebuild
+
 * Wed May 31 2006 Than Ngo <than at redhat.com> 8:1.5.3-1
 - update to 1.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:14:05 -0400
Subject: rpms/aspell/devel aspell.spec,1.32,1.33
Message-ID: <200607120514.k6C5E5ux004376@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4348

Modified Files:
	aspell.spec 
Log Message:
bumped for rebuild


Index: aspell.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- aspell.spec	24 May 2006 08:29:37 -0000	1.32
+++ aspell.spec	12 Jul 2006 05:14:02 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A spelling checker.
 Name: aspell
 Version: 0.60.3
-Release: 7
+Release: 7.1
 Epoch: 12
 License: LGPL
 Group: Applications/Text
@@ -127,6 +127,9 @@
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 12:0.60.3-7.1
+- rebuild
+
 * Tue May 23 2006 Ivana Varekova <varekova at redhat.com> - 12:0.60.3-7
 - fix multilib problem (used pkgconfig)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:14:32 -0400
Subject: rpms/aspell-af/devel aspell-af.spec,1.7,1.8
Message-ID: <200607120514.k6C5EWKI004514@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-af/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4501

Modified Files:
	aspell-af.spec 
Log Message:
bumped for rebuild


Index: aspell-af.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-af/devel/aspell-af.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-af.spec	11 Feb 2006 01:39:35 -0000	1.7
+++ aspell-af.spec	12 Jul 2006 05:14:28 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:14:49 -0400
Subject: rpms/aspell-bg/devel aspell-bg.spec,1.11,1.12
Message-ID: <200607120514.k6C5EnAN004646@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-bg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4616

Modified Files:
	aspell-bg.spec 
Log Message:
bumped for rebuild


Index: aspell-bg.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-bg/devel/aspell-bg.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-bg.spec	11 Feb 2006 01:39:49 -0000	1.11
+++ aspell-bg.spec	12 Jul 2006 05:14:47 -0000	1.12
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.2.1
+Release: 11.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -46,6 +46,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:15:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:15:10 -0400
Subject: rpms/aspell-br/devel aspell-br.spec,1.7,1.8
Message-ID: <200607120515.k6C5FAdu004769@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-br/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4745

Modified Files:
	aspell-br.spec 
Log Message:
bumped for rebuild


Index: aspell-br.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-br/devel/aspell-br.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-br.spec	11 Feb 2006 01:40:07 -0000	1.7
+++ aspell-br.spec	12 Jul 2006 05:15:07 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:15:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:15:29 -0400
Subject: rpms/aspell-ca/devel aspell-ca.spec,1.17,1.18
Message-ID: <200607120515.k6C5FTvs004902@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4873

Modified Files:
	aspell-ca.spec 
Log Message:
bumped for rebuild


Index: aspell-ca.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ca/devel/aspell-ca.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-ca.spec	11 Feb 2006 01:40:26 -0000	1.17
+++ aspell-ca.spec	12 Jul 2006 05:15:27 -0000	1.18
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:15:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:15:47 -0400
Subject: rpms/aspell-cs/devel aspell-cs.spec,1.8,1.9
Message-ID: <200607120515.k6C5FlOR005003@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4973

Modified Files:
	aspell-cs.spec 
Log Message:
bumped for rebuild


Index: aspell-cs.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cs/devel/aspell-cs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aspell-cs.spec	11 Feb 2006 01:40:55 -0000	1.8
+++ aspell-cs.spec	12 Jul 2006 05:15:45 -0000	1.9
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 3.2.1
+Release: 3.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:16:14 -0400
Subject: rpms/aspell-cy/devel aspell-cy.spec,1.7,1.8
Message-ID: <200607120516.k6C5GEaE005300@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5131

Modified Files:
	aspell-cy.spec 
Log Message:
bumped for rebuild


Index: aspell-cy.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cy/devel/aspell-cy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-cy.spec	11 Feb 2006 01:52:25 -0000	1.7
+++ aspell-cy.spec	12 Jul 2006 05:16:11 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:16:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:16:34 -0400
Subject: rpms/dasher/devel dasher.spec,1.45,1.46
Message-ID: <200607120516.k6C5GYxj006356@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5507

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



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- dasher.spec	12 Jul 2006 04:41:37 -0000	1.45
+++ dasher.spec	12 Jul 2006 05:16:31 -0000	1.46
@@ -17,6 +17,7 @@
 BuildRequires: libwnck-devel >= 2.9.92
 BuildRequires: libXtst-devel
 BuildRequires: gettext
+BuildRequires: gnome-doc-utils
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:16:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:16:36 -0400
Subject: rpms/aspell-da/devel aspell-da.spec,1.18,1.19
Message-ID: <200607120516.k6C5GaXp006394@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-da/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6289

Modified Files:
	aspell-da.spec 
Log Message:
bumped for rebuild


Index: aspell-da.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-da/devel/aspell-da.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aspell-da.spec	11 Feb 2006 01:52:45 -0000	1.18
+++ aspell-da.spec	12 Jul 2006 05:16:32 -0000	1.19
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 12.2.1
+Release: 12.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-12.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:17:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:17:00 -0400
Subject: rpms/aspell-de/devel aspell-de.spec,1.16,1.17
Message-ID: <200607120517.k6C5H0OI008316@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-de/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8094

Modified Files:
	aspell-de.spec 
Log Message:
bumped for rebuild


Index: aspell-de.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-de/devel/aspell-de.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-de.spec	11 Feb 2006 01:52:57 -0000	1.16
+++ aspell-de.spec	12 Jul 2006 05:16:58 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.2.1
+Release: 11.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:17:28 -0400
Subject: rpms/aspell-el/devel aspell-el.spec,1.7,1.8
Message-ID: <200607120517.k6C5HS3k011300@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11243

Modified Files:
	aspell-el.spec 
Log Message:
bumped for rebuild


Index: aspell-el.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-el/devel/aspell-el.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-el.spec	11 Feb 2006 01:53:11 -0000	1.7
+++ aspell-el.spec	12 Jul 2006 05:17:25 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:17:58 -0400
Subject: rpms/aspell-en/devel aspell-en.spec,1.11,1.12
Message-ID: <200607120517.k6C5HwSe014446@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-en/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14189

Modified Files:
	aspell-en.spec 
Log Message:
bumped for rebuild


Index: aspell-en.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-en/devel/aspell-en.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aspell-en.spec	3 Mar 2006 10:47:39 -0000	1.11
+++ aspell-en.spec	12 Jul 2006 05:17:56 -0000	1.12
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 6.0
-Release: 2
+Release: 2.1
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -50,6 +50,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:6.0-2.1
+- rebuild
+
 * Fri Mar  3 2006 Ivana Varekova <varekova at redhat.com> - 50:6.0-2
 - removed "offencive" (#154352), add "practice" (#62225)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:18:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:18:14 -0400
Subject: rpms/aspell-es/devel aspell-es.spec,1.20,1.21
Message-ID: <200607120518.k6C5IEMT016623@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-es/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16396

Modified Files:
	aspell-es.spec 
Log Message:
bumped for rebuild


Index: aspell-es.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- aspell-es.spec	11 Feb 2006 01:53:43 -0000	1.20
+++ aspell-es.spec	12 Jul 2006 05:18:11 -0000	1.21
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 13.2.1
+Release: 13.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-13.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:18:28 -0400
Subject: rpms/aspell-fo/devel aspell-fo.spec,1.7,1.8
Message-ID: <200607120518.k6C5ISdv018445@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18246

Modified Files:
	aspell-fo.spec 
Log Message:
bumped for rebuild


Index: aspell-fo.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-fo.spec	11 Feb 2006 01:53:56 -0000	1.7
+++ aspell-fo.spec	12 Jul 2006 05:18:26 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:18:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:18:42 -0400
Subject: rpms/aspell-fr/devel aspell-fr.spec,1.14,1.15
Message-ID: <200607120518.k6C5IgwG021068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20367

Modified Files:
	aspell-fr.spec 
Log Message:
bumped for rebuild


Index: aspell-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fr/devel/aspell-fr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aspell-fr.spec	11 Feb 2006 01:54:12 -0000	1.14
+++ aspell-fr.spec	12 Jul 2006 05:18:40 -0000	1.15
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 9.2.1
+Release: 9.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-9.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:18:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:18:56 -0400
Subject: rpms/aspell-ga/devel aspell-ga.spec,1.7,1.8
Message-ID: <200607120518.k6C5IugR021197@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21172

Modified Files:
	aspell-ga.spec 
Log Message:
bumped for rebuild


Index: aspell-ga.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ga/devel/aspell-ga.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-ga.spec	11 Feb 2006 01:54:24 -0000	1.7
+++ aspell-ga.spec	12 Jul 2006 05:18:54 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:19:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:19:11 -0400
Subject: rpms/aspell-gd/devel aspell-gd.spec,1.7,1.8
Message-ID: <200607120519.k6C5JBT3021323@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21298

Modified Files:
	aspell-gd.spec 
Log Message:
bumped for rebuild


Index: aspell-gd.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gd/devel/aspell-gd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-gd.spec	11 Feb 2006 01:54:37 -0000	1.7
+++ aspell-gd.spec	12 Jul 2006 05:19:08 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:19:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:19:23 -0400
Subject: rpms/aspell-gl/devel aspell-gl.spec,1.7,1.8
Message-ID: <200607120519.k6C5JNHA021442@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21418

Modified Files:
	aspell-gl.spec 
Log Message:
bumped for rebuild


Index: aspell-gl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gl/devel/aspell-gl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-gl.spec	11 Feb 2006 01:54:49 -0000	1.7
+++ aspell-gl.spec	12 Jul 2006 05:19:21 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:19:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:19:35 -0400
Subject: rpms/aspell-hr/devel aspell-hr.spec,1.7,1.8
Message-ID: <200607120519.k6C5JZvE021562@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-hr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21539

Modified Files:
	aspell-hr.spec 
Log Message:
bumped for rebuild


Index: aspell-hr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-hr/devel/aspell-hr.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-hr.spec	11 Feb 2006 01:55:01 -0000	1.7
+++ aspell-hr.spec	12 Jul 2006 05:19:33 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:19:49 -0400
Subject: rpms/aspell-id/devel aspell-id.spec,1.7,1.8
Message-ID: <200607120519.k6C5JnBb021707@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-id/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21674

Modified Files:
	aspell-id.spec 
Log Message:
bumped for rebuild


Index: aspell-id.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-id/devel/aspell-id.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-id.spec	11 Feb 2006 01:55:15 -0000	1.7
+++ aspell-id.spec	12 Jul 2006 05:19:46 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50.1
-Release: 4.2.1
+Release: 4.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:19:58 -0400
Subject: rpms/aspell-is/devel aspell-is.spec,1.5,1.6
Message-ID: <200607120519.k6C5JwgL021811@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-is/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21787

Modified Files:
	aspell-is.spec 
Log Message:
bumped for rebuild


Index: aspell-is.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-is/devel/aspell-is.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-is.spec	11 Feb 2006 01:55:31 -0000	1.5
+++ aspell-is.spec	12 Jul 2006 05:19:55 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51.1
-Release: 2.2.1
+Release: 2.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51.1-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:20:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:20:11 -0400
Subject: rpms/aspell-it/devel aspell-it.spec,1.17,1.18
Message-ID: <200607120520.k6C5KBIu021942@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-it/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21908

Modified Files:
	aspell-it.spec 
Log Message:
bumped for rebuild


Index: aspell-it.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-it/devel/aspell-it.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-it.spec	11 Feb 2006 01:55:42 -0000	1.17
+++ aspell-it.spec	12 Jul 2006 05:20:09 -0000	1.18
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.53
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:20:21 -0400
Subject: rpms/aspell-nl/devel aspell-nl.spec,1.17,1.18
Message-ID: <200607120520.k6C5KLpc022050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22025

Modified Files:
	aspell-nl.spec 
Log Message:
bumped for rebuild


Index: aspell-nl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-nl.spec	11 Feb 2006 01:55:54 -0000	1.17
+++ aspell-nl.spec	12 Jul 2006 05:20:18 -0000	1.18
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 8.2
+Release: 8.2.1
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:20:32 -0400
Subject: rpms/aspell-no/devel aspell-no.spec,1.19,1.20
Message-ID: <200607120520.k6C5KWtB022167@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-no/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22144

Modified Files:
	aspell-no.spec 
Log Message:
bumped for rebuild


Index: aspell-no.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-no/devel/aspell-no.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aspell-no.spec	11 Feb 2006 01:56:06 -0000	1.19
+++ aspell-no.spec	12 Jul 2006 05:20:30 -0000	1.20
@@ -5,7 +5,7 @@
 Name: aspell-no
 Epoch: 50
 Version: 0.50.1
-Release: 9.2.1
+Release: 9.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -49,6 +49,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-9.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:20:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:20:50 -0400
Subject: rpms/aspell-pl/devel aspell-pl.spec,1.10,1.11
Message-ID: <200607120520.k6C5KoWV022333@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22292

Modified Files:
	aspell-pl.spec 
Log Message:
bumped for rebuild


Index: aspell-pl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pl/devel/aspell-pl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aspell-pl.spec	11 Feb 2006 01:56:23 -0000	1.10
+++ aspell-pl.spec	12 Jul 2006 05:20:47 -0000	1.11
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 5.2.1
+Release: 5.2.2
 License: Creative Commons ShareAlike
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-5.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:21:19 -0400
Subject: rpms/aspell-pt/devel aspell-pt.spec,1.15,1.16
Message-ID: <200607120521.k6C5LJI3022507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22480

Modified Files:
	aspell-pt.spec 
Log Message:
bumped for rebuild


Index: aspell-pt.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pt/devel/aspell-pt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-pt.spec	11 Feb 2006 01:56:39 -0000	1.15
+++ aspell-pt.spec	12 Jul 2006 05:21:16 -0000	1.16
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 10.2.1
+Release: 10.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-10.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:21:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:21:30 -0400
Subject: rpms/aspell-ru/devel aspell-ru.spec,1.5,1.6
Message-ID: <200607120521.k6C5LUq2022613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ru/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22588

Modified Files:
	aspell-ru.spec 
Log Message:
bumped for rebuild


Index: aspell-ru.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ru/devel/aspell-ru.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-ru.spec	11 Feb 2006 01:56:52 -0000	1.5
+++ aspell-ru.spec	12 Jul 2006 05:21:27 -0000	1.6
@@ -4,7 +4,7 @@
 Epoch: 50
 Name: aspell-%{lang}
 Version: 0.99f7
-Release: 2.2.1
+Release: 2.2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.99f7-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:21:40 -0400
Subject: rpms/aspell-sl/devel aspell-sl.spec,1.3,1.4
Message-ID: <200607120521.k6C5LeLP022726@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22700

Modified Files:
	aspell-sl.spec 
Log Message:
bumped for rebuild


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sl/devel/aspell-sl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-sl.spec	11 Feb 2006 01:57:06 -0000	1.3
+++ aspell-sl.spec	12 Jul 2006 05:21:37 -0000	1.4
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:21:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:21:48 -0400
Subject: rpms/aspell-sr/devel aspell-sl.spec,1.4,1.5
Message-ID: <200607120521.k6C5Lmik022828@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22805

Modified Files:
	aspell-sl.spec 
Log Message:
bumped for rebuild


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sr/devel/aspell-sl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aspell-sl.spec	11 Feb 2006 01:57:23 -0000	1.4
+++ aspell-sl.spec	12 Jul 2006 05:21:45 -0000	1.5
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.02
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.02-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.02-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:21:57 -0400
Subject: rpms/aspell-sv/devel aspell-sv.spec,1.17,1.18
Message-ID: <200607120521.k6C5Lvn0022939@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22912

Modified Files:
	aspell-sv.spec 
Log Message:
bumped for rebuild


Index: aspell-sv.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sv/devel/aspell-sv.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-sv.spec	11 Feb 2006 01:57:40 -0000	1.17
+++ aspell-sv.spec	12 Jul 2006 05:21:55 -0000	1.18
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:22:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:22:10 -0400
Subject: rpms/at/devel at.spec,1.37,1.38
Message-ID: <200607120522.k6C5MA0W023070@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23046

Modified Files:
	at.spec 
Log Message:
bumped for rebuild


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/devel/at.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- at.spec	11 Feb 2006 01:57:59 -0000	1.37
+++ at.spec	12 Jul 2006 05:22:08 -0000	1.38
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 81.1
+Release: 81.2
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.8-81.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.8-81.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:22:21 -0400
Subject: rpms/atk/devel atk.spec,1.36,1.37
Message-ID: <200607120522.k6C5ML0H023191@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	atk.spec 
Log Message:
bumped for rebuild


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- atk.spec	9 Jun 2006 02:56:33 -0000	1.36
+++ atk.spec	12 Jul 2006 05:22:18 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.4
-Release: 4
+Release: 4.1
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -69,6 +69,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-4.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-4
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:22:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:22:24 -0400
Subject: rpms/gdm/devel gdm-2.15.5-security-tokens.patch,1.1,1.2
Message-ID: <200607120522.k6C5MOnl023218@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23052

Modified Files:
	gdm-2.15.5-security-tokens.patch 
Log Message:
remove some crufty debugging bits


gdm-2.15.5-security-tokens.patch:
 config/Makefile.am              |    4 
 config/gdm                      |   16 
 config/gdm-securitytokens       |   10 
 config/gdm.conf.in              |    7 
 configure.ac                    |    3 
 daemon/Makefile.am              |    7 
 daemon/gdm.c                    |   99 ++++
 daemon/gdm.h                    |    5 
 daemon/gdmconfig.c              |   35 +
 daemon/gdmconfig.h              |    3 
 daemon/securitytoken.c          |  579 ++++++++++++++++++++++++++++
 daemon/securitytoken.h          |   98 ++++
 daemon/securitytokenmonitor.c   |  817 +++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h   |   81 +++
 daemon/verify-pam.c             |    5 
 utils/gdmsecuritytokenmonitor.c |  197 +++++++++
 utils/securitytoken.c           |  573 +++++++++++++++++++++++++++
 utils/securitytoken.h           |   97 ++++
 utils/securitytokenmonitor.c    |  819 ++++++++++++++++++++++++++++++++++++++++
 utils/securitytokenmonitor.h    |   82 ++++
 20 files changed, 3526 insertions(+), 11 deletions(-)

Index: gdm-2.15.5-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-security-tokens.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.5-security-tokens.patch	12 Jul 2006 05:03:57 -0000	1.1
+++ gdm-2.15.5-security-tokens.patch	12 Jul 2006 05:22:20 -0000	1.2
@@ -1042,9 +1042,9 @@
 +#include <secmod.h>
 +#include <secerr.h>
 +
-+/* wtf
-+ */
-+#include "/tmp/certhtml.c"
++
++
++
 +
 +#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
 +#define sc_debug(format, args...) g_printerr (format "\n", ##args)
@@ -1370,7 +1370,7 @@
 +_sc_security_token_set_state (ScSecurityToken      *token,
 +			      ScSecurityTokenState  state)
 +{
-+    sc_security_token_fetch_certificates (token);
++
 +    if (token->priv->state != state)
 +    {
 +	    token->priv->state = state;
@@ -2864,9 +2864,9 @@
 +#include <secmod.h>
 +#include <secerr.h>
 +
-+/* wtf
-+ */
-+#include "/tmp/certhtml.c"
++
++
++
 +
 +#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
 +#define sc_debug(format, args...) g_printerr (format "\n", ##args)
@@ -3321,8 +3321,8 @@
 +		    if (status == SECSuccess) {
 +			    token->priv->encryption_certificate = 
 +				    CERT_DupCertificate (node->cert);
-+			    sc_debug ("using encryption certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
++
++
 +		    } else {
 +			    sc_debug ("certificate can not be used for encryption");
 +		    }
@@ -3339,8 +3339,8 @@
 +			    token->priv->signing_certificate = 
 +				    CERT_DupCertificate (node->cert);
 +
-+			    sc_debug ("using signing certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
++
++
 +		    } else {
 +			    sc_debug ("certificate can not be used for signing things");
 +		    }



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:22:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:22:36 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.40,1.41
Message-ID: <200607120522.k6C5MaxZ023375@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23328

Modified Files:
	at-spi.spec 
Log Message:
bumped for rebuild


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- at-spi.spec	9 Jun 2006 03:01:31 -0000	1.40
+++ at-spi.spec	12 Jul 2006 05:22:33 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.7
-Release: 8
+Release: 8.1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -97,6 +97,9 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.7-8.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-8
 - Add a BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:22:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:22:53 -0400
Subject: rpms/attr/devel attr.spec,1.22,1.23
Message-ID: <200607120522.k6C5Mr4m023536@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23509

Modified Files:
	attr.spec 
Log Message:
bumped for rebuild


Index: attr.spec
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/attr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- attr.spec	5 Jul 2006 16:06:54 -0000	1.22
+++ attr.spec	12 Jul 2006 05:22:50 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Utilities for managing filesystem extended attributes.
 Name: attr
 Version: 2.4.32
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.32-1.1
+- rebuild
+
 * Wed Jul  5 2006 Thomas Woerner <twoerne at redhat.com> 2.4.32-1
 - new version 2.4.32
 - fixes segmentation fault in attr, which affects #189106



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:23:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:23:09 -0400
Subject: rpms/audiofile/devel audiofile.spec,1.20,1.21
Message-ID: <200607120523.k6C5N9qv023700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audiofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23665

Modified Files:
	audiofile.spec 
Log Message:
bumped for rebuild


Index: audiofile.spec
===================================================================
RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- audiofile.spec	17 Apr 2006 21:12:46 -0000	1.20
+++ audiofile.spec	12 Jul 2006 05:23:07 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
 Version: 0.2.6
-Release: 4 
+Release: 4.1 
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -74,6 +74,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.6-4.1
+- rebuild
+
 * Mon Apr 17 2006 John (J5) Palmieri <johnp at redhat.com> - 1:0.2.6-4
 - Remove Makefile* from docs so they are not installed
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:23:22 -0400
Subject: rpms/audit/devel audit.spec,1.97,1.98
Message-ID: <200607120523.k6C5NMPg023845@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23813

Modified Files:
	audit.spec 
Log Message:
bumped for rebuild


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- audit.spec	30 Jun 2006 20:30:02 -0000	1.97
+++ audit.spec	12 Jul 2006 05:23:20 -0000	1.98
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.2.4
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -160,6 +160,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.1
+- rebuild
+
 * Fri Jun 30 2006 Steve Grubb <sgrubb at redhat.com> 1.2.4-1
 - Add support for the new filter key
 - Update syscall tables for 2.6.17



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:23:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:23:44 -0400
Subject: rpms/authconfig/devel authconfig.spec,1.60,1.61
Message-ID: <200607120523.k6C5Ni93024020@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23994

Modified Files:
	authconfig.spec 
Log Message:
bumped for rebuild


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- authconfig.spec	7 Jul 2006 18:52:22 -0000	1.60
+++ authconfig.spec	12 Jul 2006 05:23:41 -0000	1.61
@@ -3,7 +3,7 @@
 Version: 5.3.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
@@ -95,6 +95,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.3.0-1.1
+- rebuild
+
 * Fri Jul  7 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.0-1
 - added support for smartcard authentication
 - fixed parsing kerberos realms



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:23:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:23:55 -0400
Subject: rpms/authd/devel authd.spec,1.37,1.38
Message-ID: <200607120523.k6C5Nt6m024147@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24117

Modified Files:
	authd.spec 
Log Message:
bumped for rebuild


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- authd.spec	28 May 2006 13:38:18 -0000	1.37
+++ authd.spec	12 Jul 2006 05:23:53 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 8
+Release: 8.1
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -66,6 +66,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-8.1
+- rebuild
+
 * Sun May 28 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-8
 - added gettext dependency (#193350)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:02 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.27,1.28
Message-ID: <200607120524.k6C5O2bX024243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24213

Modified Files:
	autoconf.spec 
Log Message:
bumped for rebuild


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- autoconf.spec	27 Jun 2006 12:57:52 -0000	1.27
+++ autoconf.spec	12 Jul 2006 05:23:59 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.60
-Release:	3
+Release:	3.1
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -76,6 +76,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.60-3.1
+- rebuild
+
 * Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-3
 - Do not mention rpm macro in a comment, rpm expands it!
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:15 -0400
Subject: rpms/autoconf213/devel autoconf213.spec,1.10,1.11
Message-ID: <200607120524.k6C5OFnp024382@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/autoconf213/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24357

Modified Files:
	autoconf213.spec 
Log Message:
bumped for rebuild


Index: autoconf213.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf213/devel/autoconf213.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- autoconf213.spec	27 Feb 2006 12:33:02 -0000	1.10
+++ autoconf213.spec	12 Jul 2006 05:24:13 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf213
 Version:	2.13
-Release:    12
+Release:    12.1
 License:	GPL
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/autoconf/
@@ -77,6 +77,9 @@
 %doc AUTHORS COPYING NEWS README TODO
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13-12.1
+- rebuild
+
 * Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 2.13-12
 - require m4 >= 1.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:28 -0400
Subject: rpms/autofs/devel autofs.spec,1.122,1.123
Message-ID: <200607120524.k6C5OSh4024505@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	autofs.spec 
Log Message:
bumped for rebuild


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- autofs.spec	11 Jul 2006 08:05:48 -0000	1.122
+++ autofs.spec	12 Jul 2006 05:24:25 -0000	1.123
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 7
+%define release 7.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -129,6 +129,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:5.0.0_beta6-7.1
+- rebuild
+
 * Tue Jul 11 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-7
 - correct directory cleanup in mount modules.
 - merge key and wildcard LDAP query for lookups (bz 197746).



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:38 -0400
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.31,
	1.32 gnome-system-monitor.spec, 1.53, 1.54 sources, 1.31, 1.32
Message-ID: <200607120524.k6C5Ocr4024603@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24397

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	12 Jul 2006 02:26:41 -0000	1.31
+++ .cvsignore	12 Jul 2006 05:24:36 -0000	1.32
@@ -1 +1 @@
-gnome-system-monitor-2.15.0.tar.bz2
+gnome-system-monitor-2.15.4.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-system-monitor.spec	12 Jul 2006 02:26:41 -0000	1.53
+++ gnome-system-monitor.spec	12 Jul 2006 05:24:36 -0000	1.54
@@ -10,7 +10,7 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.15.0
+Version: 2.15.4
 Release: 1
 License: GPL
 Group: Applications/System
@@ -94,6 +94,9 @@
 %{_datadir}/omf
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.4-1
+- Update to 2.15.4
+
 * Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1
 - Update to 2.15.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	12 Jul 2006 02:26:41 -0000	1.31
+++ sources	12 Jul 2006 05:24:36 -0000	1.32
@@ -1 +1 @@
-918008502532998c8c4961a39027d7df  gnome-system-monitor-2.15.0.tar.bz2
+f1ae8e398b3f824c2d4807d9faedf241  gnome-system-monitor-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:41 -0400
Subject: rpms/automake/devel automake.spec,1.26,1.27
Message-ID: <200607120524.k6C5Ofw9024630@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/automake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24595

Modified Files:
	automake.spec 
Log Message:
bumped for rebuild


Index: automake.spec
===================================================================
RCS file: /cvs/dist/rpms/automake/devel/automake.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- automake.spec	19 Dec 2005 15:35:04 -0000	1.26
+++ automake.spec	12 Jul 2006 05:24:38 -0000	1.27
@@ -3,7 +3,7 @@
 Summary:	A GNU tool for automatically creating Makefiles.
 Name:		automake
 Version:	%{api_version}.6
-Release:    2
+Release:    2.1
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
@@ -63,6 +63,9 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-2.1
+- rebuild
+
 * Mon Dec 19 2005 Karsten Hopp <karsten at redhat.de> 1.9.6-2
 - include NEWS file (#174674)
 - add %%check (#174674)



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:24:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:24:54 -0400
Subject: rpms/autorun/devel autorun.spec,1.30,1.31
Message-ID: <200607120524.k6C5OsRL024755@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/autorun/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24725

Modified Files:
	autorun.spec 
Log Message:
bumped for rebuild


Index: autorun.spec
===================================================================
RCS file: /cvs/dist/rpms/autorun/devel/autorun.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- autorun.spec	7 Jun 2006 12:33:16 -0000	1.30
+++ autorun.spec	12 Jul 2006 05:24:52 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: A CD-ROM mounting utility.
 Name: autorun
 Version: 3.20
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: %name-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.20-1.1
+- rebuild
+
 * Wed Jun  7 2006 Harald Hoyer <harald at redhat.com> - 3.20
 - corrected some po files
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:05 -0400
Subject: rpms/avahi/devel avahi.spec,1.62,1.63
Message-ID: <200607120525.k6C5P5kq024873@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	avahi.spec 
Log Message:
bumped for rebuild


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- avahi.spec	13 Jun 2006 17:57:26 -0000	1.62
+++ avahi.spec	12 Jul 2006 05:25:02 -0000	1.63
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.10
-Release: 	3.FC6
+Release: 	3.FC6.1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -397,6 +397,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 13 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-3.FC6
 - rebuild for broken mono deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:20 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.18,1.19
Message-ID: <200607120525.k6C5PKu5025016@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24986

Modified Files:
	avalon-logkit.spec 
Log Message:
bumped for rebuild


Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- avalon-logkit.spec	8 Mar 2006 21:07:10 -0000	1.18
+++ avalon-logkit.spec	12 Jul 2006 05:25:17 -0000	1.19
@@ -2,7 +2,7 @@
 %define short_Name      LogKit
 %define name		avalon-%{short_name}
 %define version		1.2
-%define release		3jpp_4fc
+%define release		3jpp_5fc
 %define	section		free
 
 Name:		%{name}
@@ -93,6 +93,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2-3jpp_5fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2-3jpp_4fc
 - ecluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:31 -0400
Subject: rpms/awesfx/devel awesfx.spec,1.14,1.15
Message-ID: <200607120525.k6C5PVAg025140@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/awesfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25113

Modified Files:
	awesfx.spec 
Log Message:
bumped for rebuild


Index: awesfx.spec
===================================================================
RCS file: /cvs/dist/rpms/awesfx/devel/awesfx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- awesfx.spec	7 Feb 2006 11:06:08 -0000	1.14
+++ awesfx.spec	12 Jul 2006 05:25:28 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility programs for the AWE32/Emu10k1 sound driver.
 Name: awesfx
 Version: 0.5.0d
-Release: 3.2
+Release: 3.2.1
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0d-3.2.1
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0d-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:40 -0400
Subject: rpms/axis/devel axis.spec,1.17,1.18
Message-ID: <200607120525.k6C5Pexc025246@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25220

Modified Files:
	axis.spec 
Log Message:
bumped for rebuild


Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- axis.spec	6 Mar 2006 21:53:41 -0000	1.17
+++ axis.spec	12 Jul 2006 05:25:37 -0000	1.18
@@ -1,7 +1,7 @@
 %define name       axis
 %define version    1.2.1
 %define archivever 1_2_1
-%define release    2jpp_2fc
+%define release    2jpp_3fc
 %define section    free
 
 Name:          %{name}
@@ -176,6 +176,9 @@
 %doc docs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-2jpp_3fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2.1-2jpp_2fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:50 -0400
Subject: rpms/basesystem/devel basesystem.spec,1.9,1.10
Message-ID: <200607120525.k6C5PoJq025395@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/basesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25365

Modified Files:
	basesystem.spec 
Log Message:
bumped for rebuild


Index: basesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/basesystem/devel/basesystem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- basesystem.spec	9 Dec 2005 22:39:45 -0000	1.9
+++ basesystem.spec	12 Jul 2006 05:25:47 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: The skeleton package which defines a simple Red Hat Linux system.
 Name: basesystem
 Version: 8.0
-Release: 5.1
+Release: 5.1.1
 License: public domain
 Group: System Environment/Base
 Prereq: setup filesystem
@@ -17,6 +17,9 @@
 %files
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.0-5.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:00 -0400
Subject: rpms/totem/devel .cvsignore, 1.23, 1.24 sources, 1.23,
	1.24 totem.spec, 1.64, 1.65
Message-ID: <200607120526.k6C5Q0Bp025535@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25454

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	13 Jun 2006 15:19:37 -0000	1.23
+++ .cvsignore	12 Jul 2006 05:25:58 -0000	1.24
@@ -1 +1 @@
-totem-1.5.2.tar.bz2
+totem-1.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Jun 2006 15:19:37 -0000	1.23
+++ sources	12 Jul 2006 05:25:58 -0000	1.24
@@ -1 +1 @@
-72bbc885374c6322c0a7106e96dc75c4  totem-1.5.2.tar.bz2
+8f34cf7bc8f6d5f91137333e8558ce1a  totem-1.5.4.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- totem.spec	14 Jun 2006 14:44:41 -0000	1.64
+++ totem.spec	12 Jul 2006 05:25:58 -0000	1.65
@@ -4,8 +4,8 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.5.2
-Release: 2
+Version: 1.5.4
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -161,6 +161,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-1
+- Update to 1.5.4
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.2-2
 - Work around a gstreamer problem
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:25:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:25:59 -0400
Subject: rpms/bash/devel bash.spec,1.121,1.122
Message-ID: <200607120525.k6C5PxbI025524@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25490

Modified Files:
	bash.spec 
Log Message:
bumped for rebuild


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- bash.spec	28 Jun 2006 07:32:42 -0000	1.121
+++ bash.spec	12 Jul 2006 05:25:57 -0000	1.122
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 16
+Release: 16.1
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -234,6 +234,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1-16.1
+- rebuild
+
 * Wed Jun 28 2006 Tim Waugh <twaugh at redhat.com> 3.1-16
 - Removed 'unset USERNAME' from default .bash_profile (bug #196735).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:10 -0400
Subject: rpms/bc/devel bc.spec,1.18,1.19
Message-ID: <200607120526.k6C5QA3t025649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25624

Modified Files:
	bc.spec 
Log Message:
bumped for rebuild


Index: bc.spec
===================================================================
RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bc.spec	6 Jun 2006 10:02:35 -0000	1.18
+++ bc.spec	12 Jul 2006 05:26:08 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 20
+Release: 20.1
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -69,6 +69,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.06-20.1
+- rebuild
+
 * Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.06-20
 - added missing flex build require
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:18 -0400
Subject: rpms/bcel/devel bcel.spec,1.15,1.16
Message-ID: <200607120526.k6C5QIvE025798@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25740

Modified Files:
	bcel.spec 
Log Message:
bumped for rebuild


Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bcel.spec	6 Mar 2006 21:49:41 -0000	1.15
+++ bcel.spec	12 Jul 2006 05:26:16 -0000	1.16
@@ -1,6 +1,6 @@
 %define name    bcel
 %define version 5.1
-%define release 1jpp_6fc
+%define release 1jpp_7fc
 %define section free
 
 Name:           %{name}
@@ -112,6 +112,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.1-1jpp_7fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.1-1jpp_6fc
 - stop the scriptlet spew 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:26 -0400
Subject: rpms/beagle/devel beagle.spec,1.58,1.59
Message-ID: <200607120526.k6C5QQDx025907@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25876

Modified Files:
	beagle.spec 
Log Message:
bumped for rebuild


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- beagle.spec	22 Jun 2006 09:03:33 -0000	1.58
+++ beagle.spec	12 Jul 2006 05:26:24 -0000	1.59
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:        2
+Release:        2.1
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -213,6 +213,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-2
 - Rebuild to pick up new gsf-sharp
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:35 -0400
Subject: rpms/beecrypt/devel beecrypt.spec,1.30,1.31
Message-ID: <200607120526.k6C5QZxS026020@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25994

Modified Files:
	beecrypt.spec 
Log Message:
bumped for rebuild


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- beecrypt.spec	27 Jun 2006 16:43:57 -0000	1.30
+++ beecrypt.spec	12 Jul 2006 05:26:32 -0000	1.31
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 10.1
+Release: 10.1.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -121,6 +121,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.2-10.1.1
+- rebuild
+
 * Tue Jun 27 2006 Paul Nasrat <pnasrat at redhat.com> - 4.1.2-10.1
 - Fix missing BR
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:44 -0400
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.40,1.41
Message-ID: <200607120526.k6C5QifO026128@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	cpufreq-utils.spec 
Log Message:
fix dist tag


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cpufreq-utils.spec	11 Jul 2006 13:34:53 -0000	1.40
+++ cpufreq-utils.spec	12 Jul 2006 05:26:41 -0000	1.41
@@ -1,7 +1,7 @@
 Summary:        CPU Frequency changing related utilities
 Name:           cpufreq-utils
 Version:        002
-Release: 1.%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: 1.%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:44 -0400
Subject: rpms/bind/devel bind.spec,1.109,1.110
Message-ID: <200607120526.k6C5Qitp026137@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26098

Modified Files:
	bind.spec 
Log Message:
bumped for rebuild


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- bind.spec	14 Jun 2006 05:26:43 -0000	1.109
+++ bind.spec	12 Jul 2006 05:26:41 -0000	1.110
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	26.FC6
+Release: 	26.FC6.1
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -843,6 +843,9 @@
 :;
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 30:9.3.2-26.FC6.1
+- rebuild
+
 * Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-26.FC6
 - fix bugs 191093, 189789
 - backport selected fixes from upstream bind9 'v9_3_3b1' CVS version:



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:50 -0400
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.36,1.37
Message-ID: <200607120526.k6C5Qopp026201@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26158

Modified Files:
	cpuspeed.spec 
Log Message:
fix dist tag


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cpuspeed.spec	12 Jul 2006 04:53:24 -0000	1.36
+++ cpuspeed.spec	12 Jul 2006 05:26:47 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:	CPU Frequency adjusting daemon.
 Name:		cpuspeed
 Version:	1.2.1
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}.1
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:55 -0400
Subject: rpms/dmidecode/devel dmidecode.spec,1.24,1.25
Message-ID: <200607120526.k6C5QtEf026276@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/dmidecode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26242

Modified Files:
	dmidecode.spec 
Log Message:
fix dist tag


Index: dmidecode.spec
===================================================================
RCS file: /cvs/dist/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dmidecode.spec	2 Jul 2006 03:37:20 -0000	1.24
+++ dmidecode.spec	12 Jul 2006 05:26:52 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data.
 Name:           dmidecode
 Version:        2.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:26:57 -0400
Subject: rpms/bison/devel bison.spec,1.28,1.29
Message-ID: <200607120526.k6C5Qvu2026293@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26264

Modified Files:
	bison.spec 
Log Message:
bumped for rebuild


Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bison.spec	7 Jun 2006 23:07:22 -0000	1.28
+++ bison.spec	12 Jul 2006 05:26:54 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
 Version: 2.3
-Release: 2
+Release: 2.1
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3-2.1
+- rebuild
+
 * Wed Jun  7 2006 Roland McGrath <roland at redhat.com> - 2.3-2
 - Add BuildRequires on m4.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:00 -0400
Subject: rpms/irqbalance/devel irqbalance.spec,1.27,1.28
Message-ID: <200607120527.k6C5R0kd026336@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26305

Modified Files:
	irqbalance.spec 
Log Message:
fix dist tag


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- irqbalance.spec	12 Jul 2006 00:20:29 -0000	1.27
+++ irqbalance.spec	12 Jul 2006 05:26:58 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.12
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2376,1.2377
Message-ID: <200607120527.k6C5R5RJ026410@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix dist tag


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2376
retrieving revision 1.2377
diff -u -r1.2376 -r1.2377
--- kernel-2.6.spec	12 Jul 2006 05:13:04 -0000	1.2376
+++ kernel-2.6.spec	12 Jul 2006 05:27:03 -0000	1.2377
@@ -32,7 +32,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:09 -0400
Subject: rpms/bitmap-fonts/devel bitmap-fonts.spec,1.11,1.12
Message-ID: <200607120527.k6C5R9Gg026457@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bitmap-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26421

Modified Files:
	bitmap-fonts.spec 
Log Message:
bumped for rebuild


Index: bitmap-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/bitmap-fonts/devel/bitmap-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bitmap-fonts.spec	9 Dec 2005 22:39:47 -0000	1.11
+++ bitmap-fonts.spec	12 Jul 2006 05:27:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name: bitmap-fonts
 Version: 0.3
-Release: 5.1
+Release: 5.1.1
 License: distributable
 Source: bitmap-fonts-%{version}.tar.bz2
 Source1: fixfont-3.5.tar.bz2
@@ -76,6 +76,9 @@
 %ghost %{_datadir}/fonts/bitmap-fonts/fonts.cache-1
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3-5.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:11 -0400
Subject: rpms/mcelog/devel mcelog.spec,1.20,1.21
Message-ID: <200607120527.k6C5RBr9026470@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26439

Modified Files:
	mcelog.spec 
Log Message:
fix dist tag


Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mcelog.spec	30 Jun 2006 19:33:09 -0000	1.20
+++ mcelog.spec	12 Jul 2006 05:27:08 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
 Version:        0.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:17 -0400
Subject: rpms/microcode_ctl/devel microcode_ctl.spec,1.31,1.32
Message-ID: <200607120527.k6C5RHaZ026553@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/microcode_ctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26499

Modified Files:
	microcode_ctl.spec 
Log Message:
fix dist tag


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/dist/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- microcode_ctl.spec	17 Jun 2006 03:12:29 -0000	1.31
+++ microcode_ctl.spec	12 Jul 2006 05:27:14 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
 Version:        1.13
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:21 -0400
Subject: rpms/rng-utils/devel rng-utils.spec,1.12,1.13
Message-ID: <200607120527.k6C5RLUs026621@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
fix dist tag


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rng-utils.spec	2 Jul 2006 03:37:45 -0000	1.12
+++ rng-utils.spec	12 Jul 2006 05:27:19 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-utils
 Version:        2.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:24 -0400
Subject: rpms/bitstream-vera-fonts/devel bitstream-vera-fonts.spec,1.5,1.6
Message-ID: <200607120527.k6C5RN69026635@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bitstream-vera-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26597

Modified Files:
	bitstream-vera-fonts.spec 
Log Message:
bumped for rebuild


Index: bitstream-vera-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/bitstream-vera-fonts/devel/bitstream-vera-fonts.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bitstream-vera-fonts.spec	9 Dec 2005 22:39:47 -0000	1.5
+++ bitstream-vera-fonts.spec	12 Jul 2006 05:27:20 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:      bitstream-vera-fonts
 Version:   1.10
-Release: 5.1
+Release: 5.1.1
 Summary:   Bitstream Vera Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-5.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:27 -0400
Subject: rpms/salinfo/devel salinfo.spec,1.12,1.13
Message-ID: <200607120527.k6C5RRpL026678@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26646

Modified Files:
	salinfo.spec 
Log Message:
fix dist tag


Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- salinfo.spec	2 Jul 2006 03:37:52 -0000	1.12
+++ salinfo.spec	12 Jul 2006 05:27:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        SAL info tool.
 Name:           salinfo
 Version:        0.5
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:34 -0400
Subject: rpms/tux/devel tux.spec,1.29,1.30
Message-ID: <200607120527.k6C5RYQq026760@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26734

Modified Files:
	tux.spec 
Log Message:
fix dist tag


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tux.spec	2 Jul 2006 03:38:00 -0000	1.29
+++ tux.spec	12 Jul 2006 05:27:32 -0000	1.30
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 7%{dist}
+Release: 7%{?dist}
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:38 -0400
Subject: rpms/x86info/devel x86info.spec,1.21,1.22
Message-ID: <200607120527.k6C5RcjT026813@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/x86info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26783

Modified Files:
	x86info.spec 
Log Message:
fix dist tag


Index: x86info.spec
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- x86info.spec	2 Jul 2006 03:38:06 -0000	1.21
+++ x86info.spec	12 Jul 2006 05:27:36 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.17
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:27:47 -0400
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.21,1.22
Message-ID: <200607120527.k6C5Rlep026886@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26861

Modified Files:
	bluez-hcidump.spec 
Log Message:
bumped for rebuild


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bluez-hcidump.spec	11 Jun 2006 23:45:59 -0000	1.21
+++ bluez-hcidump.spec	12 Jul 2006 05:27:44 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.31
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-1.31.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.31-5.1
+- rebuild
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> 1.31-5
 - Upload 1.31 tarball now that the lookaside works again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:28:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:28:05 -0400
Subject: rpms/bluez-libs/devel bluez-libs.spec,1.26,1.27
Message-ID: <200607120528.k6C5S5m4027064@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27036

Modified Files:
	bluez-libs.spec 
Log Message:
bumped for rebuild


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bluez-libs.spec	11 Jun 2006 15:35:45 -0000	1.26
+++ bluez-libs.spec	12 Jul 2006 05:28:03 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
 Version: 3.0
-Release: 2
+Release: 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-2.1
+- rebuild
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-2
 - Bump release because 3.0-1 build failed
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:28:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:28:20 -0400
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.17,1.18
Message-ID: <200607120528.k6C5SKGK027208@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27180

Modified Files:
	bluez-pin.spec 
Log Message:
bumped for rebuild


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bluez-pin.spec	11 Jun 2006 16:39:32 -0000	1.17
+++ bluez-pin.spec	12 Jul 2006 05:28:17 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.30
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz
@@ -52,6 +52,9 @@
 %{_sysconfdir}/xdg/autostart/bluez-pin.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.30-4.1
+- rebuild
+
 * Sun Jun 11 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-4
 - Really rebuild against bluez-libs-3.0 (libbluetooth.so.2)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:28:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:28:38 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.47,1.48
Message-ID: <200607120528.k6C5Scwn027372@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bluez-utils.spec 
Log Message:
bumped for rebuild


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bluez-utils.spec	11 Jun 2006 16:36:08 -0000	1.47
+++ bluez-utils.spec	12 Jul 2006 05:28:36 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 11
+Release: 11.1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -121,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.25-11.1
+- rebuild
+
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at infradead.org> 2.25-11
 - Really rebuild against bluez-libs-3.0 (libbluetooth.so.2)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:28:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:28:49 -0400
Subject: rpms/boost/devel boost.spec,1.26,1.27
Message-ID: <200607120528.k6C5SnJW027510@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/boost/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27480

Modified Files:
	boost.spec 
Log Message:
bumped for rebuild


Index: boost.spec
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- boost.spec	16 May 2006 13:34:07 -0000	1.26
+++ boost.spec	12 Jul 2006 05:28:47 -0000	1.27
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.33.1
-Release: 6
+Release: 6.1
 License: Boost Software License
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -160,6 +160,9 @@
 %{_docdir}/boost-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.33.1-6.1
+- rebuild
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 1.33.1-6
 - buildrequire python-devel for Python.h
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:28:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:28:58 -0400
Subject: rpms/bootparamd/devel bootparamd.spec,1.19,1.20
Message-ID: <200607120528.k6C5SwKH027615@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bootparamd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27592

Modified Files:
	bootparamd.spec 
Log Message:
bumped for rebuild


Index: bootparamd.spec
===================================================================
RCS file: /cvs/dist/rpms/bootparamd/devel/bootparamd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bootparamd.spec	11 Feb 2006 02:11:53 -0000	1.19
+++ bootparamd.spec	12 Jul 2006 05:28:56 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A server process which provides boot information to diskless clients.
 Name: bootparamd
 Version: 0.17
-Release: 24.devel.2
+Release: 24.devel.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-24.devel.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-24.devel.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:06 -0400
Subject: rpms/bridge-utils/devel bridge-utils.spec,1.20,1.21
Message-ID: <200607120529.k6C5T6Ow027721@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bridge-utils.spec 
Log Message:
bumped for rebuild


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bridge-utils.spec	8 Jul 2006 17:14:05 -0000	1.20
+++ bridge-utils.spec	12 Jul 2006 05:29:04 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
 Version: 1.1
-Release: 1
+Release: 1.1
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
@@ -42,6 +42,9 @@
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1-1.1
+- rebuild
+
 * Wed Jun 07 2006 David Woodhouse <dwmw2 at redhat.com> 1.1-1
 - Update to 1.1
 - BR libsysfs-devel instead of sysfsutils-devel



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:15 -0400
Subject: rpms/brltty/devel brltty.spec,1.14,1.15
Message-ID: <200607120529.k6C5TFsV027825@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27800

Modified Files:
	brltty.spec 
Log Message:
bumped for rebuild


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- brltty.spec	2 Jul 2006 10:50:31 -0000	1.14
+++ brltty.spec	12 Jul 2006 05:29:13 -0000	1.15
@@ -1,6 +1,6 @@
 Name: brltty
 Version: 3.2
-Release: 12
+Release: 12.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -79,6 +79,9 @@
 /etc/brltty
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-12.1
+- rebuild
+
 * Sun Jul 02 2006 Florian La Roche <laroche at redhat.com>
 - for the post script require coreutils
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:24 -0400
Subject: rpms/bsh/devel bsh.spec,1.5,1.6
Message-ID: <200607120529.k6C5TOt1027931@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27909

Modified Files:
	bsh.spec 
Log Message:
bumped for rebuild


Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bsh.spec	9 Dec 2005 22:39:50 -0000	1.5
+++ bsh.spec	12 Jul 2006 05:29:21 -0000	1.6
@@ -2,12 +2,12 @@
 %define Name		BeanShell
 %define version		1.3.0
 %define fversion	1.3.0
-%define release 5jpp_1fc.1
+%define release 5jpp_1fc.1.1
 %define section		free
 
 Name:           %{name}
 Version:        %{version}
-Release: %{release}.1
+Release: %{release}.1.1
 Epoch:		0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -189,6 +189,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.0-5jpp_1fc.1.1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:32 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.54,1.55
Message-ID: <200607120529.k6C5TWo6028034@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28005

Modified Files:
	bug-buddy.spec 
Log Message:
bumped for rebuild


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- bug-buddy.spec	15 Jun 2006 00:07:26 -0000	1.54
+++ bug-buddy.spec	12 Jul 2006 05:29:29 -0000	1.55
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.15.0
-Release: 2
+Release: 2.1
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -109,6 +109,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.0-2.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.15.0-2
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:40 -0400
Subject: rpms/busybox/devel busybox.spec,1.45,1.46
Message-ID: <200607120529.k6C5TefR028139@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28114

Modified Files:
	busybox.spec 
Log Message:
bumped for rebuild


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- busybox.spec	4 Jul 2006 11:55:28 -0000	1.45
+++ busybox.spec	12 Jul 2006 05:29:38 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.0
-Release: 1
+Release: 1.1
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -84,6 +84,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.0-1.1
+- rebuild
+
 * Tue Jul  4 2006 Ivana Varekova <varekova at redhat.com> - 1:1.2.0-1
 - update to 1.2.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:48 -0400
Subject: rpms/byacc/devel byacc-1.9.spec,1.13,1.14
Message-ID: <200607120529.k6C5TmQI028249@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/byacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28221

Modified Files:
	byacc-1.9.spec 
Log Message:
bumped for rebuild


Index: byacc-1.9.spec
===================================================================
RCS file: /cvs/dist/rpms/byacc/devel/byacc-1.9.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- byacc-1.9.spec	11 Feb 2006 02:12:59 -0000	1.13
+++ byacc-1.9.spec	12 Jul 2006 05:29:46 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A public domain Yacc parser generator.
 Name: byacc
 Version: 1.9
-Release: 29.2.1
+Release: 29.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9-29.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9-29.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:29:56 -0400
Subject: rpms/bzip2/devel bzip2.spec,1.18,1.19
Message-ID: <200607120529.k6C5TuNB028352@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28325

Modified Files:
	bzip2.spec 
Log Message:
bumped for rebuild


Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bzip2.spec	11 Feb 2006 02:13:09 -0000	1.18
+++ bzip2.spec	12 Jul 2006 05:29:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.3
-Release: 2.2.1
+Release: 2.2.2
 License: BSD
 Group: Applications/File
 URL: http://sources.redhat.com/bzip2/
@@ -109,6 +109,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:30:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:30:07 -0400
Subject: rpms/dasher/devel dasher.spec,1.46,1.47
Message-ID: <200607120530.k6C5U7cQ028466@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28444

Modified Files:
	dasher.spec 
Log Message:
bumped for rebuild


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- dasher.spec	12 Jul 2006 05:16:31 -0000	1.46
+++ dasher.spec	12 Jul 2006 05:30:04 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 4.1.7
-Release: 1
+Release: 1.1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -99,6 +99,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.7-1.1
+- rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.7-1
 - Update t0 4.1.7
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:31:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:31:00 -0400
Subject: rpms/db4/devel db4.spec,1.33,1.34
Message-ID: <200607120531.k6C5V0HY028633@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28596

Modified Files:
	db4.spec 
Log Message:
bumped for rebuild


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- db4.spec	24 Mar 2006 11:36:33 -0000	1.33
+++ db4.spec	12 Jul 2006 05:30:58 -0000	1.34
@@ -11,7 +11,7 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 4
+Release: 4.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
@@ -351,6 +351,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-4.1
+- rebuild
+
 * Fri Mar 24 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-4
 - drop useless java, lfs patches
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:32:16 -0400
Subject: rpms/dbus/devel dbus.spec,1.84,1.85
Message-ID: <200607120532.k6C5WGKG028797@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28772

Modified Files:
	dbus.spec 
Log Message:
bumped for rebuild


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- dbus.spec	12 Jun 2006 19:47:30 -0000	1.84
+++ dbus.spec	12 Jul 2006 05:32:13 -0000	1.85
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.62
-Release: 1 
+Release: 1.1 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -347,6 +347,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.62-1.1
+- rebuild
+
 * Mon Jun 12 2006 John (J5) Palmieri <johnp at redhat.com> - 0.62-1
 - Update to upstream 0.62
 - Remove mono for s390s



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:32:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:32:34 -0400
Subject: rpms/dcraw/devel dcraw.spec,1.9,1.10
Message-ID: <200607120532.k6C5WYNh028953@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dcraw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28927

Modified Files:
	dcraw.spec 
Log Message:
bumped for rebuild


Index: dcraw.spec
===================================================================
RCS file: /cvs/dist/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dcraw.spec	23 May 2006 13:00:56 -0000	1.9
+++ dcraw.spec	12 Jul 2006 05:32:32 -0000	1.10
@@ -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: GPL
 #The next file is actually http://www.cybercom.net/~dcoffin/dcraw/dcraw.c
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.20060521-1.1
+- rebuild
+
 * Tue May 23 2006 Nils Philippsen <nphilipp at redhat.com> - 0.0.20060521-1
 - program and manpage version of 2006-05-21
 - use %%optflags



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:32:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:32:50 -0400
Subject: rpms/ddd/devel ddd.spec,1.27,1.28
Message-ID: <200607120532.k6C5WogS029073@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ddd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29051

Modified Files:
	ddd.spec 
Log Message:
bumped for rebuild


Index: ddd.spec
===================================================================
RCS file: /cvs/dist/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ddd.spec	17 May 2006 11:25:03 -0000	1.27
+++ ddd.spec	12 Jul 2006 05:32:48 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.11
-Release: 7
+Release: 7.1
 License: GPL or BSD
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
@@ -88,6 +88,9 @@
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3.11-7.1
+- rebuild
+
 * Wed May 17 2006 Karsten Hopp <karsten at redhat.de> 3.3.11-7
 - add buildrequires elfutils-libelf-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:33:21 -0400
Subject: rpms/dejagnu/devel dejagnu-rh.spec,1.13,1.14
Message-ID: <200607120533.k6C5XLTi029240@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dejagnu-rh.spec 
Log Message:
bumped for rebuild


Index: dejagnu-rh.spec
===================================================================
RCS file: /cvs/dist/rpms/dejagnu/devel/dejagnu-rh.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dejagnu-rh.spec	1 Feb 2006 15:30:37 -0000	1.13
+++ dejagnu-rh.spec	12 Jul 2006 05:33:19 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs.
 Name: dejagnu
 Version: 1.4.4
-Release: 5
+Release: 5.1
 Epoch: 1
 License: GPL
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz
@@ -59,6 +59,9 @@
 
  
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.4-5.1
+- rebuild
+
 * Wed Feb 2 2006 Petr Machata <pmachata at redhat.com> 1:1.4.4-5
 - Applying H.J. Lu's race condition patch. (#166000)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:34:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:34:08 -0400
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.27,1.28
Message-ID: <200607120534.k6C5Y8kd029366@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29351

Modified Files:
	desktop-file-utils.spec 
Log Message:
bumped for rebuild


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- desktop-file-utils.spec	11 Feb 2006 02:24:41 -0000	1.27
+++ desktop-file-utils.spec	12 Jul 2006 05:34:04 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 6.1
+Release: 6.2
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10-6.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-6.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:34:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:34:29 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.58,1.59
Message-ID: <200607120534.k6C5YTRC029498@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29470

Modified Files:
	desktop-printing.spec 
Log Message:
bumped for rebuild


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- desktop-printing.spec	14 Jun 2006 22:58:55 -0000	1.58
+++ desktop-printing.spec	12 Jul 2006 05:34:26 -0000	1.59
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 10
+Release: 10.1
 License: GPL
 Group: Applications/File
 # total lie
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.19-10.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.19-10
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:34:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:34:57 -0400
Subject: rpms/dev86/devel dev86.spec,1.16,1.17
Message-ID: <200607120534.k6C5Yvw0029612@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dev86/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29586

Modified Files:
	dev86.spec 
Log Message:
bumped for rebuild


Index: dev86.spec
===================================================================
RCS file: /cvs/dist/rpms/dev86/devel/dev86.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dev86.spec	7 Feb 2006 11:22:21 -0000	1.16
+++ dev86.spec	12 Jul 2006 05:34:54 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A real mode 80x86 assembler and linker.
 Name: dev86
 Version: 0.16.17
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Development/Languages
 Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
@@ -65,6 +65,9 @@
 /%{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.17-2.2
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.17-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:35:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:35:22 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.38,1.39
Message-ID: <200607120535.k6C5ZMjF029719@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29696

Modified Files:
	devhelp.spec 
Log Message:
bumped for rebuild


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- devhelp.spec	20 Feb 2006 12:00:43 -0000	1.38
+++ devhelp.spec	12 Jul 2006 05:35:14 -0000	1.39
@@ -3,7 +3,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.11
-Release:             3
+Release:             3.1
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -100,6 +100,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11-3.1
+- rebuild
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.11-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:35:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:35:34 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.36,1.37
Message-ID: <200607120535.k6C5ZYdP029839@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29815

Modified Files:
	device-mapper.spec 
Log Message:
bumped for rebuild


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- device-mapper.spec	11 May 2006 20:32:30 -0000	1.36
+++ device-mapper.spec	12 Jul 2006 05:35:31 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.07
-Release: 1.0
+Release: 1.0.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.02.07-1.0.1
+- rebuild
+
 * Thu May 11 2006 Alasdair Kergon <agk at redhat.com> - 1.02.07-1.0
 - Build new upstream version.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:35:46 -0400
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.29, 1.30
Message-ID: <200607120535.k6C5ZkU2029954@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29928

Modified Files:
	device-mapper-multipath.spec 
Log Message:
bumped for rebuild


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- device-mapper-multipath.spec	10 Jul 2006 22:50:04 -0000	1.29
+++ device-mapper-multipath.spec	12 Jul 2006 05:35:44 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.7-2.2.1
+- rebuild
+
 * Mon Jul 11 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.2
 - fix tagging issue.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:36:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:36:16 -0400
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.29,1.30
Message-ID: <200607120536.k6C5aGco030087@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30057

Modified Files:
	dhcdbd.spec 
Log Message:
bumped for rebuild


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dhcdbd.spec	30 May 2006 21:24:14 -0000	1.29
+++ dhcdbd.spec	12 Jul 2006 05:36:05 -0000	1.30
@@ -10,7 +10,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
 Version:   1.15
-Release:   1.FC6
+Release:   1.FC6.1
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +92,9 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.FC6.1
+- rebuild
+
 * Mon May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 1.15-1.FC6
 - fix bug 193562: remove 'servicedir' entry from dhcdbd.conf
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:37:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:37:10 -0400
Subject: rpms/dhcp/devel dhcp.spec,1.109,1.110
Message-ID: <200607120537.k6C5bAgs030299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30283

Modified Files:
	dhcp.spec 
Log Message:
bumped for rebuild


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- dhcp.spec	28 Jun 2006 19:36:42 -0000	1.109
+++ dhcp.spec	12 Jul 2006 05:37:07 -0000	1.110
@@ -4,7 +4,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.4
-Release: 17
+Release: 17.1
 Epoch:   12
 License: distributable
 Group: System Environment/Daemons
@@ -496,6 +496,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 12:3.0.4-17.1
+- rebuild
+
 * Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 12:3.0.4-17
 - export timeout cancellation functions in libdhcp4client
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:37:23 -0400
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.39,1.40
Message-ID: <200607120537.k6C5bNJP030415@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30390

Modified Files:
	dhcpv6.spec 
Log Message:
bumped for rebuild


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- dhcpv6.spec	28 Jun 2006 18:50:09 -0000	1.39
+++ dhcpv6.spec	12 Jul 2006 05:37:21 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 29
+Release: 29.1
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -191,6 +191,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10-29.1
+- rebuild
+
 * Wed Jun 28 2006 Peter Jones <pjones at redhat.com> - 0.10-29
 - getnameinfo needs the size of the incoming data, not NS_MAXHOST
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:37:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:37:54 -0400
Subject: rpms/dialog/devel dialog.spec,1.23,1.24
Message-ID: <200607120537.k6C5brik030597@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30568

Modified Files:
	dialog.spec 
Log Message:
bumped for rebuild


Index: dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/dialog/devel/dialog.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dialog.spec	11 Feb 2006 02:25:56 -0000	1.23
+++ dialog.spec	12 Jul 2006 05:37:50 -0000	1.24
@@ -2,7 +2,7 @@
 Name: dialog
 %define SubVersion 20051107
 Version: 1.0.%{SubVersion}
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.20051107-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:38:36 -0400
Subject: rpms/dictd/devel dictd.spec,1.24,1.25
Message-ID: <200607120538.k6C5calu030740@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dictd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30727

Modified Files:
	dictd.spec 
Log Message:
bumped for rebuild


Index: dictd.spec
===================================================================
RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dictd.spec	22 May 2006 10:29:04 -0000	1.24
+++ dictd.spec	12 Jul 2006 05:38:31 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: DICT protocol (RFC 2229) command-line client
 Name: dictd
 Version: 1.9.15
-Release: 8
+Release: 8.1
 License: GPL
 Group: Applications/Internet
 Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -60,6 +60,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9.15-8.1
+- rebuild
+
 * Mon May 22 2006 Karsten Hopp <karsten at redhat.de> 1.9.15-8
 - buildrequires zlib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:38:50 -0400
Subject: rpms/diffstat/devel diffstat.spec,1.17,1.18
Message-ID: <200607120538.k6C5co4q030868@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30841

Modified Files:
	diffstat.spec 
Log Message:
bumped for rebuild


Index: diffstat.spec
===================================================================
RCS file: /cvs/dist/rpms/diffstat/devel/diffstat.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- diffstat.spec	11 Feb 2006 02:26:19 -0000	1.17
+++ diffstat.spec	12 Jul 2006 05:38:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A utility which provides statistics based on the output of diff.
 Name: diffstat
 Version: 1.41
-Release: 1.2.1
+Release: 1.2.2
 Group: Development/Tools
 License: distributable
 URL: http://invisible-island.net/diffstat
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:39:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:39:15 -0400
Subject: rpms/diffutils/devel diffutils.spec,1.19,1.20
Message-ID: <200607120539.k6C5dF8e030992@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30966

Modified Files:
	diffutils.spec 
Log Message:
bumped for rebuild


Index: diffutils.spec
===================================================================
RCS file: /cvs/dist/rpms/diffutils/devel/diffutils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- diffutils.spec	11 Feb 2006 02:26:30 -0000	1.19
+++ diffutils.spec	12 Jul 2006 05:39:12 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities.
 Name: diffutils
 Version: 2.8.1
-Release: 15.2.1
+Release: 15.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.1-15.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:39:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:39:30 -0400
Subject: rpms/diskdumputils/devel diskdumputils.spec,1.24,1.25
Message-ID: <200607120539.k6C5dUei031093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diskdumputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31070

Modified Files:
	diskdumputils.spec 
Log Message:
bumped for rebuild


Index: diskdumputils.spec
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/diskdumputils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- diskdumputils.spec	18 May 2006 15:28:01 -0000	1.24
+++ diskdumputils.spec	12 Jul 2006 05:39:28 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: diskdump utilities
 Name: diskdumputils
 Version: 1.3.6
-Release: 5
+Release: 5.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/System
@@ -76,6 +76,9 @@
 /etc/diskdump/mail_template.us
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.6-5.1
+- rebuild
+
 * Thu May 18 2006 David Woodhouse <dwmw2 at redhat.com> 1.3.6-5
 - Use $RPM_OPT_FLAGS and %%{_libdir}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:39:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:39:38 -0400
Subject: rpms/distcache/devel distcache.spec,1.18,1.19
Message-ID: <200607120539.k6C5dcaY031206@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/distcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31175

Modified Files:
	distcache.spec 
Log Message:
bumped for rebuild


Index: distcache.spec
===================================================================
RCS file: /cvs/dist/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- distcache.spec	7 Jun 2006 21:24:36 -0000	1.18
+++ distcache.spec	12 Jul 2006 05:39:36 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 14
+Release: 14.1
 License: LGPL
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
@@ -101,6 +101,9 @@
 %{_mandir}/man2/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-14.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.4.5-14
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:39:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:39:47 -0400
Subject: rpms/dmidecode/devel dmidecode.spec,1.25,1.26
Message-ID: <200607120539.k6C5dlLP031317@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dmidecode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31287

Modified Files:
	dmidecode.spec 
Log Message:
bumped for rebuild


Index: dmidecode.spec
===================================================================
RCS file: /cvs/dist/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dmidecode.spec	12 Jul 2006 05:26:52 -0000	1.25
+++ dmidecode.spec	12 Jul 2006 05:39:44 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data.
 Name:           dmidecode
 Version:        2.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -46,6 +46,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.7-1.25.1
+- rebuild
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:39:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:39:55 -0400
Subject: rpms/dmraid/devel dmraid.spec,1.54,1.55
Message-ID: <200607120539.k6C5dt6f031414@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31396

Modified Files:
	dmraid.spec 
Log Message:
bumped for rebuild


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- dmraid.spec	7 Jul 2006 18:02:05 -0000	1.54
+++ dmraid.spec	12 Jul 2006 05:39:53 -0000	1.55
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6.1
+Release: FC6.1.1
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -93,6 +93,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc11-FC6.1.1
+- rebuild
+
 * Fri Jul  7 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
 - rebuilt for FC6 with dos partition discovery fix (#197573)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:40:05 -0400
Subject: rpms/docbook-dtds/devel docbook-dtds.spec,1.14,1.15
Message-ID: <200607120540.k6C5e5i8031528@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/docbook-dtds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31491

Modified Files:
	docbook-dtds.spec 
Log Message:
bumped for rebuild


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- docbook-dtds.spec	13 Dec 2005 13:17:10 -0000	1.14
+++ docbook-dtds.spec	12 Jul 2006 05:40:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name: docbook-dtds
 Version: 1.0
-Release: 30
+Release: 30.1
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook.
@@ -1207,6 +1207,9 @@
 fi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-30.1
+- rebuild
+
 * Tue Dec 13 2005 Tim Waugh <twaugh at redhat.com> 1.0-30
 - Fix ISO entities in 4.3/4.4 SGML.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:40:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:40:17 -0400
Subject: rpms/docbook-simple/devel docbook-simple.spec,1.3,1.4
Message-ID: <200607120540.k6C5eHuw031642@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/docbook-simple/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31614

Modified Files:
	docbook-simple.spec 
Log Message:
bumped for rebuild


Index: docbook-simple.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-simple/devel/docbook-simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- docbook-simple.spec	9 Dec 2005 22:40:14 -0000	1.3
+++ docbook-simple.spec	12 Jul 2006 05:40:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name: docbook-simple
 Version: 1.0
-Release: 2.1
+Release: 2.1.1
 Group: Applications/Text
 Summary: Simplified DocBook is a small subset of the DocBook XML DTD.
 License: Distributable
@@ -167,6 +167,9 @@
 rm -rf /usr/share/xml/docbook/simple
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-2.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:40:48 -0400
Subject: rpms/docbook-slides/devel docbook-slides.spec,1.3,1.4
Message-ID: <200607120540.k6C5em9g031886@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/docbook-slides/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31860

Modified Files:
	docbook-slides.spec 
Log Message:
bumped for rebuild


Index: docbook-slides.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-slides/devel/docbook-slides.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- docbook-slides.spec	9 Dec 2005 22:40:14 -0000	1.3
+++ docbook-slides.spec	12 Jul 2006 05:40:46 -0000	1.4
@@ -2,7 +2,7 @@
 Summary: DocBook Slides document type and stylesheets
 Name: docbook-slides
 Version: 3.3.1
-Release: 2.1
+Release: 2.1.1
 License: BSD
 Group: Applications/Text
 URL: http://sourceforge.net/projects/docbook
@@ -166,6 +166,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3.1-2.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:41:14 -0400
Subject: rpms/docbook-style-dsssl/devel docbook-style-dsssl.spec,1.16,1.17
Message-ID: <200607120541.k6C5fEnw032096@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/docbook-style-dsssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32070

Modified Files:
	docbook-style-dsssl.spec 
Log Message:
bumped for rebuild


Index: docbook-style-dsssl.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-dsssl/devel/docbook-style-dsssl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- docbook-style-dsssl.spec	20 Dec 2005 12:15:23 -0000	1.16
+++ docbook-style-dsssl.spec	12 Jul 2006 05:41:12 -0000	1.17
@@ -1,6 +1,6 @@
 Name: docbook-style-dsssl
 Version: 1.79
-Release: 4
+Release: 4.1
 Group: Applications/Text
 
 Summary: Norman Walsh's modular stylesheets for DocBook.
@@ -88,6 +88,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.79-4.1
+- rebuild
+
 * Tue Dec 20 2005 Tim Waugh <twaugh at redhat.com> 1.79-4
 - Rebuilt again.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:41:28 -0400
Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.27,1.28
Message-ID: <200607120541.k6C5fSQo032243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/docbook-style-xsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32205

Modified Files:
	docbook-style-xsl.spec 
Log Message:
bumped for rebuild


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- docbook-style-xsl.spec	24 Jan 2006 09:32:59 -0000	1.27
+++ docbook-style-xsl.spec	12 Jul 2006 05:41:25 -0000	1.28
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.69.1
-Release: 5
+Release: 5.1
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.69.1-5.1
+- rebuild
+
 * Tue Jan 24 2006 Tim Waugh <twaugh at redhat.com> 1.69.1-5
 - Don't ship docsrc/* (bug #177256).
 - Don't ship the extensions (bug #177256).



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:41:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:41:51 -0400
Subject: rpms/docbook-utils/devel docbook-utils.spec,1.19,1.20
Message-ID: <200607120541.k6C5fpoB032362@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	docbook-utils.spec 
Log Message:
bumped for rebuild


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- docbook-utils.spec	9 Mar 2006 11:35:25 -0000	1.19
+++ docbook-utils.spec	12 Jul 2006 05:41:49 -0000	1.20
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 5
+Release: 5.1
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -116,6 +116,9 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.14-5.1
+- rebuild
+
 * Thu Mar 09 2006 Florian La Roche <laroche at redhat.com>
 - use 755 instead of 775 for /usr/bin/db2html
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:41:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:41:58 -0400
Subject: rpms/dos2unix/devel dos2unix.spec,1.24,1.25
Message-ID: <200607120541.k6C5fwWh032460@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dos2unix.spec 
Log Message:
bumped for rebuild


Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dos2unix.spec	10 Jul 2006 15:08:25 -0000	1.24
+++ dos2unix.spec	12 Jul 2006 05:41:56 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 27
+Release: 27.1
 Group: Applications/Text
 License: Freely distributable
 Source: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1-27.1
+- rebuild
+
 * Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 3.1-27
 - Re-encoded spec file in UTF-8 (bug #197817).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:05 -0400
Subject: rpms/dosfstools/devel dosfstools.spec,1.26,1.27
Message-ID: <200607120542.k6C5g50L032565@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dosfstools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32533

Modified Files:
	dosfstools.spec 
Log Message:
bumped for rebuild


Index: dosfstools.spec
===================================================================
RCS file: /cvs/dist/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dosfstools.spec	30 Jun 2006 08:13:56 -0000	1.26
+++ dosfstools.spec	12 Jul 2006 05:42:03 -0000	1.27
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Version: 2.11
-Release: 6%{?dist}
+Release: 6.1%{?dist}
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
@@ -54,6 +54,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.11-6.1
+- rebuild
+
 * Fri Jun 30 2006 Peter Vrabec <pvrabec at redhat.com> 2.11-6
 - fix upgrade path (#197231)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:13 -0400
Subject: rpms/dovecot/devel dovecot.spec,1.52,1.53
Message-ID: <200607120542.k6C5gDdw032663@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dovecot.spec 
Log Message:
bumped for rebuild


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- dovecot.spec	8 Jun 2006 10:10:05 -0000	1.52
+++ dovecot.spec	12 Jul 2006 05:42:10 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta8.2
+Release: 0.beta8.2.1
 License: LGPL
 Group: System Environment/Daemons
 
@@ -212,6 +212,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.beta8.2.1
+- rebuild
+
 * Thu Jun 08 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta8.2
 - put back pop3_uidl_format default that got lost
   in the beta2->beta7 upgrade (would cause pop3 to not work



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:28 -0400
Subject: rpms/doxygen/devel doxygen.spec,1.42,1.43
Message-ID: <200607120542.k6C5gSeN000329@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv303

Modified Files:
	doxygen.spec 
Log Message:
bumped for rebuild


Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- doxygen.spec	12 Jun 2006 20:42:44 -0000	1.42
+++ doxygen.spec	12 Jul 2006 05:42:26 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.4.7
-Release: 1
+Release: 1.1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -100,6 +100,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.7-1.1
+- rebuild
+
 * Mon Jun 12 2006 Than Ngo <than at redhat.com> 1:1.4.7-1
 - update to 1.4.7
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:38 -0400
Subject: rpms/dtach/devel dtach.spec,1.11,1.12
Message-ID: <200607120542.k6C5gcl4000438@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dtach/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv413

Modified Files:
	dtach.spec 
Log Message:
bumped for rebuild


Index: dtach.spec
===================================================================
RCS file: /cvs/dist/rpms/dtach/devel/dtach.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dtach.spec	11 Feb 2006 02:27:45 -0000	1.11
+++ dtach.spec	12 Jul 2006 05:42:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A simple program that emulates the detach feature of screen.
 Name: dtach
 Version: 0.7
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 URL: http://dtach.sourceforge.net
 Group: Applications/System
@@ -42,6 +42,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:48 -0400
Subject: rpms/dump/devel dump.spec,1.35,1.36
Message-ID: <200607120542.k6C5gmCs000548@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dump.spec 
Log Message:
bumped for rebuild


Index: dump.spec
===================================================================
RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dump.spec	11 Feb 2006 02:27:59 -0000	1.35
+++ dump.spec	12 Jul 2006 05:42:45 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 1.2
+Release: 1.2.1
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -114,6 +114,9 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4b41-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4b41-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:42:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:42:56 -0400
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.21,1.22
Message-ID: <200607120542.k6C5gusb000659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv628

Modified Files:
	dvd+rw-tools.spec 
Log Message:
bumped for rebuild


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dvd+rw-tools.spec	13 Jun 2006 14:11:31 -0000	1.21
+++ dvd+rw-tools.spec	12 Jul 2006 05:42:53 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	6.1
-Release: 	4
+Release: 	4.1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -52,6 +52,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.1-4.1
+- rebuild
+
 * Tue Jun 13 2006 Harald Hoyer <harald at redhat.com> - 6.1-4
 - more build requirements
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:01 -0400
Subject: rpms/fonts-arabic/devel .cvsignore, 1.4, 1.5 fonts-arabic.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200607120543.k6C5h1fn000741@cvs.devel.redhat.com>

Author: llch

Update of /cvs/dist/rpms/fonts-arabic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv558

Modified Files:
	.cvsignore fonts-arabic.spec sources 
Log Message:
Added PakType fonts



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 04:48:38 -0000	1.4
+++ .cvsignore	12 Jul 2006 05:42:59 -0000	1.5
@@ -1 +1,2 @@
 KacstArabicFonts-1.5.tar.gz
+paktype-20060712.tar.bz2


Index: fonts-arabic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fonts-arabic.spec	10 Feb 2006 08:43:28 -0000	1.10
+++ fonts-arabic.spec	12 Jul 2006 05:42:59 -0000	1.11
@@ -1,29 +1,32 @@
+%define	kacst		KacstArabicFonts-1.5
+%define paktype		paktype-20060712
+
 Name: fonts-arabic
-Version: 1.5
-Release: 5
+Version: 2.0
+Release: 1
 License: GPL
-Source: KacstArabicFonts-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+Source0: %{kacst}.tar.gz
+Source1: %{paktype}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Group: User Interface/X
 Summary: Fonts for Arabic
 URL: http://www.arabeyes.org/resources.php
-Prereq: fontconfig 
  
 %description
 The fonts-arabic package contains fonts for the display of
-Arabic from the King Abdulaziz City for Science & Technology.
+Arabic from the King Abdulaziz City for Science & Technology
+and PakType by Lateef Sagar (https://sourceforge.net/projects/paktype/).
 
 %prep
-%setup -q -c
+%setup -q -c -a 0 -a 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts/arabic
-cp KacstArabicFonts-%{version}/*.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/arabic
-# %%ghost the fonts.cache-1 file
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/arabic/fonts.cache-1
+cp %{kacst}/*.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/arabic
+cp %{paktype}/*.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/arabic
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,12 +46,15 @@
 
 %files
 %defattr(-,root,root)
-%doc KacstArabicFonts-%{version}/license.txt
+%doc %{kacst}/license.txt
+%doc %{paktype}/*.txt
 %dir %{_datadir}/fonts/arabic
 %{_datadir}/fonts/arabic/*.ttf
-%ghost %{_datadir}/fonts/arabic/fonts.cache-1
 
 %changelog
+* Wed Jul 12 2006 Leon Ho <llch at redhat.com> - 2.0-1
+- Added PakType fonts
+
 * Fri Feb 10 2006 Caolan McNamara <caolanm at redhat.com> - 1.5-5
 - update url
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 04:48:38 -0000	1.4
+++ sources	12 Jul 2006 05:42:59 -0000	1.5
@@ -1 +1,2 @@
 d27ec36204feb4e8e6c50eebffd76f55  KacstArabicFonts-1.5.tar.gz
+27407c76313f42d33ffabebd77f0dd0d  paktype-20060712.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:05 -0400
Subject: rpms/dvgrab/devel dvgrab.spec,1.15,1.16
Message-ID: <200607120543.k6C5h5lW000795@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvgrab/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv770

Modified Files:
	dvgrab.spec 
Log Message:
bumped for rebuild


Index: dvgrab.spec
===================================================================
RCS file: /cvs/dist/rpms/dvgrab/devel/dvgrab.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvgrab.spec	11 Feb 2006 02:28:19 -0000	1.15
+++ dvgrab.spec	12 Jul 2006 05:43:03 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utility to capture video from a DV camera
 Name: dvgrab
 Version: 2.0
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Applications/Multimedia
 URL: http://kino.schirmacher.de/
@@ -36,6 +36,9 @@
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:16 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.60,1.61
Message-ID: <200607120543.k6C5hGsW000947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv894

Modified Files:
	e2fsprogs.spec 
Log Message:
bumped for rebuild


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- e2fsprogs.spec	10 Jul 2006 06:29:59 -0000	1.60
+++ e2fsprogs.spec	12 Jul 2006 05:43:14 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -222,6 +222,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> - 1.39-2
 - add GFS abd GFS2 support to libblkid
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:25 -0400
Subject: rpms/ed/devel ed.spec,1.17,1.18
Message-ID: <200607120543.k6C5hP0h001051@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1027

Modified Files:
	ed.spec 
Log Message:
bumped for rebuild


Index: ed.spec
===================================================================
RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ed.spec	11 Feb 2006 02:32:58 -0000	1.17
+++ ed.spec	12 Jul 2006 05:43:23 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The GNU line editor.
 Name: ed
 Version: 0.2
-Release: 38.2.1
+Release: 38.2.2
 License: GPL
 Group:	Applications/Text
 Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-38.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2-38.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:35 -0400
Subject: rpms/efax/devel efax.spec,1.20,1.21
Message-ID: <200607120543.k6C5hZQF001196@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/efax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1173

Modified Files:
	efax.spec 
Log Message:
bumped for rebuild


Index: efax.spec
===================================================================
RCS file: /cvs/dist/rpms/efax/devel/efax.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- efax.spec	11 Feb 2006 02:33:52 -0000	1.20
+++ efax.spec	12 Jul 2006 05:43:32 -0000	1.21
@@ -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.2
+Release: 27.2.1
 License: GPL
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
@@ -62,6 +62,9 @@
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-27.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9-27.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:41 -0400
Subject: rpms/eject/devel eject.spec,1.24,1.25
Message-ID: <200607120543.k6C5hfrR001290@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1265

Modified Files:
	eject.spec 
Log Message:
bumped for rebuild


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- eject.spec	10 Jun 2006 12:02:05 -0000	1.24
+++ eject.spec	12 Jul 2006 05:43:39 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -49,6 +49,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.5-1.1
+- rebuild
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 2.1.5-1
 - 2.1.5 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:49 -0400
Subject: rpms/ekiga/devel ekiga.spec,1.19,1.20
Message-ID: <200607120543.k6C5hnnG001395@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1369

Modified Files:
	ekiga.spec 
Log Message:
bumped for rebuild


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ekiga.spec	31 May 2006 12:32:35 -0000	1.19
+++ ekiga.spec	12 Jul 2006 05:43:47 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 2.0.2
-Release: 1
+Release: 1.1
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-1.1
+- rebuild
+
 * Wed May 31 2006 Daniel Veillard <veillard at redhat.com> - 2.0.2-1
 - new release of ekiga 2.0.2
 - activating Zeroconf support though avahi



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:43:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:43:58 -0400
Subject: rpms/ElectricFence/devel ElectricFence.spec,1.15,1.16
Message-ID: <200607120543.k6C5hwaB001511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ElectricFence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1486

Modified Files:
	ElectricFence.spec 
Log Message:
bumped for rebuild


Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/devel/ElectricFence.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElectricFence.spec	11 Feb 2006 02:35:37 -0000	1.15
+++ ElectricFence.spec	12 Jul 2006 05:43:56 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations.
 Name: ElectricFence
 Version: 2.2.2
-Release: 20.2.1
+Release: 20.2.2
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.perens.com/pub/ElectricFence/beta/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-20.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:06 -0400
Subject: rpms/elfutils/devel elfutils.spec,1.66,1.67
Message-ID: <200607120544.k6C5i6QQ001610@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1584

Modified Files:
	elfutils.spec 
Log Message:
bumped for rebuild


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- elfutils.spec	15 Jun 2006 08:32:06 -0000	1.66
+++ elfutils.spec	12 Jul 2006 05:44:03 -0000	1.67
@@ -1,5 +1,5 @@
 %define version 0.121
-%define release 1
+%define release 1.1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -13,7 +13,7 @@
 %if !%{compat}
 Release: %{release}
 %else
-Release: 0.%{release}
+Release: 0.%{release}.1
 %endif
 License: GPL
 Group: Development/Tools
@@ -214,6 +214,9 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.121-1.1
+- rebuild
+
 * Thu Jun 15 2006 Roland McGrath <roland at redhat.com> - 0.121-1
 - Update to 0.121
   - libelf: bug fixes for rewriting existing files when using mmap (#187618).



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:15 -0400
Subject: rpms/elilo/devel elilo.spec,1.18,1.19
Message-ID: <200607120544.k6C5iFrS001723@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elilo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1697

Modified Files:
	elilo.spec 
Log Message:
bumped for rebuild


Index: elilo.spec
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/elilo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- elilo.spec	7 Feb 2006 11:29:02 -0000	1.18
+++ elilo.spec	12 Jul 2006 05:44:12 -0000	1.19
@@ -5,7 +5,7 @@
 Group: System Environment/Base
 Obsoletes: eli
 Version: 3.6
-Release: 1.1
+Release: 1.2
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.6-1.2
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.6-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:23 -0400
Subject: rpms/elinks/devel elinks.spec,1.36,1.37
Message-ID: <200607120544.k6C5iNmp001837@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1812

Modified Files:
	elinks.spec 
Log Message:
bumped for rebuild


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- elinks.spec	12 Jun 2006 21:11:25 -0000	1.36
+++ elinks.spec	12 Jul 2006 05:44:21 -0000	1.37
@@ -2,7 +2,7 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.1
-Release: 4
+Release: 4.1
 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2
 Group: Applications/Internet
 URL: http://elinks.or.cz/
@@ -91,6 +91,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11.1-4.1
+- rebuild
+
 * Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 0.11.1-4
 - improved negotiate-auth patch (faster now)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:31 -0400
Subject: rpms/emacs/devel emacs.spec,1.71,1.72
Message-ID: <200607120544.k6C5iVfR001942@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1919

Modified Files:
	emacs.spec 
Log Message:
bumped for rebuild


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- emacs.spec	13 Jun 2006 18:12:08 -0000	1.71
+++ emacs.spec	12 Jul 2006 05:44:29 -0000	1.72
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 14.1
+Release: 14.1.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -549,6 +549,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 21.4-14.1.1
+- rebuild
+
 * Tue Apr 18 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-14.1
 - don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:39 -0400
Subject: rpms/emacspeak/devel emacspeak.spec,1.14,1.15
Message-ID: <200607120544.k6C5idOX002052@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/emacspeak/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2022

Modified Files:
	emacspeak.spec 
Log Message:
bumped for rebuild


Index: emacspeak.spec
===================================================================
RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- emacspeak.spec	8 Feb 2006 06:15:50 -0000	1.14
+++ emacspeak.spec	12 Jul 2006 05:44:37 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
 Version: %{majver}.0
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Editors
 Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2
@@ -76,6 +76,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 23.0-2.1
+- rebuild
+
 * Wed Feb  8 2006 Jens Petersen <petersen at redhat.com> - 23.0-2
 - tweak tcl scripts to run tclsh and require Tclx instead, since tclx-8.4
   no longer provides %{_bindir}/tcl



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:47 -0400
Subject: rpms/enscript/devel enscript.spec,1.31,1.32
Message-ID: <200607120544.k6C5ilhh002153@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/enscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2129

Modified Files:
	enscript.spec 
Log Message:
bumped for rebuild


Index: enscript.spec
===================================================================
RCS file: /cvs/dist/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- enscript.spec	27 Jun 2006 06:19:40 -0000	1.31
+++ enscript.spec	12 Jul 2006 05:44:45 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
 Version: 1.6.4
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Publishing
 Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.4-3.1
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 1.6.4-3
 - /sbin/install-info is required for scripts
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:44:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:44:55 -0400
Subject: rpms/eog/devel eog.spec,1.53,1.54
Message-ID: <200607120544.k6C5itmd002258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2231

Modified Files:
	eog.spec 
Log Message:
bumped for rebuild


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- eog.spec	13 Jun 2006 04:23:13 -0000	1.53
+++ eog.spec	12 Jul 2006 05:44:53 -0000	1.54
@@ -13,7 +13,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.15.3
-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 
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:45:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:45:03 -0400
Subject: rpms/epic/devel epic.spec,1.20,1.21
Message-ID: <200607120545.k6C5j33i002357@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2330

Modified Files:
	epic.spec 
Log Message:
bumped for rebuild


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- epic.spec	17 May 2006 12:15:00 -0000	1.20
+++ epic.spec	12 Jul 2006 05:45:00 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 4
+Release: 4.1
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -81,6 +81,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-4.1
+- rebuild
+
 * Wed May 17 2006 Karsten Hopp <karsten at redhat.de> 2.2-4
 - add buildrequires openssl-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:45:20 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.100,1.101
Message-ID: <200607120545.k6C5jKIc002512@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2486

Modified Files:
	epiphany.spec 
Log Message:
bumped for rebuild


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- epiphany.spec	17 May 2006 19:42:53 -0000	1.100
+++ epiphany.spec	12 Jul 2006 05:45:18 -0000	1.101
@@ -10,7 +10,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.2
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -157,6 +157,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
+- rebuild
+
 * Wed May 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:45:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:45:36 -0400
Subject: rpms/eruby/devel eruby.spec,1.17,1.18
Message-ID: <200607120545.k6C5jaK4002658@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2627

Modified Files:
	eruby.spec 
Log Message:
bumped for rebuild


Index: eruby.spec
===================================================================
RCS file: /cvs/dist/rpms/eruby/devel/eruby.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- eruby.spec	25 May 2006 22:09:28 -0000	1.17
+++ eruby.spec	12 Jul 2006 05:45:33 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		eruby
 Version:	1.0.5
-Release: 6
+Release: 6.1
 License:	distributable
 URL:		http://www.modruby.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-6.1
+- rebuild
+
 * Thu May 25 2006 Jeremy Katz <katzj at redhat.com> - 1.0.5-6
 - rebuild to pick up -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:45:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:45:52 -0400
Subject: rpms/esound/devel esound.spec,1.28,1.29
Message-ID: <200607120545.k6C5jq93003134@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/esound/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2882

Modified Files:
	esound.spec 
Log Message:
bumped for rebuild


Index: esound.spec
===================================================================
RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- esound.spec	11 Feb 2006 02:40:02 -0000	1.28
+++ esound.spec	12 Jul 2006 05:45:50 -0000	1.29
@@ -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.1
+Release: 2.2.2
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.36-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:46:08 -0400
Subject: rpms/ethtool/devel ethtool.spec,1.15,1.16
Message-ID: <200607120546.k6C5k8re005004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ethtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4846

Modified Files:
	ethtool.spec 
Log Message:
bumped for rebuild


Index: ethtool.spec
===================================================================
RCS file: /cvs/dist/rpms/ethtool/devel/ethtool.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ethtool.spec	11 Feb 2006 02:40:30 -0000	1.15
+++ ethtool.spec	12 Jul 2006 05:46:05 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Ethernet settings tool for PCI ethernet cards
 Name: ethtool
 Version: 3
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
@@ -39,6 +39,9 @@
 %{_mandir}/man8/ethtool.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:46:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:46:31 -0400
Subject: rpms/evolution/devel evolution.spec,1.162,1.163
Message-ID: <200607120546.k6C5kVwi007041@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution.spec 
Log Message:
bumped for rebuild


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- evolution.spec	11 Jul 2006 15:12:03 -0000	1.162
+++ evolution.spec	12 Jul 2006 05:46:29 -0000	1.163
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.3
-Release: 10
+Release: 10.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -686,6 +686,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-10.1
+- rebuild
+
 * Tue Jul 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.3-10
 - Update patch for RH bug #190359.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:46:43 -0400
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.66,1.67
Message-ID: <200607120546.k6C5khsp007865@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-connector.spec 
Log Message:
bumped for rebuild


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- evolution-connector.spec	15 Jun 2006 01:49:35 -0000	1.66
+++ evolution-connector.spec	12 Jul 2006 05:46:41 -0000	1.67
@@ -18,7 +18,7 @@
 
 Name: evolution-connector
 Version: 2.7.3
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -134,6 +134,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-2.1
+- rebuild
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-2
 - Rebuild 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:46:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:46:55 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.99,
	1.100
Message-ID: <200607120546.k6C5ktlS009183@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-data-server.spec 
Log Message:
bumped for rebuild


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- evolution-data-server.spec	27 Jun 2006 19:53:27 -0000	1.99
+++ evolution-data-server.spec	12 Jul 2006 05:46:52 -0000	1.100
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.7.3
-Release: 3
+Release: 3.1
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -328,6 +328,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-3.1
+- rebuild
+
 * Tue Jun 27 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.3-3
 - Show GPG key name when asking for the password (Gnome.org #345965).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:04 -0400
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.19,1.20
Message-ID: <200607120547.k6C5l4Ux010559@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-sharp.spec 
Log Message:
bumped for rebuild


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- evolution-sharp.spec	21 Jun 2006 18:38:45 -0000	1.19
+++ evolution-sharp.spec	12 Jul 2006 05:47:02 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           evolution-sharp
 Version:        0.11.1
-Release:        5
+Release:        5.1
 License:        LGPL
 Group:          System Environment/Libraries
 Summary:        Evolution Data Server Mono Bindings
@@ -69,6 +69,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11.1-5.1
+- rebuild
+
 * Wed Jun 21 2006 Matthew Barnes <mbarnes at redhat.com> 0.11.1-5
 - Mono no longer available on s390 and s390x.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:14 -0400
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.26,1.27
Message-ID: <200607120547.k6C5lEhD011418@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-webcal.spec 
Log Message:
bumped for rebuild


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- evolution-webcal.spec	15 Jun 2006 00:01:18 -0000	1.26
+++ evolution-webcal.spec	12 Jul 2006 05:47:11 -0000	1.27
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.7.1
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.1-4.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.7.1-4
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:25 -0400
Subject: rpms/expat/devel expat.spec,1.22,1.23
Message-ID: <200607120547.k6C5lPgQ012033@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/expat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11865

Modified Files:
	expat.spec 
Log Message:
bumped for rebuild


Index: expat.spec
===================================================================
RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- expat.spec	11 Feb 2006 02:41:58 -0000	1.22
+++ expat.spec	12 Jul 2006 05:47:22 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A library for parsing XML.
 Name: expat
 Version: 1.95.8
-Release: 8.2
+Release: 8.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.95.8-8.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.95.8-8.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:34 -0400
Subject: rpms/expect/devel expect.spec,1.15,1.16
Message-ID: <200607120547.k6C5lYJU012992@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	expect.spec 
Log Message:
bumped for rebuild


Index: expect.spec
===================================================================
RCS file: /cvs/dist/rpms/expect/devel/expect.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- expect.spec	15 May 2006 16:15:06 -0000	1.15
+++ expect.spec	12 Jul 2006 05:47:32 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}.0
-Release: 5
+Release: 5.1
 License: Public Domain
 Group: Development/Languages
 URL: http://expect.nist.gov/
@@ -153,6 +153,9 @@
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.43.0-5.1
+- rebuild
+
 * Mon May 15 2006 David Cantrell <dcantrell at redhat.com> - 5.43.0-5
 - BuildRequires libX11-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:44 -0400
Subject: rpms/fbset/devel fbset.spec,1.17,1.18
Message-ID: <200607120547.k6C5liN0013831@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fbset/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13688

Modified Files:
	fbset.spec 
Log Message:
bumped for rebuild


Index: fbset.spec
===================================================================
RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fbset.spec	29 May 2006 08:59:27 -0000	1.17
+++ fbset.spec	12 Jul 2006 05:47:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Tools for managing a frame buffer's video mode properties.
 Name: fbset
 Version: 2.1
-Release: 21
+Release: 21.1
 License: GPL
 Group: Applications/System
 URL: http://home.tvd.be/cr26864/Linux/fbdev/
@@ -42,6 +42,9 @@
 %config	%{_sysconfdir}/fb.modes
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1-21.1
+- rebuild
+
 * Mon May 29 2006 Jindrich Novy <jnovy at redhat.com> 2.1-21
 - add BuildRequires: bison (#193362)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:47:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:47:55 -0400
Subject: rpms/festival/devel festival.spec,1.22,1.23
Message-ID: <200607120547.k6C5lt2r014671@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/festival/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14565

Modified Files:
	festival.spec 
Log Message:
bumped for rebuild


Index: festival.spec
===================================================================
RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- festival.spec	11 Feb 2006 02:42:45 -0000	1.22
+++ festival.spec	12 Jul 2006 05:47:52 -0000	1.23
@@ -1,7 +1,7 @@
 Name: festival
 Summary: A free speech synthesizer
 Version: 1.95
-Release: 5.2
+Release: 5.2.1
 
 # we ship the 1.4.2 docs for now.
 %define docversion 1.4.2
@@ -292,6 +292,9 @@
 %{_includedir}/festival/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.95-5.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.95-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:48:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:48:05 -0400
Subject: rpms/fetchmail/devel fetchmail.spec,1.44,1.45
Message-ID: <200607120548.k6C5m5hu015802@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15660

Modified Files:
	fetchmail.spec 
Log Message:
bumped for rebuild


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- fetchmail.spec	1 May 2006 00:37:33 -0000	1.44
+++ fetchmail.spec	12 Jul 2006 05:48:03 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.4
-Release: 1
+Release: 1.1
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -83,6 +83,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.3.4-1.1
+- rebuild
+
 * Mon May  1 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.4-1
 - Update to fetchmail-6.3.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:48:20 -0400
Subject: rpms/file/devel file.spec,1.51,1.52
Message-ID: <200607120548.k6C5mKRd018472@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17625

Modified Files:
	file.spec 
Log Message:
bumped for rebuild


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- file.spec	10 Jul 2006 09:11:22 -0000	1.51
+++ file.spec	12 Jul 2006 05:48:18 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.17
-Release: 5
+Release: 5.1
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -93,6 +93,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.17-5.1
+- rebuild
+
 * Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 4.17-5
 - fix powerpoint mine (#190373) <vonsch at gmail.com>
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:48:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:48:37 -0400
Subject: rpms/file-roller/devel file-roller.spec,1.63,1.64
Message-ID: <200607120548.k6C5mb4S019107@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19084

Modified Files:
	file-roller.spec 
Log Message:
bumped for rebuild


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- file-roller.spec	9 Jun 2006 03:47:54 -0000	1.63
+++ file-roller.spec	12 Jul 2006 05:48:35 -0000	1.64
@@ -11,7 +11,7 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.14.3
-Release: 	4
+Release: 	4.1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -120,6 +120,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.3-4.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-4 
 - Add more BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:48:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:48:47 -0400
Subject: rpms/filesystem/devel filesystem.spec,1.28,1.29
Message-ID: <200607120548.k6C5ml7b019228@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19199

Modified Files:
	filesystem.spec 
Log Message:
bumped for rebuild


Index: filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- filesystem.spec	28 Jun 2006 11:11:40 -0000	1.28
+++ filesystem.spec	12 Jul 2006 05:48:45 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
 Version: 2.3.7
-Release: 2
+Release: 2.1
 License: Public Domain
 Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -95,6 +95,9 @@
 /var/yp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.7-2.1
+- rebuild
+
 * Wed Jun 28 2006 Phil Knirsch <pknirsch at redhat.com> - 2.3.7-2
 - Fixed games location according to FHS 2.1 (#165425)
 - Added {_libdir}/sse2 to owned files (#192853)



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:48:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:48:54 -0400
Subject: rpms/findutils/devel findutils.spec,1.46,1.47
Message-ID: <200607120548.k6C5msn2019326@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/findutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19297

Modified Files:
	findutils.spec 
Log Message:
bumped for rebuild


Index: findutils.spec
===================================================================
RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- findutils.spec	19 Feb 2006 09:33:31 -0000	1.46
+++ findutils.spec	12 Jul 2006 05:48:52 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs).
 Name: findutils
 Version: 4.2.27
-Release: 4
+Release: 4.1
 Epoch: 1
 License: GPL
 Group: Applications/File
@@ -73,6 +73,9 @@
 %{_infodir}/find.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:4.2.27-4.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:05 -0400
Subject: rpms/flac/devel flac.spec,1.20,1.21
Message-ID: <200607120549.k6C5n5Fw019494@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19440

Modified Files:
	flac.spec 
Log Message:
bumped for rebuild


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- flac.spec	7 Jun 2006 21:45:10 -0000	1.20
+++ flac.spec	12 Jul 2006 05:49:03 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
 Version: 1.1.2
-Release: 26
+Release: 26.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-26.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.1.2-26
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:12 -0400
Subject: rpms/flex/devel flex.spec,1.27,1.28
Message-ID: <200607120549.k6C5nCHW019589@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19566

Modified Files:
	flex.spec 
Log Message:
bumped for rebuild


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- flex.spec	10 Mar 2006 10:45:12 -0000	1.27
+++ flex.spec	12 Jul 2006 05:49:10 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 38
+Release: 38.1
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -84,6 +84,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4a-38.1
+- rebuild
+
 * Fri Mar 10 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-38
 - Caught the real cause of #183098.  It failed because the parser
   built with `flex -f' *sometimes* made it into the final package, and



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:22 -0400
Subject: rpms/fonts-arabic/devel fonts-arabic.spec,1.11,1.12
Message-ID: <200607120549.k6C5nMnK019743@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-arabic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19716

Modified Files:
	fonts-arabic.spec 
Log Message:
bumped for rebuild


Index: fonts-arabic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fonts-arabic.spec	12 Jul 2006 05:42:59 -0000	1.11
+++ fonts-arabic.spec	12 Jul 2006 05:49:20 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name: fonts-arabic
 Version: 2.0
-Release: 1
+Release: 1.1
 License: GPL
 Source0: %{kacst}.tar.gz
 Source1: %{paktype}.tar.bz2
@@ -52,6 +52,9 @@
 %{_datadir}/fonts/arabic/*.ttf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul 12 2006 Leon Ho <llch at redhat.com> - 2.0-1
 - Added PakType fonts
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:30 -0400
Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.20,1.21
Message-ID: <200607120549.k6C5nUj6019852@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19816

Modified Files:
	fonts-chinese.spec 
Log Message:
bumped for rebuild


Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fonts-chinese.spec	9 Dec 2005 22:40:27 -0000	1.20
+++ fonts-chinese.spec	12 Jul 2006 05:49:27 -0000	1.21
@@ -10,7 +10,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release: 4.1
+Release: 4.1.1
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -137,6 +137,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.02-4.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:37 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.15,1.16
Message-ID: <200607120549.k6C5nbxu019959@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19841

Modified Files:
	nautilus-sendto.spec 
Log Message:
fix file lists



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nautilus-sendto.spec	12 Jul 2006 04:26:01 -0000	1.15
+++ nautilus-sendto.spec	12 Jul 2006 05:49:34 -0000	1.16
@@ -64,19 +64,19 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-sendto.so
 %dir %{_libdir}/nautilus-sendto
 %dir %{_libdir}/nautilus-sendto/plugins
-%{_libdir}/nautilus-sendto/plugins/libevolution.so
+%{_libdir}/nautilus-sendto/plugins/libnstevolution.so
 %{_datadir}/nautilus-sendto
 %{_bindir}/nautilus-sendto
 # We put gaim in the main package, because its small, has
 # no dependencies and isn't activated unless you use gaim
 %{_libdir}/gaim/nautilus.so
-%{_libdir}/nautilus-sendto/plugins/libgaim.so
+%{_libdir}/nautilus-sendto/plugins/libnstgaim.so
 
 
 %ifnarch s390 s390x
 %files bluetooth
 %defattr(-,root,root,-)
-%{_libdir}/nautilus-sendto/plugins/libbluetooth.so
+%{_libdir}/nautilus-sendto/plugins/libnstbluetooth.so
 %endif
 
 %changelog



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:38 -0400
Subject: rpms/fonts-hebrew/devel fonts-hebrew.spec,1.5,1.6
Message-ID: <200607120549.k6C5nc5Q019972@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-hebrew/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19940

Modified Files:
	fonts-hebrew.spec 
Log Message:
bumped for rebuild


Index: fonts-hebrew.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-hebrew/devel/fonts-hebrew.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fonts-hebrew.spec	9 Dec 2005 22:40:27 -0000	1.5
+++ fonts-hebrew.spec	12 Jul 2006 05:49:35 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: fonts-hebrew
 Version: 0.100
-Release: 4.1
+Release: 4.1.1
 License: GPL
 Source: culmus-%{culmus_version}.tar.gz
 Source1: LICENSE-BITSTREAM
@@ -50,6 +50,9 @@
 %ghost %verify(not md5 size mtime) %{_datadir}/fonts/hebrew/fonts.cache-1
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.100-4.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:47 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.6,1.7
Message-ID: <200607120549.k6C5nlUf020079@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-indic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20048

Modified Files:
	fonts-indic.spec 
Log Message:
bumped for rebuild


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fonts-indic.spec	9 Dec 2005 22:40:27 -0000	1.6
+++ fonts-indic.spec	12 Jul 2006 05:49:44 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:		fonts-indic
 Version:	1.10
-Release: 2.1
+Release: 2.1.1
 License:	GPL
 Group:		User Interface/X
 BuildArch:	noarch
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-2.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:49:56 -0400
Subject: rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.12,1.13
Message-ID: <200607120549.k6C5nuhF020215@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-ISO8859-2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20192

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
bumped for rebuild


Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fonts-ISO8859-2.spec	21 Feb 2006 11:24:35 -0000	1.12
+++ fonts-ISO8859-2.spec	12 Jul 2006 05:49:53 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 17
+Release: 17.1
 License: Freely distributable
 Source: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
 %if %{include_ulT1mo}
@@ -187,6 +187,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-17.1
+- rebuild
+
 * Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 1.0-17
 - BuildRequire xorg-x11-font-utils
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:50:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:50:06 -0400
Subject: rpms/fonts-japanese/devel fonts-japanese.spec,1.15,1.16
Message-ID: <200607120550.k6C5o6qZ020331@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-japanese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20307

Modified Files:
	fonts-japanese.spec 
Log Message:
bumped for rebuild


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fonts-japanese.spec	9 Dec 2005 22:40:28 -0000	1.15
+++ fonts-japanese.spec	12 Jul 2006 05:50:04 -0000	1.16
@@ -23,7 +23,7 @@
 
 Name:		fonts-japanese
 Version:	0.20050222
-Release: 11.1
+Release: 11.1.1
 License:	Distributable
 Group:		User Interface/X
 BuildArch:	noarch
@@ -389,6 +389,9 @@
 %{cidmapdir}/cidfmap.ja
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.20050222-11.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:50:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:50:22 -0400
Subject: rpms/fonts-KOI8-R/devel fonts-KOI8-R.spec,1.9,1.10
Message-ID: <200607120550.k6C5oMEb020479@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-KOI8-R/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20455

Modified Files:
	fonts-KOI8-R.spec 
Log Message:
bumped for rebuild


Index: fonts-KOI8-R.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-KOI8-R/devel/fonts-KOI8-R.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fonts-KOI8-R.spec	9 Dec 2005 22:40:27 -0000	1.9
+++ fonts-KOI8-R.spec	12 Jul 2006 05:50:19 -0000	1.10
@@ -1,7 +1,7 @@
 %define ISONAME KOI8-R
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 9.1
+Release: 9.1.1
 License: distributable
 #URL: <none yet>
 Source: http://www.inp.nsk.su/~bolkhov/files/fonts/cyr_rfx/srctgz/cyr-rfx-koi8-ub-1.1.bdfs.tar.bz2
@@ -127,6 +127,9 @@
 /usr/share/fonts/%{ISONAME}/100dpi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-9.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:50:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:50:42 -0400
Subject: rpms/fonts-korean/devel fonts-korean.spec,1.12,1.13
Message-ID: <200607120550.k6C5og7O020659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fonts-korean/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20625

Modified Files:
	fonts-korean.spec 
Log Message:
bumped for rebuild


Index: fonts-korean.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-korean/devel/fonts-korean.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fonts-korean.spec	9 Dec 2005 22:40:28 -0000	1.12
+++ fonts-korean.spec	12 Jul 2006 05:50:39 -0000	1.13
@@ -7,7 +7,7 @@
 
 Name:		fonts-korean
 Version:	1.0.11
-Release: 9.1
+Release: 9.1.1
 License:	Distributable
 Group:		User Interface/X
 BuildArch:	noarch
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-9.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:51:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:51:07 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.137,1.138
Message-ID: <200607120551.k6C5p7pG020820@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20804

Modified Files:
	foomatic.spec 
Log Message:
bumped for rebuild


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- foomatic.spec	22 May 2006 10:58:22 -0000	1.137
+++ foomatic.spec	12 Jul 2006 05:51:04 -0000	1.138
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    36
+Release:    36.1
 License:	GPL
 Group: System Environment/Libraries
 
@@ -273,6 +273,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-36.1
+- rebuild
+
 * Mon May 22 2006 Karsten Hopp <karsten at redhat.de> 3.0.2-36
 - add buildrequires ghostscript-devel so that /usr/lib/cups/driver/foomatic
   gets built



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:51:32 -0400
Subject: rpms/freeglut/devel freeglut.spec,1.18,1.19
Message-ID: <200607120551.k6C5pWMn021007@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	freeglut.spec 
Log Message:
bumped for rebuild


Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freeglut.spec	19 May 2006 12:54:53 -0000	1.18
+++ freeglut.spec	12 Jul 2006 05:51:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   5
+Release:   5.1
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -90,6 +90,9 @@
 %{_libdir}/libglut.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-5.1
+- rebuild
+
 * Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-5
 - Added "BuildRequires: libXext-devel, libXxf86vm-devel" for (#192255)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:51:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:51:46 -0400
Subject: rpms/freeradius/devel freeradius.spec,1.32,1.33
Message-ID: <200607120551.k6C5pkTD021144@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	freeradius.spec 
Log Message:
bumped for rebuild


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- freeradius.spec	1 Jun 2006 16:18:39 -0000	1.32
+++ freeradius.spec	12 Jul 2006 05:51:44 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
 Version: 1.1.2
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -277,6 +277,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-1.1
+- rebuild
+
 * Thu Jun  1 2006 Thomas Woerner <twoerner at redhat.com> 1.1.2-1
 - new version 1.1.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:51:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:51:58 -0400
Subject: rpms/freetype/devel freetype.spec,1.32,1.33
Message-ID: <200607120551.k6C5pwHm021283@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21250

Modified Files:
	freetype.spec 
Log Message:
bumped for rebuild


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- freetype.spec	8 Jul 2006 02:10:31 -0000	1.32
+++ freetype.spec	12 Jul 2006 05:51:56 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine.
 Name: freetype
 Version: 2.2.1
-Release: 2
+Release: 2.1
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -161,6 +161,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-2.1
+- rebuild
+
 * Fri Jul 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-2
 - Remove unused BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:06 -0400
Subject: rpms/fribidi/devel fribidi.spec,1.14,1.15
Message-ID: <200607120552.k6C5q6hw021387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fribidi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21354

Modified Files:
	fribidi.spec 
Log Message:
bumped for rebuild


Index: fribidi.spec
===================================================================
RCS file: /cvs/dist/rpms/fribidi/devel/fribidi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fribidi.spec	29 Jun 2006 13:41:19 -0000	1.14
+++ fribidi.spec	12 Jul 2006 05:52:04 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.10.7
-Release: 5
+Release: 5.1
 URL: http://fribidi.org
 Source0: %{name}-%{version}.tar.gz
 Patch0: fribidi-0.10.7-multiarchdevel.patch
@@ -64,6 +64,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10.7-5.1
+- rebuild
+
 * Thu Jun 29 2006 Caolan McNamara <caolanm at redhat.com> 0.10.7-5
 - rh#197223# devel Require pkg-config
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:12 -0400
Subject: rpms/frysk/devel frysk.spec,1.66,1.67
Message-ID: <200607120552.k6C5qCK7021481@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21454

Modified Files:
	frysk.spec 
Log Message:
bumped for rebuild


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- frysk.spec	28 Jun 2006 19:41:05 -0000	1.66
+++ frysk.spec	12 Jul 2006 05:52:10 -0000	1.67
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.06.28.rh1
-Release:	0
+Release:	0.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -98,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.06.28.rh1-0.1
+- rebuild
+
 * Wed Jun 28 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1-1
 - Remove  BuildRequires:  autoconf automake
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:20 -0400
Subject: rpms/f-spot/devel f-spot.spec,1.23,1.24
Message-ID: <200607120552.k6C5qKkJ021588@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	f-spot.spec 
Log Message:
bumped for rebuild


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- f-spot.spec	25 Jun 2006 03:56:51 -0000	1.23
+++ f-spot.spec	12 Jul 2006 05:52:18 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.11
-Release:        3
+Release:        3.1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -68,6 +68,9 @@
 %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.1.11-3
 - Add missing BR gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:27 -0400
Subject: rpms/ftp/devel ftp.spec,1.26,1.27
Message-ID: <200607120552.k6C5qR5e021691@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21664

Modified Files:
	ftp.spec 
Log Message:
bumped for rebuild


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ftp.spec	11 Feb 2006 02:46:57 -0000	1.26
+++ ftp.spec	12 Jul 2006 05:52:25 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2
+Release: 32.1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:36 -0400
Subject: rpms/gail/devel gail.spec,1.44,1.45
Message-ID: <200607120552.k6C5qaJM021796@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21773

Modified Files:
	gail.spec 
Log Message:
bumped for rebuild


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gail.spec	9 Jun 2006 04:08:30 -0000	1.44
+++ gail.spec	12 Jul 2006 05:52:34 -0000	1.45
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.11
-Release: 3
+Release: 3.1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -78,6 +78,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.11-3.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.11-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:47 -0400
Subject: rpms/gaim/devel gaim.spec,1.127,1.128
Message-ID: <200607120552.k6C5qlfV021917@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21893

Modified Files:
	gaim.spec 
Log Message:
bumped for rebuild


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gaim.spec	5 Jul 2006 23:09:58 -0000	1.127
+++ gaim.spec	12 Jul 2006 05:52:44 -0000	1.128
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.6.%{betaver}%{?dist}
+Release:	0.6.%{betaver}.1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -289,6 +289,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.0.0-0.6.beta3.1
+- rebuild
+
 * Wed Jul 05 2006 Warren Togami <wtogami at redhat.com> 2.0.0-0.6.beta3
 - SILC blank realname failure fix (#173076)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:52:55 -0400
Subject: rpms/gamin/devel gamin.spec,1.45,1.46
Message-ID: <200607120552.k6C5qtQh022025@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21994

Modified Files:
	gamin.spec 
Log Message:
bumped for rebuild


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gamin.spec	11 Feb 2006 02:47:47 -0000	1.45
+++ gamin.spec	12 Jul 2006 05:52:52 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 1.2.1
+Release: 1.2.2
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.7-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:53:05 -0400
Subject: rpms/gawk/devel gawk.spec,1.40,1.41
Message-ID: <200607120553.k6C5r5tO022135@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22107

Modified Files:
	gawk.spec 
Log Message:
bumped for rebuild


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gawk.spec	10 Jul 2006 07:47:49 -0000	1.40
+++ gawk.spec	12 Jul 2006 05:53:02 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 9
+Release: 9.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -93,6 +93,9 @@
 %{_datadir}/awk
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-9.1
+- rebuild
+
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-9
 - fix numeric conversion problem (patch by Aharon Robbins)
   http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:53:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:53:15 -0400
Subject: rpms/gcalctool/devel gcalctool.spec,1.17,1.18
Message-ID: <200607120553.k6C5rFU0022249@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22218

Modified Files:
	gcalctool.spec 
Log Message:
bumped for rebuild


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gcalctool.spec	13 Jun 2006 03:19:21 -0000	1.17
+++ gcalctool.spec	12 Jul 2006 05:53:12 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           gcalctool
 Version:        5.8.16
-Release:        2
+Release:        2.1
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> 5.8.16-2
 - Update to 5.8.16
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:53:24 -0400
Subject: rpms/GConf2/devel GConf2.spec,1.41,1.42
Message-ID: <200607120553.k6C5rOC9022352@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	GConf2.spec 
Log Message:
bumped for rebuild


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- GConf2.spec	6 Jun 2006 19:27:50 -0000	1.41
+++ GConf2.spec	12 Jul 2006 05:53:22 -0000	1.42
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.14.0
-Release: 2
+Release: 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1
+- rebuild
+
 * Tue Jun  6 2006 Adam Jackson <ajackson at redhat.com> 2.14.0-2
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:53:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:53:34 -0400
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.34,1.35
Message-ID: <200607120553.k6C5rYMM022459@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22428

Modified Files:
	gconf-editor.spec 
Log Message:
bumped for rebuild


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gconf-editor.spec	9 Jun 2006 22:13:37 -0000	1.34
+++ gconf-editor.spec	12 Jul 2006 05:53:32 -0000	1.35
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.14.0
-Release: 4
+Release: 4.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -98,6 +98,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-4
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:53:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:53:45 -0400
Subject: rpms/gd/devel gd.spec,1.33,1.34
Message-ID: <200607120553.k6C5rjFr022571@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22542

Modified Files:
	gd.spec 
Log Message:
bumped for rebuild


Index: gd.spec
===================================================================
RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gd.spec	10 Jul 2006 13:18:54 -0000	1.33
+++ gd.spec	12 Jul 2006 05:53:43 -0000	1.34
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.33
-Release:       9
+Release:       9.1
 Group:         System Environment/Libraries
 License:       BSD-style
 URL:           http://www.boutell.com/gd/
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Jitka Kudrnacova <jkudrnac at redhat.com> 2.0.33-9
 - prevent from an infinite loop when decoding bad GIF images (#194520)
  



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:00 -0400
Subject: rpms/gdbm/devel gdbm.spec,1.19,1.20
Message-ID: <200607120554.k6C5s0LT022740@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22715

Modified Files:
	gdbm.spec 
Log Message:
bumped for rebuild


Index: gdbm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdbm/devel/gdbm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gdbm.spec	11 Feb 2006 02:50:40 -0000	1.19
+++ gdbm.spec	12 Jul 2006 05:53:58 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A GNU set of database routines which use extensible hashing.
 Name: gdbm
 Version: 1.8.0
-Release: 26.2
+Release: 26.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:07 -0400
Subject: rpms/gdm/devel gdm.spec,1.169,1.170
Message-ID: <200607120554.k6C5s7or022841@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22813

Modified Files:
	gdm.spec 
Log Message:
bumped for rebuild


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gdm.spec	12 Jul 2006 05:12:45 -0000	1.169
+++ gdm.spec	12 Jul 2006 05:54:05 -0000	1.170
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.5
-Release: 3
+Release: 3.1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -322,6 +322,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.5-3.1
+- rebuild
+
 * Tue Jul 11 2006 Ray Strode <rstrode at redhat.com> 1:2.15.5-3
 - add initial support for smart card security tokens
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:17 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.14,1.15
Message-ID: <200607120554.k6C5sHUN022947@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gecko-sharp2.spec 
Log Message:
bumped for rebuild


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gecko-sharp2.spec	25 Jun 2006 03:04:41 -0000	1.14
+++ gecko-sharp2.spec	12 Jul 2006 05:54:14 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        8
+Release:        8.1
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.11-8
 - BuildRequires: mono-devel, gtk-sharp2-gapi
 - Diable s390 as well



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:25 -0400
Subject: rpms/gedit/devel gedit.spec,1.88,1.89
Message-ID: <200607120554.k6C5sPrJ023056@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23031

Modified Files:
	gedit.spec 
Log Message:
bumped for rebuild


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gedit.spec	14 Jun 2006 12:54:36 -0000	1.88
+++ gedit.spec	12 Jul 2006 05:54:23 -0000	1.89
@@ -17,7 +17,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.15.3
-Release: 	1	
+Release: 	1.1	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -183,6 +183,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:34 -0400
Subject: rpms/genromfs/devel genromfs.spec,1.15,1.16
Message-ID: <200607120554.k6C5sYLB023173@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/genromfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23142

Modified Files:
	genromfs.spec 
Log Message:
bumped for rebuild


Index: genromfs.spec
===================================================================
RCS file: /cvs/dist/rpms/genromfs/devel/genromfs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- genromfs.spec	11 Feb 2006 03:02:06 -0000	1.15
+++ genromfs.spec	12 Jul 2006 05:54:32 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utility for creating romfs filesystems.
 Name: genromfs
 Version: 0.5.1
-Release: 3.2.1
+Release: 3.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:41 -0400
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.15,1.16
Message-ID: <200607120554.k6C5sfo4023265@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23235

Modified Files:
	geronimo-specs.spec 
Log Message:
bumped for rebuild


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- geronimo-specs.spec	8 Mar 2006 21:34:17 -0000	1.15
+++ geronimo-specs.spec	12 Jul 2006 05:54:38 -0000	1.16
@@ -2,7 +2,7 @@
 %define name            geronimo-specs
 %define version         1.0
 %define mstone		M2
-%define release 	0.%{mstone}.2jpp_8fc
+%define release 	0.%{mstone}.2jpp_9fc
 %define section         free
 
 Summary:        Geronimo J2EE server J2EE specifications
@@ -123,6 +123,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.M2.2jpp_9fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.0-0.%{mstone}.2jpp_8fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:48 -0400
Subject: rpms/gettext/devel gettext.spec,1.52,1.53
Message-ID: <200607120554.k6C5sm8g023363@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23335

Modified Files:
	gettext.spec 
Log Message:
bumped for rebuild


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gettext.spec	22 Feb 2006 10:07:50 -0000	1.52
+++ gettext.spec	12 Jul 2006 05:54:45 -0000	1.53
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.5
-Release: 3
+Release: 3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-3.1
+- rebuild
+
 * 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.



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:54:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:54:55 -0400
Subject: rpms/gfs2-utils/devel gfs2-utils.spec,1.3,1.4
Message-ID: <200607120554.k6C5stPm023466@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gfs2-utils.spec 
Log Message:
bumped for rebuild


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gfs2-utils.spec	27 Jun 2006 13:35:40 -0000	1.3
+++ gfs2-utils.spec	12 Jul 2006 05:54:53 -0000	1.4
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 0.1.0
-Release: 1.fc6.5
+Release: 1.fc6.5.1
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -77,6 +77,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com>
 - fix typo in preun script
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:02 -0400
Subject: rpms/gftp/devel gftp.spec,1.20,1.21
Message-ID: <200607120555.k6C5t2N2023558@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23533

Modified Files:
	gftp.spec 
Log Message:
bumped for rebuild


Index: gftp.spec
===================================================================
RCS file: /cvs/dist/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gftp.spec	11 Feb 2006 03:05:36 -0000	1.20
+++ gftp.spec	12 Jul 2006 05:54:59 -0000	1.21
@@ -2,7 +2,7 @@
 Name: gftp
 Version: 2.0.18
 Epoch: 1
-Release: 3.2.1
+Release: 3.2.2
 License: GPL
 Group: Applications/Internet
 Url: http://gftp.seul.org/
@@ -73,6 +73,9 @@
 %{_mandir}/man*/gftp.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.18-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:09 -0400
Subject: rpms/ghostscript/devel ghostscript.spec,1.121,1.122
Message-ID: <200607120555.k6C5t9Cq023693@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23638

Modified Files:
	ghostscript.spec 
Log Message:
bumped for rebuild


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ghostscript.spec	23 Jun 2006 10:28:43 -0000	1.121
+++ ghostscript.spec	12 Jul 2006 05:55:07 -0000	1.122
@@ -5,7 +5,7 @@
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 8
+Release: 8.1
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -260,6 +260,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.15.2-8.1
+- rebuild
+
 * Fri Jun 23 2006 Tim Waugh <twaugh at redhat.com> 8.15.2-8
 - Revert CJKV patch.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:13 -0400
Subject: rpms/ghostscript-fonts/devel ghostscript-fonts.spec,1.9,1.10
Message-ID: <200607120555.k6C5tDwH023740@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ghostscript-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23717

Modified Files:
	ghostscript-fonts.spec 
Log Message:
bumped for rebuild


Index: ghostscript-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript-fonts/devel/ghostscript-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ghostscript-fonts.spec	9 Dec 2005 22:40:33 -0000	1.9
+++ ghostscript-fonts.spec	12 Jul 2006 05:55:11 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Fonts for the Ghostscript PostScript(TM) interpreter.
 Name: ghostscript-fonts
 Version: 5.50
-Release: 13.1
+Release: 13.1.1
 License: GPL
 Group: Applications/Publishing
 BuildRoot: /var/tmp/gsfonts-root
@@ -36,6 +36,9 @@
 /usr/share/fonts/default
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.50-13.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:22 -0400
Subject: rpms/giflib/devel giflib.spec,1.6,1.7
Message-ID: <200607120555.k6C5tM05023856@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/giflib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23831

Modified Files:
	giflib.spec 
Log Message:
bumped for rebuild


Index: giflib.spec
===================================================================
RCS file: /cvs/dist/rpms/giflib/devel/giflib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- giflib.spec	22 May 2006 12:34:19 -0000	1.6
+++ giflib.spec	12 Jul 2006 05:55:20 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Library for manipulating GIF format image files
 Name: giflib
 Version: 4.1.3
-Release: 7
+Release: 7.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon May 22 2006 Karsten Hopp <karsten at redhat.de> 4.1.3-7
 - buildrequires libICE-devel, libSM-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:30 -0400
Subject: rpms/gimp/devel gimp.spec,1.103,1.104
Message-ID: <200607120555.k6C5tUPL023954@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23930

Modified Files:
	gimp.spec 
Log Message:
bumped for rebuild


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- gimp.spec	10 Jul 2006 11:35:03 -0000	1.103
+++ gimp.spec	12 Jul 2006 05:55:27 -0000	1.104
@@ -37,7 +37,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}1%{?dist}
+Release: %{?prever:0.0.%{prever}.}1.1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -392,6 +392,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.12-1.1
+- rebuild
+
 * Mon Jul 10 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
 - version 2.2.12
 - use %%dist/%%fedora/%%redhat



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:39 -0400
Subject: rpms/gimp-data-extras/devel gimp-data-extras.spec,1.14,1.15
Message-ID: <200607120555.k6C5tdaE024059@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp-data-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24037

Modified Files:
	gimp-data-extras.spec 
Log Message:
bumped for rebuild


Index: gimp-data-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-data-extras/devel/gimp-data-extras.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gimp-data-extras.spec	9 Dec 2005 22:40:34 -0000	1.14
+++ gimp-data-extras.spec	12 Jul 2006 05:55:36 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Extra files for the GIMP.
 Name: gimp-data-extras
 Version: 2.0.1
-Release: 1.1
+Release: 1.1.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gimp.org/
@@ -33,6 +33,9 @@
 %{_datadir}/gimp/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.1-1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:47 -0400
Subject: rpms/gimp-help/devel gimp-help.spec,1.9,1.10
Message-ID: <200607120555.k6C5tl7d024169@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp-help/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24145

Modified Files:
	gimp-help.spec 
Log Message:
bumped for rebuild


Index: gimp-help.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-help/devel/gimp-help.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gimp-help.spec	24 Apr 2006 10:14:51 -0000	1.9
+++ gimp-help.spec	12 Jul 2006 05:55:45 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Help files for the GIMP.
 Name: gimp-help
 Version: %(echo %gimphelpver|cut -d- -f1)
-Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1
+Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1.1
 License: GNU FDL
 Group: Applications/Multimedia
 URL: http://wiki.gimp.org/gimp/GimpDocs
@@ -40,6 +40,9 @@
 %{_datadir}/gimp/%{gimpsubver}/help
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2-0.1.0.10.1.1
+- rebuild
+
 * Mon Apr 24 2006 Nils Philippsen <nphilipp at redhat.com>
 - version 2-0.10
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:55:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:55:56 -0400
Subject: rpms/gimp-print/devel gimp-print.spec,1.40,1.41
Message-ID: <200607120555.k6C5tu3A024279@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24249

Modified Files:
	gimp-print.spec 
Log Message:
bumped for rebuild


Index: gimp-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gimp-print.spec	14 Jun 2006 19:45:24 -0000	1.40
+++ gimp-print.spec	12 Jul 2006 05:55:53 -0000	1.41
@@ -7,7 +7,7 @@
 Summary: A collection of high-quality printer drivers.
 Name: gimp-print
 Version: 4.2.7
-Release: 20
+Release: 20.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://gimp-print.sourceforge.net/
@@ -196,6 +196,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.7-20.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.2.7-20
 - rebuilt with new gnutls
 - dropped the openssl-devel buildrequires as gnutls linkage is pulled



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:56:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:56:17 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.34,1.35
Message-ID: <200607120556.k6C5uHDN024465@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gjdoc.spec 
Log Message:
bumped for rebuild


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gjdoc.spec	11 Feb 2006 03:09:05 -0000	1.34
+++ gjdoc.spec	12 Jul 2006 05:56:15 -0000	1.35
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 3.1
+Release: 3.2
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -51,6 +51,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-3.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:56:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:56:31 -0400
Subject: rpms/glade2/devel glade2.spec,1.24,1.25
Message-ID: <200607120556.k6C5uVEY024621@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glade2.spec 
Log Message:
bumped for rebuild


Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- glade2.spec	9 Jun 2006 13:39:59 -0000	1.24
+++ glade2.spec	12 Jul 2006 05:56:29 -0000	1.25
@@ -16,7 +16,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 	4
+Release: 	4.1
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-4.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-4
 - Add missing  BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:56:35 -0400
Subject: rpms/gtk2-engines/devel .cvsignore, 1.18, 1.19 gtk2-engines.spec,
	1.41, 1.42 sources, 1.19, 1.20
Message-ID: <200607120556.k6C5uZWA024667@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2-engines.spec sources 
Log Message:
2.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Jan 2006 02:46:23 -0000	1.18
+++ .cvsignore	12 Jul 2006 05:56:33 -0000	1.19
@@ -1,16 +1 @@
-gtk-engines-2.2.0.tar.bz2
-gtk-engines-2.6.0.tar.bz2
-gtk-engines-2.6.1.tar.bz2
-gtk-engines-2.6.2.tar.bz2
-clearlooks-0.4.tar.bz2
-clearlooks-0.5.tar.bz2
-gtk-engines-2.6.3.tar.bz2
-clearlooks-0.6.1.tar.bz2
-gtk-engines-2.6.4.tar.bz2
-gtk-engines-2.6.5.tar.bz2
-gtk-engines-2.7.0.tar.bz2
-gtk-engines-2.7.0.cvs20051211.tar.gz
-gtk-engines-2.7.1.tar.bz2
-gtk-engines-2.7.2.tar.bz2
-gtk-engines-2.7.3.tar.bz2
-gtk-engines-2.7.4.tar.bz2
+gtk-engines-2.7.5.tar.bz2


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gtk2-engines.spec	5 May 2006 18:05:24 -0000	1.41
+++ gtk2-engines.spec	12 Jul 2006 05:56:33 -0000	1.42
@@ -1,16 +1,10 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
-Version:        2.7.4
-Release:	7
+Version:        2.7.5
+Release:	1
 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
-# add missing copy method in clearlooks engine
-Patch2:		gtk-engines-2.7.4-copy.patch
 
 Requires:       gtk2 >= 2.9.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -29,9 +23,6 @@
 
 %prep
 %setup -q -n gtk-engines-%{version}
-%patch0 -p1 -b .fixes
-%patch1 -p1 -b .leaks
-%patch2 -p1 -b .copy
 
 %build
 %configure
@@ -69,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.5-1
+- Update to 2.7.5
+
 * Fri May  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.4-4
 - Rebuild against GTK+ 2.9.0
 - Require GTK+ 2.9.0


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	31 Jan 2006 02:46:23 -0000	1.19
+++ sources	12 Jul 2006 05:56:33 -0000	1.20
@@ -1 +1 @@
-b0f27c0f6d5f610ca445a3d82d5779da  gtk-engines-2.7.4.tar.bz2
+0736d5acf468a9d25148e683131d8dd5  gtk-engines-2.7.5.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:57:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:57:12 -0400
Subject: rpms/glib2/devel glib2.spec,1.102,1.103
Message-ID: <200607120557.k6C5vCic025006@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glib2.spec 
Log Message:
bumped for rebuild


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- glib2.spec	2 Jul 2006 20:23:15 -0000	1.102
+++ glib2.spec	12 Jul 2006 05:57:10 -0000	1.103
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.12.0
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-1.1
+- rebuild
+
 * Sun Jul  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-1
 - Update to 2.12.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:57:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:57:33 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.152,1.153
Message-ID: <200607120557.k6C5vWfI025181@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glibc-kernheaders.spec 
Log Message:
bumped for rebuild


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- glibc-kernheaders.spec	22 Jun 2006 13:58:00 -0000	1.152
+++ glibc-kernheaders.spec	12 Jul 2006 05:57:30 -0000	1.153
@@ -3,7 +3,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 45
+Release: 45.1
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -108,6 +108,9 @@
 /usr/include/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-45.1
+- rebuild
+
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45
 - 2.6.17-1.2299_FC6 (-git3, drop i2c-id.h and i2c-algo-ite.h)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:57:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:57:45 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.36,1.37
Message-ID: <200607120557.k6C5vjR8025308@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25286

Modified Files:
	glib-java.spec 
Log Message:
bumped for rebuild


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- glib-java.spec	17 Jun 2006 16:58:54 -0000	1.36
+++ glib-java.spec	12 Jul 2006 05:57:42 -0000	1.37
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0
+Release:   0.1
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -116,6 +116,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
+- rebuild
+
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-0
 - Use .tar.bz2, not .tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:57:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:57:58 -0400
Subject: rpms/gmime/devel gmime.spec,1.13,1.14
Message-ID: <200607120557.k6C5vwpi025425@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gmime.spec 
Log Message:
bumped for rebuild


Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gmime.spec	9 Jun 2006 12:54:06 -0000	1.13
+++ gmime.spec	12 Jul 2006 05:57:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.2.1
-Release:        2
+Release:        2.1
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -115,6 +115,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.2.1-2
 - Disable mono parts on s390* as mono doesn't build on s390 atm
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:58:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:58:13 -0400
Subject: rpms/gmp/devel gmp.spec,1.27,1.28
Message-ID: <200607120558.k6C5wD1W025556@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25527

Modified Files:
	gmp.spec 
Log Message:
bumped for rebuild


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gmp.spec	9 Jun 2006 08:54:32 -0000	1.27
+++ gmp.spec	12 Jul 2006 05:58:10 -0000	1.28
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library.
 Name: gmp
 Version: 4.2.1
-Release: 1
+Release: 1.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
@@ -152,6 +152,9 @@
 %{_infodir}/gmp.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.1-1.1
+- rebuild
+
 * Fri Jun  9 2006 Thomas Woerner <twoerner at redhat.com> 4.2.1-1
 - new version 4.2.1
 - mpfr moved out of gmp



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:58:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:58:23 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.153,1.154
Message-ID: <200607120558.k6C5wNeM025665@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-applets.spec 
Log Message:
bumped for rebuild


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- gnome-applets.spec	7 Jul 2006 18:17:33 -0000	1.153
+++ gnome-applets.spec	12 Jul 2006 05:58:21 -0000	1.154
@@ -29,7 +29,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release:  	3
+Release:  	3.1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -244,6 +244,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.1.1-3.1
+- rebuild
+
 * Fri Jul  7 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-3
 - Try to make the invest applet actually work
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:58:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:58:34 -0400
Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.6,1.7
Message-ID: <200607120558.k6C5wYah025783@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25757

Modified Files:
	gnome-applet-vm.spec 
Log Message:
bumped for rebuild


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-vm.spec	10 Feb 2006 16:16:24 -0000	1.6
+++ gnome-applet-vm.spec	12 Jul 2006 05:58:32 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
 Version: 0.0.6
-Release: 1
+Release: 1.1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-applet-vm-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.6-1.1
+- rebuild
+
 * Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 0.0.6-1
 - new upstream version
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:58:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:58:47 -0400
Subject: rpms/gnome-audio/devel gnome-audio.spec,1.10,1.11
Message-ID: <200607120558.k6C5wlRd025915@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-audio.spec 
Log Message:
bumped for rebuild


Index: gnome-audio.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-audio/devel/gnome-audio.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-audio.spec	9 Dec 2005 22:40:36 -0000	1.10
+++ gnome-audio.spec	12 Jul 2006 05:58:44 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Sounds for GNOME events.
 Name: gnome-audio
 Version: 2.0.0
-Release: 3.1
+Release: 3.1.1
 License: LGPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-audio-%{version}.tar.bz2
@@ -42,6 +42,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-3.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:58:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:58:56 -0400
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.36,1.37
Message-ID: <200607120558.k6C5wuJo026029@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-bluetooth.spec 
Log Message:
bumped for rebuild


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-bluetooth.spec	14 Jun 2006 09:59:20 -0000	1.36
+++ gnome-bluetooth.spec	12 Jul 2006 05:58:54 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 10
+Release: 10.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -135,6 +135,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-10.1
+- rebuild
+
 * Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-10
 - bump for new openobex
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:03 -0400
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.58,1.59
Message-ID: <200607120559.k6C5x3Uh026127@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-desktop.spec 
Log Message:
bumped for rebuild


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-desktop.spec	17 May 2006 16:31:31 -0000	1.58
+++ gnome-desktop.spec	12 Jul 2006 05:59:01 -0000	1.59
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
 Version: 2.15.2
-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
 # FIXME: why are these needed ?
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
+- rebuild
+
 * Tue May 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:10 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.80,1.81
Message-ID: <200607120559.k6C5xAba026227@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-games.spec 
Log Message:
bumped for rebuild


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gnome-games.spec	13 Jun 2006 04:37:46 -0000	1.80
+++ gnome-games.spec	12 Jul 2006 05:59:08 -0000	1.81
@@ -14,7 +14,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.15.3
-Release: 1
+Release: 1.1
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:17 -0400
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.26,1.27
Message-ID: <200607120559.k6C5xHc2026323@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-keyring.spec 
Log Message:
bumped for rebuild


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-keyring.spec	13 Jun 2006 14:53:00 -0000	1.26
+++ gnome-keyring.spec	12 Jul 2006 05:59:15 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 0.5.1
-Release: 1
+Release: 1.1
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/html/gnome-keyring/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.1-1
 - Update to 0.5.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:26 -0400
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.35,1.36
Message-ID: <200607120559.k6C5xQWE026461@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mag.spec 
Log Message:
bumped for rebuild


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-mag.spec	12 Jul 2006 04:49:10 -0000	1.35
+++ gnome-mag.spec	12 Jul 2006 05:59:23 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.6
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -69,6 +69,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.6-1.1
+- rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 0.12.6-1
 - Update to 0.12.6
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:32 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.70,1.71
Message-ID: <200607120559.k6C5xWma026560@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-media.spec 
Log Message:
bumped for rebuild


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gnome-media.spec	14 Jun 2006 14:46:57 -0000	1.70
+++ gnome-media.spec	12 Jul 2006 05:59:30 -0000	1.71
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.14.2
-Release:        4
+Release:        4.1
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-4.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-4
 - Rebuild against new nautilus-cd-burner
 - Work around a gstreamer problem



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:39 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.31,1.32
Message-ID: <200607120559.k6C5xdJx026667@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-menus.spec 
Log Message:
bumped for rebuild


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-menus.spec	9 Jun 2006 17:24:07 -0000	1.31
+++ gnome-menus.spec	12 Jul 2006 05:59:37 -0000	1.32
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.14.0
-Release: 4
+Release: 4.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
 - More missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:41 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.16,1.17
Message-ID: <200607120559.k6C5xf5r026684@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26574

Modified Files:
	nautilus-sendto.spec 
Log Message:
more file list fixes



Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nautilus-sendto.spec	12 Jul 2006 05:49:34 -0000	1.16
+++ nautilus-sendto.spec	12 Jul 2006 05:59:39 -0000	1.17
@@ -65,6 +65,7 @@
 %dir %{_libdir}/nautilus-sendto
 %dir %{_libdir}/nautilus-sendto/plugins
 %{_libdir}/nautilus-sendto/plugins/libnstevolution.so
+%{_libdir}/nautilus-sendto/plugins/libnstsylpheed.so
 %{_datadir}/nautilus-sendto
 %{_bindir}/nautilus-sendto
 # We put gaim in the main package, because its small, has



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:48 -0400
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.19,1.20
Message-ID: <200607120559.k6C5xmWk026780@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26755

Modified Files:
	gnome-mime-data.spec 
Log Message:
bumped for rebuild


Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-mime-data.spec	9 Jun 2006 20:21:24 -0000	1.19
+++ gnome-mime-data.spec	12 Jul 2006 05:59:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.4.2
-Release: 3
+Release: 3.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-3.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.4.2-3
 - Add a BuildRequires for gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 05:59:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 01:59:56 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.17,1.18
Message-ID: <200607120559.k6C5xuX0026921@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mount.spec 
Log Message:
bumped for rebuild


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-mount.spec	9 Jun 2006 20:52:01 -0000	1.17
+++ gnome-mount.spec	12 Jul 2006 05:59:54 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 7 
+Release: 7.1 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -67,6 +67,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4-7.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.4-7
 - Fix BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:00:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:00:03 -0400
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.30,1.31
Message-ID: <200607120600.k6C603cp027017@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-netstatus.spec 
Log Message:
bumped for rebuild


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-netstatus.spec	9 Jun 2006 20:50:52 -0000	1.30
+++ gnome-netstatus.spec	12 Jul 2006 06:00:01 -0000	1.31
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 5
+Release: 5.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.11/%{name}-%{version}.tar.bz2
 License: GPL
@@ -98,6 +98,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-5.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.0-5
 - Fix BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:01:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:01:21 -0400
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.17,1.18
Message-ID: <200607120601.k6C61Lka027194@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-nettool.spec 
Log Message:
bumped for rebuild


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-nettool.spec	10 Jun 2006 03:48:36 -0000	1.17
+++ gnome-nettool.spec	12 Jul 2006 06:00:58 -0000	1.18
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.15.0 
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -85,6 +85,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.0-1.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.0-1
 - Update to 2.15.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:02:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:02:55 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.130,1.131
Message-ID: <200607120602.k6C62tv9027398@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-panel.spec 
Log Message:
bumped for rebuild


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-panel.spec	20 Jun 2006 00:04:31 -0000	1.130
+++ gnome-panel.spec	12 Jul 2006 06:02:52 -0000	1.131
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 5
+Release: 5.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
@@ -227,6 +227,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-5.1
+- rebuild
+
 * Mon Jun 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
 - Add a patch to support transparent backgrounds in the
   notification area



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:04:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:04:30 -0400
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.43,1.44
Message-ID: <200607120604.k6C64UdZ027539@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-pilot.spec 
Log Message:
bumped for rebuild


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-pilot.spec	9 Jun 2006 01:07:24 -0000	1.43
+++ gnome-pilot.spec	12 Jul 2006 06:04:23 -0000	1.44
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 13
+Release: 13.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -151,6 +151,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-13.1
+- rebuild
+
 * Thu Jun  8 2006 Jeremy Katz <katzj at redhat.com> - 2.0.13-13
 - and libtool
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:05:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:05:04 -0400
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.19,
	1.20
Message-ID: <200607120605.k6C654Dd027710@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot-conduits/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27674

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
bumped for rebuild


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-pilot-conduits.spec	8 Jun 2006 17:40:43 -0000	1.19
+++ gnome-pilot-conduits.spec	12 Jul 2006 06:05:01 -0000	1.20
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 6
+Release: 6.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-6.1
+- rebuild
+
 * Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> 2.0.13-6
 - Add missing BR gettext, libtool
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:05:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:05:38 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.38,1.39
Message-ID: <200607120605.k6C65ciI027937@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-python.spec 
Log Message:
bumped for rebuild


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-python.spec	14 Jun 2006 05:04:33 -0000	1.38
+++ gnome-python.spec	12 Jul 2006 06:05:26 -0000	1.39
@@ -7,7 +7,7 @@
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
 Version: 2.15.2
-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
 
@@ -181,6 +181,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:06:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:06:01 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.15,
	1.16
Message-ID: <200607120606.k6C6610n028121@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28087

Modified Files:
	gnome-python-desktop.spec 
Log Message:
bumped for rebuild


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-python-desktop.spec	16 Jun 2006 03:39:52 -0000	1.15
+++ gnome-python-desktop.spec	12 Jul 2006 06:05:58 -0000	1.16
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.3
-Release: 4
+Release: 4.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
@@ -254,6 +254,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-4.1
+- rebuild
+
 * Thu Jun 15 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-4
 - Create gnomekeyring subpackage
 - block out the nautilus-cd stuff



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:06:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:06:57 -0400
Subject: rpms/atk/devel .cvsignore, 1.21, 1.22 atk.spec, 1.37, 1.38 sources,
	1.21, 1.22
Message-ID: <200607120606.k6C66v9x028315@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore atk.spec sources 
Log Message:
1.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Apr 2006 14:49:43 -0000	1.21
+++ .cvsignore	12 Jul 2006 06:06:53 -0000	1.22
@@ -1,10 +1 @@
-atk-1.7.3.tar.bz2
-atk-1.8.0.tar.bz2
-atk-1.9.0.tar.bz2
-atk-1.9.1.tar.bz2
-atk-1.10.1.tar.bz2
-atk-1.10.3.tar.bz2
-atk-1.11.0.tar.bz2
-atk-1.11.2.tar.bz2
-atk-1.11.3.tar.bz2
-atk-1.11.4.tar.bz2
+atk-1.12.1.tar.bz2


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- atk.spec	12 Jul 2006 05:22:18 -0000	1.37
+++ atk.spec	12 Jul 2006 06:06:54 -0000	1.38
@@ -2,8 +2,8 @@
 
 Summary: Interfaces for accessibility support.
 Name: atk
-Version: 1.11.4
-Release: 4.1
+Version: 1.12.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -69,6 +69,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-1
+- Update to 1.12.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	4 Apr 2006 14:49:43 -0000	1.21
+++ sources	12 Jul 2006 06:06:54 -0000	1.22
@@ -1 +1 @@
-2f7132e46a62a2586545bca40eeeef39  atk-1.11.4.tar.bz2
+df1564d233944b1be0c596761464e53e  atk-1.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:07:27 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.22, 1.23 at-spi.spec, 1.41,
	1.42 sources, 1.22, 1.23
Message-ID: <200607120607.k6C67R3R028359@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28286

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	4 Apr 2006 14:35:51 -0000	1.22
+++ .cvsignore	12 Jul 2006 06:07:10 -0000	1.23
@@ -1,14 +1 @@
-at-spi-1.5.3.tar.bz2
-at-spi-1.6.0.tar.bz2
-at-spi-1.6.2.tar.bz2
-at-spi-1.6.3.tar.bz2
-at-spi-1.6.4.tar.bz2
-at-spi-1.6.6.tar.bz2
-at-spi-1.7.0.tar.bz2
-at-spi-1.7.1.tar.bz2
-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
-at-spi-1.7.6.tar.bz2
-at-spi-1.7.7.tar.bz2
+at-spi-1.7.8.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- at-spi.spec	12 Jul 2006 05:22:33 -0000	1.41
+++ at-spi.spec	12 Jul 2006 06:07:10 -0000	1.42
@@ -6,8 +6,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.7
-Release: 8.1
+Version: 1.7.8
+Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: at-spi-1.7.7-miscompile.patch
@@ -97,6 +97,9 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.8-1
+- Update to 1.7.8
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.7-8.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	4 Apr 2006 14:35:51 -0000	1.22
+++ sources	12 Jul 2006 06:07:10 -0000	1.23
@@ -1 +1 @@
-2988cd21d9f292fd404a8c532fe2723d  at-spi-1.7.7.tar.bz2
+ea494d23d6732a1952ef0819077e853e  at-spi-1.7.8.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:07:27 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.46,1.47
Message-ID: <200607120607.k6C67RgX028352@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-python-extras.spec 
Log Message:
bumped for rebuild


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-python-extras.spec	25 Jun 2006 02:26:27 -0000	1.46
+++ gnome-python-extras.spec	12 Jul 2006 06:06:58 -0000	1.47
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.0
-Release: 2
+Release: 2.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
@@ -126,6 +126,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1
+- rebuild
+
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 2.14.0-2
 - Add missing BR pygtk2-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:08:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:08:36 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.82,1.83
Message-ID: <200607120608.k6C68aio028607@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
bumped for rebuild


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-screensaver.spec	11 Jul 2006 19:18:21 -0000	1.82
+++ gnome-screensaver.spec	12 Jul 2006 06:08:33 -0000	1.83
@@ -12,7 +12,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 1
+Release: 1.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -149,6 +149,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.4-1.1
+- rebuild
+
 * Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 2.15.4-1
 - Update to 2.15.4
 - Rename the branded screensaver to "system" and move



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:09:06 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.72,1.73
Message-ID: <200607120609.k6C696rL028740@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-session.spec 
Log Message:
bumped for rebuild


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gnome-session.spec	13 Jun 2006 02:33:33 -0000	1.72
+++ gnome-session.spec	12 Jul 2006 06:09:04 -0000	1.73
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.1
-Release: 5
+Release: 5.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -163,6 +163,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-5.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham  <notting at redhat.com> 2.15.1-5
 - remove obsolete automake14 buildreq
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:09:27 -0400
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.28,1.29
Message-ID: <200607120609.k6C69Rwb028864@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-speech.spec 
Log Message:
bumped for rebuild


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-speech.spec	12 Jul 2006 03:50:19 -0000	1.28
+++ gnome-speech.spec	12 Jul 2006 06:09:24 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.4.1
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.1-1.1
+- rebuild
+
 * Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1
 - Update to 0.4.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:09:48 -0400
Subject: rpms/gnome-spell/devel gnome-spell.spec,1.22,1.23
Message-ID: <200607120609.k6C69mJM029004@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-spell.spec 
Log Message:
bumped for rebuild


Index: gnome-spell.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-spell.spec	8 Jun 2006 17:19:14 -0000	1.22
+++ gnome-spell.spec	12 Jul 2006 06:09:45 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Bonobo component for spell checking
 Name: gnome-spell
 Version: 1.0.7
-Release: 3
+Release: 3.1
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2
 # XXX The pspell compatability layer was added three years ago.
 #     Disable it for now (1.0.7-2) and remove it in the next update.
@@ -67,6 +67,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.7-3.1
+- rebuild
+
 * Thu Jun 08 2006 Jesse Keating <jkeating at redhat.com> - 1.0.7-3
 - Add missing br gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:10:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:10:11 -0400
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.61,1.62
Message-ID: <200607120610.k6C6ABMA029179@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-terminal.spec 
Log Message:
bumped for rebuild


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-terminal.spec	30 May 2006 01:23:39 -0000	1.61
+++ gnome-terminal.spec	12 Jul 2006 06:09:58 -0000	1.62
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.15.1
-Release: 2
+Release: 2.1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
@@ -118,6 +118,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-2.1
+- rebuild
+
 * Mon May 29 2006 Kristian H??gsberg <krh at redhat.com> - 2.15.1-2
 - Update transparency patch to use gdk_screen_is_composited().
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:10:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:10:34 -0400
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.13,1.14
Message-ID: <200607120610.k6C6AYG3029363@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29341

Modified Files:
	gnome-user-share.spec 
Log Message:
bumped for rebuild


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-user-share.spec	29 May 2006 13:28:17 -0000	1.13
+++ gnome-user-share.spec	12 Jul 2006 06:10:32 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.10
-Release: 3
+Release: 3.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -62,6 +62,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10-3.1
+- rebuild
+
 * Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 0.10-3
 - buildrequire gettext and perl-XML-Parser (#193391)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:10:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:10:47 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.121,1.122
Message-ID: <200607120610.k6C6AlmC029493@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-utils.spec 
Log Message:
bumped for rebuild


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-utils.spec	13 Jun 2006 17:33:10 -0000	1.121
+++ gnome-utils.spec	12 Jul 2006 06:10:44 -0000	1.122
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.15.3
-Release:        1
+Release:        1.1
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -220,6 +220,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:10:57 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.112,1.113
Message-ID: <200607120610.k6C6AvAK029650@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
bumped for rebuild


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- gnome-vfs2.spec	13 Jun 2006 15:07:02 -0000	1.112
+++ gnome-vfs2.spec	12 Jul 2006 06:10:55 -0000	1.113
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.2
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -191,6 +191,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:11:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:11:09 -0400
Subject: rpms/gnopernicus/devel gnopernicus.spec,1.43,1.44
Message-ID: <200607120611.k6C6B9VM029738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29725

Modified Files:
	gnopernicus.spec 
Log Message:
bumped for rebuild


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnopernicus.spec	15 May 2006 14:46:13 -0000	1.43
+++ gnopernicus.spec	12 Jul 2006 06:11:07 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
 Version: 1.0.4
-Release: 2.2
+Release: 2.2.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.2.1
+- rebuild
+
 * Mon May 15 2006 John (J5) Palmieri <johnp at redhat.com> - 1.0.4-2.1
 - bump and rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:11:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:11:29 -0400
Subject: rpms/gnucash/devel gnucash.spec,1.49,1.50
Message-ID: <200607120611.k6C6BTMw029890@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29860

Modified Files:
	gnucash.spec 
Log Message:
bumped for rebuild


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnucash.spec	12 Jul 2006 03:09:28 -0000	1.49
+++ gnucash.spec	12 Jul 2006 06:11:27 -0000	1.50
@@ -7,9 +7,9 @@
 Summary: GnuCash is an application to keep track of your finances.
 Version: 2.0.0
 %if %{buildsvn}
-Release: 2.%{svnrev}svn
+Release: 2.%{svnrev}svn.1
 %else
-Release: 2
+Release: 2.1
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -151,6 +151,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-2.1
+- rebuild
+
 * Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-2
 - rebuild against new aqbanking
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:11:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:11:38 -0400
Subject: rpms/gnu-crypto/devel gnu-crypto.spec,1.24,1.25
Message-ID: <200607120611.k6C6BcRe030008@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29984

Modified Files:
	gnu-crypto.spec 
Log Message:
bumped for rebuild


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnu-crypto.spec	6 Mar 2006 22:52:49 -0000	1.24
+++ gnu-crypto.spec	12 Jul 2006 06:11:36 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           gnu-crypto
 Version:        2.1.0
-Release:        1jpp_2fc
+Release:        1jpp_3fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -143,6 +143,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.1.0-1jpp_2fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:11:47 -0400
Subject: rpms/gnu-efi/devel gnu-efi.spec,1.13,1.14
Message-ID: <200607120611.k6C6BlMD030126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnu-efi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30098

Modified Files:
	gnu-efi.spec 
Log Message:
bumped for rebuild


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnu-efi.spec	27 Apr 2006 18:02:15 -0000	1.13
+++ gnu-efi.spec	12 Jul 2006 06:11:45 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0c
-Release: 1
+Release: 1.1
 Group: Development/System
 License: GPL
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
@@ -41,6 +41,9 @@
 /usr/lib/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0c-1.1
+- rebuild
+
 * Thu Apr 27 2006 Chris Lumens <clumens at redhat.com> 3.0c-1
 - Upgrade to gnu-efi-3.0c.
 - Enable build on i386.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:11:55 -0400
Subject: rpms/gnu.getopt/devel gnu.getopt.spec,1.8,1.9
Message-ID: <200607120611.k6C6Bt7w030235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnu.getopt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30209

Modified Files:
	gnu.getopt.spec 
Log Message:
bumped for rebuild


Index: gnu.getopt.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu.getopt/devel/gnu.getopt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnu.getopt.spec	6 Mar 2006 22:21:56 -0000	1.8
+++ gnu.getopt.spec	12 Jul 2006 06:11:53 -0000	1.9
@@ -1,6 +1,6 @@
 %define name		gnu.getopt
 %define version		1.0.9
-%define release 	4jpp_4fc
+%define release 	4jpp_5fc
 %define	section		free
 
 Name:		%{name}
@@ -76,6 +76,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.9-4jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.9-4jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:03 -0400
Subject: rpms/gnupg/devel gnupg.spec,1.51,1.52
Message-ID: <200607120612.k6C6C3LG030339@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnupg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30309

Modified Files:
	gnupg.spec 
Log Message:
bumped for rebuild


Index: gnupg.spec
===================================================================
RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnupg.spec	5 Jul 2006 15:25:19 -0000	1.51
+++ gnupg.spec	12 Jul 2006 06:12:01 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
 Version: 1.4.4
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -97,6 +97,9 @@
 %{_mandir}/man7/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-5.1
+- rebuild
+
 * Wed Jul  5 2006 Nalin Dahyabhai <nalin at redhat.com> - 1.4.4-5
 - try again using per-platform buildprereq (jkeating)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:15 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.26,1.27
Message-ID: <200607120612.k6C6CFIq030463@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnuplot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30437

Modified Files:
	gnuplot.spec 
Log Message:
bumped for rebuild


Index: gnuplot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnuplot.spec	1 Mar 2006 13:52:24 -0000	1.26
+++ gnuplot.spec	12 Jul 2006 06:12:12 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A program for plotting mathematical expressions and data.
 Name: gnuplot
 Version: 4.0.0
-Release: 11
+Release: 11.1
 License: Redistributable, with restrictions
 Group: Applications/Engineering
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-11.1
+- rebuild
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 4.0.0-11
 - BuildRequires: libXt-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:26 -0400
Subject: rpms/gnutls/devel gnutls.spec,1.21,1.22
Message-ID: <200607120612.k6C6CQiv030565@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30543

Modified Files:
	gnutls.spec 
Log Message:
bumped for rebuild


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnutls.spec	14 Jun 2006 12:43:43 -0000	1.21
+++ gnutls.spec	12 Jul 2006 06:12:22 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
 Version: 1.4.0
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 BuildRequires: libgcrypt-devel >= 1.2.2, gettext
@@ -119,6 +119,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.0-1.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.0-1
 - upgrade to new upstream version (#192070), rebuild
   of dependent packages required



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:42 -0400
Subject: rpms/m17n-lib/devel m17n-lib.spec,1.9,1.10
Message-ID: <200607120612.k6C6Cg2a030707@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	m17n-lib.spec 
Log Message:
Updated spec file for bug 193524



Index: m17n-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- m17n-lib.spec	30 May 2006 07:25:52 -0000	1.9
+++ m17n-lib.spec	12 Jul 2006 06:12:39 -0000	1.10
@@ -21,6 +21,8 @@
 BuildRequires:	libotf-devel >= %{libotf_version}
 %else
 BuildRequires:	autoconf
+BuildRequires:	libtool
+BuildRequires:	pkgconfig
 %endif
 %if %{with_examples}
 BuildRequires:	anthy-devel
@@ -94,6 +96,10 @@
 
 
 %changelog
+* Wed Jul 12 2006 Mayank Jain <majain at redhat.com> - m17n-lib-1_3_3-1_fc6
+- Updated spec file for changes mentioned in RH bug 193524, comment 4
+- Thanks to Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 1.3.3-1
 - update to 1.3.3 minor bugfix release
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:42 -0400
Subject: rpms/gob2/devel gob2.spec,1.11,1.12
Message-ID: <200607120612.k6C6Cg4T030721@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gob2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30688

Modified Files:
	gob2.spec 
Log Message:
bumped for rebuild


Index: gob2.spec
===================================================================
RCS file: /cvs/dist/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gob2.spec	29 May 2006 12:23:03 -0000	1.11
+++ gob2.spec	12 Jul 2006 06:12:40 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: GOB2, The GObject Builder
 Name: gob2
 Version: 2.0.14
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 Source: gob2-%{version}.tar.gz
@@ -41,6 +41,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.14-1.1
+- rebuild
+
 * Mon May 29 2006 Harald Hoyer <harald at redhat.com> - 2.0.14-1
 - more build requires (bug #193395)
 - new version 2.0.14



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:12:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:12:53 -0400
Subject: rpms/libglade2/devel .cvsignore, 1.10, 1.11 libglade2.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200607120612.k6C6CrqG030868@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libglade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30621

Modified Files:
	.cvsignore libglade2.spec sources 
Log Message:
2.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	11 Feb 2005 16:55:13 -0000	1.10
+++ .cvsignore	12 Jul 2006 06:12:50 -0000	1.11
@@ -1,3 +1 @@
-libglade-2.4.0.tar.bz2
-libglade-2.5.0.tar.bz2
-libglade-2.5.1.tar.bz2
+libglade-2.6.0.tar.bz2


Index: libglade2.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libglade2.spec	23 Mar 2006 14:23:22 -0000	1.22
+++ libglade2.spec	12 Jul 2006 06:12:50 -0000	1.23
@@ -4,8 +4,8 @@
 
 Summary: The libglade library for loading user interfaces.
 Name: libglade2
-Version: 2.5.1
-Release: 5
+Version: 2.6.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: libglade-%{version}.tar.bz2
@@ -88,6 +88,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.0-1
+- Update to 2.6.0
+
 * Thu Mar 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.5.1-5
 - Make non-ASCII invisible characters work
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	11 Feb 2005 16:55:13 -0000	1.10
+++ sources	12 Jul 2006 06:12:50 -0000	1.11
@@ -1 +1 @@
-e4734a59f1f2308d7714dc0ebf8163f1  libglade-2.5.1.tar.bz2
+81d7b2b64871ce23a5fae1e5da0b1f6e  libglade-2.6.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:13:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:13:01 -0400
Subject: rpms/gok/devel gok.spec,1.35,1.36
Message-ID: <200607120613.k6C6D1fK030995@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30962

Modified Files:
	gok.spec 
Log Message:
bumped for rebuild


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gok.spec	18 May 2006 05:18:05 -0000	1.35
+++ gok.spec	12 Jul 2006 06:12:58 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.0.10
-Release: 2
+Release: 2.1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -110,6 +110,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.10-2.1
+- rebuild
+
 * Thu May 18 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.10-2
 - Update to 1.0.10
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:13:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:13:16 -0400
Subject: rpms/gpart/devel gpart.spec,1.6,1.7
Message-ID: <200607120613.k6C6DGfE031149@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gpart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31108

Modified Files:
	gpart.spec 
Log Message:
bumped for rebuild


Index: gpart.spec
===================================================================
RCS file: /cvs/dist/rpms/gpart/devel/gpart.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpart.spec	6 Jun 2006 22:16:28 -0000	1.6
+++ gpart.spec	12 Jul 2006 06:13:13 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:  A program for recovering corrupt partition tables.
 Name: gpart
 Version: 0.1h
-Release: 3
+Release: 3.1
 ExclusiveArch: i386
 Source: http://www.stud.uni-hannover.de/user/76201/%{name}/%{name}-%{version}.tar.gz
 Patch0: gpart-0.1h-varname.patch
@@ -42,6 +42,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1h-3.1
+- rebuild
+
 * Tue Jun 06 2006 Chris Lumens <clumens at redhat.com> 0.1h-3
 - Fix building on i386 by using the right syscall stuff.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:13:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:13:33 -0400
Subject: rpms/gperf/devel gperf.spec,1.19,1.20
Message-ID: <200607120613.k6C6DXwh031396@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gperf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31331

Modified Files:
	gperf.spec 
Log Message:
bumped for rebuild


Index: gperf.spec
===================================================================
RCS file: /cvs/dist/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gperf.spec	11 Feb 2006 03:20:13 -0000	1.19
+++ gperf.spec	12 Jul 2006 06:13:30 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A perfect hash function generator.
 Name: gperf
 Version: 3.0.1
-Release: 7.2.1
+Release: 7.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1-7.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:13:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:13:54 -0400
Subject: rpms/gphoto2/devel gphoto2.spec,1.69,1.70
Message-ID: <200607120613.k6C6DsHT031651@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31616

Modified Files:
	gphoto2.spec 
Log Message:
bumped for rebuild


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gphoto2.spec	23 Jun 2006 05:36:25 -0000	1.69
+++ gphoto2.spec	12 Jul 2006 06:13:51 -0000	1.70
@@ -8,7 +8,7 @@
 %define libpkg libgphoto2
 %define libver 2.2.1
 Version: %{pkgver}
-Release: 2
+Release: 2.1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -241,6 +241,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.0-2.1
+- rebuild
+
 * Fri Jun 23 2006 Radek Vok??l <rvokal at redhat.com> 2.2.0-2
 - fix print-camera-list to not require libgphoto2 at build time
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:09 -0400
Subject: rpms/gpm/devel gpm.spec,1.41,1.42
Message-ID: <200607120614.k6C6E9x3031781@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31756

Modified Files:
	gpm.spec 
Log Message:
bumped for rebuild


Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gpm.spec	7 Jun 2006 21:47:30 -0000	1.41
+++ gpm.spec	12 Jul 2006 06:14:07 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 74
+Release: 74.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.20.1-74.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.20.1-74
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:19 -0400
Subject: rpms/grep/devel grep.spec,1.61,1.62
Message-ID: <200607120614.k6C6EJaP031897@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31873

Modified Files:
	grep.spec 
Log Message:
bumped for rebuild


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- grep.spec	31 May 2006 09:01:15 -0000	1.61
+++ grep.spec	12 Jul 2006 06:14:17 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 54
+Release: 54.1
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -96,6 +96,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-54.1
+- rebuild
+
 * Wed May 31 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-54
 - Applied upstream patch to fix '-D skip' (bug #189580).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:29 -0400
Subject: rpms/groff/devel groff.spec,1.38,1.39
Message-ID: <200607120614.k6C6ET32032003@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/groff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31982

Modified Files:
	groff.spec 
Log Message:
bumped for rebuild


Index: groff.spec
===================================================================
RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- groff.spec	26 Apr 2006 15:23:30 -0000	1.38
+++ groff.spec	12 Jul 2006 06:14:26 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18.1.1
-Release: 11
+Release: 11.1
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -212,6 +212,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1.1-11.1
+- rebuild
+
 * Wed Apr 26 2006 Adam Jackson <ajackson at redhat.com> - 1.18.1.1-11
 - Rebuild for updated imake build rules.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:40 -0400
Subject: rpms/grub/devel grub.spec,1.44,1.45
Message-ID: <200607120614.k6C6EeVN032122@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32100

Modified Files:
	grub.spec 
Log Message:
bumped for rebuild


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- grub.spec	7 Jul 2006 15:07:27 -0000	1.44
+++ grub.spec	12 Jul 2006 06:14:37 -0000	1.45
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 9
+Release: 9.1
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -232,6 +232,9 @@
 %{_datadir}/grub
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.97-9.1
+- rebuild
+
 * Fri Jul  7 2006 Peter Jones <pjones at redhat.com> - 0.97-9
 - fix broken error reporting from helper functions
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:50 -0400
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.13,1.14
Message-ID: <200607120614.k6C6EoQR032236@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gsf-sharp.spec 
Log Message:
bumped for rebuild


Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gsf-sharp.spec	21 Jun 2006 14:53:17 -0000	1.13
+++ gsf-sharp.spec	12 Jul 2006 06:14:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.8
-Release:        1
+Release:        1.1
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Alexander Larsson <alexl at redhat.com> - 0.8-1
 - update to 0.8 which is for gsf 1.14.x
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:14:58 -0400
Subject: rpms/gsl/devel gsl.spec,1.22,1.23
Message-ID: <200607120614.k6C6EwaV032351@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32326

Modified Files:
	gsl.spec 
Log Message:
bumped for rebuild


Index: gsl.spec
===================================================================
RCS file: /cvs/dist/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gsl.spec	5 May 2006 13:54:23 -0000	1.22
+++ gsl.spec	12 Jul 2006 06:14:56 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis.
 Name: gsl
 Version: 1.8
-Release: 1
+Release: 1.1
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
@@ -93,6 +93,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8-1.1
+- rebuild
+
 * Fri May  5 2006 Ivana Varekova <varekova at redhat.com> - 1.8-1
 - update to 1.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:15:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:15:07 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.52,1.53
Message-ID: <200607120615.k6C6F7IC032460@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer.spec 
Log Message:
bumped for rebuild


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gstreamer.spec	28 Jun 2006 10:33:06 -0000	1.52
+++ gstreamer.spec	12 Jul 2006 06:15:04 -0000	1.53
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.8
-Release: 	3
+Release: 	3.1
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.10.8-3
 - remove RPATH pointing to RPM_BUILD_ROOT (#196870)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:15:21 -0400
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.12,
	1.13
Message-ID: <200607120615.k6C6FLgO032595@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
bumped for rebuild


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gstreamer-plugins-base.spec	23 May 2006 03:41:42 -0000	1.12
+++ gstreamer-plugins-base.spec	12 Jul 2006 06:15:19 -0000	1.13
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.7
-Release:  	1	
+Release:  	1.1	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -190,6 +190,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> 0.10.7-1
 - Update to 0.10.7
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:15:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:15:35 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.11,
	1.12
Message-ID: <200607120615.k6C6FZvJ032721@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
bumped for rebuild


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gstreamer-plugins-good.spec	1 Jun 2006 03:58:12 -0000	1.11
+++ gstreamer-plugins-good.spec	12 Jul 2006 06:15:32 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.3
-Release:  	2
+Release:  	2.1
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -180,6 +180,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed May 31 2006 Dan Williams  <dcbw at redhat.com> - 0.10.3-2
 - Package gsthalelements plugin so this can be pushed out
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:15:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:15:46 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.43,1.44
Message-ID: <200607120615.k6C6Fki7001263@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1049

Modified Files:
	gthumb.spec 
Log Message:
bumped for rebuild


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gthumb.spec	23 May 2006 02:43:51 -0000	1.43
+++ gthumb.spec	12 Jul 2006 06:15:43 -0000	1.44
@@ -10,7 +10,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.7.7
-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
@@ -109,6 +109,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.7-2.1
+- rebuild
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-2  
 - Update to 2.7.7  
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:15:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:15:53 -0400
Subject: rpms/gtk2/devel gtk2.spec,1.160,1.161
Message-ID: <200607120615.k6C6FrL6001787@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2.spec 
Log Message:
bumped for rebuild


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gtk2.spec	4 Jul 2006 03:53:05 -0000	1.160
+++ gtk2.spec	12 Jul 2006 06:15:50 -0000	1.161
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -274,6 +274,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1
 - Update to 2.10.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:16:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:16:04 -0400
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.42,1.43
Message-ID: <200607120616.k6C6G46W003039@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2-engines.spec 
Log Message:
bumped for rebuild


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gtk2-engines.spec	12 Jul 2006 05:56:33 -0000	1.42
+++ gtk2-engines.spec	12 Jul 2006 06:16:01 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.5
-Release:	1
+Release:	1.1
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.5-1.1
+- rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.5-1
 - Update to 2.7.5
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:16:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:16:17 -0400
Subject: rpms/gtk-doc/devel gtk-doc.spec,1.21,1.22
Message-ID: <200607120616.k6C6GHhF004692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4412

Modified Files:
	gtk-doc.spec 
Log Message:
bumped for rebuild


Index: gtk-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-doc.spec	22 May 2006 17:32:58 -0000	1.21
+++ gtk-doc.spec	12 Jul 2006 06:16:15 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.6
-Release: 3
+Release: 3.1
 License: LGPL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-1.6.tar.bz2 
@@ -66,6 +66,9 @@
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6-3.1
+- rebuild
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> 1.6-3
 - Make it build in mock
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:16:39 -0400
Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.18,1.19
Message-ID: <200607120616.k6C6Gdw8007757@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7470

Modified Files:
	gtkhtml2.spec 
Log Message:
bumped for rebuild


Index: gtkhtml2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml2/devel/gtkhtml2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gtkhtml2.spec	30 Jun 2006 16:39:57 -0000	1.18
+++ gtkhtml2.spec	12 Jul 2006 06:16:36 -0000	1.19
@@ -8,7 +8,7 @@
 
 Name: gtkhtml2
 Version: 2.11.0
-Release: 2
+Release: 2.1
 License: LGPL
 Group: System Environment/Libraries
 Summary: An HTML widget for GTK+ 2.0
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.11.0-2.1
+- rebuild
+
 * Fri Jun 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.11.0-2
 - Fix missing BuildRequires (RH #197146).
 - Some cosmetic changes.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:16:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:16:59 -0400
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.63,1.64
Message-ID: <200607120616.k6C6GxCX010566@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9101

Modified Files:
	gtkhtml3.spec 
Log Message:
bumped for rebuild


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gtkhtml3.spec	13 Jun 2006 18:44:43 -0000	1.63
+++ gtkhtml3.spec	12 Jul 2006 06:16:57 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.11.3
-Release: 1
+Release: 1.1
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.11.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 3.11.3-1
 - Update to 3.11.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:17:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:17:22 -0400
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.11,1.12
Message-ID: <200607120617.k6C6HM6J013045@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk-sharp.spec 
Log Message:
bumped for rebuild


Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtk-sharp.spec	9 Jun 2006 12:37:56 -0000	1.11
+++ gtk-sharp.spec	12 Jul 2006 06:17:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gtk-sharp
 Version:        1.0.10
-Release:        6
+Release:        6.1
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -72,6 +72,9 @@
 %{_prefix}/share/gapi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 1.0.10-6
 - Disable s390* for now as mono doesn't build there
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:17:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:17:44 -0400
Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.13,1.14
Message-ID: <200607120617.k6C6HiJq014033@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk-sharp2.spec 
Log Message:
bumped for rebuild


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtk-sharp2.spec	9 Jun 2006 13:03:44 -0000	1.13
+++ gtk-sharp2.spec	12 Jul 2006 06:17:42 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.8.2
-Release:        2
+Release:        2.1
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -93,6 +93,9 @@
 %{_prefix}/share/gapi-2.0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun  9 2006 Alexander Larsson <alexl at redhat.com> - 2.8.2-2
 - Disable on s390* as mono doesn't build on s390 atm
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:18:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:18:20 -0400
Subject: rpms/gtksourceview/devel gtksourceview.spec,1.31,1.32
Message-ID: <200607120618.k6C6IK2l016399@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16366

Modified Files:
	gtksourceview.spec 
Log Message:
bumped for rebuild


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gtksourceview.spec	10 Apr 2006 16:18:08 -0000	1.31
+++ gtksourceview.spec	12 Jul 2006 06:18:17 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.6.1
-Release: 2 
+Release: 2.1 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.1-2.1
+- rebuild
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 1.6.1-2
 - Update to 1.6.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:18:27 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.42,1.43
Message-ID: <200607120618.k6C6IRbn016475@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16386

Modified Files:
	at-spi.spec 
Log Message:
drop obsolete patch



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- at-spi.spec	12 Jul 2006 06:07:10 -0000	1.42
+++ at-spi.spec	12 Jul 2006 06:18:25 -0000	1.43
@@ -10,7 +10,6 @@
 Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
-Patch0: at-spi-1.7.7-miscompile.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -56,7 +55,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .miscompile
 
 %build
 %configure --disable-gtk-doc



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:18:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:18:45 -0400
Subject: rpms/gtkspell/devel gtkspell.spec,1.16,1.17
Message-ID: <200607120618.k6C6Ijwk016649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16624

Modified Files:
	gtkspell.spec 
Log Message:
bumped for rebuild


Index: gtkspell.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtkspell.spec	24 May 2006 14:37:33 -0000	1.16
+++ gtkspell.spec	12 Jul 2006 06:18:43 -0000	1.17
@@ -1,6 +1,6 @@
 Name: gtkspell
 Version: 2.0.11
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Libraries
 Summary: GtkSpell provides on-the-fly spell checking for GtkTextView widgets.
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/gtkspell-2.0.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.11-2.1
+- rebuild
+
 * Wed May 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.11-2
 - Remove @SPELLER_LIB@ from Libs in gtkspell-2.0.pc.in (closes #116914).
 - Disable gtk-doc to resolve multilib conflict (closes #192683).



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:18:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:18:54 -0400
Subject: rpms/gucharmap/devel gucharmap.spec,1.4,1.5
Message-ID: <200607120618.k6C6Is6N016773@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gucharmap.spec 
Log Message:
bumped for rebuild


Index: gucharmap.spec
===================================================================
RCS file: /cvs/dist/rpms/gucharmap/devel/gucharmap.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gucharmap.spec	9 Jun 2006 04:34:41 -0000	1.4
+++ gucharmap.spec	12 Jul 2006 06:18:52 -0000	1.5
@@ -4,7 +4,7 @@
 
 Name:           gucharmap
 Version:        1.6.0
-Release:        8
+Release:        8.1
 Summary:        Unicode character picker and font browser
 
 Group:          Applications/System
@@ -112,6 +112,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.6.0-8
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:05 -0400
Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.10,1.11
Message-ID: <200607120619.k6C6J5wM016904@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gwenhywfar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16879

Modified Files:
	gwenhywfar.spec 
Log Message:
bumped for rebuild


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gwenhywfar.spec	11 Jul 2006 20:38:55 -0000	1.10
+++ gwenhywfar.spec	12 Jul 2006 06:19:03 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 2.3.0
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-1.1
+- rebuild
+
 * Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 2.3.0-1
 - update to 2.3.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:15 -0400
Subject: rpms/g-wrap/devel g-wrap.spec,1.30,1.31
Message-ID: <200607120619.k6C6JFWE017009@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16986

Modified Files:
	g-wrap.spec 
Log Message:
bumped for rebuild


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- g-wrap.spec	30 May 2006 18:26:55 -0000	1.30
+++ g-wrap.spec	12 Jul 2006 06:19:12 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.9.6
-Release: 7
+Release: 7.1
 Group: Development/Libraries
 License: GPL
 Requires: guile
@@ -109,6 +109,9 @@
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-7.1
+- rebuild
+
 * Tue May 30 2006 Bill Nottingham <notting at redhat.com> 1.9.6-5
 - move ffi headers to %%{_libdir}, as they're arch-dependent (#192685)
 - buildprereq glib2-devel, not glib-devel



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:25 -0400
Subject: rpms/gzip/devel gzip.spec,1.24,1.25
Message-ID: <200607120619.k6C6JPmC017123@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17098

Modified Files:
	gzip.spec 
Log Message:
bumped for rebuild


Index: gzip.spec
===================================================================
RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gzip.spec	11 Feb 2006 03:24:15 -0000	1.24
+++ gzip.spec	12 Jul 2006 06:19:22 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program.
 Name: gzip
 Version: 1.3.5
-Release: 6.2.1
+Release: 6.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-6.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:34 -0400
Subject: rpms/hal/devel hal.spec,1.96,1.97
Message-ID: <200607120619.k6C6JYUd017240@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17214

Modified Files:
	hal.spec 
Log Message:
bumped for rebuild


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- hal.spec	10 Jun 2006 04:17:27 -0000	1.96
+++ hal.spec	12 Jul 2006 06:19:32 -0000	1.97
@@ -20,7 +20,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 12
+Release: 12.1
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -204,6 +204,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.7-12.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-12
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:41 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.36,1.37
Message-ID: <200607120619.k6C6Jfbg017337@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	hal-cups-utils.spec 
Log Message:
bumped for rebuild


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- hal-cups-utils.spec	19 Jun 2006 09:53:30 -0000	1.36
+++ hal-cups-utils.spec	12 Jul 2006 06:19:39 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.2
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -64,6 +64,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.2-1.1
+- rebuild
+
 * Mon Jun 19 2006 Florian Festi <ffesti at redhat.com> - 0.6.2-1
 - bump to 0.6.2 (move hal_lpadmin to /usr/libexec to cope with hal weirdness)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:49 -0400
Subject: rpms/hardlink/devel hardlink.spec,1.21,1.22
Message-ID: <200607120619.k6C6JnIW017464@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hardlink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17411

Modified Files:
	hardlink.spec 
Log Message:
bumped for rebuild


Index: hardlink.spec
===================================================================
RCS file: /cvs/dist/rpms/hardlink/devel/hardlink.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hardlink.spec	11 Feb 2006 03:24:53 -0000	1.21
+++ hardlink.spec	12 Jul 2006 06:19:47 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	Create a tree of hardlinks
 Name:		hardlink
 Version:	1.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -35,6 +35,9 @@
 %{_mandir}/man1/hardlink.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-1.21.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:19:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:19:55 -0400
Subject: rpms/hdparm/devel hdparm.spec,1.27,1.28
Message-ID: <200607120619.k6C6Jtiu017529@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17503

Modified Files:
	hdparm.spec 
Log Message:
bumped for rebuild


Index: hdparm.spec
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- hdparm.spec	22 May 2006 09:44:38 -0000	1.27
+++ hdparm.spec	12 Jul 2006 06:19:53 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A utility for displaying and/or setting hard disk parameters.
 Name: hdparm
 Version: 6.6
-Release: 1
+Release: 1.1
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
@@ -44,6 +44,9 @@
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.6-1.1
+- rebuild
+
 * Mon May 22 2006 Karsten Hopp <karsten at redhat.de> 6.3-3
 - remove obsolute include patch
 - disable idestruct patch, rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:20:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:20:03 -0400
Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.45,1.46
Message-ID: <200607120620.k6C6K34f017634@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/HelixPlayer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17610

Modified Files:
	HelixPlayer.spec 
Log Message:
bumped for rebuild


Index: HelixPlayer.spec
===================================================================
RCS file: /cvs/dist/rpms/HelixPlayer/devel/HelixPlayer.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- HelixPlayer.spec	6 Jun 2006 21:41:44 -0000	1.45
+++ HelixPlayer.spec	12 Jul 2006 06:20:01 -0000	1.46
@@ -4,7 +4,7 @@
 Name: HelixPlayer
 Version: 1.0.6
 Epoch: 1
-Release: 3
+Release: 3.1
 Group: Applications/Multimedia
 License: RPSL, GPL
 URL: https://player.helixcommunity.org/
@@ -169,6 +169,9 @@
 %{_datadir}/application-registry/hxplay.applications
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-3.1
+- rebuild
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-3
 - Added missing BR libXt-devel, libXv-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:20:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:20:35 -0400
Subject: rpms/hesinfo/devel hesinfo.spec,1.1,1.2
Message-ID: <200607120620.k6C6KZX7017881@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hesinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17857

Modified Files:
	hesinfo.spec 
Log Message:
bumped for rebuild


Index: hesinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/hesinfo/devel/hesinfo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hesinfo.spec	30 Mar 2006 19:14:47 -0000	1.1
+++ hesinfo.spec	12 Jul 2006 06:20:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name: hesinfo
 Version: 3.1.0
-Release: 1
+Release: 1.1
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-%{version}.tar.gz
 Summary: Command-line Hesiod client.
 Group: Applications/Internet
@@ -17,6 +17,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-1.1
+- rebuild
+
 * Thu Mar 30 2006 Nalin Dahyabhai <nalin at redhat.com> - 3.1.0-1
 - split off from hesiod package, following upstream
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:21:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:21:12 -0400
Subject: rpms/hexedit/devel hexedit.spec,1.20,1.21
Message-ID: <200607120621.k6C6LCuP018193@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hexedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18162

Modified Files:
	hexedit.spec 
Log Message:
bumped for rebuild


Index: hexedit.spec
===================================================================
RCS file: /cvs/dist/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hexedit.spec	11 Feb 2006 03:26:39 -0000	1.20
+++ hexedit.spec	12 Jul 2006 06:21:09 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A hexadecimal file viewer and editor.
 Name: hexedit
 Version: 1.2.12
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/Editors
 Url: http://merd.net/pixel
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.12-3.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.12-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:21:57 -0400
Subject: rpms/hfsutils/devel hfsutils.spec,1.10,1.11
Message-ID: <200607120621.k6C6Lvts018467@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18438

Modified Files:
	hfsutils.spec 
Log Message:
bumped for rebuild


Index: hfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hfsutils.spec	11 Feb 2006 03:26:50 -0000	1.10
+++ hfsutils.spec	12 Jul 2006 06:21:55 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes.
 Name: hfsutils
 Version: 3.2.6  
-Release: 7.2.1
+Release: 7.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-7.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:22:29 -0400
Subject: rpms/hicolor-icon-theme/devel hicolor-icon-theme.spec,1.16,1.17
Message-ID: <200607120622.k6C6MTs4018707@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hicolor-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18683

Modified Files:
	hicolor-icon-theme.spec 
Log Message:
bumped for rebuild


Index: hicolor-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/hicolor-icon-theme/devel/hicolor-icon-theme.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- hicolor-icon-theme.spec	27 Feb 2006 21:01:57 -0000	1.16
+++ hicolor-icon-theme.spec	12 Jul 2006 06:22:27 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic requirement for icon themes
 Name: hicolor-icon-theme
 Version: 0.9
-Release: 2
+Release: 2.1
 License: GPL
 Group: User Interface/Desktops
 URL: http://freedesktop.org/Software/icon-theme
@@ -47,6 +47,9 @@
 %{_datadir}/icons/hicolor
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.1
+- rebuild
+
 * 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



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:22:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:22:38 -0400
Subject: rpms/hplip/devel hplip.spec,1.88,1.89
Message-ID: <200607120622.k6C6McHr018819@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18791

Modified Files:
	hplip.spec 
Log Message:
bumped for rebuild


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- hplip.spec	4 Jul 2006 15:05:08 -0000	1.88
+++ hplip.spec	12 Jul 2006 06:22:36 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.6.6a
-Release: 3
+Release: 3.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -181,6 +181,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):1.6.6a-3.1
+- rebuild
+
 * Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1.6.6a-3
 - libhpip should link against libm (bug #197599).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:22:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:22:46 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.19,1.20
Message-ID: <200607120622.k6C6Mkxs018917@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18894

Modified Files:
	hsqldb.spec 
Log Message:
bumped for rebuild


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- hsqldb.spec	8 Mar 2006 22:20:16 -0000	1.19
+++ hsqldb.spec	12 Jul 2006 06:22:44 -0000	1.20
@@ -3,7 +3,7 @@
 %define name		hsqldb
 %define version		1.80.1
 %define cvs_version	1_8_0_1
-%define release 	1jpp_9fc
+%define release 	1jpp_10fc
 
 Name:		%{name}
 Version:	%{version}
@@ -212,6 +212,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_10fc
+- rebuild
+
 * Wed Mar  8 2006 Bill Nottingham <notting at redhat.com> - 0:1.80.1-1jpp_9fc
 - use an assigned user/group id
 - don't do usermod



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:00 -0400
Subject: rpms/htdig/devel htdig.spec,1.28,1.29
Message-ID: <200607120623.k6C6N0sG019053@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/htdig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19029

Modified Files:
	htdig.spec 
Log Message:
bumped for rebuild


Index: htdig.spec
===================================================================
RCS file: /cvs/dist/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- htdig.spec	24 Feb 2006 11:22:43 -0000	1.28
+++ htdig.spec	12 Jul 2006 06:22:58 -0000	1.29
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0b6
-Release: 6.4.2.2
+Release: 6.4.2.2.1
 Epoch: 3
 License: GPL
 Group: Applications/Internet
@@ -142,6 +142,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3:3.2.0b6-6.4.2.2.1
+- rebuild
+
 * Fri Feb 24 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3:3.2.0b6-6.4.2.2 
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:22 -0400
Subject: rpms/htmlview/devel htmlview.spec,1.23,1.24
Message-ID: <200607120623.k6C6NMYO019241@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/htmlview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19217

Modified Files:
	htmlview.spec 
Log Message:
bumped for rebuild


Index: htmlview.spec
===================================================================
RCS file: /cvs/dist/rpms/htmlview/devel/htmlview.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- htmlview.spec	28 Feb 2006 17:44:39 -0000	1.23
+++ htmlview.spec	12 Jul 2006 06:23:20 -0000	1.24
@@ -1,6 +1,6 @@
 Name: htmlview
 Version: 3.0.0
-Release: 14
+Release: 14.1
 Summary: Tools for launching Preferred Applications
 License: Public Domain
 Source0: htmlview
@@ -39,6 +39,9 @@
 %{_datadir}/applications/redhat-email.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.0-14.1
+- rebuild
+
 * Tue Feb 28 2006 Matthias Clasen <mclasen at redhat.com>> 3.0.0-14
 - Create absolute symlinks to desktop files (#176104)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:29 -0400
Subject: rpms/httpd/devel httpd.spec,1.93,1.94
Message-ID: <200607120623.k6C6NTvT019334@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	httpd.spec 
Log Message:
bumped for rebuild


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- httpd.spec	7 Jun 2006 10:57:35 -0000	1.93
+++ httpd.spec	12 Jul 2006 06:23:27 -0000	1.94
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 5
+Release: 5.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -479,6 +479,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.2-5.1
+- rebuild
+
 * Wed Jun  7 2006 Joe Orton <jorton at redhat.com> 2.2.2-5
 - require pkgconfig for -devel (#194152)
 - fixes for installed support makefiles (special.mk et al)



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:36 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.32,1.33
Message-ID: <200607120623.k6C6Na5l019428@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hwbrowser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19402

Modified Files:
	hwbrowser.spec 
Log Message:
bumped for rebuild


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- hwbrowser.spec	31 May 2006 13:10:01 -0000	1.32
+++ hwbrowser.spec	12 Jul 2006 06:23:34 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A hardware browser.
 Name: hwbrowser
 Version: 0.27
-Release: 1
+Release: 1.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -62,6 +62,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> 0.27
 - buildrequire perl-XML-Parser (#193400)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:44 -0400
Subject: rpms/icon-slicer/devel icon-slicer.spec,1.9,1.10
Message-ID: <200607120623.k6C6NitD019526@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icon-slicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19500

Modified Files:
	icon-slicer.spec 
Log Message:
bumped for rebuild


Index: icon-slicer.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-slicer/devel/icon-slicer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icon-slicer.spec	11 Feb 2006 03:27:58 -0000	1.9
+++ icon-slicer.spec	12 Jul 2006 06:23:42 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Utility for icon theme generation
 Name: icon-slicer
 Version: 0.3
-Release: 7.2.1
+Release: 7.2.2
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %{_bindir}/icon-slicer
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3-7.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3-7.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:23:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:23:52 -0400
Subject: rpms/ifd-egate/devel ifd-egate.spec,1.2,1.3
Message-ID: <200607120623.k6C6NqVD019668@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ifd-egate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19636

Modified Files:
	ifd-egate.spec 
Log Message:
bumped for rebuild


Index: ifd-egate.spec
===================================================================
RCS file: /cvs/dist/rpms/ifd-egate/devel/ifd-egate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ifd-egate.spec	10 Jul 2006 21:39:16 -0000	1.2
+++ ifd-egate.spec	12 Jul 2006 06:23:50 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name: ifd-egate
 Version: 0.05 
-Release: 10
+Release: 10.1
 Summary: Axalto Egate SmartCard device driver for PCSC-lite
 Group: System Environment/Base
 License: BSD/LGPL
@@ -51,6 +51,9 @@
 %{dropdir}/ifd-egate.bundle/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com>     0.05-10
 - remove s390 from the build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:24:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:24:00 -0400
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.64,1.65
Message-ID: <200607120624.k6C6O05S019769@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19744

Modified Files:
	ImageMagick.spec 
Log Message:
bumped for rebuild


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ImageMagick.spec	9 Jun 2006 15:27:31 -0000	1.64
+++ ImageMagick.spec	12 Jul 2006 06:23:58 -0000	1.65
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 1
+Release: 1.1
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -247,6 +247,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.2.8.0-1.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.8-1
 - Update to 6.2.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:24:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:24:21 -0400
Subject: rpms/imake/devel imake.spec,1.24,1.25
Message-ID: <200607120624.k6C6OLkO019959@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19922

Modified Files:
	imake.spec 
Log Message:
bumped for rebuild


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- imake.spec	28 Jun 2006 10:15:02 -0000	1.24
+++ imake.spec	12 Jul 2006 06:24:18 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -116,6 +116,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
 - Update to imake-1.0.2, gccmakedep-1.0.2, xorg-cf-files-1.0.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:24:29 -0400
Subject: rpms/indent/devel indent.spec,1.22,1.23
Message-ID: <200607120624.k6C6OTRq020061@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	indent.spec 
Log Message:
bumped for rebuild


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- indent.spec	6 Jun 2006 12:13:50 -0000	1.22
+++ indent.spec	12 Jul 2006 06:24:26 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12.3
+Release: 12.3.1
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.3.1
+- rebuild
+
 * Tue Jun  6 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-12.3
 - BuildRequires gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:24:37 -0400
Subject: rpms/initscripts/devel initscripts.spec,1.117,1.118
Message-ID: <200607120624.k6C6ObXh020164@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	initscripts.spec 
Log Message:
bumped for rebuild


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- initscripts.spec	12 Jun 2006 19:39:32 -0000	1.117
+++ initscripts.spec	12 Jul 2006 06:24:35 -0000	1.118
@@ -3,7 +3,7 @@
 Version: 8.35
 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/
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -209,6 +209,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.35-1.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 8.35-1
 - readonly root enhancments (modified from <law at redhat.com>, #193164)
 - encrypted swap, non-root filesystem support (#127378, <mitr at redhat.com, <redhat at flyn.org>)



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:24:59 -0400
Subject: rpms/intltool/devel intltool.spec,1.24,1.25
Message-ID: <200607120624.k6C6Ox4f020383@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/intltool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20357

Modified Files:
	intltool.spec 
Log Message:
bumped for rebuild


Index: intltool.spec
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- intltool.spec	17 May 2006 03:35:01 -0000	1.24
+++ intltool.spec	12 Jul 2006 06:24:56 -0000	1.25
@@ -1,7 +1,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files.
 Version: 0.35.0
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.bz2
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.35.0-1.1
+- rebuild
+
 * Tue May 16 2006 Matthias Clasen <mclasen at redhat.com> 0.35.0-1
 - Update to 0.35.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:12 -0400
Subject: rpms/iproute/devel iproute.spec,1.50,1.51
Message-ID: <200607120625.k6C6PCwZ020512@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20493

Modified Files:
	iproute.spec 
Log Message:
bumped for rebuild


Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- iproute.spec	26 Jun 2006 08:28:22 -0000	1.50
+++ iproute.spec	12 Jul 2006 06:25:09 -0000	1.51
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.16
-Release: 3
+Release: 3.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
@@ -94,6 +94,9 @@
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.16-3.1
+- rebuild
+
 * Mon Jun 26 2006 Radek Vok??l <rvokal at redhat.com> - 2.6.16-3
 - improve handling of initcwnd value (#179719)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:22 -0400
Subject: rpms/iprutils/devel iprutils.spec,1.20,1.21
Message-ID: <200607120625.k6C6PMuU020631@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20601

Modified Files:
	iprutils.spec 
Log Message:
bumped for rebuild


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- iprutils.spec	10 Jul 2006 15:30:16 -0000	1.20
+++ iprutils.spec	12 Jul 2006 06:25:20 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.1.4
-Release: 3
+Release: 3.1
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -56,6 +56,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.4-3.1
+- rebuild
+
 * Mon Jul 10 2006 Paul Nasrat <pnasrat at redhat.com> - 2.1.4-3
 - Add redhat-lsb requires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:32 -0400
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.30,1.31
Message-ID: <200607120625.k6C6PWhb020755@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20723

Modified Files:
	ipsec-tools.spec 
Log Message:
bumped for rebuild


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ipsec-tools.spec	21 Jun 2006 10:34:38 -0000	1.30
+++ ipsec-tools.spec	12 Jul 2006 06:25:30 -0000	1.31
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.5
-Release: 3
+Release: 3.1
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -95,6 +95,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-3.1
+- rebuild
+
 * Wed Jun 21 2006 Harald Hoyer <harald at redhat.com> - 0.6.5-3
 - more build requirements
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:41 -0400
Subject: rpms/iptables/devel iptables.spec,1.41,1.42
Message-ID: <200607120625.k6C6Pfim020851@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20828

Modified Files:
	iptables.spec 
Log Message:
bumped for rebuild


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- iptables.spec	11 Feb 2006 03:37:55 -0000	1.41
+++ iptables.spec	12 Jul 2006 06:25:39 -0000	1.42
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
 Version: 1.3.5
-Release: 1.2
+Release: 1.2.1
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -151,6 +151,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:49 -0400
Subject: rpms/iptraf/devel iptraf.spec,1.22,1.23
Message-ID: <200607120625.k6C6PnYT020950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20925

Modified Files:
	iptraf.spec 
Log Message:
bumped for rebuild


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- iptraf.spec	7 Jun 2006 07:42:49 -0000	1.22
+++ iptraf.spec	12 Jul 2006 06:25:47 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility.
 Name: iptraf
 Version: 3.0.0
-Release: 4
+Release: 4.1
 Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
@@ -84,6 +84,9 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.0-4.1
+- rebuild
+
 * Thu Jun 06 2006 Marcela Maslanova <mmaslano at redhat.com> 3.0.0-4
 - fix compile (#192510)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:25:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:25:57 -0400
Subject: rpms/iptstate/devel iptstate.spec,1.10,1.11
Message-ID: <200607120625.k6C6Pv2w021051@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptstate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21025

Modified Files:
	iptstate.spec 
Log Message:
bumped for rebuild


Index: iptstate.spec
===================================================================
RCS file: /cvs/dist/rpms/iptstate/devel/iptstate.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- iptstate.spec	11 Feb 2006 03:38:26 -0000	1.10
+++ iptstate.spec	12 Jul 2006 06:25:55 -0000	1.11
@@ -1,7 +1,7 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
 Version: 1.4
-Release: 1.1.2.1
+Release: 1.1.2.2
 Source: iptstate-%{version}.tar.bz2
 Patch0: iptstate-1.4-man8.patch
 Group: System Environment/Base
@@ -51,6 +51,9 @@
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4-1.1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:26:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:26:10 -0400
Subject: rpms/ipv6calc/devel ipv6calc.spec,1.20,1.21
Message-ID: <200607120626.k6C6QAXp021205@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21177

Modified Files:
	ipv6calc.spec 
Log Message:
bumped for rebuild


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ipv6calc.spec	11 Jul 2006 06:04:21 -0000	1.20
+++ ipv6calc.spec	12 Jul 2006 06:26:08 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
 Version: 	0.60.1
-Release: 	1
+Release: 	1.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 Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.60.1-1.1
+- rebuild
+
 * Tue Jul 11 2006 Radek Vok??l <rvokal at redhat.com> 0.60.1-1
 - upgrade to 0.60.1 - fix for big endian archs
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:26:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:26:27 -0400
Subject: rpms/ipvsadm/devel ipvsadm.spec,1.12,1.13
Message-ID: <200607120626.k6C6QRB8021351@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipvsadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21330

Modified Files:
	ipvsadm.spec 
Log Message:
bumped for rebuild


Index: ipvsadm.spec
===================================================================
RCS file: /cvs/dist/rpms/ipvsadm/devel/ipvsadm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ipvsadm.spec	15 May 2006 14:56:06 -0000	1.12
+++ ipvsadm.spec	12 Jul 2006 06:26:24 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utility to administer the Linux Virtual Server
 Name: ipvsadm
 Version: 1.24
-Release: 8
+Release: 8.1
 License: GPL
 URL: http://www.LinuxVirtualServer.org/
 Group: Applications/System
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.24-8.1
+- rebuild
+
 * Mon May 15 2006 Phil Knirsch <pknirsch at redhat.com> - 1.24-8
 - Added missing prereq to chkconfig
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:26:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:26:34 -0400
Subject: rpms/irda-utils/devel irda-utils.spec,1.24,1.25
Message-ID: <200607120626.k6C6QYgU021461@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	irda-utils.spec 
Log Message:
bumped for rebuild


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- irda-utils.spec	19 Jun 2006 14:12:16 -0000	1.24
+++ irda-utils.spec	12 Jul 2006 06:26:32 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.17
-Release: 1
+Release: 1.1
 # Download-URL: 
 #  http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download
 Source: irda-utils-%{version}.tar.gz
@@ -98,6 +98,9 @@
 %doc tekram/README.tekram
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.17-1.1
+- rebuild
+
 * Mon Jun 19 2006 Karsten Hopp <karsten at redhat.de> 0.9.17-1
 - update to 0.9.17
 - makefile fixes



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:26:58 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.60,1.61
Message-ID: <200607120626.k6C6QwiO021686@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	isdn4k-utils.spec 
Log Message:
bumped for rebuild


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- isdn4k-utils.spec	31 May 2006 13:43:46 -0000	1.60
+++ isdn4k-utils.spec	12 Jul 2006 06:26:55 -0000	1.61
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 47
+Release: 47.1
 License: GPL
 Group: Applications/System
 
@@ -493,6 +493,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-47.1
+- rebuild
+
 * Wed May 31 2006 Than Ngo <than at redhat.com> 3.2-47
 - add requires on libpcap-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:27:09 -0400
Subject: rpms/isicom/devel isicom.spec,1.16,1.17
Message-ID: <200607120627.k6C6R9pd021814@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/isicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21787

Modified Files:
	isicom.spec 
Log Message:
bumped for rebuild


Index: isicom.spec
===================================================================
RCS file: /cvs/dist/rpms/isicom/devel/isicom.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- isicom.spec	11 Feb 2006 03:39:52 -0000	1.16
+++ isicom.spec	12 Jul 2006 06:27:07 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Multitech IntelligentSerialInternal (ISI) Support Tools
 Name: isicom
 Version: 3.05
-Release: 18.2.1
+Release: 18.2.2
 License: GPL (not Firmware)
 Group: Applications/System
 URL: http://www.multitech.com/
@@ -71,6 +71,9 @@
 %{_datadir}/isicom/*.bin
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.05-18.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.05-18.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:27:23 -0400
Subject: rpms/jadetex/devel jadetex.spec,1.15,1.16
Message-ID: <200607120627.k6C6RNU9021981@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jadetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21924

Modified Files:
	jadetex.spec 
Log Message:
bumped for rebuild


Index: jadetex.spec
===================================================================
RCS file: /cvs/dist/rpms/jadetex/devel/jadetex.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jadetex.spec	9 Dec 2005 22:41:04 -0000	1.15
+++ jadetex.spec	12 Jul 2006 06:27:21 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name: jadetex
 Version: 3.12
-Release: 13.1
+Release: 13.1.1
 Group: Applications/Publishing
 
 Summary: TeX macros used by Jade TeX output.
@@ -91,6 +91,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: kpsewhich: command not found
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:27:30 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.30, 1.31
Message-ID: <200607120627.k6C6RUXj022044@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22013

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-beanutils.spec	6 Mar 2006 22:37:20 -0000	1.30
+++ jakarta-commons-beanutils.spec	12 Jul 2006 06:27:28 -0000	1.31
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.7.0
-%define release 	2jpp_6fc
+%define release 	2jpp_7fc
 %define	section		free
 
 Name:		%{name}
@@ -107,6 +107,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.7.0-2jpp_7fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7.0-2jpp_6fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:27:42 -0400
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.8,
	1.9
Message-ID: <200607120627.k6C6RgaJ022168@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22142

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-commons-codec.spec	6 Mar 2006 21:59:53 -0000	1.8
+++ jakarta-commons-codec.spec	12 Jul 2006 06:27:40 -0000	1.9
@@ -2,7 +2,7 @@
 %define short_name commons-%{base_name}
 %define name       jakarta-%{short_name}
 %define version    1.3
-%define release    2jpp_4fc
+%define release    2jpp_5fc
 %define section    free
 
 Name:           %{name}
@@ -108,6 +108,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3-2jpp_4fc
 - BR java-javadoc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:27:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:27:49 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.37, 1.38
Message-ID: <200607120627.k6C6Rnfu022264@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22238

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jakarta-commons-collections.spec	6 Mar 2006 21:52:22 -0000	1.37
+++ jakarta-commons-collections.spec	12 Jul 2006 06:27:47 -0000	1.38
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release 	2jpp_5fc
+%define release 	2jpp_6fc
 %define	section		free
 
 Name:		%{name}
@@ -111,6 +111,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1-2jpp_6fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:3.1-2jpp_5fc
 - stop the scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:02 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.7,
	1.8
Message-ID: <200607120628.k6C6S2MD022393@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22367

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jakarta-commons-daemon.spec	8 Mar 2006 20:19:13 -0000	1.7
+++ jakarta-commons-daemon.spec	12 Jul 2006 06:27:59 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        2jpp_4fc
+Release:        2jpp_5fc
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-2jpp_5fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 1:1.0-2jpp_4fc
 - added missing %post section for rebuild-gcj-db
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:14 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.13,
	1.14
Message-ID: <200607120628.k6C6SEKf022518@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22494

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-dbcp.spec	22 Dec 2005 06:50:41 -0000	1.13
+++ jakarta-commons-dbcp.spec	12 Jul 2006 06:28:12 -0000	1.14
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.2.1
-%define release 	3jpp_3fc
+%define release 	3jpp_4fc
 %define	section		free
 
 Name:		%{name}
@@ -100,6 +100,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-3jpp_4fc
+- rebuild
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-3jpp_3fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:25 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.28, 1.29
Message-ID: <200607120628.k6C6SP3O022636@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22612

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jakarta-commons-digester.spec	6 Mar 2006 22:59:20 -0000	1.28
+++ jakarta-commons-digester.spec	12 Jul 2006 06:28:22 -0000	1.29
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.7
-%define release 	2jpp_10fc
+%define release 	2jpp_10fc.1
 %define section         free
 
 Name:           %{name}
@@ -111,6 +111,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.7-2jpp_10fc.1
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7-2jpp_10fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:33 -0400
Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec,
	1.7, 1.8
Message-ID: <200607120628.k6C6SXqX022749@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22716

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jakarta-commons-discovery.spec	22 Dec 2005 08:20:10 -0000	1.7
+++ jakarta-commons-discovery.spec	12 Jul 2006 06:28:30 -0000	1.8
@@ -4,7 +4,7 @@
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.3
-Release: 	1jpp_3fc
+Release: 	1jpp_4fc
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -85,6 +85,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.3-1jpp_4fc
+- rebuild
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> -1:1:0.3-1jpp_3fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:40 -0400
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.31,1.32
Message-ID: <200607120628.k6C6SeV9022845@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22820

Modified Files:
	jakarta-commons-el.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-el.spec	10 Jul 2006 13:25:49 -0000	1.31
+++ jakarta-commons-el.spec	12 Jul 2006 06:28:38 -0000	1.32
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        5jpp_2fc
+Release:        5jpp_3fc
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -161,6 +161,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-5jpp_3fc
+- rebuild
+
 * Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_2fc
 - Build with gcj_support enabled
 - Add missing BR for jsp (API)



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:48 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.15, 1.16
Message-ID: <200607120628.k6C6Smvv022954@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22923

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-fileupload.spec	8 Mar 2006 22:43:32 -0000	1.15
+++ jakarta-commons-fileupload.spec	12 Jul 2006 06:28:46 -0000	1.16
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.0
-%define release 	3jpp_6fc
+%define release 	3jpp_7fc
 %define section         free
 
 Name:           %{name}
@@ -112,6 +112,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-3jpp_7fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 1:1.0-3jpp_6fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:28:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:28:56 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.8, 1.9
Message-ID: <200607120628.k6C6SuTF023049@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23020

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-commons-httpclient.spec	6 Mar 2006 22:28:34 -0000	1.8
+++ jakarta-commons-httpclient.spec	12 Jul 2006 06:28:54 -0000	1.9
@@ -1,7 +1,7 @@
 %define short_name httpclient
 %define name       jakarta-commons-%{short_name}
 %define version    3.0
-%define release    0.rc2.0jpp_4fc
+%define release    0.rc2.0jpp_5fc
 %define section    free
 
 Name:           %{name}
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:3.0-0.rc2.0jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:01 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.12,
	1.13
Message-ID: <200607120629.k6C6T1q2023134@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23109

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-lang.spec	22 Mar 2006 16:45:44 -0000	1.12
+++ jakarta-commons-lang.spec	12 Jul 2006 06:28:59 -0000	1.13
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        2.0
-Release: 	2jpp_5fc
+Release: 	2jpp_6fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0-2jpp_6fc
+- rebuild
+
 * Wed Mar 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.0-2jpp_5fc
 - Fixed broken URL and nativized.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:09 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec,
	1.10, 1.11
Message-ID: <200607120629.k6C6T9Zu023233@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23211

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-launcher.spec	6 Mar 2006 22:50:14 -0000	1.10
+++ jakarta-commons-launcher.spec	12 Jul 2006 06:29:07 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        0.9
-Release: 	3jpp_3fc
+Release: 	3jpp_4fc
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
@@ -90,6 +90,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9-3jpp_4fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9-3jpp_3fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:17 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.30, 1.31
Message-ID: <200607120629.k6C6THAJ023335@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23311

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-logging.spec	6 Mar 2006 22:59:57 -0000	1.30
+++ jakarta-commons-logging.spec	12 Jul 2006 06:29:14 -0000	1.31
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0.4
-Release: 	2jpp_10fc
+Release: 	2jpp_10fc.1
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -125,6 +125,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.4-2jpp_10fc.1
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.4-2jpp_10fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:26 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.29, 1.30
Message-ID: <200607120629.k6C6TQw5023453@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23423

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jakarta-commons-modeler.spec	6 Mar 2006 22:58:04 -0000	1.29
+++ jakarta-commons-modeler.spec	12 Jul 2006 06:29:24 -0000	1.30
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release 	4jpp_6fc
+%define release 	4jpp_7fc
 %define	section		free
 
 Name:		%{name}
@@ -117,6 +117,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_7fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-4jpp_6fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:36 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.10,
	1.11
Message-ID: <200607120629.k6C6TaR3023598@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23547

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-pool.spec	6 Mar 2006 23:09:11 -0000	1.10
+++ jakarta-commons-pool.spec	12 Jul 2006 06:29:34 -0000	1.11
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.2
-%define release 	2jpp_4fc
+%define release 	2jpp_5fc
 %define	section		free
 
 Name:		%{name}
@@ -81,6 +81,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2-2jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2-2jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:41 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.10, 1.11
Message-ID: <200607120629.k6C6TfaR023652@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23624

Modified Files:
	jakarta-commons-validator.spec 
Log Message:
bumped for rebuild


Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-validator.spec	22 Feb 2006 04:03:51 -0000	1.10
+++ jakarta-commons-validator.spec	12 Jul 2006 06:29:39 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:        Jakarta Commons Validator
 Name:           %{name}
 Version:        1.1.4
-Release: 	1jpp_5fc
+Release: 	1jpp_6fc
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -143,6 +143,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1.4-1jpp_6fc
+- rebuild
+
 * Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.4-1jpp_5fc
 - Updated to 1.1.4 and aot compiled.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:50 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.153,
	1.154
Message-ID: <200607120629.k6C6To9U023750@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-serv23726

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
bumped for rebuild


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.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- java-1.4.2-gcj-compat.spec	20 Jun 2006 21:23:09 -0000	1.153
+++ java-1.4.2-gcj-compat.spec	12 Jul 2006 06:29:47 -0000	1.154
@@ -14,7 +14,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_87rh
+%define release 	40jpp_88rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -589,6 +589,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.2.0-40jpp_88rh
+- rebuild
+
 * Tue Jun 20 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_87rh
 - Make com.sun.tools.javac.Main.compile method static.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:29:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:29:58 -0400
Subject: rpms/javacc/devel javacc.spec,1.14,1.15
Message-ID: <200607120629.k6C6TwQX023847@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23827

Modified Files:
	javacc.spec 
Log Message:
bumped for rebuild


Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- javacc.spec	11 Feb 2006 03:41:28 -0000	1.14
+++ javacc.spec	12 Jul 2006 06:29:56 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           javacc
 Version:        3.2
-Release: 	1jpp_6fc
+Release: 	1jpp_7fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -91,6 +91,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_7fc
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_6fc
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:30:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:30:32 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.14,1.15
Message-ID: <200607120630.k6C6UW8k023998@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23965

Modified Files:
	java_cup.spec 
Log Message:
bumped for rebuild


Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- java_cup.spec	6 Mar 2006 22:17:33 -0000	1.14
+++ java_cup.spec	12 Jul 2006 06:30:28 -0000	1.15
@@ -1,7 +1,7 @@
 %define name		java_cup
 %define version		0.10
 %define pkg_version	v10k
-%define release 	0.k.1jpp_9fc
+%define release 	0.k.1jpp_10fc
 %define section		free
 
 Name:		%{name}
@@ -102,6 +102,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_10fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:0.10-0.k.1jpp_9fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:32:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:32:08 -0400
Subject: rpms/jdom/devel jdom.spec,1.14,1.15
Message-ID: <200607120632.k6C6W8M1024176@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24130

Modified Files:
	jdom.spec 
Log Message:
bumped for rebuild


Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jdom.spec	8 Jun 2006 04:14:03 -0000	1.14
+++ jdom.spec	12 Jul 2006 06:31:54 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        1jpp_5fc
+Release:        1jpp_6fc
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-1jpp_6fc
+- rebuild
+
 * Wed Jun  7 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-1jpp_5fc
 - Removing .so ownership from demo package
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:32:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:32:38 -0400
Subject: rpms/jessie/devel jessie.spec,1.23,1.24
Message-ID: <200607120632.k6C6Wcdp024301@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24278

Modified Files:
	jessie.spec 
Log Message:
bumped for rebuild


Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jessie.spec	2 Mar 2006 01:52:46 -0000	1.23
+++ jessie.spec	12 Jul 2006 06:32:35 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:		jessie
 Version:	1.0.1
-Release:	3
+Release:	3.1
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
@@ -112,6 +112,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.1-3.1
+- rebuild
+
 * Wed Mar  1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-3
 - Bump release number.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:33:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:33:28 -0400
Subject: rpms/jfsutils/devel jfsutils.spec,1.15,1.16
Message-ID: <200607120633.k6C6XSx2024400@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24381

Modified Files:
	jfsutils.spec 
Log Message:
bumped for rebuild


Index: jfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jfsutils/devel/jfsutils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jfsutils.spec	1 Mar 2006 15:18:58 -0000	1.15
+++ jfsutils.spec	12 Jul 2006 06:33:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the JFS filesystem.
 Name: jfsutils
 Version: 1.1.10
-Release: 4
+Release: 4.1
 Source0: jfsutils-%{version}.tar.gz
 URL: http://oss.software.ibm.com/jfs
 Group: System Environment/Base
@@ -44,6 +44,9 @@
 %doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.10-4.1
+- rebuild
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 1.1.10-4
 - BuildRequires: e2fsprogs-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:34:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:34:02 -0400
Subject: rpms/jlex/devel jlex.spec,1.9,1.10
Message-ID: <200607120634.k6C6Y2VQ024529@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jlex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24516

Modified Files:
	jlex.spec 
Log Message:
bumped for rebuild


Index: jlex.spec
===================================================================
RCS file: /cvs/dist/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jlex.spec	22 Dec 2005 02:09:35 -0000	1.9
+++ jlex.spec	12 Jul 2006 06:34:00 -0000	1.10
@@ -1,6 +1,6 @@
 %define name            jlex
 %define version         1.2.6
-%define release 	1jpp_3fc
+%define release 	1jpp_4fc
 %define section		free
 
 Name:           %{name}
@@ -62,6 +62,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.6-1jpp_4fc
+- rebuild
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 1.2.6-1jpp_3fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:34:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:34:14 -0400
Subject: rpms/joe/devel joe.spec,1.31,1.32
Message-ID: <200607120634.k6C6YEau024607@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24595

Modified Files:
	joe.spec 
Log Message:
bumped for rebuild


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- joe.spec	21 Jun 2006 14:11:27 -0000	1.31
+++ joe.spec	12 Jul 2006 06:34:10 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.4
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-2.1
+- rebuild
+
 * Fri Jun 09 2006 Martin Bacovsky <mbacovsk at redhat.com> 3.4-2
 - fix nonworking PgUp - bug 194213
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:34:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:34:30 -0400
Subject: rpms/joystick/devel joystick.spec,1.16,1.17
Message-ID: <200607120634.k6C6YUIT024694@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24681

Modified Files:
	joystick.spec 
Log Message:
bumped for rebuild


Index: joystick.spec
===================================================================
RCS file: /cvs/dist/rpms/joystick/devel/joystick.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- joystick.spec	11 Feb 2006 03:42:26 -0000	1.16
+++ joystick.spec	12 Jul 2006 06:34:25 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring most popular joysticks.
 Name: joystick
 Version: 1.2.15
-Release: 20.2.1
+Release: 20.2.2
 License: GPL
 Group: System Environment/Base
 ExcludeArch: s390 s390x
@@ -41,6 +41,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.15-20.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:34:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:34:42 -0400
Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.26,1.27
Message-ID: <200607120634.k6C6YgqV024785@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	jpackage-utils.spec 
Log Message:
bumped for rebuild


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jpackage-utils.spec	6 Feb 2006 20:29:18 -0000	1.26
+++ jpackage-utils.spec	12 Jul 2006 06:34:40 -0000	1.27
@@ -5,7 +5,7 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp_2rh
+Release:        1jpp_3rh
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -207,6 +207,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.6-1jpp_3rh
+- rebuild
+
 * 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)



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:02 -0400
Subject: rpms/jpilot/devel jpilot.spec,1.37,1.38
Message-ID: <200607120635.k6C6Z2um024892@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24872

Modified Files:
	jpilot.spec 
Log Message:
bumped for rebuild


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jpilot.spec	27 Jun 2006 13:29:28 -0000	1.37
+++ jpilot.spec	12 Jul 2006 06:35:00 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 7
+Release: 7.1
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -95,6 +95,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.8-7.1
+- rebuild
+
 * Tue Jun 27 2006 Ivana Varekova <varekova at redhat.com> 0.99.8-7
 - fix translation problems (#196852)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:16 -0400
Subject: rpms/jrefactory/devel jrefactory.spec,1.8,1.9
Message-ID: <200607120635.k6C6ZGlc025006@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jrefactory/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24982

Modified Files:
	jrefactory.spec 
Log Message:
bumped for rebuild


Index: jrefactory.spec
===================================================================
RCS file: /cvs/dist/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jrefactory.spec	9 Dec 2005 22:41:06 -0000	1.8
+++ jrefactory.spec	12 Jul 2006 06:35:14 -0000	1.9
@@ -1,11 +1,11 @@
 %define	name	jrefactory
 %define	version	2.8.9
-%define release 3jpp_1fc.1
+%define release 3jpp_1fc.1.1
 %define	section	devel
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}.1.1
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
@@ -60,6 +60,9 @@
 %{_javadir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.8.9-3jpp_1fc.1.1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:26 -0400
Subject: rpms/jsch/devel jsch.spec,1.15,1.16
Message-ID: <200607120635.k6C6ZQDq025126@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	jsch.spec 
Log Message:
bumped for rebuild


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jsch.spec	2 Jun 2006 01:23:01 -0000	1.15
+++ jsch.spec	12 Jul 2006 06:35:23 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           jsch
 Version:        0.1.28
-Release:        1jpp_1fc
+Release:        1jpp_2fc
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.28-1jpp_2fc
+- rebuild
+
 * Thu Jun  1 2006 Ben Konrath <bkonrath at redhat.com> - 0:0.1.28-1jpp_1fc
 - 0.1.28
 - Add BuildRequires ant.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:36 -0400
Subject: rpms/junit/devel junit.spec,1.16,1.17
Message-ID: <200607120635.k6C6ZaEa025244@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	junit.spec 
Log Message:
bumped for rebuild


Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- junit.spec	2 Feb 2006 08:59:45 -0000	1.16
+++ junit.spec	12 Jul 2006 06:35:33 -0000	1.17
@@ -1,6 +1,6 @@
 %define	name		junit
 %define	version		3.8.1
-%define release 	3jpp_7fc
+%define release 	3jpp_8fc
 %define	section		free
 
 Name:		%{name}
@@ -106,6 +106,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.8.1-3jpp_8fc
+- rebuild
+
 * Thu Feb  2 2006 Archit Shah <ashah at redhat.com> 0:3.8.1-3jpp_7fc
 - added dependencies on coreutils
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:45 -0400
Subject: rpms/jwhois/devel jwhois.spec,1.28,1.29
Message-ID: <200607120635.k6C6ZjP9025356@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25332

Modified Files:
	jwhois.spec 
Log Message:
bumped for rebuild


Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jwhois.spec	15 May 2006 22:32:02 -0000	1.28
+++ jwhois.spec	12 Jul 2006 06:35:43 -0000	1.29
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 3.2.3
-Release: 6
+Release: 6.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
@@ -67,6 +67,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-6.1
+- rebuild
+
 * Tue May 16 2006 Miloslav Trmac <mitr at redhat.com> - 3.2.3-6
 - Fix some uninitialized memory accesses
 - Fix a typo in the ipv6 patch



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:35:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:35:57 -0400
Subject: rpms/jzlib/devel jzlib.spec,1.5,1.6
Message-ID: <200607120635.k6C6Zv6d025462@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25435

Modified Files:
	jzlib.spec 
Log Message:
bumped for rebuild


Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jzlib.spec	6 Mar 2006 21:47:26 -0000	1.5
+++ jzlib.spec	12 Jul 2006 06:35:54 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           jzlib
 Version:        1.0.5
-Release: 2jpp_2fc
+Release: 2jpp_3fc
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
@@ -96,6 +96,9 @@
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.5-2jpp_3fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.5-2jpp_2fc
 - stop the scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:36:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:36:30 -0400
Subject: rpms/kasumi/devel kasumi.spec,1.18,1.19
Message-ID: <200607120636.k6C6aU9r025659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kasumi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25638

Modified Files:
	kasumi.spec 
Log Message:
bumped for rebuild


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kasumi.spec	30 Jun 2006 03:59:46 -0000	1.18
+++ kasumi.spec	12 Jul 2006 06:36:28 -0000	1.19
@@ -1,6 +1,6 @@
 Name:    kasumi
 Version: 2.0.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
 - New upstream release.
 - use dist tag.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:36:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:36:56 -0400
Subject: rpms/kbd/devel kbd.spec,1.33,1.34
Message-ID: <200607120636.k6C6auVF025798@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25773

Modified Files:
	kbd.spec 
Log Message:
bumped for rebuild


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kbd.spec	9 Jul 2006 00:29:56 -0000	1.33
+++ kbd.spec	12 Jul 2006 06:36:54 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 16
+Release: 16.1
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -124,6 +124,9 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.12-16.1
+- rebuild
+
 * Sun Jul  9 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-16
 - Don't include <asm/kbdio.h> on SPARC (#198040, patch by Dennis Gilmore
   <dennis at ausil.us>)



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:37:20 -0400
Subject: rpms/kcc/devel kcc.spec,1.15,1.16
Message-ID: <200607120637.k6C6bKBR025912@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25890

Modified Files:
	kcc.spec 
Log Message:
bumped for rebuild


Index: kcc.spec
===================================================================
RCS file: /cvs/dist/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kcc.spec	11 Feb 2006 03:43:44 -0000	1.15
+++ kcc.spec	12 Jul 2006 06:37:18 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		kcc
 Version:	2.3
-Release: 24.2.1
+Release: 24.2.2
 License:	GPL
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -49,6 +49,9 @@
 %{_mandir}/man1/kcc.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3-24.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-24.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:37:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:37:50 -0400
Subject: rpms/kdbg/devel kdbg.spec,1.25,1.26
Message-ID: <200607120637.k6C6bo08026049@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdbg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26020

Modified Files:
	kdbg.spec 
Log Message:
bumped for rebuild


Index: kdbg.spec
===================================================================
RCS file: /cvs/dist/rpms/kdbg/devel/kdbg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdbg.spec	11 Feb 2006 03:43:55 -0000	1.25
+++ kdbg.spec	12 Jul 2006 06:37:48 -0000	1.26
@@ -1,7 +1,7 @@
 Name: kdbg
 Summary: A GUI for gdb, the GNU debugger, and KDE.
 Version: 2.0.2
-Release: 1.2
+Release: 1.2.1
 Epoch: 1
 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
 License: GPL
@@ -60,6 +60,9 @@
 %{_docdir}/HTML/en/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.2-1.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:38:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:38:27 -0400
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.52,1.53
Message-ID: <200607120638.k6C6cRFW026260@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26230

Modified Files:
	kdeaddons.spec 
Log Message:
bumped for rebuild


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdeaddons.spec	7 Jun 2006 17:48:10 -0000	1.52
+++ kdeaddons.spec	12 Jul 2006 06:38:25 -0000	1.53
@@ -15,7 +15,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2
+Release: 2.1
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -178,6 +178,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-2.1
+- rebuild
+
 * Tue Jun 06 2006 Than Ngo <than at redhat.com> 3.5.3-2
 - BR on libtool, automake
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:38:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:38:48 -0400
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.59,1.60
Message-ID: <200607120638.k6C6cmtS026432@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeadmin.spec 
Log Message:
bumped for rebuild


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdeadmin.spec	2 Jun 2006 20:25:19 -0000	1.59
+++ kdeadmin.spec	12 Jul 2006 06:38:45 -0000	1.60
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -413,6 +413,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-1.1
+- rebuild
+
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 7:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:39:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:39:07 -0400
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.48,1.49
Message-ID: <200607120639.k6C6d7D6026607@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeartwork.spec 
Log Message:
bumped for rebuild


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdeartwork.spec	1 Jun 2006 17:21:28 -0000	1.48
+++ kdeartwork.spec	12 Jul 2006 06:39:05 -0000	1.49
@@ -14,7 +14,7 @@
 
 Name: kdeartwork
 Version: 3.5.3
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
+- rebuild
+
 * Thu Jun 01 2006 Than Ngo <than at redhat.com> 3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:39:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:39:39 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.196,1.197
Message-ID: <200607120639.k6C6ddUU026871@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdebase.spec 
Log Message:
bumped for rebuild


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kdebase.spec	11 Jul 2006 13:13:02 -0000	1.196
+++ kdebase.spec	12 Jul 2006 06:39:37 -0000	1.197
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 9
+Release: 9.1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -552,6 +552,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-9
 - cleanup config files
 - upstream patches,



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:39:45 -0400
Subject: rpms/kdebindings/devel kdebindings.spec,1.47,1.48
Message-ID: <200607120639.k6C6djxv026956@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdebindings.spec 
Log Message:
bumped for rebuild


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdebindings.spec	2 Jun 2006 23:43:40 -0000	1.47
+++ kdebindings.spec	12 Jul 2006 06:39:42 -0000	1.48
@@ -28,7 +28,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -280,6 +280,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
+- rebuild
+
 * Sat Jun 03 2006 Than Ngo <than at redhat.com> 3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:39:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:39:53 -0400
Subject: rpms/kdeedu/devel kdeedu.spec,1.46,1.47
Message-ID: <200607120639.k6C6drml027066@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27037

Modified Files:
	kdeedu.spec 
Log Message:
bumped for rebuild


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdeedu.spec	2 Jun 2006 23:23:15 -0000	1.46
+++ kdeedu.spec	12 Jul 2006 06:39:51 -0000	1.47
@@ -13,7 +13,7 @@
 
 Name: kdeedu
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -185,6 +185,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
+- rebuild
+
 * Sat Jun 03 2006 Than Ngo <than at redhat.com> 3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:40:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:40:00 -0400
Subject: rpms/kdegames/devel kdegames.spec,1.51,1.52
Message-ID: <200607120640.k6C6e0rS027160@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdegames.spec 
Log Message:
bumped for rebuild


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdegames.spec	8 Jun 2006 21:59:57 -0000	1.51
+++ kdegames.spec	12 Jul 2006 06:39:57 -0000	1.52
@@ -19,7 +19,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2
+Release: 2.1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -154,6 +154,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-2.1
+- rebuild
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
 - move only *.so symlinks to -devel subpackage
 - enable --enable-new-ldflags since ld bug fixed



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:40:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:40:19 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.85,1.86
Message-ID: <200607120640.k6C6eJ2r027322@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdegraphics.spec 
Log Message:
bumped for rebuild


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdegraphics.spec	23 Jun 2006 20:40:34 -0000	1.85
+++ kdegraphics.spec	12 Jul 2006 06:40:16 -0000	1.86
@@ -18,7 +18,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2
+Release: 2.1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -196,6 +196,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-2.1
+- rebuild
+
 * Fri Jun 23 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
 - add missing kuickshow, printnodetest, svgdisplay, xf86gammacfg #196067
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:41:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:41:12 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.81,1.82
Message-ID: <200607120641.k6C6fCGv027754@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdenetwork.spec 
Log Message:
bumped for rebuild


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- kdenetwork.spec	26 Jun 2006 16:55:24 -0000	1.81
+++ kdenetwork.spec	12 Jul 2006 06:41:08 -0000	1.82
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.3
-Release: 3
+Release: 3.1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -225,6 +225,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 7:3.5.3-3
 - apply patch to check return value
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:41:24 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.90,1.91
Message-ID: <200607120641.k6C6fO0M027885@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdepim.spec 
Log Message:
bumped for rebuild


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- kdepim.spec	8 Jul 2006 08:11:54 -0000	1.90
+++ kdepim.spec	12 Jul 2006 06:41:22 -0000	1.91
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 5
+Release: 5.1
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -191,6 +191,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-5.1
+- rebuild
+
 * Sat Jul 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - fix #136533, crypto/certificate manager support
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:41:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:41:44 -0400
Subject: rpms/kdesdk/devel kdesdk.spec,1.54,1.55
Message-ID: <200607120641.k6C6fifb028080@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdesdk.spec 
Log Message:
bumped for rebuild


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdesdk.spec	2 Jun 2006 20:11:59 -0000	1.54
+++ kdesdk.spec	12 Jul 2006 06:41:42 -0000	1.55
@@ -15,7 +15,7 @@
 
 Name: kdesdk
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -229,6 +229,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.3-1.1
+- rebuild
+
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 3.5.3-1
 - update to 3.5.3 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:42:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:42:09 -0400
Subject: rpms/kdeutils/devel kdeutils.spec,1.58,1.59
Message-ID: <200607120642.k6C6g9Ie028245@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeutils.spec 
Log Message:
bumped for rebuild


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeutils.spec	22 Jun 2006 09:13:47 -0000	1.58
+++ kdeutils.spec	12 Jul 2006 06:42:06 -0000	1.59
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2
+Release: 2.1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -333,6 +333,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-2.1
+- rebuild
+
 * Thu Jun 22 2006 Karsten Hopp <karsten at redhat.de> 3.5.3-2
 - add buildrequire gmp so that kcalc can be built
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:42:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:42:31 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.48,1.49
Message-ID: <200607120642.k6C6gVoe028444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28413

Modified Files:
	kdevelop.spec 
Log Message:
bumped for rebuild


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdevelop.spec	5 Jun 2006 16:43:12 -0000	1.48
+++ kdevelop.spec	12 Jul 2006 06:42:28 -0000	1.49
@@ -13,7 +13,7 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.3
-Release: 1
+Release: 1.1
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -157,6 +157,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.3-1.1
+- rebuild
+
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 9:3.3.3-1
 - update to 3.3.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:42:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:42:43 -0400
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.30,1.31
Message-ID: <200607120642.k6C6ghxl028598@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28538

Modified Files:
	kdewebdev.spec 
Log Message:
bumped for rebuild


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- kdewebdev.spec	5 Jun 2006 16:34:55 -0000	1.30
+++ kdewebdev.spec	12 Jul 2006 06:42:40 -0000	1.31
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -148,6 +148,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-1.1
+- rebuild
+
 * Mon Jun 05 2006 Than Ngo <than at redhat.com> 6:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:42:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:42:49 -0400
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.33,1.34
Message-ID: <200607120642.k6C6gncf028659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28637

Modified Files:
	kexec-tools.spec 
Log Message:
bumped for rebuild


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kexec-tools.spec	5 Jul 2006 20:25:11 -0000	1.33
+++ kexec-tools.spec	12 Jul 2006 06:42:46 -0000	1.34
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 29%{dist}
+Release: 29%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -112,6 +112,9 @@
 %doc TODO
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.101-29%{dist}.1
+- rebuild
+
 * Wed Jul 07 2006 Neil Horman <nhorman at redhat.com> 1.101-27.fc6
 - Modify spec/sysconfig to not autobuild kdump kernel command line
 - Add dist to revision tag



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:00 -0400
Subject: rpms/kon2/devel kon2.spec,1.20,1.21
Message-ID: <200607120643.k6C6h0TL028790@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kon2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28762

Modified Files:
	kon2.spec 
Log Message:
bumped for rebuild


Index: kon2.spec
===================================================================
RCS file: /cvs/dist/rpms/kon2/devel/kon2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kon2.spec	7 Feb 2006 12:27:06 -0000	1.20
+++ kon2.spec	12 Jul 2006 06:42:58 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: KON - Kanji ON Linux console
 Name: kon2
 Version: 0.3.9b
-Release: 26.2
+Release: 26.2.1
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9b-26.2.1
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9b-26.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:10 -0400
Subject: rpms/krb5/devel krb5.spec,1.77,1.78
Message-ID: <200607120643.k6C6hAtq028911@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28887

Modified Files:
	krb5.spec 
Log Message:
bumped for rebuild


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- krb5.spec	6 Jul 2006 21:25:26 -0000	1.77
+++ krb5.spec	12 Jul 2006 06:43:08 -0000	1.78
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.5
-Release: 1
+Release: 1.1
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.5/krb5-1.5-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -130,6 +130,9 @@
 workstation.
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5-1.1
+- rebuild
+
 * Thu Jul  6 2006 Nalin Dahyabhai <nalin at redhat.com> 1.5-1
 - build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:17 -0400
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.20,1.21
Message-ID: <200607120643.k6C6hHdd029007@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28980

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
bumped for rebuild


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- krb5-auth-dialog.spec	25 Jun 2006 03:59:28 -0000	1.20
+++ krb5-auth-dialog.spec	12 Jul 2006 06:43:15 -0000	1.21
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.6.cvs20060212
-Release: 3
+Release: 3.1
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-3.1
+- rebuild
+
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-3
 - Add missing BRs perl-XML-Parser, gettext
 - Work around no network manager stuff on z900s



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:26 -0400
Subject: rpms/krbafs/devel krbafs.spec,1.22,1.23
Message-ID: <200607120643.k6C6hQMn029116@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krbafs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29089

Modified Files:
	krbafs.spec 
Log Message:
bumped for rebuild


Index: krbafs.spec
===================================================================
RCS file: /cvs/dist/rpms/krbafs/devel/krbafs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- krbafs.spec	7 Jun 2006 21:56:22 -0000	1.22
+++ krbafs.spec	12 Jul 2006 06:43:23 -0000	1.23
@@ -1,6 +1,6 @@
 Name: krbafs
 Version: 1.2.2
-Release: 10
+Release: 10.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-10.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.2.2-10
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:35 -0400
Subject: rpms/ksh/devel ksh.spec,1.26,1.27
Message-ID: <200607120643.k6C6hZwg029242@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ksh.spec 
Log Message:
bumped for rebuild


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ksh.spec	1 Jun 2006 11:47:03 -0000	1.26
+++ ksh.spec	12 Jul 2006 06:43:32 -0000	1.27
@@ -8,7 +8,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20060214
-Release:      1
+Release:      1.1
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source2:      http://www.research.att.com/~gsf/download/tgz/ast-base-locale.%{releasedate}.tgz
@@ -100,6 +100,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 20060214-1.1
+- rebuild
+
 * Thu Jun 01 2006 Karsten Hopp <karsten at redhat.de> 20060214-1
 - new upstream source
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:40 -0400
Subject: rpms/kudzu/devel kudzu.spec,1.135,1.136
Message-ID: <200607120643.k6C6heDN029338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29275

Modified Files:
	kudzu.spec 
Log Message:
bumped for rebuild


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kudzu.spec	15 Jun 2006 20:05:55 -0000	1.135
+++ kudzu.spec	12 Jul 2006 06:43:38 -0000	1.136
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.38
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.38-1.1
+- rebuild
+
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 1.2.38-1
 - more s390 segfault fixing
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:49 -0400
Subject: rpms/lam/devel lam.spec,1.34,1.35
Message-ID: <200607120643.k6C6hnAI029443@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29416

Modified Files:
	lam.spec 
Log Message:
bumped for rebuild


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lam.spec	12 Jun 2006 19:39:52 -0000	1.34
+++ lam.spec	12 Jul 2006 06:43:46 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.2
-Release: 1.fc6
+Release: 1.fc6.1
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -188,6 +188,9 @@
 fi;
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:7.1.2-1.fc6.1
+- rebuild
+
 * Mon Jun 12 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.2-1.fc6
 - Upgrade to upstream version 7.1.2
 - fix bug 191433 - Split into -libs and -devel packages



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:43:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:43:56 -0400
Subject: rpms/lcms/devel lcms.spec,1.5,1.6
Message-ID: <200607120643.k6C6huAG029541@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lcms/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29517

Modified Files:
	lcms.spec 
Log Message:
bumped for rebuild


Index: lcms.spec
===================================================================
RCS file: /cvs/dist/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lcms.spec	13 Feb 2006 18:41:22 -0000	1.5
+++ lcms.spec	12 Jul 2006 06:43:53 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           lcms
 Version:        1.15
-Release:        1.2.1
+Release:        1.2.2
 Summary:        Color Management System
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@
 %ghost %{python_sitearch}/lcms.py?
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.2.1
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:44:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:44:10 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.7,1.8
Message-ID: <200607120644.k6C6iAcf029684@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29657

Modified Files:
	ldapjdk.spec 
Log Message:
bumped for rebuild


Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ldapjdk.spec	11 Jul 2006 04:10:17 -0000	1.7
+++ ldapjdk.spec	12 Jul 2006 06:44:07 -0000	1.8
@@ -3,13 +3,13 @@
 %define version		4.17
 %define tar_name	ldapsdk_java
 %define tar_version	20020819
-%define release 1jpp_3fc.1
+%define release 1jpp_3fc.1.1
 %define section		free
 %define use_nonfree	%{?_with_nonfree:1}%{!?_without_nonfree:0}
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.2
+Release: %{release}.2.1
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -139,6 +139,9 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:4.17-1jpp_3fc.1.1.2.1
+- rebuild
+
 * Tue Jul 11 2006 Archit Shah <ashah at redhat.com>
 - add java-devel BuildRequires (bug #192530)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:44:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:44:36 -0400
Subject: rpms/less/devel less.spec,1.31,1.32
Message-ID: <200607120644.k6C6ia4f029880@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/less/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29852

Modified Files:
	less.spec 
Log Message:
bumped for rebuild


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- less.spec	4 May 2006 13:11:58 -0000	1.31
+++ less.spec	12 Jul 2006 06:44:34 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 394
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 394-4.1
+- rebuild
+
 * Thu May  5 2006 Ivana Varekova <varekova at redhat.com> - 394-4
 - fix problem with unassigned variable DECOMPRESSOR (#190619)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:45:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:45:00 -0400
Subject: rpms/lftp/devel lftp.spec,1.51,1.52
Message-ID: <200607120645.k6C6j0uo030065@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	lftp.spec 
Log Message:
bumped for rebuild


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- lftp.spec	12 Jun 2006 16:45:51 -0000	1.51
+++ lftp.spec	12 Jul 2006 06:44:57 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.7
-Release: 	2.FC6
+Release: 	2.FC6.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4.7-2.FC6.1
+- rebuild
+
 * Mon Jun 12 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.7-2
 - Add BuildRequires for broken Brew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:45:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:45:19 -0400
Subject: rpms/lha/devel lha.spec,1.17,1.18
Message-ID: <200607120645.k6C6jJo1030235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lha/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30202

Modified Files:
	lha.spec 
Log Message:
bumped for rebuild


Index: lha.spec
===================================================================
RCS file: /cvs/dist/rpms/lha/devel/lha.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lha.spec	11 Feb 2006 03:51:48 -0000	1.17
+++ lha.spec	12 Jul 2006 06:45:16 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: An archiving and compression utility for LHarc format archives.
 Name: lha
 Version: 1.14i
-Release: 19.2.1
+Release: 19.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.14i-19.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.14i-19.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:45:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:45:37 -0400
Subject: rpms/libao/devel libao.spec,1.20,1.21
Message-ID: <200607120645.k6C6jbeW030419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30394

Modified Files:
	libao.spec 
Log Message:
bumped for rebuild


Index: libao.spec
===================================================================
RCS file: /cvs/dist/rpms/libao/devel/libao.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libao.spec	7 Jun 2006 22:00:06 -0000	1.20
+++ libao.spec	12 Jul 2006 06:45:35 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Cross Platform Audio Output Library.
 Name: libao
 Version: 0.8.6
-Release: 2
+Release: 2.1
 Group: System Environment/Libraries
 License: GPL
 URL: http://www.xiph.org/
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 0.8.6-2
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:45:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:45:45 -0400
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.13,1.14
Message-ID: <200607120645.k6C6jjgD031130@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31000

Modified Files:
	libart_lgpl.spec 
Log Message:
bumped for rebuild


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libart_lgpl.spec	11 Feb 2006 03:52:19 -0000	1.13
+++ libart_lgpl.spec	12 Jul 2006 06:45:43 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 2.2.1
+Release: 2.2.2
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -61,6 +61,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:45:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:45:54 -0400
Subject: rpms/libavc1394/devel libavc1394.spec,1.19,1.20
Message-ID: <200607120645.k6C6jsXO032107@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libavc1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31747

Modified Files:
	libavc1394.spec 
Log Message:
bumped for rebuild


Index: libavc1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libavc1394/devel/libavc1394.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libavc1394.spec	11 Feb 2006 03:52:30 -0000	1.19
+++ libavc1394.spec	12 Jul 2006 06:45:52 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Audio/Video Control library for IEEE-1394 devices
 Name: libavc1394
 Version: 0.5.1
-Release: 2.2
+Release: 2.2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:13 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.41,1.42
Message-ID: <200607120646.k6C6kDpQ002271@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2068

Modified Files:
	libbonobo.spec 
Log Message:
bumped for rebuild


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libbonobo.spec	13 Jun 2006 02:51:18 -0000	1.41
+++ libbonobo.spec	12 Jul 2006 06:46:10 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.14.0
-Release: 4
+Release: 4.1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -117,6 +117,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 2.14.0-4
 - buildreq automake, not automake16
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:23 -0400
Subject: rpms/libbonoboui/devel libbonoboui.spec,1.40,1.41
Message-ID: <200607120646.k6C6kNPP003371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonoboui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3250

Modified Files:
	libbonoboui.spec 
Log Message:
bumped for rebuild


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libbonoboui.spec	10 Jun 2006 04:43:24 -0000	1.40
+++ libbonoboui.spec	12 Jul 2006 06:46:21 -0000	1.41
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.14.0
-Release: 3
+Release: 3.1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -129,6 +129,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-3.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-3
 - More missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:31 -0400
Subject: rpms/libbtctl/devel libbtctl.spec,1.39,1.40
Message-ID: <200607120646.k6C6kVg6004341@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4075

Modified Files:
	libbtctl.spec 
Log Message:
bumped for rebuild


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libbtctl.spec	14 Jun 2006 09:36:06 -0000	1.39
+++ libbtctl.spec	12 Jul 2006 06:46:29 -0000	1.40
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 9
+Release: 9.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -105,6 +105,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-9.1
+- rebuild
+
 * Wed Jun 14 2006 Harald Hoyer <harald at redhat.com> - 0.6.0-9
 - rebuilt for openobex
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:39 -0400
Subject: rpms/libcap/devel libcap.spec,1.20,1.21
Message-ID: <200607120646.k6C6kd9Y005229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4954

Modified Files:
	libcap.spec 
Log Message:
bumped for rebuild


Index: libcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libcap/devel/libcap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libcap.spec	11 Feb 2006 03:53:34 -0000	1.20
+++ libcap.spec	12 Jul 2006 06:46:37 -0000	1.21
@@ -1,6 +1,6 @@
 Name: libcap
 Version: 1.10
-Release: 24.2
+Release: 24.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:46 -0400
Subject: rpms/libglade2/devel libglade2.spec,1.23,1.24
Message-ID: <200607120646.k6C6kkYR005888@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libglade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4837

Modified Files:
	libglade2.spec 
Log Message:
drop redundant patch



Index: libglade2.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libglade2.spec	12 Jul 2006 06:12:50 -0000	1.23
+++ libglade2.spec	12 Jul 2006 06:46:44 -0000	1.24
@@ -21,8 +21,6 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=121025
 Patch1: libglade-2.0.1-nowarning.patch
-# fixed in upstream cvs
-Patch2: libglade-2.5.1-invisible-char.patch
 
 %description
 Libglade is a small library that allows a program to load its user
@@ -52,7 +50,6 @@
 %setup -q -n libglade-%{version}
 
 %patch1 -p1 -b .nowarning
-%patch2 -p1 -b .invisible-char
 
 %build
 %configure --disable-gtk-doc



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:50 -0400
Subject: rpms/libc-client/devel libc-client.spec,1.17,1.18
Message-ID: <200607120646.k6C6kn4q005983@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libc-client/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5901

Modified Files:
	libc-client.spec 
Log Message:
bumped for rebuild


Index: libc-client.spec
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libc-client.spec	11 Feb 2006 03:53:45 -0000	1.17
+++ libc-client.spec	12 Jul 2006 06:46:46 -0000	1.18
@@ -5,7 +5,7 @@
 Summary: C-client mail access routines for IMAP and POP protocols
 Name: libc-client
 Version: 2004g
-Release: 2.2
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2004g-2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2004g-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:46:59 -0400
Subject: rpms/libchewing/devel libchewing.spec,1.6,1.7
Message-ID: <200607120646.k6C6kxJq007006@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libchewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6846

Modified Files:
	libchewing.spec 
Log Message:
bumped for rebuild


Index: libchewing.spec
===================================================================
RCS file: /cvs/dist/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libchewing.spec	22 May 2006 06:05:26 -0000	1.6
+++ libchewing.spec	12 Jul 2006 06:46:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		libchewing
 Version:	0.3.0
-Release: 1%{?dist}.2.1
+Release: 1%{?dist}.2.1.1
 Summary:      Intelligent phonetic input method library for Traditional Chinese
 
 Group: 		System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-1.2.1.1
+- rebuild
+
 * Mon May 22 2006 Darshan Santani <dsantani at redhat.com>
 - New source tarball added.
 - Rebuild.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:47:11 -0400
Subject: rpms/libcroco/devel libcroco.spec,1.18,1.19
Message-ID: <200607120647.k6C6lBBk008281@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcroco/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7995

Modified Files:
	libcroco.spec 
Log Message:
bumped for rebuild


Index: libcroco.spec
===================================================================
RCS file: /cvs/dist/rpms/libcroco/devel/libcroco.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libcroco.spec	23 May 2006 18:14:37 -0000	1.18
+++ libcroco.spec	12 Jul 2006 06:47:08 -0000	1.19
@@ -1,7 +1,7 @@
 Name:             libcroco
 Summary:          A CSS2 parsing library 
 Version:          0.6.1
-Release: 	  2
+Release: 	  2.1
 License:          LGPL
 Group:            System Environment/Libraries
 Source:           %{name}-%{version}.tar.bz2
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.1-2.1
+- rebuild
+
 * Tue May 23 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.1-2
 - Make config script a pkg-config wrapper to fix multilib conflict
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:47:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:47:29 -0400
Subject: rpms/libdaemon/devel libdaemon.spec,1.7,1.8
Message-ID: <200607120647.k6C6lTrJ010855@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdaemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10417

Modified Files:
	libdaemon.spec 
Log Message:
bumped for rebuild


Index: libdaemon.spec
===================================================================
RCS file: /cvs/dist/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdaemon.spec	11 Feb 2006 03:54:21 -0000	1.7
+++ libdaemon.spec	12 Jul 2006 06:47:27 -0000	1.8
@@ -1,6 +1,6 @@
 Name: libdaemon
 Version: 0.10
-Release: 3.1
+Release: 3.2
 Summary: library for writing UNIX daemons
 
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:47:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:47:38 -0400
Subject: rpms/libdbi/devel libdbi.spec,1.16,1.17
Message-ID: <200607120647.k6C6lcvf012050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11695

Modified Files:
	libdbi.spec 
Log Message:
bumped for rebuild


Index: libdbi.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi/devel/libdbi.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libdbi.spec	7 Jun 2006 22:02:31 -0000	1.16
+++ libdbi.spec	12 Jul 2006 06:47:36 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Database Independent Abstraction Layer for C
 Name: libdbi
 Version: 0.8.1
-Release: 2
+Release: 2.1
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi.sourceforge.net/
@@ -70,6 +70,9 @@
 %{_libdir}/libdbi.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1-2.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-2
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:47:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:47:45 -0400
Subject: rpms/libdbi-drivers/devel libdbi-drivers.spec,1.7,1.8
Message-ID: <200607120647.k6C6ljZ1013856@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12771

Modified Files:
	libdbi-drivers.spec 
Log Message:
bumped for rebuild


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi-drivers/devel/libdbi-drivers.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdbi-drivers.spec	11 Feb 2006 03:54:46 -0000	1.7
+++ libdbi-drivers.spec	12 Jul 2006 06:47:43 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.1a
-Release: 1.2.1
+Release: 1.2.2
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi-drivers.sourceforge.net/
@@ -89,6 +89,9 @@
 %{_libdir}/dbd/libdbdpgsql.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1a-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:47:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:47:57 -0400
Subject: rpms/libdhcp/devel libdhcp.spec,1.27,1.28
Message-ID: <200607120647.k6C6lvWq014258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14233

Modified Files:
	libdhcp.spec 
Log Message:
bumped for rebuild


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libdhcp.spec	11 Jul 2006 20:34:21 -0000	1.27
+++ libdhcp.spec	12 Jul 2006 06:47:55 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
 Version: 	1.7
-Release: 	1
+Release: 	1.1
 License: 	GPL
 Group: 		Development/Libraries
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
@@ -76,6 +76,9 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 David Cantrell <dcantrell at redhat.com> - 1.7-1
 - Poll nic_get_links() until NLMSG_DONE is received (#197172)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:48:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:48:13 -0400
Subject: rpms/libdmx/devel libdmx.spec,1.14,1.15
Message-ID: <200607120648.k6C6mD8H014477@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14421

Modified Files:
	libdmx.spec 
Log Message:
bumped for rebuild


Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdmx.spec	28 Jun 2006 10:48:59 -0000	1.14
+++ libdmx.spec	12 Jul 2006 06:48:10 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.2
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Added "Requires: xorg-x11-proto-devel" to devel for dmx.pc



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:48:19 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.15,1.16
Message-ID: <200607120648.k6C6mJmE014544@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14515

Modified Files:
	libdrm.spec 
Log Message:
bumped for rebuild


Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libdrm.spec	28 Jun 2006 00:15:18 -0000	1.15
+++ libdrm.spec	12 Jul 2006 06:48:17 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.2
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 2.0.2-2
 - Bump to 2.0.2 for header updates.  Fix BuildRequires.  Minor spec cleanups. 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:48:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:48:33 -0400
Subject: rpms/libdv/devel libdv.spec,1.18,1.19
Message-ID: <200607120648.k6C6mXNi014702@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14673

Modified Files:
	libdv.spec 
Log Message:
bumped for rebuild


Index: libdv.spec
===================================================================
RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libdv.spec	24 May 2006 21:19:28 -0000	1.18
+++ libdv.spec	12 Jul 2006 06:48:31 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	Software decoder for DV format video
 Name:		libdv
 Version:	0.104
-Release:	4.fc6
+Release:	4.fc6.1
 Epoch:		0
 License:	LGPL
 Group:		System Environment/Libraries
@@ -97,6 +97,9 @@
 %{_libdir}/pkgconfig/libdv.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.104-4.fc6.1
+- rebuild
+
 * Wed May 24 2006 Jarod Wilson <jwilson at redhat.com> 0.104-4
 - disable PIC patch for now, it reliably causes segfaults on x86
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:48:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:48:46 -0400
Subject: rpms/libevent/devel libevent.spec,1.4,1.5
Message-ID: <200607120648.k6C6mk0B014831@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libevent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14805

Modified Files:
	libevent.spec 
Log Message:
bumped for rebuild


Index: libevent.spec
===================================================================
RCS file: /cvs/dist/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libevent.spec	11 Feb 2006 03:55:34 -0000	1.4
+++ libevent.spec	12 Jul 2006 06:48:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           libevent
 Version:        1.1a
-Release:        3.2
+Release:        3.2.1
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1a-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:10 -0400
Subject: rpms/libexif/devel libexif.spec,1.23,1.24
Message-ID: <200607120649.k6C6nAHl015030@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libexif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15007

Modified Files:
	libexif.spec 
Log Message:
bumped for rebuild


Index: libexif.spec
===================================================================
RCS file: /cvs/dist/rpms/libexif/devel/libexif.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libexif.spec	30 May 2006 04:46:45 -0000	1.23
+++ libexif.spec	12 Jul 2006 06:49:07 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
 Version: 0.6.13
-Release: 1
+Release: 1.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libexif.sourceforge.net/
@@ -65,6 +65,9 @@
 %{_datadir}/doc/libexif/api.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.13-1.1
+- rebuild
+
 * Tue May 23 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.13-1
 - Update to 0.6.13
 - Drop upstreamed patches



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:17 -0400
Subject: rpms/libfontenc/devel libfontenc.spec,1.16,1.17
Message-ID: <200607120649.k6C6nHpO015157@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15100

Modified Files:
	libfontenc.spec 
Log Message:
bumped for rebuild


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libfontenc.spec	28 Jun 2006 10:48:49 -0000	1.16
+++ libfontenc.spec	12 Jul 2006 06:49:14 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -86,6 +86,9 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Remove package ownership of mandir/libdir/etc.
 - Added "BuildRequires: autoconf" temporarily as long as autoconf is needed



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:21 -0400
Subject: rpms/libFS/devel libFS.spec,1.24,1.25
Message-ID: <200607120649.k6C6nLEm015207@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15183

Modified Files:
	libFS.spec 
Log Message:
bumped for rebuild


Index: libFS.spec
===================================================================
RCS file: /cvs/dist/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libFS.spec	28 Jun 2006 10:35:38 -0000	1.24
+++ libFS.spec	12 Jul 2006 06:49:19 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
 - Added "Requires: xorg-x11-proto-devel" to devel package.
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:29 -0400
Subject: rpms/libgail-gnome/devel libgail-gnome.spec,1.18,1.19
Message-ID: <200607120649.k6C6nTCh015302@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libgail-gnome.spec 
Log Message:
bumped for rebuild


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgail-gnome.spec	11 Feb 2006 03:56:18 -0000	1.18
+++ libgail-gnome.spec	12 Jul 2006 06:49:26 -0000	1.19
@@ -7,7 +7,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
 Version: 1.1.3
-Release: 1.2
+Release: 1.2.1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:36 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.26,1.27
Message-ID: <200607120649.k6C6naNO015409@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15382

Modified Files:
	libgconf-java.spec 
Log Message:
bumped for rebuild


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libgconf-java.spec	24 May 2006 13:45:42 -0000	1.26
+++ libgconf-java.spec	12 Jul 2006 06:49:34 -0000	1.27
@@ -12,7 +12,7 @@
 
 %define	name_base	libgconf-java
 %define	version		2.12.1.0.20060301.rh1
-%define release 	2
+%define release 	2.1
 
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
@@ -107,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1.0.20060301.rh1-2.1
+- rebuild
+
 * Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.1.0.20060301.rh1-2
 - Change mod time of all java source files for the src zip.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:43 -0400
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.13,1.14
Message-ID: <200607120649.k6C6nhhd015513@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgcrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15481

Modified Files:
	libgcrypt.spec 
Log Message:
bumped for rebuild


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libgcrypt.spec	5 Jun 2006 22:13:54 -0000	1.13
+++ libgcrypt.spec	12 Jul 2006 06:49:41 -0000	1.14
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.2.2
-Release: 3
+Release: 3.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
@@ -80,6 +80,9 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-3.1
+- rebuild
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.2.2-3
 - Added missing buildreq pkgconfig
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:49:50 -0400
Subject: rpms/libgdiplus/devel libgdiplus.spec,1.16,1.17
Message-ID: <200607120649.k6C6noAF015602@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgdiplus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15579

Modified Files:
	libgdiplus.spec 
Log Message:
bumped for rebuild


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgdiplus.spec	7 Jul 2006 09:46:14 -0000	1.16
+++ libgdiplus.spec	12 Jul 2006 06:49:48 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           libgdiplus
 Version:        1.1.16
-Release:        1
+Release:        1.1
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -46,6 +46,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
 - update to 1.1.16
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:50:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:50:04 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.39,1.40
Message-ID: <200607120650.k6C6o4nW015761@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15733

Modified Files:
	libglade-java.spec 
Log Message:
bumped for rebuild


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libglade-java.spec	17 Jun 2006 22:37:41 -0000	1.39
+++ libglade-java.spec	12 Jul 2006 06:50:01 -0000	1.40
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.4
-Release: 	0
+Release: 	0.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -118,6 +118,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.4-0.1
+- rebuild
+
 * Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
 - Use .tar.bz2 instead of .tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:50:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:50:29 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.58,1.59
Message-ID: <200607120650.k6C6oT62015948@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15928

Modified Files:
	libgnome.spec 
Log Message:
bumped for rebuild


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- libgnome.spec	10 Jun 2006 04:47:15 -0000	1.58
+++ libgnome.spec	12 Jul 2006 06:50:26 -0000	1.59
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.14.1
-Release: 4
+Release: 4.1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -158,6 +158,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-4.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-4
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:50:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:50:49 -0400
Subject: rpms/libgnomecanvas/devel libgnomecanvas.spec,1.32,1.33
Message-ID: <200607120650.k6C6onqG016113@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16088

Modified Files:
	libgnomecanvas.spec 
Log Message:
bumped for rebuild


Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgnomecanvas.spec	9 Jun 2006 14:46:41 -0000	1.32
+++ libgnomecanvas.spec	12 Jul 2006 06:50:47 -0000	1.33
@@ -8,7 +8,7 @@
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.14.0
-Release: 4
+Release: 4.1
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-4
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:50:59 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.40,1.41
Message-ID: <200607120650.k6C6oxkR016220@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16196

Modified Files:
	libgnomecups.spec 
Log Message:
bumped for rebuild


Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libgnomecups.spec	14 Jun 2006 20:15:15 -0000	1.40
+++ libgnomecups.spec	12 Jul 2006 06:50:56 -0000	1.41
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release:  6
+Release:  6.1
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-6.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 0.2.2-6
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:51:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:51:23 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.35,1.36
Message-ID: <200607120651.k6C6pN6x016416@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16393

Modified Files:
	libgnome-java.spec 
Log Message:
bumped for rebuild


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgnome-java.spec	17 Jun 2006 22:27:49 -0000	1.35
+++ libgnome-java.spec	12 Jul 2006 06:51:21 -0000	1.36
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.3
-Release: 	0
+Release: 	0.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-0.1
+- rebuild
+
 * Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
 - Use .tar.bz2, not tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:51:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:51:40 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.39,1.40
Message-ID: <200607120651.k6C6pewM016574@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16541

Modified Files:
	libgnomeprint22.spec 
Log Message:
bumped for rebuild


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgnomeprint22.spec	14 Jun 2006 20:01:59 -0000	1.39
+++ libgnomeprint22.spec	12 Jul 2006 06:51:38 -0000	1.40
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	7
+Release:	7.1
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -136,6 +136,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-7.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.12.1-7
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:51:50 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.30,1.31
Message-ID: <200607120651.k6C6pofR016684@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16654

Modified Files:
	libgnomeprintui22.spec 
Log Message:
bumped for rebuild


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgnomeprintui22.spec	13 Jun 2006 03:03:41 -0000	1.30
+++ libgnomeprintui22.spec	12 Jul 2006 06:51:48 -0000	1.31
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 3
+Release: 3.1
 Source0: libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -102,6 +102,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-3.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 2.12.1-3
 - buildreq automake, not automake16
 - buildreq gettext



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:52:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:52:09 -0400
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.48,1.49
Message-ID: <200607120652.k6C6q97D016855@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16823

Modified Files:
	libgnomeui.spec 
Log Message:
bumped for rebuild


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgnomeui.spec	10 Jun 2006 04:55:54 -0000	1.48
+++ libgnomeui.spec	12 Jul 2006 06:52:07 -0000	1.49
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.15.1
-Release: 6
+Release: 6.1
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -162,6 +162,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-6.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-6
 - More BuildRequires fixes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:52:43 -0400
Subject: rpms/libgpg-error/devel libgpg-error.spec,1.12,1.13
Message-ID: <200607120652.k6C6qh2F017107@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpg-error/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17084

Modified Files:
	libgpg-error.spec 
Log Message:
bumped for rebuild


Index: libgpg-error.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpg-error/devel/libgpg-error.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgpg-error.spec	5 Jun 2006 17:54:01 -0000	1.12
+++ libgpg-error.spec	12 Jul 2006 06:52:41 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: libgpg-error
 Name: libgpg-error
 Version: 1.3
-Release: 3
+Release: 3.1
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
@@ -71,6 +71,9 @@
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3-3.1
+- rebuild
+
 * Mon Jun  5 2006 Nalin Dahyabhai <nalin at redhat.com> 1.3-3
 - give gpg-error-config libdir=@exec_prefix@/lib instead of @libdir@, so that
   it agrees on 32- and 64-bit arches (it suppresses the -L argument if @libdir@



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:52:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:52:54 -0400
Subject: rpms/libgpod/devel libgpod.spec,1.4,1.5
Message-ID: <200607120652.k6C6qsJ3017227@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17201

Modified Files:
	libgpod.spec 
Log Message:
bumped for rebuild


Index: libgpod.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgpod.spec	6 Jun 2006 20:15:53 -0000	1.4
+++ libgpod.spec	12 Jul 2006 06:52:52 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.3.0
-Release: 3
+Release: 3.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-3.1
+- rebuild
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-3
 - Add missing BR of perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:02 -0400
Subject: rpms/libgsf/devel libgsf.spec,1.31,1.32
Message-ID: <200607120653.k6C6r2Vm017325@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17297

Modified Files:
	libgsf.spec 
Log Message:
bumped for rebuild


Index: libgsf.spec
===================================================================
RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgsf.spec	29 May 2006 09:58:10 -0000	1.31
+++ libgsf.spec	12 Jul 2006 06:52:59 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.1
-Release: 4
+Release: 4.1
 Group: System Environment/Libraries
 License: LGPL
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
@@ -65,6 +65,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.14.1-4.1
+- rebuild
+
 * Mon May 29 2006 Caolan McNamara <caolanm at redhat.com> 1.14.1-4
 - rh#193417# Add BuildRequires perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:10 -0400
Subject: rpms/libgssapi/devel libgssapi.spec,1.10,1.11
Message-ID: <200607120653.k6C6rATR017425@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17401

Modified Files:
	libgssapi.spec 
Log Message:
bumped for rebuild


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgssapi.spec	20 Jun 2006 17:33:16 -0000	1.10
+++ libgssapi.spec	12 Jul 2006 06:53:07 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.9
-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.9.tar.gz
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.1
+- rebuild
+
 * Tue Jun 20 2006 Steve Dickson <steved at redhat.com>  0.9-2
 - rebuilt for FC6 release
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:17 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.57,1.58
Message-ID: <200607120653.k6C6rHdZ017520@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17495

Modified Files:
	libgtk-java.spec 
Log Message:
bumped for rebuild


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libgtk-java.spec	17 Jun 2006 17:05:02 -0000	1.57
+++ libgtk-java.spec	12 Jul 2006 06:53:14 -0000	1.58
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.5
-Release: 	0
+Release: 	0.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-0.1
+- rebuild
+
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
 - Use .tar.bz2, not .tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:25 -0400
Subject: rpms/libgtop2/devel libgtop2.spec,1.34,1.35
Message-ID: <200607120653.k6C6rPSu017619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17592

Modified Files:
	libgtop2.spec 
Log Message:
bumped for rebuild


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgtop2.spec	6 Jun 2006 14:17:16 -0000	1.34
+++ libgtop2.spec	12 Jul 2006 06:53:23 -0000	1.35
@@ -7,7 +7,7 @@
 Name:		libgtop2
 Summary:        libgtop library (version 2)
 Version: 	2.14.1
-Release: 	3
+Release: 	3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-3.1
+- rebuild
+
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:33 -0400
Subject: rpms/libICE/devel libICE.spec,1.14,1.15
Message-ID: <200607120653.k6C6rXnQ017747@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17694

Modified Files:
	libICE.spec 
Log Message:
bumped for rebuild


Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libICE.spec	28 Jun 2006 10:36:11 -0000	1.14
+++ libICE.spec	12 Jul 2006 06:53:30 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "Requires: xorg-x11-proto-devel"
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:37 -0400
Subject: rpms/libIDL/devel libIDL.spec,1.23,1.24
Message-ID: <200607120653.k6C6rbqd017788@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17761

Modified Files:
	libIDL.spec 
Log Message:
bumped for rebuild


Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libIDL.spec	13 Jun 2006 02:17:14 -0000	1.23
+++ libIDL.spec	12 Jul 2006 06:53:34 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 6
+Release: 6.1
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Patch0: libIDL-0.8.6-multilib.patch
 Group: System Environment/Libraries
@@ -75,6 +75,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-6.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 0.8.6-6
 - we don't call the autotools or libtoolize during build - don't
   buildreq them



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:45 -0400
Subject: rpms/libidn/devel libidn.spec,1.35,1.36
Message-ID: <200607120653.k6C6rjGK017896@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libidn.spec 
Log Message:
bumped for rebuild


Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libidn.spec	7 Jul 2006 13:48:40 -0000	1.35
+++ libidn.spec	12 Jul 2006 06:53:42 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.5
-Release: 1
+Release: 1.1
 URL: http://www.gnu.org/software/libidn
 License: LGPL
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1.1
+- rebuild
+
 * Fri Jul  7 2006 Joe Orton <jorton at redhat.com> 0.6.5-1
 - update to 0.6.5
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:53:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:53:59 -0400
Subject: rpms/libiec61883/devel libiec61883.spec,1.8,1.9
Message-ID: <200607120653.k6C6rxeC018039@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libiec61883/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18011

Modified Files:
	libiec61883.spec 
Log Message:
bumped for rebuild


Index: libiec61883.spec
===================================================================
RCS file: /cvs/dist/rpms/libiec61883/devel/libiec61883.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libiec61883.spec	11 Feb 2006 04:09:03 -0000	1.8
+++ libiec61883.spec	12 Jul 2006 06:53:56 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Streaming library for IEEE1394
 Name: libiec61883
 Version: 1.0.0
-Release: 10.fc5.2
+Release: 10.fc5.2.1
 License: LGPL
 Group: Libraries
 Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:13 -0400
Subject: rpms/libieee1284/devel libieee1284.spec,1.10,1.11
Message-ID: <200607120654.k6C6sDwd018170@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libieee1284/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18144

Modified Files:
	libieee1284.spec 
Log Message:
bumped for rebuild


Index: libieee1284.spec
===================================================================
RCS file: /cvs/dist/rpms/libieee1284/devel/libieee1284.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libieee1284.spec	11 Feb 2006 04:09:14 -0000	1.10
+++ libieee1284.spec	12 Jul 2006 06:54:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A library for interfacing IEEE 1284-compatible devices.
 Name: libieee1284
 Version: 0.2.9
-Release: 3.2.1
+Release: 3.2.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
@@ -72,6 +72,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.9-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:22 -0400
Subject: rpms/libjpeg/devel libjpeg.spec,1.17,1.18
Message-ID: <200607120654.k6C6sM8Z018276@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18252

Modified Files:
	libjpeg.spec 
Log Message:
bumped for rebuild


Index: libjpeg.spec
===================================================================
RCS file: /cvs/dist/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libjpeg.spec	11 Feb 2006 04:09:27 -0000	1.17
+++ libjpeg.spec	12 Jul 2006 06:54:20 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: A library for manipulating JPEG image format files.
 Name: libjpeg
 Version: 6b
-Release: 36.2.1
+Release: 36.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:29 -0400
Subject: rpms/libmng/devel libmng.spec,1.29,1.30
Message-ID: <200607120654.k6C6sTTT018371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18345

Modified Files:
	libmng.spec 
Log Message:
bumped for rebuild


Index: libmng.spec
===================================================================
RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libmng.spec	9 Jun 2006 02:18:13 -0000	1.29
+++ libmng.spec	12 Jul 2006 06:54:27 -0000	1.30
@@ -1,6 +1,6 @@
 Name: libmng
 Version: 1.0.9
-Release: 5
+Release: 5.1
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 License: BSD-like
@@ -64,6 +64,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-5.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.9-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:36 -0400
Subject: rpms/libmusicbrainz/devel libmusicbrainz.spec,1.16,1.17
Message-ID: <200607120654.k6C6sagl018461@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libmusicbrainz.spec 
Log Message:
bumped for rebuild


Index: libmusicbrainz.spec
===================================================================
RCS file: /cvs/dist/rpms/libmusicbrainz/devel/libmusicbrainz.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libmusicbrainz.spec	7 Jun 2006 22:04:21 -0000	1.16
+++ libmusicbrainz.spec	12 Jul 2006 06:54:34 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library for accessing MusicBrainz servers
 Name: libmusicbrainz
 Version: 2.1.1
-Release: 4
+Release: 4.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org/
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-4.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 2.1.1-4
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:44 -0400
Subject: rpms/libnl/devel libnl.spec,1.14,1.15
Message-ID: <200607120654.k6C6sikS018561@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18537

Modified Files:
	libnl.spec 
Log Message:
bumped for rebuild


Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libnl.spec	15 Jun 2006 22:13:54 -0000	1.14
+++ libnl.spec	12 Jul 2006 06:54:41 -0000	1.15
@@ -5,7 +5,7 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.10.%{preversion}
+Release: 0.10.%{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
@@ -70,6 +70,9 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.10.pre5.1
+- rebuild
+
 * Thu Jun 15 2006 Peter Jones <pjones at redhat.com> 1.0-0.10.pre5
 - Fix debuginfo generation.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:51 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.11,1.12
Message-ID: <200607120654.k6C6spLS018690@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18633

Modified Files:
	libnotify.spec 
Log Message:
bumped for rebuild


Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libnotify.spec	19 May 2006 20:23:41 -0000	1.11
+++ libnotify.spec	12 Jul 2006 06:54:48 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.0
-Release: 1 
+Release: 1.1 
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.0-1.1
+- rebuild
+
 * Fri May 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-1
 - Update to 0.4.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:54:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:54:55 -0400
Subject: rpms/libofx/devel libofx.spec,1.17,1.18
Message-ID: <200607120654.k6C6stAp018738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18713

Modified Files:
	libofx.spec 
Log Message:
bumped for rebuild


Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libofx.spec	11 Jul 2006 16:46:25 -0000	1.17
+++ libofx.spec	12 Jul 2006 06:54:53 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.0
-Release: 3
+Release: 3.1
 Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 Patch: libofx-0.7.0-gcc4.patch
 Requires: openjade >= 1.3.1
@@ -63,6 +63,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.0-3.1
+- rebuild
+
 * Tue Jul 11 2006 Bill Nottingham <notting at redhat.com> - 0.8.0-3
 - own %{_datadir}/libofx (#169336)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:04 -0400
Subject: rpms/libogg/devel libogg.spec,1.20,1.21
Message-ID: <200607120655.k6C6t4gR018839@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libogg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18816

Modified Files:
	libogg.spec 
Log Message:
bumped for rebuild


Index: libogg.spec
===================================================================
RCS file: /cvs/dist/rpms/libogg/devel/libogg.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libogg.spec	11 Feb 2006 04:10:44 -0000	1.20
+++ libogg.spec	12 Jul 2006 06:55:02 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The Ogg bitstream file format library.
 Name:		libogg
 Version:	1.1.3
-Release:	1.2 
+Release:	1.2.1 
 Epoch:		2
 Group: System Environment/Libraries
 License:      BSD
@@ -70,6 +70,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.1.3-1.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:13 -0400
Subject: rpms/liboil/devel liboil.spec,1.6,1.7
Message-ID: <200607120655.k6C6tDKn018947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liboil/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18915

Modified Files:
	liboil.spec 
Log Message:
bumped for rebuild


Index: liboil.spec
===================================================================
RCS file: /cvs/dist/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- liboil.spec	27 Mar 2006 17:11:59 -0000	1.6
+++ liboil.spec	12 Jul 2006 06:55:11 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.8
-Release: 2
+Release: 2.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.8-2.1
+- rebuild
+
 * Mon Mar 27 2006 Ray Strode <rstrode at redhat.com> 0.3.8-2
 - Update to 0.3.8 (bug 186930)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:21 -0400
Subject: rpms/libpfm/devel libpfm.spec,1.16,1.17
Message-ID: <200607120655.k6C6tLdN019048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19023

Modified Files:
	libpfm.spec 
Log Message:
bumped for rebuild


Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libpfm.spec	8 Jul 2006 19:19:00 -0000	1.16
+++ libpfm.spec	12 Jul 2006 06:55:18 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
-Release: 0.%{DATE}.%{libpfm_release}
+Release: 0.%{DATE}.%{libpfm_release}.1
 License: MIT-style
 Group: Development/Libraries
 ExclusiveArch: ia64 %{ix86} x86_64
@@ -68,6 +68,9 @@
 %{_prefix}/include/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.060621.8.1
+- rebuild
+
 * Sat Jul 8 2006 Will Cohen <wcohen at redhat.com>
 - Avoid pulling in the example ELF executable into /usr/share. (#198001)
 - Mark man pages as documentation.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:30 -0400
Subject: rpms/libpng/devel libpng.spec,1.35,1.36
Message-ID: <200607120655.k6C6tUIR019153@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19125

Modified Files:
	libpng.spec 
Log Message:
bumped for rebuild


Index: libpng.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libpng.spec	25 May 2006 19:37:05 -0000	1.35
+++ libpng.spec	12 Jul 2006 06:55:27 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Version: 1.2.10
-Release: 5
+Release: 5.1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.10-5.1
+- rebuild
+
 * Thu May 25 2006 Matthias Clasen  <mclasen at redhat.com> - 2:1.2.10-5
 - Fix some paths in the -config script
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:38 -0400
Subject: rpms/libraw1394/devel libraw1394.spec,1.17,1.18
Message-ID: <200607120655.k6C6tcTR019249@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19219

Modified Files:
	libraw1394.spec 
Log Message:
bumped for rebuild


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libraw1394.spec	11 Feb 2006 04:11:44 -0000	1.17
+++ libraw1394.spec	12 Jul 2006 06:55:35 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Library providing low-level IEEE-1394 access
 Name: libraw1394
 Version: 1.2.0
-Release: 3.fc5.2
+Release: 3.fc5.2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.fc5.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:44 -0400
Subject: rpms/librsvg2/devel librsvg2.spec,1.51,1.52
Message-ID: <200607120655.k6C6tiav019371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19317

Modified Files:
	librsvg2.spec 
Log Message:
bumped for rebuild


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- librsvg2.spec	18 Jun 2006 12:09:17 -0000	1.51
+++ librsvg2.spec	12 Jul 2006 06:55:42 -0000	1.52
@@ -12,7 +12,7 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo
 Version: 2.15.0
-Release: 3
+Release: 3.1
 
 License: 	LGPL
 Group: System Environment/Libraries
@@ -117,6 +117,9 @@
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.0-3.1
+- rebuild
+
 * Sun Jun 18 2006 Florian La Roche <laroche at redhat.com>
 - change to separate Requires(post/postun) lines
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:55:48 -0400
Subject: rpms/librtas/devel librtas.spec,1.5,1.6
Message-ID: <200607120655.k6C6tmIY019416@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/librtas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19392

Modified Files:
	librtas.spec 
Log Message:
bumped for rebuild


Index: librtas.spec
===================================================================
RCS file: /cvs/dist/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- librtas.spec	11 Feb 2006 04:12:08 -0000	1.5
+++ librtas.spec	12 Jul 2006 06:55:46 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Libraries to provide access to RTAS calls and RTAS events.
 Name: librtas
 Version: 1.2.4
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:56:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:56:02 -0400
Subject: rpms/libsepol/devel libsepol.spec,1.134,1.135
Message-ID: <200607120656.k6C6u210019627@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19592

Modified Files:
	libsepol.spec 
Log Message:
bumped for rebuild


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- libsepol.spec	5 Jul 2006 02:24:55 -0000	1.134
+++ libsepol.spec	12 Jul 2006 06:55:59 -0000	1.135
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.12.19
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -81,6 +81,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.12.19-1.1
+- rebuild
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.12.19-1
 - Upgrade to latest from NSA
 	* Lindent.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:56:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:56:24 -0400
Subject: rpms/libsilc/devel libsilc.spec,1.11,1.12
Message-ID: <200607120656.k6C6uOZ3019809@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19781

Modified Files:
	libsilc.spec 
Log Message:
bumped for rebuild


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsilc.spec	28 Jun 2006 17:19:30 -0000	1.11
+++ libsilc.spec	12 Jul 2006 06:56:22 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name: libsilc
 Version: 1.0.2
-Release: 1.fc6
+Release: 1.fc6.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
@@ -84,6 +84,9 @@
 %{_includedir}/silc/*.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.2-1.fc6.1
+- rebuild
+
 * Wed Jun 28 2006 Warren Togami <wtogami at redhat.com> 1.0.2-1
 - remove .a and .la files
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:56:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:56:52 -0400
Subject: rpms/libSM/devel libSM.spec,1.15,1.16
Message-ID: <200607120656.k6C6uq5w020010@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19923

Modified Files:
	libSM.spec 
Log Message:
bumped for rebuild


Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libSM.spec	28 Jun 2006 10:36:51 -0000	1.15
+++ libSM.spec	12 Jul 2006 06:56:49 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 06 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:57:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:57:04 -0400
Subject: rpms/libsoup/devel libsoup.spec,1.36,1.37
Message-ID: <200607120657.k6C6v41r020098@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19993

Modified Files:
	libsoup.spec 
Log Message:
bumped for rebuild


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libsoup.spec	14 Jun 2006 19:34:19 -0000	1.36
+++ libsoup.spec	12 Jul 2006 06:57:01 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.94
-Release: 3
+Release: 3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.94-3.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 2.2.94-3
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:57:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:57:13 -0400
Subject: rpms/libstdc++so7/devel libstdc++7.spec,1.7,1.8
Message-ID: <200607120657.k6C6vD15020211@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libstdc++so7/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20177

Modified Files:
	libstdc++7.spec 
Log Message:
bumped for rebuild


Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/devel/libstdc++7.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libstdc++7.spec	7 Jun 2006 11:15:02 -0000	1.7
+++ libstdc++7.spec	12 Jul 2006 06:57:10 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.7.%{datestamp}
+Release: 0.7.%{datestamp}.1
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
@@ -184,6 +184,9 @@
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0-0.7.20060428.1
+- rebuild
+
 * Tue Jun  7 2006 Jakub Jelinek <jakub at redhat.com> 4.2.0-0.7.20060428
 - don't require exactly gcc-c++ 4.1.0 and libstdc++-devel 4.1.0,
   4.1.x is sufficient



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:57:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:57:29 -0400
Subject: rpms/libtermcap/devel libtermcap.spec,1.22,1.23
Message-ID: <200607120657.k6C6vTpR020404@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtermcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20378

Modified Files:
	libtermcap.spec 
Log Message:
bumped for rebuild


Index: libtermcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libtermcap.spec	27 Jun 2006 09:00:52 -0000	1.22
+++ libtermcap.spec	12 Jul 2006 06:57:27 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A basic system library for accessing the termcap database.
 Name: libtermcap
 Version: 2.0.8
-Release: 46
+Release: 46.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
@@ -129,6 +129,9 @@
 %{_infodir}/termcap.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.8-46.1
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 2.0.8-46
 - no need for the trigger, if info files are in the -devel subrpm
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:57:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:57:44 -0400
Subject: rpms/libtheora/devel libtheora.spec,1.11,1.12
Message-ID: <200607120657.k6C6viHR020553@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtheora/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20523

Modified Files:
	libtheora.spec 
Log Message:
bumped for rebuild


Index: libtheora.spec
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtheora.spec	11 Feb 2006 04:14:25 -0000	1.11
+++ libtheora.spec	12 Jul 2006 06:57:42 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha5
-Release: 1.2.1
+Release: 1.2.2
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0alpha5-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:57:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:57:55 -0400
Subject: rpms/libtiff/devel libtiff.spec,1.44,1.45
Message-ID: <200607120657.k6C6vtA4020661@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20639

Modified Files:
	libtiff.spec 
Log Message:
bumped for rebuild


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libtiff.spec	2 Jun 2006 14:45:26 -0000	1.44
+++ libtiff.spec	12 Jul 2006 06:57:53 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.8.2
-Release: 4
+Release: 4.1
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -109,6 +109,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.8.2-4.1
+- rebuild
+
 * Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> - 3.8.2-3
 - Fix multilib conflict
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:07 -0400
Subject: rpms/libtool/devel libtool.spec,1.43,1.44
Message-ID: <200607120658.k6C6w7hC020774@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20746

Modified Files:
	libtool.spec 
Log Message:
bumped for rebuild


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libtool.spec	3 Jul 2006 14:50:05 -0000	1.43
+++ libtool.spec	12 Jul 2006 06:58:04 -0000	1.44
@@ -3,7 +3,7 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:  	6
+Release:  	6.1
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -147,6 +147,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.22-6.1
+- rebuild
+
 * Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-6
 - detect gcc path at runtime instead of requiring one specific version
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:13 -0400
Subject: rpms/libunwind/devel libunwind.spec,1.17,1.18
Message-ID: <200607120658.k6C6wDXj020864@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libunwind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20833

Modified Files:
	libunwind.spec 
Log Message:
bumped for rebuild


Index: libunwind.spec
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libunwind.spec	27 May 2006 04:05:13 -0000	1.17
+++ libunwind.spec	12 Jul 2006 06:58:10 -0000	1.18
@@ -5,7 +5,7 @@
 Name: libunwind
 # Latest libunwind release.
 Version: 0.98.5
-Release: 1
+Release: 1.1
 License: BSD
 Group: Development/Debuggers
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/libunwind-%{version}.tar.gz
@@ -41,6 +41,9 @@
 /usr/include/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.98.5-1.1
+- rebuild
+
 * Sat May 27 2006 Alexandre Oliva <aoliva at redhat.com> - 0.98.5-1
 - Import version 0.98.5.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:19 -0400
Subject: rpms/libusb/devel libusb.spec,1.28,1.29
Message-ID: <200607120658.k6C6wJ5Y020955@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20929

Modified Files:
	libusb.spec 
Log Message:
bumped for rebuild


Index: libusb.spec
===================================================================
RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libusb.spec	9 Jun 2006 20:46:18 -0000	1.28
+++ libusb.spec	12 Jul 2006 06:58:17 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices.
 Name: libusb
 Version: 0.1.12
-Release: 5
+Release: 5.1
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.12-libusbconfig.patch
 License: LGPL
@@ -72,6 +72,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.12-5.1
+- rebuild
+
 * Fri Jun 08 2006 Jesse Keating <jkeating at redhat.com> 0.1.12-5
 - Add missing BR automake, libtool.
 - Add missing Requires in -devel on pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:26 -0400
Subject: rpms/libuser/devel libuser.spec,1.52,1.53
Message-ID: <200607120658.k6C6wQA3021056@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21026

Modified Files:
	libuser.spec 
Log Message:
bumped for rebuild


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libuser.spec	7 Jun 2006 22:15:52 -0000	1.52
+++ libuser.spec	12 Jul 2006 06:58:24 -0000	1.53
@@ -5,7 +5,7 @@
 
 Name: libuser
 Version: 0.54.6
-Release: 2
+Release: 2.1
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -95,6 +95,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.54.6-2.1
+- rebuild
+
 * Wed Jun  7 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.6-2
 - Configure without --enable-gtk-doc to fix multilib conflict (#192715)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:36 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.14,1.15
Message-ID: <200607120658.k6C6waMi021157@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21138

Modified Files:
	libvirt.spec 
Log Message:
bumped for rebuild


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libvirt.spec	11 Jul 2006 22:00:24 -0000	1.14
+++ libvirt.spec	12 Jul 2006 06:58:34 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.1.3
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -106,6 +106,9 @@
 %doc docs/examples/python
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.3-1.1
+- rebuild
+
 * Tue Jul 11 2006 Daniel Veillard <veillard at redhat.com> 0.1.3-1
 - support for HVM Xen guests
 - various bugfixes



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:45 -0400
Subject: rpms/libvorbis/devel libvorbis.spec,1.23,1.24
Message-ID: <200607120658.k6C6wjvg021266@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvorbis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21241

Modified Files:
	libvorbis.spec 
Log Message:
bumped for rebuild


Index: libvorbis.spec
===================================================================
RCS file: /cvs/dist/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libvorbis.spec	11 Feb 2006 04:15:35 -0000	1.23
+++ libvorbis.spec	12 Jul 2006 06:58:43 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.1.2
-Release: 	1.2
+Release: 	1.2.1
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -82,6 +82,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.2-1.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:58:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:58:53 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.20,1.21
Message-ID: <200607120658.k6C6wroX021377@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libvte-java.spec 
Log Message:
bumped for rebuild


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libvte-java.spec	17 Jun 2006 22:24:42 -0000	1.20
+++ libvte-java.spec	12 Jul 2006 06:58:51 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.0
-Release:   0
+Release:   0.1
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -96,6 +96,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.0-0.1
+- rebuild
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-0
 - New version.
 - Remove libgnomeui{,-devel} and libgnomecanvas{,-devel}; upstream have



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:01 -0400
Subject: rpms/libwnck/devel libwnck.spec,1.49,1.50
Message-ID: <200607120659.k6C6x12H021510@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21481

Modified Files:
	libwnck.spec 
Log Message:
bumped for rebuild


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libwnck.spec	13 Jun 2006 15:49:50 -0000	1.49
+++ libwnck.spec	12 Jul 2006 06:58:58 -0000	1.50
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.15.3
-Release: 1
+Release: 1.1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -90,6 +90,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:09 -0400
Subject: rpms/libwpd/devel libwpd.spec,1.27,1.28
Message-ID: <200607120659.k6C6x9Ng021603@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libwpd.spec 
Log Message:
bumped for rebuild


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libwpd.spec	11 Jun 2006 15:48:19 -0000	1.27
+++ libwpd.spec	12 Jul 2006 06:59:06 -0000	1.28
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.5
-Release: 3
+Release: 3.1
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -69,6 +69,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.5-3.1
+- rebuild
+
 * Sun Jun 11 2006  Caolan McNamara <caolanm at redhat.com> 0.8.5-3
 - add wp5nofontlistcrash
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:16 -0400
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.21,1.22
Message-ID: <200607120659.k6C6xGw5021708@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwvstreams/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21677

Modified Files:
	libwvstreams.spec 
Log Message:
bumped for rebuild


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libwvstreams.spec	2 Jun 2006 15:33:43 -0000	1.21
+++ libwvstreams.spec	12 Jul 2006 06:59:14 -0000	1.22
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.2.2
-Release: 2
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.2-2.1
+- rebuild
+
 * Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 4.2.2-2
 - more corrections to multilib patch (bug #192717)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:24 -0400
Subject: rpms/libX11/devel libX11.spec,1.24,1.25
Message-ID: <200607120659.k6C6xOCZ021834@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21777

Modified Files:
	libX11.spec 
Log Message:
bumped for rebuild


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libX11.spec	10 Jul 2006 09:29:13 -0000	1.24
+++ libX11.spec	12 Jul 2006 06:59:21 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -239,6 +239,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6
 - Updated libX11 to version 1.0.3
 - Remove libX11-1.0.1-setuid.diff as it is included in the 1.0.3 release.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:26 -0400
Subject: rpms/libXau/devel libXau.spec,1.14,1.15
Message-ID: <200607120659.k6C6xQeL021875@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21838

Modified Files:
	libXau.spec 
Log Message:
bumped for rebuild


Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXau.spec	28 Jun 2006 10:39:23 -0000	1.14
+++ libXau.spec	12 Jul 2006 06:59:24 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Remove package ownership of mandir/libdir/etc.
 - Added "BuildRequires: xorg-x11-proto-devel" needed by xau.pc



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:31 -0400
Subject: rpms/libXaw/devel libXaw.spec,1.20,1.21
Message-ID: <200607120659.k6C6xVMh021953@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21899

Modified Files:
	libXaw.spec 
Log Message:
bumped for rebuild


Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXaw.spec	7 Jul 2006 22:58:51 -0000	1.20
+++ libXaw.spec	12 Jul 2006 06:59:29 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.2
-Release: 8
+Release: 8.1
 License: MIT/X11
 URL: http://www.x.org
 Group: System Environment/Libraries
@@ -101,6 +101,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8
 - Rebuild, brew doesn't pick up buildroot changes fast enough. 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:38 -0400
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.16,1.17
Message-ID: <200607120659.k6C6xco3022049@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22017

Modified Files:
	libXcomposite.spec 
Log Message:
bumped for rebuild


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXcomposite.spec	28 Jun 2006 10:40:13 -0000	1.16
+++ libXcomposite.spec	12 Jul 2006 06:59:35 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.3
-Release: 5
+Release: 5.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 0.3-5
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Added "Requires: xorg-x11-proto-devel >= 7.0-10, libXfixes-devel to devel



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:44 -0400
Subject: rpms/libXcursor/devel libXcursor.spec,1.14,1.15
Message-ID: <200607120659.k6C6xiMH022143@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22112

Modified Files:
	libXcursor.spec 
Log Message:
bumped for rebuild


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXcursor.spec	28 Jun 2006 10:40:29 -0000	1.14
+++ libXcursor.spec	12 Jul 2006 06:59:42 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.7
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -90,6 +90,9 @@
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.7-1
 - Update to 1.1.7 from X11R7.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:51 -0400
Subject: rpms/libXdamage/devel libXdamage.spec,1.13,1.14
Message-ID: <200607120659.k6C6xpLl022229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22205

Modified Files:
	libXdamage.spec 
Log Message:
bumped for rebuild


Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXdamage.spec	28 Jun 2006 10:40:56 -0000	1.13
+++ libXdamage.spec	12 Jul 2006 06:59:48 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
 Version: 1.0.3
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -80,6 +80,9 @@
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2
 - Added "BuildRequires: xorg-x11-proto-devel >= 7.0-1" as xcursor.pc indicates
   "damageproto >= 1.0" is required.



From fedora-cvs-commits at redhat.com  Wed Jul 12 06:59:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 02:59:57 -0400
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.13,1.14
Message-ID: <200607120659.k6C6xvWP022325@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22299

Modified Files:
	libXdmcp.spec 
Log Message:
bumped for rebuild


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXdmcp.spec	28 Jun 2006 10:41:11 -0000	1.13
+++ libXdmcp.spec	12 Jul 2006 06:59:55 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "BuildRequires: xorg-x11-proto-devel"
 - Added "Requires: xorg-x11-proto-devel" to devel package, needed by xdmcp.pc



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:00:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:00:38 -0400
Subject: rpms/libXevie/devel libXevie.spec,1.14,1.15
Message-ID: <200607120700.k6C70cJx022507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22467

Modified Files:
	libXevie.spec 
Log Message:
bumped for rebuild


Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXevie.spec	28 Jun 2006 10:41:20 -0000	1.14
+++ libXevie.spec	12 Jul 2006 07:00:28 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package, needed by xevie.pc
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:02:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:02:47 -0400
Subject: rpms/libXext/devel libXext.spec,1.14,1.15
Message-ID: <200607120702.k6C72lLK022726@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22689

Modified Files:
	libXext.spec 
Log Message:
bumped for rebuild


Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXext.spec	28 Jun 2006 10:41:46 -0000	1.14
+++ libXext.spec	12 Jul 2006 07:02:31 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:04:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:04:52 -0400
Subject: rpms/libXfixes/devel libXfixes.spec,1.13,1.14
Message-ID: <200607120704.k6C74qB4022941@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22882

Modified Files:
	libXfixes.spec 
Log Message:
bumped for rebuild


Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXfixes.spec	28 Jun 2006 10:41:52 -0000	1.13
+++ libXfixes.spec	12 Jul 2006 07:04:38 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfixes runtime library
 Name: libXfixes
 Version: 4.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 4.0.1-2
 - Added "BuildRequires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"
 - Added "Requires: xorg-x11-proto-devel >= 7.0-7" for "fixesproto >= 4.0"



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:04:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:04:35 -0400
Subject: rpms/gdb/devel gdb-6.3-step-thread-exit-20050211.patch, 1.2,
	1.3 gdb-6.3-threaded-watchpoints2-20050225.patch, 1.3,
	1.4 gdb.spec, 1.189, 1.190
Message-ID: <200607120704.k6C74ZAB022873@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22788

Modified Files:
	gdb-6.3-step-thread-exit-20050211.patch 
	gdb-6.3-threaded-watchpoints2-20050225.patch gdb.spec 
Log Message:
* Wed Jul 12 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-2
- BuildReq uuencode, prelink and, on multilib systems, 32-bit glibc-devel.
- Drop obsolete attach-stop patch.
- Fix testcases in threaded-watchpoints2 and step-thread-exit patches.
- Re-enable attach-pie.exp, asm-source.exp and sigstep.exp tests.


gdb-6.3-step-thread-exit-20050211.patch:
 infrun.c                                   |   22 ++++-
 linux-nat.c                                |   98 ++++++++++++++++++++-----
 target.h                                   |    1 
 testsuite/gdb.threads/step-thread-exit.c   |   50 ++++++++++++
 testsuite/gdb.threads/step-thread-exit.exp |  113 +++++++++++++++++++++++++++++
 5 files changed, 261 insertions(+), 23 deletions(-)

Index: gdb-6.3-step-thread-exit-20050211.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-step-thread-exit-20050211.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdb-6.3-step-thread-exit-20050211.patch	11 Jul 2006 06:33:02 -0000	1.2
+++ gdb-6.3-step-thread-exit-20050211.patch	12 Jul 2006 07:04:21 -0000	1.3
@@ -23,8 +23,8 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c	2006-07-07 02:26:54.000000000 -0300
-@@ -0,0 +1,43 @@
++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.c	2006-07-12 03:18:47.000000000 -0300
+@@ -0,0 +1,50 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2005 Free Software Foundation, Inc.
@@ -55,6 +55,8 @@
 +  printf("In thread_function, *x is %d\n", *x);
 +} /* thread_function_end */
 +
++volatile int repeat = 0;
++
 +main()
 +{
 +  int ret;
@@ -62,8 +64,13 @@
 +  int i = 3;
 +
 +  ret = pthread_create (&th, NULL, thread_function, &i);
++  do
++    {
++      repeat = 0;
++      sleep (3);  /* sleep */
++    }
++  while (repeat);
 +  pthread_join (th, NULL);
-+  sleep (3);  /* sleep */
 +  return 0;
 +}
 +
@@ -71,8 +78,8 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp	2006-07-07 02:26:54.000000000 -0300
-@@ -0,0 +1,100 @@
++++ gdb-6.5/gdb/testsuite/gdb.threads/step-thread-exit.exp	2006-07-12 03:22:30.000000000 -0300
+@@ -0,0 +1,113 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
 +# Copyright 2005 Free Software Foundation, Inc.
@@ -138,8 +145,8 @@
 +     send_gdb "next\n"
 +     exp_continue
 +  }
-+  -re "Thread.*exited.*Stepped over thread exit.*Program received signal SIGSTOP.*$gdb_prompt $" {
-+     pass $test
++  -re "Stepped over thread exit.*Program received signal SIGSTOP.*$gdb_prompt $" {
++     pass "$test"
 +  }
 +  -re "start_thread.*$gdb_prompt $" {
 +     send_gdb "next\n"
@@ -152,7 +159,17 @@
 +runto_main
 +gdb_breakpoint "$sleep_line"
 +gdb_breakpoint "$end_line"
-+gdb_test "continue" "Break.*thread_function.*" "continue to thread_function 2"
++set test "continue to thread_function 2"
++gdb_test_multiple "continue" "$test" {
++    -re "Break.*thread_function.*$gdb_prompt $" {
++	pass $test
++    }
++    -re "Break.*$sleep_line.*$gdb_prompt $" {
++	gdb_test "set repeat=1" "" ""
++	send_gdb "continue\n"
++	exp_continue
++    }
++}
 +
 +# Keep nexting until we cause the thread to exit.  In this case, we
 +# expect the breakpoint in the main thread to have already triggered
@@ -164,8 +181,11 @@
 +     send_gdb "next\n"
 +     exp_continue
 +  }
-+  -re "Thread.*exited.*Stepped over thread exit.*Break.*$sleep_line.*" {
-+     pass $test
++  -re "Stepped over thread exit.*Break.*$sleep_line.*$gdb_prompt $" {
++     pass "$test (breakpoint hit)"
++  }
++  -re "Stepped over thread exit.*$gdb_prompt $" {
++     pass "$test (breakpoint not hit)"
 +  }
 +  -re "start_thread.*$gdb_prompt $" {
 +     send_gdb "next\n"
@@ -175,8 +195,8 @@
 +
 Index: gdb-6.5/gdb/infrun.c
 ===================================================================
---- gdb-6.5.orig/gdb/infrun.c	2006-07-07 01:17:35.000000000 -0300
-+++ gdb-6.5/gdb/infrun.c	2006-07-07 02:26:54.000000000 -0300
+--- gdb-6.5.orig/gdb/infrun.c	2006-07-12 01:54:29.000000000 -0300
++++ gdb-6.5/gdb/infrun.c	2006-07-12 03:22:41.000000000 -0300
 @@ -1088,6 +1088,7 @@ init_execution_control_state (struct exe
    ecs->current_symtab = ecs->sal.symtab;
    ecs->infwait_state = infwait_normal_state;
@@ -202,7 +222,7 @@
    switch (ecs->ws.kind)
      {
      case TARGET_WAITKIND_LOADED:
-@@ -2651,11 +2662,12 @@ process_event_stop_test:
+@@ -2697,11 +2708,12 @@ process_event_stop_test:
  static int
  currently_stepping (struct execution_control_state *ecs)
  {
@@ -222,9 +242,9 @@
  /* Subroutine call with source code we should not step over.  Do step
 Index: gdb-6.5/gdb/linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/linux-nat.c	2006-07-07 02:24:51.000000000 -0300
-+++ gdb-6.5/gdb/linux-nat.c	2006-07-07 02:29:12.000000000 -0300
-@@ -1121,18 +1121,21 @@ linux_nat_detach (char *args, int from_t
+--- gdb-6.5.orig/gdb/linux-nat.c	2006-07-12 01:54:29.000000000 -0300
++++ gdb-6.5/gdb/linux-nat.c	2006-07-12 03:22:42.000000000 -0300
+@@ -1137,18 +1137,21 @@ linux_nat_detach (char *args, int from_t
  static int
  resume_callback (struct lwp_info *lp, void *data)
  {
@@ -249,7 +269,7 @@
      }
  
    return 0;
-@@ -1243,13 +1246,17 @@ linux_nat_resume (ptid_t ptid, int step,
+@@ -1259,13 +1262,17 @@ linux_nat_resume (ptid_t ptid, int step,
    if (resume_all)
      iterate_over_lwps (resume_callback, NULL);
  
@@ -274,7 +294,7 @@
  }
  
  /* Issue kill to specified lwp.  */
-@@ -1840,7 +1847,7 @@ stop_and_resume_callback (struct lwp_inf
+@@ -1863,7 +1870,7 @@ stop_and_resume_callback (struct lwp_inf
        for (ptr = lwp_list; ptr; ptr = ptr->next)
  	if (lp == ptr)
  	  {
@@ -283,7 +303,7 @@
  	    resume_set_callback (lp, NULL);
  	  }
      }
-@@ -1851,8 +1858,10 @@ static ptid_t
+@@ -1874,8 +1881,10 @@ static ptid_t
  linux_nat_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
  {
    struct lwp_info *lp = NULL;
@@ -294,7 +314,7 @@
    pid_t pid = PIDGET (ptid);
    sigset_t flush_mask;
  
-@@ -1890,14 +1899,12 @@ retry:
+@@ -1913,14 +1922,12 @@ retry:
       gets the expected trap so we don't want to wait on any LWP.
       This has ramifications when adjustment of the PC is required which can be
       different after a breakpoint vs a step (e.g. x86).  */
@@ -312,7 +332,7 @@
    }
  
    /* If any pid, check if there is a LWP with a wait status pending.  */
-@@ -2130,8 +2137,9 @@ retry:
+@@ -2161,8 +2168,9 @@ retry:
  	    }
  
  	  /* Make sure we don't report a SIGSTOP that we sent
@@ -324,7 +344,7 @@
  	      && WIFSTOPPED (status) && WSTOPSIG (status) == SIGSTOP)
  	    {
  	      if (debug_linux_nat)
-@@ -2165,6 +2173,20 @@ retry:
+@@ -2196,6 +2204,20 @@ retry:
  
        if (pid == -1)
  	{
@@ -345,7 +365,7 @@
  	  /* Alternate between checking cloned and uncloned processes.  */
  	  options ^= __WCLONE;
  
-@@ -2237,6 +2259,42 @@ retry:
+@@ -2268,6 +2290,42 @@ retry:
      fprintf_unfiltered (gdb_stdlog, "LLW: Candidate event %s in %s.\n",
  			status_to_str (status), target_pid_to_str (lp->ptid));
  
@@ -388,7 +408,7 @@
    /* Now stop all other LWP's ...  */
    iterate_over_lwps (stop_callback, NULL);
  
-@@ -2275,6 +2333,10 @@ retry:
+@@ -2306,6 +2364,10 @@ retry:
    else
      store_waitstatus (ourstatus, status);
  
@@ -401,8 +421,8 @@
  
 Index: gdb-6.5/gdb/target.h
 ===================================================================
---- gdb-6.5.orig/gdb/target.h	2006-05-05 17:08:45.000000000 -0300
-+++ gdb-6.5/gdb/target.h	2006-07-07 02:26:54.000000000 -0300
+--- gdb-6.5.orig/gdb/target.h	2006-07-12 01:54:29.000000000 -0300
++++ gdb-6.5/gdb/target.h	2006-07-12 03:22:40.000000000 -0300
 @@ -136,6 +136,7 @@ enum target_waitkind
  struct target_waitstatus
    {

gdb-6.3-threaded-watchpoints2-20050225.patch:
 amd64-linux-nat.c                       |  155 +++++++++++++++++++++++++++++---
 config/i386/nm-linux.h                  |   54 +++++++++--
 config/i386/nm-linux64.h                |   53 +++++++++-
 i386-linux-nat.c                        |  155 +++++++++++++++++++++++++++++---
 i386-nat.c                              |    1 
 testsuite/gdb.threads/watchthreads.c    |    2 
 testsuite/gdb.threads/watchthreads2.c   |   66 +++++++++++++
 testsuite/gdb.threads/watchthreads2.exp |  133 +++++++++++++++++++++++++++
 8 files changed, 574 insertions(+), 45 deletions(-)

Index: gdb-6.3-threaded-watchpoints2-20050225.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-threaded-watchpoints2-20050225.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdb-6.3-threaded-watchpoints2-20050225.patch	11 Jul 2006 08:25:57 -0000	1.3
+++ gdb-6.3-threaded-watchpoints2-20050225.patch	12 Jul 2006 07:04:22 -0000	1.4
@@ -37,8 +37,8 @@
 
 Index: gdb-6.5/gdb/config/i386/nm-linux64.h
 ===================================================================
---- gdb-6.5.orig/gdb/config/i386/nm-linux64.h	2006-07-11 05:20:42.000000000 -0300
-+++ gdb-6.5/gdb/config/i386/nm-linux64.h	2006-07-11 05:20:44.000000000 -0300
+--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h	2006-07-12 01:54:10.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux64.h	2006-07-12 01:54:29.000000000 -0300
 @@ -35,22 +35,59 @@
  
  /* Provide access to the i386 hardware debugging registers.  */
@@ -109,8 +109,8 @@
  #define FETCH_INFERIOR_REGISTERS
 Index: gdb-6.5/gdb/config/i386/nm-linux.h
 ===================================================================
---- gdb-6.5.orig/gdb/config/i386/nm-linux.h	2006-07-11 05:20:42.000000000 -0300
-+++ gdb-6.5/gdb/config/i386/nm-linux.h	2006-07-11 05:20:44.000000000 -0300
+--- gdb-6.5.orig/gdb/config/i386/nm-linux.h	2006-07-12 01:54:10.000000000 -0300
++++ gdb-6.5/gdb/config/i386/nm-linux.h	2006-07-12 01:54:29.000000000 -0300
 @@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A
  
  /* Provide access to the i386 hardware debugging registers.  */
@@ -183,8 +183,8 @@
  
 Index: gdb-6.5/gdb/i386-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-nat.c	2006-07-11 05:20:42.000000000 -0300
-+++ gdb-6.5/gdb/i386-nat.c	2006-07-11 05:20:44.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-nat.c	2006-07-12 01:54:10.000000000 -0300
++++ gdb-6.5/gdb/i386-nat.c	2006-07-12 01:54:29.000000000 -0300
 @@ -21,6 +21,7 @@
  
  #include "defs.h"
@@ -196,7 +196,7 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-11 05:20:44.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c	2006-07-12 01:54:29.000000000 -0300
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -258,7 +258,7 @@
 +    /* Don't run forever.  Run just short of it :)  */
 +    while (*myp > 0)
 +      {
-+	(*myp) ++;  /* Loop increment.  */
++	(*myp) ++; usleep (1); /* Loop increment.  */
 +      }
 +
 +    pthread_exit(NULL);
@@ -267,7 +267,7 @@
 Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-11 05:20:44.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp	2006-07-12 01:54:29.000000000 -0300
 @@ -0,0 +1,133 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -404,8 +404,8 @@
 +}
 Index: gdb-6.5/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-11 05:20:42.000000000 -0300
-+++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-11 05:21:58.000000000 -0300
+--- gdb-6.5.orig/gdb/i386-linux-nat.c	2006-07-12 01:54:28.000000000 -0300
++++ gdb-6.5/gdb/i386-linux-nat.c	2006-07-12 01:57:19.000000000 -0300
 @@ -24,6 +24,7 @@
  #include "inferior.h"
  #include "gdbcore.h"
@@ -625,8 +625,8 @@
  }
 Index: gdb-6.5/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-11 05:20:42.000000000 -0300
-+++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-11 05:20:44.000000000 -0300
+--- gdb-6.5.orig/gdb/amd64-linux-nat.c	2006-07-12 01:54:28.000000000 -0300
++++ gdb-6.5/gdb/amd64-linux-nat.c	2006-07-12 01:54:29.000000000 -0300
 @@ -25,6 +25,7 @@
  #include "inferior.h"
  #include "gdbcore.h"
@@ -844,3 +844,16 @@
 +
 +  observer_attach_linux_new_thread (amd64_linux_new_thread);
  }
+Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads.c
+===================================================================
+--- gdb-6.5.orig/gdb/testsuite/gdb.threads/watchthreads.c	2006-07-12 01:55:19.000000000 -0300
++++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads.c	2006-07-12 01:56:51.000000000 -0300
+@@ -58,7 +58,7 @@ void *thread_function(void *arg) {
+     /* Don't run forever.  Run just short of it :)  */
+     while (*myp > 0)
+       {
+-	(*myp) ++;  /* Loop increment.  */
++	(*myp) ++; usleep (1); /* Loop increment.  */
+       }
+ 
+     pthread_exit(NULL);


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gdb.spec	11 Jul 2006 08:06:56 -0000	1.189
+++ gdb.spec	12 Jul 2006 07:04:22 -0000	1.190
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -187,6 +187,7 @@
 Patch166: gdb-6.3-ia64-sigtramp-fp-20050926.patch
 
 # Support gdb attaching to a stopped process
+# Appears to be obsolete, not applied. -aoliva
 Patch168: gdb-6.3-attach-stop-20051011.patch
 
 # Fix ia64 gdb problem with user-specified SIGILL handling
@@ -216,7 +217,12 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex bison
+BuildRequires: flex bison uuencode prelink
+
+%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
+%endif
 
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
@@ -289,7 +295,6 @@
 %patch164 -p1
 %patch165 -p1
 %patch166 -p1
-%patch168 -p1
 %patch169 -p1
 %patch170 -p1
 %patch173 -p1
@@ -374,7 +379,7 @@
 echo ====================TESTING=========================
 cd gdb/testsuite
 # Need to use a single --ignore option, second use overrides first.
-make -k check RUNTESTFLAGS='--ignore bigcore.exp\ attach-pie.exp\ asm-source.exp\ sigstep.exp' || :
+make -k check RUNTESTFLAGS='--ignore bigcore.exp' || :
 for t in sum log; do
   ln gdb.$t gdb-%{_target_platform}.$t || :
 done
@@ -458,9 +463,15 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Wed Jul 12 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-2
+- BuildReq uuencode, prelink and, on multilib systems, 32-bit glibc-devel.
+- Drop obsolete attach-stop patch.
+- Fix testcases in threaded-watchpoints2 and step-thread-exit patches.
+- Re-enable attach-pie.exp, asm-source.exp and sigstep.exp tests.
+
 * Tue Jul 11 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-1
 - Upgrade to GDB 6.5.  Drop redundant patches, forward-port remaining
-ones.
+ones.  Re-enable ada and objc testsuites.
 
 * Thu Jun 15 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.132
 - Require flex and bison at build time.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:05:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:05:18 -0400
Subject: rpms/libXfont/devel libXfont.spec,1.20,1.21
Message-ID: <200607120705.k6C75ICm023088@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23067

Modified Files:
	libXfont.spec 
Log Message:
bumped for rebuild


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libXfont.spec	10 Jul 2006 09:28:01 -0000	1.20
+++ libXfont.spec	12 Jul 2006 07:05:15 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.2.0
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.2.0-1.fc6
 - Update to 1.2.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:06:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:06:14 -0400
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.14,1.15
Message-ID: <200607120706.k6C76E22023218@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23173

Modified Files:
	libXfontcache.spec 
Log Message:
bumped for rebuild


Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXfontcache.spec	28 Jun 2006 10:42:19 -0000	1.14
+++ libXfontcache.spec	12 Jul 2006 07:05:58 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.2
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xfontcache.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:07:37 -0400
Subject: rpms/libXft/devel libXft.spec,1.16,1.17
Message-ID: <200607120707.k6C77b8q023339@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23320

Modified Files:
	libXft.spec 
Log Message:
bumped for rebuild


Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXft.spec	28 Jun 2006 10:42:41 -0000	1.16
+++ libXft.spec	12 Jul 2006 07:07:34 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.10
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -95,6 +95,9 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 2.1.10
 - Updated libXft to version 2.1.10
 - Specify freetype dependencies as >= 2.1.9-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:08:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:08:13 -0400
Subject: rpms/libXi/devel libXi.spec,1.14,1.15
Message-ID: <200607120708.k6C78DY1023432@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23401

Modified Files:
	libXi.spec 
Log Message:
bumped for rebuild


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXi.spec	28 Jun 2006 10:42:55 -0000	1.14
+++ libXi.spec	12 Jul 2006 07:08:10 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xi.pc
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:08:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:08:57 -0400
Subject: rpms/libXinerama/devel libXinerama.spec,1.12,1.13
Message-ID: <200607120708.k6C78viu023549@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23514

Modified Files:
	libXinerama.spec 
Log Message:
bumped for rebuild


Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXinerama.spec	28 Jun 2006 10:43:07 -0000	1.12
+++ libXinerama.spec	12 Jul 2006 07:08:53 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -77,6 +77,9 @@
 %{_libdir}/pkgconfig/xinerama.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Replace "makeinstall" with "make install DESTDIR=..."
 - Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:09:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:09:45 -0400
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.17,1.18
Message-ID: <200607120709.k6C79jiQ023687@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23658

Modified Files:
	libxkbfile.spec 
Log Message:
bumped for rebuild


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libxkbfile.spec	28 Jun 2006 10:50:30 -0000	1.17
+++ libxkbfile.spec	12 Jul 2006 07:09:33 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.3
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xkbfile.pc 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:10:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:10:29 -0400
Subject: rpms/libxklavier/devel libxklavier.spec,1.24,1.25
Message-ID: <200607120710.k6C7ATgw023902@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23871

Modified Files:
	libxklavier.spec 
Log Message:
bumped for rebuild


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libxklavier.spec	15 Jun 2006 14:23:04 -0000	1.24
+++ libxklavier.spec	12 Jul 2006 07:10:26 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	2.91
-Release: 	1
+Release: 	1.1
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -72,6 +72,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.91-1.1
+- rebuild
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.91-1
 - Update to 2.91
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:10:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:10:39 -0400
Subject: rpms/libxml/devel libxml.spec,1.19,1.20
Message-ID: <200607120710.k6C7Adow024008@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23978

Modified Files:
	libxml.spec 
Log Message:
bumped for rebuild


Index: libxml.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libxml.spec	11 Feb 2006 04:20:44 -0000	1.19
+++ libxml.spec	12 Jul 2006 07:10:36 -0000	1.20
@@ -1,7 +1,7 @@
 Name:		libxml
 Summary:	libXML library
 Version:	1.8.17
-Release: 13.2.1
+Release: 13.2.2
 Epoch:		1
 License:	LGPL
 Group:		Development/Libraries
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.8.17-13.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:10:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:10:48 -0400
Subject: rpms/libXmu/devel libXmu.spec,1.16,1.17
Message-ID: <200607120710.k6C7AmIS024149@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24124

Modified Files:
	libXmu.spec 
Log Message:
bumped for rebuild


Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXmu.spec	7 Jul 2006 22:59:52 -0000	1.16
+++ libXmu.spec	12 Jul 2006 07:10:46 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.2
-Release: 4
+Release: 4.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -109,6 +109,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-4
 - Rebuild, brew doesn't pick up buildroot changes fast enough.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:10:57 -0400
Subject: rpms/libXp/devel libXp.spec,1.14,1.15
Message-ID: <200607120710.k6C7AvKE024288@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24235

Modified Files:
	libXp.spec 
Log Message:
bumped for rebuild


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXp.spec	10 Jul 2006 11:56:37 -0000	1.14
+++ libXp.spec	12 Jul 2006 07:10:55 -0000	1.15
@@ -12,7 +12,7 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 4
+Release: 4.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -108,6 +108,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-4
 - Renamed libXp_deprecated rpm macro to "with_devel" to avoid confusion.  This
   library is still deprecated, we just decided to remove the word "deprecated"



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:11:08 -0400
Subject: rpms/libXrandr/devel libXrandr.spec,1.14,1.15
Message-ID: <200607120711.k6C7B8rW024381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24359

Modified Files:
	libXrandr.spec 
Log Message:
bumped for rebuild


Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXrandr.spec	28 Jun 2006 10:44:16 -0000	1.14
+++ libXrandr.spec	12 Jul 2006 07:11:06 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.1.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel pkg for xrandr.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:11:47 -0400
Subject: rpms/libXres/devel libXres.spec,1.14,1.15
Message-ID: <200607120711.k6C7BlGg024681@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24653

Modified Files:
	libXres.spec 
Log Message:
bumped for rebuild


Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXres.spec	28 Jun 2006 10:45:11 -0000	1.14
+++ libXres.spec	12 Jul 2006 07:11:44 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xres.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:12:15 -0400
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.19,1.20
Message-ID: <200607120712.k6C7CFBY024910@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24879

Modified Files:
	libXScrnSaver.spec 
Log Message:
bumped for rebuild


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libXScrnSaver.spec	28 Jun 2006 10:38:13 -0000	1.19
+++ libXScrnSaver.spec	12 Jul 2006 07:12:12 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.1.0
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -83,6 +83,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
 - Update build dep to "xorg-x11-proto-devel >= 7.0-9" for scrnsaverproto 1.1
 - Added "Requires: xorg-x11-proto-devel >= 7.0-9" to devel package, to match



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:12:22 -0400
Subject: rpms/libxslt/devel libxslt.spec,1.38,1.39
Message-ID: <200607120712.k6C7CMbJ025006@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxslt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24982

Modified Files:
	libxslt.spec 
Log Message:
bumped for rebuild


Index: libxslt.spec
===================================================================
RCS file: /cvs/dist/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libxslt.spec	6 Jun 2006 15:37:15 -0000	1.38
+++ libxslt.spec	12 Jul 2006 07:12:20 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.17
-Release: 1
+Release: 1.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -123,5 +123,8 @@
 %doc python/tests/*.xsl
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.17-1.1
+- rebuild
+
 * Tue Jun  6 2006 Daniel Veillard <veillard at redhat.com>
 - upstream release 1.1.17 see http://xmlsoft.org/XSLT/news.html



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:12:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:12:44 -0400
Subject: rpms/libXt/devel libXt.spec,1.22,1.23
Message-ID: <200607120712.k6C7CixO025203@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25178

Modified Files:
	libXt.spec 
Log Message:
bumped for rebuild


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libXt.spec	11 Jul 2006 21:14:15 -0000	1.22
+++ libXt.spec	12 Jul 2006 07:12:42 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.2
-Release: 3%{?dist}
+Release: 3.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -131,6 +131,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3.fc6
 - Add the {_datadir}/X11/app-defaults directory to the file manifest, as
   libXt is the canonical owner of the directory.  Discovered in (#198025).



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:12:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:12:51 -0400
Subject: rpms/libXTrap/devel libXTrap.spec,1.12,1.13
Message-ID: <200607120712.k6C7CpYV025303@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXTrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25277

Modified Files:
	libXTrap.spec 
Log Message:
bumped for rebuild


Index: libXTrap.spec
===================================================================
RCS file: /cvs/dist/rpms/libXTrap/devel/libXTrap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXTrap.spec	28 Jun 2006 10:39:08 -0000	1.12
+++ libXTrap.spec	12 Jul 2006 07:12:49 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXTrap runtime library
 Name: libXTrap
 Version: 1.0.0
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/xtrap.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 07 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
 - Added "Requires: xorg-x11-proto-devel" for xtrap.pc
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:00 -0400
Subject: rpms/libXtst/devel libXtst.spec,1.13,1.14
Message-ID: <200607120713.k6C7D0b3025419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25388

Modified Files:
	libXtst.spec 
Log Message:
bumped for rebuild


Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXtst.spec	28 Jun 2006 10:45:38 -0000	1.13
+++ libXtst.spec	12 Jul 2006 07:12:58 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xtst.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:07 -0400
Subject: rpms/libXv/devel libXv.spec,1.15,1.16
Message-ID: <200607120713.k6C7D7rH025512@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libXv.spec 
Log Message:
bumped for rebuild


Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXv.spec	28 Jun 2006 10:45:51 -0000	1.15
+++ libXv.spec	12 Jul 2006 07:13:05 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
 Version: 1.0.1
-Release: 4
+Release: 4.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
 - Added "Requires: xorg-x11-proto-devel" to devel package for xv.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:15 -0400
Subject: rpms/libXvMC/devel libXvMC.spec,1.16,1.17
Message-ID: <200607120713.k6C7DFNi025604@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libXvMC.spec 
Log Message:
bumped for rebuild


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libXvMC.spec	28 Jun 2006 10:46:09 -0000	1.16
+++ libXvMC.spec	12 Jul 2006 07:13:12 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Added "BuildRequires: pkgconfig" for (#193506)
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:22 -0400
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.14,1.15
Message-ID: <200607120713.k6C7DMC7025700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25672

Modified Files:
	libXxf86dga.spec 
Log Message:
bumped for rebuild


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXxf86dga.spec	28 Jun 2006 10:46:21 -0000	1.14
+++ libXxf86dga.spec	12 Jul 2006 07:13:20 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xxf86dga.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:29 -0400
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.14,1.15
Message-ID: <200607120713.k6C7DTNj025794@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25767

Modified Files:
	libXxf86misc.spec 
Log Message:
bumped for rebuild


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXxf86misc.spec	28 Jun 2006 10:47:18 -0000	1.14
+++ libXxf86misc.spec	12 Jul 2006 07:13:26 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel" to devel package for xxf86misc.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:34 -0400
Subject: rpms/gdb/devel gdb.spec,1.190,1.191
Message-ID: <200607120713.k6C7DYw6025884@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25807

Modified Files:
	gdb.spec 
Log Message:
It's sharutils that provides uuencode


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- gdb.spec	12 Jul 2006 07:04:22 -0000	1.190
+++ gdb.spec	12 Jul 2006 07:13:31 -0000	1.191
@@ -217,7 +217,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex bison uuencode prelink
+BuildRequires: flex bison sharutils prelink
 
 %ifarch %{multilib_64_archs} sparc ppc
 # Ensure glibc{,-devel} is installed for both multilib arches
@@ -464,7 +464,7 @@
 
 %changelog
 * Wed Jul 12 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-2
-- BuildReq uuencode, prelink and, on multilib systems, 32-bit glibc-devel.
+- BuildReq sharutils, prelink and, on multilib systems, 32-bit glibc-devel.
 - Drop obsolete attach-stop patch.
 - Fix testcases in threaded-watchpoints2 and step-thread-exit patches.
 - Re-enable attach-pie.exp, asm-source.exp and sigstep.exp tests.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:37 -0400
Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.15,1.16
Message-ID: <200607120713.k6C7DaDH025910@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25877

Modified Files:
	libXxf86vm.spec 
Log Message:
bumped for rebuild


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXxf86vm.spec	28 Jun 2006 10:47:18 -0000	1.15
+++ libXxf86vm.spec	12 Jul 2006 07:13:34 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added "Requires: xorg-x11-proto-devel"
 - Remove package ownership of mandir/libdir/etc.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:43 -0400
Subject: rpms/linux-atm/devel linux-atm.spec,1.14,1.15
Message-ID: <200607120713.k6C7DhTv026008@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25977

Modified Files:
	linux-atm.spec 
Log Message:
bumped for rebuild


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- linux-atm.spec	29 May 2006 23:44:10 -0000	1.14
+++ linux-atm.spec	12 Jul 2006 07:13:41 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.3.3
+Release: 0.20050118.3.3.1
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -86,6 +86,9 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.3.3.1
+- rebuild
+
 * Tue May 30 2006 David Woodhouse <dwmw2 at redhat.com> - 2.5.0-0.20050118.3.3
 - BuildRequires: byacc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:50 -0400
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.21,1.22
Message-ID: <200607120713.k6C7Do0A026133@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxdoc-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26102

Modified Files:
	linuxdoc-tools.spec 
Log Message:
bumped for rebuild


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linuxdoc-tools.spec	12 Jun 2006 15:48:47 -0000	1.21
+++ linuxdoc-tools.spec	12 Jul 2006 07:13:48 -0000	1.22
@@ -5,7 +5,7 @@
 Obsoletes: sgml-tools
 Obsoletes: linuxdoc-sgml
 Version: 0.9.21
-Release: 7
+Release: 7.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.21-7.1
+- rebuild
+
 * Mon Jun 12 2006 Tim Waugh <twaugh at redhat.com> 0.9.21-7
 - Build requires autoconf (bug #194752).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:13:57 -0400
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.34,1.35
Message-ID: <200607120713.k6C7Dvxr026229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26199

Modified Files:
	linuxwacom.spec 
Log Message:
bumped for rebuild


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linuxwacom.spec	21 May 2006 20:59:44 -0000	1.34
+++ linuxwacom.spec	12 Jul 2006 07:13:54 -0000	1.35
@@ -6,7 +6,7 @@
 Name:		linuxwacom
 Version:	0.7.4_1
 Epoch:		0
-Release:	2
+Release:	2.1
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -94,6 +94,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.4_1-2.1
+- rebuild
+
 * Sun May 21 2006 Peter Jones <pjones at redhat.com> 0:0.7.4_1-2
 - fix the sysfs test equality syntax in the udev rule
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:04 -0400
Subject: rpms/lksctp-tools/devel lksctp-tools.spec,1.11,1.12
Message-ID: <200607120714.k6C7E4rY026328@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lksctp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26302

Modified Files:
	lksctp-tools.spec 
Log Message:
bumped for rebuild


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lksctp-tools.spec	11 Feb 2006 04:24:47 -0000	1.11
+++ lksctp-tools.spec	12 Jul 2006 07:14:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.5
-Release: 1.fc5.2
+Release: 1.fc5.2.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://lksctp.sourceforge.net/
@@ -89,6 +89,9 @@
 %doc doc/*.txt
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:13 -0400
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.40,1.41
Message-ID: <200607120714.k6C7EDCx026432@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26405

Modified Files:
	lm_sensors.spec 
Log Message:
bumped for rebuild


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- lm_sensors.spec	10 Jul 2006 02:42:23 -0000	1.40
+++ lm_sensors.spec	12 Jul 2006 07:14:10 -0000	1.41
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.10.0
-Release: 3
+Release: 3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.10.0-3.1
+- rebuild
+
 * Sun Jul 09 2006 Warren Togami <wtogami at redhat.com> 2.10.0-3
 - change buildreq from sysfsutils-devel to libsysfs-devel (#198055)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:21 -0400
Subject: rpms/lockdev/devel lockdev.spec,1.23,1.24
Message-ID: <200607120714.k6C7ELfu026539@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lockdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26506

Modified Files:
	lockdev.spec 
Log Message:
bumped for rebuild


Index: lockdev.spec
===================================================================
RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lockdev.spec	11 Feb 2006 04:24:58 -0000	1.23
+++ lockdev.spec	12 Jul 2006 07:14:19 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A library for locking devices.
 Name: lockdev
 Version: 1.0.1
-Release: 9.2.1
+Release: 9.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-9.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:30 -0400
Subject: rpms/log4j/devel log4j.spec,1.16,1.17
Message-ID: <200607120714.k6C7EUlU026641@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26617

Modified Files:
	log4j.spec 
Log Message:
bumped for rebuild


Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- log4j.spec	6 Mar 2006 21:45:11 -0000	1.16
+++ log4j.spec	12 Jul 2006 07:14:27 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           log4j
 Version:        1.2.8
-Release: 	7jpp_8fc
+Release: 	7jpp_9fc
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.8-7jpp_9fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2.8-7jpp_8fc
 - fix scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:38 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.47,1.48
Message-ID: <200607120714.k6C7EcbF026753@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26723

Modified Files:
	logrotate.spec 
Log Message:
bumped for rebuild


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- logrotate.spec	13 Jun 2006 12:56:30 -0000	1.47
+++ logrotate.spec	12 Jul 2006 07:14:36 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.4
-Release: 3
+Release: 3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.1
+- rebuild
+
 * Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-3
 - rename ENOSUP to ENOTSUP
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:45 -0400
Subject: rpms/lrzsz/devel lrzsz.spec,1.17,1.18
Message-ID: <200607120714.k6C7Ejp3026846@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lrzsz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26821

Modified Files:
	lrzsz.spec 
Log Message:
bumped for rebuild


Index: lrzsz.spec
===================================================================
RCS file: /cvs/dist/rpms/lrzsz/devel/lrzsz.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lrzsz.spec	8 Jun 2006 20:32:45 -0000	1.17
+++ lrzsz.spec	12 Jul 2006 07:14:43 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The lrz and lsz modem communications programs.
 Name: lrzsz
 Version: 0.12.20
-Release: 22
+Release: 22.1
 License: GPL
 Group: Applications/Communications
 Source: http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
@@ -44,6 +44,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.20-22.1
+- rebuild
+
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 0.12.20-22
 - add BR on gettext #193513
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:52 -0400
Subject: rpms/lslk/devel lslk.spec,1.17,1.18
Message-ID: <200607120714.k6C7EqFE026936@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lslk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26914

Modified Files:
	lslk.spec 
Log Message:
bumped for rebuild


Index: lslk.spec
===================================================================
RCS file: /cvs/dist/rpms/lslk/devel/lslk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lslk.spec	11 Feb 2006 04:25:33 -0000	1.17
+++ lslk.spec	12 Jul 2006 07:14:49 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A lock file lister.
 Name: lslk
 Version: 1.29
-Release: 16.2.1
+Release: 16.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:14:58 -0400
Subject: rpms/lsof/devel lsof.spec,1.30,1.31
Message-ID: <200607120714.k6C7Ewkd027038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27012

Modified Files:
	lsof.spec 
Log Message:
bumped for rebuild


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lsof.spec	12 Jun 2006 21:26:52 -0000	1.30
+++ lsof.spec	12 Jul 2006 07:14:56 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 06122006devel.1
+Release: 06122006devel.1.1
 License: Free
 %define lsofrh lsof_4.78C-rh
 Group: Development/Debuggers
@@ -41,6 +41,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.78-06122006devel.1.1
+- rebuild
+
 * Mon Jun 12 2006 Karel Zak <kzak at redhat.com> 4.78-06122006devel.1
 - upgrade to 4.78C (last bugfix accepted by upstream)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:15:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:15:07 -0400
Subject: rpms/ltrace/devel ltrace.spec,1.35,1.36
Message-ID: <200607120715.k6C7F74K027158@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ltrace.spec 
Log Message:
bumped for rebuild


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ltrace.spec	14 Jun 2006 11:29:30 -0000	1.35
+++ ltrace.spec	12 Jul 2006 07:15:05 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.4
-Release: 1.7
+Release: 1.7.1
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch0: ltrace-opt_x.patch
 Patch1: ltrace-testsuite.patch
@@ -58,6 +58,9 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4-1.7.1
+- rebuild
+
 * Wed Jun 14 2006 Petr Machata <pmachata at redhat.com> - 0.4-1.7
 - drop broken ppc support
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:15:21 -0400
Subject: rpms/lucene/devel lucene.spec,1.17,1.18
Message-ID: <200607120715.k6C7FLtS027270@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lucene/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27246

Modified Files:
	lucene.spec 
Log Message:
bumped for rebuild


Index: lucene.spec
===================================================================
RCS file: /cvs/dist/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lucene.spec	22 Dec 2005 06:12:40 -0000	1.17
+++ lucene.spec	12 Jul 2006 07:15:18 -0000	1.18
@@ -4,7 +4,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.4.3
-Release:	1jpp_11fc
+Release:	1jpp_12fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://jakarta.apache.org/lucene/
@@ -168,6 +168,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.3-1jpp_12fc
+- rebuild
+
 * Wed Dec 21 2005 Gary Benson <gbenson at redhat.com> - 0:1.4.3-1jpp_10fc
 - Rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:15:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:15:36 -0400
Subject: rpms/lv/devel lv.spec,1.23,1.24
Message-ID: <200607120715.k6C7FaGH027377@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27355

Modified Files:
	lv.spec 
Log Message:
bumped for rebuild


Index: lv.spec
===================================================================
RCS file: /cvs/dist/rpms/lv/devel/lv.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lv.spec	12 Jun 2006 01:50:42 -0000	1.23
+++ lv.spec	12 Jul 2006 07:15:34 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:		lv
 Version:	4.51
-Release:	8
+Release:	8.1
 License:	distributable
 URL:		http://www.ff.iij4u.or.jp/~nrt/lv/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +62,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 12 2006 Akira TAGOH <tagoh at redhat.com> - 4.51-8
 - clean up the spec file.
 - add autoconf to BuildReq. (#194753)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:15:51 -0400
Subject: rpms/lvm2/devel lvm2.spec,1.68,1.69
Message-ID: <200607120715.k6C7FppO028583@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28470

Modified Files:
	lvm2.spec 
Log Message:
bumped for rebuild


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- lvm2.spec	6 Jun 2006 19:27:04 -0000	1.68
+++ lvm2.spec	12 Jul 2006 07:15:48 -0000	1.69
@@ -1,7 +1,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.06
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -66,6 +66,9 @@
 /var/lock/lvm
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.02.06-1.2.1
+- rebuild
+
 * Tue Jun  6 2006 Stephen C. Tweedie <sct at redhat.com> - 2.02.06-1.2
 - Rebuild to pick up new nosegneg libc.a for lvm.static
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:16:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:16:12 -0400
Subject: rpms/lynx/devel lynx.spec,1.34,1.35
Message-ID: <200607120716.k6C7GC11030283@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lynx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30117

Modified Files:
	lynx.spec 
Log Message:
bumped for rebuild


Index: lynx.spec
===================================================================
RCS file: /cvs/dist/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lynx.spec	30 May 2006 09:46:11 -0000	1.34
+++ lynx.spec	12 Jul 2006 07:16:10 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 28
+Release: 28.1
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5rel.1.tar.bz2
@@ -97,6 +97,9 @@
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-28.1
+- rebuild
+
 * Tue May 30 2006 Ivana Varekova <varekova at redhat.com> - 2.8.5-28
 - add buildreq gettext (#193515)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:16:39 -0400
Subject: rpms/m17n-lib/devel m17n-lib.spec,1.10,1.11
Message-ID: <200607120716.k6C7GcpT001850@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	m17n-lib.spec 
Log Message:
bumped for rebuild


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- m17n-lib.spec	12 Jul 2006 06:12:39 -0000	1.10
+++ m17n-lib.spec	12 Jul 2006 07:16:36 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:		m17n-lib
 Version:	1.3.3
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 Summary:	Multilingual text library
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul 12 2006 Mayank Jain <majain at redhat.com> - m17n-lib-1_3_3-1_fc6
 - Updated spec file for changes mentioned in RH bug 193524, comment 4
 - Thanks to Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:16:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:16:49 -0400
Subject: rpms/m2crypto/devel m2crypto.spec,1.23,1.24
Message-ID: <200607120716.k6C7GnDw003048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2754

Modified Files:
	m2crypto.spec 
Log Message:
bumped for rebuild


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- m2crypto.spec	6 Jul 2006 01:23:57 -0000	1.23
+++ m2crypto.spec	12 Jul 2006 07:16:47 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.16
-Release: 2
+Release: 2.1
 Source0: http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/m2crypto-%{version}.tar.gz
 License: BSDish
 Group: System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16-2.1
+- rebuild
+
 * Thu Jul  6 2006 Miloslav Trmac <mitr at redhat.com> - 0.16-2
 - Fix build with rawhide swig
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:16:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:16:59 -0400
Subject: rpms/m4/devel m4.spec,1.20,1.21
Message-ID: <200607120716.k6C7Gxu8004105@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3696

Modified Files:
	m4.spec 
Log Message:
bumped for rebuild


Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- m4.spec	11 Feb 2006 04:27:04 -0000	1.20
+++ m4.spec	12 Jul 2006 07:16:57 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.4
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:06 -0400
Subject: rpms/macutils/devel macutils.spec,1.18,1.19
Message-ID: <200607120717.k6C7H67p004619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/macutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4448

Modified Files:
	macutils.spec 
Log Message:
bumped for rebuild


Index: macutils.spec
===================================================================
RCS file: /cvs/dist/rpms/macutils/devel/macutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- macutils.spec	11 Feb 2006 04:27:15 -0000	1.18
+++ macutils.spec	12 Jul 2006 07:17:03 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating Macintosh file formats.
 Name: macutils
 Version: 2.0b3
-Release: 32.2.1
+Release: 32.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0b3-32.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0b3-32.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:13 -0400
Subject: rpms/mailcap/devel mailcap.spec,1.19,1.20
Message-ID: <200607120717.k6C7HDWf005468@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5294

Modified Files:
	mailcap.spec 
Log Message:
bumped for rebuild


Index: mailcap.spec
===================================================================
RCS file: /cvs/dist/rpms/mailcap/devel/mailcap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mailcap.spec	13 Feb 2006 12:48:16 -0000	1.19
+++ mailcap.spec	12 Jul 2006 07:17:10 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Associates helper applications with particular file types.
 Name: mailcap
 Version: 2.1.20
-Release: 1
+Release: 1.1
 License: public domain
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 %{_mandir}/man4/mailcap.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.20-1.1
+- rebuild
+
 * Mon Feb 13 2006 Miroslav Lichvar <mlichvar at redhat.com> 2.1.20-1
 - add OpenOffice.org 2.0 mime types (#173789)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:21 -0400
Subject: rpms/mailman/devel mailman.spec,1.57,1.58
Message-ID: <200607120717.k6C7HL41006437@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6226

Modified Files:
	mailman.spec 
Log Message:
bumped for rebuild


Index: mailman.spec
===================================================================
RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mailman.spec	27 Jun 2006 08:38:24 -0000	1.57
+++ mailman.spec	12 Jul 2006 07:17:19 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access.
 Name: mailman
 Version: 2.1.8
-Release: 3
+Release: 3.1
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -324,6 +324,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3:2.1.8-3.1
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 3:2.1.8-3
 - quieten postun of crontab removal
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:30 -0400
Subject: rpms/mailx/devel mailx.spec,1.22,1.23
Message-ID: <200607120717.k6C7HU9B007604@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7338

Modified Files:
	mailx.spec 
Log Message:
bumped for rebuild


Index: mailx.spec
===================================================================
RCS file: /cvs/dist/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mailx.spec	11 Feb 2006 04:27:51 -0000	1.22
+++ mailx.spec	12 Jul 2006 07:17:28 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: The /bin/mail program for sending e-mail messages.
 Name: mailx
 Version: 8.1.1
-Release: 44.2.1
+Release: 44.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:41 -0400
Subject: rpms/make/devel make.spec,1.28,1.29
Message-ID: <200607120717.k6C7HfSJ008864@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/make/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8575

Modified Files:
	make.spec 
Log Message:
bumped for rebuild


Index: make.spec
===================================================================
RCS file: /cvs/dist/rpms/make/devel/make.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- make.spec	23 May 2006 14:18:17 -0000	1.28
+++ make.spec	12 Jul 2006 07:17:38 -0000	1.29
@@ -2,7 +2,7 @@
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -81,6 +81,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.81-1.1
+- rebuild
+
 * Tue May 23 2006 Petr Machata <pmachata at redhat.com> - 1:3.81-1
 - Upstream 3.81:
   - Contains several backwards incompatible changes.  See NEWS inside



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:17:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:17:52 -0400
Subject: rpms/MAKEDEV/devel MAKEDEV.spec,1.54,1.55
Message-ID: <200607120717.k6C7HqG6009525@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/MAKEDEV/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9243

Modified Files:
	MAKEDEV.spec 
Log Message:
bumped for rebuild


Index: MAKEDEV.spec
===================================================================
RCS file: /cvs/dist/rpms/MAKEDEV/devel/MAKEDEV.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- MAKEDEV.spec	20 Jun 2006 17:26:22 -0000	1.54
+++ MAKEDEV.spec	12 Jul 2006 07:17:50 -0000	1.55
@@ -1,6 +1,6 @@
 Name: MAKEDEV
 Version: 3.23
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.23-1.1
+- rebuild
+
 * Tue Jun 20 2006 Nalin Dahyabhai <nalin at redhat.com> 3.23-1
 - update to 15 May devices-2.6+.txt:
   - remove pktcdvd*



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:18:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:18:11 -0400
Subject: rpms/man/devel man.spec,1.49,1.50
Message-ID: <200607120718.k6C7IBvA011109@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10039

Modified Files:
	man.spec 
Log Message:
bumped for rebuild


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- man.spec	22 Jun 2006 12:36:33 -0000	1.49
+++ man.spec	12 Jul 2006 07:18:07 -0000	1.50
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.6d
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -312,6 +312,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6d-1.1
+- rebuild
+
 * Thu Jun 22 2006 Ivana Varekova <varekova at redhat.com> - 1.6d-1
 - update to 1.6d
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:18:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:18:30 -0400
Subject: rpms/man-pages-cs/devel man-pages-cs.spec,1.12,1.13
Message-ID: <200607120718.k6C7IUUq011218@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-cs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11195

Modified Files:
	man-pages-cs.spec 
Log Message:
bumped for rebuild


Index: man-pages-cs.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-cs/devel/man-pages-cs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- man-pages-cs.spec	9 Dec 2005 22:41:55 -0000	1.12
+++ man-pages-cs.spec	12 Jul 2006 07:18:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Czech man pages from the Linux Documentation Project.
 Name: man-pages-cs
 Version: 0.16
-Release: 5.1
+Release: 5.1.1
 Patch0: man-pages-cs-0.14-hyphen.patch
 License: Distributable
 Group: Documentation
@@ -40,6 +40,9 @@
 %{_mandir}/cs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16-5.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:18:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:18:39 -0400
Subject: rpms/man-pages-da/devel man-pages-da.spec,1.10,1.11
Message-ID: <200607120718.k6C7IdtU011328@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-da/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11303

Modified Files:
	man-pages-da.spec 
Log Message:
bumped for rebuild


Index: man-pages-da.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-da/devel/man-pages-da.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- man-pages-da.spec	9 Dec 2005 22:41:55 -0000	1.10
+++ man-pages-da.spec	12 Jul 2006 07:18:37 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Danish man pages from the Linux Documentation Project.
 Name: man-pages-da
 Version: 0.1.1
-Release: 12.1
+Release: 12.1.1
 License: Distributable
 Group: Documentation
 Patch: manpages-da-0.1.1-manpath.patch 
@@ -39,6 +39,9 @@
 %{_mandir}/da/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.1-12.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:18:50 -0400
Subject: rpms/man-pages-es/devel man-pages-es.spec,1.13,1.14
Message-ID: <200607120718.k6C7Ioh5011444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-es/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11417

Modified Files:
	man-pages-es.spec 
Log Message:
bumped for rebuild


Index: man-pages-es.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-es/devel/man-pages-es.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- man-pages-es.spec	9 Dec 2005 22:41:56 -0000	1.13
+++ man-pages-es.spec	12 Jul 2006 07:18:48 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Spanish man pages from the Linux Documentation Project.
 Name: man-pages-es
 Version: 1.28
-Release: 10.1
+Release: 10.1.1
 License: Distributable
 Group: Documentation
 URL: http://ditec.um.es/~piernas/manpages-es/
@@ -45,6 +45,9 @@
 %{_mandir}/es/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.28-10.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:00 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.15,1.16
Message-ID: <200607120719.k6C7J0sP011554@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11531

Modified Files:
	man-pages-fr.spec 
Log Message:
bumped for rebuild


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- man-pages-fr.spec	23 Mar 2006 10:18:28 -0000	1.15
+++ man-pages-fr.spec	12 Jul 2006 07:18:57 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: French man pages from the Linux Documentation Project.
 Name: man-pages-fr
 Version: 0.9.7
-Release: 14
+Release: 14.1
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7-14.1
+- rebuild
+
 * Thu Mar 23 2006 Karsten Hopp <karsten at redhat.de> 0.9.7-14
 - remove pages that conflict with vim
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:06 -0400
Subject: rpms/man-pages-it/devel man-pages-it.spec,1.11,1.12
Message-ID: <200607120719.k6C7J6SC011648@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-it/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11620

Modified Files:
	man-pages-it.spec 
Log Message:
bumped for rebuild


Index: man-pages-it.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-it/devel/man-pages-it.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- man-pages-it.spec	23 Mar 2006 10:29:41 -0000	1.11
+++ man-pages-it.spec	12 Jul 2006 07:19:04 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Italian man (manual) pages from the Linux Documentation Project
 Name: man-pages-it
 Version: 0.3.0
-Release: 17
+Release: 17.1
 License: Distributable
 Group: Documentation
 URL: http://www.pluto.linux.it/ildp/man/
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-17.1
+- rebuild
+
 * Thu Mar 23 2006 Karsten Hopp <karsten at redhat.de> 0.3.0-17
 - remove vim.1, provided by the vim-common package
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:14 -0400
Subject: rpms/man-pages-ko/devel man-pages-ko.spec,1.10,1.11
Message-ID: <200607120719.k6C7JE0M011755@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-ko/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11723

Modified Files:
	man-pages-ko.spec 
Log Message:
bumped for rebuild


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ko/devel/man-pages-ko.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- man-pages-ko.spec	9 Dec 2005 22:41:57 -0000	1.10
+++ man-pages-ko.spec	12 Jul 2006 07:19:12 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project.
 Name: man-pages-%{LANG}
 Version: 1.48
-Release: 15.1
+Release: 15.1.1
 License: GPL
 Epoch: 1
 Group: Documentation
@@ -64,6 +64,9 @@
 %{_mandir}/ko
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.48-15.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:21 -0400
Subject: rpms/man-pages-pl/devel man-pages-pl.spec,1.20,1.21
Message-ID: <200607120719.k6C7JLKC011856@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-pl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11829

Modified Files:
	man-pages-pl.spec 
Log Message:
bumped for rebuild


Index: man-pages-pl.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- man-pages-pl.spec	6 Apr 2006 13:10:49 -0000	1.20
+++ man-pages-pl.spec	12 Jul 2006 07:19:19 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: Polish man pages from the Linux Documentation Project.
 Name: man-pages-pl
 Version: 0.24
-Release: 2
+Release: 2.1
 License: Distributable
 Group: Documentation
 Source: http://dione.ids.pl/~pborys/PTM/man-PL%{releasedate}.tar.gz
@@ -61,6 +61,9 @@
 %{_mandir}/pl/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.24-2.1
+- rebuild
+
 * Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 0.24-2
 - remove some vim man pages provided by current vim
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:28 -0400
Subject: rpms/man-pages-ru/devel man-pages-ru.spec,1.12,1.13
Message-ID: <200607120719.k6C7JSuL011956@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man-pages-ru/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11929

Modified Files:
	man-pages-ru.spec 
Log Message:
bumped for rebuild


Index: man-pages-ru.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ru/devel/man-pages-ru.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- man-pages-ru.spec	9 Dec 2005 22:41:57 -0000	1.12
+++ man-pages-ru.spec	12 Jul 2006 07:19:26 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Russian man pages from the Linux Documentation Project.
 Name: man-pages-ru
 Version: 0.97
-Release: 1.1
+Release: 1.1.1
 License: Distributable
 Group: Documentation
 URL: http://linuxshare.ru/projects/trans/
@@ -43,6 +43,9 @@
 %{_mandir}/ru/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.97-1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:37 -0400
Subject: rpms/mc/devel mc.spec,1.95,1.96
Message-ID: <200607120719.k6C7JbL5012064@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mc.spec 
Log Message:
bumped for rebuild


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mc.spec	11 Jul 2006 12:56:44 -0000	1.95
+++ mc.spec	12 Jul 2006 07:19:34 -0000	1.96
@@ -3,7 +3,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	21
+Release:	21.1
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -192,6 +192,9 @@
 %dir %{_sysconfdir}/mc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:4.6.1a-21.1
+- rebuild
+
 * Tue Jul 11 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-21
 - update to new mc snapshot (fixes #195810)
 - drop .segfault patch, applied upstream



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:46 -0400
Subject: rpms/mcstrans/devel mcstrans.spec,1.14,1.15
Message-ID: <200607120719.k6C7Jkbe012213@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mcstrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12189

Modified Files:
	mcstrans.spec 
Log Message:
bumped for rebuild


Index: mcstrans.spec
===================================================================
RCS file: /cvs/dist/rpms/mcstrans/devel/mcstrans.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mcstrans.spec	19 Jun 2006 20:25:05 -0000	1.14
+++ mcstrans.spec	12 Jul 2006 07:19:44 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: SELinux Translation Daemon
 Name: mcstrans
 Version: 0.1.7
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz
@@ -67,6 +67,9 @@
 %{_sysconfdir}/rc.d/init.d/mcstrans
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 19 2006 Dan Walsh <dwalsh at redhat.com> 0.1.7-1
 - Apply sgrubb patch to only call getpeercon on translations
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:19:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:19:53 -0400
Subject: rpms/mdadm/devel mdadm.spec,1.31,1.32
Message-ID: <200607120719.k6C7Jras012315@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12287

Modified Files:
	mdadm.spec 
Log Message:
bumped for rebuild


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mdadm.spec	7 Jul 2006 19:24:16 -0000	1.31
+++ mdadm.spec	12 Jul 2006 07:19:51 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.5.2
-Release: 1
+Release: 1.1
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
@@ -87,6 +87,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.2-1.1
+- rebuild
+
 * Fri Jul  7 2006 Doug Ledford <dledford at redhat.com> - 2.5.2-1
 - Update to 2.5.2
 - Remove auto default patch as upstream now has a preferred default auto method



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:20:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:20:01 -0400
Subject: rpms/memtest86+/devel memtest86+.spec,1.23,1.24
Message-ID: <200607120720.k6C7K1eI012415@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/memtest86+/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12388

Modified Files:
	memtest86+.spec 
Log Message:
bumped for rebuild


Index: memtest86+.spec
===================================================================
RCS file: /cvs/dist/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- memtest86+.spec	27 Jun 2006 06:16:53 -0000	1.23
+++ memtest86+.spec	12 Jul 2006 07:19:59 -0000	1.24
@@ -6,7 +6,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 1.65
-Release: 4
+Release: 4.1
 License: GPL
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -61,6 +61,9 @@
 /sbin/new-memtest-pkg --remove %{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.65-4.1
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 1.65-4
 - make sure coreutils is installed for the preun script
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:20:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:20:11 -0400
Subject: rpms/mesa/devel mesa.spec,1.67,1.68
Message-ID: <200607120720.k6C7KBsn012536@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12504

Modified Files:
	mesa.spec 
Log Message:
bumped for rebuild


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mesa.spec	5 Jul 2006 08:43:15 -0000	1.67
+++ mesa.spec	12 Jul 2006 07:20:09 -0000	1.68
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 13%{?dist}
+Release: 13.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -457,6 +457,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-13.fc6
 - Added mesa-6.5-fix-opt-flags-bug197640.patch as 2nd attempt to fix OPT_FLAGS
   for (#197640).



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:20:20 -0400
Subject: rpms/metacity/devel metacity.spec,1.85,1.86
Message-ID: <200607120720.k6C7KKge012635@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	metacity.spec 
Log Message:
bumped for rebuild


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- metacity.spec	13 Jun 2006 08:22:47 -0000	1.85
+++ metacity.spec	12 Jul 2006 07:20:17 -0000	1.86
@@ -9,7 +9,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 6
+Release: 6.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.gz
 Source1: libcm-%{libcm_version}.tar.gz
@@ -141,6 +141,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.5-6.1
+- rebuild
+
 * Tue Jun 13 2006 Michael J. Knox <michael[AT]knox.net.nz> - 2.15.5-6
 - remove BR on automake14, use current automake instead
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:20:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:20:34 -0400
Subject: rpms/kernel/devel linux-2.6-utrace.patch,1.1,1.2
Message-ID: <200607120720.k6C7KY87012772@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	linux-2.6-utrace.patch 
Log Message:
New patch rev, compilation nits for ia64/s390

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   39 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    2 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  843 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   26 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6837 insertions(+), 3196 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-utrace.patch	12 Jul 2006 01:09:47 -0000	1.1
+++ linux-2.6-utrace.patch	12 Jul 2006 07:20:32 -0000	1.2
@@ -1,17 +1,3 @@
-[PATCH 4] utrace: ptrace compatibility
-
-ptrace compatibility on top of <linux/utrace.h> interfaces.
-This attempts to be precisely compatible with existing ptrace behavior.
-It does not extend, improve, or change it.
-
-The ptrace support is made an option, CONFIG_PTRACE.  For now, noone will
-want to turn this off except maybe a bizarre embedded configuration.  But
-it looks forward to a day when we can punt the ptrace system call completely.
-
-Signed-off-by: Roland McGrath <roland at redhat.com>
-
----
-
  Documentation/utrace.txt                |  451 +++++++++
  arch/alpha/kernel/asm-offsets.c         |    2 
  arch/alpha/kernel/entry.S               |    4 
@@ -27,7 +13,8 @@
  arch/ia64/ia32/sys_ia32.c               |    2 
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
- arch/ia64/kernel/ptrace.c               |   36 -
+ arch/ia64/kernel/mca.c                  |    2 
+ arch/ia64/kernel/ptrace.c               |   39 -
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    2 
@@ -44,8 +31,8 @@
  arch/ppc/kernel/asm-offsets.c           |    2 
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |   51 -
- arch/s390/kernel/traps.c                |    4 
+ arch/s390/kernel/ptrace.c               |   79 +-
+ arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/ptrace.c            |   18 
  arch/x86_64/ia32/fpu32.c                |   92 ++
  arch/x86_64/ia32/ia32_aout.c            |    6 
@@ -58,6 +45,7 @@
  arch/x86_64/kernel/signal.c             |   30 -
  arch/x86_64/kernel/traps.c              |    8 
  arch/x86_64/mm/fault.c                  |    4 
+ drivers/connector/cn_proc.c             |    4 
  fs/binfmt_aout.c                        |    6 
  fs/binfmt_elf.c                         |    6 
  fs/binfmt_elf_fdpic.c                   |    7 
@@ -89,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 77 files changed, 6822 insertions(+), 3162 deletions(-)
+ 79 files changed, 6832 insertions(+), 3191 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -6665,6 +6653,19 @@
  				return retval;
  			}
  			read_lock(&binfmt_lock);
+--- linux-2.6/drivers/connector/cn_proc.c.utrace-ptrace-compat
++++ linux-2.6/drivers/connector/cn_proc.c
+@@ -60,8 +60,8 @@ void proc_fork_connector(struct task_str
+ 	get_seq(&msg->seq, &ev->cpu);
+ 	ktime_get_ts(&ev->timestamp); /* get high res monotonic timestamp */
+ 	ev->what = PROC_EVENT_FORK;
+-	ev->event_data.fork.parent_pid = task->real_parent->pid;
+-	ev->event_data.fork.parent_tgid = task->real_parent->tgid;
++	ev->event_data.fork.parent_pid = task->parent->pid;
++	ev->event_data.fork.parent_tgid = task->parent->tgid;
+ 	ev->event_data.fork.child_pid = task->pid;
+ 	ev->event_data.fork.child_tgid = task->tgid;
+ 
 --- linux-2.6/init/Kconfig.utrace-ptrace-compat
 +++ linux-2.6/init/Kconfig
 @@ -487,6 +487,35 @@ config STOP_MACHINE
@@ -9997,6 +9998,17 @@
 -	return current->ptrace_message;
 +	return scno;
  }
+--- linux-2.6/arch/ia64/kernel/mca.c.utrace-ptrace-compat
++++ linux-2.6/arch/ia64/kernel/mca.c
+@@ -1515,7 +1515,7 @@ format_mca_init_stack(void *mca_data, un
+ 	p->state = TASK_UNINTERRUPTIBLE;
+ 	cpu_set(cpu, p->cpus_allowed);
+ 	INIT_LIST_HEAD(&p->tasks);
+-	p->parent = p->real_parent = p->group_leader = p;
++	p->parent = p->group_leader = p;
+ 	INIT_LIST_HEAD(&p->children);
+ 	INIT_LIST_HEAD(&p->sibling);
+ 	strncpy(p->comm, type, sizeof(p->comm)-1);
 --- linux-2.6/arch/ia64/kernel/fsys.S.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/kernel/fsys.S
 @@ -83,29 +83,29 @@ ENTRY(fsys_getppid)
@@ -10039,10 +10051,27 @@
  	;;
 --- linux-2.6/arch/ia64/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/arch/ia64/kernel/ptrace.c
-@@ -1594,32 +1594,6 @@ sys_ptrace (long request, pid_t pid, uns
- 	return ret;
+@@ -12,6 +12,7 @@
+ #include <linux/mm.h>
+ #include <linux/errno.h>
+ #include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/smp_lock.h>
+ #include <linux/user.h>
+ #include <linux/security.h>
+@@ -1409,6 +1410,7 @@ ptrace_disable (struct task_struct *chil
+ 	child_psr->tb = 0;
  }
  
++#if 0 				/* XXX */
+ asmlinkage long
+ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
+ {
+@@ -1593,32 +1595,7 @@ sys_ptrace (long request, pid_t pid, uns
+ 	unlock_kernel();
+ 	return ret;
+ }
+-
 -
 -void
 -syscall_trace (void)
@@ -10068,11 +10097,11 @@
 -		current->exit_code = 0;
 -	}
 -}
--
++#endif
+ 
  /* "asmlinkage" so the input arguments are preserved... */
  
- asmlinkage void
-@@ -1627,9 +1601,8 @@ syscall_trace_enter (long arg0, long arg
+@@ -1627,9 +1604,8 @@ syscall_trace_enter (long arg0, long arg
  		     long arg4, long arg5, long arg6, long arg7,
  		     struct pt_regs regs)
  {
@@ -10084,7 +10113,7 @@
  
  	if (unlikely(current->audit_context)) {
  		long syscall;
-@@ -1664,7 +1637,6 @@ syscall_trace_leave (long arg0, long arg
+@@ -1664,7 +1640,6 @@ syscall_trace_leave (long arg0, long arg
  		audit_syscall_exit(success, result);
  	}
  
@@ -10163,6 +10192,15 @@
  		        ("sr  0,0\n\t"
 --- linux-2.6/arch/s390/kernel/traps.c.utrace-ptrace-compat
 +++ linux-2.6/arch/s390/kernel/traps.c
+@@ -18,7 +18,7 @@
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+ #include <linux/errno.h>
+-#include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/timer.h>
+ #include <linux/mm.h>
+ #include <linux/smp.h>
 @@ -338,7 +338,7 @@ static inline void *get_check_address(st
  
  void do_single_step(struct pt_regs *regs)
@@ -10183,7 +10221,15 @@
  				signal = SIGILL;
 --- linux-2.6/arch/s390/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/arch/s390/kernel/ptrace.c
-@@ -87,19 +87,25 @@ FixPerRegisters(struct task_struct *task
+@@ -29,6 +29,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/errno.h>
+ #include <linux/ptrace.h>
++#include <linux/tracehook.h>
+ #include <linux/user.h>
+ #include <linux/security.h>
+ #include <linux/audit.h>
+@@ -87,19 +88,25 @@ FixPerRegisters(struct task_struct *task
  }
  
  void
@@ -10211,7 +10257,7 @@
  /*
   * Called by kernel/ptrace.c when detaching..
   *
-@@ -109,7 +115,7 @@ void
+@@ -109,7 +116,7 @@ void
  ptrace_disable(struct task_struct *child)
  {
  	/* make sure the single step bit is not set. */
@@ -10220,7 +10266,15 @@
  }
  
  #ifndef CONFIG_64BIT
-@@ -593,6 +599,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -118,6 +125,7 @@ ptrace_disable(struct task_struct *child
+ # define __ADDR_MASK 7
+ #endif
+ 
++#if 0				/* XXX */
+ /*
+  * Read the word at offset addr from the user area of a process. The
+  * trouble here is that the information is littered over different
+@@ -593,6 +601,7 @@ do_ptrace_emu31(struct task_struct *chil
  			copied += sizeof(unsigned int);
  		}
  		return 0;
@@ -10228,7 +10282,7 @@
  	case PTRACE_GETEVENTMSG:
  		return put_user((__u32) child->ptrace_message,
  				(unsigned int __user *) data);
-@@ -606,6 +613,7 @@ do_ptrace_emu31(struct task_struct *chil
+@@ -606,6 +615,7 @@ do_ptrace_emu31(struct task_struct *chil
  			return -EINVAL;
  		return copy_siginfo_from_user32(child->last_siginfo,
  						(compat_siginfo_t __user *) data);
@@ -10236,7 +10290,7 @@
  	}
  	return ptrace_request(child, request, addr, data);
  }
-@@ -656,7 +664,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -656,7 +666,7 @@ do_ptrace(struct task_struct *child, lon
  			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
  		child->exit_code = data;
  		/* make sure the single step bit is not set. */
@@ -10245,7 +10299,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -670,7 +678,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -670,7 +680,7 @@ do_ptrace(struct task_struct *child, lon
  			return 0;
  		child->exit_code = SIGKILL;
  		/* make sure the single step bit is not set. */
@@ -10254,7 +10308,7 @@
  		wake_up_process(child);
  		return 0;
  
-@@ -683,7 +691,7 @@ do_ptrace(struct task_struct *child, lon
+@@ -683,7 +693,7 @@ do_ptrace(struct task_struct *child, lon
  		if (data)
  			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
  		else
@@ -10263,7 +10317,40 @@
  		/* give it a chance to run. */
  		wake_up_process(child);
  		return 0;
-@@ -736,30 +744,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -704,31 +714,7 @@ do_ptrace(struct task_struct *child, lon
+ 	/* Not reached.  */
+ 	return -EIO;
+ }
+-
+-asmlinkage long
+-sys_ptrace(long request, long pid, long addr, long data)
+-{
+-	struct task_struct *child;
+-	int ret;
+-
+-	lock_kernel();
+-	if (request == PTRACE_TRACEME) {
+-		 ret = ptrace_traceme();
+-		 goto out;
+-	}
+-
+-	child = ptrace_get_task_struct(pid);
+-	if (IS_ERR(child)) {
+-		ret = PTR_ERR(child);
+-		goto out;
+-	}
+-
+-	ret = do_ptrace(child, request, addr, data);
+-	put_task_struct(child);
+-out:
+-	unlock_kernel();
+-	return ret;
+-}
++#endif
+ 
+ asmlinkage void
+ syscall_trace(struct pt_regs *regs, int entryexit)
+@@ -736,30 +722,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:21:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:21:07 -0400
Subject: rpms/mingetty/devel mingetty.spec,1.15,1.16
Message-ID: <200607120721.k6C7L7bL013036@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mingetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13013

Modified Files:
	mingetty.spec 
Log Message:
bumped for rebuild


Index: mingetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mingetty/devel/mingetty.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mingetty.spec	11 Feb 2006 04:36:17 -0000	1.15
+++ mingetty.spec	12 Jul 2006 07:21:04 -0000	1.16
@@ -2,7 +2,7 @@
 Name: mingetty
 Version: 1.07
 License: GPL
-Release: 5.2.1
+Release: 5.2.2
 Group: System Environment/Base
 Source: mingetty-%{version}.tar.gz
 Patch: mingetty-1.00-opt.patch
@@ -37,6 +37,9 @@
 %{_mandir}/man8/mingetty.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:21:24 -0400
Subject: rpms/minicom/devel minicom.spec,1.20,1.21
Message-ID: <200607120721.k6C7LO7Q013183@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/minicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13162

Modified Files:
	minicom.spec 
Log Message:
bumped for rebuild


Index: minicom.spec
===================================================================
RCS file: /cvs/dist/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- minicom.spec	11 Feb 2006 04:36:27 -0000	1.20
+++ minicom.spec	12 Jul 2006 07:21:21 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
 Version: 2.1
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
@@ -81,6 +81,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:21:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:21:32 -0400
Subject: rpms/mkbootdisk/devel mkbootdisk.spec,1.21,1.22
Message-ID: <200607120721.k6C7LW8q013284@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mkbootdisk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13259

Modified Files:
	mkbootdisk.spec 
Log Message:
bumped for rebuild


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/mkbootdisk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mkbootdisk.spec	6 Apr 2006 10:44:16 -0000	1.21
+++ mkbootdisk.spec	12 Jul 2006 07:21:30 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
 Version:  1.5.3
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.gz
@@ -41,6 +41,9 @@
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.3-2.1
+- rebuild
+
 * Thu Apr 06 2006 Peter Vrabec <pvrabec at redhat.com> 1.5.3-2
 - change noarch back to ExclusiveArch
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:21:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:21:42 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.132,1.133
Message-ID: <200607120721.k6C7LgnT013385@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13355

Modified Files:
	mkinitrd.spec 
Log Message:
bumped for rebuild


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- mkinitrd.spec	30 Jun 2006 04:04:40 -0000	1.132
+++ mkinitrd.spec	12 Jul 2006 07:21:39 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.0.46
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.0.46-1.1
+- rebuild
+
 * Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
 - if we don't get a modalias for a net driver, try via 
   ethtool (notting, #196104)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:21:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:21:51 -0400
Subject: rpms/mktemp/devel mktemp.spec,1.22,1.23
Message-ID: <200607120721.k6C7Lp2b013480@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mktemp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13456

Modified Files:
	mktemp.spec 
Log Message:
bumped for rebuild


Index: mktemp.spec
===================================================================
RCS file: /cvs/dist/rpms/mktemp/devel/mktemp.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mktemp.spec	11 Feb 2006 04:36:40 -0000	1.22
+++ mktemp.spec	12 Jul 2006 07:21:48 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A small utility for safely making /tmp files.
 Name: mktemp
 Version: 1.5
-Release: 23.2.1
+Release: 23.2.2
 Epoch: 3
 License: BSD
 Group: System Environment/Base
@@ -39,6 +39,9 @@
 %{_mandir}/man1/mktemp.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3:1.5-23.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:22:09 -0400
Subject: rpms/mlocate/devel mlocate.spec,1.8,1.9
Message-ID: <200607120722.k6C7M9BA013636@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mlocate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13610

Modified Files:
	mlocate.spec 
Log Message:
bumped for rebuild


Index: mlocate.spec
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mlocate.spec	18 Mar 2006 03:49:20 -0000	1.8
+++ mlocate.spec	12 Jul 2006 07:22:06 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.14
-Release: 2
+Release: 2.1
 License: GPLv2
 Group: Applications/System
 Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %ghost /var/lib/mlocate/mlocate.db
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.14-2.1
+- rebuild
+
 * Sat Mar 18 2006 Miloslav Trmac <mitr at redhat.com> - 0.14-2
 - Ship NEWS
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:22:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:22:27 -0400
Subject: rpms/mockobjects/devel mockobjects.spec,1.9,1.10
Message-ID: <200607120722.k6C7MRJa013787@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mockobjects.spec 
Log Message:
bumped for rebuild


Index: mockobjects.spec
===================================================================
RCS file: /cvs/dist/rpms/mockobjects/devel/mockobjects.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mockobjects.spec	22 Dec 2005 09:08:40 -0000	1.9
+++ mockobjects.spec	12 Jul 2006 07:22:24 -0000	1.10
@@ -1,6 +1,6 @@
 %define name		mockobjects
 %define version		0.09
-%define release 	12jpp_4fc
+%define release 	12jpp_5fc
 %define section		free
 %define j2ee12  %{?_with_j2ee12:1}%{!?_without_j2ee12:0}
 %define j2ee13  %{?_with_j2ee13:1}%{!?_without_j2ee13:0}
@@ -270,6 +270,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.09-12jpp_5fc
+- rebuild
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:09-11jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:22:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:22:40 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.11,1.12
Message-ID: <200607120722.k6C7Mejt013915@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13892

Modified Files:
	mod_auth_kerb.spec 
Log Message:
bumped for rebuild


Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_auth_kerb.spec	11 Feb 2006 04:37:00 -0000	1.11
+++ mod_auth_kerb.spec	12 Jul 2006 07:22:37 -0000	1.12
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 8.2.1
+Release: 8.2.2
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -54,6 +54,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:00 -0400
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql.spec,1.23,1.24
Message-ID: <200607120723.k6C7N0do014091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14067

Modified Files:
	mod_auth_mysql.spec 
Log Message:
bumped for rebuild


Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_auth_mysql.spec	28 Feb 2006 09:02:55 -0000	1.23
+++ mod_auth_mysql.spec	12 Jul 2006 07:22:58 -0000	1.24
@@ -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: 3
+Release: 3.1
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
@@ -47,6 +47,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:09 -0400
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.24,1.25
Message-ID: <200607120723.k6C7N9dt014206@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14182

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
bumped for rebuild


Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_auth_pgsql.spec	11 Feb 2006 06:52:26 -0000	1.24
+++ mod_auth_pgsql.spec	12 Jul 2006 07:23:07 -0000	1.25
@@ -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.3
+Release: 2.3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.3
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:14 -0400
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.15,1.16
Message-ID: <200607120723.k6C7NEB1014293@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mod_authz_ldap.spec 
Log Message:
bumped for rebuild


Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_authz_ldap.spec	27 Mar 2006 08:22:20 -0000	1.15
+++ mod_authz_ldap.spec	12 Jul 2006 07:23:12 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 7
+Release: 7.1
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
@@ -73,6 +73,9 @@
 %doc NEWS AUTHORS ChangeLog COPYING
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Mon Mar 27 2006 Joe Orton <jorton at redhat.com> 0.26-7
 - don't package INSTALL
 - define -DLDAP_DEPRECATED=1 in CPPFLAGS



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:22 -0400
Subject: rpms/mod_perl/devel mod_perl.spec,1.39,1.40
Message-ID: <200607120723.k6C7NMtV014396@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14372

Modified Files:
	mod_perl.spec 
Log Message:
bumped for rebuild


Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_perl.spec	15 Jun 2006 09:40:43 -0000	1.39
+++ mod_perl.spec	12 Jul 2006 07:23:20 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release:        6
+Release:        6.1
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons
@@ -133,6 +133,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 15 2006 Joe Orton <jorton at redhat.com> 2.0.2-6
 - fix multilib conflicts in -devel (#192733)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:30 -0400
Subject: rpms/mod_python/devel mod_python.spec,1.30,1.31
Message-ID: <200607120723.k6C7NUrB014501@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14476

Modified Files:
	mod_python.spec 
Log Message:
bumped for rebuild


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_python.spec	27 Feb 2006 15:55:17 -0000	1.30
+++ mod_python.spec	12 Jul 2006 07:23:27 -0000	1.31
@@ -4,7 +4,7 @@
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
 Version: 3.2.8
-Release: 3
+Release: 3.1
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-3
 - remove use of apr_sockaddr_port_get
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:36 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.25,1.26
Message-ID: <200607120723.k6C7Nac6014594@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14568

Modified Files:
	module-init-tools.spec 
Log Message:
bumped for rebuild


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- module-init-tools.spec	27 Jun 2006 17:19:24 -0000	1.25
+++ module-init-tools.spec	12 Jul 2006 07:23:34 -0000	1.26
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4
+Release: 0.pre1.4.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
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3-0.pre1.4.1
+- rebuild
+
 * Tue Jun 27 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4
 - updated patch for weak-modules
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:45 -0400
Subject: rpms/mono/devel mono.spec,1.39,1.40
Message-ID: <200607120723.k6C7NjuC014702@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14670

Modified Files:
	mono.spec 
Log Message:
bumped for rebuild


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mono.spec	7 Jul 2006 11:56:22 -0000	1.39
+++ mono.spec	12 Jul 2006 07:23:43 -0000	1.40
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.1.16
-Release:        1
+Release:        1.1
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -510,6 +510,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16-1
 - update to 1.1.16
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:23:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:23:55 -0400
Subject: rpms/mozplugger/devel mozplugger.spec,1.23,1.24
Message-ID: <200607120723.k6C7NtSg014801@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mozplugger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14776

Modified Files:
	mozplugger.spec 
Log Message:
bumped for rebuild


Index: mozplugger.spec
===================================================================
RCS file: /cvs/dist/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mozplugger.spec	16 May 2006 18:24:38 -0000	1.23
+++ mozplugger.spec	12 Jul 2006 07:23:52 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.7.3
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
@@ -50,6 +50,9 @@
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-3.1
+- rebuild
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 1.7.3-3 
 - fix #191969, Missing BuildRequire on libXt-devel
 - adjust mozpluggerc for FC



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:13 -0400
Subject: rpms/mrtg/devel mrtg.spec,1.29,1.30
Message-ID: <200607120724.k6C7ODGD014996@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14922

Modified Files:
	mrtg.spec 
Log Message:
bumped for rebuild


Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mrtg.spec	5 Jul 2006 21:49:53 -0000	1.29
+++ mrtg.spec	12 Jul 2006 07:24:10 -0000	1.30
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.14.4
-Release:   1
+Release:   1.1
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp
@@ -111,6 +111,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.4-1.1
+- rebuild
+
 * Wed Jul  5 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.4-1
 - Update to mrtg-2.14.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:27 -0400
Subject: rpms/mtools/devel mtools.spec,1.21,1.22
Message-ID: <200607120724.k6C7ORDj015126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15102

Modified Files:
	mtools.spec 
Log Message:
bumped for rebuild


Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mtools.spec	11 Feb 2006 04:38:45 -0000	1.21
+++ mtools.spec	12 Jul 2006 07:24:25 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:34 -0400
Subject: rpms/mtr/devel mtr.spec,1.37,1.38
Message-ID: <200607120724.k6C7OYIb015226@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15197

Modified Files:
	mtr.spec 
Log Message:
bumped for rebuild


Index: mtr.spec
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mtr.spec	3 Jul 2006 06:31:07 -0000	1.37
+++ mtr.spec	12 Jul 2006 07:24:32 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.71
-Release: 3
+Release: 3.1
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -95,6 +95,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:0.71-3.1
+- rebuild
+
 * Mon Jul 3 2006 Marcela Maslanova <mmaslano at redhat.com> - 2:0.71-3
 - bugzilla #195458 ??? reverse-map bug in mtr and patch - resolving ipv6 hostname correctly
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:40 -0400
Subject: rpms/mt-st/devel mt-st.spec,1.21,1.22
Message-ID: <200607120724.k6C7Oejl015315@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mt-st/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15288

Modified Files:
	mt-st.spec 
Log Message:
bumped for rebuild


Index: mt-st.spec
===================================================================
RCS file: /cvs/dist/rpms/mt-st/devel/mt-st.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mt-st.spec	11 Feb 2006 04:39:06 -0000	1.21
+++ mt-st.spec	12 Jul 2006 07:24:38 -0000	1.22
@@ -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.1
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9b-2.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9b-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:48 -0400
Subject: rpms/mtx/devel mtx.spec,1.19,1.20
Message-ID: <200607120724.k6C7Om9J015449@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15387

Modified Files:
	mtx.spec 
Log Message:
bumped for rebuild


Index: mtx.spec
===================================================================
RCS file: /cvs/dist/rpms/mtx/devel/mtx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mtx.spec	11 Feb 2006 04:39:16 -0000	1.19
+++ mtx.spec	12 Jul 2006 07:24:45 -0000	1.20
@@ -1,6 +1,6 @@
 Name: mtx
 Version: 1.2.18
-Release: 8.2.1
+Release: 8.2.2
 Summary: A SCSI media changer control program.
 License: GPL
 Group: Applications/System
@@ -49,6 +49,9 @@
 %{_sbindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.18-8.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:24:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:24:52 -0400
Subject: rpms/mutt/devel mutt.spec,1.33,1.34
Message-ID: <200607120724.k6C7OqbH015499@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mutt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15474

Modified Files:
	mutt.spec 
Log Message:
bumped for rebuild


Index: mutt.spec
===================================================================
RCS file: /cvs/dist/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mutt.spec	29 Jun 2006 08:47:29 -0000	1.33
+++ mutt.spec	12 Jul 2006 07:24:50 -0000	1.34
@@ -2,7 +2,7 @@
 Name: mutt
 %define uversion 0.9
 Version: 1.4.2.1
-Release: 7
+Release: 7.1
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -156,6 +156,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:1.4.2.1-7.1
+- rebuild
+
 * Thu Jun 29 2006 Miroslav Lichvar <mlichvar at redhat.com> 5:1.4.2.1-7
 - fix a buffer overflow when processing IMAP namespace (#197152, CVE-2006-3242)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:01 -0400
Subject: rpms/mx/devel mx.spec,1.15,1.16
Message-ID: <200607120725.k6C7P1Wr015607@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15584

Modified Files:
	mx.spec 
Log Message:
bumped for rebuild


Index: mx.spec
===================================================================
RCS file: /cvs/dist/rpms/mx/devel/mx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mx.spec	11 Feb 2006 04:39:40 -0000	1.15
+++ mx.spec	12 Jul 2006 07:24:59 -0000	1.16
@@ -4,7 +4,7 @@
 Summary:  A collection of Python software tools.
 Name: mx%{pybasever}
 Version: 2.0.6
-Release: 2.2.1
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:09 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.44,1.45
Message-ID: <200607120725.k6C7P9Qu015713@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15689

Modified Files:
	mx4j.spec 
Log Message:
bumped for rebuild


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mx4j.spec	11 Feb 2006 04:39:51 -0000	1.44
+++ mx4j.spec	12 Jul 2006 07:25:06 -0000	1.45
@@ -1,6 +1,6 @@
 %define name        mx4j
 %define version     3.0.1
-%define release     1jpp_9fc
+%define release     1jpp_10fc
 %define section     free
 
 Name:           %{name}
@@ -182,6 +182,9 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_10fc
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:16 -0400
Subject: rpms/mysql/devel mysql.spec,1.79,1.80
Message-ID: <200607120725.k6C7PGfw015819@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mysql.spec 
Log Message:
bumped for rebuild


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mysql.spec	10 Jun 2006 17:43:55 -0000	1.79
+++ mysql.spec	12 Jul 2006 07:25:14 -0000	1.80
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.22
-Release: 2
+Release: 2.1
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -414,6 +414,9 @@
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.0.22-2.1
+- rebuild
+
 * Sat Jun 10 2006 Tom Lane <tgl at redhat.com> 5.0.22-2
 - Work around brew's tendency not to clean up failed builds completely,
   by adding code in mysql-testing.patch to kill leftover mysql daemons.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:24 -0400
Subject: rpms/mysqlclient10/devel mysqlclient10.spec,1.13,1.14
Message-ID: <200607120725.k6C7POgp015916@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15886

Modified Files:
	mysqlclient10.spec 
Log Message:
bumped for rebuild


Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mysqlclient10.spec	11 Feb 2006 04:40:37 -0000	1.13
+++ mysqlclient10.spec	12 Jul 2006 07:25:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name: mysqlclient10
 Version: 3.23.58
-Release: 9.2
+Release: 9.2.1
 Summary: Backlevel MySQL shared libraries.
 License: LGPL
 Group: Applications/Databases
@@ -151,6 +151,9 @@
 %{_libdir}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.23.58-9.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.23.58-9.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:31 -0400
Subject: rpms/mysqlclient14/devel mysqlclient14.spec,1.7,1.8
Message-ID: <200607120725.k6C7PVoC016007@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient14/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15977

Modified Files:
	mysqlclient14.spec 
Log Message:
bumped for rebuild


Index: mysqlclient14.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient14/devel/mysqlclient14.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysqlclient14.spec	11 Feb 2006 04:40:54 -0000	1.7
+++ mysqlclient14.spec	12 Jul 2006 07:25:28 -0000	1.8
@@ -1,6 +1,6 @@
 Name: mysqlclient14
 Version: 4.1.14
-Release: 4.2
+Release: 4.2.1
 Summary: Backlevel MySQL shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -158,6 +158,9 @@
 %{_libdir}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.14-4.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.14-4.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:40 -0400
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.22,1.23
Message-ID: <200607120725.k6C7Pe1A016155@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	MySQL-python.spec 
Log Message:
bumped for rebuild


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MySQL-python.spec	13 Feb 2006 18:42:03 -0000	1.22
+++ MySQL-python.spec	12 Jul 2006 07:25:37 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.0
-Release: 3.2.2
+Release: 3.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2.2.1
+- rebuild
+
 * 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
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:47 -0400
Subject: rpms/nano/devel nano.spec,1.14,1.15
Message-ID: <200607120725.k6C7Plkg016254@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nano/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16229

Modified Files:
	nano.spec 
Log Message:
bumped for rebuild


Index: nano.spec
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/nano.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nano.spec	10 Jul 2006 22:19:32 -0000	1.14
+++ nano.spec	12 Jul 2006 07:25:45 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A small text editor
 Name:		nano
 Version:	1.3.12
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -52,6 +52,9 @@
 %{_datadir}/nano
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.12-1.1
+- rebuild
+
 * Mon Jul 10 2006 David Woodhouse <dwmw2 at redhat.com> - 1.3.12-1
 - Update to 1.3.12
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:54 -0400
Subject: rpms/nasm/devel nasm.spec,1.17,1.18
Message-ID: <200607120725.k6C7Ps8i016378@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nasm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16324

Modified Files:
	nasm.spec 
Log Message:
bumped for rebuild


Index: nasm.spec
===================================================================
RCS file: /cvs/dist/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nasm.spec	11 Feb 2006 04:41:46 -0000	1.17
+++ nasm.spec	12 Jul 2006 07:25:51 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A portable x86 assembler which uses Intel-like syntax.
 Name: nasm
 Version: 0.98.39
-Release: 3.2.1
+Release: 3.2.2
 Patch0: nasm-0.98-boguself2.patch
 Patch1: nasm-0.98.39-overfl.patch
 License: LGPL
@@ -90,6 +90,9 @@
 %{_bindir}/rdx
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.98.39-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:25:58 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.107,1.108
Message-ID: <200607120725.k6C7PwCm016426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16402

Modified Files:
	nautilus.spec 
Log Message:
bumped for rebuild


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- nautilus.spec	13 Jun 2006 14:50:34 -0000	1.107
+++ nautilus.spec	12 Jul 2006 07:25:56 -0000	1.108
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.15.2
-Release:	1
+Release:	1.1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -178,6 +178,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:07 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.61,1.62
Message-ID: <200607120726.k6C7Q760016544@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16512

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
bumped for rebuild


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- nautilus-cd-burner.spec	13 Jun 2006 15:21:46 -0000	1.61
+++ nautilus-cd-burner.spec	12 Jul 2006 07:26:05 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.15.3
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:13 -0400
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.17,1.18
Message-ID: <200607120726.k6C7QDna016634@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16610

Modified Files:
	nautilus-sendto.spec 
Log Message:
bumped for rebuild


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nautilus-sendto.spec	12 Jul 2006 05:59:39 -0000	1.17
+++ nautilus-sendto.spec	12 Jul 2006 07:26:11 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.7
-Release: 	1
+Release: 	1.1
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -81,6 +81,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Matthias Clasen  <mclasen at redhat.com> - 0.7-1
 - Update to 0.7
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:21 -0400
Subject: rpms/nc/devel nc.spec,1.28,1.29
Message-ID: <200607120726.k6C7QLe7016738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16713

Modified Files:
	nc.spec 
Log Message:
bumped for rebuild


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nc.spec	10 Jul 2006 08:46:14 -0000	1.28
+++ nc.spec	12 Jul 2006 07:26:19 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 6
+Release: 6.1
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -60,6 +60,9 @@
 %doc README scripts
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.84-6.1
+- rebuild
+
 * Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> - 1.84-6
 - improve UDP port scanning (#159119) <varmojfekoj at gmail.com>
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:28 -0400
Subject: rpms/ncompress/devel ncompress.spec,1.19,1.20
Message-ID: <200607120726.k6C7QSkL016832@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16808

Modified Files:
	ncompress.spec 
Log Message:
bumped for rebuild


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ncompress.spec	21 Apr 2006 12:20:07 -0000	1.19
+++ ncompress.spec	12 Jul 2006 07:26:26 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 44
+Release: 44.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-44.1
+- rebuild
+
 * Fri Apr 21 2006 Peter Vrabec <pvrabec at redhat.com> 4.2.4-44
 - fix problems with compressing zero-sized files (#189215, #189216)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:36 -0400
Subject: rpms/neon/devel neon.spec,1.28,1.29
Message-ID: <200607120726.k6C7Qa00016971@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	neon.spec 
Log Message:
bumped for rebuild


Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- neon.spec	1 Jun 2006 09:21:03 -0000	1.28
+++ neon.spec	12 Jul 2006 07:26:34 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 5
+Release: 5.1
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
@@ -65,6 +65,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-5.1
+- rebuild
+
 * Thu Jun  1 2006 Joe Orton <jorton at redhat.com> 0.25.5-5
 - have -devel require pkgconfig (#193355)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:43 -0400
Subject: rpms/netatalk/devel netatalk.spec,1.27,1.28
Message-ID: <200607120726.k6C7QhOw017059@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17036

Modified Files:
	netatalk.spec 
Log Message:
bumped for rebuild


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- netatalk.spec	9 Jun 2006 14:32:01 -0000	1.27
+++ netatalk.spec	12 Jul 2006 07:26:40 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 6.fc6
+Release: 6.fc6.1
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -179,6 +179,9 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:2.0.3-6.fc6.1
+- rebuild
+
 * Fri Jun 09 2006 Jason Vas Dias <jvdias at redhat.com> - 4:2.0.3-6.fc6
 - rebuild for broken libgssapi deps and brew build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:50 -0400
Subject: rpms/netpbm/devel netpbm.spec,1.67,1.68
Message-ID: <200607120726.k6C7Qog9017197@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17164

Modified Files:
	netpbm.spec 
Log Message:
bumped for rebuild


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- netpbm.spec	10 Jul 2006 14:39:52 -0000	1.67
+++ netpbm.spec	12 Jul 2006 07:26:48 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.34
-Release: 1
+Release: 1.1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -187,6 +187,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 10.34-1.1
+- rebuild
+
 * Thu Jun 22 2006 Jindrich Novy <jnovy at redhat.com> 10.34-1
 - update to 10.34
 - drop .ppmtogif, .nstring patches



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:26:58 -0400
Subject: rpms/net-snmp/devel net-snmp.spec,1.78,1.79
Message-ID: <200607120726.k6C7Qw0A017294@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-snmp.spec 
Log Message:
bumped for rebuild


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- net-snmp.spec	10 Jul 2006 06:56:25 -0000	1.78
+++ net-snmp.spec	12 Jul 2006 07:26:55 -0000	1.79
@@ -6,7 +6,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3.1.rc4
-Release: 1
+Release: 1.1
 
 License: BSDish
 Group: System Environment/Daemons
@@ -344,6 +344,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.3.1.rc4-1.1
+- rebuild
+
 * Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.rc4-1
 - update to release candidate 4
 - fix lib dependencies on 64bit archs



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:27:05 -0400
Subject: rpms/net-tools/devel net-tools.spec,1.72,1.73
Message-ID: <200607120727.k6C7R5f2017397@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-tools.spec 
Log Message:
bumped for rebuild


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- net-tools.spec	7 Jun 2006 10:37:05 -0000	1.72
+++ net-tools.spec	12 Jul 2006 07:27:03 -0000	1.73
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 72
+Release: 72.1
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -242,6 +242,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.60-72.1
+- rebuild
+
 * Wed Jun  7 2006 Radek Vokal <rvokal at redhat.com> - 1.60-72
 - switch --trim to --notrim .. make it less confusing 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:27:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:27:12 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.110,1.111
Message-ID: <200607120727.k6C7RCLG017496@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17472

Modified Files:
	NetworkManager.spec 
Log Message:
bumped for rebuild


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- NetworkManager.spec	8 Jun 2006 18:51:42 -0000	1.110
+++ NetworkManager.spec	12 Jul 2006 07:27:10 -0000	1.111
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.1
+Release: 0%{?nm_cvs_version}.1.1
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -212,6 +212,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-0.cvs20060529.1.1
+- rebuild
+
 * Mon May 29 2006 Dan Williams <dcbw at redhat.com> - 0.7.0-0.cvs20060529
 - Update to latest CVS
 	o Gnome.org #333420: dialog do not have window icons



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:27:18 -0400
Subject: rpms/newt/devel newt.spec,1.38,1.39
Message-ID: <200607120727.k6C7RIaC017582@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17556

Modified Files:
	newt.spec 
Log Message:
bumped for rebuild


Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- newt.spec	27 Jun 2006 14:46:17 -0000	1.38
+++ newt.spec	12 Jul 2006 07:27:15 -0000	1.39
@@ -4,7 +4,7 @@
 Name: newt
 %define version 0.52.2
 Version: %{version}
-Release: 8
+Release: 8.1
 License: LGPL
 Group: System Environment/Libraries
 Source: newt-%{version}.tar.gz
@@ -101,6 +101,9 @@
 %{_libdir}/libnewt.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.52.2-8.1
+- rebuild
+
 * Tue Jun 27 2006 Miroslav Lichvar <mlichvar at redhat.com> - 0.52.2-8
 - unfocus when displaying help
 - fix help dialog in popcorn.py (#81352)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:27:54 -0400
Subject: rpms/newt-perl/devel newt-perl.spec,1.9,1.10
Message-ID: <200607120727.k6C7RsV5017869@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	newt-perl.spec 
Log Message:
bumped for rebuild


Index: newt-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/newt-perl/devel/newt-perl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- newt-perl.spec	11 Feb 2006 04:45:18 -0000	1.9
+++ newt-perl.spec	12 Jul 2006 07:27:52 -0000	1.10
@@ -2,7 +2,7 @@
 Summary: Perl bindings for the Newt library
 Name: newt-perl
 Version: 1.08
-Release: 9.2.1
+Release: 9.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.08-9.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.08-9.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:28:12 -0400
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.97,1.98
Message-ID: <200607120728.k6C7SC4e018035@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	nfs-utils.spec 
Log Message:
bumped for rebuild


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- nfs-utils.spec	2 Jul 2006 14:36:32 -0000	1.97
+++ nfs-utils.spec	12 Jul 2006 07:28:10 -0000	1.98
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 5%{?dist}
+Release: 5.1%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -225,6 +225,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.8-5.1
+- rebuild
+
 * Sun Jul  2 2006 <jkeating at redhat.com> 1:1.0.8-5
 - Introduce epoch to fix upgrade path
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:28:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:28:29 -0400
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.8,1.9
Message-ID: <200607120728.k6C7STTQ018187@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18160

Modified Files:
	nfs-utils-lib.spec 
Log Message:
bumped for rebuild


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nfs-utils-lib.spec	20 Jun 2006 19:36:11 -0000	1.8
+++ nfs-utils-lib.spec	12 Jul 2006 07:28:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 5
+Release: 5.1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -115,6 +115,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-5.1
+- rebuild
+
 * Tue Jun 20 2006 Steve Dickson <steved at redhat.com> 1.0.8-3.1
 - Updated libnfsidmap and  librpcsecgss to latest upstream version
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:28:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:28:46 -0400
Subject: rpms/nhpf/devel nhpf.spec,1.12,1.13
Message-ID: <200607120728.k6C7SkYe018348@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nhpf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18323

Modified Files:
	nhpf.spec 
Log Message:
bumped for rebuild


Index: nhpf.spec
===================================================================
RCS file: /cvs/dist/rpms/nhpf/devel/nhpf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nhpf.spec	11 Feb 2006 04:46:18 -0000	1.12
+++ nhpf.spec	12 Jul 2006 07:28:44 -0000	1.13
@@ -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.1
+Release: 9.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:28:54 -0400
Subject: rpms/nkf/devel nkf.spec,1.20,1.21
Message-ID: <200607120728.k6C7Sseu018452@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nkf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18421

Modified Files:
	nkf.spec 
Log Message:
bumped for rebuild


Index: nkf.spec
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nkf.spec	6 Jul 2006 00:33:05 -0000	1.20
+++ nkf.spec	12 Jul 2006 07:28:51 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: A Kanji code conversion filter.
 Name: nkf
 Version: 2.07
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com> - 2.07-1
 - New upstream release.
 - use dist tag.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:02 -0400
Subject: rpms/nmap/devel nmap.spec,1.31,1.32
Message-ID: <200607120729.k6C7T2bi018557@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18532

Modified Files:
	nmap.spec 
Log Message:
bumped for rebuild


Index: nmap.spec
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nmap.spec	27 Jun 2006 09:44:04 -0000	1.31
+++ nmap.spec	12 Jul 2006 07:28:59 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 4.11
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:4.11-1.1
+- rebuild
+
 * Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 2:4.11-1
 - version 4.11
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:08 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.4,1.5
Message-ID: <200607120729.k6C7T8ar018662@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/notification-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18631

Modified Files:
	notification-daemon.spec 
Log Message:
bumped for rebuild


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- notification-daemon.spec	9 Jun 2006 18:13:08 -0000	1.4
+++ notification-daemon.spec	12 Jul 2006 07:29:06 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.5
-Release: 4 
+Release: 4.1 
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,9 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.5-4
 - Mark schema as config
 - Add libtool BR



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:16 -0400
Subject: rpms/nspr/devel nspr.spec,1.14,1.15
Message-ID: <200607120729.k6C7TGuv018755@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18729

Modified Files:
	nspr.spec 
Log Message:
bumped for rebuild


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nspr.spec	26 May 2006 19:42:53 -0000	1.14
+++ nspr.spec	12 Jul 2006 07:29:13 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.2
-Release:	1
+Release:	1.1
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -120,6 +120,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.6.2-1.1
+- rebuild
+
 * Fri May 26 2006 Kai Engert <kengert at redhat.com> - 4.6.2-1
 - Update to 4.6.2
 - Tweak nspr-config to be identical on all platforms.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:23 -0400
Subject: rpms/nss/devel nss.spec,1.13,1.14
Message-ID: <200607120729.k6C7TNAY018846@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18823

Modified Files:
	nss.spec 
Log Message:
bumped for rebuild


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nss.spec	30 Jun 2006 23:10:12 -0000	1.13
+++ nss.spec	12 Jul 2006 07:29:20 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.2
-Release:          1
+Release:          1.1
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -314,6 +314,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 30 2006 Kai Engert <kengert at redhat.com> - 3.11.2-1
 - Update to 3.11.2
 - Enable executable bit on shared libs, also fixes debug info.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:34 -0400
Subject: rpms/nss_db/devel nss_db.spec,1.32,1.33
Message-ID: <200607120729.k6C7TYA2018987@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18932

Modified Files:
	nss_db.spec 
Log Message:
bumped for rebuild


Index: nss_db.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nss_db.spec	17 Feb 2006 23:04:53 -0000	1.32
+++ nss_db.spec	12 Jul 2006 07:29:32 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: An NSS library for the Berkeley DB.
 Name: nss_db
 Version: 2.2
-Release: 35
+Release: 35.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
@@ -112,6 +112,9 @@
 %config /var/db/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2-35.1
+- rebuild
+
 * Fri Feb 17 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.2-35
 - add missing 'ed' builddep
 - set LDFLAGS and CPPFLAGS so that our local copy of DB is more likely to be



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:41 -0400
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.71,1.72
Message-ID: <200607120729.k6C7Tf4w019054@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19026

Modified Files:
	nss_ldap.spec 
Log Message:
bumped for rebuild


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nss_ldap.spec	16 May 2006 21:37:08 -0000	1.71
+++ nss_ldap.spec	12 Jul 2006 07:29:38 -0000	1.72
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: 250
-Release: 5
+Release: 5.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
@@ -223,6 +223,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 250-5.1
+- rebuild
+
 * Tue May 16 2006 Nalin Dahyabhai <nalin at redhat.com> - 250-5
 - adjust nss_ldap's makefile rule to more correctly deduce the right soversion
   for nsswitch modules (#191927)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:50 -0400
Subject: rpms/numactl/devel numactl.spec,1.31,1.32
Message-ID: <200607120729.k6C7Toah019160@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19135

Modified Files:
	numactl.spec 
Log Message:
bumped for rebuild


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- numactl.spec	14 Jun 2006 11:34:48 -0000	1.31
+++ numactl.spec	12 Jul 2006 07:29:48 -0000	1.32
@@ -63,6 +63,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8-1.31
+- rebuild
+
 * Tue Jun 13 2006 Neil Horman <nhorman at redhat.com>
 - Rebased numactl to version 0.9.8 for FC6/RHEL5
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:29:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:29:58 -0400
Subject: rpms/nut/devel nut.spec,1.33,1.34
Message-ID: <200607120729.k6C7TwPs019255@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19228

Modified Files:
	nut.spec 
Log Message:
bumped for rebuild


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nut.spec	16 May 2006 14:16:18 -0000	1.33
+++ nut.spec	12 Jul 2006 07:29:56 -0000	1.34
@@ -11,7 +11,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.0.3
-Release: 2
+Release: 2.1
 Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -276,6 +276,9 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.1
+- rebuild
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 2.0.3-2 
 - fix #191914, BR fontconfig-devel for cgi
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:30:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:30:36 -0400
Subject: rpms/opal/devel opal.spec,1.9,1.10
Message-ID: <200607120730.k6C7UauV019401@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	opal.spec 
Log Message:
bumped for rebuild


Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- opal.spec	31 May 2006 11:52:17 -0000	1.9
+++ opal.spec	12 Jul 2006 07:30:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Open Phone Abstraction Library
 Name: opal
 Version: 2.2.2
-Release: 1
+Release: 1.1
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
@@ -59,6 +59,9 @@
 %{_datadir}/opal
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-1.1
+- rebuild
+
 * Wed May 31 2006 Daniel Veillard <veillard at redhat.com> - 2.2.2-1
 - new release for ekiga-2.0.2
 - try to fix #192740 mutilib problem



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:32:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:32:11 -0400
Subject: rpms/open/devel open.spec,1.14,1.15
Message-ID: <200607120732.k6C7WBSb019533@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/open/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19513

Modified Files:
	open.spec 
Log Message:
bumped for rebuild


Index: open.spec
===================================================================
RCS file: /cvs/dist/rpms/open/devel/open.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- open.spec	12 May 2006 15:03:36 -0000	1.14
+++ open.spec	12 Jul 2006 07:31:57 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A tool which will start a program on a virtual console.
 Name: open
 Version: 1.4
-Release: 25
+Release: 25.1
 License: GPL
 Group: Applications/System
 Source: ftp://sunsite.unc.edu/pub/Linux/utils/console/open-%{version}.tar.bz2
@@ -43,6 +43,9 @@
 %attr(644,root,root) %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4-25.1
+- rebuild
+
 * Fri May 12 2006 Than Ngo <than at redhat.com> 1.4-25
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:32:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:32:43 -0400
Subject: rpms/openais/devel openais.spec,1.6,1.7
Message-ID: <200607120732.k6C7WhJD019632@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19611

Modified Files:
	openais.spec 
Log Message:
bumped for rebuild


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openais.spec	11 Jul 2006 01:24:26 -0000	1.6
+++ openais.spec	12 Jul 2006 07:32:40 -0000	1.7
@@ -1,7 +1,7 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.78
-Release: 1.2
+Release: 1.2.1
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
@@ -166,6 +166,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Steven Dake <sdake at redhat.com> - 0.78-1.2
 - Allow build on s390 and s390x.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:33:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:33:05 -0400
Subject: rpms/openCryptoki/devel openCryptoki.spec,1.23,1.24
Message-ID: <200607120733.k6C7X5HT019715@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openCryptoki/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19698

Modified Files:
	openCryptoki.spec 
Log Message:
bumped for rebuild


Index: openCryptoki.spec
===================================================================
RCS file: /cvs/dist/rpms/openCryptoki/devel/openCryptoki.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openCryptoki.spec	15 May 2006 08:26:13 -0000	1.23
+++ openCryptoki.spec	12 Jul 2006 07:33:02 -0000	1.24
@@ -1,7 +1,7 @@
 Name: openCryptoki
 Summary: Implementation of Cryptoki v2.11 for IBM Crypto Hardware
 Version: 2.2.4
-Release: 1
+Release: 1.1
 License: Other License(s), see package
 Group: Productivity/Security
 Source: opencryptoki-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_libdir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.4-1.1
+- rebuild
+
 * Fri May 12 2006 Phil Knirsch <pknirsch at redhat.com> - 2.2.4-1
 - Updated to opencryptoki-2.2.4 (#184631)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:33:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:33:37 -0400
Subject: rpms/openhpi/devel openhpi.spec,1.42,1.43
Message-ID: <200607120733.k6C7XbqL019852@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19798

Modified Files:
	openhpi.spec 
Log Message:
bumped for rebuild


Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openhpi.spec	10 Jul 2006 14:57:49 -0000	1.42
+++ openhpi.spec	12 Jul 2006 07:33:34 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.4.1
-Release: 5
+Release: 5.1
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-5.1
+- rebuild
+
 
 * Mon Jul 10 2006 Phil Knirsch <pknirsch at redhat.com> - 2.4.1-5
 - Had to disable sysfs support due to new libsysfs and incompatible API.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:33:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:33:52 -0400
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.37,1.38
Message-ID: <200607120733.k6C7XqnD019892@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19872

Modified Files:
	OpenIPMI.spec 
Log Message:
bumped for rebuild


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- OpenIPMI.spec	16 Jun 2006 16:22:54 -0000	1.37
+++ OpenIPMI.spec	12 Jul 2006 07:33:49 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.6
-Release: 4
+Release: 4.1
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -166,6 +166,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-4.1
+- rebuild
+
 * Fri Jun 16 2006 Bill Nottingham <notting at redhat.com> 2.0.6-4
 - don't include <linux/compiler.h>
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:34:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:34:10 -0400
Subject: rpms/gdb/devel gdb.spec,1.191,1.192
Message-ID: <200607120734.k6C7YAnU019973@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19933

Modified Files:
	gdb.spec 
Log Message:
No prelink on ia64



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gdb.spec	12 Jul 2006 07:13:31 -0000	1.191
+++ gdb.spec	12 Jul 2006 07:34:07 -0000	1.192
@@ -217,7 +217,7 @@
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
-BuildRequires: flex bison sharutils prelink
+BuildRequires: flex bison sharutils
 
 %ifarch %{multilib_64_archs} sparc ppc
 # Ensure glibc{,-devel} is installed for both multilib arches
@@ -227,6 +227,8 @@
 %ifarch ia64
 BuildRequires: libunwind >= 0.96-3
 Requires: libunwind >= 0.96-3
+%else
+BuildRequires: prelink
 %endif
  
 Prereq: info



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:34:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:34:50 -0400
Subject: rpms/openldap/devel openldap.spec,1.56,1.57
Message-ID: <200607120734.k6C7YoqT020172@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20115

Modified Files:
	openldap.spec 
Log Message:
bumped for rebuild


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- openldap.spec	7 Jun 2006 17:17:21 -0000	1.56
+++ openldap.spec	12 Jul 2006 07:34:47 -0000	1.57
@@ -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
@@ -689,6 +689,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.24-2.1
+- rebuild
+
 * Wed Jun 7 2006 Jay Fenlason <fenlason at redhat.com> 2.3.24-2
 - New upstream version
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:12 -0400
Subject: rpms/openmotif/devel openmotif.spec,1.44,1.45
Message-ID: <200607120735.k6C7ZCMF020279@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20256

Modified Files:
	openmotif.spec 
Log Message:
bumped for rebuild


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- openmotif.spec	6 Jun 2006 11:05:24 -0000	1.44
+++ openmotif.spec	12 Jul 2006 07:35:09 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.2
+Release: 0.2.1
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
@@ -135,6 +135,9 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.2.1
+- rebuild
+
 * Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.2
 - new CVS version 2006-06-06
 - new buildprereq for pkgconfig



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:32 -0400
Subject: rpms/openobex/devel openobex.spec,1.19,1.20
Message-ID: <200607120735.k6C7ZWvx020390@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20359

Modified Files:
	openobex.spec 
Log Message:
bumped for rebuild


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openobex.spec	27 Jun 2006 11:30:46 -0000	1.19
+++ openobex.spec	12 Jul 2006 07:35:29 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.3
-Release: 3
+Release: 3.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3-3.1
+- rebuild
+
 * Tue Jun 27 2006 Harald Hoyer <harald at redhat.com> - 1.3-3
 - removed more patches
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:39 -0400
Subject: rpms/opensp/devel opensp.spec,1.10,1.11
Message-ID: <200607120735.k6C7Zd9M020487@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/opensp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20457

Modified Files:
	opensp.spec 
Log Message:
bumped for rebuild


Index: opensp.spec
===================================================================
RCS file: /cvs/dist/rpms/opensp/devel/opensp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opensp.spec	13 Jun 2006 12:44:33 -0000	1.10
+++ opensp.spec	12 Jul 2006 07:35:36 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: SGML and XML parser
 Name: opensp
 Version: 1.5.2
-Release: 3
+Release: 3.1
 Requires: sgml-common >= 0.5
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.2-3.1
+- rebuild
+
 * Tue Jun 13 2006 Tim Waugh <twaugh at redhat.com> 1.5.2-3
 - Fixed multilib fix (bug #194702).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:44 -0400
Subject: rpms/openssh/devel openssh.spec,1.91,1.92
Message-ID: <200607120735.k6C7ZiBW020570@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	openssh.spec 
Log Message:
bumped for rebuild


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- openssh.spec	14 Apr 2006 08:26:10 -0000	1.91
+++ openssh.spec	12 Jul 2006 07:35:41 -0000	1.92
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p2
-%define rel 5
+%define rel 5.1
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -454,6 +454,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.3p2-5.1
+- rebuild
+
 * Fri Apr 14 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-5
 - don't request pseudoterminal allocation if stdin is not tty (#188983)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:51 -0400
Subject: rpms/openssl/devel openssl.spec,1.77,1.78
Message-ID: <200607120735.k6C7Zp8W020673@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20640

Modified Files:
	openssl.spec 
Log Message:
bumped for rebuild


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- openssl.spec	21 Jun 2006 21:14:05 -0000	1.77
+++ openssl.spec	12 Jul 2006 07:35:49 -0000	1.78
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 3
+Release: 3.1
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -342,6 +342,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8b-3.1
+- rebuild
+
 * Wed Jun 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-3
 - dropped libica and ica engine from build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:35:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:35:59 -0400
Subject: rpms/openssl097a/devel openssl097a.spec,1.8,1.9
Message-ID: <200607120735.k6C7Zxur020767@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20745

Modified Files:
	openssl097a.spec 
Log Message:
bumped for rebuild


Index: openssl097a.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl097a.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openssl097a.spec	4 Jul 2006 20:29:37 -0000	1.8
+++ openssl097a.spec	12 Jul 2006 07:35:56 -0000	1.9
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl097a
 Version: 0.9.7a
-Release: 6
+Release: 6.1
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -392,6 +392,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7a-6.1
+- rebuild
+
 * Tue Jul  4 2006 Tomas Mraz <tmraz at redhat.com> 0.9.7a-6
 - fix a few rpmlint warnings
 - fix build if 'rand' or 'passwd' in buildroot path (#178782)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:36:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:36:07 -0400
Subject: rpms/openswan/devel openswan.spec,1.32,1.33
Message-ID: <200607120736.k6C7a7j6020865@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openswan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20842

Modified Files:
	openswan.spec 
Log Message:
bumped for rebuild


Index: openswan.spec
===================================================================
RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- openswan.spec	17 May 2006 11:56:45 -0000	1.32
+++ openswan.spec	12 Jul 2006 07:36:04 -0000	1.33
@@ -24,7 +24,7 @@
 %define srcpkgver 2.4.5
 
 %define debug_package %{nil}
-Release: 2
+Release: 2.1
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -58,7 +58,7 @@
 %package klips
 Summary: Openswan kernel module
 Group:  System Environment/Kernel
-Release: %{krelver}_%{ourrelease}.2.1
+Release: %{krelver}_%{ourrelease}.2.1.1
 Provides: ipsec-kernel
 Requires: kernel = %{kversion}
 # do not make the dependancy circular for now.
@@ -242,6 +242,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-2.1
+- rebuild
+
 * Wed May 17 2006 Harald Hoyer <harald at redhat.com> - 2.4.5-2
 - fixed typo (bug #191930)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:36:22 -0400
Subject: rpms/oprofile/devel oprofile.spec,1.44,1.45
Message-ID: <200607120736.k6C7aMHJ020985@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20961

Modified Files:
	oprofile.spec 
Log Message:
bumped for rebuild


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- oprofile.spec	10 Jul 2006 14:39:19 -0000	1.44
+++ oprofile.spec	12 Jul 2006 07:36:20 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
-Release: %{oprofile_release}.1.1
+Release: %{oprofile_release}.1.1.1
 License: GPL
 Group: Development/System
 #
@@ -258,6 +258,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-13.1.1.1
+- rebuild
+
 * Mon Jul 10 2006 Will Cohen <wcohen at redhat.com>
 - Add power6 support. (#196505)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:36:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:36:43 -0400
Subject: rpms/ORBit2/devel ORBit2.spec,1.40,1.41
Message-ID: <200607120736.k6C7ahav021092@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21070

Modified Files:
	ORBit2.spec 
Log Message:
bumped for rebuild


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ORBit2.spec	9 Jun 2006 02:21:24 -0000	1.40
+++ ORBit2.spec	12 Jul 2006 07:36:40 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
 Version: 2.14.0
-Release: 3
+Release: 3.1
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -123,6 +123,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-3.1
+- rebuild
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.0-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:36:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:36:58 -0400
Subject: rpms/oro/devel oro.spec,1.10,1.11
Message-ID: <200607120736.k6C7awZ5021246@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21185

Modified Files:
	oro.spec 
Log Message:
bumped for rebuild


Index: oro.spec
===================================================================
RCS file: /cvs/dist/rpms/oro/devel/oro.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- oro.spec	22 Dec 2005 06:07:11 -0000	1.10
+++ oro.spec	12 Jul 2006 07:36:56 -0000	1.11
@@ -1,7 +1,7 @@
 %define name		oro
 %define full_name	jakarta-%{name}
 %define version		2.0.8
-%define release 	1jpp_4fc
+%define release 	1jpp_5fc
 %define section		free
 
 Name:           %{name}
@@ -71,6 +71,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.8-1jpp_5fc
+- rebuild
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 2.0.8-1jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:37:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:37:08 -0400
Subject: rpms/pam/devel pam.spec,1.122,1.123
Message-ID: <200607120737.k6C7b6B3021301@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21276

Modified Files:
	pam.spec 
Log Message:
bumped for rebuild


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- pam.spec	3 Jul 2006 13:19:35 -0000	1.122
+++ pam.spec	12 Jul 2006 07:37:04 -0000	1.123
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -363,6 +363,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.5.0-2.1
+- rebuild
+
 * Mon Jul  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-2
 - fixed network match in pam_access (patch by Dan Yefimov)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:37:20 -0400
Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.15,1.16
Message-ID: <200607120737.k6C7bKXg021419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21396

Modified Files:
	pam_ccreds.spec 
Log Message:
bumped for rebuild


Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pam_ccreds.spec	11 Feb 2006 04:55:21 -0000	1.15
+++ pam_ccreds.spec	12 Jul 2006 07:37:18 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 3
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %attr(4755,root,root) %{_sbindir}/ccreds_validate
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3-3.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:37:37 -0400
Subject: rpms/pam_krb5/devel pam_krb5.spec,1.44,1.45
Message-ID: <200607120737.k6C7bbTA021497@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21471

Modified Files:
	pam_krb5.spec 
Log Message:
bumped for rebuild


Index: pam_krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_krb5/devel/pam_krb5.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pam_krb5.spec	29 Mar 2006 22:50:45 -0000	1.44
+++ pam_krb5.spec	12 Jul 2006 07:37:34 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A Pluggable Authentication Module for Kerberos 5.
 Name: pam_krb5
 Version: 2.2.8
-Release: 1
+Release: 1.1
 Source0: pam_krb5-%{version}-%{release}.tar.gz
 License: LGPL
 Group: System Environment/Base
@@ -47,6 +47,9 @@
 
 # $Id$
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.8-1.1
+- rebuild
+
 * Wed Mar 29 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.2.8-1
 - don't try to validate creds in a password-changing situation, because the
   attempt will always fail unless the matching key is in the keytab, which



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:38:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:38:02 -0400
Subject: rpms/pam_passwdqc/devel pam_passwdqc.spec,1.7,1.8
Message-ID: <200607120738.k6C7c2Cf021635@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_passwdqc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21606

Modified Files:
	pam_passwdqc.spec 
Log Message:
bumped for rebuild


Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_passwdqc/devel/pam_passwdqc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pam_passwdqc.spec	11 Feb 2006 04:55:42 -0000	1.7
+++ pam_passwdqc.spec	12 Jul 2006 07:37:59 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.2
-Release: 1.2.1
+Release: 1.2.2
 License: BSD-compatible
 Group: System Environment/Base
 URL: http://www.openwall.com/passwdqc/
@@ -37,6 +37,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:38:34 -0400
Subject: rpms/pam_smb/devel pam_smb.spec,1.16,1.17
Message-ID: <200607120738.k6C7cYfe021789@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_smb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21766

Modified Files:
	pam_smb.spec 
Log Message:
bumped for rebuild


Index: pam_smb.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_smb/devel/pam_smb.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pam_smb.spec	11 Feb 2006 04:55:53 -0000	1.16
+++ pam_smb.spec	12 Jul 2006 07:38:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name: pam_smb
 Version: 1.1.7
-Release: 7.2
+Release: 7.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-7.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-7.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:38:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:38:44 -0400
Subject: rpms/pango/devel pango.spec,1.73,1.74
Message-ID: <200607120738.k6C7citM021894@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21866

Modified Files:
	pango.spec 
Log Message:
bumped for rebuild


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pango.spec	11 Jul 2006 01:34:25 -0000	1.73
+++ pango.spec	12 Jul 2006 07:38:41 -0000	1.74
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.13.3
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.13.3-1.1
+- rebuild
+
 * Mon Jul 10 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.3-1
 - Update to 1.13.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:38:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:38:54 -0400
Subject: rpms/parted/devel parted.spec,1.78,1.79
Message-ID: <200607120738.k6C7csUZ022035@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22012

Modified Files:
	parted.spec 
Log Message:
bumped for rebuild


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- parted.spec	5 Jul 2006 19:36:55 -0000	1.78
+++ parted.spec	12 Jul 2006 07:38:51 -0000	1.79
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 9
+Release: 9.1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -106,6 +106,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-9.1
+- rebuild
+
 * Wed Jul  5 2006 Peter Jones <pjones at redhat.com> - 1.7.1-9
 - add ped_exception_get_handler()
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:39:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:39:01 -0400
Subject: rpms/passivetex/devel passivetex.spec,1.13,1.14
Message-ID: <200607120739.k6C7d1xF022133@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/passivetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22109

Modified Files:
	passivetex.spec 
Log Message:
bumped for rebuild


Index: passivetex.spec
===================================================================
RCS file: /cvs/dist/rpms/passivetex/devel/passivetex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- passivetex.spec	9 Dec 2005 22:42:38 -0000	1.13
+++ passivetex.spec	12 Jul 2006 07:38:59 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	Macros to process XSL formatting objects.
 Name:		passivetex
 Version:	1.25
-Release: 5.1
+Release: 5.1.1
 License:	LaTeX Project Public License (http://www.latex-project.org/lppl.txt)
 Group:		Applications/Publishing
 Source0:	http://www.tei-c.org.uk/Software/passivetex/%{name}-%{version}.zip
@@ -52,6 +52,9 @@
 %{mydir}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.25-5.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
@@ -134,8 +137,8 @@
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.13  2005/12/09 22:42:38  jkeating
-gcc update bump
+Revision 1.14  2006/07/12 07:38:59  jkeating
+bumped for rebuild
 
 Revision 1.8  2001/08/21 10:12:42  wrobell
 - ver. 1.6



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:39:14 -0400
Subject: rpms/passwd/devel passwd.spec,1.24,1.25
Message-ID: <200607120739.k6C7dELx022257@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	passwd.spec 
Log Message:
bumped for rebuild


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- passwd.spec	11 Feb 2006 04:56:39 -0000	1.24
+++ passwd.spec	12 Jul 2006 07:39:11 -0000	1.25
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM.
 Name: passwd
 Version: 0.71
-Release: 3.2
+Release: 3.2.1
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:39:23 -0400
Subject: rpms/patch/devel patch.spec,1.26,1.27
Message-ID: <200607120739.k6C7dNSB022362@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22342

Modified Files:
	patch.spec 
Log Message:
bumped for rebuild


Index: patch.spec
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- patch.spec	11 Feb 2006 04:56:48 -0000	1.26
+++ patch.spec	12 Jul 2006 07:39:20 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 29.2.1
+Release: 29.2.2
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -60,6 +60,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-29.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:40:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:40:02 -0400
Subject: rpms/patchutils/devel patchutils.spec,1.20,1.21
Message-ID: <200607120740.k6C7e2kC022666@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patchutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22441

Modified Files:
	patchutils.spec 
Log Message:
bumped for rebuild


Index: patchutils.spec
===================================================================
RCS file: /cvs/dist/rpms/patchutils/devel/patchutils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- patchutils.spec	11 Feb 2006 04:56:58 -0000	1.20
+++ patchutils.spec	12 Jul 2006 07:39:59 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
 Version: 0.2.31
-Release: 2.2.1
+Release: 2.2.2
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
@@ -45,6 +45,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.31-2.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:40:48 -0400
Subject: rpms/pax/devel pax.spec,1.16,1.17
Message-ID: <200607120740.k6C7emLm023003@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22978

Modified Files:
	pax.spec 
Log Message:
bumped for rebuild


Index: pax.spec
===================================================================
RCS file: /cvs/dist/rpms/pax/devel/pax.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pax.spec	11 Feb 2006 04:57:09 -0000	1.16
+++ pax.spec	12 Jul 2006 07:40:45 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:41:14 -0400
Subject: rpms/pciutils/devel pciutils.spec,1.39,1.40
Message-ID: <200607120741.k6C7fE69023229@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pciutils.spec 
Log Message:
bumped for rebuild


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pciutils.spec	2 Jun 2006 12:37:57 -0000	1.39
+++ pciutils.spec	12 Jul 2006 07:41:11 -0000	1.40
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.3
-Release: 	2
+Release: 	2.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
@@ -72,6 +72,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.3-2.1
+- rebuild
+
 * Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 2.2.3-2
 - corrected multilib patch
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:41:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:41:47 -0400
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.19,1.20
Message-ID: <200607120741.k6C7fklY023446@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23418

Modified Files:
	pcmciautils.spec 
Log Message:
bumped for rebuild


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pcmciautils.spec	19 Jun 2006 07:13:25 -0000	1.19
+++ pcmciautils.spec	12 Jul 2006 07:41:44 -0000	1.20
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 3
+Release: 3.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
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 014-3.1
+- rebuild
+
 * Mon Jun 19 2006 Harald Hoyer <harald at redhat.com> - 014-3
 - changed MODALIAS to ENV{MODALIAS} in the rules file
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:41:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:41:58 -0400
Subject: rpms/pcre/devel pcre.spec,1.18,1.19
Message-ID: <200607120741.k6C7fwBv023540@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcre/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23520

Modified Files:
	pcre.spec 
Log Message:
bumped for rebuild


Index: pcre.spec
===================================================================
RCS file: /cvs/dist/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pcre.spec	9 May 2006 12:38:06 -0000	1.18
+++ pcre.spec	12 Jul 2006 07:41:55 -0000	1.19
@@ -1,6 +1,6 @@
 Name: pcre
 Version: 6.6
-Release: 1
+Release: 1.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
@@ -80,6 +80,9 @@
 %{_bindir}/pcre-config
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.6-1.1
+- rebuild
+
 * Tue May 09 2006 Than Ngo <than at redhat.com> 6.6-1
 - update to 6.6
 - fix multilib problem



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:42:08 -0400
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.2,1.3
Message-ID: <200607120742.k6C7g8dk023642@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcsc-lite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23621

Modified Files:
	pcsc-lite.spec 
Log Message:
bumped for rebuild


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/dist/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcsc-lite.spec	10 Jul 2006 21:04:55 -0000	1.2
+++ pcsc-lite.spec	12 Jul 2006 07:42:05 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.3.1
-Release:        3
+Release:        3.1
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -140,6 +140,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com> - 1.3.1-3
 - remove s390 from the build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:42:45 -0400
Subject: rpms/perl/devel perl.spec,1.93,1.94
Message-ID: <200607120742.k6C7gjvl023945@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl.spec 
Log Message:
bumped for rebuild


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- perl.spec	2 Jun 2006 22:05:14 -0000	1.93
+++ perl.spec	12 Jul 2006 07:42:43 -0000	1.94
@@ -43,7 +43,7 @@
 
 Name:           perl
 Version:        %{perlver}
-Release:        %{perlrel}
+Release:        %{perlrel}.1
 Epoch:          %{perlepoch}
 Summary:        The Perl programming language
 
@@ -579,6 +579,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
 - Fix upstream perl bug 38454:
   'rindex corrects for $[ on bytes rather than UTF-8'



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:42:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:42:52 -0400
Subject: rpms/perl-Archive-Tar/devel perl-Archive-Tar.spec,1.17,1.18
Message-ID: <200607120742.k6C7gqL1024042@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Archive-Tar.spec 
Log Message:
bumped for rebuild


Index: perl-Archive-Tar.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/perl-Archive-Tar.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Archive-Tar.spec	8 Mar 2006 23:14:52 -0000	1.17
+++ perl-Archive-Tar.spec	12 Jul 2006 07:42:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Tar
 Version:        1.29
-Release: 	1
+Release: 	1.1
 Summary:        A module for Perl manipulation of .tar files
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Mar 08 2006 Jason Vas Dias <jvdias at redhat.com> - 1.29-1
 - Upgrade to upstream version 1.29
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:42:59 -0400
Subject: rpms/perl-Archive-Zip/devel perl-Archive-Zip.spec,1.6,1.7
Message-ID: <200607120742.k6C7gxAo024137@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Archive-Zip.spec 
Log Message:
bumped for rebuild


Index: perl-Archive-Zip.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Zip/devel/perl-Archive-Zip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Archive-Zip.spec	3 Feb 2006 18:14:30 -0000	1.6
+++ perl-Archive-Zip.spec	12 Jul 2006 07:42:57 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Zip
 Version:        1.16
-Release:        1.2
+Release:        1.2.1
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias<jvdias at redhat.com> - 1.16-1.2
 - rebuilt for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:43:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:43:08 -0400
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.19,1.20
Message-ID: <200607120743.k6C7h8YJ024241@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
bumped for rebuild


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-Bit-Vector.spec	11 Feb 2006 04:58:09 -0000	1.19
+++ perl-Bit-Vector.spec	12 Jul 2006 07:43:05 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
 Version:        6.4
-Release: 	2.2.2
+Release: 	2.2.2.1
 Summary:        A module for high-performance Perl manipulation of bit vectors
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.4-2.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:43:14 -0400
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.22,1.23
Message-ID: <200607120743.k6C7hEkZ024338@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
bumped for rebuild


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-BSD-Resource.spec	5 Jun 2006 23:07:19 -0000	1.22
+++ perl-BSD-Resource.spec	12 Jul 2006 07:43:12 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.28
-Release: 	1.fc6
+Release: 	1.fc6.1
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.28-1
 - upgrade to upstream version 1.28
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:43:19 -0400
Subject: rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.3,1.4
Message-ID: <200607120743.k6C7hJNr024427@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Carp-Clan.spec 
Log Message:
bumped for rebuild


Index: perl-Carp-Clan.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Carp-Clan.spec	3 Feb 2006 18:28:30 -0000	1.3
+++ perl-Carp-Clan.spec	12 Jul 2006 07:43:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan
 Version:        5.3
-Release: 	1.2
+Release: 	1.2.1
 Summary:        Report errors from perspective of caller of a "clan" of modules
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.3-2
 - rebuild for perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:43:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:43:32 -0400
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.24,1.25
Message-ID: <200607120743.k6C7hWfN024482@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
bumped for rebuild


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Compress-Zlib.spec	6 Jun 2006 00:32:49 -0000	1.24
+++ perl-Compress-Zlib.spec	12 Jul 2006 07:43:30 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name: perl-Compress-Zlib
 Version: 1.41
-Release: 2
+Release: 2.1
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: GPL or Artistic
 Group: Development/Libraries
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.41-2.1
+- rebuild
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.41-2
 - fix License: tag
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:43:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:43:39 -0400
Subject: rpms/perl-Convert-ASN1/devel perl-Convert-ASN1.spec,1.7,1.8
Message-ID: <200607120743.k6C7hdxq000729@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Convert-ASN1.spec 
Log Message:
bumped for rebuild


Index: perl-Convert-ASN1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Convert-ASN1/devel/perl-Convert-ASN1.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Convert-ASN1.spec	9 Mar 2006 19:38:58 -0000	1.7
+++ perl-Convert-ASN1.spec	12 Jul 2006 07:43:37 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Convert-ASN1 Perl module
 Name:           perl-Convert-ASN1
 Version:        0.20
-Release: 	1
+Release: 	1.1
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Mar 09 2006 Jason Vas Dias <jvdias at redhat.com> - 1.20-1
 - upgrade to upstream version 1.20-1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:44:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:44:02 -0400
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.17,1.18
Message-ID: <200607120744.k6C7i2CT030353@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
bumped for rebuild


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Crypt-SSLeay.spec	11 Feb 2006 04:58:42 -0000	1.17
+++ perl-Crypt-SSLeay.spec	12 Jul 2006 07:44:00 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Name: perl-Crypt-SSLeay
 Version: 0.51
-Release: 9.2.2
+Release: 9.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.51-9.2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.51-9.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:44:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:44:21 -0400
Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.16,1.17
Message-ID: <200607120744.k6C7iLXs016886@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Date-Calc.spec 
Log Message:
bumped for rebuild


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Date-Calc.spec	11 Feb 2006 05:00:34 -0000	1.16
+++ perl-Date-Calc.spec	12 Jul 2006 07:44:19 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
 Version:        5.4
-Release: 	1.2.2
+Release: 	1.2.2.1
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.4-1.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:44:40 -0400
Subject: rpms/perl-DateManip/devel perl-DateManip.spec,1.12,1.13
Message-ID: <200607120744.k6C7iefL002977@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DateManip.spec 
Log Message:
bumped for rebuild


Index: perl-DateManip.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DateManip/devel/perl-DateManip.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-DateManip.spec	3 Feb 2006 18:59:11 -0000	1.12
+++ perl-DateManip.spec	12 Jul 2006 07:44:37 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-DateManip
 Version:        5.44
-Release: 	1.2
+Release: 	1.2.1
 Summary:        A Perl module containing a wide variety of date manipulation routines
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.44-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:44:48 -0400
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.26,1.27
Message-ID: <200607120744.k6C7imxV003032@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bumped for rebuild


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-DBD-MySQL.spec	31 May 2006 23:35:27 -0000	1.26
+++ perl-DBD-MySQL.spec	12 Jul 2006 07:44:46 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0004
-Release: 	1.FC6
+Release: 	1.FC6.1
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0004-1.FC6
 - upgrade to upstream version 3.0004
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:02 -0400
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.24,1.25
Message-ID: <200607120745.k6C7j2YS003131@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBI.spec 
Log Message:
bumped for rebuild


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBI.spec	11 Feb 2006 05:04:13 -0000	1.24
+++ perl-DBI.spec	12 Jul 2006 07:45:00 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.50
-Release: 	2.2
+Release: 	2.2.1
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:11 -0400
Subject: rpms/perl-Digest-SHA1/devel perl-Digest-SHA1.spec,1.13,1.14
Message-ID: <200607120745.k6C7jBtJ003225@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Digest-SHA1.spec 
Log Message:
bumped for rebuild


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Digest-SHA1.spec	11 Feb 2006 05:04:37 -0000	1.13
+++ perl-Digest-SHA1.spec	12 Jul 2006 07:45:09 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
 Version:        2.11
-Release: 	1.2
+Release: 	1.2.1
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.11-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:33 -0400
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.24,1.25
Message-ID: <200607120745.k6C7jX62003309@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
bumped for rebuild


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-HTML-Parser.spec	5 Jun 2006 23:52:43 -0000	1.24
+++ perl-HTML-Parser.spec	12 Jul 2006 07:45:28 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.54
-Release: 1.fc6
+Release: 1.fc6.1
 License: GPL or Artistic
 Group:  Development/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.54-1.fc6.1
+- rebuild
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.54-1
 - upgrade to 3.54
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:42 -0400
Subject: rpms/perl-HTML-Tagset/devel perl-HTML-Tagset.spec,1.13,1.14
Message-ID: <200607120745.k6C7jgTv003413@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-HTML-Tagset.spec 
Log Message:
bumped for rebuild


Index: perl-HTML-Tagset.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/perl-HTML-Tagset.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-HTML-Tagset.spec	3 Feb 2006 19:30:50 -0000	1.13
+++ perl-HTML-Tagset.spec	12 Jul 2006 07:45:40 -0000	1.14
@@ -1,6 +1,6 @@
 Name: 		perl-HTML-Tagset
 Version: 	3.10
-Release: 	2.1
+Release: 	2.1.1
 Summary: 	HTML::Tagset - data tables useful in parsing HTML
 
 Group: 		Development/Libraries
@@ -44,6 +44,9 @@
 %{_mandir}/man?/HTML::Tagset.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.10-2.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:47 -0400
Subject: rpms/perl-Inline/devel perl-Inline.spec,1.12,1.13
Message-ID: <200607120745.k6C7jlD1004112@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Inline.spec 
Log Message:
bumped for rebuild


Index: perl-Inline.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Inline/devel/perl-Inline.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Inline.spec	3 Feb 2006 19:41:07 -0000	1.12
+++ perl-Inline.spec	12 Jul 2006 07:45:45 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Inline
 Version:        0.44
-Release: 	15.2
+Release: 	15.2.1
 Summary:        Inline Perl module
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.44-15.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:45:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:45:57 -0400
Subject: rpms/perl-IO-String/devel perl-IO-String.spec,1.5,1.6
Message-ID: <200607120745.k6C7jvRU005737@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-IO-String.spec 
Log Message:
bumped for rebuild


Index: perl-IO-String.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-String/devel/perl-IO-String.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-String.spec	3 Feb 2006 19:36:04 -0000	1.5
+++ perl-IO-String.spec	12 Jul 2006 07:45:54 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-String
 Version:        1.08
-Release:        1.1
+Release:        1.1.1
 
 Summary:        Emulate file interface for in-core strings
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0:1.08-1.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:10 -0400
Subject: rpms/perl-IO-Zlib/devel perl-IO-Zlib.spec,1.5,1.6
Message-ID: <200607120746.k6C7kAdn008278@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-IO-Zlib.spec 
Log Message:
bumped for rebuild


Index: perl-IO-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Zlib/devel/perl-IO-Zlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-IO-Zlib.spec	3 Feb 2006 19:38:44 -0000	1.5
+++ perl-IO-Zlib.spec	12 Jul 2006 07:46:08 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-IO-Zlib
 Version:        1.04
-Release: 	4.2
+Release: 	4.2.1
 Summary:        Perl IO:: style interface to Compress::Zlib
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.04-4.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:15 -0400
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.7,1.8
Message-ID: <200607120746.k6C7kFEF008884@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-LDAP.spec 
Log Message:
bumped for rebuild


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-LDAP.spec	3 Feb 2006 19:48:07 -0000	1.7
+++ perl-LDAP.spec	12 Jul 2006 07:46:13 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-LDAP
 Version:        0.33
-Release: 	1.2
+Release: 	1.2.1
 Epoch:          1
 Summary:        LDAP Perl module
 
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.33-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:23 -0400
Subject: rpms/perl-libwww-perl/devel perl-libwww-perl.spec,1.17,1.18
Message-ID: <200607120746.k6C7kN3J009974@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-libwww-perl.spec 
Log Message:
bumped for rebuild


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-libwww-perl.spec	3 Feb 2006 21:29:14 -0000	1.17
+++ perl-libwww-perl.spec	12 Jul 2006 07:46:21 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.805
-Release: 	1.1
+Release: 	1.1.1
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.805-1.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:32 -0400
Subject: rpms/perl-libxml-perl/devel perl-libxml-perl.spec,1.10,1.11
Message-ID: <200607120746.k6C7kWxQ011341@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-libxml-perl.spec 
Log Message:
bumped for rebuild


Index: perl-libxml-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-libxml-perl/devel/perl-libxml-perl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-libxml-perl.spec	3 Feb 2006 21:35:13 -0000	1.10
+++ perl-libxml-perl.spec	12 Jul 2006 07:46:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-libxml-perl
 Version:        0.08
-Release: 	1.2
+Release: 	1.2.1
 Summary:        A collection of Perl modules for working with XML
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.08-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:43 -0400
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.23,1.24
Message-ID: <200607120746.k6C7khqt012654@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Net-DNS.spec 
Log Message:
bumped for rebuild


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-Net-DNS.spec	8 Mar 2006 23:24:54 -0000	1.23
+++ perl-Net-DNS.spec	12 Jul 2006 07:46:40 -0000	1.24
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.57
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.57-1.1
+- rebuild
+
 * Wed Mar 08 2006 Jason Vas Dias <jvdias at redhat.com> - 0.57-1
 - Upgrade to upstream version 0.57
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:46:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:46:52 -0400
Subject: rpms/perl-Parse-RecDescent/devel perl-Parse-RecDescent.spec, 1.10,
	1.11
Message-ID: <200607120746.k6C7kqrU014181@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Parse-RecDescent.spec 
Log Message:
bumped for rebuild


Index: perl-Parse-RecDescent.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Parse-RecDescent/devel/perl-Parse-RecDescent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Parse-RecDescent.spec	3 Feb 2006 19:43:27 -0000	1.10
+++ perl-Parse-RecDescent.spec	12 Jul 2006 07:46:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Parse-RecDescent
 Version:        1.94
-Release: 	5.2
+Release: 	5.2.1
 Summary:        Parse-RecDescent Perl module
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.94-5.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:00 -0400
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.27,1.28
Message-ID: <200607120747.k6C7l0EQ015435@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-PDL.spec 
Log Message:
bumped for rebuild


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-PDL.spec	10 Mar 2006 21:31:54 -0000	1.27
+++ perl-PDL.spec	12 Jul 2006 07:46:57 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.2
-Release: 	4.fc5
+Release: 	4.fc5.1
 Summary:        PDL Perl module
 
 Group:          Development/Libraries
@@ -115,6 +115,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Mar 10 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.2-4
 - Further code cleanup & CFLAGS settings required to enable tests 
   to succeed on all platforms



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:04 -0400
Subject: rpms/perl-RPM-Specfile/devel perl-RPM-Specfile.spec,1.11,1.12
Message-ID: <200607120747.k6C7l4KZ016223@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-RPM-Specfile.spec 
Log Message:
bumped for rebuild


Index: perl-RPM-Specfile.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-RPM-Specfile.spec	3 Feb 2006 20:21:37 -0000	1.11
+++ perl-RPM-Specfile.spec	12 Jul 2006 07:47:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-RPM-Specfile
 Version:        1.19
-Release:        2.1
+Release:        2.1.1
 Summary:        Perl extension for creating RPM specfiles
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.19-2.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:12 -0400
Subject: rpms/perl-SGMLSpm/devel perl-SGMLSpm.spec,1.12,1.13
Message-ID: <200607120747.k6C7lCrY017550@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-SGMLSpm.spec 
Log Message:
bumped for rebuild


Index: perl-SGMLSpm.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-SGMLSpm/devel/perl-SGMLSpm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-SGMLSpm.spec	3 Feb 2006 21:10:26 -0000	1.12
+++ perl-SGMLSpm.spec	12 Jul 2006 07:47:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-SGMLSpm
 Version:        1.03ii
-Release: 	16.2
+Release: 	16.2.1
 Summary:        Perl library for parsing the output of nsgmls
 
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.03ii-16.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:18 -0400
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.7,1.8
Message-ID: <200607120747.k6C7lIri018848@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-String-CRC32.spec 
Log Message:
bumped for rebuild


Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-String-CRC32.spec	31 May 2006 23:02:37 -0000	1.7
+++ perl-String-CRC32.spec	12 Jul 2006 07:47:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.4
-Release:        1.FC6
+Release:        1.FC6.1
 
 Summary:        Perl interface for cyclic redundency check generation
 
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 1.4-1.FC6
 - upgrade to upstream version 1.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:31 -0400
Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.15,1.16
Message-ID: <200607120747.k6C7lVn6018905@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-TermReadKey.spec 
Log Message:
bumped for rebuild


Index: perl-TermReadKey.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-TermReadKey.spec	11 Feb 2006 05:07:08 -0000	1.15
+++ perl-TermReadKey.spec	12 Jul 2006 07:47:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-TermReadKey
 Version:        2.30
-Release: 	1.2.2
+Release: 	1.2.2.1
 Summary:        A perl module for simple terminal control
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.30-1.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:38 -0400
Subject: rpms/perl-TimeDate/devel perl-TimeDate.spec,1.9,1.10
Message-ID: <200607120747.k6C7lc4Z018960@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-TimeDate.spec 
Log Message:
bumped for rebuild


Index: perl-TimeDate.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TimeDate/devel/perl-TimeDate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-TimeDate.spec	3 Feb 2006 21:17:57 -0000	1.9
+++ perl-TimeDate.spec	12 Jul 2006 07:47:34 -0000	1.10
@@ -1,7 +1,7 @@
 Name:           perl-TimeDate
 Version:        1.16
 Epoch:          1
-Release: 	3.2
+Release: 	3.2.1
 Summary:        A Perl module for time and date manipulation
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1:1.16-3.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:47 -0400
Subject: rpms/perl-XML-Grove/devel perl-XML-Grove.spec,1.14,1.15
Message-ID: <200607120747.k6C7llVj019046@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-Grove.spec 
Log Message:
bumped for rebuild


Index: perl-XML-Grove.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-XML-Grove.spec	3 Feb 2006 22:12:32 -0000	1.14
+++ perl-XML-Grove.spec	12 Jul 2006 07:47:45 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-XML-Grove
 Version:        0.46alpha
-Release:        29.1
+Release:        29.1.1
 Summary:        Simple access to infoset of parsed XML, HTML, or SGML instances
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.46alpha-29.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:47:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:47:53 -0400
Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.12,1.13
Message-ID: <200607120747.k6C7lrrq019101@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-LibXML.spec 
Log Message:
bumped for rebuild


Index: perl-XML-LibXML.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-XML-LibXML.spec	11 Feb 2006 05:07:31 -0000	1.12
+++ perl-XML-LibXML.spec	12 Jul 2006 07:47:51 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: XML-LibXML Perl module
 Name: perl-XML-LibXML
 Version: 1.58
-Release: 2.2.2
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.58-2.2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.58-2.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:48:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:48:00 -0400
Subject: rpms/perl-XML-LibXML-Common/devel perl-XML-LibXML-Common.spec, 1.10,
	1.11
Message-ID: <200607120748.k6C7m0dv019156@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/perl-XML-LibXML-Common/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19142

Modified Files:
	perl-XML-LibXML-Common.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-XML-LibXML-Common.spec	11 Feb 2006 05:08:07 -0000	1.10
+++ perl-XML-LibXML-Common.spec	12 Jul 2006 07:47:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-XML-LibXML-Common
 Version:        0.13
-Release: 	8.2.1
+Release: 	8.2.2
 Summary:        XML-LibXML-Common Perl module
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-8.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:48:06 -0400
Subject: rpms/perl-XML-NamespaceSupport/devel perl-XML-NamespaceSupport.spec,
	1.7, 1.8
Message-ID: <200607120748.k6C7m6SU019211@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-NamespaceSupport.spec 
Log Message:
bumped for rebuild


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-NamespaceSupport/devel/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-XML-NamespaceSupport.spec	3 Feb 2006 21:44:59 -0000	1.7
+++ perl-XML-NamespaceSupport.spec	12 Jul 2006 07:48:04 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-XML-NamespaceSupport
 Version:        1.09
-Release:	1.2
+Release:	1.2.1
 Summary:        XML-NamespaceSupport Perl module
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.09-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:48:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:48:18 -0400
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.18,1.19
Message-ID: <200607120748.k6C7mIhb019267@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-Parser.spec 
Log Message:
bumped for rebuild


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-XML-Parser.spec	11 Feb 2006 05:08:30 -0000	1.18
+++ perl-XML-Parser.spec	12 Jul 2006 07:48:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.34
-Release:	6.1.2.2
+Release:	6.1.2.2.1
 Summary:        A low level Perl module for parsing XML either via trees or streaming
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:48:25 -0400
Subject: rpms/pfmon/devel pfmon.spec,1.16,1.17
Message-ID: <200607120748.k6C7mPdH019322@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19309

Modified Files:
	pfmon.spec 
Log Message:
bumped for rebuild


Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pfmon.spec	27 Jun 2006 16:40:15 -0000	1.16
+++ pfmon.spec	12 Jul 2006 07:48:23 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.2
-Release: 0.%{DATE}.%{pfmon_release}
+Release: 0.%{DATE}.%{pfmon_release}.1
 License: GPL
 Group: Development/Tools
 Buildroot: /var/tmp/pfmon-root
@@ -58,6 +58,9 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.060621.7.1
+- rebuild
+
 * Tue Jun 27 2006 Will Cohen <wcohen at redhat.com>
 - Separate build and install processes.
 - Make sure that $(RPM_OPT_FLAGS) is used.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:03 -0400
Subject: rpms/php/devel php.spec,1.115,1.116
Message-ID: <200607120749.k6C7n3UC019378@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	php.spec 
Log Message:
bumped for rebuild


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- php.spec	9 Jun 2006 14:11:33 -0000	1.115
+++ php.spec	12 Jul 2006 07:49:01 -0000	1.116
@@ -5,7 +5,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.4
-Release: 8
+Release: 8.1
 License: The PHP License v3.01
 Group: Development/Languages
 URL: http://www.php.net/
@@ -604,6 +604,9 @@
 %files pdo -f files.pdo
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Fri Jun  9 2006 Joe Orton <jorton at redhat.com> 5.1.4-8
 - Provide php-posix (#194583)
 - only provide php-pcntl from -cli subpackage



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:09 -0400
Subject: rpms/php-pear/devel php-pear.spec,1.10,1.11
Message-ID: <200607120749.k6C7n9sB019432@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	php-pear.spec 
Log Message:
bumped for rebuild


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-pear.spec	8 May 2006 09:33:59 -0000	1.10
+++ php-pear.spec	12 Jul 2006 07:49:07 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.9
-Release: 2
+Release: 2.1
 Epoch: 1
 License: The PHP License 3.0
 Group: System
@@ -100,6 +100,9 @@
 %doc LICENSE
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.9-2.1
+- rebuild
+
 * Mon May  8 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-2
 - update to 1.4.9 (thanks to Remi Collet, #183359)
 - package /usr/share/pear/.pkgxml (#190252)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:15 -0400
Subject: rpms/pilot-link/devel pilot-link.spec,1.41,1.42
Message-ID: <200607120749.k6C7nFOR019487@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19474

Modified Files:
	pilot-link.spec 
Log Message:
bumped for rebuild


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pilot-link.spec	21 Apr 2006 11:08:15 -0000	1.41
+++ pilot-link.spec	12 Jul 2006 07:49:12 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 15
+Release: 15.1
 Source: pilot-link-%{version}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.11.0-perlmd5.patch
@@ -145,6 +145,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:0.11.8-15.1
+- rebuild
+
 * Fri Apr 21 2006 Than Ngo <than at redhat.com> 2:0.11.8-15
 - fix pilot-xfer crash on missing device node #186779, #175334
 - don't include unnecessary man page #185147



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:21 -0400
Subject: rpms/pinfo/devel pinfo.spec,1.26,1.27
Message-ID: <200607120749.k6C7nLkO019542@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19529

Modified Files:
	pinfo.spec 
Log Message:
bumped for rebuild


Index: pinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pinfo.spec	11 Feb 2006 05:10:01 -0000	1.26
+++ pinfo.spec	12 Jul 2006 07:49:19 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: An info file viewer.
 Name: pinfo
 Version: 0.6.8
-Release: 11.2.1
+Release: 11.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-11.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:40 -0400
Subject: rpms/pkgconfig/devel pkgconfig.spec,1.32,1.33
Message-ID: <200607120749.k6C7neIV019604@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pkgconfig.spec 
Log Message:
bumped for rebuild


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pkgconfig.spec	13 Jun 2006 03:23:02 -0000	1.32
+++ pkgconfig.spec	12 Jul 2006 07:49:37 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.20
-Release: 4
+Release: 4.1
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -42,6 +42,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.20-4.1
+- rebuild
+
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> - 1:0.20-4
 - don't call auto*
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:49:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:49:58 -0400
Subject: rpms/planner/devel planner.spec,1.26,1.27
Message-ID: <200607120749.k6C7nw6F019666@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19651

Modified Files:
	planner.spec 
Log Message:
bumped for rebuild


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- planner.spec	23 Jun 2006 12:44:15 -0000	1.26
+++ planner.spec	12 Jul 2006 07:49:56 -0000	1.27
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.14
-Release:   1
+Release:   1.1
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -210,6 +210,9 @@
 # Changelog
 ##################################
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.14-1.1
+- rebuild
+
 * Fri Jun 23 2006 Caolan McNamara <caolanm at redhat.com> - 0.14-1
 - new version
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:50:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:50:19 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.38,1.39
Message-ID: <200607120750.k6C7oJ2o019728@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pm-utils.spec 
Log Message:
bumped for rebuild


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pm-utils.spec	14 Jun 2006 04:42:40 -0000	1.38
+++ pm-utils.spec	12 Jul 2006 07:50:17 -0000	1.39
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.19
-Release: 1
+Release: 1.1
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -114,6 +114,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.19-1.1
+- rebuild
+
 * Tue Jun 13 2006 Peter Jones <pjones at redhat.com> - 0.19-1
 - update from CVS
 - move pam and consolehelper stuff here.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:50:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:50:31 -0400
Subject: rpms/pnm2ppa/devel pnm2ppa.spec,1.9,1.10
Message-ID: <200607120750.k6C7oVeM019782@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pnm2ppa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19770

Modified Files:
	pnm2ppa.spec 
Log Message:
bumped for rebuild


Index: pnm2ppa.spec
===================================================================
RCS file: /cvs/dist/rpms/pnm2ppa/devel/pnm2ppa.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pnm2ppa.spec	11 Feb 2006 05:11:27 -0000	1.9
+++ pnm2ppa.spec	12 Jul 2006 07:50:29 -0000	1.10
@@ -3,7 +3,7 @@
 Epoch: 1
 Obsoletes: ppa
 Version: 1.04
-Release: 13.2.1
+Release: 13.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.04-13.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:51:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:51:20 -0400
Subject: rpms/poppler/devel poppler.spec,1.27,1.28
Message-ID: <200607120751.k6C7pK1s019884@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19869

Modified Files:
	poppler.spec 
Log Message:
bumped for rebuild


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- poppler.spec	31 May 2006 06:43:46 -0000	1.27
+++ poppler.spec	12 Jul 2006 07:51:18 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.5.3
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.3-1.1
+- rebuild
+
 * Wed May 31 2006 Kristian H??gsberg <krh at redhat.com> 0.5.3-1
 - Update to 0.5.3.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:51:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:51:28 -0400
Subject: rpms/portmap/devel portmap.spec,1.19,1.20
Message-ID: <200607120751.k6C7pSAt019939@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/portmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19925

Modified Files:
	portmap.spec 
Log Message:
bumped for rebuild


Index: portmap.spec
===================================================================
RCS file: /cvs/dist/rpms/portmap/devel/portmap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- portmap.spec	13 Feb 2006 18:43:40 -0000	1.19
+++ portmap.spec	12 Jul 2006 07:51:25 -0000	1.20
@@ -4,7 +4,7 @@
 Summary: A program which manages RPC connections.
 Name: portmap
 Version: 4.0
-Release: 65.2.2
+Release: 65.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2.2.1
+- rebuild
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2.2
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:51:35 -0400
Subject: rpms/postfix/devel postfix.spec,1.40,1.41
Message-ID: <200607120751.k6C7pZtt019997@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19984

Modified Files:
	postfix.spec 
Log Message:
bumped for rebuild


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- postfix.spec	10 May 2006 12:16:29 -0000	1.40
+++ postfix.spec	12 Jul 2006 07:51:33 -0000	1.41
@@ -43,7 +43,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.2.10
-Release: 2
+Release: 2.1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -469,6 +469,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
+- rebuild
+
 * Wed May 10 2006 Thomas Woerner <twoerner at redhat.com> 2:2.2.10-2
 - added RELRO security protection
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:51:47 -0400
Subject: rpms/postgresql/devel postgresql.spec,1.68,1.69
Message-ID: <200607120751.k6C7plKT020056@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20043

Modified Files:
	postgresql.spec 
Log Message:
bumped for rebuild


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- postgresql.spec	22 May 2006 16:08:15 -0000	1.68
+++ postgresql.spec	12 Jul 2006 07:51:45 -0000	1.69
@@ -82,7 +82,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 8.1.4
-Release: 1
+Release: 1.1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -829,6 +829,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1.4-1.1
+- rebuild
+
 * Mon May 22 2006 Tom Lane <tgl at redhat.com> 8.1.4-1
 - Update to PostgreSQL 8.1.4 (includes fixes for CVE-2006-2313, CVE-2006-2314;
   see bug #192173)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:12 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.3,1.4
Message-ID: <200607120752.k6C7qCxs020121@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20105

Modified Files:
	postgresql-jdbc.spec 
Log Message:
bumped for rebuild


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- postgresql-jdbc.spec	14 Jun 2006 20:25:18 -0000	1.3
+++ postgresql-jdbc.spec	12 Jul 2006 07:52:10 -0000	1.4
@@ -5,7 +5,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.1.407
-Release:	1jpp
+Release:	1jpp.1
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases
@@ -99,6 +99,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:8.1.407-1jpp.1
+- rebuild
+
 * Wed Jun 14 2006 Tom Lane <tgl at redhat.com> 8.1.407-1jpp
 - Update to build 8.1-407
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:22 -0400
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.15,1.16
Message-ID: <200607120752.k6C7qMWT020183@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20167

Modified Files:
	postgresql-odbc.spec 
Log Message:
bumped for rebuild


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- postgresql-odbc.spec	11 Jun 2006 02:35:52 -0000	1.15
+++ postgresql-odbc.spec	12 Jul 2006 07:52:19 -0000	1.16
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
 Version: 08.01.0200
-Release: 3
+Release: 3.1
 License: LGPL
 Group: Applications/Databases
 Url: http://gborg.postgresql.org/project/psqlodbc
@@ -70,6 +70,9 @@
 %doc license.txt readme.txt docs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 08.01.0200-3.1
+- rebuild
+
 * Sat Jun 10 2006 Tom Lane <tgl at redhat.com> 08.01.0200-3
 - Fix BuildRequires: for mock build environment
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:35 -0400
Subject: rpms/ppp/devel ppp.spec,1.37,1.38
Message-ID: <200607120752.k6C7qZSF020284@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20269

Modified Files:
	ppp.spec 
Log Message:
bumped for rebuild


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ppp.spec	11 Feb 2006 05:14:52 -0000	1.37
+++ ppp.spec	12 Jul 2006 07:52:33 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.3
-Release: 6.2.1
+Release: 6.2.2
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-6.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:44 -0400
Subject: rpms/prctl/devel prctl.spec,1.13,1.14
Message-ID: <200607120752.k6C7qi4H020343@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/prctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20329

Modified Files:
	prctl.spec 
Log Message:
bumped for rebuild


Index: prctl.spec
===================================================================
RCS file: /cvs/dist/rpms/prctl/devel/prctl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- prctl.spec	7 Feb 2006 13:36:34 -0000	1.13
+++ prctl.spec	12 Jul 2006 07:52:42 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utility to perform process operations
 Name: prctl
 Version: 1.4
-Release: 5.2
+Release: 5.2.1
 License: GPL
 Group: Applications/System
 URL:	http://sourceforge.net/projects/prctl
@@ -37,6 +37,9 @@
 %{_mandir}/man1/prctl.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4-5.2.1
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:49 -0400
Subject: rpms/prelink/devel prelink.spec,1.37,1.38
Message-ID: <200607120752.k6C7qnQY020401@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20386

Modified Files:
	prelink.spec 
Log Message:
bumped for rebuild


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- prelink.spec	21 Jun 2006 10:41:41 -0000	1.37
+++ prelink.spec	12 Jul 2006 07:52:47 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.8
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 %define date 20060621
@@ -90,6 +90,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.8-1.1
+- rebuild
+
 * Wed Jun 21 2006 Jakub Jelinek <jakub at redhat.com> 0.3.8-1
 - fix -q mode canonicalization fix, speed up filename canonicalization
   by caching canonicalization for directories (#145983, #188062)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:52:57 -0400
Subject: rpms/privoxy/devel privoxy.spec,1.13,1.14
Message-ID: <200607120752.k6C7quVo020457@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/privoxy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20444

Modified Files:
	privoxy.spec 
Log Message:
bumped for rebuild


Index: privoxy.spec
===================================================================
RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- privoxy.spec	11 Feb 2006 05:15:50 -0000	1.13
+++ privoxy.spec	12 Jul 2006 07:52:54 -0000	1.14
@@ -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.1
+Release: 9.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.3-9.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:09 -0400
Subject: rpms/procinfo/devel procinfo.spec,1.20,1.21
Message-ID: <200607120753.k6C7r9Es020521@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20507

Modified Files:
	procinfo.spec 
Log Message:
bumped for rebuild


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- procinfo.spec	20 Apr 2006 23:37:51 -0000	1.20
+++ procinfo.spec	12 Jul 2006 07:53:06 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.3
+Release: 18.3.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 18-18.3.1
+- rebuild
+
 * Fri Apr 21 2006 Karel Zak <kzak at redhat.com> - 18-18.2.3
 - fix #185300 - cpu steal time support
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:20 -0400
Subject: rpms/procmail/devel procmail.spec,1.19,1.20
Message-ID: <200607120753.k6C7rKIQ020584@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20570

Modified Files:
	procmail.spec 
Log Message:
bumped for rebuild


Index: procmail.spec
===================================================================
RCS file: /cvs/dist/rpms/procmail/devel/procmail.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- procmail.spec	30 Mar 2006 12:13:22 -0000	1.19
+++ procmail.spec	12 Jul 2006 07:53:17 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The procmail mail processing program.
 Name: procmail
 Version: 3.22
-Release: 17
+Release: 17.1
 License: GPL or Artistic
 Group: System Environment/Daemons
 Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
@@ -60,6 +60,9 @@
 %{_mandir}/man[15]/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.22-17.1
+- rebuild
+
 * Thu Mar 30 2006 Peter Vrabec <pvrabec at redhat.com> 3.22-17
 - fix truncation of mailbox when running into a disk quota or a
   full partition. Patch from Solar Designer.



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:27 -0400
Subject: rpms/procps/devel procps.spec,1.49,1.50
Message-ID: <200607120753.k6C7rRE8020638@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	procps.spec 
Log Message:
bumped for rebuild


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- procps.spec	10 Jul 2006 15:07:43 -0000	1.49
+++ procps.spec	12 Jul 2006 07:53:24 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -112,6 +112,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.7-2.1
+- rebuild
+
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> 3.2.7-2
 - fix #134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:32 -0400
Subject: rpms/psacct/devel psacct.spec,1.23,1.24
Message-ID: <200607120753.k6C7rWFr020695@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20681

Modified Files:
	psacct.spec 
Log Message:
bumped for rebuild


Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- psacct.spec	27 Feb 2006 20:59:50 -0000	1.23
+++ psacct.spec	12 Jul 2006 07:53:30 -0000	1.24
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 41
+Release: 41.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -164,6 +164,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2-41.1
+- rebuild
+
 * Mon Feb 27 2006 Peter Jones <pjones at redhat.com> - 6.3.2-41
 - add touch to prereq
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:44 -0400
Subject: rpms/psmisc/devel psmisc.spec,1.27,1.28
Message-ID: <200607120753.k6C7rita020751@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20738

Modified Files:
	psmisc.spec 
Log Message:
bumped for rebuild


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- psmisc.spec	17 May 2006 12:15:57 -0000	1.27
+++ psmisc.spec	12 Jul 2006 07:53:42 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 22.2
-Release: 2
+Release: 2.1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 22.2-2.1
+- rebuild
+
 * Wed May 17 2006 Karel Zak <kzak at redhat.com> 22.2-2
 - add BuildRequires: gettext-devel
 - sync with upstream



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:53:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:53:50 -0400
Subject: rpms/pstack/devel pstack.spec,1.17,1.18
Message-ID: <200607120753.k6C7roxO020806@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pstack/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20793

Modified Files:
	pstack.spec 
Log Message:
bumped for rebuild


Index: pstack.spec
===================================================================
RCS file: /cvs/dist/rpms/pstack/devel/pstack.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pstack.spec	11 Feb 2006 05:19:01 -0000	1.17
+++ pstack.spec	12 Jul 2006 07:53:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Display stack trace of a running process
 Name: pstack
 Version: 1.2
-Release: 7.2.1
+Release: 7.2.2
 License: GPL
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
@@ -83,6 +83,9 @@
 %{_mandir}/man1/pstack.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2-7.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2-7.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:00 -0400
Subject: rpms/psutils/devel psutils.spec,1.15,1.16
Message-ID: <200607120754.k6C7s0SY020892@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20848

Modified Files:
	psutils.spec 
Log Message:
bumped for rebuild


Index: psutils.spec
===================================================================
RCS file: /cvs/dist/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psutils.spec	12 Jun 2006 08:28:11 -0000	1.15
+++ psutils.spec	12 Jul 2006 07:53:57 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 26
+Release: 26.1
 License: distributable
 Group: Applications/Publishing
 Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz
@@ -48,6 +48,9 @@
 /usr/lib/psutils
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.17-26.1
+- rebuild
+
 * Mon Jun 12 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 1.17-26
 - new implementation of psmerge by Peter Williams
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:07 -0400
Subject: rpms/pump/devel pump.spec,1.26,1.27
Message-ID: <200607120754.k6C7s7Sh020947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20903

Modified Files:
	pump.spec 
Log Message:
bumped for rebuild


Index: pump.spec
===================================================================
RCS file: /cvs/dist/rpms/pump/devel/pump.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pump.spec	4 Jun 2006 18:58:52 -0000	1.26
+++ pump.spec	12 Jul 2006 07:54:05 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A Bootp and DHCP client for automatic IP configuration.
 Name: pump
 Version: 0.8.24
-Release: 1.2.2
+Release: 1.2.2.1
 Group: System Environment/Daemons
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-root
@@ -76,6 +76,9 @@
 %{_sbindir}/netconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2.2.1
+- rebuild
+
 * Sun Jun  4 2006 Jeremy Katz <katzj at redhat.com>
 - BR gettext (#193554)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:15 -0400
Subject: rpms/pvm/devel pvm.spec,1.37,1.38
Message-ID: <200607120754.k6C7sFvG021002@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20989

Modified Files:
	pvm.spec 
Log Message:
bumped for rebuild


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/devel/pvm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pvm.spec	12 Jun 2006 18:11:15 -0000	1.37
+++ pvm.spec	12 Jul 2006 07:54:13 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 7.fc6
+Release: 7.fc6.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4.5-7.fc6.1
+- rebuild
+
 * Mon Jun 12 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.5-7.fc6
 - fix bug 194758: BuildRequires for mock
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:22 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.34,1.35
Message-ID: <200607120754.k6C7sM7t021057@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pwlib.spec 
Log Message:
bumped for rebuild


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pwlib.spec	6 Jun 2006 20:04:02 -0000	1.34
+++ pwlib.spec	12 Jul 2006 07:54:20 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.1
-Release:        2
+Release:        2.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
@@ -90,6 +90,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-2.1
+- rebuild
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-2
 - adding missing BR flex
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:32 -0400
Subject: rpms/pycairo/devel pycairo.spec,1.9,1.10
Message-ID: <200607120754.k6C7sWfE021112@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pycairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21099

Modified Files:
	pycairo.spec 
Log Message:
bumped for rebuild


Index: pycairo.spec
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pycairo.spec	5 Jul 2006 19:36:17 -0000	1.9
+++ pycairo.spec	12 Jul 2006 07:54:30 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: Python bindings for the cairo library
 Name: pycairo
 Version: 1.2.0 
-Release: 1 
+Release: 1.1 
 License: LGPL
 Group: Development/Languages
 URL: http://cairographics.org/
@@ -58,6 +58,9 @@
 %{_includedir}/pycairo/pycairo.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.1
+- rebuild
+
 * Wed Jul 05 2006 John (J5) Palmieri <johnp at redhat.com> - 1.2.0-1
 - Update to upstream 1.2.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:46 -0400
Subject: rpms/pychecker/devel pychecker.spec,1.18,1.19
Message-ID: <200607120754.k6C7skGQ021198@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pychecker/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21154

Modified Files:
	pychecker.spec 
Log Message:
bumped for rebuild


Index: pychecker.spec
===================================================================
RCS file: /cvs/dist/rpms/pychecker/devel/pychecker.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pychecker.spec	4 Feb 2006 04:09:24 -0000	1.18
+++ pychecker.spec	12 Jul 2006 07:54:44 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:  A python source code checking tool.
 Name: pychecker
 Version: 0.8.17
-Release: 1
+Release: 1.1
 URL: http://pychecker.sourceforge.net
 Source0: http://dl.sourceforge.net/pychecker/pychecker-%{version}.tar.gz
 Patch0: pychecker-0.8.17-root.patch
@@ -45,6 +45,9 @@
 %exclude /usr/lib/python*/site-packages/pychecker/VERSION
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.17-1.1
+- rebuild
+
 * Sat Feb  4 2006 Miloslav Trmac <mitr at redhat.com> - 0.8.17-1
 - Update to pychecker-0.8.17
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:54:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:54:50 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.1,1.2
Message-ID: <200607120754.k6C7soLG021222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21209

Modified Files:
	pygobject2.spec 
Log Message:
bumped for rebuild


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygobject2.spec	25 May 2006 18:13:21 -0000	1.1
+++ pygobject2.spec	12 Jul 2006 07:54:48 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: Python bindings for gobjects
 Name: pygobject2
 Version: 2.10.1
-Release: 2 
+Release: 2.1 
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.1-2
 - Cleanup
 * Fri May 12 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:55:13 -0400
Subject: rpms/pyOpenSSL/devel pyOpenSSL.spec,1.21,1.22
Message-ID: <200607120755.k6C7tD0s021308@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyOpenSSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21295

Modified Files:
	pyOpenSSL.spec 
Log Message:
bumped for rebuild


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/dist/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pyOpenSSL.spec	11 Feb 2006 05:20:49 -0000	1.21
+++ pyOpenSSL.spec	12 Jul 2006 07:55:11 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.6
-Release: 1.p24.7.2.1
+Release: 1.p24.7.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.p24.7.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:55:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:55:35 -0400
Subject: rpms/pyorbit/devel pyorbit.spec,1.19,1.20
Message-ID: <200607120755.k6C7tZY2021370@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21357

Modified Files:
	pyorbit.spec 
Log Message:
bumped for rebuild


Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pyorbit.spec	13 Jun 2006 17:20:48 -0000	1.19
+++ pyorbit.spec	12 Jul 2006 07:55:33 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Python bindings for ORBit2.
 Name: pyorbit
 Version: 2.14.1
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Development/Languages
 Source: %{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:55:48 -0400
Subject: rpms/pyparted/devel pyparted.spec,1.21,1.22
Message-ID: <200607120755.k6C7tmMj021426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21412

Modified Files:
	pyparted.spec 
Log Message:
bumped for rebuild


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pyparted.spec	29 May 2006 14:37:54 -0000	1.21
+++ pyparted.spec	12 Jul 2006 07:55:45 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: python module for parted
 Name: pyparted
 Version: 1.7.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-1.1
+- rebuild
+
 * Sun May 28 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-1
 - Bump version to 1.7.1 and require parted >= 1.7.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:55:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:55:54 -0400
Subject: rpms/PyQt/devel PyQt.spec,1.29,1.30
Message-ID: <200607120755.k6C7tsKc021481@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21467

Modified Files:
	PyQt.spec 
Log Message:
bumped for rebuild


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PyQt.spec	16 May 2006 10:11:18 -0000	1.29
+++ PyQt.spec	12 Jul 2006 07:55:52 -0000	1.30
@@ -16,7 +16,7 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.16
-Release: 2
+Release: 2.1
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -99,6 +99,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.16-2.1
+- rebuild
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 3.16-2
 - add some buildrequirements.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:56:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:56:00 -0400
Subject: rpms/Pyrex/devel Pyrex.spec,1.14,1.15
Message-ID: <200607120756.k6C7u0qY021535@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Pyrex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21522

Modified Files:
	Pyrex.spec 
Log Message:
bumped for rebuild


Index: Pyrex.spec
===================================================================
RCS file: /cvs/dist/rpms/Pyrex/devel/Pyrex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Pyrex.spec	19 Apr 2006 21:06:48 -0000	1.14
+++ Pyrex.spec	12 Jul 2006 07:55:58 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           Pyrex
 Version:        0.9.4
-Release: 	1
+Release: 	1.1
 Epoch:		0
 BuildArch:	noarch
 Summary:        A compiler/language for writing Python extension modules.
@@ -73,6 +73,9 @@
 %exclude %{python_sitelib}/Pyrex/Mac
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Apr 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.9.4-1
 - Upgrade to upstream 0.9.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:56:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:56:23 -0400
Subject: rpms/python/devel python.spec,1.82,1.83
Message-ID: <200607120756.k6C7uNl6021590@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python.spec 
Log Message:
bumped for rebuild


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- python.spec	13 Jun 2006 18:18:32 -0000	1.82
+++ python.spec	12 Jul 2006 07:56:21 -0000	1.83
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 11.FC6
+Release: 11.FC6.1
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -392,6 +392,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-11.FC6.1
+- rebuild
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 2.4.3-11.FC6
 - and fix it for real
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:56:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:56:29 -0400
Subject: rpms/python-docs/devel python-docs.spec,1.9,1.10
Message-ID: <200607120756.k6C7uTpZ021645@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-docs.spec 
Log Message:
bumped for rebuild


Index: python-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-docs.spec	8 Apr 2006 13:45:59 -0000	1.9
+++ python-docs.spec	12 Jul 2006 07:56:27 -0000	1.10
@@ -13,7 +13,7 @@
 Summary: Documentation for the Python programming language.
 Name: %{python}-docs
 Version: %{pybasever}.3
-Release: 1
+Release: 1.1
 License: PSF - see LICENSE
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -67,6 +67,9 @@
 %doc Misc/HISTORY Doc/html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-1.1
+- rebuild
+
 * Sat Apr  8 2006 Mihai Ibanescu <misa at redhat.com> 2.4.3-1
 - updated to 2.4.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:56:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:56:43 -0400
Subject: rpms/python-elementtree/devel python-elementtree.spec,1.4,1.5
Message-ID: <200607120756.k6C7uhgF021700@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-elementtree.spec 
Log Message:
bumped for rebuild


Index: python-elementtree.spec
===================================================================
RCS file: /cvs/dist/rpms/python-elementtree/devel/python-elementtree.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-elementtree.spec	11 Feb 2006 05:23:25 -0000	1.4
+++ python-elementtree.spec	12 Jul 2006 07:56:40 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name: python-elementtree
 Version: 1.2.6
-Release: 4.2.1
+Release: 4.2.2
 Summary: Fast XML parser and writer
 Group: Development/Libraries
 License: PSF
@@ -67,6 +67,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.6-4.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:56:50 -0400
Subject: rpms/python-ldap/devel python-ldap.spec,1.17,1.18
Message-ID: <200607120756.k6C7uoAr021755@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-ldap.spec 
Log Message:
bumped for rebuild


Index: python-ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-ldap.spec	17 May 2006 19:07:37 -0000	1.17
+++ python-ldap.spec	12 Jul 2006 07:56:48 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name:           python-ldap
 Version:        2.2.0
-Release: 	2
+Release: 	2.1
 Epoch:		0
 Summary:        An object-oriented API to access LDAP directory servers.
 Group:          System Environment/Libraries
@@ -49,6 +49,9 @@
 %doc LICENCE CHANGES README TODO Demo
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed May 17 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.0-2
 - Put back the epoch line... happy beehive?
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:03 -0400
Subject: rpms/python-numeric/devel python-numeric.spec,1.6,1.7
Message-ID: <200607120757.k6C7v3Lb021810@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-numeric.spec 
Log Message:
bumped for rebuild


Index: python-numeric.spec
===================================================================
RCS file: /cvs/dist/rpms/python-numeric/devel/python-numeric.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-numeric.spec	11 Feb 2006 05:24:06 -0000	1.6
+++ python-numeric.spec	12 Jul 2006 07:57:00 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Numerical Extension to Python
 Name: python-numeric
 Version: 23.7
-Release: 2.2.1
+Release: 2.2.2
 License: Python
 Group: Development/Languages
 URL: http://numpy.sourceforge.net
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 23.7-2.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 23.7-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:08 -0400
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.21,1.22
Message-ID: <200607120757.k6C7v8Tp021867@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-pyblock.spec 
Log Message:
bumped for rebuild


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-pyblock.spec	5 Jun 2006 22:00:45 -0000	1.21
+++ python-pyblock.spec	12 Jul 2006 07:57:06 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.15
-Release: 2
+Release: 2.1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -39,6 +39,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.15-2.1
+- rebuild
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.15-2
 - Add missing BuildRequires of zlib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:15 -0400
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.7,1.8
Message-ID: <200607120757.k6C7vFd4021922@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-sqlite.spec 
Log Message:
bumped for rebuild


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sqlite.spec	11 Feb 2006 05:25:01 -0000	1.7
+++ python-sqlite.spec	12 Jul 2006 07:57:13 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: Python bindings for sqlite.
 Name: python-sqlite
 Version: 1.1.7
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Development/Libraries
 URL: http://pysqlite.org/
@@ -36,6 +36,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:20 -0400
Subject: rpms/pyxf86config/devel pyxf86config.spec,1.27,1.28
Message-ID: <200607120757.k6C7vK5g022009@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21996

Modified Files:
	pyxf86config.spec 
Log Message:
bumped for rebuild


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pyxf86config.spec	14 Jun 2006 01:49:19 -0000	1.27
+++ pyxf86config.spec	12 Jul 2006 07:57:18 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.24
-Release: 3
+Release: 3.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.24-3.1
+- rebuild
+
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 0.3.24-3
 - ppc64 X lives
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:27 -0400
Subject: rpms/PyXML/devel PyXML.spec,1.22,1.23
Message-ID: <200607120757.k6C7vRmt022096@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyXML/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22051

Modified Files:
	PyXML.spec 
Log Message:
bumped for rebuild


Index: PyXML.spec
===================================================================
RCS file: /cvs/dist/rpms/PyXML/devel/PyXML.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PyXML.spec	13 Feb 2006 18:45:42 -0000	1.22
+++ PyXML.spec	12 Jul 2006 07:57:24 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: XML libraries for python.
 Name: PyXML
 Version: 0.8.4
-Release: 3.2.2
+Release: 3.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2.2.1
+- rebuild
+
 * 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
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:30 -0400
Subject: rpms/qt/devel qt.spec,1.120,1.121
Message-ID: <200607120757.k6C7vUBA022122@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22103

Modified Files:
	qt.spec 
Log Message:
bumped for rebuild


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- qt.spec	10 Jul 2006 12:23:57 -0000	1.120
+++ qt.spec	12 Jul 2006 07:57:28 -0000	1.121
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 11
+Release: 11.1
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -495,6 +495,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Than Ngo <than at redhat.com> 1:3.3.6-11
 - apply upstream patches, fix arabic fonts issue, and
   problems with missing minimum size when richtext



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:38 -0400
Subject: rpms/quagga/devel quagga.spec,1.32,1.33
Message-ID: <200607120757.k6C7vcXd022180@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quagga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22166

Modified Files:
	quagga.spec 
Log Message:
bumped for rebuild


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- quagga.spec	8 May 2006 20:15:47 -0000	1.32
+++ quagga.spec	12 Jul 2006 07:57:35 -0000	1.33
@@ -32,7 +32,7 @@
 Summary: Routing daemon
 Name:		quagga
 Version:	0.98.6
-Release: 2
+Release: 2.1
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -346,6 +346,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.98.6-2.1
+- rebuild
+
 * Mon May 8 2006 Jay Fenlason <fenlason at redhat.com> 0:0.98.6-2
 - Upgrade to new upstream version, closing security problems:
   bz#191081 CVE-2006-2223 Quagga RIPd information disclosure



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:43 -0400
Subject: rpms/quota/devel quota.spec,1.27,1.28
Message-ID: <200607120757.k6C7vhUc022239@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quota/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22224

Modified Files:
	quota.spec 
Log Message:
bumped for rebuild


Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/devel/quota.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- quota.spec	30 Jun 2006 12:22:30 -0000	1.27
+++ quota.spec	12 Jul 2006 07:57:41 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.13
-Release: 1.2.3
+Release: 1.2.3.1
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2.3.1
+- rebuild
+
 * Fri Jun 30 2006 Steve Dickson <steved at redhat.com> - 1:3.13-1.2.3
 - fix 192826 - quota config files should not be overwritten
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:57:53 -0400
Subject: rpms/rcs/devel rcs.spec,1.17,1.18
Message-ID: <200607120757.k6C7vrD7022360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rcs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22345

Modified Files:
	rcs.spec 
Log Message:
bumped for rebuild


Index: rcs.spec
===================================================================
RCS file: /cvs/dist/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rcs.spec	12 Jun 2006 21:14:42 -0000	1.17
+++ rcs.spec	12 Jul 2006 07:57:51 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 30
+Release: 30.1
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -56,6 +56,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30.1
+- rebuild
+
 * Mon Jun 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30
 - Add missing BR automake
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:01 -0400
Subject: rpms/rdesktop/devel rdesktop.spec,1.21,1.22
Message-ID: <200607120758.k6C7w1jU022448@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22435

Modified Files:
	rdesktop.spec 
Log Message:
bumped for rebuild


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rdesktop.spec	11 Feb 2006 05:28:53 -0000	1.21
+++ rdesktop.spec	12 Jul 2006 07:57:59 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.4.1
-Release: 3.2.1
+Release: 3.2.2
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:07 -0400
Subject: rpms/rdist/devel rdist.spec,1.20,1.21
Message-ID: <200607120758.k6C7w7Fx022503@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22490

Modified Files:
	rdist.spec 
Log Message:
bumped for rebuild


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rdist.spec	7 Jun 2006 14:36:43 -0000	1.20
+++ rdist.spec	12 Jul 2006 07:58:05 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 43
+Release: 43.1
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -87,6 +87,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-43.1
+- rebuild
+
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 1:6.1.5-43
 - Added missing bison buildprereq (#194158)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:12 -0400
Subject: rpms/readahead/devel readahead.spec,1.26,1.27
Message-ID: <200607120758.k6C7wCXQ022559@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22545

Modified Files:
	readahead.spec 
Log Message:
bumped for rebuild


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- readahead.spec	15 Mar 2006 23:55:41 -0000	1.26
+++ readahead.spec	12 Jul 2006 07:58:09 -0000	1.27
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-1.26
+- rebuild
+
 * Thu Mar 16 2006 Karel Zak <kzak at redhat.com>
 - update versions in *.in lists
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:17 -0400
Subject: rpms/readline/devel readline.spec,1.27,1.28
Message-ID: <200607120758.k6C7wHD2022613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readline/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22600

Modified Files:
	readline.spec 
Log Message:
bumped for rebuild


Index: readline.spec
===================================================================
RCS file: /cvs/dist/rpms/readline/devel/readline.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- readline.spec	10 Jul 2006 08:58:22 -0000	1.27
+++ readline.spec	12 Jul 2006 07:58:15 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A library for editing typed command lines.
 Name: readline
 Version: 5.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -96,6 +96,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.1-1.1
+- rebuild
+
 * Mon Jul 10 2006 Jindrich Novy <jnovy at redhat.com> 5.1-1
 - update to readline-5.1
 - apply new proposed upstream patches for 5.1 (001-004)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:23 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.132,1.133
Message-ID: <200607120758.k6C7wNX4022668@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	redhat-artwork.spec 
Log Message:
bumped for rebuild


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- redhat-artwork.spec	8 Jun 2006 18:05:44 -0000	1.132
+++ redhat-artwork.spec	12 Jul 2006 07:58:21 -0000	1.133
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.243
-Release: 2
+Release: 2.1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -175,6 +175,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.243-2.1
+- rebuild
+
 * Thu Jun  8 2006 Jesse Keating <jkeating at redhat.com> 0.243-2
 - Add missing br gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:29 -0400
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.21,1.22
Message-ID: <200607120758.k6C7wT6I022723@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22710

Modified Files:
	redhat-lsb.spec 
Log Message:
bumped for rebuild


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- redhat-lsb.spec	6 Jul 2006 12:28:29 -0000	1.21
+++ redhat-lsb.spec	12 Jul 2006 07:58:27 -0000	1.22
@@ -49,7 +49,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.1
-Release: 10.2
+Release: 10.2.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
@@ -441,6 +441,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1-10.2.1
+- rebuild
+
 * Thu Jul 6 2006 Lawrence Lim <llim at redhat.com> - 3.1-10.2
 - for some strange reason, ld-lsb-x86-64.so need to be ld-lsb-x86-64.so.3 (LSB3.0) rather than ld-lsb-x86-64.so.3.1 (LSB3.1)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:36 -0400
Subject: rpms/regexp/devel regexp.spec,1.30,1.31
Message-ID: <200607120758.k6C7wavS022778@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22765

Modified Files:
	regexp.spec 
Log Message:
bumped for rebuild


Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- regexp.spec	6 Mar 2006 22:25:46 -0000	1.30
+++ regexp.spec	12 Jul 2006 07:58:33 -0000	1.31
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release 	2jpp_7fc
+%define release 	2jpp_8fc
 %define section		free
 
 Name:           %{name}
@@ -95,6 +95,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_8fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3-2jpp_7fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:41 -0400
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.15,1.16
Message-ID: <200607120758.k6C7wfTR022833@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	reiserfs-utils.spec 
Log Message:
bumped for rebuild


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- reiserfs-utils.spec	6 Jul 2006 15:15:16 -0000	1.15
+++ reiserfs-utils.spec	12 Jul 2006 07:58:39 -0000	1.16
@@ -1,6 +1,6 @@
 Name: reiserfs-utils
 Version: 3.6.19
-Release: 2.4
+Release: 2.4.1
 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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:3.6.19-2.4.1
+- rebuild
+
 * Thu Jul  6 2006 David Woodhouse <dwmw2 at redhat.com>
 - Remove unneeded ExclusiveArch:
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:58:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:58:52 -0400
Subject: rpms/rgmanager/devel rgmanager.spec,1.28,1.29
Message-ID: <200607120758.k6C7wqeF022889@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22875

Modified Files:
	rgmanager.spec 
Log Message:
bumped for rebuild


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rgmanager.spec	19 Jun 2006 16:25:39 -0000	1.28
+++ rgmanager.spec	12 Jul 2006 07:58:50 -0000	1.29
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 2.0.0
-Release: 0.fc6.5
+Release: 0.fc6.5.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-0.fc6.5.1
+- rebuild
+
 * Tue Jun 13 2006 Chris Feist <cfeist at redhat.com> - 2.0.0-0.fc6.4
 - Built for fc6
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:00 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.54,1.55
Message-ID: <200607120759.k6C7x0C3022974@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22961

Modified Files:
	rhgb.spec 
Log Message:
bumped for rebuild


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rhgb.spec	5 Jul 2006 16:18:34 -0000	1.54
+++ rhgb.spec	12 Jul 2006 07:58:58 -0000	1.55
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.3
-Release: 4
+Release: 4.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.3-4.1
+- rebuild
+
 * Wed Jul  5 2006 Ray Strode <rstrode at redhat.com> - 0.16.3-4
 - remove erroneous space from x conf filename.  Problem discovered
   from Mary Ellen Foster <mefoster at gmail.com> (bug 196885)



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:04 -0400
Subject: rpms/rhnlib/devel rhnlib.spec,1.21,1.22
Message-ID: <200607120759.k6C7x45L023029@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhnlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23016

Modified Files:
	rhnlib.spec 
Log Message:
bumped for rebuild


Index: rhnlib.spec
===================================================================
RCS file: /cvs/dist/rpms/rhnlib/devel/rhnlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rhnlib.spec	9 Dec 2005 22:43:00 -0000	1.21
+++ rhnlib.spec	12 Jul 2006 07:59:02 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Python libraries for the RHN project
 Name: rhnlib
 Version: 2.0
-Release: 1.p24.3.1
+Release: 1.p24.3.1.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Development/Libraries
@@ -42,6 +42,9 @@
 %doc ChangeLog COPYING README TODO
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.p24.3.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:09 -0400
Subject: rpms/rhpl/devel rhpl.spec,1.74,1.75
Message-ID: <200607120759.k6C7x9G6023086@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23073

Modified Files:
	rhpl.spec 
Log Message:
bumped for rebuild


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- rhpl.spec	21 Jun 2006 19:34:20 -0000	1.74
+++ rhpl.spec	12 Jul 2006 07:59:07 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
 Version: 0.187
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.187-1.1
+- rebuild
+
 * Wed Jun 21 2006 Chris Lumens <clumens at redhat.com> 0.187-1
 - Remove deprecated comps.py.
 - Fix traceback when updating resolv.conf (#182395).



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:21 -0400
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.72,1.73
Message-ID: <200607120759.k6C7xLZm023148@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	rhythmbox.spec 
Log Message:
bumped for rebuild


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- rhythmbox.spec	7 Jul 2006 04:22:57 -0000	1.72
+++ rhythmbox.spec	12 Jul 2006 07:59:18 -0000	1.73
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.5
-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
@@ -127,6 +127,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.5-1.1
+- rebuild
+
 * Fri Jul  7 2006 Bill Nottingham <notting at redhat.com>
 - don't require eel2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:37 -0400
Subject: rpms/rng-utils/devel rng-utils.spec,1.13,1.14
Message-ID: <200607120759.k6C7xbQb023202@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	rng-utils.spec 
Log Message:
bumped for rebuild


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rng-utils.spec	12 Jul 2006 05:27:19 -0000	1.13
+++ rng-utils.spec	12 Jul 2006 07:59:35 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-utils
 Version:        2.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -53,6 +53,9 @@
 /usr/share/man/man8/rngd.8.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0-1.13.1
+- rebuild
+
 * Mon Feb 13 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:48 -0400
Subject: rpms/rootfiles/devel rootfiles.spec,1.10,1.11
Message-ID: <200607120759.k6C7xmnh023257@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rootfiles/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23244

Modified Files:
	rootfiles.spec 
Log Message:
bumped for rebuild


Index: rootfiles.spec
===================================================================
RCS file: /cvs/dist/rpms/rootfiles/devel/rootfiles.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rootfiles.spec	9 Dec 2005 22:43:01 -0000	1.10
+++ rootfiles.spec	12 Jul 2006 07:59:46 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The basic required files for the root user's directory.
 Name: rootfiles
 Version: 8.1
-Release: 1.1
+Release: 1.1.1
 License: Public Domain
 Group: System Environment/Base
 Source0: dot-bashrc
@@ -38,6 +38,9 @@
 %config(noreplace) /root/.[A-Za-z]*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1-1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 07:59:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 03:59:58 -0400
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.37,1.38
Message-ID: <200607120759.k6C7xwDT023312@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rp-pppoe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23299

Modified Files:
	rp-pppoe.spec 
Log Message:
bumped for rebuild


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/dist/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rp-pppoe.spec	10 Jun 2006 10:46:51 -0000	1.37
+++ rp-pppoe.spec	12 Jul 2006 07:59:56 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.5
-Release: 32
+Release: 32.1
 License: GPL
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -154,6 +154,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5-32.1
+- rebuild
+
 * Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5-32
 - fix build problem in mock
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:00:41 -0400
Subject: rpms/rsh/devel rsh.spec,1.27,1.28
Message-ID: <200607120800.k6C80fwR023393@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23379

Modified Files:
	rsh.spec 
Log Message:
bumped for rebuild


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rsh.spec	11 Feb 2006 05:35:56 -0000	1.27
+++ rsh.spec	12 Jul 2006 08:00:28 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 34.1
+Release: 34.2
 License: BSD
 Group: Applications/Internet
 
@@ -176,6 +176,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-34.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-34.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:01:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:01:44 -0400
Subject: rpms/rsync/devel rsync.spec,1.38,1.39
Message-ID: <200607120801.k6C81ic9023509@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsync/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23465

Modified Files:
	rsync.spec 
Log Message:
bumped for rebuild


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rsync.spec	12 Jun 2006 17:18:32 -0000	1.38
+++ rsync.spec	12 Jul 2006 08:01:41 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.8
-Release: 3
+Release: 3.1
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
@@ -58,6 +58,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.8-3.1
+- rebuild
+
 * Fri Jun 9 2006 Jay Fenlason <fenlason at redhat.com> 2.6.8-3
 - Add my xattrs_bug patch to fix a bug where xattrs don't get sent correctly.
 - Add BuildRequires to make sure libattr-devel and libacl-devel are avaliable



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:03:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:03:02 -0400
Subject: rpms/ruby/devel ruby.spec,1.70,1.71
Message-ID: <200607120803.k6C832sG023614@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23600

Modified Files:
	ruby.spec 
Log Message:
bumped for rebuild


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ruby.spec	19 Jun 2006 08:57:21 -0000	1.70
+++ ruby.spec	12 Jul 2006 08:02:58 -0000	1.71
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	10.fc6
+Release:	10.fc6.1
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -446,6 +446,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-10.fc6.1
+- rebuild
+
 * Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-10
 - fixed the wrong file list again. moved tcltk library into ruby-tcltk.
   (#195872)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:04:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:04:29 -0400
Subject: rpms/rusers/devel rusers.spec,1.21,1.22
Message-ID: <200607120804.k6C84TX3023922@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rusers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23828

Modified Files:
	rusers.spec 
Log Message:
bumped for rebuild


Index: rusers.spec
===================================================================
RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rusers.spec	21 Mar 2006 13:37:58 -0000	1.21
+++ rusers.spec	12 Jul 2006 08:04:17 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 46
+Release: 46.1
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -142,6 +142,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-46.1
+- rebuild
+
 * Tue Mar 21 2006 Phil Knirsch <pknirsch at redhat.com> - 0.17-46
 - Included fix for correct return values for rup (#177419)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:05:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:05:04 -0400
Subject: rpms/rwall/devel rwall.spec,1.18,1.19
Message-ID: <200607120805.k6C854wN024032@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwall/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24019

Modified Files:
	rwall.spec 
Log Message:
bumped for rebuild


Index: rwall.spec
===================================================================
RCS file: /cvs/dist/rpms/rwall/devel/rwall.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rwall.spec	11 Feb 2006 05:37:47 -0000	1.18
+++ rwall.spec	12 Jul 2006 08:05:02 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Client for sending messages to a host's logged in users.
 Name: rwall
 Version: 0.17
-Release: 25.2.1
+Release: 25.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:05:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:05:22 -0400
Subject: rpms/rwho/devel rwho.spec,1.16,1.17
Message-ID: <200607120805.k6C85MHh024116@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwho/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24074

Modified Files:
	rwho.spec 
Log Message:
bumped for rebuild


Index: rwho.spec
===================================================================
RCS file: /cvs/dist/rpms/rwho/devel/rwho.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rwho.spec	11 Feb 2006 05:37:57 -0000	1.16
+++ rwho.spec	12 Jul 2006 08:05:15 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines.
 Name: rwho
 Version: 0.17
-Release: 25.2.1
+Release: 25.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:05:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:05:31 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.36,1.37
Message-ID: <200607120805.k6C85Vl2024146@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24129

Modified Files:
	s390utils.spec 
Log Message:
bumped for rebuild


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- s390utils.spec	17 May 2006 10:53:46 -0000	1.36
+++ s390utils.spec	12 Jul 2006 08:05:28 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 1
+Release: 1.1
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -150,6 +150,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-1.1
+- rebuild
+
 * Wed May 17 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-1
 - Made src_vipa build on current toolchain again
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:05:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:05:58 -0400
Subject: rpms/salinfo/devel salinfo.spec,1.13,1.14
Message-ID: <200607120805.k6C85wbe024290@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24273

Modified Files:
	salinfo.spec 
Log Message:
bumped for rebuild


Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- salinfo.spec	12 Jul 2006 05:27:25 -0000	1.13
+++ salinfo.spec	12 Jul 2006 08:05:56 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:        SAL info tool.
 Name:           salinfo
 Version:        0.5
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5-1.13.1
+- rebuild
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:06:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:06:36 -0400
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.19,1.20
Message-ID: <200607120806.k6C86aUQ024410@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-frontends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24397

Modified Files:
	sane-frontends.spec 
Log Message:
bumped for rebuild


Index: sane-frontends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sane-frontends.spec	11 Feb 2006 05:38:47 -0000	1.19
+++ sane-frontends.spec	12 Jul 2006 08:06:21 -0000	1.20
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.14-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:07:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:07:12 -0400
Subject: rpms/scim/devel scim.spec,1.45,1.46
Message-ID: <200607120807.k6C87Cbd024466@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24453

Modified Files:
	scim.spec 
Log Message:
bumped for rebuild


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- scim.spec	5 Jul 2006 14:09:06 -0000	1.45
+++ scim.spec	12 Jul 2006 08:07:07 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   23%{?dist}
+Release:   23.1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -192,6 +192,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul  5 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-23
 - use xinputrc instead of xinput.d (#194458)
 - require xorg-x11-xinit >= 1.0.2-5.fc6



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:07:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:07:36 -0400
Subject: rpms/scim-anthy/devel scim-anthy.spec,1.29,1.30
Message-ID: <200607120807.k6C87ag5024526@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	scim-anthy.spec 
Log Message:
bumped for rebuild


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- scim-anthy.spec	6 Jul 2006 09:51:57 -0000	1.29
+++ scim-anthy.spec	12 Jul 2006 08:07:33 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           scim-anthy
 Version:        1.0.0
-Release:	2%{?dist}
+Release:	2.1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com>
 - use dist tag.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:07:49 -0400
Subject: rpms/scim-bridge/devel scim-bridge.spec,1.18,1.19
Message-ID: <200607120807.k6C87nEB024583@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-bridge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24570

Modified Files:
	scim-bridge.spec 
Log Message:
bumped for rebuild


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-bridge.spec	7 Jul 2006 08:04:44 -0000	1.18
+++ scim-bridge.spec	12 Jul 2006 08:07:47 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name:		scim-bridge
 Version:	0.2.4
-Release:	1%{?dist}
+Release:	1.1%{?dist}
 Summary:	SCIM Bridge Gtk IM module
 
 Group:		System Environment/Libraries
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Jens Petersen <petersen at redhat.com> - 0.2.4-1
 - 0.2.4, fixes activating with different IME from menu (#197658)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:08:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:08:06 -0400
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.18,1.19
Message-ID: <200607120808.k6C886WE024641@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24628

Modified Files:
	scim-chewing.spec 
Log Message:
bumped for rebuild


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim-chewing.spec	30 Jun 2006 13:19:22 -0000	1.18
+++ scim-chewing.spec	12 Jul 2006 08:08:04 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.3.1
-Release:	2
+Release:	2.1
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-2.1
+- rebuild
+
 * Mon Jun 26 2006 Darshan Santani <dsantani at redhat.com> - 0.3.1-2
 - Add scim-chewing-LTC23919-191957.patch by Shoji Sugiyama [IBM Japan]  (#191957)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:08:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:08:22 -0400
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.20,1.21
Message-ID: <200607120808.k6C88MoR024713@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24700

Modified Files:
	scim-hangul.spec 
Log Message:
bumped for rebuild


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- scim-hangul.spec	5 Jul 2006 05:36:19 -0000	1.20
+++ scim-hangul.spec	12 Jul 2006 08:08:20 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        5%{?dist}
+Release:        5.1%{?dist}
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-5
 - add a keybindings documentation into the online help. (#186884)
 - use dist tag.



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:08:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:08:34 -0400
Subject: rpms/scim-m17n/devel scim-m17n.spec,1.8,1.9
Message-ID: <200607120808.k6C88Yln024769@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	scim-m17n.spec 
Log Message:
bumped for rebuild


Index: scim-m17n.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-m17n/devel/scim-m17n.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-m17n.spec	4 Jul 2006 02:51:06 -0000	1.8
+++ scim-m17n.spec	12 Jul 2006 08:08:32 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           scim-m17n
 Version:        0.2.0
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        SCIM IMEngine for m17n-lib
 
 Group:          System Environment/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul  4 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-4
 - add scim-m17n-0.2.0-unique-uuid.patch to make factory ids unique
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:09:05 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.25,1.26
Message-ID: <200607120809.k6C895av024880@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24823

Modified Files:
	scim-pinyin.spec 
Log Message:
bumped for rebuild


Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- scim-pinyin.spec	29 Jun 2006 09:48:26 -0000	1.25
+++ scim-pinyin.spec	12 Jul 2006 08:09:02 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        11%{?dist}
+Release:        11.1%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 29 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:09:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:09:25 -0400
Subject: rpms/scim-qtimm/devel scim-qtimm.spec,1.8,1.9
Message-ID: <200607120809.k6C89PmX024904@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-qtimm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24892

Modified Files:
	scim-qtimm.spec 
Log Message:
bumped for rebuild


Index: scim-qtimm.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-qtimm/devel/scim-qtimm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-qtimm.spec	6 Jun 2006 10:34:39 -0000	1.8
+++ scim-qtimm.spec	12 Jul 2006 08:09:22 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           scim-qtimm
 Version:        0.9.4
-Release:        4
+Release:        4.1
 Summary:        SCIM input method module for Qt
 
 License:	GPL
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.4-4.1
+- rebuild
+
 * Tue Jun  6 2006 Jens Petersen <petersen at redhat.com> - 0.9.4-4
 - require qt 3.3.6 or later (#190145)
 - buildrequire gettext to generate .gmo files (#194165)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:09:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:09:54 -0400
Subject: rpms/scim-tables/devel scim-tables.spec,1.25,1.26
Message-ID: <200607120809.k6C89ssb024994@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-tables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24981

Modified Files:
	scim-tables.spec 
Log Message:
bumped for rebuild


Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- scim-tables.spec	27 Apr 2006 06:06:23 -0000	1.25
+++ scim-tables.spec	12 Jul 2006 08:09:52 -0000	1.26
@@ -8,7 +8,7 @@
 
 Name:		scim-tables
 Version:	0.5.6
-Release:	5
+Release:	5.1
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -452,6 +452,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Apr 27 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-5
 - obsolete old scim-tables-{japanese,korean} subpackages
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:10:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:10:12 -0400
Subject: rpms/screen/devel screen.spec,1.30,1.31
Message-ID: <200607120810.k6C8ACXO025052@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25039

Modified Files:
	screen.spec 
Log Message:
bumped for rebuild


Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- screen.spec	10 Jul 2006 11:57:44 -0000	1.30
+++ screen.spec	12 Jul 2006 08:10:10 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
 Version: 4.0.2
-Release: 15
+Release: 15.1
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -179,6 +179,9 @@
 %config /etc/pam.d/screen
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-15.1
+- rebuild
+
 * Mon Jul 10 2006 Petr Rockai <prockai at redhat.com> - 4.0.2-15
 - bump MAXSTR (string buffer size) to 4k (from 256 bytes), fixes
   status line issues with window list in status line and too many



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:10:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:10:55 -0400
Subject: rpms/SDL/devel SDL.spec,1.44,1.45
Message-ID: <200607120810.k6C8AtAv025149@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25135

Modified Files:
	SDL.spec 
Log Message:
bumped for rebuild


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- SDL.spec	26 Jun 2006 20:54:00 -0000	1.44
+++ SDL.spec	12 Jul 2006 08:10:52 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 4
+Release: 4.1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -101,6 +101,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.10-4.1
+- rebuild
+
 * Tue Jun 20 2006 Christopher Stone <chris.stone at gmail.com> 1.2.10-4
 - added missing (build) requires for libXt libXrender libXrandr
 - remove %%makeinstall macro (bad practice)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:12:01 -0400
Subject: rpms/sed/devel sed.spec,1.33,1.34
Message-ID: <200607120812.k6C8C1KW003182@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3151

Modified Files:
	sed.spec 
Log Message:
bumped for rebuild


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sed.spec	29 Jun 2006 15:19:18 -0000	1.33
+++ sed.spec	12 Jul 2006 08:11:58 -0000	1.34
@@ -5,7 +5,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-2.2.1
+- rebuild
+
 * Thu Jun 29 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-2.2
 - typo in patch name
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:12:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:12:27 -0400
Subject: rpms/selinux-doc/devel selinux-doc.spec,1.24,1.25
Message-ID: <200607120812.k6C8CRsl003332@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	selinux-doc.spec 
Log Message:
bumped for rebuild


Index: selinux-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-doc/devel/selinux-doc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- selinux-doc.spec	16 May 2006 12:59:48 -0000	1.24
+++ selinux-doc.spec	12 Jul 2006 08:12:25 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: SELinux documentation
 Name: selinux-doc
 Version: 1.26
-Release: 1
+Release: 1.1
 License: Public Use License v1.0 
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -63,6 +63,9 @@
 %doc /usr/share/doc/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.26-1.1
+- rebuild
+
 * Tue May 16 2006 Dan Walsh <dwalsh at redhat.com> 1.26-1
 - Update to NSA Release version
 	* Updated version for release.



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:12:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:12:45 -0400
Subject: rpms/setarch/devel setarch.spec,1.15,1.16
Message-ID: <200607120812.k6C8Cjm7003443@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setarch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3412

Modified Files:
	setarch.spec 
Log Message:
bumped for rebuild


Index: setarch.spec
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/setarch.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- setarch.spec	7 Apr 2006 12:44:45 -0000	1.15
+++ setarch.spec	12 Jul 2006 08:12:43 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Personality setter
 Name: setarch
 Version: 2.0
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Kernel
@@ -60,6 +60,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.1
+- rebuild
+
 * Thu Apr  7 2006 Jindrich Novy <jnovy at redhat.com> 2.0-1
 - better error handling, thanks to Dmitry V. Levin (#187322)
 - understand --help



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:13:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:13:24 -0400
Subject: rpms/setools/devel setools.spec,1.55,1.56
Message-ID: <200607120813.k6C8DOfA003562@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3543

Modified Files:
	setools.spec 
Log Message:
bumped for rebuild


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- setools.spec	23 May 2006 22:10:45 -0000	1.55
+++ setools.spec	12 Jul 2006 08:13:20 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.4
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -226,6 +226,9 @@
 %{_libdir}/libsefs.so*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Dan Walsh <dwalsh at redhat.com> 2.4-2
 - Remove sqlite include directory
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:13:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:13:42 -0400
Subject: rpms/setserial/devel setserial.spec,1.17,1.18
Message-ID: <200607120813.k6C8DgWl003699@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3674

Modified Files:
	setserial.spec 
Log Message:
bumped for rebuild


Index: setserial.spec
===================================================================
RCS file: /cvs/dist/rpms/setserial/devel/setserial.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- setserial.spec	11 Feb 2006 05:41:20 -0000	1.17
+++ setserial.spec	12 Jul 2006 08:13:39 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A utility for configuring serial ports.
 Name: setserial
 Version: 2.17
-Release: 19.2.1
+Release: 19.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.17-19.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.17-19.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:14:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:14:01 -0400
Subject: rpms/setuptool/devel setuptool.spec,1.24,1.25
Message-ID: <200607120814.k6C8E1f6003797@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setuptool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3783

Modified Files:
	setuptool.spec 
Log Message:
bumped for rebuild


Index: setuptool.spec
===================================================================
RCS file: /cvs/dist/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- setuptool.spec	11 Feb 2006 05:41:28 -0000	1.24
+++ setuptool.spec	12 Jul 2006 08:13:59 -0000	1.25
@@ -2,7 +2,7 @@
 # named "setup".  Oh, well.
 Name: setuptool
 Version: 1.18.1
-Release: 1.2
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:14:27 -0400
Subject: rpms/sg3_utils/devel sg3_utils.spec,1.15,1.16
Message-ID: <200607120814.k6C8ERar003980@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3961

Modified Files:
	sg3_utils.spec 
Log Message:
bumped for rebuild


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sg3_utils.spec	7 Jun 2006 15:09:26 -0000	1.15
+++ sg3_utils.spec	12 Jul 2006 08:14:24 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utils for Linux's SCSI generic driver devices + raw devices
 Name: sg3_utils
 Version: 1.20
-Release: 2
+Release: 2.1
 License: GPL
 Group: Utilities/System
 Source: ftp://www.torque.net/sg/p/sg3_utils-%{version}.tgz
@@ -79,6 +79,9 @@
 %{_libdir}/*.la
  
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.20-2.1
+- rebuild
+
 * Wed Jun 07 2006 Phil Knirsch <pknirsch at redhat.com> - 1.20-2
 - Fixed rebuild problem on latest toolchain
 - Added missing buildprereqs



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:14:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:14:40 -0400
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.76,1.77
Message-ID: <200607120814.k6C8EexA004096@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	shadow-utils.spec 
Log Message:
bumped for rebuild


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- shadow-utils.spec	13 Jun 2006 19:46:40 -0000	1.76
+++ shadow-utils.spec	12 Jul 2006 08:14:38 -0000	1.77
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.16
-Release: 3
+Release: 3.1
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -205,6 +205,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:4.0.16-3.1
+- rebuild
+
 * Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.16-3
 - call "nscd -i" to flush nscd cache (#191464)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:14:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:14:53 -0400
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.41,1.42
Message-ID: <200607120814.k6C8ErH9004214@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4185

Modified Files:
	shared-mime-info.spec 
Log Message:
bumped for rebuild


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- shared-mime-info.spec	5 Jul 2006 04:38:48 -0000	1.41
+++ shared-mime-info.spec	12 Jul 2006 08:14:50 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.18
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.18-1.1
+- rebuild
+
 * Wed Jul  5 2006 Kristian H??gsberg <krh at redhat.com> - 0.18-1
 - Update to 0.18 and drop backported patches.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:15:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:15:11 -0400
Subject: rpms/sip/devel sip.spec,1.26,1.27
Message-ID: <200607120815.k6C8FB6m004395@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4370

Modified Files:
	sip.spec 
Log Message:
bumped for rebuild


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sip.spec	27 Apr 2006 10:04:57 -0000	1.26
+++ sip.spec	12 Jul 2006 08:15:09 -0000	1.27
@@ -15,7 +15,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.4.3
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -83,6 +83,9 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.4.3-1.1
+- rebuild
+
 * Thu Apr 27 2006 Than Ngo <than at redhat.com> 4.4.3-1
 - update to 4.4.3
 - built with %%{optflags}



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:15:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:15:33 -0400
Subject: rpms/slib/devel slib.spec,1.10,1.11
Message-ID: <200607120815.k6C8FXEK004517@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4449

Modified Files:
	slib.spec 
Log Message:
bumped for rebuild


Index: slib.spec
===================================================================
RCS file: /cvs/dist/rpms/slib/devel/slib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- slib.spec	9 May 2006 07:59:45 -0000	1.10
+++ slib.spec	12 Jul 2006 08:15:31 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:      platform independent library for scheme
 Name:         slib
 Version:      3a3
-Release:      1
+Release:      1.1
 License:      SLIB
 Group:        Development/Languages
 BuildArch:    noarch
@@ -59,6 +59,9 @@
 %{_infodir}/slib.info.gz
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3a3-1.1
+- rebuild
+
 * Tue May 09 2006 Miroslav Lichvar <mlichvar at redhat.com> 3a3-1
 - update to slib3a3
 - install info, remove html



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:15:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:15:47 -0400
Subject: rpms/slrn/devel slrn.spec,1.28,1.29
Message-ID: <200607120815.k6C8Fl4O004665@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slrn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4609

Modified Files:
	slrn.spec 
Log Message:
bumped for rebuild


Index: slrn.spec
===================================================================
RCS file: /cvs/dist/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- slrn.spec	11 Feb 2006 05:42:19 -0000	1.28
+++ slrn.spec	12 Jul 2006 08:15:44 -0000	1.29
@@ -1,6 +1,6 @@
 Name: slrn
 Version: 0.9.8.1pl1
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8.1pl1-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:15:55 -0400
Subject: rpms/smartmontools/devel smartmontools.spec,1.21,1.22
Message-ID: <200607120815.k6C8Fte3004995@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4821

Modified Files:
	smartmontools.spec 
Log Message:
bumped for rebuild


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- smartmontools.spec	27 Jun 2006 15:40:29 -0000	1.21
+++ smartmontools.spec	12 Jul 2006 08:15:53 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.36
-Release: 	2
+Release: 	2.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:5.36-2.1
+- rebuild
+
 * Tue Jun 27 2006 Tomas Mraz <tmraz at redhat.com> - 1:5.36-2
 - kudzu is deprecated, replace it with HAL (#195752)
 - moved later in the boot process so haldaemon is already running



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:16:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:16:20 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.56,1.57
Message-ID: <200607120816.k6C8GKcF008168@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7843

Modified Files:
	sound-juicer.spec 
Log Message:
bumped for rebuild


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sound-juicer.spec	14 Jun 2006 15:02:05 -0000	1.56
+++ sound-juicer.spec	12 Jul 2006 08:16:18 -0000	1.57
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.15.3
-Release:	2
+Release:	2.1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -110,6 +110,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-2.1
+- rebuild
+
 * Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
 - Work around a gstreamer problem
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:16:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:16:36 -0400
Subject: rpms/sox/devel sox.spec,1.24,1.25
Message-ID: <200607120816.k6C8GarR009370@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9232

Modified Files:
	sox.spec 
Log Message:
bumped for rebuild


Index: sox.spec
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sox.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sox.spec	11 Feb 2006 05:42:46 -0000	1.24
+++ sox.spec	12 Jul 2006 08:16:33 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
 Version: 12.17.9
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:16:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:16:57 -0400
Subject: rpms/spamassassin/devel spamassassin.spec,1.68,1.69
Message-ID: <200607120816.k6C8GvMW009938@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9852

Modified Files:
	spamassassin.spec 
Log Message:
bumped for rebuild


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- spamassassin.spec	27 Jun 2006 06:12:28 -0000	1.68
+++ spamassassin.spec	12 Jul 2006 08:16:53 -0000	1.69
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.3
-Release: 3
+Release: 3.1
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -158,6 +158,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.3-3.1
+- rebuild
+
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 3.1.3-3
 - require diffutils for the post script (cmp is used)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:17:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:17:15 -0400
Subject: rpms/sqlite/devel sqlite.spec,1.17,1.18
Message-ID: <200607120817.k6C8HFWC010999@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	sqlite.spec 
Log Message:
bumped for rebuild


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sqlite.spec	26 Jun 2006 18:48:38 -0000	1.17
+++ sqlite.spec	12 Jul 2006 08:17:12 -0000	1.18
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.3.6
-Release: 1
+Release: 1.1
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -105,6 +105,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3.6-1.1
+- rebuild
+
 * Mon Jun 26 2006 Paul Nasrat <pnasrat at redhat.com> - 3.3.6-1
 - Update to 3.3.6
 - Fix typo  (#189647)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:17:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:17:42 -0400
Subject: rpms/squashfs-tools/devel squashfs-tools.spec,1.7,1.8
Message-ID: <200607120817.k6C8HgLR014692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squashfs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14535

Modified Files:
	squashfs-tools.spec 
Log Message:
bumped for rebuild


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- squashfs-tools.spec	23 Jun 2006 15:50:19 -0000	1.7
+++ squashfs-tools.spec	12 Jul 2006 08:17:40 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: squashfs utilities
 Name: squashfs-tools
 Version: 3.0
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL: http://squashfs.sf.net
@@ -39,6 +39,9 @@
 /usr/sbin/unsquashfs
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-1.1
+- rebuild
+
 * Fri Jun 23 2006 Jeremy Katz <katzj at redhat.com> - 3.0-1
 - update to 3.0
 - include unsquashfs



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:18:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:18:10 -0400
Subject: rpms/squid/devel squid.spec,1.64,1.65
Message-ID: <200607120818.k6C8IA9Z018209@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18035

Modified Files:
	squid.spec 
Log Message:
bumped for rebuild


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- squid.spec	8 Jun 2006 09:22:25 -0000	1.64
+++ squid.spec	12 Jul 2006 08:18:07 -0000	1.65
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE14
-Release: 2
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE14-2.1
+- rebuild
+
 * Tue Jun 8 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-2
 - fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep"
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:18:28 -0400
Subject: rpms/star/devel star.spec,1.28,1.29
Message-ID: <200607120818.k6C8ISRd020792@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	star.spec 
Log Message:
bumped for rebuild


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- star.spec	13 Jun 2006 18:41:30 -0000	1.28
+++ star.spec	12 Jul 2006 08:18:26 -0000	1.29
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5a74
-Release: 3
+Release: 3.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
@@ -97,6 +97,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5a74-3.1
+- rebuild
+
 * Tue Jun 13 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a74-3
 - use autoconf provided by star
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:18:43 -0400
Subject: rpms/stardict/devel stardict.spec,1.21,1.22
Message-ID: <200607120818.k6C8Ih6M022623@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22597

Modified Files:
	stardict.spec 
Log Message:
bumped for rebuild


Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stardict.spec	12 Jun 2006 08:21:46 -0000	1.21
+++ stardict.spec	12 Jul 2006 08:18:41 -0000	1.22
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    4
+Release:    4.1
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -62,6 +62,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-4.1
+- rebuild
+
 * Mon Jun 12 2006 Mayank Jain <majain at redhat.com>
 - Updated package description
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:18:52 -0400
Subject: rpms/startup-notification/devel startup-notification.spec, 1.14,
	1.15
Message-ID: <200607120818.k6C8IqHj022731@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/startup-notification/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22707

Modified Files:
	startup-notification.spec 
Log Message:
bumped for rebuild


Index: startup-notification.spec
===================================================================
RCS file: /cvs/dist/rpms/startup-notification/devel/startup-notification.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- startup-notification.spec	22 May 2006 18:12:30 -0000	1.14
+++ startup-notification.spec	12 Jul 2006 08:18:50 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Library for tracking application startup
 Name: startup-notification
 Version: 0.8
-Release: 4
+Release: 4.1
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8-4.1
+- rebuild
+
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.8-4
 - Add missing BuildRequires
 - Don't install static libraries



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:18:57 -0400
Subject: rpms/statserial/devel statserial.spec,1.18,1.19
Message-ID: <200607120818.k6C8IvO6022814@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/statserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22755

Modified Files:
	statserial.spec 
Log Message:
bumped for rebuild


Index: statserial.spec
===================================================================
RCS file: /cvs/dist/rpms/statserial/devel/statserial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- statserial.spec	11 Feb 2006 05:44:22 -0000	1.18
+++ statserial.spec	12 Jul 2006 08:18:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A tool which displays the status of serial port modem lines.
 Name: statserial
 Version: 1.1
-Release: 38.2.1
+Release: 38.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1-38.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1-38.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:19:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:19:06 -0400
Subject: rpms/struts/devel struts.spec,1.32,1.33
Message-ID: <200607120819.k6C8J6nw022953@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22923

Modified Files:
	struts.spec 
Log Message:
bumped for rebuild


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- struts.spec	21 Jun 2006 13:15:49 -0000	1.32
+++ struts.spec	12 Jul 2006 08:19:03 -0000	1.33
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.8
-%define release 	2jpp_12fc
+%define release 	2jpp_13fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -213,6 +213,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.8-2jpp_13fc
+- rebuild
+
 * Wed Jun 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_12fc
 - Re-enable ppc64, s390 and s390x builds
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:19:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:19:18 -0400
Subject: rpms/stunnel/devel stunnel.spec,1.38,1.39
Message-ID: <200607120819.k6C8JI7d023067@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stunnel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23043

Modified Files:
	stunnel.spec 
Log Message:
bumped for rebuild


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- stunnel.spec	18 Mar 2006 01:58:13 -0000	1.38
+++ stunnel.spec	12 Jul 2006 08:19:15 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
 Version: 4.15
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -91,6 +91,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.15-1.1
+- rebuild
+
 * Sat Mar 18 2006 Miloslav Trmac <mitr at redhat.com> - 4.15-1
 - Update to stunnel-4.15
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:19:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:19:28 -0400
Subject: rpms/subversion/devel subversion.spec,1.80,1.81
Message-ID: <200607120819.k6C8JSfS023184@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	subversion.spec 
Log Message:
bumped for rebuild


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- subversion.spec	7 Jun 2006 13:48:16 -0000	1.80
+++ subversion.spec	12 Jul 2006 08:19:25 -0000	1.81
@@ -11,7 +11,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.2
-Release: 5
+Release: 5.1
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -248,6 +248,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+- rebuild
+
 * Wed Jun  7 2006 Joe Orton <jorton at redhat.com> 1.3.2-5
 - disable test suite
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:19:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:19:39 -0400
Subject: rpms/sudo/devel sudo.spec,1.41,1.42
Message-ID: <200607120819.k6C8JdG5023303@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23280

Modified Files:
	sudo.spec 
Log Message:
bumped for rebuild


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sudo.spec	29 May 2006 13:19:19 -0000	1.41
+++ sudo.spec	12 Jul 2006 08:19:37 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 6
+Release: 6.1
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -102,6 +102,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.8p12-6.1
+- rebuild
+
 * Mon May 29 2006 Karel Zak <kzak at redhat.com> 1.6.8p12-6
 - fix #190062 - "ssh localhost sudo su" will show the password in clear
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:19:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:19:50 -0400
Subject: rpms/symlinks/devel symlinks.spec,1.9,1.10
Message-ID: <200607120819.k6C8JoDk023449@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/symlinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23429

Modified Files:
	symlinks.spec 
Log Message:
bumped for rebuild


Index: symlinks.spec
===================================================================
RCS file: /cvs/dist/rpms/symlinks/devel/symlinks.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- symlinks.spec	11 Feb 2006 05:45:39 -0000	1.9
+++ symlinks.spec	12 Jul 2006 08:19:48 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A utility which maintains a system's symbolic links.
 Name: symlinks
 Version: 1.2
-Release: 24.2.1
+Release: 24.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2-24.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2-24.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:20:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:20:27 -0400
Subject: rpms/synaptics/devel synaptics.spec,1.21,1.22
Message-ID: <200607120820.k6C8KRkA023705@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23520

Modified Files:
	synaptics.spec 
Log Message:
bumped for rebuild


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- synaptics.spec	16 May 2006 16:27:17 -0000	1.21
+++ synaptics.spec	12 Jul 2006 08:20:25 -0000	1.22
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release:	7
+Release:	7.1
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -70,6 +70,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: pkg-config: command not found
+- rebuild
+
 * Tue May 16 2006 Kristian H??gsberg <krh at redhat.com> - 0:0.14.4-7
 - Add missing build requires for libXext.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:20:38 -0400
Subject: rpms/sysklogd/devel sysklogd.spec,1.37,1.38
Message-ID: <200607120820.k6C8Kcrw023841@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23819

Modified Files:
	sysklogd.spec 
Log Message:
bumped for rebuild


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sysklogd.spec	14 Jun 2006 22:38:34 -0000	1.37
+++ sysklogd.spec	12 Jul 2006 08:20:35 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 39
+Release: 39.1
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
@@ -101,6 +101,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-39.1
+- rebuild
+
 * Wed Jun 14 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-39
 - Add Requires(post) and (postun) on /sbin/service (fixes scriptlet errors)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:21:06 -0400
Subject: rpms/syslinux/devel syslinux.spec,1.34,1.35
Message-ID: <200607120821.k6C8L6UT024014@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	syslinux.spec 
Log Message:
bumped for rebuild


Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- syslinux.spec	12 Jun 2006 21:33:58 -0000	1.34
+++ syslinux.spec	12 Jul 2006 08:20:58 -0000	1.35
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.11
 %define tarball_version 3.11
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -90,6 +90,9 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.11-2.1
+- rebuild
+
 * Mon Jun 12 2006 Peter Jones <pjones at redhat.com> - 3.11-2
 - Fold -devel subpackage into "syslinux"
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:21:39 -0400
Subject: rpms/sysstat/devel sysstat.spec,1.39,1.40
Message-ID: <200607120821.k6C8Ld6u024249@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24224

Modified Files:
	sysstat.spec 
Log Message:
bumped for rebuild


Index: sysstat.spec
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sysstat.spec	5 Jun 2006 17:52:24 -0000	1.39
+++ sysstat.spec	12 Jul 2006 08:21:36 -0000	1.40
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 6.0.2
-Release: 2
+Release: 2.1
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -111,6 +111,9 @@
 /var/log/sa
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.2-2.1
+- rebuild
+
 * Mon Jun  5 2006 Jesse Keating <jkeating at redhat.com> 6.0.2-2
 - Add missing BR of gettext
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:22:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:22:02 -0400
Subject: rpms/system-config-boot/devel system-config-boot.spec,1.12,1.13
Message-ID: <200607120822.k6C8M295024437@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-boot.spec 
Log Message:
bumped for rebuild


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-config-boot.spec	6 Jun 2006 02:21:03 -0000	1.12
+++ system-config-boot.spec	12 Jul 2006 08:22:00 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
 Version: 0.2.11
-Release: 3
+Release: 3.1
 URL: http://fedora.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -64,6 +64,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-boot
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-3.1
+- rebuild
+
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-3
 - Added missing BuildRequire on perl-XML-Parser
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:22:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:22:38 -0400
Subject: rpms/system-config-date/devel system-config-date.spec,1.50,1.51
Message-ID: <200607120822.k6C8Mcmo024703@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-date.spec 
Log Message:
bumped for rebuild


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-date.spec	26 Apr 2006 14:40:42 -0000	1.50
+++ system-config-date.spec	12 Jul 2006 08:22:35 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
 Version: 1.8.3
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -98,6 +98,9 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.3-1.1
+- rebuild
+
 * Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.3
 - feed timezone po files from anaconda (#131528, patch by Andrew Martynov)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:22:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:22:57 -0400
Subject: rpms/system-config-httpd/devel system-config-httpd.spec,1.12,1.13
Message-ID: <200607120822.k6C8Mv62024845@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-httpd.spec 
Log Message:
bumped for rebuild


Index: system-config-httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-httpd/devel/system-config-httpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-config-httpd.spec	9 Dec 2005 22:43:25 -0000	1.12
+++ system-config-httpd.spec	12 Jul 2006 08:22:55 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Apache configuration tool
 Name: system-config-httpd
 Version: 1.3.3
-Release: 1.1
+Release: 1.1.1
 Epoch: 5
 URL: http://www.redhat.com/
 Source0: system-config-httpd-%{version}.tar.gz
@@ -70,6 +70,9 @@
 %dir /var/cache/alchemist/apache
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:1.3.3-1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:23:14 -0400
Subject: rpms/system-config-keyboard/devel system-config-keyboard.spec, 1.15,
	1.16
Message-ID: <200607120823.k6C8NEmP024982@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-keyboard.spec 
Log Message:
bumped for rebuild


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- system-config-keyboard.spec	9 Dec 2005 22:43:25 -0000	1.15
+++ system-config-keyboard.spec	12 Jul 2006 08:23:12 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the keyboard
 Name: system-config-keyboard
 Version: 1.2.7
-Release: 1.1
+Release: 1.1.1
 URL: http://fedora.redhat.com/projects/config-tools
 License: GPL
 ExclusiveOS: Linux
@@ -75,6 +75,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-keyboard.png
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.7-1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:23:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:23:25 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.16,
	1.17
Message-ID: <200607120823.k6C8NPpR025090@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-language.spec 
Log Message:
bumped for rebuild


Index: system-config-language.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- system-config-language.spec	28 Feb 2006 21:25:26 -0000	1.16
+++ system-config-language.spec	12 Jul 2006 08:23:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.1.11
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.11-1.1
+- rebuild
+
 * Tue Feb 28 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.11-1
 - Update translations
 - Serbian locales (#172600)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:23:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:23:36 -0400
Subject: rpms/system-config-network/devel system-config-network.spec, 1.17,
	1.18
Message-ID: <200607120823.k6C8NaA7025190@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-network.spec 
Log Message:
bumped for rebuild


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- system-config-network.spec	9 Dec 2005 22:43:27 -0000	1.17
+++ system-config-network.spec	12 Jul 2006 08:23:34 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: The GUI of the NEtwork Adminstration Tool
 Name: system-config-network
 Version: 1.3.30
-Release: 2.1
+Release: 2.1.1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -89,6 +89,9 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.30-2.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:23:56 -0400
Subject: rpms/system-config-nfs/devel system-config-nfs.spec,1.32,1.33
Message-ID: <200607120823.k6C8NuYj025328@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-nfs.spec 
Log Message:
bumped for rebuild


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-nfs.spec	3 Mar 2006 15:10:52 -0000	1.32
+++ system-config-nfs.spec	12 Jul 2006 08:23:53 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: NFS server configuration tool
 Name: system-config-nfs
 Version: 1.3.19
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -72,6 +72,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-nfs
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.19-1.1
+- rebuild
+
 * Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.19
 - require hicolor-icon-theme (#182870, #182871)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:24:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:24:07 -0400
Subject: rpms/system-config-printer/devel system-config-printer.spec, 1.46,
	1.47
Message-ID: <200607120824.k6C8O7f1025450@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-printer.spec 
Log Message:
bumped for rebuild


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- system-config-printer.spec	7 Jul 2006 15:09:13 -0000	1.46
+++ system-config-printer.spec	12 Jul 2006 08:24:04 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 0.7.22
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.22-1.1
+- rebuild
+
 * Fri Jul  7 2006 Tim Waugh <twaugh at redhat.com> 0.7.22-1
 - 0.7.22.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:24:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:24:33 -0400
Subject: rpms/system-config-samba/devel system-config-samba.spec,1.34,1.35
Message-ID: <200607120824.k6C8OXVw025635@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-samba.spec 
Log Message:
bumped for rebuild


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- system-config-samba.spec	29 Mar 2006 13:19:20 -0000	1.34
+++ system-config-samba.spec	12 Jul 2006 08:24:31 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
 Version: 1.2.35
-Release: 1
+Release: 1.1
 URL: http://www.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Mar 29 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.35
 - don't require gnome module (#187200)
 - don't wrap text in About dialog



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:24:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:24:44 -0400
Subject: rpms/system-config-users/devel system-config-users.spec,1.37,1.38
Message-ID: <200607120824.k6C8OiJL025757@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-users.spec 
Log Message:
bumped for rebuild


Index: system-config-users.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- system-config-users.spec	5 Apr 2006 15:14:56 -0000	1.37
+++ system-config-users.spec	12 Jul 2006 08:24:42 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
 Version: 1.2.44
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.44-1.1
+- rebuild
+
 * Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.44
 - rephrase some error messages to ease translation (#154204)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:24:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:24:51 -0400
Subject: rpms/system-switch-mail/devel system-switch-mail.spec,1.12,1.13
Message-ID: <200607120824.k6C8Oprq025851@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-switch-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25826

Modified Files:
	system-switch-mail.spec 
Log Message:
bumped for rebuild


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-switch-mail.spec	7 Mar 2006 15:04:00 -0000	1.12
+++ system-switch-mail.spec	12 Jul 2006 08:24:49 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
 Version: 0.5.25
-Release: 8
+Release: 8.1
 Source0: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: Applications/System
@@ -76,6 +76,9 @@
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.25-8.1
+- rebuild
+
 * Tue Mar 07 2006 Than Ngo <than at redhat.com> 0.5.25-8
 - fix deprecated functions in gtk #159155
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:24:59 -0400
Subject: rpms/systemtap/devel systemtap.spec,1.24,1.25
Message-ID: <200607120824.k6C8OxrN025958@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25925

Modified Files:
	systemtap.spec 
Log Message:
bumped for rebuild


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- systemtap.spec	17 Jun 2006 01:56:14 -0000	1.24
+++ systemtap.spec	12 Jul 2006 08:24:56 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name: systemtap
 Version: 0.5.8
-Release: 2
+Release: 2.1
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.8-2.1
+- rebuild
+
 * Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-2
 - Rebuilt for devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:25:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:25:06 -0400
Subject: rpms/SysVinit/devel SysVinit.spec,1.43,1.44
Message-ID: <200607120825.k6C8P6fb026053@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26025

Modified Files:
	SysVinit.spec 
Log Message:
bumped for rebuild


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SysVinit.spec	10 May 2006 16:05:23 -0000	1.43
+++ SysVinit.spec	12 Jul 2006 08:25:04 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 4
+Release: 4.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -127,6 +127,9 @@
 /dev/initctl
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.86-4.1
+- rebuild
+
 * Wed May 10 2006 Bill Nottingham <notting at redhat.com> - 2.86-3
 - fix potential under-copy of proc title (#188160, <kir at sacred.ru>)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:25:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:25:19 -0400
Subject: rpms/talk/devel talk.spec,1.18,1.19
Message-ID: <200607120825.k6C8PJl8026184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/talk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26157

Modified Files:
	talk.spec 
Log Message:
bumped for rebuild


Index: talk.spec
===================================================================
RCS file: /cvs/dist/rpms/talk/devel/talk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- talk.spec	11 Feb 2006 05:47:17 -0000	1.18
+++ talk.spec	12 Jul 2006 08:25:17 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Talk client for one-on-one Internet chatting.
 Name: talk
 Version: 0.17
-Release: 29.2.1
+Release: 29.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-29.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-29.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:25:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:25:27 -0400
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.18,1.19
Message-ID: <200607120825.k6C8PR32026286@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26257

Modified Files:
	tanukiwrapper.spec 
Log Message:
bumped for rebuild


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tanukiwrapper.spec	6 Mar 2006 22:49:25 -0000	1.18
+++ tanukiwrapper.spec	12 Jul 2006 08:25:25 -0000	1.19
@@ -1,6 +1,6 @@
 %define name		tanukiwrapper
 %define version		3.1.1
-%define release 	4jpp_7fc
+%define release 	4jpp_8fc
 %define section		devel
 
 Summary:	Java Service Wrapper
@@ -153,6 +153,9 @@
 %{_datadir}/%{name}-%{version}/test
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_8fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:3.1.1-4jpp_7fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:25:37 -0400
Subject: rpms/tar/devel tar.spec,1.38,1.39
Message-ID: <200607120825.k6C8PboY026387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26361

Modified Files:
	tar.spec 
Log Message:
bumped for rebuild


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tar.spec	29 Jun 2006 13:00:06 -0000	1.38
+++ tar.spec	12 Jul 2006 08:25:34 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -105,6 +105,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.15.90-3.1
+- rebuild
+
 * Thu Jun 29 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-3
 - fix typo in tar.1 man page
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:26:00 -0400
Subject: rpms/tcl/devel tcl.spec,1.20,1.21
Message-ID: <200607120826.k6C8Q0bo026575@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcl.spec 
Log Message:
bumped for rebuild


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tcl.spec	20 Apr 2006 18:49:29 -0000	1.20
+++ tcl.spec	12 Jul 2006 08:25:58 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 1
+Release: 1.1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -148,6 +148,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-1.1
+- rebuild
+
 * Wed Apr 19 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1
 - Upgraded to Tcl 8.4.13
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:26:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:26:20 -0400
Subject: rpms/tclx/devel tclx.spec,1.13,1.14
Message-ID: <200607120826.k6C8QKom026677@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26648

Modified Files:
	tclx.spec 
Log Message:
bumped for rebuild


Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tclx.spec	29 Jun 2006 17:27:16 -0000	1.13
+++ tclx.spec	12 Jul 2006 08:26:17 -0000	1.14
@@ -7,7 +7,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 3
+Release: 3.1
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -109,6 +109,9 @@
 %{_mandir}/man*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.0-3.1
+- rebuild
+
 * Thu Jun 29 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-3
 - Unit tests broken, disabling for now (#197107)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:26:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:26:29 -0400
Subject: rpms/tcpdump/devel tcpdump.spec,1.54,1.55
Message-ID: <200607120826.k6C8QTpN026780@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcpdump.spec 
Log Message:
bumped for rebuild


Index: tcpdump.spec
===================================================================
RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tcpdump.spec	22 Jun 2006 08:05:17 -0000	1.54
+++ tcpdump.spec	12 Jul 2006 08:26:27 -0000	1.55
@@ -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
@@ -77,7 +77,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}
+Release: %{pcap_release}.1
 %define	libpcap_dir	libpcap-%{pcap_version}
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
@@ -99,7 +99,7 @@
 
 %package -n libpcap-devel
 Version: %{pcap_version}
-Release: %{pcap_release}
+Release: %{pcap_release}.1
 Summary: A pcap library.
 Group: Development/Libraries
 License: BSD
@@ -120,7 +120,7 @@
  
 %package -n arpwatch
 Version: 2.1a13
-Release: %{arpwatch_release}
+Release: %{arpwatch_release}.1
 %define	arpwatch_dir	arpwatch-2.1a13
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
@@ -342,6 +342,9 @@
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 14:3.9.4-8.1
+- rebuild
+
 * Thu Jun 22 2006 Martin Stransky <stransky at redhat.com> - 14:3.9.4-8
 - more ipv6 flags
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:26:53 -0400
Subject: rpms/tcp_wrappers/devel tcp_wrappers.spec,1.19,1.20
Message-ID: <200607120826.k6C8QrhE026919@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcp_wrappers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26895

Modified Files:
	tcp_wrappers.spec 
Log Message:
bumped for rebuild


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tcp_wrappers.spec	11 Feb 2006 05:48:31 -0000	1.19
+++ tcp_wrappers.spec	12 Jul 2006 08:26:50 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 40.2
+Release: 40.2.1
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -106,6 +106,9 @@
 %{_sbindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:27:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:27:13 -0400
Subject: rpms/tcsh/devel tcsh.spec,1.39,1.40
Message-ID: <200607120827.k6C8RDKN027033@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27008

Modified Files:
	tcsh.spec 
Log Message:
bumped for rebuild


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tcsh.spec	10 Jul 2006 20:52:23 -0000	1.39
+++ tcsh.spec	12 Jul 2006 08:27:11 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 9
+Release: 9.1
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -108,6 +108,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.14-9.1
+- rebuild
+
 * Mon Jul 10 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-9
 - Fix seeking over multibyte characters (#195972)
 - Don't ship obsolete eight-bit.txt



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:27:41 -0400
Subject: rpms/telnet/devel telnet.spec,1.26,1.27
Message-ID: <200607120827.k6C8Rf1W027184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27160

Modified Files:
	telnet.spec 
Log Message:
bumped for rebuild


Index: telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- telnet.spec	8 May 2006 16:14:57 -0000	1.26
+++ telnet.spec	12 Jul 2006 08:27:38 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 36
+Release: 36.1
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -129,6 +129,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-36.1
+- rebuild
+
 * Mon May 08 2006 Harald Hoyer <harald at redhat.com> - 1:0.17-36
 - patch to remove gethostbyname() (bug #190296)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:27:47 -0400
Subject: rpms/termcap/devel termcap.spec,1.23,1.24
Message-ID: <200607120827.k6C8RlMj027305@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/termcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27250

Modified Files:
	termcap.spec 
Log Message:
bumped for rebuild


Index: termcap.spec
===================================================================
RCS file: /cvs/dist/rpms/termcap/devel/termcap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- termcap.spec	12 Jul 2006 07:39:50 -0000	1.23
+++ termcap.spec	12 Jul 2006 08:27:45 -0000	1.24
@@ -3,7 +3,7 @@
 Name: termcap
 Epoch: 1
 Version: 5.5
-Release: 1.20060701
+Release: 1.20060701.1
 License: Public Domain
 Group: System Environment/Base
 Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %config /etc/termcap
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:5.5-1.20060701.1
+- rebuild
+
 * Wed Jul 12 2006 Miroslav Lichvar <mlichvar at redhat.com> 1:5.5-1.20060701
 - resynchronize with ncurses package
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:27:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:27:52 -0400
Subject: rpms/tetex/devel tetex.spec,1.95,1.96
Message-ID: <200607120827.k6C8RqAZ027351@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27333

Modified Files:
	tetex.spec 
Log Message:
bumped for rebuild


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- tetex.spec	24 Jun 2006 17:23:31 -0000	1.95
+++ tetex.spec	12 Jul 2006 08:27:50 -0000	1.96
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 26
+Release: 26.1
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -826,6 +826,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-26.1
+- rebuild
+
 * Thu Jun 24 2006 Jindrich Novy <jnovy at redhat.com> 3.0-26
 - remove dependency on fonts-japanese (#158150)
 - fix dvipdfm buffer overflow (#193915)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:00 -0400
Subject: rpms/texi2html/devel texi2html.spec,1.7,1.8
Message-ID: <200607120828.k6C8S0Dg027449@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/texi2html/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27425

Modified Files:
	texi2html.spec 
Log Message:
bumped for rebuild


Index: texi2html.spec
===================================================================
RCS file: /cvs/dist/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- texi2html.spec	25 Feb 2006 09:29:28 -0000	1.7
+++ texi2html.spec	12 Jul 2006 08:27:57 -0000	1.8
@@ -1,6 +1,6 @@
 Name: texi2html
 Version: 1.76
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Text
 Summary: A highly customizable texinfo to HTML and other formats translator
@@ -78,6 +78,9 @@
 %{_datadir}/%{name}/images/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.76-3.1
+- rebuild
+
 * Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 1.76-3
 - PreReq info (#182888)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:09 -0400
Subject: rpms/texinfo/devel texinfo.spec,1.36,1.37
Message-ID: <200607120828.k6C8S9nA027592@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	texinfo.spec 
Log Message:
bumped for rebuild


Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- texinfo.spec	26 Mar 2006 22:27:02 -0000	1.36
+++ texinfo.spec	12 Jul 2006 08:28:07 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 11
+Release: 11.1
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -137,6 +137,9 @@
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.8-11.1
+- rebuild
+
 * Sat Mar 25 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-11
 - Split texinfo-tex from the texinfo package (#178406)
 - Ship COPYING, don't ship INSTALL



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:17 -0400
Subject: rpms/tftp/devel tftp.spec,1.32,1.33
Message-ID: <200607120828.k6C8SHl9027650@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27626

Modified Files:
	tftp.spec 
Log Message:
bumped for rebuild


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tftp.spec	10 Apr 2006 16:13:43 -0000	1.32
+++ tftp.spec	12 Jul 2006 08:28:15 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 3
+Release: 3.1
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
@@ -80,6 +80,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.42-3.1
+- rebuild
+
 * Mon Apr 10 2006 Radek Vok??l <rvokal at redhat.com> 0.42-3
 - show localtime instead of GMT (#172274)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:25 -0400
Subject: rpms/thunderbird/devel thunderbird.spec,1.73,1.74
Message-ID: <200607120828.k6C8SPuB027762@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27731

Modified Files:
	thunderbird.spec 
Log Message:
bumped for rebuild


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- thunderbird.spec	13 Jun 2006 04:05:26 -0000	1.73
+++ thunderbird.spec	12 Jul 2006 08:28:23 -0000	1.74
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5.0.4
-Release:	2
+Release:	2.1
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -212,6 +212,9 @@
 #===============================================================================
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
 - Update to 1.5.0.4
 - Fix desktop-file-utils requires



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:51 -0400
Subject: rpms/time/devel time.spec,1.16,1.17
Message-ID: <200607120828.k6C8Spo5027963@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/time/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27930

Modified Files:
	time.spec 
Log Message:
bumped for rebuild


Index: time.spec
===================================================================
RCS file: /cvs/dist/rpms/time/devel/time.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- time.spec	11 Feb 2006 05:51:40 -0000	1.16
+++ time.spec	12 Jul 2006 08:28:49 -0000	1.17
@@ -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.1
+Release: 27.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7-27.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7-27.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:28:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:28:59 -0400
Subject: rpms/timidity++/devel timidity++.spec,1.12,1.13
Message-ID: <200607120828.k6C8SxL2028060@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/timidity++/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28004

Modified Files:
	timidity++.spec 
Log Message:
bumped for rebuild


Index: timidity++.spec
===================================================================
RCS file: /cvs/dist/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- timidity++.spec	11 Feb 2006 05:51:51 -0000	1.12
+++ timidity++.spec	12 Jul 2006 08:28:56 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer.
 Name: timidity++
 Version: 2.13.2
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:29:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:29:05 -0400
Subject: rpms/tix/devel tix.spec,1.17,1.18
Message-ID: <200607120829.k6C8T5dl028156@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28096

Modified Files:
	tix.spec 
Log Message:
bumped for rebuild


Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tix.spec	28 Jun 2006 17:51:44 -0000	1.17
+++ tix.spec	12 Jul 2006 08:29:03 -0000	1.18
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 10
+Release: 10.1
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -126,6 +126,9 @@
 %doc docs/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:8.4.0-10.1
+- rebuild
+
 * Wed Jun 28 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-10
 - Added missing BuildRequires for autoconf (#197117)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:29:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:29:26 -0400
Subject: rpms/tmpwatch/devel tmpwatch.spec,1.26,1.27
Message-ID: <200607120829.k6C8TQ5t028351@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tmpwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28329

Modified Files:
	tmpwatch.spec 
Log Message:
bumped for rebuild


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/tmpwatch/devel/tmpwatch.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tmpwatch.spec	6 May 2006 18:56:54 -0000	1.26
+++ tmpwatch.spec	12 Jul 2006 08:29:24 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed.
 Name: tmpwatch
 Version: 2.9.7
-Release: 1
+Release: 1.1
 Source: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
@@ -49,6 +49,9 @@
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.7-1.1
+- rebuild
+
 * Sat May  6 2006 Miloslav Trmac <mitr at redhat.com> - 2.9.7-1
 - Add --nosymlinks (#190691)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:29:40 -0400
Subject: rpms/tn5250/devel tn5250.spec,1.18,1.19
Message-ID: <200607120829.k6C8Te0w028485@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28457

Modified Files:
	tn5250.spec 
Log Message:
bumped for rebuild


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tn5250.spec	28 Jun 2006 09:00:41 -0000	1.18
+++ tn5250.spec	12 Jul 2006 08:29:37 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: 	5250 Telnet protocol and Terminal
 Name: 		tn5250
 Version: 	0.17.3
-Release:    4
+Release:    4.1
 License: 	GPL 
 Group: 		Applications/Internet
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %attr( - ,root,root)  %{_libdir}/pkgconfig/tn5250.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17.3-4.1
+- rebuild
+
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.17.3-4
 - add buildrequires automake, libtool
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:30:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:30:01 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.37,1.38
Message-ID: <200607120830.k6C8U16A028641@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28621

Modified Files:
	tog-pegasus.spec 
Log Message:
bumped for rebuild


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tog-pegasus.spec	7 Jul 2006 23:59:07 -0000	1.37
+++ tog-pegasus.spec	12 Jul 2006 08:29:58 -0000	1.38
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.5.1
-Release: 		10%{?LINUX_VERSION:.%{LINUX_VERSION}}
+Release: 		10%{?LINUX_VERSION:.%{LINUX_VERSION}}.1
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -382,6 +382,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.5.1-10.FC6.1
+- rebuild
+
 * Fri Jul 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.4.1-10
 - More upstream 2.5.2_APPROVED bug fixes:
   o 4629: Pegasus freezes when it is unable to send out completely, the results of a request



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:30:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:30:57 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.17,1.18
Message-ID: <200607120830.k6C8UvGk028930@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tomboy.spec 
Log Message:
bumped for rebuild


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tomboy.spec	25 May 2006 18:34:01 -0000	1.17
+++ tomboy.spec	12 Jul 2006 08:30:54 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        5
+Release:        5.1
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -105,6 +105,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu May 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 0.3.5-5
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:31:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:31:07 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.83,1.84
Message-ID: <200607120831.k6C8V7nU029040@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tomcat5.spec 
Log Message:
bumped for rebuild


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- tomcat5.spec	7 Jul 2006 23:09:01 -0000	1.83
+++ tomcat5.spec	12 Jul 2006 08:31:05 -0000	1.84
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_2fc
+Release: 3jpp_3fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1202,6 +1202,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.5.17-3jpp_3fc
+- rebuild
+
 * Fri Jul 07 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
 - Re-enable ppc64 and s390x
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:32:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:32:19 -0400
Subject: rpms/traceroute/devel traceroute.spec,1.22,1.23
Message-ID: <200607120832.k6C8WJHo029381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29335

Modified Files:
	traceroute.spec 
Log Message:
bumped for rebuild


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- traceroute.spec	11 Feb 2006 05:53:09 -0000	1.22
+++ traceroute.spec	12 Jul 2006 08:32:14 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.0.4
-Release: 1.2
+Release: 1.2.1
 Epoch: 2
 License: GPL
 Group: Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:32:36 -0400
Subject: rpms/transfig/devel transfig.spec,1.23,1.24
Message-ID: <200607120832.k6C8WaN4029475@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29461

Modified Files:
	transfig.spec 
Log Message:
bumped for rebuild


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- transfig.spec	16 May 2006 10:56:08 -0000	1.23
+++ transfig.spec	12 Jul 2006 08:32:33 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 15
+Release: 15.1
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -73,6 +73,9 @@
 %{_datadir}/fig2dev
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-15.1
+- rebuild
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 3.2.4-15
 - fix #164140, transfig creates wrong dependencies for -L pstex
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:33:01 -0400
Subject: rpms/tree/devel tree.spec,1.18,1.19
Message-ID: <200607120833.k6C8X1bo029594@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tree/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29569

Modified Files:
	tree.spec 
Log Message:
bumped for rebuild


Index: tree.spec
===================================================================
RCS file: /cvs/dist/rpms/tree/devel/tree.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tree.spec	11 Feb 2006 05:53:26 -0000	1.18
+++ tree.spec	12 Jul 2006 08:32:59 -0000	1.19
@@ -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.1
+Release: 3.2.2
 Group: Applications/File
 License: GPL
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -48,6 +48,9 @@
 %doc README
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:33:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:33:33 -0400
Subject: rpms/tsclient/devel tsclient.spec,1.14,1.15
Message-ID: <200607120833.k6C8XXlZ029775@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tsclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29749

Modified Files:
	tsclient.spec 
Log Message:
bumped for rebuild


Index: tsclient.spec
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tsclient.spec	10 Jun 2006 05:36:48 -0000	1.14
+++ tsclient.spec	12 Jul 2006 08:33:30 -0000	1.15
@@ -7,7 +7,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 0.148
-Release: 2
+Release: 2.1
 URL: http://www.gnomepro.com/tsclient/
 Source0: http://www.gnomepro.com/tsclient/%{name}-%{version}.tar.gz
 License: GPL
@@ -72,6 +72,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.148-2.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 0.148-2
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:33:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:33:50 -0400
Subject: rpms/ttcp/devel ttcp.spec,1.14,1.15
Message-ID: <200607120833.k6C8XoVC029871@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29847

Modified Files:
	ttcp.spec 
Log Message:
bumped for rebuild


Index: ttcp.spec
===================================================================
RCS file: /cvs/dist/rpms/ttcp/devel/ttcp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ttcp.spec	15 Jun 2006 12:51:32 -0000	1.14
+++ ttcp.spec	12 Jul 2006 08:33:48 -0000	1.15
@@ -1,6 +1,6 @@
 Name: ttcp
 Version: 1.12
-Release: 14
+Release: 14.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.12-14.1
+- rebuild
+
 * Thu Jun 15 2006 Radek Vokal <rvokal at redhat.com> 1.12-14
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:34:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:34:08 -0400
Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.20,1.21
Message-ID: <200607120834.k6C8Y8ob029977@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttmkfdir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29953

Modified Files:
	ttmkfdir.spec 
Log Message:
bumped for rebuild


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ttmkfdir.spec	20 Jun 2006 02:07:25 -0000	1.20
+++ ttmkfdir.spec	12 Jul 2006 08:34:06 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 20.2
+Release: 20.2.1
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -54,6 +54,9 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.9-20.2.1
+- rebuild
+
 * Tue Jun 20 2006 Lingning Zhang <lizhang at redhat.com> - 3.0.9-20.2
 - add "BuildRequires: libtool" in ttmkfdir.spec
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:34:56 -0400
Subject: rpms/tvtime/devel tvtime.spec,1.27,1.28
Message-ID: <200607120834.k6C8YuvH030192@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tvtime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30151

Modified Files:
	tvtime.spec 
Log Message:
bumped for rebuild


Index: tvtime.spec
===================================================================
RCS file: /cvs/dist/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tvtime.spec	16 May 2006 15:42:23 -0000	1.27
+++ tvtime.spec	12 Jul 2006 08:34:54 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer.
 Name: tvtime
 Version: 1.0.1
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -93,6 +93,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-5.1
+- rebuild
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 1.0.1-5 
 - add BR on libXt-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:35:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:35:09 -0400
Subject: rpms/tzdata/devel tzdata.spec,1.32,1.33
Message-ID: <200607120835.k6C8Z9fQ030282@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30230

Modified Files:
	tzdata.spec 
Log Message:
bumped for rebuild


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tzdata.spec	11 May 2006 08:33:03 -0000	1.32
+++ tzdata.spec	12 Jul 2006 08:35:07 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2006g
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
@@ -48,6 +48,9 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2006g-1.1
+- rebuild
+
 * Thu May 11 2006 Petr Machata <pmachata at redhat.com> - 2006g-1
 - Honduras chose to follow Guatemala and will observe DST May/6 to Sep/2
 - Nicaragua updates



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:35:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:35:20 -0400
Subject: rpms/udev/devel udev.spec,1.174,1.175
Message-ID: <200607120835.k6C8ZKOp030365@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30341

Modified Files:
	udev.spec 
Log Message:
bumped for rebuild


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- udev.spec	6 Jul 2006 07:17:43 -0000	1.174
+++ udev.spec	12 Jul 2006 08:35:18 -0000	1.175
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 095-2.1
+- rebuild
+
 * Thu Jul  6 2006 Harald Hoyer <harald at redhat.com> - 095-2
 - added option to debug udev with kernel cmdline option "udevdebug"
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:35:47 -0400
Subject: rpms/units/devel units.spec,1.16,1.17
Message-ID: <200607120835.k6C8Zljj030523@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/units/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30502

Modified Files:
	units.spec 
Log Message:
bumped for rebuild


Index: units.spec
===================================================================
RCS file: /cvs/dist/rpms/units/devel/units.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- units.spec	11 Feb 2006 05:55:01 -0000	1.16
+++ units.spec	12 Jul 2006 08:35:45 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another.
 Name: units
 Version: 1.85
-Release: 1.2.1
+Release: 1.2.2
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Engineering
@@ -44,6 +44,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.85-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.85-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:35:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:35:56 -0400
Subject: rpms/unix2dos/devel unix2dos.spec,1.19,1.20
Message-ID: <200607120835.k6C8Zuhj030620@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unix2dos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30595

Modified Files:
	unix2dos.spec 
Log Message:
bumped for rebuild


Index: unix2dos.spec
===================================================================
RCS file: /cvs/dist/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- unix2dos.spec	11 Feb 2006 05:55:11 -0000	1.19
+++ unix2dos.spec	12 Jul 2006 08:35:54 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: unix2dos - UNIX to DOS text file format converter
 Name: unix2dos
 Version: 2.2
-Release: 26.2.1
+Release: 26.2.2
 License: distributable
 Group: Applications/Text
 Source: unix2dos-2.2.src.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2-26.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-26.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:36:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:36:18 -0400
Subject: rpms/unixODBC/devel unixODBC.spec,1.34,1.35
Message-ID: <200607120836.k6C8aI8m030727@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30697

Modified Files:
	unixODBC.spec 
Log Message:
bumped for rebuild


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- unixODBC.spec	27 Mar 2006 20:08:51 -0000	1.34
+++ unixODBC.spec	12 Jul 2006 08:36:16 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.11
-Release: 7
+Release: 7.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -176,6 +176,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.11-7.1
+- rebuild
+
 * Mon Mar 27 2006 Tom Lane <tgl at redhat.com> 2.2.11-7
 - Fix minor problems in desktop files (bug #185764)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:36:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:36:53 -0400
Subject: rpms/unzip/devel unzip.spec,1.31,1.32
Message-ID: <200607120836.k6C8arvS030879@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30842

Modified Files:
	unzip.spec 
Log Message:
bumped for rebuild


Index: unzip.spec
===================================================================
RCS file: /cvs/dist/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- unzip.spec	11 Feb 2006 05:55:34 -0000	1.31
+++ unzip.spec	12 Jul 2006 08:36:50 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files.
 Name: unzip
 Version: 5.52
-Release: 2.2
+Release: 2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.52-2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.52-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:37:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:37:52 -0400
Subject: rpms/usbutils/devel usbutils.spec,1.19,1.20
Message-ID: <200607120837.k6C8bqfO031108@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usbutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31088

Modified Files:
	usbutils.spec 
Log Message:
bumped for rebuild


Index: usbutils.spec
===================================================================
RCS file: /cvs/dist/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- usbutils.spec	1 Mar 2006 16:58:37 -0000	1.19
+++ usbutils.spec	12 Jul 2006 08:37:50 -0000	1.20
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 0.71
-Release: 2
+Release: 2.1
 Source:	http://prdownloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 Patch1: usbutils-0.70-hwdata.patch
 Patch2: usbutils-0.71-VT.patch
@@ -49,6 +49,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.71-2.1
+- rebuild
+
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 1.71-2
 - add usbutils-0.71-VT.patch to fix warnings about unknown lines
   (#176903)



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:37:37 -0400
Subject: rpms/urw-fonts/devel urw-fonts.spec,1.25,1.26
Message-ID: <200607120837.k6C8bbNV031067@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/urw-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31002

Modified Files:
	urw-fonts.spec 
Log Message:
bumped for rebuild


Index: urw-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/urw-fonts/devel/urw-fonts.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- urw-fonts.spec	16 Dec 2005 23:25:15 -0000	1.25
+++ urw-fonts.spec	12 Jul 2006 08:37:35 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: Free versions of the 35 standard PostScript fonts.
 Name: urw-fonts
 Version: 2.3
-Release: 6.1
+Release: 6.1.1
 Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
 Source1: n022003l.afm
 Source2: n022003l.pfb
@@ -81,6 +81,9 @@
 %{fontdir}/*.pfb
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3-6.1.1
+- rebuild
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:38:24 -0400
Subject: rpms/usermode/devel usermode.spec,1.58,1.59
Message-ID: <200607120838.k6C8cOhp031259@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usermode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31227

Modified Files:
	usermode.spec 
Log Message:
bumped for rebuild


Index: usermode.spec
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- usermode.spec	11 Feb 2006 05:56:06 -0000	1.58
+++ usermode.spec	12 Jul 2006 08:38:21 -0000	1.59
@@ -6,7 +6,7 @@
 Summary: Tools for certain user account management tasks.
 Name: usermode
 Version: 1.85
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:38:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:38:52 -0400
Subject: rpms/utempter/devel utempter.spec,1.15,1.16
Message-ID: <200607120838.k6C8cqcQ031367@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/utempter/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31356

Modified Files:
	utempter.spec 
Log Message:
bumped for rebuild


Index: utempter.spec
===================================================================
RCS file: /cvs/dist/rpms/utempter/devel/utempter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- utempter.spec	11 Feb 2006 05:56:18 -0000	1.15
+++ utempter.spec	12 Jul 2006 08:38:50 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:   A privileged helper for utmp/wtmp updates.
 Name:      utempter
 Version:   0.5.5
-Release: 7.2.1
+Release: 7.2.2
 License:   MIT/LGPL
 Group:     System Environment/Base
 Source:    utempter-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{_includedir}/utempter.h
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:39:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:39:20 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.127,1.128
Message-ID: <200607120839.k6C8dKaW031490@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31464

Modified Files:
	util-linux.spec 
Log Message:
bumped for rebuild


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- util-linux.spec	11 Jul 2006 08:52:07 -0000	1.127
+++ util-linux.spec	12 Jul 2006 08:39:17 -0000	1.128
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.31
+Release: 0.31.1
 License: distributable
 Group: System Environment/Base
 
@@ -702,6 +702,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.31.1
+- rebuild
+
 * Tue Jul 11 2006 Karel Zak <kzak at redhat.com> 2.13-0.31
 - cleanup dependences for post and preun scriptlets
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:40:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:40:02 -0400
Subject: rpms/valgrind/devel valgrind.spec,1.36,1.37
Message-ID: <200607120840.k6C8e2l3031714@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31693

Modified Files:
	valgrind.spec 
Log Message:
bumped for rebuild


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- valgrind.spec	16 Jun 2006 10:02:47 -0000	1.36
+++ valgrind.spec	12 Jul 2006 08:39:59 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.2.0
-Release: 3
+Release: 3.1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.2.0-syscall-updates.patch
@@ -118,6 +118,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.0-3.1
+- rebuild
+
 * Fri Jun 16 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-3
 - handle [sg]et_robust_list syscall on ppc{32,64}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:41:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:41:01 -0400
Subject: rpms/vconfig/devel vconfig.spec,1.13,1.14
Message-ID: <200607120841.k6C8f1ko031983@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31935

Modified Files:
	vconfig.spec 
Log Message:
bumped for rebuild


Index: vconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/vconfig.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vconfig.spec	17 Feb 2006 13:35:18 -0000	1.13
+++ vconfig.spec	12 Jul 2006 08:40:58 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Linux 802.1q VLAN configuration utility
 Name: vconfig
 Version: 1.9
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
@@ -35,6 +35,9 @@
 %{_mandir}/man8/vconfig.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9-2.1
+- rebuild
+
 * Fri Feb 17 2006 Phil Knirsch <pknirsch at redhat.com> - 1.9-2
 - Fix build problems and cleaned up files in archive properly
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:41:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:41:57 -0400
Subject: rpms/velocity/devel velocity.spec,1.14,1.15
Message-ID: <200607120841.k6C8fveL032197@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32174

Modified Files:
	velocity.spec 
Log Message:
bumped for rebuild


Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- velocity.spec	8 Mar 2006 23:08:02 -0000	1.14
+++ velocity.spec	12 Jul 2006 08:41:42 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:           velocity
 Version:        %{my_version}
-Release: 	3jpp_5fc
+Release: 	3jpp_6fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -176,6 +176,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4-3jpp_6fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.4-3jpp_5fc
 - excluded s390[x] and ppc64 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:43:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:43:10 -0400
Subject: rpms/vim/devel vim.spec,1.126,1.127
Message-ID: <200607120843.k6C8hAl5032402@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32378

Modified Files:
	vim.spec 
Log Message:
bumped for rebuild


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- vim.spec	27 Jun 2006 09:24:46 -0000	1.126
+++ vim.spec	12 Jul 2006 08:42:59 -0000	1.127
@@ -29,7 +29,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1
+Release: 1.1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -594,6 +594,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:7.0.035-1.1
+- rebuild
+
 * Tue Jun 27 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-1
 - patchlevel 35
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:43:35 -0400
Subject: rpms/vino/devel vino.spec,1.37,1.38
Message-ID: <200607120843.k6C8hZ4b032553@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vino/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32517

Modified Files:
	vino.spec 
Log Message:
bumped for rebuild


Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- vino.spec	10 Jun 2006 05:40:20 -0000	1.37
+++ vino.spec	12 Jul 2006 08:43:33 -0000	1.38
@@ -7,7 +7,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.13.5
-Release: 4
+Release: 4.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -101,6 +101,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-4.1
+- rebuild
+
 * Sat Jun 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-4
 - More missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:44:07 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.69,1.70
Message-ID: <200607120844.k6C8i7jp032725@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32708

Modified Files:
	vixie-cron.spec 
Log Message:
bumped for rebuild


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vixie-cron.spec	31 May 2006 00:09:07 -0000	1.69
+++ vixie-cron.spec	12 Jul 2006 08:44:05 -0000	1.70
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 55.FC6
+Release: 55.FC6.1
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -225,6 +225,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:4.1-55.FC6.1
+- rebuild
+
 * Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-55.FC6
 - fix bug 191823: fix missing BuildRequires: audit-libs-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:44:26 -0400
Subject: rpms/vlock/devel vlock.spec,1.19,1.20
Message-ID: <200607120844.k6C8iQ3f000370@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv341

Modified Files:
	vlock.spec 
Log Message:
bumped for rebuild


Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vlock.spec	11 Feb 2006 05:58:04 -0000	1.19
+++ vlock.spec	12 Jul 2006 08:44:23 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A program which locks one or more virtual consoles.
 Name: vlock
 Version: 1.3
-Release: 22.2.1
+Release: 22.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:45:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:45:15 -0400
Subject: rpms/vorbis-tools/devel vorbis-tools.spec,1.17,1.18
Message-ID: <200607120845.k6C8jFDZ000808@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv720

Modified Files:
	vorbis-tools.spec 
Log Message:
bumped for rebuild


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vorbis-tools.spec	11 Feb 2006 05:58:31 -0000	1.17
+++ vorbis-tools.spec	12 Jul 2006 08:45:12 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1
-Release: 1.2.1
+Release: 1.2.2
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -54,6 +54,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:45:42 -0400
Subject: rpms/vsftpd/devel vsftpd.spec,1.42,1.43
Message-ID: <200607120845.k6C8jgbE000952@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv918

Modified Files:
	vsftpd.spec 
Log Message:
bumped for rebuild


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vsftpd.spec	11 Feb 2006 05:59:15 -0000	1.42
+++ vsftpd.spec	12 Jul 2006 08:45:39 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.4
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -134,6 +134,9 @@
 /var/ftp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:46:13 -0400
Subject: rpms/vte/devel vte.spec,1.84,1.85
Message-ID: <200607120846.k6C8kD79001816@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1598

Modified Files:
	vte.spec 
Log Message:
bumped for rebuild


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- vte.spec	11 Jul 2006 01:31:38 -0000	1.84
+++ vte.spec	12 Jul 2006 08:46:10 -0000	1.85
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.13.3
-Release: 1
+Release: 1.1
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.13.3-1.1
+- rebuild
+
 * Mon Jul 10 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.3-1
 - Update to 0.13.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:46:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:46:52 -0400
Subject: rpms/w3m/devel w3m.spec,1.33,1.34
Message-ID: <200607120846.k6C8kqxm004354@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4194

Modified Files:
	w3m.spec 
Log Message:
bumped for rebuild


Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- w3m.spec	25 Jun 2006 01:40:55 -0000	1.33
+++ w3m.spec	12 Jul 2006 08:46:49 -0000	1.34
@@ -4,7 +4,7 @@
 
 Name:		w3m
 Version:	0.5.1
-Release: 	14
+Release: 	14.1
 License:	BSD
 URL:		http://w3m.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -136,6 +136,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-14.1
+- rebuild
+
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-14
 - Fix missing br gettext-devel, automake
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:47:12 -0400
Subject: rpms/webalizer/devel webalizer.spec,1.25,1.26
Message-ID: <200607120847.k6C8lCH7006183@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/webalizer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6034

Modified Files:
	webalizer.spec 
Log Message:
bumped for rebuild


Index: webalizer.spec
===================================================================
RCS file: /cvs/dist/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- webalizer.spec	16 Jun 2006 14:01:58 -0000	1.25
+++ webalizer.spec	12 Jul 2006 08:47:09 -0000	1.26
@@ -5,7 +5,7 @@
 Summary: A flexible Web server log file analysis program.
 Group: Applications/Internet
 Version: %{ver}_%{patchlevel}
-Release: 30
+Release: 30.1
 URL: http://www.mrunix.net/webalizer/
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
@@ -115,6 +115,9 @@
 %attr(-, webalizer, root) /var/www/usage/*.png
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.01_10-30.1
+- rebuild
+
 * Fri Jun 16 2006 Joe Orton <jorton at redhat.com> 2.01_10-30
 - add patch set from Jarkko Ala-Louvesniemi (#187344, #187726, #188248)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:47:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:47:40 -0400
Subject: rpms/werken.xpath/devel werken.xpath.spec,1.18,1.19
Message-ID: <200607120847.k6C8leVn006842@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/werken.xpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6627

Modified Files:
	werken.xpath.spec 
Log Message:
bumped for rebuild


Index: werken.xpath.spec
===================================================================
RCS file: /cvs/dist/rpms/werken.xpath/devel/werken.xpath.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- werken.xpath.spec	6 Mar 2006 22:46:21 -0000	1.18
+++ werken.xpath.spec	12 Jul 2006 08:47:37 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           werken.xpath
 Version:        0.9.4
-Release: 	0.beta.9jpp_3fc
+Release: 	0.beta.9jpp_4fc
 Epoch:          0
 Summary:        XPath implementation using JDOM
 License:        Apache Software License-like
@@ -100,6 +100,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.4-0.beta.9jpp_4fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9.4-0.beta.9jpp_3fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:47:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:47:57 -0400
Subject: rpms/wget/devel wget.spec,1.46,1.47
Message-ID: <200607120847.k6C8lvb6007645@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7484

Modified Files:
	wget.spec 
Log Message:
bumped for rebuild


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wget.spec	29 Jun 2006 08:33:13 -0000	1.46
+++ wget.spec	12 Jul 2006 08:47:53 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10.2
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -71,6 +71,9 @@
 %{_infodir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-5.1
+- rebuild
+
 * Thu Jun 29 2006 Karsten Hopp <karsten at redhat.de> 1.10.2-5
 - updated german translations from Robert Scheck
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:48:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:48:50 -0400
Subject: rpms/wireless-tools/devel wireless-tools.spec,1.32,1.33
Message-ID: <200607120848.k6C8moF4008759@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8641

Modified Files:
	wireless-tools.spec 
Log Message:
bumped for rebuild


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wireless-tools.spec	6 Apr 2006 21:48:28 -0000	1.32
+++ wireless-tools.spec	12 Jul 2006 08:48:48 -0000	1.33
@@ -32,7 +32,7 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{pre_version}.%{pre_release}.%{release_extension}
+Release: 0.%{pre_version}.%{pre_release}.%{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}.%{pre_version}.tar.gz
@@ -82,6 +82,9 @@
 /%{_lib}/*.so.*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:28-0.pre16.1.6.1
+- rebuild
+
 * Thu Apr  6 2006 Dan Williams <dcbw at redhat.com> - 1:28-0.pre16.1
 - Update to 28 pre16
 - Rebuild for WE-20



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:49:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:49:27 -0400
Subject: rpms/words/devel words.spec,1.8,1.9
Message-ID: <200607120849.k6C8nR9a011478@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/words/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11331

Modified Files:
	words.spec 
Log Message:
bumped for rebuild


Index: words.spec
===================================================================
RCS file: /cvs/dist/rpms/words/devel/words.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- words.spec	9 Dec 2005 22:43:50 -0000	1.8
+++ words.spec	12 Jul 2006 08:49:25 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory.
 Name: words
 Version: 3.0
-Release: 8.1
+Release: 8.1.1
 License: public domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
@@ -60,6 +60,9 @@
 /usr/share/dict/words
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-8.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:49:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:49:58 -0400
Subject: rpms/wordtrans/devel wordtrans.spec,1.25,1.26
Message-ID: <200607120849.k6C8nwWt014043@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13613

Modified Files:
	wordtrans.spec 
Log Message:
bumped for rebuild


Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wordtrans.spec	7 Jun 2006 22:30:00 -0000	1.25
+++ wordtrans.spec	12 Jul 2006 08:49:56 -0000	1.26
@@ -11,7 +11,7 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1pre13
-Release: 13
+Release: 13.1
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
 Source1: ger-eng.txt
@@ -304,6 +304,9 @@
 /var/www/wordtrans
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-13.1
+- rebuild
+
 * Wed Jun 07 2006 Than Ngo <than at redhat.com> 1.1pre13-13 
 - add BR on gettext-devel #130581
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:50:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:50:50 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.17,1.18
Message-ID: <200607120850.k6C8oocY017436@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17411

Modified Files:
	wpa_supplicant.spec 
Log Message:
bumped for rebuild


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wpa_supplicant.spec	27 Apr 2006 14:11:49 -0000	1.17
+++ wpa_supplicant.spec	12 Jul 2006 08:50:47 -0000	1.18
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 10.fc6
+Release: 10.fc6.1
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Apr 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-10
 - Add fix for madwifi and WEP (wpa_supplicant/hostap bud #140) (#rh190075#)
 - Fix up madwifi-ng private ioctl()s for r1331 and later



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:51:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:51:41 -0400
Subject: rpms/wvdial/devel wvdial.spec,1.20,1.21
Message-ID: <200607120851.k6C8pfOc017682@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wvdial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17648

Modified Files:
	wvdial.spec 
Log Message:
bumped for rebuild


Index: wvdial.spec
===================================================================
RCS file: /cvs/dist/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wvdial.spec	11 Feb 2006 06:06:27 -0000	1.20
+++ wvdial.spec	12 Jul 2006 08:51:34 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A heuristic autodialer for PPP connections.
 Name: wvdial
 Version: 1.54.0
-Release: 5.2.2
+Release: 5.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.54.0-5.2.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:52:16 -0400
Subject: rpms/x86info/devel x86info.spec,1.22,1.23
Message-ID: <200607120852.k6C8qGib017799@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/x86info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17773

Modified Files:
	x86info.spec 
Log Message:
bumped for rebuild


Index: x86info.spec
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- x86info.spec	12 Jul 2006 05:27:36 -0000	1.22
+++ x86info.spec	12 Jul 2006 08:52:03 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
 Version:        1.17
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -44,6 +44,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.17-1.22.1
+- rebuild
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:52:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:52:31 -0400
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.31,1.32
Message-ID: <200607120852.k6C8qVc3017994@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17926

Modified Files:
	Xaw3d.spec 
Log Message:
bumped for rebuild


Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Xaw3d.spec	7 Jun 2006 22:34:59 -0000	1.31
+++ Xaw3d.spec	12 Jul 2006 08:52:29 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 10
+Release: 10.1
 Group: System Environment/Libraries
 Source: ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -101,6 +101,9 @@
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-10.1
+- rebuild
+
 * Wed Jun 07 2006 Than Ngo <than at redhat.com> 1.5E-10 
 - BR on bison ed flex #194184 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:52:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:52:38 -0400
Subject: rpms/xcdroast/devel xcdroast.spec,1.26,1.27
Message-ID: <200607120852.k6C8qcFD018076@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xcdroast/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18052

Modified Files:
	xcdroast.spec 
Log Message:
bumped for rebuild


Index: xcdroast.spec
===================================================================
RCS file: /cvs/dist/rpms/xcdroast/devel/xcdroast.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xcdroast.spec	11 Feb 2006 06:07:34 -0000	1.26
+++ xcdroast.spec	12 Jul 2006 08:52:35 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: An X Window System based tool for creating CDs.
 Name: xcdroast
 Version: 0.98a15
-Release: 12.2.1
+Release: 12.2.2
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/xcdroast/xcdroast-0.98alpha15.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/applications/*
  
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.98a15-12.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.98a15-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:52:57 -0400
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.43,1.44
Message-ID: <200607120852.k6C8qvXN018360@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xerces-j2.spec 
Log Message:
bumped for rebuild


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xerces-j2.spec	6 Mar 2006 22:23:37 -0000	1.43
+++ xerces-j2.spec	12 Jul 2006 08:52:55 -0000	1.44
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.7.1
 %define cvs_version	2_7_1
-%define release 	6jpp_7fc
+%define release 	6jpp_8fc
 %define section		free
 
 Name:		%{name}
@@ -264,6 +264,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.7.1-6jpp_8fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.7.1-6jpp_7fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:53:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:53:15 -0400
Subject: rpms/xferstats/devel xferstats.spec,1.13,1.14
Message-ID: <200607120853.k6C8rFfq018566@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18524

Modified Files:
	xferstats.spec 
Log Message:
bumped for rebuild


Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xferstats.spec	4 Apr 2006 16:03:32 -0000	1.13
+++ xferstats.spec	12 Jul 2006 08:53:13 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Compiles information about file transfers from logfiles
 Name: xferstats
 Version: 2.16
-Release: 14
+Release: 14.1
 URL: http://xferstats.off.net/
 Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz
 Patch0: xferstats.patch
@@ -48,6 +48,9 @@
 %{_datadir}/xferstats
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.16-14.1
+- rebuild
+
 * Tue Apr 14 2006 Bill Nottingham <notting at redhat.com> - 2.16-14
 - build against glib2
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:53:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:53:29 -0400
Subject: rpms/xfig/devel xfig.spec,1.38,1.39
Message-ID: <200607120853.k6C8rTZ3018727@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18698

Modified Files:
	xfig.spec 
Log Message:
bumped for rebuild


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xfig.spec	16 May 2006 16:12:57 -0000	1.38
+++ xfig.spec	12 Jul 2006 08:53:27 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 21
+Release: 21.1
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -102,6 +102,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-21.1
+- rebuild
+
 * Tue May 16 2006 Than Ngo <than at redhat.com> 3.2.4-21
 - fix #191816, Xaw3d build problem 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:53:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:53:45 -0400
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.14,1.15
Message-ID: <200607120853.k6C8rjgt018958@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18916

Modified Files:
	xfsprogs.spec 
Log Message:
bumped for rebuild


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xfsprogs.spec	5 Jul 2006 13:26:08 -0000	1.14
+++ xfsprogs.spec	12 Jul 2006 08:53:42 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem.
 Name: xfsprogs
 Version: 2.8.4
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -109,6 +109,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 04 2006 Robert Scheck <redhat at linuxnetz.de> 2.8.4-1
 - Upgrade to 2.8.4 (#196599 #c2)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:53:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:53:55 -0400
Subject: rpms/xhtml1-dtds/devel xhtml1-dtds.spec,1.4,1.5
Message-ID: <200607120853.k6C8rtnW019087@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xhtml1-dtds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19027

Modified Files:
	xhtml1-dtds.spec 
Log Message:
bumped for rebuild


Index: xhtml1-dtds.spec
===================================================================
RCS file: /cvs/dist/rpms/xhtml1-dtds/devel/xhtml1-dtds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xhtml1-dtds.spec	9 Dec 2005 22:43:53 -0000	1.4
+++ xhtml1-dtds.spec	12 Jul 2006 08:53:52 -0000	1.5
@@ -1,6 +1,6 @@
 Name: xhtml1-dtds
 Version: 1.0
-Release: 7.1
+Release: 7.1.1
 Group: Applications/Text
 
 Summary: XML document type definition for XHTML 1.0
@@ -123,6 +123,9 @@
 fi
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-7.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:54:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:54:09 -0400
Subject: rpms/xinetd/devel xinetd.spec,1.31,1.32
Message-ID: <200607120854.k6C8s9Df019252@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19234

Modified Files:
	xinetd.spec 
Log Message:
bumped for rebuild


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xinetd.spec	16 Jun 2006 22:10:31 -0000	1.31
+++ xinetd.spec	12 Jul 2006 08:54:06 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.14
-Release: 3
+Release: 3.1
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -95,6 +95,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.14-3.1
+- rebuild
+
 * Fri Jun 16 2006 Steve Grubb <sgrubb at redhat.com> 2:2.3.14-3
 - Rework spec file & use xinetd's sevice config files
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:54:25 -0400
Subject: rpms/xml-commons/devel xml-commons.spec,1.35,1.36
Message-ID: <200607120854.k6C8sPPZ019382@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19363

Modified Files:
	xml-commons.spec 
Log Message:
bumped for rebuild


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xml-commons.spec	6 Mar 2006 22:57:05 -0000	1.35
+++ xml-commons.spec	12 Jul 2006 08:54:23 -0000	1.36
@@ -4,7 +4,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.3.02
-Release: 	0.b2.7jpp_7fc
+Release: 	0.b2.7jpp_8fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -206,6 +206,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.02-0.b2.7jpp_8fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3.02-0.b2.7jpp_7fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:54:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:54:32 -0400
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.11,
	1.12
Message-ID: <200607120854.k6C8sWZi019467@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xml-commons-resolver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19418

Modified Files:
	xml-commons-resolver.spec 
Log Message:
bumped for rebuild


Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xml-commons-resolver.spec	6 Mar 2006 23:09:28 -0000	1.11
+++ xml-commons-resolver.spec	12 Jul 2006 08:54:30 -0000	1.12
@@ -1,6 +1,6 @@
 %define name		xml-commons-resolver
 %define version         1.1
-%define release 	1jpp_8fc
+%define release 	1jpp_9fc
 %define section		free
 
 Name:           %{name}
@@ -99,6 +99,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-1jpp_9fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-1jpp_8fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:54:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:54:45 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.12,1.13
Message-ID: <200607120854.k6C8sjDG019592@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19564

Modified Files:
	xmlrpc.spec 
Log Message:
bumped for rebuild


Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xmlrpc.spec	8 Mar 2006 20:55:18 -0000	1.12
+++ xmlrpc.spec	12 Jul 2006 08:54:42 -0000	1.13
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_7fc
+%define release		1jpp_8fc
 %define	section		free
 %define gcj_support     1
 
@@ -114,6 +114,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_8fc
+- rebuild
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.0.1-1jpp_7fc
 - excluded s390 due to eclipse
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:54:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:54:55 -0400
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.26,1.27
Message-ID: <200607120854.k6C8stfJ019704@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19674

Modified Files:
	xmlsec1.spec 
Log Message:
bumped for rebuild


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xmlsec1.spec	14 Jun 2006 14:17:27 -0000	1.26
+++ xmlsec1.spec	12 Jul 2006 08:54:53 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 8
+Release: 8.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -234,6 +234,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-8.1
+- rebuild
+
 * Wed Jun 14 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.9-8
 - rebuilt with new gnutls
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:55:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:55:10 -0400
Subject: rpms/xmlto/devel xmlto.spec,1.27,1.28
Message-ID: <200607120855.k6C8tAq6019896@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19851

Modified Files:
	xmlto.spec 
Log Message:
bumped for rebuild


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xmlto.spec	8 Jun 2006 16:25:43 -0000	1.27
+++ xmlto.spec	12 Jul 2006 08:55:07 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 13
+Release: 13.1
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.18-13.1
+- rebuild
+
 * Thu Jun  8 2006 Tim Waugh <twaugh at redhat.com> 0.0.18-13
 - Removed debugging.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:55:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:55:16 -0400
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.18,1.19
Message-ID: <200607120855.k6C8tGJ1019994@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-apps.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-apps.spec	28 Jun 2006 10:34:00 -0000	1.18
+++ xorg-x11-apps.spec	12 Jul 2006 08:55:14 -0000	1.19
@@ -5,7 +5,7 @@
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -177,6 +177,9 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Added xload-1.0.1-setuid.diff to fix potential security issue (#196094)
 - Artificially inflate package version-release to 7.1 to match the X11R7.1



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:56:01 -0400
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.13,1.14
Message-ID: <200607120856.k6C8u1Dj020263@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drivers.spec	29 Jun 2006 19:18:07 -0000	1.13
+++ xorg-x11-drivers.spec	12 Jul 2006 08:55:59 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -279,6 +279,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 29 2006 Mike Harris <mharris at redhat.com> 7.1-2
 - Regenerate driver list to match current rawhide X11R7.1 driver set.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:56:16 -0400
Subject: rpms/xorg-x11-drv-acecad/devel xorg-x11-drv-acecad.spec,1.11,1.12
Message-ID: <200607120856.k6C8uG86020403@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-acecad.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-acecad.spec	28 Jun 2006 10:51:29 -0000	1.11
+++ xorg-x11-drv-acecad.spec	12 Jul 2006 08:56:13 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
 Version: 1.1.0
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -51,6 +51,9 @@
 %{_mandir}/man4/acecad.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
 - Update sdk dependency to 1.1.0-2 to pick up indirect dependency on
   proto-devel.



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:56:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:56:40 -0400
Subject: rpms/xorg-x11-drv-apm/devel xorg-x11-drv-apm.spec,1.12,1.13
Message-ID: <200607120856.k6C8ue8h020598@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-apm.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-apm.spec	28 Jun 2006 10:52:20 -0000	1.12
+++ xorg-x11-drv-apm.spec	12 Jul 2006 08:56:37 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
 Version: 1.1.1
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:56:50 -0400
Subject: rpms/xorg-x11-drv-ark/devel xorg-x11-drv-ark.spec,1.11,1.12
Message-ID: <200607120856.k6C8uow4020745@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-ark.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-ark.spec	28 Jun 2006 10:52:40 -0000	1.11
+++ xorg-x11-drv-ark.spec	12 Jul 2006 08:56:47 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ark video driver
 Name:      xorg-x11-drv-ark
 Version:   0.6.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -57,6 +57,9 @@
 #%{_mandir}/man4/*.4x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.6.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:01 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.29,1.30
Message-ID: <200607120857.k6C8v1o0020863@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
bumped for rebuild


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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-drv-ati.spec	28 Jun 2006 18:04:32 -0000	1.29
+++ xorg-x11-drv-ati.spec	12 Jul 2006 08:56:59 -0000	1.30
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   4
+Release:   4.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -87,6 +87,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 28 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-4
 - Added "BuildRequires: xorg-x11-server-sdk >= 1.1.0-12" to fix the same
   problem at build time as were added in 6.6.1-2 to fix it at runtime.



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:13 -0400
Subject: rpms/xorg-x11-drv-calcomp/devel xorg-x11-drv-calcomp.spec, 1.10,
	1.11
Message-ID: <200607120857.k6C8vDKP020973@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-calcomp.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-calcomp.spec	28 Jun 2006 10:54:26 -0000	1.10
+++ xorg-x11-drv-calcomp.spec	12 Jul 2006 08:57:10 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 calcomp input driver
 Name:      xorg-x11-drv-calcomp
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/calcomp.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:26 -0400
Subject: rpms/xorg-x11-drv-chips/devel xorg-x11-drv-chips.spec,1.10,1.11
Message-ID: <200607120857.k6C8vQvK021106@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-chips.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-chips.spec	28 Jun 2006 10:54:48 -0000	1.10
+++ xorg-x11-drv-chips.spec	12 Jul 2006 08:57:24 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 chips video driver
 Name:      xorg-x11-drv-chips
 Version: 1.1.1
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:34 -0400
Subject: rpms/xorg-x11-drv-cirrus/devel xorg-x11-drv-cirrus.spec,1.10,1.11
Message-ID: <200607120857.k6C8vYCM021232@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-cirrus.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-cirrus.spec	28 Jun 2006 10:55:06 -0000	1.10
+++ xorg-x11-drv-cirrus.spec	12 Jul 2006 08:57:32 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.1.0
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -60,6 +60,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:43 -0400
Subject: rpms/xorg-x11-drv-citron/devel xorg-x11-drv-citron.spec,1.11,1.12
Message-ID: <200607120857.k6C8vhj2021301@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-citron.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-citron.spec	28 Jun 2006 10:55:22 -0000	1.11
+++ xorg-x11-drv-citron.spec	12 Jul 2006 08:57:40 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 citron input driver
 Name:      xorg-x11-drv-citron
 Version:   2.2.0
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/citron.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 2.2.0-1
 - Update to 2.2.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:57:57 -0400
Subject: rpms/xorg-x11-drv-digitaledge/devel xorg-x11-drv-digitaledge.spec,
	1.10, 1.11
Message-ID: <200607120857.k6C8vvVs021475@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-digitaledge.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-digitaledge.spec	28 Jun 2006 10:56:00 -0000	1.10
+++ xorg-x11-drv-digitaledge.spec	12 Jul 2006 08:57:54 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 digitaledge input driver
 Name:      xorg-x11-drv-digitaledge
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:58:12 -0400
Subject: rpms/xorg-x11-drv-dummy/devel xorg-x11-drv-dummy.spec,1.11,1.12
Message-ID: <200607120858.k6C8wCED021637@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-dummy.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-dummy.spec	28 Jun 2006 10:56:30 -0000	1.11
+++ xorg-x11-drv-dummy.spec	12 Jul 2006 08:58:09 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.2.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/dummy.4x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.2.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:58:31 -0400
Subject: rpms/xorg-x11-drv-elo2300/devel xorg-x11-drv-elo2300.spec, 1.10,
	1.11
Message-ID: <200607120858.k6C8wVAd021827@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-elo2300.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-elo2300.spec	28 Jun 2006 10:57:35 -0000	1.10
+++ xorg-x11-drv-elo2300.spec	12 Jul 2006 08:58:29 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elo2300 input driver
 Name:      xorg-x11-drv-elo2300
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/elo2300.4x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Bump to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:58:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:58:45 -0400
Subject: rpms/xorg-x11-drv-elographics/devel xorg-x11-drv-elographics.spec,
	1.10, 1.11
Message-ID: <200607120858.k6C8wj4q021989@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-elographics.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-elographics.spec	28 Jun 2006 10:57:50 -0000	1.10
+++ xorg-x11-drv-elographics.spec	12 Jul 2006 08:58:42 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/elographics.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:58:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:58:46 -0400
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.14,1.15
Message-ID: <200607120858.k6C8wkxg021999@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
bumped for rebuild


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-evdev.spec	28 Jun 2006 10:58:08 -0000	1.14
+++ xorg-x11-drv-evdev.spec	12 Jul 2006 08:58:43 -0000	1.15
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.1.2
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -56,6 +56,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.2-2
 - Build on ppc64
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:58:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:58:55 -0400
Subject: rpms/xorg-x11-drv-fbdev/devel xorg-x11-drv-fbdev.spec,1.12,1.13
Message-ID: <200607120858.k6C8wts9022108@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-fbdev.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-fbdev.spec	28 Jun 2006 10:59:10 -0000	1.12
+++ xorg-x11-drv-fbdev.spec	12 Jul 2006 08:58:52 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
 Version:   0.3.0
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -57,6 +57,9 @@
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.3.0-1
 - Update to 0.3.0 from 7.1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:59:03 -0400
Subject: rpms/xorg-x11-drv-fpit/devel xorg-x11-drv-fpit.spec,1.10,1.11
Message-ID: <200607120859.k6C8x3dt022210@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-fpit.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-fpit.spec	28 Jun 2006 10:59:42 -0000	1.10
+++ xorg-x11-drv-fpit.spec	12 Jul 2006 08:59:00 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/fpit.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Updatte to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:59:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:59:10 -0400
Subject: rpms/xorg-x11-drv-glint/devel xorg-x11-drv-glint.spec,1.13,1.14
Message-ID: <200607120859.k6C8xA8f022314@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-glint.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-glint.spec	28 Jun 2006 11:00:56 -0000	1.13
+++ xorg-x11-drv-glint.spec	12 Jul 2006 08:59:07 -0000	1.14
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
 Version:   1.1.1
-Release:   4
+Release:   4.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -69,6 +69,9 @@
 %{_mandir}/man4/glint.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-4
 - Re-enable with_dri, as --disable-dri builds are broken (fdo#7405)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:59:19 -0400
Subject: rpms/xorg-x11-drv-i128/devel xorg-x11-drv-i128.spec,1.10,1.11
Message-ID: <200607120859.k6C8xJia022444@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-i128.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-i128.spec	28 Jun 2006 11:02:48 -0000	1.10
+++ xorg-x11-drv-i128.spec	12 Jul 2006 08:59:16 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
 Version:   1.2.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/i128.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:59:38 -0400
Subject: rpms/xorg-x11-drv-i740/devel xorg-x11-drv-i740.spec,1.11,1.12
Message-ID: <200607120859.k6C8xcil022603@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-i740.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-i740.spec	28 Jun 2006 11:03:09 -0000	1.11
+++ xorg-x11-drv-i740.spec	12 Jul 2006 08:59:35 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.1.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 08:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 04:59:49 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.24,1.25
Message-ID: <200607120859.k6C8xnCU022701@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
bumped for rebuild


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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-i810.spec	11 Jul 2006 22:07:05 -0000	1.24
+++ xorg-x11-drv-i810.spec	12 Jul 2006 08:59:47 -0000	1.25
@@ -12,7 +12,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   9.20060707modeset%{?dist}
+Release:   9.20060707modeset.1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -95,6 +95,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-9.20060707modeset
 - Fix Revision number to match naming policy.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:00:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:00:54 -0400
Subject: rpms/xorg-x11-drv-jamstudio/devel xorg-x11-drv-jamstudio.spec, 1.10,
	1.11
Message-ID: <200607120900.k6C90s4s023125@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-jamstudio.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-jamstudio.spec	28 Jun 2006 11:04:10 -0000	1.10
+++ xorg-x11-drv-jamstudio.spec	12 Jul 2006 09:00:47 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 jamstudio input driver
 Name:      xorg-x11-drv-jamstudio
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -55,6 +55,9 @@
 %{_mandir}/man4/js_x.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:00:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:00:54 -0400
Subject: rpms/xorg-x11-drv-joystick/devel xorg-x11-drv-joystick.spec, 1.10,
	1.11
Message-ID: <200607120900.k6C90rHd023132@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-joystick.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-joystick.spec	28 Jun 2006 11:04:20 -0000	1.10
+++ xorg-x11-drv-joystick.spec	12 Jul 2006 09:00:47 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 joystick input driver
 Name:      xorg-x11-drv-joystick
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:01:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:01:40 -0400
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.12,
	1.13
Message-ID: <200607120901.k6C91eQ9023354@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-keyboard.spec	28 Jun 2006 11:04:48 -0000	1.12
+++ xorg-x11-drv-keyboard.spec	12 Jul 2006 09:01:38 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
 Version: 1.1.0
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -55,6 +55,9 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 13 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Build on ppc64
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:02:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:02:21 -0400
Subject: rpms/xorg-x11-drv-magellan/devel xorg-x11-drv-magellan.spec, 1.10,
	1.11
Message-ID: <200607120902.k6C92Lum023537@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-magellan.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-magellan.spec	28 Jun 2006 11:05:12 -0000	1.10
+++ xorg-x11-drv-magellan.spec	12 Jul 2006 09:02:13 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/magellan.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:03:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:03:06 -0400
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec,
	1.11, 1.12
Message-ID: <200607120903.k6C936lB023717@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-magictouch.spec	28 Jun 2006 16:06:31 -0000	1.11
+++ xorg-x11-drv-magictouch.spec	12 Jul 2006 09:02:53 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magictouch input driver
 Name:      xorg-x11-drv-magictouch
 Version:   1.0.0.5
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,6 +54,9 @@
 %{_mandir}/man4/magictouch.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
 - Remove system owned directories from file manifest.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:03:16 -0400
Subject: rpms/xorg-x11-drv-mga/devel xorg-x11-drv-mga.spec,1.13,1.14
Message-ID: <200607120903.k6C93EKe023768@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-mga.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-mga.spec	6 Jul 2006 20:04:46 -0000	1.13
+++ xorg-x11-drv-mga.spec	12 Jul 2006 09:03:11 -0000	1.14
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.4.1
-Release:   4
+Release:   4.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -72,6 +72,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jul  6 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-4
 - mga.xinf updates.  Add G200SE cards, remove Impression and Mistral IDs
   (since they do not and never have worked), and comment each line with



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:03:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:03:44 -0400
Subject: rpms/xorg-x11-drv-microtouch/devel xorg-x11-drv-microtouch.spec,
	1.11, 1.12
Message-ID: <200607120903.k6C93iwO023860@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-microtouch.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-microtouch.spec	28 Jun 2006 11:29:56 -0000	1.11
+++ xorg-x11-drv-microtouch.spec	12 Jul 2006 09:03:32 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/microtouch.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:04:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:04:00 -0400
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.15,1.16
Message-ID: <200607120904.k6C940ii023961@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
bumped for rebuild


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-mouse.spec	28 Jun 2006 11:08:00 -0000	1.15
+++ xorg-x11-drv-mouse.spec	12 Jul 2006 09:03:58 -0000	1.16
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version:   1.1.1
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -56,6 +56,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 15 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1
 - Update to 1.1.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:04:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:04:15 -0400
Subject: rpms/xorg-x11-drv-neomagic/devel xorg-x11-drv-neomagic.spec, 1.10,
	1.11
Message-ID: <200607120904.k6C94FqB024092@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-neomagic.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-neomagic.spec	28 Jun 2006 11:08:44 -0000	1.10
+++ xorg-x11-drv-neomagic.spec	12 Jul 2006 09:04:13 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.1.1
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:04:53 -0400
Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.11,1.12
Message-ID: <200607120904.k6C94rOx024228@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-nsc.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nsc.spec	28 Jun 2006 11:11:18 -0000	1.11
+++ xorg-x11-drv-nsc.spec	12 Jul 2006 09:04:40 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
 Version:   2.8.1
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 2.8.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:05:24 -0400
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.23,1.24
Message-ID: <200607120905.k6C95OOE024388@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
bumped for rebuild


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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-nv.spec	7 Jul 2006 23:08:40 -0000	1.23
+++ xorg-x11-drv-nv.spec	12 Jul 2006 09:05:21 -0000	1.24
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   1%{?dist}
+Release:   1.1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -65,6 +65,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc6
 - Add %{?dist} and rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:06:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:06:02 -0400
Subject: rpms/xorg-x11-drv-palmax/devel xorg-x11-drv-palmax.spec,1.10,1.11
Message-ID: <200607120906.k6C9628o024528@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-palmax.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-palmax.spec	28 Jun 2006 11:12:01 -0000	1.10
+++ xorg-x11-drv-palmax.spec	12 Jul 2006 09:06:00 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 palmax input driver
 Name:      xorg-x11-drv-palmax
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/palmax.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:06:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:06:34 -0400
Subject: rpms/xorg-x11-drv-penmount/devel xorg-x11-drv-penmount.spec, 1.12,
	1.13
Message-ID: <200607120906.k6C96YG3024690@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-penmount.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-penmount.spec	28 Jun 2006 11:28:43 -0000	1.12
+++ xorg-x11-drv-penmount.spec	12 Jul 2006 09:06:31 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
 Version:   1.1.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-2
 - Actually build 1.1.0 for FC6.
 - Remove mandir ownership from package.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:07:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:07:17 -0400
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.12,
	1.13
Message-ID: <200607120907.k6C97HiX024838@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-rendition.spec	28 Jun 2006 11:27:35 -0000	1.12
+++ xorg-x11-drv-rendition.spec	12 Jul 2006 09:07:13 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 rendition video driver
 Name:      xorg-x11-drv-rendition
 Version:   4.1.0
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-3
 - Build on x86_64.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:07:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:07:21 -0400
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.14,1.15
Message-ID: <200607120907.k6C97L1i024864@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
bumped for rebuild


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-s3.spec	28 Jun 2006 11:28:10 -0000	1.14
+++ xorg-x11-drv-s3.spec	12 Jul 2006 09:07:19 -0000	1.15
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
 Version:   0.4.1
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 #%{_mandir}/man4/s3.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.4.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:08:08 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.153,1.154
Message-ID: <200607120908.k6C988S8024956@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	glibc-kernheaders.spec 
Log Message:
neuter package -- don't provide or obsolete kernel-headers


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- glibc-kernheaders.spec	12 Jul 2006 05:57:30 -0000	1.153
+++ glibc-kernheaders.spec	12 Jul 2006 09:08:05 -0000	1.154
@@ -3,12 +3,12 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 45.1
+Release: 45.2
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
-Obsoletes: kernel-headers
-Provides: kernel-headers = %{KVER}
+#Obsoletes: kernel-headers
+#Provides: kernel-headers = %{KVER}
 Prereq: fileutils initscripts >= 5.83
 BuildRequires: unifdef
 %undefine _enable_debug_packages
@@ -108,7 +108,10 @@
 /usr/include/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-45.1
+* Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45.2
+- Neuter package until it's killed off properly.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 3.0-45.1
 - rebuild
 
 * Tue Jun 20 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:08:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:08:33 -0400
Subject: rpms/xorg-x11-drv-s3virge/devel xorg-x11-drv-s3virge.spec, 1.11,
	1.12
Message-ID: <200607120908.k6C98Xdb025079@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-s3virge.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-s3virge.spec	28 Jun 2006 11:14:45 -0000	1.11
+++ xorg-x11-drv-s3virge.spec	12 Jul 2006 09:08:20 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
 Version:   1.9.1
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.9.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:09:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:09:01 -0400
Subject: rpms/xorg-x11-drv-siliconmotion/devel
	xorg-x11-drv-siliconmotion.spec, 1.10, 1.11
Message-ID: <200607120909.k6C991al025271@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-siliconmotion.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-siliconmotion.spec	28 Jun 2006 11:16:23 -0000	1.10
+++ xorg-x11-drv-siliconmotion.spec	12 Jul 2006 09:08:47 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 siliconmotion video driver
 Name:      xorg-x11-drv-siliconmotion
 Version: 1.4.1
-Release: 2
+Release: 2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.4.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:09:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:09:38 -0400
Subject: rpms/xorg-x11-drv-sis/devel xorg-x11-drv-sis.spec,1.13,1.14
Message-ID: <200607120909.k6C99cJq025460@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-sis.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-sis.spec	28 Jun 2006 11:16:41 -0000	1.13
+++ xorg-x11-drv-sis.spec	12 Jul 2006 09:09:35 -0000	1.14
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.9.1
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -64,6 +64,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-3
 - Added "BuildRequires: libdrm-devel >= 2.0-1" for (#192358)
 - Bumped sdk dep to pick up proto-devel indirectly.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:11:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:11:00 -0400
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.13,1.14
Message-ID: <200607120911.k6C9B01l025742@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-sisusb.spec	29 Jun 2006 19:41:57 -0000	1.13
+++ xorg-x11-drv-sisusb.spec	12 Jul 2006 09:10:57 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version:   0.8.1
-Release:   4
+Release:   4.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 29 2006 Adam Jackson <ajackson at redhat.com> 0.8.1-4
 - Add builds for ppc and ia64 to satisfy xorg-x11-drivers
   dependencies.  Highly untested.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:11:08 -0400
Subject: rpms/xorg-x11-drv-spaceorb/devel xorg-x11-drv-spaceorb.spec, 1.10,
	1.11
Message-ID: <200607120911.k6C9B8p4025830@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-spaceorb.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-spaceorb.spec	28 Jun 2006 11:17:12 -0000	1.10
+++ xorg-x11-drv-spaceorb.spec	12 Jul 2006 09:11:06 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 spaceorb input driver
 Name:      xorg-x11-drv-spaceorb
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:11:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:11:33 -0400
Subject: rpms/xorg-x11-drv-summa/devel xorg-x11-drv-summa.spec,1.10,1.11
Message-ID: <200607120911.k6C9BX4N025944@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-summa.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-summa.spec	28 Jun 2006 11:17:26 -0000	1.10
+++ xorg-x11-drv-summa.spec	12 Jul 2006 09:11:31 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 summa input driver
 Name:      xorg-x11-drv-summa
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:12:04 -0400
Subject: rpms/xorg-x11-drv-tdfx/devel xorg-x11-drv-tdfx.spec,1.13,1.14
Message-ID: <200607120912.k6C9C4D0026100@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-tdfx.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-tdfx.spec	28 Jun 2006 11:17:42 -0000	1.13
+++ xorg-x11-drv-tdfx.spec	12 Jul 2006 09:12:01 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
 Version:   1.2.1
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.2,1-3
 - Added "BuildRequires: libdrm-devel >= 2.0-1" for (#192358)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:12:22 -0400
Subject: rpms/xorg-x11-drv-tek4957/devel xorg-x11-drv-tek4957.spec,1.6,1.7
Message-ID: <200607120912.k6C9CMn3026238@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-tek4957.spec 
Log Message:
bumped for rebuild


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-tek4957.spec	10 Apr 2006 03:25:58 -0000	1.6
+++ xorg-x11-drv-tek4957.spec	12 Jul 2006 09:12:20 -0000	1.7
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 tek4957 input driver
 Name:      xorg-x11-drv-tek4957
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -78,6 +78,9 @@
 %{_mandir}/man4/tek4957.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:13:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:13:04 -0400
Subject: rpms/xorg-x11-drv-trident/devel xorg-x11-drv-trident.spec, 1.11,
	1.12
Message-ID: <200607120913.k6C9D47x026389@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-trident.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-trident.spec	28 Jun 2006 11:17:58 -0000	1.11
+++ xorg-x11-drv-trident.spec	12 Jul 2006 09:13:00 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 trident video driver
 Name:      xorg-x11-drv-trident
 Version:   1.2.1
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:13:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:13:49 -0400
Subject: rpms/xorg-x11-drv-tseng/devel xorg-x11-drv-tseng.spec,1.11,1.12
Message-ID: <200607120913.k6C9Dnc4026556@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-tseng.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-tseng.spec	28 Jun 2006 11:18:12 -0000	1.11
+++ xorg-x11-drv-tseng.spec	12 Jul 2006 09:13:44 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tseng video driver
 Name:      xorg-x11-drv-tseng
 Version:   1.1.0
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@
 %{_mandir}/man4/tseng.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu May 25 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
 - Added "BuildRequires: xorg-x11-proto-devel" for (#192385)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:14:15 -0400
Subject: rpms/xorg-x11-drv-ur98/devel xorg-x11-drv-ur98.spec,1.9,1.10
Message-ID: <200607120914.k6C9EFAl026672@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-ur98.spec 
Log Message:
bumped for rebuild


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-ur98.spec	28 Jun 2006 11:18:32 -0000	1.9
+++ xorg-x11-drv-ur98.spec	12 Jul 2006 09:14:11 -0000	1.10
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ur98 input driver
 Name:      xorg-x11-drv-ur98
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/ur98.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:14:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:14:42 -0400
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.13,1.14
Message-ID: <200607120914.k6C9Eg66026839@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-vesa.spec	17 Jun 2006 08:09:50 -0000	1.13
+++ xorg-x11-drv-vesa.spec	12 Jul 2006 09:14:40 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.2.1
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 1.2.1-1
 - Updated to version 1.2.1 for X11R7.1 server.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:15:21 -0400
Subject: rpms/xorg-x11-drv-vga/devel xorg-x11-drv-vga.spec,1.12,1.13
Message-ID: <200607120915.k6C9FLvI027037@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-vga.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-vga.spec	28 Jun 2006 11:20:29 -0000	1.12
+++ xorg-x11-drv-vga.spec	12 Jul 2006 09:15:18 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.1.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:15:52 -0400
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.16,1.17
Message-ID: <200607120915.k6C9FqTK027198@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
bumped for rebuild


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-via.spec	28 Jun 2006 11:20:44 -0000	1.16
+++ xorg-x11-drv-via.spec	12 Jul 2006 09:15:50 -0000	1.17
@@ -15,7 +15,7 @@
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.1
-Release:   4
+Release:   4.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -100,6 +100,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jun 19 2006 Mike A. Harris <mharris at redhat.com> 0.2.1-4
 - Updated via.xinf to fix numerous errors an inaccuracies (#195806)
 - Conditionalized DRI support by adding with_dri macro.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:16:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:16:30 -0400
Subject: rpms/xorg-x11-drv-vmmouse/devel xorg-x11-drv-vmmouse.spec,1.8,1.9
Message-ID: <200607120916.k6C9GUkg028371@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-vmmouse.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-vmmouse.spec	28 Jun 2006 11:20:51 -0000	1.8
+++ xorg-x11-drv-vmmouse.spec	12 Jul 2006 09:16:28 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vmmouse input driver
 Name:      xorg-x11-drv-vmmouse
 Version:   12.4.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,6 +54,9 @@
 %{_mandir}/man4/vmmouse.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 12.4.0-1
 - Update to 12.4.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:17:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:17:16 -0400
Subject: rpms/xorg-x11-drv-vmware/devel xorg-x11-drv-vmware.spec,1.10,1.11
Message-ID: <200607120917.k6C9HGLS031241@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-vmware.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-vmware.spec	28 Jun 2006 11:21:17 -0000	1.10
+++ xorg-x11-drv-vmware.spec	12 Jul 2006 09:17:13 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
 Version:   10.13.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 10.13.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:17:25 -0400
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.13,1.14
Message-ID: <200607120917.k6C9HPQL031934@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-void.spec	28 Jun 2006 16:11:31 -0000	1.13
+++ xorg-x11-drv-void.spec	12 Jul 2006 09:17:23 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version:   1.1.0
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,6 +54,9 @@
 %{_mandir}/man4/void.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
 - Remove system owned directories from file manifest.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:17:48 -0400
Subject: rpms/xorg-x11-drv-voodoo/devel xorg-x11-drv-voodoo.spec,1.12,1.13
Message-ID: <200607120917.k6C9Hm14000778@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-voodoo.spec 
Log Message:
bumped for rebuild


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-voodoo.spec	28 Jun 2006 11:21:49 -0000	1.12
+++ xorg-x11-drv-voodoo.spec	12 Jul 2006 09:17:46 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
 Version:   1.1.0
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-3
 - Bumped sdk dep to pick up proto-devel indirectly.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:18:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:18:07 -0400
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.20,1.21
Message-ID: <200607120918.k6C9I70k001395@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1233

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
bumped for rebuild


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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-font-utils.spec	28 Jun 2006 10:32:20 -0000	1.20
+++ xorg-x11-font-utils.spec	12 Jul 2006 09:18:05 -0000	1.21
@@ -16,7 +16,7 @@
 # NOTE: Keep version set to the X11Rx.y release the package is based upon.
 Version: 7.1
 # Bump release for updates.
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -154,6 +154,9 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1
 - Update to font-util-1.0.1 from X11R7.1
 - Set package version to X11 release the tarballs are based from.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:18:23 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.34,
	1.35
Message-ID: <200607120918.k6C9INpx002226@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
bumped for rebuild


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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-proto-devel.spec	28 Jun 2006 10:29:55 -0000	1.34
+++ xorg-x11-proto-devel.spec	12 Jul 2006 09:18:21 -0000	1.35
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 2
+Release: 2.1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -275,6 +275,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
 - Update to xproto 7.0.7 for X11R7.1
 - Use "make install" instead of makeinstall macro.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:18:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:18:46 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.14,1.15
Message-ID: <200607120918.k6C9Ikck003153@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-resutils.spec	28 Jun 2006 10:29:26 -0000	1.14
+++ xorg-x11-resutils.spec	12 Jul 2006 09:18:44 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -90,6 +90,9 @@
 %{_mandir}/man1/viewres.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bump package version to 7.1 to match the X11 release the packages were
   last synced with.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:19:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:19:04 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.114,1.115
Message-ID: <200607120919.k6C9J4mt003823@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- xorg-x11-server.spec	11 Jul 2006 19:04:00 -0000	1.114
+++ xorg-x11-server.spec	12 Jul 2006 09:19:02 -0000	1.115
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   3%{?dist}
+Release:   3.1%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -638,6 +638,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3.fc6
 - Enable DPMS by default.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:19:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:19:29 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.22,
	1.23
Message-ID: <200607120919.k6C9JThu004938@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4650

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
bumped for rebuild


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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xorg-x11-server-utils.spec	28 Jun 2006 10:25:54 -0000	1.22
+++ xorg-x11-server-utils.spec	12 Jul 2006 09:19:27 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -204,6 +204,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
 - Update to rgb-1.0.2 from X11R7.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:19:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:19:37 -0400
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.15,1.16
Message-ID: <200607120919.k6C9JbiJ005359@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-twm.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-twm.spec	28 Jun 2006 10:25:26 -0000	1.15
+++ xorg-x11-twm.spec	12 Jul 2006 09:19:35 -0000	1.16
@@ -5,7 +5,7 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
 - Bump and rebuild with minor specfile cleanups.
 - Add documentation to doc list, even though half of it is 0 bytes. Ah well.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:19:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:19:50 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.14,
	1.15
Message-ID: <200607120919.k6C9Jo29006016@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5923

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
bumped for rebuild


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-util-macros.spec	28 Jun 2006 10:25:05 -0000	1.14
+++ xorg-x11-util-macros.spec	12 Jul 2006 09:19:47 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.2
-Release: 1
+Release: 1.1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -38,6 +38,9 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1
 - Update to util-macros-1.0.2 from X11R7.1
 - Added COPYING, ChangeLog to file manifest.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:20:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:20:34 -0400
Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.14,1.15
Message-ID: <200607120920.k6C9KYMI009783@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-utils.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-utils.spec	28 Jun 2006 10:24:43 -0000	1.14
+++ xorg-x11-utils.spec	12 Jul 2006 09:20:32 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -124,6 +124,9 @@
 %{_mandir}/man1/xwininfo.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1
 - Bump package version to 7.1 to reflect the X11 release the utilities
   are aggregated from.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:20:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:20:51 -0400
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.12,1.13
Message-ID: <200607120920.k6C9KpxY011212@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xauth.spec	28 Jun 2006 10:24:03 -0000	1.12
+++ xorg-x11-xauth.spec	12 Jul 2006 09:20:49 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X authority utilities
 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
@@ -66,6 +66,9 @@
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Add missing documentation to doc manifest.
 - Use "make install" instead of makeinstall macro.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:21:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:21:09 -0400
Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.14,1.15
Message-ID: <200607120921.k6C9L9XH011303@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xbitmaps.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xbitmaps.spec	28 Jun 2006 10:21:26 -0000	1.14
+++ xorg-x11-xbitmaps.spec	12 Jul 2006 09:21:06 -0000	1.15
@@ -5,7 +5,7 @@
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 4
+Release: 4.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -51,6 +51,9 @@
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
 - Bump release and rebuild for FC6.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:21:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:21:41 -0400
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.26,1.27
Message-ID: <200607120921.k6C9LfNa011504@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-xfs.spec	28 Jun 2006 10:19:31 -0000	1.26
+++ xorg-x11-xfs.spec	12 Jul 2006 09:21:39 -0000	1.27
@@ -9,7 +9,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: %{xfs_version}
-Release: 3
+Release: 3.1
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -281,6 +281,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.2-3
 - Added xfs documentation to doc macro.
 - Use "make install" instead of makeinstall macro.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:22:19 -0400
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.13,1.14
Message-ID: <200607120922.k6C9MJIX011699@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xfwp.spec	28 Jun 2006 10:23:11 -0000	1.13
+++ xorg-x11-xfwp.spec	12 Jul 2006 09:22:16 -0000	1.14
@@ -5,7 +5,7 @@
 Name: xorg-x11-%{pkgname}
 # NOTE: The package version should always be the upstream xfwp tarball version.
 Version: %{xfwp_version}
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -91,6 +91,9 @@
 %{_mandir}/man1/xfwp.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Add BuildRequires on autoconf/automake for brew.
 - Use "make install DESTDIR=..." instead of makeinstall macro.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:22:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:22:33 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.23,1.24
Message-ID: <200607120922.k6C9MX1Z011820@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-xinit.spec	5 Jul 2006 06:46:08 -0000	1.23
+++ xorg-x11-xinit.spec	12 Jul 2006 09:22:30 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 5%{?dist}
+Release: 5.1%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -96,6 +96,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5.fc6
 - Implemented changes to xinput.sh based on suggestions from (#194458)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:22:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:22:48 -0400
Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.15,1.16
Message-ID: <200607120922.k6C9MmA8012004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11938

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
bumped for rebuild


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xkb-utils.spec	28 Jun 2006 10:17:15 -0000	1.15
+++ xorg-x11-xkb-utils.spec	12 Jul 2006 09:22:46 -0000	1.16
@@ -10,7 +10,7 @@
 Version: 1.0.2
 # NOTE: Bump the release field when updating xkbcomp/xkbevd/xkbprint/setxkbmap,
 # as the package version is supposed to be the xkbutils version.
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -110,6 +110,9 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-2
 - Added xkbutils_version macro, which can be used in the Version field
   in the future, to help prevent accidental bumping of the package version.



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:22:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:22:50 -0400
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.14,1.15
Message-ID: <200607120922.k6C9MoTq012028@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xsm.spec	28 Jun 2006 10:16:22 -0000	1.14
+++ xorg-x11-xsm.spec	12 Jul 2006 09:22:47 -0000	1.15
@@ -5,7 +5,7 @@
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -133,6 +133,9 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3
 - Added xsm documentation to doc macro.
 - The 1.0.2-1 build had the version accidentally bumped to 1.0.2 before



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:23:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:23:24 -0400
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.16,
	1.17
Message-ID: <200607120923.k6C9NOUp012178@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
bumped for rebuild


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-xtrans-devel.spec	10 Jul 2006 09:41:22 -0000	1.16
+++ xorg-x11-xtrans-devel.spec	12 Jul 2006 09:23:22 -0000	1.17
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -57,6 +57,9 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1.fc6
 - Update to xtrans-1.0.1
 - Remove xtrans-1.0.0-setuid.diff as it is included in 1.0.1



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:23:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:23:37 -0400
Subject: rpms/xpdf/devel xpdf.spec,1.77,1.78
Message-ID: <200607120923.k6C9NbCg012301@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12276

Modified Files:
	xpdf.spec 
Log Message:
bumped for rebuild


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xpdf.spec	28 Jun 2006 15:40:13 -0000	1.77
+++ xpdf.spec	12 Jul 2006 09:23:35 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 14
+Release: 14.1
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -160,6 +160,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-14.1
+- rebuild
+
 * Wed Jun 28 2006 Than Ngo <than at redhat.com> 1:3.01-14
 - fix #197090, BR: autoconf
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:23:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:23:47 -0400
Subject: rpms/xrestop/devel xrestop.spec,1.9,1.10
Message-ID: <200607120923.k6C9NlWb012405@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xrestop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12379

Modified Files:
	xrestop.spec 
Log Message:
bumped for rebuild


Index: xrestop.spec
===================================================================
RCS file: /cvs/dist/rpms/xrestop/devel/xrestop.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xrestop.spec	11 Feb 2006 06:32:01 -0000	1.9
+++ xrestop.spec	12 Jul 2006 09:23:44 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X Resource Monitor
 Name: xrestop
 Version: 0.2
-Release: 6.2.1
+Release: 6.2.2
 License: GPL
 Group: Development/Tools
 URL: http://www.freedesktop.org/Software/xrestop
@@ -41,6 +41,9 @@
 %{_mandir}/man1/xrestop.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2-6.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2-6.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:23:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:23:59 -0400
Subject: rpms/xsane/devel xsane.spec,1.35,1.36
Message-ID: <200607120923.k6C9NxYH012524@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12491

Modified Files:
	xsane.spec 
Log Message:
bumped for rebuild


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xsane.spec	8 Jun 2006 15:18:47 -0000	1.35
+++ xsane.spec	12 Jul 2006 09:23:56 -0000	1.36
@@ -3,7 +3,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 5
+Release: 5.1
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Source2: xsane.desktop
@@ -112,6 +112,9 @@
 exit 0
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99-5.1
+- rebuild
+
 * Thu Jun 08 2006 Nils Philippsen <nphilipp at redhat.com> - 0.99-5
 - re-add desktop file (#170835)
 - use %%buildroot consistently



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:24:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:24:16 -0400
Subject: rpms/xsri/devel xsri.spec,1.14,1.15
Message-ID: <200607120924.k6C9OGq5012644@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12572

Modified Files:
	xsri.spec 
Log Message:
bumped for rebuild


Index: xsri.spec
===================================================================
RCS file: /cvs/dist/rpms/xsri/devel/xsri.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xsri.spec	11 Feb 2006 06:35:48 -0000	1.14
+++ xsri.spec	12 Jul 2006 09:24:14 -0000	1.15
@@ -2,7 +2,7 @@
 Summary:   X Set Root Image
 Name:      xsri
 Version:   2.1.0
-Release: 9.2.1
+Release: 9.2.2
 Epoch:     1
 License:   GPL
 Group:     System Environment/Base
@@ -35,6 +35,9 @@
 %{_bindir}/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:24:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:24:31 -0400
Subject: rpms/xterm/devel xterm.spec,1.44,1.45
Message-ID: <200607120924.k6C9OVTm012794@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12739

Modified Files:
	xterm.spec 
Log Message:
bumped for rebuild


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xterm.spec	11 Jul 2006 21:16:16 -0000	1.44
+++ xterm.spec	12 Jul 2006 09:24:28 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 213
-Release: 2%{?dist}
+Release: 2.1%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -140,6 +140,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 213-2.1
+- rebuild
+
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 213-2.fc6
 - Use correct dist tag in Release string.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:24:37 -0400
Subject: rpms/yaboot/devel yaboot.spec,1.35,1.36
Message-ID: <200607120924.k6C9ObV0012880@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12830

Modified Files:
	yaboot.spec 
Log Message:
bumped for rebuild


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- yaboot.spec	21 Feb 2006 22:25:57 -0000	1.35
+++ yaboot.spec	12 Jul 2006 09:24:35 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.18
+Release: 0.18.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.18.1
+- rebuild
+
 * Tue Feb 21 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-0.18
 - Drop telnet console patch for now (#182180)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:24:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:24:55 -0400
Subject: rpms/yelp/devel yelp.spec,1.64,1.65
Message-ID: <200607120924.k6C9OtdO013041@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13015

Modified Files:
	yelp.spec 
Log Message:
bumped for rebuild


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- yelp.spec	13 Jun 2006 19:29:59 -0000	1.64
+++ yelp.spec	12 Jul 2006 09:24:52 -0000	1.65
@@ -14,7 +14,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.15.3
-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
@@ -126,6 +126,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
+- rebuild
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:25:11 -0400
Subject: rpms/yp-tools/devel yp-tools.spec,1.20,1.21
Message-ID: <200607120925.k6C9PB5I013274@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13215

Modified Files:
	yp-tools.spec 
Log Message:
bumped for rebuild


Index: yp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- yp-tools.spec	13 Feb 2006 16:42:56 -0000	1.20
+++ yp-tools.spec	12 Jul 2006 09:25:08 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
 Version: 2.9
-Release: 0
+Release: 0.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %dir /var/yp
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9-0.1
+- rebuild
+
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 2.9-0
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:25:20 -0400
Subject: rpms/yum-metadata-parser/devel yum-metadata-parser.spec,1.4,1.5
Message-ID: <200607120925.k6C9PK4g013349@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yum-metadata-parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13319

Modified Files:
	yum-metadata-parser.spec 
Log Message:
bumped for rebuild


Index: yum-metadata-parser.spec
===================================================================
RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/yum-metadata-parser.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yum-metadata-parser.spec	15 Jun 2006 17:41:33 -0000	1.4
+++ yum-metadata-parser.spec	12 Jul 2006 09:25:17 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: A fast metadata parser for yum
 Name: yum-metadata-parser
 Version: 1.0
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz
 Patch0: yum-metadata-parser-1.0-quiet.patch
 Patch1: yum-metadata-parser-1.0-files.patch
@@ -46,6 +46,9 @@
 %{python_sitelib_platform}/sqlitecachec.pyo
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Thu Jun 15 2006 Paul Nasrat <pnasrat at redhat.com> - 1.0-7
 - add patch to correct population of packages.location_base
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:25:43 -0400
Subject: rpms/zip/devel zip.spec,1.22,1.23
Message-ID: <200607120925.k6C9PhHv013508@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13483

Modified Files:
	zip.spec 
Log Message:
bumped for rebuild


Index: zip.spec
===================================================================
RCS file: /cvs/dist/rpms/zip/devel/zip.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- zip.spec	11 Feb 2006 06:38:04 -0000	1.22
+++ zip.spec	12 Jul 2006 09:25:40 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP.
 Name: zip
 Version: 2.31
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.31-1.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.31-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:26:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:26:08 -0400
Subject: rpms/udev/devel udev-rules.patch,1.16,1.17 udev.spec,1.175,1.176
Message-ID: <200607120926.k6C9Q8jG013733@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13609

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- more infiniband rules (bug #198501)

udev-rules.patch:
 50-udev.rules |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- udev-rules.patch	14 Jun 2006 10:20:49 -0000	1.16
+++ udev-rules.patch	12 Jul 2006 09:26:05 -0000	1.17
@@ -0,0 +1,25 @@
+--- udev-095/etc/udev/redhat/50-udev.rules.rhrules	2006-07-12 11:20:05.000000000 +0200
++++ udev-095/etc/udev/redhat/50-udev.rules	2006-07-12 11:19:47.000000000 +0200
+@@ -217,8 +217,11 @@
+ KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
+ KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
+ 
+-KERNEL=="umad*", 		NAME="infiniband/%k"
+-KERNEL=="issm*", 		NAME="infiniband/%k"
++KERNEL=="umad*", 		NAME="infiniband/%k", MODE="0660"
++KERNEL=="issm*", 		NAME="infiniband/%k", MODE="0660"
++KERNEL=="uverbs*",              NAME="infiniband/%k", MODE="0660"
++KERNEL=="ucm*",                 NAME="infiniband/%k", MODE="0660"
++KERNEL=="rdma_cm",              NAME="infiniband/%k", MODE="0660"
+ 
+ # Section for zaptel device
+ KERNEL=="zapctl",     		NAME="zap/ctl"
+@@ -229,8 +232,6 @@
+ 
+ KERNEL=="pktcdvd", NAME="%k/control"
+ 
+-
+-
+ KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+ 	SYSFS{device/media}=="floppy", \
+ 	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- udev.spec	12 Jul 2006 08:35:18 -0000	1.175
+++ udev.spec	12 Jul 2006 09:26:05 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -325,6 +325,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+<<<<<<< udev.spec
+* Wed Jul 12 2006 Harald Hoyer <harald at redhat.com> - 095-3
+- more infiniband rules (bug #198501)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 095-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:26:21 -0400
Subject: rpms/zisofs-tools/devel zisofs-tools.spec,1.14,1.15
Message-ID: <200607120926.k6C9QLtj013823@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zisofs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13723

Modified Files:
	zisofs-tools.spec 
Log Message:
bumped for rebuild


Index: zisofs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/zisofs-tools/devel/zisofs-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- zisofs-tools.spec	11 Feb 2006 06:38:18 -0000	1.14
+++ zisofs-tools.spec	12 Jul 2006 09:26:19 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utilities for creating compressed CD-ROM filesystems.
 Name: zisofs-tools
 Version: 1.0.6
-Release: 3.2.1
+Release: 3.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-3.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:26:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:26:39 -0400
Subject: rpms/zsh/devel zsh.spec,1.25,1.26
Message-ID: <200607120926.k6C9Qdos013999@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13972

Modified Files:
	zsh.spec 
Log Message:
bumped for rebuild


Index: zsh.spec
===================================================================
RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- zsh.spec	11 Feb 2006 06:38:42 -0000	1.25
+++ zsh.spec	12 Jul 2006 09:26:36 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.5
-Release: 1.2.2
+Release: 1.2.2.1
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -140,6 +140,9 @@
 %doc Doc/zsh/*.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5-1.2.2.1
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:27:04 -0400
Subject: rpms/udev/devel udev.spec,1.176,1.177
Message-ID: <200607120927.k6C9R4Bh014196@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14121

Modified Files:
	udev.spec 
Log Message:
- more infiniband rules (bug #198501)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- udev.spec	12 Jul 2006 09:26:05 -0000	1.176
+++ udev.spec	12 Jul 2006 09:27:01 -0000	1.177
@@ -325,7 +325,6 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
-<<<<<<< udev.spec
 * Wed Jul 12 2006 Harald Hoyer <harald at redhat.com> - 095-3
 - more infiniband rules (bug #198501)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:29:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:29:50 -0400
Subject: rpms/brltty/devel .cvsignore, 1.3, 1.4 brltty.spec, 1.15,
	1.16 sources, 1.3, 1.4
Message-ID: <200607120929.k6C9ToCh015095@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15035

Modified Files:
	.cvsignore brltty.spec sources 
Log Message:
* Wed Jul 12 2006 Petr Rockai <prockai at redhat.com> - 3.7.2-1
- upgrade to latest upstream version
- split off brlapi and brlapi-devel packages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Oct 2004 20:43:59 -0000	1.3
+++ .cvsignore	12 Jul 2006 09:29:45 -0000	1.4
@@ -1,2 +1 @@
-brltty-3.2.tar.gz
-brltty-3.6.tar.gz
+brltty-3.7.2.tar.gz


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- brltty.spec	12 Jul 2006 05:29:13 -0000	1.15
+++ brltty.spec	12 Jul 2006 09:29:47 -0000	1.16
@@ -1,6 +1,6 @@
 Name: brltty
-Version: 3.2
-Release: 12.1
+Version: 3.7.2
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -18,27 +18,54 @@
 and provides complete screen review functionality.
 Some speech capability has also been incorporated.
 
+%package -n brlapi
+Version: 0.4.1
+Group: Applications/System
+License: LGPL
+Summary: Appliation Programming Interface for BRLTTY.
+%description -n brlapi
+This package provides the run-time support for the Application
+Programming Interface to BRLTTY.
+
+Install this package if you have an application which directly accesses
+a refreshable braille display.
+
+%package -n brlapi-devel
+Version: 0.4.1
+Group: Development/System
+License: LGPL
+Requires: brlapi = 0.4.1
+
+Summary: Headers, static archive, and documentation for BrlAPI.
+%description -n brlapi-devel
+This package provides the header files, static archive, shared object
+linker reference, and reference documentation for BrlAPI (the
+Application Programming Interface to BRLTTY).  It enables the
+implementation of applications which take direct advantage of a
+refreshable braille display in order to present information in ways
+which are more appropriate for blind users and/or to provide user
+interfaces which are more specifically atuned to their needs.
+
+Install this package if you are developing or maintaining an application
+which directly accesses a refreshable braille display.
+
 %prep
-%setup -n %{name}-%{version}
+%setup -n brltty-3.7.2
 
 %build
-%configure --with-install-root="${RPM_BUILD_ROOT}"
+%configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
 make
 
-directory="doc"
-mkdir -p "${directory}"
-for file in `find . -path "./${directory}" -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' \) -print`
+for file in $(find . \( -path ./doc -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o -name \*.patch -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print)
 do
-   mkdir -p "${directory}/${file%/*}"
-   cp -rp "${file}" "${directory}/${file}"
+   mkdir -p "doc/${file%/*}"
+   cp -rp "${file}" "doc/${file}"
 done
 
 %install
-make install-programs install-help install-tables install-drivers install-manpage
+make install #install-programs install-help install-tables install-drivers install-manpage
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
-rm -f ${RPM_BUILD_ROOT}/bin/brltty
-rm -f ${RPM_BUILD_ROOT}/bin/install-brltty
-rm -rf ${RPM_BUILD_ROOT}/lib/brltty/*
+rm ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +83,7 @@
 done
 if $install
 then
-   device="`set -- ${devices} && echo "${1}"`"
+   device="$(set -- ${devices} && echo "${1}")"
    echo -n "Creating screen inspection device ${device}..."
    mkdir -p "${device%/*}"
    mknod -m o= "${device}" c 7 128
@@ -67,18 +94,36 @@
 
 %files
 %defattr(-,root,root)
+%config(noreplace) /etc/brltty.conf
+%{_bindir}/brltty
+%{_bindir}/brltty-*
+%{_libdir}/brltty
+/etc/brltty
 %doc COPYING
 %doc Documents/ChangeLog Documents/TODO
 %doc Bootdisks/rhmkboot Bootdisks/rhmkroot
 %doc doc/*
 %doc /usr/share/man/man1/*
-%config(noreplace) /etc/brltty.conf
-%{_bindir}/brltty
-%{_bindir}/install-brltty
-%{_libdir}/brltty/*
-/etc/brltty
+
+%files -n brlapi
+%defattr(-,root,root)
+%{_libdir}/libbrlapi.so.*
+%doc Documents/BrlAPI.sgml Documents/BrlAPI.txt Documents/BrlAPI-HTML
+%doc Documents/README.Gnopernicus
+
+%files -n brlapi-devel
+%defattr(-,root,root)
+%{_libdir}/libbrlapi.a
+%{_libdir}/libbrlapi.so
+%{_includedir}/brltty
+%doc %{_mandir}/man3/*
+%doc Documents/BrlAPIref-HTML
 
 %changelog
+* Wed Jul 12 2006 Petr Rockai <prockai at redhat.com> - 3.7.2-1
+- upgrade to latest upstream version
+- split off brlapi and brlapi-devel packages
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-12.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Oct 2004 20:43:59 -0000	1.3
+++ sources	12 Jul 2006 09:29:47 -0000	1.4
@@ -1,2 +1 @@
-fd87518e19657109987832cf7134958c  brltty-3.2.tar.gz
-98790932a3cbc78d507bfa90a7e11f8c  brltty-3.6.tar.gz
+0ae3da8252783a4d20e1ed4e55cede5b  brltty-3.7.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:38:00 -0400
Subject: rpms/brltty/devel brltty.spec,1.16,1.17
Message-ID: <200607120938.k6C9c0In016738@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16642

Modified Files:
	brltty.spec 
Log Message:
Add glibc-kernheaders to buildrequires, add %{?dist} to release.



Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- brltty.spec	12 Jul 2006 09:29:47 -0000	1.16
+++ brltty.spec	12 Jul 2006 09:37:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name: brltty
 Version: 3.7.2
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -8,7 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
 Summary: Braille display driver for Linux/Unix.
 Requires(post): coreutils
-BuildRequires: byacc
+BuildRequires: byacc, glibc-kernheaders
 
 %description
 BRLTTY is a background process (daemon) which provides



From fedora-cvs-commits at redhat.com  Wed Jul 12 09:58:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 05:58:59 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.37,1.38
Message-ID: <200607120958.k6C9wwhN004195@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4170

Modified Files:
	glib-java.spec 
Log Message:
- Release 0 is not allowed; use %{?dist}


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- glib-java.spec	12 Jul 2006 05:57:42 -0000	1.37
+++ glib-java.spec	12 Jul 2006 09:58:56 -0000	1.38
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.1
+Release:   1%{?dist}
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -116,6 +116,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-1
+- Release 0 is not allowed; use %{?dist}
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 10:17:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 06:17:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2377,1.2378
Message-ID: <200607121017.k6CAHs1W023490@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Disable headers subpackage for noarch build


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2377
retrieving revision 1.2378
diff -u -r1.2377 -r1.2378
--- kernel-2.6.spec	12 Jul 2006 05:27:03 -0000	1.2377
+++ kernel-2.6.spec	12 Jul 2006 10:17:51 -0000	1.2378
@@ -53,6 +53,7 @@
 %ifarch noarch
 %define builddoc 1
 %define buildup 0
+%define buildheaders 0
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
@@ -1597,6 +1598,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
+- No headers subpackage for noarch build
+
 * Wed Jul 12 2006 Dave Jones <davej at redhat.com>
 - Add sleazy fpu optimisation.   Apps that heavily
   use floating point in theory should get faster.



From fedora-cvs-commits at redhat.com  Wed Jul 12 10:22:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 06:22:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2378,1.2379
Message-ID: <200607121022.k6CAMF2H025157@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Build separate debuginfo subpackages instead of a single one.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2378
retrieving revision 1.2379
diff -u -r1.2378 -r1.2379
--- kernel-2.6.spec	12 Jul 2006 10:17:51 -0000	1.2378
+++ kernel-2.6.spec	12 Jul 2006 10:22:12 -0000	1.2379
@@ -1275,6 +1275,55 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
+
+###
+### Special hacks for debuginfo subpackages.
+###
+
+# This macro is used by %%install, so we must redefine it before that.
+%define debug_package %{nil}
+
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%global __debug_package 1
+%package debuginfo-common
+Summary: Kernel source files used by %{name}-debuginfo packages
+Group: Development/Debug
+Provides: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+
+%description debuginfo-common
+This package is required by %{name}-debuginfo subpackages.
+It provides the kernel source files common to all builds.
+
+%files debuginfo-common
+%defattr(-,root,root)
+/usr/src/debug/%{name}-%{KVERREL}
+%dir /usr/src/debug
+%dir /usr/lib/debug
+%dir /usr/lib/debug/lib
+%dir /usr/lib/debug/lib/modules
+%endif
+%endif
+
+%define build_debuginfo() %{?_enable_debug_packages:\
+%ifnarch noarch\
+%package %{?1:%{1}-}debuginfo\
+Summary: Debug information for package %{name}%{?1:-%{1}}\
+Group: Development/Debug\
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}\
+Provides: %{name}-%{?1:%{1}-}debuginfo-%{_target_cpu} = %{KVERREL}\
+%description %{?1:%{1}-}debuginfo\
+This package provides debug information for package %{name}%{?1:-%{1}}.\
+This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
+%files %{?1:%{1}-}debuginfo\
+%defattr(-,root,root)\
+/usr/lib/debug/%{image_install_path}/*-%{KVERREL}%{1}\
+/usr/lib/debug/lib/modules/%{KVERREL}%{1}\
+%endif\
+}\
+%{nil}
+
+
 ###
 ### install
 ###
@@ -1442,6 +1491,7 @@
 ###
 
 %if %{buildup}
+%build_debuginfo
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1469,6 +1519,7 @@
 %endif
 
 %if %{buildpae}
+%build_debuginfo PAE
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1491,6 +1542,7 @@
 %endif
 
 %if %{buildsmp}
+%build_debuginfo smp
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1514,6 +1566,7 @@
 
 %if %{includexen}
 %if %{buildxen}
+%build_debuginfo xen
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1539,6 +1592,7 @@
 %endif
 
 %if %{buildxenPAE}
+%build_debuginfo xen-PAE
 %files xen-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
@@ -1567,6 +1621,7 @@
 %if %{buildkdump}
 
 %files kdump
+%build_debuginfo kdump
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
 /boot/System.map-%{KVERREL}kdump
@@ -1598,6 +1653,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Roland McGrath <roland at redhat.com>
+- Build separate debuginfo subpackages instead of a single one.
+
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - No headers subpackage for noarch build
 
@@ -1695,7 +1753,7 @@
 
 * Thu Jun 22 2006 Dave Jones <davej at redhat.com>
 - 2.6.17-git4
-- Update sysconfig/kernel on x86 %post - Robert Scheck (#196307)
+- Update sysconfig/kernel on x86 %%post - Robert Scheck (#196307)
 
 * Thu Jun 22 2006 David Woodhouse <dwmw2 at redhat.com>
 - MTD update
@@ -1983,7 +2041,7 @@
 - Enable DECNET to keep both users happy. (#120628)
 - Enable TPM modules. (#189020)
 - Enable some SGI specific ia64 options. (#188915)
-- Add missing -kdump %preuninstall (#189100)
+- Add missing -kdump %%preuninstall (#189100)
 
 * Mon Apr 17 2006 Juan Quintela <quintela at redhat.com>
 - enable xen again.



From fedora-cvs-commits at redhat.com  Wed Jul 12 10:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 06:27:33 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2379,1.2380
Message-ID: <200607121027.k6CARX1g027185@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Back out last spec change.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2379
retrieving revision 1.2380
diff -u -r1.2379 -r1.2380
--- kernel-2.6.spec	12 Jul 2006 10:22:12 -0000	1.2379
+++ kernel-2.6.spec	12 Jul 2006 10:27:31 -0000	1.2380
@@ -1275,55 +1275,6 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
-
-###
-### Special hacks for debuginfo subpackages.
-###
-
-# This macro is used by %%install, so we must redefine it before that.
-%define debug_package %{nil}
-
-%if "%{_enable_debug_packages}" == "1"
-%ifnarch noarch
-%global __debug_package 1
-%package debuginfo-common
-Summary: Kernel source files used by %{name}-debuginfo packages
-Group: Development/Debug
-Provides: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
-
-%description debuginfo-common
-This package is required by %{name}-debuginfo subpackages.
-It provides the kernel source files common to all builds.
-
-%files debuginfo-common
-%defattr(-,root,root)
-/usr/src/debug/%{name}-%{KVERREL}
-%dir /usr/src/debug
-%dir /usr/lib/debug
-%dir /usr/lib/debug/lib
-%dir /usr/lib/debug/lib/modules
-%endif
-%endif
-
-%define build_debuginfo() %{?_enable_debug_packages:\
-%ifnarch noarch\
-%package %{?1:%{1}-}debuginfo\
-Summary: Debug information for package %{name}%{?1:-%{1}}\
-Group: Development/Debug\
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}\
-Provides: %{name}-%{?1:%{1}-}debuginfo-%{_target_cpu} = %{KVERREL}\
-%description %{?1:%{1}-}debuginfo\
-This package provides debug information for package %{name}%{?1:-%{1}}.\
-This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
-%files %{?1:%{1}-}debuginfo\
-%defattr(-,root,root)\
-/usr/lib/debug/%{image_install_path}/*-%{KVERREL}%{1}\
-/usr/lib/debug/lib/modules/%{KVERREL}%{1}\
-%endif\
-}\
-%{nil}
-
-
 ###
 ### install
 ###
@@ -1491,7 +1442,6 @@
 ###
 
 %if %{buildup}
-%build_debuginfo
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1519,7 +1469,6 @@
 %endif
 
 %if %{buildpae}
-%build_debuginfo PAE
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1542,7 +1491,6 @@
 %endif
 
 %if %{buildsmp}
-%build_debuginfo smp
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1566,7 +1514,6 @@
 
 %if %{includexen}
 %if %{buildxen}
-%build_debuginfo xen
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1592,7 +1539,6 @@
 %endif
 
 %if %{buildxenPAE}
-%build_debuginfo xen-PAE
 %files xen-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
@@ -1621,7 +1567,6 @@
 %if %{buildkdump}
 
 %files kdump
-%build_debuginfo kdump
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
 /boot/System.map-%{KVERREL}kdump
@@ -1653,9 +1598,6 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Roland McGrath <roland at redhat.com>
-- Build separate debuginfo subpackages instead of a single one.
-
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - No headers subpackage for noarch build
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 10:45:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 06:45:31 -0400
Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch, NONE,
	1.1 openoffice.org.spec, 1.758, 1.759
Message-ID: <200607121045.k6CAjVUP032273@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32240

Modified Files:
	openoffice.org.spec 
Added Files:
	ooobuild.VBAObjects.patch 
Log Message:
add ooobuild.VBAObjects.patch

ooobuild.VBAObjects.patch:
 basic/inc/sbmeth.hxx                                              |    4 
 basic/source/classes/image.cxx                                    |   79 
 basic/source/classes/makefile.mk                                  |    5 
 basic/source/classes/sb.cxx                                       |   90 
 basic/source/classes/sbunoobj.cxx                                 |  246 +
 basic/source/classes/sbxmod.cxx                                   |   81 
 basic/source/comp/buffer.cxx                                      |   58 
 basic/source/comp/codegen.cxx                                     |  202 
 basic/source/comp/codegen.cxx.orig                                |only
 basic/source/comp/dim.cxx                                         |   18 
 basic/source/comp/exprtree.cxx                                    |   14 
 basic/source/comp/loops.cxx                                       |   42 
 basic/source/comp/makefile.mk                                     |    4 
 basic/source/comp/parser.cxx                                      |    9 
 basic/source/comp/scanner.cxx                                     |   14 
 basic/source/comp/symtbl.cxx                                      |    8 
 basic/source/comp/token.cxx                                       |    1 
 basic/source/inc/buffer.hxx                                       |   15 
 basic/source/inc/codegen.hxx                                      |   38 
 basic/source/inc/disas.hxx                                        |   10 
 basic/source/inc/filefmt.hxx                                      |    4 
 basic/source/inc/image.hxx                                        |   17 
 basic/source/inc/opcodes.hxx                                      |    1 
 basic/source/inc/parser.hxx                                       |    2 
 basic/source/inc/runtime.hxx                                      |    4 
 basic/source/inc/scanner.hxx                                      |    5 
 basic/source/inc/symtbl.hxx                                       |    8 
 basic/source/inc/token.hxx                                        |    2 
 basic/source/runtime/makefile.mk                                  |    3 
 basic/source/runtime/methods.cxx                                  |   13 
 basic/source/runtime/methods1.cxx                                 |    9 
 basic/source/runtime/rtlproto.hxx                                 |    1 
 basic/source/runtime/runtime.cxx                                  |    1 
 basic/source/runtime/step0.cxx                                    |  173 
 basic/source/runtime/step1.cxx                                    |   54 
 basic/source/runtime/step2.cxx                                    |   20 
 config_office/configure.in                                        |   13 
 config_office/set_soenv.in                                        |    1 
 offapi/org/openoffice/vba/Excel/Constants.idl                     |   18 
 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl    |   54 
 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlArabicModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl                |   20 
 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl          |   15 
 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlAxisType.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlBackground.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlBarShape.idl                    |   15 
 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl               |  251 +
 offapi/org/openoffice/vba/Excel/XlCVError.idl                     |   16 
 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlCalculation.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl     |   12 
 offapi/org/openoffice/vba/Excel/XlCalculationState.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlCategoryType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCellType.idl                    |   19 
 offapi/org/openoffice/vba/Excel/XlChartGallery.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlChartItem.idl                   |   40 
 offapi/org/openoffice/vba/Excel/XlChartLocation.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl       |   16 
 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl            |   13 
 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlChartType.idl                   |   82 
 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl             |   42 
 offapi/org/openoffice/vba/Excel/XlCmdType.idl                     |   14 
 offapi/org/openoffice/vba/Excel/XlColorIndex.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl              |   20 
 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl          |   13 
 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl       |   21 
 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlCreator.idl                     |   10 
 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlDVType.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl           |   21 
 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl          |   10 
 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl              |   15 
 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl              |   13 
 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlDirection.idl                   |   13 
 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl                 |   18 
 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl               |   10 
 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl        |   17 
 offapi/org/openoffice/vba/Excel/XlEditionType.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl             |   13 
 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl                |   14 
 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl                 |   17 
 offapi/org/openoffice/vba/Excel/XlFileAccess.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlFileFormat.idl                  |   52 
 offapi/org/openoffice/vba/Excel/XlFillWith.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlFilterAction.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlFormControl.idl                 |   19 
 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl     |   17 
 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlHAlign.idl                      |   17 
 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlHtmlType.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlIMEMode.idl                     |   20 
 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl          |   11 
 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlLineStyle.idl                   |   17 
 offapi/org/openoffice/vba/Excel/XlLink.idl                        |   13 
 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl                |   12 
 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl                  |   20 
 offapi/org/openoffice/vba/Excel/XlLinkType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlListConflict.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlListDataType.idl                |   22 
 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl        |   12 
 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl             |   22 
 offapi/org/openoffice/vba/Excel/XlLookAt.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlMSApplication.idl               |   16 
 offapi/org/openoffice/vba/Excel/XlMailSystem.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl                 |   21 
 offapi/org/openoffice/vba/Excel/XlMouseButton.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlMousePointer.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlOLEType.idl                     |   12 
 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl                     |   11 
 offapi/org/openoffice/vba/Excel/XlObjectSize.idl                  |   12 
 offapi/org/openoffice/vba/Excel/XlOrder.idl                       |   11 
 offapi/org/openoffice/vba/Excel/XlOrientation.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl             |   16 
 offapi/org/openoffice/vba/Excel/XlPageBreak.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlPaperSize.idl                   |   50 
 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl           |   30 
 offapi/org/openoffice/vba/Excel/XlParameterType.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPasteType.idl                   |   19 
 offapi/org/openoffice/vba/Excel/XlPattern.idl                     |   29 
 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl        |   22 
 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl               |   19 
 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl       |   18 
 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl       |   14 
 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl             |   31 
 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl       |   12 
 offapi/org/openoffice/vba/Excel/XlPlacement.idl                   |   12 
 offapi/org/openoffice/vba/Excel/XlPlatform.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl                 |   13 
 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlPriority.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlQueryType.idl                   |   15 
 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl             |   53 
 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl          |   12 
 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlReferenceType.idl               |   13 
 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl         |   11 
 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl           |   12 
 offapi/org/openoffice/vba/Excel/XlRowCol.idl                      |   11 
 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl                |   13 
 offapi/org/openoffice/vba/Excel/XlSaveAction.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl            |   12 
 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl      |   12 
 offapi/org/openoffice/vba/Excel/XlScaleType.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlSheetType.idl                   |   14 
 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl             |   12 
 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl         |   23 
 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl         |   12 
 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethod.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrder.idl                   |   11 
 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlSortType.idl                    |   11 
 offapi/org/openoffice/vba/Excel/XlSourceType.idl                  |   17 
 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl              |   11 
 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl      |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl               |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl           |   11 
 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl                  |   11 
 offapi/org/openoffice/vba/Excel/XlTabPosition.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl        |   11 
 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl        |   14 
 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl           |   13 
 offapi/org/openoffice/vba/Excel/XlTimeMark.idl                    |   13 
 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl                    |   12 
 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl           |   15 
 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl           |   18 
 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl               |   15 
 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl              |   14 
 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl                 |   12 
 offapi/org/openoffice/vba/Excel/XlVAlign.idl                      |   14 
 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl                 |   14 
 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl              |   12 
 offapi/org/openoffice/vba/Excel/XlWindowState.idl                 |   11 
 offapi/org/openoffice/vba/Excel/XlWindowType.idl                  |   13 
 offapi/org/openoffice/vba/Excel/XlWindowView.idl                  |   10 
 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl                |   11 
 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl             |   10 
 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl             |   11 
 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl               |   12 
 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl                  |   12 
 offapi/org/openoffice/vba/Excel/makefile.mk                       |  216 +
 offapi/org/openoffice/vba/MSFormReturnTypes.idl                   |   25 
 offapi/org/openoffice/vba/XApplication.idl                        |   49 
 offapi/org/openoffice/vba/XArrayWrapper.idl                       |   26 
 offapi/org/openoffice/vba/XCharacters.idl                         |   33 
 offapi/org/openoffice/vba/XChart.idl                              |   26 
 offapi/org/openoffice/vba/XChartObject.idl                        |   27 
 offapi/org/openoffice/vba/XChartObjects.idl                       |   31 
 offapi/org/openoffice/vba/XCollection.idl                         |   28 
 offapi/org/openoffice/vba/XComment.idl                            |   38 
 offapi/org/openoffice/vba/XComments.idl                           |   24 
 offapi/org/openoffice/vba/XDialog.idl                             |   28 
 offapi/org/openoffice/vba/XDialogs.idl                            |   26 
 offapi/org/openoffice/vba/XFont.idl                               |   39 
 offapi/org/openoffice/vba/XGlobals.idl                            |   34 
 offapi/org/openoffice/vba/XInterior.idl                           |   27 
 offapi/org/openoffice/vba/XOutline.idl                            |   28 
 offapi/org/openoffice/vba/XPivotCache.idl                         |   25 
 offapi/org/openoffice/vba/XPivotTable.idl                         |   28 
 offapi/org/openoffice/vba/XPivotTables.idl                        |   27 
 offapi/org/openoffice/vba/XRange.idl                              |   94 
 offapi/org/openoffice/vba/XSeries.idl                             |   28 
 offapi/org/openoffice/vba/XSeriesCollection.idl                   |   30 
 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl                |   20 
 offapi/org/openoffice/vba/XWindow.idl                             |   32 
 offapi/org/openoffice/vba/XWindows.idl                            |   24 
 offapi/org/openoffice/vba/XWorkbook.idl                           |   36 
 offapi/org/openoffice/vba/XWorkbooks.idl                          |   24 
 offapi/org/openoffice/vba/XWorksheet.idl                          |   61 
 offapi/org/openoffice/vba/XWorksheetFunction.idl                  |   26 
 offapi/org/openoffice/vba/XWorksheets.idl                         |   30 
 offapi/org/openoffice/vba/XlBuiltInDialog.idl                     |   35 
 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl             |   29 
 offapi/org/openoffice/vba/XlPasteType.idl                         |   34 
 offapi/org/openoffice/vba/makefile.mk                             |   54 
 offapi/prj/build.lst                                              |    4 
 offapi/prj/d.lst                                                  |    8 
 offapi/util/makefile.mk                                           |    5 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |   13 
 offuh/prj/d.lst                                                   |   15 
 sc/inc/address.hxx                                                |   62 
 sc/inc/cell.hxx                                                   |   25 
 sc/inc/column.hxx                                                 |    3 
 sc/inc/compiler.hrc                                               |    6 
 sc/inc/compiler.hxx                                               |   64 
 sc/inc/document.hxx                                               |   17 
 sc/inc/drwlayer.hxx                                               |    4 
 sc/inc/global.hxx                                                 |    1 
 sc/inc/globstr.hrc                                                |    4 
 sc/inc/opcode.hxx                                                 |    2 
 sc/inc/rangelst.hxx                                               |    6 
 sc/inc/rangeutl.hxx                                               |   19 
 sc/inc/reffind.hxx                                                |    8 
 sc/inc/sc.hrc                                                     |    9 
 sc/inc/scfuncs.hrc                                                |    2 
 sc/inc/shapeuno.hxx                                               |    9 
 sc/inc/sortparam.hxx                                              |    1 
 sc/inc/table.hxx                                                  |    0 
 sc/inc/userdat.hxx                                                |   16 
 sc/prj/build.lst                                                  |    3 
 sc/sdi/docsh.sdi                                                  |    1 
 sc/sdi/drawsh.sdi                                                 |    6 
 sc/sdi/scalc.sdi                                                  |  128 
 sc/source/core/data/attrib.cxx                                    |    1 
 sc/source/core/data/cell.cxx                                      |   21 
 sc/source/core/data/cell2.cxx                                     |   16 
 sc/source/core/data/column3.cxx                                   |   17 
 sc/source/core/data/conditio.cxx                                  |    2 
 sc/source/core/data/documen2.cxx                                  |    1 
 sc/source/core/data/documen3.cxx                                  |   10 
 sc/source/core/data/documen4.cxx                                  |    4 
 sc/source/core/data/drwlayer.cxx                                  |   19 
 sc/source/core/data/sortparam.cxx                                 |    1 
 sc/source/core/data/table1.cxx                                    |    0 
 sc/source/core/data/table6.cxx                                    |    4 
 sc/source/core/data/userdat.cxx                                   |   16 
 sc/source/core/data/validat.cxx                                   |    0 
 sc/source/core/inc/interpre.hxx                                   |    2 
 sc/source/core/src/compiler.src                                   |   14 
 sc/source/core/tool/address.cxx                                   |  648 ++-
 sc/source/core/tool/chgtrack.cxx                                  |    2 
 sc/source/core/tool/compiler.cxx                                  |  657 ++-
 sc/source/core/tool/interpr1.cxx                                  |  103 
 sc/source/core/tool/interpr4.cxx                                  |    2 
 sc/source/core/tool/rangelst.cxx                                  |   11 
 sc/source/core/tool/rangenam.cxx                                  |   30 
 sc/source/core/tool/rangeutl.cxx                                  |   51 
 sc/source/core/tool/reffind.cxx                                   |    6 
 sc/source/filter/excel/excdoc.cxx                                 |    2 
 sc/source/filter/excel/excform.cxx                                |    6 
 sc/source/filter/excel/excimp8.cxx                                |    6 
 sc/source/filter/excel/impop.cxx                                  |    8 
 sc/source/filter/excel/makefile.mk                                |    4 
 sc/source/filter/excel/read.cxx                                   |    1 
 sc/source/filter/excel/xicontent.cxx                              |   17 
 sc/source/filter/excel/xiescher.cxx                               |  159 
 sc/source/filter/excel/xistyle.cxx                                |   64 
 sc/source/filter/excel/xlformula.cxx                              |    6 
 sc/source/filter/excel/xlocx.cxx                                  |  140 
 sc/source/filter/inc/excimp8.hxx                                  |    1 
 sc/source/filter/inc/xcl97dum.hxx                                 |   11 
 sc/source/filter/inc/xcl97rec.hxx                                 |   14 
 sc/source/filter/inc/xicontent.hxx                                |    1 
 sc/source/filter/inc/xiescher.hxx                                 |   10 
 sc/source/filter/inc/xistyle.hxx                                  |    2 
 sc/source/filter/inc/xlocx.hxx                                    |   11 
 sc/source/filter/lotus/lotform.cxx                                |    4 
 sc/source/filter/xcl97/xcl97dum.cxx                               |   19 
 sc/source/filter/xcl97/xcl97rec.cxx                               |   22 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx            |    6 
 sc/source/filter/xml/XMLConverter.cxx                             |    6 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx                 |    1 
 sc/source/ui/app/inputhdl.cxx                                     |   39 
 sc/source/ui/attrdlg/condfrmt.cxx                                 |    2 
 sc/source/ui/docshell/docfunc.cxx                                 |   36 
 sc/source/ui/drawfunc/drawsh.cxx                                  |  130 
 sc/source/ui/drawfunc/drawsh2.cxx                                 |   14 
 sc/source/ui/drawfunc/drawsh5.cxx                                 |   18 
 sc/source/ui/drawfunc/fudraw.cxx                                  |   19 
 sc/source/ui/drawfunc/fusel.cxx                                   |   81 
 sc/source/ui/drawfunc/objdraw.src                                 |   56 
 sc/source/ui/inc/colrowba.hxx                                     |    2 
 sc/source/ui/inc/docfunc.hxx                                      |    2 
 sc/source/ui/inc/drawsh.hxx                                       |    2 
 sc/source/ui/inc/transobj.hxx                                     |    0 
 sc/source/ui/inc/undoblk.hxx                                      |    1 
 sc/source/ui/inc/undotab.hxx                                      |   20 
 sc/source/ui/src/globstr.src                                      |   12 
 sc/source/ui/src/sc.src                                           |    6 
 sc/source/ui/src/scfuncs.src                                      |  136 
 sc/source/ui/undo/undotab.cxx                                     |   57 
 sc/source/ui/unoobj/appluno.cxx                                   |   36 
 sc/source/ui/unoobj/docuno.cxx                                    |   29 
 sc/source/ui/unoobj/makefile.mk                                   |    4 
 sc/source/ui/unoobj/shapeuno.cxx                                  |  162 
 sc/source/ui/vba/makefile.mk                                      |   59 
 sc/source/ui/vba/vbaapplication.cxx                               |  314 +
 sc/source/ui/vba/vbaapplication.hxx                               |   48 
 sc/source/ui/vba/vbaarraywrapper.cxx                              |   22 
 sc/source/ui/vba/vbaarraywrapper.hxx                              |   20 
 sc/source/ui/vba/vbacharacters.cxx                                |   87 
 sc/source/ui/vba/vbacharacters.hxx                                |   45 
 sc/source/ui/vba/vbachart.cxx                                     |   29 
 sc/source/ui/vba/vbachart.hxx                                     |   23 
 sc/source/ui/vba/vbachartobject.cxx                               |   74 
 sc/source/ui/vba/vbachartobject.hxx                               |   24 
 sc/source/ui/vba/vbachartobjects.cxx                              |   52 
 sc/source/ui/vba/vbachartobjects.hxx                              |   29 
 sc/source/ui/vba/vbacollectionimpl.cxx                            |  106 
 sc/source/ui/vba/vbacollectionimpl.hxx                            |   72 
 sc/source/ui/vba/vbacomment.cxx                                   |  198 
 sc/source/ui/vba/vbacomment.hxx                                   |   49 
 sc/source/ui/vba/vbacomments.cxx                                  |   58 
 sc/source/ui/vba/vbacomments.hxx                                  |   31 
 sc/source/ui/vba/vbadialog.cxx                                    |  104 
 sc/source/ui/vba/vbadialog.hxx                                    |   35 
 sc/source/ui/vba/vbadialogs.cxx                                   |   69 
 sc/source/ui/vba/vbadialogs.hxx                                   |   34 
 sc/source/ui/vba/vbafont.cxx                                      |  323 +
 sc/source/ui/vba/vbafont.hxx                                      |   56 
 sc/source/ui/vba/vbaglobals.cxx                                   |  203 
 sc/source/ui/vba/vbaglobals.hxx                                   |   54 
 sc/source/ui/vba/vbahelper.cxx                                    |  326 +
 sc/source/ui/vba/vbahelper.hxx                                    |   37 
 sc/source/ui/vba/vbainterior.cxx                                  |   91 
 sc/source/ui/vba/vbainterior.hxx                                  |   37 
 sc/source/ui/vba/vbaobj.xml                                       |   26 
 sc/source/ui/vba/vbaoutline.cxx                                   |   20 
 sc/source/ui/vba/vbaoutline.hxx                                   |   24 
 sc/source/ui/vba/vbapalette.cxx                                   |   72 
 sc/source/ui/vba/vbapalette.hxx                                   |   20 
 sc/source/ui/vba/vbapivotcache.cxx                                |   16 
 sc/source/ui/vba/vbapivotcache.hxx                                |   22 
 sc/source/ui/vba/vbapivottable.cxx                                |   16 
 sc/source/ui/vba/vbapivottable.hxx                                |   20 
 sc/source/ui/vba/vbapivottables.cxx                               |   49 
 sc/source/ui/vba/vbapivottables.hxx                               |   35 
 sc/source/ui/vba/vbarange.cxx                                     | 2076 ++++++++++
 sc/source/ui/vba/vbarange.hxx                                     |  191 
 sc/source/ui/vba/vbaseriescollection.cxx                          |   73 
 sc/source/ui/vba/vbaseriescollection.hxx                          |   33 
 sc/source/ui/vba/vbawindow.cxx                                    |  308 +
 sc/source/ui/vba/vbawindow.hxx                                    |   33 
 sc/source/ui/vba/vbawindows.cxx                                   |  209 +
 sc/source/ui/vba/vbawindows.hxx                                   |   37 
 sc/source/ui/vba/vbaworkbook.cxx                                  |  220 +
 sc/source/ui/vba/vbaworkbook.hxx                                  |   47 
 sc/source/ui/vba/vbaworkbooks.cxx                                 |  377 +
 sc/source/ui/vba/vbaworkbooks.hxx                                 |   39 
 sc/source/ui/vba/vbaworksheet.cxx                                 |  537 ++
 sc/source/ui/vba/vbaworksheet.hxx                                 |   84 
 sc/source/ui/vba/vbaworksheets.cxx                                |  275 +
 sc/source/ui/vba/vbaworksheets.hxx                                |   51 
 sc/source/ui/vba/vbawsfunction.cxx                                |  104 
 sc/source/ui/vba/vbawsfunction.hxx                                |   33 
 sc/source/ui/view/colrowba.cxx                                    |    9 
 sc/source/ui/view/gridwin5.cxx                                    |   22 
 sc/source/ui/view/tabvwshf.cxx                                    |   18 
 sc/source/ui/view/viewfunc.cxx                                    |    2 
 sc/uiconfig/scalc/menubar/menubar.xml                             |    1 
 sc/util/makefile.mk                                               |    4 
 sc/util/vbaobj.map                                                |   10 
 scp2/source/ooo/file_library_ooo.scp                              |   18 
 scp2/source/ooo/makefile.mk                                       |    4 
 scripting/prj/build.lst                                           |    3 
 scripting/source/vbaevents/eventhelper.cxx                        |  998 ++++
 scripting/source/vbaevents/makefile.mk                            |   50 
 scripting/source/vbaevents/service.cxx                            |   99 
 scripting/source/vbaevents/vbaevents.map                          |   10 
 scripting/source/vbaevents/vbaevents.xml                          |   26 
 source/classes/sbunoobj.cxx                                       |   60 
 source/comp/dim.cxx                                               |    2 
 source/comp/parser.cxx                                            |    2 
 source/inc/parser.hxx                                             |    2 
 source/inc/runtime.hxx                                            |   51 
 source/runtime/runtime.cxx                                        |   12 
 source/runtime/step1.cxx                                          |   17 
 source/runtime/step2.cxx                                          |   72 
 stoc/source/registry_tdprovider/makefile.mk                       |    4 
 stoc/source/registry_tdprovider/rdbtdp.xml                        |    1 
 stoc/source/registry_tdprovider/tdprovider.cxx                    |  167 
 stoc/source/tdmanager/makefile.mk                                 |    4 
 stoc/source/tdmanager/tdmgr.cxx                                   |   48 
 stoc/source/tdmanager/tdmgr.xml                                   |    1 
 svx/source/form/fmundo.cxx                                        |  110 
 svx/source/form/makefile.mk                                       |    4 
 svx/source/inc/fmundo.hxx                                         |    4 
 svx/source/msfilter/svxmsbas.cxx                                  |    1 
 unoil/util/makefile.mk                                            |    4 
 xmloff/inc/shapeexport.hxx                                        |    5 
 xmloff/source/draw/eventimp.cxx                                   |  411 +
 xmloff/source/draw/shapeexport.cxx                                |    3 
 xmloff/source/draw/shapeexport2.cxx                               |  454 +-
 464 files changed, 18539 insertions(+), 1114 deletions(-)

--- NEW FILE ooobuild.VBAObjects.patch ---
Index: basic/source/comp/exprtree.cxx
===================================================================
RCS file: /cvs/script/basic/source/comp/exprtree.cxx,v
retrieving revision 1.13
diff -u -p -r1.13 exprtree.cxx
--- basic/source/comp/exprtree.cxx	7 Apr 2006 14:01:45 -0000	1.13
+++ basic/source/comp/exprtree.cxx	9 May 2006 16:37:18 -0000
@@ -117,9 +117,19 @@ static BOOL DoParametersFollow( SbiParse
 	// Aber nur, wenn CALL-aehnlich!
 	if( !p->WhiteSpace() || eCurExpr != SbSYMBOL )
 		return FALSE;
-	return BOOL(
+	if (
 		   eTok == NUMBER || eTok == FIXSTRING
-		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT );
+		|| eTok == SYMBOL || eTok == COMMA  || eTok == DOT )
+		return TRUE;
+	else // check for default params with reserved names ( e.g. names of tokens )
+	{
+		SbiTokenizer tokens( *(SbiTokenizer*)p );
+		// Urk the Next() / Peek() symantics are... weird
+		tokens.Next();
+		if ( tokens.Peek() == ASSIGN )
+			return TRUE;
+	}
+	return FALSE;
 }
 
 // Definition eines neuen Symbols
diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx	2006-06-14 17:46:55.000000000 +0100
+++ sc/source/core/data/drwlayer.cxx	2006-06-19 10:54:51.000000000 +0100
@@ -1996,6 +1996,25 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( Sd
 	return NULL;
 }
 
+ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )				// static
+{
+	USHORT nCount = pObj->GetUserDataCount();
+	for( USHORT i = 0; i < nCount; i++ )
+	{
+		SdrObjUserData* pData = pObj->GetUserData( i );
+		if( pData && pData->GetInventor() == SC_DRAWLAYER
+					&& pData->GetId() == SC_UD_MACRODATA )
+			return (ScMacroInfo*) pData;
+	}
+	if ( bCreate )
+	{
+		ScMacroInfo* pData = new ScMacroInfo;
+		pObj->InsertUserData( pData, 0 );
+		return pData;
+	}	
+	return NULL;
+}
+
 // static:
 IMapObject*	ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
 										  const Point& rWinPoint, const Window& rCmpWnd )
diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/userdat.cxx sc/source/core/data/userdat.cxx
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/userdat.cxx	2006-06-14 17:46:55.000000000 +0100
+++ sc/source/core/data/userdat.cxx	2006-06-19 10:54:51.000000000 +0100
@@ -623,6 +623,8 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory
 			pObjFactory->pNewData = new ScDrawObjData;
 		else if ( pObjFactory->nIdentifier == SC_UD_IMAPDATA )
 			pObjFactory->pNewData = new ScIMapInfo;
+		else if ( pObjFactory->nIdentifier == SC_UD_MACRODATA )
+			pObjFactory->pNewData = new ScMacroInfo;
 		else
 			DBG_ERROR("MakeUserData: falsche ID");
 	}
@@ -711,3 +713,17 @@ SdrObjUserData* __EXPORT ScIMapInfo::Clo
 {
 	return new ScIMapInfo( *this );
 }
+
+ScMacroInfo::ScMacroInfo() :
+	SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA, 0 )
+{
+}
+
+ScMacroInfo::~ScMacroInfo()
+{
+}
+
+SdrObjUserData* ScMacroInfo::Clone( SdrObject* pObj ) const
+{
+	return new ScMacroInfo( *this );
+}
diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx	2006-06-14 17:46:55.000000000 +0100
+++ sc/source/filter/excel/xiescher.cxx	2006-06-19 11:07:24.000000000 +0100
@@ -187,8 +187,9 @@
 #ifndef SC_XICHART_HXX
 #include "xichart.hxx"
 #endif
-
+#include "xicontent.hxx"
 #include "excform.hxx"
+#include "userdat.hxx"
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -403,6 +404,13 @@ XclImpDrawObjRef XclImpDrawObjBase::Read
 
 void XclImpDrawObjBase::ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize )
 {
+    switch( nSubRecId )
+    {
+        case EXC_ID_OBJ_FTMACRO:
+            ReadMacro( rStrm );
+        break;
+    }
+
 }
 
 Rectangle XclImpDrawObjBase::ReadClientAnchor( SvStream& rEscherStrm, const DffRecordHeader& rHeader )
@@ -484,6 +492,38 @@ void XclImpDrawObjBase::DoProcessSdrObj(
     if( !IsPrintable() )
         GetTracer().TraceObjectNotPrintable();
 }
+void XclImpDrawObjBase::ReadMacro( XclImpStream& rStrm )
+{
+    maMacroName.Erase();
+    if( rStrm.GetRecLeft() > 6 )
+    {
+        // macro is stored in a tNameXR token containing a link to a defined name
+        sal_uInt16 nFmlaSize;
+        rStrm >> nFmlaSize;
+        rStrm.Ignore( 4 );
+        DBG_ASSERT( nFmlaSize == 7, "XclImpDrawObjBase::ReadMacro - unexpected formula size" );
+        if( nFmlaSize == 7 )
+        {
+            sal_uInt8 nTokenId;
+            sal_uInt16 nExtSheet, nExtName;
+            rStrm >> nTokenId >> nExtSheet >> nExtName;
+            DBG_ASSERT( nTokenId == XclTokenArrayHelper::GetTokenId( EXC_TOKID_NAMEX, EXC_TOKCLASS_REF ),
+                "XclImpDrawObjBase::ReadMacro - tNameXR token expected" );
+            if( nTokenId == XclTokenArrayHelper::GetTokenId( EXC_TOKID_NAMEX, EXC_TOKCLASS_REF ) )
+            {
+                maMacroName = GetLinkManager().GetMacroName( nExtSheet, nExtName );
+                // #i38718# missing module name - try to find the macro in the imported modules
+                if( maMacroName.Len() && (maMacroName.Search( '.' ) == STRING_NOTFOUND) )
+                    if( SfxObjectShell* pDocShell = GetDocShell() )
+                        if( StarBASIC* pBasic = pDocShell->GetBasic() )
+                            if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( maMacroName, SbxCLASS_METHOD ) ) )
+                                if( SbModule* pModule = pMethod->GetModule() )
+                                    maMacroName.Insert( '.', 0 ).Insert( pModule->GetName(), 0 );
+            }
+        }
+    }
+}
+
 
 // ----------------------------------------------------------------------------
 
@@ -644,9 +684,6 @@ void XclImpTbxControlObj::ReadSubRecord(
         case EXC_ID_OBJ_FTGBODATA:
             ReadGboData( rStrm );
         break;
-        case EXC_ID_OBJ_FTMACRO:
-            ReadMacro( rStrm );
-        break;
         default:
             XclImpDrawObjBase::ReadSubRecord( rStrm, nSubRecId, nSubRecSize );
     }
@@ -823,7 +860,7 @@ void XclImpTbxControlObj::WriteToPropert
 
 bool XclImpTbxControlObj::FillMacroDescriptor( ScriptEventDescriptor& rEvent ) const
 {
-    if( maMacroName.Len() )
+    if( GetMacroName().Len() )
     {
         // type of action is dependent on control type
         rEvent.ListenerType = XclTbxControlHelper::GetListenerType( GetObjType() );
@@ -832,7 +869,7 @@ bool XclImpTbxControlObj::FillMacroDescr
         {
             // set the macro name
             rEvent.ScriptType = XclTbxControlHelper::GetScriptType();
-            rEvent.ScriptCode = XclTbxControlHelper::GetScMacroName( maMacroName );
+            rEvent.ScriptCode = XclTbxControlHelper::GetScMacroName( GetMacroName() );
             return true;
         }
     }
@@ -914,38 +951,6 @@ void XclImpTbxControlObj::ReadGboData( X
     mbFlatBorder = ::get_flag( nStyle, EXC_OBJ_GBO_FLAT );
 }
 
-void XclImpTbxControlObj::ReadMacro( XclImpStream& rStrm )
-{
-    maMacroName.Erase();
-    if( rStrm.GetRecLeft() > 6 )
-    {
-        // macro is stored in a tNameXR token containing a link to a defined name
-        sal_uInt16 nFmlaSize;
-        rStrm >> nFmlaSize;
-        rStrm.Ignore( 4 );
-        DBG_ASSERT( nFmlaSize == 7, "XclImpTbxControlObj::ReadMacro - unexpected formula size" );
-        if( nFmlaSize == 7 )
-        {
[...25405 lines suppressed...]
 	pPool	 = &aPublics;
 	for( short i = 0; i < 26; i++ )
 		eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
--- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/basic/source/comp/codegen.cxx	2006-06-10 17:43:14.000000000 +0100
+++ basic/source/comp/codegen.cxx	2006-06-21 10:45:58.000000000 +0100
@@ -136,7 +136,7 @@ void SbiCodeGen::Save()
 	// OPTION EXPLICIT-Flag uebernehmen
 	if( pParser->bExplicit )
 		p->SetFlag( SBIMG_EXPLICIT );
-	if( pParser->bVBASupportOn )
+	if( pParser->IsVBASupportOn() )
 		p->SetFlag( SBIMG_VBASUPPORT );
 	
 	int nIfaceCount = 0;
Index: offuh/prj/d.lst
===================================================================
RCS file: /cvs/api/offuh/prj/d.lst,v
retrieving revision 1.59
diff -u -r1.59 d.lst
--- offuh/prj/d.lst	9 Jun 2005 14:54:16 -0000	1.59
+++ offuh/prj/d.lst	19 Sep 2005 10:54:08 -0000
@@ -114,6 +114,13 @@
 mkdir: %_DEST%\inc%_EXT%\com\sun\star\xml\wrapper
 #i20156 - end
 
+mkdir: %_DEST%\inc%_EXT%\MSForms
+
+mkdir: %_DEST%\inc%_EXT%\org
+mkdir: %_DEST%\inc%_EXT%\org\openoffice
+mkdir: %_DEST%\inc%_EXT%\org\openoffice\vba
+mkdir: %_DEST%\inc%_EXT%\org\openoffice\vba\Excel
+
 ..\%__SRC%\inc\com\sun\star\auth\*.hdl %_DEST%\inc%_EXT%\com\sun\star\auth\*.hdl
 ..\%__SRC%\inc\com\sun\star\auth\*.hpp %_DEST%\inc%_EXT%\com\sun\star\auth\*.hpp
 ..\%__SRC%\inc\com\sun\star\accessibility\*.hpp %_DEST%\inc%_EXT%\com\sun\star\accessibility\*.hpp
@@ -319,3 +326,11 @@
 ..\%__SRC%\inc\com\sun\star\xml\wrapper\*.hdl %_DEST%\inc%_EXT%\com\sun\star\xml\wrapper\*.hdl
 #i20156 - end
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
+
+..\%__SRC%\inc\MSForms\*.hpp %_DEST%\inc%_EXT%\MSForms\*.hpp
+..\%__SRC%\inc\MSForms\*.hdl %_DEST%\inc%_EXT%\MSForms\*.hdl
+
+..\%__SRC%\inc\org\openoffice\vba\*.hpp %_DEST%\inc%_EXT%\org\openoffice\vba\*.hpp
+..\%__SRC%\inc\org\openoffice\vba\*.hdl %_DEST%\inc%_EXT%\org\openoffice\vba\*.hdl
+..\%__SRC%\inc\org\openoffice\vba\Excel\*.hpp %_DEST%\inc%_EXT%\org\openoffice\vba\Excel\*.hpp
+..\%__SRC%\inc\org\openoffice\vba\Excel\*.hdl %_DEST%\inc%_EXT%\org\openoffice\vba\Excel\*.hdl
Index: offapi/prj/build.lst
===================================================================
RCS file: /cvs/api/offapi/prj/build.lst,v
retrieving revision 1.74
diff -u -r1.74 build.lst
--- offapi/prj/build.lst	10 Mar 2005 13:02:47 -0000	1.74
+++ offapi/prj/build.lst	19 Sep 2005 10:54:13 -0000
@@ -86,4 +86,6 @@
 oa	offapi\com\sun\star\geometry		    nmake	-	all	oa_geometry NULL
 oa	offapi\com\sun\star\rendering	        nmake	-	all oa_rendering oa_geometry NULL
 oa	offapi\drafts\com\sun\star\form         nmake	-	all	oa_drafts_form NULL
-oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto!
 _sax oa_crypto oa_csax oa_wrapper oa_script NULL
+oa	offapi\org\openoffice\vba         nmake	-	all	oa_vba NULL
+oa	offapi\org\openoffice\vba\Excel         nmake	-	all	oa_excel NULL
+oa     offapi\util                             nmake   -   all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto!
 _sax oa_crypto oa_csax oa_wrapper oa_script oa_vba oa_excel NULL
Index: offapi/prj/d.lst
===================================================================
RCS file: /cvs/api/offapi/prj/d.lst,v
retrieving revision 1.73
diff -u -r1.73 d.lst
--- offapi/prj/d.lst	10 Mar 2005 13:03:07 -0000	1.73
+++ offapi/prj/d.lst	19 Sep 2005 10:54:17 -0000
@@ -104,6 +104,11 @@
 mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\wrapper
 #i20156 - end
 
+mkdir: %COMMON_DEST%\idl%_EXT%\org
+mkdir: %COMMON_DEST%\idl%_EXT%\org\openoffice
+mkdir: %COMMON_DEST%\idl%_EXT%\org\openoffice\vba
+mkdir: %COMMON_DEST%\idl%_EXT%\org\openoffice\vba\Excel
+
 ..\%__SRC%\ucr\offapi.db %_DEST%\bin%_EXT%\offapi.rdb
 ..\%__SRC%\ucrdoc\offapi_doc.db %_DEST%\bin%_EXT%\offapi_doc.rdb
 ..\%__SRC%\ucr\types.db %_DEST%\bin%_EXT%\types.rdb
@@ -201,6 +206,9 @@
 ..\drafts\com\sun\star\chart\*.idl %COMMON_DEST%\idl%_EXT%\drafts\com\sun\star\chart
 ..\drafts\com\sun\star\form\*.idl %COMMON_DEST%\idl%_EXT%\drafts\com\sun\star\form
 
+..\org\openoffice\vba\*.idl %COMMON_DEST%\idl%_EXT%\org\openoffice\vba
+..\org\openoffice\vba\Excel\*.idl %COMMON_DEST%\idl%_EXT%\org\openoffice\vba\Excel
+
 #i20156 - add xmlsecurity module related
 ..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
 ..\com\sun\star\xml\crypto\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\xml\crypto
Index: offapi/util/makefile.mk
===================================================================
RCS file: /cvs/api/offapi/util/makefile.mk,v
retrieving revision 1.89
diff -u -r1.89 makefile.mk
--- offapi/util/makefile.mk	10 Mar 2005 13:03:32 -0000	1.89
+++ offapi/util/makefile.mk	19 Sep 2005 10:54:20 -0000
@@ -132,6 +132,11 @@
 	$(UCR)$/xsec-sax.db \
 	$(UCR)$/xsec-wrapper.db
 
+.IF "$(ENABLE_VBA)"=="YES"
+	UNOIDLDBFILES+=$(UCR)$/vba.db
+	UNOIDLDBFILES+=$(UCR)$/excel.db
+.ENDIF
+
 REFERENCE_RDB=$(PRJ)$/type_reference$/types.rdb
 
 REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
Index: unoil/util/makefile.mk
===================================================================
RCS file: /cvs/udk/unoil/util/makefile.mk,v
retrieving revision 1.2
diff -u -r1.2 makefile.mk
--- unoil/util/makefile.mk	26 Nov 2001 17:44:41 -0000	1.2
+++ unoil/util/makefile.mk	19 Sep 2005 13:49:43 -0000
@@ -71,6 +71,10 @@
 MAXLINELENGTH = 100000
 
 JARCLASSDIRS	= com drafts
+.IF "$(ENABLE_VBA)"=="YES"
+JARCLASSDIRS += org
+.ENDIF 
+
 JARTARGET		= $(TARGET).jar
 JARCOMPRESS 	= TRUE
 
--- /data4/sles/ooo-buildmLatest/ooo-build/build/src680-m169/sc/util/makefile.mk	2006-05-19 12:13:08.000000000 +0100
+++ sc/util/makefile.mk	2006-05-19 13:19:32.000000000 +0100
@@ -172,6 +172,10 @@ LIB3FILES=	\
 LIB3FILES+= \
 			$(SLB)$/unoobj.lib
 
+.IF "$(ENABLE_VBA)"=="YES"
+LIB3FILES+= \
+	$(SLB)$/vbaobj.lib
+.ENDIF
 
 LIB4TARGET=$(SLB)$/scalc3c.lib
 LIB4FILES=	\
--- /data4/sles/ooo-buildmLatest/ooo-build/build/src680-m169/sc/source/ui/unoobj/appluno.cxx	2006-05-19 16:16:12.000000000 +0100
+++ sc/source/ui/unoobj/appluno.cxx	2006-05-19 16:27:02.000000000 +0100
@@ -221,6 +221,25 @@ static const SfxItemPropertyMap* lcl_Get
 SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE )
 SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE )
 SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE )
+#ifdef ENABLE_VBA
+namespace vbaobj
+{
+// =============================================================================
+// component operations
+// =============================================================================
+
+uno::Reference< uno::XInterface > SAL_CALL create(
+        uno::Reference< lang::XMultiServiceFactory  > const & xContext )
+        SAL_THROW( () );
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL getImplementationName();
+
+uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames();
+
+} // end namespace vbaobj
+#endif
 
 //------------------------------------------------------------------------
 
@@ -342,6 +361,15 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL c
 							ScDocument_getImplementationName(),
 							ScDocument_getSupportedServiceNames() );
 
+#ifdef ENABLE_VBA
+			lcl_WriteInfo( pRegistryKey,
+							::vbaobj::getImplementationName(),
+							::vbaobj::getSupportedServiceNames() );
+			uno::Reference< registry::XRegistryKey >xKey = pRegistryKey->createKey(
+					rtl::OUString::createFromAscii( ("org.openoffice.vba.Globals/UNO/SINGLETONS/org.openoffice.vba.theGlobals") ) );
+			xKey->setStringValue( ::rtl::OUString::createFromAscii( 
+					("org.openoffice.vba.Globals") ) );
+#endif
 			return sal_True;
 		}
 		catch (registry::InvalidRegistryException&)
@@ -511,6 +539,14 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL com
 				ScDocument_createInstance,
 				ScDocument_getSupportedServiceNames() ));
 
+#ifdef ENABLE_VBA
+	if ( aImpl == ::vbaobj::getImplementationName() )
+		xFactory.set(cppu::createSingleFactory(
+				reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
+				::vbaobj::getImplementationName(),
+				::vbaobj::create,
+				::vbaobj::getSupportedServiceNames() ));
+#endif
 
 	void* pRet = NULL;
 	if (xFactory.is())


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -r1.758 -r1.759
--- openoffice.org.spec	10 Jul 2006 13:30:59 -0000	1.758
+++ openoffice.org.spec	12 Jul 2006 10:45:28 -0000	1.759
@@ -111,6 +111,7 @@
 Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch48: ooobuild.VBAObjects.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -849,6 +850,7 @@
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch48 -p1 -b .ooobuild.VBAObjects.patch
 
 tar xzf %{SOURCE1}
 
@@ -3330,6 +3332,7 @@
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+- add ooobuild.VBAObjects.patch for VBA macro support
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:00:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:00:16 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.759,1.760
Message-ID: <200607121100.k6CB0G37029051@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29035

Modified Files:
	openoffice.org.spec 
Log Message:
ready for test build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- openoffice.org.spec	12 Jul 2006 10:45:28 -0000	1.759
+++ openoffice.org.spec	12 Jul 2006 11:00:14 -0000	1.760
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 5
+%define rh_rpm_release 4.vba
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -3333,6 +3333,7 @@
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
+- rebuild for new tasty linker hash
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:32:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:32:02 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.760,1.761
Message-ID: <200607121132.k6CBW20w011843@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11824

Modified Files:
	openoffice.org.spec 
Log Message:
patch level


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- openoffice.org.spec	12 Jul 2006 11:00:14 -0000	1.760
+++ openoffice.org.spec	12 Jul 2006 11:31:59 -0000	1.761
@@ -850,7 +850,7 @@
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch48 -p1 -b .ooobuild.VBAObjects.patch
+%patch48 -p0 -b .ooobuild.VBAObjects.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:33:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:33:07 -0400
Subject: rpms/libsoup/devel .cvsignore, 1.18, 1.19 libsoup.spec, 1.37,
	1.38 sources, 1.18, 1.19
Message-ID: <200607121133.k6CBX7KD011897@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11879

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
- Update to 2.2.95.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Jun 2006 17:56:43 -0000	1.18
+++ .cvsignore	12 Jul 2006 11:33:01 -0000	1.19
@@ -1 +1 @@
-libsoup-2.2.94.tar.bz2
+libsoup-2.2.95.1.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libsoup.spec	12 Jul 2006 06:57:01 -0000	1.37
+++ libsoup.spec	12 Jul 2006 11:33:01 -0000	1.38
@@ -1,15 +1,27 @@
-Summary: Soup, an HTTP library implementation
+### Abstract ###
+
 Name: libsoup
-Version: 2.2.94
-Release: 3.1
+Version: 2.2.95.1
+Release: 1
 License: LGPL
 Group: Development/Libraries
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
-URL:  ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
-
+Summary: Soup, an HTTP library implementation
+URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: glib2 >= 2.0, gnutls, libxml2
-BuildRequires: glib2-devel, pkgconfig, gnutls-devel, libxml2-devel
+Source: %{name}-%{version}.tar.bz2
+
+### Dependencies ###
+
+Requires: glib2 >= 2.0
+Requires: gnutls
+Requires: libxml2
+
+### Build Dependencies ###
+
+BuildRequires: glib2-devel
+BuildRequires: gnutls-devel
+BuildRequires: pkgconfig
+BuildRequires: libxml2-devel
 
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
@@ -26,7 +38,9 @@
 Summary: Header files for the Soup library
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: glib2-devel, gnutls-devel, libxml2-devel
+Requires: glib2-devel
+Requires: gnutls-devel
+Requires: libxml2-devel
 
 %description devel
 Libsoup is an HTTP library implementation in C. This package allows 
@@ -66,6 +80,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.95.1-1
+- Update to 2.2.95.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.94-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Jun 2006 17:56:43 -0000	1.18
+++ sources	12 Jul 2006 11:33:01 -0000	1.19
@@ -1 +1 @@
-a242a7c4b874e080f049c8fdf90ea836  libsoup-2.2.94.tar.bz2
+60963fc61299baaa88072297ca7f23c6  libsoup-2.2.95.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:38:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:38:07 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.36, 1.37 gtkhtml3.spec, 1.64,
	1.65 sources, 1.36, 1.37
Message-ID: <200607121138.k6CBc7KE012001@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11986

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
- Update to 3.11.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	13 Jun 2006 18:44:43 -0000	1.36
+++ .cvsignore	12 Jul 2006 11:38:03 -0000	1.37
@@ -1 +1 @@
-gtkhtml-3.11.3.tar.bz2
+gtkhtml-3.11.4.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gtkhtml3.spec	12 Jul 2006 06:16:57 -0000	1.64
+++ gtkhtml3.spec	12 Jul 2006 11:38:05 -0000	1.65
@@ -1,25 +1,19 @@
+%define gnome_icon_theme_version 1.2.3
 %define gtkhtml_major 3.8
 %define libgnomeprint_version 2.7.1
-%define gnome_icon_theme_version 1.2.3
 
-Summary: gtkhtml library
+### Abstract ###
+
 Name: gtkhtml3
-Version: 3.11.3
-Release: 1.1
+Version: 3.11.4
+Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
+Summary: gtkhtml library
+Source: gtkhtml-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/gtkhtml-%{version}-root
-BuildRequires: libgnomeui-devel >= 2.0
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
-BuildRequires: libglade2-devel >= 2.0
-BuildRequires: gail-devel
-BuildRequires: libtool, gettext
-BuildRequires: intltool
-BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
-Requires: libgnomeprint22 >= %{libgnomeprint_version}
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
+
+### Patches ###
 
 # Partial band-aid for an editing crash (bug #129844)
 # http://bugzilla.ximian.com/show_bug.cgi?id=50052
@@ -29,26 +23,42 @@
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
 Patch4: gtkhtml-3.10.0-im-too-late.patch
 
+### Dependencies ###
+
+Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
+Requires: libgnomeprint22 >= %{libgnomeprint_version}
+
+### Build Dependencies ###
+
+BuildRequires: gail-devel
+BuildRequires: gettext
+BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
+BuildRequires: intltool
+BuildRequires: libglade2-devel >= 2.0
+BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
+BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libtool
+
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
 was originally based on KHTMLW, but is now being developed
 independently of it.
 
 %package devel
-Summary: Libraries, includes, etc to develop gtkhtml applications
 Group: Development/Libraries
+Summary: Libraries, includes, etc to develop gtkhtml applications
 Requires: %{name} = %{version}-%{release}
-Requires: libgnomeui-devel >= 2.0
+Requires: libglade2-devel >= 2.0
 Requires: libgnomeprint22-devel >= 2.2.0
 Requires: libgnomeprintui22-devel >= 2.2.1
-Requires: libglade2-devel >= 2.0
+Requires: libgnomeui-devel >= 2.0
 
 %description devel
 Libraries and include files that can be used to develop GtkHTML applications.
 
 %prep
 %setup -q -n gtkhtml-%{version}
-
 %patch1 -p1 -b .crash
 %patch3 -p1 -b .fix-129212
 %patch4 -p1 -b .im-too-late
@@ -69,7 +79,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.a
 
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
+  sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
 done
 rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.servere
 
@@ -85,8 +95,8 @@
 %files -f gtkhtml-%{gtkhtml_major}.lang
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO
-%{_libdir}/libgtkhtml-%{gtkhtml_major}.so.*
 %dir %{_libdir}/gtkhtml
+%{_libdir}/libgtkhtml-%{gtkhtml_major}.so.*
 %{_libdir}/gtkhtml/libgnome-gtkhtml-editor-%{gtkhtml_major}.so
 %{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-%{gtkhtml_major}.server
 %{_datadir}/gtkhtml-%{gtkhtml_major}
@@ -98,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.4-1
+- Update to 3.11.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.11.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Jun 2006 18:44:43 -0000	1.36
+++ sources	12 Jul 2006 11:38:05 -0000	1.37
@@ -1 +1 @@
-32bfb28f4dabd16d750473f049157dd6  gtkhtml-3.11.3.tar.bz2
+abb0e217fb16ecd0d83bfaf217f6ac5b  gtkhtml-3.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:40:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:40:56 -0400
Subject: rpms/brltty/devel brltty-3.7.2-linux-compiler-h.patch, NONE,
	1.1 brltty.spec, 1.17, 1.18
Message-ID: <200607121140.k6CBeuSi022992@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11981

Modified Files:
	brltty.spec 
Added Files:
	brltty-3.7.2-linux-compiler-h.patch 
Log Message:
Do not include linux/compiler.h, it seems to be unused but causes build
problems on ia64 (at least).


brltty-3.7.2-linux-compiler-h.patch:
 usb_linux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE brltty-3.7.2-linux-compiler-h.patch ---
--- brltty-3.7.2/Programs/usb_linux.c.linux-compiler-h	2006-07-12 13:27:57.000000000 +0200
+++ brltty-3.7.2/Programs/usb_linux.c	2006-07-12 13:27:28.000000000 +0200
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
-#include <linux/compiler.h>
+// #include <linux/compiler.h>
 #include <linux/usbdevice_fs.h>
 
 #ifndef USBDEVFS_DISCONNECT


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- brltty.spec	12 Jul 2006 09:37:57 -0000	1.17
+++ brltty.spec	12 Jul 2006 11:40:53 -0000	1.18
@@ -5,6 +5,7 @@
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
+Patch0: brltty-3.7.2-linux-compiler-h.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
 Summary: Braille display driver for Linux/Unix.
 Requires(post): coreutils
@@ -51,6 +52,7 @@
 
 %prep
 %setup -n brltty-3.7.2
+%patch0 -p1 -b .linux-compiler-h
 
 %build
 %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt



From fedora-cvs-commits at redhat.com  Wed Jul 12 11:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 07:48:52 -0400
Subject: rpms/brltty/devel brltty.spec,1.18,1.19
Message-ID: <200607121148.k6CBmqMi008168@cvs.devel.redhat.com>

Author: prockai

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7745

Modified Files:
	brltty.spec 
Log Message:
Apparently, xbrlapi is only built on some systems, so we need rm -f to get
rid of it. Probably in presence of X11 includes or something.



Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- brltty.spec	12 Jul 2006 11:40:53 -0000	1.18
+++ brltty.spec	12 Jul 2006 11:48:49 -0000	1.19
@@ -67,7 +67,7 @@
 %install
 make install #install-programs install-help install-tables install-drivers install-manpage
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
-rm ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
+rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
 
 %clean
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Jul 12 12:10:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 08:10:13 -0400
Subject: rpms/evolution-data-server/devel .cvsignore, 1.45,
	1.46 evolution-data-server.spec, 1.100, 1.101 sources, 1.45,
	1.46 evolution-data-server-1.7.3-gpg-account-name.patch, 1.1, NONE
Message-ID: <200607121210.k6CCAD43013650@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.7.3-gpg-account-name.patch 
Log Message:
- Update to 1.7.4
- Remove patch for Gnome.org bug #345965 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	13 Jun 2006 19:57:35 -0000	1.45
+++ .cvsignore	12 Jul 2006 12:10:10 -0000	1.46
@@ -1 +1 @@
-evolution-data-server-1.7.3.tar.bz2
+evolution-data-server-1.7.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- evolution-data-server.spec	12 Jul 2006 05:46:52 -0000	1.100
+++ evolution-data-server.spec	12 Jul 2006 12:10:10 -0000	1.101
@@ -20,8 +20,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.7.3
-Release: 3.1
+Version: 1.7.4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -47,9 +47,6 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Gnome.org #345965 - fixed upstream
-Patch301: evolution-data-server-1.7.3-gpg-account-name.patch
-
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -131,7 +128,6 @@
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
-%patch301 -p0 -b .gpg-account-name
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -328,6 +324,10 @@
 
 
 %changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-1
+- Update to 1.7.4
+- Remove patch for Gnome.org bug #345965 (fixed upstream).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	13 Jun 2006 19:57:35 -0000	1.45
+++ sources	12 Jul 2006 12:10:10 -0000	1.46
@@ -1 +1 @@
-8d1134598c1cefa669ecd42a85e3cd56  evolution-data-server-1.7.3.tar.bz2
+b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2


--- evolution-data-server-1.7.3-gpg-account-name.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 12:16:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 08:16:30 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.761,1.762
Message-ID: <200607121216.k6CCGUk9023910@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22599

Modified Files:
	openoffice.org.spec 
Log Message:
problem with the new compiler ?


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.761
retrieving revision 1.762
diff -u -r1.761 -r1.762
--- openoffice.org.spec	12 Jul 2006 11:31:59 -0000	1.761
+++ openoffice.org.spec	12 Jul 2006 12:16:27 -0000	1.762
@@ -850,7 +850,7 @@
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch48 -p0 -b .ooobuild.VBAObjects.patch
+# %patch48 -p0 -b .ooobuild.VBAObjects.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 12:32:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 08:32:26 -0400
Subject: rpms/net-snmp/devel net-snmp.spec, 1.79, 1.80 net-snmpd.init, 1.1,
	1.2 net-snmptrapd.init, 1.2, 1.3
Message-ID: <200607121232.k6CCWQSQ003538@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec net-snmpd.init net-snmptrapd.init 
Log Message:
- fix init script, read .options files from /etc/snmp (#195702)


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- net-snmp.spec	12 Jul 2006 07:26:55 -0000	1.79
+++ net-snmp.spec	12 Jul 2006 12:32:22 -0000	1.80
@@ -6,7 +6,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3.1.rc4
-Release: 1.1
+Release: 2
 
 License: BSDish
 Group: System Environment/Daemons
@@ -344,6 +344,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Radek Vok??l <rvokal at redhat.com> 5.3.1.rc4-2
+- fix init script, read .options files from /etc/snmp (#195702)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.3.1.rc4-1.1
 - rebuild
 


Index: net-snmpd.init
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-snmpd.init	9 Sep 2004 09:10:41 -0000	1.1
+++ net-snmpd.init	12 Jul 2006 12:32:23 -0000	1.2
@@ -12,7 +12,12 @@
 # source function library
 . /etc/init.d/functions
 
-OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd -a"
+if [ -e /etc/snmp/snmpd.options ]; then
+  . /etc/snmp/snmpd.options
+else
+   OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd -a"
+fi
+
 RETVAL=0
 prog="snmpd"
 


Index: net-snmptrapd.init
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmptrapd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-snmptrapd.init	9 Sep 2004 09:13:26 -0000	1.2
+++ net-snmptrapd.init	12 Jul 2006 12:32:23 -0000	1.3
@@ -13,9 +13,12 @@
 # source function library
 . /etc/init.d/functions
 
-[ -e /etc/snmp/snmptrapd.options ] && . /etc/snmp/snmptrapd.options
+if [ -e /etc/snmp/snmptrapd.options ]; then
+  . /etc/snmp/snmptrapd.options
+else
+   OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
+fi
 
-OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 RETVAL=0
 prog="snmptrapd"
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 12:54:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 08:54:05 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.23, 1.24 at-spi.spec, 1.43,
	1.44 sources, 1.23, 1.24
Message-ID: <200607121254.k6CCs5sG025204@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25110

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
add translations back



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Jul 2006 06:07:10 -0000	1.23
+++ .cvsignore	12 Jul 2006 12:54:02 -0000	1.24
@@ -1 +1,2 @@
 at-spi-1.7.8.tar.bz2
+po.tar.gz


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- at-spi.spec	12 Jul 2006 06:18:25 -0000	1.43
+++ at-spi.spec	12 Jul 2006 12:54:02 -0000	1.44
@@ -10,6 +10,7 @@
 Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
+Source1: po.tar.gz
 
 License: LGPL
 Group: System Environment/Libraries
@@ -56,6 +57,8 @@
 %prep
 %setup -q
 
+tar xzf %{SOURCE1}
+
 %build
 %configure --disable-gtk-doc
 make


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Jul 2006 06:07:10 -0000	1.23
+++ sources	12 Jul 2006 12:54:02 -0000	1.24
@@ -1 +1,2 @@
 ea494d23d6732a1952ef0819077e853e  at-spi-1.7.8.tar.bz2
+d7b61e14352cba8c843e8643390306dc  po.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 12:59:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 08:59:54 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.675, 1.676
Message-ID: <200607121259.k6CCxsdZ027517@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27444

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch 
Log Message:
workaround

openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch:
 bf_sd/source/ui/app/sd_optsitem.cxx           |    0 
 binfilter/bf_sd/source/ui/app/sd_optsitem.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch ---
Index: bf_sd/source/ui/app/sd_optsitem.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx,v
retrieving revision 1.4
diff -u -r1.4 sd_optsitem.cxx
--- openoffice.org.orig/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx	7 Sep 2005 23:40:30 -0000	1.4
+++ openoffice.org/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx	12 Jul 2006 12:57:00 -0000
@@ -1591,7 +1591,7 @@
 /*N*/ int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
-/*N*/ 	return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
+/*N*/ 	return( (const SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
 /*N*/ }
 
 // -----------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -r1.675 -r1.676
--- openoffice.org.spec	10 Jul 2006 12:48:55 -0000	1.675
+++ openoffice.org.spec	12 Jul 2006 12:59:52 -0000	1.676
@@ -180,6 +180,7 @@
 Patch52: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch55: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -843,6 +844,7 @@
 %patch52 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch53 -p1 -b .ooo64206.sfx2.saveas.patch
 %patch54 -p1 -b .rh187919.gtkunderkde.patch
+%patch56 -p1 -b .gcc28357.binfilter.constcrash.patch
 
 
 %if %{includingexternals}
@@ -3294,6 +3296,7 @@
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make 
   ~/.recently-used safe
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+- rh#198603# gcc ate my office suite, add openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
 
 * Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:03:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:03:03 -0400
Subject: rpms/gnome-desktop/devel .cvsignore, 1.32, 1.33 gnome-desktop.spec,
	1.59, 1.60 sources, 1.32, 1.33
Message-ID: <200607121303.k6CD33hC027827@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	17 May 2006 16:42:46 -0000	1.32
+++ .cvsignore	12 Jul 2006 13:03:00 -0000	1.33
@@ -1 +1 @@
-gnome-desktop-2.15.2.tar.bz2
+gnome-desktop-2.15.4.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-desktop.spec	12 Jul 2006 05:59:01 -0000	1.59
+++ gnome-desktop.spec	12 Jul 2006 13:03:00 -0000	1.60
@@ -11,8 +11,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.15.2
-Release: 1.1
+Version: 2.15.4
+Release: 1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 # FIXME: why are these needed ?
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 May 2006 16:42:46 -0000	1.32
+++ sources	12 Jul 2006 13:03:00 -0000	1.33
@@ -1 +1 @@
-60d3c4f5977d6ef903e109a6de2c79c7  gnome-desktop-2.15.2.tar.bz2
+13b68f7780b885621515e487572d3eb1  gnome-desktop-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:07:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:07:48 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.762, 1.763
Message-ID: <200607121307.k6CD7mKn028342@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28284

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch 
Log Message:
add workaround for the old compiler problem

openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch:
 bf_sd/source/ui/app/sd_optsitem.cxx           |    0 
 binfilter/bf_sd/source/ui/app/sd_optsitem.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch ---
Index: bf_sd/source/ui/app/sd_optsitem.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx,v
retrieving revision 1.4
diff -u -r1.4 sd_optsitem.cxx
--- openoffice.org.orig/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx	7 Sep 2005 23:40:30 -0000	1.4
+++ openoffice.org/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx	12 Jul 2006 12:57:00 -0000
@@ -1591,7 +1591,7 @@
 /*N*/ int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
 /*N*/ {
 /*N*/ 	DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
-/*N*/ 	return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
+/*N*/ 	return( (const SdOptionsPrint&) *this == (const SdOptionsPrint&)(const SdOptionsPrintItem&) rAttr );
 /*N*/ }
 
 // -----------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -r1.762 -r1.763
--- openoffice.org.spec	12 Jul 2006 12:16:27 -0000	1.762
+++ openoffice.org.spec	12 Jul 2006 13:07:42 -0000	1.763
@@ -112,6 +112,7 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
+Patch49: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -850,7 +851,8 @@
 %patch45 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
-# %patch48 -p0 -b .ooobuild.VBAObjects.patch
+%patch48 -p0 -b .ooobuild.VBAObjects.patch
+%patch49 -p0 -b .gcc28357.binfilter.constcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3334,6 +3336,8 @@
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
 - rebuild for new tasty linker hash
+- rh#198603# gcc ate my office suite, add openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
+
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:09:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:09:58 -0400
Subject: rpms/bash/devel bash-infotags.patch,NONE,1.1 bash.spec,1.122,1.123
Message-ID: <200607121309.k6CD9vC9029078@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29031

Modified Files:
	bash.spec 
Added Files:
	bash-infotags.patch 
Log Message:
* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 3.1-17
- Fixed 'tags out of date' problem with 'info bash' (bug #150118).


bash-infotags.patch:
 Makefile.in |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE bash-infotags.patch ---
--- bash-3.1/doc/Makefile.in.infotags	2006-07-12 13:57:18.000000000 +0100
+++ bash-3.1/doc/Makefile.in	2006-07-12 13:58:25.000000000 +0100
@@ -69,7 +69,6 @@
 TEXI2HTML   = ${SUPPORT_SRCDIR}/texi2html
 MAN2HTML    = ${BUILD_DIR}/support/man2html
 HTMLPOST    = ${srcdir}/htmlpost.sh
-INFOPOST    = ${srcdir}/infopost.sh
 QUIETPS	    = #set this to -q to shut up dvips
 PAPERSIZE   = letter	# change to a4 for A4-size paper
 PSDPI       = 600	# could be 300 if you like
@@ -146,7 +145,7 @@
 
 PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps 
 DVIFILES = bashref.dvi bashref.ps
-INFOFILES = bashref.info
+INFOFILES = bashref.info bash.info
 MAN0FILES = bash.0 bashbug.0 builtins.0 rbash.0
 HTMLFILES = bashref.html bash.html
 PDFFILES = bash.pdf bashref.pdf article.pdf rose94.pdf
@@ -167,8 +166,8 @@
 bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
 
-bash.info: bashref.info
-	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+	$(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi -o $@
 
 bash.txt: bash.1
 bash.ps: bash.1


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- bash.spec	12 Jul 2006 05:25:57 -0000	1.122
+++ bash.spec	12 Jul 2006 13:09:55 -0000	1.123
@@ -46,6 +46,7 @@
 Patch126: bash-setlocale.patch
 Patch127: bash-sighandler.patch
 Patch129: bash-read-memleak.patch
+Patch130: bash-infotags.patch
 Prefix: %{_prefix}
 Requires: mktemp
 Obsoletes: bash2 etcskel
@@ -102,6 +103,7 @@
 %patch126 -p1 -b .setlocale
 %patch127 -p1 -b .sighandler
 %patch129 -p1 -b .read-memleak
+%patch130 -p1 -b .infotags
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -234,6 +236,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 3.1-17
+- Fixed 'tags out of date' problem with 'info bash' (bug #150118).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1-16.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:21:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:21:11 -0400
Subject: rpms/prelink/devel .cvsignore, 1.29, 1.30 prelink.spec, 1.38,
	1.39 sources, 1.31, 1.32
Message-ID: <200607121321.k6CDLB8o014881@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14807

Modified Files:
	.cvsignore prelink.spec sources 
Log Message:
0.3.9-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	21 Jun 2006 10:07:33 -0000	1.29
+++ .cvsignore	12 Jul 2006 13:21:08 -0000	1.30
@@ -1 +1 @@
-prelink-20060621.tar.bz2
+prelink-20060712.tar.bz2


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- prelink.spec	12 Jul 2006 07:52:47 -0000	1.38
+++ prelink.spec	12 Jul 2006 13:21:08 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
-Version: 0.3.8
-Release: 1.1
+Version: 0.3.9
+Release: 1
 License: GPL
 Group: System Environment/Base
 %define date 20060621
@@ -90,8 +90,11 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.8-1.1
-- rebuild
+* Wed Jul 12 2006 Jakub Jelinek <jakub at redhat.com> 0.3.9-1
+- DT_GNU_HASH support
+- handle N_BNSYM and N_ENSYM stabs (#198203)
+- handle upgrades from prelink with smaller maxpagesize to prelink
+  with larger maxpagesize (#196941)
 
 * Wed Jun 21 2006 Jakub Jelinek <jakub at redhat.com> 0.3.8-1
 - fix -q mode canonicalization fix, speed up filename canonicalization


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	21 Jun 2006 10:41:42 -0000	1.31
+++ sources	12 Jul 2006 13:21:08 -0000	1.32
@@ -1 +1 @@
-f4d9c801561452b2808b36b985a3aeb2  prelink-20060621.tar.bz2
+6f72c7b02da18b121e0018b827476763  prelink-20060712.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:21:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:21:52 -0400
Subject: rpms/gnome-mag/devel .cvsignore, 1.19, 1.20 gnome-mag.spec, 1.36,
	1.37 sources, 1.19, 1.20
Message-ID: <200607121321.k6CDLq1S015082@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-mag.spec sources 
Log Message:
0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jul 2006 04:49:10 -0000	1.19
+++ .cvsignore	12 Jul 2006 13:21:47 -0000	1.20
@@ -1 +1 @@
-gnome-mag-0.12.6.tar.bz2
+gnome-mag-0.13.0.tar.bz2


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-mag.spec	12 Jul 2006 05:59:23 -0000	1.36
+++ gnome-mag.spec	12 Jul 2006 13:21:49 -0000	1.37
@@ -2,8 +2,8 @@
 
 Summary: GNOME Magnifier
 Name: gnome-mag
-Version: 0.12.6
-Release: 1.1
+Version: 0.13.0
+Release: 1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -69,6 +69,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 0.13.0-1
+- Update to 0.13.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.6-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Jul 2006 04:49:10 -0000	1.19
+++ sources	12 Jul 2006 13:21:49 -0000	1.20
@@ -1 +1 @@
-c402b06408d3b40843720ae09ad74234  gnome-mag-0.12.6.tar.bz2
+977009557cfe3de977ca62daf40cd29a  gnome-mag-0.13.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:25:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:25:51 -0400
Subject: rpms/prelink/devel prelink.spec,1.39,1.40
Message-ID: <200607121325.k6CDPpfF016455@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16428

Modified Files:
	prelink.spec 
Log Message:
0.3.9-1


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- prelink.spec	12 Jul 2006 13:21:08 -0000	1.39
+++ prelink.spec	12 Jul 2006 13:25:48 -0000	1.40
@@ -4,7 +4,7 @@
 Release: 1
 License: GPL
 Group: System Environment/Base
-%define date 20060621
+%define date 20060712
 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:28:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:28:00 -0400
Subject: rpms/atk/devel atk.spec,1.38,1.39
Message-ID: <200607121328.k6CDS0Zl017319@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	atk.spec 
Log Message:
rebuild again



Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- atk.spec	12 Jul 2006 06:06:54 -0000	1.38
+++ atk.spec	12 Jul 2006 13:27:58 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.12.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -69,6 +69,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-2
+- Rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.12.1-1
 - Update to 1.12.1
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:28:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:28:46 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.763,1.764
Message-ID: <200607121328.k6CDSkDo017675@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17619

Modified Files:
	openoffice.org.spec 
Log Message:
lets try the stock roots


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- openoffice.org.spec	12 Jul 2006 13:07:42 -0000	1.763
+++ openoffice.org.spec	12 Jul 2006 13:28:43 -0000	1.764
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 4.vba
+%define rh_rpm_release 5
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:34:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:34:21 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.38,1.39
Message-ID: <200607121334.k6CDYLKE019255@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19231

Modified Files:
	glib-java.spec 
Log Message:
- Do not use macro {?dist}.


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- glib-java.spec	12 Jul 2006 09:58:56 -0000	1.38
+++ glib-java.spec	12 Jul 2006 13:34:19 -0000	1.39
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   1%{?dist}
+Release:   2
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -116,8 +116,11 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-2
+- Do not use macro {?dist}.
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-1
-- Release 0 is not allowed; use %{?dist}
+- Release 0 is not allowed; use macro {?dist}.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:39:37 -0400
Subject: rpms/vsftpd/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 vsftpd.spec, 1.43, 1.44
Message-ID: <200607121339.k6CDdbe5020341@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20317

Modified Files:
	.cvsignore sources vsftpd.spec 
Log Message:
- upgrade to 2.0.5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Jan 2006 10:46:09 -0000	1.11
+++ .cvsignore	12 Jul 2006 13:39:34 -0000	1.12
@@ -1 +1 @@
-vsftpd-2.0.4.tar.gz
+vsftpd-2.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Jan 2006 10:46:09 -0000	1.11
+++ sources	12 Jul 2006 13:39:35 -0000	1.12
@@ -1 +1 @@
-c0bf8c7b8e15ab15827172786fc56115  vsftpd-2.0.4.tar.gz
+146062e8b2f93af43ff6c2c770feea94  vsftpd-2.0.5.tar.gz


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vsftpd.spec	12 Jul 2006 08:45:39 -0000	1.43
+++ vsftpd.spec	12 Jul 2006 13:39:35 -0000	1.44
@@ -2,8 +2,8 @@
 
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
-Version: 2.0.4
-Release: 1.2.1
+Version: 2.0.5
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -134,6 +134,10 @@
 /var/ftp
 
 %changelog
+* Wed Jul 12 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-1
+- upgrade to 2.0.5
+- IE should now show the login dialog again (#191147)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 13:57:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 09:57:17 -0400
Subject: rpms/vim/FC-5 vim-7.0-syntax.patch,1.1,1.2 vim.spec,1.102,1.103
Message-ID: <200607121357.k6CDvHS3018917@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	vim-7.0-syntax.patch vim.spec 
Log Message:
- fix a typo in http.conf syntax file

vim-7.0-syntax.patch:
 filetype.vim |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: vim-7.0-syntax.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim-7.0-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-7.0-syntax.patch	21 Jun 2006 13:24:03 -0000	1.1
+++ vim-7.0-syntax.patch	12 Jul 2006 13:57:14 -0000	1.2
@@ -5,7 +5,7 @@
  " Apache config file
  au BufNewFile,BufRead .htaccess			 setf apache
 -au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
-+au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
++au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache')
  
  " XA65 MOS6510 cross assembler
  au BufNewFile,BufRead *.a65			setf a65


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- vim.spec	26 Jun 2006 15:17:48 -0000	1.102
+++ vim.spec	12 Jul 2006 13:57:14 -0000	1.103
@@ -29,7 +29,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 0.fc5
+Release: 0.fc5.1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -596,6 +596,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jul 12 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-0.fc5.1
+- fix a typo in http.conf syntax file
+
 * Mon Jun 26 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-0.fc5
 - patchlevel 35
 - remove conflicts with some man-page packages



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:02:49 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.764,1.765
Message-ID: <200607121402.k6CE2njO019173@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19145

Modified Files:
	openoffice.org.spec 
Log Message:
patch level


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -r1.764 -r1.765
--- openoffice.org.spec	12 Jul 2006 13:28:43 -0000	1.764
+++ openoffice.org.spec	12 Jul 2006 14:02:47 -0000	1.765
@@ -852,7 +852,7 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p0 -b .gcc28357.binfilter.constcrash.patch
+%patch49 -p1 -b .gcc28357.binfilter.constcrash.patch
 
 tar xzf %{SOURCE1}
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:12:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:12:05 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.33, 1.34 gnome-vfs2.spec, 1.113,
	1.114 sources, 1.33, 1.34
Message-ID: <200607121412.k6CEC5Et019406@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	13 Jun 2006 14:15:08 -0000	1.33
+++ .cvsignore	12 Jul 2006 14:12:03 -0000	1.34
@@ -1 +1 @@
-gnome-vfs-2.15.2.tar.bz2
+gnome-vfs-2.15.3.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gnome-vfs2.spec	12 Jul 2006 06:10:55 -0000	1.113
+++ gnome-vfs2.spec	12 Jul 2006 14:12:03 -0000	1.114
@@ -1,4 +1,3 @@
-%define libbonobo_version 2.2.0
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
@@ -7,11 +6,13 @@
 %define po_package gnome-vfs-2.0
 %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
+%define dbus_version 0.32
+%define hal_version 0.5.7
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
-Version: 2.15.2
-Release: 1.1
+Version: 2.15.3
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -22,10 +23,9 @@
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
-BuildRequires: bonobo-activation-devel, libxml2-devel, zlib-devel
+BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
@@ -39,7 +39,8 @@
 BuildRequires: openssl-devel gamin-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-glib-devel >= 0.6
-BuildRequires: hal-devel >= 0.5.0
+BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
@@ -69,8 +70,8 @@
 Group: Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   GConf2-devel >= %{gconf2_version}
-Requires:   libbonobo-devel >= %{libbonobo_version}
-Conflicts: bonobo-devel < 1.0.8
+Requires:   hal-devel >= %{hal_version}
+Requires:   dbus-devel >= %{dbus_version}
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -191,6 +192,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
+- Update to 2.15.3 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Jun 2006 14:15:08 -0000	1.33
+++ sources	12 Jul 2006 14:12:03 -0000	1.34
@@ -1 +1 @@
-a2bfa7c76d77d777589995634051b293  gnome-vfs-2.15.2.tar.bz2
+f7eb8f2c658d6c8dfc34b5a2161e6890  gnome-vfs-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:13:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:13:50 -0400
Subject: rpms/man-pages/devel man-pages.spec,1.43,1.44
Message-ID: <200607121413.k6CEDoYW019484@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19462

Modified Files:
	man-pages.spec 
Log Message:
- remove btree, dbopen, hash, mpool and recno man-pages



Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- man-pages.spec	29 Jun 2006 10:59:05 -0000	1.43
+++ man-pages.spec	12 Jul 2006 14:13:47 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.34
-Release: 1
+Release: 2
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -126,6 +126,9 @@
 # Part of numactl
 rm -f man2/{mbind,set_mempolicy}.2
 
+# Problem with db x db4 - man pages
+rm -f man3/{btree,dbopen,hash,mpool,recno}.3
+
 find . -name "*sudo*" -exec rm {} \;
 
 for l1 in man[1-9]*/*
@@ -161,6 +164,10 @@
 %{_mandir}/en/man*
 
 %changelog
+* Wed Jul 12 2006 Ivana Varekova <varekova at redhat.com> 2.34-2
+- remove btree, dbopen, hash, mpool and recno man-pages
+  (#198597)
+
 * Thu Jun 29 2006 Ivana Varekova <varekova at redhat.com> 2.34-1
 - update to 2.34
 - add inet patch (#189147)



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:22:58 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.765,
	1.766 openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch,
	1.1, NONE
Message-ID: <200607121422.k6CEMwTk002337@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2321

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch 
Log Message:
was already worked around


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- openoffice.org.spec	12 Jul 2006 14:02:47 -0000	1.765
+++ openoffice.org.spec	12 Jul 2006 14:22:55 -0000	1.766
@@ -112,7 +112,6 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -852,7 +851,6 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gcc28357.binfilter.constcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3336,7 +3334,6 @@
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
 - rebuild for new tasty linker hash
-- rh#198603# gcc ate my office suite, add openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
 
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4


--- openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:23:02 -0400
Subject: rpms/gdm/devel gdm-2.15.5-session-keyring.patch, NONE, 1.1 gdm.spec,
	1.170, 1.171
Message-ID: <200607121423.k6CEN2GB002360@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2323

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.5-session-keyring.patch 
Log Message:
- add new pam module to pam files to support kernel session keyring


gdm-2.15.5-session-keyring.patch:
 gdm                |    1 +
 gdm-autologin      |    1 +
 gdm-securitytokens |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE gdm-2.15.5-session-keyring.patch ---
--- gdm-2.15.5/config/gdm-autologin.session-keyring	2006-07-12 10:18:57.000000000 +0200
+++ gdm-2.15.5/config/gdm-autologin	2006-07-12 10:19:04.000000000 +0200
@@ -6,3 +6,4 @@
 password   required	pam_stack.so service=system-auth
 session    required	pam_stack.so service=system-auth
 session    optional     pam_console.so
+session    optional     pam_keyinit.so force revoke
--- gdm-2.15.5/config/gdm-securitytokens.session-keyring	2006-07-12 10:19:10.000000000 +0200
+++ gdm-2.15.5/config/gdm-securitytokens	2006-07-12 10:19:15.000000000 +0200
@@ -8,3 +8,4 @@
 session    include      system-auth
 session    required     pam_loginuid.so
 session    optional     pam_console.so
+session    optional     pam_keyinit.so force revoke
--- gdm-2.15.5/config/gdm.session-keyring	2006-07-12 10:18:35.000000000 +0200
+++ gdm-2.15.5/config/gdm	2006-07-12 10:18:50.000000000 +0200
@@ -7,4 +7,5 @@
 session    include     system-auth
 session    required    pam_loginuid.so
 session    optional    pam_console.so
+session    optional    pam_keyinit.so force revoke
 


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gdm.spec	12 Jul 2006 05:54:05 -0000	1.170
+++ gdm.spec	12 Jul 2006 14:23:00 -0000	1.171
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.5
-Release: 3.1
+Release: 4
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -47,6 +47,7 @@
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
 Patch21: gdm-2.15.5-security-tokens.patch
+Patch22: gdm-2.15.5-session-keyring.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -127,6 +128,7 @@
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
+%patch22 -p1 -b .session-keyring
 
 # 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
@@ -322,6 +324,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Jul 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.5-4
+- add new pam module to pam files to support kernel session keyring
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.5-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:23:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:23:25 -0400
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.35,1.36
Message-ID: <200607121423.k6CENPKP002454@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2432

Modified Files:
	linuxwacom.spec 
Log Message:
Add a note about package naming.



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- linuxwacom.spec	12 Jul 2006 07:13:54 -0000	1.35
+++ linuxwacom.spec	12 Jul 2006 14:23:23 -0000	1.36
@@ -3,6 +3,11 @@
 %define _x11sdkdir	%(pkg-config --variable=sdkdir xorg-server)
 %define tarname		%{name}-0.7.4-1
 
+# This NEVR violates the package guidelines.  _ is not a valid character in
+# a Version string, even though we really want it to match upstream's
+# numbering.  We can't fix this during the 0.7.4 lifetime, since 0.7.4_*
+# is rpmnewer than 0.7.4.*, so please fix it to 0.7.5.X on next release so
+# we can avoid epoching.
 Name:		linuxwacom
 Version:	0.7.4_1
 Epoch:		0



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:31:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:31:15 -0400
Subject: rpms/glib-java/FC-5 glib-java.spec,1.32,1.33
Message-ID: <200607121431.k6CEVFC0002869@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2826

Modified Files:
	glib-java.spec 
Log Message:
Release 0 is not allowed


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/glib-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- glib-java.spec	17 Jun 2006 19:49:23 -0000	1.32
+++ glib-java.spec	12 Jul 2006 14:30:50 -0000	1.33
@@ -15,14 +15,12 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   0.FC5.build2
+Release:   0.fc5.2
 URL:       http://java-gnome.sourceforge.net
-Source0:   %{name_base}-%{version}.tar.gz
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
 Group:     Development/Libraries
 BuildRoot: %{_tmppath}/glib-java
-# try to make build
-#ExcludeArch: s390x
 
 Requires: 	/sbin/ldconfig
 Requires: 	%{c_pkg_prefix}glib2 >= 2.7.0
@@ -118,6 +116,18 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-2
+- Do not use macro {?dist}.
+
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-1
+- Release 0 is not allowed; use macro {?dist}.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.5-0.1
+- rebuild
+
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-0
+- Use .tar.bz2, not .tar.gz.
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com>    - 0.2.5-0
 - New version.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:42:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:42:14 -0400
Subject: rpms/glib-java/FC-5 .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <200607121442.k6CEgEC5014770@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/glib-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14702

Modified Files:
	.cvsignore sources 
Log Message:
Use tar.bz2, not tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Jun 2006 16:05:39 -0000	1.9
+++ .cvsignore	12 Jul 2006 14:42:12 -0000	1.10
@@ -1 +1 @@
-glib-java-0.2.5.tar.gz
+glib-java-0.2.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib-java/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Jun 2006 16:05:40 -0000	1.9
+++ sources	12 Jul 2006 14:42:12 -0000	1.10
@@ -1 +1 @@
-485ce03efb290bf05666dc42c694a637  glib-java-0.2.5.tar.gz
+83d49e96f6bc806aead66b83be542ef0  glib-java-0.2.5.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:45:35 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.27,1.28
Message-ID: <200607121445.k6CEjZ9v015706@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15674

Modified Files:
	libgconf-java.spec 
Log Message:
New upstream version, 2.12.3.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libgconf-java.spec	12 Jul 2006 06:49:34 -0000	1.27
+++ libgconf-java.spec	12 Jul 2006 14:45:32 -0000	1.28
@@ -11,26 +11,21 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libgconf-java
-%define	version		2.12.1.0.20060301.rh1
-%define release 	2.1
 
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.3
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	GConf2 >= 2.11.2
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.3.0.20060301.rh1
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.0
-BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 3.3.3
-
-# exclude while 390x is borked in beehive
-ExcludeArch: s390x
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
+BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -107,6 +102,10 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
+- New upstream version.
+- Build on s390x again.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1.0.20060301.rh1-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:46:16 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.28,1.29
Message-ID: <200607121446.k6CEkG0k021689@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21335

Modified Files:
	libgconf-java.spec 
Log Message:
New upstream version, 2.12.3.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgconf-java.spec	12 Jul 2006 14:45:32 -0000	1.28
+++ libgconf-java.spec	12 Jul 2006 14:46:12 -0000	1.29
@@ -102,7 +102,7 @@
 %{_datadir}/java/*.zip
 
 %changelog
-* Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - New upstream version.
 - Build on s390x again.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:53:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:53:49 -0400
Subject: rpms/frysk/devel .cvsignore, 1.17, 1.18 frysk.spec, 1.67,
	1.68 sources, 1.17, 1.18
Message-ID: <200607121453.k6CErneK000307@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32746

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version. 0.0.1.2006.07.12.rh1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Jun 2006 16:00:54 -0000	1.17
+++ .cvsignore	12 Jul 2006 14:53:46 -0000	1.18
@@ -1 +1 @@
-frysk-0.0.1.2006.06.28.rh1.tar.bz2
+frysk-0.0.1.2006.07.12.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- frysk.spec	12 Jul 2006 05:52:10 -0000	1.67
+++ frysk.spec	12 Jul 2006 14:53:46 -0000	1.68
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.28.rh1
-Release:	0.1
+Version:	0.0.1.2006.07.12.rh1
+Release:	1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -98,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.12.rh1-1
+- New upstream version.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.06.28.rh1-0.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Jun 2006 16:00:54 -0000	1.17
+++ sources	12 Jul 2006 14:53:46 -0000	1.18
@@ -1 +1 @@
-56ce719074fe92cb9f0bb274d448712e  frysk-0.0.1.2006.06.28.rh1.tar.bz2
+3cfbf1262c50fd4b2b041782eb57eff1  frysk-0.0.1.2006.07.12.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:58:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:58:33 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.33,1.34
Message-ID: <200607121458.k6CEwX1N001919@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1892

Modified Files:
	cairo-java.spec 
Log Message:
- Relese 0 is not allowed.


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cairo-java.spec	12 Jul 2006 04:45:01 -0000	1.33
+++ cairo-java.spec	12 Jul 2006 14:58:29 -0000	1.34
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.4
-Release: 	0.1
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-1
+- Relese 0 is not allowed.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 14:59:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 10:59:28 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.34,1.35
Message-ID: <200607121459.k6CExSsO002152@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2127

Modified Files:
	cairo-java.spec 
Log Message:
typo


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cairo-java.spec	12 Jul 2006 14:58:29 -0000	1.34
+++ cairo-java.spec	12 Jul 2006 14:59:25 -0000	1.35
@@ -112,7 +112,7 @@
 
 %changelog
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-1
-- Relese 0 is not allowed.
+- Release 0 is not allowed.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:05:15 -0400
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.34, 1.35 gnome-vfs2.spec, 1.114,
	1.115 sources, 1.34, 1.35
Message-ID: <200607121505.k6CF5F8P002988@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
include monikers



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	12 Jul 2006 14:12:03 -0000	1.34
+++ .cvsignore	12 Jul 2006 15:05:12 -0000	1.35
@@ -1 +1,2 @@
 gnome-vfs-2.15.3.tar.bz2
+gnome-vfs-monikers-2.15.3.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-vfs2.spec	12 Jul 2006 14:12:03 -0000	1.114
+++ gnome-vfs2.spec	12 Jul 2006 15:05:12 -0000	1.115
@@ -1,3 +1,4 @@
+%define libbonobo_version 2.2.0
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
@@ -16,14 +17,15 @@
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
+Source1: gnome-vfs-monikers-%{version}.tar.bz2
 URL: http://www.gnome.org/
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
+BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -72,6 +74,8 @@
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
+Requires:   libbonobo-devel >= %{libbonobo_version}
+Conflicts: bonobo-devel < 1.0.8
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -103,6 +107,8 @@
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
+tar xjf %{SOURCE1}
+
 %build
 
 if pkg-config openssl ; then
@@ -124,6 +130,11 @@
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
+pushd gnome-vfs-monikers-%{version}
+./configure 
+make LIBTOOL=/usr/bin/libtool
+popd
+
 %install
 rm -fr $RPM_BUILD_ROOT
 
@@ -132,6 +143,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+pushd gnome-vfs-monikers-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+popd
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	12 Jul 2006 14:12:03 -0000	1.34
+++ sources	12 Jul 2006 15:05:12 -0000	1.35
@@ -1 +1,2 @@
 f7eb8f2c658d6c8dfc34b5a2161e6890  gnome-vfs-2.15.3.tar.bz2
+b16f0db0482263be3318e269f52bb5b6  gnome-vfs-monikers-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:05:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:05:17 -0400
Subject: rpms/libwmf/devel libwmf-0.2.8.4-intoverflow.patch, NONE,
	1.1 libwmf.spec, 1.22, 1.23
Message-ID: <200607121505.k6CF5HxC003006@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2956

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-intoverflow.patch 
Log Message:
CVE-2006-3376 libwmf integer overflow

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE libwmf-0.2.8.4-intoverflow.patch ---
--- libwmf-0.2.8.4.orig/src/player.c	2002-12-10 19:30:26.000000000 +0000
+++ libwmf-0.2.8.4/src/player.c	2006-07-12 15:12:52.000000000 +0100
@@ -42,6 +42,7 @@
 #include "player/defaults.h" /* Provides: default settings               */
 #include "player/record.h"   /* Provides: parameter mechanism            */
 #include "player/meta.h"     /* Provides: record interpreters            */
+#include <stdint.h>
 
 /**
  * @internal
@@ -132,8 +134,14 @@
 		}
 	}
 
-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
+	{
+		API->err = wmf_E_InsMem;
+		WMF_DEBUG (API,"bailing...");
+		return (API->err);
+	}
+	
+ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2);
 
 	if (ERR (API))
 	{	WMF_DEBUG (API,"bailing...");


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libwmf.spec	16 May 2006 17:11:52 -0000	1.22
+++ libwmf.spec	12 Jul 2006 15:05:14 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 8
+Release: 9
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Patch2: libwmf-0.2.8.4-fallbackfont.patch
 Patch3: libwmf-0.2.8.4-deps.patch
 Patch4: libwmf-0.2.8.4-multiarchdevel.patch
+Patch5: libwmf-0.2.8.4-intoverflow.patch
 Requires: gtk2 >= 2.9.0
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
@@ -48,6 +49,7 @@
 %patch2 -p1 -b .fallbackfont
 %patch3 -p1 -b .deps
 %patch4 -p1 -b .multiarchdevel
+%patch5 -p1 -b .intoverflow
 
 %build
 rm configure.ac
@@ -105,6 +107,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-9
+- CVE-2006-3376 libwmf integer overflow
+
 * Tue May 16 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-8
 - rh#191971# BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:06:41 -0400
Subject: rpms/cairo-java/FC-5 cairo-java.spec,1.28,1.29
Message-ID: <200607121506.k6CF6fBn003303@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/cairo-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3285

Modified Files:
	cairo-java.spec 
Log Message:
- Release 0 is not allowed.


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/FC-5/cairo-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cairo-java.spec	17 Jun 2006 16:54:58 -0000	1.28
+++ cairo-java.spec	12 Jul 2006 15:06:39 -0000	1.29
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.4
-Release: 	0.FC5
+Release: 	0.fc5.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -111,6 +111,12 @@
 
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-1
+- Release 0 is not allowed.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.1
+- rebuild
+
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-0
 - Use *.tar.bz2, not *.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:07:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:07:07 -0400
Subject: rpms/libwmf/FC-5 libwmf-0.2.8.4-intoverflow.patch, NONE,
	1.1 libwmf.spec, 1.19, 1.20
Message-ID: <200607121507.k6CF76n4003351@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-intoverflow.patch 
Log Message:
CVE-2006-3376 libwmf integer overflow

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE libwmf-0.2.8.4-intoverflow.patch ---
--- libwmf-0.2.8.4.orig/src/player.c	2002-12-10 19:30:26.000000000 +0000
+++ libwmf-0.2.8.4/src/player.c	2006-07-12 15:12:52.000000000 +0100
@@ -42,6 +42,7 @@
 #include "player/defaults.h" /* Provides: default settings               */
 #include "player/record.h"   /* Provides: parameter mechanism            */
 #include "player/meta.h"     /* Provides: record interpreters            */
+#include <stdint.h>
 
 /**
  * @internal
@@ -132,8 +134,14 @@
 		}
 	}
 
-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
+	{
+		API->err = wmf_E_InsMem;
+		WMF_DEBUG (API,"bailing...");
+		return (API->err);
+	}
+	
+ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2);
 
 	if (ERR (API))
 	{	WMF_DEBUG (API,"bailing...");


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-5/libwmf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libwmf.spec	28 Feb 2006 11:13:42 -0000	1.19
+++ libwmf.spec	12 Jul 2006 15:07:02 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 5
+Release: 5.1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Patch1: libwmf-0.2.8.3-relocatablefonts.patch
 Patch2: libwmf-0.2.8.4-fallbackfont.patch
 Patch3: libwmf-0.2.8.4-deps.patch
+Patch4: libwmf-0.2.8.4-intoverflow.patch
 Requires: gtk2 >= 2.4.1-2
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .relocatablefonts
 %patch2 -p1 -b .fallbackfont
 %patch3 -p1 -b .deps
+%patch4 -p1 -b .intoverflow
 
 %build
 rm configure.ac
@@ -100,6 +102,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-5.1
+- CVE-2006-3376 libwmf integer overflow
+
 * Tue Feb 28 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-5
 - rh#143096# extra deps according to libwmf-config
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:07:56 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.115,1.116
Message-ID: <200607121507.k6CF7uNs003556@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
include monikers



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome-vfs2.spec	12 Jul 2006 15:05:12 -0000	1.115
+++ gnome-vfs2.spec	12 Jul 2006 15:07:53 -0000	1.116
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -207,6 +207,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2 
+- Include gnome-vfs-monikers
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3 
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:11:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:11:21 -0400
Subject: rpms/libwmf/FC-4 libwmf-0.2.8.4-intoverflow.patch, NONE,
	1.1 libwmf.spec, 1.8, 1.9
Message-ID: <200607121511.k6CFBLEc004091@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-intoverflow.patch 
Log Message:
CVE-2006-3376 libwmf integer overflow

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE libwmf-0.2.8.4-intoverflow.patch ---
--- libwmf-0.2.8.4.orig/src/player.c	2002-12-10 19:30:26.000000000 +0000
+++ libwmf-0.2.8.4/src/player.c	2006-07-12 15:12:52.000000000 +0100
@@ -42,6 +42,7 @@
 #include "player/defaults.h" /* Provides: default settings               */
 #include "player/record.h"   /* Provides: parameter mechanism            */
 #include "player/meta.h"     /* Provides: record interpreters            */
+#include <stdint.h>
 
 /**
  * @internal
@@ -132,8 +134,14 @@
 		}
 	}
 
-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
+	{
+		API->err = wmf_E_InsMem;
+		WMF_DEBUG (API,"bailing...");
+		return (API->err);
+	}
+	
+ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2);
 
 	if (ERR (API))
 	{	WMF_DEBUG (API,"bailing...");


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-4/libwmf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libwmf.spec	2 Mar 2005 14:15:56 -0000	1.8
+++ libwmf.spec	12 Jul 2006 15:11:19 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.3
-Release: 8
+Release: 9
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Patch1: libwmf-0.2.8.3-relocatablefonts.patch
 Patch2: libwmf-0.2.8.3-warnings.patch
 Patch3: libwmf-0.2.8.3-noextras.patch
+Patch4: libwmf-0.2.8.4-intoverflow.patch
 Requires: gtk2 >= 2.4.1-2
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
@@ -43,6 +44,7 @@
 %patch1 -p1 -b .relocatablefonts
 %patch2 -p1 -b .warnings
 %patch3 -p1 -b .noextras
+%patch4 -p1 -b .intoverflow
 
 %build
 rm configure.ac
@@ -99,6 +101,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-9
+- CVE-2006-3376 libwmf integer overflow
+
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-8
 - rebuild with gcc4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:13:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:13:04 -0400
Subject: rpms/libwmf/FC-4 libwmf.spec,1.9,1.10
Message-ID: <200607121513.k6CFD4lQ004830@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	libwmf.spec 
Log Message:
nvr foo


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-4/libwmf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libwmf.spec	12 Jul 2006 15:11:19 -0000	1.9
+++ libwmf.spec	12 Jul 2006 15:13:01 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.3
-Release: 9
+Release: 8.1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -101,7 +101,7 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-9
+* Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-8.1
 - CVE-2006-3376 libwmf integer overflow
 
 * Wed Mar  2 2005 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-8



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:16:02 -0400
Subject: rpms/kernel/devel linux-2.6-futex-death-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.2380, 1.2381
Message-ID: <200607121516.k6CFG2b1009874@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-futex-death-fix.patch 
Log Message:
PI-futex fix

linux-2.6-futex-death-fix.patch:
 futex.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-futex-death-fix.patch ---

Dave,

could you apply the patch below to Fedora, to make sure we have this 
tested by Ulrich before i send it upstream?

Jakub, do you agree with this approach?

	Ingo

------->
Subject: pi-futex: robust-futex exit
From: Ingo Molnar <mingo at elte.hu>

fix robust PI-futexes to be properly unlocked on unexpected exit.

Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/futex.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: linux-pi-futex.q/kernel/futex.c
===================================================================
--- linux-pi-futex.q.orig/kernel/futex.c
+++ linux-pi-futex.q/kernel/futex.c
@@ -1696,8 +1696,15 @@ retry:
 		if (nval != uval)
 			goto retry;
 
-		if (uval & FUTEX_WAITERS)
+		if (uval & FUTEX_WAITERS) {
+			/*
+			 * It's either a normal futex or a PI futex,
+			 * their wake handlers will determine this
+			 * and only one will succeed:
+		 	 */
 			futex_wake(uaddr, 1);
+			futex_unlock_pi(uaddr);
+		}
 	}
 	return 0;
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2380
retrieving revision 1.2381
diff -u -r1.2380 -r1.2381
--- kernel-2.6.spec	12 Jul 2006 10:27:31 -0000	1.2380
+++ kernel-2.6.spec	12 Jul 2006 15:15:59 -0000	1.2381
@@ -381,6 +381,7 @@
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
+Patch1780: linux-2.6-futex-death-fix.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -939,6 +940,8 @@
 #%patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
+# fix robust PI-futexes to be properly unlocked on unexpected exit.
+%patch1780 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1600,6 +1603,7 @@
 %changelog
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - No headers subpackage for noarch build
+- Fix PI-futexes to be properly unlocked on unexpected exit
 
 * Wed Jul 12 2006 Dave Jones <davej at redhat.com>
 - Add sleazy fpu optimisation.   Apps that heavily



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:16:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:16:24 -0400
Subject: rpms/libwmf/FC-5 libwmf.spec,1.20,1.21
Message-ID: <200607121516.k6CFGOlw013300@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	libwmf.spec 
Log Message:
extra build requires


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-5/libwmf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libwmf.spec	12 Jul 2006 15:07:02 -0000	1.20
+++ libwmf.spec	12 Jul 2006 15:16:22 -0000	1.21
@@ -23,6 +23,8 @@
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: automake14
+BuildRequires: libXt-devel
+BuildRequires: libX11-devel
 
 %description
 A library for reading and converting Windows MetaFile vector graphics (WMF)



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:17:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:17:56 -0400
Subject: rpms/frysk/FC-5 .cvsignore, 1.11, 1.12 frysk.spec, 1.38,
	1.39 sources, 1.12, 1.13 frysk-elf-cxx.patch, 1.1,
	NONE frysk-non-intermediate.patch, 1.1,
	NONE frysk-sscanf.patch, 1.1, NONE frysk-static-link.patch,
	1.1, NONE frysk-unistd.patch, 1.1, NONE frysk_syscall.patch,
	1.1, NONE
Message-ID: <200607121517.k6CFHu3w021791@cvs.devel.redhat.com>

Author: skasal

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

Modified Files:
	.cvsignore frysk.spec sources 
Removed Files:
	frysk-elf-cxx.patch frysk-non-intermediate.patch 
	frysk-sscanf.patch frysk-static-link.patch frysk-unistd.patch 
	frysk_syscall.patch 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2006 21:14:47 -0000	1.11
+++ .cvsignore	12 Jul 2006 15:17:53 -0000	1.12
@@ -1 +1 @@
-frysk-0.0.1.2006.02.19.rh2.tar.bz2
+frysk-0.0.1.2006.07.12.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/frysk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- frysk.spec	17 Jun 2006 23:46:42 -0000	1.38
+++ frysk.spec	12 Jul 2006 15:17:53 -0000	1.39
@@ -1,19 +1,12 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.06.15.rh4
-Release:	0.FC5
+Version:	0.0.1.2006.07.12.rh1
+Release:	0.fc5.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-Patch0:		frysk_syscall.patch
-Patch1:		frysk-sscanf.patch
-Patch2:		frysk-elf-cxx.patch
-Patch3:		frysk-unistd.patch
-Patch4:		frysk-non-intermediate.patch
-Patch5:		frysk-static-link.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	libgtk-java >= 2.8.4
@@ -33,10 +26,9 @@
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
 BuildRequires:  xmlto
-BuildRequires:  gmime
+BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
-BuildRequires:  autoconf automake
 
 # We can only build on i386 for now
 ExclusiveArch: %{ix86} x86_64
@@ -51,12 +43,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
 
 %build 
 
@@ -74,8 +60,6 @@
 
 gcc --version
 
-./bootstrap.sh
-
 # FIXME: Warninggs should be fixed, not suppressed:
 RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /}
 %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@@ -91,56 +75,6 @@
 rm -rf %{buildroot}
 make  DESTDIR=$RPM_BUILD_ROOT  install %{?_smp_mflags}
 
-# FIXME: remove the unwanted files:
-unwanted='usr/bin/addr2line
-   usr/bin/elfcmp
-   usr/bin/elflint
-   usr/bin/findtextrel
-   usr/bin/ld
-   usr/bin/nm
-   usr/bin/objdump
-   usr/bin/ranlib
-   usr/bin/readelf
-   usr/bin/size
-   usr/bin/strings
-   usr/bin/strip
-   usr/include/dwarf.h
-   usr/include/elfutils/elf-knowledge.h
-   usr/include/elfutils/libasm.h
-   usr/include/elfutils/libdw.h
-   usr/include/elfutils/libdwfl.h
-   usr/include/elfutils/libebl.h
-   usr/include/gelf.h
-   usr/include/libelf.h
-   usr/include/nlist.h
-   usr/lib{,64}/elfutils/libebl_alpha-0.120.so
-   usr/lib{,64}/elfutils/libebl_alpha.so
-   usr/lib{,64}/elfutils/libebl_arm-0.120.so
-   usr/lib{,64}/elfutils/libebl_arm.so
-   usr/lib{,64}/elfutils/libebl_i386-0.120.so
-   usr/lib{,64}/elfutils/libebl_i386.so
-   usr/lib{,64}/elfutils/libebl_ia64-0.120.so
-   usr/lib{,64}/elfutils/libebl_ia64.so
-   usr/lib{,64}/elfutils/libebl_ppc-0.120.so
-   usr/lib{,64}/elfutils/libebl_ppc.so
-   usr/lib{,64}/elfutils/libebl_ppc64-0.120.so
-   usr/lib{,64}/elfutils/libebl_ppc64.so
-   usr/lib{,64}/elfutils/libebl_s390-0.120.so
-   usr/lib{,64}/elfutils/libebl_s390.so
-   usr/lib{,64}/elfutils/libebl_sh-0.120.so
-   usr/lib{,64}/elfutils/libebl_sh.so
-   usr/lib{,64}/elfutils/libebl_sparc-0.120.so
-   usr/lib{,64}/elfutils/libebl_sparc.so
-   usr/lib{,64}/elfutils/libebl_x86_64-0.120.so
-   usr/lib{,64}/elfutils/libebl_x86_64.so
-   usr/lib{,64}/lib{asm,dw,ebl,elf}*
-'
-(cd $RPM_BUILD_ROOT && eval rm $unwanted)
-
-# For moment, keep off menu (but if someone wants to enable it they
-# can).
-echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop
-
 %post
 /sbin/ldconfig
 
@@ -164,6 +98,23 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.12.rh1-1
+- New upstream version.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.06.28.rh1-0.1
+- rebuild
+
+* Wed Jun 28 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1-1
+- Remove  BuildRequires:  autoconf automake
+
+* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.28.rh1-0
+- Refresh the tarball.
+- Remove the patches, they are all upstream now.
+- BuildRequires: sharutils, instead of gmime.
+- Do not remove the unwanted files, they should not be installed anymore.
+- Do not hide the menu entry.
+- Do not call ./bootstrap.sh.
+
 * Fri Jun 16 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.15-3
 - Add the non-intermediate hack.
 - Remove more unwanted files.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Jun 2006 23:46:42 -0000	1.12
+++ sources	12 Jul 2006 15:17:54 -0000	1.13
@@ -1 +1 @@
-177ecac75e299933d845f3519ad2bee3  frysk-0.0.1.2006.06.15.rh4.tar.bz2
+3cfbf1262c50fd4b2b041782eb57eff1  frysk-0.0.1.2006.07.12.rh1.tar.bz2


--- frysk-elf-cxx.patch DELETED ---


--- frysk-non-intermediate.patch DELETED ---


--- frysk-sscanf.patch DELETED ---


--- frysk-static-link.patch DELETED ---


--- frysk-unistd.patch DELETED ---


--- frysk_syscall.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:19:58 -0400
Subject: rpms/libraw1394/devel libraw1394.spec,1.18,1.19
Message-ID: <200607121519.k6CFJwij022611@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22583

Modified Files:
	libraw1394.spec 
Log Message:
Bump to 1.2.1, add %dist tag


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libraw1394.spec	12 Jul 2006 06:55:35 -0000	1.18
+++ libraw1394.spec	12 Jul 2006 15:19:56 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Library providing low-level IEEE-1394 access
 Name: libraw1394
-Version: 1.2.0
-Release: 3.fc5.2.1
+Version: 1.2.1
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -61,6 +61,10 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jarod Wilson <jwilson at redhat.com> - 1.2.1-1
+- update to 1.2.1
+- use %dist tag
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.fc5.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:21:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:21:08 -0400
Subject: rpms/libraw1394/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <200607121521.k6CFL8qU023096@cvs.devel.redhat.com>

Author: jwilson

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23074

Modified Files:
	.cvsignore sources 
Log Message:
update sources w/1.2.1 tarball


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jul 2005 03:00:34 -0000	1.6
+++ .cvsignore	12 Jul 2006 15:21:04 -0000	1.7
@@ -1 +1,2 @@
 libraw1394-1.2.0.tar.gz
+libraw1394-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jul 2005 03:00:48 -0000	1.6
+++ sources	12 Jul 2006 15:21:04 -0000	1.7
@@ -1 +1,2 @@
 eea394f74afecd6a22f74110128c9fb6  libraw1394-1.2.0.tar.gz
+e6210ff05b7f4ec0401ad3d11f493e1a  libraw1394-1.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:34:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:34:14 -0400
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.154,1.155
Message-ID: <200607121534.k6CFYEHi026994@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	glibc-kernheaders.spec 
Log Message:
resurrect


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- glibc-kernheaders.spec	12 Jul 2006 09:08:05 -0000	1.154
+++ glibc-kernheaders.spec	12 Jul 2006 15:34:12 -0000	1.155
@@ -3,12 +3,12 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 45.2
+Release: 45.3
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
-#Obsoletes: kernel-headers
-#Provides: kernel-headers = %{KVER}
+Obsoletes: kernel-headers
+Provides: kernel-headers = %{KVER}
 Prereq: fileutils initscripts >= 5.83
 BuildRequires: unifdef
 %undefine _enable_debug_packages
@@ -108,6 +108,9 @@
 /usr/include/*
 
 %changelog
+* Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45.3
+- Un-neuter it for now, till the mass rebuild is over
+
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-45.2
 - Neuter package until it's killed off properly.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:34:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:34:57 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2381,1.2382
Message-ID: <200607121534.k6CFYvpL027123@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable headers till the rebuild is over


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2381
retrieving revision 1.2382
diff -u -r1.2381 -r1.2382
--- kernel-2.6.spec	12 Jul 2006 15:15:59 -0000	1.2381
+++ kernel-2.6.spec	12 Jul 2006 15:34:47 -0000	1.2382
@@ -13,7 +13,7 @@
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
-%define buildheaders 1
+%define buildheaders 0
 
 # Versions of various parts
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:35:47 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2382,1.2383
Message-ID: <200607121535.k6CFZlMP027382@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
with changelog


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2382
retrieving revision 1.2383
diff -u -r1.2382 -r1.2383
--- kernel-2.6.spec	12 Jul 2006 15:34:47 -0000	1.2382
+++ kernel-2.6.spec	12 Jul 2006 15:35:45 -0000	1.2383
@@ -1602,6 +1602,10 @@
 
 %changelog
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
+- Temporarily disable -headers subpackage until the problems which 
+  arise from brew not using older package are dealt with.
+
+* Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - No headers subpackage for noarch build
 - Fix PI-futexes to be properly unlocked on unexpected exit
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:40:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:40:31 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.58,1.59
Message-ID: <200607121540.k6CFeVc9028884@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28842

Modified Files:
	libgtk-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- libgtk-java.spec	12 Jul 2006 06:53:14 -0000	1.58
+++ libgtk-java.spec	12 Jul 2006 15:40:28 -0000	1.59
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.5
-Release: 	0.1
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-1
+- Release 0 is not allowed.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:41:14 -0400
Subject: rpms/libgtk-java/FC-5 libgtk-java.spec,1.48,1.49
Message-ID: <200607121541.k6CFfE8e029179@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29154

Modified Files:
	libgtk-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/FC-5/libgtk-java.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgtk-java.spec	17 Jun 2006 21:12:08 -0000	1.48
+++ libgtk-java.spec	12 Jul 2006 15:41:12 -0000	1.49
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.5
-Release: 	0.FC5
+Release: 	0.fc5.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -121,6 +121,12 @@
 
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-1
+- Release 0 is not allowed.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-0.1
+- rebuild
+
 * Sat Jun 17 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-0
 - Use .tar.bz2, not .tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:45:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:45:58 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.36,1.37
Message-ID: <200607121545.k6CFjwwL000730@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv519

Modified Files:
	libgnome-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgnome-java.spec	12 Jul 2006 06:51:21 -0000	1.36
+++ libgnome-java.spec	12 Jul 2006 15:45:55 -0000	1.37
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.3
-Release: 	0.1
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
+- Release 0 is not allowed.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:46:22 -0400
Subject: rpms/libgnome-java/FC-5 libgnome-java.spec,1.31,1.32
Message-ID: <200607121546.k6CFkMik004006@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3792

Modified Files:
	libgnome-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/libgnome-java.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgnome-java.spec	17 Jun 2006 22:28:42 -0000	1.31
+++ libgnome-java.spec	12 Jul 2006 15:46:19 -0000	1.32
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.3
-Release: 	0.FC5
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,6 +107,12 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
+- Release 0 is not allowed.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-0.1
+- rebuild
+
 * Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-0
 - Use .tar.bz2, not tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:47:00 -0400
Subject: rpms/libgnome-java/FC-5 libgnome-java.spec,1.32,1.33
Message-ID: <200607121547.k6CFl0b8009434@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgnome-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9072

Modified Files:
	libgnome-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/FC-5/libgnome-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgnome-java.spec	12 Jul 2006 15:46:19 -0000	1.32
+++ libgnome-java.spec	12 Jul 2006 15:46:58 -0000	1.33
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.3
-Release: 	1
+Release: 	0.fc5.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:48:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:48:05 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.40,1.41
Message-ID: <200607121548.k6CFm54c014250@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14234

Modified Files:
	libglade-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libglade-java.spec	12 Jul 2006 06:50:01 -0000	1.40
+++ libglade-java.spec	12 Jul 2006 15:48:02 -0000	1.41
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.4
-Release: 	0.1
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -118,6 +118,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- Release 0 is not allowed.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.4-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:48:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:48:38 -0400
Subject: rpms/libglade-java/FC-5 libglade-java.spec,1.32,1.33
Message-ID: <200607121548.k6CFmcUD014511@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libglade-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14484

Modified Files:
	libglade-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/FC-5/libglade-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libglade-java.spec	17 Jun 2006 22:38:50 -0000	1.32
+++ libglade-java.spec	12 Jul 2006 15:48:35 -0000	1.33
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.4
-Release: 	0.FC5
+Release: 	0.fc5.1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -118,6 +118,12 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- Release 0 is not allowed.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.4-0.1
+- rebuild
+
 * Sun Jun 18 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-0
 - Use .tar.bz2 instead of .tar.gz.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:49:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:49:28 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.21,1.22
Message-ID: <200607121549.k6CFnSBL014912@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14887

Modified Files:
	libvte-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvte-java.spec	12 Jul 2006 06:58:51 -0000	1.21
+++ libvte-java.spec	12 Jul 2006 15:49:26 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.0
-Release:   0.1
+Release:   1
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -96,6 +96,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-1
+- Release 0 is not allowed.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.0-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:49:59 -0400
Subject: rpms/libvte-java/FC-5 libvte-java.spec,1.13,1.14
Message-ID: <200607121549.k6CFnxrf015185@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libvte-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15136

Modified Files:
	libvte-java.spec 
Log Message:
- Release 0 is not allowed.


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/FC-5/libvte-java.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libvte-java.spec	17 Jun 2006 22:25:00 -0000	1.13
+++ libvte-java.spec	12 Jul 2006 15:49:56 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.0
-Release:   0.FC5
+Release:   0.fc5.1
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -96,6 +96,12 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-1
+- Release 0 is not allowed.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.12.0-0.1
+- rebuild
+
 * Wed Jun 14 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-0
 - New version.
 - Remove libgnomeui{,-devel} and libgnomecanvas{,-devel}; upstream have



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:50:54 -0400
Subject: rpms/eel2/devel .cvsignore, 1.35, 1.36 eel2.spec, 1.49, 1.50 sources,
	1.35, 1.36
Message-ID: <200607121550.k6CFoska015571@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15512

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Jun 2006 14:05:04 -0000	1.35
+++ .cvsignore	12 Jul 2006 15:50:52 -0000	1.36
@@ -1 +1 @@
-eel-2.15.2.tar.bz2
+eel-2.15.4.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- eel2.spec	13 Jun 2006 14:05:05 -0000	1.49
+++ eel2.spec	12 Jul 2006 15:50:52 -0000	1.50
@@ -15,7 +15,7 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library
-Version: 	2.15.2
+Version: 	2.15.4
 Release: 	1
 License: 	LGPL
 Group: System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Jun 2006 14:05:05 -0000	1.35
+++ sources	12 Jul 2006 15:50:52 -0000	1.36
@@ -1 +1 @@
-84a66b6633b18d8d7ed884847db55d67  eel-2.15.2.tar.bz2
+52a3b2e23aec64b613afb721a67c3d38  eel-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:53:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:53:01 -0400
Subject: rpms/libgconf-java/devel .cvsignore, 1.11, 1.12 sources, 1.12,
	1.13 libgconf-java-gtk-jar.patch, 1.2,
	NONE libgconf-java-install.patch, 1.2, NONE
Message-ID: <200607121553.k6CFr1Gv016309@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16276

Modified Files:
	.cvsignore sources 
Removed Files:
	libgconf-java-gtk-jar.patch libgconf-java-install.patch 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2006 22:05:51 -0000	1.11
+++ .cvsignore	12 Jul 2006 15:52:58 -0000	1.12
@@ -1,2 +1 @@
-libgconf-java-2.12.1.tar.gz
-libgconf-java-2.12.1.0.20060301.rh1.tar.gz
+libgconf-java-2.12.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Mar 2006 22:05:51 -0000	1.12
+++ sources	12 Jul 2006 15:52:58 -0000	1.13
@@ -1 +1 @@
-022ec1400619cd666a418388da41cdfd  libgconf-java-2.12.1.0.20060301.rh1.tar.gz
+0498ac34333ddfc24b0b1b2e33ac8315  libgconf-java-2.12.3.tar.bz2


--- libgconf-java-gtk-jar.patch DELETED ---


--- libgconf-java-install.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 15:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 11:56:26 -0400
Subject: rpms/libgconf-java/FC-5 .cvsignore, 1.11, 1.12 libgconf-java.spec,
	1.23, 1.24 sources, 1.12, 1.13 libgconf-java-gtk-jar.patch,
	1.2, NONE libgconf-java-install.patch, 1.2, NONE
Message-ID: <200607121556.k6CFuQMT017729@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17567

Modified Files:
	.cvsignore libgconf-java.spec sources 
Removed Files:
	libgconf-java-gtk-jar.patch libgconf-java-install.patch 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	1 Mar 2006 22:05:51 -0000	1.11
+++ .cvsignore	12 Jul 2006 15:56:24 -0000	1.12
@@ -1,2 +1 @@
-libgconf-java-2.12.1.tar.gz
-libgconf-java-2.12.1.0.20060301.rh1.tar.gz
+libgconf-java-2.12.3.tar.bz2


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/libgconf-java.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libgconf-java.spec	1 Mar 2006 22:05:51 -0000	1.23
+++ libgconf-java.spec	12 Jul 2006 15:56:24 -0000	1.24
@@ -11,26 +11,21 @@
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
 %define	name_base	libgconf-java
-%define	version		2.12.1.0.20060301.rh1
-%define release 	0
 
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
-Version:	%{version}
-Release: 	%{release}
+Version:	2.12.3
+Release: 	1
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
-Source:		%{name_base}-%{version}.tar.gz
+Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/2.12/%{name_base}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	GConf2 >= 2.11.2
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.3.0.20060301.rh1
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.0
-BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 3.3.3
-
-# exclude while 390x is borked in beehive
-ExcludeArch: s390x
+Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
+BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -63,7 +58,8 @@
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
 zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
 pushd src/java
-zip -9 -r $zipfile $(find -name \*.java)
+find -name \*.java | xargs touch --date=1/1/1970
+zip -X -9 -r $zipfile . -i \*.java
 popd
 
 %install
@@ -106,6 +102,20 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
+- New upstream version.
+- Build on s390x again.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1.0.20060301.rh1-2.1
+- rebuild
+
+* Wed May 24 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.1.0.20060301.rh1-2
+- Change mod time of all java source files for the src zip.
+
+* Tue May 23 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.1.0.20060301.rh1-1
+- Add -X to src zip and ensure Config.java has the same mod time across
+  platforms - needed for multilib.
+
 * Wed Mar 01 2006 Adam Jocksch <ajocksch at redhat.com> - 2.12.1.0.20060301.rh1-0
 - Imported new tarball to address bg #183538, updated dependancies.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Mar 2006 22:05:51 -0000	1.12
+++ sources	12 Jul 2006 15:56:24 -0000	1.13
@@ -1 +1 @@
-022ec1400619cd666a418388da41cdfd  libgconf-java-2.12.1.0.20060301.rh1.tar.gz
+0498ac34333ddfc24b0b1b2e33ac8315  libgconf-java-2.12.3.tar.bz2


--- libgconf-java-gtk-jar.patch DELETED ---


--- libgconf-java-install.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 16:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 12:17:58 -0400
Subject: rpms/libwnck/devel .cvsignore, 1.34, 1.35 libwnck.spec, 1.50,
	1.51 sources, 1.34, 1.35
Message-ID: <200607121617.k6CGHwHF005876@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5811

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Jun 2006 15:49:50 -0000	1.34
+++ .cvsignore	12 Jul 2006 16:17:55 -0000	1.35
@@ -1 +1 @@
-libwnck-2.15.3.tar.bz2
+libwnck-2.15.4.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libwnck.spec	12 Jul 2006 06:58:58 -0000	1.50
+++ libwnck.spec	12 Jul 2006 16:17:55 -0000	1.51
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.15.3
-Release: 1.1
+Version: 2.15.4
+Release: 1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -90,6 +90,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	13 Jun 2006 15:49:50 -0000	1.34
+++ sources	12 Jul 2006 16:17:55 -0000	1.35
@@ -1 +1 @@
-6e9ef41d1aa9e81d6bc33047cccbe07f  libwnck-2.15.3.tar.bz2
+f9f586cb28758b7356ee27e6bd25d1f4  libwnck-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 16:51:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 12:51:19 -0400
Subject: rpms/gcalctool/devel .cvsignore, 1.6, 1.7 gcalctool.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200607121651.k6CGpJ8m031149@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gcalctool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31096

Modified Files:
	.cvsignore gcalctool.spec sources 
Log Message:
5.8.17



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 May 2006 17:43:07 -0000	1.6
+++ .cvsignore	12 Jul 2006 16:51:17 -0000	1.7
@@ -1 +1 @@
-gcalctool-5.8.13.tar.bz2
+gcalctool-5.8.17.tar.bz2


Index: gcalctool.spec
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gcalctool.spec	12 Jul 2006 05:53:12 -0000	1.18
+++ gcalctool.spec	12 Jul 2006 16:51:17 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gcalctool
-Version:        5.8.16
-Release:        2.1
+Version:        5.8.17
+Release:        1
 Summary:        A desktop calculator
 
 Group:          Applications/System
@@ -92,7 +92,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 5.8.17-1
+- Update to 5.8.17
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.8.16-2.1
 - rebuild
 
 * Mon Jun 12 2006 Matthias Clasen <mclasen at redhat.com> 5.8.16-2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Jun 2006 03:19:21 -0000	1.7
+++ sources	12 Jul 2006 16:51:17 -0000	1.8
@@ -1 +1 @@
-3c14ad97edd4e445b14ca99bb7c60e5b  gcalctool-5.8.16.tar.bz2
+2cf984fcec7db4796edf242405b297f9  gcalctool-5.8.17.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 16:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 12:57:24 -0400
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.9,
	1.10
Message-ID: <200607121657.k6CGvOpP001126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1097

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
bump


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-codec.spec	12 Jul 2006 06:27:40 -0000	1.9
+++ jakarta-commons-codec.spec	12 Jul 2006 16:57:22 -0000	1.10
@@ -2,7 +2,7 @@
 %define short_name commons-%{base_name}
 %define name       jakarta-%{short_name}
 %define version    1.3
-%define release    2jpp_5fc
+%define release    2jpp_5.1fc
 %define section    free
 
 Name:           %{name}
@@ -108,7 +108,7 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5fc
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5.1fc
 - rebuild
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3-2jpp_4fc



From fedora-cvs-commits at redhat.com  Wed Jul 12 16:58:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 12:58:26 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.9, 1.10
Message-ID: <200607121658.k6CGwQ99001606@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1580

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:
bump


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-httpclient.spec	12 Jul 2006 06:28:54 -0000	1.9
+++ jakarta-commons-httpclient.spec	12 Jul 2006 16:58:23 -0000	1.10
@@ -1,7 +1,7 @@
 %define short_name httpclient
 %define name       jakarta-commons-%{short_name}
 %define version    3.0
-%define release    0.rc2.0jpp_5fc
+%define release    0.rc2.0jpp_5.1fc
 %define section    free
 
 Name:           %{name}
@@ -142,7 +142,7 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_5fc
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_5.1fc
 - rebuild
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:3.0-0.rc2.0jpp_4fc



From fedora-cvs-commits at redhat.com  Wed Jul 12 16:59:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 12:59:58 -0400
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.25,1.26
Message-ID: <200607121659.k6CGxw3W002283@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBI.spec 
Log Message:
bump


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-DBI.spec	12 Jul 2006 07:45:00 -0000	1.25
+++ perl-DBI.spec	12 Jul 2006 16:59:55 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.50
-Release: 	2.2.1
+Release: 	3
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.50-3
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.2



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:02:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:02:25 -0400
Subject: rpms/tcl/devel tcl.spec,1.21,1.22
Message-ID: <200607121702.k6CH2PZC002562@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcl.spec 
Log Message:
bump


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tcl.spec	12 Jul 2006 08:25:58 -0000	1.21
+++ tcl.spec	12 Jul 2006 17:02:04 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -148,7 +148,7 @@
 %doc %{name}%{version}/html/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-1.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-1.2
 - rebuild
 
 * Wed Apr 19 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:07:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:07:09 -0400
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.18,1.19
Message-ID: <200607121707.k6CH79V2003016@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2991

Modified Files:
	wpa_supplicant.spec 
Log Message:
bump


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wpa_supplicant.spec	12 Jul 2006 08:50:47 -0000	1.18
+++ wpa_supplicant.spec	12 Jul 2006 17:07:06 -0000	1.19
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 10.fc6.1
+Release: 10.1.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -131,7 +131,7 @@
 %{_bindir}/wpa_gui
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.8-10.1
 - rebuild
 
 * Thu Apr 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-10



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:09:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:09:19 -0400
Subject: rpms/gnome-themes/devel gnome-themes.spec,1.61,1.62
Message-ID: <200607121709.k6CH9IJ4003339@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes.spec 
Log Message:
2.15.4



Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-themes.spec	13 Jun 2006 16:55:20 -0000	1.61
+++ gnome-themes.spec	12 Jul 2006 17:09:16 -0000	1.62
@@ -1,14 +1,12 @@
 %define clearlooks_version 0.6.2
-%define clearlooks_metacity_version 2.0
 
 Summary: Themes collection for GNOME
 Name: gnome-themes
-Version: 2.15.3
+Version: 2.15.4
 Release: 1
 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
 Patch2: gnome-themes-2.15.2-clearlooks.patch
 Patch3: clearlooks-0.5-inherit-bluecurve.patch
 Patch4: gnome-themes-2.11.90-redmond.patch
@@ -40,11 +38,6 @@
 %patch3 -p1 -b .inherit-bluecurve
 popd
 
-pushd metacity-themes
-rm -rf Clearlooks
-tar xzf %{SOURCE2}
-popd
-
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks/icons icon-themes/Clearlooks
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-DeepSky gtk-themes
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Olive gtk-themes
@@ -91,6 +84,10 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+- Drop the variant of the Clearlooks metacity theme
+ 
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:10:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:10:50 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.13,1.14
Message-ID: <200607121710.k6CHAoaB004014@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3976

Modified Files:
	xmlrpc.spec 
Log Message:
bump


Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xmlrpc.spec	12 Jul 2006 08:54:42 -0000	1.13
+++ xmlrpc.spec	12 Jul 2006 17:10:47 -0000	1.14
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_8fc
+%define release		1jpp_8.1fc
 %define	section		free
 %define gcj_support     1
 
@@ -114,7 +114,7 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_8fc
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_8.1fc
 - rebuild
 
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.0.1-1jpp_7fc



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:13:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:13:16 -0400
Subject: rpms/xorg-x11-drv-jamstudio/devel xorg-x11-drv-jamstudio.spec, 1.11,
	1.12
Message-ID: <200607121713.k6CHDG6r011609@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-jamstudio.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-jamstudio.spec	12 Jul 2006 09:00:47 -0000	1.11
+++ xorg-x11-drv-jamstudio.spec	12 Jul 2006 17:13:14 -0000	1.12
@@ -55,7 +55,7 @@
 %{_mandir}/man4/js_x.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-1.1
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:14:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:14:47 -0400
Subject: rpms/gnome-menus/devel .cvsignore, 1.12, 1.13 gnome-menus.spec, 1.32,
	1.33 sources, 1.12, 1.13
Message-ID: <200607121714.k6CHEl8v015820@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-menus.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Apr 2006 16:34:04 -0000	1.12
+++ .cvsignore	12 Jul 2006 17:14:45 -0000	1.13
@@ -1,8 +1 @@
-<<<<<<< .cvsignore
-gnome-menus-2.11.91.tar.bz2
-gnome-menus-2.12.0.tar.bz2
-=======
-gnome-menus-2.12.0.tar.bz2
->>>>>>> 1.10
-gnome-menus-2.13.5.tar.bz2
-gnome-menus-2.14.0.tar.bz2
+gnome-menus-2.15.4.1.tar.bz2


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-menus.spec	12 Jul 2006 05:59:37 -0000	1.32
+++ gnome-menus.spec	12 Jul 2006 17:14:45 -0000	1.33
@@ -6,8 +6,8 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.14.0
-Release: 4.1
+Version: 2.15.4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Apr 2006 16:34:04 -0000	1.12
+++ sources	12 Jul 2006 17:14:45 -0000	1.13
@@ -1 +1 @@
-7aa0c08fc8b9caabb4be46e1cfb595fc  gnome-menus-2.14.0.tar.bz2
+2a28a9abba689205a05ece3d0fa93a0b  gnome-menus-2.15.4.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:15:52 -0400
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.13,
	1.14
Message-ID: <200607121715.k6CHFqLM018326@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
bump


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-rendition.spec	12 Jul 2006 09:07:13 -0000	1.13
+++ xorg-x11-drv-rendition.spec	12 Jul 2006 17:15:49 -0000	1.14
@@ -58,7 +58,7 @@
 %{_mandir}/man4/rendition.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.0-3.1
 - rebuild
 
 * Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 4.1.0-3



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:35 -0400
Subject: rpms/evince/devel evince.spec,1.53,1.54
Message-ID: <200607121723.k6CHNZ5K030988@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30975

Modified Files:
	evince.spec 
Log Message:
bumped for rebuild


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- evince.spec	12 Jul 2006 04:14:10 -0000	1.53
+++ evince.spec	12 Jul 2006 17:23:33 -0000	1.54
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.4
-Release:	1
+Release:	1.1
 Summary:	Document viewer
 
 License: 	GPL
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-1
 - Update to 0.5.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:40 -0400
Subject: rpms/finger/devel finger.spec,1.21,1.22
Message-ID: <200607121723.k6CHNePP031044@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/finger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31031

Modified Files:
	finger.spec 
Log Message:
bumped for rebuild


Index: finger.spec
===================================================================
RCS file: /cvs/dist/rpms/finger/devel/finger.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- finger.spec	11 Feb 2006 02:44:14 -0000	1.21
+++ finger.spec	12 Jul 2006 17:23:38 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The finger client.
 Name: finger
 Version: 0.17
-Release: 32.2
+Release: 32.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.2.1
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:43 -0400
Subject: rpms/fontconfig/devel fontconfig.spec,1.78,1.79
Message-ID: <200607121723.k6CHNh6g031099@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	fontconfig.spec 
Log Message:
bumped for rebuild


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- fontconfig.spec	2 Jun 2006 16:33:32 -0000	1.78
+++ fontconfig.spec	12 Jul 2006 17:23:41 -0000	1.79
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 4
+Release: 4.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.95-4.1
+- rebuild
+
 * Fri Jun  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.95-4
 - Fix the handling of TTF font collections
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:47 -0400
Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.17,
	1.18
Message-ID: <200607121723.k6CHNl76031153@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31140

Modified Files:
	gnome-keyring-manager.spec 
Log Message:
bumped for rebuild


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-keyring-manager.spec	29 May 2006 12:34:45 -0000	1.17
+++ gnome-keyring-manager.spec	12 Jul 2006 17:23:45 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
 Version: 2.14.0
-Release: 2
+Release: 2.1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1
+- rebuild
+
 * Mon May 29 2006 Alexander Larsson <alexl at redhat.com> - 2.14.0-2
 - buildrequire gettext and perl-XML-Parser
 - Fixed summary (#151022)



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:50 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.44,
	1.45
Message-ID: <200607121723.k6CHNoJW031207@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31194

Modified Files:
	gnome-volume-manager.spec 
Log Message:
bumped for rebuild


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-volume-manager.spec	9 Jun 2006 23:05:59 -0000	1.44
+++ gnome-volume-manager.spec	12 Jul 2006 17:23:48 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.15
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.15-3.1
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 1.5.15-3
 - Drop gratitious dependency on gnome-mime-data
 - Add missing BuildRequires



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:53 -0400
Subject: rpms/icu/devel icu.spec,1.18,1.19
Message-ID: <200607121723.k6CHNrIL031261@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31248

Modified Files:
	icu.spec 
Log Message:
bumped for rebuild


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- icu.spec	10 Jun 2006 10:04:04 -0000	1.18
+++ icu.spec	12 Jul 2006 17:23:51 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.4
-Release: 	10
+Release: 	10.1
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1
+- rebuild
+
 * Sat Jun 10 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-10
 - rh#194686# BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:23:56 -0400
Subject: rpms/inn/devel inn.spec,1.31,1.32
Message-ID: <200607121723.k6CHNuco031315@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31302

Modified Files:
	inn.spec 
Log Message:
bumped for rebuild


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- inn.spec	21 Jun 2006 13:39:59 -0000	1.31
+++ inn.spec	12 Jul 2006 17:23:54 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.3
-Release: 4
+Release: 4.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -291,6 +291,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-4.1
+- rebuild
+
 * Wed Jun 21 2006 Martin Stransky <stransky at redhat.com> 2.4.3-4
 - enabled ipv6 support
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:00 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.13,
	1.14
Message-ID: <200607121724.k6CHO0vV031369@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31356

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
bumped for rebuild


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- iscsi-initiator-utils.spec	21 Jun 2006 17:43:58 -0000	1.13
+++ iscsi-initiator-utils.spec	12 Jul 2006 17:23:57 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.0.5.595
-Release: 2
+Release: 2.1
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@@ -76,6 +76,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.5.595-2.1
+- rebuild
+
 * Wed Jun 21 2006 Mike Christie <mchristi at redhat.com> - 6.0.5.595-2
 - add PatM's statics.c file. This is needed for boot since 
   there is no getpwuid static available at that time.



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:03 -0400
Subject: rpms/jdepend/devel jdepend.spec,1.14,1.15
Message-ID: <200607121724.k6CHO3SK031423@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jdepend/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31410

Modified Files:
	jdepend.spec 
Log Message:
bumped for rebuild


Index: jdepend.spec
===================================================================
RCS file: /cvs/dist/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jdepend.spec	9 Dec 2005 22:41:04 -0000	1.14
+++ jdepend.spec	12 Jul 2006 17:24:01 -0000	1.15
@@ -1,11 +1,11 @@
 %define name		jdepend
 %define version		2.6
-%define release 2jpp_4fc.1
+%define release 2jpp_4fc.1.1
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}.1.1
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
@@ -79,6 +79,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6-2jpp_4fc.1.1.1.1
+- rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:09 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.8,1.9
Message-ID: <200607121724.k6CHO9Ls031480@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31467

Modified Files:
	jgroups.spec 
Log Message:
bumped for rebuild


Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jgroups.spec	6 Mar 2006 22:01:41 -0000	1.8
+++ jgroups.spec	12 Jul 2006 17:24:06 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		jgroups
 Version:	2.2.6
-Release: 	1jpp_4fc
+Release: 	1jpp_5fc
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -104,6 +104,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.2.6-1jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.2.6-1jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:20 -0400
Subject: rpms/k3b/devel k3b.spec,1.31,1.32
Message-ID: <200607121724.k6CHOKE4031535@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31522

Modified Files:
	k3b.spec 
Log Message:
bumped for rebuild


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- k3b.spec	12 Jun 2006 15:22:17 -0000	1.31
+++ k3b.spec	12 Jul 2006 17:24:17 -0000	1.32
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.15
-Release: 3
+Release: 3.1
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.15-3.1
+- rebuild
+
 * Mon Jun 12 2006 Harald Hoyer <harald at redhat.com> - 0:0.12.15-3
 - fixed symlinks
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:23 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.17,1.18
Message-ID: <200607121724.k6CHONgu031590@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeaccessibility.spec 
Log Message:
bumped for rebuild


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdeaccessibility.spec	2 Jun 2006 21:47:50 -0000	1.17
+++ kdeaccessibility.spec	12 Jul 2006 17:24:21 -0000	1.18
@@ -7,7 +7,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1
+Release: 1.1
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.3-1.1
+- rebuild
+
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 1:3.5.3-1
 - update to 3.5.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:26 -0400
Subject: rpms/libaio/devel libaio.spec,1.21,1.22
Message-ID: <200607121724.k6CHOQcj031643@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libaio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31630

Modified Files:
	libaio.spec 
Log Message:
bumped for rebuild


Index: libaio.spec
===================================================================
RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libaio.spec	7 Jun 2006 21:57:23 -0000	1.21
+++ libaio.spec	12 Jul 2006 17:24:24 -0000	1.22
@@ -1,6 +1,6 @@
 Name: libaio
 Version: 0.3.106
-Release: 3
+Release: 3.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.106-3.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 0.3.106-3
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:29 -0400
Subject: rpms/libwmf/devel libwmf.spec,1.23,1.24
Message-ID: <200607121724.k6CHOTnt031698@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31684

Modified Files:
	libwmf.spec 
Log Message:
bumped for rebuild


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libwmf.spec	12 Jul 2006 15:05:14 -0000	1.23
+++ libwmf.spec	12 Jul 2006 17:24:27 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 9
+Release: 9.1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -107,6 +107,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-9.1
+- rebuild
+
 * Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-9
 - CVE-2006-3376 libwmf integer overflow
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:24:35 -0400
Subject: rpms/libxml2/devel libxml2.spec,1.38,1.39
Message-ID: <200607121724.k6CHOZ2F031753@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31740

Modified Files:
	libxml2.spec 
Log Message:
bumped for rebuild


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libxml2.spec	7 Jun 2006 12:55:45 -0000	1.38
+++ libxml2.spec	12 Jul 2006 17:24:33 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.26
-Release: 2
+Release: 2.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.26-2.1
+- rebuild
+
 * Wed Jun  7 2006 Daniel Veillard <veillard at redhat.com> 2.6.26-2
 - fix bug #192873
 * Tue Jun  6 2006 Daniel Veillard <veillard at redhat.com> 2.6.26-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:25:14 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2383,1.2384
Message-ID: <200607121725.k6CHPEsm031781@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Make serial console installs on ia64 work again.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2383
retrieving revision 1.2384
diff -u -r1.2383 -r1.2384
--- kernel-2.6.spec	12 Jul 2006 15:35:45 -0000	1.2383
+++ kernel-2.6.spec	12 Jul 2006 17:25:12 -0000	1.2384
@@ -1601,8 +1601,11 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Dave Jones <davej at redhat.com>
+- Make serial console installs on ia64 work again.
+
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
-- Temporarily disable -headers subpackage until the problems which 
+- Temporarily disable -headers subpackage until the problems which
   arise from brew not using older package are dealt with.
 
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:25:14 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.33,1.34
Message-ID: <200607121725.k6CHPEUY031791@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-ia64-generic 
Log Message:
Make serial console installs on ia64 work again.


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- config-ia64-generic	12 Jul 2006 01:09:47 -0000	1.33
+++ config-ia64-generic	12 Jul 2006 17:25:12 -0000	1.34
@@ -135,7 +135,7 @@
 CONFIG_HOTPLUG_PCI_SGI=m
 
 CONFIG_ACPI_VIDEO=m
-# CONFIG_PNPACPI is not set
+CONFIG_PNPACPI=y
 
 # Broken in 2.6.10-bk3 for ia64 (No DMA_MODE_WRITE)
 # CONFIG_MMC_WBSD is not set



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:30:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:30:14 -0400
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.33,1.34
Message-ID: <200607121730.k6CHUEOS031947@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-menus.spec 
Log Message:
2.15.4.1



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-menus.spec	12 Jul 2006 17:14:45 -0000	1.33
+++ gnome-menus.spec	12 Jul 2006 17:30:12 -0000	1.34
@@ -6,7 +6,7 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.15.4
+Version: 2.15.4.1
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -91,8 +91,8 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
-* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
-- Update to 2.15.4
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4.1-1
+- Update to 2.15.4.1
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:31:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:31:11 -0400
Subject: rpms/finger/devel finger.spec,1.22,1.23
Message-ID: <200607121731.k6CHVBLC031971@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/finger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31958

Modified Files:
	finger.spec 
Log Message:
bumped for rebuild


Index: finger.spec
===================================================================
RCS file: /cvs/dist/rpms/finger/devel/finger.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- finger.spec	12 Jul 2006 17:23:38 -0000	1.22
+++ finger.spec	12 Jul 2006 17:31:01 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The finger client.
 Name: finger
 Version: 0.17
-Release: 32.2.1
+Release: 32.2.1.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.2.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:31:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:31:30 -0400
Subject: rpms/fontconfig/devel fontconfig.spec,1.79,1.80
Message-ID: <200607121731.k6CHVUpi032088@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	fontconfig.spec 
Log Message:
bumped for rebuild


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- fontconfig.spec	12 Jul 2006 17:23:41 -0000	1.79
+++ fontconfig.spec	12 Jul 2006 17:31:28 -0000	1.80
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 4.1
+Release: 4.1.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -139,6 +139,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.95-4.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.95-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:32:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:32:29 -0400
Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.18,
	1.19
Message-ID: <200607121732.k6CHWTta032144@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32133

Modified Files:
	gnome-keyring-manager.spec 
Log Message:
bumped for rebuild


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-keyring-manager.spec	12 Jul 2006 17:23:45 -0000	1.18
+++ gnome-keyring-manager.spec	12 Jul 2006 17:32:27 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Manager for passwords stored in gnome-keyring
 Name: gnome-keyring-manager
 Version: 2.14.0
-Release: 2.1
+Release: 2.1.1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:32:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:32:45 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.45,
	1.46
Message-ID: <200607121732.k6CHWjbL032202@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32188

Modified Files:
	gnome-volume-manager.spec 
Log Message:
bumped for rebuild


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnome-volume-manager.spec	12 Jul 2006 17:23:48 -0000	1.45
+++ gnome-volume-manager.spec	12 Jul 2006 17:32:43 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.15
-Release: 3.1
+Release: 3.1.1
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.15-3.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.15-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:33:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:33:06 -0400
Subject: rpms/icu/devel icu.spec,1.19,1.20
Message-ID: <200607121733.k6CHX6Ss032258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32244

Modified Files:
	icu.spec 
Log Message:
bumped for rebuild


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- icu.spec	12 Jul 2006 17:23:51 -0000	1.19
+++ icu.spec	12 Jul 2006 17:33:04 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.4
-Release: 	10.1
+Release: 	10.1.1
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-10.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:33:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:33:38 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.14,
	1.15
Message-ID: <200607121733.k6CHXckv032349@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32334

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
bumped for rebuild


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- iscsi-initiator-utils.spec	12 Jul 2006 17:23:57 -0000	1.14
+++ iscsi-initiator-utils.spec	12 Jul 2006 17:33:34 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.0.5.595
-Release: 2.1
+Release: 2.1.1
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@@ -76,6 +76,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.5.595-2.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.5.595-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:34:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:34:08 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.9,1.10
Message-ID: <200607121734.k6CHY8Ka032408@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32395

Modified Files:
	jgroups.spec 
Log Message:
bumped for rebuild


Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jgroups.spec	12 Jul 2006 17:24:06 -0000	1.9
+++ jgroups.spec	12 Jul 2006 17:33:55 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		jgroups
 Version:	2.2.6
-Release: 	1jpp_5fc
+Release: 	1jpp_6fc
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -104,6 +104,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.2.6-1jpp_6fc
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.2.6-1jpp_5fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:34:44 -0400
Subject: rpms/k3b/devel k3b.spec,1.32,1.33
Message-ID: <200607121734.k6CHYiOY032479@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32450

Modified Files:
	k3b.spec 
Log Message:
bumped for rebuild


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- k3b.spec	12 Jul 2006 17:24:17 -0000	1.32
+++ k3b.spec	12 Jul 2006 17:34:41 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.15
-Release: 3.1
+Release: 3.1.1
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -181,6 +181,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.15-3.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.15-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:35:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:35:15 -0400
Subject: rpms/libxml2/devel libxml2.spec,1.39,1.40
Message-ID: <200607121735.k6CHZFfa032601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32590

Modified Files:
	libxml2.spec 
Log Message:
bumped for rebuild


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libxml2.spec	12 Jul 2006 17:24:33 -0000	1.39
+++ libxml2.spec	12 Jul 2006 17:35:13 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.26
-Release: 2.1
+Release: 2.1.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -131,6 +131,9 @@
 %doc doc/python.html
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.26-2.1.1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6.26-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:35:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:35:32 -0400
Subject: rpms/libXrender/devel libXrender.spec,1.15,1.16
Message-ID: <200607121735.k6CHZWhi032692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32677

Modified Files:
	libXrender.spec 
Log Message:
bumped for rebuild


Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXrender.spec	28 Jun 2006 10:44:32 -0000	1.15
+++ libXrender.spec	12 Jul 2006 17:35:29 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.1
-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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-3
 - Added "Requires: libX11-devel" to devel package for xrender.pc
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:35:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:35:48 -0400
Subject: rpms/mikmod/devel mikmod.spec,1.30,1.31
Message-ID: <200607121735.k6CHZm39000345@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv332

Modified Files:
	mikmod.spec 
Log Message:
bumped for rebuild


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mikmod.spec	7 Jun 2006 22:19:15 -0000	1.30
+++ mikmod.spec	12 Jul 2006 17:35:46 -0000	1.31
@@ -4,7 +4,7 @@
 Summary: A MOD music file player.
 Name: mikmod
 Version: 3.1.6
-Release: 38
+Release: 38.1
 License: GPL/LGPL
 Group: Applications/Multimedia
 Prereq: /sbin/ldconfig
@@ -121,6 +121,9 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.6-38.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 3.1.6-38
 - put .so symlink in -devel subpackage
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:35:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:35:55 -0400
Subject: rpms/mpage/devel mpage.spec,1.24,1.25
Message-ID: <200607121735.k6CHZtLN000400@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mpage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv387

Modified Files:
	mpage.spec 
Log Message:
bumped for rebuild


Index: mpage.spec
===================================================================
RCS file: /cvs/dist/rpms/mpage/devel/mpage.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mpage.spec	12 May 2006 10:55:38 -0000	1.24
+++ mpage.spec	12 Jul 2006 17:35:53 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A tool for printing multiple pages of text on each printed page.
 Name: mpage
 Version: 2.5.4
-Release: 7
+Release: 7.1
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.mesa.nl/pub/mpage/mpage-%{version}.tgz
@@ -49,6 +49,9 @@
 %{_datadir}/mpage
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-7.1
+- rebuild
+
 * Fri May 12 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 2.5.4-7
 - Applied patch for font-restriction to avoid problems with gs (bug #191459)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:36:54 -0400
Subject: rpms/puretls/devel puretls.spec,1.9,1.10
Message-ID: <200607121736.k6CHasHF000759@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv738

Modified Files:
	puretls.spec 
Log Message:
bumped for rebuild


Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- puretls.spec	6 Mar 2006 22:18:57 -0000	1.9
+++ puretls.spec	12 Jul 2006 17:36:51 -0000	1.10
@@ -1,7 +1,7 @@
 %define name		puretls
 %define rversion	0.9
 %define beta		b4
-%define release 	0.%{beta}.1jpp_4fc
+%define release 	0.%{beta}.1jpp_5fc
 %define section		free
 
 Name:		%{name}
@@ -124,6 +124,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-0.b4.1jpp_5fc
+- rebuild
+
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0.9-0.%{beta}.1jpp_4fc
 - stop scriptlet spew
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:37:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:37:02 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.55,1.56
Message-ID: <200607121737.k6CHb28A000825@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv804

Modified Files:
	pygtk.spec 
Log Message:
bumped for rebuild


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pygtk.spec	22 Jun 2006 16:43:47 -0000	1.55
+++ pygtk.spec	12 Jul 2006 17:36:59 -0000	1.56
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.2
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -117,6 +117,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: pkg-config: command not found
+- rebuild
+
 * Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 2.9.2-1
 - update to 2.9.2
 - fix for gtk+ 2.9.4 API changes



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:37:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:37:15 -0400
Subject: rpms/python-urlgrabber/devel python-urlgrabber.spec,1.10,1.11
Message-ID: <200607121737.k6CHbF37000893@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-urlgrabber.spec 
Log Message:
bumped for rebuild


Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/dist/rpms/python-urlgrabber/devel/python-urlgrabber.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-urlgrabber.spec	16 May 2006 21:08:47 -0000	1.10
+++ python-urlgrabber.spec	12 Jul 2006 17:37:13 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
 Version: 2.9.9
-Release: 1
+Release: 1.1
 Source0: urlgrabber-%{version}.tar.gz
 Patch0: urlgrabber-read-error.patch
 License: LGPL
@@ -41,6 +41,9 @@
 %{_bindir}/urlgrabber
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.9-1.1
+- rebuild
+
 * Tue May 16 2006 Jeremy Katz <katzj at redhat.com> - 2.9.9-1
 - update to 2.9.9
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:37:22 -0400
Subject: rpms/rarpd/devel rarpd.spec,1.17,1.18
Message-ID: <200607121737.k6CHbMcX000948@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rarpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv935

Modified Files:
	rarpd.spec 
Log Message:
bumped for rebuild


Index: rarpd.spec
===================================================================
RCS file: /cvs/dist/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rarpd.spec	11 Feb 2006 05:27:38 -0000	1.17
+++ rarpd.spec	12 Jul 2006 17:37:20 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 22.2.1
+Release: 22.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - ss981107-22.2.2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - ss981107-22.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:37:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:37:42 -0400
Subject: rpms/rhdb-utils/devel rhdb-utils.spec,1.12,1.13
Message-ID: <200607121737.k6CHbg24001042@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	rhdb-utils.spec 
Log Message:
bumped for rebuild


Index: rhdb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rhdb-utils/devel/rhdb-utils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rhdb-utils.spec	11 Feb 2006 05:32:19 -0000	1.12
+++ rhdb-utils.spec	12 Jul 2006 17:37:40 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition.
 Name: rhdb-utils
 Version: 8.1.1
-Release: 1.2.1
+Release: 1.2.2
 URL: http://sources.redhat.com/rhdb/
 License: GPL
 Group: Applications/Databases
@@ -50,6 +50,9 @@
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:37:48 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.67,1.68
Message-ID: <200607121737.k6CHbmD7001093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1083

Modified Files:
	sane-backends.spec 
Log Message:
bumped for rebuild


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sane-backends.spec	9 Jun 2006 09:10:05 -0000	1.67
+++ sane-backends.spec	12 Jul 2006 17:37:46 -0000	1.68
@@ -7,7 +7,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 13
+Release: 13.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
@@ -186,6 +186,9 @@
 %{_mandir}/man8/saned.8*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun 09 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-13
 - split package into sane-backends, -devel, -libs, -programs to work around
   multilib issues (#135172)



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:38:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:07 -0400
Subject: rpms/sendmail/devel sendmail.spec,1.69,1.70
Message-ID: <200607121738.k6CHc7hw001186@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1171

Modified Files:
	sendmail.spec 
Log Message:
bumped for rebuild


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sendmail.spec	19 Jun 2006 16:19:17 -0000	1.69
+++ sendmail.spec	12 Jul 2006 17:38:05 -0000	1.70
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 2
+Release: 2.1
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -578,6 +578,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.13.7-2.1
+- rebuild
+
 * Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2
 - dropped reference to Red Hat Linux in sendmail-redhat.mc (#176679)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:38:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:23 -0400
Subject: rpms/speex/devel speex.spec,1.13,1.14
Message-ID: <200607121738.k6CHcN08001280@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/speex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1265

Modified Files:
	speex.spec 
Log Message:
bumped for rebuild


Index: speex.spec
===================================================================
RCS file: /cvs/dist/rpms/speex/devel/speex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- speex.spec	7 Jun 2006 22:10:46 -0000	1.13
+++ speex.spec	12 Jul 2006 17:38:21 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
 Version: 	1.0.5
-Release: 2
+Release: 2.1
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
@@ -73,6 +73,9 @@
 %{_libdir}/libspeex.a
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-2.1
+- rebuild
+
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.0.5-2
 - rebuild for -devel deps
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:50 -0400
Subject: rpms/xmltex/devel xmltex.spec,1.16,1.17
Message-ID: <200607121738.k6CHcokM001731@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmltex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1717

Modified Files:
	xmltex.spec 
Log Message:
bumped for rebuild


Index: xmltex.spec
===================================================================
RCS file: /cvs/dist/rpms/xmltex/devel/xmltex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmltex.spec	7 Feb 2006 16:55:50 -0000	1.16
+++ xmltex.spec	12 Jul 2006 17:38:47 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Namespace-aware XML parser written in TeX.
 Name:		xmltex
 Version:	20020625
-Release: 7
+Release: 7.1
 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
@@ -64,6 +64,9 @@
 %{_datadir}/texmf/tex/xmltex
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 20020625-7.1
+- rebuild
+
 * Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-7
 - Fix xmltex symlink (-> latex) (bug #168728).
 
@@ -136,9 +139,8 @@
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-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.17  2006/07/12 17:38:47  jkeating
+bumped for rebuild
 
 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  Wed Jul 12 17:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:53 -0400
Subject: rpms/xorg-x11-drv-aiptek/devel xorg-x11-drv-aiptek.spec,1.10,1.11
Message-ID: <200607121738.k6CHcrl5001787@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-aiptek.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-aiptek.spec	28 Jun 2006 10:51:46 -0000	1.10
+++ xorg-x11-drv-aiptek.spec	12 Jul 2006 17:38:51 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
 Version: 1.0.1
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/aiptek.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1
 - Bump to 1.0.1 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:38:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:56 -0400
Subject: rpms/xorg-x11-drv-ast/devel xorg-x11-drv-ast.spec,1.3,1.4
Message-ID: <200607121738.k6CHcueO001842@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-ast.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-ast.spec	28 Jun 2006 10:53:27 -0000	1.3
+++ xorg-x11-drv-ast.spec	12 Jul 2006 17:38:54 -0000	1.4
@@ -14,7 +14,7 @@
 Summary:   Xorg X11 ast video driver
 Name:      xorg-x11-drv-ast
 Version:   0.81.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -70,6 +70,9 @@
 #%{_mandir}/man4/ast.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 0.81.0-2
 - Update ast.xinf with PCI ID list from driver.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:38:59 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.10,1.11
Message-ID: <200607121738.k6CHcxWo001898@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-cyrix.spec	28 Jun 2006 10:55:41 -0000	1.10
+++ xorg-x11-drv-cyrix.spec	12 Jul 2006 17:38:57 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.1.0
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,6 +58,9 @@
 %{_mandir}/man4/cyrix.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:02 -0400
Subject: rpms/xorg-x11-drv-dmc/devel xorg-x11-drv-dmc.spec,1.10,1.11
Message-ID: <200607121739.k6CHd2uC001967@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-dmc.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-dmc.spec	28 Jun 2006 10:56:15 -0000	1.10
+++ xorg-x11-drv-dmc.spec	12 Jul 2006 17:39:00 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/dmc.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:06 -0400
Subject: rpms/xorg-x11-drv-dynapro/devel xorg-x11-drv-dynapro.spec, 1.10,
	1.11
Message-ID: <200607121739.k6CHd6Fq002032@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-dynapro.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-dynapro.spec	28 Jun 2006 10:56:49 -0000	1.10
+++ xorg-x11-drv-dynapro.spec	12 Jul 2006 17:39:04 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 %{_mandir}/man4/dynapro.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:10 -0400
Subject: rpms/xorg-x11-drv-hyperpen/devel xorg-x11-drv-hyperpen.spec, 1.10,
	1.11
Message-ID: <200607121739.k6CHdAO4002087@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-hyperpen.spec	28 Jun 2006 11:01:06 -0000	1.10
+++ xorg-x11-drv-hyperpen.spec	12 Jul 2006 17:39:07 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
 Version: 1.1.0
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:14 -0400
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec, 1.11,
	1.12
Message-ID: <200607121739.k6CHdEkU002140@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
bumped for rebuild


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-mutouch.spec	28 Jun 2006 11:29:45 -0000	1.11
+++ xorg-x11-drv-mutouch.spec	12 Jul 2006 17:39:12 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
 Version: 1.1.0
-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/mutouch.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1
 - Update to 1.1.0 from 7.1RC1.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:18 -0400
Subject: rpms/xorg-x11-drv-savage/devel xorg-x11-drv-savage.spec,1.13,1.14
Message-ID: <200607121739.k6CHdIfJ002194@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
bumped for rebuild


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-savage.spec	28 Jun 2006 11:16:09 -0000	1.13
+++ xorg-x11-drv-savage.spec	12 Jul 2006 17:39:15 -0000	1.14
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.1.1
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -74,6 +74,9 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-3
 - Added "BuildRequires: libdrm-devel >= 2.0-1" for DRI enabled builds (#192349)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:25 -0400
Subject: rpms/xorg-x11-drv-v4l/devel xorg-x11-drv-v4l.spec,1.10,1.11
Message-ID: <200607121739.k6CHdPr9004044@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-v4l.spec 
Log Message:
bumped for rebuild


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-v4l.spec	28 Jun 2006 11:18:48 -0000	1.10
+++ xorg-x11-drv-v4l.spec	12 Jul 2006 17:39:22 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 v4l video driver
 Name:      xorg-x11-drv-v4l
 Version:   0.1.1
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,6 +54,9 @@
 %{_mandir}/man4/v4l.4*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.1.1-3
 - Rebuild for 7.1 ABI fix.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:35 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.26,1.27
Message-ID: <200607121739.k6CHdZ4i012699@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
bumped for rebuild


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-xdm.spec	28 Jun 2006 10:20:31 -0000	1.26
+++ xorg-x11-xdm.spec	12 Jul 2006 17:39:32 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 1
+Release: 1.1
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -145,6 +145,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-1
 - Updated xdm to version 1.0.5.
 - Remove xdm-1.0.4-setuid.diff as it is integrated in 1.0.5



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:42 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.24,1.25
Message-ID: <200607121739.k6CHdgqm012793@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12767

Modified Files:
	ypbind.spec 
Log Message:
bumped for rebuild


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ypbind.spec	13 Feb 2006 16:37:24 -0000	1.24
+++ ypbind.spec	12 Jul 2006 17:39:40 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 0
+Release: 0.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -80,6 +80,9 @@
 %doc README NEWS
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3:1.19-0.1
+- rebuild
+
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 3:1.19
 - Build for latest version of ypbind-mt
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:51 -0400
Subject: rpms/ypserv/devel ypserv.spec,1.30,1.31
Message-ID: <200607121739.k6CHdpIC012895@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12867

Modified Files:
	ypserv.spec 
Log Message:
bumped for rebuild


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ypserv.spec	13 Feb 2006 16:37:48 -0000	1.30
+++ ypserv.spec	12 Jul 2006 17:39:48 -0000	1.31
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 0
+Release: 0.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.19-0.1
+- rebuild
+
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 2.19-0
 - Rebuilt against latest upstream sources (2.19).
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:39:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:39:58 -0400
Subject: rpms/zenity/devel zenity.spec,1.10,1.11
Message-ID: <200607121739.k6CHdwrR012990@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12964

Modified Files:
	zenity.spec 
Log Message:
bumped for rebuild


Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zenity.spec	9 Jun 2006 04:33:23 -0000	1.10
+++ zenity.spec	12 Jul 2006 17:39:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           zenity
 Version:        2.15.2
-Release:        3
+Release:        3.1
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
 License:        GPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3
 - Add missing BuildRequires
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:40:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:40:40 -0400
Subject: rpms/zlib/devel zlib.spec,1.26,1.27
Message-ID: <200607121740.k6CHee1r013311@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13276

Modified Files:
	zlib.spec 
Log Message:
bumped for rebuild


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- zlib.spec	11 Feb 2006 06:38:29 -0000	1.26
+++ zlib.spec	12 Jul 2006 17:40:38 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-Release: 1.2.1
+Release: 1.2.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
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2.2
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:44:40 -0400
Subject: rpms/gnome-themes/devel gnome-themes-2.15.4-clearlooks.patch, NONE,
	1.1 gnome-themes-2.15.2-clearlooks.patch, 1.1,
	1.2 gnome-themes.spec, 1.62, 1.63
Message-ID: <200607121744.k6CHiemk015075@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes-2.15.2-clearlooks.patch gnome-themes.spec 
Added Files:
	gnome-themes-2.15.4-clearlooks.patch 
Log Message:
2.15.4


gnome-themes-2.15.4-clearlooks.patch:
 configure.in                             |   11 +++++++++++
 desktop-themes/Clearlooks/index.theme.in |    2 +-
 gtk-themes/Makefile.am                   |    9 ++++++++-
 icon-themes/Makefile.am                  |    2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

--- NEW FILE gnome-themes-2.15.4-clearlooks.patch ---
--- gnome-themes-2.15.4/configure.in.clearlooks	2006-07-10 10:22:59.000000000 -0400
+++ gnome-themes-2.15.4/configure.in	2006-07-12 13:24:47.000000000 -0400
@@ -108,6 +108,12 @@
 metacity-themes/Makefile
 gtk-themes/Makefile
 gtk-themes/Glider/Makefile
+gtk-themes/Clearlooks-DeepSky/Makefile
+gtk-themes/Clearlooks-DeepSky/gtk-2.0/Makefile
+gtk-themes/Clearlooks-Olive/Makefile
+gtk-themes/Clearlooks-Olive/gtk-2.0/Makefile
+gtk-themes/Clearlooks-Quicksilver/Makefile
+gtk-themes/Clearlooks-Quicksilver/gtk-2.0/Makefile
 icon-themes/Makefile
 icon-themes/Crux/Makefile
 icon-themes/Flat-Blue/Makefile
@@ -121,6 +127,11 @@
 icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile
 icon-themes/HighContrast-SVG/scalable/places/Makefile
 icon-themes/HighContrast-SVG/scalable/status/Makefile
+icon-themes/Clearlooks/Makefile
+icon-themes/Clearlooks/16x16/Makefile
+icon-themes/Clearlooks/24x24/Makefile
+icon-themes/Clearlooks/16x16/gtk/Makefile
+icon-themes/Clearlooks/24x24/gtk/Makefile
 common/Makefile
 HighContrast/Makefile
 HighContrast/gtk-2.0/Makefile
--- gnome-themes-2.15.4/gtk-themes/Makefile.am.clearlooks	2006-07-10 10:16:54.000000000 -0400
+++ gnome-themes-2.15.4/gtk-themes/Makefile.am	2006-07-12 13:23:36.000000000 -0400
@@ -1 +1,8 @@
-SUBDIRS=Glider
+SUBDIRS= \
+	Clearlooks-DeepSky \
+	Clearlooks-Olive \
+	Clearlooks-Quicksilver \
+	Glider \
+	Grand-Canyon \
+	Simple \
+	Smokey-Blue
--- gnome-themes-2.15.4/icon-themes/Makefile.am.clearlooks	2006-07-10 10:16:54.000000000 -0400
+++ gnome-themes-2.15.4/icon-themes/Makefile.am	2006-07-12 13:23:36.000000000 -0400
@@ -1 +1 @@
-SUBDIRS=Crux Flat-Blue HighContrast-SVG
+SUBDIRS=Clearlooks Crux Flat-Blue Sandy Smokey-Blue Smokey-Red HighContrast-SVG
--- gnome-themes-2.15.4/desktop-themes/Clearlooks/index.theme.in.clearlooks	2005-10-03 11:42:36.000000000 -0400
+++ gnome-themes-2.15.4/desktop-themes/Clearlooks/index.theme.in	2006-07-12 13:23:36.000000000 -0400
@@ -5,4 +5,4 @@
 Encoding=UTF-8
 GtkTheme=Clearlooks
 MetacityTheme=Clearlooks
-IconTheme=gnome
+IconTheme=Clearlooks

gnome-themes-2.15.2-clearlooks.patch:
 configure.in                             |   11 +++++++++++
 desktop-themes/Clearlooks/index.theme.in |    2 +-
 gtk-themes/Makefile.am                   |    9 ++++++++-
 icon-themes/Makefile.am                  |    2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

Index: gnome-themes-2.15.2-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.15.2-clearlooks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-themes-2.15.2-clearlooks.patch	16 May 2006 19:18:00 -0000	1.1
+++ gnome-themes-2.15.2-clearlooks.patch	12 Jul 2006 17:44:37 -0000	1.2
@@ -1,7 +1,7 @@
 --- gnome-themes-2.15.2/gtk-themes/Makefile.am.clearlooks	2005-08-23 14:59:32.000000000 -0400
 +++ gnome-themes-2.15.2/gtk-themes/Makefile.am	2006-05-16 15:02:38.000000000 -0400
 @@ -1 +1,8 @@
--SUBDIRS=Glider Grand-Canyon Simple Smokey-Blue
+-SUBDIRS=Glider
 +SUBDIRS= \
 +	Clearlooks-DeepSky \
 +	Clearlooks-Olive \
@@ -13,7 +13,7 @@
 --- gnome-themes-2.15.2/icon-themes/Makefile.am.clearlooks	2006-04-24 10:58:51.000000000 -0400
 +++ gnome-themes-2.15.2/icon-themes/Makefile.am	2006-05-16 15:02:38.000000000 -0400
 @@ -1 +1 @@
--SUBDIRS=Crux Flat-Blue Sandy Smokey-Blue Smokey-Red HighContrast-SVG
+-SUBDIRS=Crux Flat-Blue HighContrast-SVG
 +SUBDIRS=Clearlooks Crux Flat-Blue Sandy Smokey-Blue Smokey-Red HighContrast-SVG
 --- gnome-themes-2.15.2/desktop-themes/Clearlooks/index.theme.in.clearlooks	2005-10-03 11:42:36.000000000 -0400
 +++ gnome-themes-2.15.2/desktop-themes/Clearlooks/index.theme.in	2006-05-16 15:02:38.000000000 -0400


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-themes.spec	12 Jul 2006 17:09:16 -0000	1.62
+++ gnome-themes.spec	12 Jul 2006 17:44:37 -0000	1.63
@@ -7,7 +7,7 @@
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
-Patch2: gnome-themes-2.15.2-clearlooks.patch
+Patch2: gnome-themes-2.15.4-clearlooks.patch
 Patch3: clearlooks-0.5-inherit-bluecurve.patch
 Patch4: gnome-themes-2.11.90-redmond.patch
 License: LGPL
@@ -43,7 +43,7 @@
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Olive gtk-themes
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Quicksilver gtk-themes
 %patch2 -p1 -b .clearlooks
-%patch4 -p1 -b .redmond
+#%patch4 -p1 -b .redmond
 
 %build
 autoconf



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:48:32 -0400
Subject: rpms/paps/devel paps.spec,1.8,1.9
Message-ID: <200607121748.k6CHmW6H031361@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31330

Modified Files:
	paps.spec 
Log Message:
cleanup clog


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paps.spec	4 Jul 2006 05:12:40 -0000	1.8
+++ paps.spec	12 Jul 2006 17:48:29 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	10%{?dist}
+Release:	10.2%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-10.2
+- rebuild
+
 * Tue Jul  4 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-10
 - paps-0.6.6-cpilpi.patch: add --cpi and --lpi option to support the characters
   per inch and the lines per inch.



From fedora-cvs-commits at redhat.com  Wed Jul 12 17:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 13:52:57 -0400
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.29,
	1.30 gnome-icon-theme.spec, 1.50, 1.51 sources, 1.32, 1.33
Message-ID: <200607121752.k6CHqvUv000682@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv614

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	17 May 2006 03:10:59 -0000	1.29
+++ .cvsignore	12 Jul 2006 17:52:55 -0000	1.30
@@ -1 +1 @@
-gnome-icon-theme-2.15.2.tar.bz2
+gnome-icon-theme-2.15.3.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-icon-theme.spec	7 Jun 2006 13:52:37 -0000	1.50
+++ gnome-icon-theme.spec	12 Jul 2006 17:52:55 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.15.2
-Release: 3
+Version: 2.15.3
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 BuildArch: noarch
@@ -69,6 +69,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1
+- Update to 2.15.3
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3
 - Fix a problem in %%post (#194323)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 May 2006 03:10:59 -0000	1.32
+++ sources	12 Jul 2006 17:52:55 -0000	1.33
@@ -1 +1 @@
-62e3ed92d753953890b9dbb21283c682  gnome-icon-theme-2.15.2.tar.bz2
+ddb23c7f01e4b5d94f8e9e084712191a  gnome-icon-theme-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:00:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:00:18 -0400
Subject: rpms/gnome-themes/devel .cvsignore,1.30,1.31 sources,1.31,1.32
Message-ID: <200607121800.k6CI0IJK003587@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Jun 2006 16:55:20 -0000	1.30
+++ .cvsignore	12 Jul 2006 18:00:14 -0000	1.31
@@ -4,3 +4,4 @@
 gnome-themes-2.15.1.tar.bz2
 gnome-themes-2.15.2.tar.bz2
 gnome-themes-2.15.3.tar.bz2
+gnome-themes-2.15.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Jun 2006 16:55:20 -0000	1.31
+++ sources	12 Jul 2006 18:00:14 -0000	1.32
@@ -1,3 +1,2 @@
 451ef33d1bffa261c5cbe01182199f97  clearlooks-0.6.2.tar.bz2
-64bffb05ef1c8d2f3a3cbb18480cd3f0  clearlooks-metacity-2.0.tar.gz
-9fb11c076154315a674ddd86b8113f7b  gnome-themes-2.15.3.tar.bz2
+d402cd1acd3fc7b50b1ce4ea0e53f16a  gnome-themes-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:06:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:06:25 -0400
Subject: rpms/libXpm/devel libXpm.spec,1.15,1.16
Message-ID: <200607121806.k6CI6PHE004227@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4202

Modified Files:
	libXpm.spec 
Log Message:
cleanup


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libXpm.spec	28 Jun 2006 10:44:04 -0000	1.15
+++ libXpm.spec	12 Jul 2006 18:06:21 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.5
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -88,6 +88,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.5-3
+- rebuild
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 3.5.5-2
 - Added "BuildRequires: pkgconfig" for (#193427)
 - Replace "makeinstall" with "make install DESTDIR=..."



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:15:21 -0400
Subject: rpms/gdm/devel .cvsignore, 1.29, 1.30 gdm.spec, 1.171, 1.172 sources,
	1.31, 1.32
Message-ID: <200607121815.k6CIFL6J006759@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6696

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:
- Update to 2.15.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Jun 2006 18:42:16 -0000	1.29
+++ .cvsignore	12 Jul 2006 18:15:18 -0000	1.30
@@ -1 +1 @@
-gdm-2.15.5.tar.bz2
+gdm-2.15.6.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gdm.spec	12 Jul 2006 14:23:00 -0000	1.171
+++ gdm.spec	12 Jul 2006 18:15:18 -0000	1.172
@@ -15,8 +15,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.15.5
-Release: 4
+Version: 2.15.6
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -324,6 +324,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Jul 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-1
+- Update to 2.15.6
+
 * Wed Jul 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.5-4
 - add new pam module to pam files to support kernel session keyring
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Jun 2006 18:42:16 -0000	1.31
+++ sources	12 Jul 2006 18:15:18 -0000	1.32
@@ -1 +1 @@
-dd4475699ff58fdbf29b4e56ffdc74e1  gdm-2.15.5.tar.bz2
+3a81b01f31b7509a5efcbe9d3108b96a  gdm-2.15.6.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:16:15 -0400
Subject: rpms/netdump/devel netdump.spec,1.26,1.27
Message-ID: <200607121816.k6CIGFTS012565@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11707

Modified Files:
	netdump.spec 
Log Message:
bump


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- netdump.spec	25 Apr 2006 17:44:11 -0000	1.26
+++ netdump.spec	12 Jul 2006 18:16:13 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.16
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -97,6 +97,9 @@
 %doc example_scripts
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.16-2
+- rebuild
+
 * Tue Apr 25 2006 Thomas Graf <tgraf at redhat.com> - 0.7.16-1
 - update to version 0.7.16
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:20:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:20:51 -0400
Subject: rpms/netdump/devel netdump.spec,1.27,1.28
Message-ID: <200607121820.k6CIKpxI023692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23663

Modified Files:
	netdump.spec 
Log Message:
bump


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- netdump.spec	12 Jul 2006 18:16:13 -0000	1.27
+++ netdump.spec	12 Jul 2006 18:20:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.16
-Release: 2
+Release: 5
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -97,7 +97,7 @@
 %doc example_scripts
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.16-2
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.16-5
 - rebuild
 
 * Tue Apr 25 2006 Thomas Graf <tgraf at redhat.com> - 0.7.16-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:31:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:31:24 -0400
Subject: rpms/kernel/devel/configs config-generic,1.222,1.223
Message-ID: <200607121831.k6CIVNN3027340@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
fix lockdep options


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- config-generic	12 Jul 2006 03:14:15 -0000	1.222
+++ config-generic	12 Jul 2006 18:30:57 -0000	1.223
@@ -2564,10 +2564,10 @@
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
 
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
 # These debug options are deliberatly left on.
 # They aren't that much of a performance impact, and the value



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:31:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:31:39 -0400
Subject: rpms/icon-naming-utils/devel icon-naming-utils.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200607121831.k6CIVN8K027344@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27209

Modified Files:
	icon-naming-utils.spec sources 
Log Message:
0.7.3



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- icon-naming-utils.spec	8 Jun 2006 19:45:40 -0000	1.5
+++ icon-naming-utils.spec	12 Jul 2006 18:31:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           icon-naming-utils
-Version:        0.7.2
-Release:        2
+Version:        0.7.3
+Release:        1
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools/Other
@@ -48,6 +48,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.3-1
+- Update to 0.7.3
+
 * Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.2-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 May 2006 02:55:05 -0000	1.4
+++ sources	12 Jul 2006 18:31:11 -0000	1.5
@@ -1 +1 @@
-b37455829181f1043927c2418830ce10  icon-naming-utils-0.7.2.tar.gz
+279563513efcb61f3af99358f061ae66  icon-naming-utils-0.7.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:35:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:35:15 -0400
Subject: rpms/kernel/devel linux-2.6-defaults-disable-split-ptlock.patch, 1.1,
	1.2
Message-ID: <200607121835.k6CIZFHe027942@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
use per-page lock on 64bit

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 03:14:40 -0000	1.1
+++ linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 18:35:11 -0000	1.2
@@ -1,11 +1,11 @@
 --- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
 +++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
-@@ -132,7 +132,7 @@ config SPLIT_PTLOCK_CPUS
+@@ -132,7 +132,8 @@ config SPLIT_PTLOCK_CPUS
  	int
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
--	default "4"
-+	default "4096"
++	default "4096" if !64BIT
+ 	default "4"
  
  #
  # support for page migration



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:35:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:35:59 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.11,1.12
Message-ID: <200607121835.k6CIZxhq028128@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
cleanup


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-cyrix.spec	12 Jul 2006 17:38:57 -0000	1.11
+++ xorg-x11-drv-cyrix.spec	12 Jul 2006 18:35:57 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.1.0
-Release:   2.1
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,7 +58,7 @@
 %{_mandir}/man4/cyrix.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-3
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:38:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:38:21 -0400
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec, 1.12,
	1.13
Message-ID: <200607121838.k6CIcLQi028614@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
cleanup


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-mutouch.spec	12 Jul 2006 17:39:12 -0000	1.12
+++ xorg-x11-drv-mutouch.spec	12 Jul 2006 18:38:18 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
 Version: 1.1.0
-Release: 1.1
+Release: 2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -52,7 +52,7 @@
 %{_mandir}/man4/mutouch.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-2
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:40:48 -0400
Subject: rpms/eog/devel .cvsignore, 1.32, 1.33 eog.spec, 1.54, 1.55 sources,
	1.32, 1.33
Message-ID: <200607121840.k6CIemYQ029847@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29757

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	13 Jun 2006 04:23:13 -0000	1.32
+++ .cvsignore	12 Jul 2006 18:40:45 -0000	1.33
@@ -1 +1 @@
-eog-2.15.3.tar.bz2
+eog-2.15.4.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- eog.spec	12 Jul 2006 05:44:53 -0000	1.54
+++ eog.spec	12 Jul 2006 18:40:45 -0000	1.55
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.15.3
-Release: 1.1
+Version: 2.15.4
+Release: 1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -106,6 +106,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	13 Jun 2006 04:23:13 -0000	1.32
+++ sources	12 Jul 2006 18:40:45 -0000	1.33
@@ -1 +1 @@
-29a9768a41dce2823e93c8de60b638e3  eog-2.15.3.tar.bz2
+6005450c992cf3f94b3fe3c001e010e1  eog-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:44:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:44:36 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.56,1.57
Message-ID: <200607121844.k6CIiaOf031292@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31266

Modified Files:
	pygtk.spec 
Log Message:
cleanup


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pygtk.spec	12 Jul 2006 17:36:59 -0000	1.56
+++ pygtk.spec	12 Jul 2006 18:44:34 -0000	1.57
@@ -117,7 +117,7 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: pkg-config: command not found
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.2-1.1
 - rebuild
 
 * Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 2.9.2-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:47:06 -0400
Subject: rpms/tk/devel tk.spec,1.20,1.21
Message-ID: <200607121847.k6CIl6Om013748@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13215

Modified Files:
	tk.spec 
Log Message:
cleanup


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tk.spec	20 Apr 2006 19:07:58 -0000	1.20
+++ tk.spec	12 Jul 2006 18:47:04 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.13
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -115,6 +115,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-2
+- rebuild
+
 * Thu Apr 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-1
 - Upgraded to Tk 8.4.13
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:48:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:48:27 -0400
Subject: rpms/gnome-themes/devel gnome-themes-2.15.4-clearlooks.patch, 1.1,
	1.2
Message-ID: <200607121848.k6CImRYS015235@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes-2.15.4-clearlooks.patch 
Log Message:
fix patch


gnome-themes-2.15.4-clearlooks.patch:
 configure.in                             |   11 +++++++++++
 desktop-themes/Clearlooks/index.theme.in |    2 +-
 gtk-themes/Makefile.am                   |    9 ++++++++-
 icon-themes/Makefile.am                  |    2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

Index: gnome-themes-2.15.4-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.15.4-clearlooks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-themes-2.15.4-clearlooks.patch	12 Jul 2006 17:44:37 -0000	1.1
+++ gnome-themes-2.15.4-clearlooks.patch	12 Jul 2006 18:48:24 -0000	1.2
@@ -33,10 +33,10 @@
 +	Clearlooks-DeepSky \
 +	Clearlooks-Olive \
 +	Clearlooks-Quicksilver \
-+	Glider \
-+	Grand-Canyon \
-+	Simple \
-+	Smokey-Blue
++	Glider 
++
++
++
 --- gnome-themes-2.15.4/icon-themes/Makefile.am.clearlooks	2006-07-10 10:16:54.000000000 -0400
 +++ gnome-themes-2.15.4/icon-themes/Makefile.am	2006-07-12 13:23:36.000000000 -0400
 @@ -1 +1 @@



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:48:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:48:40 -0400
Subject: rpms/wireshark/devel wireshark.spec,1.2,1.3
Message-ID: <200607121848.k6CImeJH015340@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wireshark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15314

Modified Files:
	wireshark.spec 
Log Message:
bump


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wireshark.spec	11 Jul 2006 07:18:55 -0000	1.2
+++ wireshark.spec	12 Jul 2006 18:48:37 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.2
-Release: 	0.pre1
+Release: 	0.pre1.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}pre1.tar.gz
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.2-0.pre1.1
+- rebuild
+
 * Tue Jul 11 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-0.pre1
 - upgrade to 0.99.2pre1, fixes (#198242)
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:51:54 -0400
Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.32,1.33
Message-ID: <200607121851.k6CIpsRM016646@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-Pg.spec 
Log Message:
cleanup


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- perl-DBD-Pg.spec	31 May 2006 23:55:09 -0000	1.32
+++ perl-DBD-Pg.spec	12 Jul 2006 18:51:51 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
 Version:        1.49
-Release: 	1.FC6
+Release: 	1.fc6
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.49-2
+- rebuild
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 1.49-1
 - Upgrade to upstream version 1.49
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:53:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:53:33 -0400
Subject: rpms/perl-XML-Dumper/devel perl-XML-Dumper.spec,1.12,1.13
Message-ID: <200607121853.k6CIrXu4017276@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-Dumper.spec 
Log Message:
cleanup


Index: perl-XML-Dumper.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/devel/perl-XML-Dumper.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-XML-Dumper.spec	12 Apr 2006 18:09:03 -0000	1.12
+++ perl-XML-Dumper.spec	12 Jul 2006 18:53:30 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-XML-Dumper
 Version:        0.81
-Release: 	1.FC6
+Release: 	2.fc6
 Summary:        Perl module for dumping Perl objects from/to XML
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.81-2
+- rebuild
+
 * Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 0.81-1
 - upgrade to 0.81
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:57:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:57:11 -0400
Subject: rpms/samba/FC-5 samba-3.0.23-logfiles.patch, NONE,
	1.1 samba-3.0.23-smb.conf.patch, NONE,
	1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.27,
	1.28 filter-requires-samba.sh, 1.3, 1.4 samba.spec, 1.62,
	1.63 smb.init, 1.5, 1.6 sources, 1.30, 1.31
Message-ID: <200607121857.k6CIvBtp018936@cvs.devel.redhat.com>

Author: fenlason

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

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec smb.init 
	sources 
Added Files:
	samba-3.0.23-logfiles.patch samba-3.0.23-smb.conf.patch 
	samba-3.0.23rc3-passwd.patch 
Log Message:
3.0.23


samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE samba-3.0.23-logfiles.patch ---
--- samba-3.0.23rc2/source/lib/popt_common.c.logfiles	2006-06-09 15:30:31.000000000 -0400
+++ samba-3.0.23rc2/source/lib/popt_common.c	2006-06-14 12:20:02.000000000 -0400
@@ -54,7 +54,7 @@
 	else 
 		pname++;
 
-	pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+	pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 	lp_set_logfile(logfile);
 }
 
--- 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.23/packaging/Fedora/smb.conf.logfiles	2006-07-11 11:23:52.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:27:00.000000000 -0400
@@ -63,7 +63,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/local/samba/var/log.%m
+   log file = /usr/local/samba/var/%m.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50

samba-3.0.23-smb.conf.patch:
 smb.conf |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE samba-3.0.23-smb.conf.patch ---
--- samba-3.0.23/packaging/Fedora/smb.conf.upstream	2006-07-11 11:29:05.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:30:45.000000000 -0400
@@ -57,6 +57,9 @@
 # bsd, cups, sysv, plp, lprng, aix, hpux, qnx
 ;   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
 ;  guest account = pcguest

samba-3.0.23rc3-passwd.patch:
 winbindd_group.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.23rc3-passwd.patch ---
--- samba-3.0.20pre1/source/nsswitch/#winbindd_group.c~	2005-06-22 15:08:05.000000000 -0400
+++ samba-3.0.20pre1/source/nsswitch/winbindd_group.c	2005-06-22 15:08:05.000000000 -0400
@@ -49,7 +49,7 @@
 	/* Group name and password */
     
 	safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1);
-	safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1);
+	safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1);
 
 	return True;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Feb 2006 16:26:38 -0000	1.27
+++ .cvsignore	12 Jul 2006 18:57:09 -0000	1.28
@@ -1 +1 @@
-samba-3.0.21b.tar.gz
+samba-3.0.23.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/filter-requires-samba.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-requires-samba.sh	24 Feb 2005 19:14:18 -0000	1.3
+++ filter-requires-samba.sh	12 Jul 2006 18:57:09 -0000	1.4
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
 


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- samba.spec	30 Mar 2006 22:22:47 -0000	1.62
+++ samba.spec	12 Jul 2006 18:57:09 -0000	1.63
@@ -2,7 +2,7 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.22
+Version: 3.0.23
 Release: 1.fc5
 Epoch: 0
 License: GNU GPL Version 2
@@ -33,13 +33,12 @@
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
 Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.21b-logfiles.patch
+Patch103: samba-3.0.23-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch105: samba-3.0.21b-smb.conf.patch
+Patch105: samba-3.0.23-smb.conf.patch
 Patch106: samba-3.0.20pre1-man.patch
-Patch107: samba-3.0.20pre1-passwd.patch
+Patch107: samba-3.0.23rc3-passwd.patch
 #Patch108: samba-3.0.8-non-ascii-domain.patch
-Patch109: samba-3.0.4-install.mount.smbfs.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch112: samba-3.0.15pre2-bug106483.patch
@@ -51,7 +50,7 @@
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d 
 BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel
-
+BuildRequires: autoconf, libtool
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -122,7 +121,6 @@
 %patch106 -p1 -b .man
 %patch107 -p1 -b .passwd
 #%patch108 -p1 -b .non-ascii-domain
-%patch109 -p1 -b .install.mount.smbfs
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch112 -p1 -b .bug106483
@@ -236,11 +234,9 @@
 
 # pam_smbpass
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
 
 # winbind
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -sf /%{_lib}/libnss_winbind.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so
@@ -275,6 +271,12 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
 
+# why are these getting installed in the wrong place?
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -443,7 +445,15 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
-* Thu Mar 30 2006 Jay Fenlason <fenlason at redhat.com> 2.0.21c-1.fc5
+* Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc5
+- Upgrade to 3.0.23 to close
+  bz#197836 CVE-2006-3403 Samba denial of service
+- include related spec file, filter-requires-samba.sh and patch changes
+  from rawhide.
+- include the fixed smb.init file from rawhide, closing
+  bz#182560 Wrong retval for initscript when smbd is dead
+
+* Thu Mar 30 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21c-1.fc5
 - New upstream version, fixing
   bz#187170 CVE-2005-1059 Samba clear text password exposure
 - include gnutls-devel in BuildRequires


Index: smb.init
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/smb.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb.init	9 Sep 2004 12:12:38 -0000	1.5
+++ smb.init	12 Jul 2006 18:57:09 -0000	1.6
@@ -83,7 +83,11 @@
 
 rhstatus() {
 	status smbd
+	RETVAL=$?
 	status nmbd
+	if [ $? -ne 0 -o $RETVAL -ne 0 ] ; then
+		return 1
+	fi
 }	
 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Mar 2006 22:22:47 -0000	1.30
+++ sources	12 Jul 2006 18:57:09 -0000	1.31
@@ -1 +1 @@
-5c39505af17cf5caf3d6ed8bab135036  samba-3.0.22.tar.gz
+f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 18:59:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 14:59:52 -0400
Subject: rpms/gnome-terminal/devel .cvsignore, 1.27, 1.28 gnome-terminal.spec,
	1.62, 1.63 sources, 1.28, 1.29
Message-ID: <200607121859.k6CIxqHH020193@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	22 May 2006 16:23:11 -0000	1.27
+++ .cvsignore	12 Jul 2006 18:59:50 -0000	1.28
@@ -1 +1 @@
-gnome-terminal-2.15.1.tar.bz2
+gnome-terminal-2.15.2.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-terminal.spec	12 Jul 2006 06:09:58 -0000	1.62
+++ gnome-terminal.spec	12 Jul 2006 18:59:50 -0000	1.63
@@ -12,12 +12,11 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.15.1
-Release: 2.1
+Version: 2.15.2
+Release: 1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
-Patch1: gnome-terminal-2.14.1-real-transparency.patch
 # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 License: GPL 
@@ -57,7 +56,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .inputmethod
-%patch1 -p0 -b .real-transparency
 %patch2 -p1 -b .338913-revert-336325
 
 %build
@@ -118,6 +116,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 May 2006 16:23:11 -0000	1.28
+++ sources	12 Jul 2006 18:59:50 -0000	1.29
@@ -1 +1 @@
-bd50c6b881020c1b10c4eb0bbaaf8d91  gnome-terminal-2.15.1.tar.bz2
+d8ee2e59283ab397b404de20a49055a5  gnome-terminal-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:06:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:06:22 -0400
Subject: rpms/gnome-themes/devel gnome-themes-2.15.4-clearlooks.patch, 1.2,
	1.3
Message-ID: <200607121906.k6CJ6Mjp021131@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes-2.15.4-clearlooks.patch 
Log Message:
more patch fixing


gnome-themes-2.15.4-clearlooks.patch:
 configure.in                             |   11 +++++++++++
 desktop-themes/Clearlooks/index.theme.in |    2 +-
 gtk-themes/Makefile.am                   |    9 ++++++++-
 icon-themes/Makefile.am                  |    2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

Index: gnome-themes-2.15.4-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.15.4-clearlooks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-themes-2.15.4-clearlooks.patch	12 Jul 2006 18:48:24 -0000	1.2
+++ gnome-themes-2.15.4-clearlooks.patch	12 Jul 2006 19:06:12 -0000	1.3
@@ -41,7 +41,7 @@
 +++ gnome-themes-2.15.4/icon-themes/Makefile.am	2006-07-12 13:23:36.000000000 -0400
 @@ -1 +1 @@
 -SUBDIRS=Crux Flat-Blue HighContrast-SVG
-+SUBDIRS=Clearlooks Crux Flat-Blue Sandy Smokey-Blue Smokey-Red HighContrast-SVG
++SUBDIRS=Clearlooks Crux Flat-Blue HighContrast-SVG
 --- gnome-themes-2.15.4/desktop-themes/Clearlooks/index.theme.in.clearlooks	2005-10-03 11:42:36.000000000 -0400
 +++ gnome-themes-2.15.4/desktop-themes/Clearlooks/index.theme.in	2006-07-12 13:23:36.000000000 -0400
 @@ -5,4 +5,4 @@



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:08:03 -0400
Subject: rpms/pirut/devel .cvsignore, 1.27, 1.28 pirut.spec, 1.28,
	1.29 sources, 1.28, 1.29
Message-ID: <200607121908.k6CJ83u4021366@cvs.devel.redhat.com>

Author: katzj

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Jun 2006 01:41:23 -0000	1.27
+++ .cvsignore	12 Jul 2006 19:07:52 -0000	1.28
@@ -1 +1 @@
-pirut-1.1.5.tar.gz
+pirut-1.1.6.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pirut.spec	29 Jun 2006 01:41:23 -0000	1.28
+++ pirut.spec	12 Jul 2006 19:07:52 -0000	1.29
@@ -2,15 +2,16 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.5
+Version: 1.1.6
 Release: 1
 License: GPL
 Group: Applications/System
 URL: http://fedoraproject.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pygtk2, pygtk2-libglade, yum >= 2.9.2, comps-extras, rhpl
-Requires: gnome-python2-libegg, gnome-python2-gconf
+Requires: pygtk2 >= 2.9.2
+Requires: pygtk2-libglade, yum >= 2.9.3, comps-extras, rhpl
+Requires: gnome-python2-gconf
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -51,13 +52,8 @@
 %{python_sitelib}/pirut/*.py
 %{python_sitelib}/pirut/*.pyc
 %{python_sitelib}/pirut/*.pyo
-%{_bindir}/pirut
-%{_bindir}/pup
-%{_bindir}/puplet
-%{_bindir}/system-install-packages
-%{_sbindir}/pirut
-%{_sbindir}/pup
-%{_sbindir}/system-install-packages
+%{_bindir}/*
+%{_sbindir}/*
 %{_sysconfdir}/pam.d/*
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/xdg/autostart/*
@@ -71,6 +67,13 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jeremy Katz <katzj at redhat.com> - 1.1.6-1
+- Port puplet to use GtkStatusIcon instead of EggTrayIcon
+- Fix some misc bugs
+- Add system-cdinstall-helper for extra CDs of packages (note: this will 
+  currently only handle a single CD and not multi-CD sets) 
+- Make puplet exit if we can't consistently connect to yum-updatesd
+
 * Wed Jun 28 2006 Jeremy Katz <katzj at redhat.com> - 1.1.5-1
 - mark reboot later for translation (#196358)
 - add nl translations (#196557)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Jun 2006 01:41:23 -0000	1.28
+++ sources	12 Jul 2006 19:07:52 -0000	1.29
@@ -1 +1 @@
-1dc688df67e038717ce886c2c9ecb9ab  pirut-1.1.5.tar.gz
+a4c59bb9cd4527f5af065b0792c62d42  pirut-1.1.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:14:17 -0400
Subject: rpms/frysk/devel frysk.spec,1.68,1.69
Message-ID: <200607121914.k6CJEHOG023178@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23152

Modified Files:
	frysk.spec 
Log Message:
patch visibility in libdw


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- frysk.spec	12 Jul 2006 14:53:46 -0000	1.68
+++ frysk.spec	12 Jul 2006 19:14:15 -0000	1.69
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.12.rh1
+Version:	0.0.1.2006.07.12.rh2
 Release:	1
 License:	GPL
 Group:		Development/System
@@ -98,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.12.rh2-1
+- New upstream version.
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.12.rh1-1
 - New upstream version.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:16:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:16:32 -0400
Subject: rpms/xorg-x11-drv-aiptek/devel xorg-x11-drv-aiptek.spec,1.11,1.12
Message-ID: <200607121916.k6CJGW5U029210@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-aiptek.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-aiptek.spec	12 Jul 2006 17:38:51 -0000	1.11
+++ xorg-x11-drv-aiptek.spec	12 Jul 2006 19:16:30 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
 Version: 1.0.1
-Release: 1.1
+Release: 2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,7 +53,7 @@
 %{_mandir}/man4/aiptek.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:17:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:17:30 -0400
Subject: rpms/libgnome/devel .cvsignore, 1.24, 1.25 libgnome.spec, 1.59,
	1.60 sources, 1.24, 1.25
Message-ID: <200607121917.k6CJHTN8004662@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3387

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	11 Apr 2006 04:25:01 -0000	1.24
+++ .cvsignore	12 Jul 2006 19:17:27 -0000	1.25
@@ -1,9 +1 @@
-libgnome-2.11.2.tar.gz
-libgnome-2.12.0.tar.bz2
-libgnome-2.12.0.1.tar.bz2
-libgnome-2.13.2.tar.bz2
-libgnome-2.13.4.tar.bz2
-libgnome-2.13.7.tar.bz2
-libgnome-2.13.90.tar.bz2
-libgnome-2.14.0.tar.bz2
-libgnome-2.14.1.tar.bz2
+libgnome-2.15.1.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libgnome.spec	12 Jul 2006 06:50:26 -0000	1.59
+++ libgnome.spec	12 Jul 2006 19:17:27 -0000	1.60
@@ -11,8 +11,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.14.1
-Release: 4.1
+Version: 2.15.1
+Release: 1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -158,6 +158,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	11 Apr 2006 04:25:03 -0000	1.24
+++ sources	12 Jul 2006 19:17:27 -0000	1.25
@@ -1 +1 @@
-bf53815df10db62bbf00defd4100b8d8  libgnome-2.14.1.tar.bz2
+0f7c63d3cff2832758bd27339c1a9e5e  libgnome-2.15.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:17:47 -0400
Subject: rpms/xorg-x11-drv-ast/devel xorg-x11-drv-ast.spec,1.4,1.5
Message-ID: <200607121917.k6CJHlRN005248@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-ast.spec 
Log Message:
bump


Index: xorg-x11-drv-ast.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ast/devel/xorg-x11-drv-ast.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-ast.spec	12 Jul 2006 17:38:54 -0000	1.4
+++ xorg-x11-drv-ast.spec	12 Jul 2006 19:17:44 -0000	1.5
@@ -14,7 +14,7 @@
 Summary:   Xorg X11 ast video driver
 Name:      xorg-x11-drv-ast
 Version:   0.81.0
-Release:   2.1
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -70,7 +70,7 @@
 #%{_mandir}/man4/ast.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.81.0-3
 - rebuild
 
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 0.81.0-2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:18:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:18:31 -0400
Subject: rpms/xorg-x11-drv-dynapro/devel xorg-x11-drv-dynapro.spec, 1.11,
	1.12
Message-ID: <200607121918.k6CJIVjf007207@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-dynapro.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-dynapro.spec	12 Jul 2006 17:39:04 -0000	1.11
+++ xorg-x11-drv-dynapro.spec	12 Jul 2006 19:18:29 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
 Version: 1.1.0
-Release: 1.1
+Release: 2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,7 +53,7 @@
 %{_mandir}/man4/dynapro.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-2
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:19:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:19:15 -0400
Subject: rpms/xorg-x11-drv-hyperpen/devel xorg-x11-drv-hyperpen.spec, 1.11,
	1.12
Message-ID: <200607121919.k6CJJFdR007518@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-hyperpen.spec	12 Jul 2006 17:39:07 -0000	1.11
+++ xorg-x11-drv-hyperpen.spec	12 Jul 2006 19:19:12 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
 Version: 1.1.0
-Release: 1.1
+Release: 2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,7 +53,7 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-2
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:20:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:20:03 -0400
Subject: rpms/xorg-x11-drv-v4l/devel xorg-x11-drv-v4l.spec,1.11,1.12
Message-ID: <200607121920.k6CJK31G007862@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-drv-v4l.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-v4l.spec	12 Jul 2006 17:39:22 -0000	1.11
+++ xorg-x11-drv-v4l.spec	12 Jul 2006 19:20:01 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 v4l video driver
 Name:      xorg-x11-drv-v4l
 Version:   0.1.1
-Release:   3.1
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,7 +54,7 @@
 %{_mandir}/man4/v4l.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.1-4
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 0.1.1-3



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:20:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:20:55 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.27,1.28
Message-ID: <200607121920.k6CJKt5f008258@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
bump


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-xdm.spec	12 Jul 2006 17:39:32 -0000	1.27
+++ xorg-x11-xdm.spec	12 Jul 2006 19:20:52 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 1.1
+Release: 2
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -145,7 +145,7 @@
 %{_mandir}/man1/*.1*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.5-2
 - rebuild
 
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-1



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:21:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:21:41 -0400
Subject: rpms/zenity/devel zenity.spec,1.11,1.12
Message-ID: <200607121921.k6CJLfa6008578@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zenity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8562

Modified Files:
	zenity.spec 
Log Message:
bump


Index: zenity.spec
===================================================================
RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- zenity.spec	12 Jul 2006 17:39:56 -0000	1.11
+++ zenity.spec	12 Jul 2006 19:21:39 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           zenity
 Version:        2.15.2
-Release:        3.1
+Release:        4
 Summary: 	Display dialog boxes from shell scripts
 Group:  	Applications/System 
 License:        GPL
@@ -64,7 +64,7 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-4
 - rebuild
 
 * Fri Jun  9 2006 Matthias Clasen <mclasen at redhat.com> 2.15.2-3



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:22:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:22:31 -0400
Subject: rpms/zlib/devel zlib.spec,1.27,1.28
Message-ID: <200607121922.k6CJMVwH008927@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8896

Modified Files:
	zlib.spec 
Log Message:
bump


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zlib.spec	12 Jul 2006 17:40:38 -0000	1.27
+++ zlib.spec	12 Jul 2006 19:22:28 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-Release: 1.2.2
+Release: 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,7 +77,7 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2.2
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-2
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2.1



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:24:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:24:44 -0400
Subject: rpms/libgnomeui/devel .cvsignore, 1.26, 1.27 libgnomeui.spec, 1.49,
	1.50 sources, 1.26, 1.27
Message-ID: <200607121924.k6CJOixZ009831@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9774

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.15.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	8 May 2006 16:27:02 -0000	1.26
+++ .cvsignore	12 Jul 2006 19:24:41 -0000	1.27
@@ -1 +1 @@
-libgnomeui-2.15.1.tar.bz2
+libgnomeui-2.15.2.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgnomeui.spec	12 Jul 2006 06:52:07 -0000	1.49
+++ libgnomeui.spec	12 Jul 2006 19:24:41 -0000	1.50
@@ -17,8 +17,8 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.15.1
-Release: 6.1
+Version: 2.15.2
+Release: 1
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -162,6 +162,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
+- Update to 2.15.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-6.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	8 May 2006 16:27:02 -0000	1.26
+++ sources	12 Jul 2006 19:24:41 -0000	1.27
@@ -1 +1 @@
-a63906a9504e6fc7e776730137007676  libgnomeui-2.15.1.tar.bz2
+ec5841c2c01d79e97bc363414e446240  libgnomeui-2.15.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:29:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:29:50 -0400
Subject: rpms/frysk/devel .cvsignore,1.18,1.19 sources,1.18,1.19
Message-ID: <200607121929.k6CJToXg011867@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11835

Modified Files:
	.cvsignore sources 
Log Message:
patch visibility in libdw


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Jul 2006 14:53:46 -0000	1.18
+++ .cvsignore	12 Jul 2006 19:29:47 -0000	1.19
@@ -1 +1 @@
-frysk-0.0.1.2006.07.12.rh1.tar.bz2
+frysk-0.0.1.2006.07.12.rh2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Jul 2006 14:53:46 -0000	1.18
+++ sources	12 Jul 2006 19:29:47 -0000	1.19
@@ -1 +1 @@
-3cfbf1262c50fd4b2b041782eb57eff1  frysk-0.0.1.2006.07.12.rh1.tar.bz2
+16947f86b94b19916c80142038977ca4  frysk-0.0.1.2006.07.12.rh2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:40:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:40:45 -0400
Subject: rpms/file-roller/devel .cvsignore, 1.37, 1.38 file-roller.spec, 1.64,
	1.65 sources, 1.38, 1.39
Message-ID: <200607121940.k6CJejoB013728@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13589

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	29 May 2006 19:44:44 -0000	1.37
+++ .cvsignore	12 Jul 2006 19:40:43 -0000	1.38
@@ -1 +1 @@
-file-roller-2.14.3.tar.bz2
+file-roller-2.15.1.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- file-roller.spec	12 Jul 2006 05:48:35 -0000	1.64
+++ file-roller.spec	12 Jul 2006 19:40:43 -0000	1.65
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.14.3
-Release: 	4.1
+Version:	2.15.1
+Release: 	1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -120,6 +120,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Wed Jul 12 2006 Matthisa Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.3-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	29 May 2006 19:44:44 -0000	1.38
+++ sources	12 Jul 2006 19:40:43 -0000	1.39
@@ -1 +1 @@
-11a11675a9ec5f8b0164713fc60894af  file-roller-2.14.3.tar.bz2
+ec829899b9d17860244b05182e8ed69f  file-roller-2.15.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:43:23 -0400
Subject: rpms/samba/FC-5 samba.spec, 1.63, 1.64 samba-3.0.20pre1-passwd.patch,
	1.1, NONE samba-3.0.21b-logfiles.patch, 1.1, NONE
Message-ID: <200607121943.k6CJhNW6014789@cvs.devel.redhat.com>

Author: fenlason

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

Modified Files:
	samba.spec 
Removed Files:
	samba-3.0.20pre1-passwd.patch samba-3.0.21b-logfiles.patch 
Log Message:
Why did this work for rawhide, but break for fc5?



Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- samba.spec	12 Jul 2006 18:57:09 -0000	1.63
+++ samba.spec	12 Jul 2006 19:43:21 -0000	1.64
@@ -235,6 +235,7 @@
 # pam_smbpass
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
 install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 
 # winbind
 mkdir -p $RPM_BUILD_ROOT%{_libdir}


--- samba-3.0.20pre1-passwd.patch DELETED ---


--- samba-3.0.21b-logfiles.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 19:53:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 15:53:21 -0400
Subject: rpms/gnome-games/devel .cvsignore, 1.40, 1.41 gnome-games.spec, 1.81,
	1.82 sources, 1.43, 1.44
Message-ID: <200607121953.k6CJrLZd000783@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	13 Jun 2006 04:37:46 -0000	1.40
+++ .cvsignore	12 Jul 2006 19:53:19 -0000	1.41
@@ -10,3 +10,4 @@
 gnome-games-2.15.1.tar.bz2
 gnome-games-2.15.2.tar.bz2
 gnome-games-2.15.3.tar.bz2
+gnome-games-2.15.4.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gnome-games.spec	12 Jul 2006 05:59:08 -0000	1.81
+++ gnome-games.spec	12 Jul 2006 19:53:19 -0000	1.82
@@ -13,8 +13,8 @@
 
 Summary: GNOME games
 Name: gnome-games
-Version: 2.15.3
-Release: 1.1
+Version: 2.15.4
+Release: 1
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -247,6 +247,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Jun 2006 04:37:46 -0000	1.43
+++ sources	12 Jul 2006 19:53:19 -0000	1.44
@@ -1,2 +1,2 @@
 01464739e83449288c6a58685604f86e  gnome-games-extra-data-2.14.0.tar.bz2
-378d4280593a7dee51bc9ac5f126d5c8  gnome-games-2.15.3.tar.bz2
+b8c50818ad905f6ecd4f8d90cd0111fc  gnome-games-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:07:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:07:13 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.13,1.14
Message-ID: <200607122007.k6CK7DWB003972@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-gcc-296.spec 
Log Message:
fix missing br


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compat-gcc-296.spec	12 Jul 2006 04:51:33 -0000	1.13
+++ compat-gcc-296.spec	12 Jul 2006 20:07:10 -0000	1.14
@@ -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
@@ -15,7 +15,7 @@
 # Need -pie support
 # Need --as-needed/--no-as-needed support
 BuildRequires: binutils >= 2.15.90.0.1.1-2
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
+BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, automake
 # Make sure pthread.h doesn't contain __thread tokens
 BuildRequires: glibc-devel >= 2.2.90-12
 # Need .eh_frame ld optimizations
@@ -1089,8 +1089,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.96-135.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.96-135.2
 - rebuild
+- Add br automake
 
 * Mon Feb 13 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-135
 - replace -mtune=generic in $RPM_OPT_FLAGS with something that



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:13:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:13:03 -0400
Subject: rpms/am-utils/devel am-utils.spec,1.37,1.38
Message-ID: <200607122013.k6CKD3o9013209@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	am-utils.spec 
Log Message:
fix missing br


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- am-utils.spec	12 Jul 2006 05:09:10 -0000	1.37
+++ am-utils.spec	12 Jul 2006 20:13:00 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.5
-Release: 2.1
+Release: 3
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -12,7 +12,7 @@
 Source3: am-utils.sysconf
 Source4: am-utils.net.map
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel autoconf automake libtool bison
+BuildPrereq: gdbm-devel, hesiod-devel, openldap-devel, autoconf, automake, libtool, bison, flex
 Requires: portmap, grep, gawk, findutils
 Prereq: /sbin/install-info, /sbin/chkconfig, grep
 Obsoletes: amd
@@ -129,8 +129,9 @@
 %{_libdir}/libamu.so*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.5-2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.5-3
 - rebuild
+- Add missing br flex
 
 * Thu Jun 01 2006 Peter Vrabec <pvrabec at redhat.com> 5:6.1.5-2
 - force to use HAVE_LINUX_NFS_MOUNT_H macro, because linux/nfs_mount.h 



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:19:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:19:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2384,1.2385
Message-ID: <200607122019.k6CKJpUL030716@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
should be buildable again


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2384
retrieving revision 1.2385
diff -u -r1.2384 -r1.2385
--- kernel-2.6.spec	12 Jul 2006 17:25:12 -0000	1.2384
+++ kernel-2.6.spec	12 Jul 2006 20:19:48 -0000	1.2385
@@ -180,8 +180,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:20:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:20:40 -0400
Subject: rpms/libgnome/devel gnome-2.15.1-stat-homedir.patch, NONE,
	1.1 libgnome.spec, 1.60, 1.61
Message-ID: <200607122020.k6CKKeH1030757@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30742

Modified Files:
	libgnome.spec 
Added Files:
	gnome-2.15.1-stat-homedir.patch 
Log Message:
2.15.1


gnome-2.15.1-stat-homedir.patch:
 gnome-init.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE gnome-2.15.1-stat-homedir.patch ---
--- libgnome-2.15.1/libgnome/gnome-init.c.stat-homedir	2006-06-13 14:08:05.000000000 -0400
+++ libgnome-2.15.1/libgnome/gnome-init.c	2006-07-12 16:22:05.000000000 -0400
@@ -336,6 +336,8 @@
 static void
 libgnome_userdir_setup (gboolean create_dirs)
 {
+	struct stat statbuf;
+	
 	if(!gnome_user_dir) {
                 const char *override;
 
@@ -399,8 +401,15 @@
 	}
 
 
+       if (stat (gnome_user_private_dir, &statbuf) < 0) {
+               g_printerr (_("Could not stat private per-user gnome configuration directory `%s': %s\n"),
+                       gnome_user_private_dir, strerror(errno));
+               exit(1);
+       }
+
 	/* change mode to 0700 on the private directory */
-	if (g_chmod (gnome_user_private_dir, 0700) < 0) {
+	if (((statbuf.st_mode & 0700) != 0700 )  &&
+            g_chmod (gnome_user_private_dir, 0700) < 0) {
 		g_printerr (_("Could not set mode 0700 on private per-user gnome configuration directory `%s': %s\n"),
 			gnome_user_private_dir, strerror(errno));
 		exit(1);


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- libgnome.spec	12 Jul 2006 19:17:27 -0000	1.60
+++ libgnome.spec	12 Jul 2006 20:20:38 -0000	1.61
@@ -48,7 +48,7 @@
 Patch3: libgnome-2.7.2-default-icontheme.patch
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch
-Patch6: libgnome-2.8.0-stat-homedir.patch
+Patch6: libgnome-2.15.1-stat-homedir.patch
 
 # Added to avoid the warning messages about utmp group, bug #24171
 # fixme, just libzvt?



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:23:02 -0400
Subject: rpms/kernel/devel linux-2.6-utrace.patch,1.2,1.3
Message-ID: <200607122023.k6CKN2IO030864@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	linux-2.6-utrace.patch 
Log Message:
Fix powerpc parallel compile nit

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   39 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   26 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6838 insertions(+), 3196 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-utrace.patch	12 Jul 2006 07:20:32 -0000	1.2
+++ linux-2.6-utrace.patch	12 Jul 2006 20:23:00 -0000	1.3
@@ -17,11 +17,11 @@
  arch/ia64/kernel/ptrace.c               |   39 -
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
- arch/powerpc/kernel/Makefile            |    2 
+ arch/powerpc/kernel/Makefile            |    4 
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  843 +++++++++---------
+ arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
  arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
@@ -77,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6832 insertions(+), 3191 deletions(-)
+ 79 files changed, 6833 insertions(+), 3191 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -8933,7 +8933,7 @@
  }
 --- linux-2.6/arch/powerpc/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/arch/powerpc/kernel/ptrace.c
-@@ -22,507 +22,526 @@
+@@ -22,507 +22,525 @@
  #include <linux/smp_lock.h>
  #include <linux/errno.h>
  #include <linux/ptrace.h>
@@ -8944,7 +8944,6 @@
  #include <linux/seccomp.h>
  #include <linux/audit.h>
 -#ifdef CONFIG_PPC32
-+#include <linux/compile.h>
 +#include <linux/elf.h>
  #include <linux/module.h>
 -#endif
@@ -9864,7 +9863,7 @@
  
  void do_syscall_trace_enter(struct pt_regs *regs)
  {
-@@ -530,9 +549,8 @@ void do_syscall_trace_enter(struct pt_re
+@@ -530,9 +548,8 @@ void do_syscall_trace_enter(struct pt_re
  	secure_computing(regs->gpr[0]);
  #endif
  
@@ -9876,7 +9875,7 @@
  
  	if (unlikely(current->audit_context))
  		audit_syscall_entry(
-@@ -556,10 +574,13 @@ void do_syscall_trace_leave(struct pt_re
+@@ -556,10 +573,13 @@ void do_syscall_trace_leave(struct pt_re
  		audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
  				   regs->result);
  
@@ -9896,7 +9895,14 @@
  #ifdef CONFIG_PPC32
 --- linux-2.6/arch/powerpc/kernel/Makefile.utrace-ptrace-compat
 +++ linux-2.6/arch/powerpc/kernel/Makefile
-@@ -15,7 +15,7 @@ obj-y				:= semaphore.o cputable.o ptrac
+@@ -10,12 +10,14 @@ CFLAGS_prom_init.o      += -fPIC
+ CFLAGS_btext.o		+= -fPIC
+ endif
+ 
++CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
++
+ obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \
+ 				   irq.o align.o signal_32.o pmc.o vdso.o \
  				   init_task.o process.o systbl.o idle.o
  obj-y				+= vdso32/
  obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:24:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:24:25 -0400
Subject: rpms/libgnome/devel libgnome-2.15.1-stat-homedir.patch,NONE,1.1
Message-ID: <200607122024.k6CKOPtO030969@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30955

Added Files:
	libgnome-2.15.1-stat-homedir.patch 
Log Message:
fix patch name


libgnome-2.15.1-stat-homedir.patch:
 gnome-init.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE libgnome-2.15.1-stat-homedir.patch ---
--- libgnome-2.15.1/libgnome/gnome-init.c.stat-homedir	2006-06-13 14:08:05.000000000 -0400
+++ libgnome-2.15.1/libgnome/gnome-init.c	2006-07-12 16:22:05.000000000 -0400
@@ -336,6 +336,8 @@
 static void
 libgnome_userdir_setup (gboolean create_dirs)
 {
+	struct stat statbuf;
+	
 	if(!gnome_user_dir) {
                 const char *override;
 
@@ -399,8 +401,15 @@
 	}
 
 
+       if (stat (gnome_user_private_dir, &statbuf) < 0) {
+               g_printerr (_("Could not stat private per-user gnome configuration directory `%s': %s\n"),
+                       gnome_user_private_dir, strerror(errno));
+               exit(1);
+       }
+
 	/* change mode to 0700 on the private directory */
-	if (g_chmod (gnome_user_private_dir, 0700) < 0) {
+	if (((statbuf.st_mode & 0700) != 0700 )  &&
+            g_chmod (gnome_user_private_dir, 0700) < 0) {
 		g_printerr (_("Could not set mode 0700 on private per-user gnome configuration directory `%s': %s\n"),
 			gnome_user_private_dir, strerror(errno));
 		exit(1);



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:26:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:26:26 -0400
Subject: rpms/at-spi/devel .cvsignore, 1.24, 1.25 at-spi.spec, 1.44,
	1.45 sources, 1.24, 1.25
Message-ID: <200607122026.k6CKQQtL031102@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31040

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	12 Jul 2006 12:54:02 -0000	1.24
+++ .cvsignore	12 Jul 2006 20:26:24 -0000	1.25
@@ -1,2 +1 @@
-at-spi-1.7.8.tar.bz2
-po.tar.gz
+at-spi-1.7.9.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- at-spi.spec	12 Jul 2006 12:54:02 -0000	1.44
+++ at-spi.spec	12 Jul 2006 20:26:24 -0000	1.45
@@ -6,11 +6,10 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.8
+Version: 1.7.9
 Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
-Source1: po.tar.gz
 
 License: LGPL
 Group: System Environment/Libraries
@@ -57,8 +56,6 @@
 %prep
 %setup -q
 
-tar xzf %{SOURCE1}
-
 %build
 %configure --disable-gtk-doc
 make
@@ -98,6 +95,9 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-1
+- Update to 1.7.9
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.8-1
 - Update to 1.7.8
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	12 Jul 2006 12:54:02 -0000	1.24
+++ sources	12 Jul 2006 20:26:24 -0000	1.25
@@ -1,2 +1 @@
-ea494d23d6732a1952ef0819077e853e  at-spi-1.7.8.tar.bz2
-d7b61e14352cba8c843e8643390306dc  po.tar.gz
+04e88cfd462861f12ed2d11da3279d31  at-spi-1.7.9.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:26:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:26:47 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-edid-root-window-properties.patch, NONE,
	1.1 xorg-x11-server.spec, 1.115, 1.116
Message-ID: <200607122026.k6CKQl4Z031139@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-edid-root-window-properties.patch 
Log Message:
* Wed Jul 12 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-4.fc6
- Restore placing the raw EDID block on the root window.


xorg-x11-server-1.1.1-edid-root-window-properties.patch:
 ddcProperty.c |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 88 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-edid-root-window-properties.patch ---
--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.edid-on-root-window	2006-07-12 16:06:31.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c	2006-07-12 16:06:31.000000000 -0400
@@ -27,6 +27,10 @@
 
 #include "xf86.h"
 #include "xf86DDC.h"
+#include <X11/Xatom.h>
+#include "property.h"
+#include "propertyst.h"
+#include "xf86DDC.h"
 
 /*
  * xf86Mode.c should have a some more DisplayModePtr list handling.
@@ -405,9 +409,88 @@
     }
 }
 
-/*
- * Empty shell that keeps most drivers happy.
- */
+#define EDID1_ATOM_NAME         "XFree86_DDC_EDID1_RAWDATA"
+#define EDID2_ATOM_NAME         "XFree86_DDC_EDID2_RAWDATA"
+#define VDIF_ATOM_NAME          "XFree86_DDC_VDIF_RAWDATA"
+
+static void
+addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
+{
+    Atom EDID1Atom=-1, EDID2Atom=-1;
+    CARD8 *EDID1rawdata = NULL;
+    CARD8 *EDID2rawdata = NULL;
+    int i, scrnIndex = pScrn->scrnIndex;
+    Bool makeEDID1prop = FALSE;
+    Bool makeEDID2prop = FALSE;
+
+    if (DDC->ver.version == 1) {
+	makeEDID1prop = TRUE;
+    } else if (DDC->ver.version == 2) {
+	int checksum1;
+	int checksum2;
+	makeEDID2prop = TRUE;
+
+	/* Some monitors (eg Panasonic PanaSync4)
+	 * report version==2 because they used EDID v2 spec document,
+	 * although they use EDID v1 data structure :-(
+	 *
+	 * Try using checksum to determine when we have such a monitor.
+	 */
+	checksum2 = 0;
+	for (i = 0; i < 256; i++)
+	    checksum2 += DDC->rawData[i];
+	if (checksum2 % 256) {
+	    xf86DrvMsg(scrnIndex, X_INFO, "Monitor EDID v2 checksum failed\n");
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		    "XFree86_DDC_EDID2_RAWDATA property may be bad\n");
+	    checksum1 = 0;
+	    for (i = 0; i < 128; i++)
+		checksum1 += DDC->rawData[i];
+	    if (!(checksum1 % 256)) {
+		xf86DrvMsg(scrnIndex, X_INFO,
+			"Monitor EDID v1 checksum passed,\n");
+		xf86DrvMsg(scrnIndex, X_INFO,
+			"XFree86_DDC_EDID1_RAWDATA property created\n");
+		makeEDID1prop = TRUE;
+	    }
+	}
+    } else {
+	xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
+		DDC->ver.version, DDC->ver.revision);
+	return;
+    }
+
+    if (makeEDID1prop) {
+	if ((EDID1rawdata = xalloc(128*sizeof(CARD8)))==NULL)
+	    return;
+
+	EDID1Atom = MakeAtom(EDID1_ATOM_NAME, sizeof(EDID1_ATOM_NAME), TRUE);
+	memcpy(EDID1rawdata, DDC->rawData, 128);
+	xf86RegisterRootWindowProperty(scrnIndex, EDID1Atom, XA_INTEGER, 8,
+		128, (unsigned char *)EDID1rawdata);
+    } 
+
+    if (makeEDID2prop) {
+	if ((EDID2rawdata = xalloc(256*sizeof(CARD8)))==NULL)
+	    return;
+
+	memcpy(EDID2rawdata, DDC->rawData, 256);
+	EDID2Atom = MakeAtom(EDID2_ATOM_NAME, sizeof(EDID2_ATOM_NAME), TRUE);
+	xf86RegisterRootWindowProperty(scrnIndex, EDID2Atom, XA_INTEGER, 8,
+		256, (unsigned char *)EDID2rawdata);
+    }
+
+#if 0
+    if (DDC->vdif) {
+#define VDIF_DUMMY_STRING "setting dummy VDIF property - please insert correct values\n"
+
+	VDIFAtom = MakeAtom(VDIF_ATOM_NAME, sizeof(VDIF_ATOM_NAME), TRUE);
+	xf86RegisterRootWindowProperty(scrnIndex, VDIFAtom, XA_STRING, 8,
+		strlen(VDIF_DUMMY_STRING), VDIF_DUMMY_STRING);
+    }
+#endif
+}
+
 Bool
 xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
 {
@@ -416,5 +499,7 @@
 
     xf86DDCMonitorSet(pScrn->scrnIndex, pScrn->monitor, DDC);
 
+    addRootWindowProperties(pScrn, DDC);
+
     return TRUE;
 }


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- xorg-x11-server.spec	12 Jul 2006 09:19:02 -0000	1.115
+++ xorg-x11-server.spec	12 Jul 2006 20:26:45 -0000	1.116
@@ -9,7 +9,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   3.1%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -48,6 +48,7 @@
 Patch3004:  xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
 Patch3005:  xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch
 Patch3006:  xorg-x11-server-1.1.1-dpms-on-by-default.patch
+Patch3007:  xorg-x11-server-1.1.1-edid-root-window-properties.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -313,6 +314,7 @@
 %patch3004 -p1 -b .targetrefresh
 %patch3005 -p1 -b .getconfig-pl-die-die-die
 %patch3006 -p1 -b .dpms-on-by-default
+%patch3007 -p1 -b .edid-on-root-window
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -638,7 +640,10 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-4.fc6
+- Restore placing the raw EDID block on the root window.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.1.1-3.1.fc6
 - rebuild
 
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-3.fc6



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:27:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:27:01 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.481, 1.482 kernel-2.6.spec, 1.2385,
	1.2386 sources, 1.425, 1.426 upstream, 1.392,
	1.393 patch-2.6.18-rc1-git3.bz2.sign, 1.1,
	NONE patch-2.6.18-rc1-git4.bz2.sign, 1.1, NONE
Message-ID: <200607122027.k6CKR13P031233@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1-git5.bz2.sign 
Removed Files:
	patch-2.6.18-rc1-git3.bz2.sign patch-2.6.18-rc1-git4.bz2.sign 
Log Message:
git5



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

iD8DBQBEtUdnyGugalF9Dw4RAm6FAJ9B6Z7orfOEqTzytfpHG4oRR8rLhACghrIg
rM6wRJfif+V0YLP8ehw3jAM=
=tu2d
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- .cvsignore	11 Jul 2006 19:47:20 -0000	1.481
+++ .cvsignore	12 Jul 2006 20:26:58 -0000	1.482
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git4.bz2
+patch-2.6.18-rc1-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2385
retrieving revision 1.2386
diff -u -r1.2385 -r1.2386
--- kernel-2.6.spec	12 Jul 2006 20:19:48 -0000	1.2385
+++ kernel-2.6.spec	12 Jul 2006 20:26:58 -0000	1.2386
@@ -1601,6 +1601,7 @@
 
 %changelog
 * Wed Jul 12 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git5
 - Make serial console installs on ia64 work again.
 
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- sources	11 Jul 2006 19:47:20 -0000	1.425
+++ sources	12 Jul 2006 20:26:58 -0000	1.426
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-2791811fbe1ea3e9da75096144f4d67c  patch-2.6.18-rc1-git4.bz2
+f65d10d23182f3139dd26048bd697f2d  patch-2.6.18-rc1-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- upstream	11 Jul 2006 19:47:20 -0000	1.392
+++ upstream	12 Jul 2006 20:26:58 -0000	1.393
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git4.bz2
+patch-2.6.18-rc1-git5.bz2


--- patch-2.6.18-rc1-git3.bz2.sign DELETED ---


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



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:27:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:27:37 -0400
Subject: rpms/oprofile/devel oprofile-core.patch, NONE, 1.1 oprofile.spec,
	1.45, 1.46
Message-ID: <200607122027.k6CKRbGq031276@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30932

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-core.patch 
Log Message:

* Wed Jul 12 2006 Will Cohen <wcohen at redhat.com>
- Support for Intel Woodcrest. (#183081)



oprofile-core.patch:
 events/Makefile.am          |    1 
 events/i386/core/events     |  115 ++++++++++++++++++++++++++++++++++++++++++++
 events/i386/core/unit_masks |   67 +++++++++++++++++++++++++
 libop/op_cpu_type.c         |    1 
 libop/op_cpu_type.h         |    1 
 libop/op_events.c           |    1 
 module/x86/cpu_type.c       |    4 +
 utils/ophelp.c              |    1 
 8 files changed, 191 insertions(+)

--- NEW FILE oprofile-core.patch ---
Index: events/Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/events/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- events/Makefile.am	22 Feb 2006 14:36:36 -0000	1.13
+++ events/Makefile.am	13 May 2006 13:55:02 -0000	1.14
@@ -11,6 +11,7 @@
 	i386/piii/events i386/piii/unit_masks \
 	i386/ppro/events i386/ppro/unit_masks \
 	i386/p6_mobile/events i386/p6_mobile/unit_masks \
+	i386/core/events i386/core/unit_masks \
 	ia64/ia64/events ia64/ia64/unit_masks \
 	ia64/itanium2/events ia64/itanium2/unit_masks \
 	ia64/itanium/events ia64/itanium/unit_masks \
Index: events/i386/core/events
===================================================================
RCS file: events/i386/core/events
diff -N events/i386/core/events
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ events/i386/core/events	13 May 2006 13:55:03 -0000	1.1
@@ -0,0 +1,115 @@
+# Core Solo / Duo events
+#
+# Architectural events
+#
+event:0x3c counters:0,1 um:nonhlt minimum:6000 name:CPU_CLK_UNHALTED : Unhalted clock cycles
+event:0xc0 counters:0,1 um:zero minimum:6000 name:INST_RETIRED : number of instructions retired
+event:0x2e counters:0,1 um:mesi minimum:6000 name:L2_RQSTS : number of L2 requests
+#
+# Model specific events
+#
+event:0x03 counters:0,1 um:zero minimum:500 name:LD_BLOCKS : number of store buffer blocks
+event:0x04 counters:0,1 um:zero minimum:500 name:SB_DRAINS : number of store buffer drain cycles
+event:0x05 counters:0,1 um:zero minimum:500 name:MISALIGN_MEM_REF : number of misaligned data memory references
+event:0x06 counters:0,1 um:zero minimum:500 name:SEGMENT_REG_LOADS : number of segment register loads
+event:0x07 counters:0,1 um:kni_prefetch minimum:500 name:EMON_KNI_PREF_DISPATCHED : number of SSE pre-fetch/weakly ordered insns retired
+event:0x10 counters:0 um:zero minimum:3000 name:FLOPS : number of computational FP operations executed
+event:0x11 counters:1 um:zero minimum:500 name:FP_ASSIST : number of FP exceptions handled by microcode
+event:0x12 counters:1 um:zero minimum:1000 name:MUL : number of multiplies
+event:0x13 counters:1 um:zero minimum:500 name:DIV : number of divides
+event:0x14 counters:0 um:zero minimum:1000 name:CYCLES_DIV_BUSY : cycles divider is busy
+event:0x21 counters:0,1 um:zero minimum:500 name:L2_ADS : number of L2 address strobes
+event:0x22 counters:0,1 um:zero minimum:500 name:L2_DBUS_BUSY : number of cycles data bus was busy
+event:0x23 counters:0,1 um:zero minimum:500 name:L2_DBUS_BUSY_RD : cycles data bus was busy in xfer from L2 to CPU
+event:0x24 counters:0,1 um:zero minimum:500 name:L2_LINES_IN : number of allocated lines in L2
+event:0x25 counters:0,1 um:zero minimum:500 name:L2_M_LINES_INM : number of modified lines allocated in L2
+event:0x26 counters:0,1 um:zero minimum:500 name:L2_LINES_OUT : number of recovered lines from L2
+event:0x27 counters:0,1 um:zero minimum:500 name:L2_M_LINES_OUTM : number of modified lines removed from L2
+event:0x28 counters:0,1 um:mesi minimum:500 name:L2_IFETCH : number of L2 instruction fetches
+event:0x29 counters:0,1 um:mesi minimum:500 name:L2_LD : number of L2 data loads
+event:0x2a counters:0,1 um:mesi minimum:500 name:L2_ST : number of L2 data stores
+event:0x30 counters:0,1 um:mesi minimum:500 name:L2_REJECT_CYCLES : Cycles L2 is busy and rejecting new requests
+event:0x32 counters:0,1 um:mesi minimum:500 name:L2_NO_REQUEST_CYCLES : Cycles there is no request to access L2
+event:0x3a counters:0,1 um:est_trans minimum:500 name:EST_TRANS_ALL : Intel(tm) Enhanced SpeedStep(r) Technology transitions
+event:0x3b counters:0,1 um:xc0 minimum:500 name:THERMAL_TRIP : Duration in a thremal trip based on the current core clock
+event:0x40 counters:0,1 um:mesi minimum:500 name:DCACHE_CACHE_LD : L1 cacheable data read operations
+event:0x41 counters:0,1 um:mesi minimum:500 name:DCACHE_CACHE_ST : L1 cacheable data write operations
+event:0x42 counters:0,1 um:mesi minimum:500 name:DCACHE_CACHE_LOCK : L1 cacheable lock read operations to invalid state
+event:0x43 counters:0,1 um:one minimum:500 name:DATA_MEM_REFS : all L1 memory references, cachable and non
+event:0x44 counters:0,1 um:two minimum:500 name:DATA_MEM_CACHE_REFS : L1 data cacheable read and write operations
+event:0x45 counters:0,1 um:x0f minimum:500 name:DCACHE_REPL : L1 data cache line replacements
+event:0x46 counters:0,1 um:zero minimum:500 name:DCACHE_M_REPL : L1 data M-state cache line allocated
+event:0x47 counters:0,1 um:zero minimum:500 name:DCACHE_M_EVICT : L1 data M-state cache line evicted
+event:0x48 counters:0,1 um:dc_pend_miss minimum:500 name:DCACHE_PEND_MISS : Weighted cycles of L1 miss outstanding
+event:0x49 counters:0,1 um:zero minimum:500 name:DTLB_MISS : Data references that missed TLB
+event:0x4b counters:0,1 um:sse_miss minimum:500 name:SSE_PREF_MISS : SSE instructions that missed all caches
+event:0x4f counters:0,1 um:zero minimum:500 name:L1_PREF_REQ : L1 prefetch requests due to DCU cache misses
+#
+event:0x60 counters:0,1 um:zero minimum:500 name:BUS_REQ_OUTSTANDING : weighted number of outstanding bus requests
+event:0x61 counters:0,1 um:zero minimum:500 name:BUS_BNR_DRV : External bus cycles this processor is driving BNR pin
+event:0x62 counters:0,1 um:zero minimum:500 name:BUS_DRDY_CLOCKS : External bus cycles DRDY is asserted
+event:0x63 counters:0,1 um:zero minimum:500 name:BUS_LOCK_CLOCKS : External bus cycles LOCK is asserted
+event:0x64 counters:0,1 um:x40 minimum:500 name:BUS_DATA_RCV : External bus cycles this processor is receiving data
+event:0x65 counters:0,1 um:zero minimum:500 name:BUS_TRAN_BRD : number of burst read transactions
+event:0x66 counters:0,1 um:zero minimum:500 name:BUS_TRAN_RFO : number of completed read for ownership transactions
+event:0x67 counters:0,1 um:xc0 minimum:500 name:BUS_TRAN_WB : number of completed writeback transactions
+event:0x68 counters:0,1 um:zero minimum:500 name:BUS_TRAN_IFETCH : number of completed instruction fetch transactions
+event:0x69 counters:0,1 um:zero minimum:500 name:BUS_TRAN_INVAL : number of completed invalidate transactions
+event:0x6a counters:0,1 um:zero minimum:500 name:BUS_TRAN_PWR : number of completed partial write transactions
+event:0x6b counters:0,1 um:zero minimum:500 name:BUS_TRANS_P : number of completed partial transactions
+event:0x6c counters:0,1 um:zero minimum:500 name:BUS_TRANS_IO : number of completed I/O transactions
+event:0x6d counters:0,1 um:x20 minimum:500 name:BUS_TRANS_DEF : number of completed defer transactions
+event:0x6e counters:0,1 um:xc0 minimum:500 name:BUS_TRAN_BURST : number of completed burst transactions
+event:0x6f counters:0,1 um:xc0 minimum:500 name:BUS_TRAN_MEM : number of completed memory transactions
+event:0x70 counters:0,1 um:xc0 minimum:500 name:BUS_TRAN_ANY : number of any completed bus transactions
+event:0x77 counters:0,1 um:zero minimum:500 name:BUS_SNOOPS : External bus cycles
+event:0x78 counters:0,1 um:one minimum:500 name:DCU_SNOOP_TO_SHARE : DCU snoops to share-state L1 cache line due to L1 misses
+event:0x7d counters:0,1 um:zero minimum:500 name:BUS_NOT_IN_USE : Number of cycles there is no transaction from the core
+event:0x7e counters:0,1 um:zero minimum:500 name:BUS_SNOOP_STALL : Number of bus cycles during bus snoop stall
+event:0x80 counters:0,1 um:zero minimum:500 name:ICACHE_READS : number of instruction fetches
+event:0x81 counters:0,1 um:zero minimum:500 name:ICACHE_MISSES : number of instruction fetch misses
+event:0x85 counters:0,1 um:zero minimum:500 name:ITLB_MISS : number of ITLB misses
+event:0x86 counters:0,1 um:zero minimum:500 name:IFU_MEM_STALL : cycles instruction fetch pipe is stalled
+event:0x87 counters:0,1 um:zero minimum:500 name:ILD_STALL : cycles instruction length decoder is stalled
+event:0x88 counters:0,1 um:zero minimum:3000 name:BR_INST_EXEC : Branch instructions executed (not necessarily retired)
+event:0x89 counters:0,1 um:zero minimum:3000 name:BR_MISSP_EXEC : Branch instructions executed that were mispredicted at execution
+event:0x8a counters:0,1 um:zero minimum:3000 name:BR_BAC_MISSP_EXEC : Branch instructions executed that were mispredicted at Front End (BAC)
+event:0x8b counters:0,1 um:zero minimum:3000 name:BR_CND_EXEC : Conditional Branch instructions executed
+event:0x8c counters:0,1 um:zero minimum:3000 name:BR_CND_MISSP_EXEC : Conditional Branch instructions executed that were mispredicted
+event:0x8d counters:0,1 um:zero minimum:3000 name:BR_IND_EXEC : Indirect Branch instructions executed
+event:0x8e counters:0,1 um:zero minimum:3000 name:BR_IND_MISSP_EXEC : Indirect Branch instructions executed that were mispredicted
+event:0x8f counters:0,1 um:zero minimum:3000 name:BR_RET_EXEC : Return Branch instructions executed
+event:0x90 counters:0,1 um:zero minimum:3000 name:BR_RET_MISSP_EXEC : Return Branch instructions executed that were mispredicted at Execution
+event:0x91 counters:0,1 um:zero minimum:3000 name:BR_RET_BAC_MISSP_EXEC :Return Branch instructions executed that were mispredicted at Front End (BAC)
+event:0x92 counters:0,1 um:zero minimum:3000 name:BR_CALL_EXEC : CALL instruction executed
+event:0x93 counters:0,1 um:zero minimum:3000 name:BR_CALL_MISSP_EXEC : CALL instruction executed and miss predicted
+event:0x94 counters:0,1 um:zero minimum:3000 name:BR_IND_CALL_EXEC : Indirect CALL instruction executed
+event:0xa2 counters:0,1 um:zero minimum:500 name:RESOURCE_STALLS : cycles during resource related stalls
+event:0xb0 counters:0,1 um:zero minimum:500 name:MMX_INSTR_EXEC : number of MMX instructions executed (not MOVQ and MOVD)
+event:0xb1 counters:0,1 um:zero minimum:3000 name:SIMD_SAT_INSTR_EXEC : number of SIMD saturating instructions executed
+event:0xb3 counters:0,1 um:mmx_instr_type_exec minimum:3000 name:MMX_INSTR_TYPE_EXEC : number of MMX packing instructions
+event:0xc1 counters:0 um:zero minimum:3000 name:COMP_FLOP_RET : number of computational FP operations retired
+event:0xc2 counters:0,1 um:zero minimum:6000 name:UOPS_RETIRED : number of UOPs retired
+event:0xc3 counters:0,1 um:zero minimum:500 name:SMC_DETECTED : number of times self-modifying code condition is detected
+event:0xc4 counters:0,1 um:zero minimum:500 name:BR_INST_RETIRED : number of branch instructions retired
+event:0xc5 counters:0,1 um:zero minimum:500 name:BR_MISS_PRED_RETIRED : number of mispredicted branches retired
+event:0xc6 counters:0,1 um:zero minimum:500 name:CYCLES_INT_MASKED : cycles interrupts are disabled
+event:0xc7 counters:0,1 um:zero minimum:500 name:CYCLES_INT_PENDING_AND_MASKED : cycles interrupts are disabled with pending interrupts
+event:0xc8 counters:0,1 um:zero minimum:500 name:HW_INT_RX : number of hardware interrupts received
+event:0xc9 counters:0,1 um:zero minimum:500 name:BR_TAKEN_RETIRED : number of taken branches retired
+event:0xca counters:0,1 um:zero minimum:500 name:BR_MISS_PRED_TAKEN_RET : number of taken mispredictions branches retired
+event:0xcc counters:0,1 um:mmx_trans minimum:3000 name:FP_MMX_TRANS : MMX-floating point transitions
+event:0xcd counters:0,1 um:zero minimum:500 name:MMX_ASSIST : number of EMMS instructions executed
+event:0xce counters:0,1 um:zero minimum:3000 name:MMX_INSTR_RET : number of MMX instructions retired
+event:0xd0 counters:0,1 um:zero minimum:6000 name:INST_DECODED : number of instructions decoded
+event:0xd7 counters:0,1 um:zero minimum:3000 name:ESP_UOPS : Number of ESP folding instructions decoded
+event:0xd8 counters:0,1 um:sse_sse2_inst_retired minimum:3000 name:EMON_SSE_SSE2_INST_RETIRED : Streaming SIMD Extensions Instructions Retired
+event:0xd9 counters:0,1 um:sse_sse2_inst_retired minimum:3000 name:EMON_SSE_SSE2_COMP_INST_RETIRED : Computational SSE Instructions Retired
+event:0xda counters:0,1 um:fused minimum:3000 name:EMON_FUSED_UOPS_RET : Number of retired fused micro-ops
+event:0xdb counters:0,1 um:zero minimum:3000 name:EMON_UNFUSION : Number of unfusion events in the ROB, happened on a FP exception to a fused uOp
+event:0xe0 counters:0,1 um:zero minimum:500 name:BR_INST_DECODED : number of branch instructions decoded
+event:0xe2 counters:0,1 um:zero minimum:500 name:BTB_MISSES : number of branches that miss the BTB
+event:0xe4 counters:0,1 um:zero minimum:500 name:BR_BOGUS : number of bogus branches
+event:0xe6 counters:0,1 um:zero minimum:500 name:BACLEARS : number of times BACLEAR is asserted
+event:0xf0 counters:0,1 um:zero minimum:3000 name:EMON_PREF_RQSTS_UP : Number of upward prefetches issued
+event:0xf8 counters:0,1 um:zero minimum:3000 name:EMON_PREF_RQSTS_DN : Number of downward prefetches issued
Index: events/i386/core/unit_masks
===================================================================
RCS file: events/i386/core/unit_masks
diff -N events/i386/core/unit_masks
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ events/i386/core/unit_masks	13 May 2006 13:55:03 -0000	1.1
@@ -0,0 +1,67 @@
+# Core Solo / Core Duo possible unit masks
+#
+name:zero type:mandatory default:0x0
+	0x0 No unit mask
+name:one type:mandatory default:0x1
+	0x1 No unit mask
+name:two type:mandatory default:0x2
+	0x2 No unit mask
+name:x0f type:mandatory default:0xf
+	0xf No unit mask
+name:x20 type:mandatory default:0x20
+	0x20 No unit mask
+name:x40 type:mandatory default:0x40
+	0x40 No unit mask
+name:xc0 type:mandatory default:0xc0
+	0xc0 No unit mask
+name:nonhlt type:exclusive default:0x0
+	0x0 Unhalted core cycles
+	0x1 Unhalted bus cycles
+	0x2 Unhalted bus cycles of this core while the other core is halted
+name:mesi type:bitmask default:0x0f
+	0x08 (M)odified cache state
+	0x04 (E)xclusive cache state
+	0x02 (S)hared cache state
+	0x01 (I)nvalid cache state
+	0x0f All cache states
+	0x10 HW prefetched line only
+	0x20 all prefetched line w/o regarding mask 0x10.
+name:est_trans type:exclusive default:0x00
+	0x00 any transitions
+	0x10 Intel(tm) Enhanced SpeedStep(r) Technology frequency transitions
+	0x20 any transactions
+name:kni_prefetch type:exclusive default:0x0
+	0x00 prefetch NTA
+	0x01 prefetch T1
+	0x02 prefetch T2
+	0x03 weakly-ordered stores
+# this bitmask can seems weirds but is correct, note there is no way to only
+# count scalar SIMD instructions
+name:sse_sse2_inst_retired type:exclusive default:0x0
+	0x00 SSE Packed Single
+	0x01 SSE Scalar-Single
+	0x02 SSE2 Packed-Double
+	0x03 SSE2 Scalar-Double
+name:mmx_instr_type_exec type:bitmask default:0x3f
+	0x01 MMX packed multiplies
+	0x02 MMX packed shifts
+	0x04 MMX pack operations
+	0x08 MMX unpack operations
+	0x10 MMX packed logical
+	0x20 MMX packed arithmetic
+	0x3f all of the above
+name:mmx_trans type:exclusive default:0x0
+	0x00 MMX->float operations
+	0x01 float->MMX operations
+name:fused type:exclusive default:0x0
+	0x00 All fused micro-ops
+	0x01 Only load+Op micro-ops
+	0x02 Only std+sta micro-ops
+name:dc_pend_miss type:exclusive default:0x0
+	0x00 Weighted cycles
+	0x01 Duration of cycles
+name:sse_miss type:exclusive default:0x0
+	0x00 PREFETCHNTA
+	0x01 PREFETCHT1
+	0x02 PREFETCHT2
+	0x03 SSE streaming store instructions
Index: libop/op_cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libop/op_cpu_type.c	22 Feb 2006 14:36:40 -0000	1.33
+++ libop/op_cpu_type.c	13 May 2006 13:55:03 -0000	1.34
@@ -57,6 +57,7 @@
 	{ "NEC VR5432", "mips/vr5432", CPU_MIPS_VR5432, 2 },
 	{ "NEC VR5500", "mips/vr5500", CPU_MIPS_VR5500, 2 },
 	{ "e500", "ppc/e500", CPU_PPC_E500, 4 },
+	{ "Core Solo / Duo", "i386/core", CPU_CORE, 2 },
 };
  
 static size_t const nr_cpu_descrs = sizeof(cpu_descrs) / sizeof(struct cpu_descr);
Index: libop/op_cpu_type.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libop/op_cpu_type.h	22 Feb 2006 14:36:40 -0000	1.26
+++ libop/op_cpu_type.h	13 May 2006 13:55:03 -0000	1.27
@@ -53,6 +53,7 @@
	CPU_MIPS_VR5432, /**< NEC VR5432 */
 	CPU_MIPS_VR5500, /**< MIPS VR5500, VR5532 and VR7701 */
 	CPU_PPC_E500,	/**< e500 */
+	CPU_CORE, /**< Core Solo / Duo series */
 	MAX_CPU_TYPE
 } op_cpu;
 
Index: libop/op_events.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- libop/op_events.c	22 Feb 2006 14:36:40 -0000	1.69
+++ libop/op_events.c	13 May 2006 13:55:03 -0000	1.70
@@ -743,6 +743,7 @@
 		case CPU_PII:
 		case CPU_PIII:
 		case CPU_P6_MOBILE:
+		case CPU_CORE:
 		case CPU_ATHLON:
 		case CPU_HAMMER:
 			descr->name = "CPU_CLK_UNHALTED";
Index: module/x86/cpu_type.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/cpu_type.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- module/x86/cpu_type.c	9 Aug 2005 11:26:06 -0000	1.18
+++ module/x86/cpu_type.c	13 May 2006 13:55:03 -0000	1.19
@@ -173,6 +173,10 @@
 				return CPU_RTC;
 			case 6:
 				/* A P6-class processor */
+				if (model == 14)
+					return CPU_CORE;
+				if (model > 0xd)
+					return CPU_RTC;
 				if (model > 5)
 					return CPU_PIII;
 				else if (model > 2)
Index: utils/ophelp.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- utils/ophelp.c	22 Feb 2006 14:36:41 -0000	1.5
+++ utils/ophelp.c	13 May 2006 13:55:03 -0000	1.6
@@ -381,6 +381,7 @@
 	case CPU_P6_MOBILE:
 	case CPU_P4:
 	case CPU_P4_HT2:
+	case CPU_CORE:
 		printf("See Intel Architecture Developer's Manual Volume 3, Appendix A and\n"
 		"Intel Architecture Optimization Reference Manual (730795-001)\n\n");
 		break;


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- oprofile.spec	12 Jul 2006 07:36:20 -0000	1.45
+++ oprofile.spec	12 Jul 2006 20:27:35 -0000	1.46
@@ -1,6 +1,6 @@
 %define DATE 20060710
 %define oprofile_version 0.9.1
-%define oprofile_release 13
+%define oprofile_release 14
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -23,6 +23,7 @@
 Patch84: oprofile-power5p.patch
 Patch86: oprofile-ppc64evts.patch
 Patch87: oprofile-power6.patch
+Patch88: oprofile-core.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -74,6 +75,7 @@
 %patch84 -p1 -b .power5p
 %patch86 -p1 -b .ppc64evts
 %patch87 -p1 -b .power6
+%patch88 -p0 -b .core
 
 ./autogen.sh
 
@@ -178,6 +180,8 @@
 /usr/share/oprofile/arm/xscale2/unit_masks
 /usr/share/oprofile/i386/athlon/events
 /usr/share/oprofile/i386/athlon/unit_masks
+/usr/share/oprofile/i386/core/events
+/usr/share/oprofile/i386/core/unit_masks
 /usr/share/oprofile/i386/p4-ht/events
 /usr/share/oprofile/i386/p4-ht/unit_masks
 /usr/share/oprofile/i386/p4/events
@@ -258,6 +262,9 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Wed Jul 12 2006 Will Cohen <wcohen at redhat.com>
+- Support for Intel Woodcrest. (#183081)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-13.1.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:29:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:29:41 -0400
Subject: rpms/gail/devel .cvsignore, 1.19, 1.20 gail.spec, 1.45, 1.46 sources,
	1.19, 1.20
Message-ID: <200607122029.k6CKTfuG031325@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31310

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Mar 2006 17:21:28 -0000	1.19
+++ .cvsignore	12 Jul 2006 20:29:39 -0000	1.20
@@ -1,10 +1 @@
-gail-1.6.6.tar.bz2
-gail-1.8.0.tar.bz2
-gail-1.8.2.tar.bz2
-gail-1.8.3.tar.bz2
-gail-1.8.4.tar.bz2
-gail-1.8.5.tar.bz2
-gail-1.8.8.tar.bz2
-gail-1.8.9.tar.bz2
-gail-1.8.10.tar.bz2
-gail-1.8.11.tar.bz2
+gail-1.9.0.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gail.spec	12 Jul 2006 05:52:34 -0000	1.45
+++ gail.spec	12 Jul 2006 20:29:39 -0000	1.46
@@ -4,8 +4,8 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.8.11
-Release: 3.1
+Version: 1.9.0
+Release: 1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -78,6 +78,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.0-1
+- Update to 1.9.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.11-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Mar 2006 17:21:28 -0000	1.19
+++ sources	12 Jul 2006 20:29:39 -0000	1.20
@@ -1 +1 @@
-ff79df7dd0cf7a5109c089b9b5fbe17f  gail-1.8.11.tar.bz2
+ab0ab7ff000ddf3bb610ef0d2d20ea04  gail-1.9.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:34:22 -0400
Subject: rpms/kernel/devel
	linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch,
	NONE, 1.1
	linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch,
	NONE, 1.1 linux-2.6-inode-diet-move-i_bdev-into-a-union.patch,
	NONE, 1.1 linux-2.6-inode-diet-move-i_cdev-into-a-union.patch,
	NONE, 1.1 linux-2.6-inode-diet-move-i_pipe-into-a-union.patch,
	NONE, 1.1 linux-2.6-inode-diet-squashfs.patch, NONE, 1.1
	linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2386, 1.2387
Message-ID: <200607122034.k6CKYMuW031536@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch 
	linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch 
	linux-2.6-inode-diet-move-i_bdev-into-a-union.patch 
	linux-2.6-inode-diet-move-i_cdev-into-a-union.patch 
	linux-2.6-inode-diet-move-i_pipe-into-a-union.patch 
	linux-2.6-inode-diet-squashfs.patch 
	linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch 
Log Message:
shrink inode structure

linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch:
 inode.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch ---
From: Adrian Bunk <bunk at stusta.de>

This patch removes a no longer used variable.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/ocfs2/inode.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN fs/ocfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix fs/ocfs2/inode.c
--- a/fs/ocfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix
+++ a/fs/ocfs2/inode.c
@@ -1187,8 +1187,6 @@ leave:
 void ocfs2_refresh_inode(struct inode *inode,
 			 struct ocfs2_dinode *fe)
 {
-	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
-
 	spin_lock(&OCFS2_I(inode)->ip_lock);
 
 	OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
_

linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch:
 arch/powerpc/platforms/cell/spufs/inode.c |    1 -
 arch/s390/hypfs/inode.c                   |    1 -
 drivers/block/loop.c                      |    7 +++++--
 drivers/infiniband/hw/ipath/ipath_fs.c    |    1 -
 drivers/isdn/capi/capifs.c                |    2 --
 drivers/misc/ibmasm/ibmasmfs.c            |    1 -
 drivers/oprofile/oprofilefs.c             |    1 -
 drivers/usb/core/inode.c                  |    1 -
 drivers/usb/gadget/inode.c                |    1 -
 fs/9p/vfs_inode.c                         |    4 +---
 fs/adfs/inode.c                           |    1 -
 fs/afs/inode.c                            |    1 -
 fs/autofs/inode.c                         |    1 -
 fs/autofs4/inode.c                        |    1 -
 fs/befs/linuxvfs.c                        |    1 -
 fs/bfs/dir.c                              |    2 +-
 fs/bfs/inode.c                            |    1 -
 fs/binfmt_misc.c                          |    1 -
 fs/cifs/cifsfs.c                          |    1 -
 fs/cifs/readdir.c                         |    5 ++---
 fs/coda/coda_linux.c                      |    2 --
 fs/configfs/inode.c                       |    1 -
 fs/cramfs/inode.c                         |    1 -
 fs/debugfs/inode.c                        |    1 -
 fs/devpts/inode.c                         |    2 --
 fs/eventpoll.c                            |    1 -
 fs/ext2/ialloc.c                          |    1 -
 fs/ext2/inode.c                           |    1 -
 fs/ext3/ialloc.c                          |    1 -
 fs/ext3/inode.c                           |    3 ---
 fs/fat/inode.c                            |    3 ---
 fs/freevxfs/vxfs_inode.c                  |    1 -
 fs/fuse/inode.c                           |    1 -
 fs/gfs2/inode.c                           |    1 -
 fs/hfs/inode.c                            |    2 --
 fs/hfsplus/inode.c                        |    2 --
 fs/hostfs/hostfs_kern.c                   |    1 -
 fs/hpfs/inode.c                           |    1 -
 fs/hppfs/hppfs_kern.c                     |    1 -
 fs/hugetlbfs/inode.c                      |    1 -
 fs/isofs/inode.c                          |    3 +--
 fs/jffs/inode-v23.c                       |    2 --
 fs/jffs2/fs.c                             |    2 --
 fs/jfs/jfs_extent.c                       |    2 +-
 fs/jfs/jfs_imap.c                         |    1 -
 fs/jfs/jfs_inode.c                        |    1 -
 fs/jfs/jfs_metapage.c                     |    2 +-
 fs/libfs.c                                |    2 --
 fs/minix/bitmap.c                         |    2 +-
 fs/minix/inode.c                          |    4 ++--
 fs/ncpfs/inode.c                          |    1 -
 fs/nfs/inode.c                            |    4 ----
 fs/ntfs/inode.c                           |    4 ----
 fs/ntfs/mft.c                             |    5 -----
 fs/ocfs2/dlm/dlmfs.c                      |    2 --
 fs/ocfs2/inode.c                          |    2 --
 fs/pipe.c                                 |    1 -
 fs/qnx4/inode.c                           |    1 -
 fs/ramfs/inode.c                          |    1 -
 fs/reiserfs/inode.c                       |    4 ----
 fs/smbfs/inode.c                          |    2 --
 fs/smbfs/proc.c                           |    1 -
 fs/stat.c                                 |    3 ++-
 fs/sysfs/inode.c                          |    1 -
 fs/sysv/ialloc.c                          |    2 +-
 fs/sysv/inode.c                           |    2 +-
 fs/udf/ialloc.c                           |    1 -
 fs/udf/inode.c                            |    2 --
 fs/ufs/ialloc.c                           |    1 -
 fs/ufs/inode.c                            |    1 -
 fs/xfs/linux-2.6/xfs_super.c              |    1 -
 fs/xfs/linux-2.6/xfs_vnode.c              |    1 -
 include/linux/fs.h                        |    1 -
 include/linux/nfsd/nfsfh.h                |   10 ++--------
 include/linux/smb.h                       |    1 -
 ipc/mqueue.c                              |    1 -
 kernel/cpuset.c                           |    1 -
 mm/shmem.c                                |    1 -
 net/sunrpc/rpc_pipe.c                     |    1 -
 security/inode.c                          |    1 -
 security/selinux/selinuxfs.c              |    1 -
 81 files changed, 21 insertions(+), 124 deletions(-)

--- NEW FILE linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch ---
From: "Theodore Ts'o" <tytso at mit.edu>

This eliminates the i_blksize field from struct inode.  Filesystems that want
to provide a per-inode st_blksize can do so by providing their own getattr
routine instead of using the generic_fillattr() function.

Note that some filesystems were providing pretty much random (and incorrect)
values for i_blksize.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/powerpc/platforms/cell/spufs/inode.c |    1 -
 arch/s390/hypfs/inode.c                   |    1 -
 drivers/block/loop.c                      |    7 +++++--
 drivers/infiniband/hw/ipath/ipath_fs.c    |    1 -
 drivers/isdn/capi/capifs.c                |    2 --
 drivers/misc/ibmasm/ibmasmfs.c            |    1 -
 drivers/oprofile/oprofilefs.c             |    1 -
 drivers/usb/core/inode.c                  |    1 -
 drivers/usb/gadget/inode.c                |    1 -
 fs/9p/vfs_inode.c                         |    4 +---
 fs/adfs/inode.c                           |    1 -
 fs/afs/inode.c                            |    1 -
 fs/autofs/inode.c                         |    1 -
 fs/autofs4/inode.c                        |    1 -
 fs/befs/linuxvfs.c                        |    1 -
 fs/bfs/dir.c                              |    2 +-
 fs/bfs/inode.c                            |    1 -
 fs/binfmt_misc.c                          |    1 -
 fs/cifs/cifsfs.c                          |    1 -
 fs/cifs/readdir.c                         |    5 ++---
 fs/coda/coda_linux.c                      |    2 --
 fs/configfs/inode.c                       |    1 -
 fs/cramfs/inode.c                         |    1 -
 fs/debugfs/inode.c                        |    1 -
 fs/devpts/inode.c                         |    2 --
 fs/eventpoll.c                            |    1 -
 fs/ext2/ialloc.c                          |    1 -
 fs/ext2/inode.c                           |    1 -
 fs/ext3/ialloc.c                          |    1 -
 fs/ext3/inode.c                           |    3 ---
 fs/fat/inode.c                            |    3 ---
 fs/freevxfs/vxfs_inode.c                  |    1 -
 fs/fuse/inode.c                           |    1 -
 fs/gfs2/inode.c                           |    1 -
 fs/hfs/inode.c                            |    2 --
 fs/hfsplus/inode.c                        |    2 --
 fs/hostfs/hostfs_kern.c                   |    1 -
 fs/hpfs/inode.c                           |    1 -
 fs/hppfs/hppfs_kern.c                     |    1 -
 fs/hugetlbfs/inode.c                      |    1 -
 fs/isofs/inode.c                          |    3 +--
 fs/jffs/inode-v23.c                       |    2 --
 fs/jffs2/fs.c                             |    2 --
 fs/jfs/jfs_extent.c                       |    2 +-
 fs/jfs/jfs_imap.c                         |    1 -
 fs/jfs/jfs_inode.c                        |    1 -
 fs/jfs/jfs_metapage.c                     |    2 +-
 fs/libfs.c                                |    2 --
 fs/minix/bitmap.c                         |    2 +-
 fs/minix/inode.c                          |    4 ++--
 fs/ncpfs/inode.c                          |    1 -
 fs/nfs/inode.c                            |    4 ----
 fs/ntfs/inode.c                           |    4 ----
 fs/ntfs/mft.c                             |    5 -----
 fs/ocfs2/dlm/dlmfs.c                      |    2 --
 fs/ocfs2/inode.c                          |    2 --
 fs/pipe.c                                 |    1 -
 fs/qnx4/inode.c                           |    1 -
 fs/ramfs/inode.c                          |    1 -
 fs/reiserfs/inode.c                       |    4 ----
 fs/smbfs/inode.c                          |    2 --
 fs/smbfs/proc.c                           |    1 -
 fs/stat.c                                 |    3 ++-
 fs/sysfs/inode.c                          |    1 -
 fs/sysv/ialloc.c                          |    2 +-
 fs/sysv/inode.c                           |    2 +-
 fs/udf/ialloc.c                           |    1 -
 fs/udf/inode.c                            |    2 --
 fs/ufs/ialloc.c                           |    1 -
 fs/ufs/inode.c                            |    1 -
 fs/xfs/linux-2.6/xfs_super.c              |    1 -
 fs/xfs/linux-2.6/xfs_vnode.c              |    1 -
 include/linux/fs.h                        |    1 -
 include/linux/nfsd/nfsfh.h                |   10 ++--------
 include/linux/smb.h                       |    1 -
 ipc/mqueue.c                              |    1 -
 kernel/cpuset.c                           |    1 -
 mm/shmem.c                                |    1 -
 net/sunrpc/rpc_pipe.c                     |    1 -
 security/inode.c                          |    1 -
 security/selinux/selinuxfs.c              |    1 -
 81 files changed, 21 insertions(+), 124 deletions(-)

diff -puN arch/powerpc/platforms/cell/spufs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default arch/powerpc/platforms/cell/spufs/inode.c
--- a/arch/powerpc/platforms/cell/spufs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/arch/powerpc/platforms/cell/spufs/inode.c
@@ -82,7 +82,6 @@ spufs_new_inode(struct super_block *sb, 
 	inode->i_mode = mode;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 out:
diff -puN arch/s390/hypfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default arch/s390/hypfs/inode.c
--- a/arch/s390/hypfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/arch/s390/hypfs/inode.c
@@ -91,7 +91,6 @@ static struct inode *hypfs_make_inode(st
 		ret->i_mode = mode;
 		ret->i_uid = hypfs_info->uid;
 		ret->i_gid = hypfs_info->gid;
-		ret->i_blksize = PAGE_CACHE_SIZE;
 		ret->i_blocks = 0;
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 		if (mode & S_IFDIR)
diff -puN drivers/block/loop.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/block/loop.c
--- a/drivers/block/loop.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/block/loop.c
@@ -662,7 +662,8 @@ static void do_loop_switch(struct loop_d
 
 	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
 	lo->lo_backing_file = file;
-	lo->lo_blocksize = mapping->host->i_blksize;
+	lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?
+		mapping->host->i_bdev->bd_block_size : PAGE_SIZE;
 	lo->old_gfp_mask = mapping_gfp_mask(mapping);
 	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
 	complete(&p->wait);
@@ -794,7 +795,9 @@ static int loop_set_fd(struct loop_devic
 		if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)
 			lo_flags |= LO_FLAGS_READ_ONLY;
 
-		lo_blocksize = inode->i_blksize;
+		lo_blocksize = S_ISBLK(inode->i_mode) ?
+			inode->i_bdev->bd_block_size : PAGE_SIZE;
+
 		error = 0;
 	} else {
 		goto out_putf;
diff -puN drivers/infiniband/hw/ipath/ipath_fs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/infiniband/hw/ipath/ipath_fs.c
--- a/drivers/infiniband/hw/ipath/ipath_fs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -61,7 +61,6 @@ static int ipathfs_mknod(struct inode *d
 	inode->i_mode = mode;
 	inode->i_uid = 0;
 	inode->i_gid = 0;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	inode->i_private = data;
diff -puN drivers/isdn/capi/capifs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/isdn/capi/capifs.c
--- a/drivers/isdn/capi/capifs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/isdn/capi/capifs.c
@@ -104,7 +104,6 @@ capifs_fill_super(struct super_block *s,
 	inode->i_ino = 1;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	inode->i_blocks = 0;
-	inode->i_blksize = 1024;
 	inode->i_uid = inode->i_gid = 0;
 	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
 	inode->i_op = &simple_dir_inode_operations;
@@ -149,7 +148,6 @@ void capifs_new_ncci(unsigned int number
 	if (!inode)
 		return;
 	inode->i_ino = number+2;
-	inode->i_blksize = 1024;
 	inode->i_uid = config.setuid ? config.uid : current->fsuid;
 	inode->i_gid = config.setgid ? config.gid : current->fsgid;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
diff -puN drivers/misc/ibmasm/ibmasmfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/misc/ibmasm/ibmasmfs.c
--- a/drivers/misc/ibmasm/ibmasmfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/misc/ibmasm/ibmasmfs.c
@@ -147,7 +147,6 @@ static struct inode *ibmasmfs_make_inode
 	if (ret) {
 		ret->i_mode = mode;
 		ret->i_uid = ret->i_gid = 0;
-		ret->i_blksize = PAGE_CACHE_SIZE;
 		ret->i_blocks = 0;
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 	}
diff -puN drivers/oprofile/oprofilefs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/oprofile/oprofilefs.c
--- a/drivers/oprofile/oprofilefs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/oprofile/oprofilefs.c
@@ -31,7 +31,6 @@ static struct inode * oprofilefs_get_ino
 		inode->i_mode = mode;
 		inode->i_uid = 0;
 		inode->i_gid = 0;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	}
diff -puN drivers/usb/core/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/usb/core/inode.c
--- a/drivers/usb/core/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/usb/core/inode.c
@@ -249,7 +249,6 @@ static struct inode *usbfs_get_inode (st
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		switch (mode & S_IFMT) {
diff -puN drivers/usb/gadget/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default drivers/usb/gadget/inode.c
--- a/drivers/usb/gadget/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/drivers/usb/gadget/inode.c
@@ -1966,7 +1966,6 @@ gadgetfs_make_inode (struct super_block 
 		inode->i_mode = mode;
 		inode->i_uid = default_uid;
 		inode->i_gid = default_gid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime
 				= CURRENT_TIME;
diff -puN fs/9p/vfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/9p/vfs_inode.c
--- a/fs/9p/vfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/9p/vfs_inode.c
@@ -204,7 +204,6 @@ struct inode *v9fs_get_inode(struct supe
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = sb->s_blocksize;
 		inode->i_blocks = 0;
 		inode->i_rdev = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -950,9 +949,8 @@ v9fs_stat2inode(struct v9fs_stat *stat, 
 
 	inode->i_size = stat->length;
 
-	inode->i_blksize = sb->s_blocksize;
 	inode->i_blocks =
-	    (inode->i_size + inode->i_blksize - 1) >> sb->s_blocksize_bits;
+	    (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
 }
 
 /**
diff -puN fs/adfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/adfs/inode.c
--- a/fs/adfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/adfs/inode.c
@@ -269,7 +269,6 @@ adfs_iget(struct super_block *sb, struct
 	inode->i_ino	 = obj->file_id;
 	inode->i_size	 = obj->size;
 	inode->i_nlink	 = 2;
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks	 = (inode->i_size + sb->s_blocksize - 1) >>
 			    sb->s_blocksize_bits;
 
diff -puN fs/afs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/afs/inode.c
--- a/fs/afs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/afs/inode.c
@@ -72,7 +72,6 @@ static int afs_inode_map_status(struct a
 	inode->i_ctime.tv_sec	= vnode->status.mtime_server;
 	inode->i_ctime.tv_nsec	= 0;
 	inode->i_atime		= inode->i_mtime = inode->i_ctime;
-	inode->i_blksize	= PAGE_CACHE_SIZE;
 	inode->i_blocks		= 0;
 	inode->i_version	= vnode->fid.unique;
 	inode->i_mapping->a_ops	= &afs_fs_aops;
diff -puN fs/autofs4/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/autofs4/inode.c
--- a/fs/autofs4/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/autofs4/inode.c
@@ -446,7 +446,6 @@ struct inode *autofs4_get_inode(struct s
 		inode->i_uid = 0;
 		inode->i_gid = 0;
 	}
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 
diff -puN fs/autofs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/autofs/inode.c
--- a/fs/autofs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/autofs/inode.c
@@ -216,7 +216,6 @@ static void autofs_read_inode(struct ino
 	inode->i_nlink = 2;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	inode->i_blocks = 0;
-	inode->i_blksize = 1024;
 
 	if ( ino == AUTOFS_ROOT_INO ) {
 		inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
diff -puN fs/befs/linuxvfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/befs/linuxvfs.c
--- a/fs/befs/linuxvfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/befs/linuxvfs.c
@@ -365,7 +365,6 @@ befs_read_inode(struct inode *inode)
 	inode->i_mtime.tv_nsec = 0;   /* lower 16 bits are not a time */	
 	inode->i_ctime = inode->i_mtime;
 	inode->i_atime = inode->i_mtime;
-	inode->i_blksize = befs_sb->block_size;
 
 	befs_ino->i_inode_num = fsrun_to_cpu(sb, raw_inode->inode_num);
 	befs_ino->i_parent = fsrun_to_cpu(sb, raw_inode->parent);
diff -puN fs/bfs/dir.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/bfs/dir.c
--- a/fs/bfs/dir.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/bfs/dir.c
@@ -102,7 +102,7 @@ static int bfs_create(struct inode * dir
 	inode->i_uid = current->fsuid;
 	inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 	inode->i_op = &bfs_file_inops;
 	inode->i_fop = &bfs_file_operations;
 	inode->i_mapping->a_ops = &bfs_aops;
diff -puN fs/bfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/bfs/inode.c
--- a/fs/bfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/bfs/inode.c
@@ -76,7 +76,6 @@ static void bfs_read_inode(struct inode 
 	inode->i_size = BFS_FILESIZE(di);
 	inode->i_blocks = BFS_FILEBLOCKS(di);
         if (inode->i_size || inode->i_blocks) dprintf("Registered inode with %lld size, %ld blocks\n", inode->i_size, inode->i_blocks);
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_atime.tv_sec =  le32_to_cpu(di->i_atime);
 	inode->i_mtime.tv_sec =  le32_to_cpu(di->i_mtime);
 	inode->i_ctime.tv_sec =  le32_to_cpu(di->i_ctime);
diff -puN fs/binfmt_misc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/binfmt_misc.c
--- a/fs/binfmt_misc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/binfmt_misc.c
@@ -507,7 +507,6 @@ static struct inode *bm_get_inode(struct
 		inode->i_mode = mode;
 		inode->i_uid = 0;
 		inode->i_gid = 0;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime =
 			current_fs_time(inode->i_sb);
diff -puN fs/cifs/cifsfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/cifs/cifsfs.c
--- a/fs/cifs/cifsfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/cifs/cifsfs.c
@@ -255,7 +255,6 @@ cifs_alloc_inode(struct super_block *sb)
 	file data or metadata */
 	cifs_inode->clientCanCacheRead = FALSE;
 	cifs_inode->clientCanCacheAll = FALSE;
-	cifs_inode->vfs_inode.i_blksize = CIFS_MAX_MSGSIZE;
 	cifs_inode->vfs_inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */
 	cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME;
 	INIT_LIST_HEAD(&cifs_inode->openFileList);
diff -puN fs/cifs/readdir.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/cifs/readdir.c
--- a/fs/cifs/readdir.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/cifs/readdir.c
@@ -219,10 +219,9 @@ static void fill_in_inode(struct inode *
 
 	if (allocation_size < end_of_file)
 		cFYI(1, ("May be sparse file, allocation less than file size"));
-	cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld",
+	cFYI(1, ("File Size %ld and blocks %llu",
 		(unsigned long)tmp_inode->i_size,
-		(unsigned long long)tmp_inode->i_blocks,
-		tmp_inode->i_blksize));
+		(unsigned long long)tmp_inode->i_blocks));
 	if (S_ISREG(tmp_inode->i_mode)) {
 		cFYI(1, ("File inode"));
 		tmp_inode->i_op = &cifs_file_inode_ops;
diff -puN fs/coda/coda_linux.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/coda/coda_linux.c
--- a/fs/coda/coda_linux.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/coda/coda_linux.c
@@ -110,8 +110,6 @@ void coda_vattr_to_iattr(struct inode *i
 	        inode->i_nlink = attr->va_nlink;
 	if (attr->va_size != -1)
 	        inode->i_size = attr->va_size;
-	if (attr->va_blocksize != -1)
-		inode->i_blksize = attr->va_blocksize;
 	if (attr->va_size != -1)
 		inode->i_blocks = (attr->va_size + 511) >> 9;
 	if (attr->va_atime.tv_sec != -1) 
diff -puN fs/configfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/configfs/inode.c
--- a/fs/configfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/configfs/inode.c
@@ -136,7 +136,6 @@ struct inode * configfs_new_inode(mode_t
 {
 	struct inode * inode = new_inode(configfs_sb);
 	if (inode) {
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->a_ops = &configfs_aops;
 		inode->i_mapping->backing_dev_info = &configfs_backing_dev_info;
diff -puN fs/cramfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/cramfs/inode.c
--- a/fs/cramfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/cramfs/inode.c
@@ -73,7 +73,6 @@ static int cramfs_iget5_set(struct inode
 	inode->i_uid = cramfs_inode->uid;
 	inode->i_size = cramfs_inode->size;
 	inode->i_blocks = (cramfs_inode->size - 1) / 512 + 1;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_gid = cramfs_inode->gid;
 	/* Struct copy intentional */
 	inode->i_mtime = inode->i_atime = inode->i_ctime = zerotime;
diff -puN fs/debugfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/debugfs/inode.c
--- a/fs/debugfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/debugfs/inode.c
@@ -40,7 +40,6 @@ static struct inode *debugfs_get_inode(s
 		inode->i_mode = mode;
 		inode->i_uid = 0;
 		inode->i_gid = 0;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		switch (mode & S_IFMT) {
diff -puN fs/devpts/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/devpts/inode.c
--- a/fs/devpts/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/devpts/inode.c
@@ -113,7 +113,6 @@ devpts_fill_super(struct super_block *s,
 	inode->i_ino = 1;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	inode->i_blocks = 0;
-	inode->i_blksize = 1024;
 	inode->i_uid = inode->i_gid = 0;
 	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
 	inode->i_op = &simple_dir_inode_operations;
@@ -172,7 +171,6 @@ int devpts_pty_new(struct tty_struct *tt
 		return -ENOMEM;
 
 	inode->i_ino = number+2;
-	inode->i_blksize = 1024;
 	inode->i_uid = config.setuid ? config.uid : current->fsuid;
 	inode->i_gid = config.setgid ? config.gid : current->fsgid;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
diff -puN fs/eventpoll.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/eventpoll.c
--- a/fs/eventpoll.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/eventpoll.c
@@ -1590,7 +1590,6 @@ static struct inode *ep_eventpoll_inode(
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-	inode->i_blksize = PAGE_SIZE;
 	return inode;
 
 eexit_1:
diff -puN fs/ext2/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ext2/ialloc.c
--- a/fs/ext2/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ext2/ialloc.c
@@ -574,7 +574,6 @@ got:
 	inode->i_mode = mode;
 
 	inode->i_ino = ino;
-	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size (for stat), not the fs block size */
 	inode->i_blocks = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
 	memset(ei->i_data, 0, sizeof(ei->i_data));
diff -puN fs/ext2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ext2/inode.c
--- a/fs/ext2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ext2/inode.c
@@ -1094,7 +1094,6 @@ void ext2_read_inode (struct inode * ino
 		brelse (bh);
 		goto bad_inode;
 	}
-	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size (for stat), not the fs block size */
 	inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
 	ei->i_flags = le32_to_cpu(raw_inode->i_flags);
 	ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
diff -puN fs/ext3/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ext3/ialloc.c
--- a/fs/ext3/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ext3/ialloc.c
@@ -559,7 +559,6 @@ got:
 
 	inode->i_ino = ino;
 	/* This is the optimal IO size (for stat), not the fs block size */
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
 
diff -puN fs/ext3/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ext3/inode.c
--- a/fs/ext3/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ext3/inode.c
@@ -2628,9 +2628,6 @@ void ext3_read_inode(struct inode * inod
 		 * recovery code: that's fine, we're about to complete
 		 * the process of deleting those. */
 	}
-	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
-					 * (for stat), not the fs block
-					 * size */  
 	inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
 	ei->i_flags = le32_to_cpu(raw_inode->i_flags);
 #ifdef EXT3_FRAGMENTS
diff -puN fs/fat/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/fat/inode.c
--- a/fs/fat/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/fat/inode.c
@@ -370,8 +370,6 @@ static int fat_fill_inode(struct inode *
 			inode->i_flags |= S_IMMUTABLE;
 	}
 	MSDOS_I(inode)->i_attrs = de->attr & ATTR_UNUSED;
-	/* this is as close to the truth as we can get ... */
-	inode->i_blksize = sbi->cluster_size;
 	inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))
 			   & ~((loff_t)sbi->cluster_size - 1)) >> 9;
 	inode->i_mtime.tv_sec =
@@ -1132,7 +1130,6 @@ static int fat_read_root(struct inode *i
 		MSDOS_I(inode)->i_start = 0;
 		inode->i_size = sbi->dir_entries * sizeof(struct msdos_dir_entry);
 	}
-	inode->i_blksize = sbi->cluster_size;
 	inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))
 			   & ~((loff_t)sbi->cluster_size - 1)) >> 9;
 	MSDOS_I(inode)->i_logstart = 0;
diff -puN fs/freevxfs/vxfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/freevxfs/vxfs_inode.c
--- a/fs/freevxfs/vxfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/freevxfs/vxfs_inode.c
@@ -239,7 +239,6 @@ vxfs_iinit(struct inode *ip, struct vxfs
 	ip->i_ctime.tv_nsec = 0;
 	ip->i_mtime.tv_nsec = 0;
 
-	ip->i_blksize = PAGE_SIZE;
 	ip->i_blocks = vip->vii_blocks;
 	ip->i_generation = vip->vii_gen;
 
diff -puN fs/fuse/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/fuse/inode.c
--- a/fs/fuse/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/fuse/inode.c
@@ -118,7 +118,6 @@ void fuse_change_attributes(struct inode
 	inode->i_uid     = attr->uid;
 	inode->i_gid     = attr->gid;
 	i_size_write(inode, attr->size);
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks  = attr->blocks;
 	inode->i_atime.tv_sec   = attr->atime;
 	inode->i_atime.tv_nsec  = attr->atimensec;
diff -puN fs/gfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/gfs2/inode.c
--- a/fs/gfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/gfs2/inode.c
@@ -69,7 +69,6 @@ static void inode_attr_in(struct gfs2_in
 	inode->i_atime.tv_nsec = 0;
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_ctime.tv_nsec = 0;
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = ip->i_di.di_blocks <<
 		(GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
 
diff -puN fs/hfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hfs/inode.c
--- a/fs/hfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hfs/inode.c
@@ -154,7 +154,6 @@ struct inode *hfs_new_inode(struct inode
 	inode->i_gid = current->fsgid;
 	inode->i_nlink = 1;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-	inode->i_blksize = HFS_SB(sb)->alloc_blksz;
 	HFS_I(inode)->flags = 0;
 	HFS_I(inode)->rsrc_inode = NULL;
 	HFS_I(inode)->fs_blocks = 0;
@@ -284,7 +283,6 @@ static int hfs_read_inode(struct inode *
 	inode->i_uid = hsb->s_uid;
 	inode->i_gid = hsb->s_gid;
 	inode->i_nlink = 1;
-	inode->i_blksize = HFS_SB(inode->i_sb)->alloc_blksz;
 
 	if (idata->key)
 		HFS_I(inode)->cat_key = *idata->key;
diff -puN fs/hfsplus/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hfsplus/inode.c
--- a/fs/hfsplus/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hfsplus/inode.c
@@ -304,7 +304,6 @@ struct inode *hfsplus_new_inode(struct s
 	inode->i_gid = current->fsgid;
 	inode->i_nlink = 1;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-	inode->i_blksize = HFSPLUS_SB(sb).alloc_blksz;
 	INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);
 	init_MUTEX(&HFSPLUS_I(inode).extents_lock);
 	atomic_set(&HFSPLUS_I(inode).opencnt, 0);
@@ -407,7 +406,6 @@ int hfsplus_cat_read_inode(struct inode 
 	type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
 
 	HFSPLUS_I(inode).dev = 0;
-	inode->i_blksize = HFSPLUS_SB(inode->i_sb).alloc_blksz;
 	if (type == HFSPLUS_FOLDER) {
 		struct hfsplus_cat_folder *folder = &entry.folder;
 
diff -puN fs/hostfs/hostfs_kern.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hostfs/hostfs_kern.c
--- a/fs/hostfs/hostfs_kern.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hostfs/hostfs_kern.c
@@ -156,7 +156,6 @@ static int read_name(struct inode *ino, 
 	ino->i_mode = i_mode;
 	ino->i_nlink = i_nlink;
 	ino->i_size = i_size;
-	ino->i_blksize = i_blksize;
 	ino->i_blocks = i_blocks;
 	return(0);
 }
diff -puN fs/hpfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hpfs/inode.c
--- a/fs/hpfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hpfs/inode.c
@@ -17,7 +17,6 @@ void hpfs_init_inode(struct inode *i)
 	i->i_gid = hpfs_sb(sb)->sb_gid;
 	i->i_mode = hpfs_sb(sb)->sb_mode;
 	hpfs_inode->i_conv = hpfs_sb(sb)->sb_conv;
-	i->i_blksize = 512;
 	i->i_size = -1;
 	i->i_blocks = -1;
 	
diff -puN fs/hppfs/hppfs_kern.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hppfs/hppfs_kern.c
--- a/fs/hppfs/hppfs_kern.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hppfs/hppfs_kern.c
@@ -152,7 +152,6 @@ static void hppfs_read_inode(struct inod
 	ino->i_mode = proc_ino->i_mode;
 	ino->i_nlink = proc_ino->i_nlink;
 	ino->i_size = proc_ino->i_size;
-	ino->i_blksize = proc_ino->i_blksize;
 	ino->i_blocks = proc_ino->i_blocks;
 }
 
diff -puN fs/hugetlbfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/hugetlbfs/inode.c
--- a/fs/hugetlbfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/hugetlbfs/inode.c
@@ -359,7 +359,6 @@ static struct inode *hugetlbfs_get_inode
 		inode->i_mode = mode;
 		inode->i_uid = uid;
 		inode->i_gid = gid;
-		inode->i_blksize = HPAGE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->a_ops = &hugetlbfs_aops;
 		inode->i_mapping->backing_dev_info =&hugetlbfs_backing_dev_info;
diff -puN fs/isofs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/isofs/inode.c
--- a/fs/isofs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/isofs/inode.c
@@ -1238,7 +1238,7 @@ static void isofs_read_inode(struct inod
 	}
 	inode->i_uid = sbi->s_uid;
 	inode->i_gid = sbi->s_gid;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 
 	ei->i_format_parm[0] = 0;
 	ei->i_format_parm[1] = 0;
@@ -1294,7 +1294,6 @@ static void isofs_read_inode(struct inod
 			      isonum_711 (de->ext_attr_length));
 
 	/* Set the number of blocks for stat() - should be done before RR */
-	inode->i_blksize = PAGE_CACHE_SIZE; /* For stat() only */
 	inode->i_blocks  = (inode->i_size + 511) >> 9;
 
 	/*
diff -puN fs/jffs2/fs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jffs2/fs.c
--- a/fs/jffs2/fs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jffs2/fs.c
@@ -263,7 +263,6 @@ void jffs2_read_inode (struct inode *ino
 
 	inode->i_nlink = f->inocache->nlink;
 
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = (inode->i_size + 511) >> 9;
 
 	switch (inode->i_mode & S_IFMT) {
@@ -449,7 +448,6 @@ struct inode *jffs2_new_inode (struct in
 	inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
 	ri->atime = ri->mtime = ri->ctime = cpu_to_je32(I_SEC(inode->i_mtime));
 
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_size = 0;
 
diff -puN fs/jffs/inode-v23.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jffs/inode-v23.c
--- a/fs/jffs/inode-v23.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jffs/inode-v23.c
@@ -364,7 +364,6 @@ jffs_new_inode(const struct inode * dir,
 	inode->i_ctime.tv_nsec = 0;
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = (inode->i_size + 511) >> 9;
 
 	f = jffs_find_file(c, raw_inode->ino);
@@ -1706,7 +1705,6 @@ jffs_read_inode(struct inode *inode)
 	inode->i_mtime.tv_nsec = 
 	inode->i_ctime.tv_nsec = 0;
 
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = (inode->i_size + 511) >> 9;
 	if (S_ISREG(inode->i_mode)) {
 		inode->i_op = &jffs_file_inode_operations;
diff -puN fs/jfs/jfs_extent.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jfs/jfs_extent.c
--- a/fs/jfs/jfs_extent.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jfs/jfs_extent.c
@@ -468,7 +468,7 @@ int extRecord(struct inode *ip, xad_t * 
 int extFill(struct inode *ip, xad_t * xp)
 {
 	int rc, nbperpage = JFS_SBI(ip->i_sb)->nbperpage;
-	s64 blkno = offsetXAD(xp) >> ip->i_blksize;
+	s64 blkno = offsetXAD(xp) >> ip->i_blkbits;
 
 //      assert(ISSPARSE(ip));
 
diff -puN fs/jfs/jfs_imap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jfs/jfs_imap.c
--- a/fs/jfs/jfs_imap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jfs/jfs_imap.c
@@ -3115,7 +3115,6 @@ static int copy_from_dinode(struct dinod
 	ip->i_mtime.tv_nsec = le32_to_cpu(dip->di_mtime.tv_nsec);
 	ip->i_ctime.tv_sec = le32_to_cpu(dip->di_ctime.tv_sec);
 	ip->i_ctime.tv_nsec = le32_to_cpu(dip->di_ctime.tv_nsec);
-	ip->i_blksize = ip->i_sb->s_blocksize;
 	ip->i_blocks = LBLK2PBLK(ip->i_sb, le64_to_cpu(dip->di_nblocks));
 	ip->i_generation = le32_to_cpu(dip->di_gen);
 
diff -puN fs/jfs/jfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jfs/jfs_inode.c
--- a/fs/jfs/jfs_inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jfs/jfs_inode.c
@@ -115,7 +115,6 @@ struct inode *ialloc(struct inode *paren
 	}
 	jfs_inode->mode2 |= mode;
 
-	inode->i_blksize = sb->s_blocksize;
 	inode->i_blocks = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	jfs_inode->otime = inode->i_ctime.tv_sec;
diff -puN fs/jfs/jfs_metapage.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/jfs/jfs_metapage.c
--- a/fs/jfs/jfs_metapage.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/jfs/jfs_metapage.c
@@ -257,7 +257,7 @@ static sector_t metapage_get_blocks(stru
 	int rc = 0;
 	int xflag;
 	s64 xaddr;
-	sector_t file_blocks = (inode->i_size + inode->i_blksize - 1) >>
+	sector_t file_blocks = (inode->i_size + inode->i_sb->s_blocksize - 1) >>
 			       inode->i_blkbits;
 
 	if (lblock >= file_blocks)
diff -puN fs/libfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/libfs.c
--- a/fs/libfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/libfs.c
@@ -383,7 +383,6 @@ int simple_fill_super(struct super_block
 		return -ENOMEM;
 	inode->i_mode = S_IFDIR | 0755;
 	inode->i_uid = inode->i_gid = 0;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	inode->i_op = &simple_dir_inode_operations;
@@ -405,7 +404,6 @@ int simple_fill_super(struct super_block
 			goto out;
 		inode->i_mode = S_IFREG | files->mode;
 		inode->i_uid = inode->i_gid = 0;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		inode->i_fop = files->ops;
diff -puN fs/minix/bitmap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/minix/bitmap.c
--- a/fs/minix/bitmap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/minix/bitmap.c
@@ -254,7 +254,7 @@ struct inode * minix_new_inode(const str
 	inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;
 	inode->i_ino = j;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 	memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u));
 	insert_inode_hash(inode);
 	mark_inode_dirty(inode);
diff -puN fs/minix/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/minix/inode.c
--- a/fs/minix/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/minix/inode.c
@@ -392,7 +392,7 @@ static void V1_minix_read_inode(struct i
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
 	inode->i_ctime.tv_nsec = 0;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 	for (i = 0; i < 9; i++)
 		minix_inode->u.i1_data[i] = raw_inode->i_zone[i];
 	minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0]));
@@ -425,7 +425,7 @@ static void V2_minix_read_inode(struct i
 	inode->i_mtime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
 	inode->i_ctime.tv_nsec = 0;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 	for (i = 0; i < 10; i++)
 		minix_inode->u.i2_data[i] = raw_inode->i_zone[i];
 	minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0]));
diff -puN fs/ncpfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ncpfs/inode.c
--- a/fs/ncpfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ncpfs/inode.c
@@ -224,7 +224,6 @@ static void ncp_set_attr(struct inode *i
 	inode->i_nlink = 1;
 	inode->i_uid = server->m.uid;
 	inode->i_gid = server->m.gid;
-	inode->i_blksize = NCP_BLOCK_SIZE;
 
 	ncp_update_dates(inode, &nwinfo->i);
 	ncp_update_inode(inode, nwinfo);
diff -puN fs/nfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/nfs/inode.c
--- a/fs/nfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/nfs/inode.c
@@ -282,10 +282,8 @@ nfs_fhget(struct super_block *sb, struct
 			 * report the blocks in 512byte units
 			 */
 			inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
-			inode->i_blksize = inode->i_sb->s_blocksize;
 		} else {
 			inode->i_blocks = fattr->du.nfs2.blocks;
-			inode->i_blksize = fattr->du.nfs2.blocksize;
 		}
 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
 		nfsi->attrtimeo_timestamp = jiffies;
@@ -970,10 +968,8 @@ static int nfs_update_inode(struct inode
 		 * report the blocks in 512byte units
 		 */
 		inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
-		inode->i_blksize = inode->i_sb->s_blocksize;
  	} else {
  		inode->i_blocks = fattr->du.nfs2.blocks;
- 		inode->i_blksize = fattr->du.nfs2.blocksize;
  	}
 
 	if ((fattr->valid & NFS_ATTR_FATTR_V4) != 0 &&
diff -puN fs/ntfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ntfs/inode.c
--- a/fs/ntfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ntfs/inode.c
@@ -556,8 +556,6 @@ static int ntfs_read_locked_inode(struct
 
 	/* Setup the generic vfs inode parts now. */
 
-	/* This is the optimal IO size (for stat), not the fs block size. */
-	vi->i_blksize = PAGE_CACHE_SIZE;
 	/*
 	 * This is for checking whether an inode has changed w.r.t. a file so
 	 * that the file can be updated if necessary (compare with f_version).
@@ -1234,7 +1232,6 @@ static int ntfs_read_locked_attr_inode(s
 	base_ni = NTFS_I(base_vi);
 
 	/* Just mirror the values from the base inode. */
-	vi->i_blksize	= base_vi->i_blksize;
 	vi->i_version	= base_vi->i_version;
 	vi->i_uid	= base_vi->i_uid;
 	vi->i_gid	= base_vi->i_gid;
@@ -1504,7 +1501,6 @@ static int ntfs_read_locked_index_inode(
 	ni	= NTFS_I(vi);
 	base_ni = NTFS_I(base_vi);
 	/* Just mirror the values from the base inode. */
-	vi->i_blksize	= base_vi->i_blksize;
 	vi->i_version	= base_vi->i_version;
 	vi->i_uid	= base_vi->i_uid;
 	vi->i_gid	= base_vi->i_gid;
diff -puN fs/ntfs/mft.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ntfs/mft.c
--- a/fs/ntfs/mft.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ntfs/mft.c
@@ -2638,11 +2638,6 @@ mft_rec_already_initialized:
 		}
 		vi->i_ino = bit;
 		/*
-		 * This is the optimal IO size (for stat), not the fs block
-		 * size.
-		 */
-		vi->i_blksize = PAGE_CACHE_SIZE;
-		/*
 		 * This is for checking whether an inode has changed w.r.t. a
 		 * file so that the file can be updated if necessary (compare
 		 * with f_version).
diff -puN fs/ocfs2/dlm/dlmfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ocfs2/dlm/dlmfs.c
--- a/fs/ocfs2/dlm/dlmfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ocfs2/dlm/dlmfs.c
@@ -335,7 +335,6 @@ static struct inode *dlmfs_get_root_inod
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -362,7 +361,6 @@ static struct inode *dlmfs_get_inode(str
 	inode->i_mode = mode;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
diff -puN fs/ocfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ocfs2/inode.c
--- a/fs/ocfs2/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ocfs2/inode.c
@@ -251,7 +251,6 @@ int ocfs2_populate_inode(struct inode *i
 	inode->i_mode = le16_to_cpu(fe->i_mode);
 	inode->i_uid = le32_to_cpu(fe->i_uid);
 	inode->i_gid = le32_to_cpu(fe->i_gid);
-	inode->i_blksize = (u32)osb->s_clustersize;
 
 	/* Fast symlinks will have i_size but no allocated clusters. */
 	if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
@@ -1174,7 +1173,6 @@ void ocfs2_refresh_inode(struct inode *i
 	inode->i_uid = le32_to_cpu(fe->i_uid);
 	inode->i_gid = le32_to_cpu(fe->i_gid);
 	inode->i_mode = le16_to_cpu(fe->i_mode);
-	inode->i_blksize = (u32) osb->s_clustersize;
 	if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0)
 		inode->i_blocks = 0;
 	else
diff -puN fs/pipe.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/pipe.c
--- a/fs/pipe.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/pipe.c
@@ -879,7 +879,6 @@ static struct inode * get_pipe_inode(voi
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-	inode->i_blksize = PAGE_SIZE;
 
 	return inode;
 
diff -puN fs/qnx4/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/qnx4/inode.c
--- a/fs/qnx4/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/qnx4/inode.c
@@ -497,7 +497,6 @@ static void qnx4_read_inode(struct inode
 	inode->i_ctime.tv_sec   = le32_to_cpu(raw_inode->di_ctime);
 	inode->i_ctime.tv_nsec = 0;
 	inode->i_blocks  = le32_to_cpu(raw_inode->di_first_xtnt.xtnt_size);
-	inode->i_blksize = QNX4_DIR_ENTRY_SIZE;
 
 	memcpy(qnx4_inode, raw_inode, QNX4_DIR_ENTRY_SIZE);
 	if (S_ISREG(inode->i_mode)) {
diff -puN fs/ramfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ramfs/inode.c
--- a/fs/ramfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ramfs/inode.c
@@ -58,7 +58,6 @@ struct inode *ramfs_get_inode(struct sup
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->a_ops = &ramfs_aops;
 		inode->i_mapping->backing_dev_info = &ramfs_backing_dev_info;
diff -puN fs/reiserfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/reiserfs/inode.c
--- a/fs/reiserfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/reiserfs/inode.c
@@ -17,8 +17,6 @@
 #include <linux/writeback.h>
 #include <linux/quotaops.h>
 
-extern int reiserfs_default_io_size;	/* default io size devuned in super.c */
-
 static int reiserfs_commit_write(struct file *f, struct page *page,
 				 unsigned from, unsigned to);
 static int reiserfs_prepare_write(struct file *f, struct page *page,
@@ -1130,7 +1128,6 @@ static void init_inode(struct inode *ino
 	ih = PATH_PITEM_HEAD(path);
 
 	copy_key(INODE_PKEY(inode), &(ih->ih_key));
-	inode->i_blksize = reiserfs_default_io_size;
 
 	INIT_LIST_HEAD(&(REISERFS_I(inode)->i_prealloc_list));
 	REISERFS_I(inode)->i_flags = 0;
@@ -1885,7 +1882,6 @@ int reiserfs_new_inode(struct reiserfs_t
 	}
 	// these do not go to on-disk stat data
 	inode->i_ino = le32_to_cpu(ih.ih_key.k_objectid);
-	inode->i_blksize = reiserfs_default_io_size;
 
 	// store in in-core inode the key of stat data and version all
 	// object items will have (directory items will have old offset
diff -puN fs/smbfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/smbfs/inode.c
--- a/fs/smbfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/smbfs/inode.c
@@ -167,7 +167,6 @@ smb_get_inode_attr(struct inode *inode, 
 	fattr->f_mtime	= inode->i_mtime;
 	fattr->f_ctime	= inode->i_ctime;
 	fattr->f_atime	= inode->i_atime;
-	fattr->f_blksize= inode->i_blksize;
 	fattr->f_blocks	= inode->i_blocks;
 
 	fattr->attr	= SMB_I(inode)->attr;
@@ -201,7 +200,6 @@ smb_set_inode_attr(struct inode *inode, 
 	inode->i_uid	= fattr->f_uid;
 	inode->i_gid	= fattr->f_gid;
 	inode->i_ctime	= fattr->f_ctime;
-	inode->i_blksize= fattr->f_blksize;
 	inode->i_blocks = fattr->f_blocks;
 	inode->i_size	= fattr->f_size;
 	inode->i_mtime	= fattr->f_mtime;
diff -puN fs/smbfs/proc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/smbfs/proc.c
--- a/fs/smbfs/proc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/smbfs/proc.c
@@ -1826,7 +1826,6 @@ smb_init_dirent(struct smb_sb_info *serv
 	fattr->f_nlink = 1;
 	fattr->f_uid = server->mnt->uid;
 	fattr->f_gid = server->mnt->gid;
-	fattr->f_blksize = SMB_ST_BLKSIZE;
 	fattr->f_unix = 0;
 }
 
diff -puN fs/stat.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/stat.c
--- a/fs/stat.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/stat.c
@@ -14,6 +14,7 @@
 #include <linux/namei.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/pagemap.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -32,7 +33,7 @@ void generic_fillattr(struct inode *inod
 	stat->ctime = inode->i_ctime;
 	stat->size = i_size_read(inode);
 	stat->blocks = inode->i_blocks;
-	stat->blksize = inode->i_blksize;
+	stat->blksize = PAGE_CACHE_SIZE;
 }
 
 EXPORT_SYMBOL(generic_fillattr);
diff -puN fs/sysfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/sysfs/inode.c
--- a/fs/sysfs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/sysfs/inode.c
@@ -113,7 +113,6 @@ struct inode * sysfs_new_inode(mode_t mo
 {
 	struct inode * inode = new_inode(sysfs_sb);
 	if (inode) {
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->a_ops = &sysfs_aops;
 		inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
diff -puN fs/sysv/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/sysv/ialloc.c
--- a/fs/sysv/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/sysv/ialloc.c
@@ -170,7 +170,7 @@ struct inode * sysv_new_inode(const stru
 	inode->i_uid = current->fsuid;
 	inode->i_ino = fs16_to_cpu(sbi, ino);
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 	memset(SYSV_I(inode)->i_data, 0, sizeof(SYSV_I(inode)->i_data));
 	SYSV_I(inode)->i_dir_start_lookup = 0;
 	insert_inode_hash(inode);
diff -puN fs/sysv/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/sysv/inode.c
--- a/fs/sysv/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/sysv/inode.c
@@ -201,7 +201,7 @@ static void sysv_read_inode(struct inode
 	inode->i_ctime.tv_nsec = 0;
 	inode->i_atime.tv_nsec = 0;
 	inode->i_mtime.tv_nsec = 0;
-	inode->i_blocks = inode->i_blksize = 0;
+	inode->i_blocks = 0;
 
 	si = SYSV_I(inode);
 	for (block = 0; block < 10+1+1+1; block++)
diff -puN fs/udf/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/udf/ialloc.c
--- a/fs/udf/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/udf/ialloc.c
@@ -120,7 +120,6 @@ struct inode * udf_new_inode (struct ino
 	UDF_I_LOCATION(inode).logicalBlockNum = block;
 	UDF_I_LOCATION(inode).partitionReferenceNum = UDF_I_LOCATION(dir).partitionReferenceNum;
 	inode->i_ino = udf_get_lb_pblock(sb, UDF_I_LOCATION(inode), 0);
-	inode->i_blksize = PAGE_SIZE;
 	inode->i_blocks = 0;
 	UDF_I_LENEATTR(inode) = 0;
 	UDF_I_LENALLOC(inode) = 0;
diff -puN fs/udf/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/udf/inode.c
--- a/fs/udf/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/udf/inode.c
@@ -916,8 +916,6 @@ __udf_read_inode(struct inode *inode)
 	 *      i_nlink = 1
 	 *      i_op = NULL;
 	 */
-	inode->i_blksize = PAGE_SIZE;
-
 	bh = udf_read_ptagged(inode->i_sb, UDF_I_LOCATION(inode), 0, &ident);
 
 	if (!bh)
diff -puN fs/ufs/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ufs/ialloc.c
--- a/fs/ufs/ialloc.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ufs/ialloc.c
@@ -255,7 +255,6 @@ cg_found:
 		inode->i_gid = current->fsgid;
 
 	inode->i_ino = cg * uspi->s_ipg + bit;
-	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size (for stat), not the fs block size */
 	inode->i_blocks = 0;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
 	ufsi->i_flags = UFS_I(dir)->i_flags;
diff -puN fs/ufs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/ufs/inode.c
--- a/fs/ufs/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/ufs/inode.c
@@ -734,7 +734,6 @@ void ufs_read_inode(struct inode * inode
 		ufs1_read_inode(inode, ufs_inode + ufs_inotofsbo(inode->i_ino));
 	}
 
-	inode->i_blksize = PAGE_SIZE;/*This is the optimal IO size (for stat)*/
 	inode->i_version++;
 	ufsi->i_lastfrag =
 		(inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift;
diff -puN fs/xfs/linux-2.6/xfs_super.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/xfs/linux-2.6/xfs_super.c
--- a/fs/xfs/linux-2.6/xfs_super.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/xfs/linux-2.6/xfs_super.c
@@ -171,7 +171,6 @@ xfs_revalidate_inode(
 		break;
 	}
 
-	inode->i_blksize = xfs_preferred_iosize(mp);
 	inode->i_generation = ip->i_d.di_gen;
 	i_size_write(inode, ip->i_d.di_size);
 	inode->i_blocks =
diff -puN fs/xfs/linux-2.6/xfs_vnode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default fs/xfs/linux-2.6/xfs_vnode.c
--- a/fs/xfs/linux-2.6/xfs_vnode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/fs/xfs/linux-2.6/xfs_vnode.c
@@ -122,7 +122,6 @@ vn_revalidate_core(
 	inode->i_blocks	    = vap->va_nblocks;
 	inode->i_mtime	    = vap->va_mtime;
 	inode->i_ctime	    = vap->va_ctime;
-	inode->i_blksize    = vap->va_blocksize;
 	if (vap->va_xflags & XFS_XFLAG_IMMUTABLE)
 		inode->i_flags |= S_IMMUTABLE;
 	else
diff -puN include/linux/fs.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/include/linux/fs.h
@@ -507,7 +507,6 @@ struct inode {
 	struct timespec		i_mtime;
 	struct timespec		i_ctime;
 	unsigned int		i_blkbits;
-	unsigned long		i_blksize;
 	unsigned long		i_version;
 	blkcnt_t		i_blocks;
 	unsigned short          i_bytes;
diff -puN include/linux/nfsd/nfsfh.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default include/linux/nfsd/nfsfh.h
--- a/include/linux/nfsd/nfsfh.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/include/linux/nfsd/nfsfh.h
@@ -269,14 +269,8 @@ fill_post_wcc(struct svc_fh *fhp)
 	fhp->fh_post_uid	= inode->i_uid;
 	fhp->fh_post_gid	= inode->i_gid;
 	fhp->fh_post_size       = inode->i_size;
-	if (inode->i_blksize) {
-		fhp->fh_post_blksize    = inode->i_blksize;
-		fhp->fh_post_blocks     = inode->i_blocks;
-	} else {
-		fhp->fh_post_blksize    = BLOCK_SIZE;
-		/* how much do we care for accuracy with MinixFS? */
-		fhp->fh_post_blocks     = (inode->i_size+511) >> 9;
-	}
+	fhp->fh_post_blksize    = BLOCK_SIZE;
+	fhp->fh_post_blocks     = inode->i_blocks;
 	fhp->fh_post_rdev[0]    = htonl((u32)imajor(inode));
 	fhp->fh_post_rdev[1]    = htonl((u32)iminor(inode));
 	fhp->fh_post_atime      = inode->i_atime;
diff -puN include/linux/smb.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default include/linux/smb.h
--- a/include/linux/smb.h~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/include/linux/smb.h
@@ -88,7 +88,6 @@ struct smb_fattr {
 	struct timespec	f_atime;
 	struct timespec f_mtime;
 	struct timespec f_ctime;
-	unsigned long	f_blksize;
 	unsigned long	f_blocks;
 	int		f_unix;
 };
diff -puN ipc/mqueue.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default ipc/mqueue.c
--- a/ipc/mqueue.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/ipc/mqueue.c
@@ -115,7 +115,6 @@ static struct inode *mqueue_get_inode(st
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mtime = inode->i_ctime = inode->i_atime =
 				CURRENT_TIME;
diff -puN kernel/cpuset.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default kernel/cpuset.c
--- a/kernel/cpuset.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/kernel/cpuset.c
@@ -289,7 +289,6 @@ static struct inode *cpuset_new_inode(mo
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		inode->i_mapping->backing_dev_info = &cpuset_backing_dev_info;
diff -puN mm/shmem.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default mm/shmem.c
--- a/mm/shmem.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/mm/shmem.c
@@ -1350,7 +1350,6 @@ shmem_get_inode(struct super_block *sb, 
 		inode->i_mode = mode;
 		inode->i_uid = current->fsuid;
 		inode->i_gid = current->fsgid;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_mapping->a_ops = &shmem_aops;
 		inode->i_mapping->backing_dev_info = &shmem_backing_dev_info;
diff -puN net/sunrpc/rpc_pipe.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default net/sunrpc/rpc_pipe.c
--- a/net/sunrpc/rpc_pipe.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/net/sunrpc/rpc_pipe.c
@@ -490,7 +490,6 @@ rpc_get_inode(struct super_block *sb, in
 		return NULL;
 	inode->i_mode = mode;
 	inode->i_uid = inode->i_gid = 0;
-	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 	switch(mode & S_IFMT) {
diff -puN security/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default security/inode.c
--- a/security/inode.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/security/inode.c
@@ -64,7 +64,6 @@ static struct inode *get_inode(struct su
 		inode->i_mode = mode;
 		inode->i_uid = 0;
 		inode->i_gid = 0;
-		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 		switch (mode & S_IFMT) {
diff -puN security/selinux/selinuxfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default security/selinux/selinuxfs.c
--- a/security/selinux/selinuxfs.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default
+++ a/security/selinux/selinuxfs.c
@@ -771,7 +771,6 @@ static struct inode *sel_make_inode(stru
 	if (ret) {
 		ret->i_mode = mode;
 		ret->i_uid = ret->i_gid = 0;
-		ret->i_blksize = PAGE_CACHE_SIZE;
 		ret->i_blocks = 0;
 		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
 	}
_

linux-2.6-inode-diet-move-i_bdev-into-a-union.patch:
 fs/inode.c         |    2 +-
 include/linux/fs.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-inode-diet-move-i_bdev-into-a-union.patch ---
From: "Theodore Ts'o" <tytso at mit.edu>

Move the i_bdev pointer in struct inode into a union.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/inode.c         |    2 +-
 include/linux/fs.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/inode.c~inode-diet-move-i_bdev-into-a-union fs/inode.c
--- a/fs/inode.c~inode-diet-move-i_bdev-into-a-union
+++ a/fs/inode.c
@@ -254,7 +254,7 @@ void clear_inode(struct inode *inode)
 	DQUOT_DROP(inode);
 	if (inode->i_sb && inode->i_sb->s_op->clear_inode)
 		inode->i_sb->s_op->clear_inode(inode);
-	if (inode->i_bdev)
+	if (S_ISBLK(inode->i_mode) && inode->i_bdev)
 		bd_forget(inode);
 	if (inode->i_cdev)
 		cd_forget(inode);
diff -puN include/linux/fs.h~inode-diet-move-i_bdev-into-a-union include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-move-i_bdev-into-a-union
+++ a/include/linux/fs.h
@@ -526,8 +526,8 @@ struct inode {
 	struct list_head	i_devices;
 	union {
 		struct pipe_inode_info	*i_pipe;
+		struct block_device	*i_bdev;
 	};
-	struct block_device	*i_bdev;
 	struct cdev		*i_cdev;
 	int			i_cindex;
 
_

linux-2.6-inode-diet-move-i_cdev-into-a-union.patch:
 fs/file_table.c    |    2 +-
 fs/inode.c         |    2 +-
 include/linux/fs.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-inode-diet-move-i_cdev-into-a-union.patch ---
From: "Theodore Ts'o" <tytso at mit.edu>

Move the i_cdev pointer in struct inode into a union.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/file_table.c    |    2 +-
 fs/inode.c         |    2 +-
 include/linux/fs.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -puN fs/file_table.c~inode-diet-move-i_cdev-into-a-union fs/file_table.c
--- a/fs/file_table.c~inode-diet-move-i_cdev-into-a-union
+++ a/fs/file_table.c
@@ -169,7 +169,7 @@ void fastcall __fput(struct file *file)
 	if (file->f_op && file->f_op->release)
 		file->f_op->release(inode, file);
 	security_file_free(file);
-	if (unlikely(inode->i_cdev != NULL))
+	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
 		cdev_put(inode->i_cdev);
 	fops_put(file->f_op);
 	if (file->f_mode & FMODE_WRITE)
diff -puN fs/inode.c~inode-diet-move-i_cdev-into-a-union fs/inode.c
--- a/fs/inode.c~inode-diet-move-i_cdev-into-a-union
+++ a/fs/inode.c
@@ -256,7 +256,7 @@ void clear_inode(struct inode *inode)
 		inode->i_sb->s_op->clear_inode(inode);
 	if (S_ISBLK(inode->i_mode) && inode->i_bdev)
 		bd_forget(inode);
-	if (inode->i_cdev)
+	if (S_ISCHR(inode->i_mode) && inode->i_cdev)
 		cd_forget(inode);
 	inode->i_state = I_CLEAR;
 }
diff -puN include/linux/fs.h~inode-diet-move-i_cdev-into-a-union include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-move-i_cdev-into-a-union
+++ a/include/linux/fs.h
@@ -527,8 +527,8 @@ struct inode {
 	union {
 		struct pipe_inode_info	*i_pipe;
 		struct block_device	*i_bdev;
+		struct cdev		*i_cdev;
 	};
-	struct cdev		*i_cdev;
 	int			i_cindex;
 
 	__u32			i_generation;
_

linux-2.6-inode-diet-move-i_pipe-into-a-union.patch:
 fs.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-inode-diet-move-i_pipe-into-a-union.patch ---
From: "Theodore Ts'o" <tytso at mit.edu>

Move the i_pipe pointer into a union that will be shared with i_bdev and
i_cdev.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/fs.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN include/linux/fs.h~inode-diet-move-i_pipe-into-a-union include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-move-i_pipe-into-a-union
+++ a/include/linux/fs.h
@@ -523,9 +523,10 @@ struct inode {
 #ifdef CONFIG_QUOTA
 	struct dquot		*i_dquot[MAXQUOTAS];
 #endif
-	/* These three should probably be a union */
 	struct list_head	i_devices;
-	struct pipe_inode_info	*i_pipe;
+	union {
+		struct pipe_inode_info	*i_pipe;
+	};
 	struct block_device	*i_bdev;
 	struct cdev		*i_cdev;
 	int			i_cindex;
_

linux-2.6-inode-diet-squashfs.patch:
 inode.c       |    2 --
 squashfs2_0.c |    1 -
 2 files changed, 3 deletions(-)

--- NEW FILE linux-2.6-inode-diet-squashfs.patch ---
--- linux-2.6.17.noarch/fs/squashfs/inode.c~	2006-07-12 13:54:31.000000000 -0400
+++ linux-2.6.17.noarch/fs/squashfs/inode.c	2006-07-12 13:54:53.000000000 -0400
@@ -607,7 +607,6 @@ static struct inode *squashfs_iget(struc
 			i->i_fop = &generic_ro_fops;
 			i->i_mode |= S_IFREG;
 			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-			i->i_blksize = PAGE_CACHE_SIZE;
 			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
 			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
 			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
@@ -660,7 +659,6 @@ static struct inode *squashfs_iget(struc
 			i->i_fop = &generic_ro_fops;
 			i->i_mode |= S_IFREG;
 			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-			i->i_blksize = PAGE_CACHE_SIZE;
 			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
 			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
 			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
--- linux-2.6.17.noarch/fs/squashfs/squashfs2_0.c~	2006-07-12 13:55:43.000000000 -0400
+++ linux-2.6.17.noarch/fs/squashfs/squashfs2_0.c	2006-07-12 13:55:46.000000000 -0400
@@ -228,7 +228,6 @@ static struct inode *squashfs_iget_2(str
 			i->i_atime.tv_sec = inodep->mtime;
 			i->i_ctime.tv_sec = inodep->mtime;
 			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-			i->i_blksize = PAGE_CACHE_SIZE;
 			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
 			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
 			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;

linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch:
 arch/powerpc/platforms/cell/spufs/inode.c      |    2 -
 arch/s390/hypfs/inode.c                        |    6 ++--
 arch/s390/kernel/debug.c                       |    2 -
 block/blktrace.c                               |    2 -
 drivers/i2c/chips/tps65010.c                   |    2 -
 drivers/infiniband/hw/ipath/ipath_fs.c         |   12 ++++----
 drivers/infiniband/ulp/ipoib/ipoib_fs.c        |    4 +-
 drivers/misc/ibmasm/ibmasmfs.c                 |   16 +++++------
 drivers/net/irda/vlsi_ir.h                     |    2 -
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    2 -
 drivers/oprofile/oprofilefs.c                  |   10 +++----
 drivers/pci/hotplug/cpqphp_sysfs.c             |    2 -
 drivers/usb/core/devio.c                       |    2 -
 drivers/usb/core/inode.c                       |    6 ++--
 drivers/usb/gadget/inode.c                     |    6 ++--
 drivers/usb/host/isp116x-hcd.c                 |    2 -
 drivers/usb/host/uhci-debug.c                  |    2 -
 drivers/usb/mon/mon_stat.c                     |    2 -
 drivers/usb/mon/mon_text.c                     |    4 +-
 fs/autofs/inode.c                              |    2 -
 fs/autofs/symlink.c                            |    2 -
 fs/binfmt_misc.c                               |    8 ++---
 fs/debugfs/file.c                              |    4 +-
 fs/debugfs/inode.c                             |    4 +-
 fs/devpts/inode.c                              |    4 +-
 fs/dlm/debug_fs.c                              |    2 -
 fs/freevxfs/vxfs.h                             |    2 -
 fs/freevxfs/vxfs_inode.c                       |    4 +-
 fs/fuse/control.c                              |    6 ++--
 fs/gfs2/inode.c                                |    2 -
 fs/gfs2/meta_io.c                              |    2 -
 fs/gfs2/ops_super.c                            |    6 ++--
 fs/inode.c                                     |    2 -
 fs/jffs/inode-v23.c                            |   34 ++++++++++++-------------
 fs/libfs.c                                     |    2 -
 fs/ocfs2/dlmglue.c                             |    2 -
 include/linux/fs.h                             |    4 --
 kernel/relay.c                                 |    2 -
 security/inode.c                               |    8 ++---
 39 files changed, 93 insertions(+), 95 deletions(-)

--- NEW FILE linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch ---
From: "Theodore Ts'o" <tytso at mit.edu>

The following patches reduce the size of the VFS inode structure by 28 bytes
on a UP x86.  (It would be more on an x86_64 system).  This is a 10% reduction
in the inode size on a UP kernel that is configured in a production mode
(i.e., with no spinlock or other debugging functions enabled; if you want to
save memory taken up by in-core inodes, the first thing you should do is
disable the debugging options; they are responsible for a huge amount of bloat
in the VFS inode structure).



This patch:

The filesystem or device-specific pointer in the inode is inside a union,
which is pretty pointless given that all 30+ users of this field have been
using the void pointer.  Get rid of the union and rename it to i_private, with
a comment to explain who is allowed to use the void pointer.  This is just a
cleanup, but it allows us to reuse the union 'u' for something something where
the union will actually be used.

Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/powerpc/platforms/cell/spufs/inode.c      |    2 
 arch/s390/hypfs/inode.c                        |    6 +-
 arch/s390/kernel/debug.c                       |    2 
 block/blktrace.c                               |    2 
 drivers/i2c/chips/tps65010.c                   |    2 
 drivers/infiniband/hw/ipath/ipath_fs.c         |   12 ++---
 drivers/infiniband/ulp/ipoib/ipoib_fs.c        |    4 -
 drivers/misc/ibmasm/ibmasmfs.c                 |   16 +++----
 drivers/net/irda/vlsi_ir.h                     |    2 
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    2 
 drivers/oprofile/oprofilefs.c                  |   10 ++--
 drivers/pci/hotplug/cpqphp_sysfs.c             |    2 
 drivers/usb/core/devio.c                       |    2 
 drivers/usb/core/inode.c                       |    6 +-
 drivers/usb/gadget/inode.c                     |    6 +-
 drivers/usb/host/isp116x-hcd.c                 |    2 
 drivers/usb/host/uhci-debug.c                  |    2 
 drivers/usb/mon/mon_stat.c                     |    2 
 drivers/usb/mon/mon_text.c                     |    4 -
 fs/autofs/inode.c                              |    2 
 fs/autofs/symlink.c                            |    2 
 fs/binfmt_misc.c                               |    8 +--
 fs/debugfs/file.c                              |    4 -
 fs/debugfs/inode.c                             |    4 -
 fs/devpts/inode.c                              |    4 -
 fs/dlm/debug_fs.c                              |    2 
 fs/freevxfs/vxfs.h                             |    2 
 fs/freevxfs/vxfs_inode.c                       |    4 -
 fs/fuse/control.c                              |    6 +-
 fs/gfs2/inode.c                                |    2 
 fs/gfs2/meta_io.c                              |    2 
 fs/gfs2/ops_super.c                            |    6 +-
 fs/inode.c                                     |    2 
 fs/jffs/inode-v23.c                            |   34 +++++++--------
 fs/libfs.c                                     |    2 
 fs/ocfs2/dlmglue.c                             |    2 
 include/linux/fs.h                             |    4 -
 kernel/relay.c                                 |    2 
 security/inode.c                               |    8 +--
 39 files changed, 93 insertions(+), 95 deletions(-)

diff -puN arch/powerpc/platforms/cell/spufs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private arch/powerpc/platforms/cell/spufs/inode.c
--- a/arch/powerpc/platforms/cell/spufs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/arch/powerpc/platforms/cell/spufs/inode.c
@@ -120,7 +120,7 @@ spufs_new_file(struct super_block *sb, s
 	ret = 0;
 	inode->i_op = &spufs_file_iops;
 	inode->i_fop = fops;
-	inode->u.generic_ip = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
+	inode->i_private = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
 	d_add(dentry, inode);
 out:
 	return ret;
diff -puN arch/s390/hypfs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private arch/s390/hypfs/inode.c
--- a/arch/s390/hypfs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/arch/s390/hypfs/inode.c
@@ -104,13 +104,13 @@ static struct inode *hypfs_make_inode(st
 
 static void hypfs_drop_inode(struct inode *inode)
 {
-	kfree(inode->u.generic_ip);
+	kfree(inode->i_private);
 	generic_delete_inode(inode);
 }
 
 static int hypfs_open(struct inode *inode, struct file *filp)
 {
-	char *data = filp->f_dentry->d_inode->u.generic_ip;
+	char *data = filp->f_dentry->d_inode->i_private;
 	struct hypfs_sb_info *fs_info;
 
 	if (filp->f_mode & FMODE_WRITE) {
@@ -350,7 +350,7 @@ static struct dentry *hypfs_create_file(
 		parent->d_inode->i_nlink++;
 	} else
 		BUG();
-	inode->u.generic_ip = data;
+	inode->i_private = data;
 	d_instantiate(dentry, inode);
 	dget(dentry);
 	return dentry;
diff -puN arch/s390/kernel/debug.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private arch/s390/kernel/debug.c
--- a/arch/s390/kernel/debug.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/arch/s390/kernel/debug.c
@@ -603,7 +603,7 @@ debug_open(struct inode *inode, struct f
 	debug_info_t *debug_info, *debug_info_snapshot;
 
 	down(&debug_lock);
-	debug_info = (struct debug_info*)file->f_dentry->d_inode->u.generic_ip;
+	debug_info = file->f_dentry->d_inode->i_private;
 	/* find debug view */
 	for (i = 0; i < DEBUG_MAX_VIEWS; i++) {
 		if (!debug_info->views[i])
diff -puN block/blktrace.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private block/blktrace.c
--- a/block/blktrace.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/block/blktrace.c
@@ -214,7 +214,7 @@ static int blk_trace_remove(request_queu
 
 static int blk_dropped_open(struct inode *inode, struct file *filp)
 {
-	filp->private_data = inode->u.generic_ip;
+	filp->private_data = inode->i_private;
 
 	return 0;
 }
diff -puN drivers/i2c/chips/tps65010.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/i2c/chips/tps65010.c
--- a/drivers/i2c/chips/tps65010.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/i2c/chips/tps65010.c
@@ -306,7 +306,7 @@ static int dbg_show(struct seq_file *s, 
 
 static int dbg_tps_open(struct inode *inode, struct file *file)
 {
-	return single_open(file, dbg_show, inode->u.generic_ip);
+	return single_open(file, dbg_show, inode->i_private);
 }
 
 static struct file_operations debug_fops = {
diff -puN drivers/infiniband/hw/ipath/ipath_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/infiniband/hw/ipath/ipath_fs.c
--- a/drivers/infiniband/hw/ipath/ipath_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -64,7 +64,7 @@ static int ipathfs_mknod(struct inode *d
 	inode->i_blksize = PAGE_CACHE_SIZE;
 	inode->i_blocks = 0;
 	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-	inode->u.generic_ip = data;
+	inode->i_private = data;
 	if ((mode & S_IFMT) == S_IFDIR) {
 		inode->i_op = &simple_dir_inode_operations;
 		inode->i_nlink++;
@@ -119,7 +119,7 @@ static ssize_t atomic_counters_read(stru
 	u16 i;
 	struct ipath_devdata *dd;
 
-	dd = file->f_dentry->d_inode->u.generic_ip;
+	dd = file->f_dentry->d_inode->i_private;
 
 	for (i = 0; i < NUM_COUNTERS; i++)
 		counters[i] = ipath_snap_cntr(dd, i);
@@ -139,7 +139,7 @@ static ssize_t atomic_node_info_read(str
 	struct ipath_devdata *dd;
 	u64 guid;
 
-	dd = file->f_dentry->d_inode->u.generic_ip;
+	dd = file->f_dentry->d_inode->i_private;
 
 	guid = be64_to_cpu(dd->ipath_guid);
 
@@ -178,7 +178,7 @@ static ssize_t atomic_port_info_read(str
 	u32 tmp, tmp2;
 	struct ipath_devdata *dd;
 
-	dd = file->f_dentry->d_inode->u.generic_ip;
+	dd = file->f_dentry->d_inode->i_private;
 
 	/* so we only initialize non-zero fields. */
 	memset(portinfo, 0, sizeof portinfo);
@@ -325,7 +325,7 @@ static ssize_t flash_read(struct file *f
 		goto bail;
 	}
 
-	dd = file->f_dentry->d_inode->u.generic_ip;
+	dd = file->f_dentry->d_inode->i_private;
 	if (ipath_eeprom_read(dd, pos, tmp, count)) {
 		ipath_dev_err(dd, "failed to read from flash\n");
 		ret = -ENXIO;
@@ -381,7 +381,7 @@ static ssize_t flash_write(struct file *
 		goto bail_tmp;
 	}
 
-	dd = file->f_dentry->d_inode->u.generic_ip;
+	dd = file->f_dentry->d_inode->i_private;
 	if (ipath_eeprom_write(dd, pos, tmp, count)) {
 		ret = -ENXIO;
 		ipath_dev_err(dd, "failed to write to flash\n");
diff -puN drivers/infiniband/ulp/ipoib/ipoib_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/infiniband/ulp/ipoib/ipoib_fs.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -141,7 +141,7 @@ static int ipoib_mcg_open(struct inode *
 		return ret;
 
 	seq = file->private_data;
-	seq->private = inode->u.generic_ip;
+	seq->private = inode->i_private;
 
 	return 0;
 }
@@ -247,7 +247,7 @@ static int ipoib_path_open(struct inode 
 		return ret;
 
 	seq = file->private_data;
-	seq->private = inode->u.generic_ip;
+	seq->private = inode->i_private;
 
 	return 0;
 }
diff -puN drivers/misc/ibmasm/ibmasmfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/misc/ibmasm/ibmasmfs.c
--- a/drivers/misc/ibmasm/ibmasmfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/misc/ibmasm/ibmasmfs.c
@@ -175,7 +175,7 @@ static struct dentry *ibmasmfs_create_fi
 	}
 
 	inode->i_fop = fops;
-	inode->u.generic_ip = data;
+	inode->i_private = data;
 
 	d_add(dentry, inode);
 	return dentry;
@@ -244,7 +244,7 @@ static int command_file_open(struct inod
 {
 	struct ibmasmfs_command_data *command_data;
 
-	if (!inode->u.generic_ip)
+	if (!inode->i_private)
 		return -ENODEV;
 
 	command_data = kmalloc(sizeof(struct ibmasmfs_command_data), GFP_KERNEL);
@@ -252,7 +252,7 @@ static int command_file_open(struct inod
 		return -ENOMEM;
 
 	command_data->command = NULL;
-	command_data->sp = inode->u.generic_ip;
+	command_data->sp = inode->i_private;
 	file->private_data = command_data;
 	return 0;
 }
@@ -351,10 +351,10 @@ static int event_file_open(struct inode 
 	struct ibmasmfs_event_data *event_data;
 	struct service_processor *sp; 
 
-	if (!inode->u.generic_ip)
+	if (!inode->i_private)
 		return -ENODEV;
 
-	sp = inode->u.generic_ip;
+	sp = inode->i_private;
 
 	event_data = kmalloc(sizeof(struct ibmasmfs_event_data), GFP_KERNEL);
 	if (!event_data)
@@ -439,14 +439,14 @@ static int r_heartbeat_file_open(struct 
 {
 	struct ibmasmfs_heartbeat_data *rhbeat;
 
-	if (!inode->u.generic_ip)
+	if (!inode->i_private)
 		return -ENODEV;
 
 	rhbeat = kmalloc(sizeof(struct ibmasmfs_heartbeat_data), GFP_KERNEL);
 	if (!rhbeat)
 		return -ENOMEM;
 
-	rhbeat->sp = (struct service_processor *)inode->u.generic_ip;
+	rhbeat->sp = inode->i_private;
 	rhbeat->active = 0;
 	ibmasm_init_reverse_heartbeat(rhbeat->sp, &rhbeat->heartbeat);
 	file->private_data = rhbeat;
@@ -508,7 +508,7 @@ static ssize_t r_heartbeat_file_write(st
 
 static int remote_settings_file_open(struct inode *inode, struct file *file)
 {
-	file->private_data = inode->u.generic_ip;
+	file->private_data = inode->i_private;
 	return 0;
 }
 
diff -puN drivers/net/irda/vlsi_ir.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/net/irda/vlsi_ir.h
--- a/drivers/net/irda/vlsi_ir.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/net/irda/vlsi_ir.h
@@ -58,7 +58,7 @@ typedef void irqreturn_t;
 
 /* PDE() introduced in 2.5.4 */
 #ifdef CONFIG_PROC_FS
-#define PDE(inode) ((inode)->u.generic_ip)
+#define PDE(inode) ((inode)->i_private)
 #endif
 
 /* irda crc16 calculation exported in 2.5.42 */
diff -puN drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -54,7 +54,7 @@ static ssize_t write_file_dummy(struct f
 
 static int open_file_generic(struct inode *inode, struct file *file)
 {
-	file->private_data = inode->u.generic_ip;
+	file->private_data = inode->i_private;
 	return 0;
 }
 
diff -puN drivers/oprofile/oprofilefs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/oprofile/oprofilefs.c
--- a/drivers/oprofile/oprofilefs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/oprofile/oprofilefs.c
@@ -110,8 +110,8 @@ static ssize_t ulong_write_file(struct f
 
 static int default_open(struct inode * inode, struct file * filp)
 {
-	if (inode->u.generic_ip)
-		filp->private_data = inode->u.generic_ip;
+	if (inode->i_private)
+		filp->private_data = inode->i_private;
 	return 0;
 }
 
@@ -158,7 +158,7 @@ int oprofilefs_create_ulong(struct super
 	if (!d)
 		return -EFAULT;
 
-	d->d_inode->u.generic_ip = val;
+	d->d_inode->i_private = val;
 	return 0;
 }
 
@@ -171,7 +171,7 @@ int oprofilefs_create_ro_ulong(struct su
 	if (!d)
 		return -EFAULT;
 
-	d->d_inode->u.generic_ip = val;
+	d->d_inode->i_private = val;
 	return 0;
 }
 
@@ -197,7 +197,7 @@ int oprofilefs_create_ro_atomic(struct s
 	if (!d)
 		return -EFAULT;
 
-	d->d_inode->u.generic_ip = val;
+	d->d_inode->i_private = val;
 	return 0;
 }
 
diff -puN drivers/pci/hotplug/cpqphp_sysfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/pci/hotplug/cpqphp_sysfs.c
--- a/drivers/pci/hotplug/cpqphp_sysfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/pci/hotplug/cpqphp_sysfs.c
@@ -140,7 +140,7 @@ struct ctrl_dbg {
 
 static int open(struct inode *inode, struct file *file)
 {
-	struct controller *ctrl = inode->u.generic_ip;
+	struct controller *ctrl = inode->i_private;
 	struct ctrl_dbg *dbg;
 	int retval = -ENOMEM;
 
diff -puN drivers/usb/core/devio.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/core/devio.c
--- a/drivers/usb/core/devio.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/core/devio.c
@@ -555,7 +555,7 @@ static int usbdev_open(struct inode *ino
 	if (imajor(inode) == USB_DEVICE_MAJOR)
 		dev = usbdev_lookup_minor(iminor(inode));
 	if (!dev)
-		dev = inode->u.generic_ip;
+		dev = inode->i_private;
 	if (!dev) {
 		kfree(ps);
 		goto out;
diff -puN drivers/usb/core/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/core/inode.c
--- a/drivers/usb/core/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/core/inode.c
@@ -402,8 +402,8 @@ static loff_t default_file_lseek (struct
 
 static int default_open (struct inode *inode, struct file *file)
 {
-	if (inode->u.generic_ip)
-		file->private_data = inode->u.generic_ip;
+	if (inode->i_private)
+		file->private_data = inode->i_private;
 
 	return 0;
 }
@@ -509,7 +509,7 @@ static struct dentry *fs_create_file (co
 	} else {
 		if (dentry->d_inode) {
 			if (data)
-				dentry->d_inode->u.generic_ip = data;
+				dentry->d_inode->i_private = data;
 			if (fops)
 				dentry->d_inode->i_fop = fops;
 			dentry->d_inode->i_uid = uid;
diff -puN drivers/usb/gadget/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/gadget/inode.c
--- a/drivers/usb/gadget/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/gadget/inode.c
@@ -844,7 +844,7 @@ fail1:
 static int
 ep_open (struct inode *inode, struct file *fd)
 {
-	struct ep_data		*data = inode->u.generic_ip;
+	struct ep_data		*data = inode->i_private;
 	int			value = -EBUSY;
 
 	if (down_interruptible (&data->lock) != 0)
@@ -1909,7 +1909,7 @@ fail:
 static int
 dev_open (struct inode *inode, struct file *fd)
 {
-	struct dev_data		*dev = inode->u.generic_ip;
+	struct dev_data		*dev = inode->i_private;
 	int			value = -EBUSY;
 
 	if (dev->state == STATE_DEV_DISABLED) {
@@ -1970,7 +1970,7 @@ gadgetfs_make_inode (struct super_block 
 		inode->i_blocks = 0;
 		inode->i_atime = inode->i_mtime = inode->i_ctime
 				= CURRENT_TIME;
-		inode->u.generic_ip = data;
+		inode->i_private = data;
 		inode->i_fop = fops;
 	}
 	return inode;
diff -puN drivers/usb/host/isp116x-hcd.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/host/isp116x-hcd.c
--- a/drivers/usb/host/isp116x-hcd.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/host/isp116x-hcd.c
@@ -1204,7 +1204,7 @@ static int isp116x_show_dbg(struct seq_f
 
 static int isp116x_open_seq(struct inode *inode, struct file *file)
 {
-	return single_open(file, isp116x_show_dbg, inode->u.generic_ip);
+	return single_open(file, isp116x_show_dbg, inode->i_private);
 }
 
 static struct file_operations isp116x_debug_fops = {
diff -puN drivers/usb/host/uhci-debug.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/host/uhci-debug.c
--- a/drivers/usb/host/uhci-debug.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/host/uhci-debug.c
@@ -428,7 +428,7 @@ struct uhci_debug {
 
 static int uhci_debug_open(struct inode *inode, struct file *file)
 {
-	struct uhci_hcd *uhci = inode->u.generic_ip;
+	struct uhci_hcd *uhci = inode->i_private;
 	struct uhci_debug *up;
 	int ret = -ENOMEM;
 	unsigned long flags;
diff -puN drivers/usb/mon/mon_stat.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/mon/mon_stat.c
--- a/drivers/usb/mon/mon_stat.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/mon/mon_stat.c
@@ -28,7 +28,7 @@ static int mon_stat_open(struct inode *i
 	if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL)
 		return -ENOMEM;
 
-	mbus = inode->u.generic_ip;
+	mbus = inode->i_private;
 
 	sp->slen = snprintf(sp->str, STAT_BUF_SIZE,
 	    "nreaders %d events %u text_lost %u\n",
diff -puN drivers/usb/mon/mon_text.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private drivers/usb/mon/mon_text.c
--- a/drivers/usb/mon/mon_text.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/drivers/usb/mon/mon_text.c
@@ -238,7 +238,7 @@ static int mon_text_open(struct inode *i
 	int rc;
 
 	mutex_lock(&mon_lock);
-	mbus = inode->u.generic_ip;
+	mbus = inode->i_private;
 	ubus = mbus->u_bus;
 
 	rp = kzalloc(sizeof(struct mon_reader_text), GFP_KERNEL);
@@ -401,7 +401,7 @@ static int mon_text_release(struct inode
 	struct mon_event_text *ep;
 
 	mutex_lock(&mon_lock);
-	mbus = inode->u.generic_ip;
+	mbus = inode->i_private;
 
 	if (mbus->nreaders <= 0) {
 		printk(KERN_ERR TAG ": consistency error on close\n");
diff -puN fs/autofs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/autofs/inode.c
--- a/fs/autofs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/autofs/inode.c
@@ -241,7 +241,7 @@ static void autofs_read_inode(struct ino
 		
 		inode->i_op = &autofs_symlink_inode_operations;
 		sl = &sbi->symlink[n];
-		inode->u.generic_ip = sl;
+		inode->i_private = sl;
 		inode->i_mode = S_IFLNK | S_IRWXUGO;
 		inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = sl->mtime;
 		inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;
diff -puN fs/autofs/symlink.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/autofs/symlink.c
--- a/fs/autofs/symlink.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/autofs/symlink.c
@@ -15,7 +15,7 @@
 /* Nothing to release.. */
 static void *autofs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-	char *s=((struct autofs_symlink *)dentry->d_inode->u.generic_ip)->data;
+	char *s=((struct autofs_symlink *)dentry->d_inode->i_private)->data;
 	nd_set_link(nd, s);
 	return NULL;
 }
diff -puN fs/binfmt_misc.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/binfmt_misc.c
--- a/fs/binfmt_misc.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/binfmt_misc.c
@@ -517,7 +517,7 @@ static struct inode *bm_get_inode(struct
 
 static void bm_clear_inode(struct inode *inode)
 {
-	kfree(inode->u.generic_ip);
+	kfree(inode->i_private);
 }
 
 static void kill_node(Node *e)
@@ -545,7 +545,7 @@ static void kill_node(Node *e)
 static ssize_t
 bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos)
 {
-	Node *e = file->f_dentry->d_inode->u.generic_ip;
+	Node *e = file->f_dentry->d_inode->i_private;
 	loff_t pos = *ppos;
 	ssize_t res;
 	char *page;
@@ -579,7 +579,7 @@ static ssize_t bm_entry_write(struct fil
 				size_t count, loff_t *ppos)
 {
 	struct dentry *root;
-	Node *e = file->f_dentry->d_inode->u.generic_ip;
+	Node *e = file->f_dentry->d_inode->i_private;
 	int res = parse_command(buffer, count);
 
 	switch (res) {
@@ -646,7 +646,7 @@ static ssize_t bm_register_write(struct 
 	}
 
 	e->dentry = dget(dentry);
-	inode->u.generic_ip = e;
+	inode->i_private = e;
 	inode->i_fop = &bm_entry_operations;
 
 	d_instantiate(dentry, inode);
diff -puN fs/debugfs/file.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/debugfs/file.c
--- a/fs/debugfs/file.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/debugfs/file.c
@@ -32,8 +32,8 @@ static ssize_t default_write_file(struct
 
 static int default_open(struct inode *inode, struct file *file)
 {
-	if (inode->u.generic_ip)
-		file->private_data = inode->u.generic_ip;
+	if (inode->i_private)
+		file->private_data = inode->i_private;
 
 	return 0;
 }
diff -puN fs/debugfs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/debugfs/inode.c
--- a/fs/debugfs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/debugfs/inode.c
@@ -169,7 +169,7 @@ static int debugfs_create_by_name(const 
  *          directory dentry if set.  If this paramater is NULL, then the
  *          file will be created in the root of the debugfs filesystem.
  * @data: a pointer to something that the caller will want to get to later
- *        on.  The inode.u.generic_ip pointer will point to this value on
+ *        on.  The inode.i_private pointer will point to this value on
  *        the open() call.
  * @fops: a pointer to a struct file_operations that should be used for
  *        this file.
@@ -210,7 +210,7 @@ struct dentry *debugfs_create_file(const
 
 	if (dentry->d_inode) {
 		if (data)
-			dentry->d_inode->u.generic_ip = data;
+			dentry->d_inode->i_private = data;
 		if (fops)
 			dentry->d_inode->i_fop = fops;
 	}
diff -puN fs/devpts/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/devpts/inode.c
--- a/fs/devpts/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/devpts/inode.c
@@ -177,7 +177,7 @@ int devpts_pty_new(struct tty_struct *tt
 	inode->i_gid = config.setgid ? config.gid : current->fsgid;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
 	init_special_inode(inode, S_IFCHR|config.mode, device);
-	inode->u.generic_ip = tty;
+	inode->i_private = tty;
 
 	dentry = get_node(number);
 	if (!IS_ERR(dentry) && !dentry->d_inode)
@@ -196,7 +196,7 @@ struct tty_struct *devpts_get_tty(int nu
 	tty = NULL;
 	if (!IS_ERR(dentry)) {
 		if (dentry->d_inode)
-			tty = dentry->d_inode->u.generic_ip;
+			tty = dentry->d_inode->i_private;
 		dput(dentry);
 	}
 
diff -puN fs/dlm/debug_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/dlm/debug_fs.c
--- a/fs/dlm/debug_fs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/dlm/debug_fs.c
@@ -254,7 +254,7 @@ static int do_open(struct inode *inode, 
 		return ret;
 
 	seq = file->private_data;
-	seq->private = inode->u.generic_ip;
+	seq->private = inode->i_private;
 
 	return 0;
 }
diff -puN fs/freevxfs/vxfs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/freevxfs/vxfs.h
--- a/fs/freevxfs/vxfs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/freevxfs/vxfs.h
@@ -252,7 +252,7 @@ enum {
  * Get filesystem private data from VFS inode.
  */
 #define VXFS_INO(ip) \
-	((struct vxfs_inode_info *)(ip)->u.generic_ip)
+	((struct vxfs_inode_info *)(ip)->i_private)
 
 /*
  * Get filesystem private data from VFS superblock.
diff -puN fs/freevxfs/vxfs_inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/freevxfs/vxfs_inode.c
--- a/fs/freevxfs/vxfs_inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/freevxfs/vxfs_inode.c
@@ -243,7 +243,7 @@ vxfs_iinit(struct inode *ip, struct vxfs
 	ip->i_blocks = vip->vii_blocks;
 	ip->i_generation = vip->vii_gen;
 
-	ip->u.generic_ip = (void *)vip;
+	ip->i_private = vip;
 	
 }
 
@@ -338,5 +338,5 @@ vxfs_read_inode(struct inode *ip)
 void
 vxfs_clear_inode(struct inode *ip)
 {
-	kmem_cache_free(vxfs_inode_cachep, ip->u.generic_ip);
+	kmem_cache_free(vxfs_inode_cachep, ip->i_private);
 }
diff -puN fs/fuse/control.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/fuse/control.c
--- a/fs/fuse/control.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/fuse/control.c
@@ -23,7 +23,7 @@ static struct fuse_conn *fuse_ctl_file_c
 {
 	struct fuse_conn *fc;
 	mutex_lock(&fuse_mutex);
-	fc = file->f_dentry->d_inode->u.generic_ip;
+	fc = file->f_dentry->d_inode->i_private;
 	if (fc)
 		fc = fuse_conn_get(fc);
 	mutex_unlock(&fuse_mutex);
@@ -98,7 +98,7 @@ static struct dentry *fuse_ctl_add_dentr
 		inode->i_op = iop;
 	inode->i_fop = fop;
 	inode->i_nlink = nlink;
-	inode->u.generic_ip = fc;
+	inode->i_private = fc;
 	d_add(dentry, inode);
 	return dentry;
 }
@@ -150,7 +150,7 @@ void fuse_ctl_remove_conn(struct fuse_co
 
 	for (i = fc->ctl_ndents - 1; i >= 0; i--) {
 		struct dentry *dentry = fc->ctl_dentry[i];
-		dentry->d_inode->u.generic_ip = NULL;
+		dentry->d_inode->i_private = NULL;
 		d_drop(dentry);
 		dput(dentry);
 	}
diff -puN fs/gfs2/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/gfs2/inode.c
--- a/fs/gfs2/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/gfs2/inode.c
@@ -169,7 +169,7 @@ struct inode *gfs2_inode_lookup(struct s
 	if (inode->i_state & I_NEW) {
 		struct gfs2_sbd *sdp = GFS2_SB(inode);
 		umode_t mode = DT2IF(type);
-		inode->u.generic_ip = ip;
+		inode->i_private = ip;
 		inode->i_mode = mode;
 
 		if (S_ISREG(mode)) {
diff -puN fs/gfs2/meta_io.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/gfs2/meta_io.c
--- a/fs/gfs2/meta_io.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/gfs2/meta_io.c
@@ -186,7 +186,7 @@ struct inode *gfs2_aspace_get(struct gfs
 		mapping_set_gfp_mask(aspace->i_mapping, GFP_KERNEL);
 		aspace->i_mapping->a_ops = &aspace_aops;
 		aspace->i_size = ~0ULL;
-		aspace->u.generic_ip = NULL;
+		aspace->i_private = NULL;
 		insert_inode_hash(aspace);
 	}
 	return aspace;
diff -puN fs/gfs2/ops_super.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/gfs2/ops_super.c
--- a/fs/gfs2/ops_super.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/gfs2/ops_super.c
@@ -55,7 +55,7 @@ static int gfs2_write_inode(struct inode
 	struct gfs2_inode *ip = GFS2_I(inode);
 
 	/* Check this is a "normal" inode */
-	if (inode->u.generic_ip) {
+	if (inode->i_private) {
 		if (current->flags & PF_MEMALLOC)
 			return 0;
 		if (sync)
@@ -283,7 +283,7 @@ static void gfs2_clear_inode(struct inod
 	 * serves to contain an address space (see rgrp.c, meta_io.c)
 	 * which therefore doesn't have its own glocks.
 	 */
-	if (inode->u.generic_ip) {
+	if (inode->i_private) {
 		struct gfs2_inode *ip = GFS2_I(inode);
 		gfs2_glock_inode_squish(inode);
 		gfs2_assert(inode->i_sb->s_fs_info, ip->i_gl->gl_state == LM_ST_UNLOCKED);
@@ -384,7 +384,7 @@ static void gfs2_delete_inode(struct ino
 	struct gfs2_holder gh;
 	int error;
 
-	if (!inode->u.generic_ip)
+	if (!inode->i_private)
 		goto out;
 
 	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, LM_FLAG_TRY_1CB | GL_NOCACHE, &gh);
diff -puN fs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/inode.c
--- a/fs/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/inode.c
@@ -163,7 +163,7 @@ static struct inode *alloc_inode(struct 
 				bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info;
 			mapping->backing_dev_info = bdi;
 		}
-		memset(&inode->u, 0, sizeof(inode->u));
+		inode->i_private = 0;
 		inode->i_mapping = mapping;
 	}
 	return inode;
diff -puN fs/jffs/inode-v23.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/jffs/inode-v23.c
--- a/fs/jffs/inode-v23.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/jffs/inode-v23.c
@@ -369,7 +369,7 @@ jffs_new_inode(const struct inode * dir,
 
 	f = jffs_find_file(c, raw_inode->ino);
 
-	inode->u.generic_ip = (void *)f;
+	inode->i_private = (void *)f;
 	insert_inode_hash(inode);
 
 	return inode;
@@ -442,7 +442,7 @@ jffs_rename(struct inode *old_dir, struc
 	});
 
 	result = -ENOTDIR;
-	if (!(old_dir_f = (struct jffs_file *)old_dir->u.generic_ip)) {
+	if (!(old_dir_f = old_dir->i_private)) {
 		D(printk("jffs_rename(): Old dir invalid.\n"));
 		goto jffs_rename_end;
 	}
@@ -456,7 +456,7 @@ jffs_rename(struct inode *old_dir, struc
 
 	/* Find the new directory.  */
 	result = -ENOTDIR;
-	if (!(new_dir_f = (struct jffs_file *)new_dir->u.generic_ip)) {
+	if (!(new_dir_f = new_dir->i_private)) {
 		D(printk("jffs_rename(): New dir invalid.\n"));
 		goto jffs_rename_end;
 	}
@@ -593,7 +593,7 @@ jffs_readdir(struct file *filp, void *di
 		}
 		else {
 			ddino = ((struct jffs_file *)
-				 inode->u.generic_ip)->pino;
+				 inode->i_private)->pino;
 		}
 		D3(printk("jffs_readdir(): \"..\" %u\n", ddino));
 		if (filldir(dirent, "..", 2, filp->f_pos, ddino, DT_DIR) < 0) {
@@ -604,7 +604,7 @@ jffs_readdir(struct file *filp, void *di
 		}
 		filp->f_pos++;
 	}
-	f = ((struct jffs_file *)inode->u.generic_ip)->children;
+	f = ((struct jffs_file *)inode->i_private)->children;
 
 	j = 2;
 	while(f && (f->deleted || j++ < filp->f_pos )) {
@@ -668,7 +668,7 @@ jffs_lookup(struct inode *dir, struct de
 	}
 
 	r = -EACCES;
-	if (!(d = (struct jffs_file *)dir->u.generic_ip)) {
+	if (!(d = (struct jffs_file *)dir->i_private)) {
 		D(printk("jffs_lookup(): No such inode! (%lu)\n",
 			 dir->i_ino));
 		goto jffs_lookup_end;
@@ -739,7 +739,7 @@ jffs_do_readpage_nolock(struct file *fil
 	unsigned long read_len;
 	int result;
 	struct inode *inode = (struct inode*)page->mapping->host;
-	struct jffs_file *f = (struct jffs_file *)inode->u.generic_ip;
+	struct jffs_file *f = (struct jffs_file *)inode->i_private;
 	struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info;
 	int r;
 	loff_t offset;
@@ -828,7 +828,7 @@ jffs_mkdir(struct inode *dir, struct den
 	});
 
 	lock_kernel();
-	dir_f = (struct jffs_file *)dir->u.generic_ip;
+	dir_f = dir->i_private;
 
 	ASSERT(if (!dir_f) {
 		printk(KERN_ERR "jffs_mkdir(): No reference to a "
@@ -972,7 +972,7 @@ jffs_remove(struct inode *dir, struct de
 		kfree(_name);
 	});
 
-	dir_f = (struct jffs_file *) dir->u.generic_ip;
+	dir_f = dir->i_private;
 	c = dir_f->c;
 
 	result = -ENOENT;
@@ -1082,7 +1082,7 @@ jffs_mknod(struct inode *dir, struct den
 	if (!old_valid_dev(rdev))
 		return -EINVAL;
 	lock_kernel();
-	dir_f = (struct jffs_file *)dir->u.generic_ip;
+	dir_f = dir->i_private;
 	c = dir_f->c;
 
 	D3(printk (KERN_NOTICE "mknod(): down biglock\n"));
@@ -1186,7 +1186,7 @@ jffs_symlink(struct inode *dir, struct d
 		kfree(_symname);
 	});
 
-	dir_f = (struct jffs_file *)dir->u.generic_ip;
+	dir_f = dir->i_private;
 	ASSERT(if (!dir_f) {
 		printk(KERN_ERR "jffs_symlink(): No reference to a "
 		       "jffs_file struct in inode.\n");
@@ -1289,7 +1289,7 @@ jffs_create(struct inode *dir, struct de
 		kfree(s);
 	});
 
-	dir_f = (struct jffs_file *)dir->u.generic_ip;
+	dir_f = dir->i_private;
 	ASSERT(if (!dir_f) {
 		printk(KERN_ERR "jffs_create(): No reference to a "
 		       "jffs_file struct in inode.\n");
@@ -1403,9 +1403,9 @@ jffs_file_write(struct file *filp, const
 		goto out_isem;
 	}
 
-	if (!(f = (struct jffs_file *)inode->u.generic_ip)) {
-		D(printk("jffs_file_write(): inode->u.generic_ip = 0x%p\n",
-				inode->u.generic_ip));
+	if (!(f = inode->i_private)) {
+		D(printk("jffs_file_write(): inode->i_private = 0x%p\n",
+				inode->i_private));
 		goto out_isem;
 	}
 
@@ -1693,7 +1693,7 @@ jffs_read_inode(struct inode *inode)
 		mutex_unlock(&c->fmc->biglock);
 		return;
 	}
-	inode->u.generic_ip = (void *)f;
+	inode->i_private = f;
 	inode->i_mode = f->mode;
 	inode->i_nlink = f->nlink;
 	inode->i_uid = f->uid;
@@ -1748,7 +1748,7 @@ jffs_delete_inode(struct inode *inode)
 	lock_kernel();
 	inode->i_size = 0;
 	inode->i_blocks = 0;
-	inode->u.generic_ip = NULL;
+	inode->i_private = NULL;
 	clear_inode(inode);
 	if (inode->i_nlink == 0) {
 		c = (struct jffs_control *) inode->i_sb->s_fs_info;
diff -puN fs/libfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/libfs.c
--- a/fs/libfs.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/libfs.c
@@ -547,7 +547,7 @@ int simple_attr_open(struct inode *inode
 
 	attr->get = get;
 	attr->set = set;
-	attr->data = inode->u.generic_ip;
+	attr->data = inode->i_private;
 	attr->fmt = fmt;
 	mutex_init(&attr->mutex);
 
diff -puN fs/ocfs2/dlmglue.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/ocfs2/dlmglue.c
--- a/fs/ocfs2/dlmglue.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/fs/ocfs2/dlmglue.c
@@ -1995,7 +1995,7 @@ static int ocfs2_dlm_debug_open(struct i
 		mlog_errno(ret);
 		goto out;
 	}
-	osb = (struct ocfs2_super *) inode->u.generic_ip;
+	osb = inode->i_private;
 	ocfs2_get_dlm_debug(osb->osb_dlm_debug);
 	priv->p_dlm_debug = osb->osb_dlm_debug;
 	INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list);
diff -puN include/linux/fs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private include/linux/fs.h
--- a/include/linux/fs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/include/linux/fs.h
@@ -549,9 +549,7 @@ struct inode {
 
 	atomic_t		i_writecount;
 	void			*i_security;
-	union {
-		void		*generic_ip;
-	} u;
+	void			*i_private; /* fs or device private pointer */
 #ifdef __NEED_I_SIZE_ORDERED
 	seqcount_t		i_size_seqcount;
 #endif
diff -puN kernel/relay.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private kernel/relay.c
--- a/kernel/relay.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/kernel/relay.c
@@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(relay_flush);
  */
 static int relay_file_open(struct inode *inode, struct file *filp)
 {
-	struct rchan_buf *buf = inode->u.generic_ip;
+	struct rchan_buf *buf = inode->i_private;
 	kref_get(&buf->kref);
 	filp->private_data = buf;
 
diff -puN security/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private security/inode.c
--- a/security/inode.c~inode_diet-replace-inodeugeneric_ip-with-inodei_private
+++ a/security/inode.c
@@ -44,8 +44,8 @@ static ssize_t default_write_file(struct
 
 static int default_open(struct inode *inode, struct file *file)
 {
-	if (inode->u.generic_ip)
-		file->private_data = inode->u.generic_ip;
+	if (inode->i_private)
+		file->private_data = inode->i_private;
 
 	return 0;
 }
@@ -194,7 +194,7 @@ static int create_by_name(const char *na
  *          directory dentry if set.  If this paramater is NULL, then the
  *          file will be created in the root of the securityfs filesystem.
  * @data: a pointer to something that the caller will want to get to later
- *        on.  The inode.u.generic_ip pointer will point to this value on
+ *        on.  The inode.i_private pointer will point to this value on
  *        the open() call.
  * @fops: a pointer to a struct file_operations that should be used for
  *        this file.
@@ -240,7 +240,7 @@ struct dentry *securityfs_create_file(co
 		if (fops)
 			dentry->d_inode->i_fop = fops;
 		if (data)
-			dentry->d_inode->u.generic_ip = data;
+			dentry->d_inode->i_private = data;
 	}
 exit:
 	return dentry;
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2386
retrieving revision 1.2387
diff -u -r1.2386 -r1.2387
--- kernel-2.6.spec	12 Jul 2006 20:26:58 -0000	1.2386
+++ kernel-2.6.spec	12 Jul 2006 20:34:20 -0000	1.2387
@@ -357,12 +357,18 @@
 # NIC driver updates
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
+# Filesystem stuff.
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
-
 # GFS/DLM
-Patch1500: linux-2.6-gfs2-dlm.patch
-Patch1502: linux-2.6-gfs2-tux.patch
+Patch1410: linux-2.6-gfs2-dlm.patch
+Patch1411: linux-2.6-gfs2-tux.patch
+
+Patch1420: linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch
+Patch1421: linux-2.6-inode-diet-move-i_pipe-into-a-union.patch
+Patch1422: linux-2.6-inode-diet-move-i_bdev-into-a-union.patch
+Patch1423: linux-2.6-inode-diet-move-i_cdev-into-a-union.patch
+Patch1424: linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
@@ -730,7 +736,6 @@
 # Rolands utrace ptrace replacement.
 %patch10 -p1
 
-
 # Architecture patches
 
 #
@@ -897,16 +902,18 @@
 # add IPW2200_MONITOR config option
 %patch1304 -p1
 
+# Filesystem patches.
 # Squashfs
 %patch1400 -p1
-
 # GFS2/DLM
-%patch1500 -p1
-%patch1502 -p1
-
-#
-# Various SELinux fixes from 2.6.10rc
-#
+%patch1410 -p1
+%patch1411 -p1
+# Ted's inode diet work.
+%patch1420 -p1
+%patch1421 -p1
+%patch1422 -p1
+%patch1423 -p1
+%patch1424 -p1
 
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.
@@ -1603,6 +1610,7 @@
 * Wed Jul 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git5
 - Make serial console installs on ia64 work again.
+- Shrink struct inode.
 
 * Wed Jul 12 2006 David Woodhouse <dwmw2 at redhat.com>
 - Temporarily disable -headers subpackage until the problems which



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:35:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:35:15 -0400
Subject: rpms/bc/devel bc.spec,1.19,1.20
Message-ID: <200607122035.k6CKZFCV031612@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31599

Modified Files:
	bc.spec 
Log Message:
fix missing br


Index: bc.spec
===================================================================
RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bc.spec	12 Jul 2006 05:26:08 -0000	1.19
+++ bc.spec	12 Jul 2006 20:35:13 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 20.1
+Release: 21
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -11,7 +11,7 @@
 Patch3: bc-1.06-info_exp_bessel.patch
 Prereq: /sbin/install-info grep
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: readline-devel, flex
+BuildRequires: readline-devel, flex, automake
 
 %description
 The bc package includes bc and dc. Bc is an arbitrary precision
@@ -69,8 +69,9 @@
 %{_infodir}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.06-20.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.06-21
 - rebuild
+- add missing br automake
 
 * Tue Jun  6 2006 Thomas Woerner <twoerner at redhat.com> 1.06-20
 - added missing flex build require



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:36:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:36:57 -0400
Subject: rpms/gok/devel .cvsignore, 1.19, 1.20 gok.spec, 1.36, 1.37 sources,
	1.19, 1.20
Message-ID: <200607122036.k6CKav86031686@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31669

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	18 May 2006 04:45:51 -0000	1.19
+++ .cvsignore	12 Jul 2006 20:36:48 -0000	1.20
@@ -1 +1 @@
-gok-1.0.10.tar.bz2
+gok-1.1.1.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gok.spec	12 Jul 2006 06:12:58 -0000	1.36
+++ gok.spec	12 Jul 2006 20:36:48 -0000	1.37
@@ -2,8 +2,8 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.0.10
-Release: 2.1
+Version: 1.1.1
+Release: 1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -110,6 +110,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.1.1-1
+- Update to 1.1.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.10-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	18 May 2006 04:45:51 -0000	1.19
+++ sources	12 Jul 2006 20:36:48 -0000	1.20
@@ -1 +1 @@
-de6cceaca780e7ad0702c4b3c0fd8d1f  gok-1.0.10.tar.bz2
+a519dfd8d2843e517413515b0cc66a98  gok-1.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:50:59 -0400
Subject: rpms/gedit/devel .cvsignore, 1.43, 1.44 gedit.spec, 1.89,
	1.90 sources, 1.45, 1.46
Message-ID: <200607122050.k6CKoxsV028696@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28652

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	13 Jun 2006 16:11:01 -0000	1.43
+++ .cvsignore	12 Jul 2006 20:50:57 -0000	1.44
@@ -1 +1 @@
-gedit-2.15.3.tar.bz2
+gedit-2.15.4.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gedit.spec	12 Jul 2006 05:54:23 -0000	1.89
+++ gedit.spec	12 Jul 2006 20:50:57 -0000	1.90
@@ -16,8 +16,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.15.3
-Release: 	1.1	
+Version: 	2.15.4
+Release: 	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -183,6 +183,9 @@
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	13 Jun 2006 16:11:01 -0000	1.45
+++ sources	12 Jul 2006 20:50:57 -0000	1.46
@@ -1 +1 @@
-e43046da726b9df3119ff8db00c7f4ad  gedit-2.15.3.tar.bz2
+7f9e6a27cd674598a291b3124c4b9b33  gedit-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:53:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:53:41 -0400
Subject: rpms/device-mapper-multipath/devel .cvsignore, 1.10,
	1.11 device-mapper-multipath.spec, 1.30, 1.31 sources, 1.11, 1.12
Message-ID: <200607122053.k6CKrfAm029815@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29643

Modified Files:
	.cvsignore device-mapper-multipath.spec sources 
Log Message:
updated to latest source. deals with change in libsysfs API



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Jun 2006 22:20:47 -0000	1.10
+++ .cvsignore	12 Jul 2006 20:53:39 -0000	1.11
@@ -2,3 +2,4 @@
 multipath-tools-0.4.7.tgz
 multipath-tools-0.4.7.1.tgz
 multipath-tools-0.4.7.2.tgz
+multipath-tools-0.4.7.3.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- device-mapper-multipath.spec	12 Jul 2006 05:35:44 -0000	1.30
+++ device-mapper-multipath.spec	12 Jul 2006 20:53:39 -0000	1.31
@@ -1,11 +1,11 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 2.2.1
+Release: 3.0
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-0.4.7.2.tgz
+Source0: multipath-tools-0.4.7.3.tgz
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prereq: chkconfig
@@ -22,7 +22,7 @@
 * kpartx :      Makes multipath devices partitionable.
 
 %prep
-%setup -q -n multipath-tools-0.4.7.2
+%setup -q -n multipath-tools-0.4.7.3
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -66,10 +66,13 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Wed Jul 12 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-3.0
+- Updated to latest source. deals with change in libsysfs API
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.7-2.2.1
 - rebuild
 
-* Mon Jul 11 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.2
+* Mon Jul 10 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.2
 - fix tagging issue.
 
 * Mon Jul 10 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-2.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Jun 2006 22:20:47 -0000	1.11
+++ sources	12 Jul 2006 20:53:39 -0000	1.12
@@ -1 +1 @@
-d298d1e01832e2b89edb00eed88907fc  multipath-tools-0.4.7.2.tgz
+015f5c41ad640e893fbbddd9a30fe3b4  multipath-tools-0.4.7.3.tgz



From fedora-cvs-commits at redhat.com  Wed Jul 12 20:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 16:58:37 -0400
Subject: rpms/gok/devel gok.spec,1.37,1.38
Message-ID: <200607122058.k6CKwbjI031811@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31724

Modified Files:
	gok.spec 
Log Message:
remove obsoleted patch



Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gok.spec	12 Jul 2006 20:36:48 -0000	1.37
+++ gok.spec	12 Jul 2006 20:58:35 -0000	1.38
@@ -10,7 +10,6 @@
 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
-Patch4: gok-1.0.5-crash.patch
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
@@ -52,7 +51,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .launcher
-%patch4 -p1 -b .crash
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:04:56 -0400
Subject: rpms/bluez-libs/devel bluez-libs.spec,1.27,1.28
Message-ID: <200607122104.k6CL4uhi000367@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv341

Modified Files:
	bluez-libs.spec 
Log Message:
fix missing br


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bluez-libs.spec	12 Jul 2006 05:28:03 -0000	1.27
+++ bluez-libs.spec	12 Jul 2006 21:04:50 -0000	1.28
@@ -1,13 +1,13 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
 Version: 3.0
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
-BuildRequires: glib-devel >= 1.2
+#BuildRequires: glib-devel 
 Requires: bluez-libs >= %{version}
 ExcludeArch: s390 s390x
 
@@ -63,8 +63,9 @@
 %{_libdir}/pkgconfig/bluez.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-3
 - rebuild
+- Try building w/out glib-devel
 
 * Sun Jun 11 2006 David Woodhouse <dwmw2 at redhat.com> - 3.0-2
 - Bump release because 3.0-1 build failed



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:09:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:09:04 -0400
Subject: rpms/bind/devel bind.spec,1.110,1.111
Message-ID: <200607122109.k6CL94CL000708@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv670

Modified Files:
	bind.spec 
Log Message:
rebuild for new build environment


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- bind.spec	12 Jul 2006 05:26:41 -0000	1.110
+++ bind.spec	12 Jul 2006 21:09:01 -0000	1.111
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	26.FC6.1
+Release: 	27.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -843,6 +843,9 @@
 :;
 
 %changelog
+* Wed Jul 12 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-27.FC6
+- rebuild with fixed glibc-kernheaders
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 30:9.3.2-26.FC6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:09:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:09:53 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-dynamic-scannerinfo-ext.patch,
	NONE, 1.1 eclipse-cdt.spec, 1.41, 1.42
Message-ID: <200607122109.k6CL9rg9000892@cvs.devel.redhat.com>

Author: jjohnstn

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

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-dynamic-scannerinfo-ext.patch 
Log Message:

* Wed Jul 12 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_2fc
- Add dynamic scannerinfo extension used by Autotools plug-in.




eclipse-cdt-dynamic-scannerinfo-ext.patch:
 org.eclipse.cdt.core/plugin.xml                                                  |    1 
 org.eclipse.cdt.core/schema/DynamicScannerInfoProvider.exsd                      |  105 ++++++++++
 org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java                   |   22 ++
 org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java |   45 +++-
 4 files changed, 161 insertions(+), 12 deletions(-)

--- NEW FILE eclipse-cdt-dynamic-scannerinfo-ext.patch ---
--- ./results/plugins/org.eclipse.cdt.core/schema/DynamicScannerInfoProvider.exsd.fix	2006-07-12 16:58:30.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.core/schema/DynamicScannerInfoProvider.exsd	2006-07-12 16:56:05.000000000 -0400
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.cdt.core">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.cdt.core" id="DynamicScannerInfoProvider" name="Dynamic ScannerInfoProvider"/>
+      </appInfo>
+      <documentation>
+         ScannerInfoProvider that extracts from dynamic build info taken from makefiles.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="run"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="run">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Class which implements IScannerInfoProvider dynamically from makefile build.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.core.parser.IScannerInfoProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
--- ./results/plugins/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java.fix	2006-07-12 16:54:55.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java	2006-07-12 16:56:05.000000000 -0400
@@ -856,6 +856,28 @@ public class CCorePlugin extends Plugin 
 		}
 		return provider;
 	}
+    
+	/**
+	 * Get the dynamic IScannerInfoProvider contributed interface for the platform.
+	 * @return IScannerInfoProvider or null
+	 */
+	public IScannerInfoProvider getDynamicScannerInfoProvider() throws CoreException {
+		IScannerInfoProvider provider = null;
+		IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(CCorePlugin.PLUGIN_ID, "DynamicScannerInfoProvider"); //$NON-NLS-1$
+		if (extension != null) {
+			IExtension[] extensions = extension.getExtensions();
+			try {
+				if (extensions.length > 0) {
+					IConfigurationElement[] configElements = extensions[0].getConfigurationElements();
+					provider = (IScannerInfoProvider) configElements[0].createExecutableExtension("class");
+				}
+				return provider;
+			} catch (CoreException e) {
+				// log(e);
+			}
+		}
+		return null;
+	}
 
 	/**
 	 * Helper function, returning the contenttype for a filename
--- ./results/plugins/org.eclipse.cdt.core/plugin.xml.fix	2006-07-12 16:54:19.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.core/plugin.xml	2006-07-12 16:56:05.000000000 -0400
@@ -44,6 +44,7 @@
    <extension-point id="CodeFormatter" name="%CodeFormatter.name" schema="schema/CodeFormatter.exsd"/>
    <extension-point id="CIndexer" name="C/C++ Indexer" schema="schema/CIndexer.exsd"/>
    <extension-point id="language" name="%language.name" schema="schema/language.exsd"/>
+   <extension-point id="DynamicScannerInfoProvider" name="Dynamic ScannerInfoProvider" schema="schema/DynamicScannerInfoProvider.exsd"/>
 <!-- =================================================================================== -->
 <!-- Define the list of the Binary Parser provided by the CDT                            -->
 <!-- =================================================================================== -->
--- ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java.fix	2006-07-12 16:55:40.000000000 -0400
+++ ./results/plugins/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java	2006-07-12 16:56:05.000000000 -0400
@@ -37,8 +37,10 @@ import org.eclipse.core.resources.IResou
 import org.eclipse.core.resources.IResourceProxyVisitor;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
@@ -79,30 +81,47 @@ public class OpenIncludeAction extends A
 		if (include == null) {
 			return;
 		}
-		
 		try {
+			boolean dynamicIncludePathFound = false;
 			IResource res = include.getUnderlyingResource();
 			ArrayList filesFound = new ArrayList(4);
+			IResource resToScan = res;
+			QualifiedName dynamicScannerPrevFile = new QualifiedName("org.eclipse.cdt.core", "DynamicScannerPrevFile");
 			if (res != null) {
 				IProject proj = res.getProject();
 				String includeName = include.getElementName();
-				// Search in the scannerInfo information
-				IScannerInfoProvider provider =  CCorePlugin.getDefault().getScannerInfoProvider(proj);
+				IScannerInfoProvider provider = CCorePlugin.getDefault().getDynamicScannerInfoProvider();
 				if (provider != null) {
-					IScannerInfo info = provider.getScannerInformation(res);
-					// XXXX this should fall back to project by itself
-					if (info == null) {
-						info = provider.getScannerInformation(proj);
-					}
+					while (resToScan.getSessionProperty(dynamicScannerPrevFile) != null)
+						resToScan = (IResource)resToScan.getSessionProperty(dynamicScannerPrevFile);
+					IScannerInfo info = provider.getScannerInformation(resToScan);
 					if (info != null) {
 						String[] includePaths = info.getIncludePaths();
 						HashSet found = new HashSet();
 						findFile(includePaths, includeName, filesFound, found);
 					}
-					if (filesFound.size() == 0) {
-						// Fall back and search the project
-						findFile(proj, new Path(includeName), filesFound);
+				}
+				if (filesFound.size() == 0) {
+					// Search in the scannerInfo information
+					provider =  CCorePlugin.getDefault().getScannerInfoProvider(proj);
+					if (provider != null) {
+						IScannerInfo info = provider.getScannerInformation(res);
+						// XXXX this should fall back to project by itself
+						if (info == null) {
+							info = provider.getScannerInformation(proj);
+						}
+						if (info != null) {
+							String[] includePaths = info.getIncludePaths();
+							HashSet found = new HashSet();
+							findFile(includePaths, includeName, filesFound, found);
+						}
+						if (filesFound.size() == 0) {
+							// Fall back and search the project
+							findFile(proj, new Path(includeName), filesFound);
+						}
 					}
+				} else {
+					dynamicIncludePathFound = true;
 				}
 			}
 			IPath fileToOpen;
@@ -110,7 +129,7 @@ public class OpenIncludeAction extends A
 			if (nElementsFound == 0) {
 				noElementsFound();
 				fileToOpen= null;
-			} else if (nElementsFound == 1) {
+			} else if (nElementsFound == 1 || dynamicIncludePathFound) {
 				fileToOpen= (IPath) filesFound.get(0);
 			} else {
 				fileToOpen= chooseFile(filesFound);
@@ -119,6 +138,8 @@ public class OpenIncludeAction extends A
 			if (fileToOpen != null) {
 				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(fileToOpen);
 				if (file != null) {
+					if (dynamicIncludePathFound)
+						file.setSessionProperty(dynamicScannerPrevFile, resToScan);
 					EditorUtility.openInEditor(file);
 				}  else {
 					ICProject cproject = include.getCProject();


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- eclipse-cdt.spec	10 Jul 2006 22:38:32 -0000	1.41
+++ eclipse-cdt.spec	12 Jul 2006 21:09:50 -0000	1.42
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_1fc
+Release: 	1jpp_2fc
 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
@@ -48,6 +48,7 @@
 Patch2: %{name}-platform-build-linux.patch
 Patch3: %{name}-sdk-build-linux.patch
 Patch4: %{name}-no-tests.patch
+Patch5: %{name}-dynamic-scannerinfo-ext.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -80,6 +81,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -231,6 +233,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_2fc
+- Add dynamic scannerinfo extension used by Autotools plug-in.
+
 * Mon Jul 10 2006 Andrew Overholt <overholt at redhat.com> 3.1.0-1jpp_1fc
 - 3.1.0.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:10:33 -0400
Subject: rpms/dasher/devel dasher.spec,1.47,1.48
Message-ID: <200607122110.k6CLAXUo001032@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv943

Modified Files:
	dasher.spec 
Log Message:
rebuild



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- dasher.spec	12 Jul 2006 05:30:04 -0000	1.47
+++ dasher.spec	12 Jul 2006 21:10:30 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 4.1.7
-Release: 1.1
+Release: 2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -89,16 +89,19 @@
 %defattr(-,root,root,-)
 %doc
 %{_datadir}/dasher/
-#%{_datadir}/gnome/help/dasher
+%{_datadir}/gnome/help/dasher
 %{_datadir}/icons/hicolor/48x48/apps
 %{_datadir}/icons/hicolor/scalable/apps
-#%{_datadir}/omf/dasher/*
+%{_datadir}/omf/dasher/*
 %{_datadir}/applications/gnome-dasher.desktop
 %{_bindir}/dasher
-#%{_mandir}/*/dasher.1.gz
+%{_mandir}/*/dasher.1.gz
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.7-2
+- Rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.7-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:10:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:10:47 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.39,1.40
Message-ID: <200607122110.k6CLAl7j001083@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1047

Modified Files:
	devhelp.spec 
Log Message:
fix missing br


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- devhelp.spec	12 Jul 2006 05:35:14 -0000	1.39
+++ devhelp.spec	12 Jul 2006 21:10:35 -0000	1.40
@@ -1,9 +1,9 @@
-%define mozver 37:1.7.12
+%define mozver 37:1.7.13
 
 Summary:             API document browser
 Name:                devhelp
 Version:             0.11
-Release:             3.1
+Release:             4
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -100,8 +100,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11-3.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11-4
 - rebuild
+- bump mozver
 
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.11-2
 - Rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:13:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:13:16 -0400
Subject: rpms/control-center/devel .cvsignore, 1.41, 1.42 control-center.spec,
	1.148, 1.149 sources, 1.44, 1.45
Message-ID: <200607122113.k6CLDGvU001794@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1722

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	13 Jun 2006 18:34:19 -0000	1.41
+++ .cvsignore	12 Jul 2006 21:13:13 -0000	1.42
@@ -14,3 +14,4 @@
 control-center-2.14.1.tar.bz2
 control-center-2.14.2.tar.bz2
 control-center-2.15.3.tar.bz2
+control-center-2.15.4.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- control-center.spec	20 Jun 2006 18:13:01 -0000	1.148
+++ control-center.spec	12 Jul 2006 21:13:13 -0000	1.149
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center
 Name: control-center
-Version: 2.15.3
-Release: 3
+Version: 2.15.4
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -260,6 +260,9 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen  <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Tue Jun 20 2006 Matthias Clasen  <mclasen at redhat.com> - 2.15.3-3
 - Rebuild against new libxklavier
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	13 Jun 2006 18:34:20 -0000	1.44
+++ sources	12 Jul 2006 21:13:13 -0000	1.45
@@ -1,2 +1,2 @@
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
-8e6f9e1247e7878642177f6c6acd78fe  control-center-2.15.3.tar.bz2
+de3a495fc1265e9ed84212299ade5a0a  control-center-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:18:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:18:30 -0400
Subject: rpms/elfutils/devel .cvsignore,1.28,1.29 sources,1.29,1.30
Message-ID: <200607122118.k6CLIUlE018383@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18353

Modified Files:
	.cvsignore sources 
Log Message:
New upstream tarball.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	15 Jun 2006 08:18:11 -0000	1.28
+++ .cvsignore	12 Jul 2006 21:18:27 -0000	1.29
@@ -1 +1 @@
-elfutils-0.121.tar.gz
+elfutils-0.122.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	15 Jun 2006 08:18:11 -0000	1.29
+++ sources	12 Jul 2006 21:18:27 -0000	1.30
@@ -1 +1 @@
-5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz
+d83e9022eb342eede549dd6d6a537b59  elfutils-0.122.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:20:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:20:04 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.45,1.46
Message-ID: <200607122120.k6CLK43f019031@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18636

Modified Files:
	at-spi.spec 
Log Message:
Rebuild



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- at-spi.spec	12 Jul 2006 20:26:24 -0000	1.45
+++ at-spi.spec	12 Jul 2006 21:20:02 -0000	1.46
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.9
-Release: 1
+Release: 2
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 
@@ -95,6 +95,41 @@
 %{_includedir}/* 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-2
+- Rebuild
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-1
+- Update to 1.7.9
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.8-1
+- Update to 1.7.8
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.7-8.1
+- rebuild
+
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-8
+- Add a BuildRequires
+
+* Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-7
+- Make it build in mock
+
+* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-6
+- Revert the previous change
+
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-5
+- Fix a missing declaration
+- Fix segfaults on x86_64
+
+* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1
+- Update to 1.7.7
+
+* Thu Mar  9 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.6-2
+- Fix a crash on x86_64
+
+* 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
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-1
 - Update to 1.7.9
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:25:05 -0400
Subject: rpms/elfutils/devel elfutils.spec,1.67,1.68
Message-ID: <200607122125.k6CLP5wQ020998@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20966

Modified Files:
	elfutils.spec 
Log Message:
Update to 0.122


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- elfutils.spec	12 Jul 2006 05:44:03 -0000	1.67
+++ elfutils.spec	12 Jul 2006 21:25:03 -0000	1.68
@@ -1,5 +1,5 @@
-%define version 0.121
-%define release 1.1
+%define version 0.122
+%define release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -214,8 +214,15 @@
 %{_libdir}/libelf.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.121-1.1
-- rebuild
+* Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-1
+- Update to 0.122
+  - Fix libdwfl sorting of modules with 64-bit addresses (#198225).
+  - libebl: add function to test for relative relocation
+  - elflint: fix and extend DT_RELCOUNT/DT_RELACOUNT checks
+  - elflint, readelf: add support for DT_GNU_HASH
+  - libelf: add elf_gnu_hash
+  - elflint, readelf: add support for 64-bit SysV-style hash tables
+  - libdwfl: new functions dwfl_module_getsymtab, dwfl_module_getsym.
 
 * Thu Jun 15 2006 Roland McGrath <roland at redhat.com> - 0.121-1
 - Update to 0.121



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:25:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:25:13 -0400
Subject: rpms/at-spi/devel at-spi.spec,1.46,1.47
Message-ID: <200607122125.k6CLPD0V021066@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21023

Modified Files:
	at-spi.spec 
Log Message:
Rebuild



Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- at-spi.spec	12 Jul 2006 21:20:02 -0000	1.46
+++ at-spi.spec	12 Jul 2006 21:25:10 -0000	1.47
@@ -130,38 +130,6 @@
 - Update to 1.7.6 
 
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.5-1
-* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-1
-- Update to 1.7.9
-
-* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.8-1
-- Update to 1.7.8
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.7-8.1
-- rebuild
-
-* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-8
-- Add a BuildRequires
-
-* Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-7
-- Make it build in mock
-
-* Mon Apr 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-6
-- Revert the previous change
-
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-5
-- Fix a missing declaration
-- Fix segfaults on x86_64
-
-* Tue Apr  4 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.7-1
-- Update to 1.7.7
-
-* Thu Mar  9 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.6-2
-- Fix a crash on x86_64
-
-* 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 
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7.4-1.2



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:27:42 -0400
Subject: rpms/eel2/devel eel2.spec,1.50,1.51
Message-ID: <200607122127.k6CLRglD022065@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22016

Modified Files:
	eel2.spec 
Log Message:
Rebuild



Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- eel2.spec	12 Jul 2006 15:50:52 -0000	1.50
+++ eel2.spec	12 Jul 2006 21:27:40 -0000	1.51
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library
 Version: 	2.15.4
-Release: 	1
+Release: 	2
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:31:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:31:04 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.62,1.63
Message-ID: <200607122131.k6CLV4Mn023162@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23136

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
Rebuild



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- nautilus-cd-burner.spec	12 Jul 2006 07:26:05 -0000	1.62
+++ nautilus-cd-burner.spec	12 Jul 2006 21:30:59 -0000	1.63
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.15.3
-Release: 1.1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
+- Rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:32:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:32:37 -0400
Subject: rpms/elfutils/devel elfutils-portability.patch,1.22,1.23
Message-ID: <200607122132.k6CLWb57023264@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23234

Modified Files:
	elfutils-portability.patch 
Log Message:
Update to 0.122

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-portability.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- elfutils-portability.patch	15 Jun 2006 08:32:06 -0000	1.22
+++ elfutils-portability.patch	12 Jul 2006 21:32:34 -0000	1.23
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -56,6 +56,11 @@
+@@ -67,6 +67,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -78,6 +83,9 @@
+@@ -89,6 +94,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
+@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
+@@ -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,$^) \
@@ -90,7 +90,10 @@
  libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -7,6 +7,10 @@
+ 	* configure.ac: Add dummy automake conditional to get dependencies
+ 	for non-generic linker right.  See src/Makefile.am.
+ 
 +2005-11-22  Roland McGrath  <roland at redhat.com>
 +
 +	* configure.ac: Check for --as-needed linker option.
@@ -98,7 +101,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -45,6 +49,17 @@
+@@ -54,6 +58,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -126,7 +129,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -121,6 +122,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -136,12 +139,12 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.122'
  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 NEVER_TRUE NEVER_FALSE MUDFLAP_TRUE MUDFLAP_FALSE GP!
 ROF_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 WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu NEVER_TRUE NEVER_FALSE MUDFLAP_T!
 RUE 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.
@@ -238,7 +241,7 @@
  LOCALEDIR=$datadir
  
  cat >>confdefs.h <<_ACEOF
-@@ -4987,6 +5073,8 @@ s, at YACC@,$YACC,;t t
+@@ -5004,6 +5090,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
@@ -325,7 +328,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +336,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
+@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -386,7 +389,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +397,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,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 \
@@ -439,7 +442,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +450,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -175,7 +177,7 @@ sbindir = @sbindir@
+@@ -177,7 +179,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +461,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -290,6 +290,11 @@
+@@ -305,6 +305,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -499,7 +502,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +510,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
+@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -286,6 +286,11 @@
+@@ -337,6 +337,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +556,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +564,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +572,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
+@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +586,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -413,6 +413,11 @@
+@@ -437,6 +437,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +617,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +625,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -168,6 +169,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +633,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
+@@ -210,9 +212,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -136,6 +136,11 @@
+@@ -165,6 +165,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.
  
@@ -717,7 +720,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +728,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -256,10 +258,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 \
@@ -748,7 +751,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -766,7 +769,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -143,6 +144,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -776,7 +779,10 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -53,6 +53,10 @@
+ 	* Makefile.am: Add hacks to create dependency files for non-generic
+ 	linker.
+ 
 +2006-04-05  Roland McGrath  <roland at redhat.com>
 +
 +	* strings.c (MAP_POPULATE): Define to 0 if undefined.
@@ -784,7 +790,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -346,6 +350,11 @@
+@@ -401,6 +405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -832,7 +838,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -840,7 +846,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -239,6 +240,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -848,7 +854,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -269,12 +271,12 @@ target_alias = @target_alias@
+@@ -283,12 +285,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 \
@@ -970,7 +976,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -978,7 +984,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -363,10 +365,10 @@ sbindir = @sbindir@
+@@ -365,10 +367,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:32:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:32:39 -0400
Subject: rpms/fbset/devel fbset.spec,1.18,1.19
Message-ID: <200607122132.k6CLWdYL023273@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fbset/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23220

Modified Files:
	fbset.spec 
Log Message:
fix missing br


Index: fbset.spec
===================================================================
RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fbset.spec	12 Jul 2006 05:47:41 -0000	1.18
+++ fbset.spec	12 Jul 2006 21:32:20 -0000	1.19
@@ -1,12 +1,12 @@
 Summary: Tools for managing a frame buffer's video mode properties.
 Name: fbset
 Version: 2.1
-Release: 21.1
+Release: 22
 License: GPL
 Group: Applications/System
 URL: http://home.tvd.be/cr26864/Linux/fbdev/
 Source: http://home.tvd.be/cr26864/Linux/fbdev/fbset-2.1.tar.gz
-BuildRequires: bison
+BuildRequires: bison flex
 Patch0: fbset-2.1-makefile.patch
 Patch1: fbset-2.1-fixmode.patch
 BuildRoot: %{_tmppath}/%{name}-root
@@ -42,8 +42,9 @@
 %config	%{_sysconfdir}/fb.modes
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1-21.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1-22
 - rebuild
+- Add missing br flex
 
 * Mon May 29 2006 Jindrich Novy <jnovy at redhat.com> 2.1-21
 - add BuildRequires: bison (#193362)



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:34:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:34:00 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.71,1.72
Message-ID: <200607122134.k6CLY04s023490@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-media.spec 
Log Message:
Rebuild



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gnome-media.spec	12 Jul 2006 05:59:30 -0000	1.71
+++ gnome-media.spec	12 Jul 2006 21:33:44 -0000	1.72
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.14.2
-Release:        4.1
+Release:        5
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
+- Rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:37:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:37:08 -0400
Subject: rpms/x86info/devel .cvsignore, 1.8, 1.9 sources, 1.7,
	1.8 x86info.spec, 1.23, 1.24
Message-ID: <200607122137.k6CLb8vJ024135@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/x86info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24096

Modified Files:
	.cvsignore sources x86info.spec 
Log Message:
1.18



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 May 2006 20:47:42 -0000	1.8
+++ .cvsignore	12 Jul 2006 21:37:03 -0000	1.9
@@ -1,2 +1,2 @@
-x86info-1.17.tgz
-x86info-1.17
+x86info-1.18
+x86info-1.18.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Nov 2005 00:23:48 -0000	1.7
+++ sources	12 Jul 2006 21:37:05 -0000	1.8
@@ -1 +1 @@
-bef27fba7b0c3a9aeda63372a670f3a9  x86info-1.17.tgz
+6886cbabc9c8155212b9a3d0b2d37a5f  x86info-1.18.tgz


Index: x86info.spec
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- x86info.spec	12 Jul 2006 08:52:03 -0000	1.23
+++ x86info.spec	12 Jul 2006 21:37:05 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:        x86 processor information tool.
 Name:           x86info
-Version:        1.17
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1%{?dist}
+Version:        1.18
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -44,6 +44,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Wed Jul 12 2006 Dave Jones <davej at redhat.com>
+- New upstream (1.18)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.17-1.22.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:38:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:38:05 -0400
Subject: rpms/elilo/devel elilo-3.6-kern-types.patch, NONE, 1.1 elilo.spec,
	1.19, 1.20 elilo-3.3a-makefile.patch, 1.2,
	NONE elilo-3.4-debug.patch, 1.1, NONE elilo-argv-fix.patch,
	1.1, NONE elilo-initrd-size-fix.patch, 1.1,
	NONE elilo-kill-warnings.patch, 1.1, NONE
Message-ID: <200607122138.k6CLc5e5024321@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/elilo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24119

Modified Files:
	elilo.spec 
Added Files:
	elilo-3.6-kern-types.patch 
Removed Files:
	elilo-3.3a-makefile.patch elilo-3.4-debug.patch 
	elilo-argv-fix.patch elilo-initrd-size-fix.patch 
	elilo-kill-warnings.patch 
Log Message:
Remove obsoleted patches that had been removed from the spec file earlier.
Apply another patch to fix build due to kernel header problems.


elilo-3.6-kern-types.patch:
 efi.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE elilo-3.6-kern-types.patch ---
--- efibootmgr-0.5.3/src/lib/efi.c.kerntype	2006-07-12 17:30:20.000000000 -0400
+++ efibootmgr-0.5.3/src/lib/efi.c	2006-07-12 17:30:35.000000000 -0400
@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <linux/types.h>
 #include <linux/sockios.h>
 #include <net/if.h>
 #include <pci/pci.h>


Index: elilo.spec
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/elilo.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- elilo.spec	12 Jul 2006 05:44:12 -0000	1.19
+++ elilo.spec	12 Jul 2006 21:37:55 -0000	1.20
@@ -5,12 +5,13 @@
 Group: System Environment/Base
 Obsoletes: eli
 Version: 3.6
-Release: 1.2
+Release: 2
 License: GPL
 Source: elilo-%{version}.src.tgz
 Source1: http://domsch.com/linux/ia64/efibootmgr/efibootmgr-%{efibootmgr_ver}.tar.gz
 Source2: fpswa.efi
 Patch1: elilo-3.6-makefile.patch
+Patch2: elilo-3.6-kern-types.patch
 BuildPrereq: gnu-efi, pciutils-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: ia64
@@ -22,6 +23,9 @@
 %prep
 %setup -q -a 1 -n elilo
 %patch1 -p0
+pushd efibootmgr-%{efibootmgr_ver}
+%patch2 -p1
+popd
 
 %build
 make
@@ -55,6 +59,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 12 2006 Chris Lumens <clumens at redhat.com> 3.6-2
+- Patch to fix kernel header changes.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.6-1.2
 - rebuild
 


--- elilo-3.3a-makefile.patch DELETED ---


--- elilo-3.4-debug.patch DELETED ---


--- elilo-argv-fix.patch DELETED ---


--- elilo-initrd-size-fix.patch DELETED ---


--- elilo-kill-warnings.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:38:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:38:43 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.9, 1.10 libdhcp.spec, 1.28,
	1.29 sources, 1.21, 1.22
Message-ID: <200607122138.k6CLchSb024623@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24569

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Jul 2006 20:34:21 -0000	1.9
+++ .cvsignore	12 Jul 2006 21:38:40 -0000	1.10
@@ -1 +1 @@
-libdhcp-1.7.tar.gz
+libdhcp-1.8.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libdhcp.spec	12 Jul 2006 06:47:55 -0000	1.28
+++ libdhcp.spec	12 Jul 2006 21:38:40 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.7
-Release: 	1.1
+Version: 	1.8
+Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
 URL: 		http://people.redhat.com/~jvdias/libdhcp-1.0.tar.gz
@@ -76,7 +76,10 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 David Cantrell <dcantrell at redhat.com> - 1.8-1
+- Removed nic_configure_resolver() and calls to it
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7-1.1
 - rebuild
 
 * Tue Jul 11 2006 David Cantrell <dcantrell at redhat.com> - 1.7-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 Jul 2006 20:34:21 -0000	1.21
+++ sources	12 Jul 2006 21:38:40 -0000	1.22
@@ -1 +1 @@
-73c782ab52e98a6f6f33f3cb9233d6a4  libdhcp-1.7.tar.gz
+8e3532123c09347de61e3c2de7288897  libdhcp-1.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:44:09 -0400
Subject: rpms/libbonobo/devel .cvsignore, 1.16, 1.17 libbonobo.spec, 1.42,
	1.43 sources, 1.16, 1.17
Message-ID: <200607122144.k6CLi9K2026795@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26737

Modified Files:
	.cvsignore libbonobo.spec sources 
Log Message:
2.15.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	14 Mar 2006 20:09:58 -0000	1.16
+++ .cvsignore	12 Jul 2006 21:44:06 -0000	1.17
@@ -1 +1 @@
-libbonobo-2.14.0.tar.bz2
+libbonobo-2.15.0.tar.bz2


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libbonobo.spec	12 Jul 2006 06:46:10 -0000	1.42
+++ libbonobo.spec	12 Jul 2006 21:44:06 -0000	1.43
@@ -5,8 +5,8 @@
 
 Summary: Bonobo component system
 Name: libbonobo
-Version: 2.14.0
-Release: 4.1
+Version: 2.15.0
+Release: 1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -117,6 +117,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
+- Update to 2.15.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	14 Mar 2006 20:09:58 -0000	1.16
+++ sources	12 Jul 2006 21:44:06 -0000	1.17
@@ -1 +1 @@
-f1f0255f94e3354250d142b688013fad  libbonobo-2.14.0.tar.bz2
+efa3d7697e2cb4b529059dde720d62b3  libbonobo-2.15.0.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:51:08 -0400
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.34,
	1.35 nautilus-cd-burner.spec, 1.63, 1.64 sources, 1.34, 1.35
Message-ID: <200607122151.k6CLp8Ji011751@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11673

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	13 Jun 2006 15:12:41 -0000	1.34
+++ .cvsignore	12 Jul 2006 21:51:05 -0000	1.35
@@ -1 +1 @@
-nautilus-cd-burner-2.15.3.tar.bz2
+nautilus-cd-burner-2.15.4.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- nautilus-cd-burner.spec	12 Jul 2006 21:30:59 -0000	1.63
+++ nautilus-cd-burner.spec	12 Jul 2006 21:51:05 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.15.3
-Release: 2
+Version: 2.15.4
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -98,8 +98,8 @@
 
 
 %changelog
-* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
-- Rebuild
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	13 Jun 2006 15:12:41 -0000	1.34
+++ sources	12 Jul 2006 21:51:05 -0000	1.35
@@ -1 +1 @@
-9c508a19359e510ed48793e81599c168  nautilus-cd-burner-2.15.3.tar.bz2
+e0c9e4758c8cd785704c76f04f9ac5e5  nautilus-cd-burner-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 21:56:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 17:56:42 -0400
Subject: rpms/flac/devel flac.spec,1.21,1.22
Message-ID: <200607122156.k6CLugeR013919@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13898

Modified Files:
	flac.spec 
Log Message:
fix missing br


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- flac.spec	12 Jul 2006 05:49:03 -0000	1.21
+++ flac.spec	12 Jul 2006 21:56:40 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
 Version: 1.1.2
-Release: 26.1
+Release: 27
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -10,7 +10,7 @@
 Patch4: flac-1.1.2-noxmms.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: glib-devel, libogg-devel, doxygen, nasm
+BuildRequires: glib2-devel, libogg-devel, doxygen, nasm
 BuildRequires: libtool, gettext-devel
 Obsoletes: flac-libs
 Obsoletes: xmms-flac < 1.1.2-24
@@ -76,8 +76,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-26.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-27
 - rebuild
+- Try building w/ glib2-devel
 
 * Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 1.1.2-26
 - rebuild for -devel deps



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:08:28 -0400
Subject: rpms/elfutils/devel elfutils-robustify.patch, 1.4, 1.5 elfutils.spec,
	1.68, 1.69
Message-ID: <200607122208.k6CM8SF4015938@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15883

Modified Files:
	elfutils-robustify.patch elfutils.spec 
Log Message:
Update robustification for 0.122; use dist tag in rpm release.

elfutils-robustify.patch:
 libelf/elf32_getphdr.c        |   10 +++
 libelf/elf32_getshdr.c        |   15 ++++-
 libelf/elf32_newphdr.c        |    6 ++
 libelf/elf32_updatefile.c     |    7 ++
 libelf/elf_begin.c            |   46 +++++++++++++++-
 libelf/elf_getarsym.c         |    3 +
 libelf/elf_getshstrndx.c      |   38 ++++++++++++-
 libelf/elf_newscn.c           |   10 +++
 libelf/gelf_getdyn.c          |    6 +-
 libelf/gelf_getlib.c          |    3 -
 libelf/gelf_getmove.c         |    3 -
 libelf/gelf_getrel.c          |   12 +---
 libelf/gelf_getrela.c         |   12 +---
 libelf/gelf_getsym.c          |    6 +-
 libelf/gelf_getsyminfo.c      |    3 -
 libelf/gelf_getsymshndx.c     |   10 ++-
 libelf/gelf_getversym.c       |    3 -
 libelf/gelf_update_dyn.c      |   12 +---
 libelf/gelf_update_lib.c      |    9 ---
 libelf/gelf_update_move.c     |    2 
 libelf/gelf_update_rel.c      |   12 +---
 libelf/gelf_update_rela.c     |   12 +---
 libelf/gelf_update_sym.c      |   12 +---
 libelf/gelf_update_syminfo.c  |    9 ---
 libelf/gelf_update_symshndx.c |   12 +---
 libelf/gelf_update_versym.c   |    2 
 libelf/libelfP.h              |    9 +++
 src/elflint.c                 |  117 ++++++++++++++++++++++++++++++------------
 src/readelf.c                 |   92 +++++++++++++++++++++++----------
 src/strip.c                   |   73 +++++++++++++++++---------
 30 files changed, 391 insertions(+), 175 deletions(-)

Index: elfutils-robustify.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-robustify.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- elfutils-robustify.patch	5 Apr 2006 04:49:29 -0000	1.4
+++ elfutils-robustify.patch	12 Jul 2006 22:08:25 -0000	1.5
@@ -65,8 +65,8 @@
 	(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
 	check_symtab_shndx, check_hash, check_versym): Robustify.
 
---- elfutils-0.120/libelf/elf32_getphdr.c
-+++ elfutils-0.120/libelf/elf32_getphdr.c
+--- elfutils-0.122/libelf/elf32_getphdr.c
++++ elfutils-0.122/libelf/elf32_getphdr.c
 @@ -115,6 +115,16 @@ elfw2(LIBELFBITS,getphdr) (elf)
  
        if (elf->map_address != NULL)
@@ -84,8 +84,8 @@
  	  /* All the data is already mapped.  Use it.  */
  	  if (ehdr->e_ident[EI_DATA] == MY_ELFDATA
  	      && (ALLOW_UNALIGNED
---- elfutils-0.120/libelf/elf32_getshdr.c
-+++ elfutils-0.120/libelf/elf32_getshdr.c
+--- elfutils-0.122/libelf/elf32_getshdr.c
++++ elfutils-0.122/libelf/elf32_getshdr.c
 @@ -101,11 +101,12 @@ elfw2(LIBELFBITS,getshdr) (scn)
  	goto out;
  
@@ -118,8 +118,8 @@
  	  /* Now copy the data and at the same time convert the byte
  	     order.  */
  	  if (ALLOW_UNALIGNED
---- elfutils-0.120/libelf/elf32_newphdr.c
-+++ elfutils-0.120/libelf/elf32_newphdr.c
+--- elfutils-0.122/libelf/elf32_newphdr.c
++++ elfutils-0.122/libelf/elf32_newphdr.c
 @@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
    else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
  	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
@@ -133,8 +133,8 @@
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
---- elfutils-0.120/libelf/elf32_updatefile.c
-+++ elfutils-0.120/libelf/elf32_updatefile.c
+--- elfutils-0.122/libelf/elf32_updatefile.c
++++ elfutils-0.122/libelf/elf32_updatefile.c
 @@ -201,6 +201,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
@@ -145,7 +145,7 @@
        Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
        Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
        char *const shdr_start = ((char *) elf->map_address + elf->start_offset
-@@ -545,6 +548,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
+@@ -571,6 +574,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
      {
@@ -156,8 +156,8 @@
        off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
  #if EV_NUM != 2
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
---- elfutils-0.120/libelf/elf_begin.c
-+++ elfutils-0.120/libelf/elf_begin.c
+--- elfutils-0.122/libelf/elf_begin.c
++++ elfutils-0.122/libelf/elf_begin.c
 @@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
@@ -212,20 +212,16 @@
  	    = (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff);
 +
  	  if (ehdr->e_phnum > 0)
--	    /* Assign a value only if there really is a program
--	       header.  Otherwise the value remains NULL.  */
--	    elf->state.elf32.phdr
--	      = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
 +	    {
-+	      /* Assign a value only if there really is a program
-+		 header.  Otherwise the value remains NULL.  */
+ 	    /* Assign a value only if there really is a program
+ 	       header.  Otherwise the value remains NULL.  */
 +	      if (unlikely (ehdr->e_phoff >= maxsize)
 +		  || unlikely (ehdr->e_phoff
 +			       + ehdr->e_phnum
 +			       * sizeof (Elf32_Phdr) > maxsize))
 +		goto free_and_out;
-+	      elf->state.elf32.phdr
-+		= (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
+ 	    elf->state.elf32.phdr
+ 	      = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
 +	    }
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
@@ -243,26 +239,22 @@
  	    = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff);
 +
  	  if (ehdr->e_phnum > 0)
--	    /* Assign a value only if there really is a program
--	       header.  Otherwise the value remains NULL.  */
--	    elf->state.elf64.phdr
--	      = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff);
 +	    {
-+	      /* Assign a value only if there really is a program
-+		 header.  Otherwise the value remains NULL.  */
+ 	    /* Assign a value only if there really is a program
+ 	       header.  Otherwise the value remains NULL.  */
 +	      if (unlikely (ehdr->e_phoff >= maxsize)
 +		  || unlikely (ehdr->e_phoff
 +			       + ehdr->e_phnum
 +			       * sizeof (Elf32_Phdr) > maxsize))
 +		goto free_and_out;
-+	      elf->state.elf64.phdr
-+		= (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff);
+ 	    elf->state.elf64.phdr
+ 	      = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff);
 +	    }
  
  	  for (size_t cnt = 0; cnt < scncnt; ++cnt)
  	    {
---- elfutils-0.120/libelf/elf_getarsym.c
-+++ elfutils-0.120/libelf/elf_getarsym.c
+--- elfutils-0.122/libelf/elf_getarsym.c
++++ elfutils-0.122/libelf/elf_getarsym.c
 @@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
        size_t index_size = atol (tmpbuf);
  
@@ -273,8 +265,8 @@
  	  || n * sizeof (uint32_t) > index_size)
  	{
  	  /* This index table cannot be right since it does not fit into
---- elfutils-0.120/libelf/elf_getshstrndx.c
-+++ elfutils-0.120/libelf/elf_getshstrndx.c
+--- elfutils-0.122/libelf/elf_getshstrndx.c
++++ elfutils-0.122/libelf/elf_getshstrndx.c
 @@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
@@ -283,8 +275,6 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf32_Shdr) - 1)) == 0))
--		/* We can directly access the memory.  */
--		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
@@ -297,7 +287,8 @@
 +		      goto out;
 +		    }
 +
-+		  /* We can directly access the memory.  */
+ 		/* We can directly access the memory.  */
+-		num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
 +		  num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
 +					 + offset))->sh_link;
 +		}
@@ -312,8 +303,6 @@
 +		      || (((size_t) ((char *) elf->map_address
 +			   + elf->start_offset + offset))
  			  & (__alignof__ (Elf64_Shdr) - 1)) == 0))
--		/* We can directly access the memory.  */
--		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
 +		{
 +		  /* First see whether the information in the ELF header is
 +		     valid and it does not ask for too much.  */
@@ -326,16 +315,17 @@
 +		      goto out;
 +		    }
 +
-+		  /* We can directly access the memory.  */
+ 		/* We can directly access the memory.  */
+-		num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
 +		  num = ((Elf64_Shdr *) (elf->map_address
 +			 + elf->start_offset + offset))->sh_link;
 +		}
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
---- elfutils-0.120/libelf/elf_newscn.c
-+++ elfutils-0.120/libelf/elf_newscn.c
-@@ -104,13 +104,21 @@ elf_newscn (elf)
+--- elfutils-0.122/libelf/elf_newscn.c
++++ elfutils-0.122/libelf/elf_newscn.c
+@@ -104,10 +104,18 @@ elf_newscn (elf)
    else
      {
        /* We must allocate a new element.  */
@@ -344,9 +334,6 @@
  
        assert (elf->state.elf.scnincr > 0);
  
--      newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
--				     + ((elf->state.elf.scnincr *= 2)
--					* sizeof (Elf_Scn)), 1);
 +      if (
 +#if SIZE_MAX <= 4294967295U
 +	  likely (elf->state.elf.scnincr
@@ -355,14 +342,11 @@
 +	  1
 +#endif
 +	  )
-+	newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
-+				       + ((elf->state.elf.scnincr *= 2)
-+					  * sizeof (Elf_Scn)), 1);
-       if (newp == NULL)
- 	{
- 	  __libelf_seterrno (ELF_E_NOMEM);
---- elfutils-0.120/libelf/gelf_getdyn.c
-+++ elfutils-0.120/libelf/gelf_getdyn.c
+       newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
+ 				     + ((elf->state.elf.scnincr *= 2)
+ 					* sizeof (Elf_Scn)), 1);
+--- elfutils-0.122/libelf/gelf_getdyn.c
++++ elfutils-0.122/libelf/gelf_getdyn.c
 @@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -383,8 +367,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_getlib.c
-+++ elfutils-0.120/libelf/gelf_getlib.c
+--- elfutils-0.122/libelf/gelf_getlib.c
++++ elfutils-0.122/libelf/gelf_getlib.c
 @@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
    /* The data is already in the correct form.  Just make sure the
       index is OK.  */
@@ -395,8 +379,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.120/libelf/gelf_getmove.c
-+++ elfutils-0.120/libelf/gelf_getmove.c
+--- elfutils-0.122/libelf/gelf_getmove.c
++++ elfutils-0.122/libelf/gelf_getmove.c
 @@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -407,8 +391,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.120/libelf/gelf_getrela.c
-+++ elfutils-0.120/libelf/gelf_getrela.c
+--- elfutils-0.122/libelf/gelf_getrela.c
++++ elfutils-0.122/libelf/gelf_getrela.c
 @@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -442,8 +426,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.120/libelf/gelf_getrel.c
-+++ elfutils-0.120/libelf/gelf_getrel.c
+--- elfutils-0.122/libelf/gelf_getrel.c
++++ elfutils-0.122/libelf/gelf_getrel.c
 @@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
    if (data_scn == NULL)
      return NULL;
@@ -477,8 +461,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
---- elfutils-0.120/libelf/gelf_getsym.c
-+++ elfutils-0.120/libelf/gelf_getsym.c
+--- elfutils-0.122/libelf/gelf_getsym.c
++++ elfutils-0.122/libelf/gelf_getsym.c
 @@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
  	 table entries has to be adopted.  The user better has provided
  	 a buffer where we can store the information.  While copying the
@@ -499,8 +483,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_getsyminfo.c
-+++ elfutils-0.120/libelf/gelf_getsyminfo.c
+--- elfutils-0.122/libelf/gelf_getsyminfo.c
++++ elfutils-0.122/libelf/gelf_getsyminfo.c
 @@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -511,8 +495,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.120/libelf/gelf_getsymshndx.c
-+++ elfutils-0.120/libelf/gelf_getsymshndx.c
+--- elfutils-0.122/libelf/gelf_getsymshndx.c
++++ elfutils-0.122/libelf/gelf_getsymshndx.c
 @@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
       section index table.  */
    if (likely (shndxdata_scn != NULL))
@@ -544,8 +528,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_getversym.c
-+++ elfutils-0.120/libelf/gelf_getversym.c
+--- elfutils-0.122/libelf/gelf_getversym.c
++++ elfutils-0.122/libelf/gelf_getversym.c
 @@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
  
    /* The data is already in the correct form.  Just make sure the
@@ -556,8 +540,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
---- elfutils-0.120/libelf/gelf_update_dyn.c
-+++ elfutils-0.120/libelf/gelf_update_dyn.c
+--- elfutils-0.122/libelf/gelf_update_dyn.c
++++ elfutils-0.122/libelf/gelf_update_dyn.c
 @@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -591,8 +575,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_update_lib.c
-+++ elfutils-0.120/libelf/gelf_update_lib.c
+--- elfutils-0.122/libelf/gelf_update_lib.c
++++ elfutils-0.122/libelf/gelf_update_lib.c
 @@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -616,8 +600,8 @@
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
---- elfutils-0.120/libelf/gelf_update_move.c
-+++ elfutils-0.120/libelf/gelf_update_move.c
+--- elfutils-0.122/libelf/gelf_update_move.c
++++ elfutils-0.122/libelf/gelf_update_move.c
 @@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
    assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
  
@@ -627,8 +611,8 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.120/libelf/gelf_update_rela.c
-+++ elfutils-0.120/libelf/gelf_update_rela.c
+--- elfutils-0.122/libelf/gelf_update_rela.c
++++ elfutils-0.122/libelf/gelf_update_rela.c
 @@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
    if (dst == NULL)
      return 0;
@@ -662,8 +646,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_update_rel.c
-+++ elfutils-0.120/libelf/gelf_update_rel.c
+--- elfutils-0.122/libelf/gelf_update_rel.c
++++ elfutils-0.122/libelf/gelf_update_rel.c
 @@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
    if (dst == NULL)
      return 0;
@@ -697,8 +681,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_update_sym.c
-+++ elfutils-0.120/libelf/gelf_update_sym.c
+--- elfutils-0.122/libelf/gelf_update_sym.c
++++ elfutils-0.122/libelf/gelf_update_sym.c
 @@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -732,8 +716,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_update_syminfo.c
-+++ elfutils-0.120/libelf/gelf_update_syminfo.c
+--- elfutils-0.122/libelf/gelf_update_syminfo.c
++++ elfutils-0.122/libelf/gelf_update_syminfo.c
 @@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
    if (data == NULL)
      return 0;
@@ -757,8 +741,8 @@
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
---- elfutils-0.120/libelf/gelf_update_symshndx.c
-+++ elfutils-0.120/libelf/gelf_update_symshndx.c
+--- elfutils-0.122/libelf/gelf_update_symshndx.c
++++ elfutils-0.122/libelf/gelf_update_symshndx.c
 @@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
    if (symdata == NULL)
      return 0;
@@ -792,8 +776,8 @@
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
---- elfutils-0.120/libelf/gelf_update_versym.c
-+++ elfutils-0.120/libelf/gelf_update_versym.c
+--- elfutils-0.122/libelf/gelf_update_versym.c
++++ elfutils-0.122/libelf/gelf_update_versym.c
 @@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
    assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
  
@@ -803,11 +787,11 @@
        || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
---- elfutils-0.120/libelf/libelfP.h
-+++ elfutils-0.120/libelf/libelfP.h
-@@ -569,4 +569,13 @@ extern uint32_t __libelf_crc32 (uint32_t
+--- elfutils-0.122/libelf/libelfP.h
++++ elfutils-0.122/libelf/libelfP.h
+@@ -558,4 +558,13 @@ extern uint32_t __libelf_crc32 (uint32_t
+       }									      \
    } while (0)
- #endif
  
 +/* Convenience macro.  Assumes int NDX and TYPE with size at least
 +   2 bytes.  */
@@ -819,8 +803,8 @@
 +#endif
 +
  #endif  /* libelfP.h */
---- elfutils-0.120/src/elflint.c
-+++ elfutils-0.120/src/elflint.c
+--- elfutils-0.122/src/elflint.c
++++ elfutils-0.122/src/elflint.c
 @@ -123,6 +123,9 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
@@ -892,16 +876,21 @@
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -970,7 +980,7 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -968,9 +978,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+     {
+       GElf_Shdr rcshdr_mem;
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
-       assert (rcshdr != NULL);
+-      assert (rcshdr != NULL);
  
 -      if (rcshdr->sh_type == SHT_DYNAMIC)
++      if (rcshdr == NULL)
++	break;
++
 +      if (rcshdr->sh_type == SHT_DYNAMIC && rcshdr->sh_entsize)
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -980,14 +990,17 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -980,7 +992,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -912,16 +901,18 @@
  
  	      if (dyn->d_tag == DT_RELCOUNT)
  		{
- 		  /* Found it.  One last check: does the number
- 		     specified number of relative relocations exceed
- 		     the total number of relocations?  */
--		  if (dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)
-+		  if (shdr->sh_entsize
-+		      && dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)
- 		    ERROR (gettext ("\
+@@ -994,7 +1008,9 @@ section [%2d] '%s': DT_RELCOUNT used for
+ 		      /* Does the number specified number of relative
+ 			 relocations exceed the total number of
+ 			 relocations?  */
+-		      if (dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)
++		      if (shdr->sh_entsize != 0
++			  && dyn->d_un.d_val > (shdr->sh_size
++						/ shdr->sh_entsize))
+ 			ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
- 			   idx, section_name (ebl, idx),
-@@ -1062,7 +1075,8 @@ section [%2d] '%s': no relocations for m
+ 			       idx, section_name (ebl, idx),
+@@ -1154,7 +1170,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -931,7 +922,7 @@
      ERROR (gettext (reltype == ELF_T_RELA ? "\
  section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
  section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
-@@ -1280,7 +1294,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
+@@ -1376,7 +1393,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -941,7 +932,7 @@
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1330,7 +1345,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
+@@ -1426,7 +1444,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -951,7 +942,7 @@
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1432,7 +1448,8 @@ section [%2d] '%s': referenced as string
+@@ -1528,7 +1547,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -961,7 +952,7 @@
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1442,7 +1459,7 @@ section [%2d] '%s': section entry size d
+@@ -1538,7 +1558,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -970,7 +961,7 @@
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1633,6 +1650,8 @@ section [%2d] '%s': entry size does not 
+@@ -1756,6 +1776,8 @@ section [%2d] '%s': entry size does not 
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -979,7 +970,7 @@
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1659,6 +1678,12 @@ section [%2d] '%s': extended section ind
+@@ -1782,6 +1804,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -992,41 +983,95 @@
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1739,23 +1764,30 @@ section [%2d] '%s': hash table section i
- 	   idx, section_name (ebl, idx), (long int) shdr->sh_size,
- 	   (long int) ((2 + nbucket + nchain) * shdr->sh_entsize));
+@@ -1824,7 +1852,7 @@ section [%2d] '%s': hash table section i
+ 
+   size_t maxidx = nchain;
  
 -  if (symshdr != NULL)
-+  if (symshdr != NULL && symshdr->sh_entsize)
++  if (symshdr != NULL && symshdr->sh_entsize != 0)
      {
        size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
-       size_t cnt;
-+      Elf32_Word *buf, *end;
  
-       if (nchain < symshdr->sh_size / symshdr->sh_entsize)
- 	ERROR (gettext ("section [%2d] '%s': chain array not large enough\n"),
- 	       idx, section_name (ebl, idx));
- 
-+      buf = ((Elf32_Word *) data->d_buf) + 2;
-+      end = (Elf32_Word *) ((char *) data->d_buf + shdr->sh_size);
-       for (cnt = 2; cnt < 2 + nbucket; ++cnt)
--	if (((Elf32_Word *) data->d_buf)[cnt] >= symsize)
-+	if (buf >= end)
-+	  return;
-+	else if (*buf++ >= symsize)
- 	  ERROR (gettext ("\
+@@ -1835,18 +1863,28 @@ section [%2d] '%s': hash table section i
+       maxidx = symsize;
+     }
+ 
++  Elf32_Word *buf = (Elf32_Word *) data->d_buf;
++  Elf32_Word *end = (Elf32_Word *) ((char *) data->d_buf + shdr->sh_size);
+   size_t cnt;
+   for (cnt = 2; cnt < 2 + nbucket; ++cnt)
+-    if (((Elf32_Word *) data->d_buf)[cnt] >= maxidx)
+-      ERROR (gettext ("\
++    {
++      if (buf + cnt >= end)
++	break;
++      else if (buf[cnt] >= maxidx)
++	ERROR (gettext ("\
  section [%2d] '%s': hash bucket reference %zu out of bounds\n"),
- 		 idx, section_name (ebl, idx), cnt - 2);
+-	     idx, section_name (ebl, idx), cnt - 2);
++	       idx, section_name (ebl, idx), cnt - 2);
++    }
  
-       for (; cnt < 2 + nbucket + nchain; ++cnt)
--	if (((Elf32_Word *) data->d_buf)[cnt] >= symsize)
-+	if (buf >= end)
-+	  return;
-+	else if (*buf++ >= symsize)
- 	  ERROR (gettext ("\
+   for (; cnt < 2 + nbucket + nchain; ++cnt)
+-    if (((Elf32_Word *) data->d_buf)[cnt] >= maxidx)
+-      ERROR (gettext ("\
++    {
++      if (buf + cnt >= end)
++	break;
++      else if (buf[cnt] >= maxidx)
++	ERROR (gettext ("\
  section [%2d] '%s': hash chain reference %zu out of bounds\n"),
- 		 idx, section_name (ebl, idx), cnt - 2 - nbucket);
-@@ -2097,8 +2129,9 @@ section [%2d] '%s' refers in sh_link to 
+-	     idx, section_name (ebl, idx), cnt - 2 - nbucket);
++	       idx, section_name (ebl, idx), cnt - 2 - nbucket);
++    }
+ }
+ 
+ 
+@@ -1876,18 +1914,28 @@ section [%2d] '%s': hash table section i
+       maxidx = symsize;
+     }
+ 
++  Elf64_Xword *buf = (Elf64_Xword *) data->d_buf;
++  Elf64_Xword *end = (Elf64_Xword *) ((char *) data->d_buf + shdr->sh_size);
+   size_t cnt;
+   for (cnt = 2; cnt < 2 + nbucket; ++cnt)
+-    if (((Elf64_Xword *) data->d_buf)[cnt] >= maxidx)
+-      ERROR (gettext ("\
++    {
++      if (buf + cnt >= end)
++	break;
++      else if (buf[cnt] >= maxidx)
++	ERROR (gettext ("\
+ section [%2d] '%s': hash bucket reference %zu out of bounds\n"),
+-	     idx, section_name (ebl, idx), cnt - 2);
++	       idx, section_name (ebl, idx), cnt - 2);
++    }
+ 
+   for (; cnt < 2 + nbucket + nchain; ++cnt)
+-    if (((Elf64_Xword *) data->d_buf)[cnt] >= maxidx)
+-      ERROR (gettext ("\
++    {
++      if (buf + cnt >= end)
++	break;
++      else if (buf[cnt] >= maxidx)
++	ERROR (gettext ("\
+ section [%2d] '%s': hash chain reference %" PRIu64 " out of bounds\n"),
+-	     idx, section_name (ebl, idx), (uint64_t) (cnt - 2 - nbucket));
++	       idx, section_name (ebl, idx), (uint64_t) cnt - 2 - nbucket);
++    }
+ }
+ 
+ 
+@@ -1912,7 +1960,7 @@ section [%2d] '%s': bitmask size not pow
+   if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
+     {
+       ERROR (gettext ("\
+-section [%2d] '%s': hash table section is too small (is %ld, expected at least%ld)\n"),
++section [%2d] '%s': hash table section is too small (is %ld, expected at least %ld)\n"),
+ 	     idx, section_name (ebl, idx), (long int) shdr->sh_size,
+ 	     (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
+       return;
+@@ -2430,8 +2478,9 @@ section [%2d] '%s' refers in sh_link to 
  
    /* The number of elements in the version symbol table must be the
       same as the number of symbols.  */
@@ -1038,7 +1083,7 @@
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
-@@ -3002,6 +3035,8 @@ phdr[%d]: no note entries defined for th
+@@ -3336,6 +3385,8 @@ phdr[%d]: no note entries defined for th
      return;
  
    char *notemem = gelf_rawchunk (ebl->elf, phdr->p_offset, phdr->p_filesz);
@@ -1047,8 +1092,8 @@
  
    /* ELF64 files often use note section entries in the 32-bit format.
       The p_align field is set to 8 in case the 64-bit format is used.
---- elfutils-0.120/src/readelf.c
-+++ elfutils-0.120/src/readelf.c
+--- elfutils-0.122/src/readelf.c
++++ elfutils-0.122/src/readelf.c
 @@ -958,6 +958,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
@@ -1213,38 +1258,37 @@
  
    /* Now we can finally look at the actual contents of this section.  */
    for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
-@@ -2353,7 +2375,17 @@ handle_hash (Ebl *ebl)
- 	  Elf32_Word *bucket = &((Elf32_Word *) data->d_buf)[2];
- 	  Elf32_Word *chain = &((Elf32_Word *) data->d_buf)[2 + nbucket];
- 
--	  GElf_Shdr glink;
-+ 	  GElf_Shdr glink_mem;
-+ 	  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf,
-+						       shdr->sh_link),
-+					   &glink_mem);
-+ 	  if (glink == NULL)
-+ 	    {
-+ 	      error (0, 0, gettext ("invalid sh_link value in section %Zu"),
-+ 		     elf_ndxscn (scn));
-+ 	      continue;
-+ 	    }
+@@ -2330,7 +2352,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+   for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
+     ++counts[lengths[cnt]];
+ 
+-  GElf_Shdr glink;
++  GElf_Shdr glink_mem;
++  GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf,
++					       shdr->sh_link),
++				   &glink_mem);
++  if (glink == NULL)
++    {
++      error (0, 0, gettext ("invalid sh_link value in section %Zu"),
++	     elf_ndxscn (scn));
++      return;
++    }
 +
- 	  printf (ngettext ("\
+   printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
- 			    "\
-@@ -2366,10 +2398,7 @@ handle_hash (Ebl *ebl)
- 		  shdr->sh_addr,
- 		  shdr->sh_offset,
- 		  (unsigned int) shdr->sh_link,
--		  elf_strptr (ebl->elf, shstrndx,
--			      gelf_getshdr (elf_getscn (ebl->elf,
--							shdr->sh_link),
--					    &glink)->sh_name));
-+		  elf_strptr (ebl->elf, shstrndx, glink->sh_name));
- 
- 	  uint32_t *lengths = (uint32_t *) xcalloc (nbucket,
- 						    sizeof (uint32_t));
-@@ -3510,6 +3539,16 @@ print_debug_aranges_section (Ebl *ebl __
+ 		    "\
+@@ -2343,9 +2375,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+ 	  shdr->sh_addr,
+ 	  shdr->sh_offset,
+ 	  (unsigned int) shdr->sh_link,
+-	  elf_strptr (ebl->elf, shstrndx,
+-		      gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+-				    &glink)->sh_name));
++	  elf_strptr (ebl->elf, shstrndx, glink->sh_name));
+ 
+   if (extrastr != NULL)
+     fputs (extrastr, stdout);
+@@ -3654,6 +3684,16 @@ print_debug_aranges_section (Ebl *ebl __
        return;
      }
  
@@ -1261,8 +1305,8 @@
    printf (ngettext ("\
  \nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
---- elfutils-0.120/src/strip.c
-+++ elfutils-0.120/src/strip.c
+--- elfutils-0.122/src/strip.c
++++ elfutils-0.122/src/strip.c
 @@ -412,6 +412,7 @@ handle_elf (int fd, Elf *elf, const char
    Elf_Data debuglink_crc_data;
    bool any_symtab_changes = false;
@@ -1322,10 +1366,9 @@
  	  for (inner = 1;
  	       inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
  	       ++inner)
--	    shdr_info[grpref[inner]].group_idx = cnt;
 +	    {
 +	      if (grpref[inner] < shnum)
-+		shdr_info[grpref[inner]].group_idx = cnt;
+ 	    shdr_info[grpref[inner]].group_idx = cnt;
 +	      else
 +		goto illformed;
 +	    }
@@ -1350,25 +1393,24 @@
  
  	  if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
  	    {
-@@ -708,10 +722,14 @@ handle_elf (int fd, Elf *elf, const char
+@@ -708,11 +722,15 @@ handle_elf (int fd, Elf *elf, const char
  	    {
  	      /* If a relocation section is marked as being removed make
  		 sure the section it is relocating is removed, too.  */
 -	      if ((shdr_info[cnt].shdr.sh_type == SHT_REL
--		   || shdr_info[cnt].shdr.sh_type == SHT_RELA)
--		  && shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)
--		shdr_info[cnt].idx = 1;
 +	      if (shdr_info[cnt].shdr.sh_type == SHT_REL
-+		  || shdr_info[cnt].shdr.sh_type == SHT_RELA)
+ 		   || shdr_info[cnt].shdr.sh_type == SHT_RELA)
+-		  && shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)
 +		{
 +		  if (shdr_info[cnt].shdr.sh_info >= shnum)
 +		    goto illformed;
 +		  else if (shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)
-+		    shdr_info[cnt].idx = 1;
-+		}
+ 		shdr_info[cnt].idx = 1;
  	    }
++	    }
  
  	  if (shdr_info[cnt].idx == 1)
+ 	    {
 @@ -737,7 +755,7 @@ handle_elf (int fd, Elf *elf, const char
  		  if (shdr_info[cnt].symtab_idx != 0
  		      && shdr_info[shdr_info[cnt].symtab_idx].data == NULL)
@@ -1388,26 +1430,25 @@
  		      if (shdr_info[scnidx].idx == 0)
  			{
  			  /* Mark this section as used.  */
-@@ -808,11 +829,15 @@ handle_elf (int fd, Elf *elf, const char
+@@ -808,12 +829,16 @@ handle_elf (int fd, Elf *elf, const char
  		}
  
  	      /* Handle references through sh_info.  */
 -	      if (SH_INFO_LINK_P (&shdr_info[cnt].shdr)
 -		  && shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)
 +	      if (SH_INFO_LINK_P (&shdr_info[cnt].shdr))
- 		{
--		  shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;
--		  changes |= shdr_info[cnt].shdr.sh_info < cnt;
++		{
 +		  if (shdr_info[cnt].shdr.sh_info >= shnum)
 +		    goto illformed;
 +		  else if ( shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)
-+		    {
-+		      shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;
-+		      changes |= shdr_info[cnt].shdr.sh_info < cnt;
-+		    }
+ 		{
+ 		  shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;
+ 		  changes |= shdr_info[cnt].shdr.sh_info < cnt;
  		}
++		}
  
  	      /* Mark the section as investigated.  */
+ 	      shdr_info[cnt].idx = 2;
 @@ -912,7 +937,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
@@ -1444,14 +1485,13 @@
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1095,21 +1120,21 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1095,20 +1120,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
 -		    assert ((versiondata->d_size / sizeof (Elf32_Word))
--			    >= shdr_info[cnt].data->d_size / elsize);
 +		    elf_assert ((versiondata->d_size / sizeof (Elf32_Word))
-+				>= shdr_info[cnt].data->d_size / elsize);
+ 			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
  		if (shdr_info[cnt].version_idx != 0)
@@ -1465,12 +1505,10 @@
  					       NULL);
  
 -		    assert ((versiondata->d_size / sizeof (GElf_Versym))
--			    >= shdr_info[cnt].data->d_size / elsize);
 +		    elf_assert ((versiondata->d_size / sizeof (GElf_Versym))
-+				>= shdr_info[cnt].data->d_size / elsize);
+ 			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
- 		shdr_info[cnt].newsymidx
 @@ -1163,7 +1188,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
@@ -1512,17 +1550,15 @@
  		      size_t hidx = elf_hash (name) % nbucket;
  
  		      if (bucket[hidx] == 0)
-@@ -1394,8 +1419,8 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1394,7 +1419,7 @@ handle_elf (int fd, Elf *elf, const char
  	      else
  		{
  		  /* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
 -		  assert (shdr_info[cnt].shdr.sh_entsize
--			  == sizeof (Elf64_Xword));
 +		  elf_assert (shdr_info[cnt].shdr.sh_entsize
-+			      == sizeof (Elf64_Xword));
+ 			  == sizeof (Elf64_Xword));
  
  		  Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
- 
 @@ -1428,11 +1453,11 @@ handle_elf (int fd, Elf *elf, const char
  		    {
  		      GElf_Sym sym_mem;


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- elfutils.spec	12 Jul 2006 21:25:03 -0000	1.68
+++ elfutils.spec	12 Jul 2006 22:08:26 -0000	1.69
@@ -1,5 +1,5 @@
-%define version 0.122
-%define release 1
+%define eu_version 0.122
+%define eu_release 1
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -9,11 +9,11 @@
 
 Summary: A collection of utilities and DSOs to handle compiled objects.
 Name: elfutils
-Version: %{version}
+Version: %{eu_version}
 %if !%{compat}
-Release: %{release}
+Release: %{eu_release}%{?dist}
 %else
-Release: 0.%{release}.1
+Release: 0.%{eu_release}.1
 %endif
 License: GPL
 Group: Development/Tools



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:08:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:08:50 -0400
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.31, 1.32
Message-ID: <200607122208.k6CM8oEI016120@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15928

Modified Files:
	device-mapper-multipath.spec 
Log Message:
added ncurses-devel to BuildRequires



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- device-mapper-multipath.spec	12 Jul 2006 20:53:39 -0000	1.31
+++ device-mapper-multipath.spec	12 Jul 2006 22:08:47 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 3.0
+Release: 3.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -11,7 +11,7 @@
 Prereq: chkconfig
 BuildRequires: libsysfs-devel, device-mapper >= 1.02.02-2
 BuildRequires: libselinux-devel, libsepol-devel
-BuildRequires: readline-devel
+BuildRequires: readline-devel, ncurses-devel
 
 %description
 %{name} provides tools to manage multipath devices by instructing the 
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Wed Jul 12 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-3.1
+- Added ncurses-devel to BuildRequires
+
 * Wed Jul 12 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-3.0
 - Updated to latest source. deals with change in libsysfs API
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:10:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:10:17 -0400
Subject: rpms/evolution/devel .cvsignore, 1.50,
	1.51 evolution-2.7.3-candidate-window-position-calendar.patch,
	1.1, 1.2 evolution.spec, 1.163, 1.164 sources, 1.50,
	1.51 evolution-2.7.3-mailing-list-menu.patch, 1.1,
	NONE evolution-2.7.3-no-boolean-in-schemas.patch, 1.1, NONE
Message-ID: <200607122210.k6CMAH1Y016735@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore 
	evolution-2.7.3-candidate-window-position-calendar.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.7.3-mailing-list-menu.patch 
	evolution-2.7.3-no-boolean-in-schemas.patch 
Log Message:
- Update to 2.7.4
- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
- Remove patch for Gnome.org bug #345677 (fixed upstream).
- Remove patch for RH bug #175596 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	13 Jun 2006 20:11:28 -0000	1.50
+++ .cvsignore	12 Jul 2006 22:10:15 -0000	1.51
@@ -1 +1 @@
-evolution-2.7.3.tar.bz2
+evolution-2.7.4.tar.bz2

evolution-2.7.3-candidate-window-position-calendar.patch:
 e-text.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 e-text.h |    6 ++++-
 2 files changed, 74 insertions(+), 4 deletions(-)

Index: evolution-2.7.3-candidate-window-position-calendar.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.3-candidate-window-position-calendar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.3-candidate-window-position-calendar.patch	30 Jun 2006 14:59:13 -0000	1.1
+++ evolution-2.7.3-candidate-window-position-calendar.patch	12 Jul 2006 22:10:15 -0000	1.2
@@ -1,7 +1,6 @@
-diff -uNrp evolution.orig/widgets/text/e-text.c evolution/widgets/text/e-text.c
---- evolution.orig/widgets/text/e-text.c	2006-06-20 18:52:39.000000000 +0530
-+++ evolution/widgets/text/e-text.c	2006-06-20 18:58:17.000000000 +0530
-@@ -132,6 +132,11 @@ static void e_text_insert(EText *text, c
+--- evolution-2.7.4/widgets/text/e-text.c.candidate-window-position-calendar	2006-07-10 11:13:56.000000000 -0400
++++ evolution-2.7.4/widgets/text/e-text.c	2006-07-12 09:17:18.000000000 -0400
+@@ -132,6 +132,11 @@
  
  static void reset_layout_attrs (EText *text);
  
@@ -13,7 +12,7 @@
  #if 0
  /* GtkEditable Methods */
  static void e_text_editable_do_insert_text (GtkEditable    *editable,
-@@ -324,6 +329,9 @@ insert_preedit_text (EText *text)
+@@ -325,6 +330,9 @@
  			pango_layout_set_attributes (text->layout, attrs);
  			pango_attr_list_unref (attrs);
  		}
@@ -23,7 +22,7 @@
  	}
  
  	if (preedit_string)
-@@ -2195,6 +2203,8 @@ e_text_event (GnomeCanvasItem *item, Gdk
+@@ -2196,6 +2204,8 @@
  			   	 * handlers connect to  multiple e-texts but with subsequent commit these 
  				 * should go away.
  				 */
@@ -32,7 +31,7 @@
  
  				if (save_text && save_text->im_context) {
  					g_signal_handlers_disconnect_matched (save_text->im_context,
-@@ -3721,6 +3731,8 @@ e_text_init (EText *text)
+@@ -3722,6 +3732,8 @@
  	text->text                    = e_text_model_get_text (text->model);
  	text->preedit_len	      = 0;
  	text->layout                  = NULL;
@@ -41,27 +40,26 @@
  
  	text->revert                  = NULL;
  
-@@ -3842,11 +3854,16 @@ e_text_preedit_changed_cb (GtkIMContext 
+@@ -3843,11 +3855,15 @@
  				EText        *etext)
  {
  	gchar *preedit_string = NULL;
-+	gint cursor_pos;
++        gint cursor_pos;
  
 -	gtk_im_context_get_preedit_string (context, &preedit_string, 
 -					NULL, NULL);
 -
-+	/* get the cursor position for the preedit string */
-+	gtk_im_context_get_preedit_string (context, &preedit_string, NULL, &cursor_pos);
++        /* get the cursor position for the preedit string */
++        gtk_im_context_get_preedit_string (
++                context, &preedit_string, NULL, &cursor_pos);
  	etext->preedit_len = strlen (preedit_string);
-+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
-+	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
-+	
-+	if(preedit_string)
-+		g_free (preedit_string);
++        cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
++        etext->preedit_pos = g_utf8_offset_to_pointer (
++                preedit_string, cursor_pos) - preedit_string;
+ 	g_free (preedit_string);
  
  	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
- }
-@@ -3875,3 +3892,53 @@ e_text_delete_surrounding_cb   (GtkIMCon
+@@ -3877,3 +3893,53 @@
  
  	return TRUE;
  }
@@ -115,10 +113,9 @@
 +	e_text_get_cursor_locations (text, &area, NULL);
 +	gtk_im_context_set_cursor_location (text->im_context, &area);
 +}
-diff -uNrp evolution.orig/widgets/text/e-text.h evolution/widgets/text/e-text.h
---- evolution.orig/widgets/text/e-text.h	2006-06-20 18:46:54.000000000 +0530
-+++ evolution/widgets/text/e-text.h	2006-06-20 18:46:07.000000000 +0530
-@@ -107,8 +107,12 @@ struct _EText {
+--- evolution-2.7.4/widgets/text/e-text.h.candidate-window-position-calendar	2005-06-23 05:11:11.000000000 -0400
++++ evolution-2.7.4/widgets/text/e-text.h	2006-07-12 09:13:15.000000000 -0400
+@@ -107,8 +107,12 @@
  	gint model_changed_signal_id;
  	gint model_repos_signal_id;
  


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- evolution.spec	12 Jul 2006 05:46:29 -0000	1.163
+++ evolution.spec	12 Jul 2006 22:10:15 -0000	1.164
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.3
-Release: 10.1
+Version: 2.7.4
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -67,7 +67,6 @@
 
 # patches sent upstream
 Patch100: evo-addressbook-print-with-pango-2.patch
-Patch101: evo-calendar-print-with-pango-7.patch
 
 #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
@@ -116,26 +115,20 @@
 # Gnome.org #343331
 Patch900: evolution-2.7.2.1-quit-resize-crash.patch
 
-# Gnome.org #345677 - fixed upstream
-Patch901: evolution-2.7.3-no-boolean-in-schemas.patch
-
 # RH bug #157400 / Gnome.org bug #303877
-Patch902: evolution-2.7.3-candidate-window-position-task.patch
+Patch901: evolution-2.7.3-candidate-window-position-task.patch
 
 # RH bug #157505 / Gnome.org bug #303878
-Patch903: evolution-2.7.3-candidate-window-position-calendar.patch
+Patch902: evolution-2.7.3-candidate-window-position-calendar.patch
 
 # RH bug #190359 / Gnome.org bug #211058
-Patch904: evolution-2.7.3-filter-datespec.patch
-
-# RH bug #175596 / Gnome.org bug #323952
-Patch905: evolution-2.7.3-mailing-list-menu.patch
+Patch903: evolution-2.7.3-filter-datespec.patch
 
 # RH bug #166231 / Gnome.org bug #264485
-Patch906: evolution-2.7.3-replicated-cjk-input.patch
+Patch904: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #197834 / Gnome.org bug #346797
-Patch907: evolution-2.7.3-submit-bug-report.patch
+Patch905: evolution-2.7.3-submit-bug-report.patch
 
 ### Dependencies ###
 
@@ -264,7 +257,7 @@
 
 # patches sent upstream
 #%patch100 -p0 -b .addressbook-print-with-pango
-%patch101 -p1 -b .calendar-print-with-pango
+#%patch101 -p1 -b .calendar-print-with-pango
 
 %patch106 -p1 -b .commit-enter-on-calendar
 %patch107 -p1 -b .move-autosave-file
@@ -289,13 +282,11 @@
 # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain at redhat.com
 
 %patch900 -p1 -b .quit-resize-crash
-%patch901 -p1 -b .no-boolean-in-schemas
-%patch902 -p1 -b .candidate-window-position-task
-%patch903 -p1 -b .candidate-window-position-calendar
-%patch904 -p1 -b .filter-datespec
-%patch905 -p1 -b .mailing-list-menu
-%patch906 -p1 -b .replicated-cjk-input
-%patch907 -p1 -b .submit-bug-report
+%patch901 -p1 -b .candidate-window-position-task
+%patch902 -p1 -b .candidate-window-position-calendar
+%patch903 -p1 -b .filter-datespec
+%patch904 -p1 -b .replicated-cjk-input
+%patch905 -p1 -b .submit-bug-report
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -686,6 +677,12 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
+- Update to 2.7.4
+- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
+- Remove patch for Gnome.org bug #345677 (fixed upstream).
+- Remove patch for RH bug #175596 (fixed upstream).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-10.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	13 Jun 2006 20:11:29 -0000	1.50
+++ sources	12 Jul 2006 22:10:15 -0000	1.51
@@ -1 +1 @@
-e6f155e9c5d5a11ff61ef364752af6a9  evolution-2.7.3.tar.bz2
+5d9770b3d86953e8edcd36ec9f9b8852  evolution-2.7.4.tar.bz2


--- evolution-2.7.3-mailing-list-menu.patch DELETED ---


--- evolution-2.7.3-no-boolean-in-schemas.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:14:13 -0400
Subject: rpms/foomatic/devel foomatic.spec,1.138,1.139
Message-ID: <200607122214.k6CMEDpV018305@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18273

Modified Files:
	foomatic.spec 
Log Message:
- buildrequires autoconf, automake


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- foomatic.spec	12 Jul 2006 05:51:04 -0000	1.138
+++ foomatic.spec	12 Jul 2006 22:14:11 -0000	1.139
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release:    36.1
+Release:    37
 License:	GPL
 Group: System Environment/Libraries
 
@@ -58,6 +58,7 @@
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	libxml2-devel
 BuildRequires:	ghostscript-devel
+BuildRequires:	autoconf, automake
 Requires:	perl >= 3:5.8.1
 Requires:	%(eval `perl -V:version`; echo "perl(:MODULE_COMPAT_$version)")
 BuildRoot:	%_tmppath/%name-%version-%release-root
@@ -273,6 +274,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Thu Jul 13 2006 Karsten Hopp <karsten at redhat.de> 3.0.2-37
+- buildrequires autoconf, automake
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-36.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:14:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:14:30 -0400
Subject: rpms/coreutils/FC-5 coreutils.spec,1.114,1.115
Message-ID: <200607122214.k6CMEUJ4018456@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils.spec 
Log Message:
* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.3
- Build requires libacl-devel (bug #198662).



Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- coreutils.spec	5 Jun 2006 12:55:28 -0000	1.114
+++ coreutils.spec	12 Jul 2006 22:14:27 -0000	1.115
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.96
-Release: 1.2
+Release: 1.3
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -51,6 +51,7 @@
 %{?!nopam:BuildRequires: pam-devel}
 BuildRequires:	texinfo >= 4.3
 BuildRequires: autoconf >= 2.58, automake >= 1.8
+BuildRequires: libacl-devel
 Prereq:		/sbin/install-info
 %{?!nopam:Requires: pam >= 0.66-12}
 Prereq: grep, findutils
@@ -267,6 +268,9 @@
 /sbin/runuser
 
 %changelog
+* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.3
+- Build requires libacl-devel (bug #198662).
+
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.2
 - Fixed Polish translation.
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:18:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:18:03 -0400
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.65,1.66
Message-ID: <200607122218.k6CMI3FN002031@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1981

Modified Files:
	gtkhtml3.spec 
Log Message:
Rebuild



Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gtkhtml3.spec	12 Jul 2006 11:38:05 -0000	1.65
+++ gtkhtml3.spec	12 Jul 2006 22:18:00 -0000	1.66
@@ -6,7 +6,7 @@
 
 Name: gtkhtml3
 Version: 3.11.4
-Release: 1
+Release: 2
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 3.11.4-2
+- Rebuild
+
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.4-1
 - Update to 3.11.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:18:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:18:21 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.44,1.45
Message-ID: <200607122218.k6CMILhK002173@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2148

Modified Files:
	gthumb.spec 
Log Message:
fix missing br


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gthumb.spec	12 Jul 2006 06:15:43 -0000	1.44
+++ gthumb.spec	12 Jul 2006 22:18:19 -0000	1.45
@@ -10,7 +10,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.7.7
-Release: 2.1
+Release: 3
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -29,7 +29,9 @@
 BuildRequires: gphoto2-devel >= %{gphoto_version}
 
 # Needed or features are missing
+%ifnarch s390 s390x
 BuildRequires: gphoto2-devel
+%endif
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
@@ -109,8 +111,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.7-2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.7-3
 - rebuild
+- Don't get gphoto2 on s390(x)
 
 * Mon May 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-2  
 - Update to 2.7.7  



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:24:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:24:05 -0400
Subject: rpms/openCryptoki/devel openCryptoki.spec,1.24,1.25
Message-ID: <200607122224.k6CMO5o5004344@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openCryptoki/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4315

Modified Files:
	openCryptoki.spec 
Log Message:
fix missing br


Index: openCryptoki.spec
===================================================================
RCS file: /cvs/dist/rpms/openCryptoki/devel/openCryptoki.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openCryptoki.spec	12 Jul 2006 07:33:02 -0000	1.24
+++ openCryptoki.spec	12 Jul 2006 22:24:02 -0000	1.25
@@ -1,7 +1,7 @@
 Name: openCryptoki
 Summary: Implementation of Cryptoki v2.11 for IBM Crypto Hardware
 Version: 2.2.4
-Release: 1.1
+Release: 2
 License: Other License(s), see package
 Group: Productivity/Security
 Source: opencryptoki-%{version}.tar.bz2
@@ -9,7 +9,7 @@
 Url: http://oss.software.ibm.com/developerworks/opensource/opencryptoki
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 PreReq: shadow-utils coreutils sed
-BuildPreReq: openssl-devel >= 0.9.8a-5
+BuildRequires: openssl-devel >= 0.9.8a-5, automake
 ExclusiveArch: s390 s390x
 %ifarch s390x
 Requires: PKCS11_API.so PKCS11_ICA.so  
@@ -81,8 +81,9 @@
 %{_libdir}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.4-1.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.4-2
 - rebuild
+- Add missing br automake
 
 * Fri May 12 2006 Phil Knirsch <pknirsch at redhat.com> - 2.2.4-1
 - Updated to opencryptoki-2.2.4 (#184631)



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:25:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:25:41 -0400
Subject: rpms/evolution-connector/devel .cvsignore, 1.34,
	1.35 evolution-connector.spec, 1.67, 1.68 sources, 1.34, 1.35
Message-ID: <200607122225.k6CMPfGv004995@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
- Update to 2.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	14 Jun 2006 13:07:56 -0000	1.34
+++ .cvsignore	12 Jul 2006 22:25:38 -0000	1.35
@@ -1,2 +1 @@
-evolution-exchange-2.7.3.tar.bz2
-evolution-exchange-2.7.2.tar.bz2
+evolution-exchange-2.7.4.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- evolution-connector.spec	12 Jul 2006 05:46:41 -0000	1.67
+++ evolution-connector.spec	12 Jul 2006 22:25:38 -0000	1.68
@@ -17,15 +17,15 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.7.3
-Release: 2.1
+Version: 2.7.4
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
 URL: http://www.gnome.org/projects/evolution/
 Source: evolution-exchange-%{version}.tar.bz2
 # 2.7.3 shipped without translations...
-Source1: evolution-exchange-2.7.2.tar.bz2
+#Source1: evolution-exchange-2.7.2.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 ### Dependencies ###
@@ -74,8 +74,8 @@
 %setup -q -n evolution-exchange-%{version}
 
 # 2.7.3 shipped without translations
-tar xjf %{SOURCE1}
-cp -f evolution-exchange-2.7.2/po/* po
+#tar xjf %{SOURCE1}
+#cp -f evolution-exchange-2.7.2/po/* po
 
 %patch100 -p1 -b .64bit-fix-acinclude.m4
 %patch101 -p1 -b .fix-marshaller
@@ -134,6 +134,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
+- Update to 2.7.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	14 Jun 2006 13:07:56 -0000	1.34
+++ sources	12 Jul 2006 22:25:38 -0000	1.35
@@ -1,2 +1 @@
-5b87e7d205a32ee0577330fc05a7d630  evolution-exchange-2.7.3.tar.bz2
-a9081da7513ff1438821e8e739462cb6  evolution-exchange-2.7.2.tar.bz2
+cf94c6e264fc857afdb205c6f4f5a86e  evolution-exchange-2.7.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:27:33 -0400
Subject: rpms/cman/devel .cvsignore, 1.8, 1.9 cman.spec, 1.50, 1.51 sources,
	1.17, 1.18
Message-ID: <200607122227.k6CMRXTG005749@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5727

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jul 2006 18:26:46 -0000	1.8
+++ .cvsignore	12 Jul 2006 22:27:31 -0000	1.9
@@ -1 +1 @@
-cman-2.0.2.tar.gz
+cman-2.0.3.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cman.spec	12 Jul 2006 04:51:06 -0000	1.50
+++ cman.spec	12 Jul 2006 22:27:31 -0000	1.51
@@ -10,11 +10,11 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.2
+%define cman_minor 0.3
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.1.1
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Jul 2006 18:26:46 -0000	1.17
+++ sources	12 Jul 2006 22:27:31 -0000	1.18
@@ -1 +1 @@
-3c1e3115cb45fdb1089a49809702229a  cman-2.0.2.tar.gz
+43ca7eef19382475017e1482b168621d  cman-2.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:33:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:33:19 -0400
Subject: rpms/coreutils/FC-5 coreutils-autoconf.patch, NONE,
	1.1 coreutils-newhashes.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 coreutils-5.2.1-runuser.patch, 1.8,
	1.9 coreutils-selinux.patch, 1.19, 1.20 coreutils.spec, 1.115,
	1.116 sources, 1.8, 1.9
Message-ID: <200607122233.k6CMXJSj007015@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore coreutils-5.2.1-runuser.patch 
	coreutils-selinux.patch coreutils.spec sources 
Added Files:
	coreutils-autoconf.patch coreutils-newhashes.patch 
Log Message:
* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1
- 5.97.  No longer need pl translation.
- Build requires libacl-devel (bug #198662).
- Include new hashes (bug #196369).  Patch from upstream.


coreutils-autoconf.patch:
 jm-macros.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE coreutils-autoconf.patch ---
--- coreutils-5.97/m4/jm-macros.m4.autoconf	2006-06-25 23:57:47.000000000 +0100
+++ coreutils-5.97/m4/jm-macros.m4	2006-06-25 23:57:53.000000000 +0100
@@ -22,7 +22,7 @@
 
 AC_DEFUN([gl_MACROS],
 [
-  AC_PREREQ(2.59d)
+  AC_PREREQ(2.59)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",

coreutils-newhashes.patch:
 AUTHORS                |    9 
 README                 |    6 
 aclocal.m4             |    2 
 configure.ac           |    8 
 lib/Makefile.am        |    1 
 lib/base64.c           |  416 ++++++++++++++++++++++++++++++++++++
 lib/base64.h           |   45 +++
 lib/md5.c              |  189 ++++++++--------
 lib/md5.h              |   52 +---
 lib/sha1.c             |   77 +++---
 lib/sha1.h             |   22 -
 lib/sha256.c           |  548 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha256.h           |   88 +++++++
 lib/sha512.c           |  559 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sha512.h           |   90 +++++++
 m4/prereq.m4           |    2 
 m4/sha256.m4           |   15 +
 m4/sha512.m4           |   15 +
 man/Makefile.am        |   10 
 man/base64.x           |    4 
 man/sha224sum.x        |    4 
 man/sha256sum.x        |    4 
 man/sha384sum.x        |    4 
 man/sha512sum.x        |    4 
 src/Makefile.am        |   20 +
 src/base64.c           |  308 ++++++++++++++++++++++++++
 src/md5sum.c           |  137 ++++++++----
 tests/misc/Makefile.am |    5 
 tests/misc/base64      |   81 +++++++
 tests/misc/sha224sum   |   45 +++
 tests/misc/sha256sum   |   51 ++++
 tests/misc/sha384sum   |   51 ++++
 tests/misc/sha512sum   |   51 ++++
 33 files changed, 2691 insertions(+), 232 deletions(-)

--- NEW FILE coreutils-newhashes.patch ---
--- coreutils-5.97/configure.ac.newhashes	2006-05-23 21:38:46.000000000 +0100
+++ coreutils-5.97/configure.ac	2006-06-25 23:50:01.000000000 +0100
@@ -305,3 +305,11 @@
   tests/wc/Makefile
   )
 AC_OUTPUT
+
+# This is a _HACK_, tests are added via. patch so they don't have +x perms.
+# we hand hack them in here...
+chmod +x $srcdir/tests/misc/base64
+chmod +x $srcdir/tests/misc/sha224sum
+chmod +x $srcdir/tests/misc/sha256sum
+chmod +x $srcdir/tests/misc/sha384sum
+chmod +x $srcdir/tests/misc/sha512sum
--- coreutils-5.97/README.newhashes	2005-09-28 19:34:26.000000000 +0100
+++ coreutils-5.97/README	2006-06-25 23:50:01.000000000 +0100
@@ -7,11 +7,13 @@
 
 The programs that can be built with this package are:
 
-  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
+  [ base64
+  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
   df dir dircolors dirname du echo env expand expr factor false fmt fold
   ginstall groups head hostid hostname id join kill link ln logname ls
   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
-  printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
+  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
+  sha256sum sha384sum sha512sum shred sleep sort
   split stat stty su sum sync tac tail tee test touch tr true tsort tty
   uname unexpand uniq unlink uptime users vdir wc who whoami yes
 
--- coreutils-5.97/src/Makefile.am.newhashes	2005-07-18 08:52:18.000000000 +0100
+++ coreutils-5.97/src/Makefile.am	2006-06-25 23:50:01.000000000 +0100
@@ -24,10 +24,12 @@
   ginstall link ln dir vdir ls mkdir \
   mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
   cat cksum comm csplit cut expand fmt fold head join md5sum \
-  nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+  nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+  sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
   hostname id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
+  base64 \
   $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
 noinst_PROGRAMS = setuidgid
@@ -37,7 +39,7 @@
   chown-core.h fs.h \
   wheel.h wheel-size.h
 EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
-  groups.sh wheel-gen.pl extract-magic
+  groups.sh wheel-gen.pl extract-magic # rand-isaac.c
 CLEANFILES = $(SCRIPTS) su
 
 AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
@@ -169,8 +171,18 @@
 mv_SOURCES = mv.c copy.c cp-hash.c remove.c
 rm_SOURCES = rm.c remove.c
 
-md5sum_SOURCES = md5sum.c md5.c
-sha1sum_SOURCES = md5sum.c sha1sum.c
+md5sum_SOURCES = md5sum.c
+md5sum_CPPFLAGS = -DHASH_ALGO_MD5=1 $(AM_CPPFLAGS)
+sha1sum_SOURCES = md5sum.c
+sha1sum_CPPFLAGS = -DHASH_ALGO_SHA1=1 $(AM_CPPFLAGS)
+sha224sum_SOURCES = md5sum.c
+sha224sum_CPPFLAGS = -DHASH_ALGO_SHA224=1 $(AM_CPPFLAGS)
+sha256sum_SOURCES = md5sum.c
+sha256sum_CPPFLAGS = -DHASH_ALGO_SHA256=1 $(AM_CPPFLAGS)
+sha384sum_SOURCES = md5sum.c
+sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS)
+sha512sum_SOURCES = md5sum.c
+sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)
 
 editpl = sed -e 's,@''PERL''@,$(PERL),g'
 
--- coreutils-5.97/src/md5sum.c.newhashes	2005-10-27 17:22:14.000000000 +0100
+++ coreutils-5.97/src/md5sum.c	2006-06-25 23:50:01.000000000 +0100
@@ -1,4 +1,4 @@
-/* Compute MD5 or SHA1 checksum of files or strings
+/* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings
    Copyright (C) 1995-2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -24,34 +24,85 @@
 
 #include "system.h"
 
-#include "md5.h"
-#include "sha1.h"
-#include "checksum.h"
+#if HASH_ALGO_MD5
+# include "md5.h"
+#endif
+#if HASH_ALGO_SHA1
+# include "sha1.h"
+#endif
+#if HASH_ALGO_SHA256 || HASH_ALGO_SHA224
+# include "sha256.h"
+#endif
+#if HASH_ALGO_SHA512 || HASH_ALGO_SHA384
+# include "sha512.h"
+#endif
 #include "getline.h"
 #include "error.h"
 #include "quote.h"
 #include "stdio--.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
-#define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "sha1sum")
+#if HASH_ALGO_MD5
+# define PROGRAM_NAME "md5sum"
+# define DIGEST_TYPE_STRING "MD5"
+# define DIGEST_STREAM md5_stream
+# define DIGEST_BUFFER md5_buffer
+# define DIGEST_BITS 128
+# define DIGEST_REFERENCE "RFC 1321"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA1
+# define PROGRAM_NAME "sha1sum"
+# define DIGEST_TYPE_STRING "SHA1"
+# define DIGEST_STREAM sha1_stream
+# define DIGEST_BUFFER sha1_buffer
+# define DIGEST_BITS 160
+# define DIGEST_REFERENCE "FIPS-180-1"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA256
+# define PROGRAM_NAME "sha256sum"
+# define DIGEST_TYPE_STRING "SHA256"
+# define DIGEST_STREAM sha256_stream
+# define DIGEST_BUFFER sha256_buffer
+# define DIGEST_BITS 256
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA224
+# define PROGRAM_NAME "sha224sum"
+# define DIGEST_TYPE_STRING "SHA224"
+# define DIGEST_STREAM sha224_stream
+# define DIGEST_BUFFER sha224_buffer
+# define DIGEST_BITS 224
+# define DIGEST_REFERENCE "RFC 3874"
+# define DIGEST_ALIGN 4
+#elif HASH_ALGO_SHA512
+# define PROGRAM_NAME "sha512sum"
+# define DIGEST_TYPE_STRING "SHA512"
+# define DIGEST_STREAM sha512_stream
+# define DIGEST_BUFFER sha512_buffer
+# define DIGEST_BITS 512
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#elif HASH_ALGO_SHA384
+# define PROGRAM_NAME "sha384sum"
+# define DIGEST_TYPE_STRING "SHA384"
+# define DIGEST_STREAM sha384_stream
+# define DIGEST_BUFFER sha384_buffer
+# define DIGEST_BITS 384
+# define DIGEST_REFERENCE "FIPS-180-2"
+# define DIGEST_ALIGN 8
+#else
+# error "Can't decide which hash algorithm to compile."
+#endif
 
-#define AUTHORS "Ulrich Drepper", "Scott Miller"
+#define DIGEST_HEX_BYTES (DIGEST_BITS / 4)
+#define DIGEST_BIN_BYTES (DIGEST_BITS / 8)
 
-
-#define DIGEST_TYPE_STRING(Alg) ((Alg) == ALG_MD5 ? "MD5" : "SHA1")
-#define DIGEST_STREAM(Alg) ((Alg) == ALG_MD5 ? md5_stream : sha1_stream)
-
-#define DIGEST_BITS(Alg) ((Alg) == ALG_MD5 ? 128 : 160)
-#define DIGEST_HEX_BYTES(Alg) (DIGEST_BITS (Alg) / 4)
-#define DIGEST_BIN_BYTES(Alg) (DIGEST_BITS (Alg) / 8)
-
-#define MAX_DIGEST_BIN_BYTES MAX (DIGEST_BIN_BYTES (ALG_MD5), \
-				  DIGEST_BIN_BYTES (ALG_SHA1))
+#define AUTHORS "Ulrich Drepper", "Scott Miller", "David Madore"
 
 /* The minimum length of a valid digest line.  This length does
    not include any newline character at the end of a line.  */
-#define MIN_DIGEST_LINE_LENGTH(Alg) \
-  (DIGEST_HEX_BYTES (Alg) /* length of hexadecimal message digest */ \
+#define MIN_DIGEST_LINE_LENGTH \
+  (DIGEST_HEX_BYTES /* length of hexadecimal message digest */ \
    + 2 /* blank and binary indicator */ \
    + 1 /* minimum filename length */ )
 
@@ -72,9 +123,6 @@
    improperly formatted checksum line.  */
 static bool warn = false;
 
-/* Declared and set via one of the wrapper .c files.  */
-/* int algorithm = ALG_UNSPECIFIED; */
-
 /* The name this program was run with.  */
 char *program_name;
 
[...3209 lines suppressed...]
-	 little endian byte order we perhaps have to change the byte order
-	 before the computation.  To reduce the work for the next steps
-	 we store the swapped words in the array CORRECT_WORDS.  */
+         the next context is computed.  Because the algorithms processing
+         unit is a 32-bit word and it is determined to work on words in
+         little endian byte order we perhaps have to change the byte order
+         before the computation.  To reduce the work for the next steps
+         we store the swapped words in the array CORRECT_WORDS.  */
 
 #define OP(a, b, c, d, s, T)						\
       do								\
@@ -339,40 +340,40 @@
       while (0)
 
       /* It is unfortunate that C does not provide an operator for
-	 cyclic rotation.  Hope the C compiler is smart enough.  */
+         cyclic rotation.  Hope the C compiler is smart enough.  */
 #define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
 
       /* Before we start, one word to the strange constants.
-	 They are defined in RFC 1321 as
+         They are defined in RFC 1321 as
 
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+         T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
 
-	 Here is an equivalent invocation using Perl:
+         Here is an equivalent invocation using Perl:
 
-	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+         perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
        */
 
       /* Round 1.  */
-      OP (A, B, C, D,  7, 0xd76aa478);
+      OP (A, B, C, D, 7, 0xd76aa478);
       OP (D, A, B, C, 12, 0xe8c7b756);
       OP (C, D, A, B, 17, 0x242070db);
       OP (B, C, D, A, 22, 0xc1bdceee);
-      OP (A, B, C, D,  7, 0xf57c0faf);
+      OP (A, B, C, D, 7, 0xf57c0faf);
       OP (D, A, B, C, 12, 0x4787c62a);
       OP (C, D, A, B, 17, 0xa8304613);
       OP (B, C, D, A, 22, 0xfd469501);
-      OP (A, B, C, D,  7, 0x698098d8);
+      OP (A, B, C, D, 7, 0x698098d8);
       OP (D, A, B, C, 12, 0x8b44f7af);
       OP (C, D, A, B, 17, 0xffff5bb1);
       OP (B, C, D, A, 22, 0x895cd7be);
-      OP (A, B, C, D,  7, 0x6b901122);
+      OP (A, B, C, D, 7, 0x6b901122);
       OP (D, A, B, C, 12, 0xfd987193);
       OP (C, D, A, B, 17, 0xa679438e);
       OP (B, C, D, A, 22, 0x49b40821);
 
       /* For the second to fourth round we have the possibly swapped words
-	 in CORRECT_WORDS.  Redefine the macro to take an additional first
-	 argument specifying the function to use.  */
+         in CORRECT_WORDS.  Redefine the macro to take an additional first
+         argument specifying the function to use.  */
 #undef OP
 #define OP(f, a, b, c, d, k, s, T)					\
       do								\
@@ -384,58 +385,58 @@
       while (0)
 
       /* Round 2.  */
-      OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
-      OP (FG, D, A, B, C,  6,  9, 0xc040b340);
+      OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+      OP (FG, D, A, B, C, 6, 9, 0xc040b340);
       OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
-      OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
-      OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
-      OP (FG, D, A, B, C, 10,  9, 0x02441453);
+      OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+      OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+      OP (FG, D, A, B, C, 10, 9, 0x02441453);
       OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
-      OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
-      OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
-      OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
-      OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
-      OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
-      OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
-      OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
-      OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
+      OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+      OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+      OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+      OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+      OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+      OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+      OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+      OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
       OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
 
       /* Round 3.  */
-      OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
-      OP (FH, D, A, B, C,  8, 11, 0x8771f681);
+      OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+      OP (FH, D, A, B, C, 8, 11, 0x8771f681);
       OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
       OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
-      OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
-      OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
-      OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
+      OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+      OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+      OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
       OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
-      OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
-      OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
-      OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
-      OP (FH, B, C, D, A,  6, 23, 0x04881d05);
-      OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
+      OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+      OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+      OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+      OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+      OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
       OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
       OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-      OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
+      OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
 
       /* Round 4.  */
-      OP (FI, A, B, C, D,  0,  6, 0xf4292244);
-      OP (FI, D, A, B, C,  7, 10, 0x432aff97);
+      OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+      OP (FI, D, A, B, C, 7, 10, 0x432aff97);
       OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
-      OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
-      OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
-      OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
+      OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+      OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+      OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
       OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
-      OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
-      OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
+      OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+      OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
       OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-      OP (FI, C, D, A, B,  6, 15, 0xa3014314);
+      OP (FI, C, D, A, B, 6, 15, 0xa3014314);
       OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
-      OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
+      OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
       OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
-      OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
-      OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
+      OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+      OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
 
       /* Add the starting values of the context.  */
       A += A_save;
--- coreutils-5.97/AUTHORS.newhashes	2004-11-03 23:10:50.000000000 +0000
+++ coreutils-5.97/AUTHORS	2006-06-25 23:50:01.000000000 +0100
@@ -1,6 +1,7 @@
 Here are the names of the programs in this package,
 each followed by the name(s) of its author(s).
 
+base64: Simon Josefsson
 basename: FIXME unknown
 cat: Torbjorn Granlund, Richard M. Stallman
 chgrp: David MacKenzie, Jim Meyering
@@ -39,7 +40,7 @@
 ln: Mike Parker, David MacKenzie
 logname: FIXME: unknown
 ls: Richard Stallman, David MacKenzie
-md5sum: Ulrich Drepper, Scott Miller
+md5sum: Ulrich Drepper, Scott Miller, David Madore
 mkdir: David MacKenzie
 mkfifo: David MacKenzie
 mknod: David MacKenzie
@@ -60,7 +61,11 @@
 rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
 rmdir: David MacKenzie
 seq: Ulrich Drepper
-sha1sum: Ulrich Drepper, Scott Miller
+sha1sum: Ulrich Drepper, Scott Miller, David Madore
+sha224sum: Ulrich Drepper, Scott Miller, David Madore
+sha256sum: Ulrich Drepper, Scott Miller, David Madore
+sha384sum: Ulrich Drepper, Scott Miller, David Madore
+sha512sum: Ulrich Drepper, Scott Miller, David Madore
 shred: Colin Plumb
 sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
--- coreutils-5.97/aclocal.m4.newhashes	2006-06-10 10:02:48.000000000 +0100
+++ coreutils-5.97/aclocal.m4	2006-06-25 23:50:01.000000000 +0100
@@ -1055,6 +1055,8 @@
 m4_include([m4/setenv.m4])
 m4_include([m4/settime.m4])
 m4_include([m4/sha1.m4])
+m4_include([m4/sha256.m4])
+m4_include([m4/sha512.m4])
 m4_include([m4/sig2str.m4])
 m4_include([m4/signed.m4])
 m4_include([m4/socklen.m4])


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 May 2006 14:10:06 -0000	1.8
+++ .cvsignore	12 Jul 2006 22:33:04 -0000	1.9
@@ -3,3 +3,4 @@
 coreutils-5.93.tar.bz2
 coreutils-5.95.tar.bz2
 coreutils-5.96.tar.bz2
+coreutils-5.97.tar.bz2

coreutils-5.2.1-runuser.patch:
 AUTHORS            |    1 
 README             |    2 -
 man/Makefile.am    |    3 +-
 man/runuser.1      |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 man/runuser.x      |    4 +++
 src/Makefile.am    |    8 +++++--
 src/su.c           |   20 +++++++++++++++++
 tests/help-version |    1 
 8 files changed, 93 insertions(+), 5 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- coreutils-5.2.1-runuser.patch	24 Nov 2005 23:00:49 -0000	1.8
+++ coreutils-5.2.1-runuser.patch	12 Jul 2006 22:33:04 -0000	1.9
@@ -1,93 +1,5 @@
---- /dev/null	2005-10-10 09:36:06.437701000 +0100
-+++ coreutils-5.93/man/runuser.1	2005-11-14 10:54:44.000000000 +0000
-@@ -0,0 +1,59 @@
-+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-+.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
-+.SH NAME
-+runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password.
-+.SH SYNOPSIS
-+.B runuser
-+[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
-+.SH DESCRIPTION
-+.\" Add any additional description here
-+.PP
-+Change the effective user id and group id to that of USER.
-+.TP
-+-, \fB\-l\fR, \fB\-\-login\fR
-+make the shell a login shell
-+.TP
-+\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR
-+pass a single COMMAND to the shell with \fB\-c\fR
-+.TP
-+\fB\-f\fR, \fB\-\-fast\fR
-+pass \fB\-f\fR to the shell (for csh or tcsh)
-+.TP
-+\fB\-m\fR, \fB\-\-preserve\-environment\fR
-+do not reset environment variables
-+.TP
-+\fB\-p\fR
-+same as \fB\-m\fR
-+.TP
-+\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
-+run SHELL if /etc/shells allows it
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.PP
-+A mere - implies \fB\-l\fR.   If USER not given, assume root.
-+.SH AUTHOR
-+Written by David MacKenzie, Dan Walsh.
-+.SH "REPORTING BUGS"
-+Report bugs to <bug-coreutils at gnu.org>.
-+.SH COPYRIGHT
-+Copyright \(co 2004 Free Software Foundation, Inc.
-+.br
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+.SH "SEE ALSO"
-+Since this command is trimmed down version of su use you can use the su manual.
-+The full documentation for
-+.B su
-+is maintained as a Texinfo manual.  If the
-+.B info
-+and
-+.B su
-+programs are properly installed at your site, the command
-+.IP
-+.B info coreutils su
-+.PP
-+should give you access to the complete manual.
---- coreutils-5.93/man/Makefile.am.runuser	2005-10-13 15:12:51.000000000 +0100
-+++ coreutils-5.93/man/Makefile.am	2005-11-14 10:54:44.000000000 +0000
-@@ -7,7 +7,7 @@
-   link.1 ln.1 logname.1 \
-   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
-   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
--  rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
-+  rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
-   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
-   who.1 whoami.1 yes.1
-@@ -81,6 +81,7 @@
- readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
- rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
- rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
-+runuser.1:	$(common_dep)	$(srcdir)/runuser.x	../src/su.c
- seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
- sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
- shred.1:	$(common_dep)	$(srcdir)/shred.x	../src/shred.c
---- /dev/null	2005-10-10 09:36:06.437701000 +0100
-+++ coreutils-5.93/man/runuser.x	2005-11-14 10:54:45.000000000 +0000
-@@ -0,0 +1,4 @@
-+[NAME]
-+runuser \- run a shell with substitute user and group IDs
-+[DESCRIPTION]
-+.\" Add any additional description here
---- coreutils-5.93/src/su.c	2005-11-14 10:54:44.000000000 +0000
-+++ coreutils-5.93/src/su.c	2005-11-24 16:12:18.000000000 +0000
+--- coreutils-5.96/src/su.c.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/src/su.c	2006-06-22 23:31:37.000000000 +0100
 @@ -132,9 +132,15 @@
  #include "error.h"
  
@@ -157,8 +69,8 @@
      {
  #ifdef SYSLOG_FAILURE
        log_su (pw, false);
---- coreutils-5.93/src/Makefile.am	2005-11-14 10:54:44.000000000 +0000
-+++ coreutils-5.93/src/Makefile.am	2005-11-24 16:18:58.000000000 +0000
+--- coreutils-5.96/src/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/src/Makefile.am	2006-06-22 23:31:37.000000000 +0100
 @@ -17,7 +17,7 @@
  ## along with this program; if not, write to the Free Software Foundation,
  ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -168,7 +80,8 @@
  
  bin_SCRIPTS = groups
  bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \
-@@ -93,4 +93,8 @@
+@@ -94,6 +94,10 @@
+ 
  su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@
  
 +runuser_SOURCES = su.c
@@ -177,7 +90,8 @@
 +
  $(PROGRAMS): ../lib/libcoreutils.a
  
-@@ -106,7 +110,7 @@
+ SUFFIXES = .sh
+@@ -108,7 +112,7 @@
  	chmod +x $@-t
  	mv $@-t $@
  
@@ -186,9 +100,9 @@
  
  installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
  
---- coreutils-5.93/tests/help-version.runuser	2005-01-05 22:08:48.000000000 +0000
-+++ coreutils-5.93/tests/help-version	2005-11-14 10:54:45.000000000 +0000
-@@ -136,6 +136,7 @@
+--- coreutils-5.96/tests/help-version.runuser	2006-02-07 09:13:43.000000000 +0000
++++ coreutils-5.96/tests/help-version	2006-06-22 23:31:37.000000000 +0100
+@@ -137,6 +137,7 @@
  seq_args=10
  sleep_args=0
  su_args=--version
@@ -196,24 +110,112 @@
  test_args=foo
  
  # This is necessary in the unusual event that there is
---- coreutils-5.93/README.runuser	2005-09-28 19:34:26.000000000 +0100
-+++ coreutils-5.93/README	2005-11-14 10:54:45.000000000 +0000
-@@ -11,7 +11,7 @@
-   df dir dircolors dirname du echo env expand expr factor false fmt fold
-   ginstall groups head hostid hostname id join kill link ln logname ls
-   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
--  printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort
-+  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort
-   split stat stty su sum sync tac tail tee test touch tr true tsort tty
-   uname unexpand uniq unlink uptime users vdir wc who whoami yes
- 
---- coreutils-5.93/AUTHORS.runuser	2004-11-03 23:10:50.000000000 +0000
-+++ coreutils-5.93/AUTHORS	2005-11-14 10:54:45.000000000 +0000
-@@ -59,6 +59,7 @@
+--- coreutils-5.96/AUTHORS.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/AUTHORS	2006-06-22 23:31:37.000000000 +0100
+@@ -60,6 +60,7 @@
  readlink: Dmitry V. Levin
  rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
  rmdir: David MacKenzie
 +runuser: David MacKenzie, Dan Walsh
  seq: Ulrich Drepper
- sha1sum: Ulrich Drepper, Scott Miller
- shred: Colin Plumb
+ sha1sum: Ulrich Drepper, Scott Miller, David Madore
+ sha224sum: Ulrich Drepper, Scott Miller, David Madore
+--- coreutils-5.96/README.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/README	2006-06-22 23:32:02.000000000 +0100
+@@ -12,7 +12,7 @@
+   df dir dircolors dirname du echo env expand expr factor false fmt fold
+   ginstall groups head hostid hostname id join kill link ln logname ls
+   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
+-  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum
++  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum
+   sha256sum sha384sum sha512sum shred sleep sort
+   split stat stty su sum sync tac tail tee test touch tr true tsort tty
+   uname unexpand uniq unlink uptime users vdir wc who whoami yes
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runuser.x	2006-06-22 23:31:37.000000000 +0100
+@@ -0,0 +1,4 @@
++[NAME]
++runuser \- run a shell with substitute user and group IDs
++[DESCRIPTION]
++.\" Add any additional description here
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runuser.1	2006-06-22 23:31:37.000000000 +0100
+@@ -0,0 +1,59 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
++.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
++.SH NAME
++runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password.
++.SH SYNOPSIS
++.B runuser
++[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...]
++.SH DESCRIPTION
++.\" Add any additional description here
++.PP
++Change the effective user id and group id to that of USER.
++.TP
++-, \fB\-l\fR, \fB\-\-login\fR
++make the shell a login shell
++.TP
++\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR
++pass a single COMMAND to the shell with \fB\-c\fR
++.TP
++\fB\-f\fR, \fB\-\-fast\fR
++pass \fB\-f\fR to the shell (for csh or tcsh)
++.TP
++\fB\-m\fR, \fB\-\-preserve\-environment\fR
++do not reset environment variables
++.TP
++\fB\-p\fR
++same as \fB\-m\fR
++.TP
++\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR
++run SHELL if /etc/shells allows it
++.TP
++\fB\-\-help\fR
++display this help and exit
++.TP
++\fB\-\-version\fR
++output version information and exit
++.PP
++A mere - implies \fB\-l\fR.   If USER not given, assume root.
++.SH AUTHOR
++Written by David MacKenzie, Dan Walsh.
++.SH "REPORTING BUGS"
++Report bugs to <bug-coreutils at gnu.org>.
++.SH COPYRIGHT
++Copyright \(co 2004 Free Software Foundation, Inc.
++.br
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++.SH "SEE ALSO"
++Since this command is trimmed down version of su use you can use the su manual.
++The full documentation for
++.B su
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B su
++programs are properly installed at your site, the command
++.IP
++.B info coreutils su
++.PP
++should give you access to the complete manual.
+--- coreutils-5.96/man/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
++++ coreutils-5.96/man/Makefile.am	2006-06-22 23:31:37.000000000 +0100
+@@ -7,7 +7,7 @@
+   link.1 ln.1 logname.1 \
+   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
+   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
+-  rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
++  rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
+   shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
+   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
+   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
+@@ -83,6 +83,7 @@
+ readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
+ rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
+ rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
++runuser.1:	$(common_dep)	$(srcdir)/runuser.x	../src/su.c
+ seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
+ sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
+ sha224sum.1:    $(common_dep)   $(srcdir)/sha224sum.x   ../src/md5sum.c

coreutils-selinux.patch:
 README             |    4 
 config.hin         |   27 +--
 configure.ac       |    7 
 man/Makefile.am    |    4 
 man/Makefile.in    |   56 +++----
 man/chcon.1        |   64 ++++++++
 man/chcon.x        |    4 
 man/cp.1           |    5 
 man/dir.1          |   14 +
 man/id.1           |    3 
 man/install.1      |    5 
 man/ls.1           |   14 +
 man/mkdir.1        |    2 
 man/mkfifo.1       |    3 
 man/mknod.1        |    3 
 man/runcon.1       |   43 +++++
 man/runcon.x       |   14 +
 man/stat.1         |    6 
 man/vdir.1         |   14 +
 src/Makefile.am    |   23 +-
 src/chcon.c        |  421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/copy.c         |   72 ++++++++-
 src/copy.h         |    3 
 src/cp.c           |   64 +++++++-
 src/id.c           |   68 ++++++++
 src/install.c      |   99 ++++++++++++
 src/ls.c           |  296 ++++++++++++++++++++++++++++++++-----
 src/mkdir.c        |   30 +++
 src/mkfifo.c       |   29 +++
 src/mknod.c        |   30 +++
 src/mv.c           |   12 +
 src/runcon.c       |  253 +++++++++++++++++++++++++++++++
 src/stat.c         |  142 ++++++++++++++---
 tests/help-version |    4 
 34 files changed, 1714 insertions(+), 124 deletions(-)

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils-selinux.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- coreutils-selinux.patch	15 May 2006 12:50:13 -0000	1.19
+++ coreutils-selinux.patch	12 Jul 2006 22:33:04 -0000	1.20
@@ -1,5 +1,5 @@
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/src/chcon.c	2006-03-24 13:23:45.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/src/chcon.c	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,421 @@
 +/* chcontext -- change security context of a pathname */
 +
@@ -422,8 +422,8 @@
 +    freecon(ref_context);
 +  exit (errors);
 +}
---- coreutils-5.94/src/mv.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/mv.c	2006-03-24 13:23:44.000000000 +0000
+--- coreutils-5.96/src/mv.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/mv.c	2006-06-22 23:32:16.000000000 +0100
 @@ -34,6 +34,11 @@
  #include "quote.h"
  #include "remove.h"
@@ -457,8 +457,8 @@
    /* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
---- coreutils-5.94/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
-+++ coreutils-5.94/src/mkdir.c	2006-03-24 13:23:44.000000000 +0000
+--- coreutils-5.96/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
++++ coreutils-5.96/src/mkdir.c	2006-06-22 23:32:16.000000000 +0100
 @@ -34,11 +34,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -523,8 +523,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/src/cp.c.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/cp.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/cp.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/cp.c	2006-06-22 23:32:16.000000000 +0100
 @@ -51,6 +51,11 @@
  
  #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@@ -675,8 +675,8 @@
  
  	case REPLY_OPTION: /* Deprecated */
  	  x.interactive = XARGMATCH ("--reply", optarg,
---- coreutils-5.94/src/install.c.selinux	2006-03-24 13:23:44.000000000 +0000
-+++ coreutils-5.94/src/install.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/install.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/install.c	2006-06-22 23:32:16.000000000 +0100
 @@ -48,6 +48,43 @@
  # include <sys/wait.h>
  #endif
@@ -839,8 +839,8 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\
---- coreutils-5.94/src/copy.h.selinux	2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/copy.h	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/copy.h.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/copy.h	2006-06-22 23:32:16.000000000 +0100
 @@ -127,6 +127,9 @@
    bool preserve_ownership;
    bool preserve_mode;
@@ -851,9 +851,9 @@
  
    /* Enabled for mv, and for cp by the --preserve=links option.
       If true, attempt to preserve in the destination files any
---- coreutils-5.94/src/Makefile.am.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/src/Makefile.am	2006-03-24 13:23:45.000000000 +0000
-@@ -20,13 +20,13 @@
+--- coreutils-5.96/src/Makefile.am.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/Makefile.am	2006-06-22 23:32:16.000000000 +0100
+@@ -20,14 +20,14 @@
  EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
  
  bin_SCRIPTS = groups
@@ -862,14 +862,15 @@
    ginstall link ln dir vdir ls mkdir \
    mkfifo mknod mv nohup readlink rm rmdir shred stat sync touch unlink \
    cat cksum comm csplit cut expand fmt fold head join md5sum \
-   nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
+   nl od paste pr ptx sha1sum sha224sum sha256sum sha384sum sha512sum \
+   sort split sum tac tail tr tsort unexpand uniq wc \
    basename date dirname echo env expr factor false \
 -  hostname id kill logname pathchk printenv printf pwd seq sleep tee \
 +  hostname id kill logname pathchk printenv printf pwd runcon seq sleep tee \
    test true tty whoami yes \
+   base64 \
    $(OPTIONAL_BIN_PROGS) $(DF_PROG)
- 
-@@ -50,9 +50,9 @@
+@@ -52,9 +52,9 @@
  LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
  
  # for eaccess in lib/euidaccess.c.
@@ -882,7 +883,7 @@
  pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
  rm_LDADD = $(LDADD) $(LIB_EACCESS)
  test_LDADD = $(LDADD) $(LIB_EACCESS)
-@@ -61,11 +61,18 @@
+@@ -63,11 +63,18 @@
  
  # for clock_gettime and fdatasync
  dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
@@ -904,8 +905,8 @@
  
  ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
  sort_LDADD = $(LDADD) $(POW_LIB)
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/src/runcon.c	2006-03-24 13:23:44.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/src/runcon.c	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,253 @@
 +/*
 + * runcon [ context |
@@ -1160,8 +1161,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.94/src/ls.c	2006-03-24 13:23:45.000000000 +0000
-+++ coreutils-5.94/src/ls.c	2006-04-20 12:24:40.000000000 +0100
+--- coreutils-5.96/src/ls.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/ls.c	2006-06-22 23:32:16.000000000 +0100
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1692,7 +1693,10 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\n\
-@@ -4246,0 +4406,67 @@
+@@ -4244,3 +4403,70 @@
+     }
+   exit (status);
+ }
 +
 +#ifdef WITH_SELINUX
 +
@@ -1760,8 +1764,8 @@
 +  }
 +}
 +#endif
---- coreutils-5.94/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
-+++ coreutils-5.94/src/stat.c	2006-03-24 13:25:44.000000000 +0000
+--- coreutils-5.96/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
++++ coreutils-5.96/src/stat.c	2006-06-22 23:32:16.000000000 +0100
 @@ -42,6 +42,13 @@
  # endif
  #endif
@@ -2049,8 +2053,8 @@
  
    exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
  }
---- coreutils-5.94/src/mkfifo.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.94/src/mkfifo.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/mkfifo.c.selinux	2005-05-14 08:58:37.000000000 +0100
++++ coreutils-5.96/src/mkfifo.c	2006-06-22 23:32:16.000000000 +0100
 @@ -32,11 +32,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -2113,8 +2117,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/src/id.c.selinux	2006-03-24 13:23:44.000000000 +0000
-+++ coreutils-5.94/src/id.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/id.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/id.c	2006-06-22 23:32:16.000000000 +0100
 @@ -37,6 +37,20 @@
  
  int getugroups ();
@@ -2245,8 +2249,8 @@
 +  }
 +#endif
  }
---- coreutils-5.94/src/copy.c.selinux	2006-04-26 15:35:52.000000000 +0100
-+++ coreutils-5.94/src/copy.c	2006-04-26 15:42:15.000000000 +0100
+--- coreutils-5.96/src/copy.c.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/src/copy.c	2006-06-22 23:32:16.000000000 +0100
 @@ -51,6 +51,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2289,7 +2293,7 @@
        if (dest_desc < 0 && x->unlink_dest_after_failed_open)
  	{
  	  if (unlink (dst_name) != 0)
-@@ -1416,6 +1444,32 @@
+@@ -1410,6 +1438,32 @@
       In such cases, set this variable to zero.  */
    preserve_metadata = true;
  
@@ -2322,7 +2326,7 @@
    if (S_ISDIR (src_mode))
      {
        struct dir_list *dir;
-@@ -1486,7 +1540,13 @@
+@@ -1480,7 +1534,13 @@
  
        /* Are we crossing a file system boundary?  */
        if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@@ -2337,7 +2341,7 @@
  
        /* Copy the contents of the directory.  */
  
-@@ -1622,6 +1682,11 @@
+@@ -1616,6 +1676,11 @@
  	    }
  	}
  
@@ -2349,7 +2353,7 @@
        /* There's no need to preserve timestamps or permissions.  */
        preserve_metadata = false;
  
-@@ -1760,6 +1825,11 @@
+@@ -1754,6 +1819,11 @@
  
  un_backup:
  
@@ -2361,8 +2365,8 @@
    /* We have failed to create the destination file.
       If we've just added a dev/ino entry via the remember_copied
       call above (i.e., unless we've just failed to create a hard link),
---- coreutils-5.94/src/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.94/src/mknod.c	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/src/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
++++ coreutils-5.96/src/mknod.c	2006-06-22 23:32:16.000000000 +0100
 @@ -36,8 +36,15 @@
  /* The name this program was run with. */
  char *program_name;
@@ -2423,24 +2427,24 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.94/README.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/README	2006-03-24 13:23:47.000000000 +0000
-@@ -7,11 +7,11 @@
- 
+--- coreutils-5.96/README.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/README	2006-06-22 23:32:51.000000000 +0100
+@@ -8,11 +8,11 @@
  The programs that can be built with this package are:
  
--  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
-+  [ basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd
+   [ base64
+-  basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
++  basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd
    df dir dircolors dirname du echo env expand expr factor false fmt fold
    ginstall groups head hostid hostname id join kill link ln logname ls
    md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
--  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort
-+  printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum shred sleep sort
+-  printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum
++  printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum sha224sum
+   sha256sum sha384sum sha512sum shred sleep sort
    split stat stty su sum sync tac tail tee test touch tr true tsort tty
    uname unexpand uniq unlink uptime users vdir wc who whoami yes
- 
---- coreutils-5.94/tests/help-version.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/tests/help-version	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/tests/help-version.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/tests/help-version	2006-06-22 23:32:16.000000000 +0100
 @@ -46,6 +46,8 @@
  
      # Skip `test'; it doesn't accept --help or --version.
@@ -2459,8 +2463,8 @@
  
    rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
    echo > $tmp_in
---- coreutils-5.94/configure.ac.selinux	2006-03-24 13:23:41.000000000 +0000
-+++ coreutils-5.94/configure.ac	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/configure.ac.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/configure.ac	2006-06-22 23:32:16.000000000 +0100
 @@ -34,6 +34,13 @@
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
@@ -2475,8 +2479,8 @@
  gl_DEFAULT_POSIX2_VERSION
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
---- coreutils-5.94/config.hin.selinux	2006-03-24 13:23:41.000000000 +0000
-+++ coreutils-5.94/config.hin	2006-03-24 13:23:47.000000000 +0000
+--- coreutils-5.96/config.hin.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/config.hin	2006-06-22 23:32:16.000000000 +0100
 @@ -411,10 +411,6 @@
     don't. */
  #undef HAVE_DECL_TTYNAME
@@ -2508,7 +2512,7 @@
  /* Define to 1 if you have the `dgc' library (-ldgc). */
  #undef HAVE_LIBDGC
  
-@@ -1525,17 +1521,17 @@
+@@ -1529,17 +1525,17 @@
  /* Define to 1 if unlink (dir) cannot possibly succeed. */
  #undef UNLINK_CANNOT_UNLINK_DIR
  
@@ -2531,7 +2535,7 @@
  /* Version number of package */
  #undef VERSION
  
-@@ -1545,6 +1541,9 @@
+@@ -1549,6 +1545,9 @@
  /* Define if sys/ptem.h is required for struct winsize. */
  #undef WINSIZE_IN_PTEM
  
@@ -2541,7 +2545,7 @@
  /* Define to 1 if your processor stores words with the most significant byte
     first (like Motorola and SPARC, unlike Intel and VAX). */
  #undef WORDS_BIGENDIAN
-@@ -1690,7 +1689,7 @@
+@@ -1694,7 +1693,7 @@
  /* Define to rpl_nanosleep if the replacement function should be used. */
  #undef nanosleep
  
@@ -2550,7 +2554,7 @@
  #undef off_t
  
  /* Define to `int' if <sys/types.h> does not define. */
-@@ -1757,7 +1756,7 @@
+@@ -1761,7 +1760,7 @@
  /* Define to empty if the C compiler doesn't support this keyword. */
  #undef signed
  
@@ -2559,8 +2563,8 @@
  #undef size_t
  
  /* Map `socklen_t' to `int' if it is missing. */
---- coreutils-5.94/man/ls.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/ls.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/ls.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/ls.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2582,8 +2586,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- coreutils-5.94/man/install.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/install.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/install.1.selinux	2006-05-16 18:31:20.000000000 +0100
++++ coreutils-5.96/man/install.1	2006-06-22 23:32:16.000000000 +0100
 @@ -65,6 +65,11 @@
  .TP
  \fB\-v\fR, \fB\-\-verbose\fR
@@ -2596,8 +2600,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- coreutils-5.94/man/id.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/id.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/id.1.selinux	2006-05-16 18:31:20.000000000 +0100
++++ coreutils-5.96/man/id.1	2006-06-22 23:32:16.000000000 +0100
 @@ -13,6 +13,9 @@
  \fB\-a\fR
  ignore, for compatibility with other versions
@@ -2608,8 +2612,8 @@
  \fB\-g\fR, \fB\-\-group\fR
  print only the effective group ID
  .TP
---- coreutils-5.94/man/stat.1.selinux	2006-02-13 12:53:40.000000000 +0000
-+++ coreutils-5.94/man/stat.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/stat.1.selinux	2006-05-16 18:31:23.000000000 +0100
++++ coreutils-5.96/man/stat.1	2006-06-22 23:32:16.000000000 +0100
 @@ -28,6 +28,9 @@
  \fB\-t\fR, \fB\-\-terse\fR
  print the information in terse form
@@ -2630,8 +2634,8 @@
  %D
  Device number in hex
  .TP
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/runcon.1	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runcon.1	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,43 @@
 +.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
 +.SH NAME
@@ -2676,10 +2680,10 @@
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- coreutils-5.94/man/Makefile.am.selinux	2006-03-24 13:23:43.000000000 +0000
-+++ coreutils-5.94/man/Makefile.am	2006-03-24 13:23:46.000000000 +0000
-@@ -10,7 +10,7 @@
-   rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
+--- coreutils-5.96/man/Makefile.am.selinux	2006-06-22 23:32:16.000000000 +0100
++++ coreutils-5.96/man/Makefile.am	2006-06-22 23:32:16.000000000 +0100
+@@ -11,7 +11,7 @@
+   shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
 -  who.1 whoami.1 yes.1
@@ -2687,7 +2691,7 @@
  
  man_aux = $(dist_man_MANS:.1=.x)
  
-@@ -113,6 +113,8 @@
+@@ -119,6 +119,8 @@
  who.1:		$(common_dep)	$(srcdir)/who.x		../src/who.c
  whoami.1:	$(common_dep)	$(srcdir)/whoami.x	../src/whoami.c
  yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c
@@ -2696,8 +2700,8 @@
  
  SUFFIXES = .x .1
  
---- coreutils-5.94/man/cp.1.selinux	2006-02-13 12:53:36.000000000 +0000
-+++ coreutils-5.94/man/cp.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/cp.1.selinux	2006-05-16 18:31:18.000000000 +0100
++++ coreutils-5.96/man/cp.1	2006-06-22 23:32:16.000000000 +0100
 @@ -57,7 +57,7 @@
  .TP
  \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@@ -2717,8 +2721,8 @@
  \fB\-\-version\fR
  output version information and exit
  .PP
---- coreutils-5.94/man/mkfifo.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/mkfifo.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/mkfifo.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mkfifo.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2729,8 +2733,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.94/man/mknod.1.selinux	2006-02-13 12:53:38.000000000 +0000
-+++ coreutils-5.94/man/mknod.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/mknod.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mknod.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2741,8 +2745,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not a=rw \- umask
  .TP
---- coreutils-5.94/man/mkdir.1.selinux	2006-02-13 12:53:39.000000000 +0000
-+++ coreutils-5.94/man/mkdir.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/mkdir.1.selinux	2006-05-16 18:31:21.000000000 +0100
++++ coreutils-5.96/man/mkdir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -12,6 +12,8 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2752,8 +2756,8 @@
  \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
  set permission mode (as in chmod), not rwxrwxrwx \- umask
  .TP
---- coreutils-5.94/man/dir.1.selinux	2006-02-13 12:53:37.000000000 +0000
-+++ coreutils-5.94/man/dir.1	2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.96/man/dir.1.selinux	2006-05-16 18:31:19.000000000 +0100
++++ coreutils-5.96/man/dir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2775,8 +2779,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/runcon.x	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/runcon.x	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,14 @@
 +[NAME]
 +runcon \- run command with specified security context
@@ -2792,8 +2796,8 @@
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- coreutils-5.94/man/vdir.1.selinux	2006-02-13 12:53:42.000000000 +0000
-+++ coreutils-5.94/man/vdir.1	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/vdir.1.selinux	2006-05-16 18:31:25.000000000 +0100
++++ coreutils-5.96/man/vdir.1	2006-06-22 23:32:16.000000000 +0100
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2815,15 +2819,15 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/chcon.x	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/chcon.x	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,4 @@
 +[NAME]
 +chcon \- change file security context
 +[DESCRIPTION]
 +.\" Add any additional description here
---- /dev/null	2006-03-24 08:16:09.803715750 +0000
-+++ coreutils-5.94/man/chcon.1	2006-03-24 13:23:46.000000000 +0000
+--- /dev/null	2006-06-22 09:01:01.637265000 +0100
++++ coreutils-5.96/man/chcon.1	2006-06-22 23:32:16.000000000 +0100
 @@ -0,0 +1,64 @@
 +.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
 +.SH NAME
@@ -2889,8 +2893,8 @@
 +.B info chcon
 +.PP
 +should give you access to the complete manual.
---- coreutils-5.94/man/Makefile.in.selinux	2006-02-13 12:51:58.000000000 +0000
-+++ coreutils-5.94/man/Makefile.in	2006-03-24 13:23:46.000000000 +0000
+--- coreutils-5.96/man/Makefile.in.selinux	2006-05-22 07:08:33.000000000 +0100
++++ coreutils-5.96/man/Makefile.in	2006-06-22 23:32:16.000000000 +0100
 @@ -107,25 +107,25 @@
  	$(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/openat.m4 \
  	$(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \
@@ -2961,7 +2965,7 @@
  LN_S = @LN_S@
  LTLIBICONV = @LTLIBICONV@
  LTLIBINTL = @LTLIBINTL@
-@@ -271,30 +273,23 @@
+@@ -269,30 +271,23 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -2992,7 +2996,7 @@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -307,10 +302,10 @@
+@@ -305,10 +300,10 @@
    link.1 ln.1 logname.1 \
    ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
@@ -3005,7 +3009,7 @@
  
  man_aux = $(dist_man_MANS:.1=.x)
  EXTRA_DIST = $(man_aux) help2man
-@@ -600,6 +595,7 @@
+@@ -598,6 +593,7 @@
  readlink.1:	$(common_dep)	$(srcdir)/readlink.x	../src/readlink.c
  rm.1:		$(common_dep)	$(srcdir)/rm.x		../src/rm.c
  rmdir.1:	$(common_dep)	$(srcdir)/rmdir.x	../src/rmdir.c
@@ -3013,7 +3017,7 @@
  seq.1:		$(common_dep)	$(srcdir)/seq.x		../src/seq.c
  sha1sum.1:	$(common_dep)	$(srcdir)/sha1sum.x	../src/md5sum.c
  shred.1:	$(common_dep)	$(srcdir)/shred.x	../src/shred.c
-@@ -631,6 +627,8 @@
+@@ -629,6 +625,8 @@
  who.1:		$(common_dep)	$(srcdir)/who.x		../src/who.c
  whoami.1:	$(common_dep)	$(srcdir)/whoami.x	../src/whoami.c
  yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- coreutils.spec	12 Jul 2006 22:14:27 -0000	1.115
+++ coreutils.spec	12 Jul 2006 22:33:04 -0000	1.116
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
-Version: 5.96
-Release: 1.3
+Version: 5.97
+Release: 1.1
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -9,7 +9,6 @@
 Requires: libselinux >= 1.25.6-1
 
 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
-Source1: coreutils-5.96.pl.po
 Source101:	DIR_COLORS
 Source102:	DIR_COLORS.xterm
 Source105:  colorls.sh
@@ -18,6 +17,7 @@
 Source201:  runuser.pamd
 
 # From upstream
+Patch10: coreutils-newhashes.patch
 
 # Our patches
 Patch100: coreutils-chgrp.patch
@@ -42,6 +42,7 @@
 Patch908: coreutils-getgrouplist.patch
 Patch912: coreutils-overflow.patch
 Patch913: coreutils-afs.patch
+Patch914: coreutils-autoconf.patch
 
 #SELINUX Patch
 Patch950: coreutils-selinux.patch
@@ -71,10 +72,9 @@
 
 %prep
 %setup -q
-rm po/pl.*
-cp %{SOURCE1} po/pl.po
 
 # From upstream
+%patch10 -p1 -b .newhashes
 
 # Our patches
 %patch100 -p1 -b .chgrp
@@ -97,6 +97,7 @@
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch913 -p1 -b .afs
+%patch914 -p1 -b .autoconf
 
 #SELinux
 %patch950 -p1 -b .selinux
@@ -268,8 +269,10 @@
 /sbin/runuser
 
 %changelog
-* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.3
+* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1
+- 5.97.  No longer need pl translation.
 - Build requires libacl-devel (bug #198662).
+- Include new hashes (bug #196369).  Patch from upstream.
 
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.2
 - Fixed Polish translation.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 May 2006 14:10:08 -0000	1.8
+++ sources	12 Jul 2006 22:33:04 -0000	1.9
@@ -1,2 +1 @@
-8c4991ea73dd31f3191af61da3b58e59  coreutils-5.95.tar.bz2
-bf55d069d82128fd754a090ce8b5acff  coreutils-5.96.tar.bz2
+1537379b6264a1def443713988a78020  coreutils-5.97.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:44:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:44:04 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2387,1.2388
Message-ID: <200607122244.k6CMi4kX010264@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2387
retrieving revision 1.2388
diff -u -r1.2387 -r1.2388
--- kernel-2.6.spec	12 Jul 2006 20:34:20 -0000	1.2387
+++ kernel-2.6.spec	12 Jul 2006 22:44:01 -0000	1.2388
@@ -254,7 +254,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git4.bz2
+Patch2: patch-2.6.18-rc1-git5.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:49:00 -0400
Subject: rpms/freeglut/devel freeglut.spec,1.19,1.20
Message-ID: <200607122249.k6CMn0nv026914@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	freeglut.spec 
Log Message:
fix missing br


Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- freeglut.spec	12 Jul 2006 05:51:29 -0000	1.19
+++ freeglut.spec	12 Jul 2006 22:48:57 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   5.1
+Release:   6
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -17,7 +17,7 @@
 
 # FIXME: freeglut does not require glib itself, but something included with
 # it presumeably does. Need to investigate further.
-BuildRequires: glib-devel
+#BuildRequires: glib-devel
 # The virtual Provides below is present so that this freeglut package is a
 # drop in binary replacement for "glut" which will satisfy rpm dependancies
 # properly.  The Obsoletes tag is required in order for any pre-existing
@@ -90,8 +90,9 @@
 %{_libdir}/libglut.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-5.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-6
 - rebuild
+- Try to build w/out glib
 
 * Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-5
 - Added "BuildRequires: libXext-devel, libXxf86vm-devel" for (#192255)



From fedora-cvs-commits at redhat.com  Wed Jul 12 22:54:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 18:54:02 -0400
Subject: rpms/device-mapper/devel device-mapper.spec,1.37,1.38
Message-ID: <200607122254.k6CMs2r4028865@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28743

Modified Files:
	device-mapper.spec 
Log Message:
- make it so we don't get "libdir=//lib" everywhere



Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- device-mapper.spec	12 Jul 2006 05:35:31 -0000	1.37
+++ device-mapper.spec	12 Jul 2006 22:53:59 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.07
-Release: 1.0.1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -19,7 +19,9 @@
 %setup -q -n %{name}.%{version}
 
 %build
+%define _exec_prefix ""
 %configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig
+%define _exec_prefix /
 make
 
 %install
@@ -46,6 +48,9 @@
 
 
 %changelog
+* Wed Jul 12 2006 Peter Jones <pjones at redhat.com> - 1.02.07-1.1
+- Fix _exec_prefix during %%configure so .pc files have correct paths
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.02.07-1.0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 12 23:23:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 19:23:05 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic, 1.34,
	1.35 config-s390-generic, 1.17, 1.18
Message-ID: <200607122323.k6CNN5kS023671@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-ia64-generic config-s390-generic 
Log Message:
buildfix?


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- config-ia64-generic	12 Jul 2006 17:25:12 -0000	1.34
+++ config-ia64-generic	12 Jul 2006 23:23:02 -0000	1.35
@@ -176,5 +176,4 @@
 
 # FIXME
 # CONFIG_UTRACE is not set
-# CONFIG_PTRACE is not set
 


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-s390-generic	12 Jul 2006 01:09:47 -0000	1.17
+++ config-s390-generic	12 Jul 2006 23:23:02 -0000	1.18
@@ -187,4 +187,3 @@
 
 # FIXME
 # CONFIG_UTRACE is not set
-# CONFIG_PTRACE is not set



From fedora-cvs-commits at redhat.com  Wed Jul 12 23:29:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 19:29:03 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch, NONE,
	1.1 xorg-x11-server-1.1.0-no-move-damage.patch, NONE,
	1.1 xorg-x11-server.spec, 1.116,
	1.117 xorg-server-1.0.99.2-spiffiffity.patch, 1.3, NONE
Message-ID: <200607122329.k6CNT3h9023797@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch 
	xorg-x11-server-1.1.0-no-move-damage.patch 
Removed Files:
	xorg-server-1.0.99.2-spiffiffity.patch 
Log Message:
* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
- Split spiffiffity patch into one patch per change:
  xorg-x11-server-1.1.0-no-move-damage.patch and
  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.


xorg-x11-server-1.1.0-dont-backfill-bg-none.patch:
 compalloc.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-server-1.1.0-dont-backfill-bg-none.patch ---
Disable backfilling of windows created with bg=none, which otherwise
would force a framebuffer readback.

--- ./composite/compalloc.c.spiffiffity	2006-03-13 16:59:55.000000000 -0500
+++ ./composite/compalloc.c	2006-04-12 16:37:50.000000000 -0400
@@ -478,6 +478,7 @@
      * Copy bits from the parent into the new pixmap so that it will
      * have "reasonable" contents in case for background None areas.
      */
+#if 0
     if (pGC)
     {
 	XID val = IncludeInferiors;
@@ -492,6 +493,7 @@
 			       w, h, 0, 0);
 	FreeScratchGC (pGC);
     }
+#endif
     return pPixmap;
 }
 

xorg-x11-server-1.1.0-no-move-damage.patch:
 compwindow.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.0-no-move-damage.patch ---
Disable damage notifications on move for manually redirected windows.
The automatic compositor needs damage notification on move, but a
compositing manager doesn't.

--- ./composite/compwindow.c.spiffiffity	2006-03-29 12:51:53.000000000 -0500
+++ ./composite/compwindow.c	2006-04-13 23:18:42.000000000 -0400
@@ -571,12 +571,15 @@
     }
     else
     {
+	CompWindowPtr	cw = GetCompWindow (pWin);
+
 	ptOldOrg.x -= dx;
 	ptOldOrg.y -= dy;
 	REGION_TRANSLATE (prgnSrc, prgnSrc,
 			  pWin->drawable.x - ptOldOrg.x,
 			  pWin->drawable.y - ptOldOrg.y);
-	DamageDamageRegion (&pWin->drawable, prgnSrc);
+	if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic)
+	  DamageDamageRegion (&pWin->drawable, prgnSrc);
     }
     cs->CopyWindow = pScreen->CopyWindow;
     pScreen->CopyWindow = compCopyWindow;
@@ -655,7 +658,8 @@
     /*
      * Report that as damaged so it will be redrawn
      */
-    DamageDamageRegion (&pWin->drawable, &damage);
+    if (cw->update == CompositeRedirectAutomatic)
+      DamageDamageRegion (&pWin->drawable, &damage);
     REGION_UNINIT (pScreen, &damage);
     /*
      * Save the new border clip region


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- xorg-x11-server.spec	12 Jul 2006 20:26:45 -0000	1.116
+++ xorg-x11-server.spec	12 Jul 2006 23:29:00 -0000	1.117
@@ -1,5 +1,4 @@
 %define pkgname xorg-server
-%define cvsdate cvsYYYYMMDD
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
@@ -9,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -24,9 +23,10 @@
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 
-# Spiffiffity/compiz feature/optimization patches.
-Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
-Patch101:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
+# OpenGL compositing manager feature/optimization patches.
+Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
+Patch101:  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
+Patch102:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 
@@ -295,8 +295,9 @@
 %patch0 -p0 -b .init-origins-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 
-%patch100 -p0 -b .spiffiffity
-%patch101 -p0 -b .gl-include-inferiors
+%patch100 -p0 -b .no-move-damage
+%patch101 -p0 -b .dont-backfill-bg-none
+%patch102 -p0 -b .gl-include-inferiors
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 
@@ -640,6 +641,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
+- Split spiffiffity patch into one patch per change:
+  xorg-x11-server-1.1.0-no-move-damage.patch and
+  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.
+
 * Wed Jul 12 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-4.fc6
 - Restore placing the raw EDID block on the root window.
 


--- xorg-server-1.0.99.2-spiffiffity.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:00:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:00:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2388,1.2389
Message-ID: <200607130000.k6D00Lll024203@cvs.devel.redhat.com>

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2388
retrieving revision 1.2389
diff -u -r1.2388 -r1.2389
--- kernel-2.6.spec	12 Jul 2006 22:44:01 -0000	1.2388
+++ kernel-2.6.spec	13 Jul 2006 00:00:10 -0000	1.2389
@@ -369,6 +369,7 @@
 Patch1422: linux-2.6-inode-diet-move-i_bdev-into-a-union.patch
 Patch1423: linux-2.6-inode-diet-move-i_cdev-into-a-union.patch
 Patch1424: linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
+Patch1425: linux-2.6-inode-diet-squashfs.patch
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
@@ -914,6 +915,7 @@
 %patch1422 -p1
 %patch1423 -p1
 %patch1424 -p1
+%patch1425 -p1
 
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:05:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:05:58 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.116,1.117
Message-ID: <200607130005.k6D05wTW024552@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
rip out the monikers



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-vfs2.spec	12 Jul 2006 15:07:53 -0000	1.116
+++ gnome-vfs2.spec	13 Jul 2006 00:05:25 -0000	1.117
@@ -1,4 +1,3 @@
-%define libbonobo_version 2.2.0
 %define samba_version 3.0.8-0.pre1.3
 %define gconf2_version 1.2.0
 %define gtkdoc_version 0.9
@@ -17,7 +16,6 @@
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
-Source1: gnome-vfs-monikers-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
@@ -25,7 +23,6 @@
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -74,8 +71,6 @@
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
-Requires:   libbonobo-devel >= %{libbonobo_version}
-Conflicts: bonobo-devel < 1.0.8
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -107,8 +102,6 @@
 %patch104 -p1 -b .browser_default
 %patch201 -p0 -b .console
 
-tar xjf %{SOURCE1}
-
 %build
 
 if pkg-config openssl ; then
@@ -130,11 +123,6 @@
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
 
-pushd gnome-vfs-monikers-%{version}
-./configure 
-make LIBTOOL=/usr/bin/libtool
-popd
-
 %install
 rm -fr $RPM_BUILD_ROOT
 
@@ -143,18 +131,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-pushd gnome-vfs-monikers-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
-popd
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la}
-
-for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
-    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
-done
 
 
 %find_lang %{po_package}
@@ -187,8 +166,8 @@
 %exclude %{_libdir}/gnome-vfs-2.0/modules/libsmb.so
 %{_libdir}/gnome-vfs-2.0/modules
 %dir %{_libdir}/gnome-vfs-2.0
-%{_libdir}/bonobo
 %{_sysconfdir}/gconf/schemas/*
+%{_datadir}/dbus-1/services/gnome-vfs-daemon.service
 ## conflicts with gnome-vfs 1, ignore for now
 ## %{_datadir}/man/man5/*
 
@@ -208,7 +187,7 @@
 
 %changelog
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2 
-- Include gnome-vfs-monikers
+- Rebuild
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3 



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:30:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:30:13 -0400
Subject: rpms/samba/FC-4 samba-3.0.21pre1-smbspool.patch, NONE,
	1.1 samba-3.0.23-logfiles.patch, NONE,
	1.1 samba-3.0.23-smb.conf.patch, NONE,
	1.1 samba-3.0.23rc3-passwd.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 filter-requires-samba.sh, 1.3, 1.4 samba.spec, 1.51,
	1.52 smb.init, 1.5, 1.6 sources, 1.26,
	1.27 samba-3.0.12pre1-logfiles.patch, 1.1,
	NONE samba-3.0.4-smb.conf.patch, 1.1, NONE
Message-ID: <200607130030.k6D0UDQK014105@cvs.devel.redhat.com>

Author: fenlason

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

Modified Files:
	.cvsignore filter-requires-samba.sh samba.spec smb.init 
	sources 
Added Files:
	samba-3.0.21pre1-smbspool.patch samba-3.0.23-logfiles.patch 
	samba-3.0.23-smb.conf.patch samba-3.0.23rc3-passwd.patch 
Removed Files:
	samba-3.0.12pre1-logfiles.patch samba-3.0.4-smb.conf.patch 
Log Message:
3.0.23


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

samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE samba-3.0.23-logfiles.patch ---
--- samba-3.0.23rc2/source/lib/popt_common.c.logfiles	2006-06-09 15:30:31.000000000 -0400
+++ samba-3.0.23rc2/source/lib/popt_common.c	2006-06-14 12:20:02.000000000 -0400
@@ -54,7 +54,7 @@
 	else 
 		pname++;
 
-	pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+	pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 	lp_set_logfile(logfile);
 }
 
--- 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.23/packaging/Fedora/smb.conf.logfiles	2006-07-11 11:23:52.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:27:00.000000000 -0400
@@ -63,7 +63,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/local/samba/var/log.%m
+   log file = /usr/local/samba/var/%m.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50

samba-3.0.23-smb.conf.patch:
 smb.conf |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE samba-3.0.23-smb.conf.patch ---
--- samba-3.0.23/packaging/Fedora/smb.conf.upstream	2006-07-11 11:29:05.000000000 -0400
+++ samba-3.0.23/packaging/Fedora/smb.conf	2006-07-11 11:30:45.000000000 -0400
@@ -57,6 +57,9 @@
 # bsd, cups, sysv, plp, lprng, aix, hpux, qnx
 ;   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
 ;  guest account = pcguest

samba-3.0.23rc3-passwd.patch:
 winbindd_group.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.23rc3-passwd.patch ---
--- samba-3.0.20pre1/source/nsswitch/#winbindd_group.c~	2005-06-22 15:08:05.000000000 -0400
+++ samba-3.0.20pre1/source/nsswitch/winbindd_group.c	2005-06-22 15:08:05.000000000 -0400
@@ -49,7 +49,7 @@
 	/* Group name and password */
     
 	safe_strcpy(gr->gr_name, full_group_name, sizeof(gr->gr_name) - 1);
-	safe_strcpy(gr->gr_passwd, "x", sizeof(gr->gr_passwd) - 1);
+	safe_strcpy(gr->gr_passwd, "*", sizeof(gr->gr_passwd) - 1);
 
 	return True;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	2 May 2005 19:36:01 -0000	1.24
+++ .cvsignore	13 Jul 2006 00:30:01 -0000	1.25
@@ -1 +1 @@
-samba-3.0.14a.tar.gz
+samba-3.0.23.tar.gz


Index: filter-requires-samba.sh
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/filter-requires-samba.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter-requires-samba.sh	24 Feb 2005 19:14:18 -0000	1.3
+++ filter-requires-samba.sh	13 Jul 2006 00:30:01 -0000	1.4
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI|Unicode::MapUTF8)'
 


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/samba.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- samba.spec	2 May 2005 19:36:01 -0000	1.51
+++ samba.spec	13 Jul 2006 00:30:01 -0000	1.52
@@ -2,15 +2,15 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.14a
-Release: 2
+Version: 3.0.23
+Release: 1.fc4
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 #TAG: change for non-pre
-#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}pre2.tar.gz
+#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc2.tar.gz
 Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz
 
 # Red Hat specific replacement-files
@@ -26,31 +26,31 @@
 # Don't depend on Net::LDAP
 Source999: filter-requires-samba.sh
 
+# upstream patches.  Applied first so that they'll break our patches rather
+# than the other way around
+# (none at the moment)
+
 # generic patches
-Patch1: samba-2.2.0-smbw.patch
-Patch2: samba-3.0.0beta1-pipedir.patch
-Patch3: samba-3.0.12pre1-logfiles.patch
-Patch4: samba-3.0.11rc1-pie.patch
-Patch5: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch6: samba-3.0.4-smb.conf.patch
-Patch7: samba-3.0.13-man.patch
-Patch8: samba-3.0.4-warning.patch
-Patch9: samba-3.0.5rc1-passwd.patch
-#Patch11: samba-3.0.8-non-ascii-domain.patch
-Patch12: samba-3.0.4-install.mount.smbfs.patch
-Patch13: samba-3.0.10-delim.patch
-Patch14: samba-3.0.9-smbspool.patch
-Patch15: samba-3.0.12rc1-gcc4.patch
-Patch16: samba-3.0.12pre1-quoting.patch
-Patch17: samba-3.0.13-smbclient.patch
+Patch101: samba-2.2.0-smbw.patch
+Patch102: samba-3.0.0beta1-pipedir.patch
+Patch103: samba-3.0.23-logfiles.patch
+Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
+Patch105: samba-3.0.23-smb.conf.patch
+Patch106: samba-3.0.20pre1-man.patch
+Patch107: samba-3.0.23rc3-passwd.patch
+#Patch108: samba-3.0.8-non-ascii-domain.patch
+#Patch109: samba-3.0.4-install.mount.smbfs.patch
+Patch110: samba-3.0.21pre1-smbspool.patch
+Patch111: samba-3.0.13-smbclient.patch
+Patch112: samba-3.0.15pre2-bug106483.patch
 
-Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} 
+Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d 
-BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel
-
+BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel
+BuildRequires: autoconf, libtool
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE999}
@@ -70,7 +70,7 @@
 %package client
 Summary: Samba (SMB) client programs.
 Group: Applications/System
-Requires: samba-common = %{epoch}:%{version}
+Requires: samba-common = %{epoch}:%{version}-%{release}
 Obsoletes: smbfs
 
 %description client
@@ -89,7 +89,7 @@
 %package swat
 Summary: The Samba SMB server configuration program.
 Group: Applications/System
-Requires: samba = %{epoch}:%{version} xinetd
+Requires: samba = %{epoch}:%{version}-%{release} xinetd
 
 %description swat
 The samba-swat package includes the new SWAT (Samba Web Administration
@@ -98,31 +98,33 @@
 
 %prep
 # TAG: change for non-pre
-#% setup -q -n samba-3.0.15pre2
+# % setup -q -n samba-3.0.20rc2
 %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
-
-%patch1 -p1 -b .smbw
-%patch2 -p1 -b .pipedir
-%patch3 -p1 -b .logfiles
-%patch4 -p1 -b .pie
-%patch5 -p1 -b .nmbd-netbiosname
-%patch6 -p1 -b .upstream
-%patch7 -p1 -b .man
-%patch8 -p1 -b .warning
-%patch9 -p1 -b .passwd
-#%patch11 -p1 -b .non-ascii-domain
-%patch12 -p1 -b .install.mount.smbfs
-%patch13 -p1 -b .delim
-%patch14 -p1 -b .smbspool
-%patch15 -p1 -b .gcc4
-%patch16 -p1 -b .quoting
-%patch17 -p1 -b .smbclient
+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)
+
+# generic patches
+%patch101 -p1 -b .smbw
+%patch102 -p1 -b .pipedir
+%patch103 -p1 -b .logfiles
+%patch104 -p1 -b .nmbd-netbiosname
+%patch105 -p1 -b .upstream
+%patch106 -p1 -b .man
+%patch107 -p1 -b .passwd
+#%patch108 -p1 -b .non-ascii-domain
+#%patch109 -p1 -b .install.mount.smbfs
+%patch110 -p1 -b .smbspool
+%patch111 -p1 -b .smbclient
+%patch112 -p1 -b .bug106483
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -133,8 +135,8 @@
 cd ..
 
 %build
-
 cd source
+sh autogen.sh
 %ifarch i386 sparc
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
 %endif
@@ -144,7 +146,7 @@
 autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
-CFLAGS=-D_GNU_SOURCE %configure \
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
 	--with-acl-support \
 	--with-automount \
 	--with-libsmbclient \
@@ -165,12 +167,13 @@
 	--with-libdir=%{_libdir}/samba \
 	--with-configdir=%{_sysconfdir}/samba \
 	--with-swatdir=%{_datadir}/swat \
+	--with-shared-modules=idmap_ad,idmap_rid \
 
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
+make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" \
 	proto
 
-make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
+make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %{?_smp_mflags} \
 	all nsswitch/libnss_wins.so modules
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
@@ -180,6 +183,9 @@
 	smbfilter
 
 ( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c )
+( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c )
+
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -216,14 +222,14 @@
 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
-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/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/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
@@ -231,11 +237,10 @@
 
 # pam_smbpass
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-mv source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
+install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 
 # winbind
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
-install -m 755 source/nsswitch/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so.2
 ln -sf /%{_lib}/libnss_winbind.so.2  $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so
@@ -258,13 +263,17 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
 
 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}/man5/smbgetrc.5*
-#rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
+
+# why are these getting installed in the wrong place?
+rm -f $RPM_BUILD_ROOT%{_libdir}/samba/security/pam_{smbpass,winbind}.so
+rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -307,8 +316,8 @@
 %defattr(-,root,root)
 %doc README COPYING Manifest 
 %doc WHATSNEW.txt Roadmap
-%doc docs/REVISION docs/Samba-Developers-Guide.pdf docs/Samba-Guide.pdf
-%doc docs/Samba-HOWTO-Collection.pdf docs/THANKS docs/history
+%doc docs/REVISION docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
+%doc docs/Samba3-HOWTO.pdf docs/THANKS docs/history
 %doc docs/htmldocs
 %doc docs/registry
 %doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
@@ -316,11 +325,9 @@
 
 %{_sbindir}/smbd
 %{_sbindir}/nmbd
-# %{_bindir}/make_unicodemap
 %{_bindir}/mksmbpasswd.sh
 %{_bindir}/smbcontrol
 %{_bindir}/smbstatus
-# %{_bindir}/smbadduser
 %{_bindir}/tdbbackup
 %{_bindir}/tdbdump
 %{_bindir}/tdbtool
@@ -329,7 +336,6 @@
 %attr(755,root,root) %config %{_initrddir}/smb
 %config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %config(noreplace) %{_sysconfdir}/pam.d/samba
-# %{_mandir}/man1/make_unicodemap.1*
 %{_mandir}/man1/smbcontrol.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man5/smbpasswd.5*
@@ -339,11 +345,6 @@
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/tdbbackup.8*
 %{_mandir}/man8/tdbdump.8*
-#%{_mandir}/ja/man1/smbstatus.1*
-#%{_mandir}/ja/man5/smbpasswd.5*
-#%{_mandir}/ja/man7/samba.7*
-#%{_mandir}/ja/man8/smbd.8*
-#%{_mandir}/ja/man8/nmbd.8*
 %{_libdir}/samba/vfs
 
 %attr(1777,root,root) %dir /var/spool/samba
@@ -354,7 +355,6 @@
 %{_datadir}/swat
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8*
-#%{_mandir}/ja/man8/swat.8*
 %attr(755,root,root) %{_libdir}/samba/*.msg
 
 %files client
@@ -362,17 +362,21 @@
 /sbin/mount.smb
 /sbin/mount.smbfs
 /sbin/mount.cifs
+/sbin/umount.cifs
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/smbmount
 %{_bindir}/smbmnt
 %{_bindir}/smbumount
 %{_bindir}/findsmb
+%{_bindir}/smbget
+%{_bindir}/eventlogadm
 %{_mandir}/man8/smbmnt.8*
 %{_mandir}/man8/smbmount.8*
 %{_mandir}/man8/smbumount.8*
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/mount.cifs.8*
+%{_mandir}/man8/umount.cifs.8*
 %{_bindir}/nmblookup
 %{_bindir}/smbclient
 %{_bindir}/smbprint
@@ -386,18 +390,21 @@
 %{_mandir}/man1/smbclient.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
-#%{_mandir}/ja/man1/smbtar.1*
-#%{_mandir}/ja/man1/smbclient.1*
-#%{_mandir}/ja/man1/nmblookup.1*
+%{_mandir}/man1/smbget.1*
 
 %files common
 %defattr(-,root,root)
 %attr(755,root,root) /%{_lib}/security/pam_smbpass.so
 %dir %{_libdir}/samba
 %dir %{_libdir}/samba/charset
+%dir %{_libdir}/samba/idmap
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
+%{_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
@@ -405,20 +412,19 @@
 /%{_lib}/security/pam_winbind.so
 %{_libdir}/libsmbclient.a
 %{_libdir}/libsmbclient.so
+%{_libdir}/libsmbclient.so.0
 %{_libdir}/samba/charset/CP*.so
 %{_includedir}/libsmbclient.h
+%{_includedir}/libmsrpc.h
+
 %{_bindir}/net
 %{_bindir}/testparm
-%{_bindir}/testprns
 %{_bindir}/smbpasswd
-# %{_bindir}/make_printerdef
 %{_bindir}/wbinfo
-# %{_bindir}/editreg
 %{_bindir}/ntlm_auth
 %{_bindir}/pdbedit
 %{_bindir}/profiles
 %{_bindir}/smbcquotas
-#%{_bindir}/vfstest
 %{_sbindir}/winbindd
 %dir /var/cache/samba
 %dir /var/run/winbindd
@@ -430,13 +436,10 @@
 %dir %{_sysconfdir}/samba
 %attr(0700,root,root) %dir /var/log/samba
 %{_initrddir}/winbind
-# %{_datadir}/samba/codepages/*
-# %{_mandir}/man1/make_smbcodepage.1*
 %{_mandir}/man1/ntlm_auth.1*
 %{_mandir}/man1/profiles.1*
 %{_mandir}/man1/smbcquotas.1*
 %{_mandir}/man1/testparm.1*
-%{_mandir}/man1/testprns.1*
 %{_mandir}/man5/smb.conf.5*
 %{_mandir}/man5/lmhosts.5*
 %{_mandir}/man8/smbpasswd.8*
@@ -444,16 +447,47 @@
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/net.8*
 %{_mandir}/man1/vfstest.1*
-%{_mandir}/man8/pam_winbind.8*
-
-# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
-#%lang(ja) %{_mandir}/ja/man1/testparm.1*
-#%lang(ja) %{_mandir}/ja/man1/testprns.1*
-#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
-#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
-#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
+%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc4
+- Update to 3.0.23 to close
+  bz#197836 CVE-2006-3403 Samba denial of service
+- include related spec file, filter-requires-samba.sh and patch changes
+  from rawhide.  -winbind, and -access patches are obsolete.
+- include the fixed smb.init file from rawhide, closing
+  bz#182560 Wrong retval for initscript when smbd is dead
+
+* Mon Oct 10 2005 Jay Fenlason <fenlason at redhat.com>
+- Upgrade to 3.0.20a, which includes all the previous upstream patches.
+- Include the -winbind patch from Jeremy Allison <jra at samba.org> to fix
+  a problem with winbind crashing.
+- Include the -access patch from Jeremy Allison <jra at samba.org> to fix
+  a problem with MS Access lock files.
+- Updated the -warnings patch for 3.0.20a.
+- Include  --with-shared-modules=idmap_ad,idmap_rid to close
+  bz#156810 ? --with-shared-modules=idmap_ad,idmap_rid
+- Include the new samba.pamd from Tomas Mraz (tmraz at redhat.com) to close
+  bz#170259 ? pam_stack is deprecated
+
+* Mon Aug 22 2005 Jay Fenlason <fenlason at redhat.com>
+- New upstream release
+  Includes five upstream patches -bug3010_v1, -groupname_enumeration_v3,
+    -regcreatekey_winxp_v1, -usrmgr_groups_v1, and -winbindd_v1
+  This obsoletes the -pie and -delim patches
+  the -warning and -gcc4 patches are obsolete too
+  The -man, -passwd, and -smbspool patches were updated to match 3.0.20pre1
+  Also, the -quoting patch was implemented differently upstream
+  There is now a umount.cifs executable and manpage
+  We run autogen.sh as part of the build phase
+  The testprns command is now gone
+  libsmbclient now has a man page
+- Include -bug106483 patch to close
+  bz#106483 smbclient: -N negates the provided password, despite documentation
+- Added the -warnings patch to quiet some compiler warnings.
+- Removed many obsolete patches from CVS.
+
 * Mon May 2 2005 Jay Fenlason <fenlason at redhat.com> 3.0.14a-2
 - New upstream release.
 - the -64bit-timestamps, -clitar, -establish_trust, user_rights_v1,


Index: smb.init
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/smb.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb.init	9 Sep 2004 12:12:38 -0000	1.5
+++ smb.init	13 Jul 2006 00:30:01 -0000	1.6
@@ -83,7 +83,11 @@
 
 rhstatus() {
 	status smbd
+	RETVAL=$?
 	status nmbd
+	if [ $? -ne 0 -o $RETVAL -ne 0 ] ; then
+		return 1
+	fi
 }	
 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	2 May 2005 19:36:01 -0000	1.26
+++ sources	13 Jul 2006 00:30:01 -0000	1.27
@@ -1 +1 @@
-ebee37e66a8b5f6fd328967dc09088e8  samba-3.0.14a.tar.gz
+f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz


--- samba-3.0.12pre1-logfiles.patch DELETED ---


--- samba-3.0.4-smb.conf.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:35:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:35:36 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.35,1.36
Message-ID: <200607130035.k6D0Za3e014701@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pwlib.spec 
Log Message:
fix missing br


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pwlib.spec	12 Jul 2006 07:54:20 -0000	1.35
+++ pwlib.spec	13 Jul 2006 00:35:34 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.1
-Release:        2.1
+Release:        3
 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
@@ -17,7 +17,7 @@
 %endif
 BuildRequires: alsa-lib-devel libstdc++-devel
 Requires: alsa-lib libstdc++
-BuildRequires: openldap-devel expat-devel SDL-devel flex
+BuildRequires: openldap-devel expat-devel SDL-devel flex bison
 
 %description
 PWLib is a moderately large class library that has its genesis many
@@ -90,8 +90,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-2.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-3
 - rebuild
+- Add missing br bison
 
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-2
 - adding missing BR flex



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:38:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:38:56 -0400
Subject: rpms/samba/FC-4 samba-3.0.20pre1-man.patch,NONE,1.1
Message-ID: <200607130038.k6D0cupR015239@cvs.devel.redhat.com>

Author: fenlason

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

Added Files:
	samba-3.0.20pre1-man.patch 
Log Message:
Forgot a patch.


samba-3.0.20pre1-man.patch:
 ntlm_auth.1 |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE samba-3.0.20pre1-man.patch ---
--- samba-3.0.12/docs/manpages/ntlm_auth.1.man	2005-03-17 16:12:35.000000000 -0500
+++ samba-3.0.12/docs/manpages/ntlm_auth.1	2005-03-18 13:30:56.000000000 -0500
@@ -96,63 +96,63 @@
 Username
 The username, expected to be in Samba's unix charset\&.
 
-Example?1.?Username: bob
+Example 1. Username: bob
 
-Example?2.?Username:: Ym9i
+Example 2. Username:: Ym9i
 
 .TP
 Username
 The user's domain, expected to be in Samba's unix charset\&.
 
-Example?3.?Domain: WORKGROUP
+Example 3. Domain: WORKGROUP
 
-Example?4.?Domain:: V09SS0dST1VQ
+Example 4. Domain:: V09SS0dST1VQ
 
 .TP
 Full\-Username
 The fully qualified username, expected to be in Samba's  and qualified with the winbind separator\&.
 
-Example?5.?Full\-Username: WORKGROUP\\bob
+Example 5. Full\-Username: WORKGROUP\\bob
 
-Example?6.?Full\-Username:: V09SS0dST1VQYm9i
+Example 6. Full\-Username:: V09SS0dST1VQYm9i
 
 .TP
 LANMAN\-Challenge
 The 8 byte \fBLANMAN Challenge\fR value, generated randomly by the server, or (in cases such as MSCHAPv2) generated in some way by both the server and the client\&.
 
-Example?7.?LANMAN\-Challege: 0102030405060708
+Example 7. LANMAN\-Challege: 0102030405060708
 
 .TP
 LANMAN\-Response
 The 24 byte \fBLANMAN Response\fR value, calculated from the user's password and the supplied \fBLANMAN Challenge\fR\&. Typically, this is provided over the network by a client wishing to authenticate\&.
 
-Example?8.?LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+Example 8. LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
 
 .TP
 NT\-Response
 The >= 24 byte \fBNT Response\fR calculated from the user's password and the supplied \fBLANMAN Challenge\fR\&. Typically, this is provided over the network by a client wishing to authenticate\&.
 
-Example?9.?NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+Example 9. NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
 
 .TP
 Password
 The user's password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&.
 
-Example?10.?Password: samba2
+Example 10. Password: samba2
 
-Example?11.?Password:: c2FtYmEy
+Example 11. Password:: c2FtYmEy
 
 .TP
 Request\-User\-Session\-Key
 Apon sucessful authenticaiton, return the user session key associated with the login\&.
 
-Example?12.?Request\-User\-Session\-Key: Yes
+Example 12. Request\-User\-Session\-Key: Yes
 
 .TP
 Request\-LanMan\-Session\-Key
 Apon sucessful authenticaiton, return the LANMAN session key associated with the login\&.
 
-Example?13.?Request\-LanMan\-Session\-Key: Yes
+Example 13. Request\-LanMan\-Session\-Key: Yes
 .RS .Sh "Warning" Implementors should take care to base64 encode any data (such as usernames/passwords) that may contain malicous user data, such as a newline\&. They may also need to decode strings from the helper, which likewise may have been base64 encoded\&. .RE
 
 .RE



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:42:58 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.2,1.3
Message-ID: <200607130042.k6D0gwd9016428@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16405

Modified Files:
	pygobject2.spec 
Log Message:
fix missing br


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygobject2.spec	12 Jul 2006 07:54:48 -0000	1.2
+++ pygobject2.spec	13 Jul 2006 00:42:56 -0000	1.3
@@ -4,7 +4,7 @@
 Summary: Python bindings for gobjects
 Name: pygobject2
 Version: 2.10.1
-Release: 2.1 
+Release: 3
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -16,6 +16,7 @@
 Buildrequires: glib2-devel >= 2.8
 # needed for automake/autoconf to work right with multilib python
 Buildrequires: automake >= 1.6.3-5
+Buildrequires: libtool
 
 %description
 Pygobjects is an extension module for python that gives you access to GLib's 
@@ -68,10 +69,12 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.10.1-3
 - rebuild
+- Add missing br libtool
 
 * Fri May 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.1-2
 - Cleanup
+
 * Fri May 12 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.1-1
 - Initial package



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:44:27 -0400
Subject: rpms/samba/FC-4 samba-3.0.15pre2-bug106483.patch,NONE,1.1
Message-ID: <200607130044.k6D0iRpt017063@cvs.devel.redhat.com>

Author: fenlason

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

Added Files:
	samba-3.0.15pre2-bug106483.patch 
Log Message:
Another missing patch.  When will it end?


samba-3.0.15pre2-bug106483.patch:
 client.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.15pre2-bug106483.patch ---
--- samba-3.0.15pre2/source/client/#client.c~	2005-05-23 11:51:14.000000000 -0400
+++ samba-3.0.15pre2/source/client/client.c	2005-05-23 11:52:21.000000000 -0400
@@ -3502,7 +3502,7 @@
 		}
 	}
 
-	if (poptPeekArg(pc) && !cmdline_auth_info.got_pass) { 
+	if (poptPeekArg(pc) ) { 
 		cmdline_auth_info.got_pass = True;
 		pstrcpy(cmdline_auth_info.password,poptGetArg(pc));  
 	}



From fedora-cvs-commits at redhat.com  Thu Jul 13 00:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 20:51:32 -0400
Subject: rpms/scim-anthy/devel scim-anthy.spec,1.30,1.31
Message-ID: <200607130051.k6D0pWcw001894@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	scim-anthy.spec 
Log Message:
add missing br


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- scim-anthy.spec	12 Jul 2006 08:07:33 -0000	1.30
+++ scim-anthy.spec	13 Jul 2006 00:51:29 -0000	1.31
@@ -2,14 +2,14 @@
 
 Name:           scim-anthy
 Version:        1.0.0
-Release:	2.1%{?dist}
+Release:	3%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
-BuildRequires:	anthy-devel >= 6700b-1 gettext-devel
+BuildRequires:	anthy-devel >= 6700b-1 gettext-devel automake
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -70,8 +70,9 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3
 - rebuild
+- Add missing br automake
 
 * Thu Jul  6 2006 Akira TAGOH <tagoh at redhat.com>
 - use dist tag.



From fedora-cvs-commits at redhat.com  Thu Jul 13 01:04:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 21:04:10 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.37,1.38
Message-ID: <200607130104.k6D14Au8005483@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5455

Modified Files:
	s390utils.spec 
Log Message:
add missing br


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- s390utils.spec	12 Jul 2006 08:05:28 -0000	1.37
+++ s390utils.spec	13 Jul 2006 01:03:41 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 1.1
+Release: 2
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -24,6 +24,7 @@
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
+BuildRequires: libsysfs-devel
 ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
@@ -150,8 +151,9 @@
 %{_mandir}/man8/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-1.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-2
 - rebuild
+- Add missing br libsysfs-devel
 
 * Wed May 17 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-1
 - Made src_vipa build on current toolchain again



From fedora-cvs-commits at redhat.com  Thu Jul 13 01:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 21:14:36 -0400
Subject: rpms/scim-tables/devel scim-tables.spec,1.26,1.27
Message-ID: <200607130114.k6D1EaJX008041@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-tables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8015

Modified Files:
	scim-tables.spec 
Log Message:
add missing br


Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- scim-tables.spec	12 Jul 2006 08:09:52 -0000	1.26
+++ scim-tables.spec	13 Jul 2006 01:14:33 -0000	1.27
@@ -8,7 +8,7 @@
 
 Name:		scim-tables
 Version:	0.5.6
-Release:	5.1
+Release:	6
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -18,7 +18,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires:	scim-devel, gtk2-devel
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel automake
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -452,8 +452,9 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-6
 - rebuild
+- Add missing br automake
 
 * Thu Apr 27 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-5
 - obsolete old scim-tables-{japanese,korean} subpackages



From fedora-cvs-commits at redhat.com  Thu Jul 13 01:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 21:22:56 -0400
Subject: rpms/elfutils/devel elfutils-0.122-cast.patch, NONE,
	1.1 elfutils.spec, 1.69, 1.70
Message-ID: <200607130122.k6D1MuXR024843@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24812

Modified Files:
	elfutils.spec 
Added Files:
	elfutils-0.122-cast.patch 
Log Message:
Build nit broke s390

elfutils-0.122-cast.patch:
 0 files changed

--- NEW FILE elfutils-0.122-cast.patch ---
# 
# old_revision [f2430dc0eb44237e21095615046752a3f2779806]
# 
# patch "src/ChangeLog"
#  from [f8c27340f5383e9b12ba61c17f42836427afb156]
#    to [d1f7cabb30fbf8fcd0d37e059ef91fe6d2bfa052]
# 
# patch "src/readelf.c"
#  from [c644fd7f7331b5041932ad76ea3dfd9de609fdbf]
#    to [e900c18372c2c54db50c064ddb119044cc65b61f]
# 
============================================================
--- src/ChangeLog	f8c27340f5383e9b12ba61c17f42836427afb156
+++ src/ChangeLog	d1f7cabb30fbf8fcd0d37e059ef91fe6d2bfa052
@@ -1,3 +1,8 @@
+2006-07-12  Roland McGrath  <roland at redhat.com>
+
+	* readelf.c (handle_gnu_hash): Add a cast for machines where
+	Elf32_Word != unsigned int.
+
 2006-07-12  Ulrich Drepper  <drepper at redhat.com>
 
 	* elflint.c (check_sysv_hash64): Fix printf format.
============================================================
--- src/readelf.c	c644fd7f7331b5041932ad76ea3dfd9de609fdbf
+++ src/readelf.c	e900c18372c2c54db50c064ddb119044cc65b61f
@@ -2534,7 +2534,7 @@
   if (asprintf (&str, gettext ("\
  Symbol Bias: %u\n\
  Bitmask Size: %zu bytes  %" PRIuFAST32 "%% bits set  2nd hash shift: %u\n"),
-		symbias, bitmask_words * sizeof (Elf32_Word),
+		(unsigned int) symbias, bitmask_words * sizeof (Elf32_Word),
 		(nbits * 100 + 50) / (bitmask_words * sizeof (Elf32_Word) * 8),
 		shift) == -1)
     error (EXIT_FAILURE, 0, gettext ("memory exhausted"));


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- elfutils.spec	12 Jul 2006 22:08:26 -0000	1.69
+++ elfutils.spec	13 Jul 2006 01:22:49 -0000	1.70
@@ -20,6 +20,7 @@
 Source: elfutils-%{version}.tar.gz
 Patch1: elfutils-portability.patch
 Patch2: elfutils-robustify.patch
+Patch3: elfutils-0.122-cast.patch
 Obsoletes: libelf libelf-devel
 Requires: elfutils-libelf = %{version}-%{release}
 Requires: elfutils-libs = %{version}-%{release}
@@ -110,6 +111,8 @@
 %prep
 %setup -q
 
+%patch3 -p0
+
 %if %{compat}
 %patch1 -p1
 sleep 1



From fedora-cvs-commits at redhat.com  Thu Jul 13 01:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 21:23:21 -0400
Subject: rpms/elfutils/devel elfutils.spec,1.70,1.71
Message-ID: <200607130123.k6D1NLV7024967@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24944

Modified Files:
	elfutils.spec 
Log Message:
Forgot the release bump


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- elfutils.spec	13 Jul 2006 01:22:49 -0000	1.70
+++ elfutils.spec	13 Jul 2006 01:23:18 -0000	1.71
@@ -1,5 +1,5 @@
 %define eu_version 0.122
-%define eu_release 1
+%define eu_release 2
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -217,7 +217,7 @@
 %{_libdir}/libelf.so
 
 %changelog
-* Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-1
+* Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-2
 - Update to 0.122
   - Fix libdwfl sorting of modules with 64-bit addresses (#198225).
   - libebl: add function to test for relative relocation



From fedora-cvs-commits at redhat.com  Thu Jul 13 01:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 21:44:14 -0400
Subject: rpms/kernel/devel linux-2.6-utrace.patch,1.3,1.4
Message-ID: <200607130144.k6D1iEWl030484@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	linux-2.6-utrace.patch 
Log Message:
Updated patch that dikes out more ia64 code.

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   26 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1475 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6840 insertions(+), 3196 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-utrace.patch	12 Jul 2006 20:23:00 -0000	1.3
+++ linux-2.6-utrace.patch	13 Jul 2006 01:44:10 -0000	1.4
@@ -14,7 +14,7 @@
  arch/ia64/kernel/asm-offsets.c          |    2 
  arch/ia64/kernel/fsys.S                 |   16 
  arch/ia64/kernel/mca.c                  |    2 
- arch/ia64/kernel/ptrace.c               |   39 -
+ arch/ia64/kernel/ptrace.c               |   41 -
  arch/mips/kernel/ptrace.c               |   21 
  arch/mips/kernel/sysirix.c              |    2 
  arch/powerpc/kernel/Makefile            |    4 
@@ -77,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6833 insertions(+), 3191 deletions(-)
+ 79 files changed, 6835 insertions(+), 3191 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -10065,7 +10065,23 @@
  #include <linux/smp_lock.h>
  #include <linux/user.h>
  #include <linux/security.h>
-@@ -1409,6 +1410,7 @@ ptrace_disable (struct task_struct *chil
+@@ -547,6 +548,7 @@ ia64_sync_user_rbs (struct task_struct *
+ 	return 0;
+ }
+ 
++#if 0				/* XXX */
+ static inline int
+ thread_matches (struct task_struct *thread, unsigned long addr)
+ {
+@@ -619,6 +621,7 @@ find_thread_for_addr (struct task_struct
+ 	mmput(mm);
+ 	return child;
+ }
++#endif
+ 
+ /*
+  * Write f32-f127 back to task->thread.fph if it has been modified.
+@@ -1409,6 +1412,7 @@ ptrace_disable (struct task_struct *chil
  	child_psr->tb = 0;
  }
  
@@ -10073,7 +10089,7 @@
  asmlinkage long
  sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data)
  {
-@@ -1593,32 +1595,7 @@ sys_ptrace (long request, pid_t pid, uns
+@@ -1593,32 +1597,7 @@ sys_ptrace (long request, pid_t pid, uns
  	unlock_kernel();
  	return ret;
  }
@@ -10107,7 +10123,7 @@
  
  /* "asmlinkage" so the input arguments are preserved... */
  
-@@ -1627,9 +1604,8 @@ syscall_trace_enter (long arg0, long arg
+@@ -1627,9 +1606,8 @@ syscall_trace_enter (long arg0, long arg
  		     long arg4, long arg5, long arg6, long arg7,
  		     struct pt_regs regs)
  {
@@ -10119,7 +10135,7 @@
  
  	if (unlikely(current->audit_context)) {
  		long syscall;
-@@ -1664,7 +1640,6 @@ syscall_trace_leave (long arg0, long arg
+@@ -1664,7 +1642,6 @@ syscall_trace_leave (long arg0, long arg
  		audit_syscall_exit(success, result);
  	}
  
@@ -10186,7 +10202,7 @@
  			asm volatile("sfpc %0,%0" : : "d" (0));
 --- linux-2.6/arch/s390/kernel/compat_linux.c.utrace-ptrace-compat
 +++ linux-2.6/arch/s390/kernel/compat_linux.c
-@@ -537,9 +537,6 @@ sys32_execve(struct pt_regs regs)
+@@ -540,9 +540,6 @@ sys32_execve(struct pt_regs regs)
  				 compat_ptr(regs.gprs[4]), &regs);
  	if (error == 0)
  	{
@@ -10207,7 +10223,7 @@
  #include <linux/timer.h>
  #include <linux/mm.h>
  #include <linux/smp.h>
-@@ -338,7 +338,7 @@ static inline void *get_check_address(st
+@@ -338,7 +338,7 @@ static inline void __user *get_check_add
  
  void do_single_step(struct pt_regs *regs)
  {



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:02:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:02:47 -0400
Subject: rpms/gnome-session/devel .cvsignore, 1.23, 1.24 gnome-session.spec,
	1.73, 1.74 sources, 1.23, 1.24
Message-ID: <200607130202.k6D22lrA018400@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	10 May 2006 17:52:34 -0000	1.23
+++ .cvsignore	13 Jul 2006 02:02:31 -0000	1.24
@@ -1 +1 @@
-gnome-session-2.15.1.tar.bz2
+gnome-session-2.15.4.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gnome-session.spec	12 Jul 2006 06:09:04 -0000	1.73
+++ gnome-session.spec	13 Jul 2006 02:02:31 -0000	1.74
@@ -3,8 +3,6 @@
 %define gtk2_version 2.2.0
 %define libgnome_version 2.3.0
 %define libgnomeui_version 2.3.0
-%define libbonobo_version 2.3.0
-%define libbonoboui_version 2.3.0
 %define gnome_vfs2_version 2.3.0
 %define gconf2_version 2.2.0
 %define gnome_desktop_version 2.2.0
@@ -13,8 +11,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.15.1
-Release: 5.1
+Version: 2.15.4
+Release: 1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -49,17 +47,16 @@
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
 Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch
-Patch13: gnome-session-2.13.92-make-config-dir.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: dbus-devel
+BuildRequires: libnotify-devel
 
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
@@ -68,6 +65,7 @@
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: libX11-devel libXt-devel
+BuildRequires: libXrandr-devel
 
 %description
 
@@ -85,7 +83,6 @@
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch12 -p1 -b .desensitize-invalid-buttons
-%patch13 -p1 -b .make-config-dir
 
 %build
 
@@ -163,6 +160,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-5.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	10 May 2006 17:52:34 -0000	1.23
+++ sources	13 Jul 2006 02:02:31 -0000	1.24
@@ -1 +1 @@
-62030f6fcec1bf9d3d46545c18720428  gnome-session-2.15.1.tar.bz2
+3d01584d05221f708a4e05b67aefaac2  gnome-session-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:06:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:06:30 -0400
Subject: rpms/elfutils/devel elfutils-0.122-cast.patch, 1.1,
	1.2 elfutils.spec, 1.71, 1.72
Message-ID: <200607130206.k6D26Trg019037@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19001

Modified Files:
	elfutils-0.122-cast.patch elfutils.spec 
Log Message:
Tweak s390 warning fix.

elfutils-0.122-cast.patch:
 0 files changed

Index: elfutils-0.122-cast.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-0.122-cast.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elfutils-0.122-cast.patch	13 Jul 2006 01:22:49 -0000	1.1
+++ elfutils-0.122-cast.patch	13 Jul 2006 02:06:25 -0000	1.2
@@ -7,7 +7,7 @@
 # 
 # patch "src/readelf.c"
 #  from [c644fd7f7331b5041932ad76ea3dfd9de609fdbf]
-#    to [e900c18372c2c54db50c064ddb119044cc65b61f]
+#    to [bbb36859cccf55acf4ca5ff5ddae0daeb4cea4ba]
 # 
 ============================================================
 --- src/ChangeLog	f8c27340f5383e9b12ba61c17f42836427afb156
@@ -23,13 +23,18 @@
  	* elflint.c (check_sysv_hash64): Fix printf format.
 ============================================================
 --- src/readelf.c	c644fd7f7331b5041932ad76ea3dfd9de609fdbf
-+++ src/readelf.c	e900c18372c2c54db50c064ddb119044cc65b61f
-@@ -2534,7 +2534,7 @@
++++ src/readelf.c	bbb36859cccf55acf4ca5ff5ddae0daeb4cea4ba
+@@ -2534,9 +2534,10 @@
    if (asprintf (&str, gettext ("\
   Symbol Bias: %u\n\
   Bitmask Size: %zu bytes  %" PRIuFAST32 "%% bits set  2nd hash shift: %u\n"),
 -		symbias, bitmask_words * sizeof (Elf32_Word),
+-		(nbits * 100 + 50) / (bitmask_words * sizeof (Elf32_Word) * 8),
+-		shift) == -1)
 +		(unsigned int) symbias, bitmask_words * sizeof (Elf32_Word),
- 		(nbits * 100 + 50) / (bitmask_words * sizeof (Elf32_Word) * 8),
- 		shift) == -1)
++		((nbits * 100 + 50)
++		 / (uint_fast32_t) (bitmask_words * sizeof (Elf32_Word) * 8)),
++		(unsigned int) shift) == -1)
      error (EXIT_FAILURE, 0, gettext ("memory exhausted"));
+ 
+   print_hash_info (ebl, scn, shdr, shstrndx, maxlength, nbucket, nsyms,


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- elfutils.spec	13 Jul 2006 01:23:18 -0000	1.71
+++ elfutils.spec	13 Jul 2006 02:06:25 -0000	1.72
@@ -1,5 +1,5 @@
 %define eu_version 0.122
-%define eu_release 2
+%define eu_release 3
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -217,7 +217,7 @@
 %{_libdir}/libelf.so
 
 %changelog
-* Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-2
+* Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-3
 - Update to 0.122
   - Fix libdwfl sorting of modules with 64-bit addresses (#198225).
   - libebl: add function to test for relative relocation



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:12:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:12:07 -0400
Subject: rpms/nautilus/devel .cvsignore, 1.40, 1.41 nautilus.spec, 1.108,
	1.109 sources, 1.43, 1.44
Message-ID: <200607130212.k6D2C7G6020224@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20167

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	13 Jun 2006 14:50:34 -0000	1.40
+++ .cvsignore	13 Jul 2006 02:12:04 -0000	1.41
@@ -1 +1 @@
-nautilus-2.15.2.tar.bz2
+nautilus-2.15.4.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- nautilus.spec	12 Jul 2006 07:25:56 -0000	1.108
+++ nautilus.spec	13 Jul 2006 02:12:04 -0000	1.109
@@ -2,7 +2,7 @@
 %define pango_version 1.1.3
 %define gtk2_version 2.6.0
 %define libgnomeui_version 2.6.0
-%define eel2_version 2.15.1
+%define eel2_version 2.15.4
 %define gnome_icon_theme_version 1.1.5
 %define libxml2_version 2.4.20
 %define gail_version 0.17-2
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.15.2
-Release:	1.1
+Version: 	2.15.4
+Release:	1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -178,6 +178,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	13 Jun 2006 14:50:34 -0000	1.43
+++ sources	13 Jul 2006 02:12:04 -0000	1.44
@@ -1 +1 @@
-1c175ed790330aa48bdb62de8ac98343  nautilus-2.15.2.tar.bz2
+720c96c2f4ddbd65c69eda6ab54b42ec  nautilus-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:15:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:15:38 -0400
Subject: rpms/SDL/devel SDL.spec,1.45,1.46
Message-ID: <200607130215.k6D2Fc1P031168@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31153

Modified Files:
	SDL.spec 
Log Message:
fix configure


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- SDL.spec	12 Jul 2006 08:10:52 -0000	1.45
+++ SDL.spec	13 Jul 2006 02:15:35 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 4.1
+Release: 5
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -15,7 +15,7 @@
 BuildRequires: esound-devel alsa-lib-devel
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libXt-devel libXrender-devel libXrandr-devel
+BuildRequires: libXt-devel libXrender-devel libXrandr-devel gettext-devel
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -53,15 +53,12 @@
 #autoconf
 #automake --foreign --include-deps --add-missing --force-missing --copy -a
 CFLAGS="$RPM_OPT_FLAGS -O3" CXXFLAGS="$RPM_OPT_FLAGS -O3" \
-./configure \
-   --prefix=%{_prefix} \
+%configure \
    --disable-video-svga --disable-video-ggi --disable-video-aalib \
    --disable-debug \
-   --sysconfdir=%{_sysconfdir} \
    --enable-sdl-dlopen \
    --enable-dlopen \
    --enable-arts-shared \
-   --libdir=%{_libdir} \
    --enable-esd-shared \
    --enable-alsa \
    --disable-rpath
@@ -101,8 +98,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.10-4.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.10-5
 - rebuild
+- use %%configure macro
 
 * Tue Jun 20 2006 Christopher Stone <chris.stone at gmail.com> 1.2.10-4
 - added missing (build) requires for libXt libXrender libXrandr



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:16:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:16:22 -0400
Subject: rpms/system-config-boot/devel system-config-boot.spec,1.13,1.14
Message-ID: <200607130216.k6D2GMmg032187@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-boot.spec 
Log Message:
add missing br


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- system-config-boot.spec	12 Jul 2006 08:22:00 -0000	1.13
+++ system-config-boot.spec	13 Jul 2006 02:16:20 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
 Version: 0.2.11
-Release: 3.1
+Release: 4
 URL: http://fedora.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -18,7 +18,7 @@
 Obsoletes: redhat-config-boot
 Provides: redhat-config-boot = %{version}
 BuildRequires: desktop-file-utils 
-BuildRequires: perl(XML::Parser)
+BuildRequires: perl(XML::Parser) gettext
 
 %description
 system-config-boot is a graphical user interface that allows 
@@ -64,8 +64,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-boot
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-3.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-4
 - rebuild
+- Add missing br gettext
 
 * Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-3
 - Added missing BuildRequire on perl-XML-Parser



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:19:44 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.18,1.19
Message-ID: <200607130219.k6D2JiHo013800@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tomboy.spec 
Log Message:
add missing br


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tomboy.spec	12 Jul 2006 08:30:54 -0000	1.18
+++ tomboy.spec	13 Jul 2006 02:19:41 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        5.1
+Release:        6
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -24,6 +24,7 @@
 BuildRequires:  dbus-sharp
 BuildRequires:  gmime-sharp
 BuildRequires:	mono-devel
+BuildRequires:	gettext
 
 
 Requires:	gtkspell
@@ -105,8 +106,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-6
 - rebuild
+- Add missing br gettext
 
 * Thu May 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 0.3.5-5
 - rebuild



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:28:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:28:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2389,1.2390
Message-ID: <200607130228.k6D2S8Pp014036@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Build separate debuginfo subpackages instead of a single one.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2389
retrieving revision 1.2390
diff -u -r1.2389 -r1.2390
--- kernel-2.6.spec	13 Jul 2006 00:00:10 -0000	1.2389
+++ kernel-2.6.spec	13 Jul 2006 02:28:05 -0000	1.2390
@@ -17,7 +17,7 @@
 
 # Versions of various parts
 
-# After branching, please hardcode these values as the 
+# After branching, please hardcode these values as the
 # %dist and %rhel tags are not reliable yet
 # For example dist -> .el5 and rhel -> 5
 #% define dist .XX
@@ -77,7 +77,7 @@
 %ifarch ppc64iseries i686
 %define buildheaders 0
 %endif
-	
+
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
@@ -681,7 +681,7 @@
     $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
-%endif  
+%endif
 
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
@@ -790,7 +790,7 @@
 # Warn if someone tries to build userspace using kernel headers
 %patch801 -p1
 
-# Exec shield 
+# Exec shield
 %patch810 -p1
 #%patch811 -p1
 
@@ -1098,6 +1098,7 @@
 
 %if "%{_enable_debug_packages}" == "1"
     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot
+    mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/%{image_install_path}
 %endif
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
@@ -1286,6 +1287,62 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
+
+###
+### Special hacks for debuginfo subpackages.
+###
+
+# This macro is used by %%install, so we must redefine it before that.
+%define debug_package %{nil}
+
+%if "%{_enable_debug_packages}" == "1"
+%ifnarch noarch
+%global __debug_package 1
+%package debuginfo-common
+Summary: Kernel source files used by %{name}-debuginfo packages
+Group: Development/Debug
+Provides: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}
+
+%description debuginfo-common
+This package is required by %{name}-debuginfo subpackages.
+It provides the kernel source files common to all builds.
+
+%files debuginfo-common
+%defattr(-,root,root)
+/usr/src/debug/%{name}-%{version}/linux-%{kversion}.%{_target_cpu}
+%dir /usr/src/debug
+%dir /usr/lib/debug
+%dir /usr/lib/debug/%{image_install_path}
+%dir /usr/lib/debug/lib
+%dir /usr/lib/debug/lib/modules
+%dir /usr/lib/debug/usr/src/kernels
+%endif
+%endif
+
+# First argument: 		subpackage name (e.g. smp)
+# Second argument, optional:	dir with variant-named stripped ELF (e.g. boot)
+# Third argument, optional:	suffix in that dir, if not -%{1} (e.g. -PAE)
+%define build_debuginfo() \
+%if "%{_enable_debug_packages}" == "1"\
+%ifnarch noarch\
+%%package %{?1:%{1}-}debuginfo\
+Summary: Debug information for package %{name}%{?1:-%{1}}\
+Group: Development/Debug\
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}\
+Provides: %{name}-%{?1:%{1}-}debuginfo-%{_target_cpu} = %{KVERREL}\
+%%description %{?1:%{1}-}debuginfo\
+This package provides debug information for package %{name}%{?1:-%{1}}.\
+This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
+%%files %{?1:%{1}-}debuginfo\
+%defattr(-,root,root)\
+%{?2:/usr/lib/debug/%{2}/*-%{KVERREL}%{?3}%{!?3:%{?1}}.debug}\
+/usr/lib/debug/lib/modules/%{KVERREL}%{?1}\
+/usr/lib/debug/usr/src/kernels/%{KVERREL}%{?1:-%{1}}-%{_target_cpu}\
+%endif\
+%endif\
+%{nil}
+
+
 ###
 ### install
 ###
@@ -1385,9 +1442,9 @@
 
 %post xen
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
-if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then 
+if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
-else 
+else
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
@@ -1402,9 +1459,9 @@
 
 %post xen-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE
-if [ -e /proc/xen/xsd_kva ]; then 
+if [ -e /proc/xen/xsd_kva ]; then
 	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE
-else 
+else
 	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE
 fi
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
@@ -1453,7 +1510,8 @@
 ###
 
 %if %{buildup}
-%files 
+%build_debuginfo
+%files
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
 /boot/System.map-%{KVERREL}
@@ -1480,6 +1538,7 @@
 %endif
 
 %if %{buildpae}
+%build_debuginfo PAE
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1502,6 +1561,7 @@
 %endif
 
 %if %{buildsmp}
+%build_debuginfo smp
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1525,6 +1585,7 @@
 
 %if %{includexen}
 %if %{buildxen}
+%build_debuginfo xen boot
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1550,6 +1611,7 @@
 %endif
 
 %if %{buildxenPAE}
+%build_debuginfo xen-PAE boot -PAE
 %files xen-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
@@ -1578,6 +1640,7 @@
 %if %{buildkdump}
 
 %files kdump
+%build_debuginfo kdump %{image_install_path}
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
 /boot/System.map-%{KVERREL}kdump
@@ -1609,6 +1672,9 @@
 %endif
 
 %changelog
+* Wed Jul 12 2006 Roland McGrath <roland at redhat.com>
+- Build separate debuginfo subpackages instead of a single one.
+
 * Wed Jul 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git5
 - Make serial console installs on ia64 work again.
@@ -2142,4 +2208,3 @@
 * Tue Mar 14 2006 Dave Jones <davej at redhat.com>
 - FC5 final kernel
 - 2.6.16-rc6-git3
-



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:32:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:32:15 -0400
Subject: rpms/kernel/devel linux-2.6-random-patches.patch,1.16,1.17
Message-ID: <200607130232.k6D2WFCR014298@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-random-patches.patch 
Log Message:
akpm snafu

linux-2.6-random-patches.patch:
 a/fs/file.c                                                |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c       |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c    |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c |    2 +-
 linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c       |    5 +----
 6 files changed, 6 insertions(+), 10 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-2.6-random-patches.patch	4 Jul 2006 21:03:12 -0000	1.16
+++ linux-2.6-random-patches.patch	13 Jul 2006 02:32:04 -0000	1.17
@@ -81,3 +81,33 @@
 # 	}
 # 	if (!ata_dev_present(dev))
 
+
+ [<c0136fcf>] out_of_memory+0x29/0xf6
+ [<c0137f48>] __alloc_pages+0x1ed/0x276
+ [<c014db73>] kmem_getpages+0x63/0xc1
+ [<c014e960>] cache_grow+0xaa/0x139
+ [<c014eb6a>] cache_alloc_refill+0x17b/0x1c0
+ [<c014f1ef>] __kmalloc+0x83/0x93
+ [<c0168cf5>] alloc_fd_array+0x19/0x24
+ [<c0169122>] alloc_fdtable+0xb2/0xef
+ [<c016917f>] expand_fdtable+0x20/0x7d
+ [<c0169221>] expand_files+0x45/0x50
+ [<c0161263>] locate_fd+0x70/0x8e
+ [<c01612aa>] dupfd+0x29/0x61
+ [<c01613dc>] sys_dup+0x1b/0x23
+ [<c01027d3>] syscall_call+0x7/0xb
+
+I suspect that's because I had me a little mistake.
+
+--- a/fs/file.c~alloc_fdtable-expansion-fix
++++ a/fs/file.c
+@@ -240,7 +240,7 @@ static struct fdtable *alloc_fdtable(int
+ 	if (!fdt)
+   		goto out;
+ 
+-	nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nfds));
++	nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1));
+ 	if (nfds > NR_OPEN)
+ 		nfds = NR_OPEN;
+ 
+



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:34:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:34:37 -0400
Subject: rpms/vorbis-tools/devel vorbis-tools.spec,1.18,1.19
Message-ID: <200607130234.k6D2YbF2014366@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14350

Modified Files:
	vorbis-tools.spec 
Log Message:
add missing br


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vorbis-tools.spec	12 Jul 2006 08:45:12 -0000	1.18
+++ vorbis-tools.spec	13 Jul 2006 02:34:35 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1
-Release: 1.2.2
+Release:	2
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -13,6 +13,7 @@
 Requires:	libogg >= 2:1.1, libvorbis >= 1:%{version}, libao >= 0.8.4
 BuildPrereq:	libvorbis-devel >= 1:%{version}, libao-devel >= 0.8.4, curl-devel >= 7.8
 BuildPrereq:	speex-devel, flac-devel
+BuildRequires:	libtool
 Obsoletes:	vorbis
 Provides:	vorbis
 
@@ -54,8 +55,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-1.2.2
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-2
 - rebuild
+- Add missing br libtool
 
 * 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)



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:35:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:35:56 -0400
Subject: rpms/pygtk2/devel pygtk.spec,1.57,1.58
Message-ID: <200607130235.k6D2Zuv5014428@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14411

Modified Files:
	pygtk.spec 
Log Message:
2.9.3



Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pygtk.spec	12 Jul 2006 18:44:34 -0000	1.57
+++ pygtk.spec	13 Jul 2006 02:35:54 -0000	1.58
@@ -2,8 +2,8 @@
 
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
-Version: 2.9.2
-Release: 1.1
+Version: 2.9.3
+Release: 1
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -27,7 +27,6 @@
 BuildRequires: libtool
 
 Patch0: pygtk-2.9.2-use-complete-include-path.patch
-Patch1: pygtk-2.9.2-gtk2.9.4.patch
 
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
@@ -58,7 +57,6 @@
 %prep
 %setup -q -n pygtk-%{version}
 %patch0 -p1 -b .use-complete-include-path
-%patch1 -p1 -b .gtk294
 
 %build
 %configure --enable-thread --enable-numpy
@@ -117,6 +115,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-1
+- Update to 2.9.3
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.2-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 02:48:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 22:48:00 -0400
Subject: rpms/pygtk2/devel .cvsignore,1.28,1.29 sources,1.28,1.29
Message-ID: <200607130248.k6D2m0s3029538@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29520

Modified Files:
	.cvsignore sources 
Log Message:
fix sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	22 Jun 2006 16:43:47 -0000	1.28
+++ .cvsignore	13 Jul 2006 02:47:58 -0000	1.29
@@ -1 +1 @@
-pygtk-2.9.2.tar.bz2
+pygtk-2.9.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Jun 2006 16:43:47 -0000	1.28
+++ sources	13 Jul 2006 02:47:58 -0000	1.29
@@ -1 +1 @@
-2625ddd1aba04869eb2f9e4d4cc5552b  pygtk-2.9.2.tar.bz2
+7dce749a2bac4b9c8ba4ca7f44c1162f  pygtk-2.9.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 03:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 23:18:33 -0400
Subject: rpms/gnucash/devel .cvsignore,1.21,1.22
Message-ID: <200607130318.k6D3IXvo025288@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25264

Modified Files:
	.cvsignore 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Jul 2006 18:57:16 -0000	1.21
+++ .cvsignore	13 Jul 2006 03:18:31 -0000	1.22
@@ -1,5 +1,2 @@
-gnucash-1.9.7.tar.gz
-gnucash-docs-1.9.0.tar.gz
-gnucash-1.9.8.tar.gz
 gnucash-2.0.0.tar.gz
 gnucash-docs-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 03:19:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 23:19:12 -0400
Subject: rpms/pygobject2/devel .cvsignore, 1.2, 1.3 pygobject2.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200607130319.k6D3JC7x025538@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25470

Modified Files:
	.cvsignore pygobject2.spec sources 
Log Message:
2.11.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 May 2006 18:13:21 -0000	1.2
+++ .cvsignore	13 Jul 2006 03:19:10 -0000	1.3
@@ -1 +1 @@
-pygobject-2.10.1.tar.bz2
+pygobject-2.11.0.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygobject2.spec	13 Jul 2006 00:42:56 -0000	1.3
+++ pygobject2.spec	13 Jul 2006 03:19:10 -0000	1.4
@@ -3,8 +3,8 @@
 
 Summary: Python bindings for gobjects
 Name: pygobject2
-Version: 2.10.1
-Release: 3
+Version: 2.11.0
+Release: 1
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.0-1
+- Update to 2.11.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.10.1-3
 - rebuild
 - Add missing br libtool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 May 2006 18:13:21 -0000	1.2
+++ sources	13 Jul 2006 03:19:10 -0000	1.3
@@ -1 +1 @@
-3a69a75b4dfdb52642f26a4d45fcfde8  pygobject-2.10.1.tar.bz2
+5a437150bdffdcdb5c7de7f3f6906449  pygobject-2.11.0.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 03:21:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 23:21:22 -0400
Subject: rpms/gnucash/FC-5 .cvsignore, 1.12.2.7, 1.12.2.8 gnucash.spec,
	1.18.2.17, 1.18.2.18 sources, 1.12.2.7, 1.12.2.8
Message-ID: <200607130321.k6D3LMDN026349@cvs.devel.redhat.com>

Author: notting

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

Modified Files:
      Tag: gnucash-g2-branch
	.cvsignore gnucash.spec sources 
Log Message:
update to 2.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/.cvsignore,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- .cvsignore	18 May 2006 06:11:25 -0000	1.12.2.7
+++ .cvsignore	13 Jul 2006 03:21:19 -0000	1.12.2.8
@@ -1,4 +1,2 @@
-gnucash-1.9.5.tar.gz
-gnucash-docs-1.9.5.svn13798.tar.bz2
-gnucash-1.9.6.tar.gz
-gnucash-docs-1.9.6.svn14125.tar.bz2
+gnucash-2.0.0.tar.gz
+gnucash-docs-2.0.0.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/gnucash.spec,v
retrieving revision 1.18.2.17
retrieving revision 1.18.2.18
diff -u -r1.18.2.17 -r1.18.2.18
--- gnucash.spec	18 May 2006 06:11:25 -0000	1.18.2.17
+++ gnucash.spec	13 Jul 2006 03:21:19 -0000	1.18.2.18
@@ -1,14 +1,15 @@
-%define svnrev 14125
+%define svnrev 14285
 
 %define buildsvn 0
+%define docver 2.0.0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.6
+Version: 2.0.0
 %if %{buildsvn}
-Release: 0.svn%{svnrev}.1
+Release: 2.%{svnrev}svn.1
 %else
-Release: 0
+Release: 1.fc5
 %endif
 License: GPL/GFDL
 Group: Applications/Productivity
@@ -17,12 +18,12 @@
 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
+Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz
 %endif
 Patch3: gnucash-1.8.11-icon.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 Patch5: gnucash-1.8.12-aq.patch
+Patch7: gnucash-1.9.5-guile18.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
 BuildRequires: libgsf-devel >= 1.12.2
@@ -30,6 +31,7 @@
 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
+BuildRequires: gettext, slib >= 3a1-5, libtool
 Requires: slib >= 3a1-5
 # hack
 Requires: perl(Date::Manip)
@@ -66,8 +68,12 @@
 
 make LIBTOOL=/usr/bin/libtool CC=gcc
 
+%if %{buildsvn}
 cd gnucash-docs
 ./autogen.sh --prefix=/usr
+%else
+cd gnucash-docs-%{docver}
+%endif
 %configure
 make
 
@@ -78,7 +84,12 @@
 
 %find_lang %{name}
 
+%if %{buildsvn}
 cd gnucash-docs
+%else
+cd gnucash-docs-%{docver}
+%endif
+
 make install DESTDIR=$RPM_BUILD_ROOT || :
 
 # vfolder desktop file install stuff
@@ -121,7 +132,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,755)
 %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/gnucash
+%dir %{_sysconfdir}/gnucash
 %{_bindir}/*
 %{_libexecdir}/gnucash
 %{_libdir}/*
@@ -129,16 +140,31 @@
 %{_datadir}/xml/*
 %{_datadir}/gnucash
 %{_datadir}/gnome/help/gnucash
-%{_datadir}/mime-info/gnucash.*
+#%{_datadir}/mime-info/gnucash.*
 %{_datadir}/omf/gnucash-docs
 %{_datadir}/applications/*
+%{_datadir}/pixmaps/*
 %{_mandir}/man*/*
-%config %{_sysconfdir}/gnucash
+%config %{_sysconfdir}/gnucash/*
 %doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Wed May 17 2006 Bill Nottingham <notting at redhat.com> - 1.9.6-0
+* Mon Jul 10 2006 Bill Nottingham <notting at redhat.com> - 2.0.0-1.fc5
+- update to 2.0.0. Woo.
+
+* Mon Jun 19 2006 Bill Nottingham <notting at redhat.com> - 1.9.8-1
+- update to 1.9.8
+
+* Tue Jun  6 2006 Bill Nottingham <notting at redhat.com> - 1.9.7-1
+- update to 1.9.7
+- use official docs tarball, not svn snapshot
+
+* Thu May 25 2006 Bill Nottingham <notting at redhat.com> - 1.9.6-2
+- update docs to latest svn (gets rid of extraneous configure check
+  for db185)
+
+* Wed May 17 2006 Bill Nottingham <notting at redhat.com> - 1.9.6-1
 - update to 1.9.6
 
 * Tue May  9 2006 Bill Nottingham <notting at redhat.com> - 1.9.5-3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/FC-5/sources,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -u -r1.12.2.7 -r1.12.2.8
--- sources	18 May 2006 06:11:25 -0000	1.12.2.7
+++ sources	13 Jul 2006 03:21:19 -0000	1.12.2.8
@@ -1,2 +1,2 @@
-ba5164c17c4c6550f8fa00b2d926c1ad  gnucash-1.9.6.tar.gz
-1d3ddeb14860c8af3d4d9316ba80339f  gnucash-docs-1.9.6.svn14125.tar.bz2
+d5802c398825500ec322bb2b3229aadd  gnucash-2.0.0.tar.gz
+9a84f681330aa61ea1aa7448b87e86a4  gnucash-docs-2.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 03:29:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 23:29:12 -0400
Subject: rpms/gnucash/FC-5 gnucash-1.9.5-guile18.patch,NONE,1.1.2.1
Message-ID: <200607130329.k6D3TCjl029345@cvs.devel.redhat.com>

Author: notting

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

Added Files:
      Tag: gnucash-g2-branch
	gnucash-1.9.5-guile18.patch 
Log Message:
add old patch

gnucash-1.9.5-guile18.patch:
 engine-helpers.c |    7 -------
 1 files changed, 7 deletions(-)

--- NEW FILE gnucash-1.9.5-guile18.patch ---
--- gnucash-1.9.5/src/engine/engine-helpers.c.foo	2006-05-09 17:08:56.000000000 -0400
+++ gnucash-1.9.5/src/engine/engine-helpers.c	2006-05-09 17:09:05.000000000 -0400
@@ -1686,8 +1686,6 @@
 
   if (!q) return SCM_BOOL_F;
 
-  ++scm_block_gc;
-
   /* terms */
   pair = scm_cons (gnc_query_terms2scm (qof_query_get_terms (q)), SCM_EOL);
   pair = scm_cons (scm_str2symbol ("terms"), pair);
@@ -1723,7 +1721,6 @@
 
   /* Reverse this list; tag it as 'query-v2' */
   pair = scm_reverse (query_scm);
-  --scm_block_gc;
   return scm_cons (scm_str2symbol ("query-v2"), pair);
 }
 
@@ -1928,8 +1925,6 @@
   gboolean si1 = TRUE, si2 = TRUE, si3 = TRUE;
   int max_results = -1;
 
-  ++scm_block_gc;
-
   while (!SCM_NULLP (query_scm))
   {
     const gchar *symbol;
@@ -2008,8 +2003,6 @@
     }
   }
 
-  --scm_block_gc;
-
   if (ok && search_for) {
     qof_query_search_for (q, search_for);
     qof_query_set_sort_order (q, sp1, sp2, sp3);



From fedora-cvs-commits at redhat.com  Thu Jul 13 03:46:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 12 Jul 2006 23:46:48 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.109,1.110
Message-ID: <200607130346.k6D3kmeG011322@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9083

Modified Files:
	nautilus.spec 
Log Message:
Break dependency loop



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- nautilus.spec	13 Jul 2006 02:12:04 -0000	1.109
+++ nautilus.spec	13 Jul 2006 03:46:45 -0000	1.110
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.15.4
-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
@@ -42,10 +42,9 @@
 PreReq:    scrollkeeper >= 0.1.4
 
 # Not technically required, but we want them on upgrades:
-%ifnarch  s390 s390x
-Requires:	nautilus-cd-burner
-%endif
-
+#%ifnarch  s390 s390x
+#Requires:	nautilus-cd-burner
+#%endif
 
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:	pango-devel >= %{pango_version}
@@ -178,6 +177,10 @@
 %{_includedir}/nautilus
 
 %changelog
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Don't require nautilus-cd-burner, to avoid a 
+  BuildRequires-Requires loop
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:01:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:01:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2390,1.2391
Message-ID: <200607130401.k6D41YCC021812@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix debuginfo spec magic.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2390
retrieving revision 1.2391
diff -u -r1.2390 -r1.2391
--- kernel-2.6.spec	13 Jul 2006 02:28:05 -0000	1.2390
+++ kernel-2.6.spec	13 Jul 2006 04:01:31 -0000	1.2391
@@ -100,6 +100,7 @@
 #define signmodules 1
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define kernel_image_elf 1
 %endif
 
 %ifarch s390
@@ -134,6 +135,7 @@
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
+%define kernel_image_elf 1
 %define buildsmp 1
 %endif
 
@@ -1319,25 +1321,28 @@
 %endif
 %endif
 
-# First argument: 		subpackage name (e.g. smp)
-# Second argument, optional:	dir with variant-named stripped ELF (e.g. boot)
-# Third argument, optional:	suffix in that dir, if not -%{1} (e.g. -PAE)
+# First argument: 		dir with variant-named stripped ELF (e.g. boot)
+#				may be empty
+# Second argument, optional:	subpackage name (e.g. smp)
+# Third argument, optional:	suffix in %1 dir, if not -%2 (e.g. -PAE)
 %define build_debuginfo() \
 %if "%{_enable_debug_packages}" == "1"\
 %ifnarch noarch\
-%%package %{?1:%{1}-}debuginfo\
-Summary: Debug information for package %{name}%{?1:-%{1}}\
+%%package %{?2:%{2}-}debuginfo\
+Summary: Debug information for package %{name}%{?2:-%{2}}\
 Group: Development/Debug\
 Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL}\
-Provides: %{name}-%{?1:%{1}-}debuginfo-%{_target_cpu} = %{KVERREL}\
-%%description %{?1:%{1}-}debuginfo\
-This package provides debug information for package %{name}%{?1:-%{1}}.\
-This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
-%%files %{?1:%{1}-}debuginfo\
+Provides: %{name}-%{?2:%{2}-}debuginfo-%{_target_cpu} = %{KVERREL}\
+%%description %{?2:%{2}-}debuginfo\
+This package provides debug information for package %{name}%{?2:-%{2}}.\
+This is required to use SystemTap with %{name}%{?2:-%{2}}-%{KVERREL}.\
+%%files %{?2:%{2}-}debuginfo\
 %defattr(-,root,root)\
-%{?2:/usr/lib/debug/%{2}/*-%{KVERREL}%{?3}%{!?3:%{?1}}.debug}\
-/usr/lib/debug/lib/modules/%{KVERREL}%{?1}\
-/usr/lib/debug/usr/src/kernels/%{KVERREL}%{?1:-%{1}}-%{_target_cpu}\
+%if "%{?1}" != ""\
+/usr/lib/debug/%{?1}/*-%{KVERREL}%{?3}%{!?3:%{?2}}.debug\
+%endif\
+/usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
+/usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
 %endif\
 %endif\
 %{nil}
@@ -1510,7 +1515,7 @@
 ###
 
 %if %{buildup}
-%build_debuginfo
+%build_debuginfo %{?kernel_image_elf:%{image_install_path}}
 %files
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1538,7 +1543,7 @@
 %endif
 
 %if %{buildpae}
-%build_debuginfo PAE
+%build_debuginfo %{?kernel_image_elf:%{image_install_path}} PAE
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1561,7 +1566,7 @@
 %endif
 
 %if %{buildsmp}
-%build_debuginfo smp
+%build_debuginfo %{?kernel_image_elf:%{image_install_path}} smp
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1585,7 +1590,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-%build_debuginfo xen boot
+%build_debuginfo boot xen
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1611,7 +1616,7 @@
 %endif
 
 %if %{buildxenPAE}
-%build_debuginfo xen-PAE boot -PAE
+%build_debuginfo boot xen-PAE -PAE
 %files xen-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
@@ -1640,7 +1645,7 @@
 %if %{buildkdump}
 
 %files kdump
-%build_debuginfo kdump %{image_install_path}
+%build_debuginfo %{image_install_path} kdump
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
 /boot/System.map-%{KVERREL}kdump



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:15:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:15:13 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.4,1.5
Message-ID: <200607130415.k6D4FDQL023930@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23868

Modified Files:
	pygobject2.spec 
Log Message:
fix file lists



Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygobject2.spec	13 Jul 2006 03:19:10 -0000	1.4
+++ pygobject2.spec	13 Jul 2006 04:15:05 -0000	1.5
@@ -60,7 +60,7 @@
 %{_libdir}/python%{pyver}/site-packages/pygtk*
 
 %defattr(755, root, root, 755)
-%{_libdir}/python?.?/site-packages/gtk-2.0/gobject.so
+%{_libdir}/python?.?/site-packages/gtk-2.0/gobject
 
 %files devel
 %defattr(644, root, root, 755)



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:30:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:30:01 -0400
Subject: rpms/gnome-python2/devel .cvsignore, 1.16, 1.17 gnome-python.spec,
	1.39, 1.40 sources, 1.16, 1.17
Message-ID: <200607130430.k6D4U1ZN008554@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-python.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 Jun 2006 19:27:05 -0000	1.16
+++ .cvsignore	13 Jul 2006 04:29:48 -0000	1.17
@@ -1 +1 @@
-gnome-python-2.15.2.tar.bz2
+gnome-python-2.15.4.tar.bz2


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-python.spec	12 Jul 2006 06:05:26 -0000	1.39
+++ gnome-python.spec	13 Jul 2006 04:29:49 -0000	1.40
@@ -6,8 +6,8 @@
 
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
-Version: 2.15.2
-Release: 1.1
+Version: 2.15.4
+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
 
@@ -181,7 +181,10 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
 - rebuild
 
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Jun 2006 19:27:05 -0000	1.16
+++ sources	13 Jul 2006 04:29:49 -0000	1.17
@@ -1 +1 @@
-d0ec52fafc7c307028f5208e06bda98e  gnome-python-2.15.2.tar.bz2
+d97bbe81bb6c3a2a02740d5af9eb1d2a  gnome-python-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:37:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:37:18 -0400
Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.5,
	1.6 gnome-python-desktop.spec, 1.16, 1.17 sources, 1.5, 1.6
Message-ID: <200607130437.k6D4bITI009551@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9488

Modified Files:
	.cvsignore gnome-python-desktop.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 14:05:16 -0000	1.5
+++ .cvsignore	13 Jul 2006 04:37:06 -0000	1.6
@@ -1 +1 @@
-gnome-python-desktop-2.15.3.tar.bz2
+gnome-python-desktop-2.15.4.tar.bz2


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-python-desktop.spec	12 Jul 2006 06:05:58 -0000	1.16
+++ gnome-python-desktop.spec	13 Jul 2006 04:37:07 -0000	1.17
@@ -14,8 +14,8 @@
 
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
-Version: 2.15.3
-Release: 4.1
+Version: 2.15.4
+Release: 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
@@ -254,6 +254,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-4.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2006 14:05:17 -0000	1.5
+++ sources	13 Jul 2006 04:37:07 -0000	1.6
@@ -1 +1 @@
-02274896fb2e1bd9ca57989fc02832d0  gnome-python-desktop-2.15.3.tar.bz2
+83dd68a0cec2f32966660a6b9abbef08  gnome-python-desktop-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:46:01 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.35,
	1.36
Message-ID: <200607130446.k6D4k1Lm010990@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
- Add dist tag.



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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-proto-devel.spec	12 Jul 2006 09:18:21 -0000	1.35
+++ xorg-x11-proto-devel.spec	13 Jul 2006 04:45:47 -0000	1.36
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 2.1
+Release: 3%{dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -275,7 +275,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
+- Add dist tag.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-2.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-2



From fedora-cvs-commits at redhat.com  Thu Jul 13 04:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 00:46:01 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.64,1.65
Message-ID: <200607130446.k6D4k1Yl010987@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10879

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
Fix file lists



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nautilus-cd-burner.spec	12 Jul 2006 21:51:05 -0000	1.64
+++ nautilus-cd-burner.spec	13 Jul 2006 04:45:47 -0000	1.65
@@ -63,6 +63,11 @@
 
 %post
 /sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nautilus-cd-burner.schemas > /dev/null
 
@@ -73,7 +78,12 @@
       %{_sysconfdir}/gconf/schemas/nautilus-cd-burner.schemas > /dev/null || :
 fi
 
-%postun -p /sbin/ldconfig
+%postun 
+/sbin/ldconfig
+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
@@ -89,6 +99,7 @@
 %{_libexecdir}/mapping-daemon
 %{_datadir}/nautilus-cd-burner
 %{_datadir}/applications/nautilus-cd-burner.desktop
+%{_datadir}/icons/hicolor
 
 %files devel
 %defattr(-, root, root)



From fedora-cvs-commits at redhat.com  Thu Jul 13 05:05:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 01:05:17 -0400
Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.19,1.20
Message-ID: <200607130505.k6D55HXw030999@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30954

Modified Files:
	gtkhtml2.spec 
Log Message:
Rebuild



Index: gtkhtml2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml2/devel/gtkhtml2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtkhtml2.spec	12 Jul 2006 06:16:36 -0000	1.19
+++ gtkhtml2.spec	13 Jul 2006 05:05:12 -0000	1.20
@@ -8,7 +8,7 @@
 
 Name: gtkhtml2
 Version: 2.11.0
-Release: 2.1
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Summary: An HTML widget for GTK+ 2.0
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jul 13 2006 Matthis Clasen <mclasen at redhat.com> - 2.11.0-3
+- Rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.11.0-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 05:18:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 01:18:58 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.36,
	1.37
Message-ID: <200607130518.k6D5IwAM016460@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
- Tag as 7.1-3.fc5.aiglx.



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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-proto-devel.spec	13 Jul 2006 04:45:47 -0000	1.36
+++ xorg-x11-proto-devel.spec	13 Jul 2006 05:18:56 -0000	1.37
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 3%{dist}
+Release: 3.fc5.aiglx
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -276,6 +276,9 @@
 
 %changelog
 * Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
+- Tag as 7.1-3.fc5.aiglx.
+
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
 - Add dist tag.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-2.1



From fedora-cvs-commits at redhat.com  Thu Jul 13 05:29:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 01:29:14 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.15,
	1.16
Message-ID: <200607130529.k6D5TEvg020433@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20407

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-2.fc5.aiglx
- Tag as 1.0.2-2.fc5.aiglx



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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-util-macros.spec	12 Jul 2006 09:19:47 -0000	1.15
+++ xorg-x11-util-macros.spec	13 Jul 2006 05:29:11 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.2
-Release: 1.1
+Release: 2.fc5.aiglx
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -38,7 +38,10 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-2.fc5.aiglx
+- Tag as 1.0.2-2.fc5.aiglx
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.2-1.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1



From fedora-cvs-commits at redhat.com  Thu Jul 13 05:33:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 01:33:48 -0400
Subject: rpms/autofs/devel autofs-5.0.0_beta6-cache-negative-lookups.patch,
	NONE, 1.1 autofs.spec, 1.123, 1.124
Message-ID: <200607130533.k6D5Xm1O021269@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.0_beta6-cache-negative-lookups.patch 
Log Message:
* Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-8
- add cacheing of negative lookups to reduce unneeded map lookups (bz 197746 part 2).


autofs-5.0.0_beta6-cache-negative-lookups.patch:
 CHANGELOG                |    1 +
 include/automount.h      |    5 ++++-
 lib/cache.c              |    1 +
 modules/lookup_file.c    |   24 ++++++++++++++++++++++++
 modules/lookup_ldap.c    |   25 +++++++++++++++++++++++++
 modules/lookup_nisplus.c |   23 +++++++++++++++++++++++
 modules/lookup_yp.c      |   23 +++++++++++++++++++++++
 7 files changed, 101 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.0_beta6-cache-negative-lookups.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c2f04f6..3ae6ff8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - correct test for libhesiod.
 - correct directory cleanup in mount modules.
 - merge key and wildcard LDAP query for lookups.
+- add cacheing of negative lookups to reduce unneeded map lookups.
 
 29/6/2006 autofs-5.0.0_beta6
 ----------------------------
diff --git a/include/automount.h b/include/automount.h
index 2630722..3b2a1cf 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -121,7 +121,8 @@ #define CHE_RMPATH	0x0004
 #define CHE_MISSING	0x0008
 #define CHE_COMPLETED	0x0010
 
-#define HASHSIZE      77
+#define HASHSIZE		77
+#define NEGATIVE_TIMEOUT	10
 
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
@@ -141,6 +142,8 @@ struct mapent {
 	char *key;
 	char *mapent;
 	time_t age;
+	/* Time of last mount fail */
+	unsigned int status;
 	/* For direct mounts per entry context is kept here */
 	int dir_created;
 	/* File descriptor for ioctls */
diff --git a/lib/cache.c b/lib/cache.c
index 4081033..2e3e5ad 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -408,6 +408,7 @@ int cache_add(struct mapent_cache *mc, s
 		me->mapent = NULL;
 
 	me->age = age;
+	me->status = 0;
 	me->source = source;
 	INIT_LIST_HEAD(&me->ino_index);
 	INIT_LIST_HEAD(&me->multi_list);
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index d598604..d487418 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -898,6 +898,15 @@ int lookup_mount(struct autofs_point *ap
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
+	/* Check if we recorded a mount fail for this key */
+	cache_readlock(mc);
+	me = cache_lookup_distinct(mc, key);
+	if (me && me->status >= time(NULL)) {
+		cache_unlock(mc);
+		return NSS_STATUS_NOTFOUND;
+	}
+	cache_unlock(mc);
+
 	/*
 	 * We can't check the direct mount map as if it's not in
 	 * the map cache already we never get a mount lookup, so
@@ -944,6 +953,21 @@ int lookup_mount(struct autofs_point *ap
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					mapent, ctxt->parse->context);
+		if (ret) {
+			time_t now = time(NULL);
+			int status = CHE_OK;
+
+			cache_writelock(mc);
+			me = cache_lookup_distinct(mc, key);
+			if (!me)
+				status = cache_update(mc,
+						source, key, NULL, now);
+			if (status != CHE_FAIL) {
+				me = cache_lookup_distinct(mc, key);
+				me->status = now + NEGATIVE_TIMEOUT;
+			}
+			cache_unlock(mc);
+		}
 	}
 
 	if (ret)
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 82df7f8..e0d7cb5 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1549,6 +1549,15 @@ int lookup_mount(struct autofs_point *ap
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
+	/* Check if we recorded a mount fail for this key */
+	cache_readlock(mc);
+	me = cache_lookup_distinct(mc, key);
+	if (me && me->status >= time(NULL)) {
+		cache_unlock(mc);
+		return NSS_STATUS_NOTFOUND;
+	}
+	cache_unlock(mc);
+
         /*
 	 * We can't check the direct mount map as if it's not in
 	 * the map cache already we never get a mount lookup, so
@@ -1592,6 +1601,22 @@ int lookup_mount(struct autofs_point *ap
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					 mapent, ctxt->parse->context);
+		if (ret) {
+			time_t now = time(NULL);
+			int status = CHE_OK;
+
+			/* Record the the mount fail in the cache */
+			cache_writelock(mc);
+			me = cache_lookup_distinct(mc, key);
+			if (!me)
+				status = cache_update(mc,
+						source, key, NULL, now);
+			if (status != CHE_FAIL) {
+				me = cache_lookup_distinct(mc, key);
+				me->status = now + NEGATIVE_TIMEOUT;
+			}
+			cache_unlock(mc);
+		}
 	}
 
 	if (ret)
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 6cb0d6c..bcba341 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -385,6 +385,14 @@ int lookup_mount(struct autofs_point *ap
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
+	cache_readlock(mc);
+	me = cache_lookup_distinct(mc, key);
+	if (me && me->status >= time(NULL)) {
+		cache_unlock(mc);
+		return NSS_STATUS_NOTFOUND;
+	}
+	cache_unlock(mc);
+
 	/*
 	 * We can't check the direct mount map as if it's not in
 	 * the map cache already we never get a mount lookup, so
@@ -426,6 +434,21 @@ int lookup_mount(struct autofs_point *ap
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					       mapent, ctxt->parse->context);
+		if (ret) {
+			time_t now = time(NULL);
+			int status = CHE_OK;
+
+			cache_writelock(mc);
+			me = cache_lookup_distinct(mc, key);
+			if (!me)
+				status = cache_update(mc,
+						source, key, NULL, now);
+			if (status != CHE_FAIL) {
+				me = cache_lookup_distinct(mc, key);
+				me->status = time(NULL) + NEGATIVE_TIMEOUT;
+			}
+			cache_unlock(mc);
+		}
 	}
 
 	if (ret)
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 25bc6db..d2f4133 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -525,6 +525,14 @@ int lookup_mount(struct autofs_point *ap
 	if (key_len > KEY_MAX_LEN)
 		return NSS_STATUS_NOTFOUND;
 
+	cache_readlock(mc);
+	me = cache_lookup_distinct(mc, key);
+	if (me && me->status >= time(NULL)) {
+		cache_unlock(mc);
+		return NSS_STATUS_NOTFOUND;
+	}
+	cache_unlock(mc);
+
 	 /*
 	  * We can't check the direct mount map as if it's not in
 	  * the map cache already we never get a mount lookup, so
@@ -568,6 +576,21 @@ int lookup_mount(struct autofs_point *ap
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					       mapent, ctxt->parse->context);
+		if (ret) {
+			time_t now = time(NULL);
+			int status = CHE_OK;
+
+			cache_writelock(mc);
+			me = cache_lookup_distinct(mc, key);
+			if (!me)
+				status = cache_update(mc,
+						source, key, NULL, now);
+			if (status != CHE_FAIL) {
+				me = cache_lookup_distinct(mc, key);
+				me->status = now + NEGATIVE_TIMEOUT;
+			}
+			cache_unlock(mc);
+		}
 	}
 
 	if (ret)


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- autofs.spec	12 Jul 2006 05:24:25 -0000	1.123
+++ autofs.spec	13 Jul 2006 05:33:43 -0000	1.124
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta6
-%define release 7.1
+%define release 8
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -23,6 +23,7 @@
 Patch10: autofs-5.0.0_beta6-hesiod-lib.patch
 Patch11: autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch
 Patch12: autofs-5.0.0_beta6-ldap-lookup-update.patch
+Patch13: autofs-5.0.0_beta6-cache-negative-lookups.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -73,6 +74,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -129,6 +131,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-8
+- add cacheing of negative lookups to reduce unneeded map
+  lookups (bz 197746 part 2).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:5.0.0_beta6-7.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 06:07:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 02:07:47 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.16,
	1.17
Message-ID: <200607130607.k6D67lcO020594@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20581

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-3
- Bump for rawhide build.



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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-util-macros.spec	13 Jul 2006 05:29:11 -0000	1.16
+++ xorg-x11-util-macros.spec	13 Jul 2006 06:07:45 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.2
-Release: 2.fc5.aiglx
+Release: 3%{dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -38,6 +38,9 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-3
+- Bump for rawhide build.
+
 * Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-2.fc5.aiglx
 - Tag as 1.0.2-2.fc5.aiglx
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 07:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 03:25:38 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.19, 1.20 m17n-db.spec, 1.26,
	1.27 sources, 1.21, 1.22
Message-ID: <200607130725.k6D7Pc9v001594@cvs.devel.redhat.com>

Author: majain

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Added ta-typewriter keymap



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Jul 2006 12:17:39 -0000	1.19
+++ .cvsignore	13 Jul 2006 07:25:36 -0000	1.20
@@ -8,3 +8,4 @@
 m17n-db-indic-0.4.6.tar.gz
 m17n-db-indic-0.4.7.tar.gz
 m17n-db-indic-0.4.8.tar.gz
+m17n-db-indic-0.4.9.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- m17n-db.spec	6 Jul 2006 12:17:39 -0000	1.26
+++ m17n-db.spec	13 Jul 2006 07:25:36 -0000	1.27
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.8
+%define indic_ver 0.4.9
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,9 @@
 
 
 %changelog
+* Thu Jul 13 2006 Mayank Jain <majain at redhat.com>
+- Added ta-typewriter.mim keymap
+
 * Thu Jul 6 2006 Mayank Jain <majain at redhat.com>
 - Added key summaries in various keymaps
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	6 Jul 2006 12:17:39 -0000	1.21
+++ sources	13 Jul 2006 07:25:36 -0000	1.22
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-f8a77a5aa6d838d89bdb37a69072a764  m17n-db-indic-0.4.8.tar.gz
+5f2db364d607238388f3d8cb22f0ee66  m17n-db-indic-0.4.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 08:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 04:16:23 -0400
Subject: rpms/subversion/devel subversion.spec,1.81,1.82
Message-ID: <200607130816.k6D8GNjU005201@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	subversion.spec 
Log Message:
* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1.3.2-6
- fix ruby packaging (#191611)



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- subversion.spec	12 Jul 2006 08:19:25 -0000	1.81
+++ subversion.spec	13 Jul 2006 08:16:18 -0000	1.82
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 0
+%define make_check 1
 
 %define with_java 1
 
@@ -8,10 +8,12 @@
 
 %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.2
-Release: 5.1
+Release: 6
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -90,6 +92,7 @@
 Summary: Ruby bindings to the Subversion libraries
 BuildRequires: ruby-devel >= 1.8.2, ruby >= 1.8.2
 Requires: subversion = %{version}-%{release}, ruby-libs >= 1.8.2
+Requires: ruby(abi) = 1.8
 
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
@@ -113,10 +116,13 @@
 
 # override weird -shrext from ruby
 export svn_cv_ruby_link="%{__cc} -shared"
+export svn_cv_ruby_sitedir_libsuffix=""
+export svn_cv_ruby_sitedir_archsuffix=""
 
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
+        --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --disable-static
 # 1.3.0 tarball ships with generated swig sources
@@ -160,7 +166,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
 
 # Remove unnecessary ruby libraries
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/site_ruby/*/*/svn/ext/*.*a
+rm -f ${RPM_BUILD_ROOT}%{ruby_sitearch}/svn/ext/*.*a
 
 # Trim what goes in docdir
 rm -rf tools/*/*.in tools/test-scripts
@@ -237,8 +243,7 @@
 %files ruby
 %defattr(-,root,root,-)
 %{_libdir}/libsvn_swig_ruby*
-%{_libdir}/site_ruby/*/svn
-%{_libdir}/site_ruby/*/*-linux/svn
+%{ruby_sitearch}/svn
 
 %if %{with_java}
 %files javahl
@@ -248,7 +253,10 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1.3.2-6
+- fix ruby packaging (#191611)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.3.2-5.1
 - rebuild
 
 * Wed Jun  7 2006 Joe Orton <jorton at redhat.com> 1.3.2-5



From fedora-cvs-commits at redhat.com  Thu Jul 13 08:49:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 04:49:57 -0400
Subject: rpms/autofs/devel .cvsignore, 1.12, 1.13 autofs.spec, 1.124,
	1.125 sources, 1.12,
	1.13 autofs-5.0.0_beta6-auth-add-autodetect.patch, 1.1,
	NONE autofs-5.0.0_beta6-auth-config-exits.patch, 1.1,
	NONE autofs-5.0.0_beta6-auth-kerberos-update.patch, 1.1,
	NONE autofs-5.0.0_beta6-cache-negative-lookups.patch, 1.1,
	NONE autofs-5.0.0_beta6-check-no-creds-required.patch, 1.1,
	NONE autofs-5.0.0_beta6-check-return.patch, 1.1,
	NONE autofs-5.0.0_beta6-correct-auto.smb.patch, 1.1,
	NONE autofs-5.0.0_beta6-default-auth-config.patch, 1.1,
	NONE autofs-5.0.0_beta6-gssapi-segfault-exit.patch, 1.1,
	NONE autofs-5.0.0_beta6-hesiod-lib.patch, 1.1,
	NONE autofs-5.0.0_beta6-ldap-lookup-update.patch, 1.1,
	NONE autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch, 1.1,
	NONE autofs-5.0.0_beta6-shutdown-log-message.patch, 1.1, NONE
Message-ID: <200607130849.k6D8nvbl009830@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	.cvsignore autofs.spec sources 
Removed Files:
	autofs-5.0.0_beta6-auth-add-autodetect.patch 
	autofs-5.0.0_beta6-auth-config-exits.patch 
	autofs-5.0.0_beta6-auth-kerberos-update.patch 
	autofs-5.0.0_beta6-cache-negative-lookups.patch 
	autofs-5.0.0_beta6-check-no-creds-required.patch 
	autofs-5.0.0_beta6-check-return.patch 
	autofs-5.0.0_beta6-correct-auto.smb.patch 
	autofs-5.0.0_beta6-default-auth-config.patch 
	autofs-5.0.0_beta6-gssapi-segfault-exit.patch 
	autofs-5.0.0_beta6-hesiod-lib.patch 
	autofs-5.0.0_beta6-ldap-lookup-update.patch 
	autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch 
	autofs-5.0.0_beta6-shutdown-log-message.patch 
Log Message:
* Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.1
- Update version label to avoid package update problems.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Jun 2006 11:06:37 -0000	1.12
+++ .cvsignore	13 Jul 2006 08:49:54 -0000	1.13
@@ -1 +1 @@
-autofs-5.0.0_beta6.tar.bz2
+autofs-5.0.1-rc1.tar.bz2


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- autofs.spec	13 Jul 2006 05:33:43 -0000	1.124
+++ autofs.spec	13 Jul 2006 08:49:54 -0000	1.125
@@ -3,27 +3,14 @@
 #
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
-%define version 5.0.0_beta6
-%define release 8
+%define version 5.0.1
+%define release 0.rc1.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
-Patch1: autofs-5.0.0_beta6-auth-kerberos-update.patch
-Patch2: autofs-5.0.0_beta6-default-auth-config.patch
-Patch3: autofs-5.0.0_beta6-gssapi-segfault-exit.patch
-Patch4: autofs-5.0.0_beta6-check-return.patch
-Patch5: autofs-5.0.0_beta6-auth-config-exits.patch
-Patch6: autofs-5.0.0_beta6-shutdown-log-message.patch
-Patch7: autofs-5.0.0_beta6-check-no-creds-required.patch
-Patch8: autofs-5.0.0_beta6-correct-auto.smb.patch
-Patch9: autofs-5.0.0_beta6-auth-add-autodetect.patch
-Patch10: autofs-5.0.0_beta6-hesiod-lib.patch
-Patch11: autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch
-Patch12: autofs-5.0.0_beta6-ldap-lookup-update.patch
-Patch13: autofs-5.0.0_beta6-cache-negative-lookups.patch
+Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc1.tar.bz2
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -62,19 +49,6 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -131,6 +105,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.1
+- Update version label to avoid package update problems.
+
 * Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta6-8
 - add cacheing of negative lookups to reduce unneeded map
   lookups (bz 197746 part 2).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Jun 2006 11:06:37 -0000	1.12
+++ sources	13 Jul 2006 08:49:54 -0000	1.13
@@ -1 +1 @@
-27174cdcc0a9ffcfb64f527f534d0525  autofs-5.0.0_beta6.tar.bz2
+e0f2e83f5fc321dbc5861cb21482a90e  autofs-5.0.1-rc1.tar.bz2


--- autofs-5.0.0_beta6-auth-add-autodetect.patch DELETED ---


--- autofs-5.0.0_beta6-auth-config-exits.patch DELETED ---


--- autofs-5.0.0_beta6-auth-kerberos-update.patch DELETED ---


--- autofs-5.0.0_beta6-cache-negative-lookups.patch DELETED ---


--- autofs-5.0.0_beta6-check-no-creds-required.patch DELETED ---


--- autofs-5.0.0_beta6-check-return.patch DELETED ---


--- autofs-5.0.0_beta6-correct-auto.smb.patch DELETED ---


--- autofs-5.0.0_beta6-default-auth-config.patch DELETED ---


--- autofs-5.0.0_beta6-gssapi-segfault-exit.patch DELETED ---


--- autofs-5.0.0_beta6-hesiod-lib.patch DELETED ---


--- autofs-5.0.0_beta6-ldap-lookup-update.patch DELETED ---


--- autofs-5.0.0_beta6-mount-mod-dir-cleanup.patch DELETED ---


--- autofs-5.0.0_beta6-shutdown-log-message.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 09:28:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 05:28:28 -0400
Subject: rpms/man-pages/devel man-pages-2.34-typo.patch, NONE,
	1.1 man-pages.spec, 1.44, 1.45
Message-ID: <200607130928.k6D9SS4H007828@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7657

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-2.34-typo.patch 
Log Message:
--- man-pages-2.34/man3/getopt.3.mar    2006-07-13 11:17:06.000000000 +0200
+++ man-pages-2.34/man3/getopt.3        2006-07-13 11:14:27.000000000 +0200
@@ -353,7 +353,7 @@
 .I <unistd.h>
 or
 .IR <stdio.h> .
-SUSv3 marked the use if
+SUSv3 marked the use of
 .I <stdio.h>
 for this purpose as LEGACY.
 SUSv3 (POSIX.1-2001) does not allow the declaration to appear in


man-pages-2.34-typo.patch:
 getopt.3 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.34-typo.patch ---
--- man-pages-2.34/man3/getopt.3.mar	2006-07-13 11:17:06.000000000 +0200
+++ man-pages-2.34/man3/getopt.3	2006-07-13 11:14:27.000000000 +0200
@@ -353,7 +353,7 @@
 .I <unistd.h>
 or
 .IR <stdio.h> .
-SUSv3 marked the use if 
+SUSv3 marked the use of 
 .I <stdio.h>
 for this purpose as LEGACY.  
 SUSv3 (POSIX.1-2001) does not allow the declaration to appear in


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- man-pages.spec	12 Jul 2006 14:13:47 -0000	1.44
+++ man-pages.spec	13 Jul 2006 09:28:24 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.34
-Release: 2
+Release: 3
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -29,6 +29,7 @@
 Patch24: man-pages-2.25-malloc.patch
 Patch25: man-pages-2.29-sigprocmask.patch
 Patch26: man-pages-2.34-inet.patch
+Patch27: man-pages-2.34-typo.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -65,6 +66,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 
@@ -164,6 +166,9 @@
 %{_mandir}/en/man*
 
 %changelog
+* Thu Jul 13 2006 Marcela Maslanova <mmaslano at redhat.com> 2.34-3
+- fix small typo (#198663)
+
 * Wed Jul 12 2006 Ivana Varekova <varekova at redhat.com> 2.34-2
 - remove btree, dbopen, hash, mpool and recno man-pages
   (#198597)



From fedora-cvs-commits at redhat.com  Thu Jul 13 10:01:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 06:01:06 -0400
Subject: rpms/coreutils/FC-5 coreutils.spec,1.116,1.117
Message-ID: <200607131001.k6DA16j4032058@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils.spec 
Log Message:
- Build at -O1 on s390 for the moment (bug #196369).


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-5/coreutils.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- coreutils.spec	12 Jul 2006 22:33:04 -0000	1.116
+++ coreutils.spec	13 Jul 2006 10:00:59 -0000	1.117
@@ -110,7 +110,8 @@
 
 %build
 %ifarch s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+# Build at -O1 for the moment (bug #196369).
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -O1"
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
 %endif
@@ -269,10 +270,11 @@
 /sbin/runuser
 
 %changelog
-* Wed Jul 12 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1
+* Thu Jul 13 2006 Tim Waugh <twaugh at redhat.com> 5.97-1.1
 - 5.97.  No longer need pl translation.
 - Build requires libacl-devel (bug #198662).
 - Include new hashes (bug #196369).  Patch from upstream.
+- Build at -O1 on s390 for the moment (bug #196369).
 
 * Mon Jun  5 2006 Tim Waugh <twaugh at redhat.com> 5.96-1.2
 - Fixed Polish translation.



From fedora-cvs-commits at redhat.com  Thu Jul 13 10:01:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 06:01:57 -0400
Subject: rpms/tvtime/devel tvtime-1.0.1-header.patch, NONE, 1.1 tvtime.spec,
	1.28, 1.29
Message-ID: <200607131001.k6DA1vsO032270@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/tvtime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32154

Modified Files:
	tvtime.spec 
Added Files:
	tvtime-1.0.1-header.patch 
Log Message:
- fix build problem



tvtime-1.0.1-header.patch:
 videodev2.h |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE tvtime-1.0.1-header.patch ---
--- tvtime-1.0.1/src/videodev2.h.orig	2006-07-13 11:45:39.000000000 +0200
+++ tvtime-1.0.1/src/videodev2.h	2006-07-13 11:46:14.000000000 +0200
@@ -16,7 +16,6 @@
 #ifdef __KERNEL__
 #include <linux/time.h> /* need struct timeval */
 #endif
-#include <linux/compiler.h> /* need __user */
 
 /* for kernel versions 2.4.26 and below: */
 #ifndef __user


Index: tvtime.spec
===================================================================
RCS file: /cvs/dist/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tvtime.spec	12 Jul 2006 08:34:54 -0000	1.28
+++ tvtime.spec	13 Jul 2006 10:01:54 -0000	1.29
@@ -1,19 +1,22 @@
 Summary: A high quality TV viewer.
 Name: tvtime
 Version: 1.0.1
-Release: 5.1
+Release: 6
 License: GPL
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
-
 Source: http://prdownloads.sourceforge.net/tvtime/%{name}-%{version}.tar.gz
-Patch: tvtime-0.9.13-pie.patch
+Patch0: tvtime-0.9.13-pie.patch
 Patch1: tvtime-1.0.1-gcc4.1.patch
+Patch2: tvtime-1.0.1-header.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: gtk2 >= 2.6
-PreReq: hicolor-icon-theme
+Requires(post): desktop-file-utils
+Requires(post): hicolor-icon-theme
+Requires(postun): desktop-file-utils
+Requires(postun): hicolor-icon-theme
 
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel
@@ -29,6 +32,7 @@
 BuildRequires: libXv-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXt-devel
+
 ExcludeArch: s390 s390x
 
 %description
@@ -41,6 +45,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .gcc
+%patch2 -p1 -b .header
 
 for i in docs/man/de/*.?; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -60,16 +65,18 @@
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor 2> /dev/null || :
 fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor 2> /dev/null || :
 fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -93,6 +100,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Thu Jul 13 2006 Than Ngo <than at redhat.com> 1.0.1-6
+- fix build problem
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 11:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 07:09:27 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.766,1.767
Message-ID: <200607131109.k6DB9RJc014773@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14681

Modified Files:
	openoffice.org.spec 
Log Message:
add openoffice.org.2.0.3.gcc28370.statics.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.766
retrieving revision 1.767
diff -u -r1.766 -r1.767
--- openoffice.org.spec	12 Jul 2006 14:22:55 -0000	1.766
+++ openoffice.org.spec	13 Jul 2006 11:09:24 -0000	1.767
@@ -112,6 +112,7 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
+Patch49: openoffice.org.2.0.3.gcc28370.statics.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -851,6 +852,7 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
+%patch49 -p1 -b .gcc28370.statics.patch
 
 tar xzf %{SOURCE1}
 
@@ -3334,6 +3336,7 @@
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
 - rebuild for new tasty linker hash
+- add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
 
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4



From fedora-cvs-commits at redhat.com  Thu Jul 13 11:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 07:14:27 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.gcc28370.statics.patch, NONE, 1.1
Message-ID: <200607131114.k6DBERL0016253@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16218

Added Files:
	openoffice.org.2.0.3.gcc28370.statics.patch 
Log Message:
CVE-2006-3376 libwmf integer overflow

openoffice.org.2.0.3.gcc28370.statics.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'openoffice.org.2.0.3.gcc28370.statics.patch'



From fedora-cvs-commits at redhat.com  Thu Jul 13 11:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 07:32:16 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org.2.0.3.gcc28370.statics.patch, NONE,
	1.1 openoffice.org.spec, 1.676, 1.677
Message-ID: <200607131132.k6DBWGWj004653@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4610

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.gcc28370.statics.patch 
Log Message:
add openoffice.org.2.0.3.gcc28370.statics.patch

openoffice.org.2.0.3.gcc28370.statics.patch:
 inc/rtl/instance.hxx     |    0 
 sal/inc/rtl/instance.hxx |   20 ++++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org.2.0.3.gcc28370.statics.patch ---
Index: inc/rtl/instance.hxx
===================================================================
RCS file: /cvs/porting/sal/inc/rtl/instance.hxx,v
retrieving revision 1.8
diff -u -r1.8 instance.hxx
--- openoffice.org.orig/sal/inc/rtl/instance.hxx	8 Sep 2005 14:37:41 -0000	1.8
+++ openoffice.org/sal/inc/rtl/instance.hxx	13 Jul 2006 11:00:59 -0000
@@ -43,6 +43,10 @@
 #include "osl/getglobalmutex.hxx"
 #endif
 
+#if defined (_MSC_VER) || defined ( GCC )
+#define NOT_CLASSMEMBER_INSTANCE
+#endif
+
 namespace {
 
 /** A non-broken version of the double-checked locking pattern.
@@ -286,9 +290,9 @@
 public:
     static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
     {
-#if defined _MSC_VER
+#if defined NOT_CLASSMEMBER_INSTANCE
         static Inst * m_pInstance = 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
         Inst * p = m_pInstance;
         if (!p)
         {
@@ -309,9 +313,9 @@
     static inline Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor,
                                 DataCtor aDataCtor)
     {
-#if defined _MSC_VER
+#if defined NOT_CLASSMEMBER_INSTANCE
         static Inst * m_pInstance = 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
         Inst * p = m_pInstance;
         if (!p)
         {
@@ -331,19 +335,19 @@
     }
 
 private:
-#if !defined _MSC_VER
+#if !defined NOT_CLASSMEMBER_INSTANCE
     static Inst * m_pInstance;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
 };
 
-#if !defined _MSC_VER
+#if !defined NOT_CLASSMEMBER_INSTANCE
 template< typename Inst, typename InstCtor,
           typename Guard, typename GuardCtor,
           typename Data, typename DataCtor >
 Inst *
 rtl_Instance< Inst, InstCtor, Guard, GuardCtor, Data, DataCtor >::m_pInstance
 = 0;
-#endif // _MSC_VER
+#endif // NOT_CLASSMEMBER_INSTANCE
 
 }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- openoffice.org.spec	12 Jul 2006 12:59:52 -0000	1.676
+++ openoffice.org.spec	13 Jul 2006 11:32:13 -0000	1.677
@@ -181,6 +181,7 @@
 Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch55: openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
+Patch56: openoffice.org.2.0.3.gcc28370.statics.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -844,8 +845,8 @@
 %patch52 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch53 -p1 -b .ooo64206.sfx2.saveas.patch
 %patch54 -p1 -b .rh187919.gtkunderkde.patch
-%patch56 -p1 -b .gcc28357.binfilter.constcrash.patch
-
+%patch55 -p1 -b .gcc28357.binfilter.constcrash.patch
+%patch56 -p1 -b .gcc28370.statics.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3297,6 +3298,7 @@
   ~/.recently-used safe
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 - rh#198603# gcc ate my office suite, add openoffice.org-2.0.3.gcc28357.binfilter.constcrash.patch
+- gcc#28370# I'm suspicious of these statics lately
 
 * Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security



From fedora-cvs-commits at redhat.com  Thu Jul 13 11:56:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 07:56:30 -0400
Subject: rpms/openoffice.org/FC-5
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch, 1.1, 1.2
Message-ID: <200607131156.k6DBuUAO032050@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32035

Modified Files:
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch 
Log Message:
different for FC-5

openoffice.org-2.0.3.rh187919.gtkunderkde.patch:
 salnativewidgets-gtk.cxx |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

Index: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-2.0.3.rh187919.gtkunderkde.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.rh187919.gtkunderkde.patch	10 Jul 2006 12:48:55 -0000	1.1
+++ openoffice.org-2.0.3.rh187919.gtkunderkde.patch	13 Jul 2006 11:56:27 -0000	1.2
@@ -12,14 +12,14 @@
 -        // KDE 3.3 invented a bug in the qt<->gtk theme engine
 -        // that makes direct rendering impossible: they totally
 -        // ignore the clip rectangle passed to the paint methods
--        GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+-        GtkSalGraphics::bNeedPixmapPaint = true;
 +	{
 +		if( g_type_from_name( "QtEngineStyle" ) )
 +		{
 +			// KDE 3.3 invented a bug in the qt<->gtk theme engine
 +			// that makes direct rendering impossible: they totally
 +			// ignore the clip rectangle passed to the paint methods
-+			GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
++			GtkSalGraphics::bNeedPixmapPaint = true;
 +		}
 +	}
      



From fedora-cvs-commits at redhat.com  Thu Jul 13 12:01:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 08:01:34 -0400
Subject: rpms/coreutils/devel coreutils-split-pam.patch, NONE,
	1.1 runuser-l.pamd, NONE, 1.1 su-l.pamd, NONE,
	1.1 coreutils.spec, 1.126, 1.127 runuser.pamd, 1.2, 1.3
Message-ID: <200607131201.k6DC1Yxp032214@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils.spec runuser.pamd 
Added Files:
	coreutils-split-pam.patch runuser-l.pamd su-l.pamd 
Log Message:
* Thu Jul 13 2006 David Howells <dhowells at redhat.com>
- split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
  "runuser" (#198639)
- add keyinit instructions to PAM scripts


coreutils-split-pam.patch:
 su.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE coreutils-split-pam.patch ---
diff -uNrp -x '*~' coreutils-5.97-orig/src/su.c coreutils-5.97/src/su.c
--- coreutils-5.97-orig/src/su.c	2006-07-13 12:14:40.000000000 +0100
+++ coreutils-5.97/src/su.c	2006-07-13 12:24:33.000000000 +0100
@@ -131,11 +131,15 @@
 
 #include "error.h"
 
-/* The official name of this program (e.g., no `g' prefix).  */
+/* The official name of this program (e.g., no `g' prefix).
+ * - Add a "-l" to the name passed to PAM if this is a login simulation
+ */
 #ifndef RUNUSER
 #define PROGRAM_NAME "su"
+#define PROGRAM_NAME_L "su-l"
 #else
 #define PROGRAM_NAME "runuser"
+#define PROGRAM_NAME_L "runuser-l"
 #endif
 
 #ifndef AUTHORS
@@ -310,7 +314,8 @@ correct_password (const struct passwd *p
 #ifdef USE_PAM
   struct passwd *caller;
   char *tty_name, *ttyn;
-  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
+  retval = pam_start(simulate_login ? PROGRAM_NAME_L : PROGRAM_NAME,
+		     pw->pw_name, &conv, &pamh);
   PAM_BAIL_P;
 
 #ifndef RUNUSER


--- NEW FILE runuser-l.pamd ---
#%PAM-1.0
auth		sufficient	pam_rootok.so
session		optional	pam_keyinit.so force revoke
session		required	pam_limits.so
session		required	pam_unix.so


--- NEW FILE su-l.pamd ---
#%PAM-1.0
auth		sufficient	pam_rootok.so
# Uncomment the following line to implicitly trust users in the "wheel" group.
#auth		sufficient	pam_wheel.so trust use_uid
# Uncomment the following line to require a user to be in the "wheel" group.
#auth		required	pam_wheel.so use_uid
auth		include		system-auth
account		sufficient	pam_succeed_if.so uid = 0 use_uid quiet
account		include		system-auth
password	include		system-auth
session		optional	pam_keyinit.so force revoke
session		include		system-auth
session		optional	pam_xauth.so


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- coreutils.spec	12 Jul 2006 04:52:59 -0000	1.126
+++ coreutils.spec	13 Jul 2006 12:01:32 -0000	1.127
@@ -16,6 +16,8 @@
 Source106:  colorls.csh
 Source200:  su.pamd
 Source201:  runuser.pamd
+Source202:  su-l.pamd
+Source203:  runuser-l.pamd
 
 # From upstream
 Patch1: coreutils-sort-compatibility.patch
@@ -45,6 +47,7 @@
 Patch912: coreutils-overflow.patch
 Patch913: coreutils-afs.patch
 Patch914: coreutils-autoconf.patch
+Patch915: coreutils-split-pam.patch
 
 #SELINUX Patch
 Patch950: coreutils-selinux.patch
@@ -100,6 +103,7 @@
 %patch912 -p1 -b .overflow
 %patch913 -p1 -b .afs
 %patch914 -p1 -b .autoconf
+%patch915 -p1 -b .splitl
 
 #SELinux
 %patch950 -p1 -b .selinux
@@ -185,7 +189,9 @@
 done
 
 %{?!nopam:install -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su}
+%{?!nopam:install -m 644 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su-l}
 %{?!nopam:install -m 644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser}
+%{?!nopam:install -m 644 %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser-l}
 
 bzip2 -f9 old/*/C* || :
 
@@ -231,7 +237,9 @@
 %config(noreplace) %{_sysconfdir}/DIR_COLORS*
 %config(noreplace) %{_sysconfdir}/profile.d/*
 %{?!nopam:%config(noreplace) /etc/pam.d/su}
+%{?!nopam:%config(noreplace) /etc/pam.d/su-l}
 %{?!nopam:%config(noreplace) /etc/pam.d/runuser}
+%{?!nopam:%config(noreplace) /etc/pam.d/runuser-l}
 %doc ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
 /bin/basename
 /bin/cat
@@ -272,6 +280,11 @@
 /sbin/runuser
 
 %changelog
+* Thu Jul 13 2006 David Howells <dhowells at redhat.com>
+- split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
+  "runuser" (#198639)
+- add keyinit instructions to PAM scripts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.97-3.1
 - rebuild
 


Index: runuser.pamd
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/runuser.pamd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- runuser.pamd	2 Dec 2005 17:09:56 -0000	1.2
+++ runuser.pamd	13 Jul 2006 12:01:32 -0000	1.3
@@ -1,4 +1,5 @@
 #%PAM-1.0
 auth		sufficient	pam_rootok.so
+session		optional	pam_keyinit.so revoke
 session		required	pam_limits.so
 session		required	pam_unix.so



From fedora-cvs-commits at redhat.com  Thu Jul 13 12:15:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 08:15:29 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.127,1.128
Message-ID: <200607131215.k6DCFTo9012423@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	coreutils.spec 
Log Message:
5.97-4


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- coreutils.spec	13 Jul 2006 12:01:32 -0000	1.127
+++ coreutils.spec	13 Jul 2006 12:15:26 -0000	1.128
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 3.1
+Release: 4
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,7 +280,7 @@
 /sbin/runuser
 
 %changelog
-* Thu Jul 13 2006 David Howells <dhowells at redhat.com>
+* Thu Jul 13 2006 David Howells <dhowells at redhat.com> 5.97-4
 - split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
   "runuser" (#198639)
 - add keyinit instructions to PAM scripts



From fedora-cvs-commits at redhat.com  Thu Jul 13 12:15:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 08:15:30 -0400
Subject: rpms/php-pear/devel macros.pear,NONE,1.1 php-pear.spec,1.11,1.12
Message-ID: <200607131215.k6DCFUJh012431@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php-pear.spec 
Added Files:
	macros.pear 
Log Message:
* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-3
- require php-cli
- add /etc/rpm/macros.pear (Christopher Stone)



--- NEW FILE macros.pear ---
#
# Define full path to pear/pecl commands to be used in post/postun scriptlets
#
%__pear %{_bindir}/pear
%__pecl %{_bindir}/pecl

#
# Define pear directories used in php-pear-* spec files
#
%pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)
%pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)
%pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)
%pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)

#
# Define pecl directories used in php-pecl-* spec files
#
%pecl_phpdir  %(%{__pecl} config-get php_dir  2> /dev/null || echo undefined)
%pecl_docdir  %(%{__pecl} config-get doc_dir  2> /dev/null || echo undefined)
%pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo undefined)
%pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined)

#
# Define XML directories to store package registration information
#
%pear_xmldir %{pear_phpdir}/.pkgxml
%pecl_xmldir %{pecl_phpdir}/.pkgxml


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-pear.spec	12 Jul 2006 07:49:07 -0000	1.11
+++ php-pear.spec	13 Jul 2006 12:15:27 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.9
-Release: 2.1
+Release: 3
 Epoch: 1
 License: The PHP License 3.0
 Group: System
@@ -18,6 +18,7 @@
 Source10: pear.sh
 Source11: pecl.sh
 Source12: peardev.sh
+Source13: macros.pear
 Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz
 Patch0: php-pear-1.4.8-template.patch
 Patch1: php-pear-1.4.8-package.patch
@@ -28,7 +29,7 @@
 Provides: php-pear(Console_Getopt) = 1.2
 Provides: php-pear(PEAR) = %{version}
 Provides: php-pear(XML_RPC) = %{xmlrpcver}
-Requires: php >= 5.1.0-1
+Requires: php >= 5.1.0-1, php-cli
 
 %description
 PEAR is a framework and distribution system for reusable PHP
@@ -81,6 +82,9 @@
 
 install -m 644 -c $RPM_SOURCE_DIR/LICENSE .
 
+install -m 644 -c $RPM_SOURCE_DIR/macros.pear \
+           $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear        
+
 %check
 # 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
@@ -100,6 +104,10 @@
 %doc LICENSE
 
 %changelog
+* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-3
+- require php-cli
+- add /etc/rpm/macros.pear (Christopher Stone)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.9-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 12:19:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 08:19:39 -0400
Subject: rpms/php-pear/devel php-pear.spec,1.12,1.13
Message-ID: <200607131219.k6DCJdaK028668@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	php-pear.spec 
Log Message:
- fix installation



Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-pear.spec	13 Jul 2006 12:15:27 -0000	1.12
+++ php-pear.spec	13 Jul 2006 12:19:37 -0000	1.13
@@ -63,7 +63,8 @@
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir} \
            $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
-           $RPM_BUILD_ROOT%{peardir}/.pkgxml
+           $RPM_BUILD_ROOT%{peardir}/.pkgxml \
+           $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 
 # Relocate everything:
 sed -si "s,$RPM_BUILD_ROOT,,g" \



From fedora-cvs-commits at redhat.com  Thu Jul 13 12:59:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 08:59:37 -0400
Subject: rpms/libraw1394/FC-5 libraw1394.spec,1.18,1.19
Message-ID: <200607131259.k6DCxb0Z024302@cvs.devel.redhat.com>

Author: jwilson

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

Modified Files:
	libraw1394.spec 
Log Message:
use %dist tag


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/FC-5/libraw1394.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libraw1394.spec	17 Apr 2006 20:41:19 -0000	1.18
+++ libraw1394.spec	13 Jul 2006 12:59:35 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Library providing low-level IEEE-1394 access
 Name: libraw1394
 Version: 1.2.1
-Release: 1.fc5
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 14:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 10:18:34 -0400
Subject: rpms/gnopernicus/devel .cvsignore, 1.30, 1.31 gnopernicus.spec, 1.44,
	1.45 sources, 1.31, 1.32
Message-ID: <200607131418.k6DEIYr8025955@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25902

Modified Files:
	.cvsignore gnopernicus.spec sources 
Log Message:
1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	10 Apr 2006 23:07:01 -0000	1.30
+++ .cvsignore	13 Jul 2006 14:18:32 -0000	1.31
@@ -1,21 +1 @@
-gnopernicus-0.9.10.tar.bz2
-gnopernicus-0.9.11.tar.bz2
-gnopernicus-0.9.12.tar.bz2
-gnopernicus-0.9.14.tar.bz2
-gnopernicus-0.10.0.tar.bz2
-gnopernicus-0.10.1.tar.bz2
-gnopernicus-0.10.2.tar.bz2
-gnopernicus-0.10.3.tar.bz2
-gnopernicus-0.10.4.tar.bz2
-gnopernicus-0.10.5.tar.bz2
-gnopernicus-0.10.6.tar.bz2
-gnopernicus-0.11.2.tar.bz2
-gnopernicus-0.11.3.tar.bz2
-gnopernicus-0.11.4.tar.bz2
-gnopernicus-0.11.6.tar.bz2
-gnopernicus-0.11.7.tar.bz2
-gnopernicus-0.12.0.tar.bz2
-gnopernicus-1.0.0.tar.bz2
-gnopernicus-1.0.1.tar.bz2
-gnopernicus-1.0.2.tar.bz2
-gnopernicus-1.0.4.tar.bz2
+gnopernicus-1.0.6.tar.bz2


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnopernicus.spec	12 Jul 2006 06:11:07 -0000	1.44
+++ gnopernicus.spec	13 Jul 2006 14:18:32 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.0.4
-Release: 2.2.1
+Version: 1.0.6
+Release: 1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.6-1
+- Update to 1.0.6
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Apr 2006 23:07:01 -0000	1.31
+++ sources	13 Jul 2006 14:18:32 -0000	1.32
@@ -1 +1 @@
-4e798c6d08e6096702d316b702801d1d  gnopernicus-1.0.4.tar.bz2
+48b4fb06920053048418036f91069763  gnopernicus-1.0.6.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 14:24:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 10:24:08 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.19,
	1.20 selinux-policy.spec, 1.221, 1.222
Message-ID: <200607131424.k6DEO87H028051@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-3
- Turn off auditallow on setting booleans


policy-20060608.patch:
 global_tunables                  |    7 +
 modules/admin/bootloader.te      |    3 
 modules/admin/consoletype.te     |    7 +
 modules/admin/usermanage.te      |    4 
 modules/bgp.mod                  |binary
 modules/bgp.pp                   |binary
 modules/bgp.te                   |   12 ++
 modules/kernel/corenetwork.te.in |    4 
 modules/kernel/files.fc          |    1 
 modules/kernel/kernel.if         |   38 +++++++
 modules/kernel/selinux.if        |    1 
 modules/services/automount.te    |    8 +
 modules/services/avahi.te        |    1 
 modules/services/bluetooth.if    |   23 ++++
 modules/services/bluetooth.te    |    2 
 modules/services/cups.te         |    1 
 modules/services/cyrus.te        |    1 
 modules/services/hal.fc          |    1 
 modules/services/hal.te          |    5 
 modules/services/pegasus.if      |   31 ++++++
 modules/services/pegasus.te      |    5 
 modules/services/squid.te        |    2 
 modules/services/tftp.te         |    1 
 modules/services/xserver.if      |   22 ++++
 modules/services/zebra.te        |    2 
 modules/system/getty.fc          |    1 
 modules/system/getty.te          |    3 
 modules/system/hostname.te       |    5 
 modules/system/init.if           |    7 -
 modules/system/selinuxutil.te    |   11 ++
 modules/system/setrans.te        |    5 
 modules/system/unconfined.fc     |    1 
 modules/system/unconfined.te     |    8 -
 modules/system/userdomain.if     |  201 ++++++++++++++++++++++++---------------
 modules/system/userdomain.te     |   32 ++----
 35 files changed, 337 insertions(+), 119 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20060608.patch	12 Jul 2006 03:25:36 -0000	1.19
+++ policy-20060608.patch	13 Jul 2006 14:24:05 -0000	1.20
@@ -52,6 +52,27 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.2/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-06-20 09:54:00.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/usermanage.te	2006-07-12 17:28:02.000000000 -0400
+@@ -187,7 +187,7 @@
+ # Groupadd local policy
+ #
+ 
+-allow groupadd_t self:capability { dac_override chown kill setuid sys_resource };
++allow groupadd_t self:capability { audit_write dac_override chown kill setuid sys_resource };
+ dontaudit groupadd_t self:capability fsetid;
+ allow groupadd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
+ allow groupadd_t self:process { setrlimit setfscreate };
+@@ -450,7 +450,7 @@
+ # Useradd local policy
+ #
+ 
+-allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource };
++allow useradd_t self:capability { audit_write dac_override chown kill fowner fsetid setuid sys_resource };
+ allow useradd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow useradd_t self:process setfscreate;
+ allow useradd_t self:fd use;
 Binary files nsaserefpolicy/policy/modules/bgp.mod and serefpolicy-2.3.2/policy/modules/bgp.mod differ
 Binary files nsaserefpolicy/policy/modules/bgp.pp and serefpolicy-2.3.2/policy/modules/bgp.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/bgp.te serefpolicy-2.3.2/policy/modules/bgp.te
@@ -147,6 +168,17 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.2/policy/modules/kernel/selinux.if
+--- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-05-19 13:46:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/selinux.if	2006-07-13 08:46:28.000000000 -0400
+@@ -214,7 +214,6 @@
+ 
+ 	if(!secure_mode_policyload) {
+ 		allow $1 security_t:security setbool;
+-		auditallow $1 security_t:security setbool;
+ 	}
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-10 09:06:39.000000000 -0400
@@ -233,6 +265,17 @@
  	')
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.2/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-06-21 16:21:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-12 16:45:19.000000000 -0400
+@@ -81,6 +81,7 @@
+ allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow cupsd_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow cupsd_t self:netlink_selinux_socket create_socket_perms;
+ allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
+ allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
+ allow cupsd_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-09 05:52:17.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- selinux-policy.spec	12 Jul 2006 02:50:30 -0000	1.221
+++ selinux-policy.spec	13 Jul 2006 14:24:05 -0000	1.222
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.2
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-3
+- Turn off auditallow on setting booleans
+
 * Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-2
 - Multiple fixes
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 14:26:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 10:26:47 -0400
Subject: rpms/control-center/devel .cvsignore, 1.42, 1.43 control-center.spec,
	1.149, 1.150 sources, 1.45, 1.46
Message-ID: <200607131426.k6DEQlQW006533@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6486

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
- go to latest background capplet



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	12 Jul 2006 21:13:13 -0000	1.42
+++ .cvsignore	13 Jul 2006 14:26:44 -0000	1.43
@@ -1,17 +1 @@
-control-center-2.11.91.tar.bz2
-control-center-2.12.0.tar.bz2
-control-center-2.12.1.tar.bz2
-control-center-2.13.2.tar.bz2
-control-center-2.13.3.tar.bz2
-control-center-2.13.4.tar.bz2
-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
-control-center-2.13.91.tar.bz2
-control-center-2.13.92.tar.bz2
-control-center-2.14.0.tar.bz2
-control-center-2.14.1.tar.bz2
-control-center-2.14.2.tar.bz2
 control-center-2.15.3.tar.bz2
-control-center-2.15.4.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- control-center.spec	12 Jul 2006 21:13:13 -0000	1.149
+++ control-center.spec	13 Jul 2006 14:26:44 -0000	1.150
@@ -21,12 +21,11 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.14/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
@@ -121,10 +120,6 @@
 %prep
 %setup -q
 
-tar xjf %{SOURCE2}
-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
@@ -137,13 +132,6 @@
 
 %build
 
-# Rerun autoheader because of help-left-handled-dual-mice-users patch
-autoheader
-
-# Rerun autoconf because of 
-# help-left-handled-dual-mice-users patches
-autoconf
-
 # Run aclocal and automake for run-power-manager
 aclocal
 automake
@@ -260,6 +248,9 @@
 %{_libdir}/pkgconfig/gnome-window-settings*
 
 %changelog
+* Thu Jul 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-2
+- go to latest background capplet
+
 * Wed Jul 12 2006 Matthias Clasen  <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	12 Jul 2006 21:13:13 -0000	1.45
+++ sources	13 Jul 2006 14:26:44 -0000	1.46
@@ -1,2 +1 @@
-e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
 de3a495fc1265e9ed84212299ade5a0a  control-center-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 14:32:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 10:32:46 -0400
Subject: rpms/control-center/devel control-center.spec, 1.150,
	1.151 background-no-delay.patch, 1.2, NONE
Message-ID: <200607131432.k6DEWk7S006713@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6699

Modified Files:
	control-center.spec 
Removed Files:
	background-no-delay.patch 
Log Message:
drop no-delay patch



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- control-center.spec	13 Jul 2006 14:26:44 -0000	1.150
+++ control-center.spec	13 Jul 2006 14:32:44 -0000	1.151
@@ -35,7 +35,6 @@
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.14.2-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
-Patch10: background-no-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -128,7 +127,6 @@
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
-%patch10 -p1 -b .no-delay
 
 %build
 


--- background-no-delay.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 14:44:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 10:44:29 -0400
Subject: rpms/control-center/devel control-center.spec,1.151,1.152
Message-ID: <200607131444.k6DEiTT1006938@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6921

Modified Files:
	control-center.spec 
Log Message:
call autoreconf instead of the individual tools



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- control-center.spec	13 Jul 2006 14:32:44 -0000	1.151
+++ control-center.spec	13 Jul 2006 14:44:27 -0000	1.152
@@ -130,9 +130,7 @@
 
 %build
 
-# Run aclocal and automake for run-power-manager
-aclocal
-automake
+autoreconf
 
 # work around a gstreamer problem where it doesn't find
 # plugins the first time around



From fedora-cvs-commits at redhat.com  Thu Jul 13 15:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 11:03:13 -0400
Subject: rpms/kernel/devel/configs config-x86-generic,1.60,1.61
Message-ID: <200607131503.k6DF3DRp022134@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	config-x86-generic 
Log Message:
Enable CS553x SMBUS


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-x86-generic	10 Jul 2006 16:31:44 -0000	1.60
+++ config-x86-generic	13 Jul 2006 15:03:11 -0000	1.61
@@ -262,7 +262,7 @@
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
-# CONFIG_SCx200_ACB is not set
+CONFIG_SCx200_ACB=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m



From fedora-cvs-commits at redhat.com  Thu Jul 13 15:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 11:17:18 -0400
Subject: rpms/gnucash/FC-5 branch,NONE,1.1.2.1
Message-ID: <200607131517.k6DFHIfp017810@cvs.devel.redhat.com>

Author: notting

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

Added Files:
      Tag: gnucash-g2-branch
	branch 
Log Message:
add branch



--- NEW FILE branch ---
FC-5



From fedora-cvs-commits at redhat.com  Thu Jul 13 15:22:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 11:22:01 -0400
Subject: rpms/vsftpd/devel vsftpd.pam,1.6,1.7 vsftpd.spec,1.44,1.45
Message-ID: <200607131522.k6DFM1HP019551@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19517

Modified Files:
	vsftpd.pam vsftpd.spec 
Log Message:
- add keyinit instructions to the vsftpd PAM script (#198637)


Index: vsftpd.pam
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.pam,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vsftpd.pam	4 Oct 2005 11:30:19 -0000	1.6
+++ vsftpd.pam	13 Jul 2006 15:21:59 -0000	1.7
@@ -1,4 +1,5 @@
 #%PAM-1.0
+session    optional     pam_keyinit.so    force revoke
 auth       required	pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
 auth       required	pam_shells.so
 auth       include	system-auth


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- vsftpd.spec	12 Jul 2006 13:39:35 -0000	1.44
+++ vsftpd.spec	13 Jul 2006 15:21:59 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -134,6 +134,9 @@
 /var/ftp
 
 %changelog
+* Thu Jul 13 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-2
+- add keyinit instructions to the vsftpd PAM script (#198637)
+
 * Wed Jul 12 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-1
 - upgrade to 2.0.5
 - IE should now show the login dialog again (#191147)



From fedora-cvs-commits at redhat.com  Thu Jul 13 15:37:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 11:37:44 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.115, 1.116 mkinitrd.spec, 1.133,
	1.134 sources, 1.128, 1.129
Message-ID: <200607131537.k6DFbiSA023762@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22989

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.47-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- .cvsignore	30 Jun 2006 04:04:40 -0000	1.115
+++ .cvsignore	13 Jul 2006 15:37:18 -0000	1.116
@@ -1 +1,2 @@
-mkinitrd-5.0.46.tar.bz2
+bdevid-0.1.tar.bz2
+mkinitrd-5.0.47.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- mkinitrd.spec	12 Jul 2006 07:21:39 -0000	1.133
+++ mkinitrd.spec	13 Jul 2006 15:37:19 -0000	1.134
@@ -1,17 +1,21 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.46
-Release: 1.1
+Version: 5.0.47
+Release: 1
 License: GPL
 Group: System Environment/Base
-Source: mkinitrd-%{version}.tar.bz2
+Source0: mkinitrd-%{version}.tar.bz2
+%define BDEVID_VERSION 0.1
+Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
+
 ExclusiveOs: Linux
 Prereq: dev
 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 >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9
+BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
@@ -36,17 +40,32 @@
 mount the root filesystem.  The mkinitrd program creates such a
 ramdisk using information found in the /etc/modules.conf file.
 
+%package devel
+Summary: C header files and library for functionality exported by libnash.
+Group: Development/Libraries
+Requires: glibc-devel
+
+%description devel
+C header files and library for functionality exported by libnash.
+
 %prep
-%setup -q
+%setup -q -c -a 0
+%setup -q -c -a 1
 
 %build
+cd mkinitrd-%{version}
 make
 make test
 if [ $? != 0 ]; then exit 1; fi
+cd ../bdevid-%{BDEVID_VERSION}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mkinitrd-%{version}
 make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+cd ../bdevid-%{BDEVID_VERSION}
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,10 +80,34 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
+%{_libdir}/libbdevid.so*
+/lib/bdevid/scsi.so
+%{_libdir}/python*/site-packages/bdevid.so
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libnash.a
+%{_libdir}/pkgconfig/libnash.pc
+%{_includedir}/nash.h
+%{_includedir}/nash
+
+%{_libdir}/libbdevid.a
+%{_libdir}/pkgconfig/libbdevid.pc
+%{_includedir}/bdevid.h
+%{_includedir}/bdevid
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.0.46-1.1
-- rebuild
+* Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
+- add libbdevid
+- fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
+
+* Thu Jul  6 2006 Bill Nottingham <notting at redhat.com>
+- if NFS host doesn't resolve, assume it's an IP
+- make sure IP check doesn't get extraneous info
+
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com>
+- make libnash.a and the nash-devel package
+- use libdhcp instead of pump (patch from Mark McLoughlin)
 
 * Fri Jun 30 2006 Jeremy Katz <katzj at redhat.com> - 5.0.46-1
 - if we don't get a modalias for a net driver, try via 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	30 Jun 2006 04:04:41 -0000	1.128
+++ sources	13 Jul 2006 15:37:19 -0000	1.129
@@ -1 +1,2 @@
-f99f6a6e7e66ac3f3022b97ff0e375f9  mkinitrd-5.0.46.tar.bz2
+7608e5c8e6b43ffcfc68b284f756a1e2  bdevid-0.1.tar.bz2
+06af8b8edbdcf5bd3f37bc764508e7e5  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 15:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 11:46:00 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch, NONE,
	1.1 openoffice.org.spec, 1.767, 1.768
Message-ID: <200607131546.k6DFk0u7029561@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28145

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch 
Log Message:
openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch

openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch:
 lbenv.cxx |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch ---
Index: source/uno/lbenv.cxx
===================================================================
RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v
retrieving revision 1.33
diff -u -r1.33 lbenv.cxx
--- openoffice.org.orig/cppu/source/uno/lbenv.cxx	6 Mar 2006 10:16:59 -0000	1.33
+++ openoffice.org/source/uno/lbenv.cxx	13 Jul 2006 15:43:37 -0000
@@ -1049,6 +1049,8 @@
     }
 }
 
+}
+
 extern "C"
 {
 
@@ -1158,6 +1160,3 @@
 }
 
 } // extern "C"
-
-}
-


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- openoffice.org.spec	13 Jul 2006 11:09:24 -0000	1.767
+++ openoffice.org.spec	13 Jul 2006 15:45:58 -0000	1.768
@@ -113,6 +113,7 @@
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
 Patch49: openoffice.org.2.0.3.gcc28370.statics.patch
+Patch50: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -853,6 +854,7 @@
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
 %patch49 -p1 -b .gcc28370.statics.patch
+%patch50 -p1 -b .gccXXXXX.anonymousexternc.patch
 
 tar xzf %{SOURCE1}
 
@@ -3337,6 +3339,7 @@
 - add ooobuild.VBAObjects.patch for VBA macro support
 - rebuild for new tasty linker hash
 - add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
+- add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
 
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4



From fedora-cvs-commits at redhat.com  Thu Jul 13 16:08:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 12:08:55 -0400
Subject: rpms/evolution/devel
	evolution-2.7.4-candidate-window-position-calendar.patch, NONE,
	1.1 evolution-2.7.4-candidate-window-position-task.patch, NONE,
	1.1 evolution.spec, 1.164,
	1.165 evolution-2.7.3-candidate-window-position-calendar.patch,
	1.2, NONE evolution-2.7.3-candidate-window-position-task.patch,
	1.1, NONE
Message-ID: <200607131608.k6DG8tRh015318@cvs.devel.redhat.com>

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.4-candidate-window-position-calendar.patch 
	evolution-2.7.4-candidate-window-position-task.patch 
Removed Files:
	evolution-2.7.3-candidate-window-position-calendar.patch 
	evolution-2.7.3-candidate-window-position-task.patch 
Log Message:
- Update patch for RH bug #157400.
- Update patch for RH bug #157505.


evolution-2.7.4-candidate-window-position-calendar.patch:
 e-text.c |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 e-text.h |    1 
 2 files changed, 62 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.7.4-candidate-window-position-calendar.patch ---
--- evolution-2.7.4/widgets/text/e-text.h.cal	2006-07-13 10:15:56.000000000 -0400
+++ evolution-2.7.4/widgets/text/e-text.h	2006-07-13 10:18:20.000000000 -0400
@@ -109,6 +109,7 @@
 
 	const gchar *text;              /* Text to display --- from the ETextModel */
 	gint preedit_len;      		/* preedit length to display */
+	gint preedit_pos;      		/* preedit cursor position */
 	PangoLayout *layout;
 	int num_lines;			/* Number of lines of text */
 
--- evolution-2.7.4/widgets/text/e-text.c.cal	2006-07-13 10:15:51.000000000 -0400
+++ evolution-2.7.4/widgets/text/e-text.c	2006-07-13 10:18:20.000000000 -0400
@@ -132,6 +132,7 @@
 
 static void reset_layout_attrs (EText *text);
 
+static void update_im_cursor_position (EText *text);
 #if 0
 /* GtkEditable Methods */
 static void e_text_editable_do_insert_text (GtkEditable    *editable,
@@ -325,6 +326,8 @@
 			pango_layout_set_attributes (text->layout, attrs);
 			pango_attr_list_unref (attrs);
 		}
+
+		update_im_cursor_position (text);
 	}
 
 	if (preedit_string)
@@ -3723,6 +3726,7 @@
 	text->model                   = e_text_model_new ();
 	text->text                    = e_text_model_get_text (text->model);
 	text->preedit_len	      = 0;
+	text->preedit_pos	      = 0;
 	text->layout                  = NULL;
 
 	text->revert                  = NULL;
@@ -3840,17 +3844,71 @@
 	}
 }
 
+/* 
+ * Fetch cursor location into Strong or Weak positions so as to
+ * display the preedit candidate selection window in the right place 
+ */
+static void
+e_text_get_cursor_locations (EText *text,
+			     GdkRectangle *strong_pos,
+			     GdkRectangle *weak_pos)
+{
+	double x1, y1;
+	PangoRectangle pango_strong_pos;
+	PangoRectangle pango_weak_pos;
+	int cx, cy;
+	gint index;
+
+	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, NULL, NULL);
+
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (text)->canvas), &cx, &cy);
+
+	index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
+
+	pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos,
+				     strong_pos ? &pango_strong_pos : NULL,
+				     weak_pos ? &pango_weak_pos : NULL);
+
+	if (strong_pos) {
+		strong_pos->x = x1 - cx - text->xofs_edit + pango_strong_pos.x / PANGO_SCALE;
+		strong_pos->y = y1 - cy - text->yofs_edit + pango_strong_pos.y / PANGO_SCALE;
+		strong_pos->width = 0;
+		strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
+	}
+
+	if (weak_pos) {
+		weak_pos->x = x1 - cx - text->xofs_edit + pango_weak_pos.x / PANGO_SCALE;
+		weak_pos->y = y1 - cy - text->yofs_edit + pango_weak_pos.y / PANGO_SCALE;
+		weak_pos->width = 0;
+		weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
+	}
+}
+
+/* Update IM's cursor position to display candidate selection window */
+static void
+update_im_cursor_position (EText *text)
+{
+	GdkRectangle area;
+	
+	e_text_get_cursor_locations (text, &area, NULL);
+
+	gtk_im_context_set_cursor_location (text->im_context, &area);
+}
+
 static void
 e_text_preedit_changed_cb (GtkIMContext *context,
-				EText        *etext)
+			   EText        *etext)
 {
 	gchar *preedit_string = NULL;
+ 	gint cursor_pos;
 
 	gtk_im_context_get_preedit_string (context, &preedit_string, 
-					NULL, NULL);
+					   NULL, &cursor_pos);
 
+ 	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
 	etext->preedit_len = strlen (preedit_string);
-	g_free (preedit_string);
+ 	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
+ 	g_free (preedit_string);
 
 	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
 }

evolution-2.7.4-candidate-window-position-task.patch:
 e-cell-text.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 2 deletions(-)

--- NEW FILE evolution-2.7.4-candidate-window-position-task.patch ---
--- evolution-2.7.4/widgets/table/e-cell-text.c.task	2006-07-13 10:56:19.000000000 -0400
+++ evolution-2.7.4/widgets/table/e-cell-text.c	2006-07-13 10:56:27.000000000 -0400
@@ -199,6 +199,7 @@
 	gboolean im_context_signals_registered;
 
 	guint16 preedit_length;       /* length of preedit string, in bytes */
+	gint preedit_pos;             /* position of preedit cursor */
 
 	ECellActions actions;
 };
@@ -222,6 +223,7 @@
 static void _insert (ECellTextView *text_view, char *string, int value);
 static void _delete_selection (ECellTextView *text_view);
 static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length);
+static void update_im_cursor_location (ECellTextView *tv);
 
 static ECellClass *parent_class;
 
@@ -560,6 +562,9 @@
 	if (preedit_attrs)
 		pango_attr_list_unref (preedit_attrs);
 	pango_attr_list_unref (attrs);
+
+	update_im_cursor_location (text_view);
+
 	return layout;
 }
 
@@ -1863,6 +1868,66 @@
 /* IM Context Callbacks */
 
 static void
+e_cell_text_get_cursor_locations (ECellTextView *tv,
+				  GdkRectangle *strong_pos,
+				  GdkRectangle *weak_pos)
+{
+	GdkRectangle area;
+	CellEdit *edit=tv->edit;
+	ECellView *cell_view = (ECellView *)tv;
+	ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view);
+	GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent;
+	PangoRectangle pango_strong_pos;
+	PangoRectangle pango_weak_pos;
+	gint x, y, col, row;
+	gdouble x1,y1;
+	gint cx, cy;
+	gint index;
+
+	row = edit->row;
+	col = edit->view_col;
+
+	e_table_item_get_cell_geometry (item, &row, &col,
+					&x, &y, NULL, &area.height);
+
+	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL);
+	
+	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (parent_item)->canvas), &cx, &cy);
+
+	index = edit->selection_end + edit->preedit_pos;
+
+	pango_layout_get_cursor_pos (edit->layout, 
+				     index,
+				     strong_pos ? &pango_strong_pos : NULL,
+				     weak_pos ? &pango_weak_pos : NULL);
+
+	if (strong_pos) {
+		strong_pos->x = x + x1 - cx - edit->xofs_edit + pango_strong_pos.x / PANGO_SCALE;
+		strong_pos->y = y + y1 - cy - edit->yofs_edit + pango_strong_pos.y / PANGO_SCALE;
+		strong_pos->width = 0;
+		strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
+	}
+
+	if (weak_pos) {
+		weak_pos->x = x + x1 - cx - edit->xofs_edit + pango_weak_pos.x / PANGO_SCALE;
+		weak_pos->y = y + y1 - cy - edit->yofs_edit + pango_weak_pos.y / PANGO_SCALE;
+		weak_pos->width = 0;
+		weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
+	}
+}
+
+static void
+update_im_cursor_location (ECellTextView *tv)
+{
+	CellEdit *edit=tv->edit;
+	GdkRectangle area;
+	
+	e_cell_text_get_cursor_locations (tv, &area, NULL);
+
+	gtk_im_context_set_cursor_location (edit->im_context, &area);
+}
+
+static void
 e_cell_text_preedit_changed_cb (GtkIMContext *context,
 		  ECellTextView    *tv)
 {
@@ -1871,10 +1936,12 @@
 	CellEdit *edit=tv->edit;
 	gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, 
 					NULL, &cursor_pos);
-	                                                  
+
 	edit->preedit_length = strlen (preedit_string);
-	cursor_pos =  CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); 
+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+	edit->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
 	g_free (preedit_string);
+
 	ect_queue_redraw (tv, edit->view_col, edit->row);
 }
 


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- evolution.spec	12 Jul 2006 22:10:15 -0000	1.164
+++ evolution.spec	13 Jul 2006 16:08:52 -0000	1.165
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.7.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -116,10 +116,10 @@
 Patch900: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
-Patch901: evolution-2.7.3-candidate-window-position-task.patch
+Patch901: evolution-2.7.4-candidate-window-position-task.patch
 
 # RH bug #157505 / Gnome.org bug #303878
-Patch902: evolution-2.7.3-candidate-window-position-calendar.patch
+Patch902: evolution-2.7.4-candidate-window-position-calendar.patch
 
 # RH bug #190359 / Gnome.org bug #211058
 Patch903: evolution-2.7.3-filter-datespec.patch
@@ -677,6 +677,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jul 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-2
+- Update patch for RH bug #157400.
+- Update patch for RH bug #157505.
+
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-1
 - Update to 2.7.4
 - Remove evo-calendar-print-with-pango-7.patch (fixed upstream).


--- evolution-2.7.3-candidate-window-position-calendar.patch DELETED ---


--- evolution-2.7.3-candidate-window-position-task.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 16:23:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 12:23:05 -0400
Subject: rpms/gnome-python2-extras/devel .cvsignore, 1.10,
	1.11 gnome-python-extras.spec, 1.47, 1.48 sources, 1.10, 1.11
Message-ID: <200607131623.k6DGN5ok002787@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-python-extras.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2006 16:11:45 -0000	1.10
+++ .cvsignore	13 Jul 2006 16:23:03 -0000	1.11
@@ -1 +1 @@
-gnome-python-extras-2.14.0.tar.bz2
+gnome-python-extras-2.14.1.tar.bz2


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-python-extras.spec	12 Jul 2006 06:06:58 -0000	1.47
+++ gnome-python-extras.spec	13 Jul 2006 16:23:03 -0000	1.48
@@ -10,8 +10,8 @@
 
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
-Version: 2.14.0
-Release: 2.1
+Version: 2.14.1
+Release: 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
@@ -126,6 +126,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Thu Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
+- Update to 2.14.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.0-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2006 16:11:45 -0000	1.10
+++ sources	13 Jul 2006 16:23:03 -0000	1.11
@@ -1 +1 @@
-e9390569e18a5e71da1ed9476fa750b3  gnome-python-extras-2.14.0.tar.bz2
+f6868ad32303adb13a25e99f682ffe80  gnome-python-extras-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 16:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 12:57:02 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.223,
	1.224 config-ia64-generic, 1.35, 1.36 config-powerpc-generic,
	1.20, 1.21 config-powerpc32-generic, 1.12,
	1.13 config-x86-generic, 1.61, 1.62 config-x86_64-generic,
	1.48, 1.49 config-xen-generic, 1.20, 1.21
Message-ID: <200607131657.k6DGv2kq028392@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-powerpc32-generic config-x86-generic 
	config-x86_64-generic config-xen-generic 
Log Message:
KPROBES on everywhere.


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- config-generic	12 Jul 2006 18:30:57 -0000	1.223
+++ config-generic	13 Jul 2006 16:56:59 -0000	1.224
@@ -2855,3 +2855,5 @@
 CONFIG_UTRACE=y
 CONFIG_PTRACE=y
 
+CONFIG_KPROBES=y
+


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-ia64-generic	12 Jul 2006 23:23:02 -0000	1.35
+++ config-ia64-generic	13 Jul 2006 16:56:59 -0000	1.36
@@ -145,7 +145,6 @@
 CONFIG_SGI_MBCS=m
 
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_KPROBES=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-powerpc-generic	29 Jun 2006 20:38:46 -0000	1.20
+++ config-powerpc-generic	13 Jul 2006 16:56:59 -0000	1.21
@@ -4,7 +4,6 @@
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_DEBUGGER=y
-# CONFIG_KPROBES is not set
 # CONFIG_KEXEC is not set
 CONFIG_GENERIC_NVRAM=y
 CONFIG_ALTIVEC=y


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-powerpc32-generic	13 Feb 2006 00:33:52 -0000	1.12
+++ config-powerpc32-generic	13 Jul 2006 16:56:59 -0000	1.13
@@ -57,7 +57,6 @@
 CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
 CONFIG_FB_MATROX=y
-# CONFIG_KPROBES is not set
 # CONFIG_DISKDUMP is not set
 
 # CONFIG_CRASH is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- config-x86-generic	13 Jul 2006 15:03:11 -0000	1.61
+++ config-x86-generic	13 Jul 2006 16:56:59 -0000	1.62
@@ -212,7 +212,6 @@
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_STACK_BACKTRACE_COLS=2
 CONFIG_4KSTACKS=y
-CONFIG_KPROBES=y
 
 # FIXME: Disable before release.
 # CONFIG_DEBUG_PAGEALLOC is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- config-x86_64-generic	10 Jul 2006 16:31:44 -0000	1.48
+++ config-x86_64-generic	13 Jul 2006 16:56:59 -0000	1.49
@@ -116,8 +116,6 @@
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
 
-CONFIG_KPROBES=y
-
 CONFIG_BLK_DEV_AMD74XX=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-xen-generic	14 Jun 2006 12:11:08 -0000	1.20
+++ config-xen-generic	13 Jul 2006 16:56:59 -0000	1.21
@@ -76,7 +76,6 @@
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
-# CONFIG_KPROBES is not set
 # CONFIG_UNWIND_INFO is not set
 
 # FIXME: Why?



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:01:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:01:56 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.48,1.49
Message-ID: <200607131701.k6DH1uMU029787@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python-extras.spec 
Log Message:
fix build reqs



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-python-extras.spec	13 Jul 2006 16:23:03 -0000	1.48
+++ gnome-python-extras.spec	13 Jul 2006 17:01:38 -0000	1.49
@@ -30,6 +30,8 @@
 BuildRequires: mozilla-devel >= %{mozilla_version}
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
+BuildRequires: libbonoboui-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.



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:03:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:03:27 -0400
Subject: rpms/kdegames/devel kdegames.spec,1.52,1.53
Message-ID: <200607131703.k6DH3Rjl029922@cvs.devel.redhat.com>

Author: dgregor

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

Modified Files:
	kdegames.spec 
Log Message:
bump for rebuild


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdegames.spec	12 Jul 2006 06:39:57 -0000	1.52
+++ kdegames.spec	13 Jul 2006 17:03:05 -0000	1.53
@@ -19,7 +19,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 2.1
+Release: 2.2
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -154,6 +154,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 13 2006 Dennis Gregorovic <dgregor at redhat.com> - 6:3.5.3-2.2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:15:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:15:06 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.49,1.50
Message-ID: <200607131715.k6DHF6YW032550@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python-extras.spec 
Log Message:
bump rev



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-python-extras.spec	13 Jul 2006 17:01:38 -0000	1.49
+++ gnome-python-extras.spec	13 Jul 2006 17:15:04 -0000	1.50
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.1
-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
@@ -128,6 +128,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Thu Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
+- Rebuild
+
 * Thu Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-1
 - Update to 2.14.1
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:16:15 -0400
Subject: rpms/kernel/devel/configs config-generic,1.224,1.225
Message-ID: <200607131716.k6DHGFPX006125@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
git6


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- config-generic	13 Jul 2006 16:56:59 -0000	1.224
+++ config-generic	13 Jul 2006 17:16:11 -0000	1.225
@@ -2049,7 +2049,7 @@
 CONFIG_SND_AU8820=m
 CONFIG_SND_AU8830=m
 CONFIG_SND_MIXART=m
-CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m
@@ -2256,6 +2256,7 @@
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=y
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -2264,7 +2265,7 @@
 CONFIG_USB_EZUSB=y
 CONFIG_USB_EMI62=m
 CONFIG_USB_LED=m
-# CONFIG_USB_CY7C63 is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 CONFIG_USB_G_SERIAL=m
 
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:16:14 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git6.bz2.sign, NONE,
	1.1 .cvsignore, 1.482, 1.483 kernel-2.6.spec, 1.2391,
	1.2392 linux-2.6-random-patches.patch, 1.17, 1.18 sources,
	1.426, 1.427 upstream, 1.393, 1.394
Message-ID: <200607131716.k6DHGE2d006098@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-random-patches.patch 
	sources upstream 
Added Files:
	patch-2.6.18-rc1-git6.bz2.sign 
Log Message:
git6


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

iD8DBQBEtfAxyGugalF9Dw4RAu/8AJ4/4vUlT3EPsnyeEujuI7ppy0xK7QCfTRS9
1IGxyC77qBDo0A38z9LUCkI=
=/AnM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- .cvsignore	12 Jul 2006 20:26:58 -0000	1.482
+++ .cvsignore	13 Jul 2006 17:16:11 -0000	1.483
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git5.bz2
+patch-2.6.18-rc1-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2391
retrieving revision 1.2392
diff -u -r1.2391 -r1.2392
--- kernel-2.6.spec	13 Jul 2006 04:01:31 -0000	1.2391
+++ kernel-2.6.spec	13 Jul 2006 17:16:11 -0000	1.2392
@@ -256,7 +256,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git5.bz2
+Patch2: patch-2.6.18-rc1-git6.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1677,6 +1677,9 @@
 %endif
 
 %changelog
+* Thu Jul 13 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git6
+
 * Wed Jul 12 2006 Roland McGrath <roland at redhat.com>
 - Build separate debuginfo subpackages instead of a single one.
 

linux-2.6-random-patches.patch:
 char/watchdog/machzwd.c        |    3 +--
 media/dvb/ttpci/av7110.c       |    2 +-
 media/dvb/ttpci/budget-ci.c    |    2 +-
 media/dvb/ttpci/budget-patch.c |    2 +-
 media/dvb/ttpci/budget.c       |    5 +----
 5 files changed, 5 insertions(+), 9 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-random-patches.patch	13 Jul 2006 02:32:04 -0000	1.17
+++ linux-2.6-random-patches.patch	13 Jul 2006 17:16:11 -0000	1.18
@@ -81,33 +81,3 @@
 # 	}
 # 	if (!ata_dev_present(dev))
 
-
- [<c0136fcf>] out_of_memory+0x29/0xf6
- [<c0137f48>] __alloc_pages+0x1ed/0x276
- [<c014db73>] kmem_getpages+0x63/0xc1
- [<c014e960>] cache_grow+0xaa/0x139
- [<c014eb6a>] cache_alloc_refill+0x17b/0x1c0
- [<c014f1ef>] __kmalloc+0x83/0x93
- [<c0168cf5>] alloc_fd_array+0x19/0x24
- [<c0169122>] alloc_fdtable+0xb2/0xef
- [<c016917f>] expand_fdtable+0x20/0x7d
- [<c0169221>] expand_files+0x45/0x50
- [<c0161263>] locate_fd+0x70/0x8e
- [<c01612aa>] dupfd+0x29/0x61
- [<c01613dc>] sys_dup+0x1b/0x23
- [<c01027d3>] syscall_call+0x7/0xb
-
-I suspect that's because I had me a little mistake.
-
---- a/fs/file.c~alloc_fdtable-expansion-fix
-+++ a/fs/file.c
-@@ -240,7 +240,7 @@ static struct fdtable *alloc_fdtable(int
- 	if (!fdt)
-   		goto out;
- 
--	nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nfds));
-+	nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1));
- 	if (nfds > NR_OPEN)
- 		nfds = NR_OPEN;
- 
-


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- sources	12 Jul 2006 20:26:58 -0000	1.426
+++ sources	13 Jul 2006 17:16:11 -0000	1.427
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-f65d10d23182f3139dd26048bd697f2d  patch-2.6.18-rc1-git5.bz2
+387fffe0c50660921204a67eb8d61e8d  patch-2.6.18-rc1-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- upstream	12 Jul 2006 20:26:58 -0000	1.393
+++ upstream	13 Jul 2006 17:16:11 -0000	1.394
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git5.bz2
+patch-2.6.18-rc1-git6.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:25:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:25:10 -0400
Subject: rpms/xen/devel xen-change-default-nic.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 sources, 1.33,
	1.34 xen-network-iptables-bridge.patch, 1.1,
	1.2 xen-vmxballoon-hack.patch, 1.2, 1.3 xen.spec, 1.119, 1.120
Message-ID: <200607131725.k6DHPA4J018504@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	.cvsignore sources xen-network-iptables-bridge.patch 
	xen-vmxballoon-hack.patch xen.spec 
Added Files:
	xen-change-default-nic.patch 
Log Message:
Update to xen-unstable cset 10675
Remove internal libvncserver build, new qemu device model has its own one
now.
Change default FV NIC model from rtl8139 to ne2k_pci until the former works
better



xen-change-default-nic.patch:
 image.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-change-default-nic.patch ---
--- xen-unstable.hg/tools/python/xen/xend/image.py.~1~	2006-07-13 15:39:11.000000000 +0100
+++ xen-unstable.hg/tools/python/xen/xend/image.py	2006-07-13 18:01:07.000000000 +0100
@@ -303,7 +303,7 @@
                 if mac == None:
                     mac = randomMAC()
                 bridge = sxp.child_value(info, 'bridge', 'xenbr0')
-                model = sxp.child_value(info, 'model', 'rtl8139')
+                model = sxp.child_value(info, 'model', 'ne2k_pci')
                 ret.append("-net")
                 ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
                            (nics, mac, model))


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Jun 2006 14:04:13 -0000	1.18
+++ .cvsignore	13 Jul 2006 17:25:07 -0000	1.19
@@ -1,2 +1 @@
-LibVNCServer-0.7.1.tar.gz
-xen-unstable-10278.tar.bz2
+xen-unstable-10675.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	7 Jun 2006 14:04:13 -0000	1.33
+++ sources	13 Jul 2006 17:25:07 -0000	1.34
@@ -1,2 +1 @@
-54110288b3171551c03467cd60976d55  LibVNCServer-0.7.1.tar.gz
-3a9ceecf483dad0a29364b73b445636c  xen-unstable-10278.tar.bz2
+7522262f0712687cb52c337553cab183  xen-unstable-10675.tar.bz2

xen-network-iptables-bridge.patch:
 xen-network-common.sh |    3 +++
 1 files changed, 3 insertions(+)

Index: xen-network-iptables-bridge.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-network-iptables-bridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-network-iptables-bridge.patch	2 Feb 2006 22:24:14 -0000	1.1
+++ xen-network-iptables-bridge.patch	13 Jul 2006 17:25:07 -0000	1.2
@@ -1,9 +1,9 @@
---- 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 @@
+--- xen-unstable.hg/tools/examples/xen-network-common.sh.~1~	2006-06-30 16:10:18.000000000 +0100
++++ xen-unstable.hg/tools/examples/xen-network-common.sh	2006-06-30 16:16:47.000000000 +0100
+@@ -127,6 +127,9 @@
  
      # Don't create the bridge if it already exists.
-     if ! brctl show | grep -q ${bridge} ; then
+     if [ ! -e "/sys/class/net/${bridge}/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"

xen-vmxballoon-hack.patch:
 XendDomainInfo.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: xen-vmxballoon-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-vmxballoon-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-vmxballoon-hack.patch	8 Feb 2006 21:18:36 -0000	1.2
+++ xen-vmxballoon-hack.patch	13 Jul 2006 17:25:07 -0000	1.3
@@ -1,7 +1,7 @@
---- xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py.vmxballoon	2006-02-07 17:45:12.000000000 -0500
-+++ xen-3.0.0/tools/python/xen/xend/XendDomainInfo.py	2006-02-07 17:44:50.000000000 -0500
-@@ -1182,7 +1182,13 @@
-                     xc.vcpu_setaffinity(self.domid, v, cpu)
+--- xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py.~1~	2006-07-13 15:51:46.000000000 +0100
++++ xen-unstable.hg/tools/python/xen/xend/XendDomainInfo.py	2006-07-13 15:56:15.000000000 +0100
+@@ -1281,7 +1281,13 @@
+             xc.domain_setmaxmem(self.domid, self.info['maxmem'] * 1024)
  
              m = self.image.getDomainMemory(self.info['memory'] * 1024)
 -            balloon.free(m)
@@ -12,6 +12,6 @@
 +            if self.image.ostype == "hvm":
 +                fudge = 1026 * 4 # 1 meg of video ram + pt
 +            balloon.free(m + fudge)
-             xc.domain_setmaxmem(self.domid, m)
-             xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
  
+             init_reservation = self.info['memory'] * 1024
+             if os.uname()[4] == 'ia64':


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- xen.spec	11 Jul 2006 13:52:53 -0000	1.119
+++ xen.spec	13 Jul 2006 17:25:07 -0000	1.120
@@ -1,19 +1,17 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define libvncver 0.7.1
-
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 12
+Release: 13
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
-Source0: xen-unstable-10278.tar.bz2
-Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz
+Source0: xen-unstable-10675.tar.bz2
 Source2: xenguest-install.py
 Source3: xen-udev.rules
 Patch1: xen-initscript.patch
+Patch2: xen-change-default-nic.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
 Patch11: xen-3.0.1-cloexec.patch
@@ -77,8 +75,9 @@
 virtual machines. 
 
 %prep
-%setup -q -n xen-unstable.hg -a 1
+%setup -q -n xen-unstable.hg
 %patch1 -p1 -b .init
+%patch2 -p1 -b .nic
 %patch6 -p1
 %patch8 -p1
 #patch11 -p1 -b .cloexec
@@ -91,13 +90,6 @@
 cp %{SOURCE2} .
 
 %build
-pushd LibVNCServer-%{libvncver}
-%configure
-make
-vncdir=`pwd`
-popd
-
-sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure
 CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs 
 
 %install
@@ -198,6 +190,13 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jul 13 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-13
+- Update to xen-unstable cset 10675
+- Remove internal libvncserver build, new qemu device model has its own one
+  now.
+- Change default FV NIC model from rtl8139 to ne2k_pci until the former works
+  better
+
 * Tue Jul 11 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-12
 - bump libvirt requires to 0.1.2
 - drop xend httpd localhost server and use the unix socket instead



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:28:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:28:09 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.32, 1.33 sources, 1.32,
	1.33 system-config-users.spec, 1.38, 1.39
Message-ID: <200607131728.k6DHS9Jv012523@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
revamp uid/gid number selection to honor preferences and avoid primary group/created group discrepancies (#198152)
use disttag if available
detect inconsistencies between /etc/group and /etc/gshadow at startup (#174716)
change some label texts
fix indentation
fix localization markings (#191846, patch by Roozbeh Pournader)
pull out preferences handling into Preferences class
implement preferences dialog



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Apr 2006 15:14:55 -0000	1.32
+++ .cvsignore	13 Jul 2006 17:28:06 -0000	1.33
@@ -1 +1 @@
-system-config-users-1.2.44.tar.bz2
+system-config-users-1.2.45.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	5 Apr 2006 15:14:56 -0000	1.32
+++ sources	13 Jul 2006 17:28:06 -0000	1.33
@@ -1 +1 @@
-9441d0b7dd61ff78b32d5c4635770e0d  system-config-users-1.2.44.tar.bz2
+3cb63a85b4802f7eb27d1bbbcbd3b9c3  system-config-users-1.2.45.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- system-config-users.spec	12 Jul 2006 08:24:42 -0000	1.38
+++ system-config-users.spec	13 Jul 2006 17:28:06 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.44
-Release: 1.1
+Version: 1.2.45
+Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -77,8 +77,25 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.44-1.1
-- rebuild
+* Thu Jul 13 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.45
+- revamp uid/gid number selection to honor preferences and avoid primary
+  group/created group discrepancies (#198152)
+- use disttag if available
+
+* Mon Jun 12 2006 Nils Philippsen <nphilipp at redhat.com>
+- detect inconsistencies between /etc/group and /etc/gshadow at startup
+  (#174716)
+
+* Wed Jun 07 2006 Nils Philippsen <nphilipp at redhat.com>
+- change some label texts
+- fix indentation
+
+* Tue May 16 2006 Nils Philippsen <nphilipp at redhat.com>
+- fix localization markings (#191846, patch by Roozbeh Pournader)
+
+* Fri May 05 2006 Nils Philippsen <nphilipp at redhat.com>
+- pull out preferences handling into Preferences class
+- implement preferences dialog
 
 * Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.44
 - rephrase some error messages to ease translation (#154204)



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:30:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:30:44 -0400
Subject: rpms/control-center/devel control-center.spec,1.152,1.153
Message-ID: <200607131730.k6DHUhI7030343@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30319

Modified Files:
	control-center.spec 
Log Message:
- remove stale directory from file list
- glob all pkg-config files to devel subpackage



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- control-center.spec	13 Jul 2006 14:44:27 -0000	1.152
+++ control-center.spec	13 Jul 2006 17:30:40 -0000	1.153
@@ -229,7 +229,6 @@
 %{_datadir}/desktop-directories/*
 %{_bindir}/*
 %{_libexecdir}/*
-%{_libdir}/bonobo/*
 %{_libdir}/nautilus/extensions-1.0/*
 %{_libdir}/*.so.*
 %{_libdir}/window-manager-settings
@@ -241,7 +240,7 @@
 %defattr(-,root,root)
 %{_includedir}/gnome-window-settings-2.0
 %{_libdir}/libgnome-window-settings.so
-%{_libdir}/pkgconfig/gnome-window-settings*
+%{_libdir}/pkgconfig/*
 
 %changelog
 * Thu Jul 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-2



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:33:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:33:43 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-keyinit.patch, NONE, 1.1 kde-np,
	1.3, 1.4 kdebase.spec, 1.198, 1.199
Message-ID: <200607131733.k6DHXh2K030463@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-np kdebase.spec 
Added Files:
	kdebase-3.5.3-keyinit.patch 
Log Message:
- add keyinit instructions to the kdm PAM scripts (#198630)


kdebase-3.5.3-keyinit.patch:
 kdm.pamd |   12 ++++++++++++
 1 files changed, 12 insertions(+)

--- NEW FILE kdebase-3.5.3-keyinit.patch ---
diff -uNrp kdebase-3.5.3-orig/kdm.pamd kdebase-3.5.3/kdm.pamd
--- kdebase-3.5.3-orig/kdm.pamd	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.3/kdm.pamd	2006-07-13 14:26:10.000000000 +0100
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth       sufficient	pam_timestamp.so
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session	   optional	pam_keyinit.so force revoke
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional	pam_timestamp.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so


Index: kde-np
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kde-np,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde-np	7 Oct 2005 10:40:12 -0000	1.3
+++ kde-np	13 Jul 2006 17:33:40 -0000	1.4
@@ -4,6 +4,7 @@
 auth       required	pam_permit.so
 account    include	system-auth
 password   include	system-auth
+session	   optional	pam_keyinit.so force revoke
 session    include	system-auth
 session    required     pam_loginuid.so
 session    optional     pam_selinux.so


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- kdebase.spec	13 Jul 2006 13:08:18 -0000	1.198
+++ kdebase.spec	13 Jul 2006 17:33:40 -0000	1.199
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 10
+Release: 12
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -54,6 +54,7 @@
 Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
+Patch20: kdebase-3.5.3-keyinit.patch
 
 # upstream patches
 Patch100: kdebase-3.5.3-kfind-largefile.patch
@@ -171,6 +172,7 @@
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
 %patch19 -p1 -b .fuser
+%patch20 -p1 -b .keyinit
 
 # upstream patches
 %patch100 -p1 -b .kfind-largefile
@@ -252,7 +254,7 @@
 # install pam configuration file
 mkdir -p %{buildroot}/etc/pam.d
 install -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
-install -m 644 kde.pamd %{buildroot}/etc/pam.d/kdm
+install -m 644 kdm.pamd %{buildroot}/etc/pam.d/kdm
 install -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
 install -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
 
@@ -550,6 +552,12 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-12
+- cleanup keyinit patch
+
+* Thu Jul 13 2006 David Howells <dhowells at redhat.com> 6:3.5.3-11
+- add keyinit instructions to the kdm PAM scripts (#198630)
+
 * Thu Jul 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-10
 - cleanup upstream patch
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:45:47 -0400
Subject: rpms/control-center/devel control-center.spec,1.153,1.154
Message-ID: <200607131745.k6DHjlt3030759@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30678

Modified Files:
	control-center.spec 
Log Message:
add some unpackaged files to the filelist



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- control-center.spec	13 Jul 2006 17:30:40 -0000	1.153
+++ control-center.spec	13 Jul 2006 17:45:44 -0000	1.154
@@ -227,6 +227,7 @@
 %{_datadir}/omf/control-center
 %{_datadir}/gnome-default-applications/*
 %{_datadir}/desktop-directories/*
+%{_datadir}/dbus-1/services/*
 %{_bindir}/*
 %{_libexecdir}/*
 %{_libdir}/nautilus/extensions-1.0/*
@@ -239,6 +240,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/gnome-window-settings-2.0
+%{_includedir}/gnome-settings-daemon-2.0
 %{_libdir}/libgnome-window-settings.so
 %{_libdir}/pkgconfig/*
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:48:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:48:38 -0400
Subject: rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.8,1.9
Message-ID: <200607131748.k6DHmcti013169@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
I hate you CVS, seriously.



linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   10 ++++++--
 linux-2.6.18-rc1/block/ioctl.c                |    4 +--
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++---
 linux-2.6.18-rc1/fs/block_dev.c               |   29 +++++++++++++++++++++++++-
 linux-2.6.18-rc1/include/linux/libps2.h       |   10 ++++++++
 5 files changed, 49 insertions(+), 10 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-lockdep-fixes.patch	12 Jul 2006 01:42:28 -0000	1.8
+++ linux-2.6-lockdep-fixes.patch	13 Jul 2006 17:48:35 -0000	1.9
@@ -204,96 +204,6 @@
  	module_put(owner);
 
 
-From davej  Mon Jul 10 10:08:02 2006
-Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Mon, 10 Jul 2006 10:08:02 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Mon, 10 Jul 2006 10:07:48 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6AE7mWA014897
-	for <davej at pobox.devel.redhat.com>; Mon, 10 Jul 2006 10:07:48 -0400
-Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AE7mpu024718
-	for <davej at redhat.com>; Mon, 10 Jul 2006 10:07:48 -0400
-Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
-	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6AE7aKY016927
-	for <Davej at redhat.com>; Mon, 10 Jul 2006 10:07:41 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1FzwQB-0007x3-Ad; Mon, 10 Jul 2006 15:07:35 +0100
-Subject: fix for the mc thing
-From: Arjan van de Ven <arjan at infradead.org>
-To: mingo at elte.hu, Davej at redhat.com
-Content-Type: text/plain
-Date: Mon, 10 Jul 2006 16:07:34 +0200
-Message-Id: <1152540454.4874.52.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-X-RedHat-Spam-Score: 0 
-Status: RO
-Content-Length: 1945
-Lines: 47
-
-this patch fixes the "mc" bug for me (but which also hits gnome)
-
-please give it a ride in rawhide while it's also being sent to
-akpm/linus
-
-From: Arjan van de Ven <arjan at linux.intel.com>
-Subject: fix false positives by giving sysfs inodes their own lock class
-
-sysfs has a different i_mutex lock order behavior for i_mutex than the other
-filesystems; sysfs i_mutex is called in many places with subsystem locks
-held. At the same time, many of the VFS locking rules do not apply to sysfs
-at all (cross directory rename for example). To untangle this mess (which
-gives false positives in lockdep), we're giving sysfs inodes their own class
-for i_mutex.
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-Index: linux-2.6.18-rc1/fs/sysfs/inode.c
-===================================================================
---- linux-2.6.18-rc1.orig/fs/sysfs/inode.c
-+++ linux-2.6.18-rc1/fs/sysfs/inode.c
-@@ -109,6 +109,17 @@ static inline void set_inode_attr(struct
- 	inode->i_ctime = iattr->ia_ctime;
- }
- 
-+
-+/*
-+ * sysfs has a different i_mutex lock order behavior for i_mutex than other
-+ * filesystems; sysfs i_mutex is called in many places with subsystem locks
-+ * held. At the same time, many of the VFS locking rules do not apply to
-+ * sysfs at all (cross directory rename for example). To untangle this mess
-+ * (which gives false positives in lockdep), we're giving sysfs inodes their
-+ * own class for i_mutex.
-+ */
-+static struct lock_class_key sysfs_inode_imutex_key;
-+
- struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent * sd)
- {
- 	struct inode * inode = new_inode(sysfs_sb);
-@@ -118,6 +129,7 @@ struct inode * sysfs_new_inode(mode_t mo
- 		inode->i_mapping->a_ops = &sysfs_aops;
- 		inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
- 		inode->i_op = &sysfs_inode_operations;
-+		lockdep_set_class(&inode->i_mutex, &sysfs_inode_imutex_key);
- 
- 		if (sd->s_iattr) {
- 			/* sysfs_dirent has non-default attributes
-
-
 From davej  Mon Jul 10 11:13:32 2006
 Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 



From fedora-cvs-commits at redhat.com  Thu Jul 13 17:49:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 13:49:54 -0400
Subject: rpms/arptables_jf/devel .cvsignore, 1.5, 1.6 arptables_jf.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200607131749.k6DHns5R013254@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/arptables_jf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13239

Modified Files:
	.cvsignore arptables_jf.spec sources 
Log Message:
patch out compiler.h; rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Sep 2004 16:49:54 -0000	1.5
+++ .cvsignore	13 Jul 2006 17:49:51 -0000	1.6
@@ -1 +1,2 @@
 arptables_jf-0.0.8.tbz
+arptables_jf-0.0.8-header.patch


Index: arptables_jf.spec
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/arptables_jf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- arptables_jf.spec	12 Jul 2006 05:13:09 -0000	1.13
+++ arptables_jf.spec	13 Jul 2006 17:49:51 -0000	1.14
@@ -4,7 +4,7 @@
 
 Epoch: 0
 Version: 0.0.8
-Release: 7.1
+Release: 8
 Source: %{name}-%{version}.tbz
 #Source1: Makefile
 #Source2: arptables.h
@@ -15,6 +15,7 @@
 Patch1: arptables_jf-0.0.8-2.6-kernel.patch
 Patch2: arptables_jf-0.0.8-man.patch
 Patch3: arptables_jf-0.0.8-warnings.patch
+Patch4: arptables_jf-0.0.8-header.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
@@ -27,7 +28,6 @@
 Conflicts: kernel < 2.4.0
 
 Requires(post,postun): chkconfig
-BuildRequires: glibc-kernheaders
 
 %description
 
@@ -43,6 +43,7 @@
 %patch1 -p1 -b .2.6-kernel
 %patch2 -p1 -b .man
 %patch3 -p1 -b .warnings
+%patch4 -p1 -b .header
 
 %build
 make all LIBDIR=/%{_lib}
@@ -69,8 +70,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-7.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-8
 - rebuild
+- Add patch to not include linux/compiler.h
+- Remove br on glibc-kernheaders, part of the build-env.
 
 * Fri May 26 2006 Jay Fenlason <fenlason at redhat.com> 0:0.0.8-7
 - Add warnings patch to close


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Sep 2004 16:49:54 -0000	1.5
+++ sources	13 Jul 2006 17:49:51 -0000	1.6
@@ -1 +1,2 @@
 82bdb1306dca9182e05a10d3f0f520f1  arptables_jf-0.0.8.tbz
+9c96caf85b345d876f0f32ed68f67535  arptables_jf-0.0.8-header.patch



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:11:51 -0400
Subject: rpms/xen/devel xen-compile-fixes.patch, 1.1, 1.2 xen.spec, 1.120,
	1.121
Message-ID: <200607131811.k6DIBpJZ024811@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	xen-compile-fixes.patch xen.spec 
Log Message:
Compile fix: don't #include <linux/compiler.h>


xen-compile-fixes.patch:
 xenstat.c |    1 -
 1 files changed, 1 deletion(-)

Index: xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-compile-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-compile-fixes.patch	6 Dec 2005 21:22:21 -0000	1.1
+++ xen-compile-fixes.patch	13 Jul 2006 18:11:48 -0000	1.2
@@ -1,14 +1,10 @@
---- xen-3.0.0/tools/xenmon/xenbaked.c.compile	2005-12-06 09:05:34.000000000 -0500
-+++ xen-3.0.0/tools/xenmon/xenbaked.c	2005-12-06 16:05:24.000000000 -0500
-@@ -549,7 +549,10 @@
-     for (n=0; n<ncpu; n++) {
- 
-       for (i=0; i<sizeof(_new_qos_data); i=i+pgsize)
--        write(qos_fd, dummy, pgsize);
-+        if ((write(qos_fd, dummy, pgsize)) != pgsize) {
-+	  PERROR(SHARED_MEM_FILE);
-+	  exit(2);
-+	}
- 
-       new_qos = (_new_qos_data *) mmap(0, sizeof(_new_qos_data), PROT_READ|PROT_WRITE, 
- 				       MAP_SHARED, qos_fd, off);
+--- xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c.~1~	2006-07-13 15:39:15.000000000 +0100
++++ xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c	2006-07-13 19:04:59.000000000 +0100
+@@ -20,7 +20,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <linux/compiler.h>
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <sys/types.h>


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- xen.spec	13 Jul 2006 17:25:07 -0000	1.120
+++ xen.spec	13 Jul 2006 18:11:48 -0000	1.121
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 13
+Release: 14
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -12,6 +12,7 @@
 Source3: xen-udev.rules
 Patch1: xen-initscript.patch
 Patch2: xen-change-default-nic.patch
+Patch3: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
 Patch11: xen-3.0.1-cloexec.patch
@@ -78,6 +79,7 @@
 %setup -q -n xen-unstable.hg
 %patch1 -p1 -b .init
 %patch2 -p1 -b .nic
+%patch3 -p1 -b .compile
 %patch6 -p1
 %patch8 -p1
 #patch11 -p1 -b .cloexec
@@ -190,6 +192,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Jul 13 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-14
+- Compile fix: don't #include <linux/compiler.h>
+
 * Thu Jul 13 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-13
 - Update to xen-unstable cset 10675
 - Remove internal libvncserver build, new qemu device model has its own one



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:12:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:12:36 -0400
Subject: rpms/frysk/devel .cvsignore, 1.19, 1.20 frysk.spec, 1.69,
	1.70 sources, 1.19, 1.20
Message-ID: <200607131812.k6DICatU025164@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25128

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jul 2006 19:29:47 -0000	1.19
+++ .cvsignore	13 Jul 2006 18:12:34 -0000	1.20
@@ -1 +1 @@
-frysk-0.0.1.2006.07.12.rh2.tar.bz2
+frysk-0.0.1.2006.07.13.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- frysk.spec	12 Jul 2006 19:14:15 -0000	1.69
+++ frysk.spec	13 Jul 2006 18:12:34 -0000	1.70
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.12.rh2
-Release:	1
+Version:	0.0.1.2006.07.13.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -98,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 13 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.13.rh1-1
+- New upstream version.
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.12.rh2-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Jul 2006 19:29:47 -0000	1.19
+++ sources	13 Jul 2006 18:12:34 -0000	1.20
@@ -1 +1 @@
-16947f86b94b19916c80142038977ca4  frysk-0.0.1.2006.07.12.rh2.tar.bz2
+7a64a6dd6fb7cfeebd8988019ce74d61  frysk-0.0.1.2006.07.13.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:22:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:22:42 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.134,1.135 sources,1.129,1.130
Message-ID: <200607131822.k6DIMgUp011210@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11136

Modified Files:
	mkinitrd.spec sources 
Log Message:
- update from fixed upstream tarballs



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mkinitrd.spec	13 Jul 2006 15:37:19 -0000	1.134
+++ mkinitrd.spec	13 Jul 2006 18:22:40 -0000	1.135
@@ -1,3 +1,6 @@
+%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
+
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.0.47
@@ -14,9 +17,9 @@
 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 >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel
-BuildRequires: device-mapper libselinux-devel libsepol-devel
+BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x
 Requires: dmraid
 %endif
@@ -43,11 +46,19 @@
 %package devel
 Summary: C header files and library for functionality exported by libnash.
 Group: Development/Libraries
-Requires: glibc-devel
+Requires: glibc-devel, pkgconfig, e2fsprogs-devel
+
+%package -n libbdevid
+Summary: Library for probing block devices for their unique hardware IDs.
+Group: Development/Libraries
+Requires: mkinitrd-devel, python >= %{pyver}, pkgconfig
 
 %description devel
 C header files and library for functionality exported by libnash.
 
+%description -n libbdevid
+Library for probing block devices for their unique hardware IDs.
+
 %prep
 %setup -q -c -a 0
 %setup -q -c -a 1
@@ -58,12 +69,12 @@
 make test
 if [ $? != 0 ]; then exit 1; fi
 cd ../bdevid-%{BDEVID_VERSION}
-make
+make LIB=%{_lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 cd mkinitrd-%{version}
-make BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
+make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
 cd ../bdevid-%{BDEVID_VERSION}
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -80,9 +91,6 @@
 %attr(755,root,root) /sbin/new-kernel-pkg
 %attr(755,root,root) /sbin/grubby
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
-%{_libdir}/libbdevid.so*
-/lib/bdevid/scsi.so
-%{_libdir}/python*/site-packages/bdevid.so
 
 %files devel
 %defattr(-,root,root)
@@ -91,8 +99,12 @@
 %{_includedir}/nash.h
 %{_includedir}/nash
 
+%files -n libbdevid
+/%{_lib}/bdevid
+%{_libdir}/libbdevid.so*
 %{_libdir}/libbdevid.a
 %{_libdir}/pkgconfig/libbdevid.pc
+/%{python_sitelib}/bdevid.so
 %{_includedir}/bdevid.h
 %{_includedir}/bdevid
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- sources	13 Jul 2006 15:37:19 -0000	1.129
+++ sources	13 Jul 2006 18:22:40 -0000	1.130
@@ -1,2 +1,2 @@
-7608e5c8e6b43ffcfc68b284f756a1e2  bdevid-0.1.tar.bz2
-06af8b8edbdcf5bd3f37bc764508e7e5  mkinitrd-5.0.47.tar.bz2
+bc0464d3ecb741a9c19cbdfdadf5cd83  bdevid-0.1.tar.bz2
+56c5cb9e4e5f4f4147b590c17cd10d8a  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:27:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:27:17 -0400
Subject: rpms/libdhcp/devel .cvsignore, 1.10, 1.11 libdhcp.spec, 1.29,
	1.30 sources, 1.22, 1.23
Message-ID: <200607131827.k6DIRHIX012992@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/libdhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12944

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Jul 2006 21:38:40 -0000	1.10
+++ .cvsignore	13 Jul 2006 18:27:15 -0000	1.11
@@ -1 +1 @@
-libdhcp-1.8.tar.gz
+libdhcp-1.9.tar.gz


Index: libdhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libdhcp.spec	12 Jul 2006 21:38:40 -0000	1.29
+++ libdhcp.spec	13 Jul 2006 18:27:15 -0000	1.30
@@ -1,6 +1,6 @@
 Summary: 	A library for network interface configuration with DHCP
 Name: 		libdhcp
-Version: 	1.8
+Version: 	1.9
 Release: 	1
 License: 	GPL
 Group: 		Development/Libraries
@@ -76,6 +76,13 @@
 %{pkgcfgdir}/libdhcp.pc
 
 %changelog
+* Thu Jul 13 2006 David Cantrell <dcantrell at redhat.com> - 1.9-1
+- Added IP_STRLEN() macro to ip_addr.h
+- In pumpSetupInterface(), removed return_ok, make close/free calls as
+  needed
+- Close and free nic stuff in the right order in pumpSetupInterface()
+- Removed unnecessary relinquish_timeout() calls in pumpSetupInterface()
+
 * Wed Jul 12 2006 David Cantrell <dcantrell at redhat.com> - 1.8-1
 - Removed nic_configure_resolver() and calls to it
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libdhcp/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	12 Jul 2006 21:38:40 -0000	1.22
+++ sources	13 Jul 2006 18:27:15 -0000	1.23
@@ -1 +1 @@
-8e3532123c09347de61e3c2de7288897  libdhcp-1.8.tar.gz
+1dc1bfbdd2e40462360a083f70226070  libdhcp-1.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:32:16 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.74,1.75
Message-ID: <200607131832.k6DIWGw2014284@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-session.spec 
Log Message:
add buildreq on settings-daemon



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnome-session.spec	13 Jul 2006 02:02:31 -0000	1.74
+++ gnome-session.spec	13 Jul 2006 18:32:03 -0000	1.75
@@ -57,6 +57,7 @@
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires: dbus-devel
 BuildRequires: libnotify-devel
+BuildRequires: control-center-devel
 
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
@@ -160,7 +161,7 @@
 %{_datadir}/gnome/autostart
 
 %changelog
-* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+* Thu Jul 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.1-5.1



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:38:34 -0400
Subject: rpms/freetype/devel freetype.spec,1.33,1.34
Message-ID: <200607131838.k6DIcYWt016020@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15959

Modified Files:
	freetype.spec 
Log Message:
Remove period from summary.



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- freetype.spec	12 Jul 2006 05:51:56 -0000	1.33
+++ freetype.spec	13 Jul 2006 18:38:32 -0000	1.34
@@ -4,7 +4,7 @@
 
 %{!?with_xfree86:%define with_xfree86 1}
 
-Summary: A free and portable font rendering engine.
+Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
 Release: 2.1



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:42:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:42:07 -0400
Subject: rpms/freetype/devel freetype.spec,1.34,1.35
Message-ID: <200607131842.k6DIg74J017008@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16917/freetype/devel

Modified Files:
	freetype.spec 
Log Message:
Removed period at the end of summary, as per guidelines.



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- freetype.spec	13 Jul 2006 18:38:32 -0000	1.34
+++ freetype.spec	13 Jul 2006 18:42:05 -0000	1.35
@@ -34,7 +34,7 @@
 
 
 %package demos
-Summary: A collection of FreeType demos.
+Summary: A collection of FreeType demos
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:42:08 -0400
Subject: rpms/screen/devel screen.spec,1.31,1.32
Message-ID: <200607131842.k6DIg8vt017029@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16917/screen/devel

Modified Files:
	screen.spec 
Log Message:
Removed period at the end of summary, as per guidelines.



Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- screen.spec	12 Jul 2006 08:10:10 -0000	1.31
+++ screen.spec	13 Jul 2006 18:42:06 -0000	1.32
@@ -1,4 +1,4 @@
-Summary: A screen manager that supports multiple logins on one terminal.
+Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.0.2
 Release: 15.1



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:42:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:42:07 -0400
Subject: rpms/pango/devel pango.spec,1.74,1.75
Message-ID: <200607131842.k6DIg7Sm017016@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16917/pango/devel

Modified Files:
	pango.spec 
Log Message:
Removed period at the end of summary, as per guidelines.



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- pango.spec	12 Jul 2006 07:38:41 -0000	1.74
+++ pango.spec	13 Jul 2006 18:42:05 -0000	1.75
@@ -43,7 +43,7 @@
 
 
 %package devel
-Summary: System for layout and rendering of internationalized text.
+Summary: System for layout and rendering of internationalized text
 Group: Development/Libraries
 Requires: pango = %{PACKAGE_VERSION}
 Requires: libXrender-devel



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:42:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:42:08 -0400
Subject: rpms/vte/devel vte.spec,1.85,1.86
Message-ID: <200607131842.k6DIg8SC017037@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16917/vte/devel

Modified Files:
	vte.spec 
Log Message:
Removed period at the end of summary, as per guidelines.



Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- vte.spec	12 Jul 2006 08:46:10 -0000	1.85
+++ vte.spec	13 Jul 2006 18:42:06 -0000	1.86
@@ -19,7 +19,7 @@
 VTE is a terminal emulator widget for use with GTK+ 2.0.
 
 %package devel
-Summary: Files needed for developing applications which use vte.
+Summary: Files needed for developing applications which use vte
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}, gtk2-devel, ncurses-devel
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 18:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 14:58:19 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.135,1.136 sources,1.130,1.131
Message-ID: <200607131858.k6DIwJiT005447@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5364

Modified Files:
	mkinitrd.spec sources 
Log Message:
- another update, since I haven't built it successfully yet.



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mkinitrd.spec	13 Jul 2006 18:22:40 -0000	1.135
+++ mkinitrd.spec	13 Jul 2006 18:58:16 -0000	1.136
@@ -18,7 +18,7 @@
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs >= 1.38-12
 BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig
-BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel
+BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
 BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x
 Requires: dmraid
@@ -112,6 +112,7 @@
 * Thu Jul 13 2006 Peter Jones <pjones at redhat.com> - 5.0.47-1
 - add libbdevid
 - fix mode handling on open syscall wrapper (patch from Mark McLoughlin)
+- save dhcp lease file after network initialization (patch from markmc)
 
 * Thu Jul  6 2006 Bill Nottingham <notting at redhat.com>
 - if NFS host doesn't resolve, assume it's an IP


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- sources	13 Jul 2006 18:22:40 -0000	1.130
+++ sources	13 Jul 2006 18:58:16 -0000	1.131
@@ -1,2 +1,2 @@
 bc0464d3ecb741a9c19cbdfdadf5cd83  bdevid-0.1.tar.bz2
-56c5cb9e4e5f4f4147b590c17cd10d8a  mkinitrd-5.0.47.tar.bz2
+11d104bd5bcd23740b6fdb0f49fc7d01  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 19:06:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 15:06:40 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.84,1.85
Message-ID: <200607131906.k6DJ6eOm006900@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Disable JSP pre-compilation on ppc64 and x390x (FIXME)




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- tomcat5.spec	12 Jul 2006 08:31:05 -0000	1.84
+++ tomcat5.spec	13 Jul 2006 19:06:38 -0000	1.85
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_3fc
+Release: 3jpp_2fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -99,6 +99,8 @@
 Patch15: %{name}-%{majversion}-skip-native.patch
 Patch16: %{name}-%{majversion}-jspc-classpath.patch
 Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
+#FIXME Disable JSP pre-compilation on ppc64 and x390x
+Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 
@@ -413,6 +415,9 @@
 #%patch15 -b .p15
 %patch16 -b .p16
 #%patch17 -b .p17
+%ifarch ppc64 s390x
+%patch18 -b .p18
+%endif
 
 %if %{without_ecj}
 rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -1202,11 +1207,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.5.17-3jpp_3fc
-- rebuild
-
-* Fri Jul 07 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
+* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
 - Re-enable ppc64 and s390x
+- Disable JSP pre-compilation on ppc64 and x390x (FIXME)
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build



From fedora-cvs-commits at redhat.com  Thu Jul 13 19:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 15:26:57 -0400
Subject: rpms/zsh/devel zsh.spec,1.26,1.27
Message-ID: <200607131926.k6DJQvuG028934@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28904

Modified Files:
	zsh.spec 
Log Message:
Add missing BR


Index: zsh.spec
===================================================================
RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- zsh.spec	12 Jul 2006 09:26:36 -0000	1.26
+++ zsh.spec	13 Jul 2006 19:26:54 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.5
-Release: 1.2.2.1
+Release: 2
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -21,7 +21,7 @@
 Prereq: fileutils grep /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: libcap
-BuildRequires: libtermcap-devel libcap-devel texinfo tetex
+BuildRequires: libtermcap-devel libcap-devel texinfo tetex texi2html
 
 %{?_without_check: %define _without_check 1}
 %{!?_without_check: %define _without_check 0}
@@ -140,8 +140,9 @@
 %doc Doc/zsh/*.html
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5-1.2.2.1
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5-2
 - rebuild
+- add mising br texi2html
 
 * 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)



From fedora-cvs-commits at redhat.com  Thu Jul 13 19:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 15:57:57 -0400
Subject: rpms/linux-atm/devel linux-atm.spec,1.15,1.16
Message-ID: <200607131957.k6DJvvLQ021567@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21484

Modified Files:
	linux-atm.spec 
Log Message:
Add missing BR


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-atm.spec	12 Jul 2006 07:13:41 -0000	1.15
+++ linux-atm.spec	13 Jul 2006 19:57:55 -0000	1.16
@@ -1,14 +1,14 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.3.3.1
+Release: 0.20050118.4
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Older kernel headers had broken ATM includes
 BuildRequires: glibc-kernheaders >= 2.4-9.1.88
-BuildRequires: byacc
+BuildRequires: byacc automake
 # cvs -rV2_5_0 -D2005-01-18
 Source: linux-atm-2.5.0-20050118.tar.gz
 # Patch from Debian to sanify syslogging
@@ -86,8 +86,9 @@
 %{_libdir}/libatm.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.3.3.1
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.4
 - rebuild
+- add missing br automake
 
 * Tue May 30 2006 David Woodhouse <dwmw2 at redhat.com> - 2.5.0-0.20050118.3.3
 - BuildRequires: byacc



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:05:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:05:39 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.168,1.168.2.1
Message-ID: <200607132005.k6DK5dBx022852@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc5-6-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.168
retrieving revision 1.168.2.1
diff -u -r1.168 -r1.168.2.1
--- config-generic	26 Jun 2006 14:36:00 -0000	1.168
+++ config-generic	13 Jul 2006 20:05:11 -0000	1.168.2.1
@@ -633,11 +633,9 @@
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_TUNNEL=m
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_DECNET_ROUTE_FWMARK=y
-# CONFIG_DECNET_NF_GRABULATOR is not set
+# CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -648,6 +646,8 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -663,9 +663,11 @@
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -677,21 +679,21 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_MATCH_RECENT=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=m
 CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -729,22 +731,22 @@
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=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_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -805,8 +807,8 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -861,6 +863,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -923,6 +926,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -946,6 +950,7 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
+# CONFIG_AT1700 is not set
 # CONFIG_HP100 is not set
 CONFIG_LNE390=m
 CONFIG_NE3210=m
@@ -1015,6 +1020,7 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_CHELSIO_T1=m
+CONFIG_MYRI10GE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1040,6 +1046,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1068,6 +1075,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1077,8 +1085,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1089,7 +1103,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
@@ -1154,9 +1167,9 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1173,6 +1186,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:10:15 -0400
Subject: rpms/mkinitrd/devel sources,1.131,1.132
Message-ID: <200607132010.k6DKAF2I023345@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23306

Modified Files:
	sources 
Log Message:
- update tarball la la la



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources	13 Jul 2006 18:58:16 -0000	1.131
+++ sources	13 Jul 2006 20:10:11 -0000	1.132
@@ -1,2 +1,2 @@
 bc0464d3ecb741a9c19cbdfdadf5cd83  bdevid-0.1.tar.bz2
-11d104bd5bcd23740b6fdb0f49fc7d01  mkinitrd-5.0.47.tar.bz2
+6880781b997e07588f42ba3c0c37502a  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:10:20 -0400
Subject: rpms/tomcat5/devel tomcat5-5.5-skip-jsp-precompile.patch,NONE,1.1
Message-ID: <200607132010.k6DKAJn2023354@cvs.devel.redhat.com>

Author: fnasser

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

Added Files:
	tomcat5-5.5-skip-jsp-precompile.patch 
Log Message:
Add missing patch file



tomcat5-5.5-skip-jsp-precompile.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE tomcat5-5.5-skip-jsp-precompile.patch ---
*** build/build.xml.orig	2006-07-13 12:05:51.000000000 -0400
--- build/build.xml	2006-07-13 12:06:17.000000000 -0400
***************
*** 429,434 ****
--- 429,435 ----
        <classpath refid="jspc.classpath"/>
      </taskdef>
  
+ <!--
      <jasper2
               compile="false"
               validateXml="false"
***************
*** 453,458 ****
--- 454,460 ----
               webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
               addWebXmlMappings="true"
               outputDir="${admin.base}/WEB-INF/src/admin" />
+ -->
  
      <javac destdir="${ROOT.base}/WEB-INF/classes"
             optimize="off"



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:11:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:11:22 -0400
Subject: rpms/linux-atm/devel linux-atm.spec,1.16,1.17
Message-ID: <200607132011.k6DKBMm5023567@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23522

Modified Files:
	linux-atm.spec 
Log Message:
Add missing BR


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linux-atm.spec	13 Jul 2006 19:57:55 -0000	1.16
+++ linux-atm.spec	13 Jul 2006 20:11:19 -0000	1.17
@@ -1,14 +1,14 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.4
+Release: 0.20050118.5
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Older kernel headers had broken ATM includes
 BuildRequires: glibc-kernheaders >= 2.4-9.1.88
-BuildRequires: byacc automake
+BuildRequires: byacc automake libtool
 # cvs -rV2_5_0 -D2005-01-18
 Source: linux-atm-2.5.0-20050118.tar.gz
 # Patch from Debian to sanify syslogging
@@ -86,9 +86,9 @@
 %{_libdir}/libatm.so
 
 %changelog
-* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.4
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.5
 - rebuild
-- add missing br automake
+- add missing br automake libtool
 
 * Tue May 30 2006 David Woodhouse <dwmw2 at redhat.com> - 2.5.0-0.20050118.3.3
 - BuildRequires: byacc



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:15:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:15:57 -0400
Subject: rpms/kernel/FC-5
	0965-VFS-Unexport-do_kern_mount-and-clean-up-simple_pin_fs.txt,
	1.1.2.1, NONE
Message-ID: <200607132015.k6DKFv1Q024986@cvs.devel.redhat.com>

Author: linville

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

Removed Files:
      Tag: private-linville-netdev-fc5-6-branch
	0965-VFS-Unexport-do_kern_mount-and-clean-up-simple_pin_fs.txt 
Log Message:



--- 0965-VFS-Unexport-do_kern_mount-and-clean-up-simple_pin_fs.txt DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:17:48 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2145.2.1,1.2145.2.2
Message-ID: <200607132017.k6DKHmhb031100@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc5-6-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2145.2.1
retrieving revision 1.2145.2.2
diff -u -r1.2145.2.1 -r1.2145.2.2
--- kernel-2.6.spec	13 Jul 2006 20:04:54 -0000	1.2145.2.1
+++ kernel-2.6.spec	13 Jul 2006 20:17:45 -0000	1.2145.2.2
@@ -542,344 +542,343 @@
 Patch30125: 0886-skge-version-1.6.txt
 Patch30126: 0952-SUNRPC-select-privileged-port-numbers-at-random.txt
 Patch30127: 0953-SUNRPC-NFS_ROOT-always-uses-the-same-XIDs.txt
-Patch30128: 0965-VFS-Unexport-do_kern_mount-and-clean-up-simple_pin_fs.txt
-Patch30129: 0971-RPC-Allow-struc-xdr_stream-to-read-the-page-section-of-an-xdr_buf.txt
-Patch30130: 1000-e1000-prevent-statistics-from-garbling-during-bus-resets.txt
-Patch30131: 1025-forcedeth-config-tso-cleanup.txt
-Patch30132: 1026-forcedeth-config-ring-sizes.txt
-Patch30133: 1027-forcedeth-config-flow-control.txt
-Patch30134: 1028-forcedeth-config-phy.txt
-Patch30135: 1029-forcedeth-config-wol.txt
-Patch30136: 1030-forcedeth-config-csum.txt
-Patch30137: 1031-forcedeth-config-statistics.txt
-Patch30138: 1032-forcedeth-config-move-functions.txt
-Patch30139: 1033-forcedeth-config-diagnostics.txt
-Patch30140: 1034-forcedeth-config-module-parameters.txt
-Patch30141: 1035-forcedeth-config-version.txt
-Patch30142: 1036-forcedeth-new-device-ids.txt
-Patch30143: 1038-smc911x-Kconfig-fix.txt
-Patch30144: 1040-Section-mismatch-in-drivers-net-ne.o-during-modpost.txt
-Patch30145: 1041-hp-ethernet-fix-section-mismatches.txt
-Patch30146: 1042-smc-ethernet-fix-section-mismatch-warnings.txt
-Patch30147: 1043-3c5zz-ethernet-fix-section-warnings.txt
-Patch30148: 1046-net-au1000_eth-PHY-framework-conversion.txt
-Patch30149: 1125-wireless-Changes-to-ieee80211.h-for-user-space-regulatory-daemon.txt
-Patch30150: 1128-pci-bcm43xx-avoid-pci_find_device.txt
-Patch30151: 1129-wireless-correct-dump-of-WPA-IE.txt
-Patch30152: 1130-ipw2200-locking-fix.txt
-Patch30153: 1142-NET-Export-ip_dev_find.txt
-Patch30154: 1192-I-OAT-Make-sk_eat_skb-I-OAT-aware.txt
-Patch30155: 1196-LLC-use-more-efficient-ether-address-routines.txt
-Patch30156: 1197-LLC-allow-datagram-recvmsg.txt
-Patch30157: 1198-LLC-use-rcu_dereference-on-receive-handler.txt
-Patch30158: 1199-LLC-allow-applications-to-get-copy-of-kernel-datagrams.txt
-Patch30159: 1200-LLC-add-multicast-support-for-datagrams.txt
-Patch30160: 1201-BRIDGE-optimize-conditional-in-forward-path.txt
-Patch30161: 1202-BRIDGE-fix-module-startup-error-handling.txt
-Patch30162: 1203-BRIDGE-netlink-interface-for-link-management.txt
-Patch30163: 1204-TCP-tcp_rcv_rtt_measure_ts-call-in-pure-ACK-path-is-superfluous.txt
-Patch30164: 1205-IRDA-Initial-support-for-MCS7780-based-dongles.txt
-Patch30165: 1206-IRDA-stir4200-switching-to-the-kthread-API.txt
-Patch30166: 1207-IRDA-ali-ircc-using-device-model-power-management.txt
-Patch30167: 1208-TG3-Add-5786-PCI-ID.txt
-Patch30168: 1209-TG3-Add-recovery-logic-when-MMIOs-are-re-ordered.txt
-Patch30169: 1210-TG3-update-version-and-reldate.txt
-Patch30170: 1211-IPSEC-xfrm-Undo-afinfo-lock-proliferation.txt
-Patch30171: 1215-NETFILTER-x_tables-remove-some-unnecessary-casts.txt
-Patch30172: 1216-NETFILTER-x_tables-add-SCTP-DCCP-support-where-missing.txt
-Patch30173: 1217-NETFILTER-x_tables-add-quota-match.txt
-Patch30174: 1218-NETFILTER-x_tables-add-statistic-match.txt
-Patch30175: 1219-NETFILTER-recent-match-replace-by-rewritten-version.txt
-Patch30176: 1220-NETFILTER-conntrack-don-t-call-helpers-for-related-ICMP-messages.txt
-Patch30177: 1221-NETFILTER-conntrack-add-sysctl-to-disable-checksumming.txt
-Patch30178: 1222-NETFILTER-conntrack-add-fixed-timeout-flag-in-connection-tracking.txt
-Patch30179: 1223-NETFILTER-ctnetlink-fix-NAT-configuration.txt
-Patch30180: 1224-NETFILTER-ctnetlink-change-table-dumping-not-to-require-an-unique-ID.txt
-Patch30181: 1225-NETFILTER-SNMP-helper-fix-debug-module-param-type.txt
-Patch30182: 1226-NETFILTER-FTP-helper-search-optimization.txt
-Patch30183: 1227-NETFILTER-amanda-helper-convert-to-textsearch-infrastructure.txt
-Patch30184: 1228-NETFILTER-H.323-helper-Add-support-for-Call-Forwarding.txt
-Patch30185: 1229-NETFILTER-H.323-helper-replace-internal_net_addr-parameter-by-routing-based-heuristic.txt
-Patch30186: 1230-NETFILTER-Add-SIP-connection-tracking-helper.txt
-Patch30187: 1231-NETFILTER-PPTP-helper-fixup-gre_keymap_lookup-return-type.txt
-Patch30188: 1232-LLC-Fix-double-receive-of-SKB.txt
-Patch30189: 1233-TCP-TCP-Low-Priority-congestion-control.txt
-Patch30190: 1234-TCP-TCP-Veno-congestion-control.txt
-Patch30191: 1235-TCP-TCP-Compound-congestion-control.txt
-Patch30192: 1236-TCP-TCP-Compound-quad-root-function.txt
-Patch30193: 1237-TCP-Minimum-congestion-window-consolidation.txt
-Patch30194: 1238-TCP-TCP-Probe-congestion-window-tracing.txt
-Patch30195: 1239-TCP-Limited-slow-start-for-Highspeed-TCP.txt
-Patch30196: 1240-TCP-Fix-compile-warning-in-tcp_probe.c.txt
-Patch30197: 1241-IPV4-igmp-Fixup-struct-ip_mc_list-multiaddr-type.txt
-Patch30198: 1242-IPV4-Right-prototype-of-__raw_v4_lookup.txt
-Patch30199: 1243-IPV4-icmp-Kill-local-ip-arg-in-icmp_redirect.txt
-Patch30200: 1245-LSM-IPsec-SELinux-Authorize.txt
-Patch30201: 1246-NET-NET_TCPPROBE-Kconfig-fix.txt
-Patch30202: 1247-NET-Fix-warnings-after-LSM-IPSEC-changes.txt
-Patch30203: 1253-SECMARK-Add-secmark-support-to-conntrack.txt
-Patch30204: 1256-NETFILTER-recent-match-fix-sleeping-function-called-from-invalid-context.txt
-Patch30205: 1257-NETFILTER-recent-match-missing-refcnt-initialization.txt
-Patch30206: 1258-NETFILTER-hashlimit-match-fix-random-initialization.txt
-Patch30207: 1261-NET-ppp-Remove-unnecessary-pskb_may_pull.txt
-Patch30208: 1262-NET-skb_trim-audit.txt
-Patch30209: 1263-NET-Warn-in-__skb_trim-if-skb-is-paged.txt
-Patch30210: 1264-IPX-Endian-bug-in-ipxrtr_route_packet.txt
-Patch30211: 1265-IRDA-irda-usb.c-STIR421x-cleanups.txt
-Patch30212: 1266-BNX2-Endian-fixes.txt
-Patch30213: 1267-NET-net.ipv4.ip_autoconfig-sysctl-removal.txt
-Patch30214: 1268-TCP-Westwood-fix-first-sample.txt
-Patch30215: 1269-TCP-Westwood-comment-fixes.txt
-Patch30216: 1270-TCP-Westwood-bandwidth-filter-startup.txt
-Patch30217: 1271-TCP-Westwood-reset-RTT-min-after-FRTO.txt
-Patch30218: 1272-BNX2-Add-an-rx-drop-counter.txt
-Patch30219: 1273-BNX2-Allow-WoL-settings-on-new-5708-chips.txt
-Patch30220: 1274-BNX2-Add-firmware-decompression.txt
-Patch30221: 1275-BNX2-Use-compressed-firmware.txt
-Patch30222: 1276-BNX2-Use-CPU-native-page-size.txt
-Patch30223: 1277-BNX2-Update-version-and-reldate.txt
-Patch30224: 1279-TG3-Remove-unnecessary-tx_lock.txt
-Patch30225: 1280-TG3-Convert-to-non-LLTX.txt
-Patch30226: 1281-NET-Add-NETIF_F_GEN_CSUM-and-NETIF_F_ALL_CSUM.txt
-Patch30227: 1282-BRIDGE-Add-support-for-NETIF_F_HW_CSUM-devices.txt
-Patch30228: 1283-IRDA-Use-put_unaligned-in-irlmp_do_discovery.txt
-Patch30229: 1289-SCTP-Don-t-do-CRC32C-checksum-over-loopback.txt
-Patch30230: 1313-ARM-3406-1-lpd7x-compilation-fix-for-smc91x.txt
-Patch30231: 1478-NET-Prevent-multiple-qdisc-runs.txt
-Patch30232: 1488-SPARC-Kill-__irq_itoa.txt
-Patch30233: 1494-s2io-netpoll-support.txt
-Patch30234: 1529-SCTP-sctp_unpack_cookie-fix.txt
-Patch30235: 1530-ATM-fix-broken-uses-of-NIPQUAD-in-net-atm.txt
-Patch30236: 1976-via-velocity-the-link-is-not-correctly-detected-when-the-device-starts.txt
-Patch30237: 1978-IP27-Really-set-PCI64_ATTR_VIRTUAL-not-PCI64_ATTR_PREC.txt
-Patch30238: 1979-AT91RM9200-Ethernet-1-Link-poll.txt
-Patch30239: 1980-AT91RM9200-Ethernet-2-MII-interface.txt
-Patch30240: 1981-AT91RM9200-Ethernet-3-Cleanup.txt
-Patch30241: 1982-AT91RM9200-Ethernet-4-Suspend-Resume.txt
-Patch30242: 1985-b44-fix-manual-speed-duplex-autoneg-settings.txt
-Patch30243: 1986-b44-add-wol.txt
-Patch30244: 1987-b44-add-parameter.txt
-Patch30245: 1988-b44-add-wol-for-old-nic.txt
-Patch30246: 1989-b44-update-version-to-1.01.txt
-Patch30247: 1990-b44-update-b44-Kconfig-entry.txt
-Patch30248: 1992-8139cp-fix-eeprom-read-command-length.txt
-Patch30249: 1993-8139cp-add-ethtool-eeprom-support.txt
-Patch30250: 1994-Remove-useless-check-in-drivers-net-pcmcia-xirc2ps_cs.c.txt
-Patch30251: 1996-Array-overrun-in-drivers-net-wireless-wavelan.c.txt
-Patch30252: 1997-Dereference-in-tokenring-olympic.c.txt
-Patch30253: 1999-network-driver-for-Hilscher-netx.txt
-Patch30254: 2000-make-drivers-net-forcedeth.c-nv_update_pause-static.txt
-Patch30255: 2001-skb_padto-area-fixes-in-8390-wavelan.txt
-Patch30256: 2002-WAN-register_hdlc_device-doesn-t-need-dev_alloc_name.txt
-Patch30257: 2003-WAN-ioremap-failure-checks-in-drivers.txt
-Patch30258: 2024-NET-Require-CAP_NET_ADMIN-to-create-tuntap-devices.txt
-Patch30259: 2179-clean-up-default-value-of-IP_DCCP_ACKVEC.txt
-Patch30260: 2266-SPARC-Port-sparc64-in-kernel-device-tree-code-to-sparc32.txt
-Patch30261: 2273-NET-sunlance-Convert-to-new-SBUS-driver-framework.txt
-Patch30262: 2274-NET-sunbmac-Convert-over-to-new-SBUS-device-framework.txt
-Patch30263: 2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt
-Patch30264: 2276-NET-myri_sbus-Convert-to-new-SBUS-device-layer.txt
-Patch30265: 2277-NET-myri_sbus-Kill-unused-next_module-struct-member.txt
-Patch30266: 2278-NET-sunhme-Kill-useless-loop-over-sdevs-in-quattro_sbus_find.txt
-Patch30267: 2599-m68k-cleanup-generic-irq-names.txt
-Patch30268: 2619-Define-__raw_get_cpu_var-and-use-it.txt
-Patch30269: 2713-wan-sdla-section-fixes.txt
-Patch30270: 2769-irda-usb-printk-fix.txt
-Patch30271: 2794-m68knommu-532x-FEC-eth-struct-map.txt
-Patch30272: 2850-TIPC-Improved-tolerance-to-promiscuous-mode-interface.txt
-Patch30273: 2851-TIPC-Prevent-name-table-corruption-if-no-room-for-new-publication.txt
-Patch30274: 2852-TIPC-Use-correct-upper-bound-when-validating-network-zone-number.txt
-Patch30275: 2853-TIPC-Corrected-potential-misuse-of-tipc_media_addr-structure.txt
-Patch30276: 2854-TIPC-Allow-ports-to-receive-multicast-messages-through-native-API.txt
-Patch30277: 2855-TIPC-Links-now-validate-destination-node-specified-by-incoming-messages.txt
-Patch30278: 2856-TIPC-Multicast-link-failure-now-resets-all-links-to-nacking-node.txt
-Patch30279: 2857-TIPC-Allow-compilation-when-CONFIG_TIPC_DEBUG-is-not-set.txt
-Patch30280: 2858-TIPC-Fix-for-NULL-pointer-dereference.txt
-Patch30281: 2859-TIPC-Fixed-privilege-checking-typo-in-dest_name_check.txt
-Patch30282: 2860-TIPC-Fix-misleading-comment-in-buf_discard-routine.txt
-Patch30283: 2861-TIPC-Added-support-for-MODULE_VERSION-capability.txt
-Patch30284: 2862-TIPC-Validate-entire-interface-name-when-locating-bearer-to-enable.txt
-Patch30285: 2863-TIPC-Non-operation-affecting-corrections-to-comments-function-definitions.txt
-Patch30286: 2864-TIPC-Fixed-connect-to-detect-a-dest-address-that-is-missing-or-too-short.txt
-Patch30287: 2865-TIPC-Implied-connect-now-saves-dest-name-for-retrieval-as-ancillary-data.txt
-Patch30288: 2866-TIPC-Can-now-return-destination-name-of-form-0-x-y-via-ancillary-data.txt
-Patch30289: 2867-TIPC-Connected-send-now-checks-socket-state-when-retrying-congested-send.txt
-Patch30290: 2868-TIPC-Stream-socket-send-indicates-partial-success-if-data-partially-sent.txt
-Patch30291: 2869-TIPC-Improved-performance-of-error-checking-during-socket-creation.txt
-Patch30292: 2870-TIPC-recvmsg-now-returns-TIPC-ancillary-data-using-correct-level-SOL_TIPC.txt
-Patch30293: 2871-TIPC-Simplify-code-for-returning-partial-success-of-stream-send-request.txt
-Patch30294: 2872-TIPC-Optimized-argument-validation-done-by-connect.txt
-Patch30295: 2873-TIPC-Withdrawing-all-names-from-nameless-port-now-returns-success-not-error.txt
-Patch30296: 2874-TIPC-Added-missing-warning-for-out-of-memory-condition.txt
-Patch30297: 2875-TIPC-Fixed-memory-leak-in-tipc_link_send-when-destination-is-unreachable.txt
-Patch30298: 2876-TIPC-Disallow-config-operations-that-aren-t-supported-in-certain-modes.txt
-Patch30299: 2877-TIPC-First-phase-of-assert-cleanup.txt
-Patch30300: 2878-TIPC-Enhanced-cleaned-up-system-messages-fixed-2-obscure-memory-leaks.txt
-Patch30301: 2879-TIPC-Fixed-link-switchover-bugs.txt
-Patch30302: 2880-TIPC-Get-rid-of-dynamically-allocated-arrays-in-broadcast-code.txt
-Patch30303: 2881-TIPC-Fix-incorrect-correction-to-discovery-timer-frequency-computation.txt
-Patch30304: 2885-NET-skb_find_text-ignores-to-argument.txt
-Patch30305: 2886-ATM-atm-mpc.c-warning-fix.txt
-Patch30306: 2887-IRDA-add-some-IBM-think-pads.txt
-Patch30307: 2889-NET-netpoll-break-recursive-loop-in-netpoll-rx-path.txt
-Patch30308: 2890-NETROM-Fix-possible-null-pointer-dereference.txt
-Patch30309: 2934-spelling-fixes.txt
-Patch30310: 2949-net-rxrpc-use-list_move.txt
-Patch30311: 2950-drivers-use-list_move.txt
-Patch30312: 3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt
-Patch30313: 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30314: 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30315: 3390-DM9000-better-checks-for-platform-resources.txt
-Patch30316: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
-Patch30317: 3392-DM9000-do-no-re-init-spin-lock.txt
-Patch30318: 3393-DM9000-minor-code-cleanups.txt
-Patch30319: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
-Patch30320: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
-Patch30321: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
-Patch30322: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
-Patch30323: 3399-netdrvr-natsemi-minor-cleanups.txt
-Patch30324: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
-Patch30325: 3460-e1000-fix-loopback-ethtool-test.txt
-Patch30326: 3461-e1000-rework-driver-hardware-reset-locking.txt
-Patch30327: 3462-e1000-Make-PHY-powerup-down-a-function.txt
-Patch30328: 3463-e1000-fix-CONFIG_PM-blocks.txt
-Patch30329: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
-Patch30330: 3465-e1000-add-smart-power-down-code.txt
-Patch30331: 3467-e1000-recycle-skb.txt
-Patch30332: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
-Patch30333: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
-Patch30334: 3470-e1000-disable-CRC-stripping-workaround.txt
-Patch30335: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
-Patch30336: 3472-e1000-M88-PHY-workaround.txt
-Patch30337: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
-Patch30338: 3474-e1000-disable-ERT.txt
-Patch30339: 3475-e1000-add-ich8lan-core-functions.txt
-Patch30340: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
-Patch30341: 3478-e1000-add-ich8lan-device-ID-s.txt
-Patch30342: 3479-e1000-increase-version-to-7.1.9-k2.txt
-Patch30343: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
-Patch30344: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
-Patch30345: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
-Patch30346: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
-Patch30347: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
-Patch30348: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
-Patch30349: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
-Patch30350: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
-Patch30351: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
-Patch30352: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
-Patch30353: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
-Patch30354: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
-Patch30355: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
-Patch30356: 4007-AF_UNIX-Datagram-getpeersec.txt
-Patch30357: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
-Patch30358: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
-Patch30359: 4015-BNX2-Turn-off-link-during-shutdown.txt
-Patch30360: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
-Patch30361: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
-Patch30362: 4019-XFRM-unexport-xfrm_state_mtu.txt
-Patch30363: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
-Patch30364: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
-Patch30365: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
-Patch30366: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
-Patch30367: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
-Patch30368: 4062-typo-fixes-bandwith-bandwidth.txt
-Patch30369: 4066-typo-fixes-infomation-information.txt
-Patch30370: 4067-typo-fixes-occuring-occurring.txt
-Patch30371: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
-Patch30372: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
-Patch30373: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
-Patch30374: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
-Patch30375: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
-Patch30376: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
-Patch30377: 4172-com20020_cs-more-device-support.txt
-Patch30378: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
-Patch30379: 4178-TG3-Add-rx-BD-workaround.txt
-Patch30380: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
-Patch30381: 4181-TG3-Update-version-and-reldate.txt
-Patch30382: 4183-IPV6-Remove-redundant-length-check-on-input.txt
-Patch30383: 4417-bcm43xx-netlink-deadlock-fix.txt
-Patch30384: 4516-forcedeth-typecast-cleanup.txt
-Patch30385: 4523-AF_UNIX-datagram-getpeersec-fix.txt
-Patch30386: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
-Patch30387: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
-Patch30388: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
-Patch30389: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
-Patch30390: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
-Patch30391: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
-Patch30392: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
-Patch30393: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
-Patch30394: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
-Patch30395: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
-Patch30396: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
-Patch30397: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
-Patch30398: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
-Patch30399: 4572-netdrvr-epic100-minor-cleanups.txt
-Patch30400: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
-Patch30401: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
-Patch30402: 4577-netdrvr-via-velocity-misc.-cleanups.txt
-Patch30403: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
-Patch30404: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
-Patch30405: 4581-Add-two-PLX-device-IDs.txt
-Patch30406: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
-Patch30407: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
-Patch30408: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
-Patch30409: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
-Patch30410: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
-Patch30411: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
-Patch30412: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
-Patch30413: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
-Patch30414: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
-Patch30415: 4594-zd1211rw-disable-TX-queue-during-stop.txt
-Patch30416: 4595-Add-support-for-the-Cicada-8201-PHY.txt
-Patch30417: 4596-pcnet32-Fix-Section-mismatch-error.txt
-Patch30418: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
-Patch30419: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
-Patch30420: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
-Patch30421: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
-Patch30422: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
-Patch30423: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
-Patch30424: 4604-NI5010-netcard-cleanup.txt
-Patch30425: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
-Patch30426: 4606-Fix-freeing-of-net-device.txt
-Patch30427: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
-Patch30428: 4612-8139too-deadlock-fix.txt
-Patch30429: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
-Patch30430: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
-Patch30431: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
-Patch30432: 4646-wireless-add-acx-driver.txt
-Patch30433: 4647-acxsm-merge-from-acx-0.3.32.txt
-Patch30434: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
-Patch30435: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
-Patch30436: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
-Patch30437: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
-Patch30438: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
-Patch30439: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
-Patch30440: 4654-fix-tiacx-on-alpha.txt
-Patch30441: 4655-tiacx-fix-attribute-packed-warnings.txt
-Patch30442: 4656-tiacx-pci-build-fix.txt
-Patch30443: 4657-tiacx-support-ia64.txt
-Patch30444: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
-Patch30445: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
-Patch30446: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
-Patch30447: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
-Patch30448: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
-Patch30449: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
-Patch30450: 4673-AX.25-Use-kzalloc.txt
-Patch30451: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
-Patch30452: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
-Patch30453: 4691-bcm43xx-improved-statistics.txt
-Patch30454: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
-Patch30455: 4693-tiacx-don-t-use-UTS_RELEASE.txt
-Patch30456: 4716-release_firmware-fixes.txt
-Patch30457: 4821-AX.25-Get-rid-of-the-last-volatile.txt
-Patch30458: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
-Patch30459: 4824-TCP-Remove-TCP-Compound.txt
-Patch30460: 4825-DCCP-Fix-sparse-warnings.txt
-Patch30461: 4834-IPV6-order-addresses-by-scope.txt
-Patch30462: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
-Patch30463: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
-Patch30464: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
-Patch30465: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
+Patch30128: 0971-RPC-Allow-struc-xdr_stream-to-read-the-page-section-of-an-xdr_buf.txt
+Patch30129: 1000-e1000-prevent-statistics-from-garbling-during-bus-resets.txt
+Patch30130: 1025-forcedeth-config-tso-cleanup.txt
+Patch30131: 1026-forcedeth-config-ring-sizes.txt
+Patch30132: 1027-forcedeth-config-flow-control.txt
+Patch30133: 1028-forcedeth-config-phy.txt
+Patch30134: 1029-forcedeth-config-wol.txt
+Patch30135: 1030-forcedeth-config-csum.txt
+Patch30136: 1031-forcedeth-config-statistics.txt
+Patch30137: 1032-forcedeth-config-move-functions.txt
+Patch30138: 1033-forcedeth-config-diagnostics.txt
+Patch30139: 1034-forcedeth-config-module-parameters.txt
+Patch30140: 1035-forcedeth-config-version.txt
+Patch30141: 1036-forcedeth-new-device-ids.txt
+Patch30142: 1038-smc911x-Kconfig-fix.txt
+Patch30143: 1040-Section-mismatch-in-drivers-net-ne.o-during-modpost.txt
+Patch30144: 1041-hp-ethernet-fix-section-mismatches.txt
+Patch30145: 1042-smc-ethernet-fix-section-mismatch-warnings.txt
+Patch30146: 1043-3c5zz-ethernet-fix-section-warnings.txt
+Patch30147: 1046-net-au1000_eth-PHY-framework-conversion.txt
+Patch30148: 1125-wireless-Changes-to-ieee80211.h-for-user-space-regulatory-daemon.txt
+Patch30149: 1128-pci-bcm43xx-avoid-pci_find_device.txt
+Patch30150: 1129-wireless-correct-dump-of-WPA-IE.txt
+Patch30151: 1130-ipw2200-locking-fix.txt
+Patch30152: 1142-NET-Export-ip_dev_find.txt
+Patch30153: 1192-I-OAT-Make-sk_eat_skb-I-OAT-aware.txt
+Patch30154: 1196-LLC-use-more-efficient-ether-address-routines.txt
+Patch30155: 1197-LLC-allow-datagram-recvmsg.txt
+Patch30156: 1198-LLC-use-rcu_dereference-on-receive-handler.txt
+Patch30157: 1199-LLC-allow-applications-to-get-copy-of-kernel-datagrams.txt
+Patch30158: 1200-LLC-add-multicast-support-for-datagrams.txt
+Patch30159: 1201-BRIDGE-optimize-conditional-in-forward-path.txt
+Patch30160: 1202-BRIDGE-fix-module-startup-error-handling.txt
+Patch30161: 1203-BRIDGE-netlink-interface-for-link-management.txt
+Patch30162: 1204-TCP-tcp_rcv_rtt_measure_ts-call-in-pure-ACK-path-is-superfluous.txt
+Patch30163: 1205-IRDA-Initial-support-for-MCS7780-based-dongles.txt
+Patch30164: 1206-IRDA-stir4200-switching-to-the-kthread-API.txt
+Patch30165: 1207-IRDA-ali-ircc-using-device-model-power-management.txt
+Patch30166: 1208-TG3-Add-5786-PCI-ID.txt
+Patch30167: 1209-TG3-Add-recovery-logic-when-MMIOs-are-re-ordered.txt
+Patch30168: 1210-TG3-update-version-and-reldate.txt
+Patch30169: 1211-IPSEC-xfrm-Undo-afinfo-lock-proliferation.txt
+Patch30170: 1215-NETFILTER-x_tables-remove-some-unnecessary-casts.txt
+Patch30171: 1216-NETFILTER-x_tables-add-SCTP-DCCP-support-where-missing.txt
+Patch30172: 1217-NETFILTER-x_tables-add-quota-match.txt
+Patch30173: 1218-NETFILTER-x_tables-add-statistic-match.txt
+Patch30174: 1219-NETFILTER-recent-match-replace-by-rewritten-version.txt
+Patch30175: 1220-NETFILTER-conntrack-don-t-call-helpers-for-related-ICMP-messages.txt
+Patch30176: 1221-NETFILTER-conntrack-add-sysctl-to-disable-checksumming.txt
+Patch30177: 1222-NETFILTER-conntrack-add-fixed-timeout-flag-in-connection-tracking.txt
+Patch30178: 1223-NETFILTER-ctnetlink-fix-NAT-configuration.txt
+Patch30179: 1224-NETFILTER-ctnetlink-change-table-dumping-not-to-require-an-unique-ID.txt
+Patch30180: 1225-NETFILTER-SNMP-helper-fix-debug-module-param-type.txt
+Patch30181: 1226-NETFILTER-FTP-helper-search-optimization.txt
+Patch30182: 1227-NETFILTER-amanda-helper-convert-to-textsearch-infrastructure.txt
+Patch30183: 1228-NETFILTER-H.323-helper-Add-support-for-Call-Forwarding.txt
+Patch30184: 1229-NETFILTER-H.323-helper-replace-internal_net_addr-parameter-by-routing-based-heuristic.txt
+Patch30185: 1230-NETFILTER-Add-SIP-connection-tracking-helper.txt
+Patch30186: 1231-NETFILTER-PPTP-helper-fixup-gre_keymap_lookup-return-type.txt
+Patch30187: 1232-LLC-Fix-double-receive-of-SKB.txt
+Patch30188: 1233-TCP-TCP-Low-Priority-congestion-control.txt
+Patch30189: 1234-TCP-TCP-Veno-congestion-control.txt
+Patch30190: 1235-TCP-TCP-Compound-congestion-control.txt
+Patch30191: 1236-TCP-TCP-Compound-quad-root-function.txt
+Patch30192: 1237-TCP-Minimum-congestion-window-consolidation.txt
+Patch30193: 1238-TCP-TCP-Probe-congestion-window-tracing.txt
+Patch30194: 1239-TCP-Limited-slow-start-for-Highspeed-TCP.txt
+Patch30195: 1240-TCP-Fix-compile-warning-in-tcp_probe.c.txt
+Patch30196: 1241-IPV4-igmp-Fixup-struct-ip_mc_list-multiaddr-type.txt
+Patch30197: 1242-IPV4-Right-prototype-of-__raw_v4_lookup.txt
+Patch30198: 1243-IPV4-icmp-Kill-local-ip-arg-in-icmp_redirect.txt
+Patch30199: 1245-LSM-IPsec-SELinux-Authorize.txt
+Patch30200: 1246-NET-NET_TCPPROBE-Kconfig-fix.txt
+Patch30201: 1247-NET-Fix-warnings-after-LSM-IPSEC-changes.txt
+Patch30202: 1253-SECMARK-Add-secmark-support-to-conntrack.txt
+Patch30203: 1256-NETFILTER-recent-match-fix-sleeping-function-called-from-invalid-context.txt
+Patch30204: 1257-NETFILTER-recent-match-missing-refcnt-initialization.txt
+Patch30205: 1258-NETFILTER-hashlimit-match-fix-random-initialization.txt
+Patch30206: 1261-NET-ppp-Remove-unnecessary-pskb_may_pull.txt
+Patch30207: 1262-NET-skb_trim-audit.txt
+Patch30208: 1263-NET-Warn-in-__skb_trim-if-skb-is-paged.txt
+Patch30209: 1264-IPX-Endian-bug-in-ipxrtr_route_packet.txt
+Patch30210: 1265-IRDA-irda-usb.c-STIR421x-cleanups.txt
+Patch30211: 1266-BNX2-Endian-fixes.txt
+Patch30212: 1267-NET-net.ipv4.ip_autoconfig-sysctl-removal.txt
+Patch30213: 1268-TCP-Westwood-fix-first-sample.txt
+Patch30214: 1269-TCP-Westwood-comment-fixes.txt
+Patch30215: 1270-TCP-Westwood-bandwidth-filter-startup.txt
+Patch30216: 1271-TCP-Westwood-reset-RTT-min-after-FRTO.txt
+Patch30217: 1272-BNX2-Add-an-rx-drop-counter.txt
+Patch30218: 1273-BNX2-Allow-WoL-settings-on-new-5708-chips.txt
+Patch30219: 1274-BNX2-Add-firmware-decompression.txt
+Patch30220: 1275-BNX2-Use-compressed-firmware.txt
+Patch30221: 1276-BNX2-Use-CPU-native-page-size.txt
+Patch30222: 1277-BNX2-Update-version-and-reldate.txt
+Patch30223: 1279-TG3-Remove-unnecessary-tx_lock.txt
+Patch30224: 1280-TG3-Convert-to-non-LLTX.txt
+Patch30225: 1281-NET-Add-NETIF_F_GEN_CSUM-and-NETIF_F_ALL_CSUM.txt
+Patch30226: 1282-BRIDGE-Add-support-for-NETIF_F_HW_CSUM-devices.txt
+Patch30227: 1283-IRDA-Use-put_unaligned-in-irlmp_do_discovery.txt
+Patch30228: 1289-SCTP-Don-t-do-CRC32C-checksum-over-loopback.txt
+Patch30229: 1313-ARM-3406-1-lpd7x-compilation-fix-for-smc91x.txt
+Patch30230: 1478-NET-Prevent-multiple-qdisc-runs.txt
+Patch30231: 1488-SPARC-Kill-__irq_itoa.txt
+Patch30232: 1494-s2io-netpoll-support.txt
+Patch30233: 1529-SCTP-sctp_unpack_cookie-fix.txt
+Patch30234: 1530-ATM-fix-broken-uses-of-NIPQUAD-in-net-atm.txt
+Patch30235: 1976-via-velocity-the-link-is-not-correctly-detected-when-the-device-starts.txt
+Patch30236: 1978-IP27-Really-set-PCI64_ATTR_VIRTUAL-not-PCI64_ATTR_PREC.txt
+Patch30237: 1979-AT91RM9200-Ethernet-1-Link-poll.txt
+Patch30238: 1980-AT91RM9200-Ethernet-2-MII-interface.txt
+Patch30239: 1981-AT91RM9200-Ethernet-3-Cleanup.txt
+Patch30240: 1982-AT91RM9200-Ethernet-4-Suspend-Resume.txt
+Patch30241: 1985-b44-fix-manual-speed-duplex-autoneg-settings.txt
+Patch30242: 1986-b44-add-wol.txt
+Patch30243: 1987-b44-add-parameter.txt
+Patch30244: 1988-b44-add-wol-for-old-nic.txt
+Patch30245: 1989-b44-update-version-to-1.01.txt
+Patch30246: 1990-b44-update-b44-Kconfig-entry.txt
+Patch30247: 1992-8139cp-fix-eeprom-read-command-length.txt
+Patch30248: 1993-8139cp-add-ethtool-eeprom-support.txt
+Patch30249: 1994-Remove-useless-check-in-drivers-net-pcmcia-xirc2ps_cs.c.txt
+Patch30250: 1996-Array-overrun-in-drivers-net-wireless-wavelan.c.txt
+Patch30251: 1997-Dereference-in-tokenring-olympic.c.txt
+Patch30252: 1999-network-driver-for-Hilscher-netx.txt
+Patch30253: 2000-make-drivers-net-forcedeth.c-nv_update_pause-static.txt
+Patch30254: 2001-skb_padto-area-fixes-in-8390-wavelan.txt
+Patch30255: 2002-WAN-register_hdlc_device-doesn-t-need-dev_alloc_name.txt
+Patch30256: 2003-WAN-ioremap-failure-checks-in-drivers.txt
+Patch30257: 2024-NET-Require-CAP_NET_ADMIN-to-create-tuntap-devices.txt
+Patch30258: 2179-clean-up-default-value-of-IP_DCCP_ACKVEC.txt
+Patch30259: 2266-SPARC-Port-sparc64-in-kernel-device-tree-code-to-sparc32.txt
+Patch30260: 2273-NET-sunlance-Convert-to-new-SBUS-driver-framework.txt
+Patch30261: 2274-NET-sunbmac-Convert-over-to-new-SBUS-device-framework.txt
+Patch30262: 2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt
+Patch30263: 2276-NET-myri_sbus-Convert-to-new-SBUS-device-layer.txt
+Patch30264: 2277-NET-myri_sbus-Kill-unused-next_module-struct-member.txt
+Patch30265: 2278-NET-sunhme-Kill-useless-loop-over-sdevs-in-quattro_sbus_find.txt
+Patch30266: 2599-m68k-cleanup-generic-irq-names.txt
+Patch30267: 2619-Define-__raw_get_cpu_var-and-use-it.txt
+Patch30268: 2713-wan-sdla-section-fixes.txt
+Patch30269: 2769-irda-usb-printk-fix.txt
+Patch30270: 2794-m68knommu-532x-FEC-eth-struct-map.txt
+Patch30271: 2850-TIPC-Improved-tolerance-to-promiscuous-mode-interface.txt
+Patch30272: 2851-TIPC-Prevent-name-table-corruption-if-no-room-for-new-publication.txt
+Patch30273: 2852-TIPC-Use-correct-upper-bound-when-validating-network-zone-number.txt
+Patch30274: 2853-TIPC-Corrected-potential-misuse-of-tipc_media_addr-structure.txt
+Patch30275: 2854-TIPC-Allow-ports-to-receive-multicast-messages-through-native-API.txt
+Patch30276: 2855-TIPC-Links-now-validate-destination-node-specified-by-incoming-messages.txt
+Patch30277: 2856-TIPC-Multicast-link-failure-now-resets-all-links-to-nacking-node.txt
+Patch30278: 2857-TIPC-Allow-compilation-when-CONFIG_TIPC_DEBUG-is-not-set.txt
+Patch30279: 2858-TIPC-Fix-for-NULL-pointer-dereference.txt
+Patch30280: 2859-TIPC-Fixed-privilege-checking-typo-in-dest_name_check.txt
+Patch30281: 2860-TIPC-Fix-misleading-comment-in-buf_discard-routine.txt
+Patch30282: 2861-TIPC-Added-support-for-MODULE_VERSION-capability.txt
+Patch30283: 2862-TIPC-Validate-entire-interface-name-when-locating-bearer-to-enable.txt
+Patch30284: 2863-TIPC-Non-operation-affecting-corrections-to-comments-function-definitions.txt
+Patch30285: 2864-TIPC-Fixed-connect-to-detect-a-dest-address-that-is-missing-or-too-short.txt
+Patch30286: 2865-TIPC-Implied-connect-now-saves-dest-name-for-retrieval-as-ancillary-data.txt
+Patch30287: 2866-TIPC-Can-now-return-destination-name-of-form-0-x-y-via-ancillary-data.txt
+Patch30288: 2867-TIPC-Connected-send-now-checks-socket-state-when-retrying-congested-send.txt
+Patch30289: 2868-TIPC-Stream-socket-send-indicates-partial-success-if-data-partially-sent.txt
+Patch30290: 2869-TIPC-Improved-performance-of-error-checking-during-socket-creation.txt
+Patch30291: 2870-TIPC-recvmsg-now-returns-TIPC-ancillary-data-using-correct-level-SOL_TIPC.txt
+Patch30292: 2871-TIPC-Simplify-code-for-returning-partial-success-of-stream-send-request.txt
+Patch30293: 2872-TIPC-Optimized-argument-validation-done-by-connect.txt
+Patch30294: 2873-TIPC-Withdrawing-all-names-from-nameless-port-now-returns-success-not-error.txt
+Patch30295: 2874-TIPC-Added-missing-warning-for-out-of-memory-condition.txt
+Patch30296: 2875-TIPC-Fixed-memory-leak-in-tipc_link_send-when-destination-is-unreachable.txt
+Patch30297: 2876-TIPC-Disallow-config-operations-that-aren-t-supported-in-certain-modes.txt
+Patch30298: 2877-TIPC-First-phase-of-assert-cleanup.txt
+Patch30299: 2878-TIPC-Enhanced-cleaned-up-system-messages-fixed-2-obscure-memory-leaks.txt
+Patch30300: 2879-TIPC-Fixed-link-switchover-bugs.txt
+Patch30301: 2880-TIPC-Get-rid-of-dynamically-allocated-arrays-in-broadcast-code.txt
+Patch30302: 2881-TIPC-Fix-incorrect-correction-to-discovery-timer-frequency-computation.txt
+Patch30303: 2885-NET-skb_find_text-ignores-to-argument.txt
+Patch30304: 2886-ATM-atm-mpc.c-warning-fix.txt
+Patch30305: 2887-IRDA-add-some-IBM-think-pads.txt
+Patch30306: 2889-NET-netpoll-break-recursive-loop-in-netpoll-rx-path.txt
+Patch30307: 2890-NETROM-Fix-possible-null-pointer-dereference.txt
+Patch30308: 2934-spelling-fixes.txt
+Patch30309: 2949-net-rxrpc-use-list_move.txt
+Patch30310: 2950-drivers-use-list_move.txt
+Patch30311: 3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt
+Patch30312: 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt
+Patch30313: 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt
+Patch30314: 3390-DM9000-better-checks-for-platform-resources.txt
+Patch30315: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
+Patch30316: 3392-DM9000-do-no-re-init-spin-lock.txt
+Patch30317: 3393-DM9000-minor-code-cleanups.txt
+Patch30318: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
+Patch30319: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
+Patch30320: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
+Patch30321: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
+Patch30322: 3399-netdrvr-natsemi-minor-cleanups.txt
+Patch30323: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
+Patch30324: 3460-e1000-fix-loopback-ethtool-test.txt
+Patch30325: 3461-e1000-rework-driver-hardware-reset-locking.txt
+Patch30326: 3462-e1000-Make-PHY-powerup-down-a-function.txt
+Patch30327: 3463-e1000-fix-CONFIG_PM-blocks.txt
+Patch30328: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
+Patch30329: 3465-e1000-add-smart-power-down-code.txt
+Patch30330: 3467-e1000-recycle-skb.txt
+Patch30331: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
+Patch30332: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
+Patch30333: 3470-e1000-disable-CRC-stripping-workaround.txt
+Patch30334: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
+Patch30335: 3472-e1000-M88-PHY-workaround.txt
+Patch30336: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
+Patch30337: 3474-e1000-disable-ERT.txt
+Patch30338: 3475-e1000-add-ich8lan-core-functions.txt
+Patch30339: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
+Patch30340: 3478-e1000-add-ich8lan-device-ID-s.txt
+Patch30341: 3479-e1000-increase-version-to-7.1.9-k2.txt
+Patch30342: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
+Patch30343: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
+Patch30344: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
+Patch30345: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
+Patch30346: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
+Patch30347: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
+Patch30348: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
+Patch30349: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
+Patch30350: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
+Patch30351: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
+Patch30352: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
+Patch30353: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
+Patch30354: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
+Patch30355: 4007-AF_UNIX-Datagram-getpeersec.txt
+Patch30356: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
+Patch30357: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
+Patch30358: 4015-BNX2-Turn-off-link-during-shutdown.txt
+Patch30359: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
+Patch30360: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
+Patch30361: 4019-XFRM-unexport-xfrm_state_mtu.txt
+Patch30362: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
+Patch30363: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
+Patch30364: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
+Patch30365: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
+Patch30366: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
+Patch30367: 4062-typo-fixes-bandwith-bandwidth.txt
+Patch30368: 4066-typo-fixes-infomation-information.txt
+Patch30369: 4067-typo-fixes-occuring-occurring.txt
+Patch30370: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
+Patch30371: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
+Patch30372: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
+Patch30373: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
+Patch30374: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
+Patch30375: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
+Patch30376: 4172-com20020_cs-more-device-support.txt
+Patch30377: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
+Patch30378: 4178-TG3-Add-rx-BD-workaround.txt
+Patch30379: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
+Patch30380: 4181-TG3-Update-version-and-reldate.txt
+Patch30381: 4183-IPV6-Remove-redundant-length-check-on-input.txt
+Patch30382: 4417-bcm43xx-netlink-deadlock-fix.txt
+Patch30383: 4516-forcedeth-typecast-cleanup.txt
+Patch30384: 4523-AF_UNIX-datagram-getpeersec-fix.txt
+Patch30385: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
+Patch30386: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
+Patch30387: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
+Patch30388: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
+Patch30389: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
+Patch30390: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
+Patch30391: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
+Patch30392: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
+Patch30393: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
+Patch30394: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
+Patch30395: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
+Patch30396: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
+Patch30397: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
+Patch30398: 4572-netdrvr-epic100-minor-cleanups.txt
+Patch30399: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
+Patch30400: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
+Patch30401: 4577-netdrvr-via-velocity-misc.-cleanups.txt
+Patch30402: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
+Patch30403: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
+Patch30404: 4581-Add-two-PLX-device-IDs.txt
+Patch30405: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
+Patch30406: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
+Patch30407: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
+Patch30408: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
+Patch30409: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
+Patch30410: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
+Patch30411: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
+Patch30412: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
+Patch30413: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
+Patch30414: 4594-zd1211rw-disable-TX-queue-during-stop.txt
+Patch30415: 4595-Add-support-for-the-Cicada-8201-PHY.txt
+Patch30416: 4596-pcnet32-Fix-Section-mismatch-error.txt
+Patch30417: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
+Patch30418: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
+Patch30419: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
+Patch30420: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
+Patch30421: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
+Patch30422: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
+Patch30423: 4604-NI5010-netcard-cleanup.txt
+Patch30424: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
+Patch30425: 4606-Fix-freeing-of-net-device.txt
+Patch30426: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
+Patch30427: 4612-8139too-deadlock-fix.txt
+Patch30428: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
+Patch30429: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
+Patch30430: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
+Patch30431: 4646-wireless-add-acx-driver.txt
+Patch30432: 4647-acxsm-merge-from-acx-0.3.32.txt
+Patch30433: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
+Patch30434: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
+Patch30435: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
+Patch30436: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
+Patch30437: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
+Patch30438: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
+Patch30439: 4654-fix-tiacx-on-alpha.txt
+Patch30440: 4655-tiacx-fix-attribute-packed-warnings.txt
+Patch30441: 4656-tiacx-pci-build-fix.txt
+Patch30442: 4657-tiacx-support-ia64.txt
+Patch30443: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
+Patch30444: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
+Patch30445: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
+Patch30446: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
+Patch30447: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
+Patch30448: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
+Patch30449: 4673-AX.25-Use-kzalloc.txt
+Patch30450: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
+Patch30451: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
+Patch30452: 4691-bcm43xx-improved-statistics.txt
+Patch30453: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
+Patch30454: 4693-tiacx-don-t-use-UTS_RELEASE.txt
+Patch30455: 4716-release_firmware-fixes.txt
+Patch30456: 4821-AX.25-Get-rid-of-the-last-volatile.txt
+Patch30457: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
+Patch30458: 4824-TCP-Remove-TCP-Compound.txt
+Patch30459: 4825-DCCP-Fix-sparse-warnings.txt
+Patch30460: 4834-IPV6-order-addresses-by-scope.txt
+Patch30461: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
+Patch30462: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
+Patch30463: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
+Patch30464: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -1754,682 +1753,680 @@
 %patch30126 -p1
 # SUNRPC: NFS_ROOT always uses the same XIDs
 %patch30127 -p1
-# VFS: Unexport do_kern_mount() and clean up simple_pin_fs()
-%patch30128 -p1
 # RPC: Allow struc xdr_stream to read the page section of an xdr_buf
-%patch30129 -p1
+%patch30128 -p1
 # e1000: prevent statistics from garbling during bus resets
-%patch30130 -p1
+%patch30129 -p1
 # forcedeth config: tso cleanup
-%patch30131 -p1
+%patch30130 -p1
 # forcedeth config: ring sizes
-%patch30132 -p1
+%patch30131 -p1
 # forcedeth config: flow control
-%patch30133 -p1
+%patch30132 -p1
 # forcedeth config: phy
-%patch30134 -p1
+%patch30133 -p1
 # forcedeth config: wol
-%patch30135 -p1
+%patch30134 -p1
 # forcedeth config: csum
-%patch30136 -p1
+%patch30135 -p1
 # forcedeth config: statistics
-%patch30137 -p1
+%patch30136 -p1
 # forcedeth config: move functions
-%patch30138 -p1
+%patch30137 -p1
 # forcedeth config: diagnostics
-%patch30139 -p1
+%patch30138 -p1
 # forcedeth config: module parameters
-%patch30140 -p1
+%patch30139 -p1
 # forcedeth config: version
-%patch30141 -p1
+%patch30140 -p1
 # forcedeth: new device ids
-%patch30142 -p1
+%patch30141 -p1
 # smc911x Kconfig fix
-%patch30143 -p1
+%patch30142 -p1
 # Section mismatch in drivers/net/ne.o during modpost
-%patch30144 -p1
+%patch30143 -p1
 # hp ethernet: fix section mismatches
-%patch30145 -p1
+%patch30144 -p1
 # smc ethernet: fix section mismatch warnings
-%patch30146 -p1
+%patch30145 -p1
 # 3c5zz ethernet: fix section warnings
-%patch30147 -p1
+%patch30146 -p1
 # net: au1000_eth: PHY framework conversion
-%patch30148 -p1
+%patch30147 -p1
 # wireless: Changes to ieee80211.h for user space regulatory daemon
-%patch30149 -p1
+%patch30148 -p1
 # pci: bcm43xx avoid pci_find_device
-%patch30150 -p1
+%patch30149 -p1
 # wireless: correct dump of WPA IE
-%patch30151 -p1
+%patch30150 -p1
 # ipw2200 locking fix
-%patch30152 -p1
+%patch30151 -p1
 # [NET]: Export ip_dev_find()
-%patch30153 -p1
+%patch30152 -p1
 # [I/OAT]: Make sk_eat_skb I/OAT aware.
-%patch30154 -p1
+%patch30153 -p1
 # [LLC]: use more efficient ether address routines
-%patch30155 -p1
+%patch30154 -p1
 # [LLC]: allow datagram recvmsg
-%patch30156 -p1
+%patch30155 -p1
 # [LLC]: use rcu_dereference on receive handler
-%patch30157 -p1
+%patch30156 -p1
 # [LLC]: allow applications to get copy of kernel datagrams
-%patch30158 -p1
+%patch30157 -p1
 # [LLC]: add multicast support for datagrams
-%patch30159 -p1
+%patch30158 -p1
 # [BRIDGE]: optimize conditional in forward path
-%patch30160 -p1
+%patch30159 -p1
 # [BRIDGE]: fix module startup error handling
-%patch30161 -p1
+%patch30160 -p1
 # [BRIDGE]: netlink interface for link management
-%patch30162 -p1
+%patch30161 -p1
 # [TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous
-%patch30163 -p1
+%patch30162 -p1
 # [IRDA]: Initial support for MCS7780 based dongles
-%patch30164 -p1
+%patch30163 -p1
 # [IRDA]: stir4200, switching to the kthread API
-%patch30165 -p1
+%patch30164 -p1
 # [IRDA]: ali-ircc: using device model power management
-%patch30166 -p1
+%patch30165 -p1
 # [TG3]: Add 5786 PCI ID
-%patch30167 -p1
+%patch30166 -p1
 # [TG3]: Add recovery logic when MMIOs are re-ordered
-%patch30168 -p1
+%patch30167 -p1
 # [TG3]: update version and reldate
-%patch30169 -p1
+%patch30168 -p1
 # [IPSEC] xfrm: Undo afinfo lock proliferation
-%patch30170 -p1
+%patch30169 -p1
 # [NETFILTER]: x_tables: remove some unnecessary casts
-%patch30171 -p1
+%patch30170 -p1
 # [NETFILTER]: x_tables: add SCTP/DCCP support where missing
-%patch30172 -p1
+%patch30171 -p1
 # [NETFILTER]: x_tables: add quota match
-%patch30173 -p1
+%patch30172 -p1
 # [NETFILTER]: x_tables: add statistic match
-%patch30174 -p1
+%patch30173 -p1
 # [NETFILTER]: recent match: replace by rewritten version
-%patch30175 -p1
+%patch30174 -p1
 # [NETFILTER]: conntrack: don't call helpers for related ICMP messages
-%patch30176 -p1
+%patch30175 -p1
 # [NETFILTER]: conntrack: add sysctl to disable checksumming
-%patch30177 -p1
+%patch30176 -p1
 # [NETFILTER]: conntrack: add fixed timeout flag in connection tracking
-%patch30178 -p1
+%patch30177 -p1
 # [NETFILTER]: ctnetlink: fix NAT configuration
-%patch30179 -p1
+%patch30178 -p1
 # [NETFILTER]: ctnetlink: change table dumping not to require an unique ID
-%patch30180 -p1
+%patch30179 -p1
 # [NETFILTER]: SNMP helper: fix debug module param type
-%patch30181 -p1
+%patch30180 -p1
 # [NETFILTER]: FTP helper: search optimization
-%patch30182 -p1
+%patch30181 -p1
 # [NETFILTER]: amanda helper: convert to textsearch infrastructure
-%patch30183 -p1
+%patch30182 -p1
 # [NETFILTER]: H.323 helper: Add support for Call Forwarding
-%patch30184 -p1
+%patch30183 -p1
 # [NETFILTER]: H.323 helper: replace internal_net_addr parameter by routing-based heuristic
-%patch30185 -p1
+%patch30184 -p1
 # [NETFILTER]: Add SIP connection tracking helper
-%patch30186 -p1
+%patch30185 -p1
 # [NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type
-%patch30187 -p1
+%patch30186 -p1
 # [LLC]: Fix double receive of SKB.
-%patch30188 -p1
+%patch30187 -p1
 # [TCP]: TCP Low Priority congestion control
-%patch30189 -p1
+%patch30188 -p1
 # [TCP]: TCP Veno congestion control
-%patch30190 -p1
+%patch30189 -p1
 # [TCP]: TCP Compound congestion control
-%patch30191 -p1
+%patch30190 -p1
 # [TCP]: TCP Compound quad root function
-%patch30192 -p1
+%patch30191 -p1
 # [TCP]: Minimum congestion window consolidation.
-%patch30193 -p1
+%patch30192 -p1
 # [TCP]: TCP Probe congestion window tracing
-%patch30194 -p1
+%patch30193 -p1
 # [TCP]: Limited slow start for Highspeed TCP
-%patch30195 -p1
+%patch30194 -p1
 # [TCP]: Fix compile warning in tcp_probe.c
-%patch30196 -p1
+%patch30195 -p1
 # [IPV4] igmp: Fixup struct ip_mc_list::multiaddr type
-%patch30197 -p1
+%patch30196 -p1
 # [IPV4]: Right prototype of __raw_v4_lookup()
-%patch30198 -p1
+%patch30197 -p1
 # [IPV4] icmp: Kill local 'ip' arg in icmp_redirect().
-%patch30199 -p1
+%patch30198 -p1
 # [LSM-IPsec]: SELinux Authorize
-%patch30200 -p1
+%patch30199 -p1
 # [NET]: NET_TCPPROBE Kconfig fix
-%patch30201 -p1
+%patch30200 -p1
 # [NET]: Fix warnings after LSM-IPSEC changes.
-%patch30202 -p1
+%patch30201 -p1
 # [SECMARK]: Add secmark support to conntrack
-%patch30203 -p1
+%patch30202 -p1
 # [NETFILTER]: recent match: fix "sleeping function called from invalid context"
-%patch30204 -p1
+%patch30203 -p1
 # [NETFILTER]: recent match: missing refcnt initialization
-%patch30205 -p1
+%patch30204 -p1
 # [NETFILTER]: hashlimit match: fix random initialization
-%patch30206 -p1
+%patch30205 -p1
 # [NET] ppp: Remove unnecessary pskb_may_pull
-%patch30207 -p1
+%patch30206 -p1
 # [NET]: skb_trim audit
-%patch30208 -p1
+%patch30207 -p1
 # [NET]: Warn in __skb_trim if skb is paged
-%patch30209 -p1
+%patch30208 -p1
 # [IPX]: Endian bug in ipxrtr_route_packet()
-%patch30210 -p1
+%patch30209 -p1
 # [IRDA]: irda-usb.c: STIR421x cleanups
-%patch30211 -p1
+%patch30210 -p1
 # [BNX2]: Endian fixes.
-%patch30212 -p1
+%patch30211 -p1
 # [NET]: net.ipv4.ip_autoconfig sysctl removal
-%patch30213 -p1
+%patch30212 -p1
 # [TCP] Westwood: fix first sample
-%patch30214 -p1
+%patch30213 -p1
 # [TCP] Westwood: comment fixes
-%patch30215 -p1
+%patch30214 -p1
 # [TCP] Westwood: bandwidth filter startup
-%patch30216 -p1
+%patch30215 -p1
 # [TCP] Westwood: reset RTT min after FRTO
-%patch30217 -p1
+%patch30216 -p1
 # [BNX2]: Add an rx drop counter
-%patch30218 -p1
+%patch30217 -p1
 # [BNX2]: Allow WoL settings on new 5708 chips
-%patch30219 -p1
+%patch30218 -p1
 # [BNX2]: Add firmware decompression
-%patch30220 -p1
+%patch30219 -p1
 # [BNX2]: Use compressed firmware
-%patch30221 -p1
+%patch30220 -p1
 # [BNX2]: Use CPU native page size
-%patch30222 -p1
+%patch30221 -p1
 # [BNX2]: Update version and reldate
-%patch30223 -p1
+%patch30222 -p1
 # [TG3]: Remove unnecessary tx_lock
-%patch30224 -p1
+%patch30223 -p1
 # [TG3]: Convert to non-LLTX
-%patch30225 -p1
+%patch30224 -p1
 # [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
-%patch30226 -p1
+%patch30225 -p1
 # [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
-%patch30227 -p1
+%patch30226 -p1
 # [IRDA]: Use put_unaligned() in irlmp_do_discovery().
-%patch30228 -p1
+%patch30227 -p1
 # [SCTP]: Don't do CRC32C checksum over loopback.
-%patch30229 -p1
+%patch30228 -p1
 # [ARM] 3406/1: lpd7x: compilation fix for smc91x
-%patch30230 -p1
+%patch30229 -p1
 # [NET]: Prevent multiple qdisc runs
-%patch30231 -p1
+%patch30230 -p1
 # [SPARC]: Kill __irq_itoa().
-%patch30232 -p1
+%patch30231 -p1
 # s2io: netpoll support
-%patch30233 -p1
+%patch30232 -p1
 # [SCTP]: sctp_unpack_cookie() fix
-%patch30234 -p1
+%patch30233 -p1
 # [ATM]: fix broken uses of NIPQUAD in net/atm
-%patch30235 -p1
+%patch30234 -p1
 # via-velocity: the link is not correctly detected when the device starts
-%patch30236 -p1
+%patch30235 -p1
 # IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC.
-%patch30237 -p1
+%patch30236 -p1
 # AT91RM9200 Ethernet #1: Link poll
-%patch30238 -p1
+%patch30237 -p1
 # AT91RM9200 Ethernet #2: MII interface
-%patch30239 -p1
+%patch30238 -p1
 # AT91RM9200 Ethernet #3: Cleanup
-%patch30240 -p1
+%patch30239 -p1
 # AT91RM9200 Ethernet #4: Suspend/Resume
-%patch30241 -p1
+%patch30240 -p1
 # b44: fix manual speed/duplex/autoneg settings
-%patch30242 -p1
+%patch30241 -p1
 # b44: add wol
-%patch30243 -p1
+%patch30242 -p1
 # b44: add parameter
-%patch30244 -p1
+%patch30243 -p1
 # b44: add wol for old nic
-%patch30245 -p1
+%patch30244 -p1
 # b44: update version to 1.01
-%patch30246 -p1
+%patch30245 -p1
 # b44: update b44 Kconfig entry
-%patch30247 -p1
+%patch30246 -p1
 # 8139cp: fix eeprom read command length
-%patch30248 -p1
+%patch30247 -p1
 # 8139cp: add ethtool eeprom support
-%patch30249 -p1
+%patch30248 -p1
 # Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c
-%patch30250 -p1
+%patch30249 -p1
 # Array overrun in drivers/net/wireless/wavelan.c
-%patch30251 -p1
+%patch30250 -p1
 # Dereference in tokenring/olympic.c
-%patch30252 -p1
+%patch30251 -p1
 # network driver for Hilscher netx
-%patch30253 -p1
+%patch30252 -p1
 # make drivers/net/forcedeth.c:nv_update_pause() static
-%patch30254 -p1
+%patch30253 -p1
 # skb_padto()-area fixes in 8390, wavelan
-%patch30255 -p1
+%patch30254 -p1
 # WAN: register_hdlc_device() doesn't need dev_alloc_name()
-%patch30256 -p1
+%patch30255 -p1
 # WAN: ioremap() failure checks in drivers
-%patch30257 -p1
+%patch30256 -p1
 # [NET]: Require CAP_NET_ADMIN to create tuntap devices.
-%patch30258 -p1
+%patch30257 -p1
 # clean up default value of IP_DCCP_ACKVEC
-%patch30259 -p1
+%patch30258 -p1
 # [SPARC]: Port sparc64 in-kernel device tree code to sparc32.
-%patch30260 -p1
+%patch30259 -p1
 # [NET] sunlance: Convert to new SBUS driver framework.
-%patch30261 -p1
+%patch30260 -p1
 # [NET] sunbmac: Convert over to new SBUS device framework.
-%patch30262 -p1
+%patch30261 -p1
 # [NET] sunqe: Convert to new SBUS driver layer.
-%patch30263 -p1
+%patch30262 -p1
 # [NET] myri_sbus: Convert to new SBUS device layer.
-%patch30264 -p1
+%patch30263 -p1
 # [NET] myri_sbus: Kill unused next_module struct member.
-%patch30265 -p1
+%patch30264 -p1
 # [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
-%patch30266 -p1
+%patch30265 -p1
 # m68k: cleanup generic irq names
-%patch30267 -p1
+%patch30266 -p1
 # Define __raw_get_cpu_var and use it
-%patch30268 -p1
+%patch30267 -p1
 # wan/sdla section fixes
-%patch30269 -p1
+%patch30268 -p1
 # irda-usb printk fix
-%patch30270 -p1
+%patch30269 -p1
 # m68knommu: 532x FEC eth struct map
-%patch30271 -p1
+%patch30270 -p1
 # [TIPC] Improved tolerance to promiscuous mode interface
-%patch30272 -p1
+%patch30271 -p1
 # [TIPC]: Prevent name table corruption if no room for new publication
-%patch30273 -p1
+%patch30272 -p1
 # [TIPC]: Use correct upper bound when validating network zone number.
-%patch30274 -p1
+%patch30273 -p1
 # [TIPC]: Corrected potential misuse of tipc_media_addr structure.
-%patch30275 -p1
+%patch30274 -p1
 # [TIPC]: Allow ports to receive multicast messages through native API.
-%patch30276 -p1
+%patch30275 -p1
 # [TIPC]: Links now validate destination node specified by incoming messages.
-%patch30277 -p1
+%patch30276 -p1
 # [TIPC]: Multicast link failure now resets all links to "nacking" node.
-%patch30278 -p1
+%patch30277 -p1
 # [TIPC]: Allow compilation when CONFIG_TIPC_DEBUG is not set.
-%patch30279 -p1
+%patch30278 -p1
 # [TIPC] Fix for NULL pointer dereference
-%patch30280 -p1
+%patch30279 -p1
 # [TIPC]: Fixed privilege checking typo in dest_name_check().
-%patch30281 -p1
+%patch30280 -p1
 # [TIPC]: Fix misleading comment in buf_discard() routine.
-%patch30282 -p1
+%patch30281 -p1
 # [TIPC]: Added support for MODULE_VERSION capability.
-%patch30283 -p1
+%patch30282 -p1
 # [TIPC]: Validate entire interface name when locating bearer to enable.
-%patch30284 -p1
+%patch30283 -p1
 # [TIPC]: Non-operation-affecting corrections to comments & function definitions.
-%patch30285 -p1
+%patch30284 -p1
 # [TIPC]: Fixed connect() to detect a dest address that is missing or too short.
-%patch30286 -p1
+%patch30285 -p1
 # [TIPC]: Implied connect now saves dest name for retrieval as ancillary data.
-%patch30287 -p1
+%patch30286 -p1
 # [TIPC]: Can now return destination name of form {0,x,y} via ancillary data.
-%patch30288 -p1
+%patch30287 -p1
 # [TIPC]: Connected send now checks socket state when retrying congested send.
-%patch30289 -p1
+%patch30288 -p1
 # [TIPC]: Stream socket send indicates partial success if data partially sent.
-%patch30290 -p1
+%patch30289 -p1
 # [TIPC]: Improved performance of error checking during socket creation.
-%patch30291 -p1
+%patch30290 -p1
 # [TIPC]: recvmsg() now returns TIPC ancillary data using correct level (SOL_TIPC)
-%patch30292 -p1
+%patch30291 -p1
 # [TIPC]: Simplify code for returning partial success of stream send request.
-%patch30293 -p1
+%patch30292 -p1
 # [TIPC]: Optimized argument validation done by connect().
-%patch30294 -p1
+%patch30293 -p1
 # [TIPC]: Withdrawing all names from nameless port now returns success, not error
-%patch30295 -p1
+%patch30294 -p1
 # [TIPC]: Added missing warning for out-of-memory condition
-%patch30296 -p1
+%patch30295 -p1
 # [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable
-%patch30297 -p1
+%patch30296 -p1
 # [TIPC]: Disallow config operations that aren't supported in certain modes.
-%patch30298 -p1
+%patch30297 -p1
 # [TIPC]: First phase of assert() cleanup
-%patch30299 -p1
+%patch30298 -p1
 # [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks.
-%patch30300 -p1
+%patch30299 -p1
 # [TIPC]: Fixed link switchover bugs
-%patch30301 -p1
+%patch30300 -p1
 # [TIPC]: Get rid of dynamically allocated arrays in broadcast code.
-%patch30302 -p1
+%patch30301 -p1
 # [TIPC]: Fix incorrect correction to discovery timer frequency computation.
-%patch30303 -p1
+%patch30302 -p1
 # [NET]: skb_find_text ignores to argument
-%patch30304 -p1
+%patch30303 -p1
 # [ATM]: atm/mpc.c warning fix
-%patch30305 -p1
+%patch30304 -p1
 # [IRDA]: add some IBM think pads
-%patch30306 -p1
+%patch30305 -p1
 # [NET] netpoll: break recursive loop in netpoll rx path
-%patch30307 -p1
+%patch30306 -p1
 # [NETROM]: Fix possible null pointer dereference.
-%patch30308 -p1
+%patch30307 -p1
 # spelling fixes
-%patch30309 -p1
+%patch30308 -p1
 # net/rxrpc: use list_move()
-%patch30310 -p1
+%patch30309 -p1
 # drivers: use list_move()
-%patch30311 -p1
+%patch30310 -p1
 # devfs: Remove devfs_mk_dir() function from the kernel tree
-%patch30312 -p1
+%patch30311 -p1
 # devfs: Remove the miscdevice devfs_name field as it's no longer needed
-%patch30313 -p1
+%patch30312 -p1
 # devfs: Remove the tty_driver devfs_name field as it's no longer needed
-%patch30314 -p1
+%patch30313 -p1
 # DM9000 - better checks for platform resources
-%patch30315 -p1
+%patch30314 -p1
 # DM9000 - check for MAC left in by bootloader
-%patch30316 -p1
+%patch30315 -p1
 # DM9000 - do no re-init spin lock
-%patch30317 -p1
+%patch30316 -p1
 # DM9000 - minor code cleanups
-%patch30318 -p1
+%patch30317 -p1
 # Fix phy id for LXT971A/LXT972A
-%patch30319 -p1
+%patch30318 -p1
 # drivers/net/hamradio/dmascc.c: fix section mismatch
-%patch30320 -p1
+%patch30319 -p1
 # WAN: update info page for a bunch of my drivers
-%patch30321 -p1
+%patch30320 -p1
 # [netdrvr] natsemi: Separate out media initialization code
-%patch30322 -p1
+%patch30321 -p1
 # [netdrvr] natsemi: minor cleanups
-%patch30323 -p1
+%patch30322 -p1
 # [netdrvr] Remove long-unused bits from Becker template drivers
-%patch30324 -p1
+%patch30323 -p1
 # e1000: fix loopback ethtool test
-%patch30325 -p1
+%patch30324 -p1
 # e1000: rework driver hardware reset locking
-%patch30326 -p1
+%patch30325 -p1
 # e1000: Make PHY powerup/down a function
-%patch30327 -p1
+%patch30326 -p1
 # e1000: fix CONFIG_PM blocks
-%patch30328 -p1
+%patch30327 -p1
 # e1000: small performance tweak by removing double code
-%patch30329 -p1
+%patch30328 -p1
 # e1000: add smart power down code
-%patch30330 -p1
+%patch30329 -p1
 # e1000: recycle skb
-%patch30331 -p1
+%patch30330 -p1
 # e1000: rework module param code with uninitialized values
-%patch30332 -p1
+%patch30331 -p1
 # e1000: force register write flushes to circumvent broken platforms
-%patch30333 -p1
+%patch30332 -p1
 # e1000: disable CRC stripping workaround
-%patch30334 -p1
+%patch30333 -p1
 # e1000: fix adapter led blinking inconsistency
-%patch30335 -p1
+%patch30334 -p1
 # e1000: M88 PHY workaround
-%patch30336 -p1
+%patch30335 -p1
 # e1000: check return value of _get_speed_and_duplex
-%patch30337 -p1
+%patch30336 -p1
 # e1000: disable ERT
-%patch30338 -p1
+%patch30337 -p1
 # e1000: add ich8lan core functions
-%patch30339 -p1
+%patch30338 -p1
 # e1000: allow user to disable ich8 lock loss workaround
-%patch30340 -p1
+%patch30339 -p1
 # e1000: add ich8lan device ID's
-%patch30341 -p1
+%patch30340 -p1
 # e1000: increase version to 7.1.9-k2
-%patch30342 -p1
+%patch30341 -p1
 # 64bit resource: fix up printks for resources in networks drivers
-%patch30343 -p1
+%patch30342 -p1
 # m68knommu: avoid fec driver hang when link disappears
-%patch30344 -p1
+%patch30343 -p1
 # m68knommu: FEC driver support for the ColdFire 523x CPU family
-%patch30345 -p1
+%patch30344 -p1
 # m68knommu: FEC driver set different priority/level on each IRQ
-%patch30346 -p1
+%patch30345 -p1
 # m68knommu: FEC driver event/irq fixes
-%patch30347 -p1
+%patch30346 -p1
 # [NETFILTER]: x_tables: fix xt_register_table error propagation
-%patch30348 -p1
+%patch30347 -p1
 # [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_\*
-%patch30349 -p1
+%patch30348 -p1
 # [NETFILTER]: xt_tcpudp: fix double unregistration in error path
-%patch30350 -p1
+%patch30349 -p1
 # [NETFILTER]: xt_sctp: fix --chunk-types matching
-%patch30351 -p1
+%patch30350 -p1
 # [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev disappears
-%patch30352 -p1
+%patch30351 -p1
 # [NETFILTER]: statistic match: add missing Kconfig help text
-%patch30353 -p1
+%patch30352 -p1
 # [TCP]: Export accept queue len of a TCP listening socket via rx_queue
-%patch30354 -p1
+%patch30353 -p1
 # [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
-%patch30355 -p1
+%patch30354 -p1
 # [AF_UNIX]: Datagram getpeersec
-%patch30356 -p1
+%patch30355 -p1
 # [ATM]: basic sysfs support for ATM devices
-%patch30357 -p1
+%patch30356 -p1
 # [BNX2]: Use dev_kfree_skb() instead of the _irq version
-%patch30358 -p1
+%patch30357 -p1
 # [BNX2]: Turn off link during shutdown
-%patch30359 -p1
+%patch30358 -p1
 # [IrDA]: MCS7780 usb_driver struct should be static
-%patch30360 -p1
+%patch30359 -p1
 # [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
-%patch30361 -p1
+%patch30360 -p1
 # [XFRM]: unexport xfrm_state_mtu
-%patch30362 -p1
+%patch30361 -p1
 # [IrDA]: Fix RCU lock pairing on error path
-%patch30363 -p1
+%patch30362 -p1
 # [IrDA]: Fix the AU1000 FIR dependencies
-%patch30364 -p1
+%patch30363 -p1
 # [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
-%patch30365 -p1
+%patch30364 -p1
 # [TIPC]: Improve response to requests for node/link information
-%patch30366 -p1
+%patch30365 -p1
 # [TIPC]: Initial activation message now includes TIPC version number
-%patch30367 -p1
+%patch30366 -p1
 # typo fixes: bandwith -> bandwidth
-%patch30368 -p1
+%patch30367 -p1
 # typo fixes: infomation -> information
-%patch30369 -p1
+%patch30368 -p1
 # typo fixes: occuring -> occurring
-%patch30370 -p1
+%patch30369 -p1
 # Kconfig: Typos in net/sched/Kconfig
-%patch30371 -p1
+%patch30370 -p1
 # knfsd: svcrpc: gss: simplify rsc_parse()
-%patch30372 -p1
+%patch30371 -p1
 # knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code
-%patch30373 -p1
+%patch30372 -p1
 # knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case
-%patch30374 -p1
+%patch30373 -p1
 # knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy
-%patch30375 -p1
+%patch30374 -p1
 # pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
-%patch30376 -p1
+%patch30375 -p1
 # com20020_cs: more device support
-%patch30377 -p1
+%patch30376 -p1
 # [TG3]: Add tg3_netif_stop() in vlan functions
-%patch30378 -p1
+%patch30377 -p1
 # [TG3]: Add rx BD workaround
-%patch30379 -p1
+%patch30378 -p1
 # [TG3]: Turn on hw fix for ASF problems
-%patch30380 -p1
+%patch30379 -p1
 # [TG3]: Update version and reldate
-%patch30381 -p1
+%patch30380 -p1
 # [IPV6]: Remove redundant length check on input
-%patch30382 -p1
+%patch30381 -p1
 # bcm43xx: netlink deadlock fix
-%patch30383 -p1
+%patch30382 -p1
 # forcedeth: typecast cleanup
-%patch30384 -p1
+%patch30383 -p1
 # [AF_UNIX]: datagram getpeersec fix
-%patch30385 -p1
+%patch30384 -p1
 # [ROSE]: Fix dereference of skb pointer after free.
-%patch30386 -p1
+%patch30385 -p1
 # [AX.25]: Reference counting for AX.25 routes.
-%patch30387 -p1
+%patch30386 -p1
 # [NETROM]: Use socket helpers instead of direct fiddling with struct sock
-%patch30388 -p1
+%patch30387 -p1
 # [ROSE]: Try all routes when establishing a ROSE connections.
-%patch30389 -p1
+%patch30388 -p1
 # [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED)
-%patch30390 -p1
+%patch30389 -p1
 # [BRIDGE]: br_dump_ifinfo index fix
-%patch30391 -p1
+%patch30390 -p1
 # [Bluetooth] Correct SCO buffer size on request
-%patch30392 -p1
+%patch30391 -p1
 # [Bluetooth] Add automatic sniff mode support
-%patch30393 -p1
+%patch30392 -p1
 # [Bluetooth] Add platform device for virtual and serial devices
-%patch30394 -p1
+%patch30393 -p1
 # [Bluetooth] Small cleanup of the L2CAP source code
-%patch30395 -p1
+%patch30394 -p1
 # [Bluetooth] Allow disabling of credit based flow control
-%patch30396 -p1
+%patch30395 -p1
 # [Bluetooth] Add RFCOMM role switch support
-%patch30397 -p1
+%patch30396 -p1
 # This fixes a panic doing the first READDIR or READDIRPLUS call when:
-%patch30398 -p1
+%patch30397 -p1
 # [netdrvr] epic100: minor cleanups
-%patch30399 -p1
+%patch30398 -p1
 # [netdrvr] Remove Becker-template 'io_size' member, when invariant
-%patch30400 -p1
+%patch30399 -p1
 # [netdrvr] via-velocity: use netdev_priv() where appropriate
-%patch30401 -p1
+%patch30400 -p1
 # [netdrvr] via-velocity: misc. cleanups
-%patch30402 -p1
+%patch30401 -p1
 # [netdrvr] via-velocity: remove io_size struct member, it is invariant
-%patch30403 -p1
+%patch30402 -p1
 # [netdrvr] Use dev_printk() when ethernet interface isn't available
-%patch30404 -p1
+%patch30403 -p1
 # Add two PLX device IDs
-%patch30405 -p1
+%patch30404 -p1
 # bcm43xx: use softmac-suggested TX rate
-%patch30406 -p1
+%patch30405 -p1
 # ieee80211: fix not allocating IV+ICV space when usingencryption in ieee80211_tx_frame
-%patch30407 -p1
+%patch30406 -p1
 # skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.c
-%patch30408 -p1
+%patch30407 -p1
 # 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211softmac_assoc_req
-%patch30409 -p1
+%patch30408 -p1
 # SoftMAC: Prevent multiple authentication attempts on the same network
-%patch30410 -p1
+%patch30409 -p1
 # SoftMAC: Add network to ieee80211softmac_call_events when associate times out
-%patch30411 -p1
+%patch30410 -p1
 # CONFIG_WIRELESS_EXT is neccessary after all
-%patch30412 -p1
+%patch30411 -p1
 # softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
-%patch30413 -p1
+%patch30412 -p1
 # ZyDAS ZD1211 USB-WLAN driver
-%patch30414 -p1
+%patch30413 -p1
 # zd1211rw: disable TX queue during stop
-%patch30415 -p1
+%patch30414 -p1
 # Add support for the Cicada 8201 PHY
-%patch30416 -p1
+%patch30415 -p1
 # pcnet32: Fix Section mismatch error
-%patch30417 -p1
+%patch30416 -p1
 # pcnet32: Use PCI_DEVICE macro
-%patch30418 -p1
+%patch30417 -p1
 # pcnet32: Fix off-by-one in get_ringparam
-%patch30419 -p1
+%patch30418 -p1
 # pcnet32: Use kcalloc instead of kmalloc and memset
-%patch30420 -p1
+%patch30419 -p1
 # pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
-%patch30421 -p1
+%patch30420 -p1
 # pcnet32: Suspend the chip rather than restart when changing multicast/promisc
-%patch30422 -p1
+%patch30421 -p1
 # pcnet32: Cleanup rx buffers after loopback test.
-%patch30423 -p1
+%patch30422 -p1
 # NI5010 netcard cleanup
-%patch30424 -p1
+%patch30423 -p1
 # remove dead entry in net wan Kconfig
-%patch30425 -p1
+%patch30424 -p1
 # Fix freeing of net device
-%patch30426 -p1
+%patch30425 -p1
 # [netdrvr] 3c59x: snip changelog from source code
-%patch30427 -p1
+%patch30426 -p1
 # 8139too deadlock fix
-%patch30428 -p1
+%patch30427 -p1
 # [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
-%patch30429 -p1
+%patch30428 -p1
 # [PKT_SCHED]: Return ENOENT if action module is unavailable
-%patch30430 -p1
+%patch30429 -p1
 # [PKT_SCHED]: Fix error handling while dumping actions
-%patch30431 -p1
+%patch30430 -p1
 # wireless: add acx driver
-%patch30432 -p1
+%patch30431 -p1
 # acxsm: merge from acx 0.3.32
-%patch30433 -p1
+%patch30432 -p1
 # tiacx: Let only ACX_PCI/ACX_USB be user-visible
-%patch30434 -p1
+%patch30433 -p1
 # tiacx: revert "neither PCI nor USB is selected" change
-%patch30435 -p1
+%patch30434 -p1
 # tiacx: implement much more flexible firmware statistics parsing
-%patch30436 -p1
+%patch30435 -p1
 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
-%patch30437 -p1
+%patch30436 -p1
 # tiacx: fix breakage of "Get rid of circular list of adev's"
-%patch30438 -p1
+%patch30437 -p1
 # tiacx: split module into acx-common + acx-pci + acx-usb
-%patch30439 -p1
+%patch30438 -p1
 # fix tiacx on alpha
-%patch30440 -p1
+%patch30439 -p1
 # tiacx: fix attribute packed warnings
-%patch30441 -p1
+%patch30440 -p1
 # tiacx: pci build fix
-%patch30442 -p1
+%patch30441 -p1
 # tiacx: support ia64
-%patch30443 -p1
+%patch30442 -p1
 # [NET]: Fix network device interface printk message priority
-%patch30444 -p1
+%patch30443 -p1
 # [TG3]: add amd8131 to "write reorder" chipsets
-%patch30445 -p1
+%patch30444 -p1
 # [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
-%patch30446 -p1
+%patch30445 -p1
 # [NET]: Fix IPv4/DECnet routing rule dumping
-%patch30447 -p1
+%patch30446 -p1
 # [PKT_SCHED]: act_api: Fix module leak while flushing actions
-%patch30448 -p1
+%patch30447 -p1
 # [ATM] net/atm/clip.c: fix PROC_FS=n compile
-%patch30449 -p1
+%patch30448 -p1
 # [AX.25]: Use kzalloc
-%patch30450 -p1
+%patch30449 -p1
 # bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
-%patch30451 -p1
+%patch30450 -p1
 # zd1211rw: usb_clear_halt not allowed in IRQ context
-%patch30452 -p1
+%patch30451 -p1
 # bcm43xx: improved statistics
-%patch30453 -p1
+%patch30452 -p1
 # zd1211rw: Add Sagem device ID's
-%patch30454 -p1
+%patch30453 -p1
 # tiacx - don't use UTS_RELEASE
-%patch30455 -p1
+%patch30454 -p1
 # release_firmware() fixes
-%patch30456 -p1
+%patch30455 -p1
 # [AX.25]: Get rid of the last volatile.
-%patch30457 -p1
+%patch30456 -p1
 # [IPV4] inetpeer: Get rid of volatile from peer_total
-%patch30458 -p1
+%patch30457 -p1
 # [TCP]: Remove TCP Compound
-%patch30459 -p1
+%patch30458 -p1
 # [DCCP]: Fix sparse warnings.
-%patch30460 -p1
+%patch30459 -p1
 # [IPV6]: order addresses by scope
-%patch30461 -p1
+%patch30460 -p1
 # [AX.25]: Fix locking of ax25 protocol function list.
-%patch30462 -p1
+%patch30461 -p1
 # [NETROM]: Drop lock before calling nr_destroy_socket
-%patch30463 -p1
+%patch30462 -p1
 # [TCP] tcp_highspeed: Fix AI updates.
-%patch30464 -p1
+%patch30463 -p1
 # [IPV6]: Use ipv6_addr_src_scope for link address sorting.
-%patch30465 -p1
+%patch30464 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3155,7 +3152,6 @@
 - skge: version 1.6
 - SUNRPC: select privileged port numbers at random
 - SUNRPC: NFS_ROOT always uses the same XIDs
-- VFS: Unexport do_kern_mount() and clean up simple_pin_fs()
 - RPC: Allow struc xdr_stream to read the page section of an xdr_buf
 - e1000: prevent statistics from garbling during bus resets
 - forcedeth config: tso cleanup



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:20:20 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.12,1.13
Message-ID: <200607132020.k6DKKKPW008705@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8677

Modified Files:
	libnotify.spec 
Log Message:
Add missing BR


Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libnotify.spec	12 Jul 2006 06:54:48 -0000	1.12
+++ libnotify.spec	13 Jul 2006 20:20:18 -0000	1.13
@@ -4,14 +4,14 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.0
-Release: 1.1 
+Release: 2
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: libtool
-BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: glib2-devel >= %{glib2_version} dbus-devel gtk2-devel
 Requires: glib2 >= %{glib2_version}
 Requires: desktop-notification-daemon
 
@@ -70,8 +70,9 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.0-1.1
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 0.4.0-2
 - rebuild
+- add missing brs
 
 * Fri May 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-1
 - Update to 0.4.0



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:22:56 -0400
Subject: rpms/libgsf/devel libgsf.spec,1.32,1.33
Message-ID: <200607132022.k6DKMuc5009666@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9644

Modified Files:
	libgsf.spec 
Log Message:
Add missing BR


Index: libgsf.spec
===================================================================
RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgsf.spec	12 Jul 2006 06:52:59 -0000	1.32
+++ libgsf.spec	13 Jul 2006 20:22:53 -0000	1.33
@@ -1,14 +1,14 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.1
-Release: 4.1
+Release: 5
 Group: System Environment/Libraries
 License: LGPL
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: glib2 >= 2.2.0
 BuildRequires: glib2-devel >= 2.2.0, perl-XML-Parser
-BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel
+BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
 Obsoletes: libgsf113
 
 %description
@@ -65,8 +65,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.14.1-4.1
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 1.14.1-5
 - rebuild
+- add missing br gettext
 
 * Mon May 29 2006 Caolan McNamara <caolanm at redhat.com> 1.14.1-4
 - rh#193417# Add BuildRequires perl-XML-Parser



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:30:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:30:56 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.20,1.21
Message-ID: <200607132030.k6DKUusC021951@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch 
Log Message:
* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-3
- Turn off auditallow on setting booleans


policy-20060608.patch:
 global_tunables                  |    7 +
 modules/admin/bootloader.te      |    3 
 modules/admin/consoletype.te     |    7 +
 modules/admin/sudo.if            |    2 
 modules/admin/usermanage.te      |    4 
 modules/bgp.mod                  |binary
 modules/bgp.pp                   |binary
 modules/bgp.te                   |   12 ++
 modules/kernel/corenetwork.te.in |    4 
 modules/kernel/devices.fc        |    1 
 modules/kernel/files.fc          |    1 
 modules/kernel/kernel.if         |   38 +++++++
 modules/kernel/selinux.if        |    1 
 modules/kernel/storage.fc        |    1 
 modules/services/automount.te    |    8 +
 modules/services/avahi.te        |    1 
 modules/services/bluetooth.if    |   23 ++++
 modules/services/bluetooth.te    |    2 
 modules/services/cups.te         |    1 
 modules/services/cyrus.te        |    1 
 modules/services/dbus.te         |    2 
 modules/services/dovecot.fc      |    1 
 modules/services/dovecot.te      |   10 +
 modules/services/hal.fc          |    1 
 modules/services/hal.te          |    7 +
 modules/services/nscd.te         |    2 
 modules/services/openvpn.te      |    6 +
 modules/services/pegasus.if      |   31 ++++++
 modules/services/pegasus.te      |    5 
 modules/services/squid.te        |    2 
 modules/services/tftp.te         |    1 
 modules/services/xserver.if      |   22 ++++
 modules/services/zebra.te        |    2 
 modules/system/getty.fc          |    1 
 modules/system/getty.te          |    3 
 modules/system/hostname.te       |    5 
 modules/system/init.if           |    7 -
 modules/system/selinuxutil.te    |   17 ++-
 modules/system/setrans.te        |    5 
 modules/system/sysnetwork.te     |    1 
 modules/system/unconfined.fc     |    1 
 modules/system/unconfined.te     |    8 -
 modules/system/userdomain.if     |  201 ++++++++++++++++++++++++---------------
 modules/system/userdomain.te     |   32 ++----
 44 files changed, 364 insertions(+), 126 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policy-20060608.patch	13 Jul 2006 14:24:05 -0000	1.20
+++ policy-20060608.patch	13 Jul 2006 20:30:41 -0000	1.21
@@ -52,6 +52,18 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.3.2/policy/modules/admin/sudo.if
+--- nsaserefpolicy/policy/modules/admin/sudo.if	2006-04-04 18:06:38.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/sudo.if	2006-07-13 10:52:18.000000000 -0400
+@@ -57,7 +57,7 @@
+ 	#
+ 
+ 	# Use capabilities.
+-	allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_resource };
++	allow $1_sudo_t self:capability { audit_write fowner setuid setgid dac_override sys_resource };
+ 	allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ 	allow $1_sudo_t self:process { setexec setrlimit };
+ 	allow $1_sudo_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.2/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-06-20 09:54:00.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/admin/usermanage.te	2006-07-12 17:28:02.000000000 -0400
@@ -112,6 +124,17 @@
  network_port(zope, tcp,8021,s0)
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.2/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-29 11:17:34.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/devices.fc	2006-07-13 14:41:33.000000000 -0400
+@@ -89,6 +89,7 @@
+ 
+ /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
+ 
++/dev/usbdev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ /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)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-09 05:52:17.000000000 -0400
@@ -179,6 +202,17 @@
  	}
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.2/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-02-01 17:06:11.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/kernel/storage.fc	2006-07-13 11:30:44.000000000 -0400
+@@ -23,6 +23,7 @@
+ /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
++/dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-10 09:06:39.000000000 -0400
@@ -267,7 +301,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.2/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-12 16:45:19.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-13 10:56:17.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -287,6 +321,60 @@
  
  allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.2/policy/modules/services/dbus.te
+--- nsaserefpolicy/policy/modules/services/dbus.te	2006-07-07 07:35:31.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dbus.te	2006-07-13 10:54:29.000000000 -0400
+@@ -30,7 +30,7 @@
+ 
+ # dac_override: /var/run/dbus is owned by messagebus on Debian
+ # cjp: dac_override should probably go in a distro_debian
+-allow system_dbusd_t self:capability { dac_override setgid setpcap setuid };
++allow system_dbusd_t self:capability { audit_write dac_override setgid setpcap setuid };
+ dontaudit system_dbusd_t self:capability sys_tty_config;
+ allow system_dbusd_t self:process { getattr signal_perms setcap };
+ allow system_dbusd_t self:fifo_file { read write };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.2/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2005-10-21 23:17:31.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dovecot.fc	2006-07-13 11:33:34.000000000 -0400
+@@ -29,6 +29,7 @@
+ /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
+ 
+ /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
++/var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_lib_t,s0)
+ 
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.2/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dovecot.te	2006-07-13 11:33:09.000000000 -0400
+@@ -30,6 +30,10 @@
+ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
+ role system_r types dovecot_auth_t;
+ 
++# /var/lib/dovecot holds SSL parameters file
++type dovecot_var_lib_t;
++files_type(dovecot_var_lib_t) 
++
+ ########################################
+ #
+ # dovecot local policy
+@@ -186,6 +190,11 @@
+ 
+ sysnet_dns_name_resolve(dovecot_auth_t)
+ 
++# Allow dovecot to create and read SSL parameters file
++files_search_var_lib(dovecot_t)
++allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
++allow dovecot_t dovecot_var_lib_t:file manage_file_perms;
++
+ optional_policy(`
+ 	kerberos_use(dovecot_auth_t)
+ ')
+@@ -201,3 +210,4 @@
+ optional_policy(`
+ 	nscd_socket_use(dovecot_auth_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-09 05:52:17.000000000 -0400
@@ -297,7 +385,16 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-13 10:55:51.000000000 -0400
+@@ -22,7 +22,7 @@
+ #
+ 
+ # execute openvt which needs setuid
+-allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
++allow hald_t self:capability { audit_write chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
+ dontaudit hald_t self:capability sys_tty_config;
+ allow hald_t self:process signal_perms;
+ allow hald_t self:fifo_file rw_file_perms;
 @@ -163,6 +163,10 @@
  ')
  
@@ -314,6 +411,48 @@
  	vbetool_domtrans(hald_t)
  ')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.3.2/policy/modules/services/nscd.te
+--- nsaserefpolicy/policy/modules/services/nscd.te	2006-06-08 08:45:58.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/nscd.te	2006-07-13 10:55:24.000000000 -0400
+@@ -28,7 +28,7 @@
+ # Local policy
+ #
+ 
+-allow nscd_t self:capability { kill setgid setuid };
++allow nscd_t self:capability { audit_write kill setgid setuid };
+ dontaudit nscd_t self:capability sys_tty_config;
+ allow nscd_t self:process { getattr setsched signal_perms };
+ allow nscd_t self:fifo_file { read write };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.2/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-21 16:21:03.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/openvpn.te	2006-07-13 10:27:44.000000000 -0400
+@@ -33,6 +33,10 @@
+ allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow openvpn_t self:udp_socket create_socket_perms;
+ allow openvpn_t self:tcp_socket create_socket_perms;
++allow openvpn_t self:netlink_route_socket r_netlink_socket_perms;
++
++# Need to interact with terminals if config option "auth-user-pass" is used
++term_use_generic_ptys(openvpn_t)
+ 
+ allow openvpn_t openvpn_etc_t:dir r_dir_perms;
+ allow openvpn_t openvpn_etc_t:file r_file_perms;
+@@ -67,6 +71,7 @@
+ corenet_sendrecv_openvpn_server_packets(openvpn_t)
+ corenet_rw_tun_tap_dev(openvpn_t)
+ 
++dev_search_sysfs(openvpn_t)
+ dev_read_rand(openvpn_t)
+ dev_read_urand(openvpn_t)
+ 
+@@ -80,6 +85,7 @@
+ 
+ miscfiles_read_localization(openvpn_t)
+ 
++sysnet_dns_name_resolve(openvpn_t)
+ sysnet_exec_ifconfig(openvpn_t)
+ 
+ ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-09 05:52:17.000000000 -0400
@@ -510,7 +649,16 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-11 16:22:45.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-13 10:50:32.000000000 -0400
+@@ -239,7 +239,7 @@
+ # Newrole local policy
+ #
+ 
+-allow newrole_t self:capability { fowner setuid setgid dac_override };
++allow newrole_t self:capability { audit_write fowner setuid setgid dac_override };
+ allow newrole_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
+ allow newrole_t self:process setexec;
+ allow newrole_t self:fd use;
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -529,7 +677,21 @@
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
  kernel_read_system_state(restorecond_t)
-@@ -538,16 +542,23 @@
+@@ -479,7 +483,7 @@
+ 
+ ifdef(`targeted_policy',`',`
+ 	allow run_init_t self:process setexec;
+-	allow run_init_t self:capability setuid;
++	allow run_init_t self:capability { audit_write setuid };
+ 	allow run_init_t self:fifo_file rw_file_perms;
+ 	allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
+ 
+@@ -534,20 +538,27 @@
+ # semodule local policy
+ #
+ 
+-allow semanage_t self:capability dac_override;
++allow semanage_t self:capability { audit_write dac_override };
  allow semanage_t self:unix_stream_socket create_stream_socket_perms;
  allow semanage_t self:unix_dgram_socket create_socket_perms;
  allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
@@ -565,6 +727,17 @@
 +	rpm_use_script_fds(setrans_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.2/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-06-13 07:03:48.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/sysnetwork.te	2006-07-13 11:10:37.000000000 -0400
+@@ -277,6 +277,7 @@
+ # for /sbin/ip
+ allow ifconfig_t self:packet_socket create_socket_perms;
+ allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
++allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
+ allow ifconfig_t self:tcp_socket { create ioctl };
+ files_read_etc_files(ifconfig_t);
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.2/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-21 16:21:04.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-11 15:59:13.000000000 -0400



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:30:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:30:59 -0400
Subject: rpms/mkinitrd/devel sources,1.132,1.133
Message-ID: <200607132030.k6DKUxUh021991@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21948

Modified Files:
	sources 
Log Message:
- and again



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- sources	13 Jul 2006 20:10:11 -0000	1.132
+++ sources	13 Jul 2006 20:30:56 -0000	1.133
@@ -1,2 +1,2 @@
 bc0464d3ecb741a9c19cbdfdadf5cd83  bdevid-0.1.tar.bz2
-6880781b997e07588f42ba3c0c37502a  mkinitrd-5.0.47.tar.bz2
+456bbb7b91b8f79815a745c14d8e7b8e  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:31:44 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2145.2.2,
	1.2145.2.3 2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt,
	1.1.2.1,
	NONE 3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt,
	1.1.2.1, NONE
Message-ID: <200607132031.k6DKVi2k022073@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc5-6-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc5-6-branch
	2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt 
	3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2145.2.2
retrieving revision 1.2145.2.3
diff -u -r1.2145.2.2 -r1.2145.2.3
--- kernel-2.6.spec	13 Jul 2006 20:17:45 -0000	1.2145.2.2
+++ kernel-2.6.spec	13 Jul 2006 20:31:41 -0000	1.2145.2.3
@@ -676,209 +676,207 @@
 Patch30259: 2266-SPARC-Port-sparc64-in-kernel-device-tree-code-to-sparc32.txt
 Patch30260: 2273-NET-sunlance-Convert-to-new-SBUS-driver-framework.txt
 Patch30261: 2274-NET-sunbmac-Convert-over-to-new-SBUS-device-framework.txt
-Patch30262: 2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt
-Patch30263: 2276-NET-myri_sbus-Convert-to-new-SBUS-device-layer.txt
-Patch30264: 2277-NET-myri_sbus-Kill-unused-next_module-struct-member.txt
-Patch30265: 2278-NET-sunhme-Kill-useless-loop-over-sdevs-in-quattro_sbus_find.txt
-Patch30266: 2599-m68k-cleanup-generic-irq-names.txt
-Patch30267: 2619-Define-__raw_get_cpu_var-and-use-it.txt
-Patch30268: 2713-wan-sdla-section-fixes.txt
-Patch30269: 2769-irda-usb-printk-fix.txt
-Patch30270: 2794-m68knommu-532x-FEC-eth-struct-map.txt
-Patch30271: 2850-TIPC-Improved-tolerance-to-promiscuous-mode-interface.txt
-Patch30272: 2851-TIPC-Prevent-name-table-corruption-if-no-room-for-new-publication.txt
-Patch30273: 2852-TIPC-Use-correct-upper-bound-when-validating-network-zone-number.txt
-Patch30274: 2853-TIPC-Corrected-potential-misuse-of-tipc_media_addr-structure.txt
-Patch30275: 2854-TIPC-Allow-ports-to-receive-multicast-messages-through-native-API.txt
-Patch30276: 2855-TIPC-Links-now-validate-destination-node-specified-by-incoming-messages.txt
-Patch30277: 2856-TIPC-Multicast-link-failure-now-resets-all-links-to-nacking-node.txt
-Patch30278: 2857-TIPC-Allow-compilation-when-CONFIG_TIPC_DEBUG-is-not-set.txt
-Patch30279: 2858-TIPC-Fix-for-NULL-pointer-dereference.txt
-Patch30280: 2859-TIPC-Fixed-privilege-checking-typo-in-dest_name_check.txt
-Patch30281: 2860-TIPC-Fix-misleading-comment-in-buf_discard-routine.txt
-Patch30282: 2861-TIPC-Added-support-for-MODULE_VERSION-capability.txt
-Patch30283: 2862-TIPC-Validate-entire-interface-name-when-locating-bearer-to-enable.txt
-Patch30284: 2863-TIPC-Non-operation-affecting-corrections-to-comments-function-definitions.txt
-Patch30285: 2864-TIPC-Fixed-connect-to-detect-a-dest-address-that-is-missing-or-too-short.txt
-Patch30286: 2865-TIPC-Implied-connect-now-saves-dest-name-for-retrieval-as-ancillary-data.txt
-Patch30287: 2866-TIPC-Can-now-return-destination-name-of-form-0-x-y-via-ancillary-data.txt
-Patch30288: 2867-TIPC-Connected-send-now-checks-socket-state-when-retrying-congested-send.txt
-Patch30289: 2868-TIPC-Stream-socket-send-indicates-partial-success-if-data-partially-sent.txt
-Patch30290: 2869-TIPC-Improved-performance-of-error-checking-during-socket-creation.txt
-Patch30291: 2870-TIPC-recvmsg-now-returns-TIPC-ancillary-data-using-correct-level-SOL_TIPC.txt
-Patch30292: 2871-TIPC-Simplify-code-for-returning-partial-success-of-stream-send-request.txt
-Patch30293: 2872-TIPC-Optimized-argument-validation-done-by-connect.txt
-Patch30294: 2873-TIPC-Withdrawing-all-names-from-nameless-port-now-returns-success-not-error.txt
-Patch30295: 2874-TIPC-Added-missing-warning-for-out-of-memory-condition.txt
-Patch30296: 2875-TIPC-Fixed-memory-leak-in-tipc_link_send-when-destination-is-unreachable.txt
-Patch30297: 2876-TIPC-Disallow-config-operations-that-aren-t-supported-in-certain-modes.txt
-Patch30298: 2877-TIPC-First-phase-of-assert-cleanup.txt
-Patch30299: 2878-TIPC-Enhanced-cleaned-up-system-messages-fixed-2-obscure-memory-leaks.txt
-Patch30300: 2879-TIPC-Fixed-link-switchover-bugs.txt
-Patch30301: 2880-TIPC-Get-rid-of-dynamically-allocated-arrays-in-broadcast-code.txt
-Patch30302: 2881-TIPC-Fix-incorrect-correction-to-discovery-timer-frequency-computation.txt
-Patch30303: 2885-NET-skb_find_text-ignores-to-argument.txt
-Patch30304: 2886-ATM-atm-mpc.c-warning-fix.txt
-Patch30305: 2887-IRDA-add-some-IBM-think-pads.txt
-Patch30306: 2889-NET-netpoll-break-recursive-loop-in-netpoll-rx-path.txt
-Patch30307: 2890-NETROM-Fix-possible-null-pointer-dereference.txt
-Patch30308: 2934-spelling-fixes.txt
-Patch30309: 2949-net-rxrpc-use-list_move.txt
-Patch30310: 2950-drivers-use-list_move.txt
-Patch30311: 3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt
-Patch30312: 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30313: 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30314: 3390-DM9000-better-checks-for-platform-resources.txt
-Patch30315: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
-Patch30316: 3392-DM9000-do-no-re-init-spin-lock.txt
-Patch30317: 3393-DM9000-minor-code-cleanups.txt
-Patch30318: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
-Patch30319: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
-Patch30320: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
-Patch30321: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
-Patch30322: 3399-netdrvr-natsemi-minor-cleanups.txt
-Patch30323: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
-Patch30324: 3460-e1000-fix-loopback-ethtool-test.txt
-Patch30325: 3461-e1000-rework-driver-hardware-reset-locking.txt
-Patch30326: 3462-e1000-Make-PHY-powerup-down-a-function.txt
-Patch30327: 3463-e1000-fix-CONFIG_PM-blocks.txt
-Patch30328: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
-Patch30329: 3465-e1000-add-smart-power-down-code.txt
-Patch30330: 3467-e1000-recycle-skb.txt
-Patch30331: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
-Patch30332: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
-Patch30333: 3470-e1000-disable-CRC-stripping-workaround.txt
-Patch30334: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
-Patch30335: 3472-e1000-M88-PHY-workaround.txt
-Patch30336: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
-Patch30337: 3474-e1000-disable-ERT.txt
-Patch30338: 3475-e1000-add-ich8lan-core-functions.txt
-Patch30339: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
-Patch30340: 3478-e1000-add-ich8lan-device-ID-s.txt
-Patch30341: 3479-e1000-increase-version-to-7.1.9-k2.txt
-Patch30342: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
-Patch30343: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
-Patch30344: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
-Patch30345: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
-Patch30346: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
-Patch30347: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
-Patch30348: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
-Patch30349: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
-Patch30350: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
-Patch30351: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
-Patch30352: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
-Patch30353: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
-Patch30354: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
-Patch30355: 4007-AF_UNIX-Datagram-getpeersec.txt
-Patch30356: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
-Patch30357: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
-Patch30358: 4015-BNX2-Turn-off-link-during-shutdown.txt
-Patch30359: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
-Patch30360: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
-Patch30361: 4019-XFRM-unexport-xfrm_state_mtu.txt
-Patch30362: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
-Patch30363: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
-Patch30364: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
-Patch30365: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
-Patch30366: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
-Patch30367: 4062-typo-fixes-bandwith-bandwidth.txt
-Patch30368: 4066-typo-fixes-infomation-information.txt
-Patch30369: 4067-typo-fixes-occuring-occurring.txt
-Patch30370: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
-Patch30371: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
-Patch30372: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
-Patch30373: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
-Patch30374: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
-Patch30375: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
-Patch30376: 4172-com20020_cs-more-device-support.txt
-Patch30377: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
-Patch30378: 4178-TG3-Add-rx-BD-workaround.txt
-Patch30379: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
-Patch30380: 4181-TG3-Update-version-and-reldate.txt
-Patch30381: 4183-IPV6-Remove-redundant-length-check-on-input.txt
-Patch30382: 4417-bcm43xx-netlink-deadlock-fix.txt
-Patch30383: 4516-forcedeth-typecast-cleanup.txt
-Patch30384: 4523-AF_UNIX-datagram-getpeersec-fix.txt
-Patch30385: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
-Patch30386: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
-Patch30387: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
-Patch30388: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
-Patch30389: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
-Patch30390: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
-Patch30391: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
-Patch30392: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
-Patch30393: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
-Patch30394: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
-Patch30395: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
-Patch30396: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
-Patch30397: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
-Patch30398: 4572-netdrvr-epic100-minor-cleanups.txt
-Patch30399: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
-Patch30400: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
-Patch30401: 4577-netdrvr-via-velocity-misc.-cleanups.txt
-Patch30402: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
-Patch30403: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
-Patch30404: 4581-Add-two-PLX-device-IDs.txt
-Patch30405: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
-Patch30406: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
-Patch30407: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
-Patch30408: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
-Patch30409: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
-Patch30410: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
-Patch30411: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
-Patch30412: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
-Patch30413: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
-Patch30414: 4594-zd1211rw-disable-TX-queue-during-stop.txt
-Patch30415: 4595-Add-support-for-the-Cicada-8201-PHY.txt
-Patch30416: 4596-pcnet32-Fix-Section-mismatch-error.txt
-Patch30417: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
-Patch30418: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
-Patch30419: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
-Patch30420: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
-Patch30421: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
-Patch30422: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
-Patch30423: 4604-NI5010-netcard-cleanup.txt
-Patch30424: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
-Patch30425: 4606-Fix-freeing-of-net-device.txt
-Patch30426: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
-Patch30427: 4612-8139too-deadlock-fix.txt
-Patch30428: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
-Patch30429: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
-Patch30430: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
-Patch30431: 4646-wireless-add-acx-driver.txt
-Patch30432: 4647-acxsm-merge-from-acx-0.3.32.txt
-Patch30433: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
-Patch30434: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
-Patch30435: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
-Patch30436: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
-Patch30437: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
-Patch30438: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
-Patch30439: 4654-fix-tiacx-on-alpha.txt
-Patch30440: 4655-tiacx-fix-attribute-packed-warnings.txt
-Patch30441: 4656-tiacx-pci-build-fix.txt
-Patch30442: 4657-tiacx-support-ia64.txt
-Patch30443: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
-Patch30444: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
-Patch30445: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
-Patch30446: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
-Patch30447: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
-Patch30448: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
-Patch30449: 4673-AX.25-Use-kzalloc.txt
-Patch30450: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
-Patch30451: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
-Patch30452: 4691-bcm43xx-improved-statistics.txt
-Patch30453: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
-Patch30454: 4693-tiacx-don-t-use-UTS_RELEASE.txt
-Patch30455: 4716-release_firmware-fixes.txt
-Patch30456: 4821-AX.25-Get-rid-of-the-last-volatile.txt
-Patch30457: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
-Patch30458: 4824-TCP-Remove-TCP-Compound.txt
-Patch30459: 4825-DCCP-Fix-sparse-warnings.txt
-Patch30460: 4834-IPV6-order-addresses-by-scope.txt
-Patch30461: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
-Patch30462: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
-Patch30463: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
-Patch30464: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
+Patch30262: 2276-NET-myri_sbus-Convert-to-new-SBUS-device-layer.txt
+Patch30263: 2277-NET-myri_sbus-Kill-unused-next_module-struct-member.txt
+Patch30264: 2278-NET-sunhme-Kill-useless-loop-over-sdevs-in-quattro_sbus_find.txt
+Patch30265: 2599-m68k-cleanup-generic-irq-names.txt
+Patch30266: 2619-Define-__raw_get_cpu_var-and-use-it.txt
+Patch30267: 2713-wan-sdla-section-fixes.txt
+Patch30268: 2769-irda-usb-printk-fix.txt
+Patch30269: 2794-m68knommu-532x-FEC-eth-struct-map.txt
+Patch30270: 2850-TIPC-Improved-tolerance-to-promiscuous-mode-interface.txt
+Patch30271: 2851-TIPC-Prevent-name-table-corruption-if-no-room-for-new-publication.txt
+Patch30272: 2852-TIPC-Use-correct-upper-bound-when-validating-network-zone-number.txt
+Patch30273: 2853-TIPC-Corrected-potential-misuse-of-tipc_media_addr-structure.txt
+Patch30274: 2854-TIPC-Allow-ports-to-receive-multicast-messages-through-native-API.txt
+Patch30275: 2855-TIPC-Links-now-validate-destination-node-specified-by-incoming-messages.txt
+Patch30276: 2856-TIPC-Multicast-link-failure-now-resets-all-links-to-nacking-node.txt
+Patch30277: 2857-TIPC-Allow-compilation-when-CONFIG_TIPC_DEBUG-is-not-set.txt
+Patch30278: 2858-TIPC-Fix-for-NULL-pointer-dereference.txt
+Patch30279: 2859-TIPC-Fixed-privilege-checking-typo-in-dest_name_check.txt
+Patch30280: 2860-TIPC-Fix-misleading-comment-in-buf_discard-routine.txt
+Patch30281: 2861-TIPC-Added-support-for-MODULE_VERSION-capability.txt
+Patch30282: 2862-TIPC-Validate-entire-interface-name-when-locating-bearer-to-enable.txt
+Patch30283: 2863-TIPC-Non-operation-affecting-corrections-to-comments-function-definitions.txt
+Patch30284: 2864-TIPC-Fixed-connect-to-detect-a-dest-address-that-is-missing-or-too-short.txt
+Patch30285: 2865-TIPC-Implied-connect-now-saves-dest-name-for-retrieval-as-ancillary-data.txt
+Patch30286: 2866-TIPC-Can-now-return-destination-name-of-form-0-x-y-via-ancillary-data.txt
+Patch30287: 2867-TIPC-Connected-send-now-checks-socket-state-when-retrying-congested-send.txt
+Patch30288: 2868-TIPC-Stream-socket-send-indicates-partial-success-if-data-partially-sent.txt
+Patch30289: 2869-TIPC-Improved-performance-of-error-checking-during-socket-creation.txt
+Patch30290: 2870-TIPC-recvmsg-now-returns-TIPC-ancillary-data-using-correct-level-SOL_TIPC.txt
+Patch30291: 2871-TIPC-Simplify-code-for-returning-partial-success-of-stream-send-request.txt
+Patch30292: 2872-TIPC-Optimized-argument-validation-done-by-connect.txt
+Patch30293: 2873-TIPC-Withdrawing-all-names-from-nameless-port-now-returns-success-not-error.txt
+Patch30294: 2874-TIPC-Added-missing-warning-for-out-of-memory-condition.txt
+Patch30295: 2875-TIPC-Fixed-memory-leak-in-tipc_link_send-when-destination-is-unreachable.txt
+Patch30296: 2876-TIPC-Disallow-config-operations-that-aren-t-supported-in-certain-modes.txt
+Patch30297: 2877-TIPC-First-phase-of-assert-cleanup.txt
+Patch30298: 2878-TIPC-Enhanced-cleaned-up-system-messages-fixed-2-obscure-memory-leaks.txt
+Patch30299: 2879-TIPC-Fixed-link-switchover-bugs.txt
+Patch30300: 2880-TIPC-Get-rid-of-dynamically-allocated-arrays-in-broadcast-code.txt
+Patch30301: 2881-TIPC-Fix-incorrect-correction-to-discovery-timer-frequency-computation.txt
+Patch30302: 2885-NET-skb_find_text-ignores-to-argument.txt
+Patch30303: 2886-ATM-atm-mpc.c-warning-fix.txt
+Patch30304: 2887-IRDA-add-some-IBM-think-pads.txt
+Patch30305: 2889-NET-netpoll-break-recursive-loop-in-netpoll-rx-path.txt
+Patch30306: 2890-NETROM-Fix-possible-null-pointer-dereference.txt
+Patch30307: 2934-spelling-fixes.txt
+Patch30308: 2949-net-rxrpc-use-list_move.txt
+Patch30309: 2950-drivers-use-list_move.txt
+Patch30310: 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt
+Patch30311: 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt
+Patch30312: 3390-DM9000-better-checks-for-platform-resources.txt
+Patch30313: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
+Patch30314: 3392-DM9000-do-no-re-init-spin-lock.txt
+Patch30315: 3393-DM9000-minor-code-cleanups.txt
+Patch30316: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
+Patch30317: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
+Patch30318: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
+Patch30319: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
+Patch30320: 3399-netdrvr-natsemi-minor-cleanups.txt
+Patch30321: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
+Patch30322: 3460-e1000-fix-loopback-ethtool-test.txt
+Patch30323: 3461-e1000-rework-driver-hardware-reset-locking.txt
+Patch30324: 3462-e1000-Make-PHY-powerup-down-a-function.txt
+Patch30325: 3463-e1000-fix-CONFIG_PM-blocks.txt
+Patch30326: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
+Patch30327: 3465-e1000-add-smart-power-down-code.txt
+Patch30328: 3467-e1000-recycle-skb.txt
+Patch30329: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
+Patch30330: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
+Patch30331: 3470-e1000-disable-CRC-stripping-workaround.txt
+Patch30332: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
+Patch30333: 3472-e1000-M88-PHY-workaround.txt
+Patch30334: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
+Patch30335: 3474-e1000-disable-ERT.txt
+Patch30336: 3475-e1000-add-ich8lan-core-functions.txt
+Patch30337: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
+Patch30338: 3478-e1000-add-ich8lan-device-ID-s.txt
+Patch30339: 3479-e1000-increase-version-to-7.1.9-k2.txt
+Patch30340: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
+Patch30341: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
+Patch30342: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
+Patch30343: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
+Patch30344: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
+Patch30345: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
+Patch30346: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
+Patch30347: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
+Patch30348: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
+Patch30349: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
+Patch30350: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
+Patch30351: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
+Patch30352: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
+Patch30353: 4007-AF_UNIX-Datagram-getpeersec.txt
+Patch30354: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
+Patch30355: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
+Patch30356: 4015-BNX2-Turn-off-link-during-shutdown.txt
+Patch30357: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
+Patch30358: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
+Patch30359: 4019-XFRM-unexport-xfrm_state_mtu.txt
+Patch30360: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
+Patch30361: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
+Patch30362: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
+Patch30363: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
+Patch30364: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
+Patch30365: 4062-typo-fixes-bandwith-bandwidth.txt
+Patch30366: 4066-typo-fixes-infomation-information.txt
+Patch30367: 4067-typo-fixes-occuring-occurring.txt
+Patch30368: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
+Patch30369: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
+Patch30370: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
+Patch30371: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
+Patch30372: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
+Patch30373: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
+Patch30374: 4172-com20020_cs-more-device-support.txt
+Patch30375: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
+Patch30376: 4178-TG3-Add-rx-BD-workaround.txt
+Patch30377: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
+Patch30378: 4181-TG3-Update-version-and-reldate.txt
+Patch30379: 4183-IPV6-Remove-redundant-length-check-on-input.txt
+Patch30380: 4417-bcm43xx-netlink-deadlock-fix.txt
+Patch30381: 4516-forcedeth-typecast-cleanup.txt
+Patch30382: 4523-AF_UNIX-datagram-getpeersec-fix.txt
+Patch30383: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
+Patch30384: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
+Patch30385: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
+Patch30386: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
+Patch30387: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
+Patch30388: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
+Patch30389: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
+Patch30390: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
+Patch30391: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
+Patch30392: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
+Patch30393: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
+Patch30394: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
+Patch30395: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
+Patch30396: 4572-netdrvr-epic100-minor-cleanups.txt
+Patch30397: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
+Patch30398: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
+Patch30399: 4577-netdrvr-via-velocity-misc.-cleanups.txt
+Patch30400: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
+Patch30401: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
+Patch30402: 4581-Add-two-PLX-device-IDs.txt
+Patch30403: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
+Patch30404: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
+Patch30405: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
+Patch30406: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
+Patch30407: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
+Patch30408: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
+Patch30409: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
+Patch30410: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
+Patch30411: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
+Patch30412: 4594-zd1211rw-disable-TX-queue-during-stop.txt
+Patch30413: 4595-Add-support-for-the-Cicada-8201-PHY.txt
+Patch30414: 4596-pcnet32-Fix-Section-mismatch-error.txt
+Patch30415: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
+Patch30416: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
+Patch30417: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
+Patch30418: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
+Patch30419: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
+Patch30420: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
+Patch30421: 4604-NI5010-netcard-cleanup.txt
+Patch30422: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
+Patch30423: 4606-Fix-freeing-of-net-device.txt
+Patch30424: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
+Patch30425: 4612-8139too-deadlock-fix.txt
+Patch30426: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
+Patch30427: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
+Patch30428: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
+Patch30429: 4646-wireless-add-acx-driver.txt
+Patch30430: 4647-acxsm-merge-from-acx-0.3.32.txt
+Patch30431: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
+Patch30432: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
+Patch30433: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
+Patch30434: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
+Patch30435: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
+Patch30436: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
+Patch30437: 4654-fix-tiacx-on-alpha.txt
+Patch30438: 4655-tiacx-fix-attribute-packed-warnings.txt
+Patch30439: 4656-tiacx-pci-build-fix.txt
+Patch30440: 4657-tiacx-support-ia64.txt
+Patch30441: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
+Patch30442: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
+Patch30443: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
+Patch30444: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
+Patch30445: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
+Patch30446: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
+Patch30447: 4673-AX.25-Use-kzalloc.txt
+Patch30448: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
+Patch30449: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
+Patch30450: 4691-bcm43xx-improved-statistics.txt
+Patch30451: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
+Patch30452: 4693-tiacx-don-t-use-UTS_RELEASE.txt
+Patch30453: 4716-release_firmware-fixes.txt
+Patch30454: 4821-AX.25-Get-rid-of-the-last-volatile.txt
+Patch30455: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
+Patch30456: 4824-TCP-Remove-TCP-Compound.txt
+Patch30457: 4825-DCCP-Fix-sparse-warnings.txt
+Patch30458: 4834-IPV6-order-addresses-by-scope.txt
+Patch30459: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
+Patch30460: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
+Patch30461: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
+Patch30462: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2021,412 +2019,408 @@
 %patch30260 -p1
 # [NET] sunbmac: Convert over to new SBUS device framework.
 %patch30261 -p1
-# [NET] sunqe: Convert to new SBUS driver layer.
-%patch30262 -p1
 # [NET] myri_sbus: Convert to new SBUS device layer.
-%patch30263 -p1
+%patch30262 -p1
 # [NET] myri_sbus: Kill unused next_module struct member.
-%patch30264 -p1
+%patch30263 -p1
 # [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
-%patch30265 -p1
+%patch30264 -p1
 # m68k: cleanup generic irq names
-%patch30266 -p1
+%patch30265 -p1
 # Define __raw_get_cpu_var and use it
-%patch30267 -p1
+%patch30266 -p1
 # wan/sdla section fixes
-%patch30268 -p1
+%patch30267 -p1
 # irda-usb printk fix
-%patch30269 -p1
+%patch30268 -p1
 # m68knommu: 532x FEC eth struct map
-%patch30270 -p1
+%patch30269 -p1
 # [TIPC] Improved tolerance to promiscuous mode interface
-%patch30271 -p1
+%patch30270 -p1
 # [TIPC]: Prevent name table corruption if no room for new publication
-%patch30272 -p1
+%patch30271 -p1
 # [TIPC]: Use correct upper bound when validating network zone number.
-%patch30273 -p1
+%patch30272 -p1
 # [TIPC]: Corrected potential misuse of tipc_media_addr structure.
-%patch30274 -p1
+%patch30273 -p1
 # [TIPC]: Allow ports to receive multicast messages through native API.
-%patch30275 -p1
+%patch30274 -p1
 # [TIPC]: Links now validate destination node specified by incoming messages.
-%patch30276 -p1
+%patch30275 -p1
 # [TIPC]: Multicast link failure now resets all links to "nacking" node.
-%patch30277 -p1
+%patch30276 -p1
 # [TIPC]: Allow compilation when CONFIG_TIPC_DEBUG is not set.
-%patch30278 -p1
+%patch30277 -p1
 # [TIPC] Fix for NULL pointer dereference
-%patch30279 -p1
+%patch30278 -p1
 # [TIPC]: Fixed privilege checking typo in dest_name_check().
-%patch30280 -p1
+%patch30279 -p1
 # [TIPC]: Fix misleading comment in buf_discard() routine.
-%patch30281 -p1
+%patch30280 -p1
 # [TIPC]: Added support for MODULE_VERSION capability.
-%patch30282 -p1
+%patch30281 -p1
 # [TIPC]: Validate entire interface name when locating bearer to enable.
-%patch30283 -p1
+%patch30282 -p1
 # [TIPC]: Non-operation-affecting corrections to comments & function definitions.
-%patch30284 -p1
+%patch30283 -p1
 # [TIPC]: Fixed connect() to detect a dest address that is missing or too short.
-%patch30285 -p1
+%patch30284 -p1
 # [TIPC]: Implied connect now saves dest name for retrieval as ancillary data.
-%patch30286 -p1
+%patch30285 -p1
 # [TIPC]: Can now return destination name of form {0,x,y} via ancillary data.
-%patch30287 -p1
+%patch30286 -p1
 # [TIPC]: Connected send now checks socket state when retrying congested send.
-%patch30288 -p1
+%patch30287 -p1
 # [TIPC]: Stream socket send indicates partial success if data partially sent.
-%patch30289 -p1
+%patch30288 -p1
 # [TIPC]: Improved performance of error checking during socket creation.
-%patch30290 -p1
+%patch30289 -p1
 # [TIPC]: recvmsg() now returns TIPC ancillary data using correct level (SOL_TIPC)
-%patch30291 -p1
+%patch30290 -p1
 # [TIPC]: Simplify code for returning partial success of stream send request.
-%patch30292 -p1
+%patch30291 -p1
 # [TIPC]: Optimized argument validation done by connect().
-%patch30293 -p1
+%patch30292 -p1
 # [TIPC]: Withdrawing all names from nameless port now returns success, not error
-%patch30294 -p1
+%patch30293 -p1
 # [TIPC]: Added missing warning for out-of-memory condition
-%patch30295 -p1
+%patch30294 -p1
 # [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable
-%patch30296 -p1
+%patch30295 -p1
 # [TIPC]: Disallow config operations that aren't supported in certain modes.
-%patch30297 -p1
+%patch30296 -p1
 # [TIPC]: First phase of assert() cleanup
-%patch30298 -p1
+%patch30297 -p1
 # [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks.
-%patch30299 -p1
+%patch30298 -p1
 # [TIPC]: Fixed link switchover bugs
-%patch30300 -p1
+%patch30299 -p1
 # [TIPC]: Get rid of dynamically allocated arrays in broadcast code.
-%patch30301 -p1
+%patch30300 -p1
 # [TIPC]: Fix incorrect correction to discovery timer frequency computation.
-%patch30302 -p1
+%patch30301 -p1
 # [NET]: skb_find_text ignores to argument
-%patch30303 -p1
+%patch30302 -p1
 # [ATM]: atm/mpc.c warning fix
-%patch30304 -p1
+%patch30303 -p1
 # [IRDA]: add some IBM think pads
-%patch30305 -p1
+%patch30304 -p1
 # [NET] netpoll: break recursive loop in netpoll rx path
-%patch30306 -p1
+%patch30305 -p1
 # [NETROM]: Fix possible null pointer dereference.
-%patch30307 -p1
+%patch30306 -p1
 # spelling fixes
-%patch30308 -p1
+%patch30307 -p1
 # net/rxrpc: use list_move()
-%patch30309 -p1
+%patch30308 -p1
 # drivers: use list_move()
-%patch30310 -p1
-# devfs: Remove devfs_mk_dir() function from the kernel tree
-%patch30311 -p1
+%patch30309 -p1
 # devfs: Remove the miscdevice devfs_name field as it's no longer needed
-%patch30312 -p1
+%patch30310 -p1
 # devfs: Remove the tty_driver devfs_name field as it's no longer needed
-%patch30313 -p1
+%patch30311 -p1
 # DM9000 - better checks for platform resources
-%patch30314 -p1
+%patch30312 -p1
 # DM9000 - check for MAC left in by bootloader
-%patch30315 -p1
+%patch30313 -p1
 # DM9000 - do no re-init spin lock
-%patch30316 -p1
+%patch30314 -p1
 # DM9000 - minor code cleanups
-%patch30317 -p1
+%patch30315 -p1
 # Fix phy id for LXT971A/LXT972A
-%patch30318 -p1
+%patch30316 -p1
 # drivers/net/hamradio/dmascc.c: fix section mismatch
-%patch30319 -p1
+%patch30317 -p1
 # WAN: update info page for a bunch of my drivers
-%patch30320 -p1
+%patch30318 -p1
 # [netdrvr] natsemi: Separate out media initialization code
-%patch30321 -p1
+%patch30319 -p1
 # [netdrvr] natsemi: minor cleanups
-%patch30322 -p1
+%patch30320 -p1
 # [netdrvr] Remove long-unused bits from Becker template drivers
-%patch30323 -p1
+%patch30321 -p1
 # e1000: fix loopback ethtool test
-%patch30324 -p1
+%patch30322 -p1
 # e1000: rework driver hardware reset locking
-%patch30325 -p1
+%patch30323 -p1
 # e1000: Make PHY powerup/down a function
-%patch30326 -p1
+%patch30324 -p1
 # e1000: fix CONFIG_PM blocks
-%patch30327 -p1
+%patch30325 -p1
 # e1000: small performance tweak by removing double code
-%patch30328 -p1
+%patch30326 -p1
 # e1000: add smart power down code
-%patch30329 -p1
+%patch30327 -p1
 # e1000: recycle skb
-%patch30330 -p1
+%patch30328 -p1
 # e1000: rework module param code with uninitialized values
-%patch30331 -p1
+%patch30329 -p1
 # e1000: force register write flushes to circumvent broken platforms
-%patch30332 -p1
+%patch30330 -p1
 # e1000: disable CRC stripping workaround
-%patch30333 -p1
+%patch30331 -p1
 # e1000: fix adapter led blinking inconsistency
-%patch30334 -p1
+%patch30332 -p1
 # e1000: M88 PHY workaround
-%patch30335 -p1
+%patch30333 -p1
 # e1000: check return value of _get_speed_and_duplex
-%patch30336 -p1
+%patch30334 -p1
 # e1000: disable ERT
-%patch30337 -p1
+%patch30335 -p1
 # e1000: add ich8lan core functions
-%patch30338 -p1
+%patch30336 -p1
 # e1000: allow user to disable ich8 lock loss workaround
-%patch30339 -p1
+%patch30337 -p1
 # e1000: add ich8lan device ID's
-%patch30340 -p1
+%patch30338 -p1
 # e1000: increase version to 7.1.9-k2
-%patch30341 -p1
+%patch30339 -p1
 # 64bit resource: fix up printks for resources in networks drivers
-%patch30342 -p1
+%patch30340 -p1
 # m68knommu: avoid fec driver hang when link disappears
-%patch30343 -p1
+%patch30341 -p1
 # m68knommu: FEC driver support for the ColdFire 523x CPU family
-%patch30344 -p1
+%patch30342 -p1
 # m68knommu: FEC driver set different priority/level on each IRQ
-%patch30345 -p1
+%patch30343 -p1
 # m68knommu: FEC driver event/irq fixes
-%patch30346 -p1
+%patch30344 -p1
 # [NETFILTER]: x_tables: fix xt_register_table error propagation
-%patch30347 -p1
+%patch30345 -p1
 # [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_\*
-%patch30348 -p1
+%patch30346 -p1
 # [NETFILTER]: xt_tcpudp: fix double unregistration in error path
-%patch30349 -p1
+%patch30347 -p1
 # [NETFILTER]: xt_sctp: fix --chunk-types matching
-%patch30350 -p1
+%patch30348 -p1
 # [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev disappears
-%patch30351 -p1
+%patch30349 -p1
 # [NETFILTER]: statistic match: add missing Kconfig help text
-%patch30352 -p1
+%patch30350 -p1
 # [TCP]: Export accept queue len of a TCP listening socket via rx_queue
-%patch30353 -p1
+%patch30351 -p1
 # [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
-%patch30354 -p1
+%patch30352 -p1
 # [AF_UNIX]: Datagram getpeersec
-%patch30355 -p1
+%patch30353 -p1
 # [ATM]: basic sysfs support for ATM devices
-%patch30356 -p1
+%patch30354 -p1
 # [BNX2]: Use dev_kfree_skb() instead of the _irq version
-%patch30357 -p1
+%patch30355 -p1
 # [BNX2]: Turn off link during shutdown
-%patch30358 -p1
+%patch30356 -p1
 # [IrDA]: MCS7780 usb_driver struct should be static
-%patch30359 -p1
+%patch30357 -p1
 # [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
-%patch30360 -p1
+%patch30358 -p1
 # [XFRM]: unexport xfrm_state_mtu
-%patch30361 -p1
+%patch30359 -p1
 # [IrDA]: Fix RCU lock pairing on error path
-%patch30362 -p1
+%patch30360 -p1
 # [IrDA]: Fix the AU1000 FIR dependencies
-%patch30363 -p1
+%patch30361 -p1
 # [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
-%patch30364 -p1
+%patch30362 -p1
 # [TIPC]: Improve response to requests for node/link information
-%patch30365 -p1
+%patch30363 -p1
 # [TIPC]: Initial activation message now includes TIPC version number
-%patch30366 -p1
+%patch30364 -p1
 # typo fixes: bandwith -> bandwidth
-%patch30367 -p1
+%patch30365 -p1
 # typo fixes: infomation -> information
-%patch30368 -p1
+%patch30366 -p1
 # typo fixes: occuring -> occurring
-%patch30369 -p1
+%patch30367 -p1
 # Kconfig: Typos in net/sched/Kconfig
-%patch30370 -p1
+%patch30368 -p1
 # knfsd: svcrpc: gss: simplify rsc_parse()
-%patch30371 -p1
+%patch30369 -p1
 # knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code
-%patch30372 -p1
+%patch30370 -p1
 # knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case
-%patch30373 -p1
+%patch30371 -p1
 # knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy
-%patch30374 -p1
+%patch30372 -p1
 # pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
-%patch30375 -p1
+%patch30373 -p1
 # com20020_cs: more device support
-%patch30376 -p1
+%patch30374 -p1
 # [TG3]: Add tg3_netif_stop() in vlan functions
-%patch30377 -p1
+%patch30375 -p1
 # [TG3]: Add rx BD workaround
-%patch30378 -p1
+%patch30376 -p1
 # [TG3]: Turn on hw fix for ASF problems
-%patch30379 -p1
+%patch30377 -p1
 # [TG3]: Update version and reldate
-%patch30380 -p1
+%patch30378 -p1
 # [IPV6]: Remove redundant length check on input
-%patch30381 -p1
+%patch30379 -p1
 # bcm43xx: netlink deadlock fix
-%patch30382 -p1
+%patch30380 -p1
 # forcedeth: typecast cleanup
-%patch30383 -p1
+%patch30381 -p1
 # [AF_UNIX]: datagram getpeersec fix
-%patch30384 -p1
+%patch30382 -p1
 # [ROSE]: Fix dereference of skb pointer after free.
-%patch30385 -p1
+%patch30383 -p1
 # [AX.25]: Reference counting for AX.25 routes.
-%patch30386 -p1
+%patch30384 -p1
 # [NETROM]: Use socket helpers instead of direct fiddling with struct sock
-%patch30387 -p1
+%patch30385 -p1
 # [ROSE]: Try all routes when establishing a ROSE connections.
-%patch30388 -p1
+%patch30386 -p1
 # [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED)
-%patch30389 -p1
+%patch30387 -p1
 # [BRIDGE]: br_dump_ifinfo index fix
-%patch30390 -p1
+%patch30388 -p1
 # [Bluetooth] Correct SCO buffer size on request
-%patch30391 -p1
+%patch30389 -p1
 # [Bluetooth] Add automatic sniff mode support
-%patch30392 -p1
+%patch30390 -p1
 # [Bluetooth] Add platform device for virtual and serial devices
-%patch30393 -p1
+%patch30391 -p1
 # [Bluetooth] Small cleanup of the L2CAP source code
-%patch30394 -p1
+%patch30392 -p1
 # [Bluetooth] Allow disabling of credit based flow control
-%patch30395 -p1
+%patch30393 -p1
 # [Bluetooth] Add RFCOMM role switch support
-%patch30396 -p1
+%patch30394 -p1
 # This fixes a panic doing the first READDIR or READDIRPLUS call when:
-%patch30397 -p1
+%patch30395 -p1
 # [netdrvr] epic100: minor cleanups
-%patch30398 -p1
+%patch30396 -p1
 # [netdrvr] Remove Becker-template 'io_size' member, when invariant
-%patch30399 -p1
+%patch30397 -p1
 # [netdrvr] via-velocity: use netdev_priv() where appropriate
-%patch30400 -p1
+%patch30398 -p1
 # [netdrvr] via-velocity: misc. cleanups
-%patch30401 -p1
+%patch30399 -p1
 # [netdrvr] via-velocity: remove io_size struct member, it is invariant
-%patch30402 -p1
+%patch30400 -p1
 # [netdrvr] Use dev_printk() when ethernet interface isn't available
-%patch30403 -p1
+%patch30401 -p1
 # Add two PLX device IDs
-%patch30404 -p1
+%patch30402 -p1
 # bcm43xx: use softmac-suggested TX rate
-%patch30405 -p1
+%patch30403 -p1
 # ieee80211: fix not allocating IV+ICV space when usingencryption in ieee80211_tx_frame
-%patch30406 -p1
+%patch30404 -p1
 # skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.c
-%patch30407 -p1
+%patch30405 -p1
 # 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211softmac_assoc_req
-%patch30408 -p1
+%patch30406 -p1
 # SoftMAC: Prevent multiple authentication attempts on the same network
-%patch30409 -p1
+%patch30407 -p1
 # SoftMAC: Add network to ieee80211softmac_call_events when associate times out
-%patch30410 -p1
+%patch30408 -p1
 # CONFIG_WIRELESS_EXT is neccessary after all
-%patch30411 -p1
+%patch30409 -p1
 # softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
-%patch30412 -p1
+%patch30410 -p1
 # ZyDAS ZD1211 USB-WLAN driver
-%patch30413 -p1
+%patch30411 -p1
 # zd1211rw: disable TX queue during stop
-%patch30414 -p1
+%patch30412 -p1
 # Add support for the Cicada 8201 PHY
-%patch30415 -p1
+%patch30413 -p1
 # pcnet32: Fix Section mismatch error
-%patch30416 -p1
+%patch30414 -p1
 # pcnet32: Use PCI_DEVICE macro
-%patch30417 -p1
+%patch30415 -p1
 # pcnet32: Fix off-by-one in get_ringparam
-%patch30418 -p1
+%patch30416 -p1
 # pcnet32: Use kcalloc instead of kmalloc and memset
-%patch30419 -p1
+%patch30417 -p1
 # pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
-%patch30420 -p1
+%patch30418 -p1
 # pcnet32: Suspend the chip rather than restart when changing multicast/promisc
-%patch30421 -p1
+%patch30419 -p1
 # pcnet32: Cleanup rx buffers after loopback test.
-%patch30422 -p1
+%patch30420 -p1
 # NI5010 netcard cleanup
-%patch30423 -p1
+%patch30421 -p1
 # remove dead entry in net wan Kconfig
-%patch30424 -p1
+%patch30422 -p1
 # Fix freeing of net device
-%patch30425 -p1
+%patch30423 -p1
 # [netdrvr] 3c59x: snip changelog from source code
-%patch30426 -p1
+%patch30424 -p1
 # 8139too deadlock fix
-%patch30427 -p1
+%patch30425 -p1
 # [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
-%patch30428 -p1
+%patch30426 -p1
 # [PKT_SCHED]: Return ENOENT if action module is unavailable
-%patch30429 -p1
+%patch30427 -p1
 # [PKT_SCHED]: Fix error handling while dumping actions
-%patch30430 -p1
+%patch30428 -p1
 # wireless: add acx driver
-%patch30431 -p1
+%patch30429 -p1
 # acxsm: merge from acx 0.3.32
-%patch30432 -p1
+%patch30430 -p1
 # tiacx: Let only ACX_PCI/ACX_USB be user-visible
-%patch30433 -p1
+%patch30431 -p1
 # tiacx: revert "neither PCI nor USB is selected" change
-%patch30434 -p1
+%patch30432 -p1
 # tiacx: implement much more flexible firmware statistics parsing
-%patch30435 -p1
+%patch30433 -p1
 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
-%patch30436 -p1
+%patch30434 -p1
 # tiacx: fix breakage of "Get rid of circular list of adev's"
-%patch30437 -p1
+%patch30435 -p1
 # tiacx: split module into acx-common + acx-pci + acx-usb
-%patch30438 -p1
+%patch30436 -p1
 # fix tiacx on alpha
-%patch30439 -p1
+%patch30437 -p1
 # tiacx: fix attribute packed warnings
-%patch30440 -p1
+%patch30438 -p1
 # tiacx: pci build fix
-%patch30441 -p1
+%patch30439 -p1
 # tiacx: support ia64
-%patch30442 -p1
+%patch30440 -p1
 # [NET]: Fix network device interface printk message priority
-%patch30443 -p1
+%patch30441 -p1
 # [TG3]: add amd8131 to "write reorder" chipsets
-%patch30444 -p1
+%patch30442 -p1
 # [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
-%patch30445 -p1
+%patch30443 -p1
 # [NET]: Fix IPv4/DECnet routing rule dumping
-%patch30446 -p1
+%patch30444 -p1
 # [PKT_SCHED]: act_api: Fix module leak while flushing actions
-%patch30447 -p1
+%patch30445 -p1
 # [ATM] net/atm/clip.c: fix PROC_FS=n compile
-%patch30448 -p1
+%patch30446 -p1
 # [AX.25]: Use kzalloc
-%patch30449 -p1
+%patch30447 -p1
 # bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
-%patch30450 -p1
+%patch30448 -p1
 # zd1211rw: usb_clear_halt not allowed in IRQ context
-%patch30451 -p1
+%patch30449 -p1
 # bcm43xx: improved statistics
-%patch30452 -p1
+%patch30450 -p1
 # zd1211rw: Add Sagem device ID's
-%patch30453 -p1
+%patch30451 -p1
 # tiacx - don't use UTS_RELEASE
-%patch30454 -p1
+%patch30452 -p1
 # release_firmware() fixes
-%patch30455 -p1
+%patch30453 -p1
 # [AX.25]: Get rid of the last volatile.
-%patch30456 -p1
+%patch30454 -p1
 # [IPV4] inetpeer: Get rid of volatile from peer_total
-%patch30457 -p1
+%patch30455 -p1
 # [TCP]: Remove TCP Compound
-%patch30458 -p1
+%patch30456 -p1
 # [DCCP]: Fix sparse warnings.
-%patch30459 -p1
+%patch30457 -p1
 # [IPV6]: order addresses by scope
-%patch30460 -p1
+%patch30458 -p1
 # [AX.25]: Fix locking of ax25 protocol function list.
-%patch30461 -p1
+%patch30459 -p1
 # [NETROM]: Drop lock before calling nr_destroy_socket
-%patch30462 -p1
+%patch30460 -p1
 # [TCP] tcp_highspeed: Fix AI updates.
-%patch30463 -p1
+%patch30461 -p1
 # [IPV6]: Use ipv6_addr_src_scope for link address sorting.
-%patch30464 -p1
+%patch30462 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3286,7 +3280,6 @@
 - [SPARC]: Port sparc64 in-kernel device tree code to sparc32.
 - [NET] sunlance: Convert to new SBUS driver framework.
 - [NET] sunbmac: Convert over to new SBUS device framework.
-- [NET] sunqe: Convert to new SBUS driver layer.
 - [NET] myri_sbus: Convert to new SBUS device layer.
 - [NET] myri_sbus: Kill unused next_module struct member.
 - [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
@@ -3335,7 +3328,6 @@
 - spelling fixes
 - net/rxrpc: use list_move()
 - drivers: use list_move()
-- devfs: Remove devfs_mk_dir() function from the kernel tree
 - devfs: Remove the miscdevice devfs_name field as it's no longer needed
 - devfs: Remove the tty_driver devfs_name field as it's no longer needed
 - DM9000 - better checks for platform resources


--- 2275-NET-sunqe-Convert-to-new-SBUS-driver-layer.txt DELETED ---


--- 3256-devfs-Remove-devfs_mk_dir-function-from-the-kernel-tree.txt DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:38:13 -0400
Subject: rpms/libgtop2/devel libgtop2.spec,1.35,1.36
Message-ID: <200607132038.k6DKcDmJ022262@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22242

Modified Files:
	libgtop2.spec 
Log Message:
Add missing BR


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgtop2.spec	12 Jul 2006 06:53:23 -0000	1.35
+++ libgtop2.spec	13 Jul 2006 20:38:10 -0000	1.36
@@ -7,7 +7,7 @@
 Name:		libgtop2
 Summary:        libgtop library (version 2)
 Version: 	2.14.1
-Release: 	3.1
+Release: 	4
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	glib2 >= %{glib2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:  texinfo
+BuildRequires:  texinfo libtool gettext
 Patch: libgtop-2.0.2-prog_as.patch
 
 %description
@@ -83,8 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-3.1
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-4
 - rebuild
+- add missing br libtool gettext
 
 * Tue Jun  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
 - Rebuild



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:38:13 -0400
Subject: rpms/audit/devel .cvsignore, 1.64, 1.65 audit.spec, 1.98,
	1.99 sources, 1.72, 1.73
Message-ID: <200607132038.k6DKcDAF022271@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22243

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Thu Jul 13 2006 Steve Grubb <sgrubb at redhat.com> 1.2.5-1
- Switch out dispatcher
- Fix bug upgrading rule types



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	30 Jun 2006 20:30:02 -0000	1.64
+++ .cvsignore	13 Jul 2006 20:38:11 -0000	1.65
@@ -61,3 +61,4 @@
 audit-1.2.2.tar.gz
 audit-1.2.3.tar.gz
 audit-1.2.4.tar.gz
+audit-1.2.5.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- audit.spec	12 Jul 2006 05:23:20 -0000	1.98
+++ audit.spec	13 Jul 2006 20:38:11 -0000	1.99
@@ -1,14 +1,14 @@
-Summary: User space tools for 2.6 kernel auditing.
+Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.2.4
-Release: 1.1
+Version: 1.2.5
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
-BuildRequires: kernel-headers >= 2.6.16
+BuildRequires: kernel-headers >= 2.6.17
 BuildRequires: automake >= 1.9
 BuildRequires: autoconf >= 2.59
 Requires: %{name}-libs = %{version}-%{release}
@@ -33,7 +33,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.16
+Requires: kernel-headers >= 2.6.17
 
 %description libs-devel
 The audit-libs-devel package contains the static libraries and header 
@@ -45,7 +45,7 @@
 License: LGPL
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.16
+Requires: kernel-headers >= 2.6.17
 
 %description libs-python
 The audit-libs-python package contains the bindings so that libaudit
@@ -65,13 +65,11 @@
 mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,rc.d/init.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT/usr/{lib,lib32}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 make DESTDIR=$RPM_BUILD_ROOT install
 
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-# We manually install this since Makefile doesn't
-install -m 0644 lib/libaudit.h $RPM_BUILD_ROOT/%{_includedir}
 # This winds up in the wrong place when libtool is involved
 mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
@@ -90,9 +88,6 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.la
 
-# Temp remove this file
-rm -f $RPM_BUILD_ROOT/sbin/audispd
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,6 +101,14 @@
 if [ -f /etc/audit.rules ]; then
    mv /etc/audit.rules /etc/audit/audit.rules
 fi
+if [ -f /etc/audit/auditd.conf ]; then
+   tmp=`mktemp /etc/audit/auditd-post.XXXXXX`
+   if [ -n $tmp ]; then
+      sed 's|#dispatcher|dispatcher|g' /etc/audit/auditd.conf > $tmp && \
+      cat $tmp > /etc/audit/auditd.conf
+      rm -f $tmp
+   fi
+fi
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -150,16 +153,23 @@
 %attr(750,root,root) /sbin/ausearch
 %attr(750,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
-#%attr(750,root,root) /sbin/audispd
+%attr(750,root,root) /sbin/audispd
 %attr(755,root,root) /etc/rc.d/init.d/auditd
 %attr(750,root,root) %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit
+%attr(750,root,root) %dir /usr/lib/audit
+%attr(750,root,root) %dir /usr/lib32/audit
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
+/usr/lib/python2.4/site-packages/AuditMsg.py*
 
 
 %changelog
+* Thu Jul 13 2006 Steve Grubb <sgrubb at redhat.com> 1.2.5-1
+- Switch out dispatcher
+- Fix bug upgrading rule types
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	30 Jun 2006 20:30:02 -0000	1.72
+++ sources	13 Jul 2006 20:38:11 -0000	1.73
@@ -1 +1 @@
-a4a63915c411d17aa1f38e6104f49d38  audit-1.2.4.tar.gz
+d5d56d5e3189215dcd37a5eded761d12  audit-1.2.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:46:38 -0400
Subject: rpms/iprutils/devel .cvsignore, 1.12, 1.13 iprutils.spec, 1.21,
	1.22 sources, 1.13, 1.14
Message-ID: <200607132046.k6DKkcAn001212@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv788

Modified Files:
	.cvsignore iprutils.spec sources 
Log Message:
New version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	26 Jun 2006 17:26:13 -0000	1.12
+++ .cvsignore	13 Jul 2006 20:46:35 -0000	1.13
@@ -7,3 +7,4 @@
 iprutils-2.0.15.3-src.tgz
 iprutils-2.1.1-src.tgz
 iprutils-2.1.4-src.tgz
+iprutils-2.1.5-src.tgz


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- iprutils.spec	12 Jul 2006 06:25:20 -0000	1.21
+++ iprutils.spec	13 Jul 2006 20:46:36 -0000	1.22
@@ -1,8 +1,8 @@
 ExclusiveArch: ppc ppc64
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
-Version: 2.1.4
-Release: 3.1
+Version: 2.1.5
+Release: 1
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -56,6 +56,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Thu Jul 13 2006 Paul Nasrat <pnasrat at redhat.com> - 2.1.5-1
+- New upstream version
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.4-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	26 Jun 2006 17:26:13 -0000	1.13
+++ sources	13 Jul 2006 20:46:36 -0000	1.14
@@ -1 +1 @@
-37cdb233e1dfbd42143541feb3a0d3c3  iprutils-2.1.4-src.tgz
+7c5c042238d80a3a6449a5c981a9eb55  iprutils-2.1.5-src.tgz



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:49:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:49:17 -0400
Subject: rpms/mkinitrd/devel sources,1.133,1.134
Message-ID: <200607132049.k6DKnHN7005153@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5138

Modified Files:
	sources 
Log Message:
- hopefully fix the build everywhere...



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sources	13 Jul 2006 20:30:56 -0000	1.133
+++ sources	13 Jul 2006 20:49:15 -0000	1.134
@@ -1,2 +1,2 @@
-bc0464d3ecb741a9c19cbdfdadf5cd83  bdevid-0.1.tar.bz2
-456bbb7b91b8f79815a745c14d8e7b8e  mkinitrd-5.0.47.tar.bz2
+532a6c99623f05b7944d5ea45051dd24  bdevid-0.1.tar.bz2
+4e0f3b8a9715b20bddeeaa9a45b8d889  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:49:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:49:28 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.295, 1.296 anaconda.spec, 1.419,
	1.420 sources, 1.417, 1.418
Message-ID: <200607132049.k6DKnSIx005183@cvs.devel.redhat.com>

Author: dcantrel

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- .cvsignore	11 Jul 2006 21:32:40 -0000	1.295
+++ .cvsignore	13 Jul 2006 20:49:26 -0000	1.296
@@ -1 +1 @@
-anaconda-11.1.0.56.tar.bz2
+anaconda-11.1.0.57.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- anaconda.spec	11 Jul 2006 21:32:40 -0000	1.419
+++ anaconda.spec	13 Jul 2006 20:49:26 -0000	1.420
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.56
+Version: 11.1.0.57
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,8 +15,7 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.6
-BuildPreReq: libdhcp4client-devel, libdhcp6client-devel
+BuildPreReq: libdhcp-devel >= 1.9
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
 Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
@@ -101,6 +100,24 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 13 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.57-1
+- Fix unknown error on shadow file (#196705, clumens)
+- Removed inet_calcGateway (clumens)
+- Don't guess gateway address in text network UI (#197578, clumens)
+- Change iutil.copyFile calls to shutil.copyfile (clumens)
+- Removed DRI enable/disable code from xsetup (clumens)
+- Removed copyFile, getArch, memInstalled, and rmrf from iutil (clumens)
+- Don't pass command as first argument to subprocess calls (clumens)
+- Added network debugging mode for readNetConfig() in loader
+- Removed "BOOTP" string from loader network config UI
+- Added new dialog for network device config in stage2 (katzj)
+- Write gateway address to correct struct in manualNetConfig
+- Removed IP_STRLEN macro since that's moved to libdhcp
+- Link and compile libisys with libdhcp
+- Added back 'confignetdevice' and 'pumpnetdevice' in iutil
+- Removed isys_calcNetmask and isys_calcNS (clumens)
+- Added xkeyboard-config to fix VT switching (katzj)
+
 * Tue Jul 11 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.56-1
 - Many changes and fixes in the loader2 network configuration, both
   dhcp and manual IP entry


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- sources	11 Jul 2006 21:32:40 -0000	1.417
+++ sources	13 Jul 2006 20:49:26 -0000	1.418
@@ -1 +1 @@
-bd9f71381a8a7d905e80a5fd14301ab6  anaconda-11.1.0.56.tar.bz2
+ce0295899aad0789597ce31980b25b1d  anaconda-11.1.0.57.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:53:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:53:30 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.136,1.137
Message-ID: <200607132053.k6DKrUFM005304@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5291

Modified Files:
	mkinitrd.spec 
Log Message:
- add glib2 buildreq


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- mkinitrd.spec	13 Jul 2006 18:58:16 -0000	1.136
+++ mkinitrd.spec	13 Jul 2006 20:53:28 -0000	1.137
@@ -17,7 +17,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 >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig, glib2
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
 BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x
@@ -68,7 +68,10 @@
 make
 make test
 if [ $? != 0 ]; then exit 1; fi
-cd ../bdevid-%{BDEVID_VERSION}
+cd ..
+cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{version}/bdevid/
+cp -a mkinitrd-%{version}/nash/include/nash* bdevid-%{version}/bdevid/include/
+cd bdevid-%{BDEVID_VERSION}
 make LIB=%{_lib}
 
 %install



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:55:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:55:06 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2145.2.3, 1.2145.2.4
	3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt,
	1.1.2.1, NONE
	3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt,
	1.1.2.1, NONE
Message-ID: <200607132055.k6DKt6nR005353@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc5-6-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc5-6-branch
	3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt 
	3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2145.2.3
retrieving revision 1.2145.2.4
diff -u -r1.2145.2.3 -r1.2145.2.4
--- kernel-2.6.spec	13 Jul 2006 20:31:41 -0000	1.2145.2.3
+++ kernel-2.6.spec	13 Jul 2006 20:55:04 -0000	1.2145.2.4
@@ -724,159 +724,157 @@
 Patch30307: 2934-spelling-fixes.txt
 Patch30308: 2949-net-rxrpc-use-list_move.txt
 Patch30309: 2950-drivers-use-list_move.txt
-Patch30310: 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30311: 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt
-Patch30312: 3390-DM9000-better-checks-for-platform-resources.txt
-Patch30313: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
-Patch30314: 3392-DM9000-do-no-re-init-spin-lock.txt
-Patch30315: 3393-DM9000-minor-code-cleanups.txt
-Patch30316: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
-Patch30317: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
-Patch30318: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
-Patch30319: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
-Patch30320: 3399-netdrvr-natsemi-minor-cleanups.txt
-Patch30321: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
-Patch30322: 3460-e1000-fix-loopback-ethtool-test.txt
-Patch30323: 3461-e1000-rework-driver-hardware-reset-locking.txt
-Patch30324: 3462-e1000-Make-PHY-powerup-down-a-function.txt
-Patch30325: 3463-e1000-fix-CONFIG_PM-blocks.txt
-Patch30326: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
-Patch30327: 3465-e1000-add-smart-power-down-code.txt
-Patch30328: 3467-e1000-recycle-skb.txt
-Patch30329: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
-Patch30330: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
-Patch30331: 3470-e1000-disable-CRC-stripping-workaround.txt
-Patch30332: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
-Patch30333: 3472-e1000-M88-PHY-workaround.txt
-Patch30334: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
-Patch30335: 3474-e1000-disable-ERT.txt
-Patch30336: 3475-e1000-add-ich8lan-core-functions.txt
-Patch30337: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
-Patch30338: 3478-e1000-add-ich8lan-device-ID-s.txt
-Patch30339: 3479-e1000-increase-version-to-7.1.9-k2.txt
-Patch30340: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
-Patch30341: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
-Patch30342: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
-Patch30343: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
-Patch30344: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
-Patch30345: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
-Patch30346: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
-Patch30347: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
-Patch30348: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
-Patch30349: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
-Patch30350: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
-Patch30351: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
-Patch30352: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
-Patch30353: 4007-AF_UNIX-Datagram-getpeersec.txt
-Patch30354: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
-Patch30355: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
-Patch30356: 4015-BNX2-Turn-off-link-during-shutdown.txt
-Patch30357: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
-Patch30358: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
-Patch30359: 4019-XFRM-unexport-xfrm_state_mtu.txt
-Patch30360: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
-Patch30361: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
-Patch30362: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
-Patch30363: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
-Patch30364: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
-Patch30365: 4062-typo-fixes-bandwith-bandwidth.txt
-Patch30366: 4066-typo-fixes-infomation-information.txt
-Patch30367: 4067-typo-fixes-occuring-occurring.txt
-Patch30368: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
-Patch30369: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
-Patch30370: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
-Patch30371: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
-Patch30372: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
-Patch30373: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
-Patch30374: 4172-com20020_cs-more-device-support.txt
-Patch30375: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
-Patch30376: 4178-TG3-Add-rx-BD-workaround.txt
-Patch30377: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
-Patch30378: 4181-TG3-Update-version-and-reldate.txt
-Patch30379: 4183-IPV6-Remove-redundant-length-check-on-input.txt
-Patch30380: 4417-bcm43xx-netlink-deadlock-fix.txt
-Patch30381: 4516-forcedeth-typecast-cleanup.txt
-Patch30382: 4523-AF_UNIX-datagram-getpeersec-fix.txt
-Patch30383: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
-Patch30384: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
-Patch30385: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
-Patch30386: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
-Patch30387: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
-Patch30388: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
-Patch30389: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
-Patch30390: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
-Patch30391: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
-Patch30392: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
-Patch30393: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
-Patch30394: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
-Patch30395: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
-Patch30396: 4572-netdrvr-epic100-minor-cleanups.txt
-Patch30397: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
-Patch30398: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
-Patch30399: 4577-netdrvr-via-velocity-misc.-cleanups.txt
-Patch30400: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
-Patch30401: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
-Patch30402: 4581-Add-two-PLX-device-IDs.txt
-Patch30403: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
-Patch30404: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
-Patch30405: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
-Patch30406: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
-Patch30407: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
-Patch30408: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
-Patch30409: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
-Patch30410: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
-Patch30411: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
-Patch30412: 4594-zd1211rw-disable-TX-queue-during-stop.txt
-Patch30413: 4595-Add-support-for-the-Cicada-8201-PHY.txt
-Patch30414: 4596-pcnet32-Fix-Section-mismatch-error.txt
-Patch30415: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
-Patch30416: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
-Patch30417: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
-Patch30418: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
-Patch30419: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
-Patch30420: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
-Patch30421: 4604-NI5010-netcard-cleanup.txt
-Patch30422: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
-Patch30423: 4606-Fix-freeing-of-net-device.txt
-Patch30424: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
-Patch30425: 4612-8139too-deadlock-fix.txt
-Patch30426: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
-Patch30427: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
-Patch30428: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
-Patch30429: 4646-wireless-add-acx-driver.txt
-Patch30430: 4647-acxsm-merge-from-acx-0.3.32.txt
-Patch30431: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
-Patch30432: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
-Patch30433: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
-Patch30434: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
-Patch30435: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
-Patch30436: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
-Patch30437: 4654-fix-tiacx-on-alpha.txt
-Patch30438: 4655-tiacx-fix-attribute-packed-warnings.txt
-Patch30439: 4656-tiacx-pci-build-fix.txt
-Patch30440: 4657-tiacx-support-ia64.txt
-Patch30441: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
-Patch30442: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
-Patch30443: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
-Patch30444: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
-Patch30445: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
-Patch30446: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
-Patch30447: 4673-AX.25-Use-kzalloc.txt
-Patch30448: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
-Patch30449: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
-Patch30450: 4691-bcm43xx-improved-statistics.txt
-Patch30451: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
-Patch30452: 4693-tiacx-don-t-use-UTS_RELEASE.txt
-Patch30453: 4716-release_firmware-fixes.txt
-Patch30454: 4821-AX.25-Get-rid-of-the-last-volatile.txt
-Patch30455: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
-Patch30456: 4824-TCP-Remove-TCP-Compound.txt
-Patch30457: 4825-DCCP-Fix-sparse-warnings.txt
-Patch30458: 4834-IPV6-order-addresses-by-scope.txt
-Patch30459: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
-Patch30460: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
-Patch30461: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
-Patch30462: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
+Patch30310: 3390-DM9000-better-checks-for-platform-resources.txt
+Patch30311: 3391-DM9000-check-for-MAC-left-in-by-bootloader.txt
+Patch30312: 3392-DM9000-do-no-re-init-spin-lock.txt
+Patch30313: 3393-DM9000-minor-code-cleanups.txt
+Patch30314: 3394-Fix-phy-id-for-LXT971A-LXT972A.txt
+Patch30315: 3395-drivers-net-hamradio-dmascc.c-fix-section-mismatch.txt
+Patch30316: 3396-WAN-update-info-page-for-a-bunch-of-my-drivers.txt
+Patch30317: 3397-netdrvr-natsemi-Separate-out-media-initialization-code.txt
+Patch30318: 3399-netdrvr-natsemi-minor-cleanups.txt
+Patch30319: 3426-netdrvr-Remove-long-unused-bits-from-Becker-template-drivers.txt
+Patch30320: 3460-e1000-fix-loopback-ethtool-test.txt
+Patch30321: 3461-e1000-rework-driver-hardware-reset-locking.txt
+Patch30322: 3462-e1000-Make-PHY-powerup-down-a-function.txt
+Patch30323: 3463-e1000-fix-CONFIG_PM-blocks.txt
+Patch30324: 3464-e1000-small-performance-tweak-by-removing-double-code.txt
+Patch30325: 3465-e1000-add-smart-power-down-code.txt
+Patch30326: 3467-e1000-recycle-skb.txt
+Patch30327: 3468-e1000-rework-module-param-code-with-uninitialized-values.txt
+Patch30328: 3469-e1000-force-register-write-flushes-to-circumvent-broken-platforms.txt
+Patch30329: 3470-e1000-disable-CRC-stripping-workaround.txt
+Patch30330: 3471-e1000-fix-adapter-led-blinking-inconsistency.txt
+Patch30331: 3472-e1000-M88-PHY-workaround.txt
+Patch30332: 3473-e1000-check-return-value-of-_get_speed_and_duplex.txt
+Patch30333: 3474-e1000-disable-ERT.txt
+Patch30334: 3475-e1000-add-ich8lan-core-functions.txt
+Patch30335: 3477-e1000-allow-user-to-disable-ich8-lock-loss-workaround.txt
+Patch30336: 3478-e1000-add-ich8lan-device-ID-s.txt
+Patch30337: 3479-e1000-increase-version-to-7.1.9-k2.txt
+Patch30338: 3482-64bit-resource-fix-up-printks-for-resources-in-networks-drivers.txt
+Patch30339: 3648-m68knommu-avoid-fec-driver-hang-when-link-disappears.txt
+Patch30340: 3649-m68knommu-FEC-driver-support-for-the-ColdFire-523x-CPU-family.txt
+Patch30341: 3650-m68knommu-FEC-driver-set-different-priority-level-on-each-IRQ.txt
+Patch30342: 3651-m68knommu-FEC-driver-event-irq-fixes.txt
+Patch30343: 3995-NETFILTER-x_tables-fix-xt_register_table-error-propagation.txt
+Patch30344: 3996-NETFILTER-nf_conntrack-Fix-undefined-references-to-local_bh_.txt
+Patch30345: 3997-NETFILTER-xt_tcpudp-fix-double-unregistration-in-error-path.txt
+Patch30346: 3998-NETFILTER-xt_sctp-fix-chunk-types-matching.txt
+Patch30347: 3999-NETFILTER-ip_queue-nfnetlink_queue-drop-bridge-port-references-when-dev-disappears.txt
+Patch30348: 4000-NETFILTER-statistic-match-add-missing-Kconfig-help-text.txt
+Patch30349: 4003-TCP-Export-accept-queue-len-of-a-TCP-listening-socket-via-rx_queue.txt
+Patch30350: 4005-PKT_SCHED-PSCHED_TADD-and-PSCHED_TADD2-can-result-tv_usec-1000000.txt
+Patch30351: 4007-AF_UNIX-Datagram-getpeersec.txt
+Patch30352: 4013-ATM-basic-sysfs-support-for-ATM-devices.txt
+Patch30353: 4014-BNX2-Use-dev_kfree_skb-instead-of-the-_irq-version.txt
+Patch30354: 4015-BNX2-Turn-off-link-during-shutdown.txt
+Patch30355: 4016-IrDA-MCS7780-usb_driver-struct-should-be-static.txt
+Patch30356: 4017-NETFILTE-ipv4-Fix-typo-Bugzilla-6753.txt
+Patch30357: 4019-XFRM-unexport-xfrm_state_mtu.txt
+Patch30358: 4020-IrDA-Fix-RCU-lock-pairing-on-error-path.txt
+Patch30359: 4021-IrDA-Fix-the-AU1000-FIR-dependencies.txt
+Patch30360: 4022-TIPC-Fixed-skb_under_panic-caused-by-tipc_link_bundle_buf.txt
+Patch30361: 4023-TIPC-Improve-response-to-requests-for-node-link-information.txt
+Patch30362: 4024-TIPC-Initial-activation-message-now-includes-TIPC-version-number.txt
+Patch30363: 4062-typo-fixes-bandwith-bandwidth.txt
+Patch30364: 4066-typo-fixes-infomation-information.txt
+Patch30365: 4067-typo-fixes-occuring-occurring.txt
+Patch30366: 4072-Kconfig-Typos-in-net-sched-Kconfig.txt
+Patch30367: 4131-knfsd-svcrpc-gss-simplify-rsc_parse.txt
+Patch30368: 4134-knfsd-svcrpc-Simplify-nfsd-rpcsec_gss-integrity-code.txt
+Patch30369: 4135-knfsd-nfsd-mark-rqstp-to-prevent-use-of-sendfile-in-privacy-case.txt
+Patch30370: 4136-knfsd-svcrpc-gss-server-side-implementation-of-rpcsec_gss-privacy.txt
+Patch30371: 4167-pcmcia-hostap_cs.c-0xc00f-0x0000-conflicts-with-pcnet_cs.txt
+Patch30372: 4172-com20020_cs-more-device-support.txt
+Patch30373: 4177-TG3-Add-tg3_netif_stop-in-vlan-functions.txt
+Patch30374: 4178-TG3-Add-rx-BD-workaround.txt
+Patch30375: 4179-TG3-Turn-on-hw-fix-for-ASF-problems.txt
+Patch30376: 4181-TG3-Update-version-and-reldate.txt
+Patch30377: 4183-IPV6-Remove-redundant-length-check-on-input.txt
+Patch30378: 4417-bcm43xx-netlink-deadlock-fix.txt
+Patch30379: 4516-forcedeth-typecast-cleanup.txt
+Patch30380: 4523-AF_UNIX-datagram-getpeersec-fix.txt
+Patch30381: 4526-ROSE-Fix-dereference-of-skb-pointer-after-free.txt
+Patch30382: 4527-AX.25-Reference-counting-for-AX.25-routes.txt
+Patch30383: 4528-NETROM-Use-socket-helpers-instead-of-direct-fiddling-with-struct-sock.txt
+Patch30384: 4529-ROSE-Try-all-routes-when-establishing-a-ROSE-connections.txt
+Patch30385: 4532-TIPC-Fixed-sk_buff-panic-caused-by-tipc_link_bundle_buf-REVISED.txt
+Patch30386: 4539-BRIDGE-br_dump_ifinfo-index-fix.txt
+Patch30387: 4542-Bluetooth-Correct-SCO-buffer-size-on-request.txt
+Patch30388: 4543-Bluetooth-Add-automatic-sniff-mode-support.txt
+Patch30389: 4544-Bluetooth-Add-platform-device-for-virtual-and-serial-devices.txt
+Patch30390: 4546-Bluetooth-Small-cleanup-of-the-L2CAP-source-code.txt
+Patch30391: 4547-Bluetooth-Allow-disabling-of-credit-based-flow-control.txt
+Patch30392: 4548-Bluetooth-Add-RFCOMM-role-switch-support.txt
+Patch30393: 4570-This-fixes-a-panic-doing-the-first-READDIR-or-READDIRPLUS-call-when.txt
+Patch30394: 4572-netdrvr-epic100-minor-cleanups.txt
+Patch30395: 4574-netdrvr-Remove-Becker-template-io_size-member-when-invariant.txt
+Patch30396: 4575-netdrvr-via-velocity-use-netdev_priv-where-appropriate.txt
+Patch30397: 4577-netdrvr-via-velocity-misc.-cleanups.txt
+Patch30398: 4578-netdrvr-via-velocity-remove-io_size-struct-member-it-is-invariant.txt
+Patch30399: 4579-netdrvr-Use-dev_printk-when-ethernet-interface-isn-t-available.txt
+Patch30400: 4581-Add-two-PLX-device-IDs.txt
+Patch30401: 4582-bcm43xx-use-softmac-suggested-TX-rate.txt
+Patch30402: 4584-ieee80211-fix-not-allocating-IV-ICV-space-when-usingencryption-in-ieee80211_tx_frame.txt
+Patch30403: 4585-skb-used-after-passing-to-netif_rx-in-net-ieee80211-ieee80211_rx.c.txt
+Patch30404: 4587-2.6.17-missing-a-call-to-ieee80211softmac_capabilities-from-ieee80211softmac_assoc_req.txt
+Patch30405: 4589-SoftMAC-Prevent-multiple-authentication-attempts-on-the-same-network.txt
+Patch30406: 4590-SoftMAC-Add-network-to-ieee80211softmac_call_events-when-associate-times-out.txt
+Patch30407: 4591-CONFIG_WIRELESS_EXT-is-neccessary-after-all.txt
+Patch30408: 4592-softmac-fix-build-break-from-881ee6999d66c8fc903b429b73bbe6045b38c549.txt
+Patch30409: 4593-ZyDAS-ZD1211-USB-WLAN-driver.txt
+Patch30410: 4594-zd1211rw-disable-TX-queue-during-stop.txt
+Patch30411: 4595-Add-support-for-the-Cicada-8201-PHY.txt
+Patch30412: 4596-pcnet32-Fix-Section-mismatch-error.txt
+Patch30413: 4597-pcnet32-Use-PCI_DEVICE-macro.txt
+Patch30414: 4598-pcnet32-Fix-off-by-one-in-get_ringparam.txt
+Patch30415: 4599-pcnet32-Use-kcalloc-instead-of-kmalloc-and-memset.txt
+Patch30416: 4600-pcnet32-Handle-memory-allocation-failures-cleanly-when-resizing-tx-rx-rings.txt
+Patch30417: 4601-pcnet32-Suspend-the-chip-rather-than-restart-when-changing-multicast-promisc.txt
+Patch30418: 4602-pcnet32-Cleanup-rx-buffers-after-loopback-test.txt
+Patch30419: 4604-NI5010-netcard-cleanup.txt
+Patch30420: 4605-remove-dead-entry-in-net-wan-Kconfig.txt
+Patch30421: 4606-Fix-freeing-of-net-device.txt
+Patch30422: 4611-netdrvr-3c59x-snip-changelog-from-source-code.txt
+Patch30423: 4612-8139too-deadlock-fix.txt
+Patch30424: 4634-PKT_SCHED-Fix-illegal-memory-dereferences-when-dumping-actions.txt
+Patch30425: 4635-PKT_SCHED-Return-ENOENT-if-action-module-is-unavailable.txt
+Patch30426: 4636-PKT_SCHED-Fix-error-handling-while-dumping-actions.txt
+Patch30427: 4646-wireless-add-acx-driver.txt
+Patch30428: 4647-acxsm-merge-from-acx-0.3.32.txt
+Patch30429: 4648-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt
+Patch30430: 4649-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt
+Patch30431: 4650-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt
+Patch30432: 4651-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt
+Patch30433: 4652-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt
+Patch30434: 4653-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt
+Patch30435: 4654-fix-tiacx-on-alpha.txt
+Patch30436: 4655-tiacx-fix-attribute-packed-warnings.txt
+Patch30437: 4656-tiacx-pci-build-fix.txt
+Patch30438: 4657-tiacx-support-ia64.txt
+Patch30439: 4660-NET-Fix-network-device-interface-printk-message-priority.txt
+Patch30440: 4661-TG3-add-amd8131-to-write-reorder-chipsets.txt
+Patch30441: 4664-IRDA-fix-drivers-net-irda-ali-ircc.c-ali_ircc_init.txt
+Patch30442: 4667-NET-Fix-IPv4-DECnet-routing-rule-dumping.txt
+Patch30443: 4671-PKT_SCHED-act_api-Fix-module-leak-while-flushing-actions.txt
+Patch30444: 4672-ATM-net-atm-clip.c-fix-PROC_FS-n-compile.txt
+Patch30445: 4673-AX.25-Use-kzalloc.txt
+Patch30446: 4686-bcm43xx-softmac-Fix-an-off-by-one-condition-in-handle_irq_noise.txt
+Patch30447: 4687-zd1211rw-usb_clear_halt-not-allowed-in-IRQ-context.txt
+Patch30448: 4691-bcm43xx-improved-statistics.txt
+Patch30449: 4692-zd1211rw-Add-Sagem-device-ID-s.txt
+Patch30450: 4693-tiacx-don-t-use-UTS_RELEASE.txt
+Patch30451: 4716-release_firmware-fixes.txt
+Patch30452: 4821-AX.25-Get-rid-of-the-last-volatile.txt
+Patch30453: 4822-IPV4-inetpeer-Get-rid-of-volatile-from-peer_total.txt
+Patch30454: 4824-TCP-Remove-TCP-Compound.txt
+Patch30455: 4825-DCCP-Fix-sparse-warnings.txt
+Patch30456: 4834-IPV6-order-addresses-by-scope.txt
+Patch30457: 4835-AX.25-Fix-locking-of-ax25-protocol-function-list.txt
+Patch30458: 4837-NETROM-Drop-lock-before-calling-nr_destroy_socket.txt
+Patch30459: 4840-TCP-tcp_highspeed-Fix-AI-updates.txt
+Patch30460: 4841-IPV6-Use-ipv6_addr_src_scope-for-link-address-sorting.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2115,312 +2113,308 @@
 %patch30308 -p1
 # drivers: use list_move()
 %patch30309 -p1
-# devfs: Remove the miscdevice devfs_name field as it's no longer needed
-%patch30310 -p1
-# devfs: Remove the tty_driver devfs_name field as it's no longer needed
-%patch30311 -p1
 # DM9000 - better checks for platform resources
-%patch30312 -p1
+%patch30310 -p1
 # DM9000 - check for MAC left in by bootloader
-%patch30313 -p1
+%patch30311 -p1
 # DM9000 - do no re-init spin lock
-%patch30314 -p1
+%patch30312 -p1
 # DM9000 - minor code cleanups
-%patch30315 -p1
+%patch30313 -p1
 # Fix phy id for LXT971A/LXT972A
-%patch30316 -p1
+%patch30314 -p1
 # drivers/net/hamradio/dmascc.c: fix section mismatch
-%patch30317 -p1
+%patch30315 -p1
 # WAN: update info page for a bunch of my drivers
-%patch30318 -p1
+%patch30316 -p1
 # [netdrvr] natsemi: Separate out media initialization code
-%patch30319 -p1
+%patch30317 -p1
 # [netdrvr] natsemi: minor cleanups
-%patch30320 -p1
+%patch30318 -p1
 # [netdrvr] Remove long-unused bits from Becker template drivers
-%patch30321 -p1
+%patch30319 -p1
 # e1000: fix loopback ethtool test
-%patch30322 -p1
+%patch30320 -p1
 # e1000: rework driver hardware reset locking
-%patch30323 -p1
+%patch30321 -p1
 # e1000: Make PHY powerup/down a function
-%patch30324 -p1
+%patch30322 -p1
 # e1000: fix CONFIG_PM blocks
-%patch30325 -p1
+%patch30323 -p1
 # e1000: small performance tweak by removing double code
-%patch30326 -p1
+%patch30324 -p1
 # e1000: add smart power down code
-%patch30327 -p1
+%patch30325 -p1
 # e1000: recycle skb
-%patch30328 -p1
+%patch30326 -p1
 # e1000: rework module param code with uninitialized values
-%patch30329 -p1
+%patch30327 -p1
 # e1000: force register write flushes to circumvent broken platforms
-%patch30330 -p1
+%patch30328 -p1
 # e1000: disable CRC stripping workaround
-%patch30331 -p1
+%patch30329 -p1
 # e1000: fix adapter led blinking inconsistency
-%patch30332 -p1
+%patch30330 -p1
 # e1000: M88 PHY workaround
-%patch30333 -p1
+%patch30331 -p1
 # e1000: check return value of _get_speed_and_duplex
-%patch30334 -p1
+%patch30332 -p1
 # e1000: disable ERT
-%patch30335 -p1
+%patch30333 -p1
 # e1000: add ich8lan core functions
-%patch30336 -p1
+%patch30334 -p1
 # e1000: allow user to disable ich8 lock loss workaround
-%patch30337 -p1
+%patch30335 -p1
 # e1000: add ich8lan device ID's
-%patch30338 -p1
+%patch30336 -p1
 # e1000: increase version to 7.1.9-k2
-%patch30339 -p1
+%patch30337 -p1
 # 64bit resource: fix up printks for resources in networks drivers
-%patch30340 -p1
+%patch30338 -p1
 # m68knommu: avoid fec driver hang when link disappears
-%patch30341 -p1
+%patch30339 -p1
 # m68knommu: FEC driver support for the ColdFire 523x CPU family
-%patch30342 -p1
+%patch30340 -p1
 # m68knommu: FEC driver set different priority/level on each IRQ
-%patch30343 -p1
+%patch30341 -p1
 # m68knommu: FEC driver event/irq fixes
-%patch30344 -p1
+%patch30342 -p1
 # [NETFILTER]: x_tables: fix xt_register_table error propagation
-%patch30345 -p1
+%patch30343 -p1
 # [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_\*
-%patch30346 -p1
+%patch30344 -p1
 # [NETFILTER]: xt_tcpudp: fix double unregistration in error path
-%patch30347 -p1
+%patch30345 -p1
 # [NETFILTER]: xt_sctp: fix --chunk-types matching
-%patch30348 -p1
+%patch30346 -p1
 # [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev disappears
-%patch30349 -p1
+%patch30347 -p1
 # [NETFILTER]: statistic match: add missing Kconfig help text
-%patch30350 -p1
+%patch30348 -p1
 # [TCP]: Export accept queue len of a TCP listening socket via rx_queue
-%patch30351 -p1
+%patch30349 -p1
 # [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
-%patch30352 -p1
+%patch30350 -p1
 # [AF_UNIX]: Datagram getpeersec
-%patch30353 -p1
+%patch30351 -p1
 # [ATM]: basic sysfs support for ATM devices
-%patch30354 -p1
+%patch30352 -p1
 # [BNX2]: Use dev_kfree_skb() instead of the _irq version
-%patch30355 -p1
+%patch30353 -p1
 # [BNX2]: Turn off link during shutdown
-%patch30356 -p1
+%patch30354 -p1
 # [IrDA]: MCS7780 usb_driver struct should be static
-%patch30357 -p1
+%patch30355 -p1
 # [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
-%patch30358 -p1
+%patch30356 -p1
 # [XFRM]: unexport xfrm_state_mtu
-%patch30359 -p1
+%patch30357 -p1
 # [IrDA]: Fix RCU lock pairing on error path
-%patch30360 -p1
+%patch30358 -p1
 # [IrDA]: Fix the AU1000 FIR dependencies
-%patch30361 -p1
+%patch30359 -p1
 # [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
-%patch30362 -p1
+%patch30360 -p1
 # [TIPC]: Improve response to requests for node/link information
-%patch30363 -p1
+%patch30361 -p1
 # [TIPC]: Initial activation message now includes TIPC version number
-%patch30364 -p1
+%patch30362 -p1
 # typo fixes: bandwith -> bandwidth
-%patch30365 -p1
+%patch30363 -p1
 # typo fixes: infomation -> information
-%patch30366 -p1
+%patch30364 -p1
 # typo fixes: occuring -> occurring
-%patch30367 -p1
+%patch30365 -p1
 # Kconfig: Typos in net/sched/Kconfig
-%patch30368 -p1
+%patch30366 -p1
 # knfsd: svcrpc: gss: simplify rsc_parse()
-%patch30369 -p1
+%patch30367 -p1
 # knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code
-%patch30370 -p1
+%patch30368 -p1
 # knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case
-%patch30371 -p1
+%patch30369 -p1
 # knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy
-%patch30372 -p1
+%patch30370 -p1
 # pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
-%patch30373 -p1
+%patch30371 -p1
 # com20020_cs: more device support
-%patch30374 -p1
+%patch30372 -p1
 # [TG3]: Add tg3_netif_stop() in vlan functions
-%patch30375 -p1
+%patch30373 -p1
 # [TG3]: Add rx BD workaround
-%patch30376 -p1
+%patch30374 -p1
 # [TG3]: Turn on hw fix for ASF problems
-%patch30377 -p1
+%patch30375 -p1
 # [TG3]: Update version and reldate
-%patch30378 -p1
+%patch30376 -p1
 # [IPV6]: Remove redundant length check on input
-%patch30379 -p1
+%patch30377 -p1
 # bcm43xx: netlink deadlock fix
-%patch30380 -p1
+%patch30378 -p1
 # forcedeth: typecast cleanup
-%patch30381 -p1
+%patch30379 -p1
 # [AF_UNIX]: datagram getpeersec fix
-%patch30382 -p1
+%patch30380 -p1
 # [ROSE]: Fix dereference of skb pointer after free.
-%patch30383 -p1
+%patch30381 -p1
 # [AX.25]: Reference counting for AX.25 routes.
-%patch30384 -p1
+%patch30382 -p1
 # [NETROM]: Use socket helpers instead of direct fiddling with struct sock
-%patch30385 -p1
+%patch30383 -p1
 # [ROSE]: Try all routes when establishing a ROSE connections.
-%patch30386 -p1
+%patch30384 -p1
 # [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED)
-%patch30387 -p1
+%patch30385 -p1
 # [BRIDGE]: br_dump_ifinfo index fix
-%patch30388 -p1
+%patch30386 -p1
 # [Bluetooth] Correct SCO buffer size on request
-%patch30389 -p1
+%patch30387 -p1
 # [Bluetooth] Add automatic sniff mode support
-%patch30390 -p1
+%patch30388 -p1
 # [Bluetooth] Add platform device for virtual and serial devices
-%patch30391 -p1
+%patch30389 -p1
 # [Bluetooth] Small cleanup of the L2CAP source code
-%patch30392 -p1
+%patch30390 -p1
 # [Bluetooth] Allow disabling of credit based flow control
-%patch30393 -p1
+%patch30391 -p1
 # [Bluetooth] Add RFCOMM role switch support
-%patch30394 -p1
+%patch30392 -p1
 # This fixes a panic doing the first READDIR or READDIRPLUS call when:
-%patch30395 -p1
+%patch30393 -p1
 # [netdrvr] epic100: minor cleanups
-%patch30396 -p1
+%patch30394 -p1
 # [netdrvr] Remove Becker-template 'io_size' member, when invariant
-%patch30397 -p1
+%patch30395 -p1
 # [netdrvr] via-velocity: use netdev_priv() where appropriate
-%patch30398 -p1
+%patch30396 -p1
 # [netdrvr] via-velocity: misc. cleanups
-%patch30399 -p1
+%patch30397 -p1
 # [netdrvr] via-velocity: remove io_size struct member, it is invariant
-%patch30400 -p1
+%patch30398 -p1
 # [netdrvr] Use dev_printk() when ethernet interface isn't available
-%patch30401 -p1
+%patch30399 -p1
 # Add two PLX device IDs
-%patch30402 -p1
+%patch30400 -p1
 # bcm43xx: use softmac-suggested TX rate
-%patch30403 -p1
+%patch30401 -p1
 # ieee80211: fix not allocating IV+ICV space when usingencryption in ieee80211_tx_frame
-%patch30404 -p1
+%patch30402 -p1
 # skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.c
-%patch30405 -p1
+%patch30403 -p1
 # 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211softmac_assoc_req
-%patch30406 -p1
+%patch30404 -p1
 # SoftMAC: Prevent multiple authentication attempts on the same network
-%patch30407 -p1
+%patch30405 -p1
 # SoftMAC: Add network to ieee80211softmac_call_events when associate times out
-%patch30408 -p1
+%patch30406 -p1
 # CONFIG_WIRELESS_EXT is neccessary after all
-%patch30409 -p1
+%patch30407 -p1
 # softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
-%patch30410 -p1
+%patch30408 -p1
 # ZyDAS ZD1211 USB-WLAN driver
-%patch30411 -p1
+%patch30409 -p1
 # zd1211rw: disable TX queue during stop
-%patch30412 -p1
+%patch30410 -p1
 # Add support for the Cicada 8201 PHY
-%patch30413 -p1
+%patch30411 -p1
 # pcnet32: Fix Section mismatch error
-%patch30414 -p1
+%patch30412 -p1
 # pcnet32: Use PCI_DEVICE macro
-%patch30415 -p1
+%patch30413 -p1
 # pcnet32: Fix off-by-one in get_ringparam
-%patch30416 -p1
+%patch30414 -p1
 # pcnet32: Use kcalloc instead of kmalloc and memset
-%patch30417 -p1
+%patch30415 -p1
 # pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
-%patch30418 -p1
+%patch30416 -p1
 # pcnet32: Suspend the chip rather than restart when changing multicast/promisc
-%patch30419 -p1
+%patch30417 -p1
 # pcnet32: Cleanup rx buffers after loopback test.
-%patch30420 -p1
+%patch30418 -p1
 # NI5010 netcard cleanup
-%patch30421 -p1
+%patch30419 -p1
 # remove dead entry in net wan Kconfig
-%patch30422 -p1
+%patch30420 -p1
 # Fix freeing of net device
-%patch30423 -p1
+%patch30421 -p1
 # [netdrvr] 3c59x: snip changelog from source code
-%patch30424 -p1
+%patch30422 -p1
 # 8139too deadlock fix
-%patch30425 -p1
+%patch30423 -p1
 # [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
-%patch30426 -p1
+%patch30424 -p1
 # [PKT_SCHED]: Return ENOENT if action module is unavailable
-%patch30427 -p1
+%patch30425 -p1
 # [PKT_SCHED]: Fix error handling while dumping actions
-%patch30428 -p1
+%patch30426 -p1
 # wireless: add acx driver
-%patch30429 -p1
+%patch30427 -p1
 # acxsm: merge from acx 0.3.32
-%patch30430 -p1
+%patch30428 -p1
 # tiacx: Let only ACX_PCI/ACX_USB be user-visible
-%patch30431 -p1
+%patch30429 -p1
 # tiacx: revert "neither PCI nor USB is selected" change
-%patch30432 -p1
+%patch30430 -p1
 # tiacx: implement much more flexible firmware statistics parsing
-%patch30433 -p1
+%patch30431 -p1
 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
-%patch30434 -p1
+%patch30432 -p1
 # tiacx: fix breakage of "Get rid of circular list of adev's"
-%patch30435 -p1
+%patch30433 -p1
 # tiacx: split module into acx-common + acx-pci + acx-usb
-%patch30436 -p1
+%patch30434 -p1
 # fix tiacx on alpha
-%patch30437 -p1
+%patch30435 -p1
 # tiacx: fix attribute packed warnings
-%patch30438 -p1
+%patch30436 -p1
 # tiacx: pci build fix
-%patch30439 -p1
+%patch30437 -p1
 # tiacx: support ia64
-%patch30440 -p1
+%patch30438 -p1
 # [NET]: Fix network device interface printk message priority
-%patch30441 -p1
+%patch30439 -p1
 # [TG3]: add amd8131 to "write reorder" chipsets
-%patch30442 -p1
+%patch30440 -p1
 # [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
-%patch30443 -p1
+%patch30441 -p1
 # [NET]: Fix IPv4/DECnet routing rule dumping
-%patch30444 -p1
+%patch30442 -p1
 # [PKT_SCHED]: act_api: Fix module leak while flushing actions
-%patch30445 -p1
+%patch30443 -p1
 # [ATM] net/atm/clip.c: fix PROC_FS=n compile
-%patch30446 -p1
+%patch30444 -p1
 # [AX.25]: Use kzalloc
-%patch30447 -p1
+%patch30445 -p1
 # bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
-%patch30448 -p1
+%patch30446 -p1
 # zd1211rw: usb_clear_halt not allowed in IRQ context
-%patch30449 -p1
+%patch30447 -p1
 # bcm43xx: improved statistics
-%patch30450 -p1
+%patch30448 -p1
 # zd1211rw: Add Sagem device ID's
-%patch30451 -p1
+%patch30449 -p1
 # tiacx - don't use UTS_RELEASE
-%patch30452 -p1
+%patch30450 -p1
 # release_firmware() fixes
-%patch30453 -p1
+%patch30451 -p1
 # [AX.25]: Get rid of the last volatile.
-%patch30454 -p1
+%patch30452 -p1
 # [IPV4] inetpeer: Get rid of volatile from peer_total
-%patch30455 -p1
+%patch30453 -p1
 # [TCP]: Remove TCP Compound
-%patch30456 -p1
+%patch30454 -p1
 # [DCCP]: Fix sparse warnings.
-%patch30457 -p1
+%patch30455 -p1
 # [IPV6]: order addresses by scope
-%patch30458 -p1
+%patch30456 -p1
 # [AX.25]: Fix locking of ax25 protocol function list.
-%patch30459 -p1
+%patch30457 -p1
 # [NETROM]: Drop lock before calling nr_destroy_socket
-%patch30460 -p1
+%patch30458 -p1
 # [TCP] tcp_highspeed: Fix AI updates.
-%patch30461 -p1
+%patch30459 -p1
 # [IPV6]: Use ipv6_addr_src_scope for link address sorting.
-%patch30462 -p1
+%patch30460 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3328,8 +3322,6 @@
 - spelling fixes
 - net/rxrpc: use list_move()
 - drivers: use list_move()
-- devfs: Remove the miscdevice devfs_name field as it's no longer needed
-- devfs: Remove the tty_driver devfs_name field as it's no longer needed
 - DM9000 - better checks for platform resources
 - DM9000 - check for MAC left in by bootloader
 - DM9000 - do no re-init spin lock


--- 3262-devfs-Remove-the-miscdevice-devfs_name-field-as-it-s-no-longer-needed.txt DELETED ---


--- 3266-devfs-Remove-the-tty_driver-devfs_name-field-as-it-s-no-longer-needed.txt DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 20:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 16:55:53 -0400
Subject: rpms/mkinitrd/devel sources,1.134,1.135
Message-ID: <200607132055.k6DKtr2Z005436@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5423

Modified Files:
	sources 
Log Message:
- sigh



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	13 Jul 2006 20:49:15 -0000	1.134
+++ sources	13 Jul 2006 20:55:51 -0000	1.135
@@ -1,2 +1,2 @@
 532a6c99623f05b7944d5ea45051dd24  bdevid-0.1.tar.bz2
-4e0f3b8a9715b20bddeeaa9a45b8d889  mkinitrd-5.0.47.tar.bz2
+b51fb36b94ee68027da84ab9f0c752ee  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:01:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:01:45 -0400
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.16,1.17
Message-ID: <200607132101.k6DL1jeX005588@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5561

Modified Files:
	geronimo-specs.spec 
Log Message:
Reenable s390 s390x ppc64 excluded due to eclipse




Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- geronimo-specs.spec	12 Jul 2006 05:54:38 -0000	1.16
+++ geronimo-specs.spec	13 Jul 2006 21:01:42 -0000	1.17
@@ -1,17 +1,15 @@
 %define bname           geronimo
-%define name            geronimo-specs
-%define version         1.0
 %define mstone		M2
-%define release 	0.%{mstone}.2jpp_9fc
+
 %define section         free
 
 Summary:        Geronimo J2EE server J2EE specifications
 URL:            http://geronimo.apache.org
 Source0:        %{bname}-%{version}-%{mstone}-src.tar.gz
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           geronimo-specs
+Version:        1.0
+Release: 	0.%{mstone}.2jpp_10fc
 Epoch:          0
 License:        Apache Software License 2
 Group:          Development/Libraries/Java
@@ -27,8 +25,6 @@
 Requires(post):   java-gcj-compat >= 1.0.31
 Requires(postun): java-gcj-compat >= 1.0.31
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
 
 %description
 Geronimo is Apache's ASF-licenced J2EE server project.
@@ -123,6 +119,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Thu Jul 13 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.M2.2jpp_10fc
+- Reenable s390 s390x ppc64 excluded due to eclipse
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.M2.2jpp_9fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:04:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:04:12 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.137,1.138 sources,1.135,1.136
Message-ID: <200607132104.k6DL4Cdg005733@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5615

Modified Files:
	mkinitrd.spec sources 
Log Message:
- maybe this will be the last one...



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- mkinitrd.spec	13 Jul 2006 20:53:28 -0000	1.137
+++ mkinitrd.spec	13 Jul 2006 21:04:08 -0000	1.138
@@ -69,8 +69,9 @@
 make test
 if [ $? != 0 ]; then exit 1; fi
 cd ..
-cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{version}/bdevid/
-cp -a mkinitrd-%{version}/nash/include/nash* bdevid-%{version}/bdevid/include/
+cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
+cp -a mkinitrd-%{version}/nash/include/nash* \
+	bdevid-%{BDEVID_VERSION}/include/
 cd bdevid-%{BDEVID_VERSION}
 make LIB=%{_lib}
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	13 Jul 2006 20:55:51 -0000	1.135
+++ sources	13 Jul 2006 21:04:08 -0000	1.136
@@ -1,2 +1,2 @@
-532a6c99623f05b7944d5ea45051dd24  bdevid-0.1.tar.bz2
-b51fb36b94ee68027da84ab9f0c752ee  mkinitrd-5.0.47.tar.bz2
+9f84c9ef0738f9ff7d5fc814a2310f16  bdevid-0.1.tar.bz2
+2490349906b90610b8b0786226ea4822  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:10:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:10:16 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2392,1.2393
Message-ID: <200607132110.k6DLAG6J016413@cvs.devel.redhat.com>

Author: roland

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix transposed spec lines that broke kdump package.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2392
retrieving revision 1.2393
diff -u -r1.2392 -r1.2393
--- kernel-2.6.spec	13 Jul 2006 17:16:11 -0000	1.2392
+++ kernel-2.6.spec	13 Jul 2006 21:10:14 -0000	1.2393
@@ -1643,9 +1643,8 @@
 %endif
 
 %if %{buildkdump}
-
-%files kdump
 %build_debuginfo %{image_install_path} kdump
+%files kdump
 %defattr(-,root,root)
 /%{image_install_path}/vmlinux-%{KVERREL}kdump
 /boot/System.map-%{KVERREL}kdump
@@ -1677,6 +1676,9 @@
 %endif
 
 %changelog
+* Thu Jul 13 2006 Roland McGrath <roland at redhat.com>
+- Fix spec typo that swallowed kdump subpackage.
+
 * Thu Jul 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git6
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:10:45 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.138,1.139 sources,1.136,1.137
Message-ID: <200607132110.k6DLAjC0016614@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16582

Modified Files:
	mkinitrd.spec sources 
Log Message:
- no really...


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- mkinitrd.spec	13 Jul 2006 21:04:08 -0000	1.138
+++ mkinitrd.spec	13 Jul 2006 21:10:42 -0000	1.139
@@ -17,7 +17,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 >= 1.38-12
-BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig, glib2
+BuildRequires: popt e2fsprogs-devel parted-devel >= 1.7.1-9, pkgconfig, glib2-devel
 BuildRequires: libdhcp4client-devel, libdhcp6client-devel, libdhcp-devel >= 1.9
 BuildRequires: device-mapper libselinux-devel libsepol-devel, python-devel >= %{pyver}
 %ifnarch s390 s390x


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	13 Jul 2006 21:04:08 -0000	1.136
+++ sources	13 Jul 2006 21:10:42 -0000	1.137
@@ -1,2 +1,2 @@
 9f84c9ef0738f9ff7d5fc814a2310f16  bdevid-0.1.tar.bz2
-2490349906b90610b8b0786226ea4822  mkinitrd-5.0.47.tar.bz2
+6f4a12d38a78dafe9a034d71b660391a  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:16:02 -0400
Subject: rpms/mkinitrd/devel sources,1.137,1.138
Message-ID: <200607132116.k6DLG23W021176@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20104

Modified Files:
	sources 
Log Message:
- at least it got to bdevid in the build.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	13 Jul 2006 21:10:42 -0000	1.137
+++ sources	13 Jul 2006 21:16:00 -0000	1.138
@@ -1,2 +1,2 @@
-9f84c9ef0738f9ff7d5fc814a2310f16  bdevid-0.1.tar.bz2
 6f4a12d38a78dafe9a034d71b660391a  mkinitrd-5.0.47.tar.bz2
+9336d33e6f75527c68ee09053c6b40c1  bdevid-0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:17:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:17:54 -0400
Subject: rpms/kernel/devel
	linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch, NONE,
	1.1 kernel-2.6.spec, 1.2393, 1.2394
Message-ID: <200607132117.k6DLHsKM001665@cvs.devel.redhat.com>

Author: mchristi

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch 
Log Message:
add iscsi update patch (linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch). This patch syncs the FC kernel with what is being pushed upstream for hopefully 2.6.18-rc2 or rc3 (depends when the scsi maintainer merges and pushes)

linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch:
 drivers/infiniband/ulp/iser/iscsi_iser.c |   41 +++---
 drivers/scsi/iscsi_tcp.c                 |  209 +++++++++++-------------------
 drivers/scsi/iscsi_tcp.h                 |    2 
 drivers/scsi/libiscsi.c                  |  211 ++++++++++++++++---------------
 drivers/scsi/scsi_transport_iscsi.c      |   15 +-
 include/scsi/libiscsi.h                  |   19 ++
 include/scsi/scsi_transport_iscsi.h      |    4 
 7 files changed, 246 insertions(+), 255 deletions(-)

--- NEW FILE linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch ---
diff -Naurp linux-2.6.17.x86_64/drivers/infiniband/ulp/iser/iscsi_iser.c linux-2.6.17.x86_64.iscsi/drivers/infiniband/ulp/iser/iscsi_iser.c
--- linux-2.6.17.x86_64/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-07-13 14:42:40.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/drivers/infiniband/ulp/iser/iscsi_iser.c	2006-07-13 14:46:28.000000000 -0500
@@ -285,6 +285,21 @@ iscsi_iser_ib_conn_lookup(__u64 ep_handl
 	return NULL;
 }
 
+static void
+iscsi_iser_conn_terminate(struct iscsi_conn *conn)
+{
+	struct iscsi_iser_conn *iser_conn = conn->dd_data;
+	struct iser_conn *ib_conn = iser_conn->ib_conn;
+
+	if(!ib_conn) 
+		return;
+
+	/* starts conn teardown process, waits until all previously   *
+	 * posted buffers get flushed, deallocates all conn resources */
+	iser_conn_terminate(ib_conn);
+	iser_conn->ib_conn = NULL;
+}
+
 static struct iscsi_cls_conn *
 iscsi_iser_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
 {
@@ -326,6 +341,7 @@ iscsi_iser_conn_destroy(struct iscsi_cls
 	struct iscsi_conn *conn = cls_conn->dd_data;
 	struct iscsi_iser_conn *iser_conn = conn->dd_data;
 
+	iscsi_iser_conn_terminate(conn);
 	iscsi_conn_teardown(cls_conn);
 	kfree(iser_conn);
 }
@@ -379,20 +395,14 @@ iscsi_iser_conn_start(struct iscsi_cls_c
 }
 
 static void
-iscsi_iser_conn_terminate(struct iscsi_conn *conn)
+iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
 {
-	struct iscsi_iser_conn *iser_conn = conn->dd_data;
-	struct iser_conn *ib_conn = iser_conn->ib_conn;
+	struct iscsi_conn *conn = cls_conn->dd_data;
 
-	BUG_ON(!ib_conn);
-	/* starts conn teardown process, waits until all previously   *
-	 * posted buffers get flushed, deallocates all conn resources */
-	iser_conn_terminate(ib_conn);
-	iser_conn->ib_conn = NULL;
-	conn->recv_lock = NULL;
+	iscsi_conn_stop(cls_conn, flag);
+	iscsi_iser_conn_terminate(conn);
 }
 
-
 static struct iscsi_transport iscsi_iser_transport;
 
 static struct iscsi_cls_session *
@@ -562,7 +572,11 @@ iscsi_iser_ep_disconnect(__u64 ep_handle
 
 	iser_err("ib conn %p state %d\n",ib_conn, ib_conn->state);
 
-	iser_conn_terminate(ib_conn);
+	/* under some err flows the ib conn isn't yet bounded to iscsi conn */
+	if (ib_conn->iser_conn)
+		iscsi_iser_conn_terminate(ib_conn->iser_conn->iscsi_conn);
+	else
+		iser_conn_terminate(ib_conn);
 }
 
 static struct scsi_host_template iscsi_iser_sht = {
@@ -613,10 +627,7 @@ static struct iscsi_transport iscsi_iser
 	.get_conn_param		= iscsi_conn_get_param,
 	.get_session_param	= iscsi_session_get_param,
 	.start_conn             = iscsi_iser_conn_start,
-	.stop_conn              = iscsi_conn_stop,
-	/* these are called as part of conn recovery */
-	.suspend_conn_recv	= NULL, /* FIXME is/how this relvant to iser? */
-	.terminate_conn		= iscsi_iser_conn_terminate,
+	.stop_conn              = iscsi_iser_conn_stop,
 	/* IO */
 	.send_pdu		= iscsi_conn_send_pdu,
 	.get_stats		= iscsi_iser_conn_get_stats,
diff -Naurp linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.c linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.c
--- linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.c	2006-07-13 14:42:44.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.c	2006-07-13 14:46:32.000000000 -0500
@@ -43,13 +43,10 @@
 
 #include "iscsi_tcp.h"
 
-#define ISCSI_TCP_VERSION "1.0-595"
-
 MODULE_AUTHOR("Dmitry Yusupov <dmitry_yus at yahoo.com>, "
 	      "Alex Aizman <itn780 at yahoo.com>");
 MODULE_DESCRIPTION("iSCSI/TCP data-path");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ISCSI_TCP_VERSION);
 /* #define DEBUG_TCP */
 #define DEBUG_ASSERT
 
@@ -185,11 +182,19 @@ iscsi_hdr_extract(struct iscsi_tcp_conn 
  * must be called with session lock
  */
 static void
-__iscsi_ctask_cleanup(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
+iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
 {
 	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
+	struct iscsi_r2t_info *r2t;
 	struct scsi_cmnd *sc;
 
+	/* flush ctask's r2t queues */
+	while (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*))) {
+		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
+			    sizeof(void*));
+		debug_scsi("iscsi_tcp_cleanup_ctask pending r2t dropped\n");
+	}
+
 	sc = ctask->sc;
 	if (unlikely(!sc))
 		return;
@@ -374,6 +379,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 		spin_unlock(&session->lock);
 		return 0;
 	}
+
 	rc = __kfifo_get(tcp_ctask->r2tpool.queue, (void*)&r2t, sizeof(void*));
 	BUG_ON(!rc);
 
@@ -399,7 +405,7 @@ iscsi_r2t_rsp(struct iscsi_conn *conn, s
 	tcp_ctask->exp_r2tsn = r2tsn + 1;
 	tcp_ctask->xmstate |= XMSTATE_SOL_HDR;
 	__kfifo_put(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*));
-	__kfifo_put(conn->xmitqueue, (void*)&ctask, sizeof(void*));
+	list_move_tail(&ctask->running, &conn->xmitqueue);
 
 	scsi_queue_work(session->host, &conn->xmitwork);
 	conn->r2t_pdus_cnt++;
@@ -477,6 +483,8 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
 	case ISCSI_OP_SCSI_DATA_IN:
 		tcp_conn->in.ctask = session->cmds[itt];
 		rc = iscsi_data_rsp(conn, tcp_conn->in.ctask);
+		if (rc)
+			return rc;
 		/* fall through */
 	case ISCSI_OP_SCSI_CMD_RSP:
 		tcp_conn->in.ctask = session->cmds[itt];
@@ -484,7 +492,7 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
 			goto copy_hdr;
 
 		spin_lock(&session->lock);
-		__iscsi_ctask_cleanup(conn, tcp_conn->in.ctask);
+		iscsi_tcp_cleanup_ctask(conn, tcp_conn->in.ctask);
 		rc = __iscsi_complete_pdu(conn, hdr, NULL, 0);
 		spin_unlock(&session->lock);
 		break;
@@ -500,13 +508,28 @@ iscsi_tcp_hdr_recv(struct iscsi_conn *co
 		break;
 	case ISCSI_OP_LOGIN_RSP:
 	case ISCSI_OP_TEXT_RSP:
-	case ISCSI_OP_LOGOUT_RSP:
-	case ISCSI_OP_NOOP_IN:
 	case ISCSI_OP_REJECT:
 	case ISCSI_OP_ASYNC_EVENT:
+		/*
+		 * It is possible that we could get a PDU with a buffer larger
+		 * than 8K, but there are no targets that currently do this.
+		 * For now we fail until we find a vendor that needs it
+		 */
+		if (DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH <
+		    tcp_conn->in.datalen) {
+			printk(KERN_ERR "iscsi_tcp: received buffer of len %u "
+			      "but conn buffer is only %u (opcode %0x)\n",
+			      tcp_conn->in.datalen,
+			      DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, opcode);
+			rc = ISCSI_ERR_PROTO;
+			break;
+		}
+
 		if (tcp_conn->in.datalen)
 			goto copy_hdr;
 	/* fall through */
+	case ISCSI_OP_LOGOUT_RSP:
+	case ISCSI_OP_NOOP_IN:
 	case ISCSI_OP_SCSI_TMFUNC_RSP:
 		rc = iscsi_complete_pdu(conn, hdr, NULL, 0);
 		break;
@@ -523,7 +546,7 @@ copy_hdr:
 	 * skbs to complete the command then we have to copy the header
 	 * for later use
 	 */
-	if (tcp_conn->in.zero_copy_hdr && tcp_conn->in.copy <
+	if (tcp_conn->in.zero_copy_hdr && tcp_conn->in.copy <=
 	   (tcp_conn->in.datalen + tcp_conn->in.padding +
 	    (conn->datadgst_en ? 4 : 0))) {
 		debug_tcp("Copying header for later use. in.copy %d in.datalen"
@@ -614,9 +637,9 @@ iscsi_ctask_copy(struct iscsi_tcp_conn *
  *	byte counters.
  **/
 static inline int
-iscsi_tcp_copy(struct iscsi_tcp_conn *tcp_conn)
+iscsi_tcp_copy(struct iscsi_conn *conn)
 {
-	void *buf = tcp_conn->data;
+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 	int buf_size = tcp_conn->in.datalen;
 	int buf_left = buf_size - tcp_conn->data_copied;
 	int size = min(tcp_conn->in.copy, buf_left);
@@ -627,7 +650,7 @@ iscsi_tcp_copy(struct iscsi_tcp_conn *tc
 	BUG_ON(size <= 0);
 
 	rc = skb_copy_bits(tcp_conn->in.skb, tcp_conn->in.offset,
-			   (char*)buf + tcp_conn->data_copied, size);
+			   (char*)conn->data + tcp_conn->data_copied, size);
 	BUG_ON(rc);
 
 	tcp_conn->in.offset += size;
@@ -745,10 +768,11 @@ static int iscsi_scsi_data_in(struct isc
 done:
 	/* check for non-exceptional status */
 	if (tcp_conn->in.hdr->flags & ISCSI_FLAG_DATA_STATUS) {
-		debug_scsi("done [sc %lx res %d itt 0x%x]\n",
-			   (long)sc, sc->result, ctask->itt);
+		debug_scsi("done [sc %lx res %d itt 0x%x flags 0x%x]\n",
+			   (long)sc, sc->result, ctask->itt,
+			   tcp_conn->in.hdr->flags);
 		spin_lock(&conn->session->lock);
-		__iscsi_ctask_cleanup(conn, ctask);
+		iscsi_tcp_cleanup_ctask(conn, ctask);
 		__iscsi_complete_pdu(conn, tcp_conn->in.hdr, NULL, 0);
 		spin_unlock(&conn->session->lock);
 	}
@@ -769,26 +793,25 @@ iscsi_data_recv(struct iscsi_conn *conn)
 		break;
 	case ISCSI_OP_SCSI_CMD_RSP:
 		spin_lock(&conn->session->lock);
-		__iscsi_ctask_cleanup(conn, tcp_conn->in.ctask);
+		iscsi_tcp_cleanup_ctask(conn, tcp_conn->in.ctask);
 		spin_unlock(&conn->session->lock);
 	case ISCSI_OP_TEXT_RSP:
 	case ISCSI_OP_LOGIN_RSP:
-	case ISCSI_OP_NOOP_IN:
 	case ISCSI_OP_ASYNC_EVENT:
 	case ISCSI_OP_REJECT:
 		/*
 		 * Collect data segment to the connection's data
 		 * placeholder
 		 */
-		if (iscsi_tcp_copy(tcp_conn)) {
+		if (iscsi_tcp_copy(conn)) {
 			rc = -EAGAIN;
 			goto exit;
 		}
 
-		rc = iscsi_complete_pdu(conn, tcp_conn->in.hdr, tcp_conn->data,
+		rc = iscsi_complete_pdu(conn, tcp_conn->in.hdr, conn->data,
 					tcp_conn->in.datalen);
 		if (!rc && conn->datadgst_en && opcode != ISCSI_OP_LOGIN_RSP)
-			iscsi_recv_digest_update(tcp_conn, tcp_conn->data,
+			iscsi_recv_digest_update(tcp_conn, conn->data,
 			  			tcp_conn->in.datalen);
 		break;
 	default:
@@ -843,7 +866,7 @@ more:
 		       if (rc == -EAGAIN)
 				goto nomore;
 		       else {
-				iscsi_conn_failure(conn, rc);
+				iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
 				return 0;
 		       }
 		}
@@ -897,7 +920,7 @@ more:
 		if (rc) {
 			if (rc == -EAGAIN)
 				goto again;
-			iscsi_conn_failure(conn, rc);
+			iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
 			return 0;
 		}
 		tcp_conn->in.copy -= tcp_conn->in.padding;
@@ -1028,9 +1051,8 @@ iscsi_conn_set_callbacks(struct iscsi_co
 }
 
 static void
-iscsi_conn_restore_callbacks(struct iscsi_conn *conn)
+iscsi_conn_restore_callbacks(struct iscsi_tcp_conn *tcp_conn)
 {
-	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 	struct sock *sk = tcp_conn->sock->sk;
 
 	/* restore socket callbacks, see also: iscsi_conn_set_callbacks() */
@@ -1308,7 +1330,7 @@ iscsi_tcp_cmd_init(struct iscsi_cmd_task
 				    ctask->imm_count -
 				    ctask->unsol_count;
 
-		debug_scsi("cmd [itt %x total %d imm %d imm_data %d "
+		debug_scsi("cmd [itt 0x%x total %d imm %d imm_data %d "
 			   "r2t_data %d]\n",
 			   ctask->itt, ctask->total_length, ctask->imm_count,
 			   ctask->unsol_count, tcp_ctask->r2t_data_count);
@@ -1636,7 +1658,7 @@ handle_xmstate_sol_data(struct iscsi_con
 	}
 solicit_again:
 	/*
-	 * send Data-Out whitnin this R2T sequence.
+	 * send Data-Out within this R2T sequence.
 	 */
 	if (!r2t->data_count)
 		goto data_out_done;
@@ -1731,7 +1753,7 @@ handle_xmstate_w_pad(struct iscsi_conn *
 	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
 	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 	struct iscsi_data_task *dtask = tcp_ctask->dtask;
-	int sent, rc;
+	int sent = 0, rc;
 
 	tcp_ctask->xmstate &= ~XMSTATE_W_PAD;
 	iscsi_buf_init_iov(&tcp_ctask->sendbuf, (char*)&tcp_ctask->pad,
@@ -1900,27 +1922,32 @@ iscsi_tcp_conn_create(struct iscsi_cls_s
 	tcp_conn->in_progress = IN_PROGRESS_WAIT_HEADER;
 	/* initial operational parameters */
 	tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
-	tcp_conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
-
-	/* allocate initial PDU receive place holder */
-	if (tcp_conn->data_size <= PAGE_SIZE)
-		tcp_conn->data = kmalloc(tcp_conn->data_size, GFP_KERNEL);
-	else
-		tcp_conn->data = (void*)__get_free_pages(GFP_KERNEL,
-					get_order(tcp_conn->data_size));
-	if (!tcp_conn->data)
-		goto max_recv_dlenght_alloc_fail;
 
 	return cls_conn;
 
-max_recv_dlenght_alloc_fail:
-	kfree(tcp_conn);
 tcp_conn_alloc_fail:
 	iscsi_conn_teardown(cls_conn);
 	return NULL;
 }
 
 static void
+iscsi_tcp_release_conn(struct iscsi_conn *conn)
+{
+	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
+
+	if (!tcp_conn->sock)
+		return;
+
+	sock_hold(tcp_conn->sock->sk);
+	iscsi_conn_restore_callbacks(tcp_conn);
+	sock_put(tcp_conn->sock->sk);
+
+	sock_release(tcp_conn->sock);
+	tcp_conn->sock = NULL;
+	conn->recv_lock = NULL;
+}
+
+static void
 iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)
 {
 	struct iscsi_conn *conn = cls_conn->dd_data;
@@ -1930,6 +1957,7 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
 	if (conn->hdrdgst_en || conn->datadgst_en)
 		digest = 1;
 
+	iscsi_tcp_release_conn(conn);
 	iscsi_conn_teardown(cls_conn);
 
 	/* now free tcp_conn */
@@ -1944,15 +1972,18 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_
 			crypto_free_tfm(tcp_conn->data_rx_tfm);
 	}
 
-	/* free conn->data, size = MaxRecvDataSegmentLength */
-	if (tcp_conn->data_size <= PAGE_SIZE)
-		kfree(tcp_conn->data);
-	else
-		free_pages((unsigned long)tcp_conn->data,
-			   get_order(tcp_conn->data_size));
 	kfree(tcp_conn);
 }
 
+static void
+iscsi_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
+{
+	struct iscsi_conn *conn = cls_conn->dd_data;
+
+	iscsi_conn_stop(cls_conn, flag);
+	iscsi_tcp_release_conn(conn);
+}
+
 static int
 iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
 		    struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,
@@ -2001,52 +2032,6 @@ iscsi_tcp_conn_bind(struct iscsi_cls_ses
 	return 0;
 }
 
-static void
-iscsi_tcp_cleanup_ctask(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask)
-{
-	struct iscsi_tcp_cmd_task *tcp_ctask = ctask->dd_data;
-	struct iscsi_r2t_info *r2t;
-
-	/* flush ctask's r2t queues */
-	while (__kfifo_get(tcp_ctask->r2tqueue, (void*)&r2t, sizeof(void*)))
-		__kfifo_put(tcp_ctask->r2tpool.queue, (void*)&r2t,
-			    sizeof(void*));
-
-	__iscsi_ctask_cleanup(conn, ctask);
-}
-
-static void
-iscsi_tcp_suspend_conn_rx(struct iscsi_conn *conn)
-{
-	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
-	struct sock *sk;
-
-	if (!tcp_conn->sock)
-		return;
-
-	sk = tcp_conn->sock->sk;
-	write_lock_bh(&sk->sk_callback_lock);
-	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
-	write_unlock_bh(&sk->sk_callback_lock);
-}
-
-static void
-iscsi_tcp_terminate_conn(struct iscsi_conn *conn)
-{
-	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
-
-	if (!tcp_conn->sock)
-		return;
-
-	sock_hold(tcp_conn->sock->sk);
-	iscsi_conn_restore_callbacks(conn);
-	sock_put(tcp_conn->sock->sk);
-
-	sock_release(tcp_conn->sock);
-	tcp_conn->sock = NULL;
-	conn->recv_lock = NULL;
-}
-
 /* called with host lock */
 static void
 iscsi_tcp_mgmt_init(struct iscsi_conn *conn, struct iscsi_mgmt_task *mtask,
@@ -2057,6 +2042,7 @@ iscsi_tcp_mgmt_init(struct iscsi_conn *c
 	iscsi_buf_init_iov(&tcp_mtask->headbuf, (char*)mtask->hdr,
 			   sizeof(struct iscsi_hdr));
 	tcp_mtask->xmstate = XMSTATE_IMM_HDR;
+	tcp_mtask->sent = 0;
 
 	if (mtask->data_count)
 		iscsi_buf_init_iov(&tcp_mtask->sendbuf, (char*)mtask->data,
@@ -2138,39 +2124,6 @@ iscsi_conn_set_param(struct iscsi_cls_co
 	int value;
 
 	switch(param) {
-	case ISCSI_PARAM_MAX_RECV_DLENGTH: {
-		char *saveptr = tcp_conn->data;
-		gfp_t flags = GFP_KERNEL;
-
-		sscanf(buf, "%d", &value);
-		if (tcp_conn->data_size >= value) {
-			iscsi_set_param(cls_conn, param, buf, buflen);
-			break;
-		}
-
-		spin_lock_bh(&session->lock);
-		if (conn->stop_stage == STOP_CONN_RECOVER)
-			flags = GFP_ATOMIC;
-		spin_unlock_bh(&session->lock);
-
-		if (value <= PAGE_SIZE)
-			tcp_conn->data = kmalloc(value, flags);
-		else
-			tcp_conn->data = (void*)__get_free_pages(flags,
-							     get_order(value));
-		if (tcp_conn->data == NULL) {
-			tcp_conn->data = saveptr;
-			return -ENOMEM;
-		}
-		if (tcp_conn->data_size <= PAGE_SIZE)
-			kfree(saveptr);
-		else
-			free_pages((unsigned long)saveptr,
-				   get_order(tcp_conn->data_size));
-		iscsi_set_param(cls_conn, param, buf, buflen);
-		tcp_conn->data_size = value;
-		break;
-		}
 	case ISCSI_PARAM_HDRDGST_EN:
 		iscsi_set_param(cls_conn, param, buf, buflen);
 		tcp_conn->hdr_size = sizeof(struct iscsi_hdr);
@@ -2361,8 +2314,7 @@ static void iscsi_tcp_session_destroy(st
 }
 
 static struct scsi_host_template iscsi_sht = {
-	.name			= "iSCSI Initiator over TCP/IP, v"
-				  ISCSI_TCP_VERSION,
+	.name			= "iSCSI Initiator over TCP/IP",
 	.queuecommand           = iscsi_queuecommand,
 	.change_queue_depth	= iscsi_change_queue_depth,
 	.can_queue		= ISCSI_XMIT_CMDS_MAX - 1,
@@ -2414,10 +2366,7 @@ static struct iscsi_transport iscsi_tcp_
 	.get_conn_param		= iscsi_tcp_conn_get_param,
 	.get_session_param	= iscsi_session_get_param,
 	.start_conn		= iscsi_conn_start,
-	.stop_conn		= iscsi_conn_stop,
-	/* these are called as part of conn recovery */
-	.suspend_conn_recv	= iscsi_tcp_suspend_conn_rx,
-	.terminate_conn		= iscsi_tcp_terminate_conn,
+	.stop_conn		= iscsi_tcp_conn_stop,
 	/* IO */
 	.send_pdu		= iscsi_conn_send_pdu,
 	.get_stats		= iscsi_conn_get_stats,
diff -Naurp linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.h linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.h
--- linux-2.6.17.x86_64/drivers/scsi/iscsi_tcp.h	2006-07-13 14:42:44.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/iscsi_tcp.h	2006-07-13 14:46:20.000000000 -0500
@@ -78,8 +78,6 @@ struct iscsi_tcp_conn {
 	char			hdrext[4*sizeof(__u16) +
 				    sizeof(__u32)];
 	int			data_copied;
-	char			*data;		/* data placeholder */
-	int			data_size;	/* actual recv_dlength */
 	int			stop_stage;	/* conn_stop() flag: *
 						 * stop to recover,  *
 						 * stop to terminate */
diff -Naurp linux-2.6.17.x86_64/drivers/scsi/libiscsi.c linux-2.6.17.x86_64.iscsi/drivers/scsi/libiscsi.c
--- linux-2.6.17.x86_64/drivers/scsi/libiscsi.c	2006-07-13 14:42:45.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/libiscsi.c	2006-07-13 14:46:23.000000000 -0500
@@ -189,6 +189,7 @@ static void iscsi_complete_command(struc
 {
 	struct scsi_cmnd *sc = ctask->sc;
 
+	ctask->state = ISCSI_TASK_COMPLETED;
 	ctask->sc = NULL;
 	list_del_init(&ctask->running);
 	__kfifo_put(session->cmdpool.queue, (void*)&ctask, sizeof(void*));
@@ -275,6 +276,25 @@ out:
 	return rc;
 }
 
+static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
+{
+	struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr;
+
+	conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
+	conn->tmfrsp_pdus_cnt++;
+
+	if (conn->tmabort_state != TMABORT_INITIAL)
+		return;
+
+	if (tmf->response == ISCSI_TMF_RSP_COMPLETE)
+		conn->tmabort_state = TMABORT_SUCCESS;
+	else if (tmf->response == ISCSI_TMF_RSP_NO_TASK)
+		conn->tmabort_state = TMABORT_NOT_FOUND;
+	else
+		conn->tmabort_state = TMABORT_FAILED;
+	wake_up(&conn->ehwait);
+}
+
 /**
  * __iscsi_complete_pdu - complete pdu
  * @conn: iscsi conn
@@ -340,6 +360,10 @@ int __iscsi_complete_pdu(struct iscsi_co
 
 		switch(opcode) {
 		case ISCSI_OP_LOGOUT_RSP:
+			if (datalen) {
+				rc = ISCSI_ERR_PROTO;
+				break;
+			}
 			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
 			/* fall through */
 		case ISCSI_OP_LOGIN_RSP:
@@ -348,7 +372,8 @@ int __iscsi_complete_pdu(struct iscsi_co
 			 * login related PDU's exp_statsn is handled in
 			 * userspace
 			 */
-			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);
+			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))
+				rc = ISCSI_ERR_CONN_FAILED;
 			list_del(&mtask->running);
 			if (conn->login_mtask != mtask)
 				__kfifo_put(session->mgmtpool.queue,
@@ -360,25 +385,17 @@ int __iscsi_complete_pdu(struct iscsi_co
 				break;
 			}
 
-			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
-			conn->tmfrsp_pdus_cnt++;
-			if (conn->tmabort_state == TMABORT_INITIAL) {
-				conn->tmabort_state =
-					((struct iscsi_tm_rsp *)hdr)->
-					response == ISCSI_TMF_RSP_COMPLETE ?
-						TMABORT_SUCCESS:TMABORT_FAILED;
-				/* unblock eh_abort() */
-				wake_up(&conn->ehwait);
-			}
+			iscsi_tmf_rsp(conn, hdr);
 			break;
 		case ISCSI_OP_NOOP_IN:
-			if (hdr->ttt != ISCSI_RESERVED_TAG) {
+			if (hdr->ttt != ISCSI_RESERVED_TAG || datalen) {
 				rc = ISCSI_ERR_PROTO;
 				break;
 			}
 			conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
 
-			rc = iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen);
+			if (iscsi_recv_pdu(conn->cls_conn, hdr, data, datalen))
+				rc = ISCSI_ERR_CONN_FAILED;
 			list_del(&mtask->running);
 			if (conn->login_mtask != mtask)
 				__kfifo_put(session->mgmtpool.queue,
@@ -391,14 +408,21 @@ int __iscsi_complete_pdu(struct iscsi_co
 	} else if (itt == ISCSI_RESERVED_TAG) {
 		switch(opcode) {
 		case ISCSI_OP_NOOP_IN:
-			if (!datalen) {
-				rc = iscsi_check_assign_cmdsn(session,
-						 (struct iscsi_nopin*)hdr);
-				if (!rc && hdr->ttt != ISCSI_RESERVED_TAG)
-					rc = iscsi_recv_pdu(conn->cls_conn,
-							    hdr, NULL, 0);
-			} else
+			if (datalen) {
 				rc = ISCSI_ERR_PROTO;
+				break;
+			}
+
+			rc = iscsi_check_assign_cmdsn(session,
+						 (struct iscsi_nopin*)hdr);
+			if (rc)
+				break;
+
+			if (hdr->ttt == ISCSI_RESERVED_TAG)
+				break;
+
+			if (iscsi_recv_pdu(conn->cls_conn, hdr, NULL, 0))
+				rc = ISCSI_ERR_CONN_FAILED;
 			break;
 		case ISCSI_OP_REJECT:
 			/* we need sth like iscsi_reject_rsp()*/
@@ -568,20 +592,24 @@ static int iscsi_data_xmit(struct iscsi_
 	}
 
 	/* process command queue */
-	while (__kfifo_get(conn->xmitqueue, (void*)&conn->ctask,
-			   sizeof(void*))) {
+	spin_lock_bh(&conn->session->lock);
+	while (!list_empty(&conn->xmitqueue)) {
 		/*
 		 * iscsi tcp may readd the task to the xmitqueue to send
 		 * write data
 		 */
-		spin_lock_bh(&conn->session->lock);
-		if (list_empty(&conn->ctask->running))
-			list_add_tail(&conn->ctask->running, &conn->run_list);
+		conn->ctask = list_entry(conn->xmitqueue.next,
+					 struct iscsi_cmd_task, running);
+		conn->ctask->state = ISCSI_TASK_RUNNING;
+		list_move_tail(conn->xmitqueue.next, &conn->run_list);
 		spin_unlock_bh(&conn->session->lock);
+
 		rc = tt->xmit_cmd_task(conn, conn->ctask);
 		if (rc)
 			goto again;
+		spin_lock_bh(&conn->session->lock);
 	}
+	spin_unlock_bh(&conn->session->lock);
 	/* done with this ctask */
 	conn->ctask = NULL;
 
@@ -691,6 +719,7 @@ int iscsi_queuecommand(struct scsi_cmnd 
 	sc->SCp.phase = session->age;
 	sc->SCp.ptr = (char *)ctask;
 
+	ctask->state = ISCSI_TASK_PENDING;
 	ctask->mtask = NULL;
 	ctask->conn = conn;
 	ctask->sc = sc;
@@ -700,7 +729,7 @@ int iscsi_queuecommand(struct scsi_cmnd 
 
 	session->tt->init_cmd_task(ctask);
 
-	__kfifo_put(conn->xmitqueue, (void*)&ctask, sizeof(void*));
+	list_add_tail(&ctask->running, &conn->xmitqueue);
 	debug_scsi(
 	       "ctask enq [%s cid %d sc %lx itt 0x%x len %d cmdsn %d win %d]\n",
 		sc->sc_data_direction == DMA_TO_DEVICE ? "write" : "read",
@@ -977,31 +1006,27 @@ static int iscsi_exec_abort_task(struct 
 /*
  * xmit mutex and session lock must be held
  */
-#define iscsi_remove_task(tasktype)					\
-static struct iscsi_##tasktype *					\
-iscsi_remove_##tasktype(struct kfifo *fifo, uint32_t itt)		\
-{									\
-	int i, nr_tasks = __kfifo_len(fifo) / sizeof(void*);		\
-	struct iscsi_##tasktype *task;					\
-									\
-	debug_scsi("searching %d tasks\n", nr_tasks);			\
-									\
-	for (i = 0; i < nr_tasks; i++) {				\
-		__kfifo_get(fifo, (void*)&task, sizeof(void*));		\
-		debug_scsi("check task %u\n", task->itt);		\
-									\
-		if (task->itt == itt) {					\
-			debug_scsi("matched task\n");			\
-			return task;					\
-		}							\
-									\
-		__kfifo_put(fifo, (void*)&task, sizeof(void*));		\
-	}								\
-	return NULL;							\
-}
+static struct iscsi_mgmt_task *
+iscsi_remove_mgmt_task(struct kfifo *fifo, uint32_t itt)
+{
+	int i, nr_tasks = __kfifo_len(fifo) / sizeof(void*);
+	struct iscsi_mgmt_task *task;
+
+	debug_scsi("searching %d tasks\n", nr_tasks);
 
-iscsi_remove_task(mgmt_task);
-iscsi_remove_task(cmd_task);
+	for (i = 0; i < nr_tasks; i++) {
+		__kfifo_get(fifo, (void*)&task, sizeof(void*));
+		debug_scsi("check task %u\n", task->itt);
+
+		if (task->itt == itt) {
+			debug_scsi("matched task\n");
+			return task;
+		}
+
+		__kfifo_put(fifo, (void*)&task, sizeof(void*));
+	}
+	return NULL;
+}
 
 static int iscsi_ctask_mtask_cleanup(struct iscsi_cmd_task *ctask)
 {
@@ -1027,12 +1052,13 @@ static void fail_command(struct iscsi_co
 {
 	struct scsi_cmnd *sc;
 
-	conn->session->tt->cleanup_cmd_task(conn, ctask);
-	iscsi_ctask_mtask_cleanup(ctask);
-
 	sc = ctask->sc;
 	if (!sc)
 		return;
+
+	conn->session->tt->cleanup_cmd_task(conn, ctask);
+	iscsi_ctask_mtask_cleanup(ctask);
+
 	sc->result = err;
 	sc->resid = sc->request_bufflen;
 	iscsi_complete_command(conn->session, ctask);
@@ -1043,7 +1069,6 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
 	struct iscsi_cmd_task *ctask = (struct iscsi_cmd_task *)sc->SCp.ptr;
 	struct iscsi_conn *conn = ctask->conn;
 	struct iscsi_session *session = conn->session;
-	struct iscsi_cmd_task *pending_ctask;
 	int rc;
 
 	conn->eh_abort_cnt++;
@@ -1061,8 +1086,11 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
 		goto failed;
 
 	/* ctask completed before time out */
-	if (!ctask->sc)
-		goto success;
+	if (!ctask->sc) {
+		spin_unlock_bh(&session->lock);
+		debug_scsi("sc completed while abort in progress\n");
+		goto success_rel_mutex;
+	}
 
 	/* what should we do here ? */
 	if (conn->ctask == ctask) {
@@ -1071,17 +1099,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
 		goto failed;
 	}
 
-	/* check for the easy pending cmd abort */
-	pending_ctask = iscsi_remove_cmd_task(conn->xmitqueue, ctask->itt);
-	if (pending_ctask) {
-		/* iscsi_tcp queues write transfers on the xmitqueue */
-		if (list_empty(&pending_ctask->running)) {
-			debug_scsi("found pending task\n");
-			goto success;
-		} else
-			__kfifo_put(conn->xmitqueue, (void*)&pending_ctask,
-				    sizeof(void*));
-	}
+	if (ctask->state == ISCSI_TASK_PENDING)
+		goto success_cleanup;
 
 	conn->tmabort_state = TMABORT_INITIAL;
 
@@ -1089,25 +1108,31 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
 	rc = iscsi_exec_abort_task(sc, ctask);
 	spin_lock_bh(&session->lock);
 
-	iscsi_ctask_mtask_cleanup(ctask);
 	if (rc || sc->SCp.phase != session->age ||
 	    session->state != ISCSI_STATE_LOGGED_IN)
 		goto failed;
+	iscsi_ctask_mtask_cleanup(ctask);
 
-	/* ctask completed before tmf abort response */
-	if (!ctask->sc) {
-		debug_scsi("sc completed while abort in progress\n");
-		goto success;
-	}
-
-	if (conn->tmabort_state != TMABORT_SUCCESS) {
+	switch (conn->tmabort_state) {
+	case TMABORT_SUCCESS:
+		goto success_cleanup;
+	case TMABORT_NOT_FOUND:
+		if (!ctask->sc) {
+			/* ctask completed before tmf abort response */
+			spin_unlock_bh(&session->lock);
+			debug_scsi("sc completed while abort in progress\n");
+			goto success_rel_mutex;
+		}
+		/* fall through */
+	default:
+		/* timedout or failed */
 		spin_unlock_bh(&session->lock);
 		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
 		spin_lock_bh(&session->lock);
 		goto failed;
 	}
 
-success:
+success_cleanup:
 	debug_scsi("abort success [sc %lx itt 0x%x]\n", (long)sc, ctask->itt);
 	spin_unlock_bh(&session->lock);
 
@@ -1121,6 +1146,7 @@ success:
 	spin_unlock(&session->lock);
 	write_unlock_bh(conn->recv_lock);
 
+success_rel_mutex:
 	mutex_unlock(&conn->xmitmutex);
 	return SUCCESS;
 
@@ -1263,6 +1289,7 @@ iscsi_session_setup(struct iscsi_transpo
 		if (cmd_task_size)
 			ctask->dd_data = &ctask[1];
 		ctask->itt = cmd_i;
+		INIT_LIST_HEAD(&ctask->running);
 	}
 
 	spin_lock_init(&session->lock);
@@ -1282,6 +1309,7 @@ iscsi_session_setup(struct iscsi_transpo
 		if (mgmt_task_size)
 			mtask->dd_data = &mtask[1];
 		mtask->itt = ISCSI_MGMT_ITT_OFFSET + cmd_i;
+		INIT_LIST_HEAD(&mtask->running);
 	}
 
 	if (scsi_add_host(shost, NULL))
@@ -1322,6 +1350,7 @@ void iscsi_session_teardown(struct iscsi
 {
 	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
 	struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
+	struct module *owner = cls_session->transport->owner;
 
 	scsi_remove_host(shost);
 
@@ -1330,7 +1359,7 @@ void iscsi_session_teardown(struct iscsi
 
 	iscsi_destroy_session(cls_session);
 	scsi_host_put(shost);
-	module_put(cls_session->transport->owner);
+	module_put(owner);
 }
 EXPORT_SYMBOL_GPL(iscsi_session_teardown);
 
@@ -1361,12 +1390,7 @@ iscsi_conn_setup(struct iscsi_cls_sessio
 	conn->tmabort_state = TMABORT_INITIAL;
 	INIT_LIST_HEAD(&conn->run_list);
 	INIT_LIST_HEAD(&conn->mgmt_run_list);
-
-	/* initialize general xmit PDU commands queue */
-	conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*),
-					GFP_KERNEL, NULL);
-	if (conn->xmitqueue == ERR_PTR(-ENOMEM))
-		goto xmitqueue_alloc_fail;
+	INIT_LIST_HEAD(&conn->xmitqueue);
 
 	/* initialize general immediate & non-immediate PDU commands queue */
 	conn->immqueue = kfifo_alloc(session->mgmtpool_max * sizeof(void*),
@@ -1394,7 +1418,7 @@ iscsi_conn_setup(struct iscsi_cls_sessio
 	data = kmalloc(DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH, GFP_KERNEL);
 	if (!data)
 		goto login_mtask_data_alloc_fail;
-	conn->login_mtask->data = data;
+	conn->login_mtask->data = conn->data = data;
 
 	init_timer(&conn->tmabort_timer);
 	mutex_init(&conn->xmitmutex);
@@ -1410,8 +1434,6 @@ login_mtask_alloc_fail:
 mgmtqueue_alloc_fail:
 	kfifo_free(conn->immqueue);
 immqueue_alloc_fail:
-	kfifo_free(conn->xmitqueue);
-xmitqueue_alloc_fail:
 	iscsi_destroy_conn(cls_conn);
 	return NULL;
 }
@@ -1432,12 +1454,6 @@ void iscsi_conn_teardown(struct iscsi_cl
 
 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
 	mutex_lock(&conn->xmitmutex);
-	if (conn->c_stage == ISCSI_CONN_INITIAL_STAGE) {
-		if (session->tt->suspend_conn_recv)
-			session->tt->suspend_conn_recv(conn);
-
-		session->tt->terminate_conn(conn);
-	}
 
 	spin_lock_bh(&session->lock);
 	conn->c_stage = ISCSI_CONN_CLEANUP_WAIT;
@@ -1474,7 +1490,7 @@ void iscsi_conn_teardown(struct iscsi_cl
 	}
 
 	spin_lock_bh(&session->lock);
-	kfree(conn->login_mtask->data);
+	kfree(conn->data);
 	__kfifo_put(session->mgmtpool.queue, (void*)&conn->login_mtask,
 		    sizeof(void*));
 	list_del(&conn->item);
@@ -1489,7 +1505,6 @@ void iscsi_conn_teardown(struct iscsi_cl
 		session->cmdsn = session->max_cmdsn = session->exp_cmdsn = 1;
 	spin_unlock_bh(&session->lock);
 
-	kfifo_free(conn->xmitqueue);
 	kfifo_free(conn->immqueue);
 	kfifo_free(conn->mgmtqueue);
 
@@ -1572,7 +1587,7 @@ static void fail_all_commands(struct isc
 	struct iscsi_cmd_task *ctask, *tmp;
 
 	/* flush pending */
-	while (__kfifo_get(conn->xmitqueue, (void*)&ctask, sizeof(void*))) {
+	list_for_each_entry_safe(ctask, tmp, &conn->xmitqueue, running) {
 		debug_scsi("failing pending sc %p itt 0x%x\n", ctask->sc,
 			   ctask->itt);
 		fail_command(conn, ctask, DID_BUS_BUSY << 16);
@@ -1615,8 +1630,9 @@ static void iscsi_start_session_recovery
 	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);
 	spin_unlock_bh(&session->lock);
 
-	if (session->tt->suspend_conn_recv)
-		session->tt->suspend_conn_recv(conn);
+	write_lock_bh(conn->recv_lock);
+	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
+	write_unlock_bh(conn->recv_lock);
 
 	mutex_lock(&conn->xmitmutex);
 	/*
@@ -1635,7 +1651,6 @@ static void iscsi_start_session_recovery
 		}
 	}
 
-	session->tt->terminate_conn(conn);
 	/*
 	 * flush queues.
 	 */
diff -Naurp linux-2.6.17.x86_64/drivers/scsi/scsi_transport_iscsi.c linux-2.6.17.x86_64.iscsi/drivers/scsi/scsi_transport_iscsi.c
--- linux-2.6.17.x86_64/drivers/scsi/scsi_transport_iscsi.c	2006-07-13 14:42:45.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/drivers/scsi/scsi_transport_iscsi.c	2006-07-13 14:46:32.000000000 -0500
@@ -34,6 +34,7 @@
 #define ISCSI_SESSION_ATTRS 11
 #define ISCSI_CONN_ATTRS 11
 #define ISCSI_HOST_ATTRS 0
+#define ISCSI_TRANSPORT_VERSION "1.1-645"
 
 struct iscsi_internal {
 	int daemon_pid;
@@ -634,13 +635,13 @@ mempool_zone_get_skb(struct mempool_zone
 }
 
 static int
-iscsi_broadcast_skb(struct mempool_zone *zone, struct sk_buff *skb)
+iscsi_broadcast_skb(struct mempool_zone *zone, struct sk_buff *skb, gfp_t gfp)
 {
 	unsigned long flags;
 	int rc;
 
 	skb_get(skb);
-	rc = netlink_broadcast(nls, skb, 0, 1, GFP_KERNEL);
+	rc = netlink_broadcast(nls, skb, 0, 1, gfp);
 	if (rc < 0) {
 		mempool_free(skb, zone->pool);
 		printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc);
@@ -749,7 +750,7 @@ void iscsi_conn_error(struct iscsi_cls_c
 	ev->r.connerror.cid = conn->cid;
 	ev->r.connerror.sid = iscsi_conn_get_sid(conn);
 
-	iscsi_broadcast_skb(conn->z_error, skb);
+	iscsi_broadcast_skb(conn->z_error, skb, GFP_ATOMIC);
 
 	dev_printk(KERN_INFO, &conn->dev, "iscsi: detected conn error (%d)\n",
 		   error);
@@ -895,7 +896,7 @@ int iscsi_if_destroy_session_done(struct
 	 * this will occur if the daemon is not up, so we just warn
 	 * the user and when the daemon is restarted it will handle it
 	 */
-	rc = iscsi_broadcast_skb(conn->z_pdu, skb);
+	rc = iscsi_broadcast_skb(conn->z_pdu, skb, GFP_KERNEL);
 	if (rc < 0)
 		dev_printk(KERN_ERR, &conn->dev, "Cannot notify userspace of "
 			  "session destruction event. Check iscsi daemon\n");
@@ -958,7 +959,7 @@ int iscsi_if_create_session_done(struct 
 	 * this will occur if the daemon is not up, so we just warn
 	 * the user and when the daemon is restarted it will handle it
 	 */
-	rc = iscsi_broadcast_skb(conn->z_pdu, skb);
+	rc = iscsi_broadcast_skb(conn->z_pdu, skb, GFP_KERNEL);
 	if (rc < 0)
 		dev_printk(KERN_ERR, &conn->dev, "Cannot notify userspace of "
 			  "session creation event. Check iscsi daemon\n");
@@ -1613,6 +1614,9 @@ static __init int iscsi_transport_init(v
 {
 	int err;
 
+	printk(KERN_INFO "Loading iSCSI transport class v%s.",
+		ISCSI_TRANSPORT_VERSION);
+
 	err = class_register(&iscsi_transport_class);
 	if (err)
 		return err;
@@ -1678,3 +1682,4 @@ MODULE_AUTHOR("Mike Christie <michaelc at c
 	      "Alex Aizman <itn780 at yahoo.com>");
 MODULE_DESCRIPTION("iSCSI Transport Interface");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(ISCSI_TRANSPORT_VERSION);
diff -Naurp linux-2.6.17.x86_64/include/scsi/libiscsi.h linux-2.6.17.x86_64.iscsi/include/scsi/libiscsi.h
--- linux-2.6.17.x86_64/include/scsi/libiscsi.h	2006-07-13 14:42:55.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/include/scsi/libiscsi.h	2006-07-13 14:46:20.000000000 -0500
@@ -60,6 +60,7 @@ struct iscsi_nopin;
 #define TMABORT_SUCCESS			0x1
 #define TMABORT_FAILED			0x2
 #define TMABORT_TIMEDOUT		0x3
+#define TMABORT_NOT_FOUND		0x4
 
 /* Connection suspend "bit" */
 #define ISCSI_SUSPEND_BIT		1
@@ -83,6 +84,12 @@ struct iscsi_mgmt_task {
 	struct list_head	running;
 };
 
+enum {
+	ISCSI_TASK_COMPLETED,
+	ISCSI_TASK_PENDING,
+	ISCSI_TASK_RUNNING,
+};
+
 struct iscsi_cmd_task {
 	/*
 	 * Becuae LLDs allocate their hdr differently, this is a pointer to
@@ -101,6 +108,8 @@ struct iscsi_cmd_task {
 	struct iscsi_conn	*conn;		/* used connection    */
 	struct iscsi_mgmt_task	*mtask;		/* tmf mtask in progr */
 
+	/* state set/tested under session->lock */
+	int			state;
 	struct list_head	running;	/* running cmd list */
 	void			*dd_data;	/* driver/transport data */
 };
@@ -126,6 +135,14 @@ struct iscsi_conn {
 	int			id;		/* CID */
 	struct list_head	item;		/* maintains list of conns */
 	int			c_stage;	/* connection state */
+	/*
+	 * Preallocated buffer for pdus that have data but do not
+	 * originate from scsi-ml. We never have two pdus using the
+	 * buffer at the same time. It is only allocated to
+	 * the default max recv size because the pdus we support
+	 * should always fit in this buffer
+	 */
+	char			*data;
 	struct iscsi_mgmt_task	*login_mtask;	/* mtask used for login/text */
 	struct iscsi_mgmt_task	*mtask;		/* xmit mtask in progress */
 	struct iscsi_cmd_task	*ctask;		/* xmit ctask in progress */
@@ -134,7 +151,7 @@ struct iscsi_conn {
 	struct kfifo		*immqueue;	/* immediate xmit queue */
 	struct kfifo		*mgmtqueue;	/* mgmt (control) xmit queue */
 	struct list_head	mgmt_run_list;	/* list of control tasks */
-	struct kfifo		*xmitqueue;	/* data-path cmd queue */
+	struct list_head	xmitqueue;	/* data-path cmd queue */
 	struct list_head	run_list;	/* list of cmds in progress */
 	struct work_struct	xmitwork;	/* per-conn. xmit workqueue */
 	/*
diff -Naurp linux-2.6.17.x86_64/include/scsi/scsi_transport_iscsi.h linux-2.6.17.x86_64.iscsi/include/scsi/scsi_transport_iscsi.h
--- linux-2.6.17.x86_64/include/scsi/scsi_transport_iscsi.h	2006-07-13 14:42:55.000000000 -0500
+++ linux-2.6.17.x86_64.iscsi/include/scsi/scsi_transport_iscsi.h	2006-07-13 14:46:09.000000000 -0500
@@ -57,8 +57,6 @@ struct sockaddr;
  * @stop_conn:		suspend/recover/terminate connection
  * @send_pdu:		send iSCSI PDU, Login, Logout, NOP-Out, Reject, Text.
  * @session_recovery_timedout: notify LLD a block during recovery timed out
- * @suspend_conn_recv:	susepend the recv side of the connection
- * @termincate_conn:	destroy socket connection. Called with mutex lock.
  * @init_cmd_task:	Initialize a iscsi_cmd_task and any internal structs.
  *			Called from queuecommand with session lock held.
  * @init_mgmt_task:	Initialize a iscsi_mgmt_task and any internal structs.
@@ -112,8 +110,6 @@ struct iscsi_transport {
 			 char *data, uint32_t data_size);
 	void (*get_stats) (struct iscsi_cls_conn *conn,
 			   struct iscsi_stats *stats);
-	void (*suspend_conn_recv) (struct iscsi_conn *conn);
-	void (*terminate_conn) (struct iscsi_conn *conn);
 	void (*init_cmd_task) (struct iscsi_cmd_task *ctask);
 	void (*init_mgmt_task) (struct iscsi_conn *conn,
 				struct iscsi_mgmt_task *mtask,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2393
retrieving revision 1.2394
diff -u -r1.2393 -r1.2394
--- kernel-2.6.spec	13 Jul 2006 21:10:14 -0000	1.2393
+++ kernel-2.6.spec	13 Jul 2006 21:17:51 -0000	1.2394
@@ -350,6 +350,7 @@
 
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
+Patch1103: linux-2.6-iscsi-update-to-2-6-18-rc2.upstream.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -891,6 +892,7 @@
 #
 # Add a pci table to advansys driver.
 %patch1102 -p1
+%patch1103 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1676,6 +1678,9 @@
 %endif
 
 %changelog
+* Thu Jul 13 2006 Mike Christie <mchristi at redhat.com>
+- Add iscsi update being sent upstream for 2.6.18-rc2
+
 * Thu Jul 13 2006 Roland McGrath <roland at redhat.com>
 - Fix spec typo that swallowed kdump subpackage.
 



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:18:19 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.38,1.39
Message-ID: <200607132118.k6DLIJKY001838@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1811

Modified Files:
	s390utils.spec 
Log Message:
Add missing BR


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- s390utils.spec	13 Jul 2006 01:03:41 -0000	1.38
+++ s390utils.spec	13 Jul 2006 21:18:16 -0000	1.39
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 2
+Release: 3
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -24,7 +24,7 @@
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
-BuildRequires: libsysfs-devel
+BuildRequires: libsysfs-devel indent
 ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
@@ -151,9 +151,9 @@
 %{_mandir}/man8/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-2
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-3
 - rebuild
-- Add missing br libsysfs-devel
+- Add missing br libsysfs-devel, indent
 
 * Wed May 17 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-1
 - Made src_vipa build on current toolchain again



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:20:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:20:45 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-enable-composite.patch, NONE,
	1.1 xorg-x11-server.spec, 1.117, 1.118
Message-ID: <200607132120.k6DLKj4l002729@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-enable-composite.patch 
Log Message:
* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
- Enable composite by default.
- Split spiffiffity patch into one patch per change:
  xorg-x11-server-1.1.0-no-move-damage.patch and
  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.


xorg-x11-server-1.1.1-enable-composite.patch:
 utils.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-enable-composite.patch ---
--- ./os/utils.c.enable-composite	2006-07-13 17:12:10.000000000 -0400
+++ ./os/utils.c	2006-07-13 17:12:50.000000000 -0400
@@ -139,7 +139,7 @@
  #ifdef XFree86Server
   /* COMPOSITE is disabled by default for now until the
    * interface is stable */
-  #define COMPOSITE_DEFAULT FALSE
+  #define COMPOSITE_DEFAULT TRUE
  #else
   #define COMPOSITE_DEFAULT TRUE
  #endif


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- xorg-x11-server.spec	12 Jul 2006 23:29:00 -0000	1.117
+++ xorg-x11-server.spec	13 Jul 2006 21:20:42 -0000	1.118
@@ -29,6 +29,7 @@
 Patch102:  xorg-x11-server-1.1.0-gl-include-inferiors.patch
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
+Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -300,6 +301,7 @@
 %patch102 -p0 -b .gl-include-inferiors
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
+%patch105 -p0 -b .enable-composite
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -642,6 +644,7 @@
 
 %changelog
 * Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
+- Enable composite by default.
 - Split spiffiffity patch into one patch per change:
   xorg-x11-server-1.1.0-no-move-damage.patch and
   xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:28:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:28:41 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.483, 1.484 kernel-2.6.spec, 1.2394,
	1.2395 linux-2.6-lockdep-fixes.patch, 1.9, 1.10 sources, 1.427,
	1.428 upstream, 1.394, 1.395 patch-2.6.18-rc1-git5.bz2.sign,
	1.1, NONE
Message-ID: <200607132128.k6DLSfqo005690@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.18-rc1-git7.bz2.sign 
Removed Files:
	patch-2.6.18-rc1-git5.bz2.sign 
Log Message:
git7


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

iD8DBQBEtpjoyGugalF9Dw4RAlqsAJ9MwzS1nFApQLJ9JWuMBgacuhBM1ACcC/V2
ybHqvFG/6wPmIUKymPxi3mc=
=JF0m
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- .cvsignore	13 Jul 2006 17:16:11 -0000	1.483
+++ .cvsignore	13 Jul 2006 21:28:38 -0000	1.484
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git6.bz2
+patch-2.6.18-rc1-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2394
retrieving revision 1.2395
diff -u -r1.2394 -r1.2395
--- kernel-2.6.spec	13 Jul 2006 21:17:51 -0000	1.2394
+++ kernel-2.6.spec	13 Jul 2006 21:28:38 -0000	1.2395
@@ -256,7 +256,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git6.bz2
+Patch2: patch-2.6.18-rc1-git7.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1678,6 +1678,10 @@
 %endif
 
 %changelog
+* Thu Jul 13 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git7
+- More lockdep fixes.
+
 * Thu Jul 13 2006 Mike Christie <mchristi at redhat.com>
 - Add iscsi update being sent upstream for 2.6.18-rc2
 

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   10 ++++++--
 linux-2.6.18-rc1/block/ioctl.c                |    9 ++++++--
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++---
 linux-2.6.18-rc1/fs/block_dev.c               |   29 +++++++++++++++++++++++++-
 linux-2.6.18-rc1/include/linux/libps2.h       |   10 ++++++++
 linux-2.6.18-rc1/net/socket.c                 |    8 ++++++-
 6 files changed, 61 insertions(+), 11 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-lockdep-fixes.patch	13 Jul 2006 17:48:35 -0000	1.9
+++ linux-2.6-lockdep-fixes.patch	13 Jul 2006 21:28:38 -0000	1.10
@@ -425,3 +425,79 @@
  			mutex_unlock(&bdevp->bd_mutex);
 
 
+From davej  Thu Jul 13 16:29:19 2006
+Return-Path: <SRS0+c9a57fc0e55f44caf9d4+1054+infradead.org+arjan at pentafluge.srs.infradead.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY 
+	autolearn=failed version=3.1.3
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Thu, 13 Jul 2006 16:29:19 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Thu, 13 Jul 2006 16:29:13 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6DKTD60017555
+	for <davej at pobox.devel.redhat.com>; Thu, 13 Jul 2006 16:29:13 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6DKTDcQ014402
+	for <davej at redhat.com>; Thu, 13 Jul 2006 16:29:13 -0400
+Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6DKT6N9012495
+	for <davej at redhat.com>; Thu, 13 Jul 2006 16:29:06 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
+	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
+	id 1G17o0-0002HE-7V; Thu, 13 Jul 2006 21:29:04 +0100
+Subject: Re: another networking lockdep bug
+From: Arjan van de Ven <arjan at infradead.org>
+To: Dave Jones <davej at redhat.com>
+Cc: mingo at elte.hu
+In-Reply-To: <20060713040715.GE4199 at redhat.com>
+References: <20060713040715.GE4199 at redhat.com>
+Content-Type: text/plain
+Date: Thu, 13 Jul 2006 22:29:03 +0200
+Message-Id: <1152822543.3024.87.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
+Content-Transfer-Encoding: 7bit
+X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
+	See http://www.infradead.org/rpr.html
+X-RedHat-Spam-Score: 0 
+Status: RO
+X-Status: A
+Content-Length: 902
+Lines: 29
+
+On Thu, 2006-07-13 at 00:07 -0400, Dave Jones wrote:
+> Not sure if this one got reported/fixed yet, as I was running
+> a kernel from sometime last week..
+> 
+> 		Dave
+> 
+
+
+can you add this patch for this and retry?
+Index: linux-2.6.18-rc1/net/socket.c
+===================================================================
+--- linux-2.6.18-rc1.orig/net/socket.c
++++ linux-2.6.18-rc1/net/socket.c
+@@ -1232,7 +1232,13 @@ int sock_create(int family, int type, in
+ 
+ int sock_create_kern(int family, int type, int protocol, struct socket **res)
+ {
+-	return __sock_create(family, type, protocol, res, 1);
++	static struct lock_class_key sk_lock_internal_key;
++	int ret;
++	ret = __sock_create(family, type, protocol, res, 1);
++	if (!ret)
++		lockdep_set_class(&(*res)->sk->sk_lock.slock,
++        		&sk_lock_internal_key);
++        return ret;
+ }
+ 
+ asmlinkage long sys_socket(int family, int type, int protocol)
+
+


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- sources	13 Jul 2006 17:16:11 -0000	1.427
+++ sources	13 Jul 2006 21:28:38 -0000	1.428
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-387fffe0c50660921204a67eb8d61e8d  patch-2.6.18-rc1-git6.bz2
+18ccb8d081939bdcf04fd7c4a4300729  patch-2.6.18-rc1-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- upstream	13 Jul 2006 17:16:11 -0000	1.394
+++ upstream	13 Jul 2006 21:28:38 -0000	1.395
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git6.bz2
+patch-2.6.18-rc1-git7.bz2


--- patch-2.6.18-rc1-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:34:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:34:33 -0400
Subject: rpms/linux-atm/devel linux-atm.spec,1.17,1.18
Message-ID: <200607132134.k6DLYXeO007269@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7246

Modified Files:
	linux-atm.spec 
Log Message:
Add missing BR


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-atm.spec	13 Jul 2006 20:11:19 -0000	1.17
+++ linux-atm.spec	13 Jul 2006 21:34:31 -0000	1.18
@@ -1,14 +1,14 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.5
+Release: 0.20050118.6
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Older kernel headers had broken ATM includes
 BuildRequires: glibc-kernheaders >= 2.4-9.1.88
-BuildRequires: byacc automake libtool
+BuildRequires: byacc automake libtool flex
 # cvs -rV2_5_0 -D2005-01-18
 Source: linux-atm-2.5.0-20050118.tar.gz
 # Patch from Debian to sanify syslogging
@@ -86,9 +86,9 @@
 %{_libdir}/libatm.so
 
 %changelog
-* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.5
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.6
 - rebuild
-- add missing br automake libtool
+- add missing br automake libtool flex
 
 * Tue May 30 2006 David Woodhouse <dwmw2 at redhat.com> - 2.5.0-0.20050118.3.3
 - BuildRequires: byacc



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:38:08 -0400
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.139,1.140 sources,1.138,1.139
Message-ID: <200607132138.k6DLc8Tg008051@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8011

Modified Files:
	mkinitrd.spec sources 
Log Message:
- ok, this one build on chris's ia64 box, too



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mkinitrd.spec	13 Jul 2006 21:10:42 -0000	1.139
+++ mkinitrd.spec	13 Jul 2006 21:38:04 -0000	1.140
@@ -65,8 +65,8 @@
 
 %build
 cd mkinitrd-%{version}
-make
-make test
+make LIB=%{_lib}
+make LIB=%{_lib} test
 if [ $? != 0 ]; then exit 1; fi
 cd ..
 cp -a mkinitrd-%{version}/nash/libnash.a bdevid-%{BDEVID_VERSION}/bdevid/
@@ -80,7 +80,7 @@
 cd mkinitrd-%{version}
 make LIB=%{_lib} BUILDROOT=$RPM_BUILD_ROOT mandir=%{_mandir} install
 cd ../bdevid-%{BDEVID_VERSION}
-make DESTDIR=$RPM_BUILD_ROOT install
+make LIB=%{_lib} DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	13 Jul 2006 21:16:00 -0000	1.138
+++ sources	13 Jul 2006 21:38:05 -0000	1.139
@@ -1,2 +1,2 @@
-6f4a12d38a78dafe9a034d71b660391a  mkinitrd-5.0.47.tar.bz2
 9336d33e6f75527c68ee09053c6b40c1  bdevid-0.1.tar.bz2
+64b8fc011df28c649dc6cb86b3cc2a19  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:41:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:41:02 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.118,1.119
Message-ID: <200607132141.k6DLf2Bo008739@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
Set release to 5.fc5.aiglx


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- xorg-x11-server.spec	13 Jul 2006 21:20:42 -0000	1.118
+++ xorg-x11-server.spec	13 Jul 2006 21:41:00 -0000	1.119
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   5%{?dist}
+Release:   5.fc5.aiglx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:41:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:41:32 -0400
Subject: rpms/linux-atm/devel linux-atm.spec,1.18,1.19
Message-ID: <200607132141.k6DLfWeu008859@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8832

Modified Files:
	linux-atm.spec 
Log Message:
fix release


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linux-atm.spec	13 Jul 2006 21:34:31 -0000	1.18
+++ linux-atm.spec	13 Jul 2006 21:41:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.6
+Release: 1.20050118cvs
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -86,6 +86,9 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-1.20050118cvs
+- fix release to meet guidelines
+
 * Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.6
 - rebuild
 - add missing br automake libtool flex



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:42:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:42:32 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.119,1.120
Message-ID: <200607132142.k6DLgWvi009070@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc6
- Tag as 1.1.1-5.fc6.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- xorg-x11-server.spec	13 Jul 2006 21:41:00 -0000	1.119
+++ xorg-x11-server.spec	13 Jul 2006 21:42:29 -0000	1.120
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   5.fc5.aiglx
+Release:   5%{dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -643,6 +643,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc6
+- Tag as 1.1.1-5.fc6.
+
 * Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
 - Enable composite by default.
 - Split spiffiffity patch into one patch per change:



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:44:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:44:20 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 xorg-x11-drv-i810.spec, 1.25, 1.26
Message-ID: <200607132144.k6DLiK6S009562@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-10.20060713modeset.fc6 on branch devel from xorg-x11-drv-i810-1.6.0-10.20060713modeset.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Jul 2006 21:47:27 -0000	1.11
+++ .cvsignore	13 Jul 2006 21:44:17 -0000	1.12
@@ -1 +1 @@
-xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060713.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	11 Jul 2006 21:47:27 -0000	1.11
+++ sources	13 Jul 2006 21:44:17 -0000	1.12
@@ -1 +1 @@
-99af7eb02cbda6b8269d2a48b435370b  xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+c2da336622b7bb617f7ea59460a47cab  xf86-video-intel-1.6.0-git-modesetting-20060713.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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-i810.spec	12 Jul 2006 08:59:47 -0000	1.25
+++ xorg-x11-drv-i810.spec	13 Jul 2006 21:44:17 -0000	1.26
@@ -8,18 +8,20 @@
 %define with_dri        0
 %endif
 
+%define gitdate 20060713
+
 # GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   9.20060707modeset.1%{?dist}
+Release:   10.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:   xf86-video-intel-1.6.0-git-modesetting-20060707.tar.bz2
+Source0:   xf86-video-intel-1.6.0-git-modesetting-%{gitdate}.tar.bz2
 Source1:   i810.xinf
 
 ExclusiveArch: %{ix86} x86_64 ia64
@@ -82,6 +84,8 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i810_drv.so
+%{driverdir}/ch7xxx.so
+%{driverdir}/sil164.so
 %{_datadir}/hwdata/videoaliases/i810.xinf
 %dir %{_libdir}
 %{_libdir}/libI810XvMC.so.1
@@ -95,7 +99,11 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-10.20060713modeset.fc6
+- Update to today's git; crash fixes, better pre-915 support, slightly better
+  autoconfigurability.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.6.0-9.20060707modeset.1.fc6
 - rebuild
 
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-9.20060707modeset



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:47:42 -0400
Subject: rpms/scim-tables/devel scim-tables.spec,1.27,1.28
Message-ID: <200607132147.k6DLlgVw025512@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-tables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25479

Modified Files:
	scim-tables.spec 
Log Message:
Add missing BR


Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- scim-tables.spec	13 Jul 2006 01:14:33 -0000	1.27
+++ scim-tables.spec	13 Jul 2006 21:47:40 -0000	1.28
@@ -8,7 +8,7 @@
 
 Name:		scim-tables
 Version:	0.5.6
-Release:	6
+Release:	7
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -18,7 +18,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires:	scim-devel, gtk2-devel
-BuildRequires:	gettext-devel automake
+BuildRequires:	gettext-devel automake libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -452,9 +452,9 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-6
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-7
 - rebuild
-- Add missing br automake
+- Add missing br automake, gettext, libtool
 
 * Thu Apr 27 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-5
 - obsolete old scim-tables-{japanese,korean} subpackages



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:51:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:51:26 -0400
Subject: rpms/tomboy/devel tomboy.spec,1.19,1.20
Message-ID: <200607132151.k6DLpQQU026898@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tomboy.spec 
Log Message:
no mono on s390


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tomboy.spec	13 Jul 2006 02:19:41 -0000	1.19
+++ tomboy.spec	13 Jul 2006 21:51:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        6
+Release:        7
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -30,7 +30,7 @@
 Requires:	gtkspell
 
 # Mono only availible on these: (s390x disabled for now)
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
 
 %description
 Tomboy is a desktop note-taking application for Linux and Unix. Simple and easy
@@ -106,9 +106,10 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-6
+* Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-7
 - rebuild
 - Add missing br gettext
+- don't build on s390(x)
 
 * Thu May 25 2006 Nalin Dahyabhai <nalin at redhat.com> - 0.3.5-5
 - rebuild



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:57:53 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.85,1.86
Message-ID: <200607132157.k6DLvrXk029339@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Bootstrap mode (with apisonly) build




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- tomcat5.spec	13 Jul 2006 19:06:38 -0000	1.85
+++ tomcat5.spec	13 Jul 2006 21:57:50 -0000	1.86
@@ -31,6 +31,9 @@
 # If you want only apis to be built,
 # give rpmbuild option '--with apisonly'
 
+#BOOTSTRAP
+%define _with_apisonly 1
+
 %define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
 %define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
 
@@ -1210,6 +1213,7 @@
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
 - Re-enable ppc64 and s390x
 - Disable JSP pre-compilation on ppc64 and x390x (FIXME)
+- Bootstrap mode (with apisonly) build
 
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
 - Full build



From fedora-cvs-commits at redhat.com  Thu Jul 13 21:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 17:57:53 -0400
Subject: rpms/iscsi-initiator-utils/devel .cvsignore, 1.8,
	1.9 iscsi-initiator-utils.spec, 1.15,
	1.16 open-iscsi-5.0.5.595-update-initscripts-and-docs.patch,
	1.1, 1.2 sources, 1.8, 1.9
Message-ID: <200607132157.k6DLvrjr029327@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29298

Modified Files:
	.cvsignore iscsi-initiator-utils.spec 
	open-iscsi-5.0.5.595-update-initscripts-and-docs.patch sources 
Log Message:
update iscsi tools to match kernel update. This breaks backwards compat so yo must upgrade the kernel, tools and DB


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	8 Jun 2006 19:00:44 -0000	1.8
+++ .cvsignore	13 Jul 2006 21:57:49 -0000	1.9
@@ -2,3 +2,5 @@
 open-iscsi-5.0.5.476.tar.bz2
 open-iscsi-5.0.5.595.tar.bz2
 open-iscsi-6.0.5.595.tar.bz2
+open-iscsi-1.1-645.tar.bz2
+open-iscsi-6.1.1.645.tar.bz2


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- iscsi-initiator-utils.spec	12 Jul 2006 17:33:34 -0000	1.15
+++ iscsi-initiator-utils.spec	13 Jul 2006 21:57:49 -0000	1.16
@@ -1,15 +1,11 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
-Version: 6.0.5.595
-Release: 2.1.1
+Version: 6.1.1.645
+Release: 0
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
 Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
-Patch2: open-iscsi-5.0.5.595-rm-reopen-max.patch
-Patch3: open-iscsi-5.0.5.595-fc-version.patch
-Patch4: iscsi-initiator-utils-cflags.patch
-Patch5: iscsistart-static.patch
 
 Group: System Environment/Daemons
 License: GPL
@@ -29,10 +25,6 @@
 %setup -q -n open-iscsi-%{version}
 %patch0 -p1 -b .update-initscripts-and-docs
 %patch1 -p1 -b .add-iscsi-iname
-%patch2 -p1 -b .rm-reopen-max
-%patch3 -p1 -b .fc-version
-%patch4 -p1 -b .cflags
-%patch5 -p1 -b .static
 
 %build
 make OPTFLAGS="%{optflags}" -C usr
@@ -76,6 +68,10 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jul 13 2006 Mike Christie <mchristie at redhat.com> - 6.1.1.645
+- update to upstream 1.1.645
+- Note DB and interface changed so you must update kernel, tools and DB
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.5.595-2.1.1
 - rebuild
 

open-iscsi-5.0.5.595-update-initscripts-and-docs.patch:
 iscsid.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/open-iscsi-5.0.5.595-update-initscripts-and-docs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-iscsi-5.0.5.595-update-initscripts-and-docs.patch	5 Jun 2006 17:50:57 -0000	1.1
+++ open-iscsi-5.0.5.595-update-initscripts-and-docs.patch	13 Jul 2006 21:57:49 -0000	1.2
@@ -1,15 +1,3 @@
-diff -aurp open-iscsi/etc/initd/initd.redhat open-iscsi.work/etc/initd/initd.redhat
---- open-iscsi/etc/initd/initd.redhat	2006-05-30 01:51:42.000000000 -0500
-+++ open-iscsi.work/etc/initd/initd.redhat	2006-05-30 03:57:03.000000000 -0500
-@@ -37,7 +37,7 @@ start_iscsid()
- 	TARGETS=`$ISCSIADM -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1 at g'`
- 	for rec in $TARGETS
- 	do
--		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3`
-+		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
- 		if [ $STARTUP = "automatic" ]
- 		then
- 			$ISCSIADM -m node -r $rec -l
 diff -aurp open-iscsi/etc/iscsid.conf open-iscsi.work/etc/iscsid.conf
 --- open-iscsi/etc/iscsid.conf	2006-05-30 01:51:42.000000000 -0500
 +++ open-iscsi.work/etc/iscsid.conf	2006-05-30 03:57:10.000000000 -0500
@@ -30,15 +18,3 @@
  #discovery.sendtargets.auth.authmethod = CHAP
  #discovery.sendtargets.auth.username = dima
  #discovery.sendtargets.auth.password = aloha
-diff -aurp open-iscsi/README open-iscsi.work/README
---- open-iscsi/README	2006-05-30 01:51:42.000000000 -0500
-+++ open-iscsi.work/README	2006-05-30 03:57:03.000000000 -0500
-@@ -353,7 +353,7 @@ node discovered in the discovery above:
- Or to set the "node.conn[0].statup" attribute to "startup" as default for
- all sessions add the following to the /etc/iscsid.conf:
- 
--	node.conn[0].startup = automatic
-+	node.startup = automatic
- 
- To login to all the automated nodes, simply restart the iscsi service
- e.g /etc/init.d/open-iscsi restart


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Jun 2006 19:00:45 -0000	1.8
+++ sources	13 Jul 2006 21:57:49 -0000	1.9
@@ -1 +1 @@
-2ec82582f551929fe1dfec578079d0bf  open-iscsi-6.0.5.595.tar.bz2
+46938978c78168de917f73f9e53c9425  open-iscsi-6.1.1.645.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 22:00:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 18:00:51 -0400
Subject: rpms/mkinitrd/devel sources,1.139,1.140
Message-ID: <200607132200.k6DM0pMw030478@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30414

Modified Files:
	sources 
Log Message:
- fix libdir stuff for s390



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- sources	13 Jul 2006 21:38:05 -0000	1.139
+++ sources	13 Jul 2006 22:00:49 -0000	1.140
@@ -1,2 +1,2 @@
 9336d33e6f75527c68ee09053c6b40c1  bdevid-0.1.tar.bz2
-64b8fc011df28c649dc6cb86b3cc2a19  mkinitrd-5.0.47.tar.bz2
+05acec95f75f8ec02ecfef84b432296f  mkinitrd-5.0.47.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 13 22:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 18:03:16 -0400
Subject: rpms/hwbrowser/devel hwbrowser.spec,1.33,1.34
Message-ID: <200607132203.k6DM3G6k030994@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hwbrowser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30972

Modified Files:
	hwbrowser.spec 
Log Message:
fix missing br


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hwbrowser.spec	12 Jul 2006 06:23:34 -0000	1.33
+++ hwbrowser.spec	13 Jul 2006 22:03:13 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A hardware browser.
 Name: hwbrowser
 Version: 0.27
-Release: 1.1
+Release: 2
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -11,6 +11,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: perl-XML-Parser
+BuildRequires: gettext
 Requires: gnome-python2
 Requires: gnome-python2-canvas
 Requires: pygtk2
@@ -62,8 +63,9 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.27-2
 - rebuild
+- br gettext
 
 * Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> 0.27
 - buildrequire perl-XML-Parser (#193400)



From fedora-cvs-commits at redhat.com  Thu Jul 13 22:11:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 18:11:28 -0400
Subject: rpms/a2ps/devel a2ps.spec,1.35,1.36
Message-ID: <200607132211.k6DMBSi5032531@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32517

Modified Files:
	a2ps.spec 
Log Message:
no emacs on ppc64, and cleanup


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- a2ps.spec	12 Jul 2006 05:05:56 -0000	1.35
+++ a2ps.spec	13 Jul 2006 22:11:24 -0000	1.36
@@ -1,10 +1,7 @@
-%define	ver	4.13b
-%define rel 	51.1
-
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
-Version: %{ver}
-Release: %{rel}
+Version: 4.13b
+Release: 52
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -47,6 +44,9 @@
 Obsoletes: a2ps-i18n
 Provides: a2ps-i18n
 
+# Temp exclude on ppc64 as no emacs there right now
+ExcludeArch: ppc64
+
 BuildRequires: gettext
 
 %description
@@ -232,8 +232,10 @@
 %dir %{_datadir}/a2ps
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-51.1
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-52
 - rebuild
+- exclude ppc64 as no emacs there right now.
+- get rid of stupid ver and rel defines.
 
 * Tue May 30 2006 Tim Waugh <twaugh at redhat.com> 4.13b-51
 - Build requires gettext (bug #193346).



From fedora-cvs-commits at redhat.com  Thu Jul 13 23:04:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 19:04:13 -0400
Subject: rpms/kernel/devel linux-2.6-slab-corruptor-fix.patch, NONE,
	1.1 kernel-2.6.spec, 1.2395, 1.2396
Message-ID: <200607132304.k6DN4DlY012793@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-slab-corruptor-fix.patch 
Log Message:
Ever wonder why the slab corruption issues only show up the week before the freeze?


linux-2.6-slab-corruptor-fix.patch:
 a/mm/slab.c |    9 --------
 b/mm/slab.c |   67 +++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 42 insertions(+), 34 deletions(-)

--- NEW FILE linux-2.6-slab-corruptor-fix.patch ---
>From davej  Thu Jul 13 18:25:32 2006
Return-Path: <akpm at osdl.org>
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
	nwo.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY 
	autolearn=failed version=3.1.3
Received: from pobox.devel.redhat.com [10.11.255.8]
	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
	for <davej at localhost> (single-drop); Thu, 13 Jul 2006 18:25:32 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
	 Thu, 13 Jul 2006 18:24:45 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6DMOiv8027699
	for <davej at pobox.devel.redhat.com>; Thu, 13 Jul 2006 18:24:45 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6DMOifR011137
	for <davej at redhat.com>; Thu, 13 Jul 2006 18:24:44 -0400
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6DMOWXl005296
	for <davej at redhat.com>; Thu, 13 Jul 2006 18:24:38 -0400
Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k6DMOQnW001908
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO);
	Thu, 13 Jul 2006 15:24:26 -0700
Received: from box (shell0.pdx.osdl.net [10.9.0.31])
	by shell0.pdx.osdl.net (8.13.1/8.11.6) with SMTP id k6DMOQsd015752;
	Thu, 13 Jul 2006 15:24:26 -0700
Date: Thu, 13 Jul 2006 15:24:25 -0700
From: Andrew Morton <akpm at osdl.org>
To: Dave Jones <davej at redhat.com>
Cc: linux-kernel at vger.kernel.org, torvalds at osdl.org
Subject: Re: memory corruptor in .18rc1-git
Message-Id: <20060713152425.86412ea3.akpm at osdl.org>
In-Reply-To: <20060713221330.GB3371 at redhat.com>
References: <20060713221330.GB3371 at redhat.com>
X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.17; i686-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-MIMEDefang-Filter: osdl$Revision: 1.140 $
X-Scanned-By: MIMEDefang 2.36
X-RedHat-Spam-Score: 0.05 
Status: RO
X-Status: A
Content-Length: 1794
Lines: 48

On Thu, 13 Jul 2006 18:13:30 -0400
Dave Jones <davej at redhat.com> wrote:

> Three times in the last week, I've had a box running the -git-du-jour
> spontaneously reboot.  It just happened again, this time I had a serial
> console hooked up, but it rebooted before transferring much data.
> The one thing it did spew however was "List corruption. prev->ne",
> which came from the patch below which I had in my tree.
> (The latter half is likely irrelevant, and came from chasing a different bug)
> 
> Things in common at all three times it happened..
> reading email, and listening to oggs with rhythmbox.
> Another ALSA bug maybe ?
> 
> I've up'd the speed of the serial console, in the hope that more chars
> make it over the wire before reboot should this happen again.

Are you using SMP?  We have a known slab locking bug.

There have been a couple of slab.c patches committed today, but neither of
them appear to actually fix the bug.

The below should fix it, and testing this (disable lockdep) would be
useful.

It's going to take a bit of work to unpickle it all now.

diff -puN mm/slab.c~revert-slabc-lockdep-locking-change mm/slab.c
--- a/mm/slab.c~revert-slabc-lockdep-locking-change
+++ a/mm/slab.c
@@ -3100,16 +3100,7 @@ static void free_block(struct kmem_cache
 		if (slabp->inuse == 0) {
 			if (l3->free_objects > l3->free_limit) {
 				l3->free_objects -= cachep->num;
-				/*
-				 * It is safe to drop the lock. The slab is
-				 * no longer linked to the cache. cachep
-				 * cannot disappear - we are using it and
-				 * all destruction of caches must be
-				 * serialized properly by the user.
-				 */
-				spin_unlock(&l3->list_lock);
 				slab_destroy(cachep, slabp);
-				spin_lock(&l3->list_lock);
 			} else {
 				list_add(&slabp->list, &l3->slabs_free);
 			}
_



From fedora-cvs-commits at redhat.com  Thu Jul 13 23:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 19:34:55 -0400
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.26,1.27
Message-ID: <200607132334.k6DNYt6t013024@cvs.devel.redhat.com>

Author: ajackson

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

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-11.20060713modeset.fc6 on branch devel from xorg-x11-drv-i810-1.6.0-11.20060713modeset.fc6.src.rpm


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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-drv-i810.spec	13 Jul 2006 21:44:17 -0000	1.26
+++ xorg-x11-drv-i810.spec	13 Jul 2006 23:34:53 -0000	1.27
@@ -14,7 +14,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   10.%{gitdate}modeset%{?dist}
+Release:   11.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -99,6 +99,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-11.20060713modeset.fc6
+- Update again for a mode comparison bugfix.
+
 * Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-10.20060713modeset.fc6
 - Update to today's git; crash fixes, better pre-915 support, slightly better
   autoconfigurability.



From fedora-cvs-commits at redhat.com  Fri Jul 14 00:15:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 20:15:01 -0400
Subject: rpms/kernel/devel/configs config-generic,1.225,1.226
Message-ID: <200607140015.k6E0F1OM007175@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable lockdep debugging again


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- config-generic	13 Jul 2006 17:16:11 -0000	1.225
+++ config-generic	14 Jul 2006 00:14:58 -0000	1.226
@@ -2567,7 +2567,7 @@
 
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_LOCKDEP=y
+# CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
 # These debug options are deliberatly left on.



From fedora-cvs-commits at redhat.com  Fri Jul 14 00:50:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 20:50:59 -0400
Subject: rpms/perl/devel perl-5.8.8-U34297_C28006.patch,NONE,1.1
Message-ID: <200607140050.k6E0oxQc015090@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-U34297_C28006.patch 
Log Message:
fix upstream bug 34297

perl-5.8.8-U34297_C28006.patch:
 pp.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE perl-5.8.8-U34297_C28006.patch ---
--- perl-5.8.8/pp.c.U34297_C28006	2006-07-13 12:40:37.000000000 -0400
+++ perl-5.8.8/pp.c	2006-07-13 13:03:19.000000000 -0400
@@ -2949,7 +2949,22 @@
     dSP; dTARGET;
     SV *sv = TOPs;
 
-    if (DO_UTF8(sv))
+    if (SvAMAGIC(sv)) {
+	/* For an overloaded scalar, we can't know in advance if it's going to
+	   be UTF-8 or not. Also, we can't call sv_len_utf8 as it likes to
+	   cache the length. Maybe that should be a documented feature of it.
+	*/
+	STRLEN len;
+	const char *const p = SvPV_const(sv, len);
+
+	if (DO_UTF8(sv)) {
+	    SETi(utf8_length((U8*)p, (U8*)p + len));
+	}
+	else
+	    SETi(len);
+
+    } 
+    else if (DO_UTF8(sv))
 	SETi(sv_len_utf8(sv));
     else
 	SETi(sv_len(sv));



From fedora-cvs-commits at redhat.com  Fri Jul 14 02:54:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 13 Jul 2006 22:54:51 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.86,1.87
Message-ID: <200607140254.k6E2spVS017338@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Rebuild in full




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- tomcat5.spec	13 Jul 2006 21:57:50 -0000	1.86
+++ tomcat5.spec	14 Jul 2006 02:54:48 -0000	1.87
@@ -31,9 +31,6 @@
 # If you want only apis to be built,
 # give rpmbuild option '--with apisonly'
 
-#BOOTSTRAP
-%define _with_apisonly 1
-
 %define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
 %define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
 
@@ -72,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_2fc
+Release: 3jpp_3fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1210,6 +1207,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Thu Jul 13 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_3fc
+- Rebuild in full
+
 * Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
 - Re-enable ppc64 and s390x
 - Disable JSP pre-compilation on ppc64 and x390x (FIXME)



From fedora-cvs-commits at redhat.com  Fri Jul 14 04:00:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 00:00:11 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.87,1.88
Message-ID: <200607140400.k6E40Bv1007627@cvs.devel.redhat.com>

Author: fnasser

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

Modified Files:
	tomcat5.spec 
Log Message:
Remove file that is not created when Jasper is not run




Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- tomcat5.spec	14 Jul 2006 02:54:48 -0000	1.87
+++ tomcat5.spec	14 Jul 2006 04:00:06 -0000	1.88
@@ -1145,7 +1145,9 @@
 %dir %{appdir}/webdav
 %{appdir}/webdav/*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/applet*
+%ifnarch ppc64 s390x
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
+%endif
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jsp-examples*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/sample*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-examples*



From fedora-cvs-commits at redhat.com  Fri Jul 14 04:35:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 00:35:10 -0400
Subject: rpms/gdm/devel gdm-2.15.5-session-keyring.patch, 1.1, 1.2 gdm.spec,
	1.172, 1.173
Message-ID: <200607140435.k6E4ZA5p028760@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28673

Modified Files:
	gdm-2.15.5-session-keyring.patch gdm.spec 
Log Message:
- put new pam module at top of stack (bug 198629)


gdm-2.15.5-session-keyring.patch:
 gdm                |    1 +
 gdm-autologin      |    1 +
 gdm-securitytokens |    1 +
 3 files changed, 3 insertions(+)

Index: gdm-2.15.5-session-keyring.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-session-keyring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.5-session-keyring.patch	12 Jul 2006 14:23:00 -0000	1.1
+++ gdm-2.15.5-session-keyring.patch	14 Jul 2006 04:35:07 -0000	1.2
@@ -2,21 +2,21 @@
 +++ gdm-2.15.5/config/gdm-autologin	2006-07-12 10:19:04.000000000 +0200
 @@ -6,3 +6,4 @@
  password   required	pam_stack.so service=system-auth
++session    optional     pam_keyinit.so force revoke
  session    required	pam_stack.so service=system-auth
  session    optional     pam_console.so
-+session    optional     pam_keyinit.so force revoke
 --- gdm-2.15.5/config/gdm-securitytokens.session-keyring	2006-07-12 10:19:10.000000000 +0200
 +++ gdm-2.15.5/config/gdm-securitytokens	2006-07-12 10:19:15.000000000 +0200
 @@ -8,3 +8,4 @@
++session    optional     pam_keyinit.so force revoke
  session    include      system-auth
  session    required     pam_loginuid.so
  session    optional     pam_console.so
-+session    optional     pam_keyinit.so force revoke
 --- gdm-2.15.5/config/gdm.session-keyring	2006-07-12 10:18:35.000000000 +0200
 +++ gdm-2.15.5/config/gdm	2006-07-12 10:18:50.000000000 +0200
 @@ -7,4 +7,5 @@
++session    optional    pam_keyinit.so force revoke
  session    include     system-auth
  session    required    pam_loginuid.so
  session    optional    pam_console.so
-+session    optional    pam_keyinit.so force revoke
  


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- gdm.spec	12 Jul 2006 18:15:18 -0000	1.172
+++ gdm.spec	14 Jul 2006 04:35:07 -0000	1.173
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -324,6 +324,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-2
+- put new pam module at top of stack (bug 198629)
+
 * Wed Jul 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-1
 - Update to 2.15.6
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 05:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 01:18:27 -0400
Subject: rpms/gdb/devel gdb-6.5-bfd-hash-style-20060714.patch, NONE,
	1.1 gdb.spec, 1.192, 1.193
Message-ID: <200607140518.k6E5IRjP001580@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1450

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.5-bfd-hash-style-20060714.patch 
Log Message:
* Thu Jul 13 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-3
- Add missing definition of multilib_64_archs for glibc-devel buildreqs.
- Backport support for .gnu.hash sections.


gdb-6.5-bfd-hash-style-20060714.patch:
 bfd/elf-bfd.h        |    7 
 bfd/elf.c            |   23 ++
 bfd/elf32-i386.c     |   13 +
 bfd/elf64-x86-64.c   |   15 +
 bfd/elflink.c        |  466 +++++++++++++++++++++++++++++++++++++++++++--------
 bfd/elfxx-target.h   |    5 
 include/bfdlink.h    |    6 
 include/elf/common.h |    2 
 8 files changed, 471 insertions(+), 66 deletions(-)

--- NEW FILE gdb-6.5-bfd-hash-style-20060714.patch ---
2006-07-10  Jakub Jelinek  <jakub at redhat.com>

include/
	* bfdlink.h (struct bfd_link_info): Add emit_hash and
	emit_gnu_hash bitfields.
include/elf/
	* common.h (SHT_GNU_HASH, DT_GNU_HASH): Define.
bfd/
	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_GNU_HASH.
	(bfd_section_from_shdr, elf_fake_sections, assign_section_numbers):
	Handle SHT_GNU_HASH.
	(special_sections_g): Include .gnu.hash section.
	(bfd_elf_gnu_hash): New function.
	* elf-bfd.h (bfd_elf_gnu_hash, _bfd_elf_hash_symbol): New prototypes.
	(struct elf_backend_data): Add elf_hash_symbol method.
	* elflink.c (_bfd_elf_link_create_dynamic_sections): Create .hash
	only if info->emit_hash, create .gnu.hash section if
	info->emit_gnu_hash.
	(struct collect_gnu_hash_codes): New type.
	(elf_collect_gnu_hash_codes, elf_renumber_gnu_hash_syms,
	_bfd_elf_hash_symbol): New functions.
	(compute_bucket_count): Don't compute HASHCODES array, instead add
	that and NSYMS as arguments.  Use bed->s->sizeof_hash_entry
	instead of bed->s->arch_size / 8.  Fix .hash size estimation.
	When not optimizing, use the number of hashed symbols rather than
	dynsymcount.
	(bfd_elf_size_dynamic_sections): Only add DT_HASH if info->emit_hash,
	and ADD DT_GNU_HASH if info->emit_gnu_hash.
	(bfd_elf_size_dynsym_hash_dynstr): Size .hash only if info->emit_hash,
	adjust compute_bucket_count caller.  Create and populate .gnu.hash
	section if info->emit_gnu_hash.
	(elf_link_output_extsym): Only populate .hash section if
	finfo->hash_sec != NULL.
	(bfd_elf_final_link): Adjust assertion.  Handle DT_GNU_HASH.
	* elfxx-target.h (elf_backend_hash_symbol): Define if not yet defined.
	(elfNN_bed): Add elf_backend_hash_symbol.
	* elf64-x86-64.c (elf64_x86_64_hash_symbol): New function.
	(elf_backend_hash_symbol): Define.
	* elf32-i386.c (elf_i386_hash_symbol): New function.
	(elf_backend_hash_symbol): Define.

Index: gdb-6.5/bfd/elf-bfd.h
===================================================================
--- gdb-6.5.orig/bfd/elf-bfd.h	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elf-bfd.h	2006-07-14 01:31:25.000000000 -0300
@@ -1022,6 +1022,9 @@ struct elf_backend_data
 			       bfd_boolean *, bfd_boolean *,
 			       bfd *, asection **);
 
+  /* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+  bfd_boolean (*elf_hash_symbol) (struct elf_link_hash_entry *);
+
   /* Used to handle bad SHF_LINK_ORDER input.  */
   bfd_error_handler_type link_order_error_handler;
 
@@ -1462,6 +1465,8 @@ extern bfd_vma _bfd_elf_section_offset
 
 extern unsigned long bfd_elf_hash
   (const char *);
+extern unsigned long bfd_elf_gnu_hash
+  (const char *);
 
 extern bfd_reloc_status_type bfd_elf_generic_reloc
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
@@ -1632,6 +1637,8 @@ extern bfd_boolean _bfd_elf_merge_symbol
    struct elf_link_hash_entry **, bfd_boolean *,
    bfd_boolean *, bfd_boolean *, bfd_boolean *);
 
+extern bfd_boolean _bfd_elf_hash_symbol (struct elf_link_hash_entry *);
+
 extern bfd_boolean _bfd_elf_add_default_symbol
   (bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
    const char *, Elf_Internal_Sym *, asection **, bfd_vma *,
Index: gdb-6.5/bfd/elf64-x86-64.c
===================================================================
--- gdb-6.5.orig/bfd/elf64-x86-64.c	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elf64-x86-64.c	2006-07-14 01:31:26.000000000 -0300
@@ -3614,6 +3614,19 @@ elf64_x86_64_additional_program_headers 
   return count;
 }
 
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf64_x86_64_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
+
 static const struct bfd_elf_special_section 
   elf64_x86_64_special_sections[]=
 {
@@ -3685,5 +3698,7 @@ static const struct bfd_elf_special_sect
   elf64_x86_64_special_sections
 #define elf_backend_additional_program_headers \
   elf64_x86_64_additional_program_headers
+#define elf_backend_hash_symbol \
+  elf64_x86_64_hash_symbol
 
 #include "elf64-target.h"
Index: gdb-6.5/bfd/elf.c
===================================================================
--- gdb-6.5.orig/bfd/elf.c	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elf.c	2006-07-14 01:31:26.000000000 -0300
@@ -206,6 +206,21 @@ bfd_elf_hash (const char *namearg)
   return h & 0xffffffff;
 }
 
+/* DT_GNU_HASH hash function.  Do not change this function; you will
+   cause invalid hash tables to be generated.  */
+
+unsigned long
+bfd_elf_gnu_hash (const char *namearg)
+{
+  const unsigned char *name = (const unsigned char *) namearg;
+  unsigned long h = 5381;
+  unsigned char ch;
+
+  while ((ch = *name++) != '\0')
+    h = (h << 5) + h + ch;
+  return h & 0xffffffff;
+}
+
 bfd_boolean
 bfd_elf_mkobject (bfd *abfd)
 {
@@ -1239,6 +1254,7 @@ _bfd_elf_print_private_bfd_data (bfd *ab
 	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = TRUE; break;
 	    case DT_USED: name = "USED"; break;
 	    case DT_FILTER: name = "FILTER"; stringp = TRUE; break;
+	    case DT_GNU_HASH: name = "GNU_HASH"; break;
 	    }
 
 	  fprintf (f, "  %-11s ", name);
@@ -1822,6 +1838,7 @@ bfd_section_from_shdr (bfd *abfd, unsign
     case SHT_FINI_ARRAY:	/* .fini_array section.  */
     case SHT_PREINIT_ARRAY:	/* .preinit_array section.  */
     case SHT_GNU_LIBLIST:	/* .gnu.liblist section.  */
+    case SHT_GNU_HASH:		/* .gnu.hash section.  */
       return _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex);
 
     case SHT_DYNAMIC:	/* Dynamic linking information.  */
@@ -2294,6 +2311,7 @@ static const struct bfd_elf_special_sect
   { ".gnu.version_r", 14,  0, SHT_GNU_verneed, 0 },
   { ".gnu.liblist",   12,  0, SHT_GNU_LIBLIST, SHF_ALLOC },
   { ".gnu.conflict",  13,  0, SHT_RELA,     SHF_ALLOC },
+  { ".gnu.hash",       9,  0, SHT_GNU_HASH, SHF_ALLOC },
   { NULL,              0,  0, 0,            0 }
 };
 
@@ -2810,6 +2828,10 @@ elf_fake_sections (bfd *abfd, asection *
     case SHT_GROUP:
       this_hdr->sh_entsize = 4;
       break;
+
+    case SHT_GNU_HASH:
+      this_hdr->sh_entsize = bed->s->arch_size == 64 ? 0 : 4;
+      break;
     }
 
   if ((asect->flags & SEC_ALLOC) != 0)
@@ -3255,6 +3277,7 @@ assign_section_numbers (bfd *abfd, struc
 	  break;
 
 	case SHT_HASH:
+	case SHT_GNU_HASH:
 	case SHT_GNU_versym:
 	  /* sh_link is the section header index of the symbol table
 	     this hash table or version table is for.  */
Index: gdb-6.5/bfd/elf32-i386.c
===================================================================
--- gdb-6.5.orig/bfd/elf32-i386.c	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elf32-i386.c	2006-07-14 01:31:26.000000000 -0300
@@ -3872,6 +3872,18 @@ elf_i386_plt_sym_val (bfd_vma i, const a
   return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
 }
 
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+static bfd_boolean
+elf_i386_hash_symbol (struct elf_link_hash_entry *h)
+{
+  if (h->plt.offset != (bfd_vma) -1
+      && !h->def_regular
+      && !h->pointer_equality_needed)
+    return FALSE;
+
+  return _bfd_elf_hash_symbol (h);
+}
 
 #define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
 #define TARGET_LITTLE_NAME		"elf32-i386"
@@ -3912,6 +3924,7 @@ elf_i386_plt_sym_val (bfd_vma i, const a
 #define elf_backend_size_dynamic_sections     elf_i386_size_dynamic_sections
 #define elf_backend_always_size_sections      elf_i386_always_size_sections
 #define elf_backend_plt_sym_val		      elf_i386_plt_sym_val
+#define elf_backend_hash_symbol		      elf_i386_hash_symbol
 
 #include "elf32-target.h"
 
Index: gdb-6.5/bfd/elflink.c
===================================================================
--- gdb-6.5.orig/bfd/elflink.c	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elflink.c	2006-07-14 01:31:26.000000000 -0300
@@ -240,12 +240,30 @@ _bfd_elf_link_create_dynamic_sections (b
   if (!_bfd_elf_define_linkage_sym (abfd, info, s, "_DYNAMIC"))
     return FALSE;
 
-  s = bfd_make_section_with_flags (abfd, ".hash",
-				   flags | SEC_READONLY);
-  if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
-    return FALSE;
-  elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
+  if (info->emit_hash)
+    {
+      s = bfd_make_section_with_flags (abfd, ".hash", flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      elf_section_data (s)->this_hdr.sh_entsize = bed->s->sizeof_hash_entry;
+    }
+
+  if (info->emit_gnu_hash)
+    {
+      s = bfd_make_section_with_flags (abfd, ".gnu.hash",
+				       flags | SEC_READONLY);
+      if (s == NULL
+	  || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
+	return FALSE;
+      /* For 64-bit ELF, .gnu.hash is a non-uniform entity size section:
+	 4 32-bit words followed by variable count of 64-bit words, then
+	 variable count of 32-bit words.  */
+      if (bed->s->arch_size == 64)
+	elf_section_data (s)->this_hdr.sh_entsize = 0;
+      else
+	elf_section_data (s)->this_hdr.sh_entsize = 4;
+    }
 
   /* Let the backend create the rest of the sections.  This lets the
      backend set the right flags.  The backend will normally create
@@ -4795,6 +4813,131 @@ elf_collect_hash_codes (struct elf_link_
   return TRUE;
 }
 
+struct collect_gnu_hash_codes
+{
+  bfd *output_bfd;
+  const struct elf_backend_data *bed;
+  unsigned long int nsyms;
+  unsigned long int maskbits;
+  unsigned long int *hashcodes;
+  unsigned long int *hashval;
+  unsigned long int *indx;
+  unsigned long int *counts;
+  bfd_vma *bitmask;
+  bfd_byte *contents;
+  long int min_dynindx;
+  unsigned long int bucketcount;
+  unsigned long int symindx;
+  long int local_indx;
+  long int shift1, shift2;
+  unsigned long int mask;
+};
+
+/* This function will be called though elf_link_hash_traverse to store
+   all hash value of the exported symbols in an array.  */
+
+static bfd_boolean
+elf_collect_gnu_hash_codes (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = data;
+  const char *name;
+  char *p;
+  unsigned long ha;
+  char *alc = NULL;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* Ignore indirect symbols.  These are added by the versioning code.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    return TRUE;
+
+  name = h->root.root.string;
+  p = strchr (name, ELF_VER_CHR);
+  if (p != NULL)
+    {
+      alc = bfd_malloc (p - name + 1);
+      memcpy (alc, name, p - name);
+      alc[p - name] = '\0';
+      name = alc;
+    }
+
+  /* Compute the hash value.  */
+  ha = bfd_elf_gnu_hash (name);
+
+  /* Store the found hash value in the array for compute_bucket_count,
+     and also for .dynsym reordering purposes.  */
+  s->hashcodes[s->nsyms] = ha;
+  s->hashval[h->dynindx] = ha;
+  ++s->nsyms;
+  if (s->min_dynindx < 0 || s->min_dynindx > h->dynindx)
+    s->min_dynindx = h->dynindx;
+
+  if (alc != NULL)
+    free (alc);
+
+  return TRUE;
+}
+
+/* This function will be called though elf_link_hash_traverse to do
+   final dynaminc symbol renumbering.  */
+
+static bfd_boolean
+elf_renumber_gnu_hash_syms (struct elf_link_hash_entry *h, void *data)
+{
+  struct collect_gnu_hash_codes *s = data;
+  unsigned long int bucket;
+  unsigned long int val;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  /* Ignore indirect symbols.  */
+  if (h->dynindx == -1)
+    return TRUE;
+
+  /* Ignore also local symbols and undefined symbols.  */
+  if (! (*s->bed->elf_hash_symbol) (h))
+    {
+      if (h->dynindx >= s->min_dynindx)
+	h->dynindx = s->local_indx++;
+      return TRUE;
+    }
+
+  bucket = s->hashval[h->dynindx] % s->bucketcount;
+  val = (s->hashval[h->dynindx] >> s->shift1)
+	& ((s->maskbits >> s->shift1) - 1);
+  s->bitmask[val] |= ((bfd_vma) 1) << (s->hashval[h->dynindx] & s->mask);
+  s->bitmask[val]
+    |= ((bfd_vma) 1) << ((s->hashval[h->dynindx] >> s->shift2) & s->mask);
+  val = s->hashval[h->dynindx] & ~(unsigned long int) 1;
+  if (s->counts[bucket] == 1)
+    /* Last element terminates the chain.  */
+    val |= 1;
+  bfd_put_32 (s->output_bfd, val,
+	      s->contents + (s->indx[bucket] - s->symindx) * 4);
+  --s->counts[bucket];
+  h->dynindx = s->indx[bucket]++;
+  return TRUE;
+}
+
+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+
+bfd_boolean
+_bfd_elf_hash_symbol (struct elf_link_hash_entry *h)
+{
+  return !(h->forced_local
+	   || h->root.type == bfd_link_hash_undefined
+	   || h->root.type == bfd_link_hash_undefweak
+	   || ((h->root.type == bfd_link_hash_defined
+		|| h->root.type == bfd_link_hash_defweak)
+	       && h->root.u.def.section->output_section == NULL));
+}
+
 /* Array used to determine the number of hash table buckets to use
    based on the number of symbols there are.  If there are fewer than
    3 symbols we use 1 bucket, fewer than 17 symbols we use 3 buckets,
@@ -4816,42 +4959,26 @@ static const size_t elf_buckets[] =
    Therefore the result is always a good payoff between few collisions
    (= short chain lengths) and table size.  */
 static size_t
-compute_bucket_count (struct bfd_link_info *info)
+compute_bucket_count (struct bfd_link_info *info, unsigned long int *hashcodes,
+		      unsigned long int nsyms, int gnu_hash)
 {
   size_t dynsymcount = elf_hash_table (info)->dynsymcount;
   size_t best_size = 0;
-  unsigned long int *hashcodes;
-  unsigned long int *hashcodesp;
   unsigned long int i;
   bfd_size_type amt;
 
-  /* Compute the hash values for all exported symbols.  At the same
-     time store the values in an array so that we could use them for
-     optimizations.  */
-  amt = dynsymcount;
-  amt *= sizeof (unsigned long int);
-  hashcodes = bfd_malloc (amt);
-  if (hashcodes == NULL)
-    return 0;
-  hashcodesp = hashcodes;
-
-  /* Put all hash values in HASHCODES.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_collect_hash_codes, &hashcodesp);
-
   /* We have a problem here.  The following code to optimize the table
      size requires an integer type with more the 32 bits.  If
      BFD_HOST_U_64_BIT is set we know about such a type.  */
 #ifdef BFD_HOST_U_64_BIT
   if (info->optimize)
     {
-      unsigned long int nsyms = hashcodesp - hashcodes;
       size_t minsize;
       size_t maxsize;
       BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
-      unsigned long int *counts ;
       bfd *dynobj = elf_hash_table (info)->dynobj;
       const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
+      unsigned long int *counts;
 
       /* Possible optimization parameters: if we have NSYMS symbols we say
 	 that the hashing table must at least have NSYMS/4 and at most
@@ -4860,6 +4987,13 @@ compute_bucket_count (struct bfd_link_in
       if (minsize == 0)
 	minsize = 1;
       best_size = maxsize = nsyms * 2;
+      if (gnu_hash)
+	{
+	  if (minsize < 2)
+	    minsize = 2;
+	  if ((best_size & 31) == 0)
+	    ++best_size;
+	}
 
       /* Create array where we count the collisions in.  We must use bfd_malloc
 	 since the size could be large.  */
@@ -4867,10 +5001,7 @@ compute_bucket_count (struct bfd_link_in
       amt *= sizeof (unsigned long int);
       counts = bfd_malloc (amt);
       if (counts == NULL)
-	{
-	  free (hashcodes);
-	  return 0;
-	}
+	return 0;
 
       /* Compute the "optimal" size for the hash table.  The criteria is a
 	 minimal chain length.  The minor criteria is (of course) the size
@@ -4882,6 +5013,9 @@ compute_bucket_count (struct bfd_link_in
 	  unsigned long int j;
 	  unsigned long int fact;
 
+	  if (gnu_hash && (i & 31) == 0)
+	    continue;
+
 	  memset (counts, '\0', i * sizeof (unsigned long int));
 
 	  /* Determine how often each hash bucket is used.  */
@@ -4897,9 +5031,9 @@ compute_bucket_count (struct bfd_link_in
 #  define BFD_TARGET_PAGESIZE	(4096)
 # endif
 
-	  /* We in any case need 2 + NSYMS entries for the size values and
-	     the chains.  */
-	  max = (2 + nsyms) * (bed->s->arch_size / 8);
+	  /* We in any case need 2 + DYNSYMCOUNT entries for the size values
+	     and the chains.  */
+	  max = (2 + dynsymcount) * bed->s->sizeof_hash_entry;
 
 # if 1
 	  /* Variant 1: optimize for short chains.  We add the squares
@@ -4909,7 +5043,7 @@ compute_bucket_count (struct bfd_link_in
 	    max += counts[j] * counts[j];
 
 	  /* This adds penalties for the overall size of the table.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
 	  max *= fact * fact;
 # else
 	  /* Variant 2: Optimize a lot more for small table.  Here we
@@ -4920,7 +5054,7 @@ compute_bucket_count (struct bfd_link_in
 
 	  /* The overall size of the table is considered, but not as
 	     strong as in variant 1, where it is squared.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (bed->s->arch_size / 8)) + 1;
+	  fact = i / (BFD_TARGET_PAGESIZE / bed->s->sizeof_hash_entry) + 1;
 	  max *= fact;
 # endif
 
@@ -4943,14 +5077,13 @@ compute_bucket_count (struct bfd_link_in
       for (i = 0; elf_buckets[i] != 0; i++)
 	{
 	  best_size = elf_buckets[i];
-	  if (dynsymcount < elf_buckets[i + 1])
+	  if (nsyms < elf_buckets[i + 1])
 	    break;
 	}
+      if (gnu_hash && best_size < 2)
+	best_size = 2;
     }
 
-  /* Free the arrays we needed.  */
-  free (hashcodes);
-
   return best_size;
 }
 
@@ -5308,7 +5441,10 @@ bfd_elf_size_dynamic_sections (bfd *outp
 	  bfd_size_type strsize;
 
 	  strsize = _bfd_elf_strtab_size (elf_hash_table (info)->dynstr);
-	  if (!_bfd_elf_add_dynamic_entry (info, DT_HASH, 0)
+	  if ((info->emit_hash
+	       && !_bfd_elf_add_dynamic_entry (info, DT_HASH, 0))
+	      || (info->emit_gnu_hash
+		  && !_bfd_elf_add_dynamic_entry (info, DT_GNU_HASH, 0))
 	      || !_bfd_elf_add_dynamic_entry (info, DT_STRTAB, 0)
 	      || !_bfd_elf_add_dynamic_entry (info, DT_SYMTAB, 0)
 	      || !_bfd_elf_add_dynamic_entry (info, DT_STRSZ, strsize)
@@ -5710,8 +5846,6 @@ bfd_elf_size_dynsym_hash_dynstr (bfd *ou
       asection *s;
       bfd_size_type dynsymcount;
       unsigned long section_sym_count;
-      size_t bucketcount = 0;
-      size_t hash_entry_size;
       unsigned int dtagcount;
 
       dynobj = elf_hash_table (info)->dynobj;
@@ -5762,23 +5896,215 @@ bfd_elf_size_dynsym_hash_dynstr (bfd *ou
 	  memset (s->contents, 0, section_sym_count * bed->s->sizeof_sym);
 	}
 
+      elf_hash_table (info)->bucketcount = 0;
+
       /* Compute the size of the hashing table.  As a side effect this
 	 computes the hash values for all the names we export.  */
-      bucketcount = compute_bucket_count (info);
+      if (info->emit_hash)
+	{
+	  unsigned long int *hashcodes;
+	  unsigned long int *hashcodesp;
+	  bfd_size_type amt;
+	  unsigned long int nsyms;
+	  size_t bucketcount;
+	  size_t hash_entry_size;
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * sizeof (unsigned long int);
+	  hashcodes = bfd_malloc (amt);
+	  if (hashcodes == NULL)
+	    return FALSE;
+	  hashcodesp = hashcodes;
 
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-      hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
-      s->size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
-      s->contents = bfd_zalloc (output_bfd, s->size);
-      if (s->contents == NULL)
-	return FALSE;
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_hash_codes, &hashcodesp);
 
-      bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
-      bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
-	       s->contents + hash_entry_size);
+	  nsyms = hashcodesp - hashcodes;
+	  bucketcount
+	    = compute_bucket_count (info, hashcodes, nsyms, 0);
+	  free (hashcodes);
 
-      elf_hash_table (info)->bucketcount = bucketcount;
+	  if (bucketcount == 0)
+	    return FALSE;
+
+	  elf_hash_table (info)->bucketcount = bucketcount;
+
+	  s = bfd_get_section_by_name (dynobj, ".hash");
+	  BFD_ASSERT (s != NULL);
+	  hash_entry_size = elf_section_data (s)->this_hdr.sh_entsize;
+	  s->size = ((2 + bucketcount + dynsymcount) * hash_entry_size);
+	  s->contents = bfd_zalloc (output_bfd, s->size);
+	  if (s->contents == NULL)
+	    return FALSE;
+
+	  bfd_put (8 * hash_entry_size, output_bfd, bucketcount, s->contents);
+	  bfd_put (8 * hash_entry_size, output_bfd, dynsymcount,
+		   s->contents + hash_entry_size);
+	}
+
+      if (info->emit_gnu_hash)
+	{
+	  size_t i, cnt;
+	  unsigned char *contents;
+	  struct collect_gnu_hash_codes cinfo;
+	  bfd_size_type amt;
+	  size_t bucketcount;
+
+	  memset (&cinfo, 0, sizeof (cinfo));
+
+	  /* Compute the hash values for all exported symbols.  At the same
+	     time store the values in an array so that we could use them for
+	     optimizations.  */
+	  amt = dynsymcount * 2 * sizeof (unsigned long int);
+	  cinfo.hashcodes = bfd_malloc (amt);
+	  if (cinfo.hashcodes == NULL)
+	    return FALSE;
+
+	  cinfo.hashval = cinfo.hashcodes + dynsymcount;
+	  cinfo.min_dynindx = -1;
+	  cinfo.output_bfd = output_bfd;
+	  cinfo.bed = bed;
+
+	  /* Put all hash values in HASHCODES.  */
+	  elf_link_hash_traverse (elf_hash_table (info),
+				  elf_collect_gnu_hash_codes, &cinfo);
+
+	  bucketcount
+	    = compute_bucket_count (info, cinfo.hashcodes, cinfo.nsyms, 1);
+
+	  if (bucketcount == 0)
+	    {
+	      free (cinfo.hashcodes);
+	      return FALSE;
+	    }
+
+	  s = bfd_get_section_by_name (dynobj, ".gnu.hash");
+	  BFD_ASSERT (s != NULL);
+
+	  if (cinfo.nsyms == 0)
+	    {
+	      /* Empty .gnu.hash section is special.  */
+	      BFD_ASSERT (cinfo.min_dynindx == -1);
+	      free (cinfo.hashcodes);
+	      s->size = 5 * 4 + bed->s->arch_size / 8;
+	      contents = bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		return FALSE;
+	      s->contents = contents;
+	      /* 1 empty bucket.  */
+	      bfd_put_32 (output_bfd, 1, contents);
+	      /* SYMIDX above the special symbol 0.  */
+	      bfd_put_32 (output_bfd, 1, contents + 4);
+	      /* Just one word for bitmask.  */
+	      bfd_put_32 (output_bfd, 1, contents + 8);
+	      /* Only hash fn bloom filter.  */
+	      bfd_put_32 (output_bfd, 0, contents + 12);
+	      /* No hashes are valid - empty bitmask.  */
+	      bfd_put (bed->s->arch_size, output_bfd, 0, contents + 16);
+	      /* No hashes in the only bucket.  */
+	      bfd_put_32 (output_bfd, 0,
+			  contents + 16 + bed->s->arch_size / 8);
+	    }
+	  else
+	    {
+	      BFD_ASSERT (cinfo.min_dynindx != -1);
+	      unsigned long int maskwords, maskbitslog2;
+
+	      maskbitslog2 = bfd_log2 (cinfo.nsyms) + 1;
+	      if (maskbitslog2 < 3)
+		maskbitslog2 = 5;
+	      else if ((1 << (maskbitslog2 - 2)) & cinfo.nsyms)
+		maskbitslog2 = maskbitslog2 + 3;
+	      else
+		maskbitslog2 = maskbitslog2 + 2;
+	      if (bed->s->arch_size == 64)
+		{
+		  if (maskbitslog2 == 5)
+		    maskbitslog2 = 6;
+		  cinfo.shift1 = 6;
+		}
+	      else
+		cinfo.shift1 = 5;
+	      cinfo.mask = (1 << cinfo.shift1) - 1;
+	      cinfo.shift2 = maskbitslog2 + cinfo.shift1;
+	      cinfo.maskbits = 1 << maskbitslog2;
+	      maskwords = 1 << (maskbitslog2 - cinfo.shift1);
+	      amt = bucketcount * sizeof (unsigned long int) * 2;
+	      amt += maskwords * sizeof (bfd_vma);
+	      cinfo.bitmask = bfd_malloc (amt);
+	      if (cinfo.bitmask == NULL)
+		{
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      cinfo.counts = (void *) (cinfo.bitmask + maskwords);
+	      cinfo.indx = cinfo.counts + bucketcount;
+	      cinfo.symindx = dynsymcount - cinfo.nsyms;
+	      memset (cinfo.bitmask, 0, maskwords * sizeof (bfd_vma));
+
+	      /* Determine how often each hash bucket is used.  */
+	      memset (cinfo.counts, 0, bucketcount * sizeof (cinfo.counts[0]));
+	      for (i = 0; i < cinfo.nsyms; ++i)
+		++cinfo.counts[cinfo.hashcodes[i] % bucketcount];
+
+	      for (i = 0, cnt = cinfo.symindx; i < bucketcount; ++i)
+		if (cinfo.counts[i] != 0)
+		  {
+		    cinfo.indx[i] = cnt;
+		    cnt += cinfo.counts[i];
+		  }
+	      BFD_ASSERT (cnt == dynsymcount);
+	      cinfo.bucketcount = bucketcount;
+	      cinfo.local_indx = cinfo.min_dynindx;
+
+	      s->size = (4 + bucketcount + cinfo.nsyms) * 4;
+	      s->size += cinfo.maskbits / 8;
+	      contents = bfd_zalloc (output_bfd, s->size);
+	      if (contents == NULL)
+		{
+		  free (cinfo.bitmask);
+		  free (cinfo.hashcodes);
+		  return FALSE;
+		}
+
+	      s->contents = contents;
+	      bfd_put_32 (output_bfd, bucketcount, contents);
+	      bfd_put_32 (output_bfd, cinfo.symindx, contents + 4);
+	      bfd_put_32 (output_bfd, maskwords, contents + 8);
+	      bfd_put_32 (output_bfd, cinfo.shift2, contents + 12);
+	      contents += 16 + cinfo.maskbits / 8;
+
+	      for (i = 0; i < bucketcount; ++i)
+		{
+		  if (cinfo.counts[i] == 0)
+		    bfd_put_32 (output_bfd, 0, contents);
+		  else
+		    bfd_put_32 (output_bfd, cinfo.indx[i], contents);
+		  contents += 4;
+		}
+
+	      cinfo.contents = contents;
+
+	      /* Renumber dynamic symbols, populate .gnu.hash section.  */
+	      elf_link_hash_traverse (elf_hash_table (info),
+				      elf_renumber_gnu_hash_syms, &cinfo);
+
+	      contents = s->contents + 16;
+	      for (i = 0; i < maskwords; ++i)
+		{
+		  bfd_put (bed->s->arch_size, output_bfd, cinfo.bitmask[i],
+			   contents);
+		  contents += bed->s->arch_size / 8;
+		}
+
+	      free (cinfo.bitmask);
+	      free (cinfo.hashcodes);
+	    }
+	}
 
       s = bfd_get_section_by_name (dynobj, ".dynstr");
       BFD_ASSERT (s != NULL);
@@ -6647,9 +6973,6 @@ elf_link_output_extsym (struct elf_link_
     {
       size_t bucketcount;
       size_t bucket;
-      size_t hash_entry_size;
-      bfd_byte *bucketpos;
-      bfd_vma chain;
       bfd_byte *esym;
 
       sym.st_name = h->dynstr_index;
@@ -6663,15 +6986,23 @@ elf_link_output_extsym (struct elf_link_
 
       bucketcount = elf_hash_table (finfo->info)->bucketcount;
       bucket = h->u.elf_hash_value % bucketcount;
-      hash_entry_size
-	= elf_section_data (finfo->hash_sec)->this_hdr.sh_entsize;
-      bucketpos = ((bfd_byte *) finfo->hash_sec->contents
-		   + (bucket + 2) * hash_entry_size);
-      chain = bfd_get (8 * hash_entry_size, finfo->output_bfd, bucketpos);
-      bfd_put (8 * hash_entry_size, finfo->output_bfd, h->dynindx, bucketpos);
-      bfd_put (8 * hash_entry_size, finfo->output_bfd, chain,
-	       ((bfd_byte *) finfo->hash_sec->contents
-		+ (bucketcount + 2 + h->dynindx) * hash_entry_size));
+
+      if (finfo->hash_sec != NULL)
+	{
+	  size_t hash_entry_size;
+	  bfd_byte *bucketpos;
+	  bfd_vma chain;
+
+	  hash_entry_size
+	    = elf_section_data (finfo->hash_sec)->this_hdr.sh_entsize;
+	  bucketpos = ((bfd_byte *) finfo->hash_sec->contents
+		       + (bucket + 2) * hash_entry_size);
+	  chain = bfd_get (8 * hash_entry_size, finfo->output_bfd, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, h->dynindx, bucketpos);
+	  bfd_put (8 * hash_entry_size, finfo->output_bfd, chain,
+		   ((bfd_byte *) finfo->hash_sec->contents
+		    + (bucketcount + 2 + h->dynindx) * hash_entry_size));
+	}
 
       if (finfo->symver_sec != NULL && finfo->symver_sec->contents != NULL)
 	{
@@ -7845,7 +8176,7 @@ bfd_elf_final_link (bfd *abfd, struct bf
     {
       finfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
       finfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (finfo.dynsym_sec != NULL && finfo.hash_sec != NULL);
+      BFD_ASSERT (finfo.dynsym_sec != NULL);
       finfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
       /* Note that it is OK if symver_sec is NULL.  */
     }
@@ -8591,6 +8922,9 @@ bfd_elf_final_link (bfd *abfd, struct bf
 	    case DT_HASH:
 	      name = ".hash";
 	      goto get_vma;
+	    case DT_GNU_HASH:
+	      name = ".gnu.hash";
+	      goto get_vma;
 	    case DT_STRTAB:
 	      name = ".dynstr";
 	      goto get_vma;
Index: gdb-6.5/bfd/elfxx-target.h
===================================================================
--- gdb-6.5.orig/bfd/elfxx-target.h	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/bfd/elfxx-target.h	2006-07-14 01:31:26.000000000 -0300
@@ -553,6 +553,10 @@
 #define elf_backend_merge_symbol NULL
 #endif
 
+#ifndef elf_backend_hash_symbol
+#define elf_backend_hash_symbol _bfd_elf_hash_symbol
+#endif
+
 extern const struct elf_size_info _bfd_elfNN_size_info;
 
 #ifndef INCLUDED_TARGET_FILE
@@ -630,6 +634,7 @@ static const struct elf_backend_data elf
   elf_backend_common_section_index,
   elf_backend_common_section,
   elf_backend_merge_symbol,
+  elf_backend_hash_symbol,
   elf_backend_link_order_error_handler,
   elf_backend_relplt_name,
   ELF_MACHINE_ALT1,
Index: gdb-6.5/include/elf/common.h
===================================================================
--- gdb-6.5.orig/include/elf/common.h	2006-07-14 01:30:51.000000000 -0300
+++ gdb-6.5/include/elf/common.h	2006-07-14 01:31:26.000000000 -0300
@@ -338,6 +338,7 @@
 #define SHT_LOOS	0x60000000	/* First of OS specific semantics */
 #define SHT_HIOS	0x6fffffff	/* Last of OS specific semantics */
 
+#define SHT_GNU_HASH	0x6ffffff6	/* GNU style symbol hash table */
 #define SHT_GNU_LIBLIST	0x6ffffff7	/* List of prelink dependencies */
 
 /* The next three section types are defined by Solaris, and are named
@@ -577,6 +578,7 @@
 #define DT_VALRNGHI	0x6ffffdff
 
 #define DT_ADDRRNGLO	0x6ffffe00
+#define DT_GNU_HASH	0x6ffffef5
 #define DT_TLSDESC_PLT	0x6ffffef6
 #define DT_TLSDESC_GOT	0x6ffffef7
 #define DT_GNU_CONFLICT	0x6ffffef8
Index: gdb-6.5/include/bfdlink.h
===================================================================
--- gdb-6.5.orig/include/bfdlink.h	2006-04-06 15:52:45.000000000 -0300
+++ gdb-6.5/include/bfdlink.h	2006-07-14 01:31:26.000000000 -0300
@@ -324,6 +324,12 @@ struct bfd_link_info
   /* TRUE if unreferenced sections should be removed.  */
   unsigned int gc_sections: 1;
 
+  /* TRUE if .hash section should be created.  */
+  unsigned int emit_hash: 1;
+
+  /* TRUE if .gnu.hash section should be created.  */
+  unsigned int emit_gnu_hash: 1;
+
   /* What to do with unresolved symbols in an object file.
      When producing executables the default is GENERATE_ERROR.
      When producing shared libraries the default is IGNORE.  The


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- gdb.spec	12 Jul 2006 07:34:07 -0000	1.192
+++ gdb.spec	14 Jul 2006 05:18:22 -0000	1.193
@@ -11,7 +11,7 @@
 Version: 6.5
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Group: Development/Debuggers
@@ -212,13 +212,17 @@
 # Do not let errors related with debug registers break thread debugging.
 Patch178: gdb-6.3-catch-debug-registers-error-20060527.patch
 
-# Copy with waitpid modifying status even when returning zero, as on
+# Cope with waitpid modifying status even when returning zero, as on
 # ia32el.
 Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch
 
+# Backport GNU .hash support.
+Patch180: gdb-6.5-bfd-hash-style-20060714.patch
+
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext
 BuildRequires: flex bison sharutils
 
+%define multilib_64_archs sparc64 ppc64 s390x x86_64
 %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
@@ -305,6 +309,7 @@
 %patch177 -p1
 %patch178 -p1
 %patch179 -p1
+%patch180 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -465,6 +470,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Thu Jul 13 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-3
+- Add missing definition of multilib_64_archs for glibc-devel buildreqs.
+- Backport support for .gnu.hash sections.
+
 * Wed Jul 12 2006 Alexandre Oliva <aoliva at redhat.com> - 6.5-2
 - BuildReq sharutils, prelink and, on multilib systems, 32-bit glibc-devel.
 - Drop obsolete attach-stop patch.



From fedora-cvs-commits at redhat.com  Fri Jul 14 07:25:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 03:25:53 -0400
Subject: rpms/sysstat/devel sysstat-7.0.0.tar.gz, NONE, 1.1 .cvsignore, 1.13,
	1.14 sources, 1.13, 1.14 sysstat.spec, 1.40, 1.41
Message-ID: <200607140725.k6E7Pr9h008802@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8075

Modified Files:
	.cvsignore sources sysstat.spec 
Added Files:
	sysstat-7.0.0.tar.gz 
Log Message:
%changelog
* Fri Jul 14 2006 Marcela Maslanova <mmaslano at redhat.com> - 7.0.0-1
- new version 7.0.0




--- NEW FILE sysstat-7.0.0.tar.gz ---
?
?[NI??G?7q?)??dT??^??L6?RQ$$??H? -{&????
?)R?r?^???
??8?f???s&?Q4?B????????q\??0?8s#fyN???w??6??sx??	gg??#??;?d???Ck????????ksOpf???"&?a?
 do???????
???????Bv?C
u?T????PV?!??D?Z?????R?[?C?~??P
?;?tO??B??{qz????g=?a???E?????c??????q???'cB6"m
A:<???h?wx?C?T\
]o?os??0?{??N?-rg<?????
??Ma5&?F??g30fh?^#?????????h???4?hr?hJ?
;?@?~??U??.?_9??I8P
P??????Vc??M5??f#????fSJH+?sY??
:_??MY(??}?W????/??b??*?[<$???48a?m?!)&?????n?q??!0???4?V?$6?UMSX?y+]iZ?2?
?LjZ?XC?AEl?H?8+???
Q?{]P?????????xASa?(??G???f?	????I]??s??
????E??=?x??v!????@??O(?
????????????%l???????sd?g?hrq??????C???vC;?
P'0?v????+?V??uc?SkH?.????1??5|???!??C???3?I?U?z??{r|zJ*????n{1?Q?????K3l????c ?q?!???}@??w3??m%	 ?\
r??X?~????v?m?d??n
???P?4??A$??O??#?l??Z????:'??6?????f?+	7S???3c???21w#?D??/~?Xg?????4cL???I+?bT????J'Q?:??M??r-??Q?gk?6????6???Z???7??\n??zq?Yv?)??C?B>?n?(~e_?"
c[??	+?hqz????@??e???v%j_??V)?tPlAFnY"????*??Z)?????{`$?
(?p??
??Ej'????J??P?
??Hi??????B??a<??kzcQ?_i5Z?5+?
???jBP.[?KBMZ??Q~?`)l???????????k??U??!??*}????S??<=???e?V_W2)^??Zm?L??;???3'???[?&?y?C?k?x?
}???,r???i8q?5?</?>?akfCs??????O??p?z???vc??$??PH????M???6?A?WG?M6?F7?A?4?,1?M!?v]"e?*??!E?y?f?????Y/??/"5	?H???=???}?0?n????Y???f??F????\????????7,*E?Kz???[??7???oI?\??N1?Ng??M?Z>??|=;=Nx?z at q?7?2+?#2???KG?????qcm%7????dXmD???(??t?k4?b!??(w???????g??????5D???T??E?<??)?f??K?B???w??ja???c~UQn??7lt????4????-??????
+lC??
PZ?
?~?g-?G???VtVh???u?&??Hhk?H?	???*?,????2??<S???G)??Ui???@`??9?]h??eY?l??M?R????4??
????BQ???m????~??????Y0?r?G?d[????????????In
?]???$d??'/??/??I????L:2?????
X w?-8?%?w?????
Sh{??r-?u]x?tmFD?a?u>Kz}????^'	?uY????M????S?}$?s&w??2???+???n??j??<??j
?J?V?B?>?$?0]$????z??o?b???*??????EW??*???.k??e??K???lx0??.??Z~??5???8?}c?? G??M?^c??T9??b?J!s?J??W:#Q1?Y_?z???35x$s??Ge?PC??Z??}??\Y??`???????k"?y?S?t???x_?}Ba=8
?I?
o?w?j?%???[{????`{??6|????2a?c|?o??%??
????E{n\W?eoB;?X??????|?G^??%???~??l&??????F"Kd-?Ye_P??G?pK0?????_9?????J?h
&?????9??????????g??cb6????9??`v??4??p??}?!W?.??-??????<JJ???W'??r????
m???-?U????,?_7??3????Ul^??a'???F??}?.?Yb???0*M?1?????L?
?????Y??RJ??E>f???A????R?`??????#??n??9#??X?Q{??:??M?;?A-?"??e1??"????V???V?D?~??8h|??<?%?f~?(O?/1U????H,???}0??u@??Z??vv`??jT?2XW?c?????a??????u??G??[?|??!??????g	??WI????J?@?????&SwQ?3
3??????U??V?]?@uOj?;?.???]*S3???????*R??aSj?JZE?`?V??`??BA?S((?iC???????<??,??e?SS|3\i????????K?N9ZOh???????hZ?^?7?0?mO?3J?
?Nj~Y??q94p#7?nY
G???MK!%???F?RX)?,??Vz?UK???????Z'?B???%K??a????	T)??p??.3????i{W?0???x???(ml@ ?v"m???????????)A!U??Jw??{??]??j
kO???
??4??????LH?<?8_???9?z?,??+??v?Z?G"?)?4??c???e|???HGBK???/??@z??Uo????????-t????uy6
Fv??(?
??????l6 ?
?kDoU?????\??k???,c???{????Z?? N?????t?J?%ET.l?h?r&j?????#???k??T??y????fo?,Z0?l<K?"??H?u???????????,?????S????z????s?
~.y?p??5??e??+????z-[????03.3??i??D9?y?????@K??TS?A??q??????4??nj??????????q??c+l(3:??=??#??+???XdM??????L?<??????
#?``?&.??rTzr?J??Z??K?VVx?+?????D??*n??\"\??C??-??-??,??2d|? ??2?-??)??
(cC?5?%?7????????1?8??DG?Ps???????JE$??"K?:_|;??F???????W????????h??"
?1>io
Z???M???$?ys??#k?8????Xm?iG?Ce?+???s??}+??????T?)1?Ll;??2??T[vS9k?n??
EdY?A???BG??z?U?
R?2?b??(?U2{M????????E$0
^?????R?T`??K>RE9??"???????-???Cmixr?l???
P?-?S?z??
-???C?q?Y?<U??rJZ
?~( ??/lJ???+??I%q_??I?d?K???n??#C???#K????DR?KC$Q?D#?w?'??n??r??????????R????L??M???#?d0??2?Qo???R?tM???~??.K??%E?Q??&??#??k?F??K?1e%;k?nPYG????cNB?????LwD?@?j^?e?K?{?:?N?e?;?t????(????l????#az78??N'?N???EJw~???x at n???x2
E???}g?\?zwx??L?(<mo??????
?x?
? ????g?????"?cx?I?d??R?TZ?u?k??S?O1V'??0NT\?*?~]%???L??~O?????fp?u+?l???L[P?z?JI?0%?d3Ee?????_d???oPl?E???:M?I???????r???X8?`?H?)?J??[q?{b????U'?Fl???Q	??<?\??oQ?Bb.e6|,??G?9??U2`2?Ez??)+?I/?????A2?~[??z???G??J??`?L
?????j%?i?}i1?*?Y????x?H?Z??t-??z=v?#O	??d
?B)~~(F???n{g??:???Y?O?[!L?Xh???jvQ??#Jp?(??????2N??m?8l??ubw???q`,??}J?!??RN???????????w{?HplG??t?]???g?$a?Q?Z?????K??q?	??m???l?1????,?~?m{?1?N?.??@?m&2?u/?K#A	?\????O(:??G?4?"?X_wM?????We0?kwVr???~pno:???[?|}G????$??????.v?W?????8Q
l????
}
?5?Ch/?Mt?????b?KTA?Fv?bF?fFxi~f?:???V???V????wM#?8?
L%Z????Fk??8m?S?8BJM??g)???Y\cCX????<??,?(??'?`[??[_?x?^E&????O???b\D?wA?J ???qt?h???.M,??YZ??V?D~???????v??G?v?????>???L<????| ?dN??????Wk{?????HtzJ?g
X?.?q??K??v??z,&
@?l???3_t???Y?!?"?????y??c????
?E?jJu(???G?g?
?^???m???C?gp?5)???h??`?|AC?????\lF?d
?P?-pR"???<???,???-&^?x?Y7??!,??SK??;[?
?)???S?7w)??e^???0??p5G}S?s????]???H??ee1J??X?ygvC???
4??????
_?
??;P????=??+y?~?&?x?????F}?6????na05)?U??9?&?3?~|??`??bV
?'???	Q??????????t??wH?i?[??L???s?
8?(???7???u???	??V,?w????-Aj???"`)?????<??K???O??e???????x
?L?95yT?u.????E???
?jK'????????LJ?L?-.?f?N-??#?"^??&E????f??????d?@x(??S?????????V?G?j?L??Z?R9[+?Kz???hW?
???!Y??j??????Pf????&?_?????^???i*?)????????
??k?6x`j at f?oMW?????l??0???$????D?&@????5????G3???\???w
??NfN?I?S???<O?U?x?i??J??l:?}??z?Y~????A??.[\Bk?r??l??4??6???
g??1L??????s?19
?)?f?]???7?<?W??w
K??????0?a???j
K?????`??????M?????{????:??&??n??H??V,kY?nT?z???C4???+?No64+o	uD???3R
Y?????
j????; ???{????q????s???8?N8?1r&,j???????w???A????^????Y???Ov:o???kyG??????^??;:=>4_?
?156 h???S`L??????
?? ad=?? ?g???9?T4???68??w?;7l??Y?????S???????Fu??=???$?Y?A?9L1??F?????d??Koz??W%f@????B??+?A,?+?????U???Y??y??W?y??j}j?v??#~??????'?-??a{?!?????????X[??????????q???????=??????~?C?u??2?w?Wnp4?????????WeK?rGk?????DWe??H??f}G?C?A?x????|b?p??:?x???]
0?
???H\^N6V???????w?ur?c$]?a?F??1uh?AN])???XJ?k>$????*?B?T{?H?/??+??6??e70? ?5&%??p?z?ey?h????j+??????? y ?$??m???]mMK|/???cN??? ????????????]?EuW????E???V
????C7?????%(Cu?}\m????h#C ?V?S???'w????0d?'??J?D??>?4?h?<?;|~?
9??i??vw????!???b???~?D?6?}t??9!9? 9????M?V?k??q?????B?/?3)
/p??JX,??yJ??n?]B???Wsl??9:??Sv?????n)?4?P2??c?f%f:?;??]
iq??
j$i"?%g%)
?;?d??B??gm6&??2LE???Ff?
?C??'?d?^????>?1?82?r??????,??+j!???TL8\???a:1S^?n?{?W?8???BC?vF?E???n???????w8???SV??
????@F*???6^?????????2???r&e?I6?)G??+?{{*1
????)?/su???z?I?,?i????Vu.????/??OWSLfK?i8? k?:?]???HX???r?Y??[????8B?e??)???6??" +N
?y?~??A??`
??g????&?n|?Fv????E?!???|Z?????????
??
o`???T
?!8?DF??q+?r0?
!
???
???Pr?zj?n^??V???KM?9/?b??<????~?"?}e??[??
?A?1??k??204??u??rQ(T???Y?E}?c????(&?2?`?cE-???? ?+$?4??r,?m??Wh?????}M????}?>??)?????z????x^|<??G?0?C?@?D?Qp?<h*:??c>X)1??/';?;?e-??\	?p?#???j??T9:[??3Jl$1 jM?OS? ????Mz?xG17???$?????
?7?3????x$?? J??66?x1??,?,jb??fc19Cr??r????D*m??3:?c???Rc?S????'\??qQ#GyJ??zV??i6?????????t%Zk?c?<?????>t???????e??	
??KO}y?.?,,??^/,??-?????K*?7?*??s??????$b.??~e??_?d??n??W7Y???Yy\?'s?????Nb????)A?
???\?eW}?_v?o?a??K?CE??\.??:+,P??_m??^N1?????N?)%:|D~!$??ll?y?rm ??b??Vt??c?????b?*??p?8?*6
?A?l
,???
?W???cw???p????????"??E?R????j?C??1)?u pK????"[?j~8?V??(??'i??13??\????c???,K?e????2?4??E
?nSF????*????O?`???%??b&?????

&U?k???4?E????
V?tJ]?vC?+??L5o2
A+???:??i4?2????7?bS,??]j??X2
???M??6,?u?E?K???1????_?P??V?!???C????NlC?x?{???
.>???cx???e?@x????????e 75??^????KB'?K??%pm??}?w????l?p?<?????l?????P?5"&)?>???c??zb???`^??cXYj3D??o?"u[/?\SWu?
@??X???????-?????T?4??Ld"53
??	6R?
&????W?I??"R^b??????=??' ?-kfx?2?0#u-??<?,???%?rP???m?\t?dUR?&?????vh????
Z???n?0?.?`w-T<???8
?Z??I??(???????
ip9Q??\D???
?t-5????O??3???\?('?e?y_?c_?????????@?=m?J?^y?%??=???w?^?????]?&??G{??{?U?zS?9?3??F+7?D?K\c[??yP?pbM4??s-*e<?"{?E(I??
????m?K??c/kF?!????Y???5?????%B3>?3FZ??C?P???4!c!?XQ??w???)?$??1?Ai?BNK????g?7S5a?=???+q??'
??6k?0Dn\??????F?8??FO^??p???y???q??????????q8????QD??3????+~{Eo??m<c:
:?~?<E??4?[??3??x????W?\?
X????0w????s??Z?,???
@5????=??????14Bb6??<?R	?q?[???Zdy?>??l???????=??Ul?_?I{?A??$?F???U?Y?W??{?x/??
????W???7??%??qE?????2?x
$???????u????x??}8?Mc+?V
[??L;?????SGr[???8?}??7??z???Z?fQ????m?y???z_qN|????????c??T?.[ol|_(P]???;\?????2?E?Ml?G??gIf?? ???Z?>?>????%{?!H@??T???LL
?o?$?-???{R???W??M?)^?qO??i)?{????????????????/
??7?K???]?/?{k_?Q8???i?f????U?????:??????,^[ac???0FJN?0
??????-????n???Z??V?X??	y~O??zc%qs3:*7Q???n??(I?3?E?S?s?(??@BD o-??????????t?t{?M?PV8??IW???~?r7P?>i?TIA'??$??:???~????e)oi????35bZt???2??|?{q0
(,U??Q?AI at 8?|A?^?I??`??aX?#?#$????? ?z)?-?y??JU`9'?L??J+I4
x???GR\?wb????
?????5z???y?o?????N???xg???=?/????_??5?????s?-}q?q???????p??G???{?
?I?b??,?(	@?Z?V??CY???tBUYP?YRX???P?
??+L?????)`bV????n??s+?[?E?({??^z/^z?O??n?
?@^???|?|7?@D???e'?x?[???Q?=??<MEG{??f???O???R?
O??;p???s???jY?S?R??h`?TP?T?yJ6?-?b|*L,FI?Ln6w??p??7???????v? R?Q?5?a~47i.?
02i?X????????B?9M*W???P?S???gs????i?? )"??A??6???x?0Z??p,	p?n?????d?????????_????p??O)w????g?;}????[?B?
?i?i?Dy?5}Y?(?? }/?T?(nX?+^??~??!E??z?????}???>&?E?
?r)q?????-"?
?e??PY?4?H???j`P^???k?Sx
\??;?x??
??Ac?&4??~=l?b????BAm?????w??1??ZP.??B??????????6?<??8???V??Z9?R?
???@?@???H$??>??;?	=e?l?0?i???$??Pt?
8?K>???)?
?@L????o?+?=?L\N???ig??#*
?,?+
im?K??? ?Nv?u?=??C??Q|?d/??l?^?????T???m?a1??????x??????-????wbx<???2!?R????%?Z???S?b??wc?G???&?
U?&?7??GJa?b??K?W?3?Y????01]?m_?Rs@?E?????????o?~d?dJ.?.;x???/G4??:?Gl??H*?0
&???v,:W?????u???
???r^?|????"L?Y??2??M??h???y?J?{?X??)?Bw?+?0#/e???Vr?].=?????Sa?^a?0tz{??????-?L??f?;A;K???-??E7??^?[??9n?-??
}n0}%?'N????B=?IH????M??Z8c????i????(??.??VSc????????RI?#?a??/
????"????&#??????[?S??????????F?+ak?>??
s?
????A?x?????^???w@<'p?{??|?b??lB?+u?xH????8	;`??H1??w?????O??i6?t??Xm???5????Q???}??H$??>\??K9i
?n?=?J}?z????P?Vb??n*?????a5:c?F???n?m?t?@?c?cE?(oVa1?a`????c??r??Eg'?#F/ph?????!5?f?\??N}#|F?Qd?$-??t2??V"R+????G*3???OXP?
Gce??y?)(>g-?",[???(?Yn>??R8???@$?@??.?r??)?r?????????A	)0?K=?k?9N?{???????E>???_???o?N?rm???A????????\3W??h????09?????%C??#{ek?yK3*U??w?Q?	??j?QM?6L?????4>?]w>5?8O?? c?>o??=?\YY???? N??gi=?????[!?+??B
????j?
??KYb9?Mg??|?
?~$?,W??L)????hL?i7V0?'?wl??D????5??d?V????N??&Z???B
????b??%K3Q@?8??
@??CZe<??8??clq???^??l??}??n????c?c????d?L1"??1?W????w???}?~<??????ZK??`Z$,???ke"
?Y???????g?F?????^????h???????'??F?I?i??M???d?????g??4???5??x???
???q8??'?h8$K.,W??x?~???;?????O?a0??n????jg??^??W????GQ}??o??^D?gB??`???{??(?1*u
}???????Y??p?????fd?B?,A<??.oN
?b ??w4;?=?K{?8!??	?I.?~???
??zwd$?.j??x?!?>(?n]?#?R??2??>????????=t???????Qc_?_??u?.?I?F?~H??Q(9??2?
s?????{????['??k	6	?Fl??c?P\<o?x?n?i??O?????n??`???v???G????^??;:=>:???
z?E{?P1?1??aR??5???@\?i(?e???????2 at L?5jLr?-}????U??*bpW?"?????????$?GCM?:3l???F?{$
?oy??f?Yk>n<?N;??i~ae?;I??
??#??~????U???Z???a_qU?????]?Q?\}^RzK?UJS?g??"L???4?????????E86????2(?I???/?[I??2??[l?@???????f?S??*H?h
??,USJ?G????c??VX?.?L?e8????f?	?=8?????I??Q?H?8???P?????J?sGZv?????dB??n?	?3W?[???L<*.?v???uv?v?	jp??%?yr
?>_1?;I????S?z??Qy?
~?P??? ??|?O@'?y????2+?zh?????^?Ouj????~??b????M(????tu?/f??X?;?u??&D????
[????$???_)
???T??
??Vn??f1??Nv??O?dy2
.??:?????R?
??????v]U???
?w&?4b<?3??^???`???%?_m2Xk?X?Gz???S????aG????#?b?(?0??v?xYD??n?j???3??=P[5???*vXK??lQKn??9?FRsQ/EZ????D?????	?k?????X?K??b?Dq>({*?]K?E?%-O?g??d?g*~??B??4????G)	??????m
Yc?Px0??????H??#B1?Y???r:?????Zj9?[^JiL-??BT?STS??NQ?=????LUT????.u??????5???Q6?*!?*? F?d??V??'?8??V??HK????U?F?;`9By?@?|8??lw)=??G?ix???u????n??D??o?????U/?^F7#??(A??t?????????O?????????N%=??6??R6????pFCU???|

F?O?????%???????b?I?DSg?????to?r7?q8;??????*??????y?B?h???ax???a at r?g?X???~?`E?v??
???w
??6???)?x?	Jkx??iQ?G?r???4?/&????6?;?x????7(1n??3??T~?X??L??????=???m???C#???\??TcX?|???k?????Wu$
eK??F
v?%??K???f?????0??????'l5??H?"j?+S???8?l$?????: ?[$??P)???U????}??1]ana?t??&og??_?cO???Z?\??????J4???)??U??a
??xP??r?x?-?O?q?i?4?{nwR??7???n?b???H#t[H??P$:s_?s?t?|?\)#?"3???.	p??X?J6???A??U???-&# ?!???
??????????F?
????"?
???k??/?^O?9??*C 
??q
?E???WI\Q"[c?_?~0?$5?:G???JDk?a??X?h?????^????4??il|Z?.????u??J.????4?*??,??????E@??lkR^??8?
T
?!u7?9?|!?B??(???F>???????sH
?61`?2o4?V??]JV????t???NME ?*.C'X?/?[?K]??2m6?~???p?.'9'?r:??FN??\??? 'Y?4-G*C??A?c?x??+x?????&?5&?E&??%? ??^e????F+R.+?4???-?{T???J?0?IB<?5?u???.K ,q??}Q?_{??ye??????0????o?X????F?x?E?ae3W?UE.s,???N??? ?????~?)#?/?????,B[???yt?	V??s?S??;I??`z1C?X??|L???Qlv-??0?w|h????*}?<?u^?[???O???p?Rt?????e????y?h8??8??Sv?b?>??6???m:?\j??A~?_???,??h?F=?pO??r?f???fi???kY]???1.Wa?h?g?`???kXXf???@??}??]?Au??z??i0??[sW?Hw>?j?~??g7?{????r??0??M???C?ap7&E?$P?]`*????Z?G]?o?h*?????	???4x??:?i?x?????1h?j?i???????????<???hI?">;N?$?P3Z???E????9??I<?yF??L???n|?y?R?T?Y???3Z????S#???!L??????r|
?n?????
?{?D2g??X1?q2????%F???IKH?G~?e&???@<??
i?(?K@p8?'?`???=?L??W?<FS??l<w????Gz???b?83&R??8n????1???G2??{??R?u?{?#?$?8??B??Q>MGjg?????H{?w:???kg???????ut?s?MW????????B?o??|+??@JO??O????W(U??????????XUu?f???%s4?.?fS??R?
o?;+?HR?$?
'?????4?????v*sf?4??9?q+?lm???6?7?*{??:S6ams??=??QGX?k???}??"?h?h
?^$?[?_?~x?	?
9c?L?????b?[K3k?gY?f???p	#W?&v??CV??o???ZQ??r?VlT}?
??4?? =8??2!4f???=??]|A?N>3?.??Ux?s?????<??|???L???!'W?d???;??hO???nr5?.?]r?@)?2\%E??"B??\?\?I?N&??????cD?C2??
? BMq??Y5??
>i??\????????N?(?'???}"k??f????A???X'????Y'X??=Z(+nnh?r?uz?Y(z?5?r5s??????<??\?h??Y???&?-u??T],???^0?Y????R,{]$?
>R?Q??rGX??? ?g???J(??8%??6&W??Fr?&3????KC?s???=?E"????????W??e!+??YtLiL??5???????w?	0
??g????
?M?C??
??????????K?Gm???J??1?????F?T???S????U?x??C?m????TMd??????[???????~`^?M????I?/?iE??7??&<?F)??U??*??W????j??w_??????????????????y?p?Y?c}????tX?n.*-p??????WN???v????V??*??Gy??yZ'"?j??=B??D?v??+Z??RDd??c?.???w?BE
{?R??x???:VZs?U?????-j+?1????q?}???????????v??>wy*????v???J??Uf)??-??11??(?>f???9
J??h(??e?P????=????Q1 o9???x???E???<?3??Z8?g????K.N????
5??GD????4?EJ?????L,?i8?V?H6?`T
?X?K
??"?N?
?o?{>?HV?,???KV?s?_
???gct{???@???YD??????f?
%?>?z??????)p??5??6 ???H9???@l?*?e???F?????)P
=+?????Y?|u?
?TKe????????^lr>?g?y????W&???j???(C?????????[5?B??3DR-,;?B????????Wwo?*??K????v)???H??7,??s???????d"Zy$??dp???k?<s??H%?K??v??)????@?Y"?j???????m^??NL???*?|E.?B?SsN?J??&???RSu??Rj:??C???????K/???e???w???Y?y???????G|?9"?? ?5$??????V\?kae?VXyFqy?y??TX????|ZTw??>???|+??M-,?Q
??????c?W???B?;??r?-???????`l???&0?to&?0	u?{????|<U????x(?_.aOV8???S?*L?c???? 7#b}Q?3??a???^;???8???"t?-;B???>>(?n??f?????C?
X
R??%????W??D??I?(?;?????c??!<?	A???L?
3sV??k?-??r3???q?[6?X&?n?e??iL?!?X-???C?|??f<???9pB?Q
????V?%?Ug?????s
?|N(&R????????G?y
???#?c?????wG??]O??R??b=O???%?
??x????p-n?D??a
???
{??=???.X???u?.Z???u?.?.?h8???N???(??C??N?I??,'O6?.R??Or?????C?W?\P??"}?)?En.???-??26??????,!/m9)??<	????\?????x??+@;??????~?&?Ot??}?=?sCY?O?_????ooZ????e??'<Tv,8;?.????&?l.
qwK??lmr|'?~{??.??]N{??{<?v{????q?_?????N???=????=???n?????f?w???!\l?N????9x??	?$w}???b???N???V?`?s?C?%q??bX#??????`???p?P?7??=???QX??????me?bY?????????
r?h??;3?????x????`????P?????|=???By??.B$???O?P?lX?????Y? ?r>@?'?]?`???}' ?p????bt@????.??E???????_!? w?
t'?B"?????`u$D??MF?9?S?>?W????b???yzCO9???T??/,??O?????????R,??w?????qBV?+?%?2??s????0e	??s??????x???=??~????Z??f???
??+??Q????????
;?C?C?K?=?????=jF?????(\???Xv?l<7???v?;ub?k??????s\??#|???Y8??kGx??#??lI??O??^?nN??????fT!s????NB)??????C}?V???_?9Ai??
K????s??,?U~?fnd^?	;Pd\r??9?lK???`+>#7????e@&h???v?n??^??/}sZ???????????9U??????4?a??aru
?????|5????-K???r??_?7??? ??#??&??)??,??/oze???????w?m???h??{?~?[?=:??at?~?
?f???N?SND]?a.??????-f$?^?
J??x??c?i?w?=?Z!
 ??}?wn8;N????O?a?a0u
?3??????u??c?yZD?1??B???6$??@?OZE??^????%?nU???[?J?l???3Y??%?]6?K`?WJV??c'swb?}?|7???&?v?S4b??a??G?)NC_?:x/?O?>9V???0??K??iG?w?????n??E???p'/u >???d?3?;?%U?r\u???K??@)??|?#??

X?)??rp????`??8?:y??????|b????>%?????y?d"!?Jb?m
??2??o+?7??j?V??i ?b7??M???@_K??????8*?[F????
??hrM9?z?`??:???l??
?????J??????{??	wa+)?????X0????3??%??d?@?v|,+p??????E?U!??F]|?S???A?0??)??W?e5'd??)?s?????9h??9??uw???Xp?>?_?'J[???v?$? ~?<??A~?\;}?C??}??D???4???^S#????
??-?U??q??Pk?7C??V??~??o ???!X?dS????????
&???	?e?v.??^?{t|??=????z???????`?%?{?K?gz???:????????????{*????	=?x?z????ge?I??~?s???Bn????hv?X?<z??????????\?
?>T??Z{??3?????I??D,?L??N??T???v??$??&i?jb/????5?7A?????1{??d?????0Ug?$?Q$?P'?:?K6?i?R??~?e????-f4:jof3b????eb t???s?2??:8??CF????Bn??????????N????????????b8??~?d???S-???ZE???('?
???:????????%"?Z,?)?/?r???1?
??Bee??*83w0??????d???@0K??P????.[?a???#J*?H??A????*????????????+??v?J'???/*+?VY??,1???M????FK?g
q???o?{????????????|
??tc??>{????h<y?|???fc??F???g???i4o4???_c
??
??}?g?j?w?LC???????B?!bF52I7DD?p?)oU????P[??D?????4t?6??p??L??????~???????^?QE
?]?;5????8????~?????$|?^??R8?_??m?r??b??Tbt?H^D?????Q??;?V?????=??C??B??GC??M?
?'[^Z?W^?????n??.?q??+???N
??n|#??Qi)Q1S{??CA4?H????? +??R?7????=?????<?w?z??o???/qX???+?????cp}E?PV???
????????z???*?'?n?^n;=?U???%???t_jb
?3@?!?????A??|zQ??????J?h?XwJ`????????r	o?]?LB????]??Ep????q???Z??I{?/^???!+r];S??rqg?hW?????r??_r?b?CM?}??H?!uO?[?jRW??Mt??n}m????????????M?EY?tf?u+?+?????;?`??^8?w????????o?o???3????????????&?g{Ec?K?a/3??ytj?????{?=c???????e????
??lg7G?????Ru:?Q?u}?"???43U?????!*??c?W>d??*??????5?h:_?????u?????????}??6RU???'4?]?m_Y?@V?????#?x?<?y+?GUq?@??&??T
???6!\?*?I?bJ:??U????V
???*,???rV??TY+??=	~???N???o??[t???? ???*?m?d?U??*???ES1I3?S-??????sV?%??[@E????dnI??b??0???s
?-?BR@??R?W??3?)?	?wv?Y5???????:?u??s?G???x???K???8?O??????????&V9?>???z=???Q4???IB????h???SmT-??%w^?=V???Q9W??kMl?????sw?c?E,??X??????R?y??'?????L???z?Vjm?????^?????+r?-???:~??A????z.???????zEW?????????n#?h??;?X?7??'V?????>????4??9?v??tv?b???	J??1??V[0???????"?
@3?Z?h8???KE??^??3??Y????r?????
?xu?o????????F?,TBj?j0????7?mly?O`??+??X?????:@Q5?h???*?H?T)?D]???&`4?0??h???q?57?"??\?>??bTU5d??H???A?????2PU8?;?.?h^O??
Q??q???&??x?e?$? ??@]????z8F???eQ??\?X!=\U???N?d}??G?fy?8)?@2^?N/?	?????I_W?S?t)zT"?Y?????>?k?G?)??@??????????k??=5???7?Y.?+'!??&m/_?F????)???????(?
??E+?Z
???????J4zG?:
!???%???y7?{?????Lw?\?f??R?%z?????e?0????P&????$?c????Y?;w?:?cm?c???~?s???< ?r?%k%t?$|T\?m??????%????zl.??MO?
?~B?q???fBV??6???vs!??OpY``??$[?&~?j?J??_f??/?? ?{?I0?
q???????l?<,??E???,?9$8??@_"???
?H2?Oz???Rj???C??,?]H?Z	?SWN%????p?y?@??E
?rg???z|??V_ku2?z?y?z?5?,Cc?A??G?3?H?j???u#????W>??1\H??
*???V5G?o?W?e?]?_?'??`??kmi???yu?????????NPy?j&?????????7???patF????qwv?????q?&5?????*7?????pr*??
AS?+??????7??J???????e?'????
EO/Pf????N
r?z?2?u9>??+???7??S????Ep????????p???x?v9-???r??????u??"'??M?[`?????/?E?=[???T????f???????@?0_??`?h?9???)??H???4?G(?@k/UPG?????P?S
??*?&I?X,????m?????F&?&b<????????y.]?#82
XrEG?AY?#vt??AXp??0?H1)??t??g	
T+,s??6X??ym|??E????[6????um at aA?????\Xq??RQ??b??H????$????$???D?n?}s?????8U?`?@?=?H(??
?U?
??qK??C?r?6,???	?J?|???LDF7?????8??'7????p?JjnR?6????:?n?t?j???4;?4?I8??>?0??}??i>???)??E???N???-??O+7??n?w?
>???V:?/oX?z???????-?z?{-??f??????q??	???D?f?3?YG?5??8k??Fv????	&??m$??SY??]???????]??U_g??<Wg????9)??&}??&-??:?}e7???z??R??omNF?e???6????m????,??????,A0????Q??h?<l???}???j??2??k?2???d?H?K?%s?????????(?0??~??sh?E?oR??4R???C7??oN<@?7?a?Xi????`m?&??y?
?de????|W?[??%?m???D???R????E?Ah???*???
mJsnU??,???g?i?4??%?g?<#???????s8?BU?<n??y??z?9u
U?s?v?:?????n????@Yps(????L>???J?Ho?^???z??)?[U??zQ@?????????Ti'7????n?'????M????y??ld??)?k?(?*????r??O?????
??!??c2??=kNz=?9-?	!?>Z
,??j??	????dZ??"4???J??']&5?????sF???!z?N?G???&????????LNS?#h??|]%UL?N?@:?
???xei?kU????p??K?s?G?/?2???????-w??<?vRB+????'?????R??????_??H?f??~??h1??????i+}???/9<sF??N?Y)??????9=do??%?|?9m??m?????;??a5????f|k ????j???Ha|???????????O?]????o<YoR???gO????r???g?????5?}??='+?Y8????Y?2$??R??????????9????O??????q?}x
_?????M??}???K??[?6??0?_?0???^'S?g????????Z?`J
???0EQ?K[?{?????~???WZ???&q4???4?j?px??u?6G5(@?Lj??Z??-
`??Qr>??[???????R???@?????x??[?????w???Q???v.?E?*%Jb(?
x??>?!O=k??i?Fu??~???*?[?VE??????\?&???7?R?
;?f?K	~?????9~d?#8?/?W0Q\?~????N??Gpa{????P?M????????BK???>???z??????)n?
????T=?????vK%_lL?z????eRm???c???!+??#??M??Fz??={?Dvy?Z?????P??<a;??o?G????(sV???????f?x??????L???,?qC??w????1?$O.?s?1??????_????	??:?sQ?????T??q?G??6??
?????!?]?VV????1sV???`?2?NG?7?????????*.???? h?`vB?[wC?f?~???]O?.???U??K??e?????"?y??x????z????t???????K>??n?,???Nk{?[??n???=Y????0??r?(F?f???????;?NVmQ?~p??Ar????&???MJ???????F??7)=????fG7*=?I???-?J??Z???R!e?O^cB?-
?K4&d?@?DcB.
?K4&?? ?DcB?.q?hL??%?2???46?acBR/q??il?Ln?
B?/q8?il6???
c?b???jL??!?t?
???????	y?6q?????G?3??}x????II?H?6?DdT?u&r??_8?E????Auq_??4??+5?$?&s%:J(_#?6M??M?)[?`??jp????????W/??_hO?=xt?????~???{??:??*?N??E???|????O;?q?z?uZ??l{?o???x????e??B??W>? ????J?R?#?????<x?dIK?~~??fS??phJs?nM??r??[?V??Z???
e1p.?????K??)
?????,??7???14?+??\???b???~
"??<?a??E	txAd??!???v?N?:C?wy????^????s???k??8E
????Z {??.\;ji??|tj??S5???s?/U?W??ASZ???S??'??^?-???@????
)O????B????:>h????S?TD4L??#?Wi???{8???6F??Dh??j??
?&b/?z?6>?7???
's8???????,???T?
??d?_'?j??v<??iVF?p,????
b??>?]????7y??6??c?c]?????u?S?I$?F?XDoh6??????c?o??v?O????7cq???#"?dG?K?????dY%q	?W?^???gEpX?n}?????H?_?	?
??z?H??kK???}??)j2o	?^{?????6?#JoX?????@??W??!qj?????CwRE?UDq???(8??'D?? J???
x??d?H?r?]??%???i??Y???/???)??AA???<j??D??4?!&??[ ????&H???=?F#??y?W?@pHuu\T!???X??? ??%???????B
1n????H??E????"N???]{????DW??????}???MX?o?[d??`@?Ke?@#???(???	>(?P ????'FXp?6????1????2?E7?Ma{a0?'`X??c??+?b???%M?6R????K?????EWt_????'E?Z$*F?N?????/p??(?$X??$?
????P?&?Q5?h9	???[N??8P??
??
?`aC??B??D?X;????f?}&?Q??sI?
?????4???-???
??vN???2???x`?~???g?@'!??v??????zBw?6?L'?X?NE??95~!??k???t?*??(?*#??
?v??D?HC??Dhp???k??B??B???^?j6^?????E? ??]??dN??)5n??????v?Xe??u>??~???t???`J??? .?=???&??9?>?*?"Z?-r???tQ?38?D?K#~O02\?????
?
???gt?!??`??q?dh?????0 ???^?.0?e?Cr^????y?s????I\?%??b:v$??Ll?e????`D?=?<??z?=8?Pg??x,???\???1c???????????&cm!??)??????|L???&?wPHH)??d?"??????*?$(?F}?TI*?????j??????n?k ????N?6?}E?????^??j??LM
g?W@!??K?F?xgD??"??U??,76
=??q???<|?r?E=?Z,???~b??4?Gp!????d?]?kx????:P?B\	QO??[?%?????+C??hX?a???tr?? ??R??6???????-?????P?????7K,
k?????KQoT2-?t?O???.?w2N???
??? @?%?W:`?ST:?Quw;???aBP=?Ma??:???$?du?P,??O?XKlZYhD4(???.?????????8??`?
???9????a?
?0??^??????$?m`??H[&????@??@1?Os????M?????{?$??{?;??4?
+6BCDg??C?M?U6Y?y?^K?????3~??C?E??7U?{?????JS?P???!-5?)??(FZ???H?3d??+a???0FJ2??v?L???WD??
?(??B'?=?B??6?c?IU??,????r0[8f?F.?
>????????K??-?P?`???<?C?p??Y???
?>?*??3?#??bT?O???X???L'd'W??u#G???p??~???^???Z??
~???H[?2
@???F???M??p????h&(???
?0??_????Bl?]? M#???=?c_T?J;???????Y??
;?7??7?????k??_?-?#??uI??%a4?
S???^_????^??gQ?X??????M~9??????B??W??U???*)???????????Z?\U?P0?L??[?j?y?B{6"I???2{BU#??F+?}???[*89gJ?E#h:f?hRTu??r&
???2??1?????
??
???4?zp??????????
H<??????v<p?f??1Pt??????O?????c
%???

?^
??=??Yl?u5?u	[?=??t $?1??????????)????&?gI5?[T??"|dl?2??????hf?a!?=?c*WB\?
???????k@?@Q??
?F?c'??sR*?????m
_???2?'??r????S
:X$rq???0??????BO?F?51????@???-?`S
?
iT1??Im??`???+b????V??Q!???x.?m|?4~p|F??zv????r?I)????+W
!o3??????ug?{m?LS_J?
=:?lA???*o???v?	sT-sZ?3???$?<??C7C9???????O??G?6Z????Pt?r?I?+LE?0?3?&??R?????w??M??:?.k??>??-?z??? F??????+2Q~??%/?????@sz-O??xr?7??'?a?^6??I???f?Y??k,
???;7?+? \H???(p?
??<9??k??????
u?&3???79@??k?H??q?????s?=P??*??
tu;? W??)J{U5\??%??j"???u?U?m?y?$j	??&?+'s$?)#9?-???,`1-?
~?M?h??M8
???0?)>???R?b?W??I?????gO"*???
3?z1??+?PQ5?Ld?
8???X:???@D???z???\?	?$8?$dChy????t???/??S(R??Ou?sD?????????P:um?T?7P?d.?_??^TT!:bT?7????G???*'Tb?8T=K9??5)/??o?`?&?t?C;????~???6?!?$ ?m?r8??vM?	?C??>ja%?x?F?N
H2?????T?~??????|[i'????G?U[?h??%?? ?gk?M?=??Df??DV??2??UYF?k?o?,l~0&???????

?_??^?}}??&?c!????q|?t?7E?bSb???^f/???vG[?G#1??+?W??%5
???u????hY2o?k????9i??? ?C??h?gx?>????P?hMyA~:?RpT??????+j4?L???w1;w?q?n ???	??????????????U?^??9???M^u??E|f?R?k??+??,<O9o#"???b?(??k95+??IEC?A???8?Bk?K?\????
?q?P????8$???????N???????2?$???*!v??xD??'?

??QB???Mg?"?d?ZZ?_^W???j?Jl?a???Kq??/????yj\2??5<?	????
0?s?/??Ki(?%???Q?bFf?Q?G?`?5?????9JE?%'&B:?
??????3?06(??m??c?u??e??n???????????????>??????h%
?H3?A?<?u[wnA??hq?H???J???-????Y????6?????T?
"GS?-??W,?-?F????lr?fw?%z
q??{?R!Km]?e~????.n???WV	?)?q?,?)?zo?/S??3?m???9?WSo!???U??"?L?^??f8?#$<%?\???#??4Z^??%_H??mm???A|7_??h?A~?
?VH??	?fA0?4-?:qG0;??o?7?Rc]????w???????d?}Vj??G-gFHl
??W???|B?%?B?
j??b??s?????0g????"???y??z?\?@??8?? G@??jn?"U ??
??????????Y<!??????A??:6?????? ???K?q??H?{[????G;?	??U??B?}?N???&?W???????&?
??K_d?"??=bC????d??????[?nKH at B???B??q??)?F???8??]S?A??
?F???%?"*4??f?D?I??]?k?Z?x???59r?Dg?`?`
Y*?7?????l?iB>07B?|Y???d+?Ba?R?0? ??X5jhKb????????/????4?W?1?M?
?:??Vpu?<6?????E?`H
?????D??7??,??n?t???
M??+?f??7??n?u????H?nm??
S????V?}???CR?q????????kz1?bs?8??x?????$ES?b?	???y?? D?s?\6?#3???

&O???$$f+xf?????ZK?????v[??l\?`??f?????j???????L	'_?e?A??Y??????x???x?;?e?(????X?v?N??]+S??I]w?7W???9_"??&=??
?{??D??u??%???T??#SQQp??l?????2|0?T'???U?T&????VO<O=??????v??y??=??pj??JC?|EeQz?'l.??z>?H??>c???????ob`???
j????}??
7h#??????????KW=:?0?g????-
k>'?S?H4?@	??/?|???i????,?Z#c????hgL)?\????0??|?c~?"?o>????[E?B*
?	?
??zN??hC5??
?w!??????????`E????%?1
?`I?M?DB?`??y?~????p?3????vANJg???E(?????T?R???R???Z{Uo{g??J???-2 at qd?o??M????f?d??b7???Q?)4;+F?Ef at v????`??F??pT<????????E%'?`?l?h???u???H??7?_BajP?-7??l???^?G?=???8?m????
!eGf`?V!?t?R?k?!??B?x?g????z?V?8?????D?rZ)_??xM;????d???S??X???9Y?!?h???????????E??u?????????%[?a?M??w?x
??D??]?X)???x???E?l?5???0????(9}b?r?O	?1?P?
?D7JA?F?-????%?q6*b?Lu?#V&?	A???X?NQ?M???l?F???E?8(E???A
?Q??{d^,?????[??3"*?C???MZ?[;X?6?????????"<?????j??c
?y?0#?Y?K?a????3x??cX?G?b??????*r?????f??>??????`???0+c?J??7?????c+?$?????????RDD???<??I?u,z??3?m?S?p??#H??4?????????1)V??ZV?r??dF????$????MR?:?KHS?7?.M4{%Sg???K?D???>J?D???l??6f1I?|L???!bs???m6q?????
V?$c?Uo??[??v????????h?)??]??Bl??f?A?/FrMt?7?$?Q?Z??????`?<;?3N???[.??#??yr?#??z?)%r/??d????)aQ?N?? ???"??[??? M]
??4?"?$-?????????2
Xd?7???Sp?W???S????J?[??1?9pJ,/F1"???Q??5?De+6????-?#??}?l?`?S8????V2z6tI???*?d??'a?5f4d?JZ??CLYr???_9?r	??Ieu??+????????u'??[k?SW!??J????:. at Z??oBu]?%?Tq????W???F??G??6
??H??8?qP?????%<M?S???????\3-|??????A?<??8??????s?
?Iy?]???
3?1'iP?(m?Hr
W??F7????M?9?qb9}Y???7U7?$??%/na6??u>t?8V???6???k>??o?Q???}?-?\{?????1g-g???b???J??a??I>?Xl?^Fj????G\s{f*?F?*??\?5l#C/'??????bA;???J(+Y????e?<rB@?Wco?%?lJ?O?i???L??l??Z\?(bk*?HZk?J??r~????E?]?D?W??8$????[?)Q&B????$? ?:??~C?TY???^3 ??vS<)7??p??T?m??????=<?o?
t at AJ?*? ??T?
?7?B?????????Kac?
?????n?9$?<?8j???????
]??Yq0????q at p??_{?'[^Yo~???rh?U?u??(A???=?/|}?I{????F?z? ?M?e-Y&???w??????(F?
????Pa??????6?pB??pg??5Pz?"*e>?"HJ??#4????Bve?z???????G??R/&????y?&?8???2)V<
L??M??|?W?Am??[????5k??E???w?	???
??RY?
W??;??Q??a??????X?????M???`F?
?*???0:????%??$?4??r;*?%?%D Ri????h?}?UZi??R??g??$?H??Z?o?^?Z??+?$q"kU????-????;?
?|`?/??.x?l2Q:w?JN?W??8?M?T???J??d??R?????S9???jL???q?m*U+?b&?
E???B?[^Y??????P???????2o?	rD?^gc??S4?S?s?????4<	w
??P??@??K???4?^???d_z5????R	I6??!?????????$?VtJ????%m??cZR?K????~=r???[
?RiK?????] ??-?kA???7?6??p?&h?Jk???PAl H?A?=cRlq)j???9?n?J?b?Z~Vj??z??8?Z?????????b?-?/Pl??V(
e??vg?ys7??????l?'[G?-''?J?$;??N[}???7?s?H??kW?i???;Y?
3?8?'zi;????????G??x??aY^q?
?x?TL;??19?W???????'?????+$#vQ
HX?
??W/y???>{?(`??G?????Y??)z??5??????N?????i<?F??@t??c?????4B?#??V?l??????&?????<?`l_?IH??I??
??X#?*aH?"-19????=??H}?A??k??%?X?#2/%???XgN?&d?(?(9?(m?Y???t]??????X|J?*???J????7?+?/??\?axy??f:a?????F!	?^?J?%?;4O
??L?!9??Q??mH)Hy?X+??/??T??#S????mE??IEK3??
C*S??V???z?$??S?b??g?Y?`f?/??QV+JX3AC-??3???PC????/U?w=??2??<??N6?J??	?o
????Y??={O?Z????T????#?e???FlZP?*h\h????R?]?6. at 7?0?'\0?ZR}??YU??@???#<c?G???????????D???.?2U??#l???a8\??
?????KhW?x?k?:G??????b???
? 6???lYa\R[?g8??V]a??`?lz?f??%?*?U?
??R0?X7???%?q?#??7^?H?,l?j?0??F?m????GW???W?=e*??<?	1??iT
c????@&??l`#?????%h
??l?0
?EX??f??G~?0
????~?fd;N$?amiaa?x???
2Q	b???ol&=V??T???8?2? ??!R?ft??%?-?tl?
.g?JX<??:?K??S~????6?????*?a?RB?0??C?<?#3????[A

#? ??x??TBZm?.j!}`?
?Cu??1???1?R8?Z1^y?S/ t???????b?V%sT{
?gS]??:2Z??????yLF1????s????
!V???K??PL??RX???
r????^?s?TAm&
?
i??2+Z?f???BQh?LP????B?=0::?M>?P??
YI3?2??_0c??!u???EV?Q???	?F_?R??+K??j\p?	MQ?(C?	???p4?Dr9????rN?3B??f6?
 ???? W???$?P??
?O?01b?)????r?????{???!2D?z??????E?g?R?dR?=??FK?1???<?z?	<??h0m?f???6c?3hPx`7oY??X(??)????HY??
??A?dw???#r??b?`927???????O?e}??
NR??????????Xp??/?
*?4?K>w;??L2?*-?X????ciQ?a??b&??Z?Z?#??????/?	????}?PAyc?S?`??J???4?H?$??%?? gHA??????	??bl%`??????@,Q??"D?M?????????7??O?,K??
??`$?zw?z?j|)?22?????&dD|?D??N?
?d??^P?ONW?$??2??????????4+wD&???R???kb???X??[?O??@?c?aw??b????h?l>?q?!G2?D?9?3?,@???Y??@
?$5?=Gt'?.@?~0E'1D??'?]hJVsPs?>?*n,?p?????3?4?E7???U???q??G*
I??`Ti??M??????????????V6Fxn	P]?Z?)
??wE??t?6???!8?r?!3w???E??[????Z??D??WU(?A?h?|2?t?#?)?~?V?? Z!cB?p?m+?D?w?	N?i?#????Pz$?
'-????>?FsV>?]?y}N.*>n??-dL????i?%F?N2??2#y??M??#H???^?Q???rfl????^)?o?[?F??????m0f?\#?
?o? '??????N???7??????ig?;y???=n?{??????v?wv??]o?]???N??`	?-????R??{??????h?x?}r??y?????????o??3???/[;G'???vJ????mO???????????[j
q??o??x???w??Zw
z????i?tJ0??0??=??V?????>ywxz???k??~llW??65?????N?_????0??m?U??w?M??o????X'??????F?U??`?????1???I?M{?
]???n??
|0??????o?g???%? ??.T
?6???v??????
????y??oj99??\{8:{??qc+?i??g?????N?Q[?K?????U'{F!F??]K?J????/???V?-{??????C?Ye?`j???H]?????I?;$?Ae?	?66???aq???;?????
?9?*??E^+???p??jcL???7,&?*???s?i
????T???_]???Q?N	??YJ???5
{VRxj?N??q??	EC?,?t,4?????????e??/?$!?5? ?2&J????m????1??D??S?Z??uOn?v/????7??=?6?????s?
W?,T?q??xS39?-J??-????????X?'???U??5?y???fc??????g
???????????w???Z(??????? ?It??????p?Ek?4)h???>?}?z/F?????????_?W?`
!(?????????????aA??????26?h??B?{?8*u??6???o????I??K+#??#A>?/???0??Xw?????H&?y_??Q.???P?h?pq?<???&?/#?M?O?g??~F?h??G??????a????5?

(Ze??E#?10????a??;??z1???A??y????$?n1???t^??V?c???gpk?j,/F??{???#?W?]???qB?????{????`6?|??????g	???l?????unVc????,{q~F??i?? ]?d??`???U???&??????i?8??:?????????????^???:?T??{Q|???8???lg?$yo?x???????6?z8]4???G??4??a???&??j??R?Ix????q??$t??JK;?s8y?"???
????f????
?3?T?#??
?c:??]????^~\Z?#\Zax?7l7?_j??D??l?%??-?G??????8n
?H?????????,??M?????????^???z??JB??d?)G???UC?	?c??0????B???V?3"?a8?a??`?*?????o?u?;?c08?????x?????|$0??uo%y??Wl"	,??$A?tL??71?
z19??
?b`vj?y?FL??~?A???K~?t???
?v???
????,C??D??53????p?8L????
?^n[
	??R??-2*??qx?
?x?!??q??m@?$??	???????WH?$?gi?2?}$vK?G Z?T?????????
???`??!I?PZy7#q0?'?!]???X~???_?
w?m????ss?P?c+L??|nGLr?z??8?.q???+???
c?~???Y??L????O??????{'?????????:??;?"?!?eo`>PL?3??
;?rA?40N?5??r??|???	?\Q?+gd?9?N????????????b?
???9~???|??h??D??h&K????????]Z?tct??S42"?Y^??&(?(??p?G	:?????B??d>`?x?W~??q?????&/}I? I
???HE81?K8??
???????????v5?lE????s(??K????????Zw?!????.???^q????	??P???B?U??T??????B??Gp??e??hwYTr???????????????2?????%???/??????wV?!Us4r?????nccf?w???%b?]}
#???M?J?#k?@C??:p?	'r
?L???Vx????
Z????k??????c"?8[????????q?d????N"?x??O?/_Y#?0???<?[?????VL?/??c;??K	?x7N(C??4?AB'DvAY??5$%t?????L??d?^A~g6?5X??????_?G???z???>?|?02???f???????Q(_g?-?'???a@?}rF????R8?ox??&??
?f?9\???,??5????\??J????=C??????K!m???7????7?????o\?V??????mE?????`?????l?> N?}???M????={? ?y,???c?A?
R???W@???{?A?C?P?m?{;}?j??_?p?:9?a????|D??=??V?????????>?a_??W??q}?/?+??[X??
?E?o???{??s?????O???e}?^?N?=?d0?`?Q??????K???H'???;??9??`?014???Y?K?
g?0??????~F?'??;?h?K?????(??H/?y????o
?pHY????% ?>`???@yya??????q??Z?^?u?|??!}?,w?
???+zz?q??????????????wz`???w1@?????~????s?n???^??????$?\x;u ez=X????:?c{L????/?1Io?6????@??????
*e???04t?G?{(4?w?z?P*?6????P,(????Xo^_L??Q?	?H'D??d7?????Z????u
????Q?h??t?U???????#????g??i?X?*?f4z at o????????3`j???19$	?????)fh?B??D4"?>?dR?EH????(Q???? ?L?2?(%?D{?h
???*?t?Gm?am?7??",	??*~B!???9??FDunxz?t_??#`?	?J_N?M?<????Q
?hR?zB????F??5PC??e9B???2???'?F3??P?p?*?t??(
,P?>@??a??N???Tv??????.8*??L?-?????j??????6??R;?'S3gSh?/??<D??N:
??$???_?(LV+Aj?
#?A&?????2??@&?f????????m??UIvWN8N?-&{^R???Q??????8??(kI??4????v]P??EJ?^;_d at y<r
?1~t??t=???A:???>?o?<?{????;{???*?AM??lX?
???sB?J?
G??"?:4k?_?E?hP
\[E?)??V_?X?E???A4B?sdeMl??D}?'????Y????3U<???????G????(*B?1?"??????7CAqq??/?????]?~O?NO??f????Y??'?j?#q`?=?y?pj??^??k
?_??%{?H?? ?+
?|?d?w?J?w
???iDg?4"??>cUg??w??Y+????L6?n*??p??
???2??>3<???????????Y?7C????~3}f??N?Pq????$y?<?y????????????[;????F???c%??e?J<?W?'?G>?p
???????p???&l.?x??-?fU
???????W?<g?}{/j
????h?fa.????r-????N~}es?~??????????!????????b}:??"?hC}?=|???M8??&MC+???um<?F_8ws;u[?;?<??)e??S^?iTwB?????<q?U?*?$?O??Tzn?!??I????'??0tg??\
2R????1?,r?^???I????T+C?2????"?r ?>??@($?FeI
P?R[?y????^??p???\?????j?????D 
0?
#??jp>42M1??c.???yd???
????
???
"F8??=?0@????0????9??Z2)<y?ji
?1?{`f!;K?E3??????f6.?J3????T??????]*HG?(:i??H??d??P?<?e?;?i??;::@??V?U,?&??f???????|?*D?0*???udT%?%?d.?Q??0??%?W?$"???r?,???????03??	???z"?y???Xf?_???l????K???
??0?K????Xvr?????h?1??s?????M?f?x?????????H-z?[+^????	?????J?'Q???$B?H??+?C???`D?"6-?????N????BKR`CJv??(????Hf??dHO?@h
,?X>?S8zF???h?:??????*+???7?[V???>?wE??xJ
?R9???9SXK????+?cU???q? ?4N????/?n?K[?le*???@L?
E??
?:??9?l????E7@?;?&????;???U??
?}Kx=m????v??8`??H(??????N???:A???g???46??[??????v>u???j???t?+.et??X???q??l??\?]=?0M?q????A???C??U??"xg???t?hjlJ9?aQ^?????=?E
?y[???r????V/?'?j
?#bp?:????B??????A?B:?!BQ+?bD
????????\aWU?d??O??%?7??????A[?]??_????.??\<????yO?k?????????07??7g??!?C??j??3?5?^?d?????AO.?3?1/5???{?,?~T?P?J????jnq??????kk????(??U?????e?]
?ln4?u??g?{??P?$T27?Kf:?AZ??`??:8??3?4?[9??N???????Si?h
zku(?^-????%??j???))?fG??8!??;%3t!?B2???z8?aOb???f?|l
???KYus?
?c?fQ?]?7?o????k????v3?u???V?wq??D??->???,L??uuw7?h?|?a-??????Wb??????3?lx?^?b????????h????N_'%e?kL??8?m`RD??b
???*?V?R?L??
?cT?p=?b{?????>??#G?>?.???D?-xL?E??-?t?X?
{???!U??y?Z!?|??????E????? ??n?U9?\V?Y??T$?u?	??I?c?3?%??p??K}?uJ(?v???9?????B?fYh?M?4U?>co]???,?E+J?????????m\?????\?]5????l?f?FLl<??^z????^(P?{?(?V?????oI?(?-????^??:9N?&'l???*[?c
?My4???,??l?-Vl??{?^???h?q??Km'??w\<??9?>??j???????????????P???V:?
?wO:?ng??A???|?bO???? ?u??[=
L?m?Y??TdC???Kp??
?????????B?K?z?f\??jd?????9??=??.??%?>R|X4??+???b?zml\0?????
??)??????(??c?X???SP}??6I??`?9)?????h??q???/?????sh?h;g???9VbrXr?G
?	x?s?&g???????	|<?%??;O}.?<???a???q??i]?{!C???????C???i?T?????-h??Z??7L
??u?l?nXe/??u?B??
??;??@2??|?"+?	??7Z0?1??????
?Qn|
????H?2????#???P
? ???5d??M=p?M1A??gj?9E?
?-?U?lo?????????
??W?p??P?????*D???5\????,??*??M???????:LJ4?C&D???#^?F?}V?J??????!W??0?:1??1??a??????Z??7M?_\?.-<????5??????Qk????\,x
UF?
#?E'
?k???????-??[??B,?U$2?
??

???Q?m[?6V
??;????0???????~1??????/??$n?????_P,
????w
?]???a?oVV?Y????^??g????Ko???,n??z?^?b????<?K>?K~??,????????W?_?/??_?7P??????Qo??@?????9???
F???_???oa9?]Y????????|?r???
?onW?
eY !???}??Je??'??HPl!ly???[?YY?
?7???o,?U?xSA?????o?????WTP????W?e?2?
?{????????Y=??????\??~?N?7??xzoI????FD??q????????al7????`????=???;?_???????q?tL????n?h*E??"w4?]?
f????m8?=??%9f:^?o??n???m?F<-?LgI?Mj)???S????-O???_ug?>n!?4??2?)? ??.E
?S?Fb?DP???6?x???v????S?5??6h?X????????ZK]u?y?wX
????V?-#??C?K|))???%??f;J?rb
G`?%n?Ef[?H&?????(?t??
;????V????l??Z]?]i????a?qhB?BX+???xw3?
Y???J???d=2rO?????oF?n?w?????`????h??G?}?O??????A,???[??a??~i!_?>???F?]??
?[?????G??b?qk??n?=.???2j|?U?9K??cf????9?N?x?%??2??)??<?L?c?]???
????4
s.?U?x1??
	????0?:?k<?w?p?u????b??l2?:??4??w????\?????I??G?j??+?9G3??_??N???lj+R|?~"j]?[?IK?6Ma?}????a
f???M3m??W??!N[????d0??su	'????s	?]"Zv??wBFt?
??6??'?MJ@'Gt
???8<+?????????< N???=M?h?L?:?c`QHa_??jOR?rJh???UFhA\?b?*?hT$l[:?t?X+?L?6???A??????RrpS???I
oh?*w?p??'?????G??&O?$iB[y???mJ-??Yq?
?$Nc?k?O???9??????lF?j??{?q?l??;??{*???b?h??]k?V~3=/???C???B???i_??e}?J??<^]G]??/???2???? [???}x??K{ak????	HxXAMO=e??5???<???0??f.?co??=B?]?:9??????????d??h?????`?????????r???yIP#N??W?G3F????M1?-?j??wt???}=?(???F??????#?????4m2?#???l??????????&???9???%a?]?:1????? ?;;????	]????p?a?W5???%??A?;~???S???(????W??f???????
???#,?8??)?
?????????n?????????'z?9?Z?6?,_7?2????<??hsG0J??y??
??b?51?hOo??/B"??????'???
???[d??V*????j??_?L&l:?!`??????	$?sJ??{?F??=??9???%	?????????????o-??|?@??7J?o?)???????W???C?/?o??????W??/T????O?W??+?fO7B?6nn???V????j?>5?w?????Vq?f??????#=??n?Na~?4??p??????/v??2?^}kl?+?w?~???/????p?z???U7???H?J?n?*])./?n-n?????B??0t?RXP??r????1??~>??B??]).A?!?H???W?0?5RXX?_]*?4?~W,?q?jai?J?PZ??????M???WKwK\*??????Vn?~W?q??:???g?$u???[?{??ba? ?>??Q???[??K?b?h??H??E?G???5?T\!????
^?b?)??_.?j?)|\?^Z--lIt??wk?F.L?e@?si?}X?Z??f??t??b??Y*?-?"y>??V??????Bq??????$4?<??8Wt???Gy??.????,?k?-?=??2??A????Oo,v4??Bd????}R?
k+???f?N[?]??]-}??}Z)?Hy
????o>,???o??;Xo???6??GF?GO??????Vj???G*?o??D:?o???????)??,y?fa?#i-??>Tcq?3=?l'F?V?&<??,M=	?????vxT8`???c???f?}f?s?~`<P????n???????a?a?g?;M??????e$???x/%??????K6?;???????d;b???????0??]?????????M????3??P???H?g?
?i
??EJ*}????`q?Z???????W,'?y|?g???e????????-?{????(??0?{m?????y/?)g_?kM?{.???????FgD?Q?v??,??`!???C???w?j9????Lz?d??)6???{.???|k???4???~?i\d?J??n*?<*?D?Si5???i??"f0???????@?Sn??|?.??

??0?7,IO?t
?$???t\?????^?????h0?j?mL?wv??-? ?
?-?6?????N???d??TU??
???!???':?q5??i??m#?????????G??<E?7z????n????v???-vK-???v
=??N?Ub??B&al?!?=QX`???A??<0?+W
|??9??Ngb????I??
&??\|?0?	?????L?m???9x$?? HL?'rxCv?aJ0?W??]
^?<3IT???:1??83 <?08???!?@n???zH?a?8?d?!??7??i7????8{Su??`=?N?J?0????,???P?????k6`????,?u`#????w???.?+?/??? ?g??W???L?;-?iA?Ogt]S?0?GN?	^<6<2<q???INO?''???A2:861||rdp??N???
?????Xv???"S+?#Z?Vx???????N7?q?qsNA3?F?X???!?????&<??q??=????3P??l?????bdT?q??q?????&??????Io4??D?z????:dj5?A?
??????????[&l????t??g?4???L?X??c?Fhpo?>0
 F?/??O?:s???4r_?I?pj??7?a??F??g?2`????"n?x{?2?8????????_???4?OCH?C????t<????j_->?B]]????/
?????(#`v&K?\n??2????J???0<?????P?}3?Q??d?W??Xkw5???|????w?{|7?????A	?7K?T
M?????{????B?*?h?L??$t!{???w??'L?X??|/?Zp)@?l??/?Vu'?L??H?cX<iHC	???????!GM?}?wA?I?0"8{XF;x
?
?ep?)w???????A??I????P?/??v????Cvu?????????:??"%???????WRf?C?????hJ?/??????#Cg^??>=4????????19?
??g1e?|N??(N\e?<B.??,w??_????U;??+????q?????5y??|????3????n?d|?Q$#?Ma??h?)V?F??tU?"??{?64
U????<?9392??{?;?g`??t&N?????q???????????=+?T??X???v???^=??m???w???~
??????g2?1
??m?A9?jIl?dU???x?\???1w?i?J??*?:6
dZ??~?9??z?]?{S??!? e?????7*Oe???\?b1t?c#?H?????I?+z????D?r?d6@???+&)C?v?M&QU???,LR?Ou??[r??.2	?z??O?????Y?gU/?@?;????Y??37"xiD???Lf??s???pY?0blE?Kd*?????_)?
??????????S?F???M?Sm ?8??wL9?y8??-????}??*??????????????????[??7??,?(?_WEC????????U????h?3?I?????.??_?:?)??jln8?t?y?BK?)?????f|
???CE???;??'?Q??O}\??)7??~&*fT?t?@?}?3?:{JN?:?2?q
???????cN????8'}|?rM ??a?%???X????V????g?????J
????)???AK???^#dA??H??0Es|???????(Be;????"8???m??h?m
)???wt?7?w,??ed?????|mzC???7wP??~?8N?'?N?????H?????Ul?u<'?=??e??
??+?????c???l??a????????5?q?^?n?~?J?E?tukW?.??n?z?????./?^?????-?l6R/?|??????}~????j?Y?o?e?]L??y?7??7??4?w???l?I??VK???x??????M?N?z????Q&c?G,????Ev??mn?
??gK??%b??A?$Y??;[[d??O?????`r3??x????q(?#?\`????O?u??+@??N'v#?L?3AP???D???U???&uz?	H??1a??? "?3q?"z?t???L>??^?[?`8
?lF????}?*&???????Gd????<??V?V}Q?f??K>R???*g?Ui?^?&`ll/!??M?{K????{?????(???b?o???X??f???`t????"???T?*a???*[?? =[##? ?c?O?a?^??]?????????6??X6???g?????HX?b at W?Ec-l?,?	&ys??n???Eh??iv?\???"??Tc!??0???
)?1+??????3???|?l?3]/?K??!?,?l1??+???????q2??!bS?4??#?e1d9????}??o??a??{uR???,2??n;|??????wd?8?Ee???p?wr?hg???????&?????!?#@?~|??^G?;m??? y????/?K)??B???D???????????????Gn??????????i??,.??????.?????7j?????y???)??Kp'
?????E? ?r?c?_R?55?^?9??7
???F}???D?????dZ@????O?p??K<??b???????}??B??#(?B1???~}c????.
?`?????#?F?^???
oH4k??????z?????????Bk??~?Ta?[ $?o

}?)^??Mz1??h?,!??C??a,$??????Bp)???"?)?:?3?#??ru??B?t??S?????AKC??????.Q3?MJ??n]m?R$?t?1F???8h?[n?S?????5?E??jrHR?????n?
b??P>??Ai&F?r?h?]??kB(2???=*??^W;C??:???AGU?.J?%@?N3????:hG?;(?
HA?e??E*?^?S???&E2?,GB?O????n???$??qR?6??x?(??
V???61+????=*?7?<?????&?Bv?????-?-??*?'?L????N?2???xgAHk??Gf???N?=???uw?N?17wM???>??|?4>??u'?E?XY?DU'??rS??o?Uso?kU<??#?f?l/ZE??-o<?NE?>	?Q?:??[?Vb????a?I?:?*?^???
?h?q???19?d?dQLI?yO@???R????;????
????sa3?b??(???
!?O?l?????U+}f????f??{z?Q??4??????2Kq*???q????c\?[???}?W?u??M?&?~????c?YbD??v?P
G?Y?0????8?r????MZ???`I??G??l^?|^A?7?D?SM???L8??s???To?(?
0,{+7?????x&?!+??3!??l??$H???el??!????>??}0
?m??????;?? T?
S,?*{??:??C??????:?|?{k???????4r????#&????m????????}0A)??
?tv???\>iJ?`??%>?????
?`RLf=I?Ib?82^?d??????|?$???D???A(?9?fb?{Z,$?n??N? ?cq[?????FS:??????j???Q?f?	H???~5?7eP?=F?5??N?_?wo?P:DDW?2?_F????,H?
p?e?iy?:?r???
?L?&K*????????C6?L$?t????
?L????3??P???$??4=P.
?i???2C???^??DI?6???Fm"|??B*?Pr?![???????@???3<5?????
??????4?
?5k}???]?2m?A???3D??w3?+?
??U??T???6?Z?C??????N???"??(!??D???Ji
?(??/3?K(????i?C?	???/)????Nr??&6?w?iRW?lB?I???u??D2(??(???
??RK)?T???za??	??????$??w?lt??????????%_??D
?3??=?,?o????HZ$?
?????p:???zCS?? 	?
M??L@????sk?C?w???t;7
;n?H ??gl????<???????????????C?_??H????????{??+	?t??????c,????w#rU$??3?
??+???pOK?L[?(? ????I??C?2J????t&?J??%?&??0????.{fa?l??03?!?*{?tg@)La??0??
Y^?????!?h??	(?F??VD~<f$@r:/??????Q?a?yy*??????^?
????+?p5?????N?F?=?0???0P?n?z???s????(?
,D?Q???????t????tN&??-.?]?M?l??x0?G?L??;?^?q#i?2?????NA0?*o?k
3?+oDkB?eDt?4t?>?,CVgL?8-???o|c???????????&M?????????.6?????k.|???????M??(?y?L;]?h?k.}gZ?$??e2?fV?c?~&?y?Wk?HW?????B?&}H?Sf?f?,*k???"X?gA?E??"\r?&LR??a??(?+^c?
,9q??g?[51??}???x!o0?-??V|Y?r?,
H??}?P?j?G????P-`
6??uE?IM?fB????H????=;?^H<W%???Q???????MZyg?uZi?SF#? ??????
#K]????h???W??W????/?_????JG}??)N???I??-c??v???a?Hc??'&?D??????m?~?i???R??&??? ???~'A????Itb???y??Z?
$"??Z5@?r?dj?J???U?65?3*P?>??D'???7??2i?*m?/??3?X%QK&?Q?????X%[?l??8t5?5?ha?????p????h?:"??O???W??{???n??SY??????m?}??+?????R?Y?u???8;:{????b.?k.83???F?,@!.?0?q?9:?#/?R00A	????w???????e ??1???b????dQ<j<??~7eL?J?k.?@?U?
c?:|??.??W???????L?4i?j??
?/D:??%?
=???)?	?("??]??l??Ek?(?u8?{?>ctt	??????)?3O?#54ppO??NA???K?{:?9??	?????????P2?/j^
?
uf???m?I?!2??E\?oB?V9h?cj?:p?K1?y?%d??Q?????
8V?#??\?T?????g?
`g/??DI??F??M}??
???y2?
?]??[@?	?U$4?m&????`/ ??D]?.??????Xf
?K??o????f?^X??%
?{p???????????eM??2=??6?^?k??????`l??j ??
??
i(?H#?}?+?7???1??????W?
~y??=?W?[{?CUTz?(S?K|: [?	?
??N?a0vR????	)
a]H?????&??\?S?S??c?A?Q??6m?SW??J:$n?K% ??K??????2?^Ff??b?Un at NZ?????V?)???????W?,?Z??}Z'kO?c?%
?????-e?4&?
????f{G?a/
<?J???m@%??W??I*???ki???RF??R??Bpk?Y7e???7?????$?5??????fC?m"??Y??(#?;?$??????=??R#???^?2?RV?n?`"(??'q
?v??pwv????	?GC??r???<????")\????????v

??jv????Y	2?&???i?
?s>:?)NZ?HQ?8YMIL?l???$BMk?bg/s??c???#????&?D???Dc+??zG? ???q?N?14?$$?P&?cr??l?tL???VaQ??@????#v?
?L>??5+???O=?????N???Msh(????????
?.?/?
V??2	2?????!????m?2K??????R?
?{M??? 
?K?%K????P??I[g?Q???C???YW??A:?tr?lh?m?T.?}???Gn?M??s05?L?m}???>??N???????N:D[?zm?!?jOR?l???:G?bS<???*?G?1??????~J??????H??l?????eh??7c?3sH%?#t????Q':?O?????????x??7-??l?z>8??M??!&??X??:?1??*(Ro ???1?A"5i?%????U2?U.3????7???BW
??i?;?iV???g??@?I at r6t_????O??????F)A1?x?GM?
c[w??tv???A?mSy?:????&???(?A??????=]?????D?p?[K????p???N?c????
g=0?x?n1[?Fz?';I4?j8??lG??r=?z?]?GW?M?k???D????L?s*A'?aTEC??1???Nk????!b?B?:?VT7?v?h"(???3?-????A????<$????(H{.]??W??1??.	"Dk????,???J??N7?e?:?"?H?M'v7?9B7
O????Nh?[??l????h???>??????h:?\??n_w??????k`????;??[C???q??]??wfB???RH=?U?n??{~?
v?l???????????	b???e?Xt?"?(*?1??~?E?\:??`???7???Al???:?b'Q???b??[??
?%?v;@?7???A?7?R?\N??%*X?xh????????D[M??`c??V_kb7
\?BK at C?jz??i??????oP?1????#v??lL?p?q?s4?(*'s}9????4Kl??j?f?q??/2????
}???????cP??wbl?hNE"XUD(???:?5'%(??5?F%??s3-? 5????v;?
?c?d?_6?r???6&??rGk???A?jH{b%????)BM?=???M}k?????]a9rh?q???jc0?c????I at u?g'????-5o
(?X4??c?q??L?:lY???}??? ?h??oj??m	'S?S2??
?[4?_??}fD?n?kQ?X??iC??#?lE-?)
\??j??? ??%???*C?????#??????W??;?????8'l
%?=?Q@???~????AgL*?????????$????(?]+{+	?8?E?p???n??lZ+?l|Y??e???i?{??=?hi?J?A???j=F???4?????VKd?$b?a)g????0???????v?ab??9?,??h????0F(?i?z?S??Hh??*?&e>?<??e2?NN?>[?sd?C??dB??d????? ??$?w??_W???x???m?????K-??/-6?VV(?{ky????[???p?}???}??J??BA?g$K?
HD=?w?;~???j??????n?q?t????'P?	??h????)?
P??\?|??{?1?L?omnon??*????\??V?SU>???~^??????^?????f???8<%???LZ?y????(e?TSw?c4?ppjQ?u??%Ai?w?D5?v	a?u1*T?I????>???{?{??~???1W^T???
vY???YUno?????W?z??\	?Y??h?+???zE
??????\???5?????w?I?J]`??	?I??????)D)#
?U&?.?L{Rj???W??ow^??`?????U?-???&?b??6^????s??????Wm?b??v?J???
????ss??W0???BR???
???v(>???]j???T2]????:=???~?????6????:?M]?c??U?tzM??JE????{???x[?3%????F?F?r?	???0f28Y[?L???=zI??DuO?????
?W?
k?G!??*>i?O???
?9ssT~?o'?1?z#s???!?1d????Y?m/pU?V???Fd=z??;(??)??x:???3??7V?|K????\???++???oG????N?x??~??ED??????T????v??????? ????^?????%6??<??1?? y3C]???x????(?3??????k?D?v
5???:?Pr???=?q6?
{?=????W?0???Otjp-?n?v(???????e?2???v]]?????O?$?l$???Hk4`P$!E?R2?VeU#`?7???;Pk????k{{k??=1?>???????I
?a???6?^???k/6?n?&s?W????
H;???Ey??????}???????'?ekL?z?[(?r??h0?sv?????N.	??fw??Y61]?LLX?%}"j????I|?I???6??z??-=V?C????=o? U?"?b,????f?Yk.4V????	??Q?1??b?(??
??Ge'???????C???L9??~??0?D'?y??????	us?7%???K?3-?+?`z(G
????v???(?f`@0q????#? q??$?w ???WP?*?t?A????????(n????
??????Gyv??a6M??^U?Pu?????S=?????s???8,9???vD??f5y???Pc4~?6???*W?!?@????Rn??/??,??????{[)F????%p?n8hK?jb????????.?sA??z?ooN?$?O???QV!??h?????&*??B??h??a?%?4Y????{I/?N???S?)???+?Jb??*??????????hyk???????l?l??+??3????[?<?w???*?j??f]????/?|
??IM
(N?????I???x<?)D?@???f??Akw??T????K?tX????9,_'?/??gh??????"??
'??6?#????lBd	]??m?3?sr?9<??j?
??9??

X?o'??~0?????) ???G?S?;??R?v????????'W????y|?$}?O+H?????>?o?^?M8?????>?B??A7????%?X???^????(u??-???A?`??o?N?O0?*?Zc?
???b?P.?;??E8
?U????????a?^d?^?????5 ??????????J????lI??r????30[$????????Q???"T????????l8#?!?????e?3?dQ?
?
,_%?:???K??e=??2??e???\~?W?/?\&?J{?$??z?q^}?3???A??????????4??;p{??4??$???t?0?M?	?N??.????????R
y*S??i?????DN{O3=??L??n??O-???????/???9{1B?t"_^p??h??dl??????????V?w??m???????E?????,??>?,?S????8??z5e??U???????)u?????3SY}|g*kP???DI?$??q?&?c?/-???V??
|?J?9[??E????jkW?}X???[??f?ni??????????N???>??\??Z7?????1?e????L?+_
???????ke????]?!
??&J???3MYL*?u?4?1???2?y?2??Vt<??????@y??????] _&v5?I4?4???g?Y4?&?.?(???]KBQ???^?????+?w??'?dzU?????X???q??w:A??u@?\???Q#''C????de?&??5e?GRK???0???Yg+-[?,????+???=???? ?d?X?????"??=A}s????bgBy?jC?p???i??I
`?+?PV??Jf{?(~??PSW!????????PH\????~y@?k?+??????Vn????1f?B?7)KKA?A^?0??]=l??,84??R??%??l[?_*`?2s?????Q??^??????>?3M?????+
+???q??r0Lu?????'?IQ+<u???!??A?Q?M???K?e??*'????b?{??6?01ypf?l?o?????????e#mlw???l??l?Yb|5Y.?_T??`)??H?-
?????=)*??lqxZXZ??<?I????B{,?????M
?T?b[?h=??
?????i???? s???oU 
??????5b???g?p?P?????R<u4@??a?r????$
?5????;?????`?????m?R????T?9?$?1V?O?	????????+?DQ7?lDX???????4	??]?5'???<}??eLgw????K?+e?9???+???@
??K??f?c
w?#?5<?\??RU???F?
?.???????7?t???4[?9a??H???c=???8C_??@????????t?eiiR?G
?B??Z?????4?+???????_?#??????o???Xj???f???\Zn60???r?{??o?s???CL?{??q?(Xy?h?{?|?^C??j?y??????>||v???o?Z{??????s??+{h>???0???Dug??v?t????E}??Y*??J??|?;???g???k???7??93?AE????I??>=???@"?<?|??h???Ov] ?o?:??????????!& tS.i??;h??7?+:?/?a???????%??
????$p%d???M?@??G?2G?$??X?^??trs}?s&)e??;??????_??????_???r??Ui~a???;,?B??????>?
#??????$??:_z??????zU?kpVY$?{h8??pP??????*??3'M?:?b``b=?/IM?}?0????????????{G?b????e5?F?
6s
??@??%???7 at e
]??1???????????7?????O2??y
????{;?????x???/????P$??????_1?;??
?????A>??&?-$?0???j;?;???l?LJ+yd4?:?Igdn2?#?!?s??
 ^6?Fp????c????????M?????9?U
n???~Y?j.??oy
?J??0?????3W?`??????y???????w~??L??a)]4???-???JQ???0???2???6???`??U??^{?????JH*M(?K?????????N??!??? ?????]RN????w??	??-?.'?0[To?ta?!????_/??`??2%&???
???"?JP\??`???uF?og??q??(?#n}??Og????3?J???%	?`sNc(|F!2/?N}]?T????
?9?L?Bs0??jH??4s#?2??{?o"?#l??????E??k??Z\@?????w??7??e?~?
nJ?w??3??????Z??k=Gy&?$9????x????Qd??{2?
????zUo?b???)????Pe?8??NfN??VC??s???Y?v?5????????B???e%go???6??FW?u???O?k/^{???c?nY>W>??????ko7???W??????,?=?!??6h??
??????=??$??$
??
2R??c
?!vI
?)4?l????Ow??^1????B?J???5-???[M???K?
Rc????&[?e???~
?S?JL?\w?)*?a@	/? P?1T5Y??6E???a??t|???wj??|????????f??b???j?,????w??o???*???cok???>fvJ????6?s??\???]??l????#?n?"a8@?}4??@????&H$??	/P3|???y?^?(Z?X?Q?g?0	??]@O=nF??g.??`v`W?ZDh???,??|??????K-}?7?ZM???????????Q?XP????3<j???????+YS????x?$?~?B????h??a?1Q?????
$y-Ze??O??
y?:T"O?a???ru?b?$F3?????"c??E;A?#t???	????wRF??{E??O????Y????	r??y?????????DG?????z??? ????9\?????D"@@,?O?!??iG??;??A???M?=??N'??????????K???Z?{%6?hUa???j?,?A??p4?"??;?i<??T?;??????q????"??*?A?s?c??????^<Q???">??zP???~p??????9<u?~7???(???r??n?K???/???&?????????/?,_?|????g???)G??Rdc^???=?N*??8D?da]?*?8Y???m/H??????0qa<d??y????]?@????-<?4<?_???@?o?0
?u?^????????A??C????4?
?c(D??C
k?]up???,?>?O?a>???E??-6???????C??+???l,?`????d_9???????	Z?V????*q}?q?K&??a??H?j;?D???W?d?????I??h?37???<;????="???2F?co??5!^???????W??"?	u9Z4?<H?u????pb?:#J?z9?:?-???v?f-?~????%P?9v#?\z?9`?tV?V??LtR-a=!?h}?N??T?O??MU??P?'??????????o??-<?+????ou?{?":?Pe?A(????0???W?c??l?a??????;??f
??xz?	G?I??T??;4?!?j??t!\c?q??DYp??????i???u??
????????w??^??[?j?o?dt???H?8?SX5????N?6??g???C?Ad?.????h?8??w??????t??l???*?????
?????????r?H*?U????l??&??????[?@@???)?@?????c{k3T??8w?+?????&??<)1??f???k??8?C`??mU.?}.\~T?a??S??<???9?????8r?zU1??5?2?^]?Hz??9o?5+c??k???^s??$e8?x#?:?8E|?5??lGzFrn??a?*?M???g
???gp?>?]??J7@aM??%??Ph?{_?<?,????~O?h?+c?
"I??0?k8???O[??R?F?1?M\;???K???????^?"]?;
????/L(????2S??7%?b??U??D?"?4?Z?^???lI?`v???=??C?p???"bJ??`\
??
?%Q8?p?x*????<m??i????4???????jy?8?@?z*?H???E?Pe??Hs?aI?=2?.??p?l<?3???e0??????
G?nP*S?;??????
?????D6VK?e???????/>?_?\"?_?	??B????w??????????W??6?%??N???Y???
?i\U?jm?R????????E8??G??*??T?W?_R??z?????????>?;u?;~??]W????K???m?q6?k??1?np/?6???
#?,?lr???5
??
?B)??D2?`?I?'?A?VN
?Y-??<p?l?
#A?J$E?8?U????7b?S???Te???}???Mhu
???9???Nt ?D&X:???
???E?(?Bw`
@?9VQ7????{?w?z0>?SW=??B?
??C??i?^?;>?;??]??xr???!?I??u??.??LkW?<?(L??C@]??DI???;kH?s?(tF?K?O??3???l??wD|0
S?rx??h?rW1Z???)@?N?n??j5?????wn??T?/??EHLq?#?[????r
???B???
?J??
??
??^?"??V???x?:?vvV??{u>???XZ
f????r?YoU????fw?
w??z)???nu?v?"???????R??&?C!??.?0???vq???Oq?T??sLVG0??o.?f?a?MXn??KV?/???XU??Xh|??pO??D?!??Xl"+?????????DKc??e?z?6Z$	2?S??\?`6q??K???W?M)15?? r?Zl?????P??=???????z???k?P_?/??i&?4Q???Zm,???0u ?T??"t&:?7???(??{#?eYL!?/1HL~???+??&???*?y??O?g??????????S???%????gl?p????TW,<}???S?A???r??X?P?
.
x????c1>?8M???-?>?c?B?????!M???T????FS????6Q??????R0;[??????Z]??????c?s??c????e?l??+???{???-22l?7[?????# ?b????K?uRn)??]f/? ????M?1J#Y
g]N7?D????4?N??h^?U????|4J\%???Ny??????e?D1??qD?@?p??o???w|I?Z?3?w|??/?Q?8??1??KW???A??\k?Li<e1??e]?Y?'???s?V(?h?w???u ??]4fO?c1=?I???d2??????-}<?
??g?N&??????~o??B??/$???D???*"di???I????{??],hM??K???e"????!?????4,??H	X????h(5?;????"m{Gl??9`??6ft,d????[?a??????X???E?/??l??#????^?{,?eq??(?????BG?d??4??"N?N???>@?p)?Q???y?^?W??J?)3??s??3??3nC??^$nf??pIp&?>}???
K??|R?????????C?p????~?p?
q ??~R?<S?&???V??IC??#<??P?0<?????RU?4???????P????P??_H??????O???J?|7D???z?0?`#
v??B3S*aG?&S?%$??.?"[?? 0<N?8??y"?l???????i4??PR?`0???????`YM??'??Hc?e??????U@?S?	??A?-"r?3?]??H???p
???,<J??B$?6?B?????????~r?j?e~To???w???Su7]?v7`?? :R??nHv???[??v?Z?????Uqb<G?RM????qH	?z at YS?Do=???r?\???\??d6???m	?
???E??s?t?vXgI??gi?@??x?[7
?n?Y?
?-????????)?c$??????'|QA?=???0:??g????G6z ???)?uK????1<??	{?????o?Jw??i????Fe?Nr]x%
@9???g???V#??8?[l4?r??????????=:^????:uQ???Y.???k????R??
???I??xu??j?> F&#,?8?jiD?:???[??2??P??
?1?q3?s??l???&JU??????|F?W??0?Pw??
?R?>??1?g{?1??S?u???
);P\L????;s$I1??}UCH????5~?4????o?h&3#g??j??0[??*???Yo???4???2????3???????	wm~?7???\???\C??????d?????E
??L??6d???[?5M??????m???N'el?~?p??s>?k??O????6?F;?kf	F??"???#?)-.?.??????MR E??"?*??1???????&???W?
c???p???!;3X?7}ZS?P??I?:?u???????H#???l???g???:??H%?j?>Io*Xp????????J[?
?\j????J?w?}H?I@?~F???1MQ??N??=?4?E?~?????(?AU?x??(."I????X}?G????y?nG?E?T??K????4??5???????B?G?C???	?5s?l!p????13fk?X???
?
?(g&?M????q??'t?JT???R?????j????Q< j?'??}???*,??Q?????[?+??????q	??q??X?/?P<M???%??M??&F??I1}??2D1???K?7H?o.O???U??`?C?(?????)??H???
??
????j??@???????}o&??????ZjA-~*.???0???`0????c?L???R??L???)`B
???D?IMc?d?sx??m?4??M?&??N{V????B?%???Je??'ONk?K<???\R+??t
??????????~L?Q??o
|Z?k????{??%??
???O????@???#?%?x
?QTJ????h?v???+2??
?A?-t??Y???m?5[????)??fc~?mnWV[?????k?????V?&{?5??????u'z???????Q?w?qS2g?N???._??u?????W4I#?k?K??(?*L??a???????k!\z^p??n?? ???r???.?
jU???5??|l????	?
??ee1????????y	?7?????'???
?#?R
??h4%???'?(l??>?{k<?m?
????*?.&?+?Z*]?:??>????cn??
4?I???<???0???F7P=?L?e?G?T{d?????k??M?[Q?zdI_??????)+j??%????T?N?j??p?j"?|#(7tz?3??L?[-???"dAq`zi??63?w???!BFI?(??x?&U2m??LO??2m????+???Q?'??]?[???5????2y{
8?L??&??F???????????"??????+?????r?r??Gza???????)??_???+:?t?\~B?S9$J
?e?jEkw%?@V??
%??VpX????`??_n??_jA?K4&??
{??f6???
???. ??l{????I????K?90??
?t??????M?x?SAU??To????0+?t?*?
$?m??:w?|??r!????6t
x?srT??1V????pjx??G'-??t?????J?YDbR?$"???R?n??f?2??????H???!?Ja??3?T?????8????[?:Di3??t=-?Geq????:?VB??q?5???3?O?U?a?:N???c?I?6???:_??x9?0??}??????R?s?P$2?V??V?E???C/?H?]*1??B?|????8?8|1??hb?Vw?????]q??	????A???E`?jj?????sb?`?i?~???_"??2?Z???+S????5o???=???????g??/	???f?
{????0k??(U"~??????=?m&g???D??3?v??.?????N??K?)??t]??R_"??I???AhU???q(xl?I??K?L=?????%f?.?6w??`'?	????n\??f
?????5f?x???a?;b????r???=p????p?$z?B??j?y?/?iQC
????=!y???7/Y
?8;@?hF?{R'???^??|jZ?r???[????f?rg.????
??j?{?????x??????)Z??U?c=???I??E?Ho???4#??????????
?n5D?- ?q?@+$c
k?M?pWQf\,?H??'8???}?X
?`w?R???G????????^?2*[|???k????]?fA1S?!?Q??-???/????a????f??b????????????"f?Qk-?R????m??s???:.???h????:)P_-q6??<"u"3#3b*????>M????4X?m???3<l?f?w?$?Z?!???lYq>?N?????hu
"??????OE?h??IE
&6F?c<XDv??G?x5?d?h??<4???+5J???t?;?P
;rKa??a??O?lm??W?g?+)???0c>?b???.]?????????c?????Q???
#??????Th&??C?J?B;T?Bd</??q?d?????(?O/6?=p
???E??/*1gHnV?aIUG,?+/?>1?Gh?????:??$' 9n???\T/??[J[?????????0AT???u?T??Vn?Q??????Q???????1????1u??C?v???`&h?????????T
y?`d6??+Fbc?????????3??2?:???I???3|2?w???F?a?????1?s??`??2?GP??P*??u?/7
?T???&6S8?I?A?

?b???L|????4??k??k1o????|K??Y?j0
6	
O????F!Kj~?b7???9?"??k?;??;?1???&5
???
M?EQ??4s@??'??Q?>??*
?????
b
?)`???|;w???c	9s`??eL)?
^?J(?#I
?&sd????????\?l??"?7?f?()??????|?}?xn?:u?D	$?m??1K???8'?p;?KJ??cq-p~
?C??}?2?????qE??VL.??&2;?wSmOmS??2?????!???tR?-9??222;V]?D???H????b?K20???????%9?g*W.?E?cCmG*t??7ANa???????s?qE??$??V	)r??5?	]??Z?????S`??K????e?2
f1????>6?6p????w?n????!\N??`?5?]??`???6cN?2??P?^?B??8?X?S??pc?caJ?GW?o?~4?@>nlJ??
:?7?
>?o???#??V???5?h??)8?1?R??8V??|?????Qj????????"??#???r5??`??????U??3??f^???????`????????M?I????d??2?4?.???f???.?????y??A??7?eC??t.??08???W?n?og?0?3?????????i??[??($?f?;?,V]U%?E
+??0; X?<rFU6?????Q?l?_8??D????D?#??/???u??? ??????|???>Z4s?kbB`?:|??)??I??[??&?{?
?0
1	-??d9?LfW??h6d??JR\??mc??`??dx????>q??\??_4?5n?jO?\B?kc43T?????,*&+?8?U?h??T??,?3?	????????!?U???PEYV???%|?XD)???W??4???K??& g,??2eH?Jtl4/??'?H?????`I?,_?H??-LU??H?[J??fj????R'rh??rm??ek?f???`L:m:
^??i??w????v?P????????<???B$??@?sA-Q???????>i???31I_?o,?9??Iaj???
????~?O?6j???(>e????
^_?x-F>?q?t?AW??_-?km?igD0m?$*&bW?l8??0H????'?AA?]?k??????????????:|????????i?Z?R?????O?;0W?I?3?c? ????
HlI;??????	?s???D?*v???jv??U????d?I?FQiM-???/???"[?????=?mkMhg?it?UB?S	m at n??i?m????Jw?}???B?YO?7nX?\?]}??w???y????????????m{	???$?8e?o??K!?c?c?.?tU?(3}r0A?qp&??T{<Q?????0??7?q&18? `??P1??
??3?
???-J??n1~(??~?A|1"?Q??ezZ??E? ~? ??5??|J\6J??z*?~N???M=?Jc??A"?/M<??D=??
???rs?????-&`??U??'??O?%?y0
??????????q0pc??%g?l7???n?C???F??J[?ef?E)??~|DT??@	c??	?? ?V????q??mq??F???4???N??X??GN}??%????|?????n?co????f?`~??+(L?*S??3?1?????*
6???)}?7
k?`????@?JO?S?8,??>???7?????F?|??:V?7-
??C???CCP??CX?
?E??b??=??????
o???*{???$??u?T??????+????7?3:z??TL{??R?k5
GB??P??d<?`'o??F?U,???qK????goK?3?S? ?n0?????U?y(??.??7?????ET?qq^?C7?n?|???[?z??!?}??|???	9r??8?z??F?????CH???f8u?>??6??	~??t??@??>??1?N#?I????M?p????????z????k??X><h????@??xz?Vo???x|?????Z????Q^[oiW????:F????<????
?y???g???????Y>?zR???????5\Rd??7?lW?5??{????
????N?K}???g????????~???L?7??/{
?#????n??
&ho?s???
x?!?(?)?I?^?r?? Y?;??????=??	?>	s#U???T
?V??????>zt?????Q?jv]?4?@?
??_?>?????c?A?cFp?.?1vSg??>0:	?tA??=Axd???7????? ??8|em5@????x?6?o???c???>??
[?zu?3?=???a?^AG??$'??0U??p????!2????s/??????;?}sFp??????p?B
`?)I?s<d???3F?8??_`????Ok?FS???}Y????TQ??tHb??J9??????d????XoUK??s??q$|????r???????3?P;v?U/?n?)??4?y?(?898Mc0?$????7z???/??h?|}?????c??|?_wy?????-???Z??G?{?{?q????\TR?-??k?Z?1?????6"?:??*?8??6??_????j?????<?a?
3h?t???.?1?0??X??v=k
c?`???G5 ??~E/$/-?}??Zy?{??^A{pA??_??:??????z?	(?e?#o?D????A?????`??/sS?o?Z}aHp>???^??$i?}"??????Km????}
?Z???k},_?C@?$????Z?}????r?9?i??H4?????p'p7???6z??J??c?v?
???1~??$8?6Ob+????p^???????Gz7r?
1?????VO&vwoco????7672?<????A??@? I1
H?d???????????c??0:0+y#?D????I????9??
?3
#??A?O?????brB~??????^h;e<rr7???????K?Y?[???`|??.^??*i?????8=??eD*?????????}???r???76??????}l????Bn?r?RU???????????I??~?w???Fk???????Jk????????????o?S??8?f????d?w0?h-?x???:??R?L?????r??7Uk?,TW?C????9?Qw????p??3F????F???????z?u?P?)?8?Pft????8&	??Q??Z???Y??;'?x
????J??+/9??0?/0]s???G???i???R5??s?m??Y?H^nE??r3RZ?)???????Z??Z8??R??$C6?*g??oa?a~ #L???5?|??????kY{?????????8??????Lv>LY?>?
Q?R#Q3{h?p?	)???0S?j?V?I?)??'??=7?h???<Y?l????????MZ89??	??????* :%??V???S??\?.?!??5????v??JA	u"???o?O???
?????B?
??C???*??M??{k?[5?z??cay????V??????????????[?Hf8??(@
??/?`T=???4?<"????7J6Q???K????nt?0???B?
L?????6??}d?Q?E?

L??S?????????S???]?e????}mC??3???p<R???_5??T?#?
j?????????/???e????
????O9?.???*????C?m????
?
??Q>n?
???K?mb?Kd[???R??|}?qw??x?.?U???a??	]
??5???]J????a?????>z
?]+?p^x??
??L????88?!????	??E\??G??6{dM??
dO at .'?	
????S??!#B
?"P?;?0#3???.T{? ?U??"??????%eT?^???H?1? w?P?.E]e%[?Y?\_?G?????r?m*&?b????????{ko???m??k>???q??x???
:t??;bm?RbQ9???G????X????j???z)0???`<????R???]1?A?,."|"??i????[??.?&??B
?@????L?????e????:???I??F^?d?#????k???Ajb?f???B??D`q
??8S?C{Y
??)???_?nd:O??,W#???XE??h?9?? ????TWk!*??$?q?@?!?E????????-???z?
?e??? q??C???y?e??.????:??j?,p?U'?H??t???Q??^??(?Ay?b?=???????qf???#?&??1??V?5??=$??W??'?[1?*?!\Bx??2???`(?R??a???nO??????uZ9?
??%
?F?`:?!w???=?BI?H?????p?H?W???z7?U??7?Q????$s???c??
???$?)K?&?Dz??~??5?d4?f?O?z9g
K??0?h?f{<???q2D??=??w!n?f?!??x??0??N?:?? ?^?z@????=O?????a>4?@??	??
t??*
??F???
???8?.??????,???y???????5????ss????-c6?w,&?+-????V??f???+?B1?wE2???K?CE?w????
???a|??W?????S?a_|??&??"0%????
?p?p?????&?6????o??????l3??0???yy4???<?=??~??Z?
>?~?ut???I?Y?V?`?e'U??-
??UX???:??s??oo?>w`?c?Y??	??}r????^|5)?|???w?^o??7??q?0T?ONLeF?i}??oRs'V??3XV?v
?"???4H??08??4?????IL??e??S????y	?G?0?
??*$-W?;
.?b????N?<;??U?*D?^
?????#?TK??9??=?-T?-?~z?
????B?L?C/?Q'?!9?????cEg?B	E??? ???$?$?
?y?6?????($??H????C?????C
?mE,w
??C??ftm????#???#?
Xb?6)??d??GF?????????I???-4#?f?o??zkQ????????5i???%[?zp2??????8?-
?\?=??N?
T?,??..	????"p??8@?#9<")?]x?p4??t??<PA??;????,RJ???aG??i?O,R?3
?f?
?2?K?U??d????I^????t????
???
?????M?!E?4g?C
????Jf?l??#???Y???=???7VJ???L#^Q?'??AM 
?p?u??YB???lMb?2:????3:cHKy9??fl?J????De???
?w?????(???B}??ttc??Ym}?~0?5B?k???_	???
*??E???z5?DC?0M?aA?Y?#???S\Q???~?L???I??????v{U?<p	j??%?LI??e(??y1?M%?j&"??P???EI?-f?	?Dh???C?8??9???>???&?Z?;??x#??cN??$t???:|N??R???&???28?? ?L??)?<?X???????? ??oz(r$??.?jC????ZP?<@m"?9??B?%??????(?^7?????vP-?f?A?RWn?/??3?
g???`T?n??#??q?OX?gE|?????p?bkY?@Do?y%?? ,7BZ??DlB33;%?nD?>?-1?!ZFf?&?=yM????;T??(P??DM)?
?A?
??$??;#dA??b?????n?L?????\?? ???8???pA=S????u?^???????o4Z???????\?.-????f*
?????Knl??:Oa???-?k?1? $?(!+??!?r???h'???v
Z??????(??q?Z??{??8????:^??["?f????$?L???1?ig8?????4?????!?Y {?`{??W?D???TL*O%??<D??+-???V?#??N???$?I???L??A?|???\??4b|?	N??W??'?q?!?,?,eb??D?%S?2??ai???/L;4???a?.???r2?????c?cm??j???1:?U?,A???C?#?f???F?T???)??????*?Hv4?}[?w?QG??I????2??l/c??D?????D?@???r?/(???:?t<??????>K?:??$4???%8?F??????x?;??2!c???k?}??.%
????luA??????a"??;?M?P????Q;?u?B]??hx3$&vH?)II??y??n?3??I c l??l?q???'?
4AQ??????E?^?n<W?????c?W8?8]?0>??v?EBt??p8%?0?2$?	?l?q.m??.P?Z??>??'?ND????EIZG?*?L??*fx?????1%OB{?????0???hr
?=/? C??????&??b?z?-??t?C????c?C#?g
???<?	'?:?????ZUb???+&??I?q??#r?%?1?7???U?g4g$????e
K?#???[}?{FT?3~R?r??,2s*?2B?v at o4?O3??%`}Z"?QC?d??7P3?? rU?p[?]???
z??ZW
nt?F??E$?tDGg

L??q,=???!Y?P??????Q????>?t??K7b???kT?aI?S85H????CQ/g2![?eh?J??c?????L?5???
8|I?1%?P?t??i?u/*??%l?????x????????????X<]_^Q`?=??x????M!?>l>????5?,?}w?v_?FY????=s?PbsC????D?d???4?U??H????`gex,0%?hD?h?\???3Hqt?3?J?????r'??????@????p
?5?~g9?37?ZH??j?Q%?
$????/"/H>h*??Xq???{]
<{??8?? HNY???????}?:?kFYw(?O?U?u?????????X??)In?)@z?3v?xe????&s(?I?
??mn?HS???i?????
????'?G5?H?y E?@"????c?,??*Py?*??S;g~?W]???<!O???]3M????e???:?^?Zkfud?aE????Ag???NN{?????3?????Y'I*???G*U????J}[-a????9?l????
y?kq?W?O!??N?`?
?
?
???0?8?OY&?*Vu(Z?X??????~%??l<?0??U>,*??2?$Gc?C??E???FU,??k?	??z??%???v??%??c?s???4m"??2?@??r
(???5?AN3??C???dCG:^(?????c&?Y??.??????+?Q??j5??j?
e??????s_??e?
F;??\)?(I|?O????G?L?>LK??LD-??z?=??\&?????9??
?????/AP>?????n\?|B7v8<}??
Lh*?HnNV?????d?e$3?:?]j????g?o??Fm,h?????(uU?u?=?{;^E	g???J#2?_???s?R?Y??N??
?T?Dk?4??]???l???Z?34??+i??(D?????L?m(??e??s?)?{j???C?f?U?l B?O
?q&LJ?????\6~?&??E72?)??R?1??A??jDS???????G?hF\??I?1???&c?zI??0??6d?%#?k.?t]???s??????IBhV????.n+?? H/#
?1?rb/	??F?R??Y??J??}tp??????????v????r?v^X?????????;???g?:c???I??A?T?,???????@??#4?!???1?q?/?= ???t???c?t<|??8????:LX?????#us8?W,?8?????????}	}?? 2?x?"p?#
???????????-?3??mK?ZxTX??p?}???
?????d????????????9e(??????????Z?P=????=????^s
-?% ???LJ?6f%?B8e?	??M??K??????`??q???>????T??n???C???~?{G?4B???97??,?c?????????QE??Q?B??b-??????~??+??4??H]?M|l?C?*?+??M4??Q??
?.???XR??j\?i_?{???b? ????P2M?J
$|???????????1&"s??E????u?B?!R??]?QG'??yg??O??}??;?6??????????R?R
?
?	?????{?

H???^^?_?5K2F4fr?p?$???ymZ,???????:?=??lAH)m?e:??DW???Qr????1?u?X?J?
??a?o+?B??+?qN at R^u?	*ZL?????1?S??4|??A?????vq(??o???{I?4?-???w?f?$?t"
?????;?m}?>??F?? *e??s?	???"?Pc+???h????]g??xE{t??o^???c??[9
pi????
W??`Nr?a2#m???`w???.?2??P?4,ZO
<}4?&h?????????????7???XX????K??????????=????????
?>?	???|?????kK???????????`a?V?5@?y?????????/{??;??7?|???y??L at O?+H??????n????w??{J
?*V?~?'??t??z????m./7?W??/.??0??Js???????}?????x??????????O=??V????7$!1??/&
z?PVO???:?<???$?jtQ?	1?L?{?b?3??^??W??C??(S$??>??3??lP?
{?/=Q??h?(?'???!????G	(Y??a??l#`l8P!?9q??v]]?????O?$?ldQ??H??U??(????H?M??o??yw???S??????~{bL???????8C??8yjkc??(??b????o2g?z?y?????^???5???w??????=??nowg#	y4e?	Y??????_3g7?
?Y???>??1??g?????}??8?!
??????6?+??{T?G???w#?W?j??1N?????8??`?????????^{s???j^=??????I?pg4???}?*????
?k?!UG???ORo????????G?`??1#??(??EE??K???B8`
G>zqsoa1??.???t??W)?4???????+J?.F^???x?^{]|?j?>?A??S2??
?e??>????i????%??9?????Zl}K3u?O]6<??1???x???????t~w8?}h6Z??h???mt?R?ax??	??2>?*????4J?
P????kGbmf-?
=??h?@?q%?V\g??Vc??X????????>??~@??VM(cX
m"?[?8?a4? iO]????-PK??^?
(\{??~W????:DU?????Ez at -??[??4C???XT???U??#Wg)?0??>iB??e?^????l?
??T<?#
??g,??*??(]??w
??_l?q??x????j
??2,WV?XH??!?r?-????????U?\?sY?F?XoB??QP???s?s?K?68
h9l??,T????vy\???7	?Z]?????Msv[2?en{%m???~G?b
g
?
?1J?j?^???;jx??A???\??_(??Xk?[?lU???G???T?!?A???
?????@?J???????e?????2????a%?I????a???????????(??w[?u???(?~?#?
?? ?
tfG???{??=?,q???????0!=r?IGe?????9"t?t?>??J8??????m??p???FY???/3!?{???ueH~??+??+???w????kl??|E?8?5;????_3C????;AX???>[o??COO????)'?)!??d??{EJ???&????	?????_M????I$?}??????'?Z??????hD$???%EW!=u~O?j?J?g?????(??????C??p??e????W???(7????G?8o?T???)?G??!A???J$C?i-??Q'?????i1?r????????|w??
5?Q??0,B?H
]Mo????????,?f???>?Y?\kR(???W???T?????/?????&??G??kz?A?_?K??S???j.S?+??1zz&??l]?X>3?6??????41?O?'???????Bv??Q2???(M$o??}
?9?M?C??d???.f?&]??x??V?M?c?5???????Ug?M"?w?7??r????D????????%???{???X??s?X{?=??"?t?o????mPi=?????J??S?????zc&>*M?!gz4??0Rif??iNO?\?8???Z=????v?>Pt?k????????????{?Z]???^$???
??????&/??~O?&?x?0#??:O?BB?H?BOF8??~???Q?????Cs??rN.?Q???N???>2+a?T???i?(?8?*S?????We?tO????$?=????]?+=???????*???]???
ti??~|!u??kw?0<??
?@?f?J?_?]	N??W??c???T?|??Kb????iX??2W.????^?:???b???O
&???1?J???Z?qNG?@?N?t??h?w?v?w??{??????Q#???54E??????b???z?
Wd???????+???v????????,???}-??#?7F?U?????M???2???1???	!???;a%??0U?6???????i:???|?z??4??wTU???G
??HS*'L???KNlY????$+?:I?]9??S[?s[?g???=Q??DF+???SZ?M?(-?P??D?`??????I?UR??i?????{???2
???????k?B??I?e??q?JBR??6?
A?`??b??#?R?6W??8????DWB??c?i?8?5?0?Hva?dV2]F??Z??????CD?x?CD/?Ey?K?j?T5E???R??#?^?$?x?B??M??
?x?w)?M}?H??H?$=?????d????|??????????7????[??x].?,???.?L-?sr#?t???????rS??_?H4?d!S?Wi??x??L???6???#?E9?+8&?F6?|q]MN???]q'?1??SC%?vj?6??ns??$??NM???H?0?????B%?????3?#?????P~f??i3c?+;7??zn
4%^|?'|m?????{?1?6????K????@
e(?\H?t_:?K^?5?0l%??:3???s??y???D]?@?:?Q????VP>????S???D*x??	?o???xyC?Uk(U1!??????&=`?H????0dB??:Z?A??st?E???ux?`9??meO?ZY?'?h?E2??G@?Q????81?5????[qn?n????eB???z?z?{2??^???????[?!?????+?g?_??9????????d??:#??M\???j?1????]w??>&N?????AJ??????Lys?D????
a????O"?JW>???????znt/?un?????L?u?N`U???????UQZ7??a?Q
??'W]???H??H???_??????l?=%?(?e?E??d??????fkb????9?|E?????Y??xC?_???????]?rk%?U
e(SD?a????y???qG??"?76???????b??3?
??z	???-???'?????Y??\?-??C???????D?%[???6O\#m=)
{
$?t??.G?kP2?????? ???????g|\L<k?????????P????T??S?A??m?&???8
???????

87?*?S?^4?g????[.p???oz?YP{?s??7??y ?f?0?????-?v?k?n?
????e?????~_;
?3z?I8?????U???????f??kJ>????????????)??
???N?2?)?5???d^??"yF???1e?B?3??YlHfc?%:Y?-?dG?????o?;??)??1?$q????W??S&\?xi?DJo??l??3yN??g??)??_??????3??????n?S??????!1??x?t~)?"????|???4???Gq????????????7_|Uf??????
?4'gF?
???X???L??@?k???^??????H?k.???s?M??????hC?'z?????73??[xV^d??DAgc3??;s?LEPH???p)Yf???6H ??N??&?}??-??X?C~??|Fv?S<??=????????MKsECjJ?W0g??4B7? ?k???e?Dj??A???7?w?????^??3??$+?t??\3?:2??????sn???????\?r`???Ud??k??????<H??wF	?=y???	?3&?w??????k??DV???Sr??Q??w?cAf?zd??e???s??}V??f?Y9??k??;?!z??B|
??8K'?2?_?p?~Y???)?+?"!F3=??G???e?L?E?"??????SY,??e??????E
???`??` ?j?
IV??????RSg??JM=;???G+?@???X?N??Yo???c???>??e???~,???7????K????????(????\2?c>?D?L^??t?K&?~f>???R&???Bb]jwA?????gtA??-??K&?}z.T???KfX??|1????Kf???\?I??????N3#9?7-?????La??)??t?????T`?Y?r???????%?v:??/S4RY?%??~??Y?R#m?ig?7?eSv?=Z?
';??U?`S?????
?3???????[cHO?_????.????????i?[?E?H??@D???s??xl6(???h?h???0??A?? ?yz?X???&EP?M?&??N]????u?x^????Il.r?@?P?i)
Q"Ce?P?J?U at RI9*?e=T]?;S????Y?#M??J???i?:?	??.??=?_??o?kU????pgZ???????eP5={7?2??8?#?}4??/??@?3???P8b????W9???qw2<Xc;??n?_????g??8?k?m??E?
??+??\4?C????^??/bG
Y??
?Xq?C@#ot?wc??&??j,M??m???/????+?rg?23???\?W@??"??&????RXY_?????l6???N????HK.???ds?J/_??9?*%?
i??	/x??????<?????x#^??AIB????????w?J???;???J
6vw???G
*~?
? ??U??P
??????f?~ZJ8#qgg?????C]?.????*??](???J?$??<???l?"?.im?+??t?9???????tT&?E??Z??<?o?)?HN??G?9?u)?????w?=X??,?
???????????????w?9?e???Z?+Q?R??2?K?p*;??c/??.?v??{?$?x?N?<????????????A?;???????W?J????d???)???d5????(K9M?z?$F%K#f????&?]/?4+EXqc??j\????H?:????C????????7?9??Z?p?????C?9??\[?E?*@?R\A??Z?%????nl????m*?.?i??E?Z??M6???i?x?B?Yw|/??m?W?+???>? {????0??X?3?Nl???mw.1??O??0????????>)????????h???????!-&\?\^?? L??Y????{,?a`???$??|?b?_??7"8w>?1'?p??TV\?pz,%???_6?4/c????i=\?p??LE{o?~?u?D[???f??DY?9?{????mV?g??S?V?#?"4z?@
k????	?nE&<????h<	9??"?lo??Q:>?????n???h?Pw?N????d(???M\;u?C)?IG?c cA4h?n?$S?[?p?r?
Iu}|???X7??!?2?TX?}?C?b???#S??\?7o??)????R????6-FP???7DS{???ej?? ?????y??L?Sq1W?????/??(%s???Xi\a?&???D^9?U??
??.???!r?;t_?8??}?S?*"
?M)1Oj???????R?uh?Ds&?@}"??['@?g???+W???????}?]?a????D???F??*???????*???|o?Z5?p=??p?^^O,???6Mi????*??Y?4??????,1?Z??]?q!??????.?cH?o=l?y?Y? ???$??9?-?????]y?f(0???????tQJ
	????	C????EC.??J????-?Qr?y????6~?uv??
t??)CWsY*,'f??????&????l-?\??W:???????????????{??|???Je
??5?6?P?(
=?e?n?Y=R????/4?{G?--p+??7??????I???
???7?e???~?a?OU
???c?	Kb??????{?+?G?K??_3?.26?	j?????h?bN?}l???R?vb6M?|q?$Yq!?U?!Rt?%"?%}????,?H#?I???P,??W??????C?d?*??i??/???AbE????W!????)l??T5?_????W?_.?&?C?=Z
???
???/???b???"?C? a??~wB**l??9???;?C????????????zw?U??<????L??????<??b?)??PVl?Q?tq?????~Z
1t~Zu?????????(ciA?A4N?\7?eX\1?????????N????6?hh2???????E?
x?w????FIkOIe?KqU???iY?\^6UD
?QW???8EP?Fo???u)3Y?I?{G???T???????WE
????5<D`y*S??z???????0??9?Tl???_T?:}<?>~???yw??????"???r?{??fO:9]?[??~?`tSQ?	k??*#?y?'J??~?8??j?zz?8
?????Y??!:???q??1?I"?t'x??	9c???r?u????Q??%???Cg'?N?rD?+>[*:?r
?=oY??c?\?f$??a??_???ct???chDf????8K6<Y??B?G2?`?:???????$?????^ ???u^X,?fJa??1?b
	E????
?I^?U?&?	J?i[&?9???DM???vD??(?:???gq53??V M????|?#H??V:O???5\?k????f
??W7V????)>t??@?H2????CtI?`?
?\kp??????)?@|???3?E?WK???S~/?^?%?	????r`8?.'??XIs?w???Dca?!?%?*?iI????a	O}q2??{q?u?!?)`???Ip
?
?Z??
???U at Q??H????$??????7????D???g??????_??????Gg?nQ?Q??	t
?td?w0i;O????
??lc??UA????W?_a?????2????-??Y?<??]??*?kh??*?TX?v_?F7kr????S)qak??????'}?mO??f?V?? ??????????z??!??????w??pr?O??x?]??\???AX?????K????'?x<?6???????{k???'U??1p??dK??:g?C]?]Z?3?1??*?????????R?T????r???A>??g?g]>!\??=?)? ??]?7?8t?C?;??D?d:#
?R/?H????W3??????\?$??SY??y;n?????>?b?a??+???C?W6?6??@?.?????Bj???h???T??<??R
??nf-???}??M?8?E??Y=j?|?M?3X6Q?}+v?????"pC????2?Xt??!????0???G??6Q?-??1p:?(.j???-???+??Sb?\???(G?}??}pp??pp?O%?Vq)%CV??D?$.|q?cU%?8?hH?
F??Q?e(d???P?i
??O?
?c????D??`fI????O?@??;????U?
&????4?????/?????????v???}O~8n<?[?V???Q?D?M???[#;???????NDZ]??Z}]????-)?G?(??????b-??7??z?E???9??)?0???a???????????w??Cfy??KN??{??`?}X?????eWW K#.KN1'??2?'??
??e[2?
????e1+F
?%?x??+C??????d?????;?>2??!??obzH???????+?
?a???PI?B7??D???????VU	o????F??zV???!?`&E?P8YV?.]???w??T??8??)?????-t??'?D??w?^n?'??????]e?:??????
????Y?????T??R%?bk??<?#????y9????t
??d?W??l?6??B
+?B[L?A????%?	*??6?s??z9H???g$?/????v0n??????oZZ?????:
?T
?{??k???n?????6?^???N??I:???8??6?	??6O&??R]???Mq?????????!?f? bY??;?h????????oC????##?rCEt
=??M1?"???@?h#???E?G2?1?o??/Z?AVrbXo?9U??+?R?<(??T#&?%Ij&,?l??]???hjVjH?n???0?7?c2??F?4Q??n
?`h?-d??!?Ru?_!????PQ\:?0?????tYf?&?36??@:p???'f????
?_??y??I?1??G%J?z.?M??!O?`?i-??5?????)I??z?',?S??WI??+c?`?7??*??? ??K/?j???5????F9<+?K??<p???)?[?'??????xk	??z~?z=T??;=???g?l??w????+k0????ru????\????D&??hU??????0??T=?
u??d???VF7??1?`??Cp
?W[??S?=?? ??'????4?kIq?x?.?L}?A,?]{?k?d????'|???_?n!????{}?.??}e!<??????`????
?8gue?:?J???b?m???9?4????0k???r??0V????!%?????????J???Zv?dp?????r]K=M?P/???>?	EqQ}FNQe????d,?????K??X|Bz?m;?
sf<?xf=?NN????c?
oe?J??3?h??moJ1???Z at x?????#?]?????\'?_?g[)Lm=?7DpG??v?g???<??????p??n;?@'?????;?yB??C?&]8?w	??rII_$Dz??E??M??-?h??=5+??*9?C????X?I	cBKO??.&v"?????b???????OZL?XJ+?cz???p?FT???????
???vi??t#?3???&C??(?@??x???B??>??T
5????T?32??3#??dM<?~5??????;_??JzV?p??g<?????SLmJ??????~zA^??V?~=?q???_5????? ?K?Wd9????[A/k?D????(????o?b8\??iO?<QQ1?Hf5N?dgV,? :f??6CM??T
(??0????????9???;?P???<??m>?
?
?????????fI?Ct?Z??????
??<??JN?? ????rC?t/?????^?2????~?C?8?????}}??D??????????z???L?]? ?R`
??q?
?u&}?l?X?Y%<?
o?vC?Z?*F??????z:????J?!??????4j<~???[????wS??DV?`?X?W??
??=??
\O-?c?d? ???f:!0`?G??0S???Kd?L?I?2????????(?A?~???????O<Bfa???C?}|q?{|t??3}?O
??r4??n???9B?u?G
/???>??W??E?-???D0l?-??ZFL???!???????w?S[???]??f?gQx???h?j??Z????O+Q?(?EM??V???1?U>?2??#??$+??7ia?E?=4???M??W???a?p?E?B??!?2??"?	?E(????1?fI'AN?? ??'K(U(xQ??F?|?e??2?]3aZ??E>x-????0???.F?B}F?M??C??f?vs???^?e?f,OD?D??
iZ??:;??H?V*?x?wH?#)??????????:]5n+
N????$?P??'?zC?7??W>????L
???+r?????)????????'??????
?7???[???3'?{gg?f??GJ?4A??v?R????q?^,?yK?L???
??0B???.^???dD??^???LR?????x??]??y??K?
M?H?B?<????5?":????E?q??7o0/?x?6??=??kG?)0???,hGy???'M??%k1O?B1|#?h}ZB?>?Hm?%???E???\??L"e?????e?c??Xj7?'?1??|?b;?b?q6yuCj)(??*?*???;??_??\????*?&??^????HjCJ????sE????-8-???GF
?!/N?
4b????????????Q???v?8?N????=W?w?C7??N????n??	+?N????bj
?GMy????9??s???0C?a????%C
??J	*xr_%??Xx??Y?{?X?$??????l?-?HS|+1>?)o???GVK?!m18?t????????5P#?%?????
m?n???(2?8??????J?W^}?0??l?zW?????????^w??x??+??#z??2?`??teT,?? !V??v-$ N?u???_????SV????@N@x3?????E????K?WF??t?\??X???c????t??+V'??f??$yA?h?B@??(?3????l>?
???pH?f/?_c(???|c?Je?9?.??-?%z?z?[f??}$?t?
mM??`H?e?
j??Wu t??2?Qu?r1?-??j??????h?U?&???x-6EM??????????*????Z?7E?&(<?W?R??+j8???&#PP??,?I?wcq?Ao?<?????`?????|???????b<???R??[I??i??[????
}?fRD??X????5????Y{o0
?9?S?????l???J?l????w&!?^???~??h?%??IQB??o???\?U????????!~-?a?0?eJ?????
,:?R	K?@?????q4?Y2G3?^#???Z??\][?x??T??\?Udc}?"?%Q?"?p.; \]{???C??j&?w?F??b?* $8??????Cb???U0%???h?`?? #????b?x???sA.
?"?{???
?L??Q???(??
Md??w?r???? S??u]??T??-?:??Ca????&?????????<*???.r????sc????!"??_#C1?aL
?'&p???GL\&?:7ig?'?^???z??+4?d)?;??????????@
??;?????~???O????21???"?!U?c????w??7?k??#??H??`??<?R???G??T/?r?s???????*n???n??
/fn=<H??+?z??M??,n???	v
???
?W2l3??s
?G?0?-????W?Tr??'???#?^h?}?G?:
???)%??,?*????2f??)dFG}~?"?E?Cc at 2%ENm*	D\?
6??1?p5SK???t[??/?f??_?P?]??f^??H???c????????R?zpqZE?O??????p?L??T)!???????????+?ox???|?9????(?!w?enG????Q??llC?0?V???b??)/??Ak?9?"
sK??O??q?
?J%??^??+
?m???R?"??????G???*???h????Y?^?Z?\L?M??q?G???????W???#?R??p?(???/?VWD???OY??g?????
?e??
9???D za?lr\d9??R?????K
?/????n????g?r2??'??y?h??_MUOl?p??4?fZ?!?a?MF???j?knb????????????x???%?tn?L=?$6?R%?t?fF
a?<??]&?]KM?????a,
?X?L0???5?b#????%
?h;?c?bx
????????????}#t%f1?
?????????z???????Z??*e??Z?%~`???8c,.S???F??]+?%E??P??#IU?r?8?I????FE?T??s???{?????_o?t????jc??????z
???????????????7???? ????%?5Qk??
xlX???2???^?ABP?????4????|?n??'????G?P???????{?u?x?
&0???:Z??????7i.>m
t>???Z???"?1D??g?z?ck?????N??]$????n?N???s4e?<?O??]?g=l?M??8?<}????U????//??"	???k????W??f???????????$???
?&	???n\w??HU?B?y?xw?
&>CQ????????_?J?,?3?,_?[????v??)`??o???o4?????:?????????4??6????!?'C??|?/??A???$t??
??+????S[??rW?aw}!f&[??????w/]?#;T?d?-?L?`?o4[k??Z?dV???3_z????2Os??7k?
\???:|o??_?=??????ug?:?????z???r?/)?~v??d???{]????Or?k??/zl??c?

????XK:C??G??;???!&e ??????$?3?d?J&?_?-T????w????? ???a????%??????[??r?????L1??
r9?.??4????)$?4wCU?T????DP?w5tB??z?p???zD???????z)?`??S?{=??????e1p?!?3	{??x??T??\?}??????hW'?
1???\?^X????V???9??????N	??,?????N?????F?C??V?J?2y3???p??<???f$??????h??????/y?ZS?;F?c?J??-w?????c??B??~?3?x?????Y????6??6@y????? ??1???Q?????v9?h?YA?cr?}?}?^U??i????dOKE7?Z1l?-?x?\@t??+3n+g?Va?rxo??????{?????M????????????S??-?
w0?QJz??
Pb?X?????I??PD?
6??Y?,Du???-
??Am^x?U?????K?e???L4???EA???J?????|??;??J????k????:?>?

?:??U*?ocm?????=?5s??c\(??,?
?jx???k?}4z?7IA???ue??T??^???R?[???_3?o??9??j????????(????n??h5??|?	?w????@f*??m???V??k??7??F+?Y????o?n???U???*?/??????V??G??;?GQC????@Q^????N{?A??P
?]????T6????6>?????JQ??Q?}`?;???f}?J???h?J??????	/6????:?h?u?`)?_??_??A????????N???\z?8t????Y???? ?o?[?????m?|C?(??H=?R	????X?=???4?Z? ?<q2??%??@????[k??K?cA???@?(?8C'??^??Fd?K?zr?E?N?
?????5 D?q???
???l??e<???m\??m??????m???V7l????????[=?q?~?g????h?#{r???Q ?b????A?6??T{@??8t>??w`x?m?*?J??X?
G?-??????C(?????&?????????<??{??}9?h??]^?M^/??c_???Sg???hr????;Ft??%??Bu??????z?{??@??????54??;??8?[.????nw????mEX0???qBlbUnDP????1Ae?y>??l
/c+Y?N~??;?dT^?Z^?:^]m??~???!=??8p??AR?R?G?s?5R????l??F]?0??&?j?/;?????>4c?5???????T?O?QZ4?1gZ}??????2^v[0G??>??{?????^?m???V7[??u?L?J{?Z?????/??6?l_k?????5????*??1??^?????{?!z?O$~????.????W??5?q'?????Y??+??u?p?T??y??x??#??z}????????M????V??~N???
_7?T?z?@????Jc????
??S???J????x??]r??+?????(??-??~??>?YK????????h??A?|(???f
?}{Wr
)??L???qg?&3Z?????^{????2q???bS	???v?????$h}??\??=?Q?2E?????,?-q????D)?????:??{?????^???Z????????B5?a?????f
2Q???ZB??KIS?pZT2??<???.H??;?e???xA?(E?'?z???????%+??e????2`b?k????_7?k??????u?????x?_??k???$????A?{nP?U????k?^??E???)LH?@??o=???-????UQ??V*??M??Xp??*??5t
W??:???5???U??)??UX?
????????9?k?)?/?H?_???\???9d??|???|??`$??????XM?????>??????W{CD??`???4\i?$z??cG??{{G?f?z,?<s???c?d??nXO??Y8??B<%?#V0?c??V???n?6??R?G\??\5
?V???n??Ff\???%?^zo???0?????}(?????????????bHG?3Zz????
/E2?T?	?^???*??????a>???rI?????3??E??????
KJ1#???????:2Ou&?FLP?}?7?? ??;<
?fC??[?3?@?rz?#Jl??z9?YE|Ad
&??????~?5??>?=y?g??gq??.??89?????????H???????!??^??ab}e???*??)???)2??l?8?q2???D?i>K?	?/???????}?????j???h?Q?o?o<??O(????D;??EZm???
???iUF???|>?q???????t.k?qr???????=?2????EK?%???Y??]??????)WB9?????3YN?9????????d??U???|c+?h?g??e)
,????????i?'????&?"???>??????:h??+??!??m???????<?{???
#9?w??n?7?_T?F9??R^??w???>?-?+??|S<pG?o?#?\?.?????gu
u???>v??#u?-t:Q?? ?H% ??:c?b?GP4?j#??x??5?9=?
?????&???????mI???????N(%?v?Wn/??r
????h*?S,v?r??v??????5`/w????,?'?Gt????A?q??vF?G??d%9????(???5S??+x
???i6????7???7`x??Ob????? ???Y???j???*h???Z??!?????5??__k>????????%r???????$O?g?g??????=e1??Bkw??)???X??G4i??n?uLR?GN??????????0????BQ_Qe?3???????????????O)?|??U???????s?Z?*e???H????}?o???????/???	0o?????????y9??+C7|?????S?[@?E8????j????_??(ODy??????;??$<b2??:y?#X5??p?a???;!??n??.?i?}[??2/????,?aC?%t{Qx??#????^
Ik?$	?
O??6^b_?????FK?`;D????"Y?	?H at p??????o?? ??x(??H????H??mA	&????1*)???????|?a?<??'?~?i??:`?:?4w?H0?\??K??y??
P???Z(????F?J???????????	%m?????????A
"k?
??t????p?//qi?	???t???/oa?A??w?Y|????/??e???n?8???Xp?#T?qO???????????????Y^?F?$??
???????<S????????????????vw?}???????&??9?a?	??
<?Q?T??w*?*?K+]????X[???/???ZQt_dV;?H?L???Q??f????6?p:?t??co???h??????q?
5u??/?????'*?X??v?9g5?i?4?Z5k??Y?????l????????M??0`?J????h7???w?^SU???z????_R	?G?P?????3-?^Q"?J$Wo??LI??$???????????^????^;????????\??De,?G?U?m10????OK????Z,)?U@?F??A?Q?ZZ;b+?????????5@ f??????Y??????\??8???m?C?x
;
v?t%???#????tAR?7$??r?ysxeX?m?k??]???U%?\N*K??\?K?%y?3\??ShHR2U"[?
Y?Qj????
??????\??3??V?7??a???s??@?B??5)S)j?f?RR4)??Q?C?Y?X???}?:?Z
???)???{??????+?!??klS0??r?)?
?Ln?? ?!gt%??~2???n????\D??v?-F???}9Q?*???V???w????e???%???????J/?h!*???+?f?~I?
?!?c?Oe??B?(???????????>{(????????W7o?{S??lxY??????]k?????


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 May 2006 14:20:43 -0000	1.13
+++ .cvsignore	14 Jul 2006 07:25:46 -0000	1.14
@@ -1 +1,2 @@
 sysstat-6.0.2.tar.bz2
+sysstat-7.0.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 May 2006 14:20:43 -0000	1.13
+++ sources	14 Jul 2006 07:25:46 -0000	1.14
@@ -1 +1 @@
-99ed143d7e753f0b2220baa115859b44  sysstat-6.0.2.tar.bz2
+cf5b64db32a1589f76462100101c1e81  sysstat-7.0.0.tar.gz


Index: sysstat.spec
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sysstat.spec	12 Jul 2006 08:21:36 -0000	1.40
+++ sysstat.spec	14 Jul 2006 07:25:46 -0000	1.41
@@ -1,11 +1,11 @@
 Name: sysstat
-Version: 6.0.2
-Release: 2.1
+Version: 7.0.0
+Release: 1
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
-URL: http://perso.wanadoo.fr/sebastien.godard/
-Source: http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
+URL: 	http://perso.orange.fr/sebastien.godard/
+Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.gz
 Source1: sysstat.crond
 Source2: sysstat.crondaily
 Source3: sysstat.sysconfig
@@ -111,6 +111,9 @@
 /var/log/sa
 
 %changelog
+* Fri Jul 14 2006 Marcela Maslanova <mmaslano at redhat.com> - 7.0.0-1
+- new version 7.0.0
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.0.2-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 08:00:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 04:00:11 -0400
Subject: rpms/sysstat/devel .cvsignore,1.14,1.15
Message-ID: <200607140800.k6E80BSK032743@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32510

Modified Files:
	.cvsignore 
Log Message:
change .cvsignore



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	14 Jul 2006 07:25:46 -0000	1.14
+++ .cvsignore	14 Jul 2006 08:00:06 -0000	1.15
@@ -1,2 +1 @@
-sysstat-6.0.2.tar.bz2
 sysstat-7.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 14 08:24:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 04:24:13 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch, 1.1, 1.2
Message-ID: <200607140824.k6E8ODIe022312@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22273

Modified Files:
	openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch 
Log Message:
more extern C inside anonymous namespace

openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch:
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |    3 +++
 source/uno/lbenv.cxx                                |    5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Index: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch	13 Jul 2006 15:45:58 -0000	1.1
+++ openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch	14 Jul 2006 08:23:58 -0000	1.2
@@ -21,3 +21,22 @@
 -
 -}
 -
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:20:10.000000000 +0100
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:21:29.000000000 +0100
+@@ -224,6 +224,7 @@
+ 	}
+ }
+ 
++}
+ 
+ //==================================================================================================
+ extern "C" void cpp_vtable_call(
+@@ -358,6 +359,8 @@
+ extern "C" void privateSnippetExecutorClass();
+ extern "C" typedef void (*PrivateSnippetExecutor)();
+ 
++namespace {
++
+ int const codeSnippetSize = 16;
+ 
+ unsigned char * codeSnippet(



From fedora-cvs-commits at redhat.com  Fri Jul 14 08:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 04:58:43 -0400
Subject: rpms/xpdf/devel xpdf-3.01-freetype-internals.patch, 1.1,
	1.2 xpdf.spec, 1.78, 1.79
Message-ID: <200607140858.k6E8whkp014528@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14477

Modified Files:
	xpdf-3.01-freetype-internals.patch xpdf.spec 
Log Message:
fix build problem with new freetype



xpdf-3.01-freetype-internals.patch:
 SplashFTFont.cc |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

Index: xpdf-3.01-freetype-internals.patch
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf-3.01-freetype-internals.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpdf-3.01-freetype-internals.patch	13 Oct 2005 14:23:18 -0000	1.1
+++ xpdf-3.01-freetype-internals.patch	14 Jul 2006 08:58:39 -0000	1.2
@@ -1,12 +1,77 @@
---- xpdf-3.01/splash/SplashFTFont.cc.freetype-internals	2005-08-17 01:34:31.000000000 -0400
-+++ xpdf-3.01/splash/SplashFTFont.cc	2005-10-13 10:08:22.000000000 -0400
+--- xpdf-3.01/splash/SplashFTFont.cc.orig	2006-07-14 10:55:18.000000000 +0200
++++ xpdf-3.01/splash/SplashFTFont.cc	2006-07-14 10:55:25.000000000 +0200
 @@ -14,7 +14,8 @@
  
  #include <ft2build.h>
  #include FT_OUTLINE_H
 -#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
-+#include FT_SIZES_H 
-+#include FT_GLYPH_H 
++#include FT_SIZES_H // needed for FT_New_Size decl
++#include FT_GLYPH_H
  #include "gmem.h"
  #include "SplashMath.h"
  #include "SplashGlyphBitmap.h"
+@@ -25,11 +26,12 @@
+ 
+ //------------------------------------------------------------------------
+ 
+-static int glyphPathMoveTo(FT_Vector *pt, void *path);
+-static int glyphPathLineTo(FT_Vector *pt, void *path);
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+-			    FT_Vector *pt, void *path);
++static int glyphPathMoveTo( const FT_Vector *pt, void *path);
++static int glyphPathLineTo( const FT_Vector *pt, void *path);
++static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
++                             void* path );
++static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++			     const FT_Vector *pt, void *path);
+ 
+ //------------------------------------------------------------------------
+ // SplashFTFont
+@@ -210,7 +212,7 @@
+ };
+ 
+ SplashPath *SplashFTFont::getGlyphPath(int c) {
+-  static FT_Outline_Funcs outlineFuncs = {
++  static const FT_Outline_Funcs outlineFuncs = {
+     &glyphPathMoveTo,
+     &glyphPathLineTo,
+     &glyphPathConicTo,
+@@ -249,7 +251,7 @@
+   return path.path;
+ }
+ 
+-static int glyphPathMoveTo(FT_Vector *pt, void *path) {
++static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   if (p->needClose) {
+@@ -260,7 +262,7 @@
+   return 0;
+ }
+ 
+-static int glyphPathLineTo(FT_Vector *pt, void *path) {
++static int glyphPathLineTo(const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
+@@ -268,7 +270,7 @@
+   return 0;
+ }
+ 
+-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
++static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+   SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
+ 
+@@ -306,8 +308,8 @@
+   return 0;
+ }
+ 
+-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
+-			    FT_Vector *pt, void *path) {
++static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
++			    const FT_Vector *pt, void *path) {
+   SplashFTFontPath *p = (SplashFTFontPath *)path;
+ 
+   p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- xpdf.spec	12 Jul 2006 09:23:35 -0000	1.78
+++ xpdf.spec	14 Jul 2006 08:58:39 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 14.1
+Release: 15
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -160,6 +160,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Fri Jul 14 2006 Than Ngo <than at redhat.com> 1:3.01-15
+- fix build problem with new freetype
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-14.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 09:13:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 05:13:09 -0400
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.31,1.32
Message-ID: <200607140913.k6E9D9EL017760@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17715

Modified Files:
	kdewebdev.spec 
Log Message:
BR: autoconf automake libtool




Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kdewebdev.spec	12 Jul 2006 06:42:40 -0000	1.31
+++ kdewebdev.spec	14 Jul 2006 09:13:05 -0000	1.32
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1.1
+Release: 2
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -29,12 +29,17 @@
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
 
 Patch0: javascript.patch
-Prereq: /sbin/ldconfig
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
-BuildPrereq: qt-devel >= %{qt_version}
-BuildPrereq: kdesdk-devel >= %{kde_version}
-BuildPrereq: perl
+BuildRequires: qt-devel >= %{qt_version}
+BuildRequires: kdesdk-devel >= %{kde_version}
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 
 Obsoletes: WebMaker
 Obsoletes: quanta
@@ -67,18 +72,11 @@
   make -f admin/Makefile.common cvs
 %endif
 
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -148,6 +146,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Jul 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
+- BR: autoconf automake libtool
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 09:19:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 05:19:37 -0400
Subject: rpms/kdeedu/devel kdeedu.spec,1.47,1.48
Message-ID: <200607140919.k6E9JbKj001461@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1397

Modified Files:
	kdeedu.spec 
Log Message:
- BR: autoconf automake libtool



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdeedu.spec	12 Jul 2006 06:39:51 -0000	1.47
+++ kdeedu.spec	14 Jul 2006 09:19:34 -0000	1.48
@@ -9,26 +9,28 @@
 %define kdebase_epoch 6
 %define qt_epoch 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdeedu
 Version: 3.5.3
-Release: 1.1
+Release: 2
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: User Interface/Desktops
-Prefix: %{_prefix}
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version
+BuildRequires: perl
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
 
 Obsoletes: keduca
 Obsoletes: kig
@@ -46,8 +48,6 @@
 Provides: ktouch
 Provides: kvoctrain
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 %description
 Educational/Edutainment applications for KDE
 
@@ -59,55 +59,6 @@
 %description devel
 This package contains header files for kdeedu.
 
-%package -n keduca
-Summary: Tests and Exams
-Group: User Interface/Desktops
-
-%description -n keduca
-Tests and Exams
-
-%package -n kig
-Summary: Interactive Geometry
-Group: User Interface/Desktops
-
-%description -n kig
-Interactive Geometry
-
-%package -n klettres
-Summary: French alphabet tutor
-Group: User Interface/Desktops
-
-%description -n klettres
-French alphabet tutor
-
-%package -n kmessedwords
-Summary: Letter Order Game
-Group: User Interface/Desktops
-
-%description -n kmessedwords
-Letter Order Game
-
-%package -n kstars
-Summary: Desktop Planetarium
-Group: User Interface/Desktops
-
-%description -n kstars
-Desktop Planetarium
-
-%package -n ktouch
-Summary: Touch Typing Tutor
-Group: User Interface/Desktops
-
-%description -n ktouch
-Touch Typing Tutor
-
-%package -n kvoctrain
-Summary: Vocabulary Trainer
-Group: User Interface/Desktops
-
-%description -n kvoctrain
-Vocabulary Trainer
-
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
@@ -128,15 +79,11 @@
 %endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
    --enable-kig-python-scripting \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -185,6 +132,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Jul 14 2006 Than Ngo <than at redhat.com> 3.5.3-2
+- BR: autoconf automake libtool
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 09:30:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 05:30:33 -0400
Subject: rpms/kdeedu/devel kdeedu.spec,1.48,1.49
Message-ID: <200607140930.k6E9UXdY012464@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12452

Modified Files:
	kdeedu.spec 
Log Message:
fix typo



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdeedu.spec	14 Jul 2006 09:19:34 -0000	1.48
+++ kdeedu.spec	14 Jul 2006 09:30:30 -0000	1.49
@@ -26,7 +26,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: perl
 BuildRequires: autoconf
 BuildRequires: automake



From fedora-cvs-commits at redhat.com  Fri Jul 14 09:43:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 05:43:58 -0400
Subject: rpms/kdesdk/devel kdesdk.spec,1.55,1.56
Message-ID: <200607140943.k6E9hwnO012657@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdesdk.spec 
Log Message:
BR: autoconf automake libtool



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdesdk.spec	12 Jul 2006 06:41:42 -0000	1.55
+++ kdesdk.spec	14 Jul 2006 09:43:55 -0000	1.56
@@ -11,28 +11,29 @@
 
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdesdk
 Version: 3.5.3
-Release: 1.1
+Release: 2
 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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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: kdesdk-3.4.92-misc.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
-BuildPrereq: qt-devel >= %{qt_epoch}:%{qt_version}
-BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-BuildPrereq: db4-devel
-BuildPrereq: /usr/bin/desktop-file-install
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: db4-devel
+BuildRequires: desktop-file-utils
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -49,86 +50,6 @@
 Development files for kdesdk. Install kdesdk-devel if you wish
 to develop or compile KDE sdk applications.
 
-%package -n cervisia
-Summary: Graphical CVS client
-Group: Development/Tools
-Epoch: 2
-License: QPL
-
-%description -n cervisia
-Cervisia is a KDE graphical frontend for the the CVS client. It
-features checking out a module from a repository, updating or
-retrieving the status of a working directory or single files, common
-operations like add, remove and commit, diff against the repository
-and between different revisions, annotated view of a file, view of the
-log messages in tree and list form as well as resolving of conflicts
-in a file.
-
-%package kbabel
-Summary: Translator tools
-Group: Development/Tools
-Obsoletes: kbabel ktranslator
-
-%description kbabel
-Translator tools.
-kbabel includes a .po file editor, a catalog manager, message extraction
-tools, and po file thumbnail views for Konqueror (the KDE file manager).
-
-%package kbugbuster
-Summary: KBugBuster - debugging tools
-Group: Development/Tools
-
-%description kbugbuster
-Debugging tools
-
-%package gimp
-Summary: KDE palette for GIMP
-Requires: gimp >= 1.2
-Group: Applications/Multimedia
-
-%description gimp
-The standard KDE palette in GIMP format. This allows you to create/edit
-low-color KDE icons using the GIMP.
-
-%package kapptemplate
-Summary: Tool for creating a skeleton KDE application
-Group: Development/Tools
-
-%description kapptemplate
-kapptemplate creates a skeleton KDE application (configure stuff, automake
-stuff, etc.), allowing you to start writing the relevant code instead of
-bothering with things that have already been done.
-
-kapptemplate supports both standalone applications and plugins utilizing
-KParts technology.
-
-%package kmtrace
-Summary: Malloc debugger for KDE
-Group: Development/Tools
-
-%description kmtrace
-KMtrace is a malloc (memory allocation) debugger for KDE.
-
-%package kompare
-Summary: File comparison tool for KDE
-Group: Applications/File
-
-%description kompare
-A file comparison tool for KDE
-
-%package kspy
-Summary: Qt/KDE application state examination tool
-Group: Development/Tools
-
-%description kspy
-KSpy is a utility intended to help developers examine the internal
-state of a Qt/KDE application. KSpy graphically displays all the
-QObjects in use, and allows you to browse their properties. Using KSpy
-is very simple, include kspy.h and call KSpy::invoke() when you want
-to looks inside your app. The KSpy function is inline and the main
-part of KSpy is dynamically loaded, so you may even want to leave this
-in the release build of an application.
-
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
@@ -137,23 +58,16 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -203,9 +117,21 @@
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -229,7 +155,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.3-1.1
+* Fri Jul 14 2006 Than Ngo <than at redhat.com> 3.5.3-2
+- BR: autoconf automake libtool
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
 - rebuild
 
 * Fri Jun 02 2006 Than Ngo <than at redhat.com> 3.5.3-1
@@ -238,10 +167,10 @@
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
 - update to 3.5.2
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.1-1.2
+* 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> - (none):3.5.1-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 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 



From fedora-cvs-commits at redhat.com  Fri Jul 14 10:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 06:01:27 -0400
Subject: rpms/kasumi/FC-5 kasumi-2.0.1-errorcode.patch, NONE, 1.1 kasumi.spec,
	1.15, 1.16
Message-ID: <200607141001.k6EA1Rdc027640@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	kasumi.spec 
Added Files:
	kasumi-2.0.1-errorcode.patch 
Log Message:
* Fri Jul 14 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1.fc5.1
- kasumi-2.0.1-errorcode.patch: fixed not working when the private dictionary is empty.

kasumi-2.0.1-errorcode.patch:
 KasumiDic.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kasumi-2.0.1-errorcode.patch ---
diff -ruN kasumi-2.0.1.orig/KasumiDic.cxx kasumi-2.0.1/KasumiDic.cxx
--- kasumi-2.0.1.orig/KasumiDic.cxx	2006-05-27 02:41:25.000000000 +0900
+++ kasumi-2.0.1/KasumiDic.cxx	2006-06-30 12:52:27.000000000 +0900
@@ -73,11 +73,11 @@
   const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency");
 
   try{
-      if(anthy_priv_dic_select_first_entry() == -3){
+      if(anthy_priv_dic_select_first_entry() == -1){
 	  // no word
 	  return;
       }
-      else if(anthy_priv_dic_select_first_entry() == -1)
+      else if(anthy_priv_dic_select_first_entry() == -3)
       {
 	  int anthy_version = str2int(string(anthy_get_version_string()));
 	  if(anthy_version >= 7716)


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/FC-5/kasumi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kasumi.spec	30 Jun 2006 12:07:12 -0000	1.15
+++ kasumi.spec	14 Jul 2006 10:01:19 -0000	1.16
@@ -1,6 +1,6 @@
 Name:    kasumi
 Version: 2.0.1
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
@@ -9,10 +9,12 @@
 Source0: %{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0:	kasumi-1.0-gcc41.patch
+Patch1: kasumi-2.0.1-errorcode.patch
 
 
 Summary: An anthy dictionary management tool.
 Group:   Applications/Text
+Requires: anthy >= 7900
 %description
 Kasumi is a dictionary management tool for Anthy.
 
@@ -20,6 +22,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .gcc41
+%patch1 -p1 -b .errcode
 aclocal
 automake --add-missing
 autoconf
@@ -56,6 +59,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1.fc5.1
+- kasumi-2.0.1-errorcode.patch: fixed not working when the private dictionary is empty.
+
 * Fri Jun 30 2006 Akira TAGOH <tagoh at redhat.com> - 2.0.1-1
 - New upstream release.
 - use dist tag.



From fedora-cvs-commits at redhat.com  Fri Jul 14 10:24:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 06:24:40 -0400
Subject: rpms/frysk/devel frysk.spec,1.70,1.71
Message-ID: <200607141024.k6EAOegL025143@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25121

Modified Files:
	frysk.spec 
Log Message:
- New upstream version.


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- frysk.spec	13 Jul 2006 18:12:34 -0000	1.70
+++ frysk.spec	14 Jul 2006 10:24:37 -0000	1.71
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.13.rh1
+Version:	0.0.1.2006.07.14.rh1
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
@@ -98,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.14.rh1-1
+- New upstream version.
+
 * Wed Jul 13 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.13.rh1-1
 - New upstream version.
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 10:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 06:24:59 -0400
Subject: rpms/frysk/devel .cvsignore,1.20,1.21 sources,1.20,1.21
Message-ID: <200607141024.k6EAOxow025289@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25259

Modified Files:
	.cvsignore sources 
Log Message:
- New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Jul 2006 18:12:34 -0000	1.20
+++ .cvsignore	14 Jul 2006 10:24:57 -0000	1.21
@@ -1 +1 @@
-frysk-0.0.1.2006.07.13.rh1.tar.bz2
+frysk-0.0.1.2006.07.14.rh1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Jul 2006 18:12:34 -0000	1.20
+++ sources	14 Jul 2006 10:24:57 -0000	1.21
@@ -1 +1 @@
-7a64a6dd6fb7cfeebd8988019ce74d61  frysk-0.0.1.2006.07.13.rh1.tar.bz2
+08212ee6d14d70f3e6731fa0d930f5a9  frysk-0.0.1.2006.07.14.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 14 11:02:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 07:02:51 -0400
Subject: rpms/cups/devel cups-svn5737.patch, NONE, 1.1 cups-direct-usb.patch,
	1.2, 1.3 cups.spec, 1.226, 1.227 cups-str1705.patch, 1.5,
	NONE cups-svn5706.patch, 1.1, NONE
Message-ID: <200607141102.k6EB2p6l019387@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-direct-usb.patch cups.spec 
Added Files:
	cups-svn5737.patch 
Removed Files:
	cups-str1705.patch cups-svn5706.patch 
Log Message:
* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-19
- Sync with svn5737.


cups-svn5737.patch:
 .svn/dir-wcprops                                                                         |    0 
 .svn/entries                                                                             |    0 
 .svn/text-base/CHANGES.txt.svn-base                                                      |    0 
 .svn/text-base/Makedefs.in.svn-base                                                      |    0 
 .svn/text-base/config.h.in.svn-base                                                      |    0 
 .svn/text-base/configure.in.svn-base                                                     |    0 
 .svn/text-base/cups-config.in.svn-base                                                   |    0 
 .svn/wcprops/CHANGES-1.0.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES-1.1.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES.txt.svn-work                                                        |    0 
 .svn/wcprops/CREDITS.txt.svn-work                                                        |    0 
 .svn/wcprops/INSTALL.txt.svn-work                                                        |    0 
 .svn/wcprops/LICENSE.txt.svn-work                                                        |    0 
 .svn/wcprops/Makedefs.in.svn-work                                                        |    0 
 .svn/wcprops/Makefile.svn-work                                                           |    0 
 .svn/wcprops/README.txt.svn-work                                                         |    0 
 .svn/wcprops/config.h.in.svn-work                                                        |    0 
 .svn/wcprops/configure.in.svn-work                                                       |    0 
 .svn/wcprops/cups-config.in.svn-work                                                     |    0 
 .svn/wcprops/install-sh.svn-work                                                         |    0 
 CHANGES.txt                                                                              |  125 +
 Makedefs.in                                                                              |   10 
 backend/.svn/dir-prop-base                                                               |    0 
 backend/.svn/dir-props                                                                   |    0 
 backend/.svn/dir-wcprops                                                                 |    0 
 backend/.svn/entries                                                                     |    0 
 backend/.svn/prop-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/prop-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/prop-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/prop-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/prop-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/prop-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/prop-base/runloop.c.svn-base                                                |    0 
 backend/.svn/props/backend-private.h.svn-work                                            |    0 
 backend/.svn/props/easysw-firewire-design.txt.svn-work                                   |    0 
 backend/.svn/props/easysw-firewire-linux.txt.svn-work                                    |    0 
 backend/.svn/props/ieee1394-linux.c.svn-work                                             |    0 
 backend/.svn/props/ieee1394.c.svn-work                                                   |    0 
 backend/.svn/props/ieee1394.h.svn-work                                                   |    0 
 backend/.svn/props/runloop.c.svn-work                                                    |    0 
 backend/.svn/text-base/Dependencies.svn-base                                             |    0 
 backend/.svn/text-base/Makefile.svn-base                                                 |    0 
 backend/.svn/text-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/text-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/text-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/text-base/ieee1284.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/text-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/text-base/ipp.c.svn-base                                                    |    0 
 backend/.svn/text-base/parallel.c.svn-base                                               |    0 
 backend/.svn/text-base/runloop.c.svn-base                                                |    0 
 backend/.svn/text-base/serial.c.svn-base                                                 |    0 
 backend/.svn/text-base/snmp.c.svn-base                                                   |    0 
 backend/.svn/text-base/socket.c.svn-base                                                 |    0 
 backend/.svn/text-base/test1284.c.svn-base                                               |    0 
 backend/.svn/text-base/usb-darwin.c.svn-base                                             |    0 
 backend/.svn/text-base/usb-unix.c.svn-base                                               |    0 
 backend/.svn/text-base/usb.c.svn-base                                                    |    0 
 backend/.svn/wcprops/Dependencies.svn-work                                               |    0 
 backend/.svn/wcprops/Makefile.svn-work                                                   |    0 
 backend/.svn/wcprops/backend-private.h.svn-work                                          |    0 
 backend/.svn/wcprops/betest.c.svn-work                                                   |    0 
 backend/.svn/wcprops/easysw-firewire-design.txt.svn-work                                 |    0 
 backend/.svn/wcprops/easysw-firewire-linux.txt.svn-work                                  |    0 
 backend/.svn/wcprops/ieee1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394-linux.c.svn-work                                           |    0 
 backend/.svn/wcprops/ieee1394.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394.h.svn-work                                                 |    0 
 backend/.svn/wcprops/ipp.c.svn-work                                                      |    0 
 backend/.svn/wcprops/lpd.c.svn-work                                                      |    0 
 backend/.svn/wcprops/pap.c.svn-work                                                      |    0 
 backend/.svn/wcprops/parallel.c.svn-work                                                 |    0 
 backend/.svn/wcprops/runloop.c.svn-work                                                  |    0 
 backend/.svn/wcprops/scsi-irix.c.svn-work                                                |    0 
 backend/.svn/wcprops/scsi-linux.c.svn-work                                               |    0 
 backend/.svn/wcprops/scsi.c.svn-work                                                     |    0 
 backend/.svn/wcprops/serial.c.svn-work                                                   |    0 
 backend/.svn/wcprops/snmp.c.svn-work                                                     |    0 
 backend/.svn/wcprops/snmp.txt.svn-work                                                   |    0 
 backend/.svn/wcprops/socket.c.svn-work                                                   |    0 
 backend/.svn/wcprops/test1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb-darwin.c.svn-work                                               |    0 
 backend/.svn/wcprops/usb-unix.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb.c.svn-work                                                      |    0 
 backend/Dependencies                                                                     |   39 
 backend/Makefile                                                                         |   40 
 backend/backend-private.h                                                                |   73 
 backend/easysw-firewire-design.txt                                                       |   70 
 backend/easysw-firewire-linux.txt                                                        |   35 
 backend/ieee1284.c                                                                       |   77 
 backend/ieee1394-linux.c                                                                 |  877 ----------
 backend/ieee1394.c                                                                       |  267 ---
 backend/ieee1394.h                                                                       |  103 -
 backend/ipp.c                                                                            |    9 
 backend/parallel.c                                                                       |  231 --
 backend/runloop.c                                                                        |  258 ++
 backend/serial.c                                                                         |  293 +--
 backend/snmp.c                                                                           |   37 
 backend/socket.c                                                                         |  299 +--
 backend/test1284.c                                                                       |    9 
 backend/usb-darwin.c                                                                     |    6 
 backend/usb-unix.c                                                                       |  301 +--
 backend/usb.c                                                                            |   25 
 berkeley/.svn/dir-wcprops                                                                |    0 
 berkeley/.svn/entries                                                                    |    0 
 berkeley/.svn/text-base/lpq.c.svn-base                                                   |    0 
 berkeley/.svn/text-base/lprm.c.svn-base                                                  |    0 
 berkeley/.svn/wcprops/Dependencies.svn-work                                              |    0 
 berkeley/.svn/wcprops/Makefile.svn-work                                                  |    0 
 berkeley/.svn/wcprops/lpc.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpq.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpr.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lprm.c.svn-work                                                    |    0 
 berkeley/lpq.c                                                                           |    6 
 berkeley/lprm.c                                                                          |   35 
 cgi-bin/.svn/dir-wcprops                                                                 |    0 
 cgi-bin/.svn/entries                                                                     |    0 
 cgi-bin/.svn/text-base/help-index.c.svn-base                                             |    0 
 cgi-bin/.svn/wcprops/Dependencies.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/Makefile.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/admin.c.svn-work                                                    |    0 
 cgi-bin/.svn/wcprops/cgi-private.h.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/cgi.h.svn-work                                                      |    0 
 cgi-bin/.svn/wcprops/classes.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/help-index.c.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help-index.h.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/html.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/ipp-var.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/jobs.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/multipart.dat.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/printers.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/search.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/template.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/testcgi.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/testhi.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/testhi.html.svn-work                                                |    0 
 cgi-bin/.svn/wcprops/testtemplate.c.svn-work                                             |    0 
 cgi-bin/.svn/wcprops/var.c.svn-work                                                      |    0 
 cgi-bin/help-index.c                                                                     |    6 
 conf/.svn/dir-wcprops                                                                    |    0 
 conf/.svn/entries                                                                        |    0 
 conf/.svn/wcprops/Makefile.svn-work                                                      |    0 
 conf/.svn/wcprops/cupsd.conf.in.svn-work                                                 |    0 
 conf/.svn/wcprops/mime.convs.svn-work                                                    |    0 
 conf/.svn/wcprops/mime.types.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.darwin.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.irix.svn-work                                                      |    0 
 conf/.svn/wcprops/pam.std.in.svn-work                                                    |    0 
 config-scripts/.svn/dir-wcprops                                                          |    0 
 config-scripts/.svn/entries                                                              |    0 
 config-scripts/.svn/text-base/cups-compiler.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-defaults.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-directories.m4.svn-base                               |    0 
 config-scripts/.svn/text-base/cups-image.m4.svn-base                                     |    0 
 config-scripts/.svn/text-base/cups-network.m4.svn-base                                   |    0 
 config-scripts/.svn/text-base/cups-sharedlibs.m4.svn-base                                |    0 
 config-scripts/.svn/text-base/cups-ssl.m4.svn-base                                       |    0 
 config-scripts/.svn/wcprops/cups-common.m4.svn-work                                      |    0 
 config-scripts/.svn/wcprops/cups-compiler.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-defaults.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-directories.m4.svn-work                                 |    0 
 config-scripts/.svn/wcprops/cups-image.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-largefile.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-launchd.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-ldap.m4.svn-work                                        |    0 
 config-scripts/.svn/wcprops/cups-libtool.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-manpages.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-network.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-opsys.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-pam.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pap.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pdf.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-scripting.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-sharedlibs.m4.svn-work                                  |    0 
 config-scripts/.svn/wcprops/cups-slp.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-ssl.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-threads.m4.svn-work                                     |    0 
 config-scripts/cups-compiler.m4                                                          |   66 
 config-scripts/cups-defaults.m4                                                          |   40 
 config-scripts/cups-directories.m4                                                       |    6 
 config-scripts/cups-image.m4                                                             |   24 
 config-scripts/cups-network.m4                                                           |    6 
 config-scripts/cups-sharedlibs.m4                                                        |   48 
 config-scripts/cups-ssl.m4                                                               |    5 
 config.h.in                                                                              |   11 
 configure.in                                                                             |   11 
 cups-config.in                                                                           |   14 
 cups/.svn/dir-prop-base                                                                  |    0 
 cups/.svn/dir-props                                                                      |    0 
 cups/.svn/dir-wcprops                                                                    |    0 
 cups/.svn/entries                                                                        |    0 
 cups/.svn/text-base/Makefile.svn-base                                                    |    0 
 cups/.svn/text-base/adminutil.c.svn-base                                                 |    0 
 cups/.svn/text-base/emit.c.svn-base                                                      |    0 
 cups/.svn/text-base/http-addrlist.c.svn-base                                             |    0 
 cups/.svn/text-base/http.c.svn-base                                                      |    0 
 cups/.svn/text-base/http.h.svn-base                                                      |    0 
 cups/.svn/text-base/ipp.c.svn-base                                                       |    0 
 cups/.svn/text-base/mark.c.svn-base                                                      |    0 
 cups/.svn/text-base/testhttp.c.svn-base                                                  |    0 
 cups/.svn/text-base/testppd.c.svn-base                                                   |    0 
 cups/.svn/text-base/util.c.svn-base                                                      |    0 
 cups/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 cups/.svn/wcprops/Makefile.svn-work                                                      |    0 
 cups/.svn/wcprops/adminutil.c.svn-work                                                   |    0 
 cups/.svn/wcprops/adminutil.h.svn-work                                                   |    0 
 cups/.svn/wcprops/api-array.shtml.svn-work                                               |    0 
 cups/.svn/wcprops/api-cups.shtml.svn-work                                                |    0 
 cups/.svn/wcprops/api-filedir.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-filter.shtml.svn-work                                              |    0 
 cups/.svn/wcprops/api-httpipp.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-ppd.shtml.svn-work                                                 |    0 
 cups/.svn/wcprops/array.c.svn-work                                                       |    0 
 cups/.svn/wcprops/array.h.svn-work                                                       |    0 
 cups/.svn/wcprops/attr.c.svn-work                                                        |    0 
 cups/.svn/wcprops/auth.c.svn-work                                                        |    0 
 cups/.svn/wcprops/backchannel.c.svn-work                                                 |    0 
 cups/.svn/wcprops/backend.c.svn-work                                                     |    0 
 cups/.svn/wcprops/backend.h.svn-work                                                     |    0 
 cups/.svn/wcprops/cups.h.svn-work                                                        |    0 
 cups/.svn/wcprops/custom.c.svn-work                                                      |    0 
 cups/.svn/wcprops/debug.h.svn-work                                                       |    0 
 cups/.svn/wcprops/dest.c.svn-work                                                        |    0 
 cups/.svn/wcprops/dir.c.svn-work                                                         |    0 
 cups/.svn/wcprops/dir.h.svn-work                                                         |    0 
 cups/.svn/wcprops/emit.c.svn-work                                                        |    0 
 cups/.svn/wcprops/encode.c.svn-work                                                      |    0 
 cups/.svn/wcprops/file.c.svn-work                                                        |    0 
 cups/.svn/wcprops/file.h.svn-work                                                        |    0 
 cups/.svn/wcprops/getifaddrs.c.svn-work                                                  |    0 
 cups/.svn/wcprops/getputfile.c.svn-work                                                  |    0 
 cups/.svn/wcprops/globals.c.svn-work                                                     |    0 
 cups/.svn/wcprops/globals.h.svn-work                                                     |    0 
 cups/.svn/wcprops/http-addr.c.svn-work                                                   |    0 
 cups/.svn/wcprops/http-addrlist.c.svn-work                                               |    0 
 cups/.svn/wcprops/http-private.h.svn-work                                                |    0 
 cups/.svn/wcprops/http-support.c.svn-work                                                |    0 
 cups/.svn/wcprops/http.c.svn-work                                                        |    0 
 cups/.svn/wcprops/http.h.svn-work                                                        |    0 
 cups/.svn/wcprops/i18n.h.svn-work                                                        |    0 
 cups/.svn/wcprops/ipp-private.h.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp-support.c.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ipp.h.svn-work                                                         |    0 
 cups/.svn/wcprops/langprintf.c.svn-work                                                  |    0 
 cups/.svn/wcprops/language.c.svn-work                                                    |    0 
 cups/.svn/wcprops/language.h.svn-work                                                    |    0 
 cups/.svn/wcprops/libcups_s.exp.svn-work                                                 |    0 
 cups/.svn/wcprops/localize.c.svn-work                                                    |    0 
 cups/.svn/wcprops/mark.c.svn-work                                                        |    0 
 cups/.svn/wcprops/md5-apple.h.svn-work                                                   |    0 
 cups/.svn/wcprops/md5.c.svn-work                                                         |    0 
 cups/.svn/wcprops/md5.h.svn-work                                                         |    0 
 cups/.svn/wcprops/md5passwd.c.svn-work                                                   |    0 
 cups/.svn/wcprops/notify.c.svn-work                                                      |    0 
 cups/.svn/wcprops/options.c.svn-work                                                     |    0 
 cups/.svn/wcprops/page.c.svn-work                                                        |    0 
 cups/.svn/wcprops/ppd.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ppd.h.svn-work                                                         |    0 
 cups/.svn/wcprops/request.c.svn-work                                                     |    0 
 cups/.svn/wcprops/snprintf.c.svn-work                                                    |    0 
 cups/.svn/wcprops/string.c.svn-work                                                      |    0 
 cups/.svn/wcprops/string.h.svn-work                                                      |    0 
 cups/.svn/wcprops/tempfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/test.ppd.svn-work                                                      |    0 
 cups/.svn/wcprops/testadmin.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testarray.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testhttp.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testi18n.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testipp.c.svn-work                                                     |    0 
 cups/.svn/wcprops/testlang.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testppd.c.svn-work                                                     |    0 
 cups/.svn/wcprops/transcode.c.svn-work                                                   |    0 
 cups/.svn/wcprops/transcode.h.svn-work                                                   |    0 
 cups/.svn/wcprops/usersys.c.svn-work                                                     |    0 
 cups/.svn/wcprops/utf8demo.txt.svn-work                                                  |    0 
 cups/.svn/wcprops/util.c.svn-work                                                        |    0 
 cups/Makefile                                                                            |   10 
 cups/adminutil.c                                                                         |   17 
 cups/emit.c                                                                              |   27 
 cups/http-addrlist.c                                                                     |   20 
 cups/http.c                                                                              |   25 
 cups/http.h                                                                              |   14 
 cups/ipp.c                                                                               |    8 
 cups/mark.c                                                                              |   11 
 cups/testhttp.c                                                                          |   22 
 cups/testppd.c                                                                           |   57 
 cups/util.c                                                                              |   36 
 data/.svn/dir-wcprops                                                                    |    0 
 data/.svn/entries                                                                        |    0 
 data/.svn/wcprops/HPGLprolog.svn-work                                                    |    0 
 data/.svn/wcprops/Makefile.svn-work                                                      |    0 
 data/.svn/wcprops/classified.svn-work                                                    |    0 
 data/.svn/wcprops/confidential.svn-work                                                  |    0 
 data/.svn/wcprops/cups.irix.svn-work                                                     |    0 
 data/.svn/wcprops/cups.pam.svn-work                                                      |    0 
 data/.svn/wcprops/cups.suse.svn-work                                                     |    0 
 data/.svn/wcprops/euc-cn.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-jp.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-kr.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-tw.txt.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-10.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-10.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-11.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-13.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-13.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-14.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-14.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-15.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-15.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-16.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-2.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-2.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-3.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-3.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-4.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-4.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-5.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-5.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-6.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-6.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-7.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-7.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-8.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-8.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-9.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-9.txt.svn-work                                                |    0 
 data/.svn/wcprops/koi8-r.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-r.txt.svn-work                                                    |    0 
 data/.svn/wcprops/koi8-u.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-u.txt.svn-work                                                    |    0 
 data/.svn/wcprops/mac-roman.txt.svn-work                                                 |    0 
 data/.svn/wcprops/psglyphs.svn-work                                                      |    0 
 data/.svn/wcprops/secret.svn-work                                                        |    0 
 data/.svn/wcprops/smiley.ps.svn-work                                                     |    0 
 data/.svn/wcprops/standard.svn-work                                                      |    0 
 data/.svn/wcprops/testprint.ps.svn-work                                                  |    0 
 data/.svn/wcprops/topsecret.svn-work                                                     |    0 
 data/.svn/wcprops/unclassified.svn-work                                                  |    0 
 data/.svn/wcprops/utf-8.svn-work                                                         |    0 
 data/.svn/wcprops/windows-1250.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1250.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1251.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1251.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1252.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1252.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1253.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1253.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1254.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1254.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1255.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1255.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1256.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1256.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1257.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1257.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1258.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1258.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1361.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-874.svn-work                                                   |    0 
 data/.svn/wcprops/windows-874.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-932.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-936.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-949.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-950.txt.svn-work                                               |    0 
 desktop/.svn/dir-wcprops                                                                 |    0 
 desktop/.svn/entries                                                                     |    0 
 desktop/.svn/wcprops/cups-128.png.svn-work                                               |    0 
 desktop/.svn/wcprops/cups-16.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-32.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-64.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups.desktop.svn-work                                               |    0 
 doc/.svn/dir-wcprops                                                                     |    0 
 doc/.svn/entries                                                                         |    0 
 doc/.svn/text-base/Makefile.svn-base                                                     |    0 
 doc/.svn/wcprops/Makefile.svn-work                                                       |    0 
 doc/.svn/wcprops/cups-printable.css.svn-work                                             |    0 
 doc/.svn/wcprops/cups.css.svn-work                                                       |    0 
 doc/.svn/wcprops/favicon.ico.svn-work                                                    |    0 
 doc/.svn/wcprops/idd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/index.html.in.svn-work                                                  |    0 
 doc/.svn/wcprops/printing-overview.shtml.svn-work                                        |    0 
 doc/.svn/wcprops/robots.txt.svn-work                                                     |    0 
 doc/.svn/wcprops/sdd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/sps.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/system-overview.shtml.svn-work                                          |    0 
 doc/Makefile                                                                             |   18 
 doc/es/.svn/dir-wcprops                                                                  |    0 
 doc/es/.svn/entries                                                                      |    0 
 doc/es/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/es/images/.svn/dir-wcprops                                                           |    0 
 doc/es/images/.svn/entries                                                               |    0 
 doc/es/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/es/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/es/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/es/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/es/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/es/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/es/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/es/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/es/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/help/.svn/dir-wcprops                                                                |    0 
 doc/help/.svn/entries                                                                    |    0 
 doc/help/.svn/prop-base/policies.html.svn-base                                           |    0 
 doc/help/.svn/prop-base/ref-mailto-conf.html.svn-base                                    |    0 
 doc/help/.svn/props/policies.html.svn-work                                               |    0 
 doc/help/.svn/props/ref-mailto-conf.html.svn-work                                        |    0 
 doc/help/.svn/text-base/policies.html.svn-base                                           |    0 
 doc/help/.svn/text-base/ref-mailto-conf.html.svn-base                                    |    0 
 doc/help/.svn/text-base/spec-raster.html.svn-base                                        |    0 
 doc/help/.svn/wcprops/api-array.html.svn-work                                            |    0 
 doc/help/.svn/wcprops/api-cups.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/api-filedir.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-filter.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/api-httpipp.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-ppd.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/api-raster.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/cgi.html.svn-work                                                  |    0 
 doc/help/.svn/wcprops/glossary.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/license.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/network.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/options.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/overview.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/policies.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/ref-access_log.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-classes-conf.html.svn-work                                     |    0 
 doc/help/.svn/wcprops/ref-client-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-cupsd-conf.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-error_log.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-mailto-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-page_log.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/ref-printers-conf.html.svn-work                                    |    0 
 doc/help/.svn/wcprops/ref-snmp-conf.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-subscriptions-conf.html.svn-work                               |    0 
 doc/help/.svn/wcprops/security.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-cmp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-command.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/spec-design.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-ipp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-ppd.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-raster.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-stp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/standard.html.in.svn-work                                          |    0 
 doc/help/.svn/wcprops/translation.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/whatsnew.html.svn-work                                             |    0 
 doc/help/policies.html                                                                   |  498 +++++
 doc/help/ref-mailto-conf.html                                                            |  105 +
 doc/help/spec-raster.html                                                                |   32 
 doc/images/.svn/dir-wcprops                                                              |    0 
 doc/images/.svn/entries                                                                  |    0 
 doc/images/.svn/wcprops/bottom-left.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/bottom-right.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-accept-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-class.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-add-printer.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-this-printer.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-cancel-job.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-change-settings.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-clear.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-continue.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-delete-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-delete-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                      |    0 
 doc/images/.svn/wcprops/button-export-samba.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-help.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/button-hold-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-manage-classes.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-manage-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-manage-printers.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-manage-server.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-modify-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-modify-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-move-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-move-jobs.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                         |    0 
 doc/images/.svn/wcprops/button-print-test-page.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-publish-printer.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-reject-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-release-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-restart-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-save-changes.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-search.gif.svn-work                                       |    0 
 doc/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-set-as-default.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-set-printer-options.gif.svn-work                          |    0 
 doc/images/.svn/wcprops/button-show-active.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-show-all.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-show-completed.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-show-next.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-show-previous.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-sort-ascending.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-sort-descending.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-start-class.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-start-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-stop-class.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-stop-printer.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-use-default-config.gif.svn-work                           |    0 
 doc/images/.svn/wcprops/button-view-access-log.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-view-error-log.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-view-page-log.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-view-printable-version.gif.svn-work                       |    0 
 doc/images/.svn/wcprops/classes.gif.svn-work                                             |    0 
 doc/images/.svn/wcprops/classes.svg.svn-work                                             |    0 
 doc/images/.svn/wcprops/cups-black-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-black-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-block-diagram.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-block-diagram.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-green-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-green-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-large.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-medium.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/cups-red-button-2.2.scm.svn-work                                 |    0 
 doc/images/.svn/wcprops/cups-red-button.scm.svn-work                                     |    0 
 doc/images/.svn/wcprops/cups-small.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-standard-button-2.2.scm.svn-work                            |    0 
 doc/images/.svn/wcprops/cups-standard-button.scm.svn-work                                |    0 
 doc/images/.svn/wcprops/draft.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/esp-logo.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/happy.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/logo.gif.svn-work                                                |    0 
 doc/images/.svn/wcprops/printer-idle.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-idle.svg.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-processing.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-processing.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-stopped.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/printer-stopped.svg.svn-work                                     |    0 
 doc/images/.svn/wcprops/smiley.jpg.svn-work                                              |    0 
 doc/images/.svn/wcprops/tab-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/tab-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/top-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/top-middle.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/top-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/web-add-this-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/web-password.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/web-printer-driver.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-printer-status.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-set-printer-options.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/web-test-page.gif.svn-work                                       |    0 
 doc/ja/.svn/dir-wcprops                                                                  |    0 
 doc/ja/.svn/entries                                                                      |    0 
 doc/ja/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/ja/images/.svn/dir-wcprops                                                           |    0 
 doc/ja/images/.svn/entries                                                               |    0 
 doc/ja/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/ja/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/ja/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/ja/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/ja/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/ja/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/ja/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/show-all-jobs.gif.svn-work                                    |    0 
 doc/pl/.svn/dir-wcprops                                                                  |    0 
 doc/pl/.svn/entries                                                                      |    0 
 doc/pl/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/pl/images/.svn/dir-wcprops                                                           |    0 
 doc/pl/images/.svn/entries                                                               |    0 
 doc/pl/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/pl/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/pl/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/pl/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/pl/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/pl/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/pl/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/pl/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/pl/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/sv/.svn/dir-wcprops                                                                  |    0 
 doc/sv/.svn/entries                                                                      |    0 
 doc/sv/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/sv/images/.svn/dir-wcprops                                                           |    0 
 doc/sv/images/.svn/entries                                                               |    0 
 doc/sv/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/sv/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/sv/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/sv/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/sv/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/sv/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/sv/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/sv/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/sv/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 driver/.svn/dir-wcprops                                                                  |    0 
 driver/.svn/entries                                                                      |    0 
 driver/.svn/wcprops/testdriver.c.svn-work                                                |    0 
 filter/.svn/dir-prop-base                                                                |    0 
 filter/.svn/dir-props                                                                    |    0 
 filter/.svn/dir-wcprops                                                                  |    0 
 filter/.svn/entries                                                                      |    0 
 filter/.svn/prop-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/props/rasterbench.c.svn-work                                                 |    0 
 filter/.svn/text-base/Makefile.svn-base                                                  |    0 
 filter/.svn/text-base/pstops.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.h.svn-base                                                  |    0 
 filter/.svn/text-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/text-base/rastertolabel.c.svn-base                                           |    0 
 filter/.svn/wcprops/Dependencies.svn-work                                                |    0 
 filter/.svn/wcprops/Makefile.svn-work                                                    |    0 
 filter/.svn/wcprops/api-raster.shtml.svn-work                                            |    0 
 filter/.svn/wcprops/common.c.svn-work                                                    |    0 
 filter/.svn/wcprops/common.h.svn-work                                                    |    0 
 filter/.svn/wcprops/form-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form-ps.c.svn-work                                                   |    0 
 filter/.svn/wcprops/form-tree.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form.h.svn-work                                                      |    0 
 filter/.svn/wcprops/gziptoany.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-attr.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-char.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-config.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-input.c.svn-work                                                |    0 
 filter/.svn/wcprops/hpgl-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-polygon.c.svn-work                                              |    0 
 filter/.svn/wcprops/hpgl-prolog.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-vector.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgltops.h.svn-work                                                  |    0 
 filter/.svn/wcprops/image-bmp.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-colorspace.c.svn-work                                          |    0 
 filter/.svn/wcprops/image-gif.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-jpeg.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-photocd.c.svn-work                                             |    0 
 filter/.svn/wcprops/image-pix.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-png.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-pnm.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-private.h.svn-work                                             |    0 
 filter/.svn/wcprops/image-sgi.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgi.h.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgilib.c.svn-work                                              |    0 
 filter/.svn/wcprops/image-sun.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-tiff.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-zoom.c.svn-work                                                |    0 
 filter/.svn/wcprops/image.c.svn-work                                                     |    0 
 filter/.svn/wcprops/image.h.svn-work                                                     |    0 
 filter/.svn/wcprops/imagetops.c.svn-work                                                 |    0 
 filter/.svn/wcprops/imagetoraster.c.svn-work                                             |    0 
 filter/.svn/wcprops/interpret.c.svn-work                                                 |    0 
 filter/.svn/wcprops/libcupsimage_s.exp.svn-work                                          |    0 
 filter/.svn/wcprops/pstops.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.h.svn-work                                                    |    0 
 filter/.svn/wcprops/rasterbench.c.svn-work                                               |    0 
 filter/.svn/wcprops/rastertoepson.c.svn-work                                             |    0 
 filter/.svn/wcprops/rastertohp.c.svn-work                                                |    0 
 filter/.svn/wcprops/rastertolabel.c.svn-work                                             |    0 
 filter/.svn/wcprops/testimage.c.svn-work                                                 |    0 
 filter/.svn/wcprops/testraster.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.h.svn-work                                                |    0 
 filter/.svn/wcprops/texttops.c.svn-work                                                  |    0 
 filter/Makefile                                                                          |   20 
 filter/pstops.c                                                                          |   95 -
 filter/raster.c                                                                          |  683 +++----
 filter/raster.h                                                                          |   11 
 filter/rasterbench.c                                                                     |  355 ++++
 filter/rastertolabel.c                                                                   |   13 
 fonts/.svn/dir-wcprops                                                                   |    0 
 fonts/.svn/entries                                                                       |    0 
 fonts/.svn/wcprops/Courier-Bold.svn-work                                                 |    0 
 fonts/.svn/wcprops/Courier-BoldOblique.svn-work                                          |    0 
 fonts/.svn/wcprops/Courier-Oblique.svn-work                                              |    0 
 fonts/.svn/wcprops/Courier.svn-work                                                      |    0 
 fonts/.svn/wcprops/Makefile.svn-work                                                     |    0 
 fonts/.svn/wcprops/Symbol.svn-work                                                       |    0 
 init/.svn/dir-wcprops                                                                    |    0 
 init/.svn/entries                                                                        |    0 
 init/.svn/wcprops/Localizable.strings.svn-work                                           |    0 
 init/.svn/wcprops/PrintingServices.svn-work                                              |    0 
 init/.svn/wcprops/StartupParameters.plist.svn-work                                       |    0 
 init/.svn/wcprops/cups-lpd.in.svn-work                                                   |    0 
 init/.svn/wcprops/cups.sh.in.svn-work                                                    |    0 
 init/.svn/wcprops/org.cups.cupsd.plist.svn-work                                          |    0 
 locale/.svn/dir-wcprops                                                                  |    0 
 locale/.svn/entries                                                                      |    0 
 locale/.svn/text-base/Makefile.svn-base                                                  |    0 
 locale/.svn/text-base/cups_es.po.svn-base                                                |    0 
 locale/.svn/text-base/cups_ja.po.svn-base                                                |    0 
 locale/.svn/wcprops/Makefile.svn-work                                                    |    0 
 locale/.svn/wcprops/cups.footer.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.header.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.pot.svn-work                                                    |    0 
 locale/.svn/wcprops/cups_es.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_ja.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_pl.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_sv.po.svn-work                                                  |    0 
 locale/.svn/wcprops/locale.txt.svn-work                                                  |    0 
 locale/.svn/wcprops/translate.c.svn-work                                                 |    0 
 locale/Makefile                                                                          |   14 
 locale/cups_es.po                                                                        |  482 +----
 locale/cups_ja.po                                                                        |    9 
 man/.svn/dir-wcprops                                                                     |    0 
 man/.svn/entries                                                                         |    0 
 man/.svn/text-base/Makefile.svn-base                                                     |    0 
 man/.svn/text-base/cupsaddsmb.man.in.svn-base                                            |    0 
 man/.svn/text-base/cupsd.conf.man.in.svn-base                                            |    0 
 man/.svn/text-base/lpadmin.man.svn-base                                                  |    0 
 man/.svn/text-base/mailto.conf.man.svn-base                                              |    0 
 man/.svn/wcprops/Makefile.svn-work                                                       |    0 
 man/.svn/wcprops/accept.man.svn-work                                                     |    0 
 man/.svn/wcprops/backend.man.svn-work                                                    |    0 
 man/.svn/wcprops/cancel.man.svn-work                                                     |    0 
 man/.svn/wcprops/classes.conf.man.svn-work                                               |    0 
 man/.svn/wcprops/client.conf.man.in.svn-work                                             |    0 
 man/.svn/wcprops/cups-config.man.svn-work                                                |    0 
 man/.svn/wcprops/cups-deviced.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-driverd.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-lpd.man.in.svn-work                                                |    0 
 man/.svn/wcprops/cups-polld.man.svn-work                                                 |    0 
 man/.svn/wcprops/cups-snmp.conf.man.svn-work                                             |    0 
 man/.svn/wcprops/cupsaddsmb.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.conf.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.man.in.svn-work                                                   |    0 
 man/.svn/wcprops/cupsenable.man.svn-work                                                 |    0 
 man/.svn/wcprops/cupstestdsc.man.svn-work                                                |    0 
 man/.svn/wcprops/cupstestppd.man.svn-work                                                |    0 
 man/.svn/wcprops/filter.man.svn-work                                                     |    0 
 man/.svn/wcprops/lp.man.svn-work                                                         |    0 
 man/.svn/wcprops/lpadmin.man.svn-work                                                    |    0 
 man/.svn/wcprops/lpc.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpinfo.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpmove.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpoptions.man.in.svn-work                                               |    0 
 man/.svn/wcprops/lppasswd.man.svn-work                                                   |    0 
 man/.svn/wcprops/lpq.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpr.man.svn-work                                                        |    0 
 man/.svn/wcprops/lprm.man.svn-work                                                       |    0 
 man/.svn/wcprops/lpstat.man.svn-work                                                     |    0 
 man/.svn/wcprops/mailto.conf.man.svn-work                                                |    0 
 man/.svn/wcprops/mantohtml.c.svn-work                                                    |    0 
 man/.svn/wcprops/mime.convs.man.svn-work                                                 |    0 
 man/.svn/wcprops/mime.types.man.svn-work                                                 |    0 
 man/.svn/wcprops/printers.conf.man.svn-work                                              |    0 
 man/.svn/wcprops/subscriptions.conf.man.svn-work                                         |    0 
 man/Makefile                                                                             |    5 
 man/cupsaddsmb.man.in                                                                    |   21 
 man/cupsd.conf.man.in                                                                    |   10 
 man/lpadmin.man                                                                          |   33 
 man/mailto.conf.man                                                                      |   69 
 monitor/.svn/dir-wcprops                                                                 |    0 
 monitor/.svn/entries                                                                     |    0 
 monitor/.svn/wcprops/Dependencies.svn-work                                               |    0 
 monitor/.svn/wcprops/Makefile.svn-work                                                   |    0 
 monitor/.svn/wcprops/bcp.c.svn-work                                                      |    0 
 monitor/.svn/wcprops/tbcp.c.svn-work                                                     |    0 
 notifier/.svn/dir-wcprops                                                                |    0 
 notifier/.svn/entries                                                                    |    0 
 notifier/.svn/text-base/testnotify.c.svn-base                                            |    0 
 notifier/.svn/wcprops/Dependencies.svn-work                                              |    0 
 notifier/.svn/wcprops/Makefile.svn-work                                                  |    0 
 notifier/.svn/wcprops/mailto.c.svn-work                                                  |    0 
 notifier/.svn/wcprops/testnotify.c.svn-work                                              |    0 
 notifier/testnotify.c                                                                    |   12 
 packaging/.svn/dir-wcprops                                                               |    0 
 packaging/.svn/entries                                                                   |    0 
 packaging/.svn/text-base/cups.list.in.svn-base                                           |    0 
 packaging/.svn/text-base/cups.spec.in.svn-base                                           |    0 
 packaging/.svn/wcprops/LICENSE.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/WELCOME.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/cups-dbus.conf.svn-work                                           |    0 
 packaging/.svn/wcprops/cups-desc.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups-info.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups.list.in.svn-work                                             |    0 
 packaging/.svn/wcprops/cups.readme.svn-work                                              |    0 
 packaging/.svn/wcprops/cups.spec.in.svn-work                                             |    0 
 packaging/.svn/wcprops/installer.tif.svn-work                                            |    0 
 packaging/.svn/wcprops/installer.xcf.gz.svn-work                                         |    0 
 packaging/cups.list.in                                                                   |   12 
 packaging/cups.spec.in                                                                   |    8 
 pdftops/.svn/dir-wcprops                                                                 |    0 
 pdftops/.svn/entries                                                                     |    0 
 pdftops/.svn/text-base/PSOutputDev.cxx.svn-base                                          |    0 
 pdftops/.svn/wcprops/Annot.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Annot.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Array.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Array.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/BuiltinFont.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/BuiltinFont.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CMap.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/CMap.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/COPYING.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Catalog.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Catalog.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CharTypes.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/CompactFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/Decrypt.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Decrypt.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Dependencies.svn-work                                               |    0 
 pdftops/.svn/wcprops/Dict.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Dict.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Error.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Error.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/ErrorCodes.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/FoFiEncodings.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/FoFiEncodings.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/FoFiTrueType.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/FoFiTrueType.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/FoFiType1.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/FoFiType1C.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1C.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FontEncodingTables.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/FontEncodingTables.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Function.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/Function.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GHash.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GHash.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GList.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GList.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GMutex.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/GString.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GString.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Gfx.cxx.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Gfx.h.svn-work                                                      |    0 
 pdftops/.svn/wcprops/GfxFont.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GfxFont.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GfxState.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/GfxState.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GlobalParams.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/GlobalParams.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/JBIG2Stream.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/JBIG2Stream.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/Lexer.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Lexer.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Link.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Link.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Makefile.svn-work                                                   |    0 
 pdftops/.svn/wcprops/NameToCharCode.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/NameToCharCode.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/NameToUnicodeTable.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Object.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Object.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Outline.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Outline.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/OutputDev.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/OutputDev.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/PDFDoc.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/PDFDoc.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/PSOutputDev.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSOutputDev.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/PSTokenizer.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSTokenizer.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/Page.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Page.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Parser.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Parser.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/README.svn-work                                                     |    0 
 pdftops/.svn/wcprops/SecurityHandler.cxx.svn-work                                        |    0 
 pdftops/.svn/wcprops/SecurityHandler.h.svn-work                                          |    0 
 pdftops/.svn/wcprops/Stream-CCITT.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/Stream.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Stream.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/UTF8.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/UnicodeMap.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/UnicodeMap.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/UnicodeMapTables.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.cxx.svn-work                                       |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/XRef.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/XRef.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/config.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/gfile.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/gfile.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/gmem.c.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmem.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmempp.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/gtypes.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/parseargs.c.svn-work                                                |    0 
 pdftops/.svn/wcprops/parseargs.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/pdftops.cxx.svn-work                                                |    0 
 pdftops/PSOutputDev.cxx                                                                  |    2 
 ppd/.svn/dir-wcprops                                                                     |    0 
 ppd/.svn/entries                                                                         |    0 
 ppd/.svn/text-base/zebracpl.ppd.svn-base                                                 |    0 
 ppd/.svn/wcprops/Makefile.svn-work                                                       |    0 
 ppd/.svn/wcprops/deskjet.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/deskjet2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/dymo.ppd.svn-work                                                       |    0 
 ppd/.svn/wcprops/epson24.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/epson9.ppd.svn-work                                                     |    0 
 ppd/.svn/wcprops/laserjet.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidat24.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidata9.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stcolor.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stcolor2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stphoto.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stphoto2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebra.ppd.svn-work                                                      |    0 
 ppd/.svn/wcprops/zebracpl.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep1.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep2.ppd.svn-work                                                   |    0 
 ppd/zebracpl.ppd                                                                         |    8 
 scheduler/.svn/dir-wcprops                                                               |    0 
 scheduler/.svn/entries                                                                   |    0 
 scheduler/.svn/text-base/Makefile.svn-base                                               |    0 
 scheduler/.svn/text-base/auth.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/client.c.svn-base                                               |    0 
 scheduler/.svn/text-base/conf.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/conf.h.svn-base                                                 |    0 
 scheduler/.svn/text-base/dirsvc.c.svn-base                                               |    0 
 scheduler/.svn/text-base/filter.c.svn-base                                               |    0 
 scheduler/.svn/text-base/ipp.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/job.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/listen.c.svn-base                                               |    0 
 scheduler/.svn/text-base/main.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/mime.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/printers.c.svn-base                                             |    0 
 scheduler/.svn/text-base/subscriptions.c.svn-base                                        |    0 
 scheduler/.svn/text-base/subscriptions.h.svn-base                                        |    0 
 scheduler/.svn/text-base/testmime.c.svn-base                                             |    0 
 scheduler/.svn/wcprops/Dependencies.svn-work                                             |    0 
 scheduler/.svn/wcprops/Makefile.svn-work                                                 |    0 
 scheduler/.svn/wcprops/auth.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/auth.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/banners.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/banners.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/cert.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cert.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/classes.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/classes.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/client.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/client.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/conf.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/conf.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cups-deviced.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-driverd.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-lpd.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/cups-polld.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/cups.pam.svn-work                                                 |    0 
 scheduler/.svn/wcprops/cupsd.h.svn-work                                                  |    0 
 scheduler/.svn/wcprops/dirsvc.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/dirsvc.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/env.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/filter.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/ipp.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.h.svn-work                                                    |    0 
 scheduler/.svn/wcprops/listen.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/log.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/main.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/network.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/network.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/policy.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/policy.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/printers.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/printers.h.svn-work                                               |    0 
 scheduler/.svn/wcprops/process.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/quotas.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/server.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/statbuf.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/statbuf.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/subscriptions.c.svn-work                                          |    0 
 scheduler/.svn/wcprops/subscriptions.h.svn-work                                          |    0 
 scheduler/.svn/wcprops/sysman.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/sysman.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/testdirsvc.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/testmime.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/testspeed.c.svn-work                                              |    0 
 scheduler/.svn/wcprops/type.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.h.svn-work                                                   |    0 
 scheduler/Makefile                                                                       |    7 
 scheduler/auth.c                                                                         |    9 
 scheduler/client.c                                                                       |   42 
 scheduler/conf.c                                                                         |  189 +-
 scheduler/conf.h                                                                         |    5 
 scheduler/dirsvc.c                                                                       |  110 -
 scheduler/filter.c                                                                       |    8 
 scheduler/ipp.c                                                                          |   76 
 scheduler/job.c                                                                          |  124 -
 scheduler/listen.c                                                                       |    8 
 scheduler/main.c                                                                         |    8 
 scheduler/mime.c                                                                         |   19 
 scheduler/printers.c                                                                     |   48 
 scheduler/subscriptions.c                                                                |  405 ++--
 scheduler/subscriptions.h                                                                |   10 
 scheduler/testmime.c                                                                     |    6 
 scripting/.svn/dir-wcprops                                                               |    0 
 scripting/.svn/entries                                                                   |    0 
 scripting/java/.svn/dir-wcprops                                                          |    0 
 scripting/java/.svn/entries                                                              |    0 
 scripting/java/.svn/wcprops/CUPSPrinter.java.svn-work                                    |    0 
 scripting/java/.svn/wcprops/cups.jar.svn-work                                            |    0 
 scripting/java/classes/.svn/dir-wcprops                                                  |    0 
 scripting/java/classes/.svn/entries                                                      |    0 
 scripting/java/classes/com/.svn/dir-wcprops                                              |    0 
 scripting/java/classes/com/.svn/entries                                                  |    0 
 scripting/java/classes/com/easysw/.svn/dir-wcprops                                       |    0 
 scripting/java/classes/com/easysw/.svn/entries                                           |    0 
 scripting/java/classes/com/easysw/cups/.svn/dir-wcprops                                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/entries                                      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/Cups.class.svn-work                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsJob.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsPrinter.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPP.class.svn-work                   |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPAttribute.class.svn-work          |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPCalendar.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPDefs.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPError.class.svn-work              |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPHttp.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPMD5.class.svn-work                |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPRequest.class.svn-work            |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPStatus.class.svn-work             |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPURLConnection.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPValue.class.svn-work              |    0 
 scripting/java/docs/.svn/dir-wcprops                                                     |    0 
 scripting/java/docs/.svn/entries                                                         |    0 
 scripting/java/docs/.svn/wcprops/allclasses-frame.html.svn-work                          |    0 
 scripting/java/docs/.svn/wcprops/deprecated-list.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/help-doc.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/index-all.html.svn-work                                 |    0 
 scripting/java/docs/.svn/wcprops/index.html.svn-work                                     |    0 
 scripting/java/docs/.svn/wcprops/overview-tree.html.svn-work                             |    0 
 scripting/java/docs/.svn/wcprops/package-list.svn-work                                   |    0 
 scripting/java/docs/.svn/wcprops/packages.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/serialized-form.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/stylesheet.css.svn-work                                 |    0 
 scripting/java/docs/com/.svn/dir-wcprops                                                 |    0 
 scripting/java/docs/com/.svn/entries                                                     |    0 
 scripting/java/docs/com/easysw/.svn/dir-wcprops                                          |    0 
 scripting/java/docs/com/easysw/.svn/entries                                              |    0 
 scripting/java/docs/com/easysw/cups/.svn/dir-wcprops                                     |    0 
 scripting/java/docs/com/easysw/cups/.svn/entries                                         |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/Cups.html.svn-work                      |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsJob.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsPrinter.html.svn-work               |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPP.html.svn-work                       |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPAttribute.html.svn-work              |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPDefs.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPError.html.svn-work                  |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPHttp.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPRequest.html.svn-work                |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPStatus.html.svn-work                 |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPURLConnection.html.svn-work          |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPValue.html.svn-work                  |    0 
 scripting/java/example/.svn/dir-wcprops                                                  |    0 
 scripting/java/example/.svn/entries                                                      |    0 
 scripting/java/example/.svn/wcprops/GLP.class.svn-work                                   |    0 
 scripting/java/example/.svn/wcprops/GLP.java.svn-work                                    |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$1.class.svn-work                          |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$MyTextListener.class.svn-work             |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.class.svn-work                           |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.java.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$1.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$2.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$ButtonListener.class.svn-work |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.class.svn-work                |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.java.svn-work                 |    0 
 scripting/java/example/.svn/wcprops/GLPserver.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPserver.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPtabs$1.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/GLPvars.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPvars.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/buildit.svn-work                                     |    0 
 scripting/java/example/.svn/wcprops/class.list.svn-work                                  |    0 
 scripting/java/example/.svn/wcprops/runit.svn-work                                       |    0 
 scripting/java/example/images/.svn/dir-wcprops                                           |    0 
 scripting/java/example/images/.svn/entries                                               |    0 
 scripting/java/example/images/.svn/wcprops/left.gif.svn-work                             |    0 
 scripting/java/example/images/.svn/wcprops/print-test-page.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/printer-idle.gif.svn-work                     |    0 
 scripting/java/example/images/.svn/wcprops/printer-stopped.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/restart-job.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-active.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-completed.gif.svn-work                   |    0 
 scripting/java/src/.svn/dir-wcprops                                                      |    0 
 scripting/java/src/.svn/entries                                                          |    0 
 scripting/java/src/com/.svn/dir-wcprops                                                  |    0 
 scripting/java/src/com/.svn/entries                                                      |    0 
 scripting/java/src/com/easysw/.svn/dir-wcprops                                           |    0 
 scripting/java/src/com/easysw/.svn/entries                                               |    0 
 scripting/java/src/com/easysw/cups/.svn/dir-wcprops                                      |    0 
 scripting/java/src/com/easysw/cups/.svn/entries                                          |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/Cups.java.svn-work                       |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsJob.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsPrinter.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPP.java.svn-work                        |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPAttribute.java.svn-work               |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPCalendar.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPDefs.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPError.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPHttp.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPMD5.java.svn-work                     |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPRequest.java.svn-work                 |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPStatus.java.svn-work                  |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPURLConnection.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPValue.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/buildit.svn-work                         |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/class.list.svn-work                      |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/cups.nfo.svn-work                        |    0 
 scripting/perl/.svn/dir-wcprops                                                          |    0 
 scripting/perl/.svn/entries                                                              |    0 
 scripting/perl/.svn/wcprops/CUPS.pm.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/CUPS.xs.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/Makefile.PL.svn-work                                         |    0 
 scripting/perl/.svn/wcprops/README.svn-work                                              |    0 
 scripting/perl/.svn/wcprops/test.pl.svn-work                                             |    0 
 scripting/php/.svn/dir-wcprops                                                           |    0 
 scripting/php/.svn/entries                                                               |    0 
 scripting/php/.svn/wcprops/Dependencies.svn-work                                         |    0 
 scripting/php/.svn/wcprops/Makefile.svn-work                                             |    0 
 scripting/php/.svn/wcprops/README.svn-work                                               |    0 
 scripting/php/.svn/wcprops/phpcups.c.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.h.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.php.svn-work                                          |    0 
 standards/.svn/dir-wcprops                                                               |    0 
 standards/.svn/entries                                                                   |    0 
 standards/.svn/wcprops/Makefile.svn-work                                                 |    0 
 standards/.svn/wcprops/X.690-0207.pdf.svn-work                                           |    0 
 standards/.svn/wcprops/pwg5100.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/rfc1155.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1157.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1179.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1213.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1321.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2222.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2246.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2487.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2554.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2567.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2568.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2569.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2578.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2595.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2616.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2617.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2790.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2817.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2818.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2821.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2822.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2910.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2911.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2965.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3196.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3239.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3380.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3381.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3382.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3391.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3510.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3805.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3986.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3995.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3996.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3997.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3998.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc4122.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfctohtml.c.svn-work                                              |    0 
 standards/.svn/wcprops/wake-on-lan.pdf.svn-work                                          |    0 
 standards/.svn/wcprops/wd-ippmailto10-20050519.pdf.svn-work                              |    0 
 systemv/.svn/dir-wcprops                                                                 |    0 
 systemv/.svn/entries                                                                     |    0 
 systemv/.svn/text-base/Makefile.svn-base                                                 |    0 
 systemv/.svn/text-base/cancel.c.svn-base                                                 |    0 
 systemv/.svn/text-base/lpstat.c.svn-base                                                 |    0 
 systemv/.svn/wcprops/Dependencies.svn-work                                               |    0 
 systemv/.svn/wcprops/Makefile.svn-work                                                   |    0 
 systemv/.svn/wcprops/accept.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cancel.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cupsaddsmb.c.svn-work                                               |    0 
 systemv/.svn/wcprops/cupstestdsc.c.svn-work                                              |    0 
 systemv/.svn/wcprops/cupstestppd.c.svn-work                                              |    0 
 systemv/.svn/wcprops/lp.c.svn-work                                                       |    0 
 systemv/.svn/wcprops/lpadmin.c.svn-work                                                  |    0 
 systemv/.svn/wcprops/lpinfo.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpmove.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpoptions.c.svn-work                                                |    0 
 systemv/.svn/wcprops/lppasswd.c.svn-work                                                 |    0 
 systemv/.svn/wcprops/lpstat.c.svn-work                                                   |    0 
 systemv/Makefile                                                                         |    6 
 systemv/cancel.c                                                                         |    7 
 systemv/lpstat.c                                                                         |   59 
 templates/.svn/dir-wcprops                                                               |    0 
 templates/.svn/entries                                                                   |    0 
 templates/.svn/text-base/Makefile.svn-base                                               |    0 
 templates/.svn/wcprops/Makefile.svn-work                                                 |    0 
 templates/.svn/wcprops/add-class.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/add-printer.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/admin.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/choose-device.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-make.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/choose-model.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/choose-serial.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-uri.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/class-added.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/class-confirm.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-deleted.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-jobs-header.tmpl.svn-work                                   |    0 
 templates/.svn/wcprops/class-modified.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes-header.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/edit-config.tmpl.in.svn-work                                      |    0 
 templates/.svn/wcprops/error-op.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/error.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/header.tmpl.in.svn-work                                           |    0 
 templates/.svn/wcprops/help-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/help-printable.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/job-cancel.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/job-hold.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-move.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-moved.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/job-release.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/job-restart.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs.tmpl.svn-work                                                |    0 
 templates/.svn/wcprops/maintenance.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/modify-class.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/modify-printer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-boolean.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-conflict.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-header.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/option-pickmany.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-pickone.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-trailer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/pager.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/printer-accept.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-added.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-configured.tmpl.svn-work                                  |    0 
 templates/.svn/wcprops/printer-confirm.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-default.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-deleted.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work                                 |    0 
 templates/.svn/wcprops/printer-modified.tmpl.svn-work                                    |    0 
 templates/.svn/wcprops/printer-purge.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-reject.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-start.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-stop.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/printers-header.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printers.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/restart.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/samba-export.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/samba-exported.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/search.tmpl.svn-work                                              |    0 
 templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work                          |    0 
 templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                         |    0 
 templates/.svn/wcprops/test-page.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/trailer.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/users.tmpl.svn-work                                               |    0 
 templates/Makefile                                                                       |   14 
 templates/es/.svn/dir-wcprops                                                            |    0 
 templates/es/.svn/entries                                                                |    0 
 templates/es/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/es/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/es/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/es/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/es/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/es/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/es/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/es/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/es/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/es/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/es/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/.svn/dir-wcprops                                                            |    0 
 templates/ja/.svn/entries                                                                |    0 
 templates/ja/.svn/text-base/printers.tmpl.svn-base                                       |    0 
 templates/ja/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/ja/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/ja/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/ja/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/ja/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/ja/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/ja/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/ja/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/ja/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/printers.tmpl                                                               |    2 
 templates/pl/.svn/dir-wcprops                                                            |    0 
 templates/pl/.svn/entries                                                                |    0 
 templates/pl/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/pl/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/pl/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/pl/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/pl/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/pl/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/pl/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/sv/.svn/dir-wcprops                                                            |    0 
 templates/sv/.svn/entries                                                                |    0 
 templates/sv/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/sv/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/sv/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/sv/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/sv/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/sv/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 test/.svn/dir-wcprops                                                                    |    0 
 test/.svn/entries                                                                        |    0 
 test/.svn/wcprops/4.1-requests.test.svn-work                                             |    0 
 test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/4.3-job-ops.test.svn-work                                              |    0 
 test/.svn/wcprops/4.4-subscription-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/5.1-lpadmin.sh.svn-work                                                |    0 
 test/.svn/wcprops/5.2-lpc.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.3-lpq.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.4-lpstat.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.5-lp.sh.svn-work                                                     |    0 
 test/.svn/wcprops/5.6-lpr.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.7-lprm.sh.svn-work                                                   |    0 
 test/.svn/wcprops/5.8-cancel.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.9-lpinfo.sh.svn-work                                                 |    0 
 test/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 test/.svn/wcprops/Makefile.svn-work                                                      |    0 
 test/.svn/wcprops/create-job-format.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-sheets.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-timeout.test.svn-work                                       |    0 
 test/.svn/wcprops/create-job.test.svn-work                                               |    0 
 test/.svn/wcprops/get-devices.test.svn-work                                              |    0 
 test/.svn/wcprops/get-job-attributes.test.svn-work                                       |    0 
 test/.svn/wcprops/get-job-attributes2.test.svn-work                                      |    0 
 test/.svn/wcprops/get-ppds.test.svn-work                                                 |    0 
 test/.svn/wcprops/get-printer-attributes.test.svn-work                                   |    0 
 test/.svn/wcprops/get-printers.test.svn-work                                             |    0 
 test/.svn/wcprops/ipptest.c.svn-work                                                     |    0 
 test/.svn/wcprops/print-job-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/print-job.test.svn-work                                                |    0 
 test/.svn/wcprops/run-stp-tests.sh.svn-work                                              |    0 
 test/.svn/wcprops/set-attrs-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/str-header.html.svn-work                                               |    0 
 test/.svn/wcprops/str-trailer.html.svn-work                                              |    0 
 test/.svn/wcprops/testfile.jpg.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.pdf.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.ps.svn-work                                                   |    0 
 test/.svn/wcprops/testfile.txt.svn-work                                                  |    0 
 test/.svn/wcprops/testhp.ppd.svn-work                                                    |    0 
 test/.svn/wcprops/testps.ppd.svn-work                                                    |    0 
 tools/.svn/dir-wcprops                                                                   |    0 
 tools/.svn/entries                                                                       |    0 
 tools/.svn/wcprops/checkglobals.svn-work                                                 |    0 
 tools/.svn/wcprops/listpublic.svn-work                                                   |    0 
 tools/.svn/wcprops/makesrcdist.svn-work                                                  |    0 
 tools/.svn/wcprops/testosx.svn-work                                                      |    0 
 tools/.svn/wcprops/testrpm.svn-work                                                      |    0 
 vcnet/.svn/dir-wcprops                                                                   |    0 
 vcnet/.svn/entries                                                                       |    0 
 vcnet/.svn/wcprops/config.h.svn-work                                                     |    0 
 vcnet/.svn/wcprops/cups.sln.svn-work                                                     |    0 
 vcnet/.svn/wcprops/libcups2.def.svn-work                                                 |    0 
 vcnet/.svn/wcprops/libcups2.vcproj.svn-work                                              |    0 
 1769 files changed, 3703 insertions(+), 3683 deletions(-)

--- NEW FILE cups-svn5737.patch ---
diff -durN release-1.2.1/backend/backend-private.h cups-1.2.x/backend/backend-private.h
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
diff -durN release-1.2.1/backend/Dependencies cups-1.2.x/backend/Dependencies
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
diff -durN release-1.2.1/backend/easysw-firewire-design.txt cups-1.2.x/backend/easysw-firewire-design.txt
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
[...13064 lines suppressed...]
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/dir-wcprops cups-1.2.x/templates/sv/.svn/dir-wcprops
diff -durN release-1.2.1/templates/sv/.svn/entries cups-1.2.x/templates/sv/.svn/entries
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/dir-wcprops cups-1.2.x/templates/.svn/dir-wcprops
diff -durN release-1.2.1/templates/.svn/entries cups-1.2.x/templates/.svn/entries
diff -durN release-1.2.1/templates/.svn/text-base/Makefile.svn-base cups-1.2.x/templates/.svn/text-base/Makefile.svn-base
diff -durN release-1.2.1/templates/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/Makefile.svn-work cups-1.2.x/templates/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/test/.svn/dir-wcprops cups-1.2.x/test/.svn/dir-wcprops
diff -durN release-1.2.1/test/.svn/entries cups-1.2.x/test/.svn/entries
diff -durN release-1.2.1/test/.svn/wcprops/4.1-requests.test.svn-work cups-1.2.x/test/.svn/wcprops/4.1-requests.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.3-job-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.3-job-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.4-subscription-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.4-subscription-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.1-lpadmin.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.1-lpadmin.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.2-lpc.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.2-lpc.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.3-lpq.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.3-lpq.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.4-lpstat.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.4-lpstat.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.5-lp.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.5-lp.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.6-lpr.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.6-lpr.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.7-lprm.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.7-lprm.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.8-cancel.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.8-cancel.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.9-lpinfo.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.9-lpinfo.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-format.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-format.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-sheets.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-sheets.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-timeout.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-timeout.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Dependencies.svn-work cups-1.2.x/test/.svn/wcprops/Dependencies.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-devices.test.svn-work cups-1.2.x/test/.svn/wcprops/get-devices.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes2.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes2.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-ppds.test.svn-work cups-1.2.x/test/.svn/wcprops/get-ppds.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printer-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printer-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printers.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printers.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/ipptest.c.svn-work cups-1.2.x/test/.svn/wcprops/ipptest.c.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Makefile.svn-work cups-1.2.x/test/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/run-stp-tests.sh.svn-work cups-1.2.x/test/.svn/wcprops/run-stp-tests.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/set-attrs-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/set-attrs-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-header.html.svn-work cups-1.2.x/test/.svn/wcprops/str-header.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-trailer.html.svn-work cups-1.2.x/test/.svn/wcprops/str-trailer.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.jpg.svn-work cups-1.2.x/test/.svn/wcprops/testfile.jpg.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.pdf.svn-work cups-1.2.x/test/.svn/wcprops/testfile.pdf.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.ps.svn-work cups-1.2.x/test/.svn/wcprops/testfile.ps.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.txt.svn-work cups-1.2.x/test/.svn/wcprops/testfile.txt.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testhp.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testhp.ppd.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testps.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testps.ppd.svn-work
diff -durN release-1.2.1/tools/.svn/dir-wcprops cups-1.2.x/tools/.svn/dir-wcprops
diff -durN release-1.2.1/tools/.svn/entries cups-1.2.x/tools/.svn/entries
diff -durN release-1.2.1/tools/.svn/wcprops/checkglobals.svn-work cups-1.2.x/tools/.svn/wcprops/checkglobals.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/listpublic.svn-work cups-1.2.x/tools/.svn/wcprops/listpublic.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/makesrcdist.svn-work cups-1.2.x/tools/.svn/wcprops/makesrcdist.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testosx.svn-work cups-1.2.x/tools/.svn/wcprops/testosx.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testrpm.svn-work cups-1.2.x/tools/.svn/wcprops/testrpm.svn-work
diff -durN release-1.2.1/vcnet/.svn/dir-wcprops cups-1.2.x/vcnet/.svn/dir-wcprops
diff -durN release-1.2.1/vcnet/.svn/entries cups-1.2.x/vcnet/.svn/entries
diff -durN release-1.2.1/vcnet/.svn/wcprops/config.h.svn-work cups-1.2.x/vcnet/.svn/wcprops/config.h.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/cups.sln.svn-work cups-1.2.x/vcnet/.svn/wcprops/cups.sln.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.def.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.def.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.vcproj.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.vcproj.svn-work

cups-direct-usb.patch:
 usb-unix.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-direct-usb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-direct-usb.patch	4 Jul 2006 16:58:59 -0000	1.2
+++ cups-direct-usb.patch	14 Jul 2006 11:02:44 -0000	1.3
@@ -1,6 +1,15 @@
 --- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
 +++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
-@@ -327,12 +327,7 @@
+@@ -85,6 +85,8 @@
+     */
+ 
+     use_bc = strcasecmp(hostname, "Canon") != 0;
++    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++      use_bc = 0;
+ 
+     if ((device_fd = open_device(uri, &use_bc)) == -1)
+     {
+@@ -327,12 +329,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- cups.spec	12 Jul 2006 04:54:42 -0000	1.226
+++ cups.spec	14 Jul 2006 11:02:44 -0000	1.227
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 18.1
+Release: 19
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5706.patch
+Patch0: cups-svn5737.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -28,7 +28,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch8: cups-str1705.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch16: cups-no-export-ssllibs.patch
@@ -115,7 +114,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5706
+%patch0 -p1 -b .svn5737
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -123,7 +122,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch8 -p1 -b .str1705
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch16 -p1 -b .no-export-ssllibs
@@ -235,9 +233,6 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/classes.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
 
-# Ship an SSL directory
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
-
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -395,6 +390,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-19
+- Sync with svn5737.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.1-18.1
 - rebuild
 


--- cups-str1705.patch DELETED ---


--- cups-svn5706.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 11:15:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 07:15:12 -0400
Subject: rpms/telnet/devel netkit-telnet-0.17-ipv6.diff, NONE,
	1.1 telnet.spec, 1.27, 1.28
Message-ID: <200607141115.k6EBFCp1022763@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22706

Modified Files:
	telnet.spec 
Added Files:
	netkit-telnet-0.17-ipv6.diff 
Log Message:
- added netkit-telnet-0.17-ipv6.diff from Marek Gr??c,
  which adds IPv6 support to telnetd


netkit-telnet-0.17-ipv6.diff:
 telnetd.c |  177 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 108 insertions(+), 69 deletions(-)

--- NEW FILE netkit-telnet-0.17-ipv6.diff ---
diff -uNr netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17.ipv6/telnetd/telnetd.c
--- netkit-telnet-0.17/telnetd/telnetd.c	2006-07-13 08:37:18.000000000 +0200
+++ netkit-telnet-0.17.ipv6/telnetd/telnetd.c	2006-07-14 08:36:11.000000000 +0200
@@ -49,6 +49,7 @@
 /* #include <netinet/ip.h> */ /* Don't think this is used at all here */
 #include <arpa/inet.h>
 #include <assert.h>
+#include <sys/poll.h>
 #include "telnetd.h"
 #include "pathnames.h"
 #include "setproctitle.h"
@@ -68,7 +69,7 @@
 #define HAS_IPPROTO_IP
 #endif
 
-static void doit(struct sockaddr_in *who);
+static void doit(struct sockaddr *who, socklen_t wholen);
 static int terminaltypeok(const char *s);
 
 /*
@@ -90,7 +91,7 @@
 int
 main(int argc, char *argv[], char *env[])
 {
-	struct sockaddr_in from;
+	struct sockaddr from;
 	int on = 1;
 	socklen_t fromlen;
 	register int ch;
@@ -248,64 +249,89 @@
 	argc -= optind;
 	argv += optind;
 
-	if (debug) {
-	    int s, ns;
-	    socklen_t foo;
-	    struct servent *sp;
-	    struct sockaddr_in sn;
+	int s = 0;
 
-	    memset(&sn, 0, sizeof(sn));
-	    sn.sin_family = AF_INET;
+	if (debug) {
+	    struct addrinfo *ai;
+	    unsigned int nfds = 0;
+	    struct pollfd fds[2];
 
 	    if (argc > 1) {
-		usage();
-		/* NOTREACHED */
-	    } else if (argc == 1) {
-		    if ((sp = getservbyname(*argv, "tcp"))!=NULL) {
-			sn.sin_port = sp->s_port;
-		    } 
-		    else {
-			int pt = atoi(*argv);
-			if (pt <= 0) {
-			    fprintf(stderr, "telnetd: %s: bad port number\n",
-				    *argv);
-			    usage();
-			    /* NOTREACHED */
-			}
-			sn.sin_port = htons(pt);
-		   }
+	        usage();
+	        /* NOTREACHED */
 	    } else {
-		sp = getservbyname("telnet", "tcp");
-		if (sp == 0) {
-		    fprintf(stderr, "telnetd: tcp/telnet: unknown service\n");
-		    exit(1);
-		}
-		sn.sin_port = sp->s_port;
-	    }
+	        struct addrinfo hints;
+
+	        memset (&hints, '\0', sizeof (hints));
+	        hints.ai_socktype = SOCK_STREAM;
+	        hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
+	        hints.ai_protocol = IPPROTO_TCP;
+
+	        if (argc == 0) {
+	            if (getaddrinfo(NULL, "telnet", &hints, &ai) != 0) {
+	               fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
+	                usage();
+	                /* NOTREACHED */
+	            }
+	        } else {
+	            if (getaddrinfo(NULL, *argv, &hints, &ai) != 0) {
+		        fprintf(stderr, "telnetd: %s: bad port number\n", *argv);
+		        usage();
+		        /* NOTREACHED */
+		    }
+                }
+	    }	
 
-	    s = socket(AF_INET, SOCK_STREAM, 0);
-	    if (s < 0) {
+	    struct addrinfo *runp;
+	    int b = 0;
+	    for (runp = ai; ((runp != NULL) && (nfds < sizeof (fds) / sizeof (fds[0]))); runp = runp->ai_next) {
+	        fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol);
+	        if (fds[nfds].fd < 0) {
 		    perror("telnetd: socket");;
-		    exit(1);
+	            exit(1);
+	        }
+	        fds[nfds].events = POLLIN;
+	        (void) setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+
+	        if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) != 0) {
+	            // Unable to bind to given port. One of the reason can be
+	            // that we can't bind to both IPv4 and IPv6
+	            break;
+	        } else {			
+	            b++;
+	        }
+
+	        if (listen(fds[nfds].fd, 1) < 0) {
+	            perror("listen");
+	            exit(1);
+	        }
+                nfds++;
 	    }
-	    (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-	    if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) {
-		perror("bind");
-		exit(1);
-	    }
-	    if (listen(s, 1) < 0) {
-		perror("listen");
-		exit(1);
+	    freeaddrinfo(ai);
+
+	    if (b == 0) {
+	        perror("bind");
+	        exit(1);
 	    }
-	    foo = sizeof(sn);
-	    ns = accept(s, (struct sockaddr *)&sn, &foo);
-	    if (ns < 0) {
-		perror("accept");
-		exit(1);
+
+	    int n = poll (fds, nfds, -1);
+	    if (n > 0) {
+	        unsigned int i;
+	        for (i = 0; i < nfds; i++) {
+	            if (fds[i].revents & POLLIN) {
+	                struct sockaddr_storage rem;
+	                socklen_t remlen = sizeof(rem);
+	                int fd = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen);
+
+	                if (fd < 0) {
+	                    perror("accept");
+	                    exit(1);
+	                }
+
+	                s = fd;
+	            }
+	        }
 	    }
-	    (void) dup2(ns, 0);
-	    (void) close(ns);
-	    (void) close(s);
 	} else if (argc > 0) {
 		usage();
 		/* NOT REACHED */
@@ -313,13 +339,13 @@
 
 	openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
 	fromlen = sizeof (from);
-	if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
+	if (getpeername(s, &from, &fromlen) < 0) {
 		fprintf(stderr, "%s: ", progname);
 		perror("getpeername");
 		_exit(1);
 	}
 	if (keepalive &&
-	    setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
+	    setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) {
 		syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
 	}
 
@@ -333,13 +359,13 @@
 		if (tos < 0)
 			tos = 020;	/* Low Delay bit */
 		if (tos
-		   && (setsockopt(0, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+		   && (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
 		   && (errno != ENOPROTOOPT) )
 			syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
 	}
 #endif	/* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */
-	net = 0;
-	doit(&from);
+	net = s;
+	doit(&from, fromlen);
 	/* NOTREACHED */
 	return 0;
 }  /* end of main */
@@ -608,10 +634,9 @@
  * Get a pty, scan input lines.
  */
 static void
-doit(struct sockaddr_in *who)
+doit(struct sockaddr *who, socklen_t wholen)
 {
 	const char *host;
-	struct hostent *hp;
 	int level;
 	char user_name[256];
 
@@ -623,12 +648,18 @@
 		fatal(net, "All network ports in use");
 
 	/* get name of connected client */
-	hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr),
-		who->sin_family);
-	if (hp)
-		host = hp->h_name;
-	else
-		host = inet_ntoa(who->sin_addr);
+	int error = -1;
+	char namebuf[255];
+
+	error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0);
+	
+	if (error) {
+		perror("getnameinfo: localhost");
+		perror(gai_strerror(error));
+		exit(1);		
+	}
+	
+	host = namebuf;
 
 	/*
 	 * We must make a copy because Kerberos is probably going
@@ -649,13 +680,21 @@
 
 	/* Get local host name */
 	{
-		struct hostent *h;
+		struct addrinfo hints;
+		struct addrinfo *res;
+		int e;
+
+		memset(&hints, '\0', sizeof(hints));
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_flags = AI_ADDRCONFIG;
+
 		gethostname(host_name, sizeof(host_name));
-		h = gethostbyname(host_name);
-		if (h) {
-		    strncpy(host_name, h->h_name, sizeof(host_name));
-		    host_name[sizeof(host_name)-1] = 0;
+		if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) {
+			perror("getaddrinfo: localhost");
+			perror(gai_strerror(e));
+			exit(1);
 		}
+		freeaddrinfo(res);
 	}
 
 #if	defined(AUTHENTICATE) || defined(ENCRYPT)


Index: telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- telnet.spec	12 Jul 2006 08:27:38 -0000	1.27
+++ telnet.spec	14 Jul 2006 11:15:09 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 36.1
+Release: 37
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -24,6 +24,7 @@
 Patch16: telnet-0.17-CAN-2005-468_469.patch
 Patch17: telnet-0.17-linemode.patch
 Patch18: telnet-gethostbyname.patch
+Patch19: netkit-telnet-0.17-ipv6.diff
 
 BuildPreReq: ncurses-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -64,6 +65,7 @@
 %patch16 -p1 -b .CAN-2005-468_469
 #%patch17 -p1 -b .linemode
 %patch18 -p1 -b .gethost
+%patch19 -p1 -b .gethost
 
 %build
 export OPT_FLAGS="$RPM_OPT_FLAGS -g"
@@ -129,6 +131,10 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Fri Jul 14 2006 Harald Hoyer <harald at redhat.com> - 1:0.17-37
+- added netkit-telnet-0.17-ipv6.diff from Marek Gr??c, 
+  which adds IPv6 support to telnetd
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-36.1
 - rebuild
 
@@ -243,7 +249,7 @@
 * Sat Dec 30 2000 Nalin Dahyabhai <nalin at redhat.com>
 - mark the xinetd config file as config(noreplace)
 
-* Fri Dec 01 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Dec 01 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - make sure the server is turned off by default
 
 * Tue Jul 18 2000 Bill Nottingham <notting at redhat.com>
@@ -256,10 +262,10 @@
 - FHS packaging.
 - update to 0.17-pre20000412.
 
-* Tue May 23 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue May 23 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - moved the xinet entry to the server
 
-* Mon May 22 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon May 22 2000 Trond Eivind Glomsr??d <teg at redhat.com>
 - add an entry to /etc/xinetd.d
 
 * Tue May 16 2000 Jeff Johnson <jbj at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Jul 14 11:16:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 07:16:09 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.49,1.50
Message-ID: <200607141116.k6EBG9Ov028297@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27038

Modified Files:
	kdevelop.spec 
Log Message:
cleanup specfile




Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdevelop.spec	12 Jul 2006 06:42:28 -0000	1.49
+++ kdevelop.spec	14 Jul 2006 11:16:07 -0000	1.50
@@ -8,16 +8,14 @@
 
 %define make_cvs 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.3
-Release: 1.1
+Release: 2
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -27,19 +25,24 @@
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version}
 Requires: make
-Requires: perl >= 0:5.004
+Requires: perl
 Requires: libtool
+Requires: automake
+Requires: autoconf
 Requires: flex >= 2.5.4
 Requires: qt-designer >= %{qt_epoch}:%{qt_version}
 
-BuildPrereq: autoconf
-BuildPrereq: automake
-BuildPrereq: libtool
-BuildPrereq: kdelibs-devel >= %{kde_version}
-Buildprereq: db4-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: kdelibs-devel >= %{kde_version}
+BuildRequires: db4-devel
+BuildRequires: flex
+
 Obsoletes: kdevelop-c_c++_ref
 
 %description
@@ -74,22 +77,15 @@
 %patch3 -p1 -b .doc
 
 %build
-export KDEDIR=%{_prefix}
 QTDIR="" && source /etc/profile.d/qt.sh
 
-# Workaround for legacy auto* tools
 %if %{make_cvs}
-  [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
-  [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader
-  [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal
-  [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake
-  export PATH=`pwd`:$PATH
-  make -f admin/Makefile.common cvs
+  rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
+  cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
+  make -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="%{optflags}"
-
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
@@ -99,13 +95,9 @@
 popd
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
    --disable-rpath \
 %if %{debug} == 0
    --disable-debug \
@@ -119,8 +111,8 @@
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir}
 
-make %{?_smp_mflags} -C lib/util
 make %{?_smp_mflags}
+make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 rm -rf %{buildroot}
@@ -131,9 +123,19 @@
 # remove useless files
 rm -rf %{buildroot}%{_prefix}/kdevbdb
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+for f in hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %clean
 rm -rf %{buildroot}
@@ -157,6 +159,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Fri Jul 14 2006 Than Ngo <than at redhat.com> 9:3.3.3-2
+- cleanup specfile
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 12:02:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 08:02:48 -0400
Subject: rpms/ltrace/devel ltrace-ppc32fc5.patch, NONE, 1.1 .cvsignore, 1.7,
	1.8 ltrace-opd.patch, 1.1, 1.2 ltrace.spec, 1.36, 1.37 sources,
	1.7, 1.8 ltrace-demangle.patch, 1.1, NONE ltrace-e_entry.patch,
	1.2, NONE ltrace-opt_x.patch, 1.2, NONE ltrace-testsuite.patch,
	1.5, NONE ltrace_0.3.36-2.diff.gz, 1.1, NONE
Message-ID: <200607141202.k6EC2mOd002866@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	.cvsignore ltrace-opd.patch ltrace.spec sources 
Added Files:
	ltrace-ppc32fc5.patch 
Removed Files:
	ltrace-demangle.patch ltrace-e_entry.patch ltrace-opt_x.patch 
	ltrace-testsuite.patch ltrace_0.3.36-2.diff.gz 
Log Message:
- adding upstream (svn) version.  It contains most of patches that we
  already use, and has support for secure PLTs.


ltrace-ppc32fc5.patch:
 breakpoints.c                  |    5 ++---
 elf.c                          |    6 +++---
 output.c                       |    1 -
 process_event.c                |    9 ++++++---
 sysdeps/linux-gnu/breakpoint.c |    6 ++++++
 sysdeps/linux-gnu/ppc/arch.h   |    4 +---
 sysdeps/linux-gnu/ppc/plt.c    |    8 ++++++--
 sysdeps/linux-gnu/ppc/regs.c   |   11 +++++++++--
 8 files changed, 33 insertions(+), 17 deletions(-)

--- NEW FILE ltrace-ppc32fc5.patch ---
Index: output.c
===================================================================
--- output.c	(revision 45)
+++ output.c	(working copy)
@@ -170,7 +170,6 @@ void output_left(enum tof type, struct p
 	}
 	if (current_proc) {
 		fprintf(output, " <unfinished ...>\n");
-		current_proc = 0;
 		current_column = 0;
 	}
 	current_proc = proc;
Index: elf.c
===================================================================
--- elf.c	(revision 45)
+++ elf.c	(working copy)
@@ -403,7 +403,7 @@ struct library_symbol *read_elf(struct p
 			add_library_symbol(addr, name, &library_symbols,
 					   (PLTS_ARE_EXECUTABLE(lte)
 					   ?  LS_TOPLT_EXEC : LS_TOPLT_POINT),
-					   ELF64_ST_BIND(sym.st_info) != 0);
+					   ELF64_ST_BIND(sym.st_info) == STB_WEAK);
 			if (!lib_tail)
 				lib_tail = &(library_symbols->next);
 		}
@@ -415,7 +415,7 @@ struct library_symbol *read_elf(struct p
                    already there. */
 		main_cheat = (struct opt_x_t *)malloc(sizeof(struct opt_x_t));
 		if (main_cheat == NULL)
-			error(EXIT_FAILURE, 0, "Couldn allocate memory");
+			error(EXIT_FAILURE, 0, "Couldn't allocate memory");
 		main_cheat->next = opt_x;
 		main_cheat->found = 0;
 		main_cheat->name = PLTs_initialized_by_here;
@@ -464,7 +464,7 @@ struct library_symbol *read_elf(struct p
 			if (strcmp(xptr->name, PLTs_initialized_by_here) == 0) {
 				if (lte->ehdr.e_entry) {
 					add_library_symbol (
-						elf_plt2addr (lte, (void*)(long)
+						opd2addr (lte, (void*)(long)
 							lte->ehdr.e_entry),
 						PLTs_initialized_by_here,
 						lib_tail, 1, 0);
Index: sysdeps/linux-gnu/breakpoint.c
===================================================================
--- sysdeps/linux-gnu/breakpoint.c	(revision 45)
+++ sysdeps/linux-gnu/breakpoint.c	(working copy)
@@ -9,6 +9,8 @@
 #include "output.h"
 #include "debug.h"
 
+#include <errno.h>
+
 static unsigned char break_insn[] = BREAKPOINT_VALUE;
 
 #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
@@ -28,6 +30,10 @@ void enable_breakpoint(pid_t pid, struct
 		long a =
 		    ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long),
 			   0);
+		if (a == -1 && errno) {
+			perror ("ptrace");
+			return;
+		}
 		for (j = 0;
 		     j < sizeof(long)
 		     && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
Index: sysdeps/linux-gnu/ppc/plt.c
===================================================================
--- sysdeps/linux-gnu/ppc/plt.c	(revision 45)
+++ sysdeps/linux-gnu/ppc/plt.c	(working copy)
@@ -1,4 +1,5 @@
 #include <gelf.h>
+#include <errno.h>
 #include "ltrace.h"
 #include "elf.h"
 #include "debug.h"
@@ -15,8 +16,7 @@ void *sym2addr(struct process *proc, str
 	long addr = sym->enter_addr;
 	long pt_ret;
 
-	debug(3, 0);
-
+	debug(2, "sym2addr: sym=%s, pid=%d, enter_addr=%p", sym->name, proc->pid, addr);
 	if (sym->plt_type != LS_TOPLT_POINT) {
 		return addr;
 	}
@@ -46,6 +46,10 @@ void *sym2addr(struct process *proc, str
 	// break-point right in the PLT.
 
 	pt_ret = ptrace(PTRACE_PEEKTEXT, proc->pid, addr, 0);
+	if (pt_ret == -1 && errno) {
+		perror ("ptrace");
+		return 0;
+	}
 
 	if (proc->mask_32bit) {
 		// Assume big-endian.
Index: sysdeps/linux-gnu/ppc/regs.c
===================================================================
--- sysdeps/linux-gnu/ppc/regs.c	(revision 45)
+++ sysdeps/linux-gnu/ppc/regs.c	(working copy)
@@ -5,8 +5,10 @@
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <asm/ptrace.h>
+#include <errno.h>
 
 #include "ltrace.h"
+#include "debug.h"
 
 #if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR))
 # define PTRACE_PEEKUSER PTRACE_PEEKUSR
@@ -35,6 +37,11 @@ void *get_stack_pointer(struct process *
 
 void *get_return_addr(struct process *proc, void *stack_pointer)
 {
-	return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long) * PT_LNK,
-			      0);
+	long p = ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long) * PT_LNK, NULL);
+	if (p == -1 && errno) {
+		perror ("ptrace");
+		return NULL;
+	}
+	debug (3, "pid=%d ret=%p", proc->pid, p);
+	return (void*)p;
 }
Index: sysdeps/linux-gnu/ppc/arch.h
===================================================================
--- sysdeps/linux-gnu/ppc/arch.h	(revision 45)
+++ sysdeps/linux-gnu/ppc/arch.h	(working copy)
@@ -7,6 +7,7 @@
 #ifdef __powerpc64__ // Says 'ltrace' is 64 bits, says nothing about target.
 #define LT_ELFCLASS2	ELFCLASS64
 #define LT_ELF_MACHINE2	EM_PPC64
+#endif
 
 #define PLT_REINITALISATION_BP    "_start"
 
@@ -16,6 +17,3 @@
 #if (PPC_NOP_LENGTH != BREAKPOINT_LENGTH)
 #error "Length of the breakpoint value not equal to the length of a nop instruction"
 #endif
-
-
-#endif
Index: process_event.c
===================================================================
--- process_event.c	(revision 45)
+++ process_event.c	(working copy)
@@ -263,7 +263,7 @@ static void process_breakpoint(struct ev
 	struct breakpoint *sbp, *nxtbp;
 
 	debug(2, "event: breakpoint (%p)", event->e_un.brk_addr);
-	if ((sbp = event->proc->breakpoint_being_enabled) != 0) {
+	if ((sbp = event->proc->breakpoint_being_enabled) != NULL) {
 #ifdef __powerpc__
 		char nop_inst[] = PPC_NOP;
                 if (memcmp(sbp->orig_value, nop_inst, PPC_NOP_LENGTH) == 0) {
@@ -344,8 +344,11 @@ static void process_breakpoint(struct ev
 		event->proc->stack_pointer = get_stack_pointer(event->proc);
 		event->proc->return_addr =
 		    get_return_addr(event->proc, event->proc->stack_pointer);
-		output_left(LT_TOF_FUNCTION, event->proc, sbp->libsym->name);
-		callstack_push_symfunc(event->proc, sbp->libsym);
+		if (!sbp->libsym->is_weak || event->proc->return_addr == NULL) {
+			debug (2, "libsym name=%s", sbp->libsym->name);
+			output_left(LT_TOF_FUNCTION, event->proc, sbp->libsym->name);
+			callstack_push_symfunc(event->proc, sbp->libsym);
+		}
 #ifdef PLT_REINITALISATION_BP
 		if (event->proc->need_to_reinitialize_breakpoints
 		    && (strcmp(sbp->libsym->name, PLTs_initialized_by_here) ==
Index: breakpoints.c
===================================================================
--- breakpoints.c	(revision 45)
+++ breakpoints.c	(working copy)
@@ -28,6 +28,7 @@ insert_breakpoint(struct process *proc, 
 		  struct library_symbol *libsym)
 {
 	struct breakpoint *sbp;
+	debug(1, "insert_breakpoint(symbol=%s, addr=%p)", libsym?libsym->name:"(nil)", addr);
 
 	if (!proc->breakpoints) {
 		proc->breakpoints =
@@ -165,11 +166,9 @@ void breakpoints_init(struct process *pr
 	} else {
 		proc->list_of_symbols = NULL;
 	}
-	sym = proc->list_of_symbols;
-	while (sym) {
+	for (sym = proc->list_of_symbols; sym; sym = sym->next) {
 		/* proc->pid==0 delays enabling. */
 		insert_breakpoint(proc, sym2addr(proc, sym), sym);
-		sym = sym->next;
 	}
 	proc->callstack_depth = 0;
 	proc->breakpoints_enabled = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Apr 2006 12:47:45 -0000	1.7
+++ .cvsignore	14 Jul 2006 12:02:36 -0000	1.8
@@ -1 +1 @@
-ltrace_0.4.orig.tar.gz
+ltrace-0.5.tar.gz

ltrace-opd.patch:
 elf.c |    6 ++++++
 1 files changed, 6 insertions(+)

Index: ltrace-opd.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-opd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-opd.patch	24 Apr 2006 10:24:21 -0000	1.1
+++ ltrace-opd.patch	14 Jul 2006 12:02:36 -0000	1.2
@@ -1,24 +1,6 @@
 diff -BburpdN ltrace-0.4/elf.c ltrace-0.4-opd/elf.c
 --- ltrace-0.4/elf.c	2006-04-24 12:08:51.000000000 +0200
 +++ ltrace-0.4-opd/elf.c	2006-04-24 12:16:28.000000000 +0200
-@@ -23,7 +23,7 @@ static void add_library_symbol(GElf_Addr
- 			       struct library_symbol **library_symbolspp,
- 			       int use_elf_plt2addr, int is_weak);
- static int in_load_libraries(const char *name, struct ltelf *lte);
--static GElf_Addr elf_plt2addr(struct ltelf *ltc, void *addr);
-+static GElf_Addr elf_opd2addr(struct ltelf *ltc, void *addr);
- 
- extern char *PLTs_initialized_by_here;
- 
-@@ -328,7 +328,7 @@ static int in_load_libraries(const char 
- 	return 0;
- }
- 
--static GElf_Addr elf_plt2addr(struct ltelf *lte, void *addr)
-+static GElf_Addr elf_opd2addr(struct ltelf *lte, void *addr)
- {
- 	long base;
- 	long offset;
 @@ -337,12 +337,18 @@ static GElf_Addr elf_plt2addr(struct lte
  	if (!lte->opd)
  		return (GElf_Addr) addr;
@@ -38,12 +20,3 @@
  	return ret_val;
  }
  
-@@ -438,7 +444,7 @@ struct library_symbol *read_elf(struct p
- 			if (xptr->name && strcmp(xptr->name, name) == 0) {
- 				/* FIXME: Should be able to use &library_symbols as above.  But
- 				   when you do, none of the real library symbols cause breaks. */
--				add_library_symbol(elf_plt2addr
-+				add_library_symbol(elf_opd2addr
- 						   (lte, (void *)addr), name,
- 						   lib_tail, 1, 0);
- 				xptr->found = 1;


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ltrace.spec	12 Jul 2006 07:15:05 -0000	1.36
+++ ltrace.spec	14 Jul 2006 12:02:37 -0000	1.37
@@ -1,16 +1,13 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
-Version: 0.4
-Release: 1.7.1
-Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
-Patch0: ltrace-opt_x.patch
-Patch1: ltrace-testsuite.patch
+Version: 0.5
+Release: 1.0.45svn
+Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
-Patch3: ltrace-demangle.patch
-Patch4: ltrace-e_entry.patch
+Patch3: ltrace-ppc32fc5.patch
 License: GPL
 Group: Development/Debuggers
-ExclusiveArch: %{ix86} x86_64 ia64 ppc64 s390 s390x alpha sparc
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: elfutils-libelf-devel dejagnu
@@ -27,11 +24,8 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
 %patch2 -p1
-%patch3 -p2
-%patch4 -p1
+%patch3 -p0
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -58,6 +52,10 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn
+- adding upstream (svn) version.  It contains most of patches that we
+  already use, and has support for secure PLTs.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4-1.7.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Apr 2006 12:47:45 -0000	1.7
+++ sources	14 Jul 2006 12:02:37 -0000	1.8
@@ -1 +1 @@
-8dbadad76ee360c2ed2caa915f5b1c8e  ltrace_0.4.orig.tar.gz
+9b96a0056e9ba88a54e938973bf83025  ltrace-0.5.tar.gz


--- ltrace-demangle.patch DELETED ---


--- ltrace-e_entry.patch DELETED ---


--- ltrace-opt_x.patch DELETED ---


--- ltrace-testsuite.patch DELETED ---


--- ltrace_0.3.36-2.diff.gz DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 12:06:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 08:06:45 -0400
Subject: rpms/cups/FC-5 cups-svn5737.patch, NONE, 1.1 cups-direct-usb.patch,
	1.2, 1.3 cups.spec, 1.195, 1.196 cups-str1705.patch, 1.5,
	NONE cups-svn.patch, 1.5, NONE cups-svn5706.patch, 1.1, NONE
Message-ID: <200607141206.k6EC6VlZ003339@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups-direct-usb.patch cups.spec 
Added Files:
	cups-svn5737.patch 
Removed Files:
	cups-str1705.patch cups-svn.patch cups-svn5706.patch 
Log Message:
* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com>
- Sync with svn5737.


cups-svn5737.patch:
 .svn/dir-wcprops                                                                         |    0 
 .svn/entries                                                                             |    0 
 .svn/text-base/CHANGES.txt.svn-base                                                      |    0 
 .svn/text-base/Makedefs.in.svn-base                                                      |    0 
 .svn/text-base/config.h.in.svn-base                                                      |    0 
 .svn/text-base/configure.in.svn-base                                                     |    0 
 .svn/text-base/cups-config.in.svn-base                                                   |    0 
 .svn/wcprops/CHANGES-1.0.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES-1.1.txt.svn-work                                                    |    0 
 .svn/wcprops/CHANGES.txt.svn-work                                                        |    0 
 .svn/wcprops/CREDITS.txt.svn-work                                                        |    0 
 .svn/wcprops/INSTALL.txt.svn-work                                                        |    0 
 .svn/wcprops/LICENSE.txt.svn-work                                                        |    0 
 .svn/wcprops/Makedefs.in.svn-work                                                        |    0 
 .svn/wcprops/Makefile.svn-work                                                           |    0 
 .svn/wcprops/README.txt.svn-work                                                         |    0 
 .svn/wcprops/config.h.in.svn-work                                                        |    0 
 .svn/wcprops/configure.in.svn-work                                                       |    0 
 .svn/wcprops/cups-config.in.svn-work                                                     |    0 
 .svn/wcprops/install-sh.svn-work                                                         |    0 
 CHANGES.txt                                                                              |  125 +
 Makedefs.in                                                                              |   10 
 backend/.svn/dir-prop-base                                                               |    0 
 backend/.svn/dir-props                                                                   |    0 
 backend/.svn/dir-wcprops                                                                 |    0 
 backend/.svn/entries                                                                     |    0 
 backend/.svn/prop-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/prop-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/prop-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/prop-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/prop-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/prop-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/prop-base/runloop.c.svn-base                                                |    0 
 backend/.svn/props/backend-private.h.svn-work                                            |    0 
 backend/.svn/props/easysw-firewire-design.txt.svn-work                                   |    0 
 backend/.svn/props/easysw-firewire-linux.txt.svn-work                                    |    0 
 backend/.svn/props/ieee1394-linux.c.svn-work                                             |    0 
 backend/.svn/props/ieee1394.c.svn-work                                                   |    0 
 backend/.svn/props/ieee1394.h.svn-work                                                   |    0 
 backend/.svn/props/runloop.c.svn-work                                                    |    0 
 backend/.svn/text-base/Dependencies.svn-base                                             |    0 
 backend/.svn/text-base/Makefile.svn-base                                                 |    0 
 backend/.svn/text-base/backend-private.h.svn-base                                        |    0 
 backend/.svn/text-base/easysw-firewire-design.txt.svn-base                               |    0 
 backend/.svn/text-base/easysw-firewire-linux.txt.svn-base                                |    0 
 backend/.svn/text-base/ieee1284.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394-linux.c.svn-base                                         |    0 
 backend/.svn/text-base/ieee1394.c.svn-base                                               |    0 
 backend/.svn/text-base/ieee1394.h.svn-base                                               |    0 
 backend/.svn/text-base/ipp.c.svn-base                                                    |    0 
 backend/.svn/text-base/parallel.c.svn-base                                               |    0 
 backend/.svn/text-base/runloop.c.svn-base                                                |    0 
 backend/.svn/text-base/serial.c.svn-base                                                 |    0 
 backend/.svn/text-base/snmp.c.svn-base                                                   |    0 
 backend/.svn/text-base/socket.c.svn-base                                                 |    0 
 backend/.svn/text-base/test1284.c.svn-base                                               |    0 
 backend/.svn/text-base/usb-darwin.c.svn-base                                             |    0 
 backend/.svn/text-base/usb-unix.c.svn-base                                               |    0 
 backend/.svn/text-base/usb.c.svn-base                                                    |    0 
 backend/.svn/wcprops/Dependencies.svn-work                                               |    0 
 backend/.svn/wcprops/Makefile.svn-work                                                   |    0 
 backend/.svn/wcprops/backend-private.h.svn-work                                          |    0 
 backend/.svn/wcprops/betest.c.svn-work                                                   |    0 
 backend/.svn/wcprops/easysw-firewire-design.txt.svn-work                                 |    0 
 backend/.svn/wcprops/easysw-firewire-linux.txt.svn-work                                  |    0 
 backend/.svn/wcprops/ieee1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394-linux.c.svn-work                                           |    0 
 backend/.svn/wcprops/ieee1394.c.svn-work                                                 |    0 
 backend/.svn/wcprops/ieee1394.h.svn-work                                                 |    0 
 backend/.svn/wcprops/ipp.c.svn-work                                                      |    0 
 backend/.svn/wcprops/lpd.c.svn-work                                                      |    0 
 backend/.svn/wcprops/pap.c.svn-work                                                      |    0 
 backend/.svn/wcprops/parallel.c.svn-work                                                 |    0 
 backend/.svn/wcprops/runloop.c.svn-work                                                  |    0 
 backend/.svn/wcprops/scsi-irix.c.svn-work                                                |    0 
 backend/.svn/wcprops/scsi-linux.c.svn-work                                               |    0 
 backend/.svn/wcprops/scsi.c.svn-work                                                     |    0 
 backend/.svn/wcprops/serial.c.svn-work                                                   |    0 
 backend/.svn/wcprops/snmp.c.svn-work                                                     |    0 
 backend/.svn/wcprops/snmp.txt.svn-work                                                   |    0 
 backend/.svn/wcprops/socket.c.svn-work                                                   |    0 
 backend/.svn/wcprops/test1284.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb-darwin.c.svn-work                                               |    0 
 backend/.svn/wcprops/usb-unix.c.svn-work                                                 |    0 
 backend/.svn/wcprops/usb.c.svn-work                                                      |    0 
 backend/Dependencies                                                                     |   39 
 backend/Makefile                                                                         |   40 
 backend/backend-private.h                                                                |   73 
 backend/easysw-firewire-design.txt                                                       |   70 
 backend/easysw-firewire-linux.txt                                                        |   35 
 backend/ieee1284.c                                                                       |   77 
 backend/ieee1394-linux.c                                                                 |  877 ----------
 backend/ieee1394.c                                                                       |  267 ---
 backend/ieee1394.h                                                                       |  103 -
 backend/ipp.c                                                                            |    9 
 backend/parallel.c                                                                       |  231 --
 backend/runloop.c                                                                        |  258 ++
 backend/serial.c                                                                         |  293 +--
 backend/snmp.c                                                                           |   37 
 backend/socket.c                                                                         |  299 +--
 backend/test1284.c                                                                       |    9 
 backend/usb-darwin.c                                                                     |    6 
 backend/usb-unix.c                                                                       |  301 +--
 backend/usb.c                                                                            |   25 
 berkeley/.svn/dir-wcprops                                                                |    0 
 berkeley/.svn/entries                                                                    |    0 
 berkeley/.svn/text-base/lpq.c.svn-base                                                   |    0 
 berkeley/.svn/text-base/lprm.c.svn-base                                                  |    0 
 berkeley/.svn/wcprops/Dependencies.svn-work                                              |    0 
 berkeley/.svn/wcprops/Makefile.svn-work                                                  |    0 
 berkeley/.svn/wcprops/lpc.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpq.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lpr.c.svn-work                                                     |    0 
 berkeley/.svn/wcprops/lprm.c.svn-work                                                    |    0 
 berkeley/lpq.c                                                                           |    6 
 berkeley/lprm.c                                                                          |   35 
 cgi-bin/.svn/dir-wcprops                                                                 |    0 
 cgi-bin/.svn/entries                                                                     |    0 
 cgi-bin/.svn/text-base/help-index.c.svn-base                                             |    0 
 cgi-bin/.svn/wcprops/Dependencies.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/Makefile.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/admin.c.svn-work                                                    |    0 
 cgi-bin/.svn/wcprops/cgi-private.h.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/cgi.h.svn-work                                                      |    0 
 cgi-bin/.svn/wcprops/classes.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/help-index.c.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help-index.h.svn-work                                               |    0 
 cgi-bin/.svn/wcprops/help.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/html.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/ipp-var.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/jobs.c.svn-work                                                     |    0 
 cgi-bin/.svn/wcprops/multipart.dat.svn-work                                              |    0 
 cgi-bin/.svn/wcprops/printers.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/search.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/template.c.svn-work                                                 |    0 
 cgi-bin/.svn/wcprops/testcgi.c.svn-work                                                  |    0 
 cgi-bin/.svn/wcprops/testhi.c.svn-work                                                   |    0 
 cgi-bin/.svn/wcprops/testhi.html.svn-work                                                |    0 
 cgi-bin/.svn/wcprops/testtemplate.c.svn-work                                             |    0 
 cgi-bin/.svn/wcprops/var.c.svn-work                                                      |    0 
 cgi-bin/help-index.c                                                                     |    6 
 conf/.svn/dir-wcprops                                                                    |    0 
 conf/.svn/entries                                                                        |    0 
 conf/.svn/wcprops/Makefile.svn-work                                                      |    0 
 conf/.svn/wcprops/cupsd.conf.in.svn-work                                                 |    0 
 conf/.svn/wcprops/mime.convs.svn-work                                                    |    0 
 conf/.svn/wcprops/mime.types.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.darwin.svn-work                                                    |    0 
 conf/.svn/wcprops/pam.irix.svn-work                                                      |    0 
 conf/.svn/wcprops/pam.std.in.svn-work                                                    |    0 
 config-scripts/.svn/dir-wcprops                                                          |    0 
 config-scripts/.svn/entries                                                              |    0 
 config-scripts/.svn/text-base/cups-compiler.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-defaults.m4.svn-base                                  |    0 
 config-scripts/.svn/text-base/cups-directories.m4.svn-base                               |    0 
 config-scripts/.svn/text-base/cups-image.m4.svn-base                                     |    0 
 config-scripts/.svn/text-base/cups-network.m4.svn-base                                   |    0 
 config-scripts/.svn/text-base/cups-sharedlibs.m4.svn-base                                |    0 
 config-scripts/.svn/text-base/cups-ssl.m4.svn-base                                       |    0 
 config-scripts/.svn/wcprops/cups-common.m4.svn-work                                      |    0 
 config-scripts/.svn/wcprops/cups-compiler.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-defaults.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-directories.m4.svn-work                                 |    0 
 config-scripts/.svn/wcprops/cups-image.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-largefile.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-launchd.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-ldap.m4.svn-work                                        |    0 
 config-scripts/.svn/wcprops/cups-libtool.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-manpages.m4.svn-work                                    |    0 
 config-scripts/.svn/wcprops/cups-network.m4.svn-work                                     |    0 
 config-scripts/.svn/wcprops/cups-opsys.m4.svn-work                                       |    0 
 config-scripts/.svn/wcprops/cups-pam.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pap.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-pdf.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-scripting.m4.svn-work                                   |    0 
 config-scripts/.svn/wcprops/cups-sharedlibs.m4.svn-work                                  |    0 
 config-scripts/.svn/wcprops/cups-slp.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-ssl.m4.svn-work                                         |    0 
 config-scripts/.svn/wcprops/cups-threads.m4.svn-work                                     |    0 
 config-scripts/cups-compiler.m4                                                          |   66 
 config-scripts/cups-defaults.m4                                                          |   40 
 config-scripts/cups-directories.m4                                                       |    6 
 config-scripts/cups-image.m4                                                             |   24 
 config-scripts/cups-network.m4                                                           |    6 
 config-scripts/cups-sharedlibs.m4                                                        |   48 
 config-scripts/cups-ssl.m4                                                               |    5 
 config.h.in                                                                              |   11 
 configure.in                                                                             |   11 
 cups-config.in                                                                           |   14 
 cups/.svn/dir-prop-base                                                                  |    0 
 cups/.svn/dir-props                                                                      |    0 
 cups/.svn/dir-wcprops                                                                    |    0 
 cups/.svn/entries                                                                        |    0 
 cups/.svn/text-base/Makefile.svn-base                                                    |    0 
 cups/.svn/text-base/adminutil.c.svn-base                                                 |    0 
 cups/.svn/text-base/emit.c.svn-base                                                      |    0 
 cups/.svn/text-base/http-addrlist.c.svn-base                                             |    0 
 cups/.svn/text-base/http.c.svn-base                                                      |    0 
 cups/.svn/text-base/http.h.svn-base                                                      |    0 
 cups/.svn/text-base/ipp.c.svn-base                                                       |    0 
 cups/.svn/text-base/mark.c.svn-base                                                      |    0 
 cups/.svn/text-base/testhttp.c.svn-base                                                  |    0 
 cups/.svn/text-base/testppd.c.svn-base                                                   |    0 
 cups/.svn/text-base/util.c.svn-base                                                      |    0 
 cups/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 cups/.svn/wcprops/Makefile.svn-work                                                      |    0 
 cups/.svn/wcprops/adminutil.c.svn-work                                                   |    0 
 cups/.svn/wcprops/adminutil.h.svn-work                                                   |    0 
 cups/.svn/wcprops/api-array.shtml.svn-work                                               |    0 
 cups/.svn/wcprops/api-cups.shtml.svn-work                                                |    0 
 cups/.svn/wcprops/api-filedir.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-filter.shtml.svn-work                                              |    0 
 cups/.svn/wcprops/api-httpipp.shtml.svn-work                                             |    0 
 cups/.svn/wcprops/api-ppd.shtml.svn-work                                                 |    0 
 cups/.svn/wcprops/array.c.svn-work                                                       |    0 
 cups/.svn/wcprops/array.h.svn-work                                                       |    0 
 cups/.svn/wcprops/attr.c.svn-work                                                        |    0 
 cups/.svn/wcprops/auth.c.svn-work                                                        |    0 
 cups/.svn/wcprops/backchannel.c.svn-work                                                 |    0 
 cups/.svn/wcprops/backend.c.svn-work                                                     |    0 
 cups/.svn/wcprops/backend.h.svn-work                                                     |    0 
 cups/.svn/wcprops/cups.h.svn-work                                                        |    0 
 cups/.svn/wcprops/custom.c.svn-work                                                      |    0 
 cups/.svn/wcprops/debug.h.svn-work                                                       |    0 
 cups/.svn/wcprops/dest.c.svn-work                                                        |    0 
 cups/.svn/wcprops/dir.c.svn-work                                                         |    0 
 cups/.svn/wcprops/dir.h.svn-work                                                         |    0 
 cups/.svn/wcprops/emit.c.svn-work                                                        |    0 
 cups/.svn/wcprops/encode.c.svn-work                                                      |    0 
 cups/.svn/wcprops/file.c.svn-work                                                        |    0 
 cups/.svn/wcprops/file.h.svn-work                                                        |    0 
 cups/.svn/wcprops/getifaddrs.c.svn-work                                                  |    0 
 cups/.svn/wcprops/getputfile.c.svn-work                                                  |    0 
 cups/.svn/wcprops/globals.c.svn-work                                                     |    0 
 cups/.svn/wcprops/globals.h.svn-work                                                     |    0 
 cups/.svn/wcprops/http-addr.c.svn-work                                                   |    0 
 cups/.svn/wcprops/http-addrlist.c.svn-work                                               |    0 
 cups/.svn/wcprops/http-private.h.svn-work                                                |    0 
 cups/.svn/wcprops/http-support.c.svn-work                                                |    0 
 cups/.svn/wcprops/http.c.svn-work                                                        |    0 
 cups/.svn/wcprops/http.h.svn-work                                                        |    0 
 cups/.svn/wcprops/i18n.h.svn-work                                                        |    0 
 cups/.svn/wcprops/ipp-private.h.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp-support.c.svn-work                                                 |    0 
 cups/.svn/wcprops/ipp.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ipp.h.svn-work                                                         |    0 
 cups/.svn/wcprops/langprintf.c.svn-work                                                  |    0 
 cups/.svn/wcprops/language.c.svn-work                                                    |    0 
 cups/.svn/wcprops/language.h.svn-work                                                    |    0 
 cups/.svn/wcprops/libcups_s.exp.svn-work                                                 |    0 
 cups/.svn/wcprops/localize.c.svn-work                                                    |    0 
 cups/.svn/wcprops/mark.c.svn-work                                                        |    0 
 cups/.svn/wcprops/md5-apple.h.svn-work                                                   |    0 
 cups/.svn/wcprops/md5.c.svn-work                                                         |    0 
 cups/.svn/wcprops/md5.h.svn-work                                                         |    0 
 cups/.svn/wcprops/md5passwd.c.svn-work                                                   |    0 
 cups/.svn/wcprops/notify.c.svn-work                                                      |    0 
 cups/.svn/wcprops/options.c.svn-work                                                     |    0 
 cups/.svn/wcprops/page.c.svn-work                                                        |    0 
 cups/.svn/wcprops/ppd.c.svn-work                                                         |    0 
 cups/.svn/wcprops/ppd.h.svn-work                                                         |    0 
 cups/.svn/wcprops/request.c.svn-work                                                     |    0 
 cups/.svn/wcprops/snprintf.c.svn-work                                                    |    0 
 cups/.svn/wcprops/string.c.svn-work                                                      |    0 
 cups/.svn/wcprops/string.h.svn-work                                                      |    0 
 cups/.svn/wcprops/tempfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/test.ppd.svn-work                                                      |    0 
 cups/.svn/wcprops/testadmin.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testarray.c.svn-work                                                   |    0 
 cups/.svn/wcprops/testfile.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testhttp.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testi18n.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testipp.c.svn-work                                                     |    0 
 cups/.svn/wcprops/testlang.c.svn-work                                                    |    0 
 cups/.svn/wcprops/testppd.c.svn-work                                                     |    0 
 cups/.svn/wcprops/transcode.c.svn-work                                                   |    0 
 cups/.svn/wcprops/transcode.h.svn-work                                                   |    0 
 cups/.svn/wcprops/usersys.c.svn-work                                                     |    0 
 cups/.svn/wcprops/utf8demo.txt.svn-work                                                  |    0 
 cups/.svn/wcprops/util.c.svn-work                                                        |    0 
 cups/Makefile                                                                            |   10 
 cups/adminutil.c                                                                         |   17 
 cups/emit.c                                                                              |   27 
 cups/http-addrlist.c                                                                     |   20 
 cups/http.c                                                                              |   25 
 cups/http.h                                                                              |   14 
 cups/ipp.c                                                                               |    8 
 cups/mark.c                                                                              |   11 
 cups/testhttp.c                                                                          |   22 
 cups/testppd.c                                                                           |   57 
 cups/util.c                                                                              |   36 
 data/.svn/dir-wcprops                                                                    |    0 
 data/.svn/entries                                                                        |    0 
 data/.svn/wcprops/HPGLprolog.svn-work                                                    |    0 
 data/.svn/wcprops/Makefile.svn-work                                                      |    0 
 data/.svn/wcprops/classified.svn-work                                                    |    0 
 data/.svn/wcprops/confidential.svn-work                                                  |    0 
 data/.svn/wcprops/cups.irix.svn-work                                                     |    0 
 data/.svn/wcprops/cups.pam.svn-work                                                      |    0 
 data/.svn/wcprops/cups.suse.svn-work                                                     |    0 
 data/.svn/wcprops/euc-cn.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-jp.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-kr.txt.svn-work                                                    |    0 
 data/.svn/wcprops/euc-tw.txt.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-1.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-10.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-10.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-11.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-13.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-13.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-14.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-14.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-15.svn-work                                                   |    0 
 data/.svn/wcprops/iso-8859-15.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-16.txt.svn-work                                               |    0 
 data/.svn/wcprops/iso-8859-2.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-2.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-3.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-3.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-4.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-4.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-5.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-5.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-6.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-6.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-7.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-7.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-8.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-8.txt.svn-work                                                |    0 
 data/.svn/wcprops/iso-8859-9.svn-work                                                    |    0 
 data/.svn/wcprops/iso-8859-9.txt.svn-work                                                |    0 
 data/.svn/wcprops/koi8-r.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-r.txt.svn-work                                                    |    0 
 data/.svn/wcprops/koi8-u.svn-work                                                        |    0 
 data/.svn/wcprops/koi8-u.txt.svn-work                                                    |    0 
 data/.svn/wcprops/mac-roman.txt.svn-work                                                 |    0 
 data/.svn/wcprops/psglyphs.svn-work                                                      |    0 
 data/.svn/wcprops/secret.svn-work                                                        |    0 
 data/.svn/wcprops/smiley.ps.svn-work                                                     |    0 
 data/.svn/wcprops/standard.svn-work                                                      |    0 
 data/.svn/wcprops/testprint.ps.svn-work                                                  |    0 
 data/.svn/wcprops/topsecret.svn-work                                                     |    0 
 data/.svn/wcprops/unclassified.svn-work                                                  |    0 
 data/.svn/wcprops/utf-8.svn-work                                                         |    0 
 data/.svn/wcprops/windows-1250.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1250.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1251.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1251.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1252.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1252.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1253.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1253.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1254.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1254.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1255.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1255.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1256.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1256.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1257.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1257.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1258.svn-work                                                  |    0 
 data/.svn/wcprops/windows-1258.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-1361.txt.svn-work                                              |    0 
 data/.svn/wcprops/windows-874.svn-work                                                   |    0 
 data/.svn/wcprops/windows-874.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-932.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-936.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-949.txt.svn-work                                               |    0 
 data/.svn/wcprops/windows-950.txt.svn-work                                               |    0 
 desktop/.svn/dir-wcprops                                                                 |    0 
 desktop/.svn/entries                                                                     |    0 
 desktop/.svn/wcprops/cups-128.png.svn-work                                               |    0 
 desktop/.svn/wcprops/cups-16.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-32.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups-64.png.svn-work                                                |    0 
 desktop/.svn/wcprops/cups.desktop.svn-work                                               |    0 
 doc/.svn/dir-wcprops                                                                     |    0 
 doc/.svn/entries                                                                         |    0 
 doc/.svn/text-base/Makefile.svn-base                                                     |    0 
 doc/.svn/wcprops/Makefile.svn-work                                                       |    0 
 doc/.svn/wcprops/cups-printable.css.svn-work                                             |    0 
 doc/.svn/wcprops/cups.css.svn-work                                                       |    0 
 doc/.svn/wcprops/favicon.ico.svn-work                                                    |    0 
 doc/.svn/wcprops/idd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/index.html.in.svn-work                                                  |    0 
 doc/.svn/wcprops/printing-overview.shtml.svn-work                                        |    0 
 doc/.svn/wcprops/robots.txt.svn-work                                                     |    0 
 doc/.svn/wcprops/sdd.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/sps.shtml.svn-work                                                      |    0 
 doc/.svn/wcprops/system-overview.shtml.svn-work                                          |    0 
 doc/Makefile                                                                             |   18 
 doc/es/.svn/dir-wcprops                                                                  |    0 
 doc/es/.svn/entries                                                                      |    0 
 doc/es/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/es/images/.svn/dir-wcprops                                                           |    0 
 doc/es/images/.svn/entries                                                               |    0 
 doc/es/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/es/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/es/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/es/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/es/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/es/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/es/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/es/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/es/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/es/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/es/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/es/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/es/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/es/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/es/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/es/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/es/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/es/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/help/.svn/dir-wcprops                                                                |    0 
 doc/help/.svn/entries                                                                    |    0 
 doc/help/.svn/prop-base/policies.html.svn-base                                           |    0 
 doc/help/.svn/prop-base/ref-mailto-conf.html.svn-base                                    |    0 
 doc/help/.svn/props/policies.html.svn-work                                               |    0 
 doc/help/.svn/props/ref-mailto-conf.html.svn-work                                        |    0 
 doc/help/.svn/text-base/policies.html.svn-base                                           |    0 
 doc/help/.svn/text-base/ref-mailto-conf.html.svn-base                                    |    0 
 doc/help/.svn/text-base/spec-raster.html.svn-base                                        |    0 
 doc/help/.svn/wcprops/api-array.html.svn-work                                            |    0 
 doc/help/.svn/wcprops/api-cups.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/api-filedir.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-filter.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/api-httpipp.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/api-ppd.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/api-raster.html.svn-work                                           |    0 
 doc/help/.svn/wcprops/cgi.html.svn-work                                                  |    0 
 doc/help/.svn/wcprops/glossary.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/license.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/network.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/options.html.svn-work                                              |    0 
 doc/help/.svn/wcprops/overview.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/policies.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/ref-access_log.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-classes-conf.html.svn-work                                     |    0 
 doc/help/.svn/wcprops/ref-client-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-cupsd-conf.html.svn-work                                       |    0 
 doc/help/.svn/wcprops/ref-error_log.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-mailto-conf.html.svn-work                                      |    0 
 doc/help/.svn/wcprops/ref-page_log.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/ref-printers-conf.html.svn-work                                    |    0 
 doc/help/.svn/wcprops/ref-snmp-conf.html.svn-work                                        |    0 
 doc/help/.svn/wcprops/ref-subscriptions-conf.html.svn-work                               |    0 
 doc/help/.svn/wcprops/security.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-cmp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-command.html.svn-work                                         |    0 
 doc/help/.svn/wcprops/spec-design.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-ipp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-ppd.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/spec-raster.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/spec-stp.html.svn-work                                             |    0 
 doc/help/.svn/wcprops/standard.html.in.svn-work                                          |    0 
 doc/help/.svn/wcprops/translation.html.svn-work                                          |    0 
 doc/help/.svn/wcprops/whatsnew.html.svn-work                                             |    0 
 doc/help/policies.html                                                                   |  498 +++++
 doc/help/ref-mailto-conf.html                                                            |  105 +
 doc/help/spec-raster.html                                                                |   32 
 doc/images/.svn/dir-wcprops                                                              |    0 
 doc/images/.svn/entries                                                                  |    0 
 doc/images/.svn/wcprops/bottom-left.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/bottom-right.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-accept-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-class.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-add-printer.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-add-this-printer.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-cancel-job.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-change-settings.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-clear.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/button-continue.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-delete-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-delete-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                      |    0 
 doc/images/.svn/wcprops/button-export-samba.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-help.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/button-hold-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-manage-classes.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-manage-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-manage-printers.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-manage-server.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-modify-class.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-modify-printer.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-move-job.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-move-jobs.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                         |    0 
 doc/images/.svn/wcprops/button-print-test-page.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-publish-printer.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-reject-jobs.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-release-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-restart-job.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-save-changes.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-search.gif.svn-work                                       |    0 
 doc/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-set-as-default.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-set-printer-options.gif.svn-work                          |    0 
 doc/images/.svn/wcprops/button-show-active.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-show-all.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/button-show-completed.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-show-next.gif.svn-work                                    |    0 
 doc/images/.svn/wcprops/button-show-previous.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-sort-ascending.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-sort-descending.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-start-class.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/button-start-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-stop-class.gif.svn-work                                   |    0 
 doc/images/.svn/wcprops/button-stop-printer.gif.svn-work                                 |    0 
 doc/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                            |    0 
 doc/images/.svn/wcprops/button-use-default-config.gif.svn-work                           |    0 
 doc/images/.svn/wcprops/button-view-access-log.gif.svn-work                              |    0 
 doc/images/.svn/wcprops/button-view-error-log.gif.svn-work                               |    0 
 doc/images/.svn/wcprops/button-view-page-log.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/button-view-printable-version.gif.svn-work                       |    0 
 doc/images/.svn/wcprops/classes.gif.svn-work                                             |    0 
 doc/images/.svn/wcprops/classes.svg.svn-work                                             |    0 
 doc/images/.svn/wcprops/cups-black-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-black-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-block-diagram.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-block-diagram.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/cups-green-button-2.2.scm.svn-work                               |    0 
 doc/images/.svn/wcprops/cups-green-button.scm.svn-work                                   |    0 
 doc/images/.svn/wcprops/cups-large.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-medium.gif.svn-work                                         |    0 
 doc/images/.svn/wcprops/cups-red-button-2.2.scm.svn-work                                 |    0 
 doc/images/.svn/wcprops/cups-red-button.scm.svn-work                                     |    0 
 doc/images/.svn/wcprops/cups-small.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/cups-standard-button-2.2.scm.svn-work                            |    0 
 doc/images/.svn/wcprops/cups-standard-button.scm.svn-work                                |    0 
 doc/images/.svn/wcprops/draft.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/esp-logo.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/happy.gif.svn-work                                               |    0 
 doc/images/.svn/wcprops/logo.gif.svn-work                                                |    0 
 doc/images/.svn/wcprops/printer-idle.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-idle.svg.svn-work                                        |    0 
 doc/images/.svn/wcprops/printer-processing.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-processing.svg.svn-work                                  |    0 
 doc/images/.svn/wcprops/printer-stopped.gif.svn-work                                     |    0 
 doc/images/.svn/wcprops/printer-stopped.svg.svn-work                                     |    0 
 doc/images/.svn/wcprops/smiley.jpg.svn-work                                              |    0 
 doc/images/.svn/wcprops/tab-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/tab-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/top-left.gif.svn-work                                            |    0 
 doc/images/.svn/wcprops/top-middle.gif.svn-work                                          |    0 
 doc/images/.svn/wcprops/top-right.gif.svn-work                                           |    0 
 doc/images/.svn/wcprops/web-add-this-printer.gif.svn-work                                |    0 
 doc/images/.svn/wcprops/web-password.gif.svn-work                                        |    0 
 doc/images/.svn/wcprops/web-printer-driver.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-printer-status.gif.svn-work                                  |    0 
 doc/images/.svn/wcprops/web-set-printer-options.gif.svn-work                             |    0 
 doc/images/.svn/wcprops/web-test-page.gif.svn-work                                       |    0 
 doc/ja/.svn/dir-wcprops                                                                  |    0 
 doc/ja/.svn/entries                                                                      |    0 
 doc/ja/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/ja/images/.svn/dir-wcprops                                                           |    0 
 doc/ja/images/.svn/entries                                                               |    0 
 doc/ja/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/ja/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/ja/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/ja/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/ja/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/ja/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/ja/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/ja/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/ja/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/ja/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/ja/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/ja/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/ja/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/ja/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/ja/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/ja/images/.svn/wcprops/show-all-jobs.gif.svn-work                                    |    0 
 doc/pl/.svn/dir-wcprops                                                                  |    0 
 doc/pl/.svn/entries                                                                      |    0 
 doc/pl/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/pl/images/.svn/dir-wcprops                                                           |    0 
 doc/pl/images/.svn/entries                                                               |    0 
 doc/pl/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/pl/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/pl/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/pl/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/pl/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/pl/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/pl/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/pl/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/pl/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/pl/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/pl/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/pl/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/pl/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/pl/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/pl/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/pl/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/pl/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/pl/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 doc/sv/.svn/dir-wcprops                                                                  |    0 
 doc/sv/.svn/entries                                                                      |    0 
 doc/sv/.svn/wcprops/index.html.in.svn-work                                               |    0 
 doc/sv/images/.svn/dir-wcprops                                                           |    0 
 doc/sv/images/.svn/entries                                                               |    0 
 doc/sv/images/.svn/wcprops/button-accept-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-class.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-add-printer.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-add-this-printer.gif.svn-work                          |    0 
 doc/sv/images/.svn/wcprops/button-cancel-all-jobs.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-cancel-job.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-change-settings.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-clean-print-heads.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-clear.gif.svn-work                                     |    0 
 doc/sv/images/.svn/wcprops/button-continue.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-delete-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-delete-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-edit-configuration-file.gif.svn-work                   |    0 
 doc/sv/images/.svn/wcprops/button-export-samba.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-help.gif.svn-work                                      |    0 
 doc/sv/images/.svn/wcprops/button-hold-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-manage-classes.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-manage-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-manage-printers.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-manage-server.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-modify-class.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-modify-printer.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-move-job.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-move-jobs.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-print-self-test-page.gif.svn-work                      |    0 
 doc/sv/images/.svn/wcprops/button-print-test-page.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-publish-printer.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-reject-jobs.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-release-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-restart-job.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-save-changes.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-search.gif.svn-work                                    |    0 
 doc/sv/images/.svn/wcprops/button-set-allowed-users.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-set-as-default.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-set-printer-options.gif.svn-work                       |    0 
 doc/sv/images/.svn/wcprops/button-show-active.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-show-all.gif.svn-work                                  |    0 
 doc/sv/images/.svn/wcprops/button-show-completed.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-show-next.gif.svn-work                                 |    0 
 doc/sv/images/.svn/wcprops/button-show-previous.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-sort-ascending.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-sort-descending.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-start-class.gif.svn-work                               |    0 
 doc/sv/images/.svn/wcprops/button-start-printer.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-stop-class.gif.svn-work                                |    0 
 doc/sv/images/.svn/wcprops/button-stop-printer.gif.svn-work                              |    0 
 doc/sv/images/.svn/wcprops/button-unpublish-printer.gif.svn-work                         |    0 
 doc/sv/images/.svn/wcprops/button-use-default-config.gif.svn-work                        |    0 
 doc/sv/images/.svn/wcprops/button-view-access-log.gif.svn-work                           |    0 
 doc/sv/images/.svn/wcprops/button-view-error-log.gif.svn-work                            |    0 
 doc/sv/images/.svn/wcprops/button-view-page-log.gif.svn-work                             |    0 
 doc/sv/images/.svn/wcprops/button-view-printable-version.gif.svn-work                    |    0 
 driver/.svn/dir-wcprops                                                                  |    0 
 driver/.svn/entries                                                                      |    0 
 driver/.svn/wcprops/testdriver.c.svn-work                                                |    0 
 filter/.svn/dir-prop-base                                                                |    0 
 filter/.svn/dir-props                                                                    |    0 
 filter/.svn/dir-wcprops                                                                  |    0 
 filter/.svn/entries                                                                      |    0 
 filter/.svn/prop-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/props/rasterbench.c.svn-work                                                 |    0 
 filter/.svn/text-base/Makefile.svn-base                                                  |    0 
 filter/.svn/text-base/pstops.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.c.svn-base                                                  |    0 
 filter/.svn/text-base/raster.h.svn-base                                                  |    0 
 filter/.svn/text-base/rasterbench.c.svn-base                                             |    0 
 filter/.svn/text-base/rastertolabel.c.svn-base                                           |    0 
 filter/.svn/wcprops/Dependencies.svn-work                                                |    0 
 filter/.svn/wcprops/Makefile.svn-work                                                    |    0 
 filter/.svn/wcprops/api-raster.shtml.svn-work                                            |    0 
 filter/.svn/wcprops/common.c.svn-work                                                    |    0 
 filter/.svn/wcprops/common.h.svn-work                                                    |    0 
 filter/.svn/wcprops/form-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form-ps.c.svn-work                                                   |    0 
 filter/.svn/wcprops/form-tree.c.svn-work                                                 |    0 
 filter/.svn/wcprops/form.h.svn-work                                                      |    0 
 filter/.svn/wcprops/gziptoany.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-attr.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-char.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-config.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-input.c.svn-work                                                |    0 
 filter/.svn/wcprops/hpgl-main.c.svn-work                                                 |    0 
 filter/.svn/wcprops/hpgl-polygon.c.svn-work                                              |    0 
 filter/.svn/wcprops/hpgl-prolog.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgl-vector.c.svn-work                                               |    0 
 filter/.svn/wcprops/hpgltops.h.svn-work                                                  |    0 
 filter/.svn/wcprops/image-bmp.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-colorspace.c.svn-work                                          |    0 
 filter/.svn/wcprops/image-gif.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-jpeg.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-photocd.c.svn-work                                             |    0 
 filter/.svn/wcprops/image-pix.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-png.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-pnm.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-private.h.svn-work                                             |    0 
 filter/.svn/wcprops/image-sgi.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgi.h.svn-work                                                 |    0 
 filter/.svn/wcprops/image-sgilib.c.svn-work                                              |    0 
 filter/.svn/wcprops/image-sun.c.svn-work                                                 |    0 
 filter/.svn/wcprops/image-tiff.c.svn-work                                                |    0 
 filter/.svn/wcprops/image-zoom.c.svn-work                                                |    0 
 filter/.svn/wcprops/image.c.svn-work                                                     |    0 
 filter/.svn/wcprops/image.h.svn-work                                                     |    0 
 filter/.svn/wcprops/imagetops.c.svn-work                                                 |    0 
 filter/.svn/wcprops/imagetoraster.c.svn-work                                             |    0 
 filter/.svn/wcprops/interpret.c.svn-work                                                 |    0 
 filter/.svn/wcprops/libcupsimage_s.exp.svn-work                                          |    0 
 filter/.svn/wcprops/pstops.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.c.svn-work                                                    |    0 
 filter/.svn/wcprops/raster.h.svn-work                                                    |    0 
 filter/.svn/wcprops/rasterbench.c.svn-work                                               |    0 
 filter/.svn/wcprops/rastertoepson.c.svn-work                                             |    0 
 filter/.svn/wcprops/rastertohp.c.svn-work                                                |    0 
 filter/.svn/wcprops/rastertolabel.c.svn-work                                             |    0 
 filter/.svn/wcprops/testimage.c.svn-work                                                 |    0 
 filter/.svn/wcprops/testraster.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.c.svn-work                                                |    0 
 filter/.svn/wcprops/textcommon.h.svn-work                                                |    0 
 filter/.svn/wcprops/texttops.c.svn-work                                                  |    0 
 filter/Makefile                                                                          |   20 
 filter/pstops.c                                                                          |   95 -
 filter/raster.c                                                                          |  683 +++----
 filter/raster.h                                                                          |   11 
 filter/rasterbench.c                                                                     |  355 ++++
 filter/rastertolabel.c                                                                   |   13 
 fonts/.svn/dir-wcprops                                                                   |    0 
 fonts/.svn/entries                                                                       |    0 
 fonts/.svn/wcprops/Courier-Bold.svn-work                                                 |    0 
 fonts/.svn/wcprops/Courier-BoldOblique.svn-work                                          |    0 
 fonts/.svn/wcprops/Courier-Oblique.svn-work                                              |    0 
 fonts/.svn/wcprops/Courier.svn-work                                                      |    0 
 fonts/.svn/wcprops/Makefile.svn-work                                                     |    0 
 fonts/.svn/wcprops/Symbol.svn-work                                                       |    0 
 init/.svn/dir-wcprops                                                                    |    0 
 init/.svn/entries                                                                        |    0 
 init/.svn/wcprops/Localizable.strings.svn-work                                           |    0 
 init/.svn/wcprops/PrintingServices.svn-work                                              |    0 
 init/.svn/wcprops/StartupParameters.plist.svn-work                                       |    0 
 init/.svn/wcprops/cups-lpd.in.svn-work                                                   |    0 
 init/.svn/wcprops/cups.sh.in.svn-work                                                    |    0 
 init/.svn/wcprops/org.cups.cupsd.plist.svn-work                                          |    0 
 locale/.svn/dir-wcprops                                                                  |    0 
 locale/.svn/entries                                                                      |    0 
 locale/.svn/text-base/Makefile.svn-base                                                  |    0 
 locale/.svn/text-base/cups_es.po.svn-base                                                |    0 
 locale/.svn/text-base/cups_ja.po.svn-base                                                |    0 
 locale/.svn/wcprops/Makefile.svn-work                                                    |    0 
 locale/.svn/wcprops/cups.footer.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.header.svn-work                                                 |    0 
 locale/.svn/wcprops/cups.pot.svn-work                                                    |    0 
 locale/.svn/wcprops/cups_es.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_ja.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_pl.po.svn-work                                                  |    0 
 locale/.svn/wcprops/cups_sv.po.svn-work                                                  |    0 
 locale/.svn/wcprops/locale.txt.svn-work                                                  |    0 
 locale/.svn/wcprops/translate.c.svn-work                                                 |    0 
 locale/Makefile                                                                          |   14 
 locale/cups_es.po                                                                        |  482 +----
 locale/cups_ja.po                                                                        |    9 
 man/.svn/dir-wcprops                                                                     |    0 
 man/.svn/entries                                                                         |    0 
 man/.svn/text-base/Makefile.svn-base                                                     |    0 
 man/.svn/text-base/cupsaddsmb.man.in.svn-base                                            |    0 
 man/.svn/text-base/cupsd.conf.man.in.svn-base                                            |    0 
 man/.svn/text-base/lpadmin.man.svn-base                                                  |    0 
 man/.svn/text-base/mailto.conf.man.svn-base                                              |    0 
 man/.svn/wcprops/Makefile.svn-work                                                       |    0 
 man/.svn/wcprops/accept.man.svn-work                                                     |    0 
 man/.svn/wcprops/backend.man.svn-work                                                    |    0 
 man/.svn/wcprops/cancel.man.svn-work                                                     |    0 
 man/.svn/wcprops/classes.conf.man.svn-work                                               |    0 
 man/.svn/wcprops/client.conf.man.in.svn-work                                             |    0 
 man/.svn/wcprops/cups-config.man.svn-work                                                |    0 
 man/.svn/wcprops/cups-deviced.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-driverd.man.in.svn-work                                            |    0 
 man/.svn/wcprops/cups-lpd.man.in.svn-work                                                |    0 
 man/.svn/wcprops/cups-polld.man.svn-work                                                 |    0 
 man/.svn/wcprops/cups-snmp.conf.man.svn-work                                             |    0 
 man/.svn/wcprops/cupsaddsmb.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.conf.man.in.svn-work                                              |    0 
 man/.svn/wcprops/cupsd.man.in.svn-work                                                   |    0 
 man/.svn/wcprops/cupsenable.man.svn-work                                                 |    0 
 man/.svn/wcprops/cupstestdsc.man.svn-work                                                |    0 
 man/.svn/wcprops/cupstestppd.man.svn-work                                                |    0 
 man/.svn/wcprops/filter.man.svn-work                                                     |    0 
 man/.svn/wcprops/lp.man.svn-work                                                         |    0 
 man/.svn/wcprops/lpadmin.man.svn-work                                                    |    0 
 man/.svn/wcprops/lpc.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpinfo.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpmove.man.svn-work                                                     |    0 
 man/.svn/wcprops/lpoptions.man.in.svn-work                                               |    0 
 man/.svn/wcprops/lppasswd.man.svn-work                                                   |    0 
 man/.svn/wcprops/lpq.man.svn-work                                                        |    0 
 man/.svn/wcprops/lpr.man.svn-work                                                        |    0 
 man/.svn/wcprops/lprm.man.svn-work                                                       |    0 
 man/.svn/wcprops/lpstat.man.svn-work                                                     |    0 
 man/.svn/wcprops/mailto.conf.man.svn-work                                                |    0 
 man/.svn/wcprops/mantohtml.c.svn-work                                                    |    0 
 man/.svn/wcprops/mime.convs.man.svn-work                                                 |    0 
 man/.svn/wcprops/mime.types.man.svn-work                                                 |    0 
 man/.svn/wcprops/printers.conf.man.svn-work                                              |    0 
 man/.svn/wcprops/subscriptions.conf.man.svn-work                                         |    0 
 man/Makefile                                                                             |    5 
 man/cupsaddsmb.man.in                                                                    |   21 
 man/cupsd.conf.man.in                                                                    |   10 
 man/lpadmin.man                                                                          |   33 
 man/mailto.conf.man                                                                      |   69 
 monitor/.svn/dir-wcprops                                                                 |    0 
 monitor/.svn/entries                                                                     |    0 
 monitor/.svn/wcprops/Dependencies.svn-work                                               |    0 
 monitor/.svn/wcprops/Makefile.svn-work                                                   |    0 
 monitor/.svn/wcprops/bcp.c.svn-work                                                      |    0 
 monitor/.svn/wcprops/tbcp.c.svn-work                                                     |    0 
 notifier/.svn/dir-wcprops                                                                |    0 
 notifier/.svn/entries                                                                    |    0 
 notifier/.svn/text-base/testnotify.c.svn-base                                            |    0 
 notifier/.svn/wcprops/Dependencies.svn-work                                              |    0 
 notifier/.svn/wcprops/Makefile.svn-work                                                  |    0 
 notifier/.svn/wcprops/mailto.c.svn-work                                                  |    0 
 notifier/.svn/wcprops/testnotify.c.svn-work                                              |    0 
 notifier/testnotify.c                                                                    |   12 
 packaging/.svn/dir-wcprops                                                               |    0 
 packaging/.svn/entries                                                                   |    0 
 packaging/.svn/text-base/cups.list.in.svn-base                                           |    0 
 packaging/.svn/text-base/cups.spec.in.svn-base                                           |    0 
 packaging/.svn/wcprops/LICENSE.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/WELCOME.rtf.svn-work                                              |    0 
 packaging/.svn/wcprops/cups-dbus.conf.svn-work                                           |    0 
 packaging/.svn/wcprops/cups-desc.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups-info.plist.in.svn-work                                       |    0 
 packaging/.svn/wcprops/cups.list.in.svn-work                                             |    0 
 packaging/.svn/wcprops/cups.readme.svn-work                                              |    0 
 packaging/.svn/wcprops/cups.spec.in.svn-work                                             |    0 
 packaging/.svn/wcprops/installer.tif.svn-work                                            |    0 
 packaging/.svn/wcprops/installer.xcf.gz.svn-work                                         |    0 
 packaging/cups.list.in                                                                   |   12 
 packaging/cups.spec.in                                                                   |    8 
 pdftops/.svn/dir-wcprops                                                                 |    0 
 pdftops/.svn/entries                                                                     |    0 
 pdftops/.svn/text-base/PSOutputDev.cxx.svn-base                                          |    0 
 pdftops/.svn/wcprops/Annot.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Annot.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Array.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Array.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/BuiltinFont.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/BuiltinFont.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/BuiltinFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CMap.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/CMap.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/COPYING.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Catalog.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Catalog.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.cxx.svn-work                                      |    0 
 pdftops/.svn/wcprops/CharCodeToUnicode.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/CharTypes.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/CompactFontTables.h.svn-work                                        |    0 
 pdftops/.svn/wcprops/Decrypt.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Decrypt.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Dependencies.svn-work                                               |    0 
 pdftops/.svn/wcprops/Dict.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Dict.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Error.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Error.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/ErrorCodes.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/FoFiBase.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/FoFiEncodings.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/FoFiEncodings.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/FoFiTrueType.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/FoFiTrueType.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/FoFiType1.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/FoFiType1C.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/FoFiType1C.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/FontEncodingTables.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/FontEncodingTables.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Function.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/Function.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GHash.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GHash.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GList.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GList.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/GMutex.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/GString.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GString.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Gfx.cxx.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Gfx.h.svn-work                                                      |    0 
 pdftops/.svn/wcprops/GfxFont.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/GfxFont.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/GfxState.cxx.svn-work                                               |    0 
 pdftops/.svn/wcprops/GfxState.h.svn-work                                                 |    0 
 pdftops/.svn/wcprops/GlobalParams.cxx.svn-work                                           |    0 
 pdftops/.svn/wcprops/GlobalParams.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.cxx.svn-work                                     |    0 
 pdftops/.svn/wcprops/JArithmeticDecoder.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/JBIG2Stream.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/JBIG2Stream.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/JPXStream.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/Lexer.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/Lexer.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/Link.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Link.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Makefile.svn-work                                                   |    0 
 pdftops/.svn/wcprops/NameToCharCode.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/NameToCharCode.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/NameToUnicodeTable.h.svn-work                                       |    0 
 pdftops/.svn/wcprops/Object.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Object.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Outline.cxx.svn-work                                                |    0 
 pdftops/.svn/wcprops/Outline.h.svn-work                                                  |    0 
 pdftops/.svn/wcprops/OutputDev.cxx.svn-work                                              |    0 
 pdftops/.svn/wcprops/OutputDev.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/PDFDoc.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/PDFDoc.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.cxx.svn-work                                         |    0 
 pdftops/.svn/wcprops/PDFDocEncoding.h.svn-work                                           |    0 
 pdftops/.svn/wcprops/PSOutputDev.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSOutputDev.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/PSTokenizer.cxx.svn-work                                            |    0 
 pdftops/.svn/wcprops/PSTokenizer.h.svn-work                                              |    0 
 pdftops/.svn/wcprops/Page.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/Page.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/Parser.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Parser.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/README.svn-work                                                     |    0 
 pdftops/.svn/wcprops/SecurityHandler.cxx.svn-work                                        |    0 
 pdftops/.svn/wcprops/SecurityHandler.h.svn-work                                          |    0 
 pdftops/.svn/wcprops/Stream-CCITT.h.svn-work                                             |    0 
 pdftops/.svn/wcprops/Stream.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/Stream.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/UTF8.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/UnicodeMap.cxx.svn-work                                             |    0 
 pdftops/.svn/wcprops/UnicodeMap.h.svn-work                                               |    0 
 pdftops/.svn/wcprops/UnicodeMapTables.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.cxx.svn-work                                       |    0 
 pdftops/.svn/wcprops/UnicodeTypeTable.h.svn-work                                         |    0 
 pdftops/.svn/wcprops/XRef.cxx.svn-work                                                   |    0 
 pdftops/.svn/wcprops/XRef.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.cxx.svn-work                                          |    0 
 pdftops/.svn/wcprops/XpdfPluginAPI.h.svn-work                                            |    0 
 pdftops/.svn/wcprops/config.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/gfile.cxx.svn-work                                                  |    0 
 pdftops/.svn/wcprops/gfile.h.svn-work                                                    |    0 
 pdftops/.svn/wcprops/gmem.c.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmem.h.svn-work                                                     |    0 
 pdftops/.svn/wcprops/gmempp.cxx.svn-work                                                 |    0 
 pdftops/.svn/wcprops/gtypes.h.svn-work                                                   |    0 
 pdftops/.svn/wcprops/parseargs.c.svn-work                                                |    0 
 pdftops/.svn/wcprops/parseargs.h.svn-work                                                |    0 
 pdftops/.svn/wcprops/pdftops.cxx.svn-work                                                |    0 
 pdftops/PSOutputDev.cxx                                                                  |    2 
 ppd/.svn/dir-wcprops                                                                     |    0 
 ppd/.svn/entries                                                                         |    0 
 ppd/.svn/text-base/zebracpl.ppd.svn-base                                                 |    0 
 ppd/.svn/wcprops/Makefile.svn-work                                                       |    0 
 ppd/.svn/wcprops/deskjet.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/deskjet2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/dymo.ppd.svn-work                                                       |    0 
 ppd/.svn/wcprops/epson24.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/epson9.ppd.svn-work                                                     |    0 
 ppd/.svn/wcprops/laserjet.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidat24.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/okidata9.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stcolor.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stcolor2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/stphoto.ppd.svn-work                                                    |    0 
 ppd/.svn/wcprops/stphoto2.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebra.ppd.svn-work                                                      |    0 
 ppd/.svn/wcprops/zebracpl.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep1.ppd.svn-work                                                   |    0 
 ppd/.svn/wcprops/zebraep2.ppd.svn-work                                                   |    0 
 ppd/zebracpl.ppd                                                                         |    8 
 scheduler/.svn/dir-wcprops                                                               |    0 
 scheduler/.svn/entries                                                                   |    0 
 scheduler/.svn/text-base/Makefile.svn-base                                               |    0 
 scheduler/.svn/text-base/auth.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/client.c.svn-base                                               |    0 
 scheduler/.svn/text-base/conf.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/conf.h.svn-base                                                 |    0 
 scheduler/.svn/text-base/dirsvc.c.svn-base                                               |    0 
 scheduler/.svn/text-base/filter.c.svn-base                                               |    0 
 scheduler/.svn/text-base/ipp.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/job.c.svn-base                                                  |    0 
 scheduler/.svn/text-base/listen.c.svn-base                                               |    0 
 scheduler/.svn/text-base/main.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/mime.c.svn-base                                                 |    0 
 scheduler/.svn/text-base/printers.c.svn-base                                             |    0 
 scheduler/.svn/text-base/subscriptions.c.svn-base                                        |    0 
 scheduler/.svn/text-base/subscriptions.h.svn-base                                        |    0 
 scheduler/.svn/text-base/testmime.c.svn-base                                             |    0 
 scheduler/.svn/wcprops/Dependencies.svn-work                                             |    0 
 scheduler/.svn/wcprops/Makefile.svn-work                                                 |    0 
 scheduler/.svn/wcprops/auth.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/auth.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/banners.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/banners.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/cert.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cert.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/classes.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/classes.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/client.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/client.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/conf.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/conf.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/cups-deviced.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-driverd.c.svn-work                                           |    0 
 scheduler/.svn/wcprops/cups-lpd.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/cups-polld.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/cups.pam.svn-work                                                 |    0 
 scheduler/.svn/wcprops/cupsd.h.svn-work                                                  |    0 
 scheduler/.svn/wcprops/dirsvc.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/dirsvc.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/env.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/filter.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/ipp.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/job.h.svn-work                                                    |    0 
 scheduler/.svn/wcprops/listen.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/log.c.svn-work                                                    |    0 
 scheduler/.svn/wcprops/main.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/mime.h.svn-work                                                   |    0 
 scheduler/.svn/wcprops/network.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/network.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/policy.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/policy.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/printers.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/printers.h.svn-work                                               |    0 
 scheduler/.svn/wcprops/process.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/quotas.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/server.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/statbuf.c.svn-work                                                |    0 
 scheduler/.svn/wcprops/statbuf.h.svn-work                                                |    0 
 scheduler/.svn/wcprops/subscriptions.c.svn-work                                          |    0 
 scheduler/.svn/wcprops/subscriptions.h.svn-work                                          |    0 
 scheduler/.svn/wcprops/sysman.c.svn-work                                                 |    0 
 scheduler/.svn/wcprops/sysman.h.svn-work                                                 |    0 
 scheduler/.svn/wcprops/testdirsvc.c.svn-work                                             |    0 
 scheduler/.svn/wcprops/testmime.c.svn-work                                               |    0 
 scheduler/.svn/wcprops/testspeed.c.svn-work                                              |    0 
 scheduler/.svn/wcprops/type.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.c.svn-work                                                   |    0 
 scheduler/.svn/wcprops/util.h.svn-work                                                   |    0 
 scheduler/Makefile                                                                       |    7 
 scheduler/auth.c                                                                         |    9 
 scheduler/client.c                                                                       |   42 
 scheduler/conf.c                                                                         |  189 +-
 scheduler/conf.h                                                                         |    5 
 scheduler/dirsvc.c                                                                       |  110 -
 scheduler/filter.c                                                                       |    8 
 scheduler/ipp.c                                                                          |   76 
 scheduler/job.c                                                                          |  124 -
 scheduler/listen.c                                                                       |    8 
 scheduler/main.c                                                                         |    8 
 scheduler/mime.c                                                                         |   19 
 scheduler/printers.c                                                                     |   48 
 scheduler/subscriptions.c                                                                |  405 ++--
 scheduler/subscriptions.h                                                                |   10 
 scheduler/testmime.c                                                                     |    6 
 scripting/.svn/dir-wcprops                                                               |    0 
 scripting/.svn/entries                                                                   |    0 
 scripting/java/.svn/dir-wcprops                                                          |    0 
 scripting/java/.svn/entries                                                              |    0 
 scripting/java/.svn/wcprops/CUPSPrinter.java.svn-work                                    |    0 
 scripting/java/.svn/wcprops/cups.jar.svn-work                                            |    0 
 scripting/java/classes/.svn/dir-wcprops                                                  |    0 
 scripting/java/classes/.svn/entries                                                      |    0 
 scripting/java/classes/com/.svn/dir-wcprops                                              |    0 
 scripting/java/classes/com/.svn/entries                                                  |    0 
 scripting/java/classes/com/easysw/.svn/dir-wcprops                                       |    0 
 scripting/java/classes/com/easysw/.svn/entries                                           |    0 
 scripting/java/classes/com/easysw/cups/.svn/dir-wcprops                                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/entries                                      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/Cups.class.svn-work                  |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsJob.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/CupsPrinter.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPP.class.svn-work                   |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPAttribute.class.svn-work          |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPCalendar.class.svn-work           |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPDefs.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPError.class.svn-work              |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPHttp.class.svn-work               |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPMD5.class.svn-work                |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPRequest.class.svn-work            |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPStatus.class.svn-work             |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPURLConnection.class.svn-work      |    0 
 scripting/java/classes/com/easysw/cups/.svn/wcprops/IPPValue.class.svn-work              |    0 
 scripting/java/docs/.svn/dir-wcprops                                                     |    0 
 scripting/java/docs/.svn/entries                                                         |    0 
 scripting/java/docs/.svn/wcprops/allclasses-frame.html.svn-work                          |    0 
 scripting/java/docs/.svn/wcprops/deprecated-list.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/help-doc.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/index-all.html.svn-work                                 |    0 
 scripting/java/docs/.svn/wcprops/index.html.svn-work                                     |    0 
 scripting/java/docs/.svn/wcprops/overview-tree.html.svn-work                             |    0 
 scripting/java/docs/.svn/wcprops/package-list.svn-work                                   |    0 
 scripting/java/docs/.svn/wcprops/packages.html.svn-work                                  |    0 
 scripting/java/docs/.svn/wcprops/serialized-form.html.svn-work                           |    0 
 scripting/java/docs/.svn/wcprops/stylesheet.css.svn-work                                 |    0 
 scripting/java/docs/com/.svn/dir-wcprops                                                 |    0 
 scripting/java/docs/com/.svn/entries                                                     |    0 
 scripting/java/docs/com/easysw/.svn/dir-wcprops                                          |    0 
 scripting/java/docs/com/easysw/.svn/entries                                              |    0 
 scripting/java/docs/com/easysw/cups/.svn/dir-wcprops                                     |    0 
 scripting/java/docs/com/easysw/cups/.svn/entries                                         |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/Cups.html.svn-work                      |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsJob.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/CupsPrinter.html.svn-work               |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPP.html.svn-work                       |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPAttribute.html.svn-work              |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPDefs.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPError.html.svn-work                  |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPHttp.html.svn-work                   |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPRequest.html.svn-work                |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPStatus.html.svn-work                 |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPURLConnection.html.svn-work          |    0 
 scripting/java/docs/com/easysw/cups/.svn/wcprops/IPPValue.html.svn-work                  |    0 
 scripting/java/example/.svn/dir-wcprops                                                  |    0 
 scripting/java/example/.svn/entries                                                      |    0 
 scripting/java/example/.svn/wcprops/GLP.class.svn-work                                   |    0 
 scripting/java/example/.svn/wcprops/GLP.java.svn-work                                    |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPcolors.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPdetail.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPjobList.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPjobTableModel.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$1.class.svn-work                          |    0 
 scripting/java/example/.svn/wcprops/GLPoptions$MyTextListener.class.svn-work             |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.class.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPoptions.java.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.class.svn-work                      |    0 
 scripting/java/example/.svn/wcprops/GLPprinterDetail.java.svn-work                       |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.class.svn-work                           |    0 
 scripting/java/example/.svn/wcprops/GLPprinters.java.svn-work                            |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPsearch.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$1.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$2.class.svn-work              |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel$ButtonListener.class.svn-work |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.class.svn-work                |    0 
 scripting/java/example/.svn/wcprops/GLPsearchProgressPanel.java.svn-work                 |    0 
 scripting/java/example/.svn/wcprops/GLPserver.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPserver.java.svn-work                              |    0 
 scripting/java/example/.svn/wcprops/GLPtabs$1.class.svn-work                             |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPtabs.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/GLPvars.class.svn-work                               |    0 
 scripting/java/example/.svn/wcprops/GLPvars.java.svn-work                                |    0 
 scripting/java/example/.svn/wcprops/buildit.svn-work                                     |    0 
 scripting/java/example/.svn/wcprops/class.list.svn-work                                  |    0 
 scripting/java/example/.svn/wcprops/runit.svn-work                                       |    0 
 scripting/java/example/images/.svn/dir-wcprops                                           |    0 
 scripting/java/example/images/.svn/entries                                               |    0 
 scripting/java/example/images/.svn/wcprops/left.gif.svn-work                             |    0 
 scripting/java/example/images/.svn/wcprops/print-test-page.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/printer-idle.gif.svn-work                     |    0 
 scripting/java/example/images/.svn/wcprops/printer-stopped.gif.svn-work                  |    0 
 scripting/java/example/images/.svn/wcprops/restart-job.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-active.gif.svn-work                      |    0 
 scripting/java/example/images/.svn/wcprops/show-completed.gif.svn-work                   |    0 
 scripting/java/src/.svn/dir-wcprops                                                      |    0 
 scripting/java/src/.svn/entries                                                          |    0 
 scripting/java/src/com/.svn/dir-wcprops                                                  |    0 
 scripting/java/src/com/.svn/entries                                                      |    0 
 scripting/java/src/com/easysw/.svn/dir-wcprops                                           |    0 
 scripting/java/src/com/easysw/.svn/entries                                               |    0 
 scripting/java/src/com/easysw/cups/.svn/dir-wcprops                                      |    0 
 scripting/java/src/com/easysw/cups/.svn/entries                                          |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/Cups.java.svn-work                       |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsJob.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/CupsPrinter.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPP.java.svn-work                        |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPAttribute.java.svn-work               |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPBase64Encoder.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPCalendar.java.svn-work                |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPDefs.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPError.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPHttp.java.svn-work                    |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPMD5.java.svn-work                     |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPRequest.java.svn-work                 |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPStatus.java.svn-work                  |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPURLConnection.java.svn-work           |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/IPPValue.java.svn-work                   |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/buildit.svn-work                         |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/class.list.svn-work                      |    0 
 scripting/java/src/com/easysw/cups/.svn/wcprops/cups.nfo.svn-work                        |    0 
 scripting/perl/.svn/dir-wcprops                                                          |    0 
 scripting/perl/.svn/entries                                                              |    0 
 scripting/perl/.svn/wcprops/CUPS.pm.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/CUPS.xs.svn-work                                             |    0 
 scripting/perl/.svn/wcprops/Makefile.PL.svn-work                                         |    0 
 scripting/perl/.svn/wcprops/README.svn-work                                              |    0 
 scripting/perl/.svn/wcprops/test.pl.svn-work                                             |    0 
 scripting/php/.svn/dir-wcprops                                                           |    0 
 scripting/php/.svn/entries                                                               |    0 
 scripting/php/.svn/wcprops/Dependencies.svn-work                                         |    0 
 scripting/php/.svn/wcprops/Makefile.svn-work                                             |    0 
 scripting/php/.svn/wcprops/README.svn-work                                               |    0 
 scripting/php/.svn/wcprops/phpcups.c.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.h.svn-work                                            |    0 
 scripting/php/.svn/wcprops/phpcups.php.svn-work                                          |    0 
 standards/.svn/dir-wcprops                                                               |    0 
 standards/.svn/entries                                                                   |    0 
 standards/.svn/wcprops/Makefile.svn-work                                                 |    0 
 standards/.svn/wcprops/X.690-0207.pdf.svn-work                                           |    0 
 standards/.svn/wcprops/pwg5100.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.2.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.3.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.5.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.6.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.7.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5100.8.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5101.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.doc.svn-work                                            |    0 
 standards/.svn/wcprops/pwg5105.1.pdf.svn-work                                            |    0 
 standards/.svn/wcprops/rfc1155.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1157.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1179.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1213.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc1321.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2222.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2246.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2487.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2554.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2567.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2568.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2569.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2578.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2595.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2616.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2617.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2790.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2817.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2818.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2821.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2822.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2910.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2911.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc2965.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3196.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3239.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3380.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3381.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3382.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3391.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3510.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3712.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3805.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3986.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3995.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3996.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3997.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc3998.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfc4122.txt.svn-work                                              |    0 
 standards/.svn/wcprops/rfctohtml.c.svn-work                                              |    0 
 standards/.svn/wcprops/wake-on-lan.pdf.svn-work                                          |    0 
 standards/.svn/wcprops/wd-ippmailto10-20050519.pdf.svn-work                              |    0 
 systemv/.svn/dir-wcprops                                                                 |    0 
 systemv/.svn/entries                                                                     |    0 
 systemv/.svn/text-base/Makefile.svn-base                                                 |    0 
 systemv/.svn/text-base/cancel.c.svn-base                                                 |    0 
 systemv/.svn/text-base/lpstat.c.svn-base                                                 |    0 
 systemv/.svn/wcprops/Dependencies.svn-work                                               |    0 
 systemv/.svn/wcprops/Makefile.svn-work                                                   |    0 
 systemv/.svn/wcprops/accept.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cancel.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/cupsaddsmb.c.svn-work                                               |    0 
 systemv/.svn/wcprops/cupstestdsc.c.svn-work                                              |    0 
 systemv/.svn/wcprops/cupstestppd.c.svn-work                                              |    0 
 systemv/.svn/wcprops/lp.c.svn-work                                                       |    0 
 systemv/.svn/wcprops/lpadmin.c.svn-work                                                  |    0 
 systemv/.svn/wcprops/lpinfo.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpmove.c.svn-work                                                   |    0 
 systemv/.svn/wcprops/lpoptions.c.svn-work                                                |    0 
 systemv/.svn/wcprops/lppasswd.c.svn-work                                                 |    0 
 systemv/.svn/wcprops/lpstat.c.svn-work                                                   |    0 
 systemv/Makefile                                                                         |    6 
 systemv/cancel.c                                                                         |    7 
 systemv/lpstat.c                                                                         |   59 
 templates/.svn/dir-wcprops                                                               |    0 
 templates/.svn/entries                                                                   |    0 
 templates/.svn/text-base/Makefile.svn-base                                               |    0 
 templates/.svn/wcprops/Makefile.svn-work                                                 |    0 
 templates/.svn/wcprops/add-class.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/add-printer.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/admin.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/choose-device.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-make.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/choose-model.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/choose-serial.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/choose-uri.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/class-added.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/class-confirm.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-deleted.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/class-jobs-header.tmpl.svn-work                                   |    0 
 templates/.svn/wcprops/class-modified.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes-header.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/classes.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/edit-config.tmpl.in.svn-work                                      |    0 
 templates/.svn/wcprops/error-op.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/error.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/header.tmpl.in.svn-work                                           |    0 
 templates/.svn/wcprops/help-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/help-printable.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/job-cancel.tmpl.svn-work                                          |    0 
 templates/.svn/wcprops/job-hold.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-move.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/job-moved.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/job-release.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/job-restart.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs-header.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/jobs.tmpl.svn-work                                                |    0 
 templates/.svn/wcprops/maintenance.tmpl.svn-work                                         |    0 
 templates/.svn/wcprops/modify-class.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/modify-printer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-boolean.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-conflict.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-header.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/option-pickmany.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/option-pickone.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/option-trailer.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/pager.tmpl.svn-work                                               |    0 
 templates/.svn/wcprops/printer-accept.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-added.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-configured.tmpl.svn-work                                  |    0 
 templates/.svn/wcprops/printer-confirm.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-default.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-deleted.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work                                 |    0 
 templates/.svn/wcprops/printer-modified.tmpl.svn-work                                    |    0 
 templates/.svn/wcprops/printer-purge.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-reject.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/printer-start.tmpl.svn-work                                       |    0 
 templates/.svn/wcprops/printer-stop.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/printers-header.tmpl.svn-work                                     |    0 
 templates/.svn/wcprops/printers.tmpl.svn-work                                            |    0 
 templates/.svn/wcprops/restart.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/samba-export.tmpl.svn-work                                        |    0 
 templates/.svn/wcprops/samba-exported.tmpl.svn-work                                      |    0 
 templates/.svn/wcprops/search.tmpl.svn-work                                              |    0 
 templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work                          |    0 
 templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                         |    0 
 templates/.svn/wcprops/test-page.tmpl.svn-work                                           |    0 
 templates/.svn/wcprops/trailer.tmpl.svn-work                                             |    0 
 templates/.svn/wcprops/users.tmpl.svn-work                                               |    0 
 templates/Makefile                                                                       |   14 
 templates/es/.svn/dir-wcprops                                                            |    0 
 templates/es/.svn/entries                                                                |    0 
 templates/es/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/es/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/es/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/es/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/es/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/es/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/es/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/es/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/es/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/es/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/es/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/es/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/es/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/es/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/es/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/es/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/es/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/es/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/es/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/es/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/es/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/.svn/dir-wcprops                                                            |    0 
 templates/ja/.svn/entries                                                                |    0 
 templates/ja/.svn/text-base/printers.tmpl.svn-base                                       |    0 
 templates/ja/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/ja/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/ja/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/ja/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/ja/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/ja/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/ja/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/ja/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/ja/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/ja/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/ja/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/ja/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/ja/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/ja/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/ja/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/ja/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/ja/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/ja/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/ja/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/ja/printers.tmpl                                                               |    2 
 templates/pl/.svn/dir-wcprops                                                            |    0 
 templates/pl/.svn/entries                                                                |    0 
 templates/pl/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/pl/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/pl/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/pl/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/pl/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/pl/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/pl/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/pl/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/pl/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/pl/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/pl/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/pl/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/pl/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/pl/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/pl/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 templates/sv/.svn/dir-wcprops                                                            |    0 
 templates/sv/.svn/entries                                                                |    0 
 templates/sv/.svn/wcprops/add-class.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/add-printer.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/admin.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/choose-device.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-make.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/choose-model.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/class-added.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work                                |    0 
 templates/sv/.svn/wcprops/class-modified.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes-header.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/classes.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work                                   |    0 
 templates/sv/.svn/wcprops/error-op.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/error.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/header.tmpl.in.svn-work                                        |    0 
 templates/sv/.svn/wcprops/help-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/help-printable.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work                                       |    0 
 templates/sv/.svn/wcprops/job-hold.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-move.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/job-moved.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/job-release.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/job-restart.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/jobs.tmpl.svn-work                                             |    0 
 templates/sv/.svn/wcprops/maintenance.tmpl.svn-work                                      |    0 
 templates/sv/.svn/wcprops/modify-class.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-header.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/pager.tmpl.svn-work                                            |    0 
 templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-added.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work                               |    0 
 templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-default.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work                              |    0 
 templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work                                 |    0 
 templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/printer-start.tmpl.svn-work                                    |    0 
 templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/printers-header.tmpl.svn-work                                  |    0 
 templates/sv/.svn/wcprops/printers.tmpl.svn-work                                         |    0 
 templates/sv/.svn/wcprops/restart.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/samba-export.tmpl.svn-work                                     |    0 
 templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work                                   |    0 
 templates/sv/.svn/wcprops/search.tmpl.svn-work                                           |    0 
 templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work                       |    0 
 templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work                      |    0 
 templates/sv/.svn/wcprops/test-page.tmpl.svn-work                                        |    0 
 templates/sv/.svn/wcprops/trailer.tmpl.svn-work                                          |    0 
 templates/sv/.svn/wcprops/users.tmpl.svn-work                                            |    0 
 test/.svn/dir-wcprops                                                                    |    0 
 test/.svn/entries                                                                        |    0 
 test/.svn/wcprops/4.1-requests.test.svn-work                                             |    0 
 test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/4.3-job-ops.test.svn-work                                              |    0 
 test/.svn/wcprops/4.4-subscription-ops.test.svn-work                                     |    0 
 test/.svn/wcprops/5.1-lpadmin.sh.svn-work                                                |    0 
 test/.svn/wcprops/5.2-lpc.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.3-lpq.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.4-lpstat.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.5-lp.sh.svn-work                                                     |    0 
 test/.svn/wcprops/5.6-lpr.sh.svn-work                                                    |    0 
 test/.svn/wcprops/5.7-lprm.sh.svn-work                                                   |    0 
 test/.svn/wcprops/5.8-cancel.sh.svn-work                                                 |    0 
 test/.svn/wcprops/5.9-lpinfo.sh.svn-work                                                 |    0 
 test/.svn/wcprops/Dependencies.svn-work                                                  |    0 
 test/.svn/wcprops/Makefile.svn-work                                                      |    0 
 test/.svn/wcprops/create-job-format.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-sheets.test.svn-work                                        |    0 
 test/.svn/wcprops/create-job-timeout.test.svn-work                                       |    0 
 test/.svn/wcprops/create-job.test.svn-work                                               |    0 
 test/.svn/wcprops/get-devices.test.svn-work                                              |    0 
 test/.svn/wcprops/get-job-attributes.test.svn-work                                       |    0 
 test/.svn/wcprops/get-job-attributes2.test.svn-work                                      |    0 
 test/.svn/wcprops/get-ppds.test.svn-work                                                 |    0 
 test/.svn/wcprops/get-printer-attributes.test.svn-work                                   |    0 
 test/.svn/wcprops/get-printers.test.svn-work                                             |    0 
 test/.svn/wcprops/ipptest.c.svn-work                                                     |    0 
 test/.svn/wcprops/print-job-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/print-job.test.svn-work                                                |    0 
 test/.svn/wcprops/run-stp-tests.sh.svn-work                                              |    0 
 test/.svn/wcprops/set-attrs-hold.test.svn-work                                           |    0 
 test/.svn/wcprops/str-header.html.svn-work                                               |    0 
 test/.svn/wcprops/str-trailer.html.svn-work                                              |    0 
 test/.svn/wcprops/testfile.jpg.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.pdf.svn-work                                                  |    0 
 test/.svn/wcprops/testfile.ps.svn-work                                                   |    0 
 test/.svn/wcprops/testfile.txt.svn-work                                                  |    0 
 test/.svn/wcprops/testhp.ppd.svn-work                                                    |    0 
 test/.svn/wcprops/testps.ppd.svn-work                                                    |    0 
 tools/.svn/dir-wcprops                                                                   |    0 
 tools/.svn/entries                                                                       |    0 
 tools/.svn/wcprops/checkglobals.svn-work                                                 |    0 
 tools/.svn/wcprops/listpublic.svn-work                                                   |    0 
 tools/.svn/wcprops/makesrcdist.svn-work                                                  |    0 
 tools/.svn/wcprops/testosx.svn-work                                                      |    0 
 tools/.svn/wcprops/testrpm.svn-work                                                      |    0 
 vcnet/.svn/dir-wcprops                                                                   |    0 
 vcnet/.svn/entries                                                                       |    0 
 vcnet/.svn/wcprops/config.h.svn-work                                                     |    0 
 vcnet/.svn/wcprops/cups.sln.svn-work                                                     |    0 
 vcnet/.svn/wcprops/libcups2.def.svn-work                                                 |    0 
 vcnet/.svn/wcprops/libcups2.vcproj.svn-work                                              |    0 
 1769 files changed, 3703 insertions(+), 3683 deletions(-)

--- NEW FILE cups-svn5737.patch ---
diff -durN release-1.2.1/backend/backend-private.h cups-1.2.x/backend/backend-private.h
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
diff -durN release-1.2.1/backend/Dependencies cups-1.2.x/backend/Dependencies
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
diff -durN release-1.2.1/backend/easysw-firewire-design.txt cups-1.2.x/backend/easysw-firewire-design.txt
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
[...13064 lines suppressed...]
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/pl/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/pl/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/dir-wcprops cups-1.2.x/templates/sv/.svn/dir-wcprops
diff -durN release-1.2.1/templates/sv/.svn/entries cups-1.2.x/templates/sv/.svn/entries
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/sv/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/sv/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/sv/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/dir-wcprops cups-1.2.x/templates/.svn/dir-wcprops
diff -durN release-1.2.1/templates/.svn/entries cups-1.2.x/templates/.svn/entries
diff -durN release-1.2.1/templates/.svn/text-base/Makefile.svn-base cups-1.2.x/templates/.svn/text-base/Makefile.svn-base
diff -durN release-1.2.1/templates/.svn/wcprops/add-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/add-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/add-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/admin.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/admin.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-device.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-device.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-make.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-make.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-model.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-model.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-serial.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-serial.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/choose-uri.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/choose-uri.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/classes.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/classes.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/class-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/class-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/edit-config.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/edit-config.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error-op.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error-op.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/error.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/error.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/header.tmpl.in.svn-work cups-1.2.x/templates/.svn/wcprops/header.tmpl.in.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/help-printable.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/help-printable.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-cancel.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-cancel.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-hold.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-hold.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-moved.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-moved.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-move.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-move.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-release.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-release.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/job-restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/job-restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/jobs.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/jobs.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/maintenance.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/maintenance.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/Makefile.svn-work cups-1.2.x/templates/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-class.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-class.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/modify-printer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/modify-printer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-boolean.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-boolean.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-conflict.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-conflict.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickmany.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickmany.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-pickone.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-pickone.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/option-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/option-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/pager.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/pager.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-accept.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-accept.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-added.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-added.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-configured.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-configured.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-confirm.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-confirm.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-default.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-default.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-deleted.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-deleted.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-jobs-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-modified.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-modified.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-purge.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-purge.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-reject.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-reject.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-start.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-start.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printers.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printers.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/printer-stop.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/printer-stop.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/restart.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/restart.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-exported.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-exported.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/samba-export.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/samba-export.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/search.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/search.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-header.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/set-printer-options-trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/test-page.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/test-page.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/trailer.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/trailer.tmpl.svn-work
diff -durN release-1.2.1/templates/.svn/wcprops/users.tmpl.svn-work cups-1.2.x/templates/.svn/wcprops/users.tmpl.svn-work
diff -durN release-1.2.1/test/.svn/dir-wcprops cups-1.2.x/test/.svn/dir-wcprops
diff -durN release-1.2.1/test/.svn/entries cups-1.2.x/test/.svn/entries
diff -durN release-1.2.1/test/.svn/wcprops/4.1-requests.test.svn-work cups-1.2.x/test/.svn/wcprops/4.1-requests.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.2-cups-printer-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.3-job-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.3-job-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/4.4-subscription-ops.test.svn-work cups-1.2.x/test/.svn/wcprops/4.4-subscription-ops.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.1-lpadmin.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.1-lpadmin.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.2-lpc.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.2-lpc.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.3-lpq.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.3-lpq.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.4-lpstat.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.4-lpstat.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.5-lp.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.5-lp.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.6-lpr.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.6-lpr.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.7-lprm.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.7-lprm.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.8-cancel.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.8-cancel.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/5.9-lpinfo.sh.svn-work cups-1.2.x/test/.svn/wcprops/5.9-lpinfo.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-format.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-format.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-sheets.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-sheets.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/create-job-timeout.test.svn-work cups-1.2.x/test/.svn/wcprops/create-job-timeout.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Dependencies.svn-work cups-1.2.x/test/.svn/wcprops/Dependencies.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-devices.test.svn-work cups-1.2.x/test/.svn/wcprops/get-devices.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes2.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes2.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-job-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-job-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-ppds.test.svn-work cups-1.2.x/test/.svn/wcprops/get-ppds.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printer-attributes.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printer-attributes.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/get-printers.test.svn-work cups-1.2.x/test/.svn/wcprops/get-printers.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/ipptest.c.svn-work cups-1.2.x/test/.svn/wcprops/ipptest.c.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/Makefile.svn-work cups-1.2.x/test/.svn/wcprops/Makefile.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/print-job.test.svn-work cups-1.2.x/test/.svn/wcprops/print-job.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/run-stp-tests.sh.svn-work cups-1.2.x/test/.svn/wcprops/run-stp-tests.sh.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/set-attrs-hold.test.svn-work cups-1.2.x/test/.svn/wcprops/set-attrs-hold.test.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-header.html.svn-work cups-1.2.x/test/.svn/wcprops/str-header.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/str-trailer.html.svn-work cups-1.2.x/test/.svn/wcprops/str-trailer.html.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.jpg.svn-work cups-1.2.x/test/.svn/wcprops/testfile.jpg.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.pdf.svn-work cups-1.2.x/test/.svn/wcprops/testfile.pdf.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.ps.svn-work cups-1.2.x/test/.svn/wcprops/testfile.ps.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testfile.txt.svn-work cups-1.2.x/test/.svn/wcprops/testfile.txt.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testhp.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testhp.ppd.svn-work
diff -durN release-1.2.1/test/.svn/wcprops/testps.ppd.svn-work cups-1.2.x/test/.svn/wcprops/testps.ppd.svn-work
diff -durN release-1.2.1/tools/.svn/dir-wcprops cups-1.2.x/tools/.svn/dir-wcprops
diff -durN release-1.2.1/tools/.svn/entries cups-1.2.x/tools/.svn/entries
diff -durN release-1.2.1/tools/.svn/wcprops/checkglobals.svn-work cups-1.2.x/tools/.svn/wcprops/checkglobals.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/listpublic.svn-work cups-1.2.x/tools/.svn/wcprops/listpublic.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/makesrcdist.svn-work cups-1.2.x/tools/.svn/wcprops/makesrcdist.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testosx.svn-work cups-1.2.x/tools/.svn/wcprops/testosx.svn-work
diff -durN release-1.2.1/tools/.svn/wcprops/testrpm.svn-work cups-1.2.x/tools/.svn/wcprops/testrpm.svn-work
diff -durN release-1.2.1/vcnet/.svn/dir-wcprops cups-1.2.x/vcnet/.svn/dir-wcprops
diff -durN release-1.2.1/vcnet/.svn/entries cups-1.2.x/vcnet/.svn/entries
diff -durN release-1.2.1/vcnet/.svn/wcprops/config.h.svn-work cups-1.2.x/vcnet/.svn/wcprops/config.h.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/cups.sln.svn-work cups-1.2.x/vcnet/.svn/wcprops/cups.sln.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.def.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.def.svn-work
diff -durN release-1.2.1/vcnet/.svn/wcprops/libcups2.vcproj.svn-work cups-1.2.x/vcnet/.svn/wcprops/libcups2.vcproj.svn-work

cups-direct-usb.patch:
 usb-unix.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-direct-usb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-direct-usb.patch	4 Jul 2006 17:12:59 -0000	1.2
+++ cups-direct-usb.patch	14 Jul 2006 12:06:27 -0000	1.3
@@ -1,6 +1,15 @@
 --- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
 +++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
-@@ -327,12 +327,7 @@
+@@ -85,6 +85,8 @@
+     */
+ 
+     use_bc = strcasecmp(hostname, "Canon") != 0;
++    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++      use_bc = 0;
+ 
+     if ((device_fd = open_device(uri, &use_bc)) == -1)
+     {
+@@ -327,12 +329,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- cups.spec	4 Jul 2006 17:12:59 -0000	1.195
+++ cups.spec	14 Jul 2006 12:06:29 -0000	1.196
@@ -20,7 +20,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5706.patch
+Patch0: cups-svn5737.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -30,7 +30,6 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
-Patch11: cups-str1705.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch17: cups-serverbin-compat.patch
@@ -116,7 +115,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5706
+%patch0 -p1 -b .svn5737
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -126,7 +125,6 @@
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
-%patch11 -p1 -b .str1705
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch17 -p1 -b .serverbin-compat
@@ -245,9 +243,6 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
 
-# Ship an SSL directory
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
-
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -404,6 +399,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com>
+- Sync with svn5737.
+
 * Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.11
 - Sync with svn5706.
 - No longer need localhost, str1740, str1758, str1736, str1776 patches.


--- cups-str1705.patch DELETED ---


--- cups-svn.patch DELETED ---


--- cups-svn5706.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 12:07:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 08:07:48 -0400
Subject: rpms/cups/FC-5 cups.spec,1.196,1.197
Message-ID: <200607141207.k6EC7mMI003457@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
1:1.2.1-1.12


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- cups.spec	14 Jul 2006 12:06:29 -0000	1.196
+++ cups.spec	14 Jul 2006 12:07:45 -0000	1.197
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.11
+Release: 1.12
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -399,7 +399,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.12
 - Sync with svn5737.
 
 * Tue Jul  4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.11



From fedora-cvs-commits at redhat.com  Fri Jul 14 12:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 08:27:30 -0400
Subject: rpms/scim-anthy/devel
	scim-anthy-1.0.0-pseudo-ascii-insert-space.patch, NONE,
	1.1 scim-anthy-1.0.0-pseudo-ascii.patch, NONE,
	1.1 scim-anthy.spec, 1.31, 1.32
Message-ID: <200607141227.k6ECRUkA000378@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	scim-anthy.spec 
Added Files:
	scim-anthy-1.0.0-pseudo-ascii-insert-space.patch 
	scim-anthy-1.0.0-pseudo-ascii.patch 
Log Message:
* Fri Jul 14 2006 Akira TAGOH <tagohr at edhat.com> - 1.0.0-4
- scim-anthy-1.0.0-pseudo-ascii.patch,
  scim-anthy-1.0.0-pseudo-ascii-insert-space.patch: applied to allow the ASCII
  characters with the capital letter without even turning off the IME. (#187721)

scim-anthy-1.0.0-pseudo-ascii-insert-space.patch:
 scim_anthy_action.cpp       |    6 ++
 scim_anthy_action.h         |    3 -
 scim_anthy_factory.cpp      |   15 ++++++-
 scim_anthy_factory.h        |    3 +
 scim_anthy_imengine.cpp     |   90 +++++++++++++++++++++++++++++++------------
 scim_anthy_imengine.h       |    2 
 scim_anthy_kana.cpp         |   14 +++++-
 scim_anthy_kana.h           |    6 ++
 scim_anthy_key2kana.cpp     |   27 ++++++++----
 scim_anthy_key2kana.h       |   14 ++++--
 scim_anthy_key2kana_base.h  |    8 ++-
 scim_anthy_nicola.cpp       |   16 ++++++-
 scim_anthy_nicola.h         |    6 ++
 scim_anthy_preedit.cpp      |   23 ++++++++++-
 scim_anthy_preedit.h        |    9 +++-
 scim_anthy_prefs.cpp        |   82 ++++++++++++++++++++++++++++++++++++++-
 scim_anthy_prefs.h          |    9 ++++
 scim_anthy_reading.cpp      |   92 ++++++++++++++++++++++++++++++++++++++++++--
 scim_anthy_reading.h        |    6 ++
 scim_anthy_setup.cpp        |   60 ----------------------------
 scim_anthy_setup_romaji.cpp |   60 +++++++++++++++++++++-------
 21 files changed, 418 insertions(+), 133 deletions(-)

--- NEW FILE scim-anthy-1.0.0-pseudo-ascii-insert-space.patch ---
2006-07-13 Akira TAGOH <at at gclab.org>

	* src/scim_anthy_action.{cpp,h}, src/scim_anthy_factory.{cpp,h},
	  src/scim_anthy_imengine.{cpp,h}, src/scim_anthy_kana.{cpp,h},
	  src/scim_anthy_key2kana.{cpp,h}, src/scim_anthy_key2kana_base.h,
	  src/scim_anthy_nicola.{cpp,h}, src/scim_anthy_preedit.{cpp,h},
	  src/scim_anthy_prefs.{cpp,h}, src/scim_anthy_reading.{cpp,h},
	  src/scim_anthy_setup.cpp, src/scim_anthy_setup_romaji.cpp:
	  Enable to enter space during pseudo ASCII mode.
Index: src/scim_anthy_action.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_action.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/scim_anthy_action.cpp	22 Jul 2005 11:25:27 -0000	1.6
+++ src/scim_anthy_action.cpp	13 Jul 2006 07:41:51 -0000	1.7
@@ -78,3 +78,9 @@
 {
     return util_match_key_event (m_key_bindings, key, SCIM_KEY_CapsLockMask);
 }
+
+bool
+Action::match_action_name (const char *name)
+{
+    return (m_name.compare (name) == 0);
+}
Index: src/scim_anthy_action.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_action.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- src/scim_anthy_action.h	2 Jun 2005 07:35:03 -0000	1.3
+++ src/scim_anthy_action.h	13 Jul 2006 07:41:51 -0000	1.4
@@ -43,7 +43,8 @@
     bool perform (AnthyInstance  *performer);
     bool perform (AnthyInstance  *performer,
                   const KeyEvent &key);
-    
+
+    bool match_action_name (const char *name);
 
 private:
     bool match_key_event (const KeyEvent &key);
Index: src/scim_anthy_factory.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.cpp,v
retrieving revision 1.45
retrieving revision 1.47
diff -u -r1.45 -r1.47
--- src/scim_anthy_factory.cpp	4 Jul 2006 09:19:48 -0000	1.45
+++ src/scim_anthy_factory.cpp	14 Jul 2006 02:37:17 -0000	1.47
@@ -123,6 +123,7 @@
       m_romaji_half_number          (SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER_DEFAULT),
       m_romaji_allow_split          (SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT_DEFAULT),
       m_romaji_pseudo_ascii_mode    (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT),
+      m_romaji_pseudo_ascii_blank_behavior (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR),
       m_nicola_time                 (SCIM_ANTHY_CONFIG_NICOLA_TIME_DEFAULT),
       m_dict_admin_command          (SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND_DEFAULT),
       m_add_word_command            (SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND_DEFAULT),
@@ -214,7 +215,11 @@
           "  Ryo Dairiki <ryo-dairiki at mbm.nifty.com>\n"
           "  Seiichi SATO\n"
           "  AWASHIRO Ikuya <ikuya at oooug.jp>\n"
-          "  Hatuka*nezumi <nezumi at jca.apc.org>"));
+          "  Hatuka*nezumi <nezumi at jca.apc.org>\n"
+          "  Teppei Tamra <tam-t at par.odn.ne.jp>\n"
+          "  Akira TAGOH <at at gclab.org>\n"
+          "  Tatsuki Sugiura <sugi at nemui.org>\n"
+          "  Takashi Nakamoto <bluedwarf at bpost.plala.or.jp>"));
 }
 
 WideString
@@ -328,7 +333,7 @@
 #else
 #define APPEND_ACTION(key, func)                                               \
 {                                                                              \
-    String name = "func", str;                                                 \
+    String name = #key, str;                                                   \
     if (loaded) {                                                              \
         String str2, str3;                                                     \
         str2 = String (SCIM_ANTHY_CONFIG_##key##_KEY);                         \
@@ -415,6 +420,7 @@
 ANTHY_DEFINE_ACTION (action_hiragana_mode);
 ANTHY_DEFINE_ACTION (action_katakana_mode);
 ANTHY_DEFINE_ACTION (action_half_katakana_mode);
+ANTHY_DEFINE_ACTION (action_cancel_pseudo_ascii_mode);
 ANTHY_DEFINE_ACTION (action_launch_dict_admin_tool);
 ANTHY_DEFINE_ACTION (action_add_word);
 
@@ -500,6 +506,10 @@
             = config->read (String (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE),
                             SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT);
 
+        m_romaji_pseudo_ascii_blank_behavior
+            = config->read (String (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR),
+                            SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR_DEFAULT);
+
         m_nicola_time
             = config->read (String (SCIM_ANTHY_CONFIG_NICOLA_TIME),
                             SCIM_ANTHY_CONFIG_NICOLA_TIME_DEFAULT);
@@ -693,6 +703,7 @@
     APPEND_ACTION (HIRAGANA_MODE,           action_hiragana_mode);
     APPEND_ACTION (KATAKANA_MODE,           action_katakana_mode);
     APPEND_ACTION (HALF_KATAKANA_MODE,      action_half_katakana_mode);
+    APPEND_ACTION (CANCEL_PSEUDO_ASCII_MODE,action_cancel_pseudo_ascii_mode);
 
     // dict keys
     APPEND_ACTION (DICT_ADMIN,              action_launch_dict_admin_tool);
Index: src/scim_anthy_factory.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- src/scim_anthy_factory.h	4 Jul 2006 09:19:48 -0000	1.23
+++ src/scim_anthy_factory.h	13 Jul 2006 07:41:51 -0000	1.24
@@ -92,7 +92,10 @@
     bool           m_romaji_half_symbol;
     bool           m_romaji_half_number;
     bool           m_romaji_allow_split;
+
     bool           m_romaji_pseudo_ascii_mode;
+    bool           m_romaji_pseudo_ascii_blank_behavior;
+
     int            m_nicola_time;
     KeyEventList   m_left_thumb_keys;
     KeyEventList   m_right_thumb_keys;
Index: src/scim_anthy_imengine.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- src/scim_anthy_imengine.cpp	11 Jul 2006 01:16:00 -0000	1.145
+++ src/scim_anthy_imengine.cpp	13 Jul 2006 07:41:51 -0000	1.146
@@ -194,9 +194,25 @@
 bool
 AnthyInstance::process_key_event_lookup_keybind (const KeyEvent& key)
 {
+    std::vector<Action>::iterator it;
+
     m_last_key = key;
 
-    std::vector<Action>::iterator it;
+    /* try to find a "insert a blank" action to be not stolen a blank key
+     * when entering the pseudo ascii mode.
+     */
+    if (get_pseudo_ascii_mode () != 0 &&
+        m_factory->m_romaji_pseudo_ascii_blank_behavior &&
+        m_preedit.is_pseudo_ascii_mode ()) {
+        for (it  = m_factory->m_actions.begin();
+             it != m_factory->m_actions.end();
+             it++) {
+            if (it->match_action_name ("INSERT_SPACE") &&
+                it->perform (this, key)) {
+                return true;
+            }
+        }
+    }
     for (it  = m_factory->m_actions.begin();
          it != m_factory->m_actions.end();
          it++)
@@ -829,16 +845,14 @@
 
     if (method != get_typing_method ()) {
         Key2KanaTable *fundamental_table = NULL;
-        bool pseudo_ascii = false;
 
         if (method == SCIM_ANTHY_TYPING_METHOD_ROMAJI) {
             fundamental_table = m_factory->m_custom_romaji_table;
-            pseudo_ascii = m_factory->m_romaji_pseudo_ascii_mode;
         } else if (method == SCIM_ANTHY_TYPING_METHOD_KANA) {
             fundamental_table = m_factory->m_custom_kana_table;
         }
         m_preedit.set_typing_method (method);
-        m_preedit.use_pseudo_ascii_mode (pseudo_ascii);
+        m_preedit.set_pseudo_ascii_mode (get_pseudo_ascii_mode ());
     }
 }
 
@@ -1125,10 +1139,11 @@
 bool
 AnthyInstance::action_insert_space (void)
 {
-    if (m_preedit.is_preediting ())
-        return false;
+    String str;
+    bool is_wide = false, retval = false;
 
-    bool is_wide = false;
+    if (m_preedit.is_preediting () && !m_factory->m_romaji_pseudo_ascii_blank_behavior)
+        return false;
 
     if (m_factory->m_space_type == "FollowMode") {
         InputMode mode = get_input_mode ();
@@ -1144,27 +1159,38 @@
     }
 
     if (is_wide) {
-        commit_string (utf8_mbstowcs ("\xE3\x80\x80"));
-        return true;
+        str = "\xE3\x80\x80";
+        retval = true;
     } else if (get_typing_method () == SCIM_ANTHY_TYPING_METHOD_NICOLA || // FIXME! it's a ad-hoc solution.
                (m_last_key.code != SCIM_KEY_space &&
                 m_last_key.code != SCIM_KEY_KP_Space))
     {
-        commit_string (utf8_mbstowcs (" "));
-        return true;
+        str = " ";
+        retval = true;
     }
 
-    return false;
+    if (retval) {
+        if (m_preedit.is_pseudo_ascii_mode ()) {
+            m_preedit.append (m_last_key, str);
+            show_preedit_string ();
+            m_preedit_string_visible = true;
+            set_preedition ();
+        } else {
+            commit_string (utf8_mbstowcs (str));
+        }
+    }
+
+    return retval;
 }
 
 bool 
 AnthyInstance::action_insert_alternative_space (void)
 {
+    bool is_wide = false;
+
     if (m_preedit.is_preediting ())
         return false;
 
-    bool is_wide = false;
-
     if (m_factory->m_space_type == "FollowMode") {
         InputMode mode = get_input_mode ();
         if (mode == SCIM_ANTHY_MODE_LATIN ||
@@ -1795,6 +1821,14 @@
 }
 
 bool
+AnthyInstance::action_cancel_pseudo_ascii_mode (void)
+{
+    m_preedit.reset_pseudo_ascii_mode ();
+
+    return true;
+}
+
+bool
 AnthyInstance::convert_kana (CandidateType type)
 {
     if (!m_preedit.is_preediting ())
@@ -2213,22 +2247,15 @@
     if (m_on_init || !m_factory->m_show_typing_method_label) {
         if (m_factory->m_typing_method == "NICOLA") {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_NICOLA);
-            m_preedit.use_pseudo_ascii_mode(false);
         } else if (m_factory->m_typing_method == "Kana") {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_KANA);
-            m_preedit.use_pseudo_ascii_mode(false);
         } else {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_ROMAJI);
-            m_preedit.use_pseudo_ascii_mode(m_factory->m_romaji_pseudo_ascii_mode);
         }
+        m_preedit.set_pseudo_ascii_mode (get_pseudo_ascii_mode ());
     } else {
-        TypingMethod m = m_preedit.get_typing_method ();
-
-        m_preedit.set_typing_method (m);
-        if (m == SCIM_ANTHY_TYPING_METHOD_ROMAJI)
-            m_preedit.use_pseudo_ascii_mode(m_factory->m_romaji_pseudo_ascii_mode);
-        else
-            m_preedit.use_pseudo_ascii_mode(false);
+        m_preedit.set_typing_method (get_typing_method ());
+        m_preedit.set_pseudo_ascii_mode (get_pseudo_ascii_mode ());
     }
 
     // set conversion mode
@@ -2313,6 +2340,21 @@
     else
         return false;
 }
+
+int
+AnthyInstance::get_pseudo_ascii_mode (void)
+{
+    int retval = 0;
+    TypingMethod m = get_typing_method ();
+
+    if (m == SCIM_ANTHY_TYPING_METHOD_ROMAJI) {
+        if (m_factory->m_romaji_pseudo_ascii_mode)
+            retval |= SCIM_ANTHY_PSEUDO_ASCII_TRIGGERED_CAPITALIZED;
+    }
+
+    return retval;
+}
+
 /*
 vi:ts=4:nowrap:ai:expandtab
 */
Index: src/scim_anthy_imengine.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- src/scim_anthy_imengine.h	13 Feb 2006 08:06:25 -0000	1.47
+++ src/scim_anthy_imengine.h	13 Jul 2006 07:41:51 -0000	1.48
@@ -184,6 +184,7 @@
     bool   action_hiragana_mode               (void);
     bool   action_katakana_mode               (void);
     bool   action_half_katakana_mode          (void);
+    bool   action_cancel_pseudo_ascii_mode    (void);
 
     bool   action_add_word                    (void);
     bool   action_launch_dict_admin_tool      (void);
@@ -203,6 +204,7 @@
                                                void         *data = NULL,
                                                delete_func   delete_fn = NULL);
     void   timeout_remove                     (uint32        id);
+    int    get_pseudo_ascii_mode              (void);
 
 private:
     /* processing key event */
Index: src/scim_anthy_kana.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_kana.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/scim_anthy_kana.cpp	19 Nov 2005 01:22:08 -0000	1.6
+++ src/scim_anthy_kana.cpp	13 Jul 2006 07:41:51 -0000	1.7
@@ -93,7 +93,8 @@
 }
 
 bool
-KanaConvertor::can_append (const KeyEvent & key)
+KanaConvertor::can_append (const KeyEvent & key,
+                           bool             ignore_space)
 {
     // ignore key release.
     if (key.is_key_release ())
@@ -196,8 +197,17 @@
 
     String s;
     s += key.get_ascii_code ();
-    result = utf8_mbstowcs (s);
     raw    = s;
+
+    return append (raw, result, pending);
+}
+
+bool
+KanaConvertor::append (const String & str,
+                       WideString   & result,
+                       WideString   & pending)
+{
+    result = utf8_mbstowcs (str);
     m_pending = String ();
 
     return false;
Index: src/scim_anthy_kana.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_kana.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/scim_anthy_kana.h	19 Nov 2005 01:22:08 -0000	1.5
+++ src/scim_anthy_kana.h	13 Jul 2006 07:41:51 -0000	1.6
@@ -40,11 +40,15 @@
                KanaConvertor      (AnthyInstance    & anthy);
     virtual   ~KanaConvertor      ();
 
-    bool       can_append         (const KeyEvent   & key);
+    bool       can_append         (const KeyEvent   & key,
+                                   bool               ignore_space = false);
     bool       append             (const KeyEvent   & key,
                                    WideString       & result,
                                    WideString       & pending,
                                    String           & raw);
+    bool       append             (const String     & raw,
+                                   WideString       & result,
+                                   WideString       & pending);
     void       clear              (void);
 
     bool       is_pending         (void);
Index: src/scim_anthy_key2kana.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- src/scim_anthy_key2kana.cpp	25 Apr 2006 07:26:19 -0000	1.13
+++ src/scim_anthy_key2kana.cpp	13 Jul 2006 07:41:51 -0000	1.14
@@ -32,7 +32,7 @@
       m_is_in_pseudo_ascii_mode (false)
 {
     set_case_sensitive (false);
-    use_pseudo_ascii_mode (false);
+    set_pseudo_ascii_mode (0);
 }
 
 Key2KanaConvertor::~Key2KanaConvertor ()
@@ -40,7 +40,8 @@
 }
 
 bool
-Key2KanaConvertor::can_append (const KeyEvent & key)
+Key2KanaConvertor::can_append (const KeyEvent & key,
+                               bool             ignore_space)
 {
     // ignore key release.
     if (key.is_key_release ())
@@ -53,7 +54,8 @@
         return false;
     }
 
-    if (isprint(key.get_ascii_code ()) && !isspace(key.get_ascii_code ()))
+    if (isprint(key.get_ascii_code ()) &&
+        (ignore_space || !isspace(key.get_ascii_code ())))
         return true;
 
     if (util_key_is_keypad (key))
@@ -126,9 +128,7 @@
     bool has_partial_match = false;
     bool retval = false;
 
-    if (m_pseudo_ascii_mode)
-        compute_for_pseudo_ascii_mode(widestr);
-    if (m_is_in_pseudo_ascii_mode) {
+    if (m_pseudo_ascii_mode != 0 && process_pseudo_ascii_mode (widestr)) {
         m_pending += widestr;
         pending = m_pending;
         return false;
@@ -268,19 +268,26 @@
     }
 }
 
-void
-Key2KanaConvertor::compute_for_pseudo_ascii_mode(const WideString & wstr)
+bool
+Key2KanaConvertor::process_pseudo_ascii_mode (const WideString & wstr)
 {
-    for (unsigned int i = 0; !m_is_in_pseudo_ascii_mode && i < wstr.length (); i++) {
-        if (wstr[i] >= 'A' && wstr[i] <= 'Z')
+    for (unsigned int i = 0; i < wstr.length (); i++) {
+        if ((wstr[i] >= 'A' && wstr[i] <= 'Z') ||
+            iswspace(wstr[i])) {
             m_is_in_pseudo_ascii_mode = true;
+        } else if (wstr[i] >= 0x80) {
+            m_is_in_pseudo_ascii_mode = false;
+        }
     }
+
+    return m_is_in_pseudo_ascii_mode;
 }
 
 void
 Key2KanaConvertor::reset_pseudo_ascii_mode (void)
 {
     m_is_in_pseudo_ascii_mode = false;
+    m_pending.clear();
 }
 
 /*
Index: src/scim_anthy_key2kana.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/scim_anthy_key2kana.h	25 Apr 2006 07:26:19 -0000	1.8
+++ src/scim_anthy_key2kana.h	13 Jul 2006 07:41:51 -0000	1.9
@@ -41,7 +41,8 @@
                                               Key2KanaTableSet & tables);
     virtual ~Key2KanaConvertor               ();
 
-    bool       can_append                    (const KeyEvent   & key);
+    bool       can_append                    (const KeyEvent   & key,
+                                              bool               ignore_space = false);
     bool       append                        (const KeyEvent   & key,
                                               WideString       & result,
                                               WideString       & pending,
@@ -53,9 +54,11 @@
     WideString flush_pending                 (void);
     void       reset_pending                 (const WideString & result,
                                               const String     & raw);
-    void       use_pseudo_ascii_mode         (bool               flag)
-        { m_pseudo_ascii_mode = flag; }
-    void       compute_for_pseudo_ascii_mode (const WideString & wstr);
+    void       set_pseudo_ascii_mode         (int                mode)
+        { m_pseudo_ascii_mode = mode; }
+    bool       is_pseudo_ascii_mode          (void)
+        { return m_is_in_pseudo_ascii_mode; }
+    bool       process_pseudo_ascii_mode     (const WideString & wstr);
     void       reset_pseudo_ascii_mode       (void);
 
 private:
@@ -70,8 +73,9 @@
     // state
     WideString         m_pending;
     Key2KanaRule       m_exact_match;
-    bool               m_pseudo_ascii_mode;
+    int                m_pseudo_ascii_mode;
     bool               m_is_in_pseudo_ascii_mode;
+    bool               m_reset_pseudo_ascii_mode;
 };
 
 }
Index: src/scim_anthy_key2kana_base.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana_base.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/scim_anthy_key2kana_base.h	25 Apr 2006 07:26:19 -0000	1.6
+++ src/scim_anthy_key2kana_base.h	13 Jul 2006 07:41:51 -0000	1.7
@@ -36,11 +36,15 @@
         {};
     virtual ~Key2KanaConvertorBase        () {};
 
-    virtual bool       can_append         (const KeyEvent   & key)       = 0;
+    virtual bool       can_append         (const KeyEvent   & key,
+                                           bool               ignore_space = false) = 0;
     virtual bool       append             (const KeyEvent   & key,
                                            WideString       & result,
                                            WideString       & pending,
                                            String           & raw)       = 0;
+    virtual bool       append             (const String     & raw,
+                                           WideString       & result,
+                                           WideString       & pending)   = 0;
     virtual void       clear              (void)                         = 0;
 
     virtual bool       is_pending         (void)                         = 0;
@@ -51,7 +55,7 @@
 
     virtual void       reset_pseudo_ascii_mode       (void)
         {}
-    virtual void       compute_for_pseudo_ascii_mode (const WideString & wstr)
+    virtual bool       process_pseudo_ascii_mode     (const WideString & wstr)
         {}
 
     virtual void       set_case_sensitive (bool               sensitive)
Index: src/scim_anthy_nicola.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_nicola.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- src/scim_anthy_nicola.cpp	6 Dec 2005 05:43:45 -0000	1.33
+++ src/scim_anthy_nicola.cpp	13 Jul 2006 07:41:51 -0000	1.34
@@ -43,7 +43,8 @@
 }
 
 bool
-NicolaConvertor::can_append (const KeyEvent & key)
+NicolaConvertor::can_append (const KeyEvent & key,
+                             bool             ignore_space)
 {
     if (key == m_through_key_event) {
         m_through_key_event = KeyEvent ();
@@ -84,7 +85,7 @@
     }
 
     if (isprint (key.get_ascii_code ()) &&
-        !isspace (key.get_ascii_code ()))
+        (ignore_space || !isspace (key.get_ascii_code ())))
     {
         return true;
     }
@@ -583,6 +584,17 @@
     return handle_voiced_consonant (result, pending);
 }
 
+bool
+NicolaConvertor::append (const String & str,
+                         WideString   & result,
+                         WideString   & pending)
+{
+    result = utf8_mbstowcs (str);
+    m_pending = WideString ();
+
+    return false;
+}
+
 void
 NicolaConvertor::clear (void)
 {
Index: src/scim_anthy_nicola.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_nicola.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src/scim_anthy_nicola.h	19 Nov 2005 01:22:08 -0000	1.16
+++ src/scim_anthy_nicola.h	13 Jul 2006 07:41:51 -0000	1.17
@@ -48,11 +48,15 @@
                                          Key2KanaTableSet & tables);
     virtual ~NicolaConvertor            ();
 
-    bool       can_append               (const KeyEvent   & key);
+    bool       can_append               (const KeyEvent   & key,
+                                         bool               ignore_space = false);
     bool       append                   (const KeyEvent   & key,
                                          WideString       & result,
                                          WideString       & pending,
                                          String           & raw);
+    bool       append                   (const String     & raw,
+                                         WideString       & result,
+                                         WideString       & pending);
     void       clear                    (void);
 
     bool       is_pending               (void);
Index: src/scim_anthy_preedit.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- src/scim_anthy_preedit.cpp	18 Jun 2006 14:37:52 -0000	1.66
+++ src/scim_anthy_preedit.cpp	13 Jul 2006 07:41:51 -0000	1.67
@@ -191,6 +191,13 @@
     return retval;
 }
 
+bool
+Preedit::append (const KeyEvent & key,
+                 const String   & string)
+{
+    return m_reading.append (key, string);
+}
+
 void
 Preedit::erase (bool backward)
 {
@@ -489,9 +496,21 @@
 }
 
 void
-Preedit::use_pseudo_ascii_mode (bool flag)
+Preedit::set_pseudo_ascii_mode (int mode)
+{
+    m_reading.set_pseudo_ascii_mode (mode);
+}
+
+bool
+Preedit::is_pseudo_ascii_mode (void)
+{
+    return m_reading.is_pseudo_ascii_mode ();
+}
+
+void
+Preedit::reset_pseudo_ascii_mode (void)
 {
-    m_reading.use_pseudo_ascii_mode (flag);
+    m_reading.reset_pseudo_ascii_mode ();
 }
 
 bool
Index: src/scim_anthy_preedit.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- src/scim_anthy_preedit.h	26 Jun 2006 06:27:04 -0000	1.45
+++ src/scim_anthy_preedit.h	13 Jul 2006 07:41:51 -0000	1.46
@@ -29,6 +29,9 @@
 #include "scim_anthy_reading.h"
 #include "scim_anthy_conversion.h"
 
+#define SCIM_ANTHY_PSEUDO_ASCII_TRIGGERED_CAPITALIZED			(1 << 0)
+#define SCIM_ANTHY_PSEUDO_ASCII_TRIGGERED_COUPLE_OF_CAPITAL		(1 << 1)
+
 using namespace scim;
 
 class AnthyInstance;
@@ -64,6 +67,8 @@
     virtual bool          can_process_key_event  (const KeyEvent & key);
     // return true if commiting is needed.
     virtual bool          process_key_event      (const KeyEvent & key);
+    virtual bool          append                 (const KeyEvent & key,
+                                                  const String   & string);
     virtual void          erase                  (bool backward = true);
     virtual void          finish                 (void);
 
@@ -121,7 +126,9 @@
     virtual bool          get_symbol_width       (void);
     virtual void          set_number_width       (bool           half);
     virtual bool          get_number_width       (void);
-    virtual void          use_pseudo_ascii_mode  (bool           flag);
+    virtual void          set_pseudo_ascii_mode  (int            mode);
+    virtual bool          is_pseudo_ascii_mode   (void);
+    virtual void          reset_pseudo_ascii_mode(void);
 
 private:
     void                  get_reading_substr     (WideString   & substr,
Index: src/scim_anthy_prefs.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/scim_anthy_prefs.cpp	4 Jul 2006 09:19:48 -0000	1.35
+++ src/scim_anthy_prefs.cpp	13 Jul 2006 07:41:51 -0000	1.36
@@ -102,7 +102,16 @@
         SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT,
         N_("_Entering the pseudo ASCII input mode with capital letters."),
         NULL,
-        N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode during capital letters are in preedit."),
+        N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode."),
+        false,
+    },
+    {
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR,
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR_DEFAULT,
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR_DEFAULT,
+        N_("Insert a blank with a blank key."),
+        NULL,
+        N_("If this check is enabled, a blank key will works to insert a blank when entering the pseudo ASCII input mode."),
         false,
     },
     {
@@ -557,6 +566,16 @@
         false,
     },
     {
+        SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY,
+        SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY_DEFAULT,
+        SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY_DEFAULT,
+        N_("pseudo ASCII mode cancel key"),
+        N_("Select pseudo ASCII mode cancel key"),
+        N_("The key events to cancel the pseudo ASCII mode."),
+        NULL,
+        false,
+    },
+    {
         SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY,
         SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY_DEFAULT,
         SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY_DEFAULT,
@@ -1242,4 +1261,65 @@
         false,
     },
 };
+
+BoolConfigData *
+find_bool_config_entry (const char *config_key)
+{
+    if (!config_key)
+        return NULL;
+
+    for (unsigned int i = 0; config_bool_common[i].key; i++) {
+        BoolConfigData *entry = &config_bool_common[i];
+        if (entry->key && !strcmp (entry->key, config_key))
+            return entry;
+    }
+
+    return NULL;
+}
+
+IntConfigData *
+find_int_config_entry (const char *config_key)
+{
+    if (!config_key)
+        return NULL;
+
+    for (unsigned int i = 0; config_int_common[i].key; i++) {
+        IntConfigData *entry = &config_int_common[i];
+        if (entry->key && !strcmp (entry->key, config_key))
+            return entry;
+    }
+
+    return NULL;
+}
+
+StringConfigData *
+find_string_config_entry (const char *config_key)
+{
+    if (!config_key)
+        return NULL;
+
+    for (unsigned int i = 0; config_string_common[i].key; i++) {
+        StringConfigData *entry = &config_string_common[i];
+        if (entry->key && !strcmp (entry->key, config_key))
+            return entry;
+    }
+
+    return NULL;
+}
+
+ColorConfigData *
+find_color_config_entry (const char *config_key)
+{
+    if (!config_key)
+        return NULL;
+
+    for (unsigned int i = 0; config_color_common[i].fg_key; i++) {
+        ColorConfigData *entry = &config_color_common[i];
+        if (entry->fg_key && !strcmp (entry->fg_key, config_key))
+            return entry;
+    }
+
+    return NULL;
+}
+
 }
Index: src/scim_anthy_prefs.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- src/scim_anthy_prefs.h	4 Jul 2006 09:19:48 -0000	1.71
+++ src/scim_anthy_prefs.h	13 Jul 2006 07:41:51 -0000	1.72
@@ -37,6 +37,7 @@
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER          "/IMEngine/Anthy/RomajiHalfNumber"
 #define SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT          "/IMEngine/Anthy/RomajiAllowSplit"
 #define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE    "/IMEngine/Anthy/RomajiPseudoAsciiMode"
+#define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR    "/IMEngine/Anthy/RomajiPseudoAsciiBlankBehavior"
 
 #define SCIM_ANTHY_CONFIG_KANA_LAYOUT_FILE            "/IMEngine/Anthy/KanaLayoutFile"
 
@@ -82,6 +83,7 @@
 #define SCIM_ANTHY_CONFIG_HIRAGANA_MODE_KEY           "/IMEngine/Anthy/HiraganaModeKey"
 #define SCIM_ANTHY_CONFIG_KATAKANA_MODE_KEY           "/IMEngine/Anthy/KatakanaModeKey"
 #define SCIM_ANTHY_CONFIG_HALF_KATAKANA_MODE_KEY      "/IMEngine/Anthy/HalfKatakanaModeKey"
+#define SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY  "/IMEngine/Anthy/CancelPseudoAsciiModeKey"
 
 #define SCIM_ANTHY_CONFIG_INSERT_SPACE_KEY            "/IMEngine/Anthy/InsertSpaceKey"
 #define SCIM_ANTHY_CONFIG_INSERT_ALT_SPACE_KEY        "/IMEngine/Anthy/InsertAltSpaceKey"
@@ -171,6 +173,7 @@
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER_DEFAULT          false
 #define SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT_DEFAULT          true
 #define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT    true
+#define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR_DEFAULT    true
 
 #define SCIM_ANTHY_CONFIG_KANA_LAYOUT_FILE_DEFAULT            ""
 
@@ -216,6 +219,7 @@
 #define SCIM_ANTHY_CONFIG_HIRAGANA_MODE_KEY_DEFAULT           ""
 #define SCIM_ANTHY_CONFIG_KATAKANA_MODE_KEY_DEFAULT           ""
 #define SCIM_ANTHY_CONFIG_HALF_KATAKANA_MODE_KEY_DEFAULT      ""
+#define SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY_DEFAULT ""
 
 #define SCIM_ANTHY_CONFIG_INSERT_SPACE_KEY_DEFAULT            "space"
 #define SCIM_ANTHY_CONFIG_INSERT_ALT_SPACE_KEY_DEFAULT        "Shift+space"
@@ -366,6 +370,11 @@
 extern StringConfigData config_keyboards_dict [];
 extern ColorConfigData  config_color_common [];
 
+BoolConfigData   *find_bool_config_entry   (const char *config_key);
+IntConfigData    *find_int_config_entry    (const char *config_key);
+StringConfigData *find_string_config_entry (const char *config_key);
+ColorConfigData  *find_color_config_entry  (const char *config_key);
+
 }
 
 #endif /* SCIM_ANTHY_USE_GTK */
Index: src/scim_anthy_reading.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- src/scim_anthy_reading.cpp	25 Apr 2006 07:26:19 -0000	1.37
+++ src/scim_anthy_reading.cpp	13 Jul 2006 07:41:51 -0000	1.38
@@ -330,6 +330,71 @@
     }
 }
 
+bool
+Reading::append (const KeyEvent & key,
+                 const String   & string)
+{
+    bool was_pending;
+    WideString result, pending;
+    bool need_commiting;
+
+    if (!m_kana.can_append (key, true) &&
+        !m_key2kana->can_append (key, true))
+        return false;
+
+    if (m_caret_offset != 0) {
+        split_segment (m_segment_pos);
+        reset_pending ();
+    }
+
+    if (m_kana.can_append (key))
+        was_pending = m_kana.is_pending ();
+    else
+        was_pending = m_key2kana->is_pending ();
+
+    if (m_kana.can_append (key))
+        need_commiting = m_kana.append (string, result, pending);
+    else
+        need_commiting = m_key2kana->append (string, result, pending);
+
+    ReadingSegments::iterator begin = m_segments.begin ();
+
+    // fix previous segment and prepare next segment if needed
+    if (!result.empty () || !pending.empty ()) {
+        if (!was_pending ||  // previous segment was already fixed
+            need_commiting)  // previous segment has been fixed
+        {
+            ReadingSegment c;
+            m_segments.insert (begin + m_segment_pos, c);
+            m_segment_pos++;
+        }
+    }
+
+    // fill segment
+    if (result.length() > 0 && pending.length () > 0) {
+        m_segments[m_segment_pos - 1].kana = result;
+
+        ReadingSegment c;
+        c.raw += string;
+        c.kana = pending;
+        m_segments.insert (begin + m_segment_pos, c);
+        m_segment_pos++;
+
+    } else if (result.length () > 0) {
+        m_segments[m_segment_pos - 1].raw += string;
+        m_segments[m_segment_pos - 1].kana = result;
+
+    } else if (pending.length () > 0) {
+        m_segments[m_segment_pos - 1].raw += string;
+        m_segments[m_segment_pos - 1].kana = pending;
+
+    } else {
+
+    }
+
+    return false;
+}
+
 void
 Reading::erase (unsigned int start, int len, bool allow_split)
 {
@@ -433,7 +498,7 @@
                           m_segments[m_segment_pos - 1].raw);
     m_key2kana->reset_pseudo_ascii_mode();
     for (unsigned int i = 0; i < m_segment_pos; i++)
-        m_key2kana->compute_for_pseudo_ascii_mode(m_segments[i].kana);
+        m_key2kana->process_pseudo_ascii_mode(m_segments[i].kana);
 }
 
 unsigned int
@@ -655,7 +720,28 @@
 }
 
 void
-Reading::use_pseudo_ascii_mode (bool flag)
+Reading::set_pseudo_ascii_mode (int mode)
 {
-    m_key2kana_normal.use_pseudo_ascii_mode (flag);
+    m_key2kana_normal.set_pseudo_ascii_mode (mode);
+}
+
+bool
+Reading::is_pseudo_ascii_mode (void)
+{
+    return m_key2kana_normal.is_pseudo_ascii_mode ();
+}
+
+void
+Reading::reset_pseudo_ascii_mode (void)
+{
+    if (m_key2kana_normal.is_pseudo_ascii_mode () &&
+        m_key2kana_normal.is_pending ()) {
+        ReadingSegment c;
+        ReadingSegments::iterator it = m_segments.begin ();
+
+        /* separate to another segment */
+        m_key2kana_normal.reset_pseudo_ascii_mode ();
+        m_segments.insert (it + m_segment_pos, c);
+        m_segment_pos++;
+    }
 }
Index: src/scim_anthy_reading.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/scim_anthy_reading.h	25 Apr 2006 07:26:19 -0000	1.25
+++ src/scim_anthy_reading.h	13 Jul 2006 07:41:51 -0000	1.26
@@ -80,6 +80,8 @@
                                         = SCIM_ANTHY_STRING_HIRAGANA);
     String       get_raw               (unsigned int     start  = 0,
                                         int              length = -1);
+    bool         append                (const KeyEvent & key,
+                                        const String   & string);
     void         erase                 (unsigned int     start  = 0,
                                         int              length = -1,
                                         bool             allow_split = false);
@@ -104,7 +106,9 @@
     bool         get_symbol_width      (void);
     void         set_number_width      (bool             half);
     bool         get_number_width      (void);
-    void         use_pseudo_ascii_mode (bool             flag);
+    void         set_pseudo_ascii_mode (int              mode);
+    bool         is_pseudo_ascii_mode  (void);
+    void         reset_pseudo_ascii_mode (void);
 
 private:
     void         reset_pending         (void);
Index: src/scim_anthy_setup.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_setup.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- src/scim_anthy_setup.cpp	4 Jul 2006 09:19:48 -0000	1.65
+++ src/scim_anthy_setup.cpp	13 Jul 2006 07:41:51 -0000	1.66
@@ -328,51 +328,6 @@
                                                    gpointer          user_data);
 
 
-static BoolConfigData *
-find_bool_config_entry (const char *config_key)
-{
-    if (!config_key)
-        return NULL;
-
-    for (unsigned int i = 0; config_bool_common[i].key; i++) {
-        BoolConfigData *entry = &config_bool_common[i];
-        if (entry->key && !strcmp (entry->key, config_key))
-            return entry;
-    }
-
-    return NULL;
-}
-
-static IntConfigData *
-find_int_config_entry (const char *config_key)
-{
-    if (!config_key)
-        return NULL;
-
-    for (unsigned int i = 0; config_int_common[i].key; i++) {
-        IntConfigData *entry = &config_int_common[i];
-        if (entry->key && !strcmp (entry->key, config_key))
-            return entry;
-    }
-
-    return NULL;
-}
-
-static StringConfigData *
-find_string_config_entry (const char *config_key)
-{
-    if (!config_key)
-        return NULL;
-
-    for (unsigned int i = 0; config_string_common[i].key; i++) {
-        StringConfigData *entry = &config_string_common[i];
-        if (entry->key && !strcmp (entry->key, config_key))
-            return entry;
-    }
-
-    return NULL;
-}
-
 static StringConfigData *
 find_key_config_entry (const char *config_key)
 {
@@ -387,21 +342,6 @@
     return NULL;
 }
 
-static ColorConfigData *
-find_color_config_entry (const char *config_key)
-{
-    if (!config_key)
-        return NULL;
-
-    for (unsigned int i = 0; config_color_common[i].fg_key; i++) {
-        ColorConfigData *entry = &config_color_common[i];
-        if (entry->fg_key && !strcmp (entry->fg_key, config_key))
-            return entry;
-    }
-
-    return NULL;
-}
-
 GtkWidget *
 create_check_button (const char *config_key)
 {
Index: src/scim_anthy_setup_romaji.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_setup_romaji.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src/scim_anthy_setup_romaji.cpp	25 Apr 2006 07:26:19 -0000	1.19
+++ src/scim_anthy_setup_romaji.cpp	13 Jul 2006 07:41:51 -0000	1.20
@@ -60,23 +60,25 @@
 
 static bool     load_romaji_theme                 (void);
 
-static void     on_romaji_theme_menu_changed      (GtkOptionMenu        *omenu,
-                                                   gpointer              user_data);
-static void     on_romaji_customize_button_clicked(GtkWidget            *button,
-                                                   gpointer              data);
-static void     on_table_editor_add_entry         (ScimAnthyTableEditor *editor,
-                                                   gpointer              data);
-static void     on_table_editor_added_entry       (ScimAnthyTableEditor *editor,
-                                                   gpointer              data);
-static void     on_table_editor_remove_entry      (ScimAnthyTableEditor *editor,
-                                                   gpointer              data);
-static void     on_table_editor_removed_entry     (ScimAnthyTableEditor *editor,
-                                                   gpointer              data);
+static void     on_romaji_pseudo_ascii_mode_toggled(GtkToggleButton *togglebutton,
+                                                    gpointer         user_data);
+static void     on_romaji_theme_menu_changed       (GtkOptionMenu        *omenu,
+                                                    gpointer              user_data);
+static void     on_romaji_customize_button_clicked (GtkWidget            *button,
+                                                    gpointer              data);
+static void     on_table_editor_add_entry          (ScimAnthyTableEditor *editor,
+                                                    gpointer              data);
+static void     on_table_editor_added_entry        (ScimAnthyTableEditor *editor,
+                                                    gpointer              data);
+static void     on_table_editor_remove_entry       (ScimAnthyTableEditor *editor,
+                                                    gpointer              data);
+static void     on_table_editor_removed_entry      (ScimAnthyTableEditor *editor,
+                                                    gpointer              data);
 
 GtkWidget *
 romaji_page_create_ui (void)
 {
-    GtkWidget *vbox, *widget;
+    GtkWidget *vbox, *widget, *hbox, *label;
 
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_widget_show (vbox);
@@ -95,15 +97,31 @@
 
     /* pseudo ascii mode */
     widget = create_check_button (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE);
+    g_signal_connect ((gpointer) widget, "toggled",
+                      G_CALLBACK (on_romaji_pseudo_ascii_mode_toggled),
+                      NULL);
     gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 4);
 
+    /* pseudo ascii: blank behavior */
+    hbox = gtk_hbox_new (FALSE, 0), *label;
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 4);
+    gtk_widget_show (hbox);
+    label = gtk_label_new ("    ");
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_widget_show (label);
+
+    widget = create_check_button (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR);
+    gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+    // set initial state
+    on_romaji_pseudo_ascii_mode_toggled (GTK_TOGGLE_BUTTON (widget), NULL);
+
     /* romaji table */
-    GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_hbox_new (FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
     gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
     gtk_widget_show(hbox);
 
-    GtkWidget *label = gtk_label_new_with_mnemonic (_("Romaji _table:"));
+    label = gtk_label_new_with_mnemonic (_("Romaji _table:"));
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
     gtk_widget_show (label);
 
@@ -407,6 +425,18 @@
 }
 
 static void
+on_romaji_pseudo_ascii_mode_toggled (GtkToggleButton *togglebutton,
+                                     gpointer         user_data)
+{
+    gboolean active = gtk_toggle_button_get_active (togglebutton);
+    BoolConfigData *entry;
+
+    entry = find_bool_config_entry (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR);
+    if (entry->widget)
+        gtk_widget_set_sensitive (GTK_WIDGET (entry->widget), active);
+}
+
+static void
 on_romaji_theme_menu_changed (GtkOptionMenu *omenu, gpointer user_data)
 {
     bool success;

scim-anthy-1.0.0-pseudo-ascii.patch:
 scim_anthy_factory.cpp      |    5 +++++
 scim_anthy_factory.h        |    1 +
 scim_anthy_imengine.cpp     |   29 ++++++++++++++++++++++-------
 scim_anthy_key2kana.cpp     |   30 ++++++++++++++++++++++++++++--
 scim_anthy_key2kana.h       |   38 ++++++++++++++++++++++----------------
 scim_anthy_key2kana_base.h  |    5 +++++
 scim_anthy_preedit.cpp      |    6 ++++++
 scim_anthy_preedit.h        |    1 +
 scim_anthy_prefs.cpp        |    9 +++++++++
 scim_anthy_prefs.h          |    2 ++
 scim_anthy_reading.cpp      |    9 +++++++++
 scim_anthy_reading.h        |    1 +
 scim_anthy_setup_romaji.cpp |    4 ++++
 13 files changed, 115 insertions(+), 25 deletions(-)

--- NEW FILE scim-anthy-1.0.0-pseudo-ascii.patch ---
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_factory.cpp scim-anthy-1.0.0/src/scim_anthy_factory.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_factory.cpp	2006-02-13 19:18:19.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_factory.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -121,6 +121,7 @@
       m_romaji_half_symbol          (SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL_DEFAULT),
       m_romaji_half_number          (SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER_DEFAULT),
       m_romaji_allow_split          (SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT_DEFAULT),
+      m_romaji_pseudo_ascii_mode    (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT),
       m_nicola_time                 (SCIM_ANTHY_CONFIG_NICOLA_TIME_DEFAULT),
       m_dict_admin_command          (SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND_DEFAULT),
       m_add_word_command            (SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND_DEFAULT),
@@ -490,6 +491,10 @@
             = config->read (String (SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT),
                             SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT_DEFAULT);
 
+        m_romaji_pseudo_ascii_mode
+            = config->read (String (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE),
+                            SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT);
+
         m_nicola_time
             = config->read (String (SCIM_ANTHY_CONFIG_NICOLA_TIME),
                             SCIM_ANTHY_CONFIG_NICOLA_TIME_DEFAULT);
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_factory.h scim-anthy-1.0.0/src/scim_anthy_factory.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_factory.h	2006-02-13 19:17:02.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_factory.h	2006-07-06 20:43:34.000000000 +0900
@@ -91,6 +91,7 @@
     bool           m_romaji_half_symbol;
     bool           m_romaji_half_number;
     bool           m_romaji_allow_split;
+    bool           m_romaji_pseudo_ascii_mode;
     int            m_nicola_time;
     KeyEventList   m_left_thumb_keys;
     KeyEventList   m_right_thumb_keys;
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_imengine.cpp scim-anthy-1.0.0/src/scim_anthy_imengine.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_imengine.cpp	2006-03-29 14:18:59.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_imengine.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -819,11 +819,16 @@
 
     if (method != get_typing_method ()) {
         Key2KanaTable *fundamental_table = NULL;
-        if (method == SCIM_ANTHY_TYPING_METHOD_ROMAJI)
+        bool pseudo_ascii = false;
+
+        if (method == SCIM_ANTHY_TYPING_METHOD_ROMAJI) {
             fundamental_table = m_factory->m_custom_romaji_table;
-        else if (method == SCIM_ANTHY_TYPING_METHOD_KANA)
+            pseudo_ascii = m_factory->m_romaji_pseudo_ascii_mode;
+        } else if (method == SCIM_ANTHY_TYPING_METHOD_KANA) {
             fundamental_table = m_factory->m_custom_kana_table;
+        }
         m_preedit.set_typing_method (method);
+        m_preedit.use_pseudo_ascii_mode (pseudo_ascii);
     }
 }
 
@@ -2173,16 +2178,26 @@
             m_preedit.set_input_mode (SCIM_ANTHY_MODE_WIDE_LATIN);
     }
 
-    // set typing method
+    // set typing method and pseudo ASCII mode
     if (m_on_init || !m_factory->m_show_typing_method_label) {
-        if (m_factory->m_typing_method == "NICOLA")
+        if (m_factory->m_typing_method == "NICOLA") {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_NICOLA);
-        else if (m_factory->m_typing_method == "Kana")
+            m_preedit.use_pseudo_ascii_mode(false);
+        } else if (m_factory->m_typing_method == "Kana") {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_KANA);
-        else
+            m_preedit.use_pseudo_ascii_mode(false);
+        } else {
             m_preedit.set_typing_method (SCIM_ANTHY_TYPING_METHOD_ROMAJI);
+            m_preedit.use_pseudo_ascii_mode(m_factory->m_romaji_pseudo_ascii_mode);
+        }
     } else {
-        m_preedit.set_typing_method (m_preedit.get_typing_method ());
+        TypingMethod m = m_preedit.get_typing_method ();
+
+        m_preedit.set_typing_method (m);
+        if (m == SCIM_ANTHY_TYPING_METHOD_ROMAJI)
+            m_preedit.use_pseudo_ascii_mode(m_factory->m_romaji_pseudo_ascii_mode);
+        else
+            m_preedit.use_pseudo_ascii_mode(false);
     }
 
     // set conversion mode
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_key2kana.cpp scim-anthy-1.0.0/src/scim_anthy_key2kana.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_key2kana.cpp	2006-02-08 12:14:01.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_key2kana.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -27,10 +27,12 @@
 
 Key2KanaConvertor::Key2KanaConvertor (AnthyInstance    & anthy,
                                       Key2KanaTableSet & tables)
-    : m_anthy          (anthy),
-      m_tables         (tables)
+    : m_anthy                   (anthy),
+      m_tables                  (tables),
+      m_is_in_pseudo_ascii_mode (false)
 {
     set_case_sensitive (false);
+    use_pseudo_ascii_mode (false);
 }
 
 Key2KanaConvertor::~Key2KanaConvertor ()
@@ -124,6 +126,13 @@
     bool has_partial_match = false;
     bool retval = false;
 
+    if (m_pseudo_ascii_mode)
+        compute_for_pseudo_ascii_mode(widestr);
+    if (m_is_in_pseudo_ascii_mode) {
+        m_pending += widestr;
+        pending = m_pending;
+        return false;
+    }
     if (!m_case_sensitive) {
         String half = utf8_wcstombs (matching_str);
         for (unsigned int i = 0; i < half.length (); i++)
@@ -213,6 +222,7 @@
 {
     m_pending.clear ();
     m_exact_match.clear ();
+    reset_pseudo_ascii_mode();
 }
 
 bool
@@ -257,6 +267,22 @@
         append (raw.substr(i, 1), res, pend);
     }
 }
+
+void
+Key2KanaConvertor::compute_for_pseudo_ascii_mode(const WideString & wstr)
+{
+    for (unsigned int i = 0; !m_is_in_pseudo_ascii_mode && i < wstr.length (); i++) {
+        if (wstr[i] >= 'A' && wstr[i] <= 'Z')
+            m_is_in_pseudo_ascii_mode = true;
+    }
+}
+
+void
+Key2KanaConvertor::reset_pseudo_ascii_mode (void)
+{
+    m_is_in_pseudo_ascii_mode = false;
+}
+
 /*
 vi:ts=4:nowrap:ai:expandtab
 */
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_key2kana.h scim-anthy-1.0.0/src/scim_anthy_key2kana.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_key2kana.h	2006-02-08 12:14:01.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_key2kana.h	2006-07-06 20:43:34.000000000 +0900
@@ -37,22 +37,26 @@
 class Key2KanaConvertor : public Key2KanaConvertorBase
 {
 public:
-    Key2KanaConvertor             (AnthyInstance    & anthy,
-                                   Key2KanaTableSet & tables);
-    virtual ~Key2KanaConvertor    ();
-
-    bool       can_append         (const KeyEvent   & key);
-    bool       append             (const KeyEvent   & key,
-                                   WideString       & result,
-                                   WideString       & pending,
-                                   String           & raw);
-    void       clear              (void);
-
-    bool       is_pending         (void);
-    WideString get_pending        (void);
-    WideString flush_pending      (void);
-    void       reset_pending      (const WideString & result,
-                                   const String     & raw);
+    Key2KanaConvertor                        (AnthyInstance    & anthy,
+                                              Key2KanaTableSet & tables);
+    virtual ~Key2KanaConvertor               ();
+
+    bool       can_append                    (const KeyEvent   & key);
+    bool       append                        (const KeyEvent   & key,
+                                              WideString       & result,
+                                              WideString       & pending,
+                                              String           & raw);
+    void       clear                         (void);
+
+    bool       is_pending                    (void);
+    WideString get_pending                   (void);
+    WideString flush_pending                 (void);
+    void       reset_pending                 (const WideString & result,
+                                              const String     & raw);
+    void       use_pseudo_ascii_mode         (bool               flag)
+        { m_pseudo_ascii_mode = flag; }
+    void       compute_for_pseudo_ascii_mode (const WideString & wstr);
+    void       reset_pseudo_ascii_mode       (void);
 
 private:
     bool       append             (const String     & str,
@@ -66,6 +70,8 @@
     // state
     WideString         m_pending;
     Key2KanaRule       m_exact_match;
+    bool               m_pseudo_ascii_mode;
+    bool               m_is_in_pseudo_ascii_mode;
 };
 
 }
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_key2kana_base.h scim-anthy-1.0.0/src/scim_anthy_key2kana_base.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_key2kana_base.h	2006-02-08 12:14:01.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_key2kana_base.h	2006-07-06 20:43:34.000000000 +0900
@@ -49,6 +49,11 @@
     virtual void       reset_pending      (const WideString & result,
                                            const String     & raw)       = 0;
 
+    virtual void       reset_pseudo_ascii_mode       (void)
+        {}
+    virtual void       compute_for_pseudo_ascii_mode (const WideString & wstr)
+        {}
+
     virtual void       set_case_sensitive (bool               sensitive)
         { m_case_sensitive = sensitive; }
     virtual bool       get_case_sensitive (void)
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_preedit.cpp scim-anthy-1.0.0/src/scim_anthy_preedit.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_preedit.cpp	2006-02-13 17:00:41.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_preedit.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -476,6 +476,12 @@
     return m_reading.get_number_width ();
 }
 
+void
+Preedit::use_pseudo_ascii_mode (bool flag)
+{
+    m_reading.use_pseudo_ascii_mode (flag);
+}
+
 bool
 Preedit::is_comma_or_period (const String & str)
 {
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_preedit.h scim-anthy-1.0.0/src/scim_anthy_preedit.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_preedit.h	2006-02-13 17:00:42.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_preedit.h	2006-07-06 20:43:34.000000000 +0900
@@ -121,6 +121,7 @@
     virtual bool          get_symbol_width       (void);
     virtual void          set_number_width       (bool           half);
     virtual bool          get_number_width       (void);
+    virtual void          use_pseudo_ascii_mode  (bool           flag);
 
 private:
     void                  get_reading_substr     (WideString   & substr,
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_prefs.cpp scim-anthy-1.0.0/src/scim_anthy_prefs.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_prefs.cpp	2006-02-13 19:07:19.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_prefs.cpp	2006-07-06 20:43:49.000000000 +0900
@@ -97,6 +97,15 @@
         false,
     },
     {
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE,
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT,
+        SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT,
+        N_("_Entering the pseudo ASCII input mode with capital letters."),
+        NULL,
+        N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode during capital letters are in preedit."),
+        false,
+    },
+    {
         SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT,
         SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT_DEFAULT,
         SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT_DEFAULT,
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_prefs.h scim-anthy-1.0.0/src/scim_anthy_prefs.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_prefs.h	2006-02-13 19:03:56.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_prefs.h	2006-07-06 20:43:34.000000000 +0900
@@ -35,6 +35,7 @@
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL          "/IMEngine/Anthy/RomajiHalfSymbol"
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER          "/IMEngine/Anthy/RomajiHalfNumber"
 #define SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT          "/IMEngine/Anthy/RomajiAllowSplit"
+#define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE    "/IMEngine/Anthy/RomajiPseudoAsciiMode"
 
 #define SCIM_ANTHY_CONFIG_KANA_LAYOUT_FILE            "/IMEngine/Anthy/KanaLayoutFile"
 
@@ -167,6 +168,7 @@
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL_DEFAULT          false
 #define SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER_DEFAULT          false
 #define SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT_DEFAULT          true
+#define SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE_DEFAULT    true
 
 #define SCIM_ANTHY_CONFIG_KANA_LAYOUT_FILE_DEFAULT            ""
 
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_reading.cpp scim-anthy-1.0.0/src/scim_anthy_reading.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_reading.cpp	2006-02-13 17:00:42.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_reading.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -431,6 +431,9 @@
                                m_segments[m_segment_pos - 1].raw);
     m_kana.reset_pending (m_segments[m_segment_pos - 1].kana,
                           m_segments[m_segment_pos - 1].raw);
+    m_key2kana->reset_pseudo_ascii_mode();
+    for (unsigned int i = 0; i < m_segment_pos; i++)
+        m_key2kana->compute_for_pseudo_ascii_mode(m_segments[i].kana);
 }
 
 unsigned int
@@ -650,3 +653,9 @@
 {
     return m_key2kana_tables.number_is_half ();
 }
+
+void
+Reading::use_pseudo_ascii_mode (bool flag)
+{
+    m_key2kana_normal.use_pseudo_ascii_mode (flag);
+}
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_reading.h scim-anthy-1.0.0/src/scim_anthy_reading.h
--- scim-anthy-1.0.0.orig/src/scim_anthy_reading.h	2006-02-13 17:00:42.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_reading.h	2006-07-06 20:43:34.000000000 +0900
@@ -104,6 +104,7 @@
     bool         get_symbol_width      (void);
     void         set_number_width      (bool             half);
     bool         get_number_width      (void);
+    void         use_pseudo_ascii_mode (bool             flag);
 
 private:
     void         reset_pending         (void);
diff -ruN scim-anthy-1.0.0.orig/src/scim_anthy_setup_romaji.cpp scim-anthy-1.0.0/src/scim_anthy_setup_romaji.cpp
--- scim-anthy-1.0.0.orig/src/scim_anthy_setup_romaji.cpp	2006-02-08 12:14:01.000000000 +0900
+++ scim-anthy-1.0.0/src/scim_anthy_setup_romaji.cpp	2006-07-06 20:43:34.000000000 +0900
@@ -93,6 +93,10 @@
     widget = create_check_button (SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER);
     gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 4);
 
+    /* pseudo ascii mode */
+    widget = create_check_button (SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE);
+    gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 4);
+
     /* romaji table */
     GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- scim-anthy.spec	13 Jul 2006 00:51:29 -0000	1.31
+++ scim-anthy.spec	14 Jul 2006 12:27:28 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:           scim-anthy
 Version:        1.0.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -14,6 +14,8 @@
 Buildrequires: libstdc++so7-devel
 %endif
 Patch1:		scim-anthy-helper-moduledir.patch
+Patch2:		scim-anthy-1.0.0-pseudo-ascii.patch
+Patch3:		scim-anthy-1.0.0-pseudo-ascii-insert-space.patch
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -26,6 +28,8 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-moduledir
+%patch2 -p1 -b .2-pseudo-ascii
+%patch3 -p0 -b .3-insert-space
 # patch1 touches src/Makefile.am
 aclocal
 automake
@@ -70,6 +74,11 @@
 
 
 %changelog
+* Fri Jul 14 2006 Akira TAGOH <tagohr at edhat.com> - 1.0.0-4
+- scim-anthy-1.0.0-pseudo-ascii.patch,
+  scim-anthy-1.0.0-pseudo-ascii-insert-space.patch: applied to allow the ASCII
+  characters with the capital letter without even turning off the IME. (#187721)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3
 - rebuild
 - Add missing br automake



From fedora-cvs-commits at redhat.com  Fri Jul 14 12:32:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 08:32:57 -0400
Subject: rpms/scim-anthy/devel scim-anthy.spec,1.32,1.33
Message-ID: <200607141232.k6ECWvWD000525@cvs.devel.redhat.com>

Author: tagoh

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

Modified Files:
	scim-anthy.spec 
Log Message:
add missing br


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scim-anthy.spec	14 Jul 2006 12:27:28 -0000	1.32
+++ scim-anthy.spec	14 Jul 2006 12:32:55 -0000	1.33
@@ -9,7 +9,7 @@
 Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
-BuildRequires:	anthy-devel >= 6700b-1 gettext-devel automake
+BuildRequires:	anthy-devel >= 6700b-1 gettext-devel automake libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:02:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:02:16 -0400
Subject: rpms/openoffice.org/devel workspace.vcl59.patch,1.5,1.6
Message-ID: <200607141302.k6ED2GEK001456@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1389

Modified Files:
	workspace.vcl59.patch 
Log Message:
freetype headers changed

workspace.vcl59.patch:
 source/window/window.cxx           |    0 
 unx/gtk/app/gtkdata.cxx            |    0 
 unx/source/gdi/salgdi3.cxx         |    8 ++++
 vcl/source/glyphs/gcach_ftyp.cxx   |   66 +++++++++++++++++--------------------
 vcl/source/window/window.cxx       |    2 -
 vcl/unx/gtk/app/gtkdata.cxx        |    1 
 vcl/unx/source/gdi/gcach_xpeer.cxx |    5 ++
 vcl/unx/source/gdi/gcach_xpeer.hxx |    1 
 8 files changed, 48 insertions(+), 35 deletions(-)

Index: workspace.vcl59.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl59.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.vcl59.patch	22 Jun 2006 16:17:29 -0000	1.5
+++ workspace.vcl59.patch	14 Jul 2006 13:02:12 -0000	1.6
@@ -73,3 +73,157 @@
          {
              if( pParent->mpWindowImpl->mbSuppressAccessibilityEvents )
                  return TRUE;
+--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2006-07-14 13:59:52.000000000 +0100
++++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2006-07-14 14:00:43.000000000 +0100
+@@ -72,6 +72,11 @@
+ #else
+     #define FTVERSION (1000*FREETYPE_MAJOR + 100*FREETYPE_MINOR + FREETYPE_PATCH)
+ #endif
++#if FTVERSION >= 2200
++typedef const FT_Vector* FT_Vector_CPtr;
++#else // FTVERSION < 2200
++typedef FT_Vector* FT_Vector_CPtr;
++#endif
+ 
+ #include <vector>
+ 
+@@ -89,23 +94,16 @@
+     #include <io.h>
+     #define strncasecmp strnicmp
+ #endif
+-#if 0
+-#include "freetype/internal/ftobjs.h"
+-#include "freetype/internal/sfnt.h"
+-#include "freetype/internal/ftstream.h"
+-#endif
+ 
+ #include <svapp.hxx>
+ #include <settings.hxx>
+ #include <i18npool/lang.h>
+ 
+-#if defined( FT_NEXT_SHORT ) && !defined( NEXT_Short )
+-// Account for differing versions of freetype...
+-#define NEXT_Short( x )  FT_NEXT_SHORT( x )
+-#define NEXT_UShort( x ) FT_NEXT_USHORT( x )
+-#define NEXT_Long( x )   FT_NEXT_LONG( x )
+-#define NEXT_ULong( x )  FT_NEXT_ULONG( x )
+-#endif
++typedef const unsigned char* CPU8;
++inline sal_uInt16 NEXT_U16( CPU8& p ) { p+=2; return (p[-2]<<8)|p[-1]; }
++inline sal_Int16  NEXT_S16( CPU8& p ) { return (sal_Int16)NEXT_U16(p); }
++inline sal_uInt32 NEXT_U32( CPU8& p ) { p+=4; return (p[-4]<<24)|(p[-3]<<16)|(p[-2]<<8)|p[-1]; }
++//inline sal_Int32 NEXT_S32( U8*& p ) { return (sal_Int32)NEXT_U32(p); }
+ 
+ // -----------------------------------------------------------------------
+ 
+@@ -1819,15 +1817,15 @@
+ 
+     // Apple New style kern table
+     pBuffer = pKern;
+-    nVersion = NEXT_ULong( pBuffer );
+-    nTableCnt = NEXT_ULong( pBuffer );
++    nVersion = NEXT_U32( pBuffer );
++    nTableCnt = NEXT_U32( pBuffer );
+     if ( nVersion == 0x00010000 )
+     {
+         for( USHORT nTableIdx = 0; nTableIdx < nTableCnt; ++nTableIdx )
+         {
+-            ULONG  nLength  = NEXT_ULong( pBuffer );
+-            USHORT nCoverage   = NEXT_UShort( pBuffer );
+-            USHORT nTupleIndex = NEXT_UShort( pBuffer );
++            ULONG  nLength  = NEXT_U32( pBuffer );
++            USHORT nCoverage   = NEXT_U16( pBuffer );
++            USHORT nTupleIndex = NEXT_U16( pBuffer );
+ 
+             // Get kerning type
+             sal_Bool bKernVertical     = nCoverage & 0x8000;
+@@ -1841,14 +1839,14 @@
+             {
+                 case 0: // version 0, kerning format 0
+                 {
+-                    USHORT nPairs = NEXT_UShort( pBuffer );
++                    USHORT nPairs = NEXT_U16( pBuffer );
+                     pBuffer += 6;   // skip search hints
+                     aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
+                     for( int i = 0; i < nPairs; ++i )
+                     {
+-                        aKernPair.mnChar1 = NEXT_UShort( pBuffer );
+-                        aKernPair.mnChar2 = NEXT_UShort( pBuffer );
+-                        /*long nUnscaledKern=*/ NEXT_Short( pBuffer );
++                        aKernPair.mnChar1 = NEXT_U16( pBuffer );
++                        aKernPair.mnChar2 = NEXT_U16( pBuffer );
++                        /*long nUnscaledKern=*/ NEXT_S16( pBuffer );
+                         aKernGlyphVector.push_back( aKernPair );
+                     }
+                 }
+@@ -1857,18 +1855,18 @@
+                 case 2:	// version 0, kerning format 2
+                 {
+                     const FT_Byte* pSubTable = pBuffer;
+-                    /*USHORT nRowWidth	=*/ NEXT_UShort( pBuffer );
+-                    USHORT nOfsLeft     = NEXT_UShort( pBuffer );
+-                    USHORT nOfsRight    = NEXT_UShort( pBuffer );
+-                    USHORT nOfsArray    = NEXT_UShort( pBuffer );
++                    /*USHORT nRowWidth	=*/ NEXT_U16( pBuffer );
++                    USHORT nOfsLeft     = NEXT_U16( pBuffer );
++                    USHORT nOfsRight    = NEXT_U16( pBuffer );
++                    USHORT nOfsArray    = NEXT_U16( pBuffer );
+ 
+                     const FT_Byte* pTmp = pSubTable + nOfsLeft;
+-                    USHORT nFirstLeft   = NEXT_UShort( pTmp );
+-                    USHORT nLastLeft    = NEXT_UShort( pTmp ) + nFirstLeft - 1;
++                    USHORT nFirstLeft   = NEXT_U16( pTmp );
++                    USHORT nLastLeft    = NEXT_U16( pTmp ) + nFirstLeft - 1;
+ 
+                     pTmp = pSubTable + nOfsRight;
+-                    USHORT nFirstRight  = NEXT_UShort( pTmp );
+-                    USHORT nLastRight   = NEXT_UShort( pTmp ) + nFirstRight - 1;
++                    USHORT nFirstRight  = NEXT_U16( pTmp );
++                    USHORT nLastRight   = NEXT_U16( pTmp ) + nFirstRight - 1;
+ 
+                     ULONG nPairs = (ULONG)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1);
+                     aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
+@@ -1879,7 +1877,7 @@
+                         aKernPair.mnChar1 = nLeft;
+                         for( int nRight = 0; nRight < nLastRight; ++nRight )
+                         {
+-                            if( NEXT_Short( pTmp ) != 0 )
++                            if( NEXT_S16( pTmp ) != 0 )
+                             {
+                                 aKernPair.mnChar2 = nRight;
+                                 aKernGlyphVector.push_back( aKernPair );
+@@ -2075,7 +2073,7 @@
+ // TODO: wait till all compilers accept that calling conventions
+ // for functions are the same independent of implementation constness,
+ // then uncomment the const-tokens in the function interfaces below
+-static int FT_move_to( FT_Vector* /*const*/ p0, void* vpPolyArgs )
++static int FT_move_to( FT_Vector_CPtr p0, void* vpPolyArgs )
+ {
+     PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+ 
+@@ -2086,14 +2084,14 @@
+     return 0;
+ }
+ 
+-static int FT_line_to( FT_Vector* /*const*/ p1, void* vpPolyArgs )
++static int FT_line_to( FT_Vector_CPtr p1, void* vpPolyArgs )
+ {
+     PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+     rA.AddPoint( p1->x, p1->y, POLY_NORMAL );
+     return 0;
+ }
+ 
+-static int FT_conic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, void* vpPolyArgs )
++static int FT_conic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, void* vpPolyArgs )
+ {
+     PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+ 
+@@ -2110,7 +2108,7 @@
+     return 0;
+ }
+ 
+-static int FT_cubic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, FT_Vector* /*const*/ p3, void* vpPolyArgs )
++static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3, void* vpPolyArgs )
+ {
+     PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
+     rA.AddPoint( p1->x, p1->y, POLY_CONTROL );



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:03:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:03:19 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.768,1.769
Message-ID: <200607141303.k6ED3Jdn001646@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1606

Modified Files:
	openoffice.org.spec 
Log Message:
freetype headers changed


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.768
retrieving revision 1.769
diff -u -r1.768 -r1.769
--- openoffice.org.spec	13 Jul 2006 15:45:58 -0000	1.768
+++ openoffice.org.spec	14 Jul 2006 13:03:15 -0000	1.769
@@ -3340,7 +3340,7 @@
 - rebuild for new tasty linker hash
 - add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
 - add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-
+- fix use of freetype headers for new freetype
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:09:40 -0400
Subject: rpms/joe/devel joe.spec, 1.32, 1.33 joe-3.1-ret.patch, 1.1,
	NONE joe-3.4-pgup.patch, 1.1, NONE
Message-ID: <200607141309.k6ED9e1C002699@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2209

Modified Files:
	joe.spec 
Removed Files:
	joe-3.1-ret.patch joe-3.4-pgup.patch 
Log Message:
- remove uncessary patches



Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- joe.spec	12 Jul 2006 06:34:10 -0000	1.32
+++ joe.spec	14 Jul 2006 13:09:37 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.4
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -13,8 +13,6 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Patch0: joe-3.1-joerc.patch
 Patch2: joe-3.4-selinux.patch
-Patch4: joe-3.1-ret.patch
-Patch5: joe-3.4-pgup.patch
 
 %description
 Joe is a powerful, easy to use, modeless text editor.
@@ -25,8 +23,6 @@
 %setup -q
 %patch0 -p1 -b .joerc
 %patch2 -p1 -b .selinux
-%patch4 -p1 -b .ret
-%patch5 -p1 -b .pgup
 
 %build
 %configure
@@ -56,6 +52,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 14 2006 Ivana Varekova <varekova at redhat.com> 3.4-3
+- remove uncessary patches
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4-2.1
 - rebuild
 


--- joe-3.1-ret.patch DELETED ---


--- joe-3.4-pgup.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:16:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:16:10 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.61,1.62
Message-ID: <200607141316.k6EDGA7i007714@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	isdn4k-utils.spec 
Log Message:
add missing br


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- isdn4k-utils.spec	12 Jul 2006 06:26:55 -0000	1.61
+++ isdn4k-utils.spec	14 Jul 2006 13:16:08 -0000	1.62
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 47.1
+Release: 48
 License: GPL
 Group: Applications/System
 
@@ -46,23 +46,24 @@
 Requires: hwdata >= 0.146.18.EL-1
 Requires: initscripts >= 5.92
 
-BuildPrereq: openjade
-BuildPrereq: linuxdoc-tools
-BuildPrereq: /usr/bin/sgml2txt
-BuildPrereq: /usr/bin/sgml2html
-BuildPrereq: ncurses-devel
-BuildPrereq: tcl-devel
-BuildPrereq: libpcap-devel
-BuildPrereq: libICE-devel
-BuildPrereq: libSM-devel
-BuildPrereq: libX11-devel
-BuildPrereq: libXaw-devel
-BuildPrereq: libXmu-devel
-BuildPrereq: libXpm-devel
-BuildPrereq: libXt-devel
-BuildPrereq: libXp-devel
-BuildPrereq: libXext-devel
-BuildPrereq: imake
+BuildRequires: openjade
+BuildRequires: linuxdoc-tools
+BuildRequires: /usr/bin/sgml2txt
+BuildRequires: /usr/bin/sgml2html
+BuildRequires: ncurses-devel
+BuildRequires: tcl-devel
+BuildRequires: libpcap-devel
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXaw-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXt-devel
+BuildRequires: libXp-devel
+BuildRequires: libXext-devel
+BuildRequires: imake
+BuildRequires: automake
 
 Prereq: /sbin/chkconfig
 Prereq: /sbin/ldconfig
@@ -493,8 +494,9 @@
 %doc xmonisdn/README
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2-47.1
+* Wed Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 3.2-48
 - rebuild
+- add missing br automake
 
 * Wed May 31 2006 Than Ngo <than at redhat.com> 3.2-47
 - add requires on libpcap-devel
@@ -793,7 +795,7 @@
 
 * Wed Feb 07 2001 Than Ngo <than at redhat.com>
 - updated ipppd, isdnctrl for working with kernel-2.4
-- added missing BuildPrereq
+- added missing BuildRequires
 
 * Tue Feb 06 2001 Than Ngo <than at redhat.com>
 - rebuild against to fix version mismatch in isdnlog



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:21:31 -0400
Subject: rpms/php-pear/devel .cvsignore, 1.5, 1.6 php-pear.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200607141321.k6EDLVPp021089@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	.cvsignore php-pear.spec sources 
Log Message:
* Fri Jul 14 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-4
- update to XML_RPC-1.5.0
- really package macros.pear



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 May 2006 09:33:54 -0000	1.5
+++ .cvsignore	14 Jul 2006 13:21:27 -0000	1.6
@@ -1,8 +1 @@
-XML_RPC-1.4.4.tgz
-install-pear-nozlib-1.4.5.phar
-install-pear-nozlib-1.4.6.phar
-XML_RPC-1.4.8.tgz
-install-pear-nozlib-1.4.9.phar
-noarch
-clog
-*.src.rpm
+XML_RPC-1.5.0.tgz


Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- php-pear.spec	13 Jul 2006 12:19:37 -0000	1.13
+++ php-pear.spec	14 Jul 2006 13:21:27 -0000	1.14
@@ -1,12 +1,12 @@
 
 %define peardir %{_datadir}/pear
 
-%define xmlrpcver 1.4.8
+%define xmlrpcver 1.5.0
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.9
-Release: 3
+Release: 4
 Epoch: 1
 License: The PHP License 3.0
 Group: System
@@ -101,10 +101,15 @@
 %{peardir}
 %{_bindir}/*
 %config %{_sysconfdir}/pear.conf
+%config %{_sysconfdir}/rpm/macros.pear
 %dir %{_localstatedir}/cache/php-pear
 %doc LICENSE
 
 %changelog
+* Fri Jul 14 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-4
+- update to XML_RPC-1.5.0
+- really package macros.pear
+
 * Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1:1.4.9-3
 - require php-cli
 - add /etc/rpm/macros.pear (Christopher Stone)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 May 2006 09:33:59 -0000	1.5
+++ sources	14 Jul 2006 13:21:27 -0000	1.6
@@ -1,2 +1,2 @@
-c2e94575bd14a4425de9e20976c65d43  XML_RPC-1.4.8.tgz
 1030f325e0ce140db7cb3063bda52d3b  install-pear-nozlib-1.4.9.phar
+9f9205d8c8b3ca07a50c5d332c6fb722  XML_RPC-1.5.0.tgz



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:31:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:31:10 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.62,1.63
Message-ID: <200607141331.k6EDVAWS024523@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	isdn4k-utils.spec 
Log Message:
add missing br


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- isdn4k-utils.spec	14 Jul 2006 13:16:08 -0000	1.62
+++ isdn4k-utils.spec	14 Jul 2006 13:31:08 -0000	1.63
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 48
+Release: 49
 License: GPL
 Group: Applications/System
 
@@ -64,6 +64,7 @@
 BuildRequires: libXext-devel
 BuildRequires: imake
 BuildRequires: automake
+BuildRequires: libtool
 
 Prereq: /sbin/chkconfig
 Prereq: /sbin/ldconfig
@@ -494,9 +495,9 @@
 %doc xmonisdn/README
 
 %changelog
-* Wed Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 3.2-48
+* Wed Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 3.2-49
 - rebuild
-- add missing br automake
+- add missing br automake libtool
 
 * Wed May 31 2006 Than Ngo <than at redhat.com> 3.2-47
 - add requires on libpcap-devel



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:37:20 -0400
Subject: rpms/flex/devel flex-2.5.4a-posix.patch, NONE, 1.1 flex.spec, 1.28,
	1.29 test-183098.sh, 1.2, NONE
Message-ID: <200607141337.k6EDbKVq025984@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25955

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.4a-posix.patch 
Removed Files:
	test-183098.sh 
Log Message:
- fileno is defined in posix standard, so adding #define _POSIX_SOURCE
  to compile without warnings (#195687)
- dropping 183098 test, since the original bug was already resolved


flex-2.5.4a-posix.patch:
 skel.c  |    2 ++
 skel.c~ |only
 2 files changed, 2 insertions(+)

--- NEW FILE flex-2.5.4a-posix.patch ---
diff -Bburpd flex-2.5.4/skel.c flex-2.5.4-pm/skel.c
--- flex-2.5.4/skel.c	2006-07-14 15:30:18.000000000 +0200
+++ flex-2.5.4-pm/skel.c	2006-07-14 15:29:43.000000000 +0200
@@ -14,6 +14,8 @@ const char *skel[] = {
   "#define YY_FLEX_MINOR_VERSION 5",
   "",
   "%-",
+  "/* Use posix source, to silent c99 warnings about fileno. */",
+  "#define _POSIX_SOURCE 1",
   "#include <stdio.h>",
   "#include <unistd.h>",
   "%*",
Only in flex-2.5.4-pm: skel.c~


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- flex.spec	12 Jul 2006 05:49:10 -0000	1.28
+++ flex.spec	14 Jul 2006 13:37:18 -0000	1.29
@@ -1,13 +1,12 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 38.1
+Release: 39
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
 BuildRoot: %{_tmppath}/%{name}-root
 Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz
-Source2: test-183098.sh
 Patch0: flex-2.5.4a-skel.patch
 Patch1: flex-2.5.4-glibc22.patch
 Patch2: flex-2.5.4a-gcc3.patch
@@ -19,6 +18,7 @@
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
 Patch10: flex-2.5.4a-Makefile.in.patch
+Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -48,6 +48,7 @@
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
 %patch10 -p1
+%patch11 -p1
 
 %build
 autoconf
@@ -68,7 +69,6 @@
 
 %check
 echo ============TESTING===============
-sh %{SOURCE2}
 make bigcheck
 echo ============END TESTING===========
 
@@ -84,6 +84,11 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-39
+- fileno is defined in posix standard, so adding #define _POSIX_SOURCE
+  to compile without warnings (#195687)
+- dropping 183098 test, since the original bug was already resolved
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4a-38.1
 - rebuild
 


--- test-183098.sh DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 13:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 09:51:57 -0400
Subject: rpms/flex/FC-5 flex-2.5.4a-posix.patch, NONE, 1.1 flex.spec, 1.27,
	1.28 test-183098.sh, 1.2, NONE
Message-ID: <200607141351.k6EDpvt6013074@cvs.devel.redhat.com>

Author: pmachata

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

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.4a-posix.patch 
Removed Files:
	test-183098.sh 
Log Message:
- fileno is defined in posix standard, so adding #define _POSIX_SOURCE
  to compile without warnings (#195687)
- dropping 183098 test, since the original bug was already resolved


flex-2.5.4a-posix.patch:
 skel.c  |    2 ++
 skel.c~ |only
 2 files changed, 2 insertions(+)

--- NEW FILE flex-2.5.4a-posix.patch ---
diff -Bburpd flex-2.5.4/skel.c flex-2.5.4-pm/skel.c
--- flex-2.5.4/skel.c	2006-07-14 15:30:18.000000000 +0200
+++ flex-2.5.4-pm/skel.c	2006-07-14 15:29:43.000000000 +0200
@@ -14,6 +14,8 @@ const char *skel[] = {
   "#define YY_FLEX_MINOR_VERSION 5",
   "",
   "%-",
+  "/* Use posix source, to silent c99 warnings about fileno. */",
+  "#define _POSIX_SOURCE 1",
   "#include <stdio.h>",
   "#include <unistd.h>",
   "%*",
Only in flex-2.5.4-pm: skel.c~


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/FC-5/flex.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- flex.spec	10 Mar 2006 10:45:12 -0000	1.27
+++ flex.spec	14 Jul 2006 13:51:54 -0000	1.28
@@ -1,13 +1,12 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 38
+Release: 39.fc5
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
 BuildRoot: %{_tmppath}/%{name}-root
 Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz
-Source2: test-183098.sh
 Patch0: flex-2.5.4a-skel.patch
 Patch1: flex-2.5.4-glibc22.patch
 Patch2: flex-2.5.4a-gcc3.patch
@@ -19,6 +18,7 @@
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
 Patch10: flex-2.5.4a-Makefile.in.patch
+Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -48,6 +48,7 @@
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
 %patch10 -p1
+%patch11 -p1
 
 %build
 autoconf
@@ -68,7 +69,6 @@
 
 %check
 echo ============TESTING===============
-sh %{SOURCE2}
 make bigcheck
 echo ============END TESTING===========
 
@@ -84,6 +84,11 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-39
+- fileno is defined in posix standard, so adding #define _POSIX_SOURCE
+  to compile without warnings (#195687)
+- dropping 183098 test, since the original bug was already resolved
+
 * Fri Mar 10 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-38
 - Caught the real cause of #183098.  It failed because the parser
   built with `flex -f' *sometimes* made it into the final package, and


--- test-183098.sh DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:11:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:11:14 -0400
Subject: rpms/openoffice.org/devel workspace.vcl59.patch,1.6,1.7
Message-ID: <200607141411.k6EEBEeC017387@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17360

Modified Files:
	workspace.vcl59.patch 
Log Message:
sigh

workspace.vcl59.patch:
 source/window/window.cxx           |    0 
 unx/gtk/app/gtkdata.cxx            |    0 
 unx/source/gdi/salgdi3.cxx         |    8 ++++
 vcl/source/glyphs/gcach_ftyp.cxx   |   65 ++++++++++++++++++-------------------
 vcl/source/window/window.cxx       |    2 -
 vcl/unx/gtk/app/gtkdata.cxx        |    1 
 vcl/unx/source/gdi/gcach_xpeer.cxx |    5 ++
 vcl/unx/source/gdi/gcach_xpeer.hxx |    1 
 8 files changed, 48 insertions(+), 34 deletions(-)

Index: workspace.vcl59.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl59.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.vcl59.patch	14 Jul 2006 13:02:12 -0000	1.6
+++ workspace.vcl59.patch	14 Jul 2006 14:11:11 -0000	1.7
@@ -87,16 +87,14 @@
  
  #include <vector>
  
-@@ -89,23 +94,16 @@
-     #include <io.h>
+@@ -90,21 +95,15 @@
      #define strncasecmp strnicmp
  #endif
--#if 0
+ 
 -#include "freetype/internal/ftobjs.h"
 -#include "freetype/internal/sfnt.h"
 -#include "freetype/internal/ftstream.h"
--#endif
- 
+-
  #include <svapp.hxx>
  #include <settings.hxx>
  #include <i18npool/lang.h>
@@ -116,7 +114,7 @@
  
  // -----------------------------------------------------------------------
  
-@@ -1819,15 +1817,15 @@
+@@ -1818,15 +1817,15 @@
  
      // Apple New style kern table
      pBuffer = pKern;
@@ -137,7 +135,7 @@
  
              // Get kerning type
              sal_Bool bKernVertical     = nCoverage & 0x8000;
-@@ -1841,14 +1839,14 @@
+@@ -1840,14 +1839,14 @@
              {
                  case 0: // version 0, kerning format 0
                  {
@@ -156,7 +154,7 @@
                          aKernGlyphVector.push_back( aKernPair );
                      }
                  }
-@@ -1857,18 +1855,18 @@
+@@ -1856,18 +1855,18 @@
                  case 2:	// version 0, kerning format 2
                  {
                      const FT_Byte* pSubTable = pBuffer;
@@ -183,7 +181,7 @@
  
                      ULONG nPairs = (ULONG)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1);
                      aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
-@@ -1879,7 +1877,7 @@
+@@ -1878,7 +1877,7 @@
                          aKernPair.mnChar1 = nLeft;
                          for( int nRight = 0; nRight < nLastRight; ++nRight )
                          {
@@ -192,7 +190,7 @@
                              {
                                  aKernPair.mnChar2 = nRight;
                                  aKernGlyphVector.push_back( aKernPair );
-@@ -2075,7 +2073,7 @@
+@@ -2074,7 +2073,7 @@
  // TODO: wait till all compilers accept that calling conventions
  // for functions are the same independent of implementation constness,
  // then uncomment the const-tokens in the function interfaces below
@@ -201,7 +199,7 @@
  {
      PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
  
-@@ -2086,14 +2084,14 @@
+@@ -2085,14 +2084,14 @@
      return 0;
  }
  
@@ -218,7 +216,7 @@
  {
      PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs);
  
-@@ -2110,7 +2108,7 @@
+@@ -2109,7 +2108,7 @@
      return 0;
  }
  



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:43:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:43:45 -0400
Subject: rpms/a2ps/devel a2ps-4.13-hebrew.patch,1.2,1.3 a2ps.spec,1.36,1.37
Message-ID: <200607141443.k6EEhjCO008825@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8780

Modified Files:
	a2ps-4.13-hebrew.patch a2ps.spec 
Log Message:
* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 4.13b-53
- Fixed Hebrew font names (bug #174304).


a2ps-4.13-hebrew.patch:
 configure             |    4 +-
 encoding/Makefile.in  |    4 +-
 encoding/encoding.map |    3 +
 encoding/iso8.edf     |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 3 deletions(-)

Index: a2ps-4.13-hebrew.patch
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps-4.13-hebrew.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- a2ps-4.13-hebrew.patch	19 Nov 2005 03:22:25 -0000	1.2
+++ a2ps-4.13-hebrew.patch	14 Jul 2006 14:43:43 -0000	1.3
@@ -49,14 +49,14 @@
 +# This file has been specifically adapted for use with Hebrew Culmus fonts
 +
 +# If there is an unknown font requested, use Courier
-+Default: MiriamMono-Book
++Default: MiriamMonoCLM-Book
 +
 +# Automatic spell checking :)
-+Substitute: 	Times			David
-+Substitute: 	Helvetica		Nachlieli-Light
-+Substitute: 	Helvetica-Bold		Nachlieli-Bold
-+Substitute:	Courier			MiriamMono-Book
-+Substitute:	Courier-Bold		MiriamMono-Bold
++Substitute: 	Times			DavidCLM
++Substitute: 	Helvetica		NachlieliCLM-Light
++Substitute: 	Helvetica-Bold		NachlieliCLM-Bold
++Substitute:	Courier			MiriamMonoCLM-Book
++Substitute:	Courier-Bold		MiriamMonoCLM-Bold
 +
 +Vector:
 +notdef .notdef .notdef .notdef .notdef .notdef .notdef .notdef


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- a2ps.spec	13 Jul 2006 22:11:24 -0000	1.36
+++ a2ps.spec	14 Jul 2006 14:43:43 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: 4.13b
-Release: 52
+Release: 53
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -232,6 +232,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 4.13b-53
+- Fixed Hebrew font names (bug #174304).
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-52
 - rebuild
 - exclude ppc64 as no emacs there right now.



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:49:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:49:21 -0400
Subject: rpms/gdm/devel gdm-2.15.5-security-tokens.patch, 1.2,
	1.3 gdm-2.15.5-session-keyring.patch, 1.2, 1.3
Message-ID: <200607141449.k6EEnLNN025795@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25663

Modified Files:
	gdm-2.15.5-security-tokens.patch 
	gdm-2.15.5-session-keyring.patch 
Log Message:
redo patches to actually apply


gdm-2.15.5-security-tokens.patch:
 config/Makefile.am              |    4 
 config/gdm                      |   16 
 config/gdm-autologin            |    9 
 config/gdm-securitytokens       |   10 
 config/gdm.conf.in              |    7 
 configure.ac                    |    3 
 daemon/Makefile.am              |    7 
 daemon/gdm.c                    |   99 ++++
 daemon/gdm.h                    |    5 
 daemon/gdmconfig.c              |   35 +
 daemon/gdmconfig.h              |    3 
 daemon/securitytoken.c          |  579 ++++++++++++++++++++++++++++
 daemon/securitytoken.h          |   98 ++++
 daemon/securitytokenmonitor.c   |  817 +++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h   |   81 +++
 daemon/verify-pam.c             |    5 
 utils/gdmsecuritytokenmonitor.c |  197 +++++++++
 utils/securitytoken.c           |  573 +++++++++++++++++++++++++++
 utils/securitytoken.h           |   97 ++++
 utils/securitytokenmonitor.c    |  819 ++++++++++++++++++++++++++++++++++++++++
 utils/securitytokenmonitor.h    |   82 ++++
 21 files changed, 3531 insertions(+), 15 deletions(-)

Index: gdm-2.15.5-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-security-tokens.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.15.5-security-tokens.patch	12 Jul 2006 05:22:20 -0000	1.2
+++ gdm-2.15.5-security-tokens.patch	14 Jul 2006 14:49:19 -0000	1.3
@@ -1,5 +1,21 @@
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/config/gdm-securitytokens	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/config/gdm-autologin.security-tokens	2003-08-04 18:24:21.000000000 +0200
++++ gdm-2.15.6/config/gdm-autologin	2006-07-14 10:44:47.000000000 +0200
+@@ -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
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/config/gdm-securitytokens	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,10 @@
 +#%PAM-1.0
 +auth       required	pam_env.so
@@ -11,8 +27,8 @@
 +session    include      system-auth
 +session    required     pam_loginuid.so
 +session    optional     pam_console.so
---- gdm-2.15.5/config/gdm.security-tokens	2003-08-04 18:24:21.000000000 +0200
-+++ gdm-2.15.5/config/gdm	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/config/gdm.security-tokens	2003-08-04 18:24:21.000000000 +0200
++++ gdm-2.15.6/config/gdm	2006-07-14 10:43:37.000000000 +0200
 @@ -1,8 +1,10 @@
  #%PAM-1.0
 -auth       required	pam_env.so
@@ -31,8 +47,8 @@
 +session    required    pam_loginuid.so
 +session    optional    pam_console.so
 +
---- gdm-2.15.5/config/Makefile.am.security-tokens	2006-05-18 20:39:13.000000000 +0200
-+++ gdm-2.15.5/config/Makefile.am	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/config/Makefile.am.security-tokens	2006-05-18 20:39:13.000000000 +0200
++++ gdm-2.15.6/config/Makefile.am	2006-07-14 10:43:37.000000000 +0200
 @@ -26,6 +26,7 @@
  	Xsession.in \
  	gdm \
@@ -51,8 +67,8 @@
  	   if test $$system = SunOS; then \
  		echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
  	   fi; \
---- gdm-2.15.5/config/gdm.conf.in.security-tokens	2006-07-12 01:01:57.000000000 +0200
-+++ gdm-2.15.5/config/gdm.conf.in	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/config/gdm.conf.in.security-tokens	2006-07-14 10:43:36.000000000 +0200
++++ gdm-2.15.6/config/gdm.conf.in	2006-07-14 10:43:37.000000000 +0200
 @@ -193,6 +193,10 @@
  # kills it.  10 seconds should be long enough for X, but Xgl may need 20 or 25. 
  GdmXserverTimeout=10
@@ -74,8 +90,8 @@
  # XDMCP is the protocol that allows remote login.  If you want to log into GDM
  # remotely (I'd never turn this on on open network, use ssh for such remote
  # usage that).  You can then run X with -query <thishost> to log in, or
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/utils/securitytokenmonitor.c	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/utils/securitytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,819 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -896,8 +912,8 @@
 +    return 0;
 +}
 +#endif
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/utils/securitytoken.h	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/utils/securitytoken.h	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,97 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -996,8 +1012,8 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/utils/securitytoken.c	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/utils/securitytoken.c	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,573 @@
 +/* securitytoken.c - security token
 + * 
@@ -1572,8 +1588,8 @@
 +    return 0;
 +}
 +#endif
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/utils/securitytokenmonitor.h	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/utils/securitytokenmonitor.h	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,82 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1657,8 +1673,8 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/utils/gdmsecuritytokenmonitor.c	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/utils/gdmsecuritytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,197 @@
 +/* GDM Security Token monitor 
 + * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
@@ -1857,8 +1873,8 @@
 +    daemon_free (daemon);
 +    return 0;
 +}
---- gdm-2.15.5/configure.ac.security-tokens	2006-07-12 01:01:57.000000000 +0200
-+++ gdm-2.15.5/configure.ac	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/configure.ac.security-tokens	2006-07-14 10:43:36.000000000 +0200
++++ gdm-2.15.6/configure.ac	2006-07-14 10:43:37.000000000 +0200
 @@ -19,6 +19,7 @@
  LIBXML_REQUIRED=2.4.12
  LIBART_REQUIRED=2.3.11
@@ -1876,8 +1892,8 @@
  AC_SUBST(DAEMON_CFLAGS)
  AC_SUBST(DAEMON_LIBS)
  
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/daemon/securitytokenmonitor.c	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/daemon/securitytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,817 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -2696,8 +2712,8 @@
 +    return 0;
 +}
 +#endif
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/daemon/securitytoken.h	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/daemon/securitytoken.h	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,98 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -2797,8 +2813,8 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
---- gdm-2.15.5/daemon/gdm.h.security-tokens	2006-07-12 01:01:58.000000000 +0200
-+++ gdm-2.15.5/daemon/gdm.h	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/gdm.h.security-tokens	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/gdm.h	2006-07-14 10:43:37.000000000 +0200
 @@ -272,6 +272,10 @@
  /* How long to wait before assuming an Xserver has timed out */
  #define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=10"
@@ -2818,8 +2834,8 @@
  
  #define GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS "security/NeverPlaceCookiesOnNFS=true"
  #define GDM_KEY_PASSWORD_REQUIRED "security/PasswordRequired=false"
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/daemon/securitytoken.c	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/daemon/securitytoken.c	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,579 @@
 +/* securitytoken.c - security token
 + * 
@@ -3400,8 +3416,8 @@
 +    return 0;
 +}
 +#endif
---- gdm-2.15.5/daemon/gdmconfig.c.security-tokens	2006-06-10 00:12:51.000000000 +0200
-+++ gdm-2.15.5/daemon/gdmconfig.c	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/gdmconfig.c.security-tokens	2006-06-10 00:12:51.000000000 +0200
++++ gdm-2.15.6/daemon/gdmconfig.c	2006-07-14 10:43:37.000000000 +0200
 @@ -136,6 +136,8 @@
  static gchar *GdmSoundOnLoginFailureFile = NULL;
  static gchar *GdmConsoleCannotHandle = NULL;
@@ -3479,8 +3495,8 @@
         is_key (key, GDM_KEY_USER_AUTHDIR_FALLBACK)) {
        return FALSE;
     }
---- gdm-2.15.5/daemon/Makefile.am.security-tokens	2006-03-29 01:43:21.000000000 +0200
-+++ gdm-2.15.5/daemon/Makefile.am	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/Makefile.am.security-tokens	2006-03-29 01:43:21.000000000 +0200
++++ gdm-2.15.6/daemon/Makefile.am	2006-07-14 10:43:37.000000000 +0200
 @@ -9,6 +9,7 @@
  	-DAUTHDIR=\"$(authdir)\"			\
  	-DBINDIR=\"$(bindir)\"				\
@@ -3502,8 +3518,8 @@
  
  EXTRA_gdm_binary_SOURCES = verify-pam.c verify-crypt.c verify-shadow.c
  
---- gdm-2.15.5/daemon/gdm.c.security-tokens	2006-07-12 01:01:58.000000000 +0200
-+++ gdm-2.15.5/daemon/gdm.c	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/gdm.c.security-tokens	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/gdm.c	2006-07-14 10:43:37.000000000 +0200
 @@ -62,6 +62,8 @@
  #include "cookie.h"
  #include "filecheck.h"
@@ -3562,7 +3578,7 @@
      /* We always exit via exit (), and sadly we need to g_main_quit ()
       * at times not knowing if it's this main or a recursive one we're
       * quitting.
-@@ -3428,4 +3442,87 @@
+@@ -3429,4 +3443,87 @@
  	}
  }
  
@@ -3650,8 +3666,8 @@
 +    }
 +}
  /* EOF */
---- gdm-2.15.5/daemon/verify-pam.c.security-tokens	2006-07-12 01:01:58.000000000 +0200
-+++ gdm-2.15.5/daemon/verify-pam.c	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/verify-pam.c.security-tokens	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/verify-pam.c	2006-07-14 10:43:37.000000000 +0200
 @@ -55,6 +55,8 @@
  #define log_to_audit_system(l,h,d,s)	do { ; } while (0)
  #endif
@@ -3678,8 +3694,8 @@
      if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
  	    if (started_timer)
  		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
---- gdm-2.15.5/daemon/gdmconfig.h.security-tokens	2006-05-20 00:07:17.000000000 +0200
-+++ gdm-2.15.5/daemon/gdmconfig.h	2006-07-12 01:01:58.000000000 +0200
+--- gdm-2.15.6/daemon/gdmconfig.h.security-tokens	2006-05-20 00:07:17.000000000 +0200
++++ gdm-2.15.6/daemon/gdmconfig.h	2006-07-14 10:43:37.000000000 +0200
 @@ -41,6 +41,9 @@
                                           gboolean value);
  void           gdm_set_value_int        (gchar *key,
@@ -3690,8 +3706,8 @@
  void           gdm_config_key_to_string_per_display
                                          (gchar *file,
                                           gchar *key,
---- /dev/null	2006-07-12 00:29:29.434343750 +0200
-+++ gdm-2.15.5/daemon/securitytokenmonitor.h	2006-07-12 01:01:58.000000000 +0200
+--- /dev/null	2006-07-14 09:12:51.334129331 +0200
++++ gdm-2.15.6/daemon/securitytokenmonitor.h	2006-07-14 10:43:37.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events

gdm-2.15.5-session-keyring.patch:
 gdm                |    1 +
 gdm-autologin      |    1 +
 gdm-securitytokens |    1 +
 3 files changed, 3 insertions(+)

Index: gdm-2.15.5-session-keyring.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-session-keyring.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.15.5-session-keyring.patch	14 Jul 2006 04:35:07 -0000	1.2
+++ gdm-2.15.5-session-keyring.patch	14 Jul 2006 14:49:19 -0000	1.3
@@ -1,22 +1,30 @@
---- gdm-2.15.5/config/gdm-autologin.session-keyring	2006-07-12 10:18:57.000000000 +0200
-+++ gdm-2.15.5/config/gdm-autologin	2006-07-12 10:19:04.000000000 +0200
-@@ -6,3 +6,4 @@
- password   required	pam_stack.so service=system-auth
+--- gdm-2.15.6/config/gdm-autologin.session-keyring	2006-07-14 10:46:37.000000000 +0200
++++ gdm-2.15.6/config/gdm-autologin	2006-07-14 10:46:37.000000000 +0200
+@@ -4,6 +4,7 @@
+ account    required     pam_nologin.so
+ account    include      system-auth
+ password   include      system-auth
 +session    optional     pam_keyinit.so force revoke
- session    required	pam_stack.so service=system-auth
+ session    include      system-auth
+ session    required     pam_loginuid.so
  session    optional     pam_console.so
---- gdm-2.15.5/config/gdm-securitytokens.session-keyring	2006-07-12 10:19:10.000000000 +0200
-+++ gdm-2.15.5/config/gdm-securitytokens	2006-07-12 10:19:15.000000000 +0200
-@@ -8,3 +8,4 @@
+--- gdm-2.15.6/config/gdm-securitytokens.session-keyring	2006-07-14 10:46:37.000000000 +0200
++++ gdm-2.15.6/config/gdm-securitytokens	2006-07-14 10:48:13.000000000 +0200
+@@ -5,6 +5,7 @@
+ account    required     pam_nologin.so
+ account    include      system-auth
+ password   include      system-auth
 +session    optional     pam_keyinit.so force revoke
  session    include      system-auth
  session    required     pam_loginuid.so
  session    optional     pam_console.so
---- gdm-2.15.5/config/gdm.session-keyring	2006-07-12 10:18:35.000000000 +0200
-+++ gdm-2.15.5/config/gdm	2006-07-12 10:18:50.000000000 +0200
-@@ -7,4 +7,5 @@
-+session    optional    pam_keyinit.so force revoke
+--- gdm-2.15.6/config/gdm.session-keyring	2006-07-14 10:46:37.000000000 +0200
++++ gdm-2.15.6/config/gdm	2006-07-14 10:48:07.000000000 +0200
+@@ -4,6 +4,7 @@
+ account    required    pam_nologin.so
+ account    include     system-auth
+ password   include     system-auth
++session    optional     pam_keyinit.so force revoke
  session    include     system-auth
  session    required    pam_loginuid.so
  session    optional    pam_console.so
- 



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:50:51 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.168,1.169
Message-ID: <200607141450.k6EEopKu026461@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Reenable SMC NIC driver.


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- config-generic	26 Jun 2006 14:36:00 -0000	1.168
+++ config-generic	14 Jul 2006 14:50:49 -0000	1.169
@@ -2636,7 +2636,7 @@
 CONFIG_EL3=m
 # CONFIG_3C515 is not set
 # CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NET_VENDOR_SMC=m
 # CONFIG_WD80x3 is not set
 # CONFIG_ULTRA is not set
 # CONFIG_SMC9194 is not set



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:50:51 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2157,1.2158
Message-ID: <200607141450.k6EEop8C026453@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Reenable SMC NIC driver.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2157
retrieving revision 1.2158
diff -u -r1.2157 -r1.2158
--- kernel-2.6.spec	12 Jul 2006 02:34:00 -0000	1.2157
+++ kernel-2.6.spec	14 Jul 2006 14:50:49 -0000	1.2158
@@ -1548,6 +1548,9 @@
 %endif
 
 %changelog
+* Fri Jul 14 2006 Dave Jones <davej at redhat.com>
+- Reenable SMC NIC driver.
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.4
 - Disable split pagetable lock



From fedora-cvs-commits at redhat.com  Fri Jul 14 14:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 10:58:07 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.169,1.170
Message-ID: <200607141458.k6EEw7c0006857@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
fix properly


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- config-generic	14 Jul 2006 14:50:49 -0000	1.169
+++ config-generic	14 Jul 2006 14:58:05 -0000	1.170
@@ -2636,9 +2636,9 @@
 CONFIG_EL3=m
 # CONFIG_3C515 is not set
 # CONFIG_LANCE is not set
-CONFIG_NET_VENDOR_SMC=m
+CONFIG_NET_VENDOR_SMC=y
 # CONFIG_WD80x3 is not set
-# CONFIG_ULTRA is not set
+CONFIG_ULTRA=m
 # CONFIG_SMC9194 is not set
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NI52 is not set



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:00:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:00:01 -0400
Subject: rpms/passwd/devel .cvsignore, 1.14, 1.15 passwd.spec, 1.25,
	1.26 sources, 1.16, 1.17
Message-ID: <200607141500.k6EF01BZ006918@cvs.devel.redhat.com>

Author: tmraz

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

Modified Files:
	.cvsignore passwd.spec sources 
Log Message:
* Fri Jul 14 2006 Tomas Mraz <tmraz at redhat.com> 0.72-1
- merged audit patch to upstream cvs
- improved passwd -S output (#170344)
- make passwd -d work with stripped down proc (#196851)
- corrected link to pam docs (#193084)
- spec file cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	7 Oct 2005 13:16:41 -0000	1.14
+++ .cvsignore	14 Jul 2006 14:59:59 -0000	1.15
@@ -1 +1 @@
-passwd-0.71.tar.bz2
+passwd-0.72.tar.bz2


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- passwd.spec	12 Jul 2006 07:39:11 -0000	1.25
+++ passwd.spec	14 Jul 2006 14:59:59 -0000	1.26
@@ -4,25 +4,24 @@
 %if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
 %define WITH_AUDIT 1
 %endif
-Summary: The passwd utility for setting/changing passwords using PAM.
+Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
-Version: 0.71
-Release: 3.2.1
+Version: 0.72
+Release: 1
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
-Patch1: passwd-0.71-audit.patch
 Buildroot: %{_tmppath}/passwd-root
 Requires: pam >= 0.78, /etc/pam.d/system-auth, 
 %if %{WITH_SELINUX}
-BuildPrereq: glib2-devel, libuser-devel, pam-devel, libselinux-devel
-BuildPrereq: libuser >= 0.53-1
+BuildRequires: glib2-devel, libuser-devel, pam-devel, libselinux-devel
+BuildRequires: libuser >= 0.53-1
 %else
-BuildPrereq: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
+BuildRequires: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
 %endif
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 1.1.2
-Requires: audit-libs >= 1.1.2
+BuildRequires: audit-libs-devel >= 1.0.14
+Requires: audit-libs >= 1.0.14
 %endif
 
 %description
@@ -34,7 +33,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
 
 %build
 %configure
@@ -54,11 +52,18 @@
 
 %files
 %defattr(-,root,root)
-%config /etc/pam.d/passwd
-%attr(4511,root,root) %{_bindir}/passwd
+%config(noreplace) /etc/pam.d/passwd
+%attr(4755,root,root) %{_bindir}/passwd
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Fri Jul 14 2006 Tomas Mraz <tmraz at redhat.com> 0.72-1
+- merged audit patch to upstream cvs
+- improved passwd -S output (#170344)
+- make passwd -d work with stripped down proc (#196851)
+- corrected link to pam docs (#193084)
+- spec file cleanups
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Oct 2005 13:16:41 -0000	1.16
+++ sources	14 Jul 2006 14:59:59 -0000	1.17
@@ -1 +1 @@
-02ec90cdf843d558de677fe2be22de3d  passwd-0.71.tar.bz2
+26438e7f37b2a60fb012d6e8fb345848  passwd-0.72.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:02:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:02:56 -0400
Subject: rpms/passwd/devel passwd-0.71-audit.patch,1.2,NONE
Message-ID: <200607141502.k6EF2uLi007109@cvs.devel.redhat.com>

Author: tmraz

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

Removed Files:
	passwd-0.71-audit.patch 
Log Message:
- already merged



--- passwd-0.71-audit.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:03:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:03:52 -0400
Subject: rpms/kernel/devel/configs config-generic,1.226,1.227
Message-ID: <200607141503.k6EF3qGL007182@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
git8


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- config-generic	14 Jul 2006 00:14:58 -0000	1.226
+++ config-generic	14 Jul 2006 15:03:48 -0000	1.227
@@ -2719,9 +2719,9 @@
 CONFIG_EL3=m
 # CONFIG_3C515 is not set
 # CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NET_VENDOR_SMC=y
 # CONFIG_WD80x3 is not set
-# CONFIG_ULTRA is not set
+CONFIG_ULTRA=m
 # CONFIG_SMC9194 is not set
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NI52 is not set



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:03:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:03:52 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.484, 1.485 kernel-2.6.spec, 1.2396,
	1.2397 sources, 1.428, 1.429 upstream, 1.395,
	1.396 linux-2.6-slab-corruptor-fix.patch, 1.1,
	NONE patch-2.6.18-rc1-git6.bz2.sign, 1.1, NONE
Message-ID: <200607141503.k6EF3qiq007183@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc1-git8.bz2.sign 
Removed Files:
	linux-2.6-slab-corruptor-fix.patch 
	patch-2.6.18-rc1-git6.bz2.sign 
Log Message:
git8


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

iD8DBQBEt0GpyGugalF9Dw4RApNeAJkB3OmA22U5WvDUpmgZ2HlQ881FxACfcReg
Aa6/VFJBiri3hmA/+WTvD9M=
=0mK8
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- .cvsignore	13 Jul 2006 21:28:38 -0000	1.484
+++ .cvsignore	14 Jul 2006 15:03:46 -0000	1.485
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git7.bz2
+patch-2.6.18-rc1-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2396
retrieving revision 1.2397
diff -u -r1.2396 -r1.2397
--- kernel-2.6.spec	13 Jul 2006 23:04:06 -0000	1.2396
+++ kernel-2.6.spec	14 Jul 2006 15:03:47 -0000	1.2397
@@ -256,7 +256,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git7.bz2
+Patch2: patch-2.6.18-rc1-git8.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -380,7 +380,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
-Patch1650: linux-2.6-slab-corruptor-fix.patch
 Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
@@ -933,8 +932,6 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
-# slab corruption on smp issue
-%patch1650 -p1
 #
 %patch1660 -p1
 # Use persistent allocation in softcursor
@@ -1681,6 +1678,9 @@
 %endif
 
 %changelog
+* Fri Jul 14 2006 Dave Jones <davej at redhat.com>
+- 2.6.18-rc1-git8
+
 * Thu Jul 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git7
 - More lockdep fixes.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- sources	13 Jul 2006 21:28:38 -0000	1.428
+++ sources	14 Jul 2006 15:03:47 -0000	1.429
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-18ccb8d081939bdcf04fd7c4a4300729  patch-2.6.18-rc1-git7.bz2
+83f65e323b4797d758fd232eadc127d5  patch-2.6.18-rc1-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- upstream	13 Jul 2006 21:28:38 -0000	1.395
+++ upstream	14 Jul 2006 15:03:47 -0000	1.396
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git7.bz2
+patch-2.6.18-rc1-git8.bz2


--- linux-2.6-slab-corruptor-fix.patch DELETED ---


--- patch-2.6.18-rc1-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:47:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:47:16 -0400
Subject: rpms/xorg-x11-font-utils/devel
	fonttosfnt-1.0.1-freetype22-build-fix.patch, NONE,
	1.1 xorg-x11-font-utils.spec, 1.21, 1.22
Message-ID: <200607141547.k6EFlG6n018037@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18010

Modified Files:
	xorg-x11-font-utils.spec 
Added Files:
	fonttosfnt-1.0.1-freetype22-build-fix.patch 
Log Message:
* Fri Jul 14 2006 Adam Jackson <ajackson at redhat.com> 1:7.1-2
- Added fonttosfnt-1.0.1-freetype22-build-fix.patch to fix a build failure
  with new freetype 2.2.


fonttosfnt-1.0.1-freetype22-build-fix.patch:
 util.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE fonttosfnt-1.0.1-freetype22-build-fix.patch ---
--- xorg-x11-font-utils-7.1/fonttosfnt-1.0.1/util.c.freetype22	2005-11-08 01:33:31.000000000 -0500
+++ xorg-x11-font-utils-7.1/fonttosfnt-1.0.1/util.c	2006-07-14 11:43:42.000000000 -0400
@@ -35,7 +35,6 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
 #include FT_BDF_H
 #include "X11/Xos.h"
 #include "fonttosfnt.h"


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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-font-utils.spec	12 Jul 2006 09:18:05 -0000	1.21
+++ xorg-x11-font-utils.spec	14 Jul 2006 15:47:14 -0000	1.22
@@ -16,7 +16,7 @@
 # NOTE: Keep version set to the X11Rx.y release the package is based upon.
 Version: 7.1
 # Bump release for updates.
-Release: 1.1
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -30,6 +30,7 @@
 
 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
 Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
+Patch2: fonttosfnt-1.0.1-freetype22-build-fix.patch
 
 BuildRequires: pkgconfig
 # xorg-x11-libXfont-devel needed for bdftopcf
@@ -79,6 +80,7 @@
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 %patch0 -p0 -b .font-util-mapdir-use-datadir-fix
 %patch1 -p0 -b .autoconf-add-with-fontdir-option
+%patch2 -p1 -b .freetype22
 
 %build
 # Build all apps
@@ -154,7 +156,11 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Adam Jackson <ajackson at redhat.com> 1:7.1-2
+- Added fonttosfnt-1.0.1-freetype22-build-fix.patch to fix a build failure
+  with new freetype 2.2.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:7.1-1.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:7.1-1



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:52:43 -0400
Subject: rpms/perl/devel perl.spec,1.94,1.95
Message-ID: <200607141552.k6EFqhpu020166@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
fix upstream perl bug 34297 - "utf8 overload stringify bug"


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- perl.spec	12 Jul 2006 07:42:43 -0000	1.94
+++ perl.spec	14 Jul 2006 15:52:41 -0000	1.95
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    6
+%define perlrel    8
 %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
 
@@ -173,6 +173,8 @@
 #               ^- stop IPC/SysV.c including <asm/page.h> for getpagesize(), which
 #               is now declared by including <unistd.h> .
 #
+Patch38:        perl-5.8.8-U34297_C28006.patch
+#
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel
@@ -377,7 +379,9 @@
 %patch36    -p1
 
 %patch37    -p1
+%patch38    -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()
@@ -579,11 +583,16 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 13 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
+- Fix upstream perl bug #34297:
+  'utf8 overload stringify bug (utf8 caching maybe)'
+  upstream patch #28006 applied
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:5.8.8-6.1
 - rebuild
 
 * Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
-- Fix upstream perl bug 38454:
+- Fix upstream perl bug #38454:
   'rindex corrects for $[ on bytes rather than UTF-8'
   apply upstream patch #27116
 - Fix upstream perl bug 24816:
@@ -599,7 +608,7 @@
 - apply upstream patch #27605 - 'Fix off-by-one in $0 set magic.'
 - Fix upstream perl bug 23141 - '($_) = () fails to set $_ to undef'
   apply upstream patch #27914
-- Fix upstream perl bug 38619 - 
+- Fix upstream perl bug #38619 - 
   'Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)'
   apply upstream patch #27329
 - Give users the '-R' option to disable the Red Hat



From fedora-cvs-commits at redhat.com  Fri Jul 14 15:57:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 11:57:47 -0400
Subject: rpms/jakarta-commons-beanutils/devel .cvsignore, 1.5,
	1.6 jakarta-commons-beanutils.spec, 1.31, 1.32
Message-ID: <200607141557.k6EFvlJW022138@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22099/devel

Modified Files:
	.cvsignore jakarta-commons-beanutils.spec 
Log Message:
auto-import jakarta-commons-beanutils-1.7.0-4jpp on branch devel from jakarta-commons-beanutils-1.7.0-4jpp.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 May 2005 12:51:06 -0000	1.5
+++ .cvsignore	14 Jul 2006 15:57:45 -0000	1.6
@@ -1,4 +1 @@
 commons-beanutils-1.7.0-src.tar.gz
-commons-beanutils-1.7.0-src
-i386
-*.src.rpm


Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-beanutils.spec	12 Jul 2006 06:27:28 -0000	1.31
+++ jakarta-commons-beanutils.spec	14 Jul 2006 15:57:45 -0000	1.32
@@ -1,33 +1,69 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name	beanutils
-%define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.7.0
-%define release 	2jpp_7fc
+%define short_name	commons-beanutils
+
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		jakarta-commons-beanutils
+Version:	1.7.0
+Release:	4jpp
 Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
 Group:		Development/Libraries/Java
+Vendor:         JPackage Project
+Distribution:   JPackage
 Source0:	http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz
 Url:		http://jakarta.apache.org/commons/%{base_name}/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 0:2.0
 BuildRequires:	jakarta-commons-logging >= 0:1.0
 BuildRequires:	jpackage-utils > 0:1.5
-BuildRequires:  coreutils
 Requires:	jakarta-commons-collections >= 0:2.0
 Requires:	jakarta-commons-logging >= 0:1.0
+%if ! %{gcj_support}
+BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	%{short_name} <= 1.6.1
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Provides:	%{short_name}
+Obsoletes:	%{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The scope of this package is to create a package of Java utility methods
@@ -38,14 +74,13 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{short_name}-%{version}-src
+%setup -n %{short_name}-%{version}-src
 #cp LICENSE.txt LICENSE
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -66,27 +101,13 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
-%triggerpostun -- commons-beanutils < 1.7
-pushd %{_javadir} &> /dev/null
-    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
-    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-popd &> /dev/null
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -96,84 +117,54 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt LICENSE.txt
 %{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-1.7.0.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-bean-collections-1.7.0.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-core-1.7.0.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.7.0-2jpp_7fc
-- rebuild
+* Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp
+- Add AOT bits
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7.0-2jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 
-- 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
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.7.0-2jpp_3fc
-- rebuilt
-
-* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_1fc
-- Upgrade to 1.7.0-2jpp.
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
-
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
-
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_2fc
-- BC-compile.
+* Thu May 11 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-3jpp
+- Add header
+- Remove unecessary macro definitions
 
 * Sat Jan 29 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2jpp
 - Use the "dist" target to get a full build, including bean-collections
 
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_1fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp_1rh
-- Import from upstream
-
 * Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
 - Upgrade to 1.7.0
 
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 0:1.6.1-4jpp_6rh
-- add coreutils BuildRequires
-
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-5jpp
 - Rebuild with ant-1.6.2
 
-* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.6.1-4jpp_5rh
-- Added trigger to restore symlinks that are removed if ugrading
-  from a commons-beanutils rhug package
-
-* Fri Apr  2 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.6.1-4jpp_4rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.6.1-4jpp_3rh
-- add RHUG upgrade cleanup
-
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.6.1-4jpp_2rh
-- RH vacuuming part II
-
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.6.1-4jpp_1rh
-- RH vacuuming
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.6.1-4jpp
 - update for JPackage 1.5
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:04:56 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.32, 1.33
Message-ID: <200607141604.k6EG4uCq023489@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23463

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Merge with upstream




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-commons-beanutils.spec	14 Jul 2006 15:57:45 -0000	1.32
+++ jakarta-commons-beanutils.spec	14 Jul 2006 16:04:53 -0000	1.33
@@ -42,14 +42,13 @@
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
 Group:		Development/Libraries/Java
-Vendor:         JPackage Project
-Distribution:   JPackage
 Source0:	http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz
 Url:		http://jakarta.apache.org/commons/%{base_name}/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 0:2.0
 BuildRequires:	jakarta-commons-logging >= 0:1.0
 BuildRequires:	jpackage-utils > 0:1.5
+BuildRequires:  coreutils
 Requires:	jakarta-commons-collections >= 0:2.0
 Requires:	jakarta-commons-logging >= 0:1.0
 %if ! %{gcj_support}
@@ -74,6 +73,7 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
+Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -149,6 +149,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp_1rh
+- Merge with upstream
+
 * Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp
 - Add AOT bits
 
@@ -156,9 +159,42 @@
 - Add header
 - Remove unecessary macro definitions
 
+* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7.0-2jpp_6fc
+- stop scriptlet spew
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 
+- 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
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.7.0-2jpp_3fc
+- rebuilt
+
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-2jpp_1fc
+- Upgrade to 1.7.0-2jpp.
+- Rearrange how BC-compiled stuff is built and installed.
+
+* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_4fc
+- Add alpha to the list of build architectures (#157522).
+- Use absolute paths for rebuild-gcj-db.
+
+* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_3fc
+- Add dependencies for %post and %postun scriptlets (#156901).
+
+* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_2fc
+- BC-compile.
+
 * Sat Jan 29 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.7.0-2jpp
 - Use the "dist" target to get a full build, including bean-collections
 
+* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.7.0-1jpp_1fc
+- Build into Fedora.
+
 * Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
 - Upgrade to 1.7.0
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:05:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:05:23 -0400
Subject: rpms/beagle/devel beagle-0.2.7-socket-path.patch, NONE,
	1.1 beagle.spec, 1.59, 1.60
Message-ID: <200607141605.k6EG5NhI023593@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23555

Modified Files:
	beagle.spec 
Added Files:
	beagle-0.2.7-socket-path.patch 
Log Message:
Fix beagle_util_daemon_is_running with NFS homedirs


beagle-0.2.7-socket-path.patch:
 beagle-client.c |   50 +++--------------------------------------
 beagle-util.c   |   67 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 beagle-util.h   |    2 +
 3 files changed, 65 insertions(+), 54 deletions(-)

--- NEW FILE beagle-0.2.7-socket-path.patch ---
--- beagle-0.2.7/libbeagle/beagle/beagle-client.c.socket-path	2006-07-14 12:00:57.000000000 -0400
+++ beagle-0.2.7/libbeagle/beagle/beagle-client.c	2006-07-14 12:01:29.000000000 -0400
@@ -86,54 +86,12 @@
 {
 	BeagleClient *client;
 	BeagleClientPrivate *priv;
-	const gchar *beagle_home;
-	gchar *socket_dir;
 	gchar *socket_path;
-	struct stat buf;
-	
-	if (!client_name) 
-		client_name = "socket";
-
-	beagle_home = g_getenv ("BEAGLE_HOME");
-	if (beagle_home == NULL)
-		beagle_home = g_get_home_dir ();
-
-	if (! beagle_util_is_path_on_block_device (beagle_home) ||
-	    getenv ("BEAGLE_SYNCHRONIZE_LOCALLY") != NULL) {
-		gchar *remote_storage_dir = g_build_filename (beagle_home, ".beagle", "remote_storage_dir", NULL);
-		gchar *tmp;
-
-		if (! g_file_test (remote_storage_dir, G_FILE_TEST_EXISTS)) {
-			g_free (remote_storage_dir);
-			return NULL;
-		}
-
-		if (! g_file_get_contents (remote_storage_dir, &socket_dir, NULL, NULL)) {
-			g_free (remote_storage_dir);
-			return NULL;
-		}
-
-		g_free (remote_storage_dir);
-
-		/* There's a newline at the end that we want to strip off */
-		tmp = strrchr (socket_dir, '\n');
-		if (tmp != NULL)
-			*tmp = '\0';
-
-		if (! g_file_test (socket_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-			g_free (socket_dir);
-			return NULL;
-		}
-	} else {
-		socket_dir = g_build_filename (beagle_home, ".beagle", NULL);
-	}
-
-	socket_path = g_build_filename (socket_dir, client_name, NULL);
-	g_free (socket_dir);
-	if (stat (socket_path, &buf) == -1 || !S_ISSOCK (buf.st_mode)) {
-		g_free (socket_path);
+
+	socket_path = beagle_util_get_socket_path (client_name);
+
+	if (socket_path == NULL)
 		return NULL;
-	}
 
 	client = g_object_new (BEAGLE_TYPE_CLIENT, 0);
 	priv = BEAGLE_CLIENT_GET_PRIVATE (client);
--- beagle-0.2.7/libbeagle/beagle/beagle-util.h.socket-path	2006-07-14 12:01:06.000000000 -0400
+++ beagle-0.2.7/libbeagle/beagle/beagle-util.h	2006-07-14 12:01:29.000000000 -0400
@@ -40,6 +40,8 @@
 
 gboolean beagle_util_is_path_on_block_device (const char *path);
 
+gchar *beagle_util_get_socket_path (const char *client_name);
+
 gboolean beagle_util_daemon_is_running (void);
 
 #endif /* __BEAGLE_UTIL_H */
--- beagle-0.2.7/libbeagle/beagle/beagle-util.c.socket-path	2006-07-14 12:01:15.000000000 -0400
+++ beagle-0.2.7/libbeagle/beagle/beagle-util.c	2006-07-14 12:01:29.000000000 -0400
@@ -57,28 +57,79 @@
 	return (st.st_dev >> 8 != 0);
 }
 
-gboolean
-beagle_util_daemon_is_running (void)
+char *
+beagle_util_get_socket_path (const char *client_name)
 {
 	const gchar *beagle_home;
 	gchar *socket_dir;
 	gchar *socket_path;
-	int sockfd;
-	struct sockaddr_un sun;
+	struct stat buf;
+	
+	if (!client_name) 
+		client_name = "socket";
 
 	beagle_home = g_getenv ("BEAGLE_HOME");
 	if (beagle_home == NULL)
 		beagle_home = g_get_home_dir ();
-	
-	socket_dir = g_build_filename (beagle_home, ".beagle", NULL);
-	socket_path = g_build_filename (socket_dir, "socket", NULL);
+
+	if (! beagle_util_is_path_on_block_device (beagle_home) ||
+	    getenv ("BEAGLE_SYNCHRONIZE_LOCALLY") != NULL) {
+		gchar *remote_storage_dir = g_build_filename (beagle_home, ".beagle", "remote_storage_dir", NULL);
+		gchar *tmp;
+
+		if (! g_file_test (remote_storage_dir, G_FILE_TEST_EXISTS)) {
+			g_free (remote_storage_dir);
+			return NULL;
+		}
+
+		if (! g_file_get_contents (remote_storage_dir, &socket_dir, NULL, NULL)) {
+			g_free (remote_storage_dir);
+			return NULL;
+		}
+
+		g_free (remote_storage_dir);
+
+		/* There's a newline at the end that we want to strip off */
+		tmp = strrchr (socket_dir, '\n');
+		if (tmp != NULL)
+			*tmp = '\0';
+
+		if (! g_file_test (socket_dir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+			g_free (socket_dir);
+			return NULL;
+		}
+	} else {
+		socket_dir = g_build_filename (beagle_home, ".beagle", NULL);
+	}
+
+	socket_path = g_build_filename (socket_dir, client_name, NULL);
+	g_free (socket_dir);
+	if (stat (socket_path, &buf) == -1 || !S_ISSOCK (buf.st_mode)) {
+		g_free (socket_path);
+		return NULL;
+	}
+
+	return socket_path;
+
+}
+
+gboolean
+beagle_util_daemon_is_running (void)
+{
+	gchar *socket_path;
+	int sockfd;
+	struct sockaddr_un sun;
+
+	socket_path = beagle_util_get_socket_path (NULL);
+
+	if (socket_path == NULL)
+		return FALSE;
 
 	bzero (&sun, sizeof (sun));
 	sun.sun_family = AF_UNIX;
 	snprintf (sun.sun_path, sizeof (sun.sun_path), socket_path);
 
 	g_free (socket_path);
-	g_free (socket_dir);
 
 	sockfd = socket (AF_UNIX, SOCK_STREAM, 0);
 	if (sockfd < 0) {


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- beagle.spec	12 Jul 2006 05:26:24 -0000	1.59
+++ beagle.spec	14 Jul 2006 16:05:20 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:        2.1
+Release:       	3 
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -33,6 +33,8 @@
 Patch3: beagle-0.2.1-spew.patch
 Patch4: beagle-0.2.7-beagle-index-username.patch
 Patch5: beagle-0.2.7-runuser.patch
+# fixed in upstream cvs
+Patch6:		beagle-0.2.7-socket-path.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -72,6 +74,7 @@
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .beagleidx
 %patch5 -p1 -b .runuser
+%patch6 -p1 -b .socket-path
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -213,7 +216,10 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.7-3
+- Make beagle_util_daemon_is_running work with NFS homedirs
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-2.1
 - rebuild
 
 * Thu Jun 22 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-2



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:05:55 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.33, 1.34
Message-ID: <200607141605.k6EG5tf2023696@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23640

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Fix release




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-beanutils.spec	14 Jul 2006 16:04:53 -0000	1.33
+++ jakarta-commons-beanutils.spec	14 Jul 2006 16:05:46 -0000	1.34
@@ -37,7 +37,7 @@
 
 Name:		jakarta-commons-beanutils
 Version:	1.7.0
-Release:	4jpp
+Release:	4jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:08:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:08:32 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.34, 1.35
Message-ID: <200607141608.k6EG8WI2024264@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24206

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Specify gcj support




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jakarta-commons-beanutils.spec	14 Jul 2006 16:05:46 -0000	1.34
+++ jakarta-commons-beanutils.spec	14 Jul 2006 16:08:30 -0000	1.35
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define base_name	beanutils



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:23:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:23:32 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.35, 1.36
Message-ID: <200607141623.k6EGNW9I012364@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12293

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Fix changelog release




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-commons-beanutils.spec	14 Jul 2006 16:08:30 -0000	1.35
+++ jakarta-commons-beanutils.spec	14 Jul 2006 16:23:30 -0000	1.36
@@ -151,7 +151,7 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp_1rh
+* Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp_1fc
 - Merge with upstream
 
 * Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:24:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:24:38 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.2-amdfam10.patch, NONE,
	1.1 binutils-2.17.50.0.2-power6-insns.patch, NONE,
	1.1 binutils-2.17.50.0.2-power6.patch, NONE,
	1.1 binutils-2.17.50.0.2-x86-march.patch, NONE,
	1.1 binutils-2.17.50.0.2-x86-nops.patch, NONE,
	1.1 binutils-2.17.50.0.2-x86-nops2.patch, NONE,
	1.1 binutils-2.17.50.0.2-hash-style.patch, 1.1,
	1.2 binutils.spec, 1.92, 1.93
Message-ID: <200607141624.k6EGOcb2012815@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils-2.17.50.0.2-hash-style.patch binutils.spec 
Added Files:
	binutils-2.17.50.0.2-amdfam10.patch 
	binutils-2.17.50.0.2-power6-insns.patch 
	binutils-2.17.50.0.2-power6.patch 
	binutils-2.17.50.0.2-x86-march.patch 
	binutils-2.17.50.0.2-x86-nops.patch 
	binutils-2.17.50.0.2-x86-nops2.patch 
Log Message:
2.17.50.0.2-8

binutils-2.17.50.0.2-amdfam10.patch:
 gas/config/tc-i386.c                     |   77 +
 gas/config/tc-i386.h                     |   16 
 gas/testsuite/gas/i386/amdfam10.d        |   22 
 gas/testsuite/gas/i386/amdfam10.s        |   18 
 gas/testsuite/gas/i386/i386.exp          |    2 
 gas/testsuite/gas/i386/x86-64-amdfam10.d |   26 
 gas/testsuite/gas/i386/x86-64-amdfam10.s |   22 
 include/opcode/i386.h                    |   14 
 opcodes/i386-dis.c                       | 2061 ++++++++++++++++---------------
 9 files changed, 1250 insertions(+), 1008 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-amdfam10.patch ---
2006-07-13 Dwarakanath Rajagopal	<dwarak.rajagopal at amd.com>
	   Michael Meissner		<michael.meissner at amd.com>
gas/
	* config/tc-i386.h (PROCESSOR_AMDFAM10): New processor_type.
	(CpuSSE4a, CpuABM, CpuAmdFam10): New Cpu directives.
	* config/tc-i386.c (cpu_arch): Add support for AmdFam10
	architecture.
	(i386_align_code): Ditto.
	(md_assemble_code): Add support for insertq/extrq instructions,
	swapping as needed for intel syntax.
	(swap_imm_operands): New function to swap immediate operands.
	(swap_operands): Deal with 4 operand instructions.
	(build_modrm_byte): Add support for insertq instruction.
include/opcode/
	* i386.h: Add amdfam10 new instructions (SSE4a and ABM instructions).
opcodes/
	* i386-dis.c (dis386): Add support for 4 operand instructions. Add
	support for amdfam10 SSE4a/ABM instructions. Modify all
	initializer macros to have additional arguments. Disallow REP
	prefix for non-string instructions.
	(print_insn): Ditto.
gas/testsuite/
	* gas/i386/amdfam10.s: New file for amdfam10 instructions.
	* gam/i386/amdfam10.d: Ditto.
	* gas/i386/x86-64-amdfam10.s: Ditto.
	* gam/i386/x86-64-amdfam10.d: Ditto.

--- gas/config/tc-i386.c	23 Jun 2006 21:47:36 -0000	1.218
+++ gas/config/tc-i386.c	13 Jul 2006 22:25:44 -0000	1.219
@@ -89,6 +89,7 @@ static const reg_entry *parse_register P
 static char *parse_insn PARAMS ((char *, char *));
 static char *parse_operands PARAMS ((char *, const char *));
 static void swap_operands PARAMS ((void));
+static void swap_imm_operands PARAMS ((void));
 static void optimize_imm PARAMS ((void));
 static void optimize_disp PARAMS ((void));
 static int match_template PARAMS ((void));
@@ -491,6 +492,9 @@ static const arch_entry cpu_arch[] =
   {"k8", PROCESSOR_K8,
    Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
    |CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2},
+  {"amdfam10", PROCESSOR_AMDFAM10,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
+   |CpuSledgehammer|CpuAmdFam10|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM},
   {".mmx", PROCESSOR_UNKNOWN,
    CpuMMX},
   {".sse", PROCESSOR_UNKNOWN,
@@ -508,7 +512,11 @@ static const arch_entry cpu_arch[] =
   {".pacifica", PROCESSOR_UNKNOWN,
    CpuSVME},
   {".svme", PROCESSOR_UNKNOWN,
-   CpuSVME}
+   CpuSVME},
+  {".sse4a", PROCESSOR_UNKNOWN,
+   CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a},
+  {".abm", PROCESSOR_UNKNOWN,
+   CpuABM}
 };
 
 const pseudo_typeS md_pseudo_table[] =
@@ -741,7 +749,7 @@ i386_align_code (fragP, count)
   
      1. For PROCESSOR_I486, PROCESSOR_PENTIUM and PROCESSOR_GENERIC32,
      f32_patt will be used.
-     2. For PROCESSOR_K8 in 64bit, NOPs with 0x66 prefixe will be used.
+     2. For PROCESSOR_K8 and PROCESSOR_AMDFAM10 in 64bit, NOPs with 0x66 prefix will be used.
      3. For PROCESSOR_MEROM, alt_long_patt will be used.
      4. For PROCESSOR_PENTIUMPRO, PROCESSOR_PENTIUM4, PROCESSOR_NOCONA,
      PROCESSOR_YONAH, PROCESSOR_MEROM, PROCESSOR_K6, PROCESSOR_ATHLON
@@ -812,6 +820,7 @@ i386_align_code (fragP, count)
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
 	    case PROCESSOR_GENERIC64:
+	    case PROCESSOR_AMDFAM10:  
 	      patt = alt_short_patt;
 	      break;
 	    case PROCESSOR_I486:
@@ -840,6 +849,7 @@ i386_align_code (fragP, count)
 	    case PROCESSOR_K6:
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
+            case PROCESSOR_AMDFAM10:
 	    case PROCESSOR_GENERIC32:
 	      /* We use cpu_arch_isa_flags to check if we CAN optimize
 		 for Cpu686.  */
@@ -1733,15 +1743,27 @@ md_assemble (line)
   if (line == NULL)
     return;
 
+  /* The order of the immediates should be reversed 
+     for 2 immediates extrq and insertq instructions */
+  if ((i.imm_operands == 2) && 
+      ((strcmp (mnemonic, "extrq") == 0) 
+       || (strcmp (mnemonic, "insertq") == 0)))
+    {
+      swap_imm_operands ();  
+      /* "extrq" and insertq" are the only two instructions whose operands 
+	 have to be reversed even though they have two immediate operands.
+      */
+      if (intel_syntax)
+	swap_operands ();
+    }
+
   /* Now we've parsed the mnemonic into a set of templates, and have the
      operands at hand.  */
 
   /* All intel opcodes have reversed operands except for "bound" and
      "enter".  We also don't reverse intersegment "jmp" and "call"
      instructions with 2 immediate operands so that the immediate segment
-     precedes the offset, as it does when in AT&T mode.  "enter" and the
-     intersegment "jmp" and "call" instructions are the only ones that
-     have two immediate operands.  */
+     precedes the offset, as it does when in AT&T mode. */
   if (intel_syntax && i.operands > 1
       && (strcmp (mnemonic, "bound") != 0)
       && (strcmp (mnemonic, "invlpga") != 0)
@@ -2272,6 +2294,27 @@ parse_operands (l, mnemonic)
 }
 
 static void
+swap_imm_operands ()
+{
+  union i386_op temp_op;
+  unsigned int temp_type;
+  enum bfd_reloc_code_real temp_reloc;
+  int xchg1 = 0;
+  int xchg2 = 1;
+  
+  temp_type = i.types[xchg2];
+  i.types[xchg2] = i.types[xchg1];
+  i.types[xchg1] = temp_type;
+  temp_op = i.op[xchg2];
+  i.op[xchg2] = i.op[xchg1];
+  i.op[xchg1] = temp_op;
+  temp_reloc = i.reloc[xchg2];
+  i.reloc[xchg2] = i.reloc[xchg1];
+  i.reloc[xchg1] = temp_reloc;
+}
+
+
+static void
 swap_operands ()
 {
   union i386_op temp_op;
@@ -2280,6 +2323,26 @@ swap_operands ()
   int xchg1 = 0;
   int xchg2 = 0;
 
+  if (i.operands == 4)
+    /* There will be two exchanges in a 4 operand instruction.
+       First exchange is the done inside this block.(1st and 4rth operand) 
+       The next exchange is done outside this block.(2nd and 3rd operand) */
+    {
+      xchg1 = 0;
+      xchg2 = 3;
+      temp_type = i.types[xchg2];
+      i.types[xchg2] = i.types[xchg1];
+      i.types[xchg1] = temp_type;
+      temp_op = i.op[xchg2];
+      i.op[xchg2] = i.op[xchg1];
+      i.op[xchg1] = temp_op;
+      temp_reloc = i.reloc[xchg2];
+      i.reloc[xchg2] = i.reloc[xchg1];
+      i.reloc[xchg1] = temp_reloc;
+      xchg1 = 1;
+      xchg2 = 2;
+    }
+
   if (i.operands == 2)
     {
       xchg1 = 0;
@@ -3281,6 +3344,10 @@ build_modrm_byte ()
 		    | SReg2 | SReg3
 		    | Control | Debug | Test))
 		? 0 : 1);
+
+      /* In 4 operands instructions with 2 immediate operands, the first two are immediate
+	 bytes and hence source operand will be in the next byte after the immediates */
+      if ((i.operands == 4)&&(i.imm_operands=2)) source++; 
       dest = source + 1;
 
       i.rm.mode = 3;
--- gas/config/tc-i386.h	16 Jun 2006 15:46:11 -0000	1.69
+++ gas/config/tc-i386.h	13 Jul 2006 22:25:44 -0000	1.70
@@ -91,8 +91,8 @@ extern const char extra_symbol_chars[];
 extern const char *i386_comment_chars;
 #define tc_comment_chars i386_comment_chars
 
-#define MAX_OPERANDS 3		/* max operands per insn */
-#define MAX_IMMEDIATE_OPERANDS 2/* max immediates per insn (lcall, ljmp) */
+#define MAX_OPERANDS 4		/* max operands per insn */
+#define MAX_IMMEDIATE_OPERANDS 2/* max immediates per insn (lcall, ljmp, insertq, extrq) */
 #define MAX_MEMORY_OPERANDS 2	/* max memory refs per insn (string ops) */
 
 /* Prefixes will be emitted in the order defined below.
@@ -185,6 +185,9 @@ typedef struct
 #define CpuSVME	      0x80000	/* AMD Secure Virtual Machine Ext-s required */
 #define CpuVMX	     0x100000	/* VMX Instructions required */
 #define CpuMNI	     0x200000	/* Merom New Instructions required */
[...2541 lines suppressed...]
+      else
+	(*info->fprintf_func) (info->stream, "%s", fourth);
     }
-  for (i = 0; i < 3; i++)
+
+  for (i = 0; i < 4; i++)
     if (op_index[i] != -1 && op_riprel[i])
       {
 	(*info->fprintf_func) (info->stream, "        # ");
@@ -2611,34 +2678,34 @@ static const unsigned char float_mem_mod
 #define ST OP_ST, 0
 #define STi OP_STi, 0
 
-#define FGRPd9_2 NULL, NULL, 0, NULL, 0, NULL, 0
-#define FGRPd9_4 NULL, NULL, 1, NULL, 0, NULL, 0
-#define FGRPd9_5 NULL, NULL, 2, NULL, 0, NULL, 0
-#define FGRPd9_6 NULL, NULL, 3, NULL, 0, NULL, 0
-#define FGRPd9_7 NULL, NULL, 4, NULL, 0, NULL, 0
-#define FGRPda_5 NULL, NULL, 5, NULL, 0, NULL, 0
-#define FGRPdb_4 NULL, NULL, 6, NULL, 0, NULL, 0
-#define FGRPde_3 NULL, NULL, 7, NULL, 0, NULL, 0
-#define FGRPdf_4 NULL, NULL, 8, NULL, 0, NULL, 0
+#define FGRPd9_2 NULL, NULL, 0, NULL, 0, NULL, 0, NULL, 0
+#define FGRPd9_4 NULL, NULL, 1, NULL, 0, NULL, 0, NULL, 0
+#define FGRPd9_5 NULL, NULL, 2, NULL, 0, NULL, 0, NULL, 0
+#define FGRPd9_6 NULL, NULL, 3, NULL, 0, NULL, 0, NULL, 0
+#define FGRPd9_7 NULL, NULL, 4, NULL, 0, NULL, 0, NULL, 0
+#define FGRPda_5 NULL, NULL, 5, NULL, 0, NULL, 0, NULL, 0
+#define FGRPdb_4 NULL, NULL, 6, NULL, 0, NULL, 0, NULL, 0
+#define FGRPde_3 NULL, NULL, 7, NULL, 0, NULL, 0, NULL, 0
+#define FGRPdf_4 NULL, NULL, 8, NULL, 0, NULL, 0, NULL, 0
 
 static const struct dis386 float_reg[][8] = {
   /* d8 */
   {
-    { "fadd",	ST, STi, XX },
-    { "fmul",	ST, STi, XX },
-    { "fcom",	STi, XX, XX },
-    { "fcomp",	STi, XX, XX },
-    { "fsub",	ST, STi, XX },
-    { "fsubr",	ST, STi, XX },
-    { "fdiv",	ST, STi, XX },
-    { "fdivr",	ST, STi, XX },
+    { "fadd",	ST, STi, XX, XX },
+    { "fmul",	ST, STi, XX, XX },
+    { "fcom",	STi, XX, XX, XX },
+    { "fcomp",	STi, XX, XX, XX },
+    { "fsub",	ST, STi, XX, XX },
+    { "fsubr",	ST, STi, XX, XX },
+    { "fdiv",	ST, STi, XX, XX },
+    { "fdivr",	ST, STi, XX, XX },
   },
   /* d9 */
   {
-    { "fld",	STi, XX, XX },
-    { "fxch",	STi, XX, XX },
+    { "fld",	STi, XX, XX, XX },
+    { "fxch",	STi, XX, XX, XX },
     { FGRPd9_2 },
-    { "(bad)",	XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
     { FGRPd9_4 },
     { FGRPd9_5 },
     { FGRPd9_6 },
@@ -2646,83 +2713,83 @@ static const struct dis386 float_reg[][8
   },
   /* da */
   {
-    { "fcmovb",	ST, STi, XX },
-    { "fcmove",	ST, STi, XX },
-    { "fcmovbe",ST, STi, XX },
-    { "fcmovu",	ST, STi, XX },
-    { "(bad)",	XX, XX, XX },
+    { "fcmovb",	ST, STi, XX, XX },
+    { "fcmove",	ST, STi, XX, XX },
+    { "fcmovbe",ST, STi, XX, XX },
+    { "fcmovu",	ST, STi, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
     { FGRPda_5 },
-    { "(bad)",	XX, XX, XX },
-    { "(bad)",	XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
   },
   /* db */
   {
-    { "fcmovnb",ST, STi, XX },
-    { "fcmovne",ST, STi, XX },
-    { "fcmovnbe",ST, STi, XX },
-    { "fcmovnu",ST, STi, XX },
+    { "fcmovnb",ST, STi, XX, XX },
+    { "fcmovne",ST, STi, XX, XX },
+    { "fcmovnbe",ST, STi, XX, XX },
+    { "fcmovnu",ST, STi, XX, XX },
     { FGRPdb_4 },
-    { "fucomi",	ST, STi, XX },
-    { "fcomi",	ST, STi, XX },
-    { "(bad)",	XX, XX, XX },
+    { "fucomi",	ST, STi, XX, XX },
+    { "fcomi",	ST, STi, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
   },
   /* dc */
   {
-    { "fadd",	STi, ST, XX },
-    { "fmul",	STi, ST, XX },
-    { "(bad)",	XX, XX, XX },
-    { "(bad)",	XX, XX, XX },
+    { "fadd",	STi, ST, XX, XX },
+    { "fmul",	STi, ST, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
 #if UNIXWARE_COMPAT
-    { "fsub",	STi, ST, XX },
-    { "fsubr",	STi, ST, XX },
-    { "fdiv",	STi, ST, XX },
-    { "fdivr",	STi, ST, XX },
+    { "fsub",	STi, ST, XX, XX },
+    { "fsubr",	STi, ST, XX, XX },
+    { "fdiv",	STi, ST, XX, XX },
+    { "fdivr",	STi, ST, XX, XX },
 #else
-    { "fsubr",	STi, ST, XX },
-    { "fsub",	STi, ST, XX },
-    { "fdivr",	STi, ST, XX },
-    { "fdiv",	STi, ST, XX },
+    { "fsubr",	STi, ST, XX, XX },
+    { "fsub",	STi, ST, XX, XX },
+    { "fdivr",	STi, ST, XX, XX },
+    { "fdiv",	STi, ST, XX, XX },
 #endif
   },
   /* dd */
   {
-    { "ffree",	STi, XX, XX },
-    { "(bad)",	XX, XX, XX },
-    { "fst",	STi, XX, XX },
-    { "fstp",	STi, XX, XX },
-    { "fucom",	STi, XX, XX },
-    { "fucomp",	STi, XX, XX },
-    { "(bad)",	XX, XX, XX },
-    { "(bad)",	XX, XX, XX },
+    { "ffree",	STi, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "fst",	STi, XX, XX, XX },
+    { "fstp",	STi, XX, XX, XX },
+    { "fucom",	STi, XX, XX, XX },
+    { "fucomp",	STi, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
   },
   /* de */
   {
-    { "faddp",	STi, ST, XX },
-    { "fmulp",	STi, ST, XX },
-    { "(bad)",	XX, XX, XX },
+    { "faddp",	STi, ST, XX, XX },
+    { "fmulp",	STi, ST, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
     { FGRPde_3 },
 #if UNIXWARE_COMPAT
-    { "fsubp",	STi, ST, XX },
-    { "fsubrp",	STi, ST, XX },
-    { "fdivp",	STi, ST, XX },
-    { "fdivrp",	STi, ST, XX },
+    { "fsubp",	STi, ST, XX, XX },
+    { "fsubrp",	STi, ST, XX, XX },
+    { "fdivp",	STi, ST, XX, XX },
+    { "fdivrp",	STi, ST, XX, XX },
 #else
-    { "fsubrp",	STi, ST, XX },
-    { "fsubp",	STi, ST, XX },
-    { "fdivrp",	STi, ST, XX },
-    { "fdivp",	STi, ST, XX },
+    { "fsubrp",	STi, ST, XX, XX },
+    { "fsubp",	STi, ST, XX, XX },
+    { "fdivrp",	STi, ST, XX, XX },
+    { "fdivp",	STi, ST, XX, XX },
 #endif
   },
   /* df */
   {
-    { "ffreep",	STi, XX, XX },
-    { "(bad)",	XX, XX, XX },
-    { "(bad)",	XX, XX, XX },
-    { "(bad)",	XX, XX, XX },
+    { "ffreep",	STi, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
     { FGRPdf_4 },
-    { "fucomip",ST, STi, XX },
-    { "fcomip", ST, STi, XX },
-    { "(bad)",	XX, XX, XX },
+    { "fucomip",ST, STi, XX, XX },
+    { "fcomip", ST, STi, XX, XX },
+    { "(bad)",	XX, XX, XX, XX },
   },
 };
 

binutils-2.17.50.0.2-power6-insns.patch:
 ppc-opc.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE binutils-2.17.50.0.2-power6-insns.patch ---
2006-07-11  Peter Bergner  <bergner at vnet.ibm.com>

	* ppc-opc.c (POWER6): Define.
	(powerpc_opcodes): Add "mffgpr" and "mftgpr" opcodes.

--- opcodes/ppc-opc.c	15 Nov 2005 21:33:04 -0000	1.85
+++ opcodes/ppc-opc.c	11 Jul 2006 21:56:59 -0000
@@ -1823,6 +1823,7 @@ extract_tbr (unsigned long insn,
 #define NOPOWER4 PPC_OPCODE_NOPOWER4 | PPCCOM
 #define POWER4	PPC_OPCODE_POWER4
 #define POWER5	PPC_OPCODE_POWER5
+#define POWER6	PPC_OPCODE_POWER6
 #define PPC32   PPC_OPCODE_32 | PPC_OPCODE_PPC
 #define PPC64   PPC_OPCODE_64 | PPC_OPCODE_PPC
 #define PPC403	PPC_OPCODE_403
@@ -4255,6 +4256,9 @@ const struct powerpc_opcode powerpc_opco
 
 { "lfdxe",   X(31,607), X_MASK,		BOOKE64,	{ FRT, RA0, RB } },
 
+{ "mffgpr",  XRC(31,607,0), XRA_MASK,	POWER6,		{ FRT, RB } },
+{ "mftgpr",  XRC(31,735,0), XRA_MASK,	POWER6,		{ RT, FRB } },
+
 { "mfsri",   X(31,627), X_MASK,		PWRCOM,		{ RT, RA, RB } },
 
 { "dclst",   X(31,630), XRB_MASK,	PWRCOM,		{ RS, RA } },

binutils-2.17.50.0.2-power6.patch:
 gas/config/tc-ppc.c  |   12 +++++++++++-
 gas/doc/c-ppc.texi   |    3 +++
 include/opcode/ppc.h |    8 ++++++--
 opcodes/ppc-dis.c    |    5 +++++
 4 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-power6.patch ---
gas/
2006-06-06  Ben Elliston  <bje at au.ibm.com>
	    Anton Blanchard  <anton at samba.org>

	* config/tc-ppc.c (parse_cpu): Handle "-mpower6".
	(md_show_usage): Document it.
	(ppc_setup_opcodes): Test power6 opcode flag bits.
	* doc/c-ppc.texi (PowerPC-Opts): Document "-mpower6".
include/opcodes/
2006-06-06  Ben Elliston  <bje at au.ibm.com>
	    Anton Blanchard  <anton at samba.org>

	* ppc.h (PPC_OPCODE_POWER6): Define.
	Adjust whitespace.
opcodes/
2006-06-06  Ben Elliston  <bje at au.ibm.com>
	    Anton Blanchard  <anton at samba.org>
	    Peter Bergner  <bergner at vnet.ibm.com>

	* ppc-dis.c (powerpc_dialect): Handle power6 option.
	(print_ppc_disassembler_options): Mention power6.

--- gas/config/tc-ppc.c	19 May 2006 11:26:11 -0000	1.110
+++ gas/config/tc-ppc.c	7 Jun 2006 05:23:59 -0000	1.111
@@ -917,6 +917,12 @@ parse_cpu (const char *arg)
 		 | PPC_OPCODE_64 | PPC_OPCODE_POWER4
 		 | PPC_OPCODE_POWER5);
     }
+  else if (strcmp (arg, "power6") == 0)
+    {
+      ppc_cpu = (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC
+		 | PPC_OPCODE_64 | PPC_OPCODE_POWER4
+		 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6);
+    }
   /* -mcom means assemble for the common intersection between Power
      and PowerPC.  At present, we just allow the union, rather
      than the intersection.  */
@@ -1112,6 +1118,7 @@ PowerPC options:\n\
 -mbooke, mbooke32	generate code for 32-bit PowerPC BookE\n\
 -mpower4		generate code for Power4 architecture\n\
 -mpower5		generate code for Power5 architecture\n\
+-mpower6		generate code for Power6 architecture\n\
 -mcom			generate code Power/PowerPC common instructions\n\
 -many			generate code for any architecture (PWR/PWRX/PPC)\n"));
   fprintf (stream, _("\
@@ -1270,7 +1277,10 @@ ppc_setup_opcodes (void)
 		  == (ppc_cpu & PPC_OPCODE_POWER4)))
 	  && ((op->flags & PPC_OPCODE_POWER5) == 0
 	      || ((op->flags & PPC_OPCODE_POWER5)
-		  == (ppc_cpu & PPC_OPCODE_POWER5))))
+		  == (ppc_cpu & PPC_OPCODE_POWER5)))
+	  && ((op->flags & PPC_OPCODE_POWER6) == 0
+	      || ((op->flags & PPC_OPCODE_POWER6)
+		  == (ppc_cpu & PPC_OPCODE_POWER6))))
 	{
 	  const char *retval;
 
--- gas/doc/c-ppc.texi	15 Aug 2005 15:37:15 -0000	1.7
+++ gas/doc/c-ppc.texi	7 Jun 2006 05:23:59 -0000	1.8
@@ -79,6 +79,9 @@ Generate code for Power4 architecture.
 @item -mpower5
 Generate code for Power5 architecture.
 
+ at item -mpower6
+Generate code for Power6 architecture.
+
 @item -mcom
 Generate code Power/PowerPC common instructions.
 
--- include/opcode/ppc.h	15 Aug 2005 15:37:15 -0000	1.21
+++ include/opcode/ppc.h	7 Jun 2006 05:23:59 -0000	1.22
@@ -135,10 +135,14 @@ extern const int powerpc_num_opcodes;
 #define PPC_OPCODE_RFMCI	  0x800000
 
 /* Opcode is only supported by Power5 architecture.  */
-#define PPC_OPCODE_POWER5	    0x1000000
+#define PPC_OPCODE_POWER5	 0x1000000
 
 /* Opcode is supported by PowerPC e300 family.  */
-#define PPC_OPCODE_E300           0x2000000
+#define PPC_OPCODE_E300          0x2000000
+
+/* Opcode is only supported by Power6 architecture.  */
+#define PPC_OPCODE_POWER6	 0x4000000
+
 
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
--- opcodes/ppc-dis.c	6 Oct 2005 19:21:14 -0000	1.22
+++ opcodes/ppc-dis.c	7 Jun 2006 05:23:59 -0000	1.23
@@ -74,6 +74,10 @@ powerpc_dialect (struct disassemble_info
     dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5;
 
   if (info->disassembler_options
+      && strstr (info->disassembler_options, "power6") != NULL)
+    dialect |= PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_ALTIVEC;
+
+  if (info->disassembler_options
       && strstr (info->disassembler_options, "any") != NULL)
     dialect |= PPC_OPCODE_ANY;
 
@@ -306,6 +310,7 @@ the -M switch:\n");
   fprintf (stream, "  efs                      Disassemble the EFS instructions\n");
   fprintf (stream, "  power4                   Disassemble the Power4 instructions\n");
   fprintf (stream, "  power5                   Disassemble the Power5 instructions\n");
+  fprintf (stream, "  power6                   Disassemble the Power6 instructions\n");
   fprintf (stream, "  32                       Do not disassemble 64-bit instructions\n");
   fprintf (stream, "  64                       Allow disassembly of 64-bit instructions\n");
 }

binutils-2.17.50.0.2-x86-march.patch:
 config/tc-i386.c |  199 ++++++++++++++++++++++++++++++++++++++++++++-----------
 config/tc-i386.h |   24 +++++-
 doc/as.texinfo   |    1 
 doc/c-i386.texi  |   50 +++++++++++++
 4 files changed, 232 insertions(+), 42 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-x86-march.patch ---
2006-06-16  H.J. Lu  <hongjiu.lu at intel.com>

	* config/tc-i386.h (processor_type): New.
	(arch_entry): Add type.

	* config/tc-i386.c (cpu_arch_tune): New.
	(cpu_arch_tune_flags): Likewise.
	(cpu_arch_isa_flags): Likewise.
	(cpu_arch): Updated.
	(set_cpu_arch): Also update cpu_arch_isa_flags.
	(md_assemble): Update cpu_arch_isa_flags.
	(OPTION_MARCH): New.
	(OPTION_MTUNE): Likewise.
	(md_longopts): Add -march= and -mtune=.
	(md_parse_option): Support -march= and -mtune=.
	(md_show_usage): Add -march=CPU/-mtune=CPU.
	(i386_target_format): Also update cpu_arch_isa_flags,
	cpu_arch_tune and cpu_arch_tune_flags.

	* doc/as.texinfo: Add -march=CPU/-mtune=CPU.

	* doc/c-i386.texi: Document -march=CPU/-mtune=CPU.

--- gas/config/tc-i386.c	12 Jun 2006 18:55:38 -0000	1.216
+++ gas/config/tc-i386.c	16 Jun 2006 15:46:11 -0000	1.217
@@ -323,6 +323,15 @@ static const char *cpu_sub_arch_name = N
 /* CPU feature flags.  */
 static unsigned int cpu_arch_flags = CpuUnknownFlags | CpuNo64;
 
+/* Cpu we are generating instructions for.  */
+static enum processor_type cpu_arch_tune = PROCESSOR_UNKNOWN;
+
+/* CPU feature flags of cpu we are generating instructions for.  */
+static unsigned int cpu_arch_tune_flags = 0;
+
+/* CPU feature flags of instruction set architecture used.  */
+static unsigned int cpu_arch_isa_flags = 0;
+
 /* If set, conditional jumps are not automatically promoted to handle
    larger than a byte offset.  */
 static unsigned int no_cond_jump_promotion = 0;
@@ -415,35 +424,85 @@ const relax_typeS md_relax_table[] =
   {0, 0, 4, 0}
 };
 
-static const arch_entry cpu_arch[] = {
-  {"i8086",	Cpu086 },
-  {"i186",	Cpu086|Cpu186 },
-  {"i286",	Cpu086|Cpu186|Cpu286 },
-  {"i386",	Cpu086|Cpu186|Cpu286|Cpu386 },
-  {"i486",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486 },
-  {"i586",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586 },
-  {"i686",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 },
-  {"pentium",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586 },
-  {"pentiumpro",Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 },
-  {"pentiumii",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX },
-  {"pentiumiii",Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuMMX2|CpuSSE },
-  {"pentium4",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2 },
-  {"prescott",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuPNI },
-  {"k6",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX },
-  {"k6_2",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX|Cpu3dnow },
-  {"athlon",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA },
-  {"sledgehammer",Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon|CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2 },
-  {"opteron",	Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon|CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2 },
-  {".mmx",	CpuMMX },
-  {".sse",	CpuMMX|CpuMMX2|CpuSSE },
-  {".sse2",	CpuMMX|CpuMMX2|CpuSSE|CpuSSE2 },
-  {".sse3",	CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3 },
-  {".3dnow",	CpuMMX|Cpu3dnow },
-  {".3dnowa",	CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA },
-  {".padlock",	CpuPadLock },
-  {".pacifica",	CpuSVME },
-  {".svme",	CpuSVME },
-  {NULL, 0 }
+static const arch_entry cpu_arch[] =
+{
+  {"generic32", PROCESSOR_GENERIC32,
+   Cpu086|Cpu186|Cpu286|Cpu386},
+  {"generic64", PROCESSOR_GENERIC64,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2},
+  {"i8086", PROCESSOR_UNKNOWN,
+   Cpu086},
+  {"i186", PROCESSOR_UNKNOWN,
+   Cpu086|Cpu186},
+  {"i286", PROCESSOR_UNKNOWN,
+   Cpu086|Cpu186|Cpu286},
+  {"i386", PROCESSOR_GENERIC32,
+   Cpu086|Cpu186|Cpu286|Cpu386},
+  {"i486", PROCESSOR_I486,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486},
+  {"i586", PROCESSOR_PENTIUM,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586},
+  {"i686", PROCESSOR_PENTIUMPRO,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686},
+  {"pentium", PROCESSOR_PENTIUM,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586},
+  {"pentiumpro",PROCESSOR_PENTIUMPRO,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686},
+  {"pentiumii",	PROCESSOR_PENTIUMPRO,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX},
+  {"pentiumiii",PROCESSOR_PENTIUMPRO,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuMMX|CpuMMX2
+   |CpuSSE},
+  {"pentium4", PROCESSOR_PENTIUM4,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2},
+  {"prescott", PROCESSOR_NOCONA,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3},
+  {"nocona", PROCESSOR_NOCONA,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3},
+  {"yonah", PROCESSOR_YONAH,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3},
+  {"merom", PROCESSOR_MEROM,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuP4|CpuMMX
+   |CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuMNI},
+  {"k6", PROCESSOR_K6,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX},
+  {"k6_2", PROCESSOR_K6,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|CpuK6|CpuMMX|Cpu3dnow},
+  {"athlon", PROCESSOR_ATHLON,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
+   |CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA},
+  {"sledgehammer", PROCESSOR_K8,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
+   |CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2},
+  {"opteron", PROCESSOR_K8,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
+   |CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2},
+  {"k8", PROCESSOR_K8,
+   Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuK6|CpuAthlon
+   |CpuSledgehammer|CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2},
+  {".mmx", PROCESSOR_UNKNOWN,
+   CpuMMX},
+  {".sse", PROCESSOR_UNKNOWN,
+   CpuMMX|CpuMMX2|CpuSSE},
+  {".sse2", PROCESSOR_UNKNOWN,
+   CpuMMX|CpuMMX2|CpuSSE|CpuSSE2},
+  {".sse3", PROCESSOR_UNKNOWN,
+   CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3},
+  {".3dnow", PROCESSOR_UNKNOWN,
+   CpuMMX|Cpu3dnow},
+  {".3dnowa", PROCESSOR_UNKNOWN,
+   CpuMMX|CpuMMX2|Cpu3dnow|Cpu3dnowA},
+  {".padlock", PROCESSOR_UNKNOWN,
+   CpuPadLock},
+  {".pacifica", PROCESSOR_UNKNOWN,
+   CpuSVME},
+  {".svme", PROCESSOR_UNKNOWN,
+   CpuSVME}
 };
 
 const pseudo_typeS md_pseudo_table[] =
@@ -866,9 +925,9 @@ set_cpu_arch (dummy)
     {
       char *string = input_line_pointer;
       int e = get_symbol_end ();
-      int i;
+      unsigned int i;
 
-      for (i = 0; cpu_arch[i].name; i++)
+      for (i = 0; i < ARRAY_SIZE (cpu_arch); i++)
 	{
 	  if (strcmp (string, cpu_arch[i].name) == 0)
 	    {
@@ -878,6 +937,7 @@ set_cpu_arch (dummy)
 		  cpu_sub_arch_name = NULL;
 		  cpu_arch_flags = (cpu_arch[i].flags
 				    | (flag_code == CODE_64BIT ? Cpu64 : CpuNo64));
+		  cpu_arch_isa_flags = cpu_arch[i].flags;
 		  break;
 		}
 	      if ((cpu_arch_flags | cpu_arch[i].flags) != cpu_arch_flags)
@@ -890,7 +950,7 @@ set_cpu_arch (dummy)
 	      return;
 	    }
 	}
-      if (!cpu_arch[i].name)
+      if (i >= ARRAY_SIZE (cpu_arch))
 	as_bad (_("no such architecture: `%s'"), string);
 
       *input_line_pointer = e;
@@ -1655,6 +1715,9 @@ md_assemble (line)
   if (i.rex != 0)
     add_prefix (REX_OPCODE | i.rex);
 
+  /* Record what ISA we have generated so far.  */
+  cpu_arch_isa_flags |= i.tm.cpu_flags;
+
   /* We are ready to output the insn.  */
   output_insn ();
 }
@@ -5428,6 +5491,8 @@ const char *md_shortopts = "qn";
 #define OPTION_32 (OPTION_MD_BASE + 0)
 #define OPTION_64 (OPTION_MD_BASE + 1)
 #define OPTION_DIVIDE (OPTION_MD_BASE + 2)
+#define OPTION_MARCH (OPTION_MD_BASE + 3)
+#define OPTION_MTUNE (OPTION_MD_BASE + 4)
 
 struct option md_longopts[] = {
   {"32", no_argument, NULL, OPTION_32},
@@ -5435,15 +5500,17 @@ struct option md_longopts[] = {
   {"64", no_argument, NULL, OPTION_64},
 #endif
   {"divide", no_argument, NULL, OPTION_DIVIDE},
+  {"march", required_argument, NULL, OPTION_MARCH},
+  {"mtune", required_argument, NULL, OPTION_MTUNE},
   {NULL, no_argument, NULL, 0}
 };
 size_t md_longopts_size = sizeof (md_longopts);
 
 int
-md_parse_option (c, arg)
-     int c;
-     char *arg ATTRIBUTE_UNUSED;
+md_parse_option (int c, char *arg)
 {
+  unsigned int i;
+
   switch (c)
     {
     case 'n':
@@ -5513,6 +5580,37 @@ md_parse_option (c, arg)
 #endif
       break;
 
+    case OPTION_MARCH:
+      if (*arg == '.')
+	as_fatal (_("Invalid -march= option: `%s'"), arg);
+      for (i = 0; i < ARRAY_SIZE (cpu_arch); i++)
+	{
+	  if (strcmp (arg, cpu_arch [i].name) == 0)
+	    {
+	      cpu_arch_isa_flags = cpu_arch[i].flags;
+	      break;
+	    }
+	}
+      if (i >= ARRAY_SIZE (cpu_arch))
+	as_fatal (_("Invalid -march= option: `%s'"), arg);
+      break;
+
+    case OPTION_MTUNE:
+      if (*arg == '.')
+	as_fatal (_("Invalid -mtune= option: `%s'"), arg);
+      for (i = 0; i < ARRAY_SIZE (cpu_arch); i++)
+	{
+	  if (strcmp (arg, cpu_arch [i].name) == 0)
+	    {
+	      cpu_arch_tune = cpu_arch [i].type;
+	      cpu_arch_tune_flags = cpu_arch[i].flags;
+	      break;
+	    }
+	}
+      if (i >= ARRAY_SIZE (cpu_arch))
+	as_fatal (_("Invalid -mtune= option: `%s'"), arg);
+      break;
+
     default:
       return 0;
     }
@@ -5543,6 +5641,11 @@ md_show_usage (stream)
   fprintf (stream, _("\
   --divide                ignored\n"));
 #endif
+  fprintf (stream, _("\
+  -march=CPU/-mtune=CPU   generate code/optimize for CPU, where CPU is one of:\n\
+                           i386, i486, pentium, pentiumpro, pentium4, nocona,\n\
+			   yonah, merom, k6, athlon, k8, generic32, generic64\n"));
+
 }
 
 #if ((defined (OBJ_MAYBE_COFF) && defined (OBJ_MAYBE_AOUT)) \
@@ -5554,9 +5657,31 @@ const char *
 i386_target_format ()
 {
   if (!strcmp (default_arch, "x86_64"))
-    set_code_flag (CODE_64BIT);
+    {
+      set_code_flag (CODE_64BIT);
+      if (cpu_arch_isa_flags == 0)
+	cpu_arch_isa_flags = Cpu086|Cpu186|Cpu286|Cpu386|Cpu486
+			     |Cpu586|Cpu686|CpuP4|CpuMMX|CpuMMX2
+			     |CpuSSE|CpuSSE2;
+      if (cpu_arch_tune == PROCESSOR_UNKNOWN)
+	{
+	  cpu_arch_tune = PROCESSOR_GENERIC64;
+	  cpu_arch_tune_flags = Cpu086|Cpu186|Cpu286|Cpu386|Cpu486
+				|Cpu586|Cpu686|CpuP4|CpuMMX|CpuMMX2
+				|CpuSSE|CpuSSE2;
+	}
+    }
   else if (!strcmp (default_arch, "i386"))
-    set_code_flag (CODE_32BIT);
+    {
+      set_code_flag (CODE_32BIT);
+      if (cpu_arch_isa_flags == 0)
+	cpu_arch_isa_flags = Cpu086|Cpu186|Cpu286|Cpu386;
+      if (cpu_arch_tune == PROCESSOR_UNKNOWN)
+	{
+	  cpu_arch_tune = PROCESSOR_GENERIC32;
+	  cpu_arch_tune_flags = Cpu086|Cpu186|Cpu286|Cpu386;
+	}
+    }
   else
     as_fatal (_("Unknown architecture"));
   switch (OUTPUT_FLAVOR)
--- gas/config/tc-i386.h	19 May 2006 11:26:11 -0000	1.67
+++ gas/config/tc-i386.h	16 Jun 2006 15:46:11 -0000	1.68
@@ -377,11 +377,29 @@ typedef struct
 }
 sib_byte;
 
-/* x86 arch names and features */
+enum processor_type
+{
+  PROCESSOR_UNKNOWN,
+  PROCESSOR_I486,
+  PROCESSOR_PENTIUM,
+  PROCESSOR_PENTIUMPRO,
+  PROCESSOR_PENTIUM4,
+  PROCESSOR_NOCONA,
+  PROCESSOR_YONAH,
+  PROCESSOR_MEROM,
+  PROCESSOR_K6,
+  PROCESSOR_ATHLON,
+  PROCESSOR_K8,
+  PROCESSOR_GENERIC32,
+  PROCESSOR_GENERIC64
+};
+
+/* x86 arch names, types and features */
 typedef struct
 {
-  const char *name;	/* arch name */
-  unsigned int flags;	/* cpu feature flags */
+  const char *name;		/* arch name */
+  enum processor_type type;	/* arch type */
+  unsigned int flags;		/* cpu feature flags */
 }
 arch_entry;
 
--- gas/doc/as.texinfo	1 Jun 2006 14:54:25 -0000	1.147
+++ gas/doc/as.texinfo	16 Jun 2006 15:46:11 -0000	1.148
@@ -296,6 +296,7 @@ gcc(1), ld(1), and the Info entries for 
 
 @emph{Target i386 options:}
    [@b{--32}|@b{--64}] [@b{-n}]
+   [@b{-march}=@var{CPU}] [@b{-mtune}=@var{CPU}] 
 @end ifset
 @ifset I960
 
--- gas/doc/c-i386.texi	7 Nov 2005 06:01:18 -0000	1.13
+++ gas/doc/c-i386.texi	16 Jun 2006 15:46:11 -0000	1.14
@@ -76,6 +76,49 @@ character, which means that it cannot be
 not disable @samp{/} at the beginning of a line starting a comment, or
 affect using @samp{#} for starting a comment.
 
+ at cindex @samp{-march=} option, i386
+ at cindex @samp{-march=} option, x86-64
+ at item -march=@var{CPU}
+This option specifies an instruction set architecture for generating
+instructions.  The following architectures are recognized:
+ at code{i8086},
+ at code{i186},
+ at code{i286},
+ at code{i386},
+ at code{i486},
+ at code{i586},
+ at code{i686},
+ at code{pentium},
+ at code{pentiumpro},
+ at code{pentiumii},
+ at code{pentiumiii},
+ at code{pentium4},
+ at code{prescott},
+ at code{nocona},
+ at code{yonah},
+ at code{merom},
+ at code{k6},
+ at code{k6_2},
+ at code{athlon},
+ at code{sledgehammer},
+ at code{opteron},
+ at code{k8},
+ at code{generic32} and
+ at code{generic64}.
+
+This option only affects instructions generated by the assembler. The
+ at code{.arch} directive will take precedent.
+
+ at cindex @samp{-mtune=} option, i386
+ at cindex @samp{-mtune=} option, x86-64
+ at item -mtune=@var{CPU}
+This option specifies a processor to optimize for. When used in
+conjunction with the @option{-march} option, only instructions
+of the processor specified by the @option{-march} option will be
+generated.
+
+Valid @var{CPU} values are identical to @option{-march=@var{CPU}}.
+
 @end table
 
 @node i386-Syntax
@@ -709,8 +752,11 @@ supported on the CPU specified.  The cho
 @item @samp{i8086} @tab @samp{i186} @tab @samp{i286} @tab @samp{i386}
 @item @samp{i486} @tab @samp{i586} @tab @samp{i686} @tab @samp{pentium}
 @item @samp{pentiumpro} @tab @samp{pentiumii} @tab @samp{pentiumiii} @tab @samp{pentium4}
- at item @samp{k6} @tab @samp{athlon} @samp{sledgehammer}
- at item @samp{.mmx} @samp{.sse} @samp{.sse2} @samp{.sse3} @samp{.3dnow}
+ at item @samp{prescott} @tab @samp{nocona} @tab @samp{yonah} @tab @samp{merom}
+ at item @samp{k6} @tab @samp{athlon} @tab @samp{sledgehammer} @tab @samp{k8} 
+ at item @samp{.mmx} @tab @samp{.sse} @tab @samp{.sse2} @tab @samp{.sse3}
+ at item @samp{.3dnow} @tab @samp{.3dnowa} @tab @samp{.padlock} @tab @samp{.pacifica}
+ at item @samp{.svme}
 @end multitable
 
 Apart from the warning, there are only two other effects on

binutils-2.17.50.0.2-x86-nops.patch:
 gas/config/tc-i386.c                   |   10 +++++
 gas/testsuite/gas/i386/i386.exp        |    2 +
 gas/testsuite/gas/i386/nops.d          |   17 +++++++++
 gas/testsuite/gas/i386/nops.s          |   12 ++++++
 gas/testsuite/gas/i386/opcode.d        |    1 
 gas/testsuite/gas/i386/opcode.s        |    2 +
 gas/testsuite/gas/i386/x86-64-nops.d   |   17 +++++++++
 gas/testsuite/gas/i386/x86-64-nops.s   |   12 ++++++
 gas/testsuite/gas/i386/x86-64-opcode.d |    9 +++--
 gas/testsuite/gas/i386/x86-64-opcode.s |    8 ++++
 include/opcode/i386.h                  |   16 +++------
 opcodes/i386-dis.c                     |   58 +++++++++++++++++++++------------
 12 files changed, 130 insertions(+), 34 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-x86-nops.patch ---
2006-06-12  H.J. Lu  <hongjiu.lu at intel.com>

gas/
	* config/tc-i386.c (process_suffix): Don't add rex64 for
	"xchg %rax,%rax".
gas/testsuite/
	* gas/i386/i386.exp: Run nops and x86-64-nops.

	* gas/i386/nops.d: New file.
	* gas/i386/nops.s: Likewise.
	* gas/i386/x86-64-nops.d: Likewise.
	* gas/i386/x86-64-nops.s: Likewise.

	* gas/i386/opcode.s: Add "xchg %ax,%ax".
	* gas/i386/opcode.d: Updated.

	* gas/i386/x86-64-opcode.s: Add xchg %ax,%ax, xchg %eax,%eax,
	xchg %rax,%rax, rex64 xchg %rax,%rax and xchg %rax,%r8.
	* gas/i386/x86-64-opcode.d: Updated.
include/opcode/
	* i386.h (i386_optab): Add "nop" with memory reference.

	* i386.h (i386_optab): Update comment for 64bit NOP.
opcodes/
	* i386-dis.c (dis386_twobyte): Use "nopQ" for 0x1f.
	(twobyte_has_modrm): Set 1 for 0x1f.

	* i386-dis.c (NOP_Fixup): Removed.
	(NOP_Fixup1): New.
	(NOP_Fixup2): Likewise.
	(dis386): Use NOP_Fixup1 and NOP_Fixup2 on 0x90.

2006-06-10  H.J. Lu  <hongjiu.lu at intel.com>

opcodes/
	* i386.c (GRP10): Renamed to ...
	(GRP12): This.
	(GRP11): Renamed to ...
	(GRP13): This.
	(GRP12): Renamed to ...
	(GRP14): This.
	(GRP13): Renamed to ...
	(GRP15): This.
	(GRP14): Renamed to ...
	(GRP16): This.
	(dis386_twobyte): Updated.
	(grps): Likewise.

--- gas/config/tc-i386.c	19 May 2006 11:26:11 -0000	1.215
+++ gas/config/tc-i386.c	12 Jun 2006 18:55:38 -0000	1.216
@@ -2615,7 +2615,15 @@ process_suffix (void)
       if (i.suffix == QWORD_MNEM_SUFFIX
 	  && flag_code == CODE_64BIT
 	  && (i.tm.opcode_modifier & NoRex64) == 0)
-	i.rex |= REX_MODE64;
+	{
+	  /* Special case for xchg %rax,%rax.  It is NOP and doesn't
+	     need rex64.  */
+	  if (i.operands != 2
+	      || i.types [0] != (Acc | Reg64)
+	      || i.types [1] != (Acc | Reg64)
+	      || strcmp (i.tm.name, "xchg") != 0)
+	  i.rex |= REX_MODE64;
+	}
 
       /* Size floating point instruction.  */
       if (i.suffix == LONG_MNEM_SUFFIX)
--- gas/testsuite/gas/i386/i386.exp	9 May 2006 16:05:40 -0000	1.52
+++ gas/testsuite/gas/i386/i386.exp	12 Jun 2006 18:59:35 -0000	1.53
@@ -72,6 +72,7 @@ if [expr ([istarget "i*86-*-*"] ||  [ist
     run_dump_test "rep"
     run_dump_test "rep-suffix"
     run_dump_test "fp"
+    run_dump_test "nops"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
@@ -144,6 +145,7 @@ if [expr ([istarget "i*86-*-*"] || [ista
     run_dump_test "x86-64-rep"
     run_dump_test "x86-64-rep-suffix"
     run_dump_test "x86-64-gidt"
+    run_dump_test "x86-64-nops"
 
     if { ![istarget "*-*-aix*"]
       && ![istarget "*-*-beos*"]
--- gas/testsuite/gas/i386/nops.d	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/nops.d	12 Jun 2006 18:59:35 -0000	1.1
@@ -0,0 +1,17 @@
+#objdump: -drw
+#name: i386 nops
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <.text>:
+[	 ]*0:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
+[	 ]*3:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*7:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*c:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*12:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*19:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*21:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*2a:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+#pass
--- gas/testsuite/gas/i386/nops.s	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/nops.s	12 Jun 2006 18:59:35 -0000	1.1
@@ -0,0 +1,12 @@
+	.text
+
+	.byte 0x0f, 0x1f, 0x0	
+	.byte 0x0f, 0x1f, 0x40, 0x0	
+	.byte 0x0f, 0x1f, 0x44, 0x0,  0x0	
+	.byte 0x66, 0x0f, 0x1f, 0x44, 0x0,  0x0	
+	.byte 0x0f, 0x1f, 0x80, 0x0,  0x0,  0x0, 0x0	
+	.byte 0x0f, 0x1f, 0x84, 0x0,  0x0,  0x0, 0x0, 0x0
+	.byte 0x66, 0x0f, 0x1f, 0x84, 0x0,  0x0, 0x0, 0x0, 0x0
+	.byte 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x0, 0x0, 0x0, 0x0, 0x0
+
+	.p2align 4
--- gas/testsuite/gas/i386/opcode.d	29 Mar 2005 19:30:47 -0000	1.6
+++ gas/testsuite/gas/i386/opcode.d	12 Jun 2006 18:55:39 -0000	1.7
@@ -572,4 +572,5 @@ Disassembly of section .text:
  9b7:	66 0f bd 90 90 90 90 90 [ 	]*bsr    0x90909090\(%eax\),%dx
  9bf:	66 0f be 90 90 90 90 90 [ 	]*movsbw 0x90909090\(%eax\),%dx
  9c7:	66 0f c1 90 90 90 90 90 [ 	]*xadd   %dx,0x90909090\(%eax\)
+ 9cf:	66 90 [ 	]*xchg   %ax,%ax
 	\.\.\.
--- gas/testsuite/gas/i386/opcode.s	29 Mar 2005 19:30:47 -0000	1.3
+++ gas/testsuite/gas/i386/opcode.s	12 Jun 2006 18:55:39 -0000	1.4
@@ -566,5 +566,7 @@ foo:
  movsbw 0x90909090(%eax),%dx
  xadd   %dx,0x90909090(%eax)
 
+ xchg   %ax,%ax
+
 # Force a good alignment.
  .p2align 4,0
--- gas/testsuite/gas/i386/x86-64-nops.d	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/x86-64-nops.d	12 Jun 2006 18:59:35 -0000	1.1
@@ -0,0 +1,17 @@
+#objdump: -drw
+#name: x86-64 nops
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <.text>:
+[	 ]*0:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%rax\)
+[	 ]*3:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%rax\)
+[	 ]*7:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
+[	 ]*c:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
+[	 ]*12:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax\)
+[	 ]*19:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
+[	 ]*21:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%rax,%rax,1\)
+[	 ]*2a:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%rax,%rax,1\)
+#pass
--- gas/testsuite/gas/i386/x86-64-nops.s	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/x86-64-nops.s	12 Jun 2006 18:59:35 -0000	1.1
@@ -0,0 +1,12 @@
+	.text
+
+	.byte 0x0f, 0x1f, 0x0	
+	.byte 0x0f, 0x1f, 0x40, 0x0	
+	.byte 0x0f, 0x1f, 0x44, 0x0,  0x0	
+	.byte 0x66, 0x0f, 0x1f, 0x44, 0x0,  0x0	
+	.byte 0x0f, 0x1f, 0x80, 0x0,  0x0,  0x0, 0x0	
+	.byte 0x0f, 0x1f, 0x84, 0x0,  0x0,  0x0, 0x0, 0x0
+	.byte 0x66, 0x0f, 0x1f, 0x84, 0x0,  0x0, 0x0, 0x0, 0x0
+	.byte 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x0, 0x0, 0x0, 0x0, 0x0
+
+	.p2align 4
--- gas/testsuite/gas/i386/x86-64-opcode.d	29 Mar 2005 19:30:47 -0000	1.6
+++ gas/testsuite/gas/i386/x86-64-opcode.d	12 Jun 2006 18:55:39 -0000	1.7
@@ -266,6 +266,9 @@ Disassembly of section .text:
 [	 ]*[0-9a-f]+:[	 ]+e6 00[	 ]+out[	 ]+%al,\$0[x0]*[	 ]*(#.*)*
 [	 ]*[0-9a-f]+:[	 ]+66 e7 00[	 ]+out[	 ]+%ax,\$0[x0]*[	 ]*(#.*)*
 [	 ]*[0-9a-f]+:[	 ]+e7 00[	 ]+out[	 ]+%eax,\$0[x0]*[	 ]*(#.*)*
-[	 ]*[0-9a-f]+:[	 ]+00 00[	 ]+.*
-[	 ]*[0-9a-f]+:[	 ]+00 00[	 ]+.*
-[	 *]...
+[	 ]*[0-9a-f]+:[	 ]+66 90[	 ]+xchg[	 ]+%ax,%ax[	 ]*(#.*)*
+[	 ]*[0-9a-f]+:[	 ]+87 c0[	 ]+xchg[	 ]+%eax,%eax[	 ]*(#.*)*
+[	 ]*[0-9a-f]+:[	 ]+90[	 ]+nop[	 ]*(#.*)*
+[	 ]*[0-9a-f]+:[	 ]+48 90[	 ]+rex64 nop[	 ]*(#.*)*
+[	 ]*[0-9a-f]+:[	 ]+49 90[	 ]+xchg[	 ]+%rax,%r8[	 ]*(#.*)*
+#pass
--- gas/testsuite/gas/i386/x86-64-opcode.s	29 Mar 2005 19:30:47 -0000	1.5
+++ gas/testsuite/gas/i386/x86-64-opcode.s	12 Jun 2006 18:55:39 -0000	1.6
@@ -387,4 +387,12 @@
 
 	# IN
 
+
+
+	xchg %ax,%ax		      # 66  --	 -- --	 90
+	xchg %eax,%eax		      # --  --	 -- --	 87 C0
+	xchg %rax,%rax		      # --  --	 -- --	 90
+	rex64 xchg %rax,%rax	      # 48  --	 -- --	 90
+	xchg %rax,%r8		      # --  --	 -- 49	 90
+
  .p2align 4,0
--- include/opcode/i386.h	27 Feb 2006 15:35:37 -0000	1.66
+++ include/opcode/i386.h	12 Jun 2006 18:59:36 -0000	1.68
@@ -179,19 +179,11 @@ static const template i386_optab[] =
 /* Exchange instructions.
    xchg commutes:  we allow both operand orders.
  
-   In the 64bit code, xchg eax, eax is reused for new nop instruction.  */
-#if 0 /* While the two entries that are disabled generate shorter code
-         for xchg eax, reg (on x86_64), the special case xchg eax, eax
-         does not get handled correctly - it degenerates into nop, but
-         that way the side effect of zero-extending eax to rax is lost.  */
-{"xchg",   2,	0x90, X, 0,	 wlq_Suf|ShortForm,	{ WordReg, Acc, 0 } },
-{"xchg",   2,	0x90, X, 0,	 wlq_Suf|ShortForm,	{ Acc, WordReg, 0 } },
-#else
+   In the 64bit code, xchg rax, rax is reused for new nop instruction.  */
 {"xchg",   2,	0x90, X, CpuNo64, wl_Suf|ShortForm,	{ WordReg, Acc, 0 } },
 {"xchg",   2,	0x90, X, CpuNo64, wl_Suf|ShortForm,	{ Acc, WordReg, 0 } },
 {"xchg",   2,	0x90, X, Cpu64, wq_Suf|ShortForm,	{ Reg16|Reg64, Acc, 0 } },
 {"xchg",   2,	0x90, X, Cpu64, wq_Suf|ShortForm,	{ Acc, Reg16|Reg64, 0 } },
-#endif
 {"xchg",   2,	0x86, X, 0,	 bwlq_Suf|W|Modrm,	{ Reg, Reg|AnyMem, 0 } },
 {"xchg",   2,	0x86, X, 0,	 bwlq_Suf|W|Modrm,	{ Reg|AnyMem, Reg, 0 } },
 
@@ -563,7 +555,11 @@ static const template i386_optab[] =
 {"bound",  2,	0x62, X, Cpu186|CpuNo64, wl_Suf|Modrm,		{ WordReg, WordMem, 0} },
 
 {"hlt",	   0,	0xf4, X, 0,	 NoSuf,			{ 0, 0, 0} },
-/* nop is actually 'xchgl %eax, %eax'.  */
+
+{"nop",    1, 0x0f1f, X, Cpu686, wl_Suf|Modrm,		{ WordMem, 0, 0} },
+
+/* nop is actually "xchg %ax,%ax" in 16bit mode, "xchg %eax,%eax" in
+   32bit mode and "xchg %rax,%rax" in 64bit mode.  */
 {"nop",	   0,	0x90, X, 0,	 NoSuf,			{ 0, 0, 0} },
 
 /* Protection control.  */
--- opcodes/i386-dis.c	9 May 2006 16:05:40 -0000	1.78
+++ opcodes/i386-dis.c	12 Jun 2006 18:59:37 -0000	1.81
@@ -91,7 +91,8 @@ static void OP_M (int, int);
 static void OP_VMX (int, int);
 static void OP_0fae (int, int);
 static void OP_0f07 (int, int);
-static void NOP_Fixup (int, int);
+static void NOP_Fixup1 (int, int);
+static void NOP_Fixup2 (int, int);
 static void OP_3DNowSuffix (int, int);
 static void OP_SIMD_Suffix (int, int);
 static void SIMD_Fixup (int, int);
@@ -418,11 +419,11 @@ fetch_data (struct disassemble_info *inf
 #define GRP7	  NULL, NULL, USE_GROUPS, NULL, 14, NULL, 0
 #define GRP8	  NULL, NULL, USE_GROUPS, NULL, 15, NULL, 0
 #define GRP9	  NULL, NULL, USE_GROUPS, NULL, 16, NULL, 0
-#define GRP10	  NULL, NULL, USE_GROUPS, NULL, 17, NULL, 0
-#define GRP11	  NULL, NULL, USE_GROUPS, NULL, 18, NULL, 0
-#define GRP12	  NULL, NULL, USE_GROUPS, NULL, 19, NULL, 0
-#define GRP13	  NULL, NULL, USE_GROUPS, NULL, 20, NULL, 0
-#define GRP14	  NULL, NULL, USE_GROUPS, NULL, 21, NULL, 0
+#define GRP12	  NULL, NULL, USE_GROUPS, NULL, 17, NULL, 0
+#define GRP13	  NULL, NULL, USE_GROUPS, NULL, 18, NULL, 0
+#define GRP14	  NULL, NULL, USE_GROUPS, NULL, 19, NULL, 0
+#define GRP15	  NULL, NULL, USE_GROUPS, NULL, 20, NULL, 0
+#define GRP16	  NULL, NULL, USE_GROUPS, NULL, 21, NULL, 0
 #define GRPAMD	  NULL, NULL, USE_GROUPS, NULL, 22, NULL, 0
 #define GRPPADLCK1 NULL, NULL, USE_GROUPS, NULL, 23, NULL, 0
 #define GRPPADLCK2 NULL, NULL, USE_GROUPS, NULL, 24, NULL, 0
@@ -679,7 +680,7 @@ static const struct dis386 dis386[] = {
   { "movQ",		Sw, Sv, XX },
   { "popU",		stackEv, XX, XX },
   /* 90 */
-  { "nop",		NOP_Fixup, 0, XX, XX },
+  { "xchgS",		NOP_Fixup1, eAX_reg, NOP_Fixup2, eAX_reg, XX },
   { "xchgS",		RMeCX, eAX, XX },
   { "xchgS",		RMeDX, eAX, XX },
   { "xchgS",		RMeBX, eAX, XX },
@@ -835,14 +836,14 @@ static const struct dis386 dis386_twobyt
   { PREGRP31 },
   { "movhpX",		EX, XM, SIMD_Fixup, 'l' },
   /* 18 */
-  { GRP14 },
-  { "(bad)",		XX, XX, XX },
+  { GRP16 },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
+  { "nopQ",		Ev, XX, XX },
   /* 20 */
   { "movZ",		Rm, Cm, XX },
   { "movZ",		Rm, Dm, XX },
@@ -935,9 +936,9 @@ static const struct dis386 dis386_twobyt
   { PREGRP19 },
   /* 70 */
   { PREGRP22 },
-  { GRP10 },
-  { GRP11 },
   { GRP12 },
+  { GRP13 },
+  { GRP14 },
   { "pcmpeqb",		MX, EM, XX },
   { "pcmpeqw",		MX, EM, XX },
   { "pcmpeqd",		MX, EM, XX },
@@ -1003,7 +1004,7 @@ static const struct dis386 dis386_twobyt
   { "btsS",		Ev, Gv, XX },
   { "shrdS",		Ev, Gv, Ib },
   { "shrdS",		Ev, Gv, CL },
-  { GRP13 },
+  { GRP15 },
   { "imulS",		Gv, Ev, XX },
   /* b0 */
   { "cmpxchgB",		Eb, Gb, XX },
@@ -1124,7 +1125,7 @@ static const unsigned char twobyte_has_m
   /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
   /*       -------------------------------        */
   /* 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 */
+  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1, /* 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,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 */
@@ -1431,7 +1432,7 @@ static const struct dis386 grps[][8] = {
     { "",	VM, XX, XX },		/* See OP_VMX.  */
     { "vmptrst", Eq, XX, XX },
   },
-  /* GRP10 */
+  /* GRP12 */
   {
     { "(bad)",	XX, XX, XX },
     { "(bad)",	XX, XX, XX },
@@ -1442,7 +1443,7 @@ static const struct dis386 grps[][8] = {
     { "psllw",	MS, Ib, XX },
     { "(bad)",	XX, XX, XX },
   },
-  /* GRP11 */
+  /* GRP13 */
   {
     { "(bad)",	XX, XX, XX },
     { "(bad)",	XX, XX, XX },
@@ -1453,7 +1454,7 @@ static const struct dis386 grps[][8] = {
     { "pslld",	MS, Ib, XX },
     { "(bad)",	XX, XX, XX },
   },
-  /* GRP12 */
+  /* GRP14 */
   {
     { "(bad)",	XX, XX, XX },
     { "(bad)",	XX, XX, XX },
@@ -1464,7 +1465,7 @@ static const struct dis386 grps[][8] = {
     { "psllq",	MS, Ib, XX },
     { "pslldq",	MS, Ib, XX },
   },
-  /* GRP13 */
+  /* GRP15 */
   {
     { "fxsave", Ev, XX, XX },
     { "fxrstor", Ev, XX, XX },
@@ -1475,7 +1476,7 @@ static const struct dis386 grps[][8] = {
     { "mfence", OP_0fae, 0, XX, XX },
     { "clflush", OP_0fae, 0, XX, XX },
   },
-  /* GRP14 */
+  /* GRP16 */
   {
     { "prefetchnta", Ev, XX, XX },
     { "prefetcht0", Ev, XX, XX },
@@ -4360,12 +4361,29 @@ OP_0fae (int bytemode, int sizeflag)
   OP_E (bytemode, sizeflag);
 }
 
+/* NOP is an alias of "xchg %ax,%ax" in 16bit mode, "xchg %eax,%eax" in
+   32bit mode and "xchg %rax,%rax" in 64bit mode.  NOP with REPZ prefix
+   is called PAUSE.  We display "xchg %ax,%ax" instead of "data16 nop".
+ */
+
 static void
-NOP_Fixup (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
+NOP_Fixup1 (int bytemode, int sizeflag)
 {
-  /* NOP with REPZ prefix is called PAUSE.  */
   if (prefixes == PREFIX_REPZ)
     strcpy (obuf, "pause");
+  else if (prefixes == PREFIX_DATA
+	   || ((rex & REX_MODE64) && rex != 0x48))
+    OP_REG (bytemode, sizeflag);
+  else
+    strcpy (obuf, "nop");
+}
+
+static void
+NOP_Fixup2 (int bytemode, int sizeflag)
+{
+  if (prefixes == PREFIX_DATA
+      || ((rex & REX_MODE64) && rex != 0x48))
+    OP_IMREG (bytemode, sizeflag);
 }
 
 static const char *const Suffix3DNow[] = {

binutils-2.17.50.0.2-x86-nops2.patch:
 config/tc-i386.c                          |  261 +++++++++++++++++++++++++++---
 testsuite/gas/i386/i386.exp               |   11 +
 testsuite/gas/i386/nops-1-i386.d          |  177 ++++++++++++++++++++
 testsuite/gas/i386/nops-1-i686.d          |  161 ++++++++++++++++++
 testsuite/gas/i386/nops-1-merom.d         |  156 +++++++++++++++++
 testsuite/gas/i386/nops-1.d               |  176 ++++++++++++++++++++
 testsuite/gas/i386/nops-1.s               |  147 ++++++++++++++++
 testsuite/gas/i386/nops-2-i386.d          |  166 +++++++++++++++++++
 testsuite/gas/i386/nops-2-merom.d         |  160 ++++++++++++++++++
 testsuite/gas/i386/nops-2.d               |  165 ++++++++++++++++++
 testsuite/gas/i386/nops-2.s               |  151 +++++++++++++++++
 testsuite/gas/i386/sse2.d                 |    2 
 testsuite/gas/i386/x86-64-nops-1-k8.d     |  177 ++++++++++++++++++++
 testsuite/gas/i386/x86-64-nops-1-merom.d  |  156 +++++++++++++++++
 testsuite/gas/i386/x86-64-nops-1-nocona.d |  161 ++++++++++++++++++
 testsuite/gas/i386/x86-64-nops-1.d        |  160 ++++++++++++++++++
 testsuite/gas/i386/x86-64-nops-1.s        |  147 ++++++++++++++++
 17 files changed, 2507 insertions(+), 27 deletions(-)

--- NEW FILE binutils-2.17.50.0.2-x86-nops2.patch ---
2006-06-23  H.J. Lu  <hongjiu.lu at intel.com>

	* config/tc-i386.c (cpu_arch_tune_set): New.
	(cpu_arch_isa): Likewise.
	(i386_align_code): Use xchg %ax,%ax for 2 byte nop. Optimize
	nops with short or long nop sequences based on -march=/.arch
	and -mtune=.
	(set_cpu_arch): Set cpu_arch_isa.  If cpu_arch_tune_set is 0,
	set cpu_arch_tune and cpu_arch_tune_flags.
	(md_parse_option): For -march=, set cpu_arch_isa and set
	cpu_arch_tune and cpu_arch_tune_flags if cpu_arch_tune_set is
	0.  Set cpu_arch_tune_set to 1 for -mtune=.
	(i386_target_format): Don't set cpu_arch_tune.
gas/testsuite/
	* gas/i386/i386.exp: Run nops-1, nops-1-i386, nops-1-i686,
	nops-1-merom, nops-2, nops-2-i386, nops-2-merom, x86-64-nops-1,
	x86-64-nops-1-k8, x86-64-nops-1-nocona and x86-64-nops-1-merom.

	* gas/i386/nops-1.s: New file.
	* gas/i386/nops-2.s: Likewise.
	* gas/i386/nops-1-i386.d: Likewise.
	* gas/i386/nops-1-i686.d: Likewise.
	* gas/i386/nops-1-merom.d: Likewise.
	* gas/i386/nops-1.d: Likewise.
	* gas/i386/nops-2-i386.d: Likewise.
	* gas/i386/nops-2-merom.d: Likewise.
	* gas/i386/nops-2.d: Likewise.
	* gas/i386/x86-64-nops-1.s: Likewise.
	* gas/i386/x86-64-nops-1-k8.d: Likewise.
	* gas/i386/x86-64-nops-1-merom.d: Likewise.
	* gas/i386/x86-64-nops-1-nocona.d: Likewise.
	* gas/i386/x86-64-nops-1.d: Likewise.

	* gas/i386/sse2.d: Updated to expect xchg %ax,%ax as 2 byte
	nop.

--- gas/config/tc-i386.c	16 Jun 2006 15:46:11 -0000	1.217
+++ gas/config/tc-i386.c	23 Jun 2006 21:47:36 -0000	1.218
@@ -323,12 +323,18 @@ static const char *cpu_sub_arch_name = N
 /* CPU feature flags.  */
 static unsigned int cpu_arch_flags = CpuUnknownFlags | CpuNo64;
 
+/* If we have selected a cpu we are generating instructions for.  */
+static int cpu_arch_tune_set = 0;
+
 /* Cpu we are generating instructions for.  */
 static enum processor_type cpu_arch_tune = PROCESSOR_UNKNOWN;
 
 /* CPU feature flags of cpu we are generating instructions for.  */
 static unsigned int cpu_arch_tune_flags = 0;
 
+/* CPU instruction set architecture used.  */
+static enum processor_type cpu_arch_isa = PROCESSOR_UNKNOWN;
+
 /* CPU feature flags of instruction set architecture used.  */
 static unsigned int cpu_arch_isa_flags = 0;
 
@@ -562,7 +568,7 @@ i386_align_code (fragP, count)
   static const char f32_1[] =
     {0x90};					/* nop			*/
   static const char f32_2[] =
-    {0x89,0xf6};				/* movl %esi,%esi	*/
+    {0x66,0x90};				/* xchg %ax,%ax */
   static const char f32_3[] =
     {0x8d,0x76,0x00};				/* leal 0(%esi),%esi	*/
   static const char f32_4[] =
@@ -622,13 +628,140 @@ i386_align_code (fragP, count)
     f32_1, f32_2, f16_3, f16_4, f16_5, f16_6, f16_7, f16_8,
     f32_15, f32_15, f32_15, f32_15, f32_15, f32_15, f32_15
   };
+  /* nopl (%[re]ax) */
+  static const char alt_3[] =
+    {0x0f,0x1f,0x00};
+  /* nopl 0(%[re]ax) */
+  static const char alt_4[] =
+    {0x0f,0x1f,0x40,0x00};
+  /* nopl 0(%[re]ax,%[re]ax,1) */
+  static const char alt_5[] =
+    {0x0f,0x1f,0x44,0x00,0x00};
+  /* nopw 0(%[re]ax,%[re]ax,1) */
+  static const char alt_6[] =
+    {0x66,0x0f,0x1f,0x44,0x00,0x00};
+  /* nopl 0L(%[re]ax) */
+  static const char alt_7[] =
+    {0x0f,0x1f,0x80,0x00,0x00,0x00,0x00};
+  /* nopl 0L(%[re]ax,%[re]ax,1) */
+  static const char alt_8[] =
+    {0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* nopw 0L(%[re]ax,%[re]ax,1) */
+  static const char alt_9[] =
+    {0x66,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_10[] =
+    {0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* data16
+     nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_long_11[] =
+    {0x66,
+     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* data16
+     data16
+     nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_long_12[] =
+    {0x66,
+     0x66,
+     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* data16
+     data16
+     data16
+     nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_long_13[] =
+    {0x66,
+     0x66,
+     0x66,
+     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* data16
+     data16
+     data16
+     data16
+     nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_long_14[] =
+    {0x66,
+     0x66,
+     0x66,
+     0x66,
+     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* data16
+     data16
+     data16
+     data16
+     data16
+     nopw %cs:0L(%[re]ax,%[re]ax,1) */
+  static const char alt_long_15[] =
+    {0x66,
+     0x66,
+     0x66,
+     0x66,
+     0x66,
+     0x66,0x2e,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  /* nopl 0(%[re]ax,%[re]ax,1)
+     nopw 0(%[re]ax,%[re]ax,1) */
+  static const char alt_short_11[] =
+    {0x0f,0x1f,0x44,0x00,0x00,
+     0x66,0x0f,0x1f,0x44,0x00,0x00};
+  /* nopw 0(%[re]ax,%[re]ax,1)
+     nopw 0(%[re]ax,%[re]ax,1) */
+  static const char alt_short_12[] =
+    {0x66,0x0f,0x1f,0x44,0x00,0x00,
+     0x66,0x0f,0x1f,0x44,0x00,0x00};
+  /* nopw 0(%[re]ax,%[re]ax,1)
+     nopl 0L(%[re]ax) */
+  static const char alt_short_13[] =
+    {0x66,0x0f,0x1f,0x44,0x00,0x00,
+     0x0f,0x1f,0x80,0x00,0x00,0x00,0x00};
+  /* nopl 0L(%[re]ax)
+     nopl 0L(%[re]ax) */
+  static const char alt_short_14[] =
+    {0x0f,0x1f,0x80,0x00,0x00,0x00,0x00,
+     0x0f,0x1f,0x80,0x00,0x00,0x00,0x00};
+  /* nopl 0L(%[re]ax)
+     nopl 0L(%[re]ax,%[re]ax,1) */
+  static const char alt_short_15[] =
+    {0x0f,0x1f,0x80,0x00,0x00,0x00,0x00,
+     0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00};
+  static const char *const alt_short_patt[] = {
+    f32_1, f32_2, alt_3, alt_4, alt_5, alt_6, alt_7, alt_8,
+    alt_9, alt_10, alt_short_11, alt_short_12, alt_short_13,
+    alt_short_14, alt_short_15
+  };
+  static const char *const alt_long_patt[] = {
+    f32_1, f32_2, alt_3, alt_4, alt_5, alt_6, alt_7, alt_8,
+    alt_9, alt_10, alt_long_11, alt_long_12, alt_long_13,
+    alt_long_14, alt_long_15
+  };
 
   if (count <= 0 || count > 15)
     return;
 
-  /* The recommended way to pad 64bit code is to use NOPs preceded by
-     maximally four 0x66 prefixes.  Balance the size of nops.  */
-  if (flag_code == CODE_64BIT)
+  /* We need to decide which NOP sequence to use for 32bit and
+     64bit. When -mtune= is used:
+  
+     1. For PROCESSOR_I486, PROCESSOR_PENTIUM and PROCESSOR_GENERIC32,
+     f32_patt will be used.
+     2. For PROCESSOR_K8 in 64bit, NOPs with 0x66 prefixe will be used.
+     3. For PROCESSOR_MEROM, alt_long_patt will be used.
+     4. For PROCESSOR_PENTIUMPRO, PROCESSOR_PENTIUM4, PROCESSOR_NOCONA,
+     PROCESSOR_YONAH, PROCESSOR_MEROM, PROCESSOR_K6, PROCESSOR_ATHLON
+     and PROCESSOR_GENERIC64, alt_short_patt will be used.
+
+     When -mtune= isn't used, alt_short_patt will be used if
+     cpu_arch_isa_flags has Cpu686. Otherwise, f32_patt will be used.
+
+     When -march= or .arch is used, we can't use anything beyond
+     cpu_arch_isa_flags.   */
+
+  if (flag_code == CODE_16BIT)
[...2319 lines suppressed...]
+[	 ]*ab:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%rax,%rax,1\)
+
+0+b0 <nop4>:
+[	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%rax\)
+
+0+c0 <nop3>:
+[	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*cd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%rax\)
+
+0+d0 <nop2>:
+[	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d1:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d2:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d3:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d4:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d5:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d6:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d7:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d8:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*d9:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*da:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*db:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*dd:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*de:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+#pass
--- gas/testsuite/gas/i386/x86-64-nops-1.s	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/x86-64-nops-1.s	23 Jun 2006 21:47:36 -0000	1.1
@@ -0,0 +1,147 @@
+	.text
+nop15:
+	nop
+	.p2align 4
+
+nop14:
+	nop
+	nop
+	.p2align 4
+
+nop13:
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop12:
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop11:
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop10:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop9:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop8:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop7:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop6:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop5:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop4:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop3:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4
+
+nop2:
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	.p2align 4

binutils-2.17.50.0.2-hash-style.patch:
 bfd/elf-bfd.h                      |    7 
 bfd/elf.c                          |   23 +
 bfd/elf32-i386.c                   |   13 +
 bfd/elf64-x86-64.c                 |   15 +
 bfd/elflink.c                      |  466 +++++++++++++++++++++++++++++++------
 bfd/elfxx-target.h                 |    5 
 binutils/readelf.c                 |  175 +++++++++++++
 include/bfdlink.h                  |    6 
 include/elf/common.h               |    2 
 ld/emultempl/elf32.em              |   21 +
 ld/ld.texinfo                      |    8 
 ld/ldmain.c                        |    2 
 ld/scripttempl/elf.sc              |    1 
 ld/testsuite/ld-powerpc/tlsso.g    |    2 
 ld/testsuite/ld-powerpc/tlsso.r    |    6 
 ld/testsuite/ld-powerpc/tlsso32.d  |    2 
 ld/testsuite/ld-powerpc/tlsso32.g  |    2 
 ld/testsuite/ld-powerpc/tlsso32.r  |    6 
 ld/testsuite/ld-powerpc/tlstocso.g |    2 
 19 files changed, 687 insertions(+), 77 deletions(-)

Index: binutils-2.17.50.0.2-hash-style.patch
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils-2.17.50.0.2-hash-style.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.17.50.0.2-hash-style.patch	10 Jul 2006 22:05:38 -0000	1.1
+++ binutils-2.17.50.0.2-hash-style.patch	14 Jul 2006 16:24:36 -0000	1.2
@@ -1,3 +1,8 @@
+2006-07-14  Jakub Jelinek  <jakub at redhat.com>
+
+	* elflink.c (bfd_elf_size_dynsym_hash_dynstr): Fix cinfo.shift2
+	value.
+
 2006-07-10  Jakub Jelinek  <jakub at redhat.com>
 
 include/
@@ -777,7 +782,7 @@
 +	      else
 +		cinfo.shift1 = 5;
 +	      cinfo.mask = (1 << cinfo.shift1) - 1;
-+	      cinfo.shift2 = maskbitslog2 + cinfo.shift1;
++	      cinfo.shift2 = maskbitslog2;
 +	      cinfo.maskbits = 1 << maskbitslog2;
 +	      maskwords = 1 << (maskbitslog2 - cinfo.shift1);
 +	      amt = bucketcount * sizeof (unsigned long int) * 2;


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- binutils.spec	11 Jul 2006 09:42:50 -0000	1.92
+++ binutils.spec	14 Jul 2006 16:24:36 -0000	1.93
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.2
-Release: 7
+Release: 8
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -21,6 +21,12 @@
 Patch12: binutils-2.17.50.0.2-tls_common.patch
 Patch13: binutils-2.17.50.0.2-bz2513.patch
 Patch14: binutils-2.17.50.0.2-hash-style.patch
+Patch15: binutils-2.17.50.0.2-power6.patch
+Patch16: binutils-2.17.50.0.2-power6-insns.patch
+Patch17: binutils-2.17.50.0.2-x86-nops.patch
+Patch18: binutils-2.17.50.0.2-x86-march.patch
+Patch19: binutils-2.17.50.0.2-x86-nops2.patch
+Patch20: binutils-2.17.50.0.2-amdfam10.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -65,6 +71,12 @@
 %patch12 -p0 -b .tls_common~
 %patch13 -p0 -b .bz2513~
 %patch14 -p0 -b .hash-style~
+%patch15 -p0 -b .power6~
+%patch16 -p0 -b .power6-insns~
+%patch17 -p0 -b .x86-nops~
+%patch18 -p0 -b .x86-march~
+%patch19 -p0 -b .x86-nops2~
+%patch20 -p0 -b .amdfam10~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -176,6 +188,12 @@
 %{_infodir}/*info*
 
 %changelog
+* Fri Jul 14 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-8
+- add support for new AMDFAM10 instructions (#198281, IT#97662)
+- add -march=/-mtune= gas support on x86/x86-64
+- x86/x86-64 nop insn improvements
+- fix DT_GNU_HASH shift count value computation
+
 * Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-7
 - add DT_GNU_HASH support (--hash-style=gnu and --hash-style=both
   ld options)



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:37:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:37:45 -0400
Subject: rpms/kernel/devel/configs config-generic,1.227,1.228
Message-ID: <200607141637.k6EGbjYI016276@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
reenable


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- config-generic	14 Jul 2006 15:03:48 -0000	1.227
+++ config-generic	14 Jul 2006 16:37:43 -0000	1.228
@@ -1464,7 +1464,7 @@
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_COMPUTONE is not set
-# CONFIG_CYCLADES is not set
+CONFIG_CYCLADES=m
 # CONFIG_DIGIEPCA is not set
 # CONFIG_ESPSERIAL is not set
 # CONFIG_MOXA_INTELLIO is not set
@@ -1476,7 +1476,7 @@
 # CONFIG_RIO is not set
 # CONFIG_STALLION is not set
 # CONFIG_ISTALLION is not set
-# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_JSM=m
 
 #
 # Non-8250 serial port support



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:44:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:44:46 -0400
Subject: rpms/gthumb/devel gthumb.spec,1.45,1.46
Message-ID: <200607141644.k6EGikJc018836@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18762

Modified Files:
	gthumb.spec 
Log Message:
Fix build on s390



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gthumb.spec	12 Jul 2006 22:18:19 -0000	1.45
+++ gthumb.spec	14 Jul 2006 16:44:43 -0000	1.46
@@ -10,7 +10,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.7.7
-Release: 3
+Release: 4
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -26,12 +26,12 @@
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libpng-devel
 BuildRequires: gettext
-BuildRequires: gphoto2-devel >= %{gphoto_version}
 
 # Needed or features are missing
 %ifnarch s390 s390x
-BuildRequires: gphoto2-devel
+BuildRequires: gphoto2-devel >= %{gphoto_version}
 %endif
+
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
@@ -111,6 +111,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.7-4
+- Don't BR gphoto2-devel on s390
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.7.7-3
 - rebuild
 - Don't get gphoto2 on s390(x)



From fedora-cvs-commits at redhat.com  Fri Jul 14 16:48:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 12:48:44 -0400
Subject: rpms/bitstream-vera-fonts/devel bitstream-vera-fonts.spec,1.6,1.7
Message-ID: <200607141648.k6EGmiRD002708@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/bitstream-vera-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2644

Modified Files:
	bitstream-vera-fonts.spec 
Log Message:
- remove ghost file fonts.cache-1 as fontconfig uses out of tree
  cache files now.



Index: bitstream-vera-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/bitstream-vera-fonts/devel/bitstream-vera-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bitstream-vera-fonts.spec	12 Jul 2006 05:27:20 -0000	1.6
+++ bitstream-vera-fonts.spec	14 Jul 2006 16:48:42 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:      bitstream-vera-fonts
 Version:   1.10
-Release: 5.1.1
+Release:   6
 Summary:   Bitstream Vera Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -31,10 +31,6 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.ttf  $RPM_BUILD_ROOT%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not 
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1
-
 
 %clean
 /bin/rm -rf $RPM_BUILD_ROOT
@@ -58,10 +54,13 @@
 %doc *.TXT
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
 
 
 %changelog
+* Fri Jul 14 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.10-6
+- remove ghost file fonts.cache-1 as fontconfig uses out of tree
+  cache files now.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-5.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 17:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 13:16:15 -0400
Subject: rpms/binutils/devel binutils.spec,1.93,1.94
Message-ID: <200607141716.k6EHGFuR017272@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.2-8


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- binutils.spec	14 Jul 2006 16:24:36 -0000	1.93
+++ binutils.spec	14 Jul 2006 17:16:13 -0000	1.94
@@ -81,7 +81,7 @@
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
 perl -pi -e 's/i\[3-7\]86/i[34567]86/g' */conf*
-sed -i -e 's/%{version}/%{version}gnu_hash/g' bfd/configure{.in,}
+sed -i -e 's/%{version}/%{version}-%{release}/g' bfd/configure{.in,}
 touch */configure
 
 %build



From fedora-cvs-commits at redhat.com  Fri Jul 14 17:19:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 13:19:51 -0400
Subject: rpms/openCryptoki/devel openCryptoki.spec,1.25,1.26
Message-ID: <200607141719.k6EHJpfs027195@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openCryptoki/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27168

Modified Files:
	openCryptoki.spec 
Log Message:
fix missing br


Index: openCryptoki.spec
===================================================================
RCS file: /cvs/dist/rpms/openCryptoki/devel/openCryptoki.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openCryptoki.spec	12 Jul 2006 22:24:02 -0000	1.25
+++ openCryptoki.spec	14 Jul 2006 17:19:49 -0000	1.26
@@ -1,7 +1,7 @@
 Name: openCryptoki
 Summary: Implementation of Cryptoki v2.11 for IBM Crypto Hardware
 Version: 2.2.4
-Release: 2
+Release: 3
 License: Other License(s), see package
 Group: Productivity/Security
 Source: opencryptoki-%{version}.tar.bz2
@@ -9,7 +9,7 @@
 Url: http://oss.software.ibm.com/developerworks/opensource/opencryptoki
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 PreReq: shadow-utils coreutils sed
-BuildRequires: openssl-devel >= 0.9.8a-5, automake
+BuildRequires: openssl-devel >= 0.9.8a-5, automake, libtool
 ExclusiveArch: s390 s390x
 %ifarch s390x
 Requires: PKCS11_API.so PKCS11_ICA.so  
@@ -81,9 +81,9 @@
 %{_libdir}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.4-2
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.2.4-3
 - rebuild
-- Add missing br automake
+- Add missing br automake, libtool
 
 * Fri May 12 2006 Phil Knirsch <pknirsch at redhat.com> - 2.2.4-1
 - Updated to opencryptoki-2.2.4 (#184631)



From fedora-cvs-commits at redhat.com  Fri Jul 14 17:31:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 13:31:49 -0400
Subject: rpms/libglade2/devel libglade2.spec,1.24,1.25
Message-ID: <200607141731.k6EHVnA9031305@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libglade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31238

Modified Files:
	libglade2.spec 
Log Message:
fix missing BR



Index: libglade2.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libglade2.spec	12 Jul 2006 06:46:44 -0000	1.24
+++ libglade2.spec	14 Jul 2006 17:31:41 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: The libglade library for loading user interfaces.
 Name: libglade2
 Version: 2.6.0
-Release: 1
+Release: 2 
 License: LGPL
 Group: System Environment/Libraries
 Source: libglade-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 BuildRequires: fontconfig
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: libtool
+BuildRequires: gettext-devel
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=121025
 Patch1: libglade-2.0.1-nowarning.patch
@@ -85,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.0-2
+- BuildRequire gettext
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.0-1
 - Update to 2.6.0
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 17:42:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 13:42:35 -0400
Subject: rpms/ifd-egate/devel ifd-egate-0.05-write.patch, NONE,
	1.1 ifd-egate.spec, 1.3, 1.4
Message-ID: <200607141742.k6EHgZ6Y001779@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/ifd-egate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1563

Modified Files:
	ifd-egate.spec 
Added Files:
	ifd-egate-0.05-write.patch 
Log Message:


Fix spurious error message, patch by Tomas


ifd-egate-0.05-write.patch:
 egate.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ifd-egate-0.05-write.patch ---
--- ifd-egate-0.05/egate.c.write	2006-07-13 11:32:11.000000000 +0200
+++ ifd-egate-0.05/egate.c	2006-07-13 14:23:15.000000000 +0200
@@ -220,7 +220,7 @@
             write_bytes=len_out - 5;
             if (write_bytes == buffer_out[4] + 1)
                    read_bytes=buffer_out[len_out-1];
-	    else if (len_out != buffer_out[4])
+	    else if (write_bytes != buffer_out[4])
                     syslog(LOG_ERR,
                            "Buffer length probably incorrect -- help!");
         } else { /* no Lc, so P3 is Le */


Index: ifd-egate.spec
===================================================================
RCS file: /cvs/dist/rpms/ifd-egate/devel/ifd-egate.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ifd-egate.spec	12 Jul 2006 06:23:50 -0000	1.3
+++ ifd-egate.spec	14 Jul 2006 17:42:32 -0000	1.4
@@ -4,7 +4,7 @@
 
 Name: ifd-egate
 Version: 0.05 
-Release: 10.1
+Release: 11
 Summary: Axalto Egate SmartCard device driver for PCSC-lite
 Group: System Environment/Base
 License: BSD/LGPL
@@ -12,6 +12,7 @@
 Source: ifd-egate-%{version}.tar.gz
 Patch0: ifd-egate-0.05-timing.patch
 Patch1: ifd-egate-0.05-makefile.patch
+Patch2: ifd-egate-0.05-write.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcsc-lite-devel
 BuildRequires: libusb-devel >= %{libusb_version}
@@ -28,6 +29,7 @@
 %setup -q
 %patch0 -p1 -b .timing
 %patch1 -p1 -b .makefile
+%patch2 -p1 -b .write
 
 %build
 make %{?_smp_mflags}
@@ -51,7 +53,10 @@
 %{dropdir}/ifd-egate.bundle/
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 13 2006 Bob Relyea <rrelyea at redhat.com>     0.05-11
+- Fix long standing incorrect error message. patch by tmraz
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.05-10.1
 - rebuild
 
 * Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com>     0.05-10



From fedora-cvs-commits at redhat.com  Fri Jul 14 17:47:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 13:47:27 -0400
Subject: rpms/coolkey/devel .cvsignore, 1.2, 1.3 coolkey.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200607141747.k6EHlRLF011680@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/coolkey/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7766/devel

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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/coolkey/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jun 2006 22:59:00 -0000	1.2
+++ .cvsignore	14 Jul 2006 17:47:24 -0000	1.3
@@ -1 +1 @@
-coolkey-1.0.0.tar.gz
+coolkey-1.0.1.tar.gz


Index: coolkey.spec
===================================================================
RCS file: /cvs/dist/rpms/coolkey/devel/coolkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- coolkey.spec	10 Jul 2006 21:52:09 -0000	1.3
+++ coolkey.spec	14 Jul 2006 17:47:24 -0000	1.4
@@ -18,8 +18,8 @@
 # END COPYRIGHT BLOCK
 
 Name: coolkey
-Version: 1.0.0
-Release: 2
+Version: 1.0.1
+Release: 1
 Summary: CoolKey PKCS #11 module
 License: LGPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.1-1
+- Don't require pthread library in coolkey
+
 * Mon Jul 10 2006 Bob Relyea <rrelyea at redhat.com> - 1.0.0-2
 - remove s390 from the build
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/coolkey/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jun 2006 22:59:00 -0000	1.2
+++ sources	14 Jul 2006 17:47:24 -0000	1.3
@@ -1 +1 @@
-5e5a107756fae17407cd441c2de8f67b  coolkey-1.0.0.tar.gz
+e63808c533faddc2a5398e5b2e135e66  coolkey-1.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 14 18:02:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 14:02:46 -0400
Subject: rpms/libselinux/FC-5 libselinux-rhat.patch, 1.78,
	1.79 libselinux.spec, 1.189, 1.190
Message-ID: <200607141802.k6EI2keC029254@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-5.fc5
- Add getpolicytype


libselinux-rhat.patch:
 include/selinux/selinux.h  |    3 
 man/man3/getfscreatecon.3  |    4 
 man/man3/matchpathcon.3    |   11 ++
 man/man8/booleans.8        |   24 +---
 src/booleans.c             |    2 
 src/canonicalize_context.c |    8 +
 src/check_context.c        |    5 
 src/compute_av.c           |    8 +
 src/compute_create.c       |    8 +
 src/compute_member.c       |    8 +
 src/compute_relabel.c      |    8 +
 src/compute_user.c         |    8 +
 src/context.c              |    8 -
 src/disable.c              |    5 
 src/enabled.c              |    8 +
 src/getcon.c               |    3 
 src/getenforce.c           |    5 
 src/getexeccon.c           |    3 
 src/getfscreatecon.c       |    3 
 src/getpidcon.c            |    3 
 src/getprevcon.c           |    3 
 src/init.c                 |    6 -
 src/load_policy.c          |    5 
 src/matchmediacon.c        |    2 
 src/matchpathcon.c         |   27 +++++
 src/policyvers.c           |    5 
 src/selinux.py             |    1 
 src/selinux_config.c       |   24 ++++
 src/selinux_internal.h     |    1 
 src/selinuxswig.i          |   14 ++
 src/selinuxswig_wrap.c     |  228 ++++++++++++++++++++++-----------------------
 src/setenforce.c           |    5 
 utils/avcstat.c            |   18 +--
 utils/matchpathcon.c       |    1 
 34 files changed, 298 insertions(+), 177 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.78 -r 1.79 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- libselinux-rhat.patch	22 Jun 2006 15:52:02 -0000	1.78
+++ libselinux-rhat.patch	14 Jul 2006 18:02:43 -0000	1.79
@@ -1,5 +1,149 @@
---- libselinux-1.30.3/src/check_context.c.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/check_context.c	2006-06-22 11:47:35.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.30.3/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/include/selinux/selinux.h	2006-07-14 13:59:50.000000000 -0400
+@@ -310,6 +310,9 @@
+    regexes that have stems that are prefixes of 'prefix'. */
+ extern int matchpathcon_init_prefix(const char *path, const char *prefix);
+ 
++/* Free the memory allocated by matchpathcon_init. */
++extern void matchpathcon_fini(void);
++
+ /* Match the specified pathname and mode against the file contexts
+    configuration and set *con to refer to the resulting context.
+    'mode' can be 0 to disable mode matching.
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfscreatecon.3 libselinux-1.30.3/man/man3/getfscreatecon.3
+--- nsalibselinux/man/man3/getfscreatecon.3	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/getfscreatecon.3	2006-07-14 13:59:50.000000000 -0400
+@@ -32,9 +32,7 @@
+ save, reset, and restore the fscreate context to avoid unexpected behaviors.
+ .SH "RETURN VALUE"
+ On error -1 is returned.
+-
+-On success getfscreatecon returns the length of the context (not including
+-the trailing zero byte).  On success setfscreatecon returns 0.
++On success 0 is returned.
+ 
+ .SH "SEE ALSO"
+ .BR freecon "(3), " getcon "(3), " getexeccon "(3)"
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-1.30.3/man/man3/matchpathcon.3
+--- nsalibselinux/man/man3/matchpathcon.3	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man3/matchpathcon.3	2006-07-14 13:59:50.000000000 -0400
+@@ -7,6 +7,8 @@
+ .sp
+ .BI "int matchpathcon_init(const char *" path ");"
+ .br
++.BI "int matchpathcon_fini(void);"
++.br
+ .BI "int matchpathcon(const char *" path ", mode_t " mode ", security_context_t *" con);
+ .sp
+ .br 
+@@ -40,6 +42,15 @@
+ customizations.
+ .br 
+ .sp
++.B matchpathcon_fini
++frees the memory allocated by a prior call to
++.B matchpathcon_init.
++This function can be used to free and reset the internal state between multiple 
++.B matchpathcon_init 
++calls, or to free memory when finished using 
++.B matchpathcon.
++.br
++.sp
+ .B matchpathcon 
+ matches the specified pathname and mode against the file contexts
+ configuration and sets the security context 
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.3/man/man8/booleans.8
+--- nsalibselinux/man/man8/booleans.8	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/man/man8/booleans.8	2006-07-14 13:59:50.000000000 -0400
+@@ -17,17 +17,13 @@
+ value.  
+ 
+ The policy defines a default value for each boolean, typically false.
+-These default values can be overridden at boot-time based on the
+-settings in the
+-.I /etc/selinux/SELINUXTYPE/booleans
+-file, where
+-SELINUXTYPE is the type of policy currently being run on the system as
+-defined in the
+-.I /etc/selinux/config
+-file.  The
++These default values can be overridden via local settings created via the
++.B setsebool(8)
++utility, using -P to make the setting persistent across reboots.
++The 
+ .B system-config-securitylevel
+-tool provides an interface for altering
+-the settings in this file.  The
++tool provides a graphical interface for altering
++the settings.  The
+ .B load_policy(8)
+ program will preserve
+ current boolean settings upon a policy reload by default, or can
+@@ -41,8 +37,9 @@
+ .B setsebool(8)
+ utility or the
+ .B togglesebool
+-utility.  These utilities only change the
+-current boolean value and do not affect the boot-time settings.
++utility.  By default, these utilities only change the
++current boolean value and do not affect the persistent settings,
++unless the -P option is used to setsebool.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+@@ -50,6 +47,3 @@
+ 
+ .SH "SEE ALSO"
+ getsebool(8), setsebool(8), selinux(8), togglesebool(8)
+-
+-.SH FILES
+-/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/booleans.c libselinux-1.30.3/src/booleans.c
+--- nsalibselinux/src/booleans.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/booleans.c	2006-07-14 13:59:50.000000000 -0400
+@@ -309,7 +309,7 @@
+ 		int val;
+ 		char boolname[BUFSIZ];
+ 		char *buffer;
+-		char *inbuf=NULL;
++		inbuf=NULL;
+ 		__fsetlocking(boolf, FSETLOCKING_BYCALLER);
+ 		while ((len=getline(&inbuf, &size, boolf)) > 0) {
+ 			buffer=strdup(inbuf);
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/canonicalize_context.c libselinux-1.30.3/src/canonicalize_context.c
+--- nsalibselinux/src/canonicalize_context.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/canonicalize_context.c	2006-07-14 13:59:50.000000000 -0400
+@@ -5,7 +5,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <asm/page.h>
+ #include "selinux_internal.h"
+ #include "policy.h"
+ #include <limits.h>
+@@ -18,12 +17,17 @@
+ 	size_t size;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/context", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0)
+ 		return -1;
+ 
+-	size = PAGE_SIZE;
++	size = selinux_page_size;
+ 	buf = malloc(size);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/check_context.c libselinux-1.30.3/src/check_context.c
+--- nsalibselinux/src/check_context.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/check_context.c	2006-07-14 13:59:50.000000000 -0400
 @@ -14,6 +14,11 @@
  	char path[PATH_MAX];
  	int fd, ret;
@@ -12,8 +156,9 @@
  	snprintf(path, sizeof path, "%s/context", selinux_mnt);
  	fd = open(path, O_RDWR);
  	if (fd < 0)
---- libselinux-1.30.3/src/canonicalize_context.c.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/canonicalize_context.c	2006-06-22 11:48:08.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_av.c libselinux-1.30.3/src/compute_av.c
+--- nsalibselinux/src/compute_av.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_av.c	2006-07-14 13:59:50.000000000 -0400
 @@ -5,7 +5,6 @@
  #include <stdio.h>
  #include <errno.h>
@@ -22,7 +167,37 @@
  #include "selinux_internal.h"
  #include "policy.h"
  #include <limits.h>
-@@ -18,12 +17,17 @@
+@@ -21,12 +20,17 @@
+ 	size_t len;
+ 	int fd, ret;
+ 
++	if (!selinux_mnt) {
++		errno = ENOENT;
++		return -1;
++	}
++
+ 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
+ 	fd = open(path, O_RDWR);
+ 	if (fd < 0) 
+ 		return -1;
+ 
+-	len = PAGE_SIZE;
++	len = selinux_page_size;
+ 	buf = malloc(len);
+ 	if (!buf) {
+ 		ret = -1;
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/compute_create.c libselinux-1.30.3/src/compute_create.c
+--- nsalibselinux/src/compute_create.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/compute_create.c	2006-07-14 13:59:50.000000000 -0400
+@@ -5,7 +5,6 @@
[...1787 lines suppressed...]
-+	spec_arr = NULL;
-+	nspec = 0;
-+	
-+	for (i = 0; i < (unsigned int)num_stems; i++) {
-+		stem = &stem_arr[i];
-+		free(stem->buf);
-+	}
-+	free(stem_arr);
-+	stem_arr = NULL;
-+	num_stems = 0;
-+	alloc_stems = 0;
+ 
++SWIGINTERN PyObject *_wrap_selinux_getpolicytype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
++  PyObject *resultobj = 0;
++  char **arg1 = (char **) 0 ;
++  int result;
++  char *temp1 ;
++  
++  {
++    arg1 = &temp1;
++  }
++  if (!PyArg_ParseTuple(args,(char *)":selinux_getpolicytype")) SWIG_fail;
++  result = (int)selinux_getpolicytype(arg1);
++  resultobj = SWIG_From_int((int)(result));
++  {
++    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromString(*arg1));
++  }
++  return resultobj;
++fail:
++  return NULL;
 +}
 +
- static int matchpathcon_common(const char *name, 
- 			       mode_t mode)
- {
---- libselinux-1.30.3/src/compute_relabel.c.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/src/compute_relabel.c	2006-06-22 11:48:46.000000000 -0400
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <asm/page.h>
- #include "selinux_internal.h"
- #include "policy.h"
- #include <limits.h>
-@@ -20,12 +19,17 @@
- 	size_t size;
- 	int fd, ret;
++
+ SWIGINTERN PyObject *_wrap_getseuserbyname(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   char *arg1 = (char *) 0 ;
+@@ -4273,6 +4274,7 @@
+ 	 { (char *)"is_context_customizable", _wrap_is_context_customizable, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_trans_to_raw_context", _wrap_selinux_trans_to_raw_context, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_raw_to_trans_context", _wrap_selinux_raw_to_trans_context, METH_VARARGS, NULL},
++	 { (char *)"selinux_getpolicytype", _wrap_selinux_getpolicytype, METH_VARARGS, NULL},
+ 	 { (char *)"getseuserbyname", _wrap_getseuserbyname, METH_VARARGS, NULL},
+ 	 { NULL, NULL, 0, NULL }
+ };
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/setenforce.c libselinux-1.30.3/src/setenforce.c
+--- nsalibselinux/src/setenforce.c	2006-04-14 07:21:53.000000000 -0400
++++ libselinux-1.30.3/src/setenforce.c	2006-07-14 13:59:50.000000000 -0400
+@@ -15,6 +15,11 @@
+ 	char path[PATH_MAX];
+ 	char buf[20];
  
 +	if (!selinux_mnt) {
 +		errno = ENOENT;
 +		return -1;
 +	}
 +
- 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
+ 	snprintf(path, sizeof path, "%s/enforce", selinux_mnt);
  	fd = open(path, O_RDWR);
  	if (fd < 0)
- 		return -1;
- 
--	size = PAGE_SIZE;
-+	size = selinux_page_size;
- 	buf = malloc(size);
- 	if (!buf) {
- 		ret = -1;
---- libselinux-1.30.3/man/man8/booleans.8.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man8/booleans.8	2006-06-22 11:46:36.000000000 -0400
-@@ -17,17 +17,13 @@
- value.  
- 
- The policy defines a default value for each boolean, typically false.
--These default values can be overridden at boot-time based on the
--settings in the
--.I /etc/selinux/SELINUXTYPE/booleans
--file, where
--SELINUXTYPE is the type of policy currently being run on the system as
--defined in the
--.I /etc/selinux/config
--file.  The
-+These default values can be overridden via local settings created via the
-+.B setsebool(8)
-+utility, using -P to make the setting persistent across reboots.
-+The 
- .B system-config-securitylevel
--tool provides an interface for altering
--the settings in this file.  The
-+tool provides a graphical interface for altering
-+the settings.  The
- .B load_policy(8)
- program will preserve
- current boolean settings upon a policy reload by default, or can
-@@ -41,8 +37,9 @@
- .B setsebool(8)
- utility or the
- .B togglesebool
--utility.  These utilities only change the
--current boolean value and do not affect the boot-time settings.
-+utility.  By default, these utilities only change the
-+current boolean value and do not affect the persistent settings,
-+unless the -P option is used to setsebool.
- 
- .SH AUTHOR	
- This manual page was written by Dan Walsh <dwalsh at redhat.com>.
-@@ -50,6 +47,3 @@
- 
- .SH "SEE ALSO"
- getsebool(8), setsebool(8), selinux(8), togglesebool(8)
--
--.SH FILES
--/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
---- libselinux-1.30.3/man/man3/getfscreatecon.3.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man3/getfscreatecon.3	2006-06-22 11:46:36.000000000 -0400
-@@ -32,9 +32,7 @@
- save, reset, and restore the fscreate context to avoid unexpected behaviors.
- .SH "RETURN VALUE"
- On error -1 is returned.
--
--On success getfscreatecon returns the length of the context (not including
--the trailing zero byte).  On success setfscreatecon returns 0.
-+On success 0 is returned.
- 
- .SH "SEE ALSO"
- .BR freecon "(3), " getcon "(3), " getexeccon "(3)"
---- libselinux-1.30.3/man/man3/matchpathcon.3.rhat	2006-04-14 07:21:53.000000000 -0400
-+++ libselinux-1.30.3/man/man3/matchpathcon.3	2006-06-22 11:46:36.000000000 -0400
-@@ -7,6 +7,8 @@
- .sp
- .BI "int matchpathcon_init(const char *" path ");"
- .br
-+.BI "int matchpathcon_fini(void);"
-+.br
- .BI "int matchpathcon(const char *" path ", mode_t " mode ", security_context_t *" con);
- .sp
- .br 
-@@ -40,6 +42,15 @@
- customizations.
- .br 
- .sp
-+.B matchpathcon_fini
-+frees the memory allocated by a prior call to
-+.B matchpathcon_init.
-+This function can be used to free and reset the internal state between multiple 
-+.B matchpathcon_init 
-+calls, or to free memory when finished using 
-+.B matchpathcon.
-+.br
-+.sp
- .B matchpathcon 
- matches the specified pathname and mode against the file contexts
- configuration and sets the security context 
---- libselinux-1.30.3/include/selinux/selinux.h.rhat	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/include/selinux/selinux.h	2006-06-22 11:46:36.000000000 -0400
-@@ -310,6 +310,9 @@
-    regexes that have stems that are prefixes of 'prefix'. */
- extern int matchpathcon_init_prefix(const char *path, const char *prefix);
- 
-+/* Free the memory allocated by matchpathcon_init. */
-+extern void matchpathcon_fini(void);
-+
- /* Match the specified pathname and mode against the file contexts
-    configuration and set *con to refer to the resulting context.
-    'mode' can be 0 to disable mode matching.
---- libselinux-1.30.3/utils/avcstat.c.rhat	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/utils/avcstat.c	2006-06-22 11:46:36.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.30.3/utils/avcstat.c
+--- nsalibselinux/utils/avcstat.c	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/avcstat.c	2006-07-14 13:59:50.000000000 -0400
 @@ -27,12 +27,12 @@
  #define HEADERS		"lookups hits misses allocations reclaims frees"
  
@@ -1187,8 +1326,9 @@
  			       rel.lookups, rel.hits, rel.misses,
  			       rel.allocations, rel.reclaims, rel.frees);
  		}
---- libselinux-1.30.3/utils/matchpathcon.c.rhat	2006-04-14 07:21:54.000000000 -0400
-+++ libselinux-1.30.3/utils/matchpathcon.c	2006-06-22 11:46:36.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.30.3/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2006-04-14 07:21:54.000000000 -0400
++++ libselinux-1.30.3/utils/matchpathcon.c	2006-07-14 13:59:50.000000000 -0400
 @@ -66,5 +66,6 @@
  
  		freecon(buf);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- libselinux.spec	22 Jun 2006 15:52:02 -0000	1.189
+++ libselinux.spec	14 Jul 2006 18:02:43 -0000	1.190
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.3
-Release: 4.fc5
+Release: 5.fc5
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -116,6 +116,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-5.fc5
+- Add getpolicytype
+
 * Thu Jun 22 2006 Dan Walsh <dwalsh at redhat.com> 1.30.3-4.fc5
 - Return proper error number on selinux_mnt being undefined
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 18:28:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 14:28:37 -0400
Subject: rpms/libgsf/devel libgsf.spec,1.33,1.34
Message-ID: <200607141828.k6EISb51029227@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/libgsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29146

Modified Files:
	libgsf.spec 
Log Message:
add libbonobo-devel buildreq



Index: libgsf.spec
===================================================================
RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgsf.spec	13 Jul 2006 20:22:53 -0000	1.33
+++ libgsf.spec	14 Jul 2006 18:28:34 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.1
-Release: 5
+Release: 6
 Group: System Environment/Libraries
 License: LGPL
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
@@ -9,6 +9,8 @@
 Requires: glib2 >= 2.2.0
 BuildRequires: glib2-devel >= 2.2.0, perl-XML-Parser
 BuildRequires: libtool, libxml2-devel, gnome-vfs2-devel, bzip2-devel, gettext
+BuildRequires: libbonobo-devel
+
 Obsoletes: libgsf113
 
 %description
@@ -65,6 +67,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 14 2006 Bill Nottingham <notting at redhat.com> - 1.14.1-6
+- gnome-vfs2-devel no longer requires libbonobo-devel; add it as a buildreq
+
 * Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 1.14.1-5
 - rebuild
 - add missing br gettext



From fedora-cvs-commits at redhat.com  Fri Jul 14 18:43:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 14:43:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2397,
	1.2398 linux-2.6-ppc-clear-ipis-on-kdump.patch, 1.1,
	NONE linux-2.6-ppc-eoi-interrupts-for-kdump.patch, 1.1, NONE
Message-ID: <200607141843.k6EIhCQw000331@cvs.devel.redhat.com>

Author: dzickus

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-ppc-clear-ipis-on-kdump.patch 
	linux-2.6-ppc-eoi-interrupts-for-kdump.patch 
Log Message:
Removing the ppc kdump patches.  Their variant are in the upstream tarball




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2397
retrieving revision 1.2398
diff -u -r1.2397 -r1.2398
--- kernel-2.6.spec	14 Jul 2006 15:03:47 -0000	1.2397
+++ kernel-2.6.spec	14 Jul 2006 18:43:10 -0000	1.2398
@@ -279,8 +279,6 @@
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
-Patch318: linux-2.6-ppc-clear-ipis-on-kdump.patch
-Patch319: linux-2.6-ppc-eoi-interrupts-for-kdump.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -777,8 +775,6 @@
 #%patch306 -p1
 # Check properly for successful RTAS instantiation
 %patch314 -p1
-#%patch318 -p1
-#%patch319 -p1
 
 #
 # Patches 500 through 1000 are reserved for bugfixes to the core system
@@ -1678,6 +1674,9 @@
 %endif
 
 %changelog
+* Fri Jul 14 2006 Don Zickus <dzickus at redhat.com>
+- remove the ppc kdump patches
+
 * Fri Jul 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.18-rc1-git8
 


--- linux-2.6-ppc-clear-ipis-on-kdump.patch DELETED ---


--- linux-2.6-ppc-eoi-interrupts-for-kdump.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 18:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 14:49:05 -0400
Subject: rpms/audit/devel audit.spec,1.99,1.100
Message-ID: <200607141849.k6EIn5Qn017266@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17240

Modified Files:
	audit.spec 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
- Fixes for setroubleshoot



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- audit.spec	13 Jul 2006 20:38:11 -0000	1.99
+++ audit.spec	14 Jul 2006 18:49:02 -0000	1.100
@@ -1,11 +1,13 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+patch: audit-setroubleshoot.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.17
@@ -53,6 +55,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b setroubleshoot
 
 %build
 autoreconf -fv --install
@@ -141,8 +144,10 @@
 
 %files libs-python
 %defattr(-,root,root)
-%{_libdir}/python2.4/site-packages/_audit.so
-/usr/lib/python2.4/site-packages/audit.py*
+%attr(750,root,root) /sbin/audispd
+%{_libdir}/python*/site-packages/_audit.so
+/usr/lib/python*/site-packages/audit.py*
+/usr/lib/python*/site-packages/AuditMsg.py*
 
 %files
 %defattr(-,root,root,-)
@@ -153,7 +158,6 @@
 %attr(750,root,root) /sbin/ausearch
 %attr(750,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
-%attr(750,root,root) /sbin/audispd
 %attr(755,root,root) /etc/rc.d/init.d/auditd
 %attr(750,root,root) %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit
@@ -162,10 +166,11 @@
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
-/usr/lib/python2.4/site-packages/AuditMsg.py*
-
 
 %changelog
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
+- Fixes for setroubleshoot
+
 * Thu Jul 13 2006 Steve Grubb <sgrubb at redhat.com> 1.2.5-1
 - Switch out dispatcher
 - Fix bug upgrading rule types



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:26:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:26:59 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch,NONE,1.1
Message-ID: <200607141926.k6EJQx83012817@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12792

Added Files:
	audit-setroubleshoot.patch 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
- Fixes for setroubleshoot


audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 audispd     |   25 ++++++++++++++++++-----
 2 files changed, 69 insertions(+), 19 deletions(-)

--- NEW FILE audit-setroubleshoot.patch ---
--- audit-1.2.5/audisp/audispd.old	2006-07-13 13:37:04.000000000 -0400
+++ audit-1.2.5/audisp/audispd	2006-07-14 11:56:23.000000000 -0400
@@ -15,8 +15,7 @@
     def __init__(self, cmd):
         self.cmd = cmd
         self.sub_process = None
-        self.pid = None
-        
+
     def run(self):
         self.sub_process = subprocess.Popen(self.cmd, \
             stdin=subprocess.PIPE, stdout=None, stderr=None, \
@@ -27,6 +26,19 @@
     def stop(self):
         self.stdin.close()
 
+    def get_pid(self):
+        if self.subprocess is None:
+            return None
+        return self.subprocess.pid
+        
+    def get_stdin(self):
+        if self.subprocess is None:
+            return None
+        return self.subprocess.stdin
+        
+    pid   = property(get_pid)
+    stdin = property(get_stdin)
+        
 class audit_dispatcher:
     def __init__(self):
         self.data = []
@@ -69,7 +81,7 @@
         if len(self.data) > 0:
             msg=self.data.pop(0)
             for plugin in self.plugins:
-#                syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
+                #syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
                 plugin.stdin.write(msg.binary())
             return 0
         else:
@@ -86,6 +98,7 @@
                     if not msg.read_from_fd(0):
                         syslog.syslog("Connection closing")
                         return
+                    #syslog.syslog("Read Input: type=%d body='%s'" % (msg.get_msg_type(), msg.get_body()))
                     self.add(msg)
                     sleep=0
                 else:
@@ -98,11 +111,11 @@
                         self.load_plugins()
                         HUP=False
                 else:
-                    syslog.syslog("select exception %s " % e.args)
+                    syslog.syslog("select exception %s " % e)
                     return
 
             except TypeError, e:
-                syslog.syslog("Type exception %s " % e.args)
+                syslog.syslog("Type exception %s " % e)
                 syslog.syslog(traceback.format_exc())
 
 try:
@@ -113,7 +126,7 @@
     dispatcher.run()
 
 except IOError,e:
-    syslog.syslog("IOError exception %s" % e.args)
+    syslog.syslog("IOError exception %s" % e)
 
 except Exception, e:
     syslog.syslog("Unexpected exception %s " % e)
--- audit-1.2.5/audisp/AuditMsg.py.old	2006-07-13 13:36:08.000000000 -0400
+++ audit-1.2.5/audisp/AuditMsg.py	2006-07-14 11:53:55.000000000 -0400
@@ -1,33 +1,55 @@
 import struct, os
+
 class AuditMsg:
     header_format="iiii"
     header_size = struct.calcsize(header_format)
 
     def __init__(self):
-        self.version  = None
-        self.size     = None
+        self.version  = 0
+        self.size     = AuditMsg.header_size
         self.msg_type = None
         self.length   = None
         self.body     = None
+        self.log = False
         
     def read_from_fd(self, fd):
-        header = os.read(fd, AuditMsg.header_size)
-        if len(header) != AuditMsg.header_size:
-            return False
-
         # Read the header
+        header = ''
+        self.body = ''
+        while len(header) < AuditMsg.header_size:
+            new_data = os.read(fd, AuditMsg.header_size - len(header))
+            if len(new_data) == 0:
+                return False
+            header += new_data
+
+        # Parse the header
         self.version, self.size, self.msg_type, self.length = \
                       struct.unpack(AuditMsg.header_format, header)
 
-        # Read the body
-        self.body = os.read(fd, self.length)
-        if len(self.body) < self.length:
-            return False
+        # Read the body now that we know how long it is.
+        while len(self.body) < self.length:
+            new_data = os.read(fd, self.length - len(self.body))
+            if len(new_data) == 0:
+                return False
+            self.body += new_data
+
         return True
 
-    def get_header(self):
-        return struct.pack(AuditMsg.header_format,
-                           self.version, self.size, self.msg_type, self.length)
+    def set_version(self, version):
+        self.version = version
+
+    def get_version(self):
+        return self.version
+
+    def set_msg_type(self, msg_type):
+        self.msg_type = msg_type
+
+    def get_msg_type(self):
+        return self.msg_type
+
+    def set_body(self, body):
+        self.body = body
+        self.length = len(self.body)
 
     def get_body(self):
         return self.body
@@ -35,5 +57,20 @@
     def get_type(self):
         return self.msg_type
 
+    def set_length(self, length):
+        raise ValueError("setting length is side effect of setting body")
+    
+    def get_length(self):
+        return self.length
+
+    def set(self, msg_type, body):
+        self.set_msg_type(msg_type)
+        self.set_body(body)
+
+    def get_header(self):
+        self.length = len(self.body)
+        return struct.pack(AuditMsg.header_format,
+                           self.version, self.size, self.msg_type, self.length)
+
     def binary(self):
         return self.get_header() + self.get_body()



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:32:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:32:17 -0400
Subject: rpms/NetworkManager/FC-5 NetworkManager.spec, 1.107, 1.108 sources,
	1.53, 1.54 special-case-madwifi.patch, 1.1, 1.2
Message-ID: <200607141932.k6EJWHgL014521@cvs.devel.redhat.com>

Author: dcbw

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

Modified Files:
	NetworkManager.spec sources special-case-madwifi.patch 
Log Message:
Update to 0.6.4 release



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- NetworkManager.spec	8 Jun 2006 18:51:33 -0000	1.107
+++ NetworkManager.spec	14 Jul 2006 19:32:13 -0000	1.108
@@ -14,12 +14,12 @@
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
-Version: 0.6.3
-Release: 1%{?nm_cvs_version}.fc5
+Version: 0.6.4
+Release: 1%{?nm_cvs_version}%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.bz2
+Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
@@ -118,7 +118,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .madwifi
+%patch0 -p1 -b .madwifi
 %patch1 -p1 -b .service-startup
 
 %build
@@ -214,6 +214,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.4-1
+- Update to 0.6.4 release
+
 * Thu Jun  8 2006 Dan Williams <dcbw at redhat.com> - 0.6.3-1
 - Update to 0.6.3 release
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	8 Jun 2006 14:54:02 -0000	1.53
+++ sources	14 Jul 2006 19:32:14 -0000	1.54
@@ -1 +0,0 @@
-8970eabfb8e8141104ad3e9c7f7cde01  NetworkManager-0.6.3.tar.bz2

special-case-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

Index: special-case-madwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/special-case-madwifi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- special-case-madwifi.patch	6 Feb 2006 03:18:10 -0000	1.1
+++ special-case-madwifi.patch	14 Jul 2006 19:32:14 -0000	1.2
@@ -1,30 +1,25 @@
-? 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
+--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.madwifi	2006-07-13 12:42:13.000000000 -0400
++++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-07-14 15:28:21.000000000 -0400
+@@ -2497,6 +2497,8 @@
  	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
  	gboolean			success = FALSE;
  	int				tries = 0;
-+	const char *		dev_driver;
-+	char *			wpa_driver = "wext";
++ 	const char *		dev_driver;
++ 	char *			wpa_driver = "wext";
  
- 	if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_RUN_DIR)))
+ 	/* Try to open wpa_supplicant's global control socket */
+ 	for (tries = 0; tries < WPA_SUPPLICANT_NUM_RETRIES && !ctrl; tries++)
+@@ -2511,9 +2513,16 @@
  		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";
-+
++ 	/* 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))



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:41:28 -0400
Subject: rpms/gnome-python2/devel gnome-python-2.15.4-gnome-vfs.patch, NONE,
	1.1 gnome-python.spec, 1.40, 1.41
Message-ID: <200607141941.k6EJfS1u016668@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python.spec 
Added Files:
	gnome-python-2.15.4-gnome-vfs.patch 
Log Message:
fix gnome-vfs dependencies


gnome-python-2.15.4-gnome-vfs.patch:
 configure.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnome-python-2.15.4-gnome-vfs.patch ---
--- gnome-python-2.15.4/configure.in.gnome-vfs	2006-07-14 15:37:06.000000000 -0400
+++ gnome-python-2.15.4/configure.in	2006-07-14 15:37:47.000000000 -0400
@@ -162,7 +162,8 @@
 dnl should we build the gnomevfs module?
 build_gnomevfs=false
 PKG_CHECK_MODULES(GNOMEVFS, [gnome-vfs-2.0 >= libgnomevfs_required_version dnl
-                             bonobo-activation-2.0 >= bonobo_activation_required_version
+                             bonobo-activation-2.0 >= bonobo_activation_required_version dnl
+			     libbonobo-2.0 dnl
 			     pyorbit-2 >= pyorbit_required_version],
   build_gnomevfs=true,
   build_gnomevfs=false)


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-python.spec	13 Jul 2006 04:29:49 -0000	1.40
+++ gnome-python.spec	14 Jul 2006 19:41:26 -0000	1.41
@@ -9,7 +9,7 @@
 Version: 2.15.4
 Release: 1
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
-#Patch1: gnome-python-1.99.11-client-command.patch
+Patch1: gnome-python-2.15.4-gnome-vfs.patch
 
 License: LGPL
 Group: Development/Languages
@@ -21,6 +21,7 @@
 BuildRequires: %{python}-devel >= 2.3.0
 BuildRequires: pyorbit-devel >= 2.0.1
 BuildRequires: libbonoboui-devel >= 2.0.0
+BuildRequires: libbonobo-devel >= 2.0.0
 BuildRequires: libgnomeui-devel
 
 %if %{buildzvt}
@@ -101,15 +102,18 @@
 Summary: Python bindings for interacting with gnome-vfs
 Group: Development/Languages
 Requires: gnome-vfs2 >= 2.0.2
+Requires: libbonobo >= 2.0.0
 
 %description gnomevfs
 This module contains a wrapper that allows the use of gnome-vfs via python.
 
 %prep
 %setup -q -n gnome-python-%{version}
-#%patch1 -p1 -b .client-command
+%patch1 -p1 -b .gnome-vfs
 
 %build
+# gnome-vfs patch changes configure.in
+autoconf
 %configure
 make
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:42:59 -0400
Subject: rpms/gnome-python2/devel gnome-python.spec,1.41,1.42
Message-ID: <200607141942.k6EJgxAB017294@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-python.spec 
Log Message:
fix gnome-vfs deps



Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-python.spec	14 Jul 2006 19:41:26 -0000	1.41
+++ gnome-python.spec	14 Jul 2006 19:42:56 -0000	1.42
@@ -7,7 +7,7 @@
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
 Version: 2.15.4
-Release: 1
+Release: 2
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-python/gnome-python-%{version}.tar.bz2
 Patch1: gnome-python-2.15.4-gnome-vfs.patch
 
@@ -185,6 +185,9 @@
 rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo}
 
 %changelog
+* Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Fix gnome-vfs dependencies
+
 * Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:44:11 -0400
Subject: rpms/gmp/devel .cvsignore, 1.9, 1.10 gmp.spec, 1.28, 1.29 sources,
	1.9, 1.10
Message-ID: <200607141944.k6EJiBwM017797@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17698

Modified Files:
	.cvsignore gmp.spec sources 
Log Message:
[tw] going back to 4.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Jun 2006 16:56:02 -0000	1.9
+++ .cvsignore	14 Jul 2006 19:44:08 -0000	1.10
@@ -1 +1,2 @@
-gmp-4.2.1.tar.bz2
+gmp-4.1.3.tar.bz2
+gmp-4.1.4.tar.bz2


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gmp.spec	12 Jul 2006 05:58:10 -0000	1.28
+++ gmp.spec	14 Jul 2006 19:44:08 -0000	1.29
@@ -7,16 +7,18 @@
 
 Summary: A GNU arbitrary precision library.
 Name: gmp
-Version: 4.2.1
-Release: 1.1
+Version: 4.1.4
+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
+Patch1: gmp-4.1.2-ppc64.patch
 Patch2: gmp-4.1.2-autoconf.patch
+Patch3: gmp-4.1.4-fpu.patch
 License: LGPL 
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libtool
+BuildRequires: automake16 autoconf libtool
 
 %description
 The gmp package contains GNU MP, a library for arbitrary precision
@@ -33,7 +35,7 @@
 %package devel
 Summary: Development tools for the GNU MP arbitrary precision library.
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
 PreReq: /sbin/install-info
 
 %description devel
@@ -47,17 +49,24 @@
 %prep
 %setup -q
 %patch0 -p1
+#patch1 -p1
 %patch2 -p1
+%patch3 -p1 -b .fpu
+
+libtoolize --force
+aclocal-1.6 -I mpn -I mpfr
+automake-1.6
+autoconf
 
 %build
 if as --help | grep -q execstack; then
   # the object files do not require an executable stack
   export CCAS="gcc -c -Wa,--noexecstack"
 fi
-mkdir build
-cd build
+mkdir base
+cd base
 ln -s ../configure .
-%configure --enable-mpbsd --disable-mpfr --enable-cxx
+%configure --enable-mpbsd --enable-mpfr --enable-cxx
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -67,7 +76,7 @@
 cd build-sse2
 ln -s ../configure .
 CFLAGS="-O2 -g -march=pentium4"
-%configure --enable-mpbsd --disable-mpfr --enable-cxx pentium4-redhat-linux
+%configure --enable-mpbsd --enable-mpfr --enable-cxx pentium4-redhat-linux
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
@@ -76,7 +85,7 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-cd build
+cd base
 export LD_LIBRARY_PATH=`pwd`/.libs
 %{makeinstall}
 install -m 644 gmp-mparam.h ${RPM_BUILD_ROOT}%{_includedir}
@@ -103,7 +112,7 @@
 
 %check
 %ifnarch ppc
-cd build
+cd base
 export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags} check
 cd ..
@@ -120,11 +129,11 @@
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gmp.info.*
+/sbin/install-info %{_infodir}/gmp.info.gz %{_infodir}/dir
 
 %preun devel
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gmp.info.*
+	/sbin/install-info --delete %{_infodir}/gmp.info.gz %{_infodir}/dir
 fi
 
 %clean
@@ -137,7 +146,7 @@
 %{_libdir}/libmp.so.*
 %{_libdir}/libgmpxx.so.*
 %ifarch %{ix86}
-%{_libdir}/sse2/lib*
+%{_libdir}/sse2/*
 %endif
 
 %files devel
@@ -148,17 +157,12 @@
 %{_libdir}/libmp.a
 %{_libdir}/libgmp.a
 %{_libdir}/libgmpxx.a
+%{_libdir}/libmpfr.a
 %{_includedir}/*.h
 %{_infodir}/gmp.info*
+%{_infodir}/mpfr.info*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.2.1-1.1
-- rebuild
-
-* Fri Jun  9 2006 Thomas Woerner <twoerner at redhat.com> 4.2.1-1
-- new version 4.2.1
-- mpfr moved out of gmp
-
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.4-6.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Jun 2006 16:56:02 -0000	1.9
+++ sources	14 Jul 2006 19:44:08 -0000	1.10
@@ -1 +1 @@
-091c56e0e1cca6b09b17b69d47ef18e3  gmp-4.2.1.tar.bz2
+0aa7d3b3f5b5ec5951e7dddd6f65e891  gmp-4.1.4.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:45:18 -0400
Subject: rpms/gmp/devel gmp.spec,1.29,1.30
Message-ID: <200607141945.k6EJjIeL018232@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18164

Modified Files:
	gmp.spec 
Log Message:
[tw] release bump



Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gmp.spec	14 Jul 2006 19:44:08 -0000	1.29
+++ gmp.spec	14 Jul 2006 19:45:15 -0000	1.30
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library.
 Name: gmp
 Version: 4.1.4
-Release: 6.2.1
+Release: 7
 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 Jul 14 2006 Thomas Woerner <twoerner at redhat.com>- 4.1.4-7
+- release bump
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:47:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:47:33 -0400
Subject: rpms/libwmf/devel libwmf-0.2.8.4-intoverflow.patch,1.1,1.2
Message-ID: <200607141947.k6EJlXWk001371@cvs.devel.redhat.com>

Author: caolanm

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

Modified Files:
	libwmf-0.2.8.4-intoverflow.patch 
Log Message:
implement differently for 64bit issues

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: libwmf-0.2.8.4-intoverflow.patch
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf-0.2.8.4-intoverflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libwmf-0.2.8.4-intoverflow.patch	12 Jul 2006 15:05:14 -0000	1.1
+++ libwmf-0.2.8.4-intoverflow.patch	14 Jul 2006 19:47:30 -0000	1.2
@@ -14,14 +14,14 @@
  
 -/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
 - */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
-+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
++	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
 +	{
 +		API->err = wmf_E_InsMem;
 +		WMF_DEBUG (API,"bailing...");
 +		return (API->err);
 +	}
 +	
-+ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2);
++ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
  
  	if (ERR (API))
  	{	WMF_DEBUG (API,"bailing...");



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:48:58 -0400
Subject: rpms/libwmf/devel libwmf.spec,1.24,1.25
Message-ID: <200607141948.k6EJmwf1001941@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1901

Modified Files:
	libwmf.spec 
Log Message:
implement differently for 64bit issues


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libwmf.spec	12 Jul 2006 17:24:27 -0000	1.24
+++ libwmf.spec	14 Jul 2006 19:48:55 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 9.1
+Release: 10
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -107,6 +107,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 14 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-10
+- retweak for 64bit
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-9.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 19:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 15:53:24 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.39,1.40
Message-ID: <200607141953.k6EJrOT3003659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3629

Modified Files:
	s390utils.spec 
Log Message:
add missing br


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- s390utils.spec	13 Jul 2006 21:18:16 -0000	1.39
+++ s390utils.spec	14 Jul 2006 19:53:21 -0000	1.40
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 3
+Release: 4
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -24,7 +24,7 @@
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
-BuildRequires: libsysfs-devel indent
+BuildRequires: libsysfs-devel indent zlib-devel
 ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
@@ -151,9 +151,9 @@
 %{_mandir}/man8/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-3
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-4
 - rebuild
-- Add missing br libsysfs-devel, indent
+- Add missing br libsysfs-devel, indent, zlib-devel
 
 * Wed May 17 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-1
 - Made src_vipa build on current toolchain again



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:06:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:06:37 -0400
Subject: rpms/NetworkManager/FC-5 .cvsignore,1.36,1.37 sources,1.54,1.55
Message-ID: <200607142006.k6EK6b0g006844@cvs.devel.redhat.com>

Author: dcbw

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

Modified Files:
	.cvsignore sources 
Log Message:
Upload source this time


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	8 Jun 2006 14:54:02 -0000	1.36
+++ .cvsignore	14 Jul 2006 20:06:24 -0000	1.37
@@ -4,3 +4,4 @@
 NetworkManager-0.6.0.tar.gz
 NetworkManager-0.6.2.tar.gz
 NetworkManager-0.6.3.tar.bz2
+NetworkManager-0.6.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	14 Jul 2006 19:32:14 -0000	1.54
+++ sources	14 Jul 2006 20:06:24 -0000	1.55
@@ -0,0 +1 @@
+fcf8bcbc08a26176e8f8943eedf7b670  NetworkManager-0.6.4.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:09:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:09:57 -0400
Subject: rpms/selinux-policy/devel modules-strict.conf, 1.11,
	1.12 modules-targeted.conf, 1.29, 1.30 policy-20060608.patch,
	1.21, 1.22 selinux-policy.spec, 1.222,
	1.223 policy-20060505.patch, 1.19, NONE
Message-ID: <200607142009.k6EK9v0I007546@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	modules-strict.conf modules-targeted.conf 
	policy-20060608.patch selinux-policy.spec 
Removed Files:
	policy-20060505.patch 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-4
- Add setroubleshoot policy



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- modules-strict.conf	9 May 2006 21:50:36 -0000	1.11
+++ modules-strict.conf	14 Jul 2006 20:09:54 -0000	1.12
@@ -1276,3 +1276,10 @@
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
 openvpn = base
+
+# Layer: services
+# Module: setroubleshoot
+#
+# Policy for the SELinux troubleshooting utility
+# 
+setroubleshoot = base


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- modules-targeted.conf	8 Jun 2006 14:03:38 -0000	1.29
+++ modules-targeted.conf	14 Jul 2006 20:09:54 -0000	1.30
@@ -1093,5 +1093,12 @@
 # 
 openvpn = base
 
+# Layer: services
+# Module: setroubleshoot
+#
+# Policy for the SELinux troubleshooting utility
+# 
+setroubleshoot = base
+
 
 

policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    3 
 modules/admin/consoletype.te       |    7 +
 modules/admin/rpm.if               |    2 
 modules/admin/sudo.if              |    2 
 modules/admin/usermanage.te        |    4 
 modules/bgp.te                     |   12 ++
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |    1 
 modules/kernel/storage.fc          |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 ++++
 modules/services/bluetooth.te      |    2 
 modules/services/cups.te           |    1 
 modules/services/cyrus.te          |    1 
 modules/services/dbus.te           |    2 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    1 
 modules/services/hal.fc            |    1 
 modules/services/hal.te            |    7 +
 modules/services/nscd.te           |    2 
 modules/services/openvpn.te        |    6 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  121 ++++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xserver.if        |   22 +++-
 modules/services/zebra.te          |    2 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/logging.te          |    7 +
 modules/system/selinuxutil.te      |   17 ++-
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  201 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 48 files changed, 526 insertions(+), 128 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policy-20060608.patch	13 Jul 2006 20:30:41 -0000	1.21
+++ policy-20060608.patch	14 Jul 2006 20:09:54 -0000	1.22
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/global_tunables	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/global_tunables	2006-07-14 14:25:25.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -17,7 +17,7 @@
  ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.2/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-06-21 16:21:01.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/bootloader.te	2006-07-11 16:07:29.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/bootloader.te	2006-07-14 14:25:25.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -37,7 +37,7 @@
  mls_file_read_up(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-14 14:25:25.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -52,9 +52,21 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.2/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-06-08 08:45:57.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/rpm.if	2006-07-14 14:25:25.000000000 -0400
+@@ -232,7 +232,7 @@
+ 
+ 	files_search_var_lib($1)
+ 	allow $1 rpm_var_lib_t:dir rw_dir_perms;
+-	allow $1 rpm_var_lib_t:file { getattr create read write append unlink };
++	allow $1 rpm_var_lib_t:file { getattr create read write append unlink lock };
+ 	allow $1 rpm_var_lib_t:lnk_file { getattr read write unlink };
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.3.2/policy/modules/admin/sudo.if
 --- nsaserefpolicy/policy/modules/admin/sudo.if	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/sudo.if	2006-07-13 10:52:18.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/sudo.if	2006-07-14 14:25:25.000000000 -0400
 @@ -57,7 +57,7 @@
  	#
  
@@ -66,7 +78,7 @@
  	allow $1_sudo_t self:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.2/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-06-20 09:54:00.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/usermanage.te	2006-07-12 17:28:02.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/admin/usermanage.te	2006-07-14 14:25:25.000000000 -0400
 @@ -187,7 +187,7 @@
  # Groupadd local policy
  #
@@ -85,11 +97,9 @@
  allow useradd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow useradd_t self:process setfscreate;
  allow useradd_t self:fd use;
-Binary files nsaserefpolicy/policy/modules/bgp.mod and serefpolicy-2.3.2/policy/modules/bgp.mod differ
-Binary files nsaserefpolicy/policy/modules/bgp.pp and serefpolicy-2.3.2/policy/modules/bgp.pp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/bgp.te serefpolicy-2.3.2/policy/modules/bgp.te
 --- nsaserefpolicy/policy/modules/bgp.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/bgp.te	2006-07-10 10:52:30.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/bgp.te	2006-07-14 14:25:25.000000000 -0400
 @@ -0,0 +1,12 @@
 +module bgp 1.0;
 +
@@ -105,7 +115,7 @@
 +allow zebra_t port_t:tcp_socket name_bind;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in	2006-07-11 16:31:56.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in	2006-07-14 15:21:14.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -115,7 +125,15 @@
  type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict
  network_port(clamd, tcp,3310,s0)
  network_port(clockspeed, udp,4041,s0)
-@@ -145,7 +145,7 @@
+@@ -73,6 +73,7 @@
+ network_port(dhcpc, udp,68,s0)
+ network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
+ network_port(dict, tcp,2628,s0)
++network_port(setroubleshoot, tcp,3267,s0)
+ network_port(distccd, tcp,3632,s0)
+ network_port(dns, udp,53,s0, tcp,53,s0)
+ network_port(fingerd, tcp,79,s0)
+@@ -145,7 +146,7 @@
  network_port(vnc, tcp,5900,s0)
  network_port(xen, tcp,8002,s0)
  network_port(xserver, tcp, 6000, s0, 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)
@@ -126,7 +144,7 @@
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.2/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-29 11:17:34.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/devices.fc	2006-07-13 14:41:33.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/devices.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -89,6 +89,7 @@
  
  /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -137,7 +155,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -148,7 +166,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-14 14:25:25.000000000 -0400
 @@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -193,7 +211,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.2/policy/modules/kernel/selinux.if
 --- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/selinux.if	2006-07-13 08:46:28.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/selinux.if	2006-07-14 14:25:25.000000000 -0400
 @@ -214,7 +214,6 @@
  
  	if(!secure_mode_policyload) {
@@ -204,7 +222,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.2/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-02-01 17:06:11.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/kernel/storage.fc	2006-07-13 11:30:44.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/kernel/storage.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -215,7 +233,7 @@
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-10 09:06:39.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-14 14:25:25.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -241,7 +259,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.2/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/avahi.te	2006-07-11 14:26:07.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/avahi.te	2006-07-14 14:25:25.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(avahi_t)
  
@@ -252,7 +270,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-14 14:25:25.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -282,7 +300,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-14 14:25:25.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -301,7 +319,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.2/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-13 10:56:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-14 14:25:25.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -312,7 +330,7 @@
  allow cupsd_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-14 14:25:25.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -323,7 +341,7 @@
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.2/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dbus.te	2006-07-13 10:54:29.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dbus.te	2006-07-14 14:25:25.000000000 -0400
 @@ -30,7 +30,7 @@
  
  # dac_override: /var/run/dbus is owned by messagebus on Debian
@@ -335,18 +353,18 @@
  allow system_dbusd_t self:fifo_file { read write };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.2/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2005-10-21 23:17:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dovecot.fc	2006-07-13 11:33:34.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dovecot.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
  /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
-+/var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_lib_t,s0)
++/var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_var_lib_t,s0)
  
  
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.2/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dovecot.te	2006-07-13 11:33:09.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/dovecot.te	2006-07-14 14:25:25.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -375,9 +393,20 @@
  	nscd_socket_use(dovecot_auth_t)
  ')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.2/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-13 22:41:52.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/ftp.te	2006-07-14 14:25:25.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
+ allow ftpd_t self:tcp_socket create_stream_socket_perms;
+ allow ftpd_t self:udp_socket create_socket_perms;
++allow ftpd_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow ftpd_t ftpd_etc_t:file r_file_perms;
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
 --- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -1,4 +1,3 @@
 -
  /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
@@ -385,7 +414,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-13 10:55:51.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-14 14:25:25.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -413,7 +442,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.3.2/policy/modules/services/nscd.te
 --- nsaserefpolicy/policy/modules/services/nscd.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/nscd.te	2006-07-13 10:55:24.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/nscd.te	2006-07-14 14:25:25.000000000 -0400
 @@ -28,7 +28,7 @@
  # Local policy
  #
@@ -425,7 +454,7 @@
  allow nscd_t self:fifo_file { read write };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.2/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-21 16:21:03.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/openvpn.te	2006-07-13 10:27:44.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/openvpn.te	2006-07-14 14:25:25.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -455,7 +484,7 @@
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-14 14:25:25.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -491,7 +520,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-14 14:25:25.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -508,9 +537,174 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.2/policy/modules/services/setroubleshoot.fc
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.fc	2006-07-14 15:03:01.000000000 -0400
+@@ -0,0 +1,8 @@
++# setroubleshoot executables
++
++/usr/lib/audit/setroubleshoot_dispatcher	--	gen_context(system_u:object_r:setroubleshoot_exec_t,s0)
++
++/usr/sbin/setroubleshootd		--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
++
++/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
++/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.2/policy/modules/services/setroubleshoot.if
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.if	2006-07-14 14:25:25.000000000 -0400
+@@ -0,0 +1,24 @@
++## <summary>policy for setroubleshoot</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run setroubleshoot.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`setroubleshoot_domtrans',`
++	gen_require(`
++		type setroubleshoot_t, setroubleshoot_exec_t;
++	')
++
++	domain_auto_trans($1,setroubleshoot_exec_t,setroubleshoot_t)
++
++	allow $1 setroubleshoot_t:fd use;
++	allow setroubleshoot_t $1:fd use;
++	allow setroubleshoot_t $1:fifo_file rw_file_perms;
++	allow setroubleshoot_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te	2006-07-14 15:38:25.000000000 -0400
+@@ -0,0 +1,121 @@
++policy_module(setroubleshoot,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type setroubleshootd_t;
++type setroubleshootd_exec_t;
++domain_type(setroubleshootd_t)
++init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
++
++type setroubleshoot_t;
++type setroubleshoot_exec_t;
++domain_type(setroubleshoot_t)
++corecmd_executable_file(setroubleshoot_t)
++
++# log files
++type setroubleshoot_var_log_t;
++logging_log_file(setroubleshoot_var_log_t)
++
++# pid files
++type setroubleshoot_var_run_t;
++files_pid_file(setroubleshoot_var_run_t)
++
++########################################
++#
++# setroubleshootd local policy
++#
++
++files_read_etc_files(setroubleshootd_t)
++libs_use_ld_so(setroubleshootd_t)
++libs_use_shared_libs(setroubleshootd_t)
++miscfiles_read_localization(setroubleshootd_t)
++
++logging_send_syslog_msg(setroubleshootd_t)
++
++# pid file
++allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
++allow setroubleshootd_t setroubleshoot_var_run_t:sock_file manage_file_perms;
++allow setroubleshootd_t setroubleshoot_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
++
++# log files
++allow setroubleshootd_t setroubleshoot_var_log_t:file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_log_t:sock_file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
++
++allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
++corenet_tcp_bind_lo_node(setroubleshootd_t)
++corenet_tcp_bind_setroubleshoot_port(setroubleshootd_t)
++
++corecmd_exec_sbin(setroubleshootd_t)
++corecmd_exec_bin(setroubleshootd_t)
++
++dev_read_urand(setroubleshootd_t)
++
++kernel_read_kernel_sysctls(setroubleshootd_t)
++kernel_read_system_state(setroubleshootd_t)
++
++sysnet_read_config(setroubleshootd_t)
++
++init_read_utmp(setroubleshootd_t)
++init_dontaudit_write_utmp(setroubleshootd_t)
++
++term_dontaudit_use_console(setroubleshootd_t)
++term_dontaudit_use_generic_ptys(setroubleshootd_t)
++
++########################################
++#
++# setroubleshoot local policy
++#
++
++files_dontaudit_search_home(setroubleshootd_t)
++files_read_etc_files(setroubleshoot_t)
++
++libs_use_ld_so(setroubleshoot_t)
++libs_use_shared_libs(setroubleshoot_t)
++
++miscfiles_read_localization(setroubleshoot_t)
++
++allow setroubleshoot_t self:capability dac_override;
++allow setroubleshoot_t self:process { signal getattr };
++allow setroubleshoot_t self:fifo_file { read write };
++allow setroubleshoot_t self:unix_stream_socket create_stream_socket_perms;
++allow setroubleshoot_t self:unix_dgram_socket create_socket_perms;
++
++corecmd_exec_sbin(setroubleshoot_t)
++corecmd_exec_bin(setroubleshoot_t)
++
++logging_send_syslog_msg(setroubleshoot_t)
++
++#rpm_dontaudit_manage_db(setroubleshoot_t)
++# ****************BAD BAD BAD **********************
++rpm_read_db(setroubleshoot_t)
++rpm_manage_db(setroubleshoot_t)
++
++kernel_read_kernel_sysctls(setroubleshoot_t)
++kernel_read_system_state(setroubleshoot_t)
++
++files_read_usr_files(setroubleshoot_t)
++files_read_usr_symlinks(setroubleshoot_t)
++
++seutil_read_config(setroubleshoot_t)
++selinux_get_enforce_mode(setroubleshoot_t)
++
++# log files
++logging_search_logs(setroubleshoot_t)
++allow setroubleshoot_t setroubleshoot_var_log_t:file create_file_perms;
++allow setroubleshoot_t setroubleshoot_var_log_t:sock_file rw_file_perms;
++allow setroubleshoot_t setroubleshoot_var_log_t:dir r_dir_perms;
++
++files_search_pids(setroubleshoot_t)
++allow setroubleshoot_t setroubleshoot_var_run_t:dir r_dir_perms;
++allow setroubleshoot_t setroubleshoot_var_run_t:sock_file rw_file_perms;
++
++
++allow setroubleshoot_t setroubleshootd_t:unix_stream_socket { connectto rw_stream_socket_perms };
++
++allow setroubleshoot_t setroubleshoot_exec_t:file { entrypoint getattr ioctl read };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-14 14:25:25.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -524,7 +718,7 @@
  corenet_tcp_connect_http_port(squid_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-14 14:25:25.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -535,7 +729,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-14 14:25:25.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -574,7 +768,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.2/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/zebra.te	2006-07-10 10:43:24.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/services/zebra.te	2006-07-14 14:25:25.000000000 -0400
 @@ -73,9 +73,11 @@
  corenet_tcp_bind_all_nodes(zebra_t)
  corenet_udp_bind_all_nodes(zebra_t)
@@ -589,7 +783,7 @@
  dev_list_all_dev_nodes(zebra_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.2/policy/modules/system/getty.fc
 --- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/getty.fc	2006-07-11 14:09:16.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/getty.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
@@ -597,7 +791,7 @@
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.2/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2006-04-12 12:59:10.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/getty.te	2006-07-11 14:07:15.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/getty.te	2006-07-14 14:25:25.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -617,7 +811,7 @@
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-14 14:25:25.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -632,7 +826,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-14 14:25:25.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -647,9 +841,37 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.2/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-06-13 07:03:45.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/logging.te	2006-07-14 14:25:25.000000000 -0400
+@@ -140,7 +140,7 @@
+ # Probably want a transition, and a new auditd_helper app
+ corecmd_exec_sbin(auditd_t)
+ corecmd_exec_bin(auditd_t)
+-
++corecmd_exec_shell(auditd_t)
+ 
+ domain_use_interactive_fds(auditd_t)
+ 
+@@ -176,6 +176,10 @@
+ ')
+ 
+ optional_policy(`
++	setroubleshoot_domtrans(auditd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(auditd_t)
+ ')
+ 
+@@ -383,3 +387,4 @@
+ 	# log to the xconsole
+ 	xserver_rw_console(syslogd_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-13 10:50:32.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-14 14:25:25.000000000 -0400
 @@ -239,7 +239,7 @@
  # Newrole local policy
  #
@@ -717,7 +939,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.2/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-11 23:15:28.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-14 14:25:25.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -729,7 +951,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.2/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/sysnetwork.te	2006-07-13 11:10:37.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/sysnetwork.te	2006-07-14 14:25:25.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -740,7 +962,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.2/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-21 16:21:04.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-11 15:59:13.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-14 14:25:25.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
@@ -749,7 +971,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.2/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/unconfined.te	2006-07-10 11:50:54.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/unconfined.te	2006-07-14 14:25:25.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -774,7 +996,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-14 14:25:25.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1116,7 +1338,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-09 05:52:17.000000000 -0400
++++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-14 14:25:25.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- selinux-policy.spec	13 Jul 2006 14:24:05 -0000	1.222
+++ selinux-policy.spec	14 Jul 2006 20:09:54 -0000	1.223
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.2
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-4
+- Add setroubleshoot policy
+
 * Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-3
 - Turn off auditallow on setting booleans
 


--- policy-20060505.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:20:20 -0400
Subject: rpms/gzip/devel gzip.spec,1.25,1.26
Message-ID: <200607142020.k6EKKKNZ004233@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4201

Modified Files:
	gzip.spec 
Log Message:
- buildrequire texinfo, otherwise gzip.info will be empty


Index: gzip.spec
===================================================================
RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gzip.spec	12 Jul 2006 06:19:22 -0000	1.25
+++ gzip.spec	14 Jul 2006 20:20:17 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program.
 Name: gzip
 Version: 1.3.5
-Release: 6.2.2
+Release: 7
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -18,6 +18,7 @@
 URL: http://www.gzip.org/
 Prereq: /sbin/install-info
 Requires: mktemp less
+BuildRequires: texinfo
 Buildroot: %{_tmppath}/gzip-%{version}-root
 
 %description
@@ -84,6 +85,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Jul 14 2006 Karsten Hopp <karsten at redhat.de> 1.3.5-7
+- buildrequire texinfo, otherwise gzip.info will be empty
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-6.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:28:02 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.22,1.23
Message-ID: <200607142028.k6EKS2AI004759@cvs.devel.redhat.com>

Author: dwalsh

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

Modified Files:
	policy-20060608.patch 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-4
- Add setroubleshoot policy


policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    3 
 modules/admin/consoletype.te       |    7 +
 modules/admin/rpm.if               |    2 
 modules/admin/sudo.if              |    2 
 modules/admin/usermanage.te        |    4 
 modules/bgp.te                     |   12 ++
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |    1 
 modules/kernel/storage.fc          |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 ++++
 modules/services/bluetooth.te      |    2 
 modules/services/cups.te           |    1 
 modules/services/cyrus.te          |    1 
 modules/services/dbus.te           |    2 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    1 
 modules/services/hal.fc            |    1 
 modules/services/hal.te            |    7 +
 modules/services/nscd.te           |    2 
 modules/services/openvpn.te        |    6 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  125 +++++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xserver.if        |   22 +++-
 modules/services/zebra.te          |    2 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/logging.te          |    7 +
 modules/system/selinuxutil.te      |   17 ++-
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  201 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 48 files changed, 530 insertions(+), 128 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20060608.patch	14 Jul 2006 20:09:54 -0000	1.22
+++ policy-20060608.patch	14 Jul 2006 20:28:00 -0000	1.23
@@ -579,8 +579,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te	2006-07-14 15:38:25.000000000 -0400
-@@ -0,0 +1,121 @@
++++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te	2006-07-14 16:28:39.000000000 -0400
+@@ -0,0 +1,125 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -674,11 +674,6 @@
 +
 +logging_send_syslog_msg(setroubleshoot_t)
 +
-+#rpm_dontaudit_manage_db(setroubleshoot_t)
-+# ****************BAD BAD BAD **********************
-+rpm_read_db(setroubleshoot_t)
-+rpm_manage_db(setroubleshoot_t)
-+
 +kernel_read_kernel_sysctls(setroubleshoot_t)
 +kernel_read_system_state(setroubleshoot_t)
 +
@@ -702,6 +697,15 @@
 +allow setroubleshoot_t setroubleshootd_t:unix_stream_socket { connectto rw_stream_socket_perms };
 +
 +allow setroubleshoot_t setroubleshoot_exec_t:file { entrypoint getattr ioctl read };
++
++optional_policy(`
++	#rpm_dontaudit_manage_db(setroubleshoot_t)
++	# ****************BAD BAD BAD **********************
++	rpm_read_db(setroubleshoot_t)
++	rpm_manage_db(setroubleshoot_t)
++')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
 +++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-14 14:25:25.000000000 -0400



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:38:53 -0400
Subject: rpms/gwenhywfar/devel gwenhywfar-2.3.0-pkgconfig.patch, NONE,
	1.1 gwenhywfar.spec, 1.11, 1.12 gwenhywfar-1.7.2-libdir.patch,
	1.1, NONE gwenhywfar-aclocal.patch, 1.1, NONE
Message-ID: <200607142038.k6EKcrAI004972@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gwenhywfar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4944

Modified Files:
	gwenhywfar.spec 
Added Files:
	gwenhywfar-2.3.0-pkgconfig.patch 
Removed Files:
	gwenhywfar-1.7.2-libdir.patch gwenhywfar-aclocal.patch 
Log Message:
don't modify gwenhywfar.m4, just patch gwenhywfar-config to use pkgconfig


gwenhywfar-2.3.0-pkgconfig.patch:
 gwenhywfar-config.in.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE gwenhywfar-2.3.0-pkgconfig.patch ---
--- gwenhywfar-2.3.0/gwenhywfar-config.in.in.foo	2006-07-14 16:11:12.000000000 -0400
+++ gwenhywfar-2.3.0/gwenhywfar-config.in.in	2006-07-14 16:17:17.000000000 -0400
@@ -12,22 +12,22 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result -I at gwenhywfar_headerdir@"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--libraries)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@"
+	    result="$result $(pkg-config --libs gwenhywfar)"
 	    ;;
 	--libraries++)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libspp@"
+	    result="$result $(pkg-config --libs-only-L gwenhywfar) @gwenhywfar_libspp@"
 	    ;;
 	--libraries-ui)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libsui@"
+	    result="$result $(pkg-config --libs-only-L gwenhywfar) @gwenhywfar_libsui@"
 	    ;;
 	--headers)
-	    result="$result @gwenhywfar_headerdir@/gwenhywfar"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--plugins)
-	    result="$result @gwenhywfar_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir gwenhywfar)"
 	    ;;
 	--vmajor)
 	    result="$result @GWENHYWFAR_VERSION_MAJOR@"


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwenhywfar.spec	12 Jul 2006 06:19:03 -0000	1.11
+++ gwenhywfar.spec	14 Jul 2006 20:38:51 -0000	1.12
@@ -1,11 +1,11 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 2.3.0
-Release: 1.1
+Release: 2
 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz
-Patch: gwenhywfar-aclocal.patch
 Group: System Environment/Libraries
 License: LGPL
+Patch: gwenhywfar-2.3.0-pkgconfig.patch
 URL: http://sourceforge.net/projects/gwenhywfar
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: openssl-devel gettext
@@ -29,7 +29,7 @@
 
 %prep
 %setup -q
-# Port aclocal file to use pkg-config
+# Port gwenhywfar-config to pkgconfig
 %patch -p1
 
 %build
@@ -42,8 +42,6 @@
 
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 
-rm -f $RPM_BUILD_ROOT/%{_bindir}/gwenhywfar-config
-
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +66,9 @@
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Fri Jul 14 2006 Bill Nottingham <notting at redhat.com> - 2.3.0-2
+- rather than modifying the m4 file, make gwenhywfar-config use pkgconfig
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-1.1
 - rebuild
 


--- gwenhywfar-1.7.2-libdir.patch DELETED ---


--- gwenhywfar-aclocal.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:41:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:41:57 -0400
Subject: rpms/aqbanking/devel aqbanking-1.8.1beta-noglade.patch,1.1,NONE
Message-ID: <200607142041.k6EKfvPb016408@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16333

Removed Files:
	aqbanking-1.8.1beta-noglade.patch 
Log Message:
remove old dead patch



--- aqbanking-1.8.1beta-noglade.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:56:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:56:30 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.40,1.41
Message-ID: <200607142056.k6EKuUt8004180@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4148

Modified Files:
	s390utils.spec 
Log Message:
- buildrequire net-snmp-devel


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- s390utils.spec	14 Jul 2006 19:53:21 -0000	1.40
+++ s390utils.spec	14 Jul 2006 20:56:28 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 4
+Release: 5
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -24,7 +24,7 @@
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
-BuildRequires: libsysfs-devel indent zlib-devel
+BuildRequires: libsysfs-devel indent zlib-devel net-snmp-devel
 ExclusiveArch: s390 s390x
 %define _sbindir /sbin
 
@@ -151,6 +151,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jul 14 2006 Karsten Hopp <karsten at redhat.de> 2:1.5.3-5
+- buildrequire net-snmp-devel
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.3-4
 - rebuild
 - Add missing br libsysfs-devel, indent, zlib-devel



From fedora-cvs-commits at redhat.com  Fri Jul 14 20:59:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 16:59:15 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2398,
	1.2399 linux-2.6-valid-ether-addr.patch, 1.1, NONE
Message-ID: <200607142059.k6EKxF9J005373@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-valid-ether-addr.patch 
Log Message:
begone


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2398
retrieving revision 1.2399
diff -u -r1.2398 -r1.2399
--- kernel-2.6.spec	14 Jul 2006 18:43:10 -0000	1.2398
+++ kernel-2.6.spec	14 Jul 2006 20:59:12 -0000	1.2399
@@ -378,7 +378,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
-Patch1660: linux-2.6-valid-ether-addr.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
@@ -928,8 +927,6 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
-#
-%patch1660 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.


--- linux-2.6-valid-ether-addr.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:03:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:03:03 -0400
Subject: rpms/ltrace/devel ltrace-0.5-gnuhash.patch, NONE,
	1.1 ltrace-0.5-xfail.patch, NONE, 1.1 ltrace.spec, 1.37, 1.38
Message-ID: <200607142103.k6EL33nq006223@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6199

Modified Files:
	ltrace.spec 
Added Files:
	ltrace-0.5-gnuhash.patch ltrace-0.5-xfail.patch 
Log Message:
- adding .gnu.hash patch to support new ELF hash table section
- adding xfail patch to silent clone failing for missing privileges


ltrace-0.5-gnuhash.patch:
 elf.c     |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 elf.h     |    1 
 options.c |    2 -
 3 files changed, 95 insertions(+), 18 deletions(-)

--- NEW FILE ltrace-0.5-gnuhash.patch ---
diff -urpd ltrace-0.5-orig/elf.c ltrace-0.5/elf.c
--- ltrace-0.5-orig/elf.c	2006-07-14 12:28:32.000000000 -0400
+++ ltrace-0.5/elf.c	2006-07-14 16:47:31.000000000 -0400
@@ -169,6 +169,8 @@ static void do_init_elf(struct ltelf *lt
 			Elf_Data *data;
 			size_t j;
 
+			lte->hash_type = SHT_HASH;
+
 			data = elf_getdata(scn, NULL);
 			if (data == NULL || elf_getdata(scn, data) != NULL
 			    || data->d_off || data->d_size != shdr.sh_size)
@@ -209,6 +211,33 @@ static void do_init_elf(struct ltelf *lt
 				error(EXIT_FAILURE, 0,
 				      "Unknown .hash sh_entsize in \"%s\"",
 				      filename);
+#ifdef SHT_GNU_HASH
+		} else if (shdr.sh_type == SHT_GNU_HASH
+			   && lte->hash == NULL) {
+			Elf_Data *data;
+			size_t j;
+
+			lte->hash_type = SHT_GNU_HASH;
+
+			if (shdr.sh_entsize != 0) {
+				error(EXIT_FAILURE, 0,
+				      ".gnu.hash sh_entsize in \"%s\" should be 0",
+				      filename);
+			}
+
+			data = elf_getdata(scn, NULL);
+			if (data == NULL || elf_getdata(scn, data) != NULL
+			    || data->d_off || data->d_size != shdr.sh_size)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .gnu.hash data from \"%s\"",
+				      filename);
+
+			if (data->d_type != ELF_T_GNUHASH)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .gnu.hash data from \"%s\"",
+				      filename);
+			lte->hash = (Elf32_Word *) data->d_buf;
+#endif
 		} else if (shdr.sh_type == SHT_PROGBITS
 			   || shdr.sh_type == SHT_NOBITS) {
 			if (strcmp(name, ".plt") == 0) {
@@ -300,34 +329,81 @@ add_library_symbol(GElf_Addr addr, const
 static int in_load_libraries(const char *name, struct ltelf *lte)
 {
 	size_t i;
-	unsigned long hash;
+	unsigned long hash
+#ifdef SHT_GNU_HASH
+	  , gnu_hash
+#endif
+	  ;
 
 	if (!library_num)
 		return 1;
 
 	hash = elf_hash((const unsigned char *)name);
+#ifdef SHT_GNU_HASH
+	gnu_hash = elf_gnu_hash((const unsigned char *)name);
+#endif
 	for (i = 1; i <= library_num; ++i) {
-		Elf32_Word nbuckets, symndx;
-		Elf32_Word *buckets, *chain;
-
 		if (lte[i].hash == NULL)
 			continue;
 
-		nbuckets = lte[i].hash[0];
-		buckets = &lte[i].hash[2];
-		chain = &lte[i].hash[2 + nbuckets];
-		for (symndx = buckets[hash % nbuckets];
-		     symndx != STN_UNDEF; symndx = chain[symndx]) {
-			GElf_Sym sym;
+#ifdef SHT_GNU_HASH
+		if (lte[i].hash_type == SHT_GNU_HASH) {
+			Elf32_Word * hashbase = lte[i].hash;
+			Elf32_Word nbuckets = *hashbase++;
+			Elf32_Word symbias = *hashbase++;
+			Elf32_Word bitmask_nwords = *hashbase++;
+			Elf32_Word bitmask_idxbits = bitmask_nwords - 1;
+			Elf32_Word shift = *hashbase++;
+			Elf32_Word * buckets;
+			Elf32_Word * chain_zero;
+			Elf32_Word bucket;
 
-			if (gelf_getsym(lte[i].dynsym, symndx, &sym) == NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get symbol from .dynsym");
+			hashbase += LT_ELFCLASS * bitmask_nwords;
+			buckets = hashbase;
+			hashbase += nbuckets;
+			chain_zero = hashbase - symbias;
+			bucket = buckets[gnu_hash % nbuckets];
 
-			if (sym.st_value != 0
-			    && sym.st_shndx != SHN_UNDEF
-			    && strcmp(name, lte[i].dynstr + sym.st_name) == 0)
-				return 1;
+			if (bucket != 0) {
+				const Elf32_Word *hasharr = &chain_zero[bucket];
+				do
+					if ((*hasharr & ~1u) == (gnu_hash & ~1u)) {
+						int symidx = hasharr - chain_zero;
+						GElf_Sym sym;
+
+						if (gelf_getsym(lte[i].dynsym, symidx, &sym) == NULL)
+							error(EXIT_FAILURE, 0,
+							      "Couldn't get symbol from .dynsym");
+
+						if (sym.st_value != 0
+						    && sym.st_shndx != SHN_UNDEF
+						    && strcmp(name, lte[i].dynstr + sym.st_name) == 0)
+							return 1;
+					}
+				while ((*hasharr++ & 1u) == 0);
+			}
+		} else
+#endif
+		{
+			Elf32_Word nbuckets, symndx;
+			Elf32_Word *buckets, *chain;
+			nbuckets = lte[i].hash[0];
+			buckets = &lte[i].hash[2];
+			chain = &lte[i].hash[2 + nbuckets];
+
+			for (symndx = buckets[hash % nbuckets];
+			     symndx != STN_UNDEF; symndx = chain[symndx]) {
+				GElf_Sym sym;
+
+				if (gelf_getsym(lte[i].dynsym, symndx, &sym) == NULL)
+					error(EXIT_FAILURE, 0,
+					      "Couldn't get symbol from .dynsym");
+
+				if (sym.st_value != 0
+				    && sym.st_shndx != SHN_UNDEF
+				    && strcmp(name, lte[i].dynstr + sym.st_name) == 0)
+					return 1;
+			}
 		}
 	}
 	return 0;
diff -urpd ltrace-0.5-orig/elf.h ltrace-0.5/elf.h
--- ltrace-0.5-orig/elf.h	2006-07-14 12:28:32.000000000 -0400
+++ ltrace-0.5/elf.h	2006-07-14 13:26:56.000000000 -0400
@@ -24,6 +24,7 @@ struct ltelf {
 	GElf_Addr *opd_addr;
 	size_t opd_size;
 	Elf32_Word *hash;
+	int hash_type;
 	int lte_flags;
 };
 
diff -urpd ltrace-0.5-orig/options.c ltrace-0.5/options.c
--- ltrace-0.5-orig/options.c	2006-07-14 12:28:32.000000000 -0400
+++ ltrace-0.5/options.c	2006-07-14 16:46:01.000000000 -0400
@@ -3,7 +3,7 @@
 #endif
 
 #ifndef PACKAGE_VERSION
-# define PACKAGE_VERSION "0.3.32"
+# error need package version
 #endif
 
 #include <string.h>

ltrace-0.5-xfail.patch:
 trace-clone.exp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ltrace-0.5-xfail.patch ---
diff -urpd ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp
--- ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:51:31.000000000 -0400
+++ ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:55:52.000000000 -0400
@@ -30,7 +30,7 @@ if [regexp {ELF from incompatible archit
 	fail "32-bit ltrace can not perform on 64-bit PUTs and rebuild ltrace in 64 bit mode!"
 	return
 } elseif [ regexp {Operation not permitted} $exec_output ] {
-        fail "Operation not permitted, see testrun.log for details!"
+        xfail "Operation not permitted, see testrun.log for details!"
         return
 } elseif [ regexp {killed by SIGKILL} $exec_output ] {
         fail "killed by SIGKILL!"


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ltrace.spec	14 Jul 2006 12:02:37 -0000	1.37
+++ ltrace.spec	14 Jul 2006 21:03:01 -0000	1.38
@@ -1,10 +1,12 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn
+Release: 1.0.45svn.1
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
+Patch4: ltrace-0.5-gnuhash.patch
+Patch5: ltrace-0.5-xfail.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
@@ -26,6 +28,8 @@
 %setup -q
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -52,6 +56,10 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.1
+- adding .gnu.hash patch to support new ELF hash table section
+- adding xfail patch to silent clone failing for missing privileges
+
 * Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn
 - adding upstream (svn) version.  It contains most of patches that we
   already use, and has support for secure PLTs.



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:04:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:04:59 -0400
Subject: rpms/rpm/devel rpm-4.4.2-gnuhash.patch, 1.2, 1.3 rpm.spec, 1.210,
	1.211
Message-ID: <200607142104.k6EL4xvg006527@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6500

Modified Files:
	rpm-4.4.2-gnuhash.patch rpm.spec 
Log Message:
Fixed null pointer problem in rpmfcELF() DT_GNU_HASH handling.


rpm-4.4.2-gnuhash.patch:
 rpmfc.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+)

Index: rpm-4.4.2-gnuhash.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-gnuhash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-4.4.2-gnuhash.patch	11 Jul 2006 15:56:14 -0000	1.2
+++ rpm-4.4.2-gnuhash.patch	14 Jul 2006 21:04:56 -0000	1.3
@@ -1,5 +1,5 @@
---- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-11 07:32:22.000000000 -0400
-+++ rpm-4.4.2/build/rpmfc.c	2006-07-11 07:53:46.000000000 -0400
+--- rpm-4.4.2/build/rpmfc.c.gnuhash	2006-07-14 16:59:43.000000000 -0400
++++ rpm-4.4.2/build/rpmfc.c	2006-07-14 17:01:40.000000000 -0400
 @@ -12,6 +12,11 @@
  
  #if HAVE_GELF_H
@@ -34,7 +34,7 @@
                      case DT_DEBUG:    
  			gotDEBUG = 1;
  			/*@innercontinue@*/ continue;
-@@ -1107,6 +1120,16 @@
+@@ -1107,6 +1120,18 @@
      }
      /*@=branchstate =uniondef @*/
  
@@ -44,6 +44,8 @@
 +        ds = rpmdsSingle(RPMTAG_REQUIRENAME, "rtld(GNU_HASH)", "", 
 +                         RPMSENSE_FIND_REQUIRES);
 +        rpmdsMerge(&fc->requires, ds);
++        buf[0] = '\0';
++        t = buf;
 +        rpmfcSaveArg(&fc->ddict, rpmfcFileDep(t, fc->ix, ds));
 +        ds = rpmdsFree(ds);
 +    }


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- rpm.spec	11 Jul 2006 16:59:16 -0000	1.210
+++ rpm.spec	14 Jul 2006 21:04:56 -0000	1.211
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 28
+Release: 29
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -595,6 +595,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Jul 14 2006 David Cantrell <dcantrell at redhat.com> - 4.4.2-29
+- Fixed null pointer problem in rpmfcELF() DT_GNU_HASH handling
+
 * Tue Jul 11 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-28
 - Detect and provide a requirement for DT_GNU_HASH 
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:10:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:10:48 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.2, 1.3 gfs2-utils.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200607142110.k6ELAmpG007700@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7612

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
New sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jun 2006 17:41:24 -0000	1.2
+++ .cvsignore	14 Jul 2006 21:10:45 -0000	1.3
@@ -1 +1 @@
-gfs2-utils-0.1.0.tar.gz
+gfs2-utils-0.1.1.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gfs2-utils.spec	12 Jul 2006 05:54:53 -0000	1.4
+++ gfs2-utils.spec	14 Jul 2006 21:10:45 -0000	1.5
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.0
-Release: 1.fc6.5.1
+Version: 0.1.1
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -22,6 +22,7 @@
 Requires: ncurses
 BuildRequires: ncurses-devel
 BuildRequires: glibc-kernheaders
+BuildRequires: libvolume_id-devel
 URL: http://sources.redhat.com/cluster/
 Source0: gfs2-utils-%{version}.tar.gz
 Patch1: gfs2-utils-norun.patch
@@ -38,12 +39,6 @@
 %patch1 -p1 -b .norun
 
 %build
-cd gfs
-./configure --kernel_src=/usr --libdir=%{_libdir}
-cd libgfs
-make
-cd ../../
-
 cd gfs2
 ./configure --kernel_src=/usr --libdir=%{_libdir}
 sed -i '/RELEASE_MAJOR/s/= .*/= 0/' make/defines.mk
@@ -77,7 +72,10 @@
 %{_mandir}/*/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Chris Feist <cfeist at redhat.com>
+- Rebuild with updated sources
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 
 * Tue Jun 27 2006 Florian La Roche <laroche at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jun 2006 17:41:25 -0000	1.2
+++ sources	14 Jul 2006 21:10:45 -0000	1.3
@@ -1 +1 @@
-4e2691c0de190ae75f12226302615ae0  gfs2-utils-0.1.0.tar.gz
+5d2557915c3b6360922336ec7444be06  gfs2-utils-0.1.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:17:23 -0400
Subject: rpms/ltrace/devel ltrace-0.5-testsuite.patch, NONE, 1.1 ltrace.spec,
	1.38, 1.39 ltrace-0.5-xfail.patch, 1.1, NONE
Message-ID: <200607142117.k6ELHNrS022850@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20574

Modified Files:
	ltrace.spec 
Added Files:
	ltrace-0.5-testsuite.patch 
Removed Files:
	ltrace-0.5-xfail.patch 
Log Message:
More testsuite patches.


ltrace-0.5-testsuite.patch:
 ltrace.main/system_calls.exp |    6 +++---
 ltrace.minor/trace-clone.exp |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE ltrace-0.5-testsuite.patch ---
diff -urpd ltrace-0.5-orig/testsuite/ltrace.main/system_calls.exp ltrace-0.5/testsuite/ltrace.main/system_calls.exp
--- ltrace-0.5-orig/testsuite/ltrace.main/system_calls.exp	2006-07-14 16:51:31.000000000 -0400
+++ ltrace-0.5/testsuite/ltrace.main/system_calls.exp	2006-07-14 17:12:58.000000000 -0400
@@ -40,9 +40,9 @@ set pattern "SYS_brk"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_open"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_fstat"
+set pattern "SYS_(new)?fstat"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_mmap"
+set pattern "SYS_(old_)?mmap"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_close"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
@@ -55,7 +55,7 @@ set pattern "SYS_symlink"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_unlink"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-set pattern "SYS_stat"
+set pattern "SYS_(new)?stat"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "SYS_access"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
diff -urpd ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp
--- ltrace-0.5-orig/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:51:31.000000000 -0400
+++ ltrace-0.5/testsuite/ltrace.minor/trace-clone.exp	2006-07-14 16:55:52.000000000 -0400
@@ -30,7 +30,7 @@ if [regexp {ELF from incompatible archit
 	fail "32-bit ltrace can not perform on 64-bit PUTs and rebuild ltrace in 64 bit mode!"
 	return
 } elseif [ regexp {Operation not permitted} $exec_output ] {
-        fail "Operation not permitted, see testrun.log for details!"
+        xfail "Operation not permitted, see testrun.log for details!"
         return
 } elseif [ regexp {killed by SIGKILL} $exec_output ] {
         fail "killed by SIGKILL!"


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ltrace.spec	14 Jul 2006 21:03:01 -0000	1.38
+++ ltrace.spec	14 Jul 2006 21:17:21 -0000	1.39
@@ -1,12 +1,12 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.1
+Release: 1.0.45svn.2
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
 Patch4: ltrace-0.5-gnuhash.patch
-Patch5: ltrace-0.5-xfail.patch
+Patch5: ltrace-0.5-testsuite.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
@@ -56,9 +56,9 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.1
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.2
 - adding .gnu.hash patch to support new ELF hash table section
-- adding xfail patch to silent clone failing for missing privileges
+- adding testsuite patch to silent some bogus failures
 
 * Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn
 - adding upstream (svn) version.  It contains most of patches that we


--- ltrace-0.5-xfail.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:22:09 -0400
Subject: rpms/perl/devel perl.spec,1.95,1.96
Message-ID: <200607142122.k6ELM9gU026363@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26316

Modified Files:
	perl.spec 
Log Message:
fix upstream perl bug 34297 - "utf8 overload stringify bug"


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- perl.spec	14 Jul 2006 15:52:41 -0000	1.95
+++ perl.spec	14 Jul 2006 21:22:06 -0000	1.96
@@ -173,7 +173,7 @@
 #               ^- stop IPC/SysV.c including <asm/page.h> for getpagesize(), which
 #               is now declared by including <unistd.h> .
 #
-Patch38:        perl-5.8.8-U34297_C28006.patch
+Patch28006:        perl-5.8.8-U34297_C28006.patch
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
@@ -379,7 +379,7 @@
 %patch36    -p1
 
 %patch37    -p1
-%patch38    -p1
+%patch28006 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -583,7 +583,7 @@
 %endif
 
 %changelog
-* Thu Jul 13 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
+* Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
 - Fix upstream perl bug #34297:
   'utf8 overload stringify bug (utf8 caching maybe)'
   upstream patch #28006 applied



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:22:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:22:39 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.23,
	1.24 selinux-policy.spec, 1.223, 1.224
Message-ID: <200607142122.k6ELMdS0026541@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26486

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-1
- Update to upstream
- Fix lpr domain for mls


policy-20060608.patch:
 global_tunables                    |    7 +
 modules/admin/bootloader.te        |    3 
 modules/admin/consoletype.te       |    7 +
 modules/admin/rpm.if               |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 ++++
 modules/services/bluetooth.te      |    2 
 modules/services/cups.te           |    1 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    1 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |    7 +
 modules/services/openvpn.te        |    6 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  125 +++++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xserver.if        |   22 +++-
 modules/services/zebra.te          |    2 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/init.if             |    7 -
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   13 ++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  201 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 42 files changed, 515 insertions(+), 120 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- policy-20060608.patch	14 Jul 2006 20:28:00 -0000	1.23
+++ policy-20060608.patch	14 Jul 2006 21:22:36 -0000	1.24
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/global_tunables	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-14 17:18:54.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,9 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.2/policy/modules/admin/bootloader.te
---- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-06-21 16:21:01.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/bootloader.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-14 17:18:54.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -35,9 +35,9 @@
  fs_read_tmpfs_symlinks(bootloader_t)
  
  mls_file_read_up(bootloader_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-14 17:18:54.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -52,9 +52,9 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.2/policy/modules/admin/rpm.if
---- nsaserefpolicy/policy/modules/admin/rpm.if	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/rpm.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-14 17:18:54.000000000 -0400
 @@ -232,7 +232,7 @@
  
  	files_search_var_lib($1)
@@ -64,58 +64,9 @@
  	allow $1 rpm_var_lib_t:lnk_file { getattr read write unlink };
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.3.2/policy/modules/admin/sudo.if
---- nsaserefpolicy/policy/modules/admin/sudo.if	2006-04-04 18:06:38.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/sudo.if	2006-07-14 14:25:25.000000000 -0400
-@@ -57,7 +57,7 @@
- 	#
- 
- 	# Use capabilities.
--	allow $1_sudo_t self:capability { fowner setuid setgid dac_override sys_resource };
-+	allow $1_sudo_t self:capability { audit_write fowner setuid setgid dac_override sys_resource };
- 	allow $1_sudo_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
- 	allow $1_sudo_t self:process { setexec setrlimit };
- 	allow $1_sudo_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.2/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-06-20 09:54:00.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/usermanage.te	2006-07-14 14:25:25.000000000 -0400
-@@ -187,7 +187,7 @@
- # Groupadd local policy
- #
- 
--allow groupadd_t self:capability { dac_override chown kill setuid sys_resource };
-+allow groupadd_t self:capability { audit_write dac_override chown kill setuid sys_resource };
- dontaudit groupadd_t self:capability fsetid;
- allow groupadd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
- allow groupadd_t self:process { setrlimit setfscreate };
-@@ -450,7 +450,7 @@
- # Useradd local policy
- #
- 
--allow useradd_t self:capability { dac_override chown kill fowner fsetid setuid sys_resource };
-+allow useradd_t self:capability { audit_write dac_override chown kill fowner fsetid setuid sys_resource };
- allow useradd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
- allow useradd_t self:process setfscreate;
- allow useradd_t self:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/bgp.te serefpolicy-2.3.2/policy/modules/bgp.te
---- nsaserefpolicy/policy/modules/bgp.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/bgp.te	2006-07-14 14:25:25.000000000 -0400
-@@ -0,0 +1,12 @@
-+module bgp 1.0;
-+
-+require {
-+	class tcp_socket { name_bind name_connect }; 
-+	type bgp_port_t; 
-+	type port_t; 
-+	type zebra_t; 
-+	role system_r; 
-+};
-+
-+allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect };
-+allow zebra_t port_t:tcp_socket name_bind;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-06-06 22:21:53.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/corenetwork.te.in	2006-07-14 15:21:14.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:04:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:18:54.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -142,9 +93,9 @@
  network_port(zope, tcp,8021,s0)
  
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.2/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-04-29 11:17:34.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/devices.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -89,6 +89,7 @@
  
  /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -153,9 +104,9 @@
  /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
  /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)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -164,9 +115,9 @@
  /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-14 17:18:54.000000000 -0400
 @@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -209,20 +160,9 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.2/policy/modules/kernel/selinux.if
---- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-05-19 13:46:37.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/selinux.if	2006-07-14 14:25:25.000000000 -0400
-@@ -214,7 +214,6 @@
- 
- 	if(!secure_mode_policyload) {
- 		allow $1 security_t:security setbool;
--		auditallow $1 security_t:security setbool;
- 	}
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.2/policy/modules/kernel/storage.fc
---- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-02-01 17:06:11.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/kernel/storage.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -231,9 +171,9 @@
  /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-14 17:18:54.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -257,9 +197,9 @@
 +	kerberos_read_keytab(automount_t)
 +	kerberos_dontaudit_write_config(automount_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.2/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-05-26 14:02:27.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/avahi.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-07-14 17:18:54.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(avahi_t)
  
@@ -268,9 +208,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
---- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-14 17:18:54.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -298,9 +238,9 @@
 +	allow bluetooth_t $1:process sigchld;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-14 17:18:54.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -317,9 +257,9 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.2/policy/modules/services/cups.te
---- nsaserefpolicy/policy/modules/services/cups.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cups.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-14 17:18:54.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -328,9 +268,9 @@
  allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
  allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
  allow cupsd_t self:udp_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-14 17:18:54.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -339,21 +279,9 @@
  
  allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.3.2/policy/modules/services/dbus.te
---- nsaserefpolicy/policy/modules/services/dbus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dbus.te	2006-07-14 14:25:25.000000000 -0400
-@@ -30,7 +30,7 @@
- 
- # dac_override: /var/run/dbus is owned by messagebus on Debian
- # cjp: dac_override should probably go in a distro_debian
--allow system_dbusd_t self:capability { dac_override setgid setpcap setuid };
-+allow system_dbusd_t self:capability { audit_write dac_override setgid setpcap setuid };
- dontaudit system_dbusd_t self:capability sys_tty_config;
- allow system_dbusd_t self:process { getattr signal_perms setcap };
- allow system_dbusd_t self:fifo_file { read write };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.2/policy/modules/services/dovecot.fc
---- nsaserefpolicy/policy/modules/services/dovecot.fc	2005-10-21 23:17:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dovecot.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
@@ -362,9 +290,9 @@
  
  
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.2/policy/modules/services/dovecot.te
---- nsaserefpolicy/policy/modules/services/dovecot.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/dovecot.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-07-14 17:18:54.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -393,9 +321,9 @@
  	nscd_socket_use(dovecot_auth_t)
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.2/policy/modules/services/ftp.te
---- nsaserefpolicy/policy/modules/services/ftp.te	2006-06-13 22:41:52.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/ftp.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-07-14 17:18:54.000000000 -0400
 @@ -50,6 +50,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -404,17 +332,9 @@
  
  allow ftpd_t ftpd_etc_t:file r_file_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
---- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-14 14:25:25.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
- /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-14 17:18:54.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -435,26 +355,41 @@
  	clock_domtrans(hald_t)
  ')
  
-@@ -238,3 +242,4 @@
- optional_policy(`
- 	vbetool_domtrans(hald_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.3.2/policy/modules/services/nscd.te
---- nsaserefpolicy/policy/modules/services/nscd.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/nscd.te	2006-07-14 14:25:25.000000000 -0400
-@@ -28,7 +28,7 @@
- # Local policy
- #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
+--- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-14 17:18:54.000000000 -0400
+@@ -62,7 +62,7 @@
+ 	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
+ 	allow $1_lpr_t self:tcp_socket create_socket_perms;
+ 	allow $1_lpr_t self:udp_socket create_socket_perms;
+-	
++	allow $1_lpr_t self:netlink_route_socket r_netlink_socket_perms;	
+ 	# lpr can run in lightweight mode, without a local print spooler.
+ 	allow $1_lpr_t lpd_var_run_t:dir search;
+ 	allow $1_lpr_t lpd_var_run_t:sock_file write;
+@@ -108,7 +108,11 @@
+ 	allow lpd_t $1_print_spool_t:file r_file_perms;
+ 	allow lpd_t $1_print_spool_t:file link_file_perms;
+ 
++	dev_read_rand($1_lpr_t)
++	dev_read_urand($1_lpr_t)
++
+ 	kernel_tcp_recvfrom($1_lpr_t)
++	kernel_read_kernel_sysctls($1_lpr_t)
+ 
+ 	corenet_tcp_sendrecv_generic_if($1_lpr_t)
+ 	corenet_udp_sendrecv_generic_if($1_lpr_t)
+@@ -186,6 +190,7 @@
+ 		cups_tcp_connect($1_lpr_t)
+ 		cups_read_config($2)
+ 		cups_tcp_connect($2)
++		cups_stream_connect($1_lpr_t)
+ 	')
  
--allow nscd_t self:capability { kill setgid setuid };
-+allow nscd_t self:capability { audit_write kill setgid setuid };
- dontaudit nscd_t self:capability sys_tty_config;
- allow nscd_t self:process { getattr setsched signal_perms };
- allow nscd_t self:fifo_file { read write };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.2/policy/modules/services/openvpn.te
---- nsaserefpolicy/policy/modules/services/openvpn.te	2006-06-21 16:21:03.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/openvpn.te	2006-07-14 14:25:25.000000000 -0400
+ 	optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-14 17:18:54.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -482,9 +417,9 @@
  sysnet_exec_ifconfig(openvpn_t)
  
  ifdef(`targeted_policy',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
---- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-07-14 17:18:54.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -518,9 +453,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-07-14 17:18:54.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -537,9 +472,9 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.2/policy/modules/services/setroubleshoot.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.fc	2006-07-14 15:03:01.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -0,0 +1,8 @@
 +# setroubleshoot executables
 +
@@ -549,9 +484,9 @@
 +
 +/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.2/policy/modules/services/setroubleshoot.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.if	2006-07-14 14:25:25.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-14 17:18:54.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for setroubleshoot</summary>
 +
@@ -577,9 +512,9 @@
 +	allow setroubleshoot_t $1:fifo_file rw_file_perms;
 +	allow setroubleshoot_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/setroubleshoot.te	2006-07-14 16:28:39.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-14 17:18:54.000000000 -0400
 @@ -0,0 +1,125 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -706,9 +641,9 @@
 +')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-14 17:21:54.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -720,9 +655,9 @@
  corenet_tcp_connect_ftp_port(squid_t)
  corenet_tcp_connect_gopher_port(squid_t)
  corenet_tcp_connect_http_port(squid_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
---- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
+--- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-14 17:18:54.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -731,9 +666,9 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-14 17:18:54.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -770,9 +705,9 @@
 +	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.2/policy/modules/services/zebra.te
---- nsaserefpolicy/policy/modules/services/zebra.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/zebra.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-14 17:18:54.000000000 -0400
 @@ -73,9 +73,11 @@
  corenet_tcp_bind_all_nodes(zebra_t)
  corenet_udp_bind_all_nodes(zebra_t)
@@ -785,17 +720,17 @@
  
  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/getty.fc serefpolicy-2.3.2/policy/modules/system/getty.fc
---- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/getty.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
+--- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
  /var/spool/fax		--	gen_context(system_u:object_r:getty_var_run_t,s0)
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.2/policy/modules/system/getty.te
---- nsaserefpolicy/policy/modules/system/getty.te	2006-04-12 12:59:10.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/getty.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-07-14 17:18:54.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -813,9 +748,9 @@
  
  init_rw_utmp(getty_t)
  init_use_script_ptys(getty_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
---- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
+--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-14 17:18:54.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -828,9 +763,9 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-07-14 17:18:54.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -845,9 +780,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.2/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-06-13 07:03:45.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/logging.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-14 17:18:54.000000000 -0400
 @@ -140,7 +140,7 @@
  # Probably want a transition, and a new auditd_helper app
  corecmd_exec_sbin(auditd_t)
@@ -868,23 +803,9 @@
  	seutil_sigchld_newrole(auditd_t)
  ')
  
-@@ -383,3 +387,4 @@
- 	# log to the xconsole
- 	xserver_rw_console(syslogd_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-14 14:25:25.000000000 -0400
-@@ -239,7 +239,7 @@
- # Newrole local policy
- #
- 
--allow newrole_t self:capability { fowner setuid setgid dac_override };
-+allow newrole_t self:capability { audit_write fowner setuid setgid dac_override };
- allow newrole_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execheap execstack };
- allow newrole_t self:process setexec;
- allow newrole_t self:fd use;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-14 17:18:54.000000000 -0400
 @@ -352,6 +352,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
@@ -903,20 +824,11 @@
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
  kernel_read_system_state(restorecond_t)
-@@ -479,7 +483,7 @@
- 
- ifdef(`targeted_policy',`',`
- 	allow run_init_t self:process setexec;
--	allow run_init_t self:capability setuid;
-+	allow run_init_t self:capability { audit_write setuid };
- 	allow run_init_t self:fifo_file rw_file_perms;
- 	allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
- 
 @@ -534,20 +538,27 @@
  # semodule local policy
  #
  
--allow semanage_t self:capability dac_override;
+-allow semanage_t self:capability { dac_override audit_write };
 +allow semanage_t self:capability { audit_write dac_override };
  allow semanage_t self:unix_stream_socket create_stream_socket_perms;
  allow semanage_t self:unix_dgram_socket create_socket_perms;
@@ -941,9 +853,9 @@
  corecmd_exec_bin(semanage_t)
  corecmd_exec_sbin(semanage_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.2/policy/modules/system/setrans.te
---- nsaserefpolicy/policy/modules/system/setrans.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/setrans.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
+--- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-14 17:18:54.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -953,9 +865,9 @@
 +	rpm_use_script_fds(setrans_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.2/policy/modules/system/sysnetwork.te
---- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/sysnetwork.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-07-14 17:18:54.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -964,18 +876,18 @@
  allow ifconfig_t self:tcp_socket { create ioctl };
  files_read_etc_files(ifconfig_t);
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.2/policy/modules/system/unconfined.fc
---- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-06-21 16:21:04.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/unconfined.fc	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-07-14 17:18:54.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.2/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/unconfined.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-14 17:18:54.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -998,9 +910,9 @@
  		dmidecode_domtrans(unconfined_t)
  	')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-14 17:18:54.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1340,9 +1252,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-14 14:25:25.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-14 17:18:54.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- selinux-policy.spec	14 Jul 2006 20:09:54 -0000	1.223
+++ selinux-policy.spec	14 Jul 2006 21:22:36 -0000	1.224
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.2
-Release: 4
+Version: 2.3.3
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,10 @@
 %endif
 
 %changelog
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-1
+- Update to upstream
+- Fix lpr domain for mls
+
 * Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-4
 - Add setroubleshoot policy
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 21:32:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 17:32:15 -0400
Subject: rpms/kernel/devel/configs config-generic,1.228,1.229
Message-ID: <200607142132.k6ELWF1T029504@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv29468/configs

Modified Files:
	config-generic 
Log Message:
missing config opt


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- config-generic	14 Jul 2006 16:37:43 -0000	1.228
+++ config-generic	14 Jul 2006 21:32:12 -0000	1.229
@@ -1465,6 +1465,7 @@
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_COMPUTONE is not set
 CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_ESPSERIAL is not set
 # CONFIG_MOXA_INTELLIO is not set



From fedora-cvs-commits at redhat.com  Fri Jul 14 22:03:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 18:03:53 -0400
Subject: rpms/gdm/devel gdm-2.15.6-fix-setup-hang.patch, NONE, 1.1 gdm.spec,
	1.173, 1.174
Message-ID: <200607142203.k6EM3rPH020651@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20591

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.6-fix-setup-hang.patch 
Log Message:
- fix hang in gdmsetup


gdm-2.15.6-fix-setup-hang.patch:
 gdmsetup.c |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

--- NEW FILE gdm-2.15.6-fix-setup-hang.patch ---
--- gdm-2.15.6/gui/gdmsetup.c.fix-setup-hang	2006-07-14 11:22:17.000000000 +0200
+++ gdm-2.15.6/gui/gdmsetup.c	2006-07-14 16:04:01.000000000 +0200
@@ -5412,15 +5412,13 @@
 
 	if (filename != NULL &&
 	   (strcmp (ve_sure_string (value), ve_sure_string (filename)) != 0)) {
-		g_signal_handlers_disconnect_by_func (file_chooser,
-			(gpointer) background_filechooser_response,
-			file_chooser);
-						      
-		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
-			filename);
+		gchar *old_filename;
+		old_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
 
-		g_signal_connect (G_OBJECT (file_chooser), "selection-changed", 
-			G_CALLBACK (background_filechooser_response), file_chooser);
+		if (strcmp (old_filename, filename) == 0)
+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
+						       filename);
+		g_free (old_filename);
 
 		if (strcmp (ve_sure_string (value), ve_sure_string (filename)) != 0) {
 			gdm_setup_config_set_string (key, (char *)ve_sure_string (filename));
@@ -5449,7 +5447,7 @@
 	 * 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) {
 		value    = gdm_config_get_string (GDM_KEY_CHOOSER_BUTTON_LOGO);
@@ -5470,15 +5468,14 @@
 
 	if (filename != NULL &&
 	   (strcmp (ve_sure_string (value), ve_sure_string (filename)) != 0)) {
-		g_signal_handlers_disconnect_by_func (file_chooser,
-						      (gpointer) logo_filechooser_response,
-						      file_chooser);
+		gchar *old_filename;
 						      
-		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
-		                               filename);
+		old_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
 
-		g_signal_connect (G_OBJECT (file_chooser), "selection-changed", 
-       	                   G_CALLBACK (logo_filechooser_response), file_chooser);
+		if (strcmp (old_filename, filename) != 0)
+			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_chooser),
+						       filename);
+		g_free (old_filename);
 
 		if (GTK_TOGGLE_BUTTON (image_toggle)->active == TRUE) {
 			gdm_setup_config_set_string (key,


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gdm.spec	14 Jul 2006 04:35:07 -0000	1.173
+++ gdm.spec	14 Jul 2006 22:03:50 -0000	1.174
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -48,6 +48,7 @@
 Patch20: gdm-2.15.5-reset-pam.patch
 Patch21: gdm-2.15.5-security-tokens.patch
 Patch22: gdm-2.15.5-session-keyring.patch
+Patch23: gdm-2.15.6-fix-setup-hang.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -129,6 +130,7 @@
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
 %patch22 -p1 -b .session-keyring
+%patch23 -p1 -b .fix-setup-hang
 
 # 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
@@ -324,6 +326,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-3
+- fix hang in gdmsetup
+
 * Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-2
 - put new pam module at top of stack (bug 198629)
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 22:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 18:19:41 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-iseries-kdump, NONE,
	1.1 config-powerpc-generic, 1.21,
	1.22 config-powerpc32-generic, 1.13, 1.14 config-powerpc64,
	1.13, 1.14
Message-ID: <200607142219.k6EMJfgk007085@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6905/configs

Modified Files:
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 
Added Files:
	config-powerpc64-iseries-kdump 
Log Message:
Enable KEXEC/KDUMP for ppc64iseries




--- NEW FILE config-powerpc64-iseries-kdump ---
# CONFIG_NUMA is not set
# CONFIG_EMBEDDED is not set
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_PROC_VMCORE=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-powerpc-generic	13 Jul 2006 16:56:59 -0000	1.21
+++ config-powerpc-generic	14 Jul 2006 22:19:39 -0000	1.22
@@ -4,7 +4,6 @@
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
 CONFIG_DEBUGGER=y
-# CONFIG_KEXEC is not set
 CONFIG_GENERIC_NVRAM=y
 CONFIG_ALTIVEC=y
 CONFIG_TAU=y


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-powerpc32-generic	13 Jul 2006 16:56:59 -0000	1.13
+++ config-powerpc32-generic	14 Jul 2006 22:19:39 -0000	1.14
@@ -58,6 +58,7 @@
 CONFIG_FB_ATY=y
 CONFIG_FB_MATROX=y
 # CONFIG_DISKDUMP is not set
+# CONFIG_KEXEC is not set
 
 # CONFIG_CRASH is not set
 


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- config-powerpc64	26 Jun 2006 15:27:24 -0000	1.13
+++ config-powerpc64	14 Jul 2006 22:19:39 -0000	1.14
@@ -6,7 +6,6 @@
 CONFIG_PPC_IBM_CELL_BLADE=y
 # CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
-CONFIG_KEXEC=y
 CONFIG_PPC_PMAC=y
 CONFIG_IBMEBUS=y
 CONFIG_SPU_FS=m



From fedora-cvs-commits at redhat.com  Fri Jul 14 22:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 18:19:41 -0400
Subject: rpms/kernel/devel Makefile.config,1.41,1.42
Message-ID: <200607142219.k6EMJftq007071@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6905

Modified Files:
	Makefile.config 
Log Message:
Enable KEXEC/KDUMP for ppc64iseries




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Makefile.config	7 Jul 2006 20:55:46 -0000	1.41
+++ Makefile.config	14 Jul 2006 22:19:38 -0000	1.42
@@ -8,7 +8,7 @@
 	$(CFG)-i686.config $(CFG)-i686-PAE.config $(CFG)-i686-kdump.config \
 	$(CFG)-i586.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
-	$(CFG)-ppc64iseries.config \
+	$(CFG)-ppc64iseries.config  $(CFG)-ppc64iseries-kdump.config\
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
@@ -109,6 +109,9 @@
 kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config
 	perl merge.pl $^ powerpc > $@
 
+kernel-$(VERSION)-ppc64iseries-kdump.config: configs/config-powerpc64-iseries-kdump kernel-$(VERSION)-ppc64iseries.config
+	perl merge.pl $^ powerpc > $@
+
 kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
 	perl merge.pl $^ s390 > $@
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 22:50:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 18:50:19 -0400
Subject: rpms/ltrace/devel ltrace-0.5-gnuhash.patch,1.1,1.2
Message-ID: <200607142250.k6EMoJRJ031803@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31441

Modified Files:
	ltrace-0.5-gnuhash.patch 
Log Message:
Fixed gnuhash fix.  Takes into account ELFCLASS of the binary instead of ltrace #defines.


ltrace-0.5-gnuhash.patch:
 elf.c     |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 elf.h     |    1 
 options.c |    2 -
 3 files changed, 95 insertions(+), 18 deletions(-)

Index: ltrace-0.5-gnuhash.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-0.5-gnuhash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-0.5-gnuhash.patch	14 Jul 2006 21:03:01 -0000	1.1
+++ ltrace-0.5-gnuhash.patch	14 Jul 2006 22:50:16 -0000	1.2
@@ -90,7 +90,7 @@
 -			if (gelf_getsym(lte[i].dynsym, symndx, &sym) == NULL)
 -				error(EXIT_FAILURE, 0,
 -				      "Couldn't get symbol from .dynsym");
-+			hashbase += LT_ELFCLASS * bitmask_nwords;
++			hashbase += lte[i].ehdr.e_ident[EI_CLASS] * bitmask_nwords;
 +			buckets = hashbase;
 +			hashbase += nbuckets;
 +			chain_zero = hashbase - symbias;



From fedora-cvs-commits at redhat.com  Fri Jul 14 23:12:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 19:12:43 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.35,1.36
Message-ID: <200607142312.k6ENCgXi022099@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22072

Modified Files:
	gjdoc.spec 
Log Message:
Add timestamp patch.


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gjdoc.spec	12 Jul 2006 05:56:15 -0000	1.35
+++ gjdoc.spec	14 Jul 2006 23:12:39 -0000	1.36
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 3.2
+Release: 4
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -8,6 +8,7 @@
 
 Source0: ftp://ftp.gnu.org/gnu/classpath/gjdoc-%{version}.tar.gz
 Patch0: %{name}-fix-control-z.patch
+Patch1: %{name}-rm-timestamp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: gcc-java >= 4.0.0-8
@@ -20,6 +21,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p0
 
 %build
 %configure
@@ -51,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 14 2006 Ben Konrath <bkonrath at redhat.com> - 0.7.7-4
+- Add timestamp patch.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-3.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 23:16:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 19:16:50 -0400
Subject: rpms/gjdoc/devel gjdoc-rm-timestamp.patch,NONE,1.1
Message-ID: <200607142316.k6ENGoCt002330@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1971

Added Files:
	gjdoc-rm-timestamp.patch 
Log Message:
add timestamp patch

gjdoc-rm-timestamp.patch:
 HtmlDoclet.java |   66 ++++++++++++++++++++++++--------------------------------
 1 files changed, 29 insertions(+), 37 deletions(-)

--- NEW FILE gjdoc-rm-timestamp.patch ---
Index: src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
===================================================================
RCS file: /sources/classpath/gjdoc/src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java,v
retrieving revision 1.62
diff -u -r1.62 HtmlDoclet.java
--- src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java	30 Nov 2005 21:23:47 -0000	1.62
+++ src/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java	14 Jul 2006 22:24:47 -0000
@@ -21,68 +21,65 @@
 package gnu.classpath.tools.doclets.htmldoclet;
 
 import gnu.classpath.tools.IOToolkit;
-
+import gnu.classpath.tools.StringToolkit;
 import gnu.classpath.tools.doclets.AbstractDoclet;
 import gnu.classpath.tools.doclets.DocletConfigurationException;
 import gnu.classpath.tools.doclets.DocletOption;
 import gnu.classpath.tools.doclets.DocletOptionFile;
 import gnu.classpath.tools.doclets.DocletOptionFlag;
 import gnu.classpath.tools.doclets.DocletOptionString;
+import gnu.classpath.tools.doclets.InlineTagRenderer;
 import gnu.classpath.tools.doclets.PackageGroup;
 import gnu.classpath.tools.doclets.TagletPrinter;
-import gnu.classpath.tools.doclets.InlineTagRenderer;
-
 import gnu.classpath.tools.doclets.xmldoclet.HtmlRepairer;
-
+import gnu.classpath.tools.java2xhtml.Java2xhtml;
 import gnu.classpath.tools.taglets.GnuExtendedTaglet;
 import gnu.classpath.tools.taglets.TagletContext;
 
-import gnu.classpath.tools.java2xhtml.Java2xhtml;
-
-import gnu.classpath.tools.StringToolkit;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.Taglet;
-
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
-import java.net.MalformedURLException;
-
 import java.nio.charset.Charset;
-
-import java.text.DateFormat;
 import java.text.MessageFormat;
-
-import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.SortedSet;
-import java.util.TimeZone;
 import java.util.TreeSet;
 
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.ConstructorDoc;
+import com.sun.javadoc.Doc;
+import com.sun.javadoc.ExecutableMemberDoc;
+import com.sun.javadoc.FieldDoc;
+import com.sun.javadoc.MemberDoc;
+import com.sun.javadoc.MethodDoc;
+import com.sun.javadoc.PackageDoc;
+import com.sun.javadoc.ParamTag;
+import com.sun.javadoc.Parameter;
+import com.sun.javadoc.ProgramElementDoc;
+import com.sun.javadoc.SeeTag;
+import com.sun.javadoc.Tag;
+import com.sun.javadoc.ThrowsTag;
+import com.sun.javadoc.Type;
+import com.sun.javadoc.TypeVariable;
+import com.sun.tools.doclets.Taglet;
+
 public class HtmlDoclet
    extends AbstractDoclet
    implements InlineTagRenderer
@@ -1644,14 +1641,6 @@
       output.beginAnchor("http://www.gnu.org/software/classpath/cp-tools/", "", "_top");
       output.print("GNU Classpath Tools");
       output.endAnchor();
-      output.print(", on ");
-      DateFormat format = DateFormat.getDateTimeInstance(DateFormat.LONG,
-							 DateFormat.LONG,
-							 Locale.US);
-      Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"),
-					  Locale.US);
-      format.setCalendar(cal);
-      output.print(format.format(new Date()));
       output.print(".");
       output.endDiv(CssClass.ABOUT_GENERATOR);
 
@@ -3836,12 +3832,15 @@
    public void writeGjdocProperties(File outputFile)
       throws IOException
    {
-      Properties properties = new Properties();
-      properties.setProperty("gjdoc.version", getDocletVersion());
-      properties.setProperty("gjdoc.compat", Boolean.toString(isJavadocCompatibleNames()));
+	   // we're not using Properties.store() because it writes a timestamp
+      String comment = "#GNU Gjdoc API Documentation Set Descriptor\n";
+      String version = "gjdoc.version=" + getDocletVersion() + "\n";
+      String compat = "gjdoc.compat=" + Boolean.toString(isJavadocCompatibleNames()) + "\n";
 
       FileOutputStream out = new FileOutputStream(outputFile);
-      properties.store(out, "GNU Gjdoc API Documentation Set Descriptor");
+      out.write(comment.getBytes("ISO-8859-1"), 0, comment.length());
+      out.write(version.getBytes("ISO-8859-1"), 0, version.length());
+      out.write(compat.getBytes("ISO-8859-1"), 0, compat.length());
       out.close();
    }
 



From fedora-cvs-commits at redhat.com  Fri Jul 14 23:50:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 19:50:25 -0400
Subject: rpms/ltrace/devel ltrace-ppc32fc5.patch, 1.1, 1.2 ltrace.spec, 1.39,
	1.40
Message-ID: <200607142350.k6ENoPSl031214@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30798

Modified Files:
	ltrace-ppc32fc5.patch ltrace.spec 
Log Message:
Reapplying delayed breakpoints init.  Wild guess, might cure brew build on ppc32.


ltrace-ppc32fc5.patch:
 breakpoints.c                  |    5 ++---
 elf.c                          |    6 +++---
 output.c                       |    1 -
 process_event.c                |    9 ++++++---
 sysdeps/linux-gnu/breakpoint.c |   11 ++++++++++-
 sysdeps/linux-gnu/ppc/arch.h   |    4 +---
 sysdeps/linux-gnu/ppc/plt.c    |    8 ++++++--
 sysdeps/linux-gnu/ppc/regs.c   |   11 +++++++++--
 wait_for_something.c           |   12 ++++++++++++
 9 files changed, 49 insertions(+), 18 deletions(-)

Index: ltrace-ppc32fc5.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-ppc32fc5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltrace-ppc32fc5.patch	14 Jul 2006 12:02:36 -0000	1.1
+++ ltrace-ppc32fc5.patch	14 Jul 2006 23:50:23 -0000	1.2
@@ -41,30 +41,6 @@
  							lte->ehdr.e_entry),
  						PLTs_initialized_by_here,
  						lib_tail, 1, 0);
-Index: sysdeps/linux-gnu/breakpoint.c
-===================================================================
---- sysdeps/linux-gnu/breakpoint.c	(revision 45)
-+++ sysdeps/linux-gnu/breakpoint.c	(working copy)
-@@ -9,6 +9,8 @@
- #include "output.h"
- #include "debug.h"
- 
-+#include <errno.h>
-+
- static unsigned char break_insn[] = BREAKPOINT_VALUE;
- 
- #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
-@@ -28,6 +30,10 @@ void enable_breakpoint(pid_t pid, struct
- 		long a =
- 		    ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long),
- 			   0);
-+		if (a == -1 && errno) {
-+			perror ("ptrace");
-+			return;
-+		}
- 		for (j = 0;
- 		     j < sizeof(long)
- 		     && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
 Index: sysdeps/linux-gnu/ppc/plt.c
 ===================================================================
 --- sysdeps/linux-gnu/ppc/plt.c	(revision 45)
@@ -196,3 +172,68 @@
  	}
  	proc->callstack_depth = 0;
  	proc->breakpoints_enabled = -1;
+Index: wait_for_something.c
+===================================================================
+--- wait_for_something.c	(revision 45)
++++ wait_for_something.c	(working copy)
+@@ -48,6 +48,18 @@ struct event *wait_for_something(void)
+ 		fprintf(stderr, "signal from wrong pid %u ?!?\n", pid);
+ 		exit(1);
+ 	}
++#ifdef __powerpc__
++	static int bp_initialized = 0;
++	if (!bp_initialized) {
++		/* This is a hack to do delayed initialization of
++		   breakpoints for ppc32's secure PLT.  We don't have
++		   pid in hand until here, and we need pid to ptrace
++		   the binary. */
++		debug(1, "delayed breakpoints_init ahead");
++		breakpoints_init (event.proc);
++		bp_initialized = 1;
++	}
++#endif
+ 	get_arch_dep(event.proc);
+ 	event.proc->instruction_pointer = NULL;
+ 	debug(3, "signal from pid %u", pid);
+Index: sysdeps/linux-gnu/breakpoint.c
+===================================================================
+--- sysdeps/linux-gnu/breakpoint.c	(revision 45)
++++ sysdeps/linux-gnu/breakpoint.c	(working copy)
+@@ -9,6 +9,8 @@
+ #include "output.h"
+ #include "debug.h"
+ 
++#include <errno.h>
++
+ static unsigned char break_insn[] = BREAKPOINT_VALUE;
+ 
+ #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
+@@ -24,20 +26,27 @@ void enable_breakpoint(pid_t pid, struct
+ 
+ 	debug(1, "enable_breakpoint(%d,%p)", pid, sbp->addr);
+ 
++	unsigned char orig[BREAKPOINT_LENGTH];
+ 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
+ 		long a =
+ 		    ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long),
+ 			   0);
++		if (a == -1 && errno) {
++			perror ("ptrace");
++			return;
++		}
+ 		for (j = 0;
+ 		     j < sizeof(long)
+ 		     && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
+ 			unsigned char *bytes = (unsigned char *)&a;
+ 
+-			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
++			orig[i * sizeof(long) + j] = bytes[j];
+ 			bytes[j] = break_insn[i * sizeof(long) + j];
+ 		}
+ 		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
+ 	}
++	if (memcmp (orig, break_insn, BREAKPOINT_LENGTH) != 0)
++		memcpy (sbp->orig_value, orig, BREAKPOINT_LENGTH);
+ }
+ #endif				/* ARCH_HAVE_ENABLE_BREAKPOINT */
+ 


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ltrace.spec	14 Jul 2006 21:17:21 -0000	1.39
+++ ltrace.spec	14 Jul 2006 23:50:23 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.2
+Release: 1.0.45svn.3
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -56,7 +56,7 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.2
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.3
 - adding .gnu.hash patch to support new ELF hash table section
 - adding testsuite patch to silent some bogus failures
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 00:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 20:27:53 -0400
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.70,1.71
Message-ID: <200607150027.k6F0Rr55025724@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25695

Modified Files:
	vixie-cron.spec 
Log Message:
fix bug 198893


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- vixie-cron.spec	12 Jul 2006 08:44:05 -0000	1.70
+++ vixie-cron.spec	15 Jul 2006 00:27:50 -0000	1.71
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 55.FC6.1
+Release: 56.FC6
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -218,13 +218,16 @@
 %{_mandir}/man8/cron.*
 %{_mandir}/man5/crontab.*
 %{_mandir}/man1/crontab.*
-%dir /var/spool/cron
-%dir /etc/cron.d
+%attr(700,root,root) %dir /var/spool/cron
+%attr(700,root,root) %dir /etc/cron.d
 %config /etc/rc.d/init.d/crond
 %config /etc/pam.d/crond
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-56.FC6
+- fix bug 198893 - change permissions of cron spool directories to 0700
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:4.1-55.FC6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 00:31:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 20:31:18 -0400
Subject: rpms/vixie-cron/FC-5 vixie-cron.spec,1.68,1.69
Message-ID: <200607150031.k6F0VIiD026850@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26821

Modified Files:
	vixie-cron.spec 
Log Message:
fix bug 198893


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-5/vixie-cron.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vixie-cron.spec	15 Feb 2006 23:50:19 -0000	1.68
+++ vixie-cron.spec	15 Jul 2006 00:31:15 -0000	1.69
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 54.FC5
+Release: 55.FC5
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -84,6 +84,7 @@
 %if %{WITH_AUDIT}
 Requires: audit-libs >= 1.0.3
 Buildrequires: audit-libs >= 1.0.3
+Buildrequires: audit-libs-devel >= 1.0.3
 %endif
 
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
@@ -217,13 +218,17 @@
 %{_mandir}/man8/cron.*
 %{_mandir}/man5/crontab.*
 %{_mandir}/man1/crontab.*
-%dir /var/spool/cron
-%dir /etc/cron.d
+%attr(700,root,root) %dir /var/spool/cron
+%attr(700,root,root) %dir /etc/cron.d
 %config /etc/rc.d/init.d/crond
 %config /etc/pam.d/crond
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-55.FC5
+- fix bug 198893 - change permissions of cron spool directories to 0700
+- fix bug 191823: fix missing BuildRequires: audit-libs-devel
+
 * 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
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 00:38:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 20:38:55 -0400
Subject: rpms/ltrace/devel ltrace-0.5-gnuhash.patch, 1.2, 1.3 ltrace.spec,
	1.40, 1.41
Message-ID: <200607150038.k6F0ct7X028436@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28413

Modified Files:
	ltrace-0.5-gnuhash.patch ltrace.spec 
Log Message:
More gnuhash fixes.


ltrace-0.5-gnuhash.patch:
 elf.c     |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 elf.h     |    1 
 options.c |    2 -
 3 files changed, 92 insertions(+), 18 deletions(-)

Index: ltrace-0.5-gnuhash.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-0.5-gnuhash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltrace-0.5-gnuhash.patch	14 Jul 2006 22:50:16 -0000	1.2
+++ ltrace-0.5-gnuhash.patch	15 Jul 2006 00:38:52 -0000	1.3
@@ -10,7 +10,7 @@
  			data = elf_getdata(scn, NULL);
  			if (data == NULL || elf_getdata(scn, data) != NULL
  			    || data->d_off || data->d_size != shdr.sh_size)
-@@ -209,6 +211,33 @@ static void do_init_elf(struct ltelf *lt
+@@ -209,6 +211,30 @@ static void do_init_elf(struct ltelf *lt
  				error(EXIT_FAILURE, 0,
  				      "Unknown .hash sh_entsize in \"%s\"",
  				      filename);
@@ -22,10 +22,11 @@
 +
 +			lte->hash_type = SHT_GNU_HASH;
 +
-+			if (shdr.sh_entsize != 0) {
++			if (shdr.sh_entsize != 0
++			    && shdr.sh_entsize != 4) {
 +				error(EXIT_FAILURE, 0,
-+				      ".gnu.hash sh_entsize in \"%s\" should be 0",
-+				      filename);
++				      ".gnu.hash sh_entsize in \"%s\" should be 4, but is %d",
++				      filename, shdr.sh_entsize);
 +			}
 +
 +			data = elf_getdata(scn, NULL);
@@ -35,10 +36,6 @@
 +				      "Couldn't get .gnu.hash data from \"%s\"",
 +				      filename);
 +
-+			if (data->d_type != ELF_T_GNUHASH)
-+				error(EXIT_FAILURE, 0,
-+				      "Couldn't get .gnu.hash data from \"%s\"",
-+				      filename);
 +			lte->hash = (Elf32_Word *) data->d_buf;
 +#endif
  		} else if (shdr.sh_type == SHT_PROGBITS


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ltrace.spec	14 Jul 2006 23:50:23 -0000	1.40
+++ ltrace.spec	15 Jul 2006 00:38:52 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.3
+Release: 1.0.45svn.4
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -56,7 +56,7 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.3
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.4
 - adding .gnu.hash patch to support new ELF hash table section
 - adding testsuite patch to silent some bogus failures
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 00:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 20:46:40 -0400
Subject: rpms/kbd/devel kbd.spec,1.34,1.35
Message-ID: <200607150046.k6F0keoP007026@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6905

Modified Files:
	kbd.spec 
Log Message:
we dropped open package, infavor of openvt in kbd


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kbd.spec	12 Jul 2006 06:36:54 -0000	1.34
+++ kbd.spec	15 Jul 2006 00:46:38 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 16.1
+Release: 17
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -23,8 +23,8 @@
 Patch8: kbd-1.12-dir.patch
 Patch9: kbd-1.12-no-user-map.patch
 Patch10: kbd-1.12-resizecon-man.patch
-Obsoletes: console-tools
-Provides: console-tools
+Obsoletes: console-tools open
+Provides: console-tools open
 Conflicts: util-linux < 2.11r-9
 Prereq: initscripts >= 5.86-1
 ExcludeArch: s390 s390x
@@ -104,6 +104,9 @@
 install -c -m644 %{SOURCE3} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kbdrate
 
+# Link open to openvt
+ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
+
 %find_lang %{name}
 
 %clean
@@ -124,6 +127,10 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.12-17
+- Obsoletes/Provides open
+- Create a symlink from open to openvt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.12-16.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 00:51:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 20:51:12 -0400
Subject: rpms/ltrace/devel ltrace-ppc32fc5.patch, 1.2, 1.3 ltrace.spec, 1.41,
	1.42
Message-ID: <200607150051.k6F0pCHp015406@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15159

Modified Files:
	ltrace-ppc32fc5.patch ltrace.spec 
Log Message:
Trimming down the patch... I think it should do the job.


ltrace-ppc32fc5.patch:
 breakpoints.c                |    5 ++---
 elf.c                        |    6 +++---
 output.c                     |    1 -
 process_event.c              |    9 ++++++---
 sysdeps/linux-gnu/ppc/arch.h |    4 +---
 sysdeps/linux-gnu/ppc/plt.c  |    8 ++++++--
 sysdeps/linux-gnu/ppc/regs.c |   11 +++++++++--
 7 files changed, 27 insertions(+), 17 deletions(-)

Index: ltrace-ppc32fc5.patch
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace-ppc32fc5.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltrace-ppc32fc5.patch	14 Jul 2006 23:50:23 -0000	1.2
+++ ltrace-ppc32fc5.patch	15 Jul 2006 00:51:09 -0000	1.3
@@ -172,68 +172,3 @@
  	}
  	proc->callstack_depth = 0;
  	proc->breakpoints_enabled = -1;
-Index: wait_for_something.c
-===================================================================
---- wait_for_something.c	(revision 45)
-+++ wait_for_something.c	(working copy)
-@@ -48,6 +48,18 @@ struct event *wait_for_something(void)
- 		fprintf(stderr, "signal from wrong pid %u ?!?\n", pid);
- 		exit(1);
- 	}
-+#ifdef __powerpc__
-+	static int bp_initialized = 0;
-+	if (!bp_initialized) {
-+		/* This is a hack to do delayed initialization of
-+		   breakpoints for ppc32's secure PLT.  We don't have
-+		   pid in hand until here, and we need pid to ptrace
-+		   the binary. */
-+		debug(1, "delayed breakpoints_init ahead");
-+		breakpoints_init (event.proc);
-+		bp_initialized = 1;
-+	}
-+#endif
- 	get_arch_dep(event.proc);
- 	event.proc->instruction_pointer = NULL;
- 	debug(3, "signal from pid %u", pid);
-Index: sysdeps/linux-gnu/breakpoint.c
-===================================================================
---- sysdeps/linux-gnu/breakpoint.c	(revision 45)
-+++ sysdeps/linux-gnu/breakpoint.c	(working copy)
-@@ -9,6 +9,8 @@
- #include "output.h"
- #include "debug.h"
- 
-+#include <errno.h>
-+
- static unsigned char break_insn[] = BREAKPOINT_VALUE;
- 
- #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
-@@ -24,20 +26,27 @@ void enable_breakpoint(pid_t pid, struct
- 
- 	debug(1, "enable_breakpoint(%d,%p)", pid, sbp->addr);
- 
-+	unsigned char orig[BREAKPOINT_LENGTH];
- 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
- 		long a =
- 		    ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long),
- 			   0);
-+		if (a == -1 && errno) {
-+			perror ("ptrace");
-+			return;
-+		}
- 		for (j = 0;
- 		     j < sizeof(long)
- 		     && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
- 			unsigned char *bytes = (unsigned char *)&a;
- 
--			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
-+			orig[i * sizeof(long) + j] = bytes[j];
- 			bytes[j] = break_insn[i * sizeof(long) + j];
- 		}
- 		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
- 	}
-+	if (memcmp (orig, break_insn, BREAKPOINT_LENGTH) != 0)
-+		memcpy (sbp->orig_value, orig, BREAKPOINT_LENGTH);
- }
- #endif				/* ARCH_HAVE_ENABLE_BREAKPOINT */
- 


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ltrace.spec	15 Jul 2006 00:38:52 -0000	1.41
+++ ltrace.spec	15 Jul 2006 00:51:09 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.5
-Release: 1.0.45svn.4
+Release: 1.0.45svn.5
 Source: ltrace-0.5.tar.gz
 Patch2: ltrace-opd.patch
 Patch3: ltrace-ppc32fc5.patch
@@ -56,7 +56,7 @@
 %config /etc/ltrace.conf
 
 %changelog
-* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.4
+* Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 0.5-1.0.45svn.5
 - adding .gnu.hash patch to support new ELF hash table section
 - adding testsuite patch to silent some bogus failures
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 02:52:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 22:52:03 -0400
Subject: rpms/tree/devel tree.spec,1.19,1.20
Message-ID: <200607150252.k6F2q3Qr028695@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tree/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28662

Modified Files:
	tree.spec 
Log Message:
bump


Index: tree.spec
===================================================================
RCS file: /cvs/dist/rpms/tree/devel/tree.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tree.spec	12 Jul 2006 08:32:59 -0000	1.19
+++ tree.spec	15 Jul 2006 02:52:00 -0000	1.20
@@ -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.2
+Release: 4
 Group: Applications/File
 License: GPL
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -48,7 +48,7 @@
 %doc README
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2.2
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-4
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2.1



From fedora-cvs-commits at redhat.com  Sat Jul 15 02:55:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 22:55:50 -0400
Subject: rpms/rdate/devel rdate.spec,1.18,1.19
Message-ID: <200607150255.k6F2toM5030197@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30167

Modified Files:
	rdate.spec 
Log Message:
bump


Index: rdate.spec
===================================================================
RCS file: /cvs/dist/rpms/rdate/devel/rdate.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rdate.spec	11 Feb 2006 05:28:30 -0000	1.18
+++ rdate.spec	15 Jul 2006 02:55:48 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Tool for getting the date/time from a remote machine.
 Name: rdate
 Version: 1.4
-Release: 4.2.1
+Release: 5
 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 Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.4-5
+- bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4-4.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 02:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 22:57:24 -0400
Subject: rpms/which/devel which.spec,1.10,1.11
Message-ID: <200607150257.k6F2vOSn030818@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/which/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30793

Modified Files:
	which.spec 
Log Message:
bump


Index: which.spec
===================================================================
RCS file: /cvs/dist/rpms/which/devel/which.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- which.spec	11 Feb 2006 06:05:09 -0000	1.10
+++ which.spec	15 Jul 2006 02:57:22 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Displays where a particular program in your path is located.
 Name: which
 Version: 2.16
-Release: 6.2.1
+Release: 7
 License: GPL
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.16-7
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-6.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:01:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:01:09 -0400
Subject: rpms/xmltex/devel xmltex.spec,1.17,1.18
Message-ID: <200607150301.k6F3197Z031949@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmltex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31890

Modified Files:
	xmltex.spec 
Log Message:
bump


Index: xmltex.spec
===================================================================
RCS file: /cvs/dist/rpms/xmltex/devel/xmltex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmltex.spec	12 Jul 2006 17:38:47 -0000	1.17
+++ xmltex.spec	15 Jul 2006 03:00:52 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	Namespace-aware XML parser written in TeX.
 Name:		xmltex
 Version:	20020625
-Release: 7.1
+Release:	8
 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
@@ -64,7 +64,7 @@
 %{_datadir}/texmf/tex/xmltex
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 20020625-7.1
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 20020625-8
 - rebuild
 
 * Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-7
@@ -139,8 +139,8 @@
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.17  2006/07/12 17:38:47  jkeating
-bumped for rebuild
+Revision 1.18  2006/07/15 03:00:52  jkeating
+bump
 
 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  Sat Jul 15 03:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:03:16 -0400
Subject: rpms/aqbanking/devel aqbanking-2.1.0-pkgconfig.patch, NONE,
	1.1 aqbanking-2.1.0-visibility.patch, NONE, 1.1 aqbanking.spec,
	1.18, 1.19 aqbanking-aclocal.patch, 1.2, NONE
Message-ID: <200607150303.k6F33G2O032149@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32091

Modified Files:
	aqbanking.spec 
Added Files:
	aqbanking-2.1.0-pkgconfig.patch 
	aqbanking-2.1.0-visibility.patch 
Removed Files:
	aqbanking-aclocal.patch 
Log Message:
port *-config to pkgconfig
turn off -fvisiblity=hidden for now


aqbanking-2.1.0-pkgconfig.patch:
 aqbanking-config.in.in                           |   10 +++++-----
 src/frontends/cbanking/cbanking-config.in.in     |    6 +++---
 src/frontends/g2banking/g2banking-config.in.in   |    6 +++---
 src/frontends/kbanking/kbanking-config.in.in     |    6 +++---
 src/frontends/qbanking/lib/qbanking-config.in.in |   10 +++++-----
 5 files changed, 19 insertions(+), 19 deletions(-)

--- NEW FILE aqbanking-2.1.0-pkgconfig.patch ---
diff -ru aqbanking-2.1.0/aqbanking-config.in.in aqbanking-2.1.0.fixed/aqbanking-config.in.in
--- aqbanking-2.1.0/aqbanking-config.in.in	2006-04-03 15:30:43.000000000 -0400
+++ aqbanking-2.1.0.fixed/aqbanking-config.in.in	2006-07-14 17:08:28.000000000 -0400
@@ -10,19 +10,19 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @aqbanking_includes@ @gwenhywfar_includes@"
+	    result="$result $(pkg-config --cflags aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @aqbanking_ldflags@ @aqbanking_libs@"
+	    result="$result $(pkg-config --libs aqbanking)"
 	    ;;
 	--libraries++)
-	    result="$result @aqbanking_ldflags@ @aqbanking_libspp@"
+	    result="$result $(pkg-config --variable=librariespp aqbanking)"
 	    ;;
 	--plugins)
-	    result="$result @aqbanking_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir aqbanking)"
 	    ;;
 	--data)
-	    result="$result @aqbanking_pkgdatadir@"
+	    result="$result $(pkg-conifg --variable=pkgdatadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @AQBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in	2006-04-03 15:30:32.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in	2006-07-14 17:00:24.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @cbanking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=cbanking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @cbanking_libs@"
+	    result="$result $(pkg-config --variable=cbanking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @cbanking_data@"
+	    result="$result $(pkg-config --variable=cbanking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @CBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in
--- aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in	2006-04-03 15:30:23.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in	2006-07-14 17:08:00.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @g2banking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=g2banking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @g2banking_libs@"
+	    result="$result $(pkg-config --variable=g2banking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @g2banking_data@"
+	    result="$result $(pkg-config --variable=g2banking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @G2BANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in	2006-04-03 15:30:24.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in	2006-07-14 17:01:26.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @kbanking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=kbanking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @kbanking_libs@"
+	    result="$result $(pkg-config --variable=kbanking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @kbanking_data@"
+	    result="$result $(pkg-config --variable=kbanking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @KBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in	2006-04-03 15:30:30.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in	2006-07-14 17:07:03.000000000 -0400
@@ -11,19 +11,19 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @qbanking_includes@ @aqbanking_includes@ @gwenhywfar_includes@ @qt3_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=qbanking_includes aqbanking) $(pkg-config --cflags gwenhywfar) $(pkg-config --cflags qt-mt)"
 	    ;;
 	--libraries)
-	    result="$result @qbanking_libs@"
+	    result="$result $(pkg-config --variable=qbanking_libs aqbanking)"
 	    ;;
 	--plugins)
-	    result="$result @qbanking_plugindir@"
+	    result="$result $(pkg-config --variable=aqbanking_plugindir)/frontends/qbanking"
 	    ;;
 	--data)
-	    result="$result @qbanking_data@"
+	    result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking"
 	    ;;
 	--helpdir)
-	    result="$result @qbanking_helpdir@"
+	    result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking/help"
 	    ;;
 	--vmajor)
 	    result="$result @QBANKING_VERSION_MAJOR@"

aqbanking-2.1.0-visibility.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE aqbanking-2.1.0-visibility.patch ---
--- aqbanking-2.1.0/configure.moo	2006-07-14 22:56:01.000000000 -0400
+++ aqbanking-2.1.0/configure	2006-07-14 22:56:18.000000000 -0400
@@ -27040,7 +27040,7 @@
   gcc*)
      gccversion=`$CC --version | { read x1 x2 x3; echo $x3; }`
      case $gccversion in
-       0.* | 1.* | 2.* | 3.*)
+       0.* | 1.* | 2.* | 3.* | 4.*)
          visibility_supported="no (needs gcc >=4.0, you have $gccversion)"
          ;;
        *)


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aqbanking.spec	12 Jul 2006 05:12:42 -0000	1.18
+++ aqbanking.spec	15 Jul 2006 03:03:12 -0000	1.19
@@ -1,13 +1,14 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 2.1.0
-Release: 1.1
+Release: 2
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 License: GPL
 URL: http://sourceforge.net/projects/aqbanking
 Patch: aqbanking-libdir.patch
-Patch2: aqbanking-aclocal.patch
+Patch2: aqbanking-2.1.0-pkgconfig.patch
+Patch3: aqbanking-2.1.0-visibility.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gwenhywfar-devel >= 1.99.2 qt-devel
 BuildRequires: libofx-devel >= 0.7.0, gettext, autoconf, libtool
@@ -39,10 +40,10 @@
 %setup -q
 %patch -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-autoconf
 %{configure} --disable-static --with-backends="aqhbci aqdtaus aqofxconnect" \
   --with-frontends="cbanking qbanking" --enable-python
 make LIBTOOL=/usr/bin/libtool
@@ -55,9 +56,6 @@
 find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name *.a -exec rm -f {} \;
 
-
-rm -f $RPM_BUILD_ROOT/%{_bindir}/*-config
-
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 mv $RPM_BUILD_ROOT/%{_datadir}/doc/{aqbanking,aqhbci} $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
 
@@ -84,6 +82,7 @@
 %files devel
 %defattr(-,root,root)
 %{_bindir}/hbcixml2
+%{_bindir}/*-config
 %{_libdir}/*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
@@ -91,6 +90,10 @@
 
 
 %changelog
+* Fri Jul 14 2006 Bill Nottingham <notting at redhat.com> - 2.1.0-2
+- port *-config to pkgconfig
+- don't use -fvisibility=hidden
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1.0-1.1
 - rebuild
 


--- aqbanking-aclocal.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:04:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:04:24 -0400
Subject: rpms/xdelta/devel xdelta.spec,1.22,1.23
Message-ID: <200607150304.k6F34OSM032329@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32286

Modified Files:
	xdelta.spec 
Log Message:
bump


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xdelta.spec	30 May 2006 14:19:01 -0000	1.22
+++ xdelta.spec	15 Jul 2006 03:04:20 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.3
-Release: 19
+Release: 20
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
@@ -86,6 +86,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 1.1.3-20
+- rebuild
+
 * Tue May 30 2006 Ludek Smid <lsmid at redhat.com> 1.1.3-19
 - libtoolize and autotools are now run during build phase
 - resolved multilib conflict using pkgconfig tool



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:09:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:09:02 -0400
Subject: rpms/uucp/devel uucp.spec,1.29,1.30
Message-ID: <200607150309.k6F392Fq000765@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/uucp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv729

Modified Files:
	uucp.spec 
Log Message:
bump


Index: uucp.spec
===================================================================
RCS file: /cvs/dist/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- uucp.spec	11 Feb 2006 05:56:44 -0000	1.29
+++ uucp.spec	15 Jul 2006 03:09:00 -0000	1.30
@@ -7,7 +7,7 @@
 Summary: The uucp utility for copying files between systems.
 Name: uucp
 Version: 1.07
-Release: 11.2.1
+Release: 12
 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 Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.07-12
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.07-11.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:22:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:22:49 -0400
Subject: rpms/system-switch-mail/devel system-switch-mail.spec,1.13,1.14
Message-ID: <200607150322.k6F3MnKB020636@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-switch-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20606

Modified Files:
	system-switch-mail.spec 
Log Message:
bump


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- system-switch-mail.spec	12 Jul 2006 08:24:49 -0000	1.13
+++ system-switch-mail.spec	15 Jul 2006 03:22:47 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
 Version: 0.5.25
-Release: 8.1
+Release: 9
 Source0: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: Applications/System
@@ -76,7 +76,7 @@
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.25-8.1
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.5.25-9
 - rebuild
 
 * Tue Mar 07 2006 Than Ngo <than at redhat.com> 0.5.25-8



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:25:11 -0400
Subject: rpms/sysreport/devel sysreport.spec,1.37,1.38
Message-ID: <200607150325.k6F3PB2u021672@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysreport/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21647

Modified Files:
	sysreport.spec 
Log Message:
bump


Index: sysreport.spec
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sysreport.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sysreport.spec	27 Apr 2006 11:45:02 -0000	1.37
+++ sysreport.spec	15 Jul 2006 03:25:09 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Gathers system hardware and configuration information.
 Name: sysreport
 Version: 1.4.3
-Release: 6
+Release: 7
 URL: http://www.redhat.com/support
 Group: Development/Debuggers
 Source0: %{name}-%{version}-%{release}.tar.bz2
@@ -42,6 +42,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 1.4.3-7
+- rebuild
+
 * Thu Apr 27 2006 Than Ngo <than at redhat.com> 1.4.3-6
 - fix #190053, Sysreport text refers to Red Hat Linux
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:26:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:26:52 -0400
Subject: rpms/unifdef/devel - New directory
Message-ID: <200607150326.k6F3Qq1d022386@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unifdef/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22357/unifdef/devel

Log Message:
Directory /cvs/dist/rpms/unifdef/devel added to the repository




From fedora-cvs-commits at redhat.com  Sat Jul 15 03:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:26:58 -0400
Subject: rpms/unifdef/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200607150326.k6F3QwOc022458@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unifdef/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22421/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module unifdef


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:27:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:27:08 -0400
Subject: rpms/unifdef/devel unifdef.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200607150327.k6F3R8j2022564@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unifdef/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	unifdef.spec 
Log Message:
auto-import unifdef-1.171-3.fc6 on branch devel from unifdef-1.171-3.fc6.src.rpm


--- NEW FILE unifdef.spec ---
%define dist .fc6

Summary: Unifdef tool for removing ifdef'd lines
Name: unifdef
Version: 1.171
Release: 3%{?dist}
License: BSD
Group: Development/Languages
URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/
Source0: unifdef-1.171.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Unifdef is useful for removing ifdefed lines from a file while otherwise
leaving the file alone. Unifdef acts on #ifdef, #ifndef, #else, and #endif
lines, and it knows only enough about C and C++ to know when one of these
is inactive because it is inside a comment, or a single or double quote.

%prep
%setup -q

%build
make CFLAGS="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
install -d -m0755 $RPM_BUILD_ROOT%{_bindir}
install -p -m0755 unifdef $RPM_BUILD_ROOT%{_bindir}/unifdef
install -p -m0755 unifdefall.sh $RPM_BUILD_ROOT%{_bindir}/unifdefall.sh

install -d -m0755 $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m0644 unifdef.1 $RPM_BUILD_ROOT%{_mandir}/man1/unifdef.1

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/unifdef
%{_bindir}/unifdefall.sh
%{_mandir}/man1/unifdef.1.gz


%changelog
* Tue May  2 2006 David Woodhouse <dwmw2 at infradead.org> - 1.171-3
- Minor specfile cleanups from review

* Wed Apr 26 2006 David Woodhouse <dwmw2 at infradead.org> - 1.171-2
- Change BuildRoot

* Tue Apr 25 2006 David Woodhouse <dwmw2 at infradead.org> - 1.171-1
- Initial import from FreeBSD CVS



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/unifdef/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jul 2006 03:26:56 -0000	1.1
+++ .cvsignore	15 Jul 2006 03:27:06 -0000	1.2
@@ -0,0 +1 @@
+unifdef-1.171.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/unifdef/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jul 2006 03:26:56 -0000	1.1
+++ sources	15 Jul 2006 03:27:06 -0000	1.2
@@ -0,0 +1 @@
+657e97bab7cfed217f3a7c73fba9f1cb  unifdef-1.171.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:28:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:28:39 -0400
Subject: rpms/unifdef/devel unifdef.spec,1.1,1.2
Message-ID: <200607150328.k6F3SdFM023135@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unifdef/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23106

Modified Files:
	unifdef.spec 
Log Message:
bump


Index: unifdef.spec
===================================================================
RCS file: /cvs/dist/rpms/unifdef/devel/unifdef.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unifdef.spec	15 Jul 2006 03:27:06 -0000	1.1
+++ unifdef.spec	15 Jul 2006 03:28:36 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Unifdef tool for removing ifdef'd lines
 Name: unifdef
 Version: 1.171
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.171-4
+- Minor specfile cleanups from review
+
 * Tue May  2 2006 David Woodhouse <dwmw2 at infradead.org> - 1.171-3
 - Minor specfile cleanups from review
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:30:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:30:50 -0400
Subject: rpms/strace/devel strace.spec,1.37,1.38
Message-ID: <200607150330.k6F3Uofp023880@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23857

Modified Files:
	strace.spec 
Log Message:
bump


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- strace.spec	24 Apr 2006 13:19:57 -0000	1.37
+++ strace.spec	15 Jul 2006 03:30:48 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process.
 Name: strace
 Version: 4.5.14
-Release: 1.2
+Release: 2
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:32:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:32:56 -0400
Subject: rpms/sharutils/devel sharutils.spec,1.26,1.27
Message-ID: <200607150332.k6F3WuBp024091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sharutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24071

Modified Files:
	sharutils.spec 
Log Message:
bump


Index: sharutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sharutils.spec	11 Feb 2006 05:41:53 -0000	1.26
+++ sharutils.spec	15 Jul 2006 03:32:52 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
 Version: 4.6.1
-Release: 1.2
+Release: 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 Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-2
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:38:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:38:56 -0400
Subject: rpms/scrollkeeper/devel scrollkeeper.spec,1.19,1.20
Message-ID: <200607150338.k6F3cuDD025407@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25380

Modified Files:
	scrollkeeper.spec 
Log Message:
bump


Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- scrollkeeper.spec	11 Feb 2006 05:40:19 -0000	1.19
+++ scrollkeeper.spec	15 Jul 2006 03:38:54 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
 Name:       scrollkeeper
 Version:    0.3.14
-Release: 5.2.1
+Release:    6
 Source0:    http://download.sourceforge.net/scrollkeeper/%{name}-%{version}.tar.gz
 License:    LGPL
 Group:      System Environment/Base
@@ -120,6 +120,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.3.14-6
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:41:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:41:50 -0400
Subject: rpms/psmisc/devel psmisc.spec,1.28,1.29
Message-ID: <200607150341.k6F3fo8i026579@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26554

Modified Files:
	psmisc.spec 
Log Message:
bump


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- psmisc.spec	12 Jul 2006 07:53:42 -0000	1.28
+++ psmisc.spec	15 Jul 2006 03:41:48 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 22.2
-Release: 2.1
+Release: 3
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -56,7 +56,7 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 22.2-2.1
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 22.2-3
 - rebuild
 
 * Wed May 17 2006 Karel Zak <kzak at redhat.com> 22.2-2



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:43:28 -0400
Subject: rpms/ppc64-utils/devel ppc64-utils.spec,1.18,1.19
Message-ID: <200607150343.k6F3hStS027246@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ppc64-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27221

Modified Files:
	ppc64-utils.spec 
Log Message:
bump


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ppc64-utils.spec	11 Feb 2006 05:14:30 -0000	1.18
+++ ppc64-utils.spec	15 Jul 2006 03:43:26 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.9
-Release: 12.2.1
+Release: 13
 License: GPL and OSL
 Group: System Environment/Base
 Source0: ppc64-utils-%{ppc64utilsver}.tar.gz
@@ -67,6 +67,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.9-13
+- rebuild
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:44:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:44:53 -0400
Subject: rpms/perl-Digest-HMAC/devel perl-Digest-HMAC.spec,1.10,1.11
Message-ID: <200607150344.k6F3ir8j027800@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/perl-Digest-HMAC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27772

Modified Files:
	perl-Digest-HMAC.spec 
Log Message:
bump


Index: perl-Digest-HMAC.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-HMAC/devel/perl-Digest-HMAC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Digest-HMAC.spec	3 Feb 2006 19:07:04 -0000	1.10
+++ perl-Digest-HMAC.spec	15 Jul 2006 03:44:51 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Digest-HMAC
 Version:        1.01
-Release: 	14.2
+Release: 	15
 Summary:        Digest-HMAC Perl module
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.01-15
+- rebuild for new perl-5.8.8
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.01-14.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:47:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:47:23 -0400
Subject: rpms/mgetty/devel mgetty.spec,1.37,1.38
Message-ID: <200607150347.k6F3lN7s011053@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mgetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11026

Modified Files:
	mgetty.spec 
Log Message:
bump


Index: mgetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mgetty.spec	26 Mar 2006 22:34:07 -0000	1.37
+++ mgetty.spec	15 Jul 2006 03:47:21 -0000	1.38
@@ -5,7 +5,7 @@
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
 Version: 1.1.33
-Release: 7.FC5.3
+Release: 8%{?dist}
 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 Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.1.33-8
+- Change BuildPrereq from texinfo to texinfo-tex
+
 * Mon Mar 27 2006 Miloslav Trmac <mitr at redhat.com> - 1.1.33-7.FC5.3
 - Change BuildPrereq from texinfo to texinfo-tex
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:52:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:52:45 -0400
Subject: rpms/irqbalance/devel irqbalance.spec,1.28,1.29
Message-ID: <200607150352.k6F3qjiq022062@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22049

Modified Files:
	irqbalance.spec 
Log Message:
bump


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- irqbalance.spec	12 Jul 2006 05:26:58 -0000	1.28
+++ irqbalance.spec	15 Jul 2006 03:52:42 -0000	1.29
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.12
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com>
+- rebuild
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - Further lazy rebalancing tweaks.
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 03:58:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 14 Jul 2006 23:58:18 -0400
Subject: rpms/imake/devel imake.spec,1.25,1.26
Message-ID: <200607150358.k6F3wI1d022132@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22119

Modified Files:
	imake.spec 
Log Message:
bump


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- imake.spec	12 Jul 2006 06:24:18 -0000	1.25
+++ imake.spec	15 Jul 2006 03:58:15 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 1.1
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -116,7 +116,7 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-2
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-1



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:03:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:03:12 -0400
Subject: rpms/crontabs/devel crontabs.spec,1.10,1.11
Message-ID: <200607150403.k6F43CMu000504@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/crontabs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv479

Modified Files:
	crontabs.spec 
Log Message:
bump


Index: crontabs.spec
===================================================================
RCS file: /cvs/dist/rpms/crontabs/devel/crontabs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- crontabs.spec	9 Dec 2005 22:40:06 -0000	1.10
+++ crontabs.spec	15 Jul 2006 04:03:10 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Root crontab files used to schedule the execution of programs.
 Name: crontabs
 Version: 1.10
-Release: 7.1
+Release: 8
 License: Public Domain
 Group: System Environment/Base
 Source0: crontab
@@ -40,6 +40,9 @@
 %dir /etc/cron.monthly
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 0 1.10-8
+- rebuilt
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:04:53 -0400
Subject: rpms/compat-readline43/devel compat-readline43.spec,1.3,1.4
Message-ID: <200607150404.k6F44r8M000851@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-readline43/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv816

Modified Files:
	compat-readline43.spec 
Log Message:
bump


Index: compat-readline43.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-readline43/devel/compat-readline43.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compat-readline43.spec	9 Dec 2005 22:40:04 -0000	1.3
+++ compat-readline43.spec	15 Jul 2006 04:04:49 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: The readline 4.3 library for compatibility with older software.
 Name: compat-readline43
 Version: 4.3
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -75,6 +75,9 @@
 %{_libdir}/lib*.so.*
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.3-3
+- rebuilt
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:06:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:06:17 -0400
Subject: rpms/check/devel check.spec,1.4,1.5
Message-ID: <200607150406.k6F46Hlr001146@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/check/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1116

Modified Files:
	check.spec 
Log Message:
bump


Index: check.spec
===================================================================
RCS file: /cvs/dist/rpms/check/devel/check.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- check.spec	11 Feb 2006 02:14:51 -0000	1.4
+++ check.spec	15 Jul 2006 04:06:14 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	4.fc5.2
+Release:	5%{?dist}
 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 Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3-5
+- rebuild
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:19:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:19:28 -0400
Subject: rpms/ypserv/devel ypserv.spec,1.31,1.32
Message-ID: <200607150419.k6F4JS8f008486@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8319

Modified Files:
	ypserv.spec 
Log Message:
bump


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ypserv.spec	12 Jul 2006 17:39:48 -0000	1.31
+++ ypserv.spec	15 Jul 2006 04:19:20 -0000	1.32
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 0.1
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -134,7 +134,7 @@
 %{_includedir}/*/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.19-0.1
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.19-1
 - rebuild
 
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 2.19-0



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:21:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:21:35 -0400
Subject: rpms/xorg-x11-drv-savage/devel xorg-x11-drv-savage.spec,1.14,1.15
Message-ID: <200607150421.k6F4LZFr011557@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11506

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
bump


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-savage.spec	12 Jul 2006 17:39:15 -0000	1.14
+++ xorg-x11-drv-savage.spec	15 Jul 2006 04:21:32 -0000	1.15
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.1.1
-Release:   3.1
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -74,7 +74,7 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-4
 - rebuild
 
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-3



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:23:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:23:10 -0400
Subject: rpms/xorg-x11-drv-dmc/devel xorg-x11-drv-dmc.spec,1.11,1.12
Message-ID: <200607150423.k6F4NAdD014007@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dmc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13849

Modified Files:
	xorg-x11-drv-dmc.spec 
Log Message:
bump


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-dmc.spec	12 Jul 2006 17:39:00 -0000	1.11
+++ xorg-x11-drv-dmc.spec	15 Jul 2006 04:23:05 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
 Version: 1.1.0
-Release: 1.1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -53,7 +53,7 @@
 %{_mandir}/man4/dmc.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-2
 - rebuild
 
 * Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-1



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:24:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:24:43 -0400
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.12,1.13
Message-ID: <200607150424.k6F4Ohc2016093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-cyrix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15920

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
bump


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-cyrix.spec	12 Jul 2006 18:35:57 -0000	1.12
+++ xorg-x11-drv-cyrix.spec	15 Jul 2006 04:24:40 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.1.0
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -58,7 +58,7 @@
 %{_mandir}/man4/cyrix.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-3
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0-4
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2



From fedora-cvs-commits at redhat.com  Sat Jul 15 04:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 00:38:59 -0400
Subject: rpms/crash/devel crash.spec,1.14,1.15
Message-ID: <200607150438.k6F4cuPW020591@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20546

Modified Files:
	crash.spec 
Log Message:
bump


Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- crash.spec	15 May 2006 21:24:48 -0000	1.14
+++ crash.spec	15 Jul 2006 04:38:46 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 4.0
-Release: 2.26.4
+Release: 3
 License: GPL
 Group: Development/Debuggers
 Source: %{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 %doc README
 
 %changelog
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 4.0-3
+- rebuild
+
 * Mon May 15 2006 Dave Anderson <anderson at redhat.com> - 4.0-2.26.4
 - Updated crash.patch such that <asm/page.h> is not #include'd
   by s390_dump.c; IBM did not make the file s390[s] only; BZ #192719



From fedora-cvs-commits at redhat.com  Sat Jul 15 05:07:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 01:07:53 -0400
Subject: rpms/gtk2/devel gtk+-2.10.0-search.patch, NONE, 1.1 gtk2.spec, 1.161,
	1.162
Message-ID: <200607150507.k6F57rYZ011195@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11122

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.0-search.patch 
Log Message:
add search to the file chooser


gtk+-2.10.0-search.patch:
 gtkfilechooserdefault.c | 1431 ++++++++++++++++++++++++++++++++++++++++--------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1233 insertions(+), 240 deletions(-)

--- NEW FILE gtk+-2.10.0-search.patch ---
--- gtk+-2.10.0/gtk/gtkfilechooserdefault.c.search	2006-07-15 01:02:27.000000000 -0400
+++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-15 01:02:42.000000000 -0400
@@ -78,6 +78,8 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 
 
@@ -171,13 +173,20 @@
   SHORTCUTS_COL_PIXBUF,
   SHORTCUTS_COL_NAME,
   SHORTCUTS_COL_DATA,
-  SHORTCUTS_COL_IS_VOLUME,
+  SHORTCUTS_COL_TYPE,
   SHORTCUTS_COL_REMOVABLE,
   SHORTCUTS_COL_PIXBUF_VISIBLE,
   SHORTCUTS_COL_HANDLE,
   SHORTCUTS_COL_NUM_COLUMNS
 };
 
+typedef enum {
+  SHORTCUT_TYPE_PATH,
+  SHORTCUT_TYPE_VOLUME,
+  SHORTCUT_TYPE_SEPARATOR,
+  SHORTCUT_TYPE_SEARCH
+} ShortcutType;
+
 /* Column numbers for the file list */
 enum {
   FILE_LIST_COL_NAME,
@@ -186,6 +195,16 @@
   FILE_LIST_COL_NUM_COLUMNS
 };
 
+/* Column numbers for the search model.  
+ * Keep this in sync with search_setup_model() 
+ */
+enum {
+  SEARCH_MODEL_COL_PATH,
+  SEARCH_MODEL_COL_DISPLAY_NAME,
+  SEARCH_MODEL_COL_COLLATION_KEY,
+  SEARCH_MODEL_COL_STAT
+};
+
 /* Identifiers for target types */
 enum {
   GTK_TREE_MODEL_ROW,
@@ -225,9 +244,140 @@
 static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
 					       / sizeof (file_list_dest_targets[0]));
 
+/* We dlopen() all the following from libbeagle at runtime */
+#define BEAGLE_HIT(x) ((BeagleHit *)(x))
+#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
+#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
+
+typedef enum {
+        BEAGLE_QUERY_PART_LOGIC_REQUIRED   = 1,
+	BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2
+} BeagleQueryPartLogic;
+
+typedef enum {
+	BEAGLE_PROPERTY_TYPE_UNKNOWN = 0,
+	BEAGLE_PROPERTY_TYPE_TEXT    = 1,
+	BEAGLE_PROPERTY_TYPE_KEYWORD = 2,
+	BEAGLE_PROPERTY_TYPE_DATE    = 3,
+	BEAGLE_PROPERTY_TYPE_LAST    = 4
+} BeaglePropertyType;
+
+/* *static* wrapper function pointers */
+static gboolean (*beagle_client_send_request_async) (BeagleClient  *client,
+                                                    BeagleRequest  *request,
+                                                    GError        **err) = NULL;
+static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
+static BeagleQuery *(*beagle_query_new) (void) = NULL;
+static void (*beagle_query_add_text) (BeagleQuery     *query,
+				      const char      *str) = NULL;
+static void (*beagle_query_add_hit_type) (BeagleQuery *query,
+					  const char  *hit_type) = NULL;
+static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
+static void (*beagle_query_part_set_logic) (BeagleQueryPart      *part, 
+					    BeagleQueryPartLogic  logic) = NULL;
+static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part, 
+						   const char              *key) = NULL;
+static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part, 
+						     const char *             value) = NULL;
+static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part, 
+							     BeaglePropertyType       prop_type) = NULL;
+static void (*beagle_query_add_part) (BeagleQuery     *query, 
+				      BeagleQueryPart *part) = NULL;
+static GType (*beagle_request_get_type) (void) = NULL;
+static GType (*beagle_query_part_get_type) (void) = NULL;
+static gboolean (*beagle_util_daemon_is_running) (void) = NULL;
+static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL;
+
+static struct BeagleDlMapping
+{
+  const char *fn_name;
+  gpointer *fn_ptr_ref;
+} beagle_dl_mapping[] =
+{
+#define MAP(a) { #a, (gpointer *)&a }
+  MAP (beagle_client_send_request_async),
+  MAP (beagle_hit_get_uri),
+  MAP (beagle_hits_added_response_get_hits),
+  MAP (beagle_query_new),
+  MAP (beagle_query_add_text),
+  MAP (beagle_query_add_hit_type),
+  MAP (beagle_query_part_property_new),
+  MAP (beagle_query_part_set_logic),
+  MAP (beagle_query_part_property_set_key),
+  MAP (beagle_query_part_property_set_value),
+  MAP (beagle_query_part_property_set_property_type),
+  MAP (beagle_query_add_part),
+  MAP (beagle_request_get_type),
+  MAP (beagle_query_part_get_type),
+  MAP (beagle_util_daemon_is_running),
+#undef MAP
+  { "beagle_client_new", (gpointer *)&beagle_client_new_real },
+};
+
+static void 
+open_libbeagle (void)
+{
+  static gboolean done = FALSE;
+
+  if (!done)
+    {
+      int i;
+      GModule *beagle;
+      
+      done = TRUE;
+ 
+      beagle = g_module_open ("libbeagle.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+      if (!beagle)
+        {
+	  g_warning ("Can't open libbeagle '%s'\n", g_module_error ());
+	  return;
+	}
+      
+      for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+	{
+	  if (!g_module_symbol (beagle, beagle_dl_mapping[i].fn_name,
+				beagle_dl_mapping[i].fn_ptr_ref))
+	    {
+	      g_warning ("Missing symbol '%s' in libbeagle\n",
+			 beagle_dl_mapping[i].fn_name);
+	      g_module_close (beagle);
+
+	      for (i = 0; i < G_N_ELEMENTS (beagle_dl_mapping); i++)
+		beagle_dl_mapping[i].fn_ptr_ref = NULL;
+
+	      return;
+	    }
+	}
+    }
+}
+
+static gboolean
+search_is_possible (void)
+{
+  open_libbeagle ();
+
+  if (beagle_util_daemon_is_running)
+    return beagle_util_daemon_is_running ();
+
+  return FALSE;
+}
+
+static BeagleClient *
+beagle_client_new (const char *client_name)
+{
+  open_libbeagle (); 
+
+  if (beagle_client_new_real)
+    return beagle_client_new_real (client_name);
+
+  return NULL;
+}
 
 /* Interesting places in the shortcuts bar */
 typedef enum {
+  SHORTCUTS_SEARCH,
+  SHORTCUTS_SEARCH_SEPARATOR,
   SHORTCUTS_HOME,
   SHORTCUTS_DESKTOP,
   SHORTCUTS_VOLUMES,
@@ -419,6 +569,14 @@
 					GtkFileChooserDefault *impl);
 static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
 
+static void     search_stop_searching        (GtkFileChooserDefault *impl);
+static void     search_clear_model           (GtkFileChooserDefault *impl, 
+					      gboolean               remove_from_treeview);
+static gboolean search_should_respond        (GtkFileChooserDefault *impl);
[...2040 lines suppressed...]
     {
@@ -8379,6 +9337,7 @@
     g_assert_not_reached ();
 
   shortcuts_activate_iter (impl, &iter);
+  focus_browse_tree_view_if_possible (impl);
 }
 
 /* Handler for the "home-folder" keybinding signal */
@@ -8423,26 +9382,26 @@
 /* Drag and drop interfaces */
 
 static void
-_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
+_shortcuts_pane_model_filter_class_init (ShortcutsPaneModelFilterClass *class)
 {
 }
 
 static void
-_shortcuts_model_filter_init (ShortcutsModelFilter *model)
+_shortcuts_pane_model_filter_init (ShortcutsPaneModelFilter *model)
 {
   model->impl = NULL;
 }
 
 /* GtkTreeDragSource::row_draggable implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path)
+shortcuts_pane_model_filter_row_draggable (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
   int pos;
   int bookmarks_pos;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   pos = *gtk_tree_path_get_indices (path);
   bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
@@ -8452,13 +9411,13 @@
 
 /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path,
-				      GtkSelectionData  *selection_data)
+shortcuts_pane_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path,
+				           GtkSelectionData  *selection_data)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   /* FIXME */
 
@@ -8467,30 +9426,30 @@
 
 /* Fill the GtkTreeDragSourceIface vtable */
 static void
-shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
+shortcuts_pane_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
 {
-  iface->row_draggable = shortcuts_model_filter_row_draggable;
-  iface->drag_data_get = shortcuts_model_filter_drag_data_get;
+  iface->row_draggable = shortcuts_pane_model_filter_row_draggable;
+  iface->drag_data_get = shortcuts_pane_model_filter_drag_data_get;
 }
 
 #if 0
 /* Fill the GtkTreeDragDestIface vtable */
 static void
-shortcuts_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
+shortcuts_pane_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
 {
-  iface->drag_data_received = shortcuts_model_filter_drag_data_received;
-  iface->row_drop_possible = shortcuts_model_filter_row_drop_possible;
+  iface->drag_data_received = shortcuts_pane_model_filter_drag_data_received;
+  iface->row_drop_possible = shortcuts_pane_model_filter_row_drop_possible;
 }
 #endif
 
 static GtkTreeModel *
-shortcuts_model_filter_new (GtkFileChooserDefault *impl,
-			    GtkTreeModel          *child_model,
-			    GtkTreePath           *root)
+shortcuts_pane_model_filter_new (GtkFileChooserDefault *impl,
+			         GtkTreeModel          *child_model,
+			         GtkTreePath           *root)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE,
+  model = g_object_new (SHORTCUTS_PANE_MODEL_FILTER_TYPE,
 			"child-model", child_model,
 			"virtual-root", root,
 			NULL);
--- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-07-15 01:02:18.000000000 -0400
+++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-15 01:02:42.000000000 -0400
@@ -147,6 +147,20 @@
   LOCATION_MODE_FILENAME_ENTRY
 } LocationMode;
 
+typedef enum {
+  OPERATION_MODE_BROWSE,
+  OPERATION_MODE_SEARCH
+} OperationMode;
+
+typedef struct _BeagleHit BeagleHit;
+typedef struct _BeagleQuery BeagleQuery;
+typedef struct _BeagleClient BeagleClient;
+typedef struct _BeagleRequest BeagleRequest;
+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
+typedef struct _BeagleQueryPart BeagleQueryPart;
+
 struct _GtkFileChooserDefault
 {
   GtkVBox parent_instance;
@@ -175,10 +189,18 @@
   GtkWidget *browse_files_popup_menu_add_shortcut_item;
   GtkWidget *browse_files_popup_menu_hidden_files_item;
   GtkWidget *browse_new_folder_button;
+  GtkWidget *browse_path_bar_hbox;
   GtkWidget *browse_path_bar;
 
   GtkFileSystemModel *browse_files_model;
 
+  /* Widgets for searching */
+  GtkWidget *search_hbox;
+  GtkWidget *search_entry;
+  BeagleClient *search_client;
+  BeagleQuery *search_query;
+  GtkListStore *search_model;
+
   GtkWidget *filter_combo_hbox;
   GtkWidget *filter_combo;
   GtkWidget *preview_box;
@@ -194,7 +216,16 @@
   LocationMode location_mode;
 
   GtkListStore *shortcuts_model;
-  GtkTreeModel *shortcuts_filter_model;
+
+  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
+   * the separator that we use for the "Save in folder" combo.
+   */
+  GtkTreeModel *shortcuts_pane_filter_model;
+  
+  /* Filter for the "Save in folder" combo.  We filter out the Search row and
+   * its separator.
+   */
+  GtkTreeModel *shortcuts_combo_filter_model;
 
   GtkTreeModelSort *sort_model;
 
@@ -213,6 +244,8 @@
   ReloadState reload_state;
   guint load_timeout_id;
 
+  OperationMode operation_mode;
+
   GSList *pending_select_paths;
 
   GtkFileFilter *current_filter;
@@ -220,9 +253,6 @@
 
   GtkTooltips *tooltips;
 
-  gboolean has_home;
-  gboolean has_desktop;
-
   int num_volumes;
   int num_shortcuts;
   int num_bookmarks;
@@ -237,6 +267,7 @@
 
   GtkTreeViewColumn *list_name_column;
   GtkCellRenderer *list_name_renderer;
+  GtkTreeViewColumn *list_mtime_column;
 
   GSource *edited_idle;
   char *edited_new_text;
@@ -264,6 +295,9 @@
   guint changing_folder : 1;
   guint shortcuts_current_folder_active : 1;
   guint processing_pending_selections : 1;
+  guint has_home : 1;
+  guint has_desktop : 1;
+  guint has_search : 1;
 
 #if 0
   guint shortcuts_drag_outside : 1;


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gtk2.spec	12 Jul 2006 06:15:50 -0000	1.161
+++ gtk2.spec	15 Jul 2006 05:07:49 -0000	1.162
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1.1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -26,6 +26,8 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
+# Filechooser search
+Patch2: gtk+-2.10.0-search.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -105,6 +107,7 @@
 
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
+%patch2 -p1 -b .search
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -274,7 +277,10 @@
 %doc tmpdocs/examples
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Jul 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-2
+- Add Search support to the filechooser
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.10.0-1.1
 - rebuild
 
 * Mon Jul  3 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1



From fedora-cvs-commits at redhat.com  Sat Jul 15 06:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 02:49:39 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2399,1.2400
Message-ID: <200607150649.k6F6ndsD010243@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10224

Modified Files:
	kernel-2.6.spec 
Log Message:
config cleanup
- Remove a bunch of dead symbols
- unset some bogus ones
- set some ones that were missed.
- move some copied symbols to config-generic
- move some arch specific symbols from config-generic to config-$arch-generic
- Remove some dupes




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2399
retrieving revision 1.2400
diff -u -r1.2399 -r1.2400
--- kernel-2.6.spec	14 Jul 2006 20:59:12 -0000	1.2399
+++ kernel-2.6.spec	15 Jul 2006 06:49:37 -0000	1.2400
@@ -1671,6 +1671,9 @@
 %endif
 
 %changelog
+* Sat Jul 15 2006 Dave Jones <davej at redhat.com>
+- Cleaned up a bunch of bogons in the config files.
+
 * Fri Jul 14 2006 Don Zickus <dzickus at redhat.com>
 - remove the ppc kdump patches
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 06:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 02:49:40 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.229, 1.230 config-i586,
	1.16, 1.17 config-ia64-generic, 1.36,
	1.37 config-powerpc-generic, 1.22,
	1.23 config-powerpc32-generic, 1.14, 1.15 config-powerpc64,
	1.14, 1.15 config-s390-generic, 1.18,
	1.19 config-sparc64-generic, 1.1, 1.2 config-x86-generic, 1.62,
	1.63 config-x86_64-generic, 1.49, 1.50 config-xen-generic,
	1.21, 1.22 config-xen-xen, 1.1, 1.2
Message-ID: <200607150649.k6F6net0010254@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv10224/configs

Modified Files:
	config-generic config-i586 config-ia64-generic 
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 config-s390-generic config-sparc64-generic 
	config-x86-generic config-x86_64-generic config-xen-generic 
	config-xen-xen 
Log Message:
config cleanup
- Remove a bunch of dead symbols
- unset some bogus ones
- set some ones that were missed.
- move some copied symbols to config-generic
- move some arch specific symbols from config-generic to config-$arch-generic
- Remove some dupes




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- config-generic	14 Jul 2006 21:32:12 -0000	1.229
+++ config-generic	15 Jul 2006 06:49:37 -0000	1.230
@@ -4,7 +4,6 @@
 CONFIG_MMU=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_CRASH_DUMP is not set
 #
@@ -47,7 +46,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_KMOD=y
@@ -60,7 +58,6 @@
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 # FIXME: Was borked in .17git11 for non-acpi machines.
 # CONFIG_HOTPLUG_PCI_PCIE is not set
@@ -168,7 +165,7 @@
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 # CONFIG_MTD_SBC_GXX is not set
-CONFIG_MTD_SCx200_DOCFLASH=m
+# CONFIG_MTD_SCx200_DOCFLASH is not set
 # CONFIG_MTD_AMD76XROM is not set
 CONFIG_MTD_SCB2_FLASH=m
 # CONFIG_MTD_NETtel is not set
@@ -187,7 +184,6 @@
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
-# CONFIG_MTD_BLKMTD is not set
 
 #
 # Disk-On-Chip Device Drivers
@@ -214,7 +210,6 @@
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-CONFIG_MTD_CFI_AMDSTD_RETRY=3
 # CONFIG_MTD_XIP is not set
 # CONFIG_MTD_ICHXROM is not set
 # CONFIG_MTD_PHRAM is not set
@@ -247,10 +242,6 @@
 #
 CONFIG_ISAPNP=y
 # CONFIG_PNPBIOS is not set
-# CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-# CONFIG_ACPI_HOTKEY is not set
-# CONFIG_ACPI_DOCK is not set
 
 # FIXME: Broken in 2.6.18rc1git3
 # CONFIG_HOTPLUG_PCI_ACPI is not set
@@ -345,7 +336,7 @@
 # CONFIG_BLK_DEV_AMD74XX is not set
 CONFIG_BLK_DEV_CMD64X=y
 CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
+# CONFIG_BLK_DEV_CY82C693 is not set
 CONFIG_BLK_DEV_CS5520=y
 CONFIG_BLK_DEV_CS5530=y
 CONFIG_BLK_DEV_CS5535=y
@@ -361,7 +352,7 @@
 CONFIG_BLK_DEV_SVWKS=y
 CONFIG_BLK_DEV_SIIMAGE=y
 CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
+# CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -470,7 +461,6 @@
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 CONFIG_SCSI_SYM53C8XX_MMIO=y
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=m
@@ -479,14 +469,6 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
-# FIXME: Turn off for FC6 - Move to external firmware loader.
-CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA24XX=m
-CONFIG_SCSI_QLA6312=m
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_LPFC=m
@@ -509,9 +491,7 @@
 CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
 CONFIG_MD_RAID5_RESHAPE=y
-CONFIG_MD_RAID6=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
@@ -699,14 +679,11 @@
 CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
 CONFIG_IP_NF_MATCH_DSCP=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -755,16 +732,13 @@
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -831,7 +805,6 @@
 CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_DCCP_UNLOAD_HACK=y
 
 #
 # TIPC Configuration (EXPERIMENTAL)
@@ -1434,10 +1407,10 @@
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_ROCKETPORT is not set
-# CONFIG_SYNCLINK is not set
-# CONFIG_SYNCLINKMP is not set
-# CONFIG_SYNCLINK_GT is not set
+CONFIG_ROCKETPORT=m
+CONFIG_SYNCLINK=m 
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
 # CONFIG_STALDRV is not set
 # CONFIG_FTAPE is not set
@@ -1455,7 +1428,6 @@
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-# CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -1577,7 +1549,6 @@
 CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
@@ -1591,11 +1562,7 @@
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 
-CONFIG_RTC_X1205_I2C=m
-
 CONFIG_W1=m
-CONFIG_W1_DS2433_CRC=y
-
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_SLAVE_THERM=m
@@ -1737,7 +1704,6 @@
 #
 # Video Adapters
 #
-CONFIG_VIDEO_AUDIO_DECODER=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
 CONFIG_VIDEO_BWQCAM=m
@@ -1754,7 +1720,6 @@
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_DECODER=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -1909,7 +1874,6 @@
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_RADEON=m
 # CONFIG_FB_RADEON_DEBUG is not set
-# CONFIG_FB_RADEON_OLD is not set
 CONFIG_FB_RADEON_I2C=y
 CONFIG_FB_ATY128=m
 CONFIG_FB_ATY=m
@@ -2075,7 +2039,6 @@
 #
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_CMPCI is not set
 
 #
 # USB support
@@ -2105,13 +2068,10 @@
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_AUDIO is not set
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 
 #
 # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
 #
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_BLK_DEV_UB=m
@@ -2185,7 +2145,6 @@
 CONFIG_USB_SPEEDTOUCH=m
 # Has dumb detection, which gets loaded for every hid device.
 # CONFIG_USB_YEALINK is not set
-CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
@@ -2624,8 +2583,6 @@
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_LIBCRC32C=m
 CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_SIGNATURE_DSA=y
-CONFIG_CRYPTO_MPILIB=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_WP512=m
@@ -2656,9 +2613,6 @@
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_DEVICE=y
 
-CONFIG_NETDUMP=m
-CONFIG_DISKDUMP=m
-
 CONFIG_SCHEDSTATS=y
 
 CONFIG_TUX=m


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-i586	26 Jun 2006 15:27:24 -0000	1.16
+++ config-i586	15 Jul 2006 06:49:37 -0000	1.17
@@ -20,19 +20,12 @@
 # CONFIG_HOTPLUG_PCI_PCIE is not set
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_MTD is not set
 # CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_DISKDUMP is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_SYNCLINK is not set
-# CONFIG_SYNCLINKMP is not set
-# CONFIG_STALDRV is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_SONYPI is not set
-# CONFIG_HPET is not set
 # CONFIG_W1 is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_IBM_ASM is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-ia64-generic	13 Jul 2006 16:56:59 -0000	1.36
+++ config-ia64-generic	15 Jul 2006 06:49:37 -0000	1.37
@@ -41,7 +41,6 @@
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
 CONFIG_EFI_VARS=y
-CONFIG_SERIAL_8250_ACPI=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=16
 CONFIG_EFI_PCDP=y
 #
@@ -58,7 +57,6 @@
 #
 # Character devices
 #
-# CONFIG_SYNCLINK is not set
 
 #
 # Watchdog Cards
@@ -123,6 +121,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DOCK is not set
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-powerpc-generic	14 Jul 2006 22:19:39 -0000	1.22
+++ config-powerpc-generic	15 Jul 2006 06:49:37 -0000	1.23
@@ -63,7 +63,6 @@
 
 CONFIG_NVRAM=y
 CONFIG_FB_RADEON=y
-CONFIG_PCI_LEGACY_PROC=y
 
 # CONFIG_PCMCIA_M8XX is not set
 # CONFIG_FB_VGA16 is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-powerpc32-generic	14 Jul 2006 22:19:39 -0000	1.14
+++ config-powerpc32-generic	15 Jul 2006 06:49:37 -0000	1.15
@@ -57,7 +57,6 @@
 CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
 CONFIG_FB_MATROX=y
-# CONFIG_DISKDUMP is not set
 # CONFIG_KEXEC is not set
 
 # CONFIG_CRASH is not set


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-powerpc64	14 Jul 2006 22:19:39 -0000	1.14
+++ config-powerpc64	15 Jul 2006 06:49:37 -0000	1.15
@@ -33,7 +33,6 @@
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_BLK_DEV_AMD74XX=y
 CONFIG_SPIDER_NET=m
-CONFIG_HVC_FSS=y
 CONFIG_HVC_RTAS=y
 CONFIG_MAMBO=y
 CONFIG_MAMBO_DISK=m


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-s390-generic	12 Jul 2006 23:23:02 -0000	1.18
+++ config-s390-generic	15 Jul 2006 06:49:38 -0000	1.19
@@ -154,8 +154,6 @@
 # CONFIG_WARN_STACK is not set
 # CONFIG_SMALL_STACK is not set
 
-# CONFIG_DISKDUMP is not set
-
 CONFIG_UNIX98_PTY_COUNT=2048
 CONFIG_ZVM_WATCHDOG=m
 CONFIG_VMLOGRDR=m


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-sparc64-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-sparc64-generic	6 Feb 2005 05:49:11 -0000	1.1
+++ config-sparc64-generic	15 Jul 2006 06:49:38 -0000	1.2
@@ -89,7 +89,6 @@
 CONFIG_SUNBMAC=m
 CONFIG_SUNQE=m
 # CONFIG_HAMACHI is not set
-# CONFIG_HP100 is not set
 # CONFIG_R8169 is not set
 CONFIG_DRM_FFB=m
 # CONFIG_DRM_TDFX is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- config-x86-generic	13 Jul 2006 16:56:59 -0000	1.62
+++ config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
@@ -89,11 +89,6 @@
 #
 # x86 specific drivers
 #
-CONFIG_ROCKETPORT=m
-CONFIG_SYNCLINK_CS=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_HP100=m
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
@@ -148,7 +143,11 @@
 CONFIG_ACPI_IBM=m
 CONFIG_PNPACPI=y
 CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_IBM_DOCK=y
 CONFIG_ACPI_SBS=m
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_CONTAINER=m
 
 #
 # CPUFreq processor drivers
@@ -195,7 +194,6 @@
 CONFIG_NVRAM=y
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 
@@ -210,7 +208,6 @@
 CONFIG_DEBUG_RODATA=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_STACK_BACKTRACE_COLS=2
 CONFIG_4KSTACKS=y
 
 # FIXME: Disable before release.
@@ -224,7 +221,7 @@
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_ACPI_IBM_DOCK=y
+
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
@@ -261,7 +258,6 @@
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_PROSAVAGE=m
 CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
@@ -302,3 +298,4 @@
 
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 
+# CONFIG_COMPAT_VDSO is not set


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- config-x86_64-generic	13 Jul 2006 16:56:59 -0000	1.49
+++ config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
@@ -11,7 +11,6 @@
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NR_CPUS=255
-CONFIG_GART_IOMMU=y
 CONFIG_X86_POWERNOW_K8=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
@@ -35,8 +34,6 @@
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
 
-# CONFIG_UNORDERED_IO is not set
-
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_SOFTWARE_SUSPEND=y
@@ -83,6 +80,9 @@
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_SBS=m
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_ACPI_CONTAINER=m
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -178,3 +178,10 @@
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_CS5535 is not set
+# CONFIG_BLK_DEV_SVWKS is not set


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- config-xen-generic	13 Jul 2006 16:56:59 -0000	1.21
+++ config-xen-generic	15 Jul 2006 06:49:38 -0000	1.22
@@ -75,26 +75,16 @@
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+
+# FIXME: Why are the following unset ?
 # CONFIG_4KSTACKS is not set
 # CONFIG_UNWIND_INFO is not set
-
-# FIXME: Why?
 # CONFIG_DEBUG_RODATA is not set
-# FIXME: Why?
 # CONFIG_DEBUG_SLAB_LEAK is not set
 
-#
-# Disabled until I figure out a way to make next_ram_page work
-#
-# CONFIG_NETDUMP is not set
-# CONFIG_DISKDUMP is not set
-
 # needs pm_power_off
 # CONFIG_IPMI_POWEROFF is not set
 
-# needs isa_virt_to_bus_is_UNSUPPORTED
-# CONFIG_MMC_WBSD is not set
-
 #
 # Block devices
 #


Index: config-xen-xen
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-xen	13 Jun 2006 22:46:57 -0000	1.1
+++ config-xen-xen	15 Jul 2006 06:49:38 -0000	1.2
@@ -53,9 +53,6 @@
 # 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
 #



From fedora-cvs-commits at redhat.com  Sat Jul 15 07:25:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 03:25:09 -0400
Subject: rpms/kernel/devel/configs config-generic,1.230,1.231
Message-ID: <200607150725.k6F7P9Hp008818@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8599/configs

Modified Files:
	config-generic 
Log Message:
git9



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- config-generic	15 Jul 2006 06:49:37 -0000	1.230
+++ config-generic	15 Jul 2006 07:25:06 -0000	1.231
@@ -20,6 +20,8 @@
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_IKCONFIG is not set
@@ -285,6 +287,7 @@
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=4096
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_ATIIXP=y
 CONFIG_LBD=y
@@ -1629,6 +1632,7 @@
 CONFIG_RTC_INTF_PROC=m
 CONFIG_RTC_INTF_DEV=m
 CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_RS5C372=m



From fedora-cvs-commits at redhat.com  Sat Jul 15 07:25:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 03:25:09 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git9.bz2.sign, NONE,
	1.1 .cvsignore, 1.485, 1.486 kernel-2.6.spec, 1.2400,
	1.2401 linux-2.6-lockdep-fixes.patch, 1.10,
	1.11 linux-2.6-utrace.patch, 1.4, 1.5 sources, 1.429,
	1.430 upstream, 1.396,
	1.397 linux-2.6-defaults-max-symlinks.patch, 1.1,
	NONE patch-2.6.18-rc1-git7.bz2.sign, 1.1,
	NONE patch-2.6.18-rc1-git8.bz2.sign, 1.1, NONE
Message-ID: <200607150725.k6F7P9EM008807@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8599

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
	linux-2.6-utrace.patch sources upstream 
Added Files:
	patch-2.6.18-rc1-git9.bz2.sign 
Removed Files:
	linux-2.6-defaults-max-symlinks.patch 
	patch-2.6.18-rc1-git7.bz2.sign patch-2.6.18-rc1-git8.bz2.sign 
Log Message:
git9



--- NEW FILE patch-2.6.18-rc1-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEuJMqyGugalF9Dw4RAqJpAJ4zaefcBfFZXbTEqaSoQ9u7xCxIKACfQLif
nEdsDFJq9BAY9p0MaiLjaqA=
=nEM5
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- .cvsignore	14 Jul 2006 15:03:46 -0000	1.485
+++ .cvsignore	15 Jul 2006 07:25:05 -0000	1.486
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git8.bz2
+patch-2.6.18-rc1-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2400
retrieving revision 1.2401
diff -u -r1.2400 -r1.2401
--- kernel-2.6.spec	15 Jul 2006 06:49:37 -0000	1.2400
+++ kernel-2.6.spec	15 Jul 2006 07:25:05 -0000	1.2401
@@ -256,7 +256,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git8.bz2
+Patch2: patch-2.6.18-rc1-git9.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -404,12 +404,11 @@
 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-firmware-loader-timeout.patch
-Patch2103: linux-2.6-defaults-phys-start.patch
-Patch2104: linux-2.6-defaults-unicode-vt.patch
-Patch2105: linux-2.6-defaults-disable-split-ptlock.patch
+Patch2100: linux-2.6-defaults-fat-utf8.patch
+Patch2101: linux-2.6-defaults-firmware-loader-timeout.patch
+Patch2102: linux-2.6-defaults-phys-start.patch
+Patch2103: linux-2.6-defaults-unicode-vt.patch
+Patch2104: linux-2.6-defaults-disable-split-ptlock.patch
 
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
@@ -967,18 +966,16 @@
 %patch2002 -p1
 
 # Changes to upstream defaults.
-# Bump up the number of recursive symlinks.
-%patch2100 -p1
 # Use UTF-8 by default on VFAT.
-%patch2101 -p1
+%patch2100 -p1
 # Increase timeout on firmware loader.
-%patch2102 -p1
+%patch2101 -p1
 # Change PHYSICAL_START
-%patch2103 -p1
+%patch2102 -p1
 # Use unicode VT's by default.
-%patch2104 -p1
+%patch2103 -p1
 # Disable split page table lock
-%patch2105 -p1
+%patch2104 -p1
 
 # Enable PATA ports on Promise SATA.
 %patch2200 -p1
@@ -1673,6 +1670,7 @@
 %changelog
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com>
 - Cleaned up a bunch of bogons in the config files.
+- 2.6.18-rc1-git9
 
 * Fri Jul 14 2006 Don Zickus <dzickus at redhat.com>
 - remove the ppc kdump patches

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 4 files changed, 51 insertions(+), 8 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-lockdep-fixes.patch	13 Jul 2006 21:28:38 -0000	1.10
+++ linux-2.6-lockdep-fixes.patch	15 Jul 2006 07:25:06 -0000	1.11
@@ -127,83 +127,6 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
-From davej  Fri Jul  7 03:35:19 2006
-Return-Path: <SRS0+ef490921a1c7f4a961d7+1048+infradead.org+arjan at pentafluge.srs.infradead.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Fri, 07 Jul 2006 03:35:19 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Fri, 07 Jul 2006 03:34:52 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k677YqmA013341;
-	Fri, 7 Jul 2006 03:34:52 -0400
-Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k677YpbI003445;
-	Fri, 7 Jul 2006 03:34:51 -0400
-Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
-	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k677Yo2Z026997;
-	Fri, 7 Jul 2006 03:34:50 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1FykrQ-0003Cq-NY; Fri, 07 Jul 2006 08:34:48 +0100
-Subject: Re: lockdep: bdev->bd_mutex deadlock
-From: Arjan van de Ven <arjan at infradead.org>
-To: Peter Jones <pjones at redhat.com>
-Cc: mingo at elte.hu, linux-kernel <linux-kernel at vger.kernel.org>,
-        Dave Jones <davej at redhat.com>
-In-Reply-To: <1152221477.25480.9.camel at localhost.localdomain>
-References: <1152221477.25480.9.camel at localhost.localdomain>
-Content-Type: text/plain
-Date: Fri, 07 Jul 2006 09:34:47 +0200
-Message-Id: <1152257687.3111.23.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-X-RedHat-Spam-Score: 2.646 **
-Status: RO
-Content-Length: 838
-Lines: 30
-
-
-> <4> [<c0463f46>] __blkdev_put+0x22/0x123
-> <4> [<c0464060>] blkdev_put+0xa/0xc
-> <4> [<c04644e2>] do_open+0x313/0x385
-> <4> [<c0464759>] blkdev_open+0x1f/0x48
-
-ok this is a missing annotation in the error path
-
-the patch below should fix this, can you verify this?
-
-
-
----
- fs/block_dev.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.18-rc1/fs/block_dev.c
-===================================================================
---- linux-2.6.18-rc1.orig/fs/block_dev.c
-+++ linux-2.6.18-rc1/fs/block_dev.c
-@@ -980,7 +980,7 @@ out_first:
- 	bdev->bd_disk = NULL;
- 	bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
- 	if (bdev != bdev->bd_contains)
--		blkdev_put(bdev->bd_contains);
-+		blkdev_put_partition(bdev->bd_contains);
- 	bdev->bd_contains = NULL;
- 	put_disk(disk);
- 	module_put(owner);
-
-
 From davej  Mon Jul 10 11:13:32 2006
 Return-Path: <SRS0+f93f76af6977eb5e6772+1051+infradead.org+arjan at pentafluge.srs.infradead.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
@@ -339,92 +262,6 @@
  int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 
 
-From davej  Tue Jul 11 07:15:05 2006
-Return-Path: <SRS0+44288eb707b17e403147+1052+infradead.org+arjan at pentafluge.srs.infradead.org>
-X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
-	nwo.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.3
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Tue, 11 Jul 2006 07:15:05 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Tue, 11 Jul 2006 07:14:55 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6BBEteU025672;
-	Tue, 11 Jul 2006 07:14:55 -0400
-Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6BBEtjx032653;
-	Tue, 11 Jul 2006 07:14:55 -0400
-Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40])
-	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6BBEmSs006593;
-	Tue, 11 Jul 2006 07:14:51 -0400
-Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43])
-	by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux))
-	id 1G0GCV-0005jk-Au; Tue, 11 Jul 2006 12:14:47 +0100
-Subject: Re: lockdep: bdev->bd_mutex deadlock
-From: Arjan van de Ven <arjan at infradead.org>
-To: Peter Jones <pjones at redhat.com>
-Cc: mingo at elte.hu, linux-kernel <linux-kernel at vger.kernel.org>,
-        Dave Jones <davej at redhat.com>
-In-Reply-To: <1152287003.14409.2.camel at localhost.localdomain>
-References: <1152221477.25480.9.camel at localhost.localdomain>
-	 <1152257687.3111.23.camel at laptopd505.fenrus.org>
-	 <1152287003.14409.2.camel at localhost.localdomain>
-Content-Type: text/plain
-Date: Tue, 11 Jul 2006 13:14:46 +0200
-Message-Id: <1152616486.3128.34.camel at laptopd505.fenrus.org>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
-Content-Transfer-Encoding: 7bit
-X-SRS-Rewrite: SMTP reverse-path rewritten from <arjan at infradead.org> by pentafluge.infradead.org
-	See http://www.infradead.org/rpr.html
-X-RedHat-Spam-Score: 2.646 **
-Status: RO
-Content-Length: 1333
-Lines: 37
-
-On Fri, 2006-07-07 at 11:43 -0400, Peter Jones wrote:
-> <4> [<c05ebd9d>] mutex_lock+0x21/0x24
-> <4> [<c04c4acf>] blkdev_ioctl+0x5dd/0x732
-> <4> [<c046323b>] block_ioctl+0x16/0x1b
-
-
-From: Arjan van de Ven <arjan at linux.intel.com>
-Subject: lockdep: annotate the BLKPG_DEL_PARTITION ioctl
-
-The delete partition IOCTL takes the bd_mutex for both the disk and the partition;
-these have an obvious hierarchical relationship and this patch annotates this
-relationship for lockdep.
-
-Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
-Index: linux-2.6.18-rc1/block/ioctl.c
-===================================================================
---- linux-2.6.18-rc1.orig/block/ioctl.c
-+++ linux-2.6.18-rc1/block/ioctl.c
-@@ -72,7 +72,7 @@ static int blkpg_ioctl(struct block_devi
- 			bdevp = bdget_disk(disk, part);
- 			if (!bdevp)
- 				return -ENOMEM;
--			mutex_lock(&bdevp->bd_mutex);
-+			mutex_lock_nested(&bdevp->bd_mutex, BD_MUTEX_PARTITION);
- 			if (bdevp->bd_openers) {
- 				mutex_unlock(&bdevp->bd_mutex);
- 				bdput(bdevp);
-@@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_devi
- 			fsync_bdev(bdevp);
- 			invalidate_bdev(bdevp, 0);
- 
--			mutex_lock(&bdev->bd_mutex);
-+			mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_WHOLE);
- 			delete_partition(disk, part);
- 			mutex_unlock(&bdev->bd_mutex);
- 			mutex_unlock(&bdevp->bd_mutex);
-
-
 From davej  Thu Jul 13 16:29:19 2006
 Return-Path: <SRS0+c9a57fc0e55f44caf9d4+1054+infradead.org+arjan at pentafluge.srs.infradead.org>
 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 

linux-2.6-utrace.patch:
 linux-2.6.17.noarch/kernel/Makefile               |    1 
 linux-2.6/Documentation/utrace.txt                |  451 ++++++
 linux-2.6/arch/alpha/kernel/asm-offsets.c         |    2 
 linux-2.6/arch/alpha/kernel/entry.S               |    4 
 linux-2.6/arch/arm/kernel/ptrace.c                |   36 
 linux-2.6/arch/arm26/kernel/ptrace.c              |   32 
 linux-2.6/arch/frv/kernel/ptrace.c                |   15 
 linux-2.6/arch/i386/kernel/entry.S                |    7 
 linux-2.6/arch/i386/kernel/i387.c                 |  143 +-
 linux-2.6/arch/i386/kernel/process.c              |    3 
 linux-2.6/arch/i386/kernel/ptrace.c               |  862 ++++++------
 linux-2.6/arch/i386/kernel/signal.c               |   39 
 linux-2.6/arch/i386/kernel/vm86.c                 |    7 
 linux-2.6/arch/ia64/ia32/sys_ia32.c               |    2 
 linux-2.6/arch/ia64/kernel/asm-offsets.c          |    2 
 linux-2.6/arch/ia64/kernel/fsys.S                 |   16 
 linux-2.6/arch/ia64/kernel/mca.c                  |    2 
 linux-2.6/arch/ia64/kernel/ptrace.c               |   41 
 linux-2.6/arch/mips/kernel/ptrace.c               |   21 
 linux-2.6/arch/mips/kernel/sysirix.c              |    2 
 linux-2.6/arch/powerpc/kernel/Makefile            |    4 
 linux-2.6/arch/powerpc/kernel/asm-offsets.c       |    2 
 linux-2.6/arch/powerpc/kernel/process.c           |    5 
 linux-2.6/arch/powerpc/kernel/ptrace-common.h     |  161 --
 linux-2.6/arch/powerpc/kernel/ptrace.c            |  842 ++++++------
 linux-2.6/arch/powerpc/kernel/ptrace32.c          |  436 ------
 linux-2.6/arch/powerpc/kernel/signal_32.c         |   56 
 linux-2.6/arch/powerpc/kernel/signal_64.c         |    4 
 linux-2.6/arch/powerpc/kernel/sys_ppc32.c         |    5 
 linux-2.6/arch/powerpc/lib/sstep.c                |    3 
 linux-2.6/arch/powerpc/platforms/cell/spufs/run.c |    2 
 linux-2.6/arch/ppc/kernel/asm-offsets.c           |    2 
 linux-2.6/arch/s390/kernel/compat_linux.c         |    3 
 linux-2.6/arch/s390/kernel/process.c              |    3 
 linux-2.6/arch/s390/kernel/ptrace.c               |   79 -
 linux-2.6/arch/s390/kernel/traps.c                |    6 
 linux-2.6/arch/sparc64/kernel/ptrace.c            |   18 
 linux-2.6/arch/x86_64/ia32/fpu32.c                |   92 +
 linux-2.6/arch/x86_64/ia32/ia32_aout.c            |    6 
 linux-2.6/arch/x86_64/ia32/ia32_signal.c          |    8 
 linux-2.6/arch/x86_64/ia32/ia32entry.S            |    2 
 linux-2.6/arch/x86_64/ia32/ptrace32.c             |  709 ++++++----
 linux-2.6/arch/x86_64/ia32/sys_ia32.c             |    5 
 linux-2.6/arch/x86_64/kernel/process.c            |    5 
 linux-2.6/arch/x86_64/kernel/ptrace.c             |  632 +++++----
 linux-2.6/arch/x86_64/kernel/signal.c             |   30 
 linux-2.6/arch/x86_64/kernel/traps.c              |    8 
 linux-2.6/arch/x86_64/mm/fault.c                  |    4 
 linux-2.6/drivers/connector/cn_proc.c             |    4 
 linux-2.6/fs/binfmt_aout.c                        |    6 
 linux-2.6/fs/binfmt_elf.c                         |    6 
 linux-2.6/fs/binfmt_elf_fdpic.c                   |    7 
 linux-2.6/fs/binfmt_flat.c                        |    3 
 linux-2.6/fs/binfmt_som.c                         |    2 
 linux-2.6/fs/exec.c                               |   11 
 linux-2.6/fs/proc/array.c                         |    7 
 linux-2.6/fs/proc/base.c                          |   18 
 linux-2.6/include/asm-i386/i387.h                 |   13 
 linux-2.6/include/asm-i386/signal.h               |    4 
 linux-2.6/include/asm-i386/thread_info.h          |    7 
 linux-2.6/include/asm-i386/tracehook.h            |   73 +
 linux-2.6/include/asm-powerpc/tracehook.h         |  302 ++++
 linux-2.6/include/asm-x86_64/fpu32.h              |    3 
 linux-2.6/include/asm-x86_64/thread_info.h        |    2 
 linux-2.6/include/asm-x86_64/tracehook.h          |  105 +
 linux-2.6/include/linux/init_task.h               |    3 
 linux-2.6/include/linux/ptrace.h                  |   82 -
 linux-2.6/include/linux/sched.h                   |   26 
 linux-2.6/include/linux/tracehook.h               |  568 ++++++++
 linux-2.6/include/linux/utrace.h                  |  459 ++++++
 linux-2.6/init/Kconfig                            |   29 
 linux-2.6/kernel/exit.c                           |  251 ---
 linux-2.6/kernel/fork.c                           |   60 
 linux-2.6/kernel/ptrace.c                         | 1465 ++++++++++++++++-----
 linux-2.6/kernel/signal.c                         |  211 ---
 linux-2.6/kernel/sys.c                            |    2 
 linux-2.6/kernel/timer.c                          |    6 
 linux-2.6/kernel/utrace.c                         | 1475 ++++++++++++++++++++++
 linux-2.6/security/selinux/hooks.c                |    6 
 79 files changed, 6840 insertions(+), 3196 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-utrace.patch	13 Jul 2006 01:44:10 -0000	1.4
+++ linux-2.6-utrace.patch	15 Jul 2006 07:25:06 -0000	1.5
@@ -6441,16 +6441,16 @@
 +};
 +
 +#endif
---- linux-2.6/kernel/Makefile.utrace-ptrace-compat
-+++ linux-2.6/kernel/Makefile
+--- linux-2.6.17.noarch/kernel/Makefile~	2006-07-15 03:12:59.000000000 -0400
++++ linux-2.6.17.noarch/kernel/Makefile	2006-07-15 03:13:04.000000000 -0400
 @@ -48,6 +48,7 @@ obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
  obj-$(CONFIG_SECCOMP) += seccomp.o
  obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
  obj-$(CONFIG_RELAY) += relay.o
 +obj-$(CONFIG_UTRACE) += utrace.o
+ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
+ obj-$(CONFIG_TASKSTATS) += taskstats.o
  
- ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
- # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/fs/binfmt_elf_fdpic.c.utrace-ptrace-compat
 +++ linux-2.6/fs/binfmt_elf_fdpic.c
 @@ -421,13 +421,6 @@ static int load_elf_fdpic_binary(struct 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- sources	14 Jul 2006 15:03:47 -0000	1.429
+++ sources	15 Jul 2006 07:25:06 -0000	1.430
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-83f65e323b4797d758fd232eadc127d5  patch-2.6.18-rc1-git8.bz2
+9033f9941b667f3e06d99ee1975a2ed7  patch-2.6.18-rc1-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- upstream	14 Jul 2006 15:03:47 -0000	1.396
+++ upstream	15 Jul 2006 07:25:06 -0000	1.397
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git8.bz2
+patch-2.6.18-rc1-git9.bz2


--- linux-2.6-defaults-max-symlinks.patch DELETED ---


--- patch-2.6.18-rc1-git7.bz2.sign DELETED ---


--- patch-2.6.18-rc1-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 15 07:41:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 03:41:51 -0400
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.92,1.93
Message-ID: <200607150741.k6F7fpnA013557@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13399

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 Makefile            |    4 ----
 net/sched/sch_htb.c |    2 +-
 2 files changed, 1 insertion(+), 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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- linux-2.6-compile-fixes.patch	5 Jul 2006 12:53:02 -0000	1.92
+++ linux-2.6-compile-fixes.patch	15 Jul 2006 07:41:48 -0000	1.93
@@ -12,3 +12,14 @@
  # Make variables (CC, etc...)
  
  AS		= $(CROSS_COMPILE)as
+--- linux-2.6.17.noarch/net/sched/sch_htb.c~	2006-07-15 03:40:14.000000000 -0400
++++ linux-2.6.17.noarch/net/sched/sch_htb.c	2006-07-15 03:40:21.000000000 -0400
+@@ -1601,7 +1601,7 @@ static int htb_change_class(struct Qdisc
+ 		/* set class to be in HTB_CAN_SEND state */
+ 		cl->tokens = hopt->buffer;
+ 		cl->ctokens = hopt->cbuffer;
+-		cl->mbuffer = PSCHED_JIFFIE2US(HZ*60) /* 1min */
++		cl->mbuffer = PSCHED_JIFFIE2US(HZ*60); /* 1min */
+ 		PSCHED_GET_TIME(cl->t_c);
+ 		cl->cmode = HTB_CAN_SEND;
+ 



From fedora-cvs-commits at redhat.com  Sat Jul 15 08:01:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 04:01:08 -0400
Subject: rpms/kernel/devel/configs config-generic,1.231,1.232
Message-ID: <200607150801.k6F818NY002908@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2854/configs

Modified Files:
	config-generic 
Log Message:
busted


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- config-generic	15 Jul 2006 07:25:06 -0000	1.231
+++ config-generic	15 Jul 2006 08:01:00 -0000	1.232
@@ -1410,7 +1410,7 @@
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
+# CONFIG_ROCKETPORT is not set
 CONFIG_SYNCLINK=m 
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m



From fedora-cvs-commits at redhat.com  Sat Jul 15 08:12:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 04:12:33 -0400
Subject: rpms/kernel/devel/configs config-generic,1.232,1.233
Message-ID: <200607150812.k6F8CXjZ006262@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv5925/configs

Modified Files:
	config-generic 
Log Message:
replace with patch that's going upstream
(also update Makefile 'make debug/release' targets.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- config-generic	15 Jul 2006 08:01:00 -0000	1.232
+++ config-generic	15 Jul 2006 08:12:30 -0000	1.233
@@ -2524,11 +2524,9 @@
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_VM=y
 CONFIG_DEBUG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_RWSEMS=y
-
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_PROVE_LOCKING=y
 # CONFIG_DEBUG_LOCKDEP is not set
@@ -2542,6 +2540,8 @@
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_BOOT_DELAY=y
 CONFIG_DEBUG_SLAB_LEAK=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_LIST=y
 
 #
 # Security options



From fedora-cvs-commits at redhat.com  Sat Jul 15 08:12:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 04:12:33 -0400
Subject: rpms/kernel/devel Makefile, 1.27,
	1.28 linux-2.6-debug-list_head.patch, 1.3, 1.4
Message-ID: <200607150812.k6F8CXpb006252@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5925

Modified Files:
	Makefile linux-2.6-debug-list_head.patch 
Log Message:
replace with patch that's going upstream
(also update Makefile 'make debug/release' targets.




Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile	29 Jun 2006 08:27:51 -0000	1.27
+++ Makefile	15 Jul 2006 08:12:30 -0000	1.28
@@ -21,17 +21,20 @@
 
 debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' configs/config-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' configs/config-x86-generic
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' configs/config-x86-generic
 	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' configs/config-x86-generic
-	@perl -pi -e 's/# CONFIG_DEBUG_VM is not set/CONFIG_DEBUG_VM=y/' configs/config-x86-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_RWSEMS is not set/CONFIG_DEBUG_RWSEMS=y/' configs/config-x86-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' configs/config-x86-generic
+	@perl -pi -e 's/# CONFIG_DEBUG_PROVE_LOCKING is not set/CONFIG_DEBUG_PROVE_LOCKING=y/' configs/config-x86-generic
 
 release:
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' configs/config-generic
-	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-x86-generic
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' configs/config-x86-generic
 	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' configs/config-x86-generic
-	@perl -pi -e 's/CONFIG_DEBUG_VM=y/# CONFIG_DEBUG_VM is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_RWSEMS=y/# CONFIG_DEBUG_RWSEMS is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_PROVE_LOCKING=y/# CONFIG_DEBUG_PROVE_LOCKING is not set/' configs/config-x86-generic
+	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' configs/config-x86-generic
 
 reconfig:
 	@rm -f kernel-*-config

linux-2.6-debug-list_head.patch:
 include/linux/list.h |   15 +++++++++
 lib/Kconfig.debug    |    9 +++++
 lib/Makefile         |    1 
 lib/list_debug.c     |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-list_head.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-list_head.patch	27 May 2006 05:15:19 -0000	1.3
+++ linux-2.6-debug-list_head.patch	15 Jul 2006 08:12:30 -0000	1.4
@@ -1,136 +1,172 @@
-list_head debugging from -mm
-
---- linux-2.6.12/include/linux/list.h~	2005-08-08 15:34:50.000000000 -0400
-+++ linux-2.6.12/include/linux/list.h	2005-08-08 15:35:22.000000000 -0400
-@@ -5,7 +5,9 @@
- 
- #include <linux/stddef.h>
- #include <linux/prefetch.h>
-+#include <linux/kernel.h>
- #include <asm/system.h>
-+#include <asm/bug.h>
- 
- /*
-  * These are non-NULL pointers that will result in page faults
-@@ -52,6 +52,16 @@ static inline void __list_add(struct lis
+diff --git a/include/linux/list.h b/include/linux/list.h
+index 6b74adf..5617c77 100644
+--- a/include/linux/list.h
++++ b/include/linux/list.h
+@@ -39,6 +39,7 @@ static inline void INIT_LIST_HEAD(struct
+  * This is only for internal list manipulation where we know
+  * the prev/next entries already!
+  */
++#ifndef CONFIG_DEBUG_LIST
+ static inline void __list_add(struct list_head *new,
  			      struct list_head *prev,
  			      struct list_head *next)
+@@ -48,6 +49,11 @@ static inline void __list_add(struct lis
+ 	new->prev = prev;
+ 	prev->next = new;
+ }
++#else
++extern void __list_add(struct list_head *new,
++			      struct list_head *prev,
++			      struct list_head *next);
++#endif
+ 
+ /**
+  * list_add - add a new entry
+@@ -57,10 +63,15 @@ static inline void __list_add(struct lis
+  * Insert a new entry after the specified head.
+  * This is good for implementing stacks.
+  */
++#ifndef CONFIG_DEBUG_LIST
+ static inline void list_add(struct list_head *new, struct list_head *head)
  {
+ 	__list_add(new, head, head->next);
+ }
++#else
++extern void list_add(struct list_head *new, struct list_head *head);
++#endif
++
+ 
+ /**
+  * list_add_tail - add a new entry
+@@ -153,12 +164,16 @@ static inline void __list_del(struct lis
+  * Note: list_empty on entry does not return true after this, the entry is
+  * in an undefined state.
+  */
++#ifndef CONFIG_DEBUG_LIST
+ static inline void list_del(struct list_head *entry)
+ {
+ 	__list_del(entry->prev, entry->next);
+ 	entry->next = LIST_POISON1;
+ 	entry->prev = LIST_POISON2;
+ }
++#else
++extern void list_del(struct list_head *entry);
++#endif
+ 
+ /**
+  * list_del_rcu - deletes entry from list without re-initialization
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index e5889b1..bb17ce3 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -311,6 +311,15 @@ config DEBUG_VM
+ 
+ 	  If unsure, say N.
+ 
++config DEBUG_LIST
++	bool "Debug linked list manipulation"
++	depends on DEBUG_KERNEL
++	help
++	  Enable this to turn on extended checks in the linked-list
++	  walking routines.
++
++	  If unsure, say N.
++
+ config FRAME_POINTER
+ 	bool "Compile the kernel with frame pointers"
+ 	depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390)
+diff --git a/lib/Makefile b/lib/Makefile
+index be9719a..7d7da98 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -28,6 +28,7 @@ lib-$(CONFIG_GENERIC_HWEIGHT) += hweight
+ obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o
+ obj-$(CONFIG_PLIST) += plist.o
+ obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
++obj-$(CONFIG_DEBUG_LIST) += list_debug.o
+ 
+ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
+   lib-y += dec_and_lock.o
+diff --git a/lib/list_debug.c b/lib/list_debug.c
+new file mode 100644
+index 0000000..0b48b95
+--- /dev/null
++++ b/lib/list_debug.c
+@@ -0,0 +1,77 @@
++/*
++ * Copyright 2006, Red Hat, Inc., Dave Jones
++ * Released under the General Public License (GPL).
++ *
++ * This file contains the linked list implementations for
++ * DEBUG_LIST.
++ */
++
++#include <linux/module.h>
++#include <linux/list.h>
++
++/*
++ * Insert a new entry between two known consecutive entries.
++ *
++ * This is only for internal list manipulation where we know
++ * the prev/next entries already!
++ */
++
++void __list_add(struct list_head *new,
++			      struct list_head *prev,
++			      struct list_head *next)
++{
 +	if (next->prev != prev) {
 +		printk("List corruption. next->prev should be %p, but was %p\n",
-+				prev, next->prev);
++			prev, next->prev);
 +		BUG();
 +	}
 +	if (prev->next != next) {
 +		printk("List corruption. prev->next should be %p, but was %p\n",
-+				next, prev->next);
++			next, prev->next);
 +		BUG();
 +	}
- 	next->prev = new;
- 	new->next = next;
- 	new->prev = prev;
-@@ -162,6 +162,16 @@ static inline void __list_del(struct lis
-  */
- static inline void list_del(struct list_head *entry)
- {
++	next->prev = new;
++	new->next = next;
++	new->prev = prev;
++	prev->next = new;
++}
++EXPORT_SYMBOL(__list_add);
++
++/**
++ * list_add - add a new entry
++ * @new: new entry to be added
++ * @head: list head to add it after
++ *
++ * Insert a new entry after the specified head.
++ * This is good for implementing stacks.
++ */
++void list_add(struct list_head *new, struct list_head *head)
++{
++	__list_add(new, head, head->next);
++}
++EXPORT_SYMBOL(list_add);
++
++/**
++ * list_del - deletes entry from list.
++ * @entry: the element to delete from the list.
++ * Note: list_empty on entry does not return true after this, the entry is
++ * in an undefined state.
++ */
++void list_del(struct list_head *entry)
++{
 +	if (entry->prev->next != entry) {
 +		printk("List corruption. prev->next should be %p, but was %p\n",
-+				entry, entry->prev->next);
++			entry, entry->prev->next);
 +		BUG();
 +	}
 +	if (entry->next->prev != entry) {
 +		printk("List corruption. next->prev should be %p, but was %p\n",
-+				entry, entry->next->prev);
++			entry, entry->next->prev);
 +		BUG();
 +	}
- 	__list_del(entry->prev, entry->next);
- 	entry->next = LIST_POISON1;
- 	entry->prev = LIST_POISON2;
-
-
-
-It _may_ give more information about exactly which wait-queue (or rather, 
-what the poll function that was related to that wait-queue) seems to be 
-corrupted. 
-
-		Linus
-
----
-diff --git a/fs/select.c b/fs/select.c
-index a8109ba..8cd6dc3 100644
---- a/fs/select.c
-+++ b/fs/select.c
-@@ -23,6 +23,7 @@ #include <linux/personality.h> /* for ST
- #include <linux/file.h>
- #include <linux/fs.h>
- #include <linux/rcupdate.h>
-+#include <linux/kallsyms.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -65,7 +66,8 @@ EXPORT_SYMBOL(poll_initwait);
- 
- static void free_poll_entry(struct poll_table_entry *entry)
- {
--	remove_wait_queue(entry->wait_address,&entry->wait);
-+	if (remove_wait_queue(entry->wait_address,&entry->wait) < 0)
-+		print_symbol("bad poll-entry for %s", (unsigned long) entry->filp->f_op->poll);
- 	fput(entry->filp);
- }
- 
-diff --git a/include/linux/wait.h b/include/linux/wait.h
-index d285182..4c1d74e 100644
---- a/include/linux/wait.h
-+++ b/include/linux/wait.h
-@@ -115,7 +115,7 @@ #define is_sync_wait(wait)	(!(wait) || (
- 
- extern void FASTCALL(add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
- extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait));
--extern void FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
-+extern int FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
- 
- static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)
- {
-diff --git a/kernel/wait.c b/kernel/wait.c
-index 791681c..5cdf169 100644
---- a/kernel/wait.c
-+++ b/kernel/wait.c
-@@ -33,13 +33,35 @@ void fastcall add_wait_queue_exclusive(w
- }
- EXPORT_SYMBOL(add_wait_queue_exclusive);
- 
--void fastcall remove_wait_queue(wait_queue_head_t *q, wait_queue_t *wait)
-+int fastcall remove_wait_queue(wait_queue_head_t *q, wait_queue_t *wait)
- {
- 	unsigned long flags;
-+	struct list_head *list;
-+	int seen, retval;
- 
- 	spin_lock_irqsave(&q->lock, flags);
--	__remove_wait_queue(q, wait);
-+	list = &q->task_list;
-+	seen = 0;
-+	retval = -1;
-+
-+	do {
-+		struct list_head *next;
-+		if (list == &wait->task_list)
-+			seen++;
-+		next = list->next;
-+		if (next->prev != list) {
-+			seen += 2;
-+			break;
-+		}
-+		list = next;
-+	} while (list != &q->task_list);
-+
-+	if (seen == 1) {
-+		__remove_wait_queue(q, wait);
-+		retval = 0;
-+	}
- 	spin_unlock_irqrestore(&q->lock, flags);
-+	return retval;
- }
- EXPORT_SYMBOL(remove_wait_queue);
- 
-
++	__list_del(entry->prev, entry->next);
++	entry->next = LIST_POISON1;
++	entry->prev = LIST_POISON2;
++}
++EXPORT_SYMBOL(list_del);
++



From fedora-cvs-commits at redhat.com  Sat Jul 15 16:04:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 12:04:47 -0400
Subject: rpms/unifdef/devel unifdef.spec,1.2,1.3
Message-ID: <200607151604.k6FG4lNl009646@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/unifdef/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9621

Modified Files:
	unifdef.spec 
Log Message:
remove %dist redefinition


Index: unifdef.spec
===================================================================
RCS file: /cvs/dist/rpms/unifdef/devel/unifdef.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unifdef.spec	15 Jul 2006 03:28:36 -0000	1.2
+++ unifdef.spec	15 Jul 2006 16:04:43 -0000	1.3
@@ -1,9 +1,7 @@
-%define dist .fc6
-
 Summary: Unifdef tool for removing ifdef'd lines
 Name: unifdef
 Version: 1.171
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/
@@ -43,6 +41,9 @@
 
 
 %changelog
+* Sat Jul 15 2006 David Woodhouse <dwmw2 at infradead.org> - 1.171-5
+- Don't redefine %%dist
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.171-4
 - Minor specfile cleanups from review
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 19:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 15:57:56 -0400
Subject: rpms/kernel/FC-5 patch-2.6.17.6.bz2.sign, NONE, 1.1 .cvsignore,
	1.409, 1.410 kernel-2.6.spec, 1.2158, 1.2159 sources, 1.350,
	1.351 upstream, 1.319, 1.320 patch-2.6.17.4.bz2.sign, 1.1, NONE
Message-ID: <200607151957.k6FJvu8i001184@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1128

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.6.bz2.sign 
Removed Files:
	patch-2.6.17.4.bz2.sign 
Log Message:
2.6.17.6



--- NEW FILE patch-2.6.17.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEuUMsyGugalF9Dw4RAt1hAJ4gg4P/GZxC9pKtm3gcPcN3QTIpWQCeJhYR
/6Knp8/AfUN9sBxc+GMnyng=
=bDY4
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- .cvsignore	12 Jul 2006 02:32:17 -0000	1.409
+++ .cvsignore	15 Jul 2006 19:57:53 -0000	1.410
@@ -3,4 +3,4 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 xen-20060708.tar.bz2
-patch-2.6.17.4.bz2
+patch-2.6.17.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2158
retrieving revision 1.2159
diff -u -r1.2158 -r1.2159
--- kernel-2.6.spec	14 Jul 2006 14:50:49 -0000	1.2158
+++ kernel-2.6.spec	15 Jul 2006 19:57:53 -0000	1.2159
@@ -231,7 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.4.bz2
+Patch1: patch-2.6.17.6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1548,6 +1548,9 @@
 %endif
 
 %changelog
+* Sat Jul 16 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.6
+
 * Fri Jul 14 2006 Dave Jones <davej at redhat.com>
 - Reenable SMC NIC driver.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- sources	12 Jul 2006 02:32:17 -0000	1.350
+++ sources	15 Jul 2006 19:57:53 -0000	1.351
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
-c3b9e8e7b63d6273c5476a999a3b6280  patch-2.6.17.4.bz2
+d8598f06ed1ce41b4ea51d9eb7ed4277  patch-2.6.17.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- upstream	12 Jul 2006 02:32:17 -0000	1.319
+++ upstream	15 Jul 2006 19:57:53 -0000	1.320
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.4.bz2
+patch-2.6.17.6.bz2


--- patch-2.6.17.4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 15 19:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 15:59:03 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.6.bz2.sign, NONE, 1.1 .cvsignore,
	1.196, 1.197 kernel-2.6.spec, 1.1661, 1.1662 sources, 1.180,
	1.181 upstream, 1.121, 1.122
Message-ID: <200607151959.k6FJx3SP001742@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1704

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.17.6.bz2.sign 
Log Message:
2.6.17.6


--- NEW FILE patch-2.6.17.6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEuUMsyGugalF9Dw4RAt1hAJ4gg4P/GZxC9pKtm3gcPcN3QTIpWQCeJhYR
/6Knp8/AfUN9sBxc+GMnyng=
=bDY4
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- .cvsignore	12 Jul 2006 02:29:12 -0000	1.196
+++ .cvsignore	15 Jul 2006 19:58:59 -0000	1.197
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.4.bz2
+patch-2.6.17.6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- kernel-2.6.spec	12 Jul 2006 02:30:41 -0000	1.1661
+++ kernel-2.6.spec	15 Jul 2006 19:58:59 -0000	1.1662
@@ -202,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.4.bz2
+Patch1: patch-2.6.17.6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -1079,6 +1079,9 @@
 %endif
 
 %changelog
+* Sat Jul 15 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2143_FC4]
+- 2.6.17.6
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2142_FC4]
 - 2.6.17.4
 - Disable split pagetable lock.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- sources	12 Jul 2006 02:29:13 -0000	1.180
+++ sources	15 Jul 2006 19:59:00 -0000	1.181
@@ -1,2 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-c3b9e8e7b63d6273c5476a999a3b6280  patch-2.6.17.4.bz2
+d8598f06ed1ce41b4ea51d9eb7ed4277  patch-2.6.17.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- upstream	12 Jul 2006 02:29:13 -0000	1.121
+++ upstream	15 Jul 2006 19:59:00 -0000	1.122
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.4.bz2
+patch-2.6.17.6.bz2



From fedora-cvs-commits at redhat.com  Sat Jul 15 20:03:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 16:03:55 -0400
Subject: rpms/kernel/devel linux-2.6-debug-list_head.patch,1.4,1.5
Message-ID: <200607152003.k6FK3tGS002585@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2411

Modified Files:
	linux-2.6-debug-list_head.patch 
Log Message:
further improvements.


linux-2.6-debug-list_head.patch:
 include/linux/list.h |   15 +++++++++
 lib/Kconfig.debug    |    9 +++++
 lib/Makefile         |    1 
 lib/list_debug.c     |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+)

Index: linux-2.6-debug-list_head.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-list_head.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-list_head.patch	15 Jul 2006 08:12:30 -0000	1.4
+++ linux-2.6-debug-list_head.patch	15 Jul 2006 20:03:41 -0000	1.5
@@ -1,3 +1,7 @@
+Debug variants of linked-list manipulation macros.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
 diff --git a/include/linux/list.h b/include/linux/list.h
 index 6b74adf..5617c77 100644
 --- a/include/linux/list.h
@@ -115,13 +119,13 @@
 +			      struct list_head *prev,
 +			      struct list_head *next)
 +{
-+	if (next->prev != prev) {
-+		printk("List corruption. next->prev should be %p, but was %p\n",
++	if (unlikely(next->prev != prev)) {
++		printk("list_add corruption. next->prev should be %p, but was %p\n",
 +			prev, next->prev);
 +		BUG();
 +	}
-+	if (prev->next != next) {
-+		printk("List corruption. prev->next should be %p, but was %p\n",
++	if (unlikely(prev->next != next)) {
++		printk("list_add corruption. prev->next should be %p, but was %p\n",
 +			next, prev->next);
 +		BUG();
 +	}
@@ -154,13 +158,13 @@
 + */
 +void list_del(struct list_head *entry)
 +{
-+	if (entry->prev->next != entry) {
-+		printk("List corruption. prev->next should be %p, but was %p\n",
++	if (unlikely(entry->prev->next != entry)) {
++		printk("list_del corruption. prev->next should be %p, but was %p\n",
 +			entry, entry->prev->next);
 +		BUG();
 +	}
-+	if (entry->next->prev != entry) {
-+		printk("List corruption. next->prev should be %p, but was %p\n",
++	if (unlikely(entry->next->prev != entry)) {
++		printk("list_del corruption. next->prev should be %p, but was %p\n",
 +			entry, entry->next->prev);
 +		BUG();
 +	}



From fedora-cvs-commits at redhat.com  Sat Jul 15 20:21:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 16:21:23 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc1-git10.bz2.sign, NONE,
	1.1 .cvsignore, 1.486, 1.487 kernel-2.6.spec, 1.2401,
	1.2402 linux-2.6-compile-fixes.patch, 1.93, 1.94 sources,
	1.430, 1.431 upstream, 1.397,
	1.398 patch-2.6.18-rc1-git9.bz2.sign, 1.1, NONE
Message-ID: <200607152021.k6FKLNuX023016@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22949

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.18-rc1-git10.bz2.sign 
Removed Files:
	patch-2.6.18-rc1-git9.bz2.sign 
Log Message:
git10


--- NEW FILE patch-2.6.18-rc1-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEuTxhyGugalF9Dw4RAipvAJ40C7sv3bA+lg5jEHnkR1qDyUdwFwCeLs4A
wV43nx02se+NgRu/a/HSe8U=
=giJN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- .cvsignore	15 Jul 2006 07:25:05 -0000	1.486
+++ .cvsignore	15 Jul 2006 20:21:21 -0000	1.487
@@ -4,4 +4,4 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git9.bz2
+patch-2.6.18-rc1-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2401
retrieving revision 1.2402
diff -u -r1.2401 -r1.2402
--- kernel-2.6.spec	15 Jul 2006 07:25:05 -0000	1.2401
+++ kernel-2.6.spec	15 Jul 2006 20:21:21 -0000	1.2402
@@ -256,7 +256,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git9.bz2
+Patch2: patch-2.6.18-rc1-git10.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1670,7 +1670,8 @@
 %changelog
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com>
 - Cleaned up a bunch of bogons in the config files.
-- 2.6.18-rc1-git9
+- 2.6.18-rc1-git9 & git10
+- improvements to linked list debugging.
 
 * Fri Jul 14 2006 Don Zickus <dzickus at redhat.com>
 - remove the ppc kdump patches

linux-2.6-compile-fixes.patch:
 Makefile |    4 ----
 1 files changed, 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- linux-2.6-compile-fixes.patch	15 Jul 2006 07:41:48 -0000	1.93
+++ linux-2.6-compile-fixes.patch	15 Jul 2006 20:21:21 -0000	1.94
@@ -12,14 +12,3 @@
  # Make variables (CC, etc...)
  
  AS		= $(CROSS_COMPILE)as
---- linux-2.6.17.noarch/net/sched/sch_htb.c~	2006-07-15 03:40:14.000000000 -0400
-+++ linux-2.6.17.noarch/net/sched/sch_htb.c	2006-07-15 03:40:21.000000000 -0400
-@@ -1601,7 +1601,7 @@ static int htb_change_class(struct Qdisc
- 		/* set class to be in HTB_CAN_SEND state */
- 		cl->tokens = hopt->buffer;
- 		cl->ctokens = hopt->cbuffer;
--		cl->mbuffer = PSCHED_JIFFIE2US(HZ*60) /* 1min */
-+		cl->mbuffer = PSCHED_JIFFIE2US(HZ*60); /* 1min */
- 		PSCHED_GET_TIME(cl->t_c);
- 		cl->cmode = HTB_CAN_SEND;
- 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- sources	15 Jul 2006 07:25:06 -0000	1.430
+++ sources	15 Jul 2006 20:21:21 -0000	1.431
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-9033f9941b667f3e06d99ee1975a2ed7  patch-2.6.18-rc1-git9.bz2
+f8556cd0491efd4614c5a81db5208940  patch-2.6.18-rc1-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- upstream	15 Jul 2006 07:25:06 -0000	1.397
+++ upstream	15 Jul 2006 20:21:21 -0000	1.398
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git9.bz2
+patch-2.6.18-rc1-git10.bz2


--- patch-2.6.18-rc1-git9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 15 20:54:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 16:54:16 -0400
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec, 1.17,
	1.18
Message-ID: <200607152054.k6FKsGTV016156@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16126

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
* Sat Jul 15 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4.fc6
- Make dist tag usage a conditional (#198988)



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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-util-macros.spec	13 Jul 2006 06:07:45 -0000	1.17
+++ xorg-x11-util-macros.spec	15 Jul 2006 20:54:14 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.2
-Release: 3%{dist}
+Release: 4%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -38,10 +38,13 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
-* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-3
+* Sat Jul 15 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4.fc6
+- Make dist tag usage a conditional (#198988)
+
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.2-3
 - Bump for rawhide build.
 
-* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.0.2-2.fc5.aiglx
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 1.0.2-2.fc5.aiglx
 - Tag as 1.0.2-2.fc5.aiglx
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.2-1.1



From fedora-cvs-commits at redhat.com  Sat Jul 15 21:11:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 17:11:17 -0400
Subject: rpms/libuser/FC-4 libuser-0.53.7-double-free.patch, NONE,
	1.1 libuser-0.53.7-enumerate.patch, NONE,
	1.1 libuser-0.53.7-lpasswd.patch, NONE, 1.1 libuser.spec, 1.38, 1.39
Message-ID: <200607152111.k6FLBHnl020662@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libuser/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20597

Modified Files:
	libuser.spec 
Added Files:
	libuser-0.53.7-double-free.patch 
	libuser-0.53.7-enumerate.patch libuser-0.53.7-lpasswd.patch 
Log Message:
* Sat Jul 15 2006 Miloslav Trmac <mitr at redhat.com> - 0.53.7-1.fc4.1
- Fix an lpasswd crash (#198891)
- Fix a double free and user enumeration (#186382)
- Ship libuser.so.1


libuser-0.53.7-double-free.patch:
 user.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE libuser-0.53.7-double-free.patch ---
Index: lib/user.c
===================================================================
RCS file: /usr/local/CVS/libuser/lib/user.c,v
retrieving revision 1.75
diff -u -r1.75 user.c
--- lib/user.c	14 Nov 2004 20:58:51 -0000	1.75
+++ lib/user.c	7 May 2006 14:30:58 -0000
@@ -649,6 +649,7 @@
 			g_list_free(list);
 			/* Merge the pending data. */
 			attributes = lu_ent_get_attributes(current);
+			list = attributes;
 			while (attributes != NULL) {
 				attr = (const char *)attributes->data;
 				values = lu_ent_get(current, attr);

libuser-0.53.7-enumerate.patch:
 files.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libuser-0.53.7-enumerate.patch ---
Index: modules/files.c
===================================================================
RCS file: /usr/local/CVS/libuser/modules/files.c,v
retrieving revision 1.76
diff -u -r1.76 files.c
--- modules/files.c	15 Apr 2005 13:28:16 -0000	1.76
+++ modules/files.c	7 May 2006 14:31:07 -0000
@@ -2656,7 +2656,7 @@
 		}
 		/* If the account name matches the pattern, parse it and add
 		 * it to the list. */
-		if (fnmatch(pattern, buf, 0) == 0) {
+		if (fnmatch(pattern, key, 0) == 0) {
 			parser(buf, ent);
 			g_ptr_array_add(ret, ent);
 		} else {

libuser-0.53.7-lpasswd.patch:
 lpasswd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libuser-0.53.7-lpasswd.patch ---
--- libuser-0.53.7/apps/lpasswd.c.lpasswd	2006-07-15 22:50:28.000000000 +0200
+++ libuser-0.53.7/apps/lpasswd.c	2006-07-15 22:50:50.000000000 +0200
@@ -77,8 +77,6 @@
 	}
 	user = poptGetArg(popt);
 
-	lu_authenticate_unprivileged(user, "passwd");
-
 	if ((user == NULL) || (geteuid() != getuid())) {
 		struct passwd *pwd;
 		pwd = getpwuid(getuid());
@@ -92,6 +90,8 @@
 		}
 	}
 
+	lu_authenticate_unprivileged(user, "passwd");
+
 	ctx = lu_start(user, groupflag ? lu_group : lu_user, NULL, NULL,
 		       interactive ? lu_prompt_console :
 		       lu_prompt_console_quiet, NULL, &error);


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/FC-4/libuser.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libuser.spec	30 Apr 2005 16:56:58 -0000	1.38
+++ libuser.spec	15 Jul 2006 21:11:14 -0000	1.39
@@ -5,7 +5,7 @@
 
 Name: libuser
 Version: 0.53.7
-Release: 1
+Release: 1.fc4.1
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -17,6 +17,9 @@
 BuildRequires: libselinux-devel
 %endif
 Summary: A user and group account administration library.
+Patch0: libuser-0.53.7-double-free.patch
+Patch1: libuser-0.53.7-enumerate.patch
+Patch2: libuser-0.53.7-lpasswd.patch
 
 %description
 The libuser library implements a standardized interface for manipulating
@@ -38,6 +41,9 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .double-free
+%patch1 -p0 -b .enumerate
+%patch2 -p1 -b .lpasswd
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ; export CFLAGS
@@ -77,7 +83,7 @@
 
 %attr(0755,root,root) %{_bindir}/*
 %{_libdir}/python%{python}/site-packages/*.so
-%{_libdir}/*.so.*.*
+%{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so
 %attr(0755,root,root) %{_sbindir}/*
@@ -94,6 +100,11 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Jul 15 2006 Miloslav Trmac <mitr at redhat.com> - 0.53.7-1.fc4.1
+- Fix an lpasswd crash (#198891)
+- Fix a double free and user enumeration (#186382)
+- Ship libuser.so.1
+
 * Sat Apr 30 2005 Miloslav Trmac <mitr at redhat.com> - 0.53.7-1
 - Rebuild with updated translations, add missing translations.
 



From fedora-cvs-commits at redhat.com  Sat Jul 15 21:13:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 17:13:22 -0400
Subject: rpms/gcc/devel gcc41-power6.patch, NONE, 1.1 gcc41-pr28370.patch,
	NONE, 1.1 gcc41-pr28390.patch, NONE, 1.1 gcc41-reassoc1.patch,
	NONE, 1.1 gcc41-reassoc2.patch, NONE, 1.1 gcc41-reassoc3.patch,
	NONE, 1.1 gcc41-reassoc4.patch, NONE, 1.1 gcc41-reassoc5.patch,
	NONE, 1.1 gcc41.spec, 1.79, 1.80
Message-ID: <200607152113.k6FLDM61021511@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21483

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-power6.patch gcc41-pr28370.patch gcc41-pr28390.patch 
	gcc41-reassoc1.patch gcc41-reassoc2.patch gcc41-reassoc3.patch 
	gcc41-reassoc4.patch gcc41-reassoc5.patch 
Log Message:
4.1.1-8

gcc41-power6.patch:
 config.in | 2427 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
 configure |   46 +
 2 files changed, 2020 insertions(+), 453 deletions(-)

--- NEW FILE gcc41-power6.patch ---
2006-07-12  Pete Steinmetz <steinmtz at us.ibm.com>
	    Peter Bergner <bergner at vnet.ibm.com>

	* doc/invoke.texi (RS/6000 and PowerPC Options): Add -mmfpgpr.
	* recog.c (store_data_bypass_p): Add support to allow IN_INSN to
	be a PARALLEL containing sets.  Return false when out_pat is not
	a PARALLEL insn.
	* configure.ac: Add test for mf{t,f}gpr instructions.
	(HAVE_AS_MFPGPR): New.
	* configure: Regenerate.
	* config.in: Regenerate.
	* config/rs6000/linux64.h (PROCESSOR_DEFAULT): Default to POWER6.
	(PROCESSOR_DEFAULT64): Likewise.
	* config/rs6000/rs6000.md (define_attr "type"): Add insert_dword,
	shift,trap,var_shift_rotate,cntlz,exts, var_delayed_compare, mffgpr
	and mftgpr attributes.
	(define_attr "cpu"): Add power6.
	Change instruction sequences to use new attributes.
	(floatsidf2,fix_truncdfsi2): use TARGET_MFPGPR.
	(fix_truncdfsi2_internal_mfpgpr): New.
	(floatsidf_ppc64_mfpgpr): New.
	(floatsidf_ppc64): Added !TARGET_MFPGPR condition.
	(movdf_hardfloat64_mfpgpr,movdi_internal64_mfpgpr): New.
	(movdf_hardfloat64): Added !TARGET_MFPGPR condition.
	(movdi_internal64): Added !TARGET_MFPGPR and related conditions.
	* config/rs6000/{6xx.md,power4.md,8540.md,603.md,mpc.md,
	7xx.md,rios2.md,7450.md,440.md,rios1.md,rs64.md,power5.md,40x.md}:
	Add descriptions for insert_dword, shift,trap,var_shift_rotate,
	cntlz,exts and var_delayed_compare.
	* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Define
	_ARCH_PWR6, if features enabled.
	* config/rs6000/rs6000.opt (mmfpgpr): New.
	* config/rs6000/rs6000.c (rs6000_align_branch_targets): New variable.
	(cached_can_issue_more): New variable.
	(processor_costs): Add power6_cost.
	(rs6000_sched_init): New function.
	(is_dispatch_slot_restricted): Deleted.
	(set_to_load_agen): New function.
	(is_load_insn,is_store_insn): New functions.
	(adjacent_mem_locations): New function.
	(insn_must_be_first_in_group): New function.
	(insn_must_be_last_in_group): New function.
	(rs6000_sched_reorder): New function.
	(rs6000_sched_reorder2): New function.
	(TARGET_SCHED_INIT,TARGET_SCHED_REORDER,
	TARGET_SCHED_REORDER2): Define.
	(processor_target_table): Use PROCESSOR_POWER6 for power6,
	Add MASK_MFPGPR for power6.
	(POWERPC_MASKS): Add MASK_MFPGPR.
	(rs6000_override_options): Set rs6000_always_hint to false
	for power6.  Set rs6000_align_branch_targets. Replace
	rs6000_sched_groups check with rs6000_align_branch_targets.
	Use PROCESSOR_POWER6.
	(last_scheduled_insn): New variable.
	(load_store_pendulum): New variable.
	(rs6000_variable_issue): Set last_scheduled_insn and
	cached_can_issue_more.
	(rs6000_adjust_cost): Add power6 cost adjustments.
	(rs6000_adjust_priority): Replace is_dispatch_slot_restricted
	with insn_must_be_first_in_group. Add power6 priority adjustments.
	(rs6000_issue_rate): Add CPU_POWER6.
	(insn_terminates_group_p): Use insn_must_be_{first,last}_in_group.
	(rs6000_register_move_cost): Adjust rs6000_memory_move_cost if
	mf{t,f}gpr are available.
	* config/rs6000/rs6000.h (processor_type): Add PROCESSOR_POWER6.
	(TARGET_MFPGPR): New.
	(SECONDARY_MEMORY_NEEDED): Use TARGET_MFPGPR.
	* config/rs6000/power6.md: New file.

--- gcc/doc/invoke.texi	(revision 115324)
+++ gcc/doc/invoke.texi	(working copy)
@@ -637,6 +637,7 @@ See RS/6000 and PowerPC Options.
 -mpowerpc-gpopt  -mno-powerpc-gpopt @gol
 -mpowerpc-gfxopt  -mno-powerpc-gfxopt @gol
 -mmfcrf  -mno-mfcrf  -mpopcntb  -mno-popcntb  -mfprnd  -mno-fprnd @gol
+-mmfpgpr -mno-mfpgpr @gol
 -mnew-mnemonics  -mold-mnemonics @gol
 -mfull-toc   -mminimal-toc  -mno-fp-in-toc  -mno-sum-in-toc @gol
 -m64  -m32  -mxl-compat  -mno-xl-compat  -mpe @gol
@@ -10869,6 +10870,8 @@ These @samp{-m} options are defined for 
 @itemx -mno-popcntb
 @itemx -mfprnd
 @itemx -mno-fprnd
+ at itemx -mmfpgpr
+ at itemx -mno-mfpgpr
 @opindex mpower
 @opindex mno-power
 @opindex mpower2
@@ -10887,6 +10890,8 @@ These @samp{-m} options are defined for 
 @opindex mno-popcntb
 @opindex mfprnd
 @opindex mno-fprnd
+ at opindex mmfpgpr
+ at opindex mno-mfpgpr
 GCC supports two related instruction set architectures for the
 RS/6000 and PowerPC at .  The @dfn{POWER} instruction set are those
 instructions supported by the @samp{rios} chip set used in the original
@@ -10931,6 +10936,10 @@ architecture.
 The @option{-mfprnd} option allows GCC to generate the FP round to
 integer instructions implemented on the POWER5+ processor and other
 processors that support the PowerPC V2.03 architecture.
+The @option{-mfpgpr} option allows GCC to generate the FP move to/from
+general purpose register instructions implemented on the POWER6
+processor and other processors that support the PowerPC V2.05
+architecture.
 
 The @option{-mpowerpc64} option allows GCC to generate the additional
 64-bit instructions that are found in the full PowerPC64 architecture
@@ -10997,10 +11006,10 @@ following options: @option{-maltivec}, @
 @option{-mhard-float}, @option{-mmfcrf}, @option{-mmultiple},
 @option{-mnew-mnemonics}, @option{-mpopcntb}, @option{-mpower},
 @option{-mpower2}, @option{-mpowerpc64}, @option{-mpowerpc-gpopt},
- at option{-mpowerpc-gfxopt}, @option{-mstring}.  The particular options
-set for any particular CPU will vary between compiler versions,
-depending on what setting seems to produce optimal code for that CPU;
-it doesn't necessarily reflect the actual hardware's capabilities.  If
+ at option{-mpowerpc-gfxopt}, @option{-mstring}, @option{-mmfpgpr}.  The
+particular options set for any particular CPU will vary between compiler
+versions, depending on what setting seems to produce optimal code for that
+CPU; it doesn't necessarily reflect the actual hardware's capabilities.  If
 you wish to set an individual option to a particular value, you may
 specify it after the @option{-mcpu} option, like @samp{-mcpu=970
 -mno-altivec}.
--- gcc/recog.c	(revision 115324)
+++ gcc/recog.c	(working copy)
@@ -3359,47 +3359,92 @@
 /* Common predicates for use with define_bypass.  */
 
 /* True if the dependency between OUT_INSN and IN_INSN is on the store
-   data not the address operand(s) of the store.  IN_INSN must be
-   single_set.  OUT_INSN must be either a single_set or a PARALLEL with
-   SETs inside.  */
+   data not the address operand(s) of the store.  IN_INSN and OUT_INSN
+   must be either a single_set or a PARALLEL with SETs inside.  */
 
 int
 store_data_bypass_p (rtx out_insn, rtx in_insn)
 {
   rtx out_set, in_set;
+  rtx out_pat, in_pat;
+  rtx out_exp, in_exp;
+  int i, j;
 
   in_set = single_set (in_insn);
-  gcc_assert (in_set);
+  if (in_set)
+    {
+      if (!MEM_P (SET_DEST (in_set)))
+	return false;
 
-  if (!MEM_P (SET_DEST (in_set)))
-    return false;
+      out_set = single_set (out_insn);
+      if (out_set)
+        {
+          if (reg_mentioned_p (SET_DEST (out_set), SET_DEST (in_set)))
+            return false;
+        }
+      else
+        {
+          out_pat = PATTERN (out_insn);
 
-  out_set = single_set (out_insn);
-  if (out_set)
-    {
-      if (reg_mentioned_p (SET_DEST (out_set), SET_DEST (in_set)))
-	return false;
+	  if (GET_CODE (out_pat) != PARALLEL)
+	    return false;
+
+          for (i = 0; i < XVECLEN (out_pat, 0); i++)
+          {
+            out_exp = XVECEXP (out_pat, 0, i);
+
+            if (GET_CODE (out_exp) == CLOBBER)
+              continue;
+
+            gcc_assert (GET_CODE (out_exp) == SET);
+
+            if (reg_mentioned_p (SET_DEST (out_exp), SET_DEST (in_set)))
+              return false;
+          }
+      }
     }
   else
     {
-      rtx out_pat;
-      int i;
+      in_pat = PATTERN (in_insn);
+      gcc_assert (GET_CODE (in_pat) == PARALLEL);
 
-      out_pat = PATTERN (out_insn);
-      gcc_assert (GET_CODE (out_pat) == PARALLEL);
-
-      for (i = 0; i < XVECLEN (out_pat, 0); i++)
+      for (i = 0; i < XVECLEN (in_pat, 0); i++)
 	{
-	  rtx exp = XVECEXP (out_pat, 0, i);
+	  in_exp = XVECEXP (in_pat, 0, i);
[...3447 lines suppressed...]
-  [(set (match_operand:DI 0 "gpc_reg_operand" "=r")
-	(ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r")
-		     (match_operand:SI 2 "reg_or_cint_operand" "ri")))]
+  [(set (match_operand:DI 0 "gpc_reg_operand" "=r,r")
+	(ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r")
+		     (match_operand:SI 2 "reg_or_cint_operand" "r,i")))]
   "TARGET_POWERPC64"
-  "srad%I2 %0,%1,%H2")
+  "@
+   srad %0,%1,%2
+   sradi %0,%1,%H2"
+  [(set_attr "type" "var_shift_rotate,shift")])
 
 (define_insn "*ashrdi3_internal2"
-  [(set (match_operand:CC 0 "cc_reg_operand" "=x,?y")
-	(compare:CC (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r")
-				 (match_operand:SI 2 "reg_or_cint_operand" "ri,ri"))
+  [(set (match_operand:CC 0 "cc_reg_operand" "=x,x,?y,?y")
+	(compare:CC (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r,r,r")
+				 (match_operand:SI 2 "reg_or_cint_operand" "r,i,r,i"))
 		    (const_int 0)))
-   (clobber (match_scratch:DI 3 "=r,r"))]
+   (clobber (match_scratch:DI 3 "=r,r,r,r"))]
   "TARGET_64BIT"
   "@
-   srad%I2. %3,%1,%H2
+   srad. %3,%1,%2
+   sradi. %3,%1,%H2
+   #
    #"
-  [(set_attr "type" "delayed_compare")
-   (set_attr "length" "4,8")])
+  [(set_attr "type" "var_delayed_compare,delayed_compare,var_delayed_compare,delayed_compare")
+   (set_attr "length" "4,4,8,8")])
 
 (define_split
   [(set (match_operand:CC 0 "cc_reg_not_cr0_operand" "")
@@ -6715,18 +6868,20 @@
   "")
 
 (define_insn "*ashrdi3_internal3"
-  [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y")
-	(compare:CC (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r")
-				 (match_operand:SI 2 "reg_or_cint_operand" "ri,ri"))
+  [(set (match_operand:CC 3 "cc_reg_operand" "=x,x,?y,?y")
+	(compare:CC (ashiftrt:DI (match_operand:DI 1 "gpc_reg_operand" "r,r,r,r")
+				 (match_operand:SI 2 "reg_or_cint_operand" "r,i,r,i"))
 		    (const_int 0)))
-   (set (match_operand:DI 0 "gpc_reg_operand" "=r,r")
+   (set (match_operand:DI 0 "gpc_reg_operand" "=r,r,r,r")
 	(ashiftrt:DI (match_dup 1) (match_dup 2)))]
   "TARGET_64BIT"
   "@
-   srad%I2. %0,%1,%H2
+   srad. %0,%1,%2
+   sradi. %0,%1,%H2
+   #
    #"
-  [(set_attr "type" "delayed_compare")
-   (set_attr "length" "4,8")])
+  [(set_attr "type" "var_delayed_compare,delayed_compare,var_delayed_compare,delayed_compare")
+   (set_attr "length" "4,4,8,8")])
 
 (define_split
   [(set (match_operand:CC 3 "cc_reg_not_cr0_operand" "")
@@ -6801,7 +6956,7 @@
    #
    #
    #"
-  [(set_attr "type" "compare,compare,compare,compare,compare,compare,compare,compare,compare,compare,compare,compare")
+  [(set_attr "type" "compare,compare,delayed_compare,compare,compare,compare,compare,compare,compare,compare,compare,compare")
    (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
 
 (define_split
@@ -6852,7 +7007,7 @@
    #
    #
    #"
-  [(set_attr "type" "compare,compare,compare,compare,compare,compare,compare,compare,compare,compare,compare,compare")
+  [(set_attr "type" "compare,compare,delayed_compare,compare,compare,compare,compare,compare,compare,compare,compare,compare")
    (set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
 
 (define_split
@@ -7742,10 +7897,36 @@
 
 ; ld/std require word-aligned displacements -> 'Y' constraint.
 ; List Y->r and r->Y before r->r for reload.
+(define_insn "*movdf_hardfloat64_mfpgpr"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y,r,!r,f,f,m,*c*l,!r,*h,!r,!r,!r,r,f")
+	(match_operand:DF 1 "input_operand" "r,Y,r,f,m,f,r,h,0,G,H,F,f,r"))]
+  "TARGET_POWERPC64 && TARGET_MFPGPR && TARGET_HARD_FLOAT && TARGET_FPRS
+   && (gpc_reg_operand (operands[0], DFmode)
+       || gpc_reg_operand (operands[1], DFmode))"
+  "@
+   std%U0%X0 %1,%0
+   ld%U1%X1 %0,%1
+   mr %0,%1
+   fmr %0,%1
+   lfd%U1%X1 %0,%1
+   stfd%U0%X0 %1,%0
+   mt%0 %1
+   mf%1 %0
+   {cror 0,0,0|nop}
+   #
+   #
+   #
+   mftgpr %0,%1
+   mffgpr %0,%1"
+  [(set_attr "type" "store,load,*,fp,fpload,fpstore,mtjmpr,mfjmpr,*,*,*,*,mftgpr,mffgpr")
+   (set_attr "length" "4,4,4,4,4,4,4,4,4,8,12,16,4,4")])
+
+; ld/std require word-aligned displacements -> 'Y' constraint.
+; List Y->r and r->Y before r->r for reload.
 (define_insn "*movdf_hardfloat64"
   [(set (match_operand:DF 0 "nonimmediate_operand" "=Y,r,!r,f,f,m,*c*l,!r,*h,!r,!r,!r")
 	(match_operand:DF 1 "input_operand" "r,Y,r,f,m,f,r,h,0,G,H,F"))]
-  "TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS
+  "TARGET_POWERPC64 && !TARGET_MFPGPR && TARGET_HARD_FLOAT && TARGET_FPRS
    && (gpc_reg_operand (operands[0], DFmode)
        || gpc_reg_operand (operands[1], DFmode))"
   "@
@@ -8060,10 +8241,35 @@
   [(pc)]
 { rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
 
+(define_insn "*movdi_internal64_mfpgpr"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,m,r,r,r,r,*f,*f,m,r,*h,*h,r,*f")
+	(match_operand:DI 1 "input_operand" "r,m,r,I,L,nF,R,f,m,f,*h,r,0,*f,r"))]
+  "TARGET_POWERPC64 && TARGET_MFPGPR && TARGET_HARD_FLOAT && TARGET_FPRS
+   && (gpc_reg_operand (operands[0], DImode)
+       || gpc_reg_operand (operands[1], DImode))"
+  "@
+   mr %0,%1
+   ld%U1%X1 %0,%1
+   std%U0%X0 %1,%0
+   li %0,%1
+   lis %0,%v1
+   #
+   {cal|la} %0,%a1
+   fmr %0,%1
+   lfd%U1%X1 %0,%1
+   stfd%U0%X0 %1,%0
+   mf%1 %0
+   mt%0 %1
+   {cror 0,0,0|nop}
+   mftgpr %0,%1
+   mffgpr %0,%1"
+  [(set_attr "type" "*,load,store,*,*,*,*,fp,fpload,fpstore,mfjmpr,mtjmpr,*,mftgpr,mffgpr")
+   (set_attr "length" "4,4,4,4,4,20,4,4,4,4,4,4,4,4,4")])
+
 (define_insn "*movdi_internal64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,m,r,r,r,r,*f,*f,m,r,*h,*h")
 	(match_operand:DI 1 "input_operand" "r,m,r,I,L,nF,R,f,m,f,*h,r,0"))]
-  "TARGET_POWERPC64
+  "TARGET_POWERPC64 && (!TARGET_MFPGPR || !TARGET_HARD_FLOAT || !TARGET_FPRS)
    && (gpc_reg_operand (operands[0], DImode)
        || gpc_reg_operand (operands[1], DImode))"
   "@
@@ -13441,7 +13647,8 @@
 (define_insn "trap"
   [(trap_if (const_int 1) (const_int 0))]
   ""
-  "{t 31,0,0|trap}")
+  "{t 31,0,0|trap}"
+  [(set_attr "type" "trap")])
 
 (define_expand "conditional_trap"
   [(trap_if (match_operator 0 "trap_comparison_operator"
@@ -13458,7 +13665,8 @@
                              (match_operand:GPR 2 "reg_or_short_operand" "rI")])
 	    (const_int 0))]
   ""
-  "{t|t<wd>}%V0%I2 %1,%2")
+  "{t|t<wd>}%V0%I2 %1,%2"
+  [(set_attr "type" "trap")])
 
 ;; Insns related to generating the function prologue and epilogue.
 
--- gcc/config/rs6000/40x.md	(revision 115324)
+++ gcc/config/rs6000/40x.md	(working copy)
@@ -38,7 +38,8 @@
   "iu_40x")
 
 (define_insn_reservation "ppc403-integer" 1
-  (and (eq_attr "type" "integer,insert_word")
+  (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
+                        var_shift_rotate,cntlz,exts")
        (eq_attr "cpu" "ppc403,ppc405"))
   "iu_40x")
 
@@ -53,7 +54,8 @@
   "iu_40x,iu_40x,iu_40x")
 
 (define_insn_reservation "ppc403-compare" 3
-  (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare")
+  (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
+                        var_delayed_compare")
        (eq_attr "cpu" "ppc403,ppc405"))
   "iu_40x,nothing,bpu_40x")
 

gcc41-pr28370.patch:
 cp/decl2.c                        |   12 ++----------
 testsuite/g++.dg/template/anon3.C |   20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

--- NEW FILE gcc41-pr28370.patch ---
2006-07-15  Jakub Jelinek  <jakub at redhat.com>

	PR c++/28370
	* decl2.c (note_vague_linkage_var): Removed.
	(finish_static_data_member_decl): Add decl to pending_statics vector
	directly.  Do it even for non-public decls.

	* g++.dg/template/anon3.C: New test.

--- gcc/cp/decl2.c.jj	2006-07-11 11:21:20.000000000 +0200
+++ gcc/cp/decl2.c	2006-07-13 18:39:59.000000000 +0200
@@ -696,14 +696,6 @@ note_vague_linkage_fn (tree decl)
     }
 }
 
-/* Like note_vague_linkage_fn but for variables.  */
-
-static void
-note_vague_linkage_var (tree var)
-{
-  VEC_safe_push (tree, gc, pending_statics, var);
-}
-
 /* We have just processed the DECL, which is a static data member.
    The other parameters are as for cp_finish_decl.  */
 
@@ -719,8 +711,8 @@ finish_static_data_member_decl (tree dec
      TREE_CHAIN of our decl.  Instead, we modify cp_finish_decl to do
      the right thing, namely, to put this decl out straight away.  */
 
-  if (! processing_template_decl && TREE_PUBLIC (decl))
-    note_vague_linkage_var (decl);
+  if (! processing_template_decl)
+    VEC_safe_push (tree, gc, pending_statics, decl);
 
   if (LOCAL_CLASS_P (current_class_type))
     pedwarn ("local class %q#T shall not have static data member %q#D",
--- gcc/testsuite/g++.dg/template/anon3.C.jj	2006-07-13 15:36:40.709347500 +0200
+++ gcc/testsuite/g++.dg/template/anon3.C	2006-07-13 18:47:58.000000000 +0200
@@ -0,0 +1,20 @@
+// PR c++/28370
+// { dg-do run }
+
+namespace
+{
+  template<typename T> struct A { static int *a; };
+  template<typename T> int *A<T>::a = 0;
+}
+
+int *
+foo ()
+{
+  return A<int>::a;
+}
+
+int
+main ()
+{
+  return foo() != 0;
+}

gcc41-pr28390.patch:
 gcc/fortran/trans-openmp.c                  |    5 +++--
 libgomp/testsuite/libgomp.fortran/pr28390.f |    8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-pr28390.patch ---
2006-07-15  Jakub Jelinek  <jakub at redhat.com>

	PR fortran/28390
	* trans-openmp.c (gfc_trans_omp_do): Look for LASTPRIVATE in
	code->exp.omp_clauses rather than in the 3rd function argument.

	* testsuite/libgomp.fortran/pr28390.f: New test.

--- gcc/fortran/trans-openmp.c.jj	2006-06-09 23:14:16.000000000 +0200
+++ gcc/fortran/trans-openmp.c	2006-07-15 16:26:27.000000000 +0200
@@ -888,7 +888,7 @@ gfc_trans_omp_critical (gfc_code *code)
 
 static tree
 gfc_trans_omp_do (gfc_code *code, stmtblock_t *pblock,
-		  gfc_omp_clauses *clauses)
+		  gfc_omp_clauses *do_clauses)
 {
   gfc_se se;
   tree dovar, stmt, from, to, step, type, init, cond, incr;
@@ -897,6 +897,7 @@ gfc_trans_omp_do (gfc_code *code, stmtbl
   stmtblock_t body;
   int simple = 0;
   bool dovar_found = false;
+  gfc_omp_clauses *clauses = code->ext.omp_clauses;
 
   code = code->block->next;
   gcc_assert (code->op == EXEC_DO);
@@ -907,7 +908,7 @@ gfc_trans_omp_do (gfc_code *code, stmtbl
       pblock = &block;
     }
 
-  omp_clauses = gfc_trans_omp_clauses (pblock, clauses, code->loc);
+  omp_clauses = gfc_trans_omp_clauses (pblock, do_clauses, code->loc);
   if (clauses)
     {
       gfc_namelist *n;
--- libgomp/testsuite/libgomp.fortran/pr28390.f.jj	2006-07-15 15:52:33.000000000 +0200
+++ libgomp/testsuite/libgomp.fortran/pr28390.f	2006-07-15 15:52:12.000000000 +0200
@@ -0,0 +1,8 @@
+! PR fortran/28390
+      program pr28390
+      integer i
+!$omp parallel do lastprivate(i)
+      do i=1,100
+      end do
+      if (i.ne.101) call abort
+      end

gcc41-reassoc1.patch:
 0 files changed

--- NEW FILE gcc41-reassoc1.patch ---
2005-12-12  Jeff Law  <law at redhat.com>

	* tree-ssa-dom.c (simplify_rhs_and_lookup_avail_expr): Remove
	reassociation code.
	* passes.c (init_optimization_passes): Run reassociation again
	after loop optimizations.

2005-12-12  Daniel Berlin  <dberlin at dberlin.org>

	* tree-ssa-dom.c (thread_across_edge): Canonicalize condition
	if necessary.
	(optimize_stmt): Ditto.
	(canonicalize_comparison): New function.
	* tree-ssa-operands.c (swap_tree_operands): Make external.
	(get_expr_operands): Stop auto-canonicalization.
	* tree-ssa-reassoc.c: Rewrite.
	(init_optimization_passes): 
	* tree-flow.h (swap_tree_operands): Prototype.
	* Makefile.in (tree-ssa-reassoc.o): Update dependencies.

	* gcc.dg/tree-ssa/ssa-pre-2.c: Update due to reassociation changes.
	* gcc.dg/tree-ssa/reassoc-1.c: Likewise.
	* gcc.dg/tree-ssa/reassoc-2.c: Likewise.
	* gcc.dg/tree-ssa/reassoc-3.c: Likewise.
	* gcc.dg/tree-ssa/reassoc-4.c: Likewise.
	* gcc.dg/tree-ssa/reassoc-5.c: New.
	* gcc.dg/tree-ssa/reassoc-6.c: New.
	* gcc.dg/tree-ssa/reassoc-7.c: New.
	* gcc.dg/tree-ssa/reassoc-8.c: New.
	* gcc.dg/tree-ssa/reassoc-9.c: New.
	* gcc.dg/tree-ssa/reassoc-10.c: New.
	* gcc.dg/tree-ssa/reassoc-11.c: New.

--- gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c	(revision 108424)
+++ gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c	(revision 108425)
@@ -16,6 +16,7 @@ int motion_test1(int data, int data_0, i
 	return v * t * u;
 }
 /* We should eliminate one computation of data_0 + data_3 along the 
-   main path, causing one reload. */
-/* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
+   main path, and one computation of v * i along the main path, causing 
+   two eliminations. */
+/* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre"} } */
 /* { dg-final { cleanup-tree-dump "pre" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-3.c	(revision 108424)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-3.c	(revision 108425)
@@ -1,18 +1,6 @@
-/* { dg-do compile } */ 
-/* { dg-options "-O2 -fdump-tree-optimized -ffast-math" } */
-float a, b, c, d;
-extern int printf (const char *, ...);
-int main(void)
+int main(int a, int b, int c, int d)
 {
-  float e;
-  float f;
-  /* We should be able to transform these into the same expression, and only have two additions.  */
-  e = a + b;
-  e = e + c;
-  f = c + a;
-  f = f + b;
-  printf ("%f %f\n", e, f);
+  int e = (a & ~b) & (~c & d);
+  int f = (~c & a) & (b & ~d);
+ return (e & f);
 }
-
-/* { dg-final { scan-tree-dump-times "\\\+" 2 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c	(revision 108424)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c	(revision 108425)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */ 
-/* { dg-options "-O2 -fdump-tree-optimized" } */
+/* { dg-options "-O2 -fdump-tree-optimized -ffast-math" } */
 float a, b, c, d;
 extern int printf (const char *, ...);
 int main(void)
@@ -14,5 +14,5 @@ int main(void)
   printf ("%f %f\n", e, f);
 }
 
-/* { dg-final { scan-tree-dump-times "\\\+" 4 "optimized"} } */
+/* { dg-final { scan-tree-dump-times "\\\+" 2 "optimized"} } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c	(revision 108425)
@@ -0,0 +1,17 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+extern int printf (const char *, ...);
+int main(int argc, int b)
+{
+  /* We should be able to get rid of the a - i.  */
+  int i;
+  for (i = 0; i < 50; i++)
+    {
+      int a = b + i;
+      int c = a - i;
+      int d = argc + b;
+      printf ("%d %d\n", c,d);
+    }
+}
+/* { dg-final { scan-tree-dump-times "a - i" 0 "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c	(revision 108425)
@@ -0,0 +1,13 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-reassoc1" } */
+int main(int a, int b, int c, int d)
+{
+  /* Should be transformed into a + c + 8 */
+  int e = a + 3;
+  int f = c + 5;
+  int g = e + f;
+  return g;
+}
+
+/* { dg-final { scan-tree-dump-times "\\\+ 8" 1 "reassoc1"} } */
+/* { dg-final { cleanup-tree-dump "reassoc1" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c	(revision 108425)
@@ -0,0 +1,12 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-reassoc1" } */
+int main(int a, int b, int c, int d, int e, int f, int g, int h)
+{
+  /* Should be transformed into a + c + d + e + g + 15 */
+  int i = (a + 9) + (c + d);
+  int j = (e + 4) + (2 + g);
+  e = i + j;
+  return e;
+}
+/* { dg-final { scan-tree-dump-times "\\\+ 15" 1 "reassoc1"} } */
+/* { dg-final { cleanup-tree-dump "reassoc1" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c	(revision 108425)
@@ -0,0 +1,13 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-reassoc1" } */
+
+int main(int a, int b, int c, int d, int e, int f, int g, int h)
+{
+  /* e & ~e -> 0 */
+  int i = (a & 9) & (c & d);
+  int j = (~e & d) & (~c & e);
+  e = i & j;
+  return e;
+}
+/* { dg-final { scan-tree-dump-times "= 0" 1 "reassoc1"} } */
+/* { dg-final { cleanup-tree-dump "reassoc1" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c	(revision 108425)
@@ -0,0 +1,11 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-optimized" } */
+int main(int a, int b, int c, int d)
+{
+  /* Should become just a & b & c & d */
+  int e = (a & b) & (c & d);
+  int f = (c & a) & (b & d);
+  return e & f;
+}
+/* { dg-final { scan-tree-dump-times "\\\& " 3 "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c	(revision 108424)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c	(revision 108425)
@@ -14,5 +14,5 @@ int main(void)
   printf ("%d %d\n", e, f);
 }
 
-/* { dg-final { scan-tree-dump-times "a \\\+ b" 1 "optimized"} } */
+/* { dg-final { scan-tree-dump-times "b \\\+ a" 1 "optimized"} } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c	(revision 108425)
@@ -0,0 +1,14 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-reassoc1" } */
+
+int main(int a, int b, int c, int d, int e, int f, int g, int h)
+{
+  /* Should be transformed into e = 20 */
+  int i = (a + 9) + (c + 8);
+  int j = (-c + 1) + (-a + 2);
+
+  e = i + j;
+  return e;
+}
+/* { dg-final { scan-tree-dump-times "= 20" 1 "reassoc1"} } */
+/* { dg-final { cleanup-tree-dump "reassoc1" } } */
--- gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c	(revision 0)
+++ gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c	(revision 108425)
@@ -0,0 +1,11 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-reassoc1" } */
+int main(int a, int b, int c, int d)
[...2015 lines suppressed...]
+	      else
+		{
+		  rewrite_expr_tree (stmt, 0, ops);
+		}
+
+	      VEC_free (operand_entry_t, heap, ops);
+	    }
+	}
+    }
+  for (son = first_dom_son (CDI_POST_DOMINATORS, bb);
+       son;
+       son = next_dom_son (CDI_POST_DOMINATORS, son))
+    reassociate_bb (son);
+}
+
+void dump_ops_vector (FILE *file, VEC (operand_entry_t, heap) *ops);
+void debug_ops_vector (VEC (operand_entry_t, heap) *ops);
+
+/* Dump the operand entry vector OPS to FILE.  */
+
+void
+dump_ops_vector (FILE *file, VEC (operand_entry_t, heap) *ops)
+{
+  operand_entry_t oe;
+  unsigned int i;
+
+  for (i = 0; VEC_iterate (operand_entry_t, ops, i, oe); i++)
+    {
+      fprintf (file, "Op %d -> rank: %d, tree: ", i, oe->rank);
+      print_generic_stmt (file, oe->op, 0);
+    }
+}
+
+/* Dump the operand entry vector OPS to STDERR.  */
+
+void
+debug_ops_vector (VEC (operand_entry_t, heap) *ops)
+{
+  dump_ops_vector (stderr, ops);
+}
+
+static void
+do_reassoc (void)
+{
+  break_up_subtract_bb (ENTRY_BLOCK_PTR);
+  reassociate_bb (EXIT_BLOCK_PTR);
+}
+
+/* Initialize the reassociation pass.  */
+
+static void
+init_reassoc (void)
+{
+  int i;
+  unsigned int rank = 2;
+  tree param;
+  int *bbs = xmalloc ((last_basic_block + 1) * sizeof (int));
+
+  memset (&reassociate_stats, 0, sizeof (reassociate_stats));
+
+  operand_entry_pool = create_alloc_pool ("operand entry pool",
+					  sizeof (struct operand_entry), 30);
+
+  /* Reverse RPO (Reverse Post Order) will give us something where
+     deeper loops come later.  */
+  flow_depth_first_order_compute (NULL, bbs);
+  bb_rank = xcalloc (last_basic_block + 1, sizeof (unsigned int));
+  
+  operand_rank = htab_create (511, operand_entry_hash,
+			      operand_entry_eq, 0);
+
+  /* Give each argument a distinct rank.   */
+  for (param = DECL_ARGUMENTS (current_function_decl);
+       param;
+       param = TREE_CHAIN (param))
+    {
+      if (default_def (param) != NULL)
+	{
+	  tree def = default_def (param);
+	  insert_operand_rank (def, ++rank);
+	}
+    }
+
+  /* Give the chain decl a distinct rank. */
+  if (cfun->static_chain_decl != NULL)
+    {
+      tree def = default_def (cfun->static_chain_decl);
+      if (def != NULL)
+	insert_operand_rank (def, ++rank);
+    }
+
+  /* Set up rank for each BB  */
+  for (i = 0; i < n_basic_blocks; i++)
+    bb_rank[bbs[i]] = ++rank  << 16;
+
+  free (bbs);
+  calculate_dominance_info (CDI_DOMINATORS);
+  calculate_dominance_info (CDI_POST_DOMINATORS);
+  broken_up_subtracts = NULL;
+}
+
+/* Cleanup after the reassociation pass, and print stats if
+   requested.  */
+
+static void
+fini_reassoc (void)
+{
+
+  if (dump_file && (dump_flags & TDF_STATS))
+    {
+      fprintf (dump_file, "Reassociation stats:\n");
+      fprintf (dump_file, "Linearized: %d\n", 
+	       reassociate_stats.linearized);
+      fprintf (dump_file, "Constants eliminated: %d\n",
+	       reassociate_stats.constants_eliminated);
+      fprintf (dump_file, "Ops eliminated: %d\n",
+	       reassociate_stats.ops_eliminated);
+      fprintf (dump_file, "Statements rewritten: %d\n",
+	       reassociate_stats.rewritten);
+    }
+  htab_delete (operand_rank);
+
+  free_alloc_pool (operand_entry_pool);
+  free (bb_rank);
+  VEC_free (tree, heap, broken_up_subtracts);
+  free_dominance_info (CDI_POST_DOMINATORS);
+}
+
+/* Gate and execute functions for Reassociation.  */
+
+static void
+execute_reassoc (void)
+{
+  init_reassoc ();
+
+  do_reassoc ();
+  repropagate_negates ();
+
   fini_reassoc ();
 }
 
@@ -635,7 +1514,6 @@ struct tree_opt_pass pass_reassoc =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_update_ssa | TODO_dump_func 
-  | TODO_ggc_collect | TODO_verify_ssa, /* todo_flags_finish */
+  TODO_dump_func | TODO_ggc_collect | TODO_verify_ssa, /* todo_flags_finish */
   0					/* letter */
 };
--- gcc/tree-ssa-operands.c	(revision 108424)
+++ gcc/tree-ssa-operands.c	(revision 108425)
@@ -1047,7 +1047,6 @@ swap_tree_operands (tree stmt, tree *exp
   *exp1 = op0;
 }
 
-
 /* Recursively scan the expression pointed to by EXPR_P in statement referred
    to by INFO.  FLAGS is one of the OPF_* constants modifying how to interpret
    the operands found.  */
@@ -1260,39 +1259,6 @@ get_expr_operands (tree stmt, tree *expr
     case ASSERT_EXPR:
     do_binary:
       {
-	tree op0 = TREE_OPERAND (expr, 0);
-	tree op1 = TREE_OPERAND (expr, 1);
-
-	/* If it would be profitable to swap the operands, then do so to
-	   canonicalize the statement, enabling better optimization.
-
-	   By placing canonicalization of such expressions here we
-	   transparently keep statements in canonical form, even
-	   when the statement is modified.  */
-	if (tree_swap_operands_p (op0, op1, false))
-	  {
-	    /* For relationals we need to swap the operands
-	       and change the code.  */
-	    if (code == LT_EXPR
-		|| code == GT_EXPR
-		|| code == LE_EXPR
-		|| code == GE_EXPR)
-	      {
-		TREE_SET_CODE (expr, swap_tree_comparison (code));
-		swap_tree_operands (stmt,
-				    &TREE_OPERAND (expr, 0),			
-				    &TREE_OPERAND (expr, 1));
-	      }
-	  
-	    /* For a commutative operator we can just swap the operands.  */
-	    else if (commutative_tree_code (code))
-	      {
-		swap_tree_operands (stmt,
-				    &TREE_OPERAND (expr, 0),			
-				    &TREE_OPERAND (expr, 1));
-	      }
-	  }
-
 	get_expr_operands (stmt, &TREE_OPERAND (expr, 0), flags);
 	get_expr_operands (stmt, &TREE_OPERAND (expr, 1), flags);
 	return;

gcc41-reassoc2.patch:
 0 files changed

--- NEW FILE gcc41-reassoc2.patch ---
2005-12-19  Roger Sayle  <roger at eyesopen.com>

	* combine.c (try_combine): Improve splitting of binary operators
	by taking advantage of reassociative transformations.

--- gcc/combine.c	(revision 108833)
+++ gcc/combine.c	(revision 108834)
@@ -2527,6 +2527,8 @@ try_combine (rtx i3, rtx i2, rtx i1, int
 	  rtx newdest = i2dest;
 	  enum rtx_code split_code = GET_CODE (*split);
 	  enum machine_mode split_mode = GET_MODE (*split);
+	  bool subst_done = false;
+	  newi2pat = NULL_RTX;
 
 	  /* Get NEWDEST as a register in the proper mode.  We have already
 	     validated that we can do this.  */
@@ -2572,8 +2574,69 @@ try_combine (rtx i3, rtx i2, rtx i1, int
 	    }
 #endif
 
-	  newi2pat = gen_rtx_SET (VOIDmode, newdest, *split);
-	  SUBST (*split, newdest);
+	  /* Attempt to split binary operators using arithmetic identities.  */
+	  if (BINARY_P (SET_SRC (newpat))
+	      && split_mode == GET_MODE (SET_SRC (newpat))
+	      && ! side_effects_p (SET_SRC (newpat)))
+	    {
+	      rtx setsrc = SET_SRC (newpat);
+	      enum machine_mode mode = GET_MODE (setsrc);
+	      enum rtx_code code = GET_CODE (setsrc);
+	      rtx src_op0 = XEXP (setsrc, 0);
+	      rtx src_op1 = XEXP (setsrc, 1);
+
+	      /* Split "X = Y op Y" as "Z = Y; X = Z op Z".  */
+	      if (rtx_equal_p (src_op0, src_op1))
+		{
+		  newi2pat = gen_rtx_SET (VOIDmode, newdest, src_op0);
+		  SUBST (XEXP (setsrc, 0), newdest);
+		  SUBST (XEXP (setsrc, 1), newdest);
+		  subst_done = true;
+		}
+	      /* Split "((P op Q) op R) op S" where op is PLUS or MULT.  */
+	      else if ((code == PLUS || code == MULT)
+		       && GET_CODE (src_op0) == code
+		       && GET_CODE (XEXP (src_op0, 0)) == code
+		       && (INTEGRAL_MODE_P (mode)
+			   || (FLOAT_MODE_P (mode)
+			       && flag_unsafe_math_optimizations)))
+		{
+		  rtx p = XEXP (XEXP (src_op0, 0), 0);
+		  rtx q = XEXP (XEXP (src_op0, 0), 1);
+		  rtx r = XEXP (src_op0, 1);
+		  rtx s = src_op1;
+
+		  /* Split both "((X op Y) op X) op Y" and
+		     "((X op Y) op Y) op X" as "T op T" where T is
+		     "X op Y".  */
+		  if ((rtx_equal_p (p,r) && rtx_equal_p (q,s))
+		       || (rtx_equal_p (p,s) && rtx_equal_p (q,r)))
+		    {
+		      newi2pat = gen_rtx_SET (VOIDmode, newdest,
+					      XEXP (src_op0, 0));
+		      SUBST (XEXP (setsrc, 0), newdest);
+		      SUBST (XEXP (setsrc, 1), newdest);
+		      subst_done = true;
+		    }
+		  /* Split "((X op X) op Y) op Y)" as "T op T" where
+		     T is "X op Y".  */
+		  else if (rtx_equal_p (p,q) && rtx_equal_p (r,s))
+		    {
+		      rtx tmp = simplify_gen_binary (code, mode, p, r);
+		      newi2pat = gen_rtx_SET (VOIDmode, newdest, tmp);
+		      SUBST (XEXP (setsrc, 0), newdest);
+		      SUBST (XEXP (setsrc, 1), newdest);
+		      subst_done = true;
+		    }
+		}
+	    }
+
+	  if (!subst_done)
+	    {
+	      newi2pat = gen_rtx_SET (VOIDmode, newdest, *split);
+	      SUBST (*split, newdest);
+	    }
+
 	  i2_code_number = recog_for_combine (&newi2pat, i2, &new_i2_notes);
 
 	  /* recog_for_combine might have added CLOBBERs to newi2pat.

gcc41-reassoc3.patch:
 0 files changed

--- NEW FILE gcc41-reassoc3.patch ---
2005-01-04  Jeff Law  <law at redhat.com>

	PR ada/24994
	* tree-cfg.c (bsi_replace): Remove the original statement
	from the EH throw statement table.

--- gcc/tree-cfg.c	(revision 109334)
+++ gcc/tree-cfg.c	(revision 109335)
@@ -2869,7 +2869,10 @@ bsi_replace (const block_stmt_iterator *
     {
       eh_region = lookup_stmt_eh_region (orig_stmt);
       if (eh_region >= 0)
-	add_stmt_to_eh_region (stmt, eh_region);
+	{
+	  remove_stmt_from_eh_region (stmt);
+	  add_stmt_to_eh_region (stmt, eh_region);
+	}
     }
 
   delink_stmt_imm_use (orig_stmt);

gcc41-reassoc4.patch:
 omp-low.c |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE gcc41-reassoc4.patch ---
2006-07-12  Peter Bergner  <bergner at vnet.ibm.com>

	* omp-low.c (expand_omp_parallel): Add new argument to
	bsi_remove call.
	(expand_omp_for_generic): Likewise.
	(expand_omp_for_static_nochunk): Likewise.
	(expand_omp_for_static_chunk): Likewise.
	(expand_omp_sections): Likewise.
	(expand_omp_single): Likewise.
	(expand_omp_synch): Likewise.

2005-01-06  Jeff Law  <law at redhat.com>

	PR ada/24994
	* tree-cfg.c (bsi_replace): Rename final argument from
	PRESERVE_EH_INFO to UPDATE_EH_INFO.  Fix typo in last
	change (stmt -> orig_stmt).
	* tree-eh.c (verify_eh_throw_stmt_node): New function.
	(bsi_remove): Add new argument.  Remove EH information
	if requested.
	(verify_eh_throw_table_statements): New function.
	(bsi_remove): Add new argument REMOVE_EH_INFO.  All callers
	updated.
	* tree-optimize.c (execute_free_cfg_annotations): Verify
	the EH throw statement table after removing annotations.
	* except.h (verify_eh_throw_table_statements): Prototype.
	* tree-flow.h (bsi_remove): Update prototype.
	* tree-vrp.c (remove_range_assertions): Add new argument to
	bsi_remove call.
	* tree-ssa-loop-im.c (move_computations_stmt): Likewise.
	* tree-complex.c (expand_complex_div_wide): Likewise.
	* tree-ssa-threadupdate.c (remove_ctrl_stmt_and_useless_edges): Likewise
	* tree-tailcall.c (eliminate_tailcall): Likewise.
	* tree-ssa-dse.c (dse_optimize_stmt): Likewise.
	* tree-ssa-loop-ivopts.c (remove_statement): Likewise.
	* tree-nrv.c (tree_nrv): Likewise.
	* tree-vectorizer.c (slpeel_make_loop_iterate_ntimes): Likewise.
	* tree-if-conv.c (tree_if_convert_cond_expr): Likewise.
	(combine_blocks): Likewise.
	* tree-ssa-phiopt.c (replace_phi_edge_with_variable): Likewise.
	* tree-cfgcleanup.c (cleanup_ctrl_expr_graph): Likewise.
	(cleanup_control_flow): Likewise.
	(remove_forwarder_block): Likewise.
	* tree-ssa-pre.c (remove_dead_inserted_code): Likewise.
	* tree-sra.c (sra_replace): Likewise.
	* tree-ssa-forwprop.c (forward_propagate_into_cond): Likewise.
	(forward_propagate_single_use_vars): Likewise.
	* tree-ssa-dce.c (remove_dead_stmt): Likewise.
	* tree-inline.c (expand_call_inline): Likewise.
	* tree-vect-transform.c (vect_transform_loop): Likewise.
	* tree-outof-ssa.c (rewrite_trees): Likewise.
	* tree-cfg.c (make_goto_expr_edges): Likewise.
	(cleanup_dead_labels): Likewise.
	(tree_merge_blocks, remove_bb, disband_implicit_edges): Likewise.
	(bsi_move_before, bsi_move_after): Likewise.
	(bsi_move_to_bb_end, try_redirect_by_replacing_jump): Likewise
	(tree_redirect_edge_and_branch, tree_split_block): Likewise.

--- gcc/tree-vrp.c	(revision 109420)
+++ gcc/tree-vrp.c	(revision 109421)
@@ -3026,7 +3026,7 @@ remove_range_assertions (void)
 	      }
 
 	    /* And finally, remove the copy, it is not needed.  */
-	    bsi_remove (&si);
+	    bsi_remove (&si, true);
 	  }
 	else
 	  bsi_next (&si);
--- gcc/tree-ssa-loop-im.c	(revision 109420)
+++ gcc/tree-ssa-loop-im.c	(revision 109421)
@@ -759,7 +759,7 @@ move_computations_stmt (struct dom_walk_
 		   cost, level->num);
 	}
       bsi_insert_on_edge (loop_preheader_edge (level), stmt);
-      bsi_remove (&bsi);
+      bsi_remove (&bsi, false);
     }
 }
 
--- gcc/tree-complex.c	(revision 109420)
+++ gcc/tree-complex.c	(revision 109421)
@@ -1124,7 +1124,7 @@ expand_complex_div_wide (block_stmt_iter
 	 bsi_insert_before (bsi, t1, BSI_SAME_STMT);
 	 t1 = build2 (MODIFY_EXPR, inner_type, ri, ti);
 	 bsi_insert_before (bsi, t1, BSI_SAME_STMT);
-	 bsi_remove (bsi);
+	 bsi_remove (bsi, true);
        }
     }
 
@@ -1163,7 +1163,7 @@ expand_complex_div_wide (block_stmt_iter
 	 bsi_insert_before (bsi, t1, BSI_SAME_STMT);
 	 t1 = build2 (MODIFY_EXPR, inner_type, ri, ti);
 	 bsi_insert_before (bsi, t1, BSI_SAME_STMT);
-	 bsi_remove (bsi);
+	 bsi_remove (bsi, true);
        }
     }
 
--- gcc/tree-ssa-threadupdate.c	(revision 109420)
+++ gcc/tree-ssa-threadupdate.c	(revision 109421)
@@ -180,7 +180,7 @@ remove_ctrl_stmt_and_useless_edges (basi
       && (TREE_CODE (bsi_stmt (bsi)) == COND_EXPR
 	  || TREE_CODE (bsi_stmt (bsi)) == GOTO_EXPR
 	  || TREE_CODE (bsi_stmt (bsi)) == SWITCH_EXPR))
-    bsi_remove (&bsi);
+    bsi_remove (&bsi, true);
 
   for (ei = ei_start (bb->succs); (e = ei_safe_edge (ei)); )
     {
--- gcc/tree-tailcall.c	(revision 109420)
+++ gcc/tree-tailcall.c	(revision 109421)
@@ -735,7 +735,7 @@ eliminate_tail_call (struct tailcall *t)
       if (TREE_CODE (t) == RETURN_EXPR)
 	break;
 
-      bsi_remove (&bsi);
+      bsi_remove (&bsi, true);
       release_defs (t);
     }
 
@@ -825,7 +825,7 @@ eliminate_tail_call (struct tailcall *t)
       SSA_NAME_DEF_STMT (rslt) = build_empty_stmt ();
     }
 
-  bsi_remove (&t->call_bsi);
+  bsi_remove (&t->call_bsi, true);
   release_defs (call);
 }
 
--- gcc/tree-ssa-dse.c	(revision 109420)
+++ gcc/tree-ssa-dse.c	(revision 109421)
@@ -351,7 +351,7 @@ dse_optimize_stmt (struct dom_walk_data 
 	      SET_USE (use_p, USE_FROM_PTR (var2));
 	    }
 	  /* Remove the dead store.  */
-	  bsi_remove (&bsi);
+	  bsi_remove (&bsi, true);
 
 	  /* And release any SSA_NAMEs set in this statement back to the
 	     SSA_NAME manager.  */
--- gcc/tree-ssa-loop-ivopts.c	(revision 109420)
+++ gcc/tree-ssa-loop-ivopts.c	(revision 109421)
@@ -5326,7 +5326,7 @@ remove_statement (tree stmt, bool includ
     {
       block_stmt_iterator bsi = bsi_for_stmt (stmt);
 
-      bsi_remove (&bsi);
+      bsi_remove (&bsi, true);
     }
 }
 
--- gcc/tree-nrv.c	(revision 109420)
+++ gcc/tree-nrv.c	(revision 109421)
@@ -200,7 +200,7 @@ tree_nrv (void)
 	  if (TREE_CODE (*tp) == MODIFY_EXPR
 	      && TREE_OPERAND (*tp, 0) == result
 	      && TREE_OPERAND (*tp, 1) == found)
-	    bsi_remove (&bsi);
+	    bsi_remove (&bsi, true);
 	  else
 	    {
 	      walk_tree (tp, finalize_nrv_r, &data, 0);
--- gcc/tree-eh.c	(revision 109420)
+++ gcc/tree-eh.c	(revision 109421)
@@ -2075,3 +2075,25 @@ maybe_clean_or_replace_eh_stmt (tree old
 
   return false;
 }
+
+#ifdef ENABLE_CHECKING
+static int
+verify_eh_throw_stmt_node (void **slot, void *data ATTRIBUTE_UNUSED)
+{
+  struct throw_stmt_node *node = (struct throw_stmt_node *)*slot;
+
+  gcc_assert (node->stmt->common.ann == NULL);
+  return 1;
+}
+
+void
+verify_eh_throw_table_statements (void)
+{
+  if (!get_eh_throw_stmt_table (cfun))
+    return;
+  htab_traverse (get_eh_throw_stmt_table (cfun),
+		 verify_eh_throw_stmt_node,
+		 NULL);
+}
+
+#endif
--- gcc/tree-vectorizer.c	(revision 109420)
+++ gcc/tree-vectorizer.c	(revision 109421)
@@ -805,7 +805,7 @@ slpeel_make_loop_iterate_ntimes (struct 
   bsi_insert_before (&loop_cond_bsi, cond_stmt, BSI_SAME_STMT);
 
   /* Remove old loop exit test:  */
-  bsi_remove (&loop_cond_bsi);
+  bsi_remove (&loop_cond_bsi, true);
 
   loop_loc = find_loop_location (loop);
   if (dump_file && (dump_flags & TDF_DETAILS))
--- gcc/tree-if-conv.c	(revision 109420)
+++ gcc/tree-if-conv.c	(revision 109421)
@@ -287,7 +287,7 @@ tree_if_convert_cond_expr (struct loop *
      using new condition.  */
   if (!bb_with_exit_edge_p (loop, bb_for_stmt (stmt)))
     {
-      bsi_remove (bsi);
+      bsi_remove (bsi, true);
       cond = NULL_TREE;
     }
   return;
@@ -934,7 +934,7 @@ combine_blocks (struct loop *loop)
       for (bsi = bsi_start (bb); !bsi_end_p (bsi); )
 	{
 	  if (TREE_CODE (bsi_stmt (bsi)) == LABEL_EXPR)
-	    bsi_remove (&bsi);
+	    bsi_remove (&bsi, true);
 	  else
 	    {
 	      set_bb_for_stmt (bsi_stmt (bsi), merge_target_bb);
--- gcc/tree-ssa-phiopt.c	(revision 109420)
+++ gcc/tree-ssa-phiopt.c	(revision 109421)
@@ -351,7 +351,7 @@ replace_phi_edge_with_variable (basic_bl
 
   /* Eliminate the COND_EXPR at the end of COND_BLOCK.  */
   bsi = bsi_last (cond_block);
-  bsi_remove (&bsi);
+  bsi_remove (&bsi, true);
 
   if (dump_file && (dump_flags & TDF_DETAILS))
     fprintf (dump_file,
--- gcc/except.h	(revision 109420)
+++ gcc/except.h	(revision 109421)
@@ -173,3 +173,7 @@ struct throw_stmt_node GTY(())
 
 extern struct htab *get_eh_throw_stmt_table (struct function *);
 extern void set_eh_throw_stmt_table (struct function *, struct htab *);
+
+#ifdef ENABLE_CHECKING
+extern void verify_eh_throw_table_statements (void);
+#endif
--- gcc/tree-cfgcleanup.c	(revision 109420)
+++ gcc/tree-cfgcleanup.c	(revision 109421)
@@ -117,7 +117,7 @@ cleanup_control_expr_graph (basic_block 
   else
     taken_edge = single_succ_edge (bb);
 
-  bsi_remove (&bsi);
+  bsi_remove (&bsi, true);
   taken_edge->flags = EDGE_FALLTHRU;
 
   /* We removed some paths from the cfg.  */
@@ -207,7 +207,7 @@ cleanup_control_flow (void)
 
 	  /* Remove the GOTO_EXPR as it is not needed.  The CFG has all the
 	     relevant information we need.  */
-	  bsi_remove (&bsi);
+	  bsi_remove (&bsi, true);
 	  retval = true;
 	}
 
@@ -433,7 +433,7 @@ remove_forwarder_block (basic_block bb, 
 	{
 	  label = bsi_stmt (bsi);
 	  gcc_assert (TREE_CODE (label) == LABEL_EXPR);
-	  bsi_remove (&bsi);
+	  bsi_remove (&bsi, false);
 	  bsi_insert_before (&bsi_to, label, BSI_CONTINUE_LINKING);
 	}
     }
--- gcc/tree-ssa-pre.c	(revision 109420)
+++ gcc/tree-ssa-pre.c	(revision 109421)
@@ -2549,7 +2549,7 @@ remove_dead_inserted_code (void)
 	  else
 	    {
 	      bsi = bsi_for_stmt (t);
-	      bsi_remove (&bsi);
+	      bsi_remove (&bsi, true);
 	    }
 	}
     }
@@ -2899,7 +2899,7 @@ do_eustores (void)
 		  print_generic_stmt (dump_file, stmt, 0);
 		}
 	      mark_sym_for_renaming (TREE_OPERAND (stmt, 0));
-	      bsi_remove (&bsi);
+	      bsi_remove (&bsi, true);
 	    }
 	  else
 	    {
--- gcc/tree-sra.c	(revision 109420)
+++ gcc/tree-sra.c	(revision 109421)
@@ -1825,7 +1825,7 @@ static void
 sra_replace (block_stmt_iterator *bsi, tree list)
 {
   sra_insert_before (bsi, list);
-  bsi_remove (bsi);
+  bsi_remove (bsi, false);
   if (bsi_end_p (*bsi))
     *bsi = bsi_last (bsi->bb);
   else
--- gcc/tree-ssa-forwprop.c	(revision 109420)
+++ gcc/tree-ssa-forwprop.c	(revision 109421)
@@ -433,7 +433,7 @@ forward_propagate_into_cond (tree cond_e
 	{
 	  tree def = SSA_NAME_DEF_STMT (test_var);
 	  block_stmt_iterator bsi = bsi_for_stmt (def);
-	  bsi_remove (&bsi);
+	  bsi_remove (&bsi, true);
 	}
     }
 }
@@ -705,7 +705,7 @@ tree_ssa_forward_propagate_single_use_va
 	      && TREE_CODE (TREE_OPERAND (stmt, 0)) == SSA_NAME)
 	    {
 	      if (forward_propagate_addr_expr (stmt))
-		bsi_remove (&bsi);
+		bsi_remove (&bsi, true);
 	      else
 		bsi_next (&bsi);
 	    }
--- gcc/tree-ssa-dce.c	(revision 109420)
+++ gcc/tree-ssa-dce.c	(revision 109421)
@@ -799,7 +799,7 @@ remove_dead_stmt (block_stmt_iterator *i
       tree def = DEF_FROM_PTR (def_p);
       mark_sym_for_renaming (SSA_NAME_VAR (def));
     }
-  bsi_remove (i);  
+  bsi_remove (i, true);  
   release_defs (t); 
 }
 
--- gcc/tree-inline.c	(revision 109420)
+++ gcc/tree-inline.c	(revision 109421)
@@ -2067,7 +2067,7 @@ expand_call_inline (basic_block bb, tree
   else
     {
       tree stmt = bsi_stmt (stmt_bsi);
-      bsi_remove (&stmt_bsi);
+      bsi_remove (&stmt_bsi, false);
       bsi_insert_after (&bsi, stmt, BSI_NEW_STMT);
     }
   stmt_bsi = bsi_start (return_block);
@@ -2182,7 +2182,7 @@ expand_call_inline (basic_block bb, tree
   else
     /* We're modifying a TSI owned by gimple_expand_calls_inline();
        tsi_delink() will leave the iterator in a sane state.  */
-    bsi_remove (&stmt_bsi);
+    bsi_remove (&stmt_bsi, true);
 
   bsi_next (&bsi);
   if (bsi_end_p (bsi))
--- gcc/tree-optimize.c	(revision 109420)
+++ gcc/tree-optimize.c	(revision 109421)
@@ -209,6 +209,12 @@ execute_free_cfg_annotations (void)
 
   /* And get rid of annotations we no longer need.  */
   delete_tree_cfg_annotations ();
+
+#ifdef ENABLE_CHECKING
+  /* Once the statement annotations have been removed, we can verify
+     the integrity of statements in the EH throw table.  */
+  verify_eh_throw_table_statements ();
+#endif
 }
 
 struct tree_opt_pass pass_free_cfg_annotations =
--- gcc/tree-vect-transform.c	(revision 109420)
+++ gcc/tree-vect-transform.c	(revision 109421)
@@ -2944,7 +2944,7 @@ vect_transform_loop (loop_vec_info loop_
 	      stmt_ann_t ann = stmt_ann (stmt);
 	      free (stmt_info);
 	      set_stmt_info ((tree_ann_t)ann, NULL);
-	      bsi_remove (&si);
+	      bsi_remove (&si, true);
 	      continue;
 	    }
 
--- gcc/tree-outof-ssa.c	(revision 109420)
+++ gcc/tree-outof-ssa.c	(revision 109421)
@@ -1940,7 +1940,7 @@ rewrite_trees (var_map map, tree *values
 
 	  /* Remove any stmts marked for removal.  */
 	  if (remove)
-	    bsi_remove (&si);
+	    bsi_remove (&si, true);
 	  else
 	    bsi_next (&si);
 	}
--- gcc/tree-flow.h	(revision 109420)
+++ gcc/tree-flow.h	(revision 109421)
@@ -449,7 +449,7 @@ static inline void bsi_prev (block_stmt_
 static inline tree bsi_stmt (block_stmt_iterator);
 static inline tree * bsi_stmt_ptr (block_stmt_iterator);
 
-extern void bsi_remove (block_stmt_iterator *);
+extern void bsi_remove (block_stmt_iterator *, bool);
 extern void bsi_move_before (block_stmt_iterator *, block_stmt_iterator *);
 extern void bsi_move_after (block_stmt_iterator *, block_stmt_iterator *);
 extern void bsi_move_to_bb_end (block_stmt_iterator *, basic_block);
--- gcc/tree-cfg.c	(revision 109420)
+++ gcc/tree-cfg.c	(revision 109421)
@@ -843,7 +843,7 @@ make_goto_expr_edges (basic_block bb)
 #else
 	  e->goto_locus = EXPR_LOCUS (goto_t);
 #endif
-	  bsi_remove (&last);
+	  bsi_remove (&last, true);
 	  return;
 	}
 
@@ -1064,7 +1064,7 @@ cleanup_dead_labels (void)
 	      || DECL_NONLOCAL (label))
 	    bsi_next (&i);
 	  else
-	    bsi_remove (&i);
+	    bsi_remove (&i, true);
 	}
     }
 
@@ -1362,7 +1362,7 @@ tree_merge_blocks (basic_block a, basic_
 	{
 	  tree label = bsi_stmt (bsi);
 
-	  bsi_remove (&bsi);
+	  bsi_remove (&bsi, false);
 	  /* Now that we can thread computed gotos, we might have
 	     a situation where we have a forced label in block B
 	     However, the label at the start of block B might still be
@@ -2024,7 +2024,7 @@ remove_bb (basic_block bb)
 	  	  
 	  new_bb = bb->prev_bb;
 	  new_bsi = bsi_start (new_bb);
-	  bsi_remove (&i);
+	  bsi_remove (&i, false);
 	  bsi_insert_before (&new_bsi, stmt, BSI_NEW_STMT);
 	}
       else
@@ -2036,7 +2036,7 @@ remove_bb (basic_block bb)
 	  if (in_ssa_p)
 	    release_defs (stmt);
 
-	  bsi_remove (&i);
+	  bsi_remove (&i, true);
 	}
 
       /* Don't warn for removed gotos.  Gotos are often removed due to
@@ -2584,7 +2584,7 @@ disband_implicit_edges (void)
 	  if (bb->next_bb == EXIT_BLOCK_PTR
 	      && !TREE_OPERAND (stmt, 0))
 	    {
-	      bsi_remove (&last);
+	      bsi_remove (&last, true);
 	      single_succ_edge (bb)->flags |= EDGE_FALLTHRU;
 	    }
 	  continue;
@@ -2800,16 +2800,25 @@ bsi_insert_after (block_stmt_iterator *i
 
 
 /* Remove the statement pointed to by iterator I.  The iterator is updated
-   to the next statement.  */
+   to the next statement. 
+
+   When REMOVE_EH_INFO is true we remove the statement pointed to by
+   iterator I from the EH tables.  Otherwise we do not modify the EH
+   tables.
+
+   Generally, REMOVE_EH_INFO should be true when the statement is going to
+   be removed from the IL and not reinserted elsewhere.  */
 
 void
-bsi_remove (block_stmt_iterator *i)
+bsi_remove (block_stmt_iterator *i, bool remove_eh_info)
 {
   tree t = bsi_stmt (*i);
   set_bb_for_stmt (t, NULL);
   delink_stmt_imm_use (t);
   tsi_delink (&i->tsi);
   mark_stmt_modified (t);
+  if (remove_eh_info)
+    remove_stmt_from_eh_region (t);
 }
 
 
@@ -2819,7 +2828,7 @@ void 
 bsi_move_after (block_stmt_iterator *from, block_stmt_iterator *to)
 {
   tree stmt = bsi_stmt (*from);
-  bsi_remove (from);
+  bsi_remove (from, false);
   bsi_insert_after (to, stmt, BSI_SAME_STMT);
 } 
 
@@ -2830,7 +2839,7 @@ void 
 bsi_move_before (block_stmt_iterator *from, block_stmt_iterator *to)
 {
   tree stmt = bsi_stmt (*from);
-  bsi_remove (from);
+  bsi_remove (from, false);
   bsi_insert_before (to, stmt, BSI_SAME_STMT);
 }
 
@@ -2851,11 +2860,12 @@ bsi_move_to_bb_end (block_stmt_iterator 
 
 
 /* Replace the contents of the statement pointed to by iterator BSI
-   with STMT.  If PRESERVE_EH_INFO is true, the exception handling
-   information of the original statement is preserved.  */
+   with STMT.  If UPDATE_EH_INFO is true, the exception handling
+   information of the original statement is moved to the new statement.  */
+  
 
 void
-bsi_replace (const block_stmt_iterator *bsi, tree stmt, bool preserve_eh_info)
+bsi_replace (const block_stmt_iterator *bsi, tree stmt, bool update_eh_info)
 {
   int eh_region;
   tree orig_stmt = bsi_stmt (*bsi);
@@ -2865,12 +2875,12 @@ bsi_replace (const block_stmt_iterator *
 
   /* Preserve EH region information from the original statement, if
      requested by the caller.  */
-  if (preserve_eh_info)
+  if (update_eh_info)
     {
       eh_region = lookup_stmt_eh_region (orig_stmt);
       if (eh_region >= 0)
 	{
-	  remove_stmt_from_eh_region (stmt);
+	  remove_stmt_from_eh_region (orig_stmt);
 	  add_stmt_to_eh_region (stmt, eh_region);
 	}
     }
@@ -3969,7 +3979,7 @@ tree_try_redirect_by_replacing_jump (edg
   if (TREE_CODE (stmt) == COND_EXPR
       || TREE_CODE (stmt) == SWITCH_EXPR)
     {
-      bsi_remove (&b);
+      bsi_remove (&b, true);
       e = ssa_redirect_edge (e, target);
       e->flags = EDGE_FALLTHRU;
       return e;
@@ -4066,7 +4076,7 @@ tree_redirect_edge_and_branch (edge e, b
       }
 
     case RETURN_EXPR:
-      bsi_remove (&bsi);
+      bsi_remove (&bsi, true);
       e->flags |= EDGE_FALLTHRU;
       break;
 
@@ -4142,7 +4152,7 @@ tree_split_block (basic_block bb, void *
   while (!bsi_end_p (bsi))
     {
       act = bsi_stmt (bsi);
-      bsi_remove (&bsi);
+      bsi_remove (&bsi, false);
       bsi_insert_after (&bsi_tgt, act, BSI_NEW_STMT);
     }
 
--- gcc/omp-low.c	2006-07-15 21:46:28.000000000 +0200
+++ gcc/omp-low.c	2006-07-15 22:29:22.000000000 +0200
@@ -2447,7 +2447,7 @@ expand_omp_parallel (struct omp_region *
 
       si = bsi_last (entry_bb);
       gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_PARALLEL);
-      bsi_remove (&si);
+      bsi_remove (&si, true);
 
       new_bb = entry_bb;
       remove_edge (entry_succ_e);
@@ -2485,7 +2485,7 @@ expand_omp_parallel (struct omp_region *
 		     == OMP_PARALLEL_DATA_ARG (entry_stmt))
 		{
 		  if (TREE_OPERAND (stmt, 0) == DECL_ARGUMENTS (child_fn))
-		    bsi_remove (&si);
+		    bsi_remove (&si, true);
 		  else
 		    TREE_OPERAND (stmt, 1) = DECL_ARGUMENTS (child_fn);
 		  break;
@@ -2510,7 +2510,7 @@ expand_omp_parallel (struct omp_region *
       si = bsi_last (entry_bb);
       t = bsi_stmt (si);
       gcc_assert (t && TREE_CODE (t) == OMP_PARALLEL);
-      bsi_remove (&si);
+      bsi_remove (&si, true);
       e = split_block (entry_bb, t);
       entry_bb = e->dest;
       single_succ_edge (entry_bb)->flags = EDGE_FALLTHRU;
@@ -2532,7 +2532,7 @@ expand_omp_parallel (struct omp_region *
 		      && TREE_CODE (bsi_stmt (si)) == OMP_RETURN);
 	  t = build1 (RETURN_EXPR, void_type_node, NULL);
 	  bsi_insert_after (&si, t, TSI_SAME_STMT);
-	  bsi_remove (&si);
+	  bsi_remove (&si, true);
 	}
     }
 
@@ -2627,7 +2627,7 @@ expand_omp_for_generic (struct omp_regio
       append_to_statement_list (t, &list);
       bsi_insert_after (&si, list, BSI_SAME_STMT);
     }
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Iteration setup for sequential loop goes in L0_BB.  */
   list = alloc_stmt_list ();
@@ -2661,7 +2661,7 @@ expand_omp_for_generic (struct omp_regio
   si = bsi_last (cont_bb);
   bsi_insert_after (&si, list, BSI_SAME_STMT);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_CONTINUE);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Emit code to get the next parallel iteration in L2_BB.  */
   list = alloc_stmt_list ();
@@ -2687,7 +2687,7 @@ expand_omp_for_generic (struct omp_regio
     t = built_in_decls[BUILT_IN_GOMP_LOOP_END];
   t = build_function_call_expr (t, NULL);
   bsi_insert_after (&si, t, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Connect the new blocks.  */
   remove_edge (single_succ_edge (entry_bb));
@@ -2821,7 +2821,7 @@ expand_omp_for_static_nochunk (struct om
   si = bsi_last (entry_bb);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_FOR);
   bsi_insert_after (&si, list, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Setup code for sequential iteration goes in SEQ_START_BB.  */
   list = alloc_stmt_list ();
@@ -2856,7 +2856,7 @@ expand_omp_for_static_nochunk (struct om
   si = bsi_last (cont_bb);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_CONTINUE);
   bsi_insert_after (&si, list, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Replace the OMP_RETURN with a barrier, or nothing.  */
   si = bsi_last (exit_bb);
@@ -2866,7 +2866,7 @@ expand_omp_for_static_nochunk (struct om
       build_omp_barrier (&list);
       bsi_insert_after (&si, list, BSI_SAME_STMT);
     }
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Connect all the blocks.  */
   make_edge (seq_start_bb, body_bb, EDGE_FALLTHRU);
@@ -2986,7 +2986,7 @@ expand_omp_for_static_chunk (struct omp_
   si = bsi_last (entry_bb);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_FOR);
   bsi_insert_after (&si, list, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Iteration space partitioning goes in ITER_PART_BB.  */
   list = alloc_stmt_list ();
@@ -3042,7 +3042,7 @@ expand_omp_for_static_chunk (struct omp_
   si = bsi_last (cont_bb);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_CONTINUE);
   bsi_insert_after (&si, list, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Trip update code goes into TRIP_UPDATE_BB.  */
   list = alloc_stmt_list ();
@@ -3063,7 +3063,7 @@ expand_omp_for_static_chunk (struct omp_
       build_omp_barrier (&list);
       bsi_insert_after (&si, list, BSI_SAME_STMT);
     }
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Connect the new blocks.  */
   remove_edge (single_succ_edge (entry_bb));
@@ -3185,7 +3185,7 @@ expand_omp_sections (struct omp_region *
       t = build2 (MODIFY_EXPR, void_type_node, v, t);
       bsi_insert_after (&si, t, BSI_SAME_STMT);
     }
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* The switch() statement replacing OMP_SECTIONS goes in L0_BB.  */
   si = bsi_start (l0_bb);
@@ -3214,11 +3214,11 @@ expand_omp_sections (struct omp_region *
       si = bsi_last (s_entry_bb);
       gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_SECTION);
       gcc_assert (i < len || OMP_SECTION_LAST (bsi_stmt (si)));
-      bsi_remove (&si);
+      bsi_remove (&si, true);
 
       si = bsi_last (s_exit_bb);
       gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_RETURN);
-      bsi_remove (&si);
+      bsi_remove (&si, true);
 
       e = single_pred_edge (s_entry_bb);
       e->flags = 0;
@@ -3247,7 +3247,7 @@ expand_omp_sections (struct omp_region *
   t = build_function_call_expr (t, NULL);
   t = build2 (MODIFY_EXPR, void_type_node, v, t);
   bsi_insert_after (&si, t, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Cleanup function replaces OMP_RETURN in EXIT_BB.  */
   si = bsi_last (exit_bb);
@@ -3257,7 +3257,7 @@ expand_omp_sections (struct omp_region *
     t = built_in_decls[BUILT_IN_GOMP_SECTIONS_END];
   t = build_function_call_expr (t, NULL);
   bsi_insert_after (&si, t, BSI_SAME_STMT);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
 
   /* Connect the new blocks.  */
   if (is_combined_parallel (region))
@@ -3297,7 +3297,7 @@ expand_omp_single (struct omp_region *re
 		       OMP_CLAUSE_COPYPRIVATE))
     need_barrier = true;
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_SINGLE);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
   single_succ_edge (entry_bb)->flags = EDGE_FALLTHRU;
 
   si = bsi_last (exit_bb);
@@ -3307,7 +3307,7 @@ expand_omp_single (struct omp_region *re
       build_omp_barrier (&t);
       bsi_insert_after (&si, t, BSI_SAME_STMT);
     }
-  bsi_remove (&si);
+  bsi_remove (&si, true);
   single_succ_edge (exit_bb)->flags = EDGE_FALLTHRU;
 }
 
@@ -3330,12 +3330,12 @@ expand_omp_synch (struct omp_region *reg
 	      || TREE_CODE (bsi_stmt (si)) == OMP_MASTER
 	      || TREE_CODE (bsi_stmt (si)) == OMP_ORDERED
 	      || TREE_CODE (bsi_stmt (si)) == OMP_CRITICAL);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
   single_succ_edge (entry_bb)->flags = EDGE_FALLTHRU;
 
   si = bsi_last (exit_bb);
   gcc_assert (TREE_CODE (bsi_stmt (si)) == OMP_RETURN);
-  bsi_remove (&si);
+  bsi_remove (&si, true);
   single_succ_edge (exit_bb)->flags = EDGE_FALLTHRU;
 }
 

gcc41-reassoc5.patch:
 0 files changed

--- NEW FILE gcc41-reassoc5.patch ---
2006-04-20  Jeff Law  <law at redhat.com>

	PR tree-optimization/26854
	* tree-ssa-reassoc.c (negate_value): Avoid num_imm_uses when
	checking for zero or one use.
	(reassociate_bb): Similarly.

--- gcc/tree-ssa-reassoc.c	(revision 113119)
+++ gcc/tree-ssa-reassoc.c	(revision 113120)
@@ -1032,7 +1032,7 @@ negate_value (tree tonegate, block_stmt_
   if (TREE_CODE (tonegate) == SSA_NAME
       && TREE_CODE (negatedef) == MODIFY_EXPR
       && TREE_CODE (TREE_OPERAND (negatedef, 0)) == SSA_NAME
-      && num_imm_uses (TREE_OPERAND (negatedef, 0)) == 1
+      && has_single_use (TREE_OPERAND (negatedef, 0))
       && TREE_CODE (TREE_OPERAND (negatedef, 1)) == PLUS_EXPR)
     {
       block_stmt_iterator bsi;
@@ -1331,7 +1331,7 @@ reassociate_bb (basic_block bb)
 
 	      /* There may be no immediate uses left by the time we
 		 get here because we may have eliminated them all.  */
-	      if (TREE_CODE (lhs) == SSA_NAME && num_imm_uses (lhs) == 0)
+	      if (TREE_CODE (lhs) == SSA_NAME && has_zero_uses (lhs))
 		continue;
 
 	      TREE_VISITED (stmt) = 1;


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gcc41.spec	11 Jul 2006 16:00:29 -0000	1.79
+++ gcc41.spec	15 Jul 2006 21:13:19 -0000	1.80
@@ -1,6 +1,6 @@
 %define DATE 20060711
 %define gcc_version 4.1.1
-%define gcc_release 7
+%define gcc_release 8
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -36,8 +36,9 @@
 # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
 # Need binutils which support .weakref >= 2.16.91.0.3-1
 # Need binutils which support --hash-style=gnu >= 2.17.50.0.2-7
-BuildRequires: binutils >= 2.17.50.0.2-7
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
+# Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
+BuildRequires: binutils >= 2.17.50.0.2-8
+BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils
 # Make sure pthread.h doesn't contain __thread tokens
 # Make sure glibc supports stack protector
 # Make sure glibc supports DT_GNU_HASH
@@ -67,7 +68,8 @@
 # Need binutils that owns /usr/bin/c++filt
 # Need binutils that support .weakref
 # Need binutils that supports --hash-style=gnu
-Requires: binutils >= 2.17.50.0.2-7
+# Need binutils that support mffgpr/mftgpr
+Requires: binutils >= 2.17.50.0.2-8
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
@@ -130,6 +132,14 @@
 Patch26: gcc41-visibility.patch
 Patch27: gcc41-pr28150.patch
 Patch28: gcc41-pr28170.patch
+Patch29: gcc41-pr28370.patch
+Patch30: gcc41-pr28390.patch
+Patch31: gcc41-reassoc1.patch
+Patch32: gcc41-reassoc2.patch
+Patch33: gcc41-reassoc3.patch
+Patch34: gcc41-reassoc4.patch
+Patch35: gcc41-reassoc5.patch
+Patch36: gcc41-power6.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -436,6 +446,14 @@
 %patch26 -p0 -b .visibility~
 %patch27 -p0 -b .pr28150~
 %patch28 -p0 -b .pr28170~
+%patch29 -p0 -b .pr28370~
+%patch30 -p0 -b .pr28390~
+%patch31 -p0 -b .reassoc1~
+%patch32 -p0 -b .reassoc2~
+%patch33 -p0 -b .reassoc3~
+%patch34 -p0 -b .reassoc4~
+%patch35 -p0 -b .reassoc5~
+%patch36 -p0 -b .power6~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1477,6 +1495,15 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Jul 15 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-8
+- fix handling of C++ template static data members in anonymous namespace
+  (PR c++/28370)
+- fix Fortran OpenMP handling of !$omp parallel do with lastprivate on the
+  iteration variable (PR fortran/28390)
+- backported reassociation pass rewrite (Daniel Berlin, Jeff Law,
+  Roger Sayle, Peter Bergner, PRs ada/24994, tree-optimization/26854)
+- BuildReq sharutils for uuencode
+
 * Tue Jul 11 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-7
 - update from gcc-4_1-branch (-r115058:115330)
   - PRs c++/13983, c++/17519, c++/18681, c++/18698, c++/26577, c++/27019,



From fedora-cvs-commits at redhat.com  Sat Jul 15 21:42:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 17:42:29 -0400
Subject: rpms/kernel/FC-5 linux-2.6-defaults-disable-split-ptlock.patch, 1.2,
	1.3
Message-ID: <200607152142.k6FLgTe5013260@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13192

Modified Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
only disable split ptlock on 32bit

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 02:45:03 -0000	1.2
+++ linux-2.6-defaults-disable-split-ptlock.patch	15 Jul 2006 21:42:26 -0000	1.3
@@ -6,7 +6,7 @@
  	default "4096" if PARISC && !PA20
  	default "4096" if X86_XEN || X86_64_XEN
 -	default "4"
-+	default "4096"
++	default "4096" if !64BIT
  
  #
  # support for page migration



From fedora-cvs-commits at redhat.com  Sat Jul 15 21:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 17:42:53 -0400
Subject: rpms/kernel/FC-4 linux-2.6-defaults-disable-split-ptlock.patch, 1.1,
	1.2
Message-ID: <200607152142.k6FLgrrP013435@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13401

Modified Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
Log Message:
only disable split ptlock on 32bit

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 02:30:41 -0000	1.1
+++ linux-2.6-defaults-disable-split-ptlock.patch	15 Jul 2006 21:42:51 -0000	1.2
@@ -5,7 +5,7 @@
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
 -	default "4"
-+	default "4096"
++	default "4096" if !64BIT
  
  #
  # support for page migration



From fedora-cvs-commits at redhat.com  Sat Jul 15 23:20:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 19:20:52 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2.bz2.sign, NONE, 1.1 .cvsignore,
	1.487, 1.488 kernel-2.6.spec, 1.2402, 1.2403 sources, 1.431,
	1.432 upstream, 1.398, 1.399 patch-2.6.18-rc1-git10.bz2.sign,
	1.1, NONE patch-2.6.18-rc1.bz2.sign, 1.1, NONE
Message-ID: <200607152320.k6FNKqD6019663@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19497

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2.bz2.sign 
Removed Files:
	patch-2.6.18-rc1-git10.bz2.sign patch-2.6.18-rc1.bz2.sign 
Log Message:
rc2


--- NEW FILE patch-2.6.18-rc2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEuW2jyGugalF9Dw4RAmWFAJwLK/eKz5G5ExRUDTxZ3BB+k3KnvgCeIX+3
NTlQSwCmogE6qHIJ/eUi6LI=
=BtvP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- .cvsignore	15 Jul 2006 20:21:21 -0000	1.487
+++ .cvsignore	15 Jul 2006 23:20:49 -0000	1.488
@@ -3,5 +3,4 @@
 kernel-2.6.17
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git10.bz2
+patch-2.6.18-rc2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2402
retrieving revision 1.2403
diff -u -r1.2402 -r1.2403
--- kernel-2.6.spec	15 Jul 2006 20:21:21 -0000	1.2402
+++ kernel-2.6.spec	15 Jul 2006 23:20:49 -0000	1.2403
@@ -255,8 +255,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.18-rc1.bz2
-Patch2: patch-2.6.18-rc1-git10.bz2
+Patch1: patch-2.6.18-rc2.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -729,7 +728,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1670,7 +1668,7 @@
 %changelog
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com>
 - Cleaned up a bunch of bogons in the config files.
-- 2.6.18-rc1-git9 & git10
+- 2.6.18-rc1-git9,git10 & 2.6.18-rc2
 - improvements to linked list debugging.
 
 * Fri Jul 14 2006 Don Zickus <dzickus at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- sources	15 Jul 2006 20:21:21 -0000	1.431
+++ sources	15 Jul 2006 23:20:49 -0000	1.432
@@ -1,4 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
-c4b487524edc3eb86385765d85625da4  patch-2.6.18-rc1.bz2
-f8556cd0491efd4614c5a81db5208940  patch-2.6.18-rc1-git10.bz2
+f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- upstream	15 Jul 2006 20:21:21 -0000	1.398
+++ upstream	15 Jul 2006 23:20:49 -0000	1.399
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc1.bz2
-patch-2.6.18-rc1-git10.bz2
+patch-2.6.18-rc2.bz2


--- patch-2.6.18-rc1-git10.bz2.sign DELETED ---


--- patch-2.6.18-rc1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul 16 02:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 15 Jul 2006 22:26:07 -0400
Subject: rpms/mrtg/devel .cvsignore, 1.13, 1.14 mrtg.spec, 1.30, 1.31 sources,
	1.13, 1.14
Message-ID: <200607160226.k6G2Q7aU015260@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15180

Modified Files:
	.cvsignore mrtg.spec sources 
Log Message:
* Sun Jul 16 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.5-1
- Update to mrtg-2.14.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jul 2006 21:49:53 -0000	1.13
+++ .cvsignore	16 Jul 2006 02:26:03 -0000	1.14
@@ -1,2 +1,2 @@
-mrtg-2.14.4.tar.gz
-mrtg-2.14.4.tar.gz.md5.pgp
+mrtg-2.14.5.tar.gz
+mrtg-2.14.5.tar.gz.md5.pgp


Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mrtg.spec	12 Jul 2006 07:24:10 -0000	1.30
+++ mrtg.spec	16 Jul 2006 02:26:03 -0000	1.31
@@ -5,8 +5,8 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.14.4
-Release:   1.1
+Version:   2.14.5
+Release:   1
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp
@@ -111,6 +111,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Sun Jul 16 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.5-1
+- Update to mrtg-2.14.5
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.4-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jul 2006 21:49:53 -0000	1.13
+++ sources	16 Jul 2006 02:26:03 -0000	1.14
@@ -1,2 +1,2 @@
-4145907cb25a06f57af7b2b9bc4146c1  mrtg-2.14.4.tar.gz
-d0c8d0d5877896152568fe47a3bcf327  mrtg-2.14.4.tar.gz.md5.pgp
+2840275a76ad9ce1f00c07047814b0a4  mrtg-2.14.5.tar.gz
+7d8923e7f19699febb3c392d5eb7acc6  mrtg-2.14.5.tar.gz.md5.pgp



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:07:49 -0400
Subject: rpms/kernel/FC-4/configs config-i586,1.6,1.7
Message-ID: <200607160407.k6G47nVN007940@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7844/configs

Modified Files:
	config-i586 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-i586,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-i586	26 Jun 2006 14:43:18 -0000	1.6
+++ config-i586	16 Jul 2006 04:07:36 -0000	1.7
@@ -1,5 +1,10 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
+
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+
 # CONFIG_MICROCODE is not set
 CONFIG_X86_POWERNOW_K6=m
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:07:49 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1662,1.1663
Message-ID: <200607160407.k6G47nDn007930@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7844

Modified Files:
	kernel-2.6.spec 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1662
retrieving revision 1.1663
diff -u -r1.1662 -r1.1663
--- kernel-2.6.spec	15 Jul 2006 19:58:59 -0000	1.1662
+++ kernel-2.6.spec	16 Jul 2006 04:07:13 -0000	1.1663
@@ -1079,6 +1079,9 @@
 %endif
 
 %changelog
+* Sun Jul 16 2006 Dave Jones <davej at redhat.com>
+- Support up to 4GB in the 586 kernel again.
+
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2143_FC4]
 - 2.6.17.6
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:08:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:08:24 -0400
Subject: rpms/kernel/devel/configs config-i586,1.17,1.18
Message-ID: <200607160408.k6G48Cod008038@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7974/configs

Modified Files:
	config-i586 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-i586	15 Jul 2006 06:49:37 -0000	1.17
+++ config-i586	16 Jul 2006 04:08:05 -0000	1.18
@@ -1,5 +1,10 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
+
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+
 # CONFIG_MICROCODE is not set
 CONFIG_X86_POWERNOW_K6=m
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:08:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:08:24 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2403,1.2404
Message-ID: <200607160408.k6G486Cn008022@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7974

Modified Files:
	kernel-2.6.spec 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2403
retrieving revision 1.2404
diff -u -r1.2403 -r1.2404
--- kernel-2.6.spec	15 Jul 2006 23:20:49 -0000	1.2403
+++ kernel-2.6.spec	16 Jul 2006 04:08:00 -0000	1.2404
@@ -1666,6 +1666,9 @@
 %endif
 
 %changelog
+* Sun Jul 16 2006 Dave Jones <davej at redhat.com>
+- Support up to 4GB in the 586 kernel again.
+
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com>
 - Cleaned up a bunch of bogons in the config files.
 - 2.6.18-rc1-git9,git10 & 2.6.18-rc2



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:09:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:09:15 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2159,1.2160
Message-ID: <200607160409.k6G49F69008238@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8193

Modified Files:
	kernel-2.6.spec 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2159
retrieving revision 1.2160
diff -u -r1.2159 -r1.2160
--- kernel-2.6.spec	15 Jul 2006 19:57:53 -0000	1.2159
+++ kernel-2.6.spec	16 Jul 2006 04:09:12 -0000	1.2160
@@ -1548,6 +1548,9 @@
 %endif
 
 %changelog
+* Sun Jul 16 2006 Dave Jones <davej at redhat.com>
+- Support up to 4GB in the 586 kernel again.
+
 * Sat Jul 16 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.6
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:09:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:09:16 -0400
Subject: rpms/kernel/FC-5/configs config-i586,1.18,1.19
Message-ID: <200607160409.k6G49GaE008247@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8193/configs

Modified Files:
	config-i586 
Log Message:
Support up to 4GB in the 586 kernel again.


Index: config-i586
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-i586	26 Jun 2006 14:42:57 -0000	1.18
+++ config-i586	16 Jul 2006 04:09:13 -0000	1.19
@@ -1,5 +1,9 @@
 CONFIG_M586=y
 # CONFIG_SMP is not set
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+
 # CONFIG_MICROCODE is not set
 CONFIG_X86_POWERNOW_K6=m
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:24:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:24:46 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, NONE,
	1.1 gnome-screensaver.spec, 1.83, 1.84
Message-ID: <200607160424.k6G4OkVs025184@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25090

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
- add initial security token support (still needs work) 


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   14 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   14 
 src/cut-n-paste/securitytoken.c        |  579 ++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |   98 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  107 +++-
 8 files changed, 1711 insertions(+), 23 deletions(-)

--- NEW FILE gnome-screensaver-2.15.4-securitytoken.patch ---
--- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 00:10:27.000000000 +0200
@@ -41,10 +41,15 @@
 #include "gs-prefs.h"
 #include "gs-debug.h"
 
+#include "securitytokenmonitor.h"
+
 static void     gs_monitor_class_init (GSMonitorClass *klass);
 static void     gs_monitor_init       (GSMonitor      *monitor);
 static void     gs_monitor_finalize   (GObject        *object);
 
+static void     gs_monitor_simulate_user_activity (GSMonitor *monitor);
+static void     gs_monitor_lock_screen (GSMonitor *monitor);
+
 #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate))
 
 struct GSMonitorPrivate
@@ -56,6 +61,8 @@ struct GSMonitorPrivate
         GSFade         *fade;
         GSGrab         *grab;
 
+	ScSecurityTokenMonitor *security_token_monitor;
+
         guint           release_grab_id;
 };
 
@@ -100,6 +107,22 @@ manager_auth_request_end_cb (GSManager *
         gs_listener_emit_auth_request_end (monitor->priv->listener);
 }
 
+static void
+security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
+			    ScSecurityToken        *token,
+			    GSMonitor              *monitor)
+{
+	gs_monitor_simulate_user_activity (monitor);
+}
+
+static void
+security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
+			   ScSecurityToken        *token,
+			   GSMonitor              *monitor)
+{
+	gs_monitor_lock_screen (monitor);
+}
+
 static gboolean
 watcher_idle_cb (GSWatcher *watcher,
                  gboolean   is_idle,
@@ -183,20 +206,7 @@ static void
 listener_lock_cb (GSListener *listener,
                   GSMonitor  *monitor)
 {
-        gboolean res;
-        gboolean locked;
-
-        /* set lock flag before trying to activate screensaver
-           in case something tries to react to the ActiveChanged signal */
-
-        gs_manager_get_lock_active (monitor->priv->manager, &locked);
-        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
-        res = gs_listener_set_active (monitor->priv->listener, TRUE);
-        if (! res) {
-                /* If we've failed then restore lock status */
-                gs_manager_set_lock_active (monitor->priv->manager, locked);
-                gs_debug ("Unable to lock the screen");
-        }
+	gs_monitor_lock_screen (monitor);
 }
 
 static void
@@ -257,13 +267,7 @@ static void
 listener_simulate_user_activity_cb (GSListener *listener,
                                     GSMonitor  *monitor)
 {
-        /* in case the screen isn't blanked reset the
-           idle watcher */
-        gs_watcher_reset (monitor->priv->watcher);
-
-        /* request that the manager unlock -
-           will pop up a dialog if necessary */
-        gs_manager_request_unlock (monitor->priv->manager);
+	gs_monitor_simulate_user_activity (monitor);
 }
 
 static void
@@ -375,6 +379,27 @@ connect_manager_signals (GSMonitor *moni
 }
 
 static void
+disconnect_security_token_monitor_signals (GSMonitor *monitor)
+{
+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
+					      security_token_removed_cb, monitor);
+
+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
+					      security_token_inserted_cb, monitor);
+}
+
+static void
+connect_security_token_monitor_signals (GSMonitor *monitor)
+{
+	g_signal_connect (monitor->priv->security_token_monitor, 
+			  "security-token-removed",
+			  G_CALLBACK (security_token_removed_cb), monitor);
+	g_signal_connect (monitor->priv->security_token_monitor, 
+			  "security-token-inserted",
+			  G_CALLBACK (security_token_inserted_cb), monitor);
+}
+
+static void
 disconnect_prefs_signals (GSMonitor *monitor)
 {
         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
@@ -408,6 +433,11 @@ gs_monitor_init (GSMonitor *monitor)
         monitor->priv->manager = gs_manager_new ();
         connect_manager_signals (monitor);
 
+	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
+	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
+					 NULL);
+	connect_security_token_monitor_signals (monitor);
+
         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
 }
 
@@ -423,6 +453,9 @@ gs_monitor_finalize (GObject *object)
 
         g_return_if_fail (monitor->priv != NULL);
 
+	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
+	disconnect_security_token_monitor_signals (monitor);
+
         disconnect_watcher_signals (monitor);
         disconnect_listener_signals (monitor);
         disconnect_manager_signals (monitor);
@@ -434,6 +467,7 @@ gs_monitor_finalize (GObject *object)
         g_object_unref (monitor->priv->listener);
         g_object_unref (monitor->priv->manager);
         g_object_unref (monitor->priv->prefs);
+        g_object_unref (monitor->priv->security_token_monitor);
 
         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
 }
@@ -460,3 +494,34 @@ gs_monitor_start (GSMonitor *monitor,
 
         return TRUE;
 }
+
+static void     
+gs_monitor_simulate_user_activity (GSMonitor *monitor)
+{
+        /* in case the screen isn't blanked reset the
+           idle watcher */
+        gs_watcher_reset (monitor->priv->watcher);
+
+        /* request that the manager unlock -
+           will pop up a dialog if necessary */
+        gs_manager_request_unlock (monitor->priv->manager);
+}
+
+static void     
+gs_monitor_lock_screen (GSMonitor *monitor)
+{
+        gboolean res;
+        gboolean locked;
+
+        /* set lock flag before trying to activate screensaver
+           in case something tries to react to the ActiveChanged signal */
+
+        gs_manager_get_lock_active (monitor->priv->manager, &locked);
+        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
+        res = gs_listener_set_active (monitor->priv->listener, TRUE);
+        if (! res) {
+                /* If we've failed then restore lock status */
+                gs_manager_set_lock_active (monitor->priv->manager, locked);
+                gs_debug ("Unable to lock the screen");
+        }
+}
--- gnome-screensaver-2.15.4/src/Makefile.am.securitytoken	2006-06-28 01:37:57.000000000 +0200
+++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-16 00:17:39.000000000 +0200
@@ -207,6 +207,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
 gnome_screensaver_LDADD =		\
 	$(SAVER_LIBS)			\
 	$(GNOME_SCREENSAVER_LIBS)	\
+ 	$(top_builddir)/src/cut-n-paste/libsecuritytoken.a \
 	$(NULL)
 
 gnome_screensaver_LDFLAGS = -export-dynamic
--- /dev/null	2006-07-15 16:38:53.351472408 +0200
+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-16 00:10:27.000000000 +0200
@@ -0,0 +1,840 @@
+/* securitytokenmonitor.c - monitor for security token insertion and
+ *                          removal events
+ * 
+ * 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.  
+ *
+ * TODO:     - doing this per project is a bad idea i think.
+ *             We should probably make this a system service 
+ *             and use dbus.
+ *
+ *           - We hardcode a driver right now.  We should probably
+ *             look up the default list and go from there. 
+ */
+#include "securitytokenmonitor.h"
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <prerror.h>
+#include <nss.h>
+#include <pk11func.h>
+#include <secmod.h>
+#include <secerr.h>
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_DRIVER
+#define SC_SECURITY_TOKEN_MONITOR_DRIVER LIBDIR"/pkcs11/libcoolkeypk11.so"
+#endif
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_NSS_DB
+#define SC_SECURITY_TOKEN_MONITOR_NSS_DB SYSCONFDIR"/pki/nssdb"
+#endif 
+
+#ifndef SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL
+#define SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL 100	/* ms */
+#endif
+
+#ifndef sc_debug
+#if defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
+#define sc_debug(fmt, args...) g_printerr(fmt "\n", ##args)
+#else
+#define sc_debug(fmt, args...) 
+#endif
+#endif
+
+typedef enum _ScSecurityTokenMonitorState ScSecurityTokenMonitorState;
+
+enum _ScSecurityTokenMonitorState {
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED = 0,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTING,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTED,
+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING,
+};
+
+struct _ScSecurityTokenMonitorPrivate {
+	ScSecurityTokenMonitorState state;
+
+	gchar        *module_path;
+	SECMODModule *module;
+	GHashTable *security_tokens;
+
+	guint32 nss_is_loaded : 1;
+	guint32 is_unstoppable : 1;
+
+	guint poll_timeout_id;
+};
+
+static void sc_security_token_monitor_finalize (GObject *object);
+static void sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *service_class);
+static void sc_security_token_monitor_set_property (GObject       *object,
+						    guint          prop_id,
+						    const GValue  *value,
+						    GParamSpec    *pspec);
+static void sc_security_token_monitor_get_property (GObject    *object,
+						    guint       prop_id,
+						    GValue     *value,
+						    GParamSpec *pspec);
+
+static void
+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
+					   const gchar            *module_path);
+
+
+static void sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
+							     ScSecurityToken        *token);
+static void sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor_class,
+							      ScSecurityToken        *token);
+static gboolean sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor);
+
+static void sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor);
+
+enum {
+	PROP_0 = 0,
+	PROP_MODULE_PATH,
+	NUMBER_OF_PROPERTIES
+};
+
+enum {
+	SECURITY_TOKEN_INSERTED = 0,
+	SECURITY_TOKEN_REMOVED,
+	ERROR,
+	NUMBER_OF_SIGNALS
+};
+
+static guint sc_security_token_monitor_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (ScSecurityTokenMonitor, 
+	       sc_security_token_monitor, 
+	       G_TYPE_OBJECT);
+
+static void
+sc_security_token_monitor_class_init (ScSecurityTokenMonitorClass *monitor_class)
+{
+    GObjectClass *gobject_class;
+
+    gobject_class = G_OBJECT_CLASS (monitor_class);
+
+    gobject_class->finalize = sc_security_token_monitor_finalize;
+
+    sc_security_token_monitor_class_install_signals (monitor_class);
+    sc_security_token_monitor_class_install_properties (monitor_class);
+
+    g_type_class_add_private (monitor_class,
+			      sizeof (ScSecurityTokenMonitorPrivate));
+}
+
+static void
+sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *token_class)
+{
+    GObjectClass *object_class;
+    GParamSpec *param_spec;
+
+    object_class = G_OBJECT_CLASS (token_class);
+    object_class->set_property = sc_security_token_monitor_set_property;
+    object_class->get_property = sc_security_token_monitor_get_property;
+
+    param_spec = g_param_spec_string ("module-path", _("Module Path"),
+				      _("path to security token PKCS #11 driver"),
+				      NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_MODULE_PATH, param_spec);
+}
+
+static void 
+sc_security_token_monitor_set_property (GObject       *object,
+					guint          prop_id,
+					const GValue  *value,
+					GParamSpec    *pspec)
+{
+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
+
+    switch (prop_id)
+    {
+	    case PROP_MODULE_PATH:
+		    sc_security_token_monitor_set_module_path (monitor, 
+							       g_value_get_string (value));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void 
+sc_security_token_monitor_get_property (GObject    *object,
+					guint       prop_id,
+					GValue     *value,
+					GParamSpec *pspec)
+{
+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
+    gchar *module_path;
+
+    switch (prop_id)
+    {
+	    case PROP_MODULE_PATH:
+		    module_path = sc_security_token_monitor_get_module_path (monitor);
+		    g_value_set_string (value, module_path);
+		    g_free (module_path);
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+gchar *
+sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor)
+{
+    return monitor->priv->module_path;
+}
+
+static void
+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
+					   const gchar            *module_path)
+{
+    if (module_path == NULL)
+	    module_path = SC_SECURITY_TOKEN_MONITOR_DRIVER;
+
+    if ((monitor->priv->module_path == NULL) && (module_path == NULL))
+	    return;
+
+    if (((monitor->priv->module_path == NULL) ||
+	 (module_path == NULL) ||
+	 (strcmp (monitor->priv->module_path, module_path) != 0))) {
+	    g_free (monitor->priv->module_path);
+	    monitor->priv->module_path = g_strdup (module_path);
+	    g_object_notify (G_OBJECT (monitor), "module-path");
+    }
+}
+
+static void
+sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
+						 ScSecurityToken        *token)
+{
+    sc_debug ("informing security token of its removal");
+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_REMOVED);
+}
+
+static void
+sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor,
+						  ScSecurityToken        *token)
+{
+    sc_debug ("informing security token of its insertion");
+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_INSERTED);
+}
+
+static void
+sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *monitor_class)
+{
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (monitor_class);
+
+    sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED] =
+	    g_signal_new ("security-token-inserted",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_FIRST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
+					   security_token_inserted), 
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->security_token_inserted = sc_security_token_monitor_token_inserted_handler;
+
+    sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED] =
+	    g_signal_new ("security-token-removed",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_FIRST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
+					   security_token_removed), 
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->security_token_removed = sc_security_token_monitor_token_removed_handler;
+
+    sc_security_token_monitor_signals[ERROR] =
+	    g_signal_new ("error",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass, error),
+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
+    monitor_class->error = NULL;
+}
+
+static gboolean
+sc_slot_id_equal (CK_SLOT_ID *slot_id_1, 
+		  CK_SLOT_ID *slot_id_2)
+{
+    g_assert (slot_id_1 != NULL);
+    g_assert (slot_id_2 != NULL);
+
+    return *slot_id_1 == *slot_id_2;
+}
+
+static gboolean
+sc_slot_id_hash (CK_SLOT_ID *slot_id) 
+{
+    guint32 upper_bits, lower_bits;
+    gint temp;
+
+    if (sizeof (CK_SLOT_ID) == sizeof (gint))
+	    return g_int_hash (slot_id);
+
+    upper_bits = ((*slot_id) >> 31) - 1;
+    lower_bits = (*slot_id) & 0xffffffff;
+
+    /* The upper bits are almost certainly always zero,
+     * so let's degenerate to g_int_hash for the 
+     * (very) common case
+     */
+    temp = lower_bits + upper_bits;
+    return upper_bits + g_int_hash (&temp);
+}
+
+static void
+sc_security_token_monitor_init (ScSecurityTokenMonitor *monitor)
+{
+    sc_debug ("initializing security token monitor");
+
+    monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (monitor,
+						 SC_TYPE_SECURITY_TOKEN_MONITOR,
+						 ScSecurityTokenMonitorPrivate);
+    monitor->priv->poll_timeout_id = 0;
+    monitor->priv->security_tokens = NULL;
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_finalize (GObject *object)
+{
+    ScSecurityTokenMonitor *monitor;
+    GObjectClass *gobject_class;
+
+    monitor = SC_SECURITY_TOKEN_MONITOR (object);
+    gobject_class =
+	    G_OBJECT_CLASS (sc_security_token_monitor_parent_class);
+
+    sc_security_token_monitor_stop_now (monitor);
+
+    gobject_class->finalize (object);
+}
+
+GQuark 
+sc_security_token_monitor_error_quark (void)
+{
+    static GQuark error_quark = 0;
+
+    if (error_quark == 0)
+	    error_quark = g_quark_from_static_string ("sc-security-token-monitor-error-quark");
+
+    return error_quark;
+}
+
+ScSecurityTokenMonitor *
+sc_security_token_monitor_new (const gchar *module_path)
+{
+    ScSecurityTokenMonitor *instance;
+
+    instance = SC_SECURITY_TOKEN_MONITOR (g_object_new (SC_TYPE_SECURITY_TOKEN_MONITOR, 
+							"module-path", module_path,
+							NULL));
+
+    return instance;
+}
+
+static void 
+sc_security_token_monitor_emit_error (ScSecurityTokenMonitor *monitor,
+				      GError                 *error)
+{
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[ERROR], 0,
+		   error);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_emit_security_token_inserted (ScSecurityTokenMonitor *monitor,
+							ScSecurityToken        *token)
+{
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED], 0,
+		   token);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static void 
+sc_security_token_monitor_emit_security_token_removed (ScSecurityTokenMonitor *monitor,
+							ScSecurityToken        *token)
+{
+    ScSecurityTokenMonitorState old_state;
+
+    old_state = monitor->priv->state;
+    monitor->priv->is_unstoppable = TRUE;
+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED], 0,
+		   token);
+    monitor->priv->is_unstoppable = FALSE;
+}
+
+static gboolean
+sc_security_token_monitor_check_for_and_process_events (ScSecurityTokenMonitor *monitor)
+{
+    PK11SlotInfo *slot;
+    CK_SLOT_ID slot_id, *key;
+    gint slot_series, token_slot_series;
+    ScSecurityToken *token;
+
+    slot = SECMOD_WaitForAnyTokenEvent (monitor->priv->module, CKF_DONT_BLOCK,
+					PR_INTERVAL_NO_WAIT);
+
+    if (slot == NULL) {
+	    GError *error;
+	    int error_code;
+
+	    error_code = PORT_GetError ();
+	    if ((error_code == 0) || (error_code == SEC_ERROR_NO_EVENT))
+		    return TRUE;
+
+	    /* FIXME: is there a function to convert from a PORT error
+	     * code to a translated string?
+	     */
+	    error = g_error_new (SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+				 _("encountered unexpected error while "
+				   "waiting for security token events"));
+	    g_error_free (error);
+
+	    return FALSE;
+    }
+
+    /* the slot id and series together uniquely identify a token.
+     * You can never have two tokens with the same slot id at the
+     * same time, however (I think), so we can key off of it.
+     */
+    slot_id = PK11_GetSlotID (slot);
+    slot_series = PK11_GetSlotSeries (slot);
+
+    /* First check to see if there is a token that we're currently
+     * tracking in the slot.
+     */
+    key = g_new (CK_SLOT_ID, 1);
+    *key = slot_id;
+    token = g_hash_table_lookup (monitor->priv->security_tokens, key);
+
+    if (token != NULL)
+	    token_slot_series = sc_security_token_get_slot_series (token);
+
+    if (PK11_IsPresent (slot)) {
+	    /* Now, check to see if their is a new token in the slot.
+	     * If there was a different token in the slot now than
+	     * there was before, then we need to emit a removed signal
+	     * for the old token.
+	     * 
+	     * FIXME: So, I *think* the reason we need to do this is
+	     * for the case where a token is removed and another
+	     * inserted faster than the internal poll granualarity of
+	     * NSS. In that case we won't get a separate removed event
+	     * so we need to handle it ourselves.  But what happens if
+	     * a token is removed, another inserted, then removed, and
+	     * another inserted really fast?  Shouldn't we emit
+	     * several removed/inserted events?  If so, can we depend
+	     * on the difference of the series numbers to determine
+	     * how many events to emit? It's all hard to trigger
+	     * corner cases that probably don't matter anyhow, though.
+	     */
+	    if ((token != NULL) && 
+		token_slot_series != slot_series) {
+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+	    }
+
+	    token = _sc_security_token_new (monitor->priv->module, 
+					    slot_id, slot_series);
+
+	    g_hash_table_replace (monitor->priv->security_tokens,
+				  key, token);
+	    key = NULL;
+
+	    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
+    } else {
+	    /* if we aren't tracking the token, just discard the event.
+	     * We don't want unpaired remove events.  Note on startup
+	     * NSS will generate an "insertion" event if a token is
+	     * already inserted in the slot.
+	     */
+	    if ((token != NULL)) {
+		    /* FIXME: i'm not sure about this code.  Maybe we
+		     * shouldn't do this at all, or maybe we should do it
+		     * n times (where n = slot_series - token_slot_series + 1)
+		     * (see the comment in the if part of this if/else
+		     * clause for more information)
+		     * 
+		     * Right now, i'm just doing it once.  
+		     */
+		    if ((slot_series - token_slot_series) > 1) {
+
+			    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+			    g_hash_table_remove (monitor->priv->security_tokens, key);
+
+			    token = _sc_security_token_new (monitor->priv->module, 
+							    slot_id, slot_series);
+			    g_hash_table_replace (monitor->priv->security_tokens,
+						  key, token);
+			    key = NULL;
+			    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
+		    }
+
+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
+
+		    g_hash_table_remove (monitor->priv->security_tokens, key);
+		    token = NULL;
+	    }
+    }
+
+    g_free (key);
+    PK11_FreeSlot (slot);
+
+    return TRUE;
+}
+
+static void
+sc_security_token_monitor_polling_stopped_handler (ScSecurityTokenMonitor *monitor)
+{
+    monitor->priv->poll_timeout_id = 0;
+    sc_security_token_monitor_stop_now (monitor);
+}
+
+gboolean
+sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor,
+				 GError                 **error)
+{
+    SECStatus status = SECSuccess;
+    gchar *module_spec;
+    gboolean module_explicitly_specified;
+
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
+	    sc_debug ("security token monitor already started");
+	    return TRUE;
+    }
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTING;
+
+    if (!monitor->priv->nss_is_loaded) {
+	    sc_debug ("attempting to load NSS database '%s'",
+		       SC_SECURITY_TOKEN_MONITOR_NSS_DB);
+	    status = NSS_NoDB_Init (SC_SECURITY_TOKEN_MONITOR_NSS_DB);
+    }
+
+    if (status != SECSuccess) {
+	    gsize error_message_size;
+	    gchar *error_message;
+
+	    error_message_size = PR_GetErrorTextLength ();
+
+	    if (error_message_size == 0) {
+		    sc_debug ("NSS security system could not be initialized");
+		    g_set_error (error,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+				 _("NSS security system could not be initialized"));
+		    goto out;
+	    }
+
+	    error_message = g_slice_alloc0 (error_message_size);
+	    PR_GetErrorText (error_message);
+
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+			 "%s", error_message);
+	    sc_debug ("NSS security system could not be initialized - %s",
+		     error_message);
+
+	    g_slice_free1 (error_message_size, error_message);
+
+	    goto out;
+    }
+    sc_debug ("NSS database sucessfully loaded");
+    monitor->priv->nss_is_loaded = TRUE;
+
+    module_explicitly_specified = monitor->priv->module_path != NULL;
+    if (monitor->priv->module == NULL) {
+	    if (module_explicitly_specified) {
+		    module_spec = g_strdup_printf ("library=\"%s\" "
+						   "name=\"SecurityToken\"",
+						   monitor->priv->module_path);
+		    sc_debug ("loading security token driver using spec '%s'",
+			      module_spec);
+
+		    /* FIXME: this API is apparently deprecated, find out what 
+		     * is replacing it
+		     */
+		    monitor->priv->module = 
+			    SECMOD_LoadUserModule (module_spec, 
+						   NULL /* parent */, 
+						   FALSE /* recurse */);
+		    g_free (module_spec);
+	    } else {
+		    SECMODModuleList *modules, *tmp;
+		
+		    modules = SECMOD_GetDefaultModuleList ();
+
+		    for (tmp = modules; tmp != NULL; tmp = tmp->next) {
+			    if (!SECMOD_HasRemovableSlots (tmp->module) ||
+				!tmp->module->loaded)
+				    continue;
+
+			    monitor->priv->module = 
+				    SECMOD_ReferenceModule (tmp->module);
+			    break;
+		    }
+	    }
+    }
+
+    if (!module_explicitly_specified && (monitor->priv->module == NULL)) {
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+			 _("no suitable security token driver could be found"));
+	    goto out;
+    } else if ((monitor->priv->module == NULL) || 
+	       !monitor->priv->module->loaded) {
+
+	    gsize error_message_size;
+	    gchar *error_message;
+
+	    error_message_size = PR_GetErrorTextLength ();
+
+	    if (error_message_size == 0) {
+		    sc_debug ("security token driver '%s' could not be loaded",
+			     monitor->priv->module_path);
+		    g_set_error (error,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
+				 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+				 _ ("security token driver '%s' could not be "
+				    "loaded"),
+				 monitor->priv->module_path);
+		    goto out;
+	    }
+
+	    error_message = g_slice_alloc0 (error_message_size);
+	    PR_GetErrorText (error_message);
+
+	    g_set_error (error,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
+			 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+			 "%s", error_message);
+
+	    sc_debug ("security token driver '%s' could not be loaded - %s",
+		     monitor->priv->module_path, error_message);
+	    g_slice_free1 (error_message_size, error_message);
+
+	    goto out;
+    }
+
+    /* FIXME: so it sort of sucks that we have to poll here.  NSS
+     * does offer a non-blocking API (that we use), but there is
+     * no way to wake up the event loop when new events arrive, so
+     * we just have to poll periodically.  An alternative would be
+     * to fork (or bring in threads, ick) and use the blocking api
+     * plus a message pipe, but that's significantly more
+     * complicated to implement.  Maybe a better solution is to
+     * move all this off to Yet Another Daemon Process and have it
+     * emit dbus signals that we watch for.
+     */
+    monitor->priv->poll_timeout_id =
+	    g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
+				SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL,
+				(GSourceFunc)
+				sc_security_token_monitor_check_for_and_process_events,
+				monitor, (GDestroyNotify)
+				sc_security_token_monitor_polling_stopped_handler);
+
+    monitor->priv->security_tokens =
+	    g_hash_table_new_full ((GHashFunc) sc_slot_id_hash, 
+				   (GEqualFunc) sc_slot_id_equal, 
+				   (GDestroyNotify) g_free, 
+				   (GDestroyNotify) g_object_unref);
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
+
+out:
+    /* don't leave it in a half started state
+     */
+    if (monitor->priv->state != SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
+	    sc_debug ("security token monitor could not be completely started");
+	    sc_security_token_monitor_stop (monitor);
+    } else
+	    sc_debug ("security token monitor started");
+
+    return monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
+}
+
+static gboolean
+sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor)
+{
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
+	    return FALSE;
+
+    sc_debug ("stopping security token monitor");
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED;
+    if (monitor->priv->security_tokens != NULL) {
+	    g_hash_table_destroy (monitor->priv->security_tokens);
+	    monitor->priv->security_tokens = NULL;
+    }
+
+    if (monitor->priv->poll_timeout_id != 0) {
+	    g_source_remove (monitor->priv->poll_timeout_id);
+	    monitor->priv->poll_timeout_id = 0;
+    }
+
+#ifdef SC_SECURITY_TOKEN_MONITOR_DRIVER_CAN_BE_RELOADED_AFTER_BEING_DESTROYED
+    if (monitor->priv->module != NULL) {
+	    SECMOD_DestroyModule (monitor->priv->module);
+	    monitor->priv->module = NULL;
+    }
+
+    if (monitor->priv->nss_is_loaded) {
+	    NSS_Shutdown ();
+	    monitor->priv->nss_is_loaded = FALSE;
+    }
+#endif
+    sc_debug ("security token monitor stopped");
+    
+    return FALSE;
+}
+
+static void
+sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor)
+{
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING;
+
+    g_idle_add ((GSourceFunc) sc_security_token_monitor_stop_now, monitor);
+}
+
+void 
+sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor)
+{
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
+	    return;
+
+    if (monitor->priv->is_unstoppable) {
+	    sc_security_token_monitor_queue_stop (monitor);
+	    return;
+    } 
+
+    sc_security_token_monitor_stop_now (monitor);
+}
+
+#ifdef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
+#include <glib.h>
+
+static GMainLoop *event_loop;
+static gboolean should_exit_on_next_remove = FALSE;
+
+static gboolean on_timeout (ScSecurityTokenMonitor *monitor)
+{
+    GError *error;
+    g_print ("Re-enabling monitor.\n");
+
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+    g_print ("Please re-insert security token\n");
+
+    should_exit_on_next_remove = TRUE;
+
+    return FALSE;
+}
+
+static void
+on_device_inserted (ScSecurityTokenMonitor * monitor,
+		    ScSecurityToken *token)
+{
+    g_print ("security token inserted!\n");
+    g_print ("Please remove it.\n");
+}
+
+static void
+on_device_removed (ScSecurityTokenMonitor * monitor,
+		   ScSecurityToken *token)
+{
+    g_print ("security token removed!\n");
+
+    if (should_exit_on_next_remove)
+	    g_main_loop_quit (event_loop);
+    else {
+	    g_print ("disabling monitor for 2 seconds\n");
+	    sc_security_token_monitor_stop (monitor);
+	    g_timeout_add (2000, (GSourceFunc) on_timeout, monitor);
+    }
+}
+
+int 
+main (int   argc, 
+      char *argv[])
+{
+    ScSecurityTokenMonitor *monitor;
+    GError *error;
+
+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+    g_type_init ();
+
+    g_message ("creating instance of 'security token monitor' object...");
+    monitor = sc_security_token_monitor_new (NULL);
+    g_message ("'security token monitor' object created successfully");
+
+    g_signal_connect (monitor, "security-token-inserted",
+		      G_CALLBACK (on_device_inserted), NULL);
+
+    g_signal_connect (monitor, "security-token-removed",
+		      G_CALLBACK (on_device_removed), NULL);
+
+    g_message ("starting listener...");
+
+    error = NULL;
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+
+    event_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (event_loop);
+    g_main_loop_unref (event_loop);
+    event_loop = NULL;
+
+    g_message ("destroying previously created 'security token monitor' object...");
+    g_object_unref (monitor);
+    monitor = NULL;
+    g_message ("'security token monitor' object destroyed successfully");
+
+    return 0;
+}
+#endif
--- /dev/null	2006-07-15 16:38:53.351472408 +0200
+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-16 00:10:27.000000000 +0200
@@ -0,0 +1,579 @@
+/* securitytoken.c - security token
+ * 
+ * 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.  
+ *
+ * TODO:     - doing this per project is a bad idea i think.
+ *             We should probably make this a system service 
+ *             and use dbus.
+ *
+ *           - We hardcode a driver right now.  We should probably
+ *             look up the default list and go from there. 
+ */
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include <cert.h>
+#include <nss.h>
+#include <pk11func.h>
+#include <prerror.h>
+#include <secmod.h>
+#include <secerr.h>
+
+/* wtf
+ */
+#include "/tmp/certhtml.c"
+
+#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
+#define sc_debug(format, args...) g_printerr (format "\n", ##args)
+#define sc_warning(format, args...) g_printerr (format "\n", ##args)
+#else
+#define sc_debug(format, args...) 
+#define sc_warning(format, args...) 
+#endif
+
+struct _ScSecurityTokenPrivate {
+	SECMODModule *module;
+	ScSecurityTokenState state;
+
+	CK_SLOT_ID slot_id;
+	gint slot_series;
+
+	PK11SlotInfo *slot;
+
+	CERTCertificate *signing_certificate;
+	CERTCertificate *encryption_certificate;
+};
+
+static void sc_security_token_finalize (GObject *object);
+static void sc_security_token_class_install_signals (ScSecurityTokenClass *token_class);
+static void sc_security_token_class_install_properties (ScSecurityTokenClass *token_class);
+static void sc_security_token_set_property (GObject       *object,
+					    guint          prop_id,
+					    const GValue  *value,
+					    GParamSpec    *pspec);
+static void sc_security_token_get_property (GObject     *object,
+					    guint        prop_id,
+					    GValue      *value,
+					    GParamSpec  *pspec);
+
+static void sc_security_token_set_slot_id (ScSecurityToken *token, 
+					   gint             slot_id);
+static void sc_security_token_set_slot_series (ScSecurityToken *token, 
+					       gint             slot_series);
+static void sc_security_token_set_module (ScSecurityToken *token,
+					  SECMODModule    *module);
+
+static PK11SlotInfo *sc_security_token_find_slot_from_id (ScSecurityToken *token,
+							  gint slot_id);
+static gboolean sc_security_token_fetch_certificates (ScSecurityToken *token);
+
+
+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_ID 
+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_ID ((gulong) -1)
+#endif
+
+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES
+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES -1
+#endif
+
+enum {
+	PROP_0 = 0,
+	PROP_SLOT_ID,
+	PROP_SLOT_SERIES,
+	PROP_MODULE,
+	NUMBER_OF_PROPERTIES
+};
+
+enum {
+	INSERTED,
+	REMOVED,
+	NUMBER_OF_SIGNALS
+};
+
+static guint sc_security_token_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (ScSecurityToken, sc_security_token, G_TYPE_OBJECT);
+
+static void
+sc_security_token_class_init (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *gobject_class;
+
+    gobject_class = G_OBJECT_CLASS (token_class);
+
+    gobject_class->finalize = sc_security_token_finalize;
+
+    sc_security_token_class_install_signals (token_class);
+    sc_security_token_class_install_properties (token_class);
+
+    g_type_class_add_private (token_class,
+			      sizeof (ScSecurityTokenPrivate));
+}
+
+static void
+sc_security_token_class_install_signals (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *object_class;
+
+    object_class = G_OBJECT_CLASS (token_class);
+
+    sc_security_token_signals[INSERTED] =
+	    g_signal_new ("inserted",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
+					   inserted), 
+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
+			  G_TYPE_NONE, 0);
+    token_class->inserted = NULL;
+
+    sc_security_token_signals[REMOVED] =
+	    g_signal_new ("removed",
+			  G_OBJECT_CLASS_TYPE (object_class),
+			  G_SIGNAL_RUN_LAST,
+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
+					   removed), 
+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
+			  G_TYPE_NONE, 0);
+    token_class->removed = NULL;
+}
+
+static void
+sc_security_token_class_install_properties (ScSecurityTokenClass *token_class)
+{
+    GObjectClass *object_class;
+    GParamSpec *param_spec;
+
+    object_class = G_OBJECT_CLASS (token_class);
+    object_class->set_property = sc_security_token_set_property;
+    object_class->get_property = sc_security_token_get_property;
+
+    param_spec = g_param_spec_ulong ("slot-id", _("Slot ID"),
+				   _("The slot the token is in"),
+				   1, G_MAXULONG,
+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_ID,
+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_SLOT_ID, param_spec);
+
+    param_spec = g_param_spec_int ("slot-series", _("Slot Series"),
+				   _("per-slot token identifier"),
+				   -1, G_MAXINT,
+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES,
+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_SLOT_SERIES, param_spec);
+
+    /* FIXME: maybe make this a boxed type?
+     */
+    param_spec = g_param_spec_pointer ("module", _("Module"),
+				       _("security token driver"),
+				       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
+    g_object_class_install_property (object_class, PROP_MODULE, param_spec);
+}
+
+static void 
+sc_security_token_set_property (GObject       *object,
+				guint          prop_id,
+				const GValue  *value,
+				GParamSpec    *pspec)
+{
+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
+
+    switch (prop_id)
+    {
+	    case PROP_SLOT_ID:
+		    sc_security_token_set_slot_id (token, 
+						   g_value_get_ulong (value));
+		    break;
+
+	    case PROP_SLOT_SERIES:
+		    sc_security_token_set_slot_series (token, 
+						       g_value_get_int (value));
+		    break;
+
+	    case PROP_MODULE:
+		    sc_security_token_set_module (token, 
+						  (SECMODModule *)
+						  g_value_get_pointer (value));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+CK_SLOT_ID
+sc_security_token_get_slot_id (ScSecurityToken *token)
+{
+    return token->priv->slot_id;
+}
+
+ScSecurityTokenState 
+sc_security_token_get_state (ScSecurityToken *token)
+{
+    return token->priv->state;
+}
+
+static void 
+sc_security_token_get_property (GObject    *object,
+				guint        prop_id,
+				GValue      *value,
+				GParamSpec  *pspec)
+{
+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
+
+    switch (prop_id)
+    {
+	    case PROP_SLOT_ID:
+		    g_value_set_ulong (value, 
+				       (gulong) sc_security_token_get_slot_id (token));
+		    break;
+
+	    case PROP_SLOT_SERIES:
+		    g_value_set_int (value, 
+				     sc_security_token_get_slot_series (token));
+		    break;
+
+	    default:
+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+void
+sc_security_token_set_slot_id (ScSecurityToken *token,
+			       gint             slot_id)
+{
+    if (token->priv->slot_id != slot_id)
+    {
+	    token->priv->slot_id = slot_id;
+
+	    token->priv->slot = sc_security_token_find_slot_from_id (token,
+								     token->priv->slot_id);
+
+	    g_object_notify (G_OBJECT (token), "slot-id");
+    }
+}
+
+void
+sc_security_token_set_slot_series (ScSecurityToken *token,
+				   gint             slot_series)
+{
+    if (token->priv->slot_series != slot_series)
+    {
+	    token->priv->slot_series = slot_series;
+	    g_object_notify (G_OBJECT (token), "slot-series");
+    }
+}
+
+static void
+sc_security_token_set_module (ScSecurityToken *token,
+			      SECMODModule    *module)
+{
+    gboolean should_notify;
+
+    if (token->priv->module != module)
+	    should_notify = TRUE;
+    else
+	    should_notify = FALSE;
+
+    if (token->priv->module != NULL) {
+	    SECMOD_DestroyModule (token->priv->module);
+	    token->priv->module = NULL;
+    }
+
+    if (module != NULL)
+	    token->priv->module = SECMOD_ReferenceModule (module);
+
+    if (should_notify)
+	    g_object_notify (G_OBJECT (token), "module");
+}
+
+gint 
+sc_security_token_get_slot_series (ScSecurityToken *token)
+{
+    return token->priv->slot_series;
+}
+
+static void
+sc_security_token_init (ScSecurityToken *token)
+{
+
+    sc_debug ("initializing security token ");
+
+    token->priv = G_TYPE_INSTANCE_GET_PRIVATE (token,
+					       SC_TYPE_SECURITY_TOKEN,
+					       ScSecurityTokenPrivate);
+}
+
+static void sc_security_token_finalize (GObject *object)
+{
+    ScSecurityToken *token;
+    GObjectClass *gobject_class;
+
+    token = SC_SECURITY_TOKEN (object);
+
+    sc_security_token_set_module (token, NULL);
+
+    gobject_class =
+	    G_OBJECT_CLASS (sc_security_token_parent_class);
+
+    gobject_class->finalize (object);
+}
+
+GQuark sc_security_token_error_quark (void)
+{
+    static GQuark error_quark = 0;
+
+    if (error_quark == 0)
+	    error_quark = g_quark_from_static_string ("sc-security-token-error-quark");
+
+    return error_quark;
+}
+
+ScSecurityToken *
+_sc_security_token_new (SECMODModule *module,
+			CK_SLOT_ID    slot_id,
+			gint          slot_series)
+{
+    ScSecurityToken *token;
+
+    g_return_val_if_fail (module != NULL, NULL);
+    g_return_val_if_fail (slot_id >= 1, NULL);
+    g_return_val_if_fail (slot_series > 0, NULL);
+    g_return_val_if_fail (sizeof (gulong) == sizeof (slot_id), NULL);
+
+    token = SC_SECURITY_TOKEN (g_object_new (SC_TYPE_SECURITY_TOKEN,
+					     "module", module,
+					     "slot-id", (gulong) slot_id,
+					     "slot-series", slot_series,
+					     NULL));
+    return token;
+}
+
+void 
+_sc_security_token_set_state (ScSecurityToken      *token,
+			      ScSecurityTokenState  state)
+{
+    sc_security_token_fetch_certificates (token);
+    if (token->priv->state != state)
+    {
+	    token->priv->state = state;
+
+	    if (state == SC_SECURITY_TOKEN_STATE_INSERTED) {
+		    g_signal_emit (token, sc_security_token_signals[INSERTED], 0);
+	    } else if (state == SC_SECURITY_TOKEN_STATE_REMOVED)
+		    g_signal_emit (token, sc_security_token_signals[REMOVED], 0);
+	    else
+		    g_assert_not_reached ();
+    }
+}
+
+/* So we could conceivably make the closure data a pointer to the token
+ * or something similiar and then emit signals when we want passwords,
+ * but it's probably easier to just get the password up front and use
+ * it.  So we just take the passed in g_malloc'd (well probably, who knows)
+ * and strdup it using NSPR's memory allocation routines.
+ */
+static char *
+sc_security_token_password_handler (PK11SlotInfo *slot, 
+				    PRBool        is_retrying, 
+				    const gchar  *password)
+{
+    if (is_retrying)
+	    return NULL;
+
+    return password != NULL? PL_strdup (password): NULL;
+}
+
+gboolean
+sc_security_token_unlock (ScSecurityToken *token,
+			  const gchar     *password)
+{   
+    SECStatus status;
+
+    PK11_SetPasswordFunc ((PK11PasswordFunc) sc_security_token_password_handler);
+
+    /* we pass PR_TRUE to load certificates
+     */
+    status = PK11_Authenticate (token->priv->slot, PR_TRUE, (gpointer) password);
+
+    if (status != SECSuccess) {
+	    sc_debug ("could not unlock token - %d", status);
+	    return FALSE;
+    }
+    return TRUE;
+}
+
+static PK11SlotInfo *
+sc_security_token_find_slot_from_id (ScSecurityToken *token,
+                                     gint slot_id)
+{
+    int i;
+
+    for (i = 0; i < token->priv->module->slotCount; i++)
+	    if (PK11_GetSlotID (token->priv->module->slots[i]) == slot_id)
+		    return token->priv->module->slots[i];
+
+    return NULL;
+}
+
+static gboolean
+sc_security_token_fetch_certificates (ScSecurityToken *token)
+{
+    PK11SlotInfo *slot;
+    CERTCertList *certificates;
+    CERTCertListNode *node;
+    SECStatus status;
+    int i;
+
+    sc_security_token_unlock (token, "0000");
+
+    sc_debug ("fetching certificates for token in slot %lu",
+	      token->priv->slot_id);
+
+    slot = sc_security_token_find_slot_from_id (token,
+						token->priv->slot_id);
+
+    g_assert (PK11_GetSlotID (slot) == token->priv->slot_id);
+
+    if (i == token->priv->module->slotCount) {
+	    sc_debug ("could not find slot %lu", token->priv->slot_id);
+	    return FALSE;
+    }
+
+    certificates = PK11_ListCertsInSlot (slot);
+
+    sc_debug ("filtering out non-user certificates");
+    if (CERT_FilterCertListForUserCerts (certificates) != SECSuccess) {
+	    CERT_DestroyCertList (certificates);
+	    sc_debug ("could not filter out non-user certificates");
+	    return FALSE;
+    }
+
+    for (node = CERT_LIST_HEAD (certificates); 
+	 !CERT_LIST_END (node, certificates);
+	 node = CERT_LIST_NEXT(node)) {
+
+	    SECCertificateUsage cert_usages;
+
+	    sc_debug ("verifying certificate for use");
+	    status = CERT_VerifyCertificateNow (NULL, node->cert, TRUE, 
+						0, NULL, &cert_usages);
+
+	    if (status != SECSuccess) {
+		    sc_debug ("could not be verified, skipping...");
+		    continue;
+	    }
+
+	    sc_debug ("got cert with usages 0x%x", cert_usages);
+
+	    if (token->priv->encryption_certificate == NULL) {
+
+		    sc_debug ("checking if certificate can be used for data "
+			      "encryption");
+		    status = CERT_CheckCertUsage (node->cert, 
+						  KU_DATA_ENCIPHERMENT);
+
+		    if (status == SECSuccess) {
+			    token->priv->encryption_certificate = 
+				    CERT_DupCertificate (node->cert);
+			    sc_debug ("using encryption certificate:\n%s", 
+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
+		    } else {
+			    sc_debug ("certificate can not be used for encryption");
+		    }
+	    }
+
+	    if (token->priv->signing_certificate == NULL) {
+
+		    sc_debug ("checking if certificate can be used for data "
+			      "signing");
+		    status = CERT_CheckCertUsage (node->cert, 
+						  KU_DIGITAL_SIGNATURE);
+
+		    if (status == SECSuccess) {
+			    token->priv->signing_certificate = 
+				    CERT_DupCertificate (node->cert);
+
+			    sc_debug ("using signing certificate:\n%s", 
+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
+		    } else {
+			    sc_debug ("certificate can not be used for signing things");
+		    }
+	    }
+    }
+    return TRUE;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_upload_data (ScSecurityToken *token,
+			       const gchar     *key,
+			       const gchar     *data)
+{
+    return NULL;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_download_data (ScSecurityToken *token,
+				 const gchar     *key)
+{
+    return NULL;
+}
+
+ScSecurityTokenRequest *
+sc_security_token_delete_data (ScSecurityToken *token,
+			       const gchar     *key)
+{
+    return NULL;
+}
+
+#ifdef SC_SECURITY_TOKEN_ENABLE_TEST
+#include <glib.h>
+
+static GMainLoop *event_loop;
+
+int 
+main (int   argc, 
+      char *argv[])
+{
+    ScSecurityToken *token;
+    GError *error;
+
+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+    g_type_init ();
+
+    g_message ("creating instance of 'security token' object...");
+    token = _sc_security_token_new (NULL, 1, 1);
+    g_message ("'security token' object created successfully");
+
+    g_message ("destroying previously created 'security token' object...");
+    g_object_unref (token);
+    token = NULL;
+    g_message ("'security token' object destroyed successfully");
+
+    return 0;
+}
+#endif
--- /dev/null	2006-07-15 16:38:53.351472408 +0200
+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-16 00:10:27.000000000 +0200
@@ -0,0 +1,98 @@
+/* securitytoken.h - api for reading and writing data to a security token 
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * 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 SC_SECURITY_TOKEN_H
+#define SC_SECURITY_TOKEN_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <secmod.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN            (sc_security_token_get_type ())
+#define SC_SECURITY_TOKEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityToken))
+#define SC_SECURITY_TOKEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
+#define SC_IS_SECURITY_TOKEN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN))
+#define SC_IS_SECURITY_TOKEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN))
+#define SC_SECURITY_TOKEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
+#define SC_SECURITY_TOKEN_ERROR           (sc_security_token_error_quark ())
+typedef struct _ScSecurityTokenClass ScSecurityTokenClass;
+typedef struct _ScSecurityToken ScSecurityToken;
+typedef struct _ScSecurityTokenPrivate ScSecurityTokenPrivate;
+typedef enum _ScSecurityTokenError ScSecurityTokenError;
+typedef enum _ScSecurityTokenState ScSecurityTokenState;
+
+typedef struct _ScSecurityTokenRequest ScSecurityTokenRequest;
+
+struct _ScSecurityToken {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenPrivate *priv;
+};
+
+struct _ScSecurityTokenClass {
+    GObjectClass parent_class;
+
+    void (* inserted) (ScSecurityToken *token);
+    void (* removed) (ScSecurityToken *token);
+};
+
+enum _ScSecurityTokenError {
+    SC_SECURITY_TOKEN_ERROR_GENERIC = 0,
+};
+
+enum _ScSecurityTokenState {
+    SC_SECURITY_TOKEN_STATE_INSERTED = 0,
+    SC_SECURITY_TOKEN_STATE_REMOVED,
+};
+
+GType sc_security_token_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_error_quark (void) G_GNUC_CONST;
+
+CK_SLOT_ID sc_security_token_get_slot_id (ScSecurityToken *token);
+gint sc_security_token_get_slot_series (ScSecurityToken *token);
+ScSecurityTokenState sc_security_token_get_state (ScSecurityToken *token);
+
+gboolean sc_security_token_unlock (ScSecurityToken *token,
+				   const gchar     *password);
+
+ScSecurityTokenRequest *sc_security_token_upload_data (ScSecurityToken *token,
+						       const gchar     *key,
+						       const gchar     *data);
+
+ScSecurityTokenRequest *sc_security_token_download_data (ScSecurityToken *token,
+							 const gchar     *key);
+
+ScSecurityTokenRequest *sc_security_token_delete_data (ScSecurityToken *token,
+						       const gchar     *key);
+
+/* don't under any circumstances call these functions */
+#ifdef SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+
+ScSecurityToken *_sc_security_token_new (SECMODModule *module,
+					 CK_SLOT_ID slot_id, 
+					 gint slot_series);
+void _sc_security_token_set_state (ScSecurityToken      *token,
+				   ScSecurityTokenState  state);
+#endif 
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_H */
--- /dev/null	2006-07-15 16:38:53.351472408 +0200
+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-16 00:10:27.000000000 +0200
@@ -0,0 +1,81 @@
+/* securitytokenmonitor.h - monitor for security token insertion and
+ *                          removal events
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * 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 SC_SECURITY_TOKEN_MONITOR_H
+#define SC_SECURITY_TOKEN_MONITOR_H
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN_MONITOR            (sc_security_token_monitor_get_type ())
+#define SC_SECURITY_TOKEN_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor))
+#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_IS_SECURITY_TOKEN_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_SECURITY_TOKEN_MONITOR_ERROR           (sc_security_token_monitor_error_quark ())
+typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor;
+typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass;
+typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate;
+typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError;
+
+struct _ScSecurityTokenMonitor {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenMonitorPrivate *priv;
+};
+
+struct _ScSecurityTokenMonitorClass {
+    GObjectClass parent_class;
+
+    /* Signals */
+    void (*security_token_inserted) (ScSecurityTokenMonitor *monitor,
+				     ScSecurityToken *token);
+    void (*security_token_removed) (ScSecurityTokenMonitor *monitor,
+				    ScSecurityToken *token);
+    void (*error) (ScSecurityTokenMonitor *monitor, 
+		   GError                 *error);
+};
+
+enum _ScSecurityTokenMonitorError {
+    SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+};
+
+GType sc_security_token_monitor_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST;
+
+ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module);
+
+gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor, 
+				 	  GError                 **error);
+
+void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor);
+
+gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor);
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
--- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
+++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-16 00:10:27.000000000 +0200
@@ -10,7 +10,19 @@ MAINTAINERCLEANFILES =                  
         Makefile.in
 
 noinst_LIBRARIES =			\
-	libfast-user-switch.a
+	libfast-user-switch.a           \
+	libsecuritytoken.a
+
+libsecuritytoken_a_SOURCES = \
+	securitytoken.h \
+	securitytoken.c \
+	securitytokenmonitor.h \
+	securitytokenmonitor.c
+
+libsecuritytoken_a_CFLAGS = $(SECURITY_TOKEN_CFLAGS) \
+			    -DLIBDIR=\""$(libdir)"\"  \
+			    -DSYSCONFDIR=\""$(sysconfdir)"\"
+
 
 libfast_user_switch_a_CPPFLAGS =				\
 	-DDATADIR=\""$(datadir)"\"				\
--- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
+++ gnome-screensaver-2.15.4/configure.ac	2006-07-16 00:10:27.000000000 +0200
@@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
 LIBEXIF_REQUIRED_VERSION=0.6.12
 GLIB_REQUIRED_VERSION=2.7.0
+NSS_REQUIRED_VERSION=3.11.2
 
 AC_CHECK_HEADERS(unistd.h)
 AC_CHECK_HEADERS(crypt.h sys/select.h)
@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
         gtk+-2.0 >= $GTK_REQUIRED_VERSION
         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
+        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
+	nss >= $NSS_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
 
@@ -229,6 +231,16 @@ fi
 AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
 AC_SUBST(HAVE_USER_SWITCHING)
 
+
+# security token support
+PKG_CHECK_MODULES(SECURITY_TOKEN,
+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
+	nss >= $NSS_REQUIRED_VERSION)
+AC_SUBST(SECURITY_TOKEN_CFLAGS)
+AC_SUBST(SECURITY_TOKEN_LIBS)
+
+
+
 dnl ---------------------------------------------------------------------------
 dnl - Where should we put documentation ?
 dnl ---------------------------------------------------------------------------


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gnome-screensaver.spec	12 Jul 2006 06:08:33 -0000	1.83
+++ gnome-screensaver.spec	16 Jul 2006 04:24:40 -0000	1.84
@@ -12,7 +12,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 1.1
+Release: 2
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=331145
 Patch2: gnome-screensaver-2.15.4-shrink-em.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
+Patch4: gnome-screensaver-2.15.4-securitytoken.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -61,8 +62,10 @@
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .invisible-char
+%patch4 -p1 -b .securitytoken
 
 %build
+autoreconf
 %configure --with-xscreensaverdir=/usr/share/xscreensaver/config \
            --with-xscreensaverhackdir=/usr/libexec/xscreensaver  \
            --with-gdm-config=/usr/share/gdm/defaults.conf        \
@@ -149,6 +152,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sat Jul 15 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-2
+- add initial security token support (still needs work) 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.4-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 04:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 00:32:36 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2404,
	1.2405 linux-2.6-x86-sleazy-fpu.patch, 1.1, NONE
Message-ID: <200607160432.k6G4WaiJ026146@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26114

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-x86-sleazy-fpu.patch 
Log Message:
drop sleazy fpu


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2404
retrieving revision 1.2405
diff -u -r1.2404 -r1.2405
--- kernel-2.6.spec	16 Jul 2006 04:08:00 -0000	1.2404
+++ kernel-2.6.spec	16 Jul 2006 04:32:28 -0000	1.2405
@@ -272,7 +272,6 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
-Patch209: linux-2.6-x86-sleazy-fpu.patch
 
 # 300 - 399   ppc(64)
 Patch305: linux-2.6-cell-mambo-drivers.patch
@@ -759,8 +758,6 @@
 %patch207 -p1
 # Add ppoll and pselect syscalls
 %patch208 -p1
-# Arjan's sleazy fpu trick.
-%patch209 -p1
 
 #
 # PowerPC
@@ -1668,6 +1665,8 @@
 %changelog
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.
+- Drop the FPU optimisation, it may be the reason for
+  strange SIGFPE warnings various apps have been getting.
 
 * Sat Jul 15 2006 Dave Jones <davej at redhat.com>
 - Cleaned up a bunch of bogons in the config files.


--- linux-2.6-x86-sleazy-fpu.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul 16 06:17:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 02:17:28 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.84,1.85
Message-ID: <200607160617.k6G6HSvP030786@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30700

Modified Files:
	gnome-screensaver.spec 
Log Message:
add a build req on nss



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnome-screensaver.spec	16 Jul 2006 04:24:40 -0000	1.84
+++ gnome-screensaver.spec	16 Jul 2006 06:17:26 -0000	1.85
@@ -42,6 +42,7 @@
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
+BuildRequires: nss
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 06:47:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 02:47:51 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.85,1.86
Message-ID: <200607160647.k6G6lpuj022942@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22821

Modified Files:
	gnome-screensaver.spec 
Log Message:
one more buildreq



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gnome-screensaver.spec	16 Jul 2006 06:17:26 -0000	1.85
+++ gnome-screensaver.spec	16 Jul 2006 06:47:48 -0000	1.86
@@ -43,6 +43,7 @@
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: nss
+BuildRequires: autoconf
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 12:04:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 08:04:13 -0400
Subject: rpms/indent/devel indent-2.2.9-man.patch, NONE, 1.1 indent.spec,
	1.23, 1.24
Message-ID: <200607161204.k6GC4DFl007208@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7168

Modified Files:
	indent.spec 
Added Files:
	indent-2.2.9-man.patch 
Log Message:
- Add some missing options to manpage/infopage (#199037)


indent-2.2.9-man.patch:
 all_opts       |only
 indent.texinfo |   16 +++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE indent-2.2.9-man.patch ---
Only in indent-2.2.9/doc: all_opts
diff -Bburpd indent-2.2.9-orig/doc/indent.texinfo indent-2.2.9/doc/indent.texinfo
--- indent-2.2.9-orig/doc/indent.texinfo	2006-07-16 07:25:25.000000000 -0400
+++ indent-2.2.9/doc/indent.texinfo	2006-07-16 07:57:33.000000000 -0400
@@ -754,7 +754,7 @@ if (x > 0)
 
 @kindex -ce
 @kindex --cuddle-else
- at kindex -dce
+ at kindex -nce
 @kindex --dont-cuddle-else
 If you are using the @option{-br} option, you probably want to also use
 the @option{-ce} option.  This causes the @code{else} in an if-then-else
@@ -1666,6 +1666,11 @@ Line up continued lines at parentheses.@
 Leave space between @samp{#} and preprocessor directive.@*
 @xref{Indentation}.
 
+ at item -nlps
+ at itemx --remove-preprocessor-space
+Remove space between @samp{#} and preprocessor directive.@*
+ at xref{Indentation}.
+
 @item -nbad
 @itemx --no-blank-lines-after-declarations
 Do not force blank lines after declarations.@*
@@ -1827,6 +1832,11 @@ statement is broken.
 Preserve access and modification times on output files.
 @xref{Miscellaneous options}.
 
+ at item -ppi at var{n}
+ at itemx --preprocessor-indentation at var{n}
+Request indentation of preprocessor conditional statements.@*
+ at xref{Indentation}.
+
 @item -prs
 @itemx --space-after-parentheses
 Put a space after every '(' and before every ')'.@*
@@ -1979,8 +1989,10 @@ the corresponding short option.
 \line{ --original \leaderfill                      -orig}
 \line{ --parameter-indentation \leaderfill         -ip at var{n}\ } 
 \line{ --paren-indentation \leaderfill             -pi at var{n}\ }
+\line{ --preprocessor-indentation at var{n} \leaderfill     -ppi at var{n}\ }
 \line{ --preserve-mtime \leaderfill                -pmt\ }
 \line{ --procnames-start-lines \leaderfill         -psl\ }  
+\line{ --remove-preprocessor-space \leaderfill     -nlps\ }
 \line{ --space-after-cast \leaderfill              -cs\ \ } 
 \line{ --space-after-for \leaderfill               -saf\ }
 \line{ --space-after-if \leaderfill                -sai\ }
@@ -2063,8 +2075,10 @@ the corresponding short option.
 --original                                      -orig
 --parameter-indentation                         -ip at var{n}      
 --paren-indentation                             -pi at var{n}
+--preprocessor-indentation at var{n}               -ppi at var{n}
 --preserve-mtime				-pmt
 --procnames-start-lines                         -psl            
+--remove-preprocessor-space                     -nlps
 --space-after-cast                              -cs             
 --space-after-for				-saf
 --space-after-if				-sai


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- indent.spec	12 Jul 2006 06:24:26 -0000	1.23
+++ indent.spec	16 Jul 2006 12:04:09 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12.3.1
+Release: 13
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -12,6 +12,7 @@
 Patch4: indent-2.2.9-cdw.patch
 Patch5: indent-2.2.9-lcall.patch
 Patch6: indent-2.2.9-zh_TW.patch
+Patch7: indent-2.2.9-man.patch
 Prereq: /sbin/install-info
 BuildRequires: gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -33,6 +34,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -71,6 +73,9 @@
 
 
 %changelog
+* Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
+- Add some missing options to manpage/infopage (#199037)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 12:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 08:13:30 -0400
Subject: rpms/indent/devel indent.spec,1.24,1.25
Message-ID: <200607161213.k6GCDUDA009685@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9590

Modified Files:
	indent.spec 
Log Message:
Using %{?dist} tag in release.



Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- indent.spec	16 Jul 2006 12:04:09 -0000	1.24
+++ indent.spec	16 Jul 2006 12:13:27 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 13
+Release: 13%{?dist}
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/



From fedora-cvs-commits at redhat.com  Sun Jul 16 12:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 08:19:08 -0400
Subject: rpms/indent/FC-5 indent-2.2.9-man.patch, NONE, 1.1 indent.spec, 1.21,
	1.22
Message-ID: <200607161219.k6GCJ8E7026548@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26493

Modified Files:
	indent.spec 
Added Files:
	indent-2.2.9-man.patch 
Log Message:
- Add some missing options to manpage/infopage (#199037)


indent-2.2.9-man.patch:
 all_opts       |only
 indent.texinfo |   16 +++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE indent-2.2.9-man.patch ---
Only in indent-2.2.9/doc: all_opts
diff -Bburpd indent-2.2.9-orig/doc/indent.texinfo indent-2.2.9/doc/indent.texinfo
--- indent-2.2.9-orig/doc/indent.texinfo	2006-07-16 07:25:25.000000000 -0400
+++ indent-2.2.9/doc/indent.texinfo	2006-07-16 07:57:33.000000000 -0400
@@ -754,7 +754,7 @@ if (x > 0)
 
 @kindex -ce
 @kindex --cuddle-else
- at kindex -dce
+ at kindex -nce
 @kindex --dont-cuddle-else
 If you are using the @option{-br} option, you probably want to also use
 the @option{-ce} option.  This causes the @code{else} in an if-then-else
@@ -1666,6 +1666,11 @@ Line up continued lines at parentheses.@
 Leave space between @samp{#} and preprocessor directive.@*
 @xref{Indentation}.
 
+ at item -nlps
+ at itemx --remove-preprocessor-space
+Remove space between @samp{#} and preprocessor directive.@*
+ at xref{Indentation}.
+
 @item -nbad
 @itemx --no-blank-lines-after-declarations
 Do not force blank lines after declarations.@*
@@ -1827,6 +1832,11 @@ statement is broken.
 Preserve access and modification times on output files.
 @xref{Miscellaneous options}.
 
+ at item -ppi at var{n}
+ at itemx --preprocessor-indentation at var{n}
+Request indentation of preprocessor conditional statements.@*
+ at xref{Indentation}.
+
 @item -prs
 @itemx --space-after-parentheses
 Put a space after every '(' and before every ')'.@*
@@ -1979,8 +1989,10 @@ the corresponding short option.
 \line{ --original \leaderfill                      -orig}
 \line{ --parameter-indentation \leaderfill         -ip at var{n}\ } 
 \line{ --paren-indentation \leaderfill             -pi at var{n}\ }
+\line{ --preprocessor-indentation at var{n} \leaderfill     -ppi at var{n}\ }
 \line{ --preserve-mtime \leaderfill                -pmt\ }
 \line{ --procnames-start-lines \leaderfill         -psl\ }  
+\line{ --remove-preprocessor-space \leaderfill     -nlps\ }
 \line{ --space-after-cast \leaderfill              -cs\ \ } 
 \line{ --space-after-for \leaderfill               -saf\ }
 \line{ --space-after-if \leaderfill                -sai\ }
@@ -2063,8 +2075,10 @@ the corresponding short option.
 --original                                      -orig
 --parameter-indentation                         -ip at var{n}      
 --paren-indentation                             -pi at var{n}
+--preprocessor-indentation at var{n}               -ppi at var{n}
 --preserve-mtime				-pmt
 --procnames-start-lines                         -psl            
+--remove-preprocessor-space                     -nlps
 --space-after-cast                              -cs             
 --space-after-for				-saf
 --space-after-if				-sai


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/FC-5/indent.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- indent.spec	11 Feb 2006 03:32:31 -0000	1.21
+++ indent.spec	16 Jul 2006 12:19:06 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12.2
+Release: 13%{?dist}
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -12,6 +12,7 @@
 Patch4: indent-2.2.9-cdw.patch
 Patch5: indent-2.2.9-lcall.patch
 Patch6: indent-2.2.9-zh_TW.patch
+Patch7: indent-2.2.9-man.patch
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -32,6 +33,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -70,6 +72,9 @@
 
 
 %changelog
+* Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
+- Add some missing options to manpage/infopage (#199037)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 16:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 12:27:05 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.86,1.87
Message-ID: <200607161627.k6GGR5Ji022608@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22529

Modified Files:
	gnome-screensaver.spec 
Log Message:
more build reqs



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gnome-screensaver.spec	16 Jul 2006 06:47:48 -0000	1.86
+++ gnome-screensaver.spec	16 Jul 2006 16:27:02 -0000	1.87
@@ -43,7 +43,7 @@
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: nss
-BuildRequires: autoconf
+BuildRequires: aclocal, automake, autoheader, autoconf
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 16:48:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 12:48:17 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.88,1.89
Message-ID: <200607161648.k6GGmHGJ011307@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11203

Modified Files:
	gnome-screensaver.spec 
Log Message:
wow more build req fun.  maybe i should just run this through
mock



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnome-screensaver.spec	16 Jul 2006 16:37:04 -0000	1.88
+++ gnome-screensaver.spec	16 Jul 2006 16:48:15 -0000	1.89
@@ -43,7 +43,7 @@
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: nss
-BuildRequires: automake, autoconf
+BuildRequires: automake, autoconf, libtool
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 17:11:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 13:11:19 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.89,1.90
Message-ID: <200607161711.k6GHBJpw018045@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17886

Modified Files:
	gnome-screensaver.spec 
Log Message:
intltoooool buildreq



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gnome-screensaver.spec	16 Jul 2006 16:48:15 -0000	1.89
+++ gnome-screensaver.spec	16 Jul 2006 17:11:16 -0000	1.90
@@ -43,7 +43,7 @@
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: nss
-BuildRequires: automake, autoconf, libtool
+BuildRequires: automake, autoconf, libtool, intltool
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 17:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 13:35:58 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.29,1.30
Message-ID: <200607161735.k6GHZwZJ008462@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8434

Modified Files:
	libgconf-java.spec 
Log Message:
- Move the pkgconfig file to the devel package.
- BuildReq gtk2-devel (a temporary workaround).


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgconf-java.spec	12 Jul 2006 14:46:12 -0000	1.29
+++ libgconf-java.spec	16 Jul 2006 17:35:55 -0000	1.30
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.3
-Release: 	1
+Release: 	2
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -26,6 +26,8 @@
 Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
+# A temporary hack, should be required by libgtk-java-devel:
+BuildRequires:  gtk2-devel
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -94,14 +96,18 @@
 %doc doc/api AUTHORS COPYING doc/examples NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
+- Move the pkgconfig file to the devel package.
+- BuildReq gtk2-devel (a temporary workaround).
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - New upstream version.
 - Build on s390x again.



From fedora-cvs-commits at redhat.com  Sun Jul 16 18:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 14:15:02 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.30,1.31
Message-ID: <200607161815.k6GIF2TG013372@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13351

Modified Files:
	libgconf-java.spec 
Log Message:
- BuildRequire docbook-utils


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgconf-java.spec	16 Jul 2006 17:35:55 -0000	1.30
+++ libgconf-java.spec	16 Jul 2006 18:15:00 -0000	1.31
@@ -26,6 +26,7 @@
 Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
+BuildRequires:  docbook-utils
 # A temporary hack, should be required by libgtk-java-devel:
 BuildRequires:  gtk2-devel
 
@@ -106,6 +107,7 @@
 %changelog
 * Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
 - Move the pkgconfig file to the devel package.
+- BuildRequire docbook-utils
 - BuildReq gtk2-devel (a temporary workaround).
 
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1



From fedora-cvs-commits at redhat.com  Sun Jul 16 19:04:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 15:04:21 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.31,1.32
Message-ID: <200607161904.k6GJ4Ldx029254@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29228

Modified Files:
	libgconf-java.spec 
Log Message:
BuildRequire java-1.4.2-gcj-compat-devel


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgconf-java.spec	16 Jul 2006 18:15:00 -0000	1.31
+++ libgconf-java.spec	16 Jul 2006 19:04:19 -0000	1.32
@@ -27,6 +27,8 @@
 BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
 BuildRequires:  docbook-utils
+# We need javadoc:
+BuildRequires:  java-1.4.2-gcj-compat-devel
 # A temporary hack, should be required by libgtk-java-devel:
 BuildRequires:  gtk2-devel
 
@@ -107,7 +109,7 @@
 %changelog
 * Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
 - Move the pkgconfig file to the devel package.
-- BuildRequire docbook-utils
+- BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel
 - BuildReq gtk2-devel (a temporary workaround).
 
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1



From fedora-cvs-commits at redhat.com  Sun Jul 16 19:13:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 15:13:19 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.90,1.91
Message-ID: <200607161913.k6GJDJtp031805@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31710

Modified Files:
	gnome-screensaver.spec 
Log Message:
grr nss-devel not nss



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gnome-screensaver.spec	16 Jul 2006 17:11:16 -0000	1.90
+++ gnome-screensaver.spec	16 Jul 2006 19:13:16 -0000	1.91
@@ -42,7 +42,7 @@
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
-BuildRequires: nss
+BuildRequires: nss-devel
 BuildRequires: automake, autoconf, libtool, intltool
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}



From fedora-cvs-commits at redhat.com  Sun Jul 16 19:25:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 15:25:08 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.1, 1.2
Message-ID: <200607161925.k6GJP8eL018584@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18437

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
strip out unimportant macro that requires gnome-common


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   16 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   14 
 src/cut-n-paste/securitytoken.c        |  579 ++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |   98 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  107 +++-
 8 files changed, 1711 insertions(+), 25 deletions(-)

Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-2.15.4-securitytoken.patch	16 Jul 2006 04:24:40 -0000	1.1
+++ gnome-screensaver-2.15.4-securitytoken.patch	16 Jul 2006 19:25:05 -0000	1.2
@@ -1,5 +1,5 @@
 --- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 00:18:08.000000000 +0200
 @@ -41,10 +41,15 @@
  #include "gs-prefs.h"
  #include "gs-debug.h"
@@ -179,7 +179,7 @@
 +        }
 +}
 --- gnome-screensaver-2.15.4/src/Makefile.am.securitytoken	2006-06-28 01:37:57.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-16 00:17:39.000000000 +0200
++++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-16 00:18:08.000000000 +0200
 @@ -207,6 +207,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
  gnome_screensaver_LDADD =		\
  	$(SAVER_LIBS)			\
@@ -189,7 +189,7 @@
  
  gnome_screensaver_LDFLAGS = -export-dynamic
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-16 00:18:08.000000000 +0200
 @@ -0,0 +1,840 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -1032,7 +1032,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-16 00:18:08.000000000 +0200
 @@ -0,0 +1,579 @@
 +/* securitytoken.c - security token
 + * 
@@ -1614,7 +1614,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-16 00:18:08.000000000 +0200
 @@ -0,0 +1,98 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1715,7 +1715,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-16 00:18:08.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1799,7 +1799,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
 --- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-16 00:18:08.000000000 +0200
 @@ -10,7 +10,19 @@ MAINTAINERCLEANFILES =                  
          Makefile.in
  
@@ -1822,7 +1822,7 @@
  libfast_user_switch_a_CPPFLAGS =				\
  	-DDATADIR=\""$(datadir)"\"				\
 --- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
-+++ gnome-screensaver-2.15.4/configure.ac	2006-07-16 00:10:27.000000000 +0200
++++ gnome-screensaver-2.15.4/configure.ac	2006-07-16 15:22:07.000000000 +0200
 @@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
  LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
  LIBEXIF_REQUIRED_VERSION=0.6.12
@@ -1841,7 +1841,16 @@
  AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
  AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-@@ -229,6 +231,16 @@ fi
+@@ -89,8 +91,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ 
+ AM_GCONF_SOURCE_2
+ 
+-GNOME_COMPILE_WARNINGS(yes)
+-
+ # Solaris requires libresolv for daemon()
+ AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
+  
+@@ -229,6 +229,16 @@ fi
  AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
  AC_SUBST(HAVE_USER_SWITCHING)
  



From fedora-cvs-commits at redhat.com  Sun Jul 16 19:42:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 15:42:30 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.2, 1.3
Message-ID: <200607161942.k6GJgU8D023490@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23357

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
- get rid of some debugging cruft that's breaking the build


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   16 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   14 
 src/cut-n-paste/securitytoken.c        |  570 ++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |   98 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  107 +++-
 8 files changed, 1702 insertions(+), 25 deletions(-)

Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-screensaver-2.15.4-securitytoken.patch	16 Jul 2006 19:25:05 -0000	1.2
+++ gnome-screensaver-2.15.4-securitytoken.patch	16 Jul 2006 19:42:27 -0000	1.3
@@ -1,5 +1,5 @@
 --- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 15:23:19.000000000 +0200
 @@ -41,10 +41,15 @@
  #include "gs-prefs.h"
  #include "gs-debug.h"
@@ -179,7 +179,7 @@
 +        }
 +}
 --- gnome-screensaver-2.15.4/src/Makefile.am.securitytoken	2006-06-28 01:37:57.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-16 15:23:19.000000000 +0200
 @@ -207,6 +207,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
  gnome_screensaver_LDADD =		\
  	$(SAVER_LIBS)			\
@@ -189,7 +189,7 @@
  
  gnome_screensaver_LDFLAGS = -export-dynamic
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-16 15:23:19.000000000 +0200
 @@ -0,0 +1,840 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -1032,8 +1032,8 @@
 +}
 +#endif
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-16 00:18:08.000000000 +0200
-@@ -0,0 +1,579 @@
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-16 15:41:32.000000000 +0200
+@@ -0,0 +1,570 @@
 +/* securitytoken.c - security token
 + * 
 + * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
@@ -1077,10 +1077,6 @@
 +#include <secmod.h>
 +#include <secerr.h>
 +
-+/* wtf
-+ */
-+#include "/tmp/certhtml.c"
-+
 +#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
 +#define sc_debug(format, args...) g_printerr (format "\n", ##args)
 +#define sc_warning(format, args...) g_printerr (format "\n", ##args)
@@ -1534,8 +1530,6 @@
 +		    if (status == SECSuccess) {
 +			    token->priv->encryption_certificate = 
 +				    CERT_DupCertificate (node->cert);
-+			    sc_debug ("using encryption certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
 +		    } else {
 +			    sc_debug ("certificate can not be used for encryption");
 +		    }
@@ -1551,9 +1545,6 @@
 +		    if (status == SECSuccess) {
 +			    token->priv->signing_certificate = 
 +				    CERT_DupCertificate (node->cert);
-+
-+			    sc_debug ("using signing certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
 +		    } else {
 +			    sc_debug ("certificate can not be used for signing things");
 +		    }
@@ -1614,7 +1605,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-16 15:23:19.000000000 +0200
 @@ -0,0 +1,98 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1715,7 +1706,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
 --- /dev/null	2006-07-15 16:38:53.351472408 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-16 15:23:19.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1799,7 +1790,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
 --- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-16 00:18:08.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-16 15:23:19.000000000 +0200
 @@ -10,7 +10,19 @@ MAINTAINERCLEANFILES =                  
          Makefile.in
  
@@ -1822,7 +1813,7 @@
  libfast_user_switch_a_CPPFLAGS =				\
  	-DDATADIR=\""$(datadir)"\"				\
 --- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
-+++ gnome-screensaver-2.15.4/configure.ac	2006-07-16 15:22:07.000000000 +0200
++++ gnome-screensaver-2.15.4/configure.ac	2006-07-16 15:23:19.000000000 +0200
 @@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
  LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
  LIBEXIF_REQUIRED_VERSION=0.6.12



From fedora-cvs-commits at redhat.com  Sun Jul 16 19:49:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 15:49:49 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch, NONE,
	1.1 openoffice.org.spec, 1.769, 1.770
Message-ID: <200607161949.k6GJnncJ008543@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8467

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch 
Log Message:
now this is getting pretty damn tedious

openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch:
 sd/source/ui/inc/DrawController.hxx     |    6 ++----
 source/filter/inc/msfilter.hxx          |    0 
 source/filter/ww8/writerwordglue.cxx    |    0 
 source/ui/inc/DrawController.hxx        |    0 
 sw/source/filter/inc/msfilter.hxx       |    5 +----
 sw/source/filter/ww8/writerwordglue.cxx |    5 +++++
 6 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch ---
Index: source/filter/inc/msfilter.hxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/inc/msfilter.hxx,v
retrieving revision 1.12
diff -u -r1.12 msfilter.hxx
--- openoffice.org.orig/sw/source/filter/inc/msfilter.hxx	26 Jan 2006 18:18:54 -0000	1.12
+++ openoffice.org/sw/source/filter/inc/msfilter.hxx	16 Jul 2006 14:17:13 -0000
@@ -84,10 +84,7 @@
 class SwNoTxtNode;
 class SwTxtNode;
 
-namespace
-{
-    template<class C> class StyleMapperImpl;
-}
+template<class C> class StyleMapperImpl;
 class SwTxtFmtColl;
 class SwCharFmt;
 typedef StyleMapperImpl<SwTxtFmtColl> ParaMapper;
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.18
diff -u -r1.18 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx	26 Jan 2006 18:19:58 -0000	1.18
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx	16 Jul 2006 14:17:31 -0000
@@ -324,6 +324,8 @@
         return mrDoc.MakeCharFmt(rName, mrDoc.GetDfltCharFmt());
     }
 
+}
+
     template<class C> class StyleMapperImpl
     {
     private:
@@ -408,6 +410,9 @@
             sRet = GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS);
         return sRet;
     }
+
+namespace
+    {
 
     /*
      Utility to categorize unicode characters into the best fit windows charset
Index: source/ui/inc/DrawController.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/DrawController.hxx,v
retrieving revision 1.11
diff -u -r1.11 DrawController.hxx
--- openoffice.org.orig/sd/source/ui/inc/DrawController.hxx	21 Mar 2006 17:19:23 -0000	1.11
+++ openoffice.org/sd/source/ui/inc/DrawController.hxx	16 Jul 2006 16:49:42 -0000
@@ -81,16 +81,14 @@
     ::com::sun::star::view::XSelectionChangeListener
     > DrawControllerInterfaceBase;
 
+} // end of anonymous namespace.
+
 class BroadcastHelperOwner
 {
 public:
     BroadcastHelperOwner (::osl::Mutex& rMutex) : maBroadcastHelper(rMutex) {};
     ::cppu::OBroadcastHelper maBroadcastHelper;
 };
-
-
-} // end of anonymous namespace.
-
 
 namespace sd {
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- openoffice.org.spec	14 Jul 2006 13:03:15 -0000	1.769
+++ openoffice.org.spec	16 Jul 2006 19:49:46 -0000	1.770
@@ -114,6 +114,7 @@
 Patch48: ooobuild.VBAObjects.patch
 Patch49: openoffice.org.2.0.3.gcc28370.statics.patch
 Patch50: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
+Patch51: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -855,6 +856,7 @@
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
 %patch49 -p1 -b .gcc28370.statics.patch
 %patch50 -p1 -b .gccXXXXX.anonymousexternc.patch
+%patch51 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
 
 tar xzf %{SOURCE1}
 
@@ -3337,10 +3339,11 @@
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
-- rebuild for new tasty linker hash
-- add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
-- add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
 - fix use of freetype headers for new freetype
+- rebuild for new tasty linker hash
+    + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
+    + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
+    + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to workaround more gcc foo
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Sun Jul 16 20:03:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 16:03:54 -0400
Subject: rpms/flex/devel flex.spec,1.29,1.30
Message-ID: <200607162003.k6GK3soS012955@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12927

Modified Files:
	flex.spec 
Log Message:
- using dist tag



Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- flex.spec	14 Jul 2006 13:37:18 -0000	1.29
+++ flex.spec	16 Jul 2006 20:03:50 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 39
+Release: 40%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -84,6 +84,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40
+- using dist tag
+
 * Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-39
 - fileno is defined in posix standard, so adding #define _POSIX_SOURCE
   to compile without warnings (#195687)



From fedora-cvs-commits at redhat.com  Sun Jul 16 20:08:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 16:08:56 -0400
Subject: rpms/flex/FC-5 flex.spec,1.28,1.29
Message-ID: <200607162008.k6GK8ue0013846@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13809

Modified Files:
	flex.spec 
Log Message:
- using dist tag



Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/FC-5/flex.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- flex.spec	14 Jul 2006 13:51:54 -0000	1.28
+++ flex.spec	16 Jul 2006 20:08:54 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 39.fc5
+Release: 40%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -84,6 +84,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40
+- using dist tag
+
 * Fri Jul 14 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-39
 - fileno is defined in posix standard, so adding #define _POSIX_SOURCE
   to compile without warnings (#195687)



From fedora-cvs-commits at redhat.com  Sun Jul 16 21:12:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 17:12:10 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-khelpcenter-sort.patch, NONE,
	1.1 kdebase.spec, 1.199, 1.200
Message-ID: <200607162112.k6GLCAkk012013@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11937

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-khelpcenter-sort.patch 
Log Message:
fix 146377, khelpcenter's Browse Info Pages > Alphabetically should sort entries


kdebase-3.5.3-khelpcenter-sort.patch:
 infotree.cpp |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE kdebase-3.5.3-khelpcenter-sort.patch ---
--- kdebase-3.5.3/khelpcenter/infotree.cpp.tn	2006-07-16 22:39:40.000000000 +0200
+++ kdebase-3.5.3/khelpcenter/infotree.cpp	2006-07-16 22:57:50.000000000 +0200
@@ -123,6 +123,7 @@
   }
 
   m_alphabItem->sortChildItems( 0, true /* ascending */ );
+  m_categoryItem->sortChildItems( 0, true /* ascending */ );
 }
 
 void InfoTree::parseInfoDirFile( const QString &infoDirFileName )
@@ -174,8 +175,10 @@
 
         item = new InfoNodeItem( alphabSection, appName );
         item->entry()->setUrl( url );
+        alphabSection->sortChildItems( 0, true /* ascending */ );
       }
     }
+    catItem->sortChildItems( 0, true /* ascending */ );
   }
   infoDirFile.close();
 }


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- kdebase.spec	13 Jul 2006 17:33:40 -0000	1.199
+++ kdebase.spec	16 Jul 2006 21:12:07 -0000	1.200
@@ -55,6 +55,7 @@
 Patch18: kdebase-3.5.2-kconf_update-klipper.patch
 Patch19: kdebase-3.5.3-kioslave_media_dbus-fuser.patch
 Patch20: kdebase-3.5.3-keyinit.patch
+Patch21: kdebase-3.5.3-khelpcenter-sort.patch
 
 # upstream patches
 Patch100: kdebase-3.5.3-kfind-largefile.patch
@@ -173,6 +174,7 @@
 %patch18 -p1 -b .klipper
 %patch19 -p1 -b .fuser
 %patch20 -p1 -b .keyinit
+%patch21 -p1 -b .khelpcenter-sort
 
 # upstream patches
 %patch100 -p1 -b .kfind-largefile
@@ -552,6 +554,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Sun Jul 16 2006 Than Ngo <than at redhat.com> 6:3.5.3-12
+- fix 146377, khelpcenter's Browse Info Pages > Alphabetically should sort entries
+
 * Thu Jul 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-12
 - cleanup keyinit patch
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 22:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 18:29:32 -0400
Subject: rpms/kernel/devel fsaudit-1.patch, NONE, 1.1.2.1 fsaudit-2.patch,
	NONE, 1.1.2.1 fsaudit-3.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.2405, 1.2405.2.1
Message-ID: <200607162229.k6GMTWZf016893@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16849

Modified Files:
      Tag: private-lspp-45-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-45-branch
	fsaudit-1.patch fsaudit-2.patch fsaudit-3.patch 
Log Message:
* Sun Jul 16 2006 Steve Grubb <sgrubb at redhat.com>
- lspp 45


fsaudit-1.patch:
 fs/namei.c            |    2 +
 include/linux/audit.h |    7 +++++
 kernel/auditsc.c      |   63 ++++++++++++++++++++++++++++++++------------------
 3 files changed, 50 insertions(+), 22 deletions(-)

--- NEW FILE fsaudit-1.patch ---
>From amy.griffis at hp.com Thu Jul 13 13:16:02 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, 13 Jul 2006 13:19:07 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k6DHJ69P001080;
	Thu, 13 Jul 2006 13:19:06 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6DHJ6Vf027042;
	Thu, 13 Jul 2006 13:19:06 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k6DHJ083027431;
	Thu, 13 Jul 2006 13:19:00 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 832C7735EA; Thu, 13 Jul 2006 13:18:54 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k6DHIqwb032196 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 13 Jul 2006 13:18:52 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k6DHIqaO027007
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:52 -0400
Received: from atlrel6.hp.com (atlrel6.hp.com [156.153.255.205])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k6DHIl9m000608
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:47 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel6.hp.com (Postfix) with ESMTP id 8BE9537CD8
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:42 -0400 (EDT)
Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 75A1B3E0B8
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 17:18:02 +0000 (UTC)
Received: from localhost (ldl.lart [127.0.0.1])
	by ldl.fc.hp.com (Postfix) with ESMTP id 09BC71344C7
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 11:18:02 -0600 (MDT)
Received: from ldl.fc.hp.com ([127.0.0.1])
	by localhost (ldl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
	id 16823-07 for <linux-audit at redhat.com>;
	Thu, 13 Jul 2006 11:17:58 -0600 (MDT)
Received: by ldl.fc.hp.com (Postfix, from userid 13670)
	id 9852C13415B; Thu, 13 Jul 2006 11:17:58 -0600 (MDT)
X-IMAP-Sender: amg
Date: Thu, 13 Jul 2006 13:16:02 -0400
X-OfflineIMAP-x317090436-6c646c73656e64-494e424f582e4f7574626f78: 1152811078-00105361224423-v4.0.11
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060713171602.GA30792 at dill.zko.hp.com>
Mail-Followup-To: linux-audit at redhat.com
Mime-Version: 1.0
Content-Type: text/plain;
  charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.11
Status: RO
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
X-RedHat-Spam-Score: -100 
X-loop: linux-audit at redhat.com
Subject: [PATCH] fix faulty inode data collection for open() with O_CREAT
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: 75171
X-Length: 9166

When the specified path is an existing file or when it is a symlink, audit
collects the wrong inode number, which causes it to miss the open() event.
Adding a second hook to the open() path fixes this.

Also add audit_copy_inode() to consolidate some code.

Signed-off-by: Amy Griffis <amy.griffis at hp.com>
---
 fs/namei.c            |    2 ++
 include/linux/audit.h |    7 +++++
 kernel/auditsc.c      |   63 ++++++++++++++++++++++++++++++++-----------------
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 184fe4a..8904b4f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1659,6 +1659,7 @@ do_last:
 	 * It already exists.
 	 */
 	mutex_unlock(&dir->d_inode->i_mutex);
+	audit_inode_update(path.dentry->d_inode);
 
 	error = -EEXIST;
 	if (flag & O_EXCL)
@@ -1669,6 +1670,7 @@ do_last:
 		if (flag & O_NOFOLLOW)
 			goto exit_dput;
 	}
+
 	error = -ENOENT;
 	if (!path.dentry->d_inode)
 		goto exit_dput;
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 9fcafaf..c63f204 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -328,6 +328,7 @@ extern void audit_putname(const char *na
 extern void __audit_inode(const char *name, const struct inode *inode);
 extern void __audit_inode_child(const char *dname, const struct inode *inode,
 				unsigned long pino);
+extern void __audit_inode_update(const struct inode *inode);
 static inline void audit_getname(const char *name)
 {
 	if (unlikely(current->audit_context))
@@ -343,6 +344,10 @@ static inline void audit_inode_child(con
 	if (unlikely(current->audit_context))
 		__audit_inode_child(dname, inode, pino);
 }
+static inline void audit_inode_update(const struct inode *inode) {
+	if (unlikely(current->audit_context))
+		__audit_inode_update(inode);
+}
 
 				/* Private API (for audit.c only) */
 extern unsigned int audit_serial(void);
@@ -414,8 +419,10 @@ #define audit_getname(n) do { ; } while 
 #define audit_putname(n) do { ; } while (0)
 #define __audit_inode(n,i) do { ; } while (0)
 #define __audit_inode_child(d,i,p) do { ; } while (0)
+#define __audit_inode_update(i) do { ; } while (0)
 #define audit_inode(n,i) do { ; } while (0)
 #define audit_inode_child(d,i,p) do { ; } while (0)
+#define audit_inode_update(i) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
 #define audit_ipc_obj(i) ({ 0; })
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 53d2d74..0bc584d 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1200,14 +1200,18 @@ #if AUDIT_DEBUG
 #endif
 }
 
-static void audit_inode_context(int idx, const struct inode *inode)
+/* Copy inode data into an audit_names. */
+static void audit_copy_inode(struct audit_names *name, const struct inode *inode)
 {
-	struct audit_context *context = current->audit_context;
-
-	selinux_get_inode_sid(inode, &context->names[idx].osid);
+	name->ino   = inode->i_ino;
+	name->dev   = inode->i_sb->s_dev;
+	name->mode  = inode->i_mode;
+	name->uid   = inode->i_uid;
+	name->gid   = inode->i_gid;
+	name->rdev  = inode->i_rdev;
+	selinux_get_inode_sid(inode, &name->osid);
 }
 
-
 /**
  * audit_inode - store the inode and device from a lookup
  * @name: name being audited
@@ -1241,13 +1245,7 @@ #if AUDIT_DEBUG
 		++context->ino_count;
 #endif
 	}
-	context->names[idx].ino   = inode->i_ino;
-	context->names[idx].dev	  = inode->i_sb->s_dev;
-	context->names[idx].mode  = inode->i_mode;
-	context->names[idx].uid   = inode->i_uid;
-	context->names[idx].gid   = inode->i_gid;
-	context->names[idx].rdev  = inode->i_rdev;
-	audit_inode_context(idx, inode);
+	audit_copy_inode(&context->names[idx], inode);
 }
 
 /**
@@ -1303,16 +1301,37 @@ #endif
 	context->names[idx].name_len = AUDIT_NAME_FULL;
 	context->names[idx].name_put = 0;	/* don't call __putname() */
 
-	if (inode) {
-		context->names[idx].ino   = inode->i_ino;
-		context->names[idx].dev	  = inode->i_sb->s_dev;
-		context->names[idx].mode  = inode->i_mode;
-		context->names[idx].uid   = inode->i_uid;
-		context->names[idx].gid   = inode->i_gid;
-		context->names[idx].rdev  = inode->i_rdev;
-		audit_inode_context(idx, inode);
-	} else
-		context->names[idx].ino   = (unsigned long)-1;
+	if (!inode)
+		context->names[idx].ino = (unsigned long)-1;
+	else
+		audit_copy_inode(&context->names[idx], inode);
+}
+
+/**
+ * audit_inode_update - update inode info for last collected name
+ * @inode: inode being audited
+ *
+ * When open() is called on an existing object with the O_CREAT flag, the inode
+ * data audit initially collects is incorrect.  This additional hook ensures
+ * audit has the inode data for the actual object to be opened.
+ */
+void __audit_inode_update(const struct inode *inode)
+{
+	struct audit_context *context = current->audit_context;
+	int idx;
+
+	if (!context->in_syscall || !inode)
+		return;
+
+	if (context->name_count == 0) {
+		context->name_count++;
+#if AUDIT_DEBUG
+		context->ino_count++;
+#endif
+	}
+	idx = context->name_count - 1;
+
+	audit_copy_inode(&context->names[idx], inode);
 }
 
 /**
-- 
1.4.0

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


fsaudit-2.patch:
 fs/namei.c               |    2 +-
 include/linux/audit.h    |    8 ++++----
 include/linux/fsnotify.h |    6 +++---
 kernel/auditsc.c         |   16 +++++++++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

--- NEW FILE fsaudit-2.patch ---
>From amy.griffis at hp.com Thu Jul 13 13:16:39 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, 13 Jul 2006 13:19:08 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k6DHJ89P001083;
	Thu, 13 Jul 2006 13:19:08 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6DHJ73B027050;
	Thu, 13 Jul 2006 13:19:07 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k6DHJ2o0027434;
	Thu, 13 Jul 2006 13:19:02 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id BC44973625; Thu, 13 Jul 2006 13:18:55 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k6DHIsgA032201 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 13 Jul 2006 13:18:54 -0400
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k6DHIrc1027015
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:53 -0400
Received: from atlrel7.hp.com (atlrel7.hp.com [156.153.255.213])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6DHIlU5032582
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:47 -0400
Received: from smtp1.fc.hp.com (smtp.fc.hp.com [15.15.136.127])
	by atlrel7.hp.com (Postfix) with ESMTP id 69F4B3711C
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:42 -0400 (EDT)
Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30])
	by smtp1.fc.hp.com (Postfix) with ESMTP id 855353E0BC
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 17:18:05 +0000 (UTC)
Received: from localhost (ldl.lart [127.0.0.1])
	by ldl.fc.hp.com (Postfix) with ESMTP id 5EAD413415B
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 11:18:05 -0600 (MDT)
Received: from ldl.fc.hp.com ([127.0.0.1])
	by localhost (ldl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
	id 16823-08 for <linux-audit at redhat.com>;
	Thu, 13 Jul 2006 11:18:02 -0600 (MDT)
Received: by ldl.fc.hp.com (Postfix, from userid 13670)
	id 9FB6E1344C5; Thu, 13 Jul 2006 11:17:59 -0600 (MDT)
X-IMAP-Sender: amg
Date: Thu, 13 Jul 2006 13:16:39 -0400
X-OfflineIMAP-129479028-6c646c73656e64-494e424f582e4f7574626f78: 1152811079-0873502004471-v4.0.11
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060713171639.GB30792 at dill.zko.hp.com>
Mail-Followup-To: linux-audit at redhat.com
Mime-Version: 1.0
Content-Type: text/plain;
  charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.11
Status: RO
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
X-RedHat-Spam-Score: -100 
X-loop: linux-audit at redhat.com
Subject: [PATCH] fix missed create event for directory audit
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: 75172
X-Length: 8728

When an object is created via a symlink into an audited directory, audit misses
the event due to not having collected the inode data for the directory.  Modify
__audit_inode_child() to copy the parent inode data if a parent wasn't found in
audit_names[].

Signed-off-by: Amy Griffis <amy.griffis at hp.com>
---
 fs/namei.c               |    2 +-
 include/linux/audit.h    |    8 ++++----
 include/linux/fsnotify.h |    6 +++---
 kernel/auditsc.c         |   16 +++++++++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 8904b4f..f9ffe6d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1357,7 +1357,7 @@ static int may_delete(struct inode *dir,
 		return -ENOENT;
 
 	BUG_ON(victim->d_parent->d_inode != dir);
-	audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino);
+	audit_inode_child(victim->d_name.name, victim->d_inode, dir);
 
 	error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
 	if (error)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c63f204..2803163 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -327,7 +327,7 @@ extern void __audit_getname(const char *
 extern void audit_putname(const char *name);
 extern void __audit_inode(const char *name, const struct inode *inode);
 extern void __audit_inode_child(const char *dname, const struct inode *inode,
-				unsigned long pino);
+				const struct inode *parent);
 extern void __audit_inode_update(const struct inode *inode);
 static inline void audit_getname(const char *name)
 {
@@ -339,10 +339,10 @@ static inline void audit_inode(const cha
 		__audit_inode(name, inode);
 }
 static inline void audit_inode_child(const char *dname, 
-				     const struct inode *inode, 
-				     unsigned long pino) {
+				     const struct inode *inode,
+				     const struct inode *parent) {
 	if (unlikely(current->audit_context))
-		__audit_inode_child(dname, inode, pino);
+		__audit_inode_child(dname, inode, parent);
 }
 static inline void audit_inode_update(const struct inode *inode) {
 	if (unlikely(current->audit_context))
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index cc5dec7..d4f219f 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -67,7 +67,7 @@ static inline void fsnotify_move(struct 
 	if (source) {
 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
 	}
-	audit_inode_child(new_name, source, new_dir->i_ino);
+	audit_inode_child(new_name, source, new_dir);
 }
 
 /*
@@ -98,7 +98,7 @@ static inline void fsnotify_create(struc
 	inode_dir_notify(inode, DN_CREATE);
 	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);
+	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode);
 }
 
 /*
@@ -109,7 +109,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_inode);
-	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
+	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode);
 }
 
 /*
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 0bc584d..d440fe4 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1252,7 +1252,7 @@ #endif
  * audit_inode_child - collect inode info for created/removed objects
  * @dname: inode's dentry name
  * @inode: inode being audited
- * @pino: inode number of dentry parent
+ * @parent: inode of dentry parent
  *
  * For syscalls that create or remove filesystem objects, audit_inode
  * can only collect information for the filesystem object's parent.
@@ -1263,7 +1263,7 @@ #endif
  * unsuccessful attempts.
  */
 void __audit_inode_child(const char *dname, const struct inode *inode,
-			 unsigned long pino)
+			 const struct inode *parent)
 {
 	int idx;
 	struct audit_context *context = current->audit_context;
@@ -1277,7 +1277,7 @@ void __audit_inode_child(const char *dna
 	if (!dname)
 		goto update_context;
 	for (idx = 0; idx < context->name_count; idx++)
-		if (context->names[idx].ino == pino) {
+		if (context->names[idx].ino == parent->i_ino) {
 			const char *name = context->names[idx].name;
 
 			if (!name)
@@ -1305,6 +1305,16 @@ #endif
 		context->names[idx].ino = (unsigned long)-1;
 	else
 		audit_copy_inode(&context->names[idx], inode);
+
+	/* A parent was not found in audit_names, so copy the inode data for the
+	 * provided parent. */
+	if (!found_name) {
+		idx = context->name_count++;
+#if AUDIT_DEBUG
+		context->ino_count++;
+#endif
+		audit_copy_inode(&context->names[idx], parent);
+	}
 }
 
 /**
-- 
1.4.0

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


fsaudit-3.patch:
 audit.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE fsaudit-3.patch ---
>From amy.griffis at hp.com Thu Jul 13 13:17:12 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, 13 Jul 2006 13:19:18 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k6DHJI9P001100;
	Thu, 13 Jul 2006 13:19:18 -0400
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6DHJH9o027076;
	Thu, 13 Jul 2006 13:19:17 -0400
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k6DHJCof027455;
	Thu, 13 Jul 2006 13:19:12 -0400
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 065B772E66; Thu, 13 Jul 2006 13:19:12 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	k6DHJA7a032220 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 13 Jul 2006 13:19:10 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k6DHJAwZ027071
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:19:10 -0400
Received: from atlrel9.hp.com (atlrel9.hp.com [156.153.255.214])
	by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	k6DHJ9FW000676
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:19:09 -0400
Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127])
	by atlrel9.hp.com (Postfix) with ESMTP id 821D43771D
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 13:18:42 -0400 (EDT)
Received: from ldl.fc.hp.com (linux-bugs.fc.hp.com [15.11.146.30])
	by smtp1.fc.hp.com (Postfix) with ESMTP id A1C783E0BB
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 17:18:02 +0000 (UTC)
Received: from localhost (ldl.lart [127.0.0.1])
	by ldl.fc.hp.com (Postfix) with ESMTP id 7CB7F13415B
	for <linux-audit at redhat.com>; Thu, 13 Jul 2006 11:18:02 -0600 (MDT)
Received: from ldl.fc.hp.com ([127.0.0.1])
	by localhost (ldl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
	id 16736-09 for <linux-audit at redhat.com>;
	Thu, 13 Jul 2006 11:17:59 -0600 (MDT)
Received: by ldl.fc.hp.com (Postfix, from userid 13670)
	id 52E471344C4; Thu, 13 Jul 2006 11:17:58 -0600 (MDT)
X-IMAP-Sender: amg
Date: Thu, 13 Jul 2006 13:17:12 -0400
X-OfflineIMAP-2121585537-6c646c73656e64-494e424f582e4f7574626f78: 1152811078-030061455912-v4.0.11
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060713171712.GC30792 at dill.zko.hp.com>
Mail-Followup-To: linux-audit at redhat.com
Mime-Version: 1.0
Content-Type: text/plain;
  charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.11
Status: RO
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com
X-RedHat-Spam-Score: -100 
X-loop: linux-audit at redhat.com
Subject: [PATCH] fix oops with CONFIG_AUDIT and !CONFIG_AUDITSYSCALL
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: 75173
X-Length: 4862

Always initialize the audit_inode_hash[] so we don't oops on list rules.

Signed-off-by: Amy Griffis <amy.griffis at hp.com>
---
 kernel/audit.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 7dfac70..097a560 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -690,9 +690,7 @@ #endif
 /* Initialize audit support at boot time. */
 static int __init audit_init(void)
 {
-#ifdef CONFIG_AUDITSYSCALL
 	int i;
-#endif
 
 	printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
 	       audit_default ? "enabled" : "disabled");
@@ -717,10 +715,10 @@ #ifdef CONFIG_AUDITSYSCALL
 	audit_ih = inotify_init(&audit_inotify_ops);
 	if (IS_ERR(audit_ih))
 		audit_panic("cannot initialize inotify handle");
+#endif
 
 	for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
 		INIT_LIST_HEAD(&audit_inode_hash[i]);
-#endif
 
 	return 0;
 }
-- 
1.4.0

--
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.2405
retrieving revision 1.2405.2.1
diff -u -r1.2405 -r1.2405.2.1
--- kernel-2.6.spec	16 Jul 2006 04:32:28 -0000	1.2405
+++ kernel-2.6.spec	16 Jul 2006 22:29:29 -0000	1.2405.2.1
@@ -12,7 +12,7 @@
 %define buildxen 0
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 %define buildheaders 0
 
 # Versions of various parts
@@ -32,7 +32,8 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define tag .lspp.45
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}%tag
 %define signmodules 0
 %define xen_version 20060610
 %define make_target bzImage
@@ -64,7 +65,7 @@
 %endif
 
 %ifarch ppc64
-%define buildkdump 1
+%define buildkdump 0
 %endif
 
 # ... and XenPAE only on i686
@@ -433,6 +434,24 @@
 # Xen hypervisor patches
 Patch20000: xen-sched-sedf.patch
 
+# Audit & lspp patches
+#Patch20100: linux-2.6-audit-git.patch
+#Patch20101: linux-2.6-audit-pending.patch
+Patch20102: fsaudit-1.patch
+Patch20103: fsaudit-2.patch
+Patch20104: fsaudit-3.patch
+#Patch20110: linux-2.6-net-label_1_7.patch
+#Patch20111: linux-2.6-net-label_2_7.patch
+#Patch20112: linux-2.6-net-label_3_7.patch
+#Patch20113: linux-2.6-net-label_4_7.patch
+#Patch20114: linux-2.6-net-label_5_7.patch
+#Patch20115: linux-2.6-net-label_6_7.patch
+#Patch20116: linux-2.6-net-label_7_7.patch
+#Patch20122: ipsec-lspp-41.patch
+#Patch20123: ipsec-flow-41.patch
+#Patch20124: ipsec-autolabel-42.patch
+#Patch20125: ipsec-bugfix-42.patch
+
 
 # END OF PATCH DEFINITIONS
 
@@ -1000,6 +1019,26 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# Audit patches
+#%patch20100 -p1
+#%patch20101 -p1
+%patch20102 -p1
+%patch20103 -p1
+%patch20104 -p1
+# netlabel
+#%patch20110 -p1
+#%patch20111 -p1
+#%patch20112 -p1
+#%patch20113 -p1
+#%patch20114 -p1
+#%patch20115 -p1
+#%patch20116 -p1
+# ipsec
+#%patch20122 -p1
+#%patch20123 -p1
+#%patch20124 -p1
+#%patch20125 -p1
+
 # END OF PATCH APPLICATIONS
 
 cp %{SOURCE10} Documentation/
@@ -1013,6 +1052,7 @@
 for i in *.config
 do
   mv $i .config
+  echo "CONFIG_NETLABEL=y" >> .config
   Arch=`head -1 .config | cut -b 3-`
   make ARCH=$Arch nonint_oldconfig > /dev/null
   echo "# $Arch" > configs/$i
@@ -1663,6 +1703,9 @@
 %endif
 
 %changelog
+* Sun Jul 16 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp 45
+
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.
 - Drop the FPU optimisation, it may be the reason for



From fedora-cvs-commits at redhat.com  Sun Jul 16 22:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 18:37:55 -0400
Subject: rpms/sudo/devel sudo-1.6.8p12-ipv6.patch, NONE,
	1.1 sudo-1.6.8p12-pam-login.patch, NONE, 1.1 sudo.spec, 1.42, 1.43
Message-ID: <200607162237.k6GMbtJQ018521@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18491

Modified Files:
	sudo.spec 
Added Files:
	sudo-1.6.8p12-ipv6.patch sudo-1.6.8p12-pam-login.patch 
Log Message:
IPv6 and keyring support

sudo-1.6.8p12-ipv6.patch:
 Makefile.in   |   12 ++--
 interfaces.c  |   45 +++++++++++++++---
 interfaces.h  |    5 +-
 ldap.c        |    1 
 parse.c       |  128 ++++++++++++++++++++++++++++++++++++++++++++-------
 parse.h       |    1 
 parse.lex     |   28 +++++++++++
 parse.yacc    |    8 +++
 sudo.c        |   32 ++++++++----
 testsudoers.c |  145 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 visudo.c      |    7 ++
 11 files changed, 350 insertions(+), 62 deletions(-)

--- NEW FILE sudo-1.6.8p12-ipv6.patch ---
--- sudo-1.6.8p12/Makefile.in.ipv6	2005-11-08 19:21:58.000000000 +0100
+++ sudo-1.6.8p12/Makefile.in	2006-07-16 23:33:58.000000000 +0200
@@ -187,14 +187,14 @@
 @DEV at PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
 
 # Uncomment the following if you intend to modify parse.yacc
- at DEV@sudo.tab.c sudo.tab.h: parse.yacc
- at DEV@	rm -f sudo.tab.h sudo.tab.c
- at DEV@	$(YACC) -d -b sudo $(srcdir)/parse.yacc
+sudo.tab.c sudo.tab.h: parse.yacc
+	rm -f sudo.tab.h sudo.tab.c
+	$(YACC) -d -b sudo $(srcdir)/parse.yacc
 
 # Uncomment the following if you intend to modify parse.lex
- at DEV@lex.yy.c: parse.lex
- at DEV@	rm -f lex.yy.c
- at DEV@	$(LEX) $(srcdir)/parse.lex
+lex.yy.c: parse.lex
+	rm -f lex.yy.c
+	$(LEX) $(srcdir)/parse.lex
 
 # Uncomment the following if you intend to modify def_data.in
 @DEV at def_data.h def_data.c: def_data.in
--- sudo-1.6.8p12/visudo.c.ipv6	2004-11-25 18:32:40.000000000 +0100
+++ sudo-1.6.8p12/visudo.c	2006-07-16 23:33:58.000000000 +0200
@@ -87,6 +87,7 @@
 static int check_syntax		__P((int));
 int command_matches		__P((char *, char *));
 int addr_matches		__P((char *));
+int addr6_matches		__P((char *));
 int hostname_matches		__P((char *, char *, char *));
 int netgr_matches		__P((char *, char *, char *, char *));
 int usergr_matches		__P((char *, char *, struct passwd *));
@@ -515,6 +516,12 @@
     return(TRUE);
 }
 
+int addr6_matches(n)
+    char *n;
+{
+    return(TRUE);
+}
+
 int
 hostname_matches(s, l, p)
     char *s, *l, *p;
--- sudo-1.6.8p12/parse.lex.ipv6	2004-05-17 22:51:13.000000000 +0200
+++ sudo-1.6.8p12/parse.lex	2006-07-16 23:33:58.000000000 +0200
@@ -84,6 +84,29 @@
 
 OCTET			(1?[0-9]{1,2})|(2[0-4][0-9])|(25[0-5])
 DOTTEDQUAD		{OCTET}(\.{OCTET}){3}
+
+IPV6_8HEX               ([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}
+
+IPV6_COMP0              :(:[0-9A-Fa-f]{1,4}){1,7}
+IPV6_COMP1              ([0-9A-Fa-f]{1,4}){1}:(:[0-9A-Fa-f]{1,4}){0,6}
+IPV6_COMP2              ([0-9A-Fa-f]{1,4}){2}:(:[0-9A-Fa-f]{1,4}){0,5}
+IPV6_COMP3              ([0-9A-Fa-f]{1,4}){3}:(:[0-9A-Fa-f]{1,4}){0,4}
+IPV6_COMP4		([0-9A-Fa-f]{1,4}){4}:(:[0-9A-Fa-f]{1,4}){0,3}
+IPV6_COMP5              ([0-9A-Fa-f]{1,4}){5}:(:[0-9A-Fa-f]{1,4}){0,2}
+IPV6_COMP6              ([0-9A-Fa-f]{1,4}){6}:(:[0-9A-Fa-f]{1,4}){0,1}
+IPV6_COMPHEX            {IPV6_COMP0}|{IPV6_COMP1}|{IPV6_COMP2}|{IPV6_COMP3}|{IPV6_COMP4}|{IPV6_COMP5}|{IPV6_COMP6}
+
+IPV6_6H4D               [0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){5}{DOTTEDQUAD}
+
+IPV6_COMP6H4D0          ([0-9A-Fa-f]{1,4}){1}:(:[0-9A-Fa-f]{1,4}){1,4}:{DOTTEDQUAD}
+IPV6_COMP6H4D1          ([0-9A-Fa-f]{1,4}){2}:(:[0-9A-Fa-f]{1,4}){1,3}:{DOTTEDQUAD}
+IPV6_COMP6H4D2          ([0-9A-Fa-f]{1,4}){3}:(:[0-9A-Fa-f]{1,4}){1,2}:{DOTTEDQUAD}
+IPV6_COMP6H4D3          ([0-9A-Fa-f]{1,4}){4}:(:[0-9A-Fa-f]{1,4}){1}:{DOTTEDQUAD}
+IPV6_COMP6H4D           {IPV6_COMP6H4D0}|{IPV6_COMP6H4D1}|{IPV6_COMP6H4D2}|{IPV6_COMP6H4D3}
+
+IPV6ADDR                {IPV6_8HEX}|{IPV6_COMPHEX}|{IPV6_6H4D}|{IPV6_COMP6H4D}
+IPV6PREFIX		[1-9]|[1-9][0-9]|10[0-9]|11[0-9]|12[0-8]
+
 HOSTNAME		[[:alnum:]_-]+
 WORD			([^#>@!=:,\(\) \t\n\\]|\\[^\n])+
 ENVAR			([^#!=, \t\n\\]|\\[^\n])([^#=, \t\n\\]|\\[^\n])*
@@ -253,6 +276,11 @@
 			    LEXTRACE("NTWKADDR ");
 			    return(NTWKADDR);
 			}
+{IPV6ADDR}(\/{IPV6PREFIX})? {
+			    fill(yytext, yyleng);
+                            LEXTRACE("NTWKADDR6 ");
+                            return(NTWKADDR6);
+			}
 
 <INITIAL>\(		{
 				BEGIN GOTRUNAS;
--- sudo-1.6.8p12/ldap.c.ipv6	2006-07-16 23:45:35.000000000 +0200
+++ sudo-1.6.8p12/ldap.c	2006-07-16 23:59:56.000000000 +0200
@@ -160,6 +160,7 @@
     if (
          !strcasecmp(*p,"ALL") ||
          addr_matches(*p) ||
+         addr6_matches(*p) ||
          netgr_matches(*p,user_host,user_shost,NULL) ||
          !hostname_matches(user_shost,user_host,*p)
        )
--- sudo-1.6.8p12/parse.h.ipv6	2005-06-19 20:58:19.000000000 +0200
+++ sudo-1.6.8p12/parse.h	2006-07-16 23:33:58.000000000 +0200
@@ -93,6 +93,7 @@
  * Prototypes
  */
 int addr_matches	__P((char *));
+int addr6_matches	__P((char *));
 int command_matches	__P((char *, char *));
 int hostname_matches	__P((char *, char *, char *));
 int netgr_matches	__P((char *, char *, char *, char *));
--- sudo-1.6.8p12/interfaces.h.ipv6	2004-02-13 22:36:43.000000000 +0100
+++ sudo-1.6.8p12/interfaces.h	2006-07-16 23:33:58.000000000 +0200
@@ -27,8 +27,11 @@
  * IP address and netmask pairs for checking against local interfaces.
  */
 struct interface {
-    struct in_addr addr;
+    struct in_addr addr;	/* IPv4 */
     struct in_addr netmask;
+    struct in6_addr addr6;	/* IPv6 */
+    struct in6_addr netmask6;
+    sa_family_t sa_family;	/* AF_INET ? AF_INET6 */
 };
 
 /*
--- sudo-1.6.8p12/parse.c.ipv6	2005-06-19 22:03:24.000000000 +0200
+++ sudo-1.6.8p12/parse.c	2006-07-16 23:57:20.000000000 +0200
@@ -370,38 +370,134 @@
     int i;
     char *m;
     struct in_addr addr, mask;
+    struct addrinfo hints, *ai;
+
+    memset(&hints, '\0', sizeof(hints));
+    hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
+    hints.ai_family = AF_INET;
 
     /* If there's an explicit netmask, use it. */
     if ((m = strchr(n, '/'))) {
+
 	*m++ = '\0';
-	addr.s_addr = inet_addr(n);
+	if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+	memcpy(&addr.s_addr, &((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+		  sizeof(struct in_addr));
+	freeaddrinfo(ai);
+
 	if (strchr(m, '.'))
-	    mask.s_addr = inet_addr(m);
-	else {
-	    i = 32 - atoi(m);
-	    mask.s_addr = 0xffffffff;
-	    mask.s_addr >>= i;
-	    mask.s_addr <<= i;
-	    mask.s_addr = htonl(mask.s_addr);
+	{
+	    if (getaddrinfo(m, NULL, &hints, &ai)!=0)
+		return(FALSE);
+	    memcpy(&mask.s_addr,    /* IPv4 netmask from dotted quad */
+			&((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+			sizeof(struct in_addr));
 	}
+       	else
+       	{
+       	    i = 32 - atoi(m);	/* IPv4 netmask from CIDR */
+       	    mask.s_addr = 0xffffffff;
+       	    mask.s_addr >>= i;
+            mask.s_addr <<= i;
+       	    mask.s_addr = htonl(mask.s_addr);
+       	}
+
 	*(m - 1) = '/';
 
-	for (i = 0; i < num_interfaces; i++)
-	    if ((interfaces[i].addr.s_addr & mask.s_addr) == addr.s_addr)
-		return(TRUE);
+	for (i = 0; i <  num_interfaces; ++i)
+	    if (interfaces[i].sa_family == AF_INET)	/* IPv4 intf. only */
+		if ((interfaces[i].addr.s_addr & mask.s_addr) == addr.s_addr)
+		    return (TRUE);
     } else {
-	addr.s_addr = inet_addr(n);
+	if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr.s_addr, &((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+                  sizeof(struct in_addr));
+	freeaddrinfo(ai);
 
 	for (i = 0; i < num_interfaces; i++)
-	    if (interfaces[i].addr.s_addr == addr.s_addr ||
-		(interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr)
-		== addr.s_addr)
-		return(TRUE);
+	    if (interfaces[i].sa_family == AF_INET)     /* IPv4 intf. only */
+	        if (interfaces[i].addr.s_addr == addr.s_addr ||
+	            (interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr)
+			 == addr.s_addr)
+		    return(TRUE);
     }
 
     return(FALSE);
 }
 
+int
+addr6_matches(n)
+char *n;
+{
+    int i, j;
+    uint32_t msk[4] = {0, 0, 0, 0};	/* 32x4 */
+    uint32_t addr[4], i_msk[4], i_addr[4];
+    char *m;
+    struct addrinfo hints, *ai;
+
+    memset(&hints, '\0', sizeof(hints));
+    hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
+    hints.ai_family = AF_INET6;
+	
+    /* we have IPv6 prefix */
+    if ((m = strchr(n, '/'))) {
+	*m++ = '\0';
+	if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+            return(FALSE);
+	memcpy(&addr, &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, 16);
+	freeaddrinfo(ai);
+
+	for (i=0; i < (atoi(m)/32); ++i)
+	    msk[i] = 0xffffffff;
+	if (atoi(m)<128 && (atoi(m) % 32))
+	{
+	    msk[atoi(m)/32] = 0xffffffff;
+	    msk[atoi(m)/32] >>= ( 32 - (atoi(m) % 32) );
+	    msk[atoi(m)/32] <<= ( 32 - (atoi(m) % 32) );
+	}
+	for (i=0; i<4; ++i)
+	    msk[i] = htonl(msk[i]);
+	
+	*(m - 1) = '/';
+	
+	for (i=0; i < num_interfaces; i++)
+	    if (interfaces[i].sa_family == AF_INET6)	/* compare only IPv6 intf. */
+	    {
+		/* nasty */
+	        memcpy(&i_addr, &interfaces[i].addr6, 16);
+		if ( ((i_addr[0] & msk[0]) == addr[0]) &&
+		     ((i_addr[1] & msk[1]) == addr[1]) &&
+		     ((i_addr[2] & msk[2]) == addr[2]) &&
+		     ((i_addr[3] & msk[3]) == addr[3]))
+		    return(TRUE);
+	    }	     
+    } else {
+        if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr, &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, 16);
+        freeaddrinfo(ai);
+
+	for (i=0; i < num_interfaces; ++i)
+	    if (interfaces[i].sa_family == AF_INET6) /* IPv6 intf. only */
+	    {
+	        memcpy(&i_addr, &interfaces[i].addr6, 16);
+		if ((i_addr[0] == addr[0]) && (i_addr[1] == addr[1]) &&
+		    (i_addr[2] == addr[2]) && (i_addr[3] == addr[3]))
+		    return(TRUE); /* found my own address in sudoers */
+
+		memcpy(&i_msk, &interfaces[i].netmask6, 16);
+		if (((i_addr[0]&i_msk[0]) == addr[0]) &&
+		    ((i_addr[1]&i_msk[1]) == addr[1]) &&
+		    ((i_addr[2]&i_msk[2]) == addr[2]) &&
+		    ((i_addr[3]&i_msk[3]) == addr[3]))
+		    return(TRUE); /* found my netw. address in sudoers */
+	    }
+    }
+    return(FALSE);
+}
+
 /*
  * Returns 0 if the hostname matches the pattern and non-zero otherwise.
  */
--- sudo-1.6.8p12/sudo.c.ipv6	2006-07-16 23:33:58.000000000 +0200
+++ sudo-1.6.8p12/sudo.c	2006-07-16 23:33:58.000000000 +0200
@@ -1007,24 +1007,34 @@
 void
 set_fqdn()
 {
-    struct hostent *hp;
+    struct addrinfo hints, *ai;
     char *p;
 
-    if (!(hp = gethostbyname(user_host))) {
-	log_error(MSG_ONLY|NO_EXIT,
-	    "unable to lookup %s via gethostbyname()", user_host);
-    } else {
-	if (user_shost != user_host)
+    memset(&hints, '\0', sizeof(hints));
+    hints.ai_flags = AI_ADDRCONFIG;
+    
+    if (getaddrinfo(user_host, NULL, &hints, &ai) != 0)
+    {
+        log_error(MSG_ONLY|NO_EXIT,
+		"unable to lookup %s via gethostbyname()", user_host);
+    }
+    else
+    {
+	char h_name[NI_MAXHOST];
+
+        if (user_host != user_host)
 	    free(user_shost);
+
+	getnameinfo(ai->ai_addr, ai->ai_addrlen, h_name, sizeof(h_name), NULL, 0, 0);
 	free(user_host);
-	user_host = estrdup(hp->h_name);
+	user_host = estrdup(h_name);
     }
     if ((p = strchr(user_host, '.'))) {
-	*p = '\0';
-	user_shost = estrdup(user_host);
-	*p = '.';
+        *p = '\0';
+        user_shost = estrdup(user_host);
+        *p = '.';
     } else {
-	user_shost = user_host;
+        user_shost = user_host;
     }
 }
 
--- sudo-1.6.8p12/parse.yacc.ipv6	2005-06-19 20:24:32.000000000 +0200
+++ sudo-1.6.8p12/parse.yacc	2006-07-16 23:33:58.000000000 +0200
@@ -250,6 +250,7 @@
 %token <tok>	 RUNASALIAS		/* Runas_Alias keyword */
 %token <tok>	 ':' '=' ',' '!' '+' '-' /* union member tokens */
 %token <tok>	 ERROR
+%token <string>  NTWKADDR6		/* IPv6 address */
 
 /*
  * NOTE: these are not true booleans as there are actually 4 possible values:
@@ -395,6 +396,13 @@
 				$$ = NOMATCH;
 			    free($1);
 			}
+		|	NTWKADDR6 {
+			    if (addr6_matches($1))
+				$$ = TRUE;
+			    else
+				$$ = NOMATCH;
+			    free($1);
+			}
 		|	NETGROUP {
 			    if (netgr_matches($1, user_host, user_shost, NULL))
 				$$ = TRUE;
--- sudo-1.6.8p12/testsudoers.c.ipv6	2004-08-02 20:44:58.000000000 +0200
+++ sudo-1.6.8p12/testsudoers.c	2006-07-17 00:03:50.000000000 +0200
@@ -175,6 +175,10 @@
     }
 }
 
+/*
+ * Returns TRUE if "n" is one of our ip addresses or if
+ * "n" is a network that we are on, else returns FALSE.
+ */
 int
 addr_matches(n)
     char *n;
@@ -182,39 +186,136 @@
     int i;
     char *m;
     struct in_addr addr, mask;
+    struct addrinfo hints, *ai;
+
+    memset(&hints, '\0', sizeof(hints));
+    hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
+    hints.ai_family = AF_INET;
 
     /* If there's an explicit netmask, use it. */
     if ((m = strchr(n, '/'))) {
-	*m++ = '\0';
-	addr.s_addr = inet_addr(n);
-	if (strchr(m, '.'))
-	    mask.s_addr = inet_addr(m);
-	else {
-	    i = 32 - atoi(m);
-	    mask.s_addr = 0xffffffff;
-	    mask.s_addr >>= i;
-	    mask.s_addr <<= i;
-	    mask.s_addr = htonl(mask.s_addr);
-	}
-	*(m - 1) = '/';
 
-	for (i = 0; i < num_interfaces; i++)
-	    if ((interfaces[i].addr.s_addr & mask.s_addr) == addr.s_addr)
-		return(TRUE);
+        *m++ = '\0';
+        if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr.s_addr, &((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+                  sizeof(struct in_addr));
+        freeaddrinfo(ai);
+
+        if (strchr(m, '.'))
+        {
+            if (getaddrinfo(m, NULL, &hints, &ai)!=0)
+		return(FALSE);
+            memcpy(&mask.s_addr,    /* IPv4 netmask from dotted quad */
+                        &((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+                        sizeof(struct in_addr));
+        }
+        else
+        {
+            i = 32 - atoi(m);   /* IPv4 netmask from CIDR */
+            mask.s_addr = 0xffffffff;
+            mask.s_addr >>= i;
+            mask.s_addr <<= i;
+            mask.s_addr = htonl(mask.s_addr);
+        }
+
+        *(m - 1) = '/';
+
+        for (i = 0; i <  num_interfaces; ++i)
+            if (interfaces[i].sa_family == AF_INET)     /* IPv4 intf. only */
+                if ((interfaces[i].addr.s_addr & mask.s_addr) == addr.s_addr)
+                    return(TRUE);
     } else {
-	addr.s_addr = inet_addr(n);
-
-	for (i = 0; i < num_interfaces; i++)
-	    if (interfaces[i].addr.s_addr == addr.s_addr ||
-		(interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr)
-		== addr.s_addr)
-		return(TRUE);
+        if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr.s_addr, &((struct sockaddr_in *)ai->ai_addr)->sin_addr,
+                  sizeof(struct in_addr));
+        freeaddrinfo(ai);
+
+        for (i = 0; i < num_interfaces; i++)
+            if (interfaces[i].sa_family == AF_INET)     /* IPv4 intf. only */
+                if (interfaces[i].addr.s_addr == addr.s_addr ||
+                    (interfaces[i].addr.s_addr & interfaces[i].netmask.s_addr)
+                         == addr.s_addr)
+                    return(TRUE);
     }
 
     return(FALSE);
 }
 
 int
+addr6_matches(n)
+char *n;
+{
+    int i, j;
+    uint32_t msk[4] = {0, 0, 0, 0};     /* 32x4 */
+    uint32_t addr[4], i_msk[4], i_addr[4];
+    char *m;
+    struct addrinfo hints, *ai;
+
+    memset(&hints, '\0', sizeof(hints));
+    hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
+    hints.ai_family = AF_INET6;
+
+    /* we have IPv6 prefix */
+    if ((m = strchr(n, '/'))) {
+        *m++ = '\0';
+        if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr, &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, 16);
+        freeaddrinfo(ai);
+
+        for (i=0; i < (atoi(m)/32); ++i)
+            msk[i] = 0xffffffff;
+        if (atoi(m)<128 && (atoi(m) % 32))
+        {
+            msk[atoi(m)/32] = 0xffffffff;
+            msk[atoi(m)/32] >>= ( 32 - (atoi(m) % 32) );
+            msk[atoi(m)/32] <<= ( 32 - (atoi(m) % 32) );
+        }
+        for (i=0; i<4; ++i)
+            msk[i] = htonl(msk[i]);
+
+        *(m - 1) = '/';
+
+        for (i=0; i < num_interfaces; i++)
+            if (interfaces[i].sa_family == AF_INET6)    /* compare only IPv6 intf. */
+            {
+                /* nasty */
+                memcpy(&i_addr, &interfaces[i].addr6, 16);
+                if ( ((i_addr[0] & msk[0]) == addr[0]) &&
+                     ((i_addr[1] & msk[1]) == addr[1]) &&
+                     ((i_addr[2] & msk[2]) == addr[2]) &&
+                     ((i_addr[3] & msk[3]) == addr[3]))
+                    return (TRUE);
+            }
+    } else {
+        if (getaddrinfo(n, NULL, &hints, &ai)!=0)
+	    return(FALSE);
+        memcpy(&addr, &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr, 16);
+        freeaddrinfo(ai);
+
+        for (i=0; i < num_interfaces; ++i)
+            if (interfaces[i].sa_family == AF_INET6) /* IPv6 intf. only */
+            {
+                memcpy(&i_addr, &interfaces[i].addr6, 16);
+                if ((i_addr[0] == addr[0]) && (i_addr[1] == addr[1]) &&
+                    (i_addr[2] == addr[2]) && (i_addr[3] == addr[3]))
+                    return (TRUE); /* found my own address in sudoers */
+
+                memcpy(&i_msk, &interfaces[i].netmask6, 16);
+                if (((i_addr[0]&i_msk[0]) == addr[0]) &&
+                    ((i_addr[1]&i_msk[1]) == addr[1]) &&
+                    ((i_addr[2]&i_msk[2]) == addr[2]) &&
+                    ((i_addr[3]&i_msk[3]) == addr[3]))
+                    return (TRUE); /* found my netw. address in sudoers */
+            }
+    }
+    return(FALSE);
+}
+
+
+int
 hostname_matches(shost, lhost, pattern)
     char *shost;
     char *lhost;
--- sudo-1.6.8p12/interfaces.c.ipv6	2004-02-13 22:36:43.000000000 +0100
+++ sudo-1.6.8p12/interfaces.c	2006-07-16 23:33:58.000000000 +0200
@@ -102,7 +102,7 @@
 load_interfaces()
 {
     struct ifaddrs *ifa, *ifaddrs;
-    /* XXX - sockaddr_in6 sin6; */
+    struct sockaddr_in6 *sin6;
     struct sockaddr_in *sin;
     int i;
 
@@ -117,12 +117,15 @@
 	    continue;
 
 	switch(ifa->ifa_addr->sa_family) {
-	    /* XXX - AF_INET6 */
 	    case AF_INET:
 		num_interfaces++;
 		break;
+	    case AF_INET6:
+		num_interfaces++;
+		break;
 	}
     }
+
     if (num_interfaces == 0)
 	return;
     interfaces =
@@ -136,8 +139,8 @@
 		continue;
 
 	switch(ifa->ifa_addr->sa_family) {
-	    /* XXX - AF_INET6 */
 	    case AF_INET:
+		interfaces[i].sa_family = AF_INET;
 		sin = (struct sockaddr_in *)ifa->ifa_addr;
 		memcpy(&interfaces[i].addr, &sin->sin_addr,
 		    sizeof(struct in_addr));
@@ -146,6 +149,16 @@
 		    sizeof(struct in_addr));
 		i++;
 		break;
+	    case AF_INET6:
+		interfaces[i].sa_family = AF_INET6;
+		sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+		memcpy(&interfaces[i].addr6, &sin6->sin6_addr,
+		    sizeof(struct in6_addr));
+		sin6 = (struct sockaddr_in6 *)ifa->ifa_netmask;
+                memcpy(&interfaces[i].netmask6, &sin6->sin6_addr,
+                    sizeof(struct in6_addr));	
+		i++;
+		break;
 	}
     }
 #ifdef HAVE_FREEIFADDRS
@@ -306,10 +319,30 @@
 void
 dump_interfaces()
 {
-    int i;
+    int i, j, ip6_prefix=0; 	/* for counting IPv6 prefix length (in bits!!) */
+    uint8_t u6_addr8[16]; 	/* for storing IPv6 netmask */
 
     puts("Local IP address and netmask pairs:");
     for (i = 0; i < num_interfaces; i++)
-	printf("\t%s / 0x%x\n", inet_ntoa(interfaces[i].addr),
-	    (unsigned int)ntohl(interfaces[i].netmask.s_addr));
+    {
+	char name[NI_MAXHOST], netmask[NI_MAXHOST];
+	ip6_prefix=0;
+	
+	switch (interfaces[i].sa_family)
+	{
+	    case AF_INET:
+		inet_ntop(AF_INET, &interfaces[i].addr, name, NI_MAXHOST);
+		inet_ntop(AF_INET, &interfaces[i].netmask, netmask, NI_MAXHOST);
+		printf("\t%s / %s\n", name, netmask);
+		break;
+	    case AF_INET6:
+		inet_ntop(AF_INET6, &interfaces[i].addr6, name, NI_MAXHOST);
+		memcpy(u6_addr8, &interfaces[i].netmask6, 16);
+		for (j=0; j<16; ++j) 
+		    if (u6_addr8[j] == 255)		/* 255 == 0xff */
+			 ip6_prefix=ip6_prefix+8;	/* eight bits */
+		printf("\t%s / %d\n", name, ip6_prefix);
+		break;
+	}
+    }
 }

sudo-1.6.8p12-pam-login.patch:
 auth/pam.c   |    7 ++++++-
 config.h.in  |    3 +++
 configure.in |   11 +++++++++++
 env.c        |    5 ++---
 sudo.c       |    6 +++---
 sudo.h       |    1 +
 6 files changed, 26 insertions(+), 7 deletions(-)

--- NEW FILE sudo-1.6.8p12-pam-login.patch ---
--- sudo-1.6.8p12/configure.in.login	2006-07-16 15:25:33.000000000 +0200
+++ sudo-1.6.8p12/configure.in	2006-07-16 15:49:08.000000000 +0200
@@ -357,6 +357,17 @@
 		;;
 esac])
 
+AC_ARG_WITH(pam-login, [  --with-pam-login              enable specific PAM session for sudo -i],
+[case $with_pam_login in
+    yes)	AC_DEFINE(HAVE_PAM_LOGIN)
+		AC_MSG_CHECKING(whether to use PAM login)
+		AC_MSG_RESULT(yes)
+		;;
+    no)		;;
+    *)		AC_MSG_ERROR(["--with-pam-login does not take an argument."])
+		;;
+esac])
+
 AC_ARG_WITH(AFS, [  --with-AFS              enable AFS support],
 [case $with_AFS in
     yes)	AC_DEFINE(HAVE_AFS)
--- sudo-1.6.8p12/sudo.c.login	2006-07-16 15:39:26.000000000 +0200
+++ sudo-1.6.8p12/sudo.c	2006-07-16 15:41:42.000000000 +0200
@@ -109,7 +109,7 @@
 static struct passwd *get_authpw	__P((void));
 extern int sudo_edit			__P((int, char **));
 extern void list_matches		__P((void));
-extern char **rebuild_env		__P((char **, int, int));
+extern char **rebuild_env		__P((char **, int));
 extern char **zero_env			__P((char **));
 extern struct passwd *sudo_getpwnam	__P((const char *));
 extern struct passwd *sudo_getpwuid	__P((uid_t));
@@ -140,6 +140,7 @@
 #endif /* HAVE_BSD_AUTH_H */
 sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld;
 void (*set_perms) __P((int));
+int sudo_mode;
 
 
 int
@@ -151,7 +152,6 @@
     int validated;
     int fd;
     int cmnd_status;
-    int sudo_mode;
     int pwflag;
     char **new_environ;
     sigaction_t sa;
@@ -368,7 +368,7 @@
 
     /* Build a new environment that avoids any nasty bits if we have a cmnd. */
     if (ISSET(sudo_mode, MODE_RUN))
-	new_environ = rebuild_env(envp, sudo_mode, ISSET(validated, FLAG_NOEXEC));
+	new_environ = rebuild_env(envp, ISSET(validated, FLAG_NOEXEC));
     else
 	new_environ = envp;
 
--- sudo-1.6.8p12/auth/pam.c.login	2006-07-16 15:41:59.000000000 +0200
+++ sudo-1.6.8p12/auth/pam.c	2006-07-16 15:45:15.000000000 +0200
@@ -89,7 +89,12 @@
     if (auth != NULL)
 	auth->data = (VOID *) &pam_status;
     pam_conv.conv = sudo_conv;
-    pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh);
+#ifdef HAVE_PAM_LOGIN
+    if (ISSET(sudo_mode, MODE_LOGIN_SHELL))
+	    pam_status = pam_start("sudo-i", pw->pw_name, &pam_conv, &pamh);
+    else
+#endif
+	    pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh);
     if (pam_status != PAM_SUCCESS) {
 	log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM");
 	return(AUTH_FATAL);
--- sudo-1.6.8p12/env.c.login	2006-07-16 15:40:14.000000000 +0200
+++ sudo-1.6.8p12/env.c	2006-07-16 15:57:19.000000000 +0200
@@ -77,7 +77,7 @@
 /*
  * Prototypes
  */
-char **rebuild_env		__P((char **, int, int));
+char **rebuild_env		__P((char **, int));
 char **zero_env			__P((char **));
 static void insert_env		__P((char *, int));
 static char *format_env		__P((char *, ...));
@@ -321,9 +321,8 @@
  * Also adds sudo-specific variables (SUDO_*).
  */
 char **
-rebuild_env(envp, sudo_mode, noexec)
+rebuild_env(envp, noexec)
     char **envp;
-    int sudo_mode;
     int noexec;
 {
     char **ep, *cp, *ps1;
--- sudo-1.6.8p12/sudo.h.login	2006-07-16 15:59:08.000000000 +0200
+++ sudo-1.6.8p12/sudo.h	2006-07-16 15:59:38.000000000 +0200
@@ -251,6 +251,7 @@
 extern FILE *sudoers_fp;
 extern int tgetpass_flags;
 extern uid_t timestamp_uid;
+extern int sudo_mode;
 
 extern void (*set_perms) __P((int));
 #endif
--- sudo-1.6.8p12/config.h.in.login	2006-07-16 15:32:09.000000000 +0200
+++ sudo-1.6.8p12/config.h.in	2006-07-16 15:32:56.000000000 +0200
@@ -230,6 +230,9 @@
 /* Define to 1 if you use PAM authentication. */
 #undef HAVE_PAM
 
+/* Define to 1 if you use specific PAM session for sodo -i. */
+#undef HAVE_PAM_LOGIN
+
 /* Define to 1 if you have the <pam/pam_appl.h> header file. */
 #undef HAVE_PAM_PAM_APPL_H
 


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sudo.spec	12 Jul 2006 08:19:37 -0000	1.42
+++ sudo.spec	16 Jul 2006 22:37:37 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 6.1
+Release: 7
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -12,6 +12,8 @@
 BuildRequires: pam-devel
 BuildRequires: groff
 BuildRequires: openldap-devel
+BuildRequires: flex
+BuildRequires: bison
 
 # 154511 - sudo does not use limits.conf
 Patch2: sudo-1.6.8p8-pam-sess.patch
@@ -21,6 +23,10 @@
 Patch4: sudo-1.6.8p12-env-reset.patch
 # Default sudoers; require tty (#190062)
 Patch5: sudo-1.6.8p12-requiretty.patch
+# Use specific PAM session for sudo -i (#198755)
+Patch6: sudo-1.6.8p12-pam-login.patch
+# IPv6 support
+Patch7: sudo-1.6.8p12-ipv6.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -39,6 +45,8 @@
 %patch3 -p1 -b .strip
 %patch4 -p1 -b .env_reset
 %patch5 -p1 -b .tty
+%patch6 -p1 -b .login
+%patch7 -p1 -b .ipv6
 
 %build
 %ifarch s390 s390x
@@ -47,7 +55,10 @@
 F_PIE=-fpie
 %endif
 
-export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie" 
+# Note: there is a problem rebuild the ./configure script (for pam-login patch), 
+#       so we use -DHAVE_PAM_LOGIN rather than --with-pam-login... 
+#       (it's workaround that should be fixed)
+export CFLAGS="$RPM_OPT_FLAGS $F_PIE -DHAVE_PAM_LOGIN" LDFLAGS="-pie" 
 
 %configure \
 	--prefix=%{_prefix} \
@@ -75,6 +86,16 @@
 auth       include	system-auth
 account    include	system-auth
 password   include	system-auth
+session    optional	pam_keyinit.so revoke
+session    required	pam_limits.so
+EOF
+
+cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
+#%PAM-1.0
+auth       include	sudo
+account    include	sudo
+password   include	sudo
+session    optional	pam_keyinit.so force revoke
 session    required	pam_limits.so
 EOF
 
@@ -87,6 +108,7 @@
 %doc BUGS CHANGES HISTORY LICENSE README RUNSON TODO TROUBLESHOOTING UPGRADE *.pod
 %attr(0440,root,root) %config(noreplace) /etc/sudoers
 %config(noreplace) /etc/pam.d/sudo
+%config(noreplace) /etc/pam.d/sudo-i
 %dir /var/run/sudo
 %attr(4111,root,root) %{_bindir}/sudo
 %attr(4111,root,root) %{_bindir}/sudoedit
@@ -102,6 +124,11 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Sun Jul 16 2006 Karel Zak <kzak at redhat.com> 1.6.8p12-7
+- fix #198755 - make login processes (sudo -i) initialise session keyring
+  (thanks for PAM config files to David Howells)
+- add IPv6 support (patch by Milan Zazrivec)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.6.8p12-6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sun Jul 16 23:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 19:28:22 -0400
Subject: rpms/gtk2/devel gtk+-2.10.0-search.patch, 1.1, 1.2 gtk2.spec, 1.162,
	1.163
Message-ID: <200607162328.k6GNSMqN005313@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5298

Modified Files:
	gtk+-2.10.0-search.patch gtk2.spec 
Log Message:
fix some issues with the search support


gtk+-2.10.0-search.patch:
 gtkfilechooserdefault.c | 1427 +++++++++++++++++++++++++++++++++++++++---------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1227 insertions(+), 242 deletions(-)

Index: gtk+-2.10.0-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.0-search.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.10.0-search.patch	15 Jul 2006 05:07:49 -0000	1.1
+++ gtk+-2.10.0-search.patch	16 Jul 2006 23:28:19 -0000	1.2
@@ -1,5 +1,5 @@
---- gtk+-2.10.0/gtk/gtkfilechooserdefault.c.search	2006-07-15 01:02:27.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-15 01:02:42.000000000 -0400
+--- gtk+-2.10.0/gtk/gtkfilechooserdefault.c.search	2006-06-19 13:43:59.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-16 18:44:32.000000000 -0400
 @@ -78,6 +78,8 @@
  #include <errno.h>
  #include <string.h>
@@ -643,24 +643,18 @@
  
    if (list_selected)
      {
-@@ -1856,8 +2095,14 @@
+@@ -1856,8 +2095,8 @@
  
        pos = shortcut_find_position (impl, combo_selected);
        if (pos != -1)
 -	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
 -				  pos);
-+	{
-+	  gint search_separator_pos;
-+
-+	  search_separator_pos = shortcuts_get_index (impl, SHORTCUTS_SEARCH_SEPARATOR);
-+	  g_assert (pos >= search_separator_pos + 1);
-+	  gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo),
-+				    pos - (search_separator_pos + 1));
-+	}
++	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo),
++			          impl->has_search ? pos - 2 : pos);
        gtk_file_path_free (combo_selected);
      }
    
-@@ -1902,16 +2147,23 @@
+@@ -1902,16 +2141,18 @@
        if (base_path &&
  	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
  	{
@@ -678,17 +672,12 @@
 -    gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), pos);
 +  
 +  if (impl->save_folder_combo != NULL)
-+    {
-+      gint search_separator_pos;
-+      
-+      search_separator_pos = shortcuts_get_index (impl, SHORTCUTS_SEARCH_SEPARATOR);
-+      g_assert (pos >= search_separator_pos + 1);
-+      gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), pos - (search_separator_pos + 1));
-+    }
++    gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
++                              impl->has_search ? pos - 2 : pos);
  }
  
  /* Updates the current folder row in the shortcuts model */
-@@ -1933,9 +2185,9 @@
+@@ -1933,9 +2174,9 @@
  
  /* Filter function used for the shortcuts filter model */
  static gboolean
@@ -701,7 +690,7 @@
  {
    GtkFileChooserDefault *impl;
    GtkTreePath *path;
-@@ -1962,11 +2214,17 @@
+@@ -1962,11 +2203,17 @@
  					      GDK_TYPE_PIXBUF,	/* pixbuf */
  					      G_TYPE_STRING,	/* name */
  					      G_TYPE_POINTER,	/* path or volume */
@@ -720,7 +709,7 @@
    if (impl->file_system)
      {
        shortcuts_append_home (impl);
-@@ -1974,12 +2232,12 @@
+@@ -1974,12 +2221,12 @@
        shortcuts_add_volumes (impl);
      }
  
@@ -738,7 +727,7 @@
  					  impl,
  					  NULL);
  }
-@@ -2197,16 +2455,16 @@
+@@ -2197,16 +2444,16 @@
    for (i = 0; i < current_folder_separator_idx; i++)
      {
        gpointer col_data;
@@ -758,7 +747,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  	      GtkFilePath *base_path;
-@@ -2222,7 +2480,7 @@
+@@ -2222,7 +2469,7 @@
  	      if (exists)
  		return i;
  	    }
@@ -767,7 +756,7 @@
  	    {
  	      GtkFilePath *model_path;
  
-@@ -2328,7 +2586,7 @@
+@@ -2328,7 +2575,7 @@
    if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
      return FALSE;
  
@@ -776,7 +765,7 @@
  						    iter,
  						    &parent_iter);
    return TRUE;
-@@ -2351,11 +2609,12 @@
+@@ -2351,11 +2598,12 @@
  		      SHORTCUTS_COL_DATA, &col_data,
  		      SHORTCUTS_COL_REMOVABLE, &removable,
  		      -1);
@@ -790,7 +779,7 @@
    path = col_data;
  
    error = NULL;
-@@ -2512,6 +2771,16 @@
+@@ -2512,6 +2760,16 @@
    gboolean active;
    gchar *tip;
  
@@ -807,7 +796,7 @@
    selection_check (impl, &num_selected, NULL, &all_folders);
  
    if (num_selected == 0)
-@@ -3025,7 +3294,7 @@
+@@ -3025,7 +3283,7 @@
  {
    GtkTreeIter iter;
    gpointer col_data;
@@ -816,7 +805,7 @@
    GtkTreePath *path;
    int old_position;
    int bookmarks_index;
-@@ -3050,10 +3319,10 @@
+@@ -3050,10 +3308,10 @@
    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
  		      SHORTCUTS_COL_NAME, &name,
  		      SHORTCUTS_COL_DATA, &col_data,
@@ -829,7 +818,7 @@
    
    file_path = col_data;
    file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
-@@ -3137,17 +3406,11 @@
+@@ -3137,17 +3395,11 @@
  			      GtkTreeIter  *iter,
  			      gpointer      data)
  {
@@ -850,7 +839,7 @@
  }
  
  /* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3394,7 +3657,7 @@
+@@ -3394,7 +3646,7 @@
    /* Accessible object name for the file chooser's shortcuts pane */
    atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
  
@@ -859,7 +848,7 @@
  
    gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					  GDK_BUTTON1_MASK,
-@@ -3467,8 +3730,7 @@
+@@ -3467,8 +3719,7 @@
  
    gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					shortcuts_row_separator_func,
@@ -869,7 +858,7 @@
  
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
  
-@@ -3842,6 +4104,8 @@
+@@ -3842,6 +4093,8 @@
  {
    file_list_build_popup_menu (impl);
  
@@ -878,7 +867,7 @@
    /* The sensitivity of the Add to Bookmarks item is set in
     * bookmarks_check_add_sensitivity()
     */
-@@ -3941,6 +4205,28 @@
+@@ -3941,6 +4194,28 @@
    return TRUE;
  }
  
@@ -907,7 +896,7 @@
  /* Creates the widgets for the file list */
  static GtkWidget *
  create_file_list (GtkFileChooserDefault *impl)
-@@ -3954,7 +4240,7 @@
+@@ -3954,7 +4229,7 @@
  
    swin = gtk_scrolled_window_new (NULL, NULL);
    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -916,7 +905,7 @@
    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
  				       GTK_SHADOW_IN);
  
-@@ -4044,6 +4330,7 @@
+@@ -4044,6 +4319,7 @@
    gtk_tree_view_column_set_sort_column_id (column, FILE_LIST_COL_SIZE);
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_files_tree_view), column);
  #endif
@@ -924,7 +913,7 @@
    /* Modification time column */
  
    column = gtk_tree_view_column_new ();
-@@ -4054,8 +4341,11 @@
+@@ -4054,8 +4330,11 @@
    gtk_tree_view_column_pack_start (column, renderer, TRUE);
    gtk_tree_view_column_set_cell_data_func (column, renderer,
  					   list_mtime_data_func, impl, NULL);
@@ -937,7 +926,7 @@
    gtk_widget_show_all (swin);
  
    return swin;
-@@ -4162,9 +4452,56 @@
+@@ -4162,9 +4441,59 @@
      return;
  
    if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -977,14 +966,17 @@
 +
 +  retval = TRUE;
 +
-+  idx = shortcuts_get_index (impl, SHORTCUTS_SEARCH);
-+  if (idx == indices[0])
-+    retval = FALSE;
-+  else
++  if (impl->has_search)
 +    {
-+      idx = shortcuts_get_index (impl, SHORTCUTS_SEARCH_SEPARATOR);
++      idx = shortcuts_get_index (impl, SHORTCUTS_SEARCH);
 +      if (idx == indices[0])
-+	retval = FALSE;
++        retval = FALSE;
++      else
++        {
++          idx = shortcuts_get_index (impl, SHORTCUTS_SEARCH_SEPARATOR);
++          if (idx == indices[0])
++	    retval = FALSE;
++        }
 +    }
 +
 +  gtk_tree_path_free (tree_path);
@@ -995,7 +987,7 @@
  /* Creates the combo box with the save folders */
  static GtkWidget *
  save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4172,8 +4509,14 @@
+@@ -4172,8 +4501,14 @@
    GtkWidget *combo;
    GtkCellRenderer *cell;
  
@@ -1011,7 +1003,7 @@
  			"focus-on-click", FALSE,
                          NULL);
    gtk_widget_show (combo);
-@@ -4195,8 +4538,7 @@
+@@ -4195,8 +4530,7 @@
  
    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
  					shortcuts_row_separator_func,
@@ -1021,7 +1013,7 @@
  
    g_signal_connect (combo, "changed",
  		    G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4521,6 +4863,7 @@
+@@ -4521,6 +4855,7 @@
    GtkWidget *hpaned;
    GtkWidget *widget;
    GtkSizeGroup *size_group;
@@ -1029,7 +1021,7 @@
  
    /* size group is used by the [+][-] buttons and the filter combo */
    size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-@@ -4530,6 +4873,7 @@
+@@ -4530,6 +4865,7 @@
    hbox = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show (hbox);
@@ -1037,7 +1029,7 @@
  
    location_button_create (impl);
    gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -4552,7 +4896,10 @@
+@@ -4552,7 +4888,10 @@
    impl->location_entry_box = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0);
  
@@ -1049,7 +1041,7 @@
    gtk_label_set_use_markup (GTK_LABEL (impl->location_label), TRUE);
    gtk_widget_show (impl->location_label);
    gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0);
-@@ -5116,6 +5463,9 @@
+@@ -5116,6 +5455,9 @@
        impl->shortcuts_activate_iter_handle = NULL;
      }
  
@@ -1059,7 +1051,7 @@
    remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
  
    G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5387,31 +5737,32 @@
+@@ -5387,31 +5729,32 @@
  
    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
  
@@ -1117,7 +1109,7 @@
  
    bookmarks_changed_cb (impl->file_system, impl);
  
-@@ -5883,12 +6234,6 @@
+@@ -5883,12 +6226,6 @@
         * but rather on behalf of something else like GtkFileChooserButton.  In
         * that case, the chooser's selection should be what the caller expects,
         * as the user can't see that something else got selected.  See bug #165264.
@@ -1130,7 +1122,7 @@
         */
        if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
  	browse_files_select_first_row (impl);
-@@ -5937,17 +6282,11 @@
+@@ -5937,17 +6274,11 @@
    profile_end ("end", NULL);
  }
  
@@ -1151,7 +1143,7 @@
    if (impl->browse_files_model)
      {
        g_object_unref (impl->browse_files_model);
-@@ -5959,6 +6298,20 @@
+@@ -5959,6 +6290,20 @@
        g_object_unref (impl->sort_model);
        impl->sort_model = NULL;
      }
@@ -1172,7 +1164,7 @@
  
    set_busy_cursor (impl, TRUE);
    gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6018,6 +6371,9 @@
+@@ -6018,6 +6363,9 @@
    if (impl->processing_pending_selections)
      return;
  
@@ -1182,7 +1174,7 @@
    if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
  	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
  	|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6047,25 +6403,34 @@
+@@ -6047,25 +6395,34 @@
      }
    else if (closure.num_selected == 1)
      {
@@ -1232,7 +1224,7 @@
      }
    else
      {
-@@ -6188,6 +6553,8 @@
+@@ -6188,6 +6545,8 @@
  
    profile_start ("start", (char *) path);
  
@@ -1241,7 +1233,7 @@
    g_assert (path != NULL);
  
    if (impl->local_only &&
-@@ -6229,6 +6596,9 @@
+@@ -6229,6 +6588,9 @@
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
  
@@ -1251,7 +1243,7 @@
    if (impl->reload_state == RELOAD_EMPTY)
      {
        char *current_working_dir;
-@@ -6289,9 +6659,9 @@
+@@ -6289,9 +6651,9 @@
      return FALSE;
  
    if (!parent_path)
@@ -1263,7 +1255,7 @@
      same_path = FALSE;
    else
      {
-@@ -6387,6 +6757,16 @@
+@@ -6387,6 +6749,16 @@
  gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -1280,7 +1272,7 @@
    if (impl->select_multiple)
      gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model), 
  			    maybe_select, impl);
-@@ -6517,6 +6897,9 @@
+@@ -6517,6 +6889,9 @@
    GtkWindow *toplevel;
    GtkWidget *current_focus;
  
@@ -1290,7 +1282,7 @@
    info.impl = impl;
    info.result = NULL;
    info.path_from_entry = NULL;
-@@ -6734,7 +7117,7 @@
+@@ -6734,7 +7109,7 @@
  
    pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
  
@@ -1299,7 +1291,7 @@
  
  out:
    g_object_unref (data->impl);
-@@ -6848,15 +7231,15 @@
+@@ -6848,15 +7223,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -1318,7 +1310,7 @@
  
        shortcut = col_data;
        if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -6905,15 +7288,15 @@
+@@ -6905,15 +7280,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -1337,7 +1329,7 @@
  
        shortcut = col_data;
        list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7248,6 +7631,23 @@
+@@ -7248,6 +7623,23 @@
      }
  }
  
@@ -1361,7 +1353,7 @@
  static void
  action_create_folder_cb (GtkFileSystemHandle *handle,
  			 const GtkFilePath   *path,
-@@ -7447,6 +7847,9 @@
+@@ -7447,6 +7839,9 @@
  
        g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
  
@@ -1371,7 +1363,7 @@
        selection_check (impl, &num_selected, &all_files, &all_folders);
  
        if (num_selected > 2)
-@@ -7603,7 +8006,7 @@
+@@ -7603,7 +7998,7 @@
  	{
  	  shortcuts_activate_iter (impl, &iter);
  	  
@@ -1380,7 +1372,7 @@
  	}
        else
  	goto file_list;
-@@ -7617,6 +8020,11 @@
+@@ -7617,6 +8012,11 @@
         */
        goto file_list;
      }
@@ -1392,7 +1384,7 @@
    else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
      {
        /* The focus is on a dialog's action area button, *and* the widget that
-@@ -7666,14 +8074,464 @@
+@@ -7666,17 +8066,467 @@
    gtk_widget_grab_focus (widget);
  }
  
@@ -1408,11 +1400,13 @@
 -  if (impl->current_filter != filter)
 -    {
 -      int filter_index;
--
 +  GSList **list;
 +  const GtkFilePath *file_path;
 +  GtkFilePath *file_path_copy;
-+
+ 
+-      /* NULL filters are allowed to reset to non-filtered status
+-       */
+-      filter_index = g_slist_index (impl->filters, filter);
 +  list = data;
 +
 +  gtk_tree_model_get (model, iter, SEARCH_MODEL_COL_PATH, &file_path, -1);
@@ -1860,10 +1854,13 @@
 +    {
 +      int filter_index;
 +
-       /* NULL filters are allowed to reset to non-filtered status
-        */
-       filter_index = g_slist_index (impl->filters, filter);
-@@ -7714,28 +8572,43 @@
++      /* NULL filters are allowed to reset to non-filtered status
++       */
++      filter_index = g_slist_index (impl->filters, filter);
+       if (impl->filters && filter && filter_index < 0)
+ 	return;
+ 
+@@ -7714,28 +8564,43 @@
  {
    GtkTreePath *cursor_path;
    const GtkFilePath *new_path;
@@ -1924,7 +1921,7 @@
      }
  
    if (new_path != impl->preview_path &&
-@@ -7751,7 +8624,7 @@
+@@ -7751,7 +8616,7 @@
        if (new_path)
  	{
  	  impl->preview_path = gtk_file_path_copy (new_path);
@@ -1933,7 +1930,7 @@
  	}
        else
  	{
-@@ -7820,6 +8693,8 @@
+@@ -7820,6 +8685,8 @@
  {
    GtkFilePath *path;
  
@@ -1942,7 +1939,7 @@
    /* We ref the file chooser since volume_mount() may run a main loop, and the
     * user could close the file chooser window in the meantime.
     */
-@@ -7840,6 +8715,8 @@
+@@ -7840,6 +8707,8 @@
        if (path != NULL)
          {
            change_folder_and_display_error (impl, path);
@@ -1951,7 +1948,7 @@
            gtk_file_path_free (path);
          }
      }
-@@ -7872,7 +8749,10 @@
+@@ -7872,7 +8741,10 @@
      goto out;
  
    if (!error && gtk_file_info_get_is_folder (info))
@@ -1963,7 +1960,7 @@
    else
      gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
  
-@@ -7889,31 +8769,30 @@
+@@ -7889,31 +8761,30 @@
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -2003,7 +2000,7 @@
      {
        struct ShortcutsActivateData *data;
  
-@@ -7926,6 +8805,10 @@
+@@ -7926,6 +8797,10 @@
  				  GTK_FILE_INFO_IS_FOLDER,
  				  shortcuts_activate_get_info_cb, data);
      }
@@ -2014,7 +2011,7 @@
  }
  
  /* Callback used when a row in the shortcuts list is activated */
-@@ -7938,15 +8821,13 @@
+@@ -7938,15 +8813,13 @@
    GtkTreeIter iter;
    GtkTreeIter child_iter;
  
@@ -2032,7 +2029,7 @@
  }
  
  /* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -7986,8 +8867,15 @@
+@@ -7986,8 +8859,15 @@
  			gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2049,7 +2046,7 @@
  }
  
  static gboolean
-@@ -7999,6 +8887,9 @@
+@@ -7999,6 +8879,9 @@
  {
    GtkFileChooserDefault *impl = data;
  
@@ -2059,7 +2056,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
        impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
      {
-@@ -8024,7 +8915,7 @@
+@@ -8024,7 +8907,7 @@
  			GtkFileChooserDefault *impl)
  {
    /* See if we are in the new folder editable row for Save mode */
@@ -2068,7 +2065,7 @@
      {
        const GtkFileInfo *info;
        gboolean had_selection;
-@@ -8039,6 +8930,8 @@
+@@ -8039,6 +8922,8 @@
  
   out:
  
@@ -2077,7 +2074,7 @@
    update_chooser_entry (impl);
    check_preview_change (impl);
    bookmarks_check_add_sensitivity (impl);
-@@ -8056,6 +8949,12 @@
+@@ -8056,6 +8941,12 @@
    GtkTreeIter iter, child_iter;
    const GtkFileInfo *info;
  
@@ -2090,7 +2087,7 @@
    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
      return;
  
-@@ -8126,6 +9025,15 @@
+@@ -8126,6 +9017,15 @@
    const GtkFileInfo *info; 
    gboolean sensitive = TRUE;
  
@@ -2106,7 +2103,7 @@
    profile_start ("start", NULL);
    
    info = get_list_file_info (impl, iter);
-@@ -8175,13 +9083,33 @@
+@@ -8175,13 +9075,33 @@
  		     gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2142,7 +2139,7 @@
  		    NULL);
  
        return;
-@@ -8197,6 +9125,7 @@
+@@ -8197,6 +9117,7 @@
    g_object_set (cell,
  		"text", gtk_file_info_get_display_name (info),
  		"sensitive", sensitive,
@@ -2150,7 +2147,7 @@
  		NULL);
  }
  
-@@ -8258,7 +9187,6 @@
+@@ -8258,7 +9179,6 @@
  		      gpointer           data)
  {
    GtkFileChooserDefault *impl;
@@ -2158,7 +2155,7 @@
    GtkFileTime time_mtime;
    GDate mtime, now;
    int days_diff;
-@@ -8267,17 +9195,35 @@
+@@ -8267,17 +9187,35 @@
  
    impl = data;
  
@@ -2202,7 +2199,7 @@
  
    if (time_mtime == 0)
      strcpy (buf, _("Unknown"));
-@@ -8308,10 +9254,6 @@
+@@ -8308,10 +9246,6 @@
  	}
      }
  
@@ -2213,7 +2210,7 @@
    g_object_set (cell,
  		"text", buf,
  		"sensitive", sensitive,
-@@ -8329,7 +9271,23 @@
+@@ -8329,7 +9263,23 @@
  static void
  location_popup_handler (GtkFileChooserDefault *impl,
  			const gchar           *path)
@@ -2238,7 +2235,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
        || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
      {
-@@ -8379,6 +9337,7 @@
+@@ -8379,6 +9329,7 @@
      g_assert_not_reached ();
  
    shortcuts_activate_iter (impl, &iter);
@@ -2246,7 +2243,7 @@
  }
  
  /* Handler for the "home-folder" keybinding signal */
-@@ -8423,26 +9382,26 @@
+@@ -8423,26 +9374,26 @@
  /* Drag and drop interfaces */
  
  static void
@@ -2279,7 +2276,7 @@
  
    pos = *gtk_tree_path_get_indices (path);
    bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8452,13 +9411,13 @@
+@@ -8452,13 +9403,13 @@
  
  /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
  static gboolean
@@ -2298,7 +2295,7 @@
  
    /* FIXME */
  
-@@ -8467,30 +9426,30 @@
+@@ -8467,30 +9418,30 @@
  
  /* Fill the GtkTreeDragSourceIface vtable */
  static void
@@ -2340,8 +2337,8 @@
  			"child-model", child_model,
  			"virtual-root", root,
  			NULL);
---- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-07-15 01:02:18.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-15 01:02:42.000000000 -0400
+--- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-05-03 18:29:48.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-16 16:22:45.000000000 -0400
 @@ -147,6 +147,20 @@
    LOCATION_MODE_FILENAME_ENTRY
  } LocationMode;


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gtk2.spec	15 Jul 2006 05:07:49 -0000	1.162
+++ gtk2.spec	16 Jul 2006 23:28:19 -0000	1.163
@@ -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
@@ -277,6 +277,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sun Jul 16 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-3
+- Fix a problem with the Search support
+
 * Sat Jul 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-2
 - Add Search support to the filechooser
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 01:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 21:34:44 -0400
Subject: rpms/m4/devel .cvsignore,1.5,1.6 m4.spec,1.21,1.22 sources,1.5,1.6
Message-ID: <200607170134.k6H1Yiqr013143@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13074

Modified Files:
	.cvsignore m4.spec sources 
Log Message:
* Mon Jul 17 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.5-1
- Update to m4-1.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2005 17:31:37 -0000	1.5
+++ .cvsignore	17 Jul 2006 01:34:39 -0000	1.6
@@ -1,2 +1,2 @@
-m4-1.4.4.tar.bz2
-m4-1.4.4.tar.bz2.sig
+m4-1.4.5.tar.bz2
+m4-1.4.5.tar.bz2.sig


Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- m4.spec	12 Jul 2006 07:16:57 -0000	1.21
+++ m4.spec	17 Jul 2006 01:34:39 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
-Version: 1.4.4
-Release: 1.2.2
+Version: 1.4.5
+Release: 1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -34,9 +34,10 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 %{_bindir}/m4
 %{_infodir}/*
+%{_mandir}/man1/m4.1*
 
 %post
 /sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir
@@ -50,6 +51,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 17 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.5-1
+- Update to m4-1.4.5
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-1.2.2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2005 17:31:37 -0000	1.5
+++ sources	17 Jul 2006 01:34:39 -0000	1.6
@@ -1,2 +1,2 @@
-eb93bfbcb12cf00165583302bb31a822  m4-1.4.4.tar.bz2
-448fe3e059e84c131ed117dd3fd0c281  m4-1.4.4.tar.bz2.sig
+8bcd8244d5bed9f8e2d5f05ad693b8b4  m4-1.4.5.tar.bz2
+89e97964cc3999c1643d3ab1098444a9  m4-1.4.5.tar.bz2.sig



From fedora-cvs-commits at redhat.com  Mon Jul 17 03:09:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 16 Jul 2006 23:09:51 -0400
Subject: rpms/gdm/devel gdm-2.15.6-wtmp.patch, NONE,
	1.1 gdm-2.15.5-security-tokens.patch, 1.3, 1.4 gdm.spec, 1.174,
	1.175
Message-ID: <200607170309.k6H39p4r006390@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6315

Modified Files:
	gdm-2.15.5-security-tokens.patch gdm.spec 
Added Files:
	gdm-2.15.6-wtmp.patch 
Log Message:
- add initial wtmp and btmp logging support

* Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-4
- fix bug in security token support


gdm-2.15.6-wtmp.patch:
 config/PreSession.in |   13 ----
 daemon/slave.c       |   21 +++++++
 daemon/verify-pam.c  |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++
 daemon/verify.h      |   13 ++++
 4 files changed, 167 insertions(+), 14 deletions(-)

--- NEW FILE gdm-2.15.6-wtmp.patch ---
--- gdm-2.15.6/config/PreSession.in
+++ gdm-2.15.6/config/PreSession.in
@@ -68,17 +68,4 @@ if [ "x$XSETROOT" != "x" ] ; then
 	"$XSETROOT" -cursor_name left_ptr -solid "$BACKCOLOR"
 fi
 
-
-SESSREG=`gdmwhich sessreg`
-if [ "x$SESSREG" != "x" ] ; then
-	# some output for easy debugging
-	echo "$0: Registering your session with wtmp and utmp"
-	echo "$0: running: $SESSREG -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l \"$DISPLAY\" \"$USER\""
-
-	exec "$SESSREG" -a -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
-	# this is not reached
-fi
-
-# some output for easy debugging
-echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"
 exit 0
--- gdm-2.15.6/daemon/slave.c
+++ gdm-2.15.6/daemon/slave.c
@@ -4315,6 +4315,14 @@ gdm_slave_session_start (void)
     g_free (language);
     g_free (gnome_session);
 
+    gdm_verify_write_record (d,
+			     GDM_VERIFY_RECORD_TYPE_LOGIN,
+			     pwent->pw_name,
+			     d->name, 
+			     !d->attached? d->hostname : NULL,
+			     pid);
+
+
     gdm_slave_send_num (GDM_SOP_SESSPID, pid);
 
     gdm_sigchld_block_push ();
@@ -4363,6 +4371,17 @@ gdm_slave_session_start (void)
 				uid, gid);
     }
 
+    if ((pid != 0) && (d->last_sess_status != -1)) {
+	    gdm_debug ("session '%d' exited with status '%d', recording logout",
+		       pid, d->last_sess_status);
+	    gdm_verify_write_record (d,
+				     GDM_VERIFY_RECORD_TYPE_LOGOUT,
+				     pwent->pw_name,
+				     d->name, 
+				     !d->attached? d->hostname : NULL,
+				     pid);
+    }
+
     gdm_slave_session_stop (pid != 0 /* run_post_session */,
 			    FALSE /* no_shutdown_check */);
 
@@ -4724,7 +4743,7 @@ gdm_slave_child_handler (int sig)
 		}
 	} else if (pid != 0 && pid == d->sesspid) {
 		d->sesspid = 0;
-		if (WIFEXITED (status))
+		if (WIFEXITED (status)) 
 			d->last_sess_status = WEXITSTATUS (status);
 		else
 			d->last_sess_status = -1;
--- gdm-2.15.6/daemon/verify-pam.c
+++ gdm-2.15.6/daemon/verify-pam.c
@@ -30,6 +30,8 @@ #ifdef sun
 #include <fcntl.h>
 #endif
 
+#include <utmp.h>
+
 #include <gligdm-2.15.6/gi18n.h>
 
 #include "gdm.h"
@@ -47,6 +49,14 @@ #include <bsm/adt.h>
 #include <bsm/adt_event.h>
 #endif	/* HAVE_ADT */
 
+#ifndef GDM_BAD_RECORDS_FILE
+#define GDM_BAD_RECORDS_FILE "/var/log/btmp"
+#endif
+
+#ifndef GDM_NEW_RECORDS_FILE
+#define GDM_NEW_RECORDS_FILE "/var/log/wtmp"
+#endif
+
 /* Evil, but this way these things are passed to the child session */
 static pam_handle_t *pamh = NULL;
 
@@ -409,6 +419,125 @@ gdm_verify_select_user (const char *user
 		selected_user = g_strdup (user);
 }
 
+void   
+gdm_verify_write_record (GdmDisplay *d,
+			 GdmVerifyRecordType record_type,
+			 const gchar *username,
+			 const gchar *console_name,
+			 const gchar *host_name,
+			 GPid  pid)
+{
+    struct utmp record = { 0 };
+    GTimeVal now = { 0 };
+    gchar *host;
+
+    gdm_debug ("writing %s record",
+	       record_type == GDM_VERIFY_RECORD_TYPE_LOGIN? "session" :
+	       record_type == GDM_VERIFY_RECORD_TYPE_LOGOUT?  "logout" :
+	       "failed session attempt");
+
+    if (record_type != GDM_VERIFY_RECORD_TYPE_LOGOUT)
+    {
+	    /* it's possible that PAM failed before
+	     * it mapped the user input into a valid username
+	     * so we fallback to try using "(unknown)"
+	     */
+	    if (username != NULL)
+		    strncpy (record.ut_user,
+			     username, 
+			     sizeof (record.ut_user));
+	    else
+		    strncpy (record.ut_user,
+			     "(unknown)",
+			     sizeof (record.ut_user));
+    }
+
+    gdm_debug ("using username %.*s",
+	       sizeof (record.ut_user),
+	       record.ut_user);
+
+    strncpy (record.ut_id, 
+	     console_name + 
+	     strlen (console_name) - 
+	     sizeof (record.ut_id),
+	     sizeof (record.ut_id));
+
+    gdm_debug ("using id %.*s",
+	       sizeof (record.ut_id),
+	       record.ut_id);
+
+    if (g_str_has_prefix (console_name, "/dev/")) {
+	    strncpy (record.ut_line, 
+		     console_name + strlen ("/dev/"),
+		     sizeof (record.ut_line));
+    } else if (g_str_has_prefix (console_name, ":")) {
+	    strncpy (record.ut_line, 
+		     console_name,
+		     sizeof (record.ut_line));
+    }
+
+    gdm_debug ("using line %.*s",
+	       sizeof (record.ut_line),
+	       record.ut_line);
+
+    host = NULL;
+    if ((host_name != NULL) &&
+	g_str_has_prefix (console_name, ":"))
+	    host = g_strdup_printf ("%s%s",
+				    host_name,
+				    console_name);
+    else if ((host_name != NULL) && 
+	     !strstr (console_name, ":"))
+	    host = g_strdup (host_name);
+    else if (!g_str_has_prefix (console_name, ":") &&
+	     strstr (console_name, ":"))
+	    host = g_strdup (console_name);
+
+    if (host)
+    {
+	    strncpy (record.ut_host, host, sizeof (record.ut_host));
+	    g_free (host);
+	    gdm_debug ("using hostname %.*s",
+		       sizeof (record.ut_host),
+		       record.ut_host);
+    }
+
+    g_get_current_time (&now);
+    record.ut_tv.tv_sec = now.tv_sec;
+    record.ut_tv.tv_usec = now.tv_usec;
+
+    gdm_debug ("using time %ld", (glong) record.ut_tv.tv_sec);
+
+    record.ut_type = USER_PROCESS; 
+    gdm_debug ("using type USER_PROCESS"); 
+
+    record.ut_pid = pid;
+
+    gdm_debug ("using pid %d", (gint) record.ut_pid);
+
+    switch (record_type)
+    {
+	    case GDM_VERIFY_RECORD_TYPE_LOGIN:
+		    gdm_debug ("writing session record to " 
+			       GDM_NEW_RECORDS_FILE);
+		    updwtmp (GDM_NEW_RECORDS_FILE, &record);
+		    break;
+
+	    case GDM_VERIFY_RECORD_TYPE_LOGOUT: 
+		    gdm_debug ("writing logout record to " 
+			       GDM_NEW_RECORDS_FILE);
+		    updwtmp (GDM_NEW_RECORDS_FILE, &record);
+		    break;
+
+	    case GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT:
+		    gdm_debug ("writing failed session attempt record to " 
+			       GDM_BAD_RECORDS_FILE);
+		    updwtmp (GDM_BAD_RECORDS_FILE, &record);
+		    break;
+    }
+
+}
+
 static const char *
 perhaps_translate_message (const char *msg)
 {
@@ -1099,6 +1228,11 @@ #ifdef  HAVE_ADT
     audit_fail_login (d, pw_change, pwent, pamerr);
 #endif	/* HAVE_ADT */
 
+    gdm_verify_write_record (d, GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT,
+			     login == NULL? tmp_PAM_USER : login, display, 
+			     d->attached? NULL : d->hostname,
+			     getpid ());
+
     /* The verbose authentication is turned on, output the error
      * message from the PAM subsystem */
     if ( ! error_msg_given &&
--- gdm-2.15.6/daemon/verify.h
+++ gdm-2.15.6/daemon/verify.h
@@ -21,6 +21,12 @@ #define GDM_VERIFY_H
 
 #include "gdm.h"
 
+typedef enum {
+	GDM_VERIFY_RECORD_TYPE_LOGIN,
+	GDM_VERIFY_RECORD_TYPE_LOGOUT,
+	GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT
+} GdmVerifyRecordType;
+
 /* If username is NULL, we ask, if local is FALSE, don't start
  * the timed login timer */
 gchar *gdm_verify_user    (GdmDisplay *d,
@@ -30,6 +36,13 @@ gchar *gdm_verify_user    (GdmDisplay *d
 void   gdm_verify_cleanup (GdmDisplay *d);
 void   gdm_verify_check   (void);
 void   gdm_verify_select_user (const char *user);
+void   gdm_verify_write_record (GdmDisplay *d,
+				GdmVerifyRecordType record_type,
+				const gchar *username,
+				const gchar *console_name,
+				const gchar *host_name,
+				GPid  pid);
+
 /* used in pam */
 gboolean gdm_verify_setup_env (GdmDisplay *d);
 gboolean gdm_verify_setup_user (GdmDisplay *d,

gdm-2.15.5-security-tokens.patch:
 config/Makefile.am              |    4 
 config/gdm                      |   17 
 config/gdm-autologin            |   10 
 config/gdm-securitytokens       |   11 
 config/gdm.conf.in              |    7 
 configure.ac                    |    3 
 daemon/Makefile.am              |    7 
 daemon/gdm.c                    |  108 +++++
 daemon/gdm.h                    |    5 
 daemon/gdmconfig.c              |   35 +
 daemon/gdmconfig.h              |    3 
 daemon/securitytoken.c          |  579 ++++++++++++++++++++++++++++
 daemon/securitytoken.h          |   98 ++++
 daemon/securitytokenmonitor.c   |  817 +++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h   |   81 +++
 daemon/verify-pam.c             |    5 
 utils/gdmsecuritytokenmonitor.c |  197 +++++++++
 utils/securitytoken.c           |  573 +++++++++++++++++++++++++++
 utils/securitytoken.h           |   97 ++++
 utils/securitytokenmonitor.c    |  819 ++++++++++++++++++++++++++++++++++++++++
 utils/securitytokenmonitor.h    |   82 ++++
 21 files changed, 3543 insertions(+), 15 deletions(-)

Index: gdm-2.15.5-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-security-tokens.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdm-2.15.5-security-tokens.patch	14 Jul 2006 14:49:19 -0000	1.3
+++ gdm-2.15.5-security-tokens.patch	17 Jul 2006 03:09:48 -0000	1.4
@@ -1,6 +1,6 @@
 --- gdm-2.15.6/config/gdm-autologin.security-tokens	2003-08-04 18:24:21.000000000 +0200
-+++ gdm-2.15.6/config/gdm-autologin	2006-07-14 10:44:47.000000000 +0200
-@@ -1,8 +1,9 @@
++++ gdm-2.15.6/config/gdm-autologin	2006-07-14 10:53:01.000000000 +0200
+@@ -1,8 +1,10 @@
  #%PAM-1.0
  auth       required	pam_env.so
 -auth       required	pam_nologin.so
@@ -11,12 +11,13 @@
 +account    required     pam_nologin.so
 +account    include      system-auth
 +password   include      system-auth
++session    optional     pam_keyinit.so force revoke
 +session    include      system-auth
 +session    required     pam_loginuid.so
  session    optional     pam_console.so
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/config/gdm-securitytokens	2006-07-14 10:43:37.000000000 +0200
-@@ -0,0 +1,10 @@
++++ gdm-2.15.6/config/gdm-securitytokens	2006-07-14 10:53:01.000000000 +0200
+@@ -0,0 +1,11 @@
 +#%PAM-1.0
 +auth       required	pam_env.so
 +auth       sufficient   pam_pkcs11.so
@@ -24,12 +25,13 @@
 +account    required     pam_nologin.so
 +account    include      system-auth
 +password   include      system-auth
++session    optional     pam_keyinit.so force revoke
 +session    include      system-auth
 +session    required     pam_loginuid.so
 +session    optional     pam_console.so
 --- gdm-2.15.6/config/gdm.security-tokens	2003-08-04 18:24:21.000000000 +0200
-+++ gdm-2.15.6/config/gdm	2006-07-14 10:43:37.000000000 +0200
-@@ -1,8 +1,10 @@
++++ gdm-2.15.6/config/gdm	2006-07-14 10:53:01.000000000 +0200
+@@ -1,8 +1,11 @@
  #%PAM-1.0
 -auth       required	pam_env.so
 -auth       required	pam_stack.so service=system-auth
@@ -43,13 +45,14 @@
 +account    required    pam_nologin.so
 +account    include     system-auth
 +password   include     system-auth
++session    optional     pam_keyinit.so force revoke
 +session    include     system-auth
 +session    required    pam_loginuid.so
 +session    optional    pam_console.so
 +
 --- gdm-2.15.6/config/Makefile.am.security-tokens	2006-05-18 20:39:13.000000000 +0200
-+++ gdm-2.15.6/config/Makefile.am	2006-07-14 10:43:37.000000000 +0200
-@@ -26,6 +26,7 @@
++++ gdm-2.15.6/config/Makefile.am	2006-07-14 10:53:01.000000000 +0200
+@@ -26,6 +26,7 @@ EXTRA_DIST = \
  	Xsession.in \
  	gdm \
  	gdm-autologin \
@@ -57,7 +60,7 @@
  	locale.alias \
  	Init.in \
  	PreSession.in \
-@@ -237,6 +238,9 @@
+@@ -237,6 +238,9 @@ install-data-hook: gdm.conf gdm.conf-cus
  	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \
  		$(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
  	   fi; \
@@ -67,9 +70,9 @@
  	   if test $$system = SunOS; then \
  		echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
  	   fi; \
---- gdm-2.15.6/config/gdm.conf.in.security-tokens	2006-07-14 10:43:36.000000000 +0200
-+++ gdm-2.15.6/config/gdm.conf.in	2006-07-14 10:43:37.000000000 +0200
-@@ -193,6 +193,10 @@
+--- gdm-2.15.6/config/gdm.conf.in.security-tokens	2006-07-14 10:53:00.000000000 +0200
++++ gdm-2.15.6/config/gdm.conf.in	2006-07-14 10:53:01.000000000 +0200
+@@ -193,6 +193,10 @@ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONF
  # kills it.  10 seconds should be long enough for X, but Xgl may need 20 or 25. 
  GdmXserverTimeout=10
  
@@ -80,7 +83,7 @@
  [security]
  # Allow root to login.  It makes sense to turn this off for kiosk use, when
  # you want to minimize the possibility of break in.
-@@ -239,6 +243,9 @@
+@@ -239,6 +243,9 @@ CheckDirOwner=true
  # Specifies the PAM Stack to use, "gdm" by default.
  PamStack=gdm
  
@@ -91,7 +94,7 @@
  # remotely (I'd never turn this on on open network, use ssh for such remote
  # usage that).  You can then run X with -query <thishost> to log in, or
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/utils/securitytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/utils/securitytokenmonitor.c	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,819 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -913,7 +916,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/utils/securitytoken.h	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/utils/securitytoken.h	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,97 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1013,7 +1016,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/utils/securitytoken.c	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/utils/securitytoken.c	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,573 @@
 +/* securitytoken.c - security token
 + * 
@@ -1589,7 +1592,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/utils/securitytokenmonitor.h	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/utils/securitytokenmonitor.h	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,82 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1674,7 +1677,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/utils/gdmsecuritytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/utils/gdmsecuritytokenmonitor.c	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,197 @@
 +/* GDM Security Token monitor 
 + * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
@@ -1873,9 +1876,9 @@
 +    daemon_free (daemon);
 +    return 0;
 +}
---- gdm-2.15.6/configure.ac.security-tokens	2006-07-14 10:43:36.000000000 +0200
-+++ gdm-2.15.6/configure.ac	2006-07-14 10:43:37.000000000 +0200
-@@ -19,6 +19,7 @@
+--- gdm-2.15.6/configure.ac.security-tokens	2006-07-14 10:53:00.000000000 +0200
++++ gdm-2.15.6/configure.ac	2006-07-14 10:53:01.000000000 +0200
+@@ -19,6 +19,7 @@ LIBRSVG_REQUIRED=1.1.1
  LIBXML_REQUIRED=2.4.12
  LIBART_REQUIRED=2.3.11
  SCROLLKEEPER_REQUIRED=0.1.4
@@ -1883,7 +1886,7 @@
  
  dnl
  dnl Let the user configure where to look for the configuration files.
-@@ -156,7 +157,7 @@
+@@ -156,7 +157,7 @@ PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $
  AC_SUBST(VICIOUS_CFLAGS)
  AC_SUBST(VICIOUS_LIBS)
  
@@ -1893,7 +1896,7 @@
  AC_SUBST(DAEMON_LIBS)
  
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/daemon/securitytokenmonitor.c	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/securitytokenmonitor.c	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,817 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -2713,7 +2716,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/daemon/securitytoken.h	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/securitytoken.h	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,98 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -2813,9 +2816,9 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
---- gdm-2.15.6/daemon/gdm.h.security-tokens	2006-07-14 10:43:37.000000000 +0200
-+++ gdm-2.15.6/daemon/gdm.h	2006-07-14 10:43:37.000000000 +0200
-@@ -272,6 +272,10 @@
+--- gdm-2.15.6/daemon/gdm.h.security-tokens	2006-07-14 10:53:01.000000000 +0200
++++ gdm-2.15.6/daemon/gdm.h	2006-07-14 10:53:01.000000000 +0200
+@@ -272,6 +272,10 @@ enum {
  /* How long to wait before assuming an Xserver has timed out */
  #define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=10"
  
@@ -2826,7 +2829,7 @@
  /* Per server definitions */
  #define GDM_KEY_SERVER_PREFIX "server-"
  #define GDM_KEY_SERVER_NAME "name=Standard server"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@ enum {
  #define GDM_KEY_RETRY_DELAY "security/RetryDelay=1"
  #define GDM_KEY_DISALLOW_TCP "security/DisallowTCP=true"
  #define GDM_KEY_PAM_STACK "security/PamStack=gdm"
@@ -2835,7 +2838,7 @@
  #define GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS "security/NeverPlaceCookiesOnNFS=true"
  #define GDM_KEY_PASSWORD_REQUIRED "security/PasswordRequired=false"
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/daemon/securitytoken.c	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/securitytoken.c	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,579 @@
 +/* securitytoken.c - security token
 + * 
@@ -3417,8 +3420,8 @@
 +}
 +#endif
 --- gdm-2.15.6/daemon/gdmconfig.c.security-tokens	2006-06-10 00:12:51.000000000 +0200
-+++ gdm-2.15.6/daemon/gdmconfig.c	2006-07-14 10:43:37.000000000 +0200
-@@ -136,6 +136,8 @@
++++ gdm-2.15.6/daemon/gdmconfig.c	2006-07-14 10:53:01.000000000 +0200
+@@ -136,6 +136,8 @@ static gchar *GdmSoundOnLoginSuccessFile
  static gchar *GdmSoundOnLoginFailureFile = NULL;
  static gchar *GdmConsoleCannotHandle = NULL;
  static gchar *GdmPamStack = NULL;
@@ -3427,7 +3430,7 @@
  
  static gint GdmXineramaScreen = 0;
  static gint GdmUserMaxFile = 0;
-@@ -192,6 +194,7 @@
+@@ -192,6 +194,7 @@ static gboolean GdmSoundOnLogin = TRUE;
  static gboolean GdmSoundOnLoginSuccess = FALSE;
  static gboolean GdmSoundOnLoginFailure = FALSE;
  static gboolean GdmConsoleNotify = TRUE;
@@ -3435,7 +3438,7 @@
  
  /* Config options used by slave */
  /* ---------------------------- */
-@@ -418,6 +421,8 @@
+@@ -418,6 +421,8 @@ gdm_config_init (void)
     gdm_config_add_hash (GDM_KEY_SOUND_ON_LOGIN, &GdmSoundOnLogin, &bool_type);
     gdm_config_add_hash (GDM_KEY_RESTART_BACKGROUND_PROGRAM,
        &GdmRestartBackgroundProgram, &bool_type);
@@ -3444,7 +3447,7 @@
  
     /* string values */
     gdm_config_add_hash (GDM_KEY_PATH, &GdmPath, &string_type);
-@@ -503,6 +508,8 @@
+@@ -503,6 +508,8 @@ gdm_config_init (void)
     gdm_config_add_hash (GDM_KEY_PRE_FETCH_PROGRAM,
        &GdmPreFetchProgram, &string_type);
     gdm_config_add_hash (GDM_KEY_PAM_STACK, &GdmPamStack, &string_type);
@@ -3453,7 +3456,7 @@
  
     /* int values */
     gdm_config_add_hash (GDM_KEY_XINERAMA_SCREEN, &GdmXineramaScreen, &int_type);
-@@ -1432,6 +1439,32 @@
+@@ -1432,6 +1439,32 @@ gdm_set_value (VeConfig *cfg, GdmConfigT
     return FALSE;
  }
  
@@ -3486,7 +3489,7 @@
  /**
   * gdm_find_xserver
   *
-@@ -1648,6 +1681,8 @@
+@@ -1648,6 +1681,8 @@ gdm_update_config (gchar* key)
         is_key (key, GDM_KEY_SERV_AUTHDIR) ||
         is_key (key, GDM_KEY_USER_AUTHDIR) ||
         is_key (key, GDM_KEY_USER_AUTHFILE) ||
@@ -3496,8 +3499,8 @@
        return FALSE;
     }
 --- gdm-2.15.6/daemon/Makefile.am.security-tokens	2006-03-29 01:43:21.000000000 +0200
-+++ gdm-2.15.6/daemon/Makefile.am	2006-07-14 10:43:37.000000000 +0200
-@@ -9,6 +9,7 @@
++++ gdm-2.15.6/daemon/Makefile.am	2006-07-14 10:53:01.000000000 +0200
+@@ -9,6 +9,7 @@ INCLUDES = \
  	-DAUTHDIR=\"$(authdir)\"			\
  	-DBINDIR=\"$(bindir)\"				\
  	-DDATADIR=\"$(datadir)\"			\
@@ -3505,7 +3508,7 @@
  	-DDMCONFDIR=\"$(dmconfdir)\"			\
  	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
  	-DGDMLOCALEDIR=\"$(gdmlocaledir)\"		\
-@@ -71,7 +72,11 @@
+@@ -71,7 +72,11 @@ gdm_binary_SOURCES = \
  	gdm-net.c \
  	gdm-net.h \
  	getvt.c \
@@ -3518,8 +3521,8 @@
  
  EXTRA_gdm_binary_SOURCES = verify-pam.c verify-crypt.c verify-shadow.c
  
---- gdm-2.15.6/daemon/gdm.c.security-tokens	2006-07-14 10:43:37.000000000 +0200
-+++ gdm-2.15.6/daemon/gdm.c	2006-07-14 10:43:37.000000000 +0200
+--- gdm-2.15.6/daemon/gdm.c.security-tokens	2006-07-14 10:53:01.000000000 +0200
++++ gdm-2.15.6/daemon/gdm.c	2006-07-14 19:51:59.000000000 +0200
 @@ -62,6 +62,8 @@
  #include "cookie.h"
  #include "filecheck.h"
@@ -3537,10 +3540,11 @@
  extern GSList *displays;
  
  /* Local functions */
-@@ -80,6 +83,13 @@
+@@ -80,6 +83,14 @@ static void gdm_handle_message (GdmConne
  static void gdm_handle_user_message (GdmConnection *conn,
  				     const gchar *msg,
  				     gpointer data);
++static void gdm_reset_pam (void);
 +
 +static void gdm_handle_security_token_insertion (ScSecurityTokenMonitor *monitor,
 +						 ScSecurityToken *token);
@@ -3551,7 +3555,7 @@
  static void gdm_daemonify (void);
  static void gdm_safe_restart (void);
  static void gdm_try_logout_action (GdmDisplay *disp);
-@@ -150,7 +160,6 @@
+@@ -150,7 +161,6 @@ static GMainLoop *main_loop = NULL;
  
  static gboolean monte_carlo_sqrt2 = FALSE;
  
@@ -3559,7 +3563,7 @@
  /*
   * lookup display number if the display number is
   * exists then clear the remove flag and return TRUE
-@@ -1402,6 +1411,8 @@
+@@ -1402,6 +1412,8 @@ main (int argc, char *argv[])
      /* Initialize runtime environment */
      umask (022);
  
@@ -3568,17 +3572,19 @@
      ctx = g_option_context_new (_("- The GNOME login manager"));
      g_option_context_add_main_entries (ctx, options, _("main options"));
  
-@@ -1639,6 +1650,9 @@
+@@ -1639,6 +1651,11 @@ main (int argc, char *argv[])
  	gdm_xdmcp_run ();
      }
  
++    gdm_reset_pam ();
++
 +    if (gdm_get_value_bool (GDM_KEY_SECURITY_TOKENS_ENABLE))
 +	    gdm_watch_for_security_tokens ();
 +
      /* We always exit via exit (), and sadly we need to g_main_quit ()
       * at times not knowing if it's this main or a recursive one we're
       * quitting.
-@@ -3429,4 +3443,87 @@
+@@ -3429,4 +3446,93 @@ gdm_handle_user_message (GdmConnection *
  	}
  }
  
@@ -3610,22 +3616,18 @@
 +}
 +
 +static void
-+gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+				   ScSecurityToken        *token)
++gdm_reset_pam (void)
 +{
 +    GSList *li;
 +
-+    gdm_debug ("notifying local displays about token removal");
 +    for (li = displays; li != NULL; li = li->next) {
 +	    GdmDisplay *d = li->data;
 +
 +	    if (SERVER_IS_LOCAL (d)) {
 +		    gdm_debug ("notifying display '%s'", d->name);
 +		    gchar *pam_stack;
-+		    pam_stack = gdm_get_value_string (GDM_KEY_SECURITY_TOKENS_PAM_STACK);
-+
-+		    if (ve_string_empty (pam_stack))
-+			    pam_stack = gdm_get_value_string (GDM_KEY_PAM_STACK);
++		    pam_stack = gdm_get_value_string (GDM_KEY_PAM_STACK);
++		    gdm_debug ("setting pam stack to '%s'", pam_stack);
 +		    gdm_set_value_string_per_display (d->name,
 +						      GDM_KEY_PAM_STACK,
 +						      pam_stack);
@@ -3638,6 +3640,16 @@
 +}
 +
 +static void
++gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
++				   ScSecurityToken        *token)
++{
++    GSList *li;
++
++    gdm_debug ("notifying local displays about token removal");
++    gdm_reset_pam ();
++}
++
++static void
 +gdm_watch_for_security_tokens (void)
 +{
 +    GError *error;
@@ -3666,8 +3678,8 @@
 +    }
 +}
  /* EOF */
---- gdm-2.15.6/daemon/verify-pam.c.security-tokens	2006-07-14 10:43:37.000000000 +0200
-+++ gdm-2.15.6/daemon/verify-pam.c	2006-07-14 10:43:37.000000000 +0200
+--- gdm-2.15.6/daemon/verify-pam.c.security-tokens	2006-07-14 10:53:01.000000000 +0200
++++ gdm-2.15.6/daemon/verify-pam.c	2006-07-14 10:53:01.000000000 +0200
 @@ -55,6 +55,8 @@
  #define log_to_audit_system(l,h,d,s)	do { ; } while (0)
  #endif
@@ -3677,7 +3689,7 @@
  /* Evil, but this way these things are passed to the child session */
  static pam_handle_t *pamh = NULL;
  
-@@ -78,7 +80,6 @@
+@@ -78,7 +80,6 @@ static gboolean did_setcred = FALSE;
  
  static	adt_session_data_t      *adt_ah = NULL;    /* audit session handle */
  
@@ -3685,7 +3697,7 @@
  /*
   * audit_success_login - audit successful login
   *
-@@ -902,6 +903,8 @@
+@@ -902,6 +903,8 @@ authenticate_again:
       */
      pam_stack = gdm_get_value_string_per_display (display, GDM_KEY_PAM_STACK);
  
@@ -3695,8 +3707,8 @@
  	    if (started_timer)
  		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
 --- gdm-2.15.6/daemon/gdmconfig.h.security-tokens	2006-05-20 00:07:17.000000000 +0200
-+++ gdm-2.15.6/daemon/gdmconfig.h	2006-07-14 10:43:37.000000000 +0200
-@@ -41,6 +41,9 @@
++++ gdm-2.15.6/daemon/gdmconfig.h	2006-07-14 10:53:01.000000000 +0200
+@@ -41,6 +41,9 @@ void           gdm_set_value_bool       
                                           gboolean value);
  void           gdm_set_value_int        (gchar *key,
                                           gint value);
@@ -3707,7 +3719,7 @@
                                          (gchar *file,
                                           gchar *key,
 --- /dev/null	2006-07-14 09:12:51.334129331 +0200
-+++ gdm-2.15.6/daemon/securitytokenmonitor.h	2006-07-14 10:43:37.000000000 +0200
++++ gdm-2.15.6/daemon/securitytokenmonitor.h	2006-07-14 10:53:01.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- gdm.spec	14 Jul 2006 22:03:50 -0000	1.174
+++ gdm.spec	17 Jul 2006 03:09:48 -0000	1.175
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 3
+Release: 5
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -49,6 +49,7 @@
 Patch21: gdm-2.15.5-security-tokens.patch
 Patch22: gdm-2.15.5-session-keyring.patch
 Patch23: gdm-2.15.6-fix-setup-hang.patch
+Patch24: gdm-2.15.6-wtmp.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -129,8 +130,9 @@
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
-%patch22 -p1 -b .session-keyring
+#%patch22 -p1 -b .session-keyring
 %patch23 -p1 -b .fix-setup-hang
+%patch24 -p1 -b .wtmp
 
 # 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
@@ -326,6 +328,12 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sun Jul 16 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-5
+- add initial wtmp and btmp logging support
+
+* Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-4
+- fix bug in security token support
+
 * Fri Jul 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-3
 - fix hang in gdmsetup
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 05:03:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 01:03:35 -0400
Subject: rpms/paps/devel paps-0.6.6-cpilpi.patch, 1.1, 1.2 paps-cups.patch,
	1.3, 1.4 paps.spec, 1.9, 1.10
Message-ID: <200607170503.k6H53ZML032592@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32578

Modified Files:
	paps-0.6.6-cpilpi.patch paps-cups.patch paps.spec 
Log Message:
* Mon Jul 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-11
- add an owner info to PS.
- support "document-charset" attribute.

paps-0.6.6-cpilpi.patch:
 libpaps.c      |   77 ++++++++++++++++++++------
 libpaps.h      |   17 +++++
 paps.c         |  166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 test_libpaps.c |    2 
 4 files changed, 238 insertions(+), 24 deletions(-)

Index: paps-0.6.6-cpilpi.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-0.6.6-cpilpi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paps-0.6.6-cpilpi.patch	4 Jul 2006 05:12:40 -0000	1.1
+++ paps-0.6.6-cpilpi.patch	17 Jul 2006 05:03:29 -0000	1.2
@@ -1,14 +1,18 @@
-diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/libpaps.c paps-0.6.6/src/libpaps.c
+diff -ruN paps-0.6.6.orig/src/libpaps.c paps-0.6.6/src/libpaps.c
 --- paps-0.6.6.orig/src/libpaps.c	2006-04-27 04:09:03.000000000 +0900
-+++ paps-0.6.6/src/libpaps.c	2006-07-03 21:37:01.000000000 +0900
-@@ -56,12 +56,16 @@
++++ paps-0.6.6/src/libpaps.c	2006-07-17 13:33:13.000000000 +0900
+@@ -52,16 +52,20 @@
+   int last_char_idx;
+   double last_pos_y;
+   double last_pos_x;
++  double scale_x;
++  double scale_y;
+ } paps_private_t;
  
  
  // Forward declarations
 -static void add_postscript_prologue(GString *ps_string);
-+static void add_postscript_prologue(GString *ps_string,
-+				    gdouble  scale_x,
-+				    gdouble  scale_y);
++static void add_postscript_prologue(paps_private_t *paps);
  static gchar *get_next_char_id_strdup(paps_private_t *paps);
  static void add_line_to_postscript(paps_private_t *paps,
  				   GString *line_str,
@@ -19,12 +23,15 @@
  				   PangoLayoutLine *line);
  
  paps_t *paps_new()
-@@ -77,11 +81,21 @@
+@@ -76,12 +80,27 @@
+     paps->last_pos_x = -1e67;
      paps->last_pos_y = -1e67;
      paps->last_char_idx = 0;
++    paps->scale_x = 1.0;
++    paps->scale_y = 1.0;
  
 -    add_postscript_prologue(paps->header);
-+    add_postscript_prologue(paps->header, 1.0, 1.0);
++    add_postscript_prologue(paps);
  
      return paps;
  }
@@ -34,15 +41,18 @@
 +	       gdouble  scale_x,
 +	       gdouble  scale_y)
 +{
-+	paps_private_t *paps = (paps_private_t *)paps_;
-+	g_string_erase(paps->header, 0, -1);
-+	add_postscript_prologue(paps->header, scale_x, scale_y);
++    paps_private_t *paps = (paps_private_t *)paps_;
++
++    paps->scale_x = scale_x;
++    paps->scale_y = scale_y;
++    g_string_erase(paps->header, 0, -1);
++    add_postscript_prologue(paps);
 +}
 +
  PangoContext *paps_get_pango_context()
  {
    return pango_ft2_get_context (PAPS_DPI, PAPS_DPI);
-@@ -124,14 +138,18 @@
+@@ -124,14 +143,18 @@
  			 GString *line_str,
  			 PangoLayoutLine *pango_line,
  			 double line_start_pos_x,
@@ -63,7 +73,7 @@
                           );
  /* Countour traveling functions */
  static int paps_ps_move_to( FT_Vector* to,
-@@ -166,6 +184,8 @@
+@@ -166,6 +189,8 @@
  gchar *paps_layout_to_postscript_strdup(paps_t *paps_,
  					double pos_x,
  					double pos_y,
@@ -72,7 +82,7 @@
  					PangoLayout *layout)
  {
    paps_private_t *paps = (paps_private_t*)paps_;
-@@ -189,6 +209,8 @@
+@@ -189,6 +214,8 @@
  			     layout_str,
  			     pos_x,
  			     pos_y,
@@ -81,7 +91,7 @@
  			     pango_line);
  
        pos_y -= logical_rect.height * scale;
-@@ -203,6 +225,8 @@
+@@ -203,6 +230,8 @@
  gchar *paps_layout_line_to_postscript_strdup(paps_t *paps_,
  					     double pos_x,
  					     double pos_y,
@@ -90,7 +100,7 @@
  					     PangoLayoutLine *layout_line)
  {
    paps_private_t *paps = (paps_private_t*)paps_;
-@@ -213,6 +237,8 @@
+@@ -213,6 +242,8 @@
  			 layout_str,
  			 pos_x,
  			 pos_y,
@@ -99,18 +109,29 @@
  			 layout_line);
  
    ret_str = layout_str->str;
-@@ -221,7 +247,9 @@
+@@ -221,9 +252,10 @@
    return ret_str;
  }
  
 -void add_postscript_prologue(GString *ps_string)
-+void add_postscript_prologue(GString *ps_string,
-+			     gdouble  scale_x,
-+			     gdouble  scale_y)
++static void
++add_postscript_prologue(paps_private_t *paps)
  {
-   g_string_append_printf(ps_string,
+-  g_string_append_printf(ps_string,
++  g_string_append_printf(paps->header,
  			 "%%%%BeginProlog\n"
-@@ -249,7 +277,7 @@
+ 			 "/papsdict 1 dict def\n"
+ 			 "papsdict begin\n"
+@@ -231,7 +263,7 @@
+ 			 );
+   
+   /* Outline support */
+-  g_string_append_printf(ps_string,
++  g_string_append_printf(paps->header,
+ 			 "/conicto {\n"
+ 			 "    /to_y exch def\n"
+ 			 "    /to_x exch def\n"
+@@ -249,7 +281,7 @@
  			 "/start_ol { gsave } bind def\n"
  			 "/end_ol { closepath fill grestore } bind def\n"
  			 /* Specify both x and y. */
@@ -119,17 +140,34 @@
  			 "/goto_xy { fontdict begin /last_y exch def /last_x exch def end } def\n"
  			 "/goto_x { fontdict begin /last_x exch def end } def\n"
  			 "/fwd_x { fontdict begin /last_x exch last_x add def end } def\n"
-@@ -261,7 +289,8 @@
+@@ -261,14 +293,15 @@
  			 // The scaling is a combination of the scaling due
  			 // to the dpi and the difference in the coordinate
  			 // systems of postscript and freetype2.
 -			 1.0 / PAPS_DPI
 +			 1.0 / PAPS_DPI,
-+			 scale_x, scale_y
++			 paps->scale_x, paps->scale_y
  			 );
  
    // The following is a dispatcher for an encoded string that contains
-@@ -331,6 +360,8 @@
+   // a packed version of the pango layout data. Currently it just executes
+   // the symbols corresponding to the encoded characters, but in the future
+   // it will also contain some meta data, e.g. the size of the layout.
+-  g_string_append_printf(ps_string,
++  g_string_append_printf(paps->header,
+ 			 "/paps_exec {\n"
+ 			 "  1 dict begin\n"
+ 			 "  /ps exch def\n"
+@@ -320,7 +353,7 @@
+ 			 );
+ 
+   /* Open up dictionaries */
+-  g_string_append(ps_string,
++  g_string_append(paps->header,
+ 		  "/fontdict 1 dict def\n"
+ 		  "papsdict begin fontdict begin\n");
+ }
+@@ -331,6 +364,8 @@
  		       GString *line_str,
  		       double x_pos,
  		       double y_pos,
@@ -138,7 +176,7 @@
  		       PangoLayoutLine *line)
  {
    PangoRectangle ink_rect, logical_rect;
-@@ -349,7 +380,7 @@
+@@ -349,7 +384,7 @@
    }
  #endif
  
@@ -147,7 +185,7 @@
  }
  
  /* draw_contour() draws all of the contours that make up a line.
-@@ -359,7 +390,9 @@
+@@ -359,7 +394,9 @@
  			 GString *layout_str,
  			 PangoLayoutLine *pango_line,
  			 double line_start_pos_x,
@@ -158,7 +196,7 @@
  			 )
  {
    GSList *runs_list;
-@@ -389,7 +422,7 @@
+@@ -389,7 +426,7 @@
            glyph_pos_x = x_pos + 1.0*geometry.x_offset * scale;
            glyph_pos_y = line_start_pos_y - 1.0*geometry.y_offset * scale;
  
@@ -167,7 +205,7 @@
  
            if (glyphs->glyphs[glyph_idx].glyph == PANGO_GLYPH_EMPTY)
              continue;
-@@ -399,7 +432,9 @@
+@@ -399,7 +436,9 @@
  			      ft_face,
  			      &glyphs->glyphs[glyph_idx],
  			      glyph_pos_x,
@@ -178,7 +216,7 @@
  			      );
          }
  
-@@ -415,13 +450,15 @@
+@@ -415,13 +454,15 @@
                           FT_Face face,
                           PangoGlyphInfo *glyph_info,
                           double pos_x,
@@ -196,7 +234,7 @@
    gchar *id = NULL;
  
    /* Output outline */
-@@ -480,7 +517,7 @@
+@@ -480,7 +521,7 @@
            g_string_append_printf(glyph_def_string,
                                   "%.0f fwd_x\n"
                                   "end_ol\n",
@@ -205,9 +243,9 @@
                                   );
            
            // TBD - Check if the glyph_def_string is empty. If so, set the
-diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/libpaps.h paps-0.6.6/src/libpaps.h
+diff -ruN paps-0.6.6.orig/src/libpaps.h paps-0.6.6/src/libpaps.h
 --- paps-0.6.6.orig/src/libpaps.h	2005-12-21 04:35:39.000000000 +0900
-+++ paps-0.6.6/src/libpaps.h	2006-07-03 20:17:13.000000000 +0900
++++ paps-0.6.6/src/libpaps.h	2006-07-17 13:27:59.000000000 +0900
 @@ -40,6 +40,19 @@
   */
  void paps_free(paps_t *paps);
@@ -246,9 +284,9 @@
  					     PangoLayoutLine *layout_line);
  
  /** 
-diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-07-04 12:25:33.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-07-04 13:11:32.000000000 +0900
+diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
+--- paps-0.6.6.orig/src/paps.c	2006-07-17 13:27:27.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-07-17 13:27:59.000000000 +0900
 @@ -22,6 +22,7 @@
  
  
@@ -585,9 +623,9 @@
    return logical_rect.height;
  }
 -
-diff -ruN -x 'Makefile*' -x autom4te.cache -x 'config*' -x doc -x libtool -x .deps -x .libs -x '*.ps' -x '*a' -x '*~' -x '*o' -x 'stamp*' -x paps -x test_libpaps paps-0.6.6.orig/src/test_libpaps.c paps-0.6.6/src/test_libpaps.c
+diff -ruN paps-0.6.6.orig/src/test_libpaps.c paps-0.6.6/src/test_libpaps.c
 --- paps-0.6.6.orig/src/test_libpaps.c	2005-12-21 04:35:39.000000000 +0900
-+++ paps-0.6.6/src/test_libpaps.c	2006-07-03 18:48:04.000000000 +0900
++++ paps-0.6.6/src/test_libpaps.c	2006-07-17 13:27:59.000000000 +0900
 @@ -83,6 +83,7 @@
  
    ps_layout = paps_layout_to_postscript_strdup(paps,

paps-cups.patch:
 configure.in    |   13 +++++
 src/Makefile.am |    4 -
 src/paps.c      |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 144 insertions(+), 7 deletions(-)

Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paps-cups.patch	4 Jul 2006 05:12:40 -0000	1.3
+++ paps-cups.patch	17 Jul 2006 05:03:29 -0000	1.4
@@ -1,6 +1,6 @@
 diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
 --- paps-0.6.6.orig/configure.in	2006-04-28 04:41:36.000000000 +0900
-+++ paps-0.6.6/configure.in	2006-07-04 13:22:12.000000000 +0900
++++ paps-0.6.6/configure.in	2006-07-17 13:38:30.000000000 +0900
 @@ -7,4 +7,17 @@
  AC_PROG_CC
  AM_PROG_LIBTOOL
@@ -20,8 +20,8 @@
 +
  AC_OUTPUT(Makefile src/Makefile doc/Makefile)
 diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
---- paps-0.6.6.orig/src/Makefile.am	2006-07-04 13:21:56.000000000 +0900
-+++ paps-0.6.6/src/Makefile.am	2006-07-04 13:22:12.000000000 +0900
+--- paps-0.6.6.orig/src/Makefile.am	2006-07-17 13:35:07.000000000 +0900
++++ paps-0.6.6/src/Makefile.am	2006-07-17 13:38:30.000000000 +0900
 @@ -5,10 +5,10 @@
  libpaps_a_incdir = $(includedir)
  
@@ -36,8 +36,8 @@
  
  EXTRA_DIST = test_libpaps.c paps.1
 diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
---- paps-0.6.6.orig/src/paps.c	2006-07-04 13:21:56.000000000 +0900
-+++ paps-0.6.6/src/paps.c	2006-07-04 13:23:28.000000000 +0900
+--- paps-0.6.6.orig/src/paps.c	2006-07-17 13:35:07.000000000 +0900
++++ paps-0.6.6/src/paps.c	2006-07-17 13:45:45.000000000 +0900
 @@ -31,6 +31,7 @@
  #include <time.h>
  #include <locale.h>
@@ -46,7 +46,15 @@
  
  #define BUFSIZE 1024
  #define DEFAULT_FONT_FAMILY	"Monospace"
-@@ -313,8 +314,8 @@
+@@ -87,6 +88,7 @@
+   PangoDirection pango_dir;
+   gchar *filename;
+   gchar *header_font_desc;
++  gchar *owner;
+ } page_layout_t;
+ 
+ typedef struct {
+@@ -313,8 +315,8 @@
    int num_pages = 1;
    int gutter_width = 40;
    int total_gutter_width;
@@ -57,11 +65,12 @@
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -323,12 +324,113 @@
+@@ -323,12 +325,118 @@
    int header_sep = 20;
    int max_width = 0, w;
    GIConv cvh = NULL;
 +  gboolean cups_mode = FALSE;
++  gchar *page_owner = NULL;
  
    /* Prerequisite when using glib. */
    g_type_init();
@@ -96,6 +105,7 @@
 +			}
 +		}
 +		title = argv[3];
++		page_owner = argv[2];
 +		num_options = cupsParseOptions(argv[5], 0, &options);
 +
 +		if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL &&
@@ -162,7 +172,10 @@
 +			lpi = atof(val);
 +		}
 +		if (getenv("CHARSET") != NULL)
-+			encoding = getenv("CHARSET");
++			encoding = g_strdup(getenv("CHARSET"));
++		if ((val = cupsGetOption("document-charset", num_options, options)) != NULL) {
++			encoding = g_strdup(val);
++		}
 +	}
 +  } G_STMT_END;
 +
@@ -171,7 +184,7 @@
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -355,6 +457,8 @@
+@@ -355,6 +463,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -180,7 +193,7 @@
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -373,8 +477,10 @@
+@@ -373,8 +483,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -193,3 +206,52 @@
    
    if (num_columns == 1)
      total_gutter_width = 0;
+@@ -435,6 +547,7 @@
+   page_layout.pango_dir = pango_dir;
+   page_layout.filename = filename_in;
+   page_layout.header_font_desc = header_font_desc;
++  page_layout.owner = page_owner;
+ 
+   /* calculate x-coordinate scale */
+   if (cpi > 0.0L)
+@@ -781,6 +894,7 @@
+   int orientation = page_layout->page_width > page_layout->page_height;
+   int bb_page_width = page_layout->page_width;
+   int bb_page_height = page_layout->page_height;
++  char *owner = NULL;
+   
+   /* Keep bounding box non-rotated to make ggv happy */
+   if (orientation)
+@@ -790,12 +904,20 @@
+       bb_page_height = tmp;
+     }
+   
++  if (page_layout->owner)
++    {
++      owner = g_strdup_printf("%%%%For: %s\n", page_layout->owner);
++    }
++  else
++    {
++      owner = g_strdup("");
++    }
+   fprintf(OUT,
+           "%%!PS-Adobe-3.0\n"
+           "%%%%Title: %s\n"
+           "%%%%Creator: paps version 0.6.3 by Dov Grobgeld\n"
+           "%%%%Pages: (atend)\n"
+-          "%%%%BoundingBox: 0 0 %d %d\n"
++          "%%%%BoundingBox: 0 0 %d %d\n%s"
+           "%%%%BeginProlog\n"
+           "%%%%Orientation: %s\n"
+           "/papsdict 1 dict def\n"
+@@ -845,8 +967,10 @@
+           title,
+           bb_page_width,
+           bb_page_height,
++          owner,
+           orientation_names[orientation]
+           );
++  g_free(owner);
+   
+   fprintf(OUT,
+           "%% User settings\n"


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- paps.spec	12 Jul 2006 17:48:29 -0000	1.9
+++ paps.spec	17 Jul 2006 05:03:29 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		paps
 Version:	0.6.6
-Release:	10.2%{?dist}
+Release:	11%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Mon Jul 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-11
+- add an owner info to PS.
+- support "document-charset" attribute.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-10.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 06:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 02:10:20 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.3,
	1.4 gnome-screensaver.spec, 1.91, 1.92
Message-ID: <200607170610.k6H6AKUd025716@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25608

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
	gnome-screensaver.spec 
Log Message:
- only lock screen if screen locking is enabled and the token
  pulled out is a login token (requires uncommited changes to 
  pam_pkcs11).


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   14 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 +++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  118 +++-
 8 files changed, 1747 insertions(+), 23 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 gnome-screensaver-2.15.4-securitytoken.patch
Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-screensaver-2.15.4-securitytoken.patch	16 Jul 2006 19:42:27 -0000	1.3
+++ gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 06:10:18 -0000	1.4
@@ -1,198 +1,77 @@
---- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-16 15:23:19.000000000 +0200
-@@ -41,10 +41,15 @@
- #include "gs-prefs.h"
- #include "gs-debug.h"
- 
-+#include "securitytokenmonitor.h"
-+
- static void     gs_monitor_class_init (GSMonitorClass *klass);
- static void     gs_monitor_init       (GSMonitor      *monitor);
- static void     gs_monitor_finalize   (GObject        *object);
- 
-+static void     gs_monitor_simulate_user_activity (GSMonitor *monitor);
-+static void     gs_monitor_lock_screen (GSMonitor *monitor);
-+
- #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate))
- 
- struct GSMonitorPrivate
-@@ -56,6 +61,8 @@ struct GSMonitorPrivate
-         GSFade         *fade;
-         GSGrab         *grab;
- 
-+	ScSecurityTokenMonitor *security_token_monitor;
-+
-         guint           release_grab_id;
- };
- 
-@@ -100,6 +107,22 @@ manager_auth_request_end_cb (GSManager *
-         gs_listener_emit_auth_request_end (monitor->priv->listener);
- }
- 
-+static void
-+security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
-+			    ScSecurityToken        *token,
-+			    GSMonitor              *monitor)
-+{
-+	gs_monitor_simulate_user_activity (monitor);
-+}
-+
-+static void
-+security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
-+			   ScSecurityToken        *token,
-+			   GSMonitor              *monitor)
-+{
-+	gs_monitor_lock_screen (monitor);
-+}
-+
- static gboolean
- watcher_idle_cb (GSWatcher *watcher,
-                  gboolean   is_idle,
-@@ -183,20 +206,7 @@ static void
- listener_lock_cb (GSListener *listener,
-                   GSMonitor  *monitor)
- {
--        gboolean res;
--        gboolean locked;
--
--        /* set lock flag before trying to activate screensaver
--           in case something tries to react to the ActiveChanged signal */
--
--        gs_manager_get_lock_active (monitor->priv->manager, &locked);
--        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
--        res = gs_listener_set_active (monitor->priv->listener, TRUE);
--        if (! res) {
--                /* If we've failed then restore lock status */
--                gs_manager_set_lock_active (monitor->priv->manager, locked);
--                gs_debug ("Unable to lock the screen");
--        }
-+	gs_monitor_lock_screen (monitor);
- }
- 
- static void
-@@ -257,13 +267,7 @@ static void
- listener_simulate_user_activity_cb (GSListener *listener,
-                                     GSMonitor  *monitor)
- {
--        /* in case the screen isn't blanked reset the
--           idle watcher */
--        gs_watcher_reset (monitor->priv->watcher);
--
--        /* request that the manager unlock -
--           will pop up a dialog if necessary */
--        gs_manager_request_unlock (monitor->priv->manager);
-+	gs_monitor_simulate_user_activity (monitor);
- }
- 
- static void
-@@ -375,6 +379,27 @@ connect_manager_signals (GSMonitor *moni
- }
- 
- static void
-+disconnect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_removed_cb, monitor);
-+
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_inserted_cb, monitor);
-+}
-+
-+static void
-+connect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-removed",
-+			  G_CALLBACK (security_token_removed_cb), monitor);
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-inserted",
-+			  G_CALLBACK (security_token_inserted_cb), monitor);
-+}
-+
-+static void
- disconnect_prefs_signals (GSMonitor *monitor)
- {
-         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
-@@ -408,6 +433,11 @@ gs_monitor_init (GSMonitor *monitor)
-         monitor->priv->manager = gs_manager_new ();
-         connect_manager_signals (monitor);
- 
-+	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
-+	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
-+					 NULL);
-+	connect_security_token_monitor_signals (monitor);
-+
-         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
- }
- 
-@@ -423,6 +453,9 @@ gs_monitor_finalize (GObject *object)
- 
-         g_return_if_fail (monitor->priv != NULL);
+--- gnome-screensaver-2.15.4/configure.ac
++++ gnome-screensaver-2.15.4/configure.ac
+@@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
+ LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
+ LIBEXIF_REQUIRED_VERSION=0.6.12
+ GLIB_REQUIRED_VERSION=2.7.0
++NSS_REQUIRED_VERSION=3.11.2
  
-+	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
-+	disconnect_security_token_monitor_signals (monitor);
-+
-         disconnect_watcher_signals (monitor);
-         disconnect_listener_signals (monitor);
-         disconnect_manager_signals (monitor);
-@@ -434,6 +467,7 @@ gs_monitor_finalize (GObject *object)
-         g_object_unref (monitor->priv->listener);
-         g_object_unref (monitor->priv->manager);
-         g_object_unref (monitor->priv->prefs);
-+        g_object_unref (monitor->priv->security_token_monitor);
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(crypt.h sys/select.h)
+@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
+         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+         gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
++        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
++	nss >= $NSS_REQUIRED_VERSION)
+ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
+ AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
- }
-@@ -460,3 +494,34 @@ gs_monitor_start (GSMonitor *monitor,
+@@ -229,6 +231,16 @@ fi
+ AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
+ AC_SUBST(HAVE_USER_SWITCHING)
  
-         return TRUE;
- }
-+
-+static void     
-+gs_monitor_simulate_user_activity (GSMonitor *monitor)
-+{
-+        /* in case the screen isn't blanked reset the
-+           idle watcher */
-+        gs_watcher_reset (monitor->priv->watcher);
 +
-+        /* request that the manager unlock -
-+           will pop up a dialog if necessary */
-+        gs_manager_request_unlock (monitor->priv->manager);
-+}
++# security token support
++PKG_CHECK_MODULES(SECURITY_TOKEN,
++        gobject-2.0 >= $GLIB_REQUIRED_VERSION
++	nss >= $NSS_REQUIRED_VERSION)
++AC_SUBST(SECURITY_TOKEN_CFLAGS)
++AC_SUBST(SECURITY_TOKEN_LIBS)
 +
-+static void     
-+gs_monitor_lock_screen (GSMonitor *monitor)
[...2760 lines suppressed...]
+         GSGrab         *grab;
  
- AC_CHECK_HEADERS(unistd.h)
- AC_CHECK_HEADERS(crypt.h sys/select.h)
-@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
-         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-         gconf-2.0 >= $GCONF_REQUIRED_VERSION
--        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
-+        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
- AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
- AC_SUBST(GNOME_SCREENSAVER_LIBS)
++	ScSecurityTokenMonitor *security_token_monitor;
++
+         guint           release_grab_id;
+ };
  
-@@ -89,8 +91,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+@@ -100,6 +107,33 @@ manager_auth_request_end_cb (GSManager *
+         gs_listener_emit_auth_request_end (monitor->priv->listener);
+ }
  
- AM_GCONF_SOURCE_2
++static void
++security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
++			    ScSecurityToken        *token,
++			    GSMonitor              *monitor)
++{
++	gs_monitor_simulate_user_activity (monitor);
++}
++
++static void
++security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
++			   ScSecurityToken        *token,
++			   GSMonitor              *monitor)
++{
++	gboolean locking_is_enabled;
++
++	/* FIXME: why isn't there a getter for this? Should I be 
++	 * looking it up from the prefs object instead?
++	 */
++	locking_is_enabled = FALSE;
++	g_object_get (monitor->priv->manager,
++		      "lock-enabled", &locking_is_enabled, NULL);
++
++	if (locking_is_enabled &&
++	    sc_security_token_is_login_token (token))
++		gs_monitor_lock_screen (monitor);
++}
++
+ static gboolean
+ watcher_idle_cb (GSWatcher *watcher,
+                  gboolean   is_idle,
+@@ -183,20 +217,7 @@ static void
+ listener_lock_cb (GSListener *listener,
+                   GSMonitor  *monitor)
+ {
+-        gboolean res;
+-        gboolean locked;
+-
+-        /* set lock flag before trying to activate screensaver
+-           in case something tries to react to the ActiveChanged signal */
+-
+-        gs_manager_get_lock_active (monitor->priv->manager, &locked);
+-        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
+-        res = gs_listener_set_active (monitor->priv->listener, TRUE);
+-        if (! res) {
+-                /* If we've failed then restore lock status */
+-                gs_manager_set_lock_active (monitor->priv->manager, locked);
+-                gs_debug ("Unable to lock the screen");
+-        }
++	gs_monitor_lock_screen (monitor);
+ }
  
--GNOME_COMPILE_WARNINGS(yes)
+ static void
+@@ -257,13 +278,7 @@ static void
+ listener_simulate_user_activity_cb (GSListener *listener,
+                                     GSMonitor  *monitor)
+ {
+-        /* in case the screen isn't blanked reset the
+-           idle watcher */
+-        gs_watcher_reset (monitor->priv->watcher);
 -
- # Solaris requires libresolv for daemon()
- AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
-  
-@@ -229,6 +229,16 @@ fi
- AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
- AC_SUBST(HAVE_USER_SWITCHING)
+-        /* request that the manager unlock -
+-           will pop up a dialog if necessary */
+-        gs_manager_request_unlock (monitor->priv->manager);
++	gs_monitor_simulate_user_activity (monitor);
+ }
+ 
+ static void
+@@ -375,6 +390,27 @@ connect_manager_signals (GSMonitor *moni
+ }
  
+ static void
++disconnect_security_token_monitor_signals (GSMonitor *monitor)
++{
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_removed_cb, monitor);
 +
-+# security token support
-+PKG_CHECK_MODULES(SECURITY_TOKEN,
-+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
-+AC_SUBST(SECURITY_TOKEN_CFLAGS)
-+AC_SUBST(SECURITY_TOKEN_LIBS)
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_inserted_cb, monitor);
++}
++
++static void
++connect_security_token_monitor_signals (GSMonitor *monitor)
++{
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-removed",
++			  G_CALLBACK (security_token_removed_cb), monitor);
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-inserted",
++			  G_CALLBACK (security_token_inserted_cb), monitor);
++}
++
++static void
+ disconnect_prefs_signals (GSMonitor *monitor)
+ {
+         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
+@@ -408,6 +444,11 @@ gs_monitor_init (GSMonitor *monitor)
+         monitor->priv->manager = gs_manager_new ();
+         connect_manager_signals (monitor);
+ 
++	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
++	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
++					 NULL);
++	connect_security_token_monitor_signals (monitor);
 +
+         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
+ }
+ 
+@@ -423,6 +464,9 @@ gs_monitor_finalize (GObject *object)
+ 
+         g_return_if_fail (monitor->priv != NULL);
+ 
++	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
++	disconnect_security_token_monitor_signals (monitor);
 +
+         disconnect_watcher_signals (monitor);
+         disconnect_listener_signals (monitor);
+         disconnect_manager_signals (monitor);
+@@ -434,6 +478,7 @@ gs_monitor_finalize (GObject *object)
+         g_object_unref (monitor->priv->listener);
+         g_object_unref (monitor->priv->manager);
+         g_object_unref (monitor->priv->prefs);
++        g_object_unref (monitor->priv->security_token_monitor);
+ 
+         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
+ }
+@@ -460,3 +505,34 @@ gs_monitor_start (GSMonitor *monitor,
+ 
+         return TRUE;
+ }
 +
- dnl ---------------------------------------------------------------------------
- dnl - Where should we put documentation ?
- dnl ---------------------------------------------------------------------------
++static void     
++gs_monitor_simulate_user_activity (GSMonitor *monitor)
++{
++        /* in case the screen isn't blanked reset the
++           idle watcher */
++        gs_watcher_reset (monitor->priv->watcher);
++
++        /* request that the manager unlock -
++           will pop up a dialog if necessary */
++        gs_manager_request_unlock (monitor->priv->manager);
++}
++
++static void     
++gs_monitor_lock_screen (GSMonitor *monitor)
++{
++        gboolean res;
++        gboolean locked;
++
++        /* set lock flag before trying to activate screensaver
++           in case something tries to react to the ActiveChanged signal */
++
++        gs_manager_get_lock_active (monitor->priv->manager, &locked);
++        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
++        res = gs_listener_set_active (monitor->priv->listener, TRUE);
++        if (! res) {
++                /* If we've failed then restore lock status */
++                gs_manager_set_lock_active (monitor->priv->manager, locked);
++                gs_debug ("Unable to lock the screen");
++        }
++}


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-screensaver.spec	16 Jul 2006 19:13:16 -0000	1.91
+++ gnome-screensaver.spec	17 Jul 2006 06:10:18 -0000	1.92
@@ -12,7 +12,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 2
+Release: 3
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -154,6 +154,11 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sun Jul 16 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-3
+- only lock screen if screen locking is enabled and the token
+  pulled out is a login token (requires uncommited changes to 
+  pam_pkcs11).
+
 * Sat Jul 15 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-2
 - add initial security token support (still needs work) 
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 06:56:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 02:56:39 -0400
Subject: rpms/indent/FC-4 indent-2.2.9-cdw.patch, NONE,
	1.1 indent-2.2.9-explicits.patch, NONE,
	1.1 indent-2.2.9-lcall.patch, NONE, 1.1 indent-2.2.9-man.patch,
	NONE, 1.1 indent-2.2.9-zh_TW.patch, NONE, 1.1 indent.spec,
	1.14, 1.15
Message-ID: <200607170656.k6H6ud1R006495@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6395

Modified Files:
	indent.spec 
Added Files:
	indent-2.2.9-cdw.patch indent-2.2.9-explicits.patch 
	indent-2.2.9-lcall.patch indent-2.2.9-man.patch 
	indent-2.2.9-zh_TW.patch 
Log Message:
Sync with devel branch.


indent-2.2.9-cdw.patch:
 indent.c |   15 ++++++++++++---
 indent.h |    3 +++
 parse.c  |   15 +++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

--- NEW FILE indent-2.2.9-cdw.patch ---
diff -burp indent-2.2.9/src/indent.c indent-2.2.9-cdw/src/indent.c
--- indent-2.2.9/src/indent.c	2006-01-18 18:22:36.000000000 +0100
+++ indent-2.2.9-cdw/src/indent.c	2006-01-27 17:13:55.000000000 +0100
@@ -976,13 +976,10 @@ static void handle_token_semicolon(
 
     if (!*sp_sw)
     {                       /* if not if for (;;) */
-        do
-        {
             if (parse (semicolon) != total_success)
             {
                 *file_exit_value = indent_error;
             }
-        } while(0);
                 
         *force_nl = true;    /* force newline after a end of stmt */
     }
@@ -2625,6 +2622,18 @@ static exit_values_ty indent_main_loop(v
             return file_exit_value;                                              /* RETURN */
         }
 
+	if (type_code == sp_paren
+	    && parser_state_tos->p_stack[parser_state_tos->tos] == dohead
+	    && parser_state_tos->last_token == rbrace)
+	{
+	    /* This is closing `while' of `do {stuff;} while'
+	       statement (not `do stuff; while' command).  In -cdw, we
+	       want to suppress newline. */
+	    if (settings.cuddle_do_while)
+	        force_nl = false;
+	    parser_state_tos->in_closing_br_while = true;
+	}
+
         if ((type_code != comment) &&
             (type_code != cplus_comment) &&
             (type_code != newline) &&
diff -burp indent-2.2.9/src/indent.h indent-2.2.9-cdw/src/indent.h
--- indent-2.2.9/src/indent.h	2006-01-18 18:22:36.000000000 +0100
+++ indent-2.2.9-cdw/src/indent.h	2006-01-27 17:20:14.000000000 +0100
@@ -357,6 +357,9 @@ typedef struct parser_state
     BOOLEAN in_decl;              /* set to true when we are in a declaration
                                    * statement.  The processing of braces is then
                                    * slightly different */
+    BOOLEAN in_closing_br_while;  /* set to true when we are parsing
+                                   * closing while of do {} while
+                                   * statement*/
     int in_stmt;                  /* set to 1 while in a stmt */
     int in_parameter_declaration;
     int ind_level;                /* the current indentation level in spaces */
diff -burp indent-2.2.9/src/parse.c indent-2.2.9-cdw/src/parse.c
--- indent-2.2.9/src/parse.c	2002-08-04 19:08:41.000000000 +0200
+++ indent-2.2.9-cdw/src/parse.c	2006-01-27 17:18:52.000000000 +0100
@@ -38,6 +38,7 @@ void init_parser (void)
     parser_state_tos->cstk          = (int *) xmalloc (INITIAL_STACK_SIZE * sizeof (int));
     parser_state_tos->paren_indents_size = 8;
     parser_state_tos->paren_indents = (short *) xmalloc (parser_state_tos->paren_indents_size * sizeof (short));
+    parser_state_tos->in_closing_br_while = false;
 
     /* Although these are supposed to grow if we reach the end,
      * I can find no place in the code which does this. */
@@ -380,6 +381,14 @@ exit_values_ty parse (
 
                 parser_state_tos->ind_level                 = parser_state_tos->i_l_follow;
                 parser_state_tos->il[parser_state_tos->tos] = parser_state_tos->i_l_follow;
+
+		if (parser_state_tos->in_closing_br_while
+		    && settings.cuddle_do_while
+		    && !settings.btype_2)
+		{
+		    parser_state_tos->ind_level += settings.brace_indent;
+		}
+		parser_state_tos->in_closing_br_while = false;
             }
             else
             {                   /* it is a while loop */
@@ -409,6 +418,12 @@ exit_values_ty parse (
                 parser_state_tos->p_stack[parser_state_tos->tos] = elsehead;
                 /* remember if with else */
                 parser_state_tos->search_brace = true;
+
+		if (settings.cuddle_else
+		    && !settings.btype_2)
+		{
+		    parser_state_tos->ind_level += settings.brace_indent;
+		}
             }
             break;
 

indent-2.2.9-explicits.patch:
 man/texinfo2man.c |    1 +
 src/indent.c      |    3 ---
 src/io.h          |    1 +
 src/output.c      |    3 ++-
 src/output.h      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE indent-2.2.9-explicits.patch ---
diff -Burp indent-2.2.9/man/texinfo2man.c indent-2.2.9-explicits/man/texinfo2man.c
--- indent-2.2.9/man/texinfo2man.c	2006-01-18 18:18:00.000000000 +0100
+++ indent-2.2.9-explicits/man/texinfo2man.c	2006-01-18 18:15:14.000000000 +0100
@@ -163,6 +163,7 @@ int start_line[256];
 
 static char value_updated[64], value_edition[64], value_version[64];
 
+void
 process_texi (FILE * in)
 {
   char buf[1024];
diff -Burp indent-2.2.9/src/indent.c indent-2.2.9-explicits/src/indent.c
--- indent-2.2.9/src/indent.c	2006-01-18 18:17:57.000000000 +0100
+++ indent-2.2.9-explicits/src/indent.c	2006-01-18 18:16:50.000000000 +0100
@@ -373,8 +373,6 @@ static void handle_token_lparen(
    BOOLEAN        * sp_sw,
    int            * dec_ind)
 {
-    char lparen = *token;
-    
     /* Braces in initializer lists should be put on new lines. This is
      * necessary so that -gnu does not cause things like char
      * *this_is_a_string_array[] = { "foo", "this_string_does_not_fit",
@@ -3058,7 +3056,6 @@ int main (
     int     argc,
     char ** argv)
 {
-    int i;
     char *profile_pathname = 0;
     BOOLEAN using_stdin = false;
     exit_values_ty exit_status;
diff -Burp indent-2.2.9/src/io.h indent-2.2.9-explicits/src/io.h
--- indent-2.2.9/src/io.h	2002-08-04 19:08:41.000000000 +0200
+++ indent-2.2.9-explicits/src/io.h	2006-01-18 18:12:56.000000000 +0100
@@ -73,5 +73,6 @@ extern void fill_buffer (void);
 extern int compute_code_target (int paren_targ);
 extern int compute_label_target (void);
 extern void skip_buffered_space(void);
+extern void dump_line (int force_nl, int *paren_targ);
 
 #endif /* INDENT_IO_H */
diff -Burp indent-2.2.9/src/output.c indent-2.2.9-explicits/src/output.c
--- indent-2.2.9/src/output.c	2006-01-18 18:18:00.000000000 +0100
+++ indent-2.2.9-explicits/src/output.c	2006-01-18 18:14:02.000000000 +0100
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <utime.h>
+#include <time.h>
 #include <sys/stat.h>
 
 #include "indent.h"
@@ -1207,7 +1208,7 @@ extern void close_output(
     }
 }
 
-extern inhibit_indenting(
+extern void inhibit_indenting(
     BOOLEAN flag)
 {
     inhibited = flag;
diff -Burp indent-2.2.9/src/output.h indent-2.2.9-explicits/src/output.h
--- indent-2.2.9/src/output.h	2002-08-04 19:08:41.000000000 +0200
+++ indent-2.2.9-explicits/src/output.h	2006-01-18 17:55:07.000000000 +0100
@@ -47,7 +47,7 @@ extern void close_output(
     struct stat * file_stats,
      const char  * filename);
 
-extern inhibit_indenting(
+extern void inhibit_indenting(
     BOOLEAN flag);
 
 

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);

indent-2.2.9-man.patch:
 all_opts       |only
 indent.texinfo |   16 +++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE indent-2.2.9-man.patch ---
Only in indent-2.2.9/doc: all_opts
diff -Bburpd indent-2.2.9-orig/doc/indent.texinfo indent-2.2.9/doc/indent.texinfo
--- indent-2.2.9-orig/doc/indent.texinfo	2006-07-16 07:25:25.000000000 -0400
+++ indent-2.2.9/doc/indent.texinfo	2006-07-16 07:57:33.000000000 -0400
@@ -754,7 +754,7 @@ if (x > 0)
 
 @kindex -ce
 @kindex --cuddle-else
- at kindex -dce
+ at kindex -nce
 @kindex --dont-cuddle-else
 If you are using the @option{-br} option, you probably want to also use
 the @option{-ce} option.  This causes the @code{else} in an if-then-else
@@ -1666,6 +1666,11 @@ Line up continued lines at parentheses.@
 Leave space between @samp{#} and preprocessor directive.@*
 @xref{Indentation}.
 
+ at item -nlps
+ at itemx --remove-preprocessor-space
+Remove space between @samp{#} and preprocessor directive.@*
+ at xref{Indentation}.
+
 @item -nbad
 @itemx --no-blank-lines-after-declarations
 Do not force blank lines after declarations.@*
@@ -1827,6 +1832,11 @@ statement is broken.
 Preserve access and modification times on output files.
 @xref{Miscellaneous options}.
 
+ at item -ppi at var{n}
+ at itemx --preprocessor-indentation at var{n}
+Request indentation of preprocessor conditional statements.@*
+ at xref{Indentation}.
+
 @item -prs
 @itemx --space-after-parentheses
 Put a space after every '(' and before every ')'.@*
@@ -1979,8 +1989,10 @@ the corresponding short option.
 \line{ --original \leaderfill                      -orig}
 \line{ --parameter-indentation \leaderfill         -ip at var{n}\ } 
 \line{ --paren-indentation \leaderfill             -pi at var{n}\ }
+\line{ --preprocessor-indentation at var{n} \leaderfill     -ppi at var{n}\ }
 \line{ --preserve-mtime \leaderfill                -pmt\ }
 \line{ --procnames-start-lines \leaderfill         -psl\ }  
+\line{ --remove-preprocessor-space \leaderfill     -nlps\ }
 \line{ --space-after-cast \leaderfill              -cs\ \ } 
 \line{ --space-after-for \leaderfill               -saf\ }
 \line{ --space-after-if \leaderfill                -sai\ }
@@ -2063,8 +2075,10 @@ the corresponding short option.
 --original                                      -orig
 --parameter-indentation                         -ip at var{n}      
 --paren-indentation                             -pi at var{n}
+--preprocessor-indentation at var{n}               -ppi at var{n}
 --preserve-mtime				-pmt
 --procnames-start-lines                         -psl            
+--remove-preprocessor-space                     -nlps
 --space-after-cast                              -cs             
 --space-after-for				-saf
 --space-after-if				-sai

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/FC-4/indent.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- indent.spec	10 Apr 2005 12:50:02 -0000	1.14
+++ indent.spec	17 Jul 2006 06:56:37 -0000	1.15
@@ -1,13 +1,18 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 8
+Release: 13%{?dist}
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
 Source: ftp://ftp.gnu.org/pub/gnu/indent/indent-%{version}.tar.gz
 Patch: indent-2.2.9-fix.patch
 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
+Patch6: indent-2.2.9-zh_TW.patch
+Patch7: indent-2.2.9-man.patch
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -24,6 +29,11 @@
 %setup -q
 %patch -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 
@@ -62,6 +72,19 @@
 
 
 %changelog
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
+- Changes from devel branch:
+  - Silenting some warnings, voidifying some functions that were
+    implicitly int but didn't actually return anything. (#114376)
+  - Changed the placement of closing `while' of `do {} while' command
+    under a -cdw option.  It's now cuddled up to the brace. (#67781)
+  - Changed the indentation of cuddled `else': the brace is lined up
+    under opening brace.
+  - Setting LC_ALL instead of LC_MESSAGES in order to fix output of
+    KOI8-R characters.  (#134044)
+  - Adding Wei-Lun Chao's zh_TW UTF-8 messages (#134044)
+  - Add some missing options to manpage/infopage (#199037)
+
 * Sun Apr 10 2005 Jakub Jelinek <jakub at redhat.com> 2.2.9-8
 - add %%check
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 07:03:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 03:03:56 -0400
Subject: rpms/indent/FC-4 indent.spec,1.15,1.16
Message-ID: <200607170703.k6H73u7V008220@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8167

Modified Files:
	indent.spec 
Log Message:
explicit dist tag



Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/FC-4/indent.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- indent.spec	17 Jul 2006 06:56:37 -0000	1.15
+++ indent.spec	17 Jul 2006 07:03:53 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 13%{?dist}
+Release: 13.fc4
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -72,7 +72,7 @@
 
 
 %changelog
-* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13.fc4
 - Changes from devel branch:
   - Silenting some warnings, voidifying some functions that were
     implicitly int but didn't actually return anything. (#114376)



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:11:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:11:22 -0400
Subject: rpms/bzip2/devel bzip2-1.0.3-cflags.patch, NONE, 1.1 bzip2.spec,
	1.19, 1.20
Message-ID: <200607170811.k6H8BMY5009751@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9317

Modified Files:
	bzip2.spec 
Added Files:
	bzip2-1.0.3-cflags.patch 
Log Message:
- add cflags (#198926)



bzip2-1.0.3-cflags.patch:
 Makefile-libbz2_so |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bzip2-1.0.3-cflags.patch ---
--- bzip2-1.0.3/Makefile-libbz2_so.pom	2006-07-17 09:57:17.000000000 +0200
+++ bzip2-1.0.3/Makefile-libbz2_so	2006-07-17 09:58:41.000000000 +0200
@@ -20,7 +20,7 @@
       bzlib.o
 
 all: $(OBJS)
-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
+	$(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
 	rm -f libbz2.so.1.0
 	ln -s libbz2.so.1.0.3 libbz2.so.1.0


Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzip2.spec	12 Jul 2006 05:29:54 -0000	1.19
+++ bzip2.spec	17 Jul 2006 08:11:20 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.3
-Release: 2.2.2
+Release: 3
 License: BSD
 Group: Applications/File
 URL: http://sources.redhat.com/bzip2/
@@ -11,6 +11,7 @@
 Patch2: bzip2-1.0.2-chmod.patch
 Patch3: bzip2-1.0.2-NULL-ptr-check.patch
 Patch4: bzip2-1.0.2-bzgrep.patch
+Patch5: bzip2-1.0.3-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: bzip2-libs = %{version}
 
@@ -50,6 +51,7 @@
 %patch2 -p1
 %patch3 -p1 -b .nullptr
 %patch4 -p1 -b .sed
+%patch5 -p1 -b .cflags
 
 %build
 
@@ -109,6 +111,9 @@
 %{_libdir}/*so
 
 %changelog
+* Mon Jul 17 2006 Ivana Varekova <varekova at redhat.com> 1.0.3-3
+- add cflags (#198926)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:12:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:12:10 -0400
Subject: rpms/passwd/devel .cvsignore, 1.15, 1.16 passwd.spec, 1.26,
	1.27 sources, 1.17, 1.18
Message-ID: <200607170812.k6H8CApY010092@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/passwd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10057

Modified Files:
	.cvsignore passwd.spec sources 
Log Message:
* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> 0.73-1
- fixed broken logic from the last change (#196851)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	14 Jul 2006 14:59:59 -0000	1.15
+++ .cvsignore	17 Jul 2006 08:12:08 -0000	1.16
@@ -1 +1 @@
-passwd-0.72.tar.bz2
+passwd-0.73.tar.bz2


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- passwd.spec	14 Jul 2006 14:59:59 -0000	1.26
+++ passwd.spec	17 Jul 2006 08:12:08 -0000	1.27
@@ -6,7 +6,7 @@
 %endif
 Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
-Version: 0.72
+Version: 0.73
 Release: 1
 License: BSD
 Group: System Environment/Base
@@ -57,6 +57,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> 0.73-1
+- fixed broken logic from the last change (#196851)
+
 * Fri Jul 14 2006 Tomas Mraz <tmraz at redhat.com> 0.72-1
 - merged audit patch to upstream cvs
 - improved passwd -S output (#170344)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Jul 2006 14:59:59 -0000	1.17
+++ sources	17 Jul 2006 08:12:08 -0000	1.18
@@ -1 +1 @@
-26438e7f37b2a60fb012d6e8fb345848  passwd-0.72.tar.bz2
+10e0164430a11f0982b9d24dc39394fc  passwd-0.73.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:26:50 -0400
Subject: rpms/elfutils/devel Makefile,1.14,1.15 elfutils.spec,1.72,1.73
Message-ID: <200607170826.k6H8QoDX029879@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29849

Modified Files:
	Makefile elfutils.spec 
Log Message:
Fix nits for portable rpm build.


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile	15 Jun 2006 08:32:05 -0000	1.14
+++ Makefile	17 Jul 2006 08:26:47 -0000	1.15
@@ -21,7 +21,7 @@
 	(echo '%define _with_compat 1'; cat $<) > $@.new
 	mv -f $@.new $@
 
-portable-vr = $(VERSION)-0.$(RELEASE)
+portable-vr = $(VERSION)-0.$(subst $(DIST),,$(RELEASE))
 portable.srpm = elfutils-$(portable-vr).src.rpm
 $(portable.srpm): elfutils-portable.spec elfutils-portability.patch \
 		  elfutils-$(VERSION).tar.gz


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- elfutils.spec	13 Jul 2006 02:06:25 -0000	1.72
+++ elfutils.spec	17 Jul 2006 08:26:47 -0000	1.73
@@ -13,7 +13,7 @@
 %if !%{compat}
 Release: %{eu_release}%{?dist}
 %else
-Release: 0.%{eu_release}.1
+Release: 0.%{eu_release}
 %endif
 License: GPL
 Group: Development/Tools



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:46:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:46:41 -0400
Subject: rpms/elfutils/devel elfutils-0.122-cast.patch, 1.2,
	1.3 elfutils.spec, 1.73, 1.74
Message-ID: <200607170846.k6H8kfYi011543@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11216

Modified Files:
	elfutils-0.122-cast.patch elfutils.spec 
Log Message:
Fix warnings in elflint compilation.

elfutils-0.122-cast.patch:
 0 files changed

Index: elfutils-0.122-cast.patch
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-0.122-cast.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elfutils-0.122-cast.patch	13 Jul 2006 02:06:25 -0000	1.2
+++ elfutils-0.122-cast.patch	17 Jul 2006 08:46:38 -0000	1.3
@@ -1,9 +1,12 @@
 # 
-# old_revision [f2430dc0eb44237e21095615046752a3f2779806]
 # 
 # patch "src/ChangeLog"
 #  from [f8c27340f5383e9b12ba61c17f42836427afb156]
-#    to [d1f7cabb30fbf8fcd0d37e059ef91fe6d2bfa052]
+#    to [9072d1ca5e9889af095178f14a858cf93f2ee8d3]
+# 
+# patch "src/elflint.c"
+#  from [b5703cc5ab10ebe94c720267613ea88bc7ffbf01]
+#    to [2a6fb2780dcf41443bb96170902773287dba7f17]
 # 
 # patch "src/readelf.c"
 #  from [c644fd7f7331b5041932ad76ea3dfd9de609fdbf]
@@ -11,17 +14,52 @@
 # 
 ============================================================
 --- src/ChangeLog	f8c27340f5383e9b12ba61c17f42836427afb156
-+++ src/ChangeLog	d1f7cabb30fbf8fcd0d37e059ef91fe6d2bfa052
-@@ -1,3 +1,8 @@
++++ src/ChangeLog	9072d1ca5e9889af095178f14a858cf93f2ee8d3
+@@ -1,3 +1,14 @@
++2006-07-17  Roland McGrath  <roland at redhat.com>
++
++	* elflint.c (struct version_namelist): Use GElf_Versym for `ndx' field.
++	(add_version): Likewise for argument.
++	(check_versym): Cast constant to GElf_Versym for comparison.
++
 +2006-07-12  Roland McGrath  <roland at redhat.com>
 +
-+	* readelf.c (handle_gnu_hash): Add a cast for machines where
++	* readelf.c (handle_gnu_hash): Add casts for machines where
 +	Elf32_Word != unsigned int.
 +
  2006-07-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* elflint.c (check_sysv_hash64): Fix printf format.
 ============================================================
+--- src/elflint.c	b5703cc5ab10ebe94c720267613ea88bc7ffbf01
++++ src/elflint.c	2a6fb2780dcf41443bb96170902773287dba7f17
+@@ -2361,14 +2361,14 @@
+ {
+   const char *objname;
+   const char *name;
+-  GElf_Word ndx;
++  GElf_Versym ndx;
+   enum { ver_def, ver_need } type;
+   struct version_namelist *next;
+ } *version_namelist;
+ 
+ 
+ static int
+-add_version (const char *objname, const char *name, GElf_Word ndx, int type)
++add_version (const char *objname, const char *name, GElf_Versym ndx, int type)
+ {
+   /* Check that there are no duplications.  */
+   struct version_namelist *nlp = version_namelist;
+@@ -2480,7 +2480,7 @@
+ 	     index we need for this symbol.  */
+ 	  struct version_namelist *runp = version_namelist;
+ 	  while (runp != NULL)
+-	    if (runp->ndx == (*versym & 0x7fff))
++	    if (runp->ndx == (*versym & (GElf_Versym) 0x7fff))
+ 	      break;
+ 	    else
+ 	      runp = runp->next;
+============================================================
 --- src/readelf.c	c644fd7f7331b5041932ad76ea3dfd9de609fdbf
 +++ src/readelf.c	bbb36859cccf55acf4ca5ff5ddae0daeb4cea4ba
 @@ -2534,9 +2534,10 @@


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- elfutils.spec	17 Jul 2006 08:26:47 -0000	1.73
+++ elfutils.spec	17 Jul 2006 08:46:38 -0000	1.74
@@ -1,5 +1,5 @@
 %define eu_version 0.122
-%define eu_release 3
+%define eu_release 4
 
 %if %{?_with_compat:1}%{!?_with_compat:0}
 %define compat 1
@@ -217,6 +217,9 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Mon Jul 17 2006 Roland McGrath <roland at redhat.com> - 0.122-4
+- Fix warnings in elflint compilation.
+
 * Wed Jul 12 2006 Roland McGrath <roland at redhat.com> - 0.122-3
 - Update to 0.122
   - Fix libdwfl sorting of modules with 64-bit addresses (#198225).



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:54:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:54:36 -0400
Subject: rpms/libwpd/devel .cvsignore, 1.12, 1.13 libwpd.spec, 1.28,
	1.29 sources, 1.12, 1.13
Message-ID: <200607170854.k6H8sawC020082@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20046

Modified Files:
	.cvsignore libwpd.spec sources 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	1 Jun 2006 20:12:27 -0000	1.12
+++ .cvsignore	17 Jul 2006 08:54:33 -0000	1.13
@@ -5,3 +5,4 @@
 libwpd-0.8.3.tar.gz
 libwpd-0.8.4.tar.gz
 libwpd-0.8.5.tar.gz
+libwpd-0.8.6.tar.gz


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libwpd.spec	12 Jul 2006 06:59:06 -0000	1.28
+++ libwpd.spec	17 Jul 2006 08:54:33 -0000	1.29
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
-Version: 0.8.5
-Release: 3.1
+Version: 0.8.6
+Release: 1
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -69,6 +69,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Mon Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 0.8.6-1
+- next version
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.5-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	1 Jun 2006 20:12:27 -0000	1.12
+++ sources	17 Jul 2006 08:54:33 -0000	1.13
@@ -1 +1 @@
-6b679e205a2805c3d23f41c65b35e266  libwpd-0.8.5.tar.gz
+464a390c66511831821de81b887d3e61  libwpd-0.8.6.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 08:59:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 04:59:46 -0400
Subject: rpms/sed/devel sed.spec,1.34,1.35
Message-ID: <200607170859.k6H8xkWA022099@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22040

Modified Files:
	sed.spec 
Log Message:
- use dist tag



Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sed.spec	12 Jul 2006 08:11:58 -0000	1.34
+++ sed.spec	17 Jul 2006 08:59:43 -0000	1.35
@@ -5,7 +5,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 2.2.1
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
@@ -65,6 +65,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
+- use dist tag
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-2.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:01:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:01:40 -0400
Subject: rpms/libwpd/devel libwpd.spec, 1.29,
	1.30 libwpd-0.8.5-wp5nofontlistcrash.patch, 1.1, NONE
Message-ID: <200607170901.k6H91eH4022713@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22577

Modified Files:
	libwpd.spec 
Removed Files:
	libwpd-0.8.5-wp5nofontlistcrash.patch 
Log Message:
drop unneccessaray patch


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libwpd.spec	17 Jul 2006 08:54:33 -0000	1.29
+++ libwpd.spec	17 Jul 2006 09:01:29 -0000	1.30
@@ -10,8 +10,6 @@
 Requires: glib2 >= 2.0.0, libgsf >= 1.6.0
 BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0
 
-Patch0: libwpd-0.8.5-wp5nofontlistcrash.patch
-
 %description
 Library that handles Word Perfect documents.
 
@@ -36,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .wp5nofontlistcrash
 
 %build
 %configure --without-docs


--- libwpd-0.8.5-wp5nofontlistcrash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:02:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:02:38 -0400
Subject: rpms/sed/FC-5 sed.spec,1.30,1.31
Message-ID: <200607170902.k6H92ciV022930@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22813

Modified Files:
	sed.spec 
Log Message:
- sync with devel branch
  - #185374:
    - Follow symlinks before rename (avoid symlink overwrite)
    - Add -c flag for copy instead of rename (avoid ownership change)
  - use dist tag



Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-5/sed.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sed.spec	11 Feb 2006 05:40:47 -0000	1.30
+++ sed.spec	17 Jul 2006 09:02:35 -0000	1.31
@@ -5,11 +5,12 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 1.2
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
+Patch0: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --without-included-regex
@@ -63,6 +65,13 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 4.1.5-3
+- sync with devel branch
+  - #185374:
+    - Follow symlinks before rename (avoid symlink overwrite)
+    - Add -c flag for copy instead of rename (avoid ownership change)
+  - use dist tag
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:07:24 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.770,
	1.771 openoffice.org.2.0.3.gcc28370.statics.patch, 1.1, NONE
Message-ID: <200607170907.k6H97O77023905@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23839

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org.2.0.3.gcc28370.statics.patch 
Log Message:
4.1.1-8 fixes gcc28370


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- openoffice.org.spec	16 Jul 2006 19:49:46 -0000	1.770
+++ openoffice.org.spec	17 Jul 2006 09:07:10 -0000	1.771
@@ -48,7 +48,7 @@
 Source12:       ooo64726.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
-BuildRequires:	gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, gcc-java >= 4.0.2
+BuildRequires:	gcc, gcc-c++ >= 4.1.1-8, binutils, gcc-java >= 4.1.1 
 BuildRequires:	libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
 BuildRequires:	freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
 BuildRequires:	cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
@@ -112,9 +112,8 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org.2.0.3.gcc28370.statics.patch
-Patch50: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-Patch51: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
+Patch49: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
+Patch50: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -854,9 +853,8 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gcc28370.statics.patch
-%patch50 -p1 -b .gccXXXXX.anonymousexternc.patch
-%patch51 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
+%patch49 -p1 -b .gccXXXXX.anonymousexternc.patch
+%patch50 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
 
 tar xzf %{SOURCE1}
 
@@ -3342,6 +3340,7 @@
 - fix use of freetype headers for new freetype
 - rebuild for new tasty linker hash
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
+	-> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
     + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to workaround more gcc foo
 


--- openoffice.org.2.0.3.gcc28370.statics.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:10:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:10:02 -0400
Subject: rpms/util-linux/devel util-linux-2.13-login-ipv6.patch, NONE,
	1.1 util-linux-selinux.pamd, 1.5, 1.6 util-linux.spec, 1.128, 1.129
Message-ID: <200607170910.k6H9A14Z024461@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24422

Modified Files:
	util-linux-selinux.pamd util-linux.spec 
Added Files:
	util-linux-2.13-login-ipv6.patch 
Log Message:
add IPv6 and keyring support

util-linux-2.13-login-ipv6.patch:
 login.c |   37 ++++++++++++++++++++++++++++---------
 login.h |    2 +-
 2 files changed, 29 insertions(+), 10 deletions(-)

--- NEW FILE util-linux-2.13-login-ipv6.patch ---
--- util-linux-2.13-pre6/login-utils/login.c.ipv6	2006-07-17 11:05:48.000000000 +0200
+++ util-linux-2.13-pre6/login-utils/login.c	2006-07-17 11:05:48.000000000 +0200
@@ -173,7 +173,7 @@
 #ifdef HAVE_SECURITY_PAM_MISC_H
 static struct passwd pwdcopy;
 #endif
-char    hostaddress[4];		/* used in checktty.c */
+char    hostaddress[16];	/* used in checktty.c */
 char	*hostname;		/* idem */
 static char	*username, *tty_name, *tty_number;
 static char	thishost[100];
@@ -281,7 +281,7 @@
 	if (hostname) {
 		xstrncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
 		if (hostaddress[0])
-			memcpy(&ut.ut_addr, hostaddress, sizeof(ut.ut_addr));
+			memcpy(&ut.ut_addr_v6, hostaddress, sizeof(ut.ut_addr_v6));
 	}
 #if HAVE_UPDWTMP		/* bad luck for ancient systems */
 	updwtmp(_PATH_BTMP, &ut);
@@ -380,13 +380,32 @@
 
 	  hostname = strdup(optarg); 	/* strdup: Ambrose C. Li */
 	  {
-		  struct hostent *he = gethostbyname(hostname);
+		struct addrinfo hints, *addr_info;
+		int k=0;
+		
+		memset(&hints, '\0', sizeof(hints));
+		hints.ai_flags = AI_ADDRCONFIG;
+		
+		if (getaddrinfo(hostname, NULL, &hints, &addr_info) != 0)
+		    fprintf(stderr, "getaddrinfo: %s\n", strerror(errno));
+
+		hostaddress[0] = 0;
 
-		  /* he points to static storage; copy the part we use */
-		  hostaddress[0] = 0;
-		  if (he && he->h_addr_list && he->h_addr_list[0])
-			  memcpy(hostaddress, he->h_addr_list[0],
-				 sizeof(hostaddress));
+		if (addr_info && (addr_info->ai_family == AF_INET))
+		{
+		    struct sockaddr_in *sa4;
+		    
+		    sa4 = (struct sockaddr_in *)addr_info->ai_addr;
+		    memcpy(hostaddress, &(sa4->sin_addr), sizeof(sa4->sin_addr));
+		}
+		if (addr_info && (addr_info->ai_family == AF_INET6))
+		{
+		    struct sockaddr_in6 *sa6;
+		    
+		    sa6 = (struct sockaddr_in6 *)addr_info->ai_addr;
+		    memcpy(hostaddress, &(sa6->sin6_addr), sizeof(sa6->sin6_addr));
+		}
+		freeaddrinfo(addr_info);
 	  }
 	  break;
 	  
@@ -906,7 +925,7 @@
 	if (hostname) {
 		xstrncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
 		if (hostaddress[0])
-			memcpy(&ut.ut_addr, hostaddress, sizeof(ut.ut_addr));
+			memcpy(&ut.ut_addr_v6, hostaddress, sizeof(ut.ut_addr_v6));
 	}
 	
 	pututline(&ut);
--- util-linux-2.13-pre6/login-utils/login.h.ipv6	2005-08-02 14:01:18.000000000 +0200
+++ util-linux-2.13-pre6/login-utils/login.h	2006-07-17 11:05:48.000000000 +0200
@@ -1,7 +1,7 @@
 /* defined in login.c */
 extern void badlogin(const char *s);
 extern void sleepexit(int);
-extern char hostaddress[4];
+extern char hostaddress[16];
 extern char *hostname;
 
 /* defined in checktty.c */


Index: util-linux-selinux.pamd
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-selinux.pamd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util-linux-selinux.pamd	26 Oct 2005 20:30:10 -0000	1.5
+++ util-linux-selinux.pamd	17 Jul 2006 09:09:59 -0000	1.6
@@ -6,6 +6,7 @@
 password   include      system-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
+session    optional     pam_keyinit.so force revoke
 session    include      system-auth
 session    required     pam_loginuid.so
 session    optional     pam_console.so


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- util-linux.spec	12 Jul 2006 08:39:17 -0000	1.128
+++ util-linux.spec	17 Jul 2006 09:09:59 -0000	1.129
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.31.1
+Release: 0.32
 License: distributable
 Group: System Environment/Base
 
@@ -217,6 +217,8 @@
 Patch243: util-linux-2.13-swap-page.patch
 # Don't use linux/posix_types.h or asm/posix_types.h
 Patch244: util-linux-2.13-nfs4-posix_types.patch
+# IPv6 support to login command
+Patch245: util-linux-2.13-login-ipv6.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -312,6 +314,7 @@
 %patch242 -p1
 %patch243 -p1
 %patch244 -p1
+%patch245 -p1
 
 %build
 unset LINGUAS || :
@@ -702,6 +705,12 @@
 /sbin/losetup
 
 %changelog
+* Mon Jul 17 2006 Karel Zak <kzak at redhat.com> 2.13-0.32
+- add IPv6 support to the login command (patch by Milan Zazrivec)
+
+* Thu Jul 13 2006 David Howells <dhowells at redhat.com>
+- fix #198626 - add keyinit instructions to the login PAM script
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.31.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:19:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:19:47 -0400
Subject: rpms/vsftpd/devel vsftpd-2.0.5-default_ipv6.patch, NONE,
	1.1 vsftpd.spec, 1.45, 1.46
Message-ID: <200607170919.k6H9JlVm009341@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9310

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.5-default_ipv6.patch 
Log Message:
- listen to IPv6 connections in default conf file

vsftpd-2.0.5-default_ipv6.patch:
 vsftpd.conf |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE vsftpd-2.0.5-default_ipv6.patch ---
--- vsftpd-2.0.5/vsftpd.conf.ipv6	2006-07-12 15:34:13.000000000 +0200
+++ vsftpd-2.0.5/vsftpd.conf	2006-07-17 11:16:10.000000000 +0200
@@ -105,4 +105,5 @@
 userlist_enable=YES
 #enable for standalone mode
 listen=YES
+listen_ipv6=YES
 tcp_wrappers=YES


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vsftpd.spec	13 Jul 2006 15:21:59 -0000	1.45
+++ vsftpd.spec	17 Jul 2006 09:19:44 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -31,6 +31,7 @@
 Patch16: vsfptd-2.0.3-user_config.patch
 Patch17: vsftpd-2.0.3-pam_hostname.patch
 Patch18: vsftpd-close-std-fds.patch
+Patch19: vsftpd-2.0.5-default_ipv6.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -76,6 +77,7 @@
 %patch16 -p1 -b .user_config
 %patch17 -p1 -b .old-pam
 %patch18 -p1 -b .close-fds
+%patch19 -p1
 
 %build
 %ifarch s390x
@@ -134,6 +136,9 @@
 /var/ftp
 
 %changelog
+* Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-3
+- listen to IPv6 connections in default conf file
+
 * Thu Jul 13 2006 Radek Vokal <rvokal at redhat.com> - 2.0.5-2
 - add keyinit instructions to the vsftpd PAM script (#198637)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:24:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:24:15 -0400
Subject: rpms/paps/devel paps-cups.patch,1.4,1.5 paps.spec,1.10,1.11
Message-ID: <200607170924.k6H9OFoU010854@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10811

Modified Files:
	paps-cups.patch paps.spec 
Log Message:
revert 'document-charset' change

paps-cups.patch:
 configure.in    |   13 +++++
 src/Makefile.am |    4 -
 src/paps.c      |  131 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 141 insertions(+), 7 deletions(-)

Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- paps-cups.patch	17 Jul 2006 05:03:29 -0000	1.4
+++ paps-cups.patch	17 Jul 2006 09:24:12 -0000	1.5
@@ -65,7 +65,7 @@
    int do_tumble = -1;   /* -1 means not initialized */
    int do_duplex = -1;
    gchar *paps_header = NULL;
-@@ -323,12 +325,118 @@
+@@ -323,12 +325,115 @@
    int header_sep = 20;
    int max_width = 0, w;
    GIConv cvh = NULL;
@@ -173,9 +173,6 @@
 +		}
 +		if (getenv("CHARSET") != NULL)
 +			encoding = g_strdup(getenv("CHARSET"));
-+		if ((val = cupsGetOption("document-charset", num_options, options)) != NULL) {
-+			encoding = g_strdup(val);
-+		}
 +	}
 +  } G_STMT_END;
 +
@@ -184,7 +181,7 @@
    /* Parse command line */
    if (!g_option_context_parse(ctxt, &argc, &argv, &error))
      {
-@@ -355,6 +463,8 @@
+@@ -355,6 +460,8 @@
        IN = stdin;
      }
    title = filename_in;
@@ -193,7 +190,7 @@
    
    paps = paps_new();
    pango_context = paps_get_pango_context (paps);
-@@ -373,8 +483,10 @@
+@@ -373,8 +480,10 @@
    pango_context_set_font_description (pango_context, font_description);
  
    /* Page layout */
@@ -206,7 +203,7 @@
    
    if (num_columns == 1)
      total_gutter_width = 0;
-@@ -435,6 +547,7 @@
+@@ -435,6 +544,7 @@
    page_layout.pango_dir = pango_dir;
    page_layout.filename = filename_in;
    page_layout.header_font_desc = header_font_desc;
@@ -214,7 +211,7 @@
  
    /* calculate x-coordinate scale */
    if (cpi > 0.0L)
-@@ -781,6 +894,7 @@
+@@ -781,6 +891,7 @@
    int orientation = page_layout->page_width > page_layout->page_height;
    int bb_page_width = page_layout->page_width;
    int bb_page_height = page_layout->page_height;
@@ -222,7 +219,7 @@
    
    /* Keep bounding box non-rotated to make ggv happy */
    if (orientation)
-@@ -790,12 +904,20 @@
+@@ -790,12 +901,20 @@
        bb_page_height = tmp;
      }
    
@@ -244,7 +241,7 @@
            "%%%%BeginProlog\n"
            "%%%%Orientation: %s\n"
            "/papsdict 1 dict def\n"
-@@ -845,8 +967,10 @@
+@@ -845,8 +964,10 @@
            title,
            bb_page_width,
            bb_page_height,


Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- paps.spec	17 Jul 2006 05:03:29 -0000	1.10
+++ paps.spec	17 Jul 2006 09:24:12 -0000	1.11
@@ -78,7 +78,6 @@
 %changelog
 * Mon Jul 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-11
 - add an owner info to PS.
-- support "document-charset" attribute.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-10.2
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:30:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:30:12 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.3-build-fixes.patch, NONE,
 1.1 binutils-2.17.50.0.3-elfvsb-test.patch, NONE,
 1.1 binutils-2.17.50.0.3-ia64-lib64.patch, NONE,
 1.1 binutils-2.17.50.0.3-kept-section.patch, NONE,
 1.1 binutils-2.17.50.0.3-ltconfig-multilib.patch, NONE,
 1.1 binutils-2.17.50.0.3-place-orphan.patch, NONE,
 1.1 binutils-2.17.50.0.3-power6-insns.patch, NONE,
 1.1 binutils-2.17.50.0.3-ppc64-pie.patch, NONE,
 1.1 binutils-2.17.50.0.3-standards.patch, NONE, 1.1 .cvsignore, 1.26,
 1.27 binutils.spec, 1.94, 1.95 sources, 1.27,
 1.28 binutils-2.17.50.0.2-20060601.patch, 1.1,
 NONE binutils-2.17.50.0.2-amdfam10.patch, 1.1,
 NONE binutils-2.17.50.0.2-build-fixes.patch, 1.1,
 NONE binutils-2.17.50.0.2-bz2513.patch, 1.1,
 NONE binutils-2.17.50.0.2-bz2721.patch, 1.1,
 NONE binutils-2.17.50.0.2-elfvsb-test.patch, 1.1,
 NONE binutils-2.17.50.0.2-hash-style.patch, 1.2,
 NONE binutils-2.17.50.0.2-ia64-lib64.patch, 1.1,
 NONE binutils-2.17.50.0.2-install-info.patch, 1.1,
 NONE binutils-2.17.50.0.2-kept-section.patch, 1.1, NO!
 NE binutils-2.17.50.0.2-ltconfig-multilib.patch, 1.1,
 NONE binutils-2.17.50.0.2-perturb.patch, 1.1,
 NONE binutils-2.17.50.0.2-place-orphan.patch, 1.1,
 NONE binutils-2.17.50.0.2-power6-insns.patch, 1.1,
 NONE binutils-2.17.50.0.2-power6.patch, 1.1,
 NONE binutils-2.17.50.0.2-ppc64-pie.patch, 1.1,
 NONE binutils-2.17.50.0.2-standards.patch, 1.1,
 NONE binutils-2.17.50.0.2-tls_common.patch, 1.2,
 NONE binutils-2.17.50.0.2-x86-march.patch, 1.1,
 NONE binutils-2.17.50.0.2-x86-nops.patch, 1.1,
 NONE binutils-2.17.50.0.2-x86-nops2.patch, 1.1, NONE
Message-ID: <200607170930.k6H9UCWN012952@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12907

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	binutils-2.17.50.0.3-build-fixes.patch 
	binutils-2.17.50.0.3-elfvsb-test.patch 
	binutils-2.17.50.0.3-ia64-lib64.patch 
	binutils-2.17.50.0.3-kept-section.patch 
	binutils-2.17.50.0.3-ltconfig-multilib.patch 
	binutils-2.17.50.0.3-place-orphan.patch 
	binutils-2.17.50.0.3-power6-insns.patch 
	binutils-2.17.50.0.3-ppc64-pie.patch 
	binutils-2.17.50.0.3-standards.patch 
Removed Files:
	binutils-2.17.50.0.2-20060601.patch 
	binutils-2.17.50.0.2-amdfam10.patch 
	binutils-2.17.50.0.2-build-fixes.patch 
	binutils-2.17.50.0.2-bz2513.patch 
	binutils-2.17.50.0.2-bz2721.patch 
	binutils-2.17.50.0.2-elfvsb-test.patch 
	binutils-2.17.50.0.2-hash-style.patch 
	binutils-2.17.50.0.2-ia64-lib64.patch 
	binutils-2.17.50.0.2-install-info.patch 
	binutils-2.17.50.0.2-kept-section.patch 
	binutils-2.17.50.0.2-ltconfig-multilib.patch 
	binutils-2.17.50.0.2-perturb.patch 
	binutils-2.17.50.0.2-place-orphan.patch 
	binutils-2.17.50.0.2-power6-insns.patch 
	binutils-2.17.50.0.2-power6.patch 
	binutils-2.17.50.0.2-ppc64-pie.patch 
	binutils-2.17.50.0.2-standards.patch 
	binutils-2.17.50.0.2-tls_common.patch 
	binutils-2.17.50.0.2-x86-march.patch 
	binutils-2.17.50.0.2-x86-nops.patch 
	binutils-2.17.50.0.2-x86-nops2.patch 
Log Message:
2.17.50.0.3-1

binutils-2.17.50.0.3-build-fixes.patch:
 ld-elfcomm/common1b.c |    6 +++++-
 ld-shared/main.c      |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.3-build-fixes.patch ---
2006-02-14  Jakub Jelinek  <jakub at redhat.com>

ld/testsuite/
	* ld-shared/main.c (main): Prevent warnings about unused p.
	* ld-elfcomm/common1b.c (dummy1): Add __attribute__((__used__)) for
	GCC 3.3+.

--- ld/testsuite/ld-shared/main.c.jj	2001-07-11 15:48:54.000000000 +0200
+++ ld/testsuite/ld-shared/main.c	2006-02-14 10:07:08.000000000 +0100
@@ -40,6 +40,8 @@ main ()
 {
   int (*p) ();
 
+  p = (void *) 0;
+  (void) p;
   printf ("mainvar == %d\n", mainvar);
   printf ("overriddenvar == %d\n", overriddenvar);
   printf ("shlibvar1 == %d\n", shlibvar1);
--- ld/testsuite/ld-elfcomm/common1b.c.jj	2003-04-15 11:38:10.000000000 +0200
+++ ld/testsuite/ld-elfcomm/common1b.c	2006-02-14 10:11:19.000000000 +0100
@@ -1,3 +1,7 @@
-static char dummy1 = 'X';
+static char dummy1
+#if defined __GNUC__ && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+  __attribute__((__used__))
+#endif
+  = 'X';
 char foo1 [] = "Aligned at odd byte.";
 char foo2 [4];

binutils-2.17.50.0.3-elfvsb-test.patch:
 elfvsb.exp |    8 ++++----
 sh1.c      |    6 ++++++
 sh2.c      |   10 ++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

--- NEW FILE binutils-2.17.50.0.3-elfvsb-test.patch ---
2004-08-03  Jakub Jelinek  <jakub at redhat.com>

	* ld-elfvsb/sh1.c (overriddenvar, shlib_overriddencall2): If
	!SHARED, move to...
	* ld-elfvsb/sh2.c: ... here.
	* ld-elfvsb/elfvsb.exp: Add -DSHARED to compiler options when building
	{sh[123],main}.c with $picflag.

--- ld/testsuite/ld-elfvsb/sh1.c.jj	2003-05-05 17:46:50.000000000 -0400
+++ ld/testsuite/ld-elfvsb/sh1.c	2004-08-03 13:15:48.000000000 -0400
@@ -13,7 +13,11 @@ extern int mainvar;
 /* This variable is defined in the shared library, and overridden by
    the main program.  */
 #ifndef XCOFF_TEST
+#ifdef SHARED
 int overriddenvar = -1;
+#else
+extern int overriddenvar;
+#endif
 #endif
 
 /* This variable is defined in the shared library.  */
@@ -76,12 +80,14 @@ shlib_shlibcall2 ()
   return shlib_overriddencall2 ();
 }
 
+#ifdef SHARED
 int
 shlib_overriddencall2 ()
 {
   return 7;
 }
 #endif
+#endif
 
 /* This function calls a function defined by the main program.  */
 
--- ld/testsuite/ld-elfvsb/elfvsb.exp.jj	2004-05-27 14:26:05.000000000 -0400
+++ ld/testsuite/ld-elfvsb/elfvsb.exp	2004-08-03 13:13:40.000000000 -0400
@@ -315,8 +315,8 @@ proc visibility_run {visibility} {
 
 	# Now compile the code using -fpic.
 
-	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
-	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
+	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
+	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
 	    unresolved "visibility ($visibility)"
 	} else {
 	    if { [ string match $visibility "protected" ]
@@ -337,7 +337,7 @@ proc visibility_run {visibility} {
     }
 
     # Now do the same tests again, but this time compile main.c PIC.
-    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
+    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
 	unresolved "visibility ($visibility) (PIC main, non PIC so)"
 	unresolved "visibility ($visibility) (PIC main)"
     } else {
@@ -446,7 +446,7 @@ if { ![ld_compile "$CC -g $CFLAGS" $srcd
 if { ![ld_compile "$CC -g $CFLAGS" $srcdir/$subdir/test.c tmpdir/test.o] } {
     unresolved "weak hidden symbol"
 } else {
-   if { ![ld_compile "$CC -g $CFLAGS $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
+   if { ![ld_compile "$CC -g $CFLAGS -DSHARED $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
 	unresolved "weak hidden symbol"
     } else {
 	if ![ld_simple_link $ld tmpdir/sh3.so "-shared tmpdir/sh3.o"] {
--- ld/testsuite/ld-elfvsb/sh2.c.jj	2003-05-05 17:46:50.000000000 -0400
+++ ld/testsuite/ld-elfvsb/sh2.c	2004-08-03 13:14:22.000000000 -0400
@@ -44,3 +44,13 @@ visibility_func_weak ()
   return 2;
 }
 #endif
+
+#if !defined (XCOFF_TEST) && !defined (SHARED)
+int overriddenvar = -1;
+
+int
+shlib_overriddencall2 ()
+{
+  return 7;
+}
+#endif


binutils-2.17.50.0.3-ia64-lib64.patch:
 ld/emulparams/elf64_ia64.sh |   10 ++++++++++
 ltconfig                    |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE binutils-2.17.50.0.3-ia64-lib64.patch ---
2004-05-14  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on
	ia64-linux if /lib64 tree is present.

--- ld/emulparams/elf64_ia64.sh.jj	2004-02-18 20:06:03.000000000 +0100
+++ ld/emulparams/elf64_ia64.sh	2004-05-14 10:11:22.992278608 +0200
@@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL
 # .dtors.  They have to be next to .sbss/.sbss2/.sdata/.sdata2.
 SMALL_DATA_CTOR=" "
 SMALL_DATA_DTOR=" "
+
+# Linux modify the default library search path to first include
+# a 64-bit specific directory.
+case "$target" in
+  ia64*-linux*)
+    case "$EMULATION_NAME" in
+      *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac
--- ltconfig	2003-02-03 16:56:49.000000000 +0900
+++ ltconfig	2003-02-03 16:56:49.000000000 +0900
@@ -1240,10 +1240,10 @@
 
   # Find out which ABI we are using (multilib hack).
   case "$host_cpu" in
-  x86_64*|s390*|sparc*|ppc*|powerpc*)
+  x86_64*|s390*|sparc*|ppc*|powerpc*|ia64)
     echo "$progname:@lineno@: checking multilib ABI type" 1>&5
     touch conftest.$ac_ext
-    if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+    if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
       case `/usr/bin/file conftest.o` in
       *64-bit*)
 	sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"

binutils-2.17.50.0.3-kept-section.patch:
 elf-bfd.h |    5 +++++
 elflink.c |   13 +++++++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE binutils-2.17.50.0.3-kept-section.patch ---
2006-04-24  Michael Matz  <matz at suse.de>
	    H.J. Lu  <hongjiu.lu at intel.com>

	* elf-bfd.h (bfd_elf_section_data): Add kept_section.
	(elf_kept_section): New.

	* elflink.c (_bfd_elf_check_kept_section): Cache the result in
	elf_kept_section.

--- bfd/elf-bfd.h.kept	2006-03-16 12:37:42.000000000 -0800
+++ bfd/elf-bfd.h	2006-04-24 20:11:00.000000000 -0700
@@ -1168,6 +1168,10 @@ struct bfd_elf_section_data
      the linker.  */
   asection *next_in_group;
 
+  /* The pointer to the real kept section. It is computed from the
+     kept_section field in asection due to section group.  */ 
+  asection *kept_section;
+
   /* A pointer used for various section optimizations.  */
   void *sec_info;
 };
@@ -1180,6 +1184,7 @@ struct bfd_elf_section_data
 #define elf_group_id(sec)      (elf_section_data(sec)->group.id)
 #define elf_next_in_group(sec) (elf_section_data(sec)->next_in_group)
 #define elf_sec_group(sec)	(elf_section_data(sec)->sec_group)
+#define elf_kept_section(sec) (elf_section_data(sec)->kept_section)
 
 /* Return TRUE if section has been discarded.  */
 #define elf_discarded_section(sec)				\
--- bfd/elflink.c.kept	2006-04-24 15:36:18.000000000 -0700
+++ bfd/elflink.c	2006-04-24 20:18:03.000000000 -0700
@@ -6798,7 +6799,14 @@ _bfd_elf_check_kept_section (asection *s
 {
   asection *kept;
 
+  kept = elf_kept_section (sec);
+  if (kept)
+    return kept;
+
   kept = sec->kept_section;
+  if (!kept)
+    return kept;
+
   if (kept != NULL)
     {
       if (elf_sec_group (sec) != NULL)
@@ -6806,6 +6814,12 @@ _bfd_elf_check_kept_section (asection *s
       if (kept != NULL && sec->size != kept->size)
 	kept = NULL;
     }
+
+  if (kept)
+    elf_kept_section (sec) = kept;
+  else
+    sec->kept_section = NULL;
+
   return kept;
 }
 

binutils-2.17.50.0.3-ltconfig-multilib.patch:
 ltconfig |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE binutils-2.17.50.0.3-ltconfig-multilib.patch ---
--- ltconfig.jj	2003-02-03 16:56:49.000000000 +0900
+++ ltconfig	2003-02-03 16:56:49.000000000 +0900
@@ -1237,6 +1237,23 @@
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
+
+  # Find out which ABI we are using (multilib hack).
+  case "$host_cpu" in
+  x86_64*|s390*|sparc*|ppc*|powerpc*)
+    echo "$progname:@lineno@: checking multilib ABI type" 1>&5
+    touch conftest.$ac_ext
+    if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+      case `/usr/bin/file conftest.o` in
+      *64-bit*)
+	sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+	sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
   ;;
 
 netbsd*)

binutils-2.17.50.0.3-place-orphan.patch:
 elf64ppc.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.3-place-orphan.patch ---
2003-08-05  Jakub Jelinek  <jakub at redhat.com>

	* emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd.

--- ld/emulparams/elf64ppc.sh.jj	2003-07-28 10:24:45.000000000 -0400
+++ ld/emulparams/elf64ppc.sh	2003-08-05 08:35:58.000000000 -0400
@@ -28,7 +28,8 @@ else
   .toc		0 : { *(.toc) }"
 fi
 OTHER_GOT_RELOC_SECTIONS="
-  .rela.toc	${RELOCATING-0} : { *(.rela.toc) }"
+  .rela.toc	${RELOCATING-0} : { *(.rela.toc) }
+  .rela.opd	${RELOCATING-0} : { *(.rela.opd) }"
 OTHER_READWRITE_SECTIONS="
   .toc1		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) }
   .opd		${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }"

binutils-2.17.50.0.3-power6-insns.patch:
 ppc-opc.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE binutils-2.17.50.0.3-power6-insns.patch ---
2006-07-11  Peter Bergner  <bergner at vnet.ibm.com>

	* ppc-opc.c (POWER6): Define.
	(powerpc_opcodes): Add "mffgpr" and "mftgpr" opcodes.

--- opcodes/ppc-opc.c	15 Nov 2005 21:33:04 -0000	1.85
+++ opcodes/ppc-opc.c	11 Jul 2006 21:56:59 -0000
@@ -1823,6 +1823,7 @@ extract_tbr (unsigned long insn,
 #define NOPOWER4 PPC_OPCODE_NOPOWER4 | PPCCOM
 #define POWER4	PPC_OPCODE_POWER4
 #define POWER5	PPC_OPCODE_POWER5
+#define POWER6	PPC_OPCODE_POWER6
 #define PPC32   PPC_OPCODE_32 | PPC_OPCODE_PPC
 #define PPC64   PPC_OPCODE_64 | PPC_OPCODE_PPC
 #define PPC403	PPC_OPCODE_403
@@ -4255,6 +4256,9 @@ const struct powerpc_opcode powerpc_opco
 
 { "lfdxe",   X(31,607), X_MASK,		BOOKE64,	{ FRT, RA0, RB } },
 
+{ "mffgpr",  XRC(31,607,0), XRA_MASK,	POWER6,		{ FRT, RB } },
+{ "mftgpr",  XRC(31,735,0), XRA_MASK,	POWER6,		{ RT, FRB } },
+
 { "mfsri",   X(31,627), X_MASK,		PWRCOM,		{ RT, RA, RB } },
 
 { "dclst",   X(31,630), XRB_MASK,	PWRCOM,		{ RS, RA } },

binutils-2.17.50.0.3-ppc64-pie.patch:
 elf64-ppc.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.17.50.0.3-ppc64-pie.patch ---
--- bfd/elf64-ppc.c.jj	2004-09-27 16:46:06.000000000 -0400
+++ bfd/elf64-ppc.c	2004-10-04 09:09:50.000000000 -0400
@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_
 	      else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf)
 		       && !is_opd
 		       && r_type != R_PPC64_TOC)
-		outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		{
+		  outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type);
+		  if (h->elf.dynindx == -1
+		      && h->elf.root.type == bfd_link_hash_undefweak)
+		  memset (&outrel, 0, sizeof outrel);
+		}
 	      else
 		{
 		  /* This symbol is local, or marked to become local,

binutils-2.17.50.0.3-standards.patch:
 standards.texi |  493 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 322 insertions(+), 171 deletions(-)

--- NEW FILE binutils-2.17.50.0.3-standards.patch ---
--- etc/standards.texi.jj	2002-02-27 11:32:17.000000000 +0100
+++ etc/standards.texi	2005-08-18 19:05:42.000000000 +0200
@@ -3,16 +3,13 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
- at set lastupdate February 14, 2002
+ at set lastupdate June 8, 2005
 @c %**end of header
 
- at ifnottex
- at format
-START-INFO-DIR-ENTRY
+ at dircategory GNU organization
+ at direntry
 * Standards: (standards).        GNU coding standards.
-END-INFO-DIR-ENTRY
- at end format
- at end ifnottex
+ at end direntry
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY
 @set CHAPTER node
 @end ifnottex
 
- at ifnottex
-GNU Coding Standards
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ at copying
+The GNU coding standards, last updated @value{lastupdate}.
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1
@@ -43,32 +42,25 @@ with no Invariant Sections, with no
 Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
- at end ifnottex
+ at end copying
 
 @titlepage
 @title GNU Coding Standards
 @author Richard Stallman, et al.
 @author last updated @value{lastupdate}
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no
-Front-Cover Texts, and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+ at insertcopying
 @end titlepage
 
- at ifnottex
+ at contents
+
+ at ifnottex
 @node Top, Preface, (dir), (dir)
 @top Version
 
-Last updated @value{lastupdate}.
- at end ifnottex
+ at insertcopying
+ at end ifnottex
 
 @menu
 * Preface::                     About the GNU Coding Standards
@@ -101,15 +93,10 @@ This release of the GNU Coding Standards
 @cindex where to obtain @code{standards.texi}
 @cindex downloading this manual
 If you did not obtain this file directly from the GNU project and
-recently, please check for a newer version.  You can ftp the GNU
-Coding Standards from any GNU FTP host in the directory
- at file{/pub/gnu/standards/}.  The GNU Coding Standards are available
-there in several different formats: @file{standards.text},
- at file{standards.info}, and @file{standards.dvi}, as well as the
-Texinfo ``source'' which is divided in two files:
- at file{standards.texi} and @file{make-stds.texi}.  The GNU Coding
-Standards are also available on the GNU World Wide Web server:
- at uref{http://www.gnu.org/prep/standards_toc.html}.
+recently, please check for a newer version.  You can get the GNU
+Coding Standards from the GNU web server in many
+different formats, including the Texinfo source, PDF, HTML, DVI, plain
+text, and more, at: @uref{http://www.gnu.org/prep/standards/}.
 
 Corrections or suggestions for this document should be sent to
 @email{bug-standards@@gnu.org}.  If you make a suggestion, please include a
@@ -129,11 +116,15 @@ be self-consistent---try to stick to the
 to document them as much as possible.  That way, your program will be
 more maintainable by others.
 
+The GNU Hello program serves as an example of how to follow the GNU
+coding standards for a trivial program which prints @samp{Hello,
+world!}.  @uref{http://www.gnu.org/software/hello/hello.html}.
+
 @node Legal Issues
 @chapter Keeping Free Software Free
 @cindex legal aspects
 
-This @value{CHAPTER} discusses how you can make sure that GNU software
+This chapter discusses how you can make sure that GNU software
 avoids legal difficulties, and other related issues.
 
 @menu
@@ -211,7 +202,7 @@ You might have to take that code out aga
 You don't need papers for changes of a few lines here or there, since
 they are not significant for copyright purposes.  Also, you don't need
 papers if all you get from the suggestion is some ideas, not actual code
-which you use.  For example, if someone send you one implementation, but
+which you use.  For example, if someone sent you one implementation, but
 you write a different implementation of the same idea, you don't need to
 get papers.
 
@@ -221,7 +212,8 @@ result.
 
 We have more detailed advice for maintainers of programs; if you have
 reached the stage of actually maintaining a program for GNU (whether
-released or not), please ask us for a copy.
+released or not), please ask us for a copy.  It is also available
+online for your perusal: @uref{http://www.gnu.org/prep/maintain/}.
 
 @node Trademarks
 @section Trademarks
@@ -232,24 +224,33 @@ packages or documentation.
 
 Trademark acknowledgements are the statements that such-and-such is a
 trademark of so-and-so.  The GNU Project has no objection to the basic
-idea of trademarks, but these acknowledgements feel like kowtowing, so
-we don't use them.  There is no legal requirement for them.
+idea of trademarks, but these acknowledgements feel like kowtowing, 
+and there is no legal requirement for them, so we don't use them.
 
 What is legally required, as regards other people's trademarks, is to
-avoid using them in ways which a reader might read as naming or labeling
-our own programs or activities.  For example, since ``Objective C'' is
-(or at least was) a trademark, we made sure to say that we provide a
-``compiler for the Objective C language'' rather than an ``Objective C
-compiler''.  The latter is meant to be short for the former, but it does
-not explicitly state the relationship, so it could be misinterpreted as
-using ``Objective C'' as a label for the compiler rather than for the
-language.
+avoid using them in ways which a reader might reasonably understand as
+naming or labeling our own programs or activities.  For example, since
+``Objective C'' is (or at least was) a trademark, we made sure to say
+that we provide a ``compiler for the Objective C language'' rather
+than an ``Objective C compiler''.  The latter would have been meant as
+a shorter way of saying the former, but it does not explicitly state
+the relationship, so it could be misinterpreted as using ``Objective
+C'' as a label for the compiler rather than for the language.
+
+Please don't use ``win'' as an abbreviation for Microsoft Windows in
+GNU software or documentation.  In hacker terminology, calling
+something a ``win'' is a form of praise.  If you wish to praise
+Microsoft Windows when speaking on your own, by all means do so, but
+not in GNU software.  Usually we write the name ``Windows'' in full,
+but when brevity is very important (as in file names and sometimes
+symbol names), we abbreviate it to ``w''.  For instance, the files and
+functions in Emacs that deal with Windows start with @samp{w32}.
 
 @node Design Advice
 @chapter General Program Design
 @cindex program design
 
-This @value{CHAPTER} discusses some of the issues you should take into
+This chapter discusses some of the issues you should take into
 account when designing your program.
 
 @c                         Standard or ANSI C
@@ -263,7 +264,7 @@ account when designing your program.
 @c A major revision of the C Standard appeared in 1999.
 
 @menu
-* Source Language::             Which languges to use.
+* Source Language::             Which languages to use.
 * Compatibility::               Compatibility with other implementations
 * Using Extensions::            Using non-standard features
 * Standard C::                  Using Standard C features
@@ -272,7 +273,7 @@ account when designing your program.
 
 @node Source Language
 @section Which Languages to Use
- at cindex programming languges
+ at cindex programming languages
 
 When you want to use a language that gets compiled and runs at high
 speed, the best language to use is C.  Using another language is like
@@ -476,6 +477,7 @@ For example, please write
     ...
 @end smallexample
 
+ at noindent
 instead of:
 
 @smallexample
@@ -488,11 +490,12 @@ instead of:
 
 A modern compiler such as GCC will generate exactly the same code in
 both cases, and we have been using similar techniques with good success
-in several projects.
+in several projects.  Of course, the former method assumes that
+ at code{HAS_FOO} is defined as either 0 or 1.
 
 While this is not a silver bullet solving all portability problems,
-following this policy would have saved the GCC project alone many person
-hours if not days per year.
+and is not always appropriate, following this policy would have saved
+GCC developers many hours, or even days, per year.
 
 In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in
 GCC which cannot be simply used in @code{if( ...)} statements, there is
@@ -510,7 +513,7 @@ an easy workaround.  Simply introduce an
 @node Program Behavior
 @chapter Program Behavior for All Programs
 
-This @value{CHAPTER} describes conventions for writing robust
+This chapter describes conventions for writing robust
 software.  It also describes general standards for error messages, the
 command line interface, and how libraries should behave.
 
@@ -679,10 +682,12 @@ Error messages from compilers should loo
 @end example
 
 @noindent
-If you want to mention the column number, use this format:
+If you want to mention the column number, use one of these formats:
 
 @example
 @var{source-file-name}:@var{lineno}:@var{column}: @var{message}
+ at var{source-file-name}:@var{lineno}. at var{column}: @var{message}   
+
 @end example
 
 @noindent
@@ -692,6 +697,24 @@ of these conventions are chosen for comp
 numbers assuming that space and all ASCII printing characters have
 equal width, and assuming tab stops every 8 columns.
 
+The error message can also give both the starting and ending positions
+of the erroneous text.  There are several formats so that you can
+avoid redundant information such as a duplicate line number.
+Here are the possible formats:
+
+ at example
+ at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{lineno-2}. at var{column-2}: @var{message}
+ at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{column-2}: @var{message}
+ at var{source-file-name}:@var{lineno-1}- at var{lineno-2}: @var{message}
+ at end example
+
+ at noindent
+When an error is spread over several files, you can use this format:
+
+ at example
+ at var{file-1}:@var{lineno-1}. at var{column-1}- at var{file-2}:@var{lineno-2}. at var{column-2}: @var{message}
+ at end example
+
 Error messages from other noninteractive programs should look like this:
 
 @example
@@ -722,8 +745,9 @@ input from a source other than a termina
 would do best to print error messages using the noninteractive style.)
 
 The string @var{message} should not begin with a capital letter when
-it follows a program name and/or file name.  Also, it should not end
-with a period.
+it follows a program name and/or file name, because that isn't the
+beginning of a sentence.  (The sentence conceptually starts at the
+beginning of the line.)  Also, it should not end with a period.
 
 Error messages from interactive programs, and other messages such as
 usage messages, should start with a capital letter.  But they should not
@@ -767,9 +791,9 @@ multi-column format.
 @section Standards for Graphical Interfaces
 @cindex graphical user interface
 
- at cindex gtk
+ at cindex gtk+
 When you write a program that provides a graphical user interface,
-please make it work with X Windows and the GTK toolkit unless the
+please make it work with X Windows and the GTK+ toolkit unless the
 functionality specifically requires some alternative (for example,
 ``displaying jpeg images while in console mode'').
 
@@ -819,8 +843,15 @@ option as another way to specify it.  Th
 among GNU utilities, and fewer idiosyncracies for users to remember.
 
 @cindex standard command-line options
+ at cindex options, standard command-line
+ at cindex CGI programs, standard options for
+ at cindex PATH_INFO, specifying standard options as
 All programs should support two standard options: @samp{--version}
-and @samp{--help}.
+and @samp{--help}.  CGI programs should accept these as command-line
+options, and also if given as the @env{PATH_INFO}; for instance,
+visiting @url{http://example.org/p.cgi/--help} in a browser should
+output the same information as invoking @samp{p.cgi --help} from the
+command line.
 
 @table @code
 @cindex @samp{--version} option
@@ -1461,9 +1492,7 @@ Used in @code{gawk}.
 Used in @code{su}.
 
 @item machine
-No listing of which programs already use this;
-someone should check to
-see if any actually do, and tell @email{gnu@@gnu.org}.
+Used in @code{uname}.
 
 @item macro-name
 @samp{-M} in @code{ptx}.
@@ -1573,6 +1602,9 @@ Used in GDB.
 @item no-sort
 @samp{-p} in @code{nm}.
 
+ at item no-splash
+Don't print a startup splash screen.
+
 @item no-split
 Used in @code{makeinfo}.
 
@@ -1740,7 +1772,7 @@ Specify an HTTP proxy.
 @samp{-q} in Make.
 
 @item quiet
-Used in many programs to inhibit the usual output.  @strong{Note:} every
+Used in many programs to inhibit the usual output.  Every
 program accepting @samp{--quiet} should accept @samp{--silent} as a
 synonym.
 
@@ -1855,7 +1887,7 @@ Used by @code{recode} to chose files or 
 
 @item silent
 Used in many programs to inhibit the usual output.
- at strong{Note:} every program accepting
+Every program accepting
 @samp{--silent} should accept @samp{--quiet} as a synonym.
 
 @item size
@@ -2098,7 +2130,7 @@ directory.
 @node Writing C
 @chapter Making The Best Use of C
 
-This @value{CHAPTER} provides advice on how best to use the C language
+This chapter provides advice on how best to use the C language
 when writing GNU software.
 
 @menu
@@ -2128,13 +2160,12 @@ These tools will not work on code not fo
 It is also important for function definitions to start the name of the
 function in column zero.  This helps people to search for function
 definitions, and may also help certain tools recognize them.  Thus,
-the proper format is this:
+using Standard C syntax, the format is this:
 
 @example
 static char *
-concat (s1, s2)        /* Name starts in column zero here */
-     char *s1, *s2;
-@{                     /* Open brace in column zero here */
+concat (char *s1, char *s2)
+@{
   @dots{}
 @}
 @end example
@@ -2145,8 +2176,9 @@ this:
 
 @example
 static char *
-concat (char *s1, char *s2)
-@{
+concat (s1, s2)        /* Name starts in column zero here */
+     char *s1, *s2;
+@{                     /* Open brace in column zero here */
   @dots{}
 @}
 @end example
@@ -2383,7 +2415,7 @@ functions.
 @cindex temporary variables
 It used to be common practice to use the same local variables (with
 names like @code{tem}) over and over for different values within one
-function.  Instead of doing this, it is better declare a separate local
+function.  Instead of doing this, it is better to declare a separate local
 variable for each distinct purpose, and give it a name which is
 meaningful.  This not only makes programs easier to understand, it also
 facilitates optimization by good compilers.  You can also move the
@@ -2584,11 +2616,20 @@ Avoid using the format of semi-internal 
 when there is a higher-level alternative (@code{readdir}).
 
 @cindex non- at sc{posix} systems, and portability
-As for systems that are not like Unix, such as MSDOS, Windows, the
-Macintosh, VMS, and MVS, supporting them is often a lot of work.  When
-that is the case, it is better to spend your time adding features that
-will be useful on GNU and GNU/Linux, rather than on supporting other
-incompatible systems.
+As for systems that are not like Unix, such as MSDOS, Windows, VMS,
+MVS, and older Macintosh systems, supporting them is often a lot of
+work.  When that is the case, it is better to spend your time adding
+features that will be useful on GNU and GNU/Linux, rather than on
+supporting other incompatible systems.
+
+If you do support Windows, please do not abbreviate it as ``win''.  In
+hacker terminology, calling something a ``win'' is a form of praise.
+You're free to praise Microsoft Windows on your own if you want, but
+please don't do this in GNU packages.  Instead of abbreviating
+``Windows'' to ``un'', you can write it in full or abbreviate it to
+``woe'' or ``w''.  In GNU Emacs, for instance, we use @samp{w32} in
+file names of Windows-specific files, but the macro for Windows
+conditionals is called @code{WINDOWSNT}.
 
 It is a good idea to define the ``feature test macro''
 @code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU
@@ -2644,37 +2685,50 @@ while ((c = getchar()) != EOF)
   write(file_descriptor, &c, 1);
 @end example
 
-When calling functions, you need not worry about the difference between
-pointers of various types, or between pointers and integers.  On most
-machines, there's no difference anyway.  As for the few machines where
-there is a difference, all of them support Standard C prototypes, so you can
-use prototypes (perhaps conditionalized to be active only in Standard C)
-to make the code work on those systems.
-
-In certain cases, it is ok to pass integer and pointer arguments
-indiscriminately to the same function, and use no prototype on any
-system.  For example, many GNU programs have error-reporting functions
-that pass their arguments along to @code{printf} and friends:
-
- at example
-error (s, a1, a2, a3)
-     char *s;
-     char *a1, *a2, *a3;
-@{
-  fprintf (stderr, "error: ");
-  fprintf (stderr, s, a1, a2, a3);
-@}
+It used to be ok to not worry about the difference between pointers
+and integers when passing arguments to functions.  However, on most
+modern 64-bit machines pointers are wider than @code{int}.
+Conversely, integer types like @code{long long int} and @code{off_t}
+are wider than pointers on most modern 32-bit machines.  Hence it's
+often better nowadays to use prototypes to define functions whose
+argument types are not trivial.
+
+In particular, if functions accept varying argument counts or types
+they should be declared using prototypes containing @samp{...} and
+defined using @file{stdarg.h}.  For an example of this, please see the
+ at uref{http://www.gnu.org/software/gnulib/, Gnulib} error module, which
+declares and defines the following function:
+
+ at example
+/* Print a message with `fprintf (stderr, FORMAT, ...)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
+
+void error (int status, int errnum, const char *format, ...);
 @end example
 
- at noindent
-In practice, this works on all machines, since a pointer is generally
-the widest possible kind of argument; it is much simpler than any
-``correct'' alternative.  Be sure @emph{not} to use a prototype for such
-functions.
+A simple way to use the Gnulib error module is to obtain the two
+source files @file{error.c} and @file{error.h} from the Gnulib library
+source code repository at
+ at uref{http://savannah.gnu.org/cgi-bin/viewcvs/gnulib/gnulib/lib/}.
+Here's a sample use:
 
-If you have decided to use Standard C, then you can instead define
- at code{error} using @file{stdarg.h}, and pass the arguments along to
- at code{vfprintf}.
+ at example
+#include "error.h"
+#include <errno.h>
+#include <stdio.h>
+
+char *program_name = "myprogram";
+
+FILE *
+xfopen (char const *name)
+@{
+  FILE *fp = fopen (name, "r");
+  if (! fp)
+    error (1, errno, "cannot read %s", name);
+  return fp;
+@}
+ at end example
 
 @cindex casting pointers to integers
 Avoid casting pointers to integers if you can.  Such casts greatly
@@ -3000,10 +3054,13 @@ together, we can make the whole subject 
 
 The manual which discusses a program should certainly document all of
 the program's command-line options and all of its commands.  It should
-give examples of their use.  But don't organize the manual as a list of
-features.  Instead, organize it logically, by subtopics.  Address the
-questions that a user will ask when thinking about the job that the
-program does.
+give examples of their use.  But don't organize the manual as a list
+of features.  Instead, organize it logically, by subtopics.  Address
+the questions that a user will ask when thinking about the job that
+the program does.  Don't just tell the reader what each feature can
+do---say what jobs it is good for, and show how to use it for those
+jobs.  Explain what is recommended usage, and what kinds of usage
+users should avoid.
 
 In general, a GNU manual should serve both as tutorial and reference.
 It should be set up for convenient access to each topic through Info,
@@ -3030,9 +3087,9 @@ functions, variables, options, and impor
 the program.  One combined Index should do for a short manual, but
 sometimes for a complex package it is better to use multiple indices.
 The Texinfo manual includes advice on preparing good index entries, see
- at ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo
-Manual}, and see @ref{Indexing Commands, , Defining the Entries of an
-Index, texinfo, The GNU Texinfo manual}.
+ at ref{Index Entries, , Making Index Entries, texinfo, GNU Texinfo}, and
+see @ref{Indexing Commands, , Defining the Entries of an
+Index, texinfo, GNU Texinfo}.
 
 Don't use Unix man pages as a model for how to write GNU documentation;
 most of them are terse, badly structured, and give inadequate
@@ -3041,15 +3098,15 @@ exceptions.)  Also, Unix man pages use a
 different from what we use in GNU manuals.
 
 Please include an email address in the manual for where to report
-bugs @emph{in the manual}.
+bugs @emph{in the text of the manual}.
 
 Please do not use the term ``pathname'' that is used in Unix
 documentation; use ``file name'' (two words) instead.  We use the term
 ``path'' only for search paths, which are lists of directory names.
 
-Please do not use the term ``illegal'' to refer to erroneous input to a
-computer program.  Please use ``invalid'' for this, and reserve the term
-``illegal'' for activities punishable by law.
+Please do not use the term ``illegal'' to refer to erroneous input to
+a computer program.  Please use ``invalid'' for this, and reserve the
+term ``illegal'' for activities prohibited by law.
 
 @node Doc Strings and Manuals
 @section Doc Strings and Manuals
@@ -3092,7 +3149,7 @@ Each program documented in the manual sh
 @samp{@var{program} Invocation} or @samp{Invoking @var{program}}.  This
 node (together with its subnodes, if any) should describe the program's
 command line arguments and how to run it (the sort of information people
-would look in a man page for).  Start with an @samp{@@example}
+would look for in a man page).  Start with an @samp{@@example}
 containing a template for all the options and arguments that the program
 uses.
 
@@ -3210,6 +3267,11 @@ code.  For example, ``New function'' is 
 you add a function, because there should be a comment before the
 function definition to explain what it does.
 
+In the past, we recommended not mentioning changes in non-software
+files (manuals, help files, etc.) in change logs.  However, we've been
+advised that it is a good idea to include them, for the sake of
+copyright records.
+
 However, sometimes it is useful to write one line to describe the
 overall purpose of a batch of changes.
 
@@ -3224,9 +3286,9 @@ Then describe the changes you made to th
 @cindex change logs, style
 
 Here are some simple examples of change log entries, starting with the
-header line that says who made the change and when, followed by
-descriptions of specific changes.  (These examples are drawn from Emacs
-and GCC.)
+header line that says who made the change and when it was installed,
+followed by descriptions of specific changes.  (These examples are
+drawn from Emacs and GCC.)
 
 @example
 1998-08-17  Richard Stallman  <rms@@gnu.org>
@@ -3270,6 +3332,27 @@ Break long lists of function names by cl
 (Fexecute_extended_command): Deal with `keymap' property.
 @end example
 
+When you install someone else's changes, put the contributor's name in
+the change log entry rather than in the text of the entry.  In other
+words, write this:
+
+ at example
+2002-07-14  John Doe  <jdoe@@gnu.org>
+
+        * sewing.c: Make it sew.
+ at end example
+
+ at noindent
+rather than this:
+
+ at example
+2002-07-14  Usual Maintainer  <usual@@gnu.org>
+
+        * sewing.c: Make it sew.  Patch by jdoe@@gnu.org.
+ at end example
+
+As for the date, that should be the date you applied the change.
+
 @node Simple Changes
 @subsection Simple Changes
 
@@ -3291,12 +3374,17 @@ When you change just comments or doc str
 entry for the file, without mentioning the functions.  Just ``Doc
 fixes'' is enough for the change log.
 
-There's no need to make change log entries for documentation files.
-This is because documentation is not susceptible to bugs that are hard
-to fix.  Documentation does not consist of parts that must interact in a
-precisely engineered fashion.  To correct an error, you need not know
-the history of the erroneous passage; it is enough to compare what the
-documentation says with the way the program actually works.
+There's no technical need to make change log entries for documentation
+files.  This is because documentation is not susceptible to bugs that
+are hard to fix.  Documentation does not consist of parts that must
+interact in a precisely engineered fashion.  To correct an error, you
+need not know the history of the erroneous passage; it is enough to
+compare what the documentation says with the way the program actually
+works.
+
+However, you should keep change logs for documentation files when the
+project gets copyright assignments from its contributors, so as to
+make the records of authorship more accurate.
 
 @node Conditional Changes
 @subsection Conditional Changes
@@ -3387,6 +3475,25 @@ page explaining that you don't maintain 
 is more authoritative.  The note should say how to access the Texinfo
 documentation.
 
+Be sure that man pages include a copyright statement and free
+license.  The simple all-permissive license is appropriate for simple
+man pages:
+
+ at example
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+ at end example
+
+For long man pages, with enough explanation and documentation that
+they can be considered true manuals, use the GFDL (@pxref{License for
+Manuals}).
+
+Finally, the GNU help2man program
+(@uref{http://www.gnu.org/software/help2man/}) is one way to automate
+generation of a man page, in this case from @option{--help} output.
+This is sufficient in many cases.
+
 @node Reading other Manuals
 @section Reading other Manuals
 
@@ -3486,19 +3593,26 @@ this:
 @var{cpu}- at var{company}- at var{system}
 @end example
 
-For example, a Sun 3 might be @samp{m68k-sun-sunos4.1}.
+For example, an Athlon-based GNU/Linux system might be
+ at samp{i686-pc-linux-gnu}.
 
 The @code{configure} script needs to be able to decode all plausible
-alternatives for how to describe a machine.  Thus, @samp{sun3-sunos4.1}
-would be a valid alias.  For many programs, @samp{vax-dec-ultrix} would
-be an alias for @samp{vax-dec-bsd}, simply because the differences
-between Ultrix and @sc{bsd} are rarely noticeable, but a few programs
-might need to distinguish them.
- at c Real 4.4BSD now runs on some Suns.
-
-There is a shell script called @file{config.sub} that you can use
+alternatives for how to describe a machine.  Thus,
+ at samp{athlon-pc-gnu/linux} would be a valid alias.
+There is a shell script called
+ at uref{ftp://ftp.gnu.org/gnu/config/config.sub, @file{config.sub}}
+that you can use
 as a subroutine to validate system types and canonicalize aliases.
 
+The @code{configure} script should also take the option
+ at option{--build=@var{buildtype}}, which should be equivalent to a
+plain @var{buildtype} argument.  For example, @samp{configure
+--build=i686-pc-linux-gnu} is equivalent to @samp{configure
+i686-pc-linux-gnu}.  When the build type is not specified by an option
+or argument, the @code{configure} script should normally guess it
+using the shell script
+ at uref{ftp://ftp.gnu.org/gnu/config/config.guess, @file{config.guess}}.
+
 @cindex optional features, configure-time
 Other options are permitted to specify in more detail the software
 or hardware present on the machine, and include or exclude optional
@@ -3558,6 +3672,11 @@ The @code{configure} script should norma
 system as both the host and the target, thus producing a program which
 works for the same type of machine that it runs on.
 
+To compile a program to run on a host type that differs from the build
+type, use the configure option @option{--host=@var{hosttype}}, where
+ at var{hosttype} uses the same syntax as @var{buildtype}.  The host type
+normally defaults to the build type.
+
 To configure a cross-compiler, cross-assembler, or what have you, you
 should specify a target different from the host, using the configure
 option @samp{--target=@var{targettype}}.  The syntax for
@@ -3565,22 +3684,14 @@ option @samp{--target=@var{targettype}}.
 look like this:
 
 @example
-./configure @var{hosttype} --target=@var{targettype}
+./configure --host=@var{hosttype} --target=@var{targettype}
 @end example
 
+The target type normally defaults to the host type.
 Programs for which cross-operation is not meaningful need not accept the
 @samp{--target} option, because configuring an entire operating system for
 cross-operation is not a meaningful operation.
 
-Bootstrapping a cross-compiler requires compiling it on a machine other
-than the host it will run on.  Compilation packages accept a
-configuration option @samp{--build=@var{buildtype}} for specifying the
-configuration on which you will compile them, but the configure script
-should normally guess the build machine type (using
- at file{config.guess}), so this option is probably not necessary.  The
-host and target types normally default from the build type, so in
-bootstrapping a cross-compiler you must specify them both explicitly.
-
 Some programs have ways of configuring themselves automatically.  If
 your program is set up to do this, your @code{configure} script can simply
 ignore most of its arguments.
@@ -3596,6 +3707,10 @@ ignore most of its arguments.
 @section Making Releases
 @cindex packaging
 
+You should identify each release with a pair of version numbers, a
+major version and a minor.  We have no objection to using more than
+two numbers, but it is very unlikely that you really need them.
+
 Package the distribution of @code{Foo version 69.96} up in a gzipped tar
 file with the name @file{foo-69.96.tar.gz}.  It should unpack into a
 subdirectory named @file{foo-69.96}.
@@ -3644,13 +3759,6 @@ able to extract all the files even if th
 
 Make sure that all the files in the distribution are world-readable.
 
-Make sure that no file name in the distribution is more than 14
-characters long.  Likewise, no file created by building the program
-should have a name longer than 14 characters.  The reason for this is
-that some systems adhere to a foolish interpretation of the @sc{posix}
-standard, and refuse to open a longer name, rather than truncating as
-they did in the past.
-
 Don't include any symbolic links in the distribution itself.  If the tar
 file contains symbolic links, then people cannot even unpack it on
 systems that don't support symbolic links.  Also, don't use multiple
@@ -3682,16 +3790,27 @@ other files to get.
 
 A GNU program should not recommend use of any non-free program.  We
 can't stop some people from writing proprietary programs, or stop
-other people from using them, but we can and should avoid helping to
+other people from using them, but we can and should refuse to
 advertise them to new potential customers.  Proprietary software is a
 social and ethical problem, and the point of GNU is to solve that
 problem.
 
+The GNU definition of free software is found on the GNU web site at
+ at url{http://www.gnu.org/philosophy/free-sw.html}.  A list of
+important licenses and whether they qualify as free is in
+ at url{http://www.gnu.org/licenses/license-list.html}.  The terms
+``free'' and ``non-free'', used in this document, refer to that
+definition.  If it is not clear whether a license qualifies as free
+under this definition, please ask the GNU Project by writing to
+ at email{licensing@@gnu.org}.  We will answer, and if the license is an
+important one, we will add it to the list.
+
 When a non-free program or system is well known, you can mention it in
 passing---that is harmless, since users who might want to use it
 probably already know about it.  For instance, it is fine to explain
-how to build your package on top of some non-free operating system, or
-how to use it together with some widely used non-free program.
+how to build your package on top of some widely used non-free
+operating system, or how to use it together with some widely used
+non-free program.
 
 However, you should give only the necessary information to help those
 who already use the non-free program to use your program with
@@ -3700,8 +3819,8 @@ proprietary program, and don't imply tha
 enhances your program, or that its existence is in any way a good
 thing.  The goal should be that people already using the proprietary
 program will get the advice they need about how to use your free
-program, while people who don't already use the proprietary program
-will not see anything to lead them to take an interest in it.
+program with it, while people who don't already use the proprietary
+program will not see anything to lead them to take an interest in it.
 
 If a non-free program or system is obscure in your program's domain,
 your program should not mention or support it at all, since doing so
@@ -3709,13 +3828,46 @@ would tend to popularize the non-free pr
 your program.  (You cannot hope to find many additional users among
 the users of Foobar if the users of Foobar are few.)
 
+Sometimes a program is free software in itself but depends on a
+non-free platform in order to run.  For instance, many Java programs
+depend on Sun's Java implementation, and won't run on the GNU Java
+Compiler (which does not yet have all the features) or won't run with
+the GNU Java libraries.  To recommend that program is inherently to
+recommend the non-free platform as well; if you should not do the
+latter, then don't do the former.
+
 A GNU package should not refer the user to any non-free documentation
 for free software.  Free documentation that can be included in free
-operating systems is essential for completing the GNU system, so it is
-a major focus of the GNU Project; to recommend use of documentation
-that we are not allowed to use in GNU would undermine the efforts to
-get documentation that we can include.  So GNU packages should never
-recommend non-free documentation.
+operating systems is essential for completing the GNU system, or any
+free operating system, so it is a major focus of the GNU Project; to
+recommend use of documentation that we are not allowed to use in GNU
+would weaken the impetus for the community to produce documentation
+that we can include.  So GNU packages should never recommend non-free
+documentation.
+
+By contrast, it is ok to refer to journal articles and textbooks in
+the comments of a program for explanation of how it functions, even
+though they be non-free.  This is because we don't include such things
+in the GNU system even if we are allowed to--they are outside the
+scope of an operating system project.
+
+Referring to a web site that describes or recommends a non-free
+program is in effect promoting that software, so please do not make
+links (or mention by name) web sites that contain such material.  This
+policy is relevant particularly for the web pages for a GNU package.
+
+Following links from nearly any web site can lead to non-free
+software; this is an inescapable aspect of the nature of the web, and
+in itself is no objection to linking to a site.  As long as the site
+does not itself recommend a non-free program, there is no need be
+concerned about the sites it links to for other reasons.
+
+Thus, for example, you should not make a link to AT&T's web site,
+because that recommends AT&T's non-free software packages; you should
+not make a link to a site that links to AT&T's site saying it is a
+place to get a non-free program; but if a site you want to link to
+refers to AT&T's web site in some other context (such as long-distance
+telephone service), that is not a problem.
 
 @node Copying This Manual
 @appendix Copying This Manual
@@ -3730,13 +3882,12 @@ recommend non-free documentation.
 @unnumbered Index
 @printindex cp
 
- at contents
-
 @bye
- at c Local variables:
- at c eval: (add-hook 'write-file-hooks 'time-stamp)
- at c time-stamp-start: "@set lastupdate "
- at c time-stamp-end: "$"
- at c time-stamp-format: "%:b %:d, %:y"
- at c compile-command: "make just-standards"
- at c End:
+
+Local variables:
+eval: (add-hook 'write-file-hooks 'time-stamp)
+time-stamp-start: "@set lastupdate "
+time-stamp-end: "$"
+time-stamp-format: "%:b %:d, %:y"
+compile-command: "make just-standards"
+End:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	1 Jun 2006 09:43:59 -0000	1.26
+++ .cvsignore	17 Jul 2006 09:30:08 -0000	1.27
@@ -1 +1 @@
-binutils-2.17.50.0.2.tar.bz2
+binutils-2.17.50.0.3.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- binutils.spec	14 Jul 2006 17:16:13 -0000	1.94
+++ binutils.spec	17 Jul 2006 09:30:09 -0000	1.95
@@ -1,32 +1,20 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
-Version: 2.17.50.0.2
-Release: 8
+Version: 2.17.50.0.3
+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
-Patch0: binutils-2.17.50.0.2-20060601.patch
-Patch1: binutils-2.17.50.0.2-ltconfig-multilib.patch
-Patch2: binutils-2.17.50.0.2-ppc64-pie.patch
-Patch3: binutils-2.17.50.0.2-place-orphan.patch
-Patch4: binutils-2.17.50.0.2-ia64-lib64.patch
-Patch5: binutils-2.17.50.0.2-elfvsb-test.patch
-Patch6: binutils-2.17.50.0.2-standards.patch
-Patch7: binutils-2.17.50.0.2-build-fixes.patch
-Patch8: binutils-2.17.50.0.2-install-info.patch
-Patch9: binutils-2.17.50.0.2-kept-section.patch
-Patch10: binutils-2.17.50.0.2-bz2721.patch
-Patch11: binutils-2.17.50.0.2-perturb.patch
-Patch12: binutils-2.17.50.0.2-tls_common.patch
-Patch13: binutils-2.17.50.0.2-bz2513.patch
-Patch14: binutils-2.17.50.0.2-hash-style.patch
-Patch15: binutils-2.17.50.0.2-power6.patch
-Patch16: binutils-2.17.50.0.2-power6-insns.patch
-Patch17: binutils-2.17.50.0.2-x86-nops.patch
-Patch18: binutils-2.17.50.0.2-x86-march.patch
-Patch19: binutils-2.17.50.0.2-x86-nops2.patch
-Patch20: binutils-2.17.50.0.2-amdfam10.patch
+Patch1: binutils-2.17.50.0.3-ltconfig-multilib.patch
+Patch2: binutils-2.17.50.0.3-ppc64-pie.patch
+Patch3: binutils-2.17.50.0.3-place-orphan.patch
+Patch4: binutils-2.17.50.0.3-ia64-lib64.patch
+Patch5: binutils-2.17.50.0.3-elfvsb-test.patch
+Patch6: binutils-2.17.50.0.3-standards.patch
+Patch7: binutils-2.17.50.0.3-build-fixes.patch
+Patch8: binutils-2.17.50.0.3-kept-section.patch
+Patch9: binutils-2.17.50.0.3-power6-insns.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -52,7 +40,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .20060601~
 %patch1 -p0 -b .ltconfig-multilib~
 %patch2 -p0 -b .ppc64-pie~
 %patch3 -p0 -b .place-orphan~
@@ -64,19 +51,8 @@
 %patch5 -p0 -b .elfvsb-test~
 %patch6 -p0 -b .standards~
 %patch7 -p0 -b .build-fixes~
-%patch8 -p0 -b .install-info~
-%patch9 -p0 -b .kept-section~
-%patch10 -p0 -b .bz2721~
-%patch11 -p0 -b .perturb~
-%patch12 -p0 -b .tls_common~
-%patch13 -p0 -b .bz2513~
-%patch14 -p0 -b .hash-style~
-%patch15 -p0 -b .power6~
-%patch16 -p0 -b .power6-insns~
-%patch17 -p0 -b .x86-nops~
-%patch18 -p0 -b .x86-march~
-%patch19 -p0 -b .x86-nops2~
-%patch20 -p0 -b .amdfam10~
+%patch8 -p0 -b .kept-section~
+%patch9 -p0 -b .power6-insns~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -188,6 +164,9 @@
 %{_infodir}/*info*
 
 %changelog
+* Mon Jul 17 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-1
+- update to 2.17.50.0.3
+
 * Fri Jul 14 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.2-8
 - add support for new AMDFAM10 instructions (#198281, IT#97662)
 - add -march=/-mtune= gas support on x86/x86-64


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	1 Jun 2006 09:43:59 -0000	1.27
+++ sources	17 Jul 2006 09:30:09 -0000	1.28
@@ -1 +1 @@
-af337e084c3a4c019fd297a622889d40  binutils-2.17.50.0.2.tar.bz2
+684c535df0ff8ffaa11fe4aed14539e7  binutils-2.17.50.0.3.tar.bz2


--- binutils-2.17.50.0.2-20060601.patch DELETED ---


--- binutils-2.17.50.0.2-amdfam10.patch DELETED ---


--- binutils-2.17.50.0.2-build-fixes.patch DELETED ---


--- binutils-2.17.50.0.2-bz2513.patch DELETED ---


--- binutils-2.17.50.0.2-bz2721.patch DELETED ---


--- binutils-2.17.50.0.2-elfvsb-test.patch DELETED ---


--- binutils-2.17.50.0.2-hash-style.patch DELETED ---


--- binutils-2.17.50.0.2-ia64-lib64.patch DELETED ---


--- binutils-2.17.50.0.2-install-info.patch DELETED ---


--- binutils-2.17.50.0.2-kept-section.patch DELETED ---


--- binutils-2.17.50.0.2-ltconfig-multilib.patch DELETED ---


--- binutils-2.17.50.0.2-perturb.patch DELETED ---


--- binutils-2.17.50.0.2-place-orphan.patch DELETED ---


--- binutils-2.17.50.0.2-power6-insns.patch DELETED ---


--- binutils-2.17.50.0.2-power6.patch DELETED ---


--- binutils-2.17.50.0.2-ppc64-pie.patch DELETED ---


--- binutils-2.17.50.0.2-standards.patch DELETED ---


--- binutils-2.17.50.0.2-tls_common.patch DELETED ---


--- binutils-2.17.50.0.2-x86-march.patch DELETED ---


--- binutils-2.17.50.0.2-x86-nops.patch DELETED ---


--- binutils-2.17.50.0.2-x86-nops2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 09:34:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 05:34:49 -0400
Subject: rpms/vnc/devel vnc.spec,1.144,1.145
Message-ID: <200607170934.k6H9Ymgd014024@cvs.devel.redhat.com>

Author: jkudrnac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13962

Modified Files:
	vnc.spec 
Log Message:
added dist to release



Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- vnc.spec	17 Jul 2006 09:25:34 -0000	1.144
+++ vnc.spec	17 Jul 2006 09:34:43 -0000	1.145
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   3
+Release:   3%{?dist}
 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



From fedora-cvs-commits at redhat.com  Mon Jul 17 10:14:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 06:14:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch,
	NONE, 1.1 openoffice.org.spec, 1.771, 1.772
Message-ID: <200607171014.k6HAEPvm013399@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13385

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch 
Log Message:
this might be the crucial missing piece

openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch:
 inc/sal/types.h     |    0 
 sal/inc/sal/types.h |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch ---
Index: inc/sal/types.h
===================================================================
RCS file: /cvs/porting/sal/inc/sal/types.h,v
retrieving revision 1.28
diff -u -r1.28 types.h
--- openoffice.org.orig/sal/inc/sal/types.h	28 Feb 2006 10:34:09 -0000	1.28
+++ openoffice.org/sal/inc/sal/types.h	17 Jul 2006 09:36:33 -0000
@@ -223,7 +223,7 @@
 #     define SAL_DLLPRIVATE        __hidden
 #   elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
 #     define SAL_DLLPUBLIC_EXPORT  __attribute__ ((visibility("default")))
-#     define SAL_DLLPUBLIC_IMPORT
+#     define SAL_DLLPUBLIC_IMPORT  __attribute__ ((visibility("default")))
 #     define SAL_DLLPRIVATE        __attribute__ ((visibility("hidden")))
 #   else
 #     define SAL_DLLPUBLIC_EXPORT


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -r1.771 -r1.772
--- openoffice.org.spec	17 Jul 2006 09:07:10 -0000	1.771
+++ openoffice.org.spec	17 Jul 2006 10:14:22 -0000	1.772
@@ -114,6 +114,7 @@
 Patch48: ooobuild.VBAObjects.patch
 Patch49: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
 Patch50: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
+Patch51: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -855,6 +856,7 @@
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
 %patch49 -p1 -b .gccXXXXX.anonymousexternc.patch
 %patch50 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
+%patch51 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
 
 tar xzf %{SOURCE1}
 
@@ -3343,6 +3345,8 @@
 	-> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
     + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to workaround more gcc foo
+    + add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import
+    visibility the same as exported
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Mon Jul 17 10:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 06:16:43 -0400
Subject: rpms/sed/FC-5 sed-4.1.5-bz185374.patch,NONE,1.1
Message-ID: <200607171016.k6HAGhtr023502@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14181

Added Files:
	sed-4.1.5-bz185374.patch 
Log Message:
Forgot to add patchfile.


sed-4.1.5-bz185374.patch:
 doc/sed.1     |    7 ++
 lib/utils.c   |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 lib/utils.h   |    3 +
 sed/execute.c |    8 ++-
 sed/sed.c     |   22 +++++++-
 sed/sed.h     |    4 +
 6 files changed, 172 insertions(+), 18 deletions(-)

--- NEW FILE sed-4.1.5-bz185374.patch ---
diff -urp sed-4.1.5-orig/doc/sed.1 sed-4.1.5/doc/sed.1
--- sed-4.1.5-orig/doc/sed.1	2006-02-03 10:27:35.000000000 +0100
+++ sed-4.1.5/doc/sed.1	2006-06-29 15:42:07.000000000 +0200
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH SED "1" "February 2006" "sed version 4.1.4" "User Commands"
+.TH SED "1" "June 2006" "sed version 4.1.5" "User Commands"
 .SH NAME
 sed \- stream editor for filtering and transforming text
 .SH SYNOPSIS
@@ -36,6 +36,11 @@ add the contents of script-file to the c
 .IP
 edit files in place (makes backup if extension supplied)
 .HP
+\fB\-c\fR, \fB\-\-copy\fR
+.IP
+use copy instead of rename when shuffling files in \fB\-i\fR mode
+(avoids change of input file ownership)
+.HP
 \fB\-l\fR N, \fB\-\-line\-length\fR=\fIN\fR
 .IP
 specify the desired line-wrap length for the `l' command
diff -urp sed-4.1.5-orig/lib/utils.c sed-4.1.5/lib/utils.c
--- sed-4.1.5-orig/lib/utils.c	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.c	2006-06-29 16:28:05.000000000 +0200
@@ -35,6 +35,12 @@
 # include <stdlib.h>
 #endif /* HAVE_STDLIB_H */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/sendfile.h>
+#include <fcntl.h>
+
 #include "utils.h"
 
 const char *myname;
@@ -315,32 +321,146 @@ do_ck_fclose(fp)
 }
 
 
-/* Panic on failing rename */
+/* Temporary buffer for ck_follow_symlink and ck_fcopy. */
+static char buf[4096];
+static size_t bufsize = sizeof (buf);
+
+/* Follow symlink and panic if something fails.  Returned value is
+   ultimate symlink target, stored in temporary buffer.  You need to
+   strdup the return value, if you intend to use it later.*/
+const char*
+ck_follow_symlink(const char * fname)
+{
+  static struct stat statbuf;
+  int err;
+
+  if (strlen (fname) >= bufsize)
+    panic("ck_follow_symlink: file name too long");
+  strcpy (buf, fname);
+
+  while (1)
+    {
+      err = lstat (buf, &statbuf);
+
+      if (err != 0)
+	panic("ck_follow_symlink: couldn't lstat %s: %s", buf, strerror(errno));
+
+      if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
+	{
+	  err = readlink (buf, buf, bufsize);
+	  if (err < 0)
+	    panic("ck_follow_symlink: readlink failed on %s: %s", buf, strerror(errno));
+	  else if (err == bufsize)
+	    panic("ck_follow_symlink: pointee name too long");
+	  else
+	    buf [err] = '\0';
+	}
+      else
+	break;
+    }
+
+  return buf;
+}
+
+/* Panic on failing unlink */
 void
-ck_rename (from, to, unlink_if_fail)
-  const char *from, *to;
-  const char *unlink_if_fail;
+ck_unlink (name)
+  const char *name;
 {
-  int rd = rename (from, to);
-  if (rd != -1)
-    return;
+  if (unlink (name) == -1)
+    panic (_("cannot remove %s: %s"), name, strerror (errno));
+}
 
-  if (unlink_if_fail)
+/* Attempt to unlink denoted file if operation rd failed. */
+static int
+_unlink_if_fail (rd, unlink_if_fail)
+  int rd;
+  const char *unlink_if_fail;
+{
+  if (rd == -1 && unlink_if_fail)
     {
       int save_errno = errno;
+      ck_unlink (unlink_if_fail);
+      errno = save_errno;
+    }
+
+  return rd != -1;
+}
+
+/* Copy contents between files. */
+static int
+_copy (from, to)
+  const char *from, *to;
+{
+  FILE *infile, *outfile;
+  int c, retval = 0;
       errno = 0;
-      unlink (unlink_if_fail);
 
-      /* Failure to remove the temporary file is more severe, so trigger it first.  */
-      if (errno != 0)
-        panic (_("cannot remove %s: %s"), unlink_if_fail, strerror (errno));
+  infile = fopen (from, "r");
+  if (infile == NULL)
+    return -1;
 
-      errno = save_errno;
+  outfile = fopen (to, "w");
+  if (outfile == NULL)
+    {
+      fclose (infile);
+      return -1;
+    }
+
+  while (1)
+    {
+      size_t bytes_in = fread (buf, 1, bufsize, infile);
+      size_t bytes_out;
+      if (bytes_in == 0)
+	{
+	  if (ferror (infile))
+	    retval = -1;
+	  break;
+	}
+
+      bytes_out = fwrite (buf, 1, bytes_in, outfile);
+      if (bytes_out != bytes_in)
+	{
+	  retval = -1;
+	  break;
+	}
     }
 
+  fclose (outfile);
+  fclose (infile);
+
+  return retval;
+}
+
+/* Panic on failing rename */
+void
+ck_rename (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (rename (from, to), unlink_if_fail))
   panic (_("cannot rename %s: %s"), from, strerror (errno));
 }
 
+/* Attempt to copy file contents between the files. */
+void
+ck_fcmove (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (_copy (from, to), unlink_if_fail))
+    panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
+}
+
+/* Copy contents between files, and then unlink the source. */
+void
+ck_fcopy (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  ck_fcmove (from, to, unlink_if_fail);
+  ck_unlink (from);
+}
 
 
 
diff -urp sed-4.1.5-orig/lib/utils.h sed-4.1.5/lib/utils.h
--- sed-4.1.5-orig/lib/utils.h	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.h	2006-06-29 16:04:21.000000000 +0200
@@ -29,7 +29,10 @@ void ck_fflush P_((FILE *stream));
 void ck_fclose P_((FILE *stream));
 size_t ck_getline P_((char **text, size_t *buflen, FILE *stream));
 FILE * ck_mkstemp P_((char **p_filename, char *tmpdir, char *base));
+const char* ck_follow_symlink P_((const char * fname));
 void ck_rename P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcopy P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcmove P_((const char *from, const char *to, const char *unlink_if_fail));
 
 VOID *ck_malloc P_((size_t size));
 VOID *xmalloc P_((size_t size));
diff -urp sed-4.1.5-orig/sed/execute.c sed-4.1.5/sed/execute.c
--- sed-4.1.5-orig/sed/execute.c	2006-02-03 10:06:39.000000000 +0100
+++ sed-4.1.5/sed/execute.c	2006-06-29 16:12:43.000000000 +0200
@@ -711,16 +711,20 @@ closedown(input)
 
   if (in_place_extension && output_file.fp != NULL)
     {
+      char * target_name = ck_strdup (ck_follow_symlink (input->in_file_name));
       ck_fclose (output_file.fp);
       if (strcmp(in_place_extension, "*") != 0)
         {
           char *backup_file_name = get_backup_file_name(input->in_file_name);
-	  ck_rename (input->in_file_name, backup_file_name, input->out_file_name);
+	  (copy_instead_of_rename?ck_fcmove:ck_rename)
+	    (target_name, backup_file_name, input->out_file_name);
           free (backup_file_name);
 	}
 
-      ck_rename (input->out_file_name, input->in_file_name, input->out_file_name);
+      (copy_instead_of_rename?ck_fcopy:ck_rename)
+	(input->out_file_name, target_name, input->out_file_name);
       free (input->out_file_name);
+      free (target_name);
     }
 
   input->fp = NULL;
diff -urp sed-4.1.5-orig/sed/sed.c sed-4.1.5/sed/sed.c
--- sed-4.1.5-orig/sed/sed.c	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.c	2006-06-29 15:41:52.000000000 +0200
@@ -73,6 +73,10 @@ bool separate_files = false;
 /* How do we edit files in-place? (we don't if NULL) */
 char *in_place_extension = NULL;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+int copy_instead_of_rename = 0;
+
 /* Do we need to be pedantically POSIX compliant? */
 enum posixicity_types posixicity;
 
@@ -107,6 +111,9 @@ Usage: %s [OPTION]... {script-only-if-no
                  add the contents of script-file to the commands to be executed\n"));
   fprintf(out, _("  -i[SUFFIX], --in-place[=SUFFIX]\n\
                  edit files in place (makes backup if extension supplied)\n"));
+  fprintf(out, _("  -c, --copy\n\
+                 use copy instead of rename when shuffling files in -i mode\n\
+		 (avoids change of input file ownership)\n"));
   fprintf(out, _("  -l N, --line-length=N\n\
                  specify the desired line-wrap length for the `l' command\n"));
   fprintf(out, _("  --posix\n\
@@ -142,9 +149,9 @@ main(argc, argv)
   char **argv;
 {
 #ifdef REG_PERL
-#define SHORTOPTS "snrRue:f:l:i::V:"
+#define SHORTOPTS "csnrRue:f:l:i::V:"
 #else
-#define SHORTOPTS "snrue:f:l:i::V:"
+#define SHORTOPTS "csnrue:f:l:i::V:"
 #endif
 
   static struct option longopts[] = {
@@ -155,6 +162,7 @@ main(argc, argv)
     {"expression", 1, NULL, 'e'},
     {"file", 1, NULL, 'f'},
     {"in-place", 2, NULL, 'i'},
+    {"copy", 0, NULL, 'c'},
     {"line-length", 1, NULL, 'l'},
     {"quiet", 0, NULL, 'n'},
     {"posix", 0, NULL, 'p'},
@@ -215,6 +223,10 @@ main(argc, argv)
 	  the_program = compile_file(the_program, optarg);
 	  break;
 
+	case 'c':
+	  copy_instead_of_rename = true;
+	  break;
+
 	case 'i':
 	  separate_files = true;
 	  if (optarg == NULL)
@@ -284,6 +296,12 @@ to the extent permitted by law.\n\
 	}
     }
 
+  if (copy_instead_of_rename && in_place_extension == NULL)
+    {
+      fprintf (stderr, _("Error: -c used without -i.\n"));
+      usage(4);
+    }
+
   if (!the_program)
     {
       if (optind < argc)
diff -urp sed-4.1.5-orig/sed/sed.h sed-4.1.5/sed/sed.h
--- sed-4.1.5-orig/sed/sed.h	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.h	2006-06-29 15:41:52.000000000 +0200
@@ -228,6 +228,10 @@ extern countT lcmd_out_line_len;
 /* How do we edit files in-place? (we don't if NULL) */
 extern char *in_place_extension;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+extern int copy_instead_of_rename;
+
 /* Should we use EREs? */
 extern bool use_extended_syntax_p;
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 10:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 06:28:02 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.129,1.130
Message-ID: <200607171028.k6HAS2Mi028354@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28341

Modified Files:
	util-linux.spec 
Log Message:
fix spec file


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- util-linux.spec	17 Jul 2006 09:09:59 -0000	1.129
+++ util-linux.spec	17 Jul 2006 10:28:00 -0000	1.130
@@ -707,9 +707,8 @@
 %changelog
 * Mon Jul 17 2006 Karel Zak <kzak at redhat.com> 2.13-0.32
 - add IPv6 support to the login command (patch by Milan Zazrivec)
-
-* Thu Jul 13 2006 David Howells <dhowells at redhat.com>
-- fix #198626 - add keyinit instructions to the login PAM script
+- fix #198626 - add keyinit instructions to the login PAM script 
+  (patch by David Howells) 
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.31.1
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:03:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:03:32 -0400
Subject: rpms/pam/devel pam-0.99.5.0-selinux-enoent.patch, NONE, 1.1 pam.spec,
	1.123, 1.124 system-auth.pamd, 1.4, 1.5
Message-ID: <200607171103.k6HB3WdG029208@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29136

Modified Files:
	pam.spec system-auth.pamd 
Added Files:
	pam-0.99.5.0-selinux-enoent.patch 
Log Message:
* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-3
- don't report error in pam_selinux for nonexistent tty (#188722)
- add pam_keyinit to the default system-auth file (#198623)


pam-0.99.5.0-selinux-enoent.patch:
 pam_selinux.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE pam-0.99.5.0-selinux-enoent.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c.enoent	2006-06-30 12:05:15.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_selinux/pam_selinux.c	2006-07-17 11:06:18.000000000 +0200
@@ -206,10 +206,11 @@
 
   if (getfilecon(ptr, &prev_context) < 0)
   {
-    pam_syslog(pamh, LOG_NOTICE,
+    if(errno != ENOENT)
+      pam_syslog(pamh, LOG_NOTICE,
 	     "Warning!  Could not get current context for %s, not relabeling: %m",
 	     ptr);
-      return NULL;
+    return NULL;
   }
   if( security_compute_relabel(usercon,prev_context,SECCLASS_CHR_FILE,
                                &newdev_context)!=0)


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- pam.spec	12 Jul 2006 07:37:04 -0000	1.123
+++ pam.spec	17 Jul 2006 11:03:29 -0000	1.124
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 2.1%{?dist}
+Release: 3%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -34,6 +34,7 @@
 Patch82: pam-0.99.3.0-tally-fail-close.patch
 Patch83: pam-0.99.4.0-succif-service.patch
 Patch84: pam-0.99.5.0-access-gai.patch
+Patch85: pam-0.99.5.0-selinux-enoent.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -96,6 +97,7 @@
 %patch82 -p1 -b .fail-close
 %patch83 -p1 -b .service
 %patch84 -p0 -b .gai
+%patch85 -p1 -b .enoent
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
@@ -363,6 +365,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-3
+- don't report error in pam_selinux for nonexistent tty (#188722)
+- add pam_keyinit to the default system-auth file (#198623)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.5.0-2.1
 - rebuild
 


Index: system-auth.pamd
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/system-auth.pamd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system-auth.pamd	24 Feb 2006 10:46:47 -0000	1.4
+++ system-auth.pamd	17 Jul 2006 11:03:29 -0000	1.5
@@ -11,5 +11,6 @@
 password    sufficient    pam_unix.so try_first_pass use_authtok nullok md5 shadow
 password    required      pam_deny.so
 
+session     optional      pam_keyinit.so revoke
 session     required      pam_limits.so
 session     required      pam_unix.so



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:16:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:16:46 -0400
Subject: rpms/sed/FC-4 sed-4.1.5-bz185374.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 sed.spec, 1.25, 1.26 sources, 1.11, 1.12
Message-ID: <200607171116.k6HBGkZl011704@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31962

Modified Files:
	.cvsignore sed.spec sources 
Added Files:
	sed-4.1.5-bz185374.patch 
Log Message:
- sync with devel branch
  - update to 4.1.5
  - #185374:
    - Follow symlinks before rename (avoid symlink overwrite)
    - Add -c flag for copy instead of rename (avoid ownership change)


sed-4.1.5-bz185374.patch:
 doc/sed.1     |    7 ++
 lib/utils.c   |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 lib/utils.h   |    3 +
 sed/execute.c |    8 ++-
 sed/sed.c     |   22 +++++++-
 sed/sed.h     |    4 +
 6 files changed, 172 insertions(+), 18 deletions(-)

--- NEW FILE sed-4.1.5-bz185374.patch ---
diff -urp sed-4.1.5-orig/doc/sed.1 sed-4.1.5/doc/sed.1
--- sed-4.1.5-orig/doc/sed.1	2006-02-03 10:27:35.000000000 +0100
+++ sed-4.1.5/doc/sed.1	2006-06-29 15:42:07.000000000 +0200
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH SED "1" "February 2006" "sed version 4.1.4" "User Commands"
+.TH SED "1" "June 2006" "sed version 4.1.5" "User Commands"
 .SH NAME
 sed \- stream editor for filtering and transforming text
 .SH SYNOPSIS
@@ -36,6 +36,11 @@ add the contents of script-file to the c
 .IP
 edit files in place (makes backup if extension supplied)
 .HP
+\fB\-c\fR, \fB\-\-copy\fR
+.IP
+use copy instead of rename when shuffling files in \fB\-i\fR mode
+(avoids change of input file ownership)
+.HP
 \fB\-l\fR N, \fB\-\-line\-length\fR=\fIN\fR
 .IP
 specify the desired line-wrap length for the `l' command
diff -urp sed-4.1.5-orig/lib/utils.c sed-4.1.5/lib/utils.c
--- sed-4.1.5-orig/lib/utils.c	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.c	2006-06-29 16:28:05.000000000 +0200
@@ -35,6 +35,12 @@
 # include <stdlib.h>
 #endif /* HAVE_STDLIB_H */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/sendfile.h>
+#include <fcntl.h>
+
 #include "utils.h"
 
 const char *myname;
@@ -315,32 +321,146 @@ do_ck_fclose(fp)
 }
 
 
-/* Panic on failing rename */
+/* Temporary buffer for ck_follow_symlink and ck_fcopy. */
+static char buf[4096];
+static size_t bufsize = sizeof (buf);
+
+/* Follow symlink and panic if something fails.  Returned value is
+   ultimate symlink target, stored in temporary buffer.  You need to
+   strdup the return value, if you intend to use it later.*/
+const char*
+ck_follow_symlink(const char * fname)
+{
+  static struct stat statbuf;
+  int err;
+
+  if (strlen (fname) >= bufsize)
+    panic("ck_follow_symlink: file name too long");
+  strcpy (buf, fname);
+
+  while (1)
+    {
+      err = lstat (buf, &statbuf);
+
+      if (err != 0)
+	panic("ck_follow_symlink: couldn't lstat %s: %s", buf, strerror(errno));
+
+      if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
+	{
+	  err = readlink (buf, buf, bufsize);
+	  if (err < 0)
+	    panic("ck_follow_symlink: readlink failed on %s: %s", buf, strerror(errno));
+	  else if (err == bufsize)
+	    panic("ck_follow_symlink: pointee name too long");
+	  else
+	    buf [err] = '\0';
+	}
+      else
+	break;
+    }
+
+  return buf;
+}
+
+/* Panic on failing unlink */
 void
-ck_rename (from, to, unlink_if_fail)
-  const char *from, *to;
-  const char *unlink_if_fail;
+ck_unlink (name)
+  const char *name;
 {
-  int rd = rename (from, to);
-  if (rd != -1)
-    return;
+  if (unlink (name) == -1)
+    panic (_("cannot remove %s: %s"), name, strerror (errno));
+}
 
-  if (unlink_if_fail)
+/* Attempt to unlink denoted file if operation rd failed. */
+static int
+_unlink_if_fail (rd, unlink_if_fail)
+  int rd;
+  const char *unlink_if_fail;
+{
+  if (rd == -1 && unlink_if_fail)
     {
       int save_errno = errno;
+      ck_unlink (unlink_if_fail);
+      errno = save_errno;
+    }
+
+  return rd != -1;
+}
+
+/* Copy contents between files. */
+static int
+_copy (from, to)
+  const char *from, *to;
+{
+  FILE *infile, *outfile;
+  int c, retval = 0;
       errno = 0;
-      unlink (unlink_if_fail);
 
-      /* Failure to remove the temporary file is more severe, so trigger it first.  */
-      if (errno != 0)
-        panic (_("cannot remove %s: %s"), unlink_if_fail, strerror (errno));
+  infile = fopen (from, "r");
+  if (infile == NULL)
+    return -1;
 
-      errno = save_errno;
+  outfile = fopen (to, "w");
+  if (outfile == NULL)
+    {
+      fclose (infile);
+      return -1;
+    }
+
+  while (1)
+    {
+      size_t bytes_in = fread (buf, 1, bufsize, infile);
+      size_t bytes_out;
+      if (bytes_in == 0)
+	{
+	  if (ferror (infile))
+	    retval = -1;
+	  break;
+	}
+
+      bytes_out = fwrite (buf, 1, bytes_in, outfile);
+      if (bytes_out != bytes_in)
+	{
+	  retval = -1;
+	  break;
+	}
     }
 
+  fclose (outfile);
+  fclose (infile);
+
+  return retval;
+}
+
+/* Panic on failing rename */
+void
+ck_rename (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (rename (from, to), unlink_if_fail))
   panic (_("cannot rename %s: %s"), from, strerror (errno));
 }
 
+/* Attempt to copy file contents between the files. */
+void
+ck_fcmove (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  if (!_unlink_if_fail (_copy (from, to), unlink_if_fail))
+    panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno));
+}
+
+/* Copy contents between files, and then unlink the source. */
+void
+ck_fcopy (from, to, unlink_if_fail)
+  const char *from, *to;
+  const char *unlink_if_fail;
+{
+  ck_fcmove (from, to, unlink_if_fail);
+  ck_unlink (from);
+}
 
 
 
diff -urp sed-4.1.5-orig/lib/utils.h sed-4.1.5/lib/utils.h
--- sed-4.1.5-orig/lib/utils.h	2005-06-21 16:09:40.000000000 +0200
+++ sed-4.1.5/lib/utils.h	2006-06-29 16:04:21.000000000 +0200
@@ -29,7 +29,10 @@ void ck_fflush P_((FILE *stream));
 void ck_fclose P_((FILE *stream));
 size_t ck_getline P_((char **text, size_t *buflen, FILE *stream));
 FILE * ck_mkstemp P_((char **p_filename, char *tmpdir, char *base));
+const char* ck_follow_symlink P_((const char * fname));
 void ck_rename P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcopy P_((const char *from, const char *to, const char *unlink_if_fail));
+void ck_fcmove P_((const char *from, const char *to, const char *unlink_if_fail));
 
 VOID *ck_malloc P_((size_t size));
 VOID *xmalloc P_((size_t size));
diff -urp sed-4.1.5-orig/sed/execute.c sed-4.1.5/sed/execute.c
--- sed-4.1.5-orig/sed/execute.c	2006-02-03 10:06:39.000000000 +0100
+++ sed-4.1.5/sed/execute.c	2006-06-29 16:12:43.000000000 +0200
@@ -711,16 +711,20 @@ closedown(input)
 
   if (in_place_extension && output_file.fp != NULL)
     {
+      char * target_name = ck_strdup (ck_follow_symlink (input->in_file_name));
       ck_fclose (output_file.fp);
       if (strcmp(in_place_extension, "*") != 0)
         {
           char *backup_file_name = get_backup_file_name(input->in_file_name);
-	  ck_rename (input->in_file_name, backup_file_name, input->out_file_name);
+	  (copy_instead_of_rename?ck_fcmove:ck_rename)
+	    (target_name, backup_file_name, input->out_file_name);
           free (backup_file_name);
 	}
 
-      ck_rename (input->out_file_name, input->in_file_name, input->out_file_name);
+      (copy_instead_of_rename?ck_fcopy:ck_rename)
+	(input->out_file_name, target_name, input->out_file_name);
       free (input->out_file_name);
+      free (target_name);
     }
 
   input->fp = NULL;
diff -urp sed-4.1.5-orig/sed/sed.c sed-4.1.5/sed/sed.c
--- sed-4.1.5-orig/sed/sed.c	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.c	2006-06-29 15:41:52.000000000 +0200
@@ -73,6 +73,10 @@ bool separate_files = false;
 /* How do we edit files in-place? (we don't if NULL) */
 char *in_place_extension = NULL;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+int copy_instead_of_rename = 0;
+
 /* Do we need to be pedantically POSIX compliant? */
 enum posixicity_types posixicity;
 
@@ -107,6 +111,9 @@ Usage: %s [OPTION]... {script-only-if-no
                  add the contents of script-file to the commands to be executed\n"));
   fprintf(out, _("  -i[SUFFIX], --in-place[=SUFFIX]\n\
                  edit files in place (makes backup if extension supplied)\n"));
+  fprintf(out, _("  -c, --copy\n\
+                 use copy instead of rename when shuffling files in -i mode\n\
+		 (avoids change of input file ownership)\n"));
   fprintf(out, _("  -l N, --line-length=N\n\
                  specify the desired line-wrap length for the `l' command\n"));
   fprintf(out, _("  --posix\n\
@@ -142,9 +149,9 @@ main(argc, argv)
   char **argv;
 {
 #ifdef REG_PERL
-#define SHORTOPTS "snrRue:f:l:i::V:"
+#define SHORTOPTS "csnrRue:f:l:i::V:"
 #else
-#define SHORTOPTS "snrue:f:l:i::V:"
+#define SHORTOPTS "csnrue:f:l:i::V:"
 #endif
 
   static struct option longopts[] = {
@@ -155,6 +162,7 @@ main(argc, argv)
     {"expression", 1, NULL, 'e'},
     {"file", 1, NULL, 'f'},
     {"in-place", 2, NULL, 'i'},
+    {"copy", 0, NULL, 'c'},
     {"line-length", 1, NULL, 'l'},
     {"quiet", 0, NULL, 'n'},
     {"posix", 0, NULL, 'p'},
@@ -215,6 +223,10 @@ main(argc, argv)
 	  the_program = compile_file(the_program, optarg);
 	  break;
 
+	case 'c':
+	  copy_instead_of_rename = true;
+	  break;
+
 	case 'i':
 	  separate_files = true;
 	  if (optarg == NULL)
@@ -284,6 +296,12 @@ to the extent permitted by law.\n\
 	}
     }
 
+  if (copy_instead_of_rename && in_place_extension == NULL)
+    {
+      fprintf (stderr, _("Error: -c used without -i.\n"));
+      usage(4);
+    }
+
   if (!the_program)
     {
       if (optind < argc)
diff -urp sed-4.1.5-orig/sed/sed.h sed-4.1.5/sed/sed.h
--- sed-4.1.5-orig/sed/sed.h	2005-06-21 16:09:47.000000000 +0200
+++ sed-4.1.5/sed/sed.h	2006-06-29 15:41:52.000000000 +0200
@@ -228,6 +228,10 @@ extern countT lcmd_out_line_len;
 /* How do we edit files in-place? (we don't if NULL) */
 extern char *in_place_extension;
 
+/* Do we use copy or rename when in in-place edit mode? (boolean
+   value, non-zero for copy, zero for rename).*/
+extern int copy_instead_of_rename;
+
 /* Should we use EREs? */
 extern bool use_extended_syntax_p;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2005 15:23:05 -0000	1.11
+++ .cvsignore	17 Jul 2006 11:16:43 -0000	1.12
@@ -1 +1,2 @@
-sed-4.1.4.tar.gz
+sedfaq.txt
+sed-4.1.5.tar.gz


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/sed.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sed.spec	17 Mar 2005 16:01:10 -0000	1.25
+++ sed.spec	17 Jul 2006 11:16:43 -0000	1.26
@@ -4,12 +4,13 @@
 
 Summary: A GNU stream text editor.
 Name: sed
-Version: 4.1.4
-Release: 1
+Version: 4.1.5
+Release: 3.fc4
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
 Source1: http://sed.sourceforge.net/sedfaq.txt
+Patch0: sed-4.1.5-bz185374.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --without-included-regex
@@ -41,7 +43,6 @@
 
 %makeinstall
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
-mv -f ${RPM_BUILD_ROOT}/%{_datadir}/doc/sed.html .
 
 %find_lang %{name}
 
@@ -64,6 +65,13 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Mar 17 2005 Jakub Jelinek <jakub at redhat.com> 4.1.5-3
+- sync with devel branch
+  - update to 4.1.5
+  - #185374:
+    - Follow symlinks before rename (avoid symlink overwrite)
+    - Add -c flag for copy instead of rename (avoid ownership change)
+
 * Thu Mar 17 2005 Jakub Jelinek <jakub at redhat.com> 4.1.4-1
 - update to 4.1.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2005 15:23:05 -0000	1.11
+++ sources	17 Jul 2006 11:16:43 -0000	1.12
@@ -1 +1,2 @@
-2a62ceadcb571d2dac006f81df5ddb48  sed-4.1.4.tar.gz
+2f1adfb4c339f9ea4b74a535ed8e061a  sedfaq.txt
+7a1cbbbb3341287308e140bd4834c3ba  sed-4.1.5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:32:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:32:27 -0400
Subject: rpms/net-snmp/devel .cvsignore, 1.20, 1.21 net-snmp.spec, 1.80,
	1.81 sources, 1.20, 1.21
Message-ID: <200607171132.k6HBWRPW020686@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20659

Modified Files:
	.cvsignore net-snmp.spec sources 
Log Message:
- update to 5.3.1 final version, fix version number


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	10 Jul 2006 06:56:25 -0000	1.20
+++ .cvsignore	17 Jul 2006 11:32:22 -0000	1.21
@@ -1 +1 @@
-net-snmp-5.3.1.rc4.tar.gz
+net-snmp-5.3.1.tar.gz


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- net-snmp.spec	12 Jul 2006 12:32:22 -0000	1.80
+++ net-snmp.spec	17 Jul 2006 11:32:22 -0000	1.81
@@ -2,16 +2,17 @@
 
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+%define major_ver 5.3.1
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: 5.3.1.rc4
-Release: 2
+Version: %{major_ver}.0
+Release: 1
 
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
-Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
+Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{major_ver}.tar.gz
 Source1: net-snmp.redhat.conf
 Source2: net-snmpd.init
 Source3: net-snmptrapd.init
@@ -121,7 +122,7 @@
 and applications.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{major_ver}
 %patch1 -p1 -b .mnttab
 %patch2 -p1 -b .syslog
 %patch4 -p1 -b .libtool
@@ -344,6 +345,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-1
+- update to 5.3.1 final version, fix version number
+
 * Wed Jul 12 2006 Radek Vok??l <rvokal at redhat.com> 5.3.1.rc4-2
 - fix init script, read .options files from /etc/snmp (#195702)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Jul 2006 06:56:25 -0000	1.20
+++ sources	17 Jul 2006 11:32:22 -0000	1.21
@@ -1 +1 @@
-e4962fc9bf170872d8ea830371dd1cef  net-snmp-5.3.1.rc4.tar.gz
+360a9783dbc853bab6bda90d961daee5  net-snmp-5.3.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:38:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:38:17 -0400
Subject: rpms/system-config-date/devel system-config-date.spec,1.51,1.52
Message-ID: <200607171138.k6HBcHl1022140@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22092

Modified Files:
	system-config-date.spec 
Log Message:
pick up updated translations



Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- system-config-date.spec	12 Jul 2006 08:22:35 -0000	1.51
+++ system-config-date.spec	17 Jul 2006 11:38:15 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.3
-Release: 1.1
+Version: 1.8.4
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -98,8 +98,8 @@
 %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.3-1.1
-- rebuild
+* Mon Jul 17 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.4
+- pick up updated translations
 
 * Tue Mar 14 2006 Nils Philippsen <nphilipp at redhat.com> 1.8.3
 - feed timezone po files from anaconda (#131528, patch by Andrew Martynov)



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:39:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:39:13 -0400
Subject: rpms/sed/FC-4 sed.spec,1.26,1.27
Message-ID: <200607171139.k6HBdDgF022361@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/sed/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22305

Modified Files:
	sed.spec 
Log Message:
Forgot to remove .html



Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/FC-4/sed.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sed.spec	17 Jul 2006 11:16:43 -0000	1.26
+++ sed.spec	17 Jul 2006 11:39:11 -0000	1.27
@@ -59,7 +59,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS NEWS THANKS README AUTHORS sedfaq.txt.gz sed.html
+%doc BUGS NEWS THANKS README AUTHORS sedfaq.txt.gz
 %{_bindir}/sed
 %{_infodir}/*.info*
 %{_mandir}/man*/*



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:40:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:40:29 -0400
Subject: rpms/shadow-utils/devel shadow-4.0.17-redhat.patch, NONE,
	1.1 shadow-utils.spec, 1.77, 1.78 shadow-4.0.16-redhat.patch,
	1.2, NONE
Message-ID: <200607171140.k6HBeT1A022863@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22743

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.17-redhat.patch 
Removed Files:
	shadow-4.0.16-redhat.patch 
Log Message:
upgrade


shadow-4.0.17-redhat.patch:
 man/groupadd.8 |    7 ++-
 man/useradd.8  |   18 ++++++++-
 src/groupadd.c |   19 ++++++++--
 src/useradd.c  |  103 ++++++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 107 insertions(+), 40 deletions(-)

--- NEW FILE shadow-4.0.17-redhat.patch ---
--- shadow-4.0.17/man/groupadd.8.redhat	2006-06-24 08:11:26.000000000 +0200
+++ shadow-4.0.17/man/groupadd.8	2006-07-17 11:39:34.000000000 +0200
@@ -14,7 +14,7 @@
 groupadd \- create a new group
 .SH "SYNOPSIS"
 .HP 9
-\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
+\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-r] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
 .SH "DESCRIPTION"
 .PP
 The
@@ -32,10 +32,13 @@
 \fB\-g\fR
 is turned off).
 .TP 3n
+\fB-r\fR
+This flag instructs \fBgroupadd\fR to add a system account.  The first available \fIgid\fR lower than 499 will be automatically selected unless the \fB-g\fR option is also given on the command line. This is an option added by Red Hat.
+.TP 3n
 \fB\-g\fR \fIGID\fR
 The numerical value of the group's ID. This value must be unique, unless the
 \fB\-o\fR
-option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts.
+option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 500 and greater than every other group. Values between 0 and 499 are typically reserved for system accounts.
 .TP 3n
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
--- shadow-4.0.17/man/useradd.8.redhat	2006-06-24 08:12:17.000000000 +0200
+++ shadow-4.0.17/man/useradd.8	2006-07-17 11:39:34.000000000 +0200
@@ -25,7 +25,7 @@
 \fB\-D\fR
 option, the
 \fBuseradd\fR
-command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files.
+command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files. The version provided with Red Hat Linux will create a group for each user added to the system by default.
 .SH "OPTIONS"
 .PP
 The options which apply to the
@@ -65,7 +65,7 @@
 The number of days after a password expires until the account is permanently disabled. A value of 0 disables the account as soon as the password has expired, and a value of \-1 disables the feature. The default value is \-1.
 .TP 3n
 \fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR
-The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group. The default group number is 1 or whatever is specified in
+The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group.
 \fI/etc/default/useradd\fR.
 .TP 3n
 \fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,...\fR[\fI,GROUPN\fR]]]
@@ -76,6 +76,9 @@
 \fB\-h\fR, \fB\-\-help\fR
 Display help message and exit.
 .TP 3n
+\fB-M\fR
+The user's home directory will not be created, even if the system wide settings from \fI/etc/login.defs\fR is to create home dirs.
+.TP 3n
 \fB\-m\fR, \fB\-\-create\-home\fR
 The user's home directory will be created if it does not exist. The files contained in
 \fISKEL_DIR\fR
@@ -93,6 +96,9 @@
 \fB\-m\fR
 option. The default is to not create the directory and to not copy any files.
 .TP 3n
+\fB-n\fR
+A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used.
+.TP 3n
 \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
 Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others).
 
@@ -118,6 +124,9 @@
 The encrypted password, as returned by
 \fBcrypt\fR(3). The default is to disable the account.
 .TP 3n
+\fB-r\fR
+This flag is used to create a system account. That is, a user with a UID lower than the value of UID_MIN defined in \fI/etc/login.defs\fR and whose password does not expire. Note that \fBuseradd\fR will not create a home directory for such an user, regardless of the default setting in \fI/etc/login.defs\fR. You have to specify \fB-m\fR option if you want a home directory for a system account to be created. This is an option added by Red Hat
+.TP 3n
 \fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
 The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell.
 .TP 3n
@@ -161,6 +170,8 @@
 The system administrator is responsible for placing the default user files in the
 \fI/etc/skel/\fR
 directory.
+.br
+This version of useradd was modified by Red Hat to suit Red Hat user/group conventions.
 .SH "CAVEATS"
 .PP
 You may not add a user to a NIS group. This must be performed on the NIS server.
@@ -181,6 +192,9 @@
 \fI/etc/group\fR
 Group account information.
 .TP 3n
+\fI/etc/gshadow\fR
+Secure group account information.
+.TP 3n
 \fI/etc/default/useradd\fR
 Default values for account creation.
 .TP 3n
--- shadow-4.0.17/src/useradd.c.redhat	2006-06-22 13:30:32.000000000 +0200
+++ shadow-4.0.17/src/useradd.c	2006-07-17 11:39:34.000000000 +0200
@@ -81,7 +81,7 @@
 static gid_t def_group = 100;
 static const char *def_gname = "other";
 static const char *def_home = "/home";
-static const char *def_shell = "";
+static const char *def_shell = "/sbin/nologin";
 static const char *def_template = SKEL_DIR;
 static const char *def_create_mail_spool = "no";
 
@@ -93,7 +93,7 @@
 #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
 
 static const char *user_name = "";
-static const char *user_pass = "!";
+static const char *user_pass = "!!";
 static uid_t user_id;
 static gid_t user_gid;
 static const char *user_comment = "";
@@ -124,8 +124,10 @@
     Gflg = 0,			/* secondary group set for new account */
     kflg = 0,			/* specify a directory to fill new user directory */
     mflg = 0,			/* create user's home directory if it doesn't exist */
-    nflg = 0,			/* create a group having the same name as the user */
+    Mflg = 0,                   /* do NOT create user's home directory no matter what */
+    nflg = 0,                   /* do NOT create a group having the same name as the user */
     oflg = 0,			/* permit non-unique user ID to be specified with -u */
+    rflg = 0,                   /* create a system account */
     sflg = 0,			/* shell program for new account */
     uflg = 0;			/* specify user ID for new account */
 
@@ -628,6 +630,8 @@
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
 			   "  -m, --create-home		create home directory for the new user\n"
 			   "				account\n"
+			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
+			   "  -r,                       create system account\n"
 			   "  -o, --non-unique		allow create user with duplicate\n"
 			   "				(non-unique) UID\n"
 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
@@ -680,11 +684,20 @@
 	spent->sp_namp = (char *) user_name;
 	spent->sp_pwdp = (char *) user_pass;
 	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
-	spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-	spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-	spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-	spent->sp_inact = scale_age (def_inactive);
-	spent->sp_expire = scale_age (user_expire);
+	if (!rflg) {
+		spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
+		spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
+		spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
+		spent->sp_inact = scale_age (def_inactive);
+		spent->sp_expire = scale_age (user_expire);
+	}
+	else {
+		spent->sp_min = scale_age(-1);
+                spent->sp_max = scale_age(-1);
+                spent->sp_warn = scale_age(-1);
+                spent->sp_inact = scale_age(-1);
+        	spent->sp_expire = scale_age(-1);
+	}
 	spent->sp_flag = -1;
 }
 
@@ -832,8 +845,14 @@
 	const struct passwd *pwd;
 	uid_t uid_min, uid_max;
 
-	uid_min = getdef_unum ("UID_MIN", 1000);
-	uid_max = getdef_unum ("UID_MAX", 60000);
+        if (!rflg) {
+                uid_min = getdef_unum ("UID_MIN", 500);
+                uid_max = getdef_unum ("UID_MAX", 60000);
+        }
+        else {
+                uid_min = 1;
+                uid_max = getdef_unum ("UID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some UID value if the user didn't provide us with
@@ -863,7 +882,7 @@
 #endif
 			exit (E_NAME_IN_USE);
 		}
-		if (uflg && user_id == pwd->pw_uid) {
+		if (!oflg && uflg && user_id == pwd->pw_uid) {
 			fprintf (stderr, _("%s: UID %u is not unique\n"),
 				 Prog, (unsigned int) user_id);
 #ifdef WITH_AUDIT
@@ -918,8 +937,13 @@
 	const struct group *grp;
 	gid_t gid_min, gid_max;
 
-	gid_min = getdef_num ("GID_MIN", 500);
-	gid_max = getdef_num ("GID_MAX", 60000);
+        if (!rflg) {
+                gid_min = getdef_unum ("GID_MIN", 500);
+                gid_max = getdef_unum ("GID_MAX", 60000);
+        } else {
+                gid_min = 1;
+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some GID value if the user didn't provide us with
@@ -1017,7 +1041,7 @@
 			{NULL, 0, NULL, '\0'}
 		};
 		while ((c =
-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
 				     long_options, NULL)) != -1) {
 			switch (c) {
 			case 'b':
@@ -1189,6 +1213,15 @@
 				user_id = get_uid (optarg);
 				uflg++;
 				break;
+                        case 'n':
+                                nflg++;
+                                break;
+                        case 'r':
+                                rflg++;
+                                break;
+                        case 'M':
+                                Mflg++;
+                                break;
 			default:
 				usage ();
 			}
@@ -1196,6 +1229,9 @@
 		}
 	}
 
+        if (mflg && Mflg) /* the admin is not decided .. create or not ? */
+               usage();
+
 	/*
 	 * Certain options are only valid in combination with others.
 	 * Check it here so that they can be specified in any order.
@@ -1701,6 +1737,14 @@
 	}
 #endif				/* USE_PAM */
 
+        if (!rflg) /* for system accounts defaults are ignored and we
+                    * do not create a home dir -- gafton */
+        	if (getdef_bool("CREATE_HOME"))
+               		mflg = 1;
+
+        if (Mflg) /* absolutely sure that we do not create home dirs */
+        	mflg = 0;
+
 	/*
 	 * See if we are messing with the defaults file, or creating
 	 * a new user.
@@ -1731,7 +1775,7 @@
 	 * to that group, use useradd -g username username.
 	 * --bero
 	 */
-	if (!gflg) {
+	if ( !(nflg || gflg) ) {
 		if (getgrnam (user_name)) {
 			fprintf (stderr,
 				 _
@@ -1782,25 +1826,18 @@
 				 ("%s: warning: the home directory already exists.\n"
 				  "Not copying any file from skel directory into it.\n"),
 				 Prog);
-
-	} else if (getdef_str ("CREATE_HOME")) {
-		/*
-		 * RedHat added the CREATE_HOME option in login.defs in their
-		 * version of shadow-utils (which makes -m the default, with
-		 * new -M option to turn it off). Unfortunately, this
-		 * changes the way useradd works (it can be run by scripts
-		 * expecting some standard behaviour), compared to other
-		 * Unices and other Linux distributions, and also adds a lot
-		 * of confusion :-(.
-		 * So we now recognize CREATE_HOME and give a warning here
-		 * (better than "configuration error ... notify administrator"
-		 * errors in every program that reads /etc/login.defs). -MM
-		 */
-		fprintf (stderr,
-			 _
-			 ("%s: warning: CREATE_HOME not supported, please use -m instead.\n"),
-			 Prog);
 	}
+        /* Warning removed to protect the innocent. */
+        /*
+         * The whole idea about breaking some stupid scripts by creating a new
+         * variable is crap - I could care less about the scripts. Historically
+         * adduser type programs have always created the home directories and
+         * I don't like the idea of providing a script when we can fix the
+         * binary itself. And if the scripts are using the right options to the
+         * useradd then they will not break. If not, they depend on unspecified
+         * behavior and they will break, but they were broken anyway to begin
+         * with --gafton
+         */
 
 	create_mail ();
 
--- shadow-4.0.17/src/groupadd.c.redhat	2006-06-24 07:52:00.000000000 +0200
+++ shadow-4.0.17/src/groupadd.c	2006-07-17 11:46:54.000000000 +0200
@@ -74,6 +74,7 @@
 static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
 static int gflg = 0;		/* ID value for the new group */
 static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
+static int rflg = 0;            /* for adding system accounts (Red Hat) */
 
 /* local function prototypes */
 static void usage (void);
@@ -99,6 +100,7 @@
 			   "Options:\n"
 			   "  -f, --force			force exit with success status if the specified\n"
 			   "				group already exists\n"
+			   "  -r,                       create system account\n"
 			   "  -g, --gid GID			use GID for the new group\n"
 			   "  -h, --help			display this help message and exit\n"
 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
@@ -197,8 +199,13 @@
 	const struct group *grp;
 	gid_t gid_min, gid_max;
 
-	gid_min = getdef_unum ("GID_MIN", 1000);
-	gid_max = getdef_unum ("GID_MAX", 60000);
+	if (!rflg) {
+		gid_min = getdef_unum ("GID_MIN", 500);
+                gid_max = getdef_unum ("GID_MAX", 60000);
+        } else {
+                gid_min = 1;
+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
+        }
 
 	/*
 	 * Start with some GID value if the user didn't provide us with
@@ -412,7 +419,7 @@
 		};
 
 		while ((c =
-			getopt_long (argc, argv, "fg:hK:o", long_options,
+			getopt_long (argc, argv, "frg:hK:o", long_options,
 				     &option_index)) != -1) {
 			switch (c) {
 			case 'f':
@@ -425,6 +432,12 @@
 				 */
 				fflg++;
 				break;
+	                case 'r':
+	                        /*
+	                         * create a system group
+	                         */
+	                        rflg++;
+	                        break;
 			case 'g':
 				gflg++;
 				if (!isdigit (optarg[0]))


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- shadow-utils.spec	12 Jul 2006 08:14:38 -0000	1.77
+++ shadow-utils.spec	17 Jul 2006 11:40:26 -0000	1.78
@@ -4,15 +4,15 @@
 
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
-Version: 4.0.16
-Release: 3.1
+Version: 4.0.17
+Release: 1
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
 Source1: shadow-4.0.15-login.defs
 Source2: shadow-970616.useradd
 Source3: shadow-4.0.16-nscd.c
-Patch0: shadow-4.0.16-redhat.patch
+Patch0: shadow-4.0.17-redhat.patch
 Patch1: shadow-4.0.3-noinst.patch
 Patch2: shadow-4.0.11.1-vipw.patch
 Patch3: shadow-4.0.14-goodname.patch
@@ -205,6 +205,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Mon Jul 17 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-1
+- upgrade
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:4.0.16-3.1
 - rebuild
 


--- shadow-4.0.16-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:44:17 -0400
Subject: rpms/m4/devel m4.spec,1.22,1.23
Message-ID: <200607171144.k6HBiHJk024304@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24267

Modified Files:
	m4.spec 
Log Message:
* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.5-2
- remove infodir/dir so it isn't included in the package



Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- m4.spec	17 Jul 2006 01:34:39 -0000	1.22
+++ m4.spec	17 Jul 2006 11:44:15 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.5
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -31,6 +31,7 @@
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %files
 %defattr(-,root,root)
@@ -51,6 +52,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.5-2
+- remove infodir/dir so it isn't included in the package
+
 * Mon Jul 17 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.5-1
 - Update to m4-1.4.5
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 11:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 07:48:25 -0400
Subject: rpms/shadow-utils/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <200607171148.k6HBmPw6008183@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8099

Modified Files:
	.cvsignore sources 
Log Message:
upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Jun 2006 19:46:40 -0000	1.13
+++ .cvsignore	17 Jul 2006 11:48:22 -0000	1.14
@@ -1,2 +1,3 @@
 shadow-4.0.16.tar.bz2
 shadow-4.0.16-nscd.c
+shadow-4.0.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	13 Jun 2006 19:46:40 -0000	1.13
+++ sources	17 Jul 2006 11:48:22 -0000	1.14
@@ -1,2 +1,2 @@
-1d91f7479143d1d705b94180c0d4874b  shadow-4.0.16.tar.bz2
 7ebc6a5cd0207246a6b2c9ebf9b30391  shadow-4.0.16-nscd.c
+bc5972a195290533b4c0576276056ed9  shadow-4.0.17.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 12:32:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 08:32:50 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.772,1.773
Message-ID: <200607171232.k6HCWooH004529@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4482

Modified Files:
	openoffice.org.spec 
Log Message:
dammit, visibility is just super-confusing and different to what it used to mean


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -r1.772 -r1.773
--- openoffice.org.spec	17 Jul 2006 10:14:22 -0000	1.772
+++ openoffice.org.spec	17 Jul 2006 12:32:24 -0000	1.773
@@ -878,7 +878,7 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-# visibility b0rked ? ooo#66018#
+# visibility is all whacked now with gcc >= 4.1.1-7 :-(
 unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
@@ -3343,10 +3343,13 @@
 - rebuild for new tasty linker hash
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
 	-> drop with 4.1.1-8
-    + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-    + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to workaround more gcc foo
+    + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch for namespace { extern "C" ... }
+    + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to 
+        workaround ultra-strict gcc anon namespace handling
     + add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import
     visibility the same as exported
+    + what gcc "visibility" means has changed significantly, futile to update OOo to work with 
+      it anymore, most unfortunate
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Mon Jul 17 12:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 08:34:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.773,1.774
Message-ID: <200607171234.k6HCYrE0004962@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4889

Modified Files:
	openoffice.org.spec 
Log Message:
dammit, visibility is just super-confusing and different to what it used to mean


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -r1.773 -r1.774
--- openoffice.org.spec	17 Jul 2006 12:32:24 -0000	1.773
+++ openoffice.org.spec	17 Jul 2006 12:34:51 -0000	1.774
@@ -3340,16 +3340,16 @@
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 - add ooobuild.VBAObjects.patch for VBA macro support
 - fix use of freetype headers for new freetype
-- rebuild for new tasty linker hash
+- rebuild for new tasty linker hash/new compiler
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
 	-> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch for namespace { extern "C" ... }
     + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to 
-        workaround ultra-strict gcc anon namespace handling
-    + add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import
-    visibility the same as exported
+        workaround strict gcc anon namespace handling
     + what gcc "visibility" means has changed significantly, futile to update OOo to work with 
-      it anymore, most unfortunate
+      it anymore, most unfortunate :-(
+    + add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import
+    visibility the same as exported anyway
 
 * Thu Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.4
 - final 2.0.3 version



From fedora-cvs-commits at redhat.com  Mon Jul 17 12:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 08:41:22 -0400
Subject: rpms/m17n-db/devel .cvsignore, 1.20, 1.21 m17n-db.spec, 1.27,
	1.28 sources, 1.22, 1.23
Message-ID: <200607171241.k6HCfMOO006992@cvs.devel.redhat.com>

Author: majain

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6811

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
Added various icons, removed ta-typewriter keymap as it was not working



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Jul 2006 07:25:36 -0000	1.20
+++ .cvsignore	17 Jul 2006 12:41:19 -0000	1.21
@@ -9,3 +9,4 @@
 m17n-db-indic-0.4.7.tar.gz
 m17n-db-indic-0.4.8.tar.gz
 m17n-db-indic-0.4.9.tar.gz
+m17n-db-indic-0.4.10.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- m17n-db.spec	13 Jul 2006 07:25:36 -0000	1.27
+++ m17n-db.spec	17 Jul 2006 12:41:19 -0000	1.28
@@ -1,9 +1,9 @@
-%define indic_ver 0.4.9
+%define indic_ver 0.4.10
 
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	12%{?dist}
+Release:	13%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -695,6 +695,12 @@
 
 
 %changelog
+* Mon Jul 17 2006 Mayank Jain <majain at redhat.com>
+- Removed ta-typewriter.mim keymap as its not working
+- Added ml-inscript.png
+- Added hi-inscript.png
+- added hi-remington.png
+
 * Thu Jul 13 2006 Mayank Jain <majain at redhat.com>
 - Added ta-typewriter.mim keymap
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Jul 2006 07:25:36 -0000	1.22
+++ sources	17 Jul 2006 12:41:19 -0000	1.23
@@ -1,2 +1,2 @@
 a2aec22334c108565cc466d80a66292c  m17n-db-1.3.3.tar.gz
-5f2db364d607238388f3d8cb22f0ee66  m17n-db-indic-0.4.9.tar.gz
+b3f2da54dfdf04342578bbf0765d0c34  m17n-db-indic-0.4.10.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 12:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 08:43:03 -0400
Subject: rpms/flex/FC-4 flex-2.5.4a-Makefile.in.patch, NONE,
	1.1 flex-2.5.4a-posix.patch, NONE,
	1.1 flex-2.5.4a2-iniscan.patch, NONE, 1.1 flex.spec, 1.16, 1.17
Message-ID: <200607171243.k6HCh34o007701@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7581

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.4a-Makefile.in.patch flex-2.5.4a-posix.patch 
	flex-2.5.4a2-iniscan.patch 
Log Message:
- syncing with devel branch
  - adding `make bigcheck' into build process.  Refreshing initscan.c to
    make this possible.
  - fileno is defined in posix standard, so adding #define _POSIX_SOURCE
    to compile without warnings (#195687)


flex-2.5.4a-Makefile.in.patch:
 Makefile.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE flex-2.5.4a-Makefile.in.patch ---
--- flex-2.5.4/Makefile.in	2006-03-09 19:28:41.000000000 +0100
+++ flex-2.5.4/Makefile.in_new	2006-03-09 19:29:48.000000000 +0100
@@ -114,6 +114,7 @@ scan.c: scan.l
 	$(FLEX_EXEC) $(FLEX_FLAGS) $(COMPRESSION) $(srcdir)/scan.l >scan.c
 	@sed s,\"$(srcdir)/scan.l\",\"scan.l\", <scan.c >scan.tmp
 	@mv scan.tmp scan.c
+	-rm $(FLEX)
 
 scan.o: scan.c parse.h flexdef.h config.h
 yylex.o: yylex.c parse.h flexdef.h config.h
@@ -146,7 +147,7 @@ alloca.c: $(srcdir)/MISC/alloca.c
 	cp $(srcdir)/MISC/alloca.c .
 
 test: check
-check: $(FLEX)
+check: scan.c $(FLEX)
 	$(FLEX_EXEC) $(FLEX_FLAGS) $(COMPRESSION) $(srcdir)/scan.l \
 	| sed s,\"$(srcdir)/scan.l\",\"scan.l\", \
 	| diff scan.c -
@@ -160,7 +161,7 @@ bigcheck:
 	rm -f scan.c ; $(MAKE) COMPRESSION="-Cfea" check
 	rm -f scan.c ; $(MAKE) COMPRESSION="-CFer" check
 	rm -f scan.c ; $(MAKE) COMPRESSION="-l" PERF_REPORT="" check
-	rm -f scan.c ; $(MAKE)
+	rm -f scan.c ; $(MAKE) check
 	@echo "All checks successful"
 
 $(FLEXLIB): $(LIBOBJS)

flex-2.5.4a-posix.patch:
 skel.c  |    2 ++
 skel.c~ |only
 2 files changed, 2 insertions(+)

--- NEW FILE flex-2.5.4a-posix.patch ---
diff -Bburpd flex-2.5.4/skel.c flex-2.5.4-pm/skel.c
--- flex-2.5.4/skel.c	2006-07-14 15:30:18.000000000 +0200
+++ flex-2.5.4-pm/skel.c	2006-07-14 15:29:43.000000000 +0200
@@ -14,6 +14,8 @@ const char *skel[] = {
   "#define YY_FLEX_MINOR_VERSION 5",
   "",
   "%-",
+  "/* Use posix source, to silent c99 warnings about fileno. */",
+  "#define _POSIX_SOURCE 1",
   "#include <stdio.h>",
   "#include <unistd.h>",
   "%*",
Only in flex-2.5.4-pm: skel.c~

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/FC-4/flex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- flex.spec	18 Jan 2006 10:52:48 -0000	1.16
+++ flex.spec	17 Jul 2006 12:43:01 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 36.fc4
+Release: 40.fc4
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -16,6 +16,9 @@
 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
+Patch10: flex-2.5.4a-Makefile.in.patch
+Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -43,6 +46,9 @@
 %patch6 -p1 -b .std
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .shapwarn
+%patch9 -p1 -b .iniscan
+%patch10 -p1
+%patch11 -p1
 
 %build
 autoconf
@@ -62,7 +68,9 @@
 )
 
 %check
+echo ============TESTING===============
 make bigcheck
+echo ============END TESTING===========
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -76,6 +84,13 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40.fc4
+- syncing with devel branch
+  - adding `make bigcheck' into build process.  Refreshing initscan.c to
+    make this possible.
+  - fileno is defined in posix standard, so adding #define _POSIX_SOURCE
+    to compile without warnings (#195687)
+
 * Wed Jan 18 2006 Petr Machata <pmachata at redhat.com> 2.5.4a-36.fc4
 - 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  Mon Jul 17 12:51:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 08:51:28 -0400
Subject: rpms/rsh/devel netkit-rsh-0.17-ipv6.patch, NONE,
	1.1 netkit-rsh-0.17-rlogin-linefeed.patch, 1.1, 1.2 rexec.pam,
	1.5, 1.6 rlogin.pam, 1.4, 1.5 rsh.pam, 1.4, 1.5 rsh.spec, 1.28, 1.29
Message-ID: <200607171251.k6HCpSEj001699@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1680

Modified Files:
	netkit-rsh-0.17-rlogin-linefeed.patch rexec.pam rlogin.pam 
	rsh.pam rsh.spec 
Added Files:
	netkit-rsh-0.17-ipv6.patch 
Log Message:
ipv6 + keyring changes

netkit-rsh-0.17-ipv6.patch:
 rcp/rcp.c         |    7 +-
 rlogin/rlogin.c   |    2 
 rlogind/network.c |   91 +++++++++++++++++++++++----------
 rsh/rsh.c         |    3 -
 rshd/rshd.c       |  146 ++++++++++++++++++++++++++++++++++++++----------------
 5 files changed, 175 insertions(+), 74 deletions(-)

--- NEW FILE netkit-rsh-0.17-ipv6.patch ---
--- netkit-rsh-0.17/rcp/rcp.c.ipv6	2006-07-17 12:13:44.000000000 +0200
+++ netkit-rsh-0.17/rcp/rcp.c	2006-07-17 12:16:59.000000000 +0200
@@ -262,9 +262,9 @@
 					nospace();
 				(void)snprintf(bp, len, "%s -t %s", cmd, targ);
 				host = thost;
-					rem = rcmd(&host, port, pwd->pw_name,
+					rem = rcmd_af(&host, port, pwd->pw_name,
 					    tuser ? tuser : pwd->pw_name,
-					    bp, 0);
+					    bp, 0, AF_UNSPEC);
 				if (rem < 0)
 					exit(1);
 #ifdef IP_TOS
@@ -325,7 +325,8 @@
 		if (!(bp = malloc(len)))
 			nospace();
 		(void)snprintf(bp, len, "%s -f %s", cmd, src);
-			rem = rcmd(&host, port, pwd->pw_name, suser, bp, 0);
+			rem = rcmd_af(&host, port, pwd->pw_name, suser, bp, 0,
+				AF_UNSPEC);
 		(void)free(bp);
 		if (rem < 0) {
 			++errs;
--- netkit-rsh-0.17/rlogind/network.c.ipv6	2006-07-17 12:13:44.000000000 +0200
+++ netkit-rsh-0.17/rlogind/network.c	2006-07-17 12:16:59.000000000 +0200
@@ -88,47 +88,78 @@
 	return(0);
 }
 
+static int
+soaddr_eq_ip(const struct sockaddr *s1, const struct sockaddr *s2)
+{
+	if (s1->sa_family != s2->sa_family)
+		return 0;
+	if (s2->sa_family == AF_INET6)
+		return (memcmp(
+			(const void*)(
+				&((const struct sockaddr_in6 *)s1)->sin6_addr
+				),
+			(const void*)(
+				&((const struct sockaddr_in6 *)s2)->sin6_addr
+				),
+			sizeof(struct in6_addr))
+				== 0);
+	else
+		return (memcmp(
+			(const void*)(
+				&((const struct sockaddr_in *)s1)->sin_addr
+				),
+			(const void*)(
+				&((const struct sockaddr_in *)s2)->sin_addr
+				),
+			sizeof(struct in_addr))
+				== 0);
+}
 
 static char *
-find_hostname(const struct sockaddr_in *fromp, int no_host_check, int *hostokp)
+find_hostname(struct sockaddr *fromp, socklen_t fromlen,
+	char *portname, int no_host_check, int *hostokp)
 {
-	struct hostent *hop;
+	int error;
 	char *hname;
+	char hname_buf[NI_MAXHOST];
 	int hostok = 0;
 
-	hop = gethostbyaddr((const char *)&fromp->sin_addr, 
-			    sizeof(struct in_addr), fromp->sin_family);
-	if (hop == NULL) {
-		hname = strdup(inet_ntoa(fromp->sin_addr));
-		hostok = 1;
-	} 
-	else if ((check_all || local_domain(hop->h_name )) && !no_host_check ) {
+	error = getnameinfo(fromp, fromlen,
+		hname_buf, sizeof(hname_buf), portname, NI_MAXSERV,
+		NI_NUMERICSERV);
+	assert(error == 0);
+
+	if ((check_all || local_domain(hname_buf)) && !no_host_check ) {
 		/*
-		 * If name returned by gethostbyaddr is in our domain,
+		 * If name returned is in our domain,
 		 * attempt to verify that we haven't been fooled by someone
 		 * in a remote net; look up the name and check that this
 		 * address corresponds to the name.
 		 */
-		hname = strdup(hop->h_name);
-		hop = gethostbyname(hname);
-		if (hop) {
-		    for (; hop->h_addr_list[0]; hop->h_addr_list++) {
-			if (!memcmp(hop->h_addr_list[0], &fromp->sin_addr,
-				    sizeof(fromp->sin_addr))) {
+		struct addrinfo hints;
+		struct addrinfo *res0, *res;
+
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+		error = getaddrinfo(hname_buf, NULL, &hints, &res);
+		assert(error == 0);
+
+		res0 = res;
+		while (res) {
+			if (soaddr_eq_ip(fromp, res->ai_addr)) {
 				hostok = 1;
 				break;
 			}
-		    }
-		    /* not clear if this is worthwhile */
-		    free(hname);
-		    hname = strdup(hop->h_name);
+			res = res->ai_next;
 		}
+		freeaddrinfo(res0);
 	} 
 	else {
-		hname = strdup(hop->h_name);
 		hostok = 1;
 	}
 
+	hname = strdup(hname_buf);
+
 	/* 
 	 * Actually it might be null if we're out of memory, but
 	 * where do we go then? We'd have to bail anyhow.
@@ -145,14 +176,14 @@
 char * 
 network_init(int f, int no_host_check, int *hostokp)
 {
-	struct sockaddr_in from, *fromp;
+	struct sockaddr_storage from, *fromp;
 	socklen_t fromlen;
 	int on = 1;
 	char c;
 	char *hname;
+	char portname[NI_MAXSERV];
 	int port;
 
-	from.sin_family = AF_INET;
 	fromlen = sizeof (from);
 	if (getpeername(f, (struct sockaddr *)&from, &fromlen) < 0) {
 		syslog(LOG_ERR,"Can't get peer name of remote host: %m");
@@ -177,13 +208,19 @@
 
 	alarm(0);
 
-	hname = find_hostname(fromp,no_host_check, hostokp);
+	hname = find_hostname((struct sockaddr *)fromp, fromlen,
+		portname, no_host_check, hostokp);
+	assert(hname != NULL);
 
-	port = ntohs(fromp->sin_port);
-	if (fromp->sin_family != AF_INET ||
+	port = atoi(portname);
+	if (! port) {
+	    syslog(LOG_NOTICE, "Unknown port %s", portname);
+	    fatal(f, "Permission denied", 0);
+	}
+	if ((fromp->ss_family != AF_INET && fromp->ss_family != AF_INET6) ||
 	    port >= IPPORT_RESERVED || port < IPPORT_RESERVED/2) {
 	    syslog(LOG_NOTICE, "Connection from %s on illegal port",
-		   inet_ntoa(fromp->sin_addr));
+	    	portname);
 	    fatal(f, "Permission denied", 0);
 	}
 
--- netkit-rsh-0.17/rshd/rshd.c.ipv6	2006-07-17 12:13:44.000000000 +0200
+++ netkit-rsh-0.17/rshd/rshd.c	2006-07-17 12:16:59.000000000 +0200
@@ -110,7 +110,7 @@
 extern	char	**environ;
 
 static void error(const char *fmt, ...);
-static void doit(struct sockaddr_in *fromp);
+static void doit(struct sockaddr_storage *fromp, socklen_t fromlen);
 static void getstr(char *buf, int cnt, const char *err);
 
 extern int _check_rhosts_file;
@@ -285,19 +285,37 @@
 #endif
 }
 
-static const char *findhostname(struct sockaddr_in *fromp,
+static const char *findhostname(struct sockaddr *fromp,
+				socklen_t fromlen,
 				const char *remuser, const char *locuser,
 				const char *cmdbuf) 
 {
-	struct hostent *hp;
 	const char *hostname;
+	char remote_address[INET6_ADDRSTRLEN];
+	char remote_hostname[NI_MAXHOST];
+	struct addrinfo hints;
+	struct addrinfo *res0, *res;
+
+	if (! inet_ntop(fromp->sa_family,
+		(( fromp->sa_family == AF_INET6 )
+		? ( &((struct sockaddr_in6 *)fromp)->sin6_addr )
+		: ( &((struct sockaddr_in *)fromp)->sin_addr )),
+		remote_address, sizeof(remote_address))) {
+	    syslog(LOG_NOTICE|LOG_AUTH,
+	    	"Failed to retrieve the socket remote address");
+	    exit(1);
+	}
 
-	hp = gethostbyaddr((char *)&fromp->sin_addr, sizeof (struct in_addr),
-			   fromp->sin_family);
+	if (getnameinfo(fromp, fromlen, remote_hostname, NI_MAXHOST,
+		NULL, 0, 0)) {
+	    syslog(LOG_NOTICE|LOG_AUTH,
+	    	"Failed to retrieve the hostname information for %s",
+	    	remote_address);
+	    exit(1);
+	}
 
 	errno = ENOMEM; /* malloc (thus strdup) may not set it */
-	if (hp) hostname = strdup(hp->h_name);
-	else hostname = strdup(inet_ntoa(fromp->sin_addr));
+	hostname = strdup(remote_hostname);
 
 	if (hostname==NULL) {
 	    /* out of memory? */
@@ -309,33 +327,45 @@
 	 * Attempt to confirm the DNS. 
 	 */
 
-#ifdef	RES_DNSRCH
-	_res.options &= ~RES_DNSRCH;
-#endif
-	hp = gethostbyname(hostname);
-	if (hp == NULL) {
-	    syslog(LOG_INFO, "Couldn't look up address for %s", hostname);
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	if (getaddrinfo(hostname, NULL, &hints, &res)) {
+	    syslog(LOG_INFO, "Couldn't look up address for %s/%s",
+	    	hostname, remote_address);
 	    fail("Couldn't get address for your host (%s)\n", 
-		 remuser, inet_ntoa(fromp->sin_addr), locuser, cmdbuf);
-	} 
-	while (hp->h_addr_list[0] != NULL) {
-	    if (!memcmp(hp->h_addr_list[0], &fromp->sin_addr,
-			sizeof(fromp->sin_addr))) {
-		return hostname;
+		 remuser, hostname, locuser, cmdbuf);
+	}
+
+	res0 = res;
+	while (res) {
+	    struct sockaddr *sa;
+	    char res_address[INET6_ADDRSTRLEN];
+	    sa = res->ai_addr;
+
+	    if (inet_ntop(sa->sa_family,
+		(( sa->sa_family == AF_INET6 )
+		? ( &((struct sockaddr_in6 *)sa)->sin6_addr )
+		: ( &((struct sockaddr_in *)sa)->sin_addr )),
+		res_address, sizeof(res_address))
+	        && strcmp(remote_address, res_address) == 0) {
+		freeaddrinfo(res0);
+	        return hostname;
 	    }
-	    hp->h_addr_list++;
+	    res = res->ai_next;
 	}
+	freeaddrinfo(res0);
+
 	syslog(LOG_NOTICE, "Host addr %s not listed for host %s",
-	       inet_ntoa(fromp->sin_addr), hp->h_name);
+		remote_address, hostname);
 	if ( no_host_check == 1 ) 
 		return hostname;
 	fail("Host address mismatch for %s\n", 
-	     remuser, inet_ntoa(fromp->sin_addr), locuser, cmdbuf);
+	     remuser, hostname, locuser, cmdbuf);
 	return NULL; /* not reachable */
 }
 
 static void
-doit(struct sockaddr_in *fromp)
+doit(struct sockaddr_storage *fromp, socklen_t fromlen)
 {
 	char cmdbuf[ARG_MAX+1];
 	const char *theshell, *shellname;
@@ -355,8 +385,12 @@
 	alarm(0);
 
 	if (port != 0) {
+		struct sockaddr_storage second_connect;
 		int lport = IPPORT_RESERVED - 1;
-		sock = rresvport(&lport);
+
+		memcpy((void *)&second_connect, (void *)fromp, fromlen);
+		sock = rresvport_af(&lport,
+			((struct sockaddr *)&second_connect)->sa_family);
 		if (sock < 0) {
 		    syslog(LOG_ERR, "can't get stderr port: %m");
 		    exit(1);
@@ -365,10 +399,15 @@
 		    syslog(LOG_ERR, "2nd port not reserved\n");
 		    exit(1);
 		}
-		fromp->sin_port = htons(port);
-		if (connect(sock, (struct sockaddr *)fromp,
-			    sizeof(*fromp)) < 0) {
-		    syslog(LOG_INFO, "connect second port: %m");
+		if (((struct sockaddr *)&second_connect)->sa_family == AF_INET6)
+		    ((struct sockaddr_in6 *)&second_connect)->sin6_port
+		    						= htons(port);
+		else
+		    ((struct sockaddr_in *)&second_connect)->sin_port
+		    						= htons(port);
+		if (connect(sock, (struct sockaddr *)&second_connect,
+			fromlen) < 0) {
+		    syslog(LOG_INFO, "connect second port %d: %m", port);
 		    exit(1);
 		}
 	}
@@ -385,7 +424,8 @@
 	getstr(cmdbuf, sizeof(cmdbuf), "command");
 	if (!strcmp(locuser, "root")) paranoid = 1;
 
-	hostname = findhostname(fromp, remuser, locuser, cmdbuf);
+	hostname = findhostname((struct sockaddr *)fromp, fromlen,
+		remuser, locuser, cmdbuf);
 
 	setpwent();
 	pwd = doauth(remuser, hostname, locuser);
@@ -500,15 +540,19 @@
 	exit(1);
 }
 
-static void network_init(int fd, struct sockaddr_in *fromp)
+static void network_init(int fd,
+	struct sockaddr_storage *fromp, socklen_t *fromlenp)
 {
 	struct linger linger;
-	socklen_t fromlen;
+	char hostname[NI_MAXHOST];
+	char portname[NI_MAXSERV];
+	sa_family_t family;
+
+	int error;
 	int on=1;
 	int port;
 
-	fromlen = sizeof(*fromp);
-	if (getpeername(fd, (struct sockaddr *) fromp, &fromlen) < 0) {
+	if (getpeername(fd, (struct sockaddr *)fromp, fromlenp) < 0) {
 		syslog(LOG_ERR, "getpeername: %m");
 		_exit(1);
 	}
@@ -522,9 +566,20 @@
 	    sizeof (linger)) < 0)
 		syslog(LOG_WARNING, "setsockopt (SO_LINGER): %m");
 
-	if (fromp->sin_family != AF_INET) {
+	family = ((struct sockaddr *)fromp)->sa_family;
+	if (family != AF_INET && family != AF_INET6) {
 	    syslog(LOG_ERR, "malformed \"from\" address (af %d)\n",
-		   fromp->sin_family);
+	    	family);
+	    exit(1);
+	}
+
+	error = getnameinfo((struct sockaddr *)fromp, *fromlenp,
+		hostname, sizeof(hostname), portname, sizeof(portname),
+		NI_NUMERICSERV);
+	if (error) {
+	    syslog(LOG_NOTICE|LOG_AUTH,
+	    	"Failed to retrieve address and port of the connection: %s",
+		gai_strerror(error));
 	    exit(1);
 	}
 #ifdef IP_OPTIONS
@@ -554,7 +609,7 @@
 		syslog(LOG_NOTICE,
 		       "Connection received from %s using IP options"
 		       " (ignored): %s",
-		       inet_ntoa(fromp->sin_addr), lbuf);
+		       hostname, lbuf);
 
 		if (setsockopt(0, ipproto, IP_OPTIONS, NULL, optsize) != 0) {
 			syslog(LOG_ERR, "setsockopt IP_OPTIONS NULL: %m");
@@ -567,10 +622,15 @@
 	/*
 	 * Check originating port for validity.
 	 */
-	port = ntohs(fromp->sin_port);
+	port = atoi(portname);
+	if (! port) {
+	    syslog(LOG_NOTICE|LOG_AUTH, "Unknown port %s", portname);
+	    exit(1);
+	}
 	if (port >= IPPORT_RESERVED || port < IPPORT_RESERVED/2) {
-	    syslog(LOG_NOTICE|LOG_AUTH, "Connection from %s on illegal port",
-		   inet_ntoa(fromp->sin_addr));
+	    syslog(LOG_NOTICE|LOG_AUTH,
+	    	"Connection from %s from illegal port %s",
+		   hostname, portname);
 	    exit(1);
 	}
 }
@@ -579,7 +639,8 @@
 main(int argc, char *argv[])
 {
 	int ch;
-	struct sockaddr_in from;
+	struct sockaddr_storage from;
+	socklen_t fromlen;
 	_check_rhosts_file=1;
 
 	openlog("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON);
@@ -626,8 +687,9 @@
                                "pam_rhosts_auth in /etc/pam.conf");
 #endif /* USE_PAM */
 
-	network_init(0, &from);
-	doit(&from);
+	fromlen = sizeof(from);
+	network_init(0, &from, &fromlen);
+	doit(&from, fromlen);
 	return 0;
 }
 
--- netkit-rsh-0.17/rsh/rsh.c.ipv6	2000-07-23 06:16:24.000000000 +0200
+++ netkit-rsh-0.17/rsh/rsh.c	2006-07-17 12:16:59.000000000 +0200
@@ -163,7 +163,8 @@
 		exit(1);
 	}
 
-	rem = rcmd(&host, sp->s_port, pw->pw_name, user, args, &rfd2);
+	rem = rcmd_af(&host, sp->s_port, pw->pw_name, user, args, &rfd2,
+		AF_UNSPEC);
 
 	if (rem < 0)
 		exit(1);
--- netkit-rsh-0.17/rlogin/rlogin.c.ipv6	2006-07-17 12:13:44.000000000 +0200
+++ netkit-rsh-0.17/rlogin/rlogin.c	2006-07-17 12:16:59.000000000 +0200
@@ -280,7 +280,7 @@
 	/* will use SIGUSR1 for window size hack, so hold it off */
 	omask = sigblock(sigmask(SIGURG) | sigmask(SIGUSR1));
 
-	rem = rcmd(&host, sp->s_port, pw->pw_name, user, term, 0);
+	rem = rcmd_af(&host, sp->s_port, pw->pw_name, user, term, 0, AF_UNSPEC);
 
 	if (rem < 0) exit(1);
 

netkit-rsh-0.17-rlogin-linefeed.patch:
 sockconv.c |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

Index: netkit-rsh-0.17-rlogin-linefeed.patch
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/netkit-rsh-0.17-rlogin-linefeed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netkit-rsh-0.17-rlogin-linefeed.patch	9 Feb 2006 13:22:25 -0000	1.1
+++ netkit-rsh-0.17-rlogin-linefeed.patch	17 Jul 2006 12:51:26 -0000	1.2
@@ -1,17 +1,53 @@
---- 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 @@
+--- netkit-rsh-0.17/rlogind/sockconv.c.linefeed	1999-10-02 23:50:52.000000000 +0200
++++ netkit-rsh-0.17/rlogind/sockconv.c	2006-07-17 14:30:50.000000000 +0200
+@@ -86,6 +86,35 @@
+   return (text);
+ }
+ 
++/* conver \n to \r\n and also terminate string by \r\n */
++static void my_fputs(char *str, FILE *out)
++{
++	char *p = str, *last = str;
++
++	while(p && *p) { 
++		if ((p=strchr(p, '\n')) && (p==str || *(p-1)!='\r')) {
++			/* convert \n to \n\r  */
++			fwrite((const void *) last, 1, p-last, out);
++			fputs("\r\n", out);
++			p++;
++			last = p;
++		}
++		else if (p && *(p+1))
++			/* \r\n already in strimg, continue... */
++			p++;
++		else {
++			/* write the rest of string */
++			int len = strlen(str);
++
++			fwrite((const void *) last, 1, len-(last-str), out);
++			if (*(str+(len-1)) != '\n')
++				fputs("\r\n", out);	/* terminate output */
++			break;
++		}
++	}
++}
++
++
+ static void drop_reply(struct pam_response *reply, int replies)
+ {
+   int i;
+@@ -126,16 +155,15 @@
        }
        break;
      case PAM_ERROR_MSG:
 -      fprintf(stderr,"%s\n",msgm[replies]->msg);
-+      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
++      my_fputs(msgm[replies]->msg, stderr);
        string = NULL;
-       
+-      
        break;
      case PAM_TEXT_INFO:
 -      fprintf(stderr,"%s\n",msgm[replies]->msg);
-+      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
++      my_fputs(msgm[replies]->msg, stderr);
        string = NULL;
        break;
      default:


Index: rexec.pam
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rexec.pam,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rexec.pam	13 Oct 2005 14:11:10 -0000	1.5
+++ rexec.pam	17 Jul 2006 12:51:26 -0000	1.6
@@ -6,4 +6,5 @@
 auth       required     pam_env.so
 auth       include      system-auth
 account    include      system-auth
+session	   optional     pam_keyinit.so    force revoke
 session    include      system-auth


Index: rlogin.pam
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rlogin.pam,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rlogin.pam	13 Oct 2005 14:11:10 -0000	1.4
+++ rlogin.pam	17 Jul 2006 12:51:26 -0000	1.5
@@ -8,4 +8,5 @@
 auth       include      system-auth
 account    include      system-auth
 password   include      system-auth
+session	   optional     pam_keyinit.so    force revoke
 session    include      system-auth


Index: rsh.pam
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.pam,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rsh.pam	13 Oct 2005 14:11:10 -0000	1.4
+++ rsh.pam	17 Jul 2006 12:51:26 -0000	1.5
@@ -6,4 +6,5 @@
 auth       required     pam_env.so
 auth       required     pam_rhosts_auth.so
 account    include      system-auth
+session	   optional     pam_keyinit.so    force revoke
 session    include      system-auth


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rsh.spec	12 Jul 2006 08:00:28 -0000	1.28
+++ rsh.spec	17 Jul 2006 12:51:26 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 34.2
+Release: 35
 License: BSD
 Group: Applications/Internet
 
@@ -47,6 +47,7 @@
 Patch27: netkit-rsh-0.17-rcp-largefile.patch
 Patch28: netkit-rsh-0.17-pam-rhost.patch
 Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
+Patch30: netkit-rsh-0.17-ipv6.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -108,6 +109,7 @@
 %patch27 -p1 -b .largefile
 %patch28 -p1 -b .pam-rhost
 %patch29 -p1 -b .linefeed
+%patch30 -p1 -b .ipv6
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -176,6 +178,13 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+
+* Tue Jul 17 2006 Karel Zak <kzak at redhat.com> 0.17-35
+- added support for IPv6 (patch by Jan Pazdziora)
+- fix #198632 - add keyinit instructions to the rsh, rlogin and rexec PAM scripts
+  (patch by David Howells)
+- fix #191390 - improve linefeed patch
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-34.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:04:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:04:42 -0400
Subject: rpms/system-config-date/devel .cvsignore, 1.42, 1.43 sources, 1.45,
	1.46
Message-ID: <200607171304.k6HD4gJq001873@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1853

Modified Files:
	.cvsignore sources 
Log Message:
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	26 Apr 2006 14:40:42 -0000	1.42
+++ .cvsignore	17 Jul 2006 13:04:39 -0000	1.43
@@ -1 +1 @@
-system-config-date-1.8.3.tar.bz2
+system-config-date-1.8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	26 Apr 2006 14:40:42 -0000	1.45
+++ sources	17 Jul 2006 13:04:39 -0000	1.46
@@ -1 +1 @@
-5bfbb01bc3206efb91f1fe4ad44b57e4  system-config-date-1.8.3.tar.bz2
+b8c5f608dbdd00c1bd40b39fde1c5a10  system-config-date-1.8.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:07:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:07:34 -0400
Subject: rpms/libaio/devel libaio.spec,1.22,1.23
Message-ID: <200607171307.k6HD7Yh0001976@cvs.devel.redhat.com>

Author: jmoyer

Update of /cvs/dist/rpms/libaio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1962

Modified Files:
	libaio.spec 
Log Message:
rebuild


Index: libaio.spec
===================================================================
RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libaio.spec	12 Jul 2006 17:24:24 -0000	1.22
+++ libaio.spec	17 Jul 2006 13:07:32 -0000	1.23
@@ -1,6 +1,6 @@
 Name: libaio
 Version: 0.3.106
-Release: 3.1
+Release: 3.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
+* Mon Jul 17 2006 Jeff Moyer <jmoyer at redhat.com> - 0.3.106-3.2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.106-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:07:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:07:52 -0400
Subject: rpms/openjade/devel openjade.spec,1.37,1.38
Message-ID: <200607171307.k6HD7qYR002030@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1988

Modified Files:
	openjade.spec 
Log Message:
* Mon Jul 17 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-27
- Rebuilt.



Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openjade.spec	10 Jul 2006 16:18:06 -0000	1.37
+++ openjade.spec	17 Jul 2006 13:07:50 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 26
+Release: 27
 Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
@@ -92,6 +92,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Mon Jul 17 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-27
+- Rebuilt.
+
 * Mon Jul 10 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-26
 - Fix dependent libs for libogrove (bug #198232).
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:10:15 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.209,
	1.210 policycoreutils.spec, 1.291, 1.292
Message-ID: <200607171310.k6HDAFPV002205@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2187

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-3
- Update translations
- Update to new GCC


policycoreutils-rhat.patch:
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |  496 ++++++++++++++++---------------
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  142 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.c |   16 -
 73 files changed, 5159 insertions(+), 4813 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.209 -r 1.210 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- policycoreutils-rhat.patch	11 Jul 2006 19:29:29 -0000	1.209
+++ policycoreutils-rhat.patch	17 Jul 2006 13:10:11 -0000	1.210
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.17/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/af.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/af.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -311,7 +311,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.17/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/am.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/am.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -622,7 +622,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.17/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ar.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/ar.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -933,7 +933,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.30.17/po/be.po
 --- nsapolicycoreutils/po/be.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/be.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/be.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1244,7 +1244,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.30.17/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2006-07-03 07:52:46.000000000 -0400
-+++ policycoreutils-1.30.17/po/bg.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/bg.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1555,7 +1555,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.17/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/bn_IN.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/bn_IN.po	2006-07-17 09:10:10.000000000 -0400
 @@ -35,7 +35,7 @@
  msgstr ""
  "Project-Id-Version: bn_IN\n"
@@ -1870,7 +1870,7 @@
  msgstr "????????????????????? ???????????? ?????????????????????\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.30.17/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/bn.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/bn.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2181,7 +2181,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.17/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ca.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/ca.po	2006-07-17 09:10:10.000000000 -0400
 @@ -21,7 +21,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -2492,7 +2492,7 @@
  msgstr "ha fallat l'autenticaci??.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.30.17/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/cs.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/cs.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2803,7 +2803,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.30.17/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/cy.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/cy.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3114,7 +3114,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.30.17/po/da.po
 --- nsapolicycoreutils/po/da.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/da.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/da.po	2006-07-17 09:10:10.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -3416,7 +3416,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.30.17/po/de.po
 --- nsapolicycoreutils/po/de.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/de.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/de.po	2006-07-17 09:10:10.000000000 -0400
 @@ -1,55 +1,59 @@
  # German translation of policycoreutils.
  # Copyright (C) 2006 Free Software Foundation, Inc.
@@ -4810,7 +4810,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.30.17/po/el.po
 --- nsapolicycoreutils/po/el.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/el.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/el.po	2006-07-17 09:10:10.000000000 -0400
 @@ -1,56 +1,71 @@
 -# SOME DESCRIPTIVE TITLE.
 +# translation of el.po to Greek
@@ -6093,7 +6093,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.30.17/po/en_GB.po
 --- nsapolicycoreutils/po/en_GB.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/en_GB.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/en_GB.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6404,7 +6404,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.30.17/po/es.po
 --- nsapolicycoreutils/po/es.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/es.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/es.po	2006-07-17 09:10:10.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: \n"
@@ -6718,7 +6718,7 @@
  msgstr "fall? la autenticaci?n.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/et.po policycoreutils-1.30.17/po/et.po
 --- nsapolicycoreutils/po/et.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/et.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/et.po	2006-07-17 09:10:10.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -7020,7 +7020,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/eu_ES.po policycoreutils-1.30.17/po/eu_ES.po
 --- nsapolicycoreutils/po/eu_ES.po	2006-07-03 07:52:46.000000000 -0400
-+++ policycoreutils-1.30.17/po/eu_ES.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/eu_ES.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7331,7 +7331,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fa.po policycoreutils-1.30.17/po/fa.po
 --- nsapolicycoreutils/po/fa.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fa.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/fa.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7642,7 +7642,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fi.po policycoreutils-1.30.17/po/fi.po
 --- nsapolicycoreutils/po/fi.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fi.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/fi.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7953,7 +7953,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.17/po/fr.po
 --- nsapolicycoreutils/po/fr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fr.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/fr.po	2006-07-17 09:10:10.000000000 -0400
 @@ -1,418 +1,439 @@
 +# translation of Policy Core Utils.
 +# Copyright (C) 2006 Free Software Foundation, Inc.
@@ -9155,7 +9155,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gl.po policycoreutils-1.30.17/po/gl.po
 --- nsapolicycoreutils/po/gl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/gl.po	2006-07-10 13:09:18.000000000 -0400
++++ policycoreutils-1.30.17/po/gl.po	2006-07-17 09:10:10.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -9457,7 +9457,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gu.po policycoreutils-1.30.17/po/gu.po
 --- nsapolicycoreutils/po/gu.po	2006-07-03 07:52:45.000000000 -0400
[...1626 lines suppressed...]
++++ policycoreutils-1.30.17/po/pt_BR.po	2006-07-17 09:10:10.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: pt_BR\n"
@@ -20466,7 +21365,7 @@
  msgstr "autentica????o falhou.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt.po policycoreutils-1.30.17/po/pt.po
 --- nsapolicycoreutils/po/pt.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/pt.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/pt.po	2006-07-17 09:10:10.000000000 -0400
 @@ -2,7 +2,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -20784,7 +21683,7 @@
  msgstr "a autentica????o falhou.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-1.30.17/po/ro.po
 --- nsapolicycoreutils/po/ro.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ro.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/ro.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -21095,7 +21994,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-1.30.17/po/ru.po
 --- nsapolicycoreutils/po/ru.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ru.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/ru.po	2006-07-17 09:10:10.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: ru\n"
@@ -21407,7 +22306,7 @@
  msgstr "???????? ???????????????? ??????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.30.17/po/si.po
 --- nsapolicycoreutils/po/si.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/si.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/si.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -21718,7 +22617,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.30.17/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sk.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sk.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -22029,7 +22928,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.30.17/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sl.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sl.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -22340,7 +23239,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.30.17/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sq.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sq.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -22651,7 +23550,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.30.17/po/sr at Latn.po
 --- nsapolicycoreutils/po/sr at Latn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sr at Latn.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sr at Latn.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -22964,7 +23863,7 @@
  msgstr "neuspela autentifikacija.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.30.17/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sr.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sr.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -23277,7 +24176,7 @@
  msgstr "???????????????? ??????????????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.17/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sv.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/sv.po	2006-07-17 09:10:10.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -23579,7 +24478,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.17/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ta.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/ta.po	2006-07-17 09:10:10.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: ta\n"
@@ -23890,7 +24789,7 @@
  msgstr "???????????????????????????????????????????????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.30.17/po/te.po
 --- nsapolicycoreutils/po/te.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/te.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/te.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -24201,7 +25100,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.30.17/po/th.po
 --- nsapolicycoreutils/po/th.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/th.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/th.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -24512,7 +25411,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.30.17/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/tr.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/tr.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -24823,7 +25722,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.30.17/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/uk.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/uk.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25134,7 +26033,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.30.17/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ur.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/ur.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25445,7 +26344,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.30.17/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/vi.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/vi.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25756,7 +26655,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.30.17/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zh_CN.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/zh_CN.po	2006-07-17 09:10:10.000000000 -0400
 @@ -4,6 +4,7 @@
  # translation of zh_CN.po to
  # translation of zh_CN.po to
@@ -26654,7 +27553,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.17/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zh_TW.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/zh_TW.po	2006-07-17 09:10:10.000000000 -0400
 @@ -1,246 +1,246 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -27001,14 +27900,9 @@
  #, c-format
  msgid "authentication failed.\n"
  msgstr ""
-@@ -957,3 +957,4 @@
- #, c-format
- msgid "Options Error: %s "
- msgstr ""
-+
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.17/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zu.po	2006-07-10 13:09:19.000000000 -0400
++++ policycoreutils-1.30.17/po/zu.po	2006-07-17 09:10:10.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -27319,7 +28213,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-10 13:07:16.000000000 -0400
++++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-17 09:09:42.000000000 -0400
 @@ -30,9 +30,10 @@
   * and makes sure that there security context matches the systems defaults
   *


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- policycoreutils.spec	11 Jul 2006 19:29:29 -0000	1.291
+++ policycoreutils.spec	17 Jul 2006 13:10:13 -0000	1.292
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,10 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-3
+- Update translations
+- Update to new GCC
+
 * Mon Jul 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-2
 - Add verbose flag to restorecond and update translations
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:11:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:11:19 -0400
Subject: rpms/cadaver/devel cadaver.spec,1.23,1.24
Message-ID: <200607171311.k6HDBJxM012702@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/cadaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11878

Modified Files:
	cadaver.spec 
Log Message:
* Mon Jul 17 2006 Joe Orton <jorton at redhat.com> 0.22.3-4
- rebuild



Index: cadaver.spec
===================================================================
RCS file: /cvs/dist/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cadaver.spec	16 May 2006 13:43:04 -0000	1.23
+++ cadaver.spec	17 Jul 2006 13:11:16 -0000	1.24
@@ -1,6 +1,6 @@
 Name: cadaver
 Version: 0.22.3
-Release: 3
+Release: 4
 Summary: Command-line WebDAV client
 License: GPL
 Group: Applications/Internet
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jul 17 2006 Joe Orton <jorton at redhat.com> 0.22.3-4
+- rebuild
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 0.22.3-3
 - buildrequires readline-devel
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:11:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:11:19 -0400
Subject: rpms/libselinux/devel libselinux.spec,1.210,1.211
Message-ID: <200607171311.k6HDBJtK012706@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9723

Modified Files:
	libselinux.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-3
- Rebuild for new gcc



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- libselinux.spec	11 Jul 2006 19:26:08 -0000	1.210
+++ libselinux.spec	17 Jul 2006 13:11:16 -0000	1.211
@@ -116,6 +116,9 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-3
+- Rebuild for new gcc
+
 * Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-2
 - Fix libselinux to not telinit during installs
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:12:14 -0400
Subject: rpms/libselinux/devel libselinux.spec,1.211,1.212
Message-ID: <200607171312.k6HDCEGN012926@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12906

Modified Files:
	libselinux.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.19-3
- Rebuild for new gcc



Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- libselinux.spec	17 Jul 2006 13:11:16 -0000	1.211
+++ libselinux.spec	17 Jul 2006 13:12:11 -0000	1.212
@@ -2,7 +2,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.30.19
-Release: 2
+Release: 3
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:12:50 -0400
Subject: rpms/libsemanage/devel libsemanage.spec,1.97,1.98
Message-ID: <200607171312.k6HDCoiG013058@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13032

Modified Files:
	libsemanage.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-2
- Rebuild for new gcc



Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- libsemanage.spec	12 Jul 2006 02:53:48 -0000	1.97
+++ libsemanage.spec	17 Jul 2006 13:12:48 -0000	1.98
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.12
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-2
+- Rebuild for new gcc
+
 * Tue Jul 11 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.12-1
 - Upgrade to latest from NSA
 	* Merged support for read operations on read-only fs from 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:14:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:14:08 -0400
Subject: rpms/python/devel python.spec,1.83,1.84
Message-ID: <200607171314.k6HDE8DB013396@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13370

Modified Files:
	python.spec 
Log Message:
added dist tag back


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- python.spec	12 Jul 2006 07:56:21 -0000	1.83
+++ python.spec	17 Jul 2006 13:14:06 -0000	1.84
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 11.FC6.1
+Release: 12%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -392,6 +392,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jul 17 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-12
+- added dist tag back
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-11.FC6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:31:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:31:26 -0400
Subject: rpms/hdparm/devel hdparm.spec,1.28,1.29
Message-ID: <200607171331.k6HDVPp0031922@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31887

Modified Files:
	hdparm.spec 
Log Message:
- test builds on ia64, ppc, ppc64


Index: hdparm.spec
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- hdparm.spec	12 Jul 2006 06:19:53 -0000	1.28
+++ hdparm.spec	17 Jul 2006 13:31:13 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A utility for displaying and/or setting hard disk parameters.
 Name: hdparm
 Version: 6.6
-Release: 1.1
+Release: 2
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
@@ -10,7 +10,7 @@
 Patch1:	hdparm-5.9-nostrip.patch
 Patch2:	hdparm-6.3-idestruct.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-ExcludeArch: ia64 ppc ppc64 s390 s390x
+ExcludeArch: s390 s390x
 
 %description
 Hdparm is a useful system utility for setting (E)IDE hard drive
@@ -44,6 +44,9 @@
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Mon Jul 17 2006 Karsten Hopp <karsten at redhat.de> 6.6-2
+- test builds on ia64, ppc, ppc64
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.6-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:40:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:40:36 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.210,
	1.211 policycoreutils.spec, 1.292, 1.293
Message-ID: <200607171340.k6HDea4E001285@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1247

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-4
- Fix creation of restorecond pidfile


policycoreutils-rhat.patch:
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |  496 ++++++++++++++++---------------
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  142 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.c |   20 -
 73 files changed, 5161 insertions(+), 4815 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- policycoreutils-rhat.patch	17 Jul 2006 13:10:11 -0000	1.210
+++ policycoreutils-rhat.patch	17 Jul 2006 13:40:31 -0000	1.211
@@ -28213,7 +28213,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-17 09:09:42.000000000 -0400
++++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-17 09:37:26.000000000 -0400
 @@ -30,9 +30,10 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -28255,7 +28255,7 @@
  	exit(0);
  }
  
-@@ -449,11 +452,14 @@
+@@ -449,22 +452,25 @@
  	if (master_fd < 0)
  		exitApp("inotify_init");
  
@@ -28271,3 +28271,16 @@
  		case '?':
  			usage(argv[0]);
  		}
+ 	}
+ 	read_config(master_fd);
+ 
+-	write_pid_file();
+-
+ 	if (!debug_mode)
+ 		daemon(0, 0);
+ 
++	write_pid_file();
++
+ 	while (watch(master_fd) == 0) {
+ 	};
+ 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- policycoreutils.spec	17 Jul 2006 13:10:13 -0000	1.292
+++ policycoreutils.spec	17 Jul 2006 13:40:32 -0000	1.293
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -111,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-4
+- Fix creation of restorecond pidfile
+
 * Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-3
 - Update translations
 - Update to new GCC



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:41:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:41:09 -0400
Subject: rpms/indent/devel indent.spec,1.25,1.26
Message-ID: <200607171341.k6HDf9ga001445@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1246

Modified Files:
	indent.spec 
Log Message:
/builddir/build/BUILD/indent-2.2.9/config/missing: line 46: makeinfo: command not found

This resulted in empty info pages and %post errors during install



Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- indent.spec	16 Jul 2006 12:13:27 -0000	1.25
+++ indent.spec	17 Jul 2006 13:41:07 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -14,7 +14,7 @@
 Patch6: indent-2.2.9-zh_TW.patch
 Patch7: indent-2.2.9-man.patch
 Prereq: /sbin/install-info
-BuildRequires: gettext
+BuildRequires: gettext texinfo
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-14
+- add buildrequires makeinfo
+
 * Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
 - Add some missing options to manpage/infopage (#199037)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:49:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:49:07 -0400
Subject: rpms/indent/FC-5 indent.spec,1.22,1.23
Message-ID: <200607171349.k6HDn7eX017854@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15878

Modified Files:
	indent.spec 
Log Message:
* Mon Jul 17 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-14
- add buildrequires makeinfo



Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/FC-5/indent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- indent.spec	16 Jul 2006 12:19:06 -0000	1.22
+++ indent.spec	17 Jul 2006 13:49:00 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -14,6 +14,7 @@
 Patch6: indent-2.2.9-zh_TW.patch
 Patch7: indent-2.2.9-man.patch
 Prereq: /sbin/install-info
+BuildRequires: gettext texinfo
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -72,6 +73,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-14
+- add buildrequires makeinfo
+
 * Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.2.9-13
 - Add some missing options to manpage/infopage (#199037)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:56:16 -0400
Subject: rpms/binutils/devel binutils.spec,1.95,1.96
Message-ID: <200607171356.k6HDuGZI019493@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19470

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.3-1


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- binutils.spec	17 Jul 2006 09:30:09 -0000	1.95
+++ binutils.spec	17 Jul 2006 13:56:13 -0000	1.96
@@ -117,12 +117,12 @@
 
 cd ..
 %find_lang binutils
-%find_lang opcodes
+#%#find_lang opcodes
 %find_lang bfd
 %find_lang gas
 %find_lang ld
 %find_lang gprof
-cat opcodes.lang >> binutils.lang
+#cat opcodes.lang >> binutils.lang
 cat bfd.lang >> binutils.lang
 cat gas.lang >> binutils.lang
 cat ld.lang >> binutils.lang



From fedora-cvs-commits at redhat.com  Mon Jul 17 13:59:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 09:59:21 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch,
	NONE, 1.1 openoffice.org.2.0.3.gcc28409.anonymousexternc.patch,
	NONE, 1.1 openoffice.org.spec, 1.774,
	1.775 openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch,
	1.1, NONE openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch,
	1.2, NONE
Message-ID: <200607171359.k6HDxLEn020110@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20061

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch 
	openoffice.org.2.0.3.gcc28409.anonymousexternc.patch 
Removed Files:
	openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch 
	openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch 
Log Message:
track gcc bugids

openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch:
 sd/source/ui/inc/DrawController.hxx     |    6 ++----
 source/filter/inc/msfilter.hxx          |    0 
 source/filter/ww8/writerwordglue.cxx    |    0 
 source/ui/inc/DrawController.hxx        |    0 
 sw/source/filter/inc/msfilter.hxx       |    5 +----
 sw/source/filter/ww8/writerwordglue.cxx |    5 +++++
 6 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch ---
Index: source/filter/inc/msfilter.hxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/inc/msfilter.hxx,v
retrieving revision 1.12
diff -u -r1.12 msfilter.hxx
--- openoffice.org.orig/sw/source/filter/inc/msfilter.hxx	26 Jan 2006 18:18:54 -0000	1.12
+++ openoffice.org/sw/source/filter/inc/msfilter.hxx	16 Jul 2006 14:17:13 -0000
@@ -84,10 +84,7 @@
 class SwNoTxtNode;
 class SwTxtNode;
 
-namespace
-{
-    template<class C> class StyleMapperImpl;
-}
+template<class C> class StyleMapperImpl;
 class SwTxtFmtColl;
 class SwCharFmt;
 typedef StyleMapperImpl<SwTxtFmtColl> ParaMapper;
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.18
diff -u -r1.18 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx	26 Jan 2006 18:19:58 -0000	1.18
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx	16 Jul 2006 14:17:31 -0000
@@ -324,6 +324,8 @@
         return mrDoc.MakeCharFmt(rName, mrDoc.GetDfltCharFmt());
     }
 
+}
+
     template<class C> class StyleMapperImpl
     {
     private:
@@ -408,6 +410,9 @@
             sRet = GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS);
         return sRet;
     }
+
+namespace
+    {
 
     /*
      Utility to categorize unicode characters into the best fit windows charset
Index: source/ui/inc/DrawController.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/DrawController.hxx,v
retrieving revision 1.11
diff -u -r1.11 DrawController.hxx
--- openoffice.org.orig/sd/source/ui/inc/DrawController.hxx	21 Mar 2006 17:19:23 -0000	1.11
+++ openoffice.org/sd/source/ui/inc/DrawController.hxx	16 Jul 2006 16:49:42 -0000
@@ -81,16 +81,14 @@
     ::com::sun::star::view::XSelectionChangeListener
     > DrawControllerInterfaceBase;
 
+} // end of anonymous namespace.
+
 class BroadcastHelperOwner
 {
 public:
     BroadcastHelperOwner (::osl::Mutex& rMutex) : maBroadcastHelper(rMutex) {};
     ::cppu::OBroadcastHelper maBroadcastHelper;
 };
-
-
-} // end of anonymous namespace.
-
 
 namespace sd {
 

openoffice.org.2.0.3.gcc28409.anonymousexternc.patch:
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |    3 +++
 source/uno/lbenv.cxx                                |    5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3.gcc28409.anonymousexternc.patch ---
Index: source/uno/lbenv.cxx
===================================================================
RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v
retrieving revision 1.33
diff -u -r1.33 lbenv.cxx
--- openoffice.org.orig/cppu/source/uno/lbenv.cxx	6 Mar 2006 10:16:59 -0000	1.33
+++ openoffice.org/source/uno/lbenv.cxx	13 Jul 2006 15:43:37 -0000
@@ -1049,6 +1049,8 @@
     }
 }
 
+}
+
 extern "C"
 {
 
@@ -1158,6 +1160,3 @@
 }
 
 } // extern "C"
-
-}
-
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:20:10.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:21:29.000000000 +0100
@@ -224,6 +224,7 @@
 	}
 }
 
+}
 
 //==================================================================================================
 extern "C" void cpp_vtable_call(
@@ -358,6 +359,8 @@
 extern "C" void privateSnippetExecutorClass();
 extern "C" typedef void (*PrivateSnippetExecutor)();
 
+namespace {
+
 int const codeSnippetSize = 16;
 
 unsigned char * codeSnippet(


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- openoffice.org.spec	17 Jul 2006 12:34:51 -0000	1.774
+++ openoffice.org.spec	17 Jul 2006 13:59:18 -0000	1.775
@@ -112,8 +112,8 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch
-Patch50: openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch
+Patch49: openoffice.org.2.0.3.gcc28409.anonymousexternc.patch
+Patch50: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 Patch51: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
@@ -854,8 +854,8 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gccXXXXX.anonymousexternc.patch
-%patch50 -p1 -b .gccXXXXX.all.tediousanonfoo.patch
+%patch49 -p1 -b .gcc28409.anonymousexternc.patch
+%patch50 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
 %patch51 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
 
 tar xzf %{SOURCE1}
@@ -3344,8 +3344,8 @@
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
 	-> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch for namespace { extern "C" ... }
-    + add openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch to 
-        workaround strict gcc anon namespace handling
+    + add openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch to 
+        workaround strict gcc ODR anon namespace handling
     + what gcc "visibility" means has changed significantly, futile to update OOo to work with 
       it anymore, most unfortunate :-(
     + add openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch to import


--- openoffice.org-2.0.3.gccXXXXX.all.tediousanonfoo.patch DELETED ---


--- openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:01:52 -0400
Subject: rpms/m4/devel m4.spec,1.23,1.24
Message-ID: <200607171401.k6HE1qCh020686@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20608

Modified Files:
	m4.spec 
Log Message:
* Mon Jul 17 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.5-3
- Use the install-info scriptlets recommended in the Fedora Extras wiki
- Move $RPM_BUILD_ROOT cleaning from %%prep to %%install



Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- m4.spec	17 Jul 2006 11:44:15 -0000	1.23
+++ m4.spec	17 Jul 2006 14:01:49 -0000	1.24
@@ -1,14 +1,15 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.5
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2.sig
 URL: http://www.gnu.org/software/m4/
 Buildroot: %{_tmppath}/%{name}-root
-Prereq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 A GNU implementation of the traditional UNIX macro processor.  M4 is
@@ -21,8 +22,6 @@
 Install m4 if you need a macro processor.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 
 %build
@@ -30,6 +29,8 @@
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -41,17 +42,21 @@
 %{_mandir}/man1/m4.1*
 
 %post
-/sbin/install-info %{_infodir}/m4.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/m4.info %{_infodir}/dir || :
 
 %preun
 if [ "$1" = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/m4.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/m4.info %{_infodir}/dir || :
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 17 2006 Miloslav Trmac <mitr at redhat.com> - 1.4.5-3
+- Use the install-info scriptlets recommended in the Fedora Extras wiki
+- Move $RPM_BUILD_ROOT cleaning from %%prep to %%install
+
 * Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.5-2
 - remove infodir/dir so it isn't included in the package
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:09:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:09:21 -0400
Subject: rpms/openssh/devel openssh-4.3p2-askpass-grab-info.patch, NONE,
	1.1 openssh-4.3p2-buffer-len.patch, NONE,
	1.1 openssh-4.3p2-configure-typo.patch, NONE,
	1.1 openssh-4.2p1-pam-no-stack.patch, 1.1,
	1.2 openssh-selinux.patch, 1.17, 1.18 openssh.spec, 1.92, 1.93
Message-ID: <200607171409.k6HE9KUF022161@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22118

Modified Files:
	openssh-4.2p1-pam-no-stack.patch openssh-selinux.patch 
	openssh.spec 
Added Files:
	openssh-4.3p2-askpass-grab-info.patch 
	openssh-4.3p2-buffer-len.patch 
	openssh-4.3p2-configure-typo.patch 
Log Message:
* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-6
- improve selinux patch (by Jan Kiszka)
- upstream patch for buffer append space error (#191940)
- fixed typo in configure.ac (#198986)
- added pam_keyinit to pam configuration (#198628)
- improved error message when askpass dialog cannot grab
  keyboard input (#198332)
- buildrequires xauth instead of xorg-x11-xauth
- fixed a few rpmlint warnings


openssh-4.3p2-askpass-grab-info.patch:
 gnome-ssh-askpass2.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE openssh-4.3p2-askpass-grab-info.patch ---
--- openssh-4.3p2/contrib/gnome-ssh-askpass2.c.grab-info	2006-07-17 15:10:11.000000000 +0200
+++ openssh-4.3p2/contrib/gnome-ssh-askpass2.c	2006-07-17 15:25:04.000000000 +0200
@@ -65,9 +65,12 @@
 	err = gtk_message_dialog_new(NULL, 0,
 				     GTK_MESSAGE_ERROR,
 				     GTK_BUTTONS_CLOSE,
-				     "Could not grab %s. "
-				     "A malicious client may be eavesdropping "
-				     "on your session.", what);
+				     "SSH password dialog could not grab the %s input.\n"
+				     "This might be caused by application such as screensaver, "
+				     "however it could also mean that someone may be eavesdropping "
+				     "on your session.\n"
+				     "Either close the application which grabs the %s or "
+				     "log out and log in again to prevent this from happening.", what, what);
 	gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER);
 	gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(err))->label),
 				TRUE);

openssh-4.3p2-buffer-len.patch:
 buffer.c   |   59 +++++++++++++++++++++++++++++++++++++++++++++++------------
 buffer.h   |    5 ++---
 channels.c |    6 ++----
 3 files changed, 51 insertions(+), 19 deletions(-)

--- NEW FILE openssh-4.3p2-buffer-len.patch ---
Index: buffer.c
===================================================================
RCS file: /var/cvs/openssh/buffer.c,v
retrieving revision 1.26
diff -u -p -r1.26 buffer.c
--- buffer.c	26 Mar 2006 03:24:49 -0000	1.26
+++ buffer.c	5 Apr 2006 02:30:16 -0000
@@ -18,6 +18,10 @@
 #include "buffer.h"
 #include "log.h"
 
+#define	BUFFER_MAX_CHUNK	0x100000
+#define	BUFFER_MAX_LEN		0xa00000
+#define	BUFFER_ALLOCSZ		0x008000
+
 /* Initializes the buffer structure. */
 
 void
@@ -66,6 +70,23 @@ buffer_append(Buffer *buffer, const void
 	memcpy(p, data, len);
 }
 
+static int
+buffer_compact(Buffer *buffer)
+{
+	/*
+	 * If the buffer is quite empty, but all data is at the end, move the
+	 * data to the beginning.
+	 */
+	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
+		memmove(buffer->buf, buffer->buf + buffer->offset,
+			buffer->end - buffer->offset);
+		buffer->end -= buffer->offset;
+		buffer->offset = 0;
+		return (1);
+	}
+	return (0);
+}
+
 /*
  * Appends space to the buffer, expanding the buffer if necessary. This does
  * not actually copy the data into the buffer, but instead returns a pointer
@@ -93,20 +114,13 @@ restart:
 		buffer->end += len;
 		return p;
 	}
-	/*
-	 * If the buffer is quite empty, but all data is at the end, move the
-	 * data to the beginning and retry.
-	 */
-	if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) {
-		memmove(buffer->buf, buffer->buf + buffer->offset,
-			buffer->end - buffer->offset);
-		buffer->end -= buffer->offset;
-		buffer->offset = 0;
+
+	/* Compact data back to the start of the buffer if necessary */
+	if (buffer_compact(buffer))
 		goto restart;
-	}
-	/* Increase the size of the buffer and retry. */
 
-	newlen = buffer->alloc + len + 32768;
+	/* Increase the size of the buffer and retry. */
+	newlen = roundup(buffer->alloc + len, BUFFER_ALLOCSZ);
 	if (newlen > BUFFER_MAX_LEN)
 		fatal("buffer_append_space: alloc %u not supported",
 		    newlen);
@@ -114,6 +128,27 @@ restart:
 	buffer->alloc = newlen;
 	goto restart;
 	/* NOTREACHED */
+}
+
+/*
+ * Check whether an allocation of 'len' will fit in the buffer
+ * This must follow the same math as buffer_append_space
+ */
+int
+buffer_check_alloc(Buffer *buffer, u_int len)
+{
+	if (buffer->offset == buffer->end) {
+		buffer->offset = 0;
+		buffer->end = 0;
+	}
+ restart:
+	if (buffer->end + len < buffer->alloc)
+		return (1);
+	if (buffer_compact(buffer))
+		goto restart;
+	if (roundup(buffer->alloc + len, BUFFER_ALLOCSZ) <= BUFFER_MAX_LEN)
+		return (1);
+	return (0);
 }
 
 /* Returns the number of bytes of data in the buffer. */
Index: buffer.h
===================================================================
RCS file: /var/cvs/openssh/buffer.h,v
retrieving revision 1.14
diff -u -p -r1.14 buffer.h
--- buffer.h	26 Mar 2006 03:30:01 -0000	1.14
+++ buffer.h	4 Apr 2006 00:39:16 -0000
@@ -23,9 +23,6 @@ typedef struct {
 	u_int	 end;		/* Offset of last byte containing data. */
 }       Buffer;
 
-#define	BUFFER_MAX_CHUNK	0x100000
-#define	BUFFER_MAX_LEN		0xa00000
-
 void	 buffer_init(Buffer *);
 void	 buffer_clear(Buffer *);
 void	 buffer_free(Buffer *);
@@ -35,6 +32,8 @@ void	*buffer_ptr(Buffer *);
 
 void	 buffer_append(Buffer *, const void *, u_int);
 void	*buffer_append_space(Buffer *, u_int);
+
+int	 buffer_check_alloc(Buffer *, u_int);
 
 void	 buffer_get(Buffer *, void *, u_int);
 
Index: channels.c
===================================================================
RCS file: /var/cvs/openssh/channels.c,v
retrieving revision 1.228
diff -u -p -r1.228 channels.c
--- channels.c	31 Mar 2006 12:11:44 -0000	1.228
+++ channels.c	5 Apr 2006 02:30:36 -0000
@@ -747,12 +747,10 @@ channel_pre_open(Channel *c, fd_set *rea
 {
 	u_int limit = compat20 ? c->remote_window : packet_get_maxsize();
 
-	/* check buffer limits */
-	limit = MIN(limit, (BUFFER_MAX_LEN - BUFFER_MAX_CHUNK - CHAN_RBUF));
-
 	if (c->istate == CHAN_INPUT_OPEN &&
 	    limit > 0 &&
-	    buffer_len(&c->input) < limit)
+	    buffer_len(&c->input) < limit &&
+	    buffer_check_alloc(&c->input, CHAN_RBUF))
 		FD_SET(c->rfd, readset);
 	if (c->ostate == CHAN_OUTPUT_OPEN ||
 	    c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {

openssh-4.3p2-configure-typo.patch:
 configure.ac |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE openssh-4.3p2-configure-typo.patch ---
--- openssh-4.3p2/configure.ac.typo	2006-07-17 13:29:27.000000000 +0200
+++ openssh-4.3p2/configure.ac	2006-07-17 13:29:45.000000000 +0200
@@ -1608,6 +1608,7 @@
 			AC_MSG_RESULT(no)
 			AC_DEFINE(BROKEN_GETADDRINFO)
 		],
+		[
 			AC_MSG_RESULT(cross-compiling, assuming no)
 		]
 	)

openssh-4.2p1-pam-no-stack.patch:
 sshd.pam |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

Index: openssh-4.2p1-pam-no-stack.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.2p1-pam-no-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.2p1-pam-no-stack.patch	7 Oct 2005 12:29:15 -0000	1.1
+++ openssh-4.2p1-pam-no-stack.patch	17 Jul 2006 14:09:15 -0000	1.2
@@ -1,6 +1,6 @@
 --- openssh-4.2p1/contrib/redhat/sshd.pam.stack	2004-07-21 03:01:41.000000000 +0200
 +++ openssh-4.2p1/contrib/redhat/sshd.pam	2005-10-07 14:18:50.000000000 +0200
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
  #%PAM-1.0
 -auth       required     pam_stack.so service=system-auth
 -auth       required     pam_nologin.so
@@ -11,5 +11,6 @@
 +account    required     pam_nologin.so
 +account    include      system-auth
 +password   include      system-auth
++session    optional     pam_keyinit.so force revoke
 +session    include      system-auth
 +session    required     pam_loginuid.so

openssh-selinux.patch:
 Makefile.in              |    5 +-
 auth.h                   |    1 
 auth1.c                  |   10 +++++
 auth2.c                  |   10 ++++-
 configure.ac             |   23 ++++++++++++
 contrib/redhat/sshd.init |    9 +++++
 monitor.c                |   20 +++++++++++
 monitor.h                |    2 -
 monitor_wrap.c           |   17 +++++++++
 monitor_wrap.h           |    1 
 selinux.c                |   84 +++++++++++++++++++++++++++++++++++++++++++++++
 selinux.h                |   10 +++++
 session.c                |    4 ++
 sshpty.c                 |    4 ++
 14 files changed, 194 insertions(+), 6 deletions(-)

Index: openssh-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-selinux.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openssh-selinux.patch	18 Oct 2005 20:57:58 -0000	1.17
+++ openssh-selinux.patch	17 Jul 2006 14:09:15 -0000	1.18
@@ -319,7 +319,7 @@
  			if (errno == EROFS &&
 --- openssh-4.2p1/configure.ac.selinux	2005-10-18 15:50:12.000000000 -0400
 +++ openssh-4.2p1/configure.ac	2005-10-18 15:50:12.000000000 -0400
-@@ -2667,6 +2667,20 @@
+@@ -2667,6 +2667,28 @@
  			[#include <arpa/nameser.h>])
  	])
  
@@ -327,8 +327,16 @@
 +SELINUX_MSG="no"
 +LIBSELINUX=""
 +AC_ARG_WITH(selinux,
-+	[  --with-selinux   Enable SELinux support],
++	[  --with-selinux[[=LIBSELINUX-PATH]]   Enable SELinux support],
 +	[ if test "x$withval" != "xno" ; then
++		if test "x$withval" != "xyes"; then
++			CPPFLAGS="$CPPFLAGS -I${withval}/include"
++			if test -n "${need_dash_r}"; then
++				LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
++			else
++				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
++			fi
++               fi 
 +		AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.])
 +		SELINUX_MSG="yes"
 +		AC_CHECK_HEADERS(selinux.h)
@@ -340,7 +348,7 @@
  # Check whether user wants Kerberos 5 support
  KRB5_MSG="no"
  AC_ARG_WITH(kerberos5,
-@@ -3459,6 +3473,7 @@
+@@ -3459,6 +3481,7 @@
  echo "                    Manpage format: $MANTYPE"
  echo "                       PAM support: $PAM_MSG"
  echo "                 KerberosV support: $KRB5_MSG"
@@ -397,7 +405,7 @@
 +extern void setup_selinux_pty(const char *name, const char *tty);
 +extern void setup_selinux_exec_context(const char *name);
 +#else
-+inline void setup_selinux_pty(const char *name, const char *tty) {}
-+inline void setup_selinux_exec_context(const char *name) {} 
++static inline void setup_selinux_pty(const char *name, const char *tty) {}
++static inline void setup_selinux_exec_context(const char *name) {} 
 +#endif /* WITH_SELINUX */
 +#endif /* __SELINUX_H_ */


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- openssh.spec	12 Jul 2006 07:35:41 -0000	1.92
+++ openssh.spec	17 Jul 2006 14:09:15 -0000	1.93
@@ -55,10 +55,10 @@
 %define kerberos5 0
 %endif
 
-Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
+Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.3p2
-%define rel 5.1
+%define rel 6
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -89,36 +89,39 @@
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
+Patch36: openssh-4.3p2-buffer-len.patch
+Patch37: openssh-4.3p2-configure-typo.patch
+Patch38: openssh-4.3p2-askpass-grab-info.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Obsoletes: ssh
+Provides: ssh
 %if %{nologin}
 Requires: /sbin/nologin
 %endif
 
-PreReq: initscripts >= 5.20
+Requires: initscripts >= 5.20
 
 %if ! %{no_gnome_askpass}
 %if %{gtk2}
-BuildPreReq: gtk2-devel
-BuildPreReq: libX11-devel
+BuildRequires: gtk2-devel
+BuildRequires: libX11-devel
 %else
-BuildPreReq: gnome-libs-devel
+BuildRequires: gnome-libs-devel
 %endif
 %endif
 
 %if %{scard}
-BuildPreReq: sharutils
+BuildRequires: sharutils
 %endif
-BuildPreReq: autoconf, automake, openssl-devel, perl, tcp_wrappers, zlib-devel
-BuildPreReq: audit-libs-devel
-BuildPreReq: util-linux, groff, man
-
-BuildPreReq: pam-devel
+BuildRequires: autoconf, automake, openssl-devel, perl, tcp_wrappers, zlib-devel
+BuildRequires: audit-libs-devel
+BuildRequires: util-linux, groff, man
+BuildRequires: pam-devel
 
 %if %{kerberos5}
-BuildPreReq: krb5-devel
+BuildRequires: krb5-devel
 %endif
 
 %if %{WITH_SELINUX}
@@ -131,25 +134,31 @@
 BuildRequires: audit-libs >= 1.0.8
 %endif
 
+BuildRequires: xauth
+
 %package clients
-Summary: OpenSSH clients.
+Summary: The OpenSSH client applications
 Requires: openssh = %{version}-%{release}
 Group: Applications/Internet
 Obsoletes: ssh-clients
+Provides: ssh-clients
 
 %package server
-Summary: The OpenSSH server daemon.
+Summary: The OpenSSH server daemon
 Group: System Environment/Daemons
 Obsoletes: ssh-server
-PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9, /usr/sbin/useradd
+Provides: ssh-server
+Requires: openssh = %{version}-%{release}
+Requires(post): chkconfig >= 0.9, /sbin/service
+Requires(pre): /usr/sbin/useradd
 Requires: /etc/pam.d/system-auth, /%{_lib}/security/pam_loginuid.so
-BuildRequires: xorg-x11-xauth
 
 %package askpass
-Summary: A passphrase dialog for OpenSSH and X.
+Summary: A passphrase dialog for OpenSSH and X
 Group: Applications/Internet
 Requires: openssh = %{version}-%{release}
 Obsoletes: ssh-extras, openssh-askpass-gnome
+Provides: ssh-extras, openssh-askpass-gnome
 
 %description
 SSH (Secure SHell) is a program for logging into and executing
@@ -213,6 +222,9 @@
 %patch30 -p1 -b .exit-deadlock
 %patch31 -p1 -b .skip-used
 %patch35 -p1 -b .progress
+%patch36 -p0 -b .buffer-len
+%patch37 -p1 -b .typo
+%patch38 -p1 -b .grab-info
 
 autoreconf
 
@@ -399,7 +411,7 @@
 %attr(0755,root,root) %{_bindir}/ssh-keygen
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
-%attr(4711,root,root) %{_libexecdir}/openssh/ssh-keysign
+%attr(4755,root,root) %{_libexecdir}/openssh/ssh-keysign
 %attr(0644,root,root) %{_mandir}/man8/ssh-keysign.8*
 %endif
 %if %{scard}
@@ -414,7 +426,7 @@
 %attr(0755,root,root) %{_bindir}/scp
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
-%attr(-,root,root) %{_bindir}/slogin
+%attr(0755,root,root) %{_bindir}/slogin
 %attr(0644,root,root) %{_mandir}/man1/slogin.1*
 %attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
 %if ! %{rescue}
@@ -433,7 +445,7 @@
 %if ! %{rescue}
 %files server
 %defattr(-,root,root)
-%dir %attr(0111,root,root) %{_var}/empty/sshd
+%dir %attr(0711,root,root) %{_var}/empty/sshd
 %attr(0755,root,root) %{_sbindir}/sshd
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
@@ -442,7 +454,7 @@
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
 %attr(0644,root,root) %config(noreplace) /etc/pam.d/sshd
-%attr(0755,root,root) %config /etc/rc.d/init.d/sshd
+%attr(0755,root,root) /etc/rc.d/init.d/sshd
 %endif
 
 %if ! %{no_gnome_askpass}
@@ -454,6 +466,16 @@
 %endif
 
 %changelog
+* Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-6
+- improve selinux patch (by Jan Kiszka)
+- upstream patch for buffer append space error (#191940)
+- fixed typo in configure.ac (#198986)
+- added pam_keyinit to pam configuration (#198628)
+- improved error message when askpass dialog cannot grab
+  keyboard input (#198332)
+- buildrequires xauth instead of xorg-x11-xauth
+- fixed a few rpmlint warnings
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.3p2-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:22:08 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.36,1.37
Message-ID: <200607171422.k6HEM8B3007097@cvs.devel.redhat.com>

Author: mikeb

Update of /cvs/dist/rpms/pwlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7066

Modified Files:
	pwlib.spec 
Log Message:
rebuild to fix missing rpms on ppc{,64}


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pwlib.spec	13 Jul 2006 00:35:34 -0000	1.36
+++ pwlib.spec	17 Jul 2006 14:21:56 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.1
-Release:        3
+Release:        4
 URL:		http://www.openh323.org/
 Source0:	http://www.ekiga.org/pwlib-%{version}.tar.gz
 #We still need this for ppc64 it was not updated in 1.8.4
@@ -90,6 +90,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jul 17 2006 Mike Bonnet <mikeb at redhat.com> - 1.10.1-4
+- rebuild to fix missing rpms on ppc{,64}
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10.1-3
 - rebuild
 - Add missing br bison



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:25:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:25:04 -0400
Subject: rpms/binutils/devel binutils.spec,1.96,1.97
Message-ID: <200607171425.k6HEP4Nt008050@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7957

Modified Files:
	binutils.spec 
Log Message:
2.17.50.0.3-1


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- binutils.spec	17 Jul 2006 13:56:13 -0000	1.96
+++ binutils.spec	17 Jul 2006 14:25:02 -0000	1.97
@@ -117,12 +117,12 @@
 
 cd ..
 %find_lang binutils
-#%#find_lang opcodes
+%find_lang opcodes
 %find_lang bfd
 %find_lang gas
 %find_lang ld
 %find_lang gprof
-#cat opcodes.lang >> binutils.lang
+cat opcodes.lang >> binutils.lang
 cat bfd.lang >> binutils.lang
 cat gas.lang >> binutils.lang
 cat ld.lang >> binutils.lang



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:38:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:38:40 -0400
Subject: rpms/iputils/devel iputils.spec,1.39,1.40
Message-ID: <200607171438.k6HEceqS012029@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11976

Modified Files:
	iputils.spec 
Log Message:
rebuilt


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- iputils.spec	10 Jul 2006 07:33:23 -0000	1.39
+++ iputils.spec	17 Jul 2006 14:38:37 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 38
+Release: 39
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -170,6 +170,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Mon Jul 17 2006 Radek Vokal <rvokal at redhat.com> - 20020927-39
+- rebuilt
+
 * Mon Jul 10 2006 Radek Vokal <rvokal at redhat.com> - 20020927-38
 - tracepath doesn't continue past destination host (#174032) <mildew at gmail.com>
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:55:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:55:55 -0400
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec,1.5,1.6
Message-ID: <200607171455.k6HEtt7Q000522@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql-connector-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv491

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
mass rebuild


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysql-connector-odbc.spec	27 Mar 2006 17:57:44 -0000	1.5
+++ mysql-connector-odbc.spec	17 Jul 2006 14:55:53 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 3.51.12
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.mysql.com/downloads/api-myodbc.html
@@ -67,6 +67,9 @@
 %{_libdir}/lib*so
 
 %changelog
+* Mon Jul 17 2006 Tom Lane <tgl at redhat.com> 3.51.12-2.1
+- rebuild
+
 * Mon Mar 27 2006 Tom Lane <tgl at redhat.com> 3.51.12-2
 - Remove DLL-unload cleanup call from connection shutdown (bz#185343)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 14:57:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 10:57:00 -0400
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec,1.6,1.7
Message-ID: <200607171457.k6HEv0A1000991@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/mysql-connector-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv959

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
mass rebuild


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysql-connector-odbc.spec	17 Jul 2006 14:55:53 -0000	1.6
+++ mysql-connector-odbc.spec	17 Jul 2006 14:56:58 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 3.51.12
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.mysql.com/downloads/api-myodbc.html
@@ -67,7 +67,7 @@
 %{_libdir}/lib*so
 
 %changelog
-* Mon Jul 17 2006 Tom Lane <tgl at redhat.com> 3.51.12-2.1
+* Mon Jul 17 2006 Tom Lane <tgl at redhat.com> 3.51.12-2.2
 - rebuild
 
 * Mon Mar 27 2006 Tom Lane <tgl at redhat.com> 3.51.12-2



From fedora-cvs-commits at redhat.com  Mon Jul 17 15:10:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 11:10:00 -0400
Subject: rpms/xen/devel xen-3.0.2-config-disable-reloc.patch, NONE,
	1.1 xen.spec, 1.121, 1.122
Message-ID: <200607171510.k6HFA0H5003803@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3603

Modified Files:
	xen.spec 
Added Files:
	xen-3.0.2-config-disable-reloc.patch 
Log Message:
Desactivating the relocation port, Daniel


xen-3.0.2-config-disable-reloc.patch:
 xend-config.sxp |    4 !!!!
 1 files changed, 4 modifications(!)

--- NEW FILE xen-3.0.2-config-disable-reloc.patch ---
*** xen-3.0.2/tools/examples/xend-config.sxp.orig	2006-07-17 16:09:53.000000000 -0400
--- xen-3.0.2/tools/examples/xend-config.sxp	2006-07-17 16:12:27.000000000 -0400
***************
*** 19,25 ****
  #(xend-tcp-xmlrpc-server no)
  #(xend-unix-xmlrpc-server yes)
  #(xend-relocation-server no)
! (xend-relocation-server yes)
  
  (xend-unix-path /var/lib/xend/xend-socket)
  
--- 19,27 ----
  #(xend-tcp-xmlrpc-server no)
  #(xend-unix-xmlrpc-server yes)
  #(xend-relocation-server no)
! # The relocation server should be kept desactivated unless using a trusted
! # network, the domain virtual memory will be exchanged in raw form without
! # encryption of the communication. See also xend-relocation-hosts-allow option
  
  (xend-unix-path /var/lib/xend/xend-socket)
  


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- xen.spec	13 Jul 2006 18:11:48 -0000	1.121
+++ xen.spec	17 Jul 2006 15:09:58 -0000	1.122
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 14
+Release: 15
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -21,6 +21,7 @@
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
 Patch102: xen-3.0.2-config-allow-unix-server.patch
+Patch103: xen-3.0.2-config-disable-reloc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
@@ -88,6 +89,7 @@
 # config patches
 %patch100 -p1
 %patch102 -p1
+%patch103 -p1
 
 cp %{SOURCE2} .
 
@@ -192,6 +194,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Jul 17 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-15
+- desactivating the relocation server in xend conf by default and
+  add a warning text about it.
+
 * Thu Jul 13 2006 Stephen C. Tweedie <sct at redhat.com> - 3.0.2-14
 - Compile fix: don't #include <linux/compiler.h>
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 15:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 11:26:38 -0400
Subject: rpms/radvd/devel radvd.spec,1.29,1.30
Message-ID: <200607171526.k6HFQcGe024850@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24822

Modified Files:
	radvd.spec 
Log Message:
re-build for new build environment


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- radvd.spec	6 Jun 2006 00:56:32 -0000	1.29
+++ radvd.spec	17 Jul 2006 15:26:36 -0000	1.30
@@ -3,7 +3,7 @@
 Summary:   A Router Advertisement daemon
 Name:      radvd
 Version:   0.9.1
-Release:   2
+Release:   3
 License:   BSD-style
 Group:     System Environment/Daemons
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
@@ -83,6 +83,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-3
+- rebuild for new FC-6 build environment
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-2
 - fix BuildRequires for Mock
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 15:35:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 11:35:14 -0400
Subject: rpms/radvd/devel radvd.spec,1.30,1.31
Message-ID: <200607171535.k6HFZE9p026839@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26809

Modified Files:
	radvd.spec 
Log Message:
re-build for new build environment


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- radvd.spec	17 Jul 2006 15:26:36 -0000	1.30
+++ radvd.spec	17 Jul 2006 15:35:12 -0000	1.31
@@ -9,7 +9,7 @@
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
 PreReq:    chkconfig, /usr/sbin/useradd, /sbin/service, initscripts
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: flex
+BuildRequires: flex, byacc
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router



From fedora-cvs-commits at redhat.com  Mon Jul 17 15:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 11:38:49 -0400
Subject: rpms/kexec-tools/devel Makefile.kcp, NONE, 1.1.2.1 kcp.c, NONE,
	1.1.2.1 mkdumprd, NONE, 1.1.2.1 Makefile, 1.1,
	1.1.2.1 kdump.init, 1.8, 1.8.2.1 kexec-tools.spec, 1.34, 1.34.2.1
Message-ID: <200607171538.k6HFcnER027903@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27881

Modified Files:
      Tag: private-nhorman-bz197695-branch
	Makefile kdump.init kexec-tools.spec 
Added Files:
      Tag: private-nhorman-bz197695-branch
	Makefile.kcp kcp.c mkdumprd 
Log Message:
adding files for kexec frontend feature (bz 197695)


--- NEW FILE Makefile.kcp ---
#
# kcp (copying date-stamped core files to filesystems)
#

KCP_C_SRCS:= kcp/kcp.c

KCP_C_OBJS:= $(patsubst %.c, $(OBJDIR)/%.o, $(KCP_C_SRCS))
KCP_C_DEPS:= $(patsubst %.c, $(OBJDIR)/%.d, $(KCP_C_SRCS))
KCP_SRCS:= $(KCP_C_SRCS)
KCP_OBJS:= $(KCP_C_OBJS)
KCP_DEPS:= $(KCP_C_DEPS)
KCP:= $(SBINDIR)/kcp

include $(KCP_DEPS)

$(KCP_C_DEPS): $(OBJDIR)/%.d: %.c
	mkdir -p $(@D)
	$(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@

$(KCP_C_OBJS): $(OBJDIR)/%.o: %.c $(OBJDIR)/%.d
	mkdir -p $(@D)
	$(CC) $(CFLAGS) -o $@ -c $<

$(KCP): $(KCP_OBJS)
	mkdir -p $(@D)
	$(CC) $(CFLAGS) -o $@ $(KCP_OBJS)

echo::
	@echo "KCP_C_SRCS $(KCP_C_SRCS)"
	@echo "KCP_C_DEPS $(KCP_C_DEPS)"
	@echo "KCP_C_OBJS $(KCP_C_OBJS)"
	@echo "KCP_SRCS $(KCP_SRCS)"
	@echo "KCP_DEPS $(KCP_DEPS)"
	@echo "KCP_OBJS $(KCP_OBJS)"



--- NEW FILE kcp.c ---

/* Cheap program to make a variable directory first before copying contents.
 * Main use is for kdump because nash does not support variables, hence a 
 * command sequence like the following does not work:
 * date=`date ...`
 * mkdir -p /x/y/$date
 * cp foo /x/y/$date/bar
 *
 * Don Zickus (dzickus at redhat.com)
 *
 * Copyright 2006 Red Hat Software
 *
 * This software may be freely redistributed under the terms of the GNU
 * General Public License, version 2.
 *
 * 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.
 *
 */

#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <strings.h>
#include <string.h>

#define BLOCK_SIZE 512
#define SSH_TMP ".kcp-ssh"

/* simple copy routine to copy src to dst */
int copy_core(const char *src, const char *dst)
{
	int bytes, total=0;
	int fd_dst, fd_src;
	char buf[BLOCK_SIZE];

	if ((fd_dst=open(dst,O_RDWR|O_CREAT, 0755)) < 0) 	
		return -1;
	if ((fd_src=open(src,O_RDONLY)) < 0) 		
		return -1;

	while ((bytes=read(fd_src,buf,BLOCK_SIZE)) > 0) {
		if ((bytes=write(fd_dst,buf,bytes)) < 0) 
			break;
		total+=bytes;
	}
	if (bytes < 0) 
		return -1;

	close(fd_dst);
	close(fd_src);

	printf("Total bytes written: %d\n", total);
	return total;
}

/* grab the local time and replace the %DATE var with it */
char * xlate_time(const char *dst)
{
	struct tm *lclnow;
	time_t now;
	char *new_dst,*top;
	int x;
	
	//get the time
	if ((top=(char *)malloc(256)) == NULL) 	
		return NULL;
	if ((now = time(NULL)) < 1) 			
		return NULL;
	if ((lclnow = localtime(&now)) == NULL) 	
		return NULL;

	//copy the easy stuff
	new_dst=top;
	while (*dst && (*dst != '%')) *new_dst++ = *dst++;
	
	//translate the date part
	//we output Year-Month-Day-Hour:Minute
	if (*dst == '%'){
		x = sprintf(new_dst,"%d-%02d-%02d-%02d:%02d", lclnow->tm_year+1900, 
				lclnow->tm_mon+1, lclnow->tm_mday, lclnow->tm_hour, 
				lclnow->tm_min);	
		new_dst += x;

		//finish the copy
		dst += 5;  //skip over %DATE
		while (*dst) *new_dst++ = *dst++;
	}
	*new_dst='\0';

	return top;
}

void usage(int rc)
{

	printf("usage: kcp source dest\n");
	printf("       kcp --ssh dest (first time)\n");
	printf("       kcp --ssh src (second time)\n");
	printf("Will translate any %%DATE command properly\n");
	printf("in the 'dest' variable\n");
	exit(rc);
}

int main(int argc, char *argv[])
{
	char *src,*dst, *new_dst, *top;
	char path[256];
	int using_ssh=0;
	char *login;

	if (argc < 3)
		usage(1);

	if (!strncmp(argv[1], "--ssh", 5))
		using_ssh=1;
	else
		src=argv[1];

	dst=argv[2];

	if ((new_dst=xlate_time(dst)) == NULL){
		printf("Failed to translate time\n");
		exit(1);
	}
	top=new_dst;
	
	//Hack for ssh because nash doesn't support variables
	//The idea here is to save the translated date to a file to 
	//be read back later for scp
	if (using_ssh){
		int fd_dst, x;

		if ((fd_dst=open(SSH_TMP, O_RDWR|O_CREAT, 0755)) < 0){
			perror("Failed to open SSH_TMP: ");
			exit(1);
		}
		if ((x=read(fd_dst, path, BLOCK_SIZE)) > 0){
			//second time around
			src=dst;
			path[x]='\0';
			close(fd_dst);
			remove(SSH_TMP);
			execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o", 
				"StrictHostKeyChecking=no", src, path, NULL);
			//should never return!!
			perror("Failed to scp: ");
			exit(1);
		}
		//save data for next run of this program
		printf("writing <%s> to file %s\n",top, SSH_TMP);
		if ((write(fd_dst, top, strlen(top))) < 0){
			perror("Failed to write to SSH_TMP: ");
			exit(1);
		}
		close(fd_dst);

		//save the login info
		login=top;
		if ((top=index(login, ':')) == NULL){
			printf("Bad ssh format %s\n", path);
			exit(1);
		}
		*top++='\0';
	}

	//find the directory portion and separate it from the file
	if ((new_dst=rindex(top, '/')) == NULL){
		new_dst=top;  //strange but okay, only the file passed in
		sprintf(path,"%s",new_dst);
	}else{
		*new_dst='\0';
		new_dst++;

		//finish the ssh hack by running mkdir
		if (using_ssh){
			execlp("ssh", "ssh", "-q", "-o", "BatchMode=yes", "-o",
                               "StrictHostKeyChecking=no", login, "mkdir", "-p", 
				top, NULL);
			//should never return!!
			perror("Failed to ssh: ");
			exit(1);
		}
		//make the new directory
		if ((mkdir(top, 0777)) != 0){
			perror("mkdir failed: ");
			exit(1);
		}
		sprintf(path,"%s/%s",top,new_dst);
	}

	if (copy_core(src,path) < 0){
		perror("Failed to write core file: ");
		exit(1);
	}

	return 0;
}


--- NEW FILE mkdumprd ---
#!/bin/bash --norc
# vim:sts=4:sw=4:ts=8:et

# mkinitrd
#
# Copyright 2005 Red Hat, Inc.
#
# Written by Erik Troan <ewt at redhat.com>
#
# Contributors:
#	Elliot Lee <sopwith at cuc.edu>
#	Miguel de Icaza <miguel at nuclecu.unam.mx>
#	Christian 'Dr. Disk' Hechelmann <drdisk at ds9.au.s.shuttle.de>
#	Michael K. Johnson <johnsonm at redhat.com>
#	Pierre Habraken <Pierre.Habraken at ujf-grenoble.fr>
#	Jakub Jelinek <jakub at redhat.com>
#	Carlo Arenas Belon (carenas at chasqui.lared.net.pe>
#	Keith Owens <kaos at ocs.com.au>
#	Bernhard Rosenkraenzer <bero at redhat.com>
#	Matt Wilson <msw at redhat.com>
#       Trond Eivind Glomsr??d <teg at redhat.com>
#       Jeremy Katz <katzj at redhat.com>
#       Preston Brown <pbrown at redhat.com>
#	Bill Nottingham <notting at redhat.com>
#       Guillaume Cottenceau <gc at mandrakesoft.com>
#	Peter Jones <pjones at redhat.com>

umask 0022

export MALLOC_PERTURB_=204

PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
export PATH

. /etc/rc.d/init.d/functions

VERSION=5.0.39

PROBE="yes"
MODULES=""
PREMODS=""
DMRAIDS=""
MPATHS=""


[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd

CONFMODS="$MODULES"
MODULES=""

withusb=yes
compress=1
allowmissing=""
target=""
kernel=""
force=""
verbose=""
img_vers=""
builtins=""
modulefile=/etc/modules.conf
rc=0

IMAGESIZE=8000
PRESCSIMODS="sd_mod"
fstab="/etc/fstab"

vg_list=""
net_list=""

vecho()
{
    NONL=""
    if [ "$1" == "-n" ]; then
        NONL="-n"
        shift
    fi
    [ -n "$verbose" ] && echo $NONL "$@"
}

error()
{
    NONL=""
    if [ "$1" == "-n" ]; then
        NONL="-n"
        shift
    fi
    echo $NONL "$@" >&2
}

usage () {
    if [ "$1" == "-n" ]; then
        cmd=echo
    else
        cmd=error
    fi

    $cmd "usage: `basename $0` [--version] [--help] [-v] [-d] [-f] [--preload <module>]"
    $cmd "       [--force-ide-probe] [--force-scsi-probe | --omit-scsi-modules]"
    $cmd "       [--image-version] [--force-scsi-probe | --omit-raid-modules]"
    $cmd "       [--with=<module>] [--force-lvm-probe | --omit-lvm-modules]"
    $cmd "       [--builtin=<module>] [--omit-dmraid]"
    $cmd "       [--fstab=<fstab>] [--nocompress] <initrd-image> <kernel-version>"
    $cmd ""
    $cmd "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)"

    if [ "$1" == "-n" ]; then
        exit 0
    else
        exit 1
    fi
}

moduledep() {
    if [ ! -f "/lib/modules/$kernel/modules.dep" ]; then
	error "No dep file found for kernel $kernel"
	exit 1
    fi

    vecho -n "Looking for deps of module $1"
    deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
                function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \
                function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
                /^\/lib/ { show(); \
                           orig=modname($1); dep=""; \
                           if ($2) { for (i = 2; i <= NF; i++) { dep=sprintf("%s %s", dep, modname($i)); } } } \
                /^	/ { dep=sprintf("%s %s", dep, modname($1));  } \
                END      { show(); exit(rc) }' /lib/modules/$kernel/modules.dep $1)
    [ -n "$deps" ] && vecho ":$deps" || vecho
}

findone() {
    echo nash-find "$@" | /sbin/nash --force --quiet \
	| /bin/awk '{ print $1; exit; }'
}

findall() {
    echo nash-find "$@" | /sbin/nash --force --quiet
}

dm_get_uuid() {
    echo dm get_uuid "$1" | /sbin/nash --force --quiet
}

findmodule() {
    skiperrors=""

    if [ $1 == "--skiperrors" ]; then
	skiperrors=--skiperrors
	shift
    fi

    local modName=$1

    if [ "$modName" = "off" -o "$modName" = "null" ]; then
	return
    fi

    if [ $(echo $modName | cut -b1) = "-" ]; then
	skiperrors=--skiperrors
	modName=$(echo $modName | cut -b2-)
    fi

    case "$MODULES " in
        *"/$modName.ko "*) return ;;
    esac

    if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then
        vecho "module $modName assumed to be built in"
	return
    fi

    # special cases
    if [ "$modName" = "i2o_block" ]; then
	findmodule i2o_core
	findmodule -i2o_pci
	modName="i2o_block"
    elif [ "$modName" = "ppa" ]; then
	findmodule parport
	findmodule parport_pc
	modName="ppa"
    elif [ "$modName" = "sbp2" ]; then
	findmodule ieee1394
	findmodule ohci1394
	modName="sbp2"
    else
	moduledep $modName
	for i in $deps; do
	    findmodule $i
	done
    fi

    for modExt in o.gz o ko ; do
	for modDir in /lib/modules/$kernel/updates /lib/modules/$kernel ; do
	    if [ -d $modDir ]; then
		fmPath=$(findone $modDir -name $modName.$modExt)
	        if [ -f "$fmPath" ]; then
		    break 2
	        fi
	    fi
        done
    done

    if [ ! -f $fmPath ]; then
	if [ -n "$skiperrors" ]; then
	    return
	fi

        # ignore the absence of the scsi modules
	for n in $PRESCSIMODS; do
	    if [ "$n" = "$modName" ]; then
		return;
	    fi
	done;

	if [ -n "$allowmissing" ]; then
	    error "WARNING: No module $modName found for kernel $kernel, continuing anyway"
	    return
	fi

	error "No module $modName found for kernel $kernel, aborting."
	exit 1
    fi

    # only need to add each module once
    MODULES="$MODULES $fmPath"

    # need to handle prescsimods here -- they need to go _after_ scsi_mod
    if [ "$modName" = "scsi_mod" ]; then
	for n in $PRESCSIMODS ; do
	    findmodule $n
	done
    fi
}

finddmmods() {
    line=$(/sbin/dmsetup table "$1" 2>/dev/null)
    [ -z "$line" ] && return 1
    type=$(echo "$line" | awk '{ print $3 }')
    [ -z "$type" ] && return 1
    case "$type" in
    mirror)
        findmodule -dm-mirror
        ;;
    emc)
        findmodule -dm-emc
        findmodule -dm-round-robin
        ;;
    multipath)
        findmodule -dm-multipath
        findmodule -dm-round-robin
        ;;
    crypt)
        findmodule -dm-crypt
        ;;
    zero)
        findmodule -dm-zero
        ;;
    esac
}

inst() {
    if [ "$#" != "2" ];then
        echo "usage: inst <file> <destination>"
        return
    fi
    vecho "$1 -> $2"
    cp $1 $2
}

readlink() {
    echo nash-readlink "$1" | /sbin/nash --force --quiet
}

access() {
    echo nash-access -w $t | /sbin/nash --force --quiet
}

findstoragedriverinsys () {
    while [ ! -L device ]; do
        [ "$PWD" = "/sys" ] && return
        cd ..
    done
    cd $(readlink ./device)
    while [ ! -f modalias ]; do
        [ "$PWD" = "/sys/devices" ] && return
        cd ..
    done
    modalias=$(cat modalias)
    for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
        findmodule ${driver%%.ko}
    done
}

findstoragedriver () {
    for device in $@ ; do
        case " $handleddevices " in
            *" $device "*)
                continue ;;
            *) handleddevices="$handleddevices $device" ;;
        esac
        if [[ "$device" =~ "md[0-9]+" ]]; then
            vecho "Found RAID component $device"
            handleraid "$device"
            continue
        fi
        vecho "Looking for driver for device $device"
        sysfs=$(findone -type d /sys/block -name $device)
        [ -z "$sysfs" ] && return
        pushd $sysfs >/dev/null 2>&1
        findstoragedriverinsys
        popd >/dev/null 2>&1
    done
}

findnetdriver() {
    for device in $@ ; do
        case " $handleddevices " in
            *" $device "*)
                continue ;;
            *) handleddevices="$handleddevices $device" ;;
        esac
        modalias=$(cat /sys/class/net/$device/device/modalias)
        for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
            findmodule ${driver%%.ko}
        done
    done
}

handleraid() {
    local start=0

    if [ -n "$noraid" -o ! -f /proc/mdstat ]; then
        return 0
    fi

    levels=$(grep "^$1[	 ]*:" /proc/mdstat | \
        awk '{ print $4 }')
    devs=$(grep "^$1[	 ]*:" /proc/mdstat | \
        awk '{ print gensub("\\[[0-9]*\\]","","g",gensub("^md.*raid[0-9]*","","1")) }')

    for level in $levels ; do
	case $level in
	linear)
	    findmodule linear
	    start=1
	    ;;
	multipath)
	    findmodule multipath
	    start=1
	    ;;
	raid[01456] | raid10)
	    findmodule $level
	    start=1
	    ;;
	*)
	    error "raid level $level (in /proc/mdstat) not recognized"
	    ;;
	esac
    done
    findstoragedriver $devs
    if [ "$start" = 1 ]; then
        raiddevices="$raiddevices $1"
    fi
    return $start
}

handlelvordev() {
    local vg=`lvs --noheadings -o vg_name $1 2>/dev/null`
    if [ -n "$vg" ]; then
        vg=`echo $vg` # strip whitespace
        case " $vg_list " in
        *" $vg "*)
            ;;
        *)
            vg_list="$vg_list $vg"
            for device in `vgdisplay -v $vg 2>/dev/null | sed -n 's/PV Name//p'`; do
                findstoragedriver ${device##/dev/}
            done
            ;;
        esac
    else
        findstoragedriver ${1##/dev/}
    fi
}

handlenetdev() {
    local dev=$1

    source /etc/sysconfig/network
    if [ ! -f /etc/sysconfig/network-scripts/ifcfg-$dev ]; then
	error "unable to find network device configuration for $dev"
    fi
    source /etc/sysconfig/network-scripts/ifcfg-$dev
    [ -n  "$BOOTPROTO" ] || error "bootproto not specified for $dev"

    findnetdriver $dev
    [ -n "$IPADDR" ] && IPSTR="$IPSTR --ip $IPADDR"
    [ -n "$NETMASK" ] && IPSTR="$IPSTR --netmask $NETMASK"
    [ -n "$GATEWAY" ] && IPSTR="$IPSTR --gateway $GATEWAY"
    [ -n "$ETHTOOL_OPTS" ] && IPSTR="$IPSTR --ethtool \"$ETHTOOL_OPTS\""
    [ -n "$MTU" ] && IPSTR="$IPSTR --mtu $MTU"
    if [ -n "$IPADDR" ]; then
	[ -z "$DOMAIN" ] && DOMAIN=$(awk '/^search / { print gensub("^search ","",1) }' /etc/resolv.conf)
	if [ -z "$DNS1" ]; then
	    DNS1=$(awk '/^nameserver / { ORS="" ; if (x > 0) print "," ; printf "%s", $2 ; x = 1}' /etc/resolv.conf)
	fi
    fi
    [ -n "$DOMAIN" ] && IPSTR="$IPSTR --domain \"$DOMAIN\""
    if [ -n "$DNS1" ]; then
        if [ -n "$DNS2" ]; then
	    IPSTR="$IPSTR --dns $DNS1,$DNS2"
	else
	    IPSTR="$IPSTR --dns $DNS1"
	fi
    fi
    network="network --device $dev --bootproto $BOOTPROTO $IPSTR"
}

while [ $# -gt 0 ]; do
    case $1 in
	--fstab*)
	    if echo $1 | grep -q '=' ; then
	    	fstab=`echo $1 | sed 's/^--fstab=//'`
	    else
		fstab=$2
		shift
	    fi
	    ;;

	--with-usb)
	    withusb=yes
	    ;;

        --without-usb)
            withusb=no
            ;;

	--with*)
	    if echo $1 | grep -q '=' ; then
	    	modname=`echo $1 | sed 's/^--with=//'`
	    else
		modname=$2
		shift
	    fi

	    basicmodules="$basicmodules $modname"
	    ;;

	--builtin*)
	    if echo $1 | grep -q '=' ; then
	    	modname=`echo $1 | sed 's/^--builtin=//'`
	    else
		modname=$2
		shift
	    fi
	    builtins="$builtins $modname"
	    ;;

	--version)
	    echo "mkinitrd: version $VERSION"
	    exit 0
	    ;;

	-v)
	    verbose=-v
	    ;;

	--nocompress)
	    compress=""
	    ;;

	--ifneeded)
	    # legacy
	    ;;

	-f)
	    force=1
	    ;;
    
        -d)
            KDUMP_CONFIG_FILE=""
            if [ -f /etc/kdump.conf ]; then
                KDUMP_CONFIG_FILE="/etc/kdump.conf"
            fi
            ;;

	--preload*)
	    if echo $1 | grep -q '=' ; then
	    	modname=`echo $1 | sed 's/^--preload=//'`
	    else
		modname=$2
		shift
	    fi
	    PREMODS="$PREMODS $modname"
	    ;;
	--force-scsi-probe)
	    forcescsi=1
	    ;;
	--omit-scsi-modules)
	    PRESCSIMODS=""
	    noscsi=1
	    ;;
	--force-raid-probe)
	    forceraid=1
	    ;;
	--omit-raid-modules)
	    noraid=1
	    ;;
	--force-lvm-probe)
	    forcelvm=1
	    ;;
	--omit-lvm-modules)
	    nolvm=1
	    ;;
	--omit-dmraid)
	    nodmraid=1
            ;;
        --force-ide-probe)
            forceide=1
            ;;
	--image-version)
	    img_vers=yes
	    ;;
	--allow-missing)
	    allowmissing=yes
	    ;;
	--noresume)
	    noresume=1
	    ;;
        --help)
            usage -n
            ;;
	*)
	    if [ -z "$target" ]; then
		target=$1
	    elif [ -z "$kernel" ]; then
		kernel=$1
	    else
		usage
	    fi
	    ;;
    esac

    shift
done

if [ -z "$target" -o -z "$kernel" ]; then
    usage
fi

if [ -n "$img_vers" ]; then
    target="$target-$kernel"
fi

if [ -z "$force" -a -f $target ]; then
    error "$target already exists."
    exit 1
fi

if [ -n "$forcescsi" -a -n "$noscsi" ]; then
    error "Can't both force scsi probe and omit scsi modules"
    exit 1
fi

if [ -n "$forceraid" -a -n "$noraid" ]; then
    error "Can't both force raid probe and omit raid modules"
    exit 1
fi

if [ -n "$forcelvm" -a -n "$nolvm" ]; then
    error "Can't both force LVM probe and omit LVM modules"
    exit 1
fi

if [ ! -d /lib/modules/$kernel ]; then
    error 'No modules available for kernel "'${kernel}'".'
    exit 1
fi

if [ $UID != 0 ]; then
    error "mkinitrd must be run as root."
    exit 1
fi

vecho "Creating initramfs"
modulefile=/etc/modprobe.conf

# find a temporary directory which doesn't use tmpfs
TMPDIR=""
for t in /tmp /var/tmp /root ${PWD}; do
    if [ ! -d $t ]; then continue; fi
    if ! access -w $t ; then continue; fi

    fs=$(df -T $t 2>/dev/null | awk '{line=$1;} END {printf $2;}')
    if [ "$fs" != "tmpfs" ]; then
	TMPDIR=$t
	break
    fi
done

if [ -z "$TMPDIR" ]; then
    error "no temporary directory could be found."
    exit 1
fi

if [ $TMPDIR = "/root" -o $TMPDIR = "${PWD}" ]; then
    error "WARNING: using $TMPDIR for temporary files"
fi

for n in $PREMODS; do
	findmodule $n
done

needusb=""
if [ -n "$withusb" -a "x$PROBE" == "xyes" ]; then
    # If / or /boot is on a USB device include the driver. With root by
    # label we could still get some odd behaviors
    for fs in / /boot ; do
        esc=$(echo $fs | sed 's,/,\\/,g')
        dev=$(mount | awk "/ on ${esc} / { print \$1 }" | sed 's/[0-9]*$//' | cut -d/ -f3)
        if [ "$(echo $dev | cut -c1-2)" = sd ]; then
            if [ `which kudzu 2>/dev/null` ]; then
                host=$(kudzu --probe -b scsi |
                gawk '/^device: '${dev}'/,/^host:/ { if (/^host/) { print $2; exit; } }')
                if [ -d /proc/scsi/usb-storage-${host} -o -f /proc/scsi/usb-storage/${host} ]; then
                    needusb=1
                fi
            fi
        fi
    done
fi

if [ -n "$needusb" -a "x$PROBE" == "xyes" ]; then
    drivers=$(awk '/^alias[[:space:]]+usb-controller[0-9]* / { print $3}' < $modulefile)
    useUSB=0
    if [ -n "$drivers" ]; then
        useUSB=1
        for driver in $drivers; do
            findmodule $driver
        done
    fi
    for x in $(grep ^[eou]hci_hcd /proc/modules | awk '{ print $1 }' | tac) ; do
        useUSB=1
        findmodule $(echo $x | sed 's/_/-/')
    done
    if [ "$useUSB" == "1" ]; then
        findmodule scsi_mod
        findmodule sd_mod
        findmodule usb-storage
    fi
fi

if [ -n "$forcescsi" -o -z "$noscsi" -a "x$PROBE" == "xyes" ]; then
    if [ ! -f $modulefile ]; then
        modulefile=/etc/conf.modules
    fi

    if [ -f $modulefile ]; then
	scsimodules=`grep "alias[[:space:]]\+scsi_hostadapter" $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | awk '{ print $3 }'`

	if [ -n "$scsimodules" ]; then
            for n in $scsimodules; do
    # for now allow scsi modules to come from anywhere.  There are some
    # RAID controllers with drivers in block/
		findmodule $n
	    done
	fi
    fi
fi

# If we have ide devices and module ide, do the right thing
ide=/proc/ide/ide*
if [ -n "$forceide" -o -n "$ide" -a "x$PROBE" == "xyes" ]; then
    findmodule -ide-disk
fi

# If we have dasd devices, include the necessary modules (S/390)
if [ "x$PROBE" == "xyes" -a -d /proc/dasd ]; then
    findmodule -dasd_mod
    findmodule -dasd_eckd_mod
    findmodule -dasd_fba_mod
fi

if [ "x$PROBE" == "xyes" ]; then
    rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
    rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)

    # in case the root filesystem is modular
    findmodule -${rootfs}

    rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
    # check if it's nfsroot
    if [ "$rootfs" == "nfs" ]; then
	remote=$(echo $rootdev | cut -d : -f 1)
	# FIXME: this doesn't handle ips properly
	remoteip=$(host $remote | cut -d ' ' -f 4) 
	netdev=`/sbin/ip route get to $remoteip |sed 's|.*dev \(.*\).*|\1|g' |awk {'print $1;'} |head -n 1`	
	net_list="$net_list $netdev"
    # check if it's root by label
    elif echo $rootdev | cut -c1-6 | grep -q "LABEL=" ; then
    	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
                     -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
        majmin=$(get_numeric_dev dec /dev/root)
        if [ -n "$majmin" ]; then
            dev=$(findall /sys/block -name dev | while read device ; do \
	          echo "$majmin" | cmp -s $device && echo $device ; done \
	          | sed -e 's,.*/\([^/]\+\)/dev,\1,' )
	    if [ -n "$dev" ]; then
                vecho "Found root device $dev for $rootdev"
                rootdev=$dev
	    fi
        fi
    else
    	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
                     -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
    fi
    [ "$rootfs" != "nfs" ] && handlelvordev $rootdev

    # find the first swap dev which would get used for swsusp
    swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; }}' $fstab \
                | head -n 1)
    if ! echo $swsuspdev | cut -c1-6 | grep -q "LABEL=" ; then
        handlelvordev $swsuspdev
    fi
fi

# If we use LVM or dm-based raid, include dm-mod
# XXX: dm not really supported yet.
testdm=""
[ -n "$vg_list" ] && testdm="yes"
[ -n "$forceraid" -o -n "$forcelvm" ] && testdm="yes"
[ -z "$nolvm" -o -z "$noraid" ] && testdm="yes"
[ "x$PROBE" != "xyes" ] && testdm=""

if [ -n "$testdm" ]; then
    if [ -x /sbin/dmsetup -a -e /dev/mapper/control ]; then
	dmout=$(/sbin/dmsetup ls 2>/dev/null)
	if [ "$dmout" != "No devices found" -a "$dmout" != "" ]; then
	    findmodule -dm-mod

            # DM requires all of these to be there in case someone used the
            # feature.  broken.  (#132001)
            findmodule -dm-mirror
            findmodule -dm-zero
            findmodule -dm-snapshot
	fi
    fi
    if [ -x /sbin/dmraid -a -z "$nodmraid" ]; then
        for raid in $(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks" ) ; do
            dmname=$(resolve_dm_name $raid)
            if [ -n "$dmname" ]; then
                DMRAIDS="$DMRAIDS $dmname"
            fi
        done
    fi
fi
	    
for n in $basicmodules; do
    findmodule $n
done

for n in $CONFMODS; do
    findmodule $n
done

finddmmods

vecho "Using modules:$MODULES"

MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX`
IMAGE=`mktemp ${TMPDIR}/initrd.img.XXXXXX`
RCFILE=$MNTIMAGE/init

cemit()
{
    cat >> $RCFILE
}

emit()
{
    NONL=""
    if [ "$1" == "-n" ]; then
        NONL="-n"
        shift
    fi
    echo $NONL "$@" >> $RCFILE
}

emitdm()
{
    vecho "Adding dm map \"$1\""
    UUID=$(dm_get_uuid "$1")
    if [ -n "$UUID" ]; then
        UUID="--uuid $UUID"
    fi
    emit dm create "$1" $UUID $(/sbin/dmsetup table "$1")
}

emitdms()
{
    [ -z "$MPATHS" -a -z "$DMRAIDS" ] && return 0
    echo dm list $MPATHS $DMRAIDS | nash --force --quiet | \
            while read ACTION NAME ; do
        case $ACTION in
        rmparts)
            emit rmparts "$NAME"
            ;;
        create)
            emitdm "$NAME"
            ;;
        part)
            emit dm partadd "$NAME"
            ;;
        esac
    done
}

if [ -z "$MNTIMAGE" -o -z "$IMAGE" ]; then
    error "Error creating temporaries.  Try again"
    exit 1
fi

if [ -n "$KDUMP_CONFIG_FILE" ]; then
    while read type location; do

        case "$type" in
        net)
            #grab remote host and xlate into numbers
            rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
            need_dns=`echo $rhost|grep [a-zA-Z]`
            [ -n "$need_dns" ] && rhost=`host $rhost|cut -d' ' -f4`

            #find ethernet device used to route to remote host, ie eth0
            netdev=`/sbin/ip route get to $rhost 2>&1`
            [ $? != 0 ] && echo "Bad kdump location: $location" && continue
            netdev=`echo $netdev|awk '{print $3;}'|head -n 1`
           
            #add the ethernet device to the list of modules 
            handlenetdev $netdev

            #load nfs modules, if needed 
            echo $location | grep -v "@" > /dev/null && findmodule nfs
            ;;
        *)
            ;;
        esac

    done < $KDUMP_CONFIG_FILE
fi

mkdir -p $MNTIMAGE
mkdir -p $MNTIMAGE/lib
mkdir -p $MNTIMAGE/bin
mkdir -p $MNTIMAGE/etc
mkdir -p $MNTIMAGE/dev
mkdir -p $MNTIMAGE/proc
mkdir -p $MNTIMAGE/sys
mkdir -p $MNTIMAGE/sysroot
ln -s bin $MNTIMAGE/sbin

if [ -e /etc/fstab.sys ]; then
    inst /etc/fstab.sys "$MNTIMAGE/etc/fstab.sys"
fi
inst /sbin/nash "$MNTIMAGE/bin/nash"
inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
ln -s /sbin/nash $MNTIMAGE/sbin/modprobe

for MODULE in $MODULES; do
    if [ -x /usr/bin/strip ]; then
	/usr/bin/strip -g $verbose $MODULE -o $MNTIMAGE/lib/$(basename $MODULE)
    else
	cp $verbose -a $MODULE $MNTIMAGE/lib
    fi
done

# mknod'ing the devices instead of copying them works both with and
# without devfs...
mkdir $MNTIMAGE/dev/mapper

mknod $MNTIMAGE/dev/ram0 b 1 0
mknod $MNTIMAGE/dev/ram1 b 1 1
ln -sf ram1 $MNTIMAGE/dev/ram

mknod $MNTIMAGE/dev/null c 1 3
mknod $MNTIMAGE/dev/zero c 1 5
mknod $MNTIMAGE/dev/systty c 4 0
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 ; do
    mknod $MNTIMAGE/dev/tty$i c 4 $i
done
for i in 0 1 2 3 ; do
    mknod $MNTIMAGE/dev/ttyS$i c 4 $(($i + 64))
done
mknod $MNTIMAGE/dev/tty c 5 0
mknod $MNTIMAGE/dev/console c 5 1
mknod $MNTIMAGE/dev/ptmx c 5 2
mknod $MNTIMAGE/dev/rtc c 10 135
if [ "$(uname -m)" == "ia64" ]; then
    mknod $MNTIMAGE/dev/efirtc c 10 136
fi

# FIXME -- this can really go poorly with clvm or duplicate vg names.
# nash should do lvm probing for us and write its own configs.
if [ -n "$vg_list" ]; then
    inst /sbin/lvm.static "$MNTIMAGE/bin/lvm"
    if [ -f /etc/lvm/lvm.conf ]; then
	cp $verbose --parents /etc/lvm/lvm.conf $MNTIMAGE/
    fi
fi

echo -n >| $RCFILE
cemit << EOF
#!/bin/nash

mount -t proc /proc /proc
setquiet
echo Mounting proc filesystem
echo Mounting sysfs filesystem
mount -t sysfs /sys /sys
echo Creating /dev
mount -o mode=0755 -t tmpfs /dev /dev
mkdir /dev/pts
mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
mkdir /dev/shm
mkdir /dev/mapper
echo Creating initial device nodes
mknod /dev/null c 1 3
mknod /dev/zero c 1 5
mknod /dev/systty c 4 0
mknod /dev/tty c 5 0
mknod /dev/console c 5 1
mknod /dev/ptmx c 5 2
mknod /dev/rtc c 10 135
EOF
if [ "$(uname -m)" == "ia64" ]; then
    emit "mknod $MNTIMAGE/dev/efirtc c 10 136"
fi

# XXX really we need to openvt too, in case someting changes the
# color palette and then changes vts on fbcon before gettys start.
# (yay, fbcon bugs!)
for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 ; do
    emit "mknod /dev/tty$i c 4 $i"
done

for i in 0 1 2 3 ; do
    emit "mknod /dev/ttyS$i c 4 $(($i + 64))"
done

emit "echo Setting up hotplug."
emit "hotplug"

emit "echo Creating block device nodes."
emit "mkblkdevs"

for MODULE in $MODULES; do
    text=""
    module=`echo $MODULE | sed "s|.*/||" | sed "s/.k\?o$//"`
    fullmodule=`echo $MODULE | sed "s|.*/||"`

    options=`sed -n -e "s/^options[ 	][ 	]*$module[ 	][ 	]*//p" $modulefile 2>/dev/null`

    if [ -n "$options" ]; then
        vecho "Adding module $module$text with options $options"
    else
        vecho "Adding module $module$text"
    fi
    emit "echo \"Loading $fullmodule module\""
    emit "insmod /lib/$fullmodule $options"

    # Hack - we need a delay after loading usb-storage to give things
    #        time to settle down before we start looking a block devices
    if [ "$module" = "usb-storage" ]; then
	emit "echo Waiting 8 seconds for driver initialization."
	emit "sleep 8"
    fi
    if [ "$module" = "zfcp" -a -f /etc/zfcp.conf ]; then
	emit "echo Waiting 2 seconds for driver initialization."
        emit "sleep 2"
        cat /etc/zfcp.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE SCSIID WWPN SCSILUN FCPLUN; do
        cemit <<EOF 
echo -n $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
echo -n $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
echo -n 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
EOF
        done
    fi
done

if [ -n "$vg_list" ]; then
    emit "echo Making device-mapper control node"
    emit "mkdmnod"
fi

if [ -n "$net_list" ]; then
    for netdev in $net_list; do 
	emit "echo Bringing up $netdev"
	handle_netdev $netdev
	emit $network
    done
fi

# HACK: module loading + device creation isn't necessarily synchronous...
# this will make sure that we have all of our devices before trying
# things like RAID or LVM
emit "mkblkdevs"

emitdms

if [ -n "$raiddevices" ]; then
    for dev in $raiddevices; do
	cp -a /dev/${dev} $MNTIMAGE/dev
	emit "raidautorun /dev/${dev}"
    done
fi

if [ -n "$vg_list" ]; then
    emit "echo Scanning logical volumes"
    emit "lvm vgscan --ignorelockingfailure"
    emit "echo Activating logical volumes"
    emit "lvm vgchange -ay --ignorelockingfailure $vg_list"
fi

if [ -z "$noresume" -a -n "$swsuspdev" ]; then
    emit "resume $swsuspdev"
fi

kdump_chk()
{
    rc=`eval $1` && return $rc
    echo "$KDUMP_CONFIG_FILE: $2"
    exit 1
}

if [ -n "$KDUMP_CONFIG_FILE" ]; then
    memtotal=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
    
    #timezone info for date which outputs YYYY-MM-DD-hh:mm
    cp /etc/localtime $MNTIMAGE/etc/localtime
    bin="/sbin/reboot /sbin/kcp"
    
    #traverse the config file and setup each dump location
    while read type location; do
            [ -z "$type" ] && continue  #skip empty lines
            [ "`echo $type| grep ^# `" ] && continue #skip comments
            kdump_chk "test -n \"$location\"" "Need a location for $type"

            case "$type" in
                \#*) continue;;    #skip comments

                raw)
                    #test raw partition
                    kdump_chk "dd if=$location count=1 of=/dev/null > /dev/null 2>&1" \
                               "Bad raw partition $location"
                    #TODO check for available size is greater than $memtotal

                    #setup raw case
                    emit "echo Saving to partition $location"
                    emit "dd if=/proc/vmcore of=$location"
                    emit "cond reboot -h -f"
                    bin="$bin /bin/dd"
                    ;;

                net)
                    #grab remote host and xlate into numbers
                    rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
                    need_dns=`echo $rhost|grep [a-zA-Z]`
                    [ -n "$need_dns" ] && rhost=`host $rhost|cut -d' ' -f4`

                    #find the local ip being used as a route to remote ip
                    netdev=`/sbin/ip route get to $rhost 2>&1`
                    [ $? != 0 ] && echo "Bad kdump location: $location" && continue
                    lhost=`echo $netdev|awk '{print $5;}'|head -n 1`
           
                    emit "echo Saving to remote location $location"
                    if [ -z "`echo $location|grep @`" ]; then
                        #NFS path

                        #test nfs mount and directory creation
                        rlocation=`echo $location| sed 's/.*:/'"$rhost"':/'`
                        tmnt=`mktemp -dq`
                        kdump_chk "mount -t nfs -o nolock $rlocation $tmnt" \
                                   "Bad NFS mount $location"
                        mkdir -p /mnt/var/crash
                        tdir=`mktemp -dqp /mnt/var/crash`

                        rc=$? && rm -rf $tdir && umount $tmnt && rm -rf $tmnt
                        if [ $rc != "0" ]; then 
                            echo "Cannot create directory in $location: var/crash"
                            exit 1 
                        fi
                        #TODO check for available size is greater than $memtotal
    
                        #setup nfs case
                        mkdir -p $MNTIMAGE/mnt
                        emit "mount -t nfs -o nolock $rlocation /mnt"
                        emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
                        emit "cond reboot -h -f"
                    else
                        #SSH path
           
                        #rebuild $location replacing machine name with ip address
                        rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'`
                        #test ssh path and directory creation
                        s_opts="-o BatchMode=yes -o StrictHostKeyChecking=no"
                        kdump_chk "ssh -q $s_opts $rlocation mkdir -p /var/crash/ </dev/null" \
                                   "Could not create $location:/var/crash, check ssh keys"
                        tdir=`ssh -q $s_opts $rlocation mktemp -dqp /var/crash </dev/null`
                        if [ $? != "0" ]; then
                            echo "$KDUMP_CONFIG_FILE: Could not create temp directory in $location:/var/crash"
                            exit 1
                        fi
                        ssh -q $s_opts $rlocation rm -rf $tdir </dev/null
                        #TODO check for available size is greater than $memtotal

                        #setup ssh case, quick check to see if setup already
                        if [ ! -r $MNTIMAGE/dev/urandom ]; then
                            #only need to do these once
                            grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
                            mkdir -p $MNTIMAGE/root
                            cp -a /root/.ssh $MNTIMAGE/root/
                            cp -a /etc/ssh $MNTIMAGE/etc
                            mknod $MNTIMAGE/dev/urandom c 1 9
                            emit "mknod /dev/urandom c 1 9"
                        fi
                        emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
                        emit "cond kcp --ssh $rlocation:/var/crash/$lhost-%DATE/vmcore"
                        emit "cond kcp --ssh /proc/vmcore"
                        emit "cond reboot -h -f"
                        bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
                        
                        #ssh, scp require libraries that aren't found with ldd
                        lib=/lib && [ -d "/lib64" ] && lib=/lib64
                        k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
                    fi
                    ;;
                default)
                    [ "$location" == "reboot" ] && emit "reboot -h -f"
                    #else load normally on default failure case
                    ;;
                *)
                    #test filesystem and directory creation
                    kdump_chk "test -f /sbin/fsck.$type" "Unsupported type $type"
                    kdump_chk "mount -t $type $location /mnt" "Bad mount point $location"
                    mkdir -p /mnt/var/crash
                    tdir=`mktemp -dqp /mnt/var/crash/`
                    rc=$? && rm -rf $tdir && umount /mnt
                    if [ $rc != "0" ]; then 
                        echo "Cannot create directory in $location: /var/crash"
                        exit 1
                    fi
                    #TODO check for available size is greater than $memtotal
    
                    #setup filesystem case
                    lhost="127.0.0.1"
                    mkdir -p $MNTIMAGE/mnt
		    touch $MNTIMAGE/etc/mtab
                    emit "echo Saving to the local filesystem $location"
                    emit "fsck.$type $location"
                    emit "cond mount -t $type $location /mnt"
                    emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
                    emit "cond umount /mnt"
                    emit "cond reboot -h -f"
                    bin="$bin /sbin/fsck.$type /bin/mount"
                    ;;
            esac
    done < $KDUMP_CONFIG_FILE

    #find the shared libraries.  this snippet taken from kboot
    kdump_libs=`for n in $bin; do 
        ldd "$n" 2>/dev/null | tr -s '\011' ' ' | 
        sed 's/.*=> *//;s/^ *//;/ *(0x.*)/s///p;d' 
    done | sort | uniq | sed '/^ *$/d'`

    #copy the binaries and their shared libraries to the archive
    for n in $bin $kdump_libs $k_extras; do
        mkdir -p $MNTIMAGE/`dirname $n`
        cp $n $MNTIMAGE/$n
    done
fi

emit "echo Creating root device."
# mkrootdev does "echo /dev/root /sysroot ext3 defaults,ro 0 0 >/etc/fstab"
emit "mkrootdev -t $rootfs -o $rootopts $rootdev"
rootdev=/dev/root

emit "echo Mounting root filesystem."
emit "mount /sysroot"

emit "echo Setting up other filesystems."
emit "setuproot"

emit "echo Switching to new root and running init."
emit "switchroot"

chmod +x $RCFILE

(cd $MNTIMAGE; findall . | cpio --quiet -c -o) >| $IMAGE || exit 1

if [ -n "$compress" ]; then
    gzip -9 < $IMAGE >| $target || rc=1
else
    cp -a $IMAGE $target || rc=1
fi
rm -rf $MNTIMAGE $IMAGE
if [ -n "$MNTPOINT" ]; then rm -rf $MNTPOINT ; fi

exit $rc


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- Makefile	29 Aug 2005 18:44:29 -0000	1.1
+++ Makefile	17 Jul 2006 15:38:46 -0000	1.1.2.1
@@ -3,4 +3,6 @@
 NAME := kexec-tools
 SPECFILE = $(firstword $(wildcard *.spec))
 
+SUBDIRS = kcp
+
 include ../common/Makefile.common


Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- kdump.init	8 Mar 2006 20:39:23 -0000	1.8
+++ kdump.init	17 Jul 2006 15:38:46 -0000	1.8.2.1
@@ -26,6 +26,7 @@
 KDUMP_KERNELVER=""
 KDUMP_COMMANDLINE=""
 KEXEC_ARGS=""
+KDUMP_CONFIG_FILE="/etc/kdump.conf"
 
 standard_kexec_args="-p --args-linux"
 
@@ -41,10 +42,7 @@
 	cp /proc/vmcore $coredir/vmcore
 }
 
-# Load the kdump kerel specified in /etc/sysconfig/kdump
-# If none is specified, try to load a kdump kernel with the same version
-# as the currently running kernel.
-function load_kdump()
+function check_config()
 {
 	if [ -z "$KDUMP_KERNELVER" ]; then
 		local running_kernel=`uname -r`
@@ -70,6 +68,38 @@
 		return 1
 	fi
 
+	#check to see if config file has been modified after
+	#last build of the image file
+	config_time=0
+	if [ -f $KDUMP_CONFIG_FILE ]; then
+		config_time=`stat -c "%Y" $KDUMP_CONFIG_FILE`
+	fi
+	kernel_time=`stat -c "%Y" $kdump_kernel`
+	image_time=`stat -c "%Y" $kdump_initrd`
+
+	if [ "$config_time" -gt "$image_time" ] ||
+	   [ "$kernel_time" -gt "$image_time" ]; then
+		echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change"
+		echo "Rebuilding $kdump_initrd"
+		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+	fi
+
+	#hack until we stop making initrd for kdump during rpm install
+	#allow initrd 120 seconds to be created before considering it new
+	module_time=`stat -c "%Y" /lib/modules/${kdump_kver}`
+	let module_time=module_time+120
+	if [ ! "$image_time" -gt "$module_time" ]; then
+		echo "Detected initial rpm install"
+		echo "Rebuilding $kdump_initrd"
+		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+	fi
+}
+
+# Load the kdump kerel specified in /etc/sysconfig/kdump
+# If none is specified, try to load a kdump kernel with the same version
+# as the currently running kernel.
+function load_kdump()
+{
 	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'`
@@ -87,6 +117,8 @@
 	    save_core
 	    reboot
         else
+	    #TODO check raw partition for core dump image
+	    check_config
 	    load_kdump
 	fi
 	;;
@@ -98,6 +130,7 @@
 	;;
   restart)
 	$KEXEC -p -u
+	check_config
 	load_kdump
 	;;
   condrestart)


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- kexec-tools.spec	12 Jul 2006 06:42:46 -0000	1.34
+++ kexec-tools.spec	17 Jul 2006 15:38:46 -0000	1.34.2.1
@@ -7,6 +7,10 @@
 Source0: %{name}-%{version}.tar.gz
 Source1: kdump.init
 Source2: kdump.sysconfig
+Source3: mkdumprd
+Source4: kdump.conf
+Source5: kcp.c
+Source6: Makefile.kcp
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
 BuildRequires: zlib-devel
@@ -66,6 +70,11 @@
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
+cp $RPM_SOURCE_DIR/kdump.conf .
+cp $RPM_SOURCE_DIR/mkdumprd .
+mkdir -p -m755 kcp
+cp $RPM_SOURCE_DIR/kcp.c kcp/kcp.c
+cp $RPM_SOURCE_DIR/Makefile.kcp kcp/Makefile
 
 %build
 %configure --sbindir=/sbin
@@ -79,11 +88,14 @@
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
 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
+install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
+install -m 755 kdump.conf $RPM_BUILD_ROOT/etc/kdump.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+touch /etc/kdump.conf
 /sbin/chkconfig --add kdump
 
 %postun
@@ -103,6 +115,7 @@
 %defattr(-,root,root,-)
 /sbin/*
 %config(noreplace,missingok) /etc/sysconfig/kdump
+%config(noreplace,missingok) /etc/kdump.conf
 %config /etc/rc.d/init.d/kdump
 %ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:08:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:08:33 -0400
Subject: rpms/binutils/devel binutils-2.17.50.0.3-opcodes-intl.patch, NONE,
	1.1 binutils.spec, 1.97, 1.98
Message-ID: <200607171608.k6HG8XpF025435@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25418

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.17.50.0.3-opcodes-intl.patch 
Log Message:
2.17.50.0.3-1

binutils-2.17.50.0.3-opcodes-intl.patch:
 Makefile.def |    2 ++
 Makefile.in  |   16 ++++++++++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE binutils-2.17.50.0.3-opcodes-intl.patch ---
2006-07-17  Jakub Jelinek  <jakub at redhat.com>

	* Makefile.def: Add dependencies for configure-opcodes
	on configure-intl and all-opcodes on all-intl.
	* Makefile.in: Regenerated.

--- Makefile.def.jj	2006-06-29 14:31:53.000000000 +0200
+++ Makefile.def	2006-07-17 17:50:04.000000000 +0200
@@ -353,8 +353,10 @@ dependencies = { module=all-ld; on=all-b
 dependencies = { module=all-ld; on=all-build-flex; };
 dependencies = { module=all-ld; on=all-intl; };
 
+dependencies = { module=configure-opcodes; on=configure-intl; };
 dependencies = { module=all-opcodes; on=all-bfd; };
 dependencies = { module=all-opcodes; on=all-libiberty; };
+dependencies = { module=all-opcodes; on=all-intl; };
 
 // Other host modules in the 'src' repository.
 dependencies = { module=all-dejagnu; on=all-tcl; };
--- Makefile.in.jj	2006-06-29 14:31:53.000000000 +0200
+++ Makefile.in	2006-07-17 17:57:30.000000000 +0200
@@ -41053,6 +41053,14 @@ all-stage3-ld: maybe-all-stage3-intl
 all-stage4-ld: maybe-all-stage4-intl
 all-stageprofile-ld: maybe-all-stageprofile-intl
 all-stagefeedback-ld: maybe-all-stagefeedback-intl
+configure-opcodes: maybe-configure-intl
+
+configure-stage1-opcodes: maybe-configure-stage1-intl
+configure-stage2-opcodes: maybe-configure-stage2-intl
+configure-stage3-opcodes: maybe-configure-stage3-intl
+configure-stage4-opcodes: maybe-configure-stage4-intl
+configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
+configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
 all-opcodes: maybe-all-bfd
 
 all-stage1-opcodes: maybe-all-stage1-bfd
@@ -41069,6 +41077,14 @@ all-stage3-opcodes: maybe-all-stage3-lib
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-opcodes: maybe-all-intl
+
+all-stage1-opcodes: maybe-all-stage1-intl
+all-stage2-opcodes: maybe-all-stage2-intl
+all-stage3-opcodes: maybe-all-stage3-intl
+all-stage4-opcodes: maybe-all-stage4-intl
+all-stageprofile-opcodes: maybe-all-stageprofile-intl
+all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
 all-dejagnu: maybe-all-tcl
 all-dejagnu: maybe-all-expect
 all-dejagnu: maybe-all-tk


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- binutils.spec	17 Jul 2006 14:25:02 -0000	1.97
+++ binutils.spec	17 Jul 2006 16:08:31 -0000	1.98
@@ -15,6 +15,7 @@
 Patch7: binutils-2.17.50.0.3-build-fixes.patch
 Patch8: binutils-2.17.50.0.3-kept-section.patch
 Patch9: binutils-2.17.50.0.3-power6-insns.patch
+Patch10: binutils-2.17.50.0.3-opcodes-intl.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -53,6 +54,7 @@
 %patch7 -p0 -b .build-fixes~
 %patch8 -p0 -b .kept-section~
 %patch9 -p0 -b .power6-insns~
+%patch10 -p0 -b .opcodes-intl~
 # 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  Mon Jul 17 16:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:23:21 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.14,1.15
Message-ID: <200607171623.k6HGNL3G023110@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23082

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-136


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compat-gcc-296.spec	12 Jul 2006 20:07:10 -0000	1.14
+++ compat-gcc-296.spec	17 Jul 2006 16:23:19 -0000	1.15
@@ -1,10 +1,10 @@
 %define DATE 20000731
 %define gcc_version 2.96
-%define gcc_release 135
+%define gcc_release 136
 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
@@ -15,7 +15,7 @@
 # Need -pie support
 # Need --as-needed/--no-as-needed support
 BuildRequires: binutils >= 2.15.90.0.1.1-2
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, automake
+BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
 # Make sure pthread.h doesn't contain __thread tokens
 BuildRequires: glibc-devel >= 2.2.90-12
 # Need .eh_frame ld optimizations
@@ -1089,9 +1089,8 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.96-135.2
-- rebuild
-- Add br automake
+* Mon Jul 17 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-136
+- rebuilt
 
 * Mon Feb 13 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-135
 - replace -mtune=generic in $RPM_OPT_FLAGS with something that



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:33:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:33:10 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.24,
	1.25 selinux-policy.spec, 1.224, 1.225
Message-ID: <200607171633.k6HGXANT025945@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25892

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
- Remove spamassassin_can_network boolean


policy-20060608.patch:
 global_tunables                    |   14 +-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/rpm.if               |    2 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 ++++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++-
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    1 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |    7 +
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    6 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  125 ++++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xserver.if        |   22 +++-
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    2 
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   15 ++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  202 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |    2 
 67 files changed, 639 insertions(+), 161 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policy-20060608.patch	14 Jul 2006 21:22:36 -0000	1.24
+++ policy-20060608.patch	17 Jul 2006 16:32:49 -0000	1.25
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-17 11:43:02.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,9 +15,23 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
+@@ -311,13 +318,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow spamassassin to do DNS lookups
+-## </p>
+-## </desc>
+-gen_tunable(spamassasin_can_network,false)
+-
+-## <desc>
+-## <p>
+ ## Allow squid to connect to all ports, not just
+ ## HTTP, FTP, and Gopher ports.
+ ## </p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-17 11:43:02.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -27,7 +41,15 @@
  allow bootloader_t self:process { sigkill sigstop signull signal execmem };
  allow bootloader_t self:fifo_file rw_file_perms;
  
-@@ -86,6 +86,7 @@
+@@ -67,6 +67,7 @@
+ files_root_filetrans(bootloader_t,bootloader_tmp_t,file)
+ 
+ kernel_getattr_core_if(bootloader_t)
++kernel_read_network_state(bootloader_t)
+ kernel_read_system_state(bootloader_t)
+ kernel_read_software_raid_state(bootloader_t)
+ kernel_read_kernel_sysctls(bootloader_t)
+@@ -86,6 +87,7 @@
  dev_read_raw_memory(bootloader_t)
  
  fs_getattr_xattr_fs(bootloader_t)
@@ -37,7 +59,7 @@
  mls_file_read_up(bootloader_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-17 11:43:02.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -54,7 +76,7 @@
  role system_r types consoletype_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-17 11:43:02.000000000 -0400
 @@ -232,7 +232,7 @@
  
  	files_search_var_lib($1)
@@ -64,9 +86,28 @@
  	allow $1 rpm_var_lib_t:lnk_file { getattr read write unlink };
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-07-17 11:43:02.000000000 -0400
+@@ -260,6 +260,7 @@
+ ')
+ 
+ optional_policy(`
++	nscd_exec(groupadd_t)
+ 	nscd_socket_use(groupadd_t)
+ ')
+ 
+@@ -534,6 +535,7 @@
+ ')
+ 
+ optional_policy(`
++	nscd_exec(useradd_t)
+ 	nscd_socket_use(useradd_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-07-17 11:43:02.000000000 -0400
 @@ -62,7 +62,7 @@
  network_port(amavisd_send, tcp,10025,s0)
  network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
@@ -95,7 +136,7 @@
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -89,6 +89,7 @@
  
  /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
@@ -106,7 +147,7 @@
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -117,7 +158,7 @@
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-17 11:43:02.000000000 -0400
 @@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -162,7 +203,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -23,6 +23,7 @@
  /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
@@ -171,9 +212,25 @@
  /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
  /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-07-17 12:03:46.000000000 -0400
+@@ -62,10 +62,12 @@
+ allow amavis_t amavis_quarantine_t:dir create_dir_perms;
+ 
+ # Spool Files
++files_search_spool(amavis_t)
+ allow amavis_t amavis_spool_t:dir manage_dir_perms;
+ allow amavis_t amavis_spool_t:file manage_file_perms;
+ allow amavis_t amavis_spool_t:sock_file manage_file_perms;
+ files_spool_filetrans(amavis_t,amavis_spool_t,{ dir file })
++type_transition amavis_t amavis_spool_t:sock_file amavis_var_run_t;
+ 
+ # tmp files
+ allow amavis_t amavis_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-17 11:43:02.000000000 -0400
 @@ -36,10 +36,12 @@
  allow automount_t self:unix_dgram_socket create_socket_perms;
  allow automount_t self:tcp_socket create_stream_socket_perms;
@@ -199,7 +256,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-07-17 11:43:02.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(avahi_t)
  
@@ -210,7 +267,7 @@
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-17 11:43:02.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -240,7 +297,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-17 11:43:02.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -257,9 +314,139 @@
  	')
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
+--- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-07-17 12:08:12.000000000 -0400
+@@ -8,8 +8,9 @@
+ /usr/sbin/clamd			--	gen_context(system_u:object_r:clamd_exec_t,s0)
+ 
+ /var/run/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_run_t,s0)
+-/var/run/clamav/clamd.ctl	-s	gen_context(system_u:object_r:clamd_sock_t,s0)
++/var/run/amavis(d)?/clamd.pid	--	gen_context(system_u:object_r:clamd_var_run_t,s0)
+ /var/lib/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_lib_t,s0)
+ /var/log/clamav			-d	gen_context(system_u:object_r:clamd_var_log_t,s0)
+ /var/log/clamav/clamav.*	--	gen_context(system_u:object_r:clamd_var_log_t,s0)
+ /var/log/clamav/freshclam.*	--	gen_context(system_u:object_r:freshclam_var_log_t,s0)
++/var/spool/amavisd/clamd.sock	-s	gen_context(system_u:object_r:clamd_var_run_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.3/policy/modules/services/clamav.if
+--- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-07-17 12:07:25.000000000 -0400
+@@ -35,11 +35,11 @@
+ #
+ interface(`clamav_stream_connect',`
+ 	gen_require(`
+-		type clamd_t, clamd_sock_t, clamd_var_run_t;
++		type clamd_t, clamd_var_run_t;
+ 	')
+ 
+ 	allow $1 clamd_var_run_t:dir search;
+-	allow $1 clamd_sock_t:sock_file write;
++	allow $1 clamd_var_run_t:sock_file write;
+ 	allow $1 clamd_t:unix_stream_socket connectto;
+ ')
+ 
+@@ -102,3 +102,21 @@
+ 	allow clamscan_t $1:fifo_file rw_file_perms;
+ 	allow clamscan_t $1:process sigchld;
+ ')
++
++########################################
++## <summary>
++##    Access /var/lib/clamav
++## </summary>
++## <param name="domain">
++##    <summary>
++##    Domain allowed to transition.
++##    </summary>
++## </param>
++#
++interface(`access_clam_home',`
++	gen_require(`
++		type clamd_var_lib_t;
++	')
++
++	allow $1 clamd_var_lib_t:dir search;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.3/policy/modules/services/clamav.te
+--- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-07-17 12:11:30.000000000 -0400
+@@ -15,10 +15,6 @@
+ type clamd_etc_t;
+ files_type(clamd_etc_t)
+ 
+-# named socket type
+-type clamd_sock_t;
+-files_type(clamd_sock_t)
+-
+ # tmp files
+ type clamd_tmp_t;
+ files_tmp_file(clamd_tmp_t)
+@@ -34,6 +30,7 @@
+ # pid files
+ type clamd_var_run_t;
+ files_pid_file(clamd_var_run_t)
++typealias clamd_var_run_t alias clamd_sock_t;
+ 
+ type clamscan_t;
+ type clamscan_exec_t;
+@@ -67,12 +64,6 @@
+ allow clamd_t clamd_etc_t:file r_file_perms;
+ allow clamd_t clamd_etc_t:lnk_file { getattr read };
+ 
+-# socket file
+-allow clamd_t clamd_sock_t:file manage_file_perms;
+-allow clamd_t clamd_sock_t:sock_file manage_file_perms;
+-allow clamd_t clamd_sock_t:dir rw_dir_perms;
+-files_pid_filetrans(clamd_t,clamd_sock_t,sock_file)
+-
+ # tmp files
+ allow clamd_t clamd_tmp_t:file create_file_perms;
+ allow clamd_t clamd_tmp_t:dir create_dir_perms;
+@@ -80,14 +71,10 @@
+ 
+ # var/lib files for clamd
+ allow clamd_t clamd_var_lib_t:file create_file_perms;
+-allow clamd_t clamd_var_lib_t:sock_file create_file_perms;
+ allow clamd_t clamd_var_lib_t:dir create_dir_perms;
+-files_var_filetrans(clamd_t,clamd_var_lib_t,{ file dir sock_file })
+-files_var_lib_filetrans(clamd_t,clamd_var_lib_t,file)
+ 
+ # log files
+ allow clamd_t clamd_var_log_t:file create_file_perms;
+-allow clamd_t clamd_var_log_t:sock_file create_file_perms;
+ allow clamd_t clamd_var_log_t:dir { rw_dir_perms setattr };
+ logging_log_filetrans(clamd_t,clamd_var_log_t,file)
+ 
+@@ -161,10 +148,7 @@
+ 
+ # var/lib files together with clamd
+ allow freshclam_t clamd_var_lib_t:file create_file_perms;
+-allow freshclam_t clamd_var_lib_t:sock_file create_file_perms;
+ allow freshclam_t clamd_var_lib_t:dir create_dir_perms;
+-files_var_filetrans(freshclam_t,clamd_var_lib_t,{ file dir sock_file })
+-files_var_lib_filetrans(freshclam_t,clamd_var_lib_t,file)
+ 
+ # pidfiles- var/run together with clamd
+ allow freshclam_t clamd_var_run_t:file manage_file_perms;
+@@ -174,7 +158,6 @@
+ 
+ # log files (own logfiles only)
+ allow freshclam_t freshclam_var_log_t:file create_file_perms;
+-allow freshclam_t freshclam_var_log_t:sock_file create_file_perms;
+ allow freshclam_t freshclam_var_log_t:dir { rw_dir_perms setattr };
+ allow freshclam_t clamd_var_log_t:dir search;
+ logging_log_filetrans(freshclam_t,freshclam_var_log_t,file)
+@@ -234,7 +217,6 @@
+ 
+ # var/lib files together with clamd
+ allow clamscan_t clamd_var_lib_t:file r_file_perms;
+-allow clamscan_t clamd_var_lib_t:sock_file rw_file_perms;
+ allow clamscan_t clamd_var_lib_t:dir r_dir_perms;
+ 
+ kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-17 11:43:02.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -270,7 +457,7 @@
  allow cupsd_t self:udp_socket create_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-17 11:43:02.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -281,7 +468,7 @@
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -29,6 +29,7 @@
  /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
  
@@ -292,7 +479,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
 --- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-07-17 11:43:02.000000000 -0400
 @@ -30,6 +30,10 @@
  domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
  role system_r types dovecot_auth_t;
@@ -323,7 +510,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
 --- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-07-17 11:43:02.000000000 -0400
 @@ -50,6 +50,7 @@
  allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
  allow ftpd_t self:tcp_socket create_stream_socket_perms;
@@ -332,9 +519,17 @@
  
  allow ftpd_t ftpd_etc_t:file r_file_perms;
  
+@@ -185,6 +186,7 @@
+ 
+ 	ifdef(`targeted_policy',`
+ 		userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	       apache_search_sys_content(ftpd_t)
+ 	')
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-17 11:43:02.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -357,7 +552,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-17 11:43:02.000000000 -0400
 @@ -62,7 +62,7 @@
  	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_lpr_t self:tcp_socket create_socket_perms;
@@ -387,9 +582,78 @@
  	')
  
  	optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
+--- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-07-17 12:13:02.000000000 -0400
+@@ -6,8 +6,6 @@
+ # Declarations
+ #
+ 
+-mailman_domain_template(cgi)
+-
+ type mailman_data_t;
+ files_type(mailman_data_t)
+ 
+@@ -25,17 +23,28 @@
+ 
+ mailman_domain_template(queue)
+ 
++mailman_domain_template(cgi)
++
+ ########################################
+ #
+ # Mailman CGI local policy
+ #
+ 
+-# cjp: the template invocation for queue should be
++# cjp: the template invocation for queue and cgi should be
+ # in the below optional policy; however, there are no
+ # optionals for file contexts yet, so it is promoted
+ # to global scope until such facilities exist.
+ 
+ optional_policy(`
++	allow mailman_cgi_t self:netlink_route_socket r_netlink_socket_perms;
++
++	nscd_socket_use(mailman_cgi_t)
++
++	allow mailman_cgi_t urandom_device_t:chr_file { getattr read };
++
++# for python pre-compile foolishness
++	dontaudit mailman_cgi_t lib_t:dir write;
++
+ 	allow mailman_cgi_t mailman_archive_t:dir create_dir_perms;
+ 	allow mailman_cgi_t mailman_archive_t:lnk_file create_lnk_perms;
+ 	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-07-17 11:43:02.000000000 -0400
+@@ -144,3 +144,23 @@
+ 
+ 	allow $1 nscd_t:nscd *;
+ ')
++
++########################################
++## <summary>
++##	Allow the specified domain to execute nscd
++##	in the caller domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nscd_exec',`
++	gen_require(`
++		type nscd_exec_t;
++	')
++
++	can_exec($1,nscd_exec_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 11:43:02.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -419,7 +683,7 @@
  ifdef(`targeted_policy',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
 --- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-07-17 11:43:02.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -455,7 +719,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
 --- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-07-17 11:43:02.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -472,9 +736,175 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-07-17 12:13:57.000000000 -0400
+@@ -160,7 +160,7 @@
+ 
+ init_use_script_ptys(postfix_master_t)
+ 
+-miscfiles_dontaudit_search_man_pages(postfix_master_t)
++miscfiles_read_man_pages(postfix_master_t)
+ 
+ seutil_sigchld_newrole(postfix_master_t)
+ # postfix does a "find" on startup for some reason - keep it quiet
+@@ -593,3 +593,7 @@
+ optional_policy(`
+ 	sasl_connect(postfix_smtpd_t)
+ ')
++
++optional_policy(`
++	postgrey_socket_access(postfix_smtpd_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-2.3.3/policy/modules/services/postgrey.fc
+--- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-07-17 12:18:17.000000000 -0400
+@@ -6,3 +6,5 @@
+ /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
+ 
+ /var/lib/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_lib_t,s0)
++
++/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
+--- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-07-17 12:19:30.000000000 -0400
+@@ -40,6 +40,7 @@
+ allow postgrey_t postgrey_var_run_t:file create_file_perms;
+ allow postgrey_t postgrey_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(postgrey_t,postgrey_var_run_t,file)
++allow postgrey_t postgrey_var_run_t:sock_file manage_file_perms;
+ 
+ kernel_read_system_state(postgrey_t)
+ kernel_read_kernel_sysctls(postgrey_t)
+@@ -103,3 +104,22 @@
+ optional_policy(`
+ 	udev_read_db(postgrey_t)
+ ')
++
++########################################
++## <summary>
++##      Write to postgrey socket
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed to talk to postgrey
++##      </summary>
++## </param>
++#
++interface(`postgrey_socket_access',`
++        gen_require(`
++                type postgrey_var_run_t, postgrey_t;
++        ')
++
++        allow $1 postgrey_var_run_t:sock_file write;
++	allow $1 postgrey_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.3/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-07-17 12:16:02.000000000 -0400
+@@ -29,6 +29,7 @@
+ kernel_read_kernel_sysctls(procmail_t)
+ 
+ corenet_non_ipsec_sendrecv(procmail_t)
++corenet_udp_bind_inaddr_any_node(procmail_t)
+ corenet_tcp_sendrecv_all_if(procmail_t)
+ corenet_udp_sendrecv_all_if(procmail_t)
+ corenet_tcp_sendrecv_all_nodes(procmail_t)
+@@ -82,6 +83,10 @@
+ ')
+ 
+ optional_policy(`
++	access_clam_home(procmail_t)
++')
++
++optional_policy(`
+ 	logging_send_syslog_msg(procmail_t)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-2.3.3/policy/modules/services/radius.fc
+--- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -3,6 +3,7 @@
+ /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
+ 
+ /etc/raddb(/.*)?                gen_context(system_u:object_r:radiusd_etc_t,s0)
++/etc/raddb/db.daily     --      gen_context(system_u:object_r:radiusd_etc_rw_t,s0)
+ 
+ /usr/sbin/radiusd	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
+ /usr/sbin/freeradius	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.3/policy/modules/services/radius.te
+--- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-07-17 11:43:02.000000000 -0400
+@@ -13,6 +13,9 @@
+ type radiusd_etc_t;
+ files_config_file(radiusd_etc_t)
+ 
++type radiusd_etc_rw_t;
++files_type(radiusd_etc_rw_t)
++
+ type radiusd_log_t;
+ logging_log_file(radiusd_log_t)
+ 
+@@ -39,6 +42,11 @@
+ allow radiusd_t radiusd_etc_t:lnk_file { getattr read };
+ files_search_etc(radiusd_t)
+ 
++allow radiusd_t radiusd_etc_rw_t:dir create_dir_perms;
++allow radiusd_t radiusd_etc_rw_t:file create_file_perms;
++allow radiusd_t radiusd_etc_rw_t:lnk_file create_lnk_perms;
++type_transition radiusd_t radiusd_etc_t:{ dir file lnk_file } radiusd_etc_rw_t;
++
+ allow radiusd_t radiusd_log_t:file create_file_perms;
+ allow radiusd_t radiusd_log_t:dir create_dir_perms;
+ logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.3.3/policy/modules/services/remotelogin.te
+--- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-07-17 11:43:02.000000000 -0400
+@@ -37,6 +37,7 @@
+ allow remote_login_t self:sem create_sem_perms;
+ allow remote_login_t self:msgq create_msgq_perms;
+ allow remote_login_t self:msg { send receive };
++allow remote_login_t self:key write;
+ 
+ allow remote_login_t remote_login_tmp_t:dir create_dir_perms;
+ allow remote_login_t remote_login_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-07-17 12:16:42.000000000 -0400
+@@ -186,11 +186,12 @@
+ allow smbd_t self:udp_socket create_socket_perms;
+ allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow smbd_t samba_etc_t:dir rw_dir_perms;
+ allow smbd_t samba_etc_t:file { rw_file_perms setattr };
+ 
+-allow smbd_t samba_log_t:dir ra_dir_perms;
++allow smbd_t samba_log_t:dir { ra_dir_perms setattr };
+ dontaudit smbd_t samba_log_t:dir remove_name;
+ allow smbd_t samba_log_t:file { create ra_file_perms };
+ 
+@@ -313,6 +314,7 @@
+ 
+ optional_policy(`
+ 	cups_read_rw_config(smbd_t)
++	cups_stream_connect(smbd_t)
+ ')
+ 
+ optional_policy(`
+@@ -365,7 +367,7 @@
+ allow nmbd_t samba_etc_t:dir { search getattr };
+ allow nmbd_t samba_etc_t:file { getattr read };
+ 
+-allow nmbd_t samba_log_t:dir ra_dir_perms;
++allow nmbd_t samba_log_t:dir { ra_dir_perms setattr };
+ allow nmbd_t samba_log_t:file { create ra_file_perms };
+ 
+ allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -0,0 +1,8 @@
 +# setroubleshoot executables
 +
@@ -486,7 +916,7 @@
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-17 11:43:02.000000000 -0400
 @@ -0,0 +1,24 @@
 +## <summary>policy for setroubleshoot</summary>
 +
@@ -514,7 +944,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-17 11:43:02.000000000 -0400
 @@ -0,0 +1,125 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -531,7 +961,7 @@
 +type setroubleshoot_t;
 +type setroubleshoot_exec_t;
 +domain_type(setroubleshoot_t)
-+corecmd_executable_file(setroubleshoot_t)
++corecmd_executable_file(setroubleshoot_exec_t)
 +
 +# log files
 +type setroubleshoot_var_log_t;
@@ -643,7 +1073,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-14 17:21:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-17 11:43:02.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -657,7 +1087,7 @@
  corenet_tcp_connect_http_port(squid_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-17 11:43:02.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -668,7 +1098,7 @@
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-17 11:43:02.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -705,9 +1135,29 @@
 +	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-07-17 11:43:02.000000000 -0400
+@@ -88,6 +88,7 @@
+ allow xdm_t self:unix_dgram_socket create_socket_perms;
+ allow xdm_t self:tcp_socket create_stream_socket_perms;
+ allow xdm_t self:udp_socket create_socket_perms;
++allow xdm_t self:key write;
+ 
+ # Supress permission check on .ICE-unix
+ dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
+@@ -331,7 +332,7 @@
+ ')
+ 
+ optional_policy(`
+-	consoletype_domtrans(xdm_t)
++	consoletype_exec(xdm_t)
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-17 11:43:02.000000000 -0400
 @@ -73,9 +73,11 @@
  corenet_tcp_bind_all_nodes(zebra_t)
  corenet_udp_bind_all_nodes(zebra_t)
@@ -720,9 +1170,38 @@
  
  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/authlogin.if serefpolicy-2.3.3/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-07-17 11:43:02.000000000 -0400
+@@ -1336,3 +1336,6 @@
+ 	typeattribute $1 can_write_shadow_passwords;
+ 	typeattribute $1 can_relabelto_shadow_passwords;
+ ')
++
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.3/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-07-17 12:30:07.000000000 -0400
+@@ -193,6 +193,7 @@
+ term_setattr_console(pam_console_t)
+ term_getattr_unallocated_ttys(pam_console_t)
+ term_setattr_unallocated_ttys(pam_console_t)
++term_use_unallocated_ttys(pam_console_t)
+ 
+ auth_use_nsswitch(pam_console_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.3.3/policy/modules/system/fstools.fc
+--- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-07-17 12:25:16.000000000 -0400
+@@ -1,3 +1,4 @@
++/sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/blockdev		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/cfdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/dosfsck		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
 --- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -9,3 +9,4 @@
  /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
  
@@ -730,7 +1209,7 @@
 +/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
 --- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-07-17 11:43:02.000000000 -0400
 @@ -37,7 +37,7 @@
  #
  
@@ -750,7 +1229,7 @@
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-17 11:43:02.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -763,9 +1242,21 @@
  role system_r types hostname_t;
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
+--- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-07-17 11:43:02.000000000 -0400
+@@ -136,7 +136,7 @@
+ 	term_dontaudit_use_generic_ptys(hotplug_t)
+ 
+ 	optional_policy(`
+-		consoletype_domtrans(hotplug_t)
++		consoletype_exec(hotplug_t)
+ 	')
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
 --- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-07-17 11:43:02.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -780,9 +1271,32 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -198,7 +198,7 @@
+ # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
+ /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libavformat-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-07-17 11:43:02.000000000 -0400
+@@ -51,6 +51,7 @@
+ allow local_login_t self:sem create_sem_perms;
+ allow local_login_t self:msgq create_msgq_perms;
+ allow local_login_t self:msg { send receive };
++allow local_login_t self:key write;
+ 
+ allow local_login_t local_login_lock_t:file create_file_perms;
+ files_lock_filetrans(local_login_t,local_login_lock_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-17 11:43:02.000000000 -0400
 @@ -140,7 +140,7 @@
  # Probably want a transition, and a new auditd_helper app
  corecmd_exec_sbin(auditd_t)
@@ -805,8 +1319,17 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-14 17:18:54.000000000 -0400
-@@ -352,6 +352,8 @@
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-17 12:17:16.000000000 -0400
+@@ -258,6 +258,8 @@
+ allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
+ allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
+ 
++domain_interactive_fd(semanage_t)
++
+ kernel_read_system_state(newrole_t)
+ kernel_read_kernel_sysctls(newrole_t)
+ 
+@@ -352,6 +354,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
  kernel_relabelfrom_unlabeled_sockets(restorecon_t)
@@ -815,7 +1338,7 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -431,6 +433,8 @@
+@@ -431,6 +435,8 @@
  auth_read_all_files_except_shadow(restorecond_t)
  fs_relabelfrom_noxattr_fs(restorecond_t)
  
@@ -824,7 +1347,7 @@
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
  kernel_read_system_state(restorecond_t)
-@@ -534,20 +538,27 @@
+@@ -534,20 +540,27 @@
  # semodule local policy
  #
  
@@ -855,7 +1378,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-17 11:43:02.000000000 -0400
 @@ -68,3 +68,8 @@
  miscfiles_read_localization(setrans_t)
  
@@ -867,7 +1390,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
 --- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-07-17 11:43:02.000000000 -0400
 @@ -277,6 +277,7 @@
  # for /sbin/ip
  allow ifconfig_t self:packet_socket create_socket_perms;
@@ -876,18 +1399,44 @@
  allow ifconfig_t self:tcp_socket { create ioctl };
  files_read_etc_files(ifconfig_t);
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.3/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-07-17 12:22:21.000000000 -0400
+@@ -39,9 +39,9 @@
+ # 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 setuid setgid 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 setuid setgid sys_nice sys_ptrace };
+ 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 ~{ setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow udev_t self:process { execmem setfscreate };
+ allow udev_t self:fd use;
+ allow udev_t self:fifo_file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
 --- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -9,4 +9,5 @@
  /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
 +/usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-17 11:43:02.000000000 -0400
+@@ -20,6 +20,7 @@
+ 	# Use any Linux capability.
+ 	allow $1 self:capability *;
+ 	allow $1 self:fifo_file create_file_perms;
++	allow $1 self:key *;
+ 
+ 	# 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.3.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-17 11:43:02.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -912,7 +1461,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-17 12:33:27.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1208,7 +1757,15 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -4128,7 +4150,7 @@
+@@ -855,6 +877,7 @@
+ 	domain_getattr_all_sockets($1_t)
+ 
+ 	files_exec_usr_src_files($1_t)
++	files_create_boot_flag($1_t)
+ 
+ 	init_rw_initctl($1_t)
+ 
+@@ -4128,7 +4151,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -1217,7 +1774,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4811,34 @@
+@@ -4789,3 +4812,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -1254,7 +1811,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-14 17:18:54.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-17 12:32:59.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1317,3 +1874,15 @@
  	')
  
  	allow privhome home_root_t:dir { getattr search };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-17 11:43:02.000000000 -0400
+@@ -171,7 +171,7 @@
+ netutils_domtrans(xend_t)
+ 
+ optional_policy(`
+-	consoletype_domtrans(xend_t)
++	consoletype_exec(xend_t)
+ ')
+ 
+ ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- selinux-policy.spec	14 Jul 2006 21:22:36 -0000	1.224
+++ selinux-policy.spec	17 Jul 2006 16:32:50 -0000	1.225
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
+- Remove spamassassin_can_network boolean
+
 * Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-1
 - Update to upstream
 - Fix lpr domain for mls



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:43:14 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.15,1.16
Message-ID: <200607171643.k6HGhEkP028939@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28915

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-136


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compat-gcc-296.spec	17 Jul 2006 16:23:19 -0000	1.15
+++ compat-gcc-296.spec	17 Jul 2006 16:43:12 -0000	1.16
@@ -963,6 +963,7 @@
 perl -pi -e 's/"ams/"aMS/' gcc/configure.in gcc/configure gcc/config/elfos.h gcc/config/alpha/elf.h
 perl -pi -e 's/"am/"aM/' gcc/configure.in gcc/configure gcc/config/elfos.h gcc/config/alpha/elf.h
 touch gcc/c-parse.h gcc/cp/parse.h gcc/tradcif.c
+touch gcc/cstamp-h.in gcc/config.in
 
 mkdir compat
 tar xjf %{SOURCE2000} -C compat



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:49:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:49:08 -0400
Subject: rpms/kdebindings/devel kdebindings.spec,1.48,1.49
Message-ID: <200607171649.k6HGn8fI013538@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13490

Modified Files:
	kdebindings.spec 
Log Message:
rebuild



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdebindings.spec	12 Jul 2006 06:39:42 -0000	1.48
+++ kdebindings.spec	17 Jul 2006 16:49:06 -0000	1.49
@@ -22,13 +22,11 @@
 %define arts 1
 %define perl 1
 %define python 1
-%define ruby 1
+%define ruby 0
 %define pyqt 0
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 1.1
+Release: 2
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -200,17 +198,13 @@
 fi
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --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
@@ -227,7 +221,7 @@
    --without-java
 %endif
 
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -280,7 +274,7 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 3.5.3-2
 - rebuild
 
 * Sat Jun 03 2006 Than Ngo <than at redhat.com> 3.5.3-1



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:53:51 -0400
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.16,1.17
Message-ID: <200607171653.k6HGrpuJ015328@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15303

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-136


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- compat-gcc-296.spec	17 Jul 2006 16:43:12 -0000	1.16
+++ compat-gcc-296.spec	17 Jul 2006 16:53:49 -0000	1.17
@@ -15,7 +15,7 @@
 # Need -pie support
 # Need --as-needed/--no-as-needed support
 BuildRequires: binutils >= 2.15.90.0.1.1-2
-BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo
+BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, elfutils-libelf-devel
 # Make sure pthread.h doesn't contain __thread tokens
 BuildRequires: glibc-devel >= 2.2.90-12
 # Need .eh_frame ld optimizations



From fedora-cvs-commits at redhat.com  Mon Jul 17 16:57:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 12:57:09 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.775,1.776
Message-ID: <200607171657.k6HGv9Li016575@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16485

Modified Files:
	openoffice.org.spec 
Log Message:
vba stuff has new lib


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- openoffice.org.spec	17 Jul 2006 13:59:18 -0000	1.775
+++ openoffice.org.spec	17 Jul 2006 16:57:06 -0000	1.776
@@ -2649,6 +2649,7 @@
 %{instdir}/program/uri-encode
 %{instdir}/program/uriproc.uno.so
 %{instdir}/program/uuresolver.uno.so
+%{instdir}/program/vbaevents*.uno.so
 %{instdir}/program/vclcanvas.uno.so
 %{instdir}/program/cairocanvas.uno.so
 %{instdir}/program/versionrc



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:13:31 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.18,1.19
Message-ID: <200607171713.k6HHDVBB020084@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20036

Modified Files:
	kdeaccessibility.spec 
Log Message:
rebuild



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdeaccessibility.spec	12 Jul 2006 17:24:21 -0000	1.18
+++ kdeaccessibility.spec	17 Jul 2006 17:13:28 -0000	1.19
@@ -7,7 +7,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1.1
+Release: 2
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 1:3.5.3-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:14:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:14:29 -0400
Subject: rpms/selinux-policy/devel .cvsignore,1.75,1.76 sources,1.79,1.80
Message-ID: <200607171714.k6HHETfB020501@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20470

Modified Files:
	.cvsignore sources 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
- Remove spamassassin_can_network boolean



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	9 Jul 2006 09:51:33 -0000	1.75
+++ .cvsignore	17 Jul 2006 17:14:27 -0000	1.76
@@ -76,3 +76,4 @@
 serefpolicy-2.2.49.tgz
 serefpolicy-2.3.1.tgz
 serefpolicy-2.3.2.tgz
+serefpolicy-2.3.3.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	9 Jul 2006 09:51:33 -0000	1.79
+++ sources	17 Jul 2006 17:14:27 -0000	1.80
@@ -1 +1 @@
-de57afb1e83b5110b90f2aaeeca0c535  serefpolicy-2.3.2.tgz
+ccd4a3f6ed18a4309d0369e3d18bcd57  serefpolicy-2.3.3.tgz



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:14:36 -0400
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.60,1.61
Message-ID: <200607171714.k6HHEaON020585@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20469

Modified Files:
	kdeadmin.spec 
Log Message:
rebuilt



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kdeadmin.spec	12 Jul 2006 06:38:45 -0000	1.60
+++ kdeadmin.spec	17 Jul 2006 17:14:33 -0000	1.61
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.3
-Release: 1.1
+Release: 2
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -413,6 +413,9 @@
 %endif
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:17:25 -0400
Subject: rpms/system-config-language/devel system-config-language.spec, 1.17,
	1.18
Message-ID: <200607171717.k6HHHPAL003917@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/system-config-language/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3887

Modified Files:
	system-config-language.spec 
Log Message:
Don't nuke *.pyc in preun (#198959)


Index: system-config-language.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- system-config-language.spec	12 Jul 2006 08:23:23 -0000	1.17
+++ system-config-language.spec	17 Jul 2006 17:17:23 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.1.11
-Release: 1.1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -50,11 +50,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-language ] ; then
-  rm -rf /usr/share/system-config-language/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -77,6 +72,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Mon Jul 17 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.11-2
+- Don't nuke *.pyc in preun (#198959)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1.11-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:22:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:22:36 -0400
Subject: rpms/system-config-keyboard/devel system-config-keyboard.spec, 1.16,
	1.17
Message-ID: <200607171722.k6HHMaOH005849@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/system-config-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5824

Modified Files:
	system-config-keyboard.spec 
Log Message:
Don't nuke *.pyc in preun (#198952)


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- system-config-keyboard.spec	12 Jul 2006 08:23:12 -0000	1.16
+++ system-config-keyboard.spec	17 Jul 2006 17:22:33 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the keyboard
 Name: system-config-keyboard
 Version: 1.2.7
-Release: 1.1.1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools
 License: GPL
 ExclusiveOS: Linux
@@ -48,11 +48,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-keyboard ] ; then
-  rm -rf /usr/share/system-config-keyboard/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -75,6 +70,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-keyboard.png
 
 %changelog
+* Mon Jul 17 2006 Paul Nasrat <pnasrat at redhat.com> - 1.2.7-2
+- Don't nuke *.pyc in preun (#198952)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.7-1.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:28:03 -0400
Subject: rpms/kdebindings/devel kdebindings.spec,1.49,1.50
Message-ID: <200607171728.k6HHS3aA007985@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7863

Modified Files:
	kdebindings.spec 
Log Message:
BR autoconf/libtool



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdebindings.spec	17 Jul 2006 16:49:06 -0000	1.49
+++ kdebindings.spec	17 Jul 2006 17:28:00 -0000	1.50
@@ -49,6 +49,8 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
 BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:33:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:33:07 -0400
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.61,1.62
Message-ID: <200607171733.k6HHX78Z009212@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9151

Modified Files:
	kdeadmin.spec 
Log Message:
BR libtool/autoconf



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kdeadmin.spec	17 Jul 2006 17:14:33 -0000	1.61
+++ kdeadmin.spec	17 Jul 2006 17:33:04 -0000	1.62
@@ -23,8 +23,6 @@
 %define kdebase_epoch 6
 %define appdir %{_datadir}/applications/kde
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
 Release: 2
 Name: kdeadmin
@@ -46,19 +44,23 @@
 # upstream patches
 Patch100: kdeadmin-3.5.2-knetworkconf-fedora.patch
 
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
-BuildPrereq: zlib-devel
-BuildPrereq: kdelibs-devel >= %{version}
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel
-BuildPrereq: rpm-devel
-BuildPrereq: bzip2-devel
-BuildPrereq: perl
-BuildPrereq: /usr/bin/desktop-file-install
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: zlib-devel
+BuildRequires: kdelibs-devel >= %{version}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: rpm-devel
+BuildRequires: bzip2-devel
+BuildRequires: perl
+BuildRequires: /usr/bin/desktop-file-install
 
 %description
 The kdeadmin package includes administrative tools for the K Desktop
@@ -193,28 +195,14 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="%{optflags}"
-
-%if %{debug}
-  FLAGS="-O0"
-%endif
-
-export KDEDIR=%{_prefix}
-export PATH=$KDEDIR/bin:$PATH
-export CFLAGS="$FLAGS"
-export CXXFLAGS="$FLAGS"
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --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



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:34:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:34:33 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.25,1.26
Message-ID: <200607171734.k6HHYXQa009375@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9328

Modified Files:
	policy-20060608.patch 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
- Remove spamassassin_can_network boolean


policy-20060608.patch:
 global_tunables                    |   14 +-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/rpm.if               |    2 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 ++++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++-
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    1 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |    7 +
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    6 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  125 ++++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xserver.if        |   22 +++-
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    2 
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   15 ++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  202 +++++++++++++++++++++++--------------
 modules/system/userdomain.te       |   32 ++---
 modules/system/xen.te              |    2 
 68 files changed, 658 insertions(+), 161 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policy-20060608.patch	17 Jul 2006 16:32:49 -0000	1.25
+++ policy-20060608.patch	17 Jul 2006 17:34:28 -0000	1.26
@@ -765,6 +765,30 @@
  /var/lib/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_lib_t,s0)
 +
 +/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-2.3.3/policy/modules/services/postgrey.if
+--- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-07-17 13:32:46.000000000 -0400
+@@ -1 +1,20 @@
+ ## <summary>Postfix grey-listing server</summary>
++
++########################################
++## <summary>
++##      Write to postgrey socket
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed to talk to postgrey
++##      </summary>
++## </param>
++#
++interface(`postgrey_socket_access',`
++        gen_require(`
++                type postgrey_var_run_t, postgrey_t;
++        ')
++
++        allow $1 postgrey_var_run_t:sock_file write;
++	allow $1 postgrey_t:unix_stream_socket connectto;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
 --- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-07-17 12:19:30.000000000 -0400



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:41:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:41:20 -0400
Subject: rpms/spamassassin/devel spamassassin.spec,1.69,1.70
Message-ID: <200607171741.k6HHfKub011215@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11171

Modified Files:
	spamassassin.spec 
Log Message:
- req perl-IO-Socket-SSL for spamc/spamd SSL communication
- req perl-IO-Socket-INET6 for IPv6



Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- spamassassin.spec	12 Jul 2006 08:16:53 -0000	1.69
+++ spamassassin.spec	17 Jul 2006 17:41:18 -0000	1.70
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.3
-Release: 3.1
+Release: 4
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -39,6 +39,10 @@
 Requires: perl(DB_File)
 Requires: perl(Archive::Tar)
 Requires: procmail
+# Needed for spamc/spamd SSL
+Requires: perl-IO-Socket-SSL
+# Needed for IPv6
+Requires: perl-IO-Socket-INET6
 
 Obsoletes: perl-Mail-SpamAssassin
 
@@ -158,6 +162,10 @@
 exit 0
 
 %changelog
+* Mon Jul 17 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-4
+- req perl-IO-Socket-SSL for spamc/spamd SSL communication
+- req perl-IO-Socket-INET6 for IPv6
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.3-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:44:26 -0400
Subject: rpms/spamassassin/devel spamassassin.spec,1.70,1.71
Message-ID: <200607171744.k6HHiQtE012376@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12314

Modified Files:
	spamassassin.spec 
Log Message:
dist tag



Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- spamassassin.spec	17 Jul 2006 17:41:18 -0000	1.70
+++ spamassassin.spec	17 Jul 2006 17:44:23 -0000	1.71
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.3
-Release: 4
+Release: 4%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:52:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:52:50 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.776,1.777
Message-ID: <200607171752.k6HHqoRp030302@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30229

Modified Files:
	openoffice.org.spec 
Log Message:
bump date


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -r1.776 -r1.777
--- openoffice.org.spec	17 Jul 2006 16:57:06 -0000	1.776
+++ openoffice.org.spec	17 Jul 2006 17:52:47 -0000	1.777
@@ -3335,7 +3335,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jul 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
+* Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 - add openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:52:55 -0400
Subject: rpms/sysreport/devel .cvsignore, 1.27, 1.28 sources, 1.30,
	1.31 sysreport.spec, 1.38, 1.39
Message-ID: <200607171752.k6HHqtLx030357@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sysreport/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30305

Modified Files:
	.cvsignore sources sysreport.spec 
Log Message:
fix #195352, sysreport's is returning a return code of 255 vice 0




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	27 Apr 2006 11:44:48 -0000	1.27
+++ .cvsignore	17 Jul 2006 17:52:53 -0000	1.28
@@ -13,3 +13,4 @@
 sysreport-1.4.3-3.tar.bz2
 sysreport-1.4.3-5.tar.bz2
 sysreport-1.4.3-6.tar.bz2
+sysreport-1.4.3-8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Apr 2006 11:45:02 -0000	1.30
+++ sources	17 Jul 2006 17:52:53 -0000	1.31
@@ -1 +1 @@
-8373f09136ef9340f923c76a397664bc  sysreport-1.4.3-6.tar.bz2
+961cc0ab755a452a5197af0bc99b1031  sysreport-1.4.3-8.tar.bz2


Index: sysreport.spec
===================================================================
RCS file: /cvs/dist/rpms/sysreport/devel/sysreport.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sysreport.spec	15 Jul 2006 03:25:09 -0000	1.38
+++ sysreport.spec	17 Jul 2006 17:52:53 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Gathers system hardware and configuration information.
 Name: sysreport
 Version: 1.4.3
-Release: 7
+Release: 8
 URL: http://www.redhat.com/support
 Group: Development/Debuggers
 Source0: %{name}-%{version}-%{release}.tar.bz2
@@ -42,8 +42,8 @@
 %{_mandir}/man1/*
 
 %changelog
-* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 1.4.3-7
-- rebuild
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 1.4.3-8
+- fix #195352, sysreport's is returning a return code of 255 vice 0
 
 * Thu Apr 27 2006 Than Ngo <than at redhat.com> 1.4.3-6
 - fix #190053, Sysreport text refers to Red Hat Linux



From fedora-cvs-commits at redhat.com  Mon Jul 17 17:55:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 13:55:25 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.71,1.72
Message-ID: <200607171755.k6HHtP8N031439@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31362

Modified Files:
	kdemultimedia.spec 
Log Message:
rebuilt



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdemultimedia.spec	11 Jul 2006 22:38:40 -0000	1.71
+++ kdemultimedia.spec	17 Jul 2006 17:55:23 -0000	1.72
@@ -12,7 +12,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 6
+Release: 7
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -196,6 +196,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
+- rebuild
+
 * Tue Jul 11 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
 - fix #197999 ??? install kconf_update applications in $(libdir)/kconf_update_bin
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:04:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:04:50 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.4, 1.5
Message-ID: <200607171804.k6HI4oVp001264@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1226

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
remove GNOME_COMPILE_WARNINGS again


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   14 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 +++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  118 +++-
 8 files changed, 1747 insertions(+), 23 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 gnome-screensaver-2.15.4-securitytoken.patch
Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 06:10:18 -0000	1.4
+++ gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:04:47 -0000	1.5
@@ -1,43 +1,197 @@
---- gnome-screensaver-2.15.4/configure.ac
-+++ gnome-screensaver-2.15.4/configure.ac
-@@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
- LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
- LIBEXIF_REQUIRED_VERSION=0.6.12
- GLIB_REQUIRED_VERSION=2.7.0
-+NSS_REQUIRED_VERSION=3.11.2
+--- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
++++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:01:48.000000000 +0200
+@@ -41,10 +41,15 @@
+ #include "gs-prefs.h"
+ #include "gs-debug.h"
  
- AC_CHECK_HEADERS(unistd.h)
- AC_CHECK_HEADERS(crypt.h sys/select.h)
-@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
-         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-         gconf-2.0 >= $GCONF_REQUIRED_VERSION
--        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
-+        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
- AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
- AC_SUBST(GNOME_SCREENSAVER_LIBS)
++#include "securitytokenmonitor.h"
++
+ static void     gs_monitor_class_init (GSMonitorClass *klass);
+ static void     gs_monitor_init       (GSMonitor      *monitor);
+ static void     gs_monitor_finalize   (GObject        *object);
  
-@@ -229,6 +231,16 @@ fi
- AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
- AC_SUBST(HAVE_USER_SWITCHING)
++static void     gs_monitor_simulate_user_activity (GSMonitor *monitor);
++static void     gs_monitor_lock_screen (GSMonitor *monitor);
++
+ #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate))
+ 
+ struct GSMonitorPrivate
+@@ -56,6 +61,8 @@ struct GSMonitorPrivate
+         GSFade         *fade;
+         GSGrab         *grab;
  
++	ScSecurityTokenMonitor *security_token_monitor;
 +
-+# security token support
-+PKG_CHECK_MODULES(SECURITY_TOKEN,
-+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
-+AC_SUBST(SECURITY_TOKEN_CFLAGS)
-+AC_SUBST(SECURITY_TOKEN_LIBS)
+         guint           release_grab_id;
+ };
+ 
+@@ -100,6 +107,33 @@ manager_auth_request_end_cb (GSManager *
+         gs_listener_emit_auth_request_end (monitor->priv->listener);
+ }
+ 
++static void
++security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
++			    ScSecurityToken        *token,
++			    GSMonitor              *monitor)
++{
++	gs_monitor_simulate_user_activity (monitor);
++}
++
++static void
++security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
++			   ScSecurityToken        *token,
++			   GSMonitor              *monitor)
++{
++	gboolean locking_is_enabled;
++
++	/* FIXME: why isn't there a getter for this? Should I be 
++	 * looking it up from the prefs object instead?
++	 */
++	locking_is_enabled = FALSE;
++	g_object_get (monitor->priv->manager,
++		      "lock-enabled", &locking_is_enabled, NULL);
 +
++	if (locking_is_enabled &&
++	    sc_security_token_is_login_token (token))
++		gs_monitor_lock_screen (monitor);
++}
 +
+ static gboolean
+ watcher_idle_cb (GSWatcher *watcher,
+                  gboolean   is_idle,
+@@ -183,20 +217,7 @@ static void
+ listener_lock_cb (GSListener *listener,
+                   GSMonitor  *monitor)
+ {
+-        gboolean res;
+-        gboolean locked;
+-
+-        /* set lock flag before trying to activate screensaver
+-           in case something tries to react to the ActiveChanged signal */
+-
+-        gs_manager_get_lock_active (monitor->priv->manager, &locked);
+-        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
+-        res = gs_listener_set_active (monitor->priv->listener, TRUE);
+-        if (! res) {
+-                /* If we've failed then restore lock status */
+-                gs_manager_set_lock_active (monitor->priv->manager, locked);
+-                gs_debug ("Unable to lock the screen");
+-        }
++	gs_monitor_lock_screen (monitor);
+ }
+ 
+ static void
+@@ -257,13 +278,7 @@ static void
+ listener_simulate_user_activity_cb (GSListener *listener,
+                                     GSMonitor  *monitor)
+ {
+-        /* in case the screen isn't blanked reset the
+-           idle watcher */
+-        gs_watcher_reset (monitor->priv->watcher);
+-
+-        /* request that the manager unlock -
+-           will pop up a dialog if necessary */
+-        gs_manager_request_unlock (monitor->priv->manager);
++	gs_monitor_simulate_user_activity (monitor);
+ }
+ 
+ static void
+@@ -375,6 +390,27 @@ connect_manager_signals (GSMonitor *moni
+ }
+ 
+ static void
++disconnect_security_token_monitor_signals (GSMonitor *monitor)
++{
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_removed_cb, monitor);
 +
- dnl ---------------------------------------------------------------------------
- dnl - Where should we put documentation ?
- dnl ---------------------------------------------------------------------------
---- gnome-screensaver-2.15.4/src/Makefile.am
-+++ gnome-screensaver-2.15.4/src/Makefile.am
-@@ -209,6 +209,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_inserted_cb, monitor);
++}
++
++static void
++connect_security_token_monitor_signals (GSMonitor *monitor)
++{
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-removed",
++			  G_CALLBACK (security_token_removed_cb), monitor);
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-inserted",
++			  G_CALLBACK (security_token_inserted_cb), monitor);
++}
++
++static void
+ disconnect_prefs_signals (GSMonitor *monitor)
+ {
+         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
+@@ -408,6 +444,11 @@ gs_monitor_init (GSMonitor *monitor)
+         monitor->priv->manager = gs_manager_new ();
+         connect_manager_signals (monitor);
+ 
++	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
++	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
++					 NULL);
++	connect_security_token_monitor_signals (monitor);
++
+         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
+ }
+ 
+@@ -423,6 +464,9 @@ gs_monitor_finalize (GObject *object)
+ 
+         g_return_if_fail (monitor->priv != NULL);
+ 
++	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
++	disconnect_security_token_monitor_signals (monitor);
++
+         disconnect_watcher_signals (monitor);
+         disconnect_listener_signals (monitor);
+         disconnect_manager_signals (monitor);
+@@ -434,6 +478,7 @@ gs_monitor_finalize (GObject *object)
+         g_object_unref (monitor->priv->listener);
+         g_object_unref (monitor->priv->manager);
+         g_object_unref (monitor->priv->prefs);
++        g_object_unref (monitor->priv->security_token_monitor);
+ 
+         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
+ }
+@@ -460,3 +505,34 @@ gs_monitor_start (GSMonitor *monitor,
+ 
[...2744 lines suppressed...]
-+static void
-+security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
-+			   ScSecurityToken        *token,
-+			   GSMonitor              *monitor)
-+{
-+	gboolean locking_is_enabled;
-+
-+	/* FIXME: why isn't there a getter for this? Should I be 
-+	 * looking it up from the prefs object instead?
-+	 */
-+	locking_is_enabled = FALSE;
-+	g_object_get (monitor->priv->manager,
-+		      "lock-enabled", &locking_is_enabled, NULL);
-+
-+	if (locking_is_enabled &&
-+	    sc_security_token_is_login_token (token))
-+		gs_monitor_lock_screen (monitor);
-+}
-+
- static gboolean
- watcher_idle_cb (GSWatcher *watcher,
-                  gboolean   is_idle,
-@@ -183,20 +217,7 @@ static void
- listener_lock_cb (GSListener *listener,
-                   GSMonitor  *monitor)
- {
--        gboolean res;
--        gboolean locked;
--
--        /* set lock flag before trying to activate screensaver
--           in case something tries to react to the ActiveChanged signal */
--
--        gs_manager_get_lock_active (monitor->priv->manager, &locked);
--        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
--        res = gs_listener_set_active (monitor->priv->listener, TRUE);
--        if (! res) {
--                /* If we've failed then restore lock status */
--                gs_manager_set_lock_active (monitor->priv->manager, locked);
--                gs_debug ("Unable to lock the screen");
--        }
-+	gs_monitor_lock_screen (monitor);
- }
- 
- static void
-@@ -257,13 +278,7 @@ static void
- listener_simulate_user_activity_cb (GSListener *listener,
-                                     GSMonitor  *monitor)
- {
--        /* in case the screen isn't blanked reset the
--           idle watcher */
--        gs_watcher_reset (monitor->priv->watcher);
--
--        /* request that the manager unlock -
--           will pop up a dialog if necessary */
--        gs_manager_request_unlock (monitor->priv->manager);
-+	gs_monitor_simulate_user_activity (monitor);
- }
- 
- static void
-@@ -375,6 +390,27 @@ connect_manager_signals (GSMonitor *moni
- }
+--- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-17 14:01:48.000000000 +0200
+@@ -10,7 +10,18 @@ MAINTAINERCLEANFILES =                  
+         Makefile.in
  
- static void
-+disconnect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_removed_cb, monitor);
-+
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_inserted_cb, monitor);
-+}
-+
-+static void
-+connect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-removed",
-+			  G_CALLBACK (security_token_removed_cb), monitor);
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-inserted",
-+			  G_CALLBACK (security_token_inserted_cb), monitor);
-+}
+ noinst_LIBRARIES =			\
+-	libfast-user-switch.a
++	libfast-user-switch.a           \
++	libsecuritytoken.a
 +
-+static void
- disconnect_prefs_signals (GSMonitor *monitor)
- {
-         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
-@@ -408,6 +444,11 @@ gs_monitor_init (GSMonitor *monitor)
-         monitor->priv->manager = gs_manager_new ();
-         connect_manager_signals (monitor);
- 
-+	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
-+	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
-+					 NULL);
-+	connect_security_token_monitor_signals (monitor);
++libsecuritytoken_a_SOURCES = \
++	securitytoken.h \
++	securitytoken.c \
++	securitytokenmonitor.h \
++	securitytokenmonitor.c
 +
-         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
- }
- 
-@@ -423,6 +464,9 @@ gs_monitor_finalize (GObject *object)
++libsecuritytoken_a_CFLAGS = $(SECURITY_TOKEN_CFLAGS) \
++			    -DLIBDIR=\""$(libdir)"\"  \
++			    -DSYSCONFDIR=\""$(sysconfdir)"\"
  
-         g_return_if_fail (monitor->priv != NULL);
+ libfast_user_switch_a_CPPFLAGS =				\
+ 	-DDATADIR=\""$(datadir)"\"				\
+--- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
++++ gnome-screensaver-2.15.4/configure.ac	2006-07-17 14:01:48.000000000 +0200
+@@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
+ LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
+ LIBEXIF_REQUIRED_VERSION=0.6.12
+ GLIB_REQUIRED_VERSION=2.7.0
++NSS_REQUIRED_VERSION=3.11.2
  
-+	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
-+	disconnect_security_token_monitor_signals (monitor);
-+
-         disconnect_watcher_signals (monitor);
-         disconnect_listener_signals (monitor);
-         disconnect_manager_signals (monitor);
-@@ -434,6 +478,7 @@ gs_monitor_finalize (GObject *object)
-         g_object_unref (monitor->priv->listener);
-         g_object_unref (monitor->priv->manager);
-         g_object_unref (monitor->priv->prefs);
-+        g_object_unref (monitor->priv->security_token_monitor);
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(crypt.h sys/select.h)
+@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
+         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+         gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
++        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
++	nss >= $NSS_REQUIRED_VERSION)
+ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
+ AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
- }
-@@ -460,3 +505,34 @@ gs_monitor_start (GSMonitor *monitor,
+@@ -229,6 +231,16 @@ fi
+ AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
+ AC_SUBST(HAVE_USER_SWITCHING)
  
-         return TRUE;
- }
-+
-+static void     
-+gs_monitor_simulate_user_activity (GSMonitor *monitor)
-+{
-+        /* in case the screen isn't blanked reset the
-+           idle watcher */
-+        gs_watcher_reset (monitor->priv->watcher);
 +
-+        /* request that the manager unlock -
-+           will pop up a dialog if necessary */
-+        gs_manager_request_unlock (monitor->priv->manager);
-+}
++# security token support
++PKG_CHECK_MODULES(SECURITY_TOKEN,
++        gobject-2.0 >= $GLIB_REQUIRED_VERSION
++	nss >= $NSS_REQUIRED_VERSION)
++AC_SUBST(SECURITY_TOKEN_CFLAGS)
++AC_SUBST(SECURITY_TOKEN_LIBS)
 +
-+static void     
-+gs_monitor_lock_screen (GSMonitor *monitor)
-+{
-+        gboolean res;
-+        gboolean locked;
 +
-+        /* set lock flag before trying to activate screensaver
-+           in case something tries to react to the ActiveChanged signal */
 +
-+        gs_manager_get_lock_active (monitor->priv->manager, &locked);
-+        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
-+        res = gs_listener_set_active (monitor->priv->listener, TRUE);
-+        if (! res) {
-+                /* If we've failed then restore lock status */
-+                gs_manager_set_lock_active (monitor->priv->manager, locked);
-+                gs_debug ("Unable to lock the screen");
-+        }
-+}
+ dnl ---------------------------------------------------------------------------
+ dnl - Where should we put documentation ?
+ dnl ---------------------------------------------------------------------------



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:08:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:08:23 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.91,1.92
Message-ID: <200607171808.k6HI8Nb9001825@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1804

Modified Files:
	kdepim.spec 
Log Message:
rebuild



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kdepim.spec	12 Jul 2006 06:41:22 -0000	1.91
+++ kdepim.spec	17 Jul 2006 18:08:20 -0000	1.92
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 5.1
+Release: 6
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -191,6 +191,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 6:3.5.3-6
+- rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.3-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:15:51 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.92,1.93
Message-ID: <200607171815.k6HIFpU0004465@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4407

Modified Files:
	kdepim.spec 
Log Message:
typo fix



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kdepim.spec	17 Jul 2006 18:08:20 -0000	1.92
+++ kdepim.spec	17 Jul 2006 18:15:48 -0000	1.93
@@ -35,7 +35,7 @@
 Patch101: kdepim-3.5.3-kmail-typo.patch
 Patch102: kdepim-3.5.3-kmail-encryption.patch
 Patch103: kdepim-3.5.3-kmail-127538.patch
-Patch104: kdepim-3.5.3-kde#11811.patch
+Patch104: kdepim-3.5.3-kde#118112.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -93,7 +93,7 @@
 %patch101 -p1 -b .kmail-typo
 %patch102 -p1 -b .kmail-encryption
 %patch103 -p1 -b .kmail-127538.patch
-%patch104 -p0 -b .kde#11811
+%patch104 -p0 -b .kde#118112
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:16:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:16:30 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.5, 1.6
Message-ID: <200607171816.k6HIGUxC005247@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4651

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
Log Message:
try again to remove GNOME_COMPILE_WARNINGS


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   16 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 +++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  840 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   81 +++
 src/gs-monitor.c                       |  118 +++-
 8 files changed, 1747 insertions(+), 25 deletions(-)

Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:04:47 -0000	1.5
+++ gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:16:27 -0000	1.6
@@ -1,5 +1,5 @@
 --- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:02:26.000000000 +0200
 @@ -41,10 +41,15 @@
  #include "gs-prefs.h"
  #include "gs-debug.h"
@@ -190,7 +190,7 @@
 +        }
 +}
 --- gnome-screensaver-2.15.4/src/Makefile.am.securitytoken	2006-06-28 01:37:57.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/Makefile.am	2006-07-17 14:02:26.000000000 +0200
 @@ -207,6 +207,7 @@ gnome_screensaver_gl_helper_SOURCES =	\
  gnome_screensaver_LDADD =		\
  	$(SAVER_LIBS)			\
@@ -200,7 +200,7 @@
  
  gnome_screensaver_LDFLAGS = -export-dynamic
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.c	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,840 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -1043,7 +1043,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.c	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,602 @@
 +/* securitytoken.c - security token
 + * 
@@ -1648,7 +1648,7 @@
 +}
 +#endif
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytoken.h	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,101 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1752,7 +1752,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
 --- /dev/null	2006-07-17 09:19:31.432009322 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/securitytokenmonitor.h	2006-07-17 14:02:26.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events
@@ -1836,7 +1836,7 @@
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
 --- gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am.securitytoken	2005-04-14 21:59:44.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/src/cut-n-paste/Makefile.am	2006-07-17 14:02:26.000000000 +0200
 @@ -10,7 +10,18 @@ MAINTAINERCLEANFILES =                  
          Makefile.in
  
@@ -1858,7 +1858,7 @@
  libfast_user_switch_a_CPPFLAGS =				\
  	-DDATADIR=\""$(datadir)"\"				\
 --- gnome-screensaver-2.15.4/configure.ac.securitytoken	2006-06-17 03:31:47.000000000 +0200
-+++ gnome-screensaver-2.15.4/configure.ac	2006-07-17 14:01:48.000000000 +0200
++++ gnome-screensaver-2.15.4/configure.ac	2006-07-17 14:15:33.000000000 +0200
 @@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
  LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
  LIBEXIF_REQUIRED_VERSION=0.6.12
@@ -1877,7 +1877,16 @@
  AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
  AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-@@ -229,6 +231,16 @@ fi
+@@ -89,8 +91,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+ 
+ AM_GCONF_SOURCE_2
+ 
+-GNOME_COMPILE_WARNINGS(yes)
+-
+ # Solaris requires libresolv for daemon()
+ AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
+  
+@@ -229,6 +229,16 @@ fi
  AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
  AC_SUBST(HAVE_USER_SWITCHING)
  



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:18:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:18:47 -0400
Subject: rpms/system-switch-mail/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 system-switch-mail.spec, 1.14, 1.15
Message-ID: <200607171818.k6HIIlf9020464@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/system-switch-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20422

Modified Files:
	.cvsignore sources system-switch-mail.spec 
Log Message:
- update po files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Mar 2006 15:04:00 -0000	1.11
+++ .cvsignore	17 Jul 2006 18:18:44 -0000	1.12
@@ -6,3 +6,4 @@
 system-switch-mail-0.5.25-6.tar.bz2
 system-switch-mail-0.5.25-7.tar.bz2
 system-switch-mail-0.5.25-8.tar.bz2
+system-switch-mail-0.5.25-10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Mar 2006 15:04:00 -0000	1.11
+++ sources	17 Jul 2006 18:18:44 -0000	1.12
@@ -1 +1 @@
-ac3ef4f4922bf34a588ebd746c6a74cc  system-switch-mail-0.5.25-8.tar.bz2
+c39347b9060a620a885b405fb16e0b9b  system-switch-mail-0.5.25-10.tar.bz2


Index: system-switch-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/system-switch-mail/devel/system-switch-mail.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- system-switch-mail.spec	15 Jul 2006 03:22:47 -0000	1.14
+++ system-switch-mail.spec	17 Jul 2006 18:18:44 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: The Mail Transport Agent Switcher
 Name: system-switch-mail
 Version: 0.5.25
-Release: 9
+Release: 10
 Source0: %{name}-%{version}-%{release}.tar.bz2
 License: GPL
 Group: Applications/System
@@ -76,8 +76,8 @@
 %{_datadir}/%{name}/switchmail.glade
 
 %changelog
-* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.5.25-9
-- rebuild
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 0.5.25-10
+- update po files
 
 * Tue Mar 07 2006 Than Ngo <than at redhat.com> 0.5.25-8
 - fix deprecated functions in gtk #159155



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:22:21 -0400
Subject: rpms/gdm/devel gdm-2.15.6-wtmp.patch,1.1,1.2
Message-ID: <200607171822.k6HIMLWD021841@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21611

Modified Files:
	gdm-2.15.6-wtmp.patch 
Log Message:
update wtmp patch to actually apply


gdm-2.15.6-wtmp.patch:
 config/PreSession.in |   13 ----
 daemon/slave.c       |   21 +++++++-
 daemon/verify-pam.c  |  133 +++++++++++++++++++++++++++++++++++++++++++++++++++
 daemon/verify.h      |   13 ++++
 4 files changed, 166 insertions(+), 14 deletions(-)

Index: gdm-2.15.6-wtmp.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-wtmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.6-wtmp.patch	17 Jul 2006 03:09:48 -0000	1.1
+++ gdm-2.15.6-wtmp.patch	17 Jul 2006 18:22:19 -0000	1.2
@@ -1,5 +1,5 @@
---- gdm-2.15.6/config/PreSession.in
-+++ gdm-2.15.6/config/PreSession.in
+--- gdm-2.15.6/config/PreSession.in.wtmp	2006-04-27 03:06:05.000000000 +0200
++++ gdm-2.15.6/config/PreSession.in	2006-07-17 14:19:38.000000000 +0200
 @@ -68,17 +68,4 @@ if [ "x$XSETROOT" != "x" ] ; then
  	"$XSETROOT" -cursor_name left_ptr -solid "$BACKCOLOR"
  fi
@@ -18,9 +18,9 @@
 -# some output for easy debugging
 -echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"
  exit 0
---- gdm-2.15.6/daemon/slave.c
-+++ gdm-2.15.6/daemon/slave.c
-@@ -4315,6 +4315,14 @@ gdm_slave_session_start (void)
+--- gdm-2.15.6/daemon/slave.c.wtmp	2006-07-17 14:19:38.000000000 +0200
++++ gdm-2.15.6/daemon/slave.c	2006-07-17 14:19:38.000000000 +0200
+@@ -4317,6 +4317,14 @@ gdm_slave_session_start (void)
      g_free (language);
      g_free (gnome_session);
  
@@ -35,7 +35,7 @@
      gdm_slave_send_num (GDM_SOP_SESSPID, pid);
  
      gdm_sigchld_block_push ();
-@@ -4363,6 +4371,17 @@ gdm_slave_session_start (void)
+@@ -4365,6 +4373,17 @@ gdm_slave_session_start (void)
  				uid, gid);
      }
  
@@ -53,7 +53,7 @@
      gdm_slave_session_stop (pid != 0 /* run_post_session */,
  			    FALSE /* no_shutdown_check */);
  
-@@ -4724,7 +4743,7 @@ gdm_slave_child_handler (int sig)
+@@ -4723,7 +4742,7 @@ gdm_slave_child_handler (int sig)
  		}
  	} else if (pid != 0 && pid == d->sesspid) {
  		d->sesspid = 0;
@@ -62,20 +62,48 @@
  			d->last_sess_status = WEXITSTATUS (status);
  		else
  			d->last_sess_status = -1;
---- gdm-2.15.6/daemon/verify-pam.c
-+++ gdm-2.15.6/daemon/verify-pam.c
-@@ -30,6 +30,8 @@ #ifdef sun
+--- gdm-2.15.6/daemon/verify.h.wtmp	2005-11-04 01:51:21.000000000 +0100
++++ gdm-2.15.6/daemon/verify.h	2006-07-17 14:19:38.000000000 +0200
+@@ -21,6 +21,12 @@
+ 
+ #include "gdm.h"
+ 
++typedef enum {
++	GDM_VERIFY_RECORD_TYPE_LOGIN,
++	GDM_VERIFY_RECORD_TYPE_LOGOUT,
++	GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT
++} GdmVerifyRecordType;
++
+ /* If username is NULL, we ask, if local is FALSE, don't start
+  * the timed login timer */
+ gchar *gdm_verify_user    (GdmDisplay *d,
+@@ -30,6 +36,13 @@ gchar *gdm_verify_user    (GdmDisplay *d
+ void   gdm_verify_cleanup (GdmDisplay *d);
+ void   gdm_verify_check   (void);
+ void   gdm_verify_select_user (const char *user);
++void   gdm_verify_write_record (GdmDisplay *d,
++				GdmVerifyRecordType record_type,
++				const gchar *username,
++				const gchar *console_name,
++				const gchar *host_name,
++				GPid  pid);
++
+ /* used in pam */
+ gboolean gdm_verify_setup_env (GdmDisplay *d);
+ gboolean gdm_verify_setup_user (GdmDisplay *d,
+--- gdm-2.15.6/daemon/verify-pam.c.wtmp	2006-07-17 14:19:38.000000000 +0200
++++ gdm-2.15.6/daemon/verify-pam.c	2006-07-17 14:20:37.000000000 +0200
+@@ -29,6 +29,7 @@
+ #ifdef sun
  #include <fcntl.h>
  #endif
- 
 +#include <utmp.h>
-+
- #include <gligdm-2.15.6/gi18n.h>
  
- #include "gdm.h"
-@@ -47,6 +49,14 @@ #include <bsm/adt.h>
- #include <bsm/adt_event.h>
- #endif	/* HAVE_ADT */
+ #include <glib/gi18n.h>
+ 
+@@ -57,6 +58,14 @@
+ 
+ gboolean gdm_should_use_security_tokens_pam_stack (void);
  
 +#ifndef GDM_BAD_RECORDS_FILE
 +#define GDM_BAD_RECORDS_FILE "/var/log/btmp"
@@ -88,7 +116,7 @@
  /* Evil, but this way these things are passed to the child session */
  static pam_handle_t *pamh = NULL;
  
-@@ -409,6 +419,125 @@ gdm_verify_select_user (const char *user
+@@ -418,6 +427,125 @@ gdm_verify_select_user (const char *user
  		selected_user = g_strdup (user);
  }
  
@@ -214,7 +242,7 @@
  static const char *
  perhaps_translate_message (const char *msg)
  {
-@@ -1099,6 +1228,11 @@ #ifdef  HAVE_ADT
+@@ -1172,6 +1300,11 @@ authenticate_again:
      audit_fail_login (d, pw_change, pwent, pamerr);
  #endif	/* HAVE_ADT */
  
@@ -226,32 +254,3 @@
      /* The verbose authentication is turned on, output the error
       * message from the PAM subsystem */
      if ( ! error_msg_given &&
---- gdm-2.15.6/daemon/verify.h
-+++ gdm-2.15.6/daemon/verify.h
-@@ -21,6 +21,12 @@ #define GDM_VERIFY_H
- 
- #include "gdm.h"
- 
-+typedef enum {
-+	GDM_VERIFY_RECORD_TYPE_LOGIN,
-+	GDM_VERIFY_RECORD_TYPE_LOGOUT,
-+	GDM_VERIFY_RECORD_TYPE_FAILED_ATTEMPT
-+} GdmVerifyRecordType;
-+
- /* If username is NULL, we ask, if local is FALSE, don't start
-  * the timed login timer */
- gchar *gdm_verify_user    (GdmDisplay *d,
-@@ -30,6 +36,13 @@ gchar *gdm_verify_user    (GdmDisplay *d
- void   gdm_verify_cleanup (GdmDisplay *d);
- void   gdm_verify_check   (void);
- void   gdm_verify_select_user (const char *user);
-+void   gdm_verify_write_record (GdmDisplay *d,
-+				GdmVerifyRecordType record_type,
-+				const gchar *username,
-+				const gchar *console_name,
-+				const gchar *host_name,
-+				GPid  pid);
-+
- /* used in pam */
- gboolean gdm_verify_setup_env (GdmDisplay *d);
- gboolean gdm_verify_setup_user (GdmDisplay *d,



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:44:06 -0400
Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.172,1.173
Message-ID: <200607171844.k6HIi6ZL001569@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1559

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- cman-kernel.spec	10 Jul 2006 19:02:20 -0000	1.172
+++ cman-kernel.spec	17 Jul 2006 18:44:04 -0000	1.173
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145_FC5
+%define kernel_version 2.6.17-1.2157_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.27
+Release: 0.FC5.28
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:44:16 -0400
Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.166,1.167
Message-ID: <200607171844.k6HIiG9Q001627@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1614

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gnbd-kernel.spec	10 Jul 2006 19:03:27 -0000	1.166
+++ gnbd-kernel.spec	17 Jul 2006 18:44:14 -0000	1.167
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145_FC5
+%define kernel_version 2.6.17-1.2157_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.35
+Release: 5.FC5.36
 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 Jul 17 18:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:44:24 -0400
Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.143,1.144
Message-ID: <200607171844.k6HIiOU1001685@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1671

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- dlm-kernel.spec	10 Jul 2006 19:04:07 -0000	1.143
+++ dlm-kernel.spec	17 Jul 2006 18:44:22 -0000	1.144
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145_FC5
+%define kernel_version 2.6.17-1.2157_FC5
 %define tempversion 2.6.15
 %define subversion 0
 
@@ -26,7 +26,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.1
-Release: 0.FC5.25
+Release: 0.FC5.26
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:44:32 -0400
Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.164,1.165
Message-ID: <200607171844.k6HIiW7r001745@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1730

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- GFS-kernel.spec	10 Jul 2006 19:04:47 -0000	1.164
+++ GFS-kernel.spec	17 Jul 2006 18:44:30 -0000	1.165
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.17-1.2145_FC5
+%define kernel_version 2.6.17-1.2157_FC5
 %define tempversion 2.6.15
 %define subversion 2
 
@@ -26,7 +26,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.1
-Release: 5.FC5.32
+Release: 5.FC5.33
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:44:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:44:42 -0400
Subject: rpms/perl-DBI/devel .cvsignore, 1.14, 1.15 perl-DBI.spec, 1.26,
	1.27 sources, 1.14, 1.15
Message-ID: <200607171844.k6HIigZM001800@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1785

Modified Files:
	.cvsignore perl-DBI.spec sources 
Log Message:
upgrade to 1.51


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Dec 2005 18:48:12 -0000	1.14
+++ .cvsignore	17 Jul 2006 18:44:40 -0000	1.15
@@ -1,2 +1,3 @@
 DBI-1.48.tar.gz
 DBI-1.50.tar.gz
+DBI-1.51.tar.gz


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-DBI.spec	12 Jul 2006 16:59:55 -0000	1.26
+++ perl-DBI.spec	17 Jul 2006 18:44:40 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           perl-DBI
-Version:        1.50
-Release: 	3
+Version:        1.51
+Release: 	1
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.51-1
+- Upgrade to 1.51
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.50-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Dec 2005 18:48:12 -0000	1.14
+++ sources	17 Jul 2006 18:44:40 -0000	1.15
@@ -1 +1 @@
-487cb22f89ab21029725eb6e0b861a2a  DBI-1.50.tar.gz
+d2ecc92395c4ab8221bac2866afbae04  DBI-1.51.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 18:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 14:54:48 -0400
Subject: rpms/perl-DBD-MySQL/devel .cvsignore, 1.13, 1.14 perl-DBD-MySQL.spec,
	1.27, 1.28 sources, 1.13, 1.14
Message-ID: <200607171854.k6HIsmYV017079@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBD-MySQL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17061

Modified Files:
	.cvsignore perl-DBD-MySQL.spec sources 
Log Message:
upgrade to 3.0006


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 May 2006 23:35:27 -0000	1.13
+++ .cvsignore	17 Jul 2006 18:54:46 -0000	1.14
@@ -1,2 +1,3 @@
 DBD-mysql-3.0002.tar.gz
 DBD-mysql-3.0004.tar.gz
+DBD-mysql-3.0006.tar.gz


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-DBD-MySQL.spec	12 Jul 2006 07:44:46 -0000	1.27
+++ perl-DBD-MySQL.spec	17 Jul 2006 18:54:46 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
-Version:        3.0004
-Release: 	1.FC6.1
+Version:        3.0006
+Release: 	1.FC6
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -66,7 +66,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0006-1.FC6
+- Upgrade to 3.0006
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0004-1.FC6


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 May 2006 23:35:27 -0000	1.13
+++ sources	17 Jul 2006 18:54:46 -0000	1.14
@@ -1,2 +1 @@
-df70ba084c97f5f7c2a997c3de2f0ad0  DBD-mysql-3.0002.tar.gz
-5d328b9fdaf899eba6d72258242ad0a0  DBD-mysql-3.0004.tar.gz
+b6d46ea7df99800082a2d2480056b0ce  DBD-mysql-3.0006.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:08:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:08:52 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.57,
	1.58 sources, 1.70, 1.71 system-config-securitylevel.spec,
	1.81, 1.82
Message-ID: <200607171908.k6HJ8q1q017865@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17849

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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	10 Jul 2006 14:20:22 -0000	1.57
+++ .cvsignore	17 Jul 2006 19:08:50 -0000	1.58
@@ -45,3 +45,4 @@
 system-config-securitylevel-1.6.19.tar.bz2
 system-config-securitylevel-1.6.20.tar.bz2
 system-config-securitylevel-1.6.21.tar.bz2
+system-config-securitylevel-1.6.22.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	10 Jul 2006 14:20:22 -0000	1.70
+++ sources	17 Jul 2006 19:08:50 -0000	1.71
@@ -1 +1 @@
-7e45e0a91a474854461c868d01b940c1  system-config-securitylevel-1.6.21.tar.bz2
+a1ab9bf6d2e817e0b852f6c7cba34b99  system-config-securitylevel-1.6.22.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- system-config-securitylevel.spec	10 Jul 2006 14:20:22 -0000	1.81
+++ system-config-securitylevel.spec	17 Jul 2006 19:08:50 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.21
-Release: 1
+Version: 1.6.22
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -64,11 +64,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-securitylevel ] ; then
-  rm -rf /usr/share/system-config-securitylevel/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -78,7 +73,6 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
-#%doc doc/*
 /usr/bin/system-config-securitylevel
 %dir /usr/share/system-config-securitylevel
 /usr/share/system-config-securitylevel/*
@@ -99,6 +93,13 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Mon Jul 17 2006 Chris Lumens <clumens at redhat.com> 1.6.22-2
+- Don't remove .pyc files (#198950).
+- Pick up new translations. 
+
+* Tue Jul 11 2006 Chris Lumens <clumens at redhat.com> 1.6.22-1
+- Tweak regular expression used to distinguish ranges from words.
+
 * Mon Jul 10 2006 Chris Lumens <clumens at redhat.com> 1.6.21-1
 - Correctly mark messages for translation (#195013).
 - Remove /etc/sysconfig/ip6tables when firewall is disabled (#195786).



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:14:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:14:33 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.296, 1.297 anaconda.spec, 1.420,
	1.421 sources, 1.418, 1.419
Message-ID: <200607171914.k6HJEXJx030503@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30454/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.58-1 on branch devel from anaconda-11.1.0.58-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- .cvsignore	13 Jul 2006 20:49:26 -0000	1.296
+++ .cvsignore	17 Jul 2006 19:14:30 -0000	1.297
@@ -1 +1 @@
-anaconda-11.1.0.57.tar.bz2
+anaconda-11.1.0.58.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- anaconda.spec	13 Jul 2006 20:49:26 -0000	1.420
+++ anaconda.spec	17 Jul 2006 19:14:30 -0000	1.421
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.57
+Version: 11.1.0.58
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.58-1
+- Clean up noipv4/noipv6 stuff stuff (clumens)
+- Fix exception handling for test mode 
+- Lots of iscsi changes
+- Create mount points for protected partitions (clumens)
+- Add multipath kernel modules (pjones)
+- Add dhcp libs needed by isys to stage2
+
 * Thu Jul 13 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.57-1
 - Fix unknown error on shadow file (#196705, clumens)
 - Removed inet_calcGateway (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- sources	13 Jul 2006 20:49:26 -0000	1.418
+++ sources	17 Jul 2006 19:14:30 -0000	1.419
@@ -1 +1 @@
-ce0295899aad0789597ce31980b25b1d  anaconda-11.1.0.57.tar.bz2
+11aa814a7a139034a018b9b6fc0fcd4b  anaconda-11.1.0.58.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:18:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:18:31 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.82,1.83
Message-ID: <200607171918.k6HJIVxi014269@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14191

Modified Files:
	kdenetwork.spec 
Log Message:
rebuild



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kdenetwork.spec	12 Jul 2006 06:41:08 -0000	1.82
+++ kdenetwork.spec	17 Jul 2006 19:18:29 -0000	1.83
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.3
-Release: 3.1
+Release: 4
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -225,7 +225,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-4
+- rebuild
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-3.1
 - rebuild
 
 * Mon Jun 26 2006 Than Ngo <than at redhat.com> 7:3.5.3-3



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:20:43 -0400
Subject: rpms/wordtrans/devel wordtrans.spec,1.26,1.27
Message-ID: <200607171920.k6HJKhsN015127@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15080

Modified Files:
	wordtrans.spec 
Log Message:
rebuild



Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wordtrans.spec	12 Jul 2006 08:49:56 -0000	1.26
+++ wordtrans.spec	17 Jul 2006 19:20:41 -0000	1.27
@@ -4,14 +4,14 @@
 %define build_qt 0
 
 %define qt_version 3.3.5
-%define kde_version 3.4.92
+%define kde_version 3.5.3
 
 Name: wordtrans
 Group: Applications/Productivity
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1pre13
-Release: 13.1
+Release: 14
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
 Source1: ger-eng.txt
@@ -304,6 +304,9 @@
 /var/www/wordtrans
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 1.1pre13-14
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-13.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:24:24 -0400
Subject: rpms/perl-DBI/FC-5 .cvsignore, 1.14, 1.15 perl-DBI.spec, 1.24,
	1.25 sources, 1.14, 1.15
Message-ID: <200607171924.k6HJOOSu016224@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBI/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16130

Modified Files:
	.cvsignore perl-DBI.spec sources 
Log Message:
upgrade to 1.51


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Dec 2005 18:48:12 -0000	1.14
+++ .cvsignore	17 Jul 2006 19:24:21 -0000	1.15
@@ -1,2 +1,3 @@
 DBI-1.48.tar.gz
 DBI-1.50.tar.gz
+DBI-1.51.tar.gz


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/perl-DBI.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBI.spec	11 Feb 2006 05:04:13 -0000	1.24
+++ perl-DBI.spec	17 Jul 2006 19:24:21 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-DBI
-Version:        1.50
-Release: 	2.2
+Version:        1.51
+Release: 	1.fc5
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.51-1
+- Upgrade to 1.51
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Dec 2005 18:48:12 -0000	1.14
+++ sources	17 Jul 2006 19:24:21 -0000	1.15
@@ -1 +1 @@
-487cb22f89ab21029725eb6e0b861a2a  DBI-1.50.tar.gz
+d2ecc92395c4ab8221bac2866afbae04  DBI-1.51.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:30:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:30:40 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.86,1.87
Message-ID: <200607171930.k6HJUecJ018573@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18528

Modified Files:
	kdegraphics.spec 
Log Message:
rebuild



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdegraphics.spec	12 Jul 2006 06:40:16 -0000	1.86
+++ kdegraphics.spec	17 Jul 2006 19:30:35 -0000	1.87
@@ -15,10 +15,8 @@
 
 %define no_scanner_archs s390 s390x
 
-%define disable_gcc_check_and_hidden_visibility 1
-
 Version: 3.5.3
-Release: 2.1
+Release: 3
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -111,9 +109,7 @@
    --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
@@ -196,6 +192,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-3
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.3-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:36:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:36:33 -0400
Subject: rpms/python-urlgrabber/devel
	urlgrabber-ssl-byterange-keepalive.patch, NONE,
	1.1 python-urlgrabber.spec, 1.11, 1.12
Message-ID: <200607171936.k6HJaXue019346@cvs.devel.redhat.com>

Author: jbowes

Update of /cvs/dist/rpms/python-urlgrabber/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19289

Modified Files:
	python-urlgrabber.spec 
Added Files:
	urlgrabber-ssl-byterange-keepalive.patch 
Log Message:
2.9.9-2 - add ssl byterange and keepalive patch

urlgrabber-ssl-byterange-keepalive.patch:
 byterange.py |    9 +++++++++
 grabber.py   |   24 +++++++++++++-----------
 keepalive.py |   22 ++++++++++++++++++----
 3 files changed, 40 insertions(+), 15 deletions(-)

--- NEW FILE urlgrabber-ssl-byterange-keepalive.patch ---
Index: urlgrabber/byterange.py
===================================================================
RCS file: /cvsroot/urlgrabber/cvs-root/urlgrabber/urlgrabber/byterange.py,v
retrieving revision 1.11
diff -u -r1.11 byterange.py
--- urlgrabber/byterange.py	22 Oct 2005 21:57:28 -0000	1.11
+++ urlgrabber/byterange.py	13 Jul 2006 19:48:26 -0000
@@ -71,6 +71,15 @@
         # HTTP's Range Not Satisfiable error
         raise RangeError('Requested Range Not Satisfiable')
 
+class HTTPSRangeHandler(HTTPRangeHandler):
+    """ Range Header support for HTTPS. """
+
+    def https_error_206(self, req, fp, code, msg, hdrs):
+        return self.http_error_206(req, fp, code, msg, hdrs)
+
+    def https_error_416(self, req, fp, code, msg, hdrs):
+        self.https_error_416(req, fp, code, msg, hdrs)
+
 class RangeableFileObject:
     """File object wrapper to enable raw range handling.
     This was implemented primarilary for handling range 
Index: urlgrabber/grabber.py
===================================================================
RCS file: /cvsroot/urlgrabber/cvs-root/urlgrabber/urlgrabber/grabber.py,v
retrieving revision 1.46
diff -u -r1.46 grabber.py
--- urlgrabber/grabber.py	22 Mar 2006 20:09:33 -0000	1.46
+++ urlgrabber/grabber.py	13 Jul 2006 19:48:26 -0000
@@ -402,24 +402,25 @@
     # This is a convenient way to make keepalive optional.
     # Just rename the module so it can't be imported.
     import keepalive
-    from keepalive import HTTPHandler
+    from keepalive import HTTPHandler, HTTPSHandler
 except ImportError, msg:
-    keepalive_handler = None
+    keepalive_handlers = ()
 else:
-    keepalive_handler = HTTPHandler()
+    keepalive_handlers = (HTTPHandler(), HTTPSHandler())
 
 try:
     # add in range support conditionally too
     import byterange
-    from byterange import HTTPRangeHandler, FileRangeHandler, \
-         FTPRangeHandler, range_tuple_normalize, range_tuple_to_header, \
-         RangeError
+    from byterange import HTTPRangeHandler, HTTPSRangeHandler, \
+         FileRangeHandler, FTPRangeHandler, range_tuple_normalize, \
+         range_tuple_to_header, RangeError
 except ImportError, msg:
     range_handlers = ()
     RangeError = None
     have_range = 0
 else:
-    range_handlers = (HTTPRangeHandler(), FileRangeHandler(), FTPRangeHandler())
+    range_handlers = (HTTPRangeHandler(), HTTPSRangeHandler(),
+        FileRangeHandler(), FTPRangeHandler())
     have_range = 1
 
 
@@ -454,7 +455,7 @@
 
     global DEBUG
     DEBUG = DBOBJ
-    if keepalive_handler and keepalive.DEBUG is None:
+    if keepalive_handlers and keepalive.DEBUG is None:
         keepalive.DEBUG = DBOBJ
     if have_range and byterange.DEBUG is None:
         byterange.DEBUG = DBOBJ
@@ -582,7 +583,8 @@
 
 def close_all():
     """close any open keepalive connections"""
-    if keepalive_handler: keepalive_handler.close_all()
+    for handler in keepalive_handlers: 
+        handler.close_all()
 
 def urlgrab(url, filename=None, **kwargs):
     """grab the file at <url> and make a local copy at <filename>
@@ -1012,7 +1014,7 @@
             return self.opts.opener
         elif self._opener is None:
             handlers = []
-            need_keepalive_handler = (keepalive_handler and self.opts.keepalive)
+            need_keepalive_handler = (keepalive_handlers and self.opts.keepalive)
             need_range_handler = (range_handlers and \
                                   (self.opts.range or self.opts.reget))
             # if you specify a ProxyHandler when creating the opener
@@ -1043,7 +1045,7 @@
                 # -------------------------------------------------------
                     
             if need_keepalive_handler:
-                handlers.append( keepalive_handler )
+                handlers.extend( keepalive_handlers )
             if need_range_handler:
                 handlers.extend( range_handlers )
             handlers.append( auth_handler )
Index: urlgrabber/keepalive.py
===================================================================
RCS file: /cvsroot/urlgrabber/cvs-root/urlgrabber/urlgrabber/keepalive.py,v
retrieving revision 1.14
diff -u -r1.14 keepalive.py
--- urlgrabber/keepalive.py	4 Apr 2006 21:00:32 -0000	1.14
+++ urlgrabber/keepalive.py	13 Jul 2006 19:48:26 -0000
@@ -172,7 +172,7 @@
         else:
             return dict(self._hostmap)
 
-class HTTPHandler(urllib2.HTTPHandler):
+class KeepAliveHandler:
     def __init__(self):
         self._cm = ConnectionManager()
         
@@ -207,9 +207,6 @@
         self._cm.remove(connection)
         
     #### Transaction Execution
-    def http_open(self, req):
-        return self.do_open(HTTPConnection, req)
-
     def do_open(self, http_class, req):
         host = req.get_host()
         if not host:
@@ -324,6 +321,20 @@
         if req.has_data():
             h.send(data)
 
+class HTTPHandler(KeepAliveHandler, urllib2.HTTPHandler):
+    def __init__(self):
+        KeepAliveHandler.__init__(self)
+
+    def http_open(self, req):
+        return self.do_open(HTTPConnection, req)
+
+class HTTPSHandler(KeepAliveHandler, urllib2.HTTPSHandler):
+    def __init__(self):
+        KeepAliveHandler.__init__(self)
+    
+    def https_open(self, req):
+        return self.do_open(HTTPSConnection, req)
+
 class HTTPResponse(httplib.HTTPResponse):
     # we need to subclass HTTPResponse in order to
     # 1) add readline() and readlines() methods
@@ -425,6 +436,9 @@
 class HTTPConnection(httplib.HTTPConnection):
     # use the modified response class
     response_class = HTTPResponse
+
+class HTTPSConnection(httplib.HTTPSConnection):
+    response_class = HTTPResponse
     
 #########################################################################
 #####   TEST FUNCTIONS


Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/dist/rpms/python-urlgrabber/devel/python-urlgrabber.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-urlgrabber.spec	12 Jul 2006 17:37:13 -0000	1.11
+++ python-urlgrabber.spec	17 Jul 2006 19:36:22 -0000	1.12
@@ -3,9 +3,10 @@
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
 Version: 2.9.9
-Release: 1.1
+Release: 2
 Source0: urlgrabber-%{version}.tar.gz
 Patch0: urlgrabber-read-error.patch
+Patch1: urlgrabber-ssl-byterange-keepalive.patch
 License: LGPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -22,6 +23,7 @@
 %prep
 %setup -n urlgrabber-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 python setup.py build
@@ -41,6 +43,9 @@
 %{_bindir}/urlgrabber
 
 %changelog
+* Mon Jul 17 2006 James Bowes <jbowes at redhat.com> - 2.9.9-2
+- Add support for byte ranges and keepalive over HTTPS
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.9-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:38:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:38:18 -0400
Subject: rpms/qt/devel qt.spec,1.121,1.122
Message-ID: <200607171938.k6HJcIou019741@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19681

Modified Files:
	qt.spec 
Log Message:
rebuild



Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- qt.spec	12 Jul 2006 07:57:28 -0000	1.121
+++ qt.spec	17 Jul 2006 19:38:15 -0000	1.122
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.6
-Release: 11.1
+Release: 12
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -495,7 +495,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 1:3.3.6-12
+- rebuild
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.6-11.1
 - rebuild
 
 * Mon Jul 10 2006 Than Ngo <than at redhat.com> 1:3.3.6-11



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:40:47 -0400
Subject: rpms/perl-DBD-MySQL/FC-5 .cvsignore, 1.13, 1.14 perl-DBD-MySQL.spec,
	1.26, 1.27 sources, 1.13, 1.14
Message-ID: <200607171940.k6HJelog020542@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBD-MySQL/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20466

Modified Files:
	.cvsignore perl-DBD-MySQL.spec sources 
Log Message:
upgrade to 3.0006


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 May 2006 23:42:18 -0000	1.13
+++ .cvsignore	17 Jul 2006 19:40:44 -0000	1.14
@@ -1,2 +1,3 @@
 DBD-mysql-3.0002.tar.gz
 DBD-mysql-3.0004.tar.gz
+DBD-mysql-3.0006.tar.gz


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/FC-5/perl-DBD-MySQL.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-DBD-MySQL.spec	31 May 2006 23:42:18 -0000	1.26
+++ perl-DBD-MySQL.spec	17 Jul 2006 19:40:44 -0000	1.27
@@ -1,5 +1,5 @@
 Name:           perl-DBD-MySQL
-Version:        3.0004
+Version:        3.0006
 Release: 	1.FC5
 Summary:        A MySQL interface for perl
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0006-1.fc5
+- Upgrade to 3.0006
+
 * Wed May 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0004-1.FC5
 - upgrade to upstream version 3.0004
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 May 2006 23:42:18 -0000	1.13
+++ sources	17 Jul 2006 19:40:44 -0000	1.14
@@ -1,2 +1 @@
-df70ba084c97f5f7c2a997c3de2f0ad0  DBD-mysql-3.0002.tar.gz
-5d328b9fdaf899eba6d72258242ad0a0  DBD-mysql-3.0004.tar.gz
+b6d46ea7df99800082a2d2480056b0ce  DBD-mysql-3.0006.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:45:43 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.50,1.51
Message-ID: <200607171945.k6HJjhAa023277@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22271

Modified Files:
	kdevelop.spec 
Log Message:
rebuild



Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdevelop.spec	14 Jul 2006 11:16:07 -0000	1.50
+++ kdevelop.spec	17 Jul 2006 19:45:39 -0000	1.51
@@ -11,7 +11,7 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.3
-Release: 2
+Release: 3
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -159,6 +159,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 9:3.3.3-3
+- rebuild
+
 * Fri Jul 14 2006 Than Ngo <than at redhat.com> 9:3.3.3-2
 - cleanup specfile
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 19:49:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 15:49:33 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.200,1.201
Message-ID: <200607171949.k6HJnXYa006115@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6058

Modified Files:
	kdebase.spec 
Log Message:
fix 146377, khelpcenter's Browse Info Pages > Alphabetically should sort entries



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- kdebase.spec	16 Jul 2006 21:12:07 -0000	1.200
+++ kdebase.spec	17 Jul 2006 19:49:31 -0000	1.201
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 12
+Release: 13
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -554,7 +554,7 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
-* Sun Jul 16 2006 Than Ngo <than at redhat.com> 6:3.5.3-12
+* Sun Jul 16 2006 Than Ngo <than at redhat.com> 6:3.5.3-13
 - fix 146377, khelpcenter's Browse Info Pages > Alphabetically should sort entries
 
 * Thu Jul 13 2006 Than Ngo <than at redhat.com> 6:3.5.3-12



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:02:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:02:07 -0400
Subject: rpms/lftp/devel .cvsignore, 1.27, 1.28 lftp.spec, 1.52, 1.53 sources,
	1.27, 1.28
Message-ID: <200607172002.k6HK2749010471@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10427

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
upgrade to 3.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	31 May 2006 23:27:36 -0000	1.27
+++ .cvsignore	17 Jul 2006 20:02:04 -0000	1.28
@@ -17,3 +17,4 @@
 lftp-3.4.4.tar.bz2
 lftp-3.4.6.tar.bz2
 lftp-3.4.7.tar.bz2
+lftp-3.5.1.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- lftp.spec	12 Jul 2006 06:44:57 -0000	1.52
+++ lftp.spec	17 Jul 2006 20:02:05 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.7
-Release: 	2.FC6.1
+Version: 	3.5.1
+Release: 	1.fc6
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.5.1-1.fc6
+- Upgrade to 3.5.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.4.7-2.FC6.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	31 May 2006 23:27:36 -0000	1.27
+++ sources	17 Jul 2006 20:02:05 -0000	1.28
@@ -1,2 +1 @@
-ed456c48929f1e60ddde9f2525768136  lftp-3.4.6.tar.bz2
-a6f566c8260c4d5940cb509d10637b73  lftp-3.4.7.tar.bz2
+c6d48782cdad4759000bf7cd24555723  lftp-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:10:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:10:46 -0400
Subject: rpms/perl-Net-DNS/devel .cvsignore, 1.10, 1.11 perl-Net-DNS.spec,
	1.24, 1.25 sources, 1.10, 1.11
Message-ID: <200607172010.k6HKAkLF012011@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-DNS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11977

Modified Files:
	.cvsignore perl-Net-DNS.spec sources 
Log Message:
upgrade to 0.58


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 23:24:54 -0000	1.10
+++ .cvsignore	17 Jul 2006 20:10:43 -0000	1.11
@@ -1,3 +1,4 @@
 Net-DNS-0.53.tar.gz
 Net-DNS-0.55.tar.gz
 Net-DNS-0.57.tar.gz
+Net-DNS-0.58.tar.gz


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Net-DNS.spec	12 Jul 2006 07:46:40 -0000	1.24
+++ perl-Net-DNS.spec	17 Jul 2006 20:10:44 -0000	1.25
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
-Version: 0.57
-Release: 1.1
+Version: 0.58
+Release: 1.fc6
 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
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.58-1.fc6
+- Upgrade to upstream version 0.58
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.57-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Mar 2006 23:24:54 -0000	1.10
+++ sources	17 Jul 2006 20:10:44 -0000	1.11
@@ -1 +1 @@
-9511a7052e553f2a29a5bae32c20bc44  Net-DNS-0.57.tar.gz
+eddc33ef5ab2fc17a1c2239177360c01  Net-DNS-0.58.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:21:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:21:32 -0400
Subject: rpms/perl-Compress-Zlib/devel .cvsignore, 1.7,
	1.8 perl-Compress-Zlib.spec, 1.25, 1.26 sources, 1.7, 1.8
Message-ID: <200607172021.k6HKLWeX030927@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Compress-Zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30852

Modified Files:
	.cvsignore perl-Compress-Zlib.spec sources 
Log Message:
upgrade to 1.42


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2005 10:08:50 -0000	1.7
+++ .cvsignore	17 Jul 2006 20:21:30 -0000	1.8
@@ -1,2 +1,3 @@
 Compress-Zlib-1.37.tar.gz
 Compress-Zlib-1.41.tar.gz
+Compress-Zlib-1.42.tar.gz


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-Compress-Zlib.spec	12 Jul 2006 07:43:30 -0000	1.25
+++ perl-Compress-Zlib.spec	17 Jul 2006 20:21:30 -0000	1.26
@@ -3,8 +3,8 @@
 %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
 Name: perl-Compress-Zlib
-Version: 1.41
-Release: 2.1
+Version: 1.42
+Release: 1.fc6
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: GPL or Artistic
 Group: Development/Libraries
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.42-1
+- Upgrade to 1.42
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.41-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2005 10:08:50 -0000	1.7
+++ sources	17 Jul 2006 20:21:30 -0000	1.8
@@ -1 +1 @@
-ac135b84a03e814734496777cf5e5722  Compress-Zlib-1.41.tar.gz
+1ab76bfd6731d80f6abbd1643c90cabd  Compress-Zlib-1.42.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:29:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:29:49 -0400
Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.10,
	1.11 perl-HTML-Parser.spec, 1.25, 1.26 sources, 1.11, 1.12
Message-ID: <200607172029.k6HKTnHD001780@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1754

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
upgrade to 3.55


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jun 2006 23:49:44 -0000	1.10
+++ .cvsignore	17 Jul 2006 20:29:46 -0000	1.11
@@ -5,3 +5,4 @@
 HTML-Parser-3.50.tar.gz
 HTML-Parser-3.51.tar.gz
 HTML-Parser-3.54.tar.gz
+HTML-Parser-3.55.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-HTML-Parser.spec	12 Jul 2006 07:45:28 -0000	1.25
+++ perl-HTML-Parser.spec	17 Jul 2006 20:29:46 -0000	1.26
@@ -4,8 +4,8 @@
 
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
-Version: 3.54
-Release: 1.fc6.1
+Version: 3.55
+Release: 1.fc6
 License: GPL or Artistic
 Group:  Development/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 Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.55-1.fc6
+- Upgrade to 3.55
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.54-1.fc6.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jun 2006 23:49:44 -0000	1.11
+++ sources	17 Jul 2006 20:29:46 -0000	1.12
@@ -1 +1 @@
-c5bcfc6d67a47ba1b7c3e86daf0bbde4  HTML-Parser-3.54.tar.gz
+75eb683f1fb7aa7c0ffa46ded4564b54  HTML-Parser-3.55.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:38:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:38:12 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.36, 1.37
Message-ID: <200607172038.k6HKcCEn003436@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3265

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Remove from %files the ones not created by aot-compile for being subsets
of the full JAR




Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jakarta-commons-beanutils.spec	14 Jul 2006 16:23:30 -0000	1.36
+++ jakarta-commons-beanutils.spec	17 Jul 2006 20:38:10 -0000	1.37
@@ -75,7 +75,6 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -142,8 +141,9 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-1.7.0.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-bean-collections-1.7.0.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-core-1.7.0.jar.*
+# Not created by aot-compile for being subsets of the full JAR
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-bean-collections-1.7.0.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-core-1.7.0.jar.*
 %endif
 
 %files javadoc



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:41:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:41:17 -0400
Subject: rpms/dbus/devel .cvsignore, 1.19, 1.20 dbus.spec, 1.85, 1.86 sources,
	1.19, 1.20
Message-ID: <200607172041.k6HKfHSE004529@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4399

Modified Files:
	.cvsignore dbus.spec sources 
Log Message:
- update to 0.90
- split out bindings



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jun 2006 17:37:10 -0000	1.19
+++ .cvsignore	17 Jul 2006 20:41:14 -0000	1.20
@@ -12,3 +12,4 @@
 dbus-0.60.tar.gz
 dbus-0.61.tar.gz
 dbus-0.62.tar.gz
+dbus-0.90.tar.gz


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- dbus.spec	12 Jul 2006 05:32:13 -0000	1.85
+++ dbus.spec	17 Jul 2006 20:41:14 -0000	1.86
@@ -1,25 +1,14 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
-
 %define gettext_package dbus
 
 %define expat_version           1.95.5
-%define glib2_version           2.2.0
-%define qt_basever		3.3
-%define qt_version              3.3.0
-%define pyrex_version		0.9.3
-%define gtk2_version		2.4.0
 %define libselinux_version	1.15.2	
 
 %define dbus_user_uid           81
 
-# Mono only availible on these:
-%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc
-
 Summary: D-BUS message bus
 Name: dbus
-Version: 0.62
-Release: 1.1 
+Version: 0.90
+Release: 1 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -30,32 +19,17 @@
 BuildPreReq: libtool
 #BuildRequires: redhat-release 
 BuildRequires: expat-devel >= %{expat_version}
-BuildRequires: libxml2-devel
-BuildRequires: glib2-devel >= %{glib2_version}
-#BuildRequires: qt-devel    >= %{qt_version}
-BuildRequires: Pyrex	   >= %{pyrex_version}
-#BuildRequires: gtk2-devel  >= %{gtk_version}
 BuildRequires: libselinux-devel >= %{libselinux_version}
 BuildRequires: audit-libs-devel >= 0.9
 BuildRequires: libX11-devel
-BuildRequires: libICE-devel
-BuildRequires: libSM-devel
 BuildRequires: libcap-devel
 BuildRequires: gettext
-
-%ifarch %mono_archs
-BuildRequires: mono-devel gtk-sharp
-%endif
-
 Requires: libselinux >= %{libselinux_version}
 
 Conflicts: cups < 1:1.1.20-4
 
-Patch1: dbus-0.32-selinux_chroot_workaround.patch
 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
 
@@ -67,46 +41,11 @@
 Summary: Libraries and headers for D-BUS
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
-Requires: glib2-devel 
 
 %description devel
 
 Headers and static libraries for D-BUS.
 
-%package glib
-Summary: GLib-based library for using D-BUS
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-
-%description glib
-
-D-BUS add-on library to integrate the standard D-BUS library with
-the GLib thread abstraction and main loop.
-
-%if 0
-%package gtk
-Summary: GTK based tools
-Group: Development/Tools 
-Requires: %name = %{version}-%{release}
-Requires: gtk2 >= %{gtk_version}
-%description gtk
-
-D-BUS tools written using the gtk+ GUI libaries
-
-%endif
-%if 0
-%package qt
-Summary: Qt-based library for using D-BUS
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-
-%description qt
-
-D-BUS add-on library to integrate the standard D-BUS library with
-the Qt thread abstraction and main loop.
-
-%endif
-
 %package x11
 Summary: X11-requiring add-ons for D-BUS
 Group: Development/Libraries
@@ -118,49 +57,16 @@
 D-BUS contains some tools that require Xlib to be installed, those are
 in this separate package so server systems need not install X.
 
-%package python 
-Summary: python bindings for D-BUS
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-                                                                                
-%description python 
-                                                                                
-D-BUS python bindings for use with python programs.   
-
-%ifarch %mono_archs
-%package sharp
-Summary: mono bindings for D-BUS
-Group: Development/Libraries
-Requires: %name = %{version}-%{release}
-
-%description sharp
-D-BUS mono bindings for use with mono programs.   
-%endif
-
 %prep
 %setup -q
 
-%patch1 -p1 -b .selinux_chroot_workaround
 %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
-%ifarch %mono_archs
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-MONO_ARGS="--enable-mono"
-%endif
-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}
-else
-   echo "WARNING: %{_libdir}/qt-%{qtbasever} does not exist"
-fi
+COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/lib --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
 
 ### this is some crack because bits of dbus can be 
 ### smp-compiled but others don't feel like working
@@ -173,17 +79,12 @@
         DBUS_VERBOSE=1 make
 }
 
-#%ifarch ia64
-#FIXME: workaround for gcc-3.4 bug which causes python bindings build to hand on ia64 arches
-#CFLAGS="$RPM_OPT_FLAGS -O1"
-#export CFLAGS
-#%endif
-
 #### Build once with tests to make check
 %configure $COMMON_ARGS --enable-tests=yes --enable-verbose-mode=yes --enable-asserts=yes
 make_fast
+
+#keep debug mode for now.
 exit 0
-DBUS_VERBOSE=1 make check > dbus-check.log 2>&1 || (cat dbus-check.log && false)
 
 #### Clean up and build again 
 make clean 
@@ -193,63 +94,17 @@
 
 %install
 rm -rf %{buildroot}
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-
-# dbus installs mono files in libdir, not in prefix/lib, fixup:
-perl -pi -e 's,/gacdir \$\(libdir\),/gacdir /usr/lib,g' mono/Makefile
-perl -pi -e "s,/root \\\$\\(DESTDIR\\)\\\$\(libdir\\),/root $RPM_BUILD_ROOT/usr/lib,g" mono/Makefile
-perl -pi -e "s,/usr/lib64,/usr/lib,g" dbus-sharp.pc
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/mono
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+mv -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/*.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/dbus/*.*a
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mv -f $RPM_BUILD_ROOT/bin/dbus-launch $RPM_BUILD_ROOT/%{_bindir}
 
-# move the base dbus libraries and executables to /bin and /lib
-mkdir -p $RPM_BUILD_ROOT/bin
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-
-mv -f $RPM_BUILD_ROOT%{_libdir}/*dbus-1*.so.* $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-daemon $RPM_BUILD_ROOT/bin
-mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-send $RPM_BUILD_ROOT/bin
-mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-cleanup-sockets $RPM_BUILD_ROOT/bin
-
-# Create a dummy file so that no matter how deep we are we can
-# find the root directory.
-touch $RPM_BUILD_ROOT/rootfile
-
-# We need to make relative links to dbus-send
-# Search for the file relative to the location of %%{_bindir}.
-root=..
-while [ ! -e $RPM_BUILD_ROOT/%{_bindir}/${root}/rootfile ] ; do
-        root=${root}/..
-done
-
-# Actually create the link.
-pushd $RPM_BUILD_ROOT/%{_bindir}
-ln -f -s ${root}/bin/dbus-send dbus-send
-popd
-	
-
-# We need to make relative links to the moved libaries
-# Search for the file relative to the location of %%{_libdir}.
-root=..
-while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do
-        root=${root}/..
-done
-
-# Actually create the link.
-pushd $RPM_BUILD_ROOT/%{_libdir}
-for so_file in *dbus-1*.so ; do 
-	ln -f -s ${root}/%{_lib}/$so_file.? $so_file
-done
-popd
-# Clean it up.
-rm $RPM_BUILD_ROOT/rootfile
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
 
 ## %find_lang %{gettext_package}
 
@@ -274,9 +129,6 @@
 %postun
 /sbin/ldconfig
 
-%post glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
 
@@ -287,66 +139,33 @@
 %config %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_localstatedir}/run/dbus
-%dir %{_libdir}/dbus-1.0
+%dir /%{_lib}/dbus-1.0
 /bin/dbus-daemon
 /bin/dbus-send
-%{_bindir}/dbus-send
 /bin/dbus-cleanup-sockets
+/bin/dbus-monitor
 /%{_lib}/*dbus-1*.so.*
 %{_datadir}/man/man*/*
 %{_datadir}/dbus-1/services
 
-%files devel
-%defattr(-,root,root)
-
-%{_libdir}/lib*.so
-%{_libdir}/dbus-1.0/include
-%{_libdir}/pkgconfig/dbus-1.pc
-%{_libdir}/pkgconfig/dbus-glib-1.pc
-%{_includedir}/*
-
-%files glib
-%defattr(-,root,root)
-
-%{_libdir}/*glib*.so.*
-%{_bindir}/dbus-binding-tool
-%{_bindir}/dbus-monitor
-
-%if 0
-%files gtk
-%defattr(-,root,root)
-
-%{_bindir}/dbus-viewer
-
-%endif
-
-%if 0
-%files qt
-%defattr(-,root,root)
-
-%{_libdir}/*qt*.so.*
-%endif
-
 %files x11
 %defattr(-,root,root)
 
 %{_bindir}/dbus-launch
 
-%files python
+%files devel
 %defattr(-,root,root)
-%{_libdir}/python*/site-packages/dbus/*.so
-%{_libdir}/python*/site-packages/dbus.pth
-%{_libdir}/python*/site-packages/dbus/*.py*
 
-%ifarch %mono_archs
-%files sharp
-%defattr(-,root,root)
-%{_prefix}/lib/mono/dbus-sharp
-%{_prefix}/lib/mono/gac/dbus-sharp
-%{_libdir}/pkgconfig/dbus-sharp.pc
-%endif
+/%{_lib}/lib*.so
+/%{_lib}/dbus-1.0/include
+%{_libdir}/pkgconfig/dbus-1.pc
+%{_includedir}/*
 
 %changelog
+* Mon Jul 17 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-1
+- Update to upstream 0.90
+- Split out bindings
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.62-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Jun 2006 17:37:10 -0000	1.19
+++ sources	17 Jul 2006 20:41:14 -0000	1.20
@@ -1 +1 @@
-ba7692f63d0e9f1ef06703dff56cb650  dbus-0.62.tar.gz
+f07e2adb6b1556408defbc706fb98d75  dbus-0.90.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:42:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:42:07 -0400
Subject: rpms/perl-XML-Twig/devel .cvsignore, 1.9, 1.10 perl-XML-Twig.spec,
	1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200607172042.k6HKg7AH004846@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Twig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4775

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
upgrade to 3.26


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Jun 2006 00:21:57 -0000	1.9
+++ .cvsignore	17 Jul 2006 20:42:04 -0000	1.10
@@ -2,3 +2,4 @@
 XML-Twig-3.22.tar.gz
 XML-Twig-3.23.tar.gz
 XML-Twig-3.25.tar.gz
+XML-Twig-3.26.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-XML-Twig.spec	6 Jun 2006 00:21:57 -0000	1.14
+++ perl-XML-Twig.spec	17 Jul 2006 20:42:04 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
-Version:        3.25
-Release: 	1
+Version:        3.26
+Release: 	1.fc6
 Summary:        A perl module for processing huge XML documents in tree mode
 
 Group:          Development/Libraries
@@ -61,8 +61,11 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.26-1
+- Upgrade to 3.26
+
 * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.25-1
-- Upgrade to 2.25
+- Upgrade to 3.25
 
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.22-1.1
 - Update to 3.23


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Jun 2006 00:21:57 -0000	1.9
+++ sources	17 Jul 2006 20:42:04 -0000	1.10
@@ -1 +1 @@
-dd153f142487a6ec85afaf7c3dd27df0  XML-Twig-3.25.tar.gz
+b776ab7e0649dd62a50bac41366046e1  XML-Twig-3.26.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:49:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:49:31 -0400
Subject: rpms/kdesdk/devel kdesdk.spec,1.56,1.57
Message-ID: <200607172049.k6HKnVi5022385@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22336

Modified Files:
	kdesdk.spec 
Log Message:
- BR: flex, needed to build kbabel



Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdesdk.spec	14 Jul 2006 09:43:55 -0000	1.56
+++ kdesdk.spec	17 Jul 2006 20:49:29 -0000	1.57
@@ -13,7 +13,7 @@
 
 Name: kdesdk
 Version: 3.5.3
-Release: 2
+Release: 3
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -34,6 +34,7 @@
 BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: db4-devel
 BuildRequires: desktop-file-utils
+BuildRequires: flex
 
 %description
 A collection of applications and tools used by KDE developers.
@@ -155,6 +156,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 3.5.3-3
+- BR: flex, needed to build kbabel
+
 * Fri Jul 14 2006 Than Ngo <than at redhat.com> 3.5.3-2
 - BR: autoconf automake libtool
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:56:35 -0400
Subject: rpms/perl-Net-DNS/FC-5 .cvsignore, 1.10, 1.11 perl-Net-DNS.spec,
	1.23, 1.24 sources, 1.10, 1.11
Message-ID: <200607172056.k6HKuZjS025030@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-DNS/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24991

Modified Files:
	.cvsignore perl-Net-DNS.spec sources 
Log Message:
upgrade to 0.58


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 23:24:54 -0000	1.10
+++ .cvsignore	17 Jul 2006 20:56:33 -0000	1.11
@@ -1,3 +1,4 @@
 Net-DNS-0.53.tar.gz
 Net-DNS-0.55.tar.gz
 Net-DNS-0.57.tar.gz
+Net-DNS-0.58.tar.gz


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/FC-5/perl-Net-DNS.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-Net-DNS.spec	8 Mar 2006 23:24:54 -0000	1.23
+++ perl-Net-DNS.spec	17 Jul 2006 20:56:33 -0000	1.24
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
-Version: 0.57
-Release: 1
+Version: 0.58
+Release: 1.fc5
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries
@@ -52,6 +52,12 @@
 %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3*
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.58-1
+- Upgrade to upstream version 0.58
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.57-1.1
+- rebuild
+
 * Wed Mar 08 2006 Jason Vas Dias <jvdias at redhat.com> - 0.57-1
 - Upgrade to upstream version 0.57
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Mar 2006 23:24:54 -0000	1.10
+++ sources	17 Jul 2006 20:56:33 -0000	1.11
@@ -1 +1 @@
-9511a7052e553f2a29a5bae32c20bc44  Net-DNS-0.57.tar.gz
+eddc33ef5ab2fc17a1c2239177360c01  Net-DNS-0.58.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 20:59:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 16:59:06 -0400
Subject: rpms/perl-Compress-Zlib/FC-5 .cvsignore, 1.7,
	1.8 perl-Compress-Zlib.spec, 1.23, 1.24 sources, 1.7, 1.8
Message-ID: <200607172059.k6HKx6PQ026035@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Compress-Zlib/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26010

Modified Files:
	.cvsignore perl-Compress-Zlib.spec sources 
Log Message:
upgrade to 1.42


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2005 10:08:50 -0000	1.7
+++ .cvsignore	17 Jul 2006 20:59:03 -0000	1.8
@@ -1,2 +1,3 @@
 Compress-Zlib-1.37.tar.gz
 Compress-Zlib-1.41.tar.gz
+Compress-Zlib-1.42.tar.gz


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/FC-5/perl-Compress-Zlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-Compress-Zlib.spec	11 Feb 2006 04:58:29 -0000	1.23
+++ perl-Compress-Zlib.spec	17 Jul 2006 20:59:03 -0000	1.24
@@ -3,15 +3,15 @@
 %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
 
 Name: perl-Compress-Zlib
-Version: 1.41
-Release: 1.2.2
+Version: 1.42
+Release: 1.fc5
 Summary: A module providing Perl interfaces to the zlib compression library.
-License: distributable
+License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Compress-Zlib/
+Source: ftp://cpan.org/pub/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: perl >= 0:5.00503, zlib-devel
-Source0: Compress-Zlib-%{version}.tar.gz
 
 %description
 The Compress::Zlib module provides a Perl interface to the zlib
@@ -55,6 +55,15 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 1.42-1
+- Upgrade to 1.42
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.41-2.1
+- rebuild
+
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.41-2
+- fix License: tag
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2005 10:08:50 -0000	1.7
+++ sources	17 Jul 2006 20:59:03 -0000	1.8
@@ -1 +1 @@
-ac135b84a03e814734496777cf5e5722  Compress-Zlib-1.41.tar.gz
+1ab76bfd6731d80f6abbd1643c90cabd  Compress-Zlib-1.42.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 21:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 17:04:20 -0400
Subject: rpms/perl-HTML-Parser/FC-5 .cvsignore, 1.9,
	1.10 perl-HTML-Parser.spec, 1.20, 1.21 sources, 1.10, 1.11
Message-ID: <200607172104.k6HL4KtP026681@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26651

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
upgrade to 3.55


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Mar 2006 21:38:31 -0000	1.9
+++ .cvsignore	17 Jul 2006 21:03:53 -0000	1.10
@@ -4,3 +4,5 @@
 HTML-Parser-3.48.tar.gz
 HTML-Parser-3.50.tar.gz
 HTML-Parser-3.51.tar.gz
+HTML-Parser-3.54.tar.gz
+HTML-Parser-3.55.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/perl-HTML-Parser.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-HTML-Parser.spec	22 Mar 2006 21:38:31 -0000	1.20
+++ perl-HTML-Parser.spec	17 Jul 2006 21:03:53 -0000	1.21
@@ -4,10 +4,10 @@
 
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
-Version: 3.51
-Release: 1.FC5
+Version: 3.55
+Release: 1.fc5
 License: GPL or Artistic
-Group: System Environment/Libraries
+Group:  Development/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz
 Url: http://search.cpan.org/dist/HTML-Parser/
 BuildRoot: %{_tmppath}/%{name}-buildroot/
@@ -53,6 +53,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.55-1.fc5
+- Upgrade to 3.55
+
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.54-1
+- upgrade to 3.54
+
 * Mon Mar 22 2006 Jason Vas Dias <jvdias at redhat.com> - 3.51-1
 - upgrade to 3.51
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Mar 2006 21:38:31 -0000	1.10
+++ sources	17 Jul 2006 21:03:53 -0000	1.11
@@ -1 +1 @@
-4189959d60549afa9a7636f5efafbe20  HTML-Parser-3.51.tar.gz
+75eb683f1fb7aa7c0ffa46ded4564b54  HTML-Parser-3.55.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 21:08:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 17:08:46 -0400
Subject: rpms/spamassassin/devel spamassassin.spec,1.71,1.72
Message-ID: <200607172108.k6HL8kB2027223@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26682

Modified Files:
	spamassassin.spec 
Log Message:
use proper perl dep names



Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- spamassassin.spec	17 Jul 2006 17:44:23 -0000	1.71
+++ spamassassin.spec	17 Jul 2006 21:08:44 -0000	1.72
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -40,9 +40,9 @@
 Requires: perl(Archive::Tar)
 Requires: procmail
 # Needed for spamc/spamd SSL
-Requires: perl-IO-Socket-SSL
+Requires: perl(IO::Socket::SSL)
 # Needed for IPv6
-Requires: perl-IO-Socket-INET6
+Requires: perl(IO::Socket::INET6)
 
 Obsoletes: perl-Mail-SpamAssassin
 
@@ -162,7 +162,7 @@
 exit 0
 
 %changelog
-* Mon Jul 17 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-4
+* Mon Jul 17 2006 Warren Togami <wtogami at redhat.com> - 3.1.3-5
 - req perl-IO-Socket-SSL for spamc/spamd SSL communication
 - req perl-IO-Socket-INET6 for IPv6
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 21:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 17:08:47 -0400
Subject: rpms/perl-XML-Twig/FC-5 .cvsignore, 1.8, 1.9 perl-XML-Twig.spec,
	1.13, 1.14 sources, 1.8, 1.9
Message-ID: <200607172108.k6HL8l9u027239@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-Twig/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27190

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
upgrade to 3.26


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 22:19:13 -0000	1.8
+++ .cvsignore	17 Jul 2006 21:08:44 -0000	1.9
@@ -1,3 +1,5 @@
 XML-Twig-3.17.tar.gz
 XML-Twig-3.22.tar.gz
 XML-Twig-3.23.tar.gz
+XML-Twig-3.25.tar.gz
+XML-Twig-3.26.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-5/perl-XML-Twig.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-XML-Twig.spec	3 Feb 2006 22:54:18 -0000	1.13
+++ perl-XML-Twig.spec	17 Jul 2006 21:08:44 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
-Version:        3.23
-Release: 	1
+Version:        3.26
+Release: 	1.fc5
 Summary:        A perl module for processing huge XML documents in tree mode
 
 Group:          Development/Libraries
@@ -30,7 +30,8 @@
 
 %prep
 %setup -q -n XML-Twig-%{version} 
-%patch0 -p1 -b .tests_no_HTML_TreeBuilder
+#%patch0 -p1 -b .tests_no_HTML_TreeBuilder
+#      ^- now fixed upstream
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
@@ -60,6 +61,12 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.26-1
+- Upgrade to 3.26
+
+* Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 3.25-1
+- Upgrade to 3.25
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.22-1.1
 - Update to 3.23
 - rebuild for new perl-5.8.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 22:19:13 -0000	1.8
+++ sources	17 Jul 2006 21:08:44 -0000	1.9
@@ -1 +1 @@
-5393b96c6dbfcafbc45481e936b97c03  XML-Twig-3.23.tar.gz
+b776ab7e0649dd62a50bac41366046e1  XML-Twig-3.26.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 21:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 17:39:14 -0400
Subject: rpms/jakarta-commons-daemon/devel .cvsignore, 1.4,
	1.5 jakarta-commons-daemon.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200607172139.k6HLdEhc026319@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26303

Modified Files:
	.cvsignore jakarta-commons-daemon.spec sources 
Log Message:

Added conditional native build.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jan 2005 12:36:00 -0000	1.4
+++ .cvsignore	17 Jul 2006 21:39:11 -0000	1.5
@@ -1,4 +1 @@
-daemon-1.0.tar.gz
-daemon-1.0
-noarch
-*.src.rpm
+daemon-1.0.1.tar.gz


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-commons-daemon.spec	12 Jul 2006 06:27:59 -0000	1.8
+++ jakarta-commons-daemon.spec	17 Jul 2006 21:39:11 -0000	1.9
@@ -1,3 +1,37 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define native      %{?_with_native:1}%{!?_with_native:0}
 
 %define base_name   daemon
@@ -6,29 +40,34 @@
 %define section     free
 
 Name:           %{name}
-Version:        1.0
-Release:        2jpp_5fc
+Version:        1.0.1
+Release:        3jpp_1fc
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
-License:        Apache Software License
+License:        Apache Software License 2.0
 Group:          System/Boot
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 URL:            http://jakarta.apache.org/commons/daemon/
-Source0:        http://archive.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.tar.gz
+Source0:        http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-1.0.1.tar.gz
 Patch:          %{name}-crosslink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %if %{native}
 BuildRequires:  java-devel
 %else
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRequires:  ant, java-javadoc
 %endif
-BuildRequires:  jpackage-utils >= 0:1.5
-# libgcj aot-compiled native libraries
-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:  jpackage-utils >= 0:1.6
+Provides:       %{short_name}
+Obsoletes:      %{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The scope of this package is to define an API in line with the current
@@ -43,13 +82,18 @@
 Group:          System/Boot
 Provides:       jsvc = %{epoch}:%{version}-%{release}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description    jsvc
 %{summary}.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -88,7 +132,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
-aot-compile-rpm
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,24 +147,37 @@
 
 
 %if %{native}
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files jsvc
 %defattr(-,root,root,-)
 %doc LICENSE*
 %{_sbindir}/jsvc
 %else
 
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE* PROPOSAL.html RELEASE-NOTES.txt STATUS.html src/samples
 %doc src/docs/*
 %{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-daemon-1.0.1.jar.*
+%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -126,35 +186,21 @@
 
 %endif
 
-
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-2jpp_5fc
-- rebuild
-
-* Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 1:1.0-2jpp_4fc
-- added missing %post section for rebuild-gcj-db
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:1.0-2jpp_3fc
-- stop scriptlet spew
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-3jpp_1fc
+- Added conditional native build.
 
-* Tue Feb  7 2006 Rafael Schloming <rafaels at redhat.com> - 1:1.0-2jpp_2fc
-- nativized
+* Wed Apr 12 2006 Ralph Apel <r.apel at r-apel.de> - 1:1.0.1-2jpp
+- First JPP-1.7 release
 
-* Fri Jan 21 2005 Gary Benson <gbenson at redhat.com> - 1:1.0-2jpp_1fc
-- Build into Fedora.
-
-* Tue Nov 23 2004 Fernando Nasser <fnasser at redhat.com> - 1:1.0-2jpp_1rh
-- Merge with upstream for upgrade
+* Thu Oct 27 2005 Ralph Apel <r.apel at r-apel.de> - 1:1.0.1-1jpp
+- Update to 1.0.1
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:1.0-2jpp
 - Rebuild with ant-1.6.2
-
 * Tue May 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-1jpp
 - Update to 1.0.
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> - 1:1.0-0.alpha.1jpp_1rh
-- RH vacuuming
-
 * Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.0-0.alpha.1jpp
 - Update to 1.0 alpha, bump epoch.
 - Non-versioned, crosslinked javadocs.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jan 2005 12:33:13 -0000	1.3
+++ sources	17 Jul 2006 21:39:11 -0000	1.4
@@ -1 +1 @@
-3054786aaba9631ec04fef0862023bc8  daemon-1.0.tar.gz
+df3eb5aafa53ca530843a09d40b8a1c0  daemon-1.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 21:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 17:47:58 -0400
Subject: rpms/sip/devel sip.spec,1.27,1.28
Message-ID: <200607172147.k6HLlw4l008888@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8874

Modified Files:
	sip.spec 
Log Message:
rebuild



Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sip.spec	12 Jul 2006 08:15:09 -0000	1.27
+++ sip.spec	17 Jul 2006 21:47:56 -0000	1.28
@@ -15,7 +15,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.4.3
-Release: 1.1
+Release: 2
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -83,6 +83,9 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Mon Jul 17 2006 Than Ngo <than at redhat.com> 4.4.3-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.4.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:02:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:02:20 -0400
Subject: rpms/avahi/devel avahi-0.6.11-use-ipv6-yes.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 avahi.spec, 1.63, 1.64 sources,
	1.12, 1.13
Message-ID: <200607172202.k6HM2KAK009247@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9234

Modified Files:
	.cvsignore avahi.spec sources 
Added Files:
	avahi-0.6.11-use-ipv6-yes.patch 
Log Message:
upgrade to 0.6.11; fix bugs 195674, 197414, 198282

avahi-0.6.11-use-ipv6-yes.patch:
 avahi-daemon.conf |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE avahi-0.6.11-use-ipv6-yes.patch ---
--- avahi-0.6.11/avahi-daemon/avahi-daemon.conf.use_ipv6_yes	2006-02-22 17:54:56.000000000 -0500
+++ avahi-0.6.11/avahi-daemon/avahi-daemon.conf	2006-07-17 17:34:08.000000000 -0400
@@ -25,7 +25,7 @@
 #domain-name=local
 browse-domains=0pointer.de, zeroconf.org
 use-ipv4=yes
-use-ipv6=no
+use-ipv6=yes
 #check-response-ttl=no
 #use-iff-running=no
 #enable-dbus=yes


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 May 2006 23:54:27 -0000	1.12
+++ .cvsignore	17 Jul 2006 22:02:07 -0000	1.13
@@ -9,3 +9,4 @@
 avahi-0.6.8.tar.gz
 avahi-0.6.9.tar.gz
 avahi-0.6.10.tar.gz
+avahi-0.6.11.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- avahi.spec	12 Jul 2006 05:25:02 -0000	1.63
+++ avahi.spec	17 Jul 2006 22:02:07 -0000	1.64
@@ -5,8 +5,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.10
-Release: 	3.FC6.1
+Version:        0.6.11
+Release: 	1.fc6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -52,6 +52,7 @@
 Patch14:	avahi-0.6.9-bz189427.patch
 Patch15:	avahi-0.6.9-mono-libdir.patch
 Patch16:	avahi-sharp-lock.patch
+Patch17:	avahi-0.6.11-use-ipv6-yes.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -143,7 +144,7 @@
 %package   compat-howl-devel
 Summary:   Header files for development with the howl compatibility libraries.
 Group:     Development/Libraries
-Requires:  %{name} = %{version}
+Requires:  avahi-compat-howl = %{version}
 Obsoletes: howl-devel
 
 %description compat-howl-devel
@@ -160,7 +161,7 @@
 %package   compat-libdns_sd-devel
 Summary:   Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
 Group:     Development/Libraries
-Requires:  %{name} = %{version}
+Requires:  avahi-compat-libdns_sd = %{version}
 
 %description compat-libdns_sd-devel
 Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
@@ -198,6 +199,7 @@
 %patch15 -p1 -b .mono-libdir
 #%patch16 -p1 -b .sharp-lock
 #^- this patch now upstream
+%patch17 -p1 -b .use-ipv6-yes
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -253,6 +255,15 @@
 if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e  $RPM_BUILD_ROOT/%{_libdir}/mono ]; then
    mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; 
 fi
+# fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
+%if %{WITH_COMPAT_HOWL}
+ln -s avahi-compat-howl.pc  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc 
+%endif
+%if %{WITH_COMPAT_DNSSD}
+ln -s avahi-compat-libdns_sd.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libdns_sd.pc 
+ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT/%{_includedir}/
+%endif
+# 
 :;
 
 %clean
@@ -382,6 +393,7 @@
 %attr(755,root,root) %{_libdir}/libhowl.so
 %{_includedir}/avahi-compat-howl
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
+%{_libdir}/pkgconfig/howl.pc
 %endif
 
 %if %{WITH_COMPAT_DNSSD}
@@ -393,11 +405,19 @@
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libdns_sd.so
 %{_includedir}/avahi-compat-libdns_sd
+%{_includedir}/dns_sd.h
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
+%{_libdir}/pkgconfig/libdns_sd.pc
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1.fc6
+- Upgrade to upstream version 0.6.11
+- fix bug 195674: set 'use-ipv6=yes' in avahi-daemon.conf
+- fix bug 197414: avahi-compat-howl and avahi-compat-dns-sd symlinks
+- fix bug 198282: avahi-compat-{howl-devel,dns-sd-devel} Requires:
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 
 * Tue Jun 13 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-3.FC6


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	30 May 2006 23:54:27 -0000	1.12
+++ sources	17 Jul 2006 22:02:07 -0000	1.13
@@ -1 +1 @@
-cfb9e05c138dff4c430a35eee6229e8a  avahi-0.6.10.tar.gz
+91fd8cc0c2bae638848faad36cf1c032  avahi-0.6.11.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:05:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:05:07 -0400
Subject: rpms/PyQt/devel PyQt.spec,1.30,1.31
Message-ID: <200607172205.k6HM57ae009337@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9319

Modified Files:
	PyQt.spec 
Log Message:
rebuild



Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PyQt.spec	12 Jul 2006 07:55:52 -0000	1.30
+++ PyQt.spec	17 Jul 2006 22:05:02 -0000	1.31
@@ -16,7 +16,7 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.16
-Release: 2.1
+Release: 3
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -99,6 +99,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Tue Jul 18 2006 Than Ngo <than at redhat.com> 3.16-3
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.16-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:18:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:18:25 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.29, 1.30
Message-ID: <200607172218.k6HMIP8V004957@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv773

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
Added conditional native compiling.



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jakarta-commons-digester.spec	12 Jul 2006 06:28:22 -0000	1.29
+++ jakarta-commons-digester.spec	17 Jul 2006 22:18:22 -0000	1.30
@@ -1,13 +1,47 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name       digester
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.7
-%define release 	2jpp_10fc.1
+%define release         3jpp_1fc
 %define section         free
 
 Name:           %{name}
 Version:        %{version}
-Release: 	%{release}
+Release:        %{release}
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -20,13 +54,18 @@
 BuildRequires:  jpackage-utils > 0:1.5
 Requires:       jakarta-commons-beanutils >= 0:1.7
 Requires:       jakarta-commons-logging >= 0:1.0
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# RHEL3 and FC2
-Obsoletes:      %{short_name} <= 1.4.1
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Provides:       %{short_name}
+Obsoletes:      %{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The goal of Digester project is to create and maintain a XML -> Java
@@ -36,7 +75,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -70,27 +108,13 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
-%triggerpostun -- commons-digester < 1.5
-pushd %{_javadir} &> /dev/null
-    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
-    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-popd &> /dev/null
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -100,80 +124,55 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt RELEASE-NOTES.txt
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7-rss.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-digester-1.7.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.7-2jpp_10fc.1
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.7-2jpp_10fc
-- stop scriptlet spew
-
-* 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>
-- 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
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_6fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm (also BC-compiles rss jarfile).
-
-* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_5fc
-- Rearrange how BC-compiled stuff is built and installed.
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-3jpp_1fc
+- Added conditional native compiling
 
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7-2jpp
+- First JPP 1.7 build
 
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.7-1jpp
+- Upgrade to 1.7
 
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_2fc
-- BC-compile the main jarfile.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.6-2jpp_1fc
-- Build into Fedora.
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp_1rh
-- Merge with upstream for fix
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp
+* Thu Nov 26 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-2jpp
 - Rebuild so that rss package is included
 
 * Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6-1jpp
 - Upgrade to 1.6
 
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com>  0:1.5-3jpp_5rh
-- add coreutils BuildRequires
-
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.5-4jpp
 - Rebuild with ant-1.6.2
 
-* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.5-3jpp_4rh
-- Added trigger to restore symlinks that are removed if ugrading
-  from a commons-digester rhug package
-
-* Fri Apr  2 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.5-3jpp_3rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.5-3jpp_2rh
-- add RHUG upgrade cleanup
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.5-3jpp
 - update for JPackage 1.5
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:19:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:19:59 -0400
Subject: rpms/xterm/devel .cvsignore, 1.14, 1.15 sources, 1.14,
	1.15 xterm.spec, 1.45, 1.46
Message-ID: <200607172219.k6HMJxP3005608@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5584

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
upgrade to upstream version 215


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	31 May 2006 22:06:11 -0000	1.14
+++ .cvsignore	17 Jul 2006 22:19:56 -0000	1.15
@@ -12,3 +12,4 @@
 xterm-211.tgz
 xterm-212.tgz
 xterm-213.tgz
+xterm-215.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	31 May 2006 22:06:11 -0000	1.14
+++ sources	17 Jul 2006 22:19:56 -0000	1.15
@@ -1,4 +1,3 @@
-0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
 92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-20827d968ed7406d01b2125a84b7a2cd  xterm-213.tgz
+8c2a45d4ca754b2cb019242e26f657eb  xterm-215.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xterm.spec	12 Jul 2006 09:24:28 -0000	1.45
+++ xterm.spec	17 Jul 2006 22:19:56 -0000	1.46
@@ -1,13 +1,14 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 213
-Release: 2.1%{?dist}
+Version: 215
+Release: 1%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
 BuildRoot: %{_tmppath}/%{name}-root
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
+#Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
+#         ^-  now shipped in upstream source tarball
 Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz
 Source3: ftp://invisible-island.net/xterm/16colors.txt
 Patch0: xterm-can-2003-0063.patch
@@ -80,7 +81,8 @@
 #      ^- patch now upstream
 #%patch11 -p1 -b .bz186094
 #      ^- patch now in redhat-resources
-%patch12 -p1 -b .bz186935
+#%patch12 -p1 -b .bz186935
+#      ^- patch now upstream
 %patch13 -p1 -b .redhat-resources
 %patch14 -p1 -b .man-page_paths
 %patch15 -p1 -b .bz189161
@@ -116,7 +118,8 @@
 %makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
-gunzip < %SOURCE1 > ctlseqs.txt
+#gunzip < %SOURCE1 > ctlseqs.txt
+#   ^- now shipped in upstream tarball
 gunzip < %SOURCE2 > UnicodeData.txt
 cp -fp %SOURCE3 16colors.txt
 %if !%{DEBUGINFO}
@@ -140,6 +143,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 215-1.fc6
+- Upgrade to upstream version 215
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 213-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:24:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:24:31 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.13, 1.14 python-pyblock.spec,
	1.22, 1.23 sources, 1.17, 1.18
Message-ID: <200607172224.k6HMOVAD007428@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7380

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.16-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Feb 2006 03:36:06 -0000	1.13
+++ .cvsignore	17 Jul 2006 22:24:28 -0000	1.14
@@ -1 +1 @@
-pyblock-0.15.tar.bz2
+pyblock-0.16.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-pyblock.spec	12 Jul 2006 07:57:06 -0000	1.22
+++ python-pyblock.spec	17 Jul 2006 22:24:29 -0000	1.23
@@ -4,15 +4,15 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.15
-Release: 2.1
+Version: 0.16
+Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, gettext, device-mapper >= 1.01.05-3
 BuildRequires: dmraid-devel, libselinux-devel, libsepol-devel
-BuildRequires: zlib-devel
+BuildRequires: zlib-devel, libbdevid >= 5.1.0
 Requires: python >= %{pyver}, device-mapper >= 1.01.04, libselinux
 
 excludearch: s390 s390x
@@ -39,6 +39,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Mon Jul 17 2006 Peter Jones <pjones at redhat.com> - 0.16-1
+- new release with rudamentary support for multipath
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.15-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Feb 2006 03:36:06 -0000	1.17
+++ sources	17 Jul 2006 22:24:29 -0000	1.18
@@ -1 +1 @@
-a201b09eb86a748b0d41bd5671e7ae8f  pyblock-0.15.tar.bz2
+cb8b78823c19d9e5e143c9bb3dd11ed2  pyblock-0.16.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:29:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:29:07 -0400
Subject: rpms/xorg-x11-xdm/devel xdm.pamd, 1.2, 1.3 xorg-x11-xdm.spec, 1.28,
	1.29 xserver.pamd, 1.1, 1.2
Message-ID: <200607172229.k6HMT7Ol009225@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9189

Modified Files:
	xdm.pamd xorg-x11-xdm.spec xserver.pamd 
Log Message:
* Mon Jul 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-3
- Added pam_keyinit.so support to xdm.pamd and xserver.pamd (#198631)
- Flag pam.d{xdm,xserver} as attr(0644,root,root) replaceable config files.
- Flag app-defaults/Chooser as a replaceable config file.



Index: xdm.pamd
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xdm.pamd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdm.pamd	24 Nov 2005 16:40:34 -0000	1.2
+++ xdm.pamd	17 Jul 2006 22:29:05 -0000	1.3
@@ -4,6 +4,7 @@
 account    required	pam_nologin.so
 account    include	system-auth
 password   include	system-auth
+session    optional	pam_keyinit.so force revoke
 session    include	system-auth
-session    required     pam_loginuid.so
-session    optional     pam_console.so
+session    required	pam_loginuid.so
+session    optional	pam_console.so


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-xdm.spec	12 Jul 2006 19:20:52 -0000	1.28
+++ xorg-x11-xdm.spec	17 Jul 2006 22:29:05 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 2
+Release: 3
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -129,11 +129,16 @@
 %{_sysconfdir}/X11/xdm/Xsetup_0
 %{_sysconfdir}/X11/xdm/Xstartup
 %{_sysconfdir}/X11/xdm/Xwilling
-%{_sysconfdir}/pam.d/xdm
-%{_sysconfdir}/pam.d/xserver
+# NOTE: For security, upgrades of this package will install the new pam.d
+# files and make backup copies by default.  'noreplace' is intentionally avoided
+# here.
+%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xdm
+%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/app-defaults
-%{_datadir}/X11/app-defaults/Chooser
+# NOTE: We intentionally default to OS supplied file being favoured here on
+# OS upgrades.
+%config %{_datadir}/X11/app-defaults/Chooser
 %dir %{_datadir}/xdm
 %dir %{_datadir}/xdm/pixmaps
 %{_datadir}/xdm/pixmaps/xorg-bw.xpm
@@ -145,7 +150,12 @@
 %{_mandir}/man1/*.1*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.5-2
+* Mon Jul 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-3
+- Added pam_keyinit.so support to xdm.pamd and xserver.pamd (#198631)
+- Flag pam.d{xdm,xserver} as attr(0644,root,root) replaceable config files.
+- Flag app-defaults/Chooser as a replaceable config file.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.5-2
 - rebuild
 
 * Wed Jun 28 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-1


Index: xserver.pamd
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xserver.pamd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver.pamd	29 Aug 2005 06:51:54 -0000	1.1
+++ xserver.pamd	17 Jul 2006 22:29:05 -0000	1.2
@@ -2,3 +2,4 @@
 auth       sufficient	pam_rootok.so
 auth       required	pam_console.so
 account    required	pam_permit.so
+session    optional	pam_keyinit.so force revoke



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:30:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:30:51 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.29,1.30
Message-ID: <200607172230.k6HMUpOU009687@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9645

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
Add conditional {dist} flag to Release field.


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-xdm.spec	17 Jul 2006 22:29:05 -0000	1.29
+++ xorg-x11-xdm.spec	17 Jul 2006 22:30:27 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 3
+Release: 3%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -150,10 +150,11 @@
 %{_mandir}/man1/*.1*
 
 %changelog
-* Mon Jul 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-3
+* Mon Jul 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-3.fc6
 - Added pam_keyinit.so support to xdm.pamd and xserver.pamd (#198631)
 - Flag pam.d{xdm,xserver} as attr(0644,root,root) replaceable config files.
 - Flag app-defaults/Chooser as a replaceable config file.
+- Add conditional {dist} flag to Release field.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1:1.0.5-2
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:33:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:33:11 -0400
Subject: rpms/avahi/FC-5 .cvsignore, 1.12, 1.13 avahi.spec, 1.50,
	1.51 sources, 1.12, 1.13
Message-ID: <200607172233.k6HMXBJa009810@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9778

Modified Files:
	.cvsignore avahi.spec sources 
Log Message:
upgrade to 0.6.11; fix bugs 195674, 197414, 198282


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	6 Jun 2006 18:28:25 -0000	1.12
+++ .cvsignore	17 Jul 2006 22:32:56 -0000	1.13
@@ -9,3 +9,4 @@
 avahi-0.6.8.tar.gz
 avahi-0.6.9.tar.gz
 avahi-0.6.10.tar.gz
+avahi-0.6.11.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avahi.spec	6 Jun 2006 23:20:16 -0000	1.50
+++ avahi.spec	17 Jul 2006 22:32:58 -0000	1.51
@@ -1,23 +1,38 @@
 %{?!WITH_MONO:  %define WITH_MONO 1}
 %{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
 %{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
-%ifarch ppc64
+%ifarch ppc64 s390 s390x
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.10
-Release: 	1.FC5
+Version:        0.6.11
+Release: 	1.fc5
 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:  autoconf, automake, libtool, doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, libxml2-python, gdbm-devel, pygtk2
-%if %{WITH_MONO}
-BuildRequires: mono-devel >= 1.1.13
-%endif
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig, ldconfig
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  dbus-devel
+BuildRequires:  dbus-python
+BuildRequires:  libxml2-python
+BuildRequires:  gtk2-devel
+BuildRequires:  qt-devel
+BuildRequires:  libglade2-devel
+BuildRequires:  libdaemon-devel
+BuildRequires:  glib2-devel
+BuildRequires:  libcap-devel
+BuildRequires:  expat-devel
+BuildRequires:  python
+BuildRequires:  gdbm-devel
+BuildRequires:  pygtk2
+%if %{WITH_MONO}
+BuildRequires:  mono-devel >= 1.1.13
+%endif
 Obsoletes:	howl
 Source0:        %{name}-%{version}.tar.gz
 Patch1:		avahi-0.5.2-fedora.patch
@@ -37,6 +52,7 @@
 Patch14:	avahi-0.6.9-bz189427.patch
 Patch15:	avahi-0.6.9-mono-libdir.patch
 Patch16:	avahi-sharp-lock.patch
+Patch17:	avahi-0.6.11-use-ipv6-yes.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -128,7 +144,7 @@
 %package   compat-howl-devel
 Summary:   Header files for development with the howl compatibility libraries.
 Group:     Development/Libraries
-Requires:  %{name} = %{version}
+Requires:  avahi-compat-howl = %{version}
 Obsoletes: howl-devel
 
 %description compat-howl-devel
@@ -145,7 +161,7 @@
 %package   compat-libdns_sd-devel
 Summary:   Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
 Group:     Development/Libraries
-Requires:  %{name} = %{version}
+Requires:  avahi-compat-libdns_sd = %{version}
 
 %description compat-libdns_sd-devel
 Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
@@ -183,6 +199,7 @@
 %patch15 -p1 -b .mono-libdir
 #%patch16 -p1 -b .sharp-lock
 #^- this patch now upstream
+%patch17 -p1 -b .use-ipv6-yes
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -238,6 +255,15 @@
 if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e  $RPM_BUILD_ROOT/%{_libdir}/mono ]; then
    mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; 
 fi
+# fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
+%if %{WITH_COMPAT_HOWL}
+ln -s avahi-compat-howl.pc  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc 
+%endif
+%if %{WITH_COMPAT_DNSSD}
+ln -s avahi-compat-libdns_sd.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libdns_sd.pc 
+ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT/%{_includedir}/
+%endif
+# 
 :;
 
 %clean
@@ -367,6 +393,7 @@
 %attr(755,root,root) %{_libdir}/libhowl.so
 %{_includedir}/avahi-compat-howl
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
+%{_libdir}/pkgconfig/howl.pc
 %endif
 
 %if %{WITH_COMPAT_DNSSD}
@@ -378,25 +405,36 @@
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libdns_sd.so
 %{_includedir}/avahi-compat-libdns_sd
+%{_includedir}/dns_sd.h
 %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
+%{_libdir}/pkgconfig/libdns_sd.pc
 %endif
 
 %changelog
-* Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2.FC6
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1
+- Upgrade to upstream version 0.6.11
+- fix bug 195674: set 'use-ipv6=yes' in avahi-daemon.conf
+- fix bug 197414: avahi-compat-howl and avahi-compat-dns-sd symlinks
+- fix bug 198282: avahi-compat-{howl-devel,dns-sd-devel} Requires:
+
+* Tue Jun 13 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-3
+- rebuild for broken mono deps
+
+* Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2
 - fix bug 194203: fix permissions on /var/run/avahi-daemon
 
-* Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-1.FC6
+* Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-1
 - Upgrade to upstream version 0.6.10
 - fix bug 192080: split avahi-compat-libdns_sd into separate package
                   (same goes for avahi-compat-howl)
 
-* Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+* Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9
 - fix avahi-sharp issues for banshee - patches from caillon at redhat.com
 
-* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9
 - fix bug 189427: correct avahi-resolve --help typo
 
-* Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8.FC6
+* Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8
 - fix bug 185972: remove ellipses in initscript
 - fix bug 185965: make chkconfigs unconditional
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	6 Jun 2006 18:28:25 -0000	1.12
+++ sources	17 Jul 2006 22:32:58 -0000	1.13
@@ -1 +1 @@
-cfb9e05c138dff4c430a35eee6229e8a  avahi-0.6.10.tar.gz
+91fd8cc0c2bae638848faad36cf1c032  avahi-0.6.11.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:39:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:39:03 -0400
Subject: rpms/avahi/FC-5 avahi-0.6.11-use-ipv6-yes.patch,NONE,1.1
Message-ID: <200607172239.k6HMd3UA011400@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11360

Added Files:
	avahi-0.6.11-use-ipv6-yes.patch 
Log Message:
fix bug 195674

avahi-0.6.11-use-ipv6-yes.patch:
 avahi-daemon.conf |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE avahi-0.6.11-use-ipv6-yes.patch ---
--- avahi-0.6.11/avahi-daemon/avahi-daemon.conf.use_ipv6_yes	2006-02-22 17:54:56.000000000 -0500
+++ avahi-0.6.11/avahi-daemon/avahi-daemon.conf	2006-07-17 17:34:08.000000000 -0400
@@ -25,7 +25,7 @@
 #domain-name=local
 browse-domains=0pointer.de, zeroconf.org
 use-ipv4=yes
-use-ipv6=no
+use-ipv6=yes
 #check-response-ttl=no
 #use-iff-running=no
 #enable-dbus=yes



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:44:32 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.295,1.296
Message-ID: <200607172244.k6HMiWkk013492@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13449

Modified Files:
	eclipse.spec 
Log Message:
Rebuild


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- eclipse.spec	8 Jul 2006 02:20:09 -0000	1.295
+++ eclipse.spec	17 Jul 2006 22:44:29 -0000	1.296
@@ -41,7 +41,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/
@@ -1631,6 +1631,9 @@
 %endif
 
 %changelog
+* Mon Jul 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_2fc
+- Rebuild.
+
 * Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Temporarily add webapp patch for ppc64 and s390x.
 - Bump tomcat5 to 5.5.17 both in BR/R and in patches.



From fedora-cvs-commits at redhat.com  Mon Jul 17 22:48:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 18:48:31 -0400
Subject: rpms/openais/devel .cvsignore, 1.4, 1.5 openais.spec, 1.7,
	1.8 sources, 1.4, 1.5 openais-0.78-ia64-build.patch, 1.1,
	NONE openais-0.78-s390-build.patch, 1.1,
	NONE openais-0.78-timer-thread-fix.patch, 1.1, NONE
Message-ID: <200607172248.k6HMmV4Z029746@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29704/devel

Modified Files:
	.cvsignore openais.spec sources 
Removed Files:
	openais-0.78-ia64-build.patch openais-0.78-s390-build.patch 
	openais-0.78-timer-thread-fix.patch 
Log Message:
auto-import openais-0.79-1.0 on branch devel from openais-0.79-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2006 01:49:53 -0000	1.4
+++ .cvsignore	17 Jul 2006 22:48:29 -0000	1.5
@@ -1 +1 @@
-openais-0.78.tar.gz
+openais-0.79.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openais.spec	12 Jul 2006 07:32:40 -0000	1.7
+++ openais.spec	17 Jul 2006 22:48:29 -0000	1.8
@@ -1,15 +1,12 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.78
-Release: 1.2.1
+Version: 0.79
+Release: 1.0
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
-Patch1: openais-0.78-ia64-build.patch
-Patch2: openais-0.78-s390-build.patch
-Patch3: openais-0.78-timer-thread-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
@@ -34,9 +31,6 @@
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
 
 %build
 # -O3 required for performance reasons
@@ -166,8 +160,8 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
-- rebuild
+* Mon Jul 17 2006 Steven Dake <sdake at redhat.com> - 0.79-1.0
+- New upstream release.
 
 * Mon Jul 10 2006 Steven Dake <sdake at redhat.com> - 0.78-1.2
 - Allow build on s390 and s390x.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2006 01:49:53 -0000	1.4
+++ sources	17 Jul 2006 22:48:29 -0000	1.5
@@ -1 +1 @@
-ab116b67d23743946a0a1f3bc77cf609  openais-0.78.tar.gz
+63d3fd0db66260204d1fcc40779ad5b5  openais-0.79.tar.gz


--- openais-0.78-ia64-build.patch DELETED ---


--- openais-0.78-s390-build.patch DELETED ---


--- openais-0.78-timer-thread-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:06:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:06:14 -0400
Subject: rpms/gdm/devel gdm-2.15.5-process-all-ops.patch, 1.1, 1.2 gdm.spec,
	1.175, 1.176
Message-ID: <200607172306.k6HN6EWA002398@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2333

Modified Files:
	gdm-2.15.5-process-all-ops.patch gdm.spec 
Log Message:
- fix off-by-one in the process-all-ops patch that was causing
  an anoying dialog to pop up on each login


gdm-2.15.5-process-all-ops.patch:
 gdmlogin.c        |  121 +++++++++++++++++++++---------------------------------
 greeter/greeter.c |  119 +++++++++++++++++++++--------------------------------
 2 files changed, 96 insertions(+), 144 deletions(-)

Index: gdm-2.15.5-process-all-ops.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-process-all-ops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.5-process-all-ops.patch	7 Jul 2006 21:26:52 -0000	1.1
+++ gdm-2.15.5-process-all-ops.patch	17 Jul 2006 23:06:11 -0000	1.2
@@ -35,12 +35,12 @@
 +      return TRUE;
 +
 +    p = memchr (buf, STX, len);
-+
 +    if (p != NULL) {
 +      len = p - buf;
 +      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
 +      memset (buf + len, '\0', sizeof (buf) - len);
 +    }
++    buf[len - 1] = '\0';  
 + 
 +    process_operation ((guchar) buf[0], buf + 1);
  
@@ -391,13 +391,13 @@
        return TRUE;
  
 +    p = memchr (buf, STX, len);
-+
 +    if (p != NULL) {
 +      len = p - buf;
 +      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
 +      memset (buf + len, '\0', sizeof (buf) - len);
 +    }
-+      
++    buf[len - 1] = '\0';  
++
 +    process_operation ((guchar) buf[0], buf + 1);
 +    return TRUE;
 +}


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- gdm.spec	17 Jul 2006 03:09:48 -0000	1.175
+++ gdm.spec	17 Jul 2006 23:06:11 -0000	1.176
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 5
+Release: 6
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -328,6 +328,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jul 17 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-6
+- fix off-by-one in the process-all-ops patch that was causing
+  an anoying dialog to pop up on each login
+
 * Sun Jul 16 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-5
 - add initial wtmp and btmp logging support
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:06:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:06:26 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang-notarget.patch,
	NONE, 1.1 .cvsignore, 1.5, 1.6 jakarta-commons-lang.spec, 1.13,
	1.14 sources, 1.4, 1.5 jakarta-commons-lang-crosslink.patch,
	1.1, NONE
Message-ID: <200607172306.k6HN6PeN002439@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2366

Modified Files:
	.cvsignore jakarta-commons-lang.spec sources 
Added Files:
	jakarta-commons-lang-notarget.patch 
Removed Files:
	jakarta-commons-lang-crosslink.patch 
Log Message:

- Added conditional native compiling.
- By jkeating: Patched to not use taget= in build.xml



jakarta-commons-lang-notarget.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE jakarta-commons-lang-notarget.patch ---
--- ./build.xml.sav	2006-07-17 18:11:29.000000000 -0400
+++ ./build.xml	2006-07-17 18:11:46.000000000 -0400
@@ -55,7 +55,7 @@
 		</copy>
 	</target>
 	<target name="compile" depends="static" description="Compile shareable components">
-		<javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
+		<javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
 			<classpath refid="compile.classpath"/>
 		</javac>
 		<copy todir="${build.home}/classes" filtering="on">
@@ -63,7 +63,7 @@
 		</copy>
 	</target>
 	<target name="compile.tests" depends="compile" description="Compile unit test cases">
-		<javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
+		<javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}">
 			<classpath refid="test.classpath"/>
 		</javac>
 		<copy todir="${build.home}/tests" filtering="on">


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2005 22:24:59 -0000	1.5
+++ .cvsignore	17 Jul 2006 23:06:21 -0000	1.6
@@ -1,5 +1 @@
-commons-lang-2.0-src-RHCLEAN.tar.bz2
-commons-lang-2.0-src
-noarch
-*.src.rpm
-jakarta-commons-lang-notarget.patch
+commons-lang-2.1-src.tar.gz


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-lang.spec	12 Jul 2006 06:28:59 -0000	1.13
+++ jakarta-commons-lang.spec	17 Jul 2006 23:06:21 -0000	1.14
@@ -1,25 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name       lang
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define section         free
 
 Name:           %{name}
-Version:        2.0
-Release: 	2jpp_6fc
+Version:        2.1
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
-URL:            http://jakarta.apache.org/commons/lang/
-Source0:        commons-lang-2.0-src-RHCLEAN.tar.bz2
-Patch0:         %{name}-crosslink.patch
-Patch1:         %{name}-notarget.patch
+URL:            http://jakarta.apache.org/commons/lang.html
+#wget http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.1-src.tar.gz
+Source0:        commons-lang-2.1-src.tar.gz
+Patch0:         %{name}-notarget.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-BuildRequires:  ant, junit, jpackage-utils >= 0:1.5
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+BuildRequires:  ant-junit, jpackage-utils >= 0:1.5, %{__perl}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The standard Java libraries fail to provide enough methods for
@@ -37,26 +75,24 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
 
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
-%patch0 -p0
-%patch1 -p0
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+%setup -q -n %{short_name}-%{version}
+%{__perl} -pi -e 's/\r//g' *.txt
 
+%patch0
 
 %build
-ant \
+%ant \
   -Djunit.jar=$(find-jar junit) \
   -Dfinal.name=%{short_name} \
-  -Dj2se.javadoc=%{_javadocdir}/java \
-  dist
+  -Djdk.javadoc=%{_javadocdir}/java \
+  -Dtest.failonerror=false \
+  test dist
 
 
 %install
@@ -72,24 +108,44 @@
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
-aot-compile-rpm
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
-%{_bindir}/rebuild-gcj-db
+
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(0644,root,root,0755)
-%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
+%doc PROPOSAL.html STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-lang-2.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -98,43 +154,20 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0-2jpp_6fc
-- rebuild
-
-* Wed Mar 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.0-2jpp_5fc
-- Fixed broken URL and nativized.
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.0-2jpp_4fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:2.0-2jpp_3fc
-- rebuilt again
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com> - 0:2.0-2jpp_2fc.2
-- Patched to not use taget= in build.xml
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:2.0-2jpp_2fc
-- Remove jarfile from the tarball.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:2.0-2jpp_1fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:2.0-2jpp_1rh
-- Merge with upstream version
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp_1fc
+- Added conditional native compiling.
+- By jkeating: Patched to not use taget= in build.xml
+
+* Mon Feb 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.1-2jpp
+- First JPP 1.7 build
+
+* Sat Aug 20 2005 Ville Skytt?? <scop at jpackage.org> - 0:2.1-1jpp
+- 2.1, javadoc crosslink patch applied upstream.
+- Use the %%ant macro.
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.0-2jpp
 - Rebuild with ant-1.6.2
 
-* Fri Mar 12 2004 Frank Ch. Eigler <fche at redhat.com> - 0:2.0-1jpp_1rh
-- RH vacuuming
-- don't run junit tests; some parts are JVM flavour dependent
-
 * Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.0-1jpp
 - Update to 2.0.
 - Add non-versioned javadocs dir symlink.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 22:24:59 -0000	1.4
+++ sources	17 Jul 2006 23:06:21 -0000	1.5
@@ -1,2 +1 @@
-50922cf152ffd561f6b43d31e3265d8f  commons-lang-2.0-src-RHCLEAN.tar.bz2
-c03cad3778fef1820f33483ca4016a5e  jakarta-commons-lang-notarget.patch
+d8379e93f597b2ae6d1f7b4bb7e83fce  commons-lang-2.1-src.tar.gz


--- jakarta-commons-lang-crosslink.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:08:30 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.14,
	1.15
Message-ID: <200607172308.k6HN8Unn002899@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2835

Modified Files:
	jakarta-commons-lang.spec 
Log Message:

Set with_gcj_support to 1 by default




Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-lang.spec	17 Jul 2006 23:06:21 -0000	1.14
+++ jakarta-commons-lang.spec	17 Jul 2006 23:08:27 -0000	1.15
@@ -28,6 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define _with_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define base_name       lang



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:36:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:36:58 -0400
Subject: rpms/cscope/devel cscope.spec,1.26,1.27
Message-ID: <200607172336.k6HNawdE026823@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26784

Modified Files:
	cscope.spec 
Log Message:
rebuild


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cscope.spec	23 Jun 2006 20:19:28 -0000	1.26
+++ cscope.spec	17 Jul 2006 23:36:53 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.8 
+Release: 14
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -91,6 +91,12 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 15.5-14
+- rebuild
+
+* Fri Jun 23 2006 Neil Horman <nhorman at redhat.com>
+- Fix putstring overflow (bz 189666)
+
 * Fri Jun 23 2006 Neil Horman <nhorman at redhat.com>
 - Fix putstring overflow (bz 189666)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:39:56 -0400
Subject: rpms/inn/devel inn.spec,1.32,1.33
Message-ID: <200607172339.k6HNduQi027563@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27538

Modified Files:
	inn.spec 
Log Message:
rebuild


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- inn.spec	12 Jul 2006 17:23:54 -0000	1.32
+++ inn.spec	17 Jul 2006 23:39:54 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.3
-Release: 4.1
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -291,7 +291,7 @@
 %{_mandir}/man1/inews*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-4.1
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-5
 - rebuild
 
 * Wed Jun 21 2006 Martin Stransky <stransky at redhat.com> 2.4.3-4



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:42:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:42:10 -0400
Subject: rpms/mcelog/devel mcelog.spec,1.21,1.22
Message-ID: <200607172342.k6HNgArr028419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28351

Modified Files:
	mcelog.spec 
Log Message:
rebuild


Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mcelog.spec	12 Jul 2006 05:27:08 -0000	1.21
+++ mcelog.spec	17 Jul 2006 23:42:07 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
 Version:        0.7
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com>
+- Rebuild.
+
 * Fri Jun 30 2006 Dave Jones <davej at redhat.com>
 - Rebuild. (#197385)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:44:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:44:05 -0400
Subject: rpms/device-mapper-multipath/devel .cvsignore, 1.11,
	1.12 device-mapper-multipath.spec, 1.32, 1.33 sources, 1.12, 1.13
Message-ID: <200607172344.k6HNi5sQ029161@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28890

Modified Files:
	.cvsignore device-mapper-multipath.spec sources 
Log Message:
Updated to latest source.  Fixes bug in default configuration file.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Jul 2006 20:53:39 -0000	1.11
+++ .cvsignore	17 Jul 2006 23:44:02 -0000	1.12
@@ -3,3 +3,4 @@
 multipath-tools-0.4.7.1.tgz
 multipath-tools-0.4.7.2.tgz
 multipath-tools-0.4.7.3.tgz
+multipath-tools-0.4.7.4.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- device-mapper-multipath.spec	12 Jul 2006 22:08:47 -0000	1.32
+++ device-mapper-multipath.spec	17 Jul 2006 23:44:02 -0000	1.33
@@ -1,11 +1,11 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 3.1
+Release: 4.0
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-0.4.7.3.tgz
+Source0: multipath-tools-0.4.7.4.tgz
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prereq: chkconfig
@@ -22,7 +22,7 @@
 * kpartx :      Makes multipath devices partitionable.
 
 %prep
-%setup -q -n multipath-tools-0.4.7.3
+%setup -q -n multipath-tools-0.4.7.4
 
 %build
 make DESTDIR=$RPM_BUILD_ROOT
@@ -66,6 +66,9 @@
 %doc AUTHOR COPYING README* FAQ Multipath-usage.txt multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 
 %changelog
+* Mon Jul 17 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-4.0
+- Updated to latest source. Fixes bug in default multipath.conf
+
 * Wed Jul 12 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.7-3.1
 - Added ncurses-devel to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jul 2006 20:53:39 -0000	1.12
+++ sources	17 Jul 2006 23:44:02 -0000	1.13
@@ -1 +1 @@
-015f5c41ad640e893fbbddd9a30fe3b4  multipath-tools-0.4.7.3.tgz
+a5a266f9f935b2d00ade0b957d220301  multipath-tools-0.4.7.4.tgz



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:45:01 -0400
Subject: rpms/microcode_ctl/devel microcode_ctl.spec,1.32,1.33
Message-ID: <200607172345.k6HNj1KN029569@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/microcode_ctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29545

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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- microcode_ctl.spec	12 Jul 2006 05:27:14 -0000	1.32
+++ microcode_ctl.spec	17 Jul 2006 23:44:58 -0000	1.33
@@ -1,7 +1,7 @@
 Summary:        Tool to update x86/x86-64 CPU microcode.
 Name:           microcode_ctl
 Version:        1.13
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+Release: 	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL
@@ -82,6 +82,9 @@
 exit 0
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com>
+- rebuild
+
 * Fri Jun 16 2006 Bill Nottingham <notting at redhat.com>
 - remove kudzu requirement
 - add prereq for coreutils, awk, grep



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:47:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:47:28 -0400
Subject: rpms/ncpfs/devel ncpfs.spec,1.28,1.29
Message-ID: <200607172347.k6HNlSg6012795@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12768

Modified Files:
	ncpfs.spec 
Log Message:
rebuild


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ncpfs.spec	30 Jun 2006 14:34:08 -0000	1.28
+++ ncpfs.spec	17 Jul 2006 23:47:25 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 4
+Release: 5
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -120,6 +120,9 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-5
+- rebuild
+
 * Fri Jun 30 2006 Martin Stransky <stransky at redhat.com> - 2.2.6-4
 - added gettext to BuildRequires (#193526)
 



From fedora-cvs-commits at redhat.com  Mon Jul 17 23:57:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 19:57:59 -0400
Subject: rpms/pciutils/devel pciutils.spec,1.40,1.41
Message-ID: <200607172357.k6HNvxuJ016826@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16802

Modified Files:
	pciutils.spec 
Log Message:
rebuild


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pciutils.spec	12 Jul 2006 07:41:11 -0000	1.40
+++ pciutils.spec	17 Jul 2006 23:57:56 -0000	1.41
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.3
-Release: 	2.1
+Release: 	3
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Patch0:		pciutils-strip.patch
 Patch2:		pciutils-2.1.10-scan.patch
@@ -72,7 +72,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.3-2.1
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.2.3-3
 - rebuild
 
 * Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 2.2.3-2



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:03:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:03:09 -0400
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.20,1.21
Message-ID: <200607180003.k6I039Ek017867@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17847

Modified Files:
	pcmciautils.spec 
Log Message:
rebuild


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pcmciautils.spec	12 Jul 2006 07:41:44 -0000	1.20
+++ pcmciautils.spec	18 Jul 2006 00:02:54 -0000	1.21
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 3.1
+Release: 4
 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
@@ -43,7 +43,7 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 014-3.1
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 014-4
 - rebuild
 
 * Mon Jun 19 2006 Harald Hoyer <harald at redhat.com> - 014-3



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:04:17 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.30, 1.31
Message-ID: <200607180004.k6I04HZE017988@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17873

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Added conditional native compiling.



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-modeler.spec	12 Jul 2006 06:29:24 -0000	1.30
+++ jakarta-commons-modeler.spec	18 Jul 2006 00:03:59 -0000	1.31
@@ -1,18 +1,53 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name	modeler
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release 	4jpp_7fc
+%define release		6jpp_1fc
 %define	section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: 	%{release}
+Release:	%{release}
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
 Group:		Development/Libraries/Java
 Source0:	%{base_name}-%{version}-src.tar.gz
+#Patch:		%{name}.no-licence.build.patch
 Url:		http://jakarta.apache.org/commons/%{base_name}
 BuildRequires:	ant
 BuildRequires:	jaxp_parser_impl
@@ -32,13 +67,18 @@
 Requires:	jakarta-commons-collections >= 0:2.0
 Requires:	jakarta-commons-digester >= 0:1.2
 Requires:	jakarta-commons-logging >= 0:1.0
+%if ! %{gcj_support}
+BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	%{short_name} <= 0:1.0
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Provides:	%{short_name}
+Obsoletes:	%{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The Modeler project shall create and maintain a set of Java
@@ -49,13 +89,13 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -n %{short_name}-%{version}-src
+#%%patch
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -74,27 +114,13 @@
 %__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 (cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 %__rm -rf %{buildroot}
 
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%triggerpostun -- commons-modeler < 1.2
-pushd %{_javadir} &> /dev/null
-    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
-    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-popd &> /dev/null
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %post javadoc
 %__rm -f %{_javadocdir}/%{name}
 %__ln_s %{name}-%{version} %{_javadocdir}/%{name}
@@ -104,11 +130,30 @@
   %__rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
 %{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-modeler-1.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -117,66 +162,20 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_7fc
-- rebuild
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp_1fc
+- Added contional native compilation.
+- Merge with upstream version.
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-4jpp_6fc
-- stop scriptlet spew
-
-* 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
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_3fc
-- rebuilt
-
-* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-4jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Thu May 26 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-4jpp_1fc
-- Upgrade to 1.1-4jpp.
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
-
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
-
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_2fc
-- BC-compile.
-
-* Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> - 0:1.1-3jpp_1fc
-- Build into Fedora.
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-5jpp
+- First JPP 1.7 build
 
 * Thu Feb 24 2005 David Walluck <david at jpackage.org> 0:1.1-4jpp
 - add missing epochs to dependencies
 - add non-versioned javadoc symlink
 - fix file permissions
 
-* Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.1-3jpp_1rh
-- Merge with upstream version
-
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.1-3jpp
 - Rebuild with ant-1.6.2
-
-* Fri Jul  2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.1-2jpp_4rh
-- Added trigger to restore symlinks that are removed if ugrading
-  from a commons-modeler rhug package
-
-* Fri Apr  2 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_3rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_2rh
-- add RHUG upgrade cleanup
-
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-2jpp_1rh
-- RH vacuuming
-
 * Thu Oct 09 2003 Henri Gomez <hgomez at users.sourceforge.net> 0:1.1-2jpp
 - fix junit typo (reported by Kaj J. Niemi)
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:04:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:04:34 -0400
Subject: rpms/psmisc/devel psmisc.spec,1.29,1.30
Message-ID: <200607180004.k6I04YUA018028@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18010

Modified Files:
	psmisc.spec 
Log Message:
rebuild


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- psmisc.spec	15 Jul 2006 03:41:48 -0000	1.29
+++ psmisc.spec	18 Jul 2006 00:04:31 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 22.2
-Release: 3
+Release: 4
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -56,7 +56,7 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
-* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 22.2-3
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 22.2-4
 - rebuild
 
 * Wed May 17 2006 Karel Zak <kzak at redhat.com> 22.2-2



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:07:16 -0400
Subject: rpms/sysfsutils/devel sysfsutils.spec,1.18,1.19
Message-ID: <200607180007.k6I07GSc018376@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18347

Modified Files:
	sysfsutils.spec 
Log Message:
rebuild


Index: sysfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sysfsutils.spec	10 Jul 2006 13:00:56 -0000	1.18
+++ sysfsutils.spec	18 Jul 2006 00:07:00 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: sysfsutils, library interface to sysfs.
 Name: sysfsutils
 Version: 2.0.0
-Release: 4 
+Release: 5
 Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-redhatify.patch
 License: GPL
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-5
+- rebuild
+
 * Mon Jul 10 2006 Neil Horman  <nhorman at redhat.com> - 2.0.0-4
 - Obsoleting old sysfsutil-devel package for upgrade path (bz 198054)
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:09:50 -0400
Subject: rpms/tux/devel tux.spec,1.30,1.31
Message-ID: <200607180009.k6I09o5b019006@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18981

Modified Files:
	tux.spec 
Log Message:
rebuild


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tux.spec	12 Jul 2006 05:27:32 -0000	1.30
+++ tux.spec	18 Jul 2006 00:09:47 -0000	1.31
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: User-space component of TUX kernel-based threaded HTTP server
 License: GPL
 Group: System Environment/Daemons
@@ -72,6 +72,9 @@
 %doc tux.README NEWS SUCCESS gettuxconfig checkbindings demo.c demo.tux.so demo2.c demo2.tux.so demo3.c demo3.tux.so demo4.c demo4.tux.so demo5.tux.so samples/sample.log samples/sample.out docs/tux docs/TUXAPI*
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-8
+- rebuild
+
 * Mon Jun  5 2006 Dave Jones <davej at redhat.com>
 - Fix _syscall2 compile failure. (#191828)
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:18:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:18:56 -0400
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.15,1.16
Message-ID: <200607180018.k6I0IuP6004784@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4760

Modified Files:
	xfsprogs.spec 
Log Message:
rebuild


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xfsprogs.spec	12 Jul 2006 08:53:42 -0000	1.15
+++ xfsprogs.spec	18 Jul 2006 00:18:54 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem.
 Name: xfsprogs
 Version: 2.8.4
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -109,7 +109,7 @@
 %{_libdir}/*.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 2.8.4-2
 - rebuild
 
 * Tue Jul 04 2006 Robert Scheck <redhat at linuxnetz.de> 2.8.4-1



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:30:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:30:20 -0400
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.21,1.22
Message-ID: <200607180030.k6I0UKC2016652@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16637

Modified Files:
	pcmciautils.spec 
Log Message:
br changed its name


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pcmciautils.spec	18 Jul 2006 00:02:54 -0000	1.21
+++ pcmciautils.spec	18 Jul 2006 00:30:18 -0000	1.22
@@ -2,14 +2,14 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 4
+Release: 5
 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
 Obsoletes: pcmcia-cs
 Obsoletes: kernel-pcmcia-cs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: sysfsutils-devel >= 1.3.0
+BuildRequires: libsysfs-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 BuildRequires: byacc, flex
 Patch1: pcmciautils-fedora.patch
@@ -43,8 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
-* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 014-4
+* Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 014-5
 - rebuild
+- change br sysfsutils-devel to libsysfs-devel
 
 * Mon Jun 19 2006 Harald Hoyer <harald at redhat.com> - 014-3
 - changed MODALIAS to ENV{MODALIAS} in the rules file



From fedora-cvs-commits at redhat.com  Tue Jul 18 00:50:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 20:50:25 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.15,
	1.16
Message-ID: <200607180050.k6I0oPLW013461@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13361

Modified Files:
	jakarta-commons-lang.spec 
Log Message:

 Added an if block around test failure ignore when gcj support is enabled.




Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-lang.spec	17 Jul 2006 23:08:27 -0000	1.15
+++ jakarta-commons-lang.spec	18 Jul 2006 00:50:22 -0000	1.16
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        2.1
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -89,13 +89,22 @@
 %patch0
 
 %build
-%ant \
-  -Djunit.jar=$(find-jar junit) \
-  -Dfinal.name=%{short_name} \
-  -Djdk.javadoc=%{_javadocdir}/java \
-  -Dtest.failonerror=false \
-  test dist
 
+# FIXME: There are failures with gcj. Ignore them for now.
+%if %{gcj_support}
+  %ant \
+    -Djunit.jar=$(find-jar junit) \
+    -Dfinal.name=%{short_name} \
+    -Djdk.javadoc=%{_javadocdir}/java \
+    -Dtest.failonerror=false \
+    test dist
+%else
+  %ant \
+    -Djunit.jar=$(find-jar junit) \
+    -Dfinal.name=%{short_name} \
+    -Djdk.javadoc=%{_javadocdir}/java \
+    test dist
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -156,6 +165,9 @@
 
 
 %changelog
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp_2fc
+- Added an if block around test failure ignore when gcj support is enabled.
+
 * Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp_1fc
 - Added conditional native compiling.
 - By jkeating: Patched to not use taget= in build.xml



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:20:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:20:26 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.154,
	1.155
Message-ID: <200607180120.k6I1KQQ4004050@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-serv3966

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Jul 17 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_89rh
- Remove BouncyCastle.




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.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- java-1.4.2-gcj-compat.spec	12 Jul 2006 06:29:47 -0000	1.154
+++ java-1.4.2-gcj-compat.spec	18 Jul 2006 01:20:22 -0000	1.155
@@ -14,10 +14,8 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_88rh
+%define release 	40jpp_89rh
 %define cname           java-%{javaver}-%{origin}
-%define bcarchivever	131
-%define bcfullver	1.31
 
 %define	sdklnk		java-%{javaver}-%{origin}
 %define	jrelnk		jre-%{javaver}-%{origin}
@@ -37,9 +35,8 @@
 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
-Source2:	eclipse-ecj-3.1.0_fc-12.jar
-Source3:	ecj.sh.in
+Source1:	eclipse-ecj-3.1.0_fc-12.jar
+Source2:	ecj.sh.in
 Patch0:		java-gcj-compat-static-compile.patch
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
@@ -143,32 +140,13 @@
 make
 
 %if %{custom}
-cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
-sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj-1
+cp -a %{SOURCE1} eclipse-ecj-%{cname}.jar
+sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE2} > ecj-1
 sed 's:eclipse-ecj.jar:eclipse-ecj-%{cname}.jar:g' < ecj-1 > ecj-2
 LIBGCJ_JAR="%{gcj_prefix}/share/java/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar"
 sed "s,compiler.batch.Main,compiler.batch.Main -bootclasspath $LIBGCJ_JAR,g" < ecj-2 > ecj-%{cname}
 %endif
 
-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-%{bcfullver}.jar"
-  files="`find . -type f -name "*.class"`"
-  test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
-
-  # natively compile BouncyCastle
-  mkdir bctmp
-  mv bcprov-%{bcfullver}.jar bctmp
-  # close your eyes...
-  RPM_BUILD_ROOT=bctmp python ../../aot-compile-rpm
-  mv bctmp/bcprov-%{bcfullver}.jar bctmp%{_libdir}/gcj/%{name}/* ../..
-  # (you can open them again now)
-popd
-
 %install
 %if %{custom}
 export PATH=%{gcj_prefix}/bin:$PATH
@@ -211,7 +189,6 @@
 %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
 
 # versionless symlinks
 pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -236,14 +213,6 @@
 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-%{bcfullver}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-install -m755 bcprov-%{bcfullver}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-install -m644 bcprov-%{bcfullver}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-
 # classmap database directory
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
 
@@ -556,12 +525,9 @@
 %if ! %{custom}
 %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
 %endif
-%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar
-%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 %ifarch x86_64
 %{_jvmdir}/%{jredir}/lib/amd64
 %endif
-%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -589,6 +555,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Mon Jul 17 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_89rh
+- Remove BouncyCastle.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.2.0-40jpp_88rh
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:21:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:21:41 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec,1.2,1.3
Message-ID: <200607180121.k6I1Lf8i004411@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4383

Modified Files:
	pam_pkcs11.spec 
Log Message:
rebuild


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pam_pkcs11.spec	10 Jul 2006 22:23:02 -0000	1.2
+++ pam_pkcs11.spec	18 Jul 2006 01:21:39 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        3
+Release:        4
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -146,6 +146,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Jul 17 2006 Jesse Keating  <jkeating at redhat.com>  0.5.3-4
+- rebuild
+
 * Thu Jun 10 2006 Robert Relyea  <rrelyea at redhat.com>  0.5.3-3
 - Updated to 0.5.3 with card_only and NSS support
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:24:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:24:42 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.31, 1.32
Message-ID: <200607180124.k6I1OgwT005364@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5303

Modified Files:
	jakarta-commons-logging.spec 
Log Message:

Added conditional native compiling.




Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-logging.spec	12 Jul 2006 06:29:14 -0000	1.31
+++ jakarta-commons-logging.spec	18 Jul 2006 01:24:40 -0000	1.32
@@ -1,26 +1,69 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name  logging
 %define short_name commons-%{base_name}
-%define name       jakarta-%{short_name}
+%define name jakarta-%{short_name}
 %define section    free
 
 Name:           %{name}
 Version:        1.0.4
-Release: 	2jpp_10fc.1
+Release:        4jpp_1fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/commons/%{base_name}/
-Source0:        http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz
-BuildRequires:  ant, jpackage-utils >= 0:1.5, log4j, avalon-logkit, avalon-framework, junit
-BuildRequires:  coreutils
+#wget http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz
+Source0:        commons-logging-1.0.4-src.tar.gz
+Patch0:		commons-logging-1.0.4-build_xml.patch
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 0:1.6
+BuildRequires:  junit
+BuildRequires:  avalon-logkit
+BuildRequires:	avalon-framework
+BuildRequires:  log4j
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# RHEL3 and FC2
-Obsoletes:      %{short_name} <= 0:1.0.2
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The commons-logging package provides a simple, component oriented
@@ -36,7 +79,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -45,6 +87,7 @@
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%patch0 -b .sav
 
 # -----------------------------------------------------------------------------
 
@@ -54,11 +97,19 @@
 log4j.jar=$(build-classpath log4j)
 log4j12.jar=$(build-classpath log4j)
 logkit.jar=$(build-classpath avalon-logkit)
-avalon-framework.jar=$(build-classpath avalon-framework)
+avalon-framework-api.jar=$(build-classpath avalon-framework)
+avalon-framework-impl.jar=$(build-classpath avalon-framework)
 EOBM
 
 ant compile.tests dist
 
+# FIXME: There are failures with gcj. Ignore them for now.
+%if %{gcj_support}
+  ant -Dtest.failonerror=false test
+%else
+  ant test
+%endif
+
 # -----------------------------------------------------------------------------
 
 %install
@@ -74,33 +125,17 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
-
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
 
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
-%triggerpostun -- commons-logging < 1.1
-pushd %{_javadir} &> /dev/null
-    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
-    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-    ln -sf %{name}-api-%{version}.jar %{short_name}-api-%{version}.jar
-    ln -sf %{short_name}-api-%{version}.jar %{short_name}-api.jar
-popd &> /dev/null
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -112,11 +147,30 @@
 
 # -----------------------------------------------------------------------------
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -125,72 +179,19 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.4-2jpp_10fc.1
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.4-2jpp_10fc
-- stop scriptlet spew
-
-* 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
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0.4-2jpp_7fc
-- rebuilt
-
-* Fri Jul 15 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_6fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_5fc
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
-
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
-
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_2fc
-- BC-compile.
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-4jpp_1fc
+- Added conditional native compiling.
 
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> - 0:1.0.4-2jpp_1fc
-- Sync with RHAPS.
-
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> - 0:1.0.4-1jpp_2fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0.4-2jpp_1rh
-- Merge with more recent upstream version
-
-* Fri Oct 01 2004 Andrew Overholt <overholt at redhat.com> - 0:1.0.4-1jpp_2rh
-- add coreutils BuildRequires
+* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-3jpp
+- Replace avalon-logkit with new excalibur-avalon-logkit
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0.4-2jpp
 - Rebuild with ant-1.6.2
- 
-* Fri Jul 02 2004 Aizaz Ahmed <aahmed at redhat.com> 0:1.0.3-4jpp_4rh
-- Added trigger to restore symlinks that are removed if ugrading
-  from a commons-logging rhug package
-- junitclasspath.patch added to ensure that the tests run correctly
-  regardless of the system classpath
 
 * Thu Jun 24 2004 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:1.0.4-1jpp
 - Update to 1.0.4 (tomcat 5.0.27 wants it)
 - Drop Patch #0 (jakarta-commons-logging-noclasspath.patch), unnecessary
-
-* Fri Apr 02 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.0.3-4jpp_3rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.0.3-4jpp_2rh
-- add RHUG upgrade cleanup
-
-* Thu Mar 04 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.0.3-4jpp_1rh
-- RH vacuuming
-
+ 
 * Tue Jun 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.3-4jpp
 - Drop log4j requirement and manifest Class-Path.
 - Run unit tests during build.



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:26:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:26:47 -0400
Subject: rpms/jakarta-commons-logging/devel
	commons-logging-1.0.4-build_xml.patch, NONE, 1.1
Message-ID: <200607180126.k6I1Qld7006210@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6133

Added Files:
	commons-logging-1.0.4-build_xml.patch 
Log Message:

Adding missing patch to cvs.



commons-logging-1.0.4-build_xml.patch:
 build.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE commons-logging-1.0.4-build_xml.patch ---
--- build.xml.sav	2006-03-30 17:43:01.000000000 +0200
+++ build.xml	2006-03-30 17:45:04.000000000 +0200
@@ -48,7 +48,8 @@
   <property name="junit.jar"               value="${junit.home}/junit.jar"/>
   <property name="log4j.jar"               value="${jakarta.home}/jakarta-log4j/dist/lib/log4j.jar"/>
   <property name="logkit.jar"              value="${jakarta.home}/jakarta-avalon-logkit/build/log/logkit"/>
-  <property name="avalon-framework.jar"    value="../../Avalon-4.1.4/avalon-framework-4.1.4.jar"/>
+  <property name="avalon-framework-api.jar"    value="../../Avalon-4.3/avalon-framework-api-4.3.jar"/>
+  <property name="avalon-framework-impl.jar"    value="../../Avalon-4.3/avalon-framework-impl-4.3.jar"/>
 
 
 <!-- ========== Component Declarations ==================================== -->
@@ -100,7 +101,8 @@
     <pathelement location="${junit.jar}"/>
     <pathelement location="${log4j.jar}"/>
     <pathelement location="${logkit.jar}"/>
-    <pathelement location="${avalon-framework.jar}"/>
+    <pathelement location="${avalon-framework-api.jar}"/>
+    <pathelement location="${avalon-framework-impl.jar}"/>
   </path>
 
 
@@ -114,7 +116,8 @@
     <pathelement location="${junit.jar}"/>
     <pathelement location="${log4j.jar}"/>
     <pathelement location="${logkit.jar}"/>
-    <pathelement location="${avalon-framework.jar}"/>
+    <pathelement location="${avalon-framework-api.jar}"/>
+    <pathelement location="${avalon-framework-impl.jar}"/>
     <pathelement location="${conf.home}"/>
   </path>
 
@@ -171,7 +174,8 @@
     <echo>
     Log4j: ${log4j.jar}
     LogKit: ${logkit.jar}
-    Avalon-Framework: ${avalon-framework.jar}
+    Avalon-Framework API: ${avalon-framework-api.jar}
+    Avalon-Framework Impl: ${avalon-framework-impl.jar}
     </echo>
 
     <mkdir dir="${build.home}"/>
@@ -226,7 +230,7 @@
   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
     <echo>
     *** WARNING ***
-    Avalon-Framework not found: Cannot Build AvalonLogger
+    Avalon-Framework Impl not found: Cannot Build AvalonLogger
     </echo>
   </target>
   



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:45:05 -0400
Subject: rpms/jakarta-commons-collections/devel
	commons-collections-3.1-build_xml.patch, NONE,
	1.1 commons-collections-3.1-jpp-depmap.xml, NONE,
	1.1 commons-collections-3.1-navigation_xml.patch, NONE,
	1.1 commons-collections-3.1-project_properties.patch, NONE,
	1.1 commons-collections-3.1-project_xml.patch, NONE,
	1.1 pom-maven2jpp-depcat.xsl, NONE,
	1.1 pom-maven2jpp-mapdeps.xsl, NONE,
	1.1 pom-maven2jpp-newdepmap.xsl, NONE, 1.1 .cvsignore, 1.6,
	1.7 jakarta-commons-collections.spec, 1.38, 1.39 sources, 1.4, 1.5
Message-ID: <200607180145.k6I1j515011172@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10112

Modified Files:
	.cvsignore jakarta-commons-collections.spec sources 
Added Files:
	commons-collections-3.1-build_xml.patch 
	commons-collections-3.1-jpp-depmap.xml 
	commons-collections-3.1-navigation_xml.patch 
	commons-collections-3.1-project_properties.patch 
	commons-collections-3.1-project_xml.patch 
	pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl 
	pom-maven2jpp-newdepmap.xsl 
Log Message:
Merge patches/sources from 3jpp version of package and disable test-runs 
when run with gcj support. Disable run with maven by default.


commons-collections-3.1-build_xml.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE commons-collections-3.1-build_xml.patch ---
--- ./build.xml.save	2006-07-17 20:16:03.000000000 -0400
+++ ./build.xml	2006-07-17 20:13:25.000000000 -0400
@@ -302,7 +302,7 @@
   <!-- Used to obtain more detailed info on test failures -->
   <target name="test"  depends="compile.tests"
           description="Run all unit test cases">
-    <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+    <junit printsummary="yes" haltonfailure="no" showoutput="yes">
       <formatter type="brief" />
       <classpath>
         <pathelement location="${build.classes}"/>
@@ -331,7 +331,7 @@
   <target name="testjar"  depends="compile.tests,jar"
           description="Run all unit test cases">
     <echo message="Running collections tests against built jar ..."/>
-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes" haltonfailure="no">
       <classpath>
         <pathelement location="${build.jar.name}"/>
         <pathelement location="${build.tests}"/>


--- NEW FILE commons-collections-3.1-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <jar>junit.jar</jar>
         <version>3.8.1</version>
      </jpp>
   </dependency>
</depset>
commons-collections-3.1-navigation_xml.patch:
 navigation.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE commons-collections-3.1-navigation_xml.patch ---
--- xdocs/navigation.xml.sav	2006-04-07 16:14:06.000000000 +0200
+++ xdocs/navigation.xml	2006-04-07 16:14:29.000000000 +0200
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM '../commons-build/menus/menus.dtd'>
 <project name="Collections">
 
   <title>Collections</title>

commons-collections-3.1-project_properties.patch:
 project.properties |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE commons-collections-3.1-project_properties.patch ---
--- project.properties.sav	2006-04-07 16:21:08.000000000 +0200
+++ project.properties	2006-04-07 16:21:20.000000000 +0200
@@ -13,7 +13,7 @@
 #   limitations under the License.
 
 #maven.checkstyle.properties=src/conf/checkstyle.properties
-maven.xdoc.jsl=../commons-build/commons-site.jsl
+maven.xdoc.jsl=commons-build/commons-site.jsl
 maven.xdoc.date=left
 #maven.xdoc.version=${pom.currentVersion}
 maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html

commons-collections-3.1-project_xml.patch:
 project.xml |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE commons-collections-3.1-project_xml.patch ---
--- ./project.xml.sav	2006-07-17 18:35:04.000000000 -0400
+++ ./project.xml	2006-07-17 18:34:31.000000000 -0400
@@ -312,7 +312,6 @@
     	<nagEmailAddress>commons-dev at jakarta.apache.org</nagEmailAddress>
     	<sourceDirectory>src/java</sourceDirectory>
     	<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    	<integrationUnitTestSourceDirectory/>
     	<aspectSourceDirectory/>
 
     	<!-- Unit test classes -->
@@ -322,19 +321,19 @@
       		</includes>
    		</unitTest>
 
-    	<!-- Integration unit test classes -->
-    	<integrationUnitTestPatterns></integrationUnitTestPatterns>
-    
-    	<resources>
-      		<includes>
-       			<include>**/*.properties</include>
-      		</includes>
-    	</resources>
-    	<jars/>
+      <resources>
+         <resource>
+            <directory>${pom.build.sourceDirectory}</directory>
+            <includes>
+               <include>**/*.properties</include>
+            </includes>
+         </resource>
+      </resources>
+
   	</build>
 
   <reports>
-     <report>maven-changelog-plugin</report>
+     <!-- <report>maven-changelog-plugin</report> -->
      <report>maven-changes-plugin</report>
      <!--report>maven-checkstyle-plugin</report-->
      <!--report>maven-clover-plugin</report-->


--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="*[name() != 'dependencies']|*/text()">
     <xsl:apply-templates/>
 </xsl:template>
 <xsl:template match="//dependencies">
  <xsl:for-each select="./dependency">
   <xsl:element name="dependency">
    <xsl:element name="maven">
     <xsl:choose>
      <xsl:when test="./groupId">
       <xsl:copy-of select="./groupId"/>
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-before(./id/text(),':') != ''">
         <xsl:element name="groupId">
          <xsl:value-of select="substring-before(./id/text(),':')"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="groupId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
    <xsl:element name="jpp">
     <xsl:element name="groupId">JPP</xsl:element>
     <xsl:choose>
      <xsl:when test="./artifactId">
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-after(./id/text(),':') != ''">
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:element name="jar">
      <xsl:choose>
       <xsl:when test="./artifactId">
        <xsl:value-of select="./artifactId/text()"/>
       </xsl:when>
       <xsl:when test="./id">
        <xsl:choose>
         <xsl:when test="substring-after(./id/text(),':') != ''">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:when>
         <xsl:otherwise>
          <xsl:value-of select="./id/text()"/>
         </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
ERROR
       </xsl:otherwise>
      </xsl:choose>
      <xsl:choose>
       <xsl:when test="./type">
        <xsl:choose>
         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>.jar</xsl:otherwise>
      </xsl:choose>
     </xsl:element>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
   </xsl:element>
  </xsl:for-each>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:param name="map" /> 
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/project" >
  <xsl:element name="project">
   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
   <xsl:if test="not(./dependencies)">
    <xsl:element name="dependencies">
     <xsl:for-each select="document($map)//add/dependency">
       <xsl:copy-of select="."/>
     </xsl:for-each>
    </xsl:element>
   </xsl:if>
   <xsl:apply-templates select="dependencies"/>
  </xsl:element>
 </xsl:template>
 <xsl:template match="dependencies" >
  <xsl:element name="dependencies">
   <xsl:for-each select="dependency">
    <xsl:if test="./artifactId">
     <xsl:call-template name="replace">
      <xsl:with-param name="artifact" select="./artifactId/text()"/>
     </xsl:call-template>
    </xsl:if>
    <xsl:if test="./id">
     <xsl:choose>
      <xsl:when test="substring-after(./id/text(),':') != ''">
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
       </xsl:call-template>
      </xsl:when>
      <xsl:otherwise>
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="./id/text()"/>
       </xsl:call-template>
      </xsl:otherwise>
     </xsl:choose>
    </xsl:if>
   </xsl:for-each>
   <xsl:for-each select="document($map)//add/dependency">
    <xsl:copy-of select="."/>
   </xsl:for-each>
  </xsl:element>
 </xsl:template>
 <xsl:template name="replace">
  <xsl:param name="artifact"/>
  <xsl:variable name="this" select="."/>
  <xsl:element name="dependency">
   <xsl:choose>
    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
      <xsl:copy-of select="../jpp/*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
     <xsl:copy-of select="./*"/>
    </xsl:otherwise>
   </xsl:choose>
  </xsl:element>
  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
    <xsl:for-each select="../add/dependency">
     <xsl:element name="dependency">
      <xsl:copy-of select="./*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:element>
    </xsl:for-each>
   </xsl:for-each>
  </xsl:if>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
	xmlns:saxon="http://icl.com/saxon"
	extension-element-prefixes="saxon">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/" >
  <xsl:element name="depset">
   <saxon:group select="//dependency" group-by="./maven/artifactId">
    <xsl:sort select="./maven/artifactId"/>
    <xsl:element name="dependency">
     <xsl:element name="maven">
      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
     </xsl:element>
     <xsl:element name="jpp">
      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
     </xsl:element>
    </xsl:element>
    <saxon:item/>
   </saxon:group>
  </xsl:element>
 </xsl:template>
</xsl:stylesheet>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jun 2005 11:52:32 -0000	1.6
+++ .cvsignore	18 Jul 2006 01:45:02 -0000	1.7
@@ -1,4 +1 @@
-commons-collections-3.1-src-RHCLEAN.tar.bz2
-commons-collections-3.1
-i386
-*.src.rpm
+commons-build.tar.gz


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jakarta-commons-collections.spec	12 Jul 2006 06:27:47 -0000	1.38
+++ jakarta-commons-collections.spec	18 Jul 2006 01:45:02 -0000	1.39
@@ -1,31 +1,92 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+%define _without_maven 1
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
 %define base_name	collections
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release 	2jpp_6fc
+%define release 	4jpp_1fc
 %define	section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: 	%{release}
+Release:	%{release}
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
 Group:		Development/Libraries/Java
+#Source0:	http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-3.1-src.tar.gz
 Source0:	%{short_name}-%{version}-src-RHCLEAN.tar.bz2
-Patch1:		%{name}-javadoc-nonet.patch
+Source1:        pom-maven2jpp-depcat.xsl
+Source2:        pom-maven2jpp-newdepmap.xsl
+Source3:        pom-maven2jpp-mapdeps.xsl
+Source4:        commons-collections-3.1-jpp-depmap.xml
+Source5:        commons-build.tar.gz
+
+Patch0:		%{name}-javadoc-nonet.patch
+Patch1:		commons-collections-3.1-project_xml.patch
+Patch2:		commons-collections-3.1-navigation_xml.patch
+Patch3:		commons-collections-3.1-project_properties.patch
+Patch4:		commons-collections-3.1-build_xml.patch
+
 Url:		http://jakarta.apache.org/commons/%{base_name}/
 BuildRequires:	ant
 BuildRequires:	ant-junit
-BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	coreutils
+BuildRequires:	jpackage-utils >= 0:1.6
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+BuildRequires:  saxon
+BuildRequires:  saxon-scripts
+%endif
+%if ! %{gcj_support}
+BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	%{short_name} <= 0:2.1
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Provides:	%{short_name}
+Obsoletes:	%{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The introduction of the Collections API by Sun in JDK 1.2 has been a
@@ -42,55 +103,144 @@
 - methods to test or create typical set-theory properties of collections
 such as union, intersection, and closure.
 
+%package testframework
+Summary:	Testframework for %{name}
+Group:		Development/Testing
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
+%description testframework
+%{summary}.
+
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
-Javadoc for %{name}.
+%{summary}.
+
+%package testframework-javadoc
+Summary:	Javadoc for %{name}-testframework
+Group:		Development/Documentation
+
+%description testframework-javadoc
+%{summary}.
+
+%if %{with_maven}
+%package manual
+Summary:	Documents for %{name}
+Group:		Development/Documentation
+
+%description manual
+%{summary}.
+%endif
 
 %prep
+cat <<EOT
+
+                If you dont want to build with maven,
+                give rpmbuild option '--without maven'
+
+EOT
+
 %setup -q -n %{short_name}-%{version}
-%patch1 -p1
+gzip -dc %{SOURCE5} | tar xf -
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
+%patch0 -p1
+%patch1 -b .sav
+%patch2 -b .sav
+%patch3 -b .sav
+%if %{gcj_support}
+%patch4 -b .sav
+%endif
+
 %build
-ant -Djava.io.tmpdir=. jar javadoc
+%if %{with_maven}
+export DEPCAT=$(pwd)/commons-collections-3.1-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
+echo '<depset>' >> $DEPCAT
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+    popd
+done
+echo >> $DEPCAT
+echo '</depset>' >> $DEPCAT
+/usr/bin/saxon $DEPCAT %{SOURCE2} > commons-collections-3.1-depmap.new.xml
+
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    cp project.xml project.xml.orig
+    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+    popd
+done
+
+export MAVEN_HOME_LOCAL=$(pwd)/.maven
+
+#        -Dmaven.test.failure.ignore=true \
+maven \
+        -Dmaven.repo.remote=file:/usr/share/maven/repository \
+        -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
+        jar:jar javadoc:generate xdoc:transform
+ant tf.javadoc
+%else
+#FIXME Enabling tests with gcj causes memory leaks and can crash build machine!
+%if %{gcj_support}
+#ant -Djava.io.tmpdir=. compile dist tf.javadoc
+ant -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
+%else
+ant -Djava.io.tmpdir=. test dist tf.javadoc
+%endif
+%endif
 
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%if %{with_maven}
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
+%else
 install -m 644 build/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 build/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
+%endif
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
 cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-aot-compile-rpm
+%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+rm -rf target/docs/apidocs
+
+# testframework-javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
+cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
+ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework # ghost symlink
+
+# manual
+%if %{with_maven}
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%endif
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%pre
-rm -f %{_javadir}/%{short_name}*.jar
-rm -f %{_javadir}/%{name}*.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
-%triggerpostun -- commons-collections < 3.0
-pushd %{_javadir} &> /dev/null
-    ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar
-    ln -sf %{short_name}-%{version}.jar %{short_name}.jar
-popd &> /dev/null
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -100,94 +250,117 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post testframework-javadoc
+rm -f %{_javadocdir}/%{name}-testframework
+ln -s %{name}-testframework-%{version} %{_javadocdir}/%{name}-testframework
+
+%postun testframework-javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}-testframework
+fi
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post testframework
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun testframework
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html
-%{_javadir}/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}-%{version}.jar
+%{_javadir}/%{short_name}.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-3.1.jar.*
+%endif
+
+%files testframework
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}-testframework-%{version}.jar
+%{_javadir}/%{name}-testframework.jar
+%{_javadir}/%{short_name}-testframework-%{version}.jar
+%{_javadir}/%{short_name}-testframework.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-collections-testframework-3.1.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1-2jpp_6fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:3.1-2jpp_5fc
-- stop the scriptlet spew
-
-* 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
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+%files testframework-javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-testframework-%{version}
+%ghost %{_javadocdir}/%{name}-testframework
 
-* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_2fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%{_docdir}/%{name}-%{version}
+%endif
 
-* Tue Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_1fc
-- Remove jarfiles from the tarball.
+%changelog
+* Mon Jul 17 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp
+- Add conditional native compilation.
+- Update commons-collections-3.1-project_xml.patch to exclude reference
+  to maven-plugin-changelog which requires netbeans-svc etc.
+- Set test.failonerror to false for ant build.
+- Add patches from 3jpp release of package.
+- Set test.failonerror to false and add patch for build.xml for ant builds
+  with gcj to avoid memory leaks during test runs.
+
+* Fri Apr 07 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.1-3jpp
+- First JPP-1.7 release
+- Activate tests
+- Activate testframework and add -testframework subpackages
+- Add -manual subpackage
+- Build with maven by default
+- Optionally build with straight ant
 
 * Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp
 - Do not fetch stuff from sun.com during javadoc generation.
 - Add build dependency on ant-junit.
 
-* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_5fc
-- Rearrange how BC-compiled stuff is built and installed.
-
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_4fc
-- Add alpha to the list of build architectures (#157522).
-- Use absolute paths for rebuild-gcj-db.
-
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
-
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_2fc
-- BC-compile.
-- Do not fetch stuff from sun.com during javadoc generation.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_1fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:3.1-1jpp_1rh
-- Merge with upstream new version
-
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 0:2.1-4jpp_6rh
-- add coreutils BuildRequires
-
 * Thu Sep 16 2004 Ralph Apel <r.apel at r-apel.de> - 0:3.1-1jpp
 - Upgrade to 3.1
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.1.1-2jpp
 - Rebuild with ant-1.6.2
 
-* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:2.1-4jpp_5rh
-- Added trigger to restore symlinks that are removed if ugrading
-  from a commons-collections rhug package
-
 * Sun Jun 27 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:2.1.1-1jpp
 - Update to 2.1.1
 
-* Fri Apr  2 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_4rh
-- more of the same, for version-suffixed .jar files
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_3rh
-- add RHUG upgrade cleanup
-
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_2rh
-- RH vacuuming part II
-
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_1rh
-- RH vacuuming
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:2.1-4jpp
 - update for JPackage 1.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Jun 2005 11:52:32 -0000	1.4
+++ sources	18 Jul 2006 01:45:02 -0000	1.5
@@ -1 +1 @@
-3d6210f5d37eec3b85b17fa30b486072  commons-collections-3.1-src-RHCLEAN.tar.bz2
+a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 01:56:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 17 Jul 2006 21:56:31 -0400
Subject: rpms/jakarta-commons-collections/devel .cvsignore, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200607180156.k6I1uVQg030245@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29997

Modified Files:
	.cvsignore sources 
Log Message:
Re-add commons-collections-3.1-src-RHCLEAN.tar.bz2 as source.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jul 2006 01:45:02 -0000	1.7
+++ .cvsignore	18 Jul 2006 01:56:29 -0000	1.8
@@ -1 +1,2 @@
 commons-build.tar.gz
+commons-collections-3.1-src-RHCLEAN.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jul 2006 01:45:02 -0000	1.5
+++ sources	18 Jul 2006 01:56:29 -0000	1.6
@@ -1 +1,2 @@
 a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz
+3d6210f5d37eec3b85b17fa30b486072  commons-collections-3.1-src-RHCLEAN.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 05:46:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 01:46:14 -0400
Subject: rpms/gdm/devel gdm-2.15.6-security-tokens.patch, NONE, 1.1 gdm.spec,
	1.176, 1.177 gdm-2.15.5-security-tokens.patch, 1.4, NONE
Message-ID: <200607180546.k6I5kEbI027408@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24659

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.6-security-tokens.patch 
Removed Files:
	gdm-2.15.5-security-tokens.patch 
Log Message:
- make security token support use its own config file in
  preparation for modularizing it.


gdm-2.15.6-security-tokens.patch:
 config/Makefile.am              |   35 +
 config/gdm                      |   16 
 config/gdm-securitytokens       |   10 
 config/gdm.conf.in              |    7 
 configure.ac                    |    3 
 daemon/Makefile.am              |    7 
 daemon/gdm.c                    |  148 +++++++
 daemon/gdm.h                    |    5 
 daemon/gdmconfig.c              |   26 +
 daemon/gdmconfig.h              |    3 
 daemon/securitytoken.c          |  602 ++++++++++++++++++++++++++++
 daemon/securitytoken.h          |  101 ++++
 daemon/securitytokenmonitor.c   |  840 ++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h   |   81 +++
 daemon/verify-pam.c             |    5 
 utils/gdmsecuritytokenmonitor.c |  197 +++++++++
 utils/securitytoken.c           |  573 +++++++++++++++++++++++++++
 utils/securitytoken.h           |   97 ++++
 utils/securitytokenmonitor.c    |  819 +++++++++++++++++++++++++++++++++++++++
 utils/securitytokenmonitor.h    |   82 +++
 20 files changed, 3644 insertions(+), 13 deletions(-)

--- NEW FILE gdm-2.15.6-security-tokens.patch ---
--- gdm-2.15.6/config/Makefile.am
+++ gdm-2.15.6/config/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
 	Xsession.in \
 	gdm \
 	gdm-autologin \
+	gdm-securitytokens \
 	locale.alias \
 	Init.in \
 	PreSession.in \
@@ -34,9 +35,10 @@ EXTRA_DIST = \
 	XKeepsCrashing \
 	gettextfoo.h \
 	gdmprefetchlist.in \
+	securitytokens.conf.in \
 	extract-shell.sh
 
-CLEANFILES = Xsession gdm.conf default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
+CLEANFILES = Xsession gdm.conf default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist securitytokens.conf
 
 Xsession: $(srcdir)/Xsession.in
 	sed	-e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
@@ -67,6 +69,31 @@ gdm.conf: $(srcdir)/gdm.conf.in
 		-e 's,[@]sbindir[@],$(sbindir),g' \
 		<$(srcdir)/gdm.conf.in >gdm.conf
 
+securitytokens.conf: $(srcdir)/securitytokens.conf.in
+	sed	-e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
+		-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
+		-e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \
+		-e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
+		-e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \
+		-e 's,[@]SUSPEND_COMMAND[@],$(SUSPEND_COMMAND),g' \
+		-e 's,[@]XEVIE_OPTION[@],$(XEVIE_OPTION),g' \
+		-e 's,[@]X_CONFIG_OPTIONS[@],$(X_CONFIG_OPTIONS),g' \
+		-e 's,[@]X_SERVER[@],$(X_SERVER),g' \
+		-e 's,[@]X_XNEST_CONFIG_OPTIONS[@],$(X_XNEST_CONFIG_OPTIONS),g' \
+		-e 's,[@]X_XNEST_PATH[@],$(X_XNEST_PATH),g' \
+		-e 's,[@]authdir[@],$(authdir),g' \
+		-e 's,[@]datadir[@],$(datadir),g' \
+		-e 's,[@]dmconfdir[@],$(dmconfdir),g' \
+		-e 's,[@]gdmconfdir[@],$(gdmconfdir),g' \
+		-e 's,[@]libdir[@],$(libdir),g' \
+		-e 's,[@]libexecdir[@],$(libexecdir),g' \
+		-e 's,[@]localedir[@],$(libexecdir),g' \
+		-e 's,[@]logdir[@],$(logdir),g' \
+		-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
+		-e 's,[@]sbindir[@],$(sbindir),g' \
+		<$(srcdir)/securitytokens.conf.in >securitytokens.conf
+
+
 gettextfoo.h: XKeepsCrashing Xsession.in
 	cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
 
@@ -95,7 +122,7 @@ uninstall-hook:
 	$(DESTDIR)$(predir)/Default \
 	$(DESTDIR)$(postdir)/Default
 
-install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession $(DESKTOP_FILES) $(GDMPREFETCHLIST)
+install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession $(DESKTOP_FILES) $(GDMPREFETCHLIST) securitytokens.conf
 	if test '!' -d $(DESTDIR)$(confdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(confdir); \
 		chmod 755 $(DESTDIR)$(confdir); \
@@ -128,6 +155,7 @@ install-data-hook: gdm.conf gdm.conf-cus
 		chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \
 	fi
 	$(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)`
+	$(INSTALL_DATA) securitytokens.conf $(DESTDIR)$(confdir)/securitytokens.conf
 
 	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
@@ -237,6 +265,9 @@ install-data-hook: gdm.conf gdm.conf-cus
 	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \
 		$(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
 	   fi; \
+	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; then \
+		$(INSTALL_DATA) gdm-securitytokens $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; \
+	   fi; \
 	   if test $$system = SunOS; then \
 		echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
 	   fi; \
--- gdm-2.15.6/config/gdm
+++ gdm-2.15.6/config/gdm
@@ -1,8 +1,10 @@
 #%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
-session    optional     pam_console.so
+auth       required    pam_env.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_console.so
+
--- /dev/null
+++ gdm-2.15.6/config/gdm-securitytokens
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required	pam_env.so
+auth       sufficient   pam_pkcs11.so
+auth       required     pam_deny.so
+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.15.6/config/gdm.conf.in
+++ gdm-2.15.6/config/gdm.conf.in
@@ -196,6 +196,10 @@ # How long gdm should wait before it ass
 # kills it.  10 seconds should be long enough for X, but Xgl may need 20 or 25. 
 GdmXserverTimeout=10
 
+# Whether or not to listen for smart card insertion/removal events
+SecurityTokensEnable=true
+SecurityTokensDriver=
+
 [security]
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
@@ -242,6 +246,9 @@ #PasswordRequired=false
 # Specifies the PAM Stack to use, "gdm" by default.
 PamStack=gdm
 
+# Specifies the PAM Stack to use when smart cards are inserted
+SecurityTokensPamStack=gdm-securitytokens
+
 # XDMCP is the protocol that allows remote login.  If you want to log into GDM
 # remotely (I'd never turn this on on open network, use ssh for such remote
 # usage that).  You can then run X with -query <thishost> to log in, or
--- gdm-2.15.6/configure.ac
+++ gdm-2.15.6/configure.ac
@@ -19,6 +19,7 @@ LIBRSVG_REQUIRED=1.1.1
 LIBXML_REQUIRED=2.4.12
 LIBART_REQUIRED=2.3.11
 SCROLLKEEPER_REQUIRED=0.1.4
+NSS_REQUIRED=3.11.1
 
 dnl
 dnl Let the user configure where to look for the configuration files.
@@ -156,7 +157,7 @@ PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $
 AC_SUBST(VICIOUS_CFLAGS)
 AC_SUBST(VICIOUS_LIBS)
 
-PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED)
+PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED nss >= $NSS_REQUIRED)
 AC_SUBST(DAEMON_CFLAGS)
 AC_SUBST(DAEMON_LIBS)
 
--- gdm-2.15.6/daemon/Makefile.am
+++ gdm-2.15.6/daemon/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
 	-DAUTHDIR=\"$(authdir)\"			\
 	-DBINDIR=\"$(bindir)\"				\
 	-DDATADIR=\"$(datadir)\"			\
+	-DSYSCONFDIR=\"$(sysconfdir)\"			\
 	-DDMCONFDIR=\"$(dmconfdir)\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
 	-DGDMLOCALEDIR=\"$(gdmlocaledir)\"		\
@@ -71,7 +72,11 @@ gdm_binary_SOURCES = \
 	gdm-net.c \
 	gdm-net.h \
 	getvt.c \
-	getvt.h
+	getvt.h \
+	securitytoken.c \
+	securitytoken.h \
+	securitytokenmonitor.c \
+	securitytokenmonitor.h
 
 EXTRA_gdm_binary_SOURCES = verify-pam.c verify-crypt.c verify-shadow.c
 
--- gdm-2.15.6/daemon/gdm.c
+++ gdm-2.15.6/daemon/gdm.c
@@ -62,6 +62,8 @@ #include "gdm-net.h"
 #include "cookie.h"
 #include "filecheck.h"
 #include "gdmconfig.h"
+#include "securitytokenmonitor.h"
+#include "securitytoken.h"
 
 #define DYNAMIC_ADD     0
 #define DYNAMIC_RELEASE 1
@@ -71,6 +73,7 @@ #ifdef  HAVE_LOGINDEVPERM
 #include <libdevinfo.h>
 #endif  /* HAVE_LOGINDEVPERM */
 
+
 extern GSList *displays;
 
 /* Local functions */
@@ -80,6 +83,16 @@ static void gdm_handle_message (GdmConne
[...3493 lines suppressed...]
+static void
+sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor)
+{
+
+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING;
+
+    g_idle_add ((GSourceFunc) sc_security_token_monitor_stop_now, monitor);
+}
+
+void 
+sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor)
+{
+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
+	    return;
+
+    if (monitor->priv->is_unstoppable) {
+	    sc_security_token_monitor_queue_stop (monitor);
+	    return;
+    } 
+
+    sc_security_token_monitor_stop_now (monitor);
+}
+
+#ifdef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
+#include <glib.h>
+
+static GMainLoop *event_loop;
+static gboolean should_exit_on_next_remove = FALSE;
+
+static gboolean on_timeout (ScSecurityTokenMonitor *monitor)
+{
+    GError *error;
+    g_print ("Re-enabling monitor.\n");
+
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+    g_print ("Please re-insert security token\n");
+
+    should_exit_on_next_remove = TRUE;
+
+    return FALSE;
+}
+
+static void
+on_device_inserted (ScSecurityTokenMonitor * monitor,
+		    ScSecurityToken *token)
+{
+    g_print ("security token inserted!\n");
+    g_print ("Please remove it.\n");
+}
+
+static void
+on_device_removed (ScSecurityTokenMonitor * monitor,
+		   ScSecurityToken *token)
+{
+    g_print ("security token removed!\n");
+
+    if (should_exit_on_next_remove)
+	    g_main_loop_quit (event_loop);
+    else {
+	    g_print ("disabling monitor for 2 seconds\n");
+	    sc_security_token_monitor_stop (monitor);
+	    g_timeout_add (2000, (GSourceFunc) on_timeout, monitor);
+    }
+}
+
+int 
+main (int   argc, 
+      char *argv[])
+{
+    ScSecurityTokenMonitor *monitor;
+    GError *error;
+
+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+    g_type_init ();
+
+    g_message ("creating instance of 'security token monitor' object...");
+    monitor = sc_security_token_monitor_new (NULL);
+    g_message ("'security token monitor' object created successfully");
+
+    g_signal_connect (monitor, "security-token-inserted",
+		      G_CALLBACK (on_device_inserted), NULL);
+
+    g_signal_connect (monitor, "security-token-removed",
+		      G_CALLBACK (on_device_removed), NULL);
+
+    g_message ("starting listener...");
+
+    error = NULL;
+    if (!sc_security_token_monitor_start (monitor, &error)) {
+	    g_warning ("could not start security token monitor - %s",
+		       error->message);
+	    g_error_free (error);
+	    return 1;
+    }
+
+    event_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (event_loop);
+    g_main_loop_unref (event_loop);
+    event_loop = NULL;
+
+    g_message ("destroying previously created 'security token monitor' object...");
+    g_object_unref (monitor);
+    monitor = NULL;
+    g_message ("'security token monitor' object destroyed successfully");
+
+    return 0;
+}
+#endif
--- /dev/null
+++ gdm-2.15.6/utils/securitytokenmonitor.h
@@ -0,0 +1,82 @@
+/* securitytokenmonitor.h - monitor for security token insertion and
+ *                          removal events
+ *
+ * Copyright (C) 2006 Ray Strode
+ *
+ * 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 SC_SECURITY_TOKEN_MONITOR_H
+#define SC_SECURITY_TOKEN_MONITOR_H
+
+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
+#include "securitytoken.h"
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define SC_TYPE_SECURITY_TOKEN_MONITOR            (sc_security_token_monitor_get_type ())
+#define SC_SECURITY_TOKEN_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor))
+#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_IS_SECURITY_TOKEN_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR))
+#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
+#define SC_SECURITY_TOKEN_MONITOR_ERROR           (sc_security_token_monitor_error_quark ())
+typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor;
+typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass;
+typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate;
+typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError;
+
+struct _ScSecurityTokenMonitor {
+    GObject parent;
+
+    /*< private > */
+    ScSecurityTokenMonitorPrivate *priv;
+};
+
+struct _ScSecurityTokenMonitorClass {
+    GObjectClass parent_class;
+
+    /* Signals */
+    void (*security_token_inserted) (ScSecurityTokenMonitor *monitor,
+				     ScSecurityToken *token);
+    void (*security_token_removed) (ScSecurityTokenMonitor *monitor,
+				    ScSecurityToken *token);
+    void (*error) (ScSecurityTokenMonitor *monitor, 
+		   GError                 *error);
+};
+
+enum _ScSecurityTokenMonitorError {
+    SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
+    SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
+};
+
+GType sc_security_token_monitor_get_type (void) G_GNUC_CONST;
+GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST;
+
+ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module);
+
+
+gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor, 
+				 	  GError                 **error);
+
+void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor);
+
+gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor);
+
+G_END_DECLS
+#endif				/* SC_SECURITY_TOKEN_MONITOR_H */


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- gdm.spec	17 Jul 2006 23:06:11 -0000	1.176
+++ gdm.spec	18 Jul 2006 05:46:11 -0000	1.177
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 6
+Release: 7
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -46,7 +46,7 @@
 Patch18: gdm-2.15.5-process-all-ops.patch
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
-Patch21: gdm-2.15.5-security-tokens.patch
+Patch21: gdm-2.15.6-security-tokens.patch
 Patch22: gdm-2.15.5-session-keyring.patch
 Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
@@ -328,6 +328,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Jul 17 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-7
+- make security token support use its own config file in
+  preparation for modularizing it.
+
 * Mon Jul 17 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-6
 - fix off-by-one in the process-all-ops patch that was causing
   an anoying dialog to pop up on each login


--- gdm-2.15.5-security-tokens.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 05:59:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 01:59:40 -0400
Subject: rpms/gdm/devel gdm-2.15.6-security-tokens.patch,1.1,1.2
Message-ID: <200607180559.k6I5xe0n012056@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11971

Modified Files:
	gdm-2.15.6-security-tokens.patch 
Log Message:
add forgotton file to patch


gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   35 +
 config/gdm                    |   16 
 config/gdm-securitytokens     |   10 
 config/gdm.conf.in            |    7 
 config/securitytokens.conf.in |    4 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |  148 +++++++
 daemon/gdm.h                  |    5 
 daemon/gdmconfig.c            |   26 +
 daemon/gdmconfig.h            |    3 
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    5 
 16 files changed, 1880 insertions(+), 13 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.6-security-tokens.patch	18 Jul 2006 05:46:11 -0000	1.1
+++ gdm-2.15.6-security-tokens.patch	18 Jul 2006 05:59:38 -0000	1.2
@@ -2106,1787 +2106,11 @@
      if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
  	    if (started_timer)
  		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
-deleted file mode 100644
 --- /dev/null
-+++ gdm-2.15.6/utils/gdmsecuritytokenmonitor.c
-@@ -0,0 +1,197 @@
-+/* GDM Security Token monitor 
-+ * 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 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 "config.h"
-+
-+#include <locale.h>
-+#include <syslog.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+
-+#include "securitytokenmonitor.h"
-+
-+static gchar *pkcs11_module;
-+static GOptionEntry options[] = {
-+	{
-+		"pkcs11-module", 0, 0, G_OPTION_ARG_STRING, &pkcs11_module,
-+		N_("PKCS#11 driver for security token"),
-+		N_("MODULE")
-+	},
-+	{ NULL }
-+};
-+
-+static typedef struct 
-+{
-+    ScSecurityMonitor *monitor;
-+    GMainLoop *event_loop;
-+} Daemon;
-+
-+static Daemon *daemon_new (void);
-+static void daemon_free (Monitor *monitor);
-+
-+static void gdm_handle_security_token_insertion (ScSecurityTokenMonitor *monitor,
-+						 ScSecurityToken *token);
-+static void gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+					       ScSecurityToken *token);
-+static void gdm_watch_for_security_tokens (const gchar *driver);
-+
-+static Daemon *
-+daemon_new (const gchar *driver)
-+{
-+    Daemon *daemon;
-+
-+
-+    daemon = g_slice_new0 (Daemon);
-+    daemon->event_loop = g_main_loop_new (NULL, FALSE);
-+
-+    return daemon;
-+}
-+
-+static gboolean
-+daemon_run (Daemon *daemon)
-+{
-+    pid_t pid;
-+    pid = fork ();
-+
-+    if (pid < 0)
-+	    return FALSE;
-+
-+    if (pid != 0) {
-+	    gint status;
-+
-+	    waitpid (pid, &status, 0);
-+	    _exit (status);
-+    }
-+
-+    daemon ();
-+
-+    gdm_watch_for_security_tokens (pkcs11_module);
-+    g_main_loop_run (daemon->event_loop);
-+
-+    return TRUE;
-+}
-+
-+static void 
-+monitor_free (Monitor *monitor)
-+{
-+    if (daemon->loop != NULL) {
-+	    g_main_loop_unref (daemon->loop);
-+	    daemon->loop = NULL;
-+    }
-+    g_slice_free1 (Monitor, monitor);
-+}
-+
-+static void
-+gdm_handle_security_token_insertion (ScSecurityTokenMonitor *monitor,
-+				     ScSecurityToken        *token)
-+{
-+    GSList *li;
-+
-+    g_debug ("notifying local displays about token insertion");
-+#if 0
-+    for (li = displays; li != NULL; li = li->next) {
-+	    GdmDisplay *d = li->data;
-+
-+	    if (SERVER_IS_LOCAL (d)) {
-+		    g_debug ("notifying display '%s'", d->name);
-+		    send_slave_command (d, GDM_NOTIFY_RESET);
-+	    } else {
-+		    g_debug ("display '%s' is not local", d->name);
-+	    }
-+    }
-+#endif
-+}
-+
-+static void
-+gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+				   ScSecurityToken        *token)
-+{
-+    GSList *li;
-+
-+    g_debug ("notifying local displays about token removal");
-+#if 0
-+    for (li = displays; li != NULL; li = li->next) {
-+	    GdmDisplay *d = li->data;
-+
-+	    if (SERVER_IS_LOCAL (d)) {
-+		    g_debug ("notifying display '%s'", d->name);
-+		    send_slave_command (d, GDM_NOTIFY_RESET);
-+	    } else {
-+		    g_debug ("display '%s' is not local", d->name);
-+	    }
-+    }
-+#endif
-+}
-+
-+static void
-+gdm_watch_for_security_tokens (const gchar *driver)
-+{
-+    GError *error;
-+    ScSecurityTokenMonitor *monitor;
-+
-+    g_debug ("watching for security token insertion and removal events");
-+
-+    monitor = sc_security_token_monitor_new (driver);
-+    g_signal_connect (monitor,
-+		      "security-token-inserted",
-+		      G_CALLBACK (gdm_handle_security_token_insertion), NULL);
-+
-+    g_signal_connect (monitor,
-+		      "security-token-removed",
-+		      G_CALLBACK (gdm_handle_security_token_removal), NULL);
-+    error = NULL;
-+    if (!sc_security_token_monitor_start (monitor, 
-+					  &error)) {
-+	    if (error != NULL) {
-+		    syslog (LOG_ERR, "%s", error->message);
-+		    g_error_free (error);
-+	    } else {
-+		    syslog (LOG_ERR, "could not start security token monitor");
-+
-+	    }
-+    }
-+}
-+
-+gint 
-+main (gint    argc, 
-+      gchar **argv)
-+{
-+    Daemon *daemon;
-+    GOptionContext *options_context;
-+
-+    setlocale (LC_ALL, "");
-+    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-+    textdomain (GETTEXT_PACKAGE);
-+
-+    g_type_init ();
-+
-+    options_context = g_option_context_new (_("- helps gdm monitor for security "
-+					      "token insertion and deletion events"));
-+    g_option_context_add_main_entries (options_context, options, GETTEXT_PACKAGE);
-+    g_option_context_parse (options_context, &argc, &argv, NULL);
-+    g_option_context_free (options_context);
-+
-+    openlog ("gdm[security-token-monitor]", 0, LOG_DAEMON);
-+    daemon = daemon_new ();
-+
-+    if (!daemon_run ())
-+	    return 1;
-+
-+    daemon_free (daemon);
-+    return 0;
-+}
---- /dev/null
-+++ gdm-2.15.6/utils/securitytoken.c
-@@ -0,0 +1,573 @@
-+/* securitytoken.c - security token
-+ * 
-+ * 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.  
-+ *
-+ * TODO:     - doing this per project is a bad idea i think.
-+ *             We should probably make this a system service 
-+ *             and use dbus.
-+ *
-+ *           - We hardcode a driver right now.  We should probably
-+ *             look up the default list and go from there. 
-+ */
-+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
-+#include "securitytoken.h"
-+
-+#include <errno.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+
-+#include <cert.h>
-+#include <nss.h>
-+#include <pk11func.h>
-+#include <prerror.h>
-+#include <secmod.h>
-+#include <secerr.h>
-+
-+/* wtf
-+ */
-+#include "/tmp/certhtml.c"
-+
-+#if defined (SC_SECURITY_TOKEN_ENABLE_TEST) || defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
-+#define sc_debug(format, args...) g_printerr (format "\n", ##args)
-+#define sc_warning(format, args...) g_printerr (format "\n", ##args)
-+#else
-+#define sc_debug(format, args...) 
-+#define sc_warning(format, args...) 
-+#endif
-+
-+struct _ScSecurityTokenPrivate {
-+	SECMODModule *module;
-+	ScSecurityTokenState state;
-+
-+	CK_SLOT_ID slot_id;
-+	gint slot_series;
-+
-+	PK11SlotInfo *slot;
-+
-+	CERTCertificate *signing_certificate;
-+	CERTCertificate *encryption_certificate;
-+};
-+
-+static void sc_security_token_finalize (GObject *object);
-+static void sc_security_token_class_install_signals (ScSecurityTokenClass *token_class);
-+static void sc_security_token_class_install_properties (ScSecurityTokenClass *token_class);
-+static void sc_security_token_set_property (GObject       *object,
-+					    guint          prop_id,
-+					    const GValue  *value,
-+					    GParamSpec    *pspec);
-+static void sc_security_token_get_property (GObject     *object,
-+					    guint        prop_id,
-+					    GValue      *value,
-+					    GParamSpec  *pspec);
-+
-+static void sc_security_token_set_slot_id (ScSecurityToken *token, 
-+					   gint             slot_id);
-+static void sc_security_token_set_slot_series (ScSecurityToken *token, 
-+					       gint             slot_series);
-+static void sc_security_token_set_module (ScSecurityToken *token,
-+					  SECMODModule    *module);
-+
-+static PK11SlotInfo *sc_security_token_find_slot_from_id (ScSecurityToken *token,
-+							  gint slot_id);
-+static gboolean sc_security_token_fetch_certificates (ScSecurityToken *token);
-+
-+
-+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_ID 
-+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_ID ((gulong) -1)
-+#endif
-+
-+#ifndef SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES
-+#define SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES -1
-+#endif
-+
-+enum {
-+	PROP_0 = 0,
-+	PROP_SLOT_ID,
-+	PROP_SLOT_SERIES,
-+	PROP_MODULE,
-+	NUMBER_OF_PROPERTIES
-+};
-+
-+enum {
-+	INSERTED,
-+	REMOVED,
-+	NUMBER_OF_SIGNALS
-+};
-+
-+static guint sc_security_token_signals[NUMBER_OF_SIGNALS];
-+
-+G_DEFINE_TYPE (ScSecurityToken, sc_security_token, G_TYPE_OBJECT);
-+
-+static void
-+sc_security_token_class_init (ScSecurityTokenClass *token_class)
-+{
-+    GObjectClass *gobject_class;
-+
-+    gobject_class = G_OBJECT_CLASS (token_class);
-+
-+    gobject_class->finalize = sc_security_token_finalize;
-+
-+    sc_security_token_class_install_signals (token_class);
-+    sc_security_token_class_install_properties (token_class);
-+
-+    g_type_class_add_private (token_class,
-+			      sizeof (ScSecurityTokenPrivate));
-+}
-+
-+static void
-+sc_security_token_class_install_signals (ScSecurityTokenClass *token_class)
-+{
-+    GObjectClass *object_class;
-+
-+    object_class = G_OBJECT_CLASS (token_class);
-+
-+    sc_security_token_signals[INSERTED] =
-+	    g_signal_new ("inserted",
-+			  G_OBJECT_CLASS_TYPE (object_class),
-+			  G_SIGNAL_RUN_LAST,
-+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
-+					   inserted), 
-+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
-+			  G_TYPE_NONE, 0);
-+    token_class->inserted = NULL;
-+
-+    sc_security_token_signals[REMOVED] =
-+	    g_signal_new ("removed",
-+			  G_OBJECT_CLASS_TYPE (object_class),
-+			  G_SIGNAL_RUN_LAST,
-+			  G_STRUCT_OFFSET (ScSecurityTokenClass,
-+					   removed), 
-+			  NULL, NULL, g_cclosure_marshal_VOID__VOID, 
-+			  G_TYPE_NONE, 0);
-+    token_class->removed = NULL;
-+}
-+
-+static void
-+sc_security_token_class_install_properties (ScSecurityTokenClass *token_class)
-+{
-+    GObjectClass *object_class;
-+    GParamSpec *param_spec;
-+
-+    object_class = G_OBJECT_CLASS (token_class);
-+    object_class->set_property = sc_security_token_set_property;
-+    object_class->get_property = sc_security_token_get_property;
-+
-+    param_spec = g_param_spec_ulong ("slot-id", _("Slot ID"),
-+				   _("The slot the token is in"),
-+				   1, G_MAXULONG,
-+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_ID,
-+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-+    g_object_class_install_property (object_class, PROP_SLOT_ID, param_spec);
-+
-+    param_spec = g_param_spec_int ("slot-series", _("Slot Series"),
-+				   _("per-slot token identifier"),
-+				   -1, G_MAXINT,
-+				   SC_SECURITY_TOKEN_DEFAULT_SLOT_SERIES,
-+				   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-+    g_object_class_install_property (object_class, PROP_SLOT_SERIES, param_spec);
-+
-+    /* FIXME: maybe make this a boxed type?
-+     */
-+    param_spec = g_param_spec_pointer ("module", _("Module"),
-+				       _("security token driver"),
-+				       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
-+    g_object_class_install_property (object_class, PROP_MODULE, param_spec);
-+}
-+
-+static void 
-+sc_security_token_set_property (GObject       *object,
-+				guint          prop_id,
-+				const GValue  *value,
-+				GParamSpec    *pspec)
-+{
-+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
-+
-+    switch (prop_id)
-+    {
-+	    case PROP_SLOT_ID:
-+		    sc_security_token_set_slot_id (token, 
-+						   g_value_get_ulong (value));
-+		    break;
-+
-+	    case PROP_SLOT_SERIES:
-+		    sc_security_token_set_slot_series (token, 
-+						       g_value_get_int (value));
-+		    break;
-+
-+	    case PROP_MODULE:
-+		    sc_security_token_set_module (token, 
-+						  (SECMODModule *)
-+						  g_value_get_pointer (value));
-+		    break;
-+
-+	    default:
-+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+CK_SLOT_ID
-+sc_security_token_get_slot_id (ScSecurityToken *token)
-+{
-+    return token->priv->slot_id;
-+}
-+
-+static void 
-+sc_security_token_get_property (GObject    *object,
-+				guint        prop_id,
-+				GValue      *value,
-+				GParamSpec  *pspec)
-+{
-+    ScSecurityToken *token = SC_SECURITY_TOKEN (object);
-+
-+    switch (prop_id)
-+    {
-+	    case PROP_SLOT_ID:
-+		    g_value_set_ulong (value, 
-+				       (gulong) sc_security_token_get_slot_id (token));
-+		    break;
-+
-+	    case PROP_SLOT_SERIES:
-+		    g_value_set_int (value, 
-+				     sc_security_token_get_slot_series (token));
-+		    break;
-+
-+	    default:
-+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+void
-+sc_security_token_set_slot_id (ScSecurityToken *token,
-+			       gint             slot_id)
-+{
-+    if (token->priv->slot_id != slot_id)
-+    {
-+	    token->priv->slot_id = slot_id;
-+
-+	    token->priv->slot = sc_security_token_find_slot_from_id (token,
-+								     token->priv->slot_id);
-+
-+	    g_object_notify (G_OBJECT (token), "slot-id");
-+    }
-+}
-+
-+void
-+sc_security_token_set_slot_series (ScSecurityToken *token,
-+				   gint             slot_series)
-+{
-+    if (token->priv->slot_series != slot_series)
-+    {
-+	    token->priv->slot_series = slot_series;
-+	    g_object_notify (G_OBJECT (token), "slot-series");
-+    }
-+}
-+
-+static void
-+sc_security_token_set_module (ScSecurityToken *token,
-+			      SECMODModule    *module)
-+{
-+    gboolean should_notify;
-+
-+    if (token->priv->module != module)
-+	    should_notify = TRUE;
-+    else
-+	    should_notify = FALSE;
-+
-+    if (token->priv->module != NULL) {
-+	    SECMOD_DestroyModule (token->priv->module);
-+	    token->priv->module = NULL;
-+    }
-+
-+    if (module != NULL)
-+	    token->priv->module = SECMOD_ReferenceModule (module);
-+
-+    if (should_notify)
-+	    g_object_notify (G_OBJECT (token), "module");
-+}
-+
-+gint 
-+sc_security_token_get_slot_series (ScSecurityToken *token)
-+{
-+    return token->priv->slot_series;
-+}
-+
-+static void
-+sc_security_token_init (ScSecurityToken *token)
-+{
-+
-+    sc_debug ("initializing security token ");
-+
-+    token->priv = G_TYPE_INSTANCE_GET_PRIVATE (token,
-+					       SC_TYPE_SECURITY_TOKEN,
-+					       ScSecurityTokenPrivate);
-+}
-+
-+static void sc_security_token_finalize (GObject *object)
-+{
-+    ScSecurityToken *token;
-+    GObjectClass *gobject_class;
-+
-+    token = SC_SECURITY_TOKEN (object);
-+
-+    sc_security_token_set_module (token, NULL);
-+
-+    gobject_class =
-+	    G_OBJECT_CLASS (sc_security_token_parent_class);
-+
-+    gobject_class->finalize (object);
-+}
-+
-+GQuark sc_security_token_error_quark (void)
-+{
-+    static GQuark error_quark = 0;
-+
-+    if (error_quark == 0)
-+	    error_quark = g_quark_from_static_string ("sc-security-token-error-quark");
-+
-+    return error_quark;
-+}
-+
-+ScSecurityToken *
-+_sc_security_token_new (SECMODModule *module,
-+			CK_SLOT_ID    slot_id,
-+			gint          slot_series)
-+{
-+    ScSecurityToken *token;
-+
-+    g_return_val_if_fail (module != NULL, NULL);
-+    g_return_val_if_fail (slot_id >= 1, NULL);
-+    g_return_val_if_fail (slot_series > 0, NULL);
-+    g_return_val_if_fail (sizeof (gulong) == sizeof (slot_id), NULL);
-+
-+    token = SC_SECURITY_TOKEN (g_object_new (SC_TYPE_SECURITY_TOKEN,
-+					     "module", module,
-+					     "slot-id", (gulong) slot_id,
-+					     "slot-series", slot_series,
-+					     NULL));
-+    return token;
-+}
-+
-+void 
-+_sc_security_token_set_state (ScSecurityToken      *token,
-+			      ScSecurityTokenState  state)
-+{
-+    sc_security_token_fetch_certificates (token);
-+    if (token->priv->state != state)
-+    {
-+	    token->priv->state = state;
-+
-+	    if (state == SC_SECURITY_TOKEN_STATE_INSERTED) {
-+		    g_signal_emit (token, sc_security_token_signals[INSERTED], 0);
-+	    } else if (state == SC_SECURITY_TOKEN_STATE_REMOVED)
-+		    g_signal_emit (token, sc_security_token_signals[REMOVED], 0);
-+	    else
-+		    g_assert_not_reached ();
-+    }
-+}
-+
-+/* So we could conceivably make the closure data a pointer to the token
-+ * or something similiar and then emit signals when we want passwords,
-+ * but it's probably easier to just get the password up front and use
-+ * it.  So we just take the passed in g_malloc'd (well probably, who knows)
-+ * and strdup it using NSPR's memory allocation routines.
-+ */
-+static char *
-+sc_security_token_password_handler (PK11SlotInfo *slot, 
-+				    PRBool        is_retrying, 
-+				    const gchar  *password)
-+{
-+    if (is_retrying)
-+	    return NULL;
-+
-+    return password != NULL? PL_strdup (password): NULL;
-+}
-+
-+gboolean
-+sc_security_token_unlock (ScSecurityToken *token,
-+			  const gchar     *password)
-+{   
-+    SECStatus status;
-+
-+    PK11_SetPasswordFunc ((PK11PasswordFunc) sc_security_token_password_handler);
-+
-+    /* we pass PR_TRUE to load certificates
-+     */
-+    status = PK11_Authenticate (token->priv->slot, PR_TRUE, (gpointer) password);
-+
-+    if (status != SECSuccess) {
-+	    sc_debug ("could not unlock token - %d", status);
-+	    return FALSE;
-+    }
-+    return TRUE;
-+}
-+
-+static PK11SlotInfo *
-+sc_security_token_find_slot_from_id (ScSecurityToken *token,
-+                                     gint slot_id)
-+{
-+    int i;
-+
-+    for (i = 0; i < token->priv->module->slotCount; i++)
-+	    if (PK11_GetSlotID (token->priv->module->slots[i]) == slot_id)
-+		    return token->priv->module->slots[i];
-+
-+    return NULL;
-+}
-+
-+static gboolean
-+sc_security_token_fetch_certificates (ScSecurityToken *token)
-+{
-+    PK11SlotInfo *slot;
-+    CERTCertList *certificates;
-+    CERTCertListNode *node;
-+    SECStatus status;
-+    int i;
-+
-+    sc_security_token_unlock (token, "0000");
-+
-+    sc_debug ("fetching certificates for token in slot %lu",
-+	      token->priv->slot_id);
-+
-+    slot = sc_security_token_find_slot_from_id (token,
-+						token->priv->slot_id);
-+
-+    g_assert (PK11_GetSlotID (slot) == token->priv->slot_id);
-+
-+    if (i == token->priv->module->slotCount) {
-+	    sc_debug ("could not find slot %lu", token->priv->slot_id);
-+	    return FALSE;
-+    }
-+
-+    certificates = PK11_ListCertsInSlot (slot);
-+
-+    sc_debug ("filtering out non-user certificates");
-+    if (CERT_FilterCertListForUserCerts (certificates) != SECSuccess) {
-+	    CERT_DestroyCertList (certificates);
-+	    sc_debug ("could not filter out non-user certificates");
-+	    return FALSE;
-+    }
-+
-+    for (node = CERT_LIST_HEAD (certificates); 
-+	 !CERT_LIST_END (node, certificates);
-+	 node = CERT_LIST_NEXT(node)) {
-+
-+	    SECCertificateUsage cert_usages;
-+
-+	    sc_debug ("verifying certificate for use");
-+	    status = CERT_VerifyCertificateNow (NULL, node->cert, TRUE, 
-+						0, NULL, &cert_usages);
-+
-+	    if (status != SECSuccess) {
-+		    sc_debug ("could not be verified, skipping...");
-+		    continue;
-+	    }
-+
-+	    sc_debug ("got cert with usages 0x%x", cert_usages);
-+
-+	    if (token->priv->encryption_certificate == NULL) {
-+
-+		    sc_debug ("checking if certificate can be used for data "
-+			      "encryption");
-+		    status = CERT_CheckCertUsage (node->cert, 
-+						  KU_DATA_ENCIPHERMENT);
-+
-+		    if (status == SECSuccess) {
-+			    token->priv->encryption_certificate = 
-+				    CERT_DupCertificate (node->cert);
-+			    sc_debug ("using encryption certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
-+		    } else {
-+			    sc_debug ("certificate can not be used for encryption");
-+		    }
-+	    }
-+
-+	    if (token->priv->signing_certificate == NULL) {
-+
-+		    sc_debug ("checking if certificate can be used for data "
-+			      "signing");
-+		    status = CERT_CheckCertUsage (node->cert, 
-+						  KU_DIGITAL_SIGNATURE);
-+
-+		    if (status == SECSuccess) {
-+			    token->priv->signing_certificate = 
-+				    CERT_DupCertificate (node->cert);
-+
-+			    sc_debug ("using signing certificate:\n%s", 
-+				      CERT_HTMLCertInfo (node->cert, PR_FALSE, PR_TRUE));
-+		    } else {
-+			    sc_debug ("certificate can not be used for signing things");
-+		    }
-+	    }
-+    }
-+    return TRUE;
-+}
-+
-+ScSecurityTokenRequest *
-+sc_security_token_upload_data (ScSecurityToken *token,
-+			       const gchar     *key,
-+			       const gchar     *data)
-+{
-+    return NULL;
-+}
-+
-+ScSecurityTokenRequest *
-+sc_security_token_download_data (ScSecurityToken *token,
-+				 const gchar     *key)
-+{
-+    return NULL;
-+}
-+
-+ScSecurityTokenRequest *
-+sc_security_token_delete_data (ScSecurityToken *token,
-+			       const gchar     *key)
-+{
-+    return NULL;
-+}
-+
-+#ifdef SC_SECURITY_TOKEN_ENABLE_TEST
-+#include <glib.h>
-+
-+static GMainLoop *event_loop;
-+
-+int 
-+main (int   argc, 
-+      char *argv[])
-+{
-+    ScSecurityToken *token;
-+    GError *error;
-+
-+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
-+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-+
-+    g_type_init ();
-+
-+    g_message ("creating instance of 'security token' object...");
-+    token = _sc_security_token_new (NULL, 1, 1);
-+    g_message ("'security token' object created successfully");
-+
-+    g_message ("destroying previously created 'security token' object...");
-+    g_object_unref (token);
-+    token = NULL;
-+    g_message ("'security token' object destroyed successfully");
-+
-+    return 0;
-+}
-+#endif
---- /dev/null
-+++ gdm-2.15.6/utils/securitytoken.h
-@@ -0,0 +1,97 @@
-+/* securitytoken.h - api for reading and writing data to a security token 
-+ *
-+ * Copyright (C) 2006 Ray Strode
-+ *
-+ * 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 SC_SECURITY_TOKEN_H
-+#define SC_SECURITY_TOKEN_H
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+#include <secmod.h>
-+
-+G_BEGIN_DECLS
-+#define SC_TYPE_SECURITY_TOKEN            (sc_security_token_get_type ())
-+#define SC_SECURITY_TOKEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityToken))
-+#define SC_SECURITY_TOKEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
-+#define SC_IS_SECURITY_TOKEN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN))
-+#define SC_IS_SECURITY_TOKEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN))
-+#define SC_SECURITY_TOKEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN, ScSecurityTokenClass))
-+#define SC_SECURITY_TOKEN_ERROR           (sc_security_token_error_quark ())
-+typedef struct _ScSecurityTokenClass ScSecurityTokenClass;
-+typedef struct _ScSecurityToken ScSecurityToken;
-+typedef struct _ScSecurityTokenPrivate ScSecurityTokenPrivate;
-+typedef enum _ScSecurityTokenError ScSecurityTokenError;
-+typedef enum _ScSecurityTokenState ScSecurityTokenState;
-+
-+typedef struct _ScSecurityTokenRequest ScSecurityTokenRequest;
-+
-+struct _ScSecurityToken {
-+    GObject parent;
-+
-+    /*< private > */
-+    ScSecurityTokenPrivate *priv;
-+};
-+
-+struct _ScSecurityTokenClass {
-+    GObjectClass parent_class;
-+
-+    void (* inserted) (ScSecurityToken *token);
-+    void (* removed) (ScSecurityToken *token);
-+};
-+
-+enum _ScSecurityTokenError {
-+    SC_SECURITY_TOKEN_ERROR_GENERIC = 0,
-+};
-+
-+enum _ScSecurityTokenState {
-+    SC_SECURITY_TOKEN_STATE_INSERTED = 0,
-+    SC_SECURITY_TOKEN_STATE_REMOVED,
-+};
-+
-+GType sc_security_token_get_type (void) G_GNUC_CONST;
-+GQuark sc_security_token_error_quark (void) G_GNUC_CONST;
-+
-+CK_SLOT_ID sc_security_token_get_slot_id (ScSecurityToken *token);
-+gint sc_security_token_get_slot_series (ScSecurityToken *token);
-+
-+gboolean sc_security_token_unlock (ScSecurityToken *token,
-+				   const gchar     *password);
-+
-+ScSecurityTokenRequest *sc_security_token_upload_data (ScSecurityToken *token,
-+						       const gchar     *key,
-+						       const gchar     *data);
-+
-+ScSecurityTokenRequest *sc_security_token_download_data (ScSecurityToken *token,
-+							 const gchar     *key);
-+
-+ScSecurityTokenRequest *sc_security_token_delete_data (ScSecurityToken *token,
-+						       const gchar     *key);
-+
-+/* don't under any circumstances call these functions */
-+#ifdef SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
-+
-+ScSecurityToken *_sc_security_token_new (SECMODModule *module,
-+					 CK_SLOT_ID slot_id, 
-+					 gint slot_series);
-+void _sc_security_token_set_state (ScSecurityToken      *token,
-+				   ScSecurityTokenState  state);
-+#endif 
-+
-+G_END_DECLS
-+#endif				/* SC_SECURITY_TOKEN_H */
---- /dev/null
-+++ gdm-2.15.6/utils/securitytokenmonitor.c
-@@ -0,0 +1,819 @@
-+/* securitytokenmonitor.c - monitor for security token insertion and
-+ *                          removal events
-+ * 
-+ * 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.  
-+ *
-+ * TODO:     - doing this per project is a bad idea i think.
-+ *             We should probably make this a system service 
-+ *             and use dbus.
-+ *
-+ *           - We hardcode a driver right now.  We should probably
-+ *             look up the default list and go from there. 
-+ */
-+#include "securitytokenmonitor.h"
-+
-+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
-+#include "securitytoken.h"
-+
-+#include <errno.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+
-+#include <prerror.h>
-+#include <nss.h>
-+#include <pk11func.h>
-+#include <secmod.h>
-+#include <secerr.h>
-+
-+#include "marshal.h"
-+
-+#ifndef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
-+#include "misc.h"
-+#endif
-+
-+#ifndef SC_SECURITY_TOKEN_MONITOR_DRIVER
-+#define SC_SECURITY_TOKEN_MONITOR_DRIVER LIBDIR"/pkcs11/libcoolkeypk11.so"
-+#endif
-+
-+#ifndef SC_SECURITY_TOKEN_MONITOR_NSS_DB
-+#define SC_SECURITY_TOKEN_MONITOR_NSS_DB SYSCONFDIR"/pki/nssdb"
-+#endif 
-+
-+#ifndef SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL
-+#define SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL 100	/* ms */
-+#endif
-+
-+#ifndef sc_debug
-+#ifdef gdm_debug
-+#define sc_debug(fmt, args...) gdm_debug(fmt, ##args)
-+#elif defined (SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST)
-+#define sc_debug(fmt, args...) g_printerr(fmt "\n", ##args)
-+#else
-+#define sc_debug(fmt, args...) 
-+#endif
-+#endif
-+
-+typedef enum _ScSecurityTokenMonitorState ScSecurityTokenMonitorState;
-+
-+enum _ScSecurityTokenMonitorState {
-+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED = 0,
-+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTING,
-+	SC_SECURITY_TOKEN_MONITOR_STATE_STARTED,
-+	SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING,
-+};
-+
-+struct _ScSecurityTokenMonitorPrivate {
-+	ScSecurityTokenMonitorState state;
-+
-+	gchar        *module_path;
-+	SECMODModule *module;
-+	GHashTable *security_tokens;
-+
-+	guint32 nss_is_loaded : 1;
-+	guint32 is_unstoppable : 1;
-+
-+	guint poll_timeout_id;
-+};
-+
-+static void sc_security_token_monitor_finalize (GObject *object);
-+static void sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *service_class);
-+static void sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *service_class);
-+static void sc_security_token_monitor_set_property (GObject       *object,
-+						    guint          prop_id,
-+						    const GValue  *value,
-+						    GParamSpec    *pspec);
-+static void sc_security_token_monitor_get_property (GObject    *object,
-+						    guint       prop_id,
-+						    GValue     *value,
-+						    GParamSpec *pspec);
-+
-+static void
-+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
-+					   const gchar            *module_path);
-+
-+
-+static void sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
-+							     ScSecurityToken        *token);
-+static void sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor_class,
-+							      ScSecurityToken        *token);
-+static gboolean sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor);
-+
-+static void sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor);
-+
-+enum {
-+	PROP_0 = 0,
-+	PROP_MODULE_PATH,
-+	NUMBER_OF_PROPERTIES
-+};
-+
-+enum {
-+	SECURITY_TOKEN_INSERTED = 0,
-+	SECURITY_TOKEN_REMOVED,
-+	ERROR,
-+	NUMBER_OF_SIGNALS
-+};
-+
-+static guint sc_security_token_monitor_signals[NUMBER_OF_SIGNALS];
-+
-+G_DEFINE_TYPE (ScSecurityTokenMonitor, 
-+	       sc_security_token_monitor, 
-+	       G_TYPE_OBJECT);
-+
-+static void
-+sc_security_token_monitor_class_init (ScSecurityTokenMonitorClass *monitor_class)
-+{
-+    GObjectClass *gobject_class;
-+
-+    gobject_class = G_OBJECT_CLASS (monitor_class);
-+
-+    gobject_class->finalize = sc_security_token_monitor_finalize;
-+
-+    sc_security_token_monitor_class_install_signals (monitor_class);
-+    sc_security_token_monitor_class_install_properties (monitor_class);
-+
-+    g_type_class_add_private (monitor_class,
-+			      sizeof (ScSecurityTokenMonitorPrivate));
-+}
-+
-+static void
-+sc_security_token_monitor_class_install_properties (ScSecurityTokenMonitorClass *token_class)
-+{
-+    GObjectClass *object_class;
-+    GParamSpec *param_spec;
-+
-+    object_class = G_OBJECT_CLASS (token_class);
-+    object_class->set_property = sc_security_token_monitor_set_property;
-+    object_class->get_property = sc_security_token_monitor_get_property;
-+
-+    param_spec = g_param_spec_string ("module-path", _("Module Path"),
-+				      _("path to security token PKCS #11 driver"),
-+				      NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-+    g_object_class_install_property (object_class, PROP_MODULE_PATH, param_spec);
-+}
-+
-+static void 
-+sc_security_token_monitor_set_property (GObject       *object,
-+					guint          prop_id,
-+					const GValue  *value,
-+					GParamSpec    *pspec)
-+{
-+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
-+
-+    switch (prop_id)
-+    {
-+	    case PROP_MODULE_PATH:
-+		    sc_security_token_monitor_set_module_path (monitor, 
-+							       g_value_get_string (value));
-+		    break;
-+
-+	    default:
-+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+static void 
-+sc_security_token_monitor_get_property (GObject    *object,
-+					guint       prop_id,
-+					GValue     *value,
-+					GParamSpec *pspec)
-+{
-+    ScSecurityTokenMonitor *monitor = SC_SECURITY_TOKEN_MONITOR (object);
-+    gchar *module_path;
-+
-+    switch (prop_id)
-+    {
-+	    case PROP_MODULE_PATH:
-+		    module_path = sc_security_token_monitor_get_module_path (monitor);
-+		    g_value_set_string (value, module_path);
-+		    g_free (module_path);
-+		    break;
-+
-+	    default:
-+		    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+gchar *
-+sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor)
-+{
-+    return monitor->priv->module_path;
-+}
-+
-+static void
-+sc_security_token_monitor_set_module_path (ScSecurityTokenMonitor *monitor,
-+					   const gchar            *module_path)
-+{
-+    if (module_path == NULL)
-+	    module_path = SC_SECURITY_TOKEN_MONITOR_DRIVER;
-+
-+    g_assert (module_path != NULL);
-+
-+    if (((monitor->priv->module_path == NULL) ||
-+	 (strcmp (monitor->priv->module_path, module_path) != 0))) {
-+	    g_free (monitor->priv->module_path);
-+	    monitor->priv->module_path = g_strdup (module_path);
-+	    g_object_notify (G_OBJECT (monitor), "module-path");
-+    }
-+}
-+
-+static void
-+sc_security_token_monitor_token_removed_handler (ScSecurityTokenMonitor *monitor,
-+						 ScSecurityToken        *token)
-+{
-+    sc_debug ("informing security token of its removal");
-+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_REMOVED);
-+}
-+
-+static void
-+sc_security_token_monitor_token_inserted_handler (ScSecurityTokenMonitor *monitor,
-+						  ScSecurityToken        *token)
-+{
-+    sc_debug ("informing security token of its insertion");
-+    _sc_security_token_set_state (token, SC_SECURITY_TOKEN_STATE_INSERTED);
-+}
-+
-+static void
-+sc_security_token_monitor_class_install_signals (ScSecurityTokenMonitorClass *monitor_class)
-+{
-+    GObjectClass *object_class;
-+
-+    object_class = G_OBJECT_CLASS (monitor_class);
-+
-+    sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED] =
-+	    g_signal_new ("security-token-inserted",
-+			  G_OBJECT_CLASS_TYPE (object_class),
-+			  G_SIGNAL_RUN_FIRST,
-+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
-+					   security_token_inserted), 
-+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
-+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
-+    monitor_class->security_token_inserted = sc_security_token_monitor_token_inserted_handler;
-+
-+    sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED] =
-+	    g_signal_new ("security-token-removed",
-+			  G_OBJECT_CLASS_TYPE (object_class),
-+			  G_SIGNAL_RUN_FIRST,
-+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass,
-+					   security_token_removed), 
-+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
-+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
-+    monitor_class->security_token_removed = sc_security_token_monitor_token_removed_handler;
-+
-+    sc_security_token_monitor_signals[ERROR] =
-+	    g_signal_new ("error",
-+			  G_OBJECT_CLASS_TYPE (object_class),
-+			  G_SIGNAL_RUN_LAST,
-+			  G_STRUCT_OFFSET (ScSecurityTokenMonitorClass, error),
-+			  NULL, NULL, g_cclosure_marshal_VOID__POINTER,
-+			  G_TYPE_NONE, 1, G_TYPE_POINTER);
-+    monitor_class->error = NULL;
-+}
-+
-+static gboolean
-+sc_slot_id_equal (CK_SLOT_ID *slot_id_1, 
-+		  CK_SLOT_ID *slot_id_2)
-+{
-+    g_assert (slot_id_1 != NULL);
-+    g_assert (slot_id_2 != NULL);
-+
-+    return *slot_id_1 == *slot_id_2;
-+}
-+
-+static gboolean
-+sc_slot_id_hash (CK_SLOT_ID *slot_id) 
-+{
-+    guint32 upper_bits, lower_bits;
-+    gint temp;
-+
-+    if (sizeof (CK_SLOT_ID) == sizeof (gint))
-+	    return g_int_hash (slot_id);
-+
-+    upper_bits = ((*slot_id) >> 31) - 1;
-+    lower_bits = (*slot_id) & 0xffffffff;
-+
-+    /* The upper bits are almost certainly always zero,
-+     * so let's degenerate to g_int_hash for the 
-+     * (very) common case
-+     */
-+    temp = lower_bits + upper_bits;
-+    return upper_bits + g_int_hash (&temp);
-+}
-+
-+static void
-+sc_security_token_monitor_init (ScSecurityTokenMonitor *monitor)
-+{
-+    sc_debug ("initializing security token monitor");
-+
-+    monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (monitor,
-+						 SC_TYPE_SECURITY_TOKEN_MONITOR,
-+						 ScSecurityTokenMonitorPrivate);
-+    monitor->priv->poll_timeout_id = 0;
-+    monitor->priv->security_tokens = NULL;
-+    monitor->priv->is_unstoppable = FALSE;
-+}
-+
-+static void 
-+sc_security_token_monitor_finalize (GObject *object)
-+{
-+    ScSecurityTokenMonitor *monitor;
-+    GObjectClass *gobject_class;
-+
-+    monitor = SC_SECURITY_TOKEN_MONITOR (object);
-+    gobject_class =
-+	    G_OBJECT_CLASS (sc_security_token_monitor_parent_class);
-+
-+    sc_security_token_monitor_stop_now (monitor);
-+
-+    gobject_class->finalize (object);
-+}
-+
-+GQuark 
-+sc_security_token_monitor_error_quark (void)
-+{
-+    static GQuark error_quark = 0;
-+
-+    if (error_quark == 0)
-+	    error_quark = g_quark_from_static_string ("sc-security-token-monitor-error-quark");
-+
-+    return error_quark;
-+}
-+
-+ScSecurityTokenMonitor *
-+sc_security_token_monitor_new (const gchar *module_path)
-+{
-+    ScSecurityTokenMonitor *instance;
-+
-+    instance = SC_SECURITY_TOKEN_MONITOR (g_object_new (SC_TYPE_SECURITY_TOKEN_MONITOR, 
-+							"module-path", module_path,
-+							NULL));
-+
-+    return instance;
-+}
-+
-+static void 
-+sc_security_token_monitor_emit_error (ScSecurityTokenMonitor *monitor,
-+				      GError                 *error)
-+{
-+    monitor->priv->is_unstoppable = TRUE;
-+    g_signal_emit (monitor, sc_security_token_monitor_signals[ERROR], 0,
-+		   error);
-+    monitor->priv->is_unstoppable = FALSE;
-+}
-+
-+static void 
-+sc_security_token_monitor_emit_security_token_inserted (ScSecurityTokenMonitor *monitor,
-+							ScSecurityToken        *token)
-+{
-+    monitor->priv->is_unstoppable = TRUE;
-+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_INSERTED], 0,
-+		   token);
-+    monitor->priv->is_unstoppable = FALSE;
-+}
-+
-+static void 
-+sc_security_token_monitor_emit_security_token_removed (ScSecurityTokenMonitor *monitor,
-+							ScSecurityToken        *token)
-+{
-+    ScSecurityTokenMonitorState old_state;
-+
-+    old_state = monitor->priv->state;
-+    monitor->priv->is_unstoppable = TRUE;
-+    g_signal_emit (monitor, sc_security_token_monitor_signals[SECURITY_TOKEN_REMOVED], 0,
-+		   token);
-+    monitor->priv->is_unstoppable = FALSE;
-+}
-+
-+static gboolean
-+sc_security_token_monitor_check_for_and_process_events (ScSecurityTokenMonitor *monitor)
-+{
-+    PK11SlotInfo *slot;
-+    CK_SLOT_ID slot_id, *key;
-+    gint slot_series, token_slot_series;
-+    ScSecurityToken *token;
-+
-+    slot = SECMOD_WaitForAnyTokenEvent (monitor->priv->module, CKF_DONT_BLOCK,
-+					PR_INTERVAL_NO_WAIT);
-+
-+    if (slot == NULL) {
-+	    GError *error;
-+	    int error_code;
-+
-+	    error_code = PORT_GetError ();
-+	    if ((error_code == 0) || (error_code == SEC_ERROR_NO_EVENT))
-+		    return TRUE;
-+
-+	    /* FIXME: is there a function to convert from a PORT error
-+	     * code to a translated string?
-+	     */
-+	    error = g_error_new (SC_SECURITY_TOKEN_MONITOR_ERROR,
-+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
-+				 _("encountered unexpected error while "
-+				   "waiting for security token events"));
-+	    g_error_free (error);
-+
-+	    return FALSE;
-+    }
-+
-+    /* the slot id and series together uniquely identify a token.
-+     * You can never have two tokens with the same slot id at the
-+     * same time, however (I think), so we can key off of it.
-+     */
-+    slot_id = PK11_GetSlotID (slot);
-+    slot_series = PK11_GetSlotSeries (slot);
-+
-+    /* First check to see if there is a token that we're currently
-+     * tracking in the slot.
-+     */
-+    key = g_new (CK_SLOT_ID, 1);
-+    *key = slot_id;
-+    token = g_hash_table_lookup (monitor->priv->security_tokens, key);
-+
-+    if (token != NULL)
-+	    token_slot_series = sc_security_token_get_slot_series (token);
-+
-+    if (PK11_IsPresent (slot)) {
-+	    /* Now, check to see if their is a new token in the slot.
-+	     * If there was a different token in the slot now than
-+	     * there was before, then we need to emit a removed signal
-+	     * for the old token.
-+	     * 
-+	     * FIXME: So, I *think* the reason we need to do this is
-+	     * for the case where a token is removed and another
-+	     * inserted faster than the internal poll granualarity of
-+	     * NSS. In that case we won't get a separate removed event
-+	     * so we need to handle it ourselves.  But what happens if
-+	     * a token is removed, another inserted, then removed, and
-+	     * another inserted really fast?  Shouldn't we emit
-+	     * several removed/inserted events?  If so, can we depend
-+	     * on the difference of the series numbers to determine
-+	     * how many events to emit? It's all hard to trigger
-+	     * corner cases that probably don't matter anyhow, though.
-+	     */
-+	    if ((token != NULL) && 
-+		token_slot_series != slot_series) {
-+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
-+	    }
-+
-+	    token = _sc_security_token_new (monitor->priv->module, 
-+					    slot_id, slot_series);
-+
-+	    g_hash_table_replace (monitor->priv->security_tokens,
-+				  key, token);
-+	    key = NULL;
-+
-+	    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
-+    } else {
-+	    /* if we aren't tracking the token, just discard the event.
-+	     * We don't want unpaired remove events.  Note on startup
-+	     * NSS will generate an "insertion" event if a token is
-+	     * already inserted in the slot.
-+	     */
-+	    if ((token != NULL)) {
-+		    /* FIXME: i'm not sure about this code.  Maybe we
-+		     * shouldn't do this at all, or maybe we should do it
-+		     * n times (where n = slot_series - token_slot_series + 1)
-+		     * (see the comment in the if part of this if/else
-+		     * clause for more information)
-+		     * 
-+		     * Right now, i'm just doing it once.  
-+		     */
-+		    if ((slot_series - token_slot_series) > 1) {
-+
-+			    sc_security_token_monitor_emit_security_token_removed (monitor, token);
-+			    g_hash_table_remove (monitor->priv->security_tokens, key);
-+
-+			    token = _sc_security_token_new (monitor->priv->module, 
-+							    slot_id, slot_series);
-+			    g_hash_table_replace (monitor->priv->security_tokens,
-+						  key, token);
-+			    key = NULL;
-+			    sc_security_token_monitor_emit_security_token_inserted (monitor, token);
-+		    }
-+
-+		    sc_security_token_monitor_emit_security_token_removed (monitor, token);
-+
-+		    g_hash_table_remove (monitor->priv->security_tokens, key);
-+		    token = NULL;
-+	    }
-+    }
-+
-+    g_free (key);
-+    PK11_FreeSlot (slot);
-+
-+    return TRUE;
-+}
-+
-+static void
-+sc_security_token_monitor_polling_stopped_handler (ScSecurityTokenMonitor *monitor)
-+{
-+    monitor->priv->poll_timeout_id = 0;
-+    sc_security_token_monitor_stop_now (monitor);
-+}
-+
-+gboolean
-+sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor,
-+				 GError                 **error)
-+{
-+    SECStatus status = SECSuccess;
-+    gchar *module_spec;
-+
-+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
-+	    sc_debug ("security token monitor already started");
-+	    return TRUE;
-+    }
-+
-+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTING;
-+
-+    if (!monitor->priv->nss_is_loaded) {
-+	    sc_debug ("attempting to load NSS database '%s'",
-+		       SC_SECURITY_TOKEN_MONITOR_NSS_DB);
-+	    status = NSS_NoDB_Init (SC_SECURITY_TOKEN_MONITOR_NSS_DB);
-+    }
-+
-+    if (status != SECSuccess) {
-+	    gsize error_message_size;
-+	    gchar *error_message;
-+
-+	    error_message_size = PR_GetErrorTextLength ();
-+
-+	    if (error_message_size == 0) {
-+		    sc_debug ("NSS security system could not be initialized");
-+		    g_set_error (error,
-+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
-+				 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
-+				 _("NSS security system could not be initialized"));
-+		    goto out;
-+	    }
-+
-+	    error_message = g_slice_alloc0 (error_message_size);
-+	    PR_GetErrorText (error_message);
-+
-+	    g_set_error (error,
-+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
-+			 SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
-+			 "%s", error_message);
-+	    sc_debug ("NSS security system could not be initialized - %s",
-+		     error_message);
-+
-+	    g_slice_free1 (error_message_size, error_message);
-+
-+	    goto out;
-+    }
-+    sc_debug ("NSS database sucessfully loaded");
-+    monitor->priv->nss_is_loaded = TRUE;
-+
-+    if (monitor->priv->module == NULL) {
-+	    g_assert (monitor->priv->module_path != NULL);
-+	    module_spec = g_strdup_printf ("library=\"%s\" name=\"SecurityToken\"",
-+					   monitor->priv->module_path);
-+	    sc_debug ("loading security token driver using spec '%s'",
-+		     module_spec);
-+
-+	    /* FIXME: this API is apparently deprecated, find out what is replacing it
-+	     */
-+	    monitor->priv->module = SECMOD_LoadUserModule (module_spec, 
-+							   NULL /* parent */, 
-+							   FALSE /* recurse */);
-+	    g_free (module_spec);
-+    }
-+
-+    if ((monitor->priv->module == NULL) || !monitor->priv->module->loaded) {
-+	    gsize error_message_size;
-+	    gchar *error_message;
-+
-+	    error_message_size = PR_GetErrorTextLength ();
-+
-+	    if (error_message_size == 0) {
-+		    sc_debug ("security token driver '%s' could not be loaded",
-+			     monitor->priv->module_path);
-+		    g_set_error (error,
-+				 SC_SECURITY_TOKEN_MONITOR_ERROR,
-+				 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
-+				 _
-+				 ("security token driver '%s' could not be loaded"),
-+				 monitor->priv->module_path);
-+		    goto out;
-+	    }
-+
-+	    error_message = g_slice_alloc0 (error_message_size);
-+	    PR_GetErrorText (error_message);
-+
-+	    g_set_error (error,
-+			 SC_SECURITY_TOKEN_MONITOR_ERROR,
-+			 SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
-+			 "%s", error_message);
-+
-+	    sc_debug ("security token driver '%s' could not be loaded - %s",
-+		     monitor->priv->module_path, error_message);
-+	    g_slice_free1 (error_message_size, error_message);
-+
-+	    goto out;
-+    }
-+
-+    /* FIXME: so it sort of sucks that we have to poll here.  NSS
-+     * does offer a non-blocking API (that we use), but there is
-+     * no way to wake up the event loop when new events arrive, so
-+     * we just have to poll periodically.  An alternative would be
-+     * to fork (or bring in threads, ick) and use the blocking api
-+     * plus a message pipe, but that's significantly more
-+     * complicated to implement.  Maybe a better solution is to
-+     * move all this off to Yet Another Daemon Process and have it
-+     * emit dbus signals that we watch for.
-+     */
-+    monitor->priv->poll_timeout_id =
-+	    g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
-+				SC_SECURITY_TOKEN_MONITOR_POLL_INTERVAL,
-+				(GSourceFunc)
-+				sc_security_token_monitor_check_for_and_process_events,
-+				monitor, (GDestroyNotify)
-+				sc_security_token_monitor_polling_stopped_handler);
-+
-+    monitor->priv->security_tokens =
-+	    g_hash_table_new_full ((GHashFunc) sc_slot_id_hash, 
-+				   (GEqualFunc) sc_slot_id_equal, 
-+				   (GDestroyNotify) g_free, 
-+				   (GDestroyNotify) g_object_unref);
-+
-+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
-+
-+out:
-+    /* don't leave it in a half started state
-+     */
-+    if (monitor->priv->state != SC_SECURITY_TOKEN_MONITOR_STATE_STARTED) {
-+	    sc_debug
-+		    ("security token monitor could not be completely started");
-+	    sc_security_token_monitor_stop (monitor);
-+    } else
-+	    sc_debug ("security token monitor started");
-+
-+    return monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STARTED;
-+}
-+
-+static gboolean
-+sc_security_token_monitor_stop_now (ScSecurityTokenMonitor *monitor)
-+{
-+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
-+	    return FALSE;
-+
-+    sc_debug ("stopping security token monitor");
-+
-+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED;
-+    if (monitor->priv->security_tokens != NULL) {
-+	    g_hash_table_destroy (monitor->priv->security_tokens);
-+	    monitor->priv->security_tokens = NULL;
-+    }
-+
-+    if (monitor->priv->poll_timeout_id != 0) {
-+	    g_source_remove (monitor->priv->poll_timeout_id);
-+	    monitor->priv->poll_timeout_id = 0;
-+    }
-+
-+#ifdef SC_SECURITY_TOKEN_MONITOR_DRIVER_CAN_BE_RELOADED_AFTER_BEING_DESTROYED
-+    if (monitor->priv->module != NULL) {
-+	    SECMOD_DestroyModule (monitor->priv->module);
-+	    monitor->priv->module = NULL;
-+    }
-+
-+    if (monitor->priv->nss_is_loaded) {
-+	    NSS_Shutdown ();
-+	    monitor->priv->nss_is_loaded = FALSE;
-+    }
-+#endif
-+    sc_debug ("security token monitor stopped");
-+    
-+    return FALSE;
-+}
-+
-+static void
-+sc_security_token_monitor_queue_stop (ScSecurityTokenMonitor *monitor)
-+{
-+
-+    monitor->priv->state = SC_SECURITY_TOKEN_MONITOR_STATE_STOPPING;
-+
-+    g_idle_add ((GSourceFunc) sc_security_token_monitor_stop_now, monitor);
-+}
-+
-+void 
-+sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor)
-+{
-+    if (monitor->priv->state == SC_SECURITY_TOKEN_MONITOR_STATE_STOPPED)
-+	    return;
-+
-+    if (monitor->priv->is_unstoppable) {
-+	    sc_security_token_monitor_queue_stop (monitor);
-+	    return;
-+    } 
-+
-+    sc_security_token_monitor_stop_now (monitor);
-+}
-+
-+#ifdef SC_SECURITY_TOKEN_MONITOR_ENABLE_TEST
-+#include <glib.h>
-+
-+static GMainLoop *event_loop;
-+static gboolean should_exit_on_next_remove = FALSE;
-+
-+static gboolean on_timeout (ScSecurityTokenMonitor *monitor)
-+{
-+    GError *error;
-+    g_print ("Re-enabling monitor.\n");
-+
-+    if (!sc_security_token_monitor_start (monitor, &error)) {
-+	    g_warning ("could not start security token monitor - %s",
-+		       error->message);
-+	    g_error_free (error);
-+	    return 1;
-+    }
-+    g_print ("Please re-insert security token\n");
-+
-+    should_exit_on_next_remove = TRUE;
-+
-+    return FALSE;
-+}
-+
-+static void
-+on_device_inserted (ScSecurityTokenMonitor * monitor,
-+		    ScSecurityToken *token)
-+{
-+    g_print ("security token inserted!\n");
-+    g_print ("Please remove it.\n");
-+}
-+
-+static void
-+on_device_removed (ScSecurityTokenMonitor * monitor,
-+		   ScSecurityToken *token)
-+{
-+    g_print ("security token removed!\n");
-+
-+    if (should_exit_on_next_remove)
-+	    g_main_loop_quit (event_loop);
-+    else {
-+	    g_print ("disabling monitor for 2 seconds\n");
-+	    sc_security_token_monitor_stop (monitor);
-+	    g_timeout_add (2000, (GSourceFunc) on_timeout, monitor);
-+    }
-+}
-+
-+int 
-+main (int   argc, 
-+      char *argv[])
-+{
-+    ScSecurityTokenMonitor *monitor;
-+    GError *error;
-+
-+    g_log_set_always_fatal (G_LOG_LEVEL_ERROR
-+			    | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-+
-+    g_type_init ();
-+
-+    g_message ("creating instance of 'security token monitor' object...");
-+    monitor = sc_security_token_monitor_new (NULL);
-+    g_message ("'security token monitor' object created successfully");
-+
-+    g_signal_connect (monitor, "security-token-inserted",
-+		      G_CALLBACK (on_device_inserted), NULL);
-+
-+    g_signal_connect (monitor, "security-token-removed",
-+		      G_CALLBACK (on_device_removed), NULL);
-+
-+    g_message ("starting listener...");
-+
-+    error = NULL;
-+    if (!sc_security_token_monitor_start (monitor, &error)) {
-+	    g_warning ("could not start security token monitor - %s",
-+		       error->message);
-+	    g_error_free (error);
-+	    return 1;
-+    }
-+
-+    event_loop = g_main_loop_new (NULL, FALSE);
-+    g_main_loop_run (event_loop);
-+    g_main_loop_unref (event_loop);
-+    event_loop = NULL;
-+
-+    g_message ("destroying previously created 'security token monitor' object...");
-+    g_object_unref (monitor);
-+    monitor = NULL;
-+    g_message ("'security token monitor' object destroyed successfully");
-+
-+    return 0;
-+}
-+#endif
---- /dev/null
-+++ gdm-2.15.6/utils/securitytokenmonitor.h
-@@ -0,0 +1,82 @@
-+/* securitytokenmonitor.h - monitor for security token insertion and
-+ *                          removal events
-+ *
-+ * Copyright (C) 2006 Ray Strode
-+ *
-+ * 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 SC_SECURITY_TOKEN_MONITOR_H
-+#define SC_SECURITY_TOKEN_MONITOR_H
-+
-+#define SC_SECURITY_TOKEN_ENABLE_INTERNAL_API
-+#include "securitytoken.h"
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+#define SC_TYPE_SECURITY_TOKEN_MONITOR            (sc_security_token_monitor_get_type ())
-+#define SC_SECURITY_TOKEN_MONITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitor))
-+#define SC_SECURITY_TOKEN_MONITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
-+#define SC_IS_SECURITY_TOKEN_MONITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SC_TYPE_SECURITY_TOKEN_MONITOR))
-+#define SC_IS_SECURITY_TOKEN_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SC_TYPE_SECURITY_TOKEN_MONITOR))
-+#define SC_SECURITY_TOKEN_MONITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), SC_TYPE_SECURITY_TOKEN_MONITOR, ScSecurityTokenMonitorClass))
-+#define SC_SECURITY_TOKEN_MONITOR_ERROR           (sc_security_token_monitor_error_quark ())
-+typedef struct _ScSecurityTokenMonitor ScSecurityTokenMonitor;
-+typedef struct _ScSecurityTokenMonitorClass ScSecurityTokenMonitorClass;
-+typedef struct _ScSecurityTokenMonitorPrivate ScSecurityTokenMonitorPrivate;
-+typedef enum _ScSecurityTokenMonitorError ScSecurityTokenMonitorError;
-+
-+struct _ScSecurityTokenMonitor {
-+    GObject parent;
-+
-+    /*< private > */
-+    ScSecurityTokenMonitorPrivate *priv;
-+};
-+
-+struct _ScSecurityTokenMonitorClass {
-+    GObjectClass parent_class;
-+
-+    /* Signals */
-+    void (*security_token_inserted) (ScSecurityTokenMonitor *monitor,
-+				     ScSecurityToken *token);
-+    void (*security_token_removed) (ScSecurityTokenMonitor *monitor,
-+				    ScSecurityToken *token);
-+    void (*error) (ScSecurityTokenMonitor *monitor, 
-+		   GError                 *error);
-+};
-+
-+enum _ScSecurityTokenMonitorError {
-+    SC_SECURITY_TOKEN_MONITOR_ERROR_GENERIC = 0,
-+    SC_SECURITY_TOKEN_MONITOR_ERROR_WITH_NSS,
-+    SC_SECURITY_TOKEN_MONITOR_ERROR_LOADING_DRIVER,
-+};
-+
-+GType sc_security_token_monitor_get_type (void) G_GNUC_CONST;
-+GQuark sc_security_token_monitor_error_quark (void) G_GNUC_CONST;
-+
-+ScSecurityTokenMonitor *sc_security_token_monitor_new (const gchar *module);
-+
-+
-+gboolean sc_security_token_monitor_start (ScSecurityTokenMonitor  *monitor, 
-+				 	  GError                 **error);
-+
-+void sc_security_token_monitor_stop (ScSecurityTokenMonitor *monitor);
-+
-+gchar *sc_security_token_monitor_get_module_path (ScSecurityTokenMonitor *monitor);
-+
-+G_END_DECLS
-+#endif				/* SC_SECURITY_TOKEN_MONITOR_H */
++++ gdm-2.15.6/config/securitytokens.conf.in
+@@ -0,0 +1,4 @@
++[SecurityTokens]
++Enable=true
++#Driver=@libdir@/pkcs11/libcoolkeypk11.so
++#PamStack=gdm-securitytokens
+



From fedora-cvs-commits at redhat.com  Tue Jul 18 06:24:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 02:24:32 -0400
Subject: rpms/imake/devel xorg-cf-files-1.0.2-redhat.patch, NONE,
	1.1 xorg-cf-files-1.0.2-xprint.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 imake.spec, 1.26, 1.27 sources, 1.5,
	1.6 xorg-cf-files-1.0.1-redhat.patch, 1.2,
	NONE xorg-cf-files-1.0.1-xprint.patch, 1.1, NONE
Message-ID: <200607180624.k6I6OWAv010307@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10287

Modified Files:
	.cvsignore imake.spec sources 
Added Files:
	xorg-cf-files-1.0.2-redhat.patch 
	xorg-cf-files-1.0.2-xprint.patch 
Removed Files:
	xorg-cf-files-1.0.1-redhat.patch 
	xorg-cf-files-1.0.1-xprint.patch 
Log Message:
- cleanup patch files
- update source files


xorg-cf-files-1.0.2-redhat.patch:
 linux.cf |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE xorg-cf-files-1.0.2-redhat.patch ---
--- xorg-cf-files-1.0.2/linux.cf.redhat	2005-10-21 21:10:27.000000000 +0200
+++ xorg-cf-files-1.0.2/linux.cf	2005-12-21 11:27:16.000000000 +0100
@@ -190,7 +190,13 @@
 #endif /* LinuxDebian */
 
 #if LinuxDistribution == LinuxRedHat
-#define FSUseSyslog		YES
+# define FSUseSyslog		YES
+# define BuildRman		NO
+# define BuildHtmlManPages	NO
+# define ProjectRoot		/usr
+# define ManPath		/usr/share/man
+# define XAppLoadDir		/usr/share/X11/app-defaults
+# define ConfigDir		/usr/share/X11/config
 #endif
 
 #ifndef HasDevRandom

xorg-cf-files-1.0.2-xprint.patch:
 X11.tmpl |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

--- NEW FILE xorg-cf-files-1.0.2-xprint.patch ---
--- xorg-cf-files-1.0.2/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
+++ xorg-cf-files-1.0.2/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
@@ -3920,21 +3920,13 @@
 #endif
 
 #ifndef ExtraXawReqs
-# if BuildXaw
-#  define ExtraXawReqs $(XPLIB)
-# else
-#  define ExtraXawReqs /**/
-# endif
+# define ExtraXawReqs /**/
 #endif
 
 EXTRAXAWREQS = ExtraXawReqs
 
 #ifndef ExtraXawClientDepLibs
-# if BuildXaw
-#  define ExtraXawClientDepLibs $(DEPXPLIB)
-# else
-#  define ExtraXawClientDepLibs /**/
-# endif
+# define ExtraXawClientDepLibs /**/
 #endif
 
 EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
@@ -3944,11 +3936,7 @@
 #endif
 
 #ifndef ExtraXawClientLibs
-# if BuildXaw
-#  define ExtraXawClientLibs $(XPLIB)
-# else
-#  define ExtraXawClientLibs /**/
-# endif
+# define ExtraXawClientLibs /**/
 #endif
 
 EXTRAXAWCLIENTLIBS = ExtraXawClientLibs


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jan 2006 17:06:05 -0000	1.6
+++ .cvsignore	18 Jul 2006 06:24:30 -0000	1.7
@@ -3,3 +3,6 @@
 lndir-1.0.1.tar.bz2
 makedepend-1.0.0.tar.bz2
 xorg-cf-files-1.0.1.tar.bz2
+imake-1.0.2.tar.bz2
+gccmakedep-1.0.2.tar.bz2
+xorg-cf-files-1.0.2.tar.bz2


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- imake.spec	15 Jul 2006 03:58:15 -0000	1.26
+++ imake.spec	18 Jul 2006 06:24:30 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.2
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -14,8 +14,8 @@
 Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.1.tar.bz2
 Patch0: xorg-cf-files-1.0.0-misc.patch
 Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch
-Patch2: xorg-cf-files-1.0.1-redhat.patch
-Patch3: xorg-cf-files-1.0.1-xprint.patch
+Patch2: xorg-cf-files-1.0.2-redhat.patch
+Patch3: xorg-cf-files-1.0.2-xprint.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
@@ -116,6 +116,10 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* Tue Jul 18 2006 Than Ngo <than at redhat.com> 1.0.2-3
+- cleanup patch files
+- update source files
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Jan 2006 17:06:05 -0000	1.5
+++ sources	18 Jul 2006 06:24:30 -0000	1.6
@@ -1,5 +1,5 @@
-f3ff8981f6b0f06a36dca74f19d155f2  gccmakedep-1.0.1.tar.bz2
-8c859fdddd57e91132ceab1344bfe728  imake-1.0.1.tar.bz2
 e274ea9f55dfd62afa0a7b1e1ab4ba96  lndir-1.0.1.tar.bz2
 fa194caa4f059f5621ed2c5a51efb4d0  makedepend-1.0.0.tar.bz2
-e3107572a02a344b5f5da57a1eb95732  xorg-cf-files-1.0.1.tar.bz2
+02fea5a02ba2857c7d81820c8e8b8e6f  imake-1.0.2.tar.bz2
+b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
+5f62dd5545b782c74f6e4e70d0e6552c  xorg-cf-files-1.0.2.tar.bz2


--- xorg-cf-files-1.0.1-redhat.patch DELETED ---


--- xorg-cf-files-1.0.1-xprint.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 06:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 02:26:30 -0400
Subject: rpms/pilot-link/devel pilot-link-0.11.8-ncurses.patch, NONE,
	1.1 pilot-link.spec, 1.42, 1.43
Message-ID: <200607180626.k6I6QTwS010391@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10372

Modified Files:
	pilot-link.spec 
Added Files:
	pilot-link-0.11.8-ncurses.patch 
Log Message:
fix configure script


pilot-link-0.11.8-ncurses.patch:
 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pilot-link-0.11.8-ncurses.patch ---
--- pilot-link-0.11.8/configure.ncurses	2003-07-01 21:08:40.000000000 +0200
+++ pilot-link-0.11.8/configure	2006-07-18 08:16:47.000000000 +0200
@@ -10435,8 +10435,8 @@
 
 fi;
 if test "x$with_readline" != "xno"; then
-LIBS="$LIBS -lreadline"
 		for termlib in ncurses curses termcap terminfo termlib ; do
+LIBS="$LIBS -lreadline"
 		as_ac_Lib=`echo "ac_cv_lib_${termlib}''_add_history" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for add_history in -l${termlib}" >&5
 echo $ECHO_N "checking for add_history in -l${termlib}... $ECHO_C" >&6


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pilot-link.spec	12 Jul 2006 07:49:12 -0000	1.42
+++ pilot-link.spec	18 Jul 2006 06:26:27 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.11.8
-Release: 15.1
+Release: 16
 Source: pilot-link-%{version}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.11.0-perlmd5.patch
@@ -16,6 +16,7 @@
 Patch8: pilot-link-0.11.8-underquoted.patch
 Patch9: pilot-link-0.11.8-misc1.patch
 Patch10: pilot-link-0.11.8-realpath.path
+Patch11: pilot-link-0.11.8-ncurses.patch
 Epoch: 2
 License: GPL
 Group: Applications/Communications
@@ -71,6 +72,7 @@
 %patch8 -p1 -b .underquoted
 %patch9 -p1 -b .misc1
 %patch10 -p1 -b .realpath
+%patch11 -p1 -b .ncurses
 
 %build
 CFLAGS="%{optflags}" %configure \
@@ -145,6 +147,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Jul 18 2006 Ivana Varekova <varekova at redhat.com> 2:0.11.8-16
+- fix configure script
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:0.11.8-15.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 06:50:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 02:50:36 -0400
Subject: rpms/wireshark/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wireshark.spec, 1.3, 1.4
Message-ID: <200607180650.k6I6oaDe007239@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7209

Modified Files:
	.cvsignore sources wireshark.spec 
Log Message:
 - upgrade to 0.99.2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jul 2006 07:18:55 -0000	1.3
+++ .cvsignore	18 Jul 2006 06:50:33 -0000	1.4
@@ -1 +1 @@
-wireshark-0.99.2pre1.tar.gz
+wireshark-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jul 2006 07:18:55 -0000	1.3
+++ sources	18 Jul 2006 06:50:33 -0000	1.4
@@ -1 +1 @@
-ee8607dc6d8307fbac5082c3d823a88f  wireshark-0.99.2pre1.tar.gz
+46d3b7c9766960fb34782c2078c50d13  wireshark-0.99.2.tar.gz


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/devel/wireshark.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wireshark.spec	12 Jul 2006 18:48:37 -0000	1.3
+++ wireshark.spec	18 Jul 2006 06:50:33 -0000	1.4
@@ -4,10 +4,10 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.2
-Release: 	0.pre1.1
+Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
-Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}pre1.tar.gz
+Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source3:	wireshark.desktop
@@ -53,7 +53,7 @@
 
 %prep
 #%setup -q -n %{name}-%{version}-SVN-%{svn_version}
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .pie
 %patch3 -p1 
 
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Tue Jul 18 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-1
+- upgrade to 0.99.2
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.2-0.pre1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 07:21:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 03:21:36 -0400
Subject: rpms/gawk/devel gawk-3.1.5-ipv6.patch,NONE,1.1 gawk.spec,1.41,1.42
Message-ID: <200607180721.k6I7La4L031396@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31299

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.5-ipv6.patch 
Log Message:
IPv6 support


gawk-3.1.5-ipv6.patch:
 io.c |  185 +++++++++++++++++++++++++++++++------------------------------------
 1 files changed, 88 insertions(+), 97 deletions(-)

--- NEW FILE gawk-3.1.5-ipv6.patch ---
diff -bru gawk-3.1.5.orig/io.c gawk-3.1.5/io.c
--- gawk-3.1.5.orig/io.c	2006-07-07 16:13:08.000000000 +0200
+++ gawk-3.1.5/io.c	2006-07-10 13:18:13.000000000 +0200
@@ -71,7 +71,6 @@
 extern int MRL;
 
 #ifdef HAVE_SOCKETS
-enum inet_prot { INET_NONE, INET_TCP, INET_UDP, INET_RAW };
 
 #ifndef SHUT_RD
 #define SHUT_RD		0
@@ -1133,24 +1132,60 @@
 /* socketopen --- open a socket and set it into connected state */
 
 static int
-socketopen(enum inet_prot type, int localport, int remoteport, const char *remotehostname)
+socketopen(int type, const char *localpname, const char *remotepname,
+	const char *remotehostname)
 {
-	struct hostent *hp = gethostbyname(remotehostname);
-	struct sockaddr_in local_addr, remote_addr;
+	struct addrinfo *lres, *lres0;
+	struct addrinfo lhints;
+	struct addrinfo *rres, *rres0;
+	struct addrinfo rhints;
+
+	int lerror;
+	int rerror;
+
 	int socket_fd;
 	int any_remote_host = strcmp(remotehostname, "0");
 
+	memset (&lhints, '\0', sizeof (lhints));
+	lhints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+	lhints.ai_socktype = type;
+
+	lerror = getaddrinfo (NULL, localpname, &lhints, &lres);
+	if (lerror) {
+		if (strcmp(localpname, "0"))
+			fatal(_("local port invalid in `/inet'"));
+		lres0 = NULL;
+		lres = &lhints;
+	} else
+		lres0 = lres;
+
+	while (lres) {
+		memset (&rhints, '\0', sizeof (rhints));
+		rhints.ai_flags = lhints.ai_flags;
+		rhints.ai_socktype = lhints.ai_socktype;
+		rhints.ai_family = lhints.ai_family;
+		rhints.ai_protocol = lhints.ai_protocol;
+
+		rerror = getaddrinfo (remotehostname, remotepname, &rhints, &rres);
+		if (rerror) {
+			if (lres0)
+				freeaddrinfo(lres0);
+			fatal(_("remote host and port information invalid"));
+		}
+		rres0 = rres;
 	socket_fd = INVALID_HANDLE;
-	switch (type) {
-	case INET_TCP:  
-		if (localport != 0 || remoteport != 0) {
+		while (rres) {
+			socket_fd = socket (rres->ai_family,
+				rres->ai_socktype, rres->ai_protocol);
+			if (socket_fd < 0 || socket_fd == INVALID_HANDLE)
+				goto nextrres;
+
+			if (type == SOCK_STREAM) {
 			int on = 1;
 #ifdef SO_LINGER
 			struct linger linger;
-
 			memset(& linger, '\0', sizeof(linger));
 #endif
-			socket_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); 
 			setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR,
 				(char *) & on, sizeof(on));
 #ifdef SO_LINGER
@@ -1160,57 +1195,27 @@
 				(char *) & linger, sizeof(linger));
 #endif
 		}
-		break;
-	case INET_UDP:  
-		if (localport != 0 || remoteport != 0)
-			socket_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
-		break;
-	case INET_RAW:  
-#ifdef SOCK_RAW
-		if (localport == 0 && remoteport == 0)
-			socket_fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); 
-#endif
-		break;
-	case INET_NONE:
-		/* fall through */
-	default:
-		cant_happen();
-		break;
-	}
+			if (bind(socket_fd, lres->ai_addr, lres->ai_addrlen) != 0)
+				goto nextrres;
 
-	if (socket_fd < 0 || socket_fd == INVALID_HANDLE
-	    || (hp == NULL && any_remote_host != 0))
-		return INVALID_HANDLE;
-
-	local_addr.sin_family = remote_addr.sin_family = AF_INET;
-	local_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	remote_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	local_addr.sin_port  = htons(localport);
-	remote_addr.sin_port = htons(remoteport);
-	if (bind(socket_fd, (struct sockaddr *) &local_addr, sizeof(local_addr)) == 0) {
 		if (any_remote_host != 0) { /* not ANY => create a client */
-			if (type == INET_TCP || type == INET_UDP) {
-				memcpy(&remote_addr.sin_addr, hp->h_addr,
-					sizeof(remote_addr.sin_addr));
-				if (connect(socket_fd,
-						(struct sockaddr *) &remote_addr,
-						sizeof(remote_addr)) != 0) {
-					close(socket_fd);
-					if (localport == 0)
-						socket_fd = INVALID_HANDLE;
-					else
-						socket_fd = socketopen(type, localport, 0, "0");
-				}
+				if (type != SOCK_RAW) {
+					if (connect(socket_fd, rres->ai_addr,
+						rres->ai_addrlen) == 0)
+						break;
 			} else {
 				/* /inet/raw client not ready yet */ 
 				fatal(_("/inet/raw client not ready yet, sorry"));
 				if (geteuid() != 0)
+						/* FIXME: is this second fatal ever reached? */
 					fatal(_("only root may use `/inet/raw'."));
 			}
 		} else { /* remote host is ANY => create a server */
-			if (type == INET_TCP) {
+				if (type == SOCK_STREAM) {
 				int clientsocket_fd = INVALID_HANDLE;
-				socklen_t namelen = sizeof(remote_addr);
+
+					struct sockaddr_storage remote_addr;
+					socklen_t namelen = sizeof (remote_addr);
 
 				if (listen(socket_fd, 1) >= 0
 				    && (clientsocket_fd = accept(socket_fd,
@@ -1218,25 +1223,22 @@
 						&namelen)) >= 0) {
 					close(socket_fd);
 					socket_fd = clientsocket_fd;
-				} else {
-					close(socket_fd);
-					socket_fd = INVALID_HANDLE;
+						break;
 				}
-			} else if (type == INET_UDP) {
+				} else if (type == SOCK_DGRAM) {
 #ifdef MSG_PEEK
 				char buf[10];
+					struct sockaddr_storage remote_addr;
 				socklen_t readle;
 
 				if (recvfrom(socket_fd, buf, 1, MSG_PEEK,
 					(struct sockaddr *) & remote_addr,
-					& readle) < 1
-						|| readle != sizeof(remote_addr)
-				    || connect(socket_fd,
+						& readle) >= 0
+						&& readle
+						&& connect(socket_fd,
 					(struct sockaddr *)& remote_addr,
-						readle) != 0) {
-					close(socket_fd);
-					socket_fd = INVALID_HANDLE;
-				}
+							readle) == 0)
+						break;
 #endif
 			} else {
 				/* /inet/raw server not ready yet */ 
@@ -1245,10 +1247,20 @@
 					fatal(_("only root may use `/inet/raw'."));
 			}
 		}
-	} else {
+
+nextrres:
+			if (socket_fd != INVALID_HANDLE)
 		close(socket_fd);
 		socket_fd = INVALID_HANDLE;
+			rres = rres->ai_next;
+		}
+		freeaddrinfo(rres0);
+		if (socket_fd != INVALID_HANDLE)
+			break;
+		lres = lres->ai_next;
 	}
+	if (lres0)
+		freeaddrinfo(lres0);
 
 	return socket_fd;
 }
@@ -1313,30 +1325,24 @@
 	} else if (STREQN(name, "/inet/", 6)) {
 #ifdef HAVE_SOCKETS
 		/* /inet/protocol/localport/hostname/remoteport */
-		enum inet_prot protocol = INET_NONE;
-		int localport, remoteport;
+		int protocol;
 		char *hostname;
 		char *hostnameslastcharp;
 		char *localpname;
-		char proto[4];
-		struct servent *service;
+		char *localpnamelastcharp;
 
 		cp = (char *) name + 6;
 		/* which protocol? */
 		if (STREQN(cp, "tcp/", 4))
-			protocol = INET_TCP;
+			protocol = SOCK_STREAM;
 		else if (STREQN(cp, "udp/", 4))
-			protocol = INET_UDP;
+			protocol = SOCK_DGRAM;
 		else if (STREQN(cp, "raw/", 4))
-			protocol = INET_RAW;
+			protocol = SOCK_RAW;
 		else
 			fatal(_("no (known) protocol supplied in special filename `%s'"),
 				name);
 
-		proto[0] = cp[0];
-		proto[1] = cp[1];   
-		proto[2] = cp[2];   
-		proto[3] =  '\0';
 		cp += 4;
 
 		/* which localport? */
@@ -1354,25 +1360,17 @@
 		 * By using atoi() the use of decimal numbers is enforced.
 		 */
 		*cp = '\0';
-
-		localport = atoi(localpname);
-		if (strcmp(localpname, "0") != 0
-		    && (localport <= 0 || localport > 65535)) {
-			service = getservbyname(localpname, proto);
-			if (service == NULL)
-				fatal(_("local port invalid in `%s'"), name);
-			else
-				localport = ntohs(service->s_port);
-		}
-		*cp = '/';
+		localpnamelastcharp = cp;
 
 		/* which hostname? */
 		cp++;
 		hostname = cp;
 		while (*cp != '/' && *cp != '\0')
 			cp++; 
-		if (*cp != '/' || cp == hostname)
+		if (*cp != '/' || cp == hostname) {
+			*localpnamelastcharp = '/';
 			fatal(_("must supply a remote hostname to `/inet'"));
+		}
 		*cp = '\0';
 		hostnameslastcharp = cp;
 
@@ -1386,22 +1384,15 @@
 		 * Here too, require a port, let them explicitly put 0 if
 		 * they don't care.
 		 */
-		if (*cp == '\0')
+		if (*cp == '\0') {
+			*localpnamelastcharp = '/';
+			*hostnameslastcharp = '/';
 			fatal(_("must supply a remote port to `/inet'"));
-		remoteport = atoi(cp);
-		if (strcmp(cp, "0") != 0
-		    && (remoteport <= 0 || remoteport > 65535)) {
-			service = getservbyname(cp, proto);
-			if (service == NULL)
-				 fatal(_("remote port invalid in `%s'"), name);
-			else
-				remoteport = ntohs(service->s_port);
 		}
 
-		/* Open Sesame! */
-		openfd = socketopen(protocol, localport, remoteport, hostname);
+		openfd = socketopen(protocol, localpname, cp, hostname);
+		*localpnamelastcharp = '/';
 		*hostnameslastcharp = '/';
-
 #else /* ! HAVE_SOCKETS */
 		fatal(_("TCP/IP communications are not supported"));
 #endif /* HAVE_SOCKETS */


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gawk.spec	12 Jul 2006 05:53:02 -0000	1.41
+++ gawk.spec	18 Jul 2006 07:21:33 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 9.1
+Release: 10
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -25,6 +25,8 @@
 Patch8: gawk-3.1.5-syntaxerror.patch
 # http://lists.gnu.org/archive/html/bug-gnu-utils/2006-07/msg00004.html
 Patch9: gawk-3.1.5-numflags.patch
+# IPv6 support
+Patch10: gawk-3.1.5-ipv6.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -45,6 +47,7 @@
 %patch7 -p1 -b .internal
 %patch8 -p1 -b .syntaxerror
 %patch9 -p1 -b .numflag
+%patch10 -p1 -b .ipv6
 
 %build
 %configure
@@ -93,6 +96,9 @@
 %{_datadir}/awk
 
 %changelog
+* Tue Jul 18 2006 Karel Zak <kzak at redhat.com> 3.1.5-10
+- add IPv6 support (patch be Jan Pazdziora)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-9.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 07:27:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 03:27:12 -0400
Subject: rpms/libwmf/FC-5 libwmf-0.2.8.4-intoverflow.patch, 1.1,
	1.2 libwmf.spec, 1.21, 1.22
Message-ID: <200607180727.k6I7RC0F001117@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1025

Modified Files:
	libwmf-0.2.8.4-intoverflow.patch libwmf.spec 
Log Message:
rh#198291# x86_64 issues

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: libwmf-0.2.8.4-intoverflow.patch
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-5/libwmf-0.2.8.4-intoverflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libwmf-0.2.8.4-intoverflow.patch	12 Jul 2006 15:07:02 -0000	1.1
+++ libwmf-0.2.8.4-intoverflow.patch	18 Jul 2006 07:27:10 -0000	1.2
@@ -14,7 +14,7 @@
  
 -/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
 - */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
-+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
++	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
 +	{
 +		API->err = wmf_E_InsMem;
 +		WMF_DEBUG (API,"bailing...");


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-5/libwmf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libwmf.spec	12 Jul 2006 15:16:22 -0000	1.21
+++ libwmf.spec	18 Jul 2006 07:27:10 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 5.1
+Release: 5.2
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 18 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-5.2
+- CVE-2006-3376 libwmf integer overflow
+
 * Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-5.1
 - CVE-2006-3376 libwmf integer overflow
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 07:49:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 03:49:12 -0400
Subject: rpms/libwmf/FC-4 libwmf-0.2.8.4-intoverflow.patch, 1.1,
	1.2 libwmf.spec, 1.10, 1.11
Message-ID: <200607180749.k6I7nCTo022581@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22551

Modified Files:
	libwmf-0.2.8.4-intoverflow.patch libwmf.spec 
Log Message:
fix edge case on 64bit

libwmf-0.2.8.4-intoverflow.patch:
 player.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Index: libwmf-0.2.8.4-intoverflow.patch
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-4/libwmf-0.2.8.4-intoverflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libwmf-0.2.8.4-intoverflow.patch	12 Jul 2006 15:11:19 -0000	1.1
+++ libwmf-0.2.8.4-intoverflow.patch	18 Jul 2006 07:49:10 -0000	1.2
@@ -14,7 +14,7 @@
  
 -/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
 - */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
-+	if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
++	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
 +	{
 +		API->err = wmf_E_InsMem;
 +		WMF_DEBUG (API,"bailing...");


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-4/libwmf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libwmf.spec	12 Jul 2006 15:13:01 -0000	1.10
+++ libwmf.spec	18 Jul 2006 07:49:10 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.3
-Release: 8.1
+Release: 8.2
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -101,6 +101,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jul 18 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-8.2
+- CVE-2006-3376 libwmf integer overflow
+
 * Wed Jul 12 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.3-8.1
 - CVE-2006-3376 libwmf integer overflow
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 08:11:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 04:11:01 -0400
Subject: rpms/arts/devel arts.spec,1.61,1.62
Message-ID: <200607180811.k6I8B1iR028660@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/arts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28606

Modified Files:
	arts.spec 
Log Message:
rebuild



Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- arts.spec	12 Jul 2006 05:13:37 -0000	1.61
+++ arts.spec	18 Jul 2006 08:10:58 -0000	1.62
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 1.5.3
-Release: 1.1
+Release: 2
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -175,6 +175,9 @@
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Tue Jul 18 2006 Than Ngo <than at redhat.com> 8:1.5.3-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 09:35:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 05:35:42 -0400
Subject: rpms/man-pages/devel man-pages-1.67-nscd_conf.patch, NONE,
	1.1 man-pages-2.34-getrlimit.patch, NONE,
	1.1 man-pages-2.34-libaio-includes.patch, NONE,
	1.1 man-pages-2.34-nscd.patch, NONE,
	1.1 man-pages-2.34-write.patch, NONE, 1.1 .cvsignore, 1.24,
	1.25 man-pages.spec, 1.45, 1.46 sources, 1.24,
	1.25 man-pages-2.20-nscd.conf.patch, 1.1,
	NONE man-pages-2.29-sigprocmask.patch, 1.1, NONE
Message-ID: <200607180935.k6I9Zgth031576@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31551

Modified Files:
	.cvsignore man-pages.spec sources 
Added Files:
	man-pages-1.67-nscd_conf.patch man-pages-2.34-getrlimit.patch 
	man-pages-2.34-libaio-includes.patch man-pages-2.34-nscd.patch 
	man-pages-2.34-write.patch 
Removed Files:
	man-pages-2.20-nscd.conf.patch 
	man-pages-2.29-sigprocmask.patch 
Log Message:
- add nscd_conf options (nscd_conf.patch)
- added {create,query}_module.2, get_kernel_syms.2 man-pages
- added nscd, getrlimit, libaio and write patch
- remove sigprocmask patch
- update to 2.36



man-pages-1.67-nscd_conf.patch:
 nscd.conf.5 |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+)

--- NEW FILE man-pages-1.67-nscd_conf.patch ---
--- man-pages-1.67/man5/nscd.conf.5.pom	2003-11-11 18:02:18.000000000 +0100
+++ man-pages-1.67/man5/nscd.conf.5	2006-04-12 11:06:55.000000000 +0200
@@ -118,6 +118,48 @@
 .IR /etc/hosts .
 .RE
 
+.B reload-count
+.I unlimited|<number>
+.RS
+Sets the number of times a cached record is reloaded
+before it is pruned from the cache.
+Each cache record has a timeout, when that timeout expires,
+nscd will either reload it (query the NSS service again if the data
+hasn't changed), or drop it.
+.RE
+
+.B paranoia
+.I <yes|no>
+.RS
+Enables or disables restart of nscd every 
+.B restart-interval .
+.RE
+
+.B restart-interval
+.I <time in seconds>
+.RS
+Is interval in which nscd is restarted if option 
+.B paranoia 
+is set. The default value is 3600. 
+.RE
+ 
+.B persistent
+.I service <yes|no>
+.RS
+Enables or disables persistent storage of data. 
+Persistent caches are stored on the disk and therefore survive a nscd restart
+or e.g. machine reboot.
+.RE
+
+.B shared
+.I service <yes|no>
+.RS
+Enables or disables database saring among
+nscd clients (by being read-only mmapped in their address space, so the nscd
+client can directly do the lookup and only if an entry is not found there, ask
+nscd over socket to do the lookup).  
+.RE
+
 .SH "SEE ALSO"
 .BR nscd (8)
 .SH AUTHOR

man-pages-2.34-getrlimit.patch:
 getrlimit.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.34-getrlimit.patch ---
--- man-pages-2.34/man2/getrlimit.2.pom	2006-07-18 09:37:33.000000000 +0200
+++ man-pages-2.34/man2/getrlimit.2	2006-07-18 10:23:29.000000000 +0200
@@ -275,7 +275,7 @@
 .BR EMFILE .
 .TP
 .B RLIMIT_NPROC
-The maximum number of processes that can be created for the real user
+The maximum number of threads that can be created for the real user
 ID of the calling process.
 Upon encountering this limit, 
 .BR fork ()

man-pages-2.34-libaio-includes.patch:
 io_cancel.2    |    2 +-
 io_getevents.2 |    2 +-
 io_submit.2    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE man-pages-2.34-libaio-includes.patch ---
--- man-pages-1.67/man2/io_submit.2.orig	2006-04-11 10:24:00.000000000 -0400
+++ man-pages-1.67/man2/io_submit.2	2006-04-11 10:24:01.000000000 -0400
@@ -27,7 +27,7 @@ io_submit \- Submit asynchronous I/O blo
 .ad l
 .hy 0
 
-#include <linux/aio.h>
+#include <libaio.h>
 .sp
 .HP 16
 long\ \fBio_submit\fR\ (aio_context_t\ \fIctx_id\fR, long\ \fInr\fR, struct\ iocb\ \fI**iocbpp\fR);
--- man-pages-1.67/man2/io_getevents.2.orig	2006-04-11 10:24:14.000000000 -0400
+++ man-pages-1.67/man2/io_getevents.2	2006-04-11 10:24:17.000000000 -0400
@@ -31,7 +31,7 @@ io_getevents \- Read asynchronous I/O ev
 
 .sp
 
-#include <linux/aio.h>
+#include <libaio.h>
 
 .sp
 .HP 19
--- man-pages-1.67/man2/io_cancel.2.orig	2006-04-11 10:24:05.000000000 -0400
+++ man-pages-1.67/man2/io_cancel.2	2006-04-11 10:24:09.000000000 -0400
@@ -27,7 +27,7 @@ io_cancel \- Cancel an outstanding async
 .ad l
 .hy 0
 
-#include <linux/aio.h>
+#include <libaio.h>
 .sp
 .HP 16
 long\ \fBio_cancel\fR\ (aio_context_t\ \fIctx_id\fR, struct\ iocb\ \fI*iocb\fR, struct\ io_event\ \fI*result\fR);

man-pages-2.34-nscd.patch:
 nscd.8 |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE man-pages-2.34-nscd.patch ---
--- man-pages-2.34/man8/nscd.8.pom	2006-07-14 13:24:02.000000000 +0200
+++ man-pages-2.34/man8/nscd.8	2006-07-18 09:36:08.000000000 +0200
@@ -47,6 +47,8 @@
 Note that the shadow file is specifically not cached.
 .BR getspnam (3)
 calls remain uncached as a result.
+As a result of this behavior there is not possible to change non-nscd user
+to another non-nscd user via su service when nscd is running.
 
 .SH OPTIONS
 .TP

man-pages-2.34-write.patch:
 write.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.34-write.patch ---
--- man-pages-1.67/man2/write.2.pom	2002-08-04 14:01:34.000000000 +0200
+++ man-pages-1.67/man2/write.2	2006-04-27 10:55:41.000000000 +0200
@@ -52,7 +52,7 @@
 On success, the number of bytes written are returned (zero indicates
 nothing was written).  On error, \-1 is returned, and \fIerrno\fP is set
 appropriately.  If \fIcount\fP is zero and the file descriptor refers to
-a regular file, 0 will be returned without causing any other effect.
+a regular file, 0 may be returned, or an error could be detected.
 For a special file, the results are not portable.
 .SH ERRORS
 .TP


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	29 Jun 2006 10:59:05 -0000	1.24
+++ .cvsignore	18 Jul 2006 09:35:39 -0000	1.25
@@ -1,3 +1,3 @@
 man-pages-extralocale.tar.bz2
 man2.tar.gz
-man-pages-2.34.tar.bz2
+man-pages-2.36.tar.bz2


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- man-pages.spec	13 Jul 2006 09:28:24 -0000	1.45
+++ man-pages.spec	18 Jul 2006 09:35:39 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
-Version: 2.34
-Release: 3
+Version: 2.36
+Release: 1
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -24,12 +24,15 @@
 Patch19: man-pages-2.32-termcap.patch
 Patch20: man-pages-2.13-aio.patch
 Patch21: man-pages-2.32-mmap.patch
-Patch22: man-pages-2.20-nscd.conf.patch
+Patch22: man-pages-1.67-nscd_conf.patch
 Patch23: man-pages-2.25-dbopen.patch
 Patch24: man-pages-2.25-malloc.patch
-Patch25: man-pages-2.29-sigprocmask.patch
 Patch26: man-pages-2.34-inet.patch
 Patch27: man-pages-2.34-typo.patch
+Patch28: man-pages-2.34-nscd.patch
+Patch29: man-pages-2.34-getrlimit.patch
+Patch30: man-pages-2.34-libaio-includes.patch
+Patch31: man-pages-2.34-write.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -64,9 +67,12 @@
 %patch22 -p1 
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 
@@ -83,9 +89,9 @@
 # Part of quota
 rm -fv man2/quotactl.2
 
-# Part of modutils
-rm -fv man2/get_kernel_syms.2
-rm -fv man2/{create,query}_module.2
+## Part of modutils - now the man pages should be here
+#rm -fv man2/get_kernel_syms.2
+#rm -fv man2/{create,query}_module.2
 
 # Part of console-tools
 rm -fv man4/console.4
@@ -166,6 +172,13 @@
 %{_mandir}/en/man*
 
 %changelog
+* Fri Jul 14 2006 Ivana Varekova <varekova at redhat.com> 2.36-1
+- add nscd_conf options (nscd_conf.patch)
+- added {create,query}_module.2, get_kernel_syms.2 man-pages 
+- added nscd, getrlimit, libaio and write patch
+- remove sigprocmask patch
+- update to 2.36
+
 * Thu Jul 13 2006 Marcela Maslanova <mmaslano at redhat.com> 2.34-3
 - fix small typo (#198663)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	29 Jun 2006 10:59:05 -0000	1.24
+++ sources	18 Jul 2006 09:35:39 -0000	1.25
@@ -1,3 +1,3 @@
 57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
 af09d031dcee66929510e078d00066f2  man2.tar.gz
-fb8d9f55fef19ea5ab899437159c9420  man-pages-2.34.tar.bz2
+c661eb3ff67a3bfe45fe966d74dd22df  man-pages-2.36.tar.bz2


--- man-pages-2.20-nscd.conf.patch DELETED ---


--- man-pages-2.29-sigprocmask.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 10:56:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 06:56:21 -0400
Subject: rpms/vnc/devel vnc.spec,1.146,1.147
Message-ID: <200607181056.k6IAuLBo011362@cvs.devel.redhat.com>

Author: jkudrnac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11293

Modified Files:
	vnc.spec 
Log Message:
* Mon Jul 18 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 4.1.2-3
- vncviewer now supports NewFBSize pseudoencoding (#180939)
- do not BuildRequire libdrm-devel on s390, s390x, ppc64 it is not available there




Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- vnc.spec	18 Jul 2006 10:50:40 -0000	1.146
+++ vnc.spec	18 Jul 2006 10:56:19 -0000	1.147
@@ -51,7 +51,7 @@
 BuildRequires: xorg-x11-proto-devel, libXext-devel
 BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros
 BuildRequires: libXt-devel
-%ifnarch s390 s390x 
+%ifnarch s390 s390x ppc64
 BuildRequires: libdrm-devel
 %endif
 Prereq:    /sbin/chkconfig /sbin/service
@@ -269,7 +269,7 @@
 %changelog
 * Mon Jul 18 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 4.1.2-3
 - vncviewer now supports NewFBSize pseudoencoding (#180939)
-- do not BuildRequire libdrm-devel on s390, it is not available there
+- do not BuildRequire libdrm-devel on s390, s390x, ppc64 it is not available there
 
 * Tue Jun 13 2006 Jeremy Katz <katzj at redhat.com> - 4.1.2-2
 - update xorg-x11-server to 1.1.0 to fix crashes in anaconda



From fedora-cvs-commits at redhat.com  Tue Jul 18 11:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 07:44:16 -0400
Subject: rpms/gdm/devel gdm.spec,1.177,1.178
Message-ID: <200607181144.k6IBiGVj007541@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7363

Modified Files:
	gdm.spec 
Log Message:
add /etc/gdm/securitytoken.conf to file list



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gdm.spec	18 Jul 2006 05:46:11 -0000	1.177
+++ gdm.spec	18 Jul 2006 11:44:13 -0000	1.178
@@ -294,6 +294,7 @@
 %dir %{_sysconfdir}/gdm
 %{_sysconfdir}/gdm/Xsession
 %config(noreplace) %{_sysconfdir}/gdm/custom.conf
+%config %{_sysconfdir}/gdm/securitytokens.conf
 %config %{_sysconfdir}/gdm/XKeepsCrashing
 %config %{_sysconfdir}/gdm/locale.alias
 %config %{_sysconfdir}/gdm/Init/*



From fedora-cvs-commits at redhat.com  Tue Jul 18 11:57:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 07:57:17 -0400
Subject: rpms/s390utils/devel s390-tools-1.5.3-sysfs.patch, NONE,
	1.1 s390utils.spec, 1.41, 1.42
Message-ID: <200607181157.k6IBvHva004068@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4053

Modified Files:
	s390utils.spec 
Added Files:
	s390-tools-1.5.3-sysfs.patch 
Log Message:
- Disabled sysfs support due to API changes in sysfs-2.0.0


s390-tools-1.5.3-sysfs.patch:
 common.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE s390-tools-1.5.3-sysfs.patch ---
--- s390-tools-1.5.3/common.mak.sysfs	2006-07-18 13:54:53.000000000 +0200
+++ s390-tools-1.5.3/common.mak	2006-07-18 13:55:04.000000000 +0200
@@ -6,7 +6,7 @@
 RELEASE            = 5
 PATCHLEVEL         = 3
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)
-SYSFS              = true
+SYSFS              = false
 export S390_TOOLS_RELEASE SYSFS
 
 # Cross Compiling Support


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- s390utils.spec	14 Jul 2006 20:56:28 -0000	1.41
+++ s390utils.spec	18 Jul 2006 11:57:15 -0000	1.42
@@ -21,6 +21,7 @@
 Patch6: s390-tools-1.5.0-rhconf.patch
 Patch7: s390-tools-1.3.1-kernheader.patch
 Patch8: s390-tools-1.3.2-warnings.patch
+Patch9: s390-tools-1.5.3-sysfs.patch
 Patch20: cmsfs-1.1.8-kernel26.patch
 Patch40: src_vipa-2.0.3.-asm.patch
 BuildRoot: /var/tmp/%{name}-root
@@ -80,6 +81,9 @@
 # Patch to fix a couple of code bugs
 %patch8 -p1 -b .warnings
 
+# Patch to disable sysfs
+%patch9 -p1 -b .sysfs
+
 # build on kernel-2.6, too
 %patch20 -p0 -b .cmsfs26
 
@@ -151,6 +155,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-6
+- Disabled sysfs support due to API changes in sysfs-2.0.0
+
 * Fri Jul 14 2006 Karsten Hopp <karsten at redhat.de> 2:1.5.3-5
 - buildrequire net-snmp-devel
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 11:57:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 07:57:35 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.42,1.43
Message-ID: <200607181157.k6IBvZtP004090@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4079

Modified Files:
	s390utils.spec 
Log Message:
- Increase the release ;)



Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- s390utils.spec	18 Jul 2006 11:57:15 -0000	1.42
+++ s390utils.spec	18 Jul 2006 11:57:33 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 5
+Release: 6
 Epoch: 2
 License: GPL
 Group: System Environment/Base



From fedora-cvs-commits at redhat.com  Tue Jul 18 12:00:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 08:00:14 -0400
Subject: rpms/squid/devel sources, 1.19, 1.20 squid.spec, 1.65,
	1.66 squid-2.5.STABLE12-64bit.patch, 1.1,
	NONE squid-2.5.STABLE12-fd-config-fix.patch, 1.1,
	NONE squid-2.5.STABLE12-fd-config.patch, 1.2,
	NONE squid-2.5.STABLE12-follow-xff.patch, 1.1,
	NONE squid-2.5.STABLE13-libbind.patch, 1.1,
	NONE squid-2.5.STABLE14-httpReplyDestroy.patch, 1.1,
	NONE squid-2.5.STABLE5-pipe.patch, 1.2,
	NONE squid-2.5.STABLE7-build.patch, 1.1, NONE
Message-ID: <200607181200.k6IC0EDL004176@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4161

Modified Files:
	sources squid.spec 
Removed Files:
	squid-2.5.STABLE12-64bit.patch 
	squid-2.5.STABLE12-fd-config-fix.patch 
	squid-2.5.STABLE12-fd-config.patch 
	squid-2.5.STABLE12-follow-xff.patch 
	squid-2.5.STABLE13-libbind.patch 
	squid-2.5.STABLE14-httpReplyDestroy.patch 
	squid-2.5.STABLE5-pipe.patch squid-2.5.STABLE7-build.patch 
Log Message:
- new upstream + the latest CVS snapshot from 2006/07/18
- updated fd config patch
- enabled epoll
- fixed release format (#197405)
- enabled WCCPv2 support (#198642)



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 May 2006 23:19:24 -0000	1.19
+++ sources	18 Jul 2006 12:00:11 -0000	1.20
@@ -1 +1 @@
-f413e0b887a5f9b2a75350243ed5564c  squid-2.5.STABLE14.tar.bz2
+d6bb23a67b0475cca11d4af8d574d054  squid-2.6.STABLE1.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- squid.spec	12 Jul 2006 08:18:07 -0000	1.65
+++ squid.spec	18 Jul 2006 12:00:11 -0000	1.66
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE14
-Release: 2.1
+Version: 2.6.STABLE1
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,24 +19,20 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch100: squid-2.5.STABLE14-httpReplyDestroy.patch
+# the latest upstream CVS snapshot
+Patch100: squid-2.6.STABLE1-20060718.patch
 
 # External patches
-Patch150: squid-2.5.STABLE12-follow-xff.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
 Patch201: squid-2.5.STABLE11-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
-Patch203: squid-2.5.STABLE7-build.patch
+Patch203: squid-2.6.STABLE1-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
-Patch205: squid-2.5.STABLE5-pipe.patch
-Patch206: squid-2.5.STABLE13-libbind.patch
-Patch207: squid-2.5.STABLE12-64bit.patch
-Patch208: squid-2.5.STABLE12-fd-config.patch
-Patch209: squid-2.5.STABLE12-fd-config-fix.patch
-Patch210: squid-2.5.STABLE12-smb-path.patch
+Patch205: squid-2.5.STABLE12-smb-path.patch
+Patch206: squid-2.6.STABLE1-fd-config.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -59,20 +55,14 @@
 %prep
 %setup -q
 
-%patch100 -p1 -b .rpl
-
-%patch150 -p1 -b .follow-xff
+%patch100 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
-%patch205 -p1 -b .pipe
-%patch206 -p1 -b .libbind
-%patch207 -p1 -b .stat
-%patch208 -p1 -b .fdc
-%patch209 -p1 -b .fdc
-%patch210 -p1 -b .path
+%patch205 -p1 -b .smb
+%patch206 -p1 -b .fd
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@@ -83,7 +73,7 @@
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
-   --enable-poll \
+   --enable-epoll \
    --enable-snmp \
    --enable-removal-policies="heap,lru" \
    --enable-storeio="aufs,coss,diskd,null,ufs" \
@@ -92,8 +82,8 @@
    --enable-delay-pools \
    --enable-linux-netfilter \
    --with-pthreads \
-   --enable-ntlm-auth-helpers="SMB,winbind,fakeauth" \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
+   --enable-ntlm-auth-helpers="SMB,fakeauth" \
+   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
    --enable-auth="basic,digest,ntlm" \
    --enable-digest-auth-helpers="password" \
    --with-winbind-auth-challenge \
@@ -102,14 +92,17 @@
    --disable-dependency-tracking \
    --enable-cachemgr-hostname=localhost \
    --enable-underscores \
-   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind" \
+   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
    --enable-cache-digests \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
-   --enable-fd-config \
    --enable-follow-x-forwarded-for \
+   --enable-wccpv2 \
+   --enable-fd-config \
+
+
 
 export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
 make %{?_smp_mflags}
@@ -180,6 +173,7 @@
 %attr(644,root,root) /etc/pam.d/squid
 %attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
 %attr(4750,root,squid) %{_libdir}/squid/pam_auth
+%attr(755,root,root) %{_sbindir}/cossdump
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
@@ -330,6 +324,13 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Jul 18 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-1
+- new upstream + the latest CVS snapshot from 2006/07/18
+- updated fd config patch
+- enabled epoll
+- fixed release format (#197405)
+- enabled WCCPv2 support (#198642)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE14-2.1
 - rebuild
 


--- squid-2.5.STABLE12-64bit.patch DELETED ---


--- squid-2.5.STABLE12-fd-config-fix.patch DELETED ---


--- squid-2.5.STABLE12-fd-config.patch DELETED ---


--- squid-2.5.STABLE12-follow-xff.patch DELETED ---


--- squid-2.5.STABLE13-libbind.patch DELETED ---


--- squid-2.5.STABLE14-httpReplyDestroy.patch DELETED ---


--- squid-2.5.STABLE5-pipe.patch DELETED ---


--- squid-2.5.STABLE7-build.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 12:01:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 08:01:39 -0400
Subject: rpms/squid/devel squid-2.6.STABLE1-20060718.patch, NONE,
	1.1 squid-2.6.STABLE1-build.patch, NONE,
	1.1 squid-2.6.STABLE1-fd-config.patch, NONE, 1.1
Message-ID: <200607181201.k6IC1dXe004297@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4257

Added Files:
	squid-2.6.STABLE1-20060718.patch squid-2.6.STABLE1-build.patch 
	squid-2.6.STABLE1-fd-config.patch 
Log Message:
added patches

squid-2.6.STABLE1-20060718.patch:
 RELEASENOTES.html                                       |   88 -
 configure                                               |  906 ++++++++++++++--
 configure.in                                            |   60 -
 helpers/external_acl/mswin_lm_group/win32_check_group.c |   59 -
 include/autoconf.h.in                                   |   25 
 include/version.h                                       |    2 
 src/CacheDigest.c                                       |    5 
 src/HttpRequest.c                                       |    3 
 src/access_log.c                                        |   15 
 src/acl.c                                               |   27 
 src/auth/basic/auth_basic.c                             |   20 
 src/auth/basic/auth_basic.h                             |    1 
 src/auth/digest/auth_digest.c                           |   19 
 src/auth/digest/auth_digest.h                           |    1 
 src/auth/negotiate/auth_negotiate.c                     |    6 
 src/auth/ntlm/auth_ntlm.c                               |    6 
 src/authenticate.c                                      |   16 
 src/cache_cf.c                                          |   30 
 src/cf.data.pre                                         |   21 
 src/client_side.c                                       |   63 -
 src/debug.c                                             |    5 
 src/errorpage.c                                         |    5 
 src/event.c                                             |    6 
 src/fs/aufs/store_asyncufs.h                            |    1 
 src/fs/aufs/store_dir_aufs.c                            |   45 
 src/fs/aufs/store_io_aufs.c                             |   17 
 src/fs/coss/store_coss.h                                |    1 
 src/fs/coss/store_dir_coss.c                            |   18 
 src/fs/coss/store_io_coss.c                             |   27 
 src/fs/diskd/store_dir_diskd.c                          |   45 
 src/fs/diskd/store_diskd.h                              |    1 
 src/fs/diskd/store_io_diskd.c                           |   22 
 src/fs/ufs/store_dir_ufs.c                              |   50 
 src/fs/ufs/store_io_ufs.c                               |   19 
 src/fs/ufs/store_ufs.h                                  |    1 
 src/helper.c                                            |    4 
 src/main.c                                              |    4 
 src/protos.h                                            |    3 
 src/redirect.c                                          |   15 
 src/ssl_support.c                                       |    6 
 src/stat.c                                              |   23 
 src/store.c                                             |   20 
 src/store_digest.c                                      |    4 
 src/store_io.c                                          |    7 
 src/store_rebuild.c                                     |    5 
 src/structs.h                                           |    6 
 src/tools.c                                             |    6 
 src/typedefs.h                                          |    3 
 src/wccp2.c                                             |    5 
 tools/Makefile.am                                       |    6 
 tools/Makefile.in                                       |   19 
 tools/cossdump.c                                        |  218 +++
 52 files changed, 1524 insertions(+), 466 deletions(-)

--- NEW FILE squid-2.6.STABLE1-20060718.patch ---
Differences from squid-2.6.STABLE1 to squid-2.6.STABLE1-20060718
diff -ruN squid-2.6.STABLE1/RELEASENOTES.html squid-2.6.STABLE1-20060718/RELEASENOTES.html
--- squid-2.6.STABLE1/RELEASENOTES.html	Sat Jul  1 12:43:07 2006
+++ squid-2.6.STABLE1-20060718/RELEASENOTES.html	Mon Jul 17 18:12:49 2006
@@ -7,28 +7,31 @@
 <BODY>
 <H1>Squid 2.6.STABLE1 release notes</H1>
 
-<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.18 2006/06/30 21:21:37 hno Exp $
+<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.21 2006/07/08 11:22:41 hno Exp $
 <HR>
 <EM>This document contains the release notes for version 2.6 of Squid.
 Squid is a WWW Cache application developed by the Web Caching community.</EM>
 <HR>
 <P>
-<H2><A NAME="toc1">1.</A> <A HREF="release-2.6.html#s1">Key changes from squid 2.5</A></H2>
+<H2><A NAME="toc1">1.</A> <A HREF="#s1">Key changes from squid 2.5</A></H2>
 
 <P>
-<H2><A NAME="toc2">2.</A> <A HREF="release-2.6.html#s2">Changes to squid.conf</A></H2>
+<H2><A NAME="toc2">2.</A> <A HREF="#s2">Changes to squid.conf</A></H2>
 
 <P>
-<H2><A NAME="toc3">3.</A> <A HREF="release-2.6.html#s3">Known issues</A></H2>
+<H2><A NAME="toc3">3.</A> <A HREF="#s3">Known issues</A></H2>
 
 <P>
-<H2><A NAME="toc4">4.</A> <A HREF="release-2.6.html#s4">Known limitations</A></H2>
+<H2><A NAME="toc4">4.</A> <A HREF="#s4">Known limitations</A></H2>
 
 <P>
-<H2><A NAME="toc5">5.</A> <A HREF="release-2.6.html#s5">Other issues</A></H2>
+<H2><A NAME="toc5">5.</A> <A HREF="#s5">Other issues</A></H2>
 
 <P>
-<H2><A NAME="toc6">6.</A> <A HREF="release-2.6.html#s6">Windows support</A></H2>
+<H2><A NAME="toc6">6.</A> <A HREF="#s6">Windows support</A></H2>
+
+<P>
+<H2><A NAME="toc7">7.</A> <A HREF="#s7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
 
 
 <HR>
@@ -121,6 +124,7 @@
 <DT><B>url_rewrite_concurrency</B><DD><P>Activates a new and more efficient helper protocol. Requires changes in the helper.</P>
 <DT><B>location_rewrite_*</B><DD><P>New helper hook for rewriting Location headers</P>
 <DT><B>auth_param basic blankpassword</B><DD><P>New option to allow the use of blank passwords.</P>
+<DT><B>auth_param basic/digest concurrency</B><DD><P>New option enabling a multiplexed helper protocol allowing the same helper to process multiple concurrent requests in an efficient manner. Requires support from the helper. (2.6.STABLE2 and later)</P>
 <DT><B>auth_param ntlm max_challenge_reuse / max_challenge_lifetime</B><DD><P>No longer supported</P>
 <DT><B>auth_param ntlm use_ntlm_negotiate</B><DD><P>Directive no longer supported. Use of NTLM negotiate packet is always on.</P>
 <DT><B>auth_param ntlm keep_alive</B><DD><P>New option to fine-tune the use of HTTP keep-alive in combination with NTLM</P>
@@ -150,46 +154,31 @@
 
 <P>There is a few known issues in this version of Squid which we hope to correct in a later release</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</A></B><DD><P>"ETag Loop" warnings in cache.log</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</A></B><DD><P>assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</A></B><DD><P>unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</A></B><DD><P>Need to implement TCP fallback on truncated (large) DNS responses</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</a>: "ETag Loop" warnings in cache.log</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</a>: assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</a>: unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</a>: Need to implement TCP fallback on truncated (large) DNS responses</LI>
+</UL>
 </P>
 
 <H2><A NAME="s4">4.</A> <A HREF="#toc4">Known limitations</A></H2>
 
 <P>In addition there is a set of limitations in this version of Squid which we hope to correct later</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</A></B><DD><P>302 responses with an Expires header is always cached</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</A></B><DD><P>WCCPv2 unable to register with more than one router on Linux</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</A></B><DD><P>mime.conf and referenced icons must be within chroot</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</A></B><DD><P>tcp_outgoing_address using an ident ACL does not work</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</A></B><DD><P>acl max_user_ip and multiple authentication schemes</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</A></B><DD><P>miss_access fails on "slow" acl types such as dst.</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</A></B><DD><P>squid -F is starting server sockets to early</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</A></B><DD><P>does not handle swap.state corruption properly</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</A></B><DD><P>unstable if runs out of disk space</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</A></B><DD><P>diskd may appear slow on low loads</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</A></B><DD><P>delay_pools stops working on -k reconfigure</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</a>: 302 responses with an Expires header is always cached</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</a>: WCCPv2 unable to register with more than one router on Linux</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</a>: mime.conf and referenced icons must be within chroot</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</a>: tcp_outgoing_address using an ident ACL does not work</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</a>: acl max_user_ip and multiple authentication schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</a>: miss_access fails on "slow" acl types such as dst.</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</a>: squid -F is starting server sockets to early</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</a>: does not handle swap.state corruption properly</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</a>: unstable if runs out of disk space</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</a>: diskd may appear slow on low loads</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</a>: delay_pools stops working on -k reconfigure</LI>
+</UL>
 </P>
 
 <H2><A NAME="s5">5.</A> <A HREF="#toc5">Other issues</A></H2>
@@ -319,6 +308,23 @@
 </P>
 </DL>
 </P>
+
+
+<H2><A NAME="s7">7.</A> <A HREF="#toc7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
+
+<P>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1650">#1650</a>: transparent interception "Unable to forward this request at this time"</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1658">#1658</a>: Memory corruption when using client-side SSL certificates</LI>
+<LI>COSS fixes</LI>
+<LI>Added the missing concurrency parameter to basic/digest auth schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1669">#1669</a>: SEGV in storeAddVaryReadOld</LI>
+<LI>a number of other minor and cosmetic bugfixes. See the list of 
+<A HREF="http://www.squid-cache.org/Versions/v2/2.6/changesets/">squid-2.6 changes</A> and the 
+<A HREF="ChangeLog">ChangeLog</A> file for details.</LI>
+</UL>
+</P>
+
 
 
 </BODY>
diff -ruN squid-2.6.STABLE1/configure squid-2.6.STABLE1-20060718/configure
--- squid-2.6.STABLE1/configure	Sat Jul  1 12:42:47 2006
+++ squid-2.6.STABLE1-20060718/configure	Mon Jul 17 18:12:32 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.384 .
+# From configure.in Revision: 1.387 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE1.
+# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE1-20060718.
 #
 # Report bugs to <http://www.squid-cache.org/bugs/>.
 #
@@ -270,8 +270,8 @@
 # Identity of this package.
 PACKAGE_NAME='Squid Web Proxy'
 PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='2.6.STABLE1'
-PACKAGE_STRING='Squid Web Proxy 2.6.STABLE1'
+PACKAGE_VERSION='2.6.STABLE1-20060718'
+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE1-20060718'
 PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
 
 ac_default_prefix=/usr/local/squid
@@ -781,7 +781,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Squid Web Proxy 2.6.STABLE1 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 2.6.STABLE1-20060718 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -847,7 +847,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE1:";;
+     short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE1-20060718:";;
    esac
   cat <<\_ACEOF
 
@@ -907,8 +907,6 @@
   --enable-forw-via-db    Enable Forw/Via database
   --enable-cache-digests  Use Cache Digests
 			  see http://www.squid-cache.org/FAQ/FAQ-16.html
-  --enable-auth-on-acceleration
-			  Enable authentication in accelerators
   --enable-default-err-language=lang
 			  Select default language for Error pages (see
 			  errors directory)
@@ -1157,7 +1155,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Squid Web Proxy configure 2.6.STABLE1
+Squid Web Proxy configure 2.6.STABLE1-20060718
 generated by GNU Autoconf 2.59
[...3221 lines suppressed...]
+    tlv *next;
+};
+
+#undef debug
+#define	debug(a, b)	printf
+
+#define	MEM_TLV	sizeof(tlv)
+#define	memAllocate(a)	malloc(a)
+#define	memFree(a, b)	free(a)
+#define xmemcpy(a, b, c) memcpy(a, b, c)
+#define xmalloc(a) malloc(a)
+#define xfree(a) free(a)
+
+#if SIZEOF_INT64_T > SIZEOF_LONG && HAVE_STRTOLL
+typedef int64_t squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_INT64_T
+#define PRINTF_OFF_T PRId64
+#define strto_off_t (int64_t)strtoll
+#else
+typedef long squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_LONG
+#define PRINTF_OFF_T "ld"
+#define strto_off_t strtol
+#endif
+
+static tlv **
+storeSwapTLVAdd(int type, const void *ptr, size_t len, tlv ** tail)
+{
+    tlv *t = memAllocate(MEM_TLV);
+    t->type = (char) type;
+    t->length = (int) len;
+    t->value = xmalloc(len);
+    xmemcpy(t->value, ptr, len);
+    *tail = t;
+    return &t->next;		/* return new tail pointer */
+}
+
+#if UNUSED_CODE
+static void
+storeSwapTLVFree(tlv * n)
+{
+    tlv *t;
+    while ((t = n) != NULL) {
+	n = t->next;
+	xfree(t->value);
+	memFree(t, MEM_TLV);
+    }
+}
+#endif
+
+#if UNUSED_CODE
+static char *
+storeSwapMetaPack(tlv * tlv_list, int *length)
+{
+    int buflen = 0;
+    tlv *t;
+    int j = 0;
+    char *buf;
+    assert(length != NULL);
+    buflen++;			/* STORE_META_OK */
+    buflen += sizeof(int);	/* size of header to follow */
+    for (t = tlv_list; t; t = t->next)
+	buflen += sizeof(char) + sizeof(int) + t->length;
+    buflen++;			/* STORE_META_END */
+    buf = xmalloc(buflen);
+    buf[j++] = (char) STORE_META_OK;
+    xmemcpy(&buf[j], &buflen, sizeof(int));
+    j += sizeof(int);
+    for (t = tlv_list; t; t = t->next) {
+	buf[j++] = (char) t->type;
+	xmemcpy(&buf[j], &t->length, sizeof(int));
+	j += sizeof(int);
+	xmemcpy(&buf[j], t->value, t->length);
+	j += t->length;
+    }
+    buf[j++] = (char) STORE_META_END;
+    assert((int) j == buflen);
+    *length = buflen;
+    return buf;
+}
+#endif
+
+static tlv *
+storeSwapMetaUnpack(const char *buf, int *hdr_len)
+{
+    tlv *TLV;			/* we'll return this */
+    tlv **T = &TLV;
+    char type;
+    int length;
+    int buflen;
+    int j = 0;
+    assert(buf != NULL);
+    assert(hdr_len != NULL);
+    if (buf[j++] != (char) STORE_META_OK)
+	return NULL;
+    xmemcpy(&buflen, &buf[j], sizeof(int));
+    j += sizeof(int);
+    /*
+     * sanity check on 'buflen' value.  It should be at least big
+     * enough to hold one type and one length.
+     */
+    if (buflen <= (sizeof(char) + sizeof(int)))
+	    return NULL;
+    while (buflen - j > (sizeof(char) + sizeof(int))) {
+	type = buf[j++];
+	/* VOID is reserved, but allow some slack for new types.. */
+	if (type <= STORE_META_VOID || type > STORE_META_END + 10) {
+	    debug(20, 0) ("storeSwapMetaUnpack: bad type (%d)!\n", type);
+	    break;
+	}
+	xmemcpy(&length, &buf[j], sizeof(int));
+	if (length < 0 || length > (1 << 16)) {
+	    debug(20, 0) ("storeSwapMetaUnpack: insane length (%d)!\n", length);
+	    break;
+	}
+	j += sizeof(int);
+	if (j + length > buflen) {
+	    debug(20, 0) ("storeSwapMetaUnpack: overflow!\n");
+	    debug(20, 0) ("\ttype=%d, length=%d, buflen=%d, offset=%d\n",
+		type, length, buflen, (int) j);
+	    break;
+	}
+	T = storeSwapTLVAdd(type, &buf[j], (size_t) length, T);
+	j += length;
+    }
+    *hdr_len = buflen;
+    return TLV;
+}
+
+
+#define	STRIPESIZE 1048576
+#define	BLOCKSIZE 1024
+#define BLKBITS 10
+
+static void
+parse_stripe(int stripeid, char *buf, int len)
+{
+	int j = 0;
+	int bl = 0;
+	tlv *t, *tlv_list;
+	int64_t *l;
+	int tmp;
+
+	while (j < len) {
+		l = NULL;
+		bl = 0;
+		tlv_list = storeSwapMetaUnpack(&buf[j], &bl);
+		if (tlv_list == NULL) {
+			printf("  Object: NULL\n");
+			return;
+		}
+		printf("  Object: (filen %d) hdr size %d\n", j / BLOCKSIZE + (stripeid * STRIPESIZE / BLOCKSIZE), bl);
+		for (t = tlv_list; t; t = t->next) {
+			switch(t->type) {
+				case STORE_META_URL:
+					/* XXX Is this OK? Is the URL guaranteed to be \0 terminated? */
+					printf("    URL: %s\n", (char *)t->value);
+					break;
+				case STORE_META_OBJSIZE:
+					l = t->value;
+					printf("Size: %" PRINTF_OFF_T " (len %d)\n", *l, t->length);
+					break;
+			}
+		}
+		if (l == NULL) {
+			printf("  STRIPE: Completed, got an object with no size\n");
+			return;
+		}
+		j = j + *l + bl;
+		/* And now, the blocksize! */
+		tmp = j / BLOCKSIZE;
+		tmp = (tmp+1) * BLOCKSIZE;
+		j = tmp;
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	int fd;
+	char buf[STRIPESIZE];
+	int i = 0, len;
+
+	if (argc < 2) {
+		printf("Usage: %s <path to COSS datafile>\n", argv[0]);
+		exit(1);
+	}
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		perror("open");
+		exit(1);
+	}
+	while ((len = read(fd, buf, STRIPESIZE)) > 0) {
+		printf("STRIPE: %d (len %d)\n", i, len);
+		parse_stripe(i, buf, len);
+		i++;
+	}
+	return 0;
+}

squid-2.6.STABLE1-build.patch:
 errors/Makefile.in |   20 ++++++++++----------
 icons/Makefile.in  |    2 +-
 src/Makefile.in    |   22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE squid-2.6.STABLE1-build.patch ---
--- squid-2.6.STABLE1/errors/Makefile.in.build	2006-06-12 08:09:43.000000000 +0200
+++ squid-2.6.STABLE1/errors/Makefile.in	2006-07-03 11:32:12.000000000 +0200
@@ -221,8 +221,8 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-errordir = $(datadir)/errors
-DEFAULT_ERROR_DIR = $(errordir)
+errordir = $(pkgdatadir)/errors
+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
 INSTALL_LANGUAGES = @ERR_LANGUAGES@
 LANGUAGES = \
 		Azerbaijani \
@@ -413,17 +413,17 @@
 
 install-data-local:
 	@for l in $(INSTALL_LANGUAGES); do \
-		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
+		$(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
 		for f in $(srcdir)/$$l/ERR_*; do \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
 		done \
 	done
 
 uninstall-local:
 	@for l in $(INSTALL_LANGUAGES); do \
 		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	        	rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
 		done \
 	done
 
@@ -436,13 +436,13 @@
 #
 addlang: all
 	- at if test -d $(srcdir)/$(ADDLANG); then \
-	if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
+	if test -d $(errordir)/$(DESTLANG); then \
 	cd $(srcdir)/$(ADDLANG)/ ; \
 	for f in ERR_*; do \
-		if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
+		if test -f $(errordir)/$(DESTLANG)/$$f ; then \
 			echo "appending $(ADDLANG)/$$f"; \
-			echo "<HR>" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
-			cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
+			echo "<HR>" >> $(errordir)/$(DESTLANG)/$$f ; \
+			cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
 		fi; \
 	done; \
 	fi \
--- squid-2.6.STABLE1/icons/Makefile.in.build	2006-06-12 08:10:08.000000000 +0200
+++ squid-2.6.STABLE1/icons/Makefile.in	2006-07-03 11:23:00.000000000 +0200
@@ -258,7 +258,7 @@
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = 
--- squid-2.6.STABLE1/src/Makefile.in.build	2006-06-12 08:10:08.000000000 +0200
+++ squid-2.6.STABLE1/src/Makefile.in	2006-07-03 13:15:28.000000000 +0200
@@ -586,18 +586,18 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD = $(libexecdir)/`echo diskd_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR = $(datadir)/icons
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
 DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
 
 # Don't automatically uninstall config files
@@ -842,20 +842,20 @@
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+	test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/squid"
 	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 
 uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)

squid-2.6.STABLE1-fd-config.patch:
 configure             |   28 +++++++++++++++
 configure.in          |   10 +++++
 include/autoconf.h.in |    3 +
 src/bit_array.h       |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/cf.data.pre       |   12 ++++++
 src/comm.c            |   16 ++++----
 src/comm_epoll.c      |   19 +++++++++-
 src/comm_poll.c       |   47 ++++++++++++++++++++++----
 src/comm_select.c     |   89 +++++++++++++++++++++++++++++++++++--------------
 src/delay_pools.c     |    4 +-
 src/fd.c              |   10 ++---
 src/globals.h         |    2 -
 src/ident.c           |    2 -
 src/ipc.c             |    2 -
 src/main.c            |   13 +++++--
 src/mem.c             |    4 +-
 src/protos.h          |    2 +
 src/snmp_agent.c      |    2 -
 src/squid.h           |   12 ++++++
 src/stat.c            |    6 +--
 src/structs.h         |    3 +
 src/tools.c           |   18 +++++++---
 22 files changed, 328 insertions(+), 66 deletions(-)

--- NEW FILE squid-2.6.STABLE1-fd-config.patch ---
--- squid-2.6.STABLE1/configure.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/configure	2006-07-18 10:09:15.000000000 +0200
@@ -2970,6 +2970,34 @@
   AMDEP_FALSE=
 fi
 
+if false; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+# Check whether --enable-fd-config or --disable-fd-config was given.
+if test "${enable_fd_config+set}" = set; then
+  enableval="$enable_fd_config"
+   if test "$enableval" = "yes" ; then
+    echo "File descriptor config enabled"
+    cat >> confdefs.h <<\EOF
+#define FD_CONFIG 1
+EOF
+
+    
+
+if true; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+  fi
+
+fi
 
 
 
--- squid-2.6.STABLE1/include/autoconf.h.in.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/include/autoconf.h.in	2006-07-18 10:09:15.000000000 +0200
@@ -36,6 +36,9 @@
 /* Traffic management via "delay pools". */
 #undef DELAY_POOLS
 
+/* Filedesc managment */
+#undef FD_CONFIG
+
 /* Enable following X-Forwarded-For headers */
 #undef FOLLOW_X_FORWARDED_FOR
 
--- squid-2.6.STABLE1/configure.in.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/configure.in	2006-07-18 10:09:15.000000000 +0200
@@ -501,6 +501,16 @@
   fi
 ])
 
+AM_CONDITIONAL(USE_FD_CONFIG, false)
+AC_ARG_ENABLE(fd-config,
+[  --enable-fd-config    Enable filedesc config to configure maximal number of used filedescriptors],
+[ if test "$enableval" = "yes" ; then
+    echo "Filedesc config enabled"
+    AC_DEFINE(FD_CONFIG)
+    AM_CONDITIONAL(USE_FD_CONFIG, true)
+  fi
+])
+
 dnl This is a developer only option. Developers know how to set defines
 dnl
 dnl AC_ARG_ENABLE(mem-gen-trace,
--- squid-2.6.STABLE1/src/fd.c.fd	2006-06-11 19:06:25.000000000 +0200
+++ squid-2.6.STABLE1/src/fd.c	2006-07-18 10:09:15.000000000 +0200
@@ -61,7 +61,7 @@
 {
     if (fd < Biggest_FD)
 	return;
-    assert(fd < Squid_MaxFD);
+    assert(fd < SQUID_NUMFD);
     if (fd > Biggest_FD) {
 	/*
 	 * assert that we are not closing a FD bigger than
@@ -206,7 +206,7 @@
 {
     int i;
     fde *F;
-    for (i = 0; i < Squid_MaxFD; i++) {
+    for (i = 0; i < SQUID_NUMFD; i++) {
 	F = &fd_table[i];
 	if (!F->flags.open)
 	    continue;
@@ -223,7 +223,7 @@
 int
 fdNFree(void)
 {
-    return Squid_MaxFD - Number_FD - Opening_FD;
+    return SQUID_NUMFD - Number_FD - Opening_FD;
 }
 
 int
@@ -252,10 +252,10 @@
     /*
      * Calculate a new reserve, based on current usage and a small extra
      */
-    new = Squid_MaxFD - Number_FD + XMIN(25, Squid_MaxFD / 16);
+    new = SQUID_NUMFD - Number_FD + XMIN(25, SQUID_NUMFD / 16);
     if (new <= RESERVED_FD)
 	return;
-    x = Squid_MaxFD - 20 - XMIN(25, Squid_MaxFD / 16);
+    x = SQUID_NUMFD - 20 - XMIN(25, SQUID_NUMFD / 16);
     if (new > x) {
 	/* perhaps this should be fatal()? -DW */
 	debug(51, 0) ("WARNING: This machine has a serious shortage of filedescriptors.\n");
--- squid-2.6.STABLE1/src/mem.c.fd	2006-05-20 23:51:49.000000000 +0200
+++ squid-2.6.STABLE1/src/mem.c	2006-07-18 10:09:15.000000000 +0200
@@ -335,13 +335,13 @@
     memDataInit(MEM_HTTP_HDR_CONTENT_RANGE, "HttpHdrContRange", sizeof(HttpHdrContRange), 0);
     memDataInit(MEM_INTLIST, "intlist", sizeof(intlist), 0);
     memDataInit(MEM_MEMOBJECT, "MemObject", sizeof(MemObject),
-	Squid_MaxFD >> 3);
+	SQUID_NUMFD >> 3);
     memDataInit(MEM_MEM_NODE, "mem_node", sizeof(mem_node), 0);
     memDataInit(MEM_NETDBENTRY, "netdbEntry", sizeof(netdbEntry), 0);
     memDataInit(MEM_NET_DB_NAME, "net_db_name", sizeof(net_db_name), 0);
     memDataInit(MEM_RELIST, "relist", sizeof(relist), 0);
     memDataInit(MEM_REQUEST_T, "request_t", sizeof(request_t),
-	Squid_MaxFD >> 3);
+	SQUID_NUMFD >> 3);
     memDataInit(MEM_STOREENTRY, "StoreEntry", sizeof(StoreEntry), 0);
     memDataInit(MEM_WORDLIST, "wordlist", sizeof(wordlist), 0);
     memDataInit(MEM_CLIENT_INFO, "ClientInfo", sizeof(ClientInfo), 0);
--- squid-2.6.STABLE1/src/cf.data.pre.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/src/cf.data.pre	2006-07-18 10:09:15.000000000 +0200
@@ -5027,4 +5027,16 @@
 	or response to be rejected.
 DOC_END
 
+NAME: max_filedesc
+IFDEF: FD_CONFIG
+TYPE: int
+DEFAULT: 1024
+LOC: Config.max_filedesc
+DOC_START
+	The maximum number of open file descriptors.
+        
+	WARNING: Changes of this value isn't respected by reconfigure 
+	command. This value should be changed only if there isn't 
+	any active squid process.
+DOC_END
 EOF
--- squid-2.6.STABLE1/src/ipc.c.fd	2006-06-24 11:41:36.000000000 +0200
+++ squid-2.6.STABLE1/src/ipc.c	2006-07-18 10:09:15.000000000 +0200
@@ -298,7 +298,7 @@
     close(t3);
 #if 0
     /* Make sure all other filedescriptors are closed */
-    for (x = 3; x < Squid_MaxFD; x++)
+    for (x = 3; x < SQUID_NUMFD; x++)
 	close(x);
 #endif
 #if HAVE_SETSID
--- squid-2.6.STABLE1/src/protos.h.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/src/protos.h	2006-07-18 10:09:15.000000000 +0200
@@ -1264,6 +1264,8 @@
 
 #if DELAY_POOLS
 extern void delayPoolsInit(void);
+extern void delayPoolsAllocate(void);
+extern void delayPoolsFree(void);
 extern void delayInitDelayData(unsigned short pools);
 extern void delayFreeDelayData(unsigned short pools);
 extern void delayCreateDelayPool(unsigned short pool, u_char class);
--- squid-2.6.STABLE1/src/snmp_agent.c.fd	2006-05-16 03:08:30.000000000 +0200
+++ squid-2.6.STABLE1/src/snmp_agent.c	2006-07-18 10:09:15.000000000 +0200
@@ -326,7 +326,7 @@
 	break;
     case PERF_SYS_CURUNUSED_FD:
 	Answer = snmp_var_new_integer(Var->name, Var->name_length,
-	    (snint) Squid_MaxFD - Number_FD,
+	    (snint) SQUID_NUMFD - Number_FD,
 	    SMI_GAUGE32);
 	break;
     case PERF_SYS_CURRESERVED_FD:
--- squid-2.6.STABLE1/src/comm_poll.c.fd	2006-06-25 17:53:14.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_poll.c	2006-07-18 10:17:11.000000000 +0200
@@ -152,13 +152,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
@@ -286,9 +304,9 @@
 int
 comm_select(int msec)
 {
-    struct pollfd pfds[SQUID_MAXFD];
+    struct pollfd pfds[SQUID_NUMFD];
 #if DELAY_POOLS
-    char slowfds[SQUID_MAXFD];
+    BIT_ARRAY slowfds;
 #endif
     int fd;
     unsigned int i;
@@ -300,6 +318,9 @@
     int calldns = 0;
     static time_t last_timeout = 0;
     double timeout = current_dtime + (msec / 1000.0);
+#if DELAY_POOLS
+    BA_INIT(slowfds,SQUID_NUMFD);
+#endif
     do {
 	double start;
 	getCurrentTime();
@@ -307,7 +328,7 @@
 	/* Handle any fs callbacks that need doing */
 	storeDirCallback();
 #if DELAY_POOLS
-	memset(slowfds, 0, Biggest_FD);
+	BA_ZERO(slowfds);
 #endif
 	if (commCheckICPIncoming)
 	    comm_poll_icp_incoming();
@@ -333,7 +354,7 @@
 		    break;
 #if DELAY_POOLS
 		case -1:
-		    slowfds[i] = 1;
+		    BA_SET(i, slowfds);
 		    break;
 #endif
 		default:
@@ -384,6 +405,9 @@
 	}
 	if (nfds == 0) {
 	    assert(shutting_down);
+#if DELAY_POOLS
+            BA_FREE(slowfds);
+#endif
 	    return COMM_SHUTDOWN;
 	}
 	if (npending)
@@ -396,6 +420,9 @@
 	if (num < 0 && !ignoreErrno(errno)) {
 	    debug(5, 0) ("comm_select: poll failure: %s\n", xstrerror());
 	    assert(errno != EINVAL);
+#if DELAY_POOLS
+            BA_FREE(slowfds);
+#endif
 	    return COMM_ERROR;
 	    /* NOTREACHED */
 	}
@@ -462,7 +489,7 @@
 		if (hdl == NULL)
 		    (void) 0;	/* Nothing to do */
 #if DELAY_POOLS
-		else if (slowfds[i])
+		else if (BA_ISSET(fd, slowfds))
 		    commAddSlowFd(fd);
 #endif
 		else {
@@ -546,10 +573,16 @@
 #endif
 	getCurrentTime();
 	statCounter.select_time += (current_dtime - start);
+#if DELAY_POOLS
+        BA_FREE(slowfds);
+#endif
 	return COMM_OK;
     }
     while (timeout > current_dtime);
     debug(5, 8) ("comm_select: time out: %ld.\n", (long int) squid_curtime);
+#if DELAY_POOLS
+    BA_FREE(slowfds);
+#endif
     return COMM_TIMEOUT;
 }
 
--- squid-2.6.STABLE1/src/comm_epoll.c.fd	2006-06-27 15:09:43.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_epoll.c	2006-07-18 10:09:15.000000000 +0200
@@ -68,13 +68,13 @@
 void
 comm_select_init()
 {
-    kdpfd = epoll_create(Squid_MaxFD);
+    kdpfd = epoll_create(SQUID_NUMFD);
     if (kdpfd < 0)
 	fatalf("comm_select_init: epoll_create(): %s\n", xstrerror());
     fd_open(kdpfd, FD_UNKNOWN, "epoll ctl");
     commSetCloseOnExec(kdpfd);
 
-    epoll_state = xcalloc(Squid_MaxFD, sizeof(*epoll_state));
+    epoll_state = xcalloc(SQUID_NUMFD, sizeof(*epoll_state));
 }
 
 void
@@ -86,6 +86,21 @@
     safe_free(epoll_state);
 }
 
+#if DELAY_POOLS
+
+/* dummy functions... */
+void
+comm_slow_fd_init(int fd_num)
+{
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+}
+
+#endif
+
 void
 commSetEvents(int fd, int need_read, int need_write)
 {
--- squid-2.6.STABLE1/src/ident.c.fd	2006-05-13 00:08:37.000000000 +0200
+++ squid-2.6.STABLE1/src/ident.c	2006-07-18 10:09:15.000000000 +0200
@@ -239,7 +239,7 @@
 identInit(void)
 {
     ident_hash = hash_create((HASHCMP *) strcmp,
-	hashPrime(Squid_MaxFD / 8),
+	hashPrime(SQUID_NUMFD / 8),
 	hash4);
 }
 
--- squid-2.6.STABLE1/src/main.c.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/src/main.c	2006-07-18 10:11:06.000000000 +0200
@@ -556,7 +556,7 @@
 	debug(1, 0) ("Running on %s\n", WIN32_OS_string);
 #endif
     debug(1, 1) ("Process ID %d\n", (int) getpid());
-    debug(1, 1) ("With %d file descriptors available\n", Squid_MaxFD);
+    debug(1, 1) ("With %d file descriptors available\n", SQUID_NUMFD);
 #ifdef _SQUID_MSWIN_
     debug(1, 1) ("With %d CRT stdio descriptors available\n", _getmaxstdio());
     if (WIN32_Socks_initialized)
@@ -611,6 +611,9 @@
 #if DELAY_POOLS
 	delayPoolsInit();
 #endif
+#if DELAY_POOLS
+	comm_slow_fd_init(SQUID_NUMFD);
+#endif
 	fwdInit();
     }
 #if USE_WCCP
@@ -674,8 +677,6 @@
 #endif
 
     debug_log = stderr;
-    if (FD_SETSIZE < Squid_MaxFD)
-	Squid_MaxFD = FD_SETSIZE;
 
 #ifdef _SQUID_WIN32_
     if ((WIN32_init_err = WIN32_Subsystem_Init(&argc, &argv)))
@@ -758,6 +759,8 @@
     /* Make sure the OS allows core dumps if enabled in squid.conf */
     enableCoredumps();
 
+    setMaxFD();
+
 #if TEST_ACCESS
     comm_init();
     comm_select_init();
@@ -791,7 +794,6 @@
     }
     if (!opt_no_daemon)
 	watch_child(argv);
-    setMaxFD();
 
     /* init comm module */
     comm_init();
@@ -1096,6 +1098,9 @@
 #endif
     releaseServerSockets();
     commCloseAllSockets();
+#if DELAY_POOLS
+    comm_slow_fd_destroy();
+#endif
     authenticateShutdown();
 #if USE_UNLINKD
     unlinkdClose();
--- squid-2.6.STABLE1/src/structs.h.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/src/structs.h	2006-07-18 10:09:15.000000000 +0200
@@ -805,6 +805,9 @@
 #endif
     time_t refresh_stale_window;
     int umask;
+#if FD_CONFIG
+    int max_filedesc;
+#endif
 };
 
 struct _SquidConfig2 {
--- squid-2.6.STABLE1/src/delay_pools.c.fd	2006-06-08 21:36:36.000000000 +0200
+++ squid-2.6.STABLE1/src/delay_pools.c	2006-07-18 10:10:11.000000000 +0200
@@ -89,7 +89,7 @@
 typedef union _delayPool delayPool;
 
 static delayPool *delay_data = NULL;
-static char *delay_no_delay;
+static char *delay_no_delay = NULL;
 static time_t delay_pools_last_update = 0;
 static hash_table *delay_id_ptr_hash = NULL;
 static long memory_used = 0;
@@ -134,7 +134,7 @@
 delayPoolsInit(void)
 {
     delay_pools_last_update = getCurrentTime();
-    delay_no_delay = xcalloc(1, Squid_MaxFD);
+    delay_no_delay = xcalloc(1, SQUID_NUMFD);
     cachemgrRegister("delay", "Delay Pool Levels", delayPoolStats, 0, 1);
 }
 
--- squid-2.6.STABLE1/src/tools.c.fd	2006-06-30 23:23:05.000000000 +0200
+++ squid-2.6.STABLE1/src/tools.c	2006-07-18 10:09:15.000000000 +0200
@@ -753,6 +753,12 @@
 void
 setMaxFD(void)
 {
+
+/* Set up number of used filedescriptors from config file */
+#if FD_CONFIG
+   SQUID_NUMFD = Config.max_filedesc;
+#endif
+
 #if HAVE_SETRLIMIT
     /* try to use as many file descriptors as possible */
     /* System V uses RLIMIT_NOFILE and BSD uses RLIMIT_OFILE */
@@ -762,9 +768,11 @@
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
 	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
     } else {
-	rl.rlim_cur = Squid_MaxFD;
+	rl.rlim_max = rl.rlim_cur = SQUID_NUMFD;
+/*
 	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
+	    rl.rlim_cur = rl.rlim_max;
+*/
 	if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
 	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
 		"setrlimit: RLIMIT_NOFILE: %s", xstrerror());
@@ -775,9 +783,11 @@
     if (getrlimit(RLIMIT_OFILE, &rl) < 0) {
 	debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
     } else {
-	rl.rlim_cur = Squid_MaxFD;
+	rl.rlim_max = rl.rlim_cur = SQUID_NUMFD;
+/*
 	if (rl.rlim_cur > rl.rlim_max)
-	    Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
+	    rl.rlim_cur = rl.rlim_max;
+*/
 	if (setrlimit(RLIMIT_OFILE, &rl) < 0) {
 	    snprintf(tmp_error_buf, ERROR_BUF_SZ,
 		"setrlimit: RLIMIT_OFILE: %s", xstrerror());
--- squid-2.6.STABLE1/src/comm_select.c.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_select.c	2006-07-18 10:09:15.000000000 +0200
@@ -61,8 +61,8 @@
 static void comm_select_dns_incoming(void);
 
 static struct timeval zero_tv;
-static fd_set global_readfds;
-static fd_set global_writefds;
+static BIT_ARRAY global_readfds;
+static BIT_ARRAY global_writefds;
 static int nreadfds;
 static int nwritefds;
 
@@ -157,13 +157,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
@@ -294,7 +312,7 @@
     fd_set readfds;
     fd_set writefds;
 #if DELAY_POOLS
-    fd_set slowfds;
+    BIT_ARRAY slowfds;
 #endif
     int fd;
     int maxfd;
@@ -310,12 +328,15 @@
     static time_t last_timeout = 0;
     struct timeval poll_time;
     double timeout = current_dtime + (msec / 1000.0);
+#if DELAY_POOLS
+    BA_INIT(slowfds,SQUID_NUMFD);
+#endif
     do {
 	double start;
 	getCurrentTime();
 	start = current_dtime;
 #if DELAY_POOLS
-	FD_ZERO(&slowfds);
+	BA_ZERO(slowfds);
 #endif
 	/* Handle any fs callbacks that need doing */
 	storeDirCallback();
@@ -327,10 +348,12 @@
 	    comm_select_http_incoming();
 	callicp = calldns = callhttp = 0;
 	maxfd = Biggest_FD + 1;
-	xmemcpy(&readfds, &global_readfds,
-	    howmany(maxfd, FD_MASK_BITS) * FD_MASK_BYTES);
-	xmemcpy(&writefds, &global_writefds,
-	    howmany(maxfd, FD_MASK_BITS) * FD_MASK_BYTES);
+#if !FD_CONFIG
+        xmemcpy(&readfds, &global_readfds,
+            howmany(maxfd, FD_MASK_BITS) * FD_MASK_BYTES);
+        xmemcpy(&writefds, &global_writefds,
+            howmany(maxfd, FD_MASK_BITS) * FD_MASK_BYTES);
+#endif
 	/* remove stalled FDs, and deal with pending descriptors */
 	maxindex = howmany(maxfd, FD_MASK_BITS);
 	/* Note: To simplify logics we are cheating a little on pending fds
@@ -357,7 +380,7 @@
 			break;
 #if DELAY_POOLS
 		    case -1:
-			FD_SET(fd, &slowfds);
+			BA_SET(fd, slowfds);
 			break;
 #endif
 		    default:
@@ -368,6 +391,9 @@
 	}
 	if (nreadfds + nwritefds == 0) {
 	    assert(shutting_down);
+#if DELAY_POOLS
+            BA_FREE(slowfds);
+#endif
 	    return COMM_SHUTDOWN;
 	}
 	if (msec > MAX_POLL_TIME)
@@ -385,6 +411,9 @@
 	    debug(5, 0) ("comm_select: select failure: %s\n",
 		xstrerror());
 	    examine_select(&readfds, &writefds);
+#if DELAY_POOLS
+            BA_FREE(slowfds);
+#endif
 	    return COMM_ERROR;
 	    /* NOTREACHED */
 	}
@@ -448,7 +477,7 @@
 			break;
 		    }
 #if DELAY_POOLS
-		    if (do_read && FD_ISSET(fd, &slowfds))
+		    if (do_read && BA_ISSET(fd, slowfds))
 			commAddSlowFd(fd);
 		    else
 #endif
@@ -525,10 +554,16 @@
 #endif
 	getCurrentTime();
 	statCounter.select_time += (current_dtime - start);
+#if DELAY_POOLS
+        BA_FREE(slowfds);
+#endif
 	return COMM_OK;
     }
     while (timeout > current_dtime);
     debug(5, 8) ("comm_select: time out: %d\n", (int) squid_curtime);
+#if DELAY_POOLS
+    BA_FREE(slowfds);
+#endif
     return COMM_TIMEOUT;
 }
 
@@ -563,8 +598,12 @@
     cachemgrRegister("comm_incoming",
 	"comm_incoming() stats",
 	commIncomingStats, 0, 1);
-    FD_ZERO(&global_readfds);
-    FD_ZERO(&global_writefds);
+
+    BA_INIT(global_readfds,SQUID_NUMFD);
+    BA_INIT(global_writefds,SQUID_NUMFD);
+
+    BA_ZERO(global_readfds);
+    BA_ZERO(global_writefds);
     nreadfds = nwritefds = 0;
 }
 
@@ -594,7 +633,7 @@
     fde *F = NULL;
     struct stat sb;
     debug(5, 0) ("examine_select: Examining open file descriptors...\n");
-    for (fd = 0; fd < Squid_MaxFD; fd++) {
+    for (fd = 0; fd < SQUID_NUMFD; fd++) {
 	FD_ZERO(&read_x);
 	FD_ZERO(&write_x);
 	tv.tv_sec = tv.tv_usec = 0;
@@ -662,18 +701,18 @@
 void
 commSetEvents(int fd, int need_read, int need_write)
 {
-    if (need_read && !FD_ISSET(fd, &global_readfds)) {
-	FD_SET(fd, &global_readfds);
-	nreadfds++;
-    } else if (!need_read && FD_ISSET(fd, &global_readfds)) {
-	FD_CLR(fd, &global_readfds);
-	nreadfds--;
+    if (need_read && !BA_ISSET(fd, global_readfds)) {
+	BA_SET(fd, global_readfds);
+        nreadfds++;
+    } else if (!need_read && BA_ISSET(fd, global_readfds)) {
+	BA_CLR(fd, global_readfds);
+      	nreadfds--;
     }
-    if (need_write && !FD_ISSET(fd, &global_writefds)) {
-	FD_SET(fd, &global_writefds);
+    if (need_write && !BA_ISSET(fd, global_writefds)) {
+	BA_SET(fd, global_writefds);
 	nwritefds++;
-    } else if (!need_write && FD_ISSET(fd, &global_writefds)) {
-	FD_CLR(fd, &global_writefds);
+    } else if (!need_write && BA_ISSET(fd, global_writefds)) {
+	BA_CLR(fd, global_writefds);
 	nwritefds--;
     }
 }
--- squid-2.6.STABLE1/src/comm.c.fd	2006-06-27 13:14:22.000000000 +0200
+++ squid-2.6.STABLE1/src/comm.c	2006-07-18 10:09:15.000000000 +0200
@@ -242,7 +242,7 @@
 }
 
 /*
- * NOTE: set the listen queue to Squid_MaxFD/4 and rely on the kernel to      
+ * NOTE: set the listen queue to Squid_MAXFD/4 and rely on the kernel to      
  * impose an upper limit.  Solaris' listen(3n) page says it has   
  * no limit on this parameter, but sys/socket.h sets SOMAXCONN 
  * to 5.  HP-UX currently has a limit of 20.  SunOS is 5 and
@@ -252,9 +252,9 @@
 comm_listen(int sock)
 {
     int x;
-    if ((x = listen(sock, Squid_MaxFD >> 2)) < 0) {
+    if ((x = listen(sock, SQUID_NUMFD >> 2)) < 0) {
 	debug(5, 0) ("comm_listen: listen(%d, %d): %s\n",
-	    Squid_MaxFD >> 2,
+	    SQUID_NUMFD >> 2,
 	    sock, xstrerror());
 	return x;
     }
@@ -454,7 +454,7 @@
     fde *F;
     debug(5, 3) ("commSetTimeout: FD %d timeout %d\n", fd, timeout);
     assert(fd >= 0);
-    assert(fd < Squid_MaxFD);
+    assert(fd < SQUID_NUMFD);
     F = &fd_table[fd];
     assert(F->flags.open);
     if (timeout < 0) {
@@ -721,7 +721,7 @@
 
     debug(5, 5) ("comm_close: FD %d\n", fd);
     assert(fd >= 0);
-    assert(fd < Squid_MaxFD);
+    assert(fd < SQUID_NUMFD);
 
     /* XXX This down to the cavium block below needs to be split and
      * also called once on lingering close. In addition the ssl_shutdown
@@ -1026,12 +1026,12 @@
 void
 comm_init(void)
 {
-    fd_table = xcalloc(Squid_MaxFD, sizeof(fde));
+    fd_table = xcalloc(SQUID_NUMFD, sizeof(fde));
     /* XXX account fd_table */
     /* Keep a few file descriptors free so that we don't run out of FD's
      * after accepting a client but before it opens a socket or a file.
-     * Since Squid_MaxFD can be as high as several thousand, don't waste them */
-    RESERVED_FD = XMIN(100, Squid_MaxFD / 4);
+     * Since SQUID_NUMFD can be as high as several thousand, don't waste them */
+    RESERVED_FD = XMIN(100, SQUID_NUMFD / 4);
     CBDATA_INIT_TYPE(ConnectStateData);
     comm_write_pool = memPoolCreate("CommWriteStateData", sizeof(CommWriteStateData));
     conn_close_pool = memPoolCreate("close_handler", sizeof(close_handler));
--- squid-2.6.STABLE1/src/squid.h.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/squid.h	2006-07-18 10:09:15.000000000 +0200
@@ -409,6 +409,18 @@
 #include "cache_snmp.h"
 #endif
 
+#if !USE_POLL && !USE_EPOLL
+#undef FD_CONFIG
+#endif
+
+#if FD_CONFIG
+#define BIT_ARRAY_ACTIVE 1
+#else
+#define BIT_ARRAY_ACTIVE 0
+#endif
+
+#include "bit_array.h"
+
 #include "hash.h"
 #include "rfc1035.h"
 
--- /dev/null	2006-07-17 08:51:40.641022250 +0200
+++ squid-2.6.STABLE1/src/bit_array.h	2006-07-18 10:09:15.000000000 +0200
@@ -0,0 +1,90 @@
+/*
+ *
+ * DEBUG:
+ * AUTHOR: Martin Stransky <stransky at redhat.com>
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  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, USA.
+ *
+ */
+
+#ifndef __BIT_ARRAY_H__
+#define __BIT_ARRAY_H__
+
+#if !BIT_ARRAY_ACTIVE
+
+#define BIT_ARRAY             fd_set
+#define BA_INIT(arr,len)
+#define BA_FREE(arr)       
+
+#define BA_ZERO(arr)          FD_ZERO(&arr)
+#define BA_SET(fd,arr)        FD_SET(fd,&arr)
+#define BA_CLR(fd,arr)        FD_CLR(fd,&arr)
+#define BA_ISSET(fd,arr)      FD_ISSET(fd,&arr)
+
+#else
+
+typedef struct _BIT_ARRAY {
+
+  int *p_pool;
+  int  len;
+  int  offset_mask;
+  int  base_shift;
+
+} BIT_ARRAY;
+
+#define BA_INIT(arr,lenght)                                                 \
+{                                                                           \
+  int i,tmp = sizeof((arr).p_pool[0])*8;                                    \
+                                                                            \
+  for(i = 2, (arr).base_shift = 1; i < tmp; i *= 2)                         \
+    (arr).base_shift++;                                                     \
+  (arr).offset_mask = (i-1);                                                \
+                                                                            \
+  (arr).len = lenght / (sizeof((arr).p_pool[0])*8) + 1;                     \
+  (arr).p_pool = xmalloc(sizeof((arr).p_pool[0])*(arr).len);                \
+}                                                                           \
+
+
+#define BA_FREE(arr)         \
+{                            \
+  if((arr).p_pool) {         \
+    xfree((arr).p_pool);     \
+    (arr).p_pool = NULL;     \
+  }                          \
+  (arr).len = 0;             \
+}                            \
+
+
+#define BA_ZERO(arr)        { memset((arr).p_pool, 0, sizeof((arr).p_pool[0])*(arr).len); }
+#define BA_SET(fdsp, arr)   { (arr).p_pool[(fdsp)>>(arr).base_shift]|=(0x1<<((fdsp)&(arr).offset_mask)); }
+#define BA_CLR(fdsp, arr)   { (arr).p_pool[(fdsp)>>(arr).base_shift]&=(~(0x1<<((fdsp)&(arr).offset_mask))); }
+#define BA_ISSET(fdsp, arr) ((arr).p_pool[(fdsp)>>(arr).base_shift]&(0x1<<((fdsp)&(arr).offset_mask)))
+
+#endif // BIT_ARRAY_ACTIVE
+
+#endif //__BIT_ARRAY_H__
+
--- squid-2.6.STABLE1/src/globals.h.fd	2006-06-30 23:23:05.000000000 +0200
+++ squid-2.6.STABLE1/src/globals.h	2006-07-18 10:09:15.000000000 +0200
@@ -74,7 +74,7 @@
 extern int NDnsServersAlloc;	/* 0 */
 extern int NHttpSockets;	/* 0 */
 extern int RESERVED_FD;
-extern int Squid_MaxFD;		/* SQUID_MAXFD */
+extern int SQUID_NUMFD;		/* SQUID_MAXFD */
 extern int config_lineno;	/* 0 */
 extern int debugLevels[MAX_DEBUG_SECTIONS];
 extern int do_mallinfo;		/* 0 */
--- squid-2.6.STABLE1/src/stat.c.fd	2006-07-18 10:09:15.000000000 +0200
+++ squid-2.6.STABLE1/src/stat.c	2006-07-18 10:09:15.000000000 +0200
@@ -449,7 +449,7 @@
 	"Remote Address",
 	"Description");
     storeAppendPrintf(sentry, "---- ------ ---- -------- -------- --------------------- ------------------------------\n");
-    for (i = 0; i < Squid_MaxFD; i++) {
+    for (i = 0; i < SQUID_NUMFD; i++) {
 	f = &fd_table[i];
 	if (!f->flags.open)
 	    continue;
@@ -640,7 +640,7 @@
 
     storeAppendPrintf(sentry, "File descriptor usage for %s:\n", appname);
     storeAppendPrintf(sentry, "\tMaximum number of file descriptors:   %4d\n",
-	Squid_MaxFD);
+	SQUID_NUMFD);
     storeAppendPrintf(sentry, "\tLargest file desc currently in use:   %4d\n",
 	Biggest_FD);
     storeAppendPrintf(sentry, "\tNumber of file desc currently in use: %4d\n",
@@ -1031,7 +1031,7 @@
     statHistEnumInit(&C->comm_icp_incoming, INCOMING_ICP_MAX);
     statHistEnumInit(&C->comm_dns_incoming, INCOMING_DNS_MAX);
     statHistEnumInit(&C->comm_http_incoming, INCOMING_HTTP_MAX);
-    statHistIntInit(&C->select_fds_hist, 256);	/* was SQUID_MAXFD, but it is way too much. It is OK to crop this statistics */
+    statHistIntInit(&C->select_fds_hist, 256);	/* was SQUID_NUMFD, but it is way too much. It is OK to crop this statistics */
 }
 
 /* add special cases here as they arrive */



From fedora-cvs-commits at redhat.com  Tue Jul 18 12:51:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 08:51:10 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.67, 1.68 hwdata.spec, 1.69,
	1.70 sources, 1.70, 1.71
Message-ID: <200607181251.k6ICpA4u024960@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24919

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- Updated pci.ids before FC6 final (#198994)
- Added several missing Samsung monitors (#197463)
- Included a new inf2mondb.py from Matt Domsch (#158723)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	9 Jul 2006 00:08:39 -0000	1.67
+++ .cvsignore	18 Jul 2006 12:51:07 -0000	1.68
@@ -1 +1 @@
-hwdata-0.181.tar.gz
+hwdata-0.183.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- hwdata.spec	11 Jul 2006 20:41:20 -0000	1.69
+++ hwdata.spec	18 Jul 2006 12:51:07 -0000	1.70
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.182
+Version: 0.183
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,11 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> - 0.183-1
+- Updated pci.ids before FC6 final (#198994)
+- Added several missing Samsung monitors (#197463)
+- Included a new inf2mondb.py from Matt Domsch (#158723)
+
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> - 0.182-1
 - Added ast driver description to videodrivers
 - Numerous Dell monitor additions (#196734)
@@ -42,9 +47,6 @@
 - Updated videodrivers to mention i945
 - New monitors: Sony CPD-G420 (#145902), Compaq P1110 (#155120).
 
-* Thu Jun 22 2006 Adam Jackson <ajackson at redhat.com> - 0.180-2
-- Bump.
-
 * Thu May 11 2006 Phil Knirsch <pknirsch at redhat.com> - 0.180-1
 - Updated and added some MonitorsDB entries
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	9 Jul 2006 00:08:39 -0000	1.70
+++ sources	18 Jul 2006 12:51:08 -0000	1.71
@@ -1 +1 @@
-ec92b67296ee3c2b8e72509b6c61d6d5  hwdata-0.181.tar.gz
+763547a88cf4ea2aa05cd00e541ae0ea  hwdata-0.183.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 12:56:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 08:56:44 -0400
Subject: rpms/kdebindings/devel kdebindings.spec,1.50,1.51
Message-ID: <200607181256.k6ICuiLN027120@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26715

Modified Files:
	kdebindings.spec 
Log Message:
make -jX does not work, disable _smp_mflags flag temporary



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdebindings.spec	17 Jul 2006 17:28:00 -0000	1.50
+++ kdebindings.spec	18 Jul 2006 12:56:42 -0000	1.51
@@ -223,7 +223,7 @@
    --without-java
 %endif
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}



From fedora-cvs-commits at redhat.com  Tue Jul 18 13:17:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 09:17:43 -0400
Subject: rpms/minicom/devel minicom.spec,1.21,1.22
Message-ID: <200607181317.k6IDHh9g008990@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/minicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8652

Modified Files:
	minicom.spec 
Log Message:
added ncurses-devel to BuildPrereq


Index: minicom.spec
===================================================================
RCS file: /cvs/dist/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- minicom.spec	12 Jul 2006 07:21:21 -0000	1.21
+++ minicom.spec	18 Jul 2006 13:17:38 -0000	1.22
@@ -3,12 +3,12 @@
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
 Version: 2.1
-Release: 1.2.2
+Release: 2
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: lockdev-devel >= 1.0.0-13
+BuildPrereq: lockdev-devel >= 1.0.0-13 ncurses-devel
 PreReq: coreutils
 Requires: lockdev 
 URL:    http://alioth.debian.org/projects/minicom/
@@ -81,6 +81,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Martin Stransky <stransky at redhat.com> 2.1-2
+- added ncurses-devel to BuildPrereq
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 13:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 09:36:03 -0400
Subject: rpms/gdm/devel gdm-2.15.6-session-keyring.patch, NONE,
	1.1 gdm-2.15.6-security-tokens.patch, 1.2, 1.3 gdm.spec, 1.178,
	1.179 gdm-2.15.5-session-keyring.patch, 1.3, NONE
Message-ID: <200607181336.k6IDa39x020226@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20197

Modified Files:
	gdm-2.15.6-security-tokens.patch gdm.spec 
Added Files:
	gdm-2.15.6-session-keyring.patch 
Removed Files:
	gdm-2.15.5-session-keyring.patch 
Log Message:
- reenable session keyring support in pam module (bug 198629)


gdm-2.15.6-session-keyring.patch:
 gdm                |    1 +
 gdm-autologin      |    1 +
 gdm-securitytokens |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE gdm-2.15.6-session-keyring.patch ---
--- gdm-2.15.6/config/gdm-autologin.session-keyring	2006-07-18 09:32:39.000000000 +0200
+++ gdm-2.15.6/config/gdm-autologin	2006-07-18 09:33:16.000000000 +0200
@@ -4,6 +4,7 @@ auth       required    pam_permit.so
 account    required    pam_nologin.so
 account    include     system-auth
 password   include     system-auth
+session    optional    pam_keyinit.so force revoke
 session    include     system-auth
 session    required    pam_loginuid.so
 session    optional    pam_console.so
--- gdm-2.15.6/config/gdm-securitytokens.session-keyring	2006-07-18 09:32:39.000000000 +0200
+++ gdm-2.15.6/config/gdm-securitytokens	2006-07-18 09:32:39.000000000 +0200
@@ -5,6 +5,7 @@ auth       required     pam_deny.so
 account    required     pam_nologin.so
 account    include      system-auth
 password   include      system-auth
+session    optional     pam_keyinit.so force revoke
 session    include      system-auth
 session    required     pam_loginuid.so
 session    optional     pam_console.so
--- gdm-2.15.6/config/gdm.session-keyring	2006-07-18 09:32:39.000000000 +0200
+++ gdm-2.15.6/config/gdm	2006-07-18 09:33:27.000000000 +0200
@@ -4,6 +4,7 @@ auth       include     system-auth
 account    required    pam_nologin.so
 account    include     system-auth
 password   include     system-auth
+session    optional    pam_keyinit.so force revoke
 session    include     system-auth
 session    required    pam_loginuid.so
 session    optional    pam_console.so

gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   35 +
 config/gdm                    |   16 
 config/gdm-autologin          |   17 
 config/gdm-securitytokens     |   10 
 config/gdm.conf.in            |    7 
 config/securitytokens.conf.in |    4 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |  148 +++++++
 daemon/gdm.h                  |    5 
 daemon/gdmconfig.c            |   26 +
 daemon/gdmconfig.h            |    3 
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    5 
 17 files changed, 1889 insertions(+), 21 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.15.6-security-tokens.patch	18 Jul 2006 05:59:38 -0000	1.2
+++ gdm-2.15.6-security-tokens.patch	18 Jul 2006 13:36:00 -0000	1.3
@@ -99,6 +99,27 @@
 +session    required    pam_loginuid.so
 +session    optional    pam_console.so
 +
+--- gdm-2.15.6/config/gdm-autologin
++++ gdm-2.15.6/config/gdm-autologin
+@@ -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
+-session    optional     pam_console.so
++ #%PAM-1.0
++auth       required    pam_env.so
++auth       required    pam_permit.so
++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
+new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/config/gdm-securitytokens
 @@ -0,0 +1,10 @@
@@ -135,6 +156,14 @@
  # XDMCP is the protocol that allows remote login.  If you want to log into GDM
  # remotely (I'd never turn this on on open network, use ssh for such remote
  # usage that).  You can then run X with -query <thishost> to log in, or
+new file mode 100644
+--- /dev/null
++++ gdm-2.15.6/config/securitytokens.conf.in
+@@ -0,0 +1,4 @@
++[SecurityTokens]
++Enable=true
++#Driver=@libdir@/pkcs11/libcoolkeypk11.so
++#PamStack=gdm-securitytokens
 --- gdm-2.15.6/configure.ac
 +++ gdm-2.15.6/configure.ac
 @@ -19,6 +19,7 @@ LIBRSVG_REQUIRED=1.1.1
@@ -442,6 +471,7 @@
  void           gdm_config_key_to_string_per_display
                                          (gchar *file,
                                           gchar *key,
+new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytoken.c
 @@ -0,0 +1,602 @@
@@ -1047,6 +1077,7 @@
 +    return 0;
 +}
 +#endif
+new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytoken.h
 @@ -0,0 +1,101 @@
@@ -1151,6 +1182,7 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
+new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytokenmonitor.c
 @@ -0,0 +1,840 @@
@@ -1994,6 +2026,7 @@
 +    return 0;
 +}
 +#endif
+new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytokenmonitor.h
 @@ -0,0 +1,81 @@
@@ -2106,11 +2139,3 @@
      if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
  	    if (started_timer)
  		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");
---- /dev/null
-+++ gdm-2.15.6/config/securitytokens.conf.in
-@@ -0,0 +1,4 @@
-+[SecurityTokens]
-+Enable=true
-+#Driver=@libdir@/pkcs11/libcoolkeypk11.so
-+#PamStack=gdm-securitytokens
-


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- gdm.spec	18 Jul 2006 11:44:13 -0000	1.178
+++ gdm.spec	18 Jul 2006 13:36:00 -0000	1.179
@@ -47,7 +47,7 @@
 Patch19: gdm-2.15.5-move-default-message.patch
 Patch20: gdm-2.15.5-reset-pam.patch
 Patch21: gdm-2.15.6-security-tokens.patch
-Patch22: gdm-2.15.5-session-keyring.patch
+Patch22: gdm-2.15.6-session-keyring.patch
 Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
 
@@ -130,7 +130,7 @@
 %patch19 -p1 -b .move-default-message
 %patch20 -p1 -b .reset-pam
 %patch21 -p1 -b .security-tokens
-#%patch22 -p1 -b .session-keyring
+%patch22 -p1 -b .session-keyring
 %patch23 -p1 -b .fix-setup-hang
 %patch24 -p1 -b .wtmp
 
@@ -329,6 +329,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-8
+- reenable session keyring support in pam module (bug 198629)
+
 * Mon Jul 17 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-7
 - make security token support use its own config file in
   preparation for modularizing it.


--- gdm-2.15.5-session-keyring.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 13:36:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 09:36:32 -0400
Subject: rpms/gdm/devel gdm.spec,1.179,1.180
Message-ID: <200607181336.k6IDaWNq020402@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20358

Modified Files:
	gdm.spec 
Log Message:
rev release



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gdm.spec	18 Jul 2006 13:36:00 -0000	1.179
+++ gdm.spec	18 Jul 2006 13:36:29 -0000	1.180
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 7
+Release: 8
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X



From fedora-cvs-commits at redhat.com  Tue Jul 18 13:42:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 09:42:18 -0400
Subject: rpms/ypbind/devel ypbind.init,1.9,1.10 ypbind.spec,1.25,1.26
Message-ID: <200607181342.k6IDgIoN021557@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21512

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
Added NISTIMEOUT variable to init scrip (bz 196078)



Index: ypbind.init
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ypbind.init	24 Jan 2005 13:57:41 -0000	1.9
+++ ypbind.init	18 Jul 2006 13:42:15 -0000	1.10
@@ -19,6 +19,8 @@
 
 . /etc/sysconfig/network
 
+[ -z "$NISTIMEOUT" ] && NISTIMEOUT=20
+
 # Check that networking is configured.
 [ ${NETWORKING} = "no" ] && exit 0
 
@@ -42,7 +44,7 @@
 	# even when we are really not bound yet to a server, and then things
 	# that need NIS fail.
 	echo -n $"Listening for an NIS domain server."
-	for (( times = 1; times < 20; times++ )); do
+	for (( times = 1; times < $NISTIMEOUT; times++ )); do
 	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && ypwhich > /dev/null 2>&1
 	    RETVAL=$?
 	    if [ $RETVAL -eq 0 ]; then


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ypbind.spec	12 Jul 2006 17:39:40 -0000	1.25
+++ ypbind.spec	18 Jul 2006 13:42:15 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 0.1
+Release: 0.2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -80,6 +80,9 @@
 %doc README NEWS
 
 %changelog
+* Tue Jul 18 2006 Steve Dickson <steved at redhat.com> - 3:1.19-0.2
+- Added NISTIMEOUT variable to init scrip (bz 196078)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3:1.19-0.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 14:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 10:05:48 -0400
Subject: rpms/swig/devel swig.spec,1.28,1.29
Message-ID: <200607181405.k6IE5m8x011188@cvs.devel.redhat.com>

Author: jkudrnac

Update of /cvs/dist/rpms/swig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11125

Modified Files:
	swig.spec 
Log Message:
* Tue Jul 18 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 1.3.29-0.3
- rebuilt



Index: swig.spec
===================================================================
RCS file: /cvs/dist/rpms/swig/devel/swig.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- swig.spec	30 Jun 2006 08:03:04 -0000	1.28
+++ swig.spec	18 Jul 2006 14:05:45 -0000	1.29
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.29
-Release: 0.2
+Release: 0.3
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -58,6 +58,9 @@
 %{_datadir}/swig
 
 %changelog
+* Tue Jul 18 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 1.3.29-0.3
+- rebuilt 
+
 * Fri Jun 30 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 1.3.29-0.2 
 - Build requires autoconf, automake (bug #197132)
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 14:11:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 10:11:32 -0400
Subject: rpms/gimp/devel gimp.spec,1.104,1.105
Message-ID: <200607181411.k6IEBWr9012241@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12177

Modified Files:
	gimp.spec 
Log Message:
split off libraries into gimp-libs to allow multilib installations
remove pre-release cruft



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gimp.spec	12 Jul 2006 05:55:27 -0000	1.104
+++ gimp.spec	18 Jul 2006 14:11:30 -0000	1.105
@@ -27,7 +27,7 @@
 #
 #
 
-Summary:	The GNU Image Manipulation Program
+Summary:	GNU Image Manipulation Program
 Name: 		gimp
 Version: 	2.2.12
 %define binver 2.2
@@ -36,8 +36,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-#define prever pre2
-Release: %{?prever:0.0.%{prever}.}1.1%{?dist}
+Release: 2%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -86,13 +85,11 @@
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
 Requires:	gimp-print >= 4.2.0
-Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
-Requires(postun): /sbin/ldconfig
 Requires(postun): /usr/bin/update-desktop-database
 Requires(postun): hicolor-icon-theme
-Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2
+Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
@@ -101,23 +98,31 @@
 Patch6:     gimp-2.2.11-gimptool.patch
 
 %description
-The GIMP (GNU Image Manipulation Program) is a powerful image
-composition and editing program, which can be extremely useful for
-creating logos and other graphics for webpages. The GIMP has many of
-the tools and filters you would expect to find in similar commercial
-offerings, and some interesting extras as well. The GIMP provides a
-large image manipulation toolbox, including channel operations and
-layers, effects, sub-pixel imaging and anti-aliasing, and conversions,
-all with multi-level undo.
+GIMP (GNU Image Manipulation Program) is a powerful image composition and
+editing program, which can be extremely useful for creating logos and other
+graphics for webpages. GIMP has many of the tools and filters you would expect
+to find in similar commercial offerings, and some interesting extras as well.
+GIMP provides a large image manipulation toolbox, including channel operations
+and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all
+with multi-level undo.
+
+%package libs
+Summary:    GIMP libraries
+Group:      System Environment/Libraries
+
+%description libs
+The gimp-libs package contains shared libraries needed for the GNU Image
+Manipulation Program (GIMP).
 
 %package devel
-Summary: GIMP plugin and extension development kit
+Summary:    GIMP plugin and extension development kit
 Group: 		Applications/Multimedia
-Requires:   %{name} = %{epoch}:%{version}-%{release}
+Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: 	gtk2-devel
 Requires:   glib2-devel
 Requires:   pkgconfig
 Obsoletes:	gimp2-devel gimp-beta-devel <= %{version}
+
 %description devel
 The gimp-devel package contains the static libraries and header files
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
@@ -138,7 +143,7 @@
 
 EOF
 
-%setup -q -n gimp-%{version}%{?prever:-%{prever}}
+%setup -q -n gimp-%{version}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
@@ -249,7 +254,6 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /usr/bin/update-desktop-database %{_datadir}/applications
 if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then
     %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever}
@@ -266,7 +270,6 @@
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" = "0" ]; then
     /usr/bin/update-desktop-database %{_datadir}/applications
 fi
@@ -275,6 +278,9 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files -f gimp.files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -326,29 +332,6 @@
 
 #%{_datadir}/locale/*/*/*
 
-#%{_libdir}/libgck-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgck-%{interfacever}.so.%{age}
-%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimp-%{interfacever}.so.%{age}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}
-#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age}
-#%{_libdir}/libgimptool-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-#%{_libdir}/libgimptool-%{interfacever}.so.%{age}
-
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
 %{_bindir}/gimptool-%{interfacever}
@@ -375,6 +358,25 @@
 
 %{_datadir}/icons/hicolor/48x48/apps/gimp.png
 
+%files libs
+%defattr(-, root, root, 0755)
+%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimp-%{interfacever}.so.%{age}
+%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
+%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
+%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
+%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}
+%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}
+%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpui-%{interfacever}.so.%{age}
+%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}
+
 %files devel
 %defattr (-, root, root, 0755)
 %doc HACKING
@@ -392,6 +394,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jul 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-2
+- split off libraries into gimp-libs to allow multilib installations
+- remove pre-release cruft
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.12-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 14:34:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 10:34:27 -0400
Subject: rpms/tar/devel tar-1.15.90-permissions.patch, NONE, 1.1 tar.spec,
	1.39, 1.40
Message-ID: <200607181434.k6IEYRRi010929@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10916

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.90-permissions.patch 
Log Message:
fix problem with unpacking archives in a directory for which
one has write permission but does not own (such as /tmp) (#149686)


tar-1.15.90-permissions.patch:
 extract.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE tar-1.15.90-permissions.patch ---
--- tar-1.15.90/src/extract.c.permissions	2006-07-18 15:18:44.000000000 +0200
+++ tar-1.15.90/src/extract.c	2006-07-18 15:37:36.000000000 +0200
@@ -428,7 +428,7 @@
 	     invert_permissions is zero, because
 	     repair_delayed_set_stat may need to update the struct.  */
 	  delay_set_stat (file_name,
-			  &current_stat_info /* ignored */,
+			  &current_stat_info,
 			  invert_permissions, INTERDIR_PERMSTATUS);
 
 	  print_for_mkdir (file_name, cursor - file_name, mode);
@@ -647,7 +647,7 @@
 		}
 	      if (S_ISDIR (st.st_mode))
 		{
-		  mode = st.st_mode & ~ current_umask;
+		  mode = st.st_mode;
 		  break;
 		}
 	    }
@@ -668,12 +668,16 @@
   if (status == 0
       || old_files_option == DEFAULT_OLD_FILES
       || old_files_option == OVERWRITE_OLD_FILES)
-    delay_set_stat (file_name, &current_stat_info,
-		    MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
-		    (status == 0
-		     ? ARCHIVED_PERMSTATUS
-		     : UNKNOWN_PERMSTATUS));
-
+    {
+      if (status == 0)
+       delay_set_stat (file_name, &current_stat_info,
+                       MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
+                       ARCHIVED_PERMSTATUS);
+      else /* For an already existing directory, invert_perms must be 0 */
+       delay_set_stat (file_name, &current_stat_info,
+                       0,
+                       UNKNOWN_PERMSTATUS);
+    }
   return status;
 }
 


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tar.spec	12 Jul 2006 08:25:34 -0000	1.39
+++ tar.spec	18 Jul 2006 14:34:14 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 3.1
+Release: 4
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -12,6 +12,7 @@
 Patch2: tar-1.14-loneZeroWarning.patch
 Patch3: tar-1.15.1-vfatTruncate.patch
 Patch4: tar-1.15.90-makeCheck.patch
+Patch5: tar-1.15.90-permissions.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -35,7 +36,7 @@
 %patch2 -p1 -b .loneZeroWarning
 %patch3 -p1 -b .vfatTruncate
 %patch4 -p1 -b .makeCheck
-
+%patch5 -p1 -b .permissions
 %build
 
 %ifos linux
@@ -105,6 +106,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Jul 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-4
+- fix problem with unpacking archives in a directory for which 
+  one has write permission but does not own (such as /tmp) (#149686)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.15.90-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 14:44:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 10:44:22 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.46, 1.47 authconfig.spec, 1.61,
	1.62 sources, 1.53, 1.54
Message-ID: <200607181444.k6IEiMcD011228@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11213

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.1-1
- screensavers should be authenticated by smartcard too
- add feature to download a CA certificate for LDAP from 
  an URL (#197103)
- add pam_keyinit session module to the PAM configuration (#198638)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	7 Jul 2006 18:52:22 -0000	1.46
+++ .cvsignore	18 Jul 2006 14:44:19 -0000	1.47
@@ -1 +1 @@
-authconfig-5.3.0.tar.bz2
+authconfig-5.3.1.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- authconfig.spec	12 Jul 2006 05:23:41 -0000	1.61
+++ authconfig.spec	18 Jul 2006 14:44:20 -0000	1.62
@@ -1,9 +1,9 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.0
+Version: 5.3.1
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1.1
+Release: 1
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -95,8 +95,11 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.3.0-1.1
-- rebuild
+* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.1-1
+- screensavers should be authenticated by smartcard too
+- add feature to download a CA certificate for LDAP from 
+  an URL (#197103)
+- add pam_keyinit session module to the PAM configuration (#198638)
 
 * Fri Jul  7 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.0-1
 - added support for smartcard authentication


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	7 Jul 2006 18:52:22 -0000	1.53
+++ sources	18 Jul 2006 14:44:20 -0000	1.54
@@ -1 +1 @@
-835e9abe482ddcf0153c9ff7b2610d00  authconfig-5.3.0.tar.bz2
+53163e9783f5ebb03fef26018ecae7cb  authconfig-5.3.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:01:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:01:43 -0400
Subject: rpms/sendmail/devel sendmail-8.13.7-aliases_dir.patch, NONE,
	1.1 sendmail-8.13.7-vacation.patch, NONE,
	1.1 sendmail-redhat.mc, 1.15, 1.16 sendmail.etc-mail-Makefile,
	1.9, 1.10 sendmail.init, 1.14, 1.15 sendmail.spec, 1.70, 1.71
Message-ID: <200607181501.k6IF1hZp026429@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26387

Modified Files:
	sendmail-redhat.mc sendmail.etc-mail-Makefile sendmail.init 
	sendmail.spec 
Added Files:
	sendmail-8.13.7-aliases_dir.patch 
	sendmail-8.13.7-vacation.patch 
Log Message:
[tw]
- using new syntax for access database (#177566)
- fixed failure message while shutting down sm-client (#119429)
  resolution: stop sm-client before sendmail
- fixed method to specify persistent queue runners (#126760)
- removed patch backup files from sendmail-cf tree (#152955)
- fixed missing dnl on SMART_HOST define (#166680)
- fixed wrong location of aliases and aliases.db file in aliases man page
  (#166744)
- enabled CipherList config option for sendmail (#172352)
- added user chowns for /etc/mail/authinfo.db and move check for cf files
  (#184341)
- fixed Makefile of vacation (#191396)
  vacation is not included in this sendmail package
- /var/log/mail now belongs to sendmail (#192850)



sendmail-8.13.7-aliases_dir.patch:
 aliases.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sendmail-8.13.7-aliases_dir.patch ---
--- sendmail-8.13.7/sendmail/aliases.5.aliases_dir	2006-07-14 15:41:59.000000000 +0200
+++ sendmail-8.13.7/sendmail/aliases.5	2006-07-14 15:42:38.000000000 +0200
@@ -23,7 +23,7 @@
 aliases used by 
 sendmail.
 The file resides in 
-/etc/mail 
+/etc
 and 
 is formatted as a series of lines of the form
 .IP
@@ -96,7 +96,7 @@
 .PP
 This is only the raw data file; the actual aliasing information is
 placed into a binary format in the file 
-/etc/mail/aliases.db
+/etc/aliases.db
 using the program 
 newaliases(1).  
 A 

sendmail-8.13.7-vacation.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-vacation.patch ---
--- sendmail-8.13.7/vacation/Makefile.vacation	1999-09-24 00:36:45.000000000 +0200
+++ sendmail-8.13.7/vacation/Makefile	2006-07-18 15:12:42.000000000 +0200
@@ -1,7 +1,7 @@
 #       $Id: Makefile,v 8.5 1999/09/23 22:36:45 ca Exp $
 
 SHELL= /bin/sh
-BUILD=   ./Build
+BUILD=   ./Build -f ../redhat.config.m4
 OPTIONS= $(CONFIG) $(FLAGS)
 
 all: FRC


Index: sendmail-redhat.mc
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail-redhat.mc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sendmail-redhat.mc	19 Jun 2006 16:19:17 -0000	1.15
+++ sendmail-redhat.mc	18 Jul 2006 15:01:40 -0000	1.16
@@ -19,7 +19,7 @@
 dnl # Uncomment and edit the following line if your outgoing mail needs to
 dnl # be sent out through an external mail server:
 dnl #
-dnl define(`SMART_HOST',`smtp.your.provider')
+dnl define(`SMART_HOST',`smtp.your.provider')dnl
 dnl #
 define(`confDEF_USER_ID',``8:12'')dnl
 dnl define(`confAUTO_REBUILD')dnl


Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.etc-mail-Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sendmail.etc-mail-Makefile	9 Sep 2004 12:27:14 -0000	1.9
+++ sendmail.etc-mail-Makefile	18 Jul 2006 15:01:40 -0000	1.10
@@ -11,6 +11,9 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
+	@if test -f /etc/mail/authinfo.db; then \
+		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
+	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<
@@ -21,7 +24,7 @@
 %.cf: %.mc
 	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
 		umask 022; \
-		mv -f $@ $@.bak; \
+		[ -e $@ ] && mv -f $@ $@.bak; \
 		m4 $< > $@; \
 	else \
 		echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \


Index: sendmail.init
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail.init	17 Feb 2006 16:57:15 -0000	1.14
+++ sendmail.init	18 Jul 2006 15:01:40 -0000	1.15
@@ -62,7 +62,7 @@
 	    /sbin/restorecon /var/run/sm-client.pid
 	fi
 	daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \
-			-q $SMQUEUE $SENDMAIL_OPTARG
+			-q$SMQUEUE $SENDMAIL_OPTARG
 	RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client
@@ -101,11 +101,6 @@
 
 stop() {
 	# Stop daemons.
-	echo -n $"Shutting down $prog: "
-	killproc sendmail
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	if test -f /var/run/sm-client.pid ; then
 		echo -n $"Shutting down sm-client: "
 		killproc sm-client
@@ -114,6 +109,11 @@
 		[ $RETVAL -eq 0 ] && rm -f /var/run/sm-client.pid
 		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sm-client
 	fi
+	echo -n $"Shutting down $prog: "
+	killproc sendmail
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	return $RETVAL
 }
 


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sendmail.spec	12 Jul 2006 17:38:05 -0000	1.70
+++ sendmail.spec	18 Jul 2006 15:01:41 -0000	1.71
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 2.1
+Release: 3
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -42,6 +42,8 @@
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.6-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
+Patch13: sendmail-8.13.7-aliases_dir.patch
+Patch14: sendmail-8.13.7-vacation.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
@@ -137,13 +139,15 @@
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
+%patch13 -p1 -b .aliases_dir
+%patch14 -p1 -b .vacation
 
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
-define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL')
+define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
 define(\`confMANOWN', \`root')
@@ -293,6 +297,10 @@
 
 # Install the cf files for the sendmail-cf package.
 cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
+# remove patch backup files
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
 
 install -d -m755 $RPM_BUILD_ROOT/etc/mail
 
@@ -333,9 +341,9 @@
 # package.
 #
 # by default we allow relaying from localhost...
-localhost.localdomain		RELAY
-localhost			RELAY
-127.0.0.1			RELAY
+Connect:localhost.localdomain		RELAY
+Connect:localhost			RELAY
+Connect:127.0.0.1			RELAY
 
 EOF
 for map in virtusertable access domaintable mailertable ; do
@@ -523,6 +531,7 @@
 %{_mandir}/man1/newaliases.sendmail.1*
 %{_mandir}/man1/mailq.sendmail.1*
 
+%dir %{stdir}
 %config(noreplace)		%{stdir}/statistics
 %config(noreplace)		/etc/mail/sendmail.cf
 %config(noreplace)		/etc/mail/submit.cf
@@ -578,6 +587,22 @@
 %{_docdir}/sendmail
 
 %changelog
+* Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-3
+- using new syntax for access database (#177566)
+- fixed failure message while shutting down sm-client (#119429)
+  resolution: stop sm-client before sendmail
+- fixed method to specify persistent queue runners (#126760)
+- removed patch backup files from sendmail-cf tree (#152955)
+- fixed missing dnl on SMART_HOST define (#166680)
+- fixed wrong location of aliases and aliases.db file in aliases man page
+  (#166744)
+- enabled CipherList config option for sendmail (#172352)
+- added user chowns for /etc/mail/authinfo.db and move check for cf files
+  (#184341)
+- fixed Makefile of vacation (#191396)
+  vacation is not included in this sendmail package
+- /var/log/mail now belongs to sendmail (#192850)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.13.7-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:09:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:09:26 -0400
Subject: rpms/stardict/devel stardict.spec,1.22,1.23
Message-ID: <200607181509.k6IF9Q82026707@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26693

Modified Files:
	stardict.spec 
Log Message:
fix missing br


Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- stardict.spec	12 Jul 2006 08:18:41 -0000	1.22
+++ stardict.spec	18 Jul 2006 15:09:23 -0000	1.23
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    4.1
+Release:    5
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -13,7 +13,7 @@
 Requires: libgnomeui >= 2.2.0
 Requires: libbonobo >= 2.2.0
 Requires: bonobo-activation >= 2.2.0
-BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper
+BuildRequires: libgnomeui-devel >= 2.2.0, scrollkeeper, gettext
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -62,8 +62,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-4.1
+* Tue Jul 18 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-5
 - rebuild
+- add gettext as br
 
 * Mon Jun 12 2006 Mayank Jain <majain at redhat.com>
 - Updated package description



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:10:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:10:38 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.211,
	1.212 policycoreutils.spec, 1.293, 1.294
Message-ID: <200607181510.k6IFAcne005039@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5012

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-5
- Fix handling of restorecond


policycoreutils-rhat.patch:
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |  496 ++++++++++++++++---------------
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  142 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.8 |    4 
 restorecond/restorecond.c |   20 -
 74 files changed, 5163 insertions(+), 4817 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- policycoreutils-rhat.patch	17 Jul 2006 13:40:31 -0000	1.211
+++ policycoreutils-rhat.patch	18 Jul 2006 15:10:35 -0000	1.212
@@ -28211,6 +28211,27 @@
  #, c-format
  msgid "authentication failed.\n"
  msgstr ""
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.17/restorecond/restorecond.8
+--- nsapolicycoreutils/restorecond/restorecond.8	2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.17/restorecond/restorecond.8	2006-07-18 11:11:31.000000000 -0400
+@@ -11,7 +11,7 @@
+ .BR restorecond
+ program.
+ .P
+-This daemon uses inotify to watch files listed in the /etc/selinux/POLICYTYPE/restorconfiles.conf, when they are created, this daemon will make sure they have 
++This daemon uses inotify to watch files listed in the /etc/selinux/restorecond.conf, when they are created, this daemon will make sure they have 
+ the correct file context associated with the policy.
+ 
+ .SH "OPTIONS"
+@@ -25,7 +25,7 @@
+ The program was written by Dan Walsh <dwalsh at redhat.com>.
+ 
+ .SH "FILES"
+-/etc/selinux/POLICYTYPE/restorconfiles.conf
++/etc/selinux/restorecond.conf
+ 
+ .SH "SEE ALSO"
+ .BR restorecon (8),
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-07-03 07:52:43.000000000 -0400
 +++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-17 09:37:26.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- policycoreutils.spec	17 Jul 2006 13:40:32 -0000	1.293
+++ policycoreutils.spec	18 Jul 2006 15:10:36 -0000	1.294
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -106,11 +106,25 @@
 %attr(755,root,root) /etc/rc.d/init.d/restorecond
 %config(noreplace) /etc/selinux/restorecond.conf
 
+%preun
+if [ $1 -eq 0 ]; then
+   /sbin/service restorecond stop > /dev/null 2>&1
+   /sbin/chkconfig --del restorecond
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+   /sbin/service restorecond condrestart > /dev/null 2>&1 || :
+fi
+
 %post
 /sbin/chkconfig --add restorecond
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-5
+- Fix handling of restorecond
+
 * Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-4
 - Fix creation of restorecond pidfile
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:14:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:14:56 -0400
Subject: rpms/gtk2/devel gtk+-2.10.0-search.patch, 1.2, 1.3 gtk2.spec, 1.163,
	1.164
Message-ID: <200607181514.k6IFEuID006753@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6693

Modified Files:
	gtk+-2.10.0-search.patch gtk2.spec 
Log Message:
Fix more search issues


gtk+-2.10.0-search.patch:
 gtkfilechooserdefault.c | 1441 ++++++++++++++++++++++++++++++++++++++++--------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1241 insertions(+), 242 deletions(-)

Index: gtk+-2.10.0-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.0-search.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-2.10.0-search.patch	16 Jul 2006 23:28:19 -0000	1.2
+++ gtk+-2.10.0-search.patch	18 Jul 2006 15:14:54 -0000	1.3
@@ -1,5 +1,102 @@
+--- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-05-03 18:29:48.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-18 10:36:09.000000000 -0400
+@@ -147,6 +147,20 @@
+   LOCATION_MODE_FILENAME_ENTRY
+ } LocationMode;
+ 
++typedef enum {
++  OPERATION_MODE_BROWSE,
++  OPERATION_MODE_SEARCH
++} OperationMode;
++
++typedef struct _BeagleHit BeagleHit;
++typedef struct _BeagleQuery BeagleQuery;
++typedef struct _BeagleClient BeagleClient;
++typedef struct _BeagleRequest BeagleRequest;
++typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
++typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
++typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
++typedef struct _BeagleQueryPart BeagleQueryPart;
++
+ struct _GtkFileChooserDefault
+ {
+   GtkVBox parent_instance;
+@@ -175,10 +189,18 @@
+   GtkWidget *browse_files_popup_menu_add_shortcut_item;
+   GtkWidget *browse_files_popup_menu_hidden_files_item;
+   GtkWidget *browse_new_folder_button;
++  GtkWidget *browse_path_bar_hbox;
+   GtkWidget *browse_path_bar;
+ 
+   GtkFileSystemModel *browse_files_model;
+ 
++  /* Widgets for searching */
++  GtkWidget *search_hbox;
++  GtkWidget *search_entry;
++  BeagleClient *search_client;
++  BeagleQuery *search_query;
++  GtkListStore *search_model;
++
+   GtkWidget *filter_combo_hbox;
+   GtkWidget *filter_combo;
+   GtkWidget *preview_box;
+@@ -194,7 +216,16 @@
+   LocationMode location_mode;
+ 
+   GtkListStore *shortcuts_model;
+-  GtkTreeModel *shortcuts_filter_model;
++
++  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
++   * the separator that we use for the "Save in folder" combo.
++   */
++  GtkTreeModel *shortcuts_pane_filter_model;
++  
++  /* Filter for the "Save in folder" combo.  We filter out the Search row and
++   * its separator.
++   */
++  GtkTreeModel *shortcuts_combo_filter_model;
+ 
+   GtkTreeModelSort *sort_model;
+ 
+@@ -213,6 +244,8 @@
+   ReloadState reload_state;
+   guint load_timeout_id;
+ 
++  OperationMode operation_mode;
++
+   GSList *pending_select_paths;
+ 
+   GtkFileFilter *current_filter;
+@@ -220,9 +253,6 @@
+ 
+   GtkTooltips *tooltips;
+ 
+-  gboolean has_home;
+-  gboolean has_desktop;
+-
+   int num_volumes;
+   int num_shortcuts;
+   int num_bookmarks;
+@@ -237,6 +267,7 @@
+ 
+   GtkTreeViewColumn *list_name_column;
+   GtkCellRenderer *list_name_renderer;
++  GtkTreeViewColumn *list_mtime_column;
+ 
+   GSource *edited_idle;
+   char *edited_new_text;
+@@ -264,6 +295,9 @@
+   guint changing_folder : 1;
+   guint shortcuts_current_folder_active : 1;
+   guint processing_pending_selections : 1;
++  guint has_home : 1;
++  guint has_desktop : 1;
++  guint has_search : 1;
+ 
+ #if 0
+   guint shortcuts_drag_outside : 1;
 --- gtk+-2.10.0/gtk/gtkfilechooserdefault.c.search	2006-06-19 13:43:59.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-16 18:44:32.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-18 10:46:35.000000000 -0400
 @@ -78,6 +78,8 @@
  #include <errno.h>
  #include <string.h>
@@ -398,6 +495,15 @@
  
    if (request->type == SHORTCUTS_CURRENT_FOLDER
        && request->impl->save_folder_combo != NULL)
+@@ -1410,7 +1593,7 @@
+       g_signal_handlers_block_by_func (request->impl->save_folder_combo,
+ 				       G_CALLBACK (save_folder_combo_changed_cb),
+ 				       request->impl);
+-      gtk_combo_box_set_active (GTK_COMBO_BOX (request->impl->save_folder_combo), pos);
++      gtk_combo_box_set_active (GTK_COMBO_BOX (request->impl->save_folder_combo), request->impl->has_search ? pos - 2 : pos);
+       g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
+ 				         G_CALLBACK (save_folder_combo_changed_cb),
+ 				         request->impl);
 @@ -1436,7 +1619,7 @@
  static void
  shortcuts_insert_path (GtkFileChooserDefault *impl,
@@ -470,7 +576,17 @@
  
    if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
      {
-@@ -1544,6 +1737,30 @@
+@@ -1530,7 +1723,8 @@
+       g_signal_handlers_block_by_func (impl->save_folder_combo,
+ 				       G_CALLBACK (save_folder_combo_changed_cb),
+ 				       impl);
+-      gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), combo_pos);
++      gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
++				impl->has_search ? combo_pos - 2 : combo_pos);
+       g_signal_handlers_unblock_by_func (impl->save_folder_combo,
+ 				         G_CALLBACK (save_folder_combo_changed_cb),
+ 				         impl);
+@@ -1544,6 +1738,30 @@
    profile_end ("end", NULL);
  }
  
@@ -501,7 +617,7 @@
  /* Appends an item for the user's home directory to the shortcuts model */
  static void
  shortcuts_append_home (GtkFileChooserDefault *impl)
-@@ -1562,7 +1779,8 @@
+@@ -1562,7 +1780,8 @@
  
    home_path = gtk_file_system_filename_to_path (impl->file_system, home);
  
@@ -511,7 +627,7 @@
  
    gtk_file_path_free (home_path);
  
-@@ -1595,7 +1813,9 @@
+@@ -1595,7 +1814,9 @@
    path = gtk_file_system_filename_to_path (impl->file_system, name);
    g_free (name);
  
@@ -522,7 +638,7 @@
    /* We do not actually pop up an error dialog if there is no desktop directory
     * because some people may really not want to have one.
     */
-@@ -1634,7 +1854,7 @@
+@@ -1634,7 +1855,7 @@
        label = gtk_file_system_get_bookmark_label (impl->file_system, path);
  
        /* NULL GError, but we don't really want to show error boxes here */
@@ -531,7 +647,7 @@
        num_inserted++;
  
        g_free (label);
-@@ -1653,6 +1873,16 @@
+@@ -1653,6 +1874,16 @@
    int n;
  
    n = 0;
@@ -548,7 +664,7 @@
  
    if (where == SHORTCUTS_HOME)
      goto out;
-@@ -1749,15 +1979,18 @@
+@@ -1749,15 +1980,18 @@
  	    }
  	}
  
@@ -570,7 +686,7 @@
  
    impl->changing_folder = old_changing_folders;
  
-@@ -1767,11 +2000,13 @@
+@@ -1767,11 +2001,13 @@
  /* Inserts a separator node in the shortcuts list */
  static void
  shortcuts_insert_separator (GtkFileChooserDefault *impl,
@@ -586,7 +702,7 @@
  
    gtk_list_store_insert (impl->shortcuts_model, &iter,
  			 shortcuts_get_index (impl, where));
-@@ -1780,6 +2015,7 @@
+@@ -1780,6 +2016,7 @@
  		      SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
  		      SHORTCUTS_COL_NAME, NULL,
  		      SHORTCUTS_COL_DATA, NULL,
@@ -594,7 +710,7 @@
  		      -1);
  }
  
-@@ -1792,7 +2028,7 @@
+@@ -1792,7 +2029,7 @@
    GtkTreeIter iter;
    GtkFilePath *list_selected = NULL;
    GtkFilePath *combo_selected = NULL;
@@ -603,7 +719,7 @@
    gpointer col_data;
  
    profile_start ("start", NULL);
-@@ -1806,10 +2042,10 @@
+@@ -1806,10 +2043,10 @@
        gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
  			  &iter, 
  			  SHORTCUTS_COL_DATA, &col_data,
@@ -616,9 +732,18 @@
  	list_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1820,10 +2056,10 @@
+@@ -1817,13 +2054,18 @@
+       gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
+ 				     &iter))
+     {
++      GtkTreeIter child_iter;
++
++      gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER  (impl->shortcuts_combo_filter_model),
++							&iter,
++							&child_iter);
        gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
- 			  &iter, 
+-			  &iter, 
++			  &child_iter, 
  			  SHORTCUTS_COL_DATA, &col_data,
 -			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
 +			  SHORTCUTS_COL_TYPE, &shortcut_type,
@@ -629,7 +754,7 @@
  	combo_selected = gtk_file_path_copy (col_data);
      }
  
-@@ -1841,8 +2077,11 @@
+@@ -1841,8 +2083,11 @@
    if (impl->num_bookmarks > 0)
      shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
  
@@ -643,7 +768,7 @@
  
    if (list_selected)
      {
-@@ -1856,8 +2095,8 @@
+@@ -1856,8 +2101,8 @@
  
        pos = shortcut_find_position (impl, combo_selected);
        if (pos != -1)
@@ -654,7 +779,7 @@
        gtk_file_path_free (combo_selected);
      }
    
-@@ -1902,16 +2141,18 @@
+@@ -1902,16 +2147,18 @@
        if (base_path &&
  	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
  	{
@@ -677,7 +802,7 @@
  }
  
  /* Updates the current folder row in the shortcuts model */
-@@ -1933,9 +2174,9 @@
+@@ -1933,9 +2180,9 @@
  
  /* Filter function used for the shortcuts filter model */
  static gboolean
@@ -690,7 +815,7 @@
  {
    GtkFileChooserDefault *impl;
    GtkTreePath *path;
-@@ -1962,11 +2203,17 @@
+@@ -1962,11 +2209,17 @@
  					      GDK_TYPE_PIXBUF,	/* pixbuf */
  					      G_TYPE_STRING,	/* name */
  					      G_TYPE_POINTER,	/* path or volume */
@@ -709,7 +834,7 @@
    if (impl->file_system)
      {
        shortcuts_append_home (impl);
-@@ -1974,12 +2221,12 @@
+@@ -1974,12 +2227,12 @@
        shortcuts_add_volumes (impl);
      }
  
@@ -727,7 +852,7 @@
  					  impl,
  					  NULL);
  }
-@@ -2197,16 +2444,16 @@
+@@ -2197,16 +2450,16 @@
    for (i = 0; i < current_folder_separator_idx; i++)
      {
        gpointer col_data;
@@ -747,7 +872,7 @@
  	    {
  	      GtkFileSystemVolume *volume;
  	      GtkFilePath *base_path;
-@@ -2222,7 +2469,7 @@
+@@ -2222,7 +2475,7 @@
  	      if (exists)
  		return i;
  	    }
@@ -756,7 +881,7 @@
  	    {
  	      GtkFilePath *model_path;
  
-@@ -2328,7 +2575,7 @@
+@@ -2328,7 +2581,7 @@
    if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
      return FALSE;
  
@@ -765,7 +890,7 @@
  						    iter,
  						    &parent_iter);
    return TRUE;
-@@ -2351,11 +2598,12 @@
+@@ -2351,11 +2604,12 @@
  		      SHORTCUTS_COL_DATA, &col_data,
  		      SHORTCUTS_COL_REMOVABLE, &removable,
  		      -1);
@@ -779,7 +904,7 @@
    path = col_data;
  
    error = NULL;
-@@ -2512,6 +2760,16 @@
+@@ -2512,6 +2766,16 @@
    gboolean active;
    gchar *tip;
  
@@ -796,7 +921,7 @@
    selection_check (impl, &num_selected, NULL, &all_folders);
  
    if (num_selected == 0)
-@@ -3025,7 +3283,7 @@
+@@ -3025,7 +3289,7 @@
  {
    GtkTreeIter iter;
    gpointer col_data;
@@ -805,7 +930,7 @@
    GtkTreePath *path;
    int old_position;
    int bookmarks_index;
-@@ -3050,10 +3308,10 @@
+@@ -3050,10 +3314,10 @@
    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
  		      SHORTCUTS_COL_NAME, &name,
  		      SHORTCUTS_COL_DATA, &col_data,
@@ -818,7 +943,7 @@
    
    file_path = col_data;
    file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
-@@ -3137,17 +3395,11 @@
+@@ -3137,17 +3401,11 @@
  			      GtkTreeIter  *iter,
  			      gpointer      data)
  {
@@ -839,7 +964,7 @@
  }
  
  /* Since GtkTreeView has a keybinding attached to '/', we need to catch
-@@ -3394,7 +3646,7 @@
+@@ -3394,7 +3652,7 @@
    /* Accessible object name for the file chooser's shortcuts pane */
    atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
  
@@ -848,7 +973,7 @@
  
    gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					  GDK_BUTTON1_MASK,
-@@ -3467,8 +3719,7 @@
+@@ -3467,8 +3725,7 @@
  
    gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
  					shortcuts_row_separator_func,
@@ -858,7 +983,7 @@
  
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
  
-@@ -3842,6 +4093,8 @@
+@@ -3842,6 +4099,8 @@
  {
    file_list_build_popup_menu (impl);
  
@@ -867,7 +992,7 @@
    /* The sensitivity of the Add to Bookmarks item is set in
     * bookmarks_check_add_sensitivity()
     */
-@@ -3941,6 +4194,28 @@
+@@ -3941,6 +4200,28 @@
    return TRUE;
  }
  
@@ -896,7 +1021,7 @@
  /* Creates the widgets for the file list */
  static GtkWidget *
  create_file_list (GtkFileChooserDefault *impl)
-@@ -3954,7 +4229,7 @@
+@@ -3954,7 +4235,7 @@
  
    swin = gtk_scrolled_window_new (NULL, NULL);
    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
@@ -905,7 +1030,7 @@
    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
  				       GTK_SHADOW_IN);
  
-@@ -4044,6 +4319,7 @@
+@@ -4044,6 +4325,7 @@
    gtk_tree_view_column_set_sort_column_id (column, FILE_LIST_COL_SIZE);
    gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_files_tree_view), column);
  #endif
@@ -913,7 +1038,7 @@
    /* Modification time column */
  
    column = gtk_tree_view_column_new ();
-@@ -4054,8 +4330,11 @@
+@@ -4054,8 +4336,11 @@
    gtk_tree_view_column_pack_start (column, renderer, TRUE);
    gtk_tree_view_column_set_cell_data_func (column, renderer,
  					   list_mtime_data_func, impl, NULL);
@@ -926,7 +1051,7 @@
    gtk_widget_show_all (swin);
  
    return swin;
-@@ -4162,9 +4441,59 @@
+@@ -4162,9 +4447,59 @@
      return;
  
    if (gtk_combo_box_get_active_iter (combo, &iter))
@@ -987,7 +1112,7 @@
  /* Creates the combo box with the save folders */
  static GtkWidget *
  save_folder_combo_create (GtkFileChooserDefault *impl)
-@@ -4172,8 +4501,14 @@
+@@ -4172,8 +4507,14 @@
    GtkWidget *combo;
    GtkCellRenderer *cell;
  
@@ -1003,7 +1128,7 @@
  			"focus-on-click", FALSE,
                          NULL);
    gtk_widget_show (combo);
-@@ -4195,8 +4530,7 @@
+@@ -4195,8 +4536,7 @@
  
    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
  					shortcuts_row_separator_func,
@@ -1013,7 +1138,7 @@
  
    g_signal_connect (combo, "changed",
  		    G_CALLBACK (save_folder_combo_changed_cb), impl);
-@@ -4521,6 +4855,7 @@
+@@ -4521,6 +4861,7 @@
    GtkWidget *hpaned;
    GtkWidget *widget;
    GtkSizeGroup *size_group;
@@ -1021,7 +1146,7 @@
  
    /* size group is used by the [+][-] buttons and the filter combo */
    size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-@@ -4530,6 +4865,7 @@
+@@ -4530,6 +4871,7 @@
    hbox = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
    gtk_widget_show (hbox);
@@ -1029,7 +1154,7 @@
  
    location_button_create (impl);
    gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
-@@ -4552,7 +4888,10 @@
+@@ -4552,7 +4894,10 @@
    impl->location_entry_box = gtk_hbox_new (FALSE, 12);
    gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0);
  
@@ -1041,7 +1166,7 @@
    gtk_label_set_use_markup (GTK_LABEL (impl->location_label), TRUE);
    gtk_widget_show (impl->location_label);
    gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0);
-@@ -5116,6 +5455,9 @@
+@@ -5116,6 +5461,9 @@
        impl->shortcuts_activate_iter_handle = NULL;
      }
  
@@ -1051,7 +1176,7 @@
    remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
  
    G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
-@@ -5387,31 +5729,32 @@
+@@ -5387,31 +5735,32 @@
  
    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->map (widget);
  
@@ -1109,7 +1234,7 @@
  
    bookmarks_changed_cb (impl->file_system, impl);
  
-@@ -5883,12 +6226,6 @@
+@@ -5883,12 +6232,6 @@
         * but rather on behalf of something else like GtkFileChooserButton.  In
         * that case, the chooser's selection should be what the caller expects,
         * as the user can't see that something else got selected.  See bug #165264.
@@ -1122,7 +1247,7 @@
         */
        if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
  	browse_files_select_first_row (impl);
-@@ -5937,17 +6274,11 @@
+@@ -5937,17 +6280,11 @@
    profile_end ("end", NULL);
  }
  
@@ -1143,7 +1268,7 @@
    if (impl->browse_files_model)
      {
        g_object_unref (impl->browse_files_model);
-@@ -5959,6 +6290,20 @@
+@@ -5959,6 +6296,20 @@
        g_object_unref (impl->sort_model);
        impl->sort_model = NULL;
      }
@@ -1164,7 +1289,7 @@
  
    set_busy_cursor (impl, TRUE);
    gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view), NULL);
-@@ -6018,6 +6363,9 @@
+@@ -6018,6 +6369,9 @@
    if (impl->processing_pending_selections)
      return;
  
@@ -1174,7 +1299,7 @@
    if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
  	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
  	|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
-@@ -6047,25 +6395,34 @@
+@@ -6047,25 +6401,34 @@
      }
    else if (closure.num_selected == 1)
      {
@@ -1224,7 +1349,7 @@
      }
    else
      {
-@@ -6188,6 +6545,8 @@
+@@ -6188,6 +6551,8 @@
  
    profile_start ("start", (char *) path);
  
@@ -1233,7 +1358,7 @@
    g_assert (path != NULL);
  
    if (impl->local_only &&
-@@ -6229,6 +6588,9 @@
+@@ -6229,6 +6594,9 @@
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
  
@@ -1243,7 +1368,7 @@
    if (impl->reload_state == RELOAD_EMPTY)
      {
        char *current_working_dir;
-@@ -6289,9 +6651,9 @@
+@@ -6289,9 +6657,9 @@
      return FALSE;
  
    if (!parent_path)
@@ -1255,7 +1380,7 @@
      same_path = FALSE;
    else
      {
-@@ -6387,6 +6749,16 @@
+@@ -6387,6 +6755,16 @@
  gtk_file_chooser_default_select_all (GtkFileChooser *chooser)
  {
    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
@@ -1272,17 +1397,47 @@
    if (impl->select_multiple)
      gtk_tree_model_foreach (GTK_TREE_MODEL (impl->sort_model), 
  			    maybe_select, impl);
-@@ -6517,6 +6889,9 @@
+@@ -6516,6 +6894,10 @@
+   struct get_paths_closure info;
    GtkWindow *toplevel;
    GtkWidget *current_focus;
- 
++  gboolean file_list_seen;
++
 +  if (impl->operation_mode == OPERATION_MODE_SEARCH)
 +    return search_get_selected_paths (impl);
-+
+ 
    info.impl = impl;
    info.result = NULL;
-   info.path_from_entry = NULL;
-@@ -6734,7 +7109,7 @@
+@@ -6527,12 +6909,14 @@
+   else
+     current_focus = NULL;
+ 
++  file_list_seen = FALSE;
+   if (current_focus == impl->browse_files_tree_view)
+     {
+       GtkTreeSelection *selection;
+ 
+     file_list:
+ 
++      file_list_seen = TRUE;
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+       gtk_tree_selection_selected_foreach (selection, get_paths_foreach, &info);
+ 
+@@ -6567,7 +6951,12 @@
+ 	    }
+ 	}
+ 
+-      info.result = g_slist_prepend (info.result, info.path_from_entry);
++      if (info.path_from_entry)
++	info.result = g_slist_prepend (info.result, info.path_from_entry);
++      else if (!file_list_seen) 
++	goto file_list;
++      else
++	return NULL;
+     }
+   else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
+     goto file_list;
+@@ -6734,7 +7123,7 @@
  
    pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
  
@@ -1291,7 +1446,7 @@
  
  out:
    g_object_unref (data->impl);
-@@ -6848,15 +7223,15 @@
+@@ -6848,15 +7237,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -1310,7 +1465,7 @@
  
        shortcut = col_data;
        if (gtk_file_path_compare (shortcut, path) == 0)
-@@ -6905,15 +7280,15 @@
+@@ -6905,15 +7294,15 @@
    for (i = 0; i < impl->num_shortcuts; i++)
      {
        gpointer col_data;
@@ -1329,7 +1484,7 @@
  
        shortcut = col_data;
        list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
-@@ -7248,6 +7623,23 @@
+@@ -7248,6 +7637,23 @@
      }
  }
  
@@ -1353,7 +1508,7 @@
  static void
  action_create_folder_cb (GtkFileSystemHandle *handle,
  			 const GtkFilePath   *path,
-@@ -7447,6 +7839,9 @@
+@@ -7447,6 +7853,9 @@
  
        g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
  
@@ -1363,7 +1518,7 @@
        selection_check (impl, &num_selected, &all_files, &all_folders);
  
        if (num_selected > 2)
-@@ -7603,7 +7998,7 @@
+@@ -7603,7 +8012,7 @@
  	{
  	  shortcuts_activate_iter (impl, &iter);
  	  
@@ -1372,7 +1527,7 @@
  	}
        else
  	goto file_list;
-@@ -7617,6 +8012,11 @@
+@@ -7617,6 +8026,11 @@
         */
        goto file_list;
      }
@@ -1384,7 +1539,7 @@
    else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
      {
        /* The focus is on a dialog's action area button, *and* the widget that
-@@ -7666,17 +8066,467 @@
+@@ -7666,12 +8080,462 @@
    gtk_widget_grab_focus (widget);
  }
  
@@ -1399,14 +1554,10 @@
  {
 -  if (impl->current_filter != filter)
 -    {
--      int filter_index;
 +  GSList **list;
 +  const GtkFilePath *file_path;
 +  GtkFilePath *file_path_copy;
- 
--      /* NULL filters are allowed to reset to non-filtered status
--       */
--      filter_index = g_slist_index (impl->filters, filter);
++
 +  list = data;
 +
 +  gtk_tree_model_get (model, iter, SEARCH_MODEL_COL_PATH, &file_path, -1);
@@ -1852,15 +2003,10 @@
 +{
 +  if (impl->current_filter != filter)
 +    {
-+      int filter_index;
-+
-+      /* NULL filters are allowed to reset to non-filtered status
-+       */
-+      filter_index = g_slist_index (impl->filters, filter);
-       if (impl->filters && filter && filter_index < 0)
- 	return;
+       int filter_index;
  
-@@ -7714,28 +8564,43 @@
+       /* NULL filters are allowed to reset to non-filtered status
+@@ -7714,28 +8578,43 @@
  {
    GtkTreePath *cursor_path;
    const GtkFilePath *new_path;
@@ -1921,7 +2067,7 @@
      }
  
    if (new_path != impl->preview_path &&
-@@ -7751,7 +8616,7 @@
+@@ -7751,7 +8630,7 @@
        if (new_path)
  	{
  	  impl->preview_path = gtk_file_path_copy (new_path);
@@ -1930,7 +2076,7 @@
  	}
        else
  	{
-@@ -7820,6 +8685,8 @@
+@@ -7820,6 +8699,8 @@
  {
    GtkFilePath *path;
  
@@ -1939,7 +2085,7 @@
    /* We ref the file chooser since volume_mount() may run a main loop, and the
     * user could close the file chooser window in the meantime.
     */
-@@ -7840,6 +8707,8 @@
+@@ -7840,6 +8721,8 @@
        if (path != NULL)
          {
            change_folder_and_display_error (impl, path);
@@ -1948,7 +2094,7 @@
            gtk_file_path_free (path);
          }
      }
-@@ -7872,7 +8741,10 @@
+@@ -7872,7 +8755,10 @@
      goto out;
  
    if (!error && gtk_file_info_get_is_folder (info))
@@ -1960,7 +2106,7 @@
    else
      gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
  
-@@ -7889,31 +8761,30 @@
+@@ -7889,31 +8775,30 @@
  			 GtkTreeIter           *iter)
  {
    gpointer col_data;
@@ -2000,7 +2146,7 @@
      {
        struct ShortcutsActivateData *data;
  
-@@ -7926,6 +8797,10 @@
+@@ -7926,6 +8811,10 @@
  				  GTK_FILE_INFO_IS_FOLDER,
  				  shortcuts_activate_get_info_cb, data);
      }
@@ -2011,7 +2157,7 @@
  }
  
  /* Callback used when a row in the shortcuts list is activated */
-@@ -7938,15 +8813,13 @@
+@@ -7938,15 +8827,13 @@
    GtkTreeIter iter;
    GtkTreeIter child_iter;
  
@@ -2029,7 +2175,7 @@
  }
  
  /* Handler for GtkWidget::key-press-event on the shortcuts list */
-@@ -7986,8 +8859,15 @@
+@@ -7986,8 +8873,15 @@
  			gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2046,7 +2192,7 @@
  }
  
  static gboolean
-@@ -7999,6 +8879,9 @@
+@@ -7999,6 +8893,9 @@
  {
    GtkFileChooserDefault *impl = data;
  
@@ -2056,7 +2202,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
        impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
      {
-@@ -8024,7 +8907,7 @@
+@@ -8024,7 +8921,7 @@
  			GtkFileChooserDefault *impl)
  {
    /* See if we are in the new folder editable row for Save mode */
@@ -2065,7 +2211,7 @@
      {
        const GtkFileInfo *info;
        gboolean had_selection;
-@@ -8039,6 +8922,8 @@
+@@ -8039,6 +8936,8 @@
  
   out:
  
@@ -2074,7 +2220,7 @@
    update_chooser_entry (impl);
    check_preview_change (impl);
    bookmarks_check_add_sensitivity (impl);
-@@ -8056,6 +8941,12 @@
+@@ -8056,6 +8955,12 @@
    GtkTreeIter iter, child_iter;
    const GtkFileInfo *info;
  
@@ -2087,7 +2233,7 @@
    if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path))
      return;
  
-@@ -8126,6 +9017,15 @@
+@@ -8126,6 +9031,15 @@
    const GtkFileInfo *info; 
    gboolean sensitive = TRUE;
  
@@ -2103,7 +2249,7 @@
    profile_start ("start", NULL);
    
    info = get_list_file_info (impl, iter);
-@@ -8175,13 +9075,33 @@
+@@ -8175,13 +9089,33 @@
  		     gpointer           data)
  {
    GtkFileChooserDefault *impl = data;
@@ -2139,7 +2285,7 @@
  		    NULL);
  
        return;
-@@ -8197,6 +9117,7 @@
+@@ -8197,6 +9131,7 @@
    g_object_set (cell,
  		"text", gtk_file_info_get_display_name (info),
  		"sensitive", sensitive,
@@ -2147,7 +2293,7 @@
  		NULL);
  }
  
-@@ -8258,7 +9179,6 @@
+@@ -8258,7 +9193,6 @@
  		      gpointer           data)
  {
    GtkFileChooserDefault *impl;
@@ -2155,7 +2301,7 @@
    GtkFileTime time_mtime;
    GDate mtime, now;
    int days_diff;
-@@ -8267,17 +9187,35 @@
+@@ -8267,17 +9201,35 @@
  
    impl = data;
  
@@ -2199,7 +2345,7 @@
  
    if (time_mtime == 0)
      strcpy (buf, _("Unknown"));
-@@ -8308,10 +9246,6 @@
+@@ -8308,10 +9260,6 @@
  	}
      }
  
@@ -2210,7 +2356,7 @@
    g_object_set (cell,
  		"text", buf,
  		"sensitive", sensitive,
-@@ -8329,7 +9263,23 @@
+@@ -8329,7 +9277,23 @@
  static void
  location_popup_handler (GtkFileChooserDefault *impl,
  			const gchar           *path)
@@ -2235,7 +2381,7 @@
    if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
        || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
      {
-@@ -8379,6 +9329,7 @@
+@@ -8379,6 +9343,7 @@
      g_assert_not_reached ();
  
    shortcuts_activate_iter (impl, &iter);
@@ -2243,7 +2389,7 @@
  }
  
  /* Handler for the "home-folder" keybinding signal */
-@@ -8423,26 +9374,26 @@
+@@ -8423,26 +9388,26 @@
  /* Drag and drop interfaces */
  
  static void
@@ -2276,7 +2422,7 @@
  
    pos = *gtk_tree_path_get_indices (path);
    bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
-@@ -8452,13 +9403,13 @@
+@@ -8452,13 +9417,13 @@
  
  /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
  static gboolean
@@ -2295,7 +2441,7 @@
  
    /* FIXME */
  
-@@ -8467,30 +9418,30 @@
+@@ -8467,30 +9432,30 @@
  
  /* Fill the GtkTreeDragSourceIface vtable */
  static void
@@ -2337,100 +2483,3 @@
  			"child-model", child_model,
  			"virtual-root", root,
  			NULL);
---- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-05-03 18:29:48.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-16 16:22:45.000000000 -0400
-@@ -147,6 +147,20 @@
-   LOCATION_MODE_FILENAME_ENTRY
- } LocationMode;
- 
-+typedef enum {
-+  OPERATION_MODE_BROWSE,
-+  OPERATION_MODE_SEARCH
-+} OperationMode;
-+
-+typedef struct _BeagleHit BeagleHit;
-+typedef struct _BeagleQuery BeagleQuery;
-+typedef struct _BeagleClient BeagleClient;
-+typedef struct _BeagleRequest BeagleRequest;
-+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
-+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
-+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
-+typedef struct _BeagleQueryPart BeagleQueryPart;
-+
- struct _GtkFileChooserDefault
- {
-   GtkVBox parent_instance;
-@@ -175,10 +189,18 @@
-   GtkWidget *browse_files_popup_menu_add_shortcut_item;
-   GtkWidget *browse_files_popup_menu_hidden_files_item;
-   GtkWidget *browse_new_folder_button;
-+  GtkWidget *browse_path_bar_hbox;
-   GtkWidget *browse_path_bar;
- 
-   GtkFileSystemModel *browse_files_model;
- 
-+  /* Widgets for searching */
-+  GtkWidget *search_hbox;
-+  GtkWidget *search_entry;
-+  BeagleClient *search_client;
-+  BeagleQuery *search_query;
-+  GtkListStore *search_model;
-+
-   GtkWidget *filter_combo_hbox;
-   GtkWidget *filter_combo;
-   GtkWidget *preview_box;
-@@ -194,7 +216,16 @@
-   LocationMode location_mode;
- 
-   GtkListStore *shortcuts_model;
--  GtkTreeModel *shortcuts_filter_model;
-+
-+  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
-+   * the separator that we use for the "Save in folder" combo.
-+   */
-+  GtkTreeModel *shortcuts_pane_filter_model;
-+  
-+  /* Filter for the "Save in folder" combo.  We filter out the Search row and
-+   * its separator.
-+   */
-+  GtkTreeModel *shortcuts_combo_filter_model;
- 
-   GtkTreeModelSort *sort_model;
- 
-@@ -213,6 +244,8 @@
-   ReloadState reload_state;
-   guint load_timeout_id;
- 
-+  OperationMode operation_mode;
-+
-   GSList *pending_select_paths;
- 
-   GtkFileFilter *current_filter;
-@@ -220,9 +253,6 @@
- 
-   GtkTooltips *tooltips;
- 
--  gboolean has_home;
--  gboolean has_desktop;
--
-   int num_volumes;
-   int num_shortcuts;
-   int num_bookmarks;
-@@ -237,6 +267,7 @@
- 
-   GtkTreeViewColumn *list_name_column;
-   GtkCellRenderer *list_name_renderer;
-+  GtkTreeViewColumn *list_mtime_column;
- 
-   GSource *edited_idle;
-   char *edited_new_text;
-@@ -264,6 +295,9 @@
-   guint changing_folder : 1;
-   guint shortcuts_current_folder_active : 1;
-   guint processing_pending_selections : 1;
-+  guint has_home : 1;
-+  guint has_desktop : 1;
-+  guint has_search : 1;
- 
- #if 0
-   guint shortcuts_drag_outside : 1;


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- gtk2.spec	16 Jul 2006 23:28:19 -0000	1.163
+++ gtk2.spec	18 Jul 2006 15:14:54 -0000	1.164
@@ -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
@@ -277,6 +277,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-4
+- Make the Search support more bulletproof
+
 * Sun Jul 16 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-3
 - Fix a problem with the Search support
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:19:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:19:45 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.117, 1.118 mkinitrd.spec, 1.141,
	1.142 sources, 1.141, 1.142
Message-ID: <200607181519.k6IFJjkA023225@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23155

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
Bump version for new libbdevid sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- .cvsignore	17 Jul 2006 21:44:55 -0000	1.117
+++ .cvsignore	18 Jul 2006 15:19:43 -0000	1.118
@@ -1,3 +1,4 @@
 bdevid-0.1.tar.bz2
 mkinitrd-5.0.47.tar.bz2
 mkinitrd-5.1.0.tar.bz2
+bdevid-0.2.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- mkinitrd.spec	17 Jul 2006 21:44:55 -0000	1.141
+++ mkinitrd.spec	18 Jul 2006 15:19:43 -0000	1.142
@@ -4,11 +4,11 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.1.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.1
+%define BDEVID_VERSION 0.2
 Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
 
 ExclusiveOs: Linux
@@ -113,6 +113,9 @@
 %{_includedir}/bdevid
 
 %changelog
+* Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 5.1.0-2
+- Pull in new libbdevid sources with linking fix.
+
 * Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 5.1.0-1
 - allow rootdev/rootfs/rootopts parsing on the mkinitrd command line (notting)
 - fix case where we'd spin forever resolving a device (#199046) 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- sources	17 Jul 2006 21:44:55 -0000	1.141
+++ sources	18 Jul 2006 15:19:43 -0000	1.142
@@ -1,3 +1,2 @@
-9336d33e6f75527c68ee09053c6b40c1  bdevid-0.1.tar.bz2
-05acec95f75f8ec02ecfef84b432296f  mkinitrd-5.0.47.tar.bz2
 fd3fe7e971eaf78cd249bc6364b88724  mkinitrd-5.1.0.tar.bz2
+fd4c0f871c668765d2dee3aa01bcfb0c  bdevid-0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:25:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:25:35 -0400
Subject: rpms/cpio/devel cpio-2.6-rh.patch,1.1,1.2 cpio.spec,1.41,1.42
Message-ID: <200607181525.k6IFPZOf025460@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25405

Modified Files:
	cpio-2.6-rh.patch cpio.spec 
Log Message:
fix cpio --help output (#197597)


cpio-2.6-rh.patch:
 doc/cpio.info |    3 ++-
 src/main.c    |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: cpio-2.6-rh.patch
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpio-2.6-rh.patch	13 Jan 2005 13:59:49 -0000	1.1
+++ cpio-2.6-rh.patch	18 Jul 2006 15:25:32 -0000	1.2
@@ -1,5 +1,5 @@
---- cpio-2.5.90/doc/cpio.info.rh	2004-02-27 12:42:01.000000000 +0000
-+++ cpio-2.5.90/doc/cpio.info	2004-11-04 14:40:57.000000000 +0000
+--- cpio-2.6/doc/cpio.info.rh	2004-02-27 13:42:01.000000000 +0100
++++ cpio-2.6/doc/cpio.info	2006-07-18 17:10:52.000000000 +0200
 @@ -261,7 +261,8 @@
       Set the I/O block size to BLOCK-SIZE * 512 bytes.
  
@@ -10,8 +10,17 @@
  
  `-C IO-SIZE, --io-size=IO-SIZE'
       Set the I/O block size to IO-SIZE bytes.
---- cpio-2.5.90/src/main.c.rh	2004-09-08 11:41:42.000000000 +0000
-+++ cpio-2.5.90/src/main.c	2004-11-05 11:09:59.869355664 +0000
+--- cpio-2.6/src/main.c.rh	2004-11-23 01:42:18.000000000 +0100
++++ cpio-2.6/src/main.c	2006-07-18 17:18:10.000000000 +0200
+@@ -101,7 +101,7 @@
+   {"block-size", BLOCK_SIZE_OPTION, N_("BLOCK-SIZE"), 0,
+    N_("Set the I/O block size to BLOCK-SIZE * 512 bytes"), 110},
+   {NULL, 'c', NULL, 0,
+-   N_("Use the old portable (ASCII) archive format"), 0},
++   N_("Identical to \"-H newc\", use the new (SVR4) portable format.If you wish the old portable (ASCII) archive format, use \"-H odc\" instead."), 0},
+   {"dot", 'V', NULL, 0, 
+    N_("Print a \".\" for each file processed"), 110},
+   {"io-size", 'C', N_("NUMBER"), 0,
 @@ -302,6 +302,7 @@
      case 'c':		/* Use the old portable ASCII format.  */
        if (archive_format != arf_unknown)


Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cpio.spec	12 Jul 2006 04:53:10 -0000	1.41
+++ cpio.spec	18 Jul 2006 15:25:32 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 18.1
+Release: 19
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -106,6 +106,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Jul 18 2006 Peter Vrabec <pvrabec at redhat.com> 2.6-19
+- fix cpio --help output (#197597)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6-18.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:28:16 -0400
Subject: rpms/kernel/devel .cvsignore, 1.488, 1.489 find-provides, 1.4,
	1.5 kernel-2.6.spec, 1.2405, 1.2406 sources, 1.432, 1.433
Message-ID: <200607181528.k6IFSGcq026537@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26323

Modified Files:
	.cvsignore find-provides kernel-2.6.spec sources 
Log Message:
Switch over to new kabitool for kernel deps



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- .cvsignore	15 Jul 2006 23:20:49 -0000	1.488
+++ .cvsignore	18 Jul 2006 15:28:13 -0000	1.489
@@ -4,3 +4,5 @@
 xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
+kabitool
+find-provides


Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- find-provides	31 May 2006 00:42:21 -0000	1.4
+++ find-provides	18 Jul 2006 15:28:14 -0000	1.5
@@ -1,17 +1,3 @@
 #! /bin/sh
 
-IFS=$'\n'
-filelist=($(cat))
-
-printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-provides "$@"
-
-for file in "${filelist[@]}"; do
-    case "$file" in
-    */symsets-*.tar.gz)
-	for symset in $(tar tfz "$file" | grep -v '/$'); do
-	    class=${symset##*/} ; class=${class%.*}
-	    echo "kernel($class) = ${symset##*.}"
-	done
-	;;
-   esac
-done
+cat kabi.deps


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2405
retrieving revision 1.2406
diff -u -r1.2405 -r1.2406
--- kernel-2.6.spec	16 Jul 2006 04:32:28 -0000	1.2405
+++ kernel-2.6.spec	18 Jul 2006 15:28:14 -0000	1.2406
@@ -218,8 +218,7 @@
 
 Source10: COPYING.modules
 Source11: genkey
-Source12: built-in-where
-Source13: make-symsets
+Source12: kabitool
 Source14: find-provides
 Source15: merge.pl
 
@@ -1105,12 +1104,9 @@
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
 
-    # Create /boot/sym* files containing meta data for kernel_module_packages.
-    echo "**** GENERATING symvers and symsets ****"
-    gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
-    (   grep -v $'\tvmlinux$' Module.symvers
-        grep $'\tvmlinux$' Module.symvers | %_sourcedir/built-in-where
-    ) | %_sourcedir/make-symsets $RPM_BUILD_ROOT/boot/symsets-$KernelVer.tar.gz
+    # Create the kABI metadata for use in packaging
+    echo "**** GENERATING kernel ABI metadata ****"
+    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d -k $KernelVer
 
     # And save the headers/makefiles etc for building modules against
     #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- sources	15 Jul 2006 23:20:49 -0000	1.432
+++ sources	18 Jul 2006 15:28:14 -0000	1.433
@@ -1,3 +1,5 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
+10d802a1a72ca6bf091c7d6523922004  kabitool
+d83a40382c87fcfe4207f5e25089b113  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:29:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:29:54 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2406,1.2407
Message-ID: <200607181529.k6IFTsMv027205@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27121

Modified Files:
	kernel-2.6.spec 
Log Message:
update spec file with comment



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2406
retrieving revision 1.2407
diff -u -r1.2406 -r1.2407
--- kernel-2.6.spec	18 Jul 2006 15:28:14 -0000	1.2406
+++ kernel-2.6.spec	18 Jul 2006 15:29:52 -0000	1.2407
@@ -1659,6 +1659,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
+- Check in new version of kabitool for kernel deps.
+
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.
 - Drop the FPU optimisation, it may be the reason for



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:30:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:30:27 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.47, 1.48 authconfig.spec, 1.62,
	1.63 sources, 1.54, 1.55
Message-ID: <200607181530.k6IFUR0H027351@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27321

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.2-1
- don't require pam_pkcs11 to run



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	18 Jul 2006 14:44:19 -0000	1.47
+++ .cvsignore	18 Jul 2006 15:30:21 -0000	1.48
@@ -1 +1 @@
-authconfig-5.3.1.tar.bz2
+authconfig-5.3.2.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- authconfig.spec	18 Jul 2006 14:44:20 -0000	1.62
+++ authconfig.spec	18 Jul 2006 15:30:21 -0000	1.63
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.1
+Version: 5.3.2
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -95,6 +95,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.2-1
+- don't require pam_pkcs11 to run
+
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.1-1
 - screensavers should be authenticated by smartcard too
 - add feature to download a CA certificate for LDAP from 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	18 Jul 2006 14:44:20 -0000	1.54
+++ sources	18 Jul 2006 15:30:21 -0000	1.55
@@ -1 +1 @@
-53163e9783f5ebb03fef26018ecae7cb  authconfig-5.3.1.tar.bz2
+f47012e4163cdf35503db28a35e3c999  authconfig-5.3.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:33:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:33:31 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.110,1.111
Message-ID: <200607181533.k6IFXVgw027833@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27756

Modified Files:
	nautilus.spec 
Log Message:
Make monoectomy easier



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- nautilus.spec	13 Jul 2006 03:46:45 -0000	1.110
+++ nautilus.spec	18 Jul 2006 15:33:17 -0000	1.111
@@ -1,3 +1,8 @@
+%{?!WITH_MONO:  %define WITH_MONO 1}
+%ifarch ppc64 s390 s390x
+%define WITH_MONO 0
+%endif
+
 %define glib2_version 2.6.0
 %define pango_version 1.1.3
 %define gtk2_version 2.6.0
@@ -41,11 +46,6 @@
 %endif
 PreReq:    scrollkeeper >= 0.1.4
 
-# Not technically required, but we want them on upgrades:
-#%ifnarch  s390 s390x
-#Requires:	nautilus-cd-burner
-#%endif
-
 BuildRequires:	glib2-devel >= %{glib2_version}
 BuildRequires:	pango-devel >= %{pango_version}
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -66,7 +66,7 @@
 BuildRequires:  startup-notification-devel >= %{startup_notification_version}
 BuildRequires:  libexif-devel >= %{libexif_version}
 BuildRequires:  gettext
-%ifnarch  s390 s390x ppc64
+%if %{WITH_MONO}
 BuildRequires:  libbeagle-devel
 %else
 %define disable_beagle --disable-beagle



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:37:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:37:31 -0400
Subject: rpms/nautilus/devel nautilus.spec,1.111,1.112
Message-ID: <200607181537.k6IFbVwt028539@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28515

Modified Files:
	nautilus.spec 
Log Message:
Spec file cleanups



Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- nautilus.spec	18 Jul 2006 15:33:17 -0000	1.111
+++ nautilus.spec	18 Jul 2006 15:37:28 -0000	1.112
@@ -23,7 +23,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.15.4
-Release:	2
+Release:	3
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -177,6 +177,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
+- Spec file cleanups
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
 - Don't require nautilus-cd-burner, to avoid a 
   BuildRequires-Requires loop



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:38:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:38:01 -0400
Subject: rpms/sendmail/FC-4 sendmail-8.13.7-aliases_dir.patch, NONE,
	1.1 sendmail-8.13.7-pid.patch, NONE,
	1.1 sendmail-8.13.7-vacation.patch, NONE, 1.1 .cvsignore, 1.16,
	1.17 sendmail-redhat.mc, 1.14, 1.15 sendmail.etc-mail-Makefile,
	1.9, 1.10 sendmail.init, 1.14, 1.15 sendmail.spec, 1.58,
	1.59 sources, 1.16, 1.17
Message-ID: <200607181538.k6IFc1bC028640@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28592

Modified Files:
	.cvsignore sendmail-redhat.mc sendmail.etc-mail-Makefile 
	sendmail.init sendmail.spec sources 
Added Files:
	sendmail-8.13.7-aliases_dir.patch sendmail-8.13.7-pid.patch 
	sendmail-8.13.7-vacation.patch 
Log Message:
[tw]
- using new syntax for access database (#177566)
- fixed failure message while shutting down sm-client (#119429)
  resolution: stop sm-client before sendmail
- fixed method to specify persistent queue runners (#126760)
- removed patch backup files from sendmail-cf tree (#152955)
- fixed missing dnl on SMART_HOST define (#166680)
- fixed wrong location of aliases and aliases.db file in aliases man page
  (#166744)
- enabled CipherList config option for sendmail (#172352)
- added user chowns for /etc/mail/authinfo.db and move check for cf files
  (#184341)
- fixed Makefile of vacation (#191396)
  vacation is not included in this sendmail package
- /var/log/mail now belongs to sendmail (#192850)
- using old pam_stack



sendmail-8.13.7-aliases_dir.patch:
 aliases.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sendmail-8.13.7-aliases_dir.patch ---
--- sendmail-8.13.7/sendmail/aliases.5.aliases_dir	2006-07-14 15:41:59.000000000 +0200
+++ sendmail-8.13.7/sendmail/aliases.5	2006-07-14 15:42:38.000000000 +0200
@@ -23,7 +23,7 @@
 aliases used by 
 sendmail.
 The file resides in 
-/etc/mail 
+/etc
 and 
 is formatted as a series of lines of the form
 .IP
@@ -96,7 +96,7 @@
 .PP
 This is only the raw data file; the actual aliasing information is
 placed into a binary format in the file 
-/etc/mail/aliases.db
+/etc/aliases.db
 using the program 
 newaliases(1).  
 A 

sendmail-8.13.7-pid.patch:
 submit.mc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-pid.patch ---
--- sendmail-8.13.7/cf/cf/submit.mc.pid	2006-04-05 07:54:41.000000000 +0200
+++ sendmail-8.13.7/cf/cf/submit.mc	2006-06-19 18:07:11.000000000 +0200
@@ -15,12 +15,16 @@
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
+include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
+VERSIONID(`linux setup')dnl
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
 define(`confTIME_ZONE', `USE_TZ')dnl
 define(`confDONT_INIT_GROUPS', `True')dnl
+define(`confPID_FILE', `/var/run/sm-client.pid')dnl
+dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
+FEATURE(`use_ct_file')dnl
 dnl
 dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
 FEATURE(`msp', `[127.0.0.1]')dnl

sendmail-8.13.7-vacation.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-vacation.patch ---
--- sendmail-8.13.7/vacation/Makefile.vacation	1999-09-24 00:36:45.000000000 +0200
+++ sendmail-8.13.7/vacation/Makefile	2006-07-18 15:12:42.000000000 +0200
@@ -1,7 +1,7 @@
 #       $Id: Makefile,v 8.5 1999/09/23 22:36:45 ca Exp $
 
 SHELL= /bin/sh
-BUILD=   ./Build
+BUILD=   ./Build -f ../redhat.config.m4
 OPTIONS= $(CONFIG) $(FLAGS)
 
 all: FRC


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	22 Mar 2006 17:49:46 -0000	1.16
+++ .cvsignore	18 Jul 2006 15:37:58 -0000	1.17
@@ -3,3 +3,4 @@
 sendmail.8.13.3.tar.gz
 sendmail.8.13.4.tar.gz
 sendmail.8.13.6.tar.gz
+sendmail.8.13.7.tar.gz


Index: sendmail-redhat.mc
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail-redhat.mc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail-redhat.mc	22 Mar 2006 17:49:46 -0000	1.14
+++ sendmail-redhat.mc	18 Jul 2006 15:37:58 -0000	1.15
@@ -8,7 +8,7 @@
 dnl #     make -C /etc/mail
 dnl #
 include(`@@PATH@@/m4/cf.m4')dnl
-VERSIONID(`setup for Red Hat Linux')dnl
+VERSIONID(`setup for linux')dnl
 OSTYPE(`linux')dnl
 dnl #
 dnl # default logging level is 9, you might want to set it higher to
@@ -19,7 +19,7 @@
 dnl # Uncomment and edit the following line if your outgoing mail needs to
 dnl # be sent out through an external mail server:
 dnl #
-dnl define(`SMART_HOST',`smtp.your.provider')
+dnl define(`SMART_HOST',`smtp.your.provider')dnl
 dnl #
 define(`confDEF_USER_ID',``8:12'')dnl
 dnl define(`confAUTO_REBUILD')dnl


Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.etc-mail-Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sendmail.etc-mail-Makefile	9 Sep 2004 12:27:14 -0000	1.9
+++ sendmail.etc-mail-Makefile	18 Jul 2006 15:37:58 -0000	1.10
@@ -11,6 +11,9 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
+	@if test -f /etc/mail/authinfo.db; then \
+		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
+	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<
@@ -21,7 +24,7 @@
 %.cf: %.mc
 	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
 		umask 022; \
-		mv -f $@ $@.bak; \
+		[ -e $@ ] && mv -f $@ $@.bak; \
 		m4 $< > $@; \
 	else \
 		echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \


Index: sendmail.init
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail.init	22 Mar 2006 17:49:46 -0000	1.14
+++ sendmail.init	18 Jul 2006 15:37:58 -0000	1.15
@@ -62,7 +62,7 @@
 	    /sbin/restorecon /var/run/sm-client.pid
 	fi
 	daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \
-			-q $SMQUEUE $SENDMAIL_OPTARG
+			-q$SMQUEUE $SENDMAIL_OPTARG
 	RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client
@@ -101,11 +101,6 @@
 
 stop() {
 	# Stop daemons.
-	echo -n $"Shutting down $prog: "
-	killproc sendmail
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	if test -f /var/run/sm-client.pid ; then
 		echo -n $"Shutting down sm-client: "
 		killproc sm-client
@@ -114,6 +109,11 @@
 		[ $RETVAL -eq 0 ] && rm -f /var/run/sm-client.pid
 		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sm-client
 	fi
+	echo -n $"Shutting down $prog: "
+	killproc sendmail
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	return $RETVAL
 }
 


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sendmail.spec	22 Mar 2006 17:49:46 -0000	1.58
+++ sendmail.spec	18 Jul 2006 15:37:58 -0000	1.59
@@ -17,8 +17,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
-Version: 8.13.6
-Release: 0.FC4.1
+Version: 8.13.7
+Release: 2.fc4.1
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -37,16 +37,19 @@
 Patch3: sendmail-8.12.2-makemapman.patch
 Patch4: sendmail-8.13.2-smrsh-paths.patch
 Patch5: sendmail-8.12.2-movefiles.patch
-Patch7: sendmail-8.13.0-pid.patch
+Patch7: sendmail-8.13.7-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.6-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
+Patch13: sendmail-8.13.7-aliases_dir.patch
+Patch14: sendmail-8.13.7-vacation.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff
+BuildRequires: m4
 PreReq: /usr/sbin/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
@@ -70,7 +73,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,13 +139,15 @@
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
+%patch13 -p1 -b .aliases_dir
+%patch14 -p1 -b .vacation
 
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
-define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL')
+define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
 define(\`confMANOWN', \`root')
@@ -156,6 +161,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')
@@ -287,6 +297,10 @@
 
 # Install the cf files for the sendmail-cf package.
 cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
+# remove patch backup files
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
 
 install -d -m755 $RPM_BUILD_ROOT/etc/mail
 
@@ -327,9 +341,9 @@
 # package.
 #
 # by default we allow relaying from localhost...
-localhost.localdomain		RELAY
-localhost			RELAY
-127.0.0.1			RELAY
+Connect:localhost.localdomain		RELAY
+Connect:localhost			RELAY
+Connect:127.0.0.1			RELAY
 
 EOF
 for map in virtusertable access domaintable mailertable ; do
@@ -517,6 +531,7 @@
 %{_mandir}/man1/newaliases.sendmail.1*
 %{_mandir}/man1/mailq.sendmail.1*
 
+%dir %{stdir}
 %config(noreplace)		%{stdir}/statistics
 %config(noreplace)		/etc/mail/sendmail.cf
 %config(noreplace)		/etc/mail/submit.cf
@@ -572,17 +587,68 @@
 %{_docdir}/sendmail
 
 %changelog
-* Wed Mar 22 2006 Thomas Woerner <twoerner at redhat.com> 8.13.6-0.FC4.1
+* Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc4.1
+- using new syntax for access database (#177566)
+- fixed failure message while shutting down sm-client (#119429)
+  resolution: stop sm-client before sendmail
+- fixed method to specify persistent queue runners (#126760)
+- removed patch backup files from sendmail-cf tree (#152955)
+- fixed missing dnl on SMART_HOST define (#166680)
+- fixed wrong location of aliases and aliases.db file in aliases man page
+  (#166744)
+- enabled CipherList config option for sendmail (#172352)
+- added user chowns for /etc/mail/authinfo.db and move check for cf files
+  (#184341)
+- fixed Makefile of vacation (#191396)
+  vacation is not included in this sendmail package
+- /var/log/mail now belongs to sendmail (#192850)
+- using old pam_stack
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.13.7-2.1
+- rebuild
+
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2
+- dropped reference to Red Hat Linux in sendmail-redhat.mc (#176679)
+
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-1
+- new version 8.13.7 (#195282)
+- fixes CVE-2006-1173 (VU#146718): possible denial of service issue caused by
+  malformed multipart messages (#195776)
+
+* Wed Mar 22 2006 Thomas Woerner <twoerner at redhat.com> 8.13.6-1
 - new version 8.13.6 (fixes VU#834865)
 - dropped libmilter-sigwait patch (fixed in 8.13.6)
+
+* 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)
+
+* 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
+
+* Thu Nov 10 2005 Tomas Mraz <tmraz at redhat.com> 8.13.5-2
+- rebuilt against new openssl
+
+* Mon Oct 10 2005 Tomas Mraz <tmraz at redhat.com>
+- use include instead of pam_stack in pam config
+
+* Mon Sep 19 2005 Thomas Woerner <twoerner at redhat.com> 8.13.5-1
+- new version 8.13.5
 - fixed email address in changelog
 
 * Fri May  6 2005 Thomas Woerner <twoerner at redhat.com> 8.13.4-2
 - using new certificates directory /etc/pki/tls/certs
 
-* Wed Apr 27 2005 Thomas Woerner <twoerner at redhat.com> 8.13.4-1.1
+* Wed Apr 27 2005 Thomas Woerner <twoerrner at redhat.com> 8.13.4-1.1
 - added configuration example for Cyrus-IMAPd to sendmail.mc (#142001)
   Thanks to Alexander Dalloz
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	22 Mar 2006 17:49:46 -0000	1.16
+++ sources	18 Jul 2006 15:37:58 -0000	1.17
@@ -1 +1 @@
-484cca51f74b5e562b3cf119ceb2f900  sendmail.8.13.6.tar.gz
+5327e065cb0c1919122c8cecbeddbc28  sendmail.8.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:42:37 -0400
Subject: rpms/system-config-kickstart/FC-5 system-config-kickstart.spec, 1.37,
	1.38
Message-ID: <200607181542.k6IFgbim030204@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30166

Modified Files:
	system-config-kickstart.spec 
Log Message:
Bump Release to fix updates (#199248).



Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/FC-5/system-config-kickstart.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- system-config-kickstart.spec	27 Mar 2006 19:36:03 -0000	1.37
+++ system-config-kickstart.spec	18 Jul 2006 15:42:35 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
 Version: 2.6.6
-Release: 4
+Release: 5
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -82,6 +82,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 2.6.6-5
+- Bump Release to fix updates (#199248).
+
 * Mon Mar 27 2006 Chris Lumens <clumens at redhat.com> 2.6.6-4 
 - Add patch to fix loading kickstart files (#186944).
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:42:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:42:55 -0400
Subject: rpms/sendmail/FC-5 sendmail-8.13.7-aliases_dir.patch, NONE,
	1.1 sendmail-8.13.7-pid.patch, NONE,
	1.1 sendmail-8.13.7-vacation.patch, NONE, 1.1 .cvsignore, 1.17,
	1.18 sendmail-redhat.mc, 1.14, 1.15 sendmail.etc-mail-Makefile,
	1.9, 1.10 sendmail.init, 1.14, 1.15 sendmail.spec, 1.66,
	1.67 sources, 1.17, 1.18
Message-ID: <200607181542.k6IFgtUq030334@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30248

Modified Files:
	.cvsignore sendmail-redhat.mc sendmail.etc-mail-Makefile 
	sendmail.init sendmail.spec sources 
Added Files:
	sendmail-8.13.7-aliases_dir.patch sendmail-8.13.7-pid.patch 
	sendmail-8.13.7-vacation.patch 
Log Message:
[tw]
- using new syntax for access database (#177566)
- fixed failure message while shutting down sm-client (#119429)
  resolution: stop sm-client before sendmail
- fixed method to specify persistent queue runners (#126760)
- removed patch backup files from sendmail-cf tree (#152955)
- fixed missing dnl on SMART_HOST define (#166680)
- fixed wrong location of aliases and aliases.db file in aliases man page
  (#166744)
- enabled CipherList config option for sendmail (#172352)
- added user chowns for /etc/mail/authinfo.db and move check for cf files
  (#184341)
- fixed Makefile of vacation (#191396)
  vacation is not included in this sendmail package
- /var/log/mail now belongs to sendmail (#192850)



sendmail-8.13.7-aliases_dir.patch:
 aliases.5 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sendmail-8.13.7-aliases_dir.patch ---
--- sendmail-8.13.7/sendmail/aliases.5.aliases_dir	2006-07-14 15:41:59.000000000 +0200
+++ sendmail-8.13.7/sendmail/aliases.5	2006-07-14 15:42:38.000000000 +0200
@@ -23,7 +23,7 @@
 aliases used by 
 sendmail.
 The file resides in 
-/etc/mail 
+/etc
 and 
 is formatted as a series of lines of the form
 .IP
@@ -96,7 +96,7 @@
 .PP
 This is only the raw data file; the actual aliasing information is
 placed into a binary format in the file 
-/etc/mail/aliases.db
+/etc/aliases.db
 using the program 
 newaliases(1).  
 A 

sendmail-8.13.7-pid.patch:
 submit.mc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-pid.patch ---
--- sendmail-8.13.7/cf/cf/submit.mc.pid	2006-04-05 07:54:41.000000000 +0200
+++ sendmail-8.13.7/cf/cf/submit.mc	2006-06-19 18:07:11.000000000 +0200
@@ -15,12 +15,16 @@
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
+include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
+VERSIONID(`linux setup')dnl
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
 define(`confTIME_ZONE', `USE_TZ')dnl
 define(`confDONT_INIT_GROUPS', `True')dnl
+define(`confPID_FILE', `/var/run/sm-client.pid')dnl
+dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
+FEATURE(`use_ct_file')dnl
 dnl
 dnl If you use IPv6 only, change [127.0.0.1] to [IPv6:::1]
 FEATURE(`msp', `[127.0.0.1]')dnl

sendmail-8.13.7-vacation.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sendmail-8.13.7-vacation.patch ---
--- sendmail-8.13.7/vacation/Makefile.vacation	1999-09-24 00:36:45.000000000 +0200
+++ sendmail-8.13.7/vacation/Makefile	2006-07-18 15:12:42.000000000 +0200
@@ -1,7 +1,7 @@
 #       $Id: Makefile,v 8.5 1999/09/23 22:36:45 ca Exp $
 
 SHELL= /bin/sh
-BUILD=   ./Build
+BUILD=   ./Build -f ../redhat.config.m4
 OPTIONS= $(CONFIG) $(FLAGS)
 
 all: FRC


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	22 Mar 2006 17:43:12 -0000	1.17
+++ .cvsignore	18 Jul 2006 15:42:53 -0000	1.18
@@ -4,3 +4,4 @@
 sendmail.8.13.4.tar.gz
 sendmail.8.13.5.tar.gz
 sendmail.8.13.6.tar.gz
+sendmail.8.13.7.tar.gz


Index: sendmail-redhat.mc
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail-redhat.mc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail-redhat.mc	17 Feb 2006 16:57:15 -0000	1.14
+++ sendmail-redhat.mc	18 Jul 2006 15:42:53 -0000	1.15
@@ -8,7 +8,7 @@
 dnl #     make -C /etc/mail
 dnl #
 include(`@@PATH@@/m4/cf.m4')dnl
-VERSIONID(`setup for Red Hat Linux')dnl
+VERSIONID(`setup for linux')dnl
 OSTYPE(`linux')dnl
 dnl #
 dnl # default logging level is 9, you might want to set it higher to
@@ -19,7 +19,7 @@
 dnl # Uncomment and edit the following line if your outgoing mail needs to
 dnl # be sent out through an external mail server:
 dnl #
-dnl define(`SMART_HOST',`smtp.your.provider')
+dnl define(`SMART_HOST',`smtp.your.provider')dnl
 dnl #
 define(`confDEF_USER_ID',``8:12'')dnl
 dnl define(`confAUTO_REBUILD')dnl


Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.etc-mail-Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sendmail.etc-mail-Makefile	9 Sep 2004 12:27:14 -0000	1.9
+++ sendmail.etc-mail-Makefile	18 Jul 2006 15:42:53 -0000	1.10
@@ -11,6 +11,9 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
+	@if test -f /etc/mail/authinfo.db; then \
+		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
+	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<
@@ -21,7 +24,7 @@
 %.cf: %.mc
 	@if test -f /usr/share/sendmail-cf/m4/cf.m4; then \
 		umask 022; \
-		mv -f $@ $@.bak; \
+		[ -e $@ ] && mv -f $@ $@.bak; \
 		m4 $< > $@; \
 	else \
 		echo -e "WARNING: '$<' is modified. Please install package sendmail-cf to update your configuration."; \


Index: sendmail.init
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendmail.init	17 Feb 2006 16:57:15 -0000	1.14
+++ sendmail.init	18 Jul 2006 15:42:53 -0000	1.15
@@ -62,7 +62,7 @@
 	    /sbin/restorecon /var/run/sm-client.pid
 	fi
 	daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \
-			-q $SMQUEUE $SENDMAIL_OPTARG
+			-q$SMQUEUE $SENDMAIL_OPTARG
 	RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sm-client
@@ -101,11 +101,6 @@
 
 stop() {
 	# Stop daemons.
-	echo -n $"Shutting down $prog: "
-	killproc sendmail
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	if test -f /var/run/sm-client.pid ; then
 		echo -n $"Shutting down sm-client: "
 		killproc sm-client
@@ -114,6 +109,11 @@
 		[ $RETVAL -eq 0 ] && rm -f /var/run/sm-client.pid
 		[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sm-client
 	fi
+	echo -n $"Shutting down $prog: "
+	killproc sendmail
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sendmail
 	return $RETVAL
 }
 


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- sendmail.spec	22 Mar 2006 17:43:12 -0000	1.66
+++ sendmail.spec	18 Jul 2006 15:42:53 -0000	1.67
@@ -17,8 +17,8 @@
 
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
-Version: 8.13.6
-Release: 0.FC5.1
+Version: 8.13.7
+Release: 2.fc5.1
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -37,16 +37,19 @@
 Patch3: sendmail-8.12.2-makemapman.patch
 Patch4: sendmail-8.13.2-smrsh-paths.patch
 Patch5: sendmail-8.12.2-movefiles.patch
-Patch7: sendmail-8.13.0-pid.patch
+Patch7: sendmail-8.13.7-pid.patch
 Patch9: sendmail-8.12.7-hesiod.patch
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.6-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
+Patch13: sendmail-8.13.7-aliases_dir.patch
+Patch14: sendmail-8.13.7-vacation.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
 BuildRequires: hesiod-devel
 BuildRequires: groff
+BuildRequires: m4
 PreReq: /usr/sbin/alternatives
 Provides: %{_sbindir}/sendmail %{_bindir}/mailq %{_bindir}/newaliases
 Provides: %{_bindir}/rmail %{_mandir}/man1/mailq.1.gz
@@ -136,13 +139,15 @@
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
+%patch13 -p1 -b .aliases_dir
+%patch14 -p1 -b .vacation
 
 %build
 # generate redhat config file
 cat > redhat.config.m4 << EOF
 define(\`confMAPDEF', \`-DNEWDB -DNIS -DHESIOD -DMAP_REGEX -DSOCKETMAP -DNAMED_BIND=1')
 define(\`confOPTIMIZE', \`\`\`${RPM_OPT_FLAGS}''')
-define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL')
+define(\`confENVDEF', \`-I/usr/include/db4 -I/usr/kerberos/include -Wall -DXDEBUG=0 -DTCPWRAPPERS -DNETINET6 -DHES_GETMAILHOST -DUSE_VENDOR_CF_PATH=1 -D_FFR_WORKAROUND_BROKEN_NAMESERVERS -D_FFR_SMTP_SSL -D_FFR_TLS_1')
 define(\`confLIBDIRS', \`-L/usr/kerberos/%{_lib}')
 define(\`confLIBS', \`-lnsl -lwrap -lhesiod -lcrypt -ldb')
 define(\`confMANOWN', \`root')
@@ -292,6 +297,10 @@
 
 # Install the cf files for the sendmail-cf package.
 cp -ar cf/* $RPM_BUILD_ROOT%{sendmailcf}
+# remove patch backup files
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/cf/Build.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.mc.*
+rm -rf $RPM_BUILD_ROOT%{sendmailcf}/*/*.m4.*
 
 install -d -m755 $RPM_BUILD_ROOT/etc/mail
 
@@ -332,9 +341,9 @@
 # package.
 #
 # by default we allow relaying from localhost...
-localhost.localdomain		RELAY
-localhost			RELAY
-127.0.0.1			RELAY
+Connect:localhost.localdomain		RELAY
+Connect:localhost			RELAY
+Connect:127.0.0.1			RELAY
 
 EOF
 for map in virtusertable access domaintable mailertable ; do
@@ -522,6 +531,7 @@
 %{_mandir}/man1/newaliases.sendmail.1*
 %{_mandir}/man1/mailq.sendmail.1*
 
+%dir %{stdir}
 %config(noreplace)		%{stdir}/statistics
 %config(noreplace)		/etc/mail/sendmail.cf
 %config(noreplace)		/etc/mail/submit.cf
@@ -577,7 +587,34 @@
 %{_docdir}/sendmail
 
 %changelog
-* Wed Mar 22 2006 Thomas Woerner <twoerner at redhat.com> 8.13.6-0.FC5.1
+* Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc5.1
+- using new syntax for access database (#177566)
+- fixed failure message while shutting down sm-client (#119429)
+  resolution: stop sm-client before sendmail
+- fixed method to specify persistent queue runners (#126760)
+- removed patch backup files from sendmail-cf tree (#152955)
+- fixed missing dnl on SMART_HOST define (#166680)
+- fixed wrong location of aliases and aliases.db file in aliases man page
+  (#166744)
+- enabled CipherList config option for sendmail (#172352)
+- added user chowns for /etc/mail/authinfo.db and move check for cf files
+  (#184341)
+- fixed Makefile of vacation (#191396)
+  vacation is not included in this sendmail package
+- /var/log/mail now belongs to sendmail (#192850)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.13.7-2.1
+- rebuild
+
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2
+- dropped reference to Red Hat Linux in sendmail-redhat.mc (#176679)
+
+* Mon Jun 19 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-1
+- new version 8.13.7 (#195282)
+- fixes CVE-2006-1173 (VU#146718): possible denial of service issue caused by
+  malformed multipart messages (#195776)
+
+* Wed Mar 22 2006 Thomas Woerner <twoerner at redhat.com> 8.13.6-1
 - new version 8.13.6 (fixes VU#834865)
 - dropped libmilter-sigwait patch (fixed in 8.13.6)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Mar 2006 17:43:12 -0000	1.17
+++ sources	18 Jul 2006 15:42:53 -0000	1.18
@@ -1 +1 @@
-484cca51f74b5e562b3cf119ceb2f900  sendmail.8.13.6.tar.gz
+5327e065cb0c1919122c8cecbeddbc28  sendmail.8.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:43:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:43:29 -0400
Subject: rpms/kernel/devel find-provides,1.5,1.6 sources,1.433,1.434
Message-ID: <200607181543.k6IFhTeD030649@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30556

Modified Files:
	find-provides sources 
Log Message:
fixed silly bug in find-requires



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- find-provides	18 Jul 2006 15:28:14 -0000	1.5
+++ find-provides	18 Jul 2006 15:43:27 -0000	1.6
@@ -1,3 +1,8 @@
 #! /bin/sh
 
-cat kabi.deps
+# The magic is now in kabitool but we still need to have a dep script for now
+
+if [ -e kabi.deps ];
+then
+   cat kabi.deps
+fi


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- sources	18 Jul 2006 15:28:14 -0000	1.433
+++ sources	18 Jul 2006 15:43:27 -0000	1.434
@@ -2,4 +2,4 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 10d802a1a72ca6bf091c7d6523922004  kabitool
-d83a40382c87fcfe4207f5e25089b113  find-provides
+bcca9d88ea77473cce343293dc0e9b98  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:51:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:51:23 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.26,
	1.27 selinux-policy.spec, 1.225, 1.226
Message-ID: <200607181551.k6IFpNm3016042@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15937

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-3
- Allow prelink to read bin_t symlink
- allow xfs to read random devices
- Change gfs to support xattr


policy-20060608.patch:
 global_tunables                    |   14 +-
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    4 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  122 ++++++++++++++++++++
 modules/services/squid.te          |    2 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    2 
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 73 files changed, 701 insertions(+), 175 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20060608.patch	17 Jul 2006 17:34:28 -0000	1.26
+++ policy-20060608.patch	18 Jul 2006 15:51:20 -0000	1.27
@@ -74,9 +74,41 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-07-18 08:54:22.000000000 -0400
+@@ -48,6 +48,7 @@
+ corecmd_relabel_all_executables(prelink_t)
+ corecmd_mmap_all_executables(prelink_t)
+ corecmd_read_sbin_symlinks(prelink_t)
++corecmd_read_bin_symlinks(prelink_t)
+ 
+ dev_read_urand(prelink_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.3/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-07-17 15:30:08.000000000 -0400
+@@ -19,6 +19,8 @@
+ /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ ')
+ 
+ /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
 --- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-18 09:52:40.000000000 -0400
+@@ -211,7 +211,7 @@
+ 
+ 	files_search_var_lib($1)
+ 	allow $1 rpm_var_lib_t:dir r_dir_perms;
+-	allow $1 rpm_var_lib_t:file { getattr read };
++	allow $1 rpm_var_lib_t:file r_file_perms;
+ 	allow $1 rpm_var_lib_t:lnk_file r_file_perms;
+ ')
+ 
 @@ -232,7 +232,7 @@
  
  	files_search_var_lib($1)
@@ -156,6 +188,25 @@
  /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.3/policy/modules/kernel/filesystem.te
+--- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-07-18 08:50:02.000000000 -0400
+@@ -24,6 +24,7 @@
+ fs_use_xattr ext2 gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr ext3 gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr gfs2 gen_context(system_u:object_r:fs_t,s0);
++fs_use_xattr gfs gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0);
+ fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0);
+ 
+@@ -181,7 +182,6 @@
+ genfscon hfs / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0)
+ genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
+-genfscon gfs / gen_context(system_u:object_r:nfs_t,s0)
+ 
+ ########################################
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
 --- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-17 11:43:02.000000000 -0400
@@ -446,7 +497,7 @@
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-18 10:42:09.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -455,6 +506,16 @@
  allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
  allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
  allow cupsd_t self:udp_socket create_socket_perms;
+@@ -202,7 +203,8 @@
+ # invoking ghostscript needs to read fonts
+ miscfiles_read_fonts(cupsd_t)
+ 
+-seutil_dontaudit_read_config(cupsd_t)
++seutil_read_config(cupsd_t)
++selinux_get_enforce_mode(cupsd_t)
+ 
+ sysnet_read_config(cupsd_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-17 11:43:02.000000000 -0400
@@ -552,7 +613,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-18 10:41:23.000000000 -0400
 @@ -62,7 +62,7 @@
  	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
  	allow $1_lpr_t self:tcp_socket create_socket_perms;
@@ -562,7 +623,7 @@
  	# lpr can run in lightweight mode, without a local print spooler.
  	allow $1_lpr_t lpd_var_run_t:dir search;
  	allow $1_lpr_t lpd_var_run_t:sock_file write;
-@@ -108,7 +108,11 @@
+@@ -108,8 +108,13 @@
  	allow lpd_t $1_print_spool_t:file r_file_perms;
  	allow lpd_t $1_print_spool_t:file link_file_perms;
  
@@ -572,9 +633,29 @@
  	kernel_tcp_recvfrom($1_lpr_t)
 +	kernel_read_kernel_sysctls($1_lpr_t)
  
++	corenet_non_ipsec_sendrecv($1_lpr_t)
  	corenet_tcp_sendrecv_generic_if($1_lpr_t)
  	corenet_udp_sendrecv_generic_if($1_lpr_t)
-@@ -186,6 +190,7 @@
+ 	corenet_tcp_sendrecv_all_nodes($1_lpr_t)
+@@ -149,6 +154,8 @@
+ 	userdom_read_user_tmp_symlinks($1,$1_lpr_t)
+ 	# Write to the user domain tty.
+ 	userdom_use_user_terminals($1,$1_lpr_t)
++	userdom_read_user_home_content_files($1,$1_lpr_t)
++	userdom_read_user_tmp_files($1,$1_lpr_t)
+ 
+ 	tunable_policy(`read_default_t',`
+ 		files_list_default($1_lpr_t)
+@@ -158,8 +165,6 @@
+ 
+ 	tunable_policy(`read_untrusted_content',`
+ 		#list and read user specific untrusted content
+-		files_list_home($1_lpr_t)
+-		userdom_list_user_home_dirs($1,$1_lpr_t)
+ 		userdom_read_user_untrusted_content_files($1,$1_lpr_t)
+ 
+ 		#list and read user specific temporary untrusted content
+@@ -186,6 +191,7 @@
  		cups_tcp_connect($1_lpr_t)
  		cups_read_config($2)
  		cups_tcp_connect($2)
@@ -582,6 +663,21 @@
  	')
  
  	optional_policy(`
+@@ -199,14 +205,6 @@
+ 	optional_policy(`
+ 		nis_use_ypbind($1_lpr_t)
+ 	')
+-
+-	ifdef(`TODO',`
+-	optional_policy(`
+-		allow $1_lpr_t xdm_t:fd use;
+-		allow $1_lpr_t xdm_var_run_t:dir search;
+-		allow $1_lpr_t xdm_t:fifo_file { getattr read write ioctl };
+-	')
+-	') dnl end TODO
+ ')
+ 
+ #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
 --- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-07-17 12:13:02.000000000 -0400
@@ -653,7 +749,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 15:55:47.000000000 -0400
 @@ -33,6 +33,10 @@
  allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow openvpn_t self:udp_socket create_socket_perms;
@@ -665,15 +761,17 @@
  
  allow openvpn_t openvpn_etc_t:dir r_dir_perms;
  allow openvpn_t openvpn_etc_t:file r_file_perms;
-@@ -67,6 +71,7 @@
+@@ -67,6 +71,9 @@
  corenet_sendrecv_openvpn_server_packets(openvpn_t)
  corenet_rw_tun_tap_dev(openvpn_t)
  
++init_use_fds(openvpn_t)
++
 +dev_search_sysfs(openvpn_t)
  dev_read_rand(openvpn_t)
  dev_read_urand(openvpn_t)
  
-@@ -80,6 +85,7 @@
+@@ -80,6 +87,7 @@
  
  miscfiles_read_localization(openvpn_t)
  
@@ -968,8 +1066,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-17 11:43:02.000000000 -0400
-@@ -0,0 +1,125 @@
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-18 09:53:15.000000000 -0400
+@@ -0,0 +1,122 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -1088,10 +1186,7 @@
 +allow setroubleshoot_t setroubleshoot_exec_t:file { entrypoint getattr ioctl read };
 +
 +optional_policy(`
-+	#rpm_dontaudit_manage_db(setroubleshoot_t)
-+	# ****************BAD BAD BAD **********************
 +	rpm_read_db(setroubleshoot_t)
-+	rpm_manage_db(setroubleshoot_t)
 +')
 +
 +
@@ -1120,6 +1215,18 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.3.3/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-07-17 15:49:07.000000000 -0400
+@@ -59,6 +59,8 @@
+ term_dontaudit_use_console(xfs_t)
+ 
+ auth_use_nsswitch(xfs_t)
++dev_read_urand(xfs_t)
++dev_read_rand(xfs_t)
+ 
+ init_use_fds(xfs_t)
+ init_use_script_ptys(xfs_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-17 11:43:02.000000000 -0400
@@ -1318,6 +1425,25 @@
  
  allow local_login_t local_login_lock_t:file create_file_perms;
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
+--- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-18 09:01:57.000000000 -0400
+@@ -165,6 +165,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 auditd_etc_t:dir rw_dir_perms;
+ 	allow $1 auditd_etc_t:file create_file_perms;
+ ')
+ 
+@@ -287,6 +288,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 auditd_etc_t:dir r_dir_perms;
+ 	allow $1 auditd_etc_t:file r_file_perms;
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-17 11:43:02.000000000 -0400
@@ -1343,7 +1469,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-17 12:17:16.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-18 11:04:16.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -1362,16 +1488,25 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -431,6 +435,8 @@
+@@ -423,6 +427,7 @@
+ 
+ allow restorecond_t self:capability { dac_override dac_read_search fowner };
+ allow restorecond_t self:fifo_file rw_file_perms;
++allow restorecond_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow restorecond_t restorecond_var_run_t:file create_file_perms;
+ files_pid_filetrans(restorecond_t,restorecond_var_run_t, file)
+@@ -430,6 +435,9 @@
+ auth_relabel_all_files_except_shadow(restorecond_t )
  auth_read_all_files_except_shadow(restorecond_t)
  fs_relabelfrom_noxattr_fs(restorecond_t)
- 
-+init_dontaudit_use_script_ptys(restorecond_t)
++fs_dontaudit_list_nfs(restorecond_t)
 +
++init_dontaudit_use_script_ptys(restorecond_t)
+ 
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
- kernel_read_system_state(restorecond_t)
-@@ -534,20 +540,27 @@
+@@ -534,20 +542,27 @@
  # semodule local policy
  #
  
@@ -1400,6 +1535,17 @@
  corecmd_exec_bin(semanage_t)
  corecmd_exec_sbin(semanage_t)
  
+@@ -595,6 +610,10 @@
+ 	userdom_read_generic_user_home_content_files(semanage_t)
+ ')
+ 
++ifdef(`enable_mls',`
++	userdom_read_user_tmp_files(secadm, semanage_t)
++')
++
+ optional_policy(`
+ 	nscd_socket_use(semanage_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
 --- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-17 11:43:02.000000000 -0400
@@ -1485,7 +1631,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-17 12:33:27.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-18 09:32:58.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -1789,7 +1935,33 @@
  
  	init_rw_initctl($1_t)
  
-@@ -4128,7 +4151,7 @@
+@@ -3408,6 +3431,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to append to the sysadm
++##	users home directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_append_sysadm_home_content_files',`
++	gen_require(`
++		type sysadm_home_t;
++	')
++
++	dontaudit $1 sysadm_home_t:file append;
++')
++
++########################################
++## <summary>
+ ##	Read files in the staff users home directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -4128,7 +4170,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -1798,7 +1970,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4812,34 @@
+@@ -4789,3 +4831,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -1835,7 +2007,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-17 12:32:59.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-18 09:34:02.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -1898,6 +2070,26 @@
  	')
  
  	allow privhome home_root_t:dir { getattr search };
+@@ -172,6 +164,8 @@
+ 
+ 	mls_process_read_up(sysadm_t)
+ 
++	term_getattr_all_user_ttys(sysadm_t)
++
+ 	init_exec(sysadm_t)
+ 
+ 	ifdef(`direct_sysadm_daemon',`
+@@ -210,7 +204,9 @@
+ 		init_exec(secadm_t)
+ 		logging_read_audit_log(secadm_t)
+ 	        logging_read_generic_logs(secadm_t)
+-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
++		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
++		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
++
+ 	', `
+ 		logging_manage_audit_log(sysadm_t)
+ 		logging_manage_audit_config(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-17 11:43:02.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- selinux-policy.spec	17 Jul 2006 16:32:50 -0000	1.225
+++ selinux-policy.spec	18 Jul 2006 15:51:21 -0000	1.226
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,12 @@
 %endif
 
 %changelog
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-3
+- Allow prelink to read bin_t symlink
+- allow xfs to read random devices
+- Change gfs to support xattr
+
+
 * Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
 - Remove spamassassin_can_network boolean
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 15:54:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 11:54:40 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.296,1.297
Message-ID: <200607181554.k6IFseID017054@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17031

Modified Files:
	eclipse.spec 
Log Message:
%changelog      
* Tue Jul 18 2006 Igor Foox <ifoox at redhat.com> 3.2.0-1jpp_3fc
- Rebuild.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- eclipse.spec	17 Jul 2006 22:44:29 -0000	1.296
+++ eclipse.spec	18 Jul 2006 15:54:38 -0000	1.297
@@ -41,7 +41,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/
@@ -1631,6 +1631,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Igor Foox <ifoox at redhat.com> 3.2.0-1jpp_3fc
+- Rebuild.
+
 * Mon Jul 17 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_2fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:02:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:02:18 -0400
Subject: rpms/kernel/devel .cvsignore, 1.489, 1.490 find-provides, 1.6,
	1.7 kernel-2.6.spec, 1.2407, 1.2408 sources, 1.434, 1.435
Message-ID: <200607181602.k6IG2I6J019383@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19342

Modified Files:
	.cvsignore find-provides kernel-2.6.spec sources 
Log Message:
update find-provides



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -r1.489 -r1.490
--- .cvsignore	18 Jul 2006 15:28:13 -0000	1.489
+++ .cvsignore	18 Jul 2006 16:02:02 -0000	1.490
@@ -6,3 +6,4 @@
 patch-2.6.18-rc2.bz2
 kabitool
 find-provides
+kernel-2.6.spec


Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- find-provides	18 Jul 2006 15:43:27 -0000	1.6
+++ find-provides	18 Jul 2006 16:02:13 -0000	1.7
@@ -1,8 +1,12 @@
 #! /bin/sh
 
-# The magic is now in kabitool but we still need to have a dep script for now
+IFS=$'\n'
+filelist=($(cat))
 
-if [ -e kabi.deps ];
-then
-   cat kabi.deps
-fi
+for file in "${filelist[@]}"; do
+    case "$file" in
+    */symlist-*)
+	cat "$file"
+	;;
+   esac
+done


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2407
retrieving revision 1.2408
diff -u -r1.2407 -r1.2408
--- kernel-2.6.spec	18 Jul 2006 15:29:52 -0000	1.2407
+++ kernel-2.6.spec	18 Jul 2006 16:02:13 -0000	1.2408
@@ -435,12 +435,12 @@
 
 # END OF PATCH DEFINITIONS
 
+BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
+
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
 %define __find_provides %_sourcedir/find-provides %name
 
-BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
-
 %ifarch x86_64
 Obsoletes: kernel-smp
 %endif
@@ -1107,6 +1107,7 @@
     # Create the kABI metadata for use in packaging
     echo "**** GENERATING kernel ABI metadata ****"
     %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d -k $KernelVer
+    cp kabi.deps $RPM_BUILD_ROOT/boot/symlist-$KernelVer
 
     # And save the headers/makefiles etc for building modules against
     #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- sources	18 Jul 2006 15:43:27 -0000	1.434
+++ sources	18 Jul 2006 16:02:14 -0000	1.435
@@ -2,4 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 10d802a1a72ca6bf091c7d6523922004  kabitool
-bcca9d88ea77473cce343293dc0e9b98  find-provides
+f5ac998a13d45ebf1dcfd76c4aec3dc4  kernel-2.6.spec
+0b615b3c7e445c6f59120032224b3e36  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:02:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:02:33 -0400
Subject: rpms/javacc/devel javacc.spec,1.15,1.16
Message-ID: <200607181602.k6IG2X8S019428@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19268

Modified Files:
	javacc.spec 
Log Message:
* Merged with upstream version
* Added conditional native compiling



Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- javacc.spec	12 Jul 2006 06:29:56 -0000	1.15
+++ javacc.spec	18 Jul 2006 16:02:29 -0000	1.16
@@ -1,24 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 
 Name:           javacc
-Version:        3.2
-Release: 	1jpp_7fc
+Version:        4.0
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
-Source0:	javacc-3.2-src.tar.gz
+Source0:	javacc-4.0src-RHCLEAN.tar.gz
 Source1:	javacc
 Source2:	jjdoc
 Source3:	jjtree
 URL:            https://javacc.dev.java.net/
 Group:          Development/Code Generators
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 Requires:	jpackage-utils >= 0:1.5
-BuildRequires:	ant, /bin/bash
-# libgcj aot-compiled native libraries
-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:	ant, /bin/bash, junit >= 0:3.8.1
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description 
 Java Compiler Compiler (JavaCC) is the most popular parser generator for use
@@ -43,7 +82,7 @@
 Examples for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 cp %{SOURCE1} javacc
 cp %{SOURCE2} jjdoc
 cp %{SOURCE3} jjtree
@@ -64,23 +103,39 @@
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
 cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 %doc LICENSE README
-%attr(0755,root,root) /usr/bin/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%defattr(0755,root,root,0755)
+/usr/bin/*
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/javacc-4.0.jar.*
+%endif
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -91,36 +146,18 @@
 %{_datadir}/%{name}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_7fc
-- rebuild
-
-* 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
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.2-1jpp_4fc
-- rebuilt
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> 0:3.2-1jpp_3fc
-- Build on ia64, ppc64, s390 and s390x.
-- Switch to aot-compile-rpm.
-
-* Tue Jul 05 2005 Andrew Overholt <overholt at redhat.com> 0:3.2-1jpp_2fc
-- Bump release for FC4 update.
+* Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
+- Merged with upstream version
+- Added conditional native compiling
 
-* Fri Jun 10 2005 Gary Benson <gbenson at redhat.com> 0:3.2-1jpp_1fc
-- Rearrange how BC-compiled stuff is built and installed.
+* Thu Apr 20 2006 Fernando Nasser <fnasser at redhat.com> - 0:4.0-2jpp
+- First JPP 1.7 build
 
-* Thu Jun  9 2005 Andrew Overholt <overholt at redhat.com>
-- Natively-compile.
+* Fri Mar 31 2006 Sebastiano Vigna <vigna at acm.org> - 0:4.0-1jpp
+- Updated to 4.0
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:3.2-1jpp_1rh
-- RH vacuuming
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.2-2jpp
+- Rebuild with ant-1.6.2
 
-* Fri Jan 30 2004 Sebastiano Vigna <vigna at acm.org> 0:3.2-1jpp
+* Fri Jan 30 2004 Sebastiano Vigna <vigna at acm.org> 0:3.2-1jpp
 - First JPackage version



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:03:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:03:30 -0400
Subject: rpms/javacc/devel sources,1.2,1.3
Message-ID: <200607181603.k6IG3Uip019653@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19560

Modified Files:
	sources 
Log Message:
* Updated to 4.0 version



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 06:29:25 -0000	1.2
+++ sources	18 Jul 2006 16:03:28 -0000	1.3
@@ -1 +1 @@
-72f227def9cf027cc238154f6ecf2873  javacc-3.2-src.tar.gz
+62910e742042d491c7b2f443c8399213  javacc-4.0src-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:05:00 -0400
Subject: rpms/yelp/devel sources,1.29,1.30 yelp.spec,1.65,1.66
Message-ID: <200607181605.k6IG50J2020016@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19979

Modified Files:
	sources yelp.spec 
Log Message:
rebuild 2.15.2



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Jun 2006 04:43:46 -0000	1.29
+++ sources	18 Jul 2006 16:04:55 -0000	1.30
@@ -1 +1 @@
-29f058de3aacaf700a8ef535333474a9  yelp-2.15.3.tar.bz2
+0a6928685d289b67773eeff6ae90869b  yelp-2.15.2.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- yelp.spec	12 Jul 2006 09:24:52 -0000	1.65
+++ yelp.spec	18 Jul 2006 16:04:55 -0000	1.66
@@ -1,3 +1,8 @@
+%{?!WITH_MONO:  %define WITH_MONO 1}
+%ifarch ppc64 s390 s390x
+%define WITH_MONO 0
+%endif
+
 %define pango_version 1.0.99
 %define gtk2_version 2.6.0
 %define mozilla_version 1.7.13
@@ -13,8 +18,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.15.3
-Release: 1.1
+Version: 2.15.2
+Release: 2
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -59,7 +64,7 @@
 BuildRequires: dbus-devel
 
 
-%ifnarch  s390 s390x ppc64
+%if %{WITH_MONO}
 BuildRequires:  libbeagle-devel
 %endif
 
@@ -126,6 +131,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
+- Go back to 2.15.2, since gecko 1.8 is still missing
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:12:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:12:18 -0400
Subject: rpms/javacc/devel .cvsignore,1.4,1.5
Message-ID: <200607181612.k6IGCI0V021987@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21880

Modified Files:
	.cvsignore 
Log Message:
* Updated javacc sources to version 4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jun 2005 08:26:16 -0000	1.4
+++ .cvsignore	18 Jul 2006 16:12:15 -0000	1.5
@@ -1,4 +1 @@
-javacc-3.2-src.tar.gz
-javacc-3.2
-i386
-*.src.rpm
+javacc-4.0src-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:13:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:13:51 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.297, 1.298 anaconda.spec, 1.421,
	1.422 sources, 1.419, 1.420
Message-ID: <200607181613.k6IGDpuN022403@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22293/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.59-1 on branch devel from anaconda-11.1.0.59-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- .cvsignore	17 Jul 2006 19:14:30 -0000	1.297
+++ .cvsignore	18 Jul 2006 16:13:41 -0000	1.298
@@ -1 +1 @@
-anaconda-11.1.0.58.tar.bz2
+anaconda-11.1.0.59.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- anaconda.spec	17 Jul 2006 19:14:30 -0000	1.421
+++ anaconda.spec	18 Jul 2006 16:13:41 -0000	1.422
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.58
+Version: 11.1.0.59
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,7 +15,7 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.9
+BuildPreReq: libdhcp-devel >= 1.9, mkinitrd-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
 Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
 Requires: pyparted, libxml2-python, python-urlgrabber
@@ -23,7 +23,7 @@
 Requires: device-mapper >= 1.01.05-3
 Requires: dosfstools e2fsprogs
 %ifnarch s390 s390x
-Requires: python-pyblock >= 0.7-1
+Requires: python-pyblock >= 0.16-1, libbdevid >= 5.1.0-1
 %endif
 %ifnarch s390 s390x ppc64
 Requires: rhpxl
@@ -100,6 +100,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.59-1
+- Add rudimentary firmware loading support to the loader (pjones)
+- Drop some whiteout (pnasrat, #196733)
+- Fix exec'ing of symlinks (clumens)
+- Add basic multipath support (pjones)
+- Basic support for multiple repo setup in graphical mode
+- Add missing files (clumens)
+
 * Mon Jul 17 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.58-1
 - Clean up noipv4/noipv6 stuff stuff (clumens)
 - Fix exception handling for test mode 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- sources	17 Jul 2006 19:14:30 -0000	1.419
+++ sources	18 Jul 2006 16:13:49 -0000	1.420
@@ -1 +1 @@
-11aa814a7a139034a018b9b6fc0fcd4b  anaconda-11.1.0.58.tar.bz2
+6785c21382d3f595e42a875947561c9d  anaconda-11.1.0.59.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:17:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:17:33 -0400
Subject: rpms/yelp/devel yelp.spec,1.66,1.67
Message-ID: <200607181617.k6IGHXVT027374@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24745

Modified Files:
	yelp.spec 
Log Message:
fix build reqs



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- yelp.spec	18 Jul 2006 16:04:55 -0000	1.66
+++ yelp.spec	18 Jul 2006 16:17:31 -0000	1.67
@@ -62,6 +62,7 @@
 BuildRequires: libXt-devel
 BuildRequires: perl-XML-Simple
 BuildRequires: dbus-devel
+BuildRequires: gettext
 
 
 %if %{WITH_MONO}
@@ -79,7 +80,6 @@
 %patch2 -p1 -b .add-mime-handling
 
 %build
-# beagle search will be fixed in 2.13.3
 %configure                        \
 	--enable-search	  	  \
 	--with-mozilla=mozilla    \



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:18:24 -0400
Subject: rpms/yelp/devel yelp.spec,1.67,1.68
Message-ID: <200607181618.k6IGIOue028867@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28831

Modified Files:
	yelp.spec 
Log Message:
more of the same



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- yelp.spec	18 Jul 2006 16:17:31 -0000	1.67
+++ yelp.spec	18 Jul 2006 16:18:21 -0000	1.68
@@ -62,7 +62,7 @@
 BuildRequires: libXt-devel
 BuildRequires: perl-XML-Simple
 BuildRequires: dbus-devel
-BuildRequires: gettext
+BuildRequires: gettext-devel
 
 
 %if %{WITH_MONO}



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:23:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:23:18 -0400
Subject: rpms/cairo/devel cairo.spec,1.53,1.54
Message-ID: <200607181623.k6IGNIS7007271@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7228

Modified Files:
	cairo.spec 
Log Message:
rebuild



Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cairo.spec	12 Jul 2006 04:40:29 -0000	1.53
+++ cairo.spec	18 Jul 2006 16:23:15 -0000	1.54
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.2.0
-Release:   1.1
+Release:   2
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 1.2.0-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:26:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:26:13 -0400
Subject: rpms/gnutls/devel gnutls-1.4.1-enable-psk.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 gnutls.spec, 1.22, 1.23 sources, 1.9,
	1.10 gnutls-1.4.0-enable-psk.patch, 1.1, NONE
Message-ID: <200607181626.k6IGQDm9008062@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8041

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-1.4.1-enable-psk.patch 
Removed Files:
	gnutls-1.4.0-enable-psk.patch 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.1-1
- upgrade to new upstream version, only minor changes


gnutls-1.4.1-enable-psk.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnutls-1.4.1-enable-psk.patch ---
--- gnutls-1.4.1/configure.enable-psk	2006-07-14 12:01:10.000000000 +0200
+++ gnutls-1.4.1/configure	2006-07-18 17:57:53.000000000 +0200
@@ -11460,10 +11460,10 @@
 echo $ECHO_N "checking whether to disable PSK authentication support... $ECHO_C" >&6; }
 # Check whether --enable-psk-authentication was given.
 if test "${enable_psk_authentication+set}" = set; then
-  enableval=$enable_psk_authentication; ac_enable_srp=no
+  enableval=$enable_psk_authentication; ac_enable_psk=no
 fi
 
-if test x$ac_enable_srp != xno; then
+if test x$ac_enable_psk != xno; then
  { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jun 2006 12:43:43 -0000	1.9
+++ .cvsignore	18 Jul 2006 16:26:10 -0000	1.10
@@ -1 +1 @@
-gnutls-1.4.0-nosrp.tar.bz2
+gnutls-1.4.1-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnutls.spec	12 Jul 2006 06:12:22 -0000	1.22
+++ gnutls.spec	18 Jul 2006 16:26:10 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
-Version: 1.4.0
-Release: 1.1
+Version: 1.4.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 BuildRequires: libgcrypt-devel >= 1.2.2, gettext
@@ -15,7 +15,7 @@
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
 Patch0: gnutls-1.4.0-nosrp.patch
-Patch1: gnutls-1.4.0-enable-psk.patch
+Patch1: gnutls-1.4.1-enable-psk.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libgcrypt >= 1.2.2
 
@@ -119,6 +119,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 1.4.1-1
+- upgrade to new upstream version, only minor changes
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.0-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jun 2006 12:43:43 -0000	1.9
+++ sources	18 Jul 2006 16:26:10 -0000	1.10
@@ -1 +1 @@
-89be8819c829f48a32bdf7a9f267e698  gnutls-1.4.0-nosrp.tar.bz2
+6167d36f7c9d73008f3ca733901416bb  gnutls-1.4.1-nosrp.tar.bz2


--- gnutls-1.4.0-enable-psk.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:29:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:29:19 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.41, 1.42 epiphany.spec, 1.101,
	1.102 sources, 1.41, 1.42
Message-ID: <200607181629.k6IGTJmD008808@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8776

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
rebuild



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	17 May 2006 19:26:20 -0000	1.41
+++ .cvsignore	18 Jul 2006 16:29:15 -0000	1.42
@@ -1 +1 @@
-epiphany-2.15.2.tar.bz2
+epiphany-2.15.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- epiphany.spec	12 Jul 2006 05:45:18 -0000	1.101
+++ epiphany.spec	18 Jul 2006 16:29:15 -0000	1.102
@@ -9,8 +9,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.15.2
-Release: 1.1
+Version: 2.15.1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -157,6 +157,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
+- Go back to 2.15.1, since gecko 1.8 is still missing
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.2-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	17 May 2006 19:26:20 -0000	1.41
+++ sources	18 Jul 2006 16:29:16 -0000	1.42
@@ -1 +1 @@
-eb9826f106b29168a8154dbf4aaaf718  epiphany-2.15.2.tar.bz2
+1bc4bb644617ebf1aee3cd3e1604a54d  epiphany-2.15.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:31:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:31:34 -0400
Subject: rpms/kernel/devel find-provides, 1.7, 1.8 kernel-2.6.spec, 1.2408,
	1.2409 sources, 1.435, 1.436
Message-ID: <200607181631.k6IGVYtB009268@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9201

Modified Files:
	find-provides kernel-2.6.spec sources 
Log Message:
no execute permission on uploaded script, temp hack to spec file



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- find-provides	18 Jul 2006 16:02:13 -0000	1.7
+++ find-provides	18 Jul 2006 16:31:30 -0000	1.8
@@ -5,7 +5,7 @@
 
 for file in "${filelist[@]}"; do
     case "$file" in
-    */symlist-*)
+    */kabideps-*)
 	cat "$file"
 	;;
    esac


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2408
retrieving revision 1.2409
diff -u -r1.2408 -r1.2409
--- kernel-2.6.spec	18 Jul 2006 16:02:13 -0000	1.2408
+++ kernel-2.6.spec	18 Jul 2006 16:31:30 -0000	1.2409
@@ -1106,8 +1106,9 @@
 
     # Create the kABI metadata for use in packaging
     echo "**** GENERATING kernel ABI metadata ****"
+    chmod 0755 %_sourcedir/kabitool
     %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d -k $KernelVer
-    cp kabi.deps $RPM_BUILD_ROOT/boot/symlist-$KernelVer
+    cp kabi.deps $RPM_BUILD_ROOT/lib/modules/$KernelVer/kabideps-$KernelVer
 
     # And save the headers/makefiles etc for building modules against
     #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- sources	18 Jul 2006 16:02:14 -0000	1.435
+++ sources	18 Jul 2006 16:31:31 -0000	1.436
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 10d802a1a72ca6bf091c7d6523922004  kabitool
-f5ac998a13d45ebf1dcfd76c4aec3dc4  kernel-2.6.spec
-0b615b3c7e445c6f59120032224b3e36  find-provides
+3c12ea711677080f86b7bb7b97bed2aa  kernel-2.6.spec
+5c7d4562017166be2d6a4f3623be8206  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 16:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 12:59:23 -0400
Subject: rpms/frysk/devel frysk-20060714-observer.patch, NONE,
	1.1 frysk-20060714-timer.patch, NONE, 1.1 frysk.spec, 1.71, 1.72
Message-ID: <200607181659.k6IGxNIe025257@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25187

Modified Files:
	frysk.spec 
Added Files:
	frysk-20060714-observer.patch frysk-20060714-timer.patch 
Log Message:
Two patches by Phil Muldoon

frysk-20060714-observer.patch:
 ObjectFactory.java             |    8 +++++++-
 observers/ObserverManager.java |    7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE frysk-20060714-observer.patch ---
2006-07-14  Phil Muldoon  <pmuldoon at redhat.com>

	* ObjectFactory.java (importNode): Added parse check.
	* observers/ObserverManager.java (loadObservers): Added errorLog and continue
	on bad observer load.

Index: frysk-gui/frysk/gui/monitor/ObjectFactory.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/monitor/ObjectFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- frysk-gui/frysk/gui/monitor/ObjectFactory.java	17 May 2006 17:54:12 -0000	1.9
+++ frysk-gui/frysk/gui/monitor/ObjectFactory.java	14 Jul 2006 22:21:30 -0000	1.10
@@ -42,6 +42,8 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -52,6 +54,8 @@
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
+import frysk.gui.Gui;
+
 /**
  * The factory instantiates an object using the information
  * stored in an XML node.
@@ -65,6 +69,7 @@
  * */
 public class ObjectFactory {
 	public static final ObjectFactory theFactory = new ObjectFactory();
+	private Logger errorLog = Logger.getLogger (Gui.ERROR_LOG_ID);
 	
 	/**
 	 * Dynamically instantiates the object save to the given node,
@@ -146,7 +151,8 @@
            doc = (org.w3c.dom.Document) builder.parse(new File(path));
  
         } catch (Exception e) {
-			e.printStackTrace();
+        	errorLog.log(Level.WARNING, "Could not parse node ",e); //$NON-NLS-1$
+        	return null;
         } 
         
         DOMBuilder doo = new DOMBuilder();
Index: frysk-gui/frysk/gui/monitor/observers/ObserverManager.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/monitor/observers/ObserverManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- frysk-gui/frysk/gui/monitor/observers/ObserverManager.java	15 Jun 2006 21:41:47 -0000	1.35
+++ frysk-gui/frysk/gui/monitor/observers/ObserverManager.java	14 Jul 2006 22:21:30 -0000	1.36
@@ -42,10 +42,12 @@
 import java.io.File;
 import java.util.Iterator;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.jdom.Element;
 
 import frysk.Config;
+import frysk.gui.Gui;
 import frysk.gui.monitor.ObjectFactory;
 import frysk.gui.monitor.ObservableLinkedList;
 import frysk.gui.monitor.UniqueHashMap;
@@ -79,7 +81,7 @@
 	private UniqueHashMap nameHash;
 	
 	private final String OBSERVERS_DIR = Config.FRYSK_DIR + "Observers" + "/";
-	
+	private Logger errorLog = Logger.getLogger (Gui.ERROR_LOG_ID);
 	/**
 	 * a list containing a prototype of every available
 	 * observer.
@@ -276,7 +278,8 @@
 				}
 				WindowManager.logger.log(Level.FINER, "{0} loadObservers loaded {1}\n", new Object[]{this, loadedObserver.getName()});
 			}catch (Exception e) {
-				e.printStackTrace();
+				errorLog.log(Level.WARNING, "Observer  could not be loaded ",e); //$NON-NLS-1$
+				continue;
 			}
 
 			this.addTaskObserverPrototype(loadedObserver);

frysk-20060714-timer.patch:
 Gui.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

--- NEW FILE frysk-20060714-timer.patch ---
2006-07-14  Phil Muldoon  <pmuldoon at redhat.com>

	* Gui.java (gui): Fix splash screen timer. Fix requestRefreshXXX timer.

Index: frysk-gui/frysk/gui/Gui.java
===================================================================
RCS file: /cvs/frysk/frysk-gui/frysk/gui/Gui.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- frysk-gui/frysk/gui/Gui.java	12 Jul 2006 19:48:24 -0000	1.43
+++ frysk-gui/frysk/gui/Gui.java	14 Jul 2006 22:22:44 -0000	1.44
@@ -460,30 +460,28 @@
 		
 
 		
-		TimerEvent timerEvent = new TimerEvent(0, 5000){
+		TimerEvent timerEvent = new TimerEvent(3000){
 			public void execute() {
 				CustomEvents.addEvent(new Runnable() {
 					public void run() {
 						WindowManager.theManager.splashScreen.hideAll();
 					}
 				});
-				Manager.eventLoop.remove(this);
 			}
 		};
 		Manager.eventLoop.add (timerEvent);
 		
-				
-		CustomEvents.addEvent(new Runnable() {
-			public void run() {
-				TimerEvent refreshTimer = new TimerEvent(0, 5000){
-					public void execute() {
+		TimerEvent refreshTimer = new TimerEvent(0, 3000) {
+			public void execute() {
+				CustomEvents.addEvent(new Runnable() {
+					public void run() {
 						Manager.host.requestRefreshXXX (true);
 					}
-				};
-				
-				Manager.eventLoop.add (refreshTimer);
+				});
 			}
-		});
+		};
+        Manager.eventLoop.add (refreshTimer);
+
 		
 		CustomEvents.addEvent(new Runnable() {
 			public void run() {


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- frysk.spec	14 Jul 2006 10:24:37 -0000	1.71
+++ frysk.spec	18 Jul 2006 16:59:19 -0000	1.72
@@ -30,7 +30,9 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
 
-# We can only build on i386 for now
+Patch0: frysk-20060714-observer.patch
+Patch1: frysk-20060714-timer.patch
+
 ExclusiveArch: %{ix86} x86_64
 
 %description
@@ -43,6 +45,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
+%patch1
 
 %build 
 
@@ -98,6 +102,11 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Wed Jul 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.14.rh1-2
+- Add two patches from Phil Muldoon:
+  frysk-20060714-observer.patch -- continue even though an observer cannot be load
+  frysk-20060714-timer.patch -- fix incorrect usage of a core timer
+
 * Wed Jul 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.14.rh1-1
 - New upstream version.
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:01:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:01:02 -0400
Subject: rpms/frysk/devel frysk.spec,1.72,1.73
Message-ID: <200607181701.k6IH120Q026862@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26736

Modified Files:
	frysk.spec 
Log Message:
Two patches by Phil Muldoon


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- frysk.spec	18 Jul 2006 16:59:19 -0000	1.72
+++ frysk.spec	18 Jul 2006 17:00:59 -0000	1.73
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.14.rh1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:10:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:10:31 -0400
Subject: rpms/kernel/devel sources,1.436,1.437
Message-ID: <200607181710.k6IHAVYn029705@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29636

Modified Files:
	sources 
Log Message:
update kabitool



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- sources	18 Jul 2006 16:31:31 -0000	1.436
+++ sources	18 Jul 2006 17:10:10 -0000	1.437
@@ -1,6 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-10d802a1a72ca6bf091c7d6523922004  kabitool
 3c12ea711677080f86b7bb7b97bed2aa  kernel-2.6.spec
 5c7d4562017166be2d6a4f3623be8206  find-provides
+93f1747dace7f2646a855b7b44b68f38  kabitool



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:13:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:13:13 -0400
Subject: rpms/frysk/devel .cvsignore, 1.21, 1.22 frysk.spec, 1.73,
	1.74 sources, 1.21, 1.22 frysk-20060714-observer.patch, 1.1,
	NONE frysk-20060714-timer.patch, 1.1, NONE
Message-ID: <200607181713.k6IHDDo5030162@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30138

Modified Files:
	.cvsignore frysk.spec sources 
Removed Files:
	frysk-20060714-observer.patch frysk-20060714-timer.patch 
Log Message:
- New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Jul 2006 10:24:57 -0000	1.21
+++ .cvsignore	18 Jul 2006 17:13:09 -0000	1.22
@@ -1 +1 @@
-frysk-0.0.1.2006.07.14.rh1.tar.bz2
+frysk-0.0.1.2006.07.18.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- frysk.spec	18 Jul 2006 17:00:59 -0000	1.73
+++ frysk.spec	18 Jul 2006 17:13:09 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.14.rh1
-Release:	2%{?dist}
+Version:	0.0.1.2006.07.18.rh1
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -30,9 +30,6 @@
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:  ghostscript
 
-Patch0: frysk-20060714-observer.patch
-Patch1: frysk-20060714-timer.patch
-
 ExclusiveArch: %{ix86} x86_64
 
 %description
@@ -45,8 +42,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0
-%patch1
 
 %build 
 
@@ -102,7 +97,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
-* Wed Jul 14 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.14.rh1-2
+* Tue Jul 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.18.rh1-1
+- New upstream version, incorporates the previous two patches.
+
+* Wed Jul 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.14.rh1-2
 - Add two patches from Phil Muldoon:
   frysk-20060714-observer.patch -- continue even though an observer cannot be load
   frysk-20060714-timer.patch -- fix incorrect usage of a core timer


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Jul 2006 10:24:57 -0000	1.21
+++ sources	18 Jul 2006 17:13:09 -0000	1.22
@@ -1 +1 @@
-08212ee6d14d70f3e6731fa0d930f5a9  frysk-0.0.1.2006.07.14.rh1.tar.bz2
+4706503a724921bd07ae0fe4ea170675  frysk-0.0.1.2006.07.18.rh1.tar.bz2


--- frysk-20060714-observer.patch DELETED ---


--- frysk-20060714-timer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:13:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:13:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2409, 1.2410 sources, 1.437,
	1.438
Message-ID: <200607181713.k6IHDLsi030210@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30137

Modified Files:
	kernel-2.6.spec sources 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2409
retrieving revision 1.2410
diff -u -r1.2409 -r1.2410
--- kernel-2.6.spec	18 Jul 2006 16:31:30 -0000	1.2409
+++ kernel-2.6.spec	18 Jul 2006 17:13:17 -0000	1.2410
@@ -1663,6 +1663,7 @@
 %changelog
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.
+- Fix kabitool for correct location of symvers.
 
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- sources	18 Jul 2006 17:10:10 -0000	1.437
+++ sources	18 Jul 2006 17:13:18 -0000	1.438
@@ -1,6 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-3c12ea711677080f86b7bb7b97bed2aa  kernel-2.6.spec
 5c7d4562017166be2d6a4f3623be8206  find-provides
 93f1747dace7f2646a855b7b44b68f38  kabitool
+e76bb05ac4d15ba2bdfe7e46ba67a53a  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:47:02 -0400
Subject: rpms/dbus/devel dbus-0.90-remove-glib.patch, NONE, 1.1 dbus.spec,
	1.86, 1.87
Message-ID: <200607181747.k6IHl26T032483@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31726

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.90-remove-glib.patch 
Log Message:
- Remove some remnants of the GLIB bindings from configure.in



dbus-0.90-remove-glib.patch:
 configure.in |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE dbus-0.90-remove-glib.patch ---
--- dbus-0.90/configure.in.remove-glib	2006-07-18 13:43:49.000000000 -0400
+++ dbus-0.90/configure.in	2006-07-18 13:44:14.000000000 -0400
@@ -588,9 +588,7 @@
 
 #### Sort out gettext
 
-# this makes us require GLib to run autoconf, but not at runtime
 ALL_LINGUAS=""
-AM_GLIB_GNU_GETTEXT
 
 # INTLLIBS is now set
 


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- dbus.spec	17 Jul 2006 20:41:14 -0000	1.86
+++ dbus.spec	18 Jul 2006 17:47:00 -0000	1.87
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 1 
+Release: 2 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -30,6 +30,7 @@
 
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
+Patch4: dbus-0.90-remove-glib.patch
 
 %description
 
@@ -62,6 +63,7 @@
 
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
+%patch4 -p1 -b .remove-glib
 
 autoreconf -f -i
 
@@ -162,6 +164,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-2
+- Remove some remnants of the GLIB bindings from configure.in
+
 * Mon Jul 17 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-1
 - Update to upstream 0.90
 - Split out bindings



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:53:20 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.102,1.103 sources,1.42,1.43
Message-ID: <200607181753.k6IHrK7R004427@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4365

Modified Files:
	epiphany.spec sources 
Log Message:
try again



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- epiphany.spec	18 Jul 2006 16:29:15 -0000	1.102
+++ epiphany.spec	18 Jul 2006 17:53:18 -0000	1.103
@@ -15,6 +15,7 @@
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
 Source0: %{name}-%{version}.tar.bz2
+Source1: po.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(post): scrollkeeper
@@ -76,6 +77,8 @@
 
 %patch0 -p1 -b .homepage
 
+tar xzf %{SOURCE1}
+
 %build
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	18 Jul 2006 16:29:16 -0000	1.42
+++ sources	18 Jul 2006 17:53:18 -0000	1.43
@@ -1 +1,2 @@
 1bc4bb644617ebf1aee3cd3e1604a54d  epiphany-2.15.1.tar.bz2
+1244f76760f1f6a5bc56ee1c39b5c91d  po.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 17:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 13:59:45 -0400
Subject: rpms/dbus/devel dbus-0.90-remove-glib.patch,1.1,1.2
Message-ID: <200607181759.k6IHxjFr006981@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6898

Modified Files:
	dbus-0.90-remove-glib.patch 
Log Message:
- fixup remove patch


dbus-0.90-remove-glib.patch:
 configure.in |   18 ------------------
 1 files changed, 18 deletions(-)

Index: dbus-0.90-remove-glib.patch
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus-0.90-remove-glib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbus-0.90-remove-glib.patch	18 Jul 2006 17:47:00 -0000	1.1
+++ dbus-0.90-remove-glib.patch	18 Jul 2006 17:59:43 -0000	1.2
@@ -1,12 +1,27 @@
 --- dbus-0.90/configure.in.remove-glib	2006-07-18 13:43:49.000000000 -0400
-+++ dbus-0.90/configure.in	2006-07-18 13:44:14.000000000 -0400
-@@ -588,9 +588,7 @@
- 
- #### Sort out gettext
++++ dbus-0.90/configure.in	2006-07-18 13:57:07.000000000 -0400
+@@ -586,24 +586,6 @@
+ # unix:path=/foo or unix:abstract=/foo 
+ AC_SUBST(DBUS_PATH_OR_ABSTRACT)
  
+-#### Sort out gettext
+-
 -# this makes us require GLib to run autoconf, but not at runtime
- ALL_LINGUAS=""
+-ALL_LINGUAS=""
 -AM_GLIB_GNU_GETTEXT
+-
+-# INTLLIBS is now set
+-
+-# (if someone wants to go through and make internationalization 
+-#  conditional with #ifdef ENABLE_NLS then go crazy and send us a patch, 
+-#  but right now we won't build without gettext)
+-if test "$gt_cv_have_gettext" != "yes" ; then
+-  AC_MSG_ERROR([
+-*** You must have either have gettext support in your C library, or use the 
+-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
+-])
+-fi
+-
+ #### Sort out XML library
  
- # INTLLIBS is now set
- 
+ # see what we have



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:07:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:07:58 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.14, 1.15 pyxf86config.spec,
	1.28, 1.29 sources, 1.14, 1.15
Message-ID: <200607181807.k6II7wxW007762@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7725

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Feb 2006 16:02:26 -0000	1.14
+++ .cvsignore	18 Jul 2006 18:07:41 -0000	1.15
@@ -1,3 +1,4 @@
 pyxf86config-0.3.22.tar.gz
 pyxf86config-0.3.23.tar.gz
 pyxf86config-0.3.24.tar.gz
+pyxf86config-0.3.25.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pyxf86config.spec	12 Jul 2006 07:57:18 -0000	1.28
+++ pyxf86config.spec	18 Jul 2006 18:07:41 -0000	1.29
@@ -2,8 +2,8 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.24
-Release: 3.1
+Version: 0.3.25
+Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 0.3.25-1
+- Remove unneeded X config sections from template generation.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.24-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Feb 2006 16:02:26 -0000	1.14
+++ sources	18 Jul 2006 18:07:41 -0000	1.15
@@ -1 +1 @@
-43488299e096b3fed4f080579f9e7fbb  pyxf86config-0.3.24.tar.gz
+2e29f82f357f77e8443e8ff8fabd4389  pyxf86config-0.3.25.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:09:06 -0400
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.26,1.27
Message-ID: <200607181809.k6II965V007827@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Compress-Zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7782

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
fix bug 199285


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-Compress-Zlib.spec	17 Jul 2006 20:21:30 -0000	1.26
+++ perl-Compress-Zlib.spec	18 Jul 2006 18:08:54 -0000	1.27
@@ -4,7 +4,7 @@
 
 Name: perl-Compress-Zlib
 Version: 1.42
-Release: 1.fc6
+Release: 1%{?dist}
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: GPL or Artistic
 Group: Development/Libraries



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:09:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:09:30 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-ipv6.patch, NONE,
	1.1 SysVinit.spec, 1.44, 1.45
Message-ID: <200607181809.k6II9TOP007941@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7840

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-ipv6.patch 
Log Message:
add patch for ipv6 support for last (<mzazrive at redhat.com>)


sysvinit-2.86-ipv6.patch:
 last.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE sysvinit-2.86-ipv6.patch ---
diff -Naur sysvinit-2.86/src/last.c sysvinit-2.86-ipv6/src/last.c
--- sysvinit-2.86/src/last.c	2004-07-30 14:16:26.000000000 +0200
+++ sysvinit-2.86-ipv6/src/last.c	2006-07-18 15:32:19.000000000 +0200
@@ -307,14 +307,15 @@
 	struct sockaddr		*sa;
 	int			salen, flags;
 	unsigned int		topnibble;
+	unsigned int		azero = 0, sitelocal = 0;
 	int			mapped = 0;
 
 	flags = useip ? NI_NUMERICHOST : 0;
 
 	/*
 	 *	IPv4 or IPv6 ? We use 2 heuristics:
-	 *	1. Current IPv6 range uses 2000-3fff. Outside of
-	 *	   that is illegal and must be IPv4.
+	 *	1. Current IPv6 range uses 2000-3fff or fec0-feff.
+	 *	   Outside of that is illegal and must be IPv4.
 	 *	2. If last 3 bytes are 0, must be IPv4
 	 *	3. If IPv6 in IPv4, handle as IPv4
 	 *
@@ -323,7 +324,11 @@
 	if (a[0] == 0 && a[1] == 0 && a[2] == htonl (0xffff))
 		mapped = 1;
 	topnibble = ntohl((unsigned int)a[0]) >> 28;
-	if (topnibble < 2 || topnibble > 3 || mapped ||
+
+	azero = ntohl((unsigned int)a[0]) >> 16;
+	sitelocal = (azero >= 0xfec0 || azero <= 0xfeff) ? 1 : 0;
+	
+	if (((topnibble < 2 || topnibble > 3) && (!sitelocal)) || mapped ||
 	    (a[1] == 0 && a[2] == 0 && a[3] == 0)) {
 		/* IPv4 */
 		sin.sin_family = AF_INET;


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- SysVinit.spec	12 Jul 2006 08:25:04 -0000	1.44
+++ SysVinit.spec	18 Jul 2006 18:09:16 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 4.1
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -19,6 +19,7 @@
 Patch12: sysvinit-2.86-haltman.patch
 Patch13: sysvinit-2.86-single.patch
 Patch14: sysvinit-2.86-maxproclen.patch
+Patch15: sysvinit-2.86-ipv6.patch
 Patch20: sysvinit-selinux.patch
 Source1: change_console.c
 Source2: change_console.8
@@ -68,6 +69,8 @@
 %patch13 -p1 -b .single
 # Fix under-copy of proc title (#188160)
 %patch14 -p1 -b .maxproclen
+# ipv6 support in last
+%patch15 -p1 -b .ipv6
 # SELinux support for init - loading policy, etc.
 %patch20 -p1 -b .selinux
 
@@ -127,6 +130,9 @@
 /dev/initctl
 
 %changelog
+* Tue Jul 18 2006 Bill Nottingham <notting at redhat.com> - 2.86-5
+- IPv6 support for last (<mzazrive at redhat.com>)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.86-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:12:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:12:59 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.103,1.104
Message-ID: <200607181812.k6IICxgo009076@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8980

Modified Files:
	epiphany.spec 
Log Message:
don't require nm on s390



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- epiphany.spec	18 Jul 2006 17:53:18 -0000	1.103
+++ epiphany.spec	18 Jul 2006 18:12:56 -0000	1.104
@@ -40,7 +40,9 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
+%ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
+#endif
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:13:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:13:56 -0400
Subject: rpms/dbus/devel dbus.spec,1.87,1.88
Message-ID: <200607181813.k6IIDuvx009436@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9358

Modified Files:
	dbus.spec 
Log Message:
- s/--libdir=\/lib/--libdir=%{_lib}/ in configure stage



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- dbus.spec	18 Jul 2006 17:47:00 -0000	1.87
+++ dbus.spec	18 Jul 2006 18:13:53 -0000	1.88
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 2 
+Release: 3 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -68,7 +68,7 @@
 autoreconf -f -i
 
 %build
-COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/lib --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
+COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
 
 ### this is some crack because bits of dbus can be 
 ### smp-compiled but others don't feel like working
@@ -164,6 +164,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-3
+- s/--libdir=\/lib/--libdir=%{_lib}/ in configure stage
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-2
 - Remove some remnants of the GLIB bindings from configure.in
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:21:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:21:32 -0400
Subject: rpms/dbus/devel dbus.spec,1.88,1.89
Message-ID: <200607181821.k6IILWFo004914@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4871

Modified Files:
	dbus.spec 
Log Message:
- add / before % {_lib}



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- dbus.spec	18 Jul 2006 18:13:53 -0000	1.88
+++ dbus.spec	18 Jul 2006 18:21:29 -0000	1.89
@@ -68,7 +68,7 @@
 autoreconf -f -i
 
 %build
-COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
+COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
 
 ### this is some crack because bits of dbus can be 
 ### smp-compiled but others don't feel like working
@@ -165,7 +165,8 @@
 
 %changelog
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-3
-- s/--libdir=\/lib/--libdir=%{_lib}/ in configure stage
+- s/--libdir=\/lib/--libdir=% {_lib}/ in configure stage
+- add / before % {_lib}
 
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-2
 - Remove some remnants of the GLIB bindings from configure.in



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:24:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:24:46 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.298, 1.299 anaconda.spec, 1.423,
	1.424 sources, 1.420, 1.421
Message-ID: <200607181824.k6IIOk50005124@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5109

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- .cvsignore	18 Jul 2006 16:13:41 -0000	1.298
+++ .cvsignore	18 Jul 2006 18:24:44 -0000	1.299
@@ -1 +1 @@
-anaconda-11.1.0.59.tar.bz2
+anaconda-11.1.0.60.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- anaconda.spec	18 Jul 2006 17:51:31 -0000	1.423
+++ anaconda.spec	18 Jul 2006 18:24:44 -0000	1.424
@@ -1,6 +1,6 @@
 Name: anaconda
-Version: 11.1.0.59
-Release: 2
+Version: 11.1.0.60
+Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -100,6 +100,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jul 18 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.60-1
+- Fix va_copy() argument ordering in logMessageV() in loader
+
 * Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.59-1
 - Add rudimentary firmware loading support to the loader (pjones)
 - Drop some whiteout (pnasrat, #196733)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- sources	18 Jul 2006 16:13:49 -0000	1.420
+++ sources	18 Jul 2006 18:24:44 -0000	1.421
@@ -1 +1 @@
-6785c21382d3f595e42a875947561c9d  anaconda-11.1.0.59.tar.bz2
+f7fa0215f26b1c56c10cc74814cf0b85  anaconda-11.1.0.60.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:26:40 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.104,1.105
Message-ID: <200607181826.k6IIQeZD005255@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5240

Modified Files:
	epiphany.spec 
Log Message:
grr



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- epiphany.spec	18 Jul 2006 18:12:56 -0000	1.104
+++ epiphany.spec	18 Jul 2006 18:26:38 -0000	1.105
@@ -42,7 +42,7 @@
 BuildRequires: startup-notification-devel
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
-#endif
+%endif
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:34:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:34:26 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-cardonly.patch, 1.1,
	1.2 pam_pkcs11.spec, 1.3, 1.4
Message-ID: <200607181834.k6IIYQFL005636@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5594

Modified Files:
	pam_pkcs11-0.5.3-cardonly.patch pam_pkcs11.spec 
Log Message:

- Fix memory error in card_only.
- Use the TEXT_INFO field for smart card prompting



pam_pkcs11-0.5.3-cardonly.patch:
 pam_config.c |    8 ++++
 pam_config.h |    1 
 pam_pkcs11.c |   99 ++++++++++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 84 insertions(+), 24 deletions(-)

Index: pam_pkcs11-0.5.3-cardonly.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-cardonly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11-0.5.3-cardonly.patch	5 Jul 2006 21:48:16 -0000	1.1
+++ pam_pkcs11-0.5.3-cardonly.patch	18 Jul 2006 18:34:24 -0000	1.2
@@ -62,8 +62,12 @@
 retrieving revision 1.3
 diff -u -r1.3 pam_pkcs11.c
 --- src/pam_pkcs11/pam_pkcs11.c	11 Jun 2006 04:37:06 -0000	1.3
-+++ src/pam_pkcs11/pam_pkcs11.c	11 Jun 2006 04:49:08 -0000
-@@ -113,11 +113,12 @@
++++ src/pam_pkcs11/pam_pkcs11.c	14 Jul 2006 18:27:43 -0000
+@@ -110,14 +110,17 @@
+   return PAM_CRED_INSUFFICIENT;
+ }
+ 
++static const char *bad_user = "bad_user";
  PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
  {
    int i, rv;
@@ -72,12 +76,13 @@
    char *password;
    char password_prompt[64];
    int slot_num = 0;
++  int set_user = 0;
    struct configuration_st *configuration;
 +  int pkcs11_pam_fail = PAM_AUTHINFO_UNAVAIL;
  
    pkcs11_handle_t *ph;
    cert_object_t *chosen_cert;
-@@ -164,13 +165,30 @@
+@@ -164,13 +167,35 @@
      return PAM_AUTHINFO_UNAVAIL;
    }
  
@@ -99,11 +104,16 @@
 +    	rv = pam_get_item(pamh, PAM_USER, (const void **) &user);
 +	if (user) {
 +		DBG1("explicit username = [%s]", user);
++	} else {
++	    set_user = 1;
 +	}
 +  } else {
++
++        pam_prompt(pamh, PAM_TEXT_INFO, NULL,
++                   "Insert your smart card or enter your username");
 +	/* get user name */
-+	rv = pam_get_user(pamh, &user, 
-+			"Insert your smart card\nor enter your username");
++	rv = pam_get_user(pamh, &user, NULL);
++
 +	if (rv != PAM_SUCCESS) {
 +	  syslog(LOG_ERR, "pam_get_user() failed %s", pam_strerror(pamh, rv));
 +	  return PAM_USER_UNKNOWN;
@@ -114,86 +124,119 @@
  
    /* load pkcs #11 module */
    DBG("loading pkcs #11 module...");
-@@ -194,10 +212,22 @@
+@@ -194,10 +219,26 @@
    /* open pkcs #11 session */
    slot_num = find_slot_by_number(ph, configuration->slot_num);
    if (slot_num < 0) {
-+    release_pkcs11_module(ph);
 +    DBG("no token available");
 +    syslog(LOG_ERR, "no token available");
 +    /* prompt for the card or smartCard */
 +    if (user || !configuration->card_only) {
-+      release_pkcs11_module(ph);
-+      return PAM_AUTHINFO_UNAVAIL;
+       release_pkcs11_module(ph);
+-      DBG("no token available");
+-      syslog(LOG_ERR, "no token available");
+       return PAM_AUTHINFO_UNAVAIL;
 +    }
 +    
-+    rv = pam_get_user(pamh, &user, "Insert Smart Card\nor enter username");
++    pam_prompt(pamh, PAM_TEXT_INFO, NULL,
++               "Please insert your Smart Card or enter username.");
++    rv = pam_get_user(pamh, &user, NULL);
 +    /* check one more time for the smart card... */
 +    slot_num = find_slot_by_number(ph, configuration->slot_num);
 +    if (slot_num < 0) {
-       release_pkcs11_module(ph);
--      DBG("no token available");
--      syslog(LOG_ERR, "no token available");
-       return PAM_AUTHINFO_UNAVAIL;
++      release_pkcs11_module(ph);
++      return PAM_AUTHINFO_UNAVAIL;
 +    }
++  } else {
++    pam_prompt(pamh, PAM_TEXT_INFO, NULL,
++               "Smart card inserted.");
    }
  
    rv = open_pkcs11_session(ph, slot_num);
-@@ -205,7 +235,7 @@
+@@ -205,21 +246,25 @@
      release_pkcs11_module(ph);
      DBG1("open_pkcs11_session() failed: %s", get_error());
      syslog(LOG_ERR, "open_pkcs11_session() failed: %s", get_error());
 -    return PAM_AUTHINFO_UNAVAIL;
++    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +    return pkcs11_pam_fail;
    }
  
    /* get password */
-@@ -219,7 +249,7 @@
+-  sprintf(password_prompt, "Password for token %.32s: ", get_slot_label(ph));
++  sprintf(password_prompt, "Welcome %.32s!", get_slot_label(ph));
++  pam_prompt(pamh, PAM_TEXT_INFO, NULL, password_prompt);
+   if (configuration->use_first_pass) {
+     rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
+   } else if (configuration->try_first_pass) {
+-    rv = pam_get_pwd(pamh, &password, password_prompt, PAM_AUTHTOK, PAM_AUTHTOK);
++    rv = pam_get_pwd(pamh, &password, "SmartCard Password:", PAM_AUTHTOK, PAM_AUTHTOK);
+   } else {
+-    rv = pam_get_pwd(pamh, &password, password_prompt, 0, PAM_AUTHTOK);
++    rv = pam_get_pwd(pamh, &password, "SmartCard Password:", 0, PAM_AUTHTOK);
    }
    if (rv != PAM_SUCCESS) {
++    release_pkcs11_module(ph);
      syslog(LOG_ERR, "pam_get_pwd() failed: %s", pam_strerror(pamh, rv));
 -    return PAM_AUTHINFO_UNAVAIL;
++    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +    return pkcs11_pam_fail;
    }
  #ifndef DEBUG_HIDE_PASSWORD
    DBG1("password = [%s]", password);
-@@ -241,7 +271,7 @@
+@@ -227,9 +272,11 @@
+ 
+   /* check password length */
+   if (!configuration->nullok && strlen(password) == 0) {
++    release_pkcs11_module(ph);
+     memset(password, 0, strlen(password));
+     free(password);
+     syslog(LOG_ERR, "password length is zero but the 'nullok' argument was not defined.");
++    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
+     return PAM_AUTH_ERR;
+   }
+ 
+@@ -241,7 +288,8 @@
      release_pkcs11_module(ph);
      DBG1("open_pkcs11_login() failed: %s", get_error());
      syslog(LOG_ERR, "open_pkcs11_login() failed: %s", get_error());
 -    return PAM_AUTHINFO_UNAVAIL;
++    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +    return pkcs11_pam_fail;
    }
  
    /* load corresponding certificates */
-@@ -251,7 +281,7 @@
+@@ -251,7 +299,8 @@
      release_pkcs11_module(ph);
      DBG1("get_certificates() failed: %s", get_error());
      syslog(LOG_ERR, "get_certificates failed: %s", get_error());
 -    return PAM_AUTHINFO_UNAVAIL;
++    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +    return pkcs11_pam_fail;
    }
  
    /* load mapper modules */
-@@ -272,7 +302,7 @@
+@@ -272,7 +321,8 @@
          unload_mappers();
          DBG1("verify_certificate() failed: %s", get_error());
          syslog(LOG_ERR, "verify_certificate() failed: %s", get_error());
 -        return PAM_AUTHINFO_UNAVAIL;
++        if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +        return pkcs11_pam_fail;
        } else if (rv != 1) {
          DBG1("verify_certificate() failed: %s", get_error());
          continue;
-@@ -292,7 +322,7 @@
+@@ -292,7 +342,8 @@
  	  unload_mappers();
            DBG1("find_user() failed: %s", get_error());
            syslog(LOG_ERR,"find_user() failed: %s",get_error());
 -          return PAM_AUTHINFO_UNAVAIL;
++          if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
 +          return pkcs11_pam_fail;
  	} else {
            DBG1("certificate is valid and matches user %s",user);
  	  /* try to set up PAM user entry with evaluated value */
-@@ -304,7 +334,7 @@
+@@ -304,7 +355,7 @@
  	    unload_mappers();
  	    DBG1("pam_set_item() failed %s", pam_strerror(pamh, rv));
  	    syslog(LOG_ERR, "pam_set_item() failed %s", pam_strerror(pamh, rv));
@@ -202,7 +245,7 @@
  	  }
            chosen_cert = certs[i];
            break;
-@@ -320,7 +350,7 @@
+@@ -320,7 +371,7 @@
  	unload_mappers();
          DBG1("match_user() failed: %s", get_error());
          syslog(LOG_ERR, "match_user() failed: %s", get_error());
@@ -211,7 +254,7 @@
        } else if (rv == 0) {
          DBG("certificate is valid bus does not match the user");
        } else {
-@@ -337,7 +367,7 @@
+@@ -337,7 +388,7 @@
      release_pkcs11_module(ph);
      DBG("no valid certificate which meets all requirements found");
      syslog(LOG_ERR, "no valid certificate which meets all requirements found");
@@ -220,7 +263,7 @@
    }
  
    /* read random value */
-@@ -348,7 +378,7 @@
+@@ -348,7 +399,7 @@
      release_pkcs11_module(ph);
      DBG1("get_random_value() failed: %s", get_error());
      syslog(LOG_ERR, "get_random_value() failed: %s", get_error());
@@ -229,7 +272,7 @@
    }
  
    /* sign random value */
-@@ -361,7 +391,7 @@
+@@ -361,7 +412,7 @@
      release_pkcs11_module(ph);
      DBG1("sign_value() failed: %s", get_error());
      syslog(LOG_ERR, "sign_value() failed: %s", get_error());
@@ -238,7 +281,7 @@
    }
  
    /* verify the signature */
-@@ -385,7 +415,7 @@
+@@ -385,7 +436,7 @@
      release_pkcs11_module(ph);
      DBG1("close_pkcs11_session() failed: %s", get_error());
      syslog(LOG_ERR, "close_pkcs11_module() failed: %s", get_error());


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_pkcs11.spec	18 Jul 2006 01:21:39 -0000	1.3
+++ pam_pkcs11.spec	18 Jul 2006 18:34:24 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        4
+Release:        5
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -146,6 +146,10 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Thu Jul 18 2006 Robert Relyea  <rrelyea at redhat.com>  0.5.3-5
+- Fix memory error in card_only.
+- Use the TEXT_INFO field for smart card prompting
+
 * Mon Jul 17 2006 Jesse Keating  <jkeating at redhat.com>  0.5.3-4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 18:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 14:43:28 -0400
Subject: rpms/dmraid/FC-5 dmraid-1.0.0.rc11-format-handler-dos.patch, NONE,
	1.1 dmraid-1.0.0.rc11-metadata-stride.patch, NONE,
	1.1 dmraid.spec, 1.40, 1.41
Message-ID: <200607181843.k6IIhSuH017030@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17005

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-format-handler-dos.patch 
	dmraid-1.0.0.rc11-metadata-stride.patch 
Log Message:
DOS partition discovery fix

dmraid-1.0.0.rc11-format-handler-dos.patch:
 dos.c |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

--- NEW FILE dmraid-1.0.0.rc11-format-handler-dos.patch ---
--- dmraid/1.0.0.rc11/lib/format/partition/dos.c.orig	2006-01-18 13:55:09.000000000 +0100
+++ dmraid/1.0.0.rc11/lib/format/partition/dos.c	2006-07-07 19:55:15.000000000 +0200
@@ -143,6 +143,17 @@
 	return rs;
 }
 
+/* Check sector vs. RAID device end */
+static int rd_check_end(struct lib_context *lc,
+			struct raid_dev *rd, uint64_t sector)
+{
+	if (sector > rd->di->sectors)
+		LOG_ERR(lc, 1, "%s: partition address past end of RAID device",
+		 	handler);
+
+	return 0;
+}
+
 /*
  * Allocate a DOS RAID device and a set.
  * Set the device up and add it to the set.
@@ -173,7 +184,9 @@
 	r->offset = get_part_start(raw_part, sector);
 	r->sectors = (uint64_t) raw_part->length;
 
-	if (!(rs = _alloc_raid_set(lc, r)))
+	if (rd_check_end(lc, rd, r->offset) ||
+	    rd_check_end(lc, rd, r->offset + r->sectors) ||
+	    !(rs = _alloc_raid_set(lc, r)))
 		goto free_di;
 
 	list_add_tail(&r->devs, &rs->devs);
@@ -238,13 +251,13 @@
 	 * An entry pointing to the present logical partition.
 	 * It is an offset from the present partition table location.
 	 */
-	p1 = &dos->partitions[0];
+	p1 = dos->partitions;
 	
 	/*
 	 * An entry pointing to the next logical partition table.
 	 * It is an offset from the main extended partition start.
 	 */
-	p2 = &dos->partitions[1];
+	p2 = dos->partitions + 1;
 
 	/* If it is a partition, add it to the set */
 	if (is_partition(p1, start_sector) &&
@@ -301,8 +314,12 @@
 		part_end   = part_start + raw_table_entry->length;
 		
 		/* Avoid infinite recursion (mostly). */
-		if (part_start == start_sector ||
-		    part_end > rd->sectors)
+		if (part_start == start_sector)
+			continue;
+
+		/* Check bogus partition starts + ends */
+		if (rd_check_end(lc, rd, part_start) ||
+		    rd_check_end(lc, rd, part_end))
 			continue;
 
 		/*
@@ -365,7 +382,7 @@
 	.check	= dos_check,
 	.events	= NULL, /* Not supported */
 #ifdef DMRAID_NATIVE_LOG
-	.log	= NULL, /* Not supported */
+	.log	= NULL, /* Not supported; use fdisk and friends */
 #endif
 };
 

dmraid-1.0.0.rc11-metadata-stride.patch:
 metadata.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dmraid-1.0.0.rc11-metadata-stride.patch ---
--- dmraid/1.0.0.rc11/lib/metadata/metadata.c.orig	2006-03-28 16:03:13.000000000 +0200
+++ dmraid/1.0.0.rc11/lib/metadata/metadata.c	2006-07-07 19:55:42.000000000 +0200
@@ -120,7 +120,7 @@
 static uint64_t add_sectors(struct raid_set *rs, uint64_t sectors,
 			    uint64_t add)
 {
-	add = round_down(add, rs->stride);
+	add = rs->stride ? round_down(add, rs->stride) : add;
 
 	if (T_RAID1(rs)) {
 		if (!sectors || sectors > add)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/FC-5/dmraid.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- dmraid.spec	16 May 2006 16:48:04 -0000	1.40
+++ dmraid.spec	18 Jul 2006 18:43:25 -0000	1.41
@@ -7,13 +7,15 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC5_7.3
+Release: FC5_7.4
 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.rc11-metadata-stride.patch
+Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -34,6 +36,8 @@
 
 %prep
 %setup -q -n dmraid/%{version}
+%patch0 -p2
+%patch1 -p2
 
 %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
@@ -89,6 +93,9 @@
 %endif
 
 %changelog
+* Fri Jul 18 2006 Heinz Mauelshagen <heinzm at redhat.com> - 1.0.0.rc11-FC6.1
+- rebuilt for FC5 with dos partition discovery fix (#197573)
+
 * Tue May 16 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc11-FC5_7.3
 - rebuilt for FC5
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:02:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:02:37 -0400
Subject: rpms/cman/devel cman.spec,1.51,1.52
Message-ID: <200607181902.k6IJ2bNj006047@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6002

Modified Files:
	cman.spec 
Log Message:
Rebuild for new openais libraries.


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cman.spec	12 Jul 2006 22:27:31 -0000	1.51
+++ cman.spec	18 Jul 2006 19:02:20 -0000	1.52
@@ -14,7 +14,7 @@
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.0
+Release: 0.fc6.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:03:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:03:01 -0400
Subject: rpms/javacc/devel javacc.spec,1.16,1.17
Message-ID: <200607181903.k6IJ2ui1006086@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6023

Modified Files:
	javacc.spec 
Log Message:
Changed directory locations to use rpm macros.



Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- javacc.spec	18 Jul 2006 16:02:29 -0000	1.16
+++ javacc.spec	18 Jul 2006 19:02:37 -0000	1.17
@@ -98,10 +98,10 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
-cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
+install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
+install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/%{_bindir}
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
+cp -pr examples $RPM_BUILD_ROOT/%{_datadir}/%{name}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -148,6 +148,7 @@
 %changelog
 * Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
 - Merged with upstream version
+- Changed directory locations to rpm macros
 - Added conditional native compiling
 
 * Thu Apr 20 2006 Fernando Nasser <fnasser at redhat.com> - 0:4.0-2jpp



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:23:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:23:34 -0400
Subject: rpms/javacc/devel javacc.spec,1.17,1.18
Message-ID: <200607181923.k6IJNY1M026941@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26815

Modified Files:
	javacc.spec 
Log Message:
Added ant-junit as a build requires.



Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- javacc.spec	18 Jul 2006 19:02:37 -0000	1.17
+++ javacc.spec	18 Jul 2006 19:23:32 -0000	1.18
@@ -51,7 +51,7 @@
 BuildArch:      noarch
 %endif
 Requires:	jpackage-utils >= 0:1.5
-BuildRequires:	ant, /bin/bash, junit >= 0:3.8.1
+BuildRequires:	ant, /bin/bash, ant-junit, junit >= 0:3.8.1
 
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:30:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:30:07 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf-MimeType.patch, NONE,
	1.1 classpathx-jaf.spec, 1.14, 1.15
Message-ID: <200607181930.k6IJU7Ag029487@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29161

Modified Files:
	classpathx-jaf.spec 
Added Files:
	classpathx-jaf-MimeType.patch 
Log Message:
Add conditional native compilation on gcj and merge patches etc. from
the JPP version.



classpathx-jaf-MimeType.patch:
 MimeTypeParameterList.java |    9 !!!!!!!!!
 1 files changed, 9 modifications(!)

--- NEW FILE classpathx-jaf-MimeType.patch ---
*** source/javax/activation/MimeTypeParameterList.java.orig	2006-05-01 12:03:04.000000000 -0400
--- source/javax/activation/MimeTypeParameterList.java	2006-05-01 12:04:49.000000000 -0400
***************
*** 197,203 ****
      }
  
      /**
!      * Returns an RFC 2045-complient string representation of this parameter
       * list.
       */
      public synchronized String toString()
--- 197,203 ----
      }
  
      /**
!    * Returns an RFC 2045-compliant string representation of this parameter
       * list.
       */
      public synchronized String toString()
***************
*** 208,218 ****
              String name = (String)i.next();
              String value = (String)parameterValues.get(name.toLowerCase());
  
!             if (buffer.length() > 0)
!             {
!                 buffer.append(';');
!                 buffer.append(' ');
!             }
              buffer.append(name);
              buffer.append('=');
              buffer.append(quote(value));
--- 208,215 ----
              String name = (String)i.next();
              String value = (String)parameterValues.get(name.toLowerCase());
  
!         buffer.append(';');
!         buffer.append(' ');
              buffer.append(name);
              buffer.append('=');
              buffer.append(quote(value));


Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- classpathx-jaf.spec	12 Jul 2006 04:49:35 -0000	1.14
+++ classpathx-jaf.spec	18 Jul 2006 19:30:04 -0000	1.15
@@ -1,28 +1,71 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 %define jafver  1.0.2
 
 Name:           classpathx-jaf
 Version:        1.0
-Release: 	2jpp_6fc
+Release:        7jpp_1fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
+
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.gnu.org/software/classpathx/
 Source0:        http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz
 Source1:        http://ftp.gnu.org/gnu/classpathx/activation-1.0.tar.gz.sig
+Patch0:		classpathx-jaf-MimeType.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.5.38-1jpp_4rh
+%endif
+Requires(preun):  /usr/sbin/update-alternatives
+Requires(post):  /usr/sbin/update-alternatives
+BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  %{__make}
 Provides:       jaf = 0:%{jafver}
 Obsoletes:      gnujaf <= 0:1.0-0.rc1.1jpp
-# RHEL3 and FC2
-Obsoletes:	jaf >= 0:20000000
+
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 JAF provides a means to type data and locate components suitable for
@@ -35,7 +78,6 @@
 Provides:       jaf-javadoc = 0:%{jafver}
 Obsoletes:      gnujaf-javadoc <= 0:1.0-0.rc1.1jpp
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -44,6 +86,7 @@
 %prep
 %setup -q -n activation-%{version}
 
+%patch -p0
 
 %build
 export JAVAC=%{javac}
@@ -56,20 +99,49 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 cd $RPM_BUILD_ROOT%{_javadir}
-mv activation.jar jaf-%{jafver}.jar
-ln -s jaf-%{jafver}.jar activation.jar
-ln -s jaf-%{jafver}.jar jaf.jar
+mv activation.jar %{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{name}.jar
+ln -s %{name}-%{version}.jar jaf-%{jafver}.jar
+ln -s %{name}-%{version}.jar activation.jar
+#touch jaf.jar
 cd -
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/jaf-%{jafver}
 cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/jaf-%{jafver}
 ln -s jaf-%{jafver} $RPM_BUILD_ROOT%{_javadocdir}/jaf
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- classpathx-jaf <= 0:1.0-2jpp
+# Remove file from old non-free packages
+rm -f %{_javadir}/jaf.jar
+# Recreate the link as update-alternatives could not do it
+ln -s %{_sysconfdir}/alternatives/jaf %{_javadir}/jaf.jar
+
+%post
+/usr/sbin/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/%{name}.jar 10002
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%preun
+if [ "$1" = "0" ]; then
+    /usr/sbin/update-alternatives --remove jaf %{_javadir}/%{name}.jar
+fi
+
 
 %post javadoc
 rm -f %{_javadocdir}/jaf
@@ -80,7 +152,13 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
 %{_javadir}/activation.jar
-%{_javadir}/jaf*.jar
+%{_javadir}/jaf-%{jafver}.jar
+#%ghost %{_javadir}/jaf*.jar
+%{_javadir}/%{name}*.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/classpathx-jaf-1.0.jar.*
+%endif
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -89,26 +167,20 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-2jpp_5fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0-2jpp_4fc
-- rebuilt
+* Tue Jul 18 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-7jpp
+- Add conditional native compilation with GCJ.
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0-6jpp
+- Add patch for MimeType error (already commited in cvs tip)
 
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.0-2jpp_3fc
-- Sync with RHAPS.
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
+- Fix broken activation symlink
 
-* Mon Nov  1 2004 Gary Benson <gbenson at redhat.com> 0:1.0-2jpp_2fc
-- Build into Fedora.
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
+- Create alternatives symlink
 
-* Thu Oct 28 2004 Fernando Nasser <fnasser at redhat.com> 0:1.0-2jpp_1rh
-- First Red Hat build
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
+- First JPP-1.7 release
 
 * Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp
 - Pro forma rebuild with ant-1.6.2 present



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:32:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:32:25 -0400
Subject: rpms/wsdl4j/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wsdl4j.spec,
	1.10, 1.11
Message-ID: <200607181932.k6IJWPB6029880@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/wsdl4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29806

Modified Files:
	.cvsignore sources wsdl4j.spec 
Log Message:

- Merge changes from fc.
- Add conditional native compilation.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jun 2005 08:43:34 -0000	1.4
+++ .cvsignore	18 Jul 2006 19:32:20 -0000	1.5
@@ -1,4 +1 @@
-wsdl4j-1.5.1-src-RHCLEAN.tar.bz2
-wsdl4j-1.5.1
-noarch
-*.src.rpm
+wsdl4j-1.5.2-src-RHCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jun 2005 08:43:34 -0000	1.4
+++ sources	18 Jul 2006 19:32:22 -0000	1.5
@@ -1 +1 @@
-3c2ac088044a247eef519163be7a61c3  wsdl4j-1.5.1-src-RHCLEAN.tar.bz2
+edaff274e2dce138a1c898f9ee4c18d1  wsdl4j-1.5.2-src-RHCLEAN.tar.gz


Index: wsdl4j.spec
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wsdl4j.spec	6 Mar 2006 22:57:37 -0000	1.10
+++ wsdl4j.spec	18 Jul 2006 19:32:22 -0000	1.11
@@ -1,6 +1,40 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define name            wsdl4j
-%define version         1.5.1
-%define release 	1jpp_4fc
+%define version         1.5.2
+%define release         2jpp_1fc
 %define section         free
 
 # -----------------------------------------------------------------------------
@@ -8,21 +42,28 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           %{name}
 Version:        %{version}
-Release: 	%{release}
+Release:        %{release}
 Epoch:		0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
 URL:            http://sourceforge.net/projects/wsdl4j
+%if ! %{gcj_support}
 BuildArch:      noarch
-Source0:        wsdl4j-%{version}-src-RHCLEAN.tar.bz2
+%endif
+Source0:        wsdl4j-%{version}-src-RHCLEAN.tar.gz
 ##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
-##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_1 wsdl4j
+##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_2 wsdl4j
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       jaxp_parser_impl, java
-BuildRequires:  ant, java-devel
+BuildRequires:  ant, ant-junit, java-devel
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	junit
-BuildRequires:	ant-junit
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The Web Services Description Language for Java Toolkit (WSDL4J) allows the
@@ -33,7 +74,6 @@
 %package javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -54,16 +94,21 @@
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
 
 for jar in %{name}.jar qname.jar ; do
-   vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
-   install -m 644 build/lib/$jar $RPM_BUILD_ROOT%{_javadir}/$vjar
-   pushd $RPM_BUILD_ROOT%{_javadir}
-      ln -fs $vjar $jar
-   popd
+	vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
+	install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/$vjar
+	pushd $RPM_BUILD_ROOT%{_javadir}
+	   ln -fs $vjar %{name}.jar
+	popd
 done
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,39 +122,45 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc license.html
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %changelog
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.5.1-1jpp_4fc
-- stop scriptlet spew
-
-* Wed Dec 12 2005 Jesse Keating <jkeating at redhat.com> - 0:1.5.1-1jpp_3fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.5.1-1jpp_2fc
-- rebuilt
-
-* Tue Nov  8 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.5.1-1jpp_1fc
-- Converted from ISO-8859-1 to UTF-8
-
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:1.5.1-1jpp_1fc
-- Build into Fedora.
-
-* Fri Jun 10 2005 Gary Benson <gbenson at redhat.com>
-- Remove zipfiles from the tarball.
-
-* Mon Jun  6 2005 Gary Benson <gbenson at redhat.com>
-- Add build dependency on ant-junit.
-
-* Thu Jun 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.5.1-1jpp_1rh
-- Merge with upstream for update to 1.5.1
+* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.2-2jpp_1fc
+- Merge changes from fc.
+- Add conditional native compilation.
+
+* Mon Jan 30 2006 Ralph Apel <r.apel at r-apel.de> 0:1.5.2-1jpp
+- update to 1.5.2
+- move qname*.jar to %{_javadir}/wsdl4j/qname*.jar
+  to make place for qname provided by geronimo-specs
 
 * Thu Jun 02 2005 Fernando Nasser <fnasser at redhat.com> 0:1.5.1-1jpp
 - update to 1.5.1
@@ -117,15 +168,9 @@
 * Fri Mar 11 2005 Ralph Apel <r.apel at r-apel.de> 0:1.5-1jpp
 - update to 1.5
 
-* Wed Nov 03 2004 Fernando Nasser <fnasser at redhat.com> 0:4.1.29-2jpp_2rh
-- Rebuild
-
 * Mon Aug 30 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
 - Build with ant-1.6.2
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:4.1.29-2jpp_1rh
-- RH vacuuming
-
 * Thu Jun 26 2003 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:1.4-2jpp
 - Do not drop qname.jar
 
@@ -133,5 +178,5 @@
 - 1.4
 - update for JPackage 1.5
 
-* Sat Sep  7 2002 Ville Skytt?? <ville.skytta at iki.fi> 1.1-1jpp
+* Sat Sep  7 2002 Ville Skytt? <ville.skytta at iki.fi> 1.1-1jpp
 - First JPackage release.



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:36:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:36:43 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.105,1.106
Message-ID: <200607181936.k6IJah48030723@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30645

Modified Files:
	epiphany.spec 
Log Message:
try again



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- epiphany.spec	18 Jul 2006 18:26:38 -0000	1.105
+++ epiphany.spec	18 Jul 2006 19:36:41 -0000	1.106
@@ -40,6 +40,7 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
+BuildRequires: gettext-devel
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:45:34 -0400
Subject: rpms/gcc/devel gcc41-CVE-2006-3619.patch, NONE,
	1.1 gcc41-checking-identifier.patch, NONE,
	1.1 gcc41-duplicate-eh.patch, NONE, 1.1 gcc41-pr27889.patch,
	NONE, 1.1 gcc41-rh198849.patch, NONE,
	1.1 gcc41-testsuite-scantree.patch, NONE, 1.1 .cvsignore,
	1.159, 1.160 gcc41.spec, 1.80, 1.81 sources, 1.161, 1.162
Message-ID: <200607181945.k6IJjYn7003272@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3235

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-CVE-2006-3619.patch gcc41-checking-identifier.patch 
	gcc41-duplicate-eh.patch gcc41-pr27889.patch 
	gcc41-rh198849.patch gcc41-testsuite-scantree.patch 
Log Message:
4.1.1-9

gcc41-CVE-2006-3619.patch:
 jartool.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-CVE-2006-3619.patch ---
2006-07-17  Richard Guenther  <rguenther at suse.de>

	* jartool.c (extract_jar): Do not allow directory traversal
	to parents of the extraction root.

--- fastjar/jartool.c.jj	2006-07-11 10:53:39.000000000 +0200
+++ fastjar/jartool.c	2006-07-18 13:49:39.000000000 +0200
@@ -1736,6 +1736,7 @@ int extract_jar(int fd, char **files, in
       const ub1 *start = filename;
       char *tmp_buff;
       struct stat sbuf;
+      int depth = 0;
 
       tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
 
@@ -1756,7 +1757,14 @@ int extract_jar(int fd, char **files, in
 #ifdef DEBUG    
         printf("checking the existance of %s\n", tmp_buff);
 #endif
-
+	if(strcmp(tmp_buff, "..") == 0){
+	  --depth;
+	  if (depth < 0){
+	    fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+	    exit(1);
+	  }
+	} else if (strcmp(tmp_buff, ".") != 0)
+	  ++depth;
         if(stat(tmp_buff, &sbuf) < 0){
           if(errno != ENOENT){
             perror("stat");

gcc41-checking-identifier.patch:
 tree-cfg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-checking-identifier.patch ---
2006-01-11  Diego Novillo  <dnovillo at redhat.com>

	* tree-cfg.c (tree_node_can_be_shared): Handle IDENTIFIER_NODE.

--- gcc/tree-cfg.c.jj	2006-07-16 10:16:40.000000000 +0200
+++ gcc/tree-cfg.c	2006-07-18 12:26:00.000000000 +0200
@@ -3465,7 +3465,8 @@ tree_node_can_be_shared (tree t)
       || CONSTANT_CLASS_P (t)
       || is_gimple_min_invariant (t)
       || TREE_CODE (t) == SSA_NAME
-      || t == error_mark_node)
+      || t == error_mark_node
+      || TREE_CODE (t) == IDENTIFIER_NODE)
     return true;
 
   if (TREE_CODE (t) == CASE_LABEL_EXPR)

gcc41-duplicate-eh.patch:
 except.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gcc41-duplicate-eh.patch ---
2006-07-18  Jakub Jelinek  <jakub at redhat.com>

	* except.c (duplicate_eh_regions_1): Clear next_peer.

--- gcc/except.c.jj	2006-06-13 11:15:32.000000000 +0200
+++ gcc/except.c	2006-07-18 18:38:42.000000000 +0200
@@ -893,6 +893,7 @@ duplicate_eh_regions_1 (eh_region old, e
 
   *n = *old;
   n->outer = outer;
+  n->next_peer = NULL;
   gcc_assert (!old->aka);
 
   n->region_number += eh_offset;

gcc41-pr27889.patch:
 0 files changed

--- NEW FILE gcc41-pr27889.patch ---
2006-07-17  Richard Henderson  <rth at redhat.com>

	PR 27889
	* tree-nested.c (create_tmp_var_for): Set DECL_COMPLEX_GIMPLE_REG_P
	if needed.

--- gcc/testsuite/gcc.c-torture/compile/pr27889.c	(revision 0)
+++ gcc/testsuite/gcc.c-torture/compile/pr27889.c	(revision 115541)
@@ -0,0 +1,11 @@
+void h(void (*)(void));
+_Complex int g (void)
+{
+  _Complex int x;
+  void f(void)
+  {
+     x = x + x;
+  }
+  h(f);
+  return x;
+}
--- gcc/tree-nested.c	(revision 115540)
+++ gcc/tree-nested.c	(revision 115541)
@@ -147,6 +147,9 @@ create_tmp_var_for (struct nesting_info 
   DECL_CONTEXT (tmp_var) = info->context;
   TREE_CHAIN (tmp_var) = info->new_local_var_chain;
   DECL_SEEN_IN_BIND_EXPR_P (tmp_var) = 1;
+  if (TREE_CODE (type) == COMPLEX_TYPE)
+    DECL_COMPLEX_GIMPLE_REG_P (tmp_var) = 1;
+
   info->new_local_var_chain = tmp_var;
 
   return tmp_var;

gcc41-rh198849.patch:
 0 files changed

--- NEW FILE gcc41-rh198849.patch ---
2006-06-04  Mark Shinwell  <shinwell at codesourcery.com>

	* tree.h: Declare folding_initializer.
	* builtins.c (fold_builtin_constant_p): Give definite answer
	if folding inside an initializer.
	* fold-const.c: Define folding_initializer.
	(START_FOLD_INIT): Save and then set folding_initializer.
	(END_FOLD_INIT): Restore folding_initializer.

	* gcc.c-torture/compile/builtin_constant_p.c: New test.

--- gcc/tree.h	(revision 114357)
+++ gcc/tree.h	(revision 114359)
@@ -4142,6 +4142,10 @@ extern void using_eh_for_cleanups (void)
 
 /* In fold-const.c */
 
+/* Non-zero if we are folding constants inside an initializer; zero
+   otherwise.  */
+extern int folding_initializer;
+
 /* Fold constants as much as possible in an expression.
    Returns the simplified expression.
    Acts only on the top level of the expression;
--- gcc/builtins.c	(revision 114357)
+++ gcc/builtins.c	(revision 114359)
@@ -6495,7 +6495,8 @@ fold_builtin_constant_p (tree arglist)
   if (TREE_SIDE_EFFECTS (arglist)
       || AGGREGATE_TYPE_P (TREE_TYPE (arglist))
       || POINTER_TYPE_P (TREE_TYPE (arglist))
-      || cfun == 0)
+      || cfun == 0
+      || folding_initializer)
     return integer_zero_node;
 
   return 0;
--- gcc/fold-const.c	(revision 114357)
+++ gcc/fold-const.c	(revision 114359)
@@ -59,6 +59,10 @@ Software Foundation, 51 Franklin Street,
 #include "langhooks.h"
 #include "md5.h"
 
+/* Non-zero if we are folding constants inside an initializer; zero
+   otherwise.  */
+int folding_initializer = 0;
+
 /* The following constants represent a bit based encoding of GCC's
    comparison operators.  This encoding simplifies transformations
    on relational comparison operators, such as AND and OR.  */
@@ -11708,16 +11712,19 @@ fold_build3_stat (enum tree_code code, t
   int saved_trapping_math = flag_trapping_math;\
   int saved_rounding_math = flag_rounding_math;\
   int saved_trapv = flag_trapv;\
+  int saved_folding_initializer = folding_initializer;\
   flag_signaling_nans = 0;\
   flag_trapping_math = 0;\
   flag_rounding_math = 0;\
-  flag_trapv = 0
+  flag_trapv = 0;\
+  folding_initializer = 1;
 
 #define END_FOLD_INIT \
   flag_signaling_nans = saved_signaling_nans;\
   flag_trapping_math = saved_trapping_math;\
   flag_rounding_math = saved_rounding_math;\
-  flag_trapv = saved_trapv
+  flag_trapv = saved_trapv;\
+  folding_initializer = saved_folding_initializer;
 
 tree
 fold_build1_initializer (enum tree_code code, tree type, tree op)
--- gcc/testsuite/gcc.c-torture/compile/builtin_constant_p.c	(revision 0)
+++ gcc/testsuite/gcc.c-torture/compile/builtin_constant_p.c	(revision 114359)
@@ -0,0 +1,8 @@
+/* { dg-options "-O2" } */
+
+int main (int argc, char *argv[])
+{
+  static int a[] = { __builtin_constant_p (argc) ? 1 : 0 };
+  return a[0];
+}
+

gcc41-testsuite-scantree.patch:
 scantree.exp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gcc41-testsuite-scantree.patch ---
2006-07-16  Jakub Jelinek  <jakub at redhat.com>

	* lib/scantree.exp (scan-tree-dump, scan-tree-dump-times,
	scan-tree-dump-not, scan-tree-dump-dem, scan-tree-dump-dem-not):
	Handle tree dump files with numbers 100 .. 199.

--- gcc/testsuite/lib/scantree.exp.jj	2005-10-28 22:58:47.000000000 +0200
+++ gcc/testsuite/lib/scantree.exp	2006-07-16 22:03:32.000000000 +0200
@@ -36,9 +36,9 @@ proc scan-tree-dump { args } {
 	return
     }
     if { [llength $args] >= 3 } {
-	scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
+	scan-dump "tree" [lindex $args 0] "t{,1}\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
     } else {
-	scan-dump "tree" [lindex $args 0] "t\[0-9\]\[0-9\].[lindex $args 1]"
+	scan-dump "tree" [lindex $args 0] "t{,1}\[0-9\]\[0-9\].[lindex $args 1]"
     }
 }
 
@@ -59,10 +59,10 @@ proc scan-tree-dump-times { args } {
     }
     if { [llength $args] >= 4 } {
 	scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \
-			"t\[0-9\]\[0-9\].[lindex $args 2]" [lindex $args 3]
+			"t{,1}\[0-9\]\[0-9\].[lindex $args 2]" [lindex $args 3]
     } else {
 	scan-dump-times "tree" [lindex $args 0] [lindex $args 1] \
-			"t\[0-9\]\[0-9\].[lindex $args 2]"
+			"t{,1}\[0-9\]\[0-9\].[lindex $args 2]"
     }
 }
 
@@ -83,10 +83,10 @@ proc scan-tree-dump-not { args } {
     }
     if { [llength $args] >= 3 } {
 	scan-dump-not "tree" [lindex $args 0] \
-		      "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
+		      "t{,1}\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
     } else {
 	scan-dump-not "tree" [lindex $args 0] \
-		      "t\[0-9\]\[0-9\].[lindex $args 1]"
+		      "t{,1}\[0-9\]\[0-9\].[lindex $args 1]"
     }
 }
 
@@ -108,10 +108,10 @@ proc scan-tree-dump-dem { args } {
     }
     if { [llength $args] >= 3 } {
 	scan-dump-dem "tree" [lindex $args 0] \
-		      "t\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
+		      "t{,1}\[0-9\]\[0-9\].[lindex $args 1]" [lindex $args 2]
     } else {
 	scan-dump-dem "tree" [lindex $args 0] \
-		      "t\[0-9\]\[0-9\].[lindex $args 1]"
+		      "t{,1}\[0-9\]\[0-9\].[lindex $args 1]"
     }
 }
 
@@ -132,10 +132,10 @@ proc scan-tree-dump-dem-not { args } {
     }
     if { [llength $args] >= 3 } {
 	scan-dump-dem-not "tree" [lindex $args 0] \
-			  "t\[0-9\]\[0-9\].[lindex $args 1]" \
+			  "t{,1}\[0-9\]\[0-9\].[lindex $args 1]" \
 			  [lindex $args 2]
     } else {
 	scan-dump-dem-not "tree" [lindex $args 0] \
-			  "t\[0-9\]\[0-9\].[lindex $args 1]"
+			  "t{,1}\[0-9\]\[0-9\].[lindex $args 1]"
     }
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	11 Jul 2006 11:28:14 -0000	1.159
+++ .cvsignore	18 Jul 2006 19:45:31 -0000	1.160
@@ -1 +1 @@
-gcc-4.1.1-20060711.tar.bz2
+gcc-4.1.1-20060718.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gcc41.spec	15 Jul 2006 21:13:19 -0000	1.80
+++ gcc41.spec	18 Jul 2006 19:45:31 -0000	1.81
@@ -1,6 +1,6 @@
-%define DATE 20060711
+%define DATE 20060718
 %define gcc_version 4.1.1
-%define gcc_release 8
+%define gcc_release 9
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -140,6 +140,12 @@
 Patch34: gcc41-reassoc4.patch
 Patch35: gcc41-reassoc5.patch
 Patch36: gcc41-power6.patch
+Patch37: gcc41-CVE-2006-3619.patch
+Patch38: gcc41-checking-identifier.patch
+Patch39: gcc41-duplicate-eh.patch
+Patch40: gcc41-pr27889.patch
+Patch41: gcc41-rh198849.patch
+Patch42: gcc41-testsuite-scantree.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -454,6 +460,12 @@
 %patch34 -p0 -b .reassoc4~
 %patch35 -p0 -b .reassoc5~
 %patch36 -p0 -b .power6~
+%patch37 -p0 -b .CVE-2006-3619~
+%patch38 -p0 -b .checking-identifier~
+%patch39 -p0 -b .duplicate-eh~
+%patch40 -p0 -b .pr27889~
+%patch41 -p0 -b .rh198849~
+%patch42 -p0 -b .testsuite-scantree~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -588,9 +600,12 @@
 ( ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}'
 echo ====================TESTING END=====================
 mkdir testlogs-%{_target_platform}-%{version}-%{release}
-for i in `find . -name \*.log | grep testsuite/ | grep -v 'config.log\|acats\|ada'`; do
+for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats\|ada'`; do
   ln $i testlogs-%{_target_platform}-%{version}-%{release}/ || :
 done
+for i in `find . -name \*.log | grep -F testsuite.ssp/ | grep -v 'config.log\|acats\|ada'`; do
+  ln $i testlogs-%{_target_platform}-%{version}-%{release}/ssp-`basename $i` || :
+done
 tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
   | uuencode testlogs-%{_target_platform}.tar.bz2 || :
 rm -rf testlogs-%{_target_platform}-%{version}-%{release}
@@ -1495,6 +1510,23 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jul 18 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-9
+- update from gcc-4_1-branch (-r115330:115565)
+  - PRs c++/28016, c++/28051, c++/28249, c++/28291, c++/28294, c++/28304,
+	c++/28343, c/26993, c/28286, fortran/20844, fortran/20893,
+	fortran/20903, fortran/25097, fortran/27980, fortran/28201,
+	fortran/28353, fortran/28384, libstdc++/27878,
+	tree-optimization/19505, tree-optimization/28162,
+	tree-optimization/28187
+- fix directory traversal issue in fastjar (Richard Guenther, CVE-2006-3619,
+  PR fastjar/28359)
+- fix ICE on complex assignment in nested fn (Richard Henderson,
+  PR middle-end/27889)
+- fix __builtin_constant_p in initializers (Mark Shinwell, #198849)
+- fix tree verification - IDENTIFIER_NODE can be shared (Diego Novillo)
+- fix duplicate_eh_regions
+- handle > 99 tree dumps in the testsuite
+
 * Sat Jul 15 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-8
 - fix handling of C++ template static data members in anonymous namespace
   (PR c++/28370)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- sources	11 Jul 2006 11:28:15 -0000	1.161
+++ sources	18 Jul 2006 19:45:31 -0000	1.162
@@ -1 +1 @@
-226d8504785cdba0168b11e61c64286a  gcc-4.1.1-20060711.tar.bz2
+6db40175ac03098074d07466152145e4  gcc-4.1.1-20060718.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:49:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:49:02 -0400
Subject: rpms/velocity/devel velocity.spec,1.15,1.16
Message-ID: <200607181949.k6IJn21Q019440@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19369

Modified Files:
	velocity.spec 
Log Message:

Build on all archs.




Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- velocity.spec	12 Jul 2006 08:41:42 -0000	1.15
+++ velocity.spec	18 Jul 2006 19:48:59 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:           velocity
 Version:        %{my_version}
-Release: 	3jpp_6fc
+Release: 	3jpp_7fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -39,9 +39,6 @@
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
 simple yet powerful template language to reference objects defined in
@@ -176,6 +173,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.4-3jpp_7fc
+- Build on all archs.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4-3jpp_6fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:50:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:50:58 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.16, 1.17
Message-ID: <200607181950.k6IJowh9020274@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20175

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:

Build on all archs.




Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-fileupload.spec	12 Jul 2006 06:28:46 -0000	1.16
+++ jakarta-commons-fileupload.spec	18 Jul 2006 19:50:56 -0000	1.17
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.0
-%define release 	3jpp_7fc
+%define release 	3jpp_8fc
 %define section         free
 
 Name:           %{name}
@@ -30,9 +30,6 @@
 # RHEL3 and FC2
 Obsoletes:      %{short_name} <= 0:1.0
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %description
 The javax.servlet package lacks support for rfc 1867, html file
 upload.  This package provides a simple to use api for working with
@@ -112,6 +109,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-3jpp_8fc
+- Build on all archs.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-3jpp_7fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:51:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:51:05 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2410, 1.2411 sources, 1.438,
	1.439
Message-ID: <200607181951.k6IJp5FQ020334@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19953

Modified Files:
	kernel-2.6.spec sources 
Log Message:
updated spec



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2410
retrieving revision 1.2411
diff -u -r1.2410 -r1.2411
--- kernel-2.6.spec	18 Jul 2006 17:13:17 -0000	1.2410
+++ kernel-2.6.spec	18 Jul 2006 19:51:02 -0000	1.2411
@@ -439,7 +439,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
+%define __find_provides cat %{_tmppath}/kabideps
 
 %ifarch x86_64
 Obsoletes: kernel-smp
@@ -1107,8 +1107,12 @@
     # Create the kABI metadata for use in packaging
     echo "**** GENERATING kernel ABI metadata ****"
     chmod 0755 %_sourcedir/kabitool
-    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d -k $KernelVer
-    cp kabi.deps $RPM_BUILD_ROOT/lib/modules/$KernelVer/kabideps-$KernelVer
+    if [ ! -e $RPM_SOURCE_DIR/kabi_whitelist ]; then
+        %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -k $KernelVer -l -w $RPM_BUILD_ROOT/kabi_whitelist
+    else
+	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
+    fi
+    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
     #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- sources	18 Jul 2006 17:13:18 -0000	1.438
+++ sources	18 Jul 2006 19:51:02 -0000	1.439
@@ -3,4 +3,4 @@
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 5c7d4562017166be2d6a4f3623be8206  find-provides
 93f1747dace7f2646a855b7b44b68f38  kabitool
-e76bb05ac4d15ba2bdfe7e46ba67a53a  kernel-2.6.spec
+21c43afb1ffc51ffa690d3275633608d  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:51:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:51:34 -0400
Subject: rpms/kernel/devel sources,1.439,1.440
Message-ID: <200607181951.k6IJpYk9020545@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20486

Modified Files:
	sources 
Log Message:
updated kabitool



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- sources	18 Jul 2006 19:51:02 -0000	1.439
+++ sources	18 Jul 2006 19:51:31 -0000	1.440
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 5c7d4562017166be2d6a4f3623be8206  find-provides
-93f1747dace7f2646a855b7b44b68f38  kabitool
 21c43afb1ffc51ffa690d3275633608d  kernel-2.6.spec
+a2b3f17e95872918b6de1daf4930626d  kabitool



From fedora-cvs-commits at redhat.com  Tue Jul 18 19:53:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 15:53:00 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.16, 1.17
Message-ID: <200607181953.k6IJr0w6021094@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21027

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:

Build on all archs





Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-taglibs-standard.spec	5 Jun 2006 23:26:48 -0000	1.16
+++ jakarta-taglibs-standard.spec	18 Jul 2006 19:52:57 -0000	1.17
@@ -4,7 +4,7 @@
 %define section         free
 %define jversion	1.1.1
 %define version		1.1.1
-%define release 	4jpp_5fc
+%define release 	4jpp_6fc
 
 Name:           %{name}
 Version:        %{version}
@@ -30,9 +30,6 @@
 Requires:       tomcat5-jsp-2.0-api >= 0:5.0.16
 Requires:       xalan-j2 >= 2.6.0
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %description
 This directory contains releases for the 1.1.x versions of the Standard
 Tag Library, Jakarta Taglibs's open-source implementation of the JSP
@@ -106,6 +103,9 @@
 
 
 %changelog
+* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_6fc
+- Build on all archs.
+
 * Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_5fc
 - Add missing BuildRequires for tomcat5-jsp-2.0-api and xalan-j2
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:03:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:03:31 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2411, 1.2412 sources, 1.440,
	1.441
Message-ID: <200607182003.k6IK3VXv024092@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24011

Modified Files:
	kernel-2.6.spec sources 
Log Message:
updated kabideps



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2411
retrieving revision 1.2412
diff -u -r1.2411 -r1.2412
--- kernel-2.6.spec	18 Jul 2006 19:51:02 -0000	1.2411
+++ kernel-2.6.spec	18 Jul 2006 20:03:09 -0000	1.2412
@@ -439,7 +439,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides cat %{_tmppath}/kabideps
+%define __find_provides if [ -e %{_tmppath}/kabideps ]; then cat %{_tmppath}/kabideps; fi
 
 %ifarch x86_64
 Obsoletes: kernel-smp
@@ -1113,6 +1113,7 @@
 	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
     fi
     %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
+    rm -f $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
     #


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -r1.440 -r1.441
--- sources	18 Jul 2006 19:51:31 -0000	1.440
+++ sources	18 Jul 2006 20:03:15 -0000	1.441
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 5c7d4562017166be2d6a4f3623be8206  find-provides
-21c43afb1ffc51ffa690d3275633608d  kernel-2.6.spec
 a2b3f17e95872918b6de1daf4930626d  kabitool
+7981010105a71d70de0f52dc9aed7331  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:15:21 -0400
Subject: rpms/coreutils/devel coreutils.spec, 1.128, 1.129 runuser-l.pamd,
	1.1, 1.2 su-l.pamd, 1.1, 1.2
Message-ID: <200607182015.k6IKFLZE026064@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26021

Modified Files:
	coreutils.spec runuser-l.pamd su-l.pamd 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 5.97-5
- 'include' su and runuser scripts in su-l and runuser-l scripts



Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- coreutils.spec	13 Jul 2006 12:15:26 -0000	1.128
+++ coreutils.spec	18 Jul 2006 20:15:19 -0000	1.129
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 4
+Release: 5
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,6 +280,9 @@
 /sbin/runuser
 
 %changelog
+* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 5.97-5
+- 'include' su and runuser scripts in su-l and runuser-l scripts
+
 * Thu Jul 13 2006 David Howells <dhowells at redhat.com> 5.97-4
 - split the PAM scripts for "su -l"/"runuser -l" from that of normal "su" and
   "runuser" (#198639)


Index: runuser-l.pamd
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/runuser-l.pamd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- runuser-l.pamd	13 Jul 2006 12:01:32 -0000	1.1
+++ runuser-l.pamd	18 Jul 2006 20:15:19 -0000	1.2
@@ -1,5 +1,4 @@
 #%PAM-1.0
-auth		sufficient	pam_rootok.so
+auth		include		runuser
 session		optional	pam_keyinit.so force revoke
-session		required	pam_limits.so
-session		required	pam_unix.so
+session		include		runuser


Index: su-l.pamd
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/su-l.pamd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- su-l.pamd	13 Jul 2006 12:01:32 -0000	1.1
+++ su-l.pamd	18 Jul 2006 20:15:19 -0000	1.2
@@ -1,13 +1,6 @@
 #%PAM-1.0
-auth		sufficient	pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth		sufficient	pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth		required	pam_wheel.so use_uid
-auth		include		system-auth
-account		sufficient	pam_succeed_if.so uid = 0 use_uid quiet
-account		include		system-auth
-password	include		system-auth
+auth		include		su
+account		include		su
+password	include		su
 session		optional	pam_keyinit.so force revoke
-session		include		system-auth
-session		optional	pam_xauth.so
+session		include		su



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:17:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:17:05 -0400
Subject: rpms/kernel/devel find-provides, 1.8, 1.9 kernel-2.6.spec, 1.2412,
	1.2413 sources, 1.441, 1.442
Message-ID: <200607182017.k6IKH5hV000766@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32597

Modified Files:
	find-provides kernel-2.6.spec sources 
Log Message:
update find-provides



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- find-provides	18 Jul 2006 16:31:30 -0000	1.8
+++ find-provides	18 Jul 2006 20:17:01 -0000	1.9
@@ -1,12 +1,8 @@
 #! /bin/sh
 
-IFS=$'\n'
-filelist=($(cat))
+kabideps=$1
 
-for file in "${filelist[@]}"; do
-    case "$file" in
-    */kabideps-*)
-	cat "$file"
-	;;
-   esac
-done
+if [ -e "$kabideps" ];
+then
+    cat "$kabideps"
+fi


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2412
retrieving revision 1.2413
diff -u -r1.2412 -r1.2413
--- kernel-2.6.spec	18 Jul 2006 20:03:09 -0000	1.2412
+++ kernel-2.6.spec	18 Jul 2006 20:17:01 -0000	1.2413
@@ -439,7 +439,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides if [ -e %{_tmppath}/kabideps ]; then cat %{_tmppath}/kabideps; fi
+%define __find_provides %_sourcedir/find-provides %{_tmppath}/kabideps
 
 %ifarch x86_64
 Obsoletes: kernel-smp


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- sources	18 Jul 2006 20:03:15 -0000	1.441
+++ sources	18 Jul 2006 20:17:02 -0000	1.442
@@ -1,6 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-5c7d4562017166be2d6a4f3623be8206  find-provides
 a2b3f17e95872918b6de1daf4930626d  kabitool
-7981010105a71d70de0f52dc9aed7331  kernel-2.6.spec
+71b5596c15a1c8fc07ad2bd2a72204ef  kernel-2.6.spec
+db55e6a8014389e9015ee3a443a303b2  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:19:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:19:57 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.22, 1.23 rhpxl.spec, 1.25,
	1.26 sources, 1.24, 1.25
Message-ID: <200607182019.k6IKJvf4009810@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9745

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Here comes an exciting new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	4 Apr 2006 17:33:24 -0000	1.22
+++ .cvsignore	18 Jul 2006 20:19:54 -0000	1.23
@@ -1,2 +1,3 @@
 rhpxl-0.18.tar.gz
 rhpxl-0.19.tar.gz
+rhpxl-0.20.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rhpxl.spec	14 Jun 2006 01:49:42 -0000	1.25
+++ rhpxl.spec	18 Jul 2006 20:19:54 -0000	1.26
@@ -2,14 +2,13 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.19
-Release: 1.1
+Version: 0.20
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: python-devel, gettext
-BuildArch: noarch
+BuildRequires: python-devel, gettext, libXrandr-devel, libX11-devel
 ExcludeArch: s390 s390x
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 Requires: rhpl, kudzu >= 1.2.0, newt, hwdata >= 0.169
@@ -43,6 +42,11 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 0.20-1
+- Remove code for config sections that X can figure out for itself.
+- Use python randr bindings to change resolution (bindings based on code
+  from Michael Sheldon <webmaster at mikeasoft dot com>).
+
 * Tue Jun 13 2006 Jesse Keating <jkeating at redhat.com> 0.19-1.1
 - Enable build on ppc64
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	4 Apr 2006 17:33:24 -0000	1.24
+++ sources	18 Jul 2006 20:19:54 -0000	1.25
@@ -1 +1 @@
-d86b72375a3d76e5deae69498c25d562  rhpxl-0.19.tar.gz
+961173a6a0ad2d6b3fc78bc43ae2425d  rhpxl-0.20.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:22:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:22:26 -0400
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.51,1.52
Message-ID: <200607182022.k6IKMQZE010551@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10487

Modified Files:
	gnome-power-manager.spec 
Log Message:
- explicitly disable policykit since we don't ship it



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-power-manager.spec	12 Jul 2006 03:41:37 -0000	1.51
+++ gnome-power-manager.spec	18 Jul 2006 20:22:23 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.15.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -42,7 +42,7 @@
 %setup -q
 
 %build
-%configure --disable-scrollkeeper --disable-actions-menu
+%configure --disable-scrollkeeper --disable-actions-menu --disable-policykit
 make
 
 %install
@@ -103,8 +103,8 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
-* Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
-- Update to 2.15.4
+* Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.15.3-2
+- explicitly disable policykit since we don't ship it
 
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-1
 - Update to 2.15.3



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:24:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:24:55 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.39, 1.40
Message-ID: <200607182024.k6IKOtE5011402@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10935

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
Add some documentation for disabling tests for GCJ.




Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jakarta-commons-collections.spec	18 Jul 2006 01:45:02 -0000	1.39
+++ jakarta-commons-collections.spec	18 Jul 2006 20:24:53 -0000	1.40
@@ -42,7 +42,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release 	4jpp_1fc
+%define release 	4jpp_2fc
 %define	section		free
 
 Name:		%{name}
@@ -157,6 +157,7 @@
 %patch1 -b .sav
 %patch2 -b .sav
 %patch3 -b .sav
+# Avoid fail on error for GCJ. See FIXME below.
 %if %{gcj_support}
 %patch4 -b .sav
 %endif
@@ -191,9 +192,9 @@
         jar:jar javadoc:generate xdoc:transform
 ant tf.javadoc
 %else
-#FIXME Enabling tests with gcj causes memory leaks and can crash build machine!
+#FIXME Enabling tests with gcj causes memory leaks!
+# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28423
 %if %{gcj_support}
-#ant -Djava.io.tmpdir=. compile dist tf.javadoc
 ant -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
 %else
 ant -Djava.io.tmpdir=. test dist tf.javadoc
@@ -335,10 +336,8 @@
 - Add conditional native compilation.
 - Update commons-collections-3.1-project_xml.patch to exclude reference
   to maven-plugin-changelog which requires netbeans-svc etc.
-- Set test.failonerror to false for ant build.
-- Add patches from 3jpp release of package.
 - Set test.failonerror to false and add patch for build.xml for ant builds
-  with gcj to avoid memory leaks during test runs.
+  with gcj to avoid stopping the build on test failures on GCJ.
 
 * Fri Apr 07 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.1-3jpp
 - First JPP-1.7 release



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:27:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:27:57 -0400
Subject: rpms/kernel/devel find-provides, 1.9, 1.10 kernel-2.6.spec, 1.2413,
	1.2414 sources, 1.442, 1.443
Message-ID: <200607182027.k6IKRvRn012611@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12547

Modified Files:
	find-provides kernel-2.6.spec sources 
Log Message:
another try...



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- find-provides	18 Jul 2006 20:17:01 -0000	1.9
+++ find-provides	18 Jul 2006 20:27:53 -0000	1.10
@@ -1,5 +1,8 @@
 #! /bin/sh
 
+IFS=$'\n'
+filelist=($(cat))
+
 kabideps=$1
 
 if [ -e "$kabideps" ];


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2413
retrieving revision 1.2414
diff -u -r1.2413 -r1.2414
--- kernel-2.6.spec	18 Jul 2006 20:17:01 -0000	1.2413
+++ kernel-2.6.spec	18 Jul 2006 20:27:53 -0000	1.2414
@@ -1669,6 +1669,7 @@
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.
 - Fix kabitool for correct location of symvers.
+- Various other fixes when things broke.
 
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- sources	18 Jul 2006 20:17:02 -0000	1.442
+++ sources	18 Jul 2006 20:27:54 -0000	1.443
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 a2b3f17e95872918b6de1daf4930626d  kabitool
-71b5596c15a1c8fc07ad2bd2a72204ef  kernel-2.6.spec
-db55e6a8014389e9015ee3a443a303b2  find-provides
+549c1de81469f88e8b67955002562c0a  kernel-2.6.spec
+0b9dc750399fac03d77fe89907652518  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:37:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:37:41 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2414, 1.2415 sources, 1.443,
	1.444
Message-ID: <200607182037.k6IKbfnd014953@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14766

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Handle find-requires by passing "kernel" if we're building a kernel



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2414
retrieving revision 1.2415
diff -u -r1.2414 -r1.2415
--- kernel-2.6.spec	18 Jul 2006 20:27:53 -0000	1.2414
+++ kernel-2.6.spec	18 Jul 2006 20:37:15 -0000	1.2415
@@ -440,6 +440,7 @@
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
 %define __find_provides %_sourcedir/find-provides %{_tmppath}/kabideps
+%define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
 Obsoletes: kernel-smp


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- sources	18 Jul 2006 20:27:54 -0000	1.443
+++ sources	18 Jul 2006 20:37:38 -0000	1.444
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 a2b3f17e95872918b6de1daf4930626d  kabitool
-549c1de81469f88e8b67955002562c0a  kernel-2.6.spec
 0b9dc750399fac03d77fe89907652518  find-provides
+54f12d8a317b6b0433c897f6bd677744  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:38:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:38:25 -0400
Subject: rpms/rhpxl/devel rhpxl.spec,1.26,1.27 sources,1.25,1.26
Message-ID: <200607182038.k6IKcPIi015106@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15033

Modified Files:
	rhpxl.spec sources 
Log Message:
Fix arch-specific problems.



Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rhpxl.spec	18 Jul 2006 20:19:54 -0000	1.26
+++ rhpxl.spec	18 Jul 2006 20:38:23 -0000	1.27
@@ -1,4 +1,4 @@
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
@@ -38,7 +38,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog COPYING
-%{python_sitelib}/rhpxl
+%dir %{python_sitearch}/rhpxl
+%{python_sitearch}/rhpxl
 %{_sbindir}/ddcprobe
 
 %changelog
@@ -46,6 +47,7 @@
 - Remove code for config sections that X can figure out for itself.
 - Use python randr bindings to change resolution (bindings based on code
   from Michael Sheldon <webmaster at mikeasoft dot com>).
+- rhpxl is now native
 
 * Tue Jun 13 2006 Jesse Keating <jkeating at redhat.com> 0.19-1.1
 - Enable build on ppc64


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Jul 2006 20:19:54 -0000	1.25
+++ sources	18 Jul 2006 20:38:23 -0000	1.26
@@ -1 +1 @@
-961173a6a0ad2d6b3fc78bc43ae2425d  rhpxl-0.20.tar.gz
+cbf0a86f1348106eec639842cddb1a9d  rhpxl-0.20.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:45:14 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec,1.4,1.5
Message-ID: <200607182045.k6IKjELM016342@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16313

Modified Files:
	pam_pkcs11.spec 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
- added a simple pkcs11_setup tool



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pam_pkcs11.spec	18 Jul 2006 18:34:24 -0000	1.4
+++ pam_pkcs11.spec	18 Jul 2006 20:45:11 -0000	1.5
@@ -18,6 +18,7 @@
 Source3:	rh_pkcs11_eventmgr.conf
 Patch1:		pam_pkcs11-0.5.3-nss.patch
 Patch2:		pam_pkcs11-0.5.3-cardonly.patch
+Patch3:		pam_pkcs11-0.5.3-setup-tool.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -49,6 +50,7 @@
 %setup -q -n pam_pkcs11-%{version}
 %patch1 -p0 -b .nss
 %patch2 -p0 -b .card-only
+%patch3 -p1 -b .setup
 
 %build
 
@@ -132,6 +134,7 @@
 %{_bindir}/pkcs11_eventmgr
 %{_bindir}/pklogin_finder
 %{_bindir}/pkcs11_inspect
+%{_bindir}/pkcs11_setup
 %{_libdir}/%{name}/*.so
 /%{_lib}/security/%{name}.so
 %{_mandir}/man8/%{name}.8.gz
@@ -146,7 +149,10 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
-* Thu Jul 18 2006 Robert Relyea  <rrelyea at redhat.com>  0.5.3-5
+* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
+- added a simple pkcs11_setup tool
+
+* Thu Jul 18 2006 Robert Relyea  <rrelyea at redhat.com>
 - Fix memory error in card_only.
 - Use the TEXT_INFO field for smart card prompting
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:45:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:45:32 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-setup-tool.patch,NONE,1.1
Message-ID: <200607182045.k6IKjWUa016451@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16407

Added Files:
	pam_pkcs11-0.5.3-setup-tool.patch 
Log Message:
* Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
- added a simple pkcs11_setup tool


pam_pkcs11-0.5.3-setup-tool.patch:
 Makefile.am    |    7 
 Makefile.in    |   21 +-
 pkcs11_setup.c |  516 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 537 insertions(+), 7 deletions(-)

--- NEW FILE pam_pkcs11-0.5.3-setup-tool.patch ---
--- pam_pkcs11-0.5.3/src/tools/Makefile.am.setup	2006-07-07 13:46:34.000000000 +0200
+++ pam_pkcs11-0.5.3/src/tools/Makefile.am	2006-07-07 13:46:34.000000000 +0200
@@ -8,11 +8,11 @@
 AM_LDFLAGS = $(PCSC_LIBS)
 
 if HAVE_PCSC
-bin_PROGRAMS = card_eventmgr pkcs11_eventmgr pklogin_finder pkcs11_inspect
+bin_PROGRAMS = card_eventmgr pkcs11_eventmgr pklogin_finder pkcs11_inspect pkcs11_setup
 card_eventmgr_SOURCES = card_eventmgr.c
 card_eventmgr_LDADD = @LIBSCCONF@ @LIBCOMMON@
 else
-bin_PROGRAMS = pkcs11_eventmgr pklogin_finder pkcs11_inspect
+bin_PROGRAMS = pkcs11_eventmgr pklogin_finder pkcs11_inspect pkcs11_setup
 endif
 
 pklogin_finder_SOURCES = pklogin_finder.c
@@ -23,3 +23,6 @@
 
 pkcs11_inspect_SOURCES = pkcs11_inspect.c
 pkcs11_inspect_LDADD = $(FINDER_OBJS) @LIBMAPPERS@
+
+pkcs11_setup_SOURCES = pkcs11_setup.c
+pkcs11_setup_LDADD = @LIBSCCONF@ @LIBCOMMON@
--- pam_pkcs11-0.5.3/src/tools/Makefile.in.setup	2006-07-07 13:46:34.000000000 +0200
+++ pam_pkcs11-0.5.3/src/tools/Makefile.in	2006-07-07 13:46:34.000000000 +0200
@@ -16,7 +16,7 @@
 
 # Process this file with automake to create Makefile.in
 
-SOURCES = $(card_eventmgr_SOURCES) $(pkcs11_eventmgr_SOURCES) $(pkcs11_inspect_SOURCES) $(pklogin_finder_SOURCES)
+SOURCES = $(card_eventmgr_SOURCES) $(pkcs11_eventmgr_SOURCES) $(pkcs11_inspect_SOURCES) $(pkcs11_setup_SOURCES) $(pklogin_finder_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -43,11 +43,11 @@
 target_triplet = @target@
 @HAVE_PCSC_FALSE at bin_PROGRAMS = pkcs11_eventmgr$(EXEEXT) \
 @HAVE_PCSC_FALSE@	pklogin_finder$(EXEEXT) \
- at HAVE_PCSC_FALSE@	pkcs11_inspect$(EXEEXT)
+ at HAVE_PCSC_FALSE@	pkcs11_inspect$(EXEEXT) pkcs11_setup$(EXEEXT)
 @HAVE_PCSC_TRUE at bin_PROGRAMS = card_eventmgr$(EXEEXT) \
 @HAVE_PCSC_TRUE@	pkcs11_eventmgr$(EXEEXT) \
 @HAVE_PCSC_TRUE@	pklogin_finder$(EXEEXT) \
- at HAVE_PCSC_TRUE@	pkcs11_inspect$(EXEEXT)
+ at HAVE_PCSC_TRUE@	pkcs11_inspect$(EXEEXT) pkcs11_setup$(EXEEXT)
 subdir = src/tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -73,6 +73,9 @@
 am__DEPENDENCIES_2 = ../pam_pkcs11/mapper_mgr.o \
 	../pam_pkcs11/pam_config.o
 pkcs11_inspect_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_pkcs11_setup_OBJECTS = pkcs11_setup.$(OBJEXT)
+pkcs11_setup_OBJECTS = $(am_pkcs11_setup_OBJECTS)
+pkcs11_setup_DEPENDENCIES =
 am_pklogin_finder_OBJECTS = pklogin_finder.$(OBJEXT)
 pklogin_finder_OBJECTS = $(am_pklogin_finder_OBJECTS)
 pklogin_finder_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -88,10 +91,11 @@
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(card_eventmgr_SOURCES) $(pkcs11_eventmgr_SOURCES) \
-	$(pkcs11_inspect_SOURCES) $(pklogin_finder_SOURCES)
+	$(pkcs11_inspect_SOURCES) $(pkcs11_setup_SOURCES) \
+	$(pklogin_finder_SOURCES)
 DIST_SOURCES = $(am__card_eventmgr_SOURCES_DIST) \
 	$(pkcs11_eventmgr_SOURCES) $(pkcs11_inspect_SOURCES) \
-	$(pklogin_finder_SOURCES)
+	$(pkcs11_setup_SOURCES) $(pklogin_finder_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -188,6 +192,7 @@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -241,6 +246,8 @@
 pkcs11_eventmgr_LDADD = @LIBSCCONF@ @LIBCOMMON@ $(CRYPTO_LIBS)
 pkcs11_inspect_SOURCES = pkcs11_inspect.c
 pkcs11_inspect_LDADD = $(FINDER_OBJS) @LIBMAPPERS@
+pkcs11_setup_SOURCES = pkcs11_setup.c
+pkcs11_setup_LDADD = @LIBSCCONF@ @LIBCOMMON@
 all: all-am
 
 .SUFFIXES:
@@ -311,6 +318,9 @@
 pkcs11_inspect$(EXEEXT): $(pkcs11_inspect_OBJECTS) $(pkcs11_inspect_DEPENDENCIES) 
 	@rm -f pkcs11_inspect$(EXEEXT)
 	$(LINK) $(pkcs11_inspect_LDFLAGS) $(pkcs11_inspect_OBJECTS) $(pkcs11_inspect_LDADD) $(LIBS)
+pkcs11_setup$(EXEEXT): $(pkcs11_setup_OBJECTS) $(pkcs11_setup_DEPENDENCIES) 
+	@rm -f pkcs11_setup$(EXEEXT)
+	$(LINK) $(pkcs11_setup_LDFLAGS) $(pkcs11_setup_OBJECTS) $(pkcs11_setup_LDADD) $(LIBS)
 pklogin_finder$(EXEEXT): $(pklogin_finder_OBJECTS) $(pklogin_finder_DEPENDENCIES) 
 	@rm -f pklogin_finder$(EXEEXT)
 	$(LINK) $(pklogin_finder_LDFLAGS) $(pklogin_finder_OBJECTS) $(pklogin_finder_LDADD) $(LIBS)
@@ -324,6 +334,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/card_eventmgr.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkcs11_eventmgr.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkcs11_inspect.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pkcs11_setup.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pklogin_finder.Po at am__quote@
 
 .c.o:
--- /dev/null	2006-07-07 08:05:54.592713000 +0200
+++ pam_pkcs11-0.5.3/src/tools/pkcs11_setup.c	2006-07-07 13:54:45.000000000 +0200
@@ -0,0 +1,516 @@
+/*
+ * PKCS#11 Card viewer tool
+ * Copyright (C) 2006 Red Hat, Inc.
+ *
+ * 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.
+ *
+ */
+
+#define _GNU_SOURCE
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ctype.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "../scconf/scconf.h"
+#include "../common/debug.h"
+#include "../common/error.h"
+
+#define PAM_PKCS11_CONF "/etc/pam_pkcs11/pam_pkcs11.conf"
+#define EVENTMGR_CONF "/etc/pam_pkcs11/pkcs11_eventmgr.conf"
+
+static const char Ins_action[] = "ins_action=";
+static const char Rm_action[] = "rm_action=";
+static const char Use_module[] = "use_module=";
+static const char List_modules[] = "list_modules";
+
+enum params { INS_ACTION, RM_ACTION, USE_MODULE, LIST_MODULES };
+
+static const char const *param_names[] = { Ins_action, Rm_action, Use_module, List_modules };
+static int pn_sizes[] = { sizeof(Ins_action), sizeof(Rm_action), sizeof(Use_module), sizeof(List_modules) };
+
+#define NUM_PARAMS (sizeof(param_names)/sizeof(param_names[0]))
+
+const char *scconf_replace_str(scconf_block * block, const char *option, const char *value)
+{
+    scconf_list *list = NULL;
+    scconf_item *item;
+
+    scconf_list_add(&list, value);
+    item = scconf_item_add(NULL, block, NULL, SCCONF_ITEM_TYPE_VALUE, option, list);
+
+    /* now clear out the item list */
+    scconf_list_destroy(item->value.list);
+    item->value.list = list;  /* adopt */
+    return value;
+}
+
+int scconf_replace_str_list(scconf_block * block, const char *option, const char *value)
+{
+    scconf_list *list = NULL;
+    scconf_item *item;
+    char *lstitem = NULL;
+    char *next;
+    
+    while (value != NULL) {
+        if ((next=strchr(value, ',')) != NULL) {
+            lstitem = strndup(value, next-value);
+            next++;
+        }
+        else {
+            lstitem = strdup(value);
+        }
+        if (lstitem == NULL)
+            return 1;
+        scconf_list_add(&list, lstitem);
+        value = next;
+        free(lstitem);
+    }
+        
+    item = scconf_item_add(NULL, block, NULL, SCCONF_ITEM_TYPE_VALUE, option, list);
+
+    /* now clear out the item list */
+    scconf_list_destroy(item->value.list);
+    item->value.list = list;  /* adopt */
+    return 0;
+}
+
+int list_modules(void)
+{
+    const scconf_block *pam_pkcs11;
+    scconf_block **pkcs11_blocks;
+    scconf_context *ctx = NULL;
+    int i;
+    int result = 1;
+
+    /*
+     * loop through looking for smart card entries
+     */
+    ctx = scconf_new(PAM_PKCS11_CONF);
+    if (ctx == NULL) {
+    	goto bail;
+    }
+    if (scconf_parse(ctx) <= 0 ) {
+    	goto bail;
+    }
+    pam_pkcs11 = scconf_find_block(ctx, NULL, "pam_pkcs11");
+    if (!pam_pkcs11) {
+    	goto bail;
+    }
+    pkcs11_blocks = scconf_find_blocks(ctx, pam_pkcs11, "pkcs11_module", NULL);
+    if (!pkcs11_blocks) {
+    	goto bail;
+    }
+
+    /* list only those smart cards which are actually installed */
+    for (i=0; pkcs11_blocks[i]; i++) {
+    	const char *path = 
+    		scconf_get_str(pkcs11_blocks[i], "module", NULL);
+    	/* check to see if the module exists on the system */
+    	if (!path || *path == 0) {
+    		continue;
+    	}
+    	/* verify the module exists */
+        if (access(path, X_OK) == 0) {
+    	    if (pkcs11_blocks[i] && pkcs11_blocks[i]->name
+    	        && pkcs11_blocks[i]->name->data) {
+    		    printf("%s\n", pkcs11_blocks[i]->name->data);
+    	    }
+    	}
+    }
+    
+    result = 0;
+
+bail: 
+    if (ctx) {
+    	scconf_free(ctx);
+    }
+    return result;
+}
+
+int print_default_module(void)
+{
+    const scconf_block *pam_pkcs11;
+    scconf_context *ctx = NULL;
+    int result = 1;
+
+    /*
+    * read the base pam_pkcs11.conf
+    */
+    ctx = scconf_new(PAM_PKCS11_CONF);
+    if (ctx == NULL) {
+        goto bail;
+    }
+    if (scconf_parse(ctx) <= 0) {
+        goto bail;
+    }
+    pam_pkcs11 = scconf_find_block(ctx, NULL, "pam_pkcs11");
+    if (!pam_pkcs11) {
+        goto bail;
+    }
+    printf("%s\n", scconf_get_str(pam_pkcs11, "use_pkcs11_module", ""));
+    result = 0;
+
+    bail: 
+    if (ctx) {
+        scconf_free(ctx);
+    }
+    ctx = NULL;
+
+    return result;
+}
+
+int set_default_module(const char *mod)
+{
+	scconf_block *pam_pkcs11, *pkcs11_eventmgr;
+	scconf_block **modules = NULL;
+	scconf_context *ctx = NULL;
+	scconf_context *ectx = NULL;
+	const char *lib = NULL;
+	int result = 1;
+
+	/*
+	 * write out pam_pkcs11.conf
+	 */
+	ctx = scconf_new(PAM_PKCS11_CONF);
+	if (ctx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ctx) <= 0) {
+		goto bail;
+	}
+	pam_pkcs11 = (scconf_block *)scconf_find_block(ctx, NULL, "pam_pkcs11");
+	if (!pam_pkcs11) {
+		goto bail;
+	}
+	scconf_replace_str(pam_pkcs11, "use_pkcs11_module", mod);
+
+	modules = scconf_find_blocks(ctx, pam_pkcs11, "pkcs11_module", mod);
+	if (!modules || !modules[0]) {
+		goto bail;
+	}
+	lib = scconf_get_str(modules[0], "module", NULL);
+	if (!lib) {
+		goto bail;
+	}
+	result = scconf_write(ctx, NULL);
+	if (result != 0) {
+	    goto bail;
+	}
+
+	ectx = scconf_new(EVENTMGR_CONF);
+	if (ectx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ectx) <= 0) {
+		goto bail;
+	}
+	pkcs11_eventmgr = (scconf_block *)
+			scconf_find_block(ectx, NULL, "pkcs11_eventmgr");
+	if (!pkcs11_eventmgr) {
+		goto bail;
+	}
+	scconf_replace_str(pkcs11_eventmgr, "pkcs11_module", lib);
+	result = scconf_write(ectx, NULL);
+
+bail: 
+	if (modules) {
+		free(modules);
+	}
+	if (ctx) {
+		scconf_free(ctx);
+	}
+	if (ectx) {
+		scconf_free(ectx);
+	}
+	
+	return result;
+}
+
+int print_card_insert_action(void)
+{
+	const scconf_block *pkcs11_eventmgr;
+	scconf_block **event_blocks = NULL;
+	scconf_context *ctx = NULL;
+	const scconf_list *actionList = NULL;
+    int result = 1;
+
+	/*
+	 * read the pkcs11_eventmgr.conf to get our action
+	 */
+	ctx = scconf_new(EVENTMGR_CONF);
+	if (ctx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ctx) <= 0) {
+		goto bail;
+	}
+	pkcs11_eventmgr = scconf_find_block(ctx, NULL, "pkcs11_eventmgr");
+	if (!pkcs11_eventmgr) {
+		goto bail;
+	}
+	event_blocks = scconf_find_blocks(ctx, pkcs11_eventmgr, "event", 
+						"card_insert");
+	if (!event_blocks || !event_blocks[0]) {
+		goto bail;
+	}
+	actionList = scconf_find_list(event_blocks[0],"action");
+	if (actionList) {
+	   char *lst = scconf_list_strdup(actionList, "\n");
+	   if (lst != NULL) {
+	       printf("%s\n", lst);
+	       free(lst);
+	   }
+	}
+	result = 0;
+
+bail:
+	if (event_blocks) {
+		free(event_blocks);
+	}
+	if (ctx) {
+		scconf_free(ctx);
+	}
+
+	return result;
+}
+
+int set_card_insert_action(const char *act)
+{
+	scconf_block *pkcs11_eventmgr;
+	scconf_block **insert_blocks = NULL;
+	scconf_context *ctx = NULL;
+    int result = 1;
+
+	/*
+	 * write out pkcs11_eventmgr.conf
+	 */
+	ctx = scconf_new(EVENTMGR_CONF);
+	if (ctx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ctx) <= 0) {
+		goto bail;
+	}
+	pkcs11_eventmgr = (scconf_block *)
+			scconf_find_block(ctx, NULL, "pkcs11_eventmgr");
+	if (!pkcs11_eventmgr) {
+		goto bail;
+	}
+	insert_blocks = scconf_find_blocks(ctx, pkcs11_eventmgr, 
+						"event", "card_insert");
+	if (!insert_blocks || !insert_blocks[0]) {
+		goto bail;
+	}
+
+	scconf_replace_str_list(insert_blocks[0], "action", act);
+
+	result = scconf_write(ctx, NULL);
+
+bail:
+	if (insert_blocks) {
+		free(insert_blocks);
+	}
+	if (ctx) {
+		scconf_free(ctx);
+	}
+	return result;
+}
+
+int print_card_remove_action(void)
+{
+	const scconf_block *pkcs11_eventmgr;
+	scconf_block **event_blocks = NULL;
+	scconf_context *ctx = NULL;
+	const scconf_list *actionList = NULL;
+    int result = 1;
+
+	/*
+	 * read the pkcs11_eventmgr.conf to get our action
+	 */
+	ctx = scconf_new(EVENTMGR_CONF);
+	if (ctx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ctx) <= 0) {
+		goto bail;
+	}
+	pkcs11_eventmgr = scconf_find_block(ctx, NULL, "pkcs11_eventmgr");
+	if (!pkcs11_eventmgr) {
+		goto bail;
+	}
+	event_blocks = scconf_find_blocks(ctx, pkcs11_eventmgr, "event", 
+						"card_remove");
+	if (!event_blocks || !event_blocks[0]) {
+		goto bail;
+	}
+	actionList = scconf_find_list(event_blocks[0],"action");
+	if (actionList) {
+	   char *lst = scconf_list_strdup(actionList, "\n");
+	   if (lst != NULL) {
+	       printf("%s\n", lst);
+	       free(lst);
+	   }
+	}
+	result = 0;
+
+bail:
+	if (event_blocks) {
+		free(event_blocks);
+	}
+	if (ctx) {
+		scconf_free(ctx);
+	}
+
+	return result;
+}
+
+int set_card_remove_action(const char *act)
+{
+	scconf_block *pkcs11_eventmgr;
+	scconf_block **insert_blocks = NULL;
+	scconf_context *ctx = NULL;
+    int result = 1;
+
+	/*
+	 * write out pkcs11_eventmgr.conf
+	 */
+	ctx = scconf_new(EVENTMGR_CONF);
+	if (ctx == NULL) {
+		goto bail;
+	}
+	if (scconf_parse(ctx) <= 0) {
+		goto bail;
+	}
+	pkcs11_eventmgr = (scconf_block *)
+			scconf_find_block(ctx, NULL, "pkcs11_eventmgr");
+	if (!pkcs11_eventmgr) {
+		goto bail;
+	}
+	insert_blocks = scconf_find_blocks(ctx, pkcs11_eventmgr, 
+						"event", "card_remove");
+	if (!insert_blocks || !insert_blocks[0]) {
+		goto bail;
+	}
+
+	scconf_replace_str_list(insert_blocks[0], "action", act);
+
+	result = scconf_write(ctx, NULL);
+
+bail:
+	if (insert_blocks) {
+		free(insert_blocks);
+	}
+	if (ctx) {
+		scconf_free(ctx);
+	}
+	return result;
+}
+
+int main(int argc, const char **argv)
+{
+    int i;
+    int pname;
+    const char *params[NUM_PARAMS];
+    
+    memset(params, '\0', sizeof(params));
+    
+    for (i = 1; i < argc; i++) {
+    	for (pname = 0; pname < NUM_PARAMS; pname++) {
+    	    if (param_names[pname][pn_sizes[pname]-2] == '=') {
+    	        if (strncmp(argv[i], param_names[pname], pn_sizes[pname]-1) == 0) {
+    	            params[pname] = argv[i] + pn_sizes[pname] - 1;
+    	        }
+    	        else if (strncmp(argv[i], param_names[pname], pn_sizes[pname]-2) == 0
+    	            && argv[i][pn_sizes[pname]-2] == '\0') {
+    	            params[pname] = (void *)1;
+    	        }
+    	    }
+    	    else {
+        	    if (strcmp(argv[i], param_names[pname]) == 0) {
+        	        params[pname] = (void *)1;
+        	    }
+        	} 
+        }
+    }
+    
+    for (pname = 0; pname < NUM_PARAMS; pname++) {
+	    if (params[pname] != NULL)
+	        break;
+    }
+    
+    if (pname == NUM_PARAMS) {
+	DBG("No correct parameter specified");
+	printf("usage: pkcs11_setup [list_modules] [use_module[=<module_name>]]\n"
+	       "                    [ins_action[=<executable,executable,...>]]\n"
+	       "                    [rm_action[=<executable,executable,...>]]\n");
+    }
+    
+    if (params[LIST_MODULES] != NULL) {
+        DBG("List modules:");
+        return list_modules();
+    } 
+    else {
+        if (params[USE_MODULE] == (void *)1) {
+            DBG("Print default module:");
+            if ((i=print_default_module()) != 0) {
+                DBG1("Print default module failed with: %d", i);
+                return i;
+            }
+            return 0;
+        }
+        else if (params[USE_MODULE] != NULL) {
+            DBG1("Set default module: %s", params[USE_MODULE]);
+            if ((i=set_default_module(params[USE_MODULE])) != 0) {
+                DBG1("Set default module failed with: %d", i);
+                return i;
+            }
+        }
+        if (params[INS_ACTION] == (void *)1) {
+            DBG("Print card insert action:");
+            if ((i=print_card_insert_action()) != 0) {
+                DBG1("Print card insert action failed with: %d", i);
+                return i;
+            }
+            return 0;
+        }       
+        else if (params[INS_ACTION] != NULL) {
+            DBG1("Set card insert action: %s", params[INS_ACTION]);
+            if ((i=set_card_insert_action(params[INS_ACTION])) != 0) {
+                DBG1("Set card insert action failed with: %d", i);
+                return i;
+            }
+        }
+        if (params[RM_ACTION] == (void *)1) {
+            DBG("Print card remove action:");
+            if ((i=print_card_remove_action()) != 0) {
+                DBG1("Set card remove action failed with: %d", i);
+                return i;
+            }
+            return 0;
+        }        
+        else if (params[RM_ACTION] != NULL) {
+            DBG1("Set card remove action: %s", params[RM_ACTION]);
+            if ((i=set_card_remove_action(params[RM_ACTION])) != 0) {
+                DBG1("Set card remove action failed with: %d", i);
+                return i;
+            }
+        }        
+    }
+    DBG("Process completed");
+    return 0;
+}



From fedora-cvs-commits at redhat.com  Tue Jul 18 20:52:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 16:52:17 -0400
Subject: rpms/rgmanager/devel .cvsignore, 1.5, 1.6 rgmanager.spec, 1.29,
	1.30 sources, 1.12, 1.13
Message-ID: <200607182052.k6IKqHK2001315@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1288

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Updated Sources (automated).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2006 18:59:34 -0000	1.5
+++ .cvsignore	18 Jul 2006 20:52:15 -0000	1.6
@@ -1 +1,2 @@
 rgmanager-2.0.0.tar.gz
+rgmanager-2.0.2.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rgmanager.spec	12 Jul 2006 07:58:50 -0000	1.29
+++ rgmanager.spec	18 Jul 2006 20:52:15 -0000	1.30
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 2.0.0
-Release: 0.fc6.5.1
+Version: 2.0.2
+Release: 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Jun 2006 19:34:21 -0000	1.12
+++ sources	18 Jul 2006 20:52:15 -0000	1.13
@@ -1 +1 @@
-79b51511a491aca05769f0c8b3502dc8  rgmanager-2.0.0.tar.gz
+612607db0d523539a32018e65d1ebd85  rgmanager-2.0.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 18 21:00:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 17:00:43 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.130,1.131
Message-ID: <200607182100.k6IL0hEj004522@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4475

Modified Files:
	util-linux.spec 
Log Message:
fix dependences


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- util-linux.spec	17 Jul 2006 10:28:00 -0000	1.130
+++ util-linux.spec	18 Jul 2006 21:00:39 -0000	1.131
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.32
+Release: 0.33
 License: distributable
 Group: System Environment/Base
 
@@ -67,6 +67,7 @@
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 Requires(post): coreutils
+Requires(post): libselinux
 Provides: mount = %{version}
 Provides: losetup = %{version}
 Provides: schedutils
@@ -705,6 +706,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Jul 18 2006 Karel Zak <kzak at redhat.com> 2.13-0.33
+- add Requires(post): libselinux
+
 * Mon Jul 17 2006 Karel Zak <kzak at redhat.com> 2.13-0.32
 - add IPv6 support to the login command (patch by Milan Zazrivec)
 - fix #198626 - add keyinit instructions to the login PAM script 



From fedora-cvs-commits at redhat.com  Tue Jul 18 21:06:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 17:06:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2415, 1.2416 sources, 1.444,
	1.445
Message-ID: <200607182106.k6IL62MK005052@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4976

Modified Files:
	kernel-2.6.spec sources 
Log Message:
fix Module.symvers



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2415
retrieving revision 1.2416
diff -u -r1.2415 -r1.2416
--- kernel-2.6.spec	18 Jul 2006 20:37:15 -0000	1.2415
+++ kernel-2.6.spec	18 Jul 2006 21:05:54 -0000	1.2416
@@ -1107,6 +1107,7 @@
 
     # Create the kABI metadata for use in packaging
     echo "**** GENERATING kernel ABI metadata ****"
+    gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz 
     chmod 0755 %_sourcedir/kabitool
     if [ ! -e $RPM_SOURCE_DIR/kabi_whitelist ]; then
         %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -k $KernelVer -l -w $RPM_BUILD_ROOT/kabi_whitelist


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- sources	18 Jul 2006 20:37:38 -0000	1.444
+++ sources	18 Jul 2006 21:05:58 -0000	1.445
@@ -1,6 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-a2b3f17e95872918b6de1daf4930626d  kabitool
 0b9dc750399fac03d77fe89907652518  find-provides
-54f12d8a317b6b0433c897f6bd677744  kernel-2.6.spec
+41c93c884989fd2c2e4d9c33902730c4  kernel-2.6.spec
+9d18e6231257537219ea5228e353c6ae  kabitool



From fedora-cvs-commits at redhat.com  Tue Jul 18 21:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 17:11:44 -0400
Subject: rpms/flex/devel flex.spec,1.30,1.31
Message-ID: <200607182111.k6ILBi7d006244@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6166

Modified Files:
	flex.spec 
Log Message:
Reverted posix patch.



Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- flex.spec	16 Jul 2006 20:03:50 -0000	1.30
+++ flex.spec	18 Jul 2006 21:11:42 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -18,7 +18,7 @@
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
 Patch10: flex-2.5.4a-Makefile.in.patch
-Patch11: flex-2.5.4a-posix.patch
+#Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -48,7 +48,7 @@
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
 %patch10 -p1
-%patch11 -p1
+#%patch11 -p1
 
 %build
 autoconf
@@ -84,6 +84,10 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Tue Jul 18 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-41
+- Reverting posix patch.  Imposing posix because of warning is too
+  much of a restriction.
+
 * Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40
 - using dist tag
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 21:33:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 17:33:17 -0400
Subject: rpms/flex/FC-5 flex.spec,1.29,1.30
Message-ID: <200607182133.k6ILXHXW002003@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1990

Modified Files:
	flex.spec 
Log Message:
revert posix patch



Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/FC-5/flex.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- flex.spec	16 Jul 2006 20:08:54 -0000	1.29
+++ flex.spec	18 Jul 2006 21:33:14 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 40%{?dist}
+Release: 41%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -18,7 +18,7 @@
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
 Patch10: flex-2.5.4a-Makefile.in.patch
-Patch11: flex-2.5.4a-posix.patch
+#Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -48,7 +48,7 @@
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
 %patch10 -p1
-%patch11 -p1
+#%patch11 -p1
 
 %build
 autoconf
@@ -84,6 +84,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Tue Jul 18 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-41
+- reverted posix patch
+
 * Sun Jul 16 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40
 - using dist tag
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 21:34:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 17:34:29 -0400
Subject: rpms/flex/FC-4 flex.spec,1.17,1.18
Message-ID: <200607182134.k6ILYToY002037@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2019

Modified Files:
	flex.spec 
Log Message:
revert posix patch



Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/FC-4/flex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- flex.spec	17 Jul 2006 12:43:01 -0000	1.17
+++ flex.spec	18 Jul 2006 21:34:26 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 40.fc4
+Release: 41.fc4
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -18,7 +18,7 @@
 Patch8: flex-2.5.4a2-shapwarn.patch
 Patch9: flex-2.5.4a2-iniscan.patch
 Patch10: flex-2.5.4a-Makefile.in.patch
-Patch11: flex-2.5.4a-posix.patch
+#Patch11: flex-2.5.4a-posix.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -48,7 +48,7 @@
 %patch8 -p1 -b .shapwarn
 %patch9 -p1 -b .iniscan
 %patch10 -p1
-%patch11 -p1
+#%patch11 -p1
 
 %build
 autoconf
@@ -84,6 +84,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Tue Jul 18 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-41.fc4
+- revert posix patch
+
 * Mon Jul 17 2006 Petr Machata <pmachata at redhat.com> - 2.5.4a-40.fc4
 - syncing with devel branch
   - adding `make bigcheck' into build process.  Refreshing initscan.c to



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:10:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:10:36 -0400
Subject: rpms/hal/devel hal.spec,1.97,1.98
Message-ID: <200607182210.k6IMAapk002417@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2358

Modified Files:
	hal.spec 
Log Message:
- BR dbus-glib-devel



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- hal.spec	12 Jul 2006 06:19:32 -0000	1.97
+++ hal.spec	18 Jul 2006 22:10:26 -0000	1.98
@@ -1,6 +1,7 @@
 %define expat_version           1.95.5
 %define glib2_version           2.6.0
-%define dbus_version            0.60
+%define dbus_version            0.90
+%define dbus_glib_version	0.70
 %define pygtk2			2.0.0
 %define gnome_python2		2.0.0
 %define libselinux_version      1.17.14-1
@@ -20,7 +21,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 12.1
+Release: 13
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -35,6 +36,7 @@
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: python-devel
 BuildRequires: hwdata
 BuildRequires: libselinux-devel >= %{libselinux_version}
@@ -204,6 +206,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-13
+- BR dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.7-12.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:16:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:16:06 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.117,1.118
Message-ID: <200607182216.k6IMG62s008722@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6957

Modified Files:
	gnome-vfs2.spec 
Log Message:
- add BR for dbus-glib-devel



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnome-vfs2.spec	13 Jul 2006 00:05:25 -0000	1.117
+++ gnome-vfs2.spec	18 Jul 2006 22:16:03 -0000	1.118
@@ -6,13 +6,14 @@
 %define po_package gnome-vfs-2.0
 %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
-%define dbus_version 0.32
+%define dbus_version 0.90
+%define dbus_glib_version 0.70
 %define hal_version 0.5.7
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 2
+Release: 3 
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -40,6 +41,7 @@
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
@@ -186,6 +188,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-3
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2 
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:20:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:20:00 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.131,1.132
Message-ID: <200607182220.k6IMK0kw020581@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20530

Modified Files:
	util-linux.spec 
Log Message:
use absolute paths in post script


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- util-linux.spec	18 Jul 2006 21:00:39 -0000	1.131
+++ util-linux.spec	18 Jul 2006 22:19:58 -0000	1.132
@@ -510,7 +510,7 @@
 /bin/chmod 0644 /var/log/lastlog
 # Fix the file context, do not use restorecon
 if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-	chcon `matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
+	/usr/bin/chcon `/usr/sbin/matchpathcon -n /var/log/lastlog` /var/log/lastlog >/dev/null 2>&1
 fi
 
 %preun



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:20:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:20:10 -0400
Subject: rpms/hal/devel hal.spec,1.98,1.99
Message-ID: <200607182220.k6IMKAcs020661@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20475

Modified Files:
	hal.spec 
Log Message:
- add correct versions for dbus_glib and dbus_python



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- hal.spec	18 Jul 2006 22:10:26 -0000	1.98
+++ hal.spec	18 Jul 2006 22:20:07 -0000	1.99
@@ -2,6 +2,7 @@
 %define glib2_version           2.6.0
 %define dbus_version            0.90
 %define dbus_glib_version	0.70
+%define dbus_python_version	0.70
 %define pygtk2			2.0.0
 %define gnome_python2		2.0.0
 %define libselinux_version      1.17.14-1
@@ -42,14 +43,14 @@
 BuildRequires: libselinux-devel >= %{libselinux_version}
 BuildRequires: doxygen >= %{doxygen_version}
 BuildRequires: gettext >= %{gettext_version}
-BuildRequires: dbus-glib >= %{dbus_version}
+BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: perl-XML-Parser
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel >= %{libusb_version}
 %endif
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
 Requires: udev >= %{udev_version} 
 Requires: util-linux >= %{util_linux_version} 
@@ -77,7 +78,7 @@
 Summary: GNOME based device manager for HAL
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
-Requires: dbus-python >= %{dbus_version}
+Requires: dbus-python >= %{dbus_python_version}
 Requires: pygtk2 >= %{pygtk2} 
 Requires: gnome-python2 >= %{gnome_python2} 
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:22:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:22:37 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel sources,1.53,1.54
Message-ID: <200607182222.k6IMMbJO021574@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-serv21463

Modified Files:
	sources 
Log Message:
	* sources: Remove bcprov-jdk14-131.tar.gz.




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	20 Jun 2006 21:44:12 -0000	1.53
+++ sources	18 Jul 2006 22:22:35 -0000	1.54
@@ -1,5 +1,4 @@
 40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
-830237b359ad7245ec67a972e58ac098  bcprov-jdk14-131.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
 43d63ac889427a0f2d79fe7994180996  java-gcj-compat-static-compile.patch



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:27:05 -0400
Subject: rpms/avahi/devel avahi.spec,1.64,1.65
Message-ID: <200607182227.k6IMR5RF023298@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23203

Modified Files:
	avahi.spec 
Log Message:
- add BR for dbus-glib-devel



Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- avahi.spec	17 Jul 2006 22:02:07 -0000	1.64
+++ avahi.spec	18 Jul 2006 22:27:03 -0000	1.65
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.11
-Release: 	1.fc6
+Release: 	2.fc6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -17,7 +17,8 @@
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
-BuildRequires:  dbus-devel
+BuildRequires:  dbus-devel >= 0.90
+BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  dbus-python
 BuildRequires:  libxml2-python
 BuildRequires:  gtk2-devel
@@ -411,6 +412,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.11-2.fc6
+- add BR for dbus-glib-devel
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1.fc6
 - Upgrade to upstream version 0.6.11
 - fix bug 195674: set 'use-ipv6=yes' in avahi-daemon.conf



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:34:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:34:10 -0400
Subject: rpms/hal/devel hal-0.5.7-dbus-deprecated.patch, NONE, 1.1 hal.spec,
	1.99, 1.100
Message-ID: <200607182234.k6IMYACN024970@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24920

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.7-dbus-deprecated.patch 
Log Message:
- fix a deprecated function


hal-0.5.7-dbus-deprecated.patch:
 hal-device.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hal-0.5.7-dbus-deprecated.patch ---
--- hal-0.5.7/tools/hal-device.c.deprecated	2006-07-18 18:30:58.000000000 -0400
+++ hal-0.5.7/tools/hal-device.c	2006-07-18 18:31:06.000000000 -0400
@@ -155,7 +155,7 @@
 
 	libhal_ctx_shutdown(hal_ctx, &error);
 	libhal_ctx_free(hal_ctx);
-	dbus_connection_disconnect(conn);
+	dbus_connection_close(conn);
 	dbus_connection_unref(conn);
 	dbus_error_free(&error);
 


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- hal.spec	18 Jul 2006 22:20:07 -0000	1.99
+++ hal.spec	18 Jul 2006 22:34:07 -0000	1.100
@@ -30,6 +30,7 @@
 Patch1: hal-0.5.7-lid-open-fix.patch
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
 Patch3: hal-0.5.7-pcmcia-readers.patch
+Patch4: hal-0.5.7-dbus-deprecated.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -102,6 +103,7 @@
 %patch1 -p1 -b .lid-open-fix
 %patch2 -p1 -b .fix-for-nfs-and-autofs
 %patch3 -p0 -b .pcmcia-readers
+%patch4 -p1 -b .dbus-deprecated
 
 %build
 
@@ -209,6 +211,7 @@
 %changelog
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-13
 - BR dbus-glib-devel
+- Fix a deprecated function
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.7-12.1
 - rebuild



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:34:55 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.14.0-gpm-integration.patch, 1.2,
	1.3 gnome-panel.spec, 1.131, 1.132
Message-ID: <200607182234.k6IMYt8n025170@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25110

Modified Files:
	gnome-panel-2.14.0-gpm-integration.patch gnome-panel.spec 
Log Message:
- change "Suspend" to "Hibernate" where appropriate (bug 190791)


gnome-panel-2.14.0-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   53 +++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   33 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   77 +++++
 8 files changed, 716 insertions(+), 13 deletions(-)

Index: gnome-panel-2.14.0-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.14.0-gpm-integration.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-2.14.0-gpm-integration.patch	14 Jun 2006 04:09:00 -0000	1.2
+++ gnome-panel-2.14.0-gpm-integration.patch	18 Jul 2006 22:34:53 -0000	1.3
@@ -84,14 +84,14 @@
 -		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);
++	        else if (panel_power_manager_can_hibernate (power_manager))
++	          panel_power_manager_attempt_hibernate (power_manager);
 +
  		break;
  	case PANEL_LOGOUT_RESPONSE_STR:
 -		//FIXME
-+	        if (panel_power_manager_can_sleep (power_manager))
-+	          panel_power_manager_request_sleep (power_manager);
++	        if (panel_power_manager_can_suspend (power_manager))
++	          panel_power_manager_attempt_suspend (power_manager);
  		break;
  	case GTK_RESPONSE_NONE:
  	case GTK_RESPONSE_DELETE_EVENT:
@@ -103,19 +103,21 @@
  }
  
  static gboolean
-@@ -323,10 +338,10 @@ panel_logout_new (PanelLogoutDialogType 
+@@ -323,12 +338,10 @@ panel_logout_new (PanelLogoutDialogType 
  		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
  		//FIXME see previous FIXME
  
 -#if 0
-+#if 1
  		/* TODO: disable this for 2.14 since this is stupid (the user
  		 * don't want to log out of his session when suspending) */
 -		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND))
-+		if (panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager))
++		if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager))
  			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- 					       _("_Suspend"),
+-					       _("_Suspend"),
++					       _("_Hibernate"),
  					       PANEL_LOGOUT_RESPONSE_STD);
+-#endif
+
 --- gnome-panel-2.14.0/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
 +++ gnome-panel-2.14.0/gnome-panel/panel-action-button.c	2006-03-13 15:30:00.000000000 -0500
 @@ -47,10 +47,16 @@
@@ -154,7 +156,7 @@
 +
 +  manager = panel_get_power_manager ();
 +
-+  can_suspend = panel_power_manager_can_sleep (manager);
++  can_suspend = panel_power_manager_can_suspend (manager);
 +
 +  g_object_unref (manager);
 +
@@ -165,11 +167,11 @@
  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)
 +{
@@ -183,7 +185,7 @@
 +
 +  manager = panel_get_power_manager ();
 +
-+  panel_power_manager_request_sleep (manager);
++  panel_power_manager_attempt_suspend (manager);
 +
 +  g_object_unref (manager);
 +}
@@ -191,17 +193,6 @@
  /* Run Application
   */
  static void
-@@ -308,8 +350,8 @@ static PanelAction actions [] = {
- 		"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 @@ static PanelAction actions [] = {
  		panel_action_shutdown, NULL, NULL,
  		panel_action_shutdown_is_disabled
@@ -229,7 +220,7 @@
  				    int            position,
 --- /dev/null	2006-03-13 10:25:56.453532000 -0500
 +++ gnome-panel-2.14.0/gnome-panel/panel-power-manager.h	2006-03-13 15:30:00.000000000 -0500
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,77 @@
 +/* panel-power-manager.h - functions for powering down, restarting, and
 + *                         suspending the computer
 + *
@@ -267,9 +258,9 @@
 +typedef struct _PanelPowerManager PanelPowerManager;
 +typedef struct _PanelPowerManagerClass PanelPowerManagerClass;
 +typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate;
-+typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest;
 +typedef enum _PanelPowerManagerError PanelPowerManagerError;
 +
++
 +struct _PanelPowerManager
 +{
 +  GObject parent;
@@ -289,8 +280,8 @@
 +
 +enum _PanelPowerManagerError
 +{
-+  PANEL_POWER_MANAGER_ERROR_SLEEPING = 0,
-+  PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN
++  PANEL_POWER_MANAGER_ERROR_SUSPENDING = 0,
++  PANEL_POWER_MANAGER_ERROR_HIBERNATING
 +};
 +
 +GType panel_power_manager_get_type (void);
@@ -298,18 +289,12 @@
 +
 +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_suspend (PanelPowerManager *manager);
++gboolean panel_power_manager_can_hibernate (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);
-+
-+
++void panel_power_manager_attempt_suspend (PanelPowerManager *manager);
++void panel_power_manager_attempt_hibernate (PanelPowerManager *manager);
 +PanelPowerManager *panel_get_power_manager (void);
 +G_END_DECLS
 +#endif /* PANEL_POWER_MANAGER_H */
@@ -704,10 +689,10 @@
 +}
 +
 +gboolean 
-+panel_power_manager_can_sleep (PanelPowerManager *manager)
++panel_power_manager_can_suspend (PanelPowerManager *manager)
 +{
 +  GError *error;
-+  gboolean can_sleep;
++  gboolean can_suspend;
 +
 +  error = NULL;
 +
@@ -718,10 +703,10 @@
 +      return FALSE;
 +    }
 +
-+  can_sleep = FALSE;
++  can_suspend = FALSE;
 +  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend", &error,
 +	                  G_TYPE_INVALID,
-+	                  G_TYPE_BOOLEAN, &can_sleep, G_TYPE_INVALID)) 
++	                  G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) 
 +    {
 +      if (error != NULL)
 +	{
@@ -729,17 +714,17 @@
 +	             error->message);
 +	  g_error_free (error);
 +	}
-+      can_sleep = FALSE;
++      can_suspend = FALSE;
 +    }
 +
-+  return can_sleep;
++  return can_suspend;
 +}
 +
 +gboolean 
-+panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager)
++panel_power_manager_can_hibernate (PanelPowerManager *manager)
 +{
 +  GError *error;
-+  gboolean can_sleep_and_power_down;
++  gboolean can_hibernate;
 +
 +  error = NULL;
 +
@@ -750,10 +735,10 @@
 +      return FALSE;
 +    }
 +
-+  can_sleep_and_power_down = FALSE;
++  can_hibernate = FALSE;
 +  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate", &error,
 +	                  G_TYPE_INVALID,
-+	                  G_TYPE_BOOLEAN, &can_sleep_and_power_down, 
++	                  G_TYPE_BOOLEAN, &can_hibernate, 
 +	                  G_TYPE_INVALID)) 
 +    {
 +      if (error != NULL)
@@ -762,14 +747,14 @@
 +	             error->message);
 +	  g_error_free (error);
 +	}
-+      can_sleep_and_power_down = FALSE;
++      can_hibernate = FALSE;
 +    }
 +
-+  return can_sleep_and_power_down;
++  return can_hibernate;
 +}
 +
-+PanelPowerManagerRequest *
-+panel_power_manager_request_sleep (PanelPowerManager *manager)
++void
++panel_power_manager_attempt_suspend (PanelPowerManager *manager)
 +{
 +  GError *error;
 +
@@ -779,7 +764,7 @@
 +    {
 +      g_warning ("could not connect to power manager - %s", error->message);
 +      g_error_free (error);
-+      return NULL;
++      return;
 +    }
 +
 +  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", &error,
@@ -790,7 +775,7 @@
 +      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,
++	                                PANEL_POWER_MANAGER_ERROR_SUSPENDING,
 +	                                error->message);
 +      g_error_free (error);
 +      g_signal_emit (G_OBJECT (manager),
@@ -799,11 +784,11 @@
 +      g_error_free (call_error);
 +    }
 +
-+  return (PanelPowerManagerRequest *) !NULL;
 +}
 +
-+PanelPowerManagerRequest *
-+panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager)
++
++void
++panel_power_manager_attempt_hibernate (PanelPowerManager *manager)
 +{
 +  GError *error;
 +
@@ -813,7 +798,7 @@
 +    {
 +      g_warning ("could not connect to power manager - %s", error->message);
 +      g_error_free (error);
-+      return NULL;
++      return;
 +    }
 +
 +  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", &error,
@@ -824,24 +809,17 @@
 +      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,
++	                                PANEL_POWER_MANAGER_ERROR_HIBERNATING,
 +	                                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)
@@ -855,6 +833,12 @@
 +}
 +
 +
++
++
++
++
++
++
 +#ifdef PANEL_POWER_MANAGER_ENABLE_TEST
 +
 +#include <stdio.h>
@@ -875,26 +859,26 @@
 +  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 ("checking if user can put machine to suspend... ");
++  if (panel_power_manager_can_suspend (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))
++  if (panel_power_manager_can_hibernate (manager))
 +      g_print ("yes\n");
 +  else
 +      g_print ("no\n");
 +
 +  g_print ("attempting to suspend machine... ");
-+  if (panel_power_manager_request_sleep (manager) != NULL)
++  if (panel_power_manager_attempt_suspend (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)
++  if (panel_power_manager_attempt_hibernate (manager) != NULL)
 +      g_print ("yes\n");
 +  else
 +      g_print ("no\n");
@@ -908,6 +892,7 @@
 +  return exit_code;
 +}
 +#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
++
 --- gnome-panel-2.14.0/configure.in.gpm-integration	2006-03-13 14:47:14.000000000 -0500
 +++ gnome-panel-2.14.0/configure.in	2006-03-13 15:30:00.000000000 -0500
 @@ -58,10 +58,12 @@ LIBGNOME_MENU_REQUIRED=2.11.1


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnome-panel.spec	12 Jul 2006 06:02:52 -0000	1.131
+++ gnome-panel.spec	18 Jul 2006 22:34:53 -0000	1.132
@@ -227,6 +227,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-6
+- change "Suspend" to "Hibernate" where appropriate (bug 190791)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.2-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:45:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:45:26 -0400
Subject: rpms/hal/devel hal-0.5.7-dbus-deprecated.patch,1.1,1.2
Message-ID: <200607182245.k6IMjQMr028490@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28370

Modified Files:
	hal-0.5.7-dbus-deprecated.patch 
Log Message:
- caught another deprecated function being used


hal-0.5.7-dbus-deprecated.patch:
 0 files changed

Index: hal-0.5.7-dbus-deprecated.patch
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal-0.5.7-dbus-deprecated.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hal-0.5.7-dbus-deprecated.patch	18 Jul 2006 22:34:07 -0000	1.1
+++ hal-0.5.7-dbus-deprecated.patch	18 Jul 2006 22:45:24 -0000	1.2
@@ -1,11 +0,0 @@
---- hal-0.5.7/tools/hal-device.c.deprecated	2006-07-18 18:30:58.000000000 -0400
-+++ hal-0.5.7/tools/hal-device.c	2006-07-18 18:31:06.000000000 -0400
-@@ -155,7 +155,7 @@
- 
- 	libhal_ctx_shutdown(hal_ctx, &error);
- 	libhal_ctx_free(hal_ctx);
--	dbus_connection_disconnect(conn);
-+	dbus_connection_close(conn);
- 	dbus_connection_unref(conn);
- 	dbus_error_free(&error);
- 



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:48:06 -0400
Subject: rpms/avahi/devel avahi-0.6.11-dbus-deprecated.patch, NONE,
	1.1 avahi.spec, 1.65, 1.66
Message-ID: <200607182248.k6IMm6CU011764@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11619

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.11-dbus-deprecated.patch 
Log Message:
- add patch to fix use of deprecated dbus functions


avahi-0.6.11-dbus-deprecated.patch:
 avahi-client/client.c        |    4 ++--
 avahi-daemon/dbus-protocol.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE avahi-0.6.11-dbus-deprecated.patch ---
--- avahi-0.6.11/avahi-daemon/dbus-protocol.c.dbus-deprecated	2006-07-18 18:37:36.000000000 -0400
+++ avahi-0.6.11/avahi-daemon/dbus-protocol.c	2006-07-18 18:38:01.000000000 -0400
@@ -1107,7 +1107,7 @@
         dbus_error_free(&error);
 
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
         server->bus = NULL;
     }
@@ -1124,7 +1124,7 @@
     assert(server->n_clients == 0);
 
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
         server->bus = NULL;
     }
@@ -1159,7 +1159,7 @@
 
 fail:
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
     }
 
--- avahi-0.6.11/avahi-client/client.c.dbus-deprecated	2006-07-18 18:36:46.000000000 -0400
+++ avahi-0.6.11/avahi-client/client.c	2006-07-18 18:37:12.000000000 -0400
@@ -67,7 +67,7 @@
     switch (client->state) {
         case AVAHI_CLIENT_FAILURE:
             if (client->bus) {
-                dbus_connection_disconnect(client->bus);
+                dbus_connection_close(client->bus);
                 dbus_connection_unref(client->bus);
                 client->bus = NULL;
             }
@@ -598,7 +598,7 @@
     if (client->bus)
         /* Disconnect in advance, so that the free() functions won't
          * issue needless server calls */
-        dbus_connection_disconnect(client->bus);
+        dbus_connection_close(client->bus);
     
     while (client->groups)
         avahi_entry_group_free(client->groups);


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- avahi.spec	18 Jul 2006 22:27:03 -0000	1.65
+++ avahi.spec	18 Jul 2006 22:48:04 -0000	1.66
@@ -54,6 +54,7 @@
 Patch15:	avahi-0.6.9-mono-libdir.patch
 Patch16:	avahi-sharp-lock.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
+Patch18: 	avahi-0.6.11-dbus-deprecated.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -201,6 +202,7 @@
 #%patch16 -p1 -b .sharp-lock
 #^- this patch now upstream
 %patch17 -p1 -b .use-ipv6-yes
+%patch18 -p1 -b .dbus-deprecated
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -414,6 +416,7 @@
 %changelog
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.11-2.fc6
 - add BR for dbus-glib-devel
+- fix deprecated functions
 
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1.fc6
 - Upgrade to upstream version 0.6.11



From fedora-cvs-commits at redhat.com  Tue Jul 18 22:50:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 18:50:23 -0400
Subject: rpms/hal/devel hal-0.5.7-dbus-deprecated.patch,1.2,1.3
Message-ID: <200607182250.k6IMoN8A012676@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12561

Modified Files:
	hal-0.5.7-dbus-deprecated.patch 
Log Message:
- generate a correct patch this time


hal-0.5.7-dbus-deprecated.patch:
 hal-device.c |    2 +-
 lshal.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: hal-0.5.7-dbus-deprecated.patch
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal-0.5.7-dbus-deprecated.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hal-0.5.7-dbus-deprecated.patch	18 Jul 2006 22:45:24 -0000	1.2
+++ hal-0.5.7-dbus-deprecated.patch	18 Jul 2006 22:50:20 -0000	1.3
@@ -0,0 +1,22 @@
+--- hal-0.5.7/tools/hal-device.c.dbus-deprecated	2005-11-02 10:38:14.000000000 -0500
++++ hal-0.5.7/tools/hal-device.c	2006-07-18 18:42:49.000000000 -0400
+@@ -155,7 +155,7 @@
+ 
+ 	libhal_ctx_shutdown(hal_ctx, &error);
+ 	libhal_ctx_free(hal_ctx);
+-	dbus_connection_disconnect(conn);
++	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 	dbus_error_free(&error);
+ 
+--- hal-0.5.7/tools/lshal.c.dbus-deprecated	2006-07-18 18:44:43.000000000 -0400
++++ hal-0.5.7/tools/lshal.c	2006-07-18 18:44:54.000000000 -0400
+@@ -701,7 +701,7 @@
+ 	libhal_ctx_shutdown (hal_ctx, &error);
+ 	libhal_ctx_free (hal_ctx);
+ 
+-	dbus_connection_disconnect (conn);
++	dbus_connection_close (conn);
+ 	dbus_connection_unref (conn);
+ 
+ 	if (show_device)



From fedora-cvs-commits at redhat.com  Tue Jul 18 23:06:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 19:06:33 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.118,1.119
Message-ID: <200607182306.k6IN6XBR017135@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17048

Modified Files:
	gnome-vfs2.spec 
Log Message:
- add another BR on dbus-glib-devel



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnome-vfs2.spec	18 Jul 2006 22:16:03 -0000	1.118
+++ gnome-vfs2.spec	18 Jul 2006 23:06:29 -0000	1.119
@@ -73,6 +73,7 @@
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
+Requires:   dbus-glib-devel >= %{dbus_glib_version}
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel



From fedora-cvs-commits at redhat.com  Tue Jul 18 23:11:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 19:11:46 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.18,1.19
Message-ID: <200607182311.k6INBkdF018503@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18398

Modified Files:
	gnome-mount.spec 
Log Message:
- Add BR from dbus-glib-devel



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-mount.spec	12 Jul 2006 05:59:54 -0000	1.18
+++ gnome-mount.spec	18 Jul 2006 23:11:43 -0000	1.19
@@ -1,20 +1,21 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 7.1 
+Release: 8 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Patch0: gnome-mount-0.4-drive-mount.patch
 Patch1: gnome-mount-0.4-no-media.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.31
+BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.90, dbus-glib-devel >= 0.70
 BuildRequires: gnome-keyring-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 Requires: hal >= 0.5.7
-Requires: dbus >= 0.60
+Requires: dbus >= 0.90
+Requires: dbus-glib >= 0.70
 
 %description
 A replacement for the mount, umount and eject commands that
@@ -67,6 +68,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-8
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4-7.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 18 23:35:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 19:35:56 -0400
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.132,1.133
Message-ID: <200607182335.k6INZuv2008454@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8370

Modified Files:
	gnome-panel.spec 
Log Message:
rev release



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gnome-panel.spec	18 Jul 2006 22:34:53 -0000	1.132
+++ gnome-panel.spec	18 Jul 2006 23:35:54 -0000	1.133
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 5.1
+Release: 6
 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



From fedora-cvs-commits at redhat.com  Tue Jul 18 23:50:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 19:50:28 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.15.3-dbus-deprecated.patch, NONE,
	1.1 gnome-vfs2.spec, 1.119, 1.120
Message-ID: <200607182350.k6INoSvw028323@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28268

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.15.3-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated function


gnome-vfs-2.15.3-dbus-deprecated.patch:
 daemon/daemon-connection.c            |    2 +-
 daemon/vfs-daemon.c                   |   10 +++++-----
 libgnomevfs/gnome-vfs-daemon-method.c |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE gnome-vfs-2.15.3-dbus-deprecated.patch ---
--- gnome-vfs-2.15.3/daemon/vfs-daemon.c.dbus-deprecated	2006-07-18 19:43:49.000000000 -0400
+++ gnome-vfs-2.15.3/daemon/vfs-daemon.c	2006-07-18 19:45:55.000000000 -0400
@@ -108,7 +108,7 @@
 		g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
 		dbus_error_free (&error);
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -119,7 +119,7 @@
 	if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
 		g_printerr ("VFS daemon already running, exiting.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -130,7 +130,7 @@
 	if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
 		g_printerr ("Not primary owner of the service, exiting.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		/* Remove this, it asserts:
 		   dbus_connection_unref (conn); */
 		conn = NULL;
@@ -149,7 +149,7 @@
 						   NULL)) {
 		g_printerr ("Failed to register object with D-BUS.\n");
 
-		dbus_connection_disconnect (conn);
+		dbus_connection_close (conn);
 		dbus_connection_unref (conn);
 		conn = NULL;
 
@@ -177,7 +177,7 @@
 		return;
 	}
 
-	dbus_connection_disconnect (conn);
+	dbus_connection_close (conn);
 	dbus_connection_unref (conn);
 }
 
--- gnome-vfs-2.15.3/daemon/daemon-connection.c.dbus-deprecated	2006-07-18 19:46:14.000000000 -0400
+++ gnome-vfs-2.15.3/daemon/daemon-connection.c	2006-07-18 19:46:29.000000000 -0400
@@ -218,7 +218,7 @@
 	d(g_print ("Connection destroy\n"));
 
 	if (dbus_connection_get_is_connected (conn->conn)) {
-		dbus_connection_disconnect (conn->conn);
+		dbus_connection_close (conn->conn);
 	}
 	dbus_connection_unref (conn->conn);
 
--- gnome-vfs-2.15.3/libgnomevfs/gnome-vfs-daemon-method.c.dbus-deprecated	2006-07-18 19:46:49.000000000 -0400
+++ gnome-vfs-2.15.3/libgnomevfs/gnome-vfs-daemon-method.c	2006-07-18 19:47:16.000000000 -0400
@@ -348,7 +348,7 @@
 {
 	LocalConnection *ret = data;
 
-	dbus_connection_disconnect (ret->connection);
+	dbus_connection_close (ret->connection);
 	dbus_connection_unref (ret->connection);
 	g_free (ret);
 }
@@ -391,7 +391,7 @@
 							   -1,
 							   &error);
 	dbus_message_unref (message);
-	dbus_connection_disconnect (main_conn);
+	dbus_connection_close (main_conn);
 	dbus_connection_unref (main_conn);
 	if (!reply) {
 		g_warning ("Error while getting peer-to-peer connection: %s",
@@ -421,7 +421,7 @@
 						   &connection_vtable,
 						   NULL)) {
 		g_warning ("Failed to register client object with the connection.");
-		dbus_connection_disconnect (private_conn);
+		dbus_connection_close (private_conn);
 		dbus_connection_unref (private_conn);
 		return NULL;
 	}


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnome-vfs2.spec	18 Jul 2006 23:06:29 -0000	1.119
+++ gnome-vfs2.spec	18 Jul 2006 23:50:26 -0000	1.120
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 3 
+Release: 4 
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -58,6 +58,8 @@
 
 Patch4:  gnome-vfs-2.15.1-use-sys-inotify.patch
 
+Patch5: gnome-vfs-2.15.3-dbus-deprecated.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -99,6 +101,8 @@
 
 %patch4 -p1 -b .use-sys-inotify
 
+%patch5 -p1 -b .dbus-deprecated
+
 # send to upstream
 %patch101 -p1 -b .schema_about
 
@@ -189,6 +193,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-4
+- Add patch to fix deprecated function
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-3
 - Add BR for dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:01:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:01:59 -0400
Subject: rpms/cups/devel cups.spec,1.227,1.228
Message-ID: <200607190001.k6J01xYN008343@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8281

Modified Files:
	cups.spec 
Log Message:
- Require a new version od D-Bus and rebuild






From fedora-cvs-commits at redhat.com  Wed Jul 19 00:11:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:11:38 -0400
Subject: rpms/control-center/devel control-center.spec,1.154,1.155
Message-ID: <200607190011.k6J0Bc2F008511@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8497

Modified Files:
	control-center.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- control-center.spec	13 Jul 2006 17:45:44 -0000	1.154
+++ control-center.spec	19 Jul 2006 00:11:24 -0000	1.155
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 2
+Release: 3 
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -89,7 +89,8 @@
 BuildRequires: libglade2-devel
 BuildRequires: libxml2-devel
 BuildRequires: hal-devel >= 0.5.6
-BuildRequires: dbus-devel >= 0.32
+BuildRequires: dbus-devel >= 0.90
+BuildRequires: dbus-glib-devel >= 0.70
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -245,6 +246,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-3
+- Add BR on dbus-glib-devel
+
 * Thu Jul 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-2
 - go to latest background capplet
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:20:39 -0400
Subject: rpms/pm-utils/devel pm-utils.spec,1.39,1.40
Message-ID: <200607190020.k6J0Kdsg023496@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23483

Modified Files:
	pm-utils.spec 
Log Message:
- Requirer a newer version of D-Bus and rebuild



Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pm-utils.spec	12 Jul 2006 07:50:17 -0000	1.39
+++ pm-utils.spec	19 Jul 2006 00:20:37 -0000	1.40
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.19
-Release: 1.1
+Release: 2 
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -24,7 +24,7 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: hal-devel pkgconfig pciutils-devel
-BuildRequires: dbus-devel >= 0.60
+BuildRequires: dbus-devel >= 0.90
 
 Patch1: vbetool-0.3-fix-gcc4bug.patch
 Patch2: vbetool-0.3-libpci.patch
@@ -114,6 +114,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-2
+- requier a newer version of D-Bus and rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.19-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:25:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:25:33 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.12,
	1.13
Message-ID: <200607190025.k6J0PXxD023605@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23592

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
- rebuild



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gstreamer-plugins-good.spec	12 Jul 2006 06:15:32 -0000	1.12
+++ gstreamer-plugins-good.spec	19 Jul 2006 00:25:31 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.3
-Release:  	2.1
+Release:  	3
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -180,6 +180,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.3-3
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:29:40 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.37,1.38
Message-ID: <200607190029.k6J0Te9Y023669@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23655

Modified Files:
	hal-cups-utils.spec 
Log Message:
- rebuild



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- hal-cups-utils.spec	12 Jul 2006 06:19:39 -0000	1.37
+++ hal-cups-utils.spec	19 Jul 2006 00:29:37 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.2
-Release: 1.1
+Release: 2 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -15,7 +15,7 @@
 BuildRequires: cups
 BuildRequires: cups-devel
 Requires: hal >= 0.5.0
-Requires: dbus >= 0.60
+Requires: dbus >= 0.90
 Requires: cups
 Requires: system-config-printer-libs
 
@@ -64,6 +64,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.2-2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.2-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:34:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:34:31 -0400
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.38,1.39
Message-ID: <200607190034.k6J0YV2E023783@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal-cups-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23755

Modified Files:
	hal-cups-utils.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- hal-cups-utils.spec	19 Jul 2006 00:29:37 -0000	1.38
+++ hal-cups-utils.spec	19 Jul 2006 00:34:29 -0000	1.39
@@ -11,7 +11,8 @@
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
 BuildRequires: hal-devel >= 0.5.0
-BuildRequires: dbus-devel >= 0.31
+BuildRequires: dbus-devel >= 0.90
+BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: cups
 BuildRequires: cups-devel
 Requires: hal >= 0.5.0



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:45:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:45:51 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.111,1.112
Message-ID: <200607190045.k6J0jpje005536@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4009

Modified Files:
	NetworkManager.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- NetworkManager.spec	12 Jul 2006 07:27:10 -0000	1.111
+++ NetworkManager.spec	19 Jul 2006 00:45:48 -0000	1.112
@@ -2,8 +2,9 @@
 
 %define cvs_snapshot 1
 
-%define hal_version		0.5.0
-%define dbus_version	0.60
+%define hal_version	0.5.0
+%define dbus_version	0.90
+%define dbus_glib_version 0.70
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
 %define bind_version 24:9.3.1-20
@@ -15,7 +16,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.1.1
+Release: 0%{?nm_cvs_version}.2
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -25,7 +26,7 @@
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
 Requires: caching-nameserver
@@ -35,6 +36,7 @@
 Requires: wpa_supplicant
 
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: wireless-tools >= %{wireless_tools_version}
 BuildRequires: glib2-devel gtk2-devel
@@ -66,7 +68,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
@@ -82,7 +84,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description devel
 This package contains various headers accessing some NetworkManager functionality
@@ -93,7 +95,7 @@
 Summary: Libraries for adding NetworkManager support to applications that use glib.
 Group: Development/Libraries
 Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 
 %description glib
 This package contains the libraries that make it easier to use some NetworkManager
@@ -212,6 +214,9 @@
 
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.2
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.0-0.cvs20060529.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:49:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:49:22 -0400
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.30,1.31
Message-ID: <200607190049.k6J0nMNb020154@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20094

Modified Files:
	dhcdbd.spec 
Log Message:
- rebuild



Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dhcdbd.spec	12 Jul 2006 05:36:05 -0000	1.30
+++ dhcdbd.spec	19 Jul 2006 00:49:20 -0000	1.31
@@ -10,7 +10,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
 Version:   1.15
-Release:   1.FC6.1
+Release:   1.FC6.2
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -18,7 +18,7 @@
 Source1:   dhcdbd.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  dhclient >= 3.0.2-12, dbus >= 0.6
-BuildRequires: dbus-devel >= 0.6
+BuildRequires: dbus-devel >= 0.90
 
 %description
 
@@ -92,6 +92,9 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.15-1.FC6.2
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.FC6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:52:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:52:39 -0400
Subject: rpms/dhcdbd/devel dhcdbd-1.15-dbus-deprecated.patch, NONE,
	1.1 dhcdbd.spec, 1.31, 1.32
Message-ID: <200607190052.k6J0qdqc021412@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21298

Modified Files:
	dhcdbd.spec 
Added Files:
	dhcdbd-1.15-dbus-deprecated.patch 
Log Message:
- Fix deprecated functions


dhcdbd-1.15-dbus-deprecated.patch:
 dbus_service.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dhcdbd-1.15-dbus-deprecated.patch ---
--- dhcdbd-1.15/dbus_service.c.dbus-deprecated	2006-07-18 20:50:02.000000000 -0400
+++ dhcdbd-1.15/dbus_service.c	2006-07-18 20:50:22.000000000 -0400
@@ -1412,7 +1412,7 @@
     return ( cs );
 
  give_up:
-    dbus_connection_disconnect( connection );
+    dbus_connection_close( connection );
     dbus_shutdown();
     return ( 0L );
 }
@@ -1456,7 +1456,7 @@
     cs->roots=0L;
 
 
-    dbus_connection_disconnect( cs->connection );
+    dbus_connection_close( cs->connection );
     dbus_shutdown();
     free( cs );
 }


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dhcdbd.spec	19 Jul 2006 00:49:20 -0000	1.31
+++ dhcdbd.spec	19 Jul 2006 00:52:36 -0000	1.32
@@ -16,6 +16,7 @@
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
 Source0:   %{name}-%{version}.tar.gz
 Source1:   dhcdbd.init
+Patch0: dhcdbd-1.15-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  dhclient >= 3.0.2-12, dbus >= 0.6
 BuildRequires: dbus-devel >= 0.90
@@ -24,6 +25,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-deprecated
+
 cp -fp %SOURCE1 RedHat/
 # Copy latest .spec file to RedHat source dir so that up-to-date %doc/CHANGES can be generated
 if [ -e %{_specdir}/%{name}.spec ]; then
@@ -93,7 +96,7 @@
 
 %changelog
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.15-1.FC6.2
-- rebuild
+- add dbus-deprecated patch
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.FC6.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 19 00:55:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 20:55:35 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.13,1.14
Message-ID: <200607190055.k6J0tZKA022602@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22485

Modified Files:
	libnotify.spec 
Log Message:
- Add BR on dbus-glib-devel



Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libnotify.spec	13 Jul 2006 20:20:18 -0000	1.13
+++ libnotify.spec	19 Jul 2006 00:55:33 -0000	1.14
@@ -4,14 +4,14 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.0
-Release: 2
+Release: 3 
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: libtool
-BuildRequires: glib2-devel >= %{glib2_version} dbus-devel gtk2-devel
+BuildRequires: glib2-devel >= %{glib2_version} dbus-devel dbus-glib-devel gtk2-devel
 Requires: glib2 >= %{glib2_version}
 Requires: desktop-notification-daemon
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3
+- Add BR on dbus-glib-devel
+
 * Wed Jul 13 2006 Jesse Keating <jkeating at redhat.com> - 0.4.0-2
 - rebuild
 - add missing brs



From fedora-cvs-commits at redhat.com  Wed Jul 19 01:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 21:24:35 -0400
Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.2,
	1.3 perl-IO-Socket-SSL.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200607190124.k6J1OZnR012728@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/perl-IO-Socket-SSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12677

Modified Files:
	.cvsignore perl-IO-Socket-SSL.spec sources 
Log Message:
0.991



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2006 15:47:06 -0000	1.2
+++ .cvsignore	19 Jul 2006 01:24:30 -0000	1.3
@@ -1 +1 @@
-IO-Socket-SSL-0.97.tar.gz
+IO-Socket-SSL-0.991.tar.gz


Index: perl-IO-Socket-SSL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-IO-Socket-SSL.spec	17 Jul 2006 15:47:06 -0000	1.1
+++ perl-IO-Socket-SSL.spec	19 Jul 2006 01:24:30 -0000	1.2
@@ -4,8 +4,8 @@
 #
 
 Name:           perl-IO-Socket-SSL
-Version:        0.97
-Release:        3%{?dist}
+Version:        0.991
+Release:        1%{?dist}
 Summary:        Perl library for transparent SSL
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Jul 18 2006 Warren Togami <wtogami at redhat.com> - 0.991-1
+- 0.991
+
 * Wed Jul 12 2006 Warren Togami <wtogami at redhat.com> - 0.97-3
 - import into FC6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Socket-SSL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2006 15:47:06 -0000	1.2
+++ sources	19 Jul 2006 01:24:30 -0000	1.3
@@ -1 +1 @@
-34562e9475de132faa0f14ca2be053a5  IO-Socket-SSL-0.97.tar.gz
+050767e4ef39f53b22aa8ffa6a32f6a3  IO-Socket-SSL-0.991.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 01:57:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 21:57:58 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec, 1.120, 1.121 sources, 1.35,
	1.36
Message-ID: <200607190157.k6J1vwip004490@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4111

Modified Files:
	gnome-vfs2.spec sources 
Log Message:
turn on selinux support again



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnome-vfs2.spec	18 Jul 2006 23:50:26 -0000	1.120
+++ gnome-vfs2.spec	19 Jul 2006 01:57:56 -0000	1.121
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 4 
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -45,6 +45,7 @@
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
+BuildRequires: libselinux-devel
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
@@ -193,6 +194,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-5
+- Add BR for libselinux-devel
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.3-4
 - Add patch to fix deprecated function
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	12 Jul 2006 15:05:12 -0000	1.35
+++ sources	19 Jul 2006 01:57:56 -0000	1.36
@@ -1,2 +1 @@
 f7eb8f2c658d6c8dfc34b5a2161e6890  gnome-vfs-2.15.3.tar.bz2
-b16f0db0482263be3318e269f52bb5b6  gnome-vfs-monikers-2.15.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 02:14:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 22:14:33 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.121,1.122
Message-ID: <200607190214.k6J2EXVi008530@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8160

Modified Files:
	gnome-vfs2.spec 
Log Message:
break dep cycle



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnome-vfs2.spec	19 Jul 2006 01:57:56 -0000	1.121
+++ gnome-vfs2.spec	19 Jul 2006 02:14:31 -0000	1.122
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 5
+Release: 5.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -21,7 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_version}
+#Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
@@ -194,6 +194,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-5.1
+- Temporarily break dependency cycle with gnome-mount
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-5
 - Add BR for libselinux-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 02:38:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 22:38:12 -0400
Subject: rpms/gdm/devel gdm-2.15.6-security-tokens.patch, 1.3, 1.4 gdm.spec,
	1.180, 1.181
Message-ID: <200607190238.k6J2cCTl030378@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30330

Modified Files:
	gdm-2.15.6-security-tokens.patch gdm.spec 
Log Message:
- add "kill all sessions on token removal" feature


gdm-2.15.6-security-tokens.patch:
 aclocal.m4                    |  239 +++++++++++
 config/Makefile.am            |   35 +
 config/gdm                    |   16 
 config/gdm-autologin          |   17 
 config/gdm-securitytokens     |   10 
 config/gdm.conf.in            |    7 
 config/securitytokens.conf.in |    5 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |  163 ++++++++
 daemon/gdmconfig.c            |   26 +
 daemon/gdmconfig.h            |    3 
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    5 
 17 files changed, 2132 insertions(+), 28 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdm-2.15.6-security-tokens.patch	18 Jul 2006 13:36:00 -0000	1.3
+++ gdm-2.15.6-security-tokens.patch	19 Jul 2006 02:38:06 -0000	1.4
@@ -1,3 +1,307 @@
+--- gdm-2.15.6/aclocal.m4
++++ gdm-2.15.6/aclocal.m4
+@@ -552,6 +552,228 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
+   AC_SUBST(WARN_CXXFLAGS)
+ ])
+ 
++dnl GNOME_DOC_INIT([MINIMUM-VERSION])
++
++AC_DEFUN([GNOME_DOC_INIT],
++[
++dnl Only apply the version check if we're not configuring ourselves!
++if test "x$PACKAGE" != "xgnome-doc-utils"; then
++  GDU_REQUIRED_VERSION=0.3.2
++  if test -n "$1"; then
++    GDU_REQUIRED_VERSION=$1
++  fi
++
++  PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION])
++fi
++
++AC_ARG_WITH([help-dir],
++  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
++  [with_help_dir='${datadir}/gnome/help'])
++HELP_DIR="$with_help_dir"
++AC_SUBST(HELP_DIR)
++
++AC_ARG_WITH([omf-dir],
++  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
++  [with_omf_dir='${datadir}/omf'])
++OMF_DIR="$with_omf_dir"
++AC_SUBST(OMF_DIR)
++
++AC_ARG_WITH([help-formats],
++  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
++  [with_help_formats=''])
++DOC_USER_FORMATS="$with_help_formats"
++AC_SUBST(DOC_USER_FORMATS)
++
++AC_ARG_ENABLE([scrollkeeper],
++	[AC_HELP_STRING([--disable-scrollkeeper],
++			[do not make updates to the scrollkeeper database])],,
++	enable_scrollkeeper=yes)
++AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
++
++])
++
++
++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
++# serial 35 IT_PROG_INTLTOOL
++AC_DEFUN([IT_PROG_INTLTOOL],
++[AC_PREREQ([2.50])dnl
++
++case "$am__api_version" in
++    1.[01234])
++	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
++    ;;
++    *)
++    ;;
++esac
++
++if test -n "$1"; then
++    AC_MSG_CHECKING(for intltool >= $1)
++
++    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
++    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++    ]
++    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
++    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
++	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
++fi
++
++  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
++     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
++      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
++    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++
++AC_SUBST(INTLTOOL_DESKTOP_RULE)
++AC_SUBST(INTLTOOL_DIRECTORY_RULE)
++AC_SUBST(INTLTOOL_KEYS_RULE)
++AC_SUBST(INTLTOOL_PROP_RULE)
++AC_SUBST(INTLTOOL_OAF_RULE)
++AC_SUBST(INTLTOOL_PONG_RULE)
++AC_SUBST(INTLTOOL_SERVER_RULE)
++AC_SUBST(INTLTOOL_SHEET_RULE)
++AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
++AC_SUBST(INTLTOOL_UI_RULE)
++AC_SUBST(INTLTOOL_XAM_RULE)
++AC_SUBST(INTLTOOL_KBD_RULE)
++AC_SUBST(INTLTOOL_XML_RULE)
++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
++AC_SUBST(INTLTOOL_CAVES_RULE)
++AC_SUBST(INTLTOOL_SCHEMAS_RULE)
++AC_SUBST(INTLTOOL_THEME_RULE)
++AC_SUBST(INTLTOOL_SERVICE_RULE)
++
++# Use the tools built into the package, not the ones that are installed.
++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
++
++AC_PATH_PROG(INTLTOOL_PERL, perl)
++if test -z "$INTLTOOL_PERL"; then
++   AC_MSG_ERROR([perl not found; required for intltool])
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++   AC_MSG_ERROR([perl 5.x required for intltool])
++fi
++if test "x$2" != "xno-xml"; then
++   AC_MSG_CHECKING([for XML::Parser])
++   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++       AC_MSG_RESULT([ok])
++   else
++       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++   fi
++fi
++
++AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
++AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
++AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
++AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
++
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++AC_SUBST(ALL_LINGUAS)
++    
++IT_PO_SUBDIR([po])
++
++dnl The following is very similar to
++dnl
++dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
++dnl
++dnl with the following slight differences:
++dnl  - the *.in files are in ac_aux_dir,
++dnl  - if the file haven't changed upon reconfigure, it's not touched,
++dnl  - the evaluation of the third parameter enables a hack which computes
++dnl    the actual value of $libdir,
++dnl  - the user sees "executing intltool commands", instead of
++dnl    "creating intltool-extract" and such.
++dnl
++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
++dnl a reason for it.
++
++AC_CONFIG_COMMANDS([intltool], [
++
++for file in intltool-extract intltool-merge intltool-update; do
++  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
++      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
++      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
++      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
++      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
++      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
++      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
++	< ${ac_aux_dir}/${file}.in > ${file}.out
++  if cmp -s ${file} ${file}.out 2>/dev/null; then
++    rm -f ${file}.out
++  else
++    mv -f ${file}.out ${file}
++  fi
++  chmod ugo+x ${file}
++  chmod u+w ${file}
++done
++
++],
++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
++INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
++INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
++
++])
++
++
++# IT_PO_SUBDIR(DIRNAME)
++# ---------------------
++# All po subdirs have to be declared with this macro; the subdir "po" is
++# declared by IT_PROG_INTLTOOL.
++#
++AC_DEFUN([IT_PO_SUBDIR],
++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
++dnl
++dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl of config.status.
++AC_CONFIG_COMMANDS_PRE([
++  AC_CONFIG_COMMANDS([$1/stamp-it], [
++    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
++    >"$1/stamp-it.tmp"
++    [sed '/^#/d
++	 s/^[[].*] *//
++	 /^[ 	]*$/d
++	'"s|^|	$ac_top_srcdir/|" \
++      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
++    ]
++    if test ! -f "$1/Makefile"; then
++      AC_MSG_ERROR([$1/Makefile is not ready.])
++    fi
++    mv "$1/Makefile" "$1/Makefile.tmp"
++    [sed '/^POTFILES =/,/[^\\]$/ {
++		/^POTFILES =/!d
++		r $1/POTFILES
++	  }
++	 ' "$1/Makefile.tmp" >"$1/Makefile"]
++    rm -f "$1/Makefile.tmp"
++    mv "$1/stamp-it.tmp" "$1/stamp-it"
++  ])
++])dnl
++])
++
++
++# deprecated macros
++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
++# A hint is needed for aclocal from Automake <= 1.9.4:
++# AC_DEFUN([AC_PROG_INTLTOOL], ...)
++
++
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+ # serial 48 AC_PROG_LIBTOOL
+@@ -2138,7 +2360,7 @@ linux*)
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+   fi
+ 
+@@ -4846,6 +5068,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ # Is the compiler the GNU C compiler?
+ with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ 
++gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
++gcc_ver=\`gcc -dumpversion\`
++
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+ 
+@@ -4979,11 +5204,11 @@ striplib=$lt_striplib
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+@@ -4995,7 +5220,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $
+ 
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+@@ -5075,7 +5300,7 @@ # Whether libtool must link a program ag
+ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ 
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+ 
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -6911,6 +7136,7 @@ do
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -6943,6 +7169,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+@@ -7981,5 +8208,3 @@ AC_SUBST([am__tar])
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+ 
+-m4_include([m4/gnome-doc-utils.m4])
+-m4_include([m4/intltool.m4])
 --- gdm-2.15.6/config/Makefile.am
 +++ gdm-2.15.6/config/Makefile.am
 @@ -26,6 +26,7 @@ EXTRA_DIST = \
@@ -159,11 +463,12 @@
 new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/config/securitytokens.conf.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,5 @@
 +[SecurityTokens]
 +Enable=true
 +#Driver=@libdir@/pkcs11/libcoolkeypk11.so
 +#PamStack=gdm-securitytokens
++#KillSessionOnRemove=false
 --- gdm-2.15.6/configure.ac
 +++ gdm-2.15.6/configure.ac
 @@ -19,6 +19,7 @@ LIBRSVG_REQUIRED=1.1.1
@@ -225,7 +530,7 @@
  extern GSList *displays;
  
  /* Local functions */
-@@ -80,6 +83,16 @@ static void gdm_handle_message (GdmConne
+@@ -80,6 +83,17 @@ static void gdm_handle_message (GdmConne
  static void gdm_handle_user_message (GdmConnection *conn,
  				     const gchar *msg,
  				     gpointer data);
@@ -236,13 +541,14 @@
 +						 ScSecurityToken *token,
 +						 const gchar     *pam_stack);
 +static void gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+					       ScSecurityToken *token);
++					       ScSecurityToken *token,
++					       gboolean should_restart);
 +static void gdm_watch_for_security_tokens (void);
 +
  static void gdm_daemonify (void);
  static void gdm_safe_restart (void);
  static void gdm_try_logout_action (GdmDisplay *disp);
-@@ -150,7 +163,6 @@ static GMainLoop *main_loop = NULL;
+@@ -150,7 +164,6 @@ static GMainLoop *main_loop = NULL;
  
  static gboolean monte_carlo_sqrt2 = FALSE;
  
@@ -250,7 +556,7 @@
  /*
   * lookup display number if the display number is
   * exists then clear the remove flag and return TRUE
-@@ -1402,6 +1414,8 @@ main (int argc, char *argv[])
+@@ -1402,6 +1415,8 @@ main (int argc, char *argv[])
      /* Initialize runtime environment */
      umask (022);
  
@@ -259,7 +565,7 @@
      ctx = g_option_context_new (_("- The GNOME login manager"));
      g_option_context_add_main_entries (ctx, options, _("main options"));
  
-@@ -1639,6 +1653,9 @@ #endif  /* HAVE_LOGINDEVPERM */
+@@ -1639,6 +1654,9 @@ #endif  /* HAVE_LOGINDEVPERM */
  	gdm_xdmcp_run ();
      }
  
@@ -269,7 +575,7 @@
      /* We always exit via exit (), and sadly we need to g_main_quit ()
       * at times not knowing if it's this main or a recursive one we're
       * quitting.
-@@ -3429,4 +3446,133 @@ #endif
+@@ -3429,4 +3447,147 @@ #endif
  	}
  }
  
@@ -325,10 +631,17 @@
 +
 +static void
 +gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+				   ScSecurityToken        *token)
++				   ScSecurityToken        *token,
++				   gboolean                should_restart)
 +{
-+    gdm_debug ("notifying local displays about token removal");
-+    gdm_reset_pam ();
++    /* FIXME: should only kill the session associated with the token
++     */
++    if (should_restart) {
++	    gdm_restart_now ();
++    } else {
++	    gdm_debug ("notifying local displays about token removal");
++	    gdm_reset_pam ();
++    }
 +}
 +
 +#ifndef GDM_SECURITY_TOKENS_CONF
@@ -347,12 +660,17 @@
 +#define GDM_SECURITY_TOKENS_KEY_PAM_STACK "SecurityTokens/PamStack=gdm-securitytokens" 
 +#endif
 +
++#ifndef GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE
++#define GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE "SecurityTokens/KillSessionOnRemove=false"
++#endif
++
 +static void
 +gdm_watch_for_security_tokens (void)
 +{
 +    GError *error;
 +    ScSecurityTokenMonitor *monitor;
 +    gchar *driver, *pam_stack;
++    gboolean should_restart;
 +    VeConfig *cfg;
 +
 +    cfg = ve_config_new (GDM_SECURITY_TOKENS_CONF);
@@ -380,10 +698,12 @@
 +		      pam_stack);
 +    g_object_weak_ref (G_OBJECT (monitor), (GWeakNotify) g_free, pam_stack);
 +
++    should_restart = ve_config_get_bool (cfg,
++					 GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE);
 +    g_signal_connect (monitor,
 +		      "security-token-removed",
 +		      G_CALLBACK (gdm_handle_security_token_removal), 
-+		      NULL);
++		      GINT_TO_POINTER (should_restart));
 +
 +    error = NULL;
 +    if (!sc_security_token_monitor_start (monitor, &error)) {
@@ -403,27 +723,6 @@
 +    ve_config_destroy (cfg);
 +}
  /* EOF */
---- gdm-2.15.6/daemon/gdm.h
-+++ gdm-2.15.6/daemon/gdm.h
-@@ -272,6 +272,10 @@ #define GDM_KEY_CONSOLE_CANNOT_HANDLE "d
- /* How long to wait before assuming an Xserver has timed out */
- #define GDM_KEY_XSERVER_TIMEOUT "daemon/GdmXserverTimeout=10"
- 
-+/* security token bits */
-+#define GDM_KEY_SECURITY_TOKENS_ENABLE "daemon/SecurityTokensEnable=true"
-+#define GDM_KEY_SECURITY_TOKENS_DRIVER "daemon/SecurityTokensDriver=" 
-+
- /* Per server definitions */
- #define GDM_KEY_SERVER_PREFIX "server-"
- #define GDM_KEY_SERVER_NAME "name=Standard server"
-@@ -296,6 +300,7 @@ #define GDM_KEY_CHECK_DIR_OWNER "securit
- #define GDM_KEY_RETRY_DELAY "security/RetryDelay=1"
- #define GDM_KEY_DISALLOW_TCP "security/DisallowTCP=true"
- #define GDM_KEY_PAM_STACK "security/PamStack=gdm"
-+#define GDM_KEY_SECURITY_TOKENS_PAM_STACK "security/SecurityTokensPamStack=gdm-securitytokens" 
- 
- #define GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS "security/NeverPlaceCookiesOnNFS=true"
- #define GDM_KEY_PASSWORD_REQUIRED "security/PasswordRequired=false"
 --- gdm-2.15.6/daemon/gdmconfig.c
 +++ gdm-2.15.6/daemon/gdmconfig.c
 @@ -1432,6 +1432,32 @@ gdm_set_value (VeConfig *cfg, GdmConfigT


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- gdm.spec	18 Jul 2006 13:36:29 -0000	1.180
+++ gdm.spec	19 Jul 2006 02:38:06 -0000	1.181
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 8
+Release: 9
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -329,6 +329,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-9
+- add "kill all sessions on token removal" feature
+
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-8
 - reenable session keyring support in pam module (bug 198629)
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 02:40:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 22:40:20 -0400
Subject: rpms/squirrelmail/devel squirrelmail-1.4.7-ja-translate.patch, NONE,
	1.1 squirrelmail.spec, 1.42,
	1.43 squirrelmail-1.4.7-check-mail.ja.patch, 1.1, NONE
Message-ID: <200607190240.k6J2eKct031143@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31024

Modified Files:
	squirrelmail.spec 
Added Files:
	squirrelmail-1.4.7-ja-translate.patch 
Removed Files:
	squirrelmail-1.4.7-check-mail.ja.patch 
Log Message:
More JP translation updates (#194598)


squirrelmail-1.4.7-ja-translate.patch:
 squirrelmail.po |   64 +++++++++++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 40 deletions(-)

--- NEW FILE squirrelmail-1.4.7-ja-translate.patch ---
--- squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po.orig	2006-07-18 22:21:11.000000000 -0400
+++ squirrelmail-1.4.7/locale_tempdir/locale/ja_JP/LC_MESSAGES/squirrelmail.po	2006-07-18 21:49:48.000000000 -0400
@@ -1,16 +1,17 @@
 # Japanese (ja_JP) SquirrelMail Translation
 # Copyright (c) 1999-2006 The SquirrelMail Project Team
 # This file is distributed under the same license as the SquirrelMail package.
-# HIGASHIYAMA Masato <masato at yamaai-tech.com>, 2002, 2003.
 # Andre Nicholson <andre at neo-anime.org> 2005-2006.
 # $Id: squirrelmail.po,v 1.7 2006/03/03 22:02:20 jervfors Exp $
+# HIGASHIYAMA Masato <masato at yamaai-tech.com>, 2002, 2003.
+# Noriko Mizumoto <noriko at redhat.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: SquirrelMail HEAD\n"
+"Project-Id-Version: squirrelmail\n"
 "POT-Creation-Date: 2006-02-21 06:50+0100\n"
-"PO-Revision-Date: 2006-03-03 22:42+0100\n"
-"Last-Translator: Andre Nicholson <andre at neo-anime.org>\n"
-"Language-Team: Japanese <squirrelmail-i18n at lists.sourceforge.net>\n"
+"PO-Revision-Date: 2006-07-18 13:27+1000\n"
+"Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
+"Language-Team: Japanese <doc-i18n-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -398,7 +399,7 @@
 msgstr "??????????????"
 
 msgid "Check mail"
-msgstr "????????????????????"
+msgstr "????????????"
 
 msgid "Login"
 msgstr "????????"
@@ -610,17 +611,13 @@
 "you, such as the colors, the language, and other settings."
 msgstr "SquirrelMail ??????????????????????????????????????????????"
 
-#, fuzzy
 msgid ""
 "Based upon given criteria, incoming messages can have different background "
 "colors in the message list. This helps to easily distinguish who the "
 "messages are from, especially for mailing lists."
-msgstr ""
-"????????????????????????????????????????????????????????????????????????????"
-"??????????????????????????????????????????????????????????????"
+msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
 
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
+msgid "These settings change the way your folders are displayed and manipulated."
 msgstr "??????????????????????????????"
 
 msgid ""
@@ -833,8 +830,7 @@
 msgid "Viewing a text attachment"
 msgstr "????????????????????????????"
 
-msgid ""
-"Could not include PEAR database functions required for the database backend."
+msgid "Could not include PEAR database functions required for the database backend."
 msgstr ""
 
 #, php-format
@@ -2431,8 +2427,7 @@
 "??????"
 
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
-msgstr ""
-"??????Five-Ten-sg.com????????????????????????????????????????????????????"
+msgstr "??????Five-Ten-sg.com????????????????????????????????????????????????????"
 
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
 msgstr "??????Five-Ten-sg.com????????????????????????"
@@ -2536,8 +2531,7 @@
 "??????????????????????????????"
 
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
-msgstr ""
-"?????????????????????????????????????????????????????????????????????????? IP"
+msgstr "?????????????????????????????????????????????????????????????????????????? IP"
 
 msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
 msgstr ""
@@ -2551,8 +2545,7 @@
 msgid "WARNING! You must enter something to search for."
 msgstr ""
 
-msgid ""
-"WARNING! Header filters should be of the format &quot;Header: value&quot;"
+msgid "WARNING! Header filters should be of the format &quot;Header: value&quot;"
 msgstr ""
 
 msgid "Saved Scan type"
@@ -3418,8 +3411,7 @@
 msgid "You must make a choice"
 msgstr "????????????????????????"
 
-msgid ""
-"You can either delete your dictionary or type in the old password. Not both."
+msgid "You can either delete your dictionary or type in the old password. Not both."
 msgstr ""
 "????????????????????????????????????????????????????????????????????????????"
 "????????"
@@ -3581,8 +3573,7 @@
 "strong>????????????????????"
 
 #, fuzzy
-msgid ""
-"Your personal dictionary has been decrypted and is now stored as plain text."
+msgid "Your personal dictionary has been decrypted and is now stored as plain text."
 msgstr ""
 "??????????????????<strong>????</strong>????????????<strong>????</strong>????"
 "????????????????????"
@@ -3645,8 +3636,7 @@
 "old password in order to re-encrypt the dictionary with a new key."
 msgstr ""
 
-msgid ""
-"Please decrypt my personal dictionary and store it in a clear-text format."
+msgid "Please decrypt my personal dictionary and store it in a clear-text format."
 msgstr "????????????????????????????????????????????????????"
 
 msgid "Change crypto settings"
@@ -3685,8 +3675,7 @@
 "????????????????????????????????????????????????????????????????????????????"
 "????????????????????????????????????</p>"
 
-msgid ""
-"Please encrypt my personal dictionary and store it in an encrypted format."
+msgid "Please encrypt my personal dictionary and store it in an encrypted format."
 msgstr "??????????????????????????????????????"
 
 #, fuzzy, php-format
@@ -3715,13 +3704,11 @@
 
 #, fuzzy, php-format
 msgid "Settings adjusted to: %s with %s as default dictionary."
-msgstr ""
-"????????????????<strong>%s</strong> ?? <strong>%s</strong> ??????????????????"
+msgstr "????????????????<strong>%s</strong> ?? <strong>%s</strong> ??????????????????"
 
 #, fuzzy, php-format
 msgid "Using %s dictionary (system default) for spellcheck."
-msgstr ""
-"???????????????? <strong>%s</strong> ????????????????????????????????????????"
+msgstr "???????????????? <strong>%s</strong> ????????????????????????????????????????"
 
 msgid "International Dictionaries Preferences Updated"
 msgstr "??????????????????????"
@@ -4611,8 +4598,7 @@
 msgid "Incorrect LDAP connection option: %s"
 msgstr ""
 
-msgid ""
-"Current PHP LDAP extension does not allow use of ldap_set_option() function."
+msgid "Current PHP LDAP extension does not allow use of ldap_set_option() function."
 msgstr ""
 
 #, fuzzy
@@ -4691,12 +4677,10 @@
 msgid "MD5 is not supported by webserver's system crypt library."
 msgstr ""
 
-msgid ""
-"Extended DES crypt is not supported by webserver's system crypt library."
+msgid "Extended DES crypt is not supported by webserver's system crypt library."
 msgstr ""
 
-msgid ""
-"Standard DES crypt is not supported by webserver's system crypt library."
+msgid "Standard DES crypt is not supported by webserver's system crypt library."
 msgstr ""
 
 msgid "PHP Curl extension is NOT available! Unable to change password!"
@@ -4970,8 +4954,7 @@
 
 #, fuzzy, php-format
 msgid "Using %s dictionary for spellcheck."
-msgstr ""
-"???????????????? <strong>%s</strong> ????????????????????????????????????????"
+msgstr "???????????????? <strong>%s</strong> ????????????????????????????????????????"
 
 #, fuzzy
 msgid "Translation Theme:"
@@ -5043,3 +5026,4 @@
 
 msgid "This image has been removed for security reasons"
 msgstr ""
+


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- squirrelmail.spec	11 Jul 2006 03:33:47 -0000	1.42
+++ squirrelmail.spec	19 Jul 2006 02:40:18 -0000	1.43
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.7
-Release: 4.fc6
+Release: 5.fc6
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -21,7 +21,7 @@
 Patch2:  squirrelmail-1.4.6-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
-Patch5:  squirrelmail-1.4.7-check-mail.ja.patch
+Patch5:  squirrelmail-1.4.7-ja-translate.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -248,6 +248,9 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Tue Jul 18 2006 Warren Togami <wtogami at redhat.com> 1.4.7-5
+- More JP translation updates (#194598)
+
 * Mon Jul 10 2006 Warren Togami <wtogami at redhat.com> 1.4.7-4
 - Fix fatal typo in config_local.php (#198306)
 


--- squirrelmail-1.4.7-check-mail.ja.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 02:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 22:44:18 -0400
Subject: rpms/eclipse/devel eclipse-ecj-gcj.patch, NONE, 1.1 eclipse.spec,
	1.297, 1.298
Message-ID: <200607190244.k6J2iIC8032604@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32469

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-ecj-gcj.patch 
Log Message:
* Tue Jul 18 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_4fc
- Add patch from Tom Tromey for ecj-gcj branch of gcj.
- Fix SWT symlinks.


eclipse-ecj-gcj.patch:
 GCCMain.java |  442 ++++++++++++++++++++++++++++++++++++
 Main.java    |  708 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 829 insertions(+), 321 deletions(-)

--- NEW FILE eclipse-ecj-gcj.patch ---
Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
retrieving revision 1.254
diff -u -r1.254 Main.java
--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java	2 May 2006 13:45:31 -0000	1.254
+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java	18 Jul 2006 22:46:41 -0000
@@ -1392,6 +1392,391 @@
 }
 
 /*
+Handle a single warning token.
+*/
+protected void handleWarningToken(String token, boolean isEnabling,
+		boolean useEnableJavadoc) throws InvalidInputException {
+	if (token.equals("constructorName")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportMethodWithConstructorName,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportHiddenCatchBlock,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("deprecation")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecation, 
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, 
+			CompilerOptions.DISABLED);
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, 
+			CompilerOptions.DISABLED);						
+	} else if (token.equals("allDeprecation")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecation, 
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, 
+			isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
+		this.options.put(
+			CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, 
+			isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
+	} else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedLocal, 
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedParameter,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedImport,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedPrivateMember,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unusedLabel")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedLabel,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("localHiding")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportLocalVariableHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("fieldHiding")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportFieldHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("specialParamHiding")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportSpecialParameterHidingField,
+			isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
+	} else if (token.equals("conditionAssign")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		} else if (token.equals("syntheticAccess") //$NON-NLS-1$
+				|| token.equals("synthetic-access")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportSyntheticAccessEmulation,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("nls")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNonExternalizedStringLiteral,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("staticReceiver")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("indirectStatic")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportIndirectStaticAccess,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("noEffectAssign")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNoEffectAssignment,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNoImplicitStringConversion,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("semicolon")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportEmptyStatement,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("serial")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportMissingSerialVersion,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("emptyBlock")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportUndocumentedEmptyBlock,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnnecessaryTypeCheck,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportUncheckedTypeOperation,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("raw")) {//$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportRawTypeReference,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("finalBound")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportFinalParameterBound,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("suppress")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_SuppressWarnings,
+			isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
+	} else if (token.equals("warningToken")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnhandledWarningToken,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$ 
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnnecessaryElse,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("javadoc")) {//$NON-NLS-1$ 
+		if (!useEnableJavadoc) {
+			this.options.put(
+				CompilerOptions.OPTION_DocCommentSupport,
+				isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
+		}
+		// if disabling then it's not necessary to set other javadoc options
+		if (isEnabling) {
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadoc,
+				CompilerOptions.WARNING);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTags,
+				CompilerOptions.ENABLED);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef,
+				CompilerOptions.DISABLED);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef,
+				CompilerOptions.DISABLED);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
+				CompilerOptions.PRIVATE);
+			this.options.put(
+				CompilerOptions.OPTION_ReportMissingJavadocTags,
+				CompilerOptions.WARNING);
+			this.options.put(
+				CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
+				CompilerOptions.PRIVATE);
+		}
+	} else if (token.equals("allJavadoc")) { //$NON-NLS-1$
+		if (!useEnableJavadoc) {
+			this.options.put(
+				CompilerOptions.OPTION_DocCommentSupport,
+				isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
+		}
+		// if disabling then it's not necessary to set other javadoc options
+		if (isEnabling) {
+			this.options.put(
+			CompilerOptions.OPTION_ReportInvalidJavadoc,
+			CompilerOptions.WARNING);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTags,
+				CompilerOptions.ENABLED);
+			this.options.put(
+				CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
+				CompilerOptions.PRIVATE);
+			this.options.put(
+				CompilerOptions.OPTION_ReportMissingJavadocTags,
+				CompilerOptions.WARNING);
+			this.options.put(
+				CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
+				CompilerOptions.PRIVATE);
+			this.options.put(
+				CompilerOptions.OPTION_ReportMissingJavadocComments,
+				CompilerOptions.WARNING);
+		}
+	} else if (token.startsWith("tasks")) { //$NON-NLS-1$
+		String taskTags = ""; //$NON-NLS-1$
+		int start = token.indexOf('(');
+		int end = token.indexOf(')');
+		if (start >= 0 && end >= 0 && start < end){
+			taskTags = token.substring(start+1, end).trim();
+			taskTags = taskTags.replace('|',',');
+		}
+		if (taskTags.length() == 0){
+			throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$
+		}
+		this.options.put(
+			CompilerOptions.OPTION_TaskTags,
+			isEnabling ? taskTags : "");  //$NON-NLS-1$
+	} else if (token.equals("assertIdentifier")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportAssertIdentifier,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("enumIdentifier")) { //$NON-NLS-1$
+		this.options.put(
+				CompilerOptions.OPTION_ReportEnumIdentifier,
+				isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("finally")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unusedThrown")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unqualifiedField") //$NON-NLS-1$
+			|| token.equals("unqualified-field-access")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnqualifiedFieldAccess,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("typeHiding")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportTypeParameterHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("varargsCast")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportVarargsArgumentNeedCast,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("null")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNullReference,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("boxing")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportAutoboxing,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("over-ann")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportMissingOverrideAnnotation,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("dep-ann")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("intfAnnotation")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportAnnotationSuperInterface,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("enumSwitch") //$NON-NLS-1$
+			|| token.equals("incomplete-switch")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportIncompleteEnumSwitch,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
+	} else if (token.equals("hiding")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportHiddenCatchBlock,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportLocalVariableHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportFieldHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportTypeParameterHiding,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("static-access")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportIndirectStaticAccess,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("unused")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedLocal, 
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedParameter,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedImport,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedPrivateMember,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+			CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+		this.options.put(
+				CompilerOptions.OPTION_ReportUnusedLabel,
+				isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("paramAssign")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportParameterAssignment,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("discouraged")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportDiscouragedReference,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("forbidden")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportForbiddenReference,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else if (token.equals("fallthrough")) { //$NON-NLS-1$
+		this.options.put(
+			CompilerOptions.OPTION_ReportFallthroughCase,
+			isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
+	} else {
+		throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$
+	}
+}
+
+/*
+Handle extdirs processing
+*/
+protected ArrayList handleExtdirs(ArrayList extdirsClasspaths) {
+ 	final File javaHome = getJavaHome();
+	final int DEFAULT_SIZE_CLASSPATH = 4;
+
+	/*
+	 * Feed endorsedDirClasspath according to:
+	 * - -extdirs first if present;
+	 * - else java.ext.dirs if defined;
+	 * - else default extensions directory for the platform.
+	 */
+	if (extdirsClasspaths == null) {
+		extdirsClasspaths = new ArrayList(DEFAULT_SIZE_CLASSPATH);
+		String extdirsStr = System.getProperty("java.ext.dirs"); //$NON-NLS-1$
+		if (extdirsStr == null) {
+			extdirsClasspaths.add(javaHome.getAbsolutePath() + "/lib/ext"); //$NON-NLS-1$
+		} else {
+			StringTokenizer tokenizer = new StringTokenizer(extdirsStr, File.pathSeparator);
+			while (tokenizer.hasMoreTokens()) 
+				extdirsClasspaths.add(tokenizer.nextToken());
+		}
+	}
+	
+	/*
+	 * Feed extdirsClasspath with the entries found into the directories listed by
+	 * extdirsNames.
+	 */
+	if (extdirsClasspaths.size() != 0) {
+		File[] directoriesToCheck = new File[extdirsClasspaths.size()];
+		for (int i = 0; i < directoriesToCheck.length; i++) 
+			directoriesToCheck[i] = new File((String) extdirsClasspaths.get(i));
+		extdirsClasspaths.clear();
+		File[][] extdirsJars = getLibrariesFiles(directoriesToCheck);
+		if (extdirsJars != null) {
+			for (int i = 0, max = extdirsJars.length; i < max; i++) {
+				File[] current = extdirsJars[i];
+				if (current != null) {
+					for (int j = 0, max2 = current.length; j < max2; j++) {
+						FileSystem.Classpath classpath = 
+							FileSystem.getClasspath(
+									current[j].getAbsolutePath(),
+									null, null); 
+						if (classpath != null) {
+							extdirsClasspaths.add(classpath);
+						}
+					}
+				} else if (directoriesToCheck[i].isFile()) {
+					this.logger.logIncorrectExtDirsEntry(directoriesToCheck[i].getAbsolutePath());
+				}
+			}
+		}
+	}
+	
+	return extdirsClasspaths;
+}
+
+/*
 Decode the command line arguments 
  */
 public void configure(String[] argv) throws InvalidInputException {
@@ -1848,326 +2233,7 @@
 					while (tokenizer.hasMoreTokens()) {
 						String token = tokenizer.nextToken();
 						tokenCounter++;
-						if (token.equals("constructorName")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportMethodWithConstructorName,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportHiddenCatchBlock,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("deprecation")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecation, 
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, 
-								CompilerOptions.DISABLED);
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, 
-								CompilerOptions.DISABLED);						
-						} else if (token.equals("allDeprecation")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecation, 
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, 
-								isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-							this.options.put(
-								CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, 
-								isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-						} else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedLocal, 
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedParameter,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedImport,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedPrivateMember,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unusedLabel")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedLabel,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("localHiding")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportLocalVariableHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("fieldHiding")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportFieldHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("specialParamHiding")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportSpecialParameterHidingField,
-								isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-						} else if (token.equals("conditionAssign")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-	   					} else if (token.equals("syntheticAccess") //$NON-NLS-1$
-	   							|| token.equals("synthetic-access")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportSyntheticAccessEmulation,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("nls")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNonExternalizedStringLiteral,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("staticReceiver")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("indirectStatic")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportIndirectStaticAccess,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("noEffectAssign")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNoEffectAssignment,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNoImplicitStringConversion,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("semicolon")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportEmptyStatement,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("serial")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportMissingSerialVersion,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("emptyBlock")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportUndocumentedEmptyBlock,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnnecessaryTypeCheck,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportUncheckedTypeOperation,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("raw")) {//$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportRawTypeReference,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("finalBound")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportFinalParameterBound,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("suppress")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_SuppressWarnings,
-								isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-						} else if (token.equals("warningToken")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnhandledWarningToken,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$ 
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnnecessaryElse,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("javadoc")) {//$NON-NLS-1$ 
-							if (!useEnableJavadoc) {
-								this.options.put(
-									CompilerOptions.OPTION_DocCommentSupport,
-									isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-							}
-							// if disabling then it's not necessary to set other javadoc options
-							if (isEnabling) {
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadoc,
-									CompilerOptions.WARNING);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTags,
-									CompilerOptions.ENABLED);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef,
-									CompilerOptions.DISABLED);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef,
-									CompilerOptions.DISABLED);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-									CompilerOptions.PRIVATE);
-								this.options.put(
-									CompilerOptions.OPTION_ReportMissingJavadocTags,
-									CompilerOptions.WARNING);
-								this.options.put(
-									CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-									CompilerOptions.PRIVATE);
-							}
-						} else if (token.equals("allJavadoc")) { //$NON-NLS-1$
-							if (!useEnableJavadoc) {
-								this.options.put(
-									CompilerOptions.OPTION_DocCommentSupport,
-									isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-							}
-							// if disabling then it's not necessary to set other javadoc options
-							if (isEnabling) {
-								this.options.put(
-								CompilerOptions.OPTION_ReportInvalidJavadoc,
-								CompilerOptions.WARNING);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTags,
-									CompilerOptions.ENABLED);
-								this.options.put(
-									CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-									CompilerOptions.PRIVATE);
-								this.options.put(
-									CompilerOptions.OPTION_ReportMissingJavadocTags,
-									CompilerOptions.WARNING);
-								this.options.put(
-									CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-									CompilerOptions.PRIVATE);
-								this.options.put(
-									CompilerOptions.OPTION_ReportMissingJavadocComments,
-									CompilerOptions.WARNING);
-							}
-						} else if (token.startsWith("tasks")) { //$NON-NLS-1$
-							String taskTags = ""; //$NON-NLS-1$
-							int start = token.indexOf('(');
-							int end = token.indexOf(')');
-							if (start >= 0 && end >= 0 && start < end){
-								taskTags = token.substring(start+1, end).trim();
-								taskTags = taskTags.replace('|',',');
-							}
-							if (taskTags.length() == 0){
-								throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$
-							}
-							this.options.put(
-								CompilerOptions.OPTION_TaskTags,
-								isEnabling ? taskTags : "");  //$NON-NLS-1$
-						} else if (token.equals("assertIdentifier")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportAssertIdentifier,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("enumIdentifier")) { //$NON-NLS-1$
-							this.options.put(
-									CompilerOptions.OPTION_ReportEnumIdentifier,
-									isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("finally")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unusedThrown")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unqualifiedField") //$NON-NLS-1$
-								|| token.equals("unqualified-field-access")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnqualifiedFieldAccess,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("typeHiding")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportTypeParameterHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("varargsCast")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportVarargsArgumentNeedCast,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("null")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNullReference,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("boxing")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportAutoboxing,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("over-ann")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportMissingOverrideAnnotation,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("dep-ann")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("intfAnnotation")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportAnnotationSuperInterface,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("enumSwitch") //$NON-NLS-1$
-								|| token.equals("incomplete-switch")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportIncompleteEnumSwitch,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);						
-						} else if (token.equals("hiding")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportHiddenCatchBlock,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportLocalVariableHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportFieldHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportTypeParameterHiding,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("static-access")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportIndirectStaticAccess,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("unused")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedLocal, 
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedParameter,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedImport,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedPrivateMember,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-								CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-							this.options.put(
-									CompilerOptions.OPTION_ReportUnusedLabel,
-									isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("paramAssign")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportParameterAssignment,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("discouraged")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportDiscouragedReference,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("forbidden")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportForbiddenReference,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else if (token.equals("fallthrough")) { //$NON-NLS-1$
-							this.options.put(
-								CompilerOptions.OPTION_ReportFallthroughCase,
-								isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-						} else {
-							throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$
-						}
+						handleWarningToken(token, isEnabling, useEnableJavadoc);
 					}
 					if (tokenCounter == 0)
 						throw new InvalidInputException(
@@ -2708,7 +2774,7 @@
 		this.timesCounter = 0;
 	}
 }
-private void disableWarnings() {
+protected void disableWarnings() {
 	Object[] entries = this.options.entrySet().toArray();
 	for (int i = 0, max = entries.length; i < max; i++) {
 		Map.Entry entry = (Map.Entry) entries[i];
Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
===================================================================
RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,442 @@
+/**
+ * 
+ */
+package org.eclipse.jdt.internal.compiler.batch;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.zip.CRC32;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.eclipse.jdt.core.compiler.InvalidInputException;
+import org.eclipse.jdt.internal.compiler.ClassFile;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
+import org.eclipse.jdt.internal.compiler.env.AccessRule;
+import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jdt.internal.compiler.util.Messages;
+import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
+
+/**
+ * This is an alternate entry point for the command-line compiler which
+ * is simpler to integrate into GCC.  In particular the option processing
+ * is more GNU-like and the recognized options are similar to those supported
+ * by other GCC front ends.
+ */
+public class GCCMain extends Main {
+
+	// All the compilation units specified on the command line.
+	private HashSet commandLineCompilationUnits = new HashSet();
+	// True if we are only checking syntax.
+	private boolean syntaxOnly;
+	// If not null, the name of the output zip file.
+	// If null, we are generating class files in the file system,
+	// not a zip file.
+	private String zipDestination;
+	// The zip stream to which we're writing, or null if it hasn't been opened.
+	private ZipOutputStream zipStream;
+	
+	// If not null, the name of the zip file to which dependency class files
+	// should be written.
+	private String zipDependencyDestination;
+	// The zip stream to which dependency files should be written.
+	private ZipOutputStream zipDependencyStream;
+
+	public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
+			boolean systemExitWhenFinished) {
+		super(outWriter, errWriter, systemExitWhenFinished);
+		this.logger.setEmacs();
+	}
+
+	public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
+			boolean systemExitWhenFinished, Map customDefaultOptions) {
+		super(outWriter, errWriter, systemExitWhenFinished,
+				customDefaultOptions);
+		this.logger.setEmacs();
+	}
+
+	private void fail(Exception t) {
+		this.logger.logException(t);
+		System.exit(1);
+	}
+
+	public CompilationUnit[] getCompilationUnits() throws InvalidInputException {
+		CompilationUnit[] units = super.getCompilationUnits();
+		for (int i = 0; i < units.length; ++i)
+			this.commandLineCompilationUnits.add(units[i]);
+		return units;
+	}
+
+	private String combine(char[] one, char[] two) {
+		StringBuffer b = new StringBuffer();
+		b.append(one);
+		b.append(two);
+		return b.toString();
+	}
+
+	private ZipOutputStream getZipOutput() throws IOException {
+		if (this.zipDestination != null && this.zipStream == null) {
+			OutputStream os;
+			if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
+				os = System.out;
+			} else {
+				os = new FileOutputStream(this.zipDestination);
+			}
+			zipStream = new ZipOutputStream(new BufferedOutputStream(os));
+			zipStream.setMethod(ZipOutputStream.STORED);
+		}
+		return zipStream;
+	}
+
+	private ZipOutputStream getDependencyOutput() throws IOException {
+		if (this.zipDependencyDestination != null && this.zipDependencyStream == null) {
+			OutputStream os = new FileOutputStream(zipDependencyDestination);
+			zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os));
+			zipDependencyStream.setMethod(ZipOutputStream.STORED);
+		}
+		return zipDependencyStream;
+	}
+
+	public void outputClassFiles(CompilationResult unitResult) {
+		if (this.syntaxOnly) {
+			return;
+		}
+		if (this.zipDestination == null) {
+			// Nothing special to do here.
+			super.outputClassFiles(unitResult);
+			return;
+		}
+		if (unitResult == null || unitResult.hasErrors()) {
+			return;
+		}
+
+		// If we are compiling with indirect dispatch, we don't need
+		// any dependent classes.  If we are using the C++ ABI, then we
+		// do need the dependencies in order to do proper layout.
+		boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
+		if (this.zipDependencyDestination == null && !gcjCompile) {
+			return;
+		}
+
+		try {
+			ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput();
+			ClassFile[] classFiles = unitResult.getClassFiles();
+			for (int i = 0; i < classFiles.length; ++i) {
+				ClassFile classFile = classFiles[i];
+				String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class);
+				if (this.verbose)
+					this.out.println(
+							Messages.bind(
+									Messages.compilation_write,
+									new String[] {
+								String.valueOf(this.exportedClassFilesCounter+1),
+								filename
+							}));
+				ZipEntry entry = new ZipEntry(filename);
+				byte[] contents = classFile.getBytes();
+				CRC32 crc = new CRC32();
+				crc.update(contents);
+				entry.setSize(contents.length);
+				entry.setCrc(crc.getValue());
+				dest.putNextEntry(entry);
+				dest.write(contents);
+				dest.closeEntry();
+			}
+		} catch (IOException err) {
+			fail(err);
+		}
+	}
+	
+	private String getArgument(String option) {
+		int index = option.indexOf('=');
+		return option.substring(index + 1);
+	}
+
+	private void addPath(ArrayList result, String currentClasspathName) {
+		String customEncoding = null;
+		AccessRule[] accessRules = new AccessRule[0];
+		String templates[] = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH];
+		templates[0] = Main.bind(
+			"template.restrictedAccess.type", //$NON-NLS-1$
+			new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$ 
+		templates[1] = Main.bind(
+			"template.restrictedAccess.constructor", //$NON-NLS-1$
+			new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$ 
+		templates[2] = Main.bind(
+			"template.restrictedAccess.method", //$NON-NLS-1$
+			new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ 
+		templates[3] = Main.bind(
+			"template.restrictedAccess.field", //$NON-NLS-1$
+			new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ 
+		AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, templates);
+		FileSystem.Classpath currentClasspath = FileSystem
+				.getClasspath(currentClasspathName,
+						customEncoding, accessRuleSet);
+		if (currentClasspath != null) {
+			result.add(currentClasspath);
+		}
+	}
+	
+	private void parsePath(ArrayList result, String path) {
+		StringTokenizer iter = new StringTokenizer(path, File.pathSeparator);
+		while (iter.hasMoreTokens()) {
+			addPath(result, iter.nextToken());
+		}
+	}
+
+	protected void handleWarningToken(String token, boolean isEnabling,
+			boolean useEnableJavadoc) throws InvalidInputException {
+		// Recognize this for compatibility with older versions of gcj.
+		if ("deprecated".equals(token)) //$NON-NLS-1$
+			token = "deprecation"; //$NON-NLS-1$
+		else if ("static-access".equals(token)   //$NON-NLS-1$
+				|| "dep-ann".equals(token) //$NON-NLS-1$
+				|| "over-ann".equals(token)) { //$NON-NLS-1$
+			// Some exceptions to the warning naming rule.
+		} else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
+			// Compatibility with earlier versions of gcj.
+			token = "semicolon"; //$NON-NLS-1$
+		} else {
+			// Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
+			StringBuffer newToken = new StringBuffer(token.length());
+			StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$
+			boolean first = true;
+			while (t.hasMoreTokens()) {
+				String next = t.nextToken();
+				if (first) {
+					newToken.append(next);
+					first = false;
+				} else {
+					newToken.append(Character.toUpperCase(next.charAt(0)));
+					newToken.append(next.substring(1));
+				}
+			}
+			token = newToken.toString();
+		}
+		super.handleWarningToken(token, isEnabling, useEnableJavadoc);
+	}
+
+	/**
+	 * Set the debug level to the indicated value.  The level should be
+	 * between 0 and 2, inclusive, but this is not checked.
+	 * @param level the debug level
+	 */
+	private void setDebugLevel(int level) {
+		this.options.put(
+				CompilerOptions.OPTION_LocalVariableAttribute,
+				level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
+		this.options.put(
+				CompilerOptions.OPTION_LineNumberAttribute,
+				level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
+		this.options.put(
+				CompilerOptions.OPTION_SourceFileAttribute,
+				CompilerOptions.GENERATE);
+	}
+
+	private void readFileList(String file, ArrayList result) {
+		try {
+			BufferedReader b = new BufferedReader(new FileReader(file));
+			String line;
+			while ((line = b.readLine()) != null) {
+				if (line.endsWith(SUFFIX_STRING_java))
+					result.add(line);
+			}
+			b.close();
+		} catch (IOException err) {
+			fail(err);
+		}
+	}
+	
+	private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
+		Iterator it = fileList.iterator();
+		while (it.hasNext()) {
+			readFileList((String) it.next(), result);
+		}
+	}
+
+	public void configure(String[] argv) throws InvalidInputException {
+		if ((argv == null) || (argv.length == 0)) {
+			// This is a "can't happen".
+			System.exit(1);
+		}
+
+		ArrayList files = new ArrayList();
+		ArrayList otherFiles = new ArrayList();
+		String classpath = null;
+		boolean haveFileList = false;
+
+		for (int i = 0; i < argv.length; ++i) {
+			String currentArg = argv[i];
+			
+			if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
+				// Simply accept the last one.
+				String encoding = getArgument(currentArg);
+				try { // ensure encoding is supported
+					new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
+				} catch (UnsupportedEncodingException e) {
+					throw new InvalidInputException(
+						Main.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
+				}
+				this.options.put(CompilerOptions.OPTION_Encoding, encoding);
+			} else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
+				String arg = getArgument(currentArg);
+				if (this.destinationPath != null) {
+					StringBuffer errorMessage = new StringBuffer();
+					errorMessage.append("-d"); //$NON-NLS-1$
+					errorMessage.append(' ');
+					errorMessage.append(arg);
+					throw new InvalidInputException(
+						Main.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+				}
+				this.destinationPath = arg;
+				this.generatePackagesStructure = true;
+			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+				classpath = getArgument(currentArg);
+			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
+				++i;
+				if (i >= argv.length)
+					// FIXME: i18n.
+					throw new InvalidInputException("-fzip-target requires argument");
+				this.zipDestination = argv[i];
+			} else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
+				++i;
+				if (i >= argv.length)
+					// FIXME: i18n.
+					throw new InvalidInputException("-fzip-dependency requires argument");
+				this.zipDependencyDestination = argv[i];
+			} else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
+				if (currentArg.equals("-g0")) { //$NON-NLS-1$
+					setDebugLevel(0);
+				} else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
+						|| currentArg.equals("-g")) { //$NON-NLS-1$
+					setDebugLevel(2);
+				} else {
+					// Handle -g1 but also things like -gstabs.
+					setDebugLevel(1);
+				}
+			} else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
+				handleWarningToken(currentArg.substring(5), false, false);
+			} else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
+				handleWarningToken(currentArg.substring(2), true, false);
+			} else if (currentArg.equals("-w")) { //$NON-NLS-1$
+				disableWarnings();
+			} else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
+				// Ignore.
+			} else if (currentArg.equals("-v")) { //$NON-NLS-1$
+				this.verbose = true;
+			} else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
+				this.syntaxOnly = true;
+			} else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
+				currentArg = getArgument(currentArg);
+				if (currentArg.equals("1.3")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
+				} else if (currentArg.equals("1.4")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
+				} else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
+				} else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+				} else {
+					throw new InvalidInputException(Main.bind("configure.source", currentArg)); //$NON-NLS-1$
+				}
+			} else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
+				currentArg = getArgument(currentArg);
+				if (currentArg.equals("1.1")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
+				} else if (currentArg.equals("1.2")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
+				} else if (currentArg.equals("1.3")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
+				} else if (currentArg.equals("1.4")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
+				} else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
+				} else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
+				} else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
+					this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
+				} else {
+					throw new InvalidInputException(Main.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
+				}
+			} else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
+				haveFileList = true;
+			} else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
+				files.add(currentArg);
+			} else if (currentArg.charAt(0) == '-'){
+				// FIXME: error if not a file?
+			} else {
+				otherFiles.add(currentArg);
+			}
+		}
+
+		// Read the file list file.  We read them all, but really there
+		// will only be one.
+		if (haveFileList)
+			readAllFileListFiles(otherFiles, files);
+
+		this.filenames = (String[]) files.toArray(new String[0]);
+		this.encodings = new String[this.filenames.length];
+		
+		// Classpath processing.
+		ArrayList result = new ArrayList();
+		if (classpath == null)
+			// FIXME: update resources.
+			throw new InvalidInputException("no classpath specified");
+		parsePath(result, classpath);
+
+		// We must always create both output files, even if one is not used.
+		// That way we will always pass valid zip file on to jc1.
+		try {
+			getZipOutput();
+			getDependencyOutput();
+		} catch (IOException err) {
+			fail(err);
+		}
+
+		this.checkedClasspaths = new FileSystem.Classpath[result.size()];
+		result.toArray(this.checkedClasspaths);
+
+		this.logger.logCommandLineArguments(argv);
+		this.logger.logOptions(this.options);
+		this.logger.logClasspath(this.checkedClasspaths);
+		
+		this.repetitions = 1;
+	}
+
+	public boolean compile(String[] argv) {
+		boolean result = super.compile(argv);
+		try {
+			if (zipStream != null) {
+				zipStream.finish();
+				zipStream.close();
+			}
+			if (zipDependencyStream != null) {
+				zipDependencyStream.finish();
+				zipDependencyStream.close();
+			}
+		} catch (IOException err) {
+			fail(err);
+		}
+		return result;
+	}
+
+	public static void main(String[] argv) {
+		boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
+		System.exit(result ? 0 : 1);
+	}
+}


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- eclipse.spec	18 Jul 2006 15:54:38 -0000	1.297
+++ eclipse.spec	19 Jul 2006 02:44:16 -0000	1.298
@@ -41,7 +41,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/
@@ -123,6 +123,8 @@
 # JPackage []s in names of symlinks ...
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 Patch34:	%{name}-bz162177.patch
+# Use ecj for gcj
+Patch57:	%{name}-ecj-gcj.patch
 
 %if %{gcj_support}
 %else
@@ -419,6 +421,7 @@
 popd
 pushd plugins/org.eclipse.jdt.core
 %patch34 -p0
+%patch57 -p0
 popd
 %patch38 -p0
 %patch40 -p0
@@ -905,7 +908,7 @@
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
 pushd $RPM_BUILD_ROOT%{_javadir}
 ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -1631,6 +1634,10 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_4fc
+- Add patch from Tom Tromey for ecj-gcj branch of gcj.
+- Fix SWT symlinks.
+
 * Tue Jul 18 2006 Igor Foox <ifoox at redhat.com> 3.2.0-1jpp_3fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 03:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 23:36:35 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.122,1.123
Message-ID: <200607190336.k6J3aZM9013987@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13973

Modified Files:
	gnome-vfs2.spec 
Log Message:
readd gnome-mount dependency



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-vfs2.spec	19 Jul 2006 02:14:31 -0000	1.122
+++ gnome-vfs2.spec	19 Jul 2006 03:36:33 -0000	1.123
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 5.1
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -21,7 +21,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-#Requires:      gnome-mount >= %{gnome_mount_version}
+Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
@@ -194,6 +194,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-6
+- Re-add gnome-mount dependency
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-5.1
 - Temporarily break dependency cycle with gnome-mount
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 03:54:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 18 Jul 2006 23:54:17 -0400
Subject: rpms/fontconfig/devel fontconfig-2.3.95-fd-leak.patch, NONE,
	1.1 fontconfig.spec, 1.80, 1.81
Message-ID: <200607190354.k6J3sH13012362@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12290

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.95-fd-leak.patch 
Log Message:
Plug a small memory leak


fontconfig-2.3.95-fd-leak.patch:
 fccache.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE fontconfig-2.3.95-fd-leak.patch ---
--- fontconfig-2.3.95/src/fccache.c.fd-leak	2006-07-18 23:50:19.000000000 -0400
+++ fontconfig-2.3.95/src/fccache.c	2006-07-18 23:53:45.000000000 -0400
@@ -173,6 +173,8 @@
 	FcGlobalCacheDirDestroy (d);
     }
     FcMemFree (FC_MEM_CACHE, sizeof (FcGlobalCache));
+    if (cache->fd != -1)
+        close (cache->fd);
     free (cache);
 }
 


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- fontconfig.spec	12 Jul 2006 17:31:28 -0000	1.80
+++ fontconfig.spec	19 Jul 2006 03:54:14 -0000	1.81
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 4.1.1
+Release: 5
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -16,6 +16,7 @@
 Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
 Patch3: fontconfig-2.4-cmap-parsing.patch
 Patch4: fontconfig-2.3.95-ttf-collections.patch
+Patch5: fontconfig-2.3.95-fd-leak.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -55,6 +56,7 @@
 %patch2 -p1 -b .move-user-cache
 %patch3 -p1 -b .cmap-parsing
 %patch4 -p1 -b .ttf-collections
+%patch5 -p1 -b .fd-leak
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -139,6 +141,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.95-5
+- Plug a small memory leak
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.95-4.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 04:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 00:16:56 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.53,1.54
Message-ID: <200607190416.k6J4GuDo018759@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18365

Modified Files:
	gstreamer.spec 
Log Message:
temporarily break cycle



Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gstreamer.spec	12 Jul 2006 06:15:04 -0000	1.53
+++ gstreamer.spec	19 Jul 2006 04:16:48 -0000	1.54
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.8
-Release: 	3.1
+Release: 	3.2
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -17,7 +17,7 @@
 
 Requires:	gstreamer-tools >= %{version}
 Requires:	gstreamer-plugins-base
-Requires:	gstreamer-plugins-good
+#Requires:	gstreamer-plugins-good
 # superceded by the two packages above
 Obsoletes:	gstreamer-plugins
 
@@ -198,7 +198,10 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-3.2
+- Temporarily break the dependency cycle with gsteamer-plugins-good
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10.8-3.1
 - rebuild
 
 * Wed Jun 28 2006 Karsten Hopp <karsten at redhat.de> 0.10.8-3



From fedora-cvs-commits at redhat.com  Wed Jul 19 04:22:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 00:22:16 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.41,1.42
Message-ID: <200607190422.k6J4MG8p028405@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27749

Modified Files:
	libgnomecups.spec 
Log Message:
rebuild



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgnomecups.spec	12 Jul 2006 06:50:56 -0000	1.41
+++ libgnomecups.spec	19 Jul 2006 04:21:57 -0000	1.42
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release:  6.1
+Release:  7
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.2-7
+- Rebuild against new dbus
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 04:31:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 00:31:37 -0400
Subject: rpms/evince/devel evince.spec,1.54,1.55
Message-ID: <200607190431.k6J4Vbhk001325@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1272

Modified Files:
	evince.spec 
Log Message:
rebuild



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- evince.spec	12 Jul 2006 17:23:33 -0000	1.54
+++ evince.spec	19 Jul 2006 04:31:34 -0000	1.55
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.4
-Release:	1.1
+Release:	2
 Summary:	Document viewer
 
 License: 	GPL
@@ -132,7 +132,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-2
+- Rebuild against new dbus
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-1.1
 - rebuild
 
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-1



From fedora-cvs-commits at redhat.com  Wed Jul 19 04:32:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 00:32:45 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.42,1.43
Message-ID: <200607190432.k6J4WjMD001565@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1467

Modified Files:
	libgnomecups.spec 
Log Message:
fix build reqs



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libgnomecups.spec	19 Jul 2006 04:21:57 -0000	1.42
+++ libgnomecups.spec	19 Jul 2006 04:32:43 -0000	1.43
@@ -12,6 +12,7 @@
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
 BuildRequires: dbus-glib
+BuildRequires: dbus-devel
 BuildRequires: autoconf, automake, libtool, gettext
 BuildRequires: intltool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-cvs-commits at redhat.com  Wed Jul 19 04:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 00:40:47 -0400
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.43,1.44
Message-ID: <200607190440.k6J4ellv002701@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2609

Modified Files:
	libgnomecups.spec 
Log Message:
fix build reqs



Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libgnomecups.spec	19 Jul 2006 04:32:43 -0000	1.43
+++ libgnomecups.spec	19 Jul 2006 04:40:42 -0000	1.44
@@ -8,11 +8,10 @@
 Requires: cups cups-libs
 Requires: dbus dbus-glib
 BuildRequires: cups-devel
-BuildRequires: dbus-devel
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
-BuildRequires: dbus-glib
 BuildRequires: dbus-devel
+BuildRequires: dbus-glib-devel
 BuildRequires: autoconf, automake, libtool, gettext
 BuildRequires: intltool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root



From fedora-cvs-commits at redhat.com  Wed Jul 19 05:13:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 01:13:54 -0400
Subject: rpms/fonts-indic/devel .cvsignore, 1.3, 1.4 fonts-indic.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200607190513.k6J5Dsp2025705@cvs.devel.redhat.com>

Author: llch

Update of /cvs/dist/rpms/fonts-indic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25681

Modified Files:
	.cvsignore fonts-indic.spec sources 
Log Message:
2.0; added 4 new indic fonts


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 May 2005 04:36:15 -0000	1.3
+++ .cvsignore	19 Jul 2006 05:13:52 -0000	1.4
@@ -1,2 +1,3 @@
 fonts-indic-1.9.tar.gz
 fonts-indic-1.10.tar.gz
+fonts-indic-2.0.tar.gz


Index: fonts-indic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fonts-indic.spec	12 Jul 2006 05:49:44 -0000	1.7
+++ fonts-indic.spec	19 Jul 2006 05:13:52 -0000	1.8
@@ -1,10 +1,10 @@
 %define	xfontdir	%{_datadir}/fonts
 %define update_cache    /usr/bin/fc-cache
-%define langlist	"bengali hindi gujarati tamil punjabi"
+%define langlist	"bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu"
 
 Name:		fonts-indic
-Version:	1.10
-Release: 2.1.1
+Version:	2.0
+Release: 	1
 License:	GPL
 Group:		User Interface/X
 BuildArch:	noarch
@@ -13,7 +13,7 @@
 
 Summary: Free Indian truetype/opentype fonts
 %description
-This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil TrueType/Opentype fonts.
+This package provides the Hindi, Bengali, Gujarati, Punjabi, Tamil, Kannada, Malayalam, Oriya, Telugu TrueType/Opentype fonts.
 
 
 %package -n fonts-bengali
@@ -56,6 +56,37 @@
 %description -n fonts-tamil
 These are the free Tamil truetype/opentype fonts. 
 
+%package -n fonts-kannada
+Summary: Free Kannada truetype fonts
+Group: User Interface/X
+Obsoletes:  ttfonts-kn
+Requires:       fontconfig
+%description -n fonts-kannada
+These are the free Kannada truetype/opentype fonts. 
+
+%package -n fonts-malayalam
+Summary: Free Malayalam truetype fonts
+Group: User Interface/X
+Obsoletes:  ttfonts-ml
+Requires:       fontconfig
+%description -n fonts-malayalam
+These are the free Malayalam truetype/opentype fonts. 
+
+%package -n fonts-oriya
+Summary: Free Oriya truetype fonts
+Group: User Interface/X
+Obsoletes:  ttfonts-or
+Requires:       fontconfig
+%description -n fonts-oriya
+These are the free Oriya truetype/opentype fonts. 
+
+%package -n fonts-telugu
+Summary: Free Telugu truetype fonts
+Group: User Interface/X
+Obsoletes:  ttfonts-te
+Requires:       fontconfig
+%description -n fonts-telugu
+These are the free Telugu truetype/opentype fonts. 
 
 %prep
 %setup
@@ -92,6 +123,19 @@
 %post -n fonts-tamil
 [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
 
+%post -n fonts-kannada
+[  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+
+%post -n fonts-malayalam
+[  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+
+%post -n fonts-oriya
+[  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+
+%post -n fonts-telugu
+[  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+
+
 
 %postun -n fonts-bengali
 if [ "$1" = "0" ]; then
@@ -118,6 +162,26 @@
     [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
 fi
 
+%postun -n fonts-kannada
+if [ "$1" = "0" ]; then
+    [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+fi
+
+%postun -n fonts-malayalam
+if [ "$1" = "0" ]; then
+    [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+fi
+
+%postun -n fonts-oriya
+if [ "$1" = "0" ]; then
+    [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+fi
+
+%postun -n fonts-telugu
+if [ "$1" = "0" ]; then
+    [  -x %{update_cache} ] && HOME=/ %{update_cache} %{xfontdir} 2> /dev/null
+fi
+
 
 %files -n fonts-bengali
 %defattr(-, root, root)
@@ -159,8 +223,43 @@
 %ghost %{xfontdir}/tamil/fonts.cache-1
 %{xfontdir}/tamil/*ttf
 
+%files -n fonts-kannada
+%defattr(-, root, root)
+%dir %{xfontdir}
+%dir %{xfontdir}/kannada
+%doc COPYING
+%ghost %{xfontdir}/kannada/fonts.cache-1
+%{xfontdir}/kannada/*ttf
+
+%files -n fonts-malayalam
+%defattr(-, root, root)
+%dir %{xfontdir}
+%dir %{xfontdir}/malayalam
+%doc COPYING
+%ghost %{xfontdir}/malayalam/fonts.cache-1
+%{xfontdir}/malayalam/*ttf
+
+%files -n fonts-oriya
+%defattr(-, root, root)
+%dir %{xfontdir}
+%dir %{xfontdir}/oriya
+%doc COPYING
+%ghost %{xfontdir}/oriya/fonts.cache-1
+%{xfontdir}/oriya/*ttf
+
+%files -n fonts-telugu
+%defattr(-, root, root)
+%dir %{xfontdir}
+%dir %{xfontdir}/telugu
+%doc COPYING
+%ghost %{xfontdir}/telugu/fonts.cache-1
+%{xfontdir}/telugu/*ttf
 
 %changelog
+* Wed Jul 19 2006 Leon Ho <llch at redhat.com> - 2.0-1
+- added 4 new indic fonts
+- added the glyphs u+0964 and u+0965 (Danda and Double Danda) in Bengali, Punjabi and Tamil (RH#183144)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-2.1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 May 2005 04:36:15 -0000	1.5
+++ sources	19 Jul 2006 05:13:52 -0000	1.6
@@ -1,2 +1,3 @@
 3dd41a67df406480430fa954c76b44cb  fonts-indic-1.9.tar.gz
 6367531e48d531fbb175279fdbd2055a  fonts-indic-1.10.tar.gz
+7b99784822b0e0fd2cdb8d821f777820  fonts-indic-2.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 05:57:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 01:57:19 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.13,
	1.14
Message-ID: <200607190557.k6J5vJlr004404@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4351

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
Rebuild



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gstreamer-plugins-good.spec	19 Jul 2006 00:25:31 -0000	1.13
+++ gstreamer-plugins-good.spec	19 Jul 2006 05:57:16 -0000	1.14
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.3
-Release:  	3
+Release:  	4
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -180,10 +180,13 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.3-4
+- Rebuild 
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.3-3
 - rebuild
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10.3-2.1
 - rebuild
 
 * Wed May 31 2006 Dan Williams  <dcbw at redhat.com> - 0.10.3-2



From fedora-cvs-commits at redhat.com  Wed Jul 19 06:27:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 02:27:34 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.54,1.55
Message-ID: <200607190627.k6J6RYS3003694@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3681

Modified Files:
	gstreamer.spec 
Log Message:
re-add deps



Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gstreamer.spec	19 Jul 2006 04:16:48 -0000	1.54
+++ gstreamer.spec	19 Jul 2006 06:27:32 -0000	1.55
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.8
-Release: 	3.2
+Release: 	4
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -17,7 +17,7 @@
 
 Requires:	gstreamer-tools >= %{version}
 Requires:	gstreamer-plugins-base
-#Requires:	gstreamer-plugins-good
+Requires:	gstreamer-plugins-good
 # superceded by the two packages above
 Obsoletes:	gstreamer-plugins
 
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-4
+- Re-add the gstreamer-plugins-good dependency
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-3.2
 - Temporarily break the dependency cycle with gsteamer-plugins-good
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 06:46:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 02:46:06 -0400
Subject: rpms/dhcpv6/devel dhcpv6-0.10-prefix_bz196429.patch, NONE,
	1.1 dhcpv6-0.10-libdhcp6client.patch, 1.6,
	1.7 dhcpv6-0.10-salen.patch, 1.1, 1.2 dhcpv6.spec, 1.40, 1.41
Message-ID: <200607190646.k6J6k6jo016651@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16563

Modified Files:
	dhcpv6-0.10-libdhcp6client.patch dhcpv6-0.10-salen.patch 
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-prefix_bz196429.patch 
Log Message:
fix bug 196429

dhcpv6-0.10-prefix_bz196429.patch:
 client6_addr.c  |   19 +
 client6_parse.y |   18 +
 client6_token.l |    1 
 common.c        |   42 ++-
 config.c        |    5 
 config.h        |   11 
 dhcp6.h         |    4 
 dhcp6c.c        |    6 
 dhcp6c.conf.5   |  413 +++++++++++++++++-----------------
 dhcp6s.c        |   20 +
 dhcp6s.conf.5   |  668 ++++++++++++++++++++++++++++----------------------------
 server6_conf.c  |    2 
 server6_conf.h  |    1 
 server6_parse.y |   10 
 server6_token.l |    1 
 15 files changed, 668 insertions(+), 553 deletions(-)

--- NEW FILE dhcpv6-0.10-prefix_bz196429.patch ---
--- dhcp-0.10/dhcp6.h.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/dhcp6.h	2006-07-19 01:30:48.000000000 -0400
@@ -301,6 +301,7 @@
  */
 #define DH6OPT_IA_PD CONF_DH6OPT_IA_PD
 #define DH6OPT_IAPREFIX CONF_DH6OPT_IAPREFIX
+#define DH6OPT_REQUEST_PREFIX 28
 
 struct dhcp6opt {
 	u_int16_t dh6opt_type;
@@ -340,8 +341,7 @@
 	struct in6_addr addr;
 	u_int32_t preferlifetime;
 	u_int32_t validlifetime;
-	u_int8_t plen;	
-/*
+/*	u_int8_t plen;	
 	struct dhcp6_status_info status;
 */
 } __attribute__ ((__packed__));
--- dhcp-0.10/dhcp6c.c.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/dhcp6c.c	2006-07-19 01:30:48.000000000 -0400
@@ -955,8 +955,14 @@
 			if (dhcp6_copy_list(&optinfo.addr_list, &request_list))
 				goto end;
 		}
+		/* support for server assigned prefix */
+		if ( ! ifp->use_ra_prefix )
+		    optinfo.flags |= DHCIFF_REQUEST_PREFIX;
 		break;
 	case DHCP6S_REQUEST:
+		/* support for server assigned prefix */
+		if ( ! ifp->use_ra_prefix )
+		    optinfo.flags |= DHCIFF_REQUEST_PREFIX;
 		if (!(ifp->send_flags & DHCIFF_INFO_ONLY)) {
 			memcpy(&optinfo.iaidinfo, &client6_iaidaddr.client6_info.iaidinfo,
 					sizeof(optinfo.iaidinfo));
--- dhcp-0.10/dhcp6s.conf.5.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/dhcp6s.conf.5	2006-07-19 01:37:33.000000000 -0400
@@ -1,330 +1,340 @@
-.\" $Id: dhcp6s.conf.5,v 1.3 2003/05/28 22:56:23 shirleyma Exp $
-.\"
-.\" Copyright (C) International Business Machines  Corp., 2003
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.TH dhcp6s.conf 5 "17 March 2003" "dhcp6s.conf" "Linux System Manager's Manual"
-
-.SH NAME
-dhcp6s.conf \- configuration file of the DHCPv6 server daemon, dhcp6s
-
-.SH DESCRIPTION
+.\" $Id: dhcp6s.conf.5,v 1.3 2003/05/28 22:56:23 shirleyma Exp $
+.\"
+.\" Copyright (C) International Business Machines  Corp., 2003
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the project nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.TH dhcp6s.conf 5 "17 March 2003" "dhcp6s.conf" "Linux System Manager's Manual"
+
+.SH NAME
+dhcp6s.conf \- configuration file of the DHCPv6 server daemon, dhcp6s
+
+.SH DESCRIPTION
 .B dhcp6s.conf
-contains the configuration information of addresses, prefixes, or
-various network configuration parameters for each of the interfaces. 
-The network configuration parameters can be described globally for all of 
-the interfaces. The default address preferred life time is 36000 seconds; 
-the default address valid life time is 72000 seconds if they are not defined
-in any declaration. The specific declaration order is interface, link, host;
-within link the more specific declaration is pool.
-
- The interface definitions are described in the following form:
-.PP
-.nf
-.B \tinterface\ <interface\ name>
-.B \t{
-.B \t\t[declarations];
-.B \t};
-.fi
- where each of the declarations could be of type link, group, or host. 
-Each declaration and the statements within each of these declarations 
-must be terminated by a semicolon. Additional details of the declarations 
-are specified below.
-
-.PP
-.BI DECLARATIONS
-.PP
-.nf
-.B interface\ <interface\ name>
-.B {
-.B \t[declarations];
-.B };
-.fi
-An interface declaration is used to inform the DHCPv6 server that the links and
-hosts declared within it are connected to the same network segment. Common
-network parameters for this network segment can be defined within the interface
-declaration.
-
-.nf
-.B link\ <link\ name>
-.B {
-.B \t[declarations];
-.B };
-.fi
-A link declaration is used to provide the DHCPv6 server  the IPv6 assgined
-address ranges, prefixes, and hosts. Common network parameters for this link 
-can be defined within the link declaration.
-
-.nf
-.B group
-.B {
-.B \t[declarations];
-.B };
-.fi
-A group declaration is used to group a list of declarations together to define
-the common network parameters. These network parameters are valid within this
-declaration only. Declarations can be one of the following types: interface, link,
-pool, or host.
-
-.nf
-.B pool
-.B {
-.B \t[declarations];
-.B };
-.fi
-The pool declaration is used to declare an address pool from which IPv6
-address can be allocated, with its own permit to control client access
-and its own declaration in which you can declare pool-specific network parameters.
-
-.nf
-.B host\ <host\ name>
-.B {
-.B \t[duid\ <DUID\n>];
-.B \t[iaidinfo\ {}];
-.B \t[address\ {}];
-.B \t[prefix\ <prefix>/<prefix\ length>];
-.B \t[declarations];
-.B };
-.fi
-This declaration allows administrators to describe the addresses, prefixes, and
-network configuration parameters for this  host. As for this declaration, the
-DHCP Unique Identifier (DUID), Identity Association Identifier (IAID), and
 
-addresses must be specified. The host declaration is used to do Static
-Address Assginment for a particular DHCPv6 client. 
-
-.nf
-.B address
-.B {
-.B \t[<ipv6 address>/<prefix length>];
-.B \t[prefer-life-time\ <preferred\ lifetime>];
-.B \t[valid-life-time\ <valid\ lifetime>];
-.B };
-.fi
-This statement allows administrators to specify the address for the 
-host. Preferred Lifetime and Valid Lifetime also can be set in this
-statement. This statement is valid only in host {} declarations.
-
-.nf
-.B prefix\ <prefix>/<prefix\ length>;
-.fi
-This statement allows administrators to specify the prefix.
-This parameter is needed when configuring dhcp6s as the Delegation Router for
-the Prefix Delegation. dhcp6s assigns the specified prefixes 
-to the requesting routers.
-
-.nf
-.B relay\ <relay>/<prefix\ length>;
-.fi
-This statement specifies the prefix that the relay agent will put in the link
-address field of the RELAY-FORW message to indicate the link the client is
-attached to. If the link-address matches this prefix, this link declaration
-will be used. This statement is only valid in the link declaration.
-
-.nf
-.B iaidinfo
-.B {
-.B \t[iaid\ <IAID\ number>];
-.B \t[renew-time\ <renew\ time>];
-.B \t[rebind-time\ <rebind\ time>];
-.B };
-.fi
-This statement allows administrators to describe the information for 
-this IAID. This statement is only valid in host {} declarations.
-iaid is required; renew-time and rebind time are optional in this statement.
-
-.nf
-.B range\ <ipv6\ address>\ to\ <ipv6\ address>/<prefix\ length>;
-.fi
-This statement allows adminstrators to use "range" and "to" keywords and
-prefix length to specify an address range.
-For each range not more than one of the unassigned addresses will be
-assgined to the requested client.
-
-.nf
-.B duid\ <DUID\>;
-.fi
-DUID is a DHCP Unique Identifier for a DHCP participant. Using this option,
-the administrator can specify the DUID of this DHCPv6 client.
-The duid statement is valid only in host {} declarations.
-
-.nf
-.BI iaid\ <IAID\ number>;
-.fi
-IAID is a Identity Association Identifier. IA is a collection of addresses
-assigned to a client. Using this option, the administrator can specify the IAID
-in iaidinfo for a host declaration.
-
-.nf
-.BI renew-time\ <renew\ time>;
-.fi
-This statement allows administrators to specify the RenewTime (T1).
-The recommended value for RenewTime is .5 times the shortest preferred
-lifetime of the address in the IA, if the value is not defined.
-
-.nf
-.BI rebind-time\ <rebind\ time>;
-.fi
-This statement allows administrators to specify the RebindTime (T2).
-The recommended value for RenewTime is .8 times the shortest preferred 
-lifetime of the address in the IA, if the value is not defined.
-
-.nf
-.BI prefer-life-time\ <preferred\ lifetime>;
-.fi
-This statement allows administrators to specify the Preferred Life Time for 
-each address.
-
-.nf
-.BI valid-life-time\ <valid\ lifetime>;
-.fi
-This statement allows administrators to specify the Valid Life Time for 
-each address.
-
-.nf
-.BI option\ dns_server\ <ipv6\ addresses\ or\ domain\ name\ list>;
-.fi
-This statement allows administrators to specify the DNS servers.
-
-.B send\ <OPTION>;
-.fi
-This declaration enables dhcp6s to include the specified option in sending 
-DHCPv6 messages.
-
-.nf
-\fIsend\ unicast;\fR
-.fi
-This declaration enables dhcp6s to send a Server Unicast option. Usually
-DHCPv6 clients must use multicast addresses to contact the DHCPv6 server and
-agents. This declaration specifies that dhcp6s will accept unicast messages
-from DHCPv6 clients if they include a Server Unicast option.
-
-.nf
-\fIsend\ server-preference\ <server\ preference\ value>;\fR
-.fi
-This declaration enables dhcp6s to include a Preference option for sending
-DHCPv6 messages. DHCPv6 clients will pick up the DHCPv6 server which has
-highest preference value. The highest preference value is 255.
-
-.nf
-\fIsend\ temp-address;\fR
-.fi
-This declaration assigns a temporary address to the requesting client.
-
-.nf
-\fIsend\ information-only;\fR
-.fi
-This option enables dhcp6s to give only configuration information rather than
-assigning client addresses. This could be, for example, DNS server address
-configuration information.
-
-.nf
-.B allow\ <OPTION>;
-.fi
-This declaration allows the DHCPv6 client to specify an option in receiving
-DHCPv6 messages.
-
-.nf
-\fIallow rapid\-commit;\fR
-.fi
-This option enables dhcp6s to allow the Rapid-Commit option from the DHCPv6
-client and the Solicit-Reply message exchanges.
-
-.nf
-\fIallow\ unicast;\fR
-.fi
-This option enables dhcp6s to allow the Server Unicast option for the DHCPv6
-client. Usually DHCPv6 clients must use multicast addresses to contact DHCPv6
-server and agents. With this declaration, dhcp6s accepts unicast 
-messages from DHCPv6 clients if they include a Server Unicast option.
-
-.SH EXAMPLES
-.PP
-This is a sample of the dhcp6s.conf file.
-.nf
-.B option dns\_server 2003::6:1 ibm.com;
-.B prefer\-life\-time 10000;
-.B valid\-life\-time 20000;
-.B renew\-time 5000;
-.B rebind\-time 8000;
-.B interface eth1 {
-.B \tlink AAA {
-.B \t\tallow unicast;
-.B \t\tsend unicast;
-.B \t\tallow rapid-commit;
-.B \t\tsend server-preference 5;
-.B \t\trenew-time 1000;
-.B \t\trebind-time 2400;
-.B \t\tprefer-life-time 2000;
-.B \t\tvalid-life-time 3000;
-.B \t\trange 3ffe:ffff:100::10 to 3ffe:ffff:100::110/64;
-.B \t\tprefix 3ffe:ffef:104::/64;
-.B \t\tpool {
-.B \t\t\tprefer\-life\-time 3600;
-.B \t\t\tvalid\-life\-time 7200;
-.B \t\t\trange fec0:ffff::10 to fec0:ffff::110/64;
-.B \t\t\tprefix fec0:fffe::/48;
-.B \t\t};
-.B \t};
-.B \thost host0 {
-.B \t\tduid 00:00:00:00:a0:a0;
-.B \t\tiaidinfo {
-.B \t\t\tiaid 101010;
-.B \t\t\trenew-time 1000;
-.B \t\t\trebind-time 2000;
-.B \t\t};
-.B \t\taddress {
-.B \t\t\t3ffe:ffff:102::120/64;
-.B \t\t\tprefer-life-time 2000;
-.B \t\t\tvalid-life-time 3000;
-.B \t\t};
-.B \t};
-.B \tgroup {
-.B \t\tprefer\-life\-time 5000;
-.B \t\tvalid\-life\-time 6000;
-.B \t\thost host1 {
-.B \t\t\tduid 00:00:00:00:a1:a1;
-.B \t\t\tiaidinfo {
-.B \t\t\t\tiaid 101011;
-.B \t\t\t\trenew-time 1000;
-.B \t\t\t\trebind-time 2000;
-.B \t\t\t};
-.B \t\t};
-.B \t\thost host2 {
-.B \t\t\tduid 00:00:00:00:a2:a2;
-.B \t\t\tsend information-only;
-.B \t\t};
-.B \t};
-.B };
-.fi
-
-.SH SEE ALSO
-Dynamic Host Configuration Protocol for IPv6 (DHCPv6), IPv6 Prefix Options
-for DHCPv6, dhcp6s(5)
-
-.SH AUTHORS
-.LP
-Kazuo Hiekata <hiekata at yamato.ibm.com>
+contains the configuration information of addresses, prefixes, or
+various network configuration parameters for each of the interfaces. 
+The network configuration parameters can be described globally for all of 
+the interfaces. The default address preferred life time is 36000 seconds; 
+the default address valid life time is 72000 seconds if they are not defined
+in any declaration. The specific declaration order is interface, link, host;
+within link the more specific declaration is pool.
+
+ The interface definitions are described in the following form:
+.PP
+.nf
+.B \tinterface\ <interface\ name>
+.B \t{
+.B \t\t[declarations];
+.B \t};
+.fi
+ where each of the declarations could be of type link, group, or host. 
+Each declaration and the statements within each of these declarations 
+must be terminated by a semicolon. Additional details of the declarations 
+are specified below.
+
+.PP
+.BI DECLARATIONS
+.PP
+.nf
+.B interface\ <interface\ name>
+.B {
+.B \t[declarations];
+.B };
+.fi
+An interface declaration is used to inform the DHCPv6 server that the links and
+hosts declared within it are connected to the same network segment. Common
+network parameters for this network segment can be defined within the interface
+declaration.
+
+.nf
+.B link\ <link\ name>
+.B {
+.B \t[declarations];
+.B };
+.fi
+A link declaration is used to provide the DHCPv6 server  the IPv6 assgined
+address ranges, prefixes, and hosts. Common network parameters for this link 
+can be defined within the link declaration.
+
+.nf
+.B group
+.B {
+.B \t[declarations];
+.B };
+.fi
+A group declaration is used to group a list of declarations together to define
+the common network parameters. These network parameters are valid within this
+declaration only. Declarations can be one of the following types: interface, link,
+pool, or host.
+
+.nf
+.B pool
+.B {
+.B \t[declarations];
+.B };
+.fi
+The pool declaration is used to declare an address pool from which IPv6
+address can be allocated, with its own permit to control client access
+and its own declaration in which you can declare pool-specific network parameters.
+
+.nf
+.B host\ <host\ name>
+.B {
+.B \t[duid\ <DUID\n>];
+.B \t[iaidinfo\ {}];
+.B \t[address\ {}];
+.B \t[prefix\ <prefix>/<prefix\ length>];
+.B \t[declarations];
+.B };
+.fi
+This declaration allows administrators to describe the addresses, prefixes, and
+network configuration parameters for this  host. As for this declaration, the
+DHCP Unique Identifier (DUID), Identity Association Identifier (IAID), and 
+addresses must be specified. The host declaration is used to do Static
+Address Assginment for a particular DHCPv6 client. 
+
+.nf
+.B address
+.B {
+.B \t[<ipv6 address>/<prefix length>];
+.B \t[prefer-life-time\ <preferred\ lifetime>];
+.B \t[valid-life-time\ <valid\ lifetime>];
+.B };
+.fi
+This statement allows administrators to specify the address for the 
+host. Preferred Lifetime and Valid Lifetime also can be set in this
+statement. This statement is valid only in host {} declarations.
+
+.nf
+.B prefix\ <prefix>/<prefix\ length>;
+.fi
+This statement allows administrators to specify the prefix.
+This parameter is needed when configuring dhcp6s as the Delegation Router for
+the Prefix Delegation. dhcp6s assigns the specified prefixes 
+to the requesting routers.
+
+.nf
+.B relay\ <relay>/<prefix\ length>;
+.fi
+This statement specifies the prefix that the relay agent will put in the link
+address field of the RELAY-FORW message to indicate the link the client is
+attached to. If the link-address matches this prefix, this link declaration
+will be used. This statement is only valid in the link declaration.
+
+.nf
+.B iaidinfo
+.B {
+.B \t[iaid\ <IAID\ number>];
+.B \t[renew-time\ <renew\ time>];
+.B \t[rebind-time\ <rebind\ time>];
+.B };
+.fi
+This statement allows administrators to describe the information for 
+this IAID. This statement is only valid in host {} declarations.
+iaid is required; renew-time and rebind time are optional in this statement.
+
+.nf
+.B range\ <ipv6\ address>\ to\ <ipv6\ address>/<prefix\ length>;
+.fi
+This statement allows adminstrators to use "range" and "to" keywords and
+prefix length to specify an address range.
+For each range not more than one of the unassigned addresses will be
+assgined to the requested client.
+
+.nf
+.B duid\ <DUID\>;
+.fi
+DUID is a DHCP Unique Identifier for a DHCP participant. Using this option,
+the administrator can specify the DUID of this DHCPv6 client.
+The duid statement is valid only in host {} declarations.
+
+.nf
+.BI iaid\ <IAID\ number>;
+.fi
+IAID is a Identity Association Identifier. IA is a collection of addresses
+assigned to a client. Using this option, the administrator can specify the IAID
+in iaidinfo for a host declaration.
+
+.nf
+.BI renew-time\ <renew\ time>;
+.fi
+This statement allows administrators to specify the RenewTime (T1).
+The recommended value for RenewTime is .5 times the shortest preferred
+lifetime of the address in the IA, if the value is not defined.
+
+.nf
+.BI rebind-time\ <rebind\ time>;
+.fi
+This statement allows administrators to specify the RebindTime (T2).
+The recommended value for RenewTime is .8 times the shortest preferred 
+lifetime of the address in the IA, if the value is not defined.
+
+.nf
+.BI prefer-life-time\ <preferred\ lifetime>;
+.fi
+This statement allows administrators to specify the Preferred Life Time for 
+each address.
+
+.nf
+.BI valid-life-time\ <valid\ lifetime>;
+.fi
+This statement allows administrators to specify the Valid Life Time for 
+each address.
+
+.nf
+.BI option\ dns_server\ <ipv6\ addresses\ or\ domain\ name\ list>;
+.fi
+This statement allows administrators to specify the DNS servers.
+
+.B send\ <OPTION>;
+.fi
+This declaration enables dhcp6s to include the specified option in sending 
+DHCPv6 messages.
+
+.nf
+\fIsend\ unicast;\fR
+.fi
+This declaration enables dhcp6s to send a Server Unicast option. Usually
+DHCPv6 clients must use multicast addresses to contact the DHCPv6 server and
+agents. This declaration specifies that dhcp6s will accept unicast messages
+from DHCPv6 clients if they include a Server Unicast option.
+
+.nf
+\fIsend\ server-preference\ <server\ preference\ value>;\fR
+.fi
+This declaration enables dhcp6s to include a Preference option for sending
+DHCPv6 messages. DHCPv6 clients will pick up the DHCPv6 server which has
+highest preference value. The highest preference value is 255.
+
+.nf
+\fIsend\ temp-address;\fR
+.fi
+This declaration assigns a temporary address to the requesting client.
+
+.nf
+\fIsend\ information-only;\fR
+.fi
+This option enables dhcp6s to give only configuration information rather than
+assigning client addresses. This could be, for example, DNS server address
+configuration information.
+
+.nf
+.B allow\ <OPTION>;
+.fi
+This declaration allows the DHCPv6 client to specify an option in receiving
+DHCPv6 messages.
+
+.nf
+\fIallow rapid\-commit;\fR
+.fi
+This option enables dhcp6s to allow the Rapid-Commit option from the DHCPv6
+client and the Solicit-Reply message exchanges.
+
+.nf
+\fIallow\ unicast;\fR
+.fi
+This option enables dhcp6s to allow the Server Unicast option for the DHCPv6
+client. Usually DHCPv6 clients must use multicast addresses to contact DHCPv6
+server and agents. With this declaration, dhcp6s accepts unicast 
+messages from DHCPv6 clients if they include a Server Unicast option.
+
+
+.nf
+\fIuse-ra-prefix;\fR
+.fi
+This declaration tells the server not to send clients the address prefix configured
+in address or range statements. With this option, client address prefixes can
+be set only by router advertisements, and the prefix configured in address or
+range statements will be ignored. This is a Red Hat extension; previously, the
+only way to set client address prefixes was by router advertisement.
+
+.SH EXAMPLES
+.PP
+This is a sample of the dhcp6s.conf file.
+.nf
+.B option dns\_server 2003::6:1 ibm.com;
+.B prefer\-life\-time 10000;
+.B valid\-life\-time 20000;
+.B renew\-time 5000;
+.B rebind\-time 8000;
+.B interface eth1 {
+.B \tlink AAA {
+.B \t\tallow unicast;
+.B \t\tsend unicast;
+.B \t\tallow rapid-commit;
+.B \t\tsend server-preference 5;
+.B \t\trenew-time 1000;
+.B \t\trebind-time 2400;
+.B \t\tprefer-life-time 2000;
+.B \t\tvalid-life-time 3000;
+.B \t\trange 3ffe:ffff:100::10 to 3ffe:ffff:100::110/64;
+.B \t\tprefix 3ffe:ffef:104::/64;
+.B \t\tpool {
+.B \t\t\tprefer\-life\-time 3600;
+.B \t\t\tvalid\-life\-time 7200;
+.B \t\t\trange fec0:ffff::10 to fec0:ffff::110/64;
+.B \t\t\tprefix fec0:fffe::/48;
+.B \t\t};
+.B \t};
+.B \thost host0 {
+.B \t\tduid 00:00:00:00:a0:a0;
+.B \t\tiaidinfo {
+.B \t\t\tiaid 101010;
+.B \t\t\trenew-time 1000;
+.B \t\t\trebind-time 2000;
+.B \t\t};
+.B \t\taddress {
+.B \t\t\t3ffe:ffff:102::120/64;
+.B \t\t\tprefer-life-time 2000;
+.B \t\t\tvalid-life-time 3000;
+.B \t\t};
+.B \t};
+.B \tgroup {
+.B \t\tprefer\-life\-time 5000;
+.B \t\tvalid\-life\-time 6000;
+.B \t\thost host1 {
+.B \t\t\tduid 00:00:00:00:a1:a1;
+.B \t\t\tiaidinfo {
+.B \t\t\t\tiaid 101011;
+.B \t\t\t\trenew-time 1000;
+.B \t\t\t\trebind-time 2000;
+.B \t\t\t};
+.B \t\t};
+.B \t\thost host2 {
+.B \t\t\tduid 00:00:00:00:a2:a2;
+.B \t\t\tsend information-only;
+.B \t\t};
+.B \t};
+.B };
+.fi
+
+.SH SEE ALSO
+Dynamic Host Configuration Protocol for IPv6 (DHCPv6), IPv6 Prefix Options
+for DHCPv6, dhcp6s(5)
+
+.SH AUTHORS
+.LP
+Kazuo Hiekata <hiekata at yamato.ibm.com>
--- dhcp-0.10/client6_token.l.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/client6_token.l	2006-07-19 01:30:48.000000000 -0400
@@ -158,6 +158,7 @@
 	/* generic options */
 <S_CNF>information-only { DECHO; return (INFO_ONLY); }
 <S_CNF>temp-address { DECHO; return (TEMP_ADDR); }
+<S_CNF>use-ra-prefix { DECHO; return (USE_RA_PREFIX); }
 	/* duration */
 <S_CNF>infinity { DECHO; return (INFINITY); }
 
--- dhcp-0.10/dhcp6s.c.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/dhcp6s.c	2006-07-19 01:30:48.000000000 -0400
@@ -1024,7 +1024,27 @@
 	memset(dh6, 0, sizeof(*dh6));
 	dh6->dh6_msgtypexid = origmsg->dh6_msgtypexid;
 	dh6->dh6_msgtype = (u_int8_t)type;
+	
+	if ( optinfo->flags & DHCIFF_REQUEST_PREFIX )
+	{
+	    if ( ! ( (subnet && (subnet->linkscope.use_ra_prefix))
+		   ||(host && (host->hostscope.use_ra_prefix))
+		   )
+		)
+	    {
+		struct interface *ifnetwork;
+		int no_use_ra_prefix = 1;
+		for (ifnetwork = globalgroup->iflist; ifnetwork; ifnetwork = ifnetwork->next) 
+		{
+		    if (  ( ifp->ifname && ( strcmp( &(ifnetwork->name[0]), ifp->ifname ) == 0 ) )
+			&&(ifnetwork->ifscope.use_ra_prefix)
+			) no_use_ra_prefix = 0;			
+		}
 
+		if ( no_use_ra_prefix )
+		     roptinfo->flags |= DHCIFF_RESPOND_PREFIX;
+	    }
+	}
 	/* set options in the reply message */
 	if ((optlen = dhcp6_set_options((struct dhcp6opt *)(dh6 + 1),
 					(struct dhcp6opt *)(replybuf +
--- dhcp-0.10/config.h.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/config.h	2006-07-19 01:30:48.000000000 -0400
@@ -96,18 +96,21 @@
 #define DHCIFF_TEMP_ADDRS 0x4
 #define DHCIFF_PREFIX_DELEGATION 0x8
 #define DHCIFF_UNICAST 0x10
-
+#define DHCIFF_REQUEST_PREFIX 0x20
+#define DHCIFF_RESPOND_PREFIX 0x40
 
 	struct in6_addr linklocal;
 	int server_pref;	/* server preference (server only) */
 
+        int use_ra_prefix;
+
 	struct dhcp6_list reqopt_list;
 	/* request specific addresses list from client */
 	struct dhcp6_list addr_list;
 	struct dhcp6_list prefix_list;
 	struct dhcp6_option_list option_list;
 	struct dhcp6_serverinfo *current_server;
-	struct dhcp6_serverinfo *servers;
+	struct dhcp6_serverinfo *servers;    
 };
 
 struct dhcp6_event {
@@ -176,6 +179,8 @@
 	struct dhcp6_list reqopt_list;
 
 	struct dhcp6_option_list option_list;
+
+        int use_ra_prefix;  
 };
 
 struct prefix_ifconf {
@@ -282,7 +287,7 @@
       DECL_ADDRESS, DECL_LINKLOCAL, DECL_PREFIX_INFO, DECL_PREFIX_REQ, DECL_PREFIX_DELEGATION_INTERFACE,
       DHCPOPT_PREFIX_DELEGATION, IFPARAM_SLA_ID, IFPARAM_SLA_LEN,
       DHCPOPT_RAPID_COMMIT, 
-      DHCPOPT_DNS, ADDRESS_LIST_ENT };
+      DHCPOPT_DNS, ADDRESS_LIST_ENT, DECL_USE_RA_PREFIX };
 
 typedef enum {DHCP6_MODE_SERVER, DHCP6_MODE_CLIENT, DHCP6_MODE_RELAY }
 dhcp6_mode_t;
--- dhcp-0.10/client6_parse.y.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/client6_parse.y	2006-07-19 01:44:35.000000000 -0400
@@ -93,8 +93,8 @@
 %token INTERFACE IFNAME IPV6ADDR
 %token REQUEST SEND 
 %token RAPID_COMMIT PREFIX_DELEGATION DNS_SERVERS 
-%token INFO_ONLY TEMP_ADDR
-%token ADDRESS PREFIX IAID RENEW_TIME REBIND_TIME V_TIME P_TIME PREFIX_DELEGATION_INTERFACE
+%token INFO_ONLY TEMP_ADDR USE_RA_PREFIX
+%token ADDRESS PREFIX IAID RENEW_TIME REBIND_TIME V_TIME P_TIME PREFIX_DELEGATION_INTERFACE 
 %token NUMBER SLASH EOS BCL ECL STRING INFINITY
 %token COMMA OPTION
 
@@ -243,7 +243,17 @@
 			MAKE_CFLIST(l, DECL_PREFIX_DELEGATION_INTERFACE, pp, NULL );
 			
 			$$ = l;
-                }
+                }	     
+   
+	|	USE_RA_PREFIX EOS
+		{
+			struct cf_list *l;
+
+			MAKE_CFLIST(l, DECL_USE_RA_PREFIX, NULL, NULL);
+			/* no value */
+			$$ = l;
+		}
+ 
 	;
 
 dhcpoption:
@@ -270,7 +280,7 @@
 			MAKE_CFLIST(l, DHCPOPT_DNS, NULL, NULL);
 			/* currently no value */
 			$$ = l;
-		}
+		}        
 	;
 
 addrdecl:
--- dhcp-0.10/dhcp6c.conf.5.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/dhcp6c.conf.5	2006-07-19 01:37:22.000000000 -0400
@@ -1,176 +1,176 @@
-.\" $Id: dhcp6c.conf.5,v 1.2 2003/03/28 20:16:36 shirleyma Exp $
-.\"
-.\" Copyright (C) International Business Machines  Corp., 2003
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.TH dhcp6c.conf 5 "17 March 2003" "dhcp6c.conf" "Linux System Manager's Manual"
-
-.SH NAME
-dhcp6c.conf \- configuration file of the DHCPv6 client daemon, dhcp6c
-
-.SH DESCRIPTION
-.B dhcp6c.conf
-is a configuration file for dhcp6c (DHCPv6 client).
-
-dhcp6c is configured by the configuration information (such as rapid-commit,
-requesting temp-address, or prefix-delegation) in this file.
 
-dhcp6c.conf is an ASCII text file and lines that start with # are comments.
-
-.PP
-.BI STATEMENTS
-.PP
-.nf
-.B interface\ <interface\ name>
-.B {
-.B \t[declarations]
-.B };
-.fi
-Write configurations for this interface in this statement.
-In [declarations], options can be specified.
-
-.PP
-.BI DECLARATIONS
-.PP
-.nf
-.B send\ [dhcpoptions];
-.fi
-With this declaration, dhcp6c sends specified options.
-Currently rapid\-commit is defined.
-
-.nf
-\fIsend rapid\-commit;\fR
-.fi
-This declaration enables dhcp6c to request the dhcp6s server to perform a
-Rapid Commit.
-
-.nf
-.B request\ [dhcpoptions];
-.fi
-This declaration enables dhcp6c to request specified options.
-Currently temp\-address, domain\-name\-servers, and prefix\-delegation
-are defined.
-
-.nf
-\fIrequest domain\-name\-servers;\fR
-.fi
-The DHCPv6 mechanism provides a way to obtain configuration information
-such as a list of available DNS servers or NTP servers. This declaration
-enables dhcp6c to request a DNS server address from the DHCPv6 server. 
-
-.nf
-\fIrequest prefix\-delegation;\fR
-.fi
-This declaration enables dhcp6c to request a Prefix Delegation to the 
-DHCPv6 server. dhcp6c gets a prefix assignment from the DHCPv6 server.
-
-.nf
-\fIrequest temp\-address;\fR
-.fi
-This declaration enables dhcp6c to request temporary addresses.
-dhcp6c requests Non-temporary Addresses as default. This option makes
-dhcp6c request Temporary Addresses.
-
-.nf
-.B information-only;
-.fi
-This declaration enables dhcp6c to request host configuration information
-from the DHCPv6 server. If dhcp6c doesn't need to be assigned any addresses,
-this option should be specified.
-
-.nf
-.B address\ {
-.B \t[<ipv6\ address>/<prefix\ length>];
-.B \t[prefer-life-time\ <preferred\-lifetime>];
-.B \t[valid-life-time\ <valid\-lifetime>];
-.B };
-.fi
-This declaration defines the dhcp6c client preferred IPv6 address,
-the preferred lifetime of the address, and the valid lifetime for this
-interface.
-
-.nf
-.B prefix\ {
-.B \t[<ipv6\ prefix>/<prefix\ length>];
-.B \t[prefer-life-time\ <preferred\-lifetime>];
-.B \t[valid-life-time\ <valid\-lifetime>];
-.B };
-.fi
-This declaration defines the dhcp6c client acting as a requesting
-router for the preferred prefix, the prefix length, and the prefix's
-preferred lifetime, and valid lifetime for this interface.
-
-.nf
-.B prefer-life-time\ <preferred\-lifetime>;
-.fi
-This declaration sets the preferred lifetime (in seconds) of the address
-or prefix. This declaration is valid only in address or prefix declarations.
-
-.nf
-.B valid-life-time\ <valid\-lifetime>;
-.fi
-This declaration sets the valid lifetime (in seconds) of the address or
-prefix.
-This declaration is valid only in address or prefix declarations.
-
-.nf
-.B renew-time\ <renew-time>;
-.fi
-This declaration specifies the Renew Time (in seconds) for this Identity
-Association (IA). Renew Time is a T1 value in an IA option. dhcp6c sets the
-Renew Time in IA options to the specified value.
-
-.nf
-.B rebind-time\ <rebind-time>;
-.fi
-This declaration specifies the Rebind Time (in seconds) for this IA. Rebind
-Time is T2 value in an IA option. dhcp6c sets the Rebind Time in IA options
-to the specified value.
-
-.PP
-.BI DHCPOPTIONS
-.PP
-.nf
-.B rapid\-commit
-.fi
-If this option is used in a "send [dhcpoptions];" declaration, 
-dhcp6c sends DHCPv6 messages with a Rapid Commit option.
-
-.nf
-.B domain\-name\-servers
-.fi
-If this option is used in a "request [dhcpoptions];" declaration, 
-dhcp6c requests the DNS server address via the DHCPv6 mechanism.
-
-.nf
-.B prefix\-delegation
-.fi
-If this option is used in a "request [dhcpoptions];" declaration, 
-dhcp6c requests a Prefix Delegation to the DHCPv6 servers.
-
+.\" $Id: dhcp6c.conf.5,v 1.2 2003/03/28 20:16:36 shirleyma Exp $
+.\"
+.\" Copyright (C) International Business Machines  Corp., 2003
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the project nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.TH dhcp6c.conf 5 "17 March 2003" "dhcp6c.conf" "Linux System Manager's Manual"
+
+.SH NAME
+dhcp6c.conf \- configuration file of the DHCPv6 client daemon, dhcp6c
+
+.SH DESCRIPTION
+.B dhcp6c.conf
+is a configuration file for dhcp6c (DHCPv6 client).
+
+dhcp6c is configured by the configuration information (such as rapid-commit,
+requesting temp-address, or prefix-delegation) in this file. 
+dhcp6c.conf is an ASCII text file and lines that start with # are comments.
+
+.PP
+.BI STATEMENTS
+.PP
+.nf
+.B interface\ <interface\ name>
+.B {
+.B \t[declarations]
+.B };
+.fi
+Write configurations for this interface in this statement.
+In [declarations], options can be specified.
+
+.PP
+.BI DECLARATIONS
+.PP
+.nf
+.B send\ [dhcpoptions];
+.fi
+With this declaration, dhcp6c sends specified options.
+Currently rapid\-commit is defined.
+
+.nf
+\fIsend rapid\-commit;\fR
+.fi
+This declaration enables dhcp6c to request the dhcp6s server to perform a
+Rapid Commit.
+
+.nf
+.B request\ [dhcpoptions];
+.fi
+This declaration enables dhcp6c to request specified options.
+Currently temp\-address, domain\-name\-servers, and prefix\-delegation
+are defined.
+
+.nf
+\fIrequest domain\-name\-servers;\fR
+.fi
+The DHCPv6 mechanism provides a way to obtain configuration information
+such as a list of available DNS servers or NTP servers. This declaration
+enables dhcp6c to request a DNS server address from the DHCPv6 server. 
+
+.nf
+\fIrequest prefix\-delegation;\fR
+.fi
+This declaration enables dhcp6c to request a Prefix Delegation to the 
+DHCPv6 server. dhcp6c gets a prefix assignment from the DHCPv6 server.
+
+.nf
+\fIrequest temp\-address;\fR
+.fi
+This declaration enables dhcp6c to request temporary addresses.
+dhcp6c requests Non-temporary Addresses as default. This option makes
+dhcp6c request Temporary Addresses.
+
+.nf
+.B information-only;
+.fi
+This declaration enables dhcp6c to request host configuration information
+from the DHCPv6 server. If dhcp6c doesn't need to be assigned any addresses,
+this option should be specified.
+
+.nf
+.B address\ {
+.B \t[<ipv6\ address>/<prefix\ length>];
+.B \t[prefer-life-time\ <preferred\-lifetime>];
+.B \t[valid-life-time\ <valid\-lifetime>];
+.B };
+.fi
+This declaration defines the dhcp6c client preferred IPv6 address,
+the preferred lifetime of the address, and the valid lifetime for this
+interface.
+
+.nf
+.B prefix\ {
+.B \t[<ipv6\ prefix>/<prefix\ length>];
+.B \t[prefer-life-time\ <preferred\-lifetime>];
+.B \t[valid-life-time\ <valid\-lifetime>];
+.B };
+.fi
+This declaration defines the dhcp6c client acting as a requesting
+router for the preferred prefix, the prefix length, and the prefix's
+preferred lifetime, and valid lifetime for this interface.
+
+.nf
+.B prefer-life-time\ <preferred\-lifetime>;
+.fi
+This declaration sets the preferred lifetime (in seconds) of the address
+or prefix. This declaration is valid only in address or prefix declarations.
+
+.nf
+.B valid-life-time\ <valid\-lifetime>;
+.fi
+This declaration sets the valid lifetime (in seconds) of the address or
+prefix.
+This declaration is valid only in address or prefix declarations.
+
+.nf
+.B renew-time\ <renew-time>;
+.fi
+This declaration specifies the Renew Time (in seconds) for this Identity
+Association (IA). Renew Time is a T1 value in an IA option. dhcp6c sets the
+Renew Time in IA options to the specified value.
+
+.nf
+.B rebind-time\ <rebind-time>;
+.fi
+This declaration specifies the Rebind Time (in seconds) for this IA. Rebind
+Time is T2 value in an IA option. dhcp6c sets the Rebind Time in IA options
+to the specified value.
+
+.PP
+.BI DHCPOPTIONS
+.PP
+.nf
+.B rapid\-commit
+.fi
+If this option is used in a "send [dhcpoptions];" declaration, 
+dhcp6c sends DHCPv6 messages with a Rapid Commit option.
+
+.nf
+.B domain\-name\-servers
+.fi
+If this option is used in a "request [dhcpoptions];" declaration, 
+dhcp6c requests the DNS server address via the DHCPv6 mechanism.
+
+.nf
+.B prefix\-delegation
+.fi
+If this option is used in a "request [dhcpoptions];" declaration, 
+dhcp6c requests a Prefix Delegation to the DHCPv6 servers.
+
 .nf
 .B prefix\-delegation\-interface <interface name>
 Specifies the name of the interface definition in radvd.conf 
@@ -178,32 +178,41 @@
 dhcp6c will write a radvd.conf prefix declaration for the interface
 on which it receives the prefix delegation lease.
 
-.SH EXAMPLES
-.PP
-This is a sample of the dhcp6c.conf file.
-.nf
-.B interface eth0 {
-.B \tsend rapid-commit;
-.B \trequest prefix-delegation;
-.B \trequest domain-name-servers;
-.B \trequest temp-address;
-.B \tiaid 11111;
-.B \taddress {
-.B \t\t3ffe:10::10/64;
-.B \t\tprefer-life-time 6000;
-.B \t\tvalid-life-time 8000;
-.B \t};
-.B \trenew-time 11000;
-.B \trebind-time 21000;
-.B };
-.fi
-
-.SH SEE ALSO
-Dynamic Host Configuration Protocol for IPv6 (DHCPv6), IPv6 Prefix Options
-for DHCPv6, dhcp6c(5)
-
-.SH AUTHORS
-.LP
-Kazuo Hiekata <hiekata at yamato.ibm.com>
-
-
+.nf
+\fIuse-ra-prefix;\fR
+.fi
+This declaration tells the client not to request the address prefix configured
+in the server's address or range statements. With this option, client address
+prefixes can be set only by router advertisements, and the prefix configured in
+server address or range statements will be ignored. This is a Red Hat extension;
+previously, the only way to set client address prefixes was by router advertisement.
+
+.SH EXAMPLES
+.PP
+This is a sample of the dhcp6c.conf file.
+.nf
+.B interface eth0 {
+.B \tsend rapid-commit;
+.B \trequest prefix-delegation;
+.B \trequest domain-name-servers;
+.B \trequest temp-address;
+.B \tiaid 11111;
+.B \taddress {
+.B \t\t3ffe:10::10/64;
+.B \t\tprefer-life-time 6000;
+.B \t\tvalid-life-time 8000;
+.B \t};
+.B \trenew-time 11000;
+.B \trebind-time 21000;
+.B };
+.fi
+
+.SH SEE ALSO
+Dynamic Host Configuration Protocol for IPv6 (DHCPv6), IPv6 Prefix Options
+for DHCPv6, dhcp6c(5)
+
+.SH AUTHORS
+.LP
+Kazuo Hiekata <hiekata at yamato.ibm.com>
+
+
--- dhcp-0.10/server6_token.l.prefix_bz196429	2003-07-16 15:09:53.000000000 -0400
+++ dhcp-0.10/server6_token.l	2006-07-19 01:30:48.000000000 -0400
@@ -118,6 +118,7 @@
 valid-life-time	 { return VALIDLIFETIME; }
 prefer-life-time { return PREFERLIFETIME; }
 server-preference { return PREFERENCE; }
+use-ra-prefix     { return USE_RA_PREFIX; }
 
 to	{ return TO; }
 infinity	{ return INFINITY; }
--- dhcp-0.10/server6_conf.h.prefix_bz196429	2003-04-30 15:04:14.000000000 -0400
+++ dhcp-0.10/server6_conf.h	2006-07-19 01:30:48.000000000 -0400
@@ -50,6 +50,7 @@
 	u_int8_t send_flags;
 	u_int8_t allow_flags;
 	struct dns_list dnslist;
+        u_int8_t use_ra_prefix;
 };
 
 struct scopelist {
--- dhcp-0.10/server6_parse.y.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/server6_parse.y	2006-07-19 01:30:48.000000000 -0400
@@ -107,6 +107,7 @@
 %token	<str>	IAID IAIDINFO
 %token  <str>	INFO_ONLY
 %token	<str>	TO
+%token  <str>   USE_RA_PREFIX
 
 %token	<str>	BAD_TOKEN
 %type	<str>	name
@@ -903,6 +904,15 @@
 			dprintf(LOG_ERR, "%s" "bad server preference number", FNAME);
 		currentscope->scope->server_pref = $2;
 	}
+        | USE_RA_PREFIX ';'
+        {
+	       if (!currentscope) {
+			currentscope = push_double_list(currentscope, &globalgroup->scope);
+			if (currentscope == NULL)
+				ABORT;
+	       }
+	       currentscope->scope->use_ra_prefix = 1;
+	}
 	;
 
 number_or_infinity
--- dhcp-0.10/common.c.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/common.c	2006-07-19 01:30:48.000000000 -0400
@@ -1046,6 +1046,11 @@
 				goto malformed;
 			optinfo->flags |= DHCIFF_RAPID_COMMIT;
 			break;
+		case DH6OPT_REQUEST_PREFIX:
+			if (optlen != 0)
+				goto malformed;
+			optinfo->flags |= DHCIFF_REQUEST_PREFIX;
+			break;
 		case DH6OPT_UNICAST:
 			if (optlen != sizeof(struct in6_addr)
 			    && dhcp6_mode != DHCP6_MODE_CLIENT)
@@ -1222,7 +1227,6 @@
 			memcpy(&addr6.addr, (struct in6_addr *)cp, sizeof(struct in6_addr));
 			addr6.preferlifetime = ntohl(ai.preferlifetime);
 			addr6.validlifetime = ntohl(ai.validlifetime);
-			addr6.plen = ai.plen;
 			dprintf(LOG_DEBUG, "  get IAADR address information: "
 			    "%s preferlifetime %d validlifetime %d",
 			    in6addr2str(&addr6.addr, 0),
@@ -1235,6 +1239,12 @@
 				    "(%d)", addr6.preferlifetime, addr6.validlifetime);
 				goto malformed;
 			}
+			if ( optlen & 1 )
+			{ 
+			    addr6.plen = *(p + sizeof(ai));
+			    optlen -= 1;
+			    p++;
+			}
 			if (optlen == sizeof(ai) - sizeof(u_int32_t)) {
 				addr6.status_code = DH6OPT_STCODE_UNDEFINE;
 				break;
@@ -1380,6 +1390,9 @@
 	if (optinfo->flags & DHCIFF_RAPID_COMMIT)
 		COPY_OPTION(DH6OPT_RAPID_COMMIT, 0, "", p);
 
+	if (optinfo->flags & DHCIFF_REQUEST_PREFIX)
+		COPY_OPTION(DH6OPT_REQUEST_PREFIX, 0, "", p);
+
 	if ((dhcp6_mode == DHCP6_MODE_SERVER) && (optinfo->flags & DHCIFF_UNICAST)) {
 		if (!IN6_IS_ADDR_UNSPECIFIED(&optinfo->server_addr)) {
 			COPY_OPTION(DH6OPT_UNICAST, sizeof(optinfo->server_addr),
@@ -1432,27 +1445,40 @@
 		if (!TAILQ_EMPTY(&optinfo->addr_list)) {
 			for (dp = TAILQ_FIRST(&optinfo->addr_list); dp; 
 			     dp = TAILQ_NEXT(dp, link)) {
-				int iaddr_len = 0;
+				int iaddr_len = 
+				 (dp->val_dhcp6addr.plen &&
+				 ( optinfo->flags & DHCIFF_RESPOND_PREFIX )
+				  ) ? 1 : 0; 
 				memset(&ai, 0, sizeof(ai));
 				ai.dh6_ai_type = htons(DH6OPT_IADDR);
 				if (dp->val_dhcp6addr.status_code != DH6OPT_STCODE_UNDEFINE) 
-					iaddr_len = sizeof(ai) - sizeof(u_int32_t) 
+					iaddr_len += sizeof(ai) - sizeof(u_int32_t) 
 								+ sizeof(status);
 				else 
-					iaddr_len = sizeof(ai) - sizeof(u_int32_t);
+					iaddr_len += sizeof(ai) - sizeof(u_int32_t);
 				ai.dh6_ai_len = htons(iaddr_len);
 				ai.preferlifetime = htonl(dp->val_dhcp6addr.preferlifetime);
 				ai.validlifetime = htonl(dp->val_dhcp6addr.validlifetime);
-				ai.plen = dp->val_dhcp6addr.plen;
 				memcpy(&ai.addr, &dp->val_dhcp6addr.addr,
 			       		sizeof(ai.addr));
 				memcpy(tp, &ai, sizeof(ai));
 				tp += sizeof(ai);
+				if(  dp->val_dhcp6addr.plen &&
+				   ( optinfo->flags & DHCIFF_RESPOND_PREFIX )
+				  )
+				{
+				    *tp = dp->val_dhcp6addr.plen;
+				    optlen += 1;				    
+				    ++tp;
+				}
 				dprintf(LOG_DEBUG, "set IADDR address option len %d: "
-			    		"%s preferlifetime %d validlifetime %d", 
+			    		"%s preferlifetime %d validlifetime %d prefix:%d", 
 			    		iaddr_len, in6addr2str(&ai.addr, 0), 
 			    		ntohl(ai.preferlifetime), 
-					ntohl(ai.validlifetime));
+					ntohl(ai.validlifetime),
+					( optinfo->flags & DHCIFF_RESPOND_PREFIX )
+					? dp->val_dhcp6addr.plen : 0
+				       );
 				/* set up address status code if any */
 				if (dp->val_dhcp6addr.status_code != DH6OPT_STCODE_UNDEFINE) {
 					status.dh6_status_type = htons(DH6OPT_STATUS_CODE);
@@ -1465,6 +1491,8 @@
 			    		dhcp6_stcodestr(ntohs(status.dh6_status_code)));
 					optlen += sizeof(status);
 					tp += sizeof(status);
+					dprintf(LOG_DEBUG, "set IADDR status len %d optlen: %d",
+						sizeof(status), optlen);
 					/* XXX: copy status message if any */
 				}
 			}
--- dhcp-0.10/client6_addr.c.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/client6_addr.c	2006-07-19 01:30:48.000000000 -0400
@@ -110,8 +110,11 @@
 	/* add new address */
 	for (lv = TAILQ_FIRST(&optinfo->addr_list); lv; lv = lv_next) {
 		lv_next = TAILQ_NEXT(lv, link);
-/*
-		if (lv->val_dhcp6addr.type != IAPD) {	
+
+		if ( (lv->val_dhcp6addr.type != IAPD) 
+		   &&(lv->val_dhcp6addr.plen == 0) 
+		   )
+		{	
 			lv->val_dhcp6addr.plen = 
 				dhcp6_get_prefixlen(&lv->val_dhcp6addr.addr, dhcp6_if);
 			if (lv->val_dhcp6addr.plen == PREFIX_LEN_NOTINRA) {
@@ -121,7 +124,7 @@
 					in6addr2str(&lv->val_dhcp6addr.addr, 0));
 			}
 		}
-*/
+
 		if ((cl_lease = dhcp6_find_lease(&client6_iaidaddr, 
 						&lv->val_dhcp6addr)) != NULL) {
 			dhcp6_update_lease(&lv->val_dhcp6addr, cl_lease);
@@ -337,17 +340,21 @@
 	/* flag == ADDR_UPDATE */
 	for (lv = TAILQ_FIRST(&optinfo->addr_list); lv; lv = lv_next) {
 		lv_next = TAILQ_NEXT(lv, link);
-/*
-		if (lv->val_dhcp6addr.type != IAPD) {	
+
+		if ( (lv->val_dhcp6addr.type != IAPD) 
+		   &&(lv->val_dhcp6addr.plen == 0) 
+		   )
+		{	
 			lv->val_dhcp6addr.plen = 
 				dhcp6_get_prefixlen(&lv->val_dhcp6addr.addr, dhcp6_if);
 			if (lv->val_dhcp6addr.plen == PREFIX_LEN_NOTINRA) {
 				dprintf(LOG_WARNING, "assigned address %s is not in any RAs"
 					" prefix length using 64 bit instead",
 					in6addr2str(&lv->val_dhcp6addr.addr, 0)); 
+		
 			}
 		}
-*/
+
 		if ((cl = dhcp6_find_lease(&client6_iaidaddr, &lv->val_dhcp6addr)) != NULL) {
 		/* update leases */
 			dhcp6_update_lease(&lv->val_dhcp6addr, cl);
--- dhcp-0.10/config.c.prefix_bz196429	2006-07-19 01:30:48.000000000 -0400
+++ dhcp-0.10/config.c	2006-07-19 01:30:48.000000000 -0400
@@ -195,6 +195,9 @@
 					goto bad;
 				}
 				break;
+			case DECL_USE_RA_PREFIX:
+			        ifc->use_ra_prefix = 1;
+				break;
 			default:
 				dprintf(LOG_ERR, "%s" "%s:%d "
 					"invalid interface configuration",
@@ -478,6 +481,8 @@
 
 			ifp->server_pref = ifc->server_pref;
 
+			ifp->use_ra_prefix = ifc->use_ra_prefix;
+
 			memcpy(&ifp->iaidinfo, &ifc->iaidinfo, sizeof(ifp->iaidinfo));
 		}
 	}
--- dhcp-0.10/server6_conf.c.prefix_bz196429	2004-03-15 17:03:52.000000000 -0500
+++ dhcp-0.10/server6_conf.c	2006-07-19 01:30:48.000000000 -0400
@@ -293,6 +293,8 @@
 		dhcp6_copy_list(&current->dnslist.addrlist, &up->dnslist.addrlist);
 	if (current->dnslist.domainlist == NULL)
 		current->dnslist.domainlist = up->dnslist.domainlist;
+	if ( current->use_ra_prefix )
+	    up->use_ra_prefix = 1;
 	return;
 }
 

dhcpv6-0.10-libdhcp6client.patch:
 client6_addr.c    |   61 +++++--
 common.c          |   37 +++-
 dhc6_alloc.c      |   67 ++++++++
 dhc6_alloc.h      |   17 ++
 dhcp6.h           |   17 +-
 dhcp6c.c          |  447 +++++++++++++++++++++++++++++++++++++++++++++++-------
 dhcp6client.h     |   22 ++
 lease.c           |   10 -
 lease.h           |    2 
 lease_token.l     |    3 
 libdhcp_control.h |  104 ++++++++++++
 11 files changed, 705 insertions(+), 82 deletions(-)

Index: dhcpv6-0.10-libdhcp6client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-libdhcp6client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcpv6-0.10-libdhcp6client.patch	22 Jun 2006 17:23:31 -0000	1.6
+++ dhcpv6-0.10-libdhcp6client.patch	19 Jul 2006 06:46:03 -0000	1.7
@@ -1,6 +1,17 @@
-diff -urN dhcp-0.10.orig/libdhcp6client/client6_addr.c dhcp-0.10/libdhcp6client/client6_addr.c
---- dhcp-0.10.orig/libdhcp6client/client6_addr.c	2006-06-22 11:45:08.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-06-22 11:46:51.000000000 -0400
+--- dhcp-0.10/libdhcp6client/lease_token.l.libdhcp6client	2004-02-04 18:29:24.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease_token.l	2006-07-19 01:30:57.000000000 -0400
+@@ -241,6 +241,9 @@
+ 	
+ 	fseek(file, 0, 0);
+ 	yyin = file;
++	yy_init=1;
++	yy_start=0;
++	yy_current_buffer=0;
+ 	yylex(); 
+ 	return;
+ }
+--- dhcp-0.10/libdhcp6client/client6_addr.c.libdhcp6client	2006-07-19 01:30:48.000000000 -0400
++++ dhcp-0.10/libdhcp6client/client6_addr.c	2006-07-19 01:30:57.000000000 -0400
 @@ -56,6 +56,10 @@
  #include "timer.h"
  #include "lease.h"
@@ -12,7 +23,7 @@
  static int dhcp6_update_lease __P((struct dhcp6_addr *, struct dhcp6_lease *));
  static int dhcp6_add_lease __P((struct dhcp6_addr *));
  struct dhcp6_lease *dhcp6_find_lease __P((struct dhcp6_iaidaddr *, 
-@@ -217,7 +221,7 @@
+@@ -220,7 +224,7 @@
  	sp->iaidaddr = &client6_iaidaddr;
  	time(&sp->start_date);
  	sp->state = ACTIVE;
@@ -21,7 +32,7 @@
  		dprintf(LOG_ERR, "%s" "failed to write a new lease address %s to lease file", 
  			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
  		if (sp->timer)
-@@ -228,14 +232,24 @@
+@@ -231,14 +235,24 @@
  	if (sp->lease_addr.type == IAPD) {
  		dprintf(LOG_INFO, "request prefix is %s/%d", 
  			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
@@ -53,7 +64,7 @@
  	TAILQ_INSERT_TAIL(&client6_iaidaddr.lease_list, sp, link);
  	/* for infinite lifetime don't do any timer */
  	if (sp->lease_addr.validlifetime == DHCP6_DURATITION_INFINITE || 
-@@ -282,7 +296,12 @@
+@@ -285,7 +299,12 @@
  	dprintf(LOG_DEBUG, "%s" "removing address %s", FNAME,
  		in6addr2str(&sp->lease_addr.addr, 0));
  	sp->state = INVALID;
@@ -67,7 +78,7 @@
  		dprintf(LOG_INFO, "%s" 
  			"failed to write removed lease address %s to lease file", 
  			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -294,10 +313,17 @@
+@@ -297,10 +316,17 @@
  			in6addr2str(&sp->lease_addr.addr, 0), sp->lease_addr.plen);
  		/* XXX: remove from the update prefix list */
  
@@ -87,7 +98,7 @@
  	/* remove expired timer for this lease. */
  	if (sp->timer)
  		dhcp6_remove_timer(sp->timer);
-@@ -446,7 +472,12 @@
+@@ -453,7 +479,12 @@
  	memcpy(&sp->lease_addr, addr, sizeof(sp->lease_addr));
  	sp->state = ACTIVE;
  	time(&sp->start_date);
@@ -101,7 +112,7 @@
  		dprintf(LOG_ERR, "%s" 
  			"failed to write an updated lease address %s to lease file", 
  			FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -670,7 +701,7 @@
+@@ -677,7 +708,7 @@
  		return (-1);
  	}
  
@@ -110,7 +121,7 @@
  	    in6addr2str(&ifaddr->addr, 0), ifp->ifname);
  	close(s); 
  	return (0);
-@@ -700,7 +731,7 @@
+@@ -707,7 +738,7 @@
  create_iaid(struct iaid_table *iaidtab, int num_device)
  {
  	struct iaid_table *temp = iaidtab;
@@ -119,7 +130,7 @@
  	int i;
  	
  	if ( getifaddrs( &ifap ) != 0 )
-@@ -709,7 +740,7 @@
+@@ -716,7 +747,7 @@
  		return -1;
  	}
  
@@ -128,258 +139,8 @@
  	     (ifa != 0L) && ( i < MAX_DEVICE );
  	     i++, ifa = ifa->ifa_next
  	    )
-diff -urN dhcp-0.10.orig/libdhcp6client/common.c dhcp-0.10/libdhcp6client/common.c
---- dhcp-0.10.orig/libdhcp6client/common.c	2006-06-22 11:45:08.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/common.c	2006-06-22 11:46:51.000000000 -0400
-@@ -79,11 +79,19 @@
- #include "timer.h"
- #include "lease.h"
- 
-+#ifdef LIBDHCP
-+#include "libdhcp_control.h"
-+#endif
-+
- int foreground;
- int debug_thresh;
- struct dhcp6_if *dhcp6_if;
- struct dns_list dnslist;
-+#ifdef LIBDHCP
-+struct host_conf *host_conflist;
-+#else
- static struct host_conf *host_conflist;
-+#endif
- static int in6_matchflags __P((struct sockaddr *, char *, int));
- ssize_t gethwid __P((char *, int, const char *, u_int16_t *));
- static int get_assigned_ipv6addrs __P((char *, char *,
-@@ -645,7 +653,7 @@
- 	memset(&ifr, 0, sizeof(ifr));
- 	strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
- 	ifr.ifr_addr = *(struct sockaddr *)addr;
--
-+	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
- 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
- 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
- 		     addr2str(addr));
-@@ -720,6 +728,9 @@
- 	struct dhcp6_duid_type1 *dp; /* we only support the type1 DUID */
- 	char tmpbuf[256];	/* DUID should be no more than 256 bytes */
- 
-+#ifdef LIBDHCP
-+     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
-+#endif
- 	if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
- 		dprintf(LOG_NOTICE, "%s" "failed to open DUID file: %s",
- 		    FNAME, idfile);
-@@ -774,6 +785,9 @@
- 	}
- 
- 	/* save the (new) ID to the file for next time */
-+#ifdef LIBDHCP
-+     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
-+#endif
- 	if (!fp) {
- 		if ((fp = fopen(idfile, "w+")) == NULL) {
- 			dprintf(LOG_ERR, "%s"
-@@ -821,8 +835,13 @@
- 		return -1;
- 
- 	strcpy(if_hwaddr.ifr_name, ifname);
-+	dprintf(LOG_DEBUG,"gethwid: ioctl SIOCGIFHWADDR");
- 	if (ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr) < 0)
-+	{
-+	    close(skfd);
- 		return -1;
-+	}
-+	close(skfd);
- 	/* only support Ethernet */
- 	switch (if_hwaddr.ifr_hwaddr.sa_family) {
- 	case ARPHRD_ETHER:
-@@ -938,7 +957,7 @@
- 		cp = (char *)(p + 1);
- 		np = (struct dhcp6opt *)(cp + optlen);
- 
--		dprintf(LOG_DEBUG, "%s" "get DHCP option %s, len %d",
-+		dprintf(LOG_INFO, "%s" "get DHCP option %s, len %d",
- 		    FNAME, dhcp6optstr(opt), optlen);
- 
- 		/* option length field overrun */
-@@ -1078,7 +1097,7 @@
- 				ntohl(*(u_int32_t *)(cp + sizeof(u_int32_t)));
- 			optinfo->iaidinfo.rebindtime = 
- 				ntohl(*(u_int32_t *)(cp + 2 * sizeof(u_int32_t)));
--			dprintf(LOG_DEBUG, "get option iaid is %u, renewtime %u, "
-+			dprintf(LOG_INFO, "get option iaid is %u, renewtime %u, "
- 				"rebindtime %u", optinfo->iaidinfo.iaid,
- 				optinfo->iaidinfo.renewtime, optinfo->iaidinfo.rebindtime);
- 			if (get_assigned_ipv6addrs(cp + 3 * sizeof(u_int32_t), 
-@@ -1182,7 +1201,7 @@
- 		opt = ntohs(opth.dh6opt_type);
- 		cp = p + sizeof(opth);
- 		np = cp + optlen;
--		dprintf(LOG_DEBUG, "  IA address option: %s, "
-+		dprintf(LOG_INFO, "  IA address option: %s, "
- 			"len %d", dhcp6optstr(opt), optlen);
- 
- 		if (np > ep) {
-@@ -1212,7 +1231,7 @@
- 			}
- 			break;
- 		case DH6OPT_IADDR:
--			if (optlen < sizeof(ai) - sizeof(u_int32_t))
-+			if (optlen < sizeof(ai)- sizeof(u_int32_t))
- 				goto malformed;
- 			memcpy(&ai, p, sizeof(ai));
- 			/* copy the information into internal format */
-@@ -1221,7 +1240,7 @@
- 			addr6.preferlifetime = ntohl(ai.preferlifetime);
- 			addr6.validlifetime = ntohl(ai.validlifetime);
- 			addr6.plen = ai.plen;
--			dprintf(LOG_DEBUG, "  get IAADR address information: "
-+			dprintf(LOG_INFO, "  get IAADR address information: "
- 			    "%s preferlifetime %d validlifetime %d",
- 			    in6addr2str(&addr6.addr, 0),
- 			    addr6.preferlifetime, addr6.validlifetime);
-@@ -1998,8 +2017,16 @@
- 	va_list ap;
- 	char logbuf[LINE_MAX];
- 
-+#if LIBDHCP
-+	va_start(ap, fmt);
-+	if ( libdhcp_control && libdhcp_control->eh )
-+	    libdhcp_control->eh(libdhcp_control, level, fmt, ap);
-+	va_end(ap);
-+	return;
-+#endif
- 	va_start(ap, fmt);
- 	vsnprintf(logbuf, sizeof(logbuf), fmt, ap);
-+	va_end(ap);
- 
- 	if (foreground && debug_thresh >= level) {
- 		time_t now;
-diff -urN dhcp-0.10.orig/libdhcp6client/dhc6_alloc.c dhcp-0.10/libdhcp6client/dhc6_alloc.c
---- dhcp-0.10.orig/libdhcp6client/dhc6_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-06-22 11:46:51.000000000 -0400
-@@ -0,0 +1,67 @@
-+#include <malloc.h>
-+#include <search.h>
-+extern void tdestroy (void *root, void (*free_node)(void *nodep));
-+void *ifp_ptr;
-+
-+static void *ptr_tree=0L;
-+
-+static int ptr_comparator( const void *p1, const void *p2 )
-+{
-+    return
-+	(  (p1 == p2) 
-+	   ? 0
-+	   :( (p1 > p2)
-+	      ? 1
-+	      : -1
-+	    )
-+	);
-+}
-+
-+void *dhc6_alloc( size_t s )
-+{
-+    void *ptr = malloc( s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+void *dhc6_realloc( void *ptr, size_t s )
-+{
-+    void *ptr2 = realloc(ptr, s);
-+    if ( ptr2 != 0 )
-+    {
-+	if ( ptr != 0 )
-+	    tdelete(ptr,&(ptr_tree), ptr_comparator);
-+	tsearch(ptr2, &(ptr_tree), ptr_comparator);
-+    }
-+    return ptr2;
-+}
-+
-+void *dhc6_calloc( size_t n, size_t s )
-+{
-+    void *ptr = calloc( n, s );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+char *dhc6_strdup( char *str )
-+{
-+    char *ptr = strdup( str );
-+    if ( ptr != 0 )
-+	tsearch(ptr, &(ptr_tree), ptr_comparator);
-+    return ptr;
-+}
-+
-+void dhc6_free( void *ptr )
-+{
-+    free(ptr);
-+    tdelete(ptr, &(ptr_tree), ptr_comparator);
-+}
-+
-+void dhc6_free_all_pointers(void)
-+{
-+    if( ptr_tree != 0L )
-+	tdestroy(ptr_tree, free);
-+    ptr_tree = 0L;
-+}
-diff -urN dhcp-0.10.orig/libdhcp6client/dhc6_alloc.h dhcp-0.10/libdhcp6client/dhc6_alloc.h
---- dhcp-0.10.orig/libdhcp6client/dhc6_alloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-06-22 11:46:51.000000000 -0400
-@@ -0,0 +1,17 @@
-+
-+extern void *dhc6_alloc( size_t );
-+extern void *dhc6_realloc(void *, size_t);
-+extern void *dhc6_calloc(size_t, size_t);
-+extern char *dhc6_strdup(char *str);
-+extern void dhc6_free( void *);
-+extern void dhc6_free_all_pointers(void);
-+#undef malloc
-+#define malloc( size ) dhc6_alloc( size )
-+#undef realloc
-+#define realloc(ptr, size) dhc6_realloc(ptr, size)
-+#undef calloc
-+#define calloc(n, size) dhc6_calloc(n, size)
-+#undef free
-+#define free( ptr ) dhc6_free( ptr )
-+#undef strdup
-+#define strdup( str ) dhc6_strdup( str )
-diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6.h dhcp-0.10/libdhcp6client/dhcp6.h
---- dhcp-0.10.orig/libdhcp6client/dhcp6.h	2006-06-22 11:45:08.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-06-22 11:46:51.000000000 -0400
-@@ -116,9 +116,24 @@
- 
- typedef enum { IANA, IATA, IAPD} iatype_t;
- 
--typedef enum { ACTIVE, RENEW,
-+#ifdef LIBDHCP
-+typedef enum { DHCP6_ACTIVE=1, DHCP6_RENEW,
-+	       DHCP6_REBIND, DHCP6_EXPIRED,
-+	       DHCP6_INVALID } state_t;
-+
-+#define ACTIVE 	DHCP6_ACTIVE
-+#define RENEW  	DHCP6_RENEW
-+#define REBIND	DHCP6_REBIND
-+#define EXPIRED	DHCP6_EXPIRED
-+#define INVALID DHCP6_INVALID
-+#include <libdhcp_control.h>
-+extern LIBDHCP_Control *libdhcp_control;
-+#include <dhc6_alloc.h>
-+#else
-+typedef enum { ACTIVE=1, RENEW,
- 	       REBIND, EXPIRED,
- 	       INVALID } state_t;
-+#endif
- /* Internal data structure */
- 
- struct duid {
-diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6c.c dhcp-0.10/libdhcp6client/dhcp6c.c
---- dhcp-0.10.orig/libdhcp6client/dhcp6c.c	2006-06-22 11:45:08.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-22 11:47:19.000000000 -0400
+--- dhcp-0.10/libdhcp6client/dhcp6c.c.libdhcp6client	2006-07-19 01:30:48.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-07-19 01:30:57.000000000 -0400
 @@ -73,6 +73,9 @@
  #include "common.h"
  #include "timer.h"
@@ -403,7 +164,7 @@
  
  extern char *raproc_file;
  extern char *ifproc_file;
-@@ -154,20 +157,35 @@
+@@ -155,20 +158,35 @@
  #define DUID_FILE "/var/lib/dhcpv6/dhcp6c_duid"
  
  static int pid;
@@ -441,7 +202,7 @@
  
  	pid = getpid();
  	srandom(time(NULL) & pid);
-@@ -283,16 +301,22 @@
+@@ -284,16 +302,22 @@
  			err(1, "daemon");
  		openlog(progname, LOG_NDELAY|LOG_PID, LOG_DAEMON);
  	}
@@ -466,7 +227,7 @@
  	if ((cfparse(conffile)) != 0) {
  		dprintf(LOG_ERR, "%s" "failed to parse configuration file",
  			FNAME);
-@@ -301,7 +325,55 @@
+@@ -302,7 +326,55 @@
  	client6_init(device);
  	client6_ifinit(device);
  	client6_mainloop();
@@ -523,7 +284,7 @@
  }
  
  static void
-@@ -320,13 +392,17 @@
+@@ -321,13 +393,17 @@
  	char *device;
  {
  	struct addrinfo hints, *res;
@@ -541,7 +302,7 @@
  	
  	ifidx = if_nametoindex(device);
  	if (ifidx == 0) {
-@@ -345,7 +421,7 @@
+@@ -346,7 +422,7 @@
  	if (inet_ntop(AF_INET6, &lladdr, linklocal, sizeof(linklocal)) < 0) {
  		exit(1);
  	}
@@ -550,60 +311,58 @@
  	
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_INET6;
-@@ -379,14 +455,42 @@
- 			FNAME, strerror(errno));
- 		exit(1);
+@@ -382,12 +458,40 @@
  	}
--#endif
-+#endif	    
+ #endif
  	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
--	dprintf(LOG_DEBUG, "res addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
+-	dprintf(LOG_DEBUG, "res addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
 -	if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) {
 -		dprintf(LOG_ERR, "%s" "bind(inbound): %s",
 -			FNAME, strerror(errno));
 -		exit(1);
-+	dprintf(LOG_INFO, "inbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
-+	
-+	/*
+-	}
++ 	dprintf(LOG_INFO, "inbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen ), res->ai_addrlen);
++ 	
++ 	/*
 +         * If the interface has JUST been brought up, the kernel may not
-+	 * have enough time to allow the bind to the linklocal address -
-+	 * it will then return EADDRNOTAVAIL. The bind will succeed if
++ 	 * have enough time to allow the bind to the linklocal address -
++ 	 * it will then return EADDRNOTAVAIL. The bind will succeed if
 +         * we try again:
-+	 */
-+	retry = now = time(0);
-+	bound = 0;
-+	do
-+	{
-+	    if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) 
-+	    {
-+		bound = -errno;		    
-+		retry = time(0);		
-+		if( ( bound != -EADDRNOTAVAIL ) || ( (retry - now) > 5 ))
-+		    break;
-+		struct timespec tv = { 0,  200000000 };
-+		nanosleep(&tv,0);
-+	    }else
-+	    {
-+		bound = 1;
-+		break;
-+	    }
-+	}while( (retry - now) < 5 );
-+
-+	if( bound < 0 )
-+	{
-+	    dprintf(LOG_ERR, "%s" "bind(inbound): %s",
-+		    FNAME, strerror(-bound));		  
-+	    exit(bound);
- 	}
-+
++ 	 */
++ 	retry = now = time(0);
++ 	bound = 0;
++ 	do
++ 	{
++ 	    if (bind(insock, res->ai_addr, res->ai_addrlen) < 0) 
++ 	    {
++ 		bound = -errno;		    
++ 		retry = time(0);		
++ 		if( ( bound != -EADDRNOTAVAIL ) || ( (retry - now) > 5 ))
++ 		    break;
++ 		struct timespec tv = { 0,  200000000 };
++ 		nanosleep(&tv,0);
++ 	    }else
++ 	    {
++ 		bound = 1;
++ 		break;
++ 	    }
++ 	} while( (retry - now) < 5 );
++ 
++ 	if( bound < 0 )
++ 	{
++ 	    dprintf(LOG_ERR, "%s" "bind(inbound): %s",
++ 		    FNAME, strerror(-bound));		  
++ 	    exit(bound);
++  	}
++ 
  	freeaddrinfo(res);
  
  	hints.ai_flags = 0;
-@@ -410,18 +514,13 @@
+@@ -411,18 +515,13 @@
  		exit(1);
  	}
  	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
-+	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
++	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
  	if (bind(outsock, res->ai_addr, res->ai_addrlen) < 0) {
  		dprintf(LOG_ERR, "%s" "bind(outbound): %s",
  			FNAME, strerror(errno));
@@ -619,7 +378,7 @@
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_INET6;
  	hints.ai_socktype = SOCK_DGRAM;
-@@ -443,7 +542,7 @@
+@@ -445,7 +544,7 @@
  		exit(1);
  	}
  	ifp->outsock = outsock;
@@ -628,7 +387,7 @@
  	if (signal(SIGHUP, client6_signal) == SIG_ERR) {
  		dprintf(LOG_WARNING, "%s" "failed to set signal: %s",
  			FNAME, strerror(errno));
-@@ -459,6 +558,7 @@
+@@ -461,6 +560,7 @@
  			FNAME, strerror(errno));
  		exit(1);
  	}
@@ -636,7 +395,7 @@
  }
  
  static void
-@@ -487,6 +587,10 @@
+@@ -489,6 +589,10 @@
  	memcpy(&client6_iaidaddr.client6_info.iaidinfo, &ifp->iaidinfo, 
  			sizeof(client6_iaidaddr.client6_info.iaidinfo));
  	duidcpy(&client6_iaidaddr.client6_info.clientid, &client_duid);
@@ -647,7 +406,7 @@
  	/* parse the lease file */
  	strcpy(leasename, PATH_CLIENT6_LEASE);
  	sprintf(iaidstr, "%u", ifp->iaidinfo.iaid);
-@@ -502,6 +606,9 @@
+@@ -504,6 +608,9 @@
  		sync_leases(client6_lease_file, leasename, client6_lease_temp);
  	if (client6_lease_file == NULL)
  		exit(1);
@@ -657,7 +416,7 @@
  	if (!TAILQ_EMPTY(&client6_iaidaddr.lease_list)) {
  //		struct dhcp6_lease *cl;
  		struct dhcp6_listval *lv;
-@@ -527,7 +634,7 @@
+@@ -529,7 +636,7 @@
  		dprintf(LOG_INFO, "no ipv6 addresses are leased by client");
  		exit(0);
  	}
@@ -666,7 +425,7 @@
  	ifp->link_flag |= IFF_RUNNING;
  
  	/* get addrconf prefix from kernel */
-@@ -574,6 +681,11 @@
+@@ -576,6 +683,11 @@
  	else {
  		for (sp = TAILQ_FIRST(&client6_iaidaddr.lease_list); sp; sp = sp_next) { 
  			sp_next = TAILQ_NEXT(sp, link);
@@ -678,7 +437,7 @@
  			if (client6_ifaddrconf(IFADDRCONF_REMOVE, &sp->lease_addr) != 0) 
  				dprintf(LOG_INFO, "%s" "deconfiging address %s failed",
  					FNAME, in6addr2str(&sp->lease_addr.addr, 0));
-@@ -585,6 +697,11 @@
+@@ -587,6 +699,11 @@
  		ev_next = TAILQ_NEXT(ev, link);
  		dhcp6_remove_event(ev);
  	}
@@ -690,7 +449,7 @@
  	/* XXX: check the last dhcpv6 client daemon to restore the original file */
  	{
  		/* restore /etc/radv.conf.bak back to /etc/radvd.conf */
-@@ -624,19 +741,72 @@
+@@ -626,19 +743,72 @@
  static void
  client6_mainloop()
  {
@@ -765,7 +524,7 @@
  		switch (ret) {
  		case -1:
  			if (errno != EINTR) {
-@@ -648,8 +818,36 @@
+@@ -650,8 +820,36 @@
  		case 0:	/* timeout */
  			break;	/* dhcp6_check_timer() will treat the case */
  		default: /* received a packet */
@@ -802,7 +561,7 @@
  	}
  }
  
-@@ -676,6 +874,7 @@
+@@ -678,6 +876,7 @@
  
  	switch(ev->state) {
  	case DHCP6S_INIT:
@@ -810,7 +569,7 @@
  		/* From INIT state client could
  		 * go to CONFIRM state if the client reboots;
  		 * go to RELEASE state if the client issues a release;
-@@ -715,6 +914,7 @@
+@@ -717,6 +916,7 @@
  			ev->state = DHCP6S_SOLICIT;
  		dhcp6_set_timeoparam(ev);
  	case DHCP6S_SOLICIT:
@@ -818,7 +577,7 @@
  		if (ifp->servers) {
  			ifp->current_server = select_server(ifp);
  			if (ifp->current_server == NULL) {
-@@ -725,7 +925,7 @@
+@@ -727,7 +927,7 @@
  			}
  			/* if get the address assginment break */
  			if (!TAILQ_EMPTY(&client6_iaidaddr.lease_list)) {
@@ -827,7 +586,7 @@
  				return (NULL);
  			}
  			ev->timeouts = 0;
-@@ -733,14 +933,21 @@
+@@ -735,14 +935,21 @@
  			dhcp6_set_timeoparam(ev);
  		}
  	case DHCP6S_INFOREQ:
@@ -849,7 +608,7 @@
  		if (!TAILQ_EMPTY(&request_list))
  			client6_send(ev);
  		else {
-@@ -822,9 +1029,11 @@
+@@ -825,9 +1032,11 @@
  
  	switch(ev->state) {
  	case DHCP6S_SOLICIT:
@@ -861,7 +620,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -832,6 +1041,7 @@
+@@ -835,6 +1044,7 @@
  		dh6->dh6_msgtype = DH6_REQUEST;
  		break;
  	case DHCP6S_RENEW:
@@ -869,7 +628,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -839,6 +1049,7 @@
+@@ -842,6 +1052,7 @@
  		dh6->dh6_msgtype = DH6_RENEW;
  		break;
  	case DHCP6S_DECLINE:
@@ -877,7 +636,7 @@
  		if (ifp->current_server == NULL) {
  			dprintf(LOG_ERR, "%s" "assumption failure", FNAME);
  			exit(1); /* XXX */
-@@ -846,15 +1057,19 @@
+@@ -849,15 +1060,19 @@
  		dh6->dh6_msgtype = DH6_DECLINE;
  		break;
  	case DHCP6S_INFOREQ:	
@@ -897,7 +656,7 @@
  		dh6->dh6_msgtype = DH6_RELEASE;
  		break;
  	default:
-@@ -990,12 +1205,34 @@
+@@ -999,12 +1214,34 @@
  			/* XXX: allow the other emtpy list ?? */
  		}
  		if (client6_request_flag & CLIENT6_RELEASE_ADDR) {
@@ -932,33 +691,7 @@
  		}
  		break;
  	default:
-@@ -1039,20 +1276,22 @@
- 			memcpy(&dst, res->ai_addr, res->ai_addrlen);
- 			break;
- 		}
--	default:
-+	default:	        
- 		dst = *sa6_allagent;
- 		break;
- 	}
- 	dst.sin6_scope_id = ifp->linkid;
--	dprintf(LOG_DEBUG, "send dst if %s addr is %s scope id is %d", 
-+	dprintf(LOG_INFO, "send dst if %s addr is %s scope id is %d", 
- 		ifp->ifname, addr2str((struct sockaddr *)&dst), ifp->linkid);
-+	
-+	dprintf(LOG_DEBUG,"\nSEND PACKET\n");
- 	if (sendto(ifp->outsock, buf, len, MSG_DONTROUTE, (struct sockaddr *)&dst,
- 	    sizeof(dst)) == -1) {
- 		dprintf(LOG_ERR, FNAME "transmit failed: %s", strerror(errno));
- 		goto end;
- 	}
- 
--	dprintf(LOG_DEBUG, "%s" "send %s to %s", FNAME,
-+	dprintf(LOG_INFO, "%s" "send %s to %s", FNAME,
- 		dhcp6msgstr(dh6->dh6_msgtype),
- 		addr2str((struct sockaddr *)&dst));
- 
-@@ -1076,6 +1315,7 @@
+@@ -1087,6 +1324,7 @@
  	struct cmsghdr *cm;
  	struct in6_pktinfo *pi = NULL;
  
@@ -966,7 +699,7 @@
  	memset(&iov, 0, sizeof(iov));
  	memset(&mhdr, 0, sizeof(mhdr));
  
-@@ -1133,9 +1373,11 @@
+@@ -1144,9 +1382,11 @@
  
  	switch(dh6->dh6_msgtype) {
  	case DH6_ADVERTISE:
@@ -978,15 +711,15 @@
  		(void)client6_recvreply(ifp, dh6, len, &optinfo);
  		break;
  	default:
-@@ -1144,7 +1386,6 @@
- 			addr2str((struct sockaddr *)&from));
+@@ -1155,7 +1395,6 @@
+ 			addr2str((struct sockaddr *)&from, sizeof(((struct sockaddr *)&from)->sa_data)));
  		break;
  	}
 -
  	dhcp6_clear_options(&optinfo);
  	return;
  }
-@@ -1255,7 +1496,22 @@
+@@ -1266,7 +1505,22 @@
  	/* if the client send preferred addresses reqeust in SOLICIT */
  	/* XXX: client might have some local policy to select the addresses */
  	if (!TAILQ_EMPTY(&optinfo0->addr_list))
@@ -1009,7 +742,7 @@
  	return 0;
  }
  
-@@ -1343,6 +1599,7 @@
+@@ -1354,6 +1608,7 @@
  	int addr_status_code = DH6OPT_STCODE_UNSPECFAIL;
  	struct dhcp6_serverinfo *newserver;
  	int newstate = 0;
@@ -1017,7 +750,7 @@
  	/* find the corresponding event based on the received xid */
  	dprintf(LOG_DEBUG, "%s" "reply message XID is (%x)",
  		FNAME, ntohl(dh6->dh6_xid) & DH6_XIDMASK);
-@@ -1366,13 +1623,16 @@
+@@ -1377,13 +1632,16 @@
  		dprintf(LOG_INFO, "%s" "no server ID option", FNAME);
  		return -1;
  	}
@@ -1035,7 +768,7 @@
  		newserver = allocate_newserver(ifp, optinfo);
  		if (newserver == NULL)
  			return (-1);
-@@ -1395,11 +1655,13 @@
+@@ -1406,11 +1664,13 @@
  		dprintf(LOG_INFO, "%s" "client DUID mismatch", FNAME);
  		return -1;
  	}
@@ -1053,7 +786,7 @@
  	/*
  	 * The client MAY choose to report any status code or message from the
  	 * status code option in the Reply message.
-@@ -1426,7 +1688,7 @@
+@@ -1437,7 +1697,7 @@
  	switch (addr_status_code) {
  	case DH6OPT_STCODE_UNSPECFAIL:
  	case DH6OPT_STCODE_USEMULTICAST:
@@ -1062,7 +795,7 @@
  			dhcp6_stcodestr(addr_status_code));
  		/* retransmit the message with multicast address */
  		/* how many time allow the retransmission with error status code? */
-@@ -1441,6 +1703,7 @@
+@@ -1452,6 +1712,7 @@
  	 */
  	switch (ev->state) {
  	case DHCP6S_SOLICIT:
@@ -1070,7 +803,7 @@
  		if (optinfo->iaidinfo.iaid == 0)
  			break;
  		else if (!optinfo->flags & DHCIFF_RAPID_COMMIT) {
-@@ -1448,6 +1711,7 @@
+@@ -1459,6 +1720,7 @@
  			break;
  		}
  	case DHCP6S_REQUEST:
@@ -1078,7 +811,7 @@
  		/* NotOnLink: 1. SOLICIT 
  		 * NoAddrAvail: Information Request */
  		switch(addr_status_code) {
-@@ -1468,32 +1732,57 @@
+@@ -1479,32 +1741,57 @@
  		case DH6OPT_STCODE_SUCCESS:
  		case DH6OPT_STCODE_UNDEFINE:
  		default:
@@ -1139,7 +872,7 @@
  			break;
  		case DH6OPT_STCODE_NOADDRAVAIL:
  		case DH6OPT_STCODE_NOPREFIXAVAIL:
-@@ -1504,11 +1793,26 @@
+@@ -1515,11 +1802,26 @@
  		default:
  			dhcp6_update_iaidaddr(optinfo, ADDR_UPDATE);
  			if (optinfo->type == IAPD)
@@ -1166,7 +899,7 @@
  		/* NOtOnLink for a Confirm, send SOLICIT message */
  rebind_confirm:	client6_request_flag &= ~CLIENT6_CONFIRM_ADDR;
  	switch(addr_status_code) {
-@@ -1526,6 +1830,7 @@
+@@ -1537,6 +1839,7 @@
  			break;
  		case DH6OPT_STCODE_SUCCESS:
  		case DH6OPT_STCODE_UNDEFINE:
@@ -1174,7 +907,7 @@
  			/* XXX: set up renew/rebind timer */
  			dprintf(LOG_DEBUG, "%s" "got an expected reply for confirm", FNAME);
  			ftime(&now);
-@@ -1548,7 +1853,7 @@
+@@ -1559,7 +1862,7 @@
  			if ( offset > client6_iaidaddr.client6_info.iaidinfo.renewtime) 
  				timo.tv_sec = 0;
  			else
@@ -1183,7 +916,7 @@
  			timo.tv_usec = 0;
  			dhcp6_set_timer(&timo, client6_iaidaddr.timer);
  			/* check DAD */
-@@ -1564,6 +1869,7 @@
+@@ -1575,6 +1878,7 @@
  		}
  		break;
  	case DHCP6S_DECLINE:
@@ -1191,7 +924,7 @@
  		/* send REQUEST message to server with none decline address */
  		dprintf(LOG_DEBUG, "%s" 
  		    "got an expected reply for decline, sending request.", FNAME);
-@@ -1572,6 +1878,7 @@
+@@ -1583,6 +1887,7 @@
  		newstate = DHCP6S_REQUEST;
  		break;
  	case DHCP6S_RELEASE:
@@ -1199,7 +932,7 @@
  		dprintf(LOG_INFO, "%s" "got an expected release, exit.", FNAME);
  		dhcp6_remove_event(ev);
  		exit(0);
-@@ -1593,6 +1900,8 @@
+@@ -1604,6 +1909,8 @@
  	int state;
  {
  	struct dhcp6_event *ev;
@@ -1208,7 +941,7 @@
  	if ((ev = dhcp6_create_event(ifp, state)) == NULL) {
  		dprintf(LOG_ERR, "%s" "failed to create an event",
  			FNAME);
-@@ -1651,6 +1960,11 @@
+@@ -1662,6 +1969,11 @@
  		/* config the interface for reboot */
  		if (reboot && client6_iaidaddr.client6_info.type != IAPD && 
  		    (client6_request_flag & CLIENT6_CONFIRM_ADDR)) {
@@ -1220,7 +953,7 @@
  			if (client6_ifaddrconf(IFADDRCONF_ADD, &cl->lease_addr) != 0) {
  				dprintf(LOG_INFO, "config address failed: %s",
  					in6addr2str(&cl->lease_addr.addr, 0));
-@@ -1661,6 +1975,11 @@
+@@ -1672,6 +1984,11 @@
  	/* update radvd.conf for prefix delegation */
  	if (reboot && client6_iaidaddr.client6_info.type == IAPD &&
  	    (client6_request_flag & CLIENT6_CONFIRM_ADDR))
@@ -1232,7 +965,7 @@
  		radvd_parse(&client6_iaidaddr, ADDR_UPDATE);
  	return (0);
  }
-@@ -1752,8 +2071,9 @@
+@@ -1763,8 +2080,9 @@
  	int newstate;
  	dprintf(LOG_DEBUG, "enter checking link ...");
  	strncpy(ifr.ifr_name, dhcp6_if->ifname, IFNAMSIZ);
@@ -1243,7 +976,7 @@
  		goto settimer;
  	}
  	if (ifr.ifr_flags & IFF_RUNNING) {
-@@ -1795,29 +2115,48 @@
+@@ -1806,29 +2124,48 @@
  setup_interface(char *ifname)
  {
  	struct ifreq ifr;
@@ -1309,116 +1042,23 @@
  	}
  	return;
  }
-diff -urN dhcp-0.10.orig/libdhcp6client/dhcp6client.h dhcp-0.10/libdhcp6client/dhcp6client.h
---- dhcp-0.10.orig/libdhcp6client/dhcp6client.h	1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-06-22 11:46:51.000000000 -0400
-@@ -0,0 +1,22 @@
-+/* dhcp6client.h
+--- /dev/null	2006-07-18 14:52:55.494029261 -0400
++++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-07-19 01:30:57.000000000 -0400
+@@ -0,0 +1,104 @@
++/* libdhcp_control.h
 + *
-+ *  Interface to the DHCPv6 client libdhcp6client library.
++ *  DHCP client control API for libdhcp, a minimal interface to the
++ *  ISC dhcp IPv4 client libdhcp4client library,
++ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
 + *
++ *  Each DHCP client library must include this file to be controlled
++ *  by libdhcp.
 + *
 + *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
 + *
 + *  This program is free software; you can redistribute it and/or modify
 + *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at
-+ *           http://www.fsf.org/licensing/licenses/gpl.txt
-+ *  and included in this software distribution as the "LICENSE" file.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ */
-+struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
-+
-+extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
-+/* the DHCPv6 client main() function */
-diff -urN dhcp-0.10.orig/libdhcp6client/lease.c dhcp-0.10/libdhcp6client/lease.c
---- dhcp-0.10.orig/libdhcp6client/lease.c	2004-03-03 15:11:16.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease.c	2006-06-22 11:46:51.000000000 -0400
-@@ -64,7 +64,7 @@
- static int init_lease_hashes __P((void));
- 
- int 
--write_lease(const struct dhcp6_lease *lease_ptr,
-+write_6_lease(const struct dhcp6_lease *lease_ptr,
- 	    FILE *file)
- {
- 	struct tm brokendown_time;
-@@ -140,7 +140,7 @@
- 		for (i = 0; i < lease_hash_table->hash_size; i++) {
- 			element = lease_hash_table->hash_list[i];
- 			while (element) {
--				if (write_lease((struct dhcp6_lease *)element->data, 
-+				if (write_6_lease((struct dhcp6_lease *)element->data, 
- 							sync_file) < 0) {
- 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 					return (NULL);
-@@ -152,7 +152,7 @@
- 		struct dhcp6_lease *lv, *lv_next;
- 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
- 			lv_next = TAILQ_NEXT(lv, link);
--			if (write_lease(lv, sync_file) < 0)  
-+			if (write_6_lease(lv, sync_file) < 0)  
- 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
- 		}
- 	}
-@@ -354,8 +354,8 @@
- get_linklocal(const char *ifname,
- 	      struct in6_addr *linklocal)
- {	
--	struct ifaddrs *ifa, *ifap;
--	struct sockaddr *sd;
-+	struct ifaddrs *ifa=0, *ifap=0;
-+	struct sockaddr *sd=0;
- 	if (getifaddrs(&ifap) < 0) {
- 		dprintf(LOG_ERR, "getifaddrs error");
- 		return -1;
-diff -urN dhcp-0.10.orig/libdhcp6client/lease.h dhcp-0.10/libdhcp6client/lease.h
---- dhcp-0.10.orig/libdhcp6client/lease.h	2003-07-01 22:21:25.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/lease.h	2006-06-22 11:46:51.000000000 -0400
-@@ -101,7 +101,7 @@
- extern FILE *init_leases __P((const char *));
- extern void lease_parse __P((FILE *));
- extern int do_iaidaddr_hash __P((struct dhcp6_lease *, struct client6_if *));
--extern int write_lease __P((const struct dhcp6_lease *, FILE *));
-+extern int write_6_lease __P((const struct dhcp6_lease *, FILE *));
- extern FILE *sync_leases __P((FILE *, const char *, char *));
- extern struct dhcp6_timer *syncfile_timo __P((void *));
- extern unsigned int addr_hash __P((const void *));
-diff -urN dhcp-0.10.orig/libdhcp6client/lease_token.l dhcp-0.10/libdhcp6client/lease_token.l
---- dhcp-0.10.orig/libdhcp6client/lease_token.l	2004-02-04 18:29:24.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/lease_token.l	2006-06-22 11:46:51.000000000 -0400
-@@ -241,6 +241,9 @@
- 	
- 	fseek(file, 0, 0);
- 	yyin = file;
-+	yy_init=1;
-+	yy_start=0;
-+	yy_current_buffer=0;
- 	yylex(); 
- 	return;
- }
-diff -urN dhcp-0.10.orig/libdhcp6client/libdhcp_control.h dhcp-0.10/libdhcp6client/libdhcp_control.h
---- dhcp-0.10.orig/libdhcp6client/libdhcp_control.h	1969-12-31 19:00:00.000000000 -0500
-+++ dhcp-0.10/libdhcp6client/libdhcp_control.h	2006-06-22 11:46:51.000000000 -0400
-@@ -0,0 +1,104 @@
-+/* libdhcp_control.h
-+ *
-+ *  DHCP client control API for libdhcp, a minimal interface to the
-+ *  ISC dhcp IPv4 client libdhcp4client library,
-+ *  and to the dhcpv6 DHCPv6 client libdhcp6client library.
-+ *
-+ *  Each DHCP client library must include this file to be controlled
-+ *  by libdhcp.
-+ *
-+ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation at 
++ *  the Free Software Foundation at 
 + *           http://www.fsf.org/licensing/licenses/gpl.txt
 + *  and included in this software distribution as the "LICENSE" file.
 + *
@@ -1509,3 +1149,315 @@
 +} LIBDHCP_Capability;
 +
 +#endif
+--- /dev/null	2006-07-18 14:52:55.494029261 -0400
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.h	2006-07-19 01:30:57.000000000 -0400
+@@ -0,0 +1,17 @@
++
++extern void *dhc6_alloc( size_t );
++extern void *dhc6_realloc(void *, size_t);
++extern void *dhc6_calloc(size_t, size_t);
++extern char *dhc6_strdup(char *str);
++extern void dhc6_free( void *);
++extern void dhc6_free_all_pointers(void);
++#undef malloc
++#define malloc( size ) dhc6_alloc( size )
++#undef realloc
++#define realloc(ptr, size) dhc6_realloc(ptr, size)
++#undef calloc
++#define calloc(n, size) dhc6_calloc(n, size)
++#undef free
++#define free( ptr ) dhc6_free( ptr )
++#undef strdup
++#define strdup( str ) dhc6_strdup( str )
+--- dhcp-0.10/libdhcp6client/lease.c.libdhcp6client	2004-03-03 15:11:16.000000000 -0500
++++ dhcp-0.10/libdhcp6client/lease.c	2006-07-19 01:30:57.000000000 -0400
+@@ -64,7 +64,7 @@
+ static int init_lease_hashes __P((void));
+ 
+ int 
+-write_lease(const struct dhcp6_lease *lease_ptr,
++write_6_lease(const struct dhcp6_lease *lease_ptr,
+ 	    FILE *file)
+ {
+ 	struct tm brokendown_time;
+@@ -140,7 +140,7 @@
+ 		for (i = 0; i < lease_hash_table->hash_size; i++) {
+ 			element = lease_hash_table->hash_list[i];
+ 			while (element) {
+-				if (write_lease((struct dhcp6_lease *)element->data, 
++				if (write_6_lease((struct dhcp6_lease *)element->data, 
+ 							sync_file) < 0) {
+ 					dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 					return (NULL);
+@@ -152,7 +152,7 @@
+ 		struct dhcp6_lease *lv, *lv_next;
+ 		for (lv = TAILQ_FIRST(&client6_iaidaddr.lease_list); lv; lv = lv_next) {
+ 			lv_next = TAILQ_NEXT(lv, link);
+-			if (write_lease(lv, sync_file) < 0)  
++			if (write_6_lease(lv, sync_file) < 0)  
+ 				dprintf(LOG_ERR, "%s" "write lease failed", FNAME);
+ 		}
+ 	}
+@@ -354,8 +354,8 @@
+ get_linklocal(const char *ifname,
+ 	      struct in6_addr *linklocal)
+ {	
+-	struct ifaddrs *ifa, *ifap;
+-	struct sockaddr *sd;
++	struct ifaddrs *ifa=0, *ifap=0;
++	struct sockaddr *sd=0;
+ 	if (getifaddrs(&ifap) < 0) {
+ 		dprintf(LOG_ERR, "getifaddrs error");
+ 		return -1;
+--- dhcp-0.10/libdhcp6client/lease.h.libdhcp6client	2003-07-01 22:21:25.000000000 -0400
++++ dhcp-0.10/libdhcp6client/lease.h	2006-07-19 01:30:57.000000000 -0400
+@@ -101,7 +101,7 @@
+ extern FILE *init_leases __P((const char *));
+ extern void lease_parse __P((FILE *));
+ extern int do_iaidaddr_hash __P((struct dhcp6_lease *, struct client6_if *));
+-extern int write_lease __P((const struct dhcp6_lease *, FILE *));
++extern int write_6_lease __P((const struct dhcp6_lease *, FILE *));
+ extern FILE *sync_leases __P((FILE *, const char *, char *));
+ extern struct dhcp6_timer *syncfile_timo __P((void *));
+ extern unsigned int addr_hash __P((const void *));
+--- /dev/null	2006-07-18 14:52:55.494029261 -0400
++++ dhcp-0.10/libdhcp6client/dhc6_alloc.c	2006-07-19 01:30:57.000000000 -0400
+@@ -0,0 +1,67 @@
++#include <malloc.h>
++#include <search.h>
++extern void tdestroy (void *root, void (*free_node)(void *nodep));
++void *ifp_ptr;
++
++static void *ptr_tree=0L;
++
++static int ptr_comparator( const void *p1, const void *p2 )
++{
++    return
++	(  (p1 == p2) 
++	   ? 0
++	   :( (p1 > p2)
++	      ? 1
++	      : -1
++	    )
++	);
++}
++
++void *dhc6_alloc( size_t s )
++{
++    void *ptr = malloc( s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void *dhc6_realloc( void *ptr, size_t s )
++{
++    void *ptr2 = realloc(ptr, s);
++    if ( ptr2 != 0 )
++    {
++	if ( ptr != 0 )
++	    tdelete(ptr,&(ptr_tree), ptr_comparator);
++	tsearch(ptr2, &(ptr_tree), ptr_comparator);
++    }
++    return ptr2;
++}
++
++void *dhc6_calloc( size_t n, size_t s )
++{
++    void *ptr = calloc( n, s );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++char *dhc6_strdup( char *str )
++{
++    char *ptr = strdup( str );
++    if ( ptr != 0 )
++	tsearch(ptr, &(ptr_tree), ptr_comparator);
++    return ptr;
++}
++
++void dhc6_free( void *ptr )
++{
++    free(ptr);
++    tdelete(ptr, &(ptr_tree), ptr_comparator);
++}
++
++void dhc6_free_all_pointers(void)
++{
++    if( ptr_tree != 0L )
++	tdestroy(ptr_tree, free);
++    ptr_tree = 0L;
++}
+--- dhcp-0.10/libdhcp6client/common.c.libdhcp6client	2006-07-19 01:30:48.000000000 -0400
++++ dhcp-0.10/libdhcp6client/common.c	2006-07-19 01:30:57.000000000 -0400
+@@ -79,11 +79,19 @@
+ #include "timer.h"
+ #include "lease.h"
+ 
++#ifdef LIBDHCP
++#include "libdhcp_control.h"
++#endif
++
+ int foreground;
+ int debug_thresh;
+ struct dhcp6_if *dhcp6_if;
+ struct dns_list dnslist;
++#ifdef LIBDHCP
++struct host_conf *host_conflist;
++#else
+ static struct host_conf *host_conflist;
++#endif
+ static int in6_matchflags __P((struct sockaddr *, char *, int));
+ ssize_t gethwid __P((char *, int, const char *, u_int16_t *));
+ static int get_assigned_ipv6addrs __P((char *, char *,
+@@ -647,7 +655,7 @@
+ 	memset(&ifr, 0, sizeof(ifr));
+ 	strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
+ 	ifr.ifr_addr = *(struct sockaddr *)addr;
+-
++	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
+ 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
+ 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
+ 		     addr2str(addr, sizeof (addr->sa_data)));
+@@ -722,6 +730,9 @@
+ 	struct dhcp6_duid_type1 *dp; /* we only support the type1 DUID */
+ 	char tmpbuf[256];	/* DUID should be no more than 256 bytes */
+ 
++#ifdef LIBDHCP
++     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
++#endif
+ 	if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
+ 		dprintf(LOG_NOTICE, "%s" "failed to open DUID file: %s",
+ 		    FNAME, idfile);
+@@ -776,6 +787,9 @@
+ 	}
+ 
+ 	/* save the (new) ID to the file for next time */
++#ifdef LIBDHCP
++     if ( libdhcp_control && (libdhcp_control->capability & DHCP_USE_LEASE_DATABASE))
++#endif
+ 	if (!fp) {
+ 		if ((fp = fopen(idfile, "w+")) == NULL) {
+ 			dprintf(LOG_ERR, "%s"
+@@ -823,8 +837,13 @@
+ 		return -1;
+ 
+ 	strcpy(if_hwaddr.ifr_name, ifname);
++	dprintf(LOG_DEBUG,"gethwid: ioctl SIOCGIFHWADDR");
+ 	if (ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr) < 0)
++	{
++	    close(skfd);
+ 		return -1;
++	}
++	close(skfd);
+ 	/* only support Ethernet */
+ 	switch (if_hwaddr.ifr_hwaddr.sa_family) {
+ 	case ARPHRD_ETHER:
+@@ -940,7 +959,7 @@
+ 		cp = (char *)(p + 1);
+ 		np = (struct dhcp6opt *)(cp + optlen);
+ 
+-		dprintf(LOG_DEBUG, "%s" "get DHCP option %s, len %d",
++		dprintf(LOG_INFO, "%s" "get DHCP option %s, len %d",
+ 		    FNAME, dhcp6optstr(opt), optlen);
+ 
+ 		/* option length field overrun */
+@@ -1085,7 +1104,7 @@
+ 				ntohl(*(u_int32_t *)(cp + sizeof(u_int32_t)));
+ 			optinfo->iaidinfo.rebindtime = 
+ 				ntohl(*(u_int32_t *)(cp + 2 * sizeof(u_int32_t)));
+-			dprintf(LOG_DEBUG, "get option iaid is %u, renewtime %u, "
++			dprintf(LOG_INFO, "get option iaid is %u, renewtime %u, "
+ 				"rebindtime %u", optinfo->iaidinfo.iaid,
+ 				optinfo->iaidinfo.renewtime, optinfo->iaidinfo.rebindtime);
+ 			if (get_assigned_ipv6addrs(cp + 3 * sizeof(u_int32_t), 
+@@ -1189,7 +1208,7 @@
+ 		opt = ntohs(opth.dh6opt_type);
+ 		cp = p + sizeof(opth);
+ 		np = cp + optlen;
+-		dprintf(LOG_DEBUG, "  IA address option: %s, "
++		dprintf(LOG_INFO, "  IA address option: %s, "
+ 			"len %d", dhcp6optstr(opt), optlen);
+ 
+ 		if (np > ep) {
+@@ -1219,7 +1238,7 @@
+ 			}
+ 			break;
+ 		case DH6OPT_IADDR:
+-			if (optlen < sizeof(ai) - sizeof(u_int32_t))
++			if (optlen < sizeof(ai)- sizeof(u_int32_t))
+ 				goto malformed;
+ 			memcpy(&ai, p, sizeof(ai));
+ 			/* copy the information into internal format */
+@@ -2028,8 +2047,16 @@
+ 	va_list ap;
+ 	char logbuf[LINE_MAX];
+ 
++#if LIBDHCP
++	va_start(ap, fmt);
++	if ( libdhcp_control && libdhcp_control->eh )
++	    libdhcp_control->eh(libdhcp_control, level, fmt, ap);
++	va_end(ap);
++	return;
++#endif
+ 	va_start(ap, fmt);
+ 	vsnprintf(logbuf, sizeof(logbuf), fmt, ap);
++	va_end(ap);
+ 
+ 	if (foreground && debug_thresh >= level) {
+ 		time_t now;
+--- dhcp-0.10/libdhcp6client/dhcp6.h.libdhcp6client	2006-07-19 01:30:48.000000000 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6.h	2006-07-19 01:30:57.000000000 -0400
+@@ -116,9 +116,24 @@
+ 
+ typedef enum { IANA, IATA, IAPD} iatype_t;
+ 
+-typedef enum { ACTIVE, RENEW,
++#ifdef LIBDHCP
++typedef enum { DHCP6_ACTIVE=1, DHCP6_RENEW,
++	       DHCP6_REBIND, DHCP6_EXPIRED,
++	       DHCP6_INVALID } state_t;
++
++#define ACTIVE 	DHCP6_ACTIVE
++#define RENEW  	DHCP6_RENEW
++#define REBIND	DHCP6_REBIND
++#define EXPIRED	DHCP6_EXPIRED
++#define INVALID DHCP6_INVALID
++#include <libdhcp_control.h>
++extern LIBDHCP_Control *libdhcp_control;
++#include <dhc6_alloc.h>
++#else
++typedef enum { ACTIVE=1, RENEW,
+ 	       REBIND, EXPIRED,
+ 	       INVALID } state_t;
++#endif
+ /* Internal data structure */
+ 
+ struct duid {
+--- /dev/null	2006-07-18 14:52:55.494029261 -0400
++++ dhcp-0.10/libdhcp6client/dhcp6client.h	2006-07-19 01:30:57.000000000 -0400
+@@ -0,0 +1,22 @@
++/* dhcp6client.h
++ *
++ *  Interface to the DHCPv6 client libdhcp6client library.
++ *
++ *
++ *  Copyright(C) Jason Vas Dias <jvdias at redhat.com> Red Hat Inc. May 2006
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation at
++ *           http://www.fsf.org/licensing/licenses/gpl.txt
++ *  and included in this software distribution as the "LICENSE" file.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ */
++struct libdhcp_control_s;  /* include libdhcp_control.h or libdhcp.h for this */
++
++extern int dhcpv6_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
++/* the DHCPv6 client main() function */

dhcpv6-0.10-salen.patch:
 common.c     |   12 +++++++-----
 common.h     |    2 +-
 dhcp6c.c     |   15 ++++++++++-----
 dhcp6relay.c |    4 ++--
 dhcp6s.c     |    8 ++++----
 5 files changed, 24 insertions(+), 17 deletions(-)

Index: dhcpv6-0.10-salen.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-salen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcpv6-0.10-salen.patch	28 Jun 2006 18:47:40 -0000	1.1
+++ dhcpv6-0.10-salen.patch	19 Jul 2006 06:46:03 -0000	1.2
@@ -1,5 +1,16 @@
---- dhcp-0.10/dhcp6s.c.salen	2006-06-20 17:47:03.000000000 -0400
-+++ dhcp-0.10/dhcp6s.c	2006-06-20 17:47:11.000000000 -0400
+--- dhcp-0.10/common.h.salen	2006-07-18 22:17:41.000000000 -0400
++++ dhcp-0.10/common.h	2006-07-18 22:18:40.000000000 -0400
+@@ -67,7 +67,7 @@
+ extern long random_between __P((long, long));
+ extern int prefix6_mask __P((struct in6_addr *, int));
+ extern int sa6_plen2mask __P((struct sockaddr_in6 *, int));
+-extern char *addr2str __P((struct sockaddr *));
++extern char *addr2str __P((struct sockaddr *, socklen_t));
+ extern char *in6addr2str __P((struct in6_addr *, int));
+ extern const char *getdev __P((struct sockaddr_in6 *));
+ extern int in6_addrscopebyif __P((struct in6_addr *, char *));
+--- dhcp-0.10/dhcp6s.c.salen	2006-07-18 22:17:41.000000000 -0400
++++ dhcp-0.10/dhcp6s.c	2006-07-18 22:17:41.000000000 -0400
 @@ -569,7 +569,7 @@
  
  	dprintf(LOG_DEBUG, "%s" "received %s from %s", FNAME,
@@ -29,7 +40,7 @@
  	return 0;
  }
 --- dhcp-0.10/dhcp6relay.c.salen	2003-02-27 14:43:08.000000000 -0500
-+++ dhcp-0.10/dhcp6relay.c	2006-06-20 17:47:11.000000000 -0400
++++ dhcp-0.10/dhcp6relay.c	2006-07-18 22:17:41.000000000 -0400
 @@ -496,7 +496,7 @@
  	}
  
@@ -48,51 +59,8 @@
  		return;
  	}
  
---- dhcp-0.10/common.c.salen	2006-06-20 17:47:03.000000000 -0400
-+++ dhcp-0.10/common.c	2006-06-20 18:05:40.000000000 -0400
-@@ -560,17 +560,19 @@
- }
- 
- char *
--addr2str(sa)
-+addr2str(sa, salen)
- 	struct sockaddr *sa;
-+	socklen_t salen;
- {
--	static char addrbuf[8][NI_MAXHOST];
-+	static char addrbuf[8][NI_MAXHOST+1];
- 	static int round = 0;
- 	char *cp;
- 
- 	round = (round + 1) & 7;
- 	cp = addrbuf[round];
-+	memset(cp, '\0', NI_MAXHOST+1);
- 
--	if (getnameinfo(sa, NI_MAXSERV, cp, NI_MAXHOST, NULL, 
-+	if (getnameinfo(sa, salen, cp, NI_MAXHOST, NULL, 
- 				0, NI_NUMERICHOST) != 0)
- 		dprintf(LOG_ERR, "%s getnameinfo return error", FNAME);
- 
-@@ -589,7 +591,7 @@
- 	sa6.sin6_addr = *in6;
- 	sa6.sin6_scope_id = scopeid;
- 
--	return (addr2str((struct sockaddr *)&sa6));
-+	return (addr2str((struct sockaddr *)&sa6, sizeof (*in6)));
- }
- 
- /* return IPv6 address scope type. caller assumes that smaller is narrower. */
-@@ -648,7 +650,7 @@
- 
- 	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
- 		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
--		     addr2str(addr));
-+		     addr2str(addr, sizeof (addr->sa_data)));
- 		close(s);
- 		return (-1);
- 	}
---- dhcp-0.10/dhcp6c.c.salen	2006-06-20 17:47:03.000000000 -0400
-+++ dhcp-0.10/dhcp6c.c	2006-06-20 17:55:46.000000000 -0400
+--- dhcp-0.10/dhcp6c.c.salen	2006-07-18 22:17:41.000000000 -0400
++++ dhcp-0.10/dhcp6c.c	2006-07-18 22:17:41.000000000 -0400
 @@ -114,6 +114,7 @@
  extern struct dhcp6_iaidaddr client6_iaidaddr;
  FILE *dhcp6_resolv_file;
@@ -172,9 +140,9 @@
  		break;
  	}
  
---- dhcp-0.10/libdhcp6client/common.c.salen	2006-06-20 17:47:11.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/common.c	2006-06-20 18:05:41.000000000 -0400
-@@ -568,17 +568,19 @@
+--- dhcp-0.10/common.c.salen	2006-07-18 22:17:41.000000000 -0400
++++ dhcp-0.10/common.c	2006-07-18 22:17:41.000000000 -0400
+@@ -560,17 +560,19 @@
  }
  
  char *
@@ -197,7 +165,7 @@
  				0, NI_NUMERICHOST) != 0)
  		dprintf(LOG_ERR, "%s getnameinfo return error", FNAME);
  
-@@ -597,7 +599,7 @@
+@@ -589,7 +591,7 @@
  	sa6.sin6_addr = *in6;
  	sa6.sin6_scope_id = scopeid;
  
@@ -206,8 +174,8 @@
  }
  
  /* return IPv6 address scope type. caller assumes that smaller is narrower. */
-@@ -656,7 +658,7 @@
- 	dprintf(LOG_DEBUG,"in6_matchflags: SIOCGIFFLAGS");
+@@ -648,7 +650,7 @@
+ 
  	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
  		warn("in6_matchflags: ioctl(SIOCGIFFLAGS, %s)",
 -		     addr2str(addr));
@@ -215,115 +183,3 @@
  		close(s);
  		return (-1);
  	}
---- dhcp-0.10/libdhcp6client/dhcp6c.c.salen	2006-06-20 17:47:11.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/dhcp6c.c	2006-06-20 17:55:46.000000000 -0400
-@@ -117,6 +117,7 @@
- extern struct dhcp6_iaidaddr client6_iaidaddr;
- FILE *dhcp6_resolv_file;
- static const struct sockaddr_in6 *sa6_allagent;
-+static socklen_t sa6_alen;
- static struct duid client_duid;
- 
- static void usage __P((void));
-@@ -457,7 +458,7 @@
- 	}
- #endif	    
- 	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
--	dprintf(LOG_INFO, "inbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
-+	dprintf(LOG_DEBUG, "inbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
- 	
- 	/*
-          * If the interface has JUST been brought up, the kernel may not
-@@ -514,7 +515,7 @@
- 		exit(1);
- 	}
- 	((struct sockaddr_in6 *)(res->ai_addr))->sin6_scope_id = ifidx;
--	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr), res->ai_addrlen);
-+	dprintf(LOG_INFO, "outbound addr is %s/%d", addr2str(res->ai_addr, res->ai_addrlen), res->ai_addrlen);
- 	if (bind(outsock, res->ai_addr, res->ai_addrlen) < 0) {
- 		dprintf(LOG_ERR, "%s" "bind(outbound): %s",
- 			FNAME, strerror(errno));
-@@ -533,6 +534,7 @@
- 	}
- 	memcpy(&sa6_allagent_storage, res->ai_addr, res->ai_addrlen);
- 	sa6_allagent = (const struct sockaddr_in6 *)&sa6_allagent_storage;
-+	sa6_alen = res->ai_addrlen;
- 	freeaddrinfo(res);
- 
- 	/* client interface configuration */
-@@ -1021,6 +1023,7 @@
- 	struct dhcp6_optinfo optinfo;
- 	ssize_t optlen, len;
- 	struct timeval duration, now;
-+	socklen_t salen;
- 
- 	ifp = ev->ifp;
- 
-@@ -1274,15 +1277,17 @@
- 				exit(1);
- 			}
- 			memcpy(&dst, res->ai_addr, res->ai_addrlen);
-+			salen = res->ai_addrlen;
- 			break;
- 		}
- 	default:	        
- 		dst = *sa6_allagent;
-+		salen = sa6_alen;
- 		break;
- 	}
- 	dst.sin6_scope_id = ifp->linkid;
- 	dprintf(LOG_INFO, "send dst if %s addr is %s scope id is %d", 
--		ifp->ifname, addr2str((struct sockaddr *)&dst), ifp->linkid);
-+		ifp->ifname, addr2str((struct sockaddr *)&dst, salen), ifp->linkid);
- 	
- 	dprintf(LOG_DEBUG,"\nSEND PACKET\n");
- 	if (sendto(ifp->outsock, buf, len, MSG_DONTROUTE, (struct sockaddr *)&dst,
-@@ -1293,7 +1298,7 @@
- 
- 	dprintf(LOG_INFO, "%s" "send %s to %s", FNAME,
- 		dhcp6msgstr(dh6->dh6_msgtype),
--		addr2str((struct sockaddr *)&dst));
-+		addr2str((struct sockaddr *)&dst, salen));
- 
-   end:
- 	dhcp6_clear_options(&optinfo);
-@@ -1356,7 +1361,7 @@
- 
- 	dprintf(LOG_DEBUG, "%s" "receive %s from %s scope id %d %s", FNAME,
- 		dhcp6msgstr(dh6->dh6_msgtype),
--		addr2str((struct sockaddr *)&from),
-+		addr2str((struct sockaddr *)&from, sizeof (((struct sockaddr *)&from)->sa_data)),
- 		((struct sockaddr_in6 *)&from)->sin6_scope_id,
- 		ifp->ifname);
- 
-@@ -1383,7 +1388,7 @@
- 	default:
- 		dprintf(LOG_INFO, "%s" "received an unexpected message (%s) "
- 			"from %s", FNAME, dhcp6msgstr(dh6->dh6_msgtype),
--			addr2str((struct sockaddr *)&from));
-+			addr2str((struct sockaddr *)&from, sizeof(((struct sockaddr *)&from)->sa_data)));
- 		break;
- 	}
- 	dhcp6_clear_options(&optinfo);
---- dhcp-0.10/libdhcp6client/common.h.salen	2006-06-20 17:47:03.000000000 -0400
-+++ dhcp-0.10/libdhcp6client/common.h	2006-06-20 17:47:11.000000000 -0400
-@@ -67,7 +67,7 @@
- extern long random_between __P((long, long));
- extern int prefix6_mask __P((struct in6_addr *, int));
- extern int sa6_plen2mask __P((struct sockaddr_in6 *, int));
--extern char *addr2str __P((struct sockaddr *));
-+extern char *addr2str __P((struct sockaddr *, socklen_t));
- extern char *in6addr2str __P((struct in6_addr *, int));
- extern const char *getdev __P((struct sockaddr_in6 *));
- extern int in6_addrscopebyif __P((struct in6_addr *, char *));
---- dhcp-0.10/common.h.salen	2006-06-20 17:47:03.000000000 -0400
-+++ dhcp-0.10/common.h	2006-06-20 17:47:11.000000000 -0400
-@@ -67,7 +67,7 @@
- extern long random_between __P((long, long));
- extern int prefix6_mask __P((struct in6_addr *, int));
- extern int sa6_plen2mask __P((struct sockaddr_in6 *, int));
--extern char *addr2str __P((struct sockaddr *));
-+extern char *addr2str __P((struct sockaddr *, socklen_t));
- extern char *in6addr2str __P((struct in6_addr *, int));
- extern const char *getdev __P((struct sockaddr_in6 *));
- extern int in6_addrscopebyif __P((struct in6_addr *, char *));


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- dhcpv6.spec	12 Jul 2006 05:37:21 -0000	1.40
+++ dhcpv6.spec	19 Jul 2006 06:46:03 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 29.1
+Release: 30
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -30,6 +30,7 @@
 Patch18: dhcpv6-0.10-libdhcp6client-Makefile.patch
 Patch19: dhcpv6-0.10-libdhcp6client.patch
 Patch20: dhcpv6-0.10-salen.patch
+Patch21: dhcpv6-0.10-prefix_bz196429.patch
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
@@ -71,7 +72,8 @@
 %patch16 -p1 -b .prefix
 %patch17 -p1 -b .htonl
 %patch18 -p1 -b .libdhcp6client-Makefile
-
+%patch20 -p1 -b .salen
+%patch21 -p1 -b .prefix_bz196429
 %if %{NODEBUGINFO}
 export CFLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-O2//g'`' -g3 -gdwarf-2'
 %else
@@ -84,7 +86,7 @@
 	--mandir=/usr/share/man
 make libdhcp6client/.
 %patch19 -p1 -b .libdhcp6client
-%patch20 -p1 -b .salen
+
 
 %build
 make
@@ -191,6 +193,16 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Jul 18 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-30
+- fix bug 196429: 
+  Allow clients from dhcpv6-0.10<=16 to get addresses. 
+  >16, the server sent the prefix length; this is now
+  conditional on the client sending the DHC6OPT_REQUEST_PREFIX,
+  and can be disabled by the 'use-ra-prefix' dhcp6c.conf or 
+  dhcp6s.conf setting. With the upstream version, the only
+  way to set the clients' address prefixes was by router
+  advertisement.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10-29.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 07:34:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 03:34:07 -0400
Subject: rpms/squid/devel squid-2.6.STABLE1-20060719.patch, NONE,
	1.1 squid.spec, 1.66, 1.67 squid-2.6.STABLE1-20060718.patch,
	1.1, NONE
Message-ID: <200607190734.k6J7Y7n7027593@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27562

Modified Files:
	squid.spec 
Added Files:
	squid-2.6.STABLE1-20060719.patch 
Removed Files:
	squid-2.6.STABLE1-20060718.patch 
Log Message:
the latest CVS snapshot from upstream

squid-2.6.STABLE1-20060719.patch:
 ChangeLog                                               |   45 
 RELEASENOTES.html                                       |   97 -
 configure                                               |  906 ++++++++++++++--
 configure.in                                            |   60 -
 helpers/external_acl/mswin_lm_group/win32_check_group.c |   59 -
 include/autoconf.h.in                                   |   25 
 include/version.h                                       |    2 
 src/CacheDigest.c                                       |    5 
 src/HttpRequest.c                                       |    3 
 src/access_log.c                                        |   15 
 src/acl.c                                               |   27 
 src/auth/basic/auth_basic.c                             |   20 
 src/auth/basic/auth_basic.h                             |    1 
 src/auth/digest/auth_digest.c                           |   19 
 src/auth/digest/auth_digest.h                           |    1 
 src/auth/negotiate/auth_negotiate.c                     |    6 
 src/auth/ntlm/auth_ntlm.c                               |    6 
 src/authenticate.c                                      |   16 
 src/cache_cf.c                                          |   30 
 src/cf.data.pre                                         |   21 
 src/client_side.c                                       |   85 -
 src/debug.c                                             |    5 
 src/errorpage.c                                         |    5 
 src/event.c                                             |    6 
 src/fs/aufs/store_asyncufs.h                            |    1 
 src/fs/aufs/store_dir_aufs.c                            |   45 
 src/fs/aufs/store_io_aufs.c                             |   17 
 src/fs/coss/store_coss.h                                |    1 
 src/fs/coss/store_dir_coss.c                            |   18 
 src/fs/coss/store_io_coss.c                             |   27 
 src/fs/diskd/store_dir_diskd.c                          |   45 
 src/fs/diskd/store_diskd.h                              |    1 
 src/fs/diskd/store_io_diskd.c                           |   22 
 src/fs/ufs/store_dir_ufs.c                              |   50 
 src/fs/ufs/store_io_ufs.c                               |   19 
 src/fs/ufs/store_ufs.h                                  |    1 
 src/helper.c                                            |    4 
 src/logfile.c                                           |    7 
 src/main.c                                              |   14 
 src/protos.h                                            |    4 
 src/redirect.c                                          |   15 
 src/ssl_support.c                                       |    6 
 src/stat.c                                              |   23 
 src/store.c                                             |   20 
 src/store_digest.c                                      |    4 
 src/store_io.c                                          |    7 
 src/store_rebuild.c                                     |    5 
 src/structs.h                                           |    6 
 src/tools.c                                             |   22 
 src/typedefs.h                                          |    3 
 src/wccp2.c                                             |    5 
 tools/Makefile.am                                       |    6 
 tools/Makefile.in                                       |   19 
 tools/cossdump.c                                        |  218 +++
 54 files changed, 1612 insertions(+), 488 deletions(-)

--- NEW FILE squid-2.6.STABLE1-20060719.patch ---
Differences from squid-2.6.STABLE1 to squid-2.6.STABLE1-20060719
diff -ruN squid-2.6.STABLE1/ChangeLog squid-2.6.STABLE1-20060719/ChangeLog
--- squid-2.6.STABLE1/ChangeLog	Sat Jul  1 12:41:21 2006
+++ squid-2.6.STABLE1-20060719/ChangeLog	Tue Jul 18 16:24:19 2006
@@ -1,4 +1,47 @@
-Changes to squid-2.6 (1 Jul 2006)
+Changes to squid-2.6.STABLE2 (not yet released)
+
+	- WCCP2 doesn't update statCounter.syscalls.sock.sendtos counter.
+	- Releasenotes Table of contents should use relative links without
+	  filename.
+	- Reject HTTP/0.9 formatted CONNECT requests. 
+	- Cosmetic cleanup to use safe_free instead of xfree + manual
+	  assign to NULL
+	- Bug #1650: transparent interception "Unable to forward this
+	  request at this time"
+	- Bug #1658: Memory corruption when using client-side SSL certificates
+	- Add storeRecycle; a storeIO method to delete a StoreEntry w/out
+	  deleting the underlying object.
+	- Many COSS fixes and new coss data dumper utility for diagnostics
+	- Bug #1669: SEGV in storeAddVaryReadOld
+	- Many fixes in debug sections and spelling of debug messages
+	- Don't keep client connection persistent if there was a mismatch in
+	  the response size.
+	- Move eventCleanup debug messages to debug level 2 (was 0)
+	- Add the missing concurrency parameters to basic and digest auth
+	  schemes
+	- Bug #1670: assertion failure: i->prefix_size > 0 in client_side.c:2509
+	- Log SSL user id in the custom log User name format (%un)
+	- Bug #1653: Username info not logged into Cachemgr active_requests
+	  statistics
+	- Added to the redirectors interface the support for SSL client
+	  certificate
+	- squid.conf.default cleanup to remove references to old options
+	- Fix many filedescriptors in combination with TPROXY
+	- Fix connection pinning in transparently intercepted connections
+	- Bug #1679: LDFLAGS not honored in some programs.
+	- Minor cleanup of port numbers in transparent interception or
+	  vhost + vport
+	- Bug #1671: transparent interception fails with FreeBSD ipfw or
+	  Linux-2.2 ipchains
+	- Bug #1660: Accept-Encoding related memory corruption
+	- Bug #1651: Odd results if url_rewriter defined multiple times
+	- Bug #1655: Squid does not produce coredumps under linux when
+	  started as root
+	- Bug #1673: cache digests not served to other caches
+	- Cleanup of Linux capability code used by tproxy
+	- Bug #1684: xstrdup: tried to dup a NULL pointer!
+
+Changes to squid-2.6.STABLE1 (1 Jul 2006)
 	
 	- New --enable-default-hostsfile configure option
 	- Added username info to active_requests cachemgr stats
diff -ruN squid-2.6.STABLE1/RELEASENOTES.html squid-2.6.STABLE1-20060719/RELEASENOTES.html
--- squid-2.6.STABLE1/RELEASENOTES.html	Sat Jul  1 12:43:07 2006
+++ squid-2.6.STABLE1-20060719/RELEASENOTES.html	Tue Jul 18 18:12:56 2006
@@ -2,33 +2,36 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 2.6.STABLE1 release notes</TITLE>
+ <TITLE>Squid 2.6 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 2.6.STABLE1 release notes</H1>
+<H1>Squid 2.6 release notes</H1>
 
-<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.18 2006/06/30 21:21:37 hno Exp $
+<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.23 2006/07/18 22:22:54 hno Exp $
 <HR>
 <EM>This document contains the release notes for version 2.6 of Squid.
 Squid is a WWW Cache application developed by the Web Caching community.</EM>
 <HR>
 <P>
-<H2><A NAME="toc1">1.</A> <A HREF="release-2.6.html#s1">Key changes from squid 2.5</A></H2>
+<H2><A NAME="toc1">1.</A> <A HREF="#s1">Key changes from squid 2.5</A></H2>
 
 <P>
-<H2><A NAME="toc2">2.</A> <A HREF="release-2.6.html#s2">Changes to squid.conf</A></H2>
+<H2><A NAME="toc2">2.</A> <A HREF="#s2">Changes to squid.conf</A></H2>
 
 <P>
-<H2><A NAME="toc3">3.</A> <A HREF="release-2.6.html#s3">Known issues</A></H2>
+<H2><A NAME="toc3">3.</A> <A HREF="#s3">Known issues</A></H2>
 
 <P>
-<H2><A NAME="toc4">4.</A> <A HREF="release-2.6.html#s4">Known limitations</A></H2>
+<H2><A NAME="toc4">4.</A> <A HREF="#s4">Known limitations</A></H2>
 
 <P>
-<H2><A NAME="toc5">5.</A> <A HREF="release-2.6.html#s5">Other issues</A></H2>
+<H2><A NAME="toc5">5.</A> <A HREF="#s5">Other issues</A></H2>
 
 <P>
-<H2><A NAME="toc6">6.</A> <A HREF="release-2.6.html#s6">Windows support</A></H2>
+<H2><A NAME="toc6">6.</A> <A HREF="#s6">Windows support</A></H2>
+
+<P>
+<H2><A NAME="toc7">7.</A> <A HREF="#s7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
 
 
 <HR>
@@ -121,6 +124,7 @@
 <DT><B>url_rewrite_concurrency</B><DD><P>Activates a new and more efficient helper protocol. Requires changes in the helper.</P>
 <DT><B>location_rewrite_*</B><DD><P>New helper hook for rewriting Location headers</P>
 <DT><B>auth_param basic blankpassword</B><DD><P>New option to allow the use of blank passwords.</P>
+<DT><B>auth_param basic/digest concurrency</B><DD><P>New option enabling a multiplexed helper protocol allowing the same helper to process multiple concurrent requests in an efficient manner. Requires support from the helper. (2.6.STABLE2 and later)</P>
 <DT><B>auth_param ntlm max_challenge_reuse / max_challenge_lifetime</B><DD><P>No longer supported</P>
 <DT><B>auth_param ntlm use_ntlm_negotiate</B><DD><P>Directive no longer supported. Use of NTLM negotiate packet is always on.</P>
 <DT><B>auth_param ntlm keep_alive</B><DD><P>New option to fine-tune the use of HTTP keep-alive in combination with NTLM</P>
@@ -150,46 +154,31 @@
 
 <P>There is a few known issues in this version of Squid which we hope to correct in a later release</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</A></B><DD><P>"ETag Loop" warnings in cache.log</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</A></B><DD><P>assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</A></B><DD><P>unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</A></B><DD><P>Need to implement TCP fallback on truncated (large) DNS responses</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</a>: "ETag Loop" warnings in cache.log</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</a>: assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</a>: unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</a>: Need to implement TCP fallback on truncated (large) DNS responses</LI>
+</UL>
 </P>
 
 <H2><A NAME="s4">4.</A> <A HREF="#toc4">Known limitations</A></H2>
 
 <P>In addition there is a set of limitations in this version of Squid which we hope to correct later</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</A></B><DD><P>302 responses with an Expires header is always cached</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</A></B><DD><P>WCCPv2 unable to register with more than one router on Linux</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</A></B><DD><P>mime.conf and referenced icons must be within chroot</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</A></B><DD><P>tcp_outgoing_address using an ident ACL does not work</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</A></B><DD><P>acl max_user_ip and multiple authentication schemes</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</A></B><DD><P>miss_access fails on "slow" acl types such as dst.</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</A></B><DD><P>squid -F is starting server sockets to early</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</A></B><DD><P>does not handle swap.state corruption properly</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</A></B><DD><P>unstable if runs out of disk space</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</A></B><DD><P>diskd may appear slow on low loads</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</A></B><DD><P>delay_pools stops working on -k reconfigure</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</a>: 302 responses with an Expires header is always cached</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</a>: WCCPv2 unable to register with more than one router on Linux</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</a>: mime.conf and referenced icons must be within chroot</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</a>: tcp_outgoing_address using an ident ACL does not work</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</a>: acl max_user_ip and multiple authentication schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</a>: miss_access fails on "slow" acl types such as dst.</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</a>: squid -F is starting server sockets to early</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</a>: does not handle swap.state corruption properly</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</a>: unstable if runs out of disk space</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</a>: diskd may appear slow on low loads</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</a>: delay_pools stops working on -k reconfigure</LI>
+</UL>
 </P>
 
 <H2><A NAME="s5">5.</A> <A HREF="#toc5">Other issues</A></H2>
@@ -319,6 +308,28 @@
 </P>
 </DL>
 </P>
+
+
+<H2><A NAME="s7">7.</A> <A HREF="#toc7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
+
+<P>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1650">#1650</a>: transparent interception "Unable to forward this request at this time"</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1658">#1658</a>: Memory corruption when using client-side SSL certificates</LI>
+<LI>Multiple fixes to the expreimental COSS cache_dir type</LI>
+<LI>Added the missing concurrency parameter to basic/digest auth schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1669">#1669</a>: SEGV in storeAddVaryReadOld</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1670">#1670</a>: assertion failure: i-&gt;prefix_size &gt; 0 in client_side.c:2509</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1671">#1671</a>: transparent interception fails with FreeBSD ipfw or Linux-2.2 ipchains</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1660">#1660</a>: Accept-Encoding related memory corruption</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1673">#1673</a>: cache digests not served to other caches</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1684">#1684</a>: xstrdup: tried to dup a NULL pointer!</LI>
+<LI>a number of other minor and cosmetic bugfixes. See the list of 
+<A HREF="http://www.squid-cache.org/Versions/v2/2.6/changesets/">squid-2.6 changes</A> and the 
+<A HREF="ChangeLog">ChangeLog</A> file for details.</LI>
[...3395 lines suppressed...]
+    tlv *next;
+};
+
+#undef debug
+#define	debug(a, b)	printf
+
+#define	MEM_TLV	sizeof(tlv)
+#define	memAllocate(a)	malloc(a)
+#define	memFree(a, b)	free(a)
+#define xmemcpy(a, b, c) memcpy(a, b, c)
+#define xmalloc(a) malloc(a)
+#define xfree(a) free(a)
+
+#if SIZEOF_INT64_T > SIZEOF_LONG && HAVE_STRTOLL
+typedef int64_t squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_INT64_T
+#define PRINTF_OFF_T PRId64
+#define strto_off_t (int64_t)strtoll
+#else
+typedef long squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_LONG
+#define PRINTF_OFF_T "ld"
+#define strto_off_t strtol
+#endif
+
+static tlv **
+storeSwapTLVAdd(int type, const void *ptr, size_t len, tlv ** tail)
+{
+    tlv *t = memAllocate(MEM_TLV);
+    t->type = (char) type;
+    t->length = (int) len;
+    t->value = xmalloc(len);
+    xmemcpy(t->value, ptr, len);
+    *tail = t;
+    return &t->next;		/* return new tail pointer */
+}
+
+#if UNUSED_CODE
+static void
+storeSwapTLVFree(tlv * n)
+{
+    tlv *t;
+    while ((t = n) != NULL) {
+	n = t->next;
+	xfree(t->value);
+	memFree(t, MEM_TLV);
+    }
+}
+#endif
+
+#if UNUSED_CODE
+static char *
+storeSwapMetaPack(tlv * tlv_list, int *length)
+{
+    int buflen = 0;
+    tlv *t;
+    int j = 0;
+    char *buf;
+    assert(length != NULL);
+    buflen++;			/* STORE_META_OK */
+    buflen += sizeof(int);	/* size of header to follow */
+    for (t = tlv_list; t; t = t->next)
+	buflen += sizeof(char) + sizeof(int) + t->length;
+    buflen++;			/* STORE_META_END */
+    buf = xmalloc(buflen);
+    buf[j++] = (char) STORE_META_OK;
+    xmemcpy(&buf[j], &buflen, sizeof(int));
+    j += sizeof(int);
+    for (t = tlv_list; t; t = t->next) {
+	buf[j++] = (char) t->type;
+	xmemcpy(&buf[j], &t->length, sizeof(int));
+	j += sizeof(int);
+	xmemcpy(&buf[j], t->value, t->length);
+	j += t->length;
+    }
+    buf[j++] = (char) STORE_META_END;
+    assert((int) j == buflen);
+    *length = buflen;
+    return buf;
+}
+#endif
+
+static tlv *
+storeSwapMetaUnpack(const char *buf, int *hdr_len)
+{
+    tlv *TLV;			/* we'll return this */
+    tlv **T = &TLV;
+    char type;
+    int length;
+    int buflen;
+    int j = 0;
+    assert(buf != NULL);
+    assert(hdr_len != NULL);
+    if (buf[j++] != (char) STORE_META_OK)
+	return NULL;
+    xmemcpy(&buflen, &buf[j], sizeof(int));
+    j += sizeof(int);
+    /*
+     * sanity check on 'buflen' value.  It should be at least big
+     * enough to hold one type and one length.
+     */
+    if (buflen <= (sizeof(char) + sizeof(int)))
+	    return NULL;
+    while (buflen - j > (sizeof(char) + sizeof(int))) {
+	type = buf[j++];
+	/* VOID is reserved, but allow some slack for new types.. */
+	if (type <= STORE_META_VOID || type > STORE_META_END + 10) {
+	    debug(20, 0) ("storeSwapMetaUnpack: bad type (%d)!\n", type);
+	    break;
+	}
+	xmemcpy(&length, &buf[j], sizeof(int));
+	if (length < 0 || length > (1 << 16)) {
+	    debug(20, 0) ("storeSwapMetaUnpack: insane length (%d)!\n", length);
+	    break;
+	}
+	j += sizeof(int);
+	if (j + length > buflen) {
+	    debug(20, 0) ("storeSwapMetaUnpack: overflow!\n");
+	    debug(20, 0) ("\ttype=%d, length=%d, buflen=%d, offset=%d\n",
+		type, length, buflen, (int) j);
+	    break;
+	}
+	T = storeSwapTLVAdd(type, &buf[j], (size_t) length, T);
+	j += length;
+    }
+    *hdr_len = buflen;
+    return TLV;
+}
+
+
+#define	STRIPESIZE 1048576
+#define	BLOCKSIZE 1024
+#define BLKBITS 10
+
+static void
+parse_stripe(int stripeid, char *buf, int len)
+{
+	int j = 0;
+	int bl = 0;
+	tlv *t, *tlv_list;
+	int64_t *l;
+	int tmp;
+
+	while (j < len) {
+		l = NULL;
+		bl = 0;
+		tlv_list = storeSwapMetaUnpack(&buf[j], &bl);
+		if (tlv_list == NULL) {
+			printf("  Object: NULL\n");
+			return;
+		}
+		printf("  Object: (filen %d) hdr size %d\n", j / BLOCKSIZE + (stripeid * STRIPESIZE / BLOCKSIZE), bl);
+		for (t = tlv_list; t; t = t->next) {
+			switch(t->type) {
+				case STORE_META_URL:
+					/* XXX Is this OK? Is the URL guaranteed to be \0 terminated? */
+					printf("    URL: %s\n", (char *)t->value);
+					break;
+				case STORE_META_OBJSIZE:
+					l = t->value;
+					printf("Size: %" PRINTF_OFF_T " (len %d)\n", *l, t->length);
+					break;
+			}
+		}
+		if (l == NULL) {
+			printf("  STRIPE: Completed, got an object with no size\n");
+			return;
+		}
+		j = j + *l + bl;
+		/* And now, the blocksize! */
+		tmp = j / BLOCKSIZE;
+		tmp = (tmp+1) * BLOCKSIZE;
+		j = tmp;
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	int fd;
+	char buf[STRIPESIZE];
+	int i = 0, len;
+
+	if (argc < 2) {
+		printf("Usage: %s <path to COSS datafile>\n", argv[0]);
+		exit(1);
+	}
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		perror("open");
+		exit(1);
+	}
+	while ((len = read(fd, buf, STRIPESIZE)) > 0) {
+		printf("STRIPE: %d (len %d)\n", i, len);
+		parse_stripe(i, buf, len);
+		i++;
+	}
+	return 0;
+}


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- squid.spec	18 Jul 2006 12:00:11 -0000	1.66
+++ squid.spec	19 Jul 2006 07:34:04 -0000	1.67
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -20,7 +20,7 @@
 
 # Upstream patches
 # the latest upstream CVS snapshot
-Patch100: squid-2.6.STABLE1-20060718.patch
+Patch100: squid-2.6.STABLE1-20060719.patch
 
 # External patches
 
@@ -324,6 +324,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Wed Jul 19 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-2
+- the latest CVS snapshot
+
 * Mon Jul 18 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-1
 - new upstream + the latest CVS snapshot from 2006/07/18
 - updated fd config patch


--- squid-2.6.STABLE1-20060718.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 07:35:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 03:35:57 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2416, 1.2417 sources, 1.445,
	1.446
Message-ID: <200607190735.k6J7ZvxY028013@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27875

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Add extra prepare stage for external modules to build again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2416
retrieving revision 1.2417
diff -u -r1.2416 -r1.2417
--- kernel-2.6.spec	18 Jul 2006 21:05:54 -0000	1.2416
+++ kernel-2.6.spec	19 Jul 2006 07:35:54 -0000	1.2417
@@ -1226,6 +1226,11 @@
     mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
     ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
+
+    # Temporary fix for upstream "make prepare" bug.
+    pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+    make prepare
+    popd > /dev/null
 }
 
 ###
@@ -1668,6 +1673,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Jon Masters <jcm at redhat.com>
+- Workaround upstream "make prepare" bug by adding an additional prepare stage.
+
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.
 - Fix kabitool for correct location of symvers.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- sources	18 Jul 2006 21:05:58 -0000	1.445
+++ sources	19 Jul 2006 07:35:54 -0000	1.446
@@ -2,5 +2,5 @@
 7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
-41c93c884989fd2c2e4d9c33902730c4  kernel-2.6.spec
 9d18e6231257537219ea5228e353c6ae  kabitool
+3bc5fbc46b52e23038fc7ef6bc87404c  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Wed Jul 19 07:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 03:42:40 -0400
Subject: rpms/libwmf/FC-4 libwmf.spec,1.11,1.12
Message-ID: <200607190742.k6J7geP0029422@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29398

Modified Files:
	libwmf.spec 
Log Message:
prepost foo


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/FC-4/libwmf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libwmf.spec	18 Jul 2006 07:49:10 -0000	1.11
+++ libwmf.spec	19 Jul 2006 07:42:37 -0000	1.12
@@ -14,7 +14,8 @@
 Requires: gtk2 >= 2.4.1-2
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
-Requires(post,postun): %{_bindir}/update-gdk-pixbuf-loaders
+Requires(post): %{_bindir}/update-gdk-pixbuf-loaders
+Requires(postun): %{_bindir}/update-gdk-pixbuf-loaders
 BuildRequires: gtk2-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel
@@ -66,11 +67,11 @@
 
 %post
 /sbin/ldconfig
-%{_bindir}/update-gdk-pixbuf-loaders %{_arch}-%{_host_vendor}-%{_host_os}
+%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || :
 
 %postun 
 /sbin/ldconfig
-%{_bindir}/update-gdk-pixbuf-loaders %{_arch}-%{_host_vendor}-%{_host_os}
+%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || :
 
 %files
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Wed Jul 19 07:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 03:57:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2417, 1.2418 sources, 1.446,
	1.447
Message-ID: <200607190757.k6J7vhHb017062@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16908

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Fixed kabideps



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2417
retrieving revision 1.2418
diff -u -r1.2417 -r1.2418
--- kernel-2.6.spec	19 Jul 2006 07:35:54 -0000	1.2417
+++ kernel-2.6.spec	19 Jul 2006 07:57:40 -0000	1.2418
@@ -439,7 +439,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %{_tmppath}/kabideps
+%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-%{KVERREL}-kabideps
 %define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
@@ -1114,7 +1114,8 @@
     else
 	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
     fi
-    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
+    rm -f %{_tmppath}/kernel-%{KVERREL}-kabideps
+    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kernel-%{KVERREL}-kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
     rm -f $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
@@ -1675,6 +1676,7 @@
 %changelog
 * Wed Jul 19 2006 Jon Masters <jcm at redhat.com>
 - Workaround upstream "make prepare" bug by adding an additional prepare stage.
+- Fix kabideps
 
 * Tue Jul 18 2006 Jon Masters <jcm at redhat.com>
 - Check in new version of kabitool for kernel deps.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -r1.446 -r1.447
--- sources	19 Jul 2006 07:35:54 -0000	1.446
+++ sources	19 Jul 2006 07:57:41 -0000	1.447
@@ -3,4 +3,4 @@
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
-3bc5fbc46b52e23038fc7ef6bc87404c  kernel-2.6.spec
+82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec



From fedora-cvs-commits at redhat.com  Wed Jul 19 08:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 04:34:44 -0400
Subject: rpms/zlib/devel zlib-1.2.3-cflags.patch, NONE, 1.1 zlib.spec, 1.28,
	1.29
Message-ID: <200607190834.k6J8YiKl008535@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8440

Modified Files:
	zlib.spec 
Added Files:
	zlib-1.2.3-cflags.patch 
Log Message:
- add cflags (#199379)


zlib-1.2.3-cflags.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE zlib-1.2.3-cflags.patch ---
--- zlib-1.2.3/configure.cflags	2005-07-11 22:11:57.000000000 +0200
+++ zlib-1.2.3/configure	2006-07-19 09:47:58.000000000 +0200
@@ -76,7 +76,7 @@
   SFLAGS=${CFLAGS-"-fPIC -O3"}
   CFLAGS="$cflags"
   case `(uname -s || echo unknown) 2>/dev/null` in
-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
+  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc $CFLAGS -shared -Wl,-soname,libz.so.1"};;
   CYGWIN* | Cygwin* | cygwin* | OS/2* )
              EXE='.exe';;
   QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
@@ -97,7 +97,7 @@
              SHAREDLIBV=libz.$VER$shared_ext
              SHAREDLIBM=libz.$VER1$shared_ext
              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;
-  *)             LDSHARED=${LDSHARED-"$cc -shared"};;
+  *)             LDSHARED=${LDSHARED-"$cc $CFLAGS -shared"};;
   esac
 else
   # find system name and corresponding cc options


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- zlib.spec	12 Jul 2006 19:22:28 -0000	1.28
+++ zlib.spec	19 Jul 2006 08:34:35 -0000	1.29
@@ -1,10 +1,11 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-Release: 2
+Release: 3
 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
+Patch1: zlib-1.2.3-cflags.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 Prefix: %{_prefix}
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .make-test
+%patch1 -p1 -b .cflags
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
@@ -77,6 +79,9 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Wed Jul 19 2006 Ivana Varekova <varekova at redhat.com> 1.2.3-3
+- add cflags (#199379)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 09:49:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 05:49:09 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cleanup.patch, NONE,
	1.1 autofs-5.0.1-rc1-cthon-multi-locking.patch, NONE,
	1.1 autofs-5.0.1-rc1-cthon-parser-1.patch, NONE,
	1.1 autofs-5.0.1-rc1-cthon-parser-2.patch, NONE,
	1.1 autofs-5.0.1-rc1-cthon-shutdown-expire.patch, NONE,
	1.1 autofs-5.0.1-rc1-current-race.patch, NONE, 1.1 autofs.spec,
	1.125, 1.126
Message-ID: <200607190949.k6J9n9rs008313@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8295

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cleanup.patch 
	autofs-5.0.1-rc1-cthon-multi-locking.patch 
	autofs-5.0.1-rc1-cthon-parser-1.patch 
	autofs-5.0.1-rc1-cthon-parser-2.patch 
	autofs-5.0.1-rc1-cthon-shutdown-expire.patch 
	autofs-5.0.1-rc1-current-race.patch 
Log Message:
* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.2
- Code cleanup and fixes for connectathon tests.


autofs-5.0.1-rc1-cleanup.patch:
 b/CHANGELOG                 |    4 
 b/daemon/automount.c        |  146 +++++-----
 b/daemon/direct.c           |   34 --
 b/daemon/indirect.c         |   31 --
 b/daemon/lookup.c           |    1 
 b/daemon/module.c           |    1 
 b/daemon/mount.c            |    1 
 b/daemon/spawn.c            |   11 
 b/daemon/state.c            |    7 
 b/include/automount.h       |   13 
 b/include/defaults.h        |    1 
 b/include/log.h             |    1 
 b/include/lookup_ldap.h     |    9 
 b/include/macros.h          |    1 
 b/include/master.h          |    3 
 b/include/nsswitch.h        |    1 
 b/include/state.h           |    3 
 b/lib/alarm.c               |   23 -
 b/lib/args.c                |    9 
 b/lib/cache.c               |   29 +-
 b/lib/cat_path.c            |   16 -
 b/lib/defaults.c            |    1 
 b/lib/lock.c                |    1 
 b/lib/log.c                 |    1 
 b/lib/macros.c              |    1 
 b/lib/master.c              |   35 +-
 b/lib/master_parse.y        |   18 -
 b/lib/master_tok.l          |   49 ++-
 b/lib/mounts.c              |   45 +--
 b/lib/nss_parse.y           |   11 
 b/lib/nss_tok.l             |   13 
 b/lib/nsswitch.c            |    1 
 b/lib/rpc_subs.c            |   80 ++---
 b/modules/cyrus-sasl.c      |    5 
 b/modules/lookup_file.c     |   14 
 b/modules/lookup_hesiod.c   |    1 
 b/modules/lookup_hosts.c    |    1 
 b/modules/lookup_ldap.c     |   33 +-
 b/modules/lookup_multi.c    |    1 
 b/modules/lookup_nisplus.c  |   54 ++-
 b/modules/lookup_program.c  |    1 
 b/modules/lookup_userhome.c |    1 
 b/modules/lookup_yp.c       |   14 
 b/modules/mount_afs.c       |    1 
 b/modules/mount_autofs.c    |    9 
 b/modules/mount_bind.c      |    1 
 b/modules/mount_changer.c   |    1 
 b/modules/mount_ext2.c      |    1 
 b/modules/mount_generic.c   |    1 
 b/modules/mount_nfs.c       |    9 
 b/modules/parse_hesiod.c    |    1 
 b/modules/parse_sun.c       |   11 
 b/modules/replicated.c      |   28 -
 lib/syslog.c                |  382 ---------------------------
 lib/vsprintf.c              |  619 --------------------------------------------
 55 files changed, 390 insertions(+), 1400 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 0e31a60..c47648d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+?/7/2006 autofs-5.0.1
+---------------------
+- code cleanup.
+
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
 - merge LDAP authentication update for GSSAPI (Jeff Moyer).
diff --git a/daemon/automount.c b/daemon/automount.c
index 673c005..23c123f 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1,4 +1,3 @@
-#ident "$Id: automount.c,v 1.78 2006/04/06 20:02:04 raven Exp $"
 /* ----------------------------------------------------------------------- *
  *
  *  automount.c - Linux automounter daemon
@@ -54,10 +53,10 @@ static int *pst_stat = &st_stat;
 /* Attribute to create detached thread */
 pthread_attr_t thread_attr;
 
-struct master_readmap_cond mc = {
-	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0};
+struct master_readmap_cond mrc = {
+	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
 
-struct startup_cond sc = {
+struct startup_cond suc = {
 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0};
 
 pthread_key_t key_thread_stdenv_vars;
@@ -70,7 +69,7 @@ #define MAX_OPEN_FILES		10240
 static int umount_all(struct autofs_point *ap, int force);
 
 extern pthread_mutex_t master_mutex;
-extern struct master *master;
+extern struct master *master_list;
 
 int mkdir_path(const char *path, mode_t mode)
 {
@@ -547,7 +546,9 @@ int umount_multi(struct autofs_point *ap
 	int left;
 	struct mnt_list *mptr;
 	struct list_head *p;
-	LIST_HEAD(list);
+	struct list_head list;
+
+	INIT_LIST_HEAD(&list);
 
 	debug(ap->logopt, "path %s incl %d", path, incl);
 
@@ -615,7 +616,7 @@ static int umount_all(struct autofs_poin
 
 int umount_autofs(struct autofs_point *ap, int force)
 {
-	int status = 0;
+	int ret = 0;
 
 	if (ap->state == ST_INIT)
 		return -1;
@@ -631,9 +632,9 @@ int umount_autofs(struct autofs_point *a
 		if (umount_all(ap, force) && !force)
 			return -1;
 
-		status = umount_autofs_indirect(ap);
+		ret = umount_autofs_indirect(ap);
 	} else {
-		status = umount_autofs_direct(ap);
+		ret = umount_autofs_direct(ap);
 	}
 
 	if (ap->submount) {
@@ -653,7 +654,7 @@ int umount_autofs(struct autofs_point *a
 			fatal(status);
 	}
 
-	return status;
+	return ret;
 }
 
 int send_ready(int ioctlfd, unsigned int wait_queue_token)
@@ -929,7 +930,7 @@ static void do_master_cleanup_unlock(voi
 {
 	int status;
 
-	status = pthread_mutex_unlock(&mc.mutex);
+	status = pthread_mutex_unlock(&mrc.mutex);
 	if (status)
 		fatal(status);
 
@@ -944,26 +945,26 @@ static void *do_notify_state(void *arg)
 
 	sig = *(int *) arg;
 
-	status = pthread_mutex_lock(&mc.mutex);
+	status = pthread_mutex_lock(&mrc.mutex);
 	if (status)
 		fatal(status);
 
-	master = mc.master;
+	master = mrc.master;
 
 	debug(master->default_logging, "signal %d", sig);
 
-	mc.signaled = 1;
-	status = pthread_cond_signal(&mc.cond);
+	mrc.signaled = 1;
+	status = pthread_cond_signal(&mrc.cond);
 	if (status) {
 		error(master->default_logging,
 		      "failed to signal state notify condition");
-		status = pthread_mutex_unlock(&mc.mutex);
+		status = pthread_mutex_unlock(&mrc.mutex);
 		if (status)
 			fatal(status);
 		pthread_exit(NULL);
 	}
 
-	status = pthread_mutex_unlock(&mc.mutex);
+	status = pthread_mutex_unlock(&mrc.mutex);
 	if (status)
 		fatal(status);
 
@@ -972,34 +973,34 @@ static void *do_notify_state(void *arg)
 	return NULL;
 }
 
-static int do_signals(struct master *master, int signal)
+static int do_signals(struct master *master, int sig)
 {
 	pthread_t thid;
-	int sig = signal;
+	int r_sig = sig;
 	int status;
 
-	status = pthread_mutex_lock(&mc.mutex);
+	status = pthread_mutex_lock(&mrc.mutex);
 	if (status)
 		fatal(status);
 
-	status = pthread_create(&thid, &thread_attr, do_notify_state, &sig);
+	status = pthread_create(&thid, &thread_attr, do_notify_state, &r_sig);
 	if (status) {
 		error(master->default_logging,
 		      "mount state notify thread create failed");
-		status = pthread_mutex_unlock(&mc.mutex);
+		status = pthread_mutex_unlock(&mrc.mutex);
 		if (status)
 			fatal(status);
 		return 0;
 	}
 
-	mc.thid = thid;
-	mc.master = master;
+	mrc.thid = thid;
+	mrc.master = master;
 
 	pthread_cleanup_push(do_master_cleanup_unlock, NULL);
 
-	mc.signaled = 0;
-	while (!mc.signaled) {
-		status = pthread_cond_wait(&mc.cond, &mc.mutex);
+	mrc.signaled = 0;
+	while (!mrc.signaled) {
+		status = pthread_cond_wait(&mrc.cond, &mrc.mutex);
 		if (status)
 			fatal(status);
 	}
@@ -1016,25 +1017,25 @@ static void *do_read_master(void *arg)
 	int readall = 1;
 	int status;
 
-	status = pthread_mutex_lock(&mc.mutex);
+	status = pthread_mutex_lock(&mrc.mutex);
 	if (status)
 		fatal(status);
 
-	master = mc.master;
-	age = mc.age;
+	master = mrc.master;
+	age = mrc.age;
 
-	mc.signaled = 1;
-	status = pthread_cond_signal(&mc.cond);
+	mrc.signaled = 1;
+	status = pthread_cond_signal(&mrc.cond);
 	if (status) {
 		error(master->default_logging,
 		      "failed to signal master read map condition");
-		status = pthread_mutex_unlock(&mc.mutex);
+		status = pthread_mutex_unlock(&mrc.mutex);
 		if (status)
 			fatal(status);
 		pthread_exit(NULL);
 	}
[...3309 lines suppressed...]
index e744813..37ada41 100644
--- a/modules/mount_generic.c
+++ b/modules/mount_generic.c
@@ -1,4 +1,3 @@
-#ident "$Id: mount_generic.c,v 1.22 2006/03/29 10:32:36 raven Exp $"
 /* ----------------------------------------------------------------------- *
  *   
  *  mount_generic.c - module for Linux automountd to mount filesystems
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index b4df2f2..72a9c53 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -1,4 +1,3 @@
-#ident "$Id: mount_nfs.c,v 1.36 2006/03/31 18:26:16 raven Exp $"
 /* ----------------------------------------------------------------------- *
  *   
  * mount_nfs.c - Module for Linux automountd to mount an NFS filesystem,
@@ -47,7 +46,7 @@ int mount_init(void **context)
 {
 	/* Make sure we have the local mount method available */
 	if (!mount_bind) {
-		if ((mount_bind = open_mount("bind", MODPREFIX)));
+		if ((mount_bind = open_mount("bind", MODPREFIX)))
 			init_ctr++;
 	} else
 		init_ctr++;
@@ -80,13 +79,13 @@ int mount_mount(struct autofs_point *ap,
 	if (options) {
 		const char *comma;
 		char *nfsp;
-		int len = strlen(options) + 1;
+		int o_len = strlen(options) + 1;
 
-		nfsp = nfsoptions = alloca(len + 1);
+		nfsp = nfsoptions = alloca(o_len + 1);
 		if (!nfsoptions)
 			return 1;
 
-		memset(nfsoptions, '\0', len + 1);
+		memset(nfsoptions, '\0', o_len + 1);
 
 		for (comma = options; *comma != '\0';) {
 			const char *cp;
diff --git a/modules/parse_hesiod.c b/modules/parse_hesiod.c
index 2df981b..8483a99 100644
--- a/modules/parse_hesiod.c
+++ b/modules/parse_hesiod.c
@@ -1,4 +1,3 @@
-#ident "$Id: parse_hesiod.c,v 1.9 2006/03/11 06:02:48 raven Exp $"
 /*
  * parse_hesiod.c
  *
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 3859d13..7e0f211 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -1,4 +1,3 @@
-#ident "$Id: parse_sun.c,v 1.49 2006/03/31 18:26:16 raven Exp $"
 /* ----------------------------------------------------------------------- *
  *   
  *  parse_sun.c - module for Linux automountd to parse a Sun-format
@@ -477,18 +476,18 @@ int parse_init(int argc, const char *con
 	}
 }
 
-static char *dequote(const char *str, int strlen, unsigned int logopt)
+static char *dequote(const char *str, int len, unsigned int logopt)
 {
-	char *ret = malloc(strlen + 1);
+	char *ret = malloc(len + 1);
 	char *cp = ret;
 	const char *scp;
-	int origlen = strlen;
+	int origlen = len;
 	int quote = 0;
 
 	if (ret == NULL)
 		return NULL;
 
-	for (scp = str; strlen > 0 && *scp; scp++, strlen--) {
+	for (scp = str; len > 0 && *scp; scp++, len--) {
 		if (*scp == '\\' && !quote ) {
 			quote = 1;
 			continue;
@@ -700,7 +699,7 @@ static int sun_mount(struct autofs_point
  */
 static int check_is_multi(const char *mapent)
 {
-	const char *p = (char *) mapent;
+	const char *p = mapent;
 	int multi = 0;
 	int not_first_chunk = 0;
 
diff --git a/modules/replicated.c b/modules/replicated.c
index 2d7e94a..aa484b3 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -75,17 +75,17 @@ #define mmax(x, y, z)	(max(x, y) == x ? 
 static unsigned int get_proximity(const char *host_addr, int addr_len)
 {
 	struct sockaddr_in *msk_addr, *if_addr;
-	struct in_addr *h_addr;
-	char tmp[20], buf[MAX_ERR_BUF], *estr, *ptr;
+	struct in_addr *hst_addr;
+	char tmp[20], buf[MAX_ERR_BUF], *ptr;
 	struct ifconf ifc;
 	struct ifreq *ifr, nmptr;
 	int sock, ret, i;
 	uint32_t mask, ha, ia;
 
 	memcpy(tmp, host_addr, addr_len);
-	h_addr = (struct in_addr *) tmp;
+	hst_addr = (struct in_addr *) tmp;
 
-	ha = ntohl((uint32_t) h_addr->s_addr);
+	ha = ntohl((uint32_t) hst_addr->s_addr);
 
 	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
@@ -98,7 +98,7 @@ static unsigned int get_proximity(const 
 	ifc.ifc_req = (struct ifreq *) buf;
 	ret = ioctl(sock, SIOCGIFCONF, &ifc);
 	if (ret == -1) {
-		estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		error(LOGOPT_ANY, "ioctl: %s", estr);
 		close(sock);
 		return PROXIMITY_ERROR;
@@ -116,7 +116,7 @@ static unsigned int get_proximity(const 
 		switch (ifr->ifr_addr.sa_family) {
 		case AF_INET:
 			if_addr = (struct sockaddr_in *) &ifr->ifr_addr;
-			ret = memcmp(&if_addr->sin_addr, h_addr, addr_len);
+			ret = memcmp(&if_addr->sin_addr, hst_addr, addr_len);
 			if (!ret) {
 				close(sock);
 				return PROXIMITY_LOCAL;
@@ -147,7 +147,7 @@ static unsigned int get_proximity(const 
 			nmptr = *ifr;
 			ret = ioctl(sock, SIOCGIFNETMASK, &nmptr);
 			if (ret == -1) {
-				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 				error(LOGOPT_ANY, "ioctl: %s", estr);
 				return PROXIMITY_ERROR;
 			}
@@ -696,7 +696,7 @@ static int add_host_addrs(struct host **
 	struct hostent *result;
 	struct sockaddr_in saddr;
 	char buf[MAX_IFC_BUF], **haddr;
-	int h_errno, ret;
+	int ghn_errno, ret;
 	struct host *new;
 	unsigned int prx;
 
@@ -721,14 +721,14 @@ static int add_host_addrs(struct host **
 	memset(&he, 0, sizeof(struct hostent));
 
 	ret = gethostbyname_r(host, phe,
-			buf, MAX_IFC_BUF, &result, &h_errno);
+			buf, MAX_IFC_BUF, &result, &ghn_errno);
 	if (ret || !result) {
-		if (h_errno == -1)
+		if (ghn_errno == -1)
 			error(LOGOPT_ANY,
 			      "host %s: lookup failure %d", host, errno);
 		else
 			error(LOGOPT_ANY,
-			      "host %s: lookup failure %d", host, h_errno);
+			      "host %s: lookup failure %d", host, ghn_errno);
 		return 0;
 	}
 
@@ -778,7 +778,7 @@ static int add_path(struct host *hosts, 
 int parse_location(struct host **hosts, const char *list)
 {
 	char *str, *p, *delim;
-	unsigned int list_empty = 1;
+	unsigned int empty = 1;
 
 	if (!list)
 		return 0;
@@ -830,7 +830,7 @@ int parse_location(struct host **hosts, 
 				}
 
 				if (!add_host_addrs(hosts, p, weight)) {
-					if (list_empty) {
+					if (empty) {
 						p = next;
 						continue;
 					}
@@ -850,7 +850,7 @@ int parse_location(struct host **hosts, 
 					continue;
 				}
 
-				list_empty = 0;
+				empty = 0;
 			}
 		} else {
 			/* syntax error - no mount path */

autofs-5.0.1-rc1-cthon-multi-locking.patch:
 CHANGELOG                |    1 
 daemon/automount.c       |   19 +++++++++++-------
 daemon/direct.c          |    6 -----
 include/automount.h      |    3 ++
 lib/cache.c              |   31 ++++++++++++++++++++++++++++++
 lib/master.c             |   10 +++++++++
 modules/lookup_hosts.c   |   26 +++++++++++++++++++++----
 modules/lookup_ldap.c    |    2 -
 modules/lookup_nisplus.c |    2 -
 modules/lookup_program.c |   16 +++++++++++++--
 modules/lookup_yp.c      |    2 -
 modules/parse_sun.c      |   48 +++++++++++++++++++++++++++++++++--------------
 12 files changed, 131 insertions(+), 35 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-multi-locking.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 93a4df5..8cfb220 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - code cleanup.
 - fix race for current map source.
 - cthon map parser corrections.
+- cthon multi-map locking fix and current race corrections.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 95eba4b..9faf485 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -217,7 +217,7 @@ static int umount_offsets(struct autofs_
 	map = ap->entry->first;
 	while (map) {
 		mc = map->mc;
-		cache_writelock(mc);
+		cache_readlock(mc);
 		me = cache_lookup_distinct(mc, base);
 		if (!me)
 			me = cache_lookup_distinct(mc, ind_key);
@@ -226,7 +226,6 @@ static int umount_offsets(struct autofs_
 		cache_unlock(mc);
 		map = map->next;
 	}
-	ap->entry->current = map;
 	master_source_unlock(ap->entry);
 
 	if (!me)
@@ -268,12 +267,13 @@ static int umount_offsets(struct autofs_
 	}
 
 	if (!ret && me->multi == me) {
+		cache_multi_lock(mc);
 		status = cache_delete_offset_list(mc, me->key);
+		cache_multi_unlock(mc);
 		if (status != CHE_OK)
 			warn(ap->logopt, "couldn't delete offset list");
 	}
 	cache_unlock(mc);
-	ap->entry->current = NULL;
 
 	return ret;
 }
@@ -351,7 +351,6 @@ static int umount_ent(struct autofs_poin
 			     "mounted on this path.", path);
 			rv = -1;
 		}
-
 	}
 
 	status = pthread_mutex_unlock(&ap->state_mutex);
@@ -383,6 +382,8 @@ static int walk_tree(const char *base, i
 			while (n--) {
 				int ret, size;
 
+				sched_yield();
+
 				if (strcmp(de[n]->d_name, ".") == 0 ||
 				    strcmp(de[n]->d_name, "..") == 0) {
 					free(de[n]);
@@ -413,6 +414,7 @@ static int walk_tree(const char *base, i
 static int rm_unwanted_fn(const char *file, const struct stat *st, int when, void *arg)
 {
 	dev_t dev = *(int *) arg;
+	char buf[MAX_ERR_BUF];
 	struct stat newst;
 
 	if (when == 0) {
@@ -437,8 +439,9 @@ static int rm_unwanted_fn(const char *fi
 	if (S_ISDIR(newst.st_mode)) {
 		debug(LOGOPT_ANY, "removing directory %s", file);
 		if (rmdir(file)) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 			error(LOGOPT_ANY,
-			      "unable to remove directory %s", file);
+			      "unable to remove directory %s: %s", file, estr);
 			return 0;
 		}
 	} else if (S_ISREG(newst.st_mode)) {
@@ -1217,6 +1220,8 @@ static void handle_mounts_cleanup(void *
 	if (master_list_empty(master_list))
 		kill(getpid(), SIGTERM);
 
+	sched_yield();
+
 	if (clean) {
 		if (rmdir(path) == -1) {
 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -1337,7 +1342,7 @@ void *handle_mounts(void *arg)
 				fatal(status);
 		}
 	}
-/*
+
 	status = pthread_mutex_lock(&ap->mounts_mutex);
 	if (status)
 		fatal(status);
@@ -1351,7 +1356,7 @@ void *handle_mounts(void *arg)
 	status = pthread_mutex_unlock(&ap->mounts_mutex);
 	if (status)
 		fatal(status);
-*/
+
 	pthread_cleanup_pop(1);
 
 	/*
diff --git a/daemon/direct.c b/daemon/direct.c
index 93af751..4ee8a03 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -197,7 +197,6 @@ int umount_autofs_direct(struct autofs_p
 	master_source_readlock(ap->entry);
 	map = ap->entry->first;
 	while (map) {
-		ap->entry->current = map;
 		mc = map->mc;
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_readlock(mc);
@@ -213,7 +212,6 @@ int umount_autofs_direct(struct autofs_p
 	}
 	pthread_cleanup_pop(1);
 	tree_free_mnt_tree(mnts);
-	ap->entry->current = NULL;
 
 	return 0;
 }
@@ -264,7 +262,6 @@ static int unlink_mount_tree(struct auto
 
 int do_mount_autofs_direct(struct autofs_point *ap, struct mnt_list *mnts, struct mapent *me)
 {
-	struct map_source *map = ap->entry->current;
 	struct mnt_params *mp;
 	time_t timeout = ap->exp_timeout;
 	struct stat st;
@@ -382,7 +379,7 @@ got_version:
 		      "failed to stat direct mount trigger %s", me->key);
 		goto out_close;
 	}
-	cache_set_ino_index(map->mc, me->key, st.st_dev, st.st_ino);
+	cache_set_ino_index(me->source->mc, me->key, st.st_dev, st.st_ino);
 
 	close(me->ioctlfd);
 	me->ioctlfd = -1;
@@ -442,7 +439,6 @@ int mount_autofs_direct(struct autofs_po
 			continue;
 		}
 
-		ap->entry->current = map;
 		mc = map->mc;
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_readlock(mc);
diff --git a/include/automount.h b/include/automount.h
index 8a5b800..a71606e 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -123,6 +123,7 @@ #define NEGATIVE_TIMEOUT	10
 
 struct mapent_cache {
 	pthread_rwlock_t rwlock;
+	pthread_mutex_t multi_mutex;
 	unsigned int size;
 	struct list_head *ino_index;
 	struct mapent **hash;
@@ -170,6 +171,8 @@ int cache_add_offset(struct mapent_cache
 int cache_update(struct mapent_cache *mc, struct map_source *source,
 			const char *key, const char *mapent, time_t age);
 int cache_delete(struct mapent_cache *mc, const char *key);
+void cache_multi_lock(struct mapent_cache *mc);
+void cache_multi_unlock(struct mapent_cache *mc);
 int cache_delete_offset_list(struct mapent_cache *mc, const char *key);
 void cache_release(struct map_source *map);
 struct mapent *cache_enumerate(struct mapent_cache *mc, struct mapent *me);
diff --git a/lib/cache.c b/lib/cache.c
index ffc4c9b..4d0b196 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -98,6 +98,29 @@ void cache_lock_cleanup(void *arg)
 	cache_unlock(mc);
 }
 
+void cache_multi_lock(struct mapent_cache *mc)
+{
+	int status;
+
+	status = pthread_mutex_lock(&mc->multi_mutex);
+	if (status) {
+		error(LOGOPT_ANY, "mapent cache multi mutex lock failed");
+		fatal(status);
+	}
+	return;
+}
+
+void cache_multi_unlock(struct mapent_cache *mc)
+{
+	int status;
+
+	status = pthread_mutex_unlock(&mc->multi_mutex);
+	if (status) {
+		error(LOGOPT_ANY, "mapent cache multi mutex unlock failed");
+		fatal(status);
+	}
+	return;
+}
 struct mapent_cache *cache_init(struct map_source *map)
 {
 	struct mapent_cache *mc;
@@ -130,6 +153,10 @@ struct mapent_cache *cache_init(struct m
 	if (status)
 		fatal(status);
 
+	status = pthread_mutex_init(&mc->multi_mutex, NULL);
+	if (status)
+		fatal(status);
+
 	cache_writelock(mc);
 
 	for (i = 0; i < mc->size; i++) {
@@ -675,6 +702,10 @@ void cache_release(struct map_source *ma
 	if (status)
 		fatal(status);
 
+	status = pthread_mutex_destroy(&mc->multi_mutex);
+	if (status)
+		fatal(status);
+
 	free(mc->hash);
 	free(mc->ino_index);
 	free(mc);
diff --git a/lib/master.c b/lib/master.c
index 3cf0428..ea213ad 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -1142,3 +1142,13 @@ int master_kill(struct master *master)
 	return 1;
 }
 
+void dump_master(struct master *master)
+{
+	struct list_head *p, *head;
+
+	head = &master->mounts;
+	list_for_each(p, head) {
+		struct master_mapent *this = list_entry(p, struct master_mapent, list);
+		debug(LOGOPT_ANY, "path %s", this->path);
+	}
+}
diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
index 0e5152e..16fd1bd 100644
--- a/modules/lookup_hosts.c
+++ b/modules/lookup_hosts.c
@@ -76,11 +76,17 @@ int lookup_read_master(struct master *ma
 
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct hostent *host;
 	int status;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	status = pthread_mutex_lock(&hostent_mutex);
 	if (status) {
 		error(LOGOPT_ANY, MODPREFIX "failed to lock hostent mutex");
@@ -107,8 +113,8 @@ int lookup_read_map(struct autofs_point 
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me;
 	char buf[MAX_ERR_BUF];
 	char *mapent = NULL;
@@ -118,6 +124,12 @@ int lookup_mount(struct autofs_point *ap
 	int status = NSS_STATUS_UNKNOWN;
 	int ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	cache_readlock(mc);
 	me = cache_lookup_distinct(mc, name);
 	if (!me) {
@@ -168,6 +180,9 @@ done:
 		return status;
 
 	if (mapent) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		debug(ap->logopt, MODPREFIX "%s -> %s", name, me->mapent);
 		ret = ctxt->parse->parse_mount(ap, name, name_len,
 				 mapent, ctxt->parse->context);
@@ -238,6 +253,9 @@ done:
 	cache_update(mc, source, name, mapent, now);
 	cache_unlock(mc);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	ret = ctxt->parse->parse_mount(ap, name, name_len,
 				 mapent, ctxt->parse->context);
 	free(mapent);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 7986d3b..0bcd249 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1541,7 +1541,7 @@ static int check_map_indirect(struct aut
 	if (ap->ghost && need_map) {
 		int status;
 
-		ap->entry->current->stale = 1;
+		source->stale = 1;
 
 		status = pthread_mutex_lock(&ap->state_mutex);
 		if (status)
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 4049f1b..4bc8820 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -422,7 +422,7 @@ static int check_map_indirect(struct aut
 	if (ap->ghost && need_map) {
 		int status;
 
-		ap->entry->current->stale = 1;
+		source->stale = 1;
 
 		status = pthread_mutex_lock(&ap->state_mutex);
 		if (status)
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index c7c2418..9c69b6f 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -105,8 +105,8 @@ int lookup_read_map(struct autofs_point 
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *mapent = NULL, *mapp, *tmp;
 	struct mapent *me;
 	char buf[MAX_ERR_BUF];
@@ -124,6 +124,12 @@ int lookup_mount(struct autofs_point *ap
 	int distance;
 	int alloci = 1;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	/* Catch installed direct offset triggers */
 	cache_readlock(mc);
 	me = cache_lookup_distinct(mc, name);
@@ -143,6 +149,9 @@ int lookup_mount(struct autofs_point *ap
 		/* Otherwise we found a valid offset so try mount it */
 		debug(ap->logopt, MODPREFIX "%s -> %s", name, me->mapent);
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		ret = ctxt->parse->parse_mount(ap, name, name_len,
 				      me->mapent, ctxt->parse->context);
 		goto out_free;
@@ -336,6 +345,9 @@ int lookup_mount(struct autofs_point *ap
 
 	debug(ap->logopt, MODPREFIX "%s -> %s", name, mapent);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	ret = ctxt->parse->parse_mount(ap, name, name_len,
 				       mapent, ctxt->parse->context);
 out_free:
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 741e6ec..fcee26b 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -526,7 +526,7 @@ static int check_map_indirect(struct aut
 	if (ap->ghost && need_map) {
 		int status;
 
-		ap->entry->current->stale = 1;
+		source->stale = 1;
 
 		status = pthread_mutex_lock(&ap->state_mutex);
 		if (status)
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 929698f..ca80bad 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -666,8 +666,10 @@ add_offset_entry(struct autofs_point *ap
 	} else
 		strcpy(m_mapent, loc);
 
-	cache_writelock(mc);
+	cache_readlock(mc);
+	cache_multi_lock(mc);
 	ret = cache_add_offset(mc, name, m_key, m_mapent, age);
+	cache_multi_unlock(mc);
 	cache_unlock(mc);
 
 	if (ret == CHE_OK)
@@ -1088,8 +1090,10 @@ int parse_mount(struct autofs_point *ap,
 
 			if (!path) {
 				error(ap->logopt, MODPREFIX "out of memory");
-				cache_writelock(mc);
+				cache_readlock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(options);
 				return 1;
@@ -1097,8 +1101,10 @@ int parse_mount(struct autofs_point *ap,
 
 			if (!*path) {
 				error(ap->logopt, MODPREFIX "invalid path");
-				cache_writelock(mc);
+				cache_readlock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(path);
 				free(options);
@@ -1110,8 +1116,10 @@ int parse_mount(struct autofs_point *ap,
 
 			l = parse_mapent(p, options, &myoptions, &loc, ap->logopt);
 			if (!l) {
-				cache_writelock(mc);
+				cache_readlock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(path);
 				free(options);
@@ -1130,8 +1138,10 @@ int parse_mount(struct autofs_point *ap,
 
 			if (status != CHE_OK) {
 				error(ap->logopt, MODPREFIX "error adding multi-mount");
-				cache_writelock(mc);
+				cache_readlock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(path);
 				free(options);
@@ -1145,8 +1155,20 @@ int parse_mount(struct autofs_point *ap,
 			free(myoptions);
 		} while (*p == '/');
 
-		/* Mount root offset if it exists */
 		cache_readlock(mc);
+		if (!me) {
+			error(ap->logopt,
+			      MODPREFIX
+			      "failed to find cache entry for %s", name);
+			cache_multi_lock(mc);
+			cache_delete_offset_list(mc, name);
+			cache_multi_unlock(mc);
+			cache_unlock(mc);
+			free(options);
+			return 1;
+		}
+
+		/* Mount root offset if it exists */
 		ro = cache_lookup_offset("/", "/", strlen(m_root), &me->multi_list);
 		if (ro) {
 			char *myoptions, *loc;
@@ -1154,11 +1176,11 @@ int parse_mount(struct autofs_point *ap,
 			rv = parse_mapent(ro->mapent,
 				options, &myoptions, &loc, ap->logopt);
 			if (!rv) {
-				cache_unlock(mc);
 				error(ap->logopt,
 				      MODPREFIX "mount of root offset failed");
-				cache_writelock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(options);
 				return 1;
@@ -1171,12 +1193,12 @@ int parse_mount(struct autofs_point *ap,
 			free(loc);
 
 			if (rv < 0) {
-				cache_unlock(mc);
 				error(ap->logopt,
 				      MODPREFIX
 				      "mount multi-mount root %s failed", name);
-				cache_writelock(mc);
+				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
+				cache_multi_unlock(mc);
 				cache_unlock(mc);
 				free(options);
 				return rv;
@@ -1184,12 +1206,8 @@ int parse_mount(struct autofs_point *ap,
 		}
 
 		if (!mount_multi_triggers(ap, m_root, me, "/")) {
-			cache_unlock(mc);
 			error(ap->logopt,
 			      MODPREFIX "failed to mount offset triggers");
-			cache_writelock(mc);
-			cache_delete_offset_list(mc, name);
-			cache_unlock(mc);
 			free(options);
 			return 1;
 		}
@@ -1340,11 +1358,13 @@ int parse_mount(struct autofs_point *ap,
 
 			base = &me->key[start];
 
+			cache_multi_lock(mc);
 			if (!mount_multi_triggers(ap, m_root, me->multi, base)) {
 				error(ap->logopt,
 				      MODPREFIX "failed to mount offset triggers");
 				rv = 1;
 			}
+			cache_multi_unlock(mc);
 		}
 		cache_unlock(mc);
 	}

autofs-5.0.1-rc1-cthon-parser-1.patch:
 CHANGELOG                |    1 
 daemon/automount.c       |    4 
 include/automount.h      |    2 
 lib/Makefile             |    4 
 lib/cache.c              |   13 -
 modules/lookup_file.c    |   49 +++-
 modules/lookup_ldap.c    |   32 ++
 modules/lookup_nisplus.c |   29 ++
 modules/lookup_yp.c      |   35 +-
 modules/mount_nfs.c      |    2 
 modules/parse_sun.c      |  561 ++++++++++++++++++++++++-----------------------
 11 files changed, 431 insertions(+), 301 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-parser-1.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 48d811a..93a4df5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 ---------------------
 - code cleanup.
 - fix race for current map source.
+- cthon map parser corrections.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 23c123f..95eba4b 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -1368,8 +1368,8 @@ void *handle_mounts(void *arg)
 	 * So, the solution is a recipe for disaster.
 	 * Hope we don't get a really busy system!
 	 */
-	/* sleep(1); */
-	sched_yield();
+	sleep(5);
+	/* sched_yield(); */
 
 	return NULL;
 }
diff --git a/include/automount.h b/include/automount.h
index 908b308..8a5b800 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -28,6 +28,7 @@ #include "master.h"
 #include "macros.h"
 #include "log.h"
 #include "rpc_subs.h"
+#include "parse_subs.h"
 
 #ifdef WITH_DMALLOC
 #include <dmalloc.h>
@@ -115,6 +116,7 @@ #define CHE_UPDATED	0x0002
 #define CHE_RMPATH	0x0004
 #define CHE_MISSING	0x0008
 #define CHE_COMPLETED	0x0010
+#define CHE_DUPLICATE	0x0020
 
 #define HASHSIZE		77
 #define NEGATIVE_TIMEOUT	10
diff --git a/lib/Makefile b/lib/Makefile
index 5eddebb..5c4d022 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,12 +8,12 @@ include ../Makefile.rules
 
 SRCS = cache.c cat_path.c rpc_subs.c mounts.c log.c nsswitch.c \
 	master_tok.l master_parse.y nss_tok.c nss_parse.tab.c \
-	args.c alarm.c macros.c master.c defaults.c
+	args.c alarm.c macros.c master.c defaults.c parse_subs.c
 RPCS = mount.h mount_clnt.c mount_xdr.c
 OBJS = cache.o mount_clnt.o mount_xdr.o cat_path.o rpc_subs.o \
 	mounts.o log.o nsswitch.o master_tok.o master_parse.tab.o \
 	nss_tok.o nss_parse.tab.o args.o alarm.o macros.o master.o \
-	defaults.o
+	defaults.o parse_subs.o
 
 YACCSRC = nss_tok.c nss_parse.tab.c nss_parse.tab.h \
 	  master_tok.c master_parse.tab.c master_parse.tab.h
diff --git a/lib/cache.c b/lib/cache.c
index 6736a88..ffc4c9b 100644
--- a/lib/cache.c
+++ b/lib/cache.c
@@ -446,6 +446,7 @@ static void cache_add_ordered_offset(str
 {
 	struct list_head *p;
 	struct mapent *this;
+	int status = CHE_OK;
 
 	list_for_each(p, head) {
 		size_t tlen;
@@ -456,15 +457,15 @@ static void cache_add_ordered_offset(str
 
 		eq = strncmp(this->key, me->key, tlen);
 		if (!eq && tlen == strlen(me->key))
-			goto done;
+			return;
 
 		if (eq > 0) {
 			list_add_tail(&me->multi_list, p);
-			goto done;
+			return;
 		}
 	}
 	list_add_tail(&me->multi_list, p);
-done:
+
 	return;
 }
 
@@ -478,7 +479,11 @@ int cache_add_offset(struct mapent_cache
 	if (!owner)
 		return CHE_FAIL;
 
-	ret = cache_update(mc, owner->source, key, mapent, age);
+	me = cache_lookup_distinct(mc, key);
+	if (me && me != owner)
+		return CHE_DUPLICATE;
+
+	ret = cache_add(mc, owner->source, key, mapent, age);
 	if (ret == CHE_FAIL) {
 		warn(LOGOPT_ANY, "failed to add key %s to cache", key);
 		return CHE_FAIL;
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 913af6a..a515d70 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -182,6 +182,8 @@ static int read_one(FILE *f, char *key, 
 				state = st_begin;
 				if (gotten == got_plus)
 					goto got_it;
+				if (escape != esc_val)
+					goto got_it;
 			} else if (isspace(ch) && !escape) {
 				getting = got_real;
 				state = st_entspc;
@@ -192,7 +194,7 @@ static int read_one(FILE *f, char *key, 
 				if (key_len == KEY_MAX_LEN) {
 					state = st_badent;
 					error(LOGOPT_ANY,
-					      MODPREFIX "Map key \"%s...\" "
+					      MODPREFIX "map key \"%s...\" "
 					      "is too long.  The maximum key "
 					      "length is %d", key,
 					      KEY_MAX_LEN);
@@ -214,8 +216,12 @@ static int read_one(FILE *f, char *key, 
 			break;
 
 		case st_badent:
-			if (ch == '\n')
+			if (ch == '\n') {
 				state = st_begin;
+				if (gotten == got_real || gotten == getting)
+					goto got_it;
+				goto next;
+			}
 			break;
 
 		case st_entspc:
@@ -232,6 +238,16 @@ static int read_one(FILE *f, char *key, 
 
 		case st_getent:
 			if (ch == '\n') {
+				nch = getc(f);
+				if (nch != EOF && isblank(nch)) {
+					state = st_badent;
+					ungetc(nch, f);
+					error(LOGOPT_ANY, MODPREFIX 
+					      "bad map entry \"%s...\" for key "
+					      "\"%s\"", mapent, key);
+					break;
+				}
+				ungetc(nch, f);
 				state = st_begin;
 				if (gotten == got_real || gotten == getting)
 					goto got_it;
@@ -245,7 +261,7 @@ static int read_one(FILE *f, char *key, 
 				ungetc(nch, f);
 			} else {
 				error(LOGOPT_ANY,
-				      MODPREFIX "Map entry \"%s...\" for key "
+				      MODPREFIX "map entry \"%s...\" for key "
 				      "\"%s\" is too long.  The maximum entry"
 				      " size is %d", mapent, key,
 				      MAPENT_MAX_LEN);
@@ -640,15 +656,36 @@ int lookup_read_map(struct autofs_point 
 			master_free_mapent_sources(iap->entry, 0);
 			master_free_mapent(iap->entry);
 		} else {
-			if (ap->type == LKP_INDIRECT && *key == '/')
+			char *dq_key, *dq_mapent; 
+
+			dq_key = dequote(key, strlen(key), ap->logopt);
+			if (!dq_key)
 				continue;
 
-			if (ap->type == LKP_DIRECT && *key != '/')
+			if (*dq_key == '/') {
+				if (ap->type == LKP_INDIRECT) {
+					free(dq_key);
+					continue;
+				}
+			} else {
+				if (ap->type == LKP_DIRECT) {
+					free(dq_key);
+					continue;
+				}
+			}
+
+			dq_mapent = dequote(mapent, strlen(mapent), ap->logopt); 
+			if (!dq_mapent) {
+				free(dq_key);
 				continue;
+			}
 
 			cache_writelock(mc);
-			cache_update(mc, source, key, mapent, age);
+			cache_update(mc, source, dq_key, dq_mapent, age);
 			cache_unlock(mc);
+
+			free(dq_key);
+			free(dq_mapent);
 		}
 
 		if (feof(f))
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 9a7794d..7986d3b 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1146,6 +1146,7 @@ static int read_one_map(struct autofs_po
 
 	while (e) {
 		char *mapent = NULL;
+		char *dq_key, *dq_mapent;
 
 		keyValue = ldap_get_values(ldap, e, entry);
 
@@ -1227,18 +1228,37 @@ static int read_one_map(struct autofs_po
 		}
 		ldap_value_free(values);
 
-		if (**keyValue == '/' && strlen(*keyValue) == 1)
-			**keyValue = '*';
-
-		if (ap->type == LKP_INDIRECT && **keyValue == '/')
+		dq_key = dequote(*keyValue, strlen(*keyValue), ap->logopt);
+		if (!dq_key)
 			goto next;
 
-		if (ap->type == LKP_DIRECT && **keyValue != '/')
+		if (*dq_key == '/' && strlen(dq_key) == 1)
+			*dq_key = '*';
+
+		if (*dq_key == '/') {
+			if (ap->type == LKP_INDIRECT) {
+				free(dq_key);
+				goto next;
+			}
+		} else {
+			if (ap->type == LKP_DIRECT) {
+				free(dq_key);
+				goto next;
+			}
+		}
+
+		dq_mapent = dequote(mapent, strlen(mapent), ap->logopt);
+		if (!mapent) {
+			free(dq_key);
 			goto next;
+		}
 
 		cache_writelock(mc);
-		cache_update(mc, source, *keyValue, mapent, age);
+		cache_update(mc, source, dq_key, dq_mapent, age);
 		cache_unlock(mc);
+
+		free(dq_key);
+		free(dq_mapent);
 next:
 		if (mapent) {
 			free(mapent);
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index cb5d620..4049f1b 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -202,6 +202,8 @@ int lookup_read_map(struct autofs_point 
 	result_count = NIS_RES_NUMOBJ(result);
 
 	while (result_count--) {
+		char *dq_key, *dq_mapent;
+
 		this = &result->objects.objects_val[current++];
 		key = ENTRY_VAL(this, 0);
 		/*
@@ -211,16 +213,35 @@ int lookup_read_map(struct autofs_point 
 		if (*key == '+')
 			continue;
 
-		if (ap->type == LKP_INDIRECT && *key == '/')
+		dq_key = dequote(key, ENTRY_LEN(this, 0), ap->logopt);
+		if (!dq_key)
 			continue;
 
-		if (ap->type == LKP_DIRECT && *key != '/')
-			continue;
+		if (*dq_key == '/') {
+			if (ap->type == LKP_INDIRECT) {
+				free(dq_key);
+				continue;
+			}
+		} else {
+			if (ap->type == LKP_DIRECT) {
+				free(dq_key);
+				continue;
+			}
+		}
 
 		mapent = ENTRY_VAL(this, 1);
+		dq_mapent = dequote(mapent, ENTRY_LEN(this, 1), ap->logopt);
+		if (!dq_mapent) {
+			free(dq_key);
+			continue;
+		}
+
 		cache_writelock(mc);
-		cache_update(mc, source, key, mapent, age);
+		cache_update(mc, source, dq_key, dq_mapent, age);
 		cache_unlock(mc);
+
+		free(dq_key);
+		free(dq_mapent);
 	}
 
 	nis_freeresult(result);
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index 4114aaa..741e6ec 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -248,8 +248,7 @@ int yp_all_callback(int status, char *yp
 	struct map_source *source = cbdata->source;
 	struct mapent_cache *mc = source->mc;
 	time_t age = cbdata->age;
-	char *key;
-	char *mapent;
+	char *key, *mapent;
 	int ret;
 
 	if (status != YP_TRUE)
@@ -262,23 +261,35 @@ int yp_all_callback(int status, char *yp
 	if (*ypkey == '+')
 		return 0;
 
-	if (ap->type == LKP_INDIRECT && *ypkey == '/')
-		return 0;
-
-	if (ap->type == LKP_DIRECT && *ypkey != '/')
+	key = dequote(ypkey, ypkeylen, ap->logopt);
+	if (!key)
 		return 0;
 
-	key = alloca(ypkeylen + 1);
-	strncpy(key, ypkey, ypkeylen);
-	*(key + ypkeylen) = '\0';
+	if (*key == '/') {
+		if (ap->type == LKP_INDIRECT) {
+			free(key);
+			return 0;
+		}
+	} else {
+		if (ap->type == LKP_DIRECT) {
+			free(key);
+			return 0;
+		}
+	}
 
-	mapent = alloca(vallen + 1);
-	strncpy(mapent, val, vallen);
-	*(mapent + vallen) = '\0';
+	mapent = dequote(val, vallen, ap->logopt);
+	if (!mapent) {
+		free(key);
+		return 0;
+	}
 
 	cache_writelock(mc);
 	ret = cache_update(mc, source, key, mapent, age);
 	cache_unlock(mc);
+
+	free(key);
+	free(mapent);
+
 	if (ret == CHE_FAIL)
 		return -1;
 
diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
index 72a9c53..0ab2faf 100644
--- a/modules/mount_nfs.c
+++ b/modules/mount_nfs.c
@@ -227,7 +227,7 @@ int mount_mount(struct autofs_point *ap,
 
 			err = spawnll(log_debug,
 				     PATH_MOUNT, PATH_MOUNT, "-t",
-				     "nfs", SLOPPYOPT "-o", nfsoptions,
+				     "nfs", "-o", nfsoptions,
 				     loc, fullpath, NULL);
 		} else {
 			debug(ap->logopt,
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index d415660..929698f 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -214,116 +214,6 @@ int expandsunent(const char *src, char *
 	return len;
 }
 
-/*
- * Skip whitespace in a string; if we hit a #, consider the rest of the
- * entry a comment.
- */
-const char *skipspace(const char *whence)
-{
-	while (1) {
-		switch (*whence) {
-		case ' ':
-		case '\b':
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-			whence++;
-			break;
-		case '#':	/* comment: skip to end of string */
-			while (*whence != '\0')
-				whence++;
-			/* FALLTHROUGH */
-
-		default:
-			return whence;
-		}
-	}
-}
-
-/*
- * Check a string to see if a colon appears before the next '/'.
- */
-int check_colon(const char *str)
-{
-	char *ptr = (char *) str;
-
-	while (*ptr && *ptr != ':' && *ptr != '/') {
-		ptr++;
-	}
-
-	if (!*ptr || *ptr == '/')
-		return 0;
-
-	return 1;
-}
-
-/* Get the length of a chunk delimitered by whitespace */
-int chunklen(const char *whence, int expect_colon)
-{
-	int n = 0;
-	int quote = 0;
-
-	for (; *whence; whence++, n++) {
-		switch (*whence) {
-		case '\\':
-			if( quote ) {
-				break;
-			} else {
-				quote = 1;
-				continue;
-			}
-		case ':':
-			if (expect_colon)
-				expect_colon = 0;
-			continue;
-		case ' ':
-		case '\t':
-			/* Skip space or tab if we expect a colon */
-			if (expect_colon)
-				continue;
-		case '\b':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case '#':
-		case '\0':
-			if (!quote)
-				return n;
-			/* FALLTHROUGH */
-		default:
-			break;
-		}
-		quote = 0;
-	}
-
-	return n;
-}
-
-/*
- * Compare str with pat.  Return 0 if compare equal or
- * str is an abbreviation of pat of no less than mchr characters.
- */
-int strmcmp(const char *str, const char *pat, int mchr)
-{
-	int nchr = 0;
-
-	while (*str == *pat) {
-		if (!*str)
-			return 0;
-		str++;
-		pat++;
-		nchr++;
-	}
-
-	if (!*str && nchr > mchr)
-		return 0;
-
-	return *pat - *str;
-}
-
 int parse_init(int argc, const char *const *argv, void **context)
 {
 	struct parse_context *ctxt;
@@ -476,33 +366,6 @@ int parse_init(int argc, const char *con
 	}
 }
 
-static char *dequote(const char *str, int len, unsigned int logopt)
-{
-	char *ret = malloc(len + 1);
-	char *cp = ret;
-	const char *scp;
-	int origlen = len;
-	int quote = 0;
-
-	if (ret == NULL)
-		return NULL;
-
-	for (scp = str; len > 0 && *scp; scp++, len--) {
-		if (*scp == '\\' && !quote ) {
-			quote = 1;
-			continue;
-		}
-		quote = 0;
-		*cp++ = *scp;
-	}
-	*cp = '\0';
-
-	debug(logopt,
-	      MODPREFIX "dequote(\"%.*s\") -> %s", origlen, str, ret);
-
-	return ret;
-}
-
 static const char *parse_options(const char *str, char **ret, unsigned int logopt)
 {
 	const char *cp = str;
@@ -757,7 +620,7 @@ add_offset_entry(struct autofs_point *ap
 	struct mapent_cache *mc;
 	char m_key[PATH_MAX + 1];
 	char m_mapent[MAPENT_MAX_LEN + 1];
-	int m_key_len, m_mapent_len;
+	int p_len, m_key_len, m_options_len, m_mapent_len;
 	int ret;
 
 	source = ap->entry->current;
@@ -766,34 +629,54 @@ add_offset_entry(struct autofs_point *ap
 
 	mc = source->mc;
 
-	m_key_len = m_root_len + strlen(path) + 1;
-	if (m_key_len > PATH_MAX) {
+	if (!*path || !*loc) {
 		error(ap->logopt,
-		      MODPREFIX "multi mount key too long - ignored");
+		      MODPREFIX "syntax error in offset %s -> %s", path, loc);
+		return CHE_FAIL;
+	}
+
+	p_len = strlen(path);
+	/* Trailing '/' causes us pain */
+	if (path[p_len - 1] == '/')
+		p_len--;
+	m_key_len = m_root_len + p_len;
+	if (m_key_len > PATH_MAX) {
+		error(ap->logopt, MODPREFIX "multi mount key too long");
 		return CHE_FAIL;
 	}
 	strcpy(m_key, m_root);
-	strcat(m_key, path);
+	strncat(m_key, path, p_len);
+	m_key[m_key_len] = '\0';
 
-	m_mapent_len = strlen(myoptions) + strlen(loc) + 3;
-	if (m_mapent_len > MAPENT_MAX_LEN) {
-		error(ap->logopt,
-		      MODPREFIX "multi mount mapent too long - ignored");
+	m_options_len = 0;
+	if (*myoptions)
+		m_options_len = strlen(myoptions) + 2;
+
+	m_mapent_len = strlen(loc);
+	if (m_mapent_len + m_options_len > MAPENT_MAX_LEN) {
+		error(ap->logopt, MODPREFIX "multi mount mapent too long");
 		return CHE_FAIL;
 	}
-	strcpy(m_mapent, "-");
-	strcat(m_mapent, myoptions);
-	strcat(m_mapent, " ");
-	strcat(m_mapent, loc);
 
-	debug(ap->logopt,
-	      MODPREFIX
-	      "adding multi-mount offset %s -> %s", path, m_mapent);
+	if (*myoptions) {
+		strcpy(m_mapent, "-");
+		strcat(m_mapent, myoptions);
+		strcat(m_mapent, " ");
+		strcat(m_mapent, loc);
+	} else
+		strcpy(m_mapent, loc);
 
 	cache_writelock(mc);
 	ret = cache_add_offset(mc, name, m_key, m_mapent, age);
 	cache_unlock(mc);
 
+	if (ret == CHE_OK)
+		debug(ap->logopt, MODPREFIX
+		      "added multi-mount offset %s -> %s", path, m_mapent);
+	else
+		debug(ap->logopt, MODPREFIX
+		      "syntax error in offset %s -> %s", path, loc);
+
 	return ret;
 }
 
@@ -862,21 +745,164 @@ cont:
 	return 1;
 }
 
-static void parse_sun_cleanup(struct mapent_cache *mc, const char *name,
-			 char *options, char *path, char *myoptions)
+static int validate_location(char *loc)
 {
-	cache_writelock(mc);
-	cache_delete_offset_list(mc, name);
-	cache_unlock(mc);
+	char *ptr = loc;
 
-	if (options)
-		free(options);
+	/* We don't know much about these */
+	if (*ptr == '/')
+		return 1;
+
+	/* If a ':' is present now it must be a host name */
+	if (check_colon(ptr)) {
+		if (!isalpha(*ptr++))
+			return 0;
 
-	if (path)
-		free(path);
+		while (*ptr && *ptr != ':') {
+			if (!(isalnum(*ptr) ||
+			    *ptr == '-' || *ptr == '.' || *ptr == ','))
+				return 0;
+			ptr++;
+		}
+
+		if (*ptr && *ptr == ':')
+			ptr++;
+	}
+
+	/* Must always be something following */
+	if (!*ptr)
+		return 0;
+
+	return 1;
+}
 
-	if (myoptions)
+static int parse_mapent(const char *ent, char *g_options, char **options, char **location, int logopt)
+{
+	char buf[MAX_ERR_BUF];
+	const char *p;
+	char *myoptions, *loc;
+	int l;
+
+	p = ent;
+
+	myoptions = strdup(g_options);
+	if (!myoptions) {
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		error(logopt, MODPREFIX "strdup: %s", estr);
+		return 0;
+	}
+
+	/* Local options are appended to per-map options */
+	if (*p == '-') {
+		do {
+			char *tmp, *newopt = NULL;
+
+			p = parse_options(p, &newopt, logopt);
+
+			tmp = concat_options(myoptions, newopt);
+			if (!tmp) {
+				char *estr;
+				estr = strerror_r(errno, buf, MAX_ERR_BUF);
+				error(logopt, MODPREFIX
+				      "concat_options: %s", estr);
+				free(myoptions);
+				return 0;
+			}
+			myoptions = tmp;
+
+			p = skipspace(p);
+		} while (*p == '-');
+	}
+
+	/* Location can't begin with a '/' */
+	if (*p == '/') {
+		error(logopt, MODPREFIX "error location begins with \"/\"");
+		free(myoptions);
+		return 0;
+	}
+
+	/* Skip ':' escape */
+	if (*p == ':')
+		p++;
+
+	l = chunklen(p, check_colon(p));
+	loc = dequote(p, l, logopt);
+	if (!loc) {
+		error(logopt, MODPREFIX "out of memory");
 		free(myoptions);
+		return 0;
+	}
+
+	if (!validate_location(loc)) {
+		error(logopt, MODPREFIX "invalid location");
+		free(myoptions);
+		free(loc);
+		return 0;
+	}
+
+	debug(logopt, MODPREFIX "dequote(\"%.*s\") -> %s", l, p, loc);
+
+	p += l;
+	p = skipspace(p);
+
+	while (*p && *p != '/') {
+		char *ent;
+
+		/* Location can't begin with a '/' */
+		if (*p == '/') {
+			error(logopt,
+			      MODPREFIX "error location begins with \"/\"");
+			free(myoptions);
+			free(loc);
+			return 0;
+		}
+
+		/* Skip ':' escape */
+		if (*p == ':')
+			p++;
+
+		l = chunklen(p, check_colon(p));
+		ent = dequote(p, l, logopt);
+		if (!ent) {
+			error(logopt, MODPREFIX "out of memory");
+			free(myoptions);
+			free(loc);
+			return 0;
+		}
+
+		if (!validate_location(ent)) {
+			error(logopt,
+			      MODPREFIX "invalid location %s", ent);
+			free(ent);
+			free(myoptions);
+			free(loc);
+			return 0;
+		}
+
+		debug(logopt, MODPREFIX "dequote(\"%.*s\") -> %s", l, p, ent);
+
+		loc = realloc(loc, strlen(loc) + l + 2);
+		if (!loc) {
+			error(logopt, MODPREFIX "out of memory");
+			free(ent);
+			free(myoptions);
+			free(loc);
+			return 0;
+		}
+
+		strcat(loc, " ");
+		strcat(loc, ent);
+
+		free(ent);
+
+		p += l;
+		p = skipspace(p);
+	}
+
+	*options = myoptions;
+	*location = loc;
+
+	return (p - ent);
 }
 
 /*
@@ -898,7 +924,7 @@ int parse_mount(struct autofs_point *ap,
 	char buf[MAX_ERR_BUF];
 	struct map_source *source;
 	struct mapent_cache *mc;
-	struct mapent *me;
+	struct mapent *me, *ro;
 	char *pmapent, *options;
 	const char *p;
 	int mapent_len, rv = 0;
@@ -977,9 +1003,6 @@ int parse_mount(struct autofs_point *ap,
 	if (check_is_multi(p)) {
 		char *m_root = NULL;
 		int m_root_len;
-		char *root_path = NULL;
-		char *root_loc = NULL;
-		char *root_options = NULL;
 		time_t age = time(NULL);
 		int l;
 
@@ -1041,8 +1064,7 @@ int parse_mount(struct autofs_point *ap,
 
 		/* It's a multi-mount; deal with it */
 		do {
-			char *myoptions = strdup(options);
-			char *path, *loc;
+			char *path, *myoptions, *loc;
 			int status;
 
 			if (myoptions == NULL) {
@@ -1055,86 +1077,50 @@ int parse_mount(struct autofs_point *ap,
 			if (*p != '/') {
 				l = 0;
 				path = dequote("/", 1, ap->logopt);
+				debug(ap->logopt,
+				      MODPREFIX "dequote(\"/\") -> %s", path);
 			} else {
 				l = chunklen(p, 0);
 				path = dequote(p, l, ap->logopt);
+				debug(ap->logopt, MODPREFIX
+				      "dequote(\"%.*s\") -> %s", l, p, path);
 			}
 
 			if (!path) {
 				error(ap->logopt, MODPREFIX "out of memory");
-				parse_sun_cleanup(mc, name, options, NULL, myoptions);
+				cache_writelock(mc);
+				cache_delete_offset_list(mc, name);
+				cache_unlock(mc);
+				free(options);
 				return 1;
 			}
 
-			p += l;
-			p = skipspace(p);
-
-			/* Local options are appended to per-map options */
-			if (*p == '-') {
-				do {
-					char *newopt = NULL;
-
-					p = parse_options(p, &newopt, ap->logopt);
-					myoptions = concat_options(myoptions, newopt);
-
-					if (myoptions == NULL) {
-						char *estr;
-						estr = strerror_r(errno, buf, MAX_ERR_BUF);
-						error(ap->logopt, MODPREFIX
-						      "multi concat_options: %s", estr);
-						parse_sun_cleanup(mc, name,
-							options, NULL, NULL);
-						return 1;
-					}
-					p = skipspace(p);
-				} while (*p == '-');
+			if (!*path) {
+				error(ap->logopt, MODPREFIX "invalid path");
+				cache_writelock(mc);
+				cache_delete_offset_list(mc, name);
+				cache_unlock(mc);
+				free(path);
+				free(options);
+				return 1;
 			}
 
-			/* Skip over colon escape */
-			if (*p == ':')
-				p++;
+			p += l;
+			p = skipspace(p);
 
-			l = chunklen(p, check_colon(p));
-			loc = dequote(p, l, ap->logopt);
-			if (!loc) {
-				error(ap->logopt, MODPREFIX "out of memory");
-				parse_sun_cleanup(mc, name, options, path, myoptions);
+			l = parse_mapent(p, options, &myoptions, &loc, ap->logopt);
+			if (!l) {
+				cache_writelock(mc);
+				cache_delete_offset_list(mc, name);
+				cache_unlock(mc);
+				free(path);
+				free(options);
 				return 1;
 			}
 
 			p += l;
 			p = skipspace(p);
 
-			while (*p && *p != '/') {
-				char *ent;
-
-				l = chunklen(p, check_colon(p));
-				ent = dequote(p, l, ap->logopt);
-				if (!ent) {
-					error(ap->logopt, MODPREFIX "out of memory");
-					parse_sun_cleanup(mc, name,
-						options, path, myoptions);
-					return 1;
-				}
-
-				loc = realloc(loc, strlen(loc) + l + 2);
-				if (!loc) {
-					error(ap->logopt, MODPREFIX "out of memory");
-					parse_sun_cleanup(mc, name,
-						options, path, myoptions);
-					free(ent);
-					return 1;
-				}
-
-				strcat(loc, " ");
-				strcat(loc, ent);
-
-				free(ent);
-
-				p += l;
-				p = skipspace(p);
-			}
-
 			master_source_current_wait(ap->entry);
 			ap->entry->current = source;
 
@@ -1142,61 +1128,70 @@ int parse_mount(struct autofs_point *ap,
 						m_root, m_root_len,
 						path, myoptions, loc, age);
 
-			if (!strcmp(path, "/")) {
-				root_path = strdup(path);
-				if (!root_path) {
-					error(ap->logopt, MODPREFIX "out of memory");
-					parse_sun_cleanup(mc, name,
-						options, path, myoptions);
-					return 1;
-				}
-				root_loc = strdup(loc);
-				if (!root_loc) {
-					error(ap->logopt, MODPREFIX "out of memory");
-					parse_sun_cleanup(mc, name,
-						options, path, myoptions);
-					free(root_path);
-					return 1;
-				}
-				root_options = strdup(myoptions);
-				if (!root_options) {
-					error(ap->logopt, MODPREFIX "out of memory");
-					parse_sun_cleanup(mc, name,
-						options, path, myoptions);
-					free(root_loc);
-					free(root_path);
-					return 1;
-				}
+			if (status != CHE_OK) {
+				error(ap->logopt, MODPREFIX "error adding multi-mount");
+				cache_writelock(mc);
+				cache_delete_offset_list(mc, name);
+				cache_unlock(mc);
+				free(path);
+				free(options);
+				free(myoptions);
+				free(loc);
+				return 1;
 			}
+
 			free(loc);
 			free(path);
 			free(myoptions);
 		} while (*p == '/');
 
-		if (root_path) {
-			rv = sun_mount(ap, m_root, root_path, strlen(root_path),
-				root_loc, strlen(root_loc), root_options, ctxt);
+		/* Mount root offset if it exists */
+		cache_readlock(mc);
+		ro = cache_lookup_offset("/", "/", strlen(m_root), &me->multi_list);
+		if (ro) {
+			char *myoptions, *loc;
 
-			free(root_path);
-			free(root_loc);
-			free(root_options);
+			rv = parse_mapent(ro->mapent,
+				options, &myoptions, &loc, ap->logopt);
+			if (!rv) {
+				cache_unlock(mc);
+				error(ap->logopt,
+				      MODPREFIX "mount of root offset failed");
+				cache_writelock(mc);
+				cache_delete_offset_list(mc, name);
+				cache_unlock(mc);
+				free(options);
+				return 1;
+			}
+
+			rv = sun_mount(ap, m_root,
+				"/", 1, loc, strlen(loc), myoptions, ctxt);
+
+			free(myoptions);
+			free(loc);
 
 			if (rv < 0) {
+				cache_unlock(mc);
 				error(ap->logopt,
 				      MODPREFIX
 				      "mount multi-mount root %s failed", name);
 				cache_writelock(mc);
 				cache_delete_offset_list(mc, name);
 				cache_unlock(mc);
+				free(options);
 				return rv;
 			}
 		}
 
-		cache_readlock(mc);
 		if (!mount_multi_triggers(ap, m_root, me, "/")) {
+			cache_unlock(mc);
 			error(ap->logopt,
 			      MODPREFIX "failed to mount offset triggers");
-			rv = 1;
+			cache_writelock(mc);
+			cache_delete_offset_list(mc, name);
+			cache_unlock(mc);
+			free(options);
+			return 1;
 		}
 		cache_unlock(mc);
 
@@ -1209,6 +1204,14 @@ int parse_mount(struct autofs_point *ap,
 		int loclen;
 		int l;
 
+		/* Location can't begin with a '/' */
+		if (*p == '/') {
+			error(ap->logopt,
+			      MODPREFIX "error location begins with \"/\"");
+			free(options);
+			return 1;
+		}
+
 		if (*p == ':')
 			p++;	/* Sun escape for entries starting with / */
 
@@ -1220,6 +1223,23 @@ int parse_mount(struct autofs_point *ap,
 			return 1;
 		}
 
+		if (!*loc) {
+			error(ap->logopt, MODPREFIX "invalid location");
+			free(loc);
+			free(options);
+			return 1;
+		}
+
+		if (!validate_location(loc)) {
+			error(ap->logopt, MODPREFIX "invalid location");
+			free(loc);
+			free(options);
+			return 1;
+		}
+
+		debug(ap->logopt,
+		      MODPREFIX "dequote(\"%.*s\") -> %s", l, p, loc);
+
 		p += l;
 		p = skipspace(p);
 
@@ -1230,14 +1250,27 @@ int parse_mount(struct autofs_point *ap,
 			ent = dequote(p, l, ap->logopt);
 			if (!ent) {
 				error(ap->logopt, MODPREFIX "out of memory");
+				free(loc);
 				free(options);
 				return 1;
 			}
 
+			if (!validate_location(ent)) {
+				error(ap->logopt, MODPREFIX "invalid location");
+				free(ent);
+				free(loc);
+				free(options);
+				return 1;
+			}
+
+			debug(ap->logopt,
+			      MODPREFIX "dequote(\"%.*s\") -> %s", l, p, ent);
+
 			loc = realloc(loc, strlen(loc) + l + 2);
 			if (!loc) {
 				error(ap->logopt, MODPREFIX "out of memory");
 				free(ent);
+				free(loc);
 				free(options);
 				return 1;
 			}
@@ -1269,7 +1302,7 @@ int parse_mount(struct autofs_point *ap,
 		/* non-strict failure to normal failure for ordinary mount */
 		if (rv < 0)
 			rv = -rv;
-			
+
 		free(loc);
 		free(options);
 

autofs-5.0.1-rc1-cthon-parser-2.patch:
 CHANGELOG             |    1 +
 modules/lookup_file.c |    1 +
 modules/parse_sun.c   |   29 ++++++++++++-----------------
 3 files changed, 14 insertions(+), 17 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-parser-2.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 5d8e58b..9f4e4b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - cthon map parser corrections.
 - cthon multi-map locking fix and current race corrections.
 - cthon shutdown expire fix.
+- cthon more map parser corrections.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index a515d70..6306084 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -242,6 +242,7 @@ static int read_one(FILE *f, char *key, 
 				if (nch != EOF && isblank(nch)) {
 					state = st_badent;
 					ungetc(nch, f);
+					gotten = got_nothing;
 					error(LOGOPT_ANY, MODPREFIX 
 					      "bad map entry \"%s...\" for key "
 					      "\"%s\"", mapent, key);
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index ca80bad..7656bb4 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -677,7 +677,7 @@ add_offset_entry(struct autofs_point *ap
 		      "added multi-mount offset %s -> %s", path, m_mapent);
 	else
 		debug(ap->logopt, MODPREFIX
-		      "syntax error in offset %s -> %s", path, loc);
+		      "syntax error or dupliate offset %s -> %s", path, loc);
 
 	return ret;
 }
@@ -782,7 +782,7 @@ static int parse_mapent(const char *ent,
 {
 	char buf[MAX_ERR_BUF];
 	const char *p;
-	char *myoptions, *loc;
+	char *tmp, *myoptions, *loc;
 	int l;
 
 	p = ent;
@@ -1066,29 +1066,22 @@ int parse_mount(struct autofs_point *ap,
 
 		/* It's a multi-mount; deal with it */
 		do {
-			char *path, *myoptions, *loc;
+			char *tmp, *path, *myoptions, *loc;
 			int status;
 
-			if (myoptions == NULL) {
-				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-				error(ap->logopt, MODPREFIX "multi strdup: %s", estr);
-				parse_sun_cleanup(mc, name, options, NULL, NULL);
-				return 1;
-			}
-
 			if (*p != '/') {
 				l = 0;
-				path = dequote("/", 1, ap->logopt);
+				tmp = dequote("/", 1, ap->logopt);
 				debug(ap->logopt,
-				      MODPREFIX "dequote(\"/\") -> %s", path);
+				      MODPREFIX "dequote(\"/\") -> %s", tmp);
 			} else {
 				l = chunklen(p, 0);
-				path = dequote(p, l, ap->logopt);
+				tmp = dequote(p, l, ap->logopt);
 				debug(ap->logopt, MODPREFIX
-				      "dequote(\"%.*s\") -> %s", l, p, path);
+				      "dequote(\"%.*s\") -> %s", l, p, tmp);
 			}
 
-			if (!path) {
+			if (!tmp) {
 				error(ap->logopt, MODPREFIX "out of memory");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
@@ -1099,17 +1092,19 @@ int parse_mount(struct autofs_point *ap,
 				return 1;
 			}
 
-			if (!*path) {
+			path = sanitize_path(tmp, strlen(tmp));
+			if (!path) {
 				error(ap->logopt, MODPREFIX "invalid path");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
 				cache_multi_unlock(mc);
 				cache_unlock(mc);
-				free(path);
+				free(tmp);
 				free(options);
 				return 1;
 			}
+			free(tmp);
 
 			p += l;
 			p = skipspace(p);

autofs-5.0.1-rc1-cthon-shutdown-expire.patch:
 CHANGELOG          |    1 
 daemon/automount.c |   62 ++++++++++++++++++++++++++++++++++++++++++++---------
 daemon/state.c     |    6 +++--
 lib/master.c       |   15 +++++++-----
 4 files changed, 66 insertions(+), 18 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-shutdown-expire.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 8cfb220..5d8e58b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix race for current map source.
 - cthon map parser corrections.
 - cthon multi-map locking fix and current race corrections.
+- cthon shutdown expire fix.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 9faf485..1d0e64f 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -546,7 +546,8 @@ static void update_map_cache(struct auto
    it also tries to umount path itself */
 int umount_multi(struct autofs_point *ap, struct mnt_list *mnts, const char *path, int incl)
 {
-	int left;
+	int left, n;
+	struct dirent **de;
 	struct mnt_list *mptr;
 	struct list_head *p;
 	struct list_head list;
@@ -558,7 +559,7 @@ int umount_multi(struct autofs_point *ap
 	if (!tree_get_mnt_list(mnts, &list, path, incl)) {
 		debug(ap->logopt, "no mounts found under %s", path);
 		check_rm_dirs(ap, path, incl);
-		return 0;
+		return 1;
 	}
 
 	left = 0;
@@ -583,11 +584,50 @@ int umount_multi(struct autofs_point *ap
 	}
 
 	/* Lastly check for offsets with no root mount */
-	if (!tree_is_mounted(mnts, path)) {
+	n = scandir(path, &de, 0, alphasort);
+	if (n) {
+		char buf[PATH_MAX + 1];
+
+		while (n--) {
+			size_t size;
+			int ret;
+
+			if (strcmp(de[n]->d_name, ".") == 0 ||
+			    strcmp(de[n]->d_name, "..") == 0) {
+				free(de[n]);
+				continue;
+			}
+
+			sched_yield();
+
+			size = sizeof(buf);
+			ret = cat_path(buf, size, path, de[n]->d_name);
+			if (!ret) {
+				do {
+					free(de[n]);
+				} while (n--);
+				left++;
+				break;
+			}
+
+			if (!tree_is_mounted(mnts, buf)) {
+				if (umount_offsets(ap, mnts, buf)) {
+					error(ap->logopt,
+					  "could not umount some offsets under %s",
+					  buf);
+					left++;
+				}
+			}
+			free(de[n]);
+		}
+		free(de);
+	}
+
+	if (!left && !tree_is_mounted(mnts, path)) {
 		if (umount_offsets(ap, mnts, path)) {
 			error(ap->logopt,
 			      "could not umount some offsets under %s", path);
-			return 0;
+			left++;
 		}
 	}
 
@@ -1216,9 +1256,7 @@ static void handle_mounts_cleanup(void *
 	master_free_mapent_sources(ap->entry, 1);
 	master_free_mapent(ap->entry);
 
-	/* If we are the last tell the state machine to shutdown */
-	if (master_list_empty(master_list))
-		kill(getpid(), SIGTERM);
+	sched_yield();
 
 	sched_yield();
 
@@ -1232,6 +1270,10 @@ static void handle_mounts_cleanup(void *
 
 	msg("shut down path %s", path);
 
+	/* If we are the last tell the state machine to shutdown */
+	if (master_list_empty(master_list))
+		kill(getpid(), SIGTERM);
+
 	return;
 }
 
@@ -1285,7 +1327,7 @@ void *handle_mounts(void *arg)
 
 	while (ap->state != ST_SHUTDOWN) {
 		if (handle_packet(ap)) {
-			int ret;
+			int ret, result;
 
 			status = pthread_mutex_lock(&ap->state_mutex);
 			if (status)
@@ -1307,7 +1349,7 @@ void *handle_mounts(void *arg)
 			 * If the ioctl fails assume the kernel doesn't have
 			 * AUTOFS_IOC_ASKUMOUNT and just continue.
 			 */
-			ret = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);
+			ret = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &result);
 			if (ret == -1) {
 				status = pthread_mutex_unlock(&ap->state_mutex);
 				if (status)
@@ -1316,7 +1358,7 @@ void *handle_mounts(void *arg)
 			}
 
 			/* OK to exit */
-			if (status) {
+			if (result) {
 				status = pthread_mutex_unlock(&ap->state_mutex);
 				if (status)
 					fatal(status);
diff --git a/daemon/state.c b/daemon/state.c
index a5305b6..212b2c2 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -126,7 +126,9 @@ void expire_cleanup(void *arg)
 
 		case ST_SHUTDOWN_PENDING:
 			next = ST_SHUTDOWN;
-#ifndef ENABLE_IGNORE_BUSY_MOUNTS
+#ifdef ENABLE_IGNORE_BUSY_MOUNTS
+			break;
+#else
 			if (success == 0)
 				break;
 
@@ -134,8 +136,8 @@ #ifndef ENABLE_IGNORE_BUSY_MOUNTS
 			warn(ap->logopt, "filesystem %s still busy", ap->path);
 			alarm_add(ap, ap->exp_runfreq);
 			next = ST_READY;
-#endif
 			break;
+#endif
 
 		case ST_SHUTDOWN_FORCE:
 			next = ST_SHUTDOWN;
diff --git a/lib/master.c b/lib/master.c
index ea213ad..f54fffe 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -851,7 +851,8 @@ void master_notify_state_change(struct m
 
 		switch (sig) {
 		case SIGTERM:
-			if (ap->state != ST_SHUTDOWN) {
+			if (ap->state != ST_SHUTDOWN &&
+			    ap->state != ST_SHUTDOWN_PENDING) {
 				next = ST_SHUTDOWN_PENDING;
 				notify_submounts(ap, next);
 				nextstate(state_pipe, next);
@@ -859,7 +860,8 @@ void master_notify_state_change(struct m
 			break;
 #ifdef ENABLE_FORCED_SHUTDOWN
 		case SIGUSR2:
-			if (ap->state != ST_SHUTDOWN) {
+			if (ap->state != ST_SHUTDOWN &&
+			    ap->state != ST_SHUTDOWN_FORCE) {
 				next = ST_SHUTDOWN_FORCE;
 				notify_submounts(ap, next);
 				nextstate(state_pipe, next);
@@ -874,13 +876,14 @@ #endif
 			break;
 		}
 
-		debug(ap->logopt,
-		      "sig %d switching %s from %d to %d",
-		      sig, ap->path, ap->state, next);
-
 		status = pthread_mutex_unlock(&ap->state_mutex);
 		if (status)
 			fatal(status);
+
+		if (next != ST_INVAL)
+			debug(ap->logopt,
+			      "sig %d switching %s from %d to %d",
+			      sig, ap->path, ap->state, next);
 	}
 
 	status = pthread_mutex_unlock(&master_mutex);

autofs-5.0.1-rc1-current-race.patch:
 CHANGELOG                |    1 
 daemon/direct.c          |    3 -
 daemon/lookup.c          |   51 +++++++++++++++++++++----------
 daemon/state.c           |    4 --
 include/master.h         |    4 ++
 lib/master.c             |   59 ++++++++++++++++++++++++++++++++++++
 modules/lookup_file.c    |   77 ++++++++++++++++++++++++++++++++++++++++-------
 modules/lookup_ldap.c    |   52 ++++++++++++++++++++++++-------
 modules/lookup_nisplus.c |   62 +++++++++++++++++++++++++++++++------
 modules/lookup_yp.c      |   71 ++++++++++++++++++++++++++++++++++---------
 modules/parse_hesiod.c   |    3 +
 modules/parse_sun.c      |   23 +++++++++++---
 12 files changed, 337 insertions(+), 73 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-current-race.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c47648d..48d811a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 ?/7/2006 autofs-5.0.1
 ---------------------
 - code cleanup.
+- fix race for current map source.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/direct.c b/daemon/direct.c
index bb75755..93af751 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -531,7 +531,6 @@ force_umount:
 
 int mount_autofs_offset(struct autofs_point *ap, struct mapent *me, int is_autofs_fs)
 {
-	struct map_source *map = ap->entry->current;
 	struct mnt_params *mp;
 	time_t timeout = ap->exp_timeout;
 	struct stat st;
@@ -636,7 +635,7 @@ int mount_autofs_offset(struct autofs_po
 		goto out_close;
 	}
 
-	cache_set_ino_index(map->mc, me->key, st.st_dev, st.st_ino);
+	cache_set_ino_index(me->source->mc, me->key, st.st_dev, st.st_ino);
 
 	close(me->ioctlfd);
 	me->ioctlfd = -1;
diff --git a/daemon/lookup.c b/daemon/lookup.c
index 0681407..cad98d2 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -411,11 +411,11 @@ int lookup_nss_read_map(struct autofs_po
 
 		sched_yield();
 
-		entry->current = map;
-
 		if (map->type) {
 			debug(ap->logopt,
 			      "reading map %s %s", map->type, map->argv[0]);
+			master_source_current_wait(entry);
+			entry->current = map;
 			result = do_read_map(ap, map, age);
 			map = map->next;
 			continue;
@@ -432,10 +432,14 @@ int lookup_nss_read_map(struct autofs_po
 				map->type = tmp;
 				debug(ap->logopt,
 				      "reading map %s %s", tmp, map->argv[0]);
+				master_source_current_wait(entry);
+				entry->current = map;
 				result = do_read_map(ap, map, age);
 			} else {
 				debug(ap->logopt,
 				      "reading map file %s", map->argv[0]);
+				master_source_current_wait(entry);
+				entry->current = map;
 				result = read_file_source_instance(ap, map, age);
 			}
 			map = map->next;
@@ -448,7 +452,7 @@ int lookup_nss_read_map(struct autofs_po
 		if (result) {
 			error(ap->logopt,
 			      "can't to read name service switch config.");
-			goto done;
+			break;
 		}
 
 		head = &nsslist;
@@ -460,25 +464,28 @@ int lookup_nss_read_map(struct autofs_po
 			debug(ap->logopt,
 			      "reading map %s %s", this->source, map->argv[0]);
 
+			master_source_current_wait(entry);
+			entry->current = map;
 			result = read_map_source(this, ap, map, age);
 			if (result == NSS_STATUS_UNKNOWN)
 				continue;
 
 			status = check_nss_result(this, result);
 			if (status >= 0) {
-				free_sources(&nsslist);
 				result = !status;
-				goto done;
+				map = NULL;
+				break;
 			}
 		}
 
 		if (!list_empty(&nsslist))
 			free_sources(&nsslist);
 
+		if (!map)
+			break;
+
 		map = map->next;
 	}
-done:
-	entry->current = NULL;
 	pthread_cleanup_pop(1);
 
 	return !result;
@@ -737,11 +744,14 @@ int lookup_nss_mount(struct autofs_point
 		}
 
 		sched_yield();
-		entry->current = map;
+
 		if (map->type) {
+			master_source_current_wait(entry);
+			entry->current = map;
 			result = do_lookup_mount(ap, map, name, name_len);
+
 			if (result == NSS_STATUS_SUCCESS)
-				goto done;
+				break;
 
 			map = map->next;
 			continue;
@@ -756,12 +766,17 @@ int lookup_nss_mount(struct autofs_point
 					continue;
 				}
 				map->type = tmp;
+				master_source_current_wait(entry);
+				entry->current = map;
 				result = do_lookup_mount(ap, map, name, name_len);
-			} else
+			} else {
+				master_source_current_wait(entry);
+				entry->current = map;
 				result = lookup_name_file_source_instance(ap, map, name, name_len);
+			}
 
 			if (result == NSS_STATUS_SUCCESS)
-				goto done;
+				break;
 
 			map = map->next;
 			continue;
@@ -774,7 +789,7 @@ int lookup_nss_mount(struct autofs_point
 			error(ap->logopt,
 			      "can't to read name service switch config.");
 			result = 1;
-			goto done;
+			break;
 		}
 
 		head = &nsslist;
@@ -783,7 +798,10 @@ int lookup_nss_mount(struct autofs_point
 
 			this = list_entry(p, struct nss_source, list);
 
+			master_source_current_wait(entry);
+			entry->current = map;
 			result = lookup_map_name(this, ap, map, name, name_len);
+
 			if (result == NSS_STATUS_UNKNOWN) {
 				map = map->next;
 				continue;
@@ -791,18 +809,19 @@ int lookup_nss_mount(struct autofs_point
 
 			status = check_nss_result(this, result);
 			if (status >= 0) {
-				free_sources(&nsslist);
-				goto done;
+				map = NULL;
+				break;
 			}
 		}
 
 		if (!list_empty(&nsslist))
 			free_sources(&nsslist);
 
+		if (!map)
+			break;
+
 		map = map->next;
 	}
-done:
-	entry->current = NULL;
 	pthread_cleanup_pop(1);
 
 	return !result;
diff --git a/daemon/state.c b/daemon/state.c
index 4fda6df..a5305b6 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -372,7 +372,6 @@ static void *do_readmap(void *arg)
 				map = map->next;
 				continue;
 			}
-			ap->entry->current = map;
 			mc = map->mc;
 			pthread_cleanup_push(cache_lock_cleanup, mc);
 			cache_readlock(mc);
@@ -392,9 +391,8 @@ static void *do_readmap(void *arg)
 			pthread_cleanup_pop(1);
 			map = map->next;
 		}
-		pthread_cleanup_pop(1);
 		tree_free_mnt_tree(mnts);
-		ap->entry->current = NULL;
+		pthread_cleanup_pop(1);
 		lookup_prune_cache(ap, now);
 	}
 
diff --git a/include/master.h b/include/master.h
index 8e1b375..dcd77eb 100644
--- a/include/master.h
+++ b/include/master.h
@@ -40,6 +40,8 @@ struct master_mapent {
 	pthread_t thid;
 	time_t age;
 	pthread_rwlock_t source_lock;
+	pthread_mutex_t current_mutex;
+	pthread_cond_t current_cond;
 	struct map_source *first;
 	struct map_source *current;
 	struct map_source *maps;
@@ -81,6 +83,8 @@ void master_source_writelock(struct mast
 void master_source_readlock(struct master_mapent *);
 void master_source_unlock(struct master_mapent *);
 void master_source_lock_cleanup(void *);
+void master_source_current_wait(struct master_mapent *);
+void master_source_current_signal(struct master_mapent *);
 struct master_mapent *master_find_mapent(struct master *, const char *);
 struct master_mapent *master_new_mapent(const char *, time_t);
 void master_add_mapent(struct master *, struct master_mapent *);
diff --git a/lib/master.c b/lib/master.c
index f035af2..3cf0428 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -515,6 +515,49 @@ void master_source_lock_cleanup(void *ar
 	return;
 }
 
+void master_source_current_wait(struct master_mapent *entry)
+{
+	int status;
+
+	status = pthread_mutex_lock(&entry->current_mutex);
+	if (status) {
+		error(LOGOPT_ANY, "entry current source lock failed");
+		fatal(status);
+	}
+
+	while (entry->current != NULL) {
+		status = pthread_cond_wait(
+				&entry->current_cond, &entry->current_mutex);
+		if (status) {
+			error(LOGOPT_ANY,
+			      "entry current source condition wait failed");
+			fatal(status);
+		}
+	}
+
+	return;
+}
+
+void master_source_current_signal(struct master_mapent *entry)
+{
+	int status;
+
+	status = pthread_cond_signal(&entry->current_cond);
+	if (status) {
+		error(LOGOPT_ANY,
+		      "entry current source condition signal failed");
+		fatal(status);
+	}
+
+	status = pthread_mutex_unlock(&entry->current_mutex);
+	if (status) {
+		error(LOGOPT_ANY, "entry current source unlock failed");
+		fatal(status);
+	}
+
+	return;
+}
+
 struct master_mapent *master_find_mapent(struct master *master, const char *path)
 {
 	struct list_head *head, *p;
@@ -575,6 +618,14 @@ struct master_mapent *master_new_mapent(
 	if (status)
 		fatal(status);
 
+	status = pthread_mutex_init(&entry->current_mutex, NULL);
+	if (status)
+		fatal(status);
+
+	status = pthread_cond_init(&entry->current_cond, NULL);
+	if (status)
+		fatal(status);
+
 	INIT_LIST_HEAD(&entry->list);
 
 	return entry;
@@ -648,6 +699,14 @@ void master_free_mapent(struct master_ma
 	if (status)
 		fatal(status);
 
+	status = pthread_mutex_destroy(&entry->current_mutex);
+	if (status)
+		fatal(status);
+
+	status = pthread_cond_destroy(&entry->current_cond);
+	if (status)
+		fatal(status);
+
 	free(entry);
 
 	return;
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index dff7638..913af6a 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -459,7 +459,7 @@ static struct autofs_point *
 prepare_plus_include(struct autofs_point *ap, time_t age, char *key, unsigned int inc)
 {
 	struct master_mapent *entry;
-	struct map_source *current = ap->entry->current;
+	struct map_source *current;
 	struct map_source *source;
 	struct autofs_point *iap;
 	char *type, *map, *fmt;
@@ -470,6 +470,10 @@ prepare_plus_include(struct autofs_point
 	unsigned int ghost = ap->ghost;
 	char *buf, *tmp;
 
+	current = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	entry = master_new_mapent(ap->path, ap->entry->age);
 	if (!entry) {
 		error(ap->logopt, MODPREFIX "malloc failed for entry");
@@ -549,14 +553,20 @@ prepare_plus_include(struct autofs_point
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *key;
 	char *mapent;
 	struct stat st;
 	FILE *f;
 	int entry;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	if (source->recurse)
 		return NSS_STATUS_UNAVAIL;
 
@@ -611,6 +621,9 @@ int lookup_read_map(struct autofs_point 
 
 			inc = check_self_include(key, ctxt);
 
+			master_source_current_wait(ap->entry);
+			ap->entry->current = source;
+
 			iap = prepare_plus_include(ap, age, key, inc);
 			if (!iap) {
 				debug(ap->logopt,
@@ -664,14 +677,20 @@ static int lookup_one(struct autofs_poin
 		      const char *key, int key_len,
 		      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char mkey[KEY_MAX_LEN + 1];
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
 	int entry, ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	f = fopen(ctxt->mapname, "r");
 	if (!f) {
 		error(ap->logopt,
@@ -696,6 +715,9 @@ static int lookup_one(struct autofs_poin
 
 				inc = check_self_include(mkey, ctxt);
 
+				master_source_current_wait(ap->entry);
+				ap->entry->current = source;
+
 				iap = prepare_plus_include(ap, age, mkey, inc);
 				if (!iap) {
 					debug(ap->logopt,
@@ -733,14 +755,20 @@ static int lookup_one(struct autofs_poin
 
 static int lookup_wild(struct autofs_point *ap, struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char mkey[KEY_MAX_LEN + 1];
 	char mapent[MAPENT_MAX_LEN + 1];
 	time_t age = time(NULL);
 	FILE *f;
 	int entry, ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	f = fopen(ctxt->mapname, "r");
 	if (!f) {
 		error(ap->logopt,
@@ -762,6 +790,9 @@ static int lookup_wild(struct autofs_poi
 
 				inc = check_self_include(mkey, ctxt);
 
+				master_source_current_wait(ap->entry);
+				ap->entry->current = source;
+
 				iap = prepare_plus_include(ap, age, mkey, inc);
 				if (!iap) {
 					debug(ap->logopt,
@@ -801,18 +832,27 @@ static int check_map_indirect(struct aut
 			      char *key, int key_len,
 			      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *exists;
 	int need_map = 0;
 	int ret = CHE_OK;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
 	if (exists && exists->source != source)
 		exists = NULL;
 	cache_unlock(mc);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	ret = lookup_one(ap, key, key_len, ctxt);
 	if (ret == CHE_COMPLETED)
 		return NSS_STATUS_COMPLETED;
@@ -827,6 +867,9 @@ static int check_map_indirect(struct aut
 	if (ret == CHE_MISSING) {
 		int wild = CHE_MISSING;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		wild = lookup_wild(ap, ctxt);
 		if (wild == CHE_COMPLETED || CHE_UPDATED || CHE_OK)
 			return NSS_STATUS_SUCCESS;
@@ -871,8 +914,8 @@ static int check_map_indirect(struct aut
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me;
 	char key[KEY_MAX_LEN + 1];
 	int key_len;
@@ -881,6 +924,12 @@ int lookup_mount(struct autofs_point *ap
 	int status = 0;
 	int ret = 1;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	if (source->recurse)
 		return NSS_STATUS_UNAVAIL;
 
@@ -925,6 +974,9 @@ int lookup_mount(struct autofs_point *ap
 		if (!lkp_key)
 			return NSS_STATUS_UNKNOWN;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt);
 		free(lkp_key);
 		if (status) {
@@ -949,6 +1001,9 @@ int lookup_mount(struct autofs_point *ap
 	cache_unlock(mc);
 
 	if (mapent) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					mapent, ctxt->parse->context);
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index 36e8457..9a7794d 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1071,8 +1071,8 @@ static int read_one_map(struct autofs_po
 			struct lookup_context *ctxt,
 			time_t age, int *result_ldap)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	int rv, i, l, count;
 	char buf[MAX_ERR_BUF];
 	char *query;
@@ -1084,10 +1084,11 @@ static int read_one_map(struct autofs_po
 	int scope = LDAP_SCOPE_SUBTREE;
 	LDAP *ldap;
 
-	if (ctxt == NULL) {
-		crit(ap->logopt, MODPREFIX "context was NULL");
-		return NSS_STATUS_UNAVAIL;
-	}
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
 
 	class = ctxt->entry_obj_class;
 	entry = ctxt->entry_attr;
@@ -1278,8 +1279,8 @@ int lookup_read_map(struct autofs_point 
 static int lookup_one(struct autofs_point *ap,
 		char *qKey, int qKey_len, struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	int rv, i, l, ql, count;
 	char buf[MAX_ERR_BUF];
 	time_t age = time(NULL);
@@ -1295,6 +1296,12 @@ static int lookup_one(struct autofs_poin
 	unsigned int wild = 0;
 	int ret = CHE_MISSING;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	if (ctxt == NULL) {
 		crit(ap->logopt, MODPREFIX "context was NULL");
 		return CHE_FAIL;
@@ -1465,19 +1472,28 @@ static int check_map_indirect(struct aut
 			      char *key, int key_len,
 			      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me, *exists;
 	time_t now = time(NULL);
 	time_t t_last_read;
 	int ret, need_map = 0;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
 	if (exists && exists->source != source)
 		exists = NULL;
 	cache_unlock(mc);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	ret = lookup_one(ap, key, key_len, ctxt);
 	if (ret == CHE_FAIL)
 		return NSS_STATUS_NOTFOUND;
@@ -1531,8 +1547,8 @@ static int check_map_indirect(struct aut
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me;
 	char key[KEY_MAX_LEN + 1];
 	int key_len;
@@ -1541,6 +1557,12 @@ int lookup_mount(struct autofs_point *ap
 	int status = 0;
 	int ret = 1;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	debug(ap->logopt, MODPREFIX "looking up %s", name);
 
 	key_len = snprintf(key, KEY_MAX_LEN, "%s", name);
@@ -1575,6 +1597,9 @@ int lookup_mount(struct autofs_point *ap
 		if (!lkp_key)
 			return NSS_STATUS_UNKNOWN;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt);
 		free(lkp_key);
 		if (status) {
@@ -1596,6 +1621,9 @@ int lookup_mount(struct autofs_point *ap
 	cache_unlock(mc);
 
 	if (mapent) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					 mapent, ctxt->parse->context);
diff --git a/modules/lookup_nisplus.c b/modules/lookup_nisplus.c
index 2f45ad8..cb5d620 100644
--- a/modules/lookup_nisplus.c
+++ b/modules/lookup_nisplus.c
@@ -156,8 +156,8 @@ int lookup_read_master(struct master *ma
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *tablename;
 	nis_result *result;
 	nis_object *this;
@@ -165,6 +165,12 @@ int lookup_read_map(struct autofs_point 
 	char *key, *mapent;
 	char buf[MAX_ERR_BUF];
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	tablename = alloca(strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -226,8 +232,8 @@ static int lookup_one(struct autofs_poin
 		      const char *key, int key_len,
 		      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *tablename;
 	nis_result *result;
 	nis_object *this;
@@ -236,6 +242,12 @@ static int lookup_one(struct autofs_poin
 	int ret;
 	char buf[MAX_ERR_BUF];
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	tablename = alloca(strlen(key) +
 			strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
@@ -270,8 +282,8 @@ static int lookup_one(struct autofs_poin
 
 static int lookup_wild(struct autofs_point *ap, struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *tablename;
 	nis_result *result;
 	nis_object *this;
@@ -280,6 +292,12 @@ static int lookup_wild(struct autofs_poi
 	int ret;
 	char buf[MAX_ERR_BUF];
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	tablename = alloca(strlen(ctxt->mapname) + strlen(ctxt->domainname) + 20);
 	if (!tablename) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -314,20 +332,29 @@ static int check_map_indirect(struct aut
 			      char *key, int key_len,
 			      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me, *exists;
 	time_t now = time(NULL);
 	time_t t_last_read;
 	int need_map = 0;
 	int ret = 0;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
 	if (exists && exists->source != source)
 		exists = NULL;
 	cache_unlock(mc);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	/* check map and if change is detected re-read map */
 	ret = lookup_one(ap, key, key_len, ctxt);
 	if (ret == CHE_FAIL)
@@ -353,6 +380,9 @@ static int check_map_indirect(struct aut
 	if (ret == CHE_MISSING) {
 		int wild = CHE_MISSING;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		wild = lookup_wild(ap, ctxt);
 		if (wild == CHE_UPDATED || CHE_OK)
 			return NSS_STATUS_SUCCESS;
@@ -393,8 +423,8 @@ static int check_map_indirect(struct aut
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char key[KEY_MAX_LEN + 1];
 	int key_len;
 	char *mapent = NULL;
@@ -403,6 +433,12 @@ int lookup_mount(struct autofs_point *ap
 	int status;
 	int ret = 1;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	debug(ap->logopt, MODPREFIX "looking up %s", name);
 
 	key_len = snprintf(key, KEY_MAX_LEN, "%s", name);
@@ -436,6 +472,9 @@ int lookup_mount(struct autofs_point *ap
 		if (!lkp_key)
 			return NSS_STATUS_UNKNOWN;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt);
 		if (status) {
 			debug(ap->logopt,
@@ -456,6 +495,9 @@ int lookup_mount(struct autofs_point *ap
 	cache_unlock(mc);
 
 	if (mapent) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					       mapent, ctxt->parse->context);
diff --git a/modules/lookup_yp.c b/modules/lookup_yp.c
index ad37697..4114aaa 100644
--- a/modules/lookup_yp.c
+++ b/modules/lookup_yp.c
@@ -50,6 +50,7 @@ struct callback_master_data {
 
 struct callback_data {
 	struct autofs_point *ap;
+	struct map_source *source;
 	time_t age;
 };
 
@@ -244,7 +245,7 @@ int yp_all_callback(int status, char *yp
 {
 	struct callback_data *cbdata = (struct callback_data *) ypcb_data;
 	struct autofs_point *ap = cbdata->ap;
-	struct map_source *source = ap->entry->current;
+	struct map_source *source = cbdata->source;
 	struct mapent_cache *mc = source->mc;
 	time_t age = cbdata->age;
 	char *key;
@@ -292,18 +293,22 @@ int lookup_read_map(struct autofs_point 
 	char *mapname;
 	int err;
 
-	mapname = alloca(strlen(ctxt->mapname) + 1);
-	if (!mapname)
-		return 0;
-
-	strcpy(mapname, ctxt->mapname);
-
 	ypcb_data.ap = ap;
+	ypcb_data.source = ap->entry->current;
 	ypcb_data.age = age;
 
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	ypcb.foreach = yp_all_callback;
 	ypcb.data = (char *) &ypcb_data;
 
+	mapname = alloca(strlen(ctxt->mapname) + 1);
+	if (!mapname)
+		return 0;
+
+	strcpy(mapname, ctxt->mapname);
+
 	err = yp_all((char *) ctxt->domainname, mapname, &ypcb);
 
 	if (err != YPERR_SUCCESS) {
@@ -333,14 +338,20 @@ static int lookup_one(struct autofs_poin
 		      const char *key, int key_len,
 		      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *mapname;
 	char *mapent;
 	int mapent_len;
 	time_t age = time(NULL);
 	int ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	mapname = alloca(strlen(ctxt->mapname) + 1);
 	if (!mapname)
 		return 0;
@@ -385,14 +396,20 @@ static int lookup_one(struct autofs_poin
 
 static int lookup_wild(struct autofs_point *ap, struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char *mapname;
 	char *mapent;
 	int mapent_len;
 	time_t age = time(NULL);
 	int ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	mapname = alloca(strlen(ctxt->mapname) + 1);
 	if (!mapname)
 		return 0;
@@ -433,19 +450,28 @@ static int check_map_indirect(struct aut
 			      char *key, int key_len,
 			      struct lookup_context *ctxt)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *exists;
 	unsigned int map_order;
 	int need_map = 0;
 	int ret = 0;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	cache_readlock(mc);
 	exists = cache_lookup_distinct(mc, key);
 	if (exists && exists->source != source)
 		exists = NULL;
 	cache_unlock(mc);
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = source;
+
 	/* check map and if change is detected re-read map */
 	ret = lookup_one(ap, key, key_len, ctxt);
 	if (ret == CHE_FAIL)
@@ -468,6 +494,9 @@ static int check_map_indirect(struct aut
 	if (ret == CHE_MISSING) {
 		int wild = CHE_MISSING;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		wild = lookup_wild(ap, ctxt);
 		if (wild == CHE_UPDATED || CHE_OK)
 			return NSS_STATUS_SUCCESS;
@@ -508,8 +537,8 @@ static int check_map_indirect(struct aut
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char key[KEY_MAX_LEN + 1];
 	int key_len;
 	char *mapent = NULL;
@@ -518,6 +547,12 @@ int lookup_mount(struct autofs_point *ap
 	int status = 0;
 	int ret = 1;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	debug(ap->logopt, MODPREFIX "looking up %s", name);
 
 	key_len = snprintf(key, KEY_MAX_LEN, "%s", name);
@@ -551,6 +586,9 @@ int lookup_mount(struct autofs_point *ap
 		if (!lkp_key)
 			return NSS_STATUS_UNKNOWN;
 
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		status = check_map_indirect(ap, lkp_key, strlen(lkp_key), ctxt);
 		free(lkp_key);
 		if (status) {
@@ -572,6 +610,9 @@ int lookup_mount(struct autofs_point *ap
 	cache_unlock(mc);
 
 	if (mapent) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
+
 		debug(ap->logopt, MODPREFIX "%s -> %s", key, mapent);
 		ret = ctxt->parse->parse_mount(ap, key, key_len,
 					       mapent, ctxt->parse->context);
diff --git a/modules/parse_hesiod.c b/modules/parse_hesiod.c
index 8483a99..7f125eb 100644
--- a/modules/parse_hesiod.c
+++ b/modules/parse_hesiod.c
@@ -229,6 +229,9 @@ int parse_mount(struct autofs_point *ap,
 	char *q;
 	const char *p;
 
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	p = mapent;
 	q = fstype;
 
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 7e0f211..d415660 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -753,13 +753,19 @@ add_offset_entry(struct autofs_point *ap
 		 const char *path, const char *myoptions, const char *loc,
 		 time_t age)
 {
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	char m_key[PATH_MAX + 1];
 	char m_mapent[MAPENT_MAX_LEN + 1];
 	int m_key_len, m_mapent_len;
 	int ret;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	m_key_len = m_root_len + strlen(path) + 1;
 	if (m_key_len > PATH_MAX) {
 		error(ap->logopt,
@@ -890,8 +896,8 @@ int parse_mount(struct autofs_point *ap,
 {
 	struct parse_context *ctxt = (struct parse_context *) context;
 	char buf[MAX_ERR_BUF];
-	struct map_source *source = ap->entry->current;
-	struct mapent_cache *mc = source->mc;
+	struct map_source *source;
+	struct mapent_cache *mc;
 	struct mapent *me;
 	char *pmapent, *options;
 	const char *p;
@@ -899,6 +905,12 @@ int parse_mount(struct autofs_point *ap,
 	int optlen;
 	int slashify = ctxt->slashify_colons;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
+	mc = source->mc;
+
 	if (!mapent) {
 		error(ap->logopt, MODPREFIX "error: empty map entry");
 		return 1;
@@ -1123,6 +1135,9 @@ int parse_mount(struct autofs_point *ap,
 				p = skipspace(p);
 			}
 
+			master_source_current_wait(ap->entry);
+			ap->entry->current = source;
+
 			status = add_offset_entry(ap, name,
 						m_root, m_root_len,
 						path, myoptions, loc, age);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- autofs.spec	13 Jul 2006 08:49:54 -0000	1.125
+++ autofs.spec	19 Jul 2006 09:49:06 -0000	1.126
@@ -4,13 +4,20 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.1
+%define release 0.rc1.2
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc1.tar.bz2
+Patch1: autofs-5.0.1-rc1-cleanup.patch
+Patch2: autofs-5.0.1-rc1-current-race.patch
+Patch3: autofs-5.0.1-rc1-cthon-parser-1.patch
+Patch4: autofs-5.0.1-rc1-cthon-multi-locking.patch
+Patch5: autofs-5.0.1-rc1-cthon-shutdown-expire.patch
+Patch6: autofs-5.0.1-rc1-cthon-parser-2.patch
+Patch7: autofs-5.0.1-rc1-cthon-cleanup.path
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -49,6 +56,13 @@
 %prep
 %setup -q
 echo %{version}-%{release} > .version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -105,6 +119,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.2
+- Code cleanup and fixes for connectathon tests.
+
 * Thu Jul 13 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.1
 - Update version label to avoid package update problems.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 09:51:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 05:51:43 -0400
Subject: rpms/autofs/devel autofs.spec,1.126,1.127
Message-ID: <200607190951.k6J9phpm008393@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8352

Modified Files:
	autofs.spec 
Log Message:
- fix cwpatch name error in spec file.



Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- autofs.spec	19 Jul 2006 09:49:06 -0000	1.126
+++ autofs.spec	19 Jul 2006 09:51:40 -0000	1.127
@@ -17,7 +17,7 @@
 Patch4: autofs-5.0.1-rc1-cthon-multi-locking.patch
 Patch5: autofs-5.0.1-rc1-cthon-shutdown-expire.patch
 Patch6: autofs-5.0.1-rc1-cthon-parser-2.patch
-Patch7: autofs-5.0.1-rc1-cthon-cleanup.path
+Patch7: autofs-5.0.1-rc1-cthon-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig



From fedora-cvs-commits at redhat.com  Wed Jul 19 09:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 05:53:51 -0400
Subject: rpms/libX11/devel libX11.spec,1.25,1.26
Message-ID: <200607190953.k6J9rpfx008444@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8431

Modified Files:
	libX11.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2.fc6
- Added libX11-nls-indic-locales-bug185376.patch to add support for various
  indic locales which have now been committed upstream (#185376)



Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libX11.spec	12 Jul 2006 06:59:21 -0000	1.25
+++ libX11.spec	19 Jul 2006 09:53:48 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.3
-Release: 1.1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,6 +10,10 @@
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
+# FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
+# this patch is now committed upstream.  When libX11-1.0.4 is released,
+# manually confirm each patch hunk before removal.
+Patch1: libX11-nls-indic-locales-bug185376.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -47,6 +51,7 @@
 # of war with these things.  It's easier to leave this here than to try and
 # find it later.
 #%patch0 -p0 -b .datadir-locale-dir-fix
+%patch1 -p0 -b .nls-indic-locales-bug185376
 
 # Disable static library creation by default.
 %define with_static 0
@@ -239,7 +244,11 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-2.fc6
+- Added libX11-nls-indic-locales-bug185376.patch to add support for various
+  indic locales which have now been committed upstream (#185376)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.3-1.1.fc6
 - rebuild
 
 * Mon Jul 10 2006 Mike A. Harris <mharris at redhat.com> 1.0.3-1.fc6



From fedora-cvs-commits at redhat.com  Wed Jul 19 09:54:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 05:54:24 -0400
Subject: rpms/libX11/devel libX11-nls-indic-locales-bug185376.patch, NONE,
	1.1
Message-ID: <200607190954.k6J9sORJ008473@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8459

Added Files:
	libX11-nls-indic-locales-bug185376.patch 
Log Message:
add libX11-nls-indic-locales-bug185376.patch

libX11-nls-indic-locales-bug185376.patch:
 locale.alias.pre |   18 ++++++++++++++++++
 locale.dir.pre   |   12 +++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

--- NEW FILE libX11-nls-indic-locales-bug185376.patch ---
diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
--- nls/locale.alias.pre	2005-09-30 13:22:46.000000000 +0530
+++ nls/locale.alias.pre	2006-07-03 15:13:07.000000000 +0530
@@ -100,6 +100,9 @@ ar_TN:						ar_TN.ISO8859-6
 ar_TN.iso88596:					ar_TN.ISO8859-6
 ar_TN.ISO-8859-6:				ar_TN.ISO8859-6
 ar_TN.utf8:					ar_TN.UTF-8
+as:						as_IN.UTF-8
+as_IN.utf8:					as_IN.UTF-8
+as_IN.UTF-8:					as_IN.UTF-8
 ar_YE:						ar_YE.ISO8859-6
 ar_YE.iso88596:					ar_YE.ISO8859-6
 ar_YE.ISO-8859-6:				ar_YE.ISO8859-6
@@ -689,6 +692,9 @@ kl_GL.iso88591:					kl_GL.ISO8859-1
 kl_GL.ISO-8859-1:				kl_GL.ISO8859-1
 kl_GL.iso885915:				kl_GL.ISO8859-15
 kl_GL.utf8:					kl_GL.UTF-8
+kn:						kn_IN.UTF-8
+kn_IN.utf8:					kn_IN.UTF-8
+kn_IN.UTF-8:					kn_IN.UTF-8
 ko:						ko_KR.eucKR
 ko_KR:						ko_KR.eucKR
 KO_KR:						ko_KR.eucKR
@@ -751,6 +757,9 @@ mk_MK.microsoftcp1251:				mk_MK.CP1251
 mk_MK.microsoft-cp1251:				mk_MK.CP1251
 mk_MK.MICROSOFT-CP1251:				mk_MK.CP1251
 mk_MK.utf8:					mk_MK.UTF-8
+ml:						ml_IN.UTF-8
+ml_IN.utf8:					ml_IN.UTF-8
+ml_IN.UTF-8:					ml_IN.UTF-8
 mr_IN:						mr_IN.UTF-8
 mr_IN.utf8:					mr_IN.UTF-8
 ms:						ms_MY.ISO8859-1
@@ -830,6 +839,9 @@ oc_FR.ISO-8859-1:				oc_FR.ISO8859-1
 oc_FR.iso885915:				oc_FR.ISO8859-15
 oc_FR.ISO-8859-15:				oc_FR.ISO8859-15
 oc_FR at euro:					oc_FR.ISO8859-15
+or:						or_IN.UTF-8
+or_IN.utf8:					or_IN.UTF-8
+or_IN.UTF-8:					or_IN.UTF-8
 pa_IN.utf8:					pa_IN.UTF-8
 pa_IN.UTF-8:					pa_IN.UTF-8
 pd:						pd_US.ISO8859-1
@@ -979,6 +991,9 @@ ta:						ta_IN.TSCII-0
 ta_IN:						ta_IN.TSCII-0
 ta_IN.tscii:					ta_IN.TSCII-0
 ta_IN.tscii0:					ta_IN.TSCII-0
+te:						te_IN.UTF-8
+te_IN.utf8:					te_IN.UTF-8
+te_IN.UTF-8:					te_IN.UTF-8
 tg:						tg_TJ.KOI8-C
 tg_TJ:						tg_TJ.KOI8-C
 tg_TJ.koi8c:					tg_TJ.KOI8-C
@@ -1021,6 +1036,9 @@ uk_UA.microsoftcp1251:				uk_UA.CP1251
 uk_UA.microsoft-cp1251:				uk_UA.CP1251
 uk_UA.MICROSOFT-CP1251:				uk_UA.CP1251
 uk_UA.utf8:					uk_UA.UTF-8
+ur:						ur_IN.UTF-8
+ur_IN.utf8:					ur_IN.UTF-8
+ur_IN.UTF-8:					ur_IN.UTF-8
 ur:						ur_PK.CP1256
 ur_PK:						ur_PK.CP1256
 ur_PK.cp1256:					ur_PK.CP1256
diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
--- nls/locale.dir.pre	2005-09-30 13:22:46.000000000 +0530
+++ nls/locale.dir.pre	2006-07-03 15:15:48.000000000 +0530
@@ -198,7 +198,7 @@ iso8859-5/XLC_LOCALE: 			ru_RU.ISO8859-5
 microsoft-cp1251/XLC_LOCALE: 		ru_RU.CP1251
 koi8-r/XLC_LOCALE: 			ru_RU.KOI8-R
 koi8-u/XLC_LOCALE:			ru_UA.KOI8-U
-iso8859-1/XLC_LOCALE:           rw_RW.ISO8859-1
+iso8859-1/XLC_LOCALE:           	rw_RW.ISO8859-1
 iso8859-2/XLC_LOCALE: 			sh_YU.ISO8859-2
 iso8859-2/XLC_LOCALE: 			sk_SK.ISO8859-2
 iso8859-2/XLC_LOCALE: 			sl_SI.ISO8859-2
@@ -261,13 +261,14 @@ en_US.UTF-8/XLC_LOCALE:			ar_LB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_LY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_MA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_OM.UTF-8
-en_US.UTF-8/XLC_LOCALE                 bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE                  bs_BA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_QA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_SA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_SD.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_SY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_TN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_YE.UTF-8
+en_US.UTF-8/XLC_LOCALE			as_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			az_AZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			a3_AZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			be_BY.UTF-8
@@ -348,6 +349,7 @@ en_US.UTF-8/XLC_LOCALE:			iu_CA.UTF-8
 ja_JP.UTF-8/XLC_LOCALE:			ja_JP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ka_GE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kl_GL.UTF-8
+en_US.UTF-8/XLC_LOCALE			kn_IN.UTF-8
 ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
@@ -356,6 +358,7 @@ en_US.UTF-8/XLC_LOCALE:			lt_LT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			lv_LV.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mi_NZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mk_MK.UTF-8
+en_US.UTF-8/XLC_LOCALE			ml_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			mr_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ms_MY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_BE.UTF-8
@@ -367,6 +370,7 @@ en_US.UTF-8/XLC_LOCALE:			nr_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nso_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ny_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			oc_FR.UTF-8
+en_US.UTF-8/XLC_LOCALE			or_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pa_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_DE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pd_US.UTF-8
@@ -378,7 +382,7 @@ en_US.UTF-8/XLC_LOCALE:			pt_PT.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ro_RO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ru_RU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ru_UA.UTF-8
-en_US.UTF-8/XLC_LOCALE:         rw_RW.UTF-8
+en_US.UTF-8/XLC_LOCALE:         	rw_RW.UTF-8
 en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sh_YU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			si_LK.UTF-8
@@ -391,6 +395,7 @@ en_US.UTF-8/XLC_LOCALE:			st_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sv_FI.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sv_SE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ta_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE			te_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tg_TJ.UTF-8
 th_TH.UTF-8/XLC_LOCALE:			th_TH.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ti_ER.UTF-8
@@ -401,6 +406,7 @@ en_US.UTF-8/XLC_LOCALE:			tr_TR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ts_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tt_RU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			uk_UA.UTF-8
+en_US.UTF-8/XLC_LOCALE			ur_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ur_PK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			uz_UZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ve_ZA.UTF-8



From fedora-cvs-commits at redhat.com  Wed Jul 19 09:55:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 05:55:02 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-cleanup.patch,NONE,1.1
Message-ID: <200607190955.k6J9t21w008561@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8539

Added Files:
	autofs-5.0.1-rc1-cthon-cleanup.patch 
Log Message:
- add missing patch.


autofs-5.0.1-rc1-cthon-cleanup.patch:
 CHANGELOG                 |    1 +
 daemon/automount.c        |   34 +++++++++++++++++-----------------
 daemon/direct.c           |   14 +++++++-------
 daemon/indirect.c         |   14 +++++++-------
 daemon/lookup.c           |   25 +++++++------------------
 lib/master.c              |   15 +++++++--------
 modules/lookup_file.c     |    6 +++---
 modules/lookup_hesiod.c   |    6 ++++++
 modules/lookup_multi.c    |   14 ++++++++++++++
 modules/lookup_program.c  |    3 +++
 modules/lookup_userhome.c |    4 ++++
 modules/parse_sun.c       |   33 +++++++++++++--------------------
 12 files changed, 89 insertions(+), 80 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 9f4e4b4..c09ae44 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - cthon multi-map locking fix and current race corrections.
 - cthon shutdown expire fix.
 - cthon more map parser corrections.
+- cthon cleanup and corrections.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 1d0e64f..21f0378 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -314,7 +314,7 @@ static int umount_ent(struct autofs_poin
 	if (rv && (ap->state == ST_SHUTDOWN_FORCE || ap->state == ST_SHUTDOWN)) {
 		ret = stat(path, &st);
 		if (ret == -1 && errno == ENOENT) {
-			error(ap->logopt, "mount point does not exist");
+			warn(ap->logopt, "mount point does not exist");
 			status = pthread_mutex_unlock(&ap->state_mutex);
 			if (status)
 				fatal(status);
@@ -322,7 +322,7 @@ static int umount_ent(struct autofs_poin
 		}
 
 		if (ret == 0 && !S_ISDIR(st.st_mode)) {
-			error(ap->logopt, "mount point is not a directory");
+			warn(ap->logopt, "mount point is not a directory");
 			status = pthread_mutex_unlock(&ap->state_mutex);
 			if (status)
 				fatal(status);
@@ -440,7 +440,7 @@ static int rm_unwanted_fn(const char *fi
 		debug(LOGOPT_ANY, "removing directory %s", file);
 		if (rmdir(file)) {
 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			error(LOGOPT_ANY,
+			warn(LOGOPT_ANY,
 			      "unable to remove directory %s: %s", file, estr);
 			return 0;
 		}
@@ -570,36 +570,38 @@ int umount_multi(struct autofs_point *ap
 		if (!strcmp(mptr->fs_type, "autofs"))
 			continue;
 
+		sched_yield();
+
 		if (umount_offsets(ap, mnts, mptr->path))
-			error(ap->logopt, "could not umount some offsets under %s",
+			warn(ap->logopt, "could not umount some offsets under %s",
 				mptr->path);
 
+		sched_yield();
+
 		debug(ap->logopt, "unmounting dir = %s", mptr->path);
 
 		if (umount_ent(ap, mptr->path, mptr->fs_type)) {
 			left++;
 		}
-
-		sched_yield();
 	}
 
 	/* Lastly check for offsets with no root mount */
 	n = scandir(path, &de, 0, alphasort);
-	if (n) {
+	if (n && n != -1) {
 		char buf[PATH_MAX + 1];
 
 		while (n--) {
 			size_t size;
 			int ret;
 
+			sched_yield();
+
 			if (strcmp(de[n]->d_name, ".") == 0 ||
 			    strcmp(de[n]->d_name, "..") == 0) {
 				free(de[n]);
 				continue;
 			}
 
-			sched_yield();
-
 			size = sizeof(buf);
 			ret = cat_path(buf, size, path, de[n]->d_name);
 			if (!ret) {
@@ -612,7 +614,7 @@ int umount_multi(struct autofs_point *ap
 
 			if (!tree_is_mounted(mnts, buf)) {
 				if (umount_offsets(ap, mnts, buf)) {
-					error(ap->logopt,
+					warn(ap->logopt,
 					  "could not umount some offsets under %s",
 					  buf);
 					left++;
@@ -624,8 +626,9 @@ int umount_multi(struct autofs_point *ap
 	}
 
 	if (!left && !tree_is_mounted(mnts, path)) {
+		sched_yield();
 		if (umount_offsets(ap, mnts, path)) {
-			error(ap->logopt,
+			warn(ap->logopt,
 			      "could not umount some offsets under %s", path);
 			left++;
 		}
@@ -831,11 +834,10 @@ int do_expire(struct autofs_point *ap, c
 	mnts = tree_make_mnt_tree(_PROC_MOUNTS, buf);
 
 	ret = umount_multi(ap, mnts, buf, 1);
-	if (ret == 0) {
+	if (ret == 0)
 		msg("expired %s", buf);
-	} else {
+	else
 		error(ap->logopt, "error while expiring %s", buf);
-	}
 
 	tree_free_mnt_tree(mnts);
 
@@ -1258,8 +1260,6 @@ static void handle_mounts_cleanup(void *
 
 	sched_yield();
 
-	sched_yield();
-
 	if (clean) {
 		if (rmdir(path) == -1) {
 			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
@@ -1415,7 +1415,7 @@ void *handle_mounts(void *arg)
 	 * So, the solution is a recipe for disaster.
 	 * Hope we don't get a really busy system!
 	 */
-	sleep(5);
+	sleep(1);
 	/* sched_yield(); */
 
 	return NULL;
diff --git a/daemon/direct.c b/daemon/direct.c
index 4ee8a03..3905ed0 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -140,12 +140,12 @@ int do_umount_autofs_direct(struct autof
 		switch (errno) {
 		case ENOENT:
 		case EINVAL:
-			error(ap->logopt, "mount point %s does not exist",
+			warn(ap->logopt, "mount point %s does not exist",
 			      me->key);
 			return 0;
 			break;
 		case EBUSY:
-			error(ap->logopt, "mount point %s is in use", me->key);
+			warn(ap->logopt, "mount point %s is in use", me->key);
 			if (ap->state == ST_SHUTDOWN_FORCE)
 				goto force_umount;
 			else
@@ -246,13 +246,13 @@ static int unlink_mount_tree(struct auto
 
 			switch (errno) {
 			case EINVAL:
-				debug(ap->logopt,
+				warn(ap->logopt,
 				      "bad superblock or not mounted");
 				break;
 
 			case ENOENT:
 			case EFAULT:
-				debug(ap->logopt, "bad path for mount");
+				warn(ap->logopt, "bad path for mount");
 				break;
 			}
 		}
@@ -494,10 +494,10 @@ int umount_autofs_offset(struct autofs_p
 	rv = umount(me->key);
 	if (rv == -1) {
 		if (errno == ENOENT) {
-			error(ap->logopt, "mount point does not exist");
+			warn(ap->logopt, "mount point does not exist");
 			return 0;
 		} else if (errno == EBUSY) {
-			error(ap->logopt, "mount point %s is in use", me->key);
+			warn(ap->logopt, "mount point %s is in use", me->key);
 			if (ap->state != ST_SHUTDOWN_FORCE)
 				return 0;
 		} else if (errno == ENOTDIR) {
@@ -534,7 +534,7 @@ int mount_autofs_offset(struct autofs_po
 
 	if (is_mounted(_PROC_MOUNTS, me->key, MNTS_AUTOFS)) {
 		if (ap->state != ST_READMAP)
-			debug(ap->logopt,
+			warn(ap->logopt,
 			      "trigger %s already mounted", me->key);
 		return 0;
 	}
diff --git a/daemon/indirect.c b/daemon/indirect.c
index c46326c..0c47cfd 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -106,13 +106,13 @@ static int unlink_mount_tree(struct auto
 
 			switch (errno) {
 			case EINVAL:
-				debug(ap->logopt,
+				warn(ap->logopt,
 				      "bad superblock or not mounted");
 				break;
 
 			case ENOENT:
 			case EFAULT:
-				debug(ap->logopt, "bad path for mount");
+				warn(ap->logopt, "bad path for mount");
 				break;
 			}
 		}
@@ -329,12 +329,12 @@ int umount_autofs_indirect(struct autofs
 		switch (errno) {
 		case ENOENT:
 		case EINVAL:
-			error(ap->logopt,
+			warn(ap->logopt,
 			      "mount point %s does not exist", ap->path);
 			return 0;
 			break;
 		case EBUSY:
-			error(ap->logopt,
+			warn(ap->logopt,
 			      "mount point %s is in use", ap->path);
 			if (ap->state == ST_SHUTDOWN_FORCE)
 				goto force_umount;
@@ -457,7 +457,7 @@ void *expire_proc_indirect(void *arg)
 
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
 		if (ret < 0 && errno != EAGAIN) {
-			debug(ap->logopt,
+			warn(ap->logopt,
 			      "failed to expire mount %s", next->path);
 			ea->status = 1;
 			break;
@@ -490,7 +490,7 @@ void *expire_proc_indirect(void *arg)
 		while (offsets--) {
 			ret = ioctl(ap->ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
 			if (ret < 0 && errno != EAGAIN) {
-				debug(ap->logopt,
+				warn(ap->logopt,
 				      "failed to expire ofsets under %s",
 				      ap->path);
 				ea->status = 1;
@@ -529,7 +529,7 @@ void *expire_proc_indirect(void *arg)
 
 		if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
 			if (!ret) {
-				debug(ap->logopt,
+				warn(ap->logopt,
 				      "mount still busy %s", ap->path);
 				ea->status = 1;
 			}
diff --git a/daemon/lookup.c b/daemon/lookup.c
index cad98d2..f0f9718 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -253,6 +253,9 @@ static int do_read_map(struct autofs_poi
 	if (!ap->ghost && ap->type != LKP_DIRECT)
 		return NSS_STATUS_SUCCESS;
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = map;
+
 	status = lookup->lookup_read_map(ap, age, lookup->context);
 
 	/*
@@ -414,8 +417,6 @@ int lookup_nss_read_map(struct autofs_po
 		if (map->type) {
 			debug(ap->logopt,
 			      "reading map %s %s", map->type, map->argv[0]);
-			master_source_current_wait(entry);
-			entry->current = map;
 			result = do_read_map(ap, map, age);
 			map = map->next;
 			continue;
@@ -432,14 +433,10 @@ int lookup_nss_read_map(struct autofs_po
 				map->type = tmp;
 				debug(ap->logopt,
 				      "reading map %s %s", tmp, map->argv[0]);
-				master_source_current_wait(entry);
-				entry->current = map;
 				result = do_read_map(ap, map, age);
 			} else {
 				debug(ap->logopt,
 				      "reading map file %s", map->argv[0]);
-				master_source_current_wait(entry);
-				entry->current = map;
 				result = read_file_source_instance(ap, map, age);
 			}
 			map = map->next;
@@ -464,8 +461,6 @@ int lookup_nss_read_map(struct autofs_po
 			debug(ap->logopt,
 			      "reading map %s %s", this->source, map->argv[0]);
 
-			master_source_current_wait(entry);
-			entry->current = map;
 			result = read_map_source(this, ap, map, age);
 			if (result == NSS_STATUS_UNKNOWN)
 				continue;
@@ -592,6 +587,9 @@ int do_lookup_mount(struct autofs_point 
 
 	lookup = map->lookup;
 
+	master_source_current_wait(ap->entry);
+	ap->entry->current = map;
+
 	status = lookup->lookup_mount(ap, name, name_len, lookup->context);
 
 	return status;
@@ -746,8 +744,6 @@ int lookup_nss_mount(struct autofs_point
 		sched_yield();
 
 		if (map->type) {
-			master_source_current_wait(entry);
-			entry->current = map;
 			result = do_lookup_mount(ap, map, name, name_len);
 
 			if (result == NSS_STATUS_SUCCESS)
@@ -766,14 +762,9 @@ int lookup_nss_mount(struct autofs_point
 					continue;
 				}
 				map->type = tmp;
-				master_source_current_wait(entry);
-				entry->current = map;
 				result = do_lookup_mount(ap, map, name, name_len);
-			} else {
-				master_source_current_wait(entry);
-				entry->current = map;
+			} else
 				result = lookup_name_file_source_instance(ap, map, name, name_len);
-			}
 
 			if (result == NSS_STATUS_SUCCESS)
 				break;
@@ -798,8 +789,6 @@ int lookup_nss_mount(struct autofs_point
 
 			this = list_entry(p, struct nss_source, list);
 
-			master_source_current_wait(entry);
-			entry->current = map;
 			result = lookup_map_name(this, ap, map, name, name_len);
 
 			if (result == NSS_STATUS_UNKNOWN) {
diff --git a/lib/master.c b/lib/master.c
index f54fffe..9d16801 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -181,13 +181,7 @@ master_add_map_source(struct master_mape
 
 	source->age = age;
 	source->stale = 1;
-/*
-	source->mc = cache_init(source);
-	if (!source->mc) {
-		master_free_map_source(source);
-		return NULL;
-	}
-*/
+
 	tmpargv = copy_argv(argc, argv);
 	if (!tmpargv) {
 		master_free_map_source(source, 0);
@@ -343,7 +337,7 @@ void master_free_map_source(struct map_s
 		instance = source->instance;
 		while (instance) {
 			next = instance->next;
-			master_free_map_source(instance, free_cache);
+			master_free_map_source(instance, 0);
 			instance = next;
 		}
 
@@ -434,6 +428,7 @@ master_add_source_instance(struct map_so
 	}
 
 	new->age = age;
+	new->mc = source->mc;
 
 	tmpargv = copy_argv(source->argc, source->argv);
 	if (!tmpargv) {
@@ -519,6 +514,8 @@ void master_source_current_wait(struct m
 {
 	int status;
 
+	debug(LOGOPT_ANY, "locking");
+
 	status = pthread_mutex_lock(&entry->current_mutex);
 	if (status) {
 		error(LOGOPT_ANY, "entry current source lock failed");
@@ -555,6 +552,8 @@ void master_source_current_signal(struct
 		fatal(status);
 	}
 
+	debug(LOGOPT_ANY, "unlocking");
+
 	return;
 }
 
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 6306084..81ade74 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -193,7 +193,7 @@ static int read_one(FILE *f, char *key, 
 			else {
 				if (key_len == KEY_MAX_LEN) {
 					state = st_badent;
-					error(LOGOPT_ANY,
+					warn(LOGOPT_ANY,
 					      MODPREFIX "map key \"%s...\" "
 					      "is too long.  The maximum key "
 					      "length is %d", key,
@@ -243,7 +243,7 @@ static int read_one(FILE *f, char *key, 
 					state = st_badent;
 					ungetc(nch, f);
 					gotten = got_nothing;
-					error(LOGOPT_ANY, MODPREFIX 
+					warn(LOGOPT_ANY, MODPREFIX 
 					      "bad map entry \"%s...\" for key "
 					      "\"%s\"", mapent, key);
 					break;
@@ -261,7 +261,7 @@ static int read_one(FILE *f, char *key, 
 				   	goto got_it;
 				ungetc(nch, f);
 			} else {
-				error(LOGOPT_ANY,
+				warn(LOGOPT_ANY,
 				      MODPREFIX "map entry \"%s...\" for key "
 				      "\"%s\" is too long.  The maximum entry"
 				      " size is %d", mapent, key,
diff --git a/modules/lookup_hesiod.c b/modules/lookup_hesiod.c
index 4491c16..1664afc 100644
--- a/modules/lookup_hesiod.c
+++ b/modules/lookup_hesiod.c
@@ -86,6 +86,9 @@ int lookup_read_master(struct master *ma
 
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	return NSS_STATUS_UNKNOWN;
 }
 
@@ -103,6 +106,9 @@ int lookup_mount(struct autofs_point *ap
 	char **record, *best_record = NULL, *p;
 	int priority, lowest_priority = INT_MAX;	
 
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	debug(ap->logopt,
 	      MODPREFIX "looking up root=\"%s\", name=\"%s\"",
 	      ap->path, name);
diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
index a3363b7..00ab28e 100644
--- a/modules/lookup_multi.c
+++ b/modules/lookup_multi.c
@@ -133,9 +133,16 @@ int lookup_read_master(struct master *ma
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
+	struct map_source *source;
 	int i, ret, at_least_1 = 0;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	for (i = 0; i < ctxt->n; i++) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
 		ret = ctxt->m[i].mod->lookup_read_map(ap, age,
 						ctxt->m[i].mod->context);
 		if (ret & LKP_FAIL || ret == LKP_NOTSUP)
@@ -153,9 +160,16 @@ int lookup_read_map(struct autofs_point 
 int lookup_mount(struct autofs_point *ap, const char *name, int name_len, void *context)
 {
 	struct lookup_context *ctxt = (struct lookup_context *) context;
+	struct map_source *source;
 	int i;
 
+	source = ap->entry->current;
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	for (i = 0; i < ctxt->n; i++) {
+		master_source_current_wait(ap->entry);
+		ap->entry->current = source;
 		if (ctxt->m[i].mod->lookup_mount(ap, name, name_len,
 						 ctxt->m[i].mod->context) == 0)
 			return NSS_STATUS_SUCCESS;
diff --git a/modules/lookup_program.c b/modules/lookup_program.c
index 9c69b6f..c589d05 100644
--- a/modules/lookup_program.c
+++ b/modules/lookup_program.c
@@ -99,6 +99,9 @@ int lookup_read_master(struct master *ma
 
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
+
 	return NSS_STATUS_UNKNOWN;
 }
 
diff --git a/modules/lookup_userhome.c b/modules/lookup_userhome.c
index 0d84379..cc0b4fa 100644
--- a/modules/lookup_userhome.c
+++ b/modules/lookup_userhome.c
@@ -42,6 +42,8 @@ int lookup_read_master(struct master *ma
 
 int lookup_read_map(struct autofs_point *ap, time_t age, void *context)
 {
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
 	return NSS_STATUS_UNKNOWN;
 }
 
@@ -50,6 +52,8 @@ int lookup_mount(struct autofs_point *ap
 	struct passwd *pw;
 	char buf[MAX_ERR_BUF];
 
+	ap->entry->current = NULL;
+	master_source_current_signal(ap->entry);
 	debug(ap->logopt, MODPREFIX "looking up %s", name);
 
 	/* Get the equivalent username */
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 7656bb4..00b0bd3 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -641,7 +641,7 @@ add_offset_entry(struct autofs_point *ap
 		p_len--;
 	m_key_len = m_root_len + p_len;
 	if (m_key_len > PATH_MAX) {
-		error(ap->logopt, MODPREFIX "multi mount key too long");
+		warn(ap->logopt, MODPREFIX "multi mount key too long");
 		return CHE_FAIL;
 	}
 	strcpy(m_key, m_root);
@@ -654,7 +654,7 @@ add_offset_entry(struct autofs_point *ap
 
 	m_mapent_len = strlen(loc);
 	if (m_mapent_len + m_options_len > MAPENT_MAX_LEN) {
-		error(ap->logopt, MODPREFIX "multi mount mapent too long");
+		warn(ap->logopt, MODPREFIX "multi mount mapent too long");
 		return CHE_FAIL;
 	}
 
@@ -676,7 +676,7 @@ add_offset_entry(struct autofs_point *ap
 		debug(ap->logopt, MODPREFIX
 		      "added multi-mount offset %s -> %s", path, m_mapent);
 	else
-		debug(ap->logopt, MODPREFIX
+		warn(ap->logopt, MODPREFIX
 		      "syntax error or dupliate offset %s -> %s", path, loc);
 
 	return ret;
@@ -818,7 +818,7 @@ static int parse_mapent(const char *ent,
 
 	/* Location can't begin with a '/' */
 	if (*p == '/') {
-		error(logopt, MODPREFIX "error location begins with \"/\"");
+		warn(logopt, MODPREFIX "error location begins with \"/\"");
 		free(myoptions);
 		return 0;
 	}
@@ -852,7 +852,7 @@ static int parse_mapent(const char *ent,
 
 		/* Location can't begin with a '/' */
 		if (*p == '/') {
-			error(logopt,
+			warn(logopt,
 			      MODPREFIX "error location begins with \"/\"");
 			free(myoptions);
 			free(loc);
@@ -873,7 +873,7 @@ static int parse_mapent(const char *ent,
 		}
 
 		if (!validate_location(ent)) {
-			error(logopt,
+			warn(logopt,
 			      MODPREFIX "invalid location %s", ent);
 			free(ent);
 			free(myoptions);
@@ -940,7 +940,7 @@ int parse_mount(struct autofs_point *ap,
 	mc = source->mc;
 
 	if (!mapent) {
-		error(ap->logopt, MODPREFIX "error: empty map entry");
+		warn(ap->logopt, MODPREFIX "error: empty map entry");
 		return 1;
 	}
 
@@ -1094,7 +1094,7 @@ int parse_mount(struct autofs_point *ap,
 
 			path = sanitize_path(tmp, strlen(tmp));
 			if (!path) {
-				error(ap->logopt, MODPREFIX "invalid path");
+				warn(ap->logopt, MODPREFIX "invalid path");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
@@ -1132,7 +1132,7 @@ int parse_mount(struct autofs_point *ap,
 						path, myoptions, loc, age);
 
 			if (status != CHE_OK) {
-				error(ap->logopt, MODPREFIX "error adding multi-mount");
+				warn(ap->logopt, MODPREFIX "error adding multi-mount");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
@@ -1172,7 +1172,7 @@ int parse_mount(struct autofs_point *ap,
 				options, &myoptions, &loc, ap->logopt);
 			if (!rv) {
 				error(ap->logopt,
-				      MODPREFIX "mount of root offset failed");
+				      MODPREFIX "failed to mount root offset");
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
 				cache_multi_unlock(mc);
@@ -1219,7 +1219,7 @@ int parse_mount(struct autofs_point *ap,
 
 		/* Location can't begin with a '/' */
 		if (*p == '/') {
-			error(ap->logopt,
+			warn(ap->logopt,
 			      MODPREFIX "error location begins with \"/\"");
 			free(options);
 			return 1;
@@ -1236,15 +1236,8 @@ int parse_mount(struct autofs_point *ap,
 			return 1;
 		}
 
-		if (!*loc) {
-			error(ap->logopt, MODPREFIX "invalid location");
-			free(loc);
-			free(options);
-			return 1;
-		}
-
 		if (!validate_location(loc)) {
-			error(ap->logopt, MODPREFIX "invalid location");
+			warn(ap->logopt, MODPREFIX "invalid location");
 			free(loc);
 			free(options);
 			return 1;
@@ -1269,7 +1262,7 @@ int parse_mount(struct autofs_point *ap,
 			}
 
 			if (!validate_location(ent)) {
-				error(ap->logopt, MODPREFIX "invalid location");
+				warn(ap->logopt, MODPREFIX "invalid location");
 				free(ent);
 				free(loc);
 				free(options);



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:06:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:06:53 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.0-update.patch, NONE,
	1.1 system-config-soundcard.spec, 1.40, 1.41
Message-ID: <200607191006.k6JA6r9w009014@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8995

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.0-update.patch 
Log Message:
- added pycairo to Requires
- compacted card detection
- fixed info and error dialog boxes
- fixed configuration loading
- fixed playback (added script)



system-config-soundcard-2.0.0-update.patch:
 Makefile                         |    1 
 src/soundcard.py                 |   52 ++++++++-------------------------------
 src/soundcardBackend.py          |   33 ++++++++++++------------
 src/soundcardBackendSoundCard.py |   12 +++------
 src/system-config-soundcard.play |    9 ++++++
 5 files changed, 42 insertions(+), 65 deletions(-)

--- NEW FILE system-config-soundcard-2.0.0-update.patch ---
--- /dev/null	2006-07-19 11:05:40.000000000 +0200
+++ system-config-soundcard-2.0.0/src/system-config-soundcard.play	2006-07-19 11:06:18.000000000 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if ! [ $1 ]; then
+    echo -e "Usage:	system-config-soundcard.play alsa-device";
+else
+    LOG_FILE="/root/scsrun.log";
+    echo -e "------- System Config Soundcard Log --------\n`date`\n" > $LOG_FILE 2>&1;
+    exec /usr/bin/aplay -D $1 -N /usr/share/system-config-soundcard/sound-sample.wav >> $LOG_FILE 2>&1;
+fi
--- system-config-soundcard-2.0.0/src/soundcardBackendSoundCard.py.old	2006-06-30 14:07:38.000000000 +0200
+++ system-config-soundcard-2.0.0/src/soundcardBackendSoundCard.py	2006-07-19 11:05:12.000000000 +0200
@@ -118,20 +118,18 @@
         # set volume before playing test sound
         self.setVolume(self.volume)
 
-        device = " plughw:%d,%d " % (self.index, self.test_sound_device)
-        path = "/bin/sh"        
-        
-        commnad = "/usr/bin/aplay " + " -D " + device + " -N " + " /usr/share/system-config-soundcard/sound-sample.wav >> /root/scsrun.log 2>&1"
+        device = "plughw:%d,%d" % (self.index, self.test_sound_device)
+        path = "/usr/share/system-config-soundcard/system-config-soundcard.play"
 
         self.test_sound_aplay_pid = os.fork()
         if (not self.test_sound_aplay_pid):
            try:
-             os.execv(path, [path, "-c", commnad])
+             os.execv(path, [path, device])
            except:
              sys.exit(0)
 
-    def stopTestSound(self):                
-        # Kill the child process        
+    def stopTestSound(self):
+        # Kill the child process
         if self.test_sound_aplay_pid != 0:
            os.kill(self.test_sound_aplay_pid,15)
 
--- system-config-soundcard-2.0.0/src/soundcard.py.old	2006-06-30 14:07:38.000000000 +0200
+++ system-config-soundcard-2.0.0/src/soundcard.py	2006-07-19 09:36:11.000000000 +0200
@@ -84,7 +84,9 @@
         gtk.main_quit()
     
     def __init__(self, doDebug=None, backend=None):
-        
+    
+        self.mainWindow = None
+
         self.card_list = None
         
         self.doDebug = doDebug
@@ -217,7 +219,7 @@
         
     def soundQuestion(self):
         text = (_("Did you hear the sample sound?"))
-        dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,text)
+        dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,text)
 
         dlg.set_title("")
         dlg.set_default_size(100, 100)
@@ -641,14 +643,14 @@
 
         #Create a check-box for hw/sw config
         button = gtk.CheckButton(_("Disable software mixing (dmix, dsnoop)"))
-        #button.set_active(self.soundcardBackend.getHardwareDevice())
+        button.set_active(self.soundcardBackend.getHardwareDevice())
         button.connect("toggled", self.changeHW)
         
         configBox.pack_start(button)
 
         #Create a check-box for key config
         button = gtk.CheckButton(_("Dynamic keys for software mixer (more secure)"))
-        #button.set_active(self.soundcardBackend.getDynamicKeys())
+        button.set_active(self.soundcardBackend.getDynamicKeys())
         button.connect("toggled", self.changeDynKeys)
            
         configBox.pack_start(button)
@@ -658,8 +660,7 @@
         
         settingsBox.pack_start(configBox, False, False)
         
-        # card order
-        # TODO - vyladit pokud chybi nejake indexy
+        # card order        
         cardBox = gtk.HBox(False, 5)
         liststore = gtk.ListStore(int, str)
         
@@ -709,16 +710,6 @@
         
         return settingsBox
 
-    def create_system_page_redetect(self, widget):
-        self.soundcardBackend.detectCards()
-        self.refresh_notebook()
-        self.showInfoDialog(_("Sound devices have been re-detected, please check the \"Sound test\" tab."))        
-
-    def create_system_page_detection(self, widget, method):
-        if widget.get_active():
-            self.soundcardBackend.setDetectionMethod(method)
-            self.create_system_page_redetect(widget)
-
     def create_system_page_modules_reload(self, widget):
         self.soundcardBackend.reloadModules()
         self.create_system_page_redetect(widget)
@@ -776,31 +767,10 @@
 
         reload_button = gtk.Button(_("Reload audio drivers"))
         reload_button.connect("clicked", self.create_system_page_modules_reload)
-        
-        method = self.soundcardBackend.getDetectionMethod()
-        detectionBox = gtk.HBox(False, 8)
 
-        button = gtk.RadioButton(None, _("Kudzu"))
-        button.set_active(method == DETECTION_KUDZU)
-        button.connect("toggled", self.create_system_page_detection, DETECTION_KUDZU)
-        detectionBox.pack_start(button, False, False)
-        
-        button = gtk.RadioButton(button, _("/proc"))
-        button.set_active(method == DETECTION_PROC)
-        button.connect("toggled", self.create_system_page_detection, DETECTION_PROC)
-        detectionBox.pack_start(button, False, False)
-        
-        button = gtk.RadioButton(button, _("HAL"))
-        button.set_active(method == DETECTION_HAL)
-        button.connect("toggled", self.create_system_page_detection, DETECTION_HAL)
-        detectionBox.pack_start(button, False, False)
-
-        redetect_button = gtk.Button(_("Redetect cards"))
-        redetect_button.connect("clicked", self.create_system_page_redetect)
-        detectionBox.pack_start(redetect_button, True, True)
-        
+        detectionBox = gtk.HBox(False, 8)
         detectionBox.pack_start(reload_button, True, True)
-        detectionBox = self.create_frame(self.create_frame(detectionBox,8),0,_("Drivers & Detection"),gtk.SHADOW_ETCHED_IN)
+        detectionBox = self.create_frame(self.create_frame(detectionBox,8),0,_("Drivers"),gtk.SHADOW_ETCHED_IN)
         
         infoBox.pack_start(detectionBox, False, False)
 
@@ -867,7 +837,7 @@
         gtk.main()
 
     def showErrorDialog(self, text):
-        dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
+        dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
 
         dlg.set_title(_("Error"))
         dlg.set_default_size(100, 100)
@@ -879,7 +849,7 @@
         return
         
     def showInfoDialog(self, text):
-        dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, text)
+        dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, text)
 
         dlg.set_title(_("Information"))
         dlg.set_default_size(100, 100)
--- system-config-soundcard-2.0.0/src/soundcardBackend.py.old	2006-06-30 14:19:11.000000000 +0200
+++ system-config-soundcard-2.0.0/src/soundcardBackend.py	2006-07-19 09:36:11.000000000 +0200
@@ -22,9 +22,6 @@
 ## - clean-up objects interfaces
 ## - remove all 2.4 stuff
 
-## Check:
-        #dyn keys (reload/unload)
-
 
 
 import string
@@ -454,9 +451,7 @@
 class soundcardBackend:
     def __init__(self):
     
-        self.doDebug = True
-
-        self.probe_method = DETECTION_KUDZU
+        self.doDebug = True        
         
         self.soundcardBackendKudzu = soundcardBackendKudzu.soundcardBackendKudzu()
         self.soundcardBackendProc = soundcardBackendProc.soundcardBackendProc()
@@ -471,9 +466,19 @@
     def destroy(self, args):
         return        
 
+    def mergeCards(self, original_array, new_array):        
+        for card in range(self.soundConfig.card_max_index + 1):
+            if not original_array[card].active and new_array[card].active:
+                original_array[card] = new_array[card]
+        
+        return original_array
+
     def detectCards(self):
         # List of all cards in system
-        self.cardArray = self.probeCards()
+        self.cardArray = self.mergeCards(self.probeCards(DETECTION_HAL),\
+                                         self.probeCards(DETECTION_KUDZU))
+        self.cardArray = self.mergeCards(self.cardArray,\
+                                         self.probeCards(DETECTION_PROC))
         self.card_index_changed = True
         return
 
@@ -486,14 +491,8 @@
         for card in range(self.soundConfig.card_max_index + 1):
             list.append(soundcardBackendSoundCard.soundCard(card))
         return list
-
-    def setDetectionMethod(self, method):
-        self.probe_method = method
         
-    def getDetectionMethod(self):
-        return self.probe_method
-
-    def probeCards(self):
+    def probeCards(self, method):
     
         default_card = self.getDefaultCard()
         default_device = self.soundConfig.default_device
@@ -501,13 +500,13 @@
         card_list = self.createCardArray()
         card_max = self.soundConfig.card_max_index + 1
         
-        if self.probe_method == DETECTION_KUDZU:
+        if method == DETECTION_KUDZU:
             return self.soundcardBackendKudzu.probeCards(default_card,\
                    default_device, card_list, card_max)
-        elif self.probe_method == DETECTION_PROC:
+        elif method == DETECTION_PROC:
             return self.soundcardBackendProc.probeCards(default_card,\
                    default_device, card_list, card_max)
-        elif self.probe_method == DETECTION_HAL:
+        elif method == DETECTION_HAL:
             return self.soundcardBackendHal.probeCards(default_card,\
                    default_device, card_list, card_max)
                    
--- system-config-soundcard-2.0.0/Makefile.old	2006-06-30 14:13:57.000000000 +0200
+++ system-config-soundcard-2.0.0/Makefile	2006-07-19 11:07:17.000000000 +0200
@@ -30,6 +30,7 @@
 	mkdir -p $(INSTROOT)/usr/share/applications
 	install src/*.py $(INSTROOT)$(PKGDATADIR)
 	install src/*.logger $(INSTROOT)$(PKGDATADIR)
+	install src/*.play $(INSTROOT)$(PKGDATADIR)
 	install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME}
 	install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav
 	install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME}


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-soundcard.spec	30 Jun 2006 12:56:15 -0000	1.40
+++ system-config-soundcard.spec	19 Jul 2006 10:06:51 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.0
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch: system-config-soundcard-2.0.0-update.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -21,6 +22,7 @@
 Requires: kudzu
 Requires: alsa-utils >= 1.0.11
 Requires: alsa-lib
+Requires: pycairo > 1.2.0
 PreReq: hicolor-icon-theme
 Requires(post): gtk2
 Requires(postun): gtk2
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 make
@@ -85,6 +88,13 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Jul 18 2006 Martin Stransky <stransky at redhat.com> 2.0.0-2
+- added pycairo to Requires
+- compacted card detection
+- fixed info and error dialog boxes
+- fixed configuration loading
+- fixed playback (added script)
+
 * Thu Jun 30 2006 Martin Stransky <stransky at redhat.com> 2.0.0-1
 - new upstream
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:07:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:07:41 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-add-parser-subs.patch, NONE,
	1.1 autofs.spec, 1.127, 1.128
Message-ID: <200607191007.k6JA7ffG009071@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8996

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-add-parser-subs.patch 
Log Message:
- add missing parser_subs.* files .. oops.


autofs-5.0.1-rc1-cthon-add-parser-subs.patch:
 include/parse_subs.h |   28 ++++++
 lib/parse_subs.c     |  207 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

--- NEW FILE autofs-5.0.1-rc1-cthon-add-parser-subs.patch ---
diff --git a/include/parse_subs.h b/include/parse_subs.h
new file mode 100644
index 0000000..7c23429
--- /dev/null
+++ b/include/parse_subs.h
@@ -0,0 +1,28 @@
+/* ----------------------------------------------------------------------- *
+ *   
+ *  parse_subs.c - misc parser subroutines
+ *                automounter map
+ * 
+ *   Copyright 1997 Transmeta Corporation - All Rights Reserved
+ *   Copyright 2000 Jeremy Fitzhardinge <jeremy at goop.org>
+ *   Copyright 2004-2006 Ian Kent <raven at themaw.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+#ifndef PARSE_SUBS_H
+#define PARSE_SUBS_H
+
+const char *skipspace(const char *);
+int check_colon(const char *);
+int chunklen(const char *, int);
+int strmcmp(const char *, const char *, int);
+char *dequote(const char *, int, unsigned int);
+char *sanitize_path(const char *, int);
+
+#endif
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
new file mode 100644
index 0000000..d5efb8b
--- /dev/null
+++ b/lib/parse_subs.c
@@ -0,0 +1,207 @@
+/* ----------------------------------------------------------------------- *
+ *   
+ *  parse_subs.c - misc parser subroutines
+ *                automounter map
+ * 
+ *   Copyright 1997 Transmeta Corporation - All Rights Reserved
+ *   Copyright 2000 Jeremy Fitzhardinge <jeremy at goop.org>
+ *   Copyright 2004-2006 Ian Kent <raven at themaw.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+#include <stdlib.h>
+#include "log.h"
+
+/*
+ * Skip whitespace in a string; if we hit a #, consider the rest of the
+ * entry a comment.
+ */
+const char *skipspace(const char *whence)
+{
+	while (1) {
+		switch (*whence) {
+		case ' ':
+		case '\b':
+		case '\t':
+		case '\n':
+		case '\v':
+		case '\f':
+		case '\r':
+			whence++;
+			break;
+		case '#':	/* comment: skip to end of string */
+			while (*whence != '\0')
+				whence++;
+			/* FALLTHROUGH */
+
+		default:
+			return whence;
+		}
+	}
+}
+
+/*
+ * Check a string to see if a colon appears before the next '/'.
+ */
+int check_colon(const char *str)
+{
+	char *ptr = (char *) str;
+
+	while (*ptr && *ptr != ':' && *ptr != '/') {
+		ptr++;
+	}
+
+	if (!*ptr || *ptr == '/')
+		return 0;
+
+	return 1;
+}
+
+/* Get the length of a chunk delimitered by whitespace */
+int chunklen(const char *whence, int expect_colon)
+{
+	char *str = (char *) whence;
+	int n = 0;
+	int quote = 0;
+
+	for (; *str; str++, n++) {
+		switch (*str) {
+		case '\\':
+			if( quote ) {
+				break;
+			} else {
+				quote = 1;
+				continue;
+			}
+		case ':':
+			if (expect_colon)
+				expect_colon = 0;
+			continue;
+		case ' ':
+		case '\t':
+			/* Skip space or tab if we expect a colon */
+			if (expect_colon)
+				continue;
+		case '\b':
+		case '\n':
+		case '\v':
+		case '\f':
+		case '\r':
+		case '\0':
+			if (!quote)
+				return n;
+			/* FALLTHROUGH */
+		default:
+			break;
+		}
+		quote = 0;
+	}
+
+	return n;
+}
+
+/*
+ * Compare str with pat.  Return 0 if compare equal or
+ * str is an abbreviation of pat of no less than mchr characters.
+ */
+int strmcmp(const char *str, const char *pat, int mchr)
+{
+	int nchr = 0;
+
+	while (*str == *pat) {
+		if (!*str)
+			return 0;
+		str++;
+		pat++;
+		nchr++;
+	}
+
+	if (!*str && nchr > mchr)
+		return 0;
+
+	return *pat - *str;
+}
+
+char *dequote(const char *str, int origlen, unsigned int logopt)
+{
+	char *ret = malloc(origlen + 1);
+	char *cp = ret;
+	const char *scp;
+	int len = origlen;
+	int quote = 0, dquote = 0;
+
+	if (ret == NULL)
+		return NULL;
+
+	for (scp = str; len > 0 && *scp; scp++, len--) {
+		if (!quote) {
+			if (*scp == '"') {
+				if (dquote)
+					dquote = 0;
+				else
+					dquote = 1;
+				continue;
+			}
+
+			if (*scp == '\\') {
+				quote = 1;
+				continue;
+			}
+		}
+		quote = 0;
+		*cp++ = *scp;
+	}
+	*cp = '\0';
+
+	if (dquote) {
+		debug(logopt, "unmatched quote in %.*s", origlen, str);
+		free(ret);
+		return NULL;
+	}
+
+	return ret;
+}
+
+char *sanitize_path(const char *path, int origlen)
+{
+	char *ret = malloc(origlen + 1);
+	char *cp = ret;
+	const char *scp;
+	int len = origlen;
+	unsigned int seen_slash = 0, quote = 0;
+
+	if (ret == NULL)
+		return NULL;
+
+	for (scp = path; len > 0 && *scp; scp++, len--) {
+		if (!quote) {
+			if (*scp == '\\') {
+				quote = 1;
+				continue;
+			}
+
+			if (*scp == '/') {
+				if (seen_slash)
+					continue;
+
+				seen_slash = 1;
+			} else
+				seen_slash = 0;
+		}
+		quote = 0;
+		*cp++ = *scp;
+	}
+	*cp = '\0';
+
+	if (origlen > 1 && *(cp - 1) == '/')
+		*(cp - 1) = '\0';
+
+	return ret;
+}
+


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- autofs.spec	19 Jul 2006 09:51:40 -0000	1.127
+++ autofs.spec	19 Jul 2006 10:07:38 -0000	1.128
@@ -18,6 +18,7 @@
 Patch5: autofs-5.0.1-rc1-cthon-shutdown-expire.patch
 Patch6: autofs-5.0.1-rc1-cthon-parser-2.patch
 Patch7: autofs-5.0.1-rc1-cthon-cleanup.patch
+Patch8: autofs-5.0.1-rc1-cthon-add-parser-subs.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -63,6 +64,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:19:58 -0400
Subject: rpms/autoconf/devel .cvsignore, 1.7, 1.8 autoconf.spec, 1.28,
	1.29 sources, 1.7, 1.8 autoconf-2.60-intrinsic.patch, 1.1, NONE
Message-ID: <200607191019.k6JAJwNF003568@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3536

Modified Files:
	.cvsignore autoconf.spec sources 
Removed Files:
	autoconf-2.60-intrinsic.patch 
Log Message:
- make 2.59 HEAD, 2.60 is still too broken


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 Jun 2006 09:51:17 -0000	1.7
+++ .cvsignore	19 Jul 2006 10:19:55 -0000	1.8
@@ -1 +1 @@
-autoconf-2.60.tar.bz2
+autoconf-2.59.tar.bz2


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- autoconf.spec	12 Jul 2006 05:23:59 -0000	1.28
+++ autoconf.spec	19 Jul 2006 10:19:55 -0000	1.29
@@ -1,11 +1,11 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
-Version:	2.60
-Release:	3.1
+Version:	2.59
+Release:    8
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
-Patch:		autoconf-2.60-intrinsic.patch
+Patch0:     autoconf-2.59-intrinsic.patch
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info
@@ -31,17 +31,10 @@
 
 %prep
 %setup -q -n autoconf-%{version}
-%patch
-
+%patch0 -p1 -b .mod-x
 
 %build
-# Hide these files from the eager find run before configure:
-cp -p config/config{.,-}guess
-cp -p config/config{.,-}sub
 %configure
-# ... and restore them:
-mv config/config{-,.}guess
-mv config/config{-,.}sub
 make
 
 %check
@@ -76,24 +69,6 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.60-3.1
-- rebuild
-
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-3
-- Do not mention rpm macro in a comment, rpm expands it!
-
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-2
-- Second attempt to keep original config.guess and config.sub.
-
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-1
-- Do not allow rpm to replace config.guess and config.sub.
-
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-0.br
-- fix a typo
-
-* Tue Jun 27 2006 Stepan Kasal <skasal at redhat.com> 2.60-0
-- Try Autoconf 2.60
-
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 2.59-8
 - try to link with libX11 instead of libXt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	27 Jun 2006 09:51:17 -0000	1.7
+++ sources	19 Jul 2006 10:19:55 -0000	1.8
@@ -1 +1 @@
-019609c29d0cbd9110c38480304aafc8  autoconf-2.60.tar.bz2
+1ee40f7a676b3cfdc0e3f7cd81551b5f  autoconf-2.59.tar.bz2


--- autoconf-2.60-intrinsic.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:20:49 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.29,1.30
Message-ID: <200607191020.k6JAKn7A003784@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3749

Modified Files:
	autoconf.spec 
Log Message:
bump and rebuild


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- autoconf.spec	19 Jul 2006 10:19:55 -0000	1.29
+++ autoconf.spec	19 Jul 2006 10:20:46 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release:    8
+Release:    9
 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 Jul 19 2006 Karsten Hopp <karsten at redhat.de> 2.59-9
+- rebuild
+
 * Tue May 16 2006 Karsten Hopp <karsten at redhat.de> 2.59-8
 - try to link with libX11 instead of libXt
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:31:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:31:04 -0400
Subject: rpms/xorg-x11-xinit/devel Xclients, 1.1, 1.2 xorg-x11-xinit.spec,
	1.24, 1.25
Message-ID: <200607191031.k6JAV41u006251@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6214

Modified Files:
	Xclients xorg-x11-xinit.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6.fc6
- Added fix to Xclients script, based on patch from bug (#190799)



Index: Xclients
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/Xclients,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xclients	1 Nov 2005 02:00:51 -0000	1.1
+++ Xclients	19 Jul 2006 10:31:02 -0000	1.2
@@ -29,13 +29,11 @@
 # now if we can reach here, either no desktop file was present,
 # or the desktop requested is not installed.
 
-# by default, we run GNOME.
 if [ -n "$GSESSION" ]; then
+    # by default, we run GNOME.
     exec "$GSESSION"
-fi
- 
-# if GNOME isn't installed, try KDE.
-if [ -n "$STARTKDE" ]; then
+elif [ -n "$STARTKDE" ]; then
+    # if GNOME isn't installed, try KDE.
     exec "$STARTKDE"
 fi
 


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-xinit.spec	12 Jul 2006 09:22:30 -0000	1.24
+++ xorg-x11-xinit.spec	19 Jul 2006 10:31:02 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 5.1%{?dist}
+Release: 6%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -96,7 +96,10 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6.fc6
+- Added fix to Xclients script, based on patch from bug (#190799)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.2-5.1.fc6
 - rebuild
 
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-5.fc6



From fedora-cvs-commits at redhat.com  Wed Jul 19 10:31:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 06:31:02 -0400
Subject: rpms/libcap/devel libcap-1.10-useCFLAGSwithCC.patch, NONE,
	1.1 libcap.spec, 1.21, 1.22
Message-ID: <200607191031.k6JAV2r8006226@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6194

Modified Files:
	libcap.spec 
Added Files:
	libcap-1.10-useCFLAGSwithCC.patch 
Log Message:
- add patch to support COPTFLAG (#199365)

libcap-1.10-useCFLAGSwithCC.patch:
 libcap/Makefile |    2 +-
 progs/Makefile  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libcap-1.10-useCFLAGSwithCC.patch ---
--- libcap-1.10/libcap/Makefile.BAD	2006-07-13 20:42:35.000000000 -0400
+++ libcap-1.10/libcap/Makefile	2006-07-13 20:42:53.000000000 -0400
@@ -56,7 +56,7 @@
 #	@sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/  \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
 
 $(MINLIBNAME): $(OBJS)
-	$(CC) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS)
+	$(CC) $(COPTFLAG) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS)
 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
 	ln -sf $(MAJLIBNAME) $(LIBNAME)
 
--- libcap-1.10/progs/Makefile.BAD	2006-07-13 20:48:44.000000000 -0400
+++ libcap-1.10/progs/Makefile	2006-07-13 20:48:54.000000000 -0400
@@ -36,7 +36,7 @@
 all: $(PROGS)
 
 $(PROGS): %: %.o
-	$(CC) $(LDFLAGS) -o $@ $< $(LIBS)
+	$(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS)
 
 %.o: %.c $(INCS)
 	$(CC) $(CFLAGS) -c $< -o $@


Index: libcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libcap/devel/libcap.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libcap.spec	12 Jul 2006 06:46:37 -0000	1.21
+++ libcap.spec	19 Jul 2006 10:30:59 -0000	1.22
@@ -1,6 +1,6 @@
 Name: libcap
 Version: 1.10
-Release: 24.2.1
+Release: 25
 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
@@ -9,6 +9,7 @@
 Patch1: libcap-1.10-userland.patch
 Patch2: libcap-1.10-shared.patch
 Patch3: libcap-1.10-alpha.patch
+Patch4: libcap-1.10-useCFLAGSwithCC.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -40,6 +41,7 @@
 %endif
 %patch1 -p1 -b .userland
 %patch2 -p1 -b .shared
+%patch4 -p1
 
 %build
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} 
@@ -79,6 +81,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Jul 19 2006 Karsten Hopp <karsten at redhat.de> 1.10-25
+- add patch to support COPTFLAG (#199365)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 11:18:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 07:18:38 -0400
Subject: rpms/cups/devel cups-svn5754.patch, NONE, 1.1 cups.spec, 1.228,
	1.229 cups-svn5737.patch, 1.1, NONE
Message-ID: <200607191118.k6JBIcHA015975@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15584

Modified Files:
	cups.spec 
Added Files:
	cups-svn5754.patch 
Removed Files:
	cups-svn5737.patch 
Log Message:
* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-21
- Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.


cups-svn5754.patch:
 CHANGES.txt                                   |  145 +
 Makedefs.in                                   |   10 
 backend/Dependencies                          |   39 
 backend/Makefile                              |   40 
 backend/backend-private.h                     |   73 
 backend/easysw-firewire-design.txt            |   70 
 backend/easysw-firewire-linux.txt             |   35 
 backend/ieee1284.c                            |   77 
 backend/ieee1394-linux.c                      |  877 --------
 backend/ieee1394.c                            |  267 --
 backend/ieee1394.h                            |  103 
 backend/ipp.c                                 |    9 
 backend/parallel.c                            |  231 --
 backend/runloop.c                             |  258 ++
 backend/serial.c                              |  293 +-
 backend/snmp.c                                |   37 
 backend/socket.c                              |  299 --
 backend/test1284.c                            |    9 
 backend/usb-darwin.c                          |    6 
 backend/usb-unix.c                            |  301 --
 backend/usb.c                                 |   25 
 berkeley/lpq.c                                |    6 
 berkeley/lprm.c                               |   35 
 cgi-bin/help-index.c                          |    6 
 config-scripts/cups-compiler.m4               |   66 
 config-scripts/cups-defaults.m4               |   44 
 config-scripts/cups-directories.m4            |    6 
 config-scripts/cups-image.m4                  |   24 
 config-scripts/cups-network.m4                |    6 
 config-scripts/cups-sharedlibs.m4             |   48 
 config-scripts/cups-ssl.m4                    |    5 
 config.h.in                                   |   11 
 configure.in                                  |   11 
 cups-config.in                                |   14 
 cups/Makefile                                 |   10 
 cups/adminutil.c                              |   22 
 cups/dest.c                                   |   55 
 cups/emit.c                                   |   27 
 cups/encode.c                                 |   58 
 cups/http-addrlist.c                          |   20 
 cups/http.c                                   |   35 
 cups/http.h                                   |   14 
 cups/ipp-private.h                            |   17 
 cups/ipp.c                                    |    8 
 cups/language.c                               |   21 
 cups/mark.c                                   |   11 
 cups/testhttp.c                               |   22 
 cups/testipp.c                                |   19 
 cups/testppd.c                                |   57 
 cups/util.c                                   |   36 
 doc/Makefile                                  |   18 
 doc/de/index.html.in                          |  143 +
 doc/help/policies.html                        |  677 ++++++
 doc/help/ref-mailto-conf.html                 |  105 
 doc/help/spec-raster.html                     |   32 
 filter/Makefile                               |   20 
 filter/pstops.c                               |   95 
 filter/raster.c                               |  683 +++---
 filter/raster.h                               |   11 
 filter/rasterbench.c                          |  355 +++
 filter/rastertolabel.c                        |   13 
 locale/Makefile                               |   14 
 locale/cups_de.po                             | 2821 ++++++++++++++++++++++++++
 locale/cups_es.po                             |  482 +---
 locale/cups_ja.po                             |    9 
 man/Makefile                                  |    5 
 man/cupsaddsmb.man.in                         |   21 
 man/cupsd.conf.man.in                         |   10 
 man/lpadmin.man                               |   33 
 man/mailto.conf.man                           |   69 
 notifier/testnotify.c                         |   12 
 packaging/cups.list.in                        |   25 
 packaging/cups.spec.in                        |   23 
 pdftops/PSOutputDev.cxx                       |    2 
 ppd/zebracpl.ppd                              |    8 
 scheduler/Makefile                            |    7 
 scheduler/auth.c                              |    9 
 scheduler/client.c                            |  254 ++
 scheduler/conf.c                              |  189 -
 scheduler/conf.h                              |    5 
 scheduler/cups-polld.c                        |  209 +
 scheduler/dirsvc.c                            |  110 -
 scheduler/filter.c                            |    8 
 scheduler/ipp.c                               |   76 
 scheduler/job.c                               |  124 -
 scheduler/listen.c                            |    8 
 scheduler/main.c                              |    8 
 scheduler/mime.c                              |   19 
 scheduler/printers.c                          |   48 
 scheduler/subscriptions.c                     |  405 +--
 scheduler/subscriptions.h                     |   10 
 scheduler/testmime.c                          |    6 
 systemv/Makefile                              |    6 
 systemv/cancel.c                              |    7 
 systemv/cupsaddsmb.c                          |    8 
 systemv/lpoptions.c                           |   36 
 systemv/lpstat.c                              |   59 
 templates/Makefile                            |   14 
 templates/de/add-class.tmpl                   |   33 
 templates/de/add-printer.tmpl                 |   28 
 templates/de/admin.tmpl                       |   77 
 templates/de/choose-device.tmpl               |   26 
 templates/de/choose-make.tmpl                 |   42 
 templates/de/choose-model.tmpl                |   34 
 templates/de/choose-serial.tmpl               |   47 
 templates/de/choose-uri.tmpl                  |   42 
 templates/de/class-added.tmpl                 |    2 
 templates/de/class-confirm.tmpl               |    7 
 templates/de/class-deleted.tmpl               |    1 
 templates/de/class-jobs-header.tmpl           |    1 
 templates/de/class-modified.tmpl              |    2 
 templates/de/classes-header.tmpl              |    1 
 templates/de/classes.tmpl                     |   54 
 templates/de/edit-config.tmpl.in              |   91 
 templates/de/error-op.tmpl                    |    3 
 templates/de/error.tmpl                       |    3 
 templates/de/header.tmpl.in                   |   63 
 templates/de/help-header.tmpl                 |   46 
 templates/de/help-printable.tmpl              |   11 
 templates/de/job-cancel.tmpl                  |    1 
 templates/de/job-hold.tmpl                    |    1 
 templates/de/job-move.tmpl                    |   22 
 templates/de/job-moved.tmpl                   |    2 
 templates/de/job-release.tmpl                 |    1 
 templates/de/job-restart.tmpl                 |    1 
 templates/de/jobs-header.tmpl                 |   15 
 templates/de/jobs.tmpl                        |   42 
 templates/de/maintenance.tmpl                 |    2 
 templates/de/modify-class.tmpl                |   34 
 templates/de/modify-printer.tmpl              |   29 
 templates/de/option-boolean.tmpl              |    6 
 templates/de/option-conflict.tmpl             |    7 
 templates/de/option-header.tmpl               |    3 
 templates/de/option-pickmany.tmpl             |    6 
 templates/de/option-pickone.tmpl              |    6 
 templates/de/option-trailer.tmpl              |    5 
 templates/de/pager.tmpl                       |    7 
 templates/de/printer-accept.tmpl              |    3 
 templates/de/printer-added.tmpl               |    2 
 templates/de/printer-configured.tmpl          |    2 
 templates/de/printer-confirm.tmpl             |    7 
 templates/de/printer-default.tmpl             |    7 
 templates/de/printer-deleted.tmpl             |    1 
 templates/de/printer-jobs-header.tmpl         |    1 
 templates/de/printer-modified.tmpl            |    2 
 templates/de/printer-purge.tmpl               |    3 
 templates/de/printer-reject.tmpl              |    3 
 templates/de/printer-start.tmpl               |    3 
 templates/de/printer-stop.tmpl                |    3 
 templates/de/printers-header.tmpl             |    1 
 templates/de/printers.tmpl                    |   64 
 templates/de/restart.tmpl                     |    1 
 templates/de/samba-export.tmpl                |   55 
 templates/de/samba-exported.tmpl              |    1 
 templates/de/search.tmpl                      |   13 
 templates/de/set-printer-options-header.tmpl  |    3 
 templates/de/set-printer-options-trailer.tmpl |    1 
 templates/de/test-page.tmpl                   |    2 
 templates/de/trailer.tmpl                     |   21 
 templates/de/users.tmpl                       |   26 
 templates/ja/printers.tmpl                    |    2 
 test/ipptest.c                                |   31 
 162 files changed, 8442 insertions(+), 3849 deletions(-)

--- NEW FILE cups-svn5754.patch ---
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
-    available devices.
-
-    The CUPS 1.1 backend will record any status information in
[...16978 lines suppressed...]
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
--- release-1.2.1/templates/de/set-printer-options-trailer.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/set-printer-options-trailer.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1 @@
+</FORM>
--- release-1.2.1/templates/de/test-page.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/test-page.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,2 @@
+<P>Testseite gesendet; Auftrags ID ist <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
--- release-1.2.1/templates/de/trailer.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/trailer.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,21 @@
+</TD>
+<TD WIDTH="15">&nbsp;</TD>
+</TR>
+<TR CLASS="trailer">
+<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
+
+<P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
+eingetragene Warenzeichen der <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS ist urheberrechtlich gesch??tzt 1997-2006 von Easy Software Products,
+Alle Rechte vorbehalten.</SMALL></P>
+
+</TD>
+
+<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
--- release-1.2.1/templates/de/users.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/users.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,26 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Berechtigte Benutzer f&uuml;r {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Benutzer:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Erlaube diesen Benutzern zu drucken
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Verweigere diesen Benutzern zu drucken
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
--- release-1.2.1/templates/ja/printers.tmpl	2006-07-04 17:35:19.000000000 +0100
+++ cups-1.2.x/templates/ja/printers.tmpl	2006-07-14 11:41:16.000000000 +0100
@@ -12,7 +12,7 @@
 <B>??????:</B> {printer_location}<BR>
 <B>?????????????????????:</B> {printer_make_and_model}<BR>
 <B>?????????????????????:</B> {printer_state=3??????????:{printer_state=4??????????:??????}},
-{printer_is_accepting_jobs=0??????????????????????:???????????????????????????}, {printer_is_shared=0?not:} ?????????
+{printer_is_accepting_jobs=0??????????????????????:???????????????????????????}, {printer_is_shared=0????:}?????????
 {?device_uri=?:<BR><B>???????????? URI:</B> {device_uri}}
 
 <P>
--- release-1.2.1/templates/Makefile	2006-07-04 17:35:22.000000000 +0100
+++ cups-1.2.x/templates/Makefile	2006-06-26 12:45:31.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $"
+# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $"
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
@@ -118,11 +118,13 @@
 # Install files...
 #
 
-install: all
+install: all $(INSTALL_LANGUAGES)
 	$(INSTALL_DIR) -m 755 $(DATADIR)/templates
 	for file in $(FILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
 	done
+
+install-languages:
 	for lang in $(LANGUAGES); do \
 		$(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
 		for file in $(FILES); do \
@@ -137,19 +139,21 @@
 # Uninstall files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
 	for file in $(FILES); do \
 		$(RM) $(DATADIR)/templates/$$file; \
 	done
+	-$(RMDIR) $(DATADIR)/templates
+
+uninstall-languages:
 	for lang in $(LANGUAGES); do \
 		for file in $(FILES); do \
 			$(RM) $(DATADIR)/templates/$$lang/$$file; \
 		done \
 		$(RMDIR) $(DATADIR)/templates/$$lang; \
 	done
-	-$(RMDIR) $(DATADIR)/templates
 
 
 #
-# End of "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $".
+# End of "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $".
 #
--- release-1.2.1/test/ipptest.c	2006-07-04 17:33:09.000000000 +0100
+++ cups-1.2.x/test/ipptest.c	2006-07-18 15:31:56.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $"
+ * "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $"
  *
  *   IPP test command for the Common UNIX Printing System (CUPS).
  *
@@ -122,6 +122,7 @@
   int		status;			/* Status of tests... */
   const char	*uri;			/* URI to use */
   const char	*testfile;		/* Test file to use */
+  int		interval;		/* Test interval */
 
 
  /*
@@ -133,6 +134,7 @@
   uri      = NULL;
   testfile = NULL;
   status   = 0;
+  interval = 0;
 
   for (i = 1; i < argc; i ++)
   {
@@ -140,6 +142,15 @@
     {
       if (!strcmp(argv[i], "-v"))
         Verbosity ++;
+      else if (!strcmp(argv[i], "-i"))
+      {
+        i++;
+
+	if (i >= argc)
+	  usage(NULL);
+	else
+	  interval = atoi(argv[i]);
+      }
       else
         usage(argv[i]);
     }
@@ -174,6 +185,19 @@
     usage(NULL);
 
  /*
+  * Loop if the interval is set...
+  */
+
+  if (interval)
+  {
+    for (;;)
+    {
+      sleep(interval);
+      do_tests(uri, testfile);
+    }
+  }
+
+ /*
   * Exit...
   */
 
@@ -890,12 +914,13 @@
   fputs("Usage: ipptest [options] URL testfile [ ... testfileN ]\n", stderr);
   fputs("Options:\n", stderr);
   fputs("\n", stderr);
-  fputs("-v     Show all attributes in response, even on success.\n", stderr);
+  fputs("-i N    Repeat the last test file once every N seconds.\n", stderr);
+  fputs("-v      Show all attributes in response, even on success.\n", stderr);
 
   exit(1);
 }
 
 
 /*
- * End of "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $".
+ * End of "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $".
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- cups.spec	19 Jul 2006 00:01:44 -0000	1.228
+++ cups.spec	19 Jul 2006 11:18:36 -0000	1.229
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 20 
+Release: 21 
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,7 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5737.patch
+Patch0: cups-svn5754.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -114,7 +114,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5737
+%patch0 -p1 -b .svn5754
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -390,11 +390,14 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.2.1-20
+* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-21
+- Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1:1.2.1-20
 - Require a new version of D-Bus and rebuild
 
 * Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-19
-- Sync with svn5737.
+- Sync with svn5737.  Fixes bug #192015.
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.1-18.1
 - rebuild


--- cups-svn5737.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 11:19:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 07:19:27 -0400
Subject: rpms/apr/devel apr-1.2.7-ac260.patch,NONE,1.1 apr.spec,1.59,1.60
Message-ID: <200607191119.k6JBJRBX016340@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16271

Modified Files:
	apr.spec 
Added Files:
	apr-1.2.7-ac260.patch 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-10
- fix buildconf with autoconf 2.60 (#199067)


apr-1.2.7-ac260.patch:
 apr_common.m4 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE apr-1.2.7-ac260.patch ---

Author: jorton
Date: Wed Jul 19 04:07:31 2006
New Revision: 423435

URL: http://svn.apache.org/viewvc?rev=423435&view=rev
Log:
* build/apr_common.m4 (APR_CONFIG_NICE, APR_PARSE_ARGUMENTS): Fix to
remove assumption that $@ is preserved forever - it never was in any
autoconf release; autoconf 2.60 happens to overwrite it earlier.

--- apr-1.2.7/build/apr_common.m4.ac260
+++ apr-1.2.7/build/apr_common.m4
@@ -64,7 +64,12 @@
     echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> $1
   fi
 
-  for arg in [$]0 "[$]@"; do
+  # Retrieve command-line arguments.
+  eval "set x $[0] $ac_configure_args"
+  shift
+
+  for arg
+  do
     APR_EXPAND_VAR(arg, $arg)
     echo "\"[$]arg\" \\" >> $1
   done
@@ -800,6 +805,10 @@
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
 ac_prev=
+# Retrieve the command-line arguments.  The eval is needed because
+# the arguments are quoted to preserve accuracy.
+eval "set x $ac_configure_args"
+shift
 for ac_option
 do
   # If the previous option needs an argument, assign it.


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- apr.spec	12 Jul 2006 05:12:08 -0000	1.59
+++ apr.spec	19 Jul 2006 11:19:24 -0000	1.60
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.7
-Release: 9.1
+Release: 10
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,6 +18,7 @@
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
+Patch7: apr-1.2.7-ac260.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen, e2fsprogs-devel
 Conflicts: subversion < 0.20.1-2
@@ -49,6 +50,7 @@
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
+%patch7 -p1 -b .ac260
 
 %build
 # regenerate configure script etc.
@@ -128,7 +130,10 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: gcc: command not found
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-10
+- fix buildconf with autoconf 2.60 (#199067)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.7-9.1
 - rebuild
 
 * Mon Jun 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-9



From fedora-cvs-commits at redhat.com  Wed Jul 19 11:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 07:41:37 -0400
Subject: rpms/cups/devel cups-compile.patch, NONE,
	1.1 cups-dest-cache-v2.patch, 1.2, 1.3 cups.spec, 1.229, 1.230
Message-ID: <200607191141.k6JBfbJX022782@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22738

Modified Files:
	cups-dest-cache-v2.patch cups.spec 
Added Files:
	cups-compile.patch 
Log Message:
Fixed build.

cups-compile.patch:
 dest.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE cups-compile.patch ---
--- cups-1.2.1/cups/dest.c.compile	2006-07-19 12:37:51.000000000 +0100
+++ cups-1.2.1/cups/dest.c	2006-07-19 12:38:07.000000000 +0100
@@ -49,6 +49,8 @@
 #include <fcntl.h>
 #include <sys/timeb.h>
 
+#include "ipp-private.h"
+
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */

cups-dest-cache-v2.patch:
 dest.c |  180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 180 insertions(+)

Index: cups-dest-cache-v2.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-dest-cache-v2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-dest-cache-v2.patch	17 Mar 2006 12:10:57 -0000	1.2
+++ cups-dest-cache-v2.patch	19 Jul 2006 11:41:35 -0000	1.3
@@ -120,7 +120,7 @@
 +  char          buf[4096];              /* string buffer */
 +  char          tmpfn[4096];            /* temporary name to write new cache to */
 +  int c;
-+  sprintf(tmpfn,"%s-%l",cache,random());
++  sprintf(tmpfn,"%s-%ld",cache,random());
 +
 +  if ((fd = open(cache,O_WRONLY|O_CREAT|O_TRUNC)) > 0) 
 +    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- cups.spec	19 Jul 2006 11:18:36 -0000	1.229
+++ cups.spec	19 Jul 2006 11:41:35 -0000	1.230
@@ -28,6 +28,7 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
+Patch8: cups-compile.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch16: cups-no-export-ssllibs.patch
@@ -122,6 +123,7 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
+%patch8 -p1 -b .compile
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch16 -p1 -b .no-export-ssllibs



From fedora-cvs-commits at redhat.com  Wed Jul 19 11:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 07:52:01 -0400
Subject: rpms/createrepo/devel createrepo-0.4.4-relative.patch, NONE,
	1.1 createrepo.spec, 1.17, 1.18
Message-ID: <200607191152.k6JBq10P009019@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/createrepo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8984

Modified Files:
	createrepo.spec 
Added Files:
	createrepo-0.4.4-relative.patch 
Log Message:
Fixup relative paths (#199228)

createrepo-0.4.4-relative.patch:
 genpkgmetadata.py |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE createrepo-0.4.4-relative.patch ---
--- createrepo-0.4.4/genpkgmetadata.py.relative	2006-07-19 07:47:31.000000000 -0400
+++ createrepo-0.4.4/genpkgmetadata.py	2006-07-19 07:47:50.000000000 -0400
@@ -490,6 +490,8 @@
     cmds['olddir'] = '.olddata'
     cmds['update-info-dir'] = 'update-info'
 
+    # Fixup first directory
+    directories[0] = directory
     return cmds, directories
 
 def main(args):


Index: createrepo.spec
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/createrepo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- createrepo.spec	12 Jul 2006 04:54:00 -0000	1.17
+++ createrepo.spec	19 Jul 2006 11:51:59 -0000	1.18
@@ -1,10 +1,11 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.4.4
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
+Patch0: createrepo-0.4.4-relative.patch
 URL: http://linux.duke.edu/projects/metadata/
 BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildArchitectures: noarch
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -34,6 +36,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 19 2006 Paul Nasrat <pnasrat at redhat.com> - 0.4.4-2
+- Fixup relative paths (#199228)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.4.4-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:15:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:15:51 -0400
Subject: rpms/cups/devel cups.spec,1.230,1.231
Message-ID: <200607191215.k6JCFpwO018280@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17622

Modified Files:
	cups.spec 
Log Message:
Include de translation


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- cups.spec	19 Jul 2006 11:41:35 -0000	1.230
+++ cups.spec	19 Jul 2006 12:15:49 -0000	1.231
@@ -323,10 +323,11 @@
 %dir %{_docdir}/cups-%{version}
 %{_docdir}/cups-%{version}/favicon.ico
 %{_docdir}/cups-%{version}/images
-%{_docdir}/cups-%{version}/ja
+%{_docdir}/cups-%{version}/de
 %{_docdir}/cups-%{version}/es
-%{_docdir}/cups-%{version}/sv
+%{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/pl
+%{_docdir}/cups-%{version}/sv
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:25:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:25:49 -0400
Subject: rpms/apr-util/devel apr-util-1.2.7-ac260.patch, NONE,
	1.1 apr-util.spec, 1.27, 1.28
Message-ID: <200607191225.k6JCPnYi001894@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1870

Modified Files:
	apr-util.spec 
Added Files:
	apr-util-1.2.7-ac260.patch 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-3
- fix buildconf with autoconf 2.60


apr-util-1.2.7-ac260.patch:
 apr_common.m4 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE apr-util-1.2.7-ac260.patch ---

Author: jorton
Date: Wed Jul 19 04:07:31 2006
New Revision: 423435

URL: http://svn.apache.org/viewvc?rev=423435&view=rev
Log:
* build/apr_common.m4 (APR_CONFIG_NICE, APR_PARSE_ARGUMENTS): Fix to
remove assumption that $@ is preserved forever - it never was in any
autoconf release; autoconf 2.60 happens to overwrite it earlier.

--- apr-1.2.7/build/apr_common.m4.ac260
+++ apr-1.2.7/build/apr_common.m4
@@ -64,7 +64,12 @@
     echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> $1
   fi
 
-  for arg in [$]0 "[$]@"; do
+  # Retrieve command-line arguments.
+  eval "set x $[0] $ac_configure_args"
+  shift
+
+  for arg
+  do
     APR_EXPAND_VAR(arg, $arg)
     echo "\"[$]arg\" \\" >> $1
   done
@@ -800,6 +805,10 @@
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
 ac_prev=
+# Retrieve the command-line arguments.  The eval is needed because
+# the arguments are quoted to preserve accuracy.
+eval "set x $ac_configure_args"
+shift
 for ac_option
 do
   # If the previous option needs an argument, assign it.


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apr-util.spec	12 Jul 2006 05:12:20 -0000	1.27
+++ apr-util.spec	19 Jul 2006 12:25:46 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.7
-Release: 2.1
+Release: 3
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -12,6 +12,7 @@
 Patch0: apr-util-1.2.2-exports.patch
 Patch1: apr-util-1.2.6-ldap.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
+Patch3: apr-util-1.2.7-ac260.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
@@ -43,6 +44,7 @@
 %patch0 -p1 -b .exports
 %patch1 -p1 -b .ldap
 %patch2 -p1 -b .pkgconf
+%patch3 -p1 -b .ac260
 
 %build
 autoheader && autoconf
@@ -106,6 +108,9 @@
 %doc --parents html
 
 %changelog
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-3
+- fix buildconf with autoconf 2.60
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.7-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:28:48 -0400
Subject: rpms/httpd/devel httpd-2.2.2-ac260.patch, NONE, 1.1 .cvsignore, 1.15,
	1.16 httpd-2.1.10-apxs.patch, 1.3, 1.4 httpd.spec, 1.94, 1.95
Message-ID: <200607191228.k6JCSmuv003103@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3058

Modified Files:
	.cvsignore httpd-2.1.10-apxs.patch httpd.spec 
Added Files:
	httpd-2.2.2-ac260.patch 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 2.2.2-7
- fix "apxs -g"-generated Makefile
- fix buildconf with autoconf 2.60


httpd-2.2.2-ac260.patch:
 apr_common.m4 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE httpd-2.2.2-ac260.patch ---

Author: jorton
Date: Wed Jul 19 04:07:31 2006
New Revision: 423435

URL: http://svn.apache.org/viewvc?rev=423435&view=rev
Log:
* build/apr_common.m4 (APR_CONFIG_NICE, APR_PARSE_ARGUMENTS): Fix to
remove assumption that $@ is preserved forever - it never was in any
autoconf release; autoconf 2.60 happens to overwrite it earlier.

--- apr-1.2.7/build/apr_common.m4.ac260
+++ apr-1.2.7/build/apr_common.m4
@@ -64,7 +64,12 @@
     echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> $1
   fi
 
-  for arg in [$]0 "[$]@"; do
+  # Retrieve command-line arguments.
+  eval "set x $[0] $ac_configure_args"
+  shift
+
+  for arg
+  do
     APR_EXPAND_VAR(arg, $arg)
     echo "\"[$]arg\" \\" >> $1
   done
@@ -800,6 +805,10 @@
 dnl set ups.
 AC_DEFUN(APR_PARSE_ARGUMENTS,[
 ac_prev=
+# Retrieve the command-line arguments.  The eval is needed because
+# the arguments are quoted to preserve accuracy.
+eval "set x $ac_configure_args"
+shift
 for ac_option
 do
   # If the previous option needs an argument, assign it.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	3 May 2006 14:14:28 -0000	1.15
+++ .cvsignore	19 Jul 2006 12:28:45 -0000	1.16
@@ -1 +1,4 @@
 httpd-2.2.2.tar.gz
+*.rpm
+x86_64
+clog

httpd-2.1.10-apxs.patch:
 apxs.in |   51 +++++++++++++++++----------------------------------
 1 files changed, 17 insertions(+), 34 deletions(-)

Index: httpd-2.1.10-apxs.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.1.10-apxs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd-2.1.10-apxs.patch	7 Jun 2006 10:40:34 -0000	1.3
+++ httpd-2.1.10-apxs.patch	19 Jul 2006 12:28:45 -0000	1.4
@@ -88,7 +88,7 @@
 -top_builddir=%PREFIX%
 -include %INSTALLBUILDDIR%/special.mk
 +top_builddir=%LIBDIR%/httpd
-+include %LIBDIR%/httpd/special.mk
++include %LIBDIR%/httpd/build/special.mk
  
  #   the used tools
  APXS=apxs


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- httpd.spec	12 Jul 2006 06:23:27 -0000	1.94
+++ httpd.spec	19 Jul 2006 12:28:45 -0000	1.95
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 5.1
+Release: 7
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -31,6 +31,7 @@
 Patch3: httpd-2.0.45-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
+Patch6: httpd-2.2.2-ac260.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
 Patch21: httpd-2.0.40-xfsz.patch
@@ -109,6 +110,7 @@
 %patch3 -p1 -b .deplibs
 %patch4 -p1 -b .disablemods
 %patch5 -p1 -b .layout
+%patch6 -p1 -b .ac260
 
 %patch21 -p0 -b .xfsz
 %patch22 -p1 -b .pod
@@ -479,7 +481,11 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.2-5.1
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 2.2.2-7
+- fix "apxs -g"-generated Makefile
+- fix buildconf with autoconf 2.60
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-5.1
 - rebuild
 
 * Wed Jun  7 2006 Joe Orton <jorton at redhat.com> 2.2.2-5



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:34:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:34:50 -0400
Subject: rpms/traceroute/devel traceroute-1.0.4-trace_stop.patch, NONE,
	1.1 traceroute.spec, 1.23, 1.24
Message-ID: <200607191234.k6JCYos1004154@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4122

Modified Files:
	traceroute.spec 
Added Files:
	traceroute-1.0.4-trace_stop.patch 
Log Message:
- traceroute can not continue past destination host (#199342)

traceroute-1.0.4-trace_stop.patch:
 traceroute.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE traceroute-1.0.4-trace_stop.patch ---
--- traceroute-1.0.4/traceroute.c.orig	2006-07-19 01:46:17.000000000 +0200
+++ traceroute-1.0.4/traceroute.c	2006-07-19 01:52:05.000000000 +0200
@@ -620,6 +620,7 @@
 	if (opt_debug)
 		fprintf(stderr, "received hop %u response\n", hop->ttl);
 
+	if (!sameaddr (&p->responder, &dst_addr)) {
 	/* Handle error codes */
 	errstring = errbuf;
 	if (p->ee.ee_origin == SO_EE_ORIGIN_ICMP) {
@@ -690,7 +691,7 @@
 				break;
 
 			case ICMP6_DST_UNREACH_NOPORT:
-				/* we've reached the destintation host */
+				/* we've reached the destination host */
 				errstring = 0;
 				break;
 
@@ -701,6 +702,8 @@
 			break;
 		}
 	}
+	} else // we've reached the destination host
+	  errstring = 0;
 
 	if (errstring == errbuf) {
 		snprintf(errbuf, sizeof(errbuf), "icmp-%d-%d",


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- traceroute.spec	12 Jul 2006 08:32:14 -0000	1.23
+++ traceroute.spec	19 Jul 2006 12:34:47 -0000	1.24
@@ -1,12 +1,13 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.0.4
-Release: 1.2.1
+Release: 2
 Epoch: 2
 License: GPL
 Group: Applications/Internet
 Source: ftp://ftp.lst.de/pub/people/okir/traceroute/%{name}-%{version}.tar.bz2
 Patch0: traceroute-1.0.4-compat.patch
+Patch1: traceroute-1.0.4-trace_stop.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .compat
+%patch1 -p1 -b .trace_stop
 
 %build
 %ifarch s390 s390x
@@ -57,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 19 2006 Radek Vokal <rvokal at redhat.com> - 2:1.0.4-2
+- traceroute can not continue past destination host (#199342)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:45:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:45:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2418,
	1.2419 linux-2.6-utrace.patch, 1.5, 1.6
Message-ID: <200607191245.k6JCjqDB016390@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15146

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
New version of utrace patch, might fix #198780.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2418
retrieving revision 1.2419
diff -u -r1.2418 -r1.2419
--- kernel-2.6.spec	19 Jul 2006 07:57:40 -0000	1.2418
+++ kernel-2.6.spec	19 Jul 2006 12:45:49 -0000	1.2419
@@ -1674,6 +1674,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Roland McGrath <roland at redhat.com>
+- New version of utrace patch, might fix #198780.
+
 * Wed Jul 19 2006 Jon Masters <jcm at redhat.com>
 - Workaround upstream "make prepare" bug by adding an additional prepare stage.
 - Fix kabideps

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   18 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1470 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1477 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6852 insertions(+), 3190 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-utrace.patch	15 Jul 2006 07:25:06 -0000	1.5
+++ linux-2.6-utrace.patch	19 Jul 2006 12:45:49 -0000	1.6
@@ -64,20 +64,20 @@
  include/asm-x86_64/tracehook.h          |  105 ++
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   82 +-
- include/linux/sched.h                   |   26 -
+ include/linux/sched.h                   |   25 -
  include/linux/tracehook.h               |  568 ++++++++++++
  include/linux/utrace.h                  |  459 ++++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  251 +----
  kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1465 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1470 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1475 +++++++++++++++++++++++++++++++
+ kernel/utrace.c                         | 1477 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6835 insertions(+), 3191 deletions(-)
+ 79 files changed, 6847 insertions(+), 3185 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -682,7 +682,7 @@
 +#endif
 --- linux-2.6/include/linux/sched.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/sched.h
-@@ -721,7 +721,6 @@ struct task_struct {
+@@ -769,7 +769,6 @@ struct task_struct {
  	struct thread_info *thread_info;
  	atomic_t usage;
  	unsigned long flags;	/* per process flags, defined below */
@@ -690,7 +690,7 @@
  
  	int lock_depth;		/* BKL lock depth */
  
-@@ -752,12 +751,6 @@ struct task_struct {
+@@ -800,12 +799,6 @@ struct task_struct {
  #endif
  
  	struct list_head tasks;
@@ -703,7 +703,7 @@
  
  	struct mm_struct *mm, *active_mm;
  
-@@ -772,15 +765,13 @@ struct task_struct {
+@@ -820,15 +813,13 @@ struct task_struct {
  	pid_t pid;
  	pid_t tgid;
  	/* 
@@ -721,7 +721,7 @@
  	 */
  	struct list_head children;	/* list of my children */
  	struct list_head sibling;	/* linkage in my parent's children list */
-@@ -852,6 +843,11 @@ struct task_struct {
+@@ -900,6 +891,11 @@ struct task_struct {
  	struct audit_context *audit_context;
  	seccomp_t seccomp;
  
@@ -733,7 +733,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -905,8 +901,6 @@ struct task_struct {
+@@ -953,8 +949,6 @@ struct task_struct {
  
  	struct io_context *io_context;
  
@@ -742,7 +742,7 @@
  /*
   * current io wait handle: wait queue entry to use for io waits
   * If this thread is processing aio, this points at the waitqueue
-@@ -941,6 +935,10 @@ struct task_struct {
+@@ -989,6 +983,10 @@ struct task_struct {
  	atomic_t fs_excl;	/* holding fs exclusive resources */
  	struct rcu_head rcu;
  
@@ -753,15 +753,7 @@
  	/*
  	 * cache last used pipe for splice
  	 */
-@@ -1005,6 +1003,7 @@ static inline void put_task_struct(struc
- #define PF_SPREAD_SLAB	0x02000000	/* Spread some slab caches over cpuset */
- #define PF_MEMPOLICY	0x10000000	/* Non-default NUMA mempolicy */
- #define PF_MUTEX_TESTER	0x20000000	/* Thread belongs to the rt mutex tester */
-+#define	PF_REAPED	0x40000000	/* release_task started */
- 
- /*
-  * Only the _current_ task can read/write to tsk->flags, but other
-@@ -1175,6 +1174,7 @@ extern int kill_pg_info(int, struct sigi
+@@ -1227,6 +1225,7 @@ extern int kill_pg_info(int, struct sigi
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern int kill_proc_info_as_uid(int, struct siginfo *, pid_t, uid_t, uid_t, u32);
  extern void do_notify_parent(struct task_struct *, int);
@@ -1548,7 +1540,6 @@
 +static inline void tracehook_release_task(struct task_struct *p)
 +{
 +#ifdef CONFIG_UTRACE
-+	p->flags |= PF_REAPED;
 +	smp_mb();
 +	if (p->utrace != NULL)
 +		utrace_release_task(p);
@@ -1792,6 +1783,7 @@
 +static inline void tracehook_report_death(struct task_struct *tsk)
 +{
 +#ifdef CONFIG_UTRACE
++	smp_mb();
 +	if (tsk->utrace_flags & (UTRACE_EVENT(DEATH) | UTRACE_ACTION_QUIESCE))
 +		utrace_report_death(tsk);
 +#endif
@@ -2375,7 +2367,7 @@
  #include <linux/errno.h>
  #include <linux/sched.h>
  #include <linux/security.h>
-@@ -1393,7 +1393,7 @@ static int selinux_ptrace(struct task_st
+@@ -1397,7 +1397,7 @@ static int selinux_ptrace(struct task_st
  
  	rc = task_has_perm(parent, child, PROCESS__PTRACE);
  	/* Save the SID of the tracing process for later use in apply_creds. */
@@ -2384,7 +2376,7 @@
  		csec->ptrace_sid = psec->sid;
  	return rc;
  }
-@@ -4381,7 +4381,7 @@ static int selinux_setprocattr(struct ta
+@@ -4385,7 +4385,7 @@ static int selinux_setprocattr(struct ta
  		/* Check for ptracing, and update the task SID if ok.
  		   Otherwise, leave SID unchanged and fail. */
  		task_lock(p);
@@ -2404,7 +2396,7 @@
  #include <linux/mount.h>
  #include <linux/audit.h>
  #include <linux/profile.h>
-@@ -902,8 +902,7 @@ static inline void copy_flags(unsigned l
+@@ -907,8 +907,7 @@ static inline void copy_flags(unsigned l
  
  	new_flags &= ~(PF_SUPERPRIV | PF_NOFREEZE);
  	new_flags |= PF_FORKNOEXEC;
@@ -2414,7 +2406,7 @@
  	p->flags = new_flags;
  }
  
-@@ -1011,6 +1010,9 @@ static struct task_struct *copy_process(
+@@ -1017,6 +1016,9 @@ static struct task_struct *copy_process(
  	INIT_LIST_HEAD(&p->sibling);
  	p->vfork_done = NULL;
  	spin_lock_init(&p->alloc_lock);
@@ -2424,7 +2416,7 @@
  
  	clear_tsk_thread_flag(p, TIF_SIGPENDING);
  	init_sigpending(&p->pending);
-@@ -1146,8 +1148,6 @@ static struct task_struct *copy_process(
+@@ -1152,8 +1154,6 @@ static struct task_struct *copy_process(
  	 */
  	p->group_leader = p;
  	INIT_LIST_HEAD(&p->thread_group);
@@ -2433,7 +2425,7 @@
  
  	/* Perform scheduler related setup. Assign this task to a CPU. */
  	sched_fork(p, clone_flags);
-@@ -1171,10 +1171,9 @@ static struct task_struct *copy_process(
+@@ -1177,10 +1177,9 @@ static struct task_struct *copy_process(
  
  	/* CLONE_PARENT re-uses the old parent */
  	if (clone_flags & (CLONE_PARENT|CLONE_THREAD))
@@ -2446,7 +2438,7 @@
  
  	spin_lock(&current->sighand->siglock);
  
-@@ -1221,8 +1220,7 @@ static struct task_struct *copy_process(
+@@ -1227,8 +1226,7 @@ static struct task_struct *copy_process(
  
  	if (likely(p->pid)) {
  		add_parent(p);
@@ -2456,7 +2448,7 @@
  
  		if (thread_group_leader(p)) {
  			p->signal->tty = current->signal->tty;
-@@ -1305,22 +1303,6 @@ struct task_struct * __devinit fork_idle
+@@ -1311,22 +1309,6 @@ struct task_struct * __devinit fork_idle
  	return task;
  }
  
@@ -2479,7 +2471,7 @@
  /*
   *  Ok, this is the main fork-routine.
   *
-@@ -1335,18 +1317,12 @@ long do_fork(unsigned long clone_flags,
+@@ -1341,18 +1323,12 @@ long do_fork(unsigned long clone_flags,
  	      int __user *child_tidptr)
  {
  	struct task_struct *p;
@@ -2498,7 +2490,7 @@
  
  	p = copy_process(clone_flags, stack_start, regs, stack_size, parent_tidptr, child_tidptr, nr);
  	/*
-@@ -1361,28 +1337,26 @@ long do_fork(unsigned long clone_flags,
+@@ -1367,28 +1343,26 @@ long do_fork(unsigned long clone_flags,
  			init_completion(&vfork);
  		}
  
@@ -2876,7 +2868,7 @@
  EXPORT_SYMBOL(sigprocmask);
 --- linux-2.6/kernel/utrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,1475 @@
+@@ -0,0 +1,1477 @@
 +#include <linux/utrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/err.h>
@@ -2950,15 +2942,16 @@
 +		/*
 +		 * The task_lock protects us against another thread doing
 +		 * the same thing.  We might still be racing against
-+		 * tracehook_release_task.  It sets PF_REAPED and then
-+		 * checks ->utrace with an smp_mb() in between.  If
-+		 * PF_REAPED is set, then release_task might have checked
-+		 * ->utrace already and saw it NULL; we can't attach.  If
-+		 * we see PF_REAPED not yet set after our barrier, then we
-+		 * know release_task will see our target->utrace pointer.
++		 * tracehook_release_task.  It's called with ->exit_state
++		 * set to EXIT_DEAD and then checks ->utrace with an
++		 * smp_mb() in between.  If EXIT_DEAD is set, then
++		 * release_task might have checked ->utrace already and saw
++		 * it NULL; we can't attach.  If we see EXIT_DEAD not yet
++		 * set after our barrier, then we know release_task will
++		 * see our target->utrace pointer.
 +		 */
 +		smp_mb();
-+		if (target->flags & PF_REAPED) {
++		if (target->exit_state == EXIT_DEAD) {
 +			/*
 +			 * The target has already been through release_task.
 +			 */
@@ -3149,9 +3142,9 @@
 +		if (unlikely(utrace == NULL)) /* Race condition.  */
 +			goto restart;
 +	}
-+	else if (unlikely(target->flags & PF_REAPED)) {
++	else if (unlikely(target->exit_state == EXIT_DEAD)) {
 +		/*
-+		 * The target has already been through release_task.
++		 * The target has already been reaped.
 +		 */
 +		rcu_read_unlock();
 +		return ERR_PTR(-ESRCH);
@@ -3335,11 +3328,12 @@
 +	rcu_read_lock();
 +	utrace = rcu_dereference(target->utrace);
 +	smp_rmb();
-+	if (unlikely(target->flags & PF_REAPED)) {
++	if (unlikely(target->exit_state == EXIT_DEAD)) {
 +		/*
-+		 * Called after utrace_release_task has started.  A call to
-+		 * this engine's report_reap callback might already be in
-+		 * progress or engine might even have been freed already.
++		 * Called after utrace_release_task might have started.
++		 * A call to this engine's report_reap callback might
++		 * already be in progress or engine might even have been
++		 * freed already.
 +		 */
 +		rcu_read_unlock();
 +		return;
@@ -3415,9 +3409,9 @@
 +	rcu_read_lock();
 +	utrace = rcu_dereference(target->utrace);
 +	smp_rmb();
-+	if (unlikely(target->flags & PF_REAPED)) {
++	if (unlikely(target->exit_state == EXIT_DEAD)) {
 +		/*
-+		 * Race with utrace_release_task.
++		 * Race with reaping.
 +		 */
 +		rcu_read_unlock();
 +		return;
@@ -4362,7 +4356,7 @@
  #include <linux/profile.h>
  #include <linux/mount.h>
  #include <linux/proc_fs.h>
-@@ -137,10 +138,10 @@ void release_task(struct task_struct * p
+@@ -139,10 +140,10 @@ void release_task(struct task_struct * p
  	struct task_struct *leader;
  	int zap_leader;
  repeat:
@@ -4375,7 +4369,7 @@
  	__exit_signal(p);
  
  	/*
-@@ -217,10 +218,10 @@ static int will_become_orphaned_pgrp(int
+@@ -219,10 +220,10 @@ static int will_become_orphaned_pgrp(int
  	do_each_task_pid(pgrp, PIDTYPE_PGID, p) {
  		if (p == ignored_task
  				|| p->exit_state
@@ -4389,7 +4383,7 @@
  			ret = 0;
  			break;
  		}
-@@ -248,16 +249,6 @@ static int has_stopped_jobs(int pgrp)
+@@ -250,16 +251,6 @@ static int has_stopped_jobs(int pgrp)
  		if (p->state != TASK_STOPPED)
  			continue;
  
@@ -4406,7 +4400,7 @@
  		retval = 1;
  		break;
  	} while_each_task_pid(pgrp, PIDTYPE_PGID, p);
-@@ -280,11 +271,9 @@ static void reparent_to_init(void)
+@@ -282,11 +273,9 @@ static void reparent_to_init(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -4418,7 +4412,7 @@
  	add_parent(current);
  
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
-@@ -590,11 +579,11 @@ choose_new_parent(struct task_struct *p,
+@@ -592,11 +581,11 @@ choose_new_parent(struct task_struct *p,
  	 * the parent is not a zombie.
  	 */
  	BUG_ON(p == reaper || reaper->exit_state);
@@ -4432,7 +4426,7 @@
  {
  	/* We don't want people slaying init.  */
  	if (p->exit_signal != -1)
-@@ -605,35 +594,14 @@ reparent_thread(struct task_struct *p, s
+@@ -607,35 +596,14 @@ reparent_thread(struct task_struct *p, s
  		group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);
  
  	/* Move the child from its dying parent to the new one.  */
@@ -4475,7 +4469,7 @@
  
  	/*
  	 * process group orphan check
-@@ -659,7 +627,7 @@ reparent_thread(struct task_struct *p, s
+@@ -661,7 +629,7 @@ reparent_thread(struct task_struct *p, s
   * the global child reaper process (ie "init")
   */
  static void
@@ -4484,7 +4478,7 @@
  {
  	struct task_struct *p, *reaper = father;
  	struct list_head *_p, *_n;
-@@ -672,48 +640,10 @@ forget_original_parent(struct task_struc
+@@ -674,48 +642,10 @@ forget_original_parent(struct task_struc
  		}
  	} while (reaper->exit_state);
  
@@ -4534,7 +4528,7 @@
  	}
  }
  
-@@ -725,7 +655,7 @@ static void exit_notify(struct task_stru
+@@ -727,7 +657,7 @@ static void exit_notify(struct task_stru
  {
  	int state;
  	struct task_struct *t;
@@ -4543,7 +4537,7 @@
  
  	if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT)
  	    && !thread_group_empty(tsk)) {
-@@ -761,10 +691,8 @@ static void exit_notify(struct task_stru
+@@ -763,10 +693,8 @@ static void exit_notify(struct task_stru
  	 *	jobs, send them a SIGHUP and then a SIGCONT.  (POSIX 3.2.2.2)
  	 */
  
@@ -4555,7 +4549,7 @@
  
  	/*
  	 * Check to see if any process groups have become orphaned
-@@ -776,7 +704,7 @@ static void exit_notify(struct task_stru
+@@ -778,7 +706,7 @@ static void exit_notify(struct task_stru
  	 * is about to become orphaned.
  	 */
  	 
@@ -4564,7 +4558,7 @@
  	
  	if ((process_group(t) != process_group(tsk)) &&
  	    (t->signal->session == tsk->signal->session) &&
-@@ -808,32 +736,18 @@ static void exit_notify(struct task_stru
+@@ -810,32 +738,18 @@ static void exit_notify(struct task_stru
  	    && !capable(CAP_KILL))
  		tsk->exit_signal = SIGCHLD;
  
@@ -4602,7 +4596,7 @@
  
  	/* If the process is dead, release it - nobody will wait for it */
  	if (state == EXIT_DEAD)
-@@ -856,10 +770,7 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -860,10 +774,7 @@ fastcall NORET_TYPE void do_exit(long co
  	if (unlikely(tsk == child_reaper))
  		panic("Attempted to kill init!");
  
@@ -4614,7 +4608,7 @@
  
  	/*
  	 * We're taking recursive faults here in do_exit. Safest is to just
-@@ -876,6 +787,8 @@ fastcall NORET_TYPE void do_exit(long co
+@@ -880,6 +791,8 @@ fastcall NORET_TYPE void do_exit(long co
  
  	tsk->flags |= PF_EXITING;
  
@@ -4623,7 +4617,7 @@
  	if (unlikely(in_atomic()))
  		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
  				current->comm, current->pid,
-@@ -1026,10 +939,9 @@ static int eligible_child(pid_t pid, int
+@@ -1036,10 +949,9 @@ static int eligible_child(pid_t pid, int
  	}
  
  	/*
@@ -4636,7 +4630,7 @@
  		return 0;
  
  	/* Wait for all children (clone and not) if __WALL is set;
-@@ -1100,7 +1012,7 @@ static int wait_task_zombie(struct task_
+@@ -1110,7 +1022,7 @@ static int wait_task_zombie(struct task_
  
  		if (unlikely(p->exit_state != EXIT_ZOMBIE))
  			return 0;
@@ -4645,7 +4639,7 @@
  			return 0;
  		get_task_struct(p);
  		read_unlock(&tasklist_lock);
-@@ -1124,15 +1036,9 @@ static int wait_task_zombie(struct task_
+@@ -1134,15 +1046,9 @@ static int wait_task_zombie(struct task_
  		BUG_ON(state != EXIT_DEAD);
  		return 0;
  	}
@@ -4663,7 +4657,7 @@
  		struct signal_struct *psig;
  		struct signal_struct *sig;
  
-@@ -1214,28 +1120,8 @@ static int wait_task_zombie(struct task_
+@@ -1224,28 +1130,8 @@ static int wait_task_zombie(struct task_
  		return retval;
  	}
  	retval = p->pid;
@@ -4694,7 +4688,7 @@
  	BUG_ON(!retval);
  	return retval;
  }
-@@ -1254,7 +1140,7 @@ static int wait_task_stopped(struct task
+@@ -1264,7 +1150,7 @@ static int wait_task_stopped(struct task
  
  	if (!p->exit_code)
  		return 0;
@@ -4703,7 +4697,7 @@
  	    p->signal && p->signal->group_stop_count > 0)
  		/*
  		 * A group stop is in progress and this is the group leader.
-@@ -1275,14 +1161,13 @@ static int wait_task_stopped(struct task
+@@ -1285,14 +1171,13 @@ static int wait_task_stopped(struct task
  	if (unlikely(noreap)) {
  		pid_t pid = p->pid;
  		uid_t uid = p->uid;
@@ -4720,7 +4714,7 @@
  					   infop, ru);
  	}
  
-@@ -1338,9 +1223,7 @@ bail_ref:
+@@ -1348,9 +1233,7 @@ bail_ref:
  	if (!retval && infop)
  		retval = put_user(0, &infop->si_errno);
  	if (!retval && infop)
@@ -4731,7 +4725,7 @@
  	if (!retval && infop)
  		retval = put_user(exit_code, &infop->si_status);
  	if (!retval && infop)
-@@ -1408,22 +1291,6 @@ static int wait_task_continued(struct ta
+@@ -1418,22 +1301,6 @@ static int wait_task_continued(struct ta
  }
  
  
@@ -4754,7 +4748,7 @@
  static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
  		    int __user *stat_addr, struct rusage __user *ru)
  {
-@@ -1455,26 +1322,17 @@ repeat:
+@@ -1465,26 +1332,17 @@ repeat:
  
  			switch (p->state) {
  			case TASK_TRACED:
@@ -4785,7 +4779,7 @@
  					continue;
  				retval = wait_task_stopped(p, ret == 2,
  							   (options & WNOWAIT),
-@@ -1499,6 +1357,10 @@ repeat:
+@@ -1509,6 +1367,10 @@ repeat:
  						goto check_continued;
  					if (!likely(options & WEXITED))
  						continue;
@@ -4796,7 +4790,7 @@
  					retval = wait_task_zombie(
  						p, (options & WNOWAIT),
  						infop, stat_addr, ru);
-@@ -1515,6 +1377,8 @@ check_continued:
+@@ -1525,6 +1387,8 @@ check_continued:
  				flag = 1;
  				if (!unlikely(options & WCONTINUED))
  					continue;
@@ -4805,7 +4799,7 @@
  				retval = wait_task_continued(
  					p, (options & WNOWAIT),
  					infop, stat_addr, ru);
-@@ -1523,14 +1387,13 @@ check_continued:
+@@ -1533,14 +1397,13 @@ check_continued:
  				break;
  			}
  		}
@@ -4827,7 +4821,7 @@
  			}
  		}
  		if (options & __WNOTHREAD)
-@@ -1556,7 +1419,7 @@ end:
+@@ -1566,7 +1429,7 @@ end:
  	remove_wait_queue(&current->signal->wait_chldexit,&wait);
  	if (infop) {
  		if (retval > 0)
@@ -4849,7 +4843,7 @@
  			goto out;
 --- linux-2.6/kernel/timer.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/timer.c
-@@ -1306,7 +1306,7 @@ asmlinkage long sys_getpid(void)
+@@ -1324,7 +1324,7 @@ asmlinkage long sys_getpid(void)
  }
  
  /*
@@ -4858,7 +4852,7 @@
   * change from under us. However, rather than getting any lock
   * we can use an optimistic algorithm: get the parent
   * pid, and go back and check that the parent is still
-@@ -1327,7 +1327,7 @@ asmlinkage long sys_getppid(void)
+@@ -1345,7 +1345,7 @@ asmlinkage long sys_getppid(void)
  	struct task_struct *me = current;
  	struct task_struct *parent;
  
@@ -4867,7 +4861,7 @@
  	for (;;) {
  		pid = parent->tgid;
  #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-@@ -1339,7 +1339,7 @@ asmlinkage long sys_getppid(void)
+@@ -1357,7 +1357,7 @@ asmlinkage long sys_getppid(void)
  		 * parent pointer:
  		 */
  		smp_rmb();
@@ -5078,7 +5072,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1194 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1211 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5111,29 +5105,6 @@
 -		len -= retval;			
 -	}
 -	return copied;
--}
--
--int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len)
--{
--	int copied = 0;
--
--	while (len > 0) {
--		char buf[128];
--		int this_len, retval;
--
--		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
--		if (copy_from_user(buf, src, this_len))
--			return -EFAULT;
--		retval = access_process_vm(tsk, dst, buf, this_len, 1);
--		if (!retval) {
--			if (copied)
--				break;
--			return -EIO;
--		}
--		copied += retval;
--		src += retval;
--		dst += retval;
--		len -= retval;			
 +#else
 +
 +struct ptrace_state
@@ -5177,16 +5148,21 @@
 +	task_lock(state->parent);
 +	list_add_rcu(&state->entry, &state->parent->ptracees);
 +	task_unlock(state->parent);
-+}
-+
+ }
+ 
+-int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len)
 +static void
 +ptrace_state_unlink(struct ptrace_state *state)
-+{
+ {
+-	int copied = 0;
 +	task_lock(state->parent);
 +	list_del_rcu(&state->entry);
 +	task_unlock(state->parent);
 +}
-+
+ 
+-	while (len > 0) {
+-		char buf[128];
+-		int this_len, retval;
 +static int
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
 +	     struct task_struct *parent, u8 options)
@@ -5200,7 +5176,20 @@
 +	state->parent = parent;
 +	state->u.live.options = options;
 +	ptrace_state_link(state);
-+
+ 
+-		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
+-		if (copy_from_user(buf, src, this_len))
+-			return -EFAULT;
+-		retval = access_process_vm(tsk, dst, buf, this_len, 1);
+-		if (!retval) {
+-			if (copied)
+-				break;
+-			return -EIO;
+-		}
+-		copied += retval;
+-		src += retval;
+-		dst += retval;
+-		len -= retval;			
 +	BUG_ON(engine->data != 0);
 +	rcu_assign_pointer(engine->data, (unsigned long) state);
 +
@@ -5295,25 +5284,29 @@
 +		else
 +			ptrace_update(current, engine, 0);
 +	}
-+
+ 
+-	if (data & PTRACE_O_TRACEFORK)
+-		child->ptrace |= PT_TRACE_FORK;
 +	return retval;
 +}
-+
+ 
+-	if (data & PTRACE_O_TRACEVFORK)
+-		child->ptrace |= PT_TRACE_VFORK;
 +static int ptrace_attach(struct task_struct *task)
 +{
 +	struct utrace_attached_engine *engine;
 +	int retval;
  
--	if (data & PTRACE_O_TRACEFORK)
--		child->ptrace |= PT_TRACE_FORK;
+-	if (data & PTRACE_O_TRACECLONE)
+-		child->ptrace |= PT_TRACE_CLONE;
 +	retval = -EPERM;
 +	if (task->pid <= 1)
 +		goto bad;
 +	if (task->tgid == current->tgid)
 +		goto bad;
  
--	if (data & PTRACE_O_TRACEVFORK)
--		child->ptrace |= PT_TRACE_VFORK;
+-	if (data & PTRACE_O_TRACEEXEC)
+-		child->ptrace |= PT_TRACE_EXEC;
 +	engine = utrace_attach(task, (UTRACE_ATTACH_CREATE
 +				      | UTRACE_ATTACH_EXCLUSIVE
 +				      | UTRACE_ATTACH_MATCH_OPS),
@@ -5325,8 +5318,8 @@
 +		goto bad;
 +	}
  
--	if (data & PTRACE_O_TRACECLONE)
--		child->ptrace |= PT_TRACE_CLONE;
+-	if (data & PTRACE_O_TRACEVFORKDONE)
+-		child->ptrace |= PT_TRACE_VFORK_DONE;
 +	if (ptrace_may_attach(task))
 +		retval = ptrace_setup(task, engine, current, 0);
 +	if (retval)
@@ -5337,14 +5330,13 @@
 +		force_sig_specific(SIGSTOP, task);
 +	}
  
--	if (data & PTRACE_O_TRACEEXEC)
--		child->ptrace |= PT_TRACE_EXEC;
+-	if (data & PTRACE_O_TRACEEXIT)
+-		child->ptrace |= PT_TRACE_EXIT;
 +bad:
 +	return retval;
 +}
  
--	if (data & PTRACE_O_TRACEVFORKDONE)
--		child->ptrace |= PT_TRACE_VFORK_DONE;
+-	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
 +static int ptrace_detach(struct task_struct *task,
 +			 struct utrace_attached_engine *engine)
 +{
@@ -5358,50 +5350,81 @@
 +	ptrace_state_unlink(state);
 +	ptrace_done(state);
 +	return 0;
-+}
- 
--	if (data & PTRACE_O_TRACEEXIT)
--		child->ptrace |= PT_TRACE_EXIT;
+ }
  
--	return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
+-static int ptrace_getsiginfo(struct task_struct *child, siginfo_t __user * data)
++
 +/*
 + * This is called when we are exiting.  We must stop all our ptracing.
 + */
 +void
 +ptrace_exit(struct task_struct *tsk)
-+{
-+	struct ptrace_state *state, *next;
-+	task_lock(tsk);
-+	list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
-+		list_del_rcu(&state->entry);
-+		rcu_assign_pointer(state->engine->data, 0UL);
-+		utrace_detach(state->task, state->engine);
-+		ptrace_done(state);
-+	}
-+	task_unlock(tsk);
+ {
+-	siginfo_t lastinfo;
+-	int error = -ESRCH;
++	rcu_read_lock();
++	if (unlikely(!list_empty(&tsk->ptracees))) {
++		struct ptrace_state *state, *next;
+ 
+-	read_lock(&tasklist_lock);
+-	if (likely(child->sighand != NULL)) {
+-		error = -EINVAL;
+-		spin_lock_irq(&child->sighand->siglock);
+-		if (likely(child->last_siginfo != NULL)) {
+-			lastinfo = *child->last_siginfo;
+-			error = 0;
++		/*
++		 * First detach the utrace layer from all the tasks.
++		 * We don't want to hold any locks while calling utrace_detach.
++		 */
++		list_for_each_entry_rcu(state, &tsk->ptracees, entry) {
++			rcu_assign_pointer(state->engine->data, 0UL);
++			utrace_detach(state->task, state->engine);
+ 		}
+-		spin_unlock_irq(&child->sighand->siglock);
++
++		/*
++		 * Now clear out our list and clean up our data structures.
++		 * The task_lock protects our list structure.
++		 */
++		task_lock(tsk);
++		list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
++			list_del_rcu(&state->entry);
++			ptrace_done(state);
++		}
++		task_unlock(tsk);
+ 	}
+-	read_unlock(&tasklist_lock);
+-	if (!error)
+-		return copy_siginfo_to_user(data, &lastinfo);
+-	return error;
++	rcu_read_unlock();
++
 +	BUG_ON(!list_empty(&tsk->ptracees));
  }
  
--static int ptrace_getsiginfo(struct task_struct *child, siginfo_t __user * data)
+-static int ptrace_setsiginfo(struct task_struct *child, siginfo_t __user * data)
 +static int
 +ptrace_induce_signal(struct task_struct *target,
 +		     struct utrace_attached_engine *engine,
 +		     long signr)
  {
--	siginfo_t lastinfo;
+-	siginfo_t newinfo;
 -	int error = -ESRCH;
 +	struct ptrace_state *state = (struct ptrace_state *) engine->data;
  
+-	if (copy_from_user(&newinfo, data, sizeof (siginfo_t)))
+-		return -EFAULT;
++	if (signr == 0)
++		return 0;
+ 
 -	read_lock(&tasklist_lock);
 -	if (likely(child->sighand != NULL)) {
 -		error = -EINVAL;
 -		spin_lock_irq(&child->sighand->siglock);
 -		if (likely(child->last_siginfo != NULL)) {
--			lastinfo = *child->last_siginfo;
+-			*child->last_siginfo = newinfo;
 -			error = 0;
-+	if (signr == 0)
-+		return 0;
-+
 +	if (!valid_signal(signr))
 +		return -EIO;
 +
@@ -5430,24 +5453,17 @@
 +
 +		return utrace_inject_signal(target, engine,
 +					    UTRACE_ACTION_RESUME, info, NULL);
- 	}
--	read_unlock(&tasklist_lock);
--	if (!error)
--		return copy_siginfo_to_user(data, &lastinfo);
--	return error;
++	}
 +
 +	return 0;
- }
- 
--static int ptrace_setsiginfo(struct task_struct *child, siginfo_t __user * data)
++}
++
 +static int
 +ptrace_regset(struct task_struct *target,
 +	      struct utrace_attached_engine *engine,
 +	      const struct utrace_regset_view *view, int which,
 +	      int write, int nregs, unsigned long addr, void __user *datap)
- {
--	siginfo_t newinfo;
--	int error = -ESRCH;
++{
 +	const struct utrace_regset *regset = utrace_regset(target, engine,
 +							   view, which);
 +	int ret;
@@ -5457,21 +5473,10 @@
 +	printk("%d ptrace_regset on %d view %p regset %p (%d/%d) +%lx\n",
 +	       current->pid, target->pid, view, regset, write, nregs, addr);
 +#endif
- 
--	if (copy_from_user(&newinfo, data, sizeof (siginfo_t)))
--		return -EFAULT;
++
 +	if (unlikely(regset == NULL))
 +		return -EIO;
- 
--	read_lock(&tasklist_lock);
--	if (likely(child->sighand != NULL)) {
--		error = -EINVAL;
--		spin_lock_irq(&child->sighand->siglock);
--		if (likely(child->last_siginfo != NULL)) {
--			*child->last_siginfo = newinfo;
--			error = 0;
--		}
--		spin_unlock_irq(&child->sighand->siglock);
++
 +	if (nregs < 0) {
 +		if (addr < regset->bias || addr >= regset->bias + regset->n)
 +			return -EINVAL;
@@ -5550,13 +5555,13 @@
 +			default:
 +				BUG();
 +			}
-+	}
+ 	}
 +	else {
 +		void *datap = (void *) data;
 +		if (likely(access_ok(VERIFY_WRITE, datap, regset->size)))
 +			ret = (*regset->get)(target, regset,
 +					     addr, regset->size, NULL, datap);
- 	}
++	}
 +
 +out:
 +	return ret;
@@ -5735,7 +5740,7 @@
 +	case PTRACE_GETFPREGS:
 +		ret = ptrace_regset(child, engine, utrace_native_view(current),
 +				    1, 0, 0, addr, (void __user *)data);
-+		break;
+ 		break;
 +	case PTRACE_SETFPREGS:
 +		ret = ptrace_regset(child, engine, utrace_native_view(current),
 +				    1, 1, 0, addr, (void __user *)data);
@@ -5790,7 +5795,7 @@
 +	switch (request) {
 +	default:
 +		ret = ptrace_common(request, child, engine, state, addr, data);
- 		break;
++		break;
 +
 +	case PTRACE_PEEKTEXT: /* read word at location addr. */
 +	case PTRACE_PEEKDATA: {
@@ -6441,16 +6446,16 @@
 +};
 +
 +#endif
---- linux-2.6.17.noarch/kernel/Makefile~	2006-07-15 03:12:59.000000000 -0400
-+++ linux-2.6.17.noarch/kernel/Makefile	2006-07-15 03:13:04.000000000 -0400
-@@ -48,6 +48,7 @@ obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
- obj-$(CONFIG_SECCOMP) += seccomp.o
- obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o
+--- linux-2.6/kernel/Makefile.utrace-ptrace-compat
++++ linux-2.6/kernel/Makefile
+@@ -50,6 +50,7 @@ obj-$(CONFIG_RCU_TORTURE_TEST) += rcutor
  obj-$(CONFIG_RELAY) += relay.o
-+obj-$(CONFIG_UTRACE) += utrace.o
  obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
  obj-$(CONFIG_TASKSTATS) += taskstats.o
++obj-$(CONFIG_UTRACE) += utrace.o
  
+ ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
+ # According to Alan Modra <alan at linuxcare.com.au>, the -fno-omit-frame-pointer is
 --- linux-2.6/fs/binfmt_elf_fdpic.c.utrace-ptrace-compat
 +++ linux-2.6/fs/binfmt_elf_fdpic.c
 @@ -421,13 +421,6 @@ static int load_elf_fdpic_binary(struct 
@@ -6520,7 +6525,7 @@
  		put_task_struct(task);
  	}
  	return allowed;
-@@ -715,7 +709,7 @@ static ssize_t mem_read(struct file * fi
+@@ -736,7 +730,7 @@ static ssize_t mem_read(struct file * fi
  	if (!task)
  		goto out_no_task;
  
@@ -6529,7 +6534,7 @@
  		goto out;
  
  	ret = -ENOMEM;
-@@ -741,7 +735,7 @@ static ssize_t mem_read(struct file * fi
+@@ -762,7 +756,7 @@ static ssize_t mem_read(struct file * fi
  
  		this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
  		retval = access_process_vm(task, src, page, this_len, 0);
@@ -6538,7 +6543,7 @@
  			if (!ret)
  				ret = -EIO;
  			break;
-@@ -785,7 +779,7 @@ static ssize_t mem_write(struct file * f
+@@ -806,7 +800,7 @@ static ssize_t mem_write(struct file * f
  	if (!task)
  		goto out_no_task;
  
@@ -6555,9 +6560,9 @@
  #include <linux/cpuset.h>
 +#include <linux/tracehook.h>
  #include <linux/rcupdate.h>
+ #include <linux/delayacct.h>
  
- #include <asm/uaccess.h>
-@@ -174,8 +175,8 @@ static inline char * task_state(struct t
+@@ -175,8 +176,8 @@ static inline char * task_state(struct t
  		get_task_state(p),
  		(p->sleep_avg/1024)*100/(1020000000/1024),
  	       	p->tgid,
@@ -6568,7 +6573,7 @@
  		p->uid, p->euid, p->suid, p->fsuid,
  		p->gid, p->egid, p->sgid, p->fsgid);
  	read_unlock(&tasklist_lock);
-@@ -385,7 +386,7 @@ static int do_task_stat(struct task_stru
+@@ -386,7 +387,7 @@ static int do_task_stat(struct task_stru
  			stime = cputime_add(stime, task->signal->stime);
  		}
  	}
@@ -6668,7 +6673,7 @@
  
 --- linux-2.6/init/Kconfig.utrace-ptrace-compat
 +++ linux-2.6/init/Kconfig
-@@ -487,6 +487,35 @@ config STOP_MACHINE
+@@ -511,6 +511,35 @@ config STOP_MACHINE
  	  Need stop_machine() primitive.
  endmenu
  



From fedora-cvs-commits at redhat.com  Wed Jul 19 12:55:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 08:55:25 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr-aumix_missTH.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 man-pages-fr.spec, 1.16, 1.17 sources,
	1.4, 1.5
Message-ID: <200607191255.k6JCtPaj030119@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30091

Modified Files:
	.cvsignore man-pages-fr.spec sources 
Added Files:
	man-pages-fr-aumix_missTH.patch 
Log Message:
New version man-pages-fr from upstream.

--- man-pages-fr-2.22.0/man1/aumix.1.mar        2006-07-19 09:04:55.000000000 +0200
+++ man-pages-fr-2.22.0/man1/aumix.1    2006-07-19 10:51:59.000000000 +0200
@@ -30,8 +30,9 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1
 .Sh NOM
 .Nm aumix


man-pages-fr-aumix_missTH.patch:
 aumix.1 |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE man-pages-fr-aumix_missTH.patch ---
--- man-pages-fr-2.22.0/man1/aumix.1.mar	2006-07-19 09:04:55.000000000 +0200
+++ man-pages-fr-2.22.0/man1/aumix.1	2006-07-19 10:51:59.000000000 +0200
@@ -30,8 +30,9 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1
 .Sh NOM
 .Nm aumix
 

Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 08:20:31 -0000	1.4
+++ .cvsignore	19 Jul 2006 12:55:23 -0000	1.5
@@ -1,3 +1,2 @@
-man-fr-0.9.7.tar.gz
-man-fr-0.9.tar.gz
 mansupfr.tar.bz2
+man-pages-fr-2.22.0.tar.bz2


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- man-pages-fr.spec	12 Jul 2006 07:18:57 -0000	1.16
+++ man-pages-fr.spec	19 Jul 2006 12:55:23 -0000	1.17
@@ -1,87 +1,187 @@
-Summary: French man pages from the Linux Documentation Project.
-Name: man-pages-fr
-Version: 0.9.7
-Release: 14.1
-License: Distributable
-Group: Documentation
-Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz
-Source1: http://perso.club-internet.fr/ccb/man/man-fr-%{version}.tar.gz
-Source2: http://www.delafond.org/traducmanfr/mansupfr.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArchitectures: noarch
+Summary:	French man pages from the Linux Documentation Project
+Name:		man-pages-fr
+Version:	2.22.0
+Release:	0
+License:	Distributable
+Group:		Documentation
+URL:		http://manpagesfr.free.fr/
+Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
+Source1:	http://www.delafond.org/traducmanfr/mansupfr.tar.bz2
+Patch1:		man-pages-fr-aumix_missTH.patch  
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
+BuildRequires:  utrac
 
 %description
 Manual pages from the Linux Documentation Project, translated into French. Also
 includes supplemental pages provided by Dr. Patrick Atlas and Dr. Gerard
-Delafond 
+Delafond.
 
 %prep
-# setup original LDP tarball as they have pages not provided by other tarballs
-%setup -q -n man-fr-0.9
-mv -f changements changements-0.9
-mv -f LISEZ_MOI LISEZ_MOI-0.9
-
-# now include the pages maintained by Christophe Blaess
-tar zxf %{SOURCE1}
-cp -a man-fr/* .
-rm -rf man-fr
-mv -f changements changements-0.9.7
-mv -f LISEZ_MOI LISEZ_MOI-0.9.7
-
-# and finally pick up the supplemental pages, which overwrites a few files too
-tar jxf %{SOURCE2}
+%setup -q -D -a 1
+##%setup -q -D -a 2
+##%patch1 -p1 -b .aumix_missTH
+# pick up the supplemental pages, which overwrite a few files too
 cp -a pagesdeman/usr/share/man/fr/* .
 mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr
-rm -rf pagesdeman
+rm -rf pagesdeman/
 
 %build
-rm -f man1/{dnsdomainname,domainname,hostname}.1 man5/ethers.5
-rm -f man2/core.2149 man2/core.2160
 
 %install
 rm -fr $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr
+# Create all the directories to be sure this package owns them
 for n in 1 2 3 4 5 6 7 8 9 n; do
-	mkdir $RPM_BUILD_ROOT%{_mandir}/fr/man$n
+  mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man${n}
 done
+
+# Conversion to UTF-8 only when needed
 for i in man?/*; do
-        iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
-        mv -f $i.new $i
+  CODING=`utrac -p ${i}`
+  if [ "${CODING}" != "UTF-8" ]
+  then
+    iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
+    install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+    rm -rf ${i}.new
+  else
+    install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+  fi
 done
-for i in man?; do 
-    install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i; 
+
+##make install-install DESTDIR=$RPM_BUILD_ROOT
+
+for i in man?; do
+    install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
 done
+    
 
-# remove these since they conflict with cups, vim and shadow-utils packages
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1,newgrp.1,sg.1,view.1,rview.1,vim.1,vimdiff.1,vimtutor.1}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{cups-config.3,getspnam.3,shadow.3}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5,gshadow.5,login.defs.5}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8,faillog.8,groupadd.8,groupdel.8,groupmod.8,grpck.8,grpconv.8,grpunconv.8,lastlog.8,newusers.8,pwck.8,pwconv.8,pwunconv.8}*
+# Remove files already included in other packages
+# alsa-utils
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/alsaconf.8
+# cups
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend,cancel,filter,lp,lpoptions,lppasswd,lpq,lpr,lprm,lpstat}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/cups-config.3
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf,cupsd.conf,mime.convs,mime.types,printers.conf}.5
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept,cups-lpd,cups-polld,cupsaddsmb,cupsd,enable,lpadmin,lpc,lpinfo,lpmove,reject}.8
+# fcron
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{fcrondyn,fcrontab}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{fcron.conf,fcrontab}.5
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/fcron.8
+# gputils
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
+# latex2rtf
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# man
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
+#nano
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/nano.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/nanorc.5
+# net-tools
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{dnsdomainname,domainname,hostname}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/ethers.5
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{arp,ifconfig,plipconfig,route,slattach}.8
+# shadow-utils
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{chage,gpasswd,newgrp,sg}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{getspnam,shadow}.3
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{faillog,shadow}.5
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{adduser,chpasswd,faillog,groupadd,groupdel,groupmod,grpck,lastlog,newusers,pwck,pwconv,useradd,userdel,usermod}.8
+
+LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc changements-0.9 changements-0.9.7 LISEZ_MOI-0.9 LISEZ_MOI-0.9.7 LISEZ_MOI-mansupfr
-%dir %{_mandir}/fr
-%{_mandir}/fr/*
+%defattr(0644,root,root,0755)
+%doc changements changements.anciens LISEZ_MOI LISEZ_MOI-mansupfr
+##%doc Changements Changements.anciens Lisez_moi
+%{_mandir}/fr/
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7-14.1
-- rebuild
+* Tue Jul 18 2006 Marcela Maslanova <mmaslano at redhat.com> 2.16-0-2
+- make from sources from Alain Portal new version of French man-pages
+- man-pages-fr-aumix_missTH.patch - missed header
+- used Spec file for version 2.16 from Alain Portal
 
-* Thu Mar 23 2006 Karsten Hopp <karsten at redhat.de> 0.9.7-14
-- remove pages that conflict with vim
+* Thu Jul 13 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.16.0-1
+- Update to 2.16.0
+- New extra tarball
 
-* Fri Feb 03 2006 Peter Vrabec <pvrabec at redhat.com>
-- rebuilt
+* Wed Jul 12 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.15.0-1
+- Update to 2.15.0
 
-* Tue Jan 10 2006 Bernd Groh <bgroh at redhat.com>
-- remove pages that conflict with shadow-utils
+* Wed Jul 12 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.14.0-1
+- Update to 2.14.0
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Tue Jul 11 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.13.0-1
+- Update to 2.13.0
+
+* Mon Jul 10 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.12.0-1
+- Update to 2.12.0
+
+* Mon Jul 10 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.11.0-1
+- Update to 2.11.0
+
+* Fri Jul  7 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.10.0-1
+- Update to 2.10.0
+- New extra tarball
+
+* Thu Jul  6 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.09.0-1
+- Update to 2.09.0
+
+* Wed Jul  5 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.08.0-1
+- Update to 2.08.0
+
+* Mon Jul  3 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.07.0-1
+- Update to 2.07.0
+- New extra tarball
+
+* Fri Jun 30 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.06.0-1
+- Update to 2.06.0
+
+* Wed Jun 28 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.05.0-1
+- Update to 2.05.0
+
+* Tue Jun 27 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.04.0-1
+- Update to 2.04.0
+- New extra tarball
+- Set LANG to fr before creating Index.?
+
+* Thu Jun 15 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.03.0-1
+- Update to 2.03.0
+
+* Wed Jun 14 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.02.0-1
+- Update to 2.02.0
+
+* Tue May 30 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.01.0-1
+- Update to 2.01.0
+
+* Tue May 30 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 2.00.0-1
+- Update to 2.00.0
+- Add the new man-pages-extras-fr tarball.
+
+* Fri May 12 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 1.70.0-1
+- Update to 1.70.0
+
+* Thu May 11 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 1.69.1-1
+- Update to 1.69.1
+
+* Wed May 10 2006 Alain Portal <aportal AT univ-montp2 DOT fr> 1.69.0-1
+- Update to 1.69.0
+- Remove some others conflicting pages from ${SOURCE1}
+- Add BR because ${SOURCE0} pages are utf8 encoded
+  and ${SOURCE1} are ASCII, ISO-8859-1 or ISO-8859-15 encoded
+
+* Wed Nov  2 2005 Alain Portal <aportal AT univ-montp2 DOT fr> 1.64.0-1
+- Update to 1.64.0
+- Remove latex2rtf.1: package isn't provided by Fedora
+- Remove gputils pages that are provided by upstream
+
+* Thu Jul  7 2005 Matthias Saou <http://freshrpms.net/> 1.62.0-1
+- Update to 1.62.0, remove very old and now included original LDP man pages.
+- Spec file cleanup : Add URL, simplify installation.
+- Go through all know conflicting man pages and separate them by package.
 
 * Wed Sep 29 2004 Leon Ho <llch at redhat.com>
 - rebuilt
@@ -127,8 +227,8 @@
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com> 0.9-9
 - automated rebuild
 
-* Mon Jun 17 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9-8
-- Update nm.1 (#66666 - I like bugs with attaced fixes :)
+* Mon Jun 17 2002 Trond Eivind Glomsrd <teg at redhat.com> 0.9-8
+- Update nm.1 (#66666 - I like bugs with attached fixes :)
 
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
@@ -136,20 +236,20 @@
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Mon Aug 13 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9-5
+* Mon Aug 13 2001 Trond Eivind Glomsrd <teg at redhat.com> 0.9-5
 - Rebuild. This should fix #51685
 
-* Thu Aug  2 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Aug  2 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Own %%{_mandir}/fr
 - s/Copyright/License/
 
-* Sun Apr  8 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sun Apr  8 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - Remove dnsdomainname.1 and hostname.1, they're now part of net-tools
 
-* Tue Apr  3 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Apr  3 2001 Trond Eivind Glomsrd <teg at redhat.com>
 - fixes to the roff sources
 
-* Tue Dec 19 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Dec 19 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - 0.9
 
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
@@ -161,8 +261,8 @@
 * Mon Jun 19 2000 Matt Wilson <msw at redhat.com>
 - defattr root
 
-* Sun Jun 12 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Sun Jun 12 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - use %%{_mandir} and %%{_tmppath}
 
-* Mon May 15 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon May 15 2000 Trond Eivind Glomsrd <teg at redhat.com>
 - first build


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 08:20:31 -0000	1.4
+++ sources	19 Jul 2006 12:55:23 -0000	1.5
@@ -1,3 +1,3 @@
-aec50d6d7fbb9b7a096ae26ab4a3177f  man-fr-0.9.7.tar.gz
-7c9da2cb6d2663ce78a1daedff4d4e52  man-fr-0.9.tar.gz
+9b52a6a416f0aa23979a095e99419141  man-pages-fr-2.22.0.tar.bz2
 d5c654c7391dd2f452c21edb442d8f4e  mansupfr.tar.bz2
+



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:04:17 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.17,1.18
Message-ID: <200607191304.k6JD4Hx2030309@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30226

Modified Files:
	man-pages-fr.spec 
Log Message:
New version man-pages-fr from upstream.

--- man-pages-fr-2.22.0/man1/aumix.1.mar        2006-07-19 09:04:55.000000000 +0200
+++ man-pages-fr-2.22.0/man1/aumix.1    2006-07-19 10:51:59.000000000 +0200
@@ -30,8 +30,9 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1
 .Sh NOM
 .Nm aumix



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- man-pages-fr.spec	19 Jul 2006 12:55:23 -0000	1.17
+++ man-pages-fr.spec	19 Jul 2006 13:04:15 -0000	1.18
@@ -99,7 +99,7 @@
 %{_mandir}/fr/
 
 %changelog
-* Tue Jul 18 2006 Marcela Maslanova <mmaslano at redhat.com> 2.16-0-2
+* Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22-0
 - make from sources from Alain Portal new version of French man-pages
 - man-pages-fr-aumix_missTH.patch - missed header
 - used Spec file for version 2.16 from Alain Portal



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:12:04 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch, 1.1, 1.2 audit.spec,
	1.100, 1.101
Message-ID: <200607191312.k6JDC40E009264@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9228

Modified Files:
	audit-setroubleshoot.patch audit.spec 
Log Message:
* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-3
- More fixes for setroubleshoot to handle failing plugin


audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 audispd     |   37 +++++++++++++++++++++++++++--------
 2 files changed, 79 insertions(+), 21 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audit-setroubleshoot.patch	14 Jul 2006 19:26:57 -0000	1.1
+++ audit-setroubleshoot.patch	19 Jul 2006 13:12:02 -0000	1.2
@@ -1,5 +1,5 @@
---- audit-1.2.5/audisp/audispd.old	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-07-14 11:56:23.000000000 -0400
+--- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
++++ audit-1.2.5/audisp/audispd	2006-07-19 09:11:40.000000000 -0400
 @@ -15,8 +15,7 @@
      def __init__(self, cmd):
          self.cmd = cmd
@@ -30,16 +30,34 @@
  class audit_dispatcher:
      def __init__(self):
          self.data = []
-@@ -69,7 +81,7 @@
+@@ -50,6 +62,8 @@
+                     self.plugins.append(p)
+                 except OSError, e:
+                     syslog.syslog("plugin %s failed to start: %s" % (plugin, e))
++		except IOError,e:
++                    syslog.syslog("plugin %s failed to start: IOError exception %s" % (plugin, e))
+ 
+         for p in self.plugins:
+             if p.cmd not in new_plugins:
+@@ -68,9 +82,14 @@
+     def process(self):
          if len(self.data) > 0:
              msg=self.data.pop(0)
-             for plugin in self.plugins:
+-            for plugin in self.plugins:
 -#                syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
-+                #syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
-                 plugin.stdin.write(msg.binary())
+-                plugin.stdin.write(msg.binary())
++            try:
++                for plugin in self.plugins:
++                    #syslog.syslog("sending plugin %s: '%s'" % (plugin.cmd, msg.get_body()))
++                    plugin.stdin.write(msg.binary())
++            except IOError,e:
++                syslog.syslog("plugin %s failed: IOError exception %s" % (plugin.cmd, e))
++                self.plugins.remove(plugin)
++
              return 0
          else:
-@@ -86,6 +98,7 @@
+             return 500
+@@ -86,6 +105,7 @@
                      if not msg.read_from_fd(0):
                          syslog.syslog("Connection closing")
                          return
@@ -47,7 +65,7 @@
                      self.add(msg)
                      sleep=0
                  else:
-@@ -98,11 +111,11 @@
+@@ -98,11 +118,11 @@
                          self.load_plugins()
                          HUP=False
                  else:
@@ -61,17 +79,18 @@
                  syslog.syslog(traceback.format_exc())
  
  try:
-@@ -113,7 +126,7 @@
+@@ -113,7 +133,8 @@
      dispatcher.run()
  
  except IOError,e:
 -    syslog.syslog("IOError exception %s" % e.args)
 +    syslog.syslog("IOError exception %s" % e)
++    syslog.syslog(traceback.format_exc())
  
  except Exception, e:
      syslog.syslog("Unexpected exception %s " % e)
---- audit-1.2.5/audisp/AuditMsg.py.old	2006-07-13 13:36:08.000000000 -0400
-+++ audit-1.2.5/audisp/AuditMsg.py	2006-07-14 11:53:55.000000000 -0400
+--- audit-1.2.5/audisp/AuditMsg.py.setroubleshoot	2006-07-13 13:36:08.000000000 -0400
++++ audit-1.2.5/audisp/AuditMsg.py	2006-07-19 09:11:11.000000000 -0400
 @@ -1,33 +1,55 @@
  import struct, os
 +


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- audit.spec	14 Jul 2006 18:49:02 -0000	1.100
+++ audit.spec	19 Jul 2006 13:12:02 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -55,7 +55,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b setroubleshoot
+%patch -p1 -b .setroubleshoot
 
 %build
 autoreconf -fv --install
@@ -168,6 +168,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-3
+- More fixes for setroubleshoot to handle failing plugin
+
 * Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-2
 - Fixes for setroubleshoot
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:22:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:22:32 -0400
Subject: rpms/pygobject2/devel pygobject2.spec,1.5,1.6
Message-ID: <200607191322.k6JDMW6X027066@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygobject2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27037

Modified Files:
	pygobject2.spec 
Log Message:
rebuild


Index: pygobject2.spec
===================================================================
RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygobject2.spec	13 Jul 2006 04:15:05 -0000	1.5
+++ pygobject2.spec	19 Jul 2006 13:22:28 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: Python bindings for gobjects
 Name: pygobject2
 Version: 2.11.0
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Languages
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.10/
@@ -69,6 +69,9 @@
 %{_libdir}/pkgconfig/pygobject-2.0.pc
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 2.11.0-2
+- rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.11.0-1
 - Update to 2.11.0
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:26:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:26:10 -0400
Subject: rpms/oprofile/devel oprofile.spec,1.46,1.47
Message-ID: <200607191326.k6JDQA4T028278@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28252

Modified Files:
	oprofile.spec 
Log Message:
rebuild


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- oprofile.spec	12 Jul 2006 20:27:35 -0000	1.46
+++ oprofile.spec	19 Jul 2006 13:26:08 -0000	1.47
@@ -1,10 +1,9 @@
 %define DATE 20060710
 %define oprofile_version 0.9.1
-%define oprofile_release 14
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
-Release: %{oprofile_release}.1.1.1
+Release: 15
 License: GPL
 Group: Development/System
 #
@@ -262,6 +261,10 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-15
+- rebuild
+- remove silly release definition
+
 * Wed Jul 12 2006 Will Cohen <wcohen at redhat.com>
 - Support for Intel Woodcrest. (#183081)
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:29:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:29:38 -0400
Subject: rpms/libchewing/devel libchewing.spec,1.7,1.8
Message-ID: <200607191329.k6JDTcK1029621@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libchewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29593

Modified Files:
	libchewing.spec 
Log Message:
rebuild


Index: libchewing.spec
===================================================================
RCS file: /cvs/dist/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libchewing.spec	12 Jul 2006 06:46:57 -0000	1.7
+++ libchewing.spec	19 Jul 2006 13:29:36 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		libchewing
 Version:	0.3.0
-Release: 1%{?dist}.2.1.1
+Release: 	2%{?dist}
 Summary:      Intelligent phonetic input method library for Traditional Chinese
 
 Group: 		System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-2
+- fix release
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-1.2.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:36:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:36:30 -0400
Subject: rpms/cups/FC-5 cups-compile.patch, NONE, 1.1 cups-svn5754.patch,
	NONE, 1.1 cups-dest-cache-v2.patch, 1.2, 1.3 cups.spec, 1.197,
	1.198 cups-svn5737.patch, 1.1, NONE
Message-ID: <200607191336.k6JDaUr7031364@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31089

Modified Files:
	cups-dest-cache-v2.patch cups.spec 
Added Files:
	cups-compile.patch cups-svn5754.patch 
Removed Files:
	cups-svn5737.patch 
Log Message:
* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.13
- Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.


cups-compile.patch:
 dest.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE cups-compile.patch ---
--- cups-1.2.1/cups/dest.c.compile	2006-07-19 12:37:51.000000000 +0100
+++ cups-1.2.1/cups/dest.c	2006-07-19 12:38:07.000000000 +0100
@@ -49,6 +49,8 @@
 #include <fcntl.h>
 #include <sys/timeb.h>
 
+#include "ipp-private.h"
+
 #ifdef HAVE_NOTIFY_H
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */

cups-svn5754.patch:
 CHANGES.txt                                   |  145 +
 Makedefs.in                                   |   10 
 backend/Dependencies                          |   39 
 backend/Makefile                              |   40 
 backend/backend-private.h                     |   73 
 backend/easysw-firewire-design.txt            |   70 
 backend/easysw-firewire-linux.txt             |   35 
 backend/ieee1284.c                            |   77 
 backend/ieee1394-linux.c                      |  877 --------
 backend/ieee1394.c                            |  267 --
 backend/ieee1394.h                            |  103 
 backend/ipp.c                                 |    9 
 backend/parallel.c                            |  231 --
 backend/runloop.c                             |  258 ++
 backend/serial.c                              |  293 +-
 backend/snmp.c                                |   37 
 backend/socket.c                              |  299 --
 backend/test1284.c                            |    9 
 backend/usb-darwin.c                          |    6 
 backend/usb-unix.c                            |  301 --
 backend/usb.c                                 |   25 
 berkeley/lpq.c                                |    6 
 berkeley/lprm.c                               |   35 
 cgi-bin/help-index.c                          |    6 
 config-scripts/cups-compiler.m4               |   66 
 config-scripts/cups-defaults.m4               |   44 
 config-scripts/cups-directories.m4            |    6 
 config-scripts/cups-image.m4                  |   24 
 config-scripts/cups-network.m4                |    6 
 config-scripts/cups-sharedlibs.m4             |   48 
 config-scripts/cups-ssl.m4                    |    5 
 config.h.in                                   |   11 
 configure.in                                  |   11 
 cups-config.in                                |   14 
 cups/Makefile                                 |   10 
 cups/adminutil.c                              |   22 
 cups/dest.c                                   |   55 
 cups/emit.c                                   |   27 
 cups/encode.c                                 |   58 
 cups/http-addrlist.c                          |   20 
 cups/http.c                                   |   35 
 cups/http.h                                   |   14 
 cups/ipp-private.h                            |   17 
 cups/ipp.c                                    |    8 
 cups/language.c                               |   21 
 cups/mark.c                                   |   11 
 cups/testhttp.c                               |   22 
 cups/testipp.c                                |   19 
 cups/testppd.c                                |   57 
 cups/util.c                                   |   36 
 doc/Makefile                                  |   18 
 doc/de/index.html.in                          |  143 +
 doc/help/policies.html                        |  677 ++++++
 doc/help/ref-mailto-conf.html                 |  105 
 doc/help/spec-raster.html                     |   32 
 filter/Makefile                               |   20 
 filter/pstops.c                               |   95 
 filter/raster.c                               |  683 +++---
 filter/raster.h                               |   11 
 filter/rasterbench.c                          |  355 +++
 filter/rastertolabel.c                        |   13 
 locale/Makefile                               |   14 
 locale/cups_de.po                             | 2821 ++++++++++++++++++++++++++
 locale/cups_es.po                             |  482 +---
 locale/cups_ja.po                             |    9 
 man/Makefile                                  |    5 
 man/cupsaddsmb.man.in                         |   21 
 man/cupsd.conf.man.in                         |   10 
 man/lpadmin.man                               |   33 
 man/mailto.conf.man                           |   69 
 notifier/testnotify.c                         |   12 
 packaging/cups.list.in                        |   25 
 packaging/cups.spec.in                        |   23 
 pdftops/PSOutputDev.cxx                       |    2 
 ppd/zebracpl.ppd                              |    8 
 scheduler/Makefile                            |    7 
 scheduler/auth.c                              |    9 
 scheduler/client.c                            |  254 ++
 scheduler/conf.c                              |  189 -
 scheduler/conf.h                              |    5 
 scheduler/cups-polld.c                        |  209 +
 scheduler/dirsvc.c                            |  110 -
 scheduler/filter.c                            |    8 
 scheduler/ipp.c                               |   76 
 scheduler/job.c                               |  124 -
 scheduler/listen.c                            |    8 
 scheduler/main.c                              |    8 
 scheduler/mime.c                              |   19 
 scheduler/printers.c                          |   48 
 scheduler/subscriptions.c                     |  405 +--
 scheduler/subscriptions.h                     |   10 
 scheduler/testmime.c                          |    6 
 systemv/Makefile                              |    6 
 systemv/cancel.c                              |    7 
 systemv/cupsaddsmb.c                          |    8 
 systemv/lpoptions.c                           |   36 
 systemv/lpstat.c                              |   59 
 templates/Makefile                            |   14 
 templates/de/add-class.tmpl                   |   33 
 templates/de/add-printer.tmpl                 |   28 
 templates/de/admin.tmpl                       |   77 
 templates/de/choose-device.tmpl               |   26 
 templates/de/choose-make.tmpl                 |   42 
 templates/de/choose-model.tmpl                |   34 
 templates/de/choose-serial.tmpl               |   47 
 templates/de/choose-uri.tmpl                  |   42 
 templates/de/class-added.tmpl                 |    2 
 templates/de/class-confirm.tmpl               |    7 
 templates/de/class-deleted.tmpl               |    1 
 templates/de/class-jobs-header.tmpl           |    1 
 templates/de/class-modified.tmpl              |    2 
 templates/de/classes-header.tmpl              |    1 
 templates/de/classes.tmpl                     |   54 
 templates/de/edit-config.tmpl.in              |   91 
 templates/de/error-op.tmpl                    |    3 
 templates/de/error.tmpl                       |    3 
 templates/de/header.tmpl.in                   |   63 
 templates/de/help-header.tmpl                 |   46 
 templates/de/help-printable.tmpl              |   11 
 templates/de/job-cancel.tmpl                  |    1 
 templates/de/job-hold.tmpl                    |    1 
 templates/de/job-move.tmpl                    |   22 
 templates/de/job-moved.tmpl                   |    2 
 templates/de/job-release.tmpl                 |    1 
 templates/de/job-restart.tmpl                 |    1 
 templates/de/jobs-header.tmpl                 |   15 
 templates/de/jobs.tmpl                        |   42 
 templates/de/maintenance.tmpl                 |    2 
 templates/de/modify-class.tmpl                |   34 
 templates/de/modify-printer.tmpl              |   29 
 templates/de/option-boolean.tmpl              |    6 
 templates/de/option-conflict.tmpl             |    7 
 templates/de/option-header.tmpl               |    3 
 templates/de/option-pickmany.tmpl             |    6 
 templates/de/option-pickone.tmpl              |    6 
 templates/de/option-trailer.tmpl              |    5 
 templates/de/pager.tmpl                       |    7 
 templates/de/printer-accept.tmpl              |    3 
 templates/de/printer-added.tmpl               |    2 
 templates/de/printer-configured.tmpl          |    2 
 templates/de/printer-confirm.tmpl             |    7 
 templates/de/printer-default.tmpl             |    7 
 templates/de/printer-deleted.tmpl             |    1 
 templates/de/printer-jobs-header.tmpl         |    1 
 templates/de/printer-modified.tmpl            |    2 
 templates/de/printer-purge.tmpl               |    3 
 templates/de/printer-reject.tmpl              |    3 
 templates/de/printer-start.tmpl               |    3 
 templates/de/printer-stop.tmpl                |    3 
 templates/de/printers-header.tmpl             |    1 
 templates/de/printers.tmpl                    |   64 
 templates/de/restart.tmpl                     |    1 
 templates/de/samba-export.tmpl                |   55 
 templates/de/samba-exported.tmpl              |    1 
 templates/de/search.tmpl                      |   13 
 templates/de/set-printer-options-header.tmpl  |    3 
 templates/de/set-printer-options-trailer.tmpl |    1 
 templates/de/test-page.tmpl                   |    2 
 templates/de/trailer.tmpl                     |   21 
 templates/de/users.tmpl                       |   26 
 templates/ja/printers.tmpl                    |    2 
 test/ipptest.c                                |   31 
 162 files changed, 8442 insertions(+), 3849 deletions(-)

--- NEW FILE cups-svn5754.patch ---
--- release-1.2.1/backend/backend-private.h	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h	2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info at cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/cups.h>
+#  include <cups/debug.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
+		                   char *make_model, int make_model_size,
+				   const char *scheme, char *uri, int uri_size);
+extern int	backendGetMakeModel(const char *device_id, char *make_model,
+			            int make_model_size);
+extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
--- release-1.2.1/backend/Dependencies	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies	2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h
--- release-1.2.1/backend/easysw-firewire-design.txt	2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
-    available devices.
-
-    The CUPS 1.1 backend will record any status information in
[...16978 lines suppressed...]
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
--- release-1.2.1/templates/de/set-printer-options-trailer.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/set-printer-options-trailer.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1 @@
+</FORM>
--- release-1.2.1/templates/de/test-page.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/test-page.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,2 @@
+<P>Testseite gesendet; Auftrags ID ist <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
--- release-1.2.1/templates/de/trailer.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/trailer.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,21 @@
+</TD>
+<TD WIDTH="15">&nbsp;</TD>
+</TR>
+<TR CLASS="trailer">
+<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
+
+<P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
+eingetragene Warenzeichen der <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS ist urheberrechtlich gesch??tzt 1997-2006 von Easy Software Products,
+Alle Rechte vorbehalten.</SMALL></P>
+
+</TD>
+
+<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
--- release-1.2.1/templates/de/users.tmpl	1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/users.tmpl	2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,26 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Berechtigte Benutzer f&uuml;r {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Benutzer:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Erlaube diesen Benutzern zu drucken
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Verweigere diesen Benutzern zu drucken
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
--- release-1.2.1/templates/ja/printers.tmpl	2006-07-04 17:35:19.000000000 +0100
+++ cups-1.2.x/templates/ja/printers.tmpl	2006-07-14 11:41:16.000000000 +0100
@@ -12,7 +12,7 @@
 <B>??????:</B> {printer_location}<BR>
 <B>?????????????????????:</B> {printer_make_and_model}<BR>
 <B>?????????????????????:</B> {printer_state=3??????????:{printer_state=4??????????:??????}},
-{printer_is_accepting_jobs=0??????????????????????:???????????????????????????}, {printer_is_shared=0?not:} ?????????
+{printer_is_accepting_jobs=0??????????????????????:???????????????????????????}, {printer_is_shared=0????:}?????????
 {?device_uri=?:<BR><B>???????????? URI:</B> {device_uri}}
 
 <P>
--- release-1.2.1/templates/Makefile	2006-07-04 17:35:22.000000000 +0100
+++ cups-1.2.x/templates/Makefile	2006-06-26 12:45:31.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $"
+# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $"
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
@@ -118,11 +118,13 @@
 # Install files...
 #
 
-install: all
+install: all $(INSTALL_LANGUAGES)
 	$(INSTALL_DIR) -m 755 $(DATADIR)/templates
 	for file in $(FILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
 	done
+
+install-languages:
 	for lang in $(LANGUAGES); do \
 		$(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
 		for file in $(FILES); do \
@@ -137,19 +139,21 @@
 # Uninstall files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
 	for file in $(FILES); do \
 		$(RM) $(DATADIR)/templates/$$file; \
 	done
+	-$(RMDIR) $(DATADIR)/templates
+
+uninstall-languages:
 	for lang in $(LANGUAGES); do \
 		for file in $(FILES); do \
 			$(RM) $(DATADIR)/templates/$$lang/$$file; \
 		done \
 		$(RMDIR) $(DATADIR)/templates/$$lang; \
 	done
-	-$(RMDIR) $(DATADIR)/templates
 
 
 #
-# End of "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $".
+# End of "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $".
 #
--- release-1.2.1/test/ipptest.c	2006-07-04 17:33:09.000000000 +0100
+++ cups-1.2.x/test/ipptest.c	2006-07-18 15:31:56.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $"
+ * "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $"
  *
  *   IPP test command for the Common UNIX Printing System (CUPS).
  *
@@ -122,6 +122,7 @@
   int		status;			/* Status of tests... */
   const char	*uri;			/* URI to use */
   const char	*testfile;		/* Test file to use */
+  int		interval;		/* Test interval */
 
 
  /*
@@ -133,6 +134,7 @@
   uri      = NULL;
   testfile = NULL;
   status   = 0;
+  interval = 0;
 
   for (i = 1; i < argc; i ++)
   {
@@ -140,6 +142,15 @@
     {
       if (!strcmp(argv[i], "-v"))
         Verbosity ++;
+      else if (!strcmp(argv[i], "-i"))
+      {
+        i++;
+
+	if (i >= argc)
+	  usage(NULL);
+	else
+	  interval = atoi(argv[i]);
+      }
       else
         usage(argv[i]);
     }
@@ -174,6 +185,19 @@
     usage(NULL);
 
  /*
+  * Loop if the interval is set...
+  */
+
+  if (interval)
+  {
+    for (;;)
+    {
+      sleep(interval);
+      do_tests(uri, testfile);
+    }
+  }
+
+ /*
   * Exit...
   */
 
@@ -890,12 +914,13 @@
   fputs("Usage: ipptest [options] URL testfile [ ... testfileN ]\n", stderr);
   fputs("Options:\n", stderr);
   fputs("\n", stderr);
-  fputs("-v     Show all attributes in response, even on success.\n", stderr);
+  fputs("-i N    Repeat the last test file once every N seconds.\n", stderr);
+  fputs("-v      Show all attributes in response, even on success.\n", stderr);
 
   exit(1);
 }
 
 
 /*
- * End of "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $".
+ * End of "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $".
  */

cups-dest-cache-v2.patch:
 dest.c |  180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 180 insertions(+)

Index: cups-dest-cache-v2.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-dest-cache-v2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-dest-cache-v2.patch	30 Mar 2006 15:15:35 -0000	1.2
+++ cups-dest-cache-v2.patch	19 Jul 2006 13:36:27 -0000	1.3
@@ -120,7 +120,7 @@
 +  char          buf[4096];              /* string buffer */
 +  char          tmpfn[4096];            /* temporary name to write new cache to */
 +  int c;
-+  sprintf(tmpfn,"%s-%l",cache,random());
++  sprintf(tmpfn,"%s-%ld",cache,random());
 +
 +  if ((fd = open(cache,O_WRONLY|O_CREAT|O_TRUNC)) > 0) 
 +    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- cups.spec	14 Jul 2006 12:07:45 -0000	1.197
+++ cups.spec	19 Jul 2006 13:36:27 -0000	1.198
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 1.12
+Release: 1.13
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,10 +20,11 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5737.patch
+Patch0: cups-svn5754.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-compile.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -115,10 +116,11 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5737
+%patch0 -p1 -b .svn5754
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
+%patch4 -p1 -b .compile
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -330,10 +332,11 @@
 %dir %{_docdir}/cups-%{version}
 %{_docdir}/cups-%{version}/favicon.ico
 %{_docdir}/cups-%{version}/images
-%{_docdir}/cups-%{version}/ja
+%{_docdir}/cups-%{version}/de
 %{_docdir}/cups-%{version}/es
-%{_docdir}/cups-%{version}/sv
+%{_docdir}/cups-%{version}/ja
 %{_docdir}/cups-%{version}/pl
+%{_docdir}/cups-%{version}/sv
 %{_docdir}/cups-%{version}/*.css
 %{_docdir}/cups-%{version}/admin
 %{_docdir}/cups-%{version}/classes
@@ -399,6 +402,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.13
+- Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.
+
 * Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.12
 - Sync with svn5737.
 


--- cups-svn5737.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:39:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:39:39 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-more-cleanup.patch, NONE,
	1.1 autofs.spec, 1.128, 1.129
Message-ID: <200607191339.k6JDddb4032013@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31963

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-more-cleanup.patch 
Log Message:
* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.3
- More code cleanup and corrections for connectathon tests.


autofs-5.0.1-rc1-cthon-more-cleanup.patch:
 CHANGELOG           |    1 +
 lib/master.c        |    4 ----
 modules/parse_sun.c |   16 +++++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-more-cleanup.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c09ae44..42327f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - cthon shutdown expire fix.
 - cthon more map parser corrections.
 - cthon cleanup and corrections.
+- cthon more cleanup and corrections.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/lib/master.c b/lib/master.c
index 9d16801..1fe17bb 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -514,8 +514,6 @@ void master_source_current_wait(struct m
 {
 	int status;
 
-	debug(LOGOPT_ANY, "locking");
-
 	status = pthread_mutex_lock(&entry->current_mutex);
 	if (status) {
 		error(LOGOPT_ANY, "entry current source lock failed");
@@ -552,8 +550,6 @@ void master_source_current_signal(struct
 		fatal(status);
 	}
 
-	debug(LOGOPT_ANY, "unlocking");
-
 	return;
 }
 
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 00b0bd3..1b396a0 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -637,7 +637,7 @@ add_offset_entry(struct autofs_point *ap
 
 	p_len = strlen(path);
 	/* Trailing '/' causes us pain */
-	if (path[p_len - 1] == '/')
+	if (p_len > 1 && path[p_len - 1] == '/')
 		p_len--;
 	m_key_len = m_root_len + p_len;
 	if (m_key_len > PATH_MAX) {
@@ -677,7 +677,7 @@ add_offset_entry(struct autofs_point *ap
 		      "added multi-mount offset %s -> %s", path, m_mapent);
 	else
 		warn(ap->logopt, MODPREFIX
-		      "syntax error or dupliate offset %s -> %s", path, loc);
+		      "syntax error or duplicate offset %s -> %s", path, loc);
 
 	return ret;
 }
@@ -800,7 +800,6 @@ static int parse_mapent(const char *ent,
 			char *tmp, *newopt = NULL;
 
 			p = parse_options(p, &newopt, logopt);
-
 			tmp = concat_options(myoptions, newopt);
 			if (!tmp) {
 				char *estr;
@@ -816,6 +815,8 @@ static int parse_mapent(const char *ent,
 		} while (*p == '-');
 	}
 
+	debug(logopt, MODPREFIX "gathered options: %s", myoptions);
+
 	/* Location can't begin with a '/' */
 	if (*p == '/') {
 		warn(logopt, MODPREFIX "error location begins with \"/\"");
@@ -836,7 +837,7 @@ static int parse_mapent(const char *ent,
 	}
 
 	if (!validate_location(loc)) {
-		error(logopt, MODPREFIX "invalid location");
+		warn(logopt, MODPREFIX "invalid location");
 		free(myoptions);
 		free(loc);
 		return 0;
@@ -1151,6 +1152,7 @@ int parse_mount(struct autofs_point *ap,
 		} while (*p == '/');
 
 		cache_readlock(mc);
+		me = cache_lookup_distinct(mc, name);
 		if (!me) {
 			error(ap->logopt,
 			      MODPREFIX
@@ -1171,7 +1173,7 @@ int parse_mount(struct autofs_point *ap,
 			rv = parse_mapent(ro->mapent,
 				options, &myoptions, &loc, ap->logopt);
 			if (!rv) {
-				error(ap->logopt,
+				warn(ap->logopt,
 				      MODPREFIX "failed to mount root offset");
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
@@ -1188,7 +1190,7 @@ int parse_mount(struct autofs_point *ap,
 			free(loc);
 
 			if (rv < 0) {
-				error(ap->logopt,
+				warn(ap->logopt,
 				      MODPREFIX
 				      "mount multi-mount root %s failed", name);
 				cache_multi_lock(mc);
@@ -1201,7 +1203,7 @@ int parse_mount(struct autofs_point *ap,
 		}
 
 		if (!mount_multi_triggers(ap, m_root, me, "/")) {
-			error(ap->logopt,
+			warn(ap->logopt,
 			      MODPREFIX "failed to mount offset triggers");
 			free(options);
 			return 1;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- autofs.spec	19 Jul 2006 10:07:38 -0000	1.128
+++ autofs.spec	19 Jul 2006 13:39:36 -0000	1.129
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.2
+%define release 0.rc1.3
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -19,6 +19,7 @@
 Patch6: autofs-5.0.1-rc1-cthon-parser-2.patch
 Patch7: autofs-5.0.1-rc1-cthon-cleanup.patch
 Patch8: autofs-5.0.1-rc1-cthon-add-parser-subs.patch
+Patch9: autofs-5.0.1-rc1-cthon-more-cleanup.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -65,6 +66,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -121,6 +123,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.3
+- More code cleanup and corrections for connectathon tests.
+
 * Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.2
 - Code cleanup and fixes for connectathon tests.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:42:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:42:24 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.8,1.9
Message-ID: <200607191342.k6JDgOeX032567@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32508

Modified Files:
	ldapjdk.spec 
Log Message:
rebuild


Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ldapjdk.spec	12 Jul 2006 06:44:07 -0000	1.8
+++ ldapjdk.spec	19 Jul 2006 13:42:21 -0000	1.9
@@ -1,15 +1,12 @@
-%define name		ldapjdk
 %define spname		ldapsp
-%define version		4.17
 %define tar_name	ldapsdk_java
 %define tar_version	20020819
-%define release 1jpp_3fc.1.1
 %define section		free
 %define use_nonfree	%{?_with_nonfree:1}%{!?_without_nonfree:0}
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}.2.1
+Name:		ldapjdk
+Version:	4.17
+Release: 	1jpp_4fc
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -139,6 +136,10 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 0:4.17-1jpp_4fc
+- fix release
+- remove silly name, version, release defines.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:4.17-1jpp_3fc.1.1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:51:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:51:41 -0400
Subject: rpms/bind/devel bind.spec,1.111,1.112
Message-ID: <200607191351.k6JDpfZG018288@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18239

Modified Files:
	bind.spec 
Log Message:
Rebuild



Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- bind.spec	12 Jul 2006 21:09:01 -0000	1.111
+++ bind.spec	19 Jul 2006 13:51:38 -0000	1.112
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	27.FC6
+Release: 	28.FC6
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -843,6 +843,9 @@
 :;
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 30:9.3.2-28.FC6
+- Rebuild against new dbus
+
 * Wed Jul 12 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-27.FC6
 - rebuild with fixed glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:55:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:55:51 -0400
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.32,1.33
Message-ID: <200607191355.k6JDtp1p019980@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19917

Modified Files:
	dhcdbd.spec 
Log Message:
rebuild



Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dhcdbd.spec	19 Jul 2006 00:52:36 -0000	1.32
+++ dhcdbd.spec	19 Jul 2006 13:55:49 -0000	1.33
@@ -10,7 +10,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
 Version:   1.15
-Release:   1.FC6.2
+Release:   1.FC6.3
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.15-1.FC6.3
+- Rebuild against new dbus
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.15-1.FC6.2
 - add dbus-deprecated patch
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 13:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 09:59:19 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-host-name-validation.patch,
	NONE, 1.1 autofs.spec, 1.129, 1.130
Message-ID: <200607191359.k6JDxJ8P021027@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20965

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-host-name-validation.patch 
Log Message:
* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.4
- Correction to host name validation test for connectathon tests.


autofs-5.0.1-rc1-cthon-host-name-validation.patch:
 CHANGELOG           |    1 +
 modules/parse_sun.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-host-name-validation.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 42327f3..02a975d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 - cthon more map parser corrections.
 - cthon cleanup and corrections.
 - cthon more cleanup and corrections.
+- cthon correction to host validation.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 1b396a0..b07424f 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -762,7 +762,8 @@ static int validate_location(char *loc)
 
 		while (*ptr && *ptr != ':') {
 			if (!(isalnum(*ptr) ||
-			    *ptr == '-' || *ptr == '.' || *ptr == ','))
+			    *ptr == '-' || *ptr == '.' ||
+			    *ptr == ',' || *ptr == '(' || *ptr == ')'))
 				return 0;
 			ptr++;
 		}


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- autofs.spec	19 Jul 2006 13:39:36 -0000	1.129
+++ autofs.spec	19 Jul 2006 13:59:16 -0000	1.130
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.3
+%define release 0.rc1.4
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -20,6 +20,7 @@
 Patch7: autofs-5.0.1-rc1-cthon-cleanup.patch
 Patch8: autofs-5.0.1-rc1-cthon-add-parser-subs.patch
 Patch9: autofs-5.0.1-rc1-cthon-more-cleanup.patch
+Patch10: autofs-5.0.1-rc1-cthon-host-name-validation.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -67,6 +68,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -123,6 +125,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.4
+- Correction to host name validation test for connectathon tests.
+
 * Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.3
 - More code cleanup and corrections for connectathon tests.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:01:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:01:53 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.18,1.19
Message-ID: <200607191401.k6JE1rmp021565@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21476

Modified Files:
	man-pages-fr.spec 
Log Message:
New version of man-pages-fr from upstream.

--- man-pages-fr-2.22.0/man1/aumix.1.mar        2006-07-19 09:04:55.000000000 +0200
+++ man-pages-fr-2.22.0/man1/aumix.1    2006-07-19 10:51:59.000000000 +0200
@@ -30,8 +30,9 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1
 .Sh NOM
 .Nm aumix



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-fr.spec	19 Jul 2006 13:04:15 -0000	1.18
+++ man-pages-fr.spec	19 Jul 2006 14:01:49 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.22.0
-Release:	0
+Release:	2
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -10,7 +10,6 @@
 Patch1:		man-pages-fr-aumix_missTH.patch  
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
-BuildRequires:  utrac
 
 %description
 Manual pages from the Linux Documentation Project, translated into French. Also
@@ -37,23 +36,26 @@
 
 # Conversion to UTF-8 only when needed
 for i in man?/*; do
-  CODING=`utrac -p ${i}`
-  if [ "${CODING}" != "UTF-8" ]
-  then
-    iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
-    install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-    rm -rf ${i}.new
-  else
-    install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-  fi
+        iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
+        mv -f $i.new $i
 done
-
-##make install-install DESTDIR=$RPM_BUILD_ROOT
-
 for i in man?; do
-    install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
+        install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
 done
-    
+                    
+#for i in man?/*; do
+#  CODING=`file -i ${i}`
+#  if [ "${CODING}" != "UTF-8" ]
+#  then
+#    iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
+#    install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+#    rm -rf ${i}.new
+#  else
+#    install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+#  fi
+#done
+
+##make install-install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove files already included in other packages
 # alsa-utils
@@ -99,7 +101,7 @@
 %{_mandir}/fr/
 
 %changelog
-* Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22-0
+* Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-2
 - make from sources from Alain Portal new version of French man-pages
 - man-pages-fr-aumix_missTH.patch - missed header
 - used Spec file for version 2.16 from Alain Portal



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:15:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:15:15 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.2, 1.3 setroubleshoot.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200607191415.k6JEFFvN024883@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24844/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.7-1 on branch devel from setroubleshoot-0.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 19:49:13 -0000	1.2
+++ .cvsignore	19 Jul 2006 14:15:12 -0000	1.3
@@ -1 +1 @@
-setroubleshoot-0.6.tar.gz
+setroubleshoot-0.7.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setroubleshoot.spec	18 Jul 2006 20:12:55 -0000	1.2
+++ setroubleshoot.spec	19 Jul 2006 14:15:12 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.6
-Release: 2
+Version: 0.7
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.redhat.com/ 
@@ -27,8 +27,6 @@
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
 
-BuildRequires: intltool gettext python
-
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -87,6 +85,13 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.7-1
+	* Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
+	* Remove toolbar from popup window since it did nothing, and I think it looks better without it.
+	* fix allow_execmod plugin to report better data.
+
+
+
 * Mon Jun 26 2006 John Dennis <jdennis at redhat.com> - 0.3-1
 - add missing /var/log directory %files section in spec file, and add
   logrotate script


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 19:49:13 -0000	1.2
+++ sources	19 Jul 2006 14:15:12 -0000	1.3
@@ -1 +1 @@
-933fe223d0f7c9d52040796e3a8a5b95  setroubleshoot-0.6.tar.gz
+493a9de32ca6a4c1ce15a0d199838bc4  setroubleshoot-0.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:20:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:20:51 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.19,1.20
Message-ID: <200607191420.k6JEKpsr009350@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9292

Modified Files:
	avalon-logkit.spec 
Log Message:

Build on all archs.




Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- avalon-logkit.spec	12 Jul 2006 05:25:17 -0000	1.19
+++ avalon-logkit.spec	19 Jul 2006 14:20:48 -0000	1.20
@@ -2,7 +2,7 @@
 %define short_Name      LogKit
 %define name		avalon-%{short_name}
 %define version		1.2
-%define release		3jpp_5fc
+%define release		3jpp_6fc
 %define	section		free
 
 Name:		%{name}
@@ -33,9 +33,6 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %description
 LogKit is a logging toolkit designed for secure performance orientated
 logging in applications. To get started using LogKit, it is recomended
@@ -93,6 +90,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3jpp_6fc
+- Build on all archs.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2-3jpp_5fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:30:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:30:00 -0400
Subject: rpms/SysVinit/devel sysvinit-2.86-ipv6.patch,1.1,1.2
Message-ID: <200607191430.k6JEU0fD012866@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12820

Modified Files:
	sysvinit-2.86-ipv6.patch 
Log Message:
fix patch


sysvinit-2.86-ipv6.patch:
 last.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Index: sysvinit-2.86-ipv6.patch
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.86-ipv6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysvinit-2.86-ipv6.patch	18 Jul 2006 18:09:17 -0000	1.1
+++ sysvinit-2.86-ipv6.patch	19 Jul 2006 14:29:57 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur sysvinit-2.86/src/last.c sysvinit-2.86-ipv6/src/last.c
 --- sysvinit-2.86/src/last.c	2004-07-30 14:16:26.000000000 +0200
-+++ sysvinit-2.86-ipv6/src/last.c	2006-07-18 15:32:19.000000000 +0200
++++ sysvinit-2.86-ipv6/src/last.c	2006-07-19 16:14:24.000000000 +0200
 @@ -307,14 +307,15 @@
  	struct sockaddr		*sa;
  	int			salen, flags;
@@ -26,7 +26,7 @@
 -	if (topnibble < 2 || topnibble > 3 || mapped ||
 +
 +	azero = ntohl((unsigned int)a[0]) >> 16;
-+	sitelocal = (azero >= 0xfec0 || azero <= 0xfeff) ? 1 : 0;
++	sitelocal = (azero >= 0xfec0 && azero <= 0xfeff) ? 1 : 0;
 +	
 +	if (((topnibble < 2 || topnibble > 3) && (!sitelocal)) || mapped ||
  	    (a[1] == 0 && a[2] == 0 && a[3] == 0)) {



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:30:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:30:46 -0400
Subject: rpms/dbus/devel dbus.spec,1.89,1.90
Message-ID: <200607191430.k6JEUkcH012996@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12965

Modified Files:
	dbus.spec 
Log Message:
- Move arch include file from lib to libdir



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- dbus.spec	18 Jul 2006 18:21:29 -0000	1.89
+++ dbus.spec	19 Jul 2006 14:30:43 -0000	1.90
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 3 
+Release: 5 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -104,6 +104,8 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mv -f $RPM_BUILD_ROOT/bin/dbus-launch $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/dbus-1.0/include/
+mv -f $RPM_BUILD_ROOT/%{_lib}/dbus-1.0/include/* $RPM_BUILD_ROOT/%{_libdir}/dbus-1.0/include/
 
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
@@ -159,11 +161,18 @@
 %defattr(-,root,root)
 
 /%{_lib}/lib*.so
-/%{_lib}/dbus-1.0/include
+%{_libdir}/dbus-1.0/include/
 %{_libdir}/pkgconfig/dbus-1.pc
 %{_includedir}/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-5
+- Move arch include file from lib to libdir
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-4
+- add patch that pregenerates the xml introspect file so d-bus doesn't
+  have to be running suring the build.
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-3
 - s/--libdir=\/lib/--libdir=% {_lib}/ in configure stage
 - add / before % {_lib}



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:31:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:31:36 -0400
Subject: rpms/SysVinit/devel SysVinit.spec,1.45,1.46
Message-ID: <200607191431.k6JEVa6O013051@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13000

Modified Files:
	SysVinit.spec 
Log Message:
bump



Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- SysVinit.spec	18 Jul 2006 18:09:16 -0000	1.45
+++ SysVinit.spec	19 Jul 2006 14:31:10 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -130,6 +130,9 @@
 /dev/initctl
 
 %changelog
+* Wed Jul 19 2006 Bill Nottingham <notting at redhat.com> - 2.86-6
+- fix IPv6 patch (<mzazrive at redhat.com>)
+
 * Tue Jul 18 2006 Bill Nottingham <notting at redhat.com> - 2.86-5
 - IPv6 support for last (<mzazrive at redhat.com>)
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:34:22 -0400
Subject: rpms/system-config-bind/devel system-config-bind.spec,1.54,1.55
Message-ID: <200607191434.k6JEYMuZ013361@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13327

Modified Files:
	system-config-bind.spec 
Log Message:
rebuild


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- system-config-bind.spec	15 Jun 2006 03:01:35 -0000	1.54
+++ system-config-bind.spec	19 Jul 2006 14:34:19 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	42_FC6
+Release: 	43%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -91,6 +91,9 @@
 fi
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-43
+- fix release tag
+
 * Wed Jun 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-42
 - Handle named.conf 'include' statements within clauses 
   e.g. 'view x { include "y"; }'



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:50:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:50:53 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.44,1.45
Message-ID: <200607191450.k6JEorJT001276@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1245

Modified Files:
	alsa-lib.spec 
Log Message:
rebuild


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- alsa-lib.spec	12 Jul 2006 05:08:06 -0000	1.44
+++ alsa-lib.spec	19 Jul 2006 14:50:50 -0000	1.45
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3.rc2.2.1
+Release: 4.rc2
 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
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-4.rc2
+- fix release for upgrade path
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:51:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:51:30 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-dbus.patch, 1.1, 1.2 kdebase.spec,
	1.201, 1.202
Message-ID: <200607191451.k6JEpUDZ001556@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1371

Modified Files:
	kdebase-3.5.3-dbus.patch kdebase.spec 
Log Message:
- rebuild for dbus
- fixed deprecated dbus functions


kdebase-3.5.3-dbus.patch:
 kdebase-3.5.1/kioslave/media/configure.in.in             |   66 -
 kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp |  168 ++++
 kdebase-3.5.1/kioslave/media/mediamanager/connection.h   |   86 ++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp |  244 ++++++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.h   |   95 ++
 kdebase-3.5.1/kioslave/media/mediamanager/message.cpp    |  551 +++++++++++++++
 kdebase-3.5.1/kioslave/media/mediamanager/message.h      |  132 +++
 kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am    |   11 
 kdebase-3.5.3/kioslave/media/mediamanager/halbackend.h   |    2 
 9 files changed, 1286 insertions(+), 69 deletions(-)

Index: kdebase-3.5.3-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.3-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.3-dbus.patch	1 Jun 2006 15:53:36 -0000	1.1
+++ kdebase-3.5.3-dbus.patch	19 Jul 2006 14:51:27 -0000	1.2
@@ -110,7 +110,7 @@
 +
 +void Connection::close()
 +{
-+  dbus_connection_disconnect( d->connection );
++  dbus_connection_close( d->connection );
 +}
 +
 +void Connection::flush()


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- kdebase.spec	17 Jul 2006 19:49:31 -0000	1.201
+++ kdebase.spec	19 Jul 2006 14:51:27 -0000	1.202
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 13
+Release: 14
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -104,7 +104,7 @@
 BuildRequires: doxygen
 BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
-BuildRequires: dbus-devel >= 0.60
+BuildRequires: dbus-devel >= 0.90
 BuildRequires: hal-devel >= 0.5
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
@@ -554,6 +554,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> 6:3.5.3-14
+- rebuild for dbus
+- fixed deprecated dbus functions
+
 * Sun Jul 16 2006 Than Ngo <than at redhat.com> 6:3.5.3-13
 - fix 146377, khelpcenter's Browse Info Pages > Alphabetically should sort entries
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:51:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:51:56 -0400
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.45,1.46
Message-ID: <200607191451.k6JEpuUN001775@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1746

Modified Files:
	alsa-lib.spec 
Log Message:
rebuild


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- alsa-lib.spec	19 Jul 2006 14:50:50 -0000	1.45
+++ alsa-lib.spec	19 Jul 2006 14:51:53 -0000	1.46
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 4.rc2
+Release: 6.rc2
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -149,7 +149,7 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
-* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-4.rc2
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-6.rc2
 - fix release for upgrade path
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.2.1



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:52:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:52:15 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.65,1.66
Message-ID: <200607191452.k6JEqF2p001932@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1883

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
rebuild



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- nautilus-cd-burner.spec	13 Jul 2006 04:45:47 -0000	1.65
+++ nautilus-cd-burner.spec	19 Jul 2006 14:52:13 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.15.4
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -109,6 +109,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Rebuild against dbus
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:54:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:54:58 -0400
Subject: rpms/isdn4k-utils/devel .cvsignore, 1.13, 1.14 isdn4k-utils.spec,
	1.63, 1.64 sources, 1.14, 1.15
Message-ID: <200607191454.k6JEsw5x002979@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2889

Modified Files:
	.cvsignore isdn4k-utils.spec sources 
Log Message:
- add pppd 2.4.4
- use isdn-header files from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Apr 2006 14:42:26 -0000	1.13
+++ .cvsignore	19 Jul 2006 14:54:56 -0000	1.14
@@ -7,3 +7,5 @@
 isdn4k-utils-CVS-2005-02-16.tar.bz2
 isdn4k-utils-CVS-2005-03-09.tar.bz2
 isdn4k-utils-CVS-2006-02-13.tar.bz2
+isdn4k-utils-ppp-2.4.4.tar.bz2
+isdn4k-utils-CVS-2006-07-20.tar.bz2


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- isdn4k-utils.spec	14 Jul 2006 13:31:08 -0000	1.63
+++ isdn4k-utils.spec	19 Jul 2006 14:54:56 -0000	1.64
@@ -1,6 +1,6 @@
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-%define interver CVS-2006-02-13
+%define interver CVS-2006-07-20
 %ifarch s390 s390x
 %define PIE -fPIE
 %else
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 49
+Release: 50
 License: GPL
 Group: Applications/System
 
@@ -26,10 +26,10 @@
 Source4: isdndial
 Source5: isdnstatus
 Source6: isdnhangup
-Source7: isdn-header-1.tar.bz2
+Source7: isdn4k-utils-ppp-2.4.4.tar.bz2
 Source8: capi.init
 
-Patch0: isdn4k-utils-CVS-2006-02-13-redhat.patch
+Patch0: isdn4k-utils-CVS-2006-07-20-redhat.patch
 Patch2: ibod-config.patch
 Patch3: isdn4k-utils-man.patch
 Patch4: isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
@@ -39,6 +39,7 @@
 Patch11: isdn4k-utils-statfs.patch
 Patch12: isdn4k-utils-CVS-2005-03-09-xmon.patch
 Patch13: isdn4k-utils-capiinit.patch
+Patch14: isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
 
 BuildRoot: %{_tmppath}/%name-%{version}-%{release}-root
 
@@ -122,6 +123,7 @@
 %patch11 -p1 -b .statfs
 %patch12 -p1 -b .xmon
 %patch13 -p1 -b .capi
+%patch14 -p1 -b .pppd-2.4.4
 
 for i in */configure; do
 	cd `dirname $i`
@@ -495,6 +497,10 @@
 %doc xmonisdn/README
 
 %changelog
+* Wed Jul 19 2006 Than Ngo <than at redhat.com> 3.2-50
+- add pppd 2.4.4
+- use isdn-header files from upstream
+
 * Wed Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 3.2-49
 - rebuild
 - add missing br automake libtool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Apr 2006 14:42:26 -0000	1.14
+++ sources	19 Jul 2006 14:54:56 -0000	1.15
@@ -1,3 +1,3 @@
 38b45be27c0a82b38380f680fdee0aff  ibod-1.4-src.tar.gz
-f3363587ff8007ff3261dba9e877c36e  isdn-header-1.tar.bz2
-865d84dc643877ccc9a178a26f39bc45  isdn4k-utils-CVS-2006-02-13.tar.bz2
+92c52638be0abee7bd8195878f4df335  isdn4k-utils-ppp-2.4.4.tar.bz2
+7cde4a61e870bb7e53cd912a3fc30207  isdn4k-utils-CVS-2006-07-20.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:55:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:55:46 -0400
Subject: rpms/xchat/devel xchat.spec,1.51,1.52
Message-ID: <200607191455.k6JEtkqG003329@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3277

Modified Files:
	xchat.spec 
Log Message:
rebuild



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xchat.spec	22 May 2006 21:38:11 -0000	1.51
+++ xchat.spec	19 Jul 2006 14:55:43 -0000	1.52
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.0
-Release:   5
+Release:   6
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> -  1:2.6.0-6
+- Rebuild against dbus
+
 * Mon May 22 2006 Jesse Keating <jkeating at redhat.com> - 1:2.6.0-5
 - Adding missing buildreq (bz:191577, thanks Paul F.)
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 14:58:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 10:58:24 -0400
Subject: rpms/totem/devel totem.spec,1.65,1.66
Message-ID: <200607191458.k6JEwObZ004400@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4362

Modified Files:
	totem.spec 
Log Message:
rebuild



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- totem.spec	12 Jul 2006 05:25:58 -0000	1.65
+++ totem.spec	19 Jul 2006 14:58:21 -0000	1.66
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.5.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -161,6 +161,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-2
+- Rebuild against dbus
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-1
 - Update to 1.5.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:01:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:01:51 -0400
Subject: rpms/readahead/devel readahead.spec,1.27,1.28
Message-ID: <200607191501.k6JF1psf005272@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5210

Modified Files:
	readahead.spec 
Log Message:
rebuild


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- readahead.spec	12 Jul 2006 07:58:09 -0000	1.27
+++ readahead.spec	19 Jul 2006 15:01:42 -0000	1.28
@@ -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%%?})
+Release:	3
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-3
+- fix release for upgrade path (by removing cvs generated release)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-1.26
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:03:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:03:01 -0400
Subject: rpms/isdn4k-utils/devel isdn4k-utils-CVS-2006-07-20-redhat.patch,
	NONE, 1.1
Message-ID: <200607191503.k6JF31rC005441@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5121

Added Files:
	isdn4k-utils-CVS-2006-07-20-redhat.patch 
Log Message:
cleanup


isdn4k-utils-CVS-2006-07-20-redhat.patch:
 isdn4k-utils-CVS-2003-09-23/.config.rpm                          |   49 +++++-----
 isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in                  |   10 +-
 isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in                 |    2 
 isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in                    |    6 -
 isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am                  |    2 
 isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am                 |    2 
 isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in               |    8 -
 isdn4k-utils-CVS-2003-09-23/doc/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/icn/Makefile.in                      |   10 +-
 isdn4k-utils-CVS-2003-09-23/imon/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/imontty/Makefile                     |   19 +--
 isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c                          |    2 
 isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in                |    8 -
 isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in                   |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in                 |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in                  |   19 +--
 isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf        |   35 ++-----
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in        |    4 
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in       |    8 -
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in    |    4 
 isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in       |    6 -
 isdn4k-utils-CVS-2003-09-23/lib/Makefile.in                      |    2 
 isdn4k-utils-CVS-2003-09-23/loop/Makefile.in                     |    8 -
 isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in                    |    8 -
 isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile    |    2 
 isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am                   |    2 
 isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in                     |   10 +-
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example     |    6 -
 isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example |   20 ++--
 isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile                  |    2 
 isdn4k-utils-CVS-2004-11-18/Makefile                             |   16 +--
 isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile              |    6 -
 isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in                    |   10 +-
 isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile               |    2 
 isdn4k-utils-CVS-2005-02-16/lib/Makefile                         |    2 
 38 files changed, 160 insertions(+), 176 deletions(-)

--- NEW FILE isdn4k-utils-CVS-2006-07-20-redhat.patch ---
--- isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in.redhat	2002-07-19 21:03:49.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/act2000/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= actctrl
@@ -18,9 +18,9 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in.redhat	1999-06-19 11:39:59.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/areacode/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -12,7 +12,7 @@
 	# only ones that _really_ exist on _every_ system.
 	#
 	BUILDOPTS   := $(DATAOPTS)
-	INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+	INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in.redhat	2002-07-19 21:03:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/avmb1/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
+CFLAGS			= $(RPM_OPT_FLAGS)
 LDFLAGS			= -L../lib @LIBS@
 INCLUDES		= -I.
 PROGRAMS		= avmcapictrl
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am.redhat	2000-03-03 16:54:12.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capifax/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am.redhat	2000-10-20 19:14:20.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/capiinfo/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am.redhat	2000-03-17 17:19:43.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/capiinit/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr core
 
 INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
 LDFLAGS = $(all_libraries)
 LDADD = 
 
--- isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/divertctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= divertctrl
 MODULES			= divertctrl.o
 MANPAGE			= divertctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/doc/Makefile.in.redhat	1999-12-24 15:14:50.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/doc/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -9,7 +9,7 @@
 SED				= @SED@
 MANDIR			= @CONFIG_MANDIR@
 MANPAGES		= ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN		= @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN		= @INSTALL@ -m 0644
 prefix			= @prefix@
 
 %.1: %.man
--- isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in.redhat	2002-07-19 20:42:01.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/eicon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -DUNIX -DLINUX
-INCLUDES		= -I. -Iinclude
+CFLAGS			= -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -Iinclude
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		= 
 PROGRAM			= eiconctrl
@@ -22,9 +22,9 @@
 DATA_DIR		= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			= -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
 
--- isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in.redhat	2002-07-19 21:03:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/hisax/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS) -I.
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		=
 MODULES			= hisaxctrl.o
@@ -16,9 +16,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils-CVS-2003-09-23/icn/Makefile.in.redhat	2002-07-19 21:03:52.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/icn/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= icnctrl
@@ -17,9 +17,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			=
 
--- isdn4k-utils-CVS-2003-09-23/imon/Makefile.in.redhat	2002-07-19 21:03:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imon/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -7,8 +7,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= imon
 MODULES			= imon.o
@@ -18,8 +18,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/imontty/Makefile.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/imontty/Makefile	2003-09-30 17:44:24.000000000 +0200
@@ -15,14 +15,14 @@
 	# Manual config standalone
 	#
 	CONFIG_SBINDRIR := /sbin
-	MAN8DIR         := /usr/man/man8
+	MAN8DIR         := /usr/share/man/man8
 endif
 
 INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
 MANPAGE=imontty.8
 
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS)
 #CCFLAGS=-I$(ISDN_INCLUDE) -g
 
 # nothing to change behind this line
@@ -34,13 +34,6 @@
 imontty: imontty.c imontty.h
 	cc $(CCFLAGS) -o imontty imontty.c
 
-rootperm:
-	@echo 'main(int argc,char**argv){unlink(argv[0]);return(getuid()==0);}'>g
-	@if gcc -x c -o G g && rm -f g && ./G ; then \
-		echo -e "\n\n      Need root permission for (de)installation!\n\n"; \
-		exit 1; \
-	fi
-
 imontty.8: imontty.8.in
 	MANDATE=`grep CHECKIN $< | awk '{print $$4}'`; \
 	sed \
@@ -52,10 +45,10 @@
 	mkdir -p $(DESTDIR)$(MAN8DIR)
 	$(INSTALL_MAN) $< $(DESTDIR)$(MAN8DIR)/$(MANPAGE)
 
-install: $(PROGS) rootperm install-man
-	install -s -o 0 -g 0 -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
+install: $(PROGS) install-man
+	install -m 0755 $(PROGS) $(DESTDIR)$(CONFIG_SBINDIR)
 
-uninstall: rootperm
+uninstall:
 	for i in $(PROGS) ; do rm -f $(DESTDIR)$(CONFIG_SBINDIR)/$$i; done
 
 clean:
--- isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in.redhat	2002-07-19 21:03:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/ipppstats/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,14 +6,14 @@
 MANDIR       = @CONFIG_MANDIR@
 CC           = @CC@
 INSTALL      = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR  = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR  = $(INSTALL) -m 755 -d
 
 PPPSTATSRCS  = ipppstats.c
 PPPSTATOBJS  = ipppstats.o
 
-CFLAGS       = -fomit-frame-pointer -O2
+CFLAGS       = $(RPM_OPT_FLAGS)
 
 all: ipppstats
 
--- isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in.redhat	2002-07-19 23:23:53.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/iprofd/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= iprofd
 MODULES			= iprofd.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnctrl/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			  = /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 LDFLAGS			= @LIBS@ 
 PROGRAM			= isdnctrl
 MODULES			= isdnctrl.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@ -DVERSION=\"@I4LVERSION@\"
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf.redhat	2000-09-08 10:55:51.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/samples/callerid.conf	2003-09-30 17:44:24.000000000 +0200
@@ -2,38 +2,31 @@
 # 
 # More information: See the isdnlog documentation
 
+#INTERFACE = ippp0      # Isdn network interface. This information  is  required
+                        # with the "-hx" / hangup="value" option.
+
+
 [MSN]
 NUMBER = 4711
 ALIAS  = Phone
 SI     = 1
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|H
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
 
 [MSN]
 NUMBER = 4711
 ALIAS  = HDLC
 SI     = 7
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|
-  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS  = Modem
-SI     = 1
-ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
 
 [NUMBER]
 NUMBER = 01910
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in.redhat	2000-08-15 17:16:23.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/cdb/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -20,7 +20,7 @@
 BINDIR:=$(DESTDIR)@prefix@/bin
 INCDIR:=$(DESTDIR)@prefix@/include
 
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
 
 all: depend $(FILES)
 
@@ -46,7 +46,7 @@
 	install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) \
 		$(INCDIR)
 
-install:
+install: install-dirs
 	install -m0755 $(BINS) $(BINDIR)
 	install -m0644 $(MAN1) $(MAN1DIR)
 	install -m0644 $(MAN3) $(MAN3DIR)
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in.redhat	2003-07-25 23:23:15.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/dest/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -6,7 +6,7 @@
 -include ../../../.config
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 export DBEXT		= @DBEXT@
@@ -20,9 +20,9 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
+INSTALL_DATA		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 DATADIR			= @datadir@
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in.redhat	1999-12-24 15:17:08.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/telrate/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -8,8 +8,8 @@
 CGIDIR		= @CGIDIR@
 TELDIR		= @TELDIR@
 INSTALL		= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0755
-INSTALL_FILE	= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0755
+INSTALL_FILE	= $(INSTALL) -m 0644
 
 FILES = index.html info.html *.jpg *.gif tt.js
 
--- isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in.redhat	2003-03-11 14:08:00.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/tools/zone/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 #
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 CDBEXTRALIBS		= @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 #CC			= @CC@ -V2.7.2.3
--- isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in.redhat	2003-08-26 21:46:11.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/isdnlog/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -1542,10 +1542,10 @@
 # autoconf isdnlog specific stuff
 #
 INSTALL			:= @INSTALL@
-INSTALL_DIR		:= $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN		:= $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN		:= $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA		:= $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR		:= $(INSTALL) -m 0755 -d
+INSTALL_SBIN		:= $(INSTALL) -m 0700
+INSTALL_BIN		:= $(INSTALL) -m 0755
+INSTALL_DATA		:= $(INSTALL) -m 0644
 
 BZIP2                   := @BZIP2@
 BUNZIP2                 := $(BZIP2) -f -d
@@ -1600,9 +1600,9 @@
 SUBDIRS     += $(LIBISDNDIR)
 endif
 
-# export CFLAGS  = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS  = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 
-export CFLAGS  = -Wall -pipe
+export CFLAGS  = -Wall $(RPM_OPT_FLAGS)
 ifndef _CC
 export _CC  = gcc
 endif
@@ -1837,8 +1837,7 @@
 		echo ""; echo 'Do "make (un)install" as root!' ;echo ""; false; \
 	fi
 
-uninstall: rootperm
-		if ps x | fgrep $(ISDNLOG) >/dev/null; then kill `cat $(RUNDIR)/isdnlog.isdnctrl0.pid` 2>/dev/null; fi
+uninstall:
 		rm -f	$(DESTDIR)$(SBINDIR)/$(ISDNLOG) \
 			$(DESTDIR)$(BINDIR)/$(ISDNREP)	\
 			$(DESTDIR)$(BINDIR)/$(ISDNCONF)
@@ -1859,7 +1858,7 @@
 			$(DESTDIR)$(DATADIR)/dest.cdb
 
 
-installdirs: rootperm
+installdirs:
 		$(INSTALL_DIR) $(DESTDIR)$(I4LCONFDIR)
 		$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 		$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
@@ -1868,7 +1867,7 @@
 		$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
 		$(INSTALL_DIR) $(DESTDIR)$(DATADIR)
 
-install: all rootperm installdirs install-conf install-data install-progs
+install: all installdirs install-conf install-data install-progs
 
 install-old-conf:
 		@if [ -n "$(DESTDIR)$(OLDCONFDIR)" -a "$(DESTDIR)$(OLDCONFDIR)" != '/' ] ; then \
--- isdn4k-utils-CVS-2003-09-23/lib/Makefile.in.redhat	1999-12-12 18:22:36.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/lib/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -11,7 +11,7 @@
 	# Install as root with numeric Id's, since these are the
 	# only ones that _really_ exist on _every_ system.
 	#
-	INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+	INSTALLOPTS += INSTALL= install -m 644
 endif
 
 all: .depend
--- isdn4k-utils-CVS-2003-09-23/loop/Makefile.in.redhat	2002-07-19 21:03:56.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/loop/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I.
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= loopctrl
 MODULES			= loopctrl.o
 MANPAGE			= loopctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in.redhat	2002-07-19 21:03:57.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pcbit/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -Wstrict-prototypes -O2 -g
-INCLUDES		= -I. -DDEBUG 
+CFLAGS			= -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -DDEBUG
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= pcbitctl
 MODULES			= pcbitctl.o convhexbin.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile.redhat	2001-05-01 14:43:50.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/pppdcapiplugin/ppp-2.4.1/Makefile	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 #  as published by the Free Software Foundation; either version
 #  2 of the License, or (at your option) any later version.
 
-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
+PLUGINDIR=${DESTDIR}/$(LIBDIR)/pppd/$(PPPVERSION)
 
 include $(TOPDIR)/Rules.make
 
--- isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am.redhat	2002-07-19 23:23:54.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/rcapid/Makefile.am	2003-09-30 17:44:24.000000000 +0200
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example.redhat	1997-04-28 18:51:29.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxd.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -5,7 +5,7 @@
 # login (server startup) time. If access is 'yes' the host can login
 # and count messages without special access.
 
-L:localhost:Y
+#L:localhost:Y
 L:*:N
 
 # Full access list
@@ -13,7 +13,7 @@
 # All hosts in the full access list (begins with 'A') are checked if the
 # server gets the 'login' command.
 
-A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
-A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
+#A:localhost:RW:michael:xxx:/var/spool/vbox/michael:incoming
+#A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 
 A:*:!:!:!:!:!
--- isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example.redhat	1997-10-22 22:46:58.000000000 +0200
+++ isdn4k-utils-CVS-2003-09-23/vbox/examples/vboxgetty.conf.example	2003-09-30 17:44:24.000000000 +0200
@@ -20,18 +20,18 @@
 
 # Settings for port ttyI6
 
-port /dev/ttyI6
-  modeminit		ATZ&B512&E7830022
-  user			nicole
-  group			users
-  spooldir		/var/spool/vbox/nicole
+#port /dev/ttyI6
+#  modeminit		ATZ&B512&E7830022
+#  user			nicole
+#  group			users
+#  spooldir		/var/spool/vbox/nicole
 
 
 # Settings for port ttyI7
 
-port /dev/ttyI7
-  modeminit		ATZ&B512&E7850413
-  user			michael
-  group			users
-  spooldir		/var/spool/vbox/michael
+#port /dev/ttyI7
+#  modeminit		ATZ&B512&E7850413
+#  user			michael
+#  group			users
+#  spooldir		/var/spool/vbox/michael
 
--- isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in.redhat	2002-01-31 21:05:40.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/vbox/Makefile.in	2003-09-30 17:44:24.000000000 +0200
@@ -14,33 +14,33 @@
 # [*] Program to install binaries to the sbin directory (eg vboxgetty):      #
 #----------------------------------------------------------------------------#
 
-INSTALL_SBIN	= @INSTALL@ -m 750 -o root -g root -s
+INSTALL_SBIN	= @INSTALL@ -m 750
 
 #----------------------------------------------------------------------------#
 # [*] Program to install binaries to the bin directory (eg vboxconvert):     #
 #----------------------------------------------------------------------------#
 
-INSTALL_BIN	= @INSTALL@ -m 755 -o root -g root -s
+INSTALL_BIN	= @INSTALL@ -m 755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install bash scripts to the bin directory (eg vboxplay):    #
 #----------------------------------------------------------------------------#
 
-INSTALL_SHBIN	= @INSTALL@ -m 755 -o root -g root
+INSTALL_SHBIN	= @INSTALL@ -m 755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install binaries to the bin directory and set the suid bit  #
 #     (eg vboxbeep):                                                         #
 #----------------------------------------------------------------------------#
 
-INSTALL_UBIN	= @INSTALL@ -m 4755 -o root -g root -s
+INSTALL_UBIN	= @INSTALL@ -m 4755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install configurations to sysconf directory                 #
 #     (eg vboxgetty.conf):                                                   #
 #----------------------------------------------------------------------------#
 
-INSTALL_SYSCONF	= @INSTALL@ -m 640 -o root -g root
+INSTALL_SYSCONF	= @INSTALL@ -m 640
 
 #----------------------------------------------------------------------------#
 # [*] Program to create missing directories:                                 #
--- isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile.redhat	1998-03-08 19:54:01.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/xisdnload/Imakefile	2003-09-30 17:44:24.000000000 +0200
@@ -21,7 +21,7 @@
            OBJS = xisdnload.o
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-      DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+      DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 
 AllTarget(xisdnload)
 NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils-CVS-2003-09-23/.config.rpm.redhat	1998-11-23 13:12:04.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/.config.rpm	2003-09-30 17:59:55.000000000 +0200
@@ -5,16 +5,16 @@
 #
 # Code maturity level options
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 
 #
 # General configuration
 #
 CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux'
 CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
 CONFIG_RUNDIR='/var/run'
 CONFIG_LOCKDIR='/var/lock'
 CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
 CONFIG_CALLERIDFILE='callerid.conf'
 CONFIG_USERCONFFILE='~/.isdn'
 CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
 CONFIG_COUNTRY_PREFIX='+'
 CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
 
 #
 # Runtime configuration tools
@@ -36,18 +34,20 @@
 CONFIG_ISDNCTRL_CONF=y
 CONFIG_ISDNCTRL_TIMRU=y
 CONFIG_IPROFD=y
+CONFIG_DIVERTCTRL=y
 
 #
 # Card configuration tools
 #
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
 CONFIG_HISAXCTRL=y
 CONFIG_ICNCTRL=y
 # CONFIG_ICNCTRL_DEBUG is not set
 CONFIG_PCBITCTL=y
 CONFIG_AVMCAPICTRL=y
+CONFIG_EICONCTRL=y
 CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
 # CONFIG_LOOPCTRL_DEBUG is not set
 
 #
@@ -64,14 +64,20 @@
 CONFIG_ISDNLOG_USERFILE='isdnlog.users'
 CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
 CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 # CONFIG_ISDNLOG_POSTGRES is not set
 # CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
 CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
 CONFIG_IPPPSTATS=y
 CONFIG_XISDNLOAD=y
 CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
 #
 # Options for xmonisdn
 #
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
 
 #
 # Applications
@@ -94,23 +100,22 @@
 VBOX_LOGDIR='/var/log/vbox'
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.3'
+# VBOX_SUSPEND_ID is not set
 CONFIG_IPPPD=y
 
 #
 # Options for ipppd
 #
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
 # CONFIG_IPPPD_RADIUS is not set
 # CONFIG_RADIUS_WTMP_LOGGING is not set
 RADIUS_CLIENT_CONFIG_FILE=''
 CONFIG_CAPIFAX=y
 CONFIG_RCAPID=y
 
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c.redhat	2000-11-12 17:06:42.000000000 +0100
+++ isdn4k-utils-CVS-2003-09-23/ipppd/ccp.c	2004-01-20 19:14:07.000000000 +0100
@@ -41,7 +41,7 @@
 
 #include "compressions.h"
 
-#if 0
+#if HAVE_LZSCOMP_H
 #include <linux/isdn_lzscomp.h>
 #else
 #include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile.redhat	2004-02-14 16:02:46.000000000 +0100
+++ isdn4k-utils-CVS-2004-11-18/pppdcapiplugin/Makefile	2004-11-18 16:48:54.848276370 +0100
@@ -12,13 +12,13 @@
 export CAPIINC=$(TOPDIR)/../capi20
 export CAPILIB=$(TOPDIR)/../capi20
 export INSTALL=$(TOPDIR)/install-sh -c
-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
 export MKDIR=$(TOPDIR)/mkinstalldirs
 
 PPPSRCDIRS=/src/isdn/pppd
 
 ifeq ($(PPPVERSIONS),)
-PPPVERSIONS = 2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3
+PPPVERSIONS = 2.4.3
 endif
 
 PEERDIR=${DESTDIR}/etc/ppp/peers/isdn
@@ -62,7 +62,7 @@
 	done
 
 install-man:
-	for i in ${DESTDIR}/usr/share/man ${DESTDIR}/usr/man; do \
+	for i in ${DESTDIR}/usr/share/man ; do \
 		if [ -d $$i/man8 ] ; then \
 			echo $(INSTALLDATA) capiplugin.8 $$i/man8; \
 			$(INSTALLDATA) capiplugin.8 $$i/man8; \
--- isdn4k-utils-CVS-2004-11-18/Makefile.redhat	2004-08-30 16:06:42.000000000 +0200
+++ isdn4k-utils-CVS-2004-11-18/Makefile	2004-12-01 22:19:13.193347501 +0100
@@ -16,8 +16,8 @@
 # Following line is important for lib and isdnlog (sl).
 export ROOTDIR=$(shell pwd)
 
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
 do-it-all:      subtargets
 else
 CONFIGURATION = config
@@ -130,16 +130,10 @@
 		exit 1; \
 	fi
 
-install: rootperm
+install:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
-	@if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
-	then \
-		/bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
-	else \
-		sh scripts/makedev.sh $(DESTDIR) ; \
-	fi
 
-uninstall: rootperm
+uninstall:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
 
 #
@@ -202,7 +196,7 @@
 	@set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
 		if [ -x $$i/configure ] ; then \
 			/bin/echo -e "\nRunning configure in $$i ...\n"; sleep 1; \
-			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+			(cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --libdir=$(LIBDIR) --datadir=$(CONFIG_DATADIR) --enable-ippp-filter || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
 		elif [ -f $$i/Makefile.in ] ; then \
 			/bin/echo -e "\nRunning make -f Makefile.in config in $$i ...\n"; sleep 1; \
 			$(MAKE) -C $$i -f Makefile.in config; \
--- isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in.redhat	2004-08-30 16:56:36.000000000 +0200
+++ isdn4k-utils-CVS-2005-02-16/ipppd/Makefile.in	2005-02-16 18:42:54.119955183 +0100
@@ -15,10 +15,10 @@
 MANDIR        := @CONFIG_MANDIR@
 CC            := @CC@
 INSTALL       := @INSTALL@
-INSTALL_DIR   := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN  := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN   := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA  := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR   := $(INSTALL) -m 0755 -d
+INSTALL_SBIN  := $(INSTALL) -m 0700 
+INSTALL_BIN   := $(INSTALL) -m 0755
+INSTALL_DATA  := $(INSTALL) -m 0644
 RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
 
 ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
 
 DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
 COMPILE_FLAGS = 
-CFLAGS        = -O2 -fomit-frame-pointer -Wall
+CFLAGS        = $(RPM_OPT_FLAGS)
 VER           = 2.2.0
 
 # it's a hack
--- isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile.cflags	2005-02-16 18:53:15.393382578 +0100
+++ isdn4k-utils-CVS-2005-02-16/isdnlog/tools/Makefile	2005-02-16 18:53:51.914999474 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
 
 all: rate-at
--- isdn4k-utils-CVS-2005-02-16/lib/Makefile.cflags	2005-02-16 19:04:04.338731270 +0100
+++ isdn4k-utils-CVS-2005-02-16/lib/Makefile	2005-02-16 19:04:24.150811068 +0100
@@ -28,7 +28,7 @@
 # USER CONFIGURATION AREA
 ######################################################################
 
-CFLAGS      = -g -Wall -pipe #-O6
+CFLAGS      = $(RPM_OPT_FLAGS)
 DEFS        =
 ifndef _CC
 export _CC  = gcc



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:09:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:09:02 -0400
Subject: rpms/xchat/devel xchat.spec,1.52,1.53
Message-ID: <200607191509.k6JF92HI006005@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5970

Modified Files:
	xchat.spec 
Log Message:
fix build reqs



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- xchat.spec	19 Jul 2006 14:55:43 -0000	1.52
+++ xchat.spec	19 Jul 2006 15:08:57 -0000	1.53
@@ -27,7 +27,7 @@
 
 BuildRequires: perl python-devel openssl-devel pkgconfig
 BuildRequires: GConf2-devel
-BuildRequires: dbus-devel >= 0.60, dbus-glib >= 0.60
+BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.0.3, gtk2-devel >= 2.0.3, bison >= 1.35
 BuildRequires: gettext /bin/sed
 # For gconftool-2:



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:10:57 -0400
Subject: rpms/apr/FC-5 apr-1.2.7-psprintfpi.patch, NONE, 1.1 apr.spec, 1.49,
	1.50 sources, 1.6, 1.7 apr-1.2.2-chdirwarn.patch, 1.1,
	NONE apr-1.2.2-random.patch, 1.1,
	NONE apr-1.2.2-reuseaddr.patch, 1.1,
	NONE apr-1.2.2-seekflush.patch, 1.1, NONE
Message-ID: <200607191510.k6JFAvH4006555@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6517

Modified Files:
	apr.spec sources 
Added Files:
	apr-1.2.7-psprintfpi.patch 
Removed Files:
	apr-1.2.2-chdirwarn.patch apr-1.2.2-random.patch 
	apr-1.2.2-reuseaddr.patch apr-1.2.2-seekflush.patch 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.1
- update to 1.2.7
- add fix for psprintf/%pi issue


apr-1.2.7-psprintfpi.patch:
 include/arch/apr_private_common.h |    8 ++++++++
 network_io/unix/sockaddr.c        |   30 ++++++++++++++++++++----------
 strings/apr_snprintf.c            |   12 ++++++++++--
 test/testsock.c                   |   24 ++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 12 deletions(-)

--- NEW FILE apr-1.2.7-psprintfpi.patch ---
--- apr-1.2.7/test/testsock.c.psprintfpi
+++ apr-1.2.7/test/testsock.c
@@ -207,6 +207,29 @@
     APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv);
 }
 
+static void test_print_addr(abts_case *tc, void *data)
+{
+    apr_sockaddr_t *sa;
+    char *s;
+
+    APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr",
+                       apr_sockaddr_info_get(&sa, "0.0.0.0", APR_INET, 80, 0, p));
+
+    s = apr_psprintf(p, "foo %pI bar", sa);
+
+    ABTS_STR_EQUAL(tc, "foo 0.0.0.0:80 bar", s);
+
+#if APR_HAVE_IPV6
+    if (apr_sockaddr_info_get(&sa, "::ffff:0.0.0.0", APR_INET6, 80, 0, p) == APR_SUCCESS) {
+        /* sa should now be a v4-mapped IPv6 address. */
+
+        s = apr_psprintf(p, "%pI", sa);
+        
+        ABTS_STR_EQUAL(tc, "0.0.0.0:80", s);
+    }
+#endif
+}
+
 static void test_get_addr(abts_case *tc, void *data)
 {
     apr_status_t rv;
@@ -284,6 +307,7 @@
     abts_run_test(suite, test_send, NULL);
     abts_run_test(suite, test_recv, NULL);
     abts_run_test(suite, test_timeout, NULL);
+    abts_run_test(suite, test_print_addr, NULL);
     abts_run_test(suite, test_get_addr, NULL);
 
     return suite;
--- apr-1.2.7/strings/apr_snprintf.c.psprintfpi
+++ apr-1.2.7/strings/apr_snprintf.c
@@ -463,7 +463,8 @@
 }
 
 
-
+/* Must be passed a buffer of size NUM_BUF_SIZE where buf_end points
+ * to 1 byte past the end of the buffer. */
 static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, apr_size_t *len)
 {
     char *p = buf_end;
@@ -473,7 +474,14 @@
 
     p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len);
     *--p = ':';
-    apr_sockaddr_ip_get(&ipaddr_str, sa);
+    ipaddr_str = buf_end - NUM_BUF_SIZE;
+    if (apr__sockaddr_ip_getbuf(ipaddr_str, sa->addr_str_len, sa)) {
+        /* Should only fail if the buffer is too small, which it
+         * should not be; but fail safe anyway: */
+        *--p = '?';
+        *len = buf_end - p;
+        return p;
+    }
     sub_len = strlen(ipaddr_str);
 #if APR_HAVE_IPV6
     if (sa->family == APR_INET6 &&
--- apr-1.2.7/include/arch/apr_private_common.h.psprintfpi
+++ apr-1.2.7/include/arch/apr_private_common.h
@@ -23,6 +23,7 @@
 
 #include "apr_pools.h"
 #include "apr_tables.h"
+#include "apr_network_io.h"
 
 apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts,
                                           const char *liststr,
@@ -34,6 +35,13 @@
                                           char separator,
                                           apr_pool_t *p);
 
+/* This is a non-allocating version of apr_sockaddr_ip_get() which is
+ * used internally (in 1.2.x) by the vformatter implementation.
+ * Writes the address to @param buf which is of length @buflen.
+ */
+apr_status_t apr__sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
+                                     apr_sockaddr_t *sockaddr);
+
 /* temporary defines to handle 64bit compile mismatches */
 #define APR_INT_TRUNC_CAST    int
 #define APR_UINT32_TRUNC_CAST apr_uint32_t
--- apr-1.2.7/network_io/unix/sockaddr.c.psprintfpi
+++ apr-1.2.7/network_io/unix/sockaddr.c
@@ -98,27 +98,37 @@
     }
 }
 
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
-                                         apr_sockaddr_t *sockaddr)
+apr_status_t apr__sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
+                                     apr_sockaddr_t *sockaddr)
 {
-    *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
-    apr_inet_ntop(sockaddr->family,
-                  sockaddr->ipaddr_ptr,
-                  *addr,
-                  sockaddr->addr_str_len);
+    if (!apr_inet_ntop(sockaddr->family, sockaddr->ipaddr_ptr, buf, buflen)) {
+        return APR_ENOSPC;
+    }
+
 #if APR_HAVE_IPV6
-    if (sockaddr->family == AF_INET6 &&
-        IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)) {
+    if (sockaddr->family == AF_INET6 
+        && IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)
+        && buflen > strlen("::ffff:")) {
         /* This is an IPv4-mapped IPv6 address; drop the leading
          * part of the address string so we're left with the familiar
          * IPv4 format.
          */
-        *addr += strlen("::ffff:");
+        memmove(buf, buf + strlen("::ffff:"),
+                strlen(buf + strlen("::ffff:"))+1);
     }
 #endif
+    /* ensure NUL termination if the buffer is too short */
+    buf[buflen-1] = '\0';
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
+                                              apr_sockaddr_t *sockaddr)
+{
+    *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
+    return apr__sockaddr_ip_getbuf(*addr, sockaddr->addr_str_len, sockaddr);
+}
+
 void apr_sockaddr_vars_set(apr_sockaddr_t *addr, int family, apr_port_t port)
 {
     addr->family = family;


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/FC-5/apr.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apr.spec	26 May 2006 07:54:51 -0000	1.49
+++ apr.spec	19 Jul 2006 15:10:55 -0000	1.50
@@ -2,8 +2,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.2
-Release: 7.3
+Version: 1.2.7
+Release: 1.1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -11,12 +11,9 @@
 Patch1: apr-0.9.6-readdir64.patch
 Patch2: apr-0.9.6-procexit.patch
 Patch3: apr-0.9.7-deepbind.patch
-Patch4: apr-1.2.2-chdirwarn.patch
-Patch5: apr-1.2.2-reuseaddr.patch
 Patch6: apr-1.2.2-locktimeout.patch
 Patch7: apr-1.2.2-libdir.patch
-Patch8: apr-1.2.2-seekflush.patch
-Patch9: apr-1.2.2-random.patch
+Patch8: apr-1.2.7-psprintfpi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -45,12 +42,9 @@
 %patch1 -p1 -b .readdir64
 %patch2 -p1 -b .procexit
 %patch3 -p1 -b .deepbind
-%patch4 -p1 -b .chdirwarn
-%patch5 -p1 -b .reuseaddr
 %patch6 -p1 -b .locktimeout
 %patch7 -p1 -b .libdir
-%patch8 -p1 -b .seekflush
-%patch9 -p1 -b .random
+%patch8 -p1 -b .psprintfpi
 
 %build
 # regenerate configure script etc.
@@ -127,6 +121,10 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.1
+- update to 1.2.7
+- add fix for psprintf/%%pi issue
+
 * Fri May 26 2006 Jakub Jelinek <jakub at redhat.com> 1.2.2-7.3
 - rebuilt with GCC 4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Dec 2005 09:05:07 -0000	1.6
+++ sources	19 Jul 2006 15:10:55 -0000	1.7
@@ -1 +1 @@
-f96e3b04ccf86ed28a0734d7efc5bb65  apr-1.2.2.tar.gz
+aea926cbe588f844ad9e317157d60175  apr-1.2.7.tar.gz


--- apr-1.2.2-chdirwarn.patch DELETED ---


--- apr-1.2.2-random.patch DELETED ---


--- apr-1.2.2-reuseaddr.patch DELETED ---


--- apr-1.2.2-seekflush.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:10:59 -0400
Subject: rpms/isdn4k-utils/devel
	isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch, NONE, 1.1
Message-ID: <200607191510.k6JFAxPO006578@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/isdn4k-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6465

Added Files:
	isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch 
Log Message:
pppd-2.4.4 support


isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch ---
--- isdn4k-utils-CVS-2006-07-20/pppdcapiplugin/Makefile.me	2006-07-19 16:43:45.000000000 +0200
+++ isdn4k-utils-CVS-2006-07-20/pppdcapiplugin/Makefile	2006-07-19 16:43:59.000000000 +0200
@@ -18,7 +18,7 @@
 PPPSRCDIRS=/src/isdn/pppd
 
 ifeq ($(PPPVERSIONS),)
-PPPVERSIONS = 2.4.3
+PPPVERSIONS = 2.4.3 2.4.4
 endif
 
 PEERDIR=${DESTDIR}/etc/ppp/peers/isdn



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:12:50 -0400
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.66,1.67
Message-ID: <200607191512.k6JFCosl007267@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7220

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
fix build reqs



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- nautilus-cd-burner.spec	19 Jul 2006 14:52:13 -0000	1.66
+++ nautilus-cd-burner.spec	19 Jul 2006 15:12:47 -0000	1.67
@@ -21,6 +21,7 @@
 BuildRequires: eel2-devel
 BuildRequires: gettext
 BuildRequires: hal-devel >= 0.5.7
+BuildRequires: gnome-mount-devel
 # Fix hal-devel not requiring dbus-devel for the moment
 BuildRequires: dbus-devel >= 0.60
 # need nautilus-extensions



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:14:17 -0400
Subject: rpms/apr/FC-5 apr.spec,1.50,1.51
Message-ID: <200607191514.k6JFEHKF007922@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7835

Modified Files:
	apr.spec 
Log Message:
- attempt at brew build failure



Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/FC-5/apr.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- apr.spec	19 Jul 2006 15:10:55 -0000	1.50
+++ apr.spec	19 Jul 2006 15:14:14 -0000	1.51
@@ -28,7 +28,7 @@
 Group: Development/Libraries
 Summary: APR library development kit
 Conflicts: subversion-devel < 0.20.1-2
-Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion)
+Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion || echo 0.0.0)
 # shipped libtool hard-codes paths to gcc libraries in versioned dir
 
 %description devel



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:16:14 -0400
Subject: rpms/apr/devel apr.spec,1.60,1.61
Message-ID: <200607191516.k6JFGEeY014280@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12796

Modified Files:
	apr.spec 
Log Message:
- avoid SRPM build failures in brew here too



Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr.spec	19 Jul 2006 11:19:24 -0000	1.60
+++ apr.spec	19 Jul 2006 15:16:11 -0000	1.61
@@ -33,7 +33,7 @@
 Group: Development/Libraries
 Summary: APR library development kit
 Conflicts: subversion-devel < 0.20.1-2
-Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion), pkgconfig
+Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion || echo 0.0.0), pkgconfig
 # shipped libtool hard-codes paths to gcc libraries in versioned dir
 
 %description devel



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:18:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:18:42 -0400
Subject: rpms/xchat/devel xchat.spec,1.53,1.54
Message-ID: <200607191518.k6JFIgsL024427@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24371

Modified Files:
	xchat.spec 
Log Message:
fix build reqs



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xchat.spec	19 Jul 2006 15:08:57 -0000	1.53
+++ xchat.spec	19 Jul 2006 15:18:39 -0000	1.54
@@ -30,6 +30,7 @@
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.0.3, gtk2-devel >= 2.0.3, bison >= 1.35
 BuildRequires: gettext /bin/sed
+BuildRequires: libtool
 # For gconftool-2:
 Requires(post): GConf2
 # Ensure that a compatible libperl is installed



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:22:59 -0400
Subject: rpms/control-center/devel
	control-center-2.15.4-add-dbus-flags.patch, NONE,
	1.1 control-center.spec, 1.155, 1.156
Message-ID: <200607191522.k6JFMxPM026158@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26095

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.4-add-dbus-flags.patch 
Log Message:
- Add patch to use the dbus cflags and libs instead of relying on hal
  flags to populate them


control-center-2.15.4-add-dbus-flags.patch:
 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE control-center-2.15.4-add-dbus-flags.patch ---
--- control-center-2.15.4/capplets/sound/Makefile.am.add-dbus-flags	2006-07-19 11:15:47.000000000 -0400
+++ control-center-2.15.4/capplets/sound/Makefile.am	2006-07-19 11:16:18.000000000 -0400
@@ -5,6 +5,8 @@
 	$(GNOMECC_CAPPLETS_LIBS) \
 	$(SOUND_CAPPLET_LIBS) \
 	$(HAL_LIBS)
+	$(DBUS_LIBS)
+
 gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pipeline-tests.c
 
 @INTLTOOL_DESKTOP_RULE@
@@ -19,6 +21,6 @@
 Desktop_in_files = gnome-settings-sound.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA)


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- control-center.spec	19 Jul 2006 00:11:24 -0000	1.155
+++ control-center.spec	19 Jul 2006 15:22:57 -0000	1.156
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 3 
+Release: 4 
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -35,6 +35,7 @@
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.14.2-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
+Patch9: control-center-2.15.4-add-dbus-flags.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -128,6 +129,7 @@
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
+%patch9 -p1 -b .add-dbus-flags
 
 %build
 
@@ -246,6 +248,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-4
+- Add patch to use the dbus cflags and libs instead of relying on hal
+  flags to populate them
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-3
 - Add BR on dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:28:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:28:58 -0400
Subject: rpms/evolution/devel evolution.spec, 1.165,
	1.166 evo-addressbook-print-with-pango-2.patch, 1.1,
	NONE evo-calendar-print-with-pango-4.patch, 1.2,
	NONE evo-calendar-print-with-pango-5.patch, 1.1,
	NONE evo-calendar-print-with-pango-7.patch, 1.1,
	NONE evolution-2.2.0-port-to-pilot-link-0.12.patch, 1.3,
	NONE evolution-2.7.2-preedit-gnome.bz-264485.patch, 1.1, NONE
Message-ID: <200607191528.k6JFSwVh006107@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2161

Modified Files:
	evolution.spec 
Removed Files:
	evo-addressbook-print-with-pango-2.patch 
	evo-calendar-print-with-pango-4.patch 
	evo-calendar-print-with-pango-5.patch 
	evo-calendar-print-with-pango-7.patch 
	evolution-2.2.0-port-to-pilot-link-0.12.patch 
	evolution-2.7.2-preedit-gnome.bz-264485.patch 
Log Message:
- Clean up spec file, renumber patches.
- Add BuildRequires for dbus-glib-devel.
- Rebuild to pick up new D-Bus.



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- evolution.spec	13 Jul 2006 16:08:52 -0000	1.165
+++ evolution.spec	19 Jul 2006 15:28:55 -0000	1.166
@@ -7,7 +7,8 @@
 %define orbit2_version 2.9.8
 %define gnome_icon_theme_version 1.3.6
 %define libgnomeprint22_version 2.8.0
-%define dbus_version 0.31
+%define dbus_version 0.90
+%define dbus_glib_version 0.70
 %define gnomevfs2_version 2.4
 %define last_libgal2_version 2:2.5.3-2
 
@@ -47,7 +48,7 @@
 
 Name: evolution
 Version: 2.7.4
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -57,96 +58,74 @@
 
 ### Patches ###
 
-# Red Hat Linux specific patches
-#Patch11: evolution-1.3.2-redhatify.patch
-
-# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
-#Patch99: db3-dont-use-pthread.patch
 # bad hack
-Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-
-# patches sent upstream
-Patch100: evo-addressbook-print-with-pango-2.patch
-
-#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
+Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 
 # Fix for RH bug #154360:
-Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
+Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch
 
 # Move autosave file
-Patch107: evolution-2.5.4-move-autosave-file.patch
+Patch12: evolution-2.5.4-move-autosave-file.patch
 
 # Fix for RH bug 164957 (was for 145552):
-Patch109: evolution-2.0.2-fix-145552.patch
+Patch13: evolution-2.0.2-fix-145552.patch
 
 # Part of RH bug 170799:
-Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
-
-# not accepted, but proposed on a few occasions.  fixes problems with
-# some cyrus servers
-#Patch200: evolution-1.4.5-imap-command-length.patch
-
-# this was rejected due to adding a dependency on DISPLAY for 
-# evolution-wombat but it does work to fix the problem
-#Patch500: evolution-wombat-sm.patch
+Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch
 
-# This was added upstream in 1.5.93, with configure-time detection
-#Patch700: evolution-1.5.9.1-filechooser.patch
-
-# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams):
-# Patch800: evolution-2.5.4-fix-conduits.patch
+# Patches for conduits, based upon
+# rh-161817-attach-116019-conduit_pilot_link_updates.diff
+# (the latter patch was originally by Mark G. Adams):
+# Patch15: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
-Patch802: evolution-2.5.4-fix-conduit-dir.patch
+Patch16: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch803: evolution-2.7.1-no-gnome-common.patch
-
-Patch804: evolution-2.4.1-fix-missing-declarations.patch
-Patch805: evolution-2.5.4-fix-missing-declarations.patch
-Patch806: evolution-2.7.1-notification-cleanups.patch
-Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
-Patch809: evolution-2.6.0-prototypes.patch
+Patch17: evolution-2.7.1-no-gnome-common.patch
 
-# Patch to remove preedit buffer replication problem -- removed after as it was added without being confirmed.
-# Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch
+Patch18: evolution-2.4.1-fix-missing-declarations.patch
+Patch19: evolution-2.5.4-fix-missing-declarations.patch
+Patch20: evolution-2.7.1-notification-cleanups.patch
+Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+Patch22: evolution-2.6.0-prototypes.patch
 
 # Gnome.org #343331
-Patch900: evolution-2.7.2.1-quit-resize-crash.patch
+Patch23: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
-Patch901: evolution-2.7.4-candidate-window-position-task.patch
+Patch24: evolution-2.7.4-candidate-window-position-task.patch
 
 # RH bug #157505 / Gnome.org bug #303878
-Patch902: evolution-2.7.4-candidate-window-position-calendar.patch
+Patch25: evolution-2.7.4-candidate-window-position-calendar.patch
 
 # RH bug #190359 / Gnome.org bug #211058
-Patch903: evolution-2.7.3-filter-datespec.patch
+Patch26: evolution-2.7.3-filter-datespec.patch
 
 # RH bug #166231 / Gnome.org bug #264485
-Patch904: evolution-2.7.3-replicated-cjk-input.patch
+Patch27: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #197834 / Gnome.org bug #346797
-Patch905: evolution-2.7.3-submit-bug-report.patch
+Patch28: evolution-2.7.3-submit-bug-report.patch
 
 ### Dependencies ###
 
-Requires: scrollkeeper >= 0.1.4
+Requires: ORBit2 >= %{orbit2_version}
 Requires: ORBit2 >= 2.7.5
-Requires: libsoup >= %{soup_version}
+Requires: dbus >= %{dbus_version}
 Requires: evolution-data-server >= %{eds_version}
+Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-spell >= 1.0.2
+Requires: gnome-vfs2 >= %{gnomevfs2_version}
+Requires: gnutls
 Requires: gtk2 >= 2.4.0
 Requires: libbonoboui >= %{libbonoboui_version}
-Requires: ORBit2 >= %{orbit2_version}
-Requires: spamassassin
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
-Requires: redhat-menus >= %{redhat_menus_version}
-Requires: gnutls
-Requires: dbus >= %{dbus_version}
 Requires: libgnomeprint22 >= %{libgnomeprint22_version}
-Requires: gnome-vfs2 >= %{gnomevfs2_version}
+Requires: libsoup >= %{soup_version}
+Requires: redhat-menus >= %{redhat_menus_version}
+Requires: scrollkeeper >= 0.1.4
+Requires: spamassassin
 
 %if %{libnotify_support}
 Requires: libnotify >= 0.4
@@ -156,31 +135,33 @@
 
 ### Build Dependencies ###
 
-# Require specific versions of GNU Autotools packages,
-# since we rerun them during the build phase.
+BuildRequires: GConf2-devel
+BuildRequires: ORBit2-devel >= %{orbit2_version}
+BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
-BuildRequires: intltool >= 0.35
-BuildRequires: libtool >= 1.5
-
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
-BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: bison
+BuildRequires: byacc
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: desktop-file-utils
 BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: flex
+BuildRequires: gettext
+BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
+BuildRequires: gnutls-devel
+BuildRequires: gtk-doc
+BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+BuildRequires: intltool >= 0.35
 BuildRequires: libbonobo-devel >= 2.0
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
-BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgnomecanvas-devel >= 2.0
+BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: libtool >= 1.5
 BuildRequires: libxml2-devel
-BuildRequires: GConf2-devel
-BuildRequires: intltool
-BuildRequires: ORBit2-devel >= %{orbit2_version}
-BuildRequires: atk-devel
-# kind of silly...
-BuildRequires: flex bison byacc libtool gettext
-BuildRequires: gnutls-devel
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: gtk-doc
+BuildRequires: pkgconfig
 
 %if %{use_mozilla_nss}
 BuildRequires: nspr-devel
@@ -189,10 +170,6 @@
 BuildRequires: openssl-devel
 %endif
 
-BuildRequires: pkgconfig
-BuildRequires: desktop-file-utils
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
-
 %if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
 BuildRequires: gstreamer08-devel
@@ -244,49 +221,25 @@
 
 %prep
 %setup -q
-# these are in CVS already on the 1-4-branch
-
-# these are in CVS already on the gnome-2-8 branch
-
-# Red Hat specific patches
-#patch11 -p1 -b .rhatify
-
-#patch99 -p1 -b .db3pthread
-
-%patch98 -p1 -b .ldaphack
-
-# patches sent upstream
-#%patch100 -p0 -b .addressbook-print-with-pango
-#%patch101 -p1 -b .calendar-print-with-pango
-
-%patch106 -p1 -b .commit-enter-on-calendar
-%patch107 -p1 -b .move-autosave-file
-%patch109 -p1 -b .fix-164957
-
-%patch110 -p1 -b .hide-switcher-buttons-by-default
-
-#patch200 -p1 -b .commandlength
-
-#patch500 -p0 -b .wombatsm
-
-#patch700 -p1 -b .filechooser
-
-# %patch800 -p1 -b .fix-conduits
-%patch802 -p1 -b .fix-conduit-dir
-%patch803 -p1 -b .no-gnome-common
-%patch804 -p1 -b .fix-missing-declarations
-%patch805 -p1 -b .fix-missing-declarations-2-5-4
-%patch806 -p1 -b .notification-cleanups
-%patch808 -p1 -b .fix-missing-declarations-2.5.5.1
-%patch809 -p1 -b .prototypes
-# %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain at redhat.com
-
-%patch900 -p1 -b .quit-resize-crash
-%patch901 -p1 -b .candidate-window-position-task
-%patch902 -p1 -b .candidate-window-position-calendar
-%patch903 -p1 -b .filter-datespec
-%patch904 -p1 -b .replicated-cjk-input
-%patch905 -p1 -b .submit-bug-report
+%patch10 -p1 -b .ldaphack
+%patch11 -p1 -b .commit-enter-on-calendar
+%patch12 -p1 -b .move-autosave-file
+%patch13 -p1 -b .fix-164957
+%patch14 -p1 -b .hide-switcher-buttons-by-default
+#patch15 -p1 -b .fix-conduits
+%patch16 -p1 -b .fix-conduit-dir
+%patch17 -p1 -b .no-gnome-common
+%patch18 -p1 -b .fix-missing-declarations
+%patch19 -p1 -b .fix-missing-declarations-2-5-4
+%patch20 -p1 -b .notification-cleanups
+%patch21 -p1 -b .fix-missing-declarations-2.5.5.1
+%patch22 -p1 -b .prototypes
+%patch23 -p1 -b .quit-resize-crash
+%patch24 -p1 -b .candidate-window-position-task
+%patch25 -p1 -b .candidate-window-position-calendar
+%patch26 -p1 -b .filter-datespec
+%patch27 -p1 -b .replicated-cjk-input
+%patch28 -p1 -b .submit-bug-report
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -677,6 +630,11 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Jul 18 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-3
+- Clean up spec file, renumber patches.
+- Add BuildRequires for dbus-glib-devel.
+- Rebuild to pick up new D-Bus.
+
 * Thu Jul 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-2
 - Update patch for RH bug #157400.
 - Update patch for RH bug #157505.


--- evo-addressbook-print-with-pango-2.patch DELETED ---


--- evo-calendar-print-with-pango-4.patch DELETED ---


--- evo-calendar-print-with-pango-5.patch DELETED ---


--- evo-calendar-print-with-pango-7.patch DELETED ---


--- evolution-2.2.0-port-to-pilot-link-0.12.patch DELETED ---


--- evolution-2.7.2-preedit-gnome.bz-264485.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:28:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:28:57 -0400
Subject: rpms/xen/devel xen-network-iptables-bridge.patch, 1.2, 1.3 xen.spec,
	1.122, 1.123
Message-ID: <200607191528.k6JFSvr0006096@cvs.devel.redhat.com>

Author: markmc

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6076

Modified Files:
	xen-network-iptables-bridge.patch xen.spec 
Log Message:
* Wed Jul 19 2006 Mark McLoughlin <markmc at redhat.com> 3.0.2-16
- Fix network-bridge error (#199414)


xen-network-iptables-bridge.patch:
 xen-network-common.sh |    3 +++
 1 files changed, 3 insertions(+)

Index: xen-network-iptables-bridge.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-network-iptables-bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-network-iptables-bridge.patch	13 Jul 2006 17:25:07 -0000	1.2
+++ xen-network-iptables-bridge.patch	19 Jul 2006 15:28:54 -0000	1.3
@@ -1,12 +1,12 @@
---- xen-unstable.hg/tools/examples/xen-network-common.sh.~1~	2006-06-30 16:10:18.000000000 +0100
-+++ xen-unstable.hg/tools/examples/xen-network-common.sh	2006-06-30 16:16:47.000000000 +0100
-@@ -127,6 +127,9 @@
- 
-     # Don't create the bridge if it already exists.
-     if [ ! -e "/sys/class/net/${bridge}/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"
+--- xen-unstable.hg/tools/examples/xen-network-common.sh.network-iptables-bridge	2006-07-19 09:45:57.000000000 -0400
++++ xen-unstable.hg/tools/examples/xen-network-common.sh	2006-07-19 09:46:18.000000000 -0400
+@@ -130,6 +130,9 @@
  	brctl addbr ${bridge}
  	brctl stp ${bridge} off
  	brctl setfd ${bridge} 0
++	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"
+         ip link set ${bridge} arp off
+         ip link set ${bridge} multicast off
+     fi


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- xen.spec	17 Jul 2006 15:09:58 -0000	1.122
+++ xen.spec	19 Jul 2006 15:28:54 -0000	1.123
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 15
+Release: 16
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -194,6 +194,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 19 2006 Mark McLoughlin <markmc at redhat.com> 3.0.2-16
+- Fix network-bridge error (#199414)
+
 * Mon Jul 17 2006 Daniel Veillard <veillard at redhat.com> - 3.0.2-15
 - desactivating the relocation server in xend conf by default and
   add a warning text about it.



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:36:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:36:43 -0400
Subject: rpms/apr/FC-5 apr.spec,1.51,1.52
Message-ID: <200607191536.k6JFahZ7006316@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/apr/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6302

Modified Files:
	apr.spec 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.2
- add BR for e2fsprogs-devel to restore apr_os_uuid_get



Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/FC-5/apr.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- apr.spec	19 Jul 2006 15:14:14 -0000	1.51
+++ apr.spec	19 Jul 2006 15:36:32 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.7
-Release: 1.1
+Release: 1.2
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -15,7 +15,7 @@
 Patch7: apr-1.2.2-libdir.patch
 Patch8: apr-1.2.7-psprintfpi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen
+BuildPrereq: autoconf, libtool, doxygen, e2fsprogs-devel
 Conflicts: subversion < 0.20.1-2
 
 %description
@@ -121,6 +121,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.2
+- add BR for e2fsprogs-devel to restore apr_os_uuid_get
+
 * Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 1.2.7-1.1
 - update to 1.2.7
 - add fix for psprintf/%%pi issue



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:37:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:37:32 -0400
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.57,1.58
Message-ID: <200607191537.k6JFbW76006396@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6276

Modified Files:
	sound-juicer.spec 
Log Message:
rebuild



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sound-juicer.spec	12 Jul 2006 08:16:18 -0000	1.57
+++ sound-juicer.spec	19 Jul 2006 15:37:28 -0000	1.58
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.15.3
-Release:	2.1
+Release:	3
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -110,6 +110,9 @@
 %{_datadir}/icons/hicolor/*
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-3
+- Rebuild against dbus
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:39:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:39:32 -0400
Subject: rpms/dbus/devel dbus.spec,1.90,1.91
Message-ID: <200607191539.k6JFdW1g006496@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6474

Modified Files:
	dbus.spec 
Log Message:
- change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
  in the dbus-1.pc file after compile



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- dbus.spec	19 Jul 2006 14:30:43 -0000	1.90
+++ dbus.spec	19 Jul 2006 15:39:29 -0000	1.91
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 5 
+Release: 6 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -100,7 +100,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-mv -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/*.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+
+#change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
+sed -e 's at -I${libdir}@-I${prefix}/%{_lib}@' $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc > $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/dbus-1.pc
+rm -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mv -f $RPM_BUILD_ROOT/bin/dbus-launch $RPM_BUILD_ROOT/%{_bindir}
@@ -166,6 +169,10 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-6
+- change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
+  in the dbus-1.pc file after compile
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-5
 - Move arch include file from lib to libdir
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:55:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:55:08 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.14, 1.15 sources,
	1.16, 1.17 system-config-network.spec, 1.18, 1.19
Message-ID: <200607191555.k6JFt8DN021936@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/system-config-network/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21921

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:
version 1.3.90


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	2 Nov 2005 12:06:41 -0000	1.14
+++ .cvsignore	19 Jul 2006 15:55:05 -0000	1.15
@@ -1 +1 @@
-system-config-network-1.3.30.tar.gz
+system-config-network-1.3.90.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Nov 2005 12:26:13 -0000	1.16
+++ sources	19 Jul 2006 15:55:05 -0000	1.17
@@ -1 +1 @@
-4902c9d08605a396289fe2e2c87f6966  system-config-network-1.3.30.tar.gz
+9ae2e62104862ee3e8e979d2754a06ba  system-config-network-1.3.90.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- system-config-network.spec	12 Jul 2006 08:23:34 -0000	1.18
+++ system-config-network.spec	19 Jul 2006 15:55:05 -0000	1.19
@@ -1,8 +1,8 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the NEtwork Adminstration Tool
 Name: system-config-network
-Version: 1.3.30
-Release: 2.1.1
+Version: 1.3.90
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -89,6 +89,28 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+<<<<<<< system-config-network.spec
+* Tue Jul 18 2006 Harald Hoyer <harald at redhat.com> - 1.3.90
+- [135014] MTU and MRU should be confiurable for ADSL
+- [141055] system-config-network needs to be able to set MTU
+- [149780] no GATEWAY, IPADDR and NETMASK, if BOOTPROTO=dhcp 
+- [150362] [Errno 2] No such file or directory: '/etc/hosts'
+- [157172] Wrong DNS for provider "ZEDAT_Berlin"
+- [160417] Bad: cannot make any changes to network settings
+- [169819] Trailing space in host name causes crash
+- [175078] String (country name) change request
+- [176145] Please enable Serbian translation in system-config-network
+- [177198] deprecation warning in system-config-network
+- [187563] localized option passed to ifcfg-wlan0 files
+- [188321] Creating an alias for a network interface breaks device 
+           setup after reboots
+- [190242] Firefox instance running as root when used to read docs 
+           for system-config-*
+- [197401] Don't write HWADDR for alias interfaces
+
+* Fri Jul 14 2006 Nils Philippsen <nphilipp at redhat.com>
+- enable ml, or, sr, sr at Latn translations (#176145)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.30-2.1.1
 - rebuild
 
@@ -358,7 +380,7 @@
 * Sat Aug 31 2002 Preston Brown <pbrown at localhost.localdomain>
 - fix typo in error dialog function
 
-* Thu Aug 22 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.1.17-1
+* Thu Aug 22 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.1.17-1
 - Make it use the gnome help system, add yelp as a dependency (#71857)
 - Traceback fix: # 72581
 - translation updates
@@ -375,14 +397,14 @@
 - set correct device type for rawip ISDN connections (bug #69568)
 - add some ISPs for Austria
 
-* Tue Jul 30 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.1.13-1
+* Tue Jul 30 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.1.13-1
 - Fixes to the traceback dialog (fix "save to floppy" (we don't do that),
   add i18n.)
 - Fix traceback with malformed /etc/hosts (#69320)
 - Fix dependencies (#69990)
 - Some minor userhelper fixes
 
-* Thu Jul 25 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.1.12-1
+* Thu Jul 25 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.1.12-1
 - doc loc fixes (images)
 - add pam_timestamp support (#69869)
 
@@ -390,7 +412,7 @@
 - renamed "default" profile in GUI
 - fixed device renaming in profiles
 
-* Wed Jul 24 2002 Trond Eivind Glomsr?d <teg at redhat.com> 1.1.10-1
+* Wed Jul 24 2002 Trond Eivind Glomsr??d <teg at redhat.com> 1.1.10-1
 - More bugfixes, including #69635 #69636
 - Updated docs
 
@@ -438,7 +460,7 @@
 * Wed May 29 2002 Harald Hoyer <harald at redhat.de>
 - ported to python2, gtk2, gnome2
 
-* Wed Apr 17 2002 Trond Eivind Glomsr?d <teg at redhat.com> 
+* Wed Apr 17 2002 Trond Eivind Glomsr??d <teg at redhat.com> 
 - Turn off wireless. It doesn't work with all modes, all cards
  and you can't edit IP settings after the initial attempt
 
@@ -446,14 +468,14 @@
 - moved ethmodule.so to /usr/lib
 - call it 1.0.0
 
-* Tue Apr 16 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.30-1
+* Tue Apr 16 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.30-1
 - Updated translations
 - Updated docs
 
-* Tue Apr 16 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.28-1
+* Tue Apr 16 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.28-1
 - more fixes
 
-* Mon Apr 15 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.27-1
+* Mon Apr 15 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.27-1
 - Update translations, more fixes
 
 * Mon Apr 15 2002 Harald Hoyer <harald at redhat.com> 0.9.26-1
@@ -462,21 +484,21 @@
 * Sat Apr 13 2002 Than Ngo <than at redhat.com> 0.9.25-1
 - More fixes
 
-* Thu Apr 11 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.24-1
+* Thu Apr 11 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.24-1
 - More fixes (#63177,#57064,#63207)
 
-* Tue Apr 09 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.23-1
+* Tue Apr 09 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.23-1
 - more fixes 
 - updated translations
 
-* Thu Apr 04 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.22-1
+* Thu Apr 04 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.22-1
 - more fixes, including #62697,
 
 * Sat Mar 30 2002 Than Ngo <than at redhat.com> 0.9.21-1
 - add Token Ring/Wireless/Cipe Druids
 - more fixes
 
-* Wed Mar 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.20-1
+* Wed Mar 26 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.20-1
 - Rebuild... it should have more fixes
 
 * Wed Mar 26 2002 Than Ngo <than at redhat.com> 0.9.19-1
@@ -487,7 +509,7 @@
 - add userisdnctl for ISDN
 - more fixes
 
-* Thu Mar 14 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.17-1
+* Thu Mar 14 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.17-1
 - Even more fixes
 
 * Thu Mar 14 2002 Than Ngo <than at redhat.com> 0.9.16-1
@@ -497,32 +519,32 @@
 - add desktop file for neat-control
 - various fixes, additions
 
-* Wed Mar 13 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.14-1
+* Wed Mar 13 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.14-1
 - Require gnome-core, buildrequire gnome-core-devel
 
-* Mon Mar 11 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.13-1
+* Mon Mar 11 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.13-1
 - New build
 - No longer noarch
 
-* Thu Feb 28 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.12-1
+* Thu Feb 28 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.12-1
 - Various fixes, additions
 
-* Tue Jan 29 2002 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.11-1
+* Tue Jan 29 2002 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.11-1
 - build in new environment
 
 * Mon Jan 07 2002 Than Ngo <than at redhat.com> 0.9.10.1-1
 - fixed bug #57853
 
-* Tue Dec 03 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.10-1
+* Tue Dec 03 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.10-1
 - minor fixes, more translations
 
-* Mon Nov 26 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.9-0.1
+* Mon Nov 26 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.9-0.1
 - Trying again, with more fixes :)
 
 * Fri Nov 25 2001 Than Ngo <than at redhat.com> 0.9.8-0.6
 - fixed bug #56145, #56146, #56147
 
-* Tue Nov 20 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9.8-0.5
+* Tue Nov 20 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.9.8-0.5
 - prepare for errata
 
 * Fri Nov 02 2001 Than Ngo <than at redhat.com> 0.9.7-1
@@ -562,7 +584,7 @@
 - add CTC and IUCV support for s390/s390x
 - disable Dialup on s390/s390x
 
-* Thu Sep  5 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.9-1
+* Thu Sep  5 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.9-1
 - Add Russian
 
 * Wed Sep  4 2001 Phil Knirsch <phil at redhat.de> 0.8.4-1
@@ -578,7 +600,7 @@
 - if hardware is deleted, remove all devices used this hardware
 - de.po: fix bad translation
 
-* Fri Aug 31 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.8.1-1
+* Fri Aug 31 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.8.1-1
 - Add support for Czech
 
 * Fri Aug 31 2001 Than Ngo <than at redhat.com>
@@ -593,10 +615,10 @@
 * Tue Aug 28 2001 Than Ngo <than at redhat.com> 0.8.0-1
 - fix some typo bugs
 
-* Tue Aug 28 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.10-1
+* Tue Aug 28 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.10-1
 - minor fixes, including bootprotocol for CIPE (don't say it will use DHCP...)
 
-* Tue Aug 28 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.9-1
+* Tue Aug 28 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.9-1
 - Not everything was marked for translation (#52650)
 
 * Tue Aug 28 2001 Than Ngo <than at redhat.com> 0.7.8-1
@@ -609,7 +631,7 @@
 * Mon Aug 27 2001 Phil Knirsch <phil at redhat.de> 0.7.6-2
 - Fixed use of /etc/sysconfig/network (#52359)
 
-* Fri Aug 24 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.6-1
+* Fri Aug 24 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.6-1
 - Reordered tabs, added descriptions on each of the tabs
 
 * Fri Aug 24 2001 Bill Nottingham <notting at redhat.com> 0.7.5-1
@@ -619,7 +641,7 @@
 - Fixed recalculation of BROADCAST and NETWORK values if IP and netmask are
   present (#51462)
 
-* Mon Aug 20 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.4-1
+* Mon Aug 20 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.4-1
 - More bugfixes, among them #51929, #51991, #51721, #51722,
   partial #52044, #51720. 
 - Updated translations, include more languages
@@ -627,13 +649,13 @@
 * Thu Aug 16 2001 Phil Knirsch <phil at redhat.de> 0.7.3-2
 - Fixed major bug in device renaming (#50885)
 
-* Tue Aug 14 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.3-1
+* Tue Aug 14 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.3-1
 - more bugfixes, more docs, GUI fixes
 
 * Fri Aug 10 2001 Than Ngo <than at redhat.com> 0.7.2-1
 - more bugfixes
 
-* Fri Aug 10 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.7.1-1
+* Fri Aug 10 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.7.1-1
 - more bugfixes, more docs
 
 * Wed Aug  8 2001 Alexander Larsson <alexl at redhat.com> 0.7-2
@@ -656,13 +678,13 @@
 - Added a working Apply button.
 - Switched to using hardlinks instead of symlinks for config files.
 
-* Tue Aug  7 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.6.7-1
+* Tue Aug  7 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.6.7-1
 - Add online help capability (#50739)
 
-* Mon Aug  6 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.6.6-1
+* Mon Aug  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.6.6-1
 - Disable profiles in GUI and as necesarry in code
 
-* Mon Aug  6 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.6.5-1
+* Mon Aug  6 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.6.5-1
 - more bugfixes
 - add Conf.py from pythonlib, which has gone to the great bitbucket
   in the sky
@@ -687,7 +709,7 @@
 - POTFILES.in list up fix
 - Add Japanese translation
 
-* Wed Aug 02 2001 Trond Eivind Glomsr?d <teg at redhat.com> 0.6.2-1
+* Wed Aug 02 2001 Trond Eivind Glomsr??d <teg at redhat.com> 0.6.2-1
 - More bugfixes
 
 * Tue Jul 24 2001 Than Ngo <than at redhat.com> 0.6.1-1
@@ -702,19 +724,19 @@
 * Tue Jul 24 2001 Than Ngo <than at redhat.com>
 - add Druid for dialup connection (ISDN/ADSL/Modem)
 
-* Thu Jul 19 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu Jul 19 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Obsolete netcfg - rp3 is next, when gnome-lokkit doesn't require
   it anymore
 - More fixes...
 
-* Tue Jul 17 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jul 17 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - CIPE and wireless added
 
-* Mon Jul 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Add i18n
 - Many minor fixes...
 
-* Wed Jul 11 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Wed Jul 11 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Don't run autogen.sh
 - Mark files in /etc as configuration files
 - Multiple fixes to automake files
@@ -737,17 +759,17 @@
 * Thu Jul 10 2001 Phil Knirsch <phil at redhat.de> 0.2.2-2
 - Added some missing files.
 
-* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 0.2.2
 
-* Tue Jul 10 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 0.2.1
 
-* Mon Jul  9 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Mon Jul  9 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - 0.2
 - New name - system-config-network. 
   Shortcut: neat (NEtwork Administration Tool)
 
-* Fri Jul 06 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+* Fri Jul 06 2001 Trond Eivind Glomsr??d <teg at redhat.com>
 - Require a recent version of initscripts
 - Initial build. Don't obsolete older tools just yet...



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:55:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:55:25 -0400
Subject: rpms/system-config-network/devel system-config-network.spec, 1.19,
	1.20
Message-ID: <200607191555.k6JFtPAO021977@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/system-config-network/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21957

Modified Files:
	system-config-network.spec 
Log Message:
version 1.3.90


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- system-config-network.spec	19 Jul 2006 15:55:05 -0000	1.19
+++ system-config-network.spec	19 Jul 2006 15:55:23 -0000	1.20
@@ -89,7 +89,6 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-<<<<<<< system-config-network.spec
 * Tue Jul 18 2006 Harald Hoyer <harald at redhat.com> - 1.3.90
 - [135014] MTU and MRU should be confiurable for ADSL
 - [141055] system-config-network needs to be able to set MTU



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:55:53 -0400
Subject: rpms/pwlib/devel pwlib.spec,1.37,1.38
Message-ID: <200607191555.k6JFtrP4022083@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pwlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22058

Modified Files:
	pwlib.spec 
Log Message:
- add executable bit to dsos (bug 197318)



Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pwlib.spec	17 Jul 2006 14:21:56 -0000	1.37
+++ pwlib.spec	19 Jul 2006 15:55:51 -0000	1.38
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.10.1
-Release:        4
+Release:        5
 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
@@ -63,6 +63,9 @@
 
 perl -pi -e 's at PWLIBDIR.*=.*@PWLIBDIR = /usr/share/pwlib@' $RPM_BUILD_ROOT%{_datadir}/pwlib/make/ptbuildopts.mak
 
+# hack to fixup things for bug 197318
+find $RPM_BUILD_ROOT%{_libdir} -name '*.so' -type f -exec chmod +x {} \;
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,6 +93,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Wed Jul 19 2006 Ray Strode <rstrode at redhat.com> - 1.10.1-5
+- add executable bit to dsos (bug 197318)
+
 * Mon Jul 17 2006 Mike Bonnet <mikeb at redhat.com> - 1.10.1-4
 - rebuild to fix missing rpms on ppc{,64}
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:57:01 -0400
Subject: rpms/httpd/FC-5 httpd-2.1.10-pod.patch, 1.1, 1.2 httpd.spec, 1.89,
	1.90
Message-ID: <200607191557.k6JFv1I9022204@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/httpd/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22189

Modified Files:
	httpd-2.1.10-pod.patch httpd.spec 
Log Message:
* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 2.2.2-1.1
- fix segfault on dummy connection failure at graceful restart (#199429)


httpd-2.1.10-pod.patch:
 mpm_common.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Index: httpd-2.1.10-pod.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-5/httpd-2.1.10-pod.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-pod.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-pod.patch	19 Jul 2006 15:56:58 -0000	1.2
@@ -43,7 +43,7 @@
  
          ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
 -                     "connect to listener on %pI", ap_listeners->bind_addr);
-+                     "connect to listener on %pI", lr);
++                     "connect to listener on %pI", lr->bind_addr);
      }
  
      /* Create the request string. We include a User-Agent so that


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-5/httpd.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- httpd.spec	11 May 2006 13:33:33 -0000	1.89
+++ httpd.spec	19 Jul 2006 15:56:58 -0000	1.90
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 1.0
+Release: 1.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -480,6 +480,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 2.2.2-1.1
+- fix segfault on dummy connection failure at graceful restart (#199429)
+
 * Thu May 11 2006 Joe Orton <jorton at redhat.com> 2.2.2-1.0
 - update to 2.2.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 15:59:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 11:59:47 -0400
Subject: rpms/booty/devel .cvsignore, 1.49, 1.50 booty.spec, 1.54,
	1.55 sources, 1.52, 1.53
Message-ID: <200607191559.k6JFxlcb022521@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22463/devel

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
auto-import booty-0.79-1 on branch devel from booty-0.79-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	23 Jun 2006 18:12:46 -0000	1.49
+++ .cvsignore	19 Jul 2006 15:59:45 -0000	1.50
@@ -1,2 +1 @@
-booty-0.77.tar.bz2
-booty-0.78.tar.bz2
+booty-0.79.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- booty.spec	23 Jun 2006 18:12:46 -0000	1.54
+++ booty.spec	19 Jul 2006 15:59:45 -0000	1.55
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.78
+Version: 0.79
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Jeremy Katz <katzj at redhat.com> - 0.79-1
+- fix ia64 serial console (#196709)
+
 * Fri Jun 23 2006 Paul Nasrat <pnasrat at redhat.com> - 0.78-1
 - Fix duplicate entries in boot= line on ppc
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	23 Jun 2006 18:12:46 -0000	1.52
+++ sources	19 Jul 2006 15:59:45 -0000	1.53
@@ -1 +1 @@
-6903e0f636ef5abaf96467ebdef16ee6  booty-0.78.tar.bz2
+b8810d1cf592cf904715f154ce2977e4  booty-0.79.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 16:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 12:05:15 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.15,1.16
Message-ID: <200607191605.k6JG5Fs1022853@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22826

Modified Files:
	java_cup.spec 
Log Message:
- Add conditional native compilation with GCJ.
- Merge with 3jpp version of spec file.



Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- java_cup.spec	12 Jul 2006 06:30:28 -0000	1.15
+++ java_cup.spec	19 Jul 2006 16:05:12 -0000	1.16
@@ -1,28 +1,66 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define name		java_cup
 %define version		0.10
 %define pkg_version	v10k
-%define release 	0.k.1jpp_10fc
+%define release 	0.k.4jpp_1fc
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: 	%{release}
+Release:	%{release}
 Epoch:		1
 Summary:	Java source interpreter
 License:	BSD-style
 Url: 		http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
 Source0:	java_cup_v10k-RHCLEAN.tar.bz2
+#Source0:	java_cup_v10k.tar.gz
 Source1:	%{name}-build.xml
 BuildRequires:	ant
 BuildRequires:  jpackage-utils >= 0:1.5
 Group: 		Development/Java
+%if ! %{gcj_support}
+Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	cup <= 0:v10k
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 java_cup is a LALR Parser Generator for Java
@@ -30,7 +68,6 @@
 %package javadoc
 Summary:	Javadoc for java_cup
 Group:		Development/Java
-Prereq: coreutils
 
 %description javadoc
 Javadoc for java_cup
@@ -66,17 +103,13 @@
 cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -86,11 +119,32 @@
   rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc README LICENSE CHANGELOG
 %{_javadir}/*
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/java_cup-0.10.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/java_cup-runtime-0.10.jar.*
+%endif
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -102,6 +156,12 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.4jpp_1fc
+- Conditional native compilation for GCJ.
+
+* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> - 1:0.10-0.k.3jpp
+- First JPP 1.7 build
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_10fc
 - rebuild
 
@@ -133,6 +193,9 @@
 * Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 1:0.10-0.k.1jpp_2fc
 - Build into Fedora.
 
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:0.10-0.k.2jpp
+- Rebuild with ant-1.6.2
+
 * Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 1:0.10-0.k.1jpp_1rh
 - RH vacuuming
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 16:09:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 12:09:07 -0400
Subject: rpms/setroubleshoot/devel setroubleshoot.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200607191609.k6JG97N5023000@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22960

Modified Files:
	setroubleshoot.spec sources 
Log Message:
* Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.7-1
	* Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
	* Remove toolbar from popup window since it did nothing, and I think it looks better without it.
	* fix allow_execmod plugin to report better data.



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setroubleshoot.spec	19 Jul 2006 14:15:12 -0000	1.3
+++ setroubleshoot.spec	19 Jul 2006 16:09:05 -0000	1.4
@@ -10,6 +10,7 @@
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+BuildRequires: perl
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Jul 2006 14:15:12 -0000	1.3
+++ sources	19 Jul 2006 16:09:05 -0000	1.4
@@ -1 +1 @@
-493a9de32ca6a4c1ce15a0d199838bc4  setroubleshoot-0.7.tar.gz
+9820a721574635a559cf18e16deee0e7  setroubleshoot-0.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 16:14:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 12:14:53 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-submount-fix.patch, NONE,
	1.1 autofs.spec, 1.130, 1.131
Message-ID: <200607191614.k6JGEr2X003077@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3010

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-submount-fix.patch 
Log Message:
* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.5
- Add conflicts kernel < 2.6.17.
- Fix submount operation broken by connectathon updates.


autofs-5.0.1-rc1-cthon-submount-fix.patch:
 CHANGELOG              |    1 +
 daemon/mount.c         |    6 ++++--
 lib/parse_subs.c       |    4 ++++
 modules/mount_autofs.c |   22 +++++++++++-----------
 modules/parse_sun.c    |   45 ++++++++-------------------------------------
 5 files changed, 28 insertions(+), 50 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-submount-fix.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 02a975d..2ffaba6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - cthon cleanup and corrections.
 - cthon more cleanup and corrections.
 - cthon correction to host validation.
+- cthon fix submount operation broken by above.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/mount.c b/daemon/mount.c
index 723c2f9..59f8f44 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -22,6 +22,8 @@ #include <stdlib.h>
 #include <string.h>
 #include "automount.h"
 
+#define ERR_PREFIX	"(mount):"
+
 /* These filesystems are known not to work with the "generic" module */
 /* Note: starting with Samba 2.0.6, smbfs is handled generically.    */
 static char *not_generic[] = { "nfs", "userfs", "afs", "autofs",
@@ -36,14 +38,14 @@ int do_mount(struct autofs_point *ap, co
 	char **ngp;
 	int rv;
 
-	mod = open_mount(modstr = fstype, NULL);
+	mod = open_mount(modstr = fstype, ERR_PREFIX);
 	if (!mod) {
 		for (ngp = not_generic; *ngp; ngp++) {
 			if (!strcmp(fstype, *ngp))
 				break;
 		}
 		if (!*ngp)
-			mod = open_mount(modstr = "generic", NULL);
+			mod = open_mount(modstr = "generic", ERR_PREFIX);
 		if (!mod) {
 			error(ap->logopt,
 			      "cannot find mount method for filesystem %s",
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index d5efb8b..ab5de39 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -53,6 +53,10 @@ int check_colon(const char *str)
 {
 	char *ptr = (char *) str;
 
+	/* Colon escape */
+	if (*ptr == ':')
+		return 1;
+
 	while (*ptr && *ptr != ':' && *ptr != '/') {
 		ptr++;
 	}
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index af28c5c..768bcbf 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -33,7 +33,7 @@ #define MODPREFIX "mount(autofs): "
 
 /* Attribute to create detached thread */
 extern pthread_attr_t thread_attr;
-extern struct startup_cond sc;
+extern struct startup_cond suc;
 
 int mount_version = AUTOFS_MOUNT_VERSION;	/* Required by protocol */
 
@@ -189,7 +189,7 @@ int mount_mount(struct autofs_point *ap,
 		return 1;
 	}
 
-	status = pthread_mutex_lock(&sc.mutex);
+	status = pthread_mutex_lock(&suc.mutex);
 	if (status) {
 		crit(ap->logopt,
 		     MODPREFIX "failed to lock startup condition mutex!");
@@ -198,8 +198,8 @@ int mount_mount(struct autofs_point *ap,
 		return 1;
 	}
 
-	sc.done = 0;
-	sc.status = 0;
+	suc.done = 0;
+	suc.status = 0;
 
 	pthread_mutex_lock(&ap->mounts_mutex);
 
@@ -209,7 +209,7 @@ int mount_mount(struct autofs_point *ap,
 		     "failed to create mount handler thread for %s",
 		     fullpath);
 		pthread_mutex_unlock(&ap->mounts_mutex);
-		status = pthread_mutex_unlock(&sc.mutex);
+		status = pthread_mutex_unlock(&suc.mutex);
 		if (status)
 			fatal(status);
 		cache_release(source);
@@ -218,20 +218,20 @@ int mount_mount(struct autofs_point *ap,
 	}
 	nap->thid = thid;
 
-	while (!sc.done) {
-		status = pthread_cond_wait(&sc.cond, &sc.mutex);
+	while (!suc.done) {
+		status = pthread_cond_wait(&suc.cond, &suc.mutex);
 		if (status) {
 			pthread_mutex_unlock(&ap->mounts_mutex);
-			pthread_mutex_unlock(&sc.mutex);
+			pthread_mutex_unlock(&suc.mutex);
 			fatal(status);
 		}
 	}
 
-	if (sc.status) {
+	if (suc.status) {
 		crit(ap->logopt,
 		     MODPREFIX "failed to create submount for %s", fullpath);
 		pthread_mutex_unlock(&ap->mounts_mutex);
-		status = pthread_mutex_unlock(&sc.mutex);
+		status = pthread_mutex_unlock(&suc.mutex);
 		if (status)
 			fatal(status);
 		return 1;
@@ -242,7 +242,7 @@ int mount_mount(struct autofs_point *ap,
 
 	pthread_mutex_unlock(&ap->mounts_mutex);
 
-	status = pthread_mutex_unlock(&sc.mutex);
+	status = pthread_mutex_unlock(&suc.mutex);
 	if (status)
 		fatal(status);
 
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index b07424f..50f086d 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -507,34 +507,13 @@ static int sun_mount(struct autofs_point
 	sprintf(mountpoint, "%.*s", namelen, name);
 
 	what = alloca(loclen + 1);
-	memcpy(what, loc, loclen);
-	what[loclen] = '\0';
-/*
-	if (!strcmp(fstype, "autofs") && strchr(loc, ':') == NULL) {
-		char mtype[7];
-		int mtype_len;
-
-		if (loc[0] == '/') {
-			mtype_len = 5;
-			if (loc[1] == '/')
-				strcpy(mtype, "ldap:");
-			else
-				strcpy(mtype, "file:");
-		} else {
-			mtype_len = 3;
-			strcpy(mtype, "yp:");
-		}
-
-		what = alloca(loclen + mtype_len + 1);
-		memcpy(what, mtype, mtype_len);
-		memcpy(what + mtype_len, loc, loclen);
-		what[loclen + mtype_len] = '\0';
+	if (*loc == ':') {
+		memcpy(what, loc + 1, loclen - 1);
+		what[loclen - 1] = '\0';
 	} else {
-*/
-		what = alloca(loclen + 1);
 		memcpy(what, loc, loclen);
 		what[loclen] = '\0';
-/*	} */
+	}
 
 	debug(ap->logopt,
 	    MODPREFIX
@@ -752,7 +731,7 @@ static int validate_location(char *loc)
 	char *ptr = loc;
 
 	/* We don't know much about these */
-	if (*ptr == '/')
+	if (*ptr == ':')
 		return 1;
 
 	/* If a ':' is present now it must be a host name */
@@ -825,10 +804,6 @@ static int parse_mapent(const char *ent,
 		return 0;
 	}
 
-	/* Skip ':' escape */
-	if (*p == ':')
-		p++;
-
 	l = chunklen(p, check_colon(p));
 	loc = dequote(p, l, logopt);
 	if (!loc) {
@@ -861,10 +836,6 @@ static int parse_mapent(const char *ent,
 			return 0;
 		}
 
-		/* Skip ':' escape */
-		if (*p == ':')
-			p++;
-
 		l = chunklen(p, check_colon(p));
 		ent = dequote(p, l, logopt);
 		if (!ent) {
@@ -1227,10 +1198,10 @@ int parse_mount(struct autofs_point *ap,
 			free(options);
 			return 1;
 		}
-
+/*
 		if (*p == ':')
-			p++;	/* Sun escape for entries starting with / */
-
+			p++;	/* Sun escape for entries starting with / */ /*
+*/
 		l = chunklen(p, check_colon(p));
 		loc = dequote(p, l, ap->logopt);
 		if (!loc) {


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- autofs.spec	19 Jul 2006 13:59:16 -0000	1.130
+++ autofs.spec	19 Jul 2006 16:14:50 -0000	1.131
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.4
+%define release 0.rc1.5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -21,9 +21,11 @@
 Patch8: autofs-5.0.1-rc1-cthon-add-parser-subs.patch
 Patch9: autofs-5.0.1-rc1-cthon-more-cleanup.patch
 Patch10: autofs-5.0.1-rc1-cthon-host-name-validation.patch
+Patch11: autofs-5.0.1-rc1-cthon-submount-fix.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
+Conflicts: kernel < 2.6.17
 Requires: /bin/bash mktemp sed gawk textutils sh-utils grep /bin/ps
 Obsoletes: autofs-ldap
 Summary(de): autofs daemon 
@@ -69,6 +71,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -125,6 +128,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.5
+- Add conflicts kernel < 2.6.17.
+- Fix submount operation broken by connectathon updates.
+
 * Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.4
 - Correction to host name validation test for connectathon tests.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 16:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 12:49:50 -0400
Subject: rpms/totem/devel totem-1.5.4-dbus-disconnect.patch, NONE,
	1.1 totem.spec, 1.66, 1.67
Message-ID: <200607191649.k6JGno53011085@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10992

Modified Files:
	totem.spec 
Added Files:
	totem-1.5.4-dbus-disconnect.patch 
Log Message:
don't use deprecated dbus api


totem-1.5.4-dbus-disconnect.patch:
 totem-disc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE totem-1.5.4-dbus-disconnect.patch ---
--- totem-1.5.4/src/plparse/totem-disc.c.dbus-disconnect	2006-07-19 12:47:03.000000000 -0400
+++ totem-1.5.4/src/plparse/totem-disc.c	2006-07-19 12:47:11.000000000 -0400
@@ -560,7 +560,7 @@
     conn = libhal_ctx_get_dbus_connection (cache->ctx);
     libhal_ctx_shutdown (cache->ctx, NULL);
     libhal_ctx_free(cache->ctx);
-    dbus_connection_disconnect (conn);
+    dbus_connection_close (conn);
 #elif HAVE_HAL_0_2
     hal_shutdown (cache->ctx);
 #endif


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- totem.spec	19 Jul 2006 14:58:21 -0000	1.66
+++ totem.spec	19 Jul 2006 16:49:47 -0000	1.67
@@ -5,13 +5,14 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.5.4
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
 Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch1: totem-0.99.19-feature-help-removal.patch
+Patch2: totem-1.5.4-dbus-disconnect.patch
 
 Requires(post): GConf2
 Requires(post): desktop-file-utils
@@ -74,6 +75,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .feature-help-removal
+%patch2 -p1 -b .dbus-disconnect
 
 %build
 # try to work around a problem where gst-inspect does 
@@ -161,6 +163,9 @@
 %{_libdir}/*so
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-3
+- Don't use deprecated dbus api
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-2
 - Rebuild against dbus
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 16:57:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 12:57:10 -0400
Subject: rpms/nautilus-cd-burner/devel
	nautilus-cd-burner-2.15.4-dbus-disconnect.patch, NONE,
	1.1 nautilus-cd-burner.spec, 1.67, 1.68
Message-ID: <200607191657.k6JGvAbe014032@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13964

Modified Files:
	nautilus-cd-burner.spec 
Added Files:
	nautilus-cd-burner-2.15.4-dbus-disconnect.patch 
Log Message:
don't use deprecated dbus api


nautilus-cd-burner-2.15.4-dbus-disconnect.patch:
 nautilus-burn-drive-monitor.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nautilus-cd-burner-2.15.4-dbus-disconnect.patch ---
--- nautilus-cd-burner-2.15.4/src/nautilus-burn-drive-monitor.c.dbus-disconnect	2006-07-19 12:54:27.000000000 -0400
+++ nautilus-cd-burner-2.15.4/src/nautilus-burn-drive-monitor.c	2006-07-19 12:54:55.000000000 -0400
@@ -947,7 +947,7 @@
 	}
 
 #if USE_PRIVATE_DBUS_CONNECTION
-	dbus_connection_disconnect (dbus_connection);
+	dbus_connection_close (dbus_connection);
 #endif
 
 	if (! libhal_ctx_free (monitor->priv->ctx)) {


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- nautilus-cd-burner.spec	19 Jul 2006 15:12:47 -0000	1.67
+++ nautilus-cd-burner.spec	19 Jul 2006 16:57:07 -0000	1.68
@@ -1,8 +1,9 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.15.4
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.bz2
+Patch0: nautilus-cd-burner-2.15.4-dbus-disconnect.patch
 License: LGPL/GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .dbus-disconnect
 
 %build
 %configure --enable-hal --enable-gnome-mount
@@ -110,6 +112,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-3
+- Don't use deprecated dbus api
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
 - Rebuild against dbus
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:03:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:03:32 -0400
Subject: rpms/gnome-media/devel gnome-media.spec,1.72,1.73
Message-ID: <200607191703.k6JH3WIo015489@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15462

Modified Files:
	gnome-media.spec 
Log Message:
rebuild



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gnome-media.spec	12 Jul 2006 21:33:44 -0000	1.72
+++ gnome-media.spec	19 Jul 2006 17:03:22 -0000	1.73
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.14.2
-Release:        5
+Release:        6
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-6
+- Rebuild against dbus
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:17:25 -0400
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.45,1.46
Message-ID: <200607191717.k6JHHPvf001942@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1909

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 0.2.2-7 - Rebuild.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- eclipse-bugzilla.spec	13 Jun 2006 21:28:56 -0000	1.45
+++ eclipse-bugzilla.spec	19 Jul 2006 17:17:22 -0000	1.46
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	6
+Release:	7
 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
+* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 0.2.2-7
+- Rebuild.
+
 * Tue Jun 13 2006 Igor Foox <ifoox at redhat.com> 0.2.2-6
 - Rebuilding for new SDK, with versionless pde.build.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:17:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:17:44 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2419,1.2420
Message-ID: <200607191717.k6JHHixG002101@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2071

Modified Files:
	kernel-2.6.spec 
Log Message:
fix conflict of previous commit


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2419
retrieving revision 1.2420
diff -u -r1.2419 -r1.2420
--- kernel-2.6.spec	19 Jul 2006 12:45:49 -0000	1.2419
+++ kernel-2.6.spec	19 Jul 2006 17:17:41 -0000	1.2420
@@ -7,9 +7,9 @@
 %define buildsmp 0
 %define buildpae 0
 # Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
 %define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
@@ -310,6 +310,7 @@
 Patch955: linux-2.6-xen_remap_vma_flags.patch
 Patch960: linux-2.6-execshield-xen.patch
 Patch961: linux-2.6-xen-vdso-note.patch
+Patch962: linux-2.6-xen-utrace.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -827,6 +828,8 @@
 # Xen exec-shield bits
 %patch960 -p1
 %patch961 -p1
+# utrace
+%patch962 -p1
 
 %endif
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:20:15 -0400
Subject: rpms/kernel/devel/configs config-xen-x86, NONE,
	1.1 config-xen-generic, 1.22, 1.23 config-xen-x86_64, 1.3, 1.4
Message-ID: <200607191720.k6JHKFWH003065@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3028/configs

Modified Files:
	config-xen-generic config-xen-x86_64 
Added Files:
	config-xen-x86 
Log Message:
new xen config files


--- NEW FILE config-xen-x86 ---

# CONFIG_X86_PC is not set
CONFIG_X86_XEN=y
# CONFIG_X86_GENERICARCH is not set

# CONFIG_X86_POWERNOW_K7 is not set


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-xen-generic	15 Jul 2006 06:49:38 -0000	1.22
+++ config-xen-generic	19 Jul 2006 17:20:13 -0000	1.23
@@ -1,69 +1,53 @@
+
+CONFIG_XEN_PCIDEV_FRONTEND=y
+# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
+
+
+CONFIG_XEN=y
+CONFIG_XEN_INTERFACE_VERSION=0x00030202
+
 #
 # XEN
 #
-CONFIG_ARCH_XEN=y
-CONFIG_NO_IDLE_HZ=y
-CONFIG_XEN_WRITABLE_PAGETABLES=y
-# CONFIG_XEN_SHADOW_MODE is not set
+CONFIG_XEN_PRIVILEGED_GUEST=y
+# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
+CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_XENBUS_DEV=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_XEN_BLKDEV_TAP=m
+CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
+CONFIG_XEN_NETDEV_LOOPBACK=m
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_FOREIGN_PAGES=y
+# CONFIG_XEN_DISABLE_SERIAL is not set
+CONFIG_XEN_SYSFS=y
+CONFIG_XEN_COMPAT_030002_AND_LATER=y
+# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
+CONFIG_XEN_COMPAT_030002=y
+CONFIG_HAVE_ARCH_ALLOC_SKB=y
 CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
-CONFIG_XEN_BLKDEV_GRANT=y
-# CONFIG_XEN_BLKDEV_TAP_BE is not set
-# CONFIG_XEN_BLKDEV_TAP is not set
-# 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
-CONFIG_XEN_NETDEV_LOOPBACK=y
-CONFIG_XEN_BACKEND=y
+CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_XEN_UTIL=y
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_DEVMEM=y
+CONFIG_XEN_SKBUFF=y
+CONFIG_XEN_REBOOT=y
+CONFIG_XEN_SMPBOOT=y
 
-#
-# X86 Processor Configuration
-#
-CONFIG_X86_XEN=y
-# CONFIG_X86_GENERICARCH is not set
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
-# CONFIG_X86_PM_TIMER is not set
-# CONFIG_PCI_MSI is not set
 
 #
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HAVE_DEC_LOCK=y
-# CONFIG_REGPARM is not set
 
 # Huge pages do not currently work under Xen
 # CONFIG_HUGETLBFS is not set
@@ -74,10 +58,8 @@
 #
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 
 # FIXME: Why are the following unset ?
-# CONFIG_4KSTACKS is not set
 # CONFIG_UNWIND_INFO is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_SLAB_LEAK is not set
@@ -106,13 +88,56 @@
 #
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH is not set
-CONFIG_XEN_SYSFS=y
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-CONFIG_PCI_GODIRECT=y
-# CONFIG_PCI_GOXEN_FE is not set
-# CONFIG_PCI_GOANY is not set
-CONFIG_PCI_DIRECT=y
-CONFIG_PCIEPORTBUS=y
 # CONFIG_TCG_TPM is not set
+
+
+# Microcode driver in Xen won't work as a module - should be upgraded
+CONFIG_MICROCODE=y
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Ethernet (10 or 100Mbit)
+# 
+# CONFIG_LANCE is not set
+# CONFIG_SUNLANCE is not set
+# CONFIG_3C515 is not set
+# CONFIG_NI65 is not set
+# CONFIG_ELPLUS is not set
+# B44 results in "b44.ko needs unknown symbol dma_get_cache_alignment"
+# CONFIG_B44 is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_AHA1542 is not set
+
+#
+# ISA devices
+#
+# CONFIG_SND_SB16_CSP is not set
+
+#.
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+# CONFIG_SERIAL_8250_CONSOLE is not set
+
+#
+# FIR device drivers
+#
+# CONFIG_TOSHIBA_FIR is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+#
+# Power management bits that don't work in Xen:
+#
+# CONFIG_X86_P4_CLOCKMOD is not set
+


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-x86_64	14 Apr 2006 18:34:18 -0000	1.3
+++ config-xen-x86_64	19 Jul 2006 17:20:13 -0000	1.4
@@ -1,17 +1,12 @@
 # things we want different from i686 xen
 
-# CONFIG_X86 is not set
 CONFIG_X86_64=y
 
 # CONFIG_X86_XEN is not set
 CONFIG_X86_64_XEN=y
 
-CONFIG_XENARCH="x86_64"
-# CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
 
 CONFIG_NR_CPUS=8
-# CONFIG_EARLY_PRINTK is not set
 
-CONFIG_PCI=y
-# CONFIG_PCI_MMCONFIG is not set
+



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:22:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:22:07 -0400
Subject: rpms/kernel/devel Makefile.config,1.42,1.43
Message-ID: <200607191722.k6JHM70X003800@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3756

Modified Files:
	Makefile.config 
Log Message:
new xen config files


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Makefile.config	14 Jul 2006 22:19:38 -0000	1.42
+++ Makefile.config	19 Jul 2006 17:22:05 -0000	1.43
@@ -58,10 +58,10 @@
 temp-ia64-generic: configs/config-ia64-generic temp-generic
 	perl merge.pl $^ > $@
 
-temp-x86-xen-generic-temp: configs/config-xen-generic temp-x86-generic
+temp-x86-xen-generic-tmp: configs/config-xen-generic temp-x86-generic
 	perl merge.pl $^ > $@
 
-temp-x86-xen-generic: configs/config-xen-xen temp-x86-xen-generic-temp
+temp-x86-xen-generic: configs/config-xen-x86 temp-x86-xen-generic-tmp
 	perl merge.pl $^ > $@
 
 temp-x86_64-xen-generic-tmp: configs/config-xen-generic temp-x86_64-generic
@@ -133,6 +133,6 @@
 kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic
+kernel-$(VERSION)-x86_64-xen.config: configs/config-x86_64 temp-x86_64-xen-generic
 	perl merge.pl $^ x86_64 > $@
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:22:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:22:38 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.5,1.6
Message-ID: <200607191722.k6JHMcik004016@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/notification-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3947

Modified Files:
	notification-daemon.spec 
Log Message:
- add BR on dbus-glib-devel



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- notification-daemon.spec	12 Jul 2006 07:29:06 -0000	1.5
+++ notification-daemon.spec	19 Jul 2006 17:22:35 -0000	1.6
@@ -1,10 +1,11 @@
 %define gtk2_version		2.4.0
-%define dbus_version		0.50
+%define dbus_version		0.90
+%define dbus_glib_version            0.70
 
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.5
-Release: 4.1 
+Release: 5 
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -13,6 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib_devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel
 BuildRequires: GConf2-devel
 BuildRequires: autoconf automake
@@ -80,6 +82,9 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.5-5
+- add BR on dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:25:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:25:06 -0400
Subject: rpms/kernel/devel linux-2.6-xen-utrace.patch, NONE,
	1.1 linux-2.6-defaults-disable-split-ptlock.patch, 1.2,
	1.3 linux-2.6-xen.patch, 1.33,
	1.34 linux-2.6-xen-compile-fixes.patch, 1.10,
	1.11 linux-2.6-execshield-xen.patch, 1.6, 1.7 kernel-2.6.spec,
	1.2420, 1.2421
Message-ID: <200607191725.k6JHP6V2004967@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4834

Modified Files:
	linux-2.6-defaults-disable-split-ptlock.patch 
	linux-2.6-xen.patch linux-2.6-xen-compile-fixes.patch 
	linux-2.6-execshield-xen.patch kernel-2.6.spec 
Added Files:
	linux-2.6-xen-utrace.patch 
Log Message:
big xen merge

linux-2.6-xen-utrace.patch:
 i386/kernel/entry-xen.S     |    7 ++-----
 i386/kernel/process-xen.c   |    3 ---
 x86_64/ia32/ia32entry-xen.S |    2 +-
 x86_64/kernel/process-xen.c |    5 -----
 x86_64/kernel/traps-xen.c   |    8 --------
 x86_64/mm/fault-xen.c       |    4 ++--
 6 files changed, 5 insertions(+), 24 deletions(-)

--- NEW FILE linux-2.6-xen-utrace.patch ---
diff -urNp linux-2.6.17.previous/arch/i386/kernel/entry-xen.S linux-2.6.17.noarch/arch/i386/kernel/entry-xen.S
--- linux-2.6.17.previous/arch/i386/kernel/entry-xen.S	2006-07-19 16:27:09.000000000 +0200
+++ linux-2.6.17.noarch/arch/i386/kernel/entry-xen.S	2006-07-19 17:48:25.000000000 +0200
@@ -340,7 +340,7 @@ sysenter_past_esp:
 	GET_THREAD_INFO(%ebp)
 
 	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+	testw $(_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
 	jnz syscall_trace_entry
 	cmpl $(nr_syscalls), %eax
 	jae syscall_badsys
@@ -389,7 +389,7 @@ ENTRY(system_call)
 no_singlestep:
 					# system call tracing in operation / emulation
 	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+	testw $(_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
 	jnz syscall_trace_entry
 	cmpl $(nr_syscalls), %eax
 	jae syscall_badsys
@@ -539,9 +539,6 @@ syscall_trace_entry:
 	movl %esp, %eax
 	xorl %edx,%edx
 	call do_syscall_trace
-	cmpl $0, %eax
-	jne resume_userspace		# ret != 0 -> running under PTRACE_SYSEMU,
-					# so must skip actual syscall
 	movl ORIG_EAX(%esp), %eax
 	cmpl $(nr_syscalls), %eax
 	jnae syscall_call
diff -urNp linux-2.6.17.previous/arch/i386/kernel/process-xen.c linux-2.6.17.noarch/arch/i386/kernel/process-xen.c
--- linux-2.6.17.previous/arch/i386/kernel/process-xen.c	2006-07-19 16:27:11.000000000 +0200
+++ linux-2.6.17.noarch/arch/i386/kernel/process-xen.c	2006-07-19 17:46:21.000000000 +0200
@@ -657,9 +657,6 @@ asmlinkage int sys_execve(struct pt_regs
 			(char __user * __user *) regs.edx,
 			&regs);
 	if (error == 0) {
-		task_lock(current);
-		current->ptrace &= ~PT_DTRACE;
-		task_unlock(current);
 		/* Make sure we don't return using sysenter.. */
 		set_thread_flag(TIF_IRET);
 	}
diff -urNp linux-2.6.17.previous/arch/x86_64/ia32/ia32entry-xen.S linux-2.6.17.noarch/arch/x86_64/ia32/ia32entry-xen.S
--- linux-2.6.17.previous/arch/x86_64/ia32/ia32entry-xen.S	2006-07-19 16:27:10.000000000 +0200
+++ linux-2.6.17.noarch/arch/x86_64/ia32/ia32entry-xen.S	2006-07-19 17:53:16.000000000 +0200
@@ -444,7 +444,7 @@ ia32_sys_call_table:
 	.quad sys_setuid16
 	.quad sys_getuid16
 	.quad compat_sys_stime	/* stime */		/* 25 */
-	.quad sys32_ptrace	/* ptrace */
+	.quad compat_sys_ptrace	/* ptrace */
 	.quad sys_alarm
 	.quad sys_fstat	/* (old)fstat */
 	.quad sys_pause
diff -urNp linux-2.6.17.previous/arch/x86_64/kernel/process-xen.c linux-2.6.17.noarch/arch/x86_64/kernel/process-xen.c
--- linux-2.6.17.previous/arch/x86_64/kernel/process-xen.c	2006-07-19 16:27:11.000000000 +0200
+++ linux-2.6.17.noarch/arch/x86_64/kernel/process-xen.c	2006-07-19 17:52:39.000000000 +0200
@@ -580,11 +580,6 @@ long sys_execve(char __user *name, char 
 	if (IS_ERR(filename)) 
 		return error;
 	error = do_execve(filename, argv, envp, &regs); 
-	if (error == 0) {
-		task_lock(current);
-		current->ptrace &= ~PT_DTRACE;
-		task_unlock(current);
-	}
 	putname(filename);
 	return error;
 }
diff -urNp linux-2.6.17.previous/arch/x86_64/kernel/traps-xen.c linux-2.6.17.noarch/arch/x86_64/kernel/traps-xen.c
--- linux-2.6.17.previous/arch/x86_64/kernel/traps-xen.c	2006-07-19 16:27:10.000000000 +0200
+++ linux-2.6.17.noarch/arch/x86_64/kernel/traps-xen.c	2006-07-19 17:51:56.000000000 +0200
@@ -863,14 +863,6 @@ asmlinkage void __kprobes do_debug(struc
 		 */
                 if (!user_mode(regs))
                        goto clear_TF_reenable;
-		/*
-		 * Was the TF flag set by a debugger? If so, clear it now,
-		 * so that register information is correct.
-		 */
-		if (tsk->ptrace & PT_DTRACE) {
-			regs->eflags &= ~TF_MASK;
-			tsk->ptrace &= ~PT_DTRACE;
-		}
 	}
 
 	/* Ok, finally something we can handle */
diff -urNp linux-2.6.17.previous/arch/x86_64/mm/fault-xen.c linux-2.6.17.noarch/arch/x86_64/mm/fault-xen.c
--- linux-2.6.17.previous/arch/x86_64/mm/fault-xen.c	2006-07-19 16:27:11.000000000 +0200
+++ linux-2.6.17.noarch/arch/x86_64/mm/fault-xen.c	2006-07-19 18:01:52.000000000 +0200
@@ -11,7 +11,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -250,7 +250,7 @@ int unhandled_signal(struct task_struct 
 {
 	if (tsk->pid == 1)
 		return 1;
-	if (tsk->ptrace & PT_PTRACED)
+	if (tracehook_consider_fatal_signal(tsk, sig))
 		return 0;
 	return (tsk->sighand->action[sig-1].sa.sa_handler == SIG_IGN) ||
 		(tsk->sighand->action[sig-1].sa.sa_handler == SIG_DFL);

linux-2.6-defaults-disable-split-ptlock.patch:
 Kconfig |    1 +
 1 files changed, 1 insertion(+)

Index: linux-2.6-defaults-disable-split-ptlock.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-defaults-disable-split-ptlock.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-defaults-disable-split-ptlock.patch	12 Jul 2006 18:35:11 -0000	1.2
+++ linux-2.6-defaults-disable-split-ptlock.patch	19 Jul 2006 17:25:02 -0000	1.3
@@ -1,11 +1,10 @@
---- linux-2.6.17.noarch/mm/Kconfig~	2006-07-11 21:16:29.000000000 -0400
-+++ linux-2.6.17.noarch/mm/Kconfig	2006-07-11 21:16:43.000000000 -0400
-@@ -132,7 +132,8 @@ config SPLIT_PTLOCK_CPUS
- 	int
+--- linux-2.6.17.noarch/mm/Kconfig.orig	2006-07-19 16:23:03.000000000 +0200
++++ linux-2.6.17.noarch/mm/Kconfig	2006-07-19 16:25:16.000000000 +0200
+@@ -135,6 +135,7 @@ config SPLIT_PTLOCK_CPUS
  	default "4096" if ARM && !CPU_CACHE_VIPT
  	default "4096" if PARISC && !PA20
+ 	default "4096" if X86_XEN || X86_64_XEN
 +	default "4096" if !64BIT
  	default "4"
  
  #
- # support for page migration

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   18 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   13 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 407 files changed, 85120 insertions(+), 872 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.33 -r 1.34 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- linux-2.6-xen.patch	5 Jul 2006 21:12:56 -0000	1.33
+++ linux-2.6-xen.patch	19 Jul 2006 17:25:02 -0000	1.34
@@ -1,6 +1,6 @@
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile merge/arch/i386/boot-xen/Makefile
---- ../upstream/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ merge/arch/i386/boot-xen/Makefile	2006-05-30 12:42:43.000000000 +0200
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+--- ../upstream/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/boot-xen/Makefile	2006-07-18 19:30:35.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,10 +23,23 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/arch/i386/Kconfig merge/arch/i386/Kconfig
---- ../upstream/hg/linux-2.6/arch/i386/Kconfig	2006-05-27 02:37:47.000000000 +0200
-+++ merge/arch/i386/Kconfig	2006-05-30 12:42:43.000000000 +0200
-@@ -91,6 +91,15 @@ config X86_PC
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
+--- ../upstream/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig	2006-07-18 23:33:32.000000000 +0200
+@@ -16,10 +16,12 @@ config X86_32
+ 
+ config GENERIC_TIME
+ 	bool
++	depends on !X86_XEN
+ 	default y
+ 
+ config LOCKDEP_SUPPORT
+ 	bool
++	depends on !X86_XEN
+ 	default y
+ 
+ config STACKTRACE_SUPPORT
+@@ -103,6 +105,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
  
@@ -42,25 +55,15 @@
  config X86_ELAN
  	bool "AMD Elan"
  	help
-@@ -242,7 +242,7 @@ config NR_CPUS
- 
- config SCHED_SMT
- 	bool "SMT (Hyperthreading) scheduler support"
--	depends on X86_HT
-+	depends on X86_HT && !X86_XEN
- 	help
- 	  SMT scheduler support improves the CPU scheduler's decision making
- 	  when dealing with Intel Pentium 4 chips with HyperThreading at a
-@@ -251,7 +251,7 @@ config SCHED_SMT
+@@ -211,6 +222,7 @@ source "arch/i386/Kconfig.cpu"
  
- config SCHED_MC
- 	bool "Multi-core scheduler support"
--	depends on X86_HT
-+	depends on X86_HT && !X86_XEN
- 	default y
+ config HPET_TIMER
+ 	bool "HPET Timer Support"
++	depends on !X86_XEN
  	help
- 	  Multi-core scheduler support improves the CPU scheduler's decision
-@@ -259,7 +259,7 @@ source "kernel/Kconfig.preempt"
+ 	  This enables the use of the HPET for the kernel's internal timer.
+ 	  HPET is the next generation timer replacing legacy 8254s.
+@@ -261,7 +273,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -69,7 +72,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -269,12 +279,12 @@ config X86_UP_IOAPIC
+@@ -286,12 +298,12 @@ config X86_UP_IOAPIC
  
  config X86_LOCAL_APIC
  	bool
@@ -84,15 +87,8 @@
  	default y
  
  config X86_VISWS_APIC
-@@ -282,9 +292,14 @@ config X86_VISWS_APIC
- 	depends on X86_VISWS
- 	default y
+@@ -301,7 +313,7 @@ config X86_VISWS_APIC
  
-+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
@@ -100,7 +96,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -374,6 +389,7 @@ config X86_REBOOTFIXUPS
+@@ -400,6 +412,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -108,7 +104,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
-@@ -391,6 +407,7 @@ config MICROCODE
+@@ -417,6 +430,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -116,7 +112,7 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -406,6 +423,10 @@ config X86_CPUID
+@@ -432,6 +446,10 @@ config X86_CPUID
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
  
@@ -127,7 +123,7 @@
  source "drivers/firmware/Kconfig"
  
  choice
-@@ -578,7 +599,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -605,7 +623,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -136,7 +132,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
-@@ -587,6 +608,7 @@ config HIGHPTE
+@@ -614,6 +632,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -144,7 +140,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -612,6 +634,8 @@ config MATH_EMULATION
+@@ -639,6 +658,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -153,7 +149,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -646,7 +670,7 @@ config MTRR
+@@ -673,7 +694,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -162,7 +158,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -664,7 +688,7 @@ config EFI
+@@ -691,7 +712,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -171,7 +167,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -712,7 +736,7 @@ source kernel/Kconfig.hz
+@@ -739,7 +760,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -180,8 +176,8 @@
  	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
-@@ -767,18 +791,20 @@ endmenu
- 
+@@ -808,18 +829,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+ 	depends on HIGHMEM
  
  menu "Power management options (ACPI, APM)"
 -	depends on !X86_VOYAGER
@@ -204,7 +200,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
[...25337 lines suppressed...]
+  *
+  * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
+  * Ben Greear <greearb at candelatech.com>
+- * Jens L??s <jens.laas at data.slu.se>
++ * Jens L????????s <jens.laas at data.slu.se>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
+--- ../upstream/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
++++ compiling/net/core/skbuff.c	2006-07-19 01:12:57.000000000 +0200
+@@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
   */
@@ -86327,7 +89514,7 @@
  struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
  			    int fclone)
  {
-@@ -194,6 +195,7 @@ nodata:
+@@ -200,6 +201,7 @@ nodata:
  	skb = NULL;
  	goto out;
  }
@@ -86335,7 +89522,7 @@
  
  /**
   *	alloc_skb_from_cache	-	allocate a network buffer
-@@ -211,14 +213,18 @@ nodata:
+@@ -217,14 +219,18 @@ nodata:
   */
  struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
  				     unsigned int size,
@@ -86357,7 +89544,7 @@
  	if (!skb)
  		goto out;
  
-@@ -235,17 +235,30 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -241,17 +247,29 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -86367,10 +89554,16 @@
 +	shinfo->nr_frags  = 0;
 +	shinfo->gso_size = 0;
 +	shinfo->gso_segs = 0;
-+	shinfo->gso_size = 0;
++	shinfo->gso_type = 0;
 +	shinfo->ip6_frag_id = 0;
 +	shinfo->frag_list = NULL;
-+
+ 
+-	atomic_set(&(skb_shinfo(skb)->dataref), 1);
+-	skb_shinfo(skb)->nr_frags  = 0;
+-	skb_shinfo(skb)->gso_size = 0;
+-	skb_shinfo(skb)->gso_segs = 0;
+-	skb_shinfo(skb)->gso_type = 0;
+-	skb_shinfo(skb)->frag_list = NULL;
 +	if (fclone) {
 +		struct sk_buff *child = skb + 1;
 +		atomic_t *fclone_ref = (atomic_t *) (child + 1);
@@ -86380,13 +89573,6 @@
 +
 +		child->fclone = SKB_FCLONE_UNAVAILABLE;
 +	}
- 
--	atomic_set(&(skb_shinfo(skb)->dataref), 1);
--	skb_shinfo(skb)->nr_frags  = 0;
--	skb_shinfo(skb)->gso_size = 0;
--	skb_shinfo(skb)->gso_segs = 0;
--	skb_shinfo(skb)->gso_type = 0;
--	skb_shinfo(skb)->frag_list = NULL;
  out:
  	return skb;
  nodata:
@@ -86395,7 +89581,7 @@
  	skb = NULL;
  	goto out;
  }
-@@ -434,6 +453,10 @@ struct sk_buff *skb_clone(struct sk_buff
+@@ -446,6 +464,10 @@ struct sk_buff *skb_clone(struct sk_buff
  	C(local_df);
  	n->cloned = 1;
  	n->nohdr = 0;
@@ -86406,57 +89592,44 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c merge/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-05-30 12:44:05.000000000 +0200
-@@ -129,10 +129,17 @@ tcp_manip_pkt(struct sk_buff **pskb,
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 19:31:28.000000000 +0200
+@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
  
 -	hdr->check = ip_nat_cheat_check(~oldip, newip,
 +#ifdef CONFIG_XEN
-+	if ((*pskb)->proto_csum_blank) {
++	if ((*pskb)->proto_csum_blank)
 +		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+	} else
++	else
 +#endif
-+	{
 +		hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-+	}
- 	return 1;
- }
- 
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c merge/net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../upstream/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-16 01:22:34.000000000 +0100
-+++ merge/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-05-30 12:44:05.000000000 +0200
-@@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
- 		newport = tuple->dst.u.udp.port;
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-19 12:54:55.000000000 +0200
+@@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
--	if (hdr->check) /* 0 is a special case meaning no checksum */
+ 	if (hdr->check) /* 0 is a special case meaning no checksum */
 -		hdr->check = ip_nat_cheat_check(~oldip, newip,
-+	if (hdr->check) { /* 0 is a special case meaning no checksum */
 +#ifdef CONFIG_XEN
-+		if ((*pskb)->proto_csum_blank) {
++		if ((*pskb)->proto_csum_blank)
 +			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+		} else
++		else
 +#endif
-+		{
 +			hdr->check = ip_nat_cheat_check(~oldip, newip,
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-+		}
-+	}
- 	*portptr = newport;
- 	return 1;
- }
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c merge/net/ipv4/xfrm4_output.c
---- ../upstream/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-05-13 02:59:54.000000000 +0200
-+++ merge/net/ipv4/xfrm4_output.c	2006-05-30 12:44:06.000000000 +0200
-@@ -16,6 +16,8 @@
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+--- ../upstream/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/xfrm4_output.c	2006-07-19 01:12:57.000000000 +0200
+@@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
  
@@ -86465,7 +89638,7 @@
  static int xfrm4_tunnel_check_size(struct sk_buff *skb)
  {
  	int mtu, ret = 0;
-@@ -103,6 +105,10 @@ static int xfrm4_output_one(struct sk_bu
+@@ -48,6 +50,10 @@ static int xfrm4_output_one(struct sk_bu
  	struct xfrm_state *x = dst->xfrm;
  	int err;
  	
@@ -86476,9 +89649,28 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -uNrp --exclude='.hg*' ../upstream/hg/linux-2.6/scripts/Makefile.xen merge/scripts/Makefile.xen
---- ../upstream/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ merge/scripts/Makefile.xen	2006-05-30 12:44:09.000000000 +0200
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+--- ../upstream/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
++++ compiling/net/ipv6/addrconf.c	2006-07-19 01:12:57.000000000 +0200
+@@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
+ 	spin_lock_bh(&ifp->lock);
+ 
+ 	if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
++	    !(dev->flags&IFF_MULTICAST) ||
+ 	    !(ifp->flags&IFA_F_TENTATIVE)) {
+ 		ifp->flags &= ~IFA_F_TENTATIVE;
+ 		spin_unlock_bh(&ifp->lock);
+@@ -2572,6 +2573,7 @@ static void addrconf_dad_completed(struc
+ 	if (ifp->idev->cnf.forwarding == 0 &&
+ 	    ifp->idev->cnf.rtr_solicits > 0 &&
+ 	    (dev->flags&IFF_LOOPBACK) == 0 &&
++	    (dev->flags & IFF_MULTICAST) &&
+ 	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
+ 		struct in6_addr all_routers;
+ 
+diff --exclude=.hg -uNrp ../upstream/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
+--- ../upstream/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ compiling/scripts/Makefile.xen	2006-07-18 19:31:30.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 13 files changed, 40 insertions(+), 10 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-xen-compile-fixes.patch	24 Jun 2006 07:10:13 -0000	1.10
+++ linux-2.6-xen-compile-fixes.patch	19 Jul 2006 17:25:03 -0000	1.11
@@ -50,28 +50,6 @@
  #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
@@ -215,25 +193,3 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
---- linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h~	2006-06-23 15:14:49.023437000 -0400
-+++ linux-2.6.17.noarch/include/asm-x86_64/mach-xen/asm/vga.h	2006-06-23 15:15:06.941500000 -0400
-@@ -12,7 +12,7 @@
-  *	access the videoram directly without any black magic.
-  */
- 
--#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
-+#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
- 
- #define vga_readb(x) (*(x))
- #define vga_writeb(x,y) (*(y) = (x))
---- linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h~	2006-06-23 15:15:13.543893000 -0400
-+++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/vga.h	2006-06-23 15:15:25.187234000 -0400
-@@ -12,7 +12,7 @@
-  *	access the videoram directly without any black magic.
-  */
- 
--#define VGA_MAP_MEM(x) (unsigned long)isa_bus_to_virt(x)
-+#define VGA_MAP_MEM(x,s) (unsigned long)isa_bus_to_virt(x)
- 
- #define vga_readb(x) (*(x))
- #define vga_writeb(x,y) (*(y) = (x))

linux-2.6-execshield-xen.patch:
 arch/i386/kernel/process-xen.c                              |   58 +++++++
 arch/i386/kernel/smp-xen.c                                  |    2 
 arch/i386/kernel/traps-xen.c                                |   92 +++++++++++-
 arch/i386/mm/init-xen.c                                     |    6 
 linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h |    2 
 linux-2.6.16.noarch/arch/x86_64/kernel/setup64-xen.c        |   23 ---
 linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h     |    4 
 7 files changed, 160 insertions(+), 27 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-execshield-xen.patch	24 May 2006 12:21:11 -0000	1.6
+++ linux-2.6-execshield-xen.patch	19 Jul 2006 17:25:03 -0000	1.7
@@ -11,25 +11,6 @@
  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.
-  * 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
@@ -307,19 +288,22 @@
  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.16.noarch/arch/i386/kernel/sysenter.c linux-2.6.16.i686/arch/i386/kernel/sysenter.c
---- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c	2006-03-21 13:36:40.000000000 +0100
-+++ linux-2.6.16.i686/arch/i386/kernel/sysenter.c	2006-03-21 13:40:17.000000000 +0100
-@@ -134,6 +134,7 @@ int arch_setup_additional_pages(struct l
- 	return err;
- }
+diff -urNp linux-2.6.17.previous/include/asm-i386/mach-xen/asm/mmu.h linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h
+--- linux-2.6.17.previous/include/asm-i386/mach-xen/asm/mmu.h	2006-07-19 16:27:10.000000000 +0200
++++ linux-2.6.17.noarch/include/asm-i386/mach-xen/asm/mmu.h	2006-07-19 17:30:29.000000000 +0200
+@@ -7,11 +7,15 @@
+  * we put the segment information here.
+  *
+  * cpu_vm_mask is used to optimize ldt flushing.
++ * exec_limit is used to track the range PROT_EXEC
++ * mappings span.
+  */
+ typedef struct { 
+ 	int size;
+ 	struct semaphore sem;
+ 	void *ldt;
++	struct desc_struct user_cs;
++	unsigned long exec_limit;
+ 	void *vdso;
+ } mm_context_t;
  
-+#ifndef CONFIG_XEN
- int in_gate_area_no_task(unsigned long addr)
- {
- 	return 0;
-@@ -148,3 +149,4 @@ struct vm_area_struct *get_gate_vma(stru
- {
- 	return NULL;
- }
-+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2420
retrieving revision 1.2421
diff -u -r1.2420 -r1.2421
--- kernel-2.6.spec	19 Jul 2006 17:17:41 -0000	1.2420
+++ kernel-2.6.spec	19 Jul 2006 17:25:03 -0000	1.2421
@@ -1677,6 +1677,12 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Juan Quintela <quintela at redhat>
+- big xen patch.
+- enable xen again.
+- redo xen config.
+- i686 kernel for xen uses PAE now.
+
 * Wed Jul 19 2006 Roland McGrath <roland at redhat.com>
 - New version of utrace patch, might fix #198780.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:26:00 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.4-with-libdb-fix.patch, NONE,
	1.1 evolution-data-server.spec, 1.101,
	1.102 evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch,
	1.1, NONE evolution-data-server-1.0.2-fix-64-bit-build.patch, 1.1,
	NONE evolution-data-server-1.0.2-fix-calendar-factory-GType.patch,
	1.1, NONE evolution-data-server-1.2.0-validatehelo.patch, 1.1,
	NONE evolution-data-server-1.3.5-nspr_fix.patch, 1.2, NONE
Message-ID: <200607191726.k6JHQ0Jr005325@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5182

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.4-with-libdb-fix.patch 
Removed Files:
	evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch 
	evolution-data-server-1.0.2-fix-64-bit-build.patch 
	evolution-data-server-1.0.2-fix-calendar-factory-GType.patch 
	evolution-data-server-1.2.0-validatehelo.patch 
	evolution-data-server-1.3.5-nspr_fix.patch 
Log Message:
- Dynamically link to BDB.
- Add patch to make --with-db configure option work.
- Add Requires for db4 and BuildRequires for db4-devel.
- Clean up spec file, renumber patches.


evolution-data-server-1.7.4-with-libdb-fix.patch:
 backends/groupwise/Makefile.am |    1 -
 libedata-book/Makefile.am      |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE evolution-data-server-1.7.4-with-libdb-fix.patch ---
--- evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am.with-libdb-fix	2006-07-19 12:40:29.000000000 -0400
+++ evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am	2006-07-19 12:40:53.000000000 -0400
@@ -50,8 +50,7 @@
 libedata_book_1_2_la_LIBADD =					\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(top_builddir)/libdb/dist/libdb-4.1.la
+	$(top_builddir)/libedataserver/libedataserver-1.2.la
 
 libedata_book_1_2_la_LDFLAGS = \
 	-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED)
--- evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am.with-libdb-fix	2006-07-19 12:40:11.000000000 -0400
+++ evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am	2006-07-19 12:40:53.000000000 -0400
@@ -20,7 +20,6 @@
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(top_builddir)/libdb/dist/libdb-4.1.la				\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
 	$(SOUP_LIBS)
 


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- evolution-data-server.spec	12 Jul 2006 12:10:10 -0000	1.101
+++ evolution-data-server.spec	19 Jul 2006 17:25:58 -0000	1.102
@@ -18,58 +18,64 @@
 %define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
 %define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
 
-Summary: Backend data server for evolution
+### Abstract ###
+
 Name: evolution-data-server
 Version: 1.7.4
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
+Summary: Backend data server for Evolution
+URL: http://www.gnome.org/projects/evolution/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: %{name}-%{version}.tar.bz2
-#Patch1: evolution-data-server-1.0.2-fix-64-bit-build.patch
-#Patch2: fix_contact_leaks.patch
-Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
-#Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
-#Patch5: evolution-data-server-1.3.5-nspr_fix.patch
-
-# Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267)
-#Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
-
-Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
-Patch102: evolution-data-server-1.3.8-fix-implicit-function-declarations
 
-# Fixed upstream (Bug #336035)
-#Patch103: evolution-data-server-1.2.0-validatehelo.patch
+### Patches ###
+
+Patch10: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
+Patch11: evolution-1.4.4-ldap-x86_64-hack.patch
+Patch12: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
+Patch13: evolution-data-server-1.3.8-fix-implicit-function-declarations
 
 # Leak fixes by Mark G. Adams
-Patch200: gb-309079-attach-48376.patch
-Patch201: gb-309079-attach-48377.patch
+Patch14: gb-309079-attach-48376.patch
+Patch15: gb-309079-attach-48377.patch
 
-Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
+Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: libsoup >= %{soup_version}
+# Gnome.org bug #344693
+Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+
+### Dependencies ###
+
+Requires: GConf2
 Requires: ORBit2 >= %{orbit2_version}
-Requires: libbonobo >= %{libbonobo_version}
-Requires: libgnomeui
+Requires: db4
 Requires: gnome-vfs2
-Requires: GConf2
+Requires: libbonobo >= %{libbonobo_version}
 Requires: libglade2
+Requires: libgnomeui
+Requires: libsoup >= %{soup_version}
+
+### Build Dependencies ###
+
+BuildRequires: GConf2-devel
+BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: bison
+BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
-BuildRequires: intltool
-BuildRequires: libtool
 BuildRequires: glib2-devel
 BuildRequires: gnome-vfs2-devel
-BuildRequires: GConf2-devel
-BuildRequires: libsoup-devel >= %{soup_version}
-BuildRequires: ORBit2-devel >= %{orbit2_version}
+BuildRequires: gnutls-devel
+BuildRequires: intltool
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
+BuildRequires: libglade2-devel
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
-BuildRequires: libglade2-devel
-BuildRequires: gnutls-devel
+BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: libtool
+
 %if %{use_nss}
 BuildRequires: nspr-devel
 BuildRequires: nss-devel
@@ -96,9 +102,11 @@
 %endif
 
 %description
-The evolution-data-server package provides a unified backend for programs that work with contacts, tasks, and calendar information.
+The evolution-data-server package provides a unified backend for programs
+that work with contacts, tasks, and calendar information.
 
-It was originally developed for Evolution (hence the name), but is now used by other packages.
+It was originally developed for Evolution (hence the name), but is now used
+by other packages.
 
 %package devel
 Summary: Development files for building against evolution-data-server
@@ -113,21 +121,14 @@
 
 %prep
 %setup -q
-#%patch1 -p1 -b .fix-64-bit-build
-#%patch2 -p1 -b .fix_contact_leaks
-%patch3 -p1 -b .workaround-cal-backend-leak
-#%patch4 -p1 -b .fix-calendar-factory-GType
-#%patch5 -p1 -b .fix_nspr
-
-#%patch6 -p0 -b .calendar-optimisation-XB70267
-
-%patch98 -p1 -b .ldaphack
-%patch101 -p1 -b .fix_open_calendar_declaration
-%patch102 -p1 -b .fix-implicit-function-declarations
-#%patch103 -p1 -b .validatehelo
-%patch200 -p0 -b .fix-uid-leak
-%patch201 -p0 -b .fix-comp-ref-leak
-%patch300 -p1 -b .make_imap4_optional
+%patch10 -p1 -b .workaround-cal-backend-leak
+%patch11 -p1 -b .ldaphack
+%patch12 -p1 -b .fix_open_calendar_declaration
+%patch13 -p1 -b .fix-implicit-function-declarations
+%patch14 -p0 -b .fix-uid-leak
+%patch15 -p0 -b .fix-comp-ref-leak
+%patch16 -p1 -b .make_imap4_optional
+%patch17 -p1 -b .with-libdb-fix
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -202,10 +203,14 @@
 # Rerun autoconf since we patched configure.in:
 autoconf
 
+# See Ross Burton's blog entry for why we want --with-libdb.
+# http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
+
 %configure \
-  %gtkdoc_flags \
-  --enable-file-locking=fcntl --enable-dot-locking=no \
-  %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
+	%gtkdoc_flags \
+	--with-libdb=/usr \
+	--enable-file-locking=fcntl --enable-dot-locking=no \
+	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
@@ -322,8 +327,13 @@
 %{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
-
 %changelog
+* Tue Jul 19 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-2
+- Dynamically link to BDB.
+- Add patch to make --with-db configure option work.
+- Add Requires for db4 and BuildRequires for db4-devel.
+- Clean up spec file, renumber patches.
+
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-1
 - Update to 1.7.4
 - Remove patch for Gnome.org bug #345965 (fixed upstream).


--- evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch DELETED ---


--- evolution-data-server-1.0.2-fix-64-bit-build.patch DELETED ---


--- evolution-data-server-1.0.2-fix-calendar-factory-GType.patch DELETED ---


--- evolution-data-server-1.2.0-validatehelo.patch DELETED ---


--- evolution-data-server-1.3.5-nspr_fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:27:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:27:27 -0400
Subject: rpms/kernel/devel .cvsignore, 1.490, 1.491 Config.mk, 1.1,
	1.2 kernel-2.6.spec, 1.2421, 1.2422 sources, 1.447, 1.448
Message-ID: <200607191727.k6JHRRdI005938@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5899

Modified Files:
	.cvsignore Config.mk kernel-2.6.spec sources 
Log Message:
update xen HV to cset 20060717


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- .cvsignore	18 Jul 2006 16:02:02 -0000	1.490
+++ .cvsignore	19 Jul 2006 17:27:25 -0000	1.491
@@ -7,3 +7,4 @@
 kabitool
 find-provides
 kernel-2.6.spec
+xen-20060719.tar.bz2


Index: Config.mk
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Config.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Config.mk	13 Feb 2006 21:21:22 -0000	1.1
+++ Config.mk	19 Jul 2006 17:27:25 -0000	1.2
@@ -1,5 +1,8 @@
 # -*- mode: Makefile; -*-
 
+# A debug build of Xen and tools?
+debug ?= n
+
 # 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)
@@ -21,16 +24,52 @@
 OBJDUMP    = $(CROSS_COMPILE)objdump
 
 DISTDIR     ?= $(XEN_ROOT)/dist
+DESTDIR     ?= /
 
 INSTALL      = install
 INSTALL_DIR  = $(INSTALL) -d -m0755
 INSTALL_DATA = $(INSTALL) -m0644
 INSTALL_PROG = $(INSTALL) -m0755
 
+ifneq ($(debug),y)
+# Optimisation flags are overridable
+CFLAGS    ?= -O2 -fomit-frame-pointer
+CFLAGS    += -DNDEBUG
+else
+CFLAGS    += -g
+endif
+
+
+ifeq ($(XEN_TARGET_ARCH),x86_32)
+CONFIG_X86 := y
+CONFIG_PLAN9 := y
+CONFIG_HVM := y
+CONFIG_MIGRATE := y
+CONFIG_IOEMU := y
+CONFIG_MBOOTPACK := y
+
+CFLAGS += -m32 -march=i686
+LIBDIR := lib
+
+endif
+
 ifeq ($(XEN_TARGET_ARCH),x86_64)
+CONFIG_X86 := y
+CONFIG_PLAN9 := y
+CONFIG_HVM := y
+CONFIG_MIGRATE := y
+CONFIG_IOEMU := y
+CONFIG_MBOOTPACK := y
+
+CFLAGS += -m64
 LIBDIR = lib64
-else
-LIBDIR = lib
+endif
+
+ifeq ($(XEN_TARGET_ARCH),ia64)
+CONFIG_IA64 := y
+CONFIG_IOEMU := y
+
+LIBDIR := lib
 endif
 
 ifneq ($(EXTRA_PREFIX),)
@@ -38,19 +77,34 @@
 EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
 endif
 
+test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
+
+CFLAGS += -Wall -Wstrict-prototypes
+
+HOSTCFLAGS += $(call test-gcc-flag,$(HOSTCC),-Wdeclaration-after-statement)
+CFLAGS     += $(call test-gcc-flag,$(CC),-Wdeclaration-after-statement)
+
 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
+# If ACM_SECURITY = y, then the access control module is compiled
+# into Xen and the policy type can be set by the boot policy file
+#        y - Build the Xen ACM framework
+#        n - Do not build the Xen ACM framework
+ACM_SECURITY ?= n
+
+# If ACM_SECURITY = y and no boot policy file is installed,
+# then the ACM defaults to the security policy set by
+# ACM_DEFAULT_SECURITY_POLICY
 # Supported models are:
-#	ACM_NULL_POLICY (ACM will not be built with this policy)
+#	ACM_NULL_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
+ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_POLICY
 
 # Optional components
 XENSTAT_XENTOP ?= y


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2421
retrieving revision 1.2422
diff -u -r1.2421 -r1.2422
--- kernel-2.6.spec	19 Jul 2006 17:25:03 -0000	1.2421
+++ kernel-2.6.spec	19 Jul 2006 17:27:25 -0000	1.2422
@@ -34,7 +34,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_version 20060610
+%define xen_version 20060717
 %define make_target bzImage
 %define kernel_image x86
 
@@ -1682,6 +1682,7 @@
 - enable xen again.
 - redo xen config.
 - i686 kernel for xen uses PAE now.
+- new xen Hypervisor cset 10711.
 
 * Wed Jul 19 2006 Roland McGrath <roland at redhat.com>
 - New version of utrace patch, might fix #198780.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- sources	19 Jul 2006 07:57:41 -0000	1.447
+++ sources	19 Jul 2006 17:27:25 -0000	1.448
@@ -4,3 +4,4 @@
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
 82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec
+d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:27:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:27:28 -0400
Subject: rpms/kernel/devel/scripts reconfig.sh,1.2,1.3
Message-ID: <200607191727.k6JHRSWX005944@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv5899/scripts

Modified Files:
	reconfig.sh 
Log Message:
update xen HV to cset 20060717


Index: reconfig.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/reconfig.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reconfig.sh	29 Jun 2006 08:27:52 -0000	1.2
+++ reconfig.sh	19 Jul 2006 17:27:25 -0000	1.3
@@ -3,10 +3,10 @@
 V=$(grep sublevel kernel-2.6.spec | head -n1 | awk '{ print $3 }')
 
 cd kernel-2.6.$V/linux-2.6.$V.noarch/
-rm -f kernel-*-config
-cp ../../kernel-*.config .
+rm -f kernel-*.config
+cp ../../kernel-2.6.$V-*.config .
 
-for i in kernel-*.config
+for i in kernel-*xen.config
 do
 	echo $i
 	rm -f .config



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:27:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:27:34 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.18,1.19
Message-ID: <200607191727.k6JHRWpF005991@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5966

Modified Files:
	eclipse-pydev.spec 
Log Message:
* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-2fc
- Rebuild.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- eclipse-pydev.spec	5 Jun 2006 18:38:56 -0000	1.18
+++ eclipse-pydev.spec	19 Jul 2006 17:27:30 -0000	1.19
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1fc
+Release:	2fc
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -168,6 +168,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-2fc
+- Rebuild.
+
 * Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-1fc
 - Building upstream version 1.0.8 backported to Java 1.4.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:28:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:28:30 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.19,1.20
Message-ID: <200607191728.k6JHSUfs006399@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6374

Modified Files:
	eclipse-pydev.spec 
Log Message:
* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-3fc
- Rebuild.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eclipse-pydev.spec	19 Jul 2006 17:27:30 -0000	1.19
+++ eclipse-pydev.spec	19 Jul 2006 17:28:28 -0000	1.20
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}
-Release:	2fc
+Release:	3fc
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -168,7 +168,7 @@
 %endif
 
 %changelog
-* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-2fc
+* Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-3fc
 - Rebuild.
 
 * Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-1fc



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:29:04 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2422,1.2423
Message-ID: <200607191729.k6JHT4V9006660@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6624

Modified Files:
	kernel-2.6.spec 
Log Message:
remove xen HV patch already integrated upstream


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2422
retrieving revision 1.2423
diff -u -r1.2422 -r1.2423
--- kernel-2.6.spec	19 Jul 2006 17:27:25 -0000	1.2422
+++ kernel-2.6.spec	19 Jul 2006 17:29:01 -0000	1.2423
@@ -34,7 +34,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_version 20060717
+%define xen_version 20060719
 %define make_target bzImage
 %define kernel_image x86
 
@@ -431,8 +431,6 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
-Patch20000: xen-sched-sedf.patch
-
 
 # END OF PATCH DEFINITIONS
 
@@ -721,7 +719,6 @@
 cp -rl xen-%{xen_version} xen
 
 # Any necessary hypervisor patches go here
-%patch20000 -p0
 %endif
 
 cd linux-%{kversion}.%{_target_cpu}



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:29:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:29:53 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.6,1.7
Message-ID: <200607191729.k6JHTrbL007050@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/notification-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6929

Modified Files:
	notification-daemon.spec 
Log Message:
- fix typo



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notification-daemon.spec	19 Jul 2006 17:22:35 -0000	1.6
+++ notification-daemon.spec	19 Jul 2006 17:29:50 -0000	1.7
@@ -14,7 +14,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib_devel >= %{dbus_glib_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel
 BuildRequires: GConf2-devel
 BuildRequires: autoconf automake



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:33:21 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.154,1.155
Message-ID: <200607191733.k6JHXLQD007447@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7417

Modified Files:
	gnome-applets.spec 
Log Message:
rebuild



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-applets.spec	12 Jul 2006 05:58:21 -0000	1.154
+++ gnome-applets.spec	19 Jul 2006 17:33:03 -0000	1.155
@@ -29,7 +29,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release:  	3.1
+Release:  	4
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -244,6 +244,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-4
+- Rebuild against dbus
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.1.1-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:33:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:33:41 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.42,1.43
Message-ID: <200607191733.k6JHXf2v007499@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7475

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Wed Jul 19 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_3fc
- Rebuild.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eclipse-cdt.spec	12 Jul 2006 21:09:50 -0000	1.42
+++ eclipse-cdt.spec	19 Jul 2006 17:33:31 -0000	1.43
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_2fc
+Release: 	1jpp_3fc
 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
@@ -233,6 +233,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_3fc
+- Rebuild.
+
 * Wed Jul 12 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_2fc
 - Add dynamic scannerinfo extension used by Autotools plug-in.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:36:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:36:26 -0400
Subject: rpms/gnome-session/devel gnome-session.spec,1.75,1.76
Message-ID: <200607191736.k6JHaQKm008496@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8376

Modified Files:
	gnome-session.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gnome-session.spec	13 Jul 2006 18:32:03 -0000	1.75
+++ gnome-session.spec	19 Jul 2006 17:36:23 -0000	1.76
@@ -6,13 +6,15 @@
 %define gnome_vfs2_version 2.3.0
 %define gconf2_version 2.2.0
 %define gnome_desktop_version 2.2.0
+%define dbus_glib_version 0.70
+%define dbus_version 0.90
 
 %define po_package gnome-session-2.0
 
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.15.4
-Release: 1
+Release: 2 
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -55,7 +57,8 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires: dbus-devel
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libnotify-devel
 BuildRequires: control-center-devel
 
@@ -161,6 +164,9 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-2
+- Add BR for dbus-glib-devel
+
 * Thu Jul 13 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:45:05 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.14,1.15
Message-ID: <200607191745.k6JHj5cl011296@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11233

Modified Files:
	libnotify.spec 
Log Message:
- comment out desktop-notification dependency so we can build the
  notification daemon




Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libnotify.spec	19 Jul 2006 00:55:33 -0000	1.14
+++ libnotify.spec	19 Jul 2006 17:45:03 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.0
-Release: 3 
+Release: 3.1 
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -13,7 +13,7 @@
 BuildPreReq: libtool
 BuildRequires: glib2-devel >= %{glib2_version} dbus-devel dbus-glib-devel gtk2-devel
 Requires: glib2 >= %{glib2_version}
-Requires: desktop-notification-daemon
+#Requires: desktop-notification-daemon
 
 %description
 
@@ -70,6 +70,10 @@
 
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3.1
+- comment out desktop-notification dependency so we can build the
+  notification daemon
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3
 - Add BR on dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 17:58:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 13:58:52 -0400
Subject: rpms/cryptix/devel cryptix.spec,1.6,1.7
Message-ID: <200607191758.k6JHwq4F031313@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/cryptix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31099

Modified Files:
	cryptix.spec 
Log Message:
Merged with upstream version



Index: cryptix.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cryptix.spec	22 Dec 2005 02:17:00 -0000	1.6
+++ cryptix.spec	19 Jul 2006 17:58:49 -0000	1.7
@@ -1,12 +1,47 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define name		cryptix
 %define version		3.2.0
-%define release 	4jpp_3fc
+%define release		7jpp_1fc
 %define snapshot	20001002
+
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: 	%{release}
+Release:	%{release}
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -15,9 +50,17 @@
 Source0:	%{name}32-%{snapshot}-r%{version}-RHCLEAN.zip
 Source1:	%{name}.build.script
 BuildRequires:	ant
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Cryptix 3 is a cleanroom implementation of Sun's Java Cryptography
 Extensions (JCE) version 1.1. In addition to that it contains the
@@ -32,6 +75,7 @@
 Javadoc for %{name}.
 
 %prep
+rm -rf $RPM_BUILD_ROOT
 %setup -c
 cp %{SOURCE1} build.xml
 # remove all binary libs
@@ -40,7 +84,7 @@
 chmod -R go=u-w *
 
 %build
-unset CLASSPATH
+export CLASSPATH=
 
 ant clean jar javadoc
 
@@ -53,33 +97,52 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc LICENCE.TXT README.TXT
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/cryptix-3.2.0.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 3.2.0-4jpp_3fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> 3.2.0-4jpp_2fc
-- Remove jarfile from the tarball.
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-7jpp
+- Merged with upstream version
+- Added conditional native compiling
 
-* Fri Jan 21 2005 Gary Benson <gbenson at redhat.com> 3.2.0-4jpp_1fc
-- Build into Fedora.
+* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> 3.2.0-6jpp
+- First JPP 1.7 build
 
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 3.2.0-4jpp_1rh
-- RH vacuuming
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 3.2.0-5jpp
+- Build with ant-1.6.2
 
 * Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 3.2.0-4jpp
 - for jpackage-utils 1.5



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:02:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:02:35 -0400
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.59,1.60
Message-ID: <200607191802.k6JI2Z15032026@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31969

Modified Files:
	desktop-printing.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- desktop-printing.spec	12 Jul 2006 05:34:26 -0000	1.59
+++ desktop-printing.spec	19 Jul 2006 18:02:18 -0000	1.60
@@ -1,11 +1,12 @@
-%define dbus_version	0.60
+%define dbus_version	0.90
+%define dbus_glib_version 0.70
 %define hal_version	0.5.0
 %define gtk_version	2.6
 
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 10.1
+Release: 11
 License: GPL
 Group: Applications/File
 # total lie
@@ -22,7 +23,9 @@
 Requires: cups
 PreReq:   gtk2 >= %{gtk_version}
 
-BuildRequires: libgnomeui-devel, dbus-devel >= %{dbus_version}
+BuildRequires: libgnomeui-devel
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: hal-devel >= %{hal_version}
 BuildRequires: desktop-file-utils, intltool, cups-devel
 BuildRequires: libgnomecups-devel >= 0.1.12
@@ -94,6 +97,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-11
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.19-10.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:11:45 -0400
Subject: rpms/desktop-printing/devel
	desktop-printing-0.19-dbus-deprecated.patch, NONE,
	1.1 desktop-printing.spec, 1.60, 1.61
Message-ID: <200607191811.k6JIBjpK001767@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1714

Modified Files:
	desktop-printing.spec 
Added Files:
	desktop-printing-0.19-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated dbus functions



desktop-printing-0.19-dbus-deprecated.patch:
 ec-tray-icon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE desktop-printing-0.19-dbus-deprecated.patch ---
--- desktop-printing-0.19/eggcups-0.19/ec-tray-icon.c.dbus-deprecated	2006-07-19 14:08:34.000000000 -0400
+++ desktop-printing-0.19/eggcups-0.19/ec-tray-icon.c	2006-07-19 14:09:13.000000000 -0400
@@ -249,13 +249,13 @@
 
 	rb_debug ("disposing");
 	if (icon->priv->system_dbus) {
-		dbus_connection_disconnect (icon->priv->system_dbus);
+		dbus_connection_close (icon->priv->system_dbus);
 		dbus_connection_unref (icon->priv->system_dbus);
 		icon->priv->system_dbus = NULL;
 	}
 
 	if (icon->priv->session_dbus) {
-		dbus_connection_disconnect (icon->priv->session_dbus);
+		dbus_connection_close (icon->priv->session_dbus);
 		dbus_connection_unref (icon->priv->session_dbus);
 		icon->priv->session_dbus = NULL;
 	}


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- desktop-printing.spec	19 Jul 2006 18:02:18 -0000	1.60
+++ desktop-printing.spec	19 Jul 2006 18:11:43 -0000	1.61
@@ -15,6 +15,7 @@
 Patch0: desktop-printing-0.19-dbus-api.patch
 Patch1: eggcups-dbus-send-null-crash.patch
 Patch2: desktop-printing-0.19-hal_lpadmin.patch
+Patch3: desktop-printing-0.19-dbus-deprecated.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: redhat-menus
@@ -44,6 +45,7 @@
 %patch0 -p1 -b .dbus-api
 %patch1 -p0 -b .dbus-null-crash
 %patch2 -p2 -b .hal-lpadmin
+%patch3 -p2 -b .desktop-printing-0.19-dbus-deprecated.patch
 popd
 
 %build
@@ -99,6 +101,7 @@
 %changelog
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-11
 - Add BR for dbus-glib-devel
+- Add patch to fix deprecated dbus functions
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.19-10.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:17:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:17:35 -0400
Subject: rpms/adaptx/devel adaptx-0.9.13-missingstubs.patch, NONE,
	1.1 adaptx-0.9.13-xsl.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 adaptx.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200607191817.k6JIHZIu018863@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18784

Modified Files:
	.cvsignore adaptx.spec sources 
Added Files:
	adaptx-0.9.13-missingstubs.patch adaptx-0.9.13-xsl.patch 
Log Message:

Add conditional native compiling.



adaptx-0.9.13-missingstubs.patch:
 TransformerFactoryImpl.java |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE adaptx-0.9.13-missingstubs.patch ---
--- ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java.sav	2006-07-19 14:06:26.000000000 -0400
+++ ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java	2006-07-19 14:07:13.000000000 -0400
@@ -193,6 +193,13 @@
         return false;
     } //-- getFeature
 
+    // DOM Level 3 stub
+    public void setFeature(String name, boolean value)
+      throws TransformerConfigurationException
+    {
+      throw new RuntimeException("not implemented");
+    }  
+
     /**
      * Get the object that is used by default during the transformation
      * to resolve URIs used in document(), xsl:import, or xsl:include.

adaptx-0.9.13-xsl.patch:
 exolab.xsl     |    2 +-
 keywords.xsl   |    2 +-
 leftNav.xsl    |    2 +-
 searchForm.xsl |    2 +-
 topNav.xsl     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE adaptx-0.9.13-xsl.patch ---
--- src/doc/style/exolab.xsl.sav	2006-06-19 18:25:07.000000000 +0200
+++ src/doc/style/exolab.xsl	2006-06-19 18:28:57.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:output method="html" indent="no"/>
 
--- src/doc/style/keywords.xsl.sav	2006-06-19 18:30:23.000000000 +0200
+++ src/doc/style/keywords.xsl	2006-06-19 18:30:38.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:template match="keywords">
     <xsl:element name="meta">
       <xsl:attribute name="http-equiv">Keywords</xsl:attribute>
--- src/doc/style/leftNav.xsl.sav	2006-06-19 18:31:37.000000000 +0200
+++ src/doc/style/leftNav.xsl	2006-06-19 18:31:51.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:template match="$project/navSections">
     <xsl:for-each select="section">
--- src/doc/style/topNav.xsl.sav	2006-06-19 18:33:16.000000000 +0200
+++ src/doc/style/topNav.xsl	2006-06-19 18:33:32.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:variable name="leftTopNavPos" select="5"/>
 <xsl:template match="$project/topNav">
--- src/doc/style/searchForm.xsl.sav	2006-06-19 18:32:38.000000000 +0200
+++ src/doc/style/searchForm.xsl	2006-06-19 18:32:53.000000000 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:template match="searchForm">
   <table width="95" border="0" cellpadding="0" cellspacing="0">


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2005 19:18:07 -0000	1.4
+++ .cvsignore	19 Jul 2006 18:17:32 -0000	1.5
@@ -1,4 +1 @@
-adaptx-0.9.6-cvs-RHCLEAN.tar.bz2
-adaptx
-noarch
-*.src.rpm
+adaptx-0.9.13-src-RHCLEAN.tar.gz


Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- adaptx.spec	12 Jul 2006 05:07:17 -0000	1.8
+++ adaptx.spec	19 Jul 2006 18:17:32 -0000	1.9
@@ -1,32 +1,72 @@
-%define	name	adaptx
-%define	version	0.9.6
-%define release 1jpp_4fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define	section	free
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}.1.1
+Name:		adaptx
+Version:	0.9.13
+Release:	2jpp_1fc
 Epoch:		0
 Summary:	AdaptX
 License:	Exolab Software License
 Group:		Development/Libraries/Java
-Source0:	%{name}-%{version}-cvs-RHCLEAN.tar.bz2
-Url:		http://castor.exolab.org/
-Requires:       xerces-j2
-BuildRequires:	ant
-BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:  xerces-j2
+Source0:	%{name}-%{version}-src-RHCLEAN.tar.gz
+# svn export http://svn.codehaus.org/castor/adaptx
+
+Patch0:		%{name}-%{version}-xsl.patch
+Patch1:		%{name}-%{version}-missingstubs.patch
+Url:		http://castor.codehaus.org/
+BuildRequires:	ant >= 0:1.6
+BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:  xml-commons-apis
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Adaptx is an XSLT processor and XPath engine.
 
 %package javadoc
 Group:		Development/Java
 Summary:	Javadoc for %{name}
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -39,19 +79,23 @@
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-src
 # remove CVS internal files
 for dir in `find . -type d -name CVS`; do rm -rf $dir; done
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+for j in $(find . -name "*.jar"); do
+	mv $j $j.no
+done
+
+%patch0
+%patch1
 
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
-adaptx_classpath=$(build-classpath xml-commons-apis xerces-j2)
-export CLASSPATH=$adaptx_classpath
-ant -buildfile src/build.xml jar
-ant -buildfile src/build.xml javadoc
-export CLASSPATH=dist/adaptx_0.9.6.jar:$adaptx_classpath
+#export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis)
+export CLASSPATH=$(build-classpath xml-commons-apis)
+ant -buildfile src/build.xml jar javadoc
+CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
 ant -buildfile src/build.xml doc
 
 %install
@@ -64,6 +108,10 @@
 cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf build/doc/javadoc
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,11 +124,31 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0664,root,root,0755)
 %doc src/etc/{CHANGELOG,contributors.html,LICENSE}
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/adaptx-0.9.13.jar.*
+%endif
+
 %files javadoc
 %defattr(0664,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
@@ -90,35 +158,15 @@
 %doc build/doc/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.6-1jpp_4fc.1.1
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9.6-1jpp_3fc.1
-- stop scriptlet spew
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-2jpp_1fc
+- Add conditional native compiling.
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Mon Jun 19 2006 Ralph Apel <r.apel at r-apel.de> 0:0.9.13-1jpp
+- Upgrade to 0.9.13
 
-* Tue Nov 22 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:0.9.6-1jpp_2fc
-- BZ 162481:
-  src/main/org/exolab/adaptx/xslt/util/Configuration.java
-  and
-  src/main/org/exolab/adaptx/xml/parser/XercesParser.java
-  both depend on org.apache.xerces.*
-  This change makes this dependency explicit.
-
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:0.9.6-1jpp_1fc
-- Build into Fedora.
-
-* Thu Jun  9 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
-
-* Wed Jun  1 2005 Gary Benson <gbenson at redhat.com>
-- Remove all jarfiles before building.
-
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:0.9.6-1jpp_1rh
-- RH vacuuming
-- build with internal adaptx for the moment
+* Thu Aug 19 2004 Ralph Apel <r.apel at r-apel.de> 0:0.9.6-2jpp
+- Build with ant-1.6.2
+- Set xmlns in **/*.xsl
 
 * Tue Sep 09 2003 David Walluck <david at anti-microsoft.org> 0:0.9.6-1jpp
 - 0.9.6


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2005 19:18:07 -0000	1.3
+++ sources	19 Jul 2006 18:17:32 -0000	1.4
@@ -1 +1 @@
-2b85e4869fd4c3a3d1a8d1ef81fc25f7  adaptx-0.9.6-cvs-RHCLEAN.tar.bz2
+5d9765b42d49bb83b7b8ac00a57cabc9  adaptx-0.9.13-src-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:20:21 -0400
Subject: rpms/gdm/devel gdm-2.15.6-security-tokens.patch,1.4,1.5
Message-ID: <200607191820.k6JIKLpj019942@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19796

Modified Files:
	gdm-2.15.6-security-tokens.patch 
Log Message:
remove aclocal changes from security patch


gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   35 +
 config/gdm                    |   16 
 config/gdm-autologin          |   17 
 config/gdm-securitytokens     |   10 
 config/gdm.conf.in            |    7 
 config/securitytokens.conf.in |    5 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |  163 ++++++++
 daemon/gdmconfig.c            |   26 +
 daemon/gdmconfig.h            |    3 
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    5 
 16 files changed, 1900 insertions(+), 21 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.15.6-security-tokens.patch	19 Jul 2006 02:38:06 -0000	1.4
+++ gdm-2.15.6-security-tokens.patch	19 Jul 2006 18:20:18 -0000	1.5
@@ -1,307 +1,3 @@
---- gdm-2.15.6/aclocal.m4
-+++ gdm-2.15.6/aclocal.m4
-@@ -552,6 +552,228 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
-   AC_SUBST(WARN_CXXFLAGS)
- ])
- 
-+dnl GNOME_DOC_INIT([MINIMUM-VERSION])
-+
-+AC_DEFUN([GNOME_DOC_INIT],
-+[
-+dnl Only apply the version check if we're not configuring ourselves!
-+if test "x$PACKAGE" != "xgnome-doc-utils"; then
-+  GDU_REQUIRED_VERSION=0.3.2
-+  if test -n "$1"; then
-+    GDU_REQUIRED_VERSION=$1
-+  fi
-+
-+  PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION])
-+fi
-+
-+AC_ARG_WITH([help-dir],
-+  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-+  [with_help_dir='${datadir}/gnome/help'])
-+HELP_DIR="$with_help_dir"
-+AC_SUBST(HELP_DIR)
-+
-+AC_ARG_WITH([omf-dir],
-+  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-+  [with_omf_dir='${datadir}/omf'])
-+OMF_DIR="$with_omf_dir"
-+AC_SUBST(OMF_DIR)
-+
-+AC_ARG_WITH([help-formats],
-+  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-+  [with_help_formats=''])
-+DOC_USER_FORMATS="$with_help_formats"
-+AC_SUBST(DOC_USER_FORMATS)
-+
-+AC_ARG_ENABLE([scrollkeeper],
-+	[AC_HELP_STRING([--disable-scrollkeeper],
-+			[do not make updates to the scrollkeeper database])],,
-+	enable_scrollkeeper=yes)
-+AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
-+
-+])
-+
-+
-+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 35 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL],
-+[AC_PREREQ([2.50])dnl
-+
-+case "$am__api_version" in
-+    1.[01234])
-+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+    ;;
-+    *)
-+    ;;
-+esac
-+
-+if test -n "$1"; then
-+    AC_MSG_CHECKING(for intltool >= $1)
-+
-+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-+    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    ]
-+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-+fi
-+
-+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+
-+AC_SUBST(INTLTOOL_DESKTOP_RULE)
-+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-+AC_SUBST(INTLTOOL_KEYS_RULE)
-+AC_SUBST(INTLTOOL_PROP_RULE)
-+AC_SUBST(INTLTOOL_OAF_RULE)
-+AC_SUBST(INTLTOOL_PONG_RULE)
-+AC_SUBST(INTLTOOL_SERVER_RULE)
-+AC_SUBST(INTLTOOL_SHEET_RULE)
-+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+AC_SUBST(INTLTOOL_UI_RULE)
-+AC_SUBST(INTLTOOL_XAM_RULE)
-+AC_SUBST(INTLTOOL_KBD_RULE)
-+AC_SUBST(INTLTOOL_XML_RULE)
-+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+AC_SUBST(INTLTOOL_CAVES_RULE)
-+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-+AC_SUBST(INTLTOOL_THEME_RULE)
-+AC_SUBST(INTLTOOL_SERVICE_RULE)
-+
-+# Use the tools built into the package, not the ones that are installed.
-+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+   AC_MSG_ERROR([perl not found; required for intltool])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+   AC_MSG_ERROR([perl 5.x required for intltool])
-+fi
-+if test "x$2" != "xno-xml"; then
-+   AC_MSG_CHECKING([for XML::Parser])
-+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+       AC_MSG_RESULT([ok])
-+   else
-+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+   fi
-+fi
-+
-+AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-+AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-+AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-+AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-+    
-+IT_PO_SUBDIR([po])
-+
-+dnl The following is very similar to
-+dnl
-+dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-+dnl
-+dnl with the following slight differences:
-+dnl  - the *.in files are in ac_aux_dir,
-+dnl  - if the file haven't changed upon reconfigure, it's not touched,
-+dnl  - the evaluation of the third parameter enables a hack which computes
-+dnl    the actual value of $libdir,
-+dnl  - the user sees "executing intltool commands", instead of
-+dnl    "creating intltool-extract" and such.
-+dnl
-+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-+dnl a reason for it.
-+
-+AC_CONFIG_COMMANDS([intltool], [
-+
-+for file in intltool-extract intltool-merge intltool-update; do
-+  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-+      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-+      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-+	< ${ac_aux_dir}/${file}.in > ${file}.out
-+  if cmp -s ${file} ${file}.out 2>/dev/null; then
-+    rm -f ${file}.out
-+  else
-+    mv -f ${file}.out ${file}
-+  fi
-+  chmod ugo+x ${file}
-+  chmod u+w ${file}
-+done
-+
-+],
-+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-+
-+])
-+
-+
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+  AC_CONFIG_COMMANDS([$1/stamp-it], [
-+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+    >"$1/stamp-it.tmp"
-+    [sed '/^#/d
-+	 s/^[[].*] *//
-+	 /^[ 	]*$/d
-+	'"s|^|	$ac_top_srcdir/|" \
-+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+    ]
-+    if test ! -f "$1/Makefile"; then
-+      AC_MSG_ERROR([$1/Makefile is not ready.])
-+    fi
-+    mv "$1/Makefile" "$1/Makefile.tmp"
-+    [sed '/^POTFILES =/,/[^\\]$/ {
-+		/^POTFILES =/!d
-+		r $1/POTFILES
-+	  }
-+	 ' "$1/Makefile.tmp" >"$1/Makefile"]
-+    rm -f "$1/Makefile.tmp"
-+    mv "$1/stamp-it.tmp" "$1/stamp-it"
-+  ])
-+])dnl
-+])
-+
-+
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-+
-+
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
- # serial 48 AC_PROG_LIBTOOL
-@@ -2138,7 +2360,7 @@ linux*)
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -4846,6 +5068,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
- # Is the compiler the GNU C compiler?
- with_gcc=$_LT_AC_TAGVAR(GCC, $1)
- 
-+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-+gcc_ver=\`gcc -dumpversion\`
-+
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -4979,11 +5204,11 @@ striplib=$lt_striplib
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -4995,7 +5220,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -5075,7 +5300,7 @@ # Whether libtool must link a program ag
- link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -6911,6 +7136,7 @@ do
-     done
-   done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6943,6 +7169,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
- 
-@@ -7981,5 +8208,3 @@ AC_SUBST([am__tar])
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
--m4_include([m4/gnome-doc-utils.m4])
--m4_include([m4/intltool.m4])
 --- gdm-2.15.6/config/Makefile.am
 +++ gdm-2.15.6/config/Makefile.am
 @@ -26,6 +26,7 @@ EXTRA_DIST = \



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:22:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:22:03 -0400
Subject: rpms/setroubleshoot/devel sources,1.4,1.5
Message-ID: <200607191822.k6JIM3AD009338@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6584

Modified Files:
	sources 
Log Message:
* Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.7-1
	* Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
	* Remove toolbar from popup window since it did nothing, and I think it looks better without it.
	* fix allow_execmod plugin to report better data.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jul 2006 16:09:05 -0000	1.4
+++ sources	19 Jul 2006 18:22:01 -0000	1.5
@@ -1 +1 @@
-9820a721574635a559cf18e16deee0e7  setroubleshoot-0.7.tar.gz
+1333a0721b17fe978a25af250f1cabfa  setroubleshoot-0.7.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:27:21 -0400
Subject: rpms/NetworkManager/devel
	NetworkManager-0.7.0-dbus-deprecated.patch, NONE,
	1.1 NetworkManager.spec, 1.112, 1.113
Message-ID: <200607191827.k6JIRLtb031334@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31319

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.7.0-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated dbus functions


NetworkManager-0.7.0-dbus-deprecated.patch:
 libnm_glib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.7.0-dbus-deprecated.patch ---
--- NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c.dbus-deprecated	2006-07-19 14:22:42.000000000 -0400
+++ NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c	2006-07-19 14:23:30.000000000 -0400
@@ -230,7 +230,7 @@
 	{
 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
 		ctx->nm_state = LIBNM_NO_DBUS;
-		dbus_connection_disconnect (ctx->dbus_con);
+		dbus_connection_close (ctx->dbus_con);
 		libnm_glib_schedule_dbus_watcher (ctx);
 	}
 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +444,7 @@
 		g_main_loop_unref (ctx->g_main_loop);
 
 	if (ctx->dbus_con)
-		dbus_connection_disconnect (ctx->dbus_con);
+		dbus_connection_close (ctx->dbus_con);
 
 	if (ctx->callbacks_lock)
 		g_mutex_free (ctx->callbacks_lock);


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- NetworkManager.spec	19 Jul 2006 00:45:48 -0000	1.112
+++ NetworkManager.spec	19 Jul 2006 18:27:19 -0000	1.113
@@ -16,11 +16,12 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.2
+Release: 0%{?nm_cvs_version}.3
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
+Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 PreReq:   chkconfig
@@ -116,6 +117,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 .dbus-deprecated
 
 %build
 %configure \
@@ -214,6 +216,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.3
+- Add patch to fix deprecated dbus functions
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.2
 - Add BR for dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:27:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:27:45 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.9,1.10
Message-ID: <200607191827.k6JIRjvW031391@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31378

Modified Files:
	adaptx.spec 
Log Message:

Added missing dep. to classpath.




Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- adaptx.spec	19 Jul 2006 18:17:32 -0000	1.9
+++ adaptx.spec	19 Jul 2006 18:27:43 -0000	1.10
@@ -49,6 +49,7 @@
 Url:		http://castor.codehaus.org/
 BuildRequires:	ant >= 0:1.6
 BuildRequires:	jpackage-utils >= 0:1.6
+BuildRequires:	log4j
 BuildRequires:  xml-commons-apis
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -93,7 +94,7 @@
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
 #export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis)
-export CLASSPATH=$(build-classpath xml-commons-apis)
+export CLASSPATH=$(build-classpath xml-commons-apis log4j)
 ant -buildfile src/build.xml jar javadoc
 CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
 ant -buildfile src/build.xml doc



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:27:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:27:58 -0400
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.113,1.114
Message-ID: <200607191827.k6JIRwK7031441@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31400

Modified Files:
	NetworkManager.spec 
Log Message:
- fixed typo on patch line



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- NetworkManager.spec	19 Jul 2006 18:27:19 -0000	1.113
+++ NetworkManager.spec	19 Jul 2006 18:27:56 -0000	1.114
@@ -117,7 +117,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 .dbus-deprecated
+%patch0 -p1 -b .dbus-deprecated
 
 %build
 %configure \



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:29:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:29:58 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.15,1.16
Message-ID: <200607191829.k6JITwrH031506@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31493

Modified Files:
	libnotify.spec 
Log Message:
- reinstate desktop-notification dependency



Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnotify.spec	19 Jul 2006 17:45:03 -0000	1.15
+++ libnotify.spec	19 Jul 2006 18:29:56 -0000	1.16
@@ -4,7 +4,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.0
-Release: 3.1 
+Release: 3.2
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -13,7 +13,7 @@
 BuildPreReq: libtool
 BuildRequires: glib2-devel >= %{glib2_version} dbus-devel dbus-glib-devel gtk2-devel
 Requires: glib2 >= %{glib2_version}
-#Requires: desktop-notification-daemon
+Requires: desktop-notification-daemon
 
 %description
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3.2
+- reinstate desktop-notification dependency
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3.1
 - comment out desktop-notification dependency so we can build the
   notification daemon



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:34:53 -0400
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.4,1.5
Message-ID: <200607191834.k6JIYrbk031636@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31622

Modified Files:
	setroubleshoot.spec 
Log Message:
* Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.7-1
	* Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
	* Remove toolbar from popup window since it did nothing, and I think it looks better without it.
	* fix allow_execmod plugin to report better data.



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setroubleshoot.spec	19 Jul 2006 16:09:05 -0000	1.4
+++ setroubleshoot.spec	19 Jul 2006 18:34:50 -0000	1.5
@@ -10,7 +10,7 @@
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: perl
+BuildRequires: perl-XML-Parser
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:39:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:39:34 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.14,
	1.15 modules-strict.conf, 1.12, 1.13 policy-20060608.patch,
	1.27, 1.28 selinux-policy.spec, 1.226, 1.227
Message-ID: <200607191839.k6JIdYXV009674@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1651

Modified Files:
	booleans-targeted.conf modules-strict.conf 
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-4
- setroubleshootd fixes



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- booleans-targeted.conf	12 Jul 2006 02:50:30 -0000	1.14
+++ booleans-targeted.conf	19 Jul 2006 18:39:31 -0000	1.15
@@ -50,10 +50,6 @@
 # 
 allow_smbd_anon_write = false
 
-# Allow sysadm to ptrace all processes
-# 
-allow_ptrace = false
-
 # Allow system to run with NIS
 # 
 allow_ypbind = false
@@ -142,10 +138,6 @@
 # 
 squid_connect_any = false
 
-# Allow ssh logins as sysadm_r:sysadm_t
-# 
-ssh_sysadm_login = false
-
 # Configure stunnel to be a standalone daemon orinetd service.
 # 
 stunnel_is_daemon = false
@@ -186,10 +178,6 @@
 # 
 spamd_enable_home_dirs = true
 
-# Allow staff_r users to search the sysadm homedir and read files (such as ~/.bashrc)
-# 
-staff_read_sysadm_file = false
-
 # Allow regular users direct mouse access
 # 
 user_direct_mouse = false


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modules-strict.conf	14 Jul 2006 20:09:54 -0000	1.12
+++ modules-strict.conf	19 Jul 2006 18:39:31 -0000	1.13
@@ -198,7 +198,7 @@
 #
 # APT advanced package toll.
 # 
-apt = module
+apt = off
 
 # Layer: admin
 # Module: dmesg

policy-20060608.patch:
 global_tunables                    |   67 +++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    4 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  128 +++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    2 
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 74 files changed, 739 insertions(+), 209 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policy-20060608.patch	18 Jul 2006 15:51:20 -0000	1.27
+++ policy-20060608.patch	19 Jul 2006 18:39:31 -0000	1.28
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 12:33:32.000000000 -0400
 @@ -89,6 +89,13 @@
  
  ## <desc>
@@ -15,7 +15,20 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-@@ -311,13 +318,6 @@
+@@ -132,12 +139,6 @@
+ ## </desc>
+ gen_tunable(allow_smbd_anon_write,false)
+ 
+-## <desc>
+-## <p>
+-## Allow sysadm to ptrace all processes
+-## </p>
+-## </desc>
+-gen_tunable(allow_ptrace,false)
+ 
+ ## <desc>
+ ## <p>
+@@ -311,13 +312,6 @@
  
  ## <desc>
  ## <p>
@@ -29,6 +42,82 @@
  ## Allow squid to connect to all ports, not just
  ## HTTP, FTP, and Gopher ports.
  ## </p>
+@@ -326,13 +320,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow ssh logins as sysadm_r:sysadm_t
+-## </p>
+-## </desc>
+-gen_tunable(ssh_sysadm_login,false)
+-
+-## <desc>
+-## <p>
+ ## Configure stunnel to be a standalone daemon or
+ ## inetd service.
+ ## </p>
+@@ -353,6 +340,12 @@
+ ## </desc>
+ gen_tunable(use_samba_home_dirs,false)
+ 
++########################################
++#
++# Strict policy specific
++#
++
++ifdef(`strict_policy',`
+ ## <desc>
+ ## <p>
+ ## Control users use of ping and traceroute
+@@ -360,12 +353,28 @@
+ ## </desc>
+ gen_tunable(user_ping,false)
+ 
+-########################################
+-#
+-# Strict policy specific
+-#
++## <desc>
++## <p>
++## Allow sysadm to ptrace all processes
++## </p>
++## </desc>
++gen_tunable(allow_ptrace,false)
++
++## <desc>
++## <p>
++## Allow ssh logins as sysadm_r:sysadm_t
++## </p>
++## </desc>
++gen_tunable(ssh_sysadm_login,false)
++
++## <desc>
++## <p>
++## Allow staff_r users to search the sysadm home 
++## dir and read files (such as ~/.bashrc)
++## </p>
++## </desc>
++gen_tunable(staff_read_sysadm_file,false)
+ 
+-ifdef(`strict_policy',`
+ ## <desc>
+ ## <p>
+ ## Allow gpg executable stack
+@@ -489,14 +498,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow staff_r users to search the sysadm home 
+-## dir and read files (such as ~/.bashrc)
+-## </p>
+-## </desc>
+-gen_tunable(staff_read_sysadm_file,false)
+-
+-## <desc>
+-## <p>
+ ## Allow regular users direct mouse access 
+ ## </p>
+ ## </desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-17 11:43:02.000000000 -0400
@@ -74,6 +163,26 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-07-19 12:37:56.000000000 -0400
+@@ -211,11 +211,11 @@
+ ifdef(`targeted_policy',`
+ 	term_use_unallocated_ttys(traceroute_t)
+ 	term_use_generic_ptys(traceroute_t)
+-')
+-
+-tunable_policy(`user_ping',`
+-	term_use_all_user_ttys(traceroute_t)
+-	term_use_all_user_ptys(traceroute_t)
++',`
++	tunable_policy(`user_ping',`
++		term_use_all_user_ttys(traceroute_t)
++		term_use_all_user_ptys(traceroute_t)
++	')
+ ')
+ 
+ optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-07-18 08:54:22.000000000 -0400
@@ -1066,13 +1175,13 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-18 09:53:15.000000000 -0400
-@@ -0,0 +1,122 @@
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-19 09:09:36.000000000 -0400
+@@ -0,0 +1,128 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
 +#
-+# Declarations
++# Declarations 
 +#
 +
 +type setroubleshootd_t;
@@ -1118,6 +1227,8 @@
 +logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
 +
 +allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
++
++corenet_tcp_bind_generic_node(setroubleshootd_t)
 +corenet_tcp_bind_lo_node(setroubleshootd_t)
 +corenet_tcp_bind_setroubleshoot_port(setroubleshootd_t)
 +
@@ -1133,6 +1244,7 @@
 +
 +init_read_utmp(setroubleshootd_t)
 +init_dontaudit_write_utmp(setroubleshootd_t)
++init_use_fds(setroubleshootd_t)
 +
 +term_dontaudit_use_console(setroubleshootd_t)
 +term_dontaudit_use_generic_ptys(setroubleshootd_t)
@@ -1142,6 +1254,7 @@
 +# setroubleshoot local policy
 +#
 +
++
 +files_dontaudit_search_home(setroubleshootd_t)
 +files_read_etc_files(setroubleshoot_t)
 +
@@ -1164,6 +1277,7 @@
 +kernel_read_kernel_sysctls(setroubleshoot_t)
 +kernel_read_system_state(setroubleshoot_t)
 +
++files_dontaudit_getattr_tmp_dirs(setroubleshoot_t)
 +files_read_usr_files(setroubleshoot_t)
 +files_read_usr_symlinks(setroubleshoot_t)
 +
@@ -1187,12 +1301,13 @@
 +
 +optional_policy(`
 +	rpm_read_db(setroubleshoot_t)
++	rpm_dontaudit_manage_db(setroubleshoot_t)
 +')
 +
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-19 11:33:04.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -1204,6 +1319,16 @@
  corenet_tcp_connect_ftp_port(squid_t)
  corenet_tcp_connect_gopher_port(squid_t)
  corenet_tcp_connect_http_port(squid_t)
+@@ -176,9 +178,6 @@
+ ')
+ 
+ ifdef(`TODO',`
+-ifdef(`apache.te',`
+-can_tcp_connect(squid_t, httpd_t)
+-')
+ #squid requires the following when run in diskd mode, the recommended setting
+ allow squid_t tmpfs_t:file { read write };
+ ') dnl end TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-17 11:43:02.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- selinux-policy.spec	18 Jul 2006 15:51:21 -0000	1.226
+++ selinux-policy.spec	19 Jul 2006 18:39:31 -0000	1.227
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-4
+- setroubleshootd fixes
+
 * Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-3
 - Allow prelink to read bin_t symlink
 - allow xfs to read random devices



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:40:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:40:49 -0400
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.46,
	1.47
Message-ID: <200607191840.k6JIenBe010211@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10111

Modified Files:
	gnome-volume-manager.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-volume-manager.spec	12 Jul 2006 17:32:43 -0000	1.46
+++ gnome-volume-manager.spec	19 Jul 2006 18:40:47 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.15
-Release: 3.1.1
+Release: 4 
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -14,12 +14,12 @@
 Patch2: gvm-no-mount-ui-on-startup.patch 
 Patch3: gnome-volume-manager-1.5.9-goption.patch 
 BuildRoot: /var/tmp/%{name}-root
-BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
+BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.90, dbus-glib-devel >= 0.70
 BuildPrereq: hal-devel >= 0.5.0
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
 Requires: hal >= 0.5.0, kernel >= 2.6, control-center >= 2.0
-Requires: dbus >= 0.60
+Requires: dbus >= 0.90
 Requires: gthumb
 Requires: gnome-media
 Requires: gnome-mount >= 0.4
@@ -84,6 +84,9 @@
 %{_datadir}/gnome/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 1.5.15-4
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.15-3.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:44:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:44:15 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.28,1.29
Message-ID: <200607191844.k6JIiF3j011620@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11576

Modified Files:
	policy-20060608.patch 
Log Message:
* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-4
- setroubleshootd fixes


policy-20060608.patch:
 global_tunables                    |   67 +++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    4 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  128 +++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    2 
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 74 files changed, 739 insertions(+), 209 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policy-20060608.patch	19 Jul 2006 18:39:31 -0000	1.28
+++ policy-20060608.patch	19 Jul 2006 18:44:13 -0000	1.29
@@ -606,7 +606,7 @@
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-18 10:42:09.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 14:44:51.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -621,7 +621,7 @@
  
 -seutil_dontaudit_read_config(cupsd_t)
 +seutil_read_config(cupsd_t)
-+selinux_get_enforce_mode(cupsd_t)
++selinux_compute_access_vector(cupsd_t)
  
  sysnet_read_config(cupsd_t)
  



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:46:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:46:45 -0400
Subject: rpms/bind/devel bind.spec, 1.112, 1.113 named.init, 1.42,
	1.43 namedGetForwarders, 1.1, 1.2
Message-ID: <200607191846.k6JIkjtA022606@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21136

Modified Files:
	bind.spec named.init namedGetForwarders 
Log Message:
fix bug 196398; fix namedGetForwarders for new dbus


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- bind.spec	19 Jul 2006 13:51:38 -0000	1.112
+++ bind.spec	19 Jul 2006 18:46:43 -0000	1.113
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	28.FC6
+Release: 	30%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -609,6 +609,7 @@
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
 %{_libdir}/liblwres.a
+%exclude %{_libdir}/libbind.so
 %{_libdir}/*so
 %{_includedir}/bind9
 %{_includedir}/dns
@@ -675,6 +676,7 @@
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
+%{_libdir}/libbind.so
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -843,6 +845,11 @@
 :;
 
 %changelog
+* Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-30
+- fix bug 196398 - Enable -D option automatically in initscript
+  if NetworkManager enabled in any runlevel.
+- fix namedGetForwarders for new dbus
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 30:9.3.2-28.FC6
 - Rebuild against new dbus
 


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.init,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- named.init	22 Mar 2006 17:55:16 -0000	1.42
+++ named.init	19 Jul 2006 18:46:43 -0000	1.43
@@ -60,9 +60,29 @@
        echo Locating $ROOTDIR/${named_conf} failed:
        failure
        echo;
+       exit 1;
    fi;
 fi;
 
+NetworkManagerEnabled=0
+for l in 0 1 2 3 4 5 6; do 
+    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
+	NetworkManagerEnabled=1; 
+    fi; 
+done
+
+dbusEnabled=0;
+for a in $OPTIONS; do
+    if [ $a  = "-D" ]; then
+	dbusEnabled=1;
+    fi;
+done
+
+if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then
+   OPTIONS="$OPTIONS -D";
+   dbusEnabled=1;
+fi
+
 start() {
         # Start daemons.
         echo -n $"Starting $named: "
@@ -85,13 +105,7 @@
 		if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
 		    mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
-		dbus=0;
-		for a in $OPTIONS; do
-		    if [ $a  = "-D" ]; then
-			dbus=1;
-	            fi;
-	        done
-		if [ $dbus -eq 1 ]; then
+		if [ $dbusEnabled -eq 1 ]; then
 		    if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
 			mkdir -p ${ROOTDIR}/var/run/dbus
 			if [ ! -d  /var/run/dbus ] ; then


Index: namedGetForwarders
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/namedGetForwarders,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- namedGetForwarders	13 Nov 2005 19:40:07 -0000	1.1
+++ namedGetForwarders	19 Jul 2006 18:46:43 -0000	1.2
@@ -42,7 +42,7 @@
 @dn=(); 
 
 open(DNS,
-     '/usr/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=20000 '
+     '/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=20000 '
     .'--dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders '
     .$zone .'|'
     ) || die("dbus-send failed: $?: $!");



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:50:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:50:06 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-dbus-deprecated.patch, NONE,
	1.1 gnome-screensaver.spec, 1.92, 1.93
Message-ID: <200607191850.k6JIo6I3028532@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28403

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.15.4-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated dbus functions


gnome-screensaver-2.15.4-dbus-deprecated.patch:
 gnome-screensaver-command.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-screensaver-2.15.4-dbus-deprecated.patch ---
--- gnome-screensaver-2.15.4/src/gnome-screensaver-command.c.dbus-deprecated	2006-07-19 14:47:45.000000000 -0400
+++ gnome-screensaver-2.15.4/src/gnome-screensaver-command.c	2006-07-19 14:47:58.000000000 -0400
@@ -359,7 +359,7 @@
         loop = g_main_loop_new (NULL, FALSE);
         g_main_loop_run (loop);
 
-        dbus_connection_disconnect (connection);
+        dbus_connection_close (connection);
 
 	return 0;
 }


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-screensaver.spec	17 Jul 2006 06:10:18 -0000	1.92
+++ gnome-screensaver.spec	19 Jul 2006 18:50:04 -0000	1.93
@@ -2,7 +2,8 @@
 %define gnome_vfs2_version     2.6.0
 %define libgnomeui_version     2.6.0
 %define libglade2_version      2.5.0
-%define dbus_version           0.60
+%define dbus_version           0.90
+%define dbus_glib_version      0.70
 %define libxml2_version        2.6.0
 %define gconf2_version         2.6.1
 %define redhat_menus_version   5.0.1
@@ -12,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 3
+Release: 4 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -23,13 +24,14 @@
 Patch2: gnome-screensaver-2.15.4-shrink-em.patch
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 Patch4: gnome-screensaver-2.15.4-securitytoken.patch
-
+Patch5: gnome-screensaver-2.15.4-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
 BuildRequires: gnome-vfs2-devel => %{gnome_vfs2_version}
 BuildRequires: libgnomeui-devel => %{libgnomeui_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libglade2-devel => %{libglade2_version}
 BuildRequires: libxml2-devel >= %{libxml2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
@@ -65,6 +67,7 @@
 %patch2 -p1 -b .shrink-em
 %patch3 -p1 -b .invisible-char
 %patch4 -p1 -b .securitytoken
+%patch5 -p1 -b .dbus-deprecated
 
 %build
 autoreconf
@@ -154,6 +157,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-4
+- Add BR on dbus-glib-devel
+- Add patch to fix deprecated dbus functions
+
 * Sun Jul 16 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-3
 - only lock screen if screen locking is enabled and the token
   pulled out is a login token (requires uncommited changes to 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:55:36 -0400
Subject: rpms/mx4j/devel mx4j-3.0.1.patch, NONE, 1.1 mx4j-no-poa.patch, NONE,
	1.1 .cvsignore, 1.8, 1.9 mx4j-build.patch, 1.1,
	1.2 mx4j-build.policy, 1.1, 1.2 mx4j.spec, 1.45, 1.46
Message-ID: <200607191855.k6JItabI030645@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30605/devel

Modified Files:
	.cvsignore mx4j-build.patch mx4j-build.policy mx4j.spec 
Added Files:
	mx4j-3.0.1.patch mx4j-no-poa.patch 
Log Message:
auto-import mx4j-3.0.1-4jpp_1fc on branch devel from mx4j-3.0.1-4jpp_1fc.src.rpm

mx4j-3.0.1.patch:
 Resolver.java |   37 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 1 files changed, 1 insertion(+), 36 modifications(!)

--- NEW FILE mx4j-3.0.1.patch ---
*** src/core/mx4j/remote/resolver/iiop/Resolver.java.orig	2005-05-12 12:13:28.000000000 -0400
--- src/core/mx4j/remote/resolver/iiop/Resolver.java	2005-05-13 14:38:21.000000000 -0400
***************
*** 33,36 ****
--- 33,37 ----
  
     private ORB orb;
+    private static final String ORB_KEY = "java.naming.corba.orb";
  
  
***************
*** 111,127 ****
        if (orb == null)
        {
!          Properties props = new Properties();
!          // Using putAll() on a Properties is discouraged, since it expects only Strings
!          for (Iterator i = environment.entrySet().iterator(); i.hasNext();)
!          {
!             Map.Entry entry = (Map.Entry)i.next();
!             Object key = entry.getKey();
!             Object value = entry.getValue();
!             if (key instanceof String && value instanceof String)
!             {
!                props.setProperty((String)key, (String)value);
!             }
!          }
!          orb = ORB.init((String[])null, props);
        }
        return orb;
--- 112,138 ----
        if (orb == null)
        {
!           Object candidateORB = environment.get(ORB_KEY);
!           if (candidateORB != null)
!           {
!              // Throw as required by the spec
!              if (!(candidateORB instanceof ORB)) throw new IllegalArgumentException("Property " + ORB_KEY + " must specify a " + ORB.class.getName() + ", not " + candidateORB.getClass().getName());
!              orb = (ORB)candidateORB;
!           }
!           else
!           {
!              Properties props = new Properties();
!              // Using putAll() on a Properties is discouraged, since it expects only Strings
!              for (Iterator i = environment.entrySet().iterator(); i.hasNext();)
!              {
!                 Map.Entry entry = (Map.Entry)i.next();
!                 Object key = entry.getKey();
!                 Object value = entry.getValue();
!                 if (key instanceof String && value instanceof String)
!                 {
!                    props.setProperty((String)key, (String)value);
!                 }
!              }
!              orb = ORB.init((String[])null, props);
!            }
        }
        return orb;

mx4j-no-poa.patch:
 build.xml |   11 +----------
 1 files changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE mx4j-no-poa.patch ---
--- build/build.xml.sav	2005-03-01 11:14:37.000000000 +0100
+++ build/build.xml	2006-03-10 16:45:56.000000000 +0100
@@ -249,16 +253,7 @@
       </jar>
    </target>
 
-   <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
-      <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
-         <compilerarg value="-poa"/>
-      </rmic>
-      <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
-         <compilerarg value="-poa"/>
-      </rmic>
-   </target>
-
-   <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
+   <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" >
       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
    </target>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jun 2005 11:38:38 -0000	1.8
+++ .cvsignore	19 Jul 2006 18:55:34 -0000	1.9
@@ -1,4 +1 @@
 mx4j-3.0.1-src.tar.gz
-mx4j-3.0.1
-i386
-*.src.rpm

mx4j-build.patch:
 build.xml |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

Index: mx4j-build.patch
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mx4j-build.patch	17 Jan 2005 12:19:46 -0000	1.1
+++ mx4j-build.patch	19 Jul 2006 18:55:34 -0000	1.2
@@ -1,5 +1,5 @@
---- mx4j/build/build.xml.orig	Thu Dec 23 18:35:27 2004
-+++ mx4j/build/build.xml	Thu Dec 23 19:52:49 2004
+--- build/build.xml.sav	2005-03-01 11:14:37.000000000 +0100
++++ build/build.xml	2006-03-10 16:45:56.000000000 +0100
 @@ -55,6 +55,9 @@
     <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
     <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
@@ -18,7 +18,7 @@
  
        <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
           <patternset refid="mx4j.classes"/>
-@@ -270,6 +274,25 @@
+@@ -270,8 +265,29 @@
        </javac>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
@@ -42,9 +42,13 @@
 +      </jar>
 +
        <antcall target="rmic.iiop"/>
++<!--
        <antcall target="rmic.iiop.poa"/>
++-->
  
-@@ -440,8 +463,7 @@
+       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
+          <fileset dir="${core.classes.dir}">
+@@ -423,8 +439,7 @@
           author="true"
           version="true"
           use="true"
@@ -53,8 +57,8 @@
 +         windowtitle="MX4J API">
           <package name="mx4j.*"/>
  
-          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
-@@ -454,8 +476,6 @@
+          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
+@@ -437,8 +452,6 @@
     </target>
  
     <target name="docs" description="Builds the MX4J documentation">
@@ -63,7 +67,7 @@
        <mkdir dir="${dist.docs.dir}"/>
  
        <style processor="trax"
-@@ -467,9 +487,6 @@
+@@ -450,9 +463,6 @@
           classpathref="lib.classpath"
           />
  
@@ -73,3 +77,42 @@
        <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
        <move todir="${dist.docs.dir}">
           <fileset dir="${basedir}/build">
+@@ -583,7 +593,8 @@
+             <include name="wsdl4j.jar"/>
+             <include name="commons-discovery.jar"/>
+             <include name="org.mortbay.jetty.jar"/>
+-            <include name="hessian-3.0.8.jar"/>
++            <include name="hessian3.jar"/>
++            <include name="burlap3.jar"/>
+             <!-- Also jars downloaded apart -->
+             <include name="servlet.jar"/>
+             <include name="jython.jar"/>
+@@ -612,7 +623,9 @@
+ 
+    <target name="single-test" description="Executes the test class defined by the system property 'testname'" depends="tests">
+       <junit printsummary="withOutAndErr" fork="yes" dir="${basedir}" showoutput="yes">
+-         <!--sysproperty key="mx4j.log.priority" value="debug"/-->
++         <sysproperty key="mx4j.log.priority" value="debug"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!--sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="plain" usefile="no"/>
+          <test name="${testname}" if="testname" fork="yes"/>
+@@ -639,6 +652,8 @@
+ 
+       <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
+          <sysproperty key="mx4j.log.priority" value="warn"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!-- sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="xml"/>
+          <batchtest fork="yes" todir="${test.xml.dir}">
+@@ -687,6 +702,8 @@
+ 
+       <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
+          <sysproperty key="mx4j.log.priority" value="warn"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!-- sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="xml"/>
+          <batchtest fork="yes" todir="${test.xml.dir}">


Index: mx4j-build.policy
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-build.policy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mx4j-build.policy	17 Jan 2005 12:19:46 -0000	1.1
+++ mx4j-build.policy	19 Jul 2006 18:55:34 -0000	1.2
@@ -4,6 +4,12 @@
 grant {
 	permission java.util.PropertyPermission "*", "read";
 	permission java.io.FilePermission "/-", "read,write";
-	permission java.net.SocketPermission "*", "listen,accept,resolve,connect";
+	permission java.net.SocketPermission "*", "accept, connect, listen, resolve";
+	permission java.net.SocketPermission "127.0.0.1", "accept, connect, listen, resolve";
+	permission java.lang.RuntimePermission "createSecurityManager";
+	permission java.lang.RuntimePermission "setSecurityManager";
+	permission javax.management.MBeanPermission "*", "*";
+	permission javax.management.remote.SubjectDelegationPermission "*";
+	permission javax.security.auth.AuthPermission "getSubject";
 };
 


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mx4j.spec	12 Jul 2006 07:25:06 -0000	1.45
+++ mx4j.spec	19 Jul 2006 18:55:34 -0000	1.46
@@ -1,11 +1,42 @@
-%define name        mx4j
-%define version     3.0.1
-%define release     1jpp_10fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section     free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           mx4j
+Version:        3.0.1
+Release:        4jpp_1fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -14,32 +45,40 @@
 Source1:        %{name}-build.policy
 Source2:        CatalogManager.properties
 Patch0:         mx4j-javaxssl.patch
+Patch1:         mx4j-%{version}.patch
 Patch2:         mx4j-build.patch
 Patch3:         mx4j-docbook.patch
+Patch4:         mx4j-no-poa.patch
 Patch5:         mx4j-caucho-build.patch
 Patch6:         mx4j-no-iiop.patch
 Url:            http://mx4j.sourceforge.net/
-BuildRequires:  jpackage-utils > 0:1.5
+BuildRequires:  jpackage-utils > 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-trax, ant-junit
+BuildRequires:  ant-trax
+#BuildRequires:  ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
 BuildRequires:	log4j >= 0:1.2.7
 BuildRequires:	jakarta-commons-logging >= 0:1.0.1
 BuildRequires:  xml-commons-apis
 BuildRequires:  bcel >= 0:5.0
-BuildRequires:	jsse
-BuildRequires:	jce
+BuildRequires:	jsse >= 0:1.0.2-6jpp
+BuildRequires:	jce >= 0:1.2.2
+#BuildRequires:	junit >= 0:3.7.1
 BuildRequires:  coreutils
 BuildRequires:  xjavadoc
 BuildRequires:  xdoclet
 BuildRequires:  axis >= 0:1.1
 BuildRequires:  wsdl4j
 BuildRequires:  jakarta-commons-discovery
-BuildRequires:  docbook-dtds >= 1.0
-BuildRequires:  docbook-style-xsl >= 1.61
+BuildRequires:  docbook-dtds >= 0:1.0
+BuildRequires:  docbook-style-xsl >= 0:1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
+#BuildRequires:  xmlunit
+%if ! %{gcj_support}
+Buildarch:      noarch
+%endif
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
@@ -47,18 +86,20 @@
 Requires:	jakarta-commons-logging >= 0:1.0.1
 Requires:  	xml-commons-apis
 Requires:  	bcel >= 0:5.0
-Requires:	jsse
-Requires:	jce
+Requires:	jsse >= 0:1.0.2-6jpp
+Requires:	jce >= 0:1.2.2
 Requires:  	axis >= 0:1.1
 Requires:  	xml-commons-resolver
 Requires:  	xml-commons
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
 Obsoletes:      openjmx
 Provides:	jmxri
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 OpenJMX is an open source implementation of the
@@ -80,19 +121,28 @@
 Documentation for %{name}.
 
 %prep
+rm -rf $RPM_BUILD_ROOT
+
 %setup -q
 
+# FIXME To enable iiop when rmic becomes available
+# turn off patch6 and turn on patch4
+# Patch4 is a backport of upstream changes (MX4J) and may go
+# away on future releases
 %patch0 -p1
-%patch2 -p1
+%patch1 -p0
+%patch2 -b .sav
 %patch3 -p1
+#%patch4 -p0
 %patch5 -p1
 %patch6 -p1
 
 cp %{SOURCE1} build
-cp %{SOURCE2} build
+cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/
 
 pushd lib
-   ln -sf $(build-classpath junit) .
+#   ln -sf $(build-classpath junit) .
+#   ln -sf $(build-classpath xmlunit) .
    ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
    ln -sf $(build-classpath xerces-j2) xercesImpl.jar
    ln -sf $(build-classpath xalan-j2) xalan.jar
@@ -105,25 +155,27 @@
    ln -sf $(build-classpath wsdl4j) .
    ln -sf $(build-classpath commons-discovery) .
    ln -sf $(build-classpath servletapi5) servlet.jar
+#   ln -sf $(build-classpath jython) .
    ln -sf $(build-classpath jsse) .
+   ln -sf $(build-classpath jsse/jcert) jcert.jar
+   ln -sf $(build-classpath jsse/jnet) jnet.jar
    ln -sf $(build-classpath jaas) .
+   ln -sf $(build-classpath javamail/mailapi) .
+   ln -sf $(build-classpath javamail/smtp) .
+   ln -sf $(build-classpath jaf) .
+   ln -sf $(build-classpath xml-commons-resolver) .
+   ln -sf $(build-classpath xdoclet/xdoclet) .
+   ln -sf $(build-classpath xdoclet/xdoclet-jmx-module) .
+   ln -sf $(build-classpath xdoclet/xdoclet-mx4j-module) .
 popd
 
 %build
-export ANT_OPTS="-Djava.security.manager -Djava.security.policy=$(pwd)/build/mx4j-build.policy"
-export CLASSPATH=$(build-classpath activation javamail/mailapi javamail/smtp \
-   jetty4 jython jakarta-commons-logging xml-commons-apis bcel jsse jaas jce \
-   log4j jaxp_transform_impl axis/axis axis/jaxrpc axis/saaj \
-   xml-commons-resolver xdoclet/xdoclet xdoclet/xdoclet-jmx-module \
-   xdoclet/xdoclet-mx4j-module)
-%ifarch x86_64
-export CLASSPATH=$(build-classpath jacorb/jacorb jonathan-rmi):$CLASSPATH
-%endif
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl"
 
-export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build
 
 cd build
-ant compile.jmx compile.rjmx compile.tools javadocs docs
+#ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -149,7 +201,9 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -159,19 +213,44 @@
 
 %post
 /usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
-%{_bindir}/rebuild-gcj-db
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
-%{_bindir}/rebuild-gcj-db
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(-,root,root)
-%{_javadir}/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*.jar
+%{_javadir}/%{name}/boa/*.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-3.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-tools-3.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-remote-boa-3.0.1.jar.*
+%endif
 
 %files javadoc
 %defattr(-,root,root)
@@ -182,9 +261,32 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Jul 19 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp_1fc
+- Merge with upstream
+- Do not use jython as it is not available on FC6
+- Do not use jetty4 as it is not available on FC6
+- Do not run tests as xmlunit not available on FC6 (FIXME)
+  so do not BR junit as well
+
+* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp
+- Remove duplicate macros
+- Use unversioned burlap and hessian
+- Don't use jetty4 as it is not yet available on JPP 1.7
+- Re-add Epoch to the versions required
+- Split patch for removal of poa
+- Add AOT bits
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_10fc
 - rebuild
 
+* Tue Mar 14 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-3jpp
+- Remove dependencies on non-free JXM packages by building MX4J's own
+- Add (re-add?) "java.naming.corba.orb" patch, needed by JOnAS
+
+* Fri Mar 10 2006 Ralph Apel <r.apel at r-apel.de> 0:3.0.1-2jpp
+- Activate burlap and hessian support
+- Most unit tests now pass with java-1.4.2-sun-1.4.2.10-1jpp
+
 * 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)
 
@@ -247,6 +349,8 @@
 * Wed Apr 20 2005 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp
 - Upgrade to 2.1.0
 - Do not build caucho part because of version incompatibilities
+  From Andrew Overholt <overholt at redhat.com>
+- add coreutils BuildRequires
 
 * Mon Mar 14 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_2fc
 - Install mx4j.jar as the jmxri.jar alternative instead of
@@ -258,19 +362,6 @@
 * Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_1fc
 - Build into Fedora.
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp_1rh
-- Merge with upstream for upgrade
-
-* Wed Oct 27 2004 Fernando Nasser <fnasser at redhat.com> 0:2.0.1-2jpp_1rh
-- Merge with upstream for upgrade to 2.0.1
-- Correctly specify CatalogManager.properties as a source file
-- Deactivate jython- and jetty-related classes
-- Disable unit tests, therefore NOT BuildReq xmlunit
-- Disable compliance test, therefore NOT BuildReq jmx, jmxremote
-
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 1:1.1.1-4jpp_4rh
-- add coreutils BuildRequires
-
 * Fri Sep 24 2004 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-2jpp
 - Require xml-commons (jpackage), not xml-common (linux)
 - Activate jython- and jetty-related classes
@@ -283,16 +374,6 @@
 - Updated to use mx4j-2.0.1
 - Rebuilt with Ant 1.6.2
 
-* Wed Mar 31 2004 Frank Ch. Eigler <fche at redhat.com> 1:1.1.1-4jpp_3rh
-- bump up epoch for RHUG upgrading
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1.1-4jpp_2rh
-- add RHUG upgrade cleanup
-
-* Thu Mar 11 2004 Frank Ch. Eigler <fche at redhat.com: 0:1.1.1-4jpp_1rh
-- RH vacuuming
-- added mx4j-javaxssl.patch to use javax.net.* instead of com.sun.net.*
-
 * Mon Mar 24 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.1.1-4jpp
 - jmxri alternative
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 18:56:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 14:56:06 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.155,1.156
Message-ID: <200607191856.k6JIu6DW030888@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30782

Modified Files:
	gnome-applets.spec 
Log Message:
- Added BR for dbus-glib-devel



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- gnome-applets.spec	19 Jul 2006 17:33:03 -0000	1.155
+++ gnome-applets.spec	19 Jul 2006 18:56:04 -0000	1.156
@@ -15,7 +15,8 @@
 %define libwnck_version 2.9.3
 %define libgnome_desktop_version 2.11.1
 %define gnome_utils_version 2.8.1
-%define dbus_version 0.60
+%define dbus_version 0.90
+%define dbus_glib_verion 0.70
 %define hal_version 0.5.3
 %define libnotify_version 0.3.2
 %define pygobject_version 2.6
@@ -29,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release:  	4
+Release:  	5
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -76,6 +77,7 @@
 BuildRequires:  gucharmap-devel
 
 BuildRequires:  dbus-devel >= %{dbus_version}
+BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  which
@@ -244,6 +246,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 1:2.15.1.1-5
+- Add BR for dbus-glib-devel
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-4
 - Rebuild against dbus
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:00:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:00:39 -0400
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.18,1.19
Message-ID: <200607191900.k6JJ0d5S032715@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32533

Modified Files:
	bluez-pin.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bluez-pin.spec	12 Jul 2006 05:28:17 -0000	1.18
+++ bluez-pin.spec	19 Jul 2006 19:00:36 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.30
-Release: 4.1
+Release: 5 
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz
@@ -12,7 +12,7 @@
 Patch3: bluez-pin-0.30-dbus-die-die-die.patch
 Patch4: bluez-pin-0.30-null-pin.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: dbus-devel >= 0.60, gtk2-devel, libglade2-devel, GConf2-devel
+BuildRequires: dbus-devel >= 0.90, dbus-glib-devel >= 0.70, gtk2-devel, libglade2-devel, GConf2-devel
 BuildRequires: bluez-libs-devel, gettext
 ExcludeArch: s390 s390x
 
@@ -52,6 +52,9 @@
 %{_sysconfdir}/xdg/autostart/bluez-pin.desktop
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.30-5
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.30-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:00:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:00:43 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.56, 1.57 firstboot.spec, 1.77,
	1.78 sources, 1.73, 1.74
Message-ID: <200607191900.k6JJ0h4q032766@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32635

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	10 Jul 2006 14:12:28 -0000	1.56
+++ .cvsignore	19 Jul 2006 19:00:40 -0000	1.57
@@ -28,3 +28,4 @@
 firstboot-1.4.11.tar.bz2
 firstboot-1.4.12.tar.bz2
 firstboot-1.4.13.tar.bz2
+firstboot-1.4.14.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- firstboot.spec	10 Jul 2006 14:12:28 -0000	1.77
+++ firstboot.spec	19 Jul 2006 19:00:40 -0000	1.78
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.13
+Version: 1.4.14
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 1.4.14-1
+- Disable the display module for now.
+
 * Fri Jul 10 2006 Chris Lumens <clumens at redhat.com> 1.4.13-1
 - Better fix for the no display hardware case (#192808).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	10 Jul 2006 14:12:28 -0000	1.73
+++ sources	19 Jul 2006 19:00:40 -0000	1.74
@@ -1 +1 @@
-cf55d4ceb618c246677501e155780541  firstboot-1.4.13.tar.bz2
+2f7975390510c68886db62e98b8bcee0  firstboot-1.4.14.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:08:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:08:24 -0400
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.48,1.49
Message-ID: <200607191908.k6JJ8Oxp002325@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2268

Modified Files:
	bluez-utils.spec 
Log Message:
- Rebuild for dbus



Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- bluez-utils.spec	12 Jul 2006 05:28:36 -0000	1.48
+++ bluez-utils.spec	19 Jul 2006 19:08:22 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.25
-Release: 11.1
+Release: 12 
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -20,7 +20,7 @@
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
 BuildRequires: flex
-BuildRequires: dbus-devel >= 0.60
+BuildRequires: dbus-devel >= 0.90
 BuildRequires: libusb-devel
 ExcludeArch: s390 s390x
 Obsoletes: bluez-pan, bluez-sdp
@@ -121,6 +121,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.25-12
+- Rebuild for dbus
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.25-11.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:10:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:10:42 -0400
Subject: rpms/avalon-framework/devel avalon-framework.spec,1.16,1.17
Message-ID: <200607191910.k6JJAgWw003238@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3147

Modified Files:
	avalon-framework.spec 
Log Message:
Added conditional native compiling.



Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- avalon-framework.spec	8 Jun 2006 17:43:53 -0000	1.16
+++ avalon-framework.spec	19 Jul 2006 19:10:39 -0000	1.17
@@ -1,8 +1,11 @@
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define short_name	framework
 %define short_Name	Avalon
 %define name		avalon-%{short_name}
 %define version		4.1.4
-%define release		2jpp_9fc
+%define release		2jpp_10fc
 %define section		free
 
 Name:		%{name}
@@ -13,8 +16,6 @@
 License:	Apache Software License
 Url:		http://avalon.apache.org/%{short_name}/
 Group:		Development/Libraries/Application Frameworks
-#Vendor:		JPackage Project
-#Distribution:	JPackage
 Source0:	http://www.apache.org/dist/avalon/framework/v4.1.4/Avalon-4.1.4-src.tar.gz
 Patch1:		%{name}-target.patch
 Requires:	xml-commons-apis
@@ -24,9 +25,17 @@
 BuildRequires:	avalon-logkit
 BuildRequires:	xml-commons-apis
 BuildRequires:  jpackage-utils >= 0:1.5
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Avalon framework consists of interfaces that define relationships
 between commonly used application components, best-of-practice pattern
@@ -72,6 +81,10 @@
 # create unversioned symlinks
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,11 +97,31 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc KEYS LICENSE.txt README.txt
 %{_javadir}/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework-4.1.4.jar.*
+%endif
+
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/*
@@ -98,6 +131,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:4.1.4-2jpp_10fc
+- Added conditional native compling.
+
 * Thu Jun  8 2006 Deepak Bhole <dbhole at redhat.com> - 0:4.1.4-2jpp_9fc
 - Updated description for fix to Bug# 170999
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:16:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:16:46 -0400
Subject: rpms/rhythmbox/devel rhythmbox-0.9.5-dbus-deprecated.patch, NONE,
	1.1 rhythmbox.spec, 1.73, 1.74
Message-ID: <200607191916.k6JJGkbg014048@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11602

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.5-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated dbus function


rhythmbox-0.9.5-dbus-deprecated.patch:
 rb-metadata-dbus-client.c  |    2 +-
 rb-metadata-dbus-service.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rhythmbox-0.9.5-dbus-deprecated.patch ---
--- rhythmbox-0.9.5/metadata/rb-metadata-dbus-service.c.dbus-deprecated	2006-07-19 15:13:00.000000000 -0400
+++ rhythmbox-0.9.5/metadata/rb-metadata-dbus-service.c	2006-07-19 15:14:26.000000000 -0400
@@ -494,7 +494,7 @@
 	g_main_loop_run (svc.loop);
 
 	if (svc.connection) {
-		dbus_connection_disconnect (svc.connection);
+		dbus_connection_close (svc.connection);
 		dbus_connection_unref (svc.connection);
 	}
 
--- rhythmbox-0.9.5/metadata/rb-metadata-dbus-client.c.dbus-deprecated	2006-07-19 15:13:39.000000000 -0400
+++ rhythmbox-0.9.5/metadata/rb-metadata-dbus-client.c	2006-07-19 15:13:50.000000000 -0400
@@ -118,7 +118,7 @@
 	if (dbus_connection) {
 		if (dbus_connection_get_is_connected (dbus_connection)) {
 			rb_debug ("closing dbus connection");
-			dbus_connection_disconnect (dbus_connection);
+			dbus_connection_close (dbus_connection);
 		} else {
 			rb_debug ("dbus connection already closed");
 		}


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- rhythmbox.spec	12 Jul 2006 07:59:18 -0000	1.73
+++ rhythmbox.spec	19 Jul 2006 19:16:43 -0000	1.74
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.5
-Release: 1.1
+Release: 2 
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -28,7 +28,8 @@
 BuildRequires: gnome-vfs2-devel >= 2.7.4
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: libmusicbrainz-devel >= 2.1.0
-BuildRequires: dbus-devel >= 0.60
+BuildRequires: dbus-devel >= 0.90
+BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: libnotify-devel
 BuildRequires:	gstreamer-devel
 BuildRequires:	gnome-doc-utils
@@ -38,6 +39,7 @@
 BuildRequires:	hal-devel
 
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
+Patch3: rhythmbox-0.9.5-dbus-deprecated.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -48,6 +50,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .use-icon-name
+%patch3 -p1 -b .dbus-deprecated
 
 %build
 
@@ -127,6 +130,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.9.5-2
+- Add BR for dbus-glib-devel 
+- Add patch to fix deprecated dbus function
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.5-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:19:26 -0400
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.21,1.22
Message-ID: <200607191919.k6JJJQve021383@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21317

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
- rebuild for dbus



Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- krb5-auth-dialog.spec	12 Jul 2006 06:43:15 -0000	1.21
+++ krb5-auth-dialog.spec	19 Jul 2006 19:19:24 -0000	1.22
@@ -1,12 +1,12 @@
 %define libgnomeui_version 2.9.1
 %define krb5_version 1.4
 %define libnm_version 0.5
-%define dbus_version 0.60
+%define dbus_version 0.90
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.6.cvs20060212
-Release: 3.1
+Release: 4 
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.cvs20060212-4
+- rebuild for dbus 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.cvs20060212-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:25:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:25:16 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.12,1.13
Message-ID: <200607191925.k6JJPG3d023677@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv23441/configs

Modified Files:
	config-powerpc64-iseries 
Log Message:
Small updates to the config files and a major rewrite of merge.pl to make it
smarter and faster. 




Index: config-powerpc64-iseries
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config-powerpc64-iseries	5 Jul 2006 14:15:09 -0000	1.12
+++ config-powerpc64-iseries	19 Jul 2006 19:25:13 -0000	1.13
@@ -66,7 +66,6 @@
 # CONFIG_CPU_FREQ is not set
 # CONFIG_PCCARD is not set
 # CONFIG_CARDBUS is not set
-# CONFIG_HOTPLUG_PCI is not set
 # CONFIG_ATM is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:25:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:25:16 -0400
Subject: rpms/kernel/devel config-rhel-generic,1.7,1.8 merge.pl,1.8,1.9
Message-ID: <200607191925.k6JJPGf6023678@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23441

Modified Files:
	config-rhel-generic merge.pl 
Log Message:
Small updates to the config files and a major rewrite of merge.pl to make it
smarter and faster. 




Index: config-rhel-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/config-rhel-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-rhel-generic	7 Jul 2006 20:55:46 -0000	1.7
+++ config-rhel-generic	19 Jul 2006 19:25:13 -0000	1.8
@@ -190,3 +190,5 @@
 # CONFIG_I2C_PCA_ISA is not set
 # CONFIG_DECNET is not set
 # CONFIG_TCG_TPM is not set
+CONFIG_RAW_DRIVER=y
+


Index: merge.pl
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/merge.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merge.pl	7 Jul 2006 20:55:46 -0000	1.8
+++ merge.pl	19 Jul 2006 19:25:13 -0000	1.9
@@ -1,8 +1,8 @@
 #! /usr/bin/perl
 
 my @args=@ARGV;
+my %configvalues;
 my @configoptions;
-my @configvalues;
 my $configcounter = 0;
 
 # optionally print out the architecture as the first line of our output
@@ -16,55 +16,38 @@
 open (FILE,"$args[0]") || die "Could not open $args[0]";
 while (<FILE>) {
 	my $str = $_;
+	my $configname;
+
 	if (/\# ([\w]+) is not set/) {
-		$configoptions[$configcounter] = $1;
-		$configvalues[$configcounter] = $str;
+		$configname = $1;
+	} elsif (/([\w]+)=/) {
+		$configname = $1;
+	}
+
+	if (defined($configname) && !exists($configvalues{$configname})) {
+		$configvalues{$configname} = $str;
+		$configoptions[$configcounter] = $configname;
 		$configcounter ++;
-	} else {
-		if (/([\w]+)=/) {
-			$configoptions[$configcounter] = $1;
-			$configvalues[$configcounter] = $str;
-			$configcounter ++;
-		}
 	}
 };
 
 # now, read and output the entire configfile, except for the overridden
 # parts... for those the new value is printed.
-# O(N!) algorithm so if this is slow I need to look at it later
 
 open (FILE2,"$args[1]") || die "Could not open $args[1]";
 while (<FILE2>) {
-	my $nooutput;
-	my $counter;
 	my $configname;
 
 	if (/\# ([\w]+) is not set/) {
 		$configname = $1;
-	} else {
-		if (/([\w]+)=/) {
-			$configname  = $1;
-		}
-	}
-
-	$counter = 0;
-	$nooutput = 0;
-	while ($counter < $configcounter) {
-		if ("$configname" eq "$configoptions[$counter]") {
-			$nooutput = 1;
-			print "$configvalues[$counter]";
-
-			#remove this option from the list
-			#assuming no duplicates here
-			splice(@configoptions,$counter,1);
-			splice(@configvalues,$counter,1);
-			$configcounter--;
-			last;
-		}
-		$counter++;
+	} elsif (/([\w]+)=/) {
+		$configname  = $1;
 	}
 
-	if ($nooutput == 0) {
+	if (defined($configname) && exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+		delete($configvalues{$configname});
+	} else {
 		print "$_";
 	}
 }
@@ -73,7 +56,10 @@
 my $counter = 0;
 
 while ($counter < $configcounter) {
-	print "$configvalues[$counter]";
+	my $configname = $configoptions[$counter];
+	if (exists($configvalues{$configname})) {
+		print "$configvalues{$configname}";
+	}
 	$counter++;
 }
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:26:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:26:45 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.106,1.107
Message-ID: <200607191926.k6JJQjYC024282@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24227

Modified Files:
	epiphany.spec 
Log Message:
fix build reqs



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- epiphany.spec	18 Jul 2006 19:36:41 -0000	1.106
+++ epiphany.spec	19 Jul 2006 19:26:42 -0000	1.107
@@ -44,6 +44,7 @@
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
+BuildRequires: pygtk2-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:28:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:28:51 -0400
Subject: rpms/gaim/devel gaim.spec,1.128,1.129
Message-ID: <200607191928.k6JJSpiH025168@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25068

Modified Files:
	gaim.spec 
Log Message:
- Add BR for dbus-glib-devel



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gaim.spec	12 Jul 2006 05:52:44 -0000	1.128
+++ gaim.spec	19 Jul 2006 19:28:49 -0000	1.129
@@ -27,7 +27,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.6.%{betaver}.1%{?dist}
+Release:	0.6.%{betaver}.2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -104,7 +104,8 @@
 %endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
-BuildRequires:	dbus-devel >= 0.35
+BuildRequires:	dbus-devel >= 0.90
+BuildRequires:  dbus-glib-devel >= 0.70
 %endif
 
 # Howl integration (seems to be broken)
@@ -289,6 +290,9 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2:2.0.0-0.6.beta4.2
+- Add BR for dbus-glib-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.0.0-0.6.beta3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:29:40 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.46,1.47
Message-ID: <200607191929.k6JJTecG025570@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25430

Modified Files:
	mx4j.spec 
Log Message:
Temporarely remove x86_64




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mx4j.spec	19 Jul 2006 18:55:34 -0000	1.46
+++ mx4j.spec	19 Jul 2006 19:29:38 -0000	1.47
@@ -78,6 +78,8 @@
 #BuildRequires:  xmlunit
 %if ! %{gcj_support}
 Buildarch:      noarch
+%else
+ExcludeArch: x86_64
 %endif
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:35:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:35:27 -0400
Subject: rpms/bind/devel bind.spec,1.113,1.114
Message-ID: <200607191935.k6JJZR5r026613@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26575

Modified Files:
	bind.spec 
Log Message:
fix bugs 196398, 195881; fix namedGetForwarders for new dbus


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- bind.spec	19 Jul 2006 18:46:43 -0000	1.113
+++ bind.spec	19 Jul 2006 19:35:24 -0000	1.114
@@ -849,6 +849,7 @@
 - fix bug 196398 - Enable -D option automatically in initscript
   if NetworkManager enabled in any runlevel.
 - fix namedGetForwarders for new dbus
+- fix bug 195881 - libbind.so should be owned by bind-libbind-devel
 
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 30:9.3.2-28.FC6
 - Rebuild against new dbus



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:40:47 -0400
Subject: rpms/avalon-framework/devel avalon-framework.spec,1.17,1.18
Message-ID: <200607191940.k6JJel7d028256@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28067

Modified Files:
	avalon-framework.spec 
Log Message:
Removed separate definition of name, version and release.



Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- avalon-framework.spec	19 Jul 2006 19:10:39 -0000	1.17
+++ avalon-framework.spec	19 Jul 2006 19:40:44 -0000	1.18
@@ -3,14 +3,11 @@
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define short_name	framework
 %define short_Name	Avalon
-%define name		avalon-%{short_name}
-%define version		4.1.4
-%define release		2jpp_10fc
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		avalon-%{short_name}
+Version:	4.1.4
+Release:	2jpp_11fc
 Epoch:		0
 Summary:	Java components interfaces
 License:	Apache Software License
@@ -131,6 +128,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:4.1.4-2jpp_11fc
+- Removed separate definition of name, version and release.
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:4.1.4-2jpp_10fc
 - Added conditional native compling.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:41:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:41:23 -0400
Subject: rpms/antlr/devel antlr.spec,1.18,1.19
Message-ID: <200607191941.k6JJfNIR028532@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28462

Modified Files:
	antlr.spec 
Log Message:

Added conditional native compilation.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- antlr.spec	12 Jul 2006 05:11:00 -0000	1.18
+++ antlr.spec	19 Jul 2006 19:41:20 -0000	1.19
@@ -1,26 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 %define native  %{?_with_native:1}%{!?_without_native:0}
-%define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
 
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
-Version:        2.7.4
-Release: 	2jpp_7fc
+Version:        2.7.6
+Release:        3jpp_1fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
 Group:          Development/Code Generators
-Source0:        antlr-2.7.4-RHCLEAN.tar.bz2
+#http://www.antlr.org/download/antlr-%{version}.tar.gz
+Source0:        antlr-%{version}-RHCLEAN.tar.gz
 Source1:        %{name}-build.xml
 Source2:        %{name}-script
-Source3:        http://www.antlr.org/share/1069557132934/makefile.gcj
+#http://www.antlr.org/share/1069557132934/makefile.gcj
+Source3:        makefile.gcj
 Patch0:         %{name}-jedit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %if %{native}
 BuildRequires:  %{_bindir}/gcj, %{__make}
 %else
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRequires:  ant
 BuildRequires:  %{__perl}, java-javadoc
 Requires:       jpackage-utils
@@ -28,6 +65,12 @@
 Requires(postun): %{_sbindir}/update-alternatives
 %endif
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a
 language tool that provides a framework for constructing recognizers,
@@ -41,6 +84,12 @@
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description    native
 ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is a
 language tool that provides a framework for constructing recognizers,
@@ -58,12 +107,10 @@
 %package        javadoc
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
 
-%if %{build_jedit}
 %package        jedit
 Group:          Text Editors
 Summary:        ANTLR mode for jEdit
@@ -74,7 +121,6 @@
 %{_datadir}/jedit/modes/catalog:
 
   <MODE NAME="antlr" FILE="antlr.xml" FILE_NAME_GLOB="*.g"/>
-%endif
 
 
 %prep
@@ -124,13 +170,15 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # jedit mode
-%if %{build_jedit}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/jedit/modes
 cp -p extras/antlr-jedit.xml $RPM_BUILD_ROOT%{_datadir}/jedit/modes/antlr.xml
 %endif
-%endif
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,22 +187,50 @@
 %{_sbindir}/update-alternatives --install %{_bindir}/antlr \
   %{name} %{_bindir}/antlr-java 10
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %postun
 if [ $1 -eq 0 ] ; then
   %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/antlr-java
 fi
 
 %if %{native}
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %post native
 %{_sbindir}/update-alternatives --install %{_bindir}/antlr \
   %{name} %{_bindir}/antlr-native 20
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %postun native
 if [ $1 -eq 0 ] ; then
   %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/antlr-native
 fi
 %endif
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -163,7 +239,7 @@
 %if %{native}
 %files native
 %defattr(0644,root,root,0755)
-%doc install.html LICENSE.txt
+%doc INSTALL.txt LICENSE.txt
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-native
@@ -171,12 +247,16 @@
 %else
 %files
 %defattr(0644,root,root,0755)
-%doc install.html LICENSE.txt
+%doc INSTALL.txt LICENSE.txt
 %{_javadir}/%{name}*.jar
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-java
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files manual
 %defattr(0644,root,root,0755)
 %doc doc/*
@@ -186,51 +266,21 @@
 %doc %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
-%if %{build_jedit}
 %files jedit
 %defattr(0644,root,root,0755)
 %{_datadir}/jedit/modes/*
 %endif
-%endif
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.7.4-2jpp_7fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.7.4-2jpp_6fc
-- stop scriptlet spew
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_1fc
+- Added conditional native compilation.
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:2.7.4-2jpp_5fc
-- rebuilt for new gcj
+* Fri Jan 13 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.7.6-2jpp
+- First JPP 1.7 build
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Mon Nov 28 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:2.7.4-2jpp_4fc
-- Reverted the previous change.
-
-* Mon Nov  7 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:2.7.4-2jpp_3fc
-- BZ 172456: Added /usr/lib/libantlr.a and /usr/include/antlr/*.hpp
-
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:2.7.4-2jpp_2fc
-- Remove jarfile from the tarball.
-- Remove now-unnecessary workaround for #144775.
-
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> - 0:2.7.4-2jpp_1fc
-- Sync with RHAPS.
-
-* Mon Nov 15 2004 Fernando Nasser <fnasser at redhat.com> - 0:2.7.4-2jpp_1rh
-- Merge with upstream for upgrade
-
-* Fri Nov 12 2004 Gary Benson <gbenson at redhat.com> - 0:2.7.2-3jpp_3fc
-- Omit the jedit subpackage to fix dependencies.
-
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> - 0:2.7.2-3jpp_2fc
-- Build into Fedora.
+* Fri Jan 13 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.7.6-1jpp
+- Update to 2.7.6.
 
 * Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:2.7.4-2jpp
 - Build with ant-1.6.2.
@@ -248,9 +298,6 @@
   "--with native" to get that.
 - Add %{_bindir}/antlr alternative.
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com - 0:2.7.2-3jpp_1rh
-- RH vacuuming
-
 * Mon Dec 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.7.2-3jpp
 - Add non-versioned javadoc dir symlink.
 - Crosslink with local J2SE javadocs.



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:43:14 -0400
Subject: rpms/antlr/devel .cvsignore,1.5,1.6 sources,1.4,1.5
Message-ID: <200607191943.k6JJhEqh029307@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29247

Modified Files:
	.cvsignore sources 
Log Message:

Added new source tarball.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 12:33:53 -0000	1.5
+++ .cvsignore	19 Jul 2006 19:43:12 -0000	1.6
@@ -1,4 +1 @@
-antlr-2.7.4-RHCLEAN.tar.bz2
-antlr-2.7.4
-noarch
-*.src.rpm
+antlr-2.7.6-RHCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2005 12:33:53 -0000	1.4
+++ sources	19 Jul 2006 19:43:12 -0000	1.5
@@ -1 +1 @@
-498d18eb0330cc784da883b885b2f7ea  antlr-2.7.4-RHCLEAN.tar.bz2
+a8d17be897f0d15dc96061f01aee2d12  antlr-2.7.6-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:47:11 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.47,1.48
Message-ID: <200607191947.k6JJlBO1010982@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9658

Modified Files:
	mx4j.spec 
Log Message:
Add x86_64 to the build




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mx4j.spec	19 Jul 2006 19:29:38 -0000	1.47
+++ mx4j.spec	19 Jul 2006 19:47:09 -0000	1.48
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -78,8 +78,6 @@
 #BuildRequires:  xmlunit
 %if ! %{gcj_support}
 Buildarch:      noarch
-%else
-ExcludeArch: x86_64
 %endif
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
@@ -263,6 +261,9 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Jul 19 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp_2fc
+- Add x86_64 to the build
+
 * Wed Jul 19 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp_1fc
 - Merge with upstream
 - Do not use jython as it is not available on FC6



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:48:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:48:18 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.9,
	1.10
Message-ID: <200607191948.k6JJmIZs013549@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13518

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
Remove name/release/version defines as applicable.


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-daemon.spec	17 Jul 2006 21:39:11 -0000	1.9
+++ jakarta-commons-daemon.spec	19 Jul 2006 19:48:16 -0000	1.10
@@ -36,12 +36,11 @@
 
 %define base_name   daemon
 %define short_name  commons-%{base_name}
-%define name        jakarta-%{short_name}
 %define section     free
 
-Name:           %{name}
+Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        3jpp_1fc
+Release:        4jpp_1fc
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License 2.0
@@ -187,7 +186,10 @@
 %endif
 
 %changelog
-* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-3jpp_1fc
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-4jpp_1fc
+- Remove name/release/version defines as applicable.
+
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-3jpp
 - Added conditional native build.
 
 * Wed Apr 12 2006 Ralph Apel <r.apel at r-apel.de> - 1:1.0.1-2jpp



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:49:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:49:21 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.107,1.108
Message-ID: <200607191949.k6JJnLLk013955@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13892

Modified Files:
	epiphany.spec 
Log Message:
more build reqs



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- epiphany.spec	19 Jul 2006 19:26:42 -0000	1.107
+++ epiphany.spec	19 Jul 2006 19:49:19 -0000	1.108
@@ -44,7 +44,7 @@
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
-BuildRequires: pygtk2-devel
+BuildRequires: pygtk2-devel, gnome-python2-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:52:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:52:18 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.16,
	1.17
Message-ID: <200607191952.k6JJqI95015136@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15106

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
Remove name/release/version defines as applicable.


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-lang.spec	18 Jul 2006 00:50:22 -0000	1.16
+++ jakarta-commons-lang.spec	19 Jul 2006 19:52:16 -0000	1.17
@@ -34,12 +34,11 @@
 
 %define base_name       lang
 %define short_name      commons-%{base_name}
-%define name            jakarta-%{short_name}
 %define section         free
 
-Name:           %{name}
+Name:           jakarta-%{short_name}
 Version:        2.1
-Release:        3jpp_2fc
+Release:        4jpp_1fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -89,7 +88,6 @@
 %patch0
 
 %build
-
 # FIXME: There are failures with gcj. Ignore them for now.
 %if %{gcj_support}
   %ant \
@@ -163,12 +161,11 @@
 %doc %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
-
 %changelog
-* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp_2fc
-- Added an if block around test failure ignore when gcj support is enabled.
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-4jpp_1fc
+- Remove name/release/version defines as applicable.
 
-* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp_1fc
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-3jpp
 - Added conditional native compiling.
 - By jkeating: Patched to not use taget= in build.xml
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:53:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:53:50 -0400
Subject: rpms/jlex/devel jlex.spec,1.10,1.11
Message-ID: <200607191953.k6JJroEL015780@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jlex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15468

Modified Files:
	jlex.spec 
Log Message:
* Conditional native compilation for GCJ.
* Remove clean up of build root in prep section.



Index: jlex.spec
===================================================================
RCS file: /cvs/dist/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jlex.spec	12 Jul 2006 06:34:00 -0000	1.10
+++ jlex.spec	19 Jul 2006 19:53:48 -0000	1.11
@@ -1,25 +1,62 @@
-%define name            jlex
-%define version         1.2.6
-%define release 	1jpp_4fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           jlex
+Version:        1.2.6
+Release:        4jpp_1fc
 Epoch:		0
 Summary:        A Lexical Analyzer Generator for Java
 License:        Free
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 Source0:        http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.5/Main.java
 Source1:        %{name}-%{version}.build.xml
 Patch0:         %{name}-%{version}.static.patch
 URL:            http://www.cs.princeton.edu/~appel/modern/java/JLex/
 BuildRequires:  ant, sed, jpackage-utils > 1.4
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JLex is a Lexical Analyzer Generator for Java
 
@@ -31,7 +68,6 @@
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -c -T
 cp %{SOURCE0} .
 %patch0 -p0
@@ -50,18 +86,49 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root,-)
 %{_javadir}
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jlex-1.2.6.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.6-4jpp_1fc
+- Conditional native compilation for GCJ.
+- Remove clean up of build root in prep section.
+
+* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> - 1.2.6-3jpp
+- First JPP 1.7 build
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.6-1jpp_4fc
 - rebuild
 
@@ -77,6 +144,9 @@
 * Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 1.2.6-1jpp_2fc
 - Build into Fedora.
 
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1.2.6-2jpp
+- Rebuild with ant-1.6.2
+
 * Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 1.2.6-1jpp_1rh
 - RH vacuuming
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:56:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:56:12 -0400
Subject: rpms/rpm/devel rpm-4.4.2-debugedit-ppc-reloc.patch, NONE,
	1.1 rpm.spec, 1.211, 1.212
Message-ID: <200607191956.k6JJuCsN016788@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16726

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2-debugedit-ppc-reloc.patch 
Log Message:
Fix debugedit for ppc relocations (#199473)

rpm-4.4.2-debugedit-ppc-reloc.patch:
 debugedit.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rpm-4.4.2-debugedit-ppc-reloc.patch ---
--- tools/debugedit.c	20 May 2004 21:30:00 -0000	2.8
+++ tools/debugedit.c	19 Jul 2006 19:17:49 -0000
@@ -1034,7 +1034,7 @@ edit_dwarf2 (DSO *dso)
 		  break;
 		case EM_PPC:
 		case EM_PPC64:
-		  if (rtype != R_PPC_ADDR32 || rtype != R_PPC_UADDR32)
+		  if (rtype != R_PPC_ADDR32 && rtype != R_PPC_UADDR32)
 		    goto fail;
 		  break;
 		case EM_S390:


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- rpm.spec	14 Jul 2006 21:04:56 -0000	1.211
+++ rpm.spec	19 Jul 2006 19:56:10 -0000	1.212
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 29
+Release: 30
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -56,6 +56,7 @@
 Patch28: rpm-4.4.2-python-aslist.patch
 Patch29: rpm-4.4.2-rpmio-ipv6.patch
 Patch30: rpm-4.4.2-gnuhash.patch
+Patch31: rpm-4.4.2-debugedit-ppc-reloc.patch
 License: GPL
 Conflicts: patch < 2.5
 %ifos linux
@@ -199,6 +200,7 @@
 %patch28 -p1 -b .aslist
 %patch29 -p1 -b .ipv6
 %patch30 -p1 -b .gnuhash
+%patch31 -p0 -b .dbgppc
 
 # rebuild configure for ipv6
 autoconf
@@ -595,6 +597,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Wed Jul 19 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-30
+- Fix debugedit for ppc relocations (#199473)
+
 * Fri Jul 14 2006 David Cantrell <dcantrell at redhat.com> - 4.4.2-29
 - Fixed null pointer problem in rpmfcELF() DT_GNU_HASH handling
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 19:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 15:56:48 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.32, 1.33
Message-ID: <200607191956.k6JJumwP017105@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17080

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
Remove name/release/version defines as applicable.


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-commons-logging.spec	18 Jul 2006 01:24:40 -0000	1.32
+++ jakarta-commons-logging.spec	19 Jul 2006 19:56:46 -0000	1.33
@@ -34,12 +34,11 @@
 
 %define base_name  logging
 %define short_name commons-%{base_name}
-%define name jakarta-%{short_name}
 %define section    free
 
-Name:           %{name}
+Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        4jpp_1fc
+Release:        5jpp_1fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -179,7 +178,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-4jpp_1fc
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-5jpp_1fc
+- Remove name/release/version defines as applicable.
+
+* Mon Jul 17 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-4jpp
 - Added conditional native compiling.
 
 * Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-3jpp



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:00:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:00:15 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.108,1.109
Message-ID: <200607192000.k6JK0FM9018186@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18066

Modified Files:
	epiphany.spec 
Log Message:
more build reqs



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- epiphany.spec	19 Jul 2006 19:49:19 -0000	1.108
+++ epiphany.spec	19 Jul 2006 20:00:12 -0000	1.109
@@ -44,7 +44,7 @@
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
-BuildRequires: pygtk2-devel, gnome-python2-devel
+BuildRequires: pygtk2-devel, gnome-python2
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:05:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:05:33 -0400
Subject: rpms/wsdl4j/devel wsdl4j.spec,1.11,1.12
Message-ID: <200607192005.k6JK5X0U018909@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/wsdl4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18881

Modified Files:
	wsdl4j.spec 
Log Message:
Remove name/release/version defines as applicable.


Index: wsdl4j.spec
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wsdl4j.spec	18 Jul 2006 19:32:22 -0000	1.11
+++ wsdl4j.spec	19 Jul 2006 20:05:27 -0000	1.12
@@ -32,18 +32,15 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define name            wsdl4j
-%define version         1.5.2
-%define release         2jpp_1fc
 %define section         free
 
 # -----------------------------------------------------------------------------
 
 Summary:        Web Services Description Language Toolkit for Java
-Name:           %{name}
-Version:        %{version}
-Release:        %{release}
-Epoch:		0
+Name:           wsdl4j
+Version:        1.5.2
+Release:        3jpp_1jpp
+Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
 URL:            http://sourceforge.net/projects/wsdl4j
@@ -153,7 +150,10 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
-* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.2-2jpp_1fc
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.2-3jpp_1fc
+- Remove name/release/version defines as applicable.
+
+* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.2-2jpp
 - Merge changes from fc.
 - Add conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:06:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:06:38 -0400
Subject: rpms/selinux-policy/devel booleans-targeted.conf, 1.15,
	1.16 policy-20060608.patch, 1.29, 1.30 selinux-policy.spec,
	1.227, 1.228
Message-ID: <200607192006.k6JK6cq1019087@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19063

Modified Files:
	booleans-targeted.conf policy-20060608.patch 
	selinux-policy.spec 
Log Message:
* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-5
- add boolean to allow zebra to write config files



Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- booleans-targeted.conf	19 Jul 2006 18:39:31 -0000	1.15
+++ booleans-targeted.conf	19 Jul 2006 20:06:35 -0000	1.16
@@ -54,6 +54,10 @@
 # 
 allow_ypbind = false
 
+# Allow zebra to write it own configuration files
+# 
+allow_zebra_write_config = true
+
 # Enable extra rules in the cron domainto support fcron.
 # 
 fcron_crond = false

policy-20060608.patch:
 global_tunables                    |   75 +++++++-----
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    4 
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  128 +++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 74 files changed, 752 insertions(+), 209 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policy-20060608.patch	19 Jul 2006 18:44:13 -0000	1.29
+++ policy-20060608.patch	19 Jul 2006 20:06:35 -0000	1.30
@@ -1,7 +1,22 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 12:33:32.000000000 -0400
-@@ -89,6 +89,13 @@
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 15:08:53.000000000 -0400
+@@ -19,6 +19,14 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow zebra daemon to write it configuration files
++## </p>
++## </desc>
++#
++gen_tunable(allow_zebra_write_config,false)
++
++## <desc>
++## <p>
+ ## Allow making the heap executable.
+ ## </p>
+ ## </desc>
+@@ -89,6 +97,13 @@
  
  ## <desc>
  ## <p>
@@ -15,7 +30,7 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-@@ -132,12 +139,6 @@
+@@ -132,12 +147,6 @@
  ## </desc>
  gen_tunable(allow_smbd_anon_write,false)
  
@@ -28,7 +43,7 @@
  
  ## <desc>
  ## <p>
-@@ -311,13 +312,6 @@
+@@ -311,13 +320,6 @@
  
  ## <desc>
  ## <p>
@@ -42,7 +57,7 @@
  ## Allow squid to connect to all ports, not just
  ## HTTP, FTP, and Gopher ports.
  ## </p>
-@@ -326,13 +320,6 @@
+@@ -326,13 +328,6 @@
  
  ## <desc>
  ## <p>
@@ -56,7 +71,7 @@
  ## Configure stunnel to be a standalone daemon or
  ## inetd service.
  ## </p>
-@@ -353,6 +340,12 @@
+@@ -353,6 +348,12 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
  
@@ -69,7 +84,7 @@
  ## <desc>
  ## <p>
  ## Control users use of ping and traceroute
-@@ -360,12 +353,28 @@
+@@ -360,12 +361,28 @@
  ## </desc>
  gen_tunable(user_ping,false)
  
@@ -103,7 +118,7 @@
  ## <desc>
  ## <p>
  ## Allow gpg executable stack
-@@ -489,14 +498,6 @@
+@@ -489,14 +506,6 @@
  
  ## <desc>
  ## <p>
@@ -1413,8 +1428,20 @@
  optional_policy(`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-17 11:43:02.000000000 -0400
-@@ -73,9 +73,11 @@
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-19 15:07:01.000000000 -0400
+@@ -42,6 +42,11 @@
+ allow zebra_t zebra_conf_t:file r_file_perms;
+ allow zebra_t zebra_conf_t:lnk_file { getattr read };
+ 
++tunable_policy(`allow_zebra_write_config',`
++	allow zebra_t zebra_conf_t:dir write;
++	allow zebra_t zebra_conf_t:file write;
++')
++
+ allow zebra_t zebra_log_t:file create_file_perms;
+ allow zebra_t zebra_log_t:sock_file create_file_perms;
+ allow zebra_t zebra_log_t:dir { rw_dir_perms setattr };
+@@ -73,9 +78,11 @@
  corenet_tcp_bind_all_nodes(zebra_t)
  corenet_udp_bind_all_nodes(zebra_t)
  corenet_tcp_bind_zebra_port(zebra_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- selinux-policy.spec	19 Jul 2006 18:39:31 -0000	1.227
+++ selinux-policy.spec	19 Jul 2006 20:06:35 -0000	1.228
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-5
+- add boolean to allow zebra to write config files
+
 * Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-4
 - setroubleshootd fixes
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:15:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:15:50 -0400
Subject: rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.11,1.12
Message-ID: <200607192015.k6JKFoMw024002@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23508

Modified Files:
	linux-2.6-xen-compile-fixes.patch 
Log Message:
fix the i586 build problem with new xen pach

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 arch/i386/kernel/asm-offsets.c                               |    2 +
 arch/i386/kernel/entry-xen.S                                 |    4 +++
 arch/i386/kernel/entry.S                                     |    4 +++
 arch/i386/kernel/sysenter.c                                  |    6 ++++
 include/asm-i386/elf.h                                       |    9 +++++++
 include/asm-i386/fixmap.h                                    |    2 +
 include/asm-i386/mach-xen/asm/fixmap.h                       |    2 +
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.17.noarch/arch/i386/kernel/Makefile                |    3 --
 linux-2.6.17.noarch/arch/i386/kernel/time-xen.c              |    2 +
 linux-2.6.17.noarch/arch/i386/kernel/tsc.c                   |    2 +
 23 files changed, 74 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-xen-compile-fixes.patch	19 Jul 2006 17:25:03 -0000	1.11
+++ linux-2.6-xen-compile-fixes.patch	19 Jul 2006 20:15:48 -0000	1.12
@@ -193,3 +193,188 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
+diff -urNp linux-2.6.17.previous/arch/i386/kernel/Makefile linux-2.6.17.noarch/arch/i386/kernel/Makefile
+--- linux-2.6.17.previous/arch/i386/kernel/Makefile	2006-07-19 16:27:09.000000000 +0200
++++ linux-2.6.17.noarch/arch/i386/kernel/Makefile	2006-07-19 21:45:09.000000000 +0200
+@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
+ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
+ 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
+ 		pci-dma.o i386_ksyms.o i387.o bootflag.o \
+-		quirks.o i8237.o topology.o alternative.o i8253.o
++		quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
+ 
+ obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
+ obj-y				+= cpu/
+@@ -37,7 +37,6 @@ 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_X86_TSC)		+= tsc.o
+ obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
+ obj-$(CONFIG_K8_NB)		+= k8.o
+ obj-$(CONFIG_AUDIT)		+= audit.o
+diff -urNp linux-2.6.17.previous/arch/i386/kernel/time-xen.c linux-2.6.17.noarch/arch/i386/kernel/time-xen.c
+--- linux-2.6.17.previous/arch/i386/kernel/time-xen.c	2006-07-19 16:27:09.000000000 +0200
++++ linux-2.6.17.noarch/arch/i386/kernel/time-xen.c	2006-07-19 21:49:54.000000000 +0200
+@@ -164,7 +164,9 @@ static int __init __permitted_clock_jitt
+ }
+ __setup("permitted_clock_jitter=", __permitted_clock_jitter);
+ 
++#ifndef CONFIG_X86
+ int tsc_disable __devinitdata = 0;
++#endif
+ 
+ static void delay_tsc(unsigned long loops)
+ {
+diff -urNp linux-2.6.17.previous/arch/i386/kernel/tsc.c linux-2.6.17.noarch/arch/i386/kernel/tsc.c
+--- linux-2.6.17.previous/arch/i386/kernel/tsc.c	2006-07-19 16:27:02.000000000 +0200
++++ linux-2.6.17.noarch/arch/i386/kernel/tsc.c	2006-07-19 21:49:03.000000000 +0200
+@@ -101,6 +101,7 @@ static inline unsigned long long cycles_
+ 	return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR;
+ }
+ 
++#ifndef CONFIG_XEN
+ /*
+  * Scheduler clock - returns current time in nanosec units.
+  */
+@@ -124,6 +125,7 @@ unsigned long long sched_clock(void)
+ 	/* return the value in ns */
+ 	return cycles_2_ns(this_offset);
+ }
++#endif
+ 
+ static unsigned long calculate_cpu_khz(void)
+ {
+diff -r 9ffbaea14aad arch/i386/kernel/asm-offsets.c
+--- a/arch/i386/kernel/asm-offsets.c	Wed Jul 19 15:55:00 2006 +0200
++++ b/arch/i386/kernel/asm-offsets.c	Fri Jul 21 06:34:30 2006 -0400
+@@ -55,7 +55,9 @@ void foo(void)
+ 	OFFSET(TI_preempt_count, thread_info, preempt_count);
+ 	OFFSET(TI_addr_limit, thread_info, addr_limit);
+ 	OFFSET(TI_restart_block, thread_info, restart_block);
++#ifndef CONFIG_XEN
+ 	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
++#endif
+ 	BLANK();
+ 
+ 	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
+diff -r 9ffbaea14aad arch/i386/kernel/entry-xen.S
+--- a/arch/i386/kernel/entry-xen.S	Wed Jul 19 15:55:00 2006 +0200
++++ b/arch/i386/kernel/entry-xen.S	Fri Jul 21 06:34:30 2006 -0400
+@@ -313,12 +313,16 @@ sysenter_past_esp:
+ 	pushl $(__USER_CS)
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	/*CFI_REL_OFFSET cs, 0*/
++#ifndef CONFIG_XEN
+ 	/*
+ 	 * 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)
++#else
++	pushl $SYSENTER_RETURN
++#endif
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	CFI_REL_OFFSET eip, 0
+ 
+diff -r 9ffbaea14aad arch/i386/kernel/entry.S
+--- a/arch/i386/kernel/entry.S	Wed Jul 19 15:55:00 2006 +0200
++++ b/arch/i386/kernel/entry.S	Fri Jul 21 06:34:30 2006 -0400
+@@ -288,7 +288,11 @@ sysenter_past_esp:
+ 	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
+ 	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
+ 	 */
++#ifndef CONFIG_XEN
+ 	pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
++#else
++	pusl $SYSENTER_RETURN
++#endif
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	CFI_REL_OFFSET eip, 0
+ 
+diff -r 9ffbaea14aad arch/i386/kernel/sysenter.c
+--- a/arch/i386/kernel/sysenter.c	Wed Jul 19 15:55:00 2006 +0200
++++ b/arch/i386/kernel/sysenter.c	Fri Jul 21 06:34:30 2006 -0400
+@@ -90,6 +90,7 @@ int __init sysenter_setup(void)
+ 	}
+ #endif
+ 
++#ifndef CONFIG_XEN
+ #ifdef CONFIG_COMPAT_VDSO
+ 	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY);
+ 	printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
+@@ -99,6 +100,7 @@ int __init sysenter_setup(void)
+ 	 */
+ 	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_KERNEL_RO);
+ #endif
++#endif
+ 
+ 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
+ 		memcpy(syscall_page,
+@@ -144,7 +146,11 @@ int arch_setup_additional_pages(struct l
+ 	int ret;
+ 
+ 	down_write(&mm->mmap_sem);
++#ifndef CONFIG_XEN
+ 	addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
++#else
++	addr = VDSO_BASE;
++#endif
+ 	if (IS_ERR_VALUE(addr)) {
+ 		ret = addr;
+ 		goto up_fail;
+diff -r 9ffbaea14aad include/asm-i386/elf.h
+--- a/include/asm-i386/elf.h	Wed Jul 19 15:55:00 2006 +0200
++++ b/include/asm-i386/elf.h	Fri Jul 21 06:34:30 2006 -0400
+@@ -130,15 +130,24 @@ extern int dump_task_extended_fpu (struc
+ #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
+ #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
+ 
++#ifndef CONFIG_XEN
+ #define VDSO_HIGH_BASE		(__fix_to_virt(FIX_VDSO))
+ #define VDSO_BASE		((unsigned long)current->mm->context.vdso)
++#else
++#define VDSO_HIGH_BASE		VDSO_BASE
++#define VDSO_BASE		(PAGE_OFFSET - 2*PAGE_SIZE)
++#endif
+ 
+ #ifdef CONFIG_COMPAT_VDSO
+ # define VDSO_COMPAT_BASE	VDSO_HIGH_BASE
+ # define VDSO_PRELINK		VDSO_HIGH_BASE
+ #else
+ # define VDSO_COMPAT_BASE	VDSO_BASE
++#ifndef CONFIG_XEN
+ # define VDSO_PRELINK		0
++#else
++# define VDSO_PRELINK		VDSO_BASE
++#endif
+ #endif
+ 
+ #define VDSO_COMPAT_SYM(x) \
+diff -r 9ffbaea14aad include/asm-i386/fixmap.h
+--- a/include/asm-i386/fixmap.h	Wed Jul 19 15:55:00 2006 +0200
++++ b/include/asm-i386/fixmap.h	Fri Jul 21 06:34:30 2006 -0400
+@@ -51,7 +51,9 @@ extern unsigned long __FIXADDR_TOP;
+  */
+ enum fixed_addresses {
+ 	FIX_HOLE,
++#ifndef CONFIG_XEN
+ 	FIX_VDSO,
++#endif
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
+ #endif
+diff -r 9ffbaea14aad include/asm-i386/mach-xen/asm/fixmap.h
+--- a/include/asm-i386/mach-xen/asm/fixmap.h	Wed Jul 19 15:55:00 2006 +0200
++++ b/include/asm-i386/mach-xen/asm/fixmap.h	Fri Jul 21 06:34:30 2006 -0400
+@@ -52,7 +52,9 @@ extern unsigned long __FIXADDR_TOP;
+  */
+ enum fixed_addresses {
+ 	FIX_HOLE,
++#ifndef CONFIG_XEN
+ 	FIX_VDSO,
++#endif
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
+ #endif



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:21:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:21:29 -0400
Subject: rpms/cryptix/devel cryptix.spec,1.7,1.8
Message-ID: <200607192021.k6JKLThj006284@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/cryptix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6065

Modified Files:
	cryptix.spec 
Log Message:
Merged with upstream version.



Index: cryptix.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cryptix.spec	19 Jul 2006 17:58:49 -0000	1.7
+++ cryptix.spec	19 Jul 2006 20:21:27 -0000	1.8
@@ -32,16 +32,13 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define name		cryptix
-%define version		3.2.0
-%define release		7jpp_1fc
 %define snapshot	20001002
 
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		cryptix
+Version:	3.2.0
+Release:	8jpp_1fc
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -134,8 +131,13 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 19 2006 Matt Weinge <mwringe at redhat.com> 3.2.0-8jpp_1rh
+- Merged with upstream verison.
+
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-8jpp
+- Removed separate definition of name, version, release
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-7jpp
-- Merged with upstream version
 - Added conditional native compiling
 
 * Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> 3.2.0-6jpp



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:22:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:22:44 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.3, 1.4 setroubleshoot.spec,
	1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200607192022.k6JKMiEw006826@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6791/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.8-1 on branch devel from setroubleshoot-0.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Jul 2006 14:15:12 -0000	1.3
+++ .cvsignore	19 Jul 2006 20:22:42 -0000	1.4
@@ -1 +1 @@
-setroubleshoot-0.7.tar.gz
+setroubleshoot-0.8.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setroubleshoot.spec	19 Jul 2006 18:34:50 -0000	1.5
+++ setroubleshoot.spec	19 Jul 2006 20:22:42 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.7
+Version: 0.8
 Release: 1
 License: GPL
 Group: Applications/System
@@ -86,10 +86,17 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.8-1
+- Added a bunch more plugins
+- From 2006-07-19  Karl MacMillan  <kmacmill at localhost.localdomain>
+- Add allow_cvs_read_shadow.py, allow_ftp_use_cifs, allow_ftp_use_nfs, and allow_gssd_read_tmp.
+- Change AVC to have additional helpers for matching messages.
+- Change Plugin to work better with more than one solution.
+
 * Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.7-1
-	* Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
-	* Remove toolbar from popup window since it did nothing, and I think it looks better without it.
-	* fix allow_execmod plugin to report better data.
+- Fix setroubleshoot_dispatcher to catch all information from avc.  Much cleaner interface and no longer uses audit2allow cruft.
+- Remove toolbar from popup window since it did nothing, and I think it looks better without it.
+- fix allow_execmod plugin to report better data.
 
 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jul 2006 18:22:01 -0000	1.5
+++ sources	19 Jul 2006 20:22:42 -0000	1.6
@@ -1 +1 @@
-1333a0721b17fe978a25af250f1cabfa  setroubleshoot-0.7.tar.gz
+69a6ff3f48ebc58e92d8b5872db35840  setroubleshoot-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:25:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:25:51 -0400
Subject: rpms/gtk2/devel gtk+-2.10.0-search.patch, 1.3, 1.4 gtk2.spec, 1.164,
	1.165
Message-ID: <200607192025.k6JKPprm008038@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6459

Modified Files:
	gtk+-2.10.0-search.patch gtk2.spec 
Log Message:
fix another search issue


gtk+-2.10.0-search.patch:
 gtkfilechooserdefault.c | 1441 ++++++++++++++++++++++++++++++++++++++++--------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1241 insertions(+), 242 deletions(-)

Index: gtk+-2.10.0-search.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.0-search.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk+-2.10.0-search.patch	18 Jul 2006 15:14:54 -0000	1.3
+++ gtk+-2.10.0-search.patch	19 Jul 2006 20:25:48 -0000	1.4
@@ -1,102 +1,5 @@
---- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-05-03 18:29:48.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-18 10:36:09.000000000 -0400
-@@ -147,6 +147,20 @@
-   LOCATION_MODE_FILENAME_ENTRY
- } LocationMode;
- 
-+typedef enum {
-+  OPERATION_MODE_BROWSE,
-+  OPERATION_MODE_SEARCH
-+} OperationMode;
-+
-+typedef struct _BeagleHit BeagleHit;
-+typedef struct _BeagleQuery BeagleQuery;
-+typedef struct _BeagleClient BeagleClient;
-+typedef struct _BeagleRequest BeagleRequest;
-+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
-+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
-+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
-+typedef struct _BeagleQueryPart BeagleQueryPart;
-+
- struct _GtkFileChooserDefault
- {
-   GtkVBox parent_instance;
-@@ -175,10 +189,18 @@
-   GtkWidget *browse_files_popup_menu_add_shortcut_item;
-   GtkWidget *browse_files_popup_menu_hidden_files_item;
-   GtkWidget *browse_new_folder_button;
-+  GtkWidget *browse_path_bar_hbox;
-   GtkWidget *browse_path_bar;
- 
-   GtkFileSystemModel *browse_files_model;
- 
-+  /* Widgets for searching */
-+  GtkWidget *search_hbox;
-+  GtkWidget *search_entry;
-+  BeagleClient *search_client;
-+  BeagleQuery *search_query;
-+  GtkListStore *search_model;
-+
-   GtkWidget *filter_combo_hbox;
-   GtkWidget *filter_combo;
-   GtkWidget *preview_box;
-@@ -194,7 +216,16 @@
-   LocationMode location_mode;
- 
-   GtkListStore *shortcuts_model;
--  GtkTreeModel *shortcuts_filter_model;
-+
-+  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
-+   * the separator that we use for the "Save in folder" combo.
-+   */
-+  GtkTreeModel *shortcuts_pane_filter_model;
-+  
-+  /* Filter for the "Save in folder" combo.  We filter out the Search row and
-+   * its separator.
-+   */
-+  GtkTreeModel *shortcuts_combo_filter_model;
- 
-   GtkTreeModelSort *sort_model;
- 
-@@ -213,6 +244,8 @@
-   ReloadState reload_state;
-   guint load_timeout_id;
- 
-+  OperationMode operation_mode;
-+
-   GSList *pending_select_paths;
- 
-   GtkFileFilter *current_filter;
-@@ -220,9 +253,6 @@
- 
-   GtkTooltips *tooltips;
- 
--  gboolean has_home;
--  gboolean has_desktop;
--
-   int num_volumes;
-   int num_shortcuts;
-   int num_bookmarks;
-@@ -237,6 +267,7 @@
- 
-   GtkTreeViewColumn *list_name_column;
-   GtkCellRenderer *list_name_renderer;
-+  GtkTreeViewColumn *list_mtime_column;
- 
-   GSource *edited_idle;
-   char *edited_new_text;
-@@ -264,6 +295,9 @@
-   guint changing_folder : 1;
-   guint shortcuts_current_folder_active : 1;
-   guint processing_pending_selections : 1;
-+  guint has_home : 1;
-+  guint has_desktop : 1;
-+  guint has_search : 1;
- 
- #if 0
-   guint shortcuts_drag_outside : 1;
 --- gtk+-2.10.0/gtk/gtkfilechooserdefault.c.search	2006-06-19 13:43:59.000000000 -0400
-+++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-18 10:46:35.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserdefault.c	2006-07-19 16:07:43.000000000 -0400
 @@ -78,6 +78,8 @@
  #include <errno.h>
  #include <string.h>
@@ -739,8 +642,8 @@
 +      GtkTreeIter child_iter;
 +
 +      gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER  (impl->shortcuts_combo_filter_model),
-+							&iter,
-+							&child_iter);
++							&child_iter,
++							&iter);
        gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
 -			  &iter, 
 +			  &child_iter, 
@@ -2483,3 +2386,100 @@
  			"child-model", child_model,
  			"virtual-root", root,
  			NULL);
+--- gtk+-2.10.0/gtk/gtkfilechooserprivate.h.search	2006-05-03 18:29:48.000000000 -0400
++++ gtk+-2.10.0/gtk/gtkfilechooserprivate.h	2006-07-19 16:00:34.000000000 -0400
+@@ -147,6 +147,20 @@
+   LOCATION_MODE_FILENAME_ENTRY
+ } LocationMode;
+ 
++typedef enum {
++  OPERATION_MODE_BROWSE,
++  OPERATION_MODE_SEARCH
++} OperationMode;
++
++typedef struct _BeagleHit BeagleHit;
++typedef struct _BeagleQuery BeagleQuery;
++typedef struct _BeagleClient BeagleClient;
++typedef struct _BeagleRequest BeagleRequest;
++typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
++typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
++typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
++typedef struct _BeagleQueryPart BeagleQueryPart;
++
+ struct _GtkFileChooserDefault
+ {
+   GtkVBox parent_instance;
+@@ -175,10 +189,18 @@
+   GtkWidget *browse_files_popup_menu_add_shortcut_item;
+   GtkWidget *browse_files_popup_menu_hidden_files_item;
+   GtkWidget *browse_new_folder_button;
++  GtkWidget *browse_path_bar_hbox;
+   GtkWidget *browse_path_bar;
+ 
+   GtkFileSystemModel *browse_files_model;
+ 
++  /* Widgets for searching */
++  GtkWidget *search_hbox;
++  GtkWidget *search_entry;
++  BeagleClient *search_client;
++  BeagleQuery *search_query;
++  GtkListStore *search_model;
++
+   GtkWidget *filter_combo_hbox;
+   GtkWidget *filter_combo;
+   GtkWidget *preview_box;
+@@ -194,7 +216,16 @@
+   LocationMode location_mode;
+ 
+   GtkListStore *shortcuts_model;
+-  GtkTreeModel *shortcuts_filter_model;
++
++  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
++   * the separator that we use for the "Save in folder" combo.
++   */
++  GtkTreeModel *shortcuts_pane_filter_model;
++  
++  /* Filter for the "Save in folder" combo.  We filter out the Search row and
++   * its separator.
++   */
++  GtkTreeModel *shortcuts_combo_filter_model;
+ 
+   GtkTreeModelSort *sort_model;
+ 
+@@ -213,6 +244,8 @@
+   ReloadState reload_state;
+   guint load_timeout_id;
+ 
++  OperationMode operation_mode;
++
+   GSList *pending_select_paths;
+ 
+   GtkFileFilter *current_filter;
+@@ -220,9 +253,6 @@
+ 
+   GtkTooltips *tooltips;
+ 
+-  gboolean has_home;
+-  gboolean has_desktop;
+-
+   int num_volumes;
+   int num_shortcuts;
+   int num_bookmarks;
+@@ -237,6 +267,7 @@
+ 
+   GtkTreeViewColumn *list_name_column;
+   GtkCellRenderer *list_name_renderer;
++  GtkTreeViewColumn *list_mtime_column;
+ 
+   GSource *edited_idle;
+   char *edited_new_text;
+@@ -264,6 +295,9 @@
+   guint changing_folder : 1;
+   guint shortcuts_current_folder_active : 1;
+   guint processing_pending_selections : 1;
++  guint has_home : 1;
++  guint has_desktop : 1;
++  guint has_search : 1;
+ 
+ #if 0
+   guint shortcuts_drag_outside : 1;


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gtk2.spec	18 Jul 2006 15:14:54 -0000	1.164
+++ gtk2.spec	19 Jul 2006 20:25:48 -0000	1.165
@@ -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
@@ -277,6 +277,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-5
+- Fix a typo in the Search support patch
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-4
 - Make the Search support more bulletproof
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:27:21 -0400
Subject: rpms/quagga/FC-4 quagga-0.98.5-pam.patch, NONE,
	1.1 quagga-0.98.5-pie.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 quagga.spec, 1.20, 1.21 sources, 1.11, 1.12
Message-ID: <200607192027.k6JKRLxr008650@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/quagga/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8577

Modified Files:
	.cvsignore quagga.spec sources 
Added Files:
	quagga-0.98.5-pam.patch quagga-0.98.5-pie.patch 
Log Message:
Upgrade to 0.98.6


quagga-0.98.5-pam.patch:
 quagga.pam |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE quagga-0.98.5-pam.patch ---
--- quagga-0.98.5/redhat/quagga.pam.old	2004-06-06 06:27:53.000000000 -0400
+++ quagga-0.98.5/redhat/quagga.pam	2005-10-10 17:47:44.000000000 -0400
@@ -4,12 +4,12 @@
 ##### if running quagga as root:
 # Only allow root (and possibly wheel) to use this because enable access
 # is unrestricted.
-auth       sufficient   /lib/security/$ISA/pam_rootok.so
+auth       sufficient   pam_rootok.so
 
 # Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth       sufficient   /lib/security/$ISA/pam_wheel.so trust use_uid
+#auth       sufficient   pam_wheel.so trust use_uid
 # Uncomment the following line to require a user to be in the "wheel" group.
-#auth       required     /lib/security/$ISA/pam_wheel.so use_uid
+#auth       required     pam_wheel.so use_uid
 ###########################################################
 
 # If using quagga privileges and with a seperate group for vty access, then
@@ -17,10 +17,10 @@
 # check for valid user/password, eg:
 #
 # only allow local users.
-#auth       required     /lib/security/$ISA/pam_securetty.so
-#auth       required     /lib/security/$ISA/pam_stack.so service=system-auth
-#auth       required     /lib/security/$ISA/pam_nologin.so
-#account    required     /lib/security/$ISA/pam_stack.so service=system-auth
-#password   required     /lib/security/$ISA/pam_stack.so service=system-auth
-#session    required     /lib/security/$ISA/pam_stack.so service=system-auth
-#session    optional     /lib/security/$ISA/pam_console.so
+#auth       required     pam_securetty.so
+#auth       include      system-auth
+#account    required     pam_nologin.so
+#account    include      system-auth
+#password   include      system-auth
+#session    include      system-auth
+#session    optional     pam_console.so

quagga-0.98.5-pie.patch:
 ltmain.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE quagga-0.98.5-pie.patch ---
--- quagga-0.98.5/ltmain.sh.pie	2005-10-18 23:03:50.000000000 -0400
+++ quagga-0.98.5/ltmain.sh	2005-10-18 23:04:05.000000000 -0400
@@ -723,7 +723,7 @@
 	command="$base_compile $srcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $srcfile -fPIC"
       fi
 
       if test ! -d "${xdir}$objdir"; then
@@ -803,7 +803,7 @@
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $srcfile -fPIC"
       else
 	command="$base_compile $srcfile $pic_flag"
       fi


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Apr 2005 18:15:16 -0000	1.11
+++ .cvsignore	19 Jul 2006 20:27:19 -0000	1.12
@@ -1 +1,2 @@
-quagga-0.98.3.tar.gz
+quagga-0.98.5.tar.gz
+quagga-0.98.6.tar.gz


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-4/quagga.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- quagga.spec	4 Apr 2005 18:15:16 -0000	1.20
+++ quagga.spec	19 Jul 2006 20:27:19 -0000	1.21
@@ -16,6 +16,7 @@
 %define		quagga_gid      92
 %define		quagga_user	quagga
 %define		vty_group	quaggavt
+%define		vty_gid		85
 
 # path defines
 %define		_sysconfdir	/etc/quagga
@@ -31,8 +32,8 @@
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.98.3
-Release: 2
+Version:	0.98.6
+Release: 1.fc4
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -42,11 +43,13 @@
 Patch1:         quagga-0.96.3-netlink.patch
 Patch2:		quagga-0.96.5-nostart.patch
 Patch4:		quagga-0.98.2-gcc4.patch
+Patch5:		quagga-0.98.5-pam.patch
+Patch6:		quagga-0.98.5-pie.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
-BuildRequires:	ucd-snmp-devel
-Prereq:		ucd-snmp
+BuildRequires:	net-snmp-devel
+Prereq:		net-snmp
 %endif
 %if %with_vtysh
 BuildRequires:	readline readline-devel ncurses ncurses-devel
@@ -97,9 +100,18 @@
 %patch1 -p1 -b .netlink
 %patch2 -p1 -b .nostart
 %patch4 -p1 -b .gcc4
+%patch5 -p1 -b .pam
+# This creates a .diff file that we apply after configuring
+%patch6 -p1
 
 %build
-CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
+# FC5+ automatic -fstack-protector-all switch
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+#./autogen.sh                                                                 
+export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
+
+%configure \
 %if %with_ipv6
 	--enable-ipv6 \
 %endif
@@ -147,10 +159,11 @@
 %if %with_rtadv
 	--enable-rtadv \
 %endif
---with-cflags="-O2" \
 --enable-netlink
 
-CFLAGS=-fPIE ; LDFLAGS=-pie ; make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
+for X in Makefile */Makefile ; do perl -pe 's/^COMPILE \= \$\(CC\) /COMPILE = \$(CC) -fPIE /;s/^LDFLAGS = $/LDFLAGS = -pie/' < $X > $X.tmp ; mv $X.tmp $X ; done
+
+make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
 
 pushd doc
 texi2html quagga.texi
@@ -184,7 +197,7 @@
 %pre
 # add vty_group
 %if %vty_group
-groupadd -r %vty_group 2> /dev/null || :
+groupadd -g %vty_gid -r %vty_group 2> /dev/null || :
 %endif
 # add quagga user and group
 %if %quagga_user
@@ -334,6 +347,12 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Jay Fenlason <fenlason at redhat.com> 0.98.6-1.fc4
+- Upgrade to 0.98.6 to close
+  bz#191081 CVE-2006-2223 Quagga RIPd information disclosure
+  bz#191085 CVE-2006-2224 Quagga RIPd route injection
+- Also backport other changes to this spec file
+
 * Mon Apr 4 2005 Jay Fenlason <fenlason at redhat.com> 0.98.3-2
 - new upstream verison.
 - remove the -bug157 patch.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/quagga/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Apr 2005 18:15:16 -0000	1.11
+++ sources	19 Jul 2006 20:27:19 -0000	1.12
@@ -1 +1 @@
-68be5e911e4d604c0f5959338263356e  quagga-0.98.3.tar.gz
+b0d4132039953a0214256873b7d23d68  quagga-0.98.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:27:26 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.30,
	1.31 selinux-policy.spec, 1.228, 1.229
Message-ID: <200607192027.k6JKRPfx008692@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8619

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-6
- Cups needs to be able to read domain state off of printer client


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  128 +++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 75 files changed, 763 insertions(+), 216 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policy-20060608.patch	19 Jul 2006 20:06:35 -0000	1.30
+++ policy-20060608.patch	19 Jul 2006 20:27:22 -0000	1.31
@@ -1,6 +1,25 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.3.3/policy/global_booleans
+--- nsaserefpolicy/policy/global_booleans	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_booleans	2006-07-19 15:59:32.000000000 -0400
+@@ -4,6 +4,7 @@
+ # file should be used.
+ #
+ 
++ifdef(`strict_policy',`
+ ## <desc>
+ ## <p>
+ ## Enabling secure mode disallows programs, such as
+@@ -12,6 +13,7 @@
+ ## </p>
+ ## </desc>
+ gen_bool(secure_mode,false)
++')
+ 
+ ## <desc>
+ ## <p>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
 --- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 15:08:53.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 16:01:14.000000000 -0400
 @@ -19,6 +19,14 @@
  
  ## <desc>
@@ -43,7 +62,21 @@
  
  ## <desc>
  ## <p>
-@@ -311,13 +320,6 @@
+@@ -290,13 +299,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow ssh to run from inetd instead of as a daemon.
+-## </p>
+-## </desc>
+-gen_tunable(run_ssh_inetd,false)
+-
+-## <desc>
+-## <p>
+ ## Allow samba to export user home directories.
+ ## </p>
+ ## </desc>
+@@ -311,13 +313,6 @@
  
  ## <desc>
  ## <p>
@@ -57,7 +90,7 @@
  ## Allow squid to connect to all ports, not just
  ## HTTP, FTP, and Gopher ports.
  ## </p>
-@@ -326,13 +328,6 @@
+@@ -326,13 +321,6 @@
  
  ## <desc>
  ## <p>
@@ -71,7 +104,7 @@
  ## Configure stunnel to be a standalone daemon or
  ## inetd service.
  ## </p>
-@@ -353,6 +348,12 @@
+@@ -353,6 +341,19 @@
  ## </desc>
  gen_tunable(use_samba_home_dirs,false)
  
@@ -81,6 +114,13 @@
 +#
 +
 +ifdef(`strict_policy',`
++## <desc>
++## <p>
++## Allow ssh to run from inetd instead of as a daemon.
++## </p>
++## </desc>
++gen_tunable(run_ssh_inetd,false)
++
  ## <desc>
  ## <p>
  ## Control users use of ping and traceroute
@@ -621,7 +661,7 @@
  kernel_read_kernel_sysctls(clamscan_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 14:44:51.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 16:27:33.000000000 -0400
 @@ -81,6 +81,7 @@
  allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
  allow cupsd_t self:unix_dgram_socket create_socket_perms;
@@ -630,7 +670,16 @@
  allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
  allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
  allow cupsd_t self:udp_socket create_socket_perms;
-@@ -202,7 +203,8 @@
+@@ -153,6 +154,8 @@
+ dev_read_sysfs(cupsd_t)
+ dev_read_usbfs(cupsd_t)
+ 
++domain_read_all_domains_state(cupsd_t)
++
+ fs_getattr_all_fs(cupsd_t)
+ fs_search_auto_mountpoints(cupsd_t)
+ # from old usercanread attrib:
+@@ -202,7 +205,8 @@
  # invoking ghostscript needs to read fonts
  miscfiles_read_fonts(cupsd_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- selinux-policy.spec	19 Jul 2006 20:06:35 -0000	1.228
+++ selinux-policy.spec	19 Jul 2006 20:27:22 -0000	1.229
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-6
+- Cups needs to be able to read domain state off of printer client
+
 * Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-5
 - add boolean to allow zebra to write config files
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:30:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:30:06 -0400
Subject: rpms/gdm/devel gdm-2.15.6-center-cursor.patch, NONE, 1.1 gdm.spec,
	1.181, 1.182
Message-ID: <200607192030.k6JKU69c009793@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9691

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.6-center-cursor.patch 
Log Message:
- center cursor on xinerama head (bug 180085)


gdm-2.15.6-center-cursor.patch:
 gdmwm.c           |    8 +++++++-
 gdmwm.h           |    4 ++++
 greeter/greeter.c |    1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE gdm-2.15.6-center-cursor.patch ---
--- gdm-2.15.6/gui/gdmwm.c
+++ gdm-2.15.6/gui/gdmwm.c
@@ -250,7 +250,13 @@ gdm_wm_center_window (GtkWindow *cw) 
  	gtk_window_move (GTK_WINDOW (cw), x, y);	
 }
 
-
+void
+gdm_wm_center_cursor (void)
+{
+    XWarpPointer (wm_disp, None, wm_root, 0, 0, 0, 0, 
+		  gdm_wm_screen.x + gdm_wm_screen.width / 2,
+		  gdm_wm_screen.y + gdm_wm_screen.height / 2);
+}
 
 static void
 trap_push (void)
--- gdm-2.15.6/gui/gdmwm.h
+++ gdm-2.15.6/gui/gdmwm.h
@@ -64,6 +64,10 @@ void	gdm_wm_set_screen		(int cur_screen_
  */
 void	gdm_wm_center_window		(GtkWindow *cw);
 
+/* Center mouse pointer
+ */
+void gdm_wm_center_cursor (void);
+
 /*
  * Save and restore stacking order, useful for restarting
  * the greeter
--- gdm-2.15.6/gui/greeter/greeter.c
+++ gdm-2.15.6/gui/greeter/greeter.c
@@ -1432,6 +1432,7 @@ main (int argc, char *argv[])
      gdm_config_get_string (GDM_KEY_INFO_MSG_FONT));
 
   gdm_common_setup_cursor (GDK_LEFT_PTR);
+  gdm_wm_center_cursor ();
   gdm_common_pre_fetch_launch ();
   gtk_main ();
 


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- gdm.spec	19 Jul 2006 02:38:06 -0000	1.181
+++ gdm.spec	19 Jul 2006 20:30:03 -0000	1.182
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 9
+Release: 10
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -50,6 +50,7 @@
 Patch22: gdm-2.15.6-session-keyring.patch
 Patch23: gdm-2.15.6-fix-setup-hang.patch
 Patch24: gdm-2.15.6-wtmp.patch
+Patch25: gdm-2.15.6-center-cursor.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -133,6 +134,7 @@
 %patch22 -p1 -b .session-keyring
 %patch23 -p1 -b .fix-setup-hang
 %patch24 -p1 -b .wtmp
+%patch25 -p1 -b .center-cursor
 
 # 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
@@ -329,6 +331,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Jul 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-10
+- center cursor on xinerama head (bug 180085)
+
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-9
 - add "kill all sessions on token removal" feature
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:38:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:38:02 -0400
Subject: rpms/sip/devel .cvsignore, 1.14, 1.15 sip.spec, 1.28, 1.29 sources,
	1.14, 1.15
Message-ID: <200607192038.k6JKc2wJ011234@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11169

Modified Files:
	.cvsignore sip.spec sources 
Log Message:
update to 4.4.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	27 Apr 2006 10:04:57 -0000	1.14
+++ .cvsignore	19 Jul 2006 20:38:00 -0000	1.15
@@ -4,3 +4,4 @@
 sip-4.2.1.tar.gz
 sip-4.3.1.tar.gz
 sip-4.4.3.tar.gz
+sip-4.4.5.tar.gz


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sip.spec	17 Jul 2006 21:47:56 -0000	1.28
+++ sip.spec	19 Jul 2006 20:38:00 -0000	1.29
@@ -1,4 +1,4 @@
-%define pythonver 2.4
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define pythonsitedir %{_libdir}/python%{pythonver}/site-packages
 %define pythonpkg python
 %define minor .2
@@ -14,17 +14,17 @@
 
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
-Version: 4.4.3
-Release: 2
+Version: 4.4.5
+Release: 1
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-%{version}.tar.gz
 
-BuildPrereq: %{pythonpkg}-devel >= %{pythonver}
-BuildPrereq: %{qtpkg}-devel >= %{qtver}
-BuildPrereq: sed
+BuildRequires: %{pythonpkg}-devel >= %{pythonver}
+BuildRequires: %{qtpkg}-devel >= %{qtver}
+BuildRequires: sed
 
 Requires: %{pythonpkg} >= %{pythonver}
 
@@ -83,6 +83,9 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Wed Jul 19 2006 Than Ngo <than at redhat.com> 4.4.5-1
+- update to 4.4.5
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 4.4.3-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	27 Apr 2006 10:04:57 -0000	1.14
+++ sources	19 Jul 2006 20:38:00 -0000	1.15
@@ -1 +1 @@
-7465a9cf8e1f280425ab8f9f6e85b888  sip-4.4.3.tar.gz
+ba334c4412cee1dbc6c56ff9a58e7bb0  sip-4.4.5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:44:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:44:34 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.20,1.21
Message-ID: <200607192044.k6JKiYMJ013517@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13454

Modified Files:
	avalon-logkit.spec 
Log Message:

Added conditional native compilation.
Removed name/release/version defines as applicable.




Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- avalon-logkit.spec	19 Jul 2006 14:20:48 -0000	1.20
+++ avalon-logkit.spec	19 Jul 2006 20:44:32 -0000	1.21
@@ -1,24 +1,56 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define short_name      logkit
-%define short_Name      LogKit
-%define name		avalon-%{short_name}
-%define version		1.2
-%define release		3jpp_6fc
+%define camelcase_short_name      LogKit
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		avalon-%{short_name}
+Version:	1.2
+Release:	4jpp_1fc
 Epoch:		0
 Summary:	Java logging toolkit
 License:	Apache Software License
 Group:		Development/Libraries/Java
 Url:		http://avalon.apache.org/%{short_name}/
-Source0:	http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-src.tar.gz
+#http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-src.tar.gz
+Source0:	LogKit-1.2-src.tar.gz
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-javadoc.patch
 Patch2:		%{name}-notarget.patch
 Requires:	avalon-framework >= 0:4.1.4
-Requires:	servletapi5
+Requires:	servlet
 Requires:	jms
 Requires:	jdbc-stdext
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -27,12 +59,20 @@
 BuildRequires:  junit
 BuildRequires:  log4j
 BuildRequires:	avalon-framework >= 0:4.1.4
-BuildRequires:	servletapi5
+BuildRequires:	servlet
 BuildRequires:	jms
 BuildRequires:	jdbc-stdext
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 LogKit is a logging toolkit designed for secure performance orientated
 logging in applications. To get started using LogKit, it is recomended
@@ -41,22 +81,23 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{short_Name}-%{version}
-%patch
+%setup -q -n %{camelcase_short_name}-%{version}
+
+%patch0
 %patch1 -p1
 %patch2 -p1
+
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servletapi5 jdbc-stdext avalon-framework junit):$PWD/build/classes
+export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
 ant clean jar javadocs
 
 %install
@@ -68,6 +109,10 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,54 +125,43 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc KEYS LICENSE
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3jpp_6fc
-- Build on all archs.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2-3jpp_5fc
-- rebuild
-
-* Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2-3jpp_4fc
-- ecluded s390[x] and ppc64 due to eclipse
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2-3jpp_3fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.2-3jpp_2fc
-- bump again
-
-* Wed Dec 14 2005 Jesse Keating <jkeating at redhat.com> 
-- bump for new gcj
-- change to not use target= in build.xml
-
-* Mon Jul  4 2005 Gary Benson <gbenson at redhat.com> 0:1.2-3jpp_1fc
-- Reenable building of classes that require jms.
-- Build with servletapi5.
-
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_4fc
-- Reenable building of classes that require swing (#130006).
-
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_3fc
-- Build into Fedora.
-
-* Thu Oct 28 2004 Gary Benson <gbenson at redhat.com> 0:1.2-2jpp_2fc
-- Bootstrap into Fedora.
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2-4jpp_1fc
+- Added conditional native compilation.
+- Removed name/release/version defines as applicable.
 
 * Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-3jpp
 - Build with ant-1.6.2
 
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.2-2jpp_1rh
-- RH vacuuming
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.2-2jpp
 - update for JPackage 1.5
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:46:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:46:28 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.23, 1.24 rhpxl.spec, 1.27,
	1.28 sources, 1.26, 1.27
Message-ID: <200607192046.k6JKkSxn022426@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21867

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	18 Jul 2006 20:19:54 -0000	1.23
+++ .cvsignore	19 Jul 2006 20:46:26 -0000	1.24
@@ -1,3 +1,4 @@
 rhpxl-0.18.tar.gz
 rhpxl-0.19.tar.gz
 rhpxl-0.20.tar.gz
+rhpxl-0.21.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rhpxl.spec	18 Jul 2006 20:38:23 -0000	1.27
+++ rhpxl.spec	19 Jul 2006 20:46:26 -0000	1.28
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.20
+Version: 0.21
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 0.21-1
+- Don't traceback if no monitor, screen, or device is found in the
+  X config file.
+
 * Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 0.20-1
 - Remove code for config sections that X can figure out for itself.
 - Use python randr bindings to change resolution (bindings based on code


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 Jul 2006 20:38:23 -0000	1.26
+++ sources	19 Jul 2006 20:46:26 -0000	1.27
@@ -1 +1 @@
-cbf0a86f1348106eec639842cddb1a9d  rhpxl-0.20.tar.gz
+ae9bafab5a755e085f92a79e63f7e579  rhpxl-0.21.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 20:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 16:47:42 -0400
Subject: rpms/PyQt/devel PyQt.spec,1.31,1.32
Message-ID: <200607192047.k6JKlgvB029484@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29438

Modified Files:
	PyQt.spec 
Log Message:
rebuid against sip-4.4.5



Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PyQt.spec	17 Jul 2006 22:05:02 -0000	1.31
+++ PyQt.spec	19 Jul 2006 20:47:40 -0000	1.32
@@ -1,11 +1,12 @@
-%define pythonver 2.4
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
+
 %define pythonsitedir %{_libdir}/python%{pythonver}/site-packages
 %define pythonpkg python
 %define minor %{nil}
 
-%define qtversion 3.3.5
+%define qtversion 3.3.6
 %define qtpkg qt
-%define sip_version 4.4.3
+%define sip_version 4.4.5
 
 %if "%{pythonver}" == "2.4"
 %define pythonprog /usr/bin/python2.4
@@ -16,24 +17,22 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.16
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-x11-gpl-%{version}.tar.gz
 
-BuildPrereq: qt-MySQL >= %{qtversion}
-BuildPrereq: qt-PostgreSQL >= %{qtversion}
-BuildPrereq: qt-ODBC >= %{qtversion}
-BuildPrereq: sip-devel >= %{sip_version}
-BuildPrereq: qt-devel >= %{qtversion}
-BuildPrereq: %{pythonpkg}-devel >= %{pythonver}%{minor}
-BuildPrereq: libGL-devel
-BuildPrereq: libGLU-devel
-BuildPrereq: libXmu-devel
-
+BuildRequires: qt-MySQL >= %{qtversion}
+BuildRequires: qt-PostgreSQL >= %{qtversion}
+BuildRequires: qt-ODBC >= %{qtversion}
+BuildRequires: sip-devel >= %{sip_version}
+BuildRequires: qt-devel >= %{qtversion}
+BuildRequires: %{pythonpkg}-devel >= %{pythonver}%{minor}
+BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
+BuildRequires: libXmu-devel
 
 Requires: %{pythonpkg} >= %{pythonver}%{minor}
 Requires: qt >= %{qtversion}
@@ -99,6 +98,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Wed Jul 19 2006 Than Ngo <than at redhat.com> 3.16-4
+- rebuid against sip-4.4.5
+
 * Tue Jul 18 2006 Than Ngo <than at redhat.com> 3.16-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:04:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:04:11 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.15, 1.16 pyxf86config.spec,
	1.29, 1.30 sources, 1.15, 1.16
Message-ID: <200607192104.k6JL4BBt008435@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8419

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	18 Jul 2006 18:07:41 -0000	1.15
+++ .cvsignore	19 Jul 2006 21:04:03 -0000	1.16
@@ -2,3 +2,4 @@
 pyxf86config-0.3.23.tar.gz
 pyxf86config-0.3.24.tar.gz
 pyxf86config-0.3.25.tar.gz
+pyxf86config-0.3.26.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pyxf86config.spec	18 Jul 2006 18:07:41 -0000	1.29
+++ pyxf86config.spec	19 Jul 2006 21:04:09 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.25
+Version: 0.3.26
 Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 0.3.26-1
+- Don't traceback when given empty section identifiers.
+
 * Tue Jul 18 2006 Chris Lumens <clumens at redhat.com> 0.3.25-1
 - Remove unneeded X config sections from template generation.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	18 Jul 2006 18:07:41 -0000	1.15
+++ sources	19 Jul 2006 21:04:09 -0000	1.16
@@ -1 +1 @@
-2e29f82f357f77e8443e8ff8fabd4389  pyxf86config-0.3.25.tar.gz
+310b1b167df0bd67b9a42b7553f015e2  pyxf86config-0.3.26.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:04:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:04:27 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.30, 1.31
Message-ID: <200607192104.k6JL4Rpg008493@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8447

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
Merged with upstream version



Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jakarta-commons-digester.spec	17 Jul 2006 22:18:22 -0000	1.30
+++ jakarta-commons-digester.spec	19 Jul 2006 21:04:21 -0000	1.31
@@ -34,14 +34,11 @@
 
 %define base_name       digester
 %define short_name      commons-%{base_name}
-%define name            jakarta-%{short_name}
-%define version         1.7
-%define release         3jpp_1fc
 %define section         free
 
-Name:           %{name}
-Version:        %{version}
-Release:        %{release}
+Name:           jakarta-%{short_name}
+Version:        1.7
+Release:        4jpp_1fc
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -155,7 +152,13 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-3jpp_1fc
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-4jpp_1fc
+- Merged with upstream version
+
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-4jpp
+- Removed separate definition of name, version and release.
+
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-3jpp
 - Added conditional native compiling
 
 * Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7-2jpp



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:05:55 -0400
Subject: rpms/bind/FC-5 bind-9.3.2-9_3_3_bind.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dig.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dns.patch, NONE,
	1.1 bind-9.3.2-9_3_3_dnssec.patch, NONE,
	1.1 bind-9.3.2-9_3_3_isc.patch, NONE,
	1.1 bind-9.3.2-9_3_3_isccfg.patch, NONE,
	1.1 bind-9.3.2-9_3_3_lwres.patch, NONE,
	1.1 bind-9.3.2-9_3_3_named.patch, NONE,
	1.1 bind-9.3.2-9_3_3_nsupdate.patch, NONE,
	1.1 bind-9.3.2-9_3_3_resolver.patch, NONE,
	1.1 bind-9.3.2-9_3_3_tests.patch, NONE,
	1.1 bind-9.3.2-9_3_3_validator.patch, NONE,
	1.1 bind-9.3.2-ch1991_rt15813.patch, NONE,
	1.1 bind-9.3.2-ch1994_rt15694.patch, NONE,
	1.1 bind-9.3.2-ch1997_rt15818.patch, NONE,
	1.1 bind-9.3.2-ch2009_rt15808.patch, NONE,
	1.1 bind-9.3.2-ch2013_rt15941.patch, NONE,
	1.1 bind-9.3.2-ch2024_rt16027.patch, NONE,
	1.1 bind-chroot-admin.in, 1.6, 1.7 bind.spec, 1.103,
	1.104 named.conf.sample, 1.1, 1.2 named.init, 1.42, 1.43
Message-ID: <200607192105.k6JL5tNb008600@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8578

Modified Files:
	bind-chroot-admin.in bind.spec named.conf.sample named.init 
Added Files:
	bind-9.3.2-9_3_3_bind.patch bind-9.3.2-9_3_3_dig.patch 
	bind-9.3.2-9_3_3_dns.patch bind-9.3.2-9_3_3_dnssec.patch 
	bind-9.3.2-9_3_3_isc.patch bind-9.3.2-9_3_3_isccfg.patch 
	bind-9.3.2-9_3_3_lwres.patch bind-9.3.2-9_3_3_named.patch 
	bind-9.3.2-9_3_3_nsupdate.patch 
	bind-9.3.2-9_3_3_resolver.patch bind-9.3.2-9_3_3_tests.patch 
	bind-9.3.2-9_3_3_validator.patch 
	bind-9.3.2-ch1991_rt15813.patch 
	bind-9.3.2-ch1994_rt15694.patch 
	bind-9.3.2-ch1997_rt15818.patch 
	bind-9.3.2-ch2009_rt15808.patch 
	bind-9.3.2-ch2013_rt15941.patch 
	bind-9.3.2-ch2024_rt16027.patch 
Log Message:
fix bugs 196398, 191093, 189789, 196962, apply upstream v9.3.3b1 bug fix backports

bind-9.3.2-9_3_3_bind.patch:
 dst/dst_api.c                 |   23 +++++++++++++----------
 dst/hmac_link.c               |   25 ++++++++++++++-----------
 dst/support.c                 |    2 +-
 include/arpa/nameser_compat.h |    7 ++++---
 include/netdb.h               |    4 ++--
 irs/dns.c                     |    4 ++--
 irs/dns_ho.c                  |   22 ++++++++++------------
 irs/gai_strerror.c            |   25 +++++++++++++++++++------
 irs/gen_ho.c                  |    4 +---
 irs/getaddrinfo.c             |   16 ++++++----------
 irs/gethostent.c              |    4 ++--
 irs/getnameinfo.c             |   10 ++++++++++
 irs/irp.c                     |    7 +++++--
 irs/irp_nw.c                  |    4 +++-
 irs/irpmarshall.c             |    6 +++---
 irs/irs_data.c                |   25 +++++++++++++++++++------
 irs/lcl_ho.c                  |    4 ++--
 irs/lcl_pr.c                  |   10 +++++++++-
 isc/ev_connects.c             |   10 +++++-----
 isc/eventlib.c                |    9 +++------
 isc/eventlib_p.h              |    4 +++-
 isc/heap.c                    |    8 ++++++--
 isc/hex.c                     |    5 +++--
 nameser/ns_sign.c             |    7 +++++--
 nameser/ns_verify.c           |    6 ++++--
 resolv/mtctxres.c             |    7 ++++---
 resolv/res_query.c            |    2 --
 resolv/res_send.c             |   14 +++++++-------
 resolv/res_sendsigned.c       |    5 +++--
 29 files changed, 168 insertions(+), 111 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_bind.patch ---
--- bind-9.3.2/lib/bind/nameser/ns_verify.c.9_3_3_bind	2005-10-10 20:48:16.000000000 -0400
+++ bind-9.3.2/lib/bind/nameser/ns_verify.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.2 2005/10/11 00:48:16 marka Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -343,7 +343,7 @@
 	HEADER *hp = (HEADER *)msg;
 	u_char *recstart, *sigstart;
 	unsigned int sigfieldlen, otherfieldlen;
-	u_char *cp, *eom = msg + *msglen, *cp2;
+	u_char *cp, *eom, *cp2;
 	char name[MAXDNAME], alg[MAXDNAME];
 	u_char buf[MAXDNAME];
 	int n, type, length, fudge, error;
@@ -352,6 +352,8 @@
 	if (msg == NULL || msglen == NULL || state == NULL)
 		return (-1);
 
+	eom = msg + *msglen;
+
 	state->counter++;
 	if (state->counter == 0)
 		return (ns_verify(msg, msglen, state->key,
--- bind-9.3.2/lib/bind/nameser/ns_sign.c.9_3_3_bind	2004-03-09 03:33:45.000000000 -0500
+++ bind-9.3.2/lib/bind/nameser/ns_sign.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.1 2004/03/09 08:33:45 marka Exp $";
+static const char rcsid[] = "$Id: ns_sign.c,v 1.1.2.2.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -89,7 +89,7 @@
 {
 	HEADER *hp = (HEADER *)msg;
 	DST_KEY *key = (DST_KEY *)k;
-	u_char *cp = msg + *msglen, *eob = msg + msgsize;
+	u_char *cp, *eob;
 	u_char *lenp;
 	u_char *alg;
 	int n;
@@ -100,6 +100,9 @@
 	if (msg == NULL || msglen == NULL || sig == NULL || siglen == NULL)
 		return (-1);
 
+	cp = msg + *msglen;
+	eob = msg + msgsize;
+
 	/* Name. */
 	if (key != NULL && error != ns_r_badsig && error != ns_r_badkey) {
 		n = ns_name_pton(key->dk_key_name, name, sizeof name);
--- bind-9.3.2/lib/bind/irs/irp_nw.c.9_3_3_bind	2004-03-09 03:33:37.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irp_nw.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.1 2004/03/09 08:33:37 marka Exp $";
+static const char rcsid[] = "$Id: irp_nw.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -319,6 +319,8 @@
 		nw = NULL;
 	}
 
+	if (body != NULL)
+		memput(body, bodylen);
 	return (nw);
 }
 
--- bind-9.3.2/lib/bind/irs/lcl_ho.c.9_3_3_bind	2004-03-16 19:29:50.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/lcl_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.2 2004/03/17 00:29:50 marka Exp $";
+static const char rcsid[] = "$Id: lcl_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -541,7 +541,7 @@
 		ai = hostent2addrinfo(hp, pai);
 		if (ai) {
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
 		}
 	}
--- bind-9.3.2/lib/bind/irs/dns_ho.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/dns_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.6 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.7.4.8 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -218,8 +218,7 @@
 	ho_minimize(this);
 	if (pvt->res && pvt->free_res)
 		(*pvt->free_res)(pvt->res);
-	if (pvt)
-		memput(pvt, sizeof *pvt);
+	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
 
@@ -260,7 +259,7 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
+	memset(q, 0, sizeof(*q));
 
 	switch (af) {
 	case AF_INET:
@@ -352,8 +351,8 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q));
+	memset(q2, 0, sizeof(*q2));
 
 	if (af == AF_INET6 && len == IN6ADDRSZ &&
 	    (!memcmp(uaddr, mapped, sizeof mapped) ||
@@ -578,8 +577,8 @@
 		errno = ENOMEM;
 		goto cleanup;
 	}
-	memset(q, 0, sizeof(q2));
-	memset(q2, 0, sizeof(q2));
+	memset(q, 0, sizeof(*q2));
+	memset(q2, 0, sizeof(*q2));
 
 	switch (pai->ai_family) {
 	case AF_UNSPEC:
@@ -649,10 +648,9 @@
 		if (ai) {
 			querystate = RESQRY_SUCCESS;
 			cur->ai_next = ai;
-			while (cur && cur->ai_next)
+			while (cur->ai_next)
 				cur = cur->ai_next;
-		}
-		else
+		} else
 			querystate = RESQRY_FAIL;
 	}
 
@@ -948,7 +946,7 @@
 				continue;
 			}
 			if (ret_aip) { /* need addrinfo. keep it. */
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else if (cur->ai_next) { /* need hostent */
 				struct addrinfo *aip = cur->ai_next;
--- bind-9.3.2/lib/bind/irs/gai_strerror.c.9_3_3_bind	2004-11-29 20:15:43.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gai_strerror.c	2006-03-09 19:17:21.000000000 -0500
@@ -66,18 +66,26 @@
 
 #ifdef DO_PTHREADS
         if (!once) {
-                pthread_mutex_lock(&lock);
-                if (!once++)
-                        pthread_key_create(&key, free);
-                pthread_mutex_unlock(&lock);
+                if (pthread_mutex_lock(&lock) != 0)
+			goto unknown;
+                if (!once) {
+                        if (pthread_key_create(&key, free) != 0)
+				goto unknown;
+			once = 1;
+		}
+                if (pthread_mutex_unlock(&lock) != 0)
+			goto unknown;
         }
 
 	buf = pthread_getspecific(key);
         if (buf == NULL) {
 		buf = malloc(EAI_BUFSIZE);
                 if (buf == NULL)
-                        return ("unknown error");
-                pthread_setspecific(key, buf);
+                        goto unknown;
+                if (pthread_setspecific(key, buf) != 0) {
+			free(buf);
+			goto unknown;
+		}
         }
 #endif
 	/* 
@@ -86,4 +94,9 @@
 	 */
 	sprintf(buf, "%s: %d", gai_errlist[gai_nerr - 1], ecode);
 	return (buf);
+
+#ifdef DO_PTHREADS
+ unknown:
+	return ("unknown error");
+#endif
 }
--- bind-9.3.2/lib/bind/irs/gethostent.c.9_3_3_bind	2004-03-16 20:49:40.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gethostent.c	2006-01-10 00:09:16.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.2 2004/03/17 01:49:40 marka Exp $";
+static const char rcsid[] = "$Id: gethostent.c,v 1.1.2.2.4.3 2006/01/10 05:09:16 marka Exp $";
 #endif
 
 /* Imports */
@@ -608,7 +608,7 @@
 }
 #endif
 
-#ifdef __linux
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
 #ifndef IF_NAMESIZE
 # ifdef IFNAMSIZ
 #  define IF_NAMESIZE  IFNAMSIZ
--- bind-9.3.2/lib/bind/irs/dns.c.9_3_3_bind	2004-03-16 19:29:47.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/dns.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns.c,v 1.1.206.2 2004/03/17 00:29:47 marka Exp $";
+static const char rcsid[] = "$Id: dns.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -114,7 +114,7 @@
 		res = (struct __res_state *)malloc(sizeof *res);
 		if (res == NULL)
 			return (NULL);
-		memset(dns->res, 0, sizeof *dns->res);
+		memset(res, 0, sizeof *res);
 		dns_res_set(this, res, free);
 	}
 
--- bind-9.3.2/lib/bind/irs/gen_ho.c.9_3_3_bind	2004-03-16 20:49:39.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/gen_ho.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.2 2004/03/17 01:49:39 marka Exp $";
+static const char rcsid[] = "$Id: gen_ho.c,v 1.1.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports */
@@ -371,8 +371,6 @@
 	}
 	if (softerror != 0 && pvt->res->res_h_errno == HOST_NOT_FOUND)
 		RES_SET_H_ERRNO(pvt->res, therrno);
-	if (rval)
-		freeaddrinfo(rval);
 	return (NULL);
 }
 
--- bind-9.3.2/lib/bind/irs/irpmarshall.c.9_3_3_bind	2004-03-16 20:13:34.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irpmarshall.c	2006-03-09 19:17:21.000000000 -0500
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.3 2004/03/17 01:13:34 marka Exp $";
+static const char rcsid[] = "$Id: irpmarshall.c,v 1.3.206.4 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #if 0
@@ -1020,7 +1020,7 @@
 	int hoaddrtype;
 	int holength;
 	long t;
-	char *name = NULL;
+	char *name;
 	char **aliases = NULL;
 	char **hohaddrlist = NULL;
 	size_t hoaddrsize;
@@ -1143,6 +1143,7 @@
 	errno = myerrno;
 
 	if (name != NULL) free(name);
+	free_array(hohaddrlist, 0);
 	free_array(aliases, 0);
 
 	return (-1);
@@ -1313,7 +1314,6 @@
 
 	if (host != NULL) free(host);
 	if (user != NULL) free(user);
-	if (domain != NULL) free(domain);
 
 	return (-1);
 }
--- bind-9.3.2/lib/bind/irs/irp.c.9_3_3_bind	2004-03-16 20:49:41.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/irp.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.2 2004/03/17 01:49:41 marka Exp $";
+static const char rcsid[] = "$Id: irp.c,v 1.3.2.1.10.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Imports */
@@ -425,6 +425,9 @@
 	char *buffer = memget(len);
 	int idx = 0;
 
+	if (buffer == NULL)
+		return (NULL);
+
 	for (;;) {
 		if (irs_irp_read_line(pvt, line, sizeof line) <= 0 ||
 		    strchr(line, '\n') == NULL)
@@ -517,7 +520,7 @@
  * int irs_irp_send_command(struct irp_p *pvt, const char *fmt, ...);
  *
  *	Sends command to remote connected via the PVT
- *	struture. FMT and args after it are fprintf-like
+ *	structure. FMT and args after it are fprintf-like
  *	arguments for formatting.
  *
  * Returns:
--- bind-9.3.2/lib/bind/irs/getnameinfo.c.9_3_3_bind	2004-06-24 20:35:00.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/getnameinfo.c	2006-01-10 00:09:16.000000000 -0500
@@ -3,6 +3,16 @@
  * - Thread safe-ness must be checked
  */
 
+#if ( defined(__linux__) || defined(__linux) || defined(LINUX) )
+#ifndef IF_NAMESIZE
+# ifdef IFNAMSIZ
+#  define IF_NAMESIZE  IFNAMSIZ
+# else
+#  define IF_NAMESIZE 16
+# endif
+#endif
+#endif
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
--- bind-9.3.2/lib/bind/irs/lcl_pr.c.9_3_3_bind	2004-03-09 03:33:38.000000000 -0500
+++ bind-9.3.2/lib/bind/irs/lcl_pr.c	2006-03-09 19:17:21.000000000 -0500
@@ -49,7 +49,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.1 2004/03/09 08:33:38 marka Exp $";
+static const char rcsid[] = "$Id: lcl_pr.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* extern */
@@ -85,6 +85,7 @@
 struct pvt {
 	FILE *		fp;
 	char		line[BUFSIZ+1];
+	char *		dbuf;
 	struct protoent	proto;
 	char *		proto_aliases[MAXALIASES];
 };
@@ -141,6 +142,8 @@
 
 	if (pvt->fp)
 		(void) fclose(pvt->fp);
+	if (pvt->dbuf)
+		free(pvt->dbuf);
 	memput(pvt, sizeof *pvt);
 	memput(this, sizeof *this);
 }
@@ -202,6 +205,10 @@
 		pr_rewind(this);
 	if (!pvt->fp)
 		return (NULL);
+	if (pvt->dbuf) {
+		free(pvt->dbuf);
+		pvt->dbuf = NULL;
+	}
 	bufp = pvt->line;
 	bufsiz = BUFSIZ;
 	offset = 0;
@@ -270,6 +277,7 @@
 		}
 	}
 	*q = NULL;
+	pvt->dbuf = dbuf;
 	return (&pvt->proto);
 }
 
--- bind-9.3.2/lib/bind/irs/irs_data.c.9_3_3_bind	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/irs_data.c	2006-03-09 19:17:21.000000000 -0500
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.3 2004/11/30 01:15:43 marka Exp $";
+static const char rcsid[] = "$Id: irs_data.c,v 1.3.2.2.4.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -128,10 +128,15 @@
 	struct net_data *net_data;
 
 	if (!once) {
-		pthread_mutex_lock(&keylock);
-		if (!once++)
-			pthread_key_create(&key, net_data_destroy);
-		pthread_mutex_unlock(&keylock);
+		if (pthread_mutex_lock(&keylock) != 0)
+			return (NULL);
+		if (!once) {
+			if (pthread_key_create(&key, net_data_destroy) != 0)
+				return (NULL);
+			once = 1;
+		}
+		if (pthread_mutex_unlock(&keylock) != 0)
+			return (NULL);
 	}
 	net_data = pthread_getspecific(key);
 #endif
@@ -141,7 +146,10 @@
 		if (net_data == NULL)
 			return (NULL);
 #ifdef	DO_PTHREADS
-		pthread_setspecific(key, net_data);
+		if (pthread_setspecific(key, net_data) != 0) {
+			net_data_destroy(net_data);
+			return (NULL);
+		}
 #endif
 	}
 
@@ -222,7 +230,12 @@
 void
 __h_errno_set(struct __res_state *res, int err) {
 
+
+#if (__GLIBC__ > 2 || __GLIBC__ == 2 &&  __GLIBC_MINOR__ >= 3)
+	res->res_h_errno = err;
+#else
 	h_errno = res->res_h_errno = err;
+#endif
 }
 
 #endif /*__BIND_NOSTATIC*/
--- bind-9.3.2/lib/bind/irs/getaddrinfo.c.9_3_3_bind	2005-07-28 03:43:19.000000000 -0400
+++ bind-9.3.2/lib/bind/irs/getaddrinfo.c	2006-03-09 19:17:21.000000000 -0500
@@ -332,7 +332,7 @@
 	pai->ai_family = PF_UNSPEC;
 	pai->ai_socktype = ANY;
 	pai->ai_protocol = ANY;
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 	/*
 	 * clear _ai_pad to preserve binary
 	 * compatibility with previously compiled 64-bit
@@ -340,7 +340,7 @@
 	 * guaranteeing the upper 32-bits are empty.
 	 */
 	pai->_ai_pad = 0;
-#endif /* __sparcv9 */
+#endif
 	pai->ai_addrlen = 0;
 	pai->ai_canonname = NULL;
 	pai->ai_addr = NULL;
@@ -365,7 +365,7 @@
 		}
 		memcpy(pai, hints, sizeof(*pai));
 
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 		/*
 		 * We need to clear _ai_pad to preserve binary
 		 * compatibility.  See prior comment.
@@ -576,10 +576,6 @@
 
 	freeaddrinfo(afai);	/* afai must not be NULL at this point. */
 
-	/* we must not have got any errors. */
-	if (error != 0) /* just for diagnosis */
-		abort();
-
 	if (sentinel.ai_next) {
 good:
 		*res = sentinel.ai_next;
@@ -804,7 +800,7 @@
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -817,7 +813,7 @@
 			    pai->ai_family == PF_UNSPEC /*?*/) {
 				GET_AI(cur->ai_next, afd, pton);
 				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
+				while (cur->ai_next)
 					cur = cur->ai_next;
 			} else
 				ERR(EAI_FAMILY);	/*xxx*/
@@ -1202,7 +1198,7 @@
 			 */
 			GET_CANONNAME(cur->ai_next, hp->h_name);
 		}
-		while (cur && cur->ai_next) /* no need to loop, actually. */
+		while (cur->ai_next) /* no need to loop, actually. */
 			cur = cur->ai_next;
 		continue;
 
--- bind-9.3.2/lib/bind/dst/hmac_link.c.9_3_3_bind	2005-07-28 03:43:16.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/hmac_link.c	2006-03-09 19:17:21.000000000 -0500
@@ -1,6 +1,6 @@
 #ifdef HMAC_MD5
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.1 2005/07/28 07:43:16 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/hmac_link.c,v 1.2.2.1.4.2 2006/03/10 00:17:21 marka Exp $";
 #endif
 /*
  * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -93,6 +93,9 @@
 	int sign_len = 0;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -100,8 +103,6 @@
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 
 	if (mode & SIG_MODE_INIT) {
@@ -160,6 +161,9 @@
 	HMAC_Key *key;
 	MD5_CTX *ctx = NULL;
 
+	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
+		return (-1);
+
 	if (mode & SIG_MODE_INIT) 
 		ctx = (MD5_CTX *) malloc(sizeof(*ctx));
 	else if (context)
@@ -167,9 +171,6 @@
 	if (ctx == NULL) 
 		return (-1);
 
-	if (d_key == NULL || d_key->dk_KEY_struct == NULL)
-		return (-1);
-
 	key = (HMAC_Key *) d_key->dk_KEY_struct;
 	if (mode & SIG_MODE_INIT) {
 		MD5Init(ctx);
@@ -272,7 +273,7 @@
 
 static int
 dst_hmac_md5_key_to_file_format(const DST_KEY *dkey, char *buff,
-			    const int buff_len)
+			        const int buff_len)
 {
 	char *bp;
 	int len, b_len, i, key_len;
@@ -289,7 +290,7 @@
 	/* write file header */
 	sprintf(buff, key_file_fmt_str, KEY_FILE_FORMAT, KEY_HMAC_MD5, "HMAC");
 
-	bp = (char *) strchr(buff, '\0');
+	bp = buff + strlen(buff);
 	b_len = buff_len - (bp - buff);
 
 	memset(key, 0, HMAC_LEN);
@@ -334,9 +335,9 @@
 {
 	const char *p = buff, *eol;
 	u_char key[HMAC_LEN+1];	/* b64_pton needs more than 64 bytes do decode
-							 * it should probably be fixed rather than doing
-							 * this
-							 */
+				 * it should probably be fixed rather than doing
+				 * this
+				 */
 	u_char *tmp;
 	int key_len, len;
 
@@ -355,6 +356,8 @@
 		return (-4);
 	len = eol - p;
 	tmp = malloc(len + 2);
+	if (tmp == NULL)
+		return (-5);
 	memcpy(tmp, p, len);
 	*(tmp + len) = 0x0;
 	key_len = b64_pton((char *)tmp, key, HMAC_LEN+1);	/* see above */
--- bind-9.3.2/lib/bind/dst/support.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/support.c	2005-10-10 20:48:14.000000000 -0400
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/support.c,v 1.2.2.1.10.2 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/support.c,v 1.2.2.1.10.2 2005/10/11 00:48:14 marka Exp $";
 
 
 /*
--- bind-9.3.2/lib/bind/dst/dst_api.c.9_3_3_bind	2005-10-10 20:48:14.000000000 -0400
+++ bind-9.3.2/lib/bind/dst/dst_api.c	2006-03-09 19:17:21.000000000 -0500
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /proj/cvs/prod/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.3 2005/10/11 00:48:14 marka Exp $";
+static const char rcsid[] = "$Header: /var/snap/bind9/lib/bind/dst/dst_api.c,v 1.4.2.6.8.4 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /*
@@ -170,6 +170,10 @@
 
 	memset(new_key, 0, sizeof(*new_key));
 	new_key->dk_key_name = strdup(name);
+	if (new_key->dk_key_name == NULL) {
+		free(new_key);
+		return (NULL);
+	}
 	new_key->dk_alg = alg;
 	new_key->dk_flags = flags;
 	new_key->dk_proto = protocol;
@@ -655,11 +659,13 @@
 			 alg));
 		return (NULL);
 	}
-	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
-		return (NULL);
 
 	if (in_name == NULL)
 		return (NULL);
+
+	if ((key_st = dst_s_get_key_struct(in_name, alg, 0, 0, 0)) == NULL)
+		return (NULL);
+
 	key_st->dk_id = dst_s_dns_key_id(rdata, len);
 	key_st->dk_flags = dst_s_get_int16(rdata);
 	key_st->dk_proto = (u_int16_t) rdata[DST_KEY_PROT];
@@ -772,13 +778,11 @@
 		return (NULL);
 	}
 
-	dkey = dst_s_get_key_struct(key_name, alg, flags, 
-					     protocol, -1);
+	dkey = dst_s_get_key_struct(key_name, alg, flags, protocol, -1);
 
-	if (dkey == NULL)
-		return (NULL);
-	if (dkey->dk_func == NULL || dkey->dk_func->from_dns_key == NULL)
-		return NULL;
+	if (dkey == NULL || dkey->dk_func == NULL ||
+	    dkey->dk_func->from_dns_key == NULL) 
+		return (dst_free_key(dkey));
 
 	if (dkey->dk_func->from_dns_key(dkey, key_buf, key_len) < 0) {
 		EREPORT(("dst_buffer_to_key(): dst_buffer_to_hmac failed\n"));
@@ -1013,7 +1017,6 @@
 	else {
 		EREPORT(("dst_free_key(): Unknown key alg %d\n",
 			 f_key->dk_alg));
-		free(f_key->dk_KEY_struct);	/* SHOULD NOT happen */
 	}
 	if (f_key->dk_KEY_struct) {
 		free(f_key->dk_KEY_struct);
--- bind-9.3.2/lib/bind/resolv/res_sendsigned.c.9_3_3_bind	2005-07-28 03:43:23.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_sendsigned.c	2006-03-09 19:17:21.000000000 -0500
@@ -52,6 +52,7 @@
 	bufsize = msglen + 1024;
 	newmsg = (u_char *) malloc(bufsize);
 	if (newmsg == NULL) {
+		free(nstatp);
 		errno = ENOMEM;
 		return (-1);
 	}
@@ -102,11 +103,11 @@
 retry:
 
 	len = res_nsend(nstatp, newmsg, newmsglen, answer, anslen);
-	if (ret < 0) {
+	if (len < 0) {
 		free (nstatp);
 		free (newmsg);
 		dst_free_key(dstkey);
-		return (ret);
+		return (len);
 	}
 
 	ret = ns_verify(answer, &len, dstkey, sig, siglen,
--- bind-9.3.2/lib/bind/resolv/res_send.c.9_3_3_bind	2005-08-14 22:04:41.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_send.c	2006-03-07 23:13:31.000000000 -0500
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -130,7 +130,7 @@
 static int		send_vc(res_state, const u_char *, int,
 				u_char *, int, int *, int);
 static int		send_dg(res_state, const u_char *, int,
-				u_char *, int, int *, int,
+				u_char *, int, int *, int, int,
 				int *, int *);
 static void		Aerror(const res_state, FILE *, const char *, int,
 			       const struct sockaddr *, int);
@@ -458,7 +458,7 @@
 		} else {
 			/* Use datagrams. */
 			n = send_dg(statp, buf, buflen, ans, anssiz, &terrno,
-				    ns, &v_circuit, &gotsomewhere);
+				    ns, try, &v_circuit, &gotsomewhere);
 			if (n < 0)
 				goto fail;
 			if (n == 0)
@@ -766,9 +766,9 @@
 }
 
 static int
-send_dg(res_state statp,
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns, int *v_circuit, int *gotsomewhere)
+send_dg(res_state statp, const u_char *buf, int buflen, u_char *ans,
+	int anssiz, int *terrno, int ns, int try, int *v_circuit,
+	int *gotsomewhere)
 {
 	const HEADER *hp = (const HEADER *) buf;
 	HEADER *anhp = (HEADER *) ans;
@@ -849,7 +849,7 @@
 	/*
 	 * Wait for reply.
 	 */
-	seconds = (statp->retrans << ns);
+	seconds = (statp->retrans << try);
 	if (ns > 0)
 		seconds /= statp->nscount;
 	if (seconds <= 0)
--- bind-9.3.2/lib/bind/resolv/mtctxres.c.9_3_3_bind	2005-08-23 00:48:40.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/mtctxres.c	2006-03-09 19:17:21.000000000 -0500
@@ -106,9 +106,10 @@
 	 */
 	if (!mt_key_initialized) {
 		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                pthread_mutex_lock(&keylock);
-		_mtctxres_init();
-                pthread_mutex_unlock(&keylock);
+                if (pthread_mutex_lock(&keylock) == 0) {
+			_mtctxres_init();
+			(void) pthread_mutex_unlock(&keylock);
+		}
 	}
 
 	/*
--- bind-9.3.2/lib/bind/resolv/res_query.c.9_3_3_bind	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/bind/resolv/res_query.c	2004-03-16 07:34:19.000000000 -0500
@@ -192,8 +192,6 @@
 		}
 		return (-1);
 	}
-	if( n > 0 )
-		RES_SET_H_ERRNO(statp,0);
 	return (n);
 }
 
--- bind-9.3.2/lib/bind/include/arpa/nameser_compat.h.9_3_3_bind	2004-07-01 00:43:41.000000000 -0400
+++ bind-9.3.2/lib/bind/include/arpa/nameser_compat.h	2006-05-18 22:38:15.000000000 -0400
@@ -32,7 +32,7 @@
 
 /*
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $
+ *	$Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $
  */
 
 #ifndef _ARPA_NAMESER_COMPAT_
@@ -52,8 +52,9 @@
 #define	PDP_ENDIAN	3412	/* LSB first in word, MSW first in long (pdp)*/
 
 #if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
-    defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
-    defined(__alpha__) || defined(__alpha) || \
+    defined(__i386__) || defined(__i386) || defined(__amd64__) || \
+    defined(__x86_64__) || defined(MIPSEL) || defined(_MIPSEL) || \
+    defined(BIT_ZERO_ON_RIGHT) || defined(__alpha__) || defined(__alpha) || \
     (defined(__Lynx__) && defined(__x86__))
 #define BYTE_ORDER	LITTLE_ENDIAN
 #endif
--- bind-9.3.2/lib/bind/include/netdb.h.9_3_3_bind	2004-11-29 20:15:42.000000000 -0500
+++ bind-9.3.2/lib/bind/include/netdb.h	2006-03-05 21:27:35.000000000 -0500
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *	$Id: netdb.h,v 1.12.2.1.4.5 2004/11/30 01:15:42 marka Exp $
+ *	$Id: netdb.h,v 1.12.2.1.4.6 2006/03/06 02:27:35 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -175,7 +175,7 @@
 	int		ai_socktype;	/* SOCK_xxx */
 	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
 #if defined(sun) && defined(_SOCKLEN_T)
-#ifdef __sparc9
+#ifdef __sparcv9
 	int		_ai_pad;
 #endif
 	socklen_t	ai_addrlen;
--- bind-9.3.2/lib/bind/isc/heap.c.9_3_3_bind	2004-03-09 03:33:43.000000000 -0500
+++ bind-9.3.2/lib/bind/isc/heap.c	2006-03-09 19:17:21.000000000 -0500
@@ -26,7 +26,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: heap.c,v 1.1.206.1 2004/03/09 08:33:43 marka Exp $";
+static const char rcsid[] = "$Id: heap.c,v 1.1.206.2 2006/03/10 00:17:21 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -54,9 +54,13 @@
 	 int array_size_increment) {
 	heap_context ctx;
 
+	if (higher_priority == NULL)
+		return (NULL);
+
 	ctx = (heap_context)malloc(sizeof (struct heap_context));
-	if (ctx == NULL || higher_priority == NULL)
+	if (ctx == NULL)
 		return (NULL);
+
 	ctx->array_size = 0;
 	if (array_size_increment == 0)
 		ctx->array_size_increment = ARRAY_SIZE_INCREMENT;
--- bind-9.3.2/lib/bind/isc/eventlib_p.h.9_3_3_bind	2005-07-28 03:43:20.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/eventlib_p.h	2006-03-09 19:17:21.000000000 -0500
@@ -18,7 +18,7 @@
 /* eventlib_p.h - private interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $
+ * $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $
  */
 
 #ifndef _EVENTLIB_P_H
@@ -45,6 +45,8 @@
 #define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
 #define EV_ERR(e)		return (errno = (e), -1)
 #define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
+#define OKFREE(x, y)	if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
+			else (void)NULL
 
 #define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
 				FILL(p); \
--- bind-9.3.2/lib/bind/isc/ev_connects.c.9_3_3_bind	2005-07-08 00:52:54.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/ev_connects.c	2006-03-09 19:17:21.000000000 -0500
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.2 2005/07/08 04:52:54 marka Exp $";
+static const char rcsid[] = "$Id: ev_connects.c,v 1.4.206.3 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 /* Import. */
@@ -69,7 +69,7 @@
 
 	OKNEW(new);
 	new->flags = EV_CONN_LISTEN;
-	OK(mode = fcntl(fd, F_GETFL, NULL));	/* side effect: validate fd. */
+	OKFREE(mode = fcntl(fd, F_GETFL, NULL), new);	/* side effect: validate fd. */
 	/*
 	 * Remember the nonblocking status.  We assume that either evSelectFD
 	 * has not been done to this fd, or that if it has then the caller
@@ -80,13 +80,13 @@
 	if ((mode & PORT_NONBLOCK) == 0) {
 #ifdef USE_FIONBIO_IOCTL
 		int on = 1;
-		OK(ioctl(fd, FIONBIO, (char *)&on));
+		OKFREE(ioctl(fd, FIONBIO, (char *)&on), new);
 #else
-		OK(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK));
+		OKFREE(fcntl(fd, F_SETFL, mode | PORT_NONBLOCK), new);
 #endif
 		new->flags |= EV_CONN_BLOCK;
 	}
-	OK(listen(fd, maxconn));
+	OKFREE(listen(fd, maxconn), new);
 	if (evSelectFD(opaqueCtx, fd, EV_READ, listener, new, &new->file) < 0){
 		int save = errno;
 
--- bind-9.3.2/lib/bind/isc/eventlib.c.9_3_3_bind	2005-07-28 03:43:20.000000000 -0400
+++ bind-9.3.2/lib/bind/isc/eventlib.c	2006-03-09 19:17:21.000000000 -0500
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.5 2005/07/28 07:43:20 marka Exp $";
+static const char rcsid[] = "$Id: eventlib.c,v 1.2.2.1.4.6 2006/03/10 00:17:21 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -784,13 +784,10 @@
 		pnfds = 0;
 	}
 	n = poll(fds, pnfds, polltimeout);
-	/*
-	 * pselect() should return the total number of events on the file
-	 * desriptors, not just the count of fd:s with activity. Hence,
-	 * traverse the pollfds array and count the events.
-	 */
 	if (n > 0) {
 		int     i, e;
+
+		INSIST(ctx != NULL);
 		for (e = 0, i = ctx->firstfd; i <= ctx->fdMax; i++) {
 			if (ctx->pollfds[i].fd < 0)
 				continue;
--- bind-9.3.2/lib/bind/isc/hex.c.9_3_3_bind	2004-03-16 07:34:16.000000000 -0500
+++ bind-9.3.2/lib/bind/isc/hex.c	2006-01-30 19:53:21.000000000 -0500
@@ -45,8 +45,9 @@
 			goto formerr;
 		/* comment */
 		if (c == ';') {
-			while ((c = fgetc(fp)) != EOF && c != '\n')
-				/* empty */
+			do {
+				c = fgetc(fp);
+			} while (c != EOF && c != '\n');
 			if (c == '\n' && *multiline)
 				continue;
 			goto formerr;

bind-9.3.2-9_3_3_dig.patch:
 host.c |  106 +++++++++++++++++++++++------------------------------------------
 1 files changed, 38 insertions(+), 68 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dig.patch ---
--- bind-9.3.2/bin/dig/host.c.9_3_3_dig	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/bin/dig/host.c	2006-06-13 23:04:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.76.2.5.2.13 2005/07/04 03:29:45 marka Exp $ */
+/* $Id: host.c,v 1.76.2.5.2.16 2006/05/23 04:43:47 marka Exp $ */
 
 #include <config.h>
 #include <limits.h>
@@ -46,6 +46,7 @@
 static int seen_error = -1;
 static isc_boolean_t list_addresses = ISC_TRUE;
 static dns_rdatatype_t list_type = dns_rdatatype_a;
+static isc_boolean_t printed_server = ISC_FALSE;
 
 static const char *opcodetext[] = {
 	"QUERY",
@@ -329,60 +330,6 @@
 }
 
 static isc_result_t
-get_cname( dig_query_t *query, dns_message_t *msg, char *cnamestr, int cnamestrlen )
-{
-    /*  check for a cname result in msg answer section; if present, copy it into cnamestr 
-     *  Jason Vas Dias<jvdias at redhat.com>, Red Hat, Inc. fix for bugzilla 187286 (RT #15702)
-     */
-	isc_result_t result;
-	dns_name_t   *aname;
-	dns_rdataset_t *rdataset;
-	dns_rdata_t  rdata = DNS_RDATA_INIT;
-
-	*cnamestr = '\0';
-			
-	result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
-	if (result != ISC_R_SUCCESS)
-	    return ISC_R_FAILURE;
-
-	do
-	{
-		aname = NULL;
-		dns_message_currentname(msg, DNS_SECTION_ANSWER, &aname);
-		if (   aname 
-		    &&(dns_name_equal(query->lookup->name, aname) == ISC_TRUE)
-		   )
-		{
-			for (rdataset = ISC_LIST_HEAD(aname->list);
-			     rdataset != NULL;
-			     rdataset = ISC_LIST_NEXT(rdataset, link)) 
-			{
-				isc_result_t loopresult = dns_rdataset_first(rdataset);
-				while (loopresult == ISC_R_SUCCESS) 
-				{
-					dns_rdataset_current(rdataset, &rdata);
-					if ( rdata.type == dns_rdatatype_cname )
-					{
-						dns_rdata_cname_t cname;
-						if ( dns_rdata_tostruct( &rdata, &cname, NULL ) 
-						     == ISC_R_SUCCESS
-						   )
-						{
-							dns_name_format(&(cname.cname), cnamestr, cnamestrlen );
-							return ( ISC_R_SUCCESS );
-						}
-					}
-					dns_rdata_reset(&rdata);
-					loopresult = dns_rdataset_next(rdataset);
-				}
-			}
-		}
-	} while ( dns_message_nextname(msg, DNS_SECTION_ANSWER) == ISC_R_SUCCESS );
-
-	return ( ISC_R_FAILURE );
-}
-
-static isc_result_t
 printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner,
 	   const char *set_name, isc_boolean_t headers)
 {
@@ -407,6 +354,32 @@
 	return (ISC_R_SUCCESS);
 }
 
+static void
+chase_cnamechain(dns_message_t *msg, dns_name_t *qname) {
+	isc_result_t result;
+	dns_rdataset_t *rdataset;
+	dns_rdata_cname_t cname;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	unsigned int i = msg->counts[DNS_SECTION_ANSWER];
+
+ 	while (i-- > 0) {
+		rdataset = NULL;
+		result = dns_message_findname(msg, DNS_SECTION_ANSWER, qname,
+					      dns_rdatatype_cname, 0, NULL,
+					      &rdataset);
+		if (result != ISC_R_SUCCESS)
+			return;
+		result = dns_rdataset_first(rdataset);
+		check_result(result, "dns_rdataset_first");
+		dns_rdata_reset(&rdata);
+		dns_rdataset_current(rdataset, &rdata);
+		result = dns_rdata_tostruct(&rdata, &cname, NULL);
+		check_result(result, "dns_rdata_tostruct");
+		dns_name_copy(&cname.cname, qname, NULL);
+		dns_rdata_freestruct(&cname);
+	}
+}
+
 isc_result_t
 printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	isc_boolean_t did_flag = ISC_FALSE;
@@ -423,7 +396,7 @@
 	 */
 	force_error = (seen_error == 1) ? 1 : 0;
 	seen_error = 1;
-	if (listed_server) {
+	if (listed_server && !printed_server) {
 		char sockstr[ISC_SOCKADDR_FORMATSIZE];
 
 		printf("Using domain server:\n");
@@ -432,6 +405,7 @@
 				    sizeof(sockstr));
 		printf("Address: %s\n", sockstr);
 		printf("Aliases: \n\n");
+		printed_server = ISC_TRUE;
 	}
 
 	if (msg->rcode != 0) {
@@ -445,19 +419,15 @@
 	if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) {
 		char namestr[DNS_NAME_FORMATSIZE];
 		dig_lookup_t *lookup;
+		dns_fixedname_t fixed;
+		dns_name_t *name;
 
 		/* Add AAAA and MX lookups. */
-
-		if ( ! ISC_LIST_EMPTY( msg->sections[DNS_SECTION_ANSWER] ) )
-		{ 
-			/* check for CNAME answer ; if present, then use canonical name for
-			 * AAAA and MX lookups.
-			 */		
-			if ( get_cname( query, msg, namestr, sizeof(namestr) ) != ISC_R_SUCCESS )
-				dns_name_format(query->lookup->name, namestr, sizeof(namestr));			
-		} else	/* use same name for AAAA and MX lookups */			
-			dns_name_format(query->lookup->name, namestr, sizeof(namestr));
-
+		dns_fixedname_init(&fixed);
+		name = dns_fixedname_name(&fixed);
+		dns_name_copy(query->lookup->name, name, NULL);
+		chase_cnamechain(msg, name);
+		dns_name_format(name, namestr, sizeof(namestr));
 		lookup = clone_lookup(query->lookup, ISC_FALSE);
 		if (lookup != NULL) {
 			strncpy(lookup->textname, namestr,

bind-9.3.2-9_3_3_dns.patch:
 lib/dns/Makefile.in |    9 +++++----
 lib/dns/adb.c       |    7 +++----
 lib/dns/cache.c     |   39 ++++++++++++++++++++++++++-------------
 lib/dns/dispatch.c  |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 lib/dns/dnssec.c    |    7 +++----
 lib/dns/dst_api.c   |    8 +++++---
 lib/dns/keytable.c  |   13 ++++++++++---
 lib/dns/lookup.c    |   14 +++++---------
 lib/dns/request.c   |    6 ++++--
 lib/dns/xfrin.c     |   19 ++++++++++++++++---
 make/rules.in       |   10 ++++++++--
 11 files changed, 131 insertions(+), 49 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dns.patch ---
--- bind-9.3.2/make/rules.in.9_3_3_dns	2006-06-13 23:34:04.000000000 -0400
+++ bind-9.3.2/make/rules.in	2006-06-13 23:34:05.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.40.2.5.4.8 2005/10/28 01:53:44 marka Exp $
+# $Id: rules.in,v 1.40.2.5.4.10 2006/01/06 00:01:42 marka Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -101,6 +101,12 @@
 STD_CDEFINES =	@STD_CDEFINES@
 STD_CWARNINGS =	@STD_CWARNINGS@
 
+BUILD_CC = @BUILD_CC@
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
+BUILD_LDFAGS = @BUILD_LDFAGS@
+BUILD_LIBS = @BUILD_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c . at O@
 
--- bind-9.3.2/lib/dns/dispatch.c.9_3_3_dns	2004-09-01 00:27:41.000000000 -0400
+++ bind-9.3.2/lib/dns/dispatch.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.6.2.10 2004/09/01 04:27:41 marka Exp $ */
+/* $Id: dispatch.c,v 1.101.2.6.2.12 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -641,6 +641,50 @@
 		free_buffer(disp, ev->region.base, ev->region.length);
 		goto unlock;
 	} 
+
+	/*
+	 * Now that we have the original dispatch the query was sent
+	 * from check that the address and port the response was
+	 * sent to make sense.
+	 */
+	if (disp != resp->disp) {
+		isc_sockaddr_t a1;
+		isc_sockaddr_t a2;
+		
+		/*
+		 * Check that the socket types and ports match.
+		 */
+		if (disp->socktype != resp->disp->socktype ||
+		    isc_sockaddr_getport(&disp->local) !=
+		    isc_sockaddr_getport(&resp->disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+
+		/*
+		 * If both dispatches are bound to an address then fail as
+		 * the addresses can't be equal (enforced by the IP stack).  
+		 *
+		 * Note under Linux a packet can be sent out via IPv4 socket
+		 * and the response be received via a IPv6 socket.
+		 * 
+		 * Requests sent out via IPv6 should always come back in
+		 * via IPv6.
+		 */
+		if (isc_sockaddr_pf(&resp->disp->local) == PF_INET6 &&
+		    isc_sockaddr_pf(&disp->local) != PF_INET6) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+		isc_sockaddr_anyofpf(&a1, isc_sockaddr_pf(&resp->disp->local));
+		isc_sockaddr_anyofpf(&a2, isc_sockaddr_pf(&disp->local));
+		if (!isc_sockaddr_eqaddr(&a1, &resp->disp->local) &&
+		    !isc_sockaddr_eqaddr(&a2, &disp->local)) {
+			free_buffer(disp, ev->region.base, ev->region.length);
+			goto unlock;
+		}
+	}
+
 	queue_response = resp->item_out;
 	rev = allocate_event(resp->disp);
 	if (rev == NULL) {
--- bind-9.3.2/lib/dns/dnssec.c.9_3_3_dns	2004-06-10 20:30:54.000000000 -0400
+++ bind-9.3.2/lib/dns/dnssec.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.69.2.5.2.7 2004/06/11 00:30:54 marka Exp $
+ * $Id: dnssec.c,v 1.69.2.5.2.9 2006/01/04 23:50:20 marka Exp $
  */
 
 
@@ -330,8 +330,7 @@
 cleanup_context:
 	dst_context_destroy(&ctx);
 cleanup_databuf:
-	if (databuf != NULL)
-		isc_buffer_free(&databuf);
+	isc_buffer_free(&databuf);
 cleanup_signature:
 	isc_mem_put(mctx, sig.signature, sig.siglen);
 
--- bind-9.3.2/lib/dns/keytable.c.9_3_3_dns	2004-03-08 04:04:30.000000000 -0500
+++ bind-9.3.2/lib/dns/keytable.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.26.12.3 2004/03/08 09:04:30 marka Exp $ */
+/* $Id: keytable.c,v 1.26.12.5 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -244,6 +244,13 @@
 
 	RWLOCK(&keytable->rwlock, isc_rwlocktype_read);
 
+	/*
+	 * Note we don't want the DNS_R_PARTIALMATCH from dns_rbt_findname()
+	 * as that indicates that 'name' was not found.
+	 *
+	 * DNS_R_PARTIALMATCH indicates that the name was found but we
+	 * didn't get a match on algorithm and key id arguments.
+	 */
 	knode = NULL;
 	data = NULL;
 	result = dns_rbt_findname(keytable->table, name, 0, NULL, &data);
@@ -261,7 +268,7 @@
 			UNLOCK(&keytable->lock);
 			*keynodep = knode;
 		} else
-			result = ISC_R_NOTFOUND;
+			result = DNS_R_PARTIALMATCH;
 	} else if (result == DNS_R_PARTIALMATCH)
 		result = ISC_R_NOTFOUND;
 
--- bind-9.3.2/lib/dns/xfrin.c.9_3_3_dns	2005-11-03 18:08:41.000000000 -0500
+++ bind-9.3.2/lib/dns/xfrin.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.12 2005/11/03 23:08:41 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.15 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -797,7 +797,18 @@
 	return (ISC_R_SUCCESS);
 
  failure:
-	xfrin_fail(xfr, result, "failed creating transfer context");
+	if (xfr->timer != NULL)
+		isc_timer_detach(&xfr->timer);
+	if (dns_name_dynamic(&xfr->name))
+		dns_name_free(&xfr->name, xfr->mctx);
+	if (xfr->tsigkey != NULL)
+		dns_tsigkey_detach(&xfr->tsigkey);
+	if (xfr->db != NULL)
+		dns_db_detach(&xfr->db);
+	isc_task_detach(&xfr->task);
+	dns_zone_idetach(&xfr->zone);
+	isc_mem_put(mctx, xfr, sizeof(*xfr));
+
 	return (result);
 }
 
@@ -808,7 +819,9 @@
 				isc_sockaddr_pf(&xfr->sourceaddr),
 				isc_sockettype_tcp,
 				&xfr->socket));
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	CHECK(isc_socket_bind(xfr->socket, &xfr->sourceaddr));
+#endif
 	CHECK(isc_socket_connect(xfr->socket, &xfr->masteraddr, xfr->task,
 				 xfrin_connect_done, xfr));
 	xfr->connects++;
--- bind-9.3.2/lib/dns/request.c.9_3_3_dns	2004-03-08 04:04:31.000000000 -0500
+++ bind-9.3.2/lib/dns/request.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.64.2.1.10.6 2004/03/08 09:04:31 marka Exp $ */
+/* $Id: request.c,v 1.64.2.1.10.8 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -512,6 +512,7 @@
 				   isc_sockettype_tcp, &socket);
 	if (result != ISC_R_SUCCESS)
 		return (result);
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 	if (srcaddr == NULL) {
 		isc_sockaddr_anyofpf(&bind_any,
 				     isc_sockaddr_pf(destaddr));
@@ -523,6 +524,7 @@
 	}
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
+#endif
 	attrs = 0;
 	attrs |= DNS_DISPATCHATTR_TCP;
 	attrs |= DNS_DISPATCHATTR_PRIVATE;
--- bind-9.3.2/lib/dns/adb.c.9_3_3_dns	2005-10-14 01:19:00.000000000 -0400
+++ bind-9.3.2/lib/dns/adb.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.181.2.11.2.24 2005/10/14 05:19:00 marka Exp $ */
+/* $Id: adb.c,v 1.181.2.11.2.26 2006/01/04 23:50:20 marka Exp $ */
 
 /*
  * Implementation notes
@@ -2587,8 +2587,7 @@
 		}
 	}
 
-	if (bucket != DNS_ADB_INVALIDBUCKET)
-		UNLOCK(&adb->namelocks[bucket]);
+	UNLOCK(&adb->namelocks[bucket]);
 
 	return (result);
 }
--- bind-9.3.2/lib/dns/dst_api.c.9_3_3_dns	2004-12-08 23:07:16.000000000 -0500
+++ bind-9.3.2/lib/dns/dst_api.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.1.4.1 2004/12/09 04:07:16 marka Exp $
+ * $Id: dst_api.c,v 1.1.4.3 2006/01/04 23:50:20 marka Exp $
  */
 
 #include <config.h>
@@ -1027,8 +1027,10 @@
 	}
 
 	ret = dns_name_print(key->key_name, fp);
-	if (ret != ISC_R_SUCCESS)
+	if (ret != ISC_R_SUCCESS) {
+		fclose(fp);
 		return (ret);
+	}
 
 	fprintf(fp, " ");
 
--- bind-9.3.2/lib/dns/Makefile.in.9_3_3_dns	2006-06-13 23:34:04.000000000 -0400
+++ bind-9.3.2/lib/dns/Makefile.in	2006-06-13 23:40:09.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.126.2.3.2.17 2004/12/09 04:07:15 marka Exp $
+# $Id: Makefile.in,v 1.126.2.3.2.19 2006/01/06 00:01:42 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -123,7 +123,7 @@
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns. at A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns. at A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libdns. at A@ timestamp
@@ -156,7 +156,8 @@
 	./gen -s ${srcdir} > code.h
 
 gen: gen.c
-	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
+	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir} -I${top_srcdir}/lib/isc/include \
+	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
 
 rbtdb64. at O@: rbtdb.c
 
--- bind-9.3.2/lib/dns/cache.c.9_3_3_dns	2005-03-16 22:58:30.000000000 -0500
+++ bind-9.3.2/lib/dns/cache.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.45.2.4.8.9 2005/03/17 03:58:30 marka Exp $ */
+/* $Id: cache.c,v 1.45.2.4.8.14 2006/05/04 02:21:46 marka Exp $ */
 
 #include <config.h>
 
@@ -68,7 +68,6 @@
  * Convenience macros for comprehensive assertion checking.
  */
 #define CLEANER_IDLE(c) ((c)->state == cleaner_s_idle && \
-			 (c)->iterator == NULL && \
 			 (c)->resched_event != NULL)
 #define CLEANER_BUSY(c) ((c)->state == cleaner_s_busy && \
 			 (c)->iterator != NULL && \
@@ -507,6 +506,11 @@
 	cleaner->resched_event = NULL;
 	cleaner->overmem_event = NULL;
 
+	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+				       &cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		goto cleanup;
+
 	if (taskmgr != NULL && timermgr != NULL) {
 		result = isc_task_create(taskmgr, 1, &cleaner->task);
 		if (result != ISC_R_SUCCESS) {
@@ -575,6 +579,8 @@
 		isc_timer_detach(&cleaner->cleaning_timer);
 	if (cleaner->task != NULL)
 		isc_task_detach(&cleaner->task);
+	if (cleaner->iterator != NULL)
+		dns_dbiterator_destroy(&cleaner->iterator);
 	DESTROYLOCK(&cleaner->lock);
  fail:
 	return (result);
@@ -582,15 +588,17 @@
 
 static void
 begin_cleaning(cache_cleaner_t *cleaner) {
-	isc_result_t result;
+	isc_result_t result = ISC_R_SUCCESS;
 
 	REQUIRE(CLEANER_IDLE(cleaner));
 
 	/*
-	 * Create an iterator and position it at the beginning of the cache.
+	 * Create an iterator, if it does not already exist, and
+         * position it at the beginning of the cache.
 	 */
-	result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
-				       &cleaner->iterator);
+	if (cleaner->iterator == NULL)
+		result = dns_db_createiterator(cleaner->cache->db, ISC_FALSE,
+					       &cleaner->iterator);
 	if (result != ISC_R_SUCCESS)
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
 			      DNS_LOGMODULE_CACHE, ISC_LOG_WARNING,
@@ -600,20 +608,21 @@
 		dns_dbiterator_setcleanmode(cleaner->iterator, ISC_TRUE);
 		result = dns_dbiterator_first(cleaner->iterator);
 	}
-
 	if (result != ISC_R_SUCCESS) {
 		/*
 		 * If the result is ISC_R_NOMORE, the database is empty,
 		 * so there is nothing to be cleaned.
 		 */
-		if (result != ISC_R_NOMORE)
+		if (result != ISC_R_NOMORE && cleaner->iterator != NULL) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "cache cleaner: "
 					 "dns_dbiterator_first() failed: %s",
 					 dns_result_totext(result));
-
-		if (cleaner->iterator != NULL)
 			dns_dbiterator_destroy(&cleaner->iterator);
+		} else if (cleaner->iterator != NULL) {
+			result = dns_dbiterator_pause(cleaner->iterator);
+			RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		}
 	} else {
 		/*
 		 * Pause the iterator to free its lock.
@@ -634,10 +643,14 @@
 
 static void
 end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) {
+	isc_result_t result;
+
 	REQUIRE(CLEANER_BUSY(cleaner));
 	REQUIRE(event != NULL);
 
-	dns_dbiterator_destroy(&cleaner->iterator);
+	result = dns_dbiterator_pause(cleaner->iterator);
+	if (result != ISC_R_SUCCESS)
+		dns_dbiterator_destroy(&cleaner->iterator);
 
 	dns_cache_setcleaninginterval(cleaner->cache,
 				      cleaner->cleaning_interval);
@@ -774,7 +787,7 @@
 			 * Either the end was reached (ISC_R_NOMORE) or
 			 * some error was signaled.  If the cache is still
 			 * overmem and no error was encountered,
-			 * keep trying to clean it, otherwise stop cleanng.
+			 * keep trying to clean it, otherwise stop cleaning.
 			 */
 			if (result != ISC_R_NOMORE)
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
--- bind-9.3.2/lib/dns/lookup.c.9_3_3_dns	2004-04-14 22:10:40.000000000 -0400
+++ bind-9.3.2/lib/dns/lookup.c	2006-06-13 23:34:05.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.9.12.5 2004/04/15 02:10:40 marka Exp $ */
+/* $Id: lookup.c,v 1.9.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -154,11 +154,6 @@
 			dns_rdataset_disassociate(rdataset);
 		isc_mem_put(lookup->mctx, rdataset, sizeof(dns_rdataset_t));
 	}
-	if (sigrdataset != NULL) {
-		if (dns_rdataset_isassociated(sigrdataset))
-			dns_rdataset_disassociate(sigrdataset);
-		isc_mem_put(lookup->mctx, sigrdataset, sizeof(dns_rdataset_t));
-	}
 	return (result);
 }
 
@@ -229,13 +224,14 @@
 					send_event = ISC_TRUE;
 				goto done;
 			}
-		} else {
+		} else if (event != NULL) {
 			result = event->result;
 			fname = dns_fixedname_name(&event->foundname);
 			dns_resolver_destroyfetch(&lookup->fetch);
 			INSIST(event->rdataset == &lookup->rdataset);
 			INSIST(event->sigrdataset == &lookup->sigrdataset);
-		}
+		} else
+			fname = NULL;	/* Silence compiler warning. */
 
 		/*
 		 * If we've been canceled, forget about the result.

bind-9.3.2-9_3_3_dnssec.patch:
 dnssec-signzone.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_dnssec.patch ---
--- bind-9.3.2/bin/dnssec/dnssec-signzone.c.9_3_3_dnssec	2005-10-13 21:38:41.000000000 -0400
+++ bind-9.3.2/bin/dnssec/dnssec-signzone.c	2006-06-13 23:08:25.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.139.2.2.4.21 2005/10/14 01:38:41 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.139.2.2.4.23 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -1292,10 +1292,6 @@
 				result = dns_dbiterator_next(dbiter);
 				continue;
 			}
-			if (result != ISC_R_SUCCESS) {
-				dns_db_detachnode(gdb, &nextnode);
-				break;
-			}
 			if (!dns_name_issubdomain(nextname, gorigin) ||
 			    (zonecut != NULL &&
 			     dns_name_issubdomain(nextname, zonecut)))

bind-9.3.2-9_3_3_isc.patch:
 hash.c              |   13 ++--
 hmacmd5.c           |    5 -
 include/isc/heap.h  |  143 +++++++++++++++++++++++++++++++++++++++++++++++-----
 lex.c               |   20 ++++---
 taskpool.c          |    8 ++
 timer.c             |   13 ++--
 unix/entropy.c      |   14 ++---
 unix/ifiter_ioctl.c |   10 ++-
 unix/socket.c       |   32 +++++++++--
 9 files changed, 206 insertions(+), 52 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_isc.patch ---
--- bind-9.3.2/lib/isc/lex.c.9_3_3_isc	2004-08-28 02:25:21.000000000 -0400
+++ bind-9.3.2/lib/isc/lex.c	2006-06-13 20:47:01.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.66.2.6.2.8 2004/08/28 06:25:21 marka Exp $ */
+/* $Id: lex.c,v 1.66.2.6.2.10 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -372,9 +372,6 @@
 	source = HEAD(lex->sources);
 	REQUIRE(tokenp != NULL);
 
-	lex->saved_paren_count = lex->paren_count;
-	source->saved_line = source->line;
-
 	if (source == NULL) {
 		if ((options & ISC_LEXOPT_NOMORE) != 0) {
 			tokenp->type = isc_tokentype_nomore;
@@ -386,6 +383,9 @@
 	if (source->result != ISC_R_SUCCESS)
 		return (source->result);
 
+	lex->saved_paren_count = lex->paren_count;
+	source->saved_line = source->line;
+
 	if (isc_buffer_remaininglength(source->pushback) == 0 &&
 	    source->at_eof)
 	{
@@ -633,9 +633,13 @@
 			remaining--;
 			break;
 		case lexstate_string:
-			if ((!escaped &&
-			     (c == ' ' || c == '\t' || lex->specials[c])) ||
-			    c == '\r' || c == '\n' || c == EOF) {
+			/*
+			 * EOF needs to be checked before lex->specials[c]
+			 * as lex->specials[EOF] is not a good idea.
+			 */
+			if (c == '\r' || c == '\n' || c == EOF ||
+			    (!escaped &&
+			     (c == ' ' || c == '\t' || lex->specials[c]))) {
 				pushback(source, c);
 				if (source->result != ISC_R_SUCCESS) {
 					result = source->result;
--- bind-9.3.2/lib/isc/timer.c.9_3_3_isc	2005-10-26 20:27:29.000000000 -0400
+++ bind-9.3.2/lib/isc/timer.c	2006-06-13 20:57:17.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.64.12.11 2005/10/27 00:27:29 marka Exp $ */
+/* $Id: timer.c,v 1.64.12.13 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -212,9 +212,10 @@
 		isc_time_t then;
 
 		isc_interval_set(&fifteen, 15, 0);
-		isc_time_add(&manager->due, &fifteen, &then);
+		result = isc_time_add(&manager->due, &fifteen, &then);
 
-		if (isc_time_compare(&then, now) < 0) {
+		if (result == ISC_R_SUCCESS &&
+		    isc_time_compare(&then, now) < 0) {
 			SIGNAL(&manager->wakeup);
 			signal_ok = ISC_FALSE;
 			isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
@@ -347,8 +348,10 @@
 
 	if (type == isc_timertype_once && !isc_interval_iszero(interval)) {
 		result = isc_time_add(&now, interval, &timer->idle);
-		if (result != ISC_R_SUCCESS)
+		if (result != ISC_R_SUCCESS) {
+			isc_mem_put(manager->mctx, timer, sizeof(*timer));
 			return (result);
+		}
 	} else
 		isc_time_settoepoch(&timer->idle);
 
--- bind-9.3.2/lib/isc/taskpool.c.9_3_3_isc	2004-03-08 04:04:50.000000000 -0500
+++ bind-9.3.2/lib/isc/taskpool.c	2006-06-13 20:55:21.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.10.12.3 2004/03/08 09:04:50 marka Exp $ */
+/* $Id: taskpool.c,v 1.10.12.5 2006/01/04 23:50:21 marka Exp $ */
 
 #include <config.h>
 
@@ -52,6 +52,10 @@
 	pool->mctx = mctx;
 	pool->ntasks = ntasks;
 	pool->tasks = isc_mem_get(mctx, ntasks * sizeof(isc_task_t *));
+	if (pool->tasks == NULL) {
+		isc_mem_put(mctx, pool, sizeof(*pool));
+		return (ISC_R_NOMEMORY);
+	}
 	for (i = 0; i < ntasks; i++)
 		pool->tasks[i] = NULL;
 	for (i = 0; i < ntasks; i++) {
--- bind-9.3.2/lib/isc/hash.c.9_3_3_isc	2004-03-06 03:14:29.000000000 -0500
+++ bind-9.3.2/lib/isc/hash.c	2006-06-13 20:43:53.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.2.2.4.2.1 2004/03/06 08:14:29 marka Exp $ */
+/* $Id: hash.c,v 1.2.2.4.2.3 2006/01/04 00:37:22 marka Exp $ */
 
 /*
  * Some portion of this code was derived from universal hash function
@@ -68,7 +68,6 @@
 #include <isc/once.h>
 #include <isc/random.h>
 #include <isc/refcount.h>
-#include <isc/rwlock.h>
 #include <isc/string.h>
 #include <isc/util.h>
 
@@ -99,7 +98,7 @@
 	hash_random_t	*rndvector; /* random vector for universal hashing */
 };
 
-static isc_rwlock_t createlock;
+static isc_mutex_t createlock;
 static isc_once_t once = ISC_ONCE_INIT;
 static isc_hash_t *hash = NULL;
 
@@ -209,7 +208,7 @@
 
 static void
 initialize_lock(void) {
-	RUNTIME_CHECK(isc_rwlock_init(&createlock, 0, 0) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_mutex_init(&createlock) == ISC_R_SUCCESS);
 }
 
 isc_result_t
@@ -221,12 +220,12 @@
 
 	RUNTIME_CHECK(isc_once_do(&once, initialize_lock) == ISC_R_SUCCESS);
 
-	RWLOCK(&createlock, isc_rwlocktype_write);
+	LOCK(&createlock);
 
 	if (hash == NULL)
 		result = isc_hash_ctxcreate(mctx, entropy, limit, &hash);
 
-	RWUNLOCK(&createlock, isc_rwlocktype_write);
+	UNLOCK(&createlock);
 
 	return (result);
 }
--- bind-9.3.2/lib/isc/unix/ifiter_ioctl.c.9_3_3_isc	2005-10-13 22:13:07.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/ifiter_ioctl.c	2006-06-13 21:13:06.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.17 2005/10/14 02:13:07 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.19.2.5.2.19 2006/02/03 23:51:37 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -529,7 +529,8 @@
 #endif
 
 	REQUIRE(VALID_IFITER(iter));
-	REQUIRE (iter->pos < (unsigned int) iter->ifc.ifc_len);
+	REQUIRE(iter->ifc.ifc_len == 0 ||
+		iter->pos < (unsigned int) iter->ifc.ifc_len);
 
 #ifdef __linux
 	result = linux_if_inet6_current(iter);
@@ -538,6 +539,9 @@
 	iter->first = ISC_TRUE;
 #endif
 
+	if (iter->ifc.ifc_len == 0)
+		return (ISC_R_NOMORE);
+
 	ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
 
 	memset(&ifreq, 0, sizeof(ifreq));
--- bind-9.3.2/lib/isc/unix/socket.c.9_3_3_isc	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/socket.c	2006-06-13 21:17:43.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.22 2005/11/03 23:08:42 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.26 2006/05/19 02:53:36 marka Exp $ */
 
 #include <config.h>
 
@@ -109,7 +109,7 @@
  * to collect the destination address and interface so the client can
  * set them on outgoing packets.
  */
-#ifdef ISC_PLATFORM_HAVEIPV6
+#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
 #ifndef USE_CMSG
 #define USE_CMSG	1
 #endif
@@ -752,8 +752,26 @@
 
 	if (sock->type == isc_sockettype_udp) {
 		memset(&dev->address, 0, sizeof(dev->address));
+#ifdef BROKEN_RECVMSG
+		if (sock->pf == AF_INET) {
+			msg->msg_name = (void *)&dev->address.type.sin;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+		} else if (sock->pf == AF_INET6) {
+			msg->msg_name = (void *)&dev->address.type.sin6;
+			msg->msg_namelen = sizeof(dev->address.type.sin6);
+#ifdef ISC_PLATFORM_HAVESYSUNH
+		} else if (sock->pf == AF_UNIX) {
+			msg->msg_name = (void *)&dev->address.type.sunix;
+			msg->msg_namelen = sizeof(dev->address.type.sunix);
+#endif
+		} else {
+			msg->msg_name = (void *)&dev->address.type.sa;
+			msg->msg_namelen = sizeof(dev->address.type);
+		}
+#else
 		msg->msg_name = (void *)&dev->address.type.sa;
 		msg->msg_namelen = sizeof(dev->address.type);
+#endif
 #ifdef ISC_NET_RECVOVERFLOW
 		/* If needed, steal one iovec for overflow detection. */
 		maxiov--;
@@ -926,6 +944,10 @@
 	cc = recvmsg(sock->fd, &msghdr, 0);
 	recv_errno = errno;
 
+#if defined(ISC_SOCKET_DEBUG)
+	dump_msg(&msghdr);
+#endif
+
 	if (cc < 0) {
 		if (SOFT_ERROR(recv_errno))
 			return (DOIO_SOFT);
@@ -2737,8 +2759,8 @@
 		dev->attributes |= ISC_SOCKEVENTATTR_PKTINFO;
 		dev->pktinfo = *pktinfo;
 
-		if (!isc_sockaddr_issitelocal(address) &&
-		    !isc_sockaddr_islinklocal(address)) {
+		if (!isc_sockaddr_issitelocal(&dev->address) &&
+		    !isc_sockaddr_islinklocal(&dev->address)) {
 			socket_log(sock, NULL, TRACE, isc_msgcat,
 				   ISC_MSGSET_SOCKET, ISC_MSG_PKTINFOPROVIDED,
 				   "pktinfo structure provided, ifindex %u "
--- bind-9.3.2/lib/isc/unix/entropy.c.9_3_3_isc	2005-07-12 01:47:43.000000000 -0400
+++ bind-9.3.2/lib/isc/unix/entropy.c	2006-06-13 21:11:13.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.60.2.3.8.11 2005/07/12 05:47:43 marka Exp $ */
+/* $Id: entropy.c,v 1.60.2.3.8.14 2006/03/02 23:29:17 marka Exp $ */
 
 /*
  * This is the system depenedent part of the ISC entropy API.
@@ -127,7 +127,7 @@
 		switch ( source->sources.usocket.status ) {
 		case isc_usocketsource_ndesired:
 			buf[0] = ndesired;
-			if ((n = send(fd, buf, 1, 0)) < 0) {
+			if ((n = sendto(fd, buf, 1, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -142,7 +142,7 @@
 		case isc_usocketsource_connected:
 			buf[0] = 1;
 			buf[1] = ndesired;
-			if ((n = send(fd, buf, 2, 0)) < 0) {
+			if ((n = sendto(fd, buf, 2, 0, NULL, 0)) < 0) {
 				if (errno == EWOULDBLOCK || errno == EINTR ||
 				    errno == ECONNRESET)
 					goto out;
@@ -159,12 +159,12 @@
 			/*FALLTHROUGH*/
 		
 		case isc_usocketsource_wrote:
-			if (recv(fd, buf, 1, 0) != 1) {
+			if (recvfrom(fd, buf, 1, 0, NULL, NULL) != 1) {
 				if (errno == EAGAIN) {
 					/*
 					 * The problem of EAGAIN (try again
 					 * later) is a major issue on HP-UX.
-					 * Solaris actually tries the recv
+					 * Solaris actually tries the recvfrom
 					 * call again, while HP-UX just dies. 
 					 * This code is an attempt to let the
 					 * entropy pool fill back up (at least
@@ -503,7 +503,7 @@
 	if (S_ISSOCK(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
-#if defined(S_ISFIFO)
+#if defined(S_ISFIFO) && defined(sun)
 	if (S_ISFIFO(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
--- bind-9.3.2/lib/isc/hmacmd5.c.9_3_3_isc	2004-03-08 04:04:48.000000000 -0500
+++ bind-9.3.2/lib/isc/hmacmd5.c	2006-06-13 20:59:23.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.c,v 1.5.12.3 2004/03/08 09:04:48 marka Exp $ */
+/* $Id: hmacmd5.c,v 1.5.12.5 2006/02/26 23:49:48 marka Exp $ */
 
 /*
  * This code implements the HMAC-MD5 keyed hash algorithm
@@ -65,7 +65,6 @@
 isc_hmacmd5_invalidate(isc_hmacmd5_t *ctx) {
 	isc_md5_invalidate(&ctx->md5ctx);
 	memset(ctx->key, 0, sizeof(ctx->key));
-	memset(ctx, 0, sizeof(ctx));
 }
 
 /*
--- bind-9.3.2/lib/isc/include/isc/heap.h.9_3_3_isc	2004-03-06 03:14:41.000000000 -0500
+++ bind-9.3.2/lib/isc/include/isc/heap.h	2006-06-13 21:02:28.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,36 +15,155 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.h,v 1.16.206.1 2004/03/06 08:14:41 marka Exp $ */
+/* $Id: heap.h,v 1.16.206.2 2006/04/17 18:27:20 explorer Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1
 
+/*! \file */
+
 #include <isc/lang.h>
 #include <isc/types.h>
 
 ISC_LANG_BEGINDECLS
 
-/*
+/*%
  * The comparision function returns ISC_TRUE if the first argument has
  * higher priority than the second argument, and ISC_FALSE otherwise.
  */
 typedef isc_boolean_t (*isc_heapcompare_t)(void *, void *);
 
+/*%
+ * The index function allows the client of the heap to receive a callback
+ * when an item's index number changes.  This allows it to maintain
+ * sync with its external state, but still delete itself, since deletions
+ * from the heap require the index be provided.
+ */
 typedef void (*isc_heapindex_t)(void *, unsigned int);
+
+/*%
+ * The heapaction function is used when iterating over the heap.
+ *
+ * NOTE:  The heap structure CANNOT BE MODIFIED during the call to
+ * isc_heap_foreach().
+ */
 typedef void (*isc_heapaction_t)(void *, void *);
 
 typedef struct isc_heap isc_heap_t;
 
-isc_result_t	isc_heap_create(isc_mem_t *, isc_heapcompare_t,
-				isc_heapindex_t, unsigned int, isc_heap_t **);
-void		isc_heap_destroy(isc_heap_t **);
-isc_result_t	isc_heap_insert(isc_heap_t *, void *);
-void		isc_heap_delete(isc_heap_t *, unsigned int);
-void		isc_heap_increased(isc_heap_t *, unsigned int);
-void		isc_heap_decreased(isc_heap_t *, unsigned int);
-void *		isc_heap_element(isc_heap_t *, unsigned int);
-void		isc_heap_foreach(isc_heap_t *, isc_heapaction_t, void *);
+isc_result_t
+isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
+		isc_heapindex_t index, unsigned int size_increment,
+		isc_heap_t **heapp);
+/*!<
+ * \brief Create a new heap.  The heap is implemented using a space-efficient
+ * storage method.  When the heap elements are deleted space is not freed
+ * but will be reused when new elements are inserted.
+ *
+ * Requires:
+ *\li	"mctx" is valid.
+ *\li	"compare" is a function which takes two void * arguments and
+ *	returns ISC_TRUE if the first argument has a higher priority than
+ *	the second, and ISC_FALSE otherwise.
+ *\li	"index" is a function which takes a void *, and an unsigned int
+ *	argument.  This function will be called whenever an element's
+ *	index value changes, so it may continue to delete itself from the
+ *	heap.  This option may be NULL if this functionality is unneeded.
+ *\li	"size_increment" is a hint about how large the heap should grow
+ *	when resizing is needed.  If this is 0, a default size will be
+ *	used, which is currently 1024, allowing space for an additional 1024
+ *	heap elements to be inserted before adding more space.
+ *\li	"heapp" is not NULL, and "*heap" is NULL.
+ *
+ * Returns:
+ *\li	ISC_R_SUCCESS		- success
+ *\li	ISC_R_NOMEMORY		- insufficient memory
+ */
+
+void
+isc_heap_destroy(isc_heap_t **heapp);
+/*!<
+ * \brief Destroys a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+isc_result_t
+isc_heap_insert(isc_heap_t *heap, void *elt);
+/*!<
+ * \brief Inserts a new element into a heap.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ */
+
+void
+isc_heap_delete(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Deletes an element from a heap, by element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_increased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has increased.
+ * This function MUST be called whenever an element has increased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void
+isc_heap_decreased(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Indicates to the heap that an element's priority has decreased.
+ * This function MUST be called whenever an element has decreased in priority.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ */
+
+void *
+isc_heap_element(isc_heap_t *heap, unsigned int index);
+/*!<
+ * \brief Returns the element for a specific element index.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"index" is a valid element index, as provided by the "index" callback
+ *	provided during heap creation.
+ *
+ * Returns:
+ *\li	A pointer to the element for the element index.
+ */
+
+void
+isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap);
+/*!<
+ * \brief Iterate over the heap, calling an action for each element.  The
+ * order of iteration is not sorted.
+ *
+ * Requires:
+ *\li	"heapp" is not NULL and "*heap" points to a valid isc_heap_t.
+ *\li	"action" is not NULL, and is a function which takes two arguments.
+ *	The first is a void *, representing the element, and the second is
+ *	"uap" as provided to isc_heap_foreach.
+ *\li	"uap" is a caller-provided argument, and may be NULL.
+ *
+ * Note:
+ *\li	The heap structure CANNOT be modified during this iteration.  The only
+ *	safe function to call while iterating the heap is isc_heap_element().
+ */
 
 ISC_LANG_ENDDECLS
 

bind-9.3.2-9_3_3_isccfg.patch:
 parser.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE bind-9.3.2-9_3_3_isccfg.patch ---
--- bind-9.3.2/lib/isccfg/parser.c.9_3_3_isccfg	2004-05-14 23:46:13.000000000 -0400
+++ bind-9.3.2/lib/isccfg/parser.c	2006-06-13 21:56:19.000000000 -0400
@@ -1556,6 +1556,10 @@
 	isc_lex_getlasttokentext(pctx->lexer, &pctx->token, &r);
 
 	obj->value.string.base = isc_mem_get(pctx->mctx, r.length + 1);
+	if (obj->value.string.base == NULL) {
+		result = ISC_R_NOMEMORY;
+		goto cleanup;
+	}
 	obj->value.string.length = r.length;
 	memcpy(obj->value.string.base, r.base, r.length);
 	obj->value.string.base[r.length] = '\0';

bind-9.3.2-9_3_3_lwres.patch:
 getaddrinfo.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE bind-9.3.2-9_3_3_lwres.patch ---
--- bind-9.3.2/lib/lwres/getaddrinfo.c.9_3_3_lwres	2005-06-09 19:54:33.000000000 -0400
+++ bind-9.3.2/lib/lwres/getaddrinfo.c	2006-06-13 22:01:34.000000000 -0400
@@ -326,7 +326,10 @@
 						      NI_NUMERICHOST) == 0) {
 					ai->ai_canonname = strdup(nbuf);
 					if (ai->ai_canonname == NULL)
+					{
+					        lwres_freeaddrinfo(ai_list);
 						return (EAI_MEMORY);
+					}
 				} else {
 					/* XXX raise error? */
 					ai->ai_canonname = NULL;

bind-9.3.2-9_3_3_named.patch:
 client.c       |   71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 config.c       |   13 +++++-----
 controlconf.c  |   50 +++++++++++++++++++++++++---------------
 interfacemgr.c |   15 +++++-------
 lwdgrbn.c      |    8 +++---
 lwresd.c       |    5 ++--
 query.c        |   47 ++++++++++++++++++++++++++-----------
 server.c       |   53 ++++++++++++++++++++++++------------------
 update.c       |   34 +++++++++++++++++++++------
 zoneconf.c     |    9 ++++---
 10 files changed, 218 insertions(+), 87 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_named.patch ---
--- bind-9.3.2/bin/named/lwdgrbn.c.9_3_3_named	2004-03-07 23:04:19.000000000 -0500
+++ bind-9.3.2/bin/named/lwdgrbn.c	2006-06-13 22:23:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgrbn.c,v 1.11.208.3 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwdgrbn.c,v 1.11.208.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -358,7 +358,7 @@
 	client->sendlength = r.length;
 	result = ns_lwdclient_sendreply(client, &r);
 	if (result != ISC_R_SUCCESS)
-		goto out;
+		goto out2;
 
 	NS_LWDCLIENT_SETSEND(client);
 
@@ -378,7 +378,7 @@
 	if (grbn->siglen != NULL)
 		isc_mem_put(cm->mctx, grbn->siglen,
 			    grbn->nsigs * sizeof(lwres_uint16_t));
-
+ out2:
 	if (client->lookup != NULL)
 		dns_lookup_destroy(&client->lookup);
 	if (lwb.base != NULL)
--- bind-9.3.2/bin/named/controlconf.c.9_3_3_named	2004-03-08 04:04:14.000000000 -0500
+++ bind-9.3.2/bin/named/controlconf.c	2006-06-13 22:12:06.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.28.2.9.2.6 2004/03/08 09:04:14 marka Exp $ */
+/* $Id: controlconf.c,v 1.28.2.9.2.10 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -356,6 +356,9 @@
 	{
 		ccregion.rstart = isc_buffer_base(&conn->ccmsg.buffer);
 		ccregion.rend = isc_buffer_used(&conn->ccmsg.buffer);
+		if (secret.rstart != NULL)
+			isc_mem_put(listener->mctx, secret.rstart,
+				    REGION_SIZE(secret));
 		secret.rstart = isc_mem_get(listener->mctx, key->secret.length);
 		if (secret.rstart == NULL)
 			goto cleanup;
@@ -371,8 +374,6 @@
 			 */
 			if (request != NULL)
 				isccc_sexpr_free(&request);
-			isc_mem_put(listener->mctx, secret.rstart,
-				    REGION_SIZE(secret));
 		} else {
 			log_invalid(&conn->ccmsg, result);
 			goto cleanup;
@@ -977,18 +978,25 @@
 		result = get_rndckey(listener->mctx, &listener->keys);
 	}
 
-	if (result != ISC_R_SUCCESS && global_keylist != NULL)
+	if (result != ISC_R_SUCCESS && global_keylist != NULL) {
 		/*
 		 * This message might be a little misleading since the
 		 * "new keys" might in fact be identical to the old ones,
 		 * but tracking whether they are identical just for the
 		 * sake of avoiding this message would be too much trouble.
 		 */
-		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
-			    "couldn't install new keys for "
-			    "command channel %s: %s",
-			    socktext, isc_result_totext(result));
-
+		if (control != NULL)
+			cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
+				    "couldn't install new keys for "
+				    "command channel %s: %s",
+				    socktext, isc_result_totext(result));
+		else
+			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+				      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+				      "couldn't install new keys for "
+				      "command channel %s: %s",
+				      socktext, isc_result_totext(result));
+	}
 
 	/*
 	 * Now, keep the old access list unless a new one can be made.
@@ -1005,12 +1013,18 @@
 		dns_acl_detach(&listener->acl);
 		dns_acl_attach(new_acl, &listener->acl);
 		dns_acl_detach(&new_acl);
-	} else
 		/* XXXDCL say the old acl is still used? */
+	} else if (control != NULL)
 		cfg_obj_log(control, ns_g_lctx, ISC_LOG_WARNING,
 			    "couldn't install new acl for "
 			    "command channel %s: %s",
 			    socktext, isc_result_totext(result));
+	else
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_CONTROL, ISC_LOG_WARNING,
+			      "couldn't install new acl for "
+			      "command channel %s: %s",
+			      socktext, isc_result_totext(result));
 
 	*listenerp = listener;
 }
@@ -1176,7 +1190,7 @@
 			     element2 = cfg_list_next(element2)) {
 				cfg_obj_t *control;
 				cfg_obj_t *obj;
-				isc_sockaddr_t *addr;
+				isc_sockaddr_t addr;
 
 				/*
 				 * The parser handles BIND 8 configuration file
@@ -1189,12 +1203,12 @@
 				control = cfg_listelt_value(element2);
 
 				obj = cfg_tuple_get(control, "address");
-				addr = cfg_obj_assockaddr(obj);
-				if (isc_sockaddr_getport(addr) == 0)
-					isc_sockaddr_setport(addr,
+				addr = *cfg_obj_assockaddr(obj);
+				if (isc_sockaddr_getport(&addr) == 0)
+					isc_sockaddr_setport(&addr,
 							     NS_CONTROL_PORT);
 
-				isc_sockaddr_format(addr, socktext,
+				isc_sockaddr_format(&addr, socktext,
 						    sizeof(socktext));
 
 				isc_log_write(ns_g_lctx,
@@ -1205,7 +1219,7 @@
 					      socktext);
 
 				update_listener(cp, &listener, control, config,
-						addr, aclconfctx, socktext);
+						&addr, aclconfctx, socktext);
 
 				if (listener != NULL)
 					/*
@@ -1219,7 +1233,7 @@
 					 * This is a new listener.
 					 */
 					add_listener(cp, &listener, control,
-						     config, addr, aclconfctx,
+						     config, &addr, aclconfctx,
 						     socktext);
 
 				if (listener != NULL)
--- bind-9.3.2/bin/named/zoneconf.c.9_3_3_named	2005-09-05 22:12:39.000000000 -0400
+++ bind-9.3.2/bin/named/zoneconf.c	2006-06-13 22:21:09.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.87.2.4.10.15 2005/09/06 02:12:39 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.4.10.19 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -106,8 +106,10 @@
 	isc_result_t result;
 
 	(void)cfg_map_get(zconfig, "update-policy", &updatepolicy);
-	if (updatepolicy == NULL)
+	if (updatepolicy == NULL) {
+		dns_zone_setssutable(zone, NULL);
 		return (ISC_R_SUCCESS);
+	}
 
 	result = dns_ssutable_create(mctx, &table);
 	if (result != ISC_R_SUCCESS)
@@ -612,6 +614,7 @@
 	switch (ztype) {
 	case dns_zone_slave:
 	case dns_zone_stub:
+		count = 0;
 		obj = NULL;
 		result = cfg_map_get(zoptions, "masters", &obj);
 		if (obj != NULL) {
--- bind-9.3.2/bin/named/lwresd.c.9_3_3_named	2004-03-07 23:04:19.000000000 -0500
+++ bind-9.3.2/bin/named/lwresd.c	2006-06-13 22:28:30.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.37.2.2.2.5 2004/03/08 04:04:19 marka Exp $ */
+/* $Id: lwresd.c,v 1.37.2.2.2.8 2006/02/28 06:32:53 marka Exp $ */
 
 /*
  * Main program for the Lightweight Resolver Daemon.
@@ -407,6 +407,7 @@
 		ns_lwsearchlist_detach(&lwresd->search);
 	if (lwresd->mctx != NULL)
 		isc_mem_detach(&lwresd->mctx);
+	isc_mem_put(mctx, lwresd, sizeof(ns_lwresd_t));
 	return (result);
 }
 
--- bind-9.3.2/bin/named/query.c.9_3_3_named	2005-08-11 01:25:20.000000000 -0400
+++ bind-9.3.2/bin/named/query.c	2006-06-13 22:34:22.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.198.2.13.4.36 2005/08/11 05:25:20 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.41 2006/05/18 03:15:46 marka Exp $ */
 
 #include <config.h>
 
@@ -2091,17 +2091,31 @@
 		result = isc_quota_attach(&ns_g_server->recursionquota,
 					  &client->recursionquota);
 		if  (result == ISC_R_SOFTQUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "recursive-clients soft limit exceeded, "
-				      "aborting oldest query");
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "recursive-clients soft limit "
+					      "exceeded, aborting oldest query");
+			}
 			ns_client_killoldestquery(client);
 			result = ISC_R_SUCCESS;
 		} else if (result == ISC_R_QUOTA) {
-			ns_client_log(client, NS_LOGCATEGORY_CLIENT,
-				      NS_LOGMODULE_QUERY, ISC_LOG_WARNING,
-				      "no more recursive clients: %s",
-				      isc_result_totext(result));
+			static isc_stdtime_t last = 0;
+			isc_stdtime_t now;
+			isc_stdtime_get(&now);
+			if (now != last) {
+				last = now;
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY,
+					      ISC_LOG_WARNING,
+					      "no more recursive clients: %s",
+					      isc_result_totext(result));
+			}
 			ns_client_killoldestquery(client);
 		}
 		if (result == ISC_R_SUCCESS && !client->mortal &&
@@ -2469,7 +2483,7 @@
 	/*
 	 * First we must find the right database.
 	 */
-	options = 0;
+	options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
 	if (dns_rdatatype_atparent(qtype) &&
 	    !dns_name_equal(client->query.qname, dns_rootname))
 		options |= DNS_GETDB_NOEXACT;
@@ -2509,9 +2523,10 @@
 		}
 	}
 	if (result != ISC_R_SUCCESS) {
-		if (result == DNS_R_REFUSED)
-			QUERY_ERROR(DNS_R_REFUSED);
-		else
+		if (result == DNS_R_REFUSED) {
+			if (!PARTIALANSWER(client))
+				QUERY_ERROR(DNS_R_REFUSED);
+		} else
 			QUERY_ERROR(DNS_R_SERVFAIL);
 		goto cleanup;
 	}
@@ -2998,6 +3013,8 @@
 		query_maybeputqname(client);
 		client->query.qname = tname;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	case DNS_R_DNAME:
 		/*
@@ -3115,6 +3132,8 @@
 		client->query.qname = fname;
 		fname = NULL;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	default:
 		/*
--- bind-9.3.2/bin/named/update.c.9_3_3_named	2005-10-07 20:21:06.000000000 -0400
+++ bind-9.3.2/bin/named/update.c	2006-06-13 22:54:34.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.88.2.5.2.27 2005/10/08 00:21:06 marka Exp $ */
+/* $Id: update.c,v 1.88.2.5.2.29 2006/01/06 00:01:42 marka Exp $ */
 
 #include <config.h>
 
@@ -36,6 +36,7 @@
 #include <dns/rdataclass.h>
 #include <dns/rdataset.h>
 #include <dns/rdatasetiter.h>
+#include <dns/rdatastruct.h>
 #include <dns/rdatatype.h>
 #include <dns/soa.h>
 #include <dns/ssu.h>
@@ -1517,7 +1518,8 @@
  */
 static isc_result_t
 add_nsec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
-	dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff)
+	 dns_dbversion_t *ver, dns_name_t *name, dns_ttl_t nsecttl,
+	 dns_diff_t *diff)
 {
 	isc_result_t result;
 	dns_dbnode_t *node = NULL;
@@ -1552,8 +1554,7 @@
 	 * Add the new NSEC and record the change.
 	 */
 	CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_ADD, name,
-				   3600,	/* XXXRTH */
-				   &rdata, &tuple));
+				   nsecttl, &rdata, &tuple));
 	CHECK(do_one_tuple(&tuple, db, ver, diff));
 	INSIST(tuple == NULL);
 
@@ -1678,6 +1679,11 @@
 	unsigned int nkeys = 0;
 	unsigned int i;
 	isc_stdtime_t now, inception, expire;
+	dns_ttl_t nsecttl;
+	dns_rdata_soa_t soa;
+	dns_rdata_t rdata = DNS_RDATA_INIT;
+	dns_rdataset_t rdataset;
+	dns_dbnode_t *node = NULL;
 
 	dns_diff_init(client->mctx, &diffnames);
 	dns_diff_init(client->mctx, &affected);
@@ -1699,6 +1705,20 @@
 	expire = now + sigvalidityinterval;
 
 	/*
+	 * Get the NSEC's TTL from the SOA MINIMUM field.
+	 */
+	CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node));
+	dns_rdataset_init(&rdataset);
+	CHECK(dns_db_findrdataset(db, node, newver, dns_rdatatype_soa, 0,
+                                  (isc_stdtime_t) 0, &rdataset, NULL));
+	CHECK(dns_rdataset_first(&rdataset));
+	dns_rdataset_current(&rdataset, &rdata);
+	CHECK(dns_rdata_tostruct(&rdata, &soa, NULL));
+	nsecttl = soa.minimum;
+	dns_rdataset_disassociate(&rdataset);
+	dns_db_detachnode(db, &node);
+
+	/*
 	 * Find all RRsets directly affected by the update, and
 	 * update their RRSIGs.  Also build a list of names affected
 	 * by the update in "diffnames".
@@ -1901,8 +1921,8 @@
 			 * there is other data, and if there is other data,
 			 * there are other RRSIGs.
 			 */
-			CHECK(add_nsec(client, zone, db, newver,
-				      &t->name, &nsec_diff));
+			CHECK(add_nsec(client, zone, db, newver, &t->name,
+				       nsecttl, &nsec_diff));
 		}
 	}
 
--- bind-9.3.2/bin/named/config.c.9_3_3_named	2004-10-04 22:52:26.000000000 -0400
+++ bind-9.3.2/bin/named/config.c	2006-06-13 22:17:33.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.11.2.4.8.29 2004/10/05 02:52:26 marka Exp $ */
+/* $Id: config.c,v 1.11.2.4.8.32 2006/02/28 06:32:53 marka Exp $ */
 
 #include <config.h>
 
@@ -439,13 +439,14 @@
 		if (val > ISC_UINT16_MAX) {
 			cfg_obj_log(portobj, ns_g_lctx, ISC_LOG_ERROR,
 				    "port '%u' out of range", val);
-			return (ISC_R_RANGE);
+			result = ISC_R_RANGE;
+			goto cleanup;
 		}
 		port = (in_port_t) val;
 	} else {
 		result = ns_config_getport(config, &port);
 		if (result != ISC_R_SUCCESS)
-			return (result);
+			goto cleanup;
 	}
 
 	result = ISC_R_NOMEMORY;
@@ -606,9 +607,9 @@
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, addrs, newsize);
-			isc_mem_put(mctx, addrs, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, addrs, oldsize);
 		addrs = new;
 		addrcount = i;
 
@@ -619,9 +620,9 @@
 			if (new == NULL)
 				goto cleanup;
 			memcpy(new, keys,  newsize);
-			isc_mem_put(mctx, keys, oldsize);
 		} else
 			new = NULL;
+		isc_mem_put(mctx, keys, oldsize);
 		keys = new;
 		keycount = i;
 	}
--- bind-9.3.2/bin/named/interfacemgr.c.9_3_3_named	2004-08-10 00:56:23.000000000 -0400
+++ bind-9.3.2/bin/named/interfacemgr.c	2006-06-13 22:31:59.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.59.2.5.8.15 2004/08/10 04:56:23 jinmei Exp $ */
+/* $Id: interfacemgr.c,v 1.59.2.5.8.17 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -717,9 +717,8 @@
 			 * See if the address matches the listen-on statement;
 			 * if not, ignore the interface.
 			 */
-			result = dns_acl_match(&listen_netaddr, NULL,
-					       le->acl, &mgr->aclenv,
-					       &match, NULL);
+			(void)dns_acl_match(&listen_netaddr, NULL, le->acl,
+					    &mgr->aclenv, &match, NULL);
 			if (match <= 0)
 				continue;
 
@@ -745,9 +744,9 @@
 				for (ele = ISC_LIST_HEAD(ext_listen->elts);
 				     ele != NULL;
 				     ele = ISC_LIST_NEXT(ele, link)) {
-					dns_acl_match(&listen_netaddr, NULL,
-						      ele->acl, NULL,
-						      &match, NULL);
+					(void)dns_acl_match(&listen_netaddr,
+							    NULL, ele->acl,
+							    NULL, &match, NULL);
 					if (match > 0 && ele->port == le->port)
 						break;
 					else
--- bind-9.3.2/bin/named/server.c.9_3_3_named	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/bin/named/server.c	2006-06-13 22:45:55.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339.2.15.2.65 2005/07/27 02:53:15 marka Exp $ */
+/* $Id: server.c,v 1.339.2.15.2.70 2006/05/24 04:30:24 marka Exp $ */
 
 #include <config.h>
 
@@ -220,7 +220,7 @@
 	}
 	maps[i] = NULL;
 
-	result = ns_config_get(maps, aclname, &aclobj);
+	(void)ns_config_get(maps, aclname, &aclobj);
 	if (aclobj == NULL)
 		/*
 		 * No value available.  *aclp == NULL.
@@ -438,7 +438,6 @@
 	case AF_INET:
 		result = ns_config_get(maps, "query-source", &obj);
 		INSIST(result == ISC_R_SUCCESS);
-
 		break;
 	case AF_INET6:
 		result = ns_config_get(maps, "query-source-v6", &obj);
@@ -569,7 +568,7 @@
 	/*
 	 * "*" should match everything including the root (BIND 8 compat).
 	 * As dns_name_matcheswildcard(".", "*.") returns FALSE add a
-	 * explict entry for "." when the name is "*".
+	 * explicit entry for "." when the name is "*".
 	 */
 	if (addroot) {
 		result = dns_order_add(order, dns_rootname,
@@ -1080,7 +1079,7 @@
 	 * Configure the "match-recursive-only" option.
 	 */
 	obj = NULL;
-	(void) ns_config_get(maps, "match-recursive-only", &obj);
+	(void)ns_config_get(maps, "match-recursive-only", &obj);
 	if (obj != NULL && cfg_obj_asboolean(obj))
 		view->matchrecursiveonly = ISC_TRUE;
 	else
@@ -1498,8 +1497,8 @@
 	if (result != ISC_R_SUCCESS) {
 		char namebuf[DNS_NAME_FORMATSIZE];
 		dns_name_format(origin, namebuf, sizeof(namebuf));
-		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_NOTICE,
-			    "setting up forwarding failed for domain '%s': %s",
+		cfg_obj_log(forwarders, ns_g_lctx, ISC_LOG_WARNING,
+			    "could not set up forwarding for domain '%s': %s",
 			    namebuf, isc_result_totext(result));
 		goto cleanup;
 	}
@@ -1893,8 +1892,7 @@
 
  clean:
 	INSIST(lelt == NULL);
-	if (src_acl != NULL)
-		dns_acl_detach(&src_acl);
+	dns_acl_detach(&src_acl);
 
 	return (result);
 }
@@ -3477,20 +3475,29 @@
 ns_server_refreshcommand(ns_server_t *server, char *args, isc_buffer_t *text) {
 	isc_result_t result;
 	dns_zone_t *zone = NULL;
-	const unsigned char msg[] = "zone refresh queued";
-
+	const unsigned char msg1[] = "zone refresh queued";
+	const unsigned char msg2[] = "not a slave or stub zone";
+	dns_zonetype_t type;
+	
 	result = zone_from_args(server, args, &zone);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	if (zone == NULL)
 		return (ISC_R_UNEXPECTEDEND);
-	
-	dns_zone_refresh(zone);
-	dns_zone_detach(&zone);
-	if (sizeof(msg) <= isc_buffer_availablelength(text))
-		isc_buffer_putmem(text, msg, sizeof(msg));
 
-	return (ISC_R_SUCCESS);
+	type = dns_zone_gettype(zone);
+	if (type == dns_zone_slave || type == dns_zone_stub) {
+		dns_zone_refresh(zone);
+		dns_zone_detach(&zone);
+		if (sizeof(msg1) <= isc_buffer_availablelength(text))
+			isc_buffer_putmem(text, msg1, sizeof(msg1));
+		return (ISC_R_SUCCESS);
+	}
+		
+	dns_zone_detach(&zone);
+	if (sizeof(msg2) <= isc_buffer_availablelength(text))
+		isc_buffer_putmem(text, msg2, sizeof(msg2));
+	return (ISC_R_FAILURE);
 }	
 
 isc_result_t
@@ -3842,6 +3849,11 @@
 	char *ptr;
 	const char *sep;
 
+	/* Skip the command name. */
+	ptr = next_token(&args, " \t");
+	if (ptr == NULL)
+		return (ISC_R_UNEXPECTEDEND);
+
 	dctx = isc_mem_get(server->mctx, sizeof(*dctx));
 	if (dctx == NULL)
 		return (ISC_R_NOMEMORY);
@@ -3864,11 +3876,6 @@
 	CHECKMF(isc_stdio_open(server->dumpfile, "w", &dctx->fp),
 		"could not open dump file", server->dumpfile);
 
-	/* Skip the command name. */
-	ptr = next_token(&args, " \t");
-	if (ptr == NULL)
-		return (ISC_R_UNEXPECTEDEND);
-
 	sep = (args == NULL) ? "" : ": ";
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 		      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
--- bind-9.3.2/bin/named/client.c.9_3_3_named	2005-07-26 22:53:14.000000000 -0400
+++ bind-9.3.2/bin/named/client.c	2006-06-13 22:26:31.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.13.4.26 2005/07/27 02:53:14 marka Exp $ */
+/* $Id: client.c,v 1.176.2.13.4.28 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -164,6 +164,12 @@
  * Must be greater than any valid state.
  */
 
+/*
+ * Enable ns_client_dropport() by default.
+ */
+#ifndef NS_CLIENT_DROPPORT
+#define NS_CLIENT_DROPPORT 1
+#endif
 
 static void client_read(ns_client_t *client);
 static void client_accept(ns_client_t *client);
@@ -972,6 +978,34 @@
 	ns_client_next(client, result);
 }
 
+#if NS_CLIENT_DROPPORT
+#define DROPPORT_NO		0
+#define DROPPORT_REQUEST	1
+#define DROPPORT_RESPONSE	2
+/*%
+ * ns_client_dropport determines if certain requests / responses
+ * should be dropped based on the port number.
+ *
+ * Returns:
+ * \li	0:	Don't drop.
+ * \li	1:	Drop request.
+ * \li	2:	Drop (error) response.
+ */
+static int
+ns_client_dropport(in_port_t port) {
+	switch (port) {
+	case 7: /* echo */
+	case 13: /* daytime */
+	case 19: /* chargen */
+	case 37: /* time */
+		return (DROPPORT_REQUEST);
+	case 464: /* kpasswd */
+		return (DROPPORT_RESPONSE);
+	}
+	return (DROPPORT_NO);
+}
+#endif
+
 void
 ns_client_error(ns_client_t *client, isc_result_t result) {
 	dns_rcode_t rcode;
@@ -984,6 +1018,28 @@
 	message = client->message;
 	rcode = dns_result_torcode(result);
 
+#if NS_CLIENT_DROPPORT
+	/*
+	 * Don't send FORMERR to ports on the drop port list.
+	 */
+	if (rcode == dns_rcode_formerr &&
+	    ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) !=
+	    DROPPORT_NO) {
+		char buf[64];
+		isc_buffer_t b;
+
+		isc_buffer_init(&b, buf, sizeof(buf) - 1);
+		if (dns_rcode_totext(rcode, &b) != ISC_R_SUCCESS)
+			isc_buffer_putstr(&b, "UNKNOWN RCODE");
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped error (%.*s) response: suspicious port",
+			      (int)isc_buffer_usedlength(&b), buf);
+		ns_client_next(client, ISC_R_SUCCESS);
+		return;
+	}
+#endif
+
 	/*
 	 * Message may be an in-progress reply that we had trouble
 	 * with, in which case QR will be set.  We need to clear QR before
@@ -1208,6 +1264,17 @@
 
 	isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr);
 
+#if NS_CLIENT_DROPPORT
+	if (ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) ==
+	    DROPPORT_REQUEST) {
+		ns_client_log(client, DNS_LOGCATEGORY_SECURITY,
+			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10),
+			      "dropped request: suspicious port");
+		ns_client_next(client, ISC_R_SUCCESS);
+		goto cleanup;
+	}
+#endif
+
 	ns_client_log(client, NS_LOGCATEGORY_CLIENT,
 		      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3),
 		      "%s request",

bind-9.3.2-9_3_3_nsupdate.patch:
 nsupdate.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_nsupdate.patch ---
--- bind-9.3.2/bin/nsupdate/nsupdate.c.9_3_3_nsupdate	2005-03-16 22:58:26.000000000 -0500
+++ bind-9.3.2/bin/nsupdate/nsupdate.c	2006-06-13 23:12:59.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.103.2.15.2.20 2005/03/17 03:58:26 marka Exp $ */
+/* $Id: nsupdate.c,v 1.103.2.15.2.22 2006/01/07 00:23:33 marka Exp $ */
 
 #include <config.h>
 
@@ -1665,7 +1665,7 @@
 		result = dns_request_createvia3(requestmgr, soaquery,
 						localaddr, addr, 0, NULL,
 						FIND_TIMEOUT * 20,
-						FIND_TIMEOUT * 20, 3,
+						FIND_TIMEOUT, 3,
 						global_task, recvsoa, reqinfo,
 						&request);
 		check_result(result, "dns_request_createvia");

bind-9.3.2-9_3_3_resolver.patch:
 resolver.c |   54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 40 insertions(+), 14 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_resolver.patch ---
--- bind-9.3.2/lib/dns/resolver.c.9_3_3_resolver	2006-06-13 17:18:24.000000000 -0400
+++ bind-9.3.2/lib/dns/resolver.c	2006-06-13 19:03:28.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.18.4.56 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.18.4.63 2006/01/06 01:21:08 marka Exp $ */
 
 #include <config.h>
 
@@ -27,8 +27,10 @@
 
 #include <dns/acl.h>
 #include <dns/adb.h>
+#include <dns/cache.h>
 #include <dns/db.h>
 #include <dns/dispatch.h>
+#include <dns/ds.h>
 #include <dns/events.h>
 #include <dns/forward.h>
 #include <dns/keytable.h>
@@ -47,6 +49,7 @@
 #include <dns/rdatatype.h>
 #include <dns/resolver.h>
 #include <dns/result.h>
+#include <dns/rootns.h>
 #include <dns/tsig.h>
 #include <dns/validator.h>
 
@@ -1027,9 +1030,11 @@
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_query;
 
+#ifndef BROKEN_TCP_BIND_BEFORE_CONNECT
 		result = isc_socket_bind(query->tcpsocket, &addr);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_socket;
+#endif
 
 		/*
 		 * A dispatch will be created once the connect succeeds.
@@ -1287,6 +1292,12 @@
 	}
 
 	/*
+	 * Clear CD if EDNS is not in use.
+	 */
+	if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0)
+		fctx->qmessage->flags &= ~DNS_MESSAGEFLAG_CD;
+
+	/*
 	 * Add TSIG record tailored to the current recipient.
 	 */
 	result = dns_view_getpeertsig(fctx->res->view, &ipaddr, &tsigkey);
@@ -3155,10 +3166,12 @@
 	 * so, destroy the fctx.
 	 */
 	if (SHUTTINGDOWN(fctx) && !sentresponse) {
-		maybe_destroy(fctx);
+		maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
+	LOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
 	/*
 	 * If chaining, we need to make sure that the right result code is
 	 * returned, and that the rdatasets are bound.
@@ -3217,10 +3230,11 @@
 		result = vevent->result;
 		add_bad(fctx, &addrinfo->sockaddr, result);
 		isc_event_free(&event);
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (sentresponse)
-			fctx_done(fctx, result);
+			fctx_done(fctx, result);	/* Locks bucket. */
 		else
-			fctx_try(fctx);
+			fctx_try(fctx);			/* Locks bucket. */
 		return;
 	}
 
@@ -3265,6 +3279,7 @@
 		result = dns_rdataset_addnoqname(vevent->rdataset,
 				   vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF]);
 		RUNTIME_CHECK(result == ISC_R_SUCCESS);
+		INSIST(vevent->sigrdataset != NULL);
 		vevent->sigrdataset->ttl = vevent->rdataset->ttl;
 	}
 
@@ -3297,9 +3312,9 @@
 		 * If we only deferred the destroy because we wanted to cache
 		 * the data, destroy now.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		if (SHUTTINGDOWN(fctx))
-			maybe_destroy(fctx);
-
+			maybe_destroy(fctx);	/* Locks bucket. */
 		goto cleanup_event;
 	}
 
@@ -3312,6 +3327,7 @@
 		 * more rdatasets that still need to
 		 * be validated.
 		 */
+		UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
 		goto cleanup_event;
 	}
 
@@ -3384,7 +3400,9 @@
 	if (node != NULL)
 		dns_db_detachnode(fctx->cache, &node);
 
-	fctx_done(fctx, result);
+	UNLOCK(&fctx->res->buckets[fctx->bucketnum].lock);
+
+	fctx_done(fctx, result);	/* Locks bucket. */
 
  cleanup_event:
 	isc_event_free(&event);
@@ -3771,7 +3789,7 @@
 	}
 	result = dns_ncache_add(message, cache, node, covers, now,
 				maxttl, ardataset);
-	if ((result == DNS_R_UNCHANGED) || (result == ISC_R_SUCCESS)) {
+	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
 		/*
 		 * If the cache now contains a negative entry and we
 		 * care about whether it is DNS_R_NCACHENXDOMAIN or
@@ -3799,7 +3817,7 @@
 		}
 		result = ISC_R_SUCCESS;
 	}
-	if ((ardataset == &rdataset) && dns_rdataset_isassociated(ardataset))
+	if (ardataset == &rdataset && dns_rdataset_isassociated(ardataset))
 		dns_rdataset_disassociate(ardataset);
 
 	return (result);
@@ -4916,6 +4934,7 @@
 		fctx_try(fctx);
 	} else {
 		unsigned int n;
+		dns_rdataset_t *nsrdataset = NULL;
 
 		/*
 		 * Retrieve state from fctx->nsfetch before we destroy it.
@@ -4923,13 +4942,20 @@
 		dns_fixedname_init(&fixed);
 		domain = dns_fixedname_name(&fixed);
 		dns_name_copy(&fctx->nsfetch->private->domain, domain, NULL);
-		dns_rdataset_clone(&fctx->nsfetch->private->nameservers,
-				   &nameservers);
-		dns_resolver_destroyfetch(&fctx->nsfetch);
 		if (dns_name_equal(&fctx->nsname, domain)) {
 			fctx_done(fctx, DNS_R_SERVFAIL);
+			dns_resolver_destroyfetch(&fctx->nsfetch);
 			goto cleanup;
 		}
+		if (dns_rdataset_isassociated(
+		    &fctx->nsfetch->private->nameservers)) {
+			dns_rdataset_clone(
+			    &fctx->nsfetch->private->nameservers,
+			    &nameservers);
+			nsrdataset = &nameservers;
+		} else
+			domain = NULL;
+		dns_resolver_destroyfetch(&fctx->nsfetch);
 		n = dns_name_countlabels(&fctx->nsname);
 		dns_name_getlabelsequence(&fctx->nsname, 1, n - 1,
 					  &fctx->nsname);
@@ -4939,7 +4965,7 @@
 		FCTXTRACE("continuing to look for parent's NS records");
 		result = dns_resolver_createfetch(fctx->res, &fctx->nsname,
 						  dns_rdatatype_ns, domain,
-						  &nameservers, NULL, 0, task,
+						  nsrdataset, NULL, 0, task,
 						  resume_dslookup, fctx,
 						  &fctx->nsrrset, NULL,
 						  &fctx->nsfetch);

bind-9.3.2-9_3_3_tests.patch:
 compress_test.c         |    6 +--
 db/t_db.c               |    8 +++-
 dst/dst_test.c          |   27 ++++++++++++----
 dst/t_dst.c             |   29 ++++++++++++++---
 master/t_master.c       |    8 +++-
 names/t_names.c         |   64 ++++++++++++++++++++++++++++-----------
 rbt/t_rbt.c             |   78 ++++++++++++++++++++++++++++--------------------
 rdata_test.c            |   10 +++---
 system/tkey/keycreate.c |    8 +++-
 system/tkey/keydelete.c |    8 +++-
 tasks/t_tasks.c         |   20 ++++++++----
 11 files changed, 180 insertions(+), 86 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_tests.patch ---
--- bind-9.3.2/bin/tests/names/t_names.c.9_3_3_tests	2004-03-08 16:06:23.000000000 -0500
+++ bind-9.3.2/bin/tests/names/t_names.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.32.2.2.8.3 2004/03/08 21:06:23 marka Exp $ */
+/* $Id: t_names.c,v 1.32.2.2.8.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -566,8 +566,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -677,8 +679,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -831,8 +835,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -949,8 +955,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1049,8 +1057,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1145,8 +1155,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 3) {
@@ -1226,8 +1238,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -1336,8 +1350,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1464,8 +1480,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1552,8 +1570,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1600,8 +1620,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 1) {
@@ -1735,8 +1757,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1869,8 +1893,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 2) {
@@ -2028,8 +2054,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 6) {
@@ -2221,8 +2249,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = bustline(p, Tokens);
 			if (cnt == 5) {
--- bind-9.3.2/bin/tests/tasks/t_tasks.c.9_3_3_tests	2005-07-19 03:08:36.000000000 -0400
+++ bind-9.3.2/bin/tests/tasks/t_tasks.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.29.12.9 2005/07/19 07:08:36 marka Exp $ */
+/* $Id: t_tasks.c,v 1.29.12.11 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -2131,6 +2131,7 @@
 #define T14_NTASKS 10
 #define T14_EXCLTASK 6
 
+int t14_exclusiveerror = ISC_R_SUCCESS;
 int t14_error = 0;
 int t14_done = 0;
 
@@ -2146,8 +2147,12 @@
 	t_info("task enter %d\n", taskno);	
 	if (taskno == T14_EXCLTASK) {
 		int	i;
-		isc_task_beginexclusive(task);
-		t_info("task %d got exclusive access\n", taskno);			
+		t14_exclusiveerror = isc_task_beginexclusive(task);
+		if (t14_exclusiveerror == ISC_R_SUCCESS)
+			t_info("task %d got exclusive access\n", taskno);
+		else
+			t_info("task %d failed to got exclusive access: %d\n",
+				taskno, t14_exclusiveerror);
 		for (i = 0; i < T14_NTASKS; i++) {
    		        t_info("task %d state %d\n", i , t14_active[i]);
 			if (t14_active[i])
@@ -2251,8 +2256,11 @@
 
 	isc_taskmgr_destroy(&manager);
 
-	if (t14_error) {
-		t_info("mutual access occurred\n");
+	if (t14_exclusiveerror != ISC_R_SUCCESS || t14_error) {
+		if (t14_exclusiveerror != ISC_R_SUCCESS)
+			t_info("isc_task_beginexclusive() failed\n");
+		if (t14_error)
+			t_info("mutual access occurred\n");
 		return(T_FAIL);
 	}
 
--- bind-9.3.2/bin/tests/system/tkey/keycreate.c.9_3_3_tests	2004-06-10 20:30:53.000000000 -0400
+++ bind-9.3.2/bin/tests/system/tkey/keycreate.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keycreate.c,v 1.7.12.5 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keycreate.c,v 1.7.12.7 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -144,7 +144,9 @@
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	dns_fixedname_init(&keyname);
--- bind-9.3.2/bin/tests/system/tkey/keydelete.c.9_3_3_tests	2004-06-10 20:30:53.000000000 -0400
+++ bind-9.3.2/bin/tests/system/tkey/keydelete.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keydelete.c,v 1.4.206.3 2004/06/11 00:30:53 marka Exp $ */
+/* $Id: keydelete.c,v 1.4.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -118,7 +118,9 @@
 
 	isc_event_free(&event);
 
-	inet_pton(AF_INET, "10.53.0.1", &inaddr);
+	result = ISC_R_FAILURE;
+	if (inet_pton(AF_INET, "10.53.0.1", &inaddr) != 1)
+		CHECK("inet_pton", result);
 	isc_sockaddr_fromin(&address, &inaddr, PORT);
 
 	query = NULL;
--- bind-9.3.2/bin/tests/rbt/t_rbt.c.9_3_3_tests	2004-10-24 21:36:07.000000000 -0400
+++ bind-9.3.2/bin/tests/rbt/t_rbt.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_rbt.c,v 1.23.206.4 2004/10/25 01:36:07 marka Exp $ */
+/* $Id: t_rbt.c,v 1.23.206.6 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -127,6 +127,7 @@
 	isc_result_t	result;
 	isc_buffer_t	source;
 	isc_buffer_t	target;
+	dns_name_t	*name;
 
 	nfails = 0;
 
@@ -141,22 +142,26 @@
 		 * The buffer for the actual name will immediately follow the
 		 * name structure.
 		 */
-		*dns_name = isc_mem_get(mctx, sizeof(**dns_name) + DNSNAMELEN);
-		if (*dns_name == NULL) {
+		name = isc_mem_get(mctx, sizeof(*name) + DNSNAMELEN);
+		if (name == NULL) {
 			t_info("isc_mem_get failed\n");
 			++nfails;
-		}
+		} else {
 
-		dns_name_init(*dns_name, NULL);
-		isc_buffer_init(&target, *dns_name + 1, DNSNAMELEN);
+			dns_name_init(name, NULL);
+			isc_buffer_init(&target, name + 1, DNSNAMELEN);
 
-		result = dns_name_fromtext(*dns_name, &source, dns_rootname,
-					   ISC_FALSE, &target);
+			result = dns_name_fromtext(name, &source, dns_rootname,
+						   ISC_FALSE, &target);
 
-		if (result != ISC_R_SUCCESS) {
-			++nfails;
-			t_info("dns_name_fromtext(%s) failed %s\n",
-			       s, dns_result_totext(result));
+			if (result != ISC_R_SUCCESS) {
+				++nfails;
+				t_info("dns_name_fromtext(%s) failed %s\n",
+				       s, dns_result_totext(result));
+				 isc_mem_put(mctx, name,
+					     sizeof(*name) + DNSNAMELEN);
+			} else
+				*dns_name = name;
 		}
 	} else {
 		++nfails;
@@ -182,15 +187,17 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			if (T_debug)
 				t_info("dns_rbt_addname succeeded\n");
 			*dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
+			if (*dns_result != ISC_R_SUCCESS) {
+				delete_name(dns_name, mctx);
+				t_info("dns_rbt_addname failed %s\n",
+		       		       dns_result_totext(*dns_result));
+				++nprobs;
+			}
 		} else {
-			t_info("dns_rbt_addname failed %s\n",
-		       			dns_result_totext(*dns_result));
-			delete_name(dns_name, mctx);
 			++nprobs;
 		}
 	} else {
@@ -208,8 +215,7 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_name);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_name) == 0) {
 			*dns_result = dns_rbt_deletename(rbt, dns_name,
 							 ISC_FALSE);
 			delete_name(dns_name, mctx);
@@ -234,8 +240,7 @@
 
 	nprobs = 0;
 	if (name && dns_result) {
-		*dns_result = create_name(name, mctx, &dns_searchname);
-		if (*dns_result == ISC_R_SUCCESS) {
+		if (create_name(name, mctx, &dns_searchname) == 0) {
 			dns_fixedname_init(&dns_fixedname);
 			dns_foundname = dns_fixedname_name(&dns_fixedname);
 			data = NULL;
@@ -281,7 +286,7 @@
 		 * Skip any comment lines.
 		 */
 		if ((*p == '#') || (*p == '\0') || (*p == ' ')) {
-			free(p);
+			(void)free(p);
 			continue;
 		}
 
@@ -362,8 +367,7 @@
 	if (strcmp(command, "create") == 0) {
 		result = T_PASS;
 	} else if (strcmp(command, "add") == 0) {
-		dns_result = create_name(testname, mctx, &dns_name);
-		if (dns_result == ISC_R_SUCCESS) {
+		if (create_name(testname, mctx, &dns_name) == 0) {
 			dns_result = dns_rbt_addname(rbt, dns_name, dns_name);
 
 			if (dns_result != ISC_R_SUCCESS)
@@ -466,8 +470,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of db file, command, testname,
@@ -976,8 +982,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 10) {
@@ -1163,8 +1171,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1354,8 +1364,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 5) {
@@ -1560,8 +1572,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
@@ -1765,8 +1779,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, Tokens);
 			if (cnt == 4) {
--- bind-9.3.2/bin/tests/master/t_master.c.9_3_3_tests	2004-03-07 23:04:29.000000000 -0500
+++ bind-9.3.2/bin/tests/master/t_master.c	2006-01-04 18:50:20.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_master.c,v 1.30.206.3 2004/03/08 04:04:29 marka Exp $ */
+/* $Id: t_master.c,v 1.30.206.5 2006/01/04 23:50:20 marka Exp $ */
 
 #include <config.h>
 
@@ -153,8 +153,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace(*p & 0xff)) || (*p == '#'))
+			if ((isspace(*p & 0xff)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			/*
 			 * Name of data file, origin, zclass, expected result.
--- bind-9.3.2/bin/tests/db/t_db.c.9_3_3_tests	2004-10-24 21:36:06.000000000 -0400
+++ bind-9.3.2/bin/tests/db/t_db.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.29.206.3 2004/10/25 01:36:06 marka Exp $ */
+/* $Id: t_db.c,v 1.29.206.5 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -403,8 +403,10 @@
 			/*
 			 * Skip comment lines.
 			 */
-			if ((isspace((unsigned char)*p)) || (*p == '#'))
+			if ((isspace((unsigned char)*p)) || (*p == '#')) {
+				(void)free(p);
 				continue;
+			}
 
 			cnt = t_bustline(p, tokens);
 			if (cnt == 4) {
--- bind-9.3.2/bin/tests/rdata_test.c.9_3_3_tests	2005-03-16 22:58:28.000000000 -0500
+++ bind-9.3.2/bin/tests/rdata_test.c	2006-02-26 18:49:48.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata_test.c,v 1.35.12.9 2005/03/17 03:58:28 marka Exp $ */
+/* $Id: rdata_test.c,v 1.35.12.11 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -304,7 +304,7 @@
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else
@@ -561,7 +561,7 @@
 		break;
 	}
 	if (result != ISC_R_SUCCESS)
-		fprintf(stdout, "viastruct: tostuct %d %d return %s\n",
+		fprintf(stdout, "viastruct: tostruct %d %d return %s\n",
 			rdata->type, rdata->rdclass,
 			dns_result_totext(result));
 	else {
@@ -572,7 +572,7 @@
 		result = dns_rdata_fromstruct(rdata2, rdc, rdt, sp, b);
 		if (result != ISC_R_SUCCESS)
 			fprintf(stdout,
-				"viastruct: fromstuct %d %d return %s\n",
+				"viastruct: fromstruct %d %d return %s\n",
 				rdata->type, rdata->rdclass,
 				dns_result_totext(result));
 		else if (rdata->length != rdata2->length ||
--- bind-9.3.2/bin/tests/compress_test.c.9_3_3_tests	2004-03-07 23:04:25.000000000 -0500
+++ bind-9.3.2/bin/tests/compress_test.c	2006-02-26 18:49:48.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress_test.c,v 1.24.12.4 2004/03/08 04:04:25 marka Exp $ */
+/* $Id: compress_test.c,v 1.24.12.6 2006/02/26 23:49:48 marka Exp $ */
 
 #include <config.h>
 
@@ -131,7 +131,7 @@
 		case DNS_COMPRESS_NONE: s = "DNS_COMPRESS_NONE"; break;
 		case DNS_COMPRESS_GLOBAL14: s = "DNS_COMPRESS_GLOBAL14"; break;
 		/* case DNS_COMPRESS_ALL: s = "DNS_COMPRESS_ALL"; break; */
-		default: s = "UNKOWN"; break;
+		default: s = "UNKNOWN"; break;
 		}
 		fprintf(stdout, "Allowed = %s\n", s);
 	}
--- bind-9.3.2/bin/tests/dst/dst_test.c.9_3_3_tests	2004-06-10 20:30:52.000000000 -0400
+++ bind-9.3.2/bin/tests/dst/dst_test.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.37.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: dst_test.c,v 1.37.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -236,23 +236,34 @@
 	isc_buffer_t b;
 	dns_fixedname_t fname;
 	dns_name_t *name;
+	isc_result_t result;
 
-	isc_mem_create(0, 0, &mctx);
+	result = isc_mem_create(0, 0, &mctx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 
 	current = isc_mem_get(mctx, 256);
+	if (current == NULL)
+		return (1);
 	getcwd(current, 256);
 
 	dns_result_register();
 
-	isc_entropy_create(mctx, &ectx);
-	isc_entropy_createfilesource(ectx, "randomfile");
+	result = isc_entropy_create(mctx, &ectx);
+	if (result != ISC_R_SUCCESS)
+		return (1);
+	result = isc_entropy_createfilesource(ectx, "randomfile");
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING|ISC_ENTROPY_GOODONLY);
 
 	dns_fixedname_init(&fname);
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
 	io(name, 54622, DST_ALG_RSAMD5, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 	   mctx);
@@ -262,7 +273,9 @@
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (result != ISC_R_SUCCESS)
+		return (1);
 	dh(name, 18602, name, 48957, mctx);
 
 	generate(DST_ALG_RSAMD5, mctx);
--- bind-9.3.2/bin/tests/dst/t_dst.c.9_3_3_tests	2004-06-10 20:30:52.000000000 -0400
+++ bind-9.3.2/bin/tests/dst/t_dst.c	2006-01-04 18:50:19.000000000 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.47.206.2 2004/06/11 00:30:52 marka Exp $ */
+/* $Id: t_dst.c,v 1.47.206.4 2006/01/04 23:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -405,7 +405,13 @@
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, "test.", 5);
 	isc_buffer_add(&b, 5);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 	io(name, 23616, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC,
 			mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 	t_info("testing use of stored keys [2]\n");
@@ -421,7 +427,13 @@
 
 	isc_buffer_init(&b, "dh.", 3);
 	isc_buffer_add(&b, 3);
-	dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+		       isc_result_totext(isc_result));
+		t_result(T_UNRESOLVED);
+		return;
+	}
 
 	dh(name, 18602, name, 48957, mctx, ISC_R_SUCCESS, &nfails, &nprobs);
 
@@ -674,7 +686,14 @@
 	name = dns_fixedname_name(&fname);
 	isc_buffer_init(&b, keyname, strlen(keyname));
 	isc_buffer_add(&b, strlen(keyname));
-	dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	isc_result = dns_name_fromtext(name, &b, dns_rootname, ISC_FALSE, NULL);
+	if (isc_result != ISC_R_SUCCESS) {
+		t_info("dns_name_fromtext failed %s\n",
+			isc_result_totext(isc_result));
+		(void) free(data);
+		++*nprobs;
+		return;
+	}
 	isc_result = dst_key_fromfile(name, id, alg, type, NULL, mctx, &key);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("dst_key_fromfile failed %s\n",

bind-9.3.2-9_3_3_validator.patch:
 validator.c |  435 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 314 insertions(+), 121 deletions(-)

--- NEW FILE bind-9.3.2-9_3_3_validator.patch ---
--- bind-9.3.2/lib/dns/validator.c.9_3_3_validator	2005-11-01 21:07:47.000000000 -0500
+++ bind-9.3.2/lib/dns/validator.c	2006-06-13 18:51:23.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91.2.5.8.21 2005/11/02 02:07:47 marka Exp $ */
+/* $Id: validator.c,v 1.91.2.5.8.27 2006/02/26 23:03:52 marka Exp $ */
 
 #include <config.h>
 
@@ -43,20 +43,65 @@
 #include <dns/validator.h>
 #include <dns/view.h>
 
+/*! \file
+ * \brief
+ * Basic processing sequences.
+ *
+ * \li When called with rdataset and sigrdataset:
+ * validator_start -> validate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> validate -> proveunsecure
+ *
+ * validator_start -> validate -> nsecvalidate	(secure wildcard answer)
+ * 
+ * \li When called with rdataset, sigrdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> validate -> proveunsecure
+ *
+ * \li When called with rdataset:
+ * validator_start -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> proveunsecure
+ *
+ * \li When called with rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> proveunsecure
+ *
+ * \li When called without a rdataset:
+ * validator_start -> nsecvalidate -> proveunsecure -> startfinddlvsep ->
+ *	dlv_validator_start -> validator_start -> nsecvalidate -> proveunsecure
+ *
+ * \li When called without a rdataset and with DNS_VALIDATOR_DLV:
+ * validator_start -> startfinddlvsep -> dlv_validator_start ->
+ *	validator_start -> nsecvalidate -> proveunsecure
+ *
+ * validator_start: determines what type of validation to do.
+ * validate: attempts to perform a positive validation.
+ * proveunsecure: attempts to prove the answer comes from a unsecure zone.
+ * nsecvalidate: attempts to prove a negative response.
+ * startfinddlvsep: starts the DLV record lookup.
+ * dlv_validator_start: resets state and restarts the lookup using the
+ *	DLV RRset found by startfinddlvsep.
+ */
+
 #define VALIDATOR_MAGIC			ISC_MAGIC('V', 'a', 'l', '?')
 #define VALID_VALIDATOR(v)		ISC_MAGIC_VALID(v, VALIDATOR_MAGIC)
 
-#define VALATTR_SHUTDOWN		0x0001
-#define VALATTR_FOUNDNONEXISTENCE	0x0002
-#define VALATTR_TRIEDVERIFY		0x0004
-#define VALATTR_NEGATIVE		0x0008
-#define VALATTR_INSECURITY		0x0010
-#define VALATTR_DLVTRIED		0x0020
+#define VALATTR_SHUTDOWN		0x0001	/*%< Shutting down. */
+#define VALATTR_TRIEDVERIFY		0x0004  /*%< We have found a key and
+						 * have attempted a verify. */
+#define VALATTR_INSECURITY		0x0010	/*%< Attempting proveunsecure. */
+#define VALATTR_DLVTRIED		0x0020	/*%< Looked for a DLV record. */
+#define VALATTR_AUTHNONPENDING		0x0040	/*%< Tidy up pending auth. */
 
+/*!
+ * NSEC proofs to be looked for.
+ */
 #define VALATTR_NEEDNOQNAME		0x0100
 #define VALATTR_NEEDNOWILDCARD		0x0200
 #define VALATTR_NEEDNODATA		0x0400
 
+/*!
+ * NSEC proofs that have been found.
+ */
 #define VALATTR_FOUNDNOQNAME		0x1000
 #define VALATTR_FOUNDNOWILDCARD		0x2000
 #define VALATTR_FOUNDNODATA		0x4000
@@ -104,19 +149,35 @@
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val);
 
-static isc_result_t
+static void
 dlv_validator_start(dns_validator_t *val);
 
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume);
 
+static void
+auth_nonpending(dns_message_t *message);
+
+static isc_result_t
+startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure);
+
+/*%
+ * Mark the RRsets as a answer.
+ *
+ * If VALATTR_AUTHNONPENDING is set then this is a negative answer
+ * in a insecure zone.  We need to mark any pending RRsets as
+ * dns_trust_authauthority answers (this is deferred from resolver.c).
+ */
 static inline void
 markanswer(dns_validator_t *val) {
 	validator_log(val, ISC_LOG_DEBUG(3), "marking as answer");
-	if (val->event->rdataset)
+	if (val->event->rdataset != NULL)
 		val->event->rdataset->trust = dns_trust_answer;
-	if (val->event->sigrdataset)
+	if (val->event->sigrdataset != NULL)
 		val->event->sigrdataset->trust = dns_trust_answer;
+	if (val->event->message != NULL &&
+	    (val->attributes & VALATTR_AUTHNONPENDING) != 0)
+		auth_nonpending(val->event->message);
 }
 
 static void
@@ -155,6 +216,9 @@
 	return (ISC_TRUE);
 }
 
+/*%
+ * Mark pending answers in the authority section as dns_trust_authauthority.
+ */
 static void
 auth_nonpending(dns_message_t *message) {
 	isc_result_t result;
@@ -177,6 +241,10 @@
 	}
 }
 
+/*%
+ * Look in the NSEC record returned from a DS query to see if there is
+ * a NS RRset at this name.  If it is found we are at a delegation point.
+ */
 static isc_boolean_t
 isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
 	     isc_result_t dbresult)
@@ -210,6 +278,11 @@
 	return (found);
 }
 
+/*%
+ * We have been asked to to look for a key.
+ * If found resume the validation process.
+ * If not found fail the validation process.
+ */
 static void
 fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -269,6 +342,11 @@
 		destroy(val);
 }
 
+/*%
+ * We were asked to look for a DS record as part of following a key chain
+ * upwards.  If found resume the validation process.  If not found fail the
+ * validation process.
+ */
 static void
 dsfetched(isc_task_t *task, isc_event_t *event) {
 	dns_fetchevent_t *devent;
@@ -330,8 +408,16 @@
 		destroy(val);
 }
 
-/*
- * XXX there's too much duplicated code here.
+/*%
+ * We were asked to look for the DS record as part of proving that a
+ * name is unsecure.
+ *
+ * If the DS record doesn't exist and the query name corresponds to
+ * a delegation point we are transitioning from a secure zone to a
+ * unsecure zone.
+ *
+ * If the DS record exists it will be secure.  We can continue looking
+ * for the break point in the chain of trust.
  */
 static void
 dsfetched2(isc_task_t *task, isc_event_t *event) {
@@ -359,7 +445,8 @@
 
 	INSIST(val->event != NULL);
 
-	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2");
+	validator_log(val, ISC_LOG_DEBUG(3), "in dsfetched2: %s",
+		      dns_result_totext(eresult));
 	LOCK(&val->lock);
 	if (eresult == DNS_R_NXRRSET || eresult == DNS_R_NCACHENXRRSET) {
 		/*
@@ -371,9 +458,13 @@
 				validator_log(val, ISC_LOG_WARNING,
 					      "must be secure failure");
 				validator_done(val, DNS_R_MUSTBESECURE);
-			} else {
+			} else if (val->view->dlv == NULL || DLVTRIED(val)) {
 				markanswer(val);
 				validator_done(val, ISC_R_SUCCESS);
+			} else {
+				result = startfinddlvsep(val, tname);
+				if (result != DNS_R_WAIT)
+					validator_done(val, result);
 			}
 		} else {
 			result = proveunsecure(val, ISC_TRUE);
@@ -385,7 +476,9 @@
 		   eresult == DNS_R_NCACHENXDOMAIN)
 	{
 		/*
-		 * Either there is a DS or this is not a zone cut.  Continue.
+		 * There is a DS which may or may not be a zone cut. 
+		 * In either case we are still in a secure zone resume
+		 * validation.
 		 */
 		result = proveunsecure(val, ISC_TRUE);
 		if (result != DNS_R_WAIT)
@@ -403,6 +496,11 @@
 		destroy(val);
 }
 
+/*%
+ * Callback from when a DNSKEY RRset has been validated.
+ *
+ * Resumes the stalled validation process.
+ */
 static void
 keyvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -448,6 +546,11 @@
 		destroy(val);
 }
 
+/*%
+ * Callback when the DS record has been validated.
+ *
+ * Resumes validation of the zone key or the unsecure zone proof.
+ */
 static void
 dsvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -491,10 +594,12 @@
 		destroy(val);
 }
 
-/*
+/*%
  * Return ISC_R_SUCCESS if we can determine that the name doesn't exist
  * or we can determine whether there is data or not at the name.
  * If the name does not exist return the wildcard name.
+ *
+ * Return ISC_R_IGNORE when the NSEC is not the appropriate one.
  */
 static isc_result_t
 nsecnoexistnodata(dns_validator_t *val, dns_name_t* name, dns_name_t *nsecname,
@@ -627,7 +732,7 @@
 					       wild, NULL);
 		if (result != ISC_R_SUCCESS) {
 			validator_log(val, ISC_LOG_DEBUG(3),
-				    "failure generating wilcard name");
+				    "failure generating wildcard name");
 			return (result);
 		}
 	}
@@ -637,6 +742,13 @@
 	return (ISC_R_SUCCESS);
 }
 
+/*%
+ * Callback for when NSEC records have been validated.
+ *
+ * Looks for NOQNAME and NODATA proofs.
+ *
+ * Resumes nsecvalidate.
+ */
 static void
 authvalidated(isc_task_t *task, isc_event_t *event) {
 	dns_validatorevent_t *devent;
@@ -715,44 +827,20 @@
 	isc_event_free(&event);
 }
 
-static void
-negauthvalidated(isc_task_t *task, isc_event_t *event) {
-	dns_validatorevent_t *devent;
-	dns_validator_t *val;
-	isc_boolean_t want_destroy;
-	isc_result_t eresult;
-
-	UNUSED(task);
-	INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE);
-
-	devent = (dns_validatorevent_t *)event;
-	val = devent->ev_arg;
-	eresult = devent->result;
-	isc_event_free(&event);
-	dns_validator_destroy(&val->subvalidator);
-
-	INSIST(val->event != NULL);
-
-	validator_log(val, ISC_LOG_DEBUG(3), "in negauthvalidated");
-	LOCK(&val->lock);
-	if (eresult == ISC_R_SUCCESS) {
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
-		auth_nonpending(val->event->message);
-		validator_done(val, ISC_R_SUCCESS);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "negauthvalidated: got %s",
-			      isc_result_totext(eresult));
-		validator_done(val, eresult);
-	}
-	want_destroy = exit_check(val);
-	UNLOCK(&val->lock);
-	if (want_destroy)
-		destroy(val);
-}
-
+/*%
+ * Looks for the requested name and type in the view (zones and cache).
+ *
+ * When looking for a DLV record also checks to make sure the NSEC record
+ * returns covers the query name as part of aggressive negative caching.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_NCACHENXDOMAIN
+ * \li	DNS_R_NCACHENXRRSET
+ * \li	DNS_R_NXRRSET
+ * \li	DNS_R_NXDOMAIN
+ */
 static inline isc_result_t
 view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_fixedname_t fixedname;
@@ -855,12 +943,9 @@
 		dns_rdata_freestruct(&nsec);
 		result = DNS_R_NCACHENXDOMAIN;
 	} else if (result != ISC_R_SUCCESS &&
-                   result != DNS_R_GLUE &&
-                   result != DNS_R_HINT &&
                    result != DNS_R_NCACHENXDOMAIN &&
                    result != DNS_R_NCACHENXRRSET &&
                    result != DNS_R_NXRRSET &&
-                   result != DNS_R_HINTNXRRSET &&
                    result != ISC_R_NOTFOUND) {
 		goto  notfound;
 	}
@@ -874,11 +959,15 @@
 	return (ISC_R_NOTFOUND);
 }
 
+/*%
+ * Checks to make sure we are not going to loop.  As we use a SHARED fetch
+ * the validation process will stall if looping was to occur.
+ */
 static inline isc_boolean_t
 check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) {
 	dns_validator_t *parent;
 
-	for (parent = val->parent; parent != NULL; parent = parent->parent) {
+	for (parent = val; parent != NULL; parent = parent->parent) {
 		if (parent->event != NULL &&
 		    parent->event->type == type &&
 		    dns_name_equal(parent->event->name, name))
@@ -892,6 +981,9 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Start a fetch for the requested name and type.
+ */
 static inline isc_result_t
 create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 	     isc_taskaction_t callback, const char *caller)
@@ -914,6 +1006,9 @@
 					 &val->fetch));
 }
 
+/*%
+ * Start a subvalidation process.
+ */
 static inline isc_result_t
 create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 		 dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
@@ -936,7 +1031,7 @@
 	return (result);
 }
 
-/*
+/*%
  * Try to find a key that could have signed 'siginfo' among those
  * in 'rdataset'.  If found, build a dst_key_t for it and point
  * val->key at it.
@@ -1004,6 +1099,9 @@
 	return (result);
 }
 
+/*%
+ * Get the key that generated this signature.
+ */
 static isc_result_t
 get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
 	isc_result_t result;
@@ -1130,7 +1228,7 @@
 	return (dst_region_computeid(&r, key->algorithm));
 }
 
-/*
+/*%
  * Is this keyset self-signed?
  */
 static isc_boolean_t
@@ -1172,8 +1270,19 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Attempt to verify the rdataset using the given key and rdata (RRSIG).
+ * The signature was good and from a wildcard record and the QNAME does
+ * not match the wildcard we need to look for a NOQNAME proof.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS if the verification succeeds.
+ * \li	Others if the verification fails.
+ */
 static isc_result_t
-verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata) {
+verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata,
+       isc_uint16_t keyid)
+{
 	isc_result_t result;
 	dns_fixedname_t fixed;
 
@@ -1183,8 +1292,8 @@
 				    key, ISC_FALSE, val->view->mctx, rdata,
 				    dns_fixedname_name(&fixed));
 	validator_log(val, ISC_LOG_DEBUG(3),
-		      "verify rdataset: %s",
-		      isc_result_totext(result));
+		      "verify rdataset (keyid=%u): %s",
+		      keyid, isc_result_totext(result));
 	if (result == DNS_R_FROMWILDCARD) {
 		if (!dns_name_equal(val->event->name,
 				    dns_fixedname_name(&fixed)))
@@ -1194,14 +1303,14 @@
 	return (result);
 }
 
-/*
+/*%
  * Attempts positive response validation of a normal RRset.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validate(dns_validator_t *val, isc_boolean_t resume) {
@@ -1272,7 +1381,8 @@
 		}
 
 		do {
-			result = verify(val, val->key, &rdata);
+			result = verify(val, val->key, &rdata,
+					val->siginfo->keyid);
 			if (result == ISC_R_SUCCESS)
 				break;
 			if (val->keynode != NULL) {
@@ -1356,6 +1466,10 @@
 	return (DNS_R_NOVALIDSIG);
 }
 
+/*%
+ * Validate the DNSKEY RRset by looking for a DNSKEY that matches a
+ * DLV record and that also verifies the DNSKEY RRset.
+ */
 static isc_result_t
 dlv_validatezonekey(dns_validator_t *val) {
 	dns_keytag_t keytag;
@@ -1373,12 +1487,12 @@
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
 
 	validator_log(val, ISC_LOG_DEBUG(3), "dlv_validatezonekey");
+
 	/*
 	 * Look through the DLV record and find the keys that can sign the
 	 * key set and the matching signature.  For each such key, attempt
 	 * verification.
 	 */
-
 	supported_algorithm = ISC_FALSE;
 
 	for (result = dns_rdataset_first(&val->dlv);
@@ -1456,7 +1570,7 @@
 				 */
 				continue;
 
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1486,14 +1600,14 @@
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Attempts positive response validation of an RRset containing zone keys.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 validatezonekey(dns_validator_t *val) {
@@ -1505,12 +1619,14 @@
 	dns_rdata_t keyrdata = DNS_RDATA_INIT;
 	dns_rdata_t sigrdata = DNS_RDATA_INIT;
 	unsigned char dsbuf[DNS_DS_BUFFERSIZE];
+	char namebuf[DNS_NAME_FORMATSIZE];
 	dns_keytag_t keytag;
 	dns_rdata_ds_t ds;
 	dns_rdata_dnskey_t key;
 	dns_rdata_rrsig_t sig;
 	dst_key_t *dstkey;
 	isc_boolean_t supported_algorithm;
+	isc_boolean_t atsep = ISC_FALSE;
 
 	/*
 	 * Caller must be holding the validator lock.
@@ -1541,9 +1657,13 @@
 							  sig.algorithm,
 							  sig.keyid,
 							  &keynode);
+			if (result == DNS_R_PARTIALMATCH ||
+			    result == ISC_R_SUCCESS)
+				atsep = ISC_TRUE;
 			while (result == ISC_R_SUCCESS) {
 				dstkey = dns_keynode_key(keynode);
-				result = verify(val, dstkey, &sigrdata);
+				result = verify(val, dstkey, &sigrdata,
+						sig.keyid);
 				if (result == ISC_R_SUCCESS) {
 					dns_keytable_detachkeynode(val->keytable,
 								   &keynode);
@@ -1578,6 +1698,22 @@
 				return (DNS_R_NOVALIDDS);
 		}
 
+		if (atsep) {
+			/*
+			 * We have not found a key to verify this DNSKEY
+			 * RRset.  As this is a SEP we have to assume that
+			 * the RRset is invalid.
+			 */
+			dns_name_format(val->event->name, namebuf,
+				        sizeof(namebuf));
+			validator_log(val, ISC_LOG_DEBUG(2),
+				      "unable to find a DNSKEY which verifies "
+				      "the DNSKEY RRset and also matches one "
+				      "of specified trusted-keys for '%s'",
+				      namebuf);
+			return (DNS_R_NOVALIDKEY);
+		}
+
 		/*
 		 * Otherwise, try to find the DS record.
 		 */
@@ -1680,6 +1816,9 @@
 		dns_rdataset_init(&trdataset);
 		dns_rdataset_clone(val->event->rdataset, &trdataset);
 
+		/*
+		 * Look for the KEY that matches the DS record.
+		 */
 		for (result = dns_rdataset_first(&trdataset);
 		     result == ISC_R_SUCCESS;
 		     result = dns_rdataset_next(&trdataset))
@@ -1714,7 +1853,7 @@
 			dns_rdataset_current(val->event->sigrdataset,
 					     &sigrdata);
 			(void)dns_rdata_tostruct(&sigrdata, &sig, NULL);
-			if (ds.key_tag != sig.keyid &&
+			if (ds.key_tag != sig.keyid ||
 			    ds.algorithm != sig.algorithm)
 				continue;
 
@@ -1728,8 +1867,7 @@
 				 * This really shouldn't happen, but...
 				 */
 				continue;
-
-			result = verify(val, dstkey, &sigrdata);
+			result = verify(val, dstkey, &sigrdata, sig.keyid);
 			dst_key_free(&dstkey);
 			if (result == ISC_R_SUCCESS)
 				break;
@@ -1759,14 +1897,14 @@
 		return (DNS_R_NOVALIDSIG);
 }
 
-/*
+/*%
  * Starts a positive response validation.
  *
  * Returns:
- *	ISC_R_SUCCESS	Validation completed successfully
- *	DNS_R_WAIT	Validation has started but is waiting
+ * \li	ISC_R_SUCCESS	Validation completed successfully
+ * \li	DNS_R_WAIT	Validation has started but is waiting
  *			for an event.
- *	Other return codes are possible and all indicate failure.
+ * \li	Other return codes are possible and all indicate failure.
  */
 static isc_result_t
 start_positive_validation(dns_validator_t *val) {
@@ -1779,6 +1917,14 @@
 	return (validatezonekey(val));
 }
 
+/*%
+ * Look for NODATA at the wildcard and NOWILDCARD proofs in the
+ * previously validated NSEC records.  As these proofs are mutually
+ * exclusive we stop when one is found.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS 
+ */
 static isc_result_t
 checkwildcard(dns_validator_t *val) {
 	dns_name_t *name, *wild;
@@ -1851,6 +1997,18 @@
 	return (result);
 }
 
+/*%
+ * Prove a negative answer is good or that there is a NOQNAME when the
+ * answer is from a wildcard.
+ *
+ * Loop through the authority section looking for NODATA, NOWILDCARD
+ * and NOQNAME proofs in the NSEC records by calling authvalidated().
+ *
+ * If the required proofs are found we are done.
+ *
+ * If the proofs are not found attempt to prove this is a unsecure
+ * response.
+ */
 static isc_result_t
 nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 	dns_name_t *name;
@@ -1946,7 +2104,8 @@
 		return (result);
 
 	/*
-	 * Do we only need to check for NOQNAME?
+	 * Do we only need to check for NOQNAME?  To get here we must have
+	 * had a secure wildcard answer.
 	 */
 	if ((val->attributes & VALATTR_NEEDNODATA) == 0 &&
 	    (val->attributes & VALATTR_NEEDNOWILDCARD) == 0 &&
@@ -1982,28 +2141,17 @@
 	    ((val->attributes & VALATTR_NEEDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_FOUNDNOQNAME) != 0 &&
 	     (val->attributes & VALATTR_NEEDNOWILDCARD) != 0 &&
-	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0))
-		val->attributes |= VALATTR_FOUNDNONEXISTENCE;
-
-	if ((val->attributes & VALATTR_FOUNDNONEXISTENCE) == 0) {
-		if (!val->seensig && val->soaset != NULL) {
-			result = create_validator(val, val->soaname,
-						  dns_rdatatype_soa,
-						  val->soaset, NULL,
-						  negauthvalidated,
-						  "nsecvalidate");
-			if (result != ISC_R_SUCCESS)
-				return (result);
-			return (DNS_R_WAIT);
-		}
+	     (val->attributes & VALATTR_FOUNDNOWILDCARD) != 0)) {
 		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof not found");
-		return (DNS_R_NOVALIDNSEC);
-	} else {
-		validator_log(val, ISC_LOG_DEBUG(3),
-			      "nonexistence proof found");
+			      "nonexistence proof(s) found");
 		return (ISC_R_SUCCESS);
 	}
+
+	validator_log(val, ISC_LOG_DEBUG(3),
+		      "nonexistence proof(s) not found");
+	val->attributes |= VALATTR_AUTHNONPENDING;
+	val->attributes |= VALATTR_INSECURITY;
+	return (proveunsecure(val, ISC_FALSE));
 }
 
 static isc_boolean_t
@@ -2029,6 +2177,11 @@
 	return (ISC_FALSE);
 }
 
+/*%
+ * Callback from fetching a DLV record.
+ * 
+ * Resumes the DLV lookup process.
+ */
 static void
 dlvfetched(isc_task_t *task, isc_event_t *event) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2065,9 +2218,7 @@
 		dns_rdataset_clone(&val->frdataset, &val->dlv);
 		val->havedlvsep = ISC_TRUE;
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-		result = dlv_validator_start(val);
-		if (result != DNS_R_WAIT)
-			validator_done(val, result);
+		dlv_validator_start(val);
 	} else if (eresult == DNS_R_NXRRSET ||
 		   eresult == DNS_R_NXDOMAIN ||
 		   eresult == DNS_R_NCACHENXRRSET ||
@@ -2078,9 +2229,7 @@
 					namebuf, sizeof(namebuf));
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found",
 				      namebuf);
-			result = dlv_validator_start(val);
-			if (result != DNS_R_WAIT)
-				validator_done(val, result);
+			dlv_validator_start(val);
 		} else if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3), "DLV not found");
 			markanswer(val);
@@ -2094,6 +2243,7 @@
 	} else {
 		validator_log(val, ISC_LOG_DEBUG(3), "DLV lookup: %s",
 			      dns_result_totext(eresult));
+		validator_done(val, eresult);
 	}
 	want_destroy = exit_check(val);
 	UNLOCK(&val->lock);
@@ -2101,6 +2251,14 @@
 		destroy(val);
 }
 
+/*%
+ * Start the DLV lookup proccess.
+ * 
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failures.
+ */
 static isc_result_t
 startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2135,9 +2293,19 @@
 	dns_name_format(dns_fixedname_name(&val->dlvsep), namebuf,
 			sizeof(namebuf));
 	validator_log(val, ISC_LOG_DEBUG(3), "DLV %s found", namebuf);
-	return (dlv_validator_start(val));
+	dlv_validator_start(val);
+	return (DNS_R_WAIT);
 }
 
+/*%
+ * Continue the DLV lookup process.
+ *
+ * Returns
+ * \li	ISC_R_SUCCESS
+ * \li	ISC_R_NOTFOUND
+ * \li	DNS_R_WAIT
+ * \li	Others on validation failure.
+ */
 static isc_result_t
 finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
 	char namebuf[DNS_NAME_FORMATSIZE];
@@ -2147,7 +2315,7 @@
 	dns_name_t noroot;
 	isc_result_t result;
 	unsigned int labels;
-		
+
 	INSIST(val->view->dlv != NULL);
 
 	if (!resume) {
@@ -2231,11 +2399,24 @@
 	return (ISC_R_NOTFOUND);
 }
 
-/*
+/*%
  * proveunsecure walks down from the SEP looking for a break in the
- * chain of trust.   That occurs when we can prove the DS record does
+ * chain of trust.  That occurs when we can prove the DS record does
  * not exist at a delegation point or the DS exists at a delegation
  * but we don't support the algorithm/digest.
+ *
+ * If DLV is active and we look for a DLV record at or below the
+ * point we go insecure.  If found we restart the validation process.
+ * If not found or DLV isn't active we mark the response as a answer.
+ *
+ * Returns:
+ * \li	ISC_R_SUCCESS		val->event->name is in a unsecure zone
+ * \li	DNS_R_WAIT		validation is in progress.
+ * \li	DNS_R_MUSTBESECURE	val->event->name is supposed to be secure
+ *				(policy) but we proved that it is unsecure.
+ * \li	DNS_R_NOVALIDSIG
+ * \li	DNS_R_NOVALIDNSEC
+ * \li	DNS_R_NOTINSECURE
  */
 static isc_result_t
 proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
@@ -2253,7 +2434,7 @@
 		result = dns_keytable_finddeepestmatch(val->keytable,
 						       val->event->name,
 						       secroot);
-
+	
 		if (result == ISC_R_NOTFOUND) {
 			validator_log(val, ISC_LOG_DEBUG(3),
 				      "not beneath secure root");
@@ -2395,8 +2576,7 @@
 				goto out;
 			return (DNS_R_WAIT);
 		} else if (result == DNS_R_NXDOMAIN ||
-			   result == DNS_R_NCACHENXDOMAIN)
-		{
+			   result == DNS_R_NCACHENXDOMAIN) {
 			/*
 			 * This is not a zone cut.  Assuming things are
 			 * as expected, continue.
@@ -2441,7 +2621,10 @@
 	return (result);
 }
 
-static isc_result_t
+/*%
+ * Reset state and revalidate the answer using DLV.
+ */
+static void
 dlv_validator_start(dns_validator_t *val) {
 	isc_event_t *event;
 
@@ -2455,9 +2638,20 @@
 
 	event = (isc_event_t *)val->event;
 	isc_task_send(val->task, &event);
-	return (DNS_R_WAIT);
 }
 
+/*%
+ * Start the validation process.
+ *
+ * Attempt to valididate the answer based on the category it appears to
+ * fall in.
+ * \li	1. secure positive answer.
+ * \li	2. unsecure positive answer.
+ * \li	3. a negative answer (secure or unsecure).
+ *
+ * Note a answer that appears to be a secure positive answer may actually
+ * be a unsecure positive answer.
+ */
 static void
 validator_start(isc_task_t *task, isc_event_t *event) {
 	dns_validator_t *val;
@@ -2529,7 +2723,6 @@
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting negative response validation");
 
-		val->attributes |= VALATTR_NEGATIVE;
 		if (val->event->message->rcode == dns_rcode_nxdomain) {
 			val->attributes |= VALATTR_NEEDNOQNAME;
 			val->attributes |= VALATTR_NEEDNOWILDCARD;
@@ -2640,7 +2833,7 @@
 
  cleanup_event:
 	isc_task_detach(&tclone);
-	isc_event_free((isc_event_t **)&val->event);
+	isc_event_free(ISC_EVENT_PTR(&event));
 
  cleanup_val:
 	dns_view_weakdetach(&val->view);

bind-9.3.2-ch1991_rt15813.patch:
 include/dns/message.h |   25 +++++++++++++++++++++++--
 message.c             |   42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 56 insertions(+), 11 deletions(-)

--- NEW FILE bind-9.3.2-ch1991_rt15813.patch ---
--- bind-9.3.2/lib/dns/message.c.ch1991_rt15813	2005-06-06 21:42:23.000000000 -0400
+++ bind-9.3.2/lib/dns/message.c	2006-06-13 18:37:54.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.194.2.10.2.20 2005/06/07 01:42:23 marka Exp $ */
+/* $Id: message.c,v 1.194.2.10.2.24 2006/02/28 06:32:54 marka Exp $ */
 
 /***
  *** Imports
@@ -801,11 +801,37 @@
 }
 
 isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset)
+{
+	dns_rdataset_t *curr;
+
+	if (rdataset != NULL) {
+		REQUIRE(*rdataset == NULL);
+	}
+
+	for (curr = ISC_LIST_TAIL(name->list);
+	     curr != NULL;
+	     curr = ISC_LIST_PREV(curr, link)) {
+		if (curr->rdclass == rdclass &&
+		    curr->type == type && curr->covers == covers) {
+			if (rdataset != NULL)
+				*rdataset = curr;
+			return (ISC_R_SUCCESS);
+		}
+	}
+
+	return (ISC_R_NOTFOUND);
+}
+
+isc_result_t
 dns_message_findtype(dns_name_t *name, dns_rdatatype_t type,
 		     dns_rdatatype_t covers, dns_rdataset_t **rdataset)
 {
 	dns_rdataset_t *curr;
 
+	REQUIRE(name != NULL);
 	if (rdataset != NULL) {
 		REQUIRE(*rdataset == NULL);
 	}
@@ -1030,7 +1056,7 @@
 		/*
 		 * Can't ask the same question twice.
 		 */
-		result = dns_message_findtype(name, rdtype, 0, NULL);
+		result = dns_message_find(name, rdclass, rdtype, 0, NULL);
 		if (result == ISC_R_SUCCESS)
 			DO_FORMERR;
 
@@ -1190,6 +1216,7 @@
 		    && rdtype != dns_rdatatype_dnskey /* in a TKEY query */
 		    && rdtype != dns_rdatatype_sig /* SIG(0) */
 		    && rdtype != dns_rdatatype_tkey /* Win2000 TKEY */
+		    && msg->rdclass != dns_rdataclass_any
 		    && msg->rdclass != rdclass)
 			DO_FORMERR;
 
@@ -1279,12 +1306,9 @@
 			rdata->type = rdtype;
 			rdata->flags = DNS_RDATA_UPDATE;
 			result = ISC_R_SUCCESS;
-		} else if (rdtype == dns_rdatatype_tsig)
+		} else
 			result = getrdata(source, msg, dctx, rdclass,
 					  rdtype, rdatalen, rdata);
-		else
-			result = getrdata(source, msg, dctx, msg->rdclass,
-					  rdtype, rdatalen, rdata);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
 		rdata->rdclass = rdclass;
@@ -1360,8 +1384,8 @@
 				DO_FORMERR;
 
 			rdataset = NULL;
-			result = dns_message_findtype(name, rdtype, covers,
-						      &rdataset);
+			result = dns_message_find(name, rdclass, rdtype,
+						   covers, &rdataset);
 		}
 
 		/*
--- bind-9.3.2/lib/dns/include/dns/message.h.ch1991_rt15813	2004-03-07 21:08:00.000000000 -0500
+++ bind-9.3.2/lib/dns/include/dns/message.h	2006-06-13 19:21:33.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.100.2.3.8.7 2004/03/08 02:08:00 marka Exp $ */
+/* $Id: message.h,v 1.100.2.3.8.10 2006/02/28 06:32:54 marka Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -710,6 +710,27 @@
  *	ISC_R_NOTFOUND		-- the desired type does not exist.
  */
 
+isc_result_t
+dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass,
+		 dns_rdatatype_t type, dns_rdatatype_t covers,
+		 dns_rdataset_t **rdataset);
+/*%<
+ * Search the name for the specified rdclass and type.  If it is found,
+ * *rdataset is filled in with a pointer to that rdataset.
+ *
+ * Requires:
+ *\li	if '**rdataset' is non-NULL, *rdataset needs to be NULL.
+ *
+ *\li	'type' be a valid type, and NOT dns_rdatatype_any.
+ *
+ *\li	If 'type' is dns_rdatatype_rrsig, 'covers' must be a valid type.
+ *	Otherwise it should be 0.
+ *
+ * Returns:
+ *\li	#ISC_R_SUCCESS		-- all is well.
+ *\li	#ISC_R_NOTFOUND		-- the desired type does not exist.
+ */
+
 void
 dns_message_movename(dns_message_t *msg, dns_name_t *name,
 		     dns_section_t fromsection,

bind-9.3.2-ch1994_rt15694.patch:
 configure.in              |   59 ++++++++++++++++++++++++--
 lib/dns/openssl_link.c    |    8 +--
 lib/dns/openssldh_link.c  |   77 +++++++++++++++++++++++++++++++++-
 lib/dns/openssldsa_link.c |   81 +++++++++++++++++++++++++++++++++++-
 lib/dns/opensslrsa_link.c |  102 +++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 312 insertions(+), 15 deletions(-)

--- NEW FILE bind-9.3.2-ch1994_rt15694.patch ---
--- bind-9.3.2/configure.in.ch1994_rt15694	2006-06-14 00:37:24.000000000 -0400
+++ bind-9.3.2/configure.in	2006-06-14 00:40:04.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.294.2.23.2.51 $)
+AC_REVISION($Revision: 1.294.2.23.2.60 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -466,6 +466,9 @@
 		[AC_MSG_RESULT(assuming it does work on target platform)]
 		)
 		 
+		AC_CHECK_FUNC(DH_generate_parameters, [echo '#define HAVE_DH_GENERATE_PARAMETERS 1' > openssl_config.h])
+		AC_CHECK_FUNC(RSA_generate_key, [echo '#define  HAVE_RSA_GENERATE_KEY 1' >> openssl_config.h])
+		AC_CHECK_FUNC(DSA_generate_parameters,[echo '#define HAVE_DSA_GENERATE_PARAMETERS 1' >> openssl_config.h])
 #
 #	OpenSSLDie is new with CERT CS-2002-23.  If we see it we have may
 #	have a patched library otherwise check that we are greater than
@@ -1571,11 +1574,11 @@
 
 AC_CHECK_FUNC(strtoul,
 	[ISC_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#undef ISC_PLATFORM_NEEDSTRTOUL"
+	 LWRES_PLATFORM_NEEDSTRTOUL="#undef LWRES_PLATFORM_NEEDSTRTOUL"
 	 GENRANDOMLIB=""],
 	[ISC_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 LWRES_PLATFORM_NEEDSTRTOUL="#define ISC_PLATFORM_NEEDSTRTOUL 1"
-	 "GENRANDOMLIB=${ISCLIBS}"])
+	 LWRES_PLATFORM_NEEDSTRTOUL="#define LWRES_PLATFORM_NEEDSTRTOUL 1"
+	 GENRANDOMLIB="${ISCLIBS}"])
 AC_SUBST(ISC_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(LWRES_PLATFORM_NEEDSTRTOUL)
 AC_SUBST(GENRANDOMLIB)
@@ -1690,6 +1693,7 @@
 [optarg = 0;],
 [AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)
+GEN_NEED_OPTARG="-DNEED_OPTARG=1"
 AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])])
 
 #
@@ -1753,6 +1757,17 @@
 esac
 
 #
+# Some hosts need msg_namelen to match the size of the socket structure.
+# Some hosts don't set msg_namelen appropriately on return from recvmsg().
+#
+case $host in
+*os2*|*hp-mpeix*)
+	AC_DEFINE(BROKEN_RECVMSG, 1,
+		  [Define if recvmsg() does not meet all of the BSD socket API specifications.])
+	;;
+esac
+
+#
 # Microsoft has their own way of handling shared libraries that requires
 # additional qualifiers on extern variables.  Unix systems don't need it.
 #
@@ -1865,6 +1880,16 @@
 	;;
 esac
 #
+# Solaris 2.5.1 and earlier cannot bind() then connect() a TCP socket.
+# This prevents the source address being set.
+#
+case "$host" in
+*-solaris2.[[012345]]|*-solaris2.5.1)
+	AC_DEFINE(BROKEN_TCP_BIND_BEFORE_CONNECT, 1,
+		  [Define if you cannot bind() before connect() for TCP sockets.])
+	;;
+esac
+#
 # The following sections deal with tools used for formatting
 # the documentation.  They are all optional, unless you are
 # a developer editing the documentation source.
@@ -2040,6 +2065,28 @@
 AC_SUBST_FILE(LIBLWRES_API)
 LIBLWRES_API=$srcdir/lib/lwres/api
 
+if test "cross_compiling" = "yes"; then
+	if test -z "$BUILD_CC"; then
+		AC_ERROR([BUILD_CC not set])
+	fi
+	BUILD_CFLAGS="$BUILD_CFLAGS"
+	BUILD_CPPFLAGS="$BUILD_CPPFLAGS"
+	BUILD_LDFLAGS="$BUILD_LDFLAGS"
+	BUILD_LIBS="$BUILD_LIBS"
+else
+	BUILD_CC="$CC" 
+	BUILD_CFLAGS="$CFLAGS" 
+	BUILD_CPPFLAGS="$CPPFLAGS $GEN_NEED_OPTARG"
+	BUILD_LDFLAGS="$LDFLAGS"
+	BUILD_LIBS="$LIBS"
+fi
+
+AC_SUBST(BUILD_CC)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_CPPFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
+AC_SUBST(BUILD_LIBS)
+
 AC_OUTPUT(
 	make/rules
 	make/includes
@@ -2123,6 +2170,8 @@
 )
 chmod a+x isc-config.sh
 
+if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h; fi;
+
 # Tell Emacs to edit this file in shell mode.
 # Local Variables:
 # mode: sh
--- bind-9.3.2/lib/dns/opensslrsa_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/opensslrsa_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.4 2006/03/01 02:40:17 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -68,6 +68,12 @@
 	(rsa)->flags &= ~(RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE); \
 	(rsa)->flags &= ~RSA_FLAG_BLINDING; \
 	} while (0)
+#elif defined(RSA_FLAG_NO_BLINDING)
+#define SET_FLAGS(rsa) \
+	do { \
+		(rsa)->flags &= ~RSA_FLAG_BLINDING; \
+		(rsa)->flags |= RSA_FLAG_NO_BLINDING; \
+	} while (0)
 #else
 #define SET_FLAGS(rsa) \
 	do { \
@@ -87,12 +93,16 @@
 		isc_md5_t *md5ctx;
 
 		md5ctx = isc_mem_get(dctx->mctx, sizeof(isc_md5_t));
+		if (md5ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_md5_init(md5ctx);
 		dctx->opaque = md5ctx;
 	} else {
 		isc_sha1_t *sha1ctx;
 
 		sha1ctx = isc_mem_get(dctx->mctx, sizeof(isc_sha1_t));
+		if (sha1ctx == NULL)
+			return (ISC_R_NOMEMORY);
 		isc_sha1_init(sha1ctx);
 		dctx->opaque = sha1ctx;
 	}
@@ -258,6 +268,94 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_RSA_GENERATE_KEY
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static RSA *
+RSA_generate_key(int bits, unsigned long e_value,
+		 void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        size_t i;
+        RSA *rsa = RSA_new();
+        BIGNUM *e = BN_new();
+
+        if (rsa == NULL || e == NULL)
+		goto err;
+
+        /* The problem is when building with 8, 16, or 32 BN_ULONG,
+         * unsigned long can be larger */
+        for (i = 0; i < sizeof(unsigned long) * 8; i++) {
+                if ((e_value & (1UL<<i)) != 0)
+                        BN_set_bit(e, i);
+	}
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if (RSA_generate_key_ex(rsa, bits, e, &cb)) {
+                BN_free(e);
+                return (rsa);
+        }
+err:
+        if (e != NULL)
+		BN_free(e);
+        if (rsa != NULL)
+		RSA_free(rsa);
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 opensslrsa_generate(dst_key_t *key, int exp) {
 	RSA *rsa;
--- bind-9.3.2/lib/dns/openssl_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssl_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssl_link.c,v 1.1.4.3 2006/05/23 23:51:03 marka Exp $
  */
 #ifdef OPENSSL
 
@@ -39,7 +39,7 @@
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 
-#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L)
+#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER != 0x00907000L)
 #define USE_ENGINE 1
 #endif
 
@@ -160,7 +160,7 @@
 		goto cleanup_rm;
 	}
 	ENGINE_set_RAND(e, rm);
-	RAND_set_rand_method(e);
+	RAND_set_rand_method(rm);
 #else
 	RAND_set_rand_method(rm);
 #endif
--- bind-9.3.2/lib/dns/openssldh_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssldh_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -18,7 +18,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: openssldh_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $
  */
 
 #ifdef OPENSSL
@@ -138,6 +138,79 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DH_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static DH *
+DH_generate_parameters(int prime_len, int generator,
+		       void (*callback)(int,int,void *), void *cb_arg)
+{
+        BN_GENCB cb;
+        DH *dh = NULL;
+
+	dh = DH_new();
+	if (dh != NULL) {
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+
+		if (DH_generate_parameters_ex(dh, prime_len, generator, &cb))
+			return (dh);
+		DH_free(dh);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldh_generate(dst_key_t *key, int generator) {
 	DH *dh = NULL;
--- bind-9.3.2/lib/dns/openssldsa_link.c.ch1994_rt15694	2004-12-08 23:07:18.000000000 -0500
+++ bind-9.3.2/lib/dns/openssldsa_link.c	2006-06-14 00:37:24.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.1.4.3 2006/03/02 00:37:20 marka Exp $ */
 
 #ifdef OPENSSL
 
@@ -169,6 +169,83 @@
 	return (ISC_TRUE);
 }
 
+#ifndef HAVE_DSA_GENERATE_PARAMETERS
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+static DSA *
+DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
+			int *counter_ret, unsigned long *h_ret,
+			void (*callback)(int, int, void *),
+			void *cb_arg)
+{
+        BN_GENCB cb;
+        DSA *dsa;
+ 
+        dsa = DSA_new();
+	if (dsa != NULL) {
+ 
+		BN_GENCB_set_old(&cb, callback, cb_arg);
+  
+		if (DSA_generate_parameters_ex(dsa, bits, seed_in, seed_len,  
+					       counter_ret, h_ret, &cb))
+			return (dsa);
+		DSA_free(dsa);
+	}
+        return (NULL);
+}
+#endif
+
 static isc_result_t
 openssldsa_generate(dst_key_t *key, int unused) {
 	DSA *dsa;

bind-9.3.2-ch1997_rt15818.patch:
 rbtdb.c |  202 ++++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 128 insertions(+), 74 deletions(-)

--- NEW FILE bind-9.3.2-ch1997_rt15818.patch ---
--- bind-9.3.2/lib/dns/rbtdb.c.ch1997_rt15818	2005-10-13 21:38:48.000000000 -0400
+++ bind-9.3.2/lib/dns/rbtdb.c	2006-06-13 18:17:55.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.168.2.11.2.22 2005/10/14 01:38:48 marka Exp $ */
+/* $Id: rbtdb.c,v 1.168.2.11.2.26 2006/03/02 23:18:20 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -1011,6 +1011,47 @@
 	}
 }
 
+static isc_boolean_t
+iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
+	dns_rdataset_t keyset;
+	dns_rdataset_t nsecset, signsecset;
+	isc_boolean_t haszonekey = ISC_FALSE;
+	isc_boolean_t hasnsec = ISC_FALSE;
+	isc_result_t result;
+
+	dns_rdataset_init(&keyset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
+				     0, &keyset, NULL);
+	if (result == ISC_R_SUCCESS) {
+		dns_rdata_t keyrdata = DNS_RDATA_INIT;
+		result = dns_rdataset_first(&keyset);
+		while (result == ISC_R_SUCCESS) {
+			dns_rdataset_current(&keyset, &keyrdata);
+			if (dns_zonekey_iszonekey(&keyrdata)) {
+				haszonekey = ISC_TRUE;
+				break;
+			}
+			result = dns_rdataset_next(&keyset);
+		}
+		dns_rdataset_disassociate(&keyset);
+	}
+	if (!haszonekey)
+		return (ISC_FALSE);
+
+	dns_rdataset_init(&nsecset);
+	dns_rdataset_init(&signsecset);
+	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
+				     0, &nsecset, &signsecset);
+	if (result == ISC_R_SUCCESS) {
+		if (dns_rdataset_isassociated(&signsecset)) {
+			hasnsec = ISC_TRUE;
+			dns_rdataset_disassociate(&signsecset);
+		}
+		dns_rdataset_disassociate(&nsecset);
+	}
+	return (hasnsec);
+}
+
 static void
 closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
@@ -1136,6 +1177,12 @@
 	least_serial = rbtdb->least_serial;
 	UNLOCK(&rbtdb->lock);
 
+	/*
+	 * Update the zone's secure status.
+	 */
+	if (version->writer && commit && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	if (cleanup_version != NULL) {
 		INSIST(EMPTY(cleanup_version->changed_list));
 		isc_mem_put(rbtdb->common.mctx, cleanup_version,
@@ -2184,12 +2231,12 @@
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2247,9 +2294,15 @@
 				search.need_cleanup = ISC_TRUE;
 				maybe_zonecut = ISC_FALSE;
 				at_zonecut = ISC_TRUE;
+				/*
+				 * It is not clear if KEY should still be
+				 * allowed at the parent side of the zone
+				 * cut or not.  It is needed for RFC3007
+				 * validated updates.
+				 */
 				if ((search.options & DNS_DBFIND_GLUEOK) == 0
 				    && type != dns_rdatatype_nsec
-				    && type != dns_rdatatype_dnskey) {
+				    && type != dns_rdatatype_key) {
 					/*
 					 * Glue is not OK, but any answer we
 					 * could return would be glue.  Return
@@ -2430,8 +2483,14 @@
 		 * and the type is NSEC or KEY.
 		 */
 		if (search.zonecut == node) {
+			/*
+			 * It is not clear if KEY should still be
+			 * allowed at the parent side of the zone
+			 * cut or not.  It is needed for RFC3007
+			 * validated updates.
+			 */
 			if (type == dns_rdatatype_nsec ||
-			    type == dns_rdatatype_dnskey)
+			    type == dns_rdatatype_key)
 				result = ISC_R_SUCCESS;
 			else if (type == dns_rdatatype_any)
 				result = DNS_R_ZONECUT;
@@ -2860,7 +2919,7 @@
 	rdatasetheader_t *header, *header_prev, *header_next;
 	rdatasetheader_t *found, *nsheader;
 	rdatasetheader_t *foundsig, *nssig, *cnamesig;
-	rbtdb_rdatatype_t sigtype, nsectype;
+	rbtdb_rdatatype_t sigtype, negtype;
 
 	UNUSED(version);
 
@@ -2918,12 +2977,12 @@
 
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
-	 * (RFC 2535, section 2.3.5).
+	 * (RFC4035, section 2.5 and RFC3007).
 	 *
 	 * We don't check for RRSIG, because we don't store RRSIG records
 	 * directly.
 	 */
-	if (type == dns_rdatatype_dnskey || type == dns_rdatatype_nsec)
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec)
 		cname_ok = ISC_FALSE;
 
 	/*
@@ -2935,7 +2994,7 @@
 	found = NULL;
 	foundsig = NULL;
 	sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	nsheader = NULL;
 	nssig = NULL;
 	cnamesig = NULL;
@@ -3007,7 +3066,7 @@
 				 */
 				foundsig = header;
 			} else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				   header->type == nsectype) {
+				   header->type == negtype) {
 				/*
 				 * We've found a negative cache entry.
 				 */
@@ -3618,7 +3677,7 @@
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
 	dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node;
 	rdatasetheader_t *header, *header_next, *found, *foundsig;
-	rbtdb_rdatatype_t matchtype, sigmatchtype, nsectype;
+	rbtdb_rdatatype_t matchtype, sigmatchtype, negtype;
 	isc_result_t result;
 
 	REQUIRE(VALID_RBTDB(rbtdb));
@@ -3636,7 +3695,7 @@
 	found = NULL;
 	foundsig = NULL;
 	matchtype = RBTDB_RDATATYPE_VALUE(type, covers);
-	nsectype = RBTDB_RDATATYPE_VALUE(0, type);
+	negtype = RBTDB_RDATATYPE_VALUE(0, type);
 	if (covers == 0)
 		sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, type);
 	else
@@ -3659,7 +3718,7 @@
 			if (header->type == matchtype)
 				found = header;
 			else if (header->type == RBTDB_RDATATYPE_NCACHEANY ||
-				 header->type == nsectype)
+				 header->type == negtype)
 				found = header;
 			else if (header->type == sigmatchtype)
 				foundsig = header;
@@ -3785,16 +3844,13 @@
 			 * Look for active extant "other data".
 			 *
 			 * "Other data" is any rdataset whose type is not
-			 * DNSKEY, RRSIG DNSKEY, NSEC, RRSIG NSEC,
-			 * or RRSIG CNAME.
+			 * KEY, RRSIG KEY, NSEC, RRSIG NSEC or RRSIG CNAME.
 			 */
 			rdtype = RBTDB_RDATATYPE_BASE(header->type);
 			if (rdtype == dns_rdatatype_rrsig ||
 			    rdtype == dns_rdatatype_sig)
 				rdtype = RBTDB_RDATATYPE_EXT(header->type);
 			if (rdtype != dns_rdatatype_nsec &&
-			    rdtype != dns_rdatatype_dnskey &&
-			    rdtype != dns_rdatatype_nxt &&
 			    rdtype != dns_rdatatype_key &&
 			    rdtype != dns_rdatatype_cname) {
 				/*
@@ -3839,7 +3895,8 @@
 	isc_boolean_t header_nx;
 	isc_boolean_t newheader_nx;
 	isc_boolean_t merge;
-	dns_rdatatype_t nsectype, rdtype, covers;
+	dns_rdatatype_t rdtype, covers;
+	rbtdb_rdatatype_t negtype;
 	dns_trust_t trust;
 
 	/*
@@ -3877,7 +3934,7 @@
 	newheader_nx = NONEXISTENT(newheader) ? ISC_TRUE : ISC_FALSE;
 	topheader_prev = NULL;
 
-	nsectype = 0;
+	negtype = 0;
 	if (rbtversion == NULL && !newheader_nx) {
 		rdtype = RBTDB_RDATATYPE_BASE(newheader->type);
 		if (rdtype == 0) {
@@ -3887,12 +3944,13 @@
 			covers = RBTDB_RDATATYPE_EXT(newheader->type);
 			if (covers == dns_rdatatype_any) {
 				/*
-				 * We're adding an NXDOMAIN negative cache
-				 * entry.
+				 * We're adding an negative cache entry
+				 * which covers all types (NXDOMAIN,
+				 * NODATA(QTYPE=ANY)).
 				 *
 				 * We make all other data stale so that the
 				 * only rdataset that can be found at this
-				 * node is the NXDOMAIN negative cache entry.
+				 * node is the negative cache entry.
 				 */
 				for (topheader = rbtnode->data;
 				     topheader != NULL;
@@ -3904,17 +3962,19 @@
 				rbtnode->dirty = 1;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(covers, 0);
+			negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
 		} else {
 			/*
 			 * We're adding something that isn't a
 			 * negative cache entry.  Look for an extant
-			 * non-stale NXDOMAIN negative cache entry.
+			 * non-stale NXDOMAIN/NODATA(QTYPE=ANY) negative
+			 * cache entry.
 			 */
 			for (topheader = rbtnode->data;
 			     topheader != NULL;
 			     topheader = topheader->next) {
-				if (NXDOMAIN(topheader))
+				if (topheader->type == 
+				    RBTDB_RDATATYPE_NCACHEANY)
 					break;
 			}
 			if (topheader != NULL && EXISTS(topheader) &&
@@ -3924,7 +3984,8 @@
 				 */
 				if (trust < topheader->trust) {
 					/*
-					 * The NXDOMAIN is more trusted.
+					 * The NXDOMAIN/NODATA(QTYPE=ANY)
+					 * is more trusted.
 					 */
 					free_rdataset(rbtdb->common.mctx,
 						      newheader);
@@ -3936,7 +3997,7 @@
 				}
 				/*
 				 * The new rdataset is better.  Expire the
-				 * NXDOMAIN.
+				 * NXDOMAIN/NODATA(QTYPE=ANY).
 				 */
 				topheader->ttl = 0;
 				topheader->attributes |= RDATASET_ATTR_STALE;
@@ -3944,7 +4005,7 @@
 				topheader = NULL;
 				goto find_header;
 			}
-			nsectype = RBTDB_RDATATYPE_VALUE(0, rdtype);
+			negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 		}
 	}
 
@@ -3952,7 +4013,7 @@
 	     topheader != NULL;
 	     topheader = topheader->next) {
 		if (topheader->type == newheader->type ||
-		    topheader->type == nsectype)
+		    topheader->type == negtype)
 			break;
 		topheader_prev = topheader;
 	}
@@ -4118,6 +4179,10 @@
 			rbtnode->dirty = 1;
 			if (changed != NULL)
 				changed->dirty = ISC_TRUE;
+			if (rbtversion == NULL) {
+				header->ttl = 0;
+				header->attributes |= RDATASET_ATTR_STALE;
+			}
 		}
 	} else {
 		/*
@@ -4318,6 +4383,13 @@
 	if (delegating)
 		RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4460,6 +4532,13 @@
  unlock:
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4501,6 +4580,13 @@
 
 	UNLOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
+	/*
+	 * Update the zone's secure status.  If version is non-NULL
+	 * this is defered until closeversion() is called.
+	 */
+	if (result == ISC_R_SUCCESS && version == NULL && !IS_CACHE(rbtdb))
+		rbtdb->secure = iszonesecure(db, rbtdb->origin_node);
+
 	return (result);
 }
 
@@ -4615,48 +4701,6 @@
 	return (ISC_R_SUCCESS);
 }
 
-static isc_boolean_t
-iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
-	dns_rdataset_t keyset;
-	dns_rdataset_t nsecset, signsecset;
-	isc_boolean_t haszonekey = ISC_FALSE;
-	isc_boolean_t hasnsec = ISC_FALSE;
-	isc_result_t result;
-
-	dns_rdataset_init(&keyset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_dnskey, 0,
-				     0, &keyset, NULL);
-	if (result == ISC_R_SUCCESS) {
-		dns_rdata_t keyrdata = DNS_RDATA_INIT;
-		result = dns_rdataset_first(&keyset);
-		while (result == ISC_R_SUCCESS) {
-			dns_rdataset_current(&keyset, &keyrdata);
-			if (dns_zonekey_iszonekey(&keyrdata)) {
-				haszonekey = ISC_TRUE;
-				break;
-			}
-			result = dns_rdataset_next(&keyset);
-		}
-		dns_rdataset_disassociate(&keyset);
-	}
-	if (!haszonekey)
-		return (ISC_FALSE);
-
-	dns_rdataset_init(&nsecset);
-	dns_rdataset_init(&signsecset);
-	result = dns_db_findrdataset(db, origin, NULL, dns_rdatatype_nsec, 0,
-				     0, &nsecset, &signsecset);
-	if (result == ISC_R_SUCCESS) {
-		if (dns_rdataset_isassociated(&signsecset)) {
-			hasnsec = ISC_TRUE;
-			dns_rdataset_disassociate(&signsecset);
-		}
-		dns_rdataset_disassociate(&nsecset);
-	}
-	return (hasnsec);
-
-}
-
 static isc_result_t
 endload(dns_db_t *db, dns_dbload_t **dbloadp) {
 	rbtdb_load_t *loadctx;
@@ -5235,7 +5279,8 @@
 	rdatasetheader_t *header, *top_next;
 	rbtdb_serial_t serial;
 	isc_stdtime_t now;
-	rbtdb_rdatatype_t type;
+	rbtdb_rdatatype_t type, negtype;
+	dns_rdatatype_t rdtype, covers;
 
 	header = rbtiterator->current;
 	if (header == NULL)
@@ -5252,9 +5297,18 @@
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
 	type = header->type;
+	rdtype = RBTDB_RDATATYPE_BASE(header->type);
+	if (rdtype == 0) {
+		covers = RBTDB_RDATATYPE_EXT(header->type);
+		negtype = RBTDB_RDATATYPE_VALUE(covers, 0);
+	} else 
+		negtype = RBTDB_RDATATYPE_VALUE(0, rdtype);
 	for (header = header->next; header != NULL; header = top_next) {
 		top_next = header->next;
-		if (header->type != type) {
+		/*
+		 * If not walking back up the down list.
+		 */
+		if (header->type != type && header->type != negtype) {
 			do {
 				if (header->serial <= serial &&
 				    !IGNORE(header)) {

bind-9.3.2-ch2009_rt15808.patch:
 masterdump.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bind-9.3.2-ch2009_rt15808.patch ---
--- bind-9.3.2/lib/dns/masterdump.c.ch2009_rt15808	2004-08-28 02:25:19.000000000 -0400
+++ bind-9.3.2/lib/dns/masterdump.c	2006-06-13 18:08:18.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.56.2.5.2.12 2004/08/28 06:25:19 marka Exp $ */
+/* $Id: masterdump.c,v 1.56.2.5.2.15 2006/03/10 00:17:21 marka Exp $ */
 
 #include <config.h>
 
@@ -1160,7 +1160,8 @@
 	}
 
 	if (dctx->nodes != 0 && result == ISC_R_SUCCESS) {
-		dns_dbiterator_pause(dctx->dbiter);
+		result = dns_dbiterator_pause(dctx->dbiter);
+		RUNTIME_CHECK(result == ISC_R_SUCCESS);
 		result = DNS_R_CONTINUE;
 	} else if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
@@ -1197,9 +1198,8 @@
 		dns_dumpctx_attach(dctx, dctxp);
 		return (DNS_R_CONTINUE);
 	}
-	if (dctx != NULL)
-		dns_dumpctx_detach(&dctx);
 
+	dns_dumpctx_detach(&dctx);
 	return (result);
 }
 

bind-9.3.2-ch2013_rt15941.patch:
 tsig.c |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

--- NEW FILE bind-9.3.2-ch2013_rt15941.patch ---
--- bind-9.3.2/lib/dns/tsig.c.ch2013_rt15941	2005-03-16 22:58:31.000000000 -0500
+++ bind-9.3.2/lib/dns/tsig.c	2006-06-13 18:02:14.000000000 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.112.2.3.8.6 2005/03/17 03:58:31 marka Exp $
+ * $Id: tsig.c,v 1.112.2.3.8.10 2006/05/02 04:21:42 marka Exp $
  */
 
 #include <config.h>
@@ -363,7 +363,7 @@
 	isc_buffer_t databuf, sigbuf;
 	isc_buffer_t *dynbuf;
 	dns_name_t *owner;
-	dns_rdata_t *rdata;
+	dns_rdata_t *rdata = NULL;
 	dns_rdatalist_t *datalist;
 	dns_rdataset_t *dataset;
 	isc_region_t r;
@@ -555,13 +555,12 @@
 		tsig.signature = NULL;
 	}
 
-	rdata = NULL;
 	ret = dns_message_gettemprdata(msg, &rdata);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_signature;
 	ret = isc_buffer_allocate(msg->mctx, &dynbuf, 512);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_signature;
+		goto cleanup_rdata;
 	ret = dns_rdata_fromstruct(rdata, dns_rdataclass_any,
 				   dns_rdatatype_tsig, &tsig, dynbuf);
 	if (ret != ISC_R_SUCCESS)
@@ -577,7 +576,7 @@
 	owner = NULL;
 	ret = dns_message_gettempname(msg, &owner);
 	if (ret != ISC_R_SUCCESS)
-		goto cleanup_dynbuf;
+		goto cleanup_rdata;
 	dns_name_init(owner, NULL);
 	ret = dns_name_dup(&key->name, msg->mctx, owner);
 	if (ret != ISC_R_SUCCESS)
@@ -587,16 +586,16 @@
 	ret = dns_message_gettemprdatalist(msg, &datalist);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_owner;
+	dataset = NULL;
+	ret = dns_message_gettemprdataset(msg, &dataset);
+	if (ret != ISC_R_SUCCESS)
+		goto cleanup_rdatalist;
 	datalist->rdclass = dns_rdataclass_any;
 	datalist->type = dns_rdatatype_tsig;
 	datalist->covers = 0;
 	datalist->ttl = 0;
 	ISC_LIST_INIT(datalist->rdata);
 	ISC_LIST_APPEND(datalist->rdata, rdata, link);
-	dataset = NULL;
-	ret = dns_message_gettemprdataset(msg, &dataset);
-	if (ret != ISC_R_SUCCESS)
-		goto cleanup_owner;
 	dns_rdataset_init(dataset);
 	RUNTIME_CHECK(dns_rdatalist_tordataset(datalist, dataset)
 		      == ISC_R_SUCCESS);
@@ -605,16 +604,19 @@
 
 	return (ISC_R_SUCCESS);
 
-cleanup_owner:
-	if (owner != NULL)
-		dns_message_puttempname(msg, &owner);
-cleanup_dynbuf:
-	if (dynbuf != NULL)
-		isc_buffer_free(&dynbuf);
-cleanup_signature:
+ cleanup_rdatalist:
+	dns_message_puttemprdatalist(msg, &datalist);
+ cleanup_owner:
+	dns_message_puttempname(msg, &owner);
+	goto cleanup_rdata;
+ cleanup_dynbuf:
+	isc_buffer_free(&dynbuf);
+ cleanup_rdata:
+	dns_message_puttemprdata(msg, &rdata);
+ cleanup_signature:
 	if (tsig.signature != NULL)
 		isc_mem_put(mctx, tsig.signature, sigsize);
-cleanup_context:
+ cleanup_context:
 	if (ctx != NULL)
 		dst_context_destroy(&ctx);
 	return (ret);
@@ -646,8 +648,11 @@
 
 	msg->verify_attempted = 1;
 
-	if (msg->tcp_continuation)
+	if (msg->tcp_continuation) {
+		if (tsigkey == NULL || msg->querytsig == NULL)
+			return (DNS_R_UNEXPECTEDTSIG);
 		return (tsig_verify_tcp(source, msg));
+	}
 
 	/*
 	 * There should be a TSIG record...

bind-9.3.2-ch2024_rt16027.patch:
 zone.c |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

--- NEW FILE bind-9.3.2-ch2024_rt16027.patch ---
--- bind-9.3.2/lib/dns/zone.c.ch2024_rt16027	2005-07-28 20:38:33.000000000 -0400
+++ bind-9.3.2/lib/dns/zone.c	2006-06-13 17:47:56.000000000 -0400
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.333.2.23.2.59 2005/07/29 00:38:33 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.23.2.64 2006/05/18 02:28:55 marka Exp $ */
 
 #include <config.h>
 
@@ -772,12 +772,10 @@
 
  nomem:
 	if (new != NULL) {
-		for (i = 0; i < dbargc; i++) {
-			if (zone->db_argv[i] != NULL)
+		for (i = 0; i < dbargc; i++)
+			if (new[i] != NULL)
 				isc_mem_free(zone->mctx, new[i]);
-			isc_mem_put(zone->mctx, new,
-				    dbargc * sizeof(*new));
-		}
+		isc_mem_put(zone->mctx, new, dbargc * sizeof(*new));
 	}
 	result = ISC_R_NOMEMORY;
 
@@ -998,7 +996,7 @@
 			result = isc_file_getmodtime(zone->masterfile,
 						     &filetime);
 			if (result == ISC_R_SUCCESS &&
-			    isc_time_compare(&filetime, &zone->loadtime) < 0) {
+			    isc_time_compare(&filetime, &zone->loadtime) <= 0) {
 				dns_zone_log(zone, ISC_LOG_DEBUG(1),
 					     "skipping load: master file older "
 					     "than last load");
@@ -1010,6 +1008,16 @@
 
 	INSIST(zone->db_argc >= 1);
 
+	/*
+	 * Built in zones don't need to be reloaded.
+	 */
+	if (zone->type == dns_zone_master &&
+	    strcmp(zone->db_argv[0], "_builtin") == 0 &&
+	    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
+		result = ISC_R_SUCCESS;
+		goto cleanup;
+	}
+
 	if ((zone->type == dns_zone_slave || zone->type == dns_zone_stub) &&
 	    (strcmp(zone->db_argv[0], "rbt") == 0 ||
 	     strcmp(zone->db_argv[0], "rbt64") == 0)) {
@@ -1210,10 +1218,12 @@
 				       zone_gotreadhandle, load,
 				       &zone->readio);
 		if (result != ISC_R_SUCCESS) {
-			tresult = dns_db_endload(load->db,
-						 &load->callbacks.add_private);
-			if (result == ISC_R_SUCCESS)
-				result = tresult;
+			/*
+			 * We can't report multiple errors so ignore
+			 * the result of dns_db_endload().
+			 */
+			(void)dns_db_endload(load->db,
+					     &load->callbacks.add_private);
 			goto cleanup;
 		} else
 			result = DNS_R_CONTINUE;
@@ -1284,14 +1294,12 @@
 	dns_zone_log(zone, ISC_LOG_DEBUG(2),
 		     "number of nodes in database: %u",
 		     dns_db_nodecount(db));
-	zone->loadtime = loadtime;
-
-	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
 
 	if (result == DNS_R_SEENINCLUDE)
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
 	else
 		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
+
 	/*
 	 * Apply update log, if any, on initial load.
 	 */
@@ -1323,6 +1331,10 @@
 			needdump = ISC_TRUE;
 	}
 
+	zone->loadtime = loadtime;
+
+	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
+
 	/*
 	 * Obtain ns and soa counts for top of zone.
 	 */
@@ -2274,6 +2286,7 @@
 	isc_interval_t i;
 	isc_uint32_t oldflags;
 	unsigned int j;
+	isc_result_t result;
 
 	REQUIRE(DNS_ZONE_VALID(zone));
 
@@ -2307,7 +2320,11 @@
 	 */
 	isc_interval_set(&i, isc_random_jitter(zone->retry, zone->retry / 4),
 			 0);
-	isc_time_nowplusinterval(&zone->refreshtime, &i);
+	result = isc_time_nowplusinterval(&zone->refreshtime, &i);
+	if (result != ISC_R_SUCCESS)
+		dns_zone_log(zone, ISC_LOG_WARNING,
+			     "isc_time_nowplusinterval() failed: %s",
+			     dns_result_totext(result));
 
 	/*
 	 * When lacking user-specified timer values from the SOA,


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind-chroot-admin.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bind-chroot-admin.in	19 Apr 2006 14:01:13 -0000	1.6
+++ bind-chroot-admin.in	19 Jul 2006 21:05:53 -0000	1.7
@@ -50,6 +50,15 @@
     return 1;
 }
 
+function selinux_enabled()
+{
+    [ -e /etc/selinux/config ] && . /etc/selinux/config;
+    if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then
+	return 0;
+    fi;
+    return 1;
+}
+
 function check_dirs()
 {
     if [ -z "$BIND_CHROOT_PREFIX" ]; then
@@ -89,7 +98,7 @@
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
     chown root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
     chmod 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
-    if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then       
+    if selinux_enabled && [ -x /usr/bin/chcon ]; then       
        for dev in random zero null; do
 	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
        done
@@ -250,7 +259,7 @@
     chmod 660 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1;
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
-	if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then
+	if selinux_enabled && [ -x /sbin/restorecon ]; then
 	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/etc ${BIND_CHROOT_PREFIX}/var/named ${BIND_CHROOT_PREFIX}/var/run/named >/dev/null 2>&1;
 	   if [ -e ${BIND_CHROOT_PREFIX}/etc/localtime ] && [ -e /etc/localtime ] ; then 
 	      /usr/bin/chcon --reference=/etc/localtime ${BIND_CHROOT_PREFIX}/etc/localtime >/dev/null 2>&1;


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- bind.spec	19 Apr 2006 14:01:13 -0000	1.103
+++ bind.spec	19 Jul 2006 21:05:53 -0000	1.104
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	20.FC5
+Release: 	22%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -89,6 +89,24 @@
 Patch30:	bind-9.3.2-bz187286_fix_host_cname.patch
 Patch31:	bind-9.3.2-bz173961.patch
 Patch32:	bind-9.3.2-prctl_set_dumpable.patch
+Patch33:	bind-9.3.2-ch2024_rt16027.patch
+Patch34:        bind-9.3.2-ch2013_rt15941.patch
+Patch35:	bind-9.3.2-ch2009_rt15808.patch
+Patch36:	bind-9.3.2-ch1997_rt15818.patch
+Patch37:	bind-9.3.2-ch1994_rt15694.patch
+Patch38:	bind-9.3.2-ch1991_rt15813.patch
+Patch39:	bind-9.3.2-9_3_3_validator.patch
+Patch40:	bind-9.3.2-9_3_3_resolver.patch
+Patch41:	bind-9.3.2-9_3_3_dns.patch
+Patch42:	bind-9.3.2-9_3_3_isc.patch
+Patch43:        bind-9.3.2-9_3_3_bind.patch
+Patch44:	bind-9.3.2-9_3_3_isccfg.patch
+Patch45:	bind-9.3.2-9_3_3_lwres.patch
+Patch46:	bind-9.3.2-9_3_3_named.patch
+Patch47:	bind-9.3.2-9_3_3_dig.patch
+Patch48:	bind-9.3.2-9_3_3_dnssec.patch
+Patch49:	bind-9.3.2-9_3_3_nsupdate.patch
+Patch50:	bind-9.3.2-9_3_3_tests.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2
 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26
@@ -97,7 +115,7 @@
 %if %{selinux}
 Requires(post):	policycoreutils
 %endif
-BuildRequires: 	gcc, glibc-devel >= 2.2.5-26,  glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, pkgconfig, tar
+BuildRequires: 	gcc, glibc-devel >= 2.2.5-26,  glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, autoconf, pkgconfig
 %if %{SDB}
 BuildRequires:  openldap-devel, postgresql-devel
 %endif
@@ -317,6 +335,24 @@
 %patch30 -p1 -b .bz187286_fix_host_cname
 %patch31 -p1 -b .bz173961
 %patch32 -p1 -b .prctl_set_dumpable
+%patch33 -p1 -b .ch2024_rt16027
+%patch34 -p1 -b .ch2013_rt15941
+%patch35 -p1 -b .ch2009_rt15808
+%patch36 -p1 -b .ch1997_rt15818
+%patch37 -p1 -b .ch1994_rt15694
+%patch38 -p1 -b .ch1991_rt15813
+%patch39 -p1 -b .9_3_3_validator
+%patch40 -p1 -b .9_3_3_resolver
+%patch41 -p1 -b .9_3_3_dns
+%patch42 -p1 -b .9_3_3_isc
+%patch43 -p1 -b .9_3_3_bind
+%patch44 -p1 -b .9_3_3_isccfg
+%patch45 -p1 -b .9_3_3_lwres
+%patch46 -p1 -b .9_3_3_named 
+%patch47 -p1 -b .9_3_3_dig
+%patch48 -p1 -b .9_3_3_dnssec
+%patch49 -p1 -b .9_3_3_nsupdate
+%patch50 -p1 -b .9_3_3_tests
 #
 # this must follow all dbus patches:
 %if %{SDB}
@@ -363,6 +399,7 @@
 %endif
 	CFLAGS="$CFLAGS" \
 ;
+if [ -s openssl_config.h ]; then cat openssl_config.h >> config.h ; fi;
 make %{?_smp_mflags}
 
 
@@ -503,7 +540,7 @@
 %dir /var/named/slaves
 %dir /var/named/data
 %dir /var/run/named
-%defattr(0750,root,root,0750)
+%defattr(0754,root,root,0750)
 %config /etc/rc.d/init.d/named
 %defattr(0640,root,named,0750)
 %config(noreplace) /etc/sysconfig/named
@@ -550,7 +587,7 @@
 
 %files libs
 %defattr(0755,root,root,0755)
-%{_libdir}/*so*
+%{_libdir}/*so.*
 
 %files utils
 %defattr(0755,root,root,0755)
@@ -572,6 +609,8 @@
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
 %{_libdir}/liblwres.a
+%exclude %{_libdir}/libbind.so
+%{_libdir}/*so
 %{_includedir}/bind9
 %{_includedir}/dns
 %{_includedir}/dst
@@ -637,6 +676,7 @@
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
+%{_libdir}/libbind.so
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -805,7 +845,44 @@
 :;
 
 %changelog
-* Tue Apr 18 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-20
+* Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-30
+- fix bug 196398 - Enable -D option automatically in initscript
+  if NetworkManager enabled in any runlevel.
+- fix bug 
+- fix bugs 191093, 189789
+- fix bug 196962 (fixed by backported 9.3.3b1 fixes to lib/isc/unix/ifiter_ioctl.c)
+- backport selected fixes from upstream bind9 'v9_3_3b1' CVS version:
+  ( see http://www.isc.org/sw/bind9.3.php "Fixes" ): 
+  o change 2024 / bug 16027:
+    named emitted spurious "zone serial unchanged" messages on reload
+  o change 2013 / bug 15941:
+    handle unexpected TSIGs on unsigned AXFR/IXFR responses more gracefully
+  o change 2009 / bug 15808: coverity fixes
+  o change 1997 / bug 15818: 
+    named was failing to replace negative cache entries when a positive one
+    for the type was learnt
+  o change 1994 / bug 15694: OpenSSL 0.9.8 support
+  o change 1991 / bug 15813:
+    The configuration data, once read, should be treated as readonly.
+  o misc. validator fixes 
+  o misc. resolver fixes
+  o misc. dns fixes
+  o misc. isc fixes
+  o misc. libbind fixes
+  o misc. isccfg fix
+  o misc. lwres fix
+  o misc. named fixes
+  o misc. dig fixes
+  o misc. nsupdate fix
+  o misc. tests fixes
+
+* Wed Jun  7 2006 Jeremy Katz <katzj at redhat.com> - 30:9.3.2-24.FC6
+- and actually put the devel symlinks in the right subpackage
+
+* Thu May 25 2006 Jeremy Katz <katzj at redhat.com> - 30:9.3.2-23.FC6
+- rebuild for -devel deps
+
+* Tue Apr 18 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-22
 - apply upstream patch for ncache_adderesult segfault bug 173961 addenda
 - fix bug 188382: rpm --verify permissions inconsistencies
 - fix bug 189186: use /sbin/service instead of initscript


Index: named.conf.sample
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/named.conf.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- named.conf.sample	30 Mar 2006 01:05:30 -0000	1.1
+++ named.conf.sample	19 Jul 2006 21:05:53 -0000	1.2
@@ -68,8 +68,8 @@
 /* This view will contain zones you want to serve only to "internal" clients
    that connect via your directly attached LAN interfaces - "localnets" .
  */
-	match-clients		{ !localnets; !localhost; };
-	match-destinations	{ !localnets; !localhost; };
+	match-clients		{ localnets; };
+	match-destinations	{ localnets; };
 	recursion yes;
 	// all views must contain the root hints zone:
 	include "/etc/named.root.hints";


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/named.init,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- named.init	22 Mar 2006 18:07:49 -0000	1.42
+++ named.init	19 Jul 2006 21:05:53 -0000	1.43
@@ -60,9 +60,29 @@
        echo Locating $ROOTDIR/${named_conf} failed:
        failure
        echo;
+       exit 1;
    fi;
 fi;
 
+NetworkManagerEnabled=0
+for l in 0 1 2 3 4 5 6; do 
+    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
+	NetworkManagerEnabled=1; 
+    fi; 
+done
+
+dbusEnabled=0;
+for a in $OPTIONS; do
+    if [ $a  = "-D" ]; then
+	dbusEnabled=1;
+    fi;
+done
+
+if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then
+   OPTIONS="$OPTIONS -D";
+   dbusEnabled=1;
+fi
+
 start() {
         # Start daemons.
         echo -n $"Starting $named: "
@@ -85,13 +105,7 @@
 		if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
 		    mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
-		dbus=0;
-		for a in $OPTIONS; do
-		    if [ $a  = "-D" ]; then
-			dbus=1;
-	            fi;
-	        done
-		if [ $dbus -eq 1 ]; then
+		if [ $dbusEnabled -eq 1 ]; then
 		    if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
 			mkdir -p ${ROOTDIR}/var/run/dbus
 			if [ ! -d  /var/run/dbus ] ; then



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:08:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:08:38 -0400
Subject: rpms/rgmanager/devel .cvsignore, 1.6, 1.7 rgmanager.spec, 1.30,
	1.31 sources, 1.13, 1.14
Message-ID: <200607192108.k6JL8cL4008733@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8719

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Updated Sources (automated).


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jul 2006 20:52:15 -0000	1.6
+++ .cvsignore	19 Jul 2006 21:08:29 -0000	1.7
@@ -1,2 +1,3 @@
 rgmanager-2.0.0.tar.gz
 rgmanager-2.0.2.tar.gz
+rgmanager-2.0.3.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rgmanager.spec	18 Jul 2006 20:52:15 -0000	1.30
+++ rgmanager.spec	19 Jul 2006 21:08:34 -0000	1.31
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 2.0.2
+Version: 2.0.3
 Release: 0
 License: GPL,LGPL
 Group: System Environment/Base


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Jul 2006 20:52:15 -0000	1.13
+++ sources	19 Jul 2006 21:08:34 -0000	1.14
@@ -1 +1 @@
-612607db0d523539a32018e65d1ebd85  rgmanager-2.0.2.tar.gz
+6001ba57c6fcfe5c37e89880823183cf  rgmanager-2.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:24:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:24:08 -0400
Subject: rpms/gaim/devel gaim-fedora-prefs.xml, 1.7, 1.8 gaim.spec, 1.129,
	1.130
Message-ID: <200607192124.k6JLO8dE006455@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6417

Modified Files:
	gaim-fedora-prefs.xml gaim.spec 
Log Message:
cleanup spec and update default pref



Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim-fedora-prefs.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gaim-fedora-prefs.xml	10 Jun 2005 03:37:31 -0000	1.7
+++ gaim-fedora-prefs.xml	19 Jul 2006 21:24:04 -0000	1.8
@@ -1,261 +1,341 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='current' type='int' value='1153343286'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1153343293'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value=''/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
 			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
-			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
-			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gaim.spec	19 Jul 2006 19:28:49 -0000	1.129
+++ gaim.spec	19 Jul 2006 21:24:04 -0000	1.130
@@ -10,11 +10,13 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
-# OPTION: Mono integration (FC5+)
-%define mono_integration	0
 # OPTION: dbus integration (FC5+)
 %define dbus_integration	1
+# OPTION: dbus-glib split (FC6+)
+%define dbus_glib_splt		1
 
+# OPTION: Mono integration (FC5+, broken)
+%define mono_integration	0
 # OPTION: Howl integration (seems broken)
 %define howl_integration	0
 # OPTION: gadugadu integration (not shipped in core)
@@ -27,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.6.%{betaver}.2%{?dist}
+Release:	0.7.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -98,16 +100,19 @@
 %if %{silc_integration}
 BuildRequires:	libsilc-devel
 %endif
-# Mono integration (FC5+)
-%if %{mono_integration}
-BuildRequires:	mono-devel
-%endif
 # DBus integration (FC5+)
 %if %{dbus_integration}
-BuildRequires:	dbus-devel >= 0.90
+BuildRequires:	dbus-devel >= 0.35
+%endif
+# DBus GLIB Split (FC6+)
+%if %{dbus_glib_splt}
 BuildRequires:  dbus-glib-devel >= 0.70
 %endif
 
+# Mono integration (FC5+, broken)
+%if %{mono_integration}
+BuildRequires:	mono-devel
+%endif
 # Howl integration (seems to be broken)
 %if %{howl_integration}
 BuildRequires:	avahi-devel
@@ -290,7 +295,10 @@
 %{_libdir}/libgaim-client.so
 
 %changelog
-* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2:2.0.0-0.6.beta4.2
+* Wed Jul 19 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.7.beta3
+- cleanup spec and update default pref
+
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2:2.0.0-0.6.beta3.2
 - Add BR for dbus-glib-devel
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.0.0-0.6.beta3.1



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:32:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:32:08 -0400
Subject: rpms/pygtk2/devel pygtk-2.9.3-init.patch, NONE, 1.1 pygtk.spec, 1.58,
	1.59
Message-ID: <200607192132.k6JLW8EJ008913@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8833

Modified Files:
	pygtk.spec 
Added Files:
	pygtk-2.9.3-init.patch 
Log Message:
Add patch to restore exception raising behavior if there's no $DISPLAY set.
Rebuild.


pygtk-2.9.3-init.patch:
 __init__.py |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE pygtk-2.9.3-init.patch ---
diff -ruN pygtk-2.9.3.orig/gtk/__init__.py pygtk-2.9.3/gtk/__init__.py
--- pygtk-2.9.3.orig/gtk/__init__.py	2006-07-12 12:46:27.000000000 -0400
+++ pygtk-2.9.3/gtk/__init__.py	2006-07-19 17:13:37.000000000 -0400
@@ -47,11 +47,7 @@
 
     try:
         sys_path = sys.path[:]
-
-        try:
-            _gtk.init_check()
-        except RuntimeError, e:
-            print >> sys.stderr, "WARNING: %s" % e
+        _gtk.init_check()
     finally:
         # init_check calls PySys_SetArgv which calls sys.path.insert(0, ''),
         # which causes problems for pychecker, restore it if modified.


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pygtk.spec	13 Jul 2006 02:35:54 -0000	1.58
+++ pygtk.spec	19 Jul 2006 21:32:05 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.3
-Release: 1
+Release: 2
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -27,6 +27,7 @@
 BuildRequires: libtool
 
 Patch0: pygtk-2.9.2-use-complete-include-path.patch
+Patch1: pygtk-2.9.3-init.patch
 
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
@@ -57,6 +58,7 @@
 %prep
 %setup -q -n pygtk-%{version}
 %patch0 -p1 -b .use-complete-include-path
+%patch1 -p1
 
 %build
 %configure --enable-thread --enable-numpy
@@ -115,6 +117,10 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 2.9.3-2
+- Revert to previous behavior of raising an error if $DISPLAY cannot be
+  opened.
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-1
 - Update to 2.9.3
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:41:29 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.299, 1.300 anaconda.spec, 1.424,
	1.425 sources, 1.421, 1.422
Message-ID: <200607192141.k6JLfThs011036@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11001/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.61-1 on branch devel from anaconda-11.1.0.61-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- .cvsignore	18 Jul 2006 18:24:44 -0000	1.299
+++ .cvsignore	19 Jul 2006 21:41:27 -0000	1.300
@@ -1 +1 @@
-anaconda-11.1.0.60.tar.bz2
+anaconda-11.1.0.61.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- anaconda.spec	18 Jul 2006 18:24:44 -0000	1.424
+++ anaconda.spec	19 Jul 2006 21:41:27 -0000	1.425
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.60
+Version: 11.1.0.61
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 11.1.0.61-1
+- Bring down network interface after fetching files (dcantrel).
+- Use dejavu fonts instead of vera (katzj).
+- Tweak iSCSI, partitioning, and tasksel UI (katzj, #199451).
+- Fix busybox symlinks (katzj, #199463).
+- Use reboot instead of shutdown (katzj, #199262).
+- Fix DHCP error messages (dcantrel, #199452).
+
 * Tue Jul 18 2006 David Cantrell <dcantrell at redhat.com> - 11.1.0.60-1
 - Fix va_copy() argument ordering in logMessageV() in loader
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -r1.421 -r1.422
--- sources	18 Jul 2006 18:24:44 -0000	1.421
+++ sources	19 Jul 2006 21:41:27 -0000	1.422
@@ -1 +1 @@
-f7fa0215f26b1c56c10cc74814cf0b85  anaconda-11.1.0.60.tar.bz2
+549ad31828cb011ad62494e506376fed  anaconda-11.1.0.61.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:47:42 -0400
Subject: rpms/lockdev/devel lockdev.spec,1.24,1.25
Message-ID: <200607192147.k6JLlghj023408@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lockdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22829

Modified Files:
	lockdev.spec 
Log Message:
fix spec file


Index: lockdev.spec
===================================================================
RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lockdev.spec	12 Jul 2006 07:14:19 -0000	1.24
+++ lockdev.spec	19 Jul 2006 21:47:39 -0000	1.25
@@ -1,10 +1,11 @@
 Summary: A library for locking devices.
 Name: lockdev
 Version: 1.0.1
-Release: 9.2.2
+Release: 10
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
+
 Patch0: lockdev-1.0.0-rh.patch
 Patch1: lockdev-1.0.0-shared.patch
 Patch2: lockdev-1.0.0-signal.patch
@@ -14,7 +15,12 @@
 Patch6: lockdev-1.0.1-subdir.patch
 Patch7: lockdev-1.0.1-fcntl.patch
 Patch8: lockdev-1.0.1-32bit.patch
-Prereq: shadow-utils, filesystem >= 2.1.4-1
+
+Requires(pre): shadow-utils 
+Requires(post): glibc
+Requires(postun): glibc
+PreReq: filesystem >= 2.1.4-1
+
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -81,6 +87,9 @@
 %{_includedir}/*
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 1.0.1-10
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-9.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:52:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:52:39 -0400
Subject: rpms/gawk/devel gawk.spec,1.42,1.43
Message-ID: <200607192152.k6JLqdSc028854@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28822

Modified Files:
	gawk.spec 
Log Message:
fix spec file


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gawk.spec	18 Jul 2006 07:21:33 -0000	1.42
+++ gawk.spec	19 Jul 2006 21:52:37 -0000	1.43
@@ -1,15 +1,17 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
 Source1: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}-ps.tar.gz
-Prereq: /sbin/install-info
-Requires: /bin/mktemp
 Buildroot: %{_tmppath}/%{name}-root
 
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Requires: /bin/mktemp
+
 BuildRequires: flex
 BuildRequires: bison
 
@@ -96,6 +98,9 @@
 %{_datadir}/awk
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> 3.1.5-11
+- spec file cleanup
+
 * Tue Jul 18 2006 Karel Zak <kzak at redhat.com> 3.1.5-10
 - add IPv6 support (patch be Jan Pazdziora)
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:55:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:55:09 -0400
Subject: rpms/lslk/devel lslk.spec,1.18,1.19
Message-ID: <200607192155.k6JLt97A029741@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lslk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29712

Modified Files:
	lslk.spec 
Log Message:
cleanup spec file


Index: lslk.spec
===================================================================
RCS file: /cvs/dist/rpms/lslk/devel/lslk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lslk.spec	12 Jul 2006 07:14:49 -0000	1.18
+++ lslk.spec	19 Jul 2006 21:55:03 -0000	1.19
@@ -1,12 +1,14 @@
 Summary: A lock file lister.
 Name: lslk
 Version: 1.29
-Release: 16.2.2
+Release: 17
 License: Free
 Group: Development/Debuggers
 Source: ftp://vic.cc.purdue.edu/pub/tools/unix/lslk/lslk_%{version}_W.tar.gz
+
 Patch0: lslk_1.29_W-misc.patch
 Patch1: lslk_1.29_W-readlink.patch
+
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
 
@@ -48,6 +50,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> 1.29-17
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:56:53 -0400
Subject: rpms/lsof/devel lsof.spec,1.31,1.32
Message-ID: <200607192156.k6JLurDI030449@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30420

Modified Files:
	lsof.spec 
Log Message:
cleanup spec file


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lsof.spec	12 Jul 2006 07:14:56 -0000	1.31
+++ lsof.spec	19 Jul 2006 21:56:50 -0000	1.32
@@ -1,10 +1,11 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.78
-Release: 06122006devel.1.1
+Release: 1
 License: Free
 %define lsofrh lsof_4.78C-rh
 Group: Development/Debuggers
+
 Source0: %{lsofrh}.tar.bz2
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,6 +42,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 19 Karel Zak <kzak at redhat.com> 4.78-1
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.78-06122006devel.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 21:58:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 17:58:22 -0400
Subject: rpms/lsof/devel lsof.spec,1.32,1.33
Message-ID: <200607192158.k6JLwMhb030976@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30947

Modified Files:
	lsof.spec 
Log Message:
cleanup spec file


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lsof.spec	19 Jul 2006 21:56:50 -0000	1.32
+++ lsof.spec	19 Jul 2006 21:58:20 -0000	1.33
@@ -42,7 +42,7 @@
 %{_mandir}/man*/*
 
 %changelog
-* Wed Jul 19 Karel Zak <kzak at redhat.com> 4.78-1
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> 4.78-1
 - rebuild
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.78-06122006devel.1.1



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:03:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:03:47 -0400
Subject: rpms/procinfo/devel procinfo.spec,1.21,1.22
Message-ID: <200607192203.k6JM3lF7032405@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32375

Modified Files:
	procinfo.spec 
Log Message:
clean spec file


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- procinfo.spec	12 Jul 2006 07:53:06 -0000	1.21
+++ procinfo.spec	19 Jul 2006 22:03:44 -0000	1.22
@@ -1,10 +1,11 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.3.1
+Release: 19
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
+
 Patch0: procinfo-14-misc.patch
 Patch3: procinfo-17-mandir.patch
 Patch5: procinfo-17-uptime.patch
@@ -14,6 +15,7 @@
 Patch9: procinfo-18-maxdev.patch
 Patch10: procinfo-18-ranges.patch
 Patch11: procinfo-18-cpu-steal.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtermcap-devel
 
@@ -61,6 +63,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 18-19
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 18-18.3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:06:51 -0400
Subject: rpms/procps/devel procps.spec,1.50,1.51
Message-ID: <200607192206.k6JM6pgq000744@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/procps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv726

Modified Files:
	procps.spec 
Log Message:
fix spec file


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- procps.spec	12 Jul 2006 07:53:24 -0000	1.50
+++ procps.spec	19 Jul 2006 22:06:49 -0000	1.51
@@ -1,13 +1,16 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
 Source1: FAQ
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /bin/rm /sbin/ldconfig
+
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 Patch1: procps-3.2.7-selinux.patch
 Patch2: procps-3.1.15-misc.patch
@@ -112,6 +115,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 3.2.7-3
+- spec file cleanup
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.7-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:11:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:11:06 -0400
Subject: rpms/psmisc/devel .cvsignore, 1.12, 1.13 psmisc.spec, 1.30,
	1.31 sources, 1.12, 1.13
Message-ID: <200607192211.k6JMB6fU001761@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1737

Modified Files:
	.cvsignore psmisc.spec sources 
Log Message:
clean spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Mar 2006 21:53:59 -0000	1.12
+++ .cvsignore	19 Jul 2006 22:10:54 -0000	1.13
@@ -1 +1 @@
-psmisc-22.1.03072006cvs.tar.gz
+psmisc-22.2.tar.gz


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- psmisc.spec	18 Jul 2006 00:04:31 -0000	1.30
+++ psmisc.spec	19 Jul 2006 22:10:54 -0000	1.31
@@ -1,12 +1,13 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 22.2
-Release: 4
+Release: 5
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
+
 BuildRequires: libtermcap-devel
 BuildRequires: libselinux-devel
 BuildRequires: gettext-devel
@@ -56,6 +57,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com>  - 22.2-5
+- spec file cleanup & rebuild
+
 * Mon Jul 17 2006 Jesse Keating <jkeating at redhat.com> - 22.2-4
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Mar 2006 21:53:59 -0000	1.12
+++ sources	19 Jul 2006 22:10:54 -0000	1.13
@@ -1 +1 @@
-25f607bb96467f2b094201d81b50c8cb  psmisc-22.1.03072006cvs.tar.gz
+77737c817a40ef2c160a7194b5b64337  psmisc-22.2.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:15:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:15:03 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.31, 1.32
Message-ID: <200607192215.k6JMF3Qm002780@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2703

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Merged with upstream version



Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-modeler.spec	18 Jul 2006 00:03:59 -0000	1.31
+++ jakarta-commons-modeler.spec	19 Jul 2006 22:15:00 -0000	1.32
@@ -34,14 +34,11 @@
 
 %define base_name	modeler
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.1
-%define release		6jpp_1fc
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		jakarta-%{short_name}
+Version:	1.1
+Release:	7jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
@@ -162,9 +159,14 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
-* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp_1fc
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-7jpp_1fc
+- Merged with upstream version
+
+* Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-7jpp
+- Removed separate definition of name, version and release
+
+* Mon Jul 17 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-6jpp
 - Added contional native compilation.
-- Merge with upstream version.
 
 * Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1-5jpp
 - First JPP 1.7 build



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:17:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:17:05 -0400
Subject: rpms/vlock/devel vlock.spec,1.20,1.21
Message-ID: <200607192217.k6JMH5gB012768@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11578

Modified Files:
	vlock.spec 
Log Message:
cleanup spec file


Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vlock.spec	12 Jul 2006 08:44:23 -0000	1.20
+++ vlock.spec	19 Jul 2006 22:17:03 -0000	1.21
@@ -1,10 +1,11 @@
 Summary: A program which locks one or more virtual consoles.
 Name: vlock
 Version: 1.3
-Release: 22.2.2
+Release: 23
 License: GPL
 Group: Applications/System
 Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
+
 Requires: pam >= 0.59, /etc/pam.d/system-auth
 Buildrequires: pam-devel
 BuildRoot: %{_tmppath}/vlock
@@ -54,6 +55,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 1.3-23
+- spec file cleanup & rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:19:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:19:29 -0400
Subject: rpms/axis/devel axis.spec,1.18,1.19
Message-ID: <200607192219.k6JMJTW7019162@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19101

Modified Files:
	axis.spec 
Log Message:

Added conditional native compilation.




Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- axis.spec	12 Jul 2006 05:25:37 -0000	1.18
+++ axis.spec	19 Jul 2006 22:19:27 -0000	1.19
@@ -1,12 +1,14 @@
-%define name       axis
-%define version    1.2.1
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define archivever 1_2_1
-%define release    2jpp_3fc
 %define section    free
 
-Name:          %{name}
-Version:       %{version}
-Release:       %{release}
+Name:          axis
+Version:       1.2.1
+Release:       2jpp_4fc
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
@@ -49,9 +51,17 @@
 Requires:      log4j
 Requires:      wsdl4j
 
+%if ! %{gcj_support}
 BuildArch:     noarch
+%endif
 BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
 submission to W3C.
@@ -148,6 +158,10 @@
    ln -fs %{_javadocdir}/%{name} apiDocs
 popd
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -160,12 +174,32 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE README release-notes.html changelog.html
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %dir %{_javadocdir}/%{name}-%{version}
@@ -176,6 +210,9 @@
 %doc docs/*
 
 %changelog
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.1-2jpp_4fc
+- Added conditional native compilation.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-2jpp_3fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:22:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:22:18 -0400
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.15,1.16
Message-ID: <200607192222.k6JMMIPY020255@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20226

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
- Add 'dist' tag to package release string.



Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-resutils.spec	12 Jul 2006 09:18:44 -0000	1.15
+++ xorg-x11-resutils.spec	19 Jul 2006 22:22:16 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 1.1
+Release: 2%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -79,18 +79,20 @@
 %{_bindir}/listres
 %{_bindir}/viewres
 %dir %{_datadir}/X11
-%dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Editres
 %{_datadir}/X11/app-defaults/Editres-color
 %{_datadir}/X11/app-defaults/Viewres
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/appres.1x*
 %{_mandir}/man1/editres.1x*
 %{_mandir}/man1/listres.1x*
 %{_mandir}/man1/viewres.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+- Add 'dist' tag to package release string.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-1.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:23:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:23:28 -0400
Subject: rpms/psmisc/devel psmisc.spec,1.31,1.32
Message-ID: <200607192223.k6JMNSRh020754@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20722

Modified Files:
	psmisc.spec 
Log Message:
fix build dependences


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- psmisc.spec	19 Jul 2006 22:10:54 -0000	1.31
+++ psmisc.spec	19 Jul 2006 22:23:26 -0000	1.32
@@ -8,9 +8,9 @@
 URL: http://psmisc.sourceforge.net
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: libtermcap-devel
 BuildRequires: libselinux-devel
 BuildRequires: gettext-devel
+BuildRequires: ncurses-devel
 
 Patch0: psmisc-22.1-fuser-listsigs.patch
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:26:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:26:19 -0400
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.23,
	1.24
Message-ID: <200607192226.k6JMQJ28021902@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21874

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-3.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
- Add 'dist' tag to package release string.



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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-server-utils.spec	12 Jul 2006 09:19:27 -0000	1.23
+++ xorg-x11-server-utils.spec	19 Jul 2006 22:26:17 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 2.1
+Release: 3%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -175,9 +175,7 @@
 %{_bindir}/xvidtune
 %dir %{_datadir}/X11
 %{_datadir}/X11/rgb.txt
-%dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Xvidtune
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/iceauth.1x*
 %{_mandir}/man1/sessreg.1x*
 %{_mandir}/man1/showrgb.1x*
@@ -204,10 +202,13 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-3.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+- Add 'dist' tag to package release string.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-2.1
 - rebuild
 
-* Thu Jun 22 2006 Mike A. Harris <mharris at redhat.com> 7.1-2
 - Update to rgb-1.0.2 from X11R7.1
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:31:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:31:37 -0400
Subject: rpms/systemtap/devel Makefile,1.1,1.2
Message-ID: <200607192231.k6JMVbrD023724@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23694

Modified Files:
	Makefile 
Log Message:
New import hacks, moved from ../FC-4/Makefile and updated for new world.



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	22 Jul 2005 21:23:29 -0000	1.1
+++ Makefile	19 Jul 2006 22:31:35 -0000	1.2
@@ -4,3 +4,75 @@
 SPECFILE = $(firstword $(wildcard *.spec))
 
 include ../common/Makefile.common
+
+tarball = systemtap-$(VERSION).tar.gz
+
+ifeq ($(clobber),t)
+commit-check = :
+else
+commit-check = cvs -Q diff --brief > /dev/null 2>&1
+endif
+
+elfutils-version := $(shell awk '$$2 == "elfutils_version" { print $$3 }' \
+				systemtap.spec)
+eu-dir = ../../elfutils/devel
+$(eu-dir)/elfutils.spec: FORCE
+	cd $(@D) && cvs -Q update && $(commit-check)
+$(eu-dir)/%.tar.gz: $(eu-dir)/elfutils.spec
+	$(MAKE) -C $(@D) sources
+$(eu-dir)/%.patch: $(eu-dir)/elfutils.spec ;
+
+import-systemtap: $(tarball)
+	$(commit-check) systemtap.spec
+	tar -zf $(tarball) -xO '*.spec' > systemtap.spec
+	$(MAKE) upload-systemtap
+	touch $@
+
+upload-systemtap: $(tarball) \
+		  $(addprefix $(eu-dir)/,\
+					 elfutils-$(elfutils-version).tar.gz \
+					 elfutils-portability.patch)
+	ln -f $(filter $(eu-dir)/%.tar.gz,$^) .
+	ln -f $(filter $(eu-dir)/%.patch,$^) .
+	$(MAKE) new-source FILES='$(filter-out %.patch,$^)'
+
+copy-sources-%: import-systemtap
+	cd ../$* && $(commit-check)
+	cp -f sources elfutils-portability.patch ../$*
+	ln -f elfutils-*.tar.gz $(tarball) ../$*
+
+propagate-%: copy-sources-%
+	cp -f systemtap.spec ../$*
+	touch $@
+
+# No automagic macros in beehive, only brew.
+propagate-RHEL-4: copy-sources-RHEL-4 ../RHEL-4/systemtap.spec
+	touch $@
+propagate-FC-4: copy-sources-FC-4 ../FC-4/systemtap.spec
+	touch $@
+
+../RHEL-4/systemtap.spec: systemtap.spec import-systemtap
+	@rm -f $@.new
+	(echo '%define dist .el4'; \
+	 echo '%define rhel 4'; \
+	 cat systemtap.spec) > $@.new
+	mv -f $@.new $@
+../FC-4/systemtap.spec: systemtap.spec import-systemtap
+	@rm -f $@.new
+	(echo '%define dist .fc4'; \
+	 echo '%define fedora 4'; \
+	 cat systemtap.spec) > $@.new
+	mv -f $@.new $@
+
+.PRECIOUS: propagate-% tag-%
+
+commit-%: propagate-%
+	cd ../$* && cvs commit -m'Automatic update to $(VERSION)'
+	touch $@
+
+tag-%: commit-%
+	cd ../$* && $(MAKE) tag
+	touch $@
+
+build-%: tag-%
+	cd ../$* && $(MAKE) build



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:32:16 -0400
Subject: rpms/systemtap/devel .cvsignore, 1.4, 1.5 elfutils-portability.patch,
	1.9, 1.10 sources, 1.17, 1.18 systemtap.spec, 1.25, 1.26
Message-ID: <200607192232.k6JMWG19023885@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23814

Modified Files:
	.cvsignore elfutils-portability.patch sources systemtap.spec 
Log Message:
Version 0.5.9


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Aug 2005 10:23:41 -0000	1.4
+++ .cvsignore	19 Jul 2006 22:32:14 -0000	1.5
@@ -1,2 +1,2 @@
-elfutils-0.111.tar.gz
-systemtap-0.2.2.tar.gz
+systemtap-0.5.9.tar.gz
+elfutils-0.122.tar.gz

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/elfutils-portability.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- elfutils-portability.patch	17 Jun 2006 01:56:13 -0000	1.9
+++ elfutils-portability.patch	19 Jul 2006 22:32:14 -0000	1.10
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -56,6 +56,11 @@
+@@ -67,6 +67,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -78,6 +83,9 @@
+@@ -89,6 +94,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
+@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
+@@ -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,$^) \
@@ -90,7 +90,10 @@
  libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -7,6 +7,10 @@
+ 	* configure.ac: Add dummy automake conditional to get dependencies
+ 	for non-generic linker right.  See src/Makefile.am.
+ 
 +2005-11-22  Roland McGrath  <roland at redhat.com>
 +
 +	* configure.ac: Check for --as-needed linker option.
@@ -98,7 +101,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -45,6 +49,17 @@
+@@ -54,6 +58,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -126,7 +129,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -121,6 +122,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -136,12 +139,12 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.122'
  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 NEVER_TRUE NEVER_FALSE MUDFLAP_TRUE MUDFLAP_FALSE GP!
 ROF_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 WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu NEVER_TRUE NEVER_FALSE MUDFLAP_T!
 RUE 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.
@@ -238,7 +241,7 @@
  LOCALEDIR=$datadir
  
  cat >>confdefs.h <<_ACEOF
-@@ -4987,6 +5073,8 @@ s, at YACC@,$YACC,;t t
+@@ -5004,6 +5090,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
@@ -325,7 +328,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +336,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
+@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -386,7 +389,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +397,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,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 \
@@ -439,7 +442,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +450,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -175,7 +177,7 @@ sbindir = @sbindir@
+@@ -177,7 +179,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +461,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -290,6 +290,11 @@
+@@ -305,6 +305,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -499,7 +502,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +510,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
+@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -286,6 +286,11 @@
+@@ -337,6 +337,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +556,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +564,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +572,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
+@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +586,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -413,6 +413,11 @@
+@@ -437,6 +437,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +617,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +625,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -168,6 +169,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +633,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
+@@ -210,9 +212,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -136,6 +136,11 @@
+@@ -165,6 +165,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.
  
@@ -717,7 +720,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +728,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -256,10 +258,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 \
@@ -748,7 +751,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -766,7 +769,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -143,6 +144,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -776,7 +779,10 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -53,6 +53,10 @@
+ 	* Makefile.am: Add hacks to create dependency files for non-generic
+ 	linker.
+ 
 +2006-04-05  Roland McGrath  <roland at redhat.com>
 +
 +	* strings.c (MAP_POPULATE): Define to 0 if undefined.
@@ -784,7 +790,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -346,6 +350,11 @@
+@@ -401,6 +405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -832,7 +838,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -840,7 +846,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -239,6 +240,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -848,7 +854,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -269,12 +271,12 @@ target_alias = @target_alias@
+@@ -283,12 +285,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 \
@@ -970,7 +976,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -978,7 +984,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -363,10 +365,10 @@ sbindir = @sbindir@
+@@ -365,10 +367,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Jun 2006 01:56:13 -0000	1.17
+++ sources	19 Jul 2006 22:32:14 -0000	1.18
@@ -1,2 +1,2 @@
-9f06c069faf89454b65a0faf9b544975  systemtap-0.5.8.tar.gz
-5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz
+35ed51e45bbd9db9a0aa132a442382d7  systemtap-0.5.9.tar.gz
+d83e9022eb342eede549dd6d6a537b59  elfutils-0.122.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- systemtap.spec	12 Jul 2006 08:24:56 -0000	1.25
+++ systemtap.spec	19 Jul 2006 22:32:14 -0000	1.26
@@ -1,10 +1,32 @@
-# Yo!  DO NOT THE FOLLOWING LINE.
+# Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
+%define release 1
+# Version number of oldest elfutils release that works with systemtap.
+%define elfutils_version 0.122
+
+# Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer.
+%if 0%{?fedora}
+%define bundled_elfutils 1
+%if "%fedora" >= "6"
 %define bundled_elfutils 0
-%define elfutils_version 0.121
+%endif
+%endif
+
+%if 0%{?rhel}
+%define bundled_elfutils 1
+%if "%rhel" >= "5"
+%define bundled_elfutils 0
+%endif
+%endif
+
+%if 0%{!?bundled_elfutils:1}
+# Yo!  DO NOT TOUCH THE FOLLOWING LINE.
+# You can use rpmbuild --define "bundled_elfutils 0" for a build of your own.
+%define bundled_elfutils 1
+%endif
 
 Name: systemtap
-Version: 0.5.8
-Release: 2.1
+Version: 0.5.9
+Release: %{release}%{?dist}
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -104,11 +126,8 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.8-2.1
-- rebuild
-
-* Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-2
-- Rebuilt for devel
+* Wed Jul 19 2006 Roland McGrath <roland at redhat.com> - 0.5.9-1
+- PRs 2669, 2913
 
 * Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-1
 - PRs 2627, 2520, 2228, 2645



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:33:01 -0400
Subject: rpms/systemtap/FC-4 Makefile,1.7,1.8
Message-ID: <200607192233.k6JMX1Yo024070@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24048

Modified Files:
	Makefile 
Log Message:
Makefile import magic moved to ../devel/Makefile.



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	5 May 2006 22:12:26 -0000	1.7
+++ Makefile	19 Jul 2006 22:32:59 -0000	1.8
@@ -4,68 +4,3 @@
 SPECFILE = $(firstword $(wildcard *.spec))
 
 include ../common/Makefile.common
-
-tarball = systemtap-$(VERSION).tar.gz
-
-ifeq ($(clobber),t)
-commit-check = :
-else
-commit-check = cvs -Q diff --brief > /dev/null 2>&1
-endif
-
-elfutils-version := $(shell awk '$$2 == "elfutils_version" { print $$3 }' \
-				systemtap.spec)
-eu-dir = ../../elfutils/devel
-$(eu-dir)/elfutils.spec: FORCE
-	cd $(@D) && cvs -Q update && $(commit-check)
-$(eu-dir)/%.tar.gz: $(eu-dir)/elfutils.spec
-	$(MAKE) -C $(@D) sources
-$(eu-dir)/%.patch: $(eu-dir)/elfutils.spec ;
-
-import-systemtap: $(tarball)
-	$(commit-check) systemtap.spec
-	tar -zf $(tarball) -xO '*.spec' > systemtap.spec
-	$(MAKE) upload-systemtap
-	touch $@
-
-upload-systemtap: $(tarball) \
-		  $(addprefix $(eu-dir)/,\
-					 elfutils-$(elfutils-version).tar.gz \
-					 elfutils-portability.patch)
-	ln -f $(filter $(eu-dir)/%.tar.gz,$^) .
-	ln -f $(filter $(eu-dir)/%.patch,$^) .
-	$(MAKE) new-source FILES='$(filter-out %.patch,$^)'
-
-bundled-devel := 0
-release-devel := 2
-release-RHEL-4 := 0.EL4
-release-FC-5 := 0.FC5
-
-propagate-%: import-systemtap
-	cd ../$* && $(commit-check)
-	cp -f sources elfutils-portability.patch ../$*
-	ln -f elfutils-*.tar.gz $(tarball) ../$*
-	USER=`whoami`; \
-	NAME=`getent passwd $$USER | awk -F: '{ printf $$5 }'`; \
-	(date +"* %a %b %e %Y $${NAME} <$${USER}@redhat.com>\
-	     - ${VERSION}-$(release-$*)"; \
-	 echo '- Rebuilt for $*'; echo) > tmp.$$$$; \
-	sed 's/%define bundled_elfutils .*$$/%define\
-		       bundled_elfutils $(firstword $(bundled-$*) 1)/;\
-	     /^Release:/s/: 1/: $(release-$*)/;\
-	     /%changelog/'"r tmp.$$$$" \
-	    systemtap.spec > ../$*/systemtap.spec; \
-	rm -f tmp.$$$$
-	touch $@
-.PRECIOUS: propagate-% tag-%
-
-commit-%: propagate-%
-	cd ../$* && cvs commit -m'Automatic update to $(VERSION)'
-	touch $@
-
-tag-%: commit-%
-	cd ../$* && $(MAKE) tag
-	touch $@
-
-build-%: tag-%
-	cd ../$* && $(MAKE) build



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:33:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:33:10 -0400
Subject: rpms/words/devel words.spec,1.9,1.10
Message-ID: <200607192233.k6JMXA0Z024139@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/words/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24113

Modified Files:
	words.spec 
Log Message:
fix spec file


Index: words.spec
===================================================================
RCS file: /cvs/dist/rpms/words/devel/words.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- words.spec	12 Jul 2006 08:49:25 -0000	1.9
+++ words.spec	19 Jul 2006 22:33:07 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A dictionary of English words for the /usr/share/dict directory.
 Name: words
 Version: 3.0
-Release: 8.1.1
+Release: 9
 License: public domain
 Group: System Environment/Libraries
 Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z
@@ -60,6 +60,9 @@
 /usr/share/dict/words
 
 %changelog
+* Wed Jul 19 2006 Karel Zak <kzak at redhat.com> - 3.0-9
+- rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.0-8.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:45:42 -0400
Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.15,1.16
Message-ID: <200607192245.k6JMjgR2028760@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28341

Modified Files:
	xorg-x11-utils.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
- Add 'dist' tag to package release string.



Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-utils.spec	12 Jul 2006 09:20:32 -0000	1.15
+++ xorg-x11-utils.spec	19 Jul 2006 22:45:40 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.1
-Release: 1.1
+Release: 2%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -107,10 +107,8 @@
 %{_bindir}/xvinfo
 %{_bindir}/xwininfo
 %dir %{_datadir}/X11
-%dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/XFontSel
 %{_datadir}/X11/app-defaults/Xfd
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/xdpyinfo.1x*
 %{_mandir}/man1/xdriinfo.1x*
 %{_mandir}/man1/xev.1x*
@@ -124,7 +122,11 @@
 %{_mandir}/man1/xwininfo.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+- Add 'dist' tag to package release string.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-1.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 7.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:48:01 -0400
Subject: rpms/readahead/devel default.early.in, NONE, 1.1 default.later.in,
	NONE, 1.1 readahead-check, NONE, 1.1 readahead_early, NONE,
	1.1 readahead_later, NONE, 1.1 readahead.c, 1.2,
	1.3 readahead.spec, 1.28, 1.29 readahead-gen, 1.2,
	NONE readahead.early.files.in, 1.6, NONE readahead.files.in,
	1.6, NONE readahead.init, 1.6, NONE readahead_early.init, 1.5, NONE
Message-ID: <200607192248.k6JMm1uG010972@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10916

Modified Files:
	readahead.c readahead.spec 
Added Files:
	default.early.in default.later.in readahead-check 
	readahead_early readahead_later 
Removed Files:
	readahead-gen readahead.early.files.in readahead.files.in 
	readahead.init readahead_early.init 
Log Message:
new version


--- NEW FILE default.early.in ---
/bin/awk
/bin/basename
/bin/bash
/bin/cat
/bin/cut
/bin/date
/bin/dbus-daemon
/bin/dd
/bin/dmesg
/bin/egrep
/bin/fgrep
/bin/grep
/bin/gzip
/bin/hostname
/bin/chgrp
/bin/chmod
/bin/chown
/bin/ipcalc
/bin/loadkeys
/bin/login
/bin/ls
/bin/mkdir
/bin/mktemp
/bin/mount
/bin/nice
/bin/rm
/bin/sed
/bin/sh
/bin/sleep
/bin/sort
/bin/touch
/bin/true
/bin/umount
/bin/uname
/etc/acpi/events/sample.conf
/etc/alchemist/namespace/printconf/local.adl
/etc/alchemist/namespace/printconf/rpm.adl
/etc/alchemist/switchboard/printconf.swb.adl
/etc/aliases
/etc/aliases.db
/etc/alsa/alsa.conf
/etc/anacrontab
/etc/asound.state
/etc/auto.master
/etc/bashrc
/etc/blkid/blkid.tab
/etc/bluetooth/hcid.conf
/etc/bluetooth/pin
/etc/bluetooth/rfcomm.conf
/etc/cpuspeed.conf
/etc/crontab
/etc/cups/certs/0
/etc/cups/classes.conf
/etc/cups/cupsd.conf
/etc/cups/mime.convs
/etc/cups/mime.types
/etc/cups/ppds.dat
/etc/cups/printers.conf
/etc/cups/pstoraster.convs
/etc/dbus-1/system.conf
/etc/dbus-1/system.d/cups.conf
/etc/dbus-1/system.d/cups-config-daemon-dbus.conf
/etc/dbus-1/system.d/hal.conf
/etc/dbus-1/system.d/NetworkManager.conf
/etc/dbus-1/system.d/NetworkManagerInfo.conf
/etc/dbus-1/system.d/printdriverselector.conf
/etc/dev.d/default/05-pam_console.dev
/etc/dev.d/fd0/10-MAKEDEV.dev
/etc/dev.d/sound/alsa.dev
/etc/DIR_COLORS
/etc/fonts/fonts.conf
/etc/fonts/local.conf
/etc/fstab
/etc/group
/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gdk-pixbuf.loaders
/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gtk.immodules
/etc/gtk-2.0/gtkrc
/etc/hesiod.conf
/etc/host.conf
/etc/hosts
/etc/hotplug/blacklist
/etc/hotplug.d/default/default.hotplug
/etc/hotplug.d/default/10-udev.hotplug
/etc/hotplug.d/default/20-hal.hotplug
/etc/hotplug/input.agent
/etc/hotplug/net.agent
/etc/hotplug/usb.agent
/etc/hotplug/usb.usermap
/etc/howl/mDNSResponder.conf
/etc/idmapd.conf
/etc/init.d/functions
/etc/inittab
/etc/inputrc
/etc/iproute2/rt_scopes
/etc/issue
/etc/krb5.conf
/etc/ld.so.cache
/etc/localtime
/etc/lvm/lvm.conf
/etc/mail/local-host-names
/etc/mail/Makefile
/etc/mail/sendmail.cf
/etc/mail/submit.cf
/etc/mail/trusted-users
/etc/makedev.d/alsa
/etc/makedev.d/cciss
/etc/makedev.d/cdrom
/etc/makedev.d/console
/etc/makedev.d/dac960
/etc/makedev.d/ftape
/etc/makedev.d/generic
/etc/makedev.d/ia64
/etc/makedev.d/ibcs
/etc/makedev.d/ida
/etc/makedev.d/ide
/etc/makedev.d/ipfilter
/etc/makedev.d/isdn
/etc/makedev.d/linux1394
/etc/makedev.d/linux-2.6.x
/etc/makedev.d/mouse
/etc/makedev.d/qic
/etc/makedev.d/raid
/etc/makedev.d/redhat
/etc/makedev.d/sound
/etc/makedev.d/std
/etc/makedev.d/s390
/etc/makedev.d/undocumented
/etc/makedev.d/usb
/etc/makedev.d/v4l
/etc/makedev.d/00macros
/etc/modprobe.conf
/etc/modprobe.conf.dist
/etc/modprobe.d/modprobe.conf.dist
/etc/motd
/etc/mtab
/etc/nsswitch.conf
/etc/openldap/ldap.conf
/etc/pam.d/gdm
/etc/pam.d/login
/etc/pam.d/other
/etc/pam.d/system-auth
/etc/pango/%{_arch}-redhat-linux-gnu/pango.modules
/etc/passwd
/etc/pcmcia/config
/etc/printcap
/etc/profile
/etc/profile.d/colorls.sh
/etc/profile.d/glib2.sh
/etc/profile.d/gnome-ssh-askpass.sh
/etc/profile.d/krb5.sh
/etc/profile.d/lang.sh
/etc/profile.d/less.sh
/etc/profile.d/which-2.sh
/etc/protocols
/etc/rc.d/init.d/bluetooth
/etc/rc.d/init.d/crond
/etc/rc.d/init.d/cups
/etc/rc.d/init.d/cups-config-daemon
/etc/rc.d/init.d/functions
/etc/rc.d/init.d/haldaemon
/etc/rc.d/init.d/mDNSResponder
/etc/rc.d/init.d/messagebus
/etc/rc.d/init.d/nfslock
/etc/rc.d/init.d/rpcidmapd
/etc/rc.d/rc
/etc/rc.d/rc.sysinit
/etc/rc.d/rc5.d/S14nfslock
/etc/rc.d/rc5.d/S18rpcidmapd
/etc/rc.d/rc5.d/S25bluetooth
/etc/rc.d/rc5.d/S34mDNSResponder
/etc/rc.d/rc5.d/S55cups
/etc/rc.d/rc5.d/S90crond
/etc/rc.d/rc5.d/S97messagebus
/etc/rc.d/rc5.d/S98cups-config-daemon
/etc/rc.d/rc5.d/S98haldaemon
/etc/rc5.d/K05saslauthd
/etc/rc5.d/K10psacct
/etc/rc5.d/K20nfs
/etc/rc5.d/K24irda
/etc/rc5.d/K30spamassassin
/etc/rc5.d/K35vncserver
/etc/rc5.d/K35winbind
/etc/rc5.d/K50netdump
/etc/rc5.d/K69rpcsvcgssd
/etc/rc5.d/K73ypbind
/etc/rc5.d/K74nscd
/etc/rc5.d/K74ntpd
/etc/rc5.d/K85mdmpd
/etc/rc5.d/K87auditd
/etc/rc5.d/K89named
/etc/rc5.d/K89netplugd
/etc/rc5.d/K89rdisc
/etc/rc5.d/K94diskdump
/etc/rc5.d/S05kudzu
/etc/rc5.d/S06cpuspeed
/etc/rc5.d/S08iptables
/etc/rc5.d/S09isdn
/etc/rc5.d/S09pcmcia
/etc/rc5.d/S10network
/etc/rc5.d/S12syslog
/etc/rc5.d/S13portmap
/etc/rc5.d/S14nfslock
/etc/rc5.d/S15mdmonitor
/etc/rc5.d/S18rpcidmapd
/etc/rc5.d/S19rpcgssd
/etc/rc5.d/S25bluetooth
/etc/rc5.d/S25netfs
/etc/rc5.d/S28autofs
/etc/rc5.d/S33nifd
/etc/rc5.d/S34mDNSResponder
/etc/rc5.d/S44acpid
/etc/rc5.d/S55cups
/etc/rc5.d/S55sshd
/etc/rc5.d/S80sendmail
/etc/rc5.d/S85gpm
/etc/rc5.d/S90crond
/etc/rc5.d/S90xfs
/etc/rc5.d/S95anacron
/etc/rc5.d/S95atd
/etc/rc5.d/S95firstboot
/etc/rc5.d/S97messagebus
/etc/rc5.d/S97rhnsd
/etc/rc5.d/S98cups-config-daemon
/etc/rc5.d/S98haldaemon
/etc/rc5.d/S99local
/etc/redhat-release
/etc/resolv.conf
/etc/rhgb/temp/display
/etc/rhgb/temp/rhgb-console
/etc/rhgb/temp/XFree86.0.log
/etc/rpc
/etc/securetty
/etc/security/console.perms
/etc/security/console.perms.d/50-default.perms
/etc/security/limits.conf
/etc/security/pam_env.conf
/etc/selinux/config
/etc/selinux/targeted/contexts/customizable_types
/etc/selinux/targeted/contexts/dbus_contexts
/etc/selinux/targeted/contexts/default_contexts
/etc/selinux/targeted/contexts/files/file_contexts
/etc/selinux/targeted/contexts/files/file_contexts.homedirs
/etc/selinux/targeted/contexts/files/media
/etc/selinux/targeted/contexts/removable_context
/etc/selinux/targeted/contexts/users/root
/etc/services
/etc/shadow
/etc/ssh/sshd_config
/etc/ssh/ssh_host_dsa_key
/etc/ssh/ssh_host_key
/etc/ssh/ssh_host_rsa_key
/etc/sysconfig/autofs
/etc/sysconfig/bluetooth
/etc/sysconfig/crond
/etc/sysconfig/desktop
/etc/sysconfig/firstboot
/etc/sysconfig/hwconf
/etc/sysconfig/init
/etc/sysconfig/iptables
/etc/sysconfig/iptables-config
/etc/sysconfig/i18n
/etc/sysconfig/keyboard
/etc/sysconfig/kudzu
/etc/sysconfig/mouse
/etc/sysconfig/network
/etc/sysconfig/network-scripts/ifcfg-eth0
/etc/sysconfig/network-scripts/ifcfg-lo
/etc/sysconfig/network-scripts/ifup-aliases
/etc/sysconfig/network-scripts/ifup-eth
/etc/sysconfig/network-scripts/ifup-post
/etc/sysconfig/network-scripts/ifup-routes
/etc/sysconfig/network-scripts/network-functions
/etc/sysconfig/pcmcia
/etc/sysconfig/sendmail
/etc/sysconfig/syslog
/etc/sysctl.conf
/etc/syslog.conf
/etc/termcap
/etc/udev/rules.d/10-wacom.rules
/etc/udev/rules.d/50-udev.rules
/etc/udev/udev.conf
/etc/X11/fs/config
/etc/X11/gdm/gdm.conf
/etc/X11/gdm/Init/:0
/etc/X11/prefdm
/etc/X11/xdm/Xsetup_0
/etc/X11/xorg.conf
/etc/X11/Xresources
/%{_lib}/iptables/libipt_icmp.so
/%{_lib}/iptables/libipt_REJECT.so
/%{_lib}/iptables/libipt_standard.so
/%{_lib}/iptables/libipt_state.so
/%{_lib}/iptables/libipt_tcp.so
/%{_lib}/iptables/libipt_udp.so
/lib/kbd/keymaps/amiga/amiga-de.map.gz
/lib/kbd/keymaps/amiga/amiga-us.map.gz
/lib/kbd/keymaps/atari/atari-de.map.gz
/lib/kbd/keymaps/atari/atari-se.map.gz
/lib/kbd/keymaps/atari/atari-uk-falcon.map.gz
/lib/kbd/keymaps/atari/atari-us.map.gz
/lib/kbd/keymaps/i386/qwerty/../include/compose.inc
/lib/kbd/keymaps/i386/qwerty/../../include/compose.latin1
/lib/kbd/keymaps/i386/qwerty/../include/euro1.map.gz
/lib/kbd/keymaps/i386/qwerty/../include/linux-keys-bare.inc
/lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc
/lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc
/lib/kbd/keymaps/i386/qwerty/us.map.gz
/%{_lib}/ld-linux-x86-64.so.2
/%{_lib}/libacl.so.1
/%{_lib}/libasound.so.2
/%{_lib}/libattr.so.1
/%{_lib}/libaudit.so.0
/%{_lib}/libblkid.so.1
/%{_lib}/libcom_err.so.2
/%{_lib}/libcrypto.so.6
/%{_lib}/libcrypt.so.1
/%{_lib}/libc.so.6
/%{_lib}/libdbus-1.so.2
/%{_lib}/libdb-4.3.so
/%{_lib}/libdl.so.2
/%{_lib}/libexpat.so.0
/%{_lib}/libiw.so.28
/%{_lib}/libm.so.6
/%{_lib}/libnsl.so.1
/%{_lib}/libnss_dns.so.2
/%{_lib}/libnss_files.so.2
/%{_lib}/libnss_hesiod.so.2
/%{_lib}/libpam_misc.so.0
/%{_lib}/libpam.so.0
/%{_lib}/libpcre.so.0
/%{_lib}/libproc-3.2.6.so
/%{_lib}/libpthread.so.0
/%{_lib}/libresolv.so.2
/%{_lib}/librt.so.1
/%{_lib}/libselinux.so.1
/%{_lib}/libssl.so.6
/%{_lib}/libtermcap.so.2
/%{_lib}/libutil.so.1
/%{_lib}/libuuid.so.1
/lib/security/../../%{_lib}/security/pam_cracklib.so
/lib/security/../../%{_lib}/security/pam_deny.so
/lib/security/../../%{_lib}/security/pam_env.so
/lib/security/../../%{_lib}/security/pam_krb5.so
/lib/security/../../%{_lib}/security/pam_limits.so
/lib/security/../../%{_lib}/security/pam_permit.so
/lib/security/../../%{_lib}/security/pam_succeed_if.so
/lib/security/../../%{_lib}/security/pam_unix.so
/%{_lib}/security/pam_console.so
/%{_lib}/security/pam_deny.so
/%{_lib}/security/pam_env.so
/%{_lib}/security/pam_nologin.so
/%{_lib}/security/pam_securetty.so
/%{_lib}/security/pam_selinux.so
/%{_lib}/security/pam_stack.so
/lib/udev/check-cdrom.sh
/lib/udev/ide-media.sh
/lib/udev/MAKEDEV.dev
/lib/udev/pam_console.dev
/sbin/alsactl
/sbin/arping
/sbin/auditctl
/sbin/cardmgr
/sbin/consoletype
/sbin/dhclient
/sbin/ethtool
/sbin/findfs
/sbin/fixfiles
/sbin/fsck
/sbin/fsck.ext3
/sbin/getkey
/sbin/hwclock
/sbin/change_console
/sbin/ifconfig
/sbin/ifenslave
/sbin/insmod
/sbin/ip
/sbin/iptables
/sbin/iptables-restore
/sbin/iwconfig
/sbin/klogd
/sbin/kmodule
/sbin/lsmod
/sbin/lvm.static
/sbin/MAKEDEV
/sbin/mingetty
/sbin/modprobe
/sbin/nash
/sbin/pam_console_apply
/sbin/pidof
/sbin/portmap
/sbin/poweroff
/sbin/quotaon
/sbin/reboot
/sbin/restorecon
/sbin/rpc.statd
/sbin/runlevel
/sbin/runuser
/sbin/start_udev
/sbin/swapon
/sbin/sysctl
/sbin/syslogd
/sbin/udev
/sbin/udevd
/sbin/udevstart
/sbin/vconfig
/usr/bin/cpp
/usr/bin/cups-config-daemon
/usr/bin/dircolors
/usr/bin/fc-cache
/usr/bin/find
/usr/bin/gnome-session
/usr/bin/id
/usr/bin/lesspipe.sh
/usr/bin/logger
/usr/bin/make
/usr/bin/mDNSResponder
/usr/bin/newaliases
/usr/bin/nifd
/usr/bin/rfcomm
/usr/bin/rhgb
/usr/bin/rhgb-client
/usr/bin/setxkbmap
/usr/bin/tee
/usr/bin/udevinfo
/usr/bin/uniq
/usr/bin/X
/usr/bin/X
/usr/bin/xfs
/usr/bin/xrdb
/usr/%{_lib}/autofs/lookup_ldap.so
/usr/%{_lib}/autofs/mount_bind.so
/usr/%{_lib}/autofs/mount_nfs.so
/usr/%{_lib}/autofs/parse_sun.so
/usr/%{_lib}/cups/backend/hal
/usr/%{_lib}/cups/backend/http
/usr/%{_lib}/cups/backend/ipp
/usr/%{_lib}/cups/backend/lpd
/usr/%{_lib}/cups/backend/ncp
/usr/%{_lib}/cups/backend/parallel
/usr/%{_lib}/cups/backend/scsi
/usr/%{_lib}/cups/backend/serial
/usr/%{_lib}/cups/backend/smb
/usr/%{_lib}/cups/backend/socket
/usr/%{_lib}/cups/backend/usb
/usr/%{_lib}/cups/filter/hpgltops
/usr/%{_lib}/cups/filter/imagetops
/usr/%{_lib}/cups/filter/imagetoraster
/usr/%{_lib}/cups/filter/pdftops
/usr/%{_lib}/cups/filter/pstops
/usr/%{_lib}/cups/filter/pstoraster
/usr/%{_lib}/cups/filter/texttops
/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/cc1
/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/collect2
/usr/libexec/gdmgreeter
/usr/libexec/gdmchooser
/usr/libexec/gdmlogin
/usr/libexec/hald-addon-acpi
/usr/libexec/hald-addon-storage
/usr/libexec/hald-add-selinux-mount-option
/usr/libexec/hald-probe-input
/usr/libexec/hald-probe-pc-floppy
/usr/libexec/hald-probe-smbios
/usr/libexec/hald-probe-storage
/usr/libexec/hald-probe-volume
/usr/%{_lib}/gconv/gconv-modules.cache
/usr/%{_lib}/gconv/ISO8859-1.so
/usr/%{_lib}/gtk-2.0/2.4.0/engines/libclearlooks.so
/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-png.so
/usr/%{_lib}/libalchemist.so.0
/usr/%{_lib}/libart_lgpl_2.so.2
/usr/%{_lib}/libatk-1.0.so.0
/usr/%{_lib}/libbluetooth.so.1
/usr/%{_lib}/libbonobo-activation.so.4
/usr/%{_lib}/libbonobo-2.so.0
/usr/%{_lib}/libbz2.so.1
/usr/%{_lib}/libcrack.so.2
/usr/%{_lib}/libcroco-0.6.so.3
/usr/%{_lib}/libcups.so.2
/usr/%{_lib}/libdbus-glib-1.so.2
/usr/%{_lib}/libdes425.so.3
/usr/%{_lib}/libfontconfig.so.1
/usr/%{_lib}/libfreetype.so.6
/usr/%{_lib}/libgconf-2.so.4
/usr/%{_lib}/libgdk_pixbuf-2.0.so.0
/usr/%{_lib}/libgdk-x11-2.0.so.0
/usr/%{_lib}/libglib-2.0.so.0
/usr/%{_lib}/libgmodule-2.0.so.0
/usr/%{_lib}/libgnomecanvas-2.so.0
/usr/%{_lib}/libgnomevfs-2.so.0
/usr/%{_lib}/libgobject-2.0.so.0
/usr/%{_lib}/libgsf-1.so.113
/usr/%{_lib}/libgssapi_krb5.so.2
/usr/%{_lib}/libgthread-2.0.so.0
/usr/%{_lib}/libgtk-x11-2.0.so.0
/usr/%{_lib}/libhal.so.1
/usr/%{_lib}/libhal-storage.so.1
/usr/%{_lib}/libhesiod.so.0
/usr/%{_lib}/libhowl.so.0
/usr/%{_lib}/libICE.so.6
/usr/%{_lib}/libkrb4.so.2
/usr/%{_lib}/libkrb5.so.3
/usr/%{_lib}/libkrb5support.so.0
/usr/%{_lib}/libk5crypto.so.3
/usr/%{_lib}/liblber-2.3.so.0
/usr/%{_lib}/libldap-2.3.so.0
/usr/%{_lib}/libncurses.so.5
/usr/%{_lib}/libORBitCosNaming-2.so.0
/usr/%{_lib}/libORBit-2.so.0
/usr/%{_lib}/libpangoft2-1.0.so.0
/usr/%{_lib}/libpangoxft-1.0.so.0
/usr/%{_lib}/libpangox-1.0.so.0
/usr/%{_lib}/libpango-1.0.so.0
/usr/%{_lib}/libpng12.so.0
/usr/%{_lib}/libpopt.so.0
/usr/%{_lib}/libpython2.4.so.1.0
/usr/%{_lib}/librsvg-2.so.2
/usr/%{_lib}/libsasl2.so.2
/usr/%{_lib}/libSM.so.6
/usr/%{_lib}/libusb-0.1.so.4
/usr/%{_lib}/libvte.so.4
/usr/%{_lib}/libwrap.so.0
/usr/%{_lib}/libXcursor.so.1
/usr/%{_lib}/libXext.so.6
/usr/%{_lib}/libXfixes.so.3
/usr/%{_lib}/libXfont.so.1
/usr/%{_lib}/libXft.so.2
/usr/%{_lib}/libXinerama.so.1
/usr/%{_lib}/libXi.so.6
/usr/%{_lib}/libxkbfile.so.1
/usr/%{_lib}/libxml2.so.2
/usr/%{_lib}/libXmuu.so.1
/usr/%{_lib}/libXrandr.so.2
/usr/%{_lib}/libXrender.so.1
/usr/%{_lib}/libX11.so.6
/usr/%{_lib}/libz.so.1
/usr/lib/locale/locale-archive
/usr/%{_lib}/pango/1.5.0/modules/pango-basic-fc.so
/usr/%{_lib}/python2.4/codecs.py
/usr/%{_lib}/python2.4/codecs.pyo
/usr/%{_lib}/python2.4/copy.py
/usr/%{_lib}/python2.4/copy.pyo
/usr/%{_lib}/python2.4/copy_reg.py
/usr/%{_lib}/python2.4/copy_reg.pyo
/usr/%{_lib}/python2.4/dis.py
/usr/%{_lib}/python2.4/dis.pyo
/usr/%{_lib}/python2.4/encodings/aliases.py
/usr/%{_lib}/python2.4/encodings/aliases.pyo
/usr/%{_lib}/python2.4/encodings/__init__.py
/usr/%{_lib}/python2.4/encodings/__init__.pyo
/usr/%{_lib}/python2.4/encodings/latin_1.py
/usr/%{_lib}/python2.4/encodings/latin_1.pyo
/usr/%{_lib}/python2.4/fnmatch.py
/usr/%{_lib}/python2.4/fnmatch.pyo
/usr/%{_lib}/python2.4/getopt.py
/usr/%{_lib}/python2.4/getopt.pyo
/usr/%{_lib}/python2.4/gettext.py
/usr/%{_lib}/python2.4/gettext.pyo
/usr/%{_lib}/python2.4/glob.py
/usr/%{_lib}/python2.4/glob.pyo
/usr/%{_lib}/python2.4/inspect.py
/usr/%{_lib}/python2.4/inspect.pyo
/usr/%{_lib}/python2.4/lib-dynload/cPickle.so
/usr/%{_lib}/python2.4/lib-dynload/cStringIO.so
/usr/%{_lib}/python2.4/lib-dynload/grpmodule.so
/usr/%{_lib}/python2.4/lib-dynload/_localemodule.so
/usr/%{_lib}/python2.4/lib-dynload/pwdmodule.so
/usr/%{_lib}/python2.4/lib-dynload/pyexpat.so
/usr/%{_lib}/python2.4/lib-dynload/stropmodule.so
/usr/%{_lib}/python2.4/lib-dynload/structmodule.so
/usr/%{_lib}/python2.4/lib-dynload/timemodule.so
/usr/%{_lib}/python2.4/lib-dynload/zlibmodule.so
/usr/%{_lib}/python2.4/linecache.py
/usr/%{_lib}/python2.4/linecache.pyo
/usr/%{_lib}/python2.4/locale.py
/usr/%{_lib}/python2.4/locale.pyo
/usr/%{_lib}/python2.4/opcode.py
/usr/%{_lib}/python2.4/opcode.pyo
/usr/%{_lib}/python2.4/os.py
/usr/%{_lib}/python2.4/os.pyo
/usr/%{_lib}/python2.4/posixpath.py
/usr/%{_lib}/python2.4/posixpath.pyo
/usr/%{_lib}/python2.4/re.py
/usr/%{_lib}/python2.4/re.pyo
/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.py
/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyo
/usr/%{_lib}/python2.4/site-packages/japanese/__init__.py
/usr/%{_lib}/python2.4/site-packages/japanese/__init__.pyo
/usr/%{_lib}/python2.4/site-packages/japanese.pth
/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.py
/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.pyo
/usr/%{_lib}/python2.4/site-packages/pyalchemist.so
/usr/%{_lib}/python2.4/site-packages/pygtk.pth
/usr/%{_lib}/python2.4/site-packages/rhpl/ethtool.so
/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.py
/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.pyo
/usr/%{_lib}/python2.4/site-packages/rhpl/iconv.so
/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.py
/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyo
/usr/%{_lib}/python2.4/site-packages/rhpl/translate.py
/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyo
/usr/%{_lib}/python2.4/site-packages/rhpl/_translate.so
/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.py
/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.pyo
/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/__init__.py
/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/__init__.pyo
/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/qp_xml.py
/usr/%{_lib}/python2.4/site-packages/_xmlplus/utils/qp_xml.pyo
/usr/%{_lib}/python2.4/site.py
/usr/%{_lib}/python2.4/site.pyo
/usr/%{_lib}/python2.4/sre_compile.py
/usr/%{_lib}/python2.4/sre_compile.pyo
/usr/%{_lib}/python2.4/sre_constants.py
/usr/%{_lib}/python2.4/sre_constants.pyo
/usr/%{_lib}/python2.4/sre_parse.py
/usr/%{_lib}/python2.4/sre_parse.pyo
/usr/%{_lib}/python2.4/sre.py
/usr/%{_lib}/python2.4/sre.pyo
/usr/%{_lib}/python2.4/stat.py
/usr/%{_lib}/python2.4/stat.pyo
/usr/%{_lib}/python2.4/string.py
/usr/%{_lib}/python2.4/string.pyo
/usr/%{_lib}/python2.4/tokenize.py
/usr/%{_lib}/python2.4/tokenize.pyo
/usr/%{_lib}/python2.4/token.py
/usr/%{_lib}/python2.4/token.pyo
/usr/%{_lib}/python2.4/types.py
/usr/%{_lib}/python2.4/types.pyo
/usr/%{_lib}/python2.4/UserDict.py
/usr/%{_lib}/python2.4/UserDict.pyo
/usr/%{_lib}/python2.4/warnings.py
/usr/%{_lib}/python2.4/warnings.pyo
/usr/%{_lib}/python2.4/xml/__init__.py
/usr/%{_lib}/python2.4/xml/__init__.pyo
/usr/%{_lib}/sasl2/libanonymous.la
/usr/%{_lib}/sasl2/libanonymous.so.2
/usr/%{_lib}/sasl2/liblogin.la
/usr/%{_lib}/sasl2/liblogin.so.2
/usr/%{_lib}/sasl2/libplain.la
/usr/%{_lib}/sasl2/libplain.so.2
/usr/%{_lib}/sasl2/libsasldb.la
/usr/%{_lib}/sasl2/libsasldb.so.2
/usr/%{_lib}/sasl2/Sendmail.conf
/usr/%{_lib}/vte/gnome-pty-helper
/usr/%{_lib}/xorg/modules/drivers/apm_drv.so
/usr/%{_lib}/xorg/modules/drivers/ark_drv.so
/usr/%{_lib}/xorg/modules/drivers/ati_drv.so
/usr/%{_lib}/xorg/modules/drivers/atimisc_drv.so
/usr/%{_lib}/xorg/modules/drivers/cirrus_alpine.so
/usr/%{_lib}/xorg/modules/drivers/cirrus_drv.so
/usr/%{_lib}/xorg/modules/drivers/cirrus_laguna.so
/usr/%{_lib}/xorg/modules/drivers/cyrix_drv.so
/usr/%{_lib}/xorg/modules/drivers/dummy_drv.so
/usr/%{_lib}/xorg/modules/drivers/fbdev_drv.so
/usr/%{_lib}/xorg/modules/drivers/glint_drv.so
/usr/%{_lib}/xorg/modules/drivers/chips_drv.so
/usr/%{_lib}/xorg/modules/drivers/i128_drv.so
/usr/%{_lib}/xorg/modules/drivers/i810_drv.so
/usr/%{_lib}/xorg/modules/drivers/mga_drv.so
/usr/%{_lib}/xorg/modules/drivers/neomagic_drv.so
/usr/%{_lib}/xorg/modules/drivers/nv_drv.so
/usr/%{_lib}/xorg/modules/drivers/radeon_drv.so
/usr/%{_lib}/xorg/modules/drivers/rendition_drv.so
/usr/%{_lib}/xorg/modules/drivers/riva128.so
/usr/%{_lib}/xorg/modules/drivers/r128_drv.so
/usr/%{_lib}/xorg/modules/drivers/savage_drv.so
/usr/%{_lib}/xorg/modules/drivers/siliconmotion_drv.so
/usr/%{_lib}/xorg/modules/drivers/sis_drv.so
/usr/%{_lib}/xorg/modules/drivers/s3_drv.so
/usr/%{_lib}/xorg/modules/drivers/s3virge_drv.so
/usr/%{_lib}/xorg/modules/drivers/tdfx_drv.so
/usr/%{_lib}/xorg/modules/drivers/tga_drv.so
/usr/%{_lib}/xorg/modules/drivers/trident_drv.so
/usr/%{_lib}/xorg/modules/drivers/tseng_drv.so
/usr/%{_lib}/xorg/modules/drivers/vesa_drv.so
/usr/%{_lib}/xorg/modules/drivers/vga_drv.so
/usr/%{_lib}/xorg/modules/drivers/vmware_drv.so
/usr/%{_lib}/xorg/modules/drivers/v4l_drv.so
/usr/%{_lib}/xorg/modules/extensions/libdbe.so
/usr/%{_lib}/xorg/modules/extensions/libdri.so
/usr/%{_lib}/xorg/modules/extensions/libextmod.so
/usr/%{_lib}/xorg/modules/extensions/libGLcore.so
/usr/%{_lib}/xorg/modules/extensions/libglx.so
/usr/%{_lib}/xorg/modules/extensions/librecord.so
/usr/%{_lib}/xorg/modules/extensions/libvnc.so
/usr/%{_lib}/xorg/modules/extensions/libxtrap.so
/usr/%{_lib}/xorg/modules/fonts/libbitmap.so
/usr/%{_lib}/xorg/modules/fonts/libfreetype.so
/usr/%{_lib}/xorg/modules/fonts/libtype1.so
/usr/%{_lib}/xorg/modules/input/acecad_drv.so
/usr/%{_lib}/xorg/modules/input/aiptek_drv.so
/usr/%{_lib}/xorg/modules/input/calcomp_drv.so
/usr/%{_lib}/xorg/modules/input/citron_drv.so
/usr/%{_lib}/xorg/modules/input/digitaledge_drv.so
/usr/%{_lib}/xorg/modules/input/dmc_drv.so
/usr/%{_lib}/xorg/modules/input/dynapro_drv.so
/usr/%{_lib}/xorg/modules/input/elographics_drv.so
/usr/%{_lib}/xorg/modules/input/fpit_drv.so
/usr/%{_lib}/xorg/modules/input/hyperpen_drv.so
/usr/%{_lib}/xorg/modules/input/js_x_drv.so
/usr/%{_lib}/xorg/modules/input/kbd_drv.so
/usr/%{_lib}/xorg/modules/input/keyboard_drv.so
/usr/%{_lib}/xorg/modules/input/magellan_drv.so
/usr/%{_lib}/xorg/modules/input/microtouch_drv.so
/usr/%{_lib}/xorg/modules/input/mouse_drv.so
/usr/%{_lib}/xorg/modules/input/mutouch_drv.so
/usr/%{_lib}/xorg/modules/input/palmax_drv.so
/usr/%{_lib}/xorg/modules/input/penmount_drv.so
/usr/%{_lib}/xorg/modules/input/spaceorb_drv.so
/usr/%{_lib}/xorg/modules/input/summa_drv.so
/usr/%{_lib}/xorg/modules/input/synaptics_drv.so
/usr/%{_lib}/xorg/modules/input/tek4957_drv.so
/usr/%{_lib}/xorg/modules/input/ur98_drv.so
/usr/%{_lib}/xorg/modules/input/void_drv.so
/usr/%{_lib}/xorg/modules/input/wacom_drv.so
/usr/%{_lib}/xorg/modules/libafb.so
/usr/%{_lib}/xorg/modules/libcfb.so
/usr/%{_lib}/xorg/modules/libcfb16.so
/usr/%{_lib}/xorg/modules/libcfb24.so
/usr/%{_lib}/xorg/modules/libcfb32.so
/usr/%{_lib}/xorg/modules/libcw.so
/usr/%{_lib}/xorg/modules/libdamage.so
/usr/%{_lib}/xorg/modules/libddc.so
/usr/%{_lib}/xorg/modules/libfb.so
/usr/%{_lib}/xorg/modules/libint10.so
/usr/%{_lib}/xorg/modules/libi2c.so
/usr/%{_lib}/xorg/modules/liblayer.so
/usr/%{_lib}/xorg/modules/libmfb.so
/usr/%{_lib}/xorg/modules/libpcidata.so
/usr/%{_lib}/xorg/modules/librac.so
/usr/%{_lib}/xorg/modules/libramdac.so
/usr/%{_lib}/xorg/modules/libscanpci.so
/usr/%{_lib}/xorg/modules/libshadow.so
/usr/%{_lib}/xorg/modules/libvbe.so
/usr/%{_lib}/xorg/modules/libvgahw.so
/usr/%{_lib}/xorg/modules/libxaa.so
/usr/%{_lib}/xorg/modules/libxf24_32bpp.so
/usr/%{_lib}/xorg/modules/libxf4bpp.so
/usr/%{_lib}/xorg/modules/libxf8_16bpp.so
/usr/%{_lib}/xorg/modules/libxf8_32bpp.so
/usr/%{_lib}/xorg/modules/linux/libdrm.so
/usr/%{_lib}/xorg/modules/linux/libfbdevhw.so
/usr/%{_lib}/xorg/modules/v20002d.uc
/usr/lib/xserver/SecurityPolicy
/usr/sbin/acpid
/usr/sbin/anacron
/usr/sbin/atd
/usr/sbin/automount
/usr/sbin/cpuspeed
/usr/sbin/crond
/usr/sbin/cupsd
/usr/sbin/fstab-sync
/usr/sbin/gdm
/usr/sbin/gdm-binary
/usr/sbin/gdmsetup
/usr/sbin/gpm
/usr/sbin/hald
/usr/sbin/hcid
/usr/sbin/hid2hci
/usr/sbin/chkfontpath
/usr/sbin/kudzu
/usr/sbin/printconf-backend
/usr/sbin/rhnsd
/usr/sbin/rpc.gssd
/usr/sbin/rpc.idmapd
/usr/sbin/sdpd
/usr/sbin/sendmail
/usr/sbin/sshd
/usr/sbin/system-config-network-cmd
/usr/share/cups/banners/classified
/usr/share/cups/banners/confidential
/usr/share/cups/banners/secret
/usr/share/cups/banners/standard
/usr/share/cups/banners/topsecret
/usr/share/cups/banners/unclassified
/usr/share/cups/model/deskjet.ppd.gz
/usr/share/cups/model/deskjet2.ppd.gz
/usr/share/cups/model/dymo.ppd.gz
/usr/share/cups/model/epson24.ppd.gz
/usr/share/cups/model/epson9.ppd.gz
/usr/share/cups/model/laserjet.ppd.gz
/usr/share/cups/model/okidata9.ppd.gz
/usr/share/cups/model/okidat24.ppd.gz
/usr/share/cups/model/postscript.ppd.gz
/usr/share/cups/model/stcolor.ppd.gz
/usr/share/cups/model/stcolor2.ppd.gz
/usr/share/cups/model/stphoto.ppd.gz
/usr/share/cups/model/stphoto2.ppd.gz
/usr/share/cups/model/textonly.ppd
/usr/share/cups/model/zebra.ppd.gz
/usr/share/fonts/bitmap-fonts/console8x16.pcf
/usr/share/fonts/bitmap-fonts/console8x8.pcf
/usr/share/fonts/bitmap-fonts/fonts.cache-1
/usr/share/fonts/bitmap-fonts/lutRS10.pcf
/usr/share/fonts/bitmap-fonts/lutRS12.pcf
/usr/share/fonts/bitmap-fonts/10x20.pcf
/usr/share/fonts/bitmap-fonts/5x8.pcf
/usr/share/fonts/bitmap-fonts/6x10.pcf
/usr/share/fonts/bitmap-fonts/6x12.pcf
/usr/share/fonts/bitmap-fonts/6x13.pcf
/usr/share/fonts/bitmap-fonts/6x9.pcf
/usr/share/fonts/bitmap-fonts/9x15.pcf
/usr/share/fonts/bitmap-fonts/9x18.pcf
/usr/share/fonts/bitstream-vera/fonts.cache-1
/usr/share/fonts/bitstream-vera/VeraBd.ttf
/usr/share/fonts/bitstream-vera/VeraBI.ttf
/usr/share/fonts/bitstream-vera/VeraMono.ttf
/usr/share/fonts/bitstream-vera/Vera.ttf
/usr/share/fonts/default/fonts.cache-1
/usr/share/fonts/default/ghostscript/fonts.cache-1
/usr/share/fonts/default/Type1/c059013l.pfb
/usr/share/fonts/default/Type1/fonts.cache-1
/usr/share/fonts/default/Type1/fonts.dir
/usr/share/fonts/default/Type1/n019003l.pfb
/usr/share/fonts/default/Type1/n022003l.pfb
/usr/share/fonts/default/Type1/s050000l.pfb
/usr/share/fonts/fonts.cache-1
/usr/share/gdm/BuiltInSessions/default.desktop
/usr/share/gdm/themes/Bluecurve/Bluecurve.xml
/usr/share/gdm/themes/Bluecurve/curve-bottom_left.png
/usr/share/gdm/themes/Bluecurve/curve-bottom_right.png
/usr/share/gdm/themes/Bluecurve/curve-top_left.png
/usr/share/gdm/themes/Bluecurve/curve-top_right.png
/usr/share/gdm/themes/Bluecurve/GdmGreeterTheme.desktop
/usr/share/gdm/themes/Bluecurve/icon-language.png
/usr/share/gdm/themes/Bluecurve/icon-reboot.png
/usr/share/gdm/themes/Bluecurve/icon-session.png
/usr/share/gdm/themes/Bluecurve/icon-shutdown.png
/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
/usr/share/gdm/themes/Bluecurve/throbber.png
/usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
/usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
/usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
/usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
/usr/share/hal/fdi/information/10freedesktop/10-wireless-mice.fdi
/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
/usr/share/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
/usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
/usr/share/hal/fdi/policy/10osvendor/10-storage-policy.fdi
/usr/share/hal/fdi/policy/10osvendor/20-storage-add-selinux.fdi
/usr/share/hal/fdi/policy/10osvendor/90-fstab-sync.fdi
/usr/share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
/usr/share/hwdata/pci.ids
/usr/share/hwdata/pcitable
/usr/share/hwdata/usb.ids
/usr/share/icons/Bluecurve/cursors/left_ptr
/usr/share/icons/Bluecurve/cursors/watch
/usr/share/icons/Bluecurve/cursors/xterm
/usr/share/icons/Bluecurve/index.theme
/usr/share/icons/default/index.theme
/usr/share/icons/gnome/index.theme
/usr/share/locale/locale.alias
/usr/share/printconf/util/backend.py
/usr/share/printconf/util/backend.pyo
/usr/share/printconf/util/cups_import.py
/usr/share/printconf/util/cups_import.pyo
/usr/share/printconf/util/printconf_conf.py
/usr/share/printconf/util/printconf_conf.pyo
/usr/share/printconf/util/printconf_version.py
/usr/share/printconf/util/printconf_version.pyo
/usr/share/printconf/util/scan_usb_devices.py
/usr/share/printconf/util/scan_usb_devices.pyo
/usr/share/rhgb/large-computer.png
/usr/share/rhgb/system-logo.png
/usr/share/rhgb/throbber-anim.png
/usr/share/themes/Clearlooks/gtk-2.0/gtkrc
/usr/share/themes/Clearlooks/index.theme
/usr/share/vte/termcap/xterm
/usr/share/xsessions/gnome.desktop
/usr/share/X11/fonts/misc/cursor.pcf.gz
/usr/share/X11/fonts/misc/cursor.pcf.gz
/usr/share/X11/fonts/misc/fonts.alias
/usr/share/X11/fonts/misc/fonts.alias
/usr/share/X11/fonts/misc/fonts.alias
/usr/share/X11/fonts/misc/fonts.alias
/usr/share/X11/fonts/misc/fonts.dir
/usr/share/X11/fonts/misc/fonts.dir
/usr/share/X11/fonts/misc/fonts.dir
/usr/share/X11/fonts/misc/fonts.dir
/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz
/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz
/usr/share/X11/locale/locale.alias
/usr/share/zoneinfo/Universal


--- NEW FILE default.later.in ---
/bin/df
/bin/netstat
/etc/alsa/ainit.conf
/etc/bonobo-activation/bonobo-activation-config.xml
/etc/cups/client.conf
/etc/dbus-1/session.conf
/etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evince/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/display/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/select_names/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/date_navigator/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/display/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/notify/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/other/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/prompts/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/publish/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/colors/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/calendar/tasks/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/composer/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/fonts/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/display/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/message_window/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/subscribe_window/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/shell/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/shell/offline/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/folder_bar/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/evolution/shell/view_defaults/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/file-roller/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gcalctool/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gconf-editor/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gedit-2/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gfloppy/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-keyring-manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnomemeeting/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-screenshot/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-session/rh_extensions/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gnopernicus/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gok/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/gthumb/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/global_keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/keybinding_commands/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/window_keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/metacity/workspace_names/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/mini-commander/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/desktop/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/netstatus_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/clock/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/gimlet/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/mixer/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/show_desktop_button/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/systray/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/window_list/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/workspace_switcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/applets/workspace_switcher/prefs/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/default_setup/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/email_launcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/menu_bar/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/presentation_launcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/spreadsheet_launcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/web_launcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/objects/wordprocessor_launcher/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/toplevels/bottom_panel/background/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/toplevels/bottom_panel/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/toplevels/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/toplevels/top_panel/background/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/panel/toplevels/top_panel/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/procman/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/stickynotes_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/apps/yelp/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/startup/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/lockdown/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/monitor/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/remote_access/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at pdf/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-font-otf/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-font-pcf/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-font-ttf/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-font-type1/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-gnome-theme/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application at x-gnome-theme-installed/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/typing_break/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/about/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/aim/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/cdda/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/webcal/%gconf.xml
/etc/gconf/gconf.xml.defaults/desktop/gnome/volume_manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/cpufreq-applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/drivemount-applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evince/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/addressbook/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/date_navigator/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/display/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/notify/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/other/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/prompts/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/publish/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/colors/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/calendar/tasks/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/composer/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/fonts/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/display/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/message_window/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/subscribe_window/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/offline/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/evolution/shell/view_defaults/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gcalctool/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gconf-editor/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/geyes/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gfloppy/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-keyring-manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnomemeeting/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-screenshot/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/rh_extensions/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gpilot_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/keybinding_commands/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/window_keybindings/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/metacity/workspace_names/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/mini-commander-global/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/mixer_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/netstatus_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/objects/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/background/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/panel/toplevels/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/procman/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/stickynotes_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/window_list_applet/prefs/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/workspace_switcher_applet/prefs/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/apps/yelp/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/startup/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file_views/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/lockdown/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/general/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/monitor/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/remote_access/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at pdf/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-font-otf/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-font-pcf/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-font-ttf/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-font-type1/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-gnome-theme/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application at x-gnome-theme-installed/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/typing_break/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/about/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/aim/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/cdda/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/webcal/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/volume_manager/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
/etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
/etc/gconf/gconf.xml.defaults/system/%gconf.xml
/etc/gconf/2/path
/etc/gnome-vfs-2.0/modules/default-modules.conf
/etc/gnome-vfs-2.0/modules/font-method.conf
/etc/gnome-vfs-2.0/modules/mapping-modules.conf
/etc/gnome-vfs-2.0/modules/smb-module.conf
/etc/gnome-vfs-2.0/modules/ssl-modules.conf
/etc/gnome-vfs-2.0/modules/theme-method.conf
/etc/pam.d/xscreensaver
/etc/rc.d/init.d/pcmcia
/etc/rc.d/init.d/sendmail
/etc/rc.d/rc5.d/S09pcmcia
/etc/rc.d/rc5.d/S80sendmail
/etc/rc5.d/K01yum
/etc/rc5.d/K02NetworkManager
/etc/rc5.d/K02NetworkManagerDispatcher
/etc/rpm/macros.jpackage
/etc/rpm/macros.prelink
/etc/rpm/macros.specspo
/etc/rpm/macros.up2date
/etc/rpm/platform
/etc/security/console.handlers
/etc/sysconfig/rhn/rhn-applet
/etc/sysconfig/rhn/sources
/etc/sysconfig/rhn/up2date
/etc/sysconfig/rhn/up2date-uuid
/etc/X11/gdm/PreSession/Default
/etc/X11/xdm/Xsession
/etc/X11/xinit/Xclients
/etc/X11/xinit/xinitrc-common
/etc/X11/xinit/xinitrc.d/xinput.sh
/etc/X11/Xmodmap
/%{_lib}/libgcc_s.so.1
/sbin/pam_timestamp_check
/usr/bin/ainit
/usr/bin/cut
/usr/bin/dbus-launch
/usr/bin/dirname
/usr/bin/eggcups
/usr/bin/evolution
/usr/bin/expr
/usr/bin/firefox
/usr/bin/gconftool-2
/usr/bin/gnome-keyring-daemon
/usr/bin/gnome-open
/usr/bin/gnome-panel
/usr/bin/gnome-volume-manager
/usr/bin/gnome-wm
/usr/bin/htmlview
/usr/bin/launchmail
/usr/bin/magicdev
/usr/bin/md5sum
/usr/bin/metacity
/usr/bin/mkfontdir
/usr/bin/mkfontscale
/usr/bin/nautilus
/usr/bin/nautilus-connect-server
/usr/bin/openoffice.org-2.0
/usr/bin/pam-panel-icon
/usr/bin/printenv
/usr/bin/rhn-applet-gui
/usr/bin/sessreg
/usr/bin/ssh-agent
/usr/bin/system-config-date
/usr/bin/which
/usr/bin/xmodmap
/usr/bin/xsetroot
/usr/%{_lib}/bonobo/monikers/libmoniker_std_2.so
/usr/%{_lib}/bonobo/servers/Accessibility_Registry.server
/usr/%{_lib}/bonobo/servers/Bonobo_CosNaming_NamingContext.server
/usr/%{_lib}/bonobo/servers/Bonobo_Moniker_std.server
/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Controls.server
/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Echo.server
/usr/%{_lib}/bonobo/servers/CanvDemo.server
/usr/%{_lib}/bonobo/servers/File_Roller_Component.server
/usr/%{_lib}/bonobo/servers/GNOME_AccessxStatusApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_BattstatApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_CDPlayerApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_CPUFreqApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_DriveMountApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Addressbook_2.6.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.6.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_2.6.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Mail_2.6.server
/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Shell_2.6.server
/usr/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_GDictApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Gedit.server
/usr/%{_lib}/bonobo/servers/GNOME_GeyesApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Gok.server
/usr/%{_lib}/bonobo/servers/GNOME_GThumb_CatalogView.server
/usr/%{_lib}/bonobo/servers/GNOME_GThumb_Viewer.server
/usr/%{_lib}/bonobo/servers/GNOME_GtikApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.server
/usr/%{_lib}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_CharpickerApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_KeyboardApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Magnifier.server
/usr/%{_lib}/bonobo/servers/GNOME_MailcheckApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_Media_CDDBSlave2.server
/usr/%{_lib}/bonobo/servers/gnomemeeting.server
/usr/%{_lib}/bonobo/servers/GNOME_MiniCommanderApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_MixerApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_ModemLightsApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Moniker_std.server
/usr/%{_lib}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_NetstatusApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_NullApplet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_Panel.server
/usr/%{_lib}/bonobo/servers/GNOME_Panel_TrashApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Panel_WirelessApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_PilotApplet.server
/usr/%{_lib}/bonobo/servers/GNOME_Pilot_Daemon.server
/usr/%{_lib}/bonobo/servers/GNOME_RemoteDesktop.server
/usr/%{_lib}/bonobo/servers/GNOME_SettingsDaemon.server
/usr/%{_lib}/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
/usr/%{_lib}/bonobo/servers/GNOME_Spell.server
/usr/%{_lib}/bonobo/servers/GNOME_StickyNotesApplet.server
/usr/%{_lib}/bonobo/servers/gnome-terminal.server
/usr/%{_lib}/bonobo/servers/GNOME_VFS_Daemon.server
/usr/%{_lib}/bonobo/servers/GNOME_VFS_Moniker_std.server
/usr/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server
/usr/%{_lib}/bonobo/servers/GNOME_Yelp.server
/usr/%{_lib}/bonobo/servers/Nautilus_shell.server
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.so
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelnntp.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelpop3.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsendmail.urls
/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls
/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendfile.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendgroupwise.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendldap.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendvcf.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendcontacts.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendfile.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendhttp.so
/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendweather.so
/usr/%{_lib}/evolution/2.6/components/libevolution-addressbook.so
/usr/%{_lib}/evolution/2.6/components/libevolution-calendar.so
/usr/%{_lib}/evolution/2.6/components/libevolution-mail.so
/usr/%{_lib}/evolution/2.6/libeabutil.so.0
/usr/%{_lib}/evolution/2.6/libecontacteditor.so.0
/usr/%{_lib}/evolution/2.6/libecontactlisteditor.so.0
/usr/%{_lib}/evolution/2.6/libefilterbar.so.0
/usr/%{_lib}/evolution/2.6/libemiscwidgets.so.0
/usr/%{_lib}/evolution/2.6/libeshell.so.0
/usr/%{_lib}/evolution/2.6/libessmime.so.0
/usr/%{_lib}/evolution/2.6/libetimezonedialog.so.0
/usr/%{_lib}/evolution/2.6/libeutil.so.0
/usr/%{_lib}/evolution/2.6/libevolution-addressbook-a11y.so.0
/usr/%{_lib}/evolution/2.6/libevolution-a11y.so.0
/usr/%{_lib}/evolution/2.6/libevolution-calendar-a11y.so.0
/usr/%{_lib}/evolution/2.6/libevolution-importer.so.0
/usr/%{_lib}/evolution/2.6/libevolution-mail-importers.so.0
/usr/%{_lib}/evolution/2.6/libevolution-smime.so.0
/usr/%{_lib}/evolution/2.6/libevolution-widgets-a11y.so.0
/usr/%{_lib}/evolution/2.6/libfilter.so.0
/usr/%{_lib}/evolution/2.6/libmenus.so.0
/usr/%{_lib}/evolution/2.6/plugins/libmail-account-disable.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-addressbook-file.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-audio-inline.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-file.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-http.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-weather.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-copy-tool.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-default-mailer.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-default-source.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-bbdb.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-hula-account-setup.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-startup-wizard.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-exchange-operations.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-groupwise-features.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-gw-account-setup.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-itip-formatter.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mailing-list-actions.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mail-to-task.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mark-all-read.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mark-calendar-offline.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-new-mail-notify.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-plugin-manager.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-print-message.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-publish-calendar.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-sa-junk-plugin.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-save-calendar.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-select-one-source.so
/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-subject-thread.so
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-addressbook-file.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-audio-inline.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-file.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-http.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-weather.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-compose-send-options.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-copy-tool.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-default-mailer.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-default-source.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-bbdb.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-hula-account-setup.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-startup-wizard.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-ab-subscription.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-cal-subscription.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-operations.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-tasks-subscription.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-folder-permissions.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-folder-subscription.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-groupwise-features.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-gw-account-setup.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-itip-formatter.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mail-account-disable.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mailing-list-actions.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mailing-list-actions.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mail-to-task.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mark-all-read.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mark-calendar-offline.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-new-mail-notify.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-plugin-manager.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-plugin-manager.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-print-message.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-print-message.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-publish-calendar.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-publish-calendar.xml
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-sa-junk-plugin.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-save-calendar.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-select-one-source.eplug
/usr/%{_lib}/evolution/2.6/plugins/org-gnome-subject-thread.eplug
/usr/%{_lib}/evolution/2.6/plugins/publish-calendar.glade
/usr/libexec/bonobo-activation-server
/usr/libexec/clock-applet
/usr/libexec/evolution-data-server-1.6
/usr/libexec/evolution/2.6/evolution-alarm-notify
/usr/libexec/gam_server
/usr/libexec/gconfd-2
/usr/libexec/gconf-sanity-check-2
/usr/libexec/gnome-settings-daemon
/usr/libexec/gnome-vfs-daemon
/usr/libexec/mapping-daemon
/usr/libexec/mixer_applet2
/usr/libexec/notification-area-applet
/usr/libexec/wnck-applet
/usr/libexec/xscreensaver
/usr/%{_lib}/firefox-1.5.0.1/browserconfig.properties
/usr/%{_lib}/firefox-1.5.0.1/components/accessibility-atk.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/accessibility.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/alerts.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/appshell.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/appstartup.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/autocomplete.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/autoconfig.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/bookmarks.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/browsercompsbase.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/caps.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/commandhandler.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/commandlines.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/composer.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_base.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_htmldoc.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_html.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_xmldoc.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_xslt.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/content_xtf.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/cookie.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/directory.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/docshell.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_base.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_canvas.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_core.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_css.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_events.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_html.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_loadsave.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_range.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_stylesheets.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_svg.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_traversal.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_views.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_xbl.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_xpath.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/dom_xul.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/downloads.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/editor.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/embed_base.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/extensions.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/exthandler.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/fastfind.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/filepicker.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/find.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/gfx.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/gksvgrenderer.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/history.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/htmlparser.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/chardet.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/chrome.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/imgicon.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/imglib2.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/intl.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/jar.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/jsconsole-clhandler.js
/usr/%{_lib}/firefox-1.5.0.1/components/jsconsole.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/jsdservice.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/layout_base.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/layout_printing.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/layout_xul_tree.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/layout_xul.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/libaccessibility.so
/usr/%{_lib}/firefox-1.5.0.1/components/libappcomps.so
/usr/%{_lib}/firefox-1.5.0.1/components/libauth.so
/usr/%{_lib}/firefox-1.5.0.1/components/libautoconfig.so
/usr/%{_lib}/firefox-1.5.0.1/components/libbrowsercomps.so
/usr/%{_lib}/firefox-1.5.0.1/components/libbrowserdirprovider.so
/usr/%{_lib}/firefox-1.5.0.1/components/libcaps.so
/usr/%{_lib}/firefox-1.5.0.1/components/libcommandlines.so
/usr/%{_lib}/firefox-1.5.0.1/components/libcomposer.so
/usr/%{_lib}/firefox-1.5.0.1/components/libcookie.so
/usr/%{_lib}/firefox-1.5.0.1/components/libdocshell.so
/usr/%{_lib}/firefox-1.5.0.1/components/libeditor.so
/usr/%{_lib}/firefox-1.5.0.1/components/libembedcomponents.so
/usr/%{_lib}/firefox-1.5.0.1/components/libfileview.so
/usr/%{_lib}/firefox-1.5.0.1/components/libgfx_gtk.so
/usr/%{_lib}/firefox-1.5.0.1/components/libgfxps.so
/usr/%{_lib}/firefox-1.5.0.1/components/libgklayout.so
/usr/%{_lib}/firefox-1.5.0.1/components/libgkplugin.so
/usr/%{_lib}/firefox-1.5.0.1/components/libhtmlpars.so
/usr/%{_lib}/firefox-1.5.0.1/components/libchrome.so
/usr/%{_lib}/firefox-1.5.0.1/components/libimgicon.so
/usr/%{_lib}/firefox-1.5.0.1/components/libimglib2.so
/usr/%{_lib}/firefox-1.5.0.1/components/libi18n.so
/usr/%{_lib}/firefox-1.5.0.1/components/libjar50.so
/usr/%{_lib}/firefox-1.5.0.1/components/libjsd.so
/usr/%{_lib}/firefox-1.5.0.1/components/libmork.so
/usr/%{_lib}/firefox-1.5.0.1/components/libmozfind.so
/usr/%{_lib}/firefox-1.5.0.1/components/libmozgnome.so
/usr/%{_lib}/firefox-1.5.0.1/components/libnecko.so
/usr/%{_lib}/firefox-1.5.0.1/components/libnecko2.so
/usr/%{_lib}/firefox-1.5.0.1/components/libnkgnomevfs.so
/usr/%{_lib}/firefox-1.5.0.1/components/libnsappshell.so
/usr/%{_lib}/firefox-1.5.0.1/components/liboji.so
/usr/%{_lib}/firefox-1.5.0.1/components/libpermissions.so
/usr/%{_lib}/firefox-1.5.0.1/components/libpipboot.so
/usr/%{_lib}/firefox-1.5.0.1/components/libpipnss.so
/usr/%{_lib}/firefox-1.5.0.1/components/libpippki.so
/usr/%{_lib}/firefox-1.5.0.1/components/libpref.so
/usr/%{_lib}/firefox-1.5.0.1/components/librdf.so
/usr/%{_lib}/firefox-1.5.0.1/components/libremoteservice.so
/usr/%{_lib}/firefox-1.5.0.1/components/libsearchservice.so
/usr/%{_lib}/firefox-1.5.0.1/components/libsystem-pref.so
/usr/%{_lib}/firefox-1.5.0.1/components/libtoolkitcomps.so
/usr/%{_lib}/firefox-1.5.0.1/components/libtransformiix.so
/usr/%{_lib}/firefox-1.5.0.1/components/libtxmgr.so
/usr/%{_lib}/firefox-1.5.0.1/components/libuconv.so
/usr/%{_lib}/firefox-1.5.0.1/components/libucvmath.so
/usr/%{_lib}/firefox-1.5.0.1/components/libuniversalchardet.so
/usr/%{_lib}/firefox-1.5.0.1/components/libwebbrwsr.so
/usr/%{_lib}/firefox-1.5.0.1/components/libwebsrvcs.so
/usr/%{_lib}/firefox-1.5.0.1/components/libwidget_gtk2.so
/usr/%{_lib}/firefox-1.5.0.1/components/libxmlextras.so
/usr/%{_lib}/firefox-1.5.0.1/components/libxpcom_compat_c.so
/usr/%{_lib}/firefox-1.5.0.1/components/libxpconnect.so
/usr/%{_lib}/firefox-1.5.0.1/components/libxpinstall.so
/usr/%{_lib}/firefox-1.5.0.1/components/locale.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/lwbrk.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/migration.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/mimetype.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/mozbrwsr.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/mozfind.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/mozgnome.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_about.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_cache.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_cookie.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_data.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_dns.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_file.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_ftp.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_http.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_res.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_socket.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_strconv.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko_viewsource.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/necko.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/nsBrowserContentHandler.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsBrowserGlue.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsCloseAllWindows.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsDefaultCLH.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsDictionary.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsExtensionManager.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsFilePicker.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsHelperAppDlg.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsInterfaceInfoToIDL.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsKillAll.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsProgressDialog.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsProxyAutoConfig.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsResetPref.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsSetDefaultBrowser.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsSidebar.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsUpdateService.js
/usr/%{_lib}/firefox-1.5.0.1/components/nsXmlRpcClient.js
/usr/%{_lib}/firefox-1.5.0.1/components/oji.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/passwordmgr.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/pipboot.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/pipnss.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/pippki.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/plugin.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/prefetch.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/pref.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/profile.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/progressDlg.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/proxyObjInst.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/rdf.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/satchel.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/search.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/shellservice.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/shistory.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/sidebar.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/toolkitprofile.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/toolkitremote.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/txmgr.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/txtsvc.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/uconv.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/unicharutil.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/update.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/uriloader.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/webBrowser_core.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/webbrowserpersist.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/webshell_idls.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/websrvcs.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/widget.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/windowds.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/windowwatcher.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xmlextras.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xml-rpc.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_base.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_components.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_ds.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_io.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_obsolete.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_threads.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_xpti.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpconnect.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xpinstall.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xulapp.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xuldoc.xpt
/usr/%{_lib}/firefox-1.5.0.1/components/xultmpl.xpt
/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig
/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig/platform.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig/prefcalls.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/all-redhat.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/firefox.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/firefox-l10n.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/channel-prefs.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/reporter.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/bookmarks.html
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome/userContent-example.css
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome/userChrome-example.css
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/localstore.rdf
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/mimeTypes.rdf
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/prefs.js
/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/search.rdf
/usr/%{_lib}/firefox-1.5.0.1/dependentlibs.list
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/inspector-cmdline.js
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/inspector.xpt
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/libinspector.so
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults/preferences
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults/preferences/inspector.js
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome/chromelist.txt
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome/inspector.jar
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome.manifest
/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/install.rdf
/usr/%{_lib}/firefox-1.5.0.1/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
/usr/%{_lib}/firefox-1.5.0.1/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
/usr/%{_lib}/firefox-1.5.0.1/firefox
/usr/%{_lib}/firefox-1.5.0.1/firefox-bin
/usr/%{_lib}/firefox-1.5.0.1/firefox-xremote-client
/usr/%{_lib}/firefox-1.5.0.1/greprefs/all.js
/usr/%{_lib}/firefox-1.5.0.1/greprefs/all-redhat.js
/usr/%{_lib}/firefox-1.5.0.1/greprefs/security-prefs.js
/usr/%{_lib}/firefox-1.5.0.1/greprefs/xpinstall.js
/usr/%{_lib}/firefox-1.5.0.1/chrome/browser.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/browser.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/classic.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/classic.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/comm.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/comm.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/en-US.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/en-US.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/chromelist.txt
/usr/%{_lib}/firefox-1.5.0.1/chrome/icons
/usr/%{_lib}/firefox-1.5.0.1/chrome/icons/default
/usr/%{_lib}/firefox-1.5.0.1/chrome/icons/default/default.xpm
/usr/%{_lib}/firefox-1.5.0.1/chrome/pippki.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/pippki.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/reporter.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/reporter.manifest
/usr/%{_lib}/firefox-1.5.0.1/chrome/toolkit.jar
/usr/%{_lib}/firefox-1.5.0.1/chrome/toolkit.manifest
/usr/%{_lib}/firefox-1.5.0.1/icons/default.xpm
/usr/%{_lib}/firefox-1.5.0.1/icons/document.png
/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon128.png
/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon16.xpm
/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon50.xpm
/usr/%{_lib}/firefox-1.5.0.1/init.d
/usr/%{_lib}/firefox-1.5.0.1/init.d/README
/usr/%{_lib}/firefox-1.5.0.1/libgfxpsshar.so
/usr/%{_lib}/firefox-1.5.0.1/libgkgfx.so
/usr/%{_lib}/firefox-1.5.0.1/libgtkembedmoz.so
/usr/%{_lib}/firefox-1.5.0.1/libgtkxtbin.so
/usr/%{_lib}/firefox-1.5.0.1/libjsj.so
/usr/%{_lib}/firefox-1.5.0.1/libmozjs.so
/usr/%{_lib}/firefox-1.5.0.1/libxpcom_compat.so
/usr/%{_lib}/firefox-1.5.0.1/libxpcom_core.so
/usr/%{_lib}/firefox-1.5.0.1/libxpcom.so
/usr/%{_lib}/firefox-1.5.0.1/libxpistub.so
/usr/%{_lib}/firefox-1.5.0.1/mozilla-xremote-client
/usr/%{_lib}/firefox-1.5.0.1/plugins/libnullplugin.so
/usr/%{_lib}/firefox-1.5.0.1/plugins/libunixprintplugin.so
/usr/%{_lib}/firefox-1.5.0.1/removed-files
/usr/%{_lib}/firefox-1.5.0.1/res/arrowd.gif
/usr/%{_lib}/firefox-1.5.0.1/res/arrow.gif
/usr/%{_lib}/firefox-1.5.0.1/res/bloatcycle.html
/usr/%{_lib}/firefox-1.5.0.1/res/broken-image.gif
/usr/%{_lib}/firefox-1.5.0.1/res/cmessage.txt
/usr/%{_lib}/firefox-1.5.0.1/res/dtd/mathml.dtd
/usr/%{_lib}/firefox-1.5.0.1/res/dtd/xhtml11.dtd
/usr/%{_lib}/firefox-1.5.0.1/res/EditorOverride.css
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/htmlEntityVersions.properties
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Latin1.properties
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Special.properties
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Symbols.properties
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/mathml20.properties
/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/transliterate.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/fontEncoding.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontCMEX10.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontCMSY10.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath1.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath2.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath4.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMTExtra.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfont.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontPUA.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontSymbol.properties
/usr/%{_lib}/firefox-1.5.0.1/res/fonts/pangoFontEncoding.properties
/usr/%{_lib}/firefox-1.5.0.1/res/forms.css
/usr/%{_lib}/firefox-1.5.0.1/res/grabber.gif
/usr/%{_lib}/firefox-1.5.0.1/res/hiddenWindow.html
/usr/%{_lib}/firefox-1.5.0.1/res/html.css
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-audio.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-binary.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-find.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-image.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-menu.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-movie.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-sound.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-telnet.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-text.gif
/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-unknown.gif
/usr/%{_lib}/firefox-1.5.0.1/res/charsetalias.properties
/usr/%{_lib}/firefox-1.5.0.1/res/charsetData.properties
/usr/%{_lib}/firefox-1.5.0.1/res/langGroups.properties
/usr/%{_lib}/firefox-1.5.0.1/res/language.properties
/usr/%{_lib}/firefox-1.5.0.1/res/loading-image.gif
/usr/%{_lib}/firefox-1.5.0.1/res/mathml.css
/usr/%{_lib}/firefox-1.5.0.1/res/quirk.css
/usr/%{_lib}/firefox-1.5.0.1/res/sample.unixpsfonts.properties
/usr/%{_lib}/firefox-1.5.0.1/res/svg.css
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row-active.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row.gif
/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row-hover.gif
/usr/%{_lib}/firefox-1.5.0.1/res/ua.css
/usr/%{_lib}/firefox-1.5.0.1/res/unixcharset.properties
/usr/%{_lib}/firefox-1.5.0.1/res/viewer.properties
/usr/%{_lib}/firefox-1.5.0.1/res/viewsource.css
/usr/%{_lib}/firefox-1.5.0.1/run-mozilla.sh
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/amazondotcom.png
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/amazondotcom.src
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/answers.png
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/answers.src
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/creativecommons.png
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/creativecommons.src
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/eBay.gif
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/eBay.src
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/google.gif
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/google.src
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/yahoo.gif
/usr/%{_lib}/firefox-1.5.0.1/searchplugins/yahoo.src
/usr/%{_lib}/firefox-1.5.0.1/updater
/usr/%{_lib}/firefox-1.5.0.1/updater.ini
/usr/%{_lib}/firefox-1.5.0.1/xpicleanup
/usr/%{_lib}/GConf/2/libgconfbackend-xml.so
/usr/%{_lib}/gconv/UTF-16.so
/usr/%{_lib}/gnome-vfs-2.0/modules/libfile.so
/usr/%{_lib}/gnome-vfs-2.0/modules/libmapping.so
/usr/%{_lib}/gstreamer-0.10/libgstadder.so
/usr/%{_lib}/gstreamer-0.10/libgstalaw.so
/usr/%{_lib}/gstreamer-0.10/libgstalphacolor.so
/usr/%{_lib}/gstreamer-0.10/libgstalpha.so
/usr/%{_lib}/gstreamer-0.10/libgstalsa.so
/usr/%{_lib}/gstreamer-0.10/libgstapetag.so
/usr/%{_lib}/gstreamer-0.10/libgstartsdsink.so
/usr/%{_lib}/gstreamer-0.10/libgstarts.so
/usr/%{_lib}/gstreamer-0.10/libgstasf.so
/usr/%{_lib}/gstreamer-0.10/libgstaudioconvert.so
/usr/%{_lib}/gstreamer-0.10/libgstaudiofile.so
/usr/%{_lib}/gstreamer-0.10/libgstaudiofilter.so
/usr/%{_lib}/gstreamer-0.10/libgstaudiorate.so
/usr/%{_lib}/gstreamer-0.10/libgstaudioscale.so
/usr/%{_lib}/gstreamer-0.10/libgstaudio.so
/usr/%{_lib}/gstreamer-0.10/libgstauparse.so
/usr/%{_lib}/gstreamer-0.10/libgstautodetect.so
/usr/%{_lib}/gstreamer-0.10/libgstavi.so
/usr/%{_lib}/gstreamer-0.10/libgstbasicgthreadscheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstbasicomegascheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstbytestream.so
/usr/%{_lib}/gstreamer-0.10/libgstcdparanoia.so
/usr/%{_lib}/gstreamer-0.10/libgstcdplayer.so
/usr/%{_lib}/gstreamer-0.10/libgstcdxaparse.so
/usr/%{_lib}/gstreamer-0.10/libgstcolorspace.so
/usr/%{_lib}/gstreamer-0.10/libgstcutter.so
/usr/%{_lib}/gstreamer-0.10/libgstdataprotocol.so
/usr/%{_lib}/gstreamer-0.10/libgstdebug.so
/usr/%{_lib}/gstreamer-0.10/libgstdecodebin.so
/usr/%{_lib}/gstreamer-0.10/libgstdeinterlace.so
/usr/%{_lib}/gstreamer-0.10/libgstdvdec.so
/usr/%{_lib}/gstreamer-0.10/libgstdvdlpcmdec.so
/usr/%{_lib}/gstreamer-0.10/libgstefence.so
/usr/%{_lib}/gstreamer-0.10/libgsteffectv.so
/usr/%{_lib}/gstreamer-0.10/libgstelements.so
/usr/%{_lib}/gstreamer-0.10/libgstentrygthreadscheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstentryomegascheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstequalizer.so
/usr/%{_lib}/gstreamer-0.10/libgstesd.so
/usr/%{_lib}/gstreamer-0.10/libgstfairgthreadscheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstfestival.so
/usr/%{_lib}/gstreamer-0.10/libgstffmpegcolorspace.so
/usr/%{_lib}/gstreamer-0.10/libgstfilter.so
/usr/%{_lib}/gstreamer-0.10/libgstflac.so
/usr/%{_lib}/gstreamer-0.10/libgstflxdec.so
/usr/%{_lib}/gstreamer-0.10/libgstgamma.so
/usr/%{_lib}/gstreamer-0.10/libgstgconfelements.so
/usr/%{_lib}/gstreamer-0.10/libgstgdkpixbuf.so
/usr/%{_lib}/gstreamer-0.10/libgstgetbits.so
/usr/%{_lib}/gstreamer-0.10/libgstglimagesink.so
/usr/%{_lib}/gstreamer-0.10/libgstgnomevfs.so
/usr/%{_lib}/gstreamer-0.10/libgstgoom.so
/usr/%{_lib}/gstreamer-0.10/libgstchart.so
/usr/%{_lib}/gstreamer-0.10/libgstidct.so
/usr/%{_lib}/gstreamer-0.10/libgstindexers.so
/usr/%{_lib}/gstreamer-0.10/libgstinterleave.so
/usr/%{_lib}/gstreamer-0.10/libgstjpeg.so
/usr/%{_lib}/gstreamer-0.10/libgstlevel.so
/usr/%{_lib}/gstreamer-0.10/libgstmatroska.so
/usr/%{_lib}/gstreamer-0.10/libgstmedian.so
/usr/%{_lib}/gstreamer-0.10/libgstmixmatrix.so
/usr/%{_lib}/gstreamer-0.10/libgstmng.so
/usr/%{_lib}/gstreamer-0.10/libgstmodplug.so
/usr/%{_lib}/gstreamer-0.10/libgstmonoscope.so
/usr/%{_lib}/gstreamer-0.10/libgstmulaw.so
/usr/%{_lib}/gstreamer-0.10/libgstmultifilesink.so
/usr/%{_lib}/gstreamer-0.10/libgstmultipart.so
/usr/%{_lib}/gstreamer-0.10/libgstnavigationtest.so
/usr/%{_lib}/gstreamer-0.10/libgstogg.so
/usr/%{_lib}/gstreamer-0.10/libgstoptgthreadscheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstoptomegascheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstoptscheduler.so
/usr/%{_lib}/gstreamer-0.10/libgstossaudio.so
/usr/%{_lib}/gstreamer-0.10/libgstoverlay.so
/usr/%{_lib}/gstreamer-0.10/libgstpassthrough.so
/usr/%{_lib}/gstreamer-0.10/libgstplaybin.so
/usr/%{_lib}/gstreamer-0.10/libgstplayondemand.so
/usr/%{_lib}/gstreamer-0.10/libgstpng.so
/usr/%{_lib}/gstreamer-0.10/libgstpuzzle.so
/usr/%{_lib}/gstreamer-0.10/libgstqtdemux.so
/usr/%{_lib}/gstreamer-0.10/libgstresample.so
/usr/%{_lib}/gstreamer-0.10/libgstrfbsrc.so
/usr/%{_lib}/gstreamer-0.10/libgstriff.so
/usr/%{_lib}/gstreamer-0.10/libgstrmdemux.so
/usr/%{_lib}/gstreamer-0.10/libgstrtjpeg.so
/usr/%{_lib}/gstreamer-0.10/libgstrtp.so
/usr/%{_lib}/gstreamer-0.10/libgstsdlvideosink.so
/usr/%{_lib}/gstreamer-0.10/libgstsilence.so
/usr/%{_lib}/gstreamer-0.10/libgstsinesrc.so
/usr/%{_lib}/gstreamer-0.10/libgstsmooth.so
/usr/%{_lib}/gstreamer-0.10/libgstsmoothwave.so
/usr/%{_lib}/gstreamer-0.10/libgstsmpte.so
/usr/%{_lib}/gstreamer-0.10/libgstsnapshot.so
/usr/%{_lib}/gstreamer-0.10/libgstspectrum.so
/usr/%{_lib}/gstreamer-0.10/libgstspeed.so
/usr/%{_lib}/gstreamer-0.10/libgstspeex.so
/usr/%{_lib}/gstreamer-0.10/libgstspider.so
/usr/%{_lib}/gstreamer-0.10/libgststereo.so
/usr/%{_lib}/gstreamer-0.10/libgstsubparse.so
/usr/%{_lib}/gstreamer-0.10/libgstswitch.so
/usr/%{_lib}/gstreamer-0.10/libgstsynaesthesia.so
/usr/%{_lib}/gstreamer-0.10/libgsttagedit.so
/usr/%{_lib}/gstreamer-0.10/libgsttcp.so
/usr/%{_lib}/gstreamer-0.10/libgsttextoverlay.so
/usr/%{_lib}/gstreamer-0.10/libgsttheora.so
/usr/%{_lib}/gstreamer-0.10/libgsttimeoverlay.so
/usr/%{_lib}/gstreamer-0.10/libgsttrm.so
/usr/%{_lib}/gstreamer-0.10/libgsttta.so
/usr/%{_lib}/gstreamer-0.10/libgsttypefindfunctions.so
/usr/%{_lib}/gstreamer-0.10/libgstudp.so
/usr/%{_lib}/gstreamer-0.10/libgstvbidec.so
/usr/%{_lib}/gstreamer-0.10/libgstvcdsrc.so
/usr/%{_lib}/gstreamer-0.10/libgstvideobalance.so
/usr/%{_lib}/gstreamer-0.10/libgstvideobox.so
/usr/%{_lib}/gstreamer-0.10/libgstvideocrop.so
/usr/%{_lib}/gstreamer-0.10/libgstvideodrop.so
/usr/%{_lib}/gstreamer-0.10/libgstvideofilter.so
/usr/%{_lib}/gstreamer-0.10/libgstvideoflip.so
/usr/%{_lib}/gstreamer-0.10/libgstvideomixer.so
/usr/%{_lib}/gstreamer-0.10/libgstvideorate.so
/usr/%{_lib}/gstreamer-0.10/libgstvideoscale.so
/usr/%{_lib}/gstreamer-0.10/libgstvideo.so
/usr/%{_lib}/gstreamer-0.10/libgstvideotestsrc.so
/usr/%{_lib}/gstreamer-0.10/libgstvideo4linux.so
/usr/%{_lib}/gstreamer-0.10/libgstvideo4linux2.so
/usr/%{_lib}/gstreamer-0.10/libgstvolenv.so
/usr/%{_lib}/gstreamer-0.10/libgstvolume.so
/usr/%{_lib}/gstreamer-0.10/libgstvorbis.so
/usr/%{_lib}/gstreamer-0.10/libgstwavenc.so
/usr/%{_lib}/gstreamer-0.10/libgstwavparse.so
/usr/%{_lib}/gstreamer-0.10/libgstximagesink.so
/usr/%{_lib}/gstreamer-0.10/libgstxvimagesink.so
/usr/%{_lib}/gstreamer-0.10/libgstxwindowlistener.so
/usr/%{_lib}/gstreamer-0.10/libgsty4menc.so
/usr/%{_lib}/gstreamer-0.10/libgst1394.so
/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so
/usr/%{_lib}/libaudiofile.so.0
/usr/%{_lib}/libbeecrypt.so.6
/usr/%{_lib}/libbonoboui-2.so.0
/usr/%{_lib}/libcamel-provider-1.2.so.8
/usr/%{_lib}/libcamel-1.2.so.0
/usr/%{_lib}/libebook-1.2.so.5
/usr/%{_lib}/libecal-1.2.so.3
/usr/%{_lib}/libedata-book-1.2.so.2
/usr/%{_lib}/libedata-cal-1.2.so.1
/usr/%{_lib}/libedataserverui-1.2.so.8
/usr/%{_lib}/libedataserver-1.2.so.6
/usr/%{_lib}/libeel-2.so.2
/usr/%{_lib}/libegroupwise-1.2.so.9
/usr/%{_lib}/libelf.so.1
/usr/%{_lib}/libesd.so.0
/usr/%{_lib}/libexif.so.12
/usr/%{_lib}/libfam.so.0
/usr/%{_lib}/libfontenc.so.1
/usr/%{_lib}/libgailutil.so.17
/usr/%{_lib}/libgal-a11y-2.4.so.0
/usr/%{_lib}/libgal-2.4.so.0
/usr/%{_lib}/libgcrypt.so.11
/usr/%{_lib}/libglade-2.0.so.0
/usr/%{_lib}/libgnomecups-1.0.so.1
/usr/%{_lib}/libgnome-desktop-2.so.2
/usr/%{_lib}/libgnome-keyring.so.0
/usr/%{_lib}/libgnome-menu.so.2
/usr/%{_lib}/libgnomeprintui-2-2.so.0
/usr/%{_lib}/libgnomeprint-2-2.so.0
/usr/%{_lib}/libgnomeui-2.so.0
/usr/%{_lib}/libgnome-window-settings.so.1
/usr/%{_lib}/libgnome-2.so.0
/usr/%{_lib}/libgnutls.so.12
/usr/%{_lib}/libgpg-error.so.0
/usr/lib/libgssapi_krb5.so.2
/usr/%{_lib}/libgstinterfaces-0.8.so.0
/usr/%{_lib}/libgstreamer-0.10.so.1
/usr/%{_lib}/libgtkhtml-2.so.0
/usr/%{_lib}/libIDL-2.so.0
/usr/%{_lib}/libjpeg.so.62
/usr/lib/libkrb5.so.3
/usr/lib/libkrb5support.so.0
/usr/lib/libk5crypto.so.3
/usr/%{_lib}/libmetacity-private.so.0
/usr/%{_lib}/libnautilus-extension.so.1
/usr/%{_lib}/libnautilus-private.so.2
/usr/%{_lib}/libneon.so.25
/usr/%{_lib}/libnspr4.so
/usr/lib/libnssckbi.so
/usr/lib/libnss3.so
/usr/%{_lib}/libnss3.so
/usr/%{_lib}/libORBit-imodule-2.so.0
/usr/%{_lib}/libpanel-applet-2.so.0
/usr/%{_lib}/libplc4.so
/usr/%{_lib}/libplds4.so
/usr/%{_lib}/librpmbuild-4.4.so
/usr/%{_lib}/librpmdb-4.4.so
/usr/%{_lib}/librpmio-4.4.so
/usr/%{_lib}/librpm-4.4.so
/usr/%{_lib}/libsmime3.so
/usr/%{_lib}/libsoftokn3.so
/usr/%{_lib}/libsoup-2.2.so.8
/usr/%{_lib}/libsqlite3.so.0
/usr/%{_lib}/libssl3.so
/usr/%{_lib}/libstartup-notification-1.so.0
/usr/%{_lib}/libstdc++.so.6
/usr/%{_lib}/libwnck-1.so.16
/usr/%{_lib}/libxklavier.so.10
/usr/%{_lib}/libXmu.so.6
/usr/%{_lib}/libXRes.so.1
/usr/%{_lib}/libXss.so.1
/usr/%{_lib}/libXt.so.6
/usr/%{_lib}/libXxf86misc.so.1
/usr/%{_lib}/libXxf86vm.so.1
/usr/lib/libz.so.1
/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-burn-extension.so
/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fileroller.so
/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fontilus.so
/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-themus.so
/usr/lib/openoffice.org2.0/program/javaldx
/usr/lib/openoffice.org2.0/program/pagein
/usr/lib/openoffice.org2.0/program/soffice
/usr/lib/openoffice.org2.0/program/soffice.bin
/usr/%{_lib}/orbit-2.0/Bonobo_module.so
/usr/%{_lib}/python2.4/atexit.py
/usr/%{_lib}/python2.4/atexit.pyc
/usr/%{_lib}/python2.4/base64.py
/usr/%{_lib}/python2.4/base64.pyc
/usr/%{_lib}/python2.4/bisect.py
/usr/%{_lib}/python2.4/bisect.pyc
/usr/%{_lib}/python2.4/calendar.py
/usr/%{_lib}/python2.4/calendar.pyc
/usr/%{_lib}/python2.4/codecs.pyc
/usr/%{_lib}/python2.4/cookielib.py
/usr/%{_lib}/python2.4/cookielib.pyc
/usr/%{_lib}/python2.4/copy.pyc
/usr/%{_lib}/python2.4/copy_reg.pyc
/usr/%{_lib}/python2.4/dis.pyc
/usr/%{_lib}/python2.4/encodings/aliases.pyc
/usr/%{_lib}/python2.4/encodings/ascii.py
/usr/%{_lib}/python2.4/encodings/ascii.pyc
/usr/%{_lib}/python2.4/encodings/idna.py
/usr/%{_lib}/python2.4/encodings/idna.pyc
/usr/%{_lib}/python2.4/encodings/__init__.pyc
/usr/%{_lib}/python2.4/encodings/latin_1.pyc
/usr/%{_lib}/python2.4/encodings/utf_8.py
/usr/%{_lib}/python2.4/encodings/utf_8.pyc
/usr/%{_lib}/python2.4/fnmatch.pyc
/usr/%{_lib}/python2.4/ftplib.py
/usr/%{_lib}/python2.4/ftplib.pyc
/usr/%{_lib}/python2.4/gettext.pyc
/usr/%{_lib}/python2.4/glob.pyc
/usr/%{_lib}/python2.4/gopherlib.py
/usr/%{_lib}/python2.4/gopherlib.pyc
/usr/%{_lib}/python2.4/gzip.py
/usr/%{_lib}/python2.4/gzip.pyc
/usr/%{_lib}/python2.4/httplib.py
/usr/%{_lib}/python2.4/httplib.pyc
/usr/%{_lib}/python2.4/inspect.pyc
/usr/%{_lib}/python2.4/keyword.py
/usr/%{_lib}/python2.4/keyword.pyc
/usr/%{_lib}/python2.4/lib-dynload/arraymodule.so
/usr/%{_lib}/python2.4/lib-dynload/binascii.so
/usr/%{_lib}/python2.4/lib-dynload/_bisect.so
/usr/%{_lib}/python2.4/lib-dynload/collectionsmodule.so
/usr/%{_lib}/python2.4/lib-dynload/datetime.so
/usr/%{_lib}/python2.4/lib-dynload/fcntlmodule.so
/usr/%{_lib}/python2.4/lib-dynload/mathmodule.so
/usr/%{_lib}/python2.4/lib-dynload/md5module.so
/usr/%{_lib}/python2.4/lib-dynload/operator.so
/usr/%{_lib}/python2.4/lib-dynload/_randommodule.so
/usr/%{_lib}/python2.4/lib-dynload/selectmodule.so
/usr/%{_lib}/python2.4/lib-dynload/shamodule.so
/usr/%{_lib}/python2.4/lib-dynload/_socketmodule.so
/usr/%{_lib}/python2.4/lib-dynload/_ssl.so
/usr/%{_lib}/python2.4/lib-dynload/unicodedata.so
/usr/%{_lib}/python2.4/linecache.pyc
/usr/%{_lib}/python2.4/locale.pyc
/usr/%{_lib}/python2.4/logging/__init__.py
/usr/%{_lib}/python2.4/logging/__init__.pyc
/usr/%{_lib}/python2.4/_LWPCookieJar.py
/usr/%{_lib}/python2.4/_LWPCookieJar.pyc
/usr/%{_lib}/python2.4/mimetools.py
/usr/%{_lib}/python2.4/mimetools.pyc
/usr/%{_lib}/python2.4/mimetypes.py
/usr/%{_lib}/python2.4/mimetypes.pyc
/usr/%{_lib}/python2.4/_MozillaCookieJar.py
/usr/%{_lib}/python2.4/_MozillaCookieJar.pyc
/usr/%{_lib}/python2.4/opcode.pyc
/usr/%{_lib}/python2.4/os.pyc
/usr/%{_lib}/python2.4/popen2.py
/usr/%{_lib}/python2.4/popen2.pyc
/usr/%{_lib}/python2.4/posixpath.pyc
/usr/%{_lib}/python2.4/random.py
/usr/%{_lib}/python2.4/random.pyc
/usr/%{_lib}/python2.4/re.pyc
/usr/%{_lib}/python2.4/rfc822.py
/usr/%{_lib}/python2.4/rfc822.pyc
/usr/%{_lib}/python2.4/shelve.py
/usr/%{_lib}/python2.4/shelve.pyc
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/atk.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/activation.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/_bonobo.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.py
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/ui.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomecanvas.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/_gnome.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.py
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/ui.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomevfs.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gobject.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/glade.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/_gtk.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtkhtml2.so
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.py
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.py
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.pyc
/usr/%{_lib}/python2.4/site-packages/gtk-2.0/pango.so
/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/japanese/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/OpenSSL/crypto.so
/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.py
/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/OpenSSL/rand.so
/usr/%{_lib}/python2.4/site-packages/OpenSSL/SSL.so
/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.py
/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.pyc
/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.py
/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.pyc
/usr/%{_lib}/python2.4/site-packages/ORBit.so
/usr/lib/python2.4/site-packages/rhn/connections.py
/usr/lib/python2.4/site-packages/rhn/connections.pyc
/usr/lib/python2.4/site-packages/rhn/__init__.py
/usr/lib/python2.4/site-packages/rhn/__init__.pyc
/usr/lib/python2.4/site-packages/rhn/nonblocking.py
/usr/lib/python2.4/site-packages/rhn/nonblocking.pyc
/usr/lib/python2.4/site-packages/rhn/rpclib.py
/usr/lib/python2.4/site-packages/rhn/rpclib.pyc
/usr/lib/python2.4/site-packages/rhn/SmartIO.py
/usr/lib/python2.4/site-packages/rhn/SmartIO.pyc
/usr/lib/python2.4/site-packages/rhn/SSL.py
/usr/lib/python2.4/site-packages/rhn/SSL.pyc
/usr/lib/python2.4/site-packages/rhn/transports.py
/usr/lib/python2.4/site-packages/rhn/transports.pyc
/usr/lib/python2.4/site-packages/rhn/UserDictCase.py
/usr/lib/python2.4/site-packages/rhn/UserDictCase.pyc
/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.pyc
/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyc
/usr/%{_lib}/python2.4/site-packages/rpm/__init__.py
/usr/%{_lib}/python2.4/site-packages/rpm/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/rpm/_rpmmodule.so
/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.py
/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.pyc
/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.py
/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.pyc
/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/pyexpat.so
/usr/%{_lib}/python2.4/site.pyc
/usr/%{_lib}/python2.4/socket.py
/usr/%{_lib}/python2.4/socket.pyc
/usr/%{_lib}/python2.4/sre_compile.pyc
/usr/%{_lib}/python2.4/sre_constants.pyc
/usr/%{_lib}/python2.4/sre_parse.pyc
/usr/%{_lib}/python2.4/sre.pyc
/usr/%{_lib}/python2.4/stat.pyc
/usr/%{_lib}/python2.4/StringIO.py
/usr/%{_lib}/python2.4/StringIO.pyc
/usr/%{_lib}/python2.4/stringprep.py
/usr/%{_lib}/python2.4/stringprep.pyc
/usr/%{_lib}/python2.4/string.pyc
/usr/%{_lib}/python2.4/tempfile.py
/usr/%{_lib}/python2.4/tempfile.pyc
/usr/%{_lib}/python2.4/threading.py
/usr/%{_lib}/python2.4/threading.pyc
/usr/%{_lib}/python2.4/tokenize.pyc
/usr/%{_lib}/python2.4/token.pyc
/usr/%{_lib}/python2.4/traceback.py
/usr/%{_lib}/python2.4/traceback.pyc
/usr/%{_lib}/python2.4/types.pyc
/usr/%{_lib}/python2.4/urllib.py
/usr/%{_lib}/python2.4/urllib.pyc
/usr/%{_lib}/python2.4/urllib2.py
/usr/%{_lib}/python2.4/urllib2.pyc
/usr/%{_lib}/python2.4/urlparse.py
/usr/%{_lib}/python2.4/urlparse.pyc
/usr/%{_lib}/python2.4/UserDict.pyc
/usr/%{_lib}/python2.4/warnings.pyc
/usr/%{_lib}/python2.4/xml/__init__.pyc
/usr/%{_lib}/python2.4/xmlrpclib.py
/usr/%{_lib}/python2.4/xmlrpclib.pyc
/usr/lib/rpm/%{_arch}-linux/macros
/usr/lib/rpm/macros
/usr/lib/rpm/redhat/macros
/usr/lib/rpm/redhat/rpmrc
/usr/lib/rpm/rpmrc
/usr/%{_lib}/X11/app-defaults/XScreenSaver
/usr/sbin/lpc
/usr/share/applications/defaults.list
/usr/share/applications/gnome-nautilus-computer.desktop
/usr/share/applications/gnome-nautilus-home.desktop
/usr/share/applications/gnome-search-tool.desktop
/usr/share/applications/mimeinfo.cache
/usr/share/applications/mozilla-firefox.desktop
/usr/share/backgrounds/images/default.png
/usr/share/control-center-2.0/xrdb/Editres.ad
/usr/share/control-center-2.0/xrdb/Emacs.ad
/usr/share/control-center-2.0/xrdb/General.ad
/usr/share/control-center-2.0/xrdb/Motif.ad
/usr/share/control-center-2.0/xrdb/Tk.ad
/usr/share/control-center-2.0/xrdb/Xaw.ad
/usr/share/doc/HTML/css/content.css
/usr/share/doc/HTML/css/docbook.css
/usr/share/doc/HTML/css/layout.css
/usr/share/doc/HTML/css/print.css
/usr/share/doc/HTML/img/corner-bl.png
/usr/share/doc/HTML/img/corner-br.png
/usr/share/doc/HTML/img/corner-tl.png
/usr/share/doc/HTML/img/corner-tr.png
/usr/share/doc/HTML/img/header-download.png
/usr/share/doc/HTML/img/header-faq.png
/usr/share/doc/HTML/img/header-fedora_logo.png
/usr/share/doc/HTML/img/header-projects.png
/usr/share/doc/HTML/index.html
/usr/share/eggcups/icon.png
/usr/share/evolution-data-server-1.6/zoneinfo/America/New_York.ics
/usr/share/evolution-data-server-1.6/zoneinfo/zones.tab
/usr/share/evolution/2.6/etspec/message-list.etspec
/usr/share/evolution/2.6/images/offline.png
/usr/share/evolution/2.6/images/online.png
/usr/share/evolution/2.6/searchtypes.xml
/usr/share/evolution/2.6/ui/evolution-mail-global.xml
/usr/share/evolution/2.6/ui/evolution-mail-list.xml
/usr/share/evolution/2.6/ui/evolution-mail-message.xml
/usr/share/evolution/2.6/ui/evolution.xml
/usr/share/evolution/2.6/vfoldertypes.xml
/usr/share/fonts/bitstream-vera/VeraIt.ttf
/usr/share/fonts/default/Type1/n021003l.pfb
/usr/share/gdm/BuiltInSessions/default.desktop
/usr/share/gnome/default.session
/usr/share/gnome-panelrc
/usr/share/gnome-2.0/ui/GNOME_ClockApplet.xml
/usr/share/gnome-2.0/ui/GNOME_MixerApplet.xml
/usr/share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
/usr/share/gnome-2.0/ui/GNOME_Panel_Popup.xml
/usr/share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
/usr/share/gnome-2.0/ui/GNOME_WindowListApplet.xml
/usr/share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
/usr/share/gtkhtml-3.8/keybindingsrc.emacs
/usr/share/icons/Bluecurve/cursors/arrow
/usr/share/icons/Bluecurve/cursors/bottom_right_corner
/usr/share/icons/Bluecurve/cursors/crosshair
/usr/share/icons/Bluecurve/cursors/fleur
/usr/share/icons/Bluecurve/cursors/hand2
/usr/share/icons/Bluecurve/cursors/sb_h_double_arrow
/usr/share/icons/Bluecurve/cursors/sb_v_double_arrow
/usr/share/icons/Bluecurve/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
/usr/share/icons/Bluecurve/icon-theme.cache
/usr/share/icons/Bluecurve/16x16/apps/gnome-panel.png
/usr/share/icons/Bluecurve/16x16/apps/gnome-settings.png
/usr/share/icons/Bluecurve/16x16/apps/openofficeorg-writer.png
/usr/share/icons/Bluecurve/16x16/apps/redhat-email.png
/usr/share/icons/Bluecurve/16x16/apps/redhat-web-browser.png
/usr/share/icons/Bluecurve/16x16/filesystems/gnome-fs-desktop.png
/usr/share/icons/Bluecurve/16x16/filesystems/gnome-fs-directory.icon
/usr/share/icons/Bluecurve/16x16/filesystems/gnome-fs-directory.png
/usr/share/icons/Bluecurve/16x16/stock/gtk-close.png
/usr/share/icons/Bluecurve/16x16/stock/gtk-jump-to-ltr.png
/usr/share/icons/Bluecurve/24x24/apps/gnome-panel.png
/usr/share/icons/Bluecurve/24x24/apps/openofficeorg-calc.png
/usr/share/icons/Bluecurve/24x24/apps/openofficeorg-impress.png
/usr/share/icons/Bluecurve/24x24/apps/openofficeorg-writer.png
/usr/share/icons/Bluecurve/24x24/apps/redhat-email.png
/usr/share/icons/Bluecurve/24x24/apps/redhat-web-browser.png
/usr/share/icons/Bluecurve/24x24/filesystems/gnome-fs-desktop.png
/usr/share/icons/Bluecurve/24x24/filesystems/gnome-fs-directory.icon
/usr/share/icons/Bluecurve/24x24/filesystems/gnome-fs-directory.png
/usr/share/icons/Bluecurve/24x24/stock/gtk-delete.png
/usr/share/icons/Bluecurve/24x24/stock/gtk-home.png
/usr/share/icons/Bluecurve/24x24/stock/gtk-print.png
/usr/share/icons/Bluecurve/24x24/stock/gtk-stop.png
/usr/share/icons/Bluecurve/24x24/stock/stock_volume-max.png
/usr/share/icons/Bluecurve/24x24/stock/stock_volume-med.png
/usr/share/icons/Bluecurve/24x24/stock/stock_volume-min.png
/usr/share/icons/Bluecurve/24x24/stock/stock_volume-mute.png
/usr/share/icons/Bluecurve/24x24/stock/stock_volume-0.png
/usr/share/icons/Bluecurve/32x32/apps/gnome-panel.png
/usr/share/icons/Bluecurve/32x32/filesystems/gnome-fs-desktop.png
/usr/share/icons/Bluecurve/36x36/apps/gnome-panel.png
/usr/share/icons/Bluecurve/36x36/filesystems/gnome-fs-desktop.png
/usr/share/icons/Bluecurve/48x48/apps/gnome-logo-icon-transparent.png
/usr/share/icons/Bluecurve/48x48/apps/gnome-panel.png
/usr/share/icons/Bluecurve/48x48/apps/gnome-window-manager.png
/usr/share/icons/Bluecurve/48x48/apps/printer.png
/usr/share/icons/Bluecurve/48x48/apps/up2date.png
/usr/share/icons/Bluecurve/48x48/devices/gnome-dev-cdrom.icon
/usr/share/icons/Bluecurve/48x48/devices/gnome-dev-cdrom.png
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-client.png
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-desktop.png
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-directory.icon
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-directory.png
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-home.icon
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-home.png
/usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-trash-empty.png
/usr/share/icons/Bluecurve/48x48/stock/stock_volume-max.png
/usr/share/icons/Bluecurve/48x48/stock/stock_volume-med.png
/usr/share/icons/Bluecurve/48x48/stock/stock_volume-min.png
/usr/share/icons/Bluecurve/48x48/stock/stock_volume-mute.png
/usr/share/icons/Bluecurve/48x48/stock/stock_volume-0.png
/usr/share/icons/Bluecurve/96x96/filesystems/gnome-fs-directory.icon
/usr/share/icons/Bluecurve/96x96/filesystems/gnome-fs-directory.png
/usr/share/icons/Clearlooks/icon-theme.cache
/usr/share/icons/Clearlooks/index.theme
/usr/share/icons/Clearlooks/24x24/gtk/gtk-go-back-ltr.png
/usr/share/icons/Clearlooks/24x24/gtk/gtk-go-forward-ltr.png
/usr/share/icons/Clearlooks/24x24/gtk/gtk-refresh.png
/usr/share/icons/gnome/icon-theme.cache
/usr/share/icons/hicolor/icon-theme.cache
/usr/share/icons/hicolor/index.theme
/usr/share/icons/hicolor/16x16/stock/document/stock_attach.png
/usr/share/icons/hicolor/16x16/stock/document/stock_task.png
/usr/share/icons/hicolor/16x16/stock/document/stock_todo.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_calendar.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_copy.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_cut.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_delete.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_folder.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_folder-properties.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_new-appointment.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_new-dir.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_new-meeting.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_paste.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-higher.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-highest.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-high.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-lower.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-lowest.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-low.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_score-normal.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_search.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_show-all.png
/usr/share/icons/hicolor/16x16/stock/generic/stock_undelete.png
/usr/share/icons/hicolor/16x16/stock/io/stock_print.png
/usr/share/icons/hicolor/16x16/stock/io/stock_print-preview.png
/usr/share/icons/hicolor/16x16/stock/io/stock_save-as.png
/usr/share/icons/hicolor/16x16/stock/net/stock_addressbook.png
/usr/share/icons/hicolor/16x16/stock/net/stock_contact-list.png
/usr/share/icons/hicolor/16x16/stock/net/stock_contact.png
/usr/share/icons/hicolor/16x16/stock/net/stock_disconnect.png
/usr/share/icons/hicolor/16x16/stock/net/stock_inbox.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-compose.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-copy.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-filters-apply.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup-done.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-flag-for-followup.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-forward.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-hide-read.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-hide-selected.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-import.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-move.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-open-multiple.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-open.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-priority-high.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-replied.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-reply.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-reply-to-all.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-send-receive.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-unread-multiple.png
/usr/share/icons/hicolor/16x16/stock/net/stock_mail-unread.png
/usr/share/icons/hicolor/16x16/stock/net/stock_not-spam.png
/usr/share/icons/hicolor/16x16/stock/net/stock_outbox.png
/usr/share/icons/hicolor/16x16/stock/net/stock_shared-by-me.png
/usr/share/icons/hicolor/16x16/stock/net/stock_shared-to-me.png
/usr/share/icons/hicolor/16x16/stock/net/stock_spam.png
/usr/share/icons/hicolor/16x16/stock/object/stock_bookmark.png
/usr/share/icons/hicolor/16x16/stock/object/stock_new-window.png
/usr/share/icons/hicolor/24x24/stock/document/stock_todo.png
/usr/share/icons/hicolor/24x24/stock/generic/stock_calendar.png
/usr/share/icons/hicolor/24x24/stock/generic/stock_delete.png
/usr/share/icons/hicolor/24x24/stock/io/stock_print.png
/usr/share/icons/hicolor/24x24/stock/navigation/stock_next.png
/usr/share/icons/hicolor/24x24/stock/navigation/stock_previous.png
/usr/share/icons/hicolor/24x24/stock/net/stock_addressbook.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-copy.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-forward.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-move.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-reply.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-reply-to-all.png
/usr/share/icons/hicolor/24x24/stock/net/stock_mail-send-receive.png
/usr/share/icons/hicolor/24x24/stock/net/stock_not-spam.png
/usr/share/icons/hicolor/24x24/stock/net/stock_spam.png
/usr/share/icons/hicolor/32x32/stock/net/stock_mail.png
/usr/share/icons/hicolor/48x48/stock/net/stock_mail.png
/usr/share/locale/en_US/cups_en_US
/usr/share/man/man1/firefox.1.gz
/usr/share/mime/aliases
/usr/share/mime/application/octet-stream.xml
/usr/share/mime/globs
/usr/share/mime/magic
/usr/share/mime/subclasses
/usr/share/nautilus/ui/nautilus-desktop-icon-view-ui.xml
/usr/share/nautilus/ui/nautilus-directory-view-ui.xml
/usr/share/nautilus/ui/nautilus-icon-view-ui.xml
/usr/share/nautilus/ui/nautilus-shell-ui.xml
/usr/share/nautilus/ui/nautilus-spatial-window-ui.xml
/usr/share/pixmaps/applet-busy.png
/usr/share/pixmaps/applet-critical-blank.png
/usr/share/pixmaps/applet-critical.png
/usr/share/pixmaps/applet-disconnect.png
/usr/share/pixmaps/applet-error.png
/usr/share/pixmaps/applet-okay.png
/usr/share/pixmaps/badge-small.png
/usr/share/pixmaps/firefox.png
/usr/share/pixmaps/keyring.png
/usr/share/pixmaps/nautilus/text-selection-frame.png
/usr/share/pixmaps/nautilus/thumbnail_frame.png
/usr/share/pixmaps/splash/gnome-splash.png
/usr/share/rhn/rhn_applet/applet.py
/usr/share/rhn/rhn_applet/eggtrayiconmodule.so
/usr/share/rhn/rhn_applet/rhn_applet_animation.py
/usr/share/rhn/rhn_applet/rhn_applet_animation.pyc
/usr/share/rhn/rhn_applet/rhn_applet_apt.py
/usr/share/rhn/rhn_applet/rhn_applet_apt.pyc
/usr/share/rhn/rhn_applet/rhn_applet_dialogs.py
/usr/share/rhn/rhn_applet/rhn_applet_dialogs.pyc
/usr/share/rhn/rhn_applet/rhn_applet_model.py
/usr/share/rhn/rhn_applet/rhn_applet_model.pyc
/usr/share/rhn/rhn_applet/rhn_applet_protocols.py
/usr/share/rhn/rhn_applet/rhn_applet_protocols.pyc
/usr/share/rhn/rhn_applet/rhn_applet.py
/usr/share/rhn/rhn_applet/rhn_applet.pyc
/usr/share/rhn/rhn_applet/rhn_applet_rpc.py
/usr/share/rhn/rhn_applet/rhn_applet_rpc.pyc
/usr/share/rhn/rhn_applet/rhn_applet_rpm.py
/usr/share/rhn/rhn_applet/rhn_applet_rpm.pyc
/usr/share/rhn/rhn_applet/rhn_applet_source.py
/usr/share/rhn/rhn_applet/rhn_applet_version.py
/usr/share/rhn/rhn_applet/rhn_applet_version.pyc
/usr/share/rhn/rhn_applet/rhn_applet_yum.py
/usr/share/rhn/rhn_applet/rhn_applet_yum.pyc
/usr/share/rhn/rhn_applet/rhn_sources.py
/usr/share/rhn/rhn_applet/rhn_sources.pyc
/usr/share/rhn/rhn_applet/rhn_utils.py
/usr/share/rhn/rhn_applet/rhn_utils.pyc
/usr/share/rhn/up2date_client/capabilities.py
/usr/share/rhn/up2date_client/capabilities.pyc
/usr/share/rhn/up2date_client/clientCaps.py
/usr/share/rhn/up2date_client/clientCaps.pyc
/usr/share/rhn/up2date_client/config.py
/usr/share/rhn/up2date_client/config.pyc
/usr/share/rhn/up2date_client/distrotype.py
/usr/share/rhn/up2date_client/distrotype.pyc
/usr/share/rhn/up2date_client/gpgUtils.py
/usr/share/rhn/up2date_client/gpgUtils.pyc
/usr/share/rhn/up2date_client/__init__.py
/usr/share/rhn/up2date_client/__init__.pyc
/usr/share/rhn/up2date_client/repoBackends/__init__.py
/usr/share/rhn/up2date_client/repoBackends/__init__.pyc
/usr/share/rhn/up2date_client/repoBackends/urlUtils.py
/usr/share/rhn/up2date_client/repoBackends/urlUtils.pyc
/usr/share/rhn/up2date_client/repoDirector.py
/usr/share/rhn/up2date_client/repoDirector.pyc
/usr/share/rhn/up2date_client/rhnErrata.py
/usr/share/rhn/up2date_client/rhnErrata.pyc
/usr/share/rhn/up2date_client/rhnChannel.py
/usr/share/rhn/up2date_client/rhnChannel.pyc
/usr/share/rhn/up2date_client/rpcServer.py
/usr/share/rhn/up2date_client/rpcServer.pyc
/usr/share/rhn/up2date_client/rpmUtils.py
/usr/share/rhn/up2date_client/rpmUtils.pyc
/usr/share/rhn/up2date_client/sourcesConfig.py
/usr/share/rhn/up2date_client/sourcesConfig.pyc
/usr/share/rhn/up2date_client/transaction.py
/usr/share/rhn/up2date_client/transaction.pyc
/usr/share/rhn/up2date_client/up2dateAuth.py
/usr/share/rhn/up2date_client/up2dateAuth.pyc
/usr/share/rhn/up2date_client/up2dateErrors.py
/usr/share/rhn/up2date_client/up2dateErrors.pyc
/usr/share/rhn/up2date_client/up2dateLog.py
/usr/share/rhn/up2date_client/up2dateLog.pyc
/usr/share/rhn/up2date_client/up2dateMessages.py
/usr/share/rhn/up2date_client/up2dateMessages.pyc
/usr/share/rhn/up2date_client/up2dateUtils.py
/usr/share/rhn/up2date_client/up2dateUtils.pyc
/usr/share/rhn/up2date_client/urlMirrors.py
/usr/share/rhn/up2date_client/urlMirrors.pyc
/usr/share/rhn/up2date_client/wrapperUtils.py
/usr/share/rhn/up2date_client/wrapperUtils.pyc
/usr/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
/usr/share/themes/Default/gtk-2.0-key/gtkrc
/usr/share/themes/Raleigh/gtk/gtkrc
/usr/share/zoneinfo/UTC


***** Error reading new file: [Errno 2] No such file or directory: 'readahead-check'

--- NEW FILE readahead_early ---
#!/bin/sh
#
# readahead:	Prereads programs required for startup into memory
#
# chkconfig: 2345 4 99
# description:  This service causes the programs used during startup \
#		to be loaded into memory before they are needed,\
#		thus improving startup performance 
#
#

# Sanity checks.
[ -x /usr/sbin/readahead ] || exit 0

# Check for > 384 MB
free -m | gawk '/Mem:/ {exit ($2 >= 384)?0:1}' || exit 0

# Source function library.
. /etc/rc.d/init.d/functions

start() {
    echo -n $"Starting background readahead: "
    FILES=$( ls /etc/readahead.d/*.early )
    /usr/sbin/readahead $FILES >/dev/null &
    echo_success
    echo
}

stop() {
   /bin/true
}

# See how we were called.
case "$1" in
    start)
	start
	;;
    stop)
	stop
	;;
    status)
        ;;
    restart)
	stop
	start
	;;
    condrestart)
	;;
    reload)
        ;;
    *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
	;;
esac
exit $RETVAL


--- NEW FILE readahead_later ---
#!/bin/sh
#
# readahead:	Prereads programs required for startup into memory
#
# chkconfig: 5 96 99
# description:  This service causes the programs used during startup \
#		to be loaded into memory before they are needed,\
#		thus improving startup performance 
#
#

# Sanity checks.
[ -x /usr/sbin/readahead ] || exit 0

# Check for > 384 MB
free -m | gawk '/Mem:/ {exit ($2 >= 384)?0:1}' || exit 0

# Source function library.
. /etc/rc.d/init.d/functions

start() {
    echo -n $"Starting background readahead: "
    FILES=$( ls /etc/readahead.d/*.later )
    /usr/sbin/readahead $FILES >/dev/null &
    echo_success
    echo
}


stop() {
   /bin/true
}

# See how we were called.
case "$1" in
    start)
	start
	;;
    stop)
	stop
	;;
    status)
        ;;
    restart)
	stop
	start
	;;
    condrestart)
	;;
    reload)
        ;;
    *)
	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
	;;
esac
exit $RETVAL


Index: readahead.c
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readahead.c	19 May 2005 02:06:19 -0000	1.2
+++ readahead.c	19 Jul 2006 22:47:58 -0000	1.3
@@ -252,10 +252,12 @@
 
 	/*
 	 * Stat each file.  Sorting by path should offer least directory block
-	 * seeking.
+	 * seeking and ignore duplicate files.
 	 */
 	qsort(files, file_count, sizeof(struct file), comp_files_path);
 	for (i=0; i<file_count; i++) {
+		if (i && strcmp(files[i].path, files[i-1].path)==0) 
+			continue;
 		process_file(&files[i], devices, &dev_count, 0);
 		total_size += files[i].size;
 	}


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- readahead.spec	19 Jul 2006 15:01:42 -0000	1.28
+++ readahead.spec	19 Jul 2006 22:47:59 -0000	1.29
@@ -1,22 +1,28 @@
 Summary:        Read a preset list of files into memory.
 Name:           readahead
-Version:        1.2
-Release:	3
+Version:        1.3
+Release:	1
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
 Source0:	readahead.c
-Source1:	readahead.init
-Source2:	readahead.files.in
-Source3:	readahead_early.init
-Source4:	readahead.early.files.in
-Source5:	COPYING
-Source6:	README
+Source2:	readahead-check
+Source4:	readahead_early
+Source5:	readahead_later
+Source6:	default.early.in
+Source7:	default.later.in
+Source8:	COPYING
+Source9:	README
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
-Prereq:		/sbin/chkconfig
-Requires:	procps /bin/awk
+
+Requires(post):	/sbin/chkconfig
+Requires(pre): 	/sbin/chkconfig
+Requires(triggerpostun): /sbin/chkconfig
+Requires:	procps /bin/gawk
+
 BuildPreReq:	e2fsprogs-devel
 BuildRequires:	pkgconfig
+
 Obsoletes:	kernel-utils
 
 %description
@@ -30,52 +36,63 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}/etc/rc.d/init.d
-mkdir -p %{buildroot}/etc/sysconfig
+mkdir -p %{buildroot}/etc/readahead.d
 gcc $RPM_OPT_FLAGS %{SOURCE0} -o readahead `pkg-config --libs ext2fs blkid`
 
-for file in %{SOURCE2} %{SOURCE4} ; do
+for file in %{SOURCE6} %{SOURCE7} ; do
   f=${file##*/}
   sed 's|%%{_lib}|%{_lib}|g; s|%%{_arch}|%{_arch}|g' $file > ${f%%.in}
 done
 
 %install
-install %{SOURCE1} %{buildroot}/etc/rc.d/init.d/readahead
-install readahead.files %{buildroot}/etc/readahead.files
-install %{SOURCE3} %{buildroot}/etc/rc.d/init.d/readahead_early
-install readahead.early.files %{buildroot}/etc/readahead.early.files
+# readahead binary
 install -m 755 readahead %{buildroot}%{_sbindir}
-cp %{SOURCE5} %{SOURCE6} .
+# init scripts
+install %{SOURCE4} %{buildroot}/etc/rc.d/init.d
+install %{SOURCE5} %{buildroot}/etc/rc.d/init.d
+# lists
+install default.early %{buildroot}/etc/readahead.d/
+install default.later %{buildroot}/etc/readahead.d/
+# docs
+[ "$RPM_SOURCE_DIR" != $(pwd) ] && cp %{SOURCE2} %{SOURCE8} %{SOURCE9} .
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -f default.early default.later
 
 %files
 %defattr(-,root,root)
-%doc COPYING README
-%attr(0644,root,root) /etc/readahead.files
-%attr(0644,root,root) /etc/readahead.early.files
+%doc COPYING README readahead-check
+%attr(0644,root,root) %{_sysconfdir}/readahead.d/default.early
+%attr(0644,root,root) %{_sysconfdir}/readahead.d/default.later
 %{_sbindir}/readahead
-/etc/rc.d/init.d/readahead
-/etc/rc.d/init.d/readahead_early
+%{_sysconfdir}/rc.d/init.d/readahead_later
+%{_sysconfdir}/rc.d/init.d/readahead_early
 
 %preun
 if [ "$1" = "0" ] ; then
- /sbin/chkconfig --del readahead
+ /sbin/chkconfig --del readahead_later
  /sbin/chkconfig --del readahead_early
 fi
 
 %post
-/sbin/chkconfig --add readahead
+/sbin/chkconfig --add readahead_later
 /sbin/chkconfig --add readahead_early
 
 %triggerpostun -- kernel-utils
-/sbin/chkconfig --add readahead
+/sbin/chkconfig --add readahead_later
 /sbin/chkconfig --add readahead_early
 exit 0
 
 
 %changelog
+* Mon Jul 20 2006 Karel Zak <kzak at redhat.com> 1:1.3-1
+- move lists of files to /etc/readahead.d
+- add readahead-check to docs
+- ignore duplicate files
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-3
 - fix release for upgrade path (by removing cvs generated release)
 


--- readahead-gen DELETED ---


--- readahead.early.files.in DELETED ---


--- readahead.files.in DELETED ---


--- readahead.init DELETED ---


--- readahead_early.init DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:57:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:57:28 -0400
Subject: rpms/perl/devel perl-5.8.8-useCFLAGSwithCC.patch, NONE,
	1.1 perl.spec, 1.96, 1.97
Message-ID: <200607192257.k6JMvS2L014578@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14544

Modified Files:
	perl.spec 
Added Files:
	perl-5.8.8-useCFLAGSwithCC.patch 
Log Message:
fix bug 199372

perl-5.8.8-useCFLAGSwithCC.patch:
 Configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-5.8.8-useCFLAGSwithCC.patch ---
--- perl-5.8.8/Configure.BAD	2006-07-17 12:43:58.000000000 -0400
+++ perl-5.8.8/Configure	2006-07-17 12:44:04.000000000 -0400
@@ -7659,7 +7659,7 @@
 			      '') dflt="$dflt +vnocompatwarnings" ;;
 			      esac
 			      ;;	
-			linux|irix*|gnu*)	dflt='-shared' ;;
+			linux|irix*|gnu*)	dflt="-shared $optimize" ;;
 			next)  dflt='none' ;;
 			solaris) dflt='-G' ;;
 			sunos) dflt='-assert nodefinitions' ;;


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- perl.spec	14 Jul 2006 21:22:06 -0000	1.96
+++ perl.spec	19 Jul 2006 22:57:26 -0000	1.97
@@ -1,1182 +0,0 @@
-%define threading  1
-%define largefiles 1
-%define suidperl   1
-
-%define multilib_64_archs x86_64 s390x ppc64 sparc64
-
-%define perlver    5.8.8
-%define perlrel    8
-%define perlepoch  4
-
-%{?!perl_debugging:    %define perl_debugging 0}
-%if %{perl_debugging}
-%define debug_package %{nil}
-# don't build debuginfo and disable stripping
-%endif
-
-Provides: perl(:WITH_PERLIO)
-
-%if %{threading}
-%define thread_arch -thread-multi
-Provides: perl(:WITH_ITHREADS)
-Provides: perl(:WITH_THREADS)
-%else
-%define thread_arch %{nil}
-Provides: perl(:WITHOUT_ITHREADS)
-Provides: perl(:WITHOUT_THREADS)
-%endif
-
-%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)
-%else
-Provides: perl(:WITHOUT_LARGEFILES)
-%endif
-
-
-Name:           perl
-Version:        %{perlver}
-Release:        %{perlrel}
-Epoch:          %{perlepoch}
-Summary:        The Perl programming language
-
-Group:          Development/Languages
-License:        Artistic or GPL
-Url:            http://www.perl.org/
-
-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
-# Patch8:         perl-5.8.0-errno.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.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
-
-# make sure we get the proper ldflags on libperl.so
-Patch17:        perl-5.8.0-sharedlinker.patch
-
-# perl 5.8.0 likes to use man3ext for BOTH directories AND files.  not kosher.
-# Patch18:        perl-5.8.0-manext.patch
-
-# lynx is deprecated, use links instead
-Patch19:        perl-5.8.8-links.patch
-
-# work around annoying rpath issue
-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
-
-# 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
-
-# CAN-2005-0155 and CAN-2005-0156 fix (now in 5.8.7!)
-# Patch27:        perl-5.8.5-CAN-2005-0155+0156.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)
-# (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
-# (now in 5.8.8!)
-# Patch32:        perl-5.8.7-IOC_SIZE.patch
-
-# arch-specific patches
-Patch100:       perl-5.8.1-fpic.patch
-Patch101:       perl-5.8.0-libdir64.patch
-
-Patch32002:     perl-5.8.0-nptlhint.patch
-
-Patch32003:     perl-5.8.6-libresolv.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 (bug still in 5.8.8!):
-Patch25084:     perl-5.8.7-25084.patch
-
-Patch172396:	perl-5.8.7-172396.patch
-
-# now in 5.8.8:
-# Patch172587:    perl-5.8.7-bz172587.patch
-
-Patch040976:	perl-5.8.8-CAN-2004-0976.patch
-
-# now in 5.8.8:
-# Patch172739:    perl-5.8.7-bz172739_obz36521.patch
-
-#Patch136009:     perl-5.8.7-MM_Unix-rpath-136009.patch
-
-# now in 5.8.8:
-#Patch174684:	perl-5.8.7-CVE-2005-3962-bz174684.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
-#
-# 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
-# Upstream patch 27284:
-Patch34:	perl-5.8.8-up27284.patch
-# Fix for bug 183553 / upstream bug 38657:
-Patch35:	perl-5.8.8-bz183553_ubz38657.patch
-#
-Patch188841:	perl-5.8.8-bz188441.patch
-#
-Patch191416:	perl-5.8.8-bz191416.patch
-
-Patch27116:	perl-5.8.8-U27116.patch
-Patch27391:     perl-5.8.8-U27391.patch
-Patch27426:	perl-5.8.8-U27426.patch
-Patch27509:     perl-5.8.8-U27509.patch
-Patch27512:     perl-5.8.8-U27512.patch
-Patch27604:     perl-5.8.8-U27604.patch
-Patch27605:     perl-5.8.8-U27605.patch
-Patch27914:     perl-5.8.8-U27914.patch
-Patch27329:     perl-5.8.8-U27329.patch
-Patch36:	perl-5.8.8-R-switch.patch
-Patch37:	perl-5.8.8-no_asm_page_h.patch
-#               ^- stop IPC/SysV.c including <asm/page.h> for getpagesize(), which
-#               is now declared by including <unistd.h> .
-#
-Patch28006:        perl-5.8.8-U34297_C28006.patch
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
-BuildRequires:  gdbm-devel, db4-devel
-
-
-# By definition of 'do' (see 'man perlfunc') this package provides all
-# versions of perl previous to it.
-Provides: perl <= %{epoch}:%{version}
-
-# These provides are needed by the perl pkg itself with auto-generated perl.req
-Provides: perl(VMS::Filespec)
-Provides: perl(VMS::Stdio)
-
-Provides: perl(abbrev.pl)
-Provides: perl(assert.pl)
-Provides: perl(bigfloat.pl)
-Provides: perl(bigint.pl)
-Provides: perl(bigrat.pl)
-Provides: perl(bytes_heavy.pl)
-Provides: perl(cacheout.pl)
-Provides: perl(complete.pl)
-Provides: perl(ctime.pl)
-Provides: perl(dotsh.pl)
-Provides: perl(dumpvar.pl)
-Provides: perl(exceptions.pl)
-Provides: perl(fastcwd.pl)
-Provides: perl(find.pl)
-Provides: perl(finddepth.pl)
-Provides: perl(flush.pl)
-Provides: perl(ftp.pl)
-Provides: perl(getcwd.pl)
-Provides: perl(getopt.pl)
-Provides: perl(getopts.pl)
-Provides: perl(hostname.pl)
-Provides: perl(importenv.pl)
-Provides: perl(look.pl)
-Provides: perl(newgetopt.pl)
-Provides: perl(open2.pl)
-Provides: perl(open3.pl)
-Provides: perl(perl5db.pl)
-Provides: perl(pwd.pl)
-Provides: perl(shellwords.pl)
-Provides: perl(stat.pl)
-Provides: perl(syslog.pl)
-Provides: perl(tainted.pl)
-Provides: perl(termcap.pl)
-Provides: perl(timelocal.pl)
-Provides: perl(utf8_heavy.pl)
-Provides: perl(validate.pl)
-
-Provides: perl(Carp::Heavy)
-
-# These modules appear to be missing or break assumptions made by the
-# dependency analysis tools.  Typical problems include refering to
-# CGI::Apache as Apache and having no package line in CPAN::Nox.pm. I
-# hope that the perl people fix these to work with our dependency
-# engine or give us better dependency tools.
-#
-# Provides: perl(Apache)
-# Provides: perl(ExtUtils::MM_Mac)
-# Provides: perl(ExtUtils::XSSymSet)
-# Provides: perl(LWP::UserAgent)
-# Provides: perl(URI::URL)
-
-# Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
-
-Obsoletes: perl-Digest-MD5
-Obsoletes: perl-MIME-Base64
-Obsoletes: perl-libnet
-Obsoletes: perl-Storable
-Obsoletes: perl-CGI
-Obsoletes: perl-CPAN
-Obsoletes: perl-DB_File
-Obsoletes: perl-Filter
-Obsoletes: perl-Filter-Simple
-Obsoletes: perl-Time-HiRes
-Obsoletes: perl-Test-Builder-Tester
-
-%define __perl_requires %{SOURCE11}
-
-
-%description
-Perl is a high-level programming language with roots in C, sed, awk
-and shell scripting.  Perl is good at handling processes and files,
-and is especially good at handling text.  Perl's hallmarks are
-practicality and efficiency.  While it is used to do a lot of
-different things, Perl's most common applications are system
-administration utilities and web programming.  A large proportion of
-the CGI scripts on the web are written in Perl.  You need the perl
-package installed on your system so that your system can handle Perl
-scripts.
-
-Install this package if you want to program in Perl or enable your
-system to handle Perl scripts.
-
-
-%if %{suidperl}
-%package suidperl
-Summary:        suidperl, for use with setuid perl scripts
-Group:          Development/Languages
-Requires:       perl = %{perlepoch}:%{perlver}-%{perlrel}
-
-%description suidperl
-suidperl is a setuid binary copy of perl that allows for (hopefully)
-more secure running of setuid perl scripts.
-%endif
-
-
-%prep
-%setup -q
-%patch5 -p1
-# %%patch8 -p1 
-
-# perl 5.8.7: reject
-# %patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-
-%patch17 -p1
-
-%patch19 -p1
-
-%patch21 -p1
-# %patch24 -p1
-
-# perl 5.8.7: reject
-# %patch26 -p1
-# perl 5.8.7: Already in ?
-# %patch27 -p0
-# %patch28 -p1
-
-# %patch30 -p1
-
-%if !%{perl_debugging}
-%patch31 -p1
-%endif
-
-# %patch32 -p1
-
-%patch100 -p1
-
-%ifarch %{multilib_64_archs}
-%patch101 -p1
-%endif
-
-%patch32002 -p1
-
-%patch32003 -p1
-
-# %patch172236 -p1
-
-%patch25084 -p1
-
-%patch172396 -p1
-
-# %patch172587 -p1
-
-%patch040976 -p1
-
-# %patch172739 -p1
-
-# %patch136009 -p1
-
-# %patch174684 -p1
-
-%patch1360090 -p1
-
-%patch178343 -p1
-
-%patch32 -p1
-
-%patch33 -p1
-
-%patch34 -p1
-
-%patch35 -p1
-
-%patch188841 -p1
-
-%patch191416 -p1
-
-%patch27116 -p1
-
-%patch27391 -p1
-
-%patch27426 -p1
-
-%patch27509 -p1
-
-%patch27512 -p1
-
-%patch27604 -p1
-
-%patch27605 -p1
-
-%patch27914 -p1
-
-%patch27329 -p1
-
-%patch36    -p1
-
-%patch37    -p1
-%patch28006 -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()
-{
-	iconv -f "$2" -t utf-8 < "$1" > "${1}_"
-	mv -f "${1}_" "$1"
-}
-recode README.cn euc-cn
-recode README.jp euc-jp
-recode README.ko euc-kr
-recode README.tw big5
-recode pod/perlebcdic.pod iso-8859-1
-recode pod/perlhack.pod iso-8859-1
-recode pod/perlhist.pod iso-8859-1
-recode pod/perlothrtut.pod iso-8859-1
-recode pod/perlthrtut.pod iso-8859-1
-recode lib/Unicode/Collate.pm iso-8859-1
-# recode not needed (5.8.7):
-# ext/Encode/t/Mod_EUCJP.pm, ext/Encode/lib/Encode/CJKConstants.pm,
-# ext/Encode/lib/Encode/JP/H2Z.pm, lib/ExtUtils/MM_MacOS.pm,
-# lib/Pod/Checker.pm, lib/Net/README.libnet
-
-find . -name \*.orig -exec rm -fv {} \;
-
-
-%build
-echo "RPM Build arch: %{_arch}"
-
-# yes; don't use %_libdir so that noarch packages from other OSs
-# arches work correctly :\ the Configure lines below hardcode lib for
-# similar reasons.
-
-sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
-	-Dversion=%{perlver} \
-	-Dmyhostname=localhost \
-	-Dperladmin=root at localhost \
-	-Dcc='%{__cc}' \
-	-Dcf_by='Red Hat, Inc.' \
-	-Dinstallprefix=%{_prefix} \
-	-Dprefix=%{_prefix} \
-%ifarch %{multilib_64_archs}
-	-Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
-	-Dprivlib="/usr/lib/perl5/%{version}" \
-	-Dsitelib="/usr/lib/perl5/site_perl/%{version}" \
-	-Dvendorlib="/usr/lib/perl5/vendor_perl/%{version}" \
-	-Darchlib="%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
-	-Dsitearch="%{_libdir}/perl5/site_perl/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
-	-Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
-%endif
-	-Darchname=%{_arch}-%{_os} \
-%ifarch sparc
-	-Ud_longdbl \
-%endif
-	-Dvendorprefix=%{_prefix} \
-	-Dsiteprefix=%{_prefix} \
-	-Duseshrplib \
-%if %threading
-	-Dusethreads \
-	-Duseithreads \
-%else
-	-Uusethreads \
-	-Uuseithreads \
-%endif
-%if %largefiles
-	-Duselargefiles \
-%else
-	-Uuselargefiles \
-%endif
-	-Dd_dosuid \
-	-Dd_semctl_semun \
-	-Di_db \
-	-Ui_ndbm \
-	-Di_gdbm \
-	-Di_shadow \
-	-Di_syslog \
-	-Dman3ext=3pm \
-	-Duseperlio \
-	-Dinstallusrbinperl=n \
-	-Ubincompat5005 \
-	-Uversiononly \
-	-Dpager='/usr/bin/less -isr' \
-	-Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto \
-	-Ud_endprotoent_r_proto -Ud_setprotoent_r_proto \
-	-Ud_endservent_r_proto -Ud_setservent_r_proto \
-	-Dinc_version_list='%{perlmodcompat}' \
-	-Dscriptdir='%{_bindir}'
-
-make %{?_smp_mflags}
-make test
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%ifarch %{multilib_64_archs}
-	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
-	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{perlver}
-	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl/%{perlver}
-%endif
-
-%ifarch %{multilib_64_archs}
-mkdir -p -m 755 ${RPM_BUILD_ROOT}/usr/lib64/perl5/vendor_perl/%{perlver}/%{_arch}-%{_os}
-%endif
-
-
-#
-# Compatibility directories
-#
-pushd $RPM_BUILD_ROOT/%{_libdir}/perl5
-for i in %{perlmodcompat}; do
-    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/CORE
-    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/auto
-    pushd $i/%{_arch}-%{_os}%{thread_arch}/CORE
-      ln -s ../../../%{perlver}/%{_arch}-%{_os}%{thread_arch}/CORE/libperl.so libperl.so
-    popd
-  done
-popd
-
-
-install -p -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_bindir}/pl2pm
-
-
-#
-
-%define new_perl_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}:$RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
-%define comp_perl_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}:$RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
-%define new_arch_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}
-%define comp_arch_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}
-
-%define new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
-%define new_perl %{new_perl_flags} $RPM_BUILD_ROOT/%{_bindir}/perl
-
-for i in asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h sys/socket.h sys/time.h wait.h
-do
-  %{new_perl} $RPM_BUILD_ROOT/%{_bindir}/h2ph -a \
-              -d $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch} $i || /bin/true
-done
-
-
-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^/usr/lib')
-do
-  mkdir -p $RPM_BUILD_ROOT/$dir
-done
-
-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_libdir}')
-do
-  mkdir -p $RPM_BUILD_ROOT/$dir
-done
-
-for i in %{perlver} %{perlmodcompat} ; do
-  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
-  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
-done
-
-
-#
-# libnet configuration file
-#
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net
-install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net/libnet.cfg
-
-#
-# Core modules removal
-#
-find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
-
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';'
-
-chmod -R u+w $RPM_BUILD_ROOT/*
-%if %{perl_debugging}
-exit 0
-# disable brp-strip
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3*
-%{_bindir}/*
-%{_libdir}/perl5/
-%ifarch %{multilib_64_archs}
-/usr/lib/perl5/
-%endif
-%if %{suidperl}
-%exclude %{_bindir}/suidperl
-%exclude %{_bindir}/sperl%{perlver}
-%endif
-
-%if %{suidperl}
-%files suidperl
-%{_bindir}/suidperl
-%{_bindir}/sperl%{perlver}
-%endif
-
-%changelog
-* Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
-- Fix upstream perl bug #34297:
-  'utf8 overload stringify bug (utf8 caching maybe)'
-  upstream patch #28006 applied
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:5.8.8-6.1
-- rebuild
-
-* Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
-- Fix upstream perl bug #38454:
-  'rindex corrects for $[ on bytes rather than UTF-8'
-  apply upstream patch #27116
-- Fix upstream perl bug 24816:
-  'Magic vars seem unsure if they are purely numeric' 
-  ( perl -wle 'print $? = $? ^ "3"' -> 'Argument "^C" isn't numeric' )
-  apply upstream patch #27391
-- Avoid writing over the input string in the case 'F' in moreswitches.
-  apply upstream patch #27426
-- Fix upstream perl bug 34925 - 'overload and rebless' -
-  apply upstream patches #27509, #27512
-- Fix upstream perl bug 3038 - '$qr = qr/^a$/m; $x =~ $qr; fails'
-  apply upstream patch #27604
-- apply upstream patch #27605 - 'Fix off-by-one in $0 set magic.'
-- Fix upstream perl bug 23141 - '($_) = () fails to set $_ to undef'
-  apply upstream patch #27914
-- Fix upstream perl bug #38619 - 
-  'Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)'
-  apply upstream patch #27329
-- Give users the '-R' option to disable the Red Hat
-  module compatibility default search path extension (incpush.patch).
-
-* Thu May 11 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
-- Fix bug 191416: make h2ph generate correct code for cpp statements
-  like: '#if defined A || defined B'
-- Fix 172396.patch for non-threaded builds
-
-* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
-- Fix bug 188841: make CGI.pm's url(-relative) handle rewrites
-
-* Tue Mar 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-4
-- Fix bug 183553 / upstream bug 38657: fix -d:Foo=bar processing
-- rebuild with new gcc-4.1.0-1, released today
-
-* Mon Feb 27 2006 Jason Vas Dias <jvdias at redhat.com>
-- Apply upstream patch #28284
-
-* 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)
-
-* 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
-
-* 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
-
-* 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
-- Apply upstream patches 26283 and 26284 : complete, revised fixes
-  for CVE-2005-3962 and CVE-2005-3912 and 
-  "Sys::Syslog security vulnerabilities" issues.
-- Fix bug 136009 / MakeMaker LD_RUN_PATH issue: 
-  restore previous default Red Hat behavior of removing the MakeMaker
-  generated LD_RUN_PATH setting from the link command .
-  Document this removal, as it contravenes upstream default behavior, and 
-  provide a USE_MM_LD_RUN_PATH MakeMaker member to enable use of the 
-  MakeMaker generated LD_RUN_PATH .
-
-* Thu Dec 01 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.8
-- fix bug 174684 / CVE-2005-3962: sprintf integer overflow vulnerability
-  backport upstream patch #26240
-
-* Wed Nov 09 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 136009: restore MakeMaker support for LD_RUN_PATH, 
-  while removing empty LD_RUN_PATH
-
-* Tue Nov 08 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 172739: upstream bug 36521 : deep recursion and segfault
-  in CGI::Carp::warn with 'use diagnostics' : applied patch 25160.
-- fix CAN-2004-0976: insecure use of temp files (ala Debian)
-
-* Mon Nov 07 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 172587: apply upstream patches 26009, 26011
-
-* Thu Nov 03 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 172396 / upstream bug 26136: insert tzset() call before localtime_r() calls
-
-* Wed Nov 02 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 172336 / upstream bug 37056: reentr ERANGE realloc recursion
-
-* Tue Nov 01 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
-- fix bug 172236 : missing C standard headers -
-  use gcc4's '-print-search-path' option in h2ph
-
-* Tue Oct 25 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.6
-- fix bug 171111 : define ioctl length macro IOCPARM_LEN(x)
-  macro to be _IOC_SIZE(x), not 256 - upstream bug #37535 raised.
-- provide 'perl_debugging' .spec file option to enable -DDEBUGGING
-  and disable stripping / debuginfo generation - default: 0
-
-* Sun Oct 09 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.4
-- rebuild for db4 (#170235)
-
-* Mon Sep 05 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.3
-- convert docs to UTF-8 (#140871)
-
-* Sat Sep 03 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.2
-- scriptdir to /usr/bin (#167205)
-
-* Sun Aug 28 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.1
-- patch12 from Marius Feraru (#165907)
-  TODO: patch11, patch26 and patch27 clash and need verification
-- Build without -DDEBUGGING (#156113)
-
-* Sun Aug 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.7-0
-- 5.8.7
-- Dropped the CGI.pm update patches (patch25 and patch29).
-
-* Fri Aug 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-17
-- Don't remove the core modules:
-    Filter::Util::Call, Filter::Simple, and Time::HiRes.
-- Obsoletes perl-{Filter,Filter-Simple,Time-HiRes}.
-
-* Tue Aug  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-16
-- Reformatted the specfile.
-- Added the Source0 URL.
-- Dropped the MANIFEST.all file for the perl package.
-- Dropped the MANIFEST.suidperl file for the suidperl subpackage.
-
-* Wed May 18 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-15
-- remove unused /tmp/MANIFEST.all (#151801)
-
-* Tue May 17 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-14
-- CGI.pm 3.10 fixes mod_perl problems (#158036)
-
-* Sun May 15 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-13
-- Better patch for FindBin.pm (#127023#c37)
-
-* Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-12
-- New findbin-selinux patch: it now passes the FindBin.t tests
-  (patch28 replaces patch23). #118877 #127023
-- Remove 5.8.2 ABI compat (#154295 comments 6 and 7).
-
-* Thu Apr 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 3:5.8.6-10
-- Apply fixes for CAN-2004-0452, CAN-2005-0155 and CAN-2005-0156 (#156128).
-
-* Tue Apr 26 2005 Warren Togami <wtogami at redhat.com. - 3:5.8.6-8
-- -Dinstallusrbinperl=n (#141182 Aaron Sherman)
-- remove 5.8.0 and 5.8.1 ABI compat (#154295)
-
-* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-7
-- Updating CGI.pm from version 3.05 to 3.08 (mod_perl 2.0.0 RC5). (#155839)
-
-* Wed Apr 20 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-6
-- FCGI is not provided by perl (#148847).
-- Drop the '.1' suffix from the perl-suidperl subpackage.
-
-* Thu Mar 17 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-5
-- bug 151127: fix to use libresolv instead of libbind (perl-5.8.6-libresolv.patch).
-
-* Tue Mar  8 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-4
-- add patch to put site_perl and vendor_perl before core perl dirs, to
-  allow for overriding modules
-
-* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-3
-- bugzilla: 127025, fix strip warnings
-
-* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-2
-- bugzilla: 145448, fix invalid utf8 in changelog
-
-* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-1
-- bugzilla: 145447, add 5.8.5 to perlmodcompat list
-
-* Mon Jan 17 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-1
-- update to 5.8.6
-
-* Wed Dec  1 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-13
-- rebuild
-
-* Wed Dec  1 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-11
-- bugzilla: 140563, nptl doesn't act like linuxthreads; threads have no PIDs
-
-* Thu Nov 11 2004 Jeff Johnson <jbj at jbj.org> 3:5.8.5-10
-- rebuild against db-4.3.21.
-
-* Tue Oct 12 2004 Jose Pedro Oliveira <jpo at di.uminho.pt>
-- Corrected the license information (missing GPL).
-- Added the URL tag.
-- Removed empty .bs files.
-- Eliminated several strip generated messages (bug 127025).
-- Corrected problems mentioned in bug 120772
-  (updated Ville Skytta)
-
-* Tue Oct 12 2004 Chip Turner <cturner at redhat.com>
-- bugzilla: 135303, add more missing 5.8.4 paths
-
-* Mon Oct 11 2004 Tim Waugh <twaugh at redhat.com>
-- Build requires groff (bug #135101).
-
-* Tue Oct  5 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-7
-- update perlbug patch to strip build date as well
-
-* Mon Aug 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-2
-- fix conflicting file when building on x86_64 and i386
-
-* Sat Jul 24 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-1
-- Add Provides: Carp::Heavy to fix new dep error (bz 128507)
-
-* Thu Jul 22 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-1
-- update to 5.8.5
-
-* Mon Jun 28 2004 Chip Turner <cturner at redhat.com> 3:5.8.4-1
-- update to 5.8.4, remove patch 8
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu Apr 15 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-18
-- add patch to fix empty RPATH issue on perl module compile
-
-* Sat Apr 03 2004 Colin Walters <walters at redhat.com> 3:5.8.3-17
-- Apply patch to fix FindBin module when access to cwd is disallowed,
-  should solve the MRTG/SELinux cron spam issue
-
-* Tue Mar 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-14
-- make sure multilib boxes also own the entries in @INC that are in /usr/lib, not just %_libdir
-
-* Tue Mar  9 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-%{perlrel}.1
-- fix i386-specifics in %%install to arch generic
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Feb 25 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-10
-- add perl(:MODULE_COMPAT_*) provides; make sure all of @INC is owned by perl package
-
-* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-8
-- rebuild
-
-* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7.9.rhl9
-- rebuild
-
- patch for perl 5.8.4).
-
-* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7.10.fc1
-- rebuild
-
-* Sun Feb 15 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-6
-- fix very broken @INC calculations with slightly less broken @INC
-  calculations (not perfectly handled but the result is correct)
-- fix broken -Dsitearch declaration
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed Jan 28 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-5
-- update incpush patch to better handle multilib
-
-* Fri Jan 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-2
-- add a dependency filter on perl(Tie::RangeHash)
-
-* Thu Jan 22 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7
-- upgrade to 5.8.3
-
-* Mon Dec 15 2003 Chip Turner <cturner at redhat.com> 3:5.8.2-7
-- fix @INC so that all dirs go into it, not just those that exist at buildtime in the build system
-
-* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 3:5.8.2-4
-- rebuild against db-4.2.52.
-
-* Sun Dec  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3:5.8.2-3
-- Own site and vendor auto directories (#73970).
-
-* Wed Dec  3 2003 Chip Turner <cturner at redhat.com> 3:5.8.2-2
-- upgrade to 5.8.2
-
-* Fri Oct 31 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-92
-- remove Vendor and Distribution macros from specfile (#108567)
-
-* Wed Oct 15 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-92
-- add srand on fork patch from upstream, as well as test case
-
-* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 3:5.8.1-91.1
-- rebuild against db-4.2.42.
-
-* Thu Sep 25 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-91
-- perl 5.8.1 final
-
-* Mon Sep 22 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc5.3
-- ensure inc_version_list is always set properly
-
-* Mon Sep 22 2003 Chip Turner <cturner at redhat.com>
-- update to RC5
-
-* Wed Aug 20 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc4.2
-- rebuild
-
-* Wed Aug  6 2003 Chip Turner <cturner at redhat.com>
-- bugzilla 101767, make sure threads.so links directly to -lpthread
-
-* Fri Aug  1 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc2.1
-- RC4
-- remove perl-5.8.0-fhs.patch since it is integrated now
-- remove perl-5.8.0-Safe2.09.patch, unnecessary now
-
-* Fri Jul 11 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc2.1
-- rc2 snapshot
-
-* Thu Jul 10 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-90.rc1
-- upgrade to 5.8.1 RC1
-
-* Mon Jul  7 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-89.pre%{PRELEVEL}.0
-- integrate another pre-5.8.1 release
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon May 19 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-89.pre%{PRELEVEL}.0
-- bump epoch since we went from perl 5.8.1-pre to 5.8.0-pre (ie,
-  changed what version perl thought of itself as)
-
-* Mon May  5 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.3
-- rebuild
-
-* Thu May  1 2003 Chip Turner <cturner at redhat.com>
-- bump for rebuilg
-
-* Sun Apr 27 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.1
-- fix the fix for RPM_BUILD_ROOT substitution
-
-* Tue Apr 22 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.3
-- fix Config.pm; lost when h2ph changes made
-
-* Thu Apr 17 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}
-- move to latest snapshot, 19261
-
-* Tue Feb 18 2003 Chip Turner <cturner at redhat.com>
-- fix MANIFEST.DB_File handling for #83410; problem was unsubstituted
-  %{_libdir} that crept in with multilib
-
-* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 5.8.0-87
-- clean up backup files from patches (#82838)
-
-* Wed Feb 05 2003 Elliot Lee <sopwith at redhat.com> 5.8.0-86
-- Fix up multilib handling to use multilib_64_archs macro, add ppc64.
-- Patch100 probably makes sense on all archs, and ifarch'd patches are Bad(tm).
-
-* Mon Jan 27 2003 Chip Turner <cturner at redhat.com>
-- version the Obsoleted on perl-NDBM_File so users can install newer
-- change the Obsoletes on NDBM_File to a Conflicts
-  ones than what shipped with 7.3, yet still keep anaconda happy
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Thu Jan  9 2003 Chip Turner <cturner at redhat.com>
-- rebuild
-
-* Sat Jan  4 2003 Jeff Johnson <jbj at redhat.com> 5.8.0-82
-- use internal dep generator.
-
-* Thu Jan  2 2003 Chip Turner <cturner at redhat.com>
-- fix issue with -Dpager in Pod::Perldoc.pm to properly respect setting once more
-
-* Tue Dec 31 2002 Chip Turner <cturner at redhat.com>
-- add rpath fix to prevent building perl from using installed system perl
-- massive re-integration of upstream patches to come to common basis (head of perl-maint branch)
-
-* Mon Dec 16 2002 Chip Turner <cturner at redhat.com>
-- rebuild
-
-* Sun Dec 15 2002 Chip Turner <cturner at redhat.com>
-- add numerous upstream patches to fix utf8/perlio issues
-- upgrade Storable, Safe, and Encoding to latest CPAN versions
-
-* Thu Nov  7 2002 Chip Turner <cturner at redhat.com>
-- multilib support when building noarch perl modules
-- integrate upstream bugfix patches
-
-* Tue Sep 10 2002 Chip Turner <cturner at redhat.com>
-- integrate patch for /usr/lib64 instead of /usr/lib from Than Ngo
-
-* Mon Sep  9 2002 Chip Turner <cturner at redhat.com>
-- integrate s390/s390x patch from Florian La Roche
-
-* Sun Sep  1 2002 Chip Turner <cturner at redhat.com>
-- fix pager issues; default to /usr/bin/less -isr
-- more work on pager bug (72125)
-
-* Thu Aug 29 2002 Chip Turner <cturner at redhat.com>
-- add a few new directories to h2ph to produce better .ph files
-
-* Thu Aug 15 2002 Chip Turner <cturner at redhat.com>
-- change from lynx to links in CPAN.pm
-
-* Tue Aug  6 2002 Chip Turner <cturner at redhat.com>
-- automated release bump and build
-- remove Filter packages and use CPAN ones
-
-* Fri Jul 19 2002 Chip Turner <cturner at redhat.com>
-- move to final perl 5.8.0, huzzah!
-
-* Tue Jul 16 2002 Chip Turner <cturner at redhat.com>
-- update CPAN, CGI, and DB_File versions; obsolete perl-libnet
-- libnet.cfg supplied, default to passive ftp in all cases
-
-* Tue Jun 18 2002 Chip Turner <cturner at redhat.com>
-- add patch to ensire libperl.so is linked properly
-
-* Mon May 20 2002 Nalin Dahyabhai <nalin at redhat.com>
-- always build with -fPIC
-
-* Thu May  9 2002 Jeff Johnson <jbj at redhat.com>
-- rebuild in rawhide
-
-* Sun Mar 31 2002 Chip Turner <cturner at redhat.com>
-- split suidperl back out (bug #62215)
-
-* Tue Mar 26 2002 Chip Turner <cturner at redhat.com>
-- restructuring of some directories, alteration of @INC
-
-* Thu Dec 20 2001 Chip Turner <cturner at redhat.com>
-- remove ndbm completely
-
-* Sun Dec 16 2001 Chip Turner <cturner at redhat.com>
-- make rpmlint happy, split out NDBM_File, clean up other spots
-- stopped doing grep -v etc in favor of custom script
-
-* Wed Dec 12 2001 Chip Turner <cturner at redhat.com>
-- cleaning up of ia64 issues, as well as compatibility with gcc 3.1
-  and glibc 2.2.4
-
-* Mon Sep 24 2001 Chip Turner <cturner at redhat.com>
-- changing building of extra modules out of the core perl rpm
-
-* Mon Sep 17 2001 Chip Turner <cturner at redhat.com>
-- upgrade to 5.6.1, added old INC dirs to maintain compat
-
-* Fri Mar 23 2001 Preston Brown <pbrown at redhat.com>
-- bzip2 source, save some space.
-
-* Thu Dec  7 2000 Crutcher Dunnavant <crutcher at redhat.com>
-- initial rebuild for 7.1
-
-* Tue Sep 12 2000 Bill Nottingham <notting at redhat.com>
-- fix dependencies on ia64/sparc64
-
-* Mon Aug  7 2000 Nalin Dahyabhai <nalin at redhat.com>
-- replace the deprecated MD5 with Digest::MD5 (has to be here for cleanfeed)
-- obsolete: perl-Digest-MD5
-- use syslog instead of mail to report possible attempts to break into suidperl
-- force syslog on at build-time
-
-* Mon Jul 31 2000 Nalin Dahyabhai <nalin at redhat.com>
-- add Owen's fix for #14779/#14863
-- specify cc=%{__cc}; continue to let cpp sort itself out
-- switch shadow support on (#8646)
-- release 7
-
-* Tue Jul 18 2000 Nalin Dahyabhai <nalin at redhat.com>
-- strip buildroot from perl pods (#14040)
-- release 6
-
-* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
-- automatic rebuild (release 5)
-
-* Wed Jun 21 2000 Preston Brown <pbrown at redhat.com>
-- don't require tcsh to install, only to build
-- release 4
-
-* Mon Jun 19 2000 Nalin Dahyabhai <nalin at redhat.com>
-- rebuild against new db3 package
-- release 3
-
-* Sat Jun 17 2000 Nalin Dahyabhai <nalin at redhat.com>
-- disable 64-bit file support
-- change name of package that Perl expects gcc to be in from "egcs" to "gcc"
-- move man pages to /usr/share via hints/linux.sh and MM_Unix.pm
-- fix problems prefixifying with empty prefixes
-- disable long doubles on sparc (they're the same as doubles anyway)
-- add an Epoch to make sure we can upgrade from perl-5.00503
-- release 2
-
-* Thu Mar 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- 2.6.0
-
-* Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
-- fix description
-
-* Fri Jan 14 2000 Jeff Johnson <jbj at redhat.com>
-- add provides for perl modules (from kestes at staff.mail.com).
-
-* Mon Oct 04 1999 Cristian Gafton <gafton at redhat.com>
-- fix the %%install so that the MD5 module gets actually installed correctly
-
-* Mon Aug 30 1999 Cristian Gafton <gafton at redhat.com>
-- make sure the package builds even when we don't have perl installed on the
-  system
-
-* Fri Aug 06 1999 Cristian Gafton <gafton at redhat.com>
-- merged with perl-MD5
-- get rid of the annoying $RPM_BUILD_ROOT paths in the installed tree
-
-* Mon Jul 26 1999 Cristian Gafton <gafton at redhat.com>
-- do not link anymore against the system db library (and make each module
-  link against it separately, so that we can have Berkeley db1 and db2 mixed
-  up)
-
-* Wed Jun 16 1999 Cristian Gafton <gafton at redhat.com>
-- use wildcards for files in /usr/bin and /usr/man
-
-* Tue Apr 06 1999 Cristian Gafton <gafton at redhat.com>
-- version 5.00503
-- make the default man3 install dir be release independent
-- try to link against db1 to preserve compatibility with older databases;
-  abandoned idea because perl is too broken to allow such an easy change
-  (hardcoded names *everywhere* !!!)
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 3)
-
-* Thu Jan 07 1999 Cristian Gafton <gafton at redhat.com>
-- guilty of the inlined Makefile in the spec file
-- adapted for the arm build
-
-* Wed Sep 09 1998 Preston Brown <pbrown at redhat.com>
-- added newer CGI.pm to the build
-- changed the version naming scheme around to work with RPM
-
-* Sun Jul 19 1998 Jeff Johnson <jbj at redhat.com>
-- attempt to generate *.ph files reproducibly
-
-* Mon Jun 15 1998 Jeff Johnson <jbj at redhat.com>
-- update to 5.004_04-m4 (pre-5.005 maintenance release)
-
-* Tue Jun 12 1998 Christopher McCrory <chrismcc at netus.com
-- need stdarg.h from gcc shadow to fix "use Sys::Syslog" (problem #635)
-
-* Fri May 08 1998 Cristian Gafton <gafton at redhat.com>
-- added a patch to correct the .ph constructs unless defined (foo) to read
-  unless(defined(foo))
-
-* Thu May 07 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Tue Mar 10 1998 Cristian Gafton <gafton at redhat.com>
-- fixed strftime problem
-
-* Sun Mar 08 1998 Cristian Gafton <gafton at redhat.com>
-- added a patch to fix a security race
-- do not use setres[ug]id - those are not implemented on 2.0.3x kernels
-
-* Mon Mar 02 1998 Cristian Gafton <gafton at redhat.com>
-- upgraded to 5.004_04 - 5.004_01 had some nasty memory leaks.
-- fixed the spec file to be version-independent
-
-* Fri Dec 05 1997 Erik Troan <ewt at redhat.com>
-- Config.pm wasn't right do to the builtrooting
-
-* Mon Oct 20 1997 Erik Troan <ewt at redhat.com>
-- fixed arch-specfic part of spec file
-
-* Sun Oct 19 1997 Erik Troan <ewt at redhat.com>
-- updated to perl 5.004_01
-- users a build root
-
-* Thu Jun 12 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
-
-* Tue Apr 22 1997 Erik Troan <ewt at redhat.com>
-- Incorporated security patch from Chip Salzenberg <salzench at nielsenmedia.com>
-
-* Fri Feb 07 1997 Erik Troan <ewt at redhat.com>
-- Use -Darchname=i386-linux 
-- Require csh (for glob)
-- Use RPM_ARCH during configuration and installation for arch independence



From fedora-cvs-commits at redhat.com  Wed Jul 19 22:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 18:58:58 -0400
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.27,1.28
Message-ID: <200607192258.k6JMwwY0015158@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15128

Modified Files:
	perl-DBI.spec 
Log Message:
fix bug 199291


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-DBI.spec	17 Jul 2006 18:44:40 -0000	1.27
+++ perl-DBI.spec	19 Jul 2006 22:58:56 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.51
-Release: 	1
+Release: 	1%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:00:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:00:31 -0400
Subject: rpms/perl-DBI/FC-5 perl-DBI.spec,1.25,1.26
Message-ID: <200607192300.k6JN0Vc2015679@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBI/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15663

Modified Files:
	perl-DBI.spec 
Log Message:
fix bug 199291


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/FC-5/perl-DBI.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-DBI.spec	17 Jul 2006 19:24:21 -0000	1.25
+++ perl-DBI.spec	19 Jul 2006 23:00:26 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.51
-Release: 	1.fc5
+Release: 	1%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:01:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:01:48 -0400
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.28,1.29
Message-ID: <200607192301.k6JN1mq6015904@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBD-MySQL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15838

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
fix bug 199289


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- perl-DBD-MySQL.spec	17 Jul 2006 18:54:46 -0000	1.28
+++ perl-DBD-MySQL.spec	19 Jul 2006 23:01:33 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0006
-Release: 	1.FC6
+Release: 	1%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:02:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:02:43 -0400
Subject: rpms/perl-DBD-MySQL/FC-5 perl-DBD-MySQL.spec,1.27,1.28
Message-ID: <200607192302.k6JN2hYe016083@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-DBD-MySQL/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16050

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
fix bug 199289


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/FC-5/perl-DBD-MySQL.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- perl-DBD-MySQL.spec	17 Jul 2006 19:40:44 -0000	1.27
+++ perl-DBD-MySQL.spec	19 Jul 2006 23:02:40 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0006
-Release: 	1.FC5
+Release: 	1%{?dist}
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:03:42 -0400
Subject: rpms/gnome-applet-vm/devel .cvsignore, 1.4, 1.5 gnome-applet-vm.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200607192303.k6JN3goP016240@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16213

Modified Files:
	.cvsignore gnome-applet-vm.spec sources 
Log Message:
upgrade


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2006 16:16:24 -0000	1.4
+++ .cvsignore	19 Jul 2006 23:03:39 -0000	1.5
@@ -1 +1 @@
-gnome-applet-vm-0.0.6.tar.gz
+gnome-applet-vm-0.1.0rc1.tar.bz2


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-applet-vm.spec	12 Jul 2006 05:58:32 -0000	1.7
+++ gnome-applet-vm.spec	19 Jul 2006 23:03:39 -0000	1.8
@@ -1,12 +1,13 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
-Version: 0.0.6
-Release: 1.1
+Version: 0.1.0
+Release: 0.rc1
+%define upstreamname %{name}-%{version}rc1
 License: GPL
 Group: User Interface/Desktops
-Source: gnome-applet-vm-%{version}.tar.gz
+Source: %{upstreamname}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-URL: http://people.redhat.com/kzak
+URL: http://people.redhat.com/kzak/gnome-applet-vm
 ExclusiveArch: i386 x86_64
 
 %define glib2_version 2.2.0
@@ -24,21 +25,26 @@
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  /usr/bin/automake
 BuildRequires:  libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires:	dbus-devel
 
 Prereq:         gtk2 >= %{gtk2_version}
 Requires:	xen
 Requires:	libvirt
 Requires:	gnome-panel >= %{gnome_panel_version}
+Requires:	usermode
+
+Requires(post): /sbin/ldconfig, /usr/bin/gconftool-2, /usr/bin/scrollkeeper-update
+Requires(postun): /sbin/ldconfig
 
 %description
-The gnome-applet-vm package provides Panel applet which monitor
-locally running virtual domains.
+The gnome-applet-vm is GNOME panel applet for monitoring and controlling 
+locally-running virtual machines.
 
 %prep
-%setup -q
+%setup -q -n %{upstreamname}
 
 %build
-%configure
+%configure --enable-consolehelper
 make
 
 %install
@@ -50,27 +56,22 @@
 
 # Clean up unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
+# userhelper
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/vm_applet_wrapper
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-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
+/usr/bin/scrollkeeper-update
 
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vm-applet.schemas > /dev/null
+export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vm-applet.schemas > /dev/null
 
 %postun 
 /sbin/ldconfig
-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
 %defattr(-, root, root)
@@ -81,20 +82,26 @@
 %{_datadir}/omf/*
 %{_libdir}/bonobo/servers/*
 %{_libexecdir}/*
+%{_sbindir}/*
+%{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
+%config %{_sysconfdir}/pam.d/vm_applet_wrapper
+%config %{_sysconfdir}/security/console.apps/vm_applet_wrapper
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.0.6-1.1
-- rebuild
+* Thu Jul 20 2006 Karel Zak <kzak at redhat.com> 0.1.0-0.rc1
+- upgrade to version 0.1.0rc1
+- fix spec file
+
+* Mon Apr  3 2006 Karel Zak <kzak at redhat.com> 0.0.8-1
+- update to version 0.0.8
+- fix postun section
 
-* Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 0.0.6-1
-- new upstream version
+* Thu Mar 16 2006 Karel Zak <kzak at redhat.com> 0.0.7-1
+- update to version 0.0.7
 
-* 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
+* Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 0.0.6-1
+- compile against libvirt instead libvir
 
 * Fri Jan 27 2006 Karel Zak <kzak at redhat.com> 0.0.5-1
 - public release


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2006 16:16:24 -0000	1.4
+++ sources	19 Jul 2006 23:03:39 -0000	1.5
@@ -1 +1 @@
-664b870e292233ebd05bd8dd56c06692  gnome-applet-vm-0.0.6.tar.gz
+7a204ecf3789160bc1b75b4ee31b6f40  gnome-applet-vm-0.1.0rc1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:03:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:03:42 -0400
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.25,1.26
Message-ID: <200607192303.k6JN3g5W016249@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-DNS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16214

Modified Files:
	perl-Net-DNS.spec 
Log Message:
fix bug 199287


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-Net-DNS.spec	17 Jul 2006 20:10:44 -0000	1.25
+++ perl-Net-DNS.spec	19 Jul 2006 23:03:39 -0000	1.26
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.58
-Release: 1.fc6
+Release: 1%{?dist}
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:04:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:04:48 -0400
Subject: rpms/perl-Net-DNS/FC-5 perl-Net-DNS.spec,1.24,1.25
Message-ID: <200607192304.k6JN4moc016422@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-DNS/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16401

Modified Files:
	perl-Net-DNS.spec 
Log Message:
fix bug 199287


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/FC-5/perl-Net-DNS.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-Net-DNS.spec	17 Jul 2006 20:56:33 -0000	1.24
+++ perl-Net-DNS.spec	19 Jul 2006 23:04:42 -0000	1.25
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.58
-Release: 1.fc5
+Release: 1%{?dist}
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:07:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:07:13 -0400
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.26,1.27
Message-ID: <200607192307.k6JN7Dlq016926@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16894

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
fix bug 199286


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- perl-HTML-Parser.spec	17 Jul 2006 20:29:46 -0000	1.26
+++ perl-HTML-Parser.spec	19 Jul 2006 23:07:10 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.55
-Release: 1.fc6
+Release: 1%{?dist}
 License: GPL or Artistic
 Group:  Development/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:08:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:08:08 -0400
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.15,1.16
Message-ID: <200607192308.k6JN88A4017081@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17059

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
- Add 'dist' tag to package release string.



Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xsm.spec	12 Jul 2006 09:22:47 -0000	1.15
+++ xorg-x11-xsm.spec	19 Jul 2006 23:08:05 -0000	1.16
@@ -5,7 +5,7 @@
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.2
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 3.1
+Release: 4%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -115,7 +115,6 @@
 %{_datadir}/X11/rstart/contexts/@List
 %{_datadir}/X11/rstart/contexts/default
 %{_datadir}/X11/rstart/contexts/x11r6
-%dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/XSm
 %dir %{_libdir}/X11
 %dir %{_libdir}/X11/rstart
@@ -133,7 +132,11 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-4.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+- Add 'dist' tag to package release string.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.0.2-3.1
 - rebuild
 
 * Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-3



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:08:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:08:20 -0400
Subject: rpms/perl-HTML-Parser/FC-5 perl-HTML-Parser.spec,1.21,1.22
Message-ID: <200607192308.k6JN8H5j017120@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17058

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
fix bug 199286


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/perl-HTML-Parser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-HTML-Parser.spec	17 Jul 2006 21:03:53 -0000	1.21
+++ perl-HTML-Parser.spec	19 Jul 2006 23:08:13 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.55
-Release: 1.fc5
+Release: 1%{?dist}
 License: GPL or Artistic
 Group:  Development/Libraries
 Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:10:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:10:16 -0400
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.19,1.20
Message-ID: <200607192310.k6JNAGJB017474@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17446

Modified Files:
	xorg-x11-apps.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
- Add 'dist' tag to package release string.



Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-apps.spec	12 Jul 2006 08:55:14 -0000	1.19
+++ xorg-x11-apps.spec	19 Jul 2006 23:10:14 -0000	1.20
@@ -5,7 +5,7 @@
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.1
-Release: 1.1
+Release: 2%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -136,7 +136,6 @@
 %{_bindir}/xwd
 %{_bindir}/xwud
 %dir %{_datadir}/X11
-%dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Clock-color
 %{_datadir}/X11/app-defaults/XClipboard
 %{_datadir}/X11/app-defaults/XClock
@@ -177,7 +176,11 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 7.1-2.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+- Add 'dist' tag to package release string.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 7.1-1.1
 - rebuild
 
 * Tue Jun 20 2006 Mike A. Harris <mharris at redhat.com> 7.1-1



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:14:18 -0400
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.30,1.31
Message-ID: <200607192314.k6JNEIRg018933@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18903

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-4.fc6
- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)



Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-xdm.spec	17 Jul 2006 22:30:27 -0000	1.30
+++ xorg-x11-xdm.spec	19 Jul 2006 23:14:16 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -135,7 +135,6 @@
 %config %attr(0644,root,root) %{_sysconfdir}/pam.d/xdm
 %config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
 %dir %{_datadir}/X11
-%dir %{_datadir}/X11/app-defaults
 # NOTE: We intentionally default to OS supplied file being favoured here on
 # OS upgrades.
 %config %{_datadir}/X11/app-defaults/Chooser
@@ -146,10 +145,12 @@
 %dir %{_libdir}/X11/xdm
 %{_libdir}/X11/xdm/chooser
 %{_libdir}/X11/xdm/libXdmGreet.so
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-4.fc6
+- Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
+
 * Mon Jul 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-3.fc6
 - Added pam_keyinit.so support to xdm.pamd and xserver.pamd (#198631)
 - Flag pam.d{xdm,xserver} as attr(0644,root,root) replaceable config files.



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:22:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:22:30 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.38,1.39
Message-ID: <200607192322.k6JNMUaJ004333@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4302

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 198185


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tog-pegasus.spec	12 Jul 2006 08:29:58 -0000	1.38
+++ tog-pegasus.spec	19 Jul 2006 23:22:28 -0000	1.39
@@ -14,7 +14,7 @@
 #  April 2006, Jason Vas Dias <jvdias at redhat.com>, Red Hat Inc.
 #
 
-%{?!LINUX_VERSION: 		%define LINUX_VERSION  FC6}
+%{?!LINUX_VERSION: 		%define LINUX_VERSION  %{?dist}}
 #
 %{?!PEGASUS_BUILD_TEST_RPM:   	%define PEGASUS_BUILD_TEST_RPM        0}
 # do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
@@ -41,7 +41,7 @@
 %endif
 
 Version: 		2.5.1
-Release: 		10%{?LINUX_VERSION:.%{LINUX_VERSION}}.1
+Release: 		11%{?LINUX_VERSION:%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -97,6 +97,7 @@
 Patch35:		pegasus-2.5.1-obz5073.patch
 Patch36:		pegasus-2.5.1-obz5090.patch
 Patch37:		pegasus-2.5.1-obz5180.patch
+Patch38:		pegasus-2.5.1-bz198185.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -189,6 +190,7 @@
 %patch35 -p1 -b .obz5073
 %patch36 -p1 -b .obz5090
 %patch37 -p1 -b .obz5180
+%patch38 -p1 -b .bz198185
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:27:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:27:13 -0400
Subject: rpms/systemtap/FC-5 elfutils-portability.patch, 1.9, 1.10 sources,
	1.16, 1.17 systemtap.spec, 1.24, 1.25
Message-ID: <200607192327.k6JNRD5D016468@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16452

Modified Files:
	elfutils-portability.patch sources systemtap.spec 
Log Message:
Automatic update to 0.5.9

elfutils-portability.patch:
 ChangeLog            |   15 ++++++++
 Makefile.in          |    2 +
 backends/ChangeLog   |    8 ++++
 backends/Makefile.am |    6 ++-
 backends/Makefile.in |    8 ++--
 config/Makefile.in   |    2 +
 configure            |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |   28 +++++++++++++++
 lib/ChangeLog        |    5 ++
 lib/Makefile.am      |    3 +
 lib/Makefile.in      |    6 ++-
 libasm/ChangeLog     |    5 ++
 libasm/Makefile.am   |    3 +
 libasm/Makefile.in   |    6 ++-
 libcpu/ChangeLog     |    5 ++
 libcpu/Makefile.am   |    3 +
 libcpu/Makefile.in   |    4 +-
 libdw/ChangeLog      |    5 ++
 libdw/Makefile.am    |    3 +
 libdw/Makefile.in    |    7 ++-
 libdwfl/ChangeLog    |    5 ++
 libdwfl/Makefile.am  |    3 +
 libdwfl/Makefile.in  |    6 ++-
 libebl/ChangeLog     |    5 ++
 libebl/Makefile.am   |    3 +
 libebl/Makefile.in   |    6 ++-
 libelf/ChangeLog     |    5 ++
 libelf/Makefile.am   |    6 ++-
 libelf/Makefile.in   |    8 ++--
 libelf/common.h      |    4 +-
 m4/Makefile.in       |    2 +
 src/ChangeLog        |    9 +++++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strings.c        |    4 ++
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 40 files changed, 292 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/elfutils-portability.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- elfutils-portability.patch	17 Jun 2006 01:56:43 -0000	1.9
+++ elfutils-portability.patch	19 Jul 2006 23:27:10 -0000	1.10
@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -56,6 +56,11 @@
+@@ -67,6 +67,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -12,7 +12,7 @@
  2005-11-19  Roland McGrath  <roland at redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -78,6 +83,9 @@
+@@ -89,6 +94,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -59,7 +59,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -193,6 +194,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -67,7 +67,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -235,9 +237,9 @@ sharedstatedir = @sharedstatedir@
+@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -79,7 +79,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
  	   -I$(top_srcdir)/lib -I..
-@@ -595,7 +597,7 @@ uninstall-am: uninstall-info-am
+@@ -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,$^) \
@@ -90,7 +90,10 @@
  libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -7,6 +7,10 @@
+ 	* configure.ac: Add dummy automake conditional to get dependencies
+ 	for non-generic linker right.  See src/Makefile.am.
+ 
 +2005-11-22  Roland McGrath  <roland at redhat.com>
 +
 +	* configure.ac: Check for --as-needed linker option.
@@ -98,7 +101,7 @@
  2005-11-18  Roland McGrath  <roland at redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -45,6 +49,17 @@
+@@ -54,6 +58,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -126,7 +129,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -121,6 +122,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -136,12 +139,12 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.121'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.122'
  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 NEVER_TRUE NEVER_FALSE MUDFLAP_TRUE MUDFLAP_FALSE GP!
 ROF_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 WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu NEVER_TRUE NEVER_FALSE MUDFLAP_T!
 RUE 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.
@@ -238,7 +241,7 @@
  LOCALEDIR=$datadir
  
  cat >>confdefs.h <<_ACEOF
-@@ -4987,6 +5073,8 @@ s, at YACC@,$YACC,;t t
+@@ -5004,6 +5090,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
@@ -325,7 +328,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -138,6 +139,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -140,6 +141,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -333,7 +336,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -180,9 +182,9 @@ sharedstatedir = @sharedstatedir@
+@@ -182,9 +184,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -386,7 +389,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -394,7 +397,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,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 \
@@ -439,7 +442,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -134,6 +135,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -447,7 +450,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -175,7 +177,7 @@ sbindir = @sbindir@
+@@ -177,7 +179,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +461,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -290,6 +290,11 @@
+@@ -305,6 +305,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -499,7 +502,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -211,6 +212,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -507,7 +510,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -253,9 +255,10 @@ sharedstatedir = @sharedstatedir@
+@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
@@ -522,7 +525,7 @@
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -286,6 +286,11 @@
+@@ -337,6 +337,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,7 +556,7 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -134,6 +134,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -561,7 +564,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -169,6 +170,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -569,7 +572,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -211,9 +213,9 @@ sharedstatedir = @sharedstatedir@
+@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +586,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -413,6 +413,11 @@
+@@ -437,6 +437,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -614,7 +617,7 @@
  INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -130,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -622,7 +625,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -165,6 +166,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -168,6 +169,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -630,7 +633,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -207,9 +209,9 @@ sharedstatedir = @sharedstatedir@
+@@ -210,9 +212,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -644,7 +647,7 @@
  
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -136,6 +136,11 @@
+@@ -165,6 +165,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.
  
@@ -717,7 +720,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -214,6 +215,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -725,7 +728,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -256,10 +258,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 \
@@ -748,7 +751,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -766,7 +769,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -143,6 +144,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -776,7 +779,10 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1,3 +1,7 @@
+@@ -53,6 +53,10 @@
+ 	* Makefile.am: Add hacks to create dependency files for non-generic
+ 	linker.
+ 
 +2006-04-05  Roland McGrath  <roland at redhat.com>
 +
 +	* strings.c (MAP_POPULATE): Define to 0 if undefined.
@@ -784,7 +790,7 @@
  2006-06-12  Ulrich Drepper  <drepper at redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -346,6 +350,11 @@
+@@ -401,6 +405,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -832,7 +838,7 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -190,6 +190,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -202,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -840,7 +846,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -225,6 +226,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -239,6 +240,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -848,7 +854,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -269,12 +271,12 @@ target_alias = @target_alias@
+@@ -283,12 +285,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 \
@@ -970,7 +976,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -322,6 +323,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+@@ -324,6 +325,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
  TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -978,7 +984,7 @@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -363,10 +365,10 @@ sbindir = @sbindir@
+@@ -365,10 +367,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	17 Jun 2006 01:56:43 -0000	1.16
+++ sources	19 Jul 2006 23:27:10 -0000	1.17
@@ -1,2 +1,2 @@
-9f06c069faf89454b65a0faf9b544975  systemtap-0.5.8.tar.gz
-5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz
+35ed51e45bbd9db9a0aa132a442382d7  systemtap-0.5.9.tar.gz
+d83e9022eb342eede549dd6d6a537b59  elfutils-0.122.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-5/systemtap.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- systemtap.spec	17 Jun 2006 01:56:43 -0000	1.24
+++ systemtap.spec	19 Jul 2006 23:27:10 -0000	1.25
@@ -1,10 +1,32 @@
-# Yo!  DO NOT THE FOLLOWING LINE.
+# Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
+%define release 1
+# Version number of oldest elfutils release that works with systemtap.
+%define elfutils_version 0.122
+
+# Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer.
+%if 0%{?fedora}
+%define bundled_elfutils 1
+%if "%fedora" >= "6"
+%define bundled_elfutils 0
+%endif
+%endif
+
+%if 0%{?rhel}
 %define bundled_elfutils 1
-%define elfutils_version 0.121
+%if "%rhel" >= "5"
+%define bundled_elfutils 0
+%endif
+%endif
+
+%if 0%{!?bundled_elfutils:1}
+# Yo!  DO NOT TOUCH THE FOLLOWING LINE.
+# You can use rpmbuild --define "bundled_elfutils 0" for a build of your own.
+%define bundled_elfutils 1
+%endif
 
 Name: systemtap
-Version: 0.5.8
-Release: 0.FC5
+Version: 0.5.9
+Release: %{release}%{?dist}
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -104,8 +126,8 @@
 
 
 %changelog
-* Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-0.FC5
-- Rebuilt for FC-5
+* Wed Jul 19 2006 Roland McGrath <roland at redhat.com> - 0.5.9-1
+- PRs 2669, 2913
 
 * Fri Jun 16 2006 Roland McGrath <roland at redhat.com> - 0.5.8-1
 - PRs 2627, 2520, 2228, 2645



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:44:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:44:33 -0400
Subject: rpms/kernel/devel Makefile.config,1.43,1.44
Message-ID: <200607192344.k6JNiXdn016692@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16680

Modified Files:
	Makefile.config 
Log Message:
make i686 kernel PAE


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.config	19 Jul 2006 17:22:05 -0000	1.43
+++ Makefile.config	19 Jul 2006 23:44:31 -0000	1.44
@@ -127,7 +127,7 @@
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl merge.pl $^ ia64 > $@
 
-kernel-$(VERSION)-i686-xen.config: configs/config-i686 temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen.config: configs/config-i686-PAE temp-x86-xen-generic
 	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic



From fedora-cvs-commits at redhat.com  Wed Jul 19 23:45:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 19:45:44 -0400
Subject: rpms/kernel/devel/configs config-xen-x86_64,1.4,1.5
Message-ID: <200607192345.k6JNji9s018151@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv17544/configs

Modified Files:
	config-xen-x86_64 
Log Message:
calgar iommu don't work with xen yet


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-xen-x86_64	19 Jul 2006 17:20:13 -0000	1.4
+++ config-xen-x86_64	19 Jul 2006 23:45:42 -0000	1.5
@@ -9,4 +9,4 @@
 
 CONFIG_NR_CPUS=8
 
-
+# CONFIG_CALGARY_IOMMU is not set                                                               |extern int numa_setup(char *opt);



From fedora-cvs-commits at redhat.com  Thu Jul 20 00:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 20:24:35 -0400
Subject: rpms/dhcp/FC-5 dhcp.spec,1.89,1.90
Message-ID: <200607200024.k6K0OZV1029884@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29859

Modified Files:
	dhcp.spec 
Log Message:
fix bug 196584


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-5/dhcp.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- dhcp.spec	8 Jun 2006 21:47:04 -0000	1.89
+++ dhcp.spec	20 Jul 2006 00:24:33 -0000	1.90
@@ -87,6 +87,7 @@
 Prereq: /sbin/chkconfig
 BuildRequires:  groff
 #BuildRequires: compat-gcc >= 8-3.3.4.2   groff
+Requires(post): coreutils
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows



From fedora-cvs-commits at redhat.com  Thu Jul 20 00:27:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 20:27:33 -0400
Subject: rpms/kernel/devel/configs config-generic,1.233,1.234
Message-ID: <200607200027.k6K0RXAJ031030@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30538/configs

Modified Files:
	config-generic 
Log Message:
Adding in a bunch of new patches, the big one being nfs-sharing and cachefs
with dirty page tracking on the side.
Disabled part of kabidep because it was breaking ppc symlink




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- config-generic	15 Jul 2006 08:12:30 -0000	1.233
+++ config-generic	20 Jul 2006 00:27:30 -0000	1.234
@@ -2817,3 +2817,12 @@
 
 CONFIG_KPROBES=y
 
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_CACHEFILES=m
+CONFIG_CACHEFILES_DEBUG=y
+
+CONFIG_NFS_FSCACHE=y
+



From fedora-cvs-commits at redhat.com  Thu Jul 20 00:27:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 20:27:32 -0400
Subject: rpms/kernel/devel linux-2.6-cachefiles.patch, NONE,
	1.1 linux-2.6-filesystem-caching-for-afs-and-nfs.patch, NONE,
	1.1 linux-2.6-mm-tracking-dirty-pages.patch, NONE,
	1.1 linux-2.6-nfs-superblock-sharing.patch, NONE,
	1.1 linux-2.6-nfs-superblock-unmount-optimization.patch, NONE,
	1.1 linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch, NONE,
	1.1 linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2423, 1.2424
Message-ID: <200607200027.k6K0RWo0031024@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30538

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-cachefiles.patch 
	linux-2.6-filesystem-caching-for-afs-and-nfs.patch 
	linux-2.6-mm-tracking-dirty-pages.patch 
	linux-2.6-nfs-superblock-sharing.patch 
	linux-2.6-nfs-superblock-unmount-optimization.patch 
	linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch 
	linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch 
Log Message:
Adding in a bunch of new patches, the big one being nfs-sharing and cachefs
with dirty page tracking on the side.
Disabled part of kabidep because it was breaking ppc symlink



linux-2.6-cachefiles.patch:
 fs/file_table.c                                         |    1 
 latest/Documentation/filesystems/caching/cachefiles.txt |  281 +++
 latest/Documentation/sysctl/fs.txt                      |    6 
 latest/fs/Kconfig                                       |   20 
 latest/fs/Makefile                                      |    1 
 latest/fs/buffer.c                                      |    2 
 latest/fs/cachefiles/Makefile                           |   18 
 latest/fs/cachefiles/cf-bind.c                          |  283 +++
 latest/fs/cachefiles/cf-interface.c                     | 1313 ++++++++++++++++
 latest/fs/cachefiles/cf-key.c                           |  160 +
 latest/fs/cachefiles/cf-main.c                          |  131 +
 latest/fs/cachefiles/cf-namei.c                         |  837 ++++++++++
 latest/fs/cachefiles/cf-proc.c                          |  510 ++++++
 latest/fs/cachefiles/cf-sysctl.c                        |   69 
 latest/fs/cachefiles/cf-xattr.c                         |  299 +++
 latest/fs/cachefiles/internal.h                         |  308 +++
 latest/fs/fcntl.c                                       |    2 
 latest/fs/file_table.c                                  |   47 
 latest/fs/open.c                                        |   20 
 latest/include/linux/file.h                             |    1 
 latest/include/linux/fs.h                               |   10 
 latest/include/linux/pagemap.h                          |    6 
 latest/include/linux/sysctl.h                           |    1 
 latest/kernel/auditsc.c                                 |    2 
 latest/kernel/sysctl.c                                  |   11 
 latest/mm/filemap.c                                     |  103 +
 26 files changed, 4431 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-cachefiles.patch ---
Date: Fri, 14 Jul 2006 16:51:22 +0100
From: David Howells <dhowells at redhat.com>
Subject: [RHEL5 PATCH 21/28] FS-Cache: Avoid ENFILE checking for kernel-specific open files

Make it possible to avoid ENFILE checking for kernel specific open files, such
as are used by the CacheFiles module.

After, for example, tarring up a kernel source tree over the network, the
CacheFiles module may easily have 20000+ files open in the backing filesystem,
thus causing all non-root processes to be given error ENFILE when they try to
open a file, socket, pipe, etc..

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 Documentation/sysctl/fs.txt |    6 +++++
 fs/file_table.c             |   47 +++++++++++++++++++++++++++++++++++--------
 fs/open.c                   |   20 ++++++++++++++++++
 include/linux/file.h        |    1 -
 include/linux/fs.h          |   10 +++++++++
 include/linux/sysctl.h      |    1 +
 kernel/sysctl.c             |   11 ++++++++++
 7 files changed, 85 insertions(+), 11 deletions(-)

Index: latest/Documentation/sysctl/fs.txt
===================================================================
--- latest.orig/Documentation/sysctl/fs.txt
+++ latest/Documentation/sysctl/fs.txt
@@ -71,7 +71,7 @@ you might want to raise the limit.
 
 ==============================================================
 
-file-max & file-nr:
+file-max, file-nr & file-kernel:
 
 The kernel allocates file handles dynamically, but as yet it
 doesn't free them again.
@@ -88,6 +88,10 @@ close to the maximum, but the number of 
 significantly greater than 0, you've encountered a peak in your 
 usage of file handles and you don't need to increase the maximum.
 
+The value in file-kernel denotes the number of internal file handles
+that the kernel has open.  These do not contribute to ENFILE
+accounting.
+
 ==============================================================
 
 inode-max, inode-nr & inode-state:
Index: latest/fs/file_table.c
===================================================================
--- latest.orig/fs/file_table.c
+++ latest/fs/file_table.c
@@ -29,10 +29,13 @@ struct files_stat_struct files_stat = {
 	.max_files = NR_FILE
 };
 
+struct files_kernel_stat_struct files_kernel_stat;
+
 /* public. Not pretty! */
 __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
 
 static struct percpu_counter nr_files __cacheline_aligned_in_smp;
+static atomic_t nr_kernel_files;
 
 static inline void file_free_rcu(struct rcu_head *head)
 {
@@ -42,7 +45,10 @@ static inline void file_free_rcu(struct 
 
 static inline void file_free(struct file *f)
 {
-	percpu_counter_dec(&nr_files);
+	if (f->f_kernel_flags & FKFLAGS_NO_ENFILE)
+		atomic_dec(&nr_kernel_files);
+	else
+		percpu_counter_dec(&nr_files);
 	call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
 }
 
@@ -73,45 +79,63 @@ int proc_nr_files(ctl_table *table, int 
 	files_stat.nr_files = get_nr_files();
 	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
 }
+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
+		      void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	files_kernel_stat.nr_kernel_files = atomic_read(&nr_kernel_files);
+	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
 #else
 int proc_nr_files(ctl_table *table, int write, struct file *filp,
                      void __user *buffer, size_t *lenp, loff_t *ppos)
 {
 	return -ENOSYS;
 }
+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
+		      void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+	return -ENOSYS;
+}
 #endif
 
 /* Find an unused file structure and return a pointer to it.
  * Returns NULL, if there are no more free file structures or
  * we run out of memory.
  */
-struct file *get_empty_filp(void)
+struct file *get_empty_kernel_filp(unsigned short kflags)
 {
 	struct task_struct *tsk;
 	static int old_max;
 	struct file * f;
 
 	/*
-	 * Privileged users can go above max_files
+	 * Privileged users can go above max_files and internal kernel users
+	 * can avoid it completely
 	 */
-	if (get_nr_files() >= files_stat.max_files && !capable(CAP_SYS_ADMIN)) {
+	if (!(kflags & FKFLAGS_NO_ENFILE) &&
+	    get_nr_files() >= files_stat.max_files &&
+	    !capable(CAP_SYS_ADMIN)) {
 		/*
-		 * percpu_counters are inaccurate.  Do an expensive check before
-		 * we go and fail.
+		 * percpu_counters are inaccurate.  Do an expensive
+		 * check before we go and fail.
 		 */
 		if (percpu_counter_sum(&nr_files) >= files_stat.max_files)
 			goto over;
 	}
 
-	f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);
+	f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);
 	if (f == NULL)
 		goto fail;
 
-	percpu_counter_inc(&nr_files);
-	memset(f, 0, sizeof(*f));
+	if (kflags & FKFLAGS_NO_ENFILE)
+		atomic_inc(&nr_kernel_files);
+	else
+		percpu_counter_inc(&nr_files);
+
 	if (security_file_alloc(f))
 		goto fail_sec;
 
+	f->f_kernel_flags = kflags;
 	tsk = current;
 	INIT_LIST_HEAD(&f->f_u.fu_list);
 	atomic_set(&f->f_count, 1);
@@ -137,6 +161,11 @@ fail:
 	return NULL;
 }
 
+struct file *get_empty_filp(void)
+{
+	return get_empty_kernel_filp(0);
+}
+
 EXPORT_SYMBOL(get_empty_filp);
 
 void fastcall fput(struct file *file)
Index: latest/fs/open.c
===================================================================
--- latest.orig/fs/open.c
+++ latest/fs/open.c
@@ -978,6 +978,26 @@ struct file *dentry_open(struct dentry *
 EXPORT_SYMBOL(dentry_open);
 
 /*
+ * open a specifically in-kernel file
+ */
+struct file *dentry_open_kernel(struct dentry *dentry, struct vfsmount *mnt, int flags)
+{
+	int error;
+	struct file *f;
+
+	error = -ENFILE;
+	f = get_empty_kernel_filp(FKFLAGS_NO_ENFILE);
+	if (f == NULL) {
+		dput(dentry);
+		mntput(mnt);
+		return ERR_PTR(error);
+	}
+
+	return __dentry_open(dentry, mnt, flags, f, NULL);
+}
+EXPORT_SYMBOL_GPL(dentry_open_kernel);
+
+/*
  * Find an empty file descriptor entry, and mark it busy.
  */
 int get_unused_fd(void)
Index: latest/include/linux/file.h
===================================================================
--- latest.orig/include/linux/file.h
+++ latest/include/linux/file.h
@@ -79,7 +79,6 @@ extern void FASTCALL(set_close_on_exec(u
 extern void put_filp(struct file *);
[...4705 lines suppressed...]
+		       (unsigned long)(X), (unsigned long)(Y));		\
+		BUG();							\
+	}								\
+} while(0)
+
+#else
+
+#define ASSERT(X)				\
+do {						\
+} while(0)
+
+#define ASSERTCMP(X, OP, Y)			\
+do {						\
+} while(0)
+
+#define ASSERTIF(C, X)				\
+do {						\
+} while(0)
+
+#define ASSERTIFCMP(C, X, OP, Y)		\
+do {						\
+} while(0)
+
+#endif
Index: latest/fs/fcntl.c
===================================================================
--- latest.orig/fs/fcntl.c
+++ latest/fs/fcntl.c
@@ -531,6 +531,8 @@ int send_sigurg(struct fown_struct *fown
 	return ret;
 }
 
+EXPORT_SYMBOL(send_sigurg);
+
 static DEFINE_RWLOCK(fasync_lock);
 static kmem_cache_t *fasync_cache __read_mostly;
 
Index: latest/fs/file_table.c
===================================================================
--- latest.orig/fs/file_table.c
+++ latest/fs/file_table.c
@@ -263,6 +263,7 @@ struct file fastcall *fget_light(unsigne
 	return file;
 }
 
+EXPORT_SYMBOL_GPL(fget_light);
 
 void put_filp(struct file *file)
 {
Index: latest/include/linux/pagemap.h
===================================================================
--- latest.orig/include/linux/pagemap.h
+++ latest/include/linux/pagemap.h
@@ -181,6 +181,12 @@ static inline void wait_on_page_fs_misc(
 extern void fastcall end_page_fs_misc(struct page *page);
 
 /*
+ * permit installation of a state change monitor in the queue for a page
+ */
+extern void install_page_waitqueue_monitor(struct page *page,
+					   wait_queue_t *monitor);
+
+/*
  * Fault a userspace page into pagetables.  Return non-zero on a fault.
  *
  * This assumes that two userspace pages are always sufficient.  That's
Index: latest/kernel/auditsc.c
===================================================================
--- latest.orig/kernel/auditsc.c
+++ latest/kernel/auditsc.c
@@ -1314,6 +1314,8 @@ update_context:
 		context->names[idx].ino   = (unsigned long)-1;
 }
 
+EXPORT_SYMBOL_GPL(__audit_inode_child);
+
 /**
  * auditsc_get_stamp - get local copies of audit_context values
  * @ctx: audit_context for the task
Index: latest/mm/filemap.c
===================================================================
--- latest.orig/mm/filemap.c
+++ latest/mm/filemap.c
@@ -520,6 +520,18 @@ void fastcall wait_on_page_bit(struct pa
 }
 EXPORT_SYMBOL(wait_on_page_bit);
 
+void install_page_waitqueue_monitor(struct page *page, wait_queue_t *monitor)
+{
+	wait_queue_head_t *q = page_waitqueue(page);
+	unsigned long flags;
+
+	spin_lock_irqsave(&q->lock, flags);
+	__add_wait_queue(q, monitor);
+	spin_unlock_irqrestore(&q->lock, flags);
+}
+
+EXPORT_SYMBOL_GPL(install_page_waitqueue_monitor);
+
 /**
  * unlock_page - unlock a locked page
  * @page: the page
@@ -2256,6 +2268,97 @@ zero_length_segment:
 }
 EXPORT_SYMBOL(generic_file_buffered_write);
 
+/*
+ * This writes the data from the source page to the specified page offset in
+ * the nominated file
+ * - the source page does not need to have any association with the file or the
+ *   page offset
+ */
+int
+generic_file_buffered_write_one_kernel_page(struct file *file,
+					    pgoff_t index,
+					    struct page *src)
+{
+	struct address_space *mapping = file->f_mapping;
+	struct address_space_operations *a_ops = mapping->a_ops;
+	struct pagevec	lru_pvec;
+	struct page *page, *cached_page = NULL;
+	long status = 0;
+
+	pagevec_init(&lru_pvec, 0);
+
+	page = __grab_cache_page(mapping, index, &cached_page, &lru_pvec);
+	if (!page) {
+		BUG_ON(cached_page);
+		return -ENOMEM;
+	}
+
+	status = a_ops->prepare_write(file, page, 0, PAGE_CACHE_SIZE);
+	if (unlikely(status)) {
+		loff_t isize = i_size_read(mapping->host);
+
+		if (status != AOP_TRUNCATED_PAGE)
+			unlock_page(page);
+		page_cache_release(page);
+		if (status == AOP_TRUNCATED_PAGE)
+			goto sync;
+
+		/* prepare_write() may have instantiated a few blocks outside
+		 * i_size.  Trim these off again.
+		 */
+		if ((1ULL << (index + 1)) > isize)
+			vmtruncate(mapping->host, isize);
+		goto sync;
+	}
+
+	copy_highpage(page, src);
+	flush_dcache_page(page);
+
+	status = a_ops->commit_write(file, page, 0, PAGE_CACHE_SIZE);
+	if (status == AOP_TRUNCATED_PAGE) {
+		page_cache_release(page);
+		goto sync;
+	}
+
+	if (status > 0)
+		status = 0;
+
+	unlock_page(page);
+	mark_page_accessed(page);
+	page_cache_release(page);
+	if (status < 0)
+		return status;
+
+	balance_dirty_pages_ratelimited(mapping);
+	cond_resched();
+
+sync:
+	if (cached_page)
+		page_cache_release(cached_page);
+
+	/*
+	 * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
+	 */
+	if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(mapping->host))) {
+		if (!a_ops->writepage)
+			status = generic_osync_inode(
+				mapping->host, mapping,
+				OSYNC_METADATA | OSYNC_DATA);
+  	}
+
+	/*
+	 * If we get here for O_DIRECT writes then we must have fallen through
+	 * to buffered writes (block instantiation inside i_size).  So we sync
+	 * the file data here, to try to honour O_DIRECT expectations.
+	 */
+	if (unlikely(file->f_flags & O_DIRECT))
+		status = filemap_write_and_wait(mapping);
+
+	pagevec_lru_add(&lru_pvec);
+	return status;
+}
+EXPORT_SYMBOL(generic_file_buffered_write_one_kernel_page);
+
 static ssize_t
 __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
 				unsigned long nr_segs, loff_t *ppos)

linux-2.6-filesystem-caching-for-afs-and-nfs.patch:
 fs/Kconfig                                               |   14 
 fs/afs/cache.h                                           |   27 
 fs/afs/dir.c                                             |   10 
 latest/Documentation/filesystems/caching/backend-api.txt |  357 +++++
 latest/Documentation/filesystems/caching/fscache.txt     |  151 ++
 latest/Documentation/filesystems/caching/netfs-api.txt   |  752 ++++++++++
 latest/fs/Kconfig                                        |   15 
 latest/fs/Makefile                                       |    1 
 latest/fs/afs/cell.c                                     |  109 -
 latest/fs/afs/cell.h                                     |   16 
 latest/fs/afs/cmservice.c                                |    2 
 latest/fs/afs/dir.c                                      |    5 
 latest/fs/afs/file.c                                     |  246 ++-
 latest/fs/afs/fsclient.c                                 |    4 
 latest/fs/afs/inode.c                                    |   45 
 latest/fs/afs/internal.h                                 |   25 
 latest/fs/afs/main.c                                     |   24 
 latest/fs/afs/mntpt.c                                    |   12 
 latest/fs/afs/proc.c                                     |    1 
 latest/fs/afs/server.c                                   |    3 
 latest/fs/afs/vlocation.c                                |  185 +-
 latest/fs/afs/vnode.c                                    |  250 ++-
 latest/fs/afs/vnode.h                                    |   10 
 latest/fs/afs/volume.c                                   |   78 -
 latest/fs/afs/volume.h                                   |   28 
 latest/fs/cachefiles/cf-interface.c                      |    6 
 latest/fs/ext2/dir.c                                     |    6 
 latest/fs/ext3/inode.c                                   |   10 
 latest/fs/freevxfs/vxfs_subr.c                           |    2 
 latest/fs/fscache/Makefile                               |   11 
 latest/fs/fscache/cookie.c                               | 1063 +++++++++++++++
 latest/fs/fscache/fscache-int.h                          |   93 +
 latest/fs/fscache/fsdef.c                                |  113 +
 latest/fs/fscache/main.c                                 |  105 +
 latest/fs/fscache/page.c                                 |  548 +++++++
 latest/fs/nfs/Makefile                                   |    1 
 latest/fs/nfs/client.c                                   |   11 
 latest/fs/nfs/file.c                                     |   33 
 latest/fs/nfs/fscache.c                                  |  349 ++++
 latest/fs/nfs/fscache.h                                  |  466 ++++++
 latest/fs/nfs/inode.c                                    |   22 
 latest/fs/nfs/internal.h                                 |   32 
 latest/fs/nfs/pagelist.c                                 |    3 
 latest/fs/nfs/read.c                                     |   30 
 latest/fs/nfs/super.c                                    |    1 
 latest/fs/nfs/sysctl.c                                   |   43 
 latest/fs/nfs/write.c                                    |   11 
 latest/fs/reiserfs/inode.c                               |   10 
 latest/fs/ufs/dir.c                                      |    6 
 latest/include/linux/fscache-cache.h                     |  243 +++
 latest/include/linux/fscache.h                           |  496 ++++++
 latest/include/linux/nfs4_mount.h                        |    1 
 latest/include/linux/nfs_fs.h                            |    5 
 latest/include/linux/nfs_fs_sb.h                         |    5 
 latest/include/linux/nfs_mount.h                         |    1 
 latest/include/linux/page-flags.h                        |   15 
 latest/include/linux/pagemap.h                           |   11 
 latest/mm/filemap.c                                      |   17 
 latest/mm/migrate.c                                      |    4 
 latest/mm/page_alloc.c                                   |    2 
 latest/mm/readahead.c                                    |   25 
 61 files changed, 5713 insertions(+), 457 deletions(-)

--- NEW FILE linux-2.6-filesystem-caching-for-afs-and-nfs.patch ---
Date: Fri, 14 Jul 2006 16:51:20 +0100
From: David Howells <dhowells at redhat.com>
Subject: [RHEL5 PATCH 20/28] FS-Cache: Provide a filesystem-specific sync'able page bit

The attached patch provides a filesystem-specific page bit that a filesystem
can synchronise upon.  This can be used, for example, by a netfs to synchronise
with CacheFS writing its pages to disk.

The PG_checked bit is replaced with PG_fs_misc, and various operations are
provided based upon that.  The *PageChecked() macros still exist, though now
they just convert to *PageFsMisc() macros.  The name of the "checked" macros
seems appropriate as they're used for metadata page validation by various
filesystems.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 fs/afs/dir.c               |    5 +----
 fs/ext2/dir.c              |    6 +++---
 fs/ext3/inode.c            |   10 +++++-----
 fs/freevxfs/vxfs_subr.c    |    2 +-
 fs/reiserfs/inode.c        |   10 +++++-----
 fs/ufs/dir.c               |    6 +++---
 include/linux/page-flags.h |   15 ++++++++++-----
 include/linux/pagemap.h    |   11 +++++++++++
 mm/filemap.c               |   17 +++++++++++++++++
 mm/migrate.c               |    4 ++--
 mm/page_alloc.c            |    2 +-
 11 files changed, 59 insertions(+), 29 deletions(-)

Index: latest/fs/afs/dir.c
===================================================================
--- latest.orig/fs/afs/dir.c
+++ latest/fs/afs/dir.c
@@ -155,11 +155,9 @@ static inline void afs_dir_check_page(st
 		}
 	}
 
-	SetPageChecked(page);
 	return;
 
  error:
-	SetPageChecked(page);
 	SetPageError(page);
 
 } /* end afs_dir_check_page() */
@@ -191,8 +189,7 @@ static struct page *afs_dir_get_page(str
 		kmap(page);
 		if (!PageUptodate(page))
 			goto fail;
-		if (!PageChecked(page))
-			afs_dir_check_page(dir, page);
+		afs_dir_check_page(dir, page);
 		if (PageError(page))
 			goto fail;
 	}
Index: latest/fs/ext2/dir.c
===================================================================
--- latest.orig/fs/ext2/dir.c
+++ latest/fs/ext2/dir.c
@@ -112,7 +112,7 @@ static void ext2_check_page(struct page 
 	if (offs != limit)
 		goto Eend;
 out:
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	return;
 
 	/* Too bad, we had an error */
@@ -152,7 +152,7 @@ Eend:
 		dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs,
 		(unsigned long) le32_to_cpu(p->inode));
 fail:
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	SetPageError(page);
 }
 
@@ -165,7 +165,7 @@ static struct page * ext2_get_page(struc
 		kmap(page);
 		if (!PageUptodate(page))
 			goto fail;
-		if (!PageChecked(page))
+		if (!PageFsMisc(page))
 			ext2_check_page(page);
 		if (PageError(page))
 			goto fail;
Index: latest/fs/ext3/inode.c
===================================================================
--- latest.orig/fs/ext3/inode.c
+++ latest/fs/ext3/inode.c
@@ -1527,12 +1527,12 @@ static int ext3_journalled_writepage(str
 		goto no_write;
 	}
 
-	if (!page_has_buffers(page) || PageChecked(page)) {
+	if (!page_has_buffers(page) || PageFsMisc(page)) {
 		/*
 		 * It's mmapped pagecache.  Add buffers and journal it.  There
 		 * doesn't seem much point in redirtying the page here.
 		 */
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 		ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
 					ext3_get_block);
 		if (ret != 0) {
@@ -1589,7 +1589,7 @@ static void ext3_invalidatepage(struct p
 	 * If it's a full truncate we just forget about the pending dirtying
 	 */
 	if (offset == 0)
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 
 	journal_invalidatepage(journal, page, offset);
 }
@@ -1598,7 +1598,7 @@ static int ext3_releasepage(struct page 
 {
 	journal_t *journal = EXT3_JOURNAL(page->mapping->host);
 
-	WARN_ON(PageChecked(page));
+	WARN_ON(PageFsMisc(page));
 	if (!page_has_buffers(page))
 		return 0;
 	return journal_try_to_free_buffers(journal, page, wait);
@@ -1694,7 +1694,7 @@ out:
  */
 static int ext3_journalled_set_page_dirty(struct page *page)
 {
-	SetPageChecked(page);
+	SetPageFsMisc(page);
 	return __set_page_dirty_nobuffers(page);
 }
 
Index: latest/fs/freevxfs/vxfs_subr.c
===================================================================
--- latest.orig/fs/freevxfs/vxfs_subr.c
+++ latest/fs/freevxfs/vxfs_subr.c
@@ -78,7 +78,7 @@ vxfs_get_page(struct address_space *mapp
 		kmap(pp);
 		if (!PageUptodate(pp))
 			goto fail;
-		/** if (!PageChecked(pp)) **/
+		/** if (!PageFsMisc(pp)) **/
 			/** vxfs_check_page(pp); **/
 		if (PageError(pp))
 			goto fail;
Index: latest/fs/reiserfs/inode.c
===================================================================
--- latest.orig/fs/reiserfs/inode.c
+++ latest/fs/reiserfs/inode.c
@@ -2347,7 +2347,7 @@ static int reiserfs_write_full_page(stru
 	struct buffer_head *head, *bh;
 	int partial = 0;
 	int nr = 0;
-	int checked = PageChecked(page);
+	int checked = PageFsMisc(page);
 	struct reiserfs_transaction_handle th;
 	struct super_block *s = inode->i_sb;
 	int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize;
@@ -2416,7 +2416,7 @@ static int reiserfs_write_full_page(stru
 	 * blocks we're going to log
 	 */
 	if (checked) {
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 		reiserfs_write_lock(s);
 		error = journal_begin(&th, s, bh_per_page + 1);
 		if (error) {
@@ -2797,7 +2797,7 @@ static void reiserfs_invalidatepage(stru
 	BUG_ON(!PageLocked(page));
 
 	if (offset == 0)
-		ClearPageChecked(page);
+		ClearPageFsMisc(page);
 
 	if (!page_has_buffers(page))
 		goto out;
@@ -2838,7 +2838,7 @@ static int reiserfs_set_page_dirty(struc
 {
 	struct inode *inode = page->mapping->host;
 	if (reiserfs_file_data_log(inode)) {
-		SetPageChecked(page);
+		SetPageFsMisc(page);
 		return __set_page_dirty_nobuffers(page);
 	}
 	return __set_page_dirty_buffers(page);
@@ -2861,7 +2861,7 @@ static int reiserfs_releasepage(struct p
 	struct buffer_head *bh;
 	int ret = 1;
 
-	WARN_ON(PageChecked(page));
+	WARN_ON(PageFsMisc(page));
 	spin_lock(&j->j_dirty_buffers_lock);
 	head = page_buffers(page);
 	bh = head;
Index: latest/fs/ufs/dir.c
===================================================================
--- latest.orig/fs/ufs/dir.c
+++ latest/fs/ufs/dir.c
[...7660 lines suppressed...]
Index: latest/fs/nfs/super.c
===================================================================
--- latest.orig/fs/nfs/super.c
+++ latest/fs/nfs/super.c
@@ -286,6 +286,7 @@ static void nfs_show_mount_options(struc
 		{ NFS_MOUNT_NOAC, ",noac", "" },
 		{ NFS_MOUNT_NONLM, ",nolock", "" },
 		{ NFS_MOUNT_NOACL, ",noacl", "" },
+		{ NFS_MOUNT_FSCACHE, ",fsc", "" },
 		{ 0, NULL, NULL }
 	};
 	const struct proc_nfs_info *nfs_infop;
Index: latest/fs/nfs/sysctl.c
===================================================================
--- latest.orig/fs/nfs/sysctl.c
+++ latest/fs/nfs/sysctl.c
@@ -14,6 +14,7 @@
 #include <linux/nfs_fs.h>
 
 #include "callback.h"
+#include "internal.h"
 
 static const int nfs_set_port_min = 0;
 static const int nfs_set_port_max = 65535;
@@ -55,6 +56,48 @@ static ctl_table nfs_cb_sysctls[] = {
 		.proc_handler	= &proc_dointvec_jiffies,
 		.strategy	= &sysctl_jiffies,
 	},
+#ifdef CONFIG_NFS_FSCACHE
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_from_error",
+		.data = &nfs_fscache_from_error,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_to_error",
+		.data = &nfs_fscache_to_error,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_uncache_page",
+		.data = &nfs_fscache_uncache_page,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_to_pages",
+		.data = &nfs_fscache_to_pages,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec_minmax,
+	},
+	{
+		.ctl_name = CTL_UNNUMBERED,
+		.procname = "fscache_from_pages",
+		.data = &nfs_fscache_from_pages,
+		.maxlen = sizeof(int),
+		.mode = 0644,
+		.proc_handler = &proc_dointvec,
+	},
+#endif
 	{ .ctl_name = 0 }
 };
 
Index: latest/fs/nfs/write.c
===================================================================
--- latest.orig/fs/nfs/write.c
+++ latest/fs/nfs/write.c
@@ -63,6 +63,7 @@
 
 #include "delegation.h"
 #include "iostat.h"
+#include "internal.h"
 
 #define NFSDBG_FACILITY		NFSDBG_PAGECACHE
 
@@ -163,6 +164,9 @@ static void nfs_grow_file(struct page *p
 		return;
 	nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);
 	i_size_write(inode, end);
+#ifdef FSCACHE_WRITE_SUPPORT
+	nfs_set_fscsize(NFS_SERVER(inode), NFS_I(inode), end);
+#endif
 }
 
 /* We can set the PG_uptodate flag if we see that a write request
@@ -342,6 +346,9 @@ do_it:
 		err = -EBADF;
 		goto out;
 	}
+
+	nfs_writepage_to_fscache(inode, page);
+
 	lock_kernel();
 	if (!IS_SYNC(inode) && inode_referenced) {
 		err = nfs_writepage_async(ctx, inode, page, 0, offset);
@@ -424,7 +431,7 @@ static int nfs_inode_add_request(struct 
 		if (nfs_have_delegation(inode, FMODE_WRITE))
 			nfsi->change_attr++;
 	}
-	SetPagePrivate(req->wb_page);
+	SetPageNfsWriting(req->wb_page);
 	nfsi->npages++;
 	atomic_inc(&req->wb_count);
 	return 0;
@@ -441,7 +448,7 @@ static void nfs_inode_remove_request(str
 	BUG_ON (!NFS_WBACK_BUSY(req));
 
 	spin_lock(&nfsi->req_lock);
-	ClearPagePrivate(req->wb_page);
+	ClearPageNfsWriting(req->wb_page);
 	radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index);
 	nfsi->npages--;
 	if (!nfsi->npages) {
Index: latest/include/linux/nfs4_mount.h
===================================================================
--- latest.orig/include/linux/nfs4_mount.h
+++ latest/include/linux/nfs4_mount.h
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
 #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
 #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
+#define NFS4_MOUNT_FSCACHE	0x4000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 #endif
Index: latest/include/linux/nfs_fs.h
===================================================================
--- latest.orig/include/linux/nfs_fs.h
+++ latest/include/linux/nfs_fs.h
@@ -29,6 +29,7 @@
 
 #include <linux/rwsem.h>
 #include <linux/mempool.h>
+#include <linux/fscache.h>
 
 /*
  * Enable debugging support for nfs client.
@@ -180,6 +181,9 @@ struct nfs_inode {
 	int			 delegation_state;
 	struct rw_semaphore	rwsem;
 #endif /* CONFIG_NFS_V4*/
+#ifdef CONFIG_NFS_FSCACHE
+	struct fscache_cookie	*fscache;
+#endif
 	struct inode		vfs_inode;
 };
 
@@ -582,6 +586,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_ROOT		0x0080
 #define NFSDBG_CALLBACK		0x0100
 #define NFSDBG_CLIENT		0x0200
+#define NFSDBG_FSCACHE		0x0400
 #define NFSDBG_ALL		0xFFFF
 
 #ifdef __KERNEL__
Index: latest/include/linux/nfs_fs_sb.h
===================================================================
--- latest.orig/include/linux/nfs_fs_sb.h
+++ latest/include/linux/nfs_fs_sb.h
@@ -3,6 +3,7 @@
 
 #include <linux/list.h>
 #include <linux/backing-dev.h>
+#include <linux/fscache.h>
 
 struct nfs_iostats;
 
@@ -66,6 +67,10 @@ struct nfs_client {
 	char			cl_ipaddr[16];
 	unsigned char		cl_id_uniquifier;
 #endif
+
+#ifdef CONFIG_NFS_FSCACHE
+	struct fscache_cookie	*fscache;	/* client index cache cookie */
+#endif
 };
 
 /*
Index: latest/include/linux/nfs_mount.h
===================================================================
--- latest.orig/include/linux/nfs_mount.h
+++ latest/include/linux/nfs_mount.h
@@ -61,6 +61,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_NOACL		0x0800	/* 4 */
 #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE	0x4000
 #define NFS_MOUNT_FLAGMASK	0xFFFF
 
 #endif

linux-2.6-mm-tracking-dirty-pages.patch:
 latest/fs/buffer.c               |    2 
 latest/include/linux/mm.h        |   34 ++++++
 latest/include/linux/rmap.h      |    8 +
 latest/include/linux/writeback.h |    1 
 latest/mm/fremap.c               |    4 
 latest/mm/memory.c               |   29 ++++-
 latest/mm/mmap.c                 |   10 -
 latest/mm/mprotect.c             |   21 +---
 latest/mm/msync.c                |  196 ++++++---------------------------------
 latest/mm/page-writeback.c       |   17 ++-
 latest/mm/rmap.c                 |   65 ++++++++++++
 mm/memory.c                      |   24 +++-
 mm/mprotect.c                    |   34 ++++--
 mm/page-writeback.c              |   12 ++
 mm/rmap.c                        |    2 
 15 files changed, 245 insertions(+), 214 deletions(-)

--- NEW FILE linux-2.6-mm-tracking-dirty-pages.patch ---
Date: Wed, 19 Jul 2006 00:03:33 +0200
From: Peter Zijlstra <pzijlstr at redhat.com>
Subject: Re: [RHEL5][PATCH 1/8] mm: tracking shared dirty pages

Respin against current Rawhide kernel.

The other patches apply with a little offset/fuzz but end up rightly.
It even compiles :-)

Don, is this enough, or would you like me to repost the whole series
(minus 8/8) fuzzless?

---


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

Tracking of dirty pages in shared writeable mmap()s.

The idea is simple: write protect clean shared writeable pages, catch the
write-fault, make writeable and set dirty.  On page write-back clean all
the PTE dirty bits and write protect them once again.

The implementation is a tad harder, mainly because the default
backing_dev_info capabilities were too loosely maintained. Hence it is
not enough to test the backing_dev_info for cap_account_dirty.

The current heuristic is as follows, a VMA is eligible when:
 - its shared writeable
    (vm_flags & (VM_WRITE|VM_SHARED)) == (VM_WRITE|VM_SHARED)
 - it is not a 'special' mapping
    (vm_flags & (VM_PFNMAP|VM_INSERTPAGE)) == 0
 - the backing_dev_info is cap_account_dirty
    mapping_cap_account_dirty(vma->vm_file->f_mapping)
 - f_op->mmap() didn't change the default page protection

Page from remap_pfn_range() are explicitly excluded because their
COW semantics are already horrid enough (see vm_normal_page() in
do_wp_page()) and because they don't have a backing store anyway.

mprotect() is taught about the new behaviour as well. However it
fudges the last condition.

Cleaning the pages on write-back is done with page_mkclean() a new
rmap call. It cleans and wrprotects all PTEs of dirty accountable
pages.

Finally, in fs/buffers.c:try_to_free_buffers(); remove clear_page_dirty()
from under ->private_lock. This seems to be safe, since ->private_lock
is used to serialize access to the buffers, not the page itself.
This is needed because clear_page_dirty() will call into page_mkclean()
and would thereby violate locking order.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Hugh Dickins <hugh at veritas
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 fs/buffer.c          |    2 -
 include/linux/mm.h   |   34 ++++++++++++++++++++++++++
 include/linux/rmap.h |    8 ++++++
 mm/memory.c          |   29 ++++++++++++++++++----
 mm/mmap.c            |   10 +++----
 mm/mprotect.c        |   21 ++++++----------
 mm/page-writeback.c  |   17 ++++++++++---
 mm/rmap.c            |   65 +++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 156 insertions(+), 30 deletions(-)

Index: latest/fs/buffer.c
===================================================================
--- latest.orig/fs/buffer.c
+++ latest/fs/buffer.c
@@ -2984,6 +2984,7 @@ int try_to_free_buffers(struct page *pag
 
 	spin_lock(&mapping->private_lock);
 	ret = drop_buffers(page, &buffers_to_free);
+	spin_unlock(&mapping->private_lock);
 	if (ret) {
 		/*
 		 * If the filesystem writes its buffers by hand (eg ext3)
@@ -2995,7 +2996,6 @@ int try_to_free_buffers(struct page *pag
 		 */
 		clear_page_dirty(page);
 	}
-	spin_unlock(&mapping->private_lock);
 out:
 	if (buffers_to_free) {
 		struct buffer_head *bh = buffers_to_free;
Index: latest/include/linux/mm.h
===================================================================
--- latest.orig/include/linux/mm.h
+++ latest/include/linux/mm.h
@@ -15,6 +15,7 @@
 #include <linux/fs.h>
 #include <linux/mutex.h>
 #include <linux/debug_locks.h>
+#include <linux/backing-dev.h>
 
 struct mempolicy;
 struct anon_vma;
@@ -801,6 +802,39 @@ struct shrinker;
 extern struct shrinker *set_shrinker(int, shrinker_t);
 extern void remove_shrinker(struct shrinker *shrinker);
 
+/*
+ * Some shared mappigns will want the pages marked read-only
+ * to track write events. If so, we'll downgrade vm_page_prot
+ * to the private version (using protection_map[] without the
+ * VM_SHARED bit).
+ */
+static inline int vma_wants_writenotify(struct vm_area_struct *vma)
+{
+	unsigned int vm_flags = vma->vm_flags;
+
+	/* If it was private or non-writable, the write bit is already clear */
+	if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
+		return 0;
+
+	/* The backer wishes to know when pages are first written to? */
+	if (vma->vm_ops && vma->vm_ops->page_mkwrite)
+		return 1;
+
+	/* The open routine did something to the protections already? */
+	if (pgprot_val(vma->vm_page_prot) !=
+	    pgprot_val(protection_map[vm_flags &
+		    (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]))
+		return 0;
+
+	/* Specialty mapping? */
+	if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE))
+		return 0;
+
+	/* Can the mapping track the dirty pages? */
+	return vma->vm_file && vma->vm_file->f_mapping &&
+		mapping_cap_account_dirty(vma->vm_file->f_mapping);
+}
+
 extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl));
 
 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
Index: latest/include/linux/rmap.h
===================================================================
--- latest.orig/include/linux/rmap.h
+++ latest/include/linux/rmap.h
@@ -103,6 +103,14 @@ pte_t *page_check_address(struct page *,
  */
 unsigned long page_address_in_vma(struct page *, struct vm_area_struct *);
 
+/*
+ * Cleans the PTEs of shared mappings.
+ * (and since clean PTEs should also be readonly, write protects them too)
+ *
+ * returns the number of cleaned PTEs.
+ */
+int page_mkclean(struct page *);
+
 #else	/* !CONFIG_MMU */
 
 #define anon_vma_init()		do {} while (0)
Index: latest/mm/memory.c
===================================================================
--- latest.orig/mm/memory.c
+++ latest/mm/memory.c
@@ -1458,14 +1458,19 @@ static int do_wp_page(struct mm_struct *
 {
 	struct page *old_page, *new_page;
 	pte_t entry;
-	int reuse, ret = VM_FAULT_MINOR;
+	int reuse = 0, ret = VM_FAULT_MINOR;
+	struct page *dirty_page = NULL;
 
 	old_page = vm_normal_page(vma, address, orig_pte);
 	if (!old_page)
 		goto gotten;
 
-	if (unlikely((vma->vm_flags & (VM_SHARED|VM_WRITE)) ==
-				(VM_SHARED|VM_WRITE))) {
+	/*
+	 * Only catch write-faults on shared writable pages, read-only
+	 * shared pages can get COWed by get_user_pages(.write=1, .force=1).
+	 */
+	if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
+					(VM_WRITE|VM_SHARED))) {
 		if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
 			/*
 			 * Notify the address space that the page is about to
@@ -1494,13 +1499,12 @@ static int do_wp_page(struct mm_struct *
 			if (!pte_same(*page_table, orig_pte))
 				goto unlock;
 		}
-
+		dirty_page = old_page;
+		get_page(dirty_page);
 		reuse = 1;
 	} else if (PageAnon(old_page) && !TestSetPageLocked(old_page)) {
 		reuse = can_share_swap_page(old_page);
 		unlock_page(old_page);
-	} else {
-		reuse = 0;
 	}
 
 	if (reuse) {
@@ -1566,6 +1570,10 @@ gotten:
 		page_cache_release(old_page);
 unlock:
 	pte_unmap_unlock(page_table, ptl);
+	if (dirty_page) {
+		set_page_dirty(dirty_page);
+		put_page(dirty_page);
+	}
 	return ret;
 oom:
 	if (old_page)
@@ -2098,6 +2106,7 @@ static int do_no_page(struct mm_struct *
 	unsigned int sequence = 0;
 	int ret = VM_FAULT_MINOR;
 	int anon = 0;
+	struct page *dirty_page = NULL;
 
 	pte_unmap(page_table);
 	BUG_ON(vma->vm_flags & VM_PFNMAP);
@@ -2192,6 +2201,10 @@ retry:
 		} else {
 			inc_mm_counter(mm, file_rss);
 			page_add_file_rmap(new_page);
+			if (write_access) {
+				dirty_page = new_page;
+				get_page(dirty_page);
+			}
 		}
 	} else {
 		/* One of our sibling threads was faster, back out. */
@@ -2204,6 +2217,10 @@ retry:
 	lazy_mmu_prot_update(entry);
 unlock:
 	pte_unmap_unlock(page_table, ptl);
+	if (dirty_page) {
+		set_page_dirty(dirty_page);
+		put_page(dirty_page);
+	}
 	return ret;
 oom:
 	page_cache_release(new_page);
Index: latest/mm/mmap.c
===================================================================
--- latest.orig/mm/mmap.c
+++ latest/mm/mmap.c
@@ -1097,12 +1097,6 @@ munmap_back:
 			goto free_vma;
 	}
 
-	/* Don't make the VMA automatically writable if it's shared, but the
-	 * backer wishes to know when pages are first written to */
-	if (vma->vm_ops && vma->vm_ops->page_mkwrite)
-		vma->vm_page_prot =
-			protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC)];
-
 	/* We set VM_ACCOUNT in a shared mapping's vm_flags, to inform
 	 * shmem_zero_setup (perhaps called through /dev/zero's ->mmap)
 	 * that memory reservation must be checked; but that reservation
@@ -1120,6 +1114,10 @@ munmap_back:
 	pgoff = vma->vm_pgoff;
 	vm_flags = vma->vm_flags;
 
+	if (vma_wants_writenotify(vma))
+		vma->vm_page_prot =
+			protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC)];
+
 	if (!file || !vma_merge(mm, prev, addr, vma->vm_end,
 			vma->vm_flags, NULL, file, pgoff, vma_policy(vma))) {
 		file = vma->vm_file;
Index: latest/mm/mprotect.c
===================================================================
--- latest.orig/mm/mprotect.c
+++ latest/mm/mprotect.c
@@ -124,8 +124,6 @@ mprotect_fixup(struct vm_area_struct *vm
 	unsigned long oldflags = vma->vm_flags;
 	long nrpages = (end - start) >> PAGE_SHIFT;
 	unsigned long charged = 0, old_end = vma->vm_end;
-	unsigned int mask;
-	pgprot_t newprot;
 	pgoff_t pgoff;
 	int error;
 
@@ -177,26 +175,23 @@ mprotect_fixup(struct vm_area_struct *vm
 	}
 
 success:
-	/* Don't make the VMA automatically writable if it's shared, but the
-	 * backer wishes to know when pages are first written to */
-	mask = VM_READ|VM_WRITE|VM_EXEC|VM_SHARED;
-	if (vma->vm_ops && vma->vm_ops->page_mkwrite)
-		mask &= ~VM_SHARED;
-
-	newprot = protection_map[newflags & mask];
-
 	/*
 	 * vm_flags and vm_page_prot are protected by the mmap_sem
 	 * held in write mode.
 	 */
 	vma->vm_flags = newflags;
-	vma->vm_page_prot = newprot;
 	if (oldflags & VM_EXEC)
 		arch_remove_exec_range(current->mm, old_end);
+	vma->vm_page_prot = protection_map[newflags &
+		(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
+	if (vma_wants_writenotify(vma))
+		vma->vm_page_prot = protection_map[newflags &
+			(VM_READ|VM_WRITE|VM_EXEC)];
+
 	if (is_vm_hugetlb_page(vma))
-		hugetlb_change_protection(vma, start, end, newprot);
+		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 	else
-		change_protection(vma, start, end, newprot);
+		change_protection(vma, start, end, vma->vm_page_prot);
 	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
 	vm_stat_account(mm, newflags, vma->vm_file, nrpages);
 	return 0;
Index: latest/mm/page-writeback.c
===================================================================
--- latest.orig/mm/page-writeback.c
+++ latest/mm/page-writeback.c
@@ -29,6 +29,7 @@
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
+#include <linux/rmap.h>
 
 /*
  * The maximum number of pages to writeout in a single bdflush/kupdate
@@ -550,7 +551,7 @@ int do_writepages(struct address_space *
 		return 0;
 	wbc->for_writepages = 1;
 	if (mapping->a_ops->writepages)
-		ret =  mapping->a_ops->writepages(mapping, wbc);
+		ret = mapping->a_ops->writepages(mapping, wbc);
 	else
 		ret = generic_writepages(mapping, wbc);
 	wbc->for_writepages = 0;
@@ -712,9 +713,15 @@ int test_clear_page_dirty(struct page *p
 			radix_tree_tag_clear(&mapping->page_tree,
 						page_index(page),
 						PAGECACHE_TAG_DIRTY);
-			if (mapping_cap_account_dirty(mapping))
-				__dec_zone_page_state(page, NR_FILE_DIRTY);
 			write_unlock_irqrestore(&mapping->tree_lock, flags);
+			/*
+			 * We can continue to use `mapping' here because the
+			 * page is locked, which pins the address_space
+			 */
+			if (mapping_cap_account_dirty(mapping)) {
+				page_mkclean(page);
+				dec_zone_page_state(page, NR_FILE_DIRTY);
+			}
 			return 1;
 		}
 		write_unlock_irqrestore(&mapping->tree_lock, flags);
@@ -744,8 +751,10 @@ int clear_page_dirty_for_io(struct page 
 
 	if (mapping) {
 		if (TestClearPageDirty(page)) {
-			if (mapping_cap_account_dirty(mapping))
+			if (mapping_cap_account_dirty(mapping)) {
+				page_mkclean(page);
 				dec_zone_page_state(page, NR_FILE_DIRTY);
+			}
 			return 1;
 		}
 		return 0;
Index: latest/mm/rmap.c
===================================================================
--- latest.orig/mm/rmap.c
+++ latest/mm/rmap.c
@@ -434,6 +434,71 @@ int page_referenced(struct page *page, i
 	return referenced;
 }
 
+static int page_mkclean_one(struct page *page, struct vm_area_struct *vma)
+{
+	struct mm_struct *mm = vma->vm_mm;
+	unsigned long address;
+	pte_t *pte, entry;
+	spinlock_t *ptl;
+	int ret = 0;
+
+	address = vma_address(page, vma);
+	if (address == -EFAULT)
+		goto out;
+
+	pte = page_check_address(page, mm, address, &ptl);
+	if (!pte)
+		goto out;
+
+	if (!pte_dirty(*pte) && !pte_write(*pte))
+		goto unlock;
+
+	entry = ptep_get_and_clear(mm, address, pte);
+	entry = pte_mkclean(entry);
+	entry = pte_wrprotect(entry);
+	ptep_establish(vma, address, pte, entry);
+	lazy_mmu_prot_update(entry);
+	ret = 1;
+
+unlock:
+	pte_unmap_unlock(pte, ptl);
+out:
+	return ret;
+}
+
+static int page_mkclean_file(struct address_space *mapping, struct page *page)
+{
+	pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+	struct vm_area_struct *vma;
+	struct prio_tree_iter iter;
+	int ret = 0;
+
+	BUG_ON(PageAnon(page));
+
+	spin_lock(&mapping->i_mmap_lock);
+	vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
+		if (vma->vm_flags & VM_SHARED)
+			ret += page_mkclean_one(page, vma);
+	}
+	spin_unlock(&mapping->i_mmap_lock);
+	return ret;
+}
+
+int page_mkclean(struct page *page)
+{
+	int ret = 0;
+
+	BUG_ON(!PageLocked(page));
+
+	if (page_mapped(page)) {
+		struct address_space *mapping = page_mapping(page);
+		if (mapping)
+			ret = page_mkclean_file(mapping, page);
+	}
+
+	return ret;
+}
+
 /**
  * page_set_anon_rmap - setup new anonymous rmap
  * @page:	the page to add the mapping to
Date: Mon, 17 Jul 2006 20:32:34 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 2/8] mm: balance dirty pages


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

Now that we can detect writers of shared mappings, throttle them.  Avoids OOM
by surprise.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 include/linux/writeback.h |    1 +
 mm/memory.c               |    5 +++--
 mm/page-writeback.c       |   10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

Index: latest/include/linux/writeback.h
===================================================================
--- latest.orig/include/linux/writeback.h
+++ latest/include/linux/writeback.h
@@ -115,6 +115,7 @@ int sync_page_range(struct inode *inode,
 			loff_t pos, loff_t count);
 int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
 			   loff_t pos, loff_t count);
+void set_page_dirty_balance(struct page *page);
 
 /* pdflush.c */
 extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl
Index: latest/mm/memory.c
===================================================================
--- latest.orig/mm/memory.c
+++ latest/mm/memory.c
@@ -49,6 +49,7 @@
 #include <linux/module.h>
 #include <linux/delayacct.h>
 #include <linux/init.h>
+#include <linux/writeback.h>
 
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
@@ -1571,7 +1572,7 @@ gotten:
 unlock:
 	pte_unmap_unlock(page_table, ptl);
 	if (dirty_page) {
-		set_page_dirty(dirty_page);
+		set_page_dirty_balance(dirty_page);
 		put_page(dirty_page);
 	}
 	return ret;
@@ -2218,7 +2219,7 @@ retry:
 unlock:
 	pte_unmap_unlock(page_table, ptl);
 	if (dirty_page) {
-		set_page_dirty(dirty_page);
+		set_page_dirty_balance(dirty_page);
 		put_page(dirty_page);
 	}
 	return ret;
Index: latest/mm/page-writeback.c
===================================================================
--- latest.orig/mm/page-writeback.c
+++ latest/mm/page-writeback.c
@@ -244,6 +244,16 @@ static void balance_dirty_pages(struct a
 		pdflush_operation(background_writeout, 0);
 }
 
+void set_page_dirty_balance(struct page *page)
+{
+	if (set_page_dirty(page)) {
+		struct address_space *mapping = page_mapping(page);
+
+		if (mapping)
+			balance_dirty_pages_ratelimited(mapping);
+	}
+}
+
 /**
  * balance_dirty_pages_ratelimited_nr - balance dirty memory state
  * @mapping: address_space which was dirtied
Date: Mon, 17 Jul 2006 20:32:41 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 3/8] mm: optimize the new mprotect code a bit


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

mprotect() resets the page protections, which could result in extra write
faults for those pages whose dirty state we track using write faults
and are dirty already.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
---
 mm/mprotect.c |   31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

Index: latest/mm/mprotect.c
===================================================================
--- latest.orig/mm/mprotect.c
+++ latest/mm/mprotect.c
@@ -28,7 +28,8 @@
 #include <asm/tlbflush.h>
 
 static void change_pte_range(struct mm_struct *mm, pmd_t *pmd,
-		unsigned long addr, unsigned long end, pgprot_t newprot)
+		unsigned long addr, unsigned long end, pgprot_t newprot,
+		int dirty_accountable)
 {
 	pte_t *pte, oldpte;
 	spinlock_t *ptl;
@@ -43,7 +44,14 @@ static void change_pte_range(struct mm_s
 			 * bits by wiping the pte and then setting the new pte
 			 * into place.
 			 */
-			ptent = pte_modify(ptep_get_and_clear(mm, addr, pte), newprot);
+			ptent = ptep_get_and_clear(mm, addr, pte);
+			ptent = pte_modify(ptent, newprot);
+			/*
+			 * Avoid taking write faults for pages we know to be
+			 * dirty.
+			 */
+			if (dirty_accountable && pte_dirty(ptent))
+				ptent = pte_mkwrite(ptent);
 			set_pte_at(mm, addr, pte, ptent);
 			lazy_mmu_prot_update(ptent);
 #ifdef CONFIG_MIGRATION
@@ -67,7 +75,8 @@ static void change_pte_range(struct mm_s
 }
 
 static inline void change_pmd_range(struct mm_struct *mm, pud_t *pud,
-		unsigned long addr, unsigned long end, pgprot_t newprot)
+		unsigned long addr, unsigned long end, pgprot_t newprot,
+		int dirty_accountable)
 {
 	pmd_t *pmd;
 	unsigned long next;
@@ -77,12 +86,13 @@ static inline void change_pmd_range(stru
 		next = pmd_addr_end(addr, end);
 		if (pmd_none_or_clear_bad(pmd))
 			continue;
-		change_pte_range(mm, pmd, addr, next, newprot);
+		change_pte_range(mm, pmd, addr, next, newprot, dirty_accountable);
 	} while (pmd++, addr = next, addr != end);
 }
 
 static inline void change_pud_range(struct mm_struct *mm, pgd_t *pgd,
-		unsigned long addr, unsigned long end, pgprot_t newprot)
+		unsigned long addr, unsigned long end, pgprot_t newprot,
+		int dirty_accountable)
 {
 	pud_t *pud;
 	unsigned long next;
@@ -92,12 +102,13 @@ static inline void change_pud_range(stru
 		next = pud_addr_end(addr, end);
 		if (pud_none_or_clear_bad(pud))
 			continue;
-		change_pmd_range(mm, pud, addr, next, newprot);
+		change_pmd_range(mm, pud, addr, next, newprot, dirty_accountable);
 	} while (pud++, addr = next, addr != end);
 }
 
 static void change_protection(struct vm_area_struct *vma,
-		unsigned long addr, unsigned long end, pgprot_t newprot)
+		unsigned long addr, unsigned long end, pgprot_t newprot,
+		int dirty_accountable)
 {
 	struct mm_struct *mm = vma->vm_mm;
 	pgd_t *pgd;
@@ -111,7 +122,7 @@ static void change_protection(struct vm_
 		next = pgd_addr_end(addr, end);
 		if (pgd_none_or_clear_bad(pgd))
 			continue;
-		change_pud_range(mm, pgd, addr, next, newprot);
+		change_pud_range(mm, pgd, addr, next, newprot, dirty_accountable);
 	} while (pgd++, addr = next, addr != end);
 	flush_tlb_range(vma, start, end);
 }
@@ -126,6 +137,7 @@ mprotect_fixup(struct vm_area_struct *vm
 	unsigned long charged = 0, old_end = vma->vm_end;
 	pgoff_t pgoff;
 	int error;
+	int dirty_accountable = 0;
 
 	if (newflags == oldflags) {
 		*pprev = vma;
@@ -184,14 +196,16 @@ success:
 		arch_remove_exec_range(current->mm, old_end);
 	vma->vm_page_prot = protection_map[newflags &
 		(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)];
-	if (vma_wants_writenotify(vma))
+	if (vma_wants_writenotify(vma)) {
 		vma->vm_page_prot = protection_map[newflags &
 			(VM_READ|VM_WRITE|VM_EXEC)];
+		dirty_accountable = 1;
+	}
 
 	if (is_vm_hugetlb_page(vma))
 		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 	else
-		change_protection(vma, start, end, vma->vm_page_prot);
+		change_protection(vma, start, end, vma->vm_page_prot, dirty_accountable);
 	vm_stat_account(mm, oldflags, vma->vm_file, -nrpages);
 	vm_stat_account(mm, newflags, vma->vm_file, nrpages);
 	return 0;
Date: Mon, 17 Jul 2006 20:32:49 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 4/8] mm: small cleanup of install_page()


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

Smallish cleanup to install_page(), could save a memory read (haven't checked
the asm output) and sure looks nicer.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 mm/fremap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: latest/mm/fremap.c
===================================================================
--- latest.orig/mm/fremap.c
+++ latest/mm/fremap.c
@@ -81,9 +81,9 @@ int install_page(struct mm_struct *mm, s
 		inc_mm_counter(mm, file_rss);
 
 	flush_icache_page(vma, page);
-	set_pte_at(mm, addr, pte, mk_pte(page, prot));
+	pte_val = mk_pte(page, prot);
+	set_pte_at(mm, addr, pte, pte_val);
 	page_add_file_rmap(page);
-	pte_val = *pte;
 	update_mmu_cache(vma, addr, pte_val);
 	lazy_mmu_prot_update(pte_val);
 	err = 0;
Date: Mon, 17 Jul 2006 20:32:56 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 5/8] mm: fixup do_wp_page()


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

Wrt. the recent modifications in do_wp_page() Hugh Dickins pointed out:

"I now realize it's right to the first
order (normal case) and to the second order (ptrace poke), but not
to the third order (ptrace poke anon page here to be COWed -
perhaps can't occur without intervening mprotects)."

This patch restores the old COW behaviour for anonymous pages.

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Acked-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 mm/memory.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

Index: latest/mm/memory.c
===================================================================
--- latest.orig/mm/memory.c
+++ latest/mm/memory.c
@@ -1467,11 +1467,21 @@ static int do_wp_page(struct mm_struct *
 		goto gotten;
 
 	/*
-	 * Only catch write-faults on shared writable pages, read-only
-	 * shared pages can get COWed by get_user_pages(.write=1, .force=1).
+	 * Take out anonymous pages first, anonymous shared vmas are
+	 * not dirty accountable.
 	 */
-	if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
+	if (PageAnon(old_page)) {
+		if (!TestSetPageLocked(old_page)) {
+			reuse = can_share_swap_page(old_page);
+			unlock_page(old_page);
+		}
+	} else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
 					(VM_WRITE|VM_SHARED))) {
+		/*
+		 * Only catch write-faults on shared writable pages,
+		 * read-only shared pages can get COWed by
+		 * get_user_pages(.write=1, .force=1).
+		 */
 		if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
 			/*
 			 * Notify the address space that the page is about to
@@ -1503,9 +1513,6 @@ static int do_wp_page(struct mm_struct *
 		dirty_page = old_page;
 		get_page(dirty_page);
 		reuse = 1;
-	} else if (PageAnon(old_page) && !TestSetPageLocked(old_page)) {
-		reuse = can_share_swap_page(old_page);
-		unlock_page(old_page);
 	}
 
 	if (reuse) {
Date: Mon, 17 Jul 2006 20:33:03 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 6/8] mm: msync cleanup


From: Peter Zijlstra <a.p.zijlstra at chello.nl>

With the tracking of dirty pages properly done now, msync doesn't need to scan
the PTEs anymore to determine the dirty status.

From: Hugh Dickins <hugh at veritas.com>

In looking to do that, I made some other tidyups: can remove several
#includes, and sys_msync loop termination not quite right.

Most of those points are criticisms of the existing sys_msync, not of your
patch.  In particular, the loop termination errors were introduced in 2.6.17:
I did notice this shortly before it came out, but decided I was more likely to
get it wrong myself, and make matters worse if I tried to rush a last-minute
fix in.  And it's not terribly likely to go wrong, nor disastrous if it does
go wrong (may miss reporting an unmapped area; may also fsync file of a
following vma).

Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 mm/msync.c |  196 ++++++++-------------------------------------------
 1 file changed, 33 insertions(+), 163 deletions(-)

Index: latest/mm/msync.c
===================================================================
--- latest.orig/mm/msync.c
+++ latest/mm/msync.c
@@ -7,149 +7,33 @@
 /*
  * The msync() system call.
  */
-#include <linux/slab.h>
-#include <linux/pagemap.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/hugetlb.h>
-#include <linux/writeback.h>
 #include <linux/file.h>
 #include <linux/syscalls.h>
 
-#include <asm/pgtable.h>
-#include <asm/tlbflush.h>
-
-static unsigned long msync_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
-				unsigned long addr, unsigned long end)
-{
-	pte_t *pte;
-	spinlock_t *ptl;
-	int progress = 0;
-	unsigned long ret = 0;
-
-again:
-	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
-	do {
-		struct page *page;
-
-		if (progress >= 64) {
-			progress = 0;
-			if (need_resched() || need_lockbreak(ptl))
-				break;
-		}
-		progress++;
-		if (!pte_present(*pte))
-			continue;
-		if (!pte_maybe_dirty(*pte))
-			continue;
-		page = vm_normal_page(vma, addr, *pte);
-		if (!page)
-			continue;
-		if (ptep_clear_flush_dirty(vma, addr, pte) ||
-				page_test_and_clear_dirty(page))
-			ret += set_page_dirty(page);
-		progress += 3;
-	} while (pte++, addr += PAGE_SIZE, addr != end);
-	pte_unmap_unlock(pte - 1, ptl);
-	cond_resched();
-	if (addr != end)
-		goto again;
-	return ret;
-}
-
-static inline unsigned long msync_pmd_range(struct vm_area_struct *vma,
-			pud_t *pud, unsigned long addr, unsigned long end)
-{
-	pmd_t *pmd;
-	unsigned long next;
-	unsigned long ret = 0;
-
-	pmd = pmd_offset(pud, addr);
-	do {
-		next = pmd_addr_end(addr, end);
-		if (pmd_none_or_clear_bad(pmd))
-			continue;
-		ret += msync_pte_range(vma, pmd, addr, next);
-	} while (pmd++, addr = next, addr != end);
-	return ret;
-}
-
-static inline unsigned long msync_pud_range(struct vm_area_struct *vma,
-			pgd_t *pgd, unsigned long addr, unsigned long end)
-{
-	pud_t *pud;
-	unsigned long next;
-	unsigned long ret = 0;
-
-	pud = pud_offset(pgd, addr);
-	do {
-		next = pud_addr_end(addr, end);
-		if (pud_none_or_clear_bad(pud))
-			continue;
-		ret += msync_pmd_range(vma, pud, addr, next);
-	} while (pud++, addr = next, addr != end);
-	return ret;
-}
-
-static unsigned long msync_page_range(struct vm_area_struct *vma,
-				unsigned long addr, unsigned long end)
-{
-	pgd_t *pgd;
-	unsigned long next;
-	unsigned long ret = 0;
-
-	/* For hugepages we can't go walking the page table normally,
-	 * but that's ok, hugetlbfs is memory based, so we don't need
-	 * to do anything more on an msync().
-	 */
-	if (vma->vm_flags & VM_HUGETLB)
-		return 0;
-
-	BUG_ON(addr >= end);
-	pgd = pgd_offset(vma->vm_mm, addr);
-	flush_cache_range(vma, addr, end);
-	do {
-		next = pgd_addr_end(addr, end);
-		if (pgd_none_or_clear_bad(pgd))
-			continue;
-		ret += msync_pud_range(vma, pgd, addr, next);
-	} while (pgd++, addr = next, addr != end);
-	return ret;
-}
-
 /*
  * MS_SYNC syncs the entire file - including mappings.
  *
- * MS_ASYNC does not start I/O (it used to, up to 2.5.67).  Instead, it just
- * marks the relevant pages dirty.  The application may now run fsync() to
+ * MS_ASYNC does not start I/O (it used to, up to 2.5.67).
+ * Nor does it marks the relevant pages dirty (it used to up to 2.6.17).
+ * Now it doesn't do anything, since dirty pages are properly tracked.
+ *
+ * The application may now run fsync() to
  * write out the dirty pages and wait on the writeout and check the result.
  * Or the application may run fadvise(FADV_DONTNEED) against the fd to start
  * async writeout immediately.
  * So by _not_ starting I/O in MS_ASYNC we provide complete flexibility to
  * applications.
  */
-static int msync_interval(struct vm_area_struct *vma, unsigned long addr,
-			unsigned long end, int flags,
-			unsigned long *nr_pages_dirtied)
-{
-	struct file *file = vma->vm_file;
-
-	if ((flags & MS_INVALIDATE) && (vma->vm_flags & VM_LOCKED))
-		return -EBUSY;
-
-	if (file && (vma->vm_flags & VM_SHARED))
-		*nr_pages_dirtied = msync_page_range(vma, addr, end);
-	return 0;
-}
-
 asmlinkage long sys_msync(unsigned long start, size_t len, int flags)
 {
 	unsigned long end;
+	struct mm_struct *mm = current->mm;
 	struct vm_area_struct *vma;
 	int unmapped_error = 0;
 	int error = -EINVAL;
-	int done = 0;
 
 	if (flags & ~(MS_ASYNC | MS_INVALIDATE | MS_SYNC))
 		goto out;
@@ -169,64 +53,50 @@ asmlinkage long sys_msync(unsigned long 
 	 * If the interval [start,end) covers some unmapped address ranges,
 	 * just ignore them, but return -ENOMEM at the end.
 	 */
-	down_read(&current->mm->mmap_sem);
-	vma = find_vma(current->mm, start);
-	if (!vma) {
-		error = -ENOMEM;
-		goto out_unlock;
-	}
-	do {
-		unsigned long nr_pages_dirtied = 0;
+	down_read(&mm->mmap_sem);
+	vma = find_vma(mm, start);
+	for (;;) {
 		struct file *file;
 
+		/* Still start < end. */
+		error = -ENOMEM;
+		if (!vma)
+			goto out_unlock;
 		/* Here start < vma->vm_end. */
 		if (start < vma->vm_start) {
-			unmapped_error = -ENOMEM;
 			start = vma->vm_start;
+			if (start >= end)
+				goto out_unlock;
+			unmapped_error = -ENOMEM;
 		}
 		/* Here vma->vm_start <= start < vma->vm_end. */
-		if (end <= vma->vm_end) {
-			if (start < end) {
-				error = msync_interval(vma, start, end, flags,
-							&nr_pages_dirtied);
-				if (error)
-					goto out_unlock;
-			}
-			error = unmapped_error;
-			done = 1;
-		} else {
-			/* Here vma->vm_start <= start < vma->vm_end < end. */
-			error = msync_interval(vma, start, vma->vm_end, flags,
-						&nr_pages_dirtied);
-			if (error)
-				goto out_unlock;
+		if ((flags & MS_INVALIDATE) &&
+				(vma->vm_flags & VM_LOCKED)) {
+			error = -EBUSY;
+			goto out_unlock;
 		}
 		file = vma->vm_file;
 		start = vma->vm_end;
-		if ((flags & MS_ASYNC) && file && nr_pages_dirtied) {
-			get_file(file);
-			up_read(&current->mm->mmap_sem);
-			balance_dirty_pages_ratelimited_nr(file->f_mapping,
-							nr_pages_dirtied);
-			fput(file);
-			down_read(&current->mm->mmap_sem);
-			vma = find_vma(current->mm, start);
-		} else if ((flags & MS_SYNC) && file &&
+		if ((flags & MS_SYNC) && file &&
 				(vma->vm_flags & VM_SHARED)) {
 			get_file(file);
-			up_read(&current->mm->mmap_sem);
+			up_read(&mm->mmap_sem);
 			error = do_fsync(file, 0);
 			fput(file);
-			down_read(&current->mm->mmap_sem);
-			if (error)
-				goto out_unlock;
-			vma = find_vma(current->mm, start);
+			if (error || start >= end)
+				goto out;
+			down_read(&mm->mmap_sem);
+			vma = find_vma(mm, start);
 		} else {
+			if (start >= end) {
+				error = 0;
+				goto out_unlock;
+			}
 			vma = vma->vm_next;
 		}
-	} while (vma && !done);
+	}
 out_unlock:
-	up_read(&current->mm->mmap_sem);
+	up_read(&mm->mmap_sem);
 out:
-	return error;
+	return error ? : unmapped_error;
 }
Date: Mon, 17 Jul 2006 20:33:11 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 7/8] mm: tracking shared dirty pages checks


From: Andrew Morton <akpm at osdl.org>

Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 mm/page-writeback.c |    2 ++
 1 files changed, 2 insertions(+)

Index: latest/mm/page-writeback.c
===================================================================
--- latest.orig/mm/page-writeback.c
+++ latest/mm/page-writeback.c
@@ -717,6 +717,7 @@ int test_clear_page_dirty(struct page *p
 	struct address_space *mapping = page_mapping(page);
 	unsigned long flags;
 
+	WARN_ON_ONCE(!PageLocked(page));
 	if (mapping) {
 		write_lock_irqsave(&mapping->tree_lock, flags);
 		if (TestClearPageDirty(page)) {
@@ -759,6 +760,7 @@ int clear_page_dirty_for_io(struct page 
 {
 	struct address_space *mapping = page_mapping(page);
 
+	WARN_ON_ONCE(!PageLocked(page));
 	if (mapping) {
 		if (TestClearPageDirty(page)) {
 			if (mapping_cap_account_dirty(mapping)) {
Date: Mon, 17 Jul 2006 20:33:18 +0200
From: pzijlstr at redhat.com
Subject: [RHEL5][PATCH 8/8] mm: tracking shared dirty pages wimp.patch


From: Andrew Morton <akpm at osdl.org>

I'm not so sure, and if this is wrong, we wreck an -mm release.  Please don't
wreck -mm releases.

Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 mm/rmap.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: latest/mm/rmap.c
===================================================================
--- latest.orig/mm/rmap.c
+++ latest/mm/rmap.c
@@ -488,7 +488,7 @@ int page_mkclean(struct page *page)
 {
 	int ret = 0;
 
-	BUG_ON(!PageLocked(page));
+	WARN_ON_ONCE(!PageLocked(page));
 
 	if (page_mapped(page)) {
 		struct address_space *mapping = page_mapping(page);

linux-2.6-nfs-superblock-sharing.patch:
 fs/nfs/Makefile                  |    2 
 fs/nfs/callback.c                |   16 
 fs/nfs/callback_proc.c           |    9 
 fs/nfs/client.c                  | 1138 +++++++++++++++++++++++++++
 fs/nfs/delegation.c              |   21 
 fs/nfs/dir.c                     |   16 
 fs/nfs/idmap.c                   |   27 
 fs/nfs/inode.c                   |    9 
 fs/nfs/internal.h                |  102 +-
 fs/nfs/namespace.c               |   31 
 fs/nfs/nfs3proc.c                |    8 
 fs/nfs/nfs4_fs.h                 |   58 -
 fs/nfs/nfs4namespace.c           |  110 ++
 fs/nfs/nfs4proc.c                |  149 +--
 fs/nfs/nfs4renewd.c              |   15 
 fs/nfs/nfs4state.c               |  156 ---
 fs/nfs/nfs4xdr.c                 |   28 
 fs/nfs/proc.c                    |    4 
 fs/nfs/super.c                   | 1629 ++++++++++++++-------------------------
 include/linux/nfs_fs.h           |    2 
 include/linux/nfs_fs_sb.h        |   94 +-
 include/linux/nfs_idmap.h        |    2 
 include/linux/nfs_xdr.h          |    7 
 latest/fs/dcache.c               |  164 +++
 latest/fs/nfs/Makefile           |    6 
 latest/fs/nfs/callback.c         |   15 
 latest/fs/nfs/callback.h         |    7 
 latest/fs/nfs/callback_proc.c    |    4 
 latest/fs/nfs/client.c           |  312 +++++++
 latest/fs/nfs/delegation.c       |   24 
 latest/fs/nfs/delegation.h       |   10 
 latest/fs/nfs/dir.c              |    2 
 latest/fs/nfs/file.c             |    2 
 latest/fs/nfs/getroot.c          |  306 +++++++
 latest/fs/nfs/idmap.c            |   14 
 latest/fs/nfs/inode.c            |    4 
 latest/fs/nfs/internal.h         |   12 
 latest/fs/nfs/namespace.c        |    3 
 latest/fs/nfs/nfs3proc.c         |    2 
 latest/fs/nfs/nfs4_fs.h          |   30 
 latest/fs/nfs/nfs4namespace.c    |    8 
 latest/fs/nfs/nfs4proc.c         |   32 
 latest/fs/nfs/nfs4renewd.c       |    8 
 latest/fs/nfs/nfs4state.c        |   50 -
 latest/fs/nfs/nfs4xdr.c          |   14 
 latest/fs/nfs/proc.c             |    2 
 latest/fs/nfs/read.c             |    2 
 latest/fs/nfs/super.c            |   40 
 latest/fs/nfs/write.c            |    2 
 latest/include/linux/dcache.h    |    1 
 latest/include/linux/nfs_fs.h    |    1 
 latest/include/linux/nfs_fs_sb.h |    2 
 latest/include/linux/nfs_idmap.h |   14 
 latest/include/linux/nfs_xdr.h   |    3 
 54 files changed, 3068 insertions(+), 1661 deletions(-)

--- NEW FILE linux-2.6-nfs-superblock-sharing.patch ---
Date: Fri, 14 Jul 2006 16:50:38 +0100
From: David Howells <dhowells at redhat.com>
Subject: [RHEL5 PATCH 01/28] NFS: Add dentry materialisation op

The attached patch adds a new directory cache management function that prepares
a disconnected anonymous function to be connected into the dentry tree. The
anonymous dentry is transferred the name and parentage from another dentry.


The following changes were made in [try #2]:

 (*) d_materialise_dentry() now switches the parentage of the two nodes around
     correctly when one or other of them is self-referential.

The following changes were made in [try #7]:

 (*) d_instantiate_unique() has had the interior part split out as function
     __d_instantiate_unique(). Callers of this latter function must be holding
     the appropriate locks.

 (*) _d_rehash() has been added as a wrapper around __d_rehash() to call it
     with the most obvious hash list (the one from the name). d_rehash() now
     calls _d_rehash().

 (*) d_materialise_dentry() is now __d_materialise_dentry() and is static.

 (*) d_materialise_unique() added to perform the combination of d_find_alias(),
     d_materialise_dentry() and d_add_unique() that the NFS client was doing
     twice, all within a single dcache_lock critical section. This reduces the
     number of times two different spinlocks were being accessed.

The following further changes were made:

 (*) Add the dentries onto their parents d_subdirs lists.

Signed-Off-By: David Howells <dhowells at redhat.com>
---

 fs/dcache.c            |  164 ++++++++++++++++++++++++++++++++++++++++++++----
 include/linux/dcache.h |    1 
 2 files changed, 151 insertions(+), 14 deletions(-)

Index: latest/fs/dcache.c
===================================================================
--- latest.orig/fs/dcache.c
+++ latest/fs/dcache.c
@@ -833,17 +833,19 @@ void d_instantiate(struct dentry *entry,
  * (or otherwise set) by the caller to indicate that it is now
  * in use by the dcache.
  */
-struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode)
+static struct dentry *__d_instantiate_unique(struct dentry *entry,
+					     struct inode *inode)
 {
 	struct dentry *alias;
 	int len = entry->d_name.len;
 	const char *name = entry->d_name.name;
 	unsigned int hash = entry->d_name.hash;
 
-	BUG_ON(!list_empty(&entry->d_alias));
-	spin_lock(&dcache_lock);
-	if (!inode)
-		goto do_negative;
+	if (!inode) {
+		entry->d_inode = NULL;
+		return NULL;
+	}
+
 	list_for_each_entry(alias, &inode->i_dentry, d_alias) {
 		struct qstr *qstr = &alias->d_name;
 
@@ -856,19 +858,35 @@ struct dentry *d_instantiate_unique(stru
 		if (memcmp(qstr->name, name, len))
 			continue;
 		dget_locked(alias);
-		spin_unlock(&dcache_lock);
-		BUG_ON(!d_unhashed(alias));
-		iput(inode);
 		return alias;
 	}
+
 	list_add(&entry->d_alias, &inode->i_dentry);
-do_negative:
 	entry->d_inode = inode;
 	fsnotify_d_instantiate(entry, inode);
-	spin_unlock(&dcache_lock);
-	security_d_instantiate(entry, inode);
 	return NULL;
 }
+
+struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode)
+{
+	struct dentry *result;
+
+	BUG_ON(!list_empty(&entry->d_alias));
+
+	spin_lock(&dcache_lock);
+	result = __d_instantiate_unique(entry, inode);
+	spin_unlock(&dcache_lock);
+
+	if (!result) {
+		security_d_instantiate(entry, inode);
+		return NULL;
+	}
+
+	BUG_ON(!d_unhashed(result));
+	iput(inode);
+	return result;
+}
+
 EXPORT_SYMBOL(d_instantiate_unique);
 
 /**
@@ -1240,6 +1258,11 @@ static void __d_rehash(struct dentry * e
  	hlist_add_head_rcu(&entry->d_hash, list);
 }
 
+static void _d_rehash(struct dentry * entry)
+{
+	__d_rehash(entry, d_hash(entry->d_parent, entry->d_name.hash));
+}
+
 /**
  * d_rehash	- add an entry back to the hash
  * @entry: dentry to add to the hash
@@ -1249,11 +1272,9 @@ static void __d_rehash(struct dentry * e
  
 void d_rehash(struct dentry * entry)
 {
-	struct hlist_head *list = d_hash(entry->d_parent, entry->d_name.hash);
-
 	spin_lock(&dcache_lock);
 	spin_lock(&entry->d_lock);
-	__d_rehash(entry, list);
+	_d_rehash(entry);
 	spin_unlock(&entry->d_lock);
 	spin_unlock(&dcache_lock);
 }
@@ -1401,6 +1422,120 @@ already_unhashed:
 	spin_unlock(&dcache_lock);
 }
 
+/*
+ * Prepare an anonymous dentry for life in the superblock's dentry tree as a
+ * named dentry in place of the dentry to be replaced.
+ */
+static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon)
+{
+	struct dentry *dparent, *aparent;
+
+	switch_names(dentry, anon);
+	do_switch(dentry->d_name.len, anon->d_name.len);
+	do_switch(dentry->d_name.hash, anon->d_name.hash);
+
+	dparent = dentry->d_parent;
+	aparent = anon->d_parent;
+
+	dentry->d_parent = (aparent == anon) ? dentry : aparent;
+	list_del(&dentry->d_u.d_child);
+	if (!IS_ROOT(dentry))
+		list_add(&dentry->d_u.d_child, &dentry->d_parent->d_subdirs);
+	else
+		INIT_LIST_HEAD(&dentry->d_u.d_child);
+
+	anon->d_parent = (dparent == dentry) ? anon : dparent;
+	list_del(&anon->d_u.d_child);
+	if (!IS_ROOT(anon))
+		list_add(&anon->d_u.d_child, &anon->d_parent->d_subdirs);
+	else
+		INIT_LIST_HEAD(&anon->d_u.d_child);
+
+	anon->d_flags &= ~DCACHE_DISCONNECTED;
+}
+
+/**
+ * d_materialise_unique - introduce an inode into the tree
+ * @dentry: candidate dentry
+ * @inode: inode to bind to the dentry, to which aliases may be attached
+ *
+ * Introduces an dentry into the tree, substituting an extant disconnected
+ * root directory alias in its place if there is one
+ */
+struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode)
+{
+	struct dentry *alias, *actual;
+
+	BUG_ON(!d_unhashed(dentry));
+
+	spin_lock(&dcache_lock);
+
+	if (!inode) {
+		actual = dentry;
+		dentry->d_inode = NULL;
+		goto found_lock;
+	}
+
+	/* See if a disconnected directory already exists as an anonymous root
+	 * that we should splice into the tree instead */
+	if (S_ISDIR(inode->i_mode) && (alias = __d_find_alias(inode, 1))) {
[...7942 lines suppressed...]
+static int nfs_volume_list_open(struct inode *inode, struct file *file)
+{
+	struct seq_file *m;
+	int ret;
+
+	ret = seq_open(file, &nfs_volume_list_ops);
+	if (ret < 0)
+		return ret;
+
+	m = file->private_data;
+	m->private = PDE(inode)->data;
+
+	return 0;
+}
+
+/*
+ * set up the iterator to start reading from the volume list and return the first item
+ */
+static void *nfs_volume_list_start(struct seq_file *m, loff_t *_pos)
+{
+	struct list_head *_p;
+	loff_t pos = *_pos;
+
+	/* lock the list against modification */
+	spin_lock(&nfs_client_lock);
+
+	/* allow for the header line */
+	if (!pos)
+		return SEQ_START_TOKEN;
+	pos--;
+
+	/* find the n'th element in the list */
+	list_for_each(_p, &nfs_volume_list)
+		if (!pos--)
+			break;
+
+	return _p != &nfs_volume_list ? _p : NULL;
+}
+
+/*
+ * move to next volume
+ */
+static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos)
+{
+	struct list_head *_p;
+
+	(*pos)++;
+
+	_p = v;
+	_p = (v == SEQ_START_TOKEN) ? nfs_volume_list.next : _p->next;
+
+	return _p != &nfs_volume_list ? _p : NULL;
+}
+
+/*
+ * clean up after reading from the transports list
+ */
+static void nfs_volume_list_stop(struct seq_file *p, void *v)
+{
+	spin_unlock(&nfs_client_lock);
+}
+
+/*
+ * display a header line followed by a load of call lines
+ */
+static int nfs_volume_list_show(struct seq_file *m, void *v)
+{
+	struct nfs_server *server;
+	struct nfs_client *clp;
+	char dev[8], fsid[17];
+
+	/* display header on line 1 */
+	if (v == SEQ_START_TOKEN) {
+		seq_puts(m, "NV SERVER   PORT DEV     FSID\n");
+		return 0;
+	}
+	/* display one transport per line on subsequent lines */
+	server = list_entry(v, struct nfs_server, master_link);
+	clp = server->nfs_client;
+
+	snprintf(dev, 8, "%u:%u",
+		 MAJOR(server->s_dev), MINOR(server->s_dev));
+
+	snprintf(fsid, 17, "%llx:%llx",
+		 server->fsid.major, server->fsid.minor);
+
+	seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s\n",
+		   clp->cl_nfsversion,
+		   NIPQUAD(clp->cl_addr.sin_addr),
+		   ntohs(clp->cl_addr.sin_port),
+		   dev,
+		   fsid);
+
+	return 0;
+}
+
+/*
+ * initialise the /proc/fs/nfsfs/ directory
+ */
+int __init nfs_fs_proc_init(void)
+{
+	struct proc_dir_entry *p;
+
+	proc_fs_nfs = proc_mkdir("nfsfs", proc_root_fs);
+	if (!proc_fs_nfs)
+		goto error_0;
+
+	proc_fs_nfs->owner = THIS_MODULE;
+
+	/* a file of servers with which we're dealing */
+	p = create_proc_entry("servers", S_IFREG|S_IRUGO, proc_fs_nfs);
+	if (!p)
+		goto error_1;
+
+	p->proc_fops = &nfs_server_list_fops;
+	p->owner = THIS_MODULE;
+
+	/* a file of volumes that we have mounted */
+	p = create_proc_entry("volumes", S_IFREG|S_IRUGO, proc_fs_nfs);
+	if (!p)
+		goto error_2;
+
+	p->proc_fops = &nfs_volume_list_fops;
+	p->owner = THIS_MODULE;
+	return 0;
+
+error_2:
+	remove_proc_entry("servers", proc_fs_nfs);
+error_1:
+	remove_proc_entry("nfsfs", proc_root_fs);
+error_0:
+	return -ENOMEM;
+}
+
+/*
+ * clean up the /proc/fs/nfsfs/ directory
+ */
+void nfs_fs_proc_exit(void)
+{
+	remove_proc_entry("volumes", proc_fs_nfs);
+	remove_proc_entry("servers", proc_fs_nfs);
+	remove_proc_entry("nfsfs", proc_root_fs);
+}
+
+#endif /* CONFIG_PROC_FS */
Index: latest/fs/nfs/inode.c
===================================================================
--- latest.orig/fs/nfs/inode.c
+++ latest/fs/nfs/inode.c
@@ -1140,6 +1140,10 @@ static int __init init_nfs_fs(void)
 {
 	int err;
 
+	err = nfs_fs_proc_init();
+	if (err)
+		goto out5;
+
 	err = nfs_init_nfspagecache();
 	if (err)
 		goto out4;
@@ -1180,6 +1184,8 @@ out2:
 out3:
 	nfs_destroy_nfspagecache();
 out4:
+	nfs_fs_proc_exit();
+out5:
 	return err;
 }
 
@@ -1194,6 +1200,7 @@ static void __exit exit_nfs_fs(void)
 	rpc_proc_unregister("nfs");
 #endif
 	unregister_nfs_fs();
+	nfs_fs_proc_exit();
 }
 
 /* Not quite true; I just maintain it */
Index: latest/fs/nfs/internal.h
===================================================================
--- latest.orig/fs/nfs/internal.h
+++ latest/fs/nfs/internal.h
@@ -47,6 +47,18 @@ extern void nfs_free_server(struct nfs_s
 extern struct nfs_server *nfs_clone_server(struct nfs_server *,
 					   struct nfs_fh *,
 					   struct nfs_fattr *);
+#ifdef CONFIG_PROC_FS
+extern int __init nfs_fs_proc_init(void);
+extern void nfs_fs_proc_exit(void);
+#else
+static inline int nfs_fs_proc_init(void)
+{
+	return 0;
+}
+static inline void nfs_fs_proc_exit(void)
+{
+}
+#endif
 
 /* nfs4namespace.c */
 #ifdef CONFIG_NFS_V4

linux-2.6-nfs-superblock-unmount-optimization.patch:
 fs/autofs4/autofs_i.h  |    3 -
 fs/autofs4/init.c      |    2 
 fs/autofs4/inode.c     |   22 +-------
 fs/autofs4/waitq.c     |    1 
 fs/dcache.c            |  133 +++++++++++++++++++++++++++++++++++++++++++++++++
 fs/super.c             |   12 ++--
 include/linux/dcache.h |    1 
 7 files changed, 146 insertions(+), 28 deletions(-)

--- NEW FILE linux-2.6-nfs-superblock-unmount-optimization.patch ---
Date: Fri, 14 Jul 2006 16:51:35 +0100
From: David Howells <dhowells at redhat.com>
Subject: [RHEL5 PATCH 27/28] VFS: Destroy the dentries contributed by a superblock on unmounting

The attached patch destroys all the dentries attached to a superblock in one go
by:

 (1) Destroying the tree rooted at s_root.

 (2) Destroying every entry in the anon list, one at a time.

 (3) Each entry in the anon list has its subtree consumed from the leaves
     inwards.

This reduces the amount of work generic_shutdown_super() does, and avoids
iterating through the dentry_unused list.

Note that locking is almost entirely absent in the shrink_dcache_for_umount*()
functions added by this patch.  This is because:

 (1) at the point the filesystem calls generic_shutdown_super(), it is not
     permitted to further touch the superblock's set of dentries, and nor may
     it remove aliases from inodes;

 (2) the dcache memory shrinker now skips dentries that are being unmounted;
     and

 (3) the superblock no longer has any external references through which the VFS
     can reach it.

Given these points, the only locking we need to do is when we remove dentries
from the unused list and the name hashes, which we do a directory's worth at a
time.

We also don't need to guard against reference counts going to zero unexpectedly
and removing bits of the tree we're working on as nothing else can call dput().

A cut down version of dentry_iput() has been folded into
shrink_dcache_for_umount_subtree() function.  Apart from not needing to unlock
things, it also doesn't need to check for inotify watches.

In this version of the patch, the complaint about a dentry still being in use
has been expanded from a single BUG_ON() and now gives much more information.

Signed-Off-By: David Howells <dhowells at redhat.com>
Acked-by: NeilBrown <neilb at suse.de>
Acked-by: Ian Kent <raven at themaw.net>
---

 fs/dcache.c            |  133 ++++++++++++++++++++++++++++++++++++++++++++++++
 fs/super.c             |   12 ++--
 include/linux/dcache.h |    1 
 3 files changed, 140 insertions(+), 6 deletions(-)

Index: latest/fs/dcache.c
===================================================================
--- latest.orig/fs/dcache.c
+++ latest/fs/dcache.c
@@ -551,6 +551,139 @@ repeat:
 }
 
 /*
+ * destroy a single subtree of dentries for unmount
+ * - see the comments on shrink_dcache_for_umount() for a description of the
+ *   locking
+ */
+static void shrink_dcache_for_umount_subtree(struct dentry *dentry)
+{
+	struct dentry *parent;
+
+	BUG_ON(!IS_ROOT(dentry));
+
+	/* detach this root from the system */
+	spin_lock(&dcache_lock);
+	if (!list_empty(&dentry->d_lru)) {
+		dentry_stat.nr_unused--;
+		list_del_init(&dentry->d_lru);
+	}
+	__d_drop(dentry);
+	spin_unlock(&dcache_lock);
+
+	for (;;) {
+		/* descend to the first leaf in the current subtree */
+		while (!list_empty(&dentry->d_subdirs)) {
+			struct dentry *loop;
+
+			/* this is a branch with children - detach all of them
+			 * from the system in one go */
+			spin_lock(&dcache_lock);
+			list_for_each_entry(loop, &dentry->d_subdirs,
+					    d_u.d_child) {
+				if (!list_empty(&loop->d_lru)) {
+					dentry_stat.nr_unused--;
+					list_del_init(&loop->d_lru);
+				}
+
+				__d_drop(loop);
+				cond_resched_lock(&dcache_lock);
+			}
+			spin_unlock(&dcache_lock);
+
+			/* move to the first child */
+			dentry = list_entry(dentry->d_subdirs.next,
+					    struct dentry, d_u.d_child);
+		}
+
+		/* consume the dentries from this leaf up through its parents
+		 * until we find one with children or run out altogether */
+		do {
+			struct inode *inode;
+
+			if (atomic_read(&dentry->d_count) != 0) {
+				printk(KERN_ERR
+				       "BUG: Dentry %p{i=%lx,n=%s}"
+				       " still in use (%d)"
+				       " [unmount of %s %s]\n",
+				       dentry,
+				       dentry->d_inode ?
+				       dentry->d_inode->i_ino : 0UL,
+				       dentry->d_name.name,
+				       atomic_read(&dentry->d_count),
+				       dentry->d_sb->s_type->name,
+				       dentry->d_sb->s_id);
+				BUG();
+			}
+
+			parent = dentry->d_parent;
+			if (parent == dentry)
+				parent = NULL;
+			else
+				atomic_dec(&parent->d_count);
+
+			list_del(&dentry->d_u.d_child);
+			dentry_stat.nr_dentry--;	/* For d_free, below */
+
+			inode = dentry->d_inode;
+			if (inode) {
+#ifdef CONFIG_INOTIFY
+				BUG_ON(!list_empty(&inode->inotify_watches));
+#endif
+				dentry->d_inode = NULL;
+				list_del_init(&dentry->d_alias);
+				if (dentry->d_op && dentry->d_op->d_iput)
+					dentry->d_op->d_iput(dentry, inode);
+				else
+					iput(inode);
+			}
+
+			d_free(dentry);
+
+			/* finished when we fall off the top of the tree,
+			 * otherwise we ascend to the parent and move to the
+			 * next sibling if there is one */
+			if (!parent)
+				return;
+
+			dentry = parent;
+
+		} while (list_empty(&dentry->d_subdirs));
+
+		dentry = list_entry(dentry->d_subdirs.next,
+				    struct dentry, d_u.d_child);
+	}
+}
+
+/*
+ * destroy the dentries attached to a superblock on unmounting
+ * - we don't need to use dentry->d_lock, and only need dcache_lock when
+ *   removing the dentry from the system lists and hashes because:
+ *   - the superblock is detached from all mountings and open files, so the
+ *     dentry trees will not be rearranged by the VFS
+ *   - s_umount is write-locked, so the memory pressure shrinker will ignore
+ *     any dentries belonging to this superblock that it comes across
+ *   - the filesystem itself is no longer permitted to rearrange the dentries
+ *     in this superblock
+ */
+void shrink_dcache_for_umount(struct super_block *sb)
+{
+	struct dentry *dentry;
+
+	if (down_read_trylock(&sb->s_umount))
+		BUG();
+
+	dentry = sb->s_root;
+	sb->s_root = NULL;
+	atomic_dec(&dentry->d_count);
+	shrink_dcache_for_umount_subtree(dentry);
+
+	while (!hlist_empty(&sb->s_anon)) {
+		dentry = hlist_entry(sb->s_anon.first, struct dentry, d_hash);
+		shrink_dcache_for_umount_subtree(dentry);
+	}
+}
+
+/*
  * Search for at least 1 mount point in the dentry's subdirs.
  * We descend to the next level whenever the d_subdirs
  * list is non-empty and continue searching.
Index: latest/fs/super.c
===================================================================
--- latest.orig/fs/super.c
+++ latest/fs/super.c
@@ -228,17 +228,17 @@ static int grab_super(struct super_block
  *	that need destruction out of superblock, call generic_shutdown_super()
  *	and release aforementioned objects.  Note: dentries and inodes _are_
  *	taken care of and do not need specific handling.
+ *
+ *	Upon calling this function, the filesystem may no longer alter or
+ *	rearrange the set of dentries belonging to this super_block, nor may it
+ *	change the attachments of dentries to inodes.
  */
 void generic_shutdown_super(struct super_block *sb)
 {
-	struct dentry *root = sb->s_root;
 	struct super_operations *sop = sb->s_op;
 
-	if (root) {
-		sb->s_root = NULL;
-		shrink_dcache_parent(root);
-		shrink_dcache_sb(sb);
-		dput(root);
+	if (sb->s_root) {
+		shrink_dcache_for_umount(sb);
 		fsync_super(sb);
 		lock_super(sb);
 		sb->s_flags &= ~MS_ACTIVE;
Index: latest/include/linux/dcache.h
===================================================================
--- latest.orig/include/linux/dcache.h
+++ latest/include/linux/dcache.h
@@ -231,6 +231,7 @@ extern struct dentry * d_alloc_anon(stru
 extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
 extern void shrink_dcache_sb(struct super_block *);
 extern void shrink_dcache_parent(struct dentry *);
+extern void shrink_dcache_for_umount(struct super_block *);
 extern int d_invalidate(struct dentry *);
 extern void flush_dentry_attributes(void);
 
Date: Fri, 14 Jul 2006 16:51:37 +0100
From: David Howells <dhowells at redhat.com>
Subject: [RHEL5 PATCH 28/28] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super()

Make sure all dentries refs are released before calling kill_anon_super() so
that the assumption that generic_shutdown_super() can completely destroy the
dentry tree for there will be no external references holds true.

What was being done in the put_super() superblock op, is now done in the
kill_sb() filesystem op instead, prior to calling kill_anon_super().

This makes the struct autofs_sb_info::root member variable redundant (since
sb->s_root is still available), and so that is removed.  The calls to
shrink_dcache_sb() are also removed since they're also redundant as
shrink_dcache_for_umount() will now be called after the cleanup routine.

Signed-Off-By: David Howells <dhowells at redhat.com>
Acked-by: Ian Kent <raven at themaw.net>
---

 fs/autofs4/autofs_i.h |    3 +--
 fs/autofs4/init.c     |    2 +-
 fs/autofs4/inode.c    |   22 ++++------------------
 fs/autofs4/waitq.c    |    1 -
 4 files changed, 6 insertions(+), 22 deletions(-)

Index: latest/fs/autofs4/autofs_i.h
===================================================================
--- latest.orig/fs/autofs4/autofs_i.h
+++ latest/fs/autofs4/autofs_i.h
@@ -96,7 +96,6 @@ struct autofs_wait_queue {
 
 struct autofs_sb_info {
 	u32 magic;
-	struct dentry *root;
 	int pipefd;
 	struct file *pipe;
 	pid_t oz_pgrp;
@@ -231,4 +230,4 @@ out:
 }
 
 void autofs4_dentry_release(struct dentry *);
-
+extern void autofs4_kill_sb(struct super_block *);
Index: latest/fs/autofs4/init.c
===================================================================
--- latest.orig/fs/autofs4/init.c
+++ latest/fs/autofs4/init.c
@@ -24,7 +24,7 @@ static struct file_system_type autofs_fs
 	.owner		= THIS_MODULE,
 	.name		= "autofs",
 	.get_sb		= autofs_get_sb,
-	.kill_sb	= kill_anon_super,
+	.kill_sb	= autofs4_kill_sb,
 };
 
 static int __init init_autofs4_fs(void)
Index: latest/fs/autofs4/inode.c
===================================================================
--- latest.orig/fs/autofs4/inode.c
+++ latest/fs/autofs4/inode.c
@@ -95,7 +95,7 @@ void autofs4_free_ino(struct autofs_info
  */
 static void autofs4_force_release(struct autofs_sb_info *sbi)
 {
-	struct dentry *this_parent = sbi->root;
+	struct dentry *this_parent = sbi->sb->s_root;
 	struct list_head *next;
 
 	spin_lock(&dcache_lock);
@@ -126,7 +126,7 @@ resume:
 		spin_lock(&dcache_lock);
 	}
 
-	if (this_parent != sbi->root) {
+	if (this_parent != sbi->sb->s_root) {
 		struct dentry *dentry = this_parent;
 
 		next = this_parent->d_u.d_child.next;
@@ -139,15 +139,9 @@ resume:
 		goto resume;
 	}
 	spin_unlock(&dcache_lock);
-
-	dput(sbi->root);
-	sbi->root = NULL;
-	shrink_dcache_sb(sbi->sb);
-
-	return;
 }
 
-static void autofs4_put_super(struct super_block *sb)
+void autofs4_kill_sb(struct super_block *sb)
 {
 	struct autofs_sb_info *sbi = autofs4_sbi(sb);
 
@@ -162,6 +156,7 @@ static void autofs4_put_super(struct sup
 	kfree(sbi);
 
 	DPRINTK("shutting down");
+	kill_anon_super(sb);
 }
 
 static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)
@@ -188,7 +183,6 @@ static int autofs4_show_options(struct s
 }
 
 static struct super_operations autofs4_sops = {
-	.put_super	= autofs4_put_super,
 	.statfs		= simple_statfs,
 	.show_options	= autofs4_show_options,
 };
@@ -314,7 +308,6 @@ int autofs4_fill_super(struct super_bloc
 
 	s->s_fs_info = sbi;
 	sbi->magic = AUTOFS_SBI_MAGIC;
-	sbi->root = NULL;
 	sbi->pipefd = -1;
 	sbi->catatonic = 0;
 	sbi->exp_timeout = 0;
@@ -396,13 +389,6 @@ int autofs4_fill_super(struct super_bloc
 	sbi->pipefd = pipefd;
 
 	/*
-	 * Take a reference to the root dentry so we get a chance to
-	 * clean up the dentry tree on umount.
-	 * See autofs4_force_release.
-	 */
-	sbi->root = dget(root);
-
-	/*
 	 * Success! Install the root dentry now to indicate completion.
 	 */
 	s->s_root = root;
Index: latest/fs/autofs4/waitq.c
===================================================================
--- latest.orig/fs/autofs4/waitq.c
+++ latest/fs/autofs4/waitq.c
@@ -45,7 +45,6 @@ void autofs4_catatonic_mode(struct autof
 		fput(sbi->pipe);	/* Close the pipe */
 		sbi->pipe = NULL;
 	}
-	shrink_dcache_sb(sbi->sb);
 }
 
 static int autofs4_write(struct file *file, const void *addr, int bytes)

linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch:
 arch/x86_64/kernel/pci-calgary.c |   77 ++++++++++++++++++++++-----------------
 arch/x86_64/kernel/tce.c         |    4 --
 include/asm-x86_64/calgary.h     |    5 --
 3 files changed, 45 insertions(+), 41 deletions(-)

--- NEW FILE linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch ---
Date: Tue, 18 Jul 2006 16:48:21 -0400
From: Konrad Rzeszutek <konradr at redhat.com>
Subject: [RHEL5] BZ# 198498 ??? 2.6.17-1.2365.fc6 and Calgary-X watchdog hangs (DMA error) on 2-node x460.

RHBZ#:
------
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=198498

Description:
------------
>From mainline (-mm): 

Calgary hits a NULL pointer dereference when booting in a
multi-chassis NUMA system.  See Redhat bugzilla number 198498, found
by Konrad Rzeszutek (konradr at redhat.com).

There are many issues that had to be resolved to fix this problem.
Firstly when I originally wrote the code to handle NUMA systems, I had
a large misunderstanding that was not corrected until now.  That was
that I thought the "number of nodes online" referred to number of
physical systems connected.  So that if NUMA was disabled, there would
only be 1 node and it would only show that node's PCI bus.  In reality
if NUMA is disabled, the system displays all of the connected chassis
as one node but is only ignorant of the delays in accessing main
memory.  Therefore, references to num_online_nodes() and MAX_NUMNODES
are incorrect and need to be set to the maximum number of nodes that
can be accessed (which are 8).  I created a variable, MAX_NUM_CHASSIS,
and set it to 8 to fix this.

Secondly, when walking the PCI in detect_calgary, the code only
checked the first "slot" when looking to see if a device is present.
This will work for most cases, but unfortunately it isn't always the
case.  In the NUMA MXE drawers, there are USB devices present on the
3rd slot (with slot 1 being empty).  So, to work around this, all
slots (up to 8) are scanned to see if there are any devices present.

Lastly, the bus is being enumerated on large systems in a different
way the we originally thought.  This throws the ugly logic we had out
the window.  To more elegantly handle this, I reorganized the kva
array to be sparse (which removed the need to have any bus number to
kva slot logic in tce.c) and created a secondary space array to
contain the bus number to phb mapping.

With these changes Calgary boots on an x460 with 4 nodes with and
without NUMA enabled.

Signed-Off-By: Jon Mason <jdmason at us.ibm.com>
Signed-Off-By: Muli Ben-Yehuda <muli at il.ibm.com>

RHEL Version Found:
------------------
RHEL5

Upstream Status:
----------------
This patch is being merged in -mm as of today.

Test Status:
------------
Tested on IBM xSeries x460 in Westford and in Beaverton.

Proposed Patch:
---------------
This patch is based on RHEL5  kernel.

Index: latest/arch/x86_64/kernel/pci-calgary.c
===================================================================
--- latest.orig/arch/x86_64/kernel/pci-calgary.c
+++ latest/arch/x86_64/kernel/pci-calgary.c
@@ -85,7 +85,8 @@
 #define CSR_AGENT_MASK		0xffe0ffff
 
 #define MAX_NUM_OF_PHBS		8 /* how many PHBs in total? */
-#define MAX_PHB_BUS_NUM		(MAX_NUM_OF_PHBS * 2) /* max dev->bus->number */
+#define MAX_NUM_CHASSIS		8 /* max number of chassis */
+#define MAX_PHB_BUS_NUM		(MAX_NUM_OF_PHBS * MAX_NUM_CHASSIS * 2) /* max dev->bus->number */
 #define PHBS_PER_CALGARY	4
 
 /* register offsets in Calgary's internal register space */
@@ -110,7 +111,8 @@ static const unsigned long phb_offsets[]
 	0xB000 /* PHB3 */
 };
 
-void* tce_table_kva[MAX_NUM_OF_PHBS * MAX_NUMNODES];
+static char bus_to_phb[MAX_PHB_BUS_NUM];
+void* tce_table_kva[MAX_PHB_BUS_NUM];
 unsigned int specified_table_size = TCE_TABLE_SIZE_UNSPECIFIED;
 static int translate_empty_slots __read_mostly = 0;
 static int calgary_detected __read_mostly = 0;
@@ -119,7 +121,7 @@ static int calgary_detected __read_mostl
  * the bitmap of PHBs the user requested that we disable
  * translation on.
  */
-static DECLARE_BITMAP(translation_disabled, MAX_NUMNODES * MAX_PHB_BUS_NUM);
+static DECLARE_BITMAP(translation_disabled, MAX_PHB_BUS_NUM);
 
 static void tce_cache_blast(struct iommu_table *tbl);
 
@@ -452,7 +454,7 @@ static struct dma_mapping_ops calgary_dm
 
 static inline int busno_to_phbid(unsigned char num)
 {
-	return bus_to_phb(num) % PHBS_PER_CALGARY;
+	return bus_to_phb[num];
 }
 
 static inline unsigned long split_queue_offset(unsigned char num)
@@ -812,7 +814,7 @@ static int __init calgary_init(void)
 	int i, ret = -ENODEV;
 	struct pci_dev *dev = NULL;
 
-	for (i = 0; i <= num_online_nodes() * MAX_NUM_OF_PHBS; i++) {
+	for (i = 0; i < MAX_PHB_BUS_NUM; i++) {
 		dev = pci_get_device(PCI_VENDOR_ID_IBM,
 				     PCI_DEVICE_ID_IBM_CALGARY,
 				     dev);
@@ -822,7 +824,7 @@ static int __init calgary_init(void)
 			calgary_init_one_nontraslated(dev);
 			continue;
 		}
-		if (!tce_table_kva[i] && !translate_empty_slots) {
+		if (!tce_table_kva[dev->bus->number] && !translate_empty_slots) {
 			pci_dev_put(dev);
 			continue;
 		}
@@ -842,7 +844,7 @@ error:
 			pci_dev_put(dev);
 			continue;
 		}
-		if (!tce_table_kva[i] && !translate_empty_slots)
+		if (!tce_table_kva[dev->bus->number] && !translate_empty_slots)
 			continue;
 		calgary_disable_translation(dev);
 		calgary_free_tar(dev);
@@ -876,9 +878,10 @@ static inline int __init determine_tce_t
 void __init detect_calgary(void)
 {
 	u32 val;
-	int bus, table_idx;
+	int bus;
 	void *tbl;
-	int detected = 0;
+	int calgary_found = 0;
+	int phb = -1;
 
 	/*
 	 * if the user specified iommu=off or iommu=soft or we found
@@ -889,38 +892,46 @@ void __init detect_calgary(void)
 
 	specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE);
 
-	for (bus = 0, table_idx = 0;
-	     bus <= num_online_nodes() * MAX_PHB_BUS_NUM;
-	     bus++) {
-		BUG_ON(bus > MAX_NUMNODES * MAX_PHB_BUS_NUM);
+	for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
+		int dev;
+
+		tce_table_kva[bus] = NULL;
+		bus_to_phb[bus] = -1;
+
 		if (read_pci_config(bus, 0, 0, 0) != PCI_VENDOR_DEVICE_ID_CALGARY)
 			continue;
+
+		/* 
+		 * There are 4 PHBs per Calgary chip.  Set phb to which phb (0-3)
+		 * it is connected to releative to the clagary chip.
+		 */
+		phb = (phb + 1) % PHBS_PER_CALGARY;
+
 		if (test_bit(bus, translation_disabled)) {
 			printk(KERN_INFO "Calgary: translation is disabled for "
 			       "PHB 0x%x\n", bus);
 			/* skip this phb, don't allocate a tbl for it */
-			tce_table_kva[table_idx] = NULL;
-			table_idx++;
 			continue;
 		}
 		/*
-		 * scan the first slot of the PCI bus to see if there
-		 * are any devices present
+		 * Scan the slots of the PCI bus to see if there is a device present.
+		 * The parent bus will be the zero-ith device, so start at 1.
 		 */
-		val = read_pci_config(bus, 1, 0, 0);
-		if (val != 0xffffffff || translate_empty_slots) {
-			tbl = alloc_tce_table();
-			if (!tbl)
-				goto cleanup;
-			detected = 1;
-		} else
-			tbl = NULL;
-
-		tce_table_kva[table_idx] = tbl;
-		table_idx++;
+		for (dev = 1; dev < 8; dev++) {
+			val = read_pci_config(bus, dev, 0, 0);
+			if (val != 0xffffffff || translate_empty_slots) {
+				tbl = alloc_tce_table();
+				if (!tbl)
+					goto cleanup;
+				tce_table_kva[bus] = tbl;
+				bus_to_phb[bus] = phb;
+				calgary_found = 1;
+				break;
+			}
+		}
 	}
 
-	if (detected) {
+	if (calgary_found) {
 		iommu_detected = 1;
 		calgary_detected = 1;
 		printk(KERN_INFO "PCI-DMA: Calgary IOMMU detected. "
@@ -929,9 +940,9 @@ void __init detect_calgary(void)
 	return;
 
 cleanup:
-	for (--table_idx; table_idx >= 0; --table_idx)
-		if (tce_table_kva[table_idx])
-			free_tce_table(tce_table_kva[table_idx]);
+	for (--bus; bus >= 0; --bus)
+		if (tce_table_kva[bus])
+			free_tce_table(tce_table_kva[bus]);
 }
 
 int __init calgary_iommu_init(void)
@@ -1002,7 +1013,7 @@ static int __init calgary_parse_options(
 			if (p == endp)
 				break;
 
-			if (bridge <= (num_online_nodes() * MAX_PHB_BUS_NUM)) {
+			if (bridge < MAX_PHB_BUS_NUM) {
 				printk(KERN_INFO "Calgary: disabling "
 				       "translation for PHB 0x%x\n", bridge);
 				set_bit(bridge, translation_disabled);
Index: latest/arch/x86_64/kernel/tce.c
===================================================================
--- latest.orig/arch/x86_64/kernel/tce.c
+++ latest/arch/x86_64/kernel/tce.c
@@ -96,7 +96,6 @@ static inline unsigned int table_size_to
 static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl)
 {
 	unsigned int bitmapsz;
-	unsigned int tce_table_index;
 	unsigned long bmppages;
 	int ret;
 
@@ -105,8 +104,7 @@ static int tce_table_setparms(struct pci
 	/* set the tce table size - measured in entries */
 	tbl->it_size = table_size_to_number_of_entries(specified_table_size);
 
-	tce_table_index = bus_to_phb(tbl->it_busno);
-	tbl->it_base = (unsigned long)tce_table_kva[tce_table_index];
+	tbl->it_base = (unsigned long)tce_table_kva[dev->bus->number];
 	if (!tbl->it_base) {
 		printk(KERN_ERR "Calgary: iommu_table_setparms: "
 		       "no table allocated?!\n");
Index: latest/include/asm-x86_64/calgary.h
===================================================================
--- latest.orig/include/asm-x86_64/calgary.h
+++ latest/include/asm-x86_64/calgary.h
@@ -60,9 +60,4 @@ static inline int calgary_iommu_init(voi
 static inline void detect_calgary(void) { return; }
 #endif
 
-static inline unsigned int bus_to_phb(unsigned char busno)
-{
-	return ((busno % 15 == 0) ? 0 : busno / 2 + 1);
-}
-
 #endif /* _ASM_X86_64_CALGARY_H */

linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch:
 powernow-k8.c |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 powernow-k8.h |    5 ++
 2 files changed, 113 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch ---
Date: Thu, 13 Jul 2006 10:55:00 -0400
From: Bhavana Nagendra <bnagendr at redhat.com>
Subject: [RHEL 5.0.0 PATCH] : Allow Opterons to synchronize P-state when using
 TSC as time source


This patch addresses bugzilla BZ 195306.   This patch is not upstream as 
the x86_64
maintainer believes using TSC as a time keeping source is a horrible 
idea.  TSC
was picked as the time source for GTOD operation for a select group of 
customers to
address their scalability needs (which upstream maintainers aren't 
concerned with).
I seriously doubt that this patch will make it upstream in the RHEL5 
timeframe.  

Description:

The current generation of Opteron processors do not provide a frequency 
independent TSC.  This causes wild gettimeofday skew on systems that 
enable cpufreq while using TSC as a gtod source.

This patch provides a workaround by changing all processors to the same 
frequency at the same time, so that the TSC on each processor never 
increments at a different rate than the TSC on another processor.

the "powernow-k8.tscsync=1" options enables simeltameous transitions.  
Other options are necessary to force the use of TSC as a gtod source,
i.e. "nohpet nopmtimer"

This patch should apply cleanly to the 2.6.18-rc1 kernel.

Testing results are posted on the bugzilla and I have worked with 
performance
engineering and got their input on the results.

Please comment/ACK as appropriate.








Index: latest/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
===================================================================
--- latest.orig/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ latest/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -37,6 +37,7 @@
 #include <asm/msr.h>
 #include <asm/io.h>
 #include <asm/delay.h>
+#include <asm/pci-direct.h>
 
 #ifdef CONFIG_X86_POWERNOW_K8_ACPI
 #include <linux/acpi.h>
@@ -46,13 +47,15 @@
 
 #define PFX "powernow-k8: "
 #define BFX PFX "BIOS error: "
-#define VERSION "version 2.00.00"
+#define VERSION "version 2.10.00"
 #include "powernow-k8.h"
 
 /* serialize freq changes  */
 static DEFINE_MUTEX(fidvid_mutex);
 
 static struct powernow_k8_data *powernow_data[NR_CPUS];
+static int *req_state = NULL;
+static int tscsync __initdata = 0;
 
 static int cpu_family = CPU_OPTERON;
 
@@ -205,6 +208,17 @@ static int write_new_fid(struct powernow
 	dprintk("writing fid 0x%x, lo 0x%x, hi 0x%x\n",
 		fid, lo, data->plllock * PLL_LOCK_CONVERSION);
 
+	if (tscsync) {
+		int i;
+		cpumask_t oldmask = current->cpus_allowed;
+		for_each_online_cpu(i) {
+			set_cpus_allowed(current, cpumask_of_cpu(i));
+			schedule();
+			wrmsr(MSR_FIDVID_CTL, lo & ~MSR_C_LO_INIT_FID_VID, data->plllock * PLL_LOCK_CONVERSION);
+		}
+		set_cpus_allowed(current, oldmask);
+		schedule();
+	}
 	do {
 		wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION);
 		if (i++ > 100) {
@@ -247,6 +261,17 @@ static int write_new_vid(struct powernow
 	dprintk("writing vid 0x%x, lo 0x%x, hi 0x%x\n",
 		vid, lo, STOP_GRANT_5NS);
 
+	if (tscsync) {
+		int i;
+		cpumask_t oldmask = current->cpus_allowed;
+		for_each_online_cpu(i) {
+			set_cpus_allowed(current, cpumask_of_cpu(i));
+			schedule();
+			wrmsr(MSR_FIDVID_CTL, lo & ~MSR_C_LO_INIT_FID_VID, STOP_GRANT_5NS);
+		}
+		set_cpus_allowed(current, oldmask);
+		schedule();
+	}
 	do {
 		wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS);
 		if (i++ > 100) {
@@ -386,7 +411,8 @@ static int core_frequency_transition(str
 	}
 
 	if (data->currfid == reqfid) {
-		printk(KERN_ERR PFX "ph2 null fid transition 0x%x\n", data->currfid);
+		if (!tscsync)
+			printk(KERN_ERR PFX "ph2 null fid transition 0x%x\n", data->currfid);
 		return 0;
 	}
 
@@ -960,9 +986,21 @@ static int transition_frequency_fidvid(s
 	u32 vid = 0;
 	int res, i;
 	struct cpufreq_freqs freqs;
+	cpumask_t changing_cores;
 
 	dprintk("cpu %d transition to index %u\n", smp_processor_id(), index);
 
+	/* if all processors are transitioning in step, find the highest
+	 * current state and go to that
+         */
+
+	if (tscsync && req_state) {
+		req_state[smp_processor_id()] = index;
+		for_each_online_cpu(i) 
+			if (req_state[i] < index)
+				index = req_state[i];
+	}
+
 	/* fid/vid correctness check for k8 */
 	/* fid are the lower 8 bits of the index we stored into
 	 * the cpufreq frequency table in find_psb_table, vid
@@ -983,6 +1021,8 @@ static int transition_frequency_fidvid(s
 	}
 
 	if ((fid < HI_FID_TABLE_BOTTOM) && (data->currfid < HI_FID_TABLE_BOTTOM)) {
+		if (tscsync && (data->currfid == fid))
+			return 0;
 		printk(KERN_ERR PFX
 		       "ignoring illegal change in lo freq table-%x to 0x%x\n",
 		       data->currfid, fid);
@@ -994,7 +1034,11 @@ static int transition_frequency_fidvid(s
 	freqs.old = find_khz_freq_from_fid(data->currfid);
 	freqs.new = find_khz_freq_from_fid(fid);
 
-	for_each_cpu_mask(i, *(data->available_cores)) {
+	if (tscsync)
+		changing_cores = cpu_online_map;
+	else
+		changing_cores = *(data->available_cores);
+	for_each_cpu_mask(i, changing_cores) {
 		freqs.cpu = i;
 		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
 	}
@@ -1002,10 +1046,16 @@ static int transition_frequency_fidvid(s
 	res = transition_fid_vid(data, fid, vid);
 	freqs.new = find_khz_freq_from_fid(data->currfid);
 
-	for_each_cpu_mask(i, *(data->available_cores)) {
+	for_each_cpu_mask(i, changing_cores) {
 		freqs.cpu = i;
 		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 	}
+	if (tscsync) 
+		for_each_online_cpu(i)
+			if (powernow_data[i]) {
+				powernow_data[i]->currfid = data->currfid;
+				powernow_data[i]->currvid = data->currvid;
+			}
 	return res;
 }
 
@@ -1089,7 +1139,7 @@ static int powernowk8_target(struct cpuf
 		dprintk("targ: curr fid 0x%x, vid 0x%x\n",
 		data->currfid, data->currvid);
 
-		if ((checkvid != data->currvid) || (checkfid != data->currfid)) {
+		if (!tscsync && ((checkvid != data->currvid) || (checkfid != data->currfid))) {
 			printk(KERN_INFO PFX
 				"error - out of sync, fix 0x%x 0x%x, vid 0x%x 0x%x\n",
 				checkfid, data->currfid, checkvid, data->currvid);
@@ -1100,7 +1150,6 @@ static int powernowk8_target(struct cpuf
 		goto err_out;
 
 	mutex_lock(&fidvid_mutex);
-
 	powernow_k8_acpi_pst_values(data, newstate);
 
 	if (cpu_family == CPU_HW_PSTATE)
@@ -1137,6 +1186,32 @@ static int powernowk8_verify(struct cpuf
 	return cpufreq_frequency_table_verify(pol, data->powernow_table);
 }
 
+/* On an MP system that is transitioning all cores in sync, adjust the
+ * vids for each frequency to the highest.  Otherwise, systems made up
+ * of different steppings may fail.
+ */
+static void sync_tables(int curcpu)
+{
+	int j;
+	for (j = 0; j < powernow_data[curcpu]->numps; j++) {
+		int i;
+		int maxvid = 0;
+		for_each_online_cpu(i) {
+			int testvid;
+			if (!powernow_data[i] || !powernow_data[i]->powernow_table)
+				continue;
+			testvid = powernow_data[i]->powernow_table[j].index & 0xff00;
+			if (testvid > maxvid)
+				maxvid = testvid;
+		}	
+		for_each_online_cpu(i) {
+			if (!powernow_data[i] || ! powernow_data[i]->powernow_table)
+				continue;
+			powernow_data[i]->powernow_table[j].index &= 0xff;
+			powernow_data[i]->powernow_table[j].index |= maxvid;
+		}
+	}
+}
 /* per CPU init entry point to the driver */
 static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
@@ -1200,6 +1275,9 @@ static int __cpuinit powernowk8_cpu_init
 	if (cpu_family == CPU_OPTERON)
 		fidvid_msr_init();
 
+	if (tscsync && (cpu_family == CPU_OPTERON))
+		req_state[pol->cpu] = 0;
+
 	/* run on any CPU again */
 	set_cpus_allowed(current, oldmask);
 
@@ -1241,6 +1319,13 @@ static int __cpuinit powernowk8_cpu_init
 
 	powernow_data[pol->cpu] = data;
 
+	if (tscsync && (cpu_family == CPU_OPTERON)) {
+		u32 reg;
+		sync_tables(pol->cpu);
+		reg = read_pci_config(0, NB_PCI_ADDR + pol->cpu, NB_PM_DEV, NB_C1_REG);
+		/* turn off C1 clock ramping */
+		write_pci_config(0, NB_PCI_ADDR + pol->cpu, NB_PM_DEV, NB_C1_REG, reg & NB_C1_MASK);
+	}
 	return 0;
 
 err_out:
@@ -1322,7 +1407,18 @@ static int __cpuinit powernowk8_init(voi
 			supported_cpus++;
 	}
 
+#ifndef CONFIG_SMP
+	tscsync = 0;
+#endif
+
 	if (supported_cpus == num_online_cpus()) {
+		if (tscsync) {
+			req_state = kzalloc(sizeof(int)*NR_CPUS, GFP_KERNEL);
+			if (!req_state) {
+				printk(KERN_ERR PFX "Unable to allocate memory!\n");
+				return -ENOMEM;
+			}
+		}
 		printk(KERN_INFO PFX "Found %d %s "
 			"processors (" VERSION ")\n", supported_cpus,
 			boot_cpu_data.x86_model_id);
@@ -1337,6 +1433,9 @@ static void __exit powernowk8_exit(void)
 {
 	dprintk("exit\n");
 
+	if (tscsync)
+		kfree(req_state);
+
 	cpufreq_unregister_driver(&cpufreq_amd64_driver);
 }
 
@@ -1346,3 +1445,6 @@ MODULE_LICENSE("GPL");
 
 late_initcall(powernowk8_init);
 module_exit(powernowk8_exit);
+
+module_param(tscsync, int, 0);
+MODULE_PARM_DESC(tscsync, "enable tsc by synchronizing powernow-k8 changes");
Index: latest/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
===================================================================
--- latest.orig/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
+++ latest/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
@@ -173,6 +173,11 @@ struct powernow_k8_data {
 #define EXT_VID_MASK 0x3f
 #define EXT_FID_MASK 0x3f
 
+/* Defines for disabling C1 clock ramping */
+#define NB_PCI_ADDR	0x18
+#define NB_PM_DEV	3
+#define NB_C1_REG	0x84
+#define NB_C1_MASK	0xfc
 
 /*
  * Version 1.4 of the PSB table. This table is constructed by BIOS and is


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2423
retrieving revision 1.2424
diff -u -r1.2423 -r1.2424
--- kernel-2.6.spec	19 Jul 2006 17:29:01 -0000	1.2423
+++ kernel-2.6.spec	20 Jul 2006 00:27:30 -0000	1.2424
@@ -271,6 +271,8 @@
 Patch206: linux-2.6-x86-hp-reboot.patch
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
+Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
+Patch210: linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch
 
 # 300 - 399   ppc(64)
 Patch305: linux-2.6-cell-mambo-drivers.patch
@@ -370,6 +372,12 @@
 Patch1424: linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
 Patch1425: linux-2.6-inode-diet-squashfs.patch
 
+#NFS superblock sharing / CacheFS
+Patch1430: linux-2.6-nfs-superblock-sharing.patch
+Patch1431: linux-2.6-cachefiles.patch
+Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
+Patch1433: linux-2.6-nfs-superblock-unmount-optimization.patch
+
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
@@ -400,6 +408,7 @@
 # VM bits.
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
+Patch2003: linux-2.6-mm-tracking-dirty-pages.patch
 
 # Tweak some defaults.
 Patch2100: linux-2.6-defaults-fat-utf8.patch
@@ -756,6 +765,10 @@
 %patch207 -p1
 # Add ppoll and pselect syscalls
 %patch208 -p1
+# fix opteron timer scaling
+%patch209 -p1
+# fix a calgary pci hang on numa
+%patch210 -p1
 
 #
 # PowerPC
@@ -910,6 +923,12 @@
 %patch1424 -p1
 %patch1425 -p1
 
+#nfs sharing / cachefs
+%patch1430 -p1
+%patch1431 -p1
+%patch1432 -p1
+%patch1433 -p1
+
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.
 %patch1600 -p1
@@ -959,6 +978,8 @@
 %patch2001 -p1
 # VM oom killer tweaks.
 %patch2002 -p1
+# track dirty pages
+%patch2003 -p1
 
 # Changes to upstream defaults.
 # Use UTF-8 by default on VFAT.
@@ -1229,9 +1250,9 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
     # Temporary fix for upstream "make prepare" bug.
-    pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-    make prepare
-    popd > /dev/null
+#    pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+#    make prepare
+#    popd > /dev/null
 }
 
 ###
@@ -1674,6 +1695,14 @@
 %endif
 
 %changelog
+* Tue Jul 19 2006 Don Zickus <dzickus at redhat.com>
+- Add in support for nfs superblock sharing and cachefs
+  patches from David Howells
+- Disable 'make prepare' hack as it is breaking ppc symlinks  
+- Added tracking dirty pages patch from Peter Zijlstra
+- Fix for Opteron timer scaling
+- Fix for Calgary pci hang
+  
 * Wed Jul 19 2006 Juan Quintela <quintela at redhat>
 - big xen patch.
 - enable xen again.



From fedora-cvs-commits at redhat.com  Thu Jul 20 01:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 21:56:16 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.31,1.32
Message-ID: <200607200156.k6K1uGtT004752@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4580

Modified Files:
	policy-20060608.patch 
Log Message:
* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-6
- Cups needs to be able to read domain state off of printer client


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    1 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/inetd.te          |   12 +-
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |    8 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  128 +++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   21 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    1 
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   38 ++----
 modules/system/xen.te              |    2 
 76 files changed, 771 insertions(+), 220 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policy-20060608.patch	19 Jul 2006 20:27:22 -0000	1.31
+++ policy-20060608.patch	20 Jul 2006 01:56:13 -0000	1.32
@@ -784,6 +784,32 @@
  	clock_domtrans(hald_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.3.3/policy/modules/services/inetd.te
+--- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-07-19 21:52:57.000000000 -0400
+@@ -218,10 +218,6 @@
+ 
+ sysnet_read_config(inetd_child_t)
+ 
+-tunable_policy(`run_ssh_inetd',`
+-	corenet_tcp_bind_ssh_port(inetd_t)
+-')
+-
+ optional_policy(`
+ 	tunable_policy(`ftpd_is_daemon',`
+ 		# Allows it to check exec privs on daemon
+@@ -240,3 +236,11 @@
+ optional_policy(`
+ 	nscd_socket_use(inetd_child_t)
+ ')
++
++ifdef(`strict_policy', `
++	tunable_policy(`run_ssh_inetd',`
++		corenet_tcp_bind_ssh_port(inetd_t)
++	')
++')
++
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-18 10:41:23.000000000 -0400



From fedora-cvs-commits at redhat.com  Thu Jul 20 02:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 22:59:23 -0400
Subject: rpms/kexec-tools/devel/kcp - New directory
Message-ID: <200607200259.k6K2xN2U005029@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel/kcp
In directory cvs.devel.redhat.com:/tmp/cvs-serv4988/kcp

Log Message:
Directory /cvs/dist/rpms/kexec-tools/devel/kcp added to the repository
--> Using per-directory sticky tag `private-nhorman-bz197695-branch'




From fedora-cvs-commits at redhat.com  Thu Jul 20 03:05:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 23:05:19 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-Makefile-kcp.patch, NONE,
	1.1.2.1 kexec-tools.spec, 1.34.2.1, 1.34.2.2 Makefile.kcp,
	1.1.2.1, NONE kcp.c, 1.1.2.1, NONE
Message-ID: <200607200305.k6K35Js8005804@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5746

Modified Files:
      Tag: private-nhorman-bz197695-branch
	kexec-tools.spec 
Added Files:
      Tag: private-nhorman-bz197695-branch
	kexec-tools-1.101-Makefile-kcp.patch 
Removed Files:
      Tag: private-nhorman-bz197695-branch
	Makefile.kcp kcp.c 
Log Message:
checking in remaining kcp patches

kexec-tools-1.101-Makefile-kcp.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'kexec-tools-1.101-Makefile-kcp.patch'



--- Makefile.kcp DELETED ---


--- kcp.c DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 03:28:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 23:28:06 -0400
Subject: rpms/man-pages-ja/devel .cvsignore, 1.38, 1.39 man-pages-ja.spec,
	1.44, 1.45 sources, 1.37, 1.38
Message-ID: <200607200328.k6K3S68D028336@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28304

Modified Files:
	.cvsignore man-pages-ja.spec sources 
Log Message:
* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 20060715-1
- updates to 20060715.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	22 Jun 2006 16:25:29 -0000	1.38
+++ .cvsignore	20 Jul 2006 03:28:04 -0000	1.39
@@ -25,3 +25,4 @@
 man-pages-ja-20060415.tar.gz
 man-pages-ja-20060515.tar.gz
 man-pages-ja-20060615.tar.gz
+man-pages-ja-20060715.tar.gz


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- man-pages-ja.spec	22 Jun 2006 16:25:29 -0000	1.44
+++ man-pages-ja.spec	20 Jul 2006 03:28:04 -0000	1.45
@@ -1,13 +1,11 @@
-%define	manver		20060615
+%define	manver		20060715
 %define	use_utf8	1
 
-Summary: Japanese man (manual) pages from the Japanese Manual Project
 Name: man-pages-ja
 Version: %{manver}
 Release: 1
 License: Distributable
-Group: Documentation
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 URL: http://www.linux.or.jp/JM/
 
@@ -20,6 +18,8 @@
 Patch5: man-pages-ja-20051115-libaio.patch
 Patch8: man-pages-ja-20050215-ls.patch
 
+Summary: Japanese man (manual) pages from the Japanese Manual Project
+Group: Documentation
 %description
 Japanese Manual pages, translated by JM-Project (Japanese Manual Project).
 
@@ -38,7 +38,7 @@
 perl %{SOURCE1} $RPM_BUILD_ROOT | make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
 
 sh ./installman.sh
 
@@ -90,7 +90,7 @@
 )
  
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -fr $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 20060715-1
+- updates to 20060715.
+
 * Fri Jun 23 2006 Akira TAGOH <tagoh at redhat.com> - 20060615-1
 - updates to 20060615.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	22 Jun 2006 16:25:29 -0000	1.37
+++ sources	20 Jul 2006 03:28:04 -0000	1.38
@@ -1 +1 @@
-3c3b70fbb5d09a83828b1d83bb53cdb3  man-pages-ja-20060615.tar.gz
+7ec37d771e1f9781be4b7af33379f5d7  man-pages-ja-20060715.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 03:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 19 Jul 2006 23:36:20 -0400
Subject: rpms/kexec-tools/devel Makefile.kcp, 1.1, 1.2 kcp.c, 1.1,
	1.2 kdump.conf, NONE, 1.1 kexec-tools-1.101-Makefile-kcp.patch,
	1.1, 1.2 mkdumprd, 1.1, 1.2 Makefile, 1.1,
	1.2 kexec-tools.spec, 1.34, 1.35
Message-ID: <200607200336.k6K3aK2T030224@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30170

Modified Files:
	Makefile kexec-tools.spec 
Added Files:
	Makefile.kcp kcp.c kdump.conf 
	kexec-tools-1.101-Makefile-kcp.patch mkdumprd 
Log Message:
adding kexec frontend


Index: Makefile.kcp
===================================================================
RCS file: Makefile.kcp
diff -N Makefile.kcp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.kcp	20 Jul 2006 03:36:18 -0000	1.2
@@ -0,0 +1,35 @@
+#
+# kcp (copying date-stamped core files to filesystems)
+#
+
+KCP_C_SRCS:= kcp/kcp.c
+
+KCP_C_OBJS:= $(patsubst %.c, $(OBJDIR)/%.o, $(KCP_C_SRCS))
+KCP_C_DEPS:= $(patsubst %.c, $(OBJDIR)/%.d, $(KCP_C_SRCS))
+KCP_SRCS:= $(KCP_C_SRCS)
+KCP_OBJS:= $(KCP_C_OBJS)
+KCP_DEPS:= $(KCP_C_DEPS)
+KCP:= $(SBINDIR)/kcp
+
+include $(KCP_DEPS)
+
+$(KCP_C_DEPS): $(OBJDIR)/%.d: %.c
+	mkdir -p $(@D)
+	$(CC) $(CFLAGS) -M $< | sed -e 's|$(patsubst %.d,%.o,$(@F))|$(patsubst %.d,%.o,$(@))|' > $@
+
+$(KCP_C_OBJS): $(OBJDIR)/%.o: %.c $(OBJDIR)/%.d
+	mkdir -p $(@D)
+	$(CC) $(CFLAGS) -o $@ -c $<
+
+$(KCP): $(KCP_OBJS)
+	mkdir -p $(@D)
+	$(CC) $(CFLAGS) -o $@ $(KCP_OBJS)
+
+echo::
+	@echo "KCP_C_SRCS $(KCP_C_SRCS)"
+	@echo "KCP_C_DEPS $(KCP_C_DEPS)"
+	@echo "KCP_C_OBJS $(KCP_C_OBJS)"
+	@echo "KCP_SRCS $(KCP_SRCS)"
+	@echo "KCP_DEPS $(KCP_DEPS)"
+	@echo "KCP_OBJS $(KCP_OBJS)"
+


Index: kcp.c
===================================================================
RCS file: kcp.c
diff -N kcp.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kcp.c	20 Jul 2006 03:36:18 -0000	1.2
@@ -0,0 +1,204 @@
+
+/* Cheap program to make a variable directory first before copying contents.
+ * Main use is for kdump because nash does not support variables, hence a 
+ * command sequence like the following does not work:
+ * date=`date ...`
+ * mkdir -p /x/y/$date
+ * cp foo /x/y/$date/bar
+ *
+ * Don Zickus (dzickus at redhat.com)
+ *
+ * Copyright 2006 Red Hat Software
+ *
+ * This software may be freely redistributed under the terms of the GNU
+ * General Public License, version 2.
+ *
+ * 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.
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <strings.h>
+#include <string.h>
+
+#define BLOCK_SIZE 512
+#define SSH_TMP ".kcp-ssh"
+
+/* simple copy routine to copy src to dst */
+int copy_core(const char *src, const char *dst)
+{
+	int bytes, total=0;
+	int fd_dst, fd_src;
+	char buf[BLOCK_SIZE];
+
+	if ((fd_dst=open(dst,O_RDWR|O_CREAT, 0755)) < 0) 	
+		return -1;
+	if ((fd_src=open(src,O_RDONLY)) < 0) 		
+		return -1;
+
+	while ((bytes=read(fd_src,buf,BLOCK_SIZE)) > 0) {
+		if ((bytes=write(fd_dst,buf,bytes)) < 0) 
+			break;
+		total+=bytes;
+	}
+	if (bytes < 0) 
+		return -1;
+
+	close(fd_dst);
+	close(fd_src);
+
+	printf("Total bytes written: %d\n", total);
+	return total;
+}
+
+/* grab the local time and replace the %DATE var with it */
+char * xlate_time(const char *dst)
+{
+	struct tm *lclnow;
+	time_t now;
+	char *new_dst,*top;
+	int x;
+	
+	//get the time
+	if ((top=(char *)malloc(256)) == NULL) 	
+		return NULL;
+	if ((now = time(NULL)) < 1) 			
+		return NULL;
+	if ((lclnow = localtime(&now)) == NULL) 	
+		return NULL;
+
+	//copy the easy stuff
+	new_dst=top;
+	while (*dst && (*dst != '%')) *new_dst++ = *dst++;
+	
+	//translate the date part
+	//we output Year-Month-Day-Hour:Minute
+	if (*dst == '%'){
+		x = sprintf(new_dst,"%d-%02d-%02d-%02d:%02d", lclnow->tm_year+1900, 
+				lclnow->tm_mon+1, lclnow->tm_mday, lclnow->tm_hour, 
+				lclnow->tm_min);	
+		new_dst += x;
+
+		//finish the copy
+		dst += 5;  //skip over %DATE
+		while (*dst) *new_dst++ = *dst++;
+	}
+	*new_dst='\0';
+
+	return top;
+}
+
+void usage(int rc)
+{
+
+	printf("usage: kcp source dest\n");
+	printf("       kcp --ssh dest (first time)\n");
+	printf("       kcp --ssh src (second time)\n");
+	printf("Will translate any %%DATE command properly\n");
+	printf("in the 'dest' variable\n");
+	exit(rc);
+}
+
+int main(int argc, char *argv[])
+{
+	char *src,*dst, *new_dst, *top;
+	char path[256];
+	int using_ssh=0;
+	char *login;
+
+	if (argc < 3)
+		usage(1);
+
+	if (!strncmp(argv[1], "--ssh", 5))
+		using_ssh=1;
+	else
+		src=argv[1];
+
+	dst=argv[2];
+
+	if ((new_dst=xlate_time(dst)) == NULL){
+		printf("Failed to translate time\n");
+		exit(1);
+	}
+	top=new_dst;
+	
+	//Hack for ssh because nash doesn't support variables
+	//The idea here is to save the translated date to a file to 
+	//be read back later for scp
+	if (using_ssh){
+		int fd_dst, x;
+
+		if ((fd_dst=open(SSH_TMP, O_RDWR|O_CREAT, 0755)) < 0){
+			perror("Failed to open SSH_TMP: ");
+			exit(1);
+		}
+		if ((x=read(fd_dst, path, BLOCK_SIZE)) > 0){
+			//second time around
+			src=dst;
+			path[x]='\0';
+			close(fd_dst);
+			remove(SSH_TMP);
+			execlp("scp", "scp", "-q", "-o", "BatchMode=yes", "-o", 
+				"StrictHostKeyChecking=no", src, path, NULL);
+			//should never return!!
+			perror("Failed to scp: ");
+			exit(1);
+		}
+		//save data for next run of this program
+		printf("writing <%s> to file %s\n",top, SSH_TMP);
+		if ((write(fd_dst, top, strlen(top))) < 0){
+			perror("Failed to write to SSH_TMP: ");
+			exit(1);
+		}
+		close(fd_dst);
+
+		//save the login info
+		login=top;
+		if ((top=index(login, ':')) == NULL){
+			printf("Bad ssh format %s\n", path);
+			exit(1);
+		}
+		*top++='\0';
+	}
+
+	//find the directory portion and separate it from the file
+	if ((new_dst=rindex(top, '/')) == NULL){
+		new_dst=top;  //strange but okay, only the file passed in
+		sprintf(path,"%s",new_dst);
+	}else{
+		*new_dst='\0';
+		new_dst++;
+
+		//finish the ssh hack by running mkdir
+		if (using_ssh){
+			execlp("ssh", "ssh", "-q", "-o", "BatchMode=yes", "-o",
+                               "StrictHostKeyChecking=no", login, "mkdir", "-p", 
+				top, NULL);
+			//should never return!!
+			perror("Failed to ssh: ");
+			exit(1);
+		}
+		//make the new directory
+		if ((mkdir(top, 0777)) != 0){
+			perror("mkdir failed: ");
+			exit(1);
+		}
+		sprintf(path,"%s/%s",top,new_dst);
+	}
+
+	if (copy_core(src,path) < 0){
+		perror("Failed to write core file: ");
+		exit(1);
+	}
+
+	return 0;
+}


--- NEW FILE kdump.conf ---
# Configures where to put the kdump /proc/vmcore files
#
# This file contains a series of commands to perform (in order) when a
# kernel crash has happened and the kdump kernel has been loaded
# 
# The commands are chained together to allow redundancy in case the 
# primary choice is not available at crash time
#
# Basics commands supported are:
# raw <partition> - will dd /proc/vmcore into <partition>
# net <nfs mount> - will mount fs and copy /proc/vmcore to 
#			<mnt>/var/crash/%DATE/ , supports DNS
# net <ssh user at location> - will scp /proc/vmcore to 
#				<user at location>:/var/crash/%DATE/, supports DNS
# <fs type> - will mount -t <fs type> /mnt and copy /proc/vmcore to 
#			/mnt/var/crash/%DATE/
# default reboot - if all of the above fail, then reboot the system 
#			and accept the /proc/vmcore is lost, else 
#			comment out 'default' to fall through and fix 
#			the system (if the disk is available)

#raw /dev/sda5
#ext3 /dev/sda3
#default reboot

kexec-tools-1.101-Makefile-kcp.patch:
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: kexec-tools-1.101-Makefile-kcp.patch
===================================================================
RCS file: kexec-tools-1.101-Makefile-kcp.patch
diff -N kexec-tools-1.101-Makefile-kcp.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kexec-tools-1.101-Makefile-kcp.patch	20 Jul 2006 03:36:18 -0000	1.2
@@ -0,0 +1,22 @@
+--- kexec-tools-1.101/Makefile.orig	2006-07-19 23:23:35.000000000 -0400
++++ kexec-tools-1.101/Makefile	2006-07-19 23:24:41.000000000 -0400
+@@ -45,7 +45,7 @@
+ MAN_PAGES:= kexec/kexec.8
+ BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+ BINARIES_x86_64:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
+-BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
++BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) $(SBINDIR)/kcp
+ 
+ TARGETS:=$(BINARIES) $(MAN_PAGES)
+ 
+@@ -80,6 +80,10 @@
+ #
+ include kdump/Makefile
+ 
++# kcp (copy date-stamped core dump to a filesystem)
++#
++include kcp/Makefile
++
+ #
+ # kexec_test (test program)
+ #


Index: mkdumprd
===================================================================
RCS file: mkdumprd
diff -N mkdumprd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mkdumprd	20 Jul 2006 03:36:18 -0000	1.2
@@ -0,0 +1,1207 @@
+#!/bin/bash --norc
+# vim:sts=4:sw=4:ts=8:et
+
+# mkinitrd
+#
+# Copyright 2005 Red Hat, Inc.
+#
+# Written by Erik Troan <ewt at redhat.com>
+#
+# Contributors:
+#	Elliot Lee <sopwith at cuc.edu>
+#	Miguel de Icaza <miguel at nuclecu.unam.mx>
+#	Christian 'Dr. Disk' Hechelmann <drdisk at ds9.au.s.shuttle.de>
+#	Michael K. Johnson <johnsonm at redhat.com>
+#	Pierre Habraken <Pierre.Habraken at ujf-grenoble.fr>
+#	Jakub Jelinek <jakub at redhat.com>
+#	Carlo Arenas Belon (carenas at chasqui.lared.net.pe>
+#	Keith Owens <kaos at ocs.com.au>
+#	Bernhard Rosenkraenzer <bero at redhat.com>
+#	Matt Wilson <msw at redhat.com>
+#       Trond Eivind Glomsr??d <teg at redhat.com>
+#       Jeremy Katz <katzj at redhat.com>
+#       Preston Brown <pbrown at redhat.com>
+#	Bill Nottingham <notting at redhat.com>
+#       Guillaume Cottenceau <gc at mandrakesoft.com>
+#	Peter Jones <pjones at redhat.com>
+
+umask 0022
+
+export MALLOC_PERTURB_=204
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
+export PATH
+
+. /etc/rc.d/init.d/functions
+
+VERSION=5.0.39
+
+PROBE="yes"
+MODULES=""
+PREMODS=""
+DMRAIDS=""
+MPATHS=""
+
+
+[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd
+
+CONFMODS="$MODULES"
+MODULES=""
+
+withusb=yes
+compress=1
+allowmissing=""
+target=""
+kernel=""
+force=""
+verbose=""
+img_vers=""
+builtins=""
+modulefile=/etc/modules.conf
+rc=0
+
+IMAGESIZE=8000
+PRESCSIMODS="sd_mod"
+fstab="/etc/fstab"
+
+vg_list=""
+net_list=""
+
+vecho()
+{
+    NONL=""
+    if [ "$1" == "-n" ]; then
+        NONL="-n"
+        shift
+    fi
+    [ -n "$verbose" ] && echo $NONL "$@"
+}
+
+error()
+{
+    NONL=""
+    if [ "$1" == "-n" ]; then
+        NONL="-n"
+        shift
+    fi
+    echo $NONL "$@" >&2
+}
+
+usage () {
+    if [ "$1" == "-n" ]; then
+        cmd=echo
+    else
+        cmd=error
+    fi
+
+    $cmd "usage: `basename $0` [--version] [--help] [-v] [-d] [-f] [--preload <module>]"
+    $cmd "       [--force-ide-probe] [--force-scsi-probe | --omit-scsi-modules]"
+    $cmd "       [--image-version] [--force-scsi-probe | --omit-raid-modules]"
+    $cmd "       [--with=<module>] [--force-lvm-probe | --omit-lvm-modules]"
+    $cmd "       [--builtin=<module>] [--omit-dmraid]"
+    $cmd "       [--fstab=<fstab>] [--nocompress] <initrd-image> <kernel-version>"
+    $cmd ""
+    $cmd "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)"
+
+    if [ "$1" == "-n" ]; then
+        exit 0
+    else
+        exit 1
+    fi
+}
+
+moduledep() {
+    if [ ! -f "/lib/modules/$kernel/modules.dep" ]; then
+	error "No dep file found for kernel $kernel"
+	exit 1
+    fi
+
+    vecho -n "Looking for deps of module $1"
+    deps=$(awk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
+                function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \
+                function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
+                /^\/lib/ { show(); \
+                           orig=modname($1); dep=""; \
+                           if ($2) { for (i = 2; i <= NF; i++) { dep=sprintf("%s %s", dep, modname($i)); } } } \
+                /^	/ { dep=sprintf("%s %s", dep, modname($1));  } \
+                END      { show(); exit(rc) }' /lib/modules/$kernel/modules.dep $1)
+    [ -n "$deps" ] && vecho ":$deps" || vecho
+}
+
+findone() {
+    echo nash-find "$@" | /sbin/nash --force --quiet \
+	| /bin/awk '{ print $1; exit; }'
+}
+
+findall() {
+    echo nash-find "$@" | /sbin/nash --force --quiet
+}
+
+dm_get_uuid() {
+    echo dm get_uuid "$1" | /sbin/nash --force --quiet
+}
+
+findmodule() {
+    skiperrors=""
+
+    if [ $1 == "--skiperrors" ]; then
+	skiperrors=--skiperrors
+	shift
+    fi
+
+    local modName=$1
+
+    if [ "$modName" = "off" -o "$modName" = "null" ]; then
+	return
+    fi
+
+    if [ $(echo $modName | cut -b1) = "-" ]; then
+	skiperrors=--skiperrors
+	modName=$(echo $modName | cut -b2-)
+    fi
+
+    case "$MODULES " in
+        *"/$modName.ko "*) return ;;
+    esac
+
+    if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then
+        vecho "module $modName assumed to be built in"
+	return
+    fi
+
+    # special cases
+    if [ "$modName" = "i2o_block" ]; then
+	findmodule i2o_core
+	findmodule -i2o_pci
+	modName="i2o_block"
+    elif [ "$modName" = "ppa" ]; then
+	findmodule parport
+	findmodule parport_pc
+	modName="ppa"
+    elif [ "$modName" = "sbp2" ]; then
+	findmodule ieee1394
+	findmodule ohci1394
+	modName="sbp2"
+    else
+	moduledep $modName
+	for i in $deps; do
+	    findmodule $i
+	done
+    fi
+
+    for modExt in o.gz o ko ; do
+	for modDir in /lib/modules/$kernel/updates /lib/modules/$kernel ; do
+	    if [ -d $modDir ]; then
+		fmPath=$(findone $modDir -name $modName.$modExt)
+	        if [ -f "$fmPath" ]; then
+		    break 2
+	        fi
+	    fi
+        done
+    done
+
+    if [ ! -f $fmPath ]; then
+	if [ -n "$skiperrors" ]; then
+	    return
+	fi
+
+        # ignore the absence of the scsi modules
+	for n in $PRESCSIMODS; do
+	    if [ "$n" = "$modName" ]; then
+		return;
+	    fi
+	done;
+
+	if [ -n "$allowmissing" ]; then
+	    error "WARNING: No module $modName found for kernel $kernel, continuing anyway"
+	    return
+	fi
+
+	error "No module $modName found for kernel $kernel, aborting."
+	exit 1
+    fi
+
+    # only need to add each module once
+    MODULES="$MODULES $fmPath"
+
+    # need to handle prescsimods here -- they need to go _after_ scsi_mod
+    if [ "$modName" = "scsi_mod" ]; then
+	for n in $PRESCSIMODS ; do
+	    findmodule $n
+	done
+    fi
+}
+
+finddmmods() {
+    line=$(/sbin/dmsetup table "$1" 2>/dev/null)
+    [ -z "$line" ] && return 1
+    type=$(echo "$line" | awk '{ print $3 }')
+    [ -z "$type" ] && return 1
+    case "$type" in
+    mirror)
+        findmodule -dm-mirror
+        ;;
+    emc)
+        findmodule -dm-emc
+        findmodule -dm-round-robin
+        ;;
+    multipath)
+        findmodule -dm-multipath
+        findmodule -dm-round-robin
+        ;;
+    crypt)
+        findmodule -dm-crypt
+        ;;
+    zero)
+        findmodule -dm-zero
+        ;;
+    esac
+}
+
+inst() {
+    if [ "$#" != "2" ];then
+        echo "usage: inst <file> <destination>"
+        return
+    fi
+    vecho "$1 -> $2"
+    cp $1 $2
+}
+
+readlink() {
+    echo nash-readlink "$1" | /sbin/nash --force --quiet
+}
+
+access() {
+    echo nash-access -w $t | /sbin/nash --force --quiet
+}
+
+findstoragedriverinsys () {
+    while [ ! -L device ]; do
+        [ "$PWD" = "/sys" ] && return
+        cd ..
+    done
+    cd $(readlink ./device)
+    while [ ! -f modalias ]; do
+        [ "$PWD" = "/sys/devices" ] && return
+        cd ..
+    done
+    modalias=$(cat modalias)
+    for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
+        findmodule ${driver%%.ko}
+    done
+}
+
+findstoragedriver () {
+    for device in $@ ; do
+        case " $handleddevices " in
+            *" $device "*)
+                continue ;;
+            *) handleddevices="$handleddevices $device" ;;
+        esac
+        if [[ "$device" =~ "md[0-9]+" ]]; then
+            vecho "Found RAID component $device"
+            handleraid "$device"
+            continue
+        fi
+        vecho "Looking for driver for device $device"
+        sysfs=$(findone -type d /sys/block -name $device)
+        [ -z "$sysfs" ] && return
+        pushd $sysfs >/dev/null 2>&1
+        findstoragedriverinsys
+        popd >/dev/null 2>&1
+    done
+}
+
+findnetdriver() {
+    for device in $@ ; do
+        case " $handleddevices " in
+            *" $device "*)
+                continue ;;
+            *) handleddevices="$handleddevices $device" ;;
+        esac
+        modalias=$(cat /sys/class/net/$device/device/modalias)
+        for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
+            findmodule ${driver%%.ko}
+        done
+    done
+}
+
+handleraid() {
+    local start=0
+
+    if [ -n "$noraid" -o ! -f /proc/mdstat ]; then
+        return 0
+    fi
+
+    levels=$(grep "^$1[	 ]*:" /proc/mdstat | \
+        awk '{ print $4 }')
+    devs=$(grep "^$1[	 ]*:" /proc/mdstat | \
+        awk '{ print gensub("\\[[0-9]*\\]","","g",gensub("^md.*raid[0-9]*","","1")) }')
+
+    for level in $levels ; do
+	case $level in
+	linear)
+	    findmodule linear
+	    start=1
+	    ;;
+	multipath)
+	    findmodule multipath
+	    start=1
+	    ;;
+	raid[01456] | raid10)
+	    findmodule $level
+	    start=1
+	    ;;
+	*)
+	    error "raid level $level (in /proc/mdstat) not recognized"
+	    ;;
+	esac
+    done
+    findstoragedriver $devs
+    if [ "$start" = 1 ]; then
+        raiddevices="$raiddevices $1"
+    fi
+    return $start
+}
+
+handlelvordev() {
+    local vg=`lvs --noheadings -o vg_name $1 2>/dev/null`
+    if [ -n "$vg" ]; then
+        vg=`echo $vg` # strip whitespace
+        case " $vg_list " in
+        *" $vg "*)
+            ;;
+        *)
+            vg_list="$vg_list $vg"
+            for device in `vgdisplay -v $vg 2>/dev/null | sed -n 's/PV Name//p'`; do
+                findstoragedriver ${device##/dev/}
+            done
+            ;;
+        esac
+    else
+        findstoragedriver ${1##/dev/}
+    fi
+}
+
+handlenetdev() {
+    local dev=$1
+
+    source /etc/sysconfig/network
+    if [ ! -f /etc/sysconfig/network-scripts/ifcfg-$dev ]; then
+	error "unable to find network device configuration for $dev"
+    fi
+    source /etc/sysconfig/network-scripts/ifcfg-$dev
+    [ -n  "$BOOTPROTO" ] || error "bootproto not specified for $dev"
+
+    findnetdriver $dev
+    [ -n "$IPADDR" ] && IPSTR="$IPSTR --ip $IPADDR"
+    [ -n "$NETMASK" ] && IPSTR="$IPSTR --netmask $NETMASK"
+    [ -n "$GATEWAY" ] && IPSTR="$IPSTR --gateway $GATEWAY"
+    [ -n "$ETHTOOL_OPTS" ] && IPSTR="$IPSTR --ethtool \"$ETHTOOL_OPTS\""
+    [ -n "$MTU" ] && IPSTR="$IPSTR --mtu $MTU"
+    if [ -n "$IPADDR" ]; then
+	[ -z "$DOMAIN" ] && DOMAIN=$(awk '/^search / { print gensub("^search ","",1) }' /etc/resolv.conf)
+	if [ -z "$DNS1" ]; then
+	    DNS1=$(awk '/^nameserver / { ORS="" ; if (x > 0) print "," ; printf "%s", $2 ; x = 1}' /etc/resolv.conf)
+	fi
+    fi
+    [ -n "$DOMAIN" ] && IPSTR="$IPSTR --domain \"$DOMAIN\""
+    if [ -n "$DNS1" ]; then
+        if [ -n "$DNS2" ]; then
+	    IPSTR="$IPSTR --dns $DNS1,$DNS2"
+	else
+	    IPSTR="$IPSTR --dns $DNS1"
+	fi
+    fi
+    network="network --device $dev --bootproto $BOOTPROTO $IPSTR"
+}
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--fstab*)
+	    if echo $1 | grep -q '=' ; then
+	    	fstab=`echo $1 | sed 's/^--fstab=//'`
+	    else
+		fstab=$2
+		shift
+	    fi
+	    ;;
+
+	--with-usb)
+	    withusb=yes
+	    ;;
+
+        --without-usb)
+            withusb=no
+            ;;
+
+	--with*)
+	    if echo $1 | grep -q '=' ; then
+	    	modname=`echo $1 | sed 's/^--with=//'`
+	    else
+		modname=$2
+		shift
+	    fi
+
+	    basicmodules="$basicmodules $modname"
+	    ;;
+
+	--builtin*)
+	    if echo $1 | grep -q '=' ; then
+	    	modname=`echo $1 | sed 's/^--builtin=//'`
+	    else
+		modname=$2
+		shift
+	    fi
+	    builtins="$builtins $modname"
+	    ;;
+
+	--version)
+	    echo "mkinitrd: version $VERSION"
+	    exit 0
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	--nocompress)
+	    compress=""
+	    ;;
+
+	--ifneeded)
+	    # legacy
+	    ;;
+
+	-f)
+	    force=1
+	    ;;
+    
+        -d)
+            KDUMP_CONFIG_FILE=""
+            if [ -f /etc/kdump.conf ]; then
+                KDUMP_CONFIG_FILE="/etc/kdump.conf"
+            fi
+            ;;
+
+	--preload*)
+	    if echo $1 | grep -q '=' ; then
+	    	modname=`echo $1 | sed 's/^--preload=//'`
+	    else
+		modname=$2
+		shift
+	    fi
+	    PREMODS="$PREMODS $modname"
+	    ;;
+	--force-scsi-probe)
+	    forcescsi=1
+	    ;;
+	--omit-scsi-modules)
+	    PRESCSIMODS=""
+	    noscsi=1
+	    ;;
+	--force-raid-probe)
+	    forceraid=1
+	    ;;
+	--omit-raid-modules)
+	    noraid=1
+	    ;;
+	--force-lvm-probe)
+	    forcelvm=1
+	    ;;
+	--omit-lvm-modules)
+	    nolvm=1
+	    ;;
+	--omit-dmraid)
+	    nodmraid=1
+            ;;
+        --force-ide-probe)
+            forceide=1
+            ;;
+	--image-version)
+	    img_vers=yes
+	    ;;
+	--allow-missing)
+	    allowmissing=yes
+	    ;;
+	--noresume)
+	    noresume=1
+	    ;;
+        --help)
+            usage -n
+            ;;
+	*)
+	    if [ -z "$target" ]; then
+		target=$1
+	    elif [ -z "$kernel" ]; then
+		kernel=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+if [ -z "$target" -o -z "$kernel" ]; then
+    usage
+fi
+
+if [ -n "$img_vers" ]; then
+    target="$target-$kernel"
+fi
+
+if [ -z "$force" -a -f $target ]; then
+    error "$target already exists."
+    exit 1
+fi
+
+if [ -n "$forcescsi" -a -n "$noscsi" ]; then
+    error "Can't both force scsi probe and omit scsi modules"
+    exit 1
+fi
+
+if [ -n "$forceraid" -a -n "$noraid" ]; then
+    error "Can't both force raid probe and omit raid modules"
+    exit 1
+fi
+
+if [ -n "$forcelvm" -a -n "$nolvm" ]; then
+    error "Can't both force LVM probe and omit LVM modules"
+    exit 1
+fi
+
+if [ ! -d /lib/modules/$kernel ]; then
+    error 'No modules available for kernel "'${kernel}'".'
+    exit 1
+fi
+
+if [ $UID != 0 ]; then
+    error "mkinitrd must be run as root."
+    exit 1
+fi
+
+vecho "Creating initramfs"
+modulefile=/etc/modprobe.conf
+
+# find a temporary directory which doesn't use tmpfs
+TMPDIR=""
+for t in /tmp /var/tmp /root ${PWD}; do
+    if [ ! -d $t ]; then continue; fi
+    if ! access -w $t ; then continue; fi
+
+    fs=$(df -T $t 2>/dev/null | awk '{line=$1;} END {printf $2;}')
+    if [ "$fs" != "tmpfs" ]; then
+	TMPDIR=$t
+	break
+    fi
+done
+
+if [ -z "$TMPDIR" ]; then
+    error "no temporary directory could be found."
+    exit 1
+fi
+
+if [ $TMPDIR = "/root" -o $TMPDIR = "${PWD}" ]; then
+    error "WARNING: using $TMPDIR for temporary files"
+fi
+
+for n in $PREMODS; do
+	findmodule $n
+done
+
+needusb=""
+if [ -n "$withusb" -a "x$PROBE" == "xyes" ]; then
+    # If / or /boot is on a USB device include the driver. With root by
+    # label we could still get some odd behaviors
+    for fs in / /boot ; do
+        esc=$(echo $fs | sed 's,/,\\/,g')
+        dev=$(mount | awk "/ on ${esc} / { print \$1 }" | sed 's/[0-9]*$//' | cut -d/ -f3)
+        if [ "$(echo $dev | cut -c1-2)" = sd ]; then
+            if [ `which kudzu 2>/dev/null` ]; then
+                host=$(kudzu --probe -b scsi |
+                gawk '/^device: '${dev}'/,/^host:/ { if (/^host/) { print $2; exit; } }')
+                if [ -d /proc/scsi/usb-storage-${host} -o -f /proc/scsi/usb-storage/${host} ]; then
+                    needusb=1
+                fi
+            fi
+        fi
+    done
+fi
+
+if [ -n "$needusb" -a "x$PROBE" == "xyes" ]; then
+    drivers=$(awk '/^alias[[:space:]]+usb-controller[0-9]* / { print $3}' < $modulefile)
+    useUSB=0
+    if [ -n "$drivers" ]; then
+        useUSB=1
+        for driver in $drivers; do
+            findmodule $driver
+        done
+    fi
+    for x in $(grep ^[eou]hci_hcd /proc/modules | awk '{ print $1 }' | tac) ; do
+        useUSB=1
+        findmodule $(echo $x | sed 's/_/-/')
+    done
+    if [ "$useUSB" == "1" ]; then
+        findmodule scsi_mod
+        findmodule sd_mod
+        findmodule usb-storage
+    fi
+fi
+
+if [ -n "$forcescsi" -o -z "$noscsi" -a "x$PROBE" == "xyes" ]; then
+    if [ ! -f $modulefile ]; then
+        modulefile=/etc/conf.modules
+    fi
+
+    if [ -f $modulefile ]; then
+	scsimodules=`grep "alias[[:space:]]\+scsi_hostadapter" $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | awk '{ print $3 }'`
+
+	if [ -n "$scsimodules" ]; then
+            for n in $scsimodules; do
+    # for now allow scsi modules to come from anywhere.  There are some
+    # RAID controllers with drivers in block/
+		findmodule $n
+	    done
+	fi
+    fi
+fi
+
+# If we have ide devices and module ide, do the right thing
+ide=/proc/ide/ide*
+if [ -n "$forceide" -o -n "$ide" -a "x$PROBE" == "xyes" ]; then
+    findmodule -ide-disk
+fi
+
+# If we have dasd devices, include the necessary modules (S/390)
+if [ "x$PROBE" == "xyes" -a -d /proc/dasd ]; then
+    findmodule -dasd_mod
+    findmodule -dasd_eckd_mod
+    findmodule -dasd_fba_mod
+fi
+
+if [ "x$PROBE" == "xyes" ]; then
+    rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
+    rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
+
+    # in case the root filesystem is modular
+    findmodule -${rootfs}
+
+    rootdev=$(awk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
+    # check if it's nfsroot
+    if [ "$rootfs" == "nfs" ]; then
+	remote=$(echo $rootdev | cut -d : -f 1)
+	# FIXME: this doesn't handle ips properly
+	remoteip=$(host $remote | cut -d ' ' -f 4) 
+	netdev=`/sbin/ip route get to $remoteip |sed 's|.*dev \(.*\).*|\1|g' |awk {'print $1;'} |head -n 1`	
+	net_list="$net_list $netdev"
+    # check if it's root by label
+    elif echo $rootdev | cut -c1-6 | grep -q "LABEL=" ; then
+    	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
+                     -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
+        majmin=$(get_numeric_dev dec /dev/root)
+        if [ -n "$majmin" ]; then
+            dev=$(findall /sys/block -name dev | while read device ; do \
+	          echo "$majmin" | cmp -s $device && echo $device ; done \
+	          | sed -e 's,.*/\([^/]\+\)/dev,\1,' )
+	    if [ -n "$dev" ]; then
+                vecho "Found root device $dev for $rootdev"
+                rootdev=$dev
+	    fi
+        fi
+    else
+    	rootopts=$(echo $rootopts | sed -e 's/^r[ow],//' -e 's/,r[ow],$//' -e 's/,r[ow],/,/' \
+                     -e 's/^r[ow]$/defaults/' -e 's/$/,ro/')
+    fi
+    [ "$rootfs" != "nfs" ] && handlelvordev $rootdev
+
+    # find the first swap dev which would get used for swsusp
+    swsuspdev=$(awk '/^[ \t]*[^#]/ { if ($3 == "swap") { print $1; }}' $fstab \
+                | head -n 1)
+    if ! echo $swsuspdev | cut -c1-6 | grep -q "LABEL=" ; then
+        handlelvordev $swsuspdev
+    fi
+fi
+
+# If we use LVM or dm-based raid, include dm-mod
+# XXX: dm not really supported yet.
+testdm=""
+[ -n "$vg_list" ] && testdm="yes"
+[ -n "$forceraid" -o -n "$forcelvm" ] && testdm="yes"
+[ -z "$nolvm" -o -z "$noraid" ] && testdm="yes"
+[ "x$PROBE" != "xyes" ] && testdm=""
+
+if [ -n "$testdm" ]; then
+    if [ -x /sbin/dmsetup -a -e /dev/mapper/control ]; then
+	dmout=$(/sbin/dmsetup ls 2>/dev/null)
+	if [ "$dmout" != "No devices found" -a "$dmout" != "" ]; then
+	    findmodule -dm-mod
+
+            # DM requires all of these to be there in case someone used the
+            # feature.  broken.  (#132001)
+            findmodule -dm-mirror
+            findmodule -dm-zero
+            findmodule -dm-snapshot
+	fi
+    fi
+    if [ -x /sbin/dmraid -a -z "$nodmraid" ]; then
+        for raid in $(/sbin/dmraid -s -craidname 2>/dev/null | grep -vi "no raid disks" ) ; do
+            dmname=$(resolve_dm_name $raid)
+            if [ -n "$dmname" ]; then
+                DMRAIDS="$DMRAIDS $dmname"
+            fi
+        done
+    fi
+fi
+	    
+for n in $basicmodules; do
+    findmodule $n
+done
+
+for n in $CONFMODS; do
+    findmodule $n
+done
+
+finddmmods
+
+vecho "Using modules:$MODULES"
+
+MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX`
+IMAGE=`mktemp ${TMPDIR}/initrd.img.XXXXXX`
+RCFILE=$MNTIMAGE/init
+
+cemit()
+{
+    cat >> $RCFILE
+}
+
+emit()
+{
+    NONL=""
+    if [ "$1" == "-n" ]; then
+        NONL="-n"
+        shift
+    fi
+    echo $NONL "$@" >> $RCFILE
+}
+
+emitdm()
+{
+    vecho "Adding dm map \"$1\""
+    UUID=$(dm_get_uuid "$1")
+    if [ -n "$UUID" ]; then
+        UUID="--uuid $UUID"
+    fi
+    emit dm create "$1" $UUID $(/sbin/dmsetup table "$1")
+}
+
+emitdms()
+{
+    [ -z "$MPATHS" -a -z "$DMRAIDS" ] && return 0
+    echo dm list $MPATHS $DMRAIDS | nash --force --quiet | \
+            while read ACTION NAME ; do
+        case $ACTION in
+        rmparts)
+            emit rmparts "$NAME"
+            ;;
+        create)
+            emitdm "$NAME"
+            ;;
+        part)
+            emit dm partadd "$NAME"
+            ;;
+        esac
+    done
+}
+
+if [ -z "$MNTIMAGE" -o -z "$IMAGE" ]; then
+    error "Error creating temporaries.  Try again"
+    exit 1
+fi
+
+if [ -n "$KDUMP_CONFIG_FILE" ]; then
+    while read type location; do
+
+        case "$type" in
+        net)
+            #grab remote host and xlate into numbers
+            rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
+            need_dns=`echo $rhost|grep [a-zA-Z]`
+            [ -n "$need_dns" ] && rhost=`host $rhost|cut -d' ' -f4`
+
+            #find ethernet device used to route to remote host, ie eth0
+            netdev=`/sbin/ip route get to $rhost 2>&1`
+            [ $? != 0 ] && echo "Bad kdump location: $location" && continue
+            netdev=`echo $netdev|awk '{print $3;}'|head -n 1`
+           
+            #add the ethernet device to the list of modules 
+            handlenetdev $netdev
+
+            #load nfs modules, if needed 
+            echo $location | grep -v "@" > /dev/null && findmodule nfs
+            ;;
+        *)
+            ;;
+        esac
+
+    done < $KDUMP_CONFIG_FILE
+fi
+
+mkdir -p $MNTIMAGE
+mkdir -p $MNTIMAGE/lib
+mkdir -p $MNTIMAGE/bin
+mkdir -p $MNTIMAGE/etc
+mkdir -p $MNTIMAGE/dev
+mkdir -p $MNTIMAGE/proc
+mkdir -p $MNTIMAGE/sys
+mkdir -p $MNTIMAGE/sysroot
+ln -s bin $MNTIMAGE/sbin
+
+if [ -e /etc/fstab.sys ]; then
+    inst /etc/fstab.sys "$MNTIMAGE/etc/fstab.sys"
+fi
+inst /sbin/nash "$MNTIMAGE/bin/nash"
+inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
+ln -s /sbin/nash $MNTIMAGE/sbin/modprobe
+
+for MODULE in $MODULES; do
+    if [ -x /usr/bin/strip ]; then
+	/usr/bin/strip -g $verbose $MODULE -o $MNTIMAGE/lib/$(basename $MODULE)
+    else
+	cp $verbose -a $MODULE $MNTIMAGE/lib
+    fi
+done
+
+# mknod'ing the devices instead of copying them works both with and
+# without devfs...
+mkdir $MNTIMAGE/dev/mapper
+
+mknod $MNTIMAGE/dev/ram0 b 1 0
+mknod $MNTIMAGE/dev/ram1 b 1 1
+ln -sf ram1 $MNTIMAGE/dev/ram
+
+mknod $MNTIMAGE/dev/null c 1 3
+mknod $MNTIMAGE/dev/zero c 1 5
+mknod $MNTIMAGE/dev/systty c 4 0
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 ; do
+    mknod $MNTIMAGE/dev/tty$i c 4 $i
+done
+for i in 0 1 2 3 ; do
+    mknod $MNTIMAGE/dev/ttyS$i c 4 $(($i + 64))
+done
+mknod $MNTIMAGE/dev/tty c 5 0
+mknod $MNTIMAGE/dev/console c 5 1
+mknod $MNTIMAGE/dev/ptmx c 5 2
+mknod $MNTIMAGE/dev/rtc c 10 135
+if [ "$(uname -m)" == "ia64" ]; then
+    mknod $MNTIMAGE/dev/efirtc c 10 136
+fi
+
+# FIXME -- this can really go poorly with clvm or duplicate vg names.
+# nash should do lvm probing for us and write its own configs.
+if [ -n "$vg_list" ]; then
+    inst /sbin/lvm.static "$MNTIMAGE/bin/lvm"
+    if [ -f /etc/lvm/lvm.conf ]; then
+	cp $verbose --parents /etc/lvm/lvm.conf $MNTIMAGE/
+    fi
+fi
+
+echo -n >| $RCFILE
+cemit << EOF
+#!/bin/nash
+
+mount -t proc /proc /proc
+setquiet
+echo Mounting proc filesystem
+echo Mounting sysfs filesystem
+mount -t sysfs /sys /sys
+echo Creating /dev
+mount -o mode=0755 -t tmpfs /dev /dev
+mkdir /dev/pts
+mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
+mkdir /dev/shm
+mkdir /dev/mapper
+echo Creating initial device nodes
+mknod /dev/null c 1 3
+mknod /dev/zero c 1 5
+mknod /dev/systty c 4 0
+mknod /dev/tty c 5 0
+mknod /dev/console c 5 1
+mknod /dev/ptmx c 5 2
+mknod /dev/rtc c 10 135
+EOF
+if [ "$(uname -m)" == "ia64" ]; then
+    emit "mknod $MNTIMAGE/dev/efirtc c 10 136"
+fi
+
+# XXX really we need to openvt too, in case someting changes the
+# color palette and then changes vts on fbcon before gettys start.
+# (yay, fbcon bugs!)
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 ; do
+    emit "mknod /dev/tty$i c 4 $i"
+done
+
+for i in 0 1 2 3 ; do
+    emit "mknod /dev/ttyS$i c 4 $(($i + 64))"
+done
+
+emit "echo Setting up hotplug."
+emit "hotplug"
+
+emit "echo Creating block device nodes."
+emit "mkblkdevs"
+
+for MODULE in $MODULES; do
+    text=""
+    module=`echo $MODULE | sed "s|.*/||" | sed "s/.k\?o$//"`
+    fullmodule=`echo $MODULE | sed "s|.*/||"`
+
+    options=`sed -n -e "s/^options[ 	][ 	]*$module[ 	][ 	]*//p" $modulefile 2>/dev/null`
+
+    if [ -n "$options" ]; then
+        vecho "Adding module $module$text with options $options"
+    else
+        vecho "Adding module $module$text"
+    fi
+    emit "echo \"Loading $fullmodule module\""
+    emit "insmod /lib/$fullmodule $options"
+
+    # Hack - we need a delay after loading usb-storage to give things
+    #        time to settle down before we start looking a block devices
+    if [ "$module" = "usb-storage" ]; then
+	emit "echo Waiting 8 seconds for driver initialization."
+	emit "sleep 8"
+    fi
+    if [ "$module" = "zfcp" -a -f /etc/zfcp.conf ]; then
+	emit "echo Waiting 2 seconds for driver initialization."
+        emit "sleep 2"
+        cat /etc/zfcp.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE SCSIID WWPN SCSILUN FCPLUN; do
+        cemit <<EOF 
+echo -n $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add
+echo -n $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add
+echo -n 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online
+EOF
+        done
+    fi
+done
+
+if [ -n "$vg_list" ]; then
+    emit "echo Making device-mapper control node"
+    emit "mkdmnod"
+fi
+
+if [ -n "$net_list" ]; then
+    for netdev in $net_list; do 
+	emit "echo Bringing up $netdev"
+	handle_netdev $netdev
+	emit $network
+    done
+fi
+
+# HACK: module loading + device creation isn't necessarily synchronous...
+# this will make sure that we have all of our devices before trying
+# things like RAID or LVM
+emit "mkblkdevs"
+
+emitdms
+
+if [ -n "$raiddevices" ]; then
+    for dev in $raiddevices; do
+	cp -a /dev/${dev} $MNTIMAGE/dev
+	emit "raidautorun /dev/${dev}"
+    done
+fi
+
+if [ -n "$vg_list" ]; then
+    emit "echo Scanning logical volumes"
+    emit "lvm vgscan --ignorelockingfailure"
+    emit "echo Activating logical volumes"
+    emit "lvm vgchange -ay --ignorelockingfailure $vg_list"
+fi
+
+if [ -z "$noresume" -a -n "$swsuspdev" ]; then
+    emit "resume $swsuspdev"
+fi
+
+kdump_chk()
+{
+    rc=`eval $1` && return $rc
+    echo "$KDUMP_CONFIG_FILE: $2"
+    exit 1
+}
+
+if [ -n "$KDUMP_CONFIG_FILE" ]; then
+    memtotal=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
+    
+    #timezone info for date which outputs YYYY-MM-DD-hh:mm
+    cp /etc/localtime $MNTIMAGE/etc/localtime
+    bin="/sbin/reboot /sbin/kcp"
+    
+    #traverse the config file and setup each dump location
+    while read type location; do
+            [ -z "$type" ] && continue  #skip empty lines
+            [ "`echo $type| grep ^# `" ] && continue #skip comments
+            kdump_chk "test -n \"$location\"" "Need a location for $type"
+
+            case "$type" in
+                \#*) continue;;    #skip comments
+
+                raw)
+                    #test raw partition
+                    kdump_chk "dd if=$location count=1 of=/dev/null > /dev/null 2>&1" \
+                               "Bad raw partition $location"
+                    #TODO check for available size is greater than $memtotal
+
+                    #setup raw case
+                    emit "echo Saving to partition $location"
+                    emit "dd if=/proc/vmcore of=$location"
+                    emit "cond reboot -h -f"
+                    bin="$bin /bin/dd"
+                    ;;
+
+                net)
+                    #grab remote host and xlate into numbers
+                    rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1`
+                    need_dns=`echo $rhost|grep [a-zA-Z]`
+                    [ -n "$need_dns" ] && rhost=`host $rhost|cut -d' ' -f4`
+
+                    #find the local ip being used as a route to remote ip
+                    netdev=`/sbin/ip route get to $rhost 2>&1`
+                    [ $? != 0 ] && echo "Bad kdump location: $location" && continue
+                    lhost=`echo $netdev|awk '{print $5;}'|head -n 1`
+           
+                    emit "echo Saving to remote location $location"
+                    if [ -z "`echo $location|grep @`" ]; then
+                        #NFS path
+
+                        #test nfs mount and directory creation
+                        rlocation=`echo $location| sed 's/.*:/'"$rhost"':/'`
+                        tmnt=`mktemp -dq`
+                        kdump_chk "mount -t nfs -o nolock $rlocation $tmnt" \
+                                   "Bad NFS mount $location"
+                        mkdir -p /mnt/var/crash
+                        tdir=`mktemp -dqp /mnt/var/crash`
+
+                        rc=$? && rm -rf $tdir && umount $tmnt && rm -rf $tmnt
+                        if [ $rc != "0" ]; then 
+                            echo "Cannot create directory in $location: var/crash"
+                            exit 1 
+                        fi
+                        #TODO check for available size is greater than $memtotal
+    
+                        #setup nfs case
+                        mkdir -p $MNTIMAGE/mnt
+                        emit "mount -t nfs -o nolock $rlocation /mnt"
+                        emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                        emit "cond reboot -h -f"
+                    else
+                        #SSH path
+           
+                        #rebuild $location replacing machine name with ip address
+                        rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'`
+                        #test ssh path and directory creation
+                        s_opts="-o BatchMode=yes -o StrictHostKeyChecking=no"
+                        kdump_chk "ssh -q $s_opts $rlocation mkdir -p /var/crash/ </dev/null" \
+                                   "Could not create $location:/var/crash, check ssh keys"
+                        tdir=`ssh -q $s_opts $rlocation mktemp -dqp /var/crash </dev/null`
+                        if [ $? != "0" ]; then
+                            echo "$KDUMP_CONFIG_FILE: Could not create temp directory in $location:/var/crash"
+                            exit 1
+                        fi
+                        ssh -q $s_opts $rlocation rm -rf $tdir </dev/null
+                        #TODO check for available size is greater than $memtotal
+
+                        #setup ssh case, quick check to see if setup already
+                        if [ ! -r $MNTIMAGE/dev/urandom ]; then
+                            #only need to do these once
+                            grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd
+                            mkdir -p $MNTIMAGE/root
+                            cp -a /root/.ssh $MNTIMAGE/root/
+                            cp -a /etc/ssh $MNTIMAGE/etc
+                            mknod $MNTIMAGE/dev/urandom c 1 9
+                            emit "mknod /dev/urandom c 1 9"
+                        fi
+                        emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
+                        emit "cond kcp --ssh $rlocation:/var/crash/$lhost-%DATE/vmcore"
+                        emit "cond kcp --ssh /proc/vmcore"
+                        emit "cond reboot -h -f"
+                        bin="$bin /usr/bin/scp /usr/bin/ssh /bin/dd"
+                        
+                        #ssh, scp require libraries that aren't found with ldd
+                        lib=/lib && [ -d "/lib64" ] && lib=/lib64
+                        k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2"
+                    fi
+                    ;;
+                default)
+                    [ "$location" == "reboot" ] && emit "reboot -h -f"
+                    #else load normally on default failure case
+                    ;;
+                *)
+                    #test filesystem and directory creation
+                    kdump_chk "test -f /sbin/fsck.$type" "Unsupported type $type"
+                    kdump_chk "mount -t $type $location /mnt" "Bad mount point $location"
+                    mkdir -p /mnt/var/crash
+                    tdir=`mktemp -dqp /mnt/var/crash/`
+                    rc=$? && rm -rf $tdir && umount /mnt
+                    if [ $rc != "0" ]; then 
+                        echo "Cannot create directory in $location: /var/crash"
+                        exit 1
+                    fi
+                    #TODO check for available size is greater than $memtotal
+    
+                    #setup filesystem case
+                    lhost="127.0.0.1"
+                    mkdir -p $MNTIMAGE/mnt
+		    touch $MNTIMAGE/etc/mtab
+                    emit "echo Saving to the local filesystem $location"
+                    emit "fsck.$type $location"
+                    emit "cond mount -t $type $location /mnt"
+                    emit "cond kcp /proc/vmcore /mnt/var/crash/$lhost-%DATE/vmcore"
+                    emit "cond umount /mnt"
+                    emit "cond reboot -h -f"
+                    bin="$bin /sbin/fsck.$type /bin/mount"
+                    ;;
+            esac
+    done < $KDUMP_CONFIG_FILE
+
+    #find the shared libraries.  this snippet taken from kboot
+    kdump_libs=`for n in $bin; do 
+        ldd "$n" 2>/dev/null | tr -s '\011' ' ' | 
+        sed 's/.*=> *//;s/^ *//;/ *(0x.*)/s///p;d' 
+    done | sort | uniq | sed '/^ *$/d'`
+
+    #copy the binaries and their shared libraries to the archive
+    for n in $bin $kdump_libs $k_extras; do
+        mkdir -p $MNTIMAGE/`dirname $n`
+        cp $n $MNTIMAGE/$n
+    done
+fi
+
+emit "echo Creating root device."
+# mkrootdev does "echo /dev/root /sysroot ext3 defaults,ro 0 0 >/etc/fstab"
+emit "mkrootdev -t $rootfs -o $rootopts $rootdev"
+rootdev=/dev/root
+
+emit "echo Mounting root filesystem."
+emit "mount /sysroot"
+
+emit "echo Setting up other filesystems."
+emit "setuproot"
+
+emit "echo Switching to new root and running init."
+emit "switchroot"
+
+chmod +x $RCFILE
+
+(cd $MNTIMAGE; findall . | cpio --quiet -c -o) >| $IMAGE || exit 1
+
+if [ -n "$compress" ]; then
+    gzip -9 < $IMAGE >| $target || rc=1
+else
+    cp -a $IMAGE $target || rc=1
+fi
+rm -rf $MNTIMAGE $IMAGE
+if [ -n "$MNTPOINT" ]; then rm -rf $MNTPOINT ; fi
+
+exit $rc


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	29 Aug 2005 18:44:29 -0000	1.1
+++ Makefile	20 Jul 2006 03:36:18 -0000	1.2
@@ -3,4 +3,6 @@
 NAME := kexec-tools
 SPECFILE = $(firstword $(wildcard *.spec))
 
+SUBDIRS = kcp
+
 include ../common/Makefile.common


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kexec-tools.spec	12 Jul 2006 06:42:46 -0000	1.34
+++ kexec-tools.spec	20 Jul 2006 03:36:18 -0000	1.35
@@ -1,12 +1,16 @@
 Name: kexec-tools
 Version: 1.101
-Release: 29%{dist}.1
+Release: 30%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
 Source0: %{name}-%{version}.tar.gz
 Source1: kdump.init
 Source2: kdump.sysconfig
+Source3: mkdumprd
+Source4: kdump.conf
+Source5: kcp.c
+Source6: Makefile.kcp
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(pre): coreutils chkconfig sed
 BuildRequires: zlib-devel
@@ -45,6 +49,7 @@
 # Patches 601 onward are generic patches
 #
 Patch601: kexec-tools-1.101-Makefile.patch
+Patch602: kexec-tools-1.101-Makefile-kcp.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -63,9 +68,15 @@
 %patch401 -p1
 %patch501 -p1
 %patch601 -p1
+%patch602 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
+cp $RPM_SOURCE_DIR/kdump.conf .
+cp $RPM_SOURCE_DIR/mkdumprd .
+mkdir -p -m755 kcp
+cp $RPM_SOURCE_DIR/kcp.c kcp/kcp.c
+cp $RPM_SOURCE_DIR/Makefile.kcp kcp/Makefile
 
 %build
 %configure --sbindir=/sbin
@@ -79,11 +90,14 @@
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
 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
+install -m 755 mkdumprd $RPM_BUILD_ROOT/sbin/mkdumprd
+install -m 755 kdump.conf $RPM_BUILD_ROOT/etc/kdump.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+touch /etc/kdump.conf
 /sbin/chkconfig --add kdump
 
 %postun
@@ -103,6 +117,7 @@
 %defattr(-,root,root,-)
 /sbin/*
 %config(noreplace,missingok) /etc/sysconfig/kdump
+%config(noreplace,missingok) /etc/kdump.conf
 %config /etc/rc.d/init.d/kdump
 %ifarch %{ix86} x86_64
 %{_libdir}/kexec-tools/kexec_test
@@ -112,6 +127,9 @@
 %doc TODO
 
 %changelog
+* Wed Jul 19 2006 Neil Horman <nhorman at redhat.com> - 1.101-30%{dist}.1
+-add kexec frontend (bz 197695)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.101-29%{dist}.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 05:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 01:43:55 -0400
Subject: rpms/xalan-j2/devel .cvsignore, 1.8, 1.9 sources, 1.6,
	1.7 xalan-j2.spec, 1.44, 1.45 xalan-j2-bz152255.patch, 1.1,
	NONE xalan-j2-javadoc.patch, 1.1, NONE
Message-ID: <200607200543.k6K5ht0a005387@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4209

Modified Files:
	.cvsignore sources xalan-j2.spec 
Removed Files:
	xalan-j2-bz152255.patch xalan-j2-javadoc.patch 
Log Message:
* Merge with latest version from jpp.
* Undo ExcludeArch since eclipse available for all arch-es.
* Remove jars from sources for new upstream version.
* Purge unused patches from previous release.
* Conditional native compilation with GCJ.
* Use NVR macros wherever possible.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Dec 2005 07:44:57 -0000	1.8
+++ .cvsignore	20 Jul 2006 05:43:53 -0000	1.9
@@ -1,5 +1,2 @@
-xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2
-xalan-j_2_6_0
-i386
-*.src.rpm
 xalan-j2-notarget.patch
+xalan-j_2_7_0-src-RHsemiCLEAN.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Dec 2005 07:44:57 -0000	1.6
+++ sources	20 Jul 2006 05:43:53 -0000	1.7
@@ -1,2 +1,2 @@
-ed5d8bdfcac79989486ee418abe51f80  xalan-j_2_6_0-src-RHsemiCLEAN.tar.bz2
 3461365d8636e454f73e14884c3f8692  xalan-j2-notarget.patch
+a03a7531cac901e9aa185b1dfc714126  xalan-j_2_7_0-src-RHsemiCLEAN.tar.gz


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xalan-j2.spec	8 Mar 2006 22:39:46 -0000	1.44
+++ xalan-j2.spec	20 Jul 2006 05:43:53 -0000	1.45
@@ -1,37 +1,78 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
-%define version   2.6.0
-%define cvs_version 2_6_0
+%define cvs_version 2_7_0
 
 Name:           xalan-j2
-Version:        %{version}
-Release:        3jpp_10fc
+Version:        2.7.0
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
-Source0:        xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.bz2
+#Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_0-src.tar.gz
+Source0:        xalan-j_%{cvs_version}-src-RHsemiCLEAN.tar.gz
 Patch0:         %{name}-noxsltcdeps.patch
 Patch1:         %{name}-manifest.patch
 Patch2:         %{name}-crosslink.patch
-Patch4:         %{name}-bz152255.patch
-Patch5:         %{name}-javadoc.patch
-Patch6:         %{name}-notarget.patch
-URL:            http://xml.apache.org/xalan-j/
+URL:            http://xalan.apache.org/
 Group:          Text Processing/Markup/XML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 Provides:       jaxp_transform_impl
-Requires:       jaxp_parser_impl, /usr/sbin/update-alternatives
-BuildRequires:  ant, xml-commons-apis, bcel, servletapi5, jlex, java_cup, sed
-BuildRequires:  jpackage-utils >= 0:1.5, java-devel, xerces-j2
-# RHEL3 and FC2
-Obsoletes:	xalan-j <= 0:2.4.1
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
+Requires:       jaxp_parser_impl
+Requires:	/usr/sbin/update-alternatives
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:	java-devel
+BuildRequires:  ant
+BuildRequires:  bcel
+BuildRequires:	jlex
+BuildRequires:	java_cup
+BuildRequires:	regexp
+BuildRequires:	sed
+BuildRequires:	servletapi5
+BuildRequires:  xerces-j2 >= 0:2.7.1
+BuildRequires:  xml-commons-apis >= 0:1.3
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Xalan is an XSLT processor for transforming XML documents into HTML,
@@ -43,11 +84,17 @@
 %package        xsltc
 Summary:        XSLT compiler
 Group:          Text Processing/Markup/XML
-Requires:       java_cup, bcel, jlex, regexp, jaxp_parser_impl
-#Requires:       /usr/sbin/update-alternatives
-#Provides:       jaxp_transform_impl
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Requires:       java_cup
+Requires:	bcel
+Requires:	jlex
+Requires:	regexp
+Requires:	jaxp_parser_impl
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description    xsltc
 The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
@@ -64,7 +111,6 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -72,10 +118,14 @@
 %package        demo
 Summary:        Demo for %{name}
 Group:          Text Processing/Markup/XML
-Requires:       %{name} = %{epoch}:%{version}-%{release}, servletapi5
-BuildRequires:  servletapi5
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Requires:       %{name} = %{epoch}:%{version}-%{release}, servlet
+BuildRequires:  servlet
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description    demo
 Demonstrations and samples for %{name}.
@@ -83,21 +133,32 @@
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
+#%patch1 -p0
+#%patch2 -p0
 # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
-find . -name "*.jar" \
-  ! -name xalan2jdoc.jar \
-  ! -name stylebook-1.0-b3_xalan-2.jar \
-  -exec rm -f {} \;
+for j in $(find . -name "*.jar"); do
+	mv $j $j.no
+done
+# FIXME who knows where the sources are? xalan-j1 ?
+mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
+mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
 
 %build
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
-export CLASSPATH=$(build-classpath servletapi5 java_cup java_cup-runtime jlex \
-bcel xerces-j2)
+pushd lib
+ln -sf $(build-classpath java_cup-runtime) runtime.jar
+ln -sf $(build-classpath bcel) BCEL.jar
+ln -sf $(build-classpath regexp) regexp.jar
+ln -sf $(build-classpath xerces-j2) xercesImpl.jar
+ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
+popd
+pushd tools
+ln -sf $(build-classpath java_cup) java_cup.jar
+ln -sf $(build-classpath ant) ant.jar
+ln -sf $(build-classpath jlex) JLex.jar
+ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
+popd
+export CLASSPATH=$(build-classpath servletapi5)
 
 ant \
   -Djava.awt.headless=true \
@@ -121,6 +182,8 @@
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 install -p -m 644 build/xsltc.jar \
   $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
+install -p -m 644 build/serializer.jar \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-serializer-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # javadoc
@@ -144,21 +207,25 @@
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
 
-aot-compile-rpm --exclude %{_datadir}/%{name}/%{name}-servlet.war
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm --exclude %{_datadir}/%{name}/%{name}-servlet.war
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{name}.jar
 
 %post
 update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
   jaxp_transform_impl %{_javadir}/%{name}.jar 30
-%{_bindir}/rebuild-gcj-db
 
-%postun
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %preun
 {
@@ -166,43 +233,76 @@
   update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
-%post xsltc
+#%post xsltc
 #update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 #  jaxp_transform_impl %{_javadir}/xsltc.jar 10
-%{_bindir}/rebuild-gcj-db
 
-%preun xsltc
+#%preun xsltc
 #{
 #  [ $1 = 0 ] || exit 0
 #  update-alternatives --remove jaxp_transform_impl %{_javadir}/xsltc.jar
 #} >/dev/null 2>&1 || :
-%{_bindir}/rebuild-gcj-db
-
-%post demo
-%{_bindir}/rebuild-gcj-db
-
-%postun demo
-%{_bindir}/rebuild-gcj-db
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%post xsltc
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun xsltc
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
-%doc KEYS LICENSE NOTICE
+%doc KEYS licenses/xalan.LICENSE.txt licenses/xalan.NOTICE.txt licenses/serializer.LICENSE.txt licenses/serializer.NOTICE.txt
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
+%{_javadir}/%{name}-serializer-%{version}.jar
+%{_javadir}/%{name}-serializer.jar
 %ghost %{_javadir}/jaxp_transform_impl.jar
+
+%if %{gcj_support}
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-serializer-%{version}.jar.*
+%endif
 
 %files xsltc
 %defattr(0644,root,root,0755)
 %{_javadir}/xsltc-%{version}.jar
 %{_javadir}/xsltc.jar
 #%ghost %{_javadir}/jaxp_transform_impl.jar
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/xsltc-%{version}.jar.*
+%endif
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -216,9 +316,20 @@
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
+%endif
 
 %changelog
+* Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-3jpp_1fc
+- Merge with latest version from jpp.
+- Undo ExcludeArch since eclipse available for all arch-es.
+- Remove jars from sources for new upstream version.
+- Purge unused patches from previous release.
+- Conditional native compilation with GCJ.
+- Use NVR macros wherever possible.
+
 * Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.6.0-3jpp_10fc
 - excluded s390[x] and ppc64 due to eclipse
 
@@ -424,3 +535,5 @@
 
 * Wed Aug 08 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 2.2.D6-1mdk
 - first Mandrake release
+
+


--- xalan-j2-bz152255.patch DELETED ---


--- xalan-j2-javadoc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 06:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 02:25:24 -0400
Subject: rpms/man-pages-ja/devel rh-man-pages-ja.pl,1.10,1.11
Message-ID: <200607200625.k6K6PODZ016162@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/man-pages-ja/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16125

Modified Files:
	rh-man-pages-ja.pl 
Log Message:



Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/dist/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rh-man-pages-ja.pl	22 Jun 2006 16:25:29 -0000	1.10
+++ rh-man-pages-ja.pl	20 Jul 2006 06:25:21 -0000	1.11
@@ -20,7 +20,7 @@
 }
 print "C\n";
 
-for($i=0; $i<=56; $i++) {
+for($i=0; $i<=61; $i++) {
   print "0\n";
 }
 print "C\n";



From fedora-cvs-commits at redhat.com  Thu Jul 20 07:31:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 03:31:20 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.40, 1.41
Message-ID: <200607200731.k6K7VKaE001386@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1308

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
* Remove define statements for NVR.




Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jakarta-commons-collections.spec	18 Jul 2006 20:24:53 -0000	1.40
+++ jakarta-commons-collections.spec	20 Jul 2006 07:30:52 -0000	1.41
@@ -40,14 +40,11 @@
 
 %define base_name	collections
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		3.1
-%define release 	4jpp_2fc
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		jakarta-%{short_name}
+Version:	3.1
+Release:	4jpp_3fc
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
@@ -332,34 +329,97 @@
 %endif
 
 %changelog
-* Mon Jul 17 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp
+* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp-3fc
+- Remove define statements for NVR.
+
+* Tue Jul 18 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp-2fc
+- Add bug # for bug forcing disabling of tests for GCJ.
+
+* Mon Jul 17 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp-1fc
 - Add conditional native compilation.
 - Update commons-collections-3.1-project_xml.patch to exclude reference
   to maven-plugin-changelog which requires netbeans-svc etc.
 - Set test.failonerror to false and add patch for build.xml for ant builds
   with gcj to avoid stopping the build on test failures on GCJ.
+- Merge with latest JPP version.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1-2jpp_6fc
+- rebuild
+
+* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:3.1-2jpp_5fc
+- stop the scriptlet spew
+
+* 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
 
-* Fri Apr 07 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.1-3jpp
-- First JPP-1.7 release
-- Activate tests
-- Activate testframework and add -testframework subpackages
-- Add -manual subpackage
-- Build with maven by default
-- Optionally build with straight ant
+* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt for new gcj
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_2fc
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Tue Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp_1fc
+- Remove jarfiles from the tarball.
 
 * Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-2jpp
 - Do not fetch stuff from sun.com during javadoc generation.
 - Add build dependency on ant-junit.
 
+* Wed May 25 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_5fc
+- Rearrange how BC-compiled stuff is built and installed.
+
+* Mon May 23 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_4fc
+- Add alpha to the list of build architectures (#157522).
+- Use absolute paths for rebuild-gcj-db.
+
+* Thu May  5 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_3fc
+- Add dependencies for %post and %postun scriptlets (#156901).
+
+* Wed May  4 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_2fc
+- BC-compile.
+- Do not fetch stuff from sun.com during javadoc generation.
+
+* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:3.1-1jpp_1fc
+- Build into Fedora.
+
+* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:3.1-1jpp_1rh
+- Merge with upstream new version
+
+* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 0:2.1-4jpp_6rh
+- add coreutils BuildRequires
+
 * Thu Sep 16 2004 Ralph Apel <r.apel at r-apel.de> - 0:3.1-1jpp
 - Upgrade to 3.1
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.1.1-2jpp
 - Rebuild with ant-1.6.2
 
+* Fri Jul 2 2004 Aizaz Ahmed <aahmed at redhat.com> 0:2.1-4jpp_5rh
+- Added trigger to restore symlinks that are removed if ugrading
+  from a commons-collections rhug package
+
 * Sun Jun 27 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:2.1.1-1jpp
 - Update to 2.1.1
 
+* Fri Apr  2 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_4rh
+- more of the same, for version-suffixed .jar files
+
+* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_3rh
+- add RHUG upgrade cleanup
+
+* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_2rh
+- RH vacuuming part II
+
+* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.1-4jpp_1rh
+- RH vacuuming
+
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:2.1-4jpp
 - update for JPackage 1.5
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 07:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 03:53:05 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.41, 1.42
Message-ID: <200607200753.k6K7r5FZ031346@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31333

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
Re-sync with latest version from JPP.




Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- jakarta-commons-collections.spec	20 Jul 2006 07:30:52 -0000	1.41
+++ jakarta-commons-collections.spec	20 Jul 2006 07:53:01 -0000	1.42
@@ -44,7 +44,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	3.1
-Release:	4jpp_3fc
+Release:	5jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
@@ -329,6 +329,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-5jpp-1fc
+- Resync with latest JPP version.
+
 * Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-4jpp-3fc
 - Remove define statements for NVR.
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 08:45:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 04:45:31 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.16,1.17
Message-ID: <200607200845.k6K8jV8C000305@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32691

Modified Files:
	java_cup.spec 
Log Message:
- Re-sync with latest version from JPP.




Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- java_cup.spec	19 Jul 2006 16:05:12 -0000	1.16
+++ java_cup.spec	20 Jul 2006 08:45:25 -0000	1.17
@@ -32,15 +32,12 @@
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
-%define name		java_cup
-%define version		0.10
 %define pkg_version	v10k
-%define release 	0.k.4jpp_1fc
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		java_cup
+Version:	0.10
+Release:	0.k.5jpp_1fc
 Epoch:		1
 Summary:	Java source interpreter
 License:	BSD-style
@@ -156,12 +153,12 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.5jpp_1fc
+- Re-sync with latest version from JPP.
+
 * Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.4jpp_1fc
 - Conditional native compilation for GCJ.
 
-* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> - 1:0.10-0.k.3jpp
-- First JPP 1.7 build
-
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_10fc
 - rebuild
 
@@ -193,9 +190,6 @@
 * Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 1:0.10-0.k.1jpp_2fc
 - Build into Fedora.
 
-* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:0.10-0.k.2jpp
-- Rebuild with ant-1.6.2
-
 * Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 1:0.10-0.k.1jpp_1rh
 - RH vacuuming
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:17:47 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.15,1.16
Message-ID: <200607200917.k6K9Hloj026322@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24958

Modified Files:
	classpathx-jaf.spec 
Log Message:
- Rebuild.




Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- classpathx-jaf.spec	18 Jul 2006 19:30:04 -0000	1.15
+++ classpathx-jaf.spec	20 Jul 2006 09:17:42 -0000	1.16
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        7jpp_1fc
+Release:        7jpp_2fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -167,20 +167,33 @@
 
 
 %changelog
-* Tue Jul 18 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-7jpp
+* Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-7jpp_2fc
+- Rebuild.
+
+* Tue Jul 18 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-7jpp_1fc
 - Add conditional native compilation with GCJ.
+- Merge with latest from JPP.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+- rebuild
+
+* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-2jpp_5fc
+- stop scriptlet spew
+
+* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0-2jpp_4fc
+- rebuilt
 
-* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0-6jpp
-- Add patch for MimeType error (already commited in cvs tip)
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
 
-* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
-- Fix broken activation symlink
+* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:1.0-2jpp_3fc
+- Sync with RHAPS.
 
-* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
-- Create alternatives symlink
+* Mon Nov  1 2004 Gary Benson <gbenson at redhat.com> 0:1.0-2jpp_2fc
+- Build into Fedora.
 
-* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
-- First JPP-1.7 release
+* Thu Oct 28 2004 Fernando Nasser <fnasser at redhat.com> 0:1.0-2jpp_1rh
+- First Red Hat build
 
 * Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-2jpp
 - Pro forma rebuild with ant-1.6.2 present



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:31:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:31:18 -0400
Subject: rpms/httpd/devel httpd-2.1.10-pod.patch, 1.1, 1.2 httpd.spec, 1.95,
	1.96
Message-ID: <200607200931.k6K9VIFr007307@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7237

Modified Files:
	httpd-2.1.10-pod.patch httpd.spec 
Log Message:
* Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 2.2.2-8
- fix segfault on dummy connection failure at graceful restart (#199429)


httpd-2.1.10-pod.patch:
 mpm_common.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Index: httpd-2.1.10-pod.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd-2.1.10-pod.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- httpd-2.1.10-pod.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-pod.patch	20 Jul 2006 09:31:15 -0000	1.2
@@ -43,7 +43,7 @@
  
          ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
 -                     "connect to listener on %pI", ap_listeners->bind_addr);
-+                     "connect to listener on %pI", lr);
++                     "connect to listener on %pI", lr->bind_addr);
      }
  
      /* Create the request string. We include a User-Agent so that


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- httpd.spec	19 Jul 2006 12:28:45 -0000	1.95
+++ httpd.spec	20 Jul 2006 09:31:15 -0000	1.96
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.2
-Release: 7
+Release: 8
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -481,6 +481,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 2.2.2-8
+- fix segfault on dummy connection failure at graceful restart (#199429)
+
 * Wed Jul 19 2006 Joe Orton <jorton at redhat.com> 2.2.2-7
 - fix "apxs -g"-generated Makefile
 - fix buildconf with autoconf 2.60



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:42:38 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.patch,1.2,1.3
Message-ID: <200607200942.k6K9gcmN009908@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9293

Modified Files:
	scim-pinyin-helper.patch 
Log Message:
qshen: remove "g_object_set ( renderer_num, "alignment", 0.5, NULL) " in add_column to fit gtk2.10 in fc6.


scim-pinyin-helper.patch:
 configure.ac                           |    9 
 po/POTFILES.in                         |    1 
 po/zh_CN.po                            |  135 +++
 src/Makefile.am                        |   19 
 src/scim_pinyin_helper.cpp             | 1123 +++++++++++++++++++++++++++++++++
 src/scim_pinyin_helper.h               |   56 +
 src/scim_pinyin_imengine.cpp           |  307 ++++++++-
 src/scim_pinyin_imengine.h             |    8 
 src/scim_pinyin_imengine_config_keys.h |    3 
 src/scim_pinyin_imengine_setup.cpp     |   31 
 src/scim_pinyin_phrase.h               |    6 
 11 files changed, 1687 insertions(+), 11 deletions(-)

Index: scim-pinyin-helper.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin-helper.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-pinyin-helper.patch	28 Jun 2006 09:25:04 -0000	1.2
+++ scim-pinyin-helper.patch	20 Jul 2006 09:42:34 -0000	1.3
@@ -208,7 +208,7 @@
 diff -Naur scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp
 --- scim-pinyin-0.5.91.bak/src/scim_pinyin_helper.cpp	1970-01-01 08:00:00.000000000 +0800
 +++ scim-pinyin-0.5.91/src/scim_pinyin_helper.cpp	2006-06-28 17:20:26.000000000 +0800
-@@ -0,0 +1,1124 @@
+@@ -0,0 +1,1123 @@
 +/*
 + *  Copyright (C) 2006 Qian Shen <qshen at redhat.com>
 + *
@@ -1064,7 +1064,6 @@
 +						     renderer_num,
 +						     "text",NUM_COLUMN,
 +						     NULL);
-+  g_object_set ( renderer_num, "alignment", 0.5, NULL);
 +  gtk_tree_view_append_column (treeview, column);
 +
 +  renderer_phrase = gtk_cell_renderer_text_new ();



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:46:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:46:22 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.26,1.27
Message-ID: <200607200946.k6K9kMZR013509@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10709

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: remove " g_object_set ( renderer_num, "alignment", 0.5, NULL)" to fit gtk2.10



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- scim-pinyin.spec	12 Jul 2006 08:09:02 -0000	1.26
+++ scim-pinyin.spec	20 Jul 2006 09:46:19 -0000	1.27
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        11.1%{?dist}
+Release:        11.2%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Jul 20 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11.2
+- remove " g_object_set ( renderer_num, "alignment", 0.5, NULL) " in add_column() to fit gtk2.10 in fc6
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:46:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:46:42 -0400
Subject: rpms/system-config-soundcard/devel system-config-soundcard.spec,
	1.41, 1.42
Message-ID: <200607200946.k6K9kgjH015281@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14920

Modified Files:
	system-config-soundcard.spec 
Log Message:
fixed pycairo Requires


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- system-config-soundcard.spec	19 Jul 2006 10:06:51 -0000	1.41
+++ system-config-soundcard.spec	20 Jul 2006 09:46:39 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.0
-Release: 2
+Release: 3
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -22,7 +22,7 @@
 Requires: kudzu
 Requires: alsa-utils >= 1.0.11
 Requires: alsa-lib
-Requires: pycairo > 1.2.0
+Requires: pycairo >= 1.2.0
 PreReq: hicolor-icon-theme
 Requires(post): gtk2
 Requires(postun): gtk2
@@ -88,6 +88,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Jul 20 2006 Martin Stransky <stransky at redhat.com> 2.0.0-3
+- fixed pycairo Requires
+
 * Tue Jul 18 2006 Martin Stransky <stransky at redhat.com> 2.0.0-2
 - added pycairo to Requires
 - compacted card detection



From fedora-cvs-commits at redhat.com  Thu Jul 20 09:48:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 05:48:11 -0400
Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.677,1.678
Message-ID: <200607200948.k6K9mBUM021912@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20997

Modified Files:
	openoffice.org.spec 
Log Message:
release


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- openoffice.org.spec	13 Jul 2006 11:32:13 -0000	1.677
+++ openoffice.org.spec	20 Jul 2006 09:48:08 -0000	1.678
@@ -3292,7 +3292,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Fri Jul 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.17.UNRELEASED
+* Fri Jul 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.17
 - rh#197618# add openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make 
   ~/.recently-used safe



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:04:03 -0400
Subject: rpms/sendmail/devel sendmail.etc-mail-Makefile, 1.10,
	1.11 sendmail.spec, 1.71, 1.72
Message-ID: <200607201004.k6KA43Us030574@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30522

Modified Files:
	sendmail.etc-mail-Makefile sendmail.spec 
Log Message:
[tw]
- dropped chown of /etc/mail/authinfo.db (#199455)




Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.etc-mail-Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sendmail.etc-mail-Makefile	18 Jul 2006 15:01:40 -0000	1.10
+++ sendmail.etc-mail-Makefile	20 Jul 2006 10:03:59 -0000	1.11
@@ -11,9 +11,6 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
-	@if test -f /etc/mail/authinfo.db; then \
-		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
-	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sendmail.spec	18 Jul 2006 15:01:41 -0000	1.71
+++ sendmail.spec	20 Jul 2006 10:03:59 -0000	1.72
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 3
+Release: 3.1
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -587,6 +587,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Thu Jul 20 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-3.1
+- dropped chown of /etc/mail/authinfo.db (#199455)
+
 * Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-3
 - using new syntax for access database (#177566)
 - fixed failure message while shutting down sm-client (#119429)



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:08:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:08:07 -0400
Subject: rpms/sendmail/FC-4 sendmail.etc-mail-Makefile, 1.10,
	1.11 sendmail.spec, 1.59, 1.60
Message-ID: <200607201008.k6KA87jp031382@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31333

Modified Files:
	sendmail.etc-mail-Makefile sendmail.spec 
Log Message:
[tw]
- dropped chown of /etc/mail/authinfo.db (#199455)




Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.etc-mail-Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sendmail.etc-mail-Makefile	18 Jul 2006 15:37:58 -0000	1.10
+++ sendmail.etc-mail-Makefile	20 Jul 2006 10:08:04 -0000	1.11
@@ -11,9 +11,6 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
-	@if test -f /etc/mail/authinfo.db; then \
-		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
-	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sendmail.spec	18 Jul 2006 15:37:58 -0000	1.59
+++ sendmail.spec	20 Jul 2006 10:08:04 -0000	1.60
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 2.fc4.1
+Release: 2.fc4.2
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -587,6 +587,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Thu Jul 20 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc4.2
+- dropped chown of /etc/mail/authinfo.db (#199455)
+
 * Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc4.1
 - using new syntax for access database (#177566)
 - fixed failure message while shutting down sm-client (#119429)



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:15:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:15:59 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.12,1.13
Message-ID: <200607201015.k6KAFxiw000687@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv662

Modified Files:
	mod_auth_kerb.spec 
Log Message:
* Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 5.0-9
- add Russ Allbery's fix for disabling replay cache with krb15



Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_auth_kerb.spec	12 Jul 2006 07:22:37 -0000	1.12
+++ mod_auth_kerb.spec	20 Jul 2006 10:15:56 -0000	1.13
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 8.2.2
+Release: 9
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -14,6 +14,7 @@
 Patch4: mod_auth_kerb-5.0-gcc4.patch
 Patch5: mod_auth_kerb-5.0-exports.patch
 Patch6: mod_auth_kerb-5.0-apr1x.patch
+Patch7: mod_auth_kerb-5.0-rc6-krb15.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: httpd-devel, krb5-devel
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
@@ -30,6 +31,7 @@
 %patch4 -p1 -b .gcc4
 %patch5 -p1 -b .exports
 %patch6 -p1 -b .apr1x
+%patch7 -p1 -b .krb15
 
 %build
 %configure --without-krb4 --with-krb5=/usr/kerberos --with-apxs=/usr
@@ -54,7 +56,10 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+* Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 5.0-9
+- add Russ Allbery's fix for disabling replay cache with krb15
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2.2
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2.1



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:16:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:16:26 -0400
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb-5.0-rc6-krb15.patch, NONE,
	1.1
Message-ID: <200607201016.k6KAGQ4x002062@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1651

Added Files:
	mod_auth_kerb-5.0-rc6-krb15.patch 
Log Message:
* Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 5.0-9
- add Russ Allbery's fix for disabling replay cache with krb15


mod_auth_kerb-5.0-rc6-krb15.patch:
 mod_auth_kerb.c |   52 ++--------------------------------------------------
 1 files changed, 2 insertions(+), 50 deletions(-)

--- NEW FILE mod_auth_kerb-5.0-rc6-krb15.patch ---

Forcibly disable the replay cache using the environment variable
rather than trying to hack through libkrb5 internals (doomed to failure).

Patch by: Russ Allbery <rra stanford.edu>

--- mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c.krb14	2006-07-20 11:05:41.000000000 +0100
+++ mod_auth_kerb-5.0-rc6/src/mod_auth_kerb.c	2006-07-20 11:11:16.000000000 +0100
@@ -215,35 +215,6 @@
    { NULL }
 };
 
-#if defined(KRB5) && !defined(HEIMDAL)
-/* Needed to work around problems with replay caches */
-#include "mit-internals.h"
-
-/* This is our replacement krb5_rc_store function */
-static krb5_error_code
-mod_auth_kerb_rc_store(krb5_context context, krb5_rcache rcache,
-                       krb5_donot_replay_internal *donot_replay)
-{
-   return 0;
-}
-
-/* And this is the operations vector for our replay cache */
-const krb5_rc_ops_internal mod_auth_kerb_rc_ops = {
-  0,
-  "dfl",
-  krb5_rc_dfl_init,
-  krb5_rc_dfl_recover,
-  krb5_rc_dfl_destroy,
-  krb5_rc_dfl_close,
-  mod_auth_kerb_rc_store,
-  krb5_rc_dfl_expunge,
-  krb5_rc_dfl_get_span,
-  krb5_rc_dfl_get_name,
-  krb5_rc_dfl_resolve
-};
-#endif
-
-
 /*************************************************************************** 
  Auth Configuration Initialization
  ***************************************************************************/
@@ -1055,27 +1026,6 @@
 		 		     "gss_acquire_cred() failed"));
       return HTTP_INTERNAL_SERVER_ERROR;
    }
-
-#ifndef HEIMDAL
-   /*
-    * With MIT Kerberos 5 1.3.x the gss_cred_id_t is the same as
-    * krb5_gss_cred_id_t and krb5_gss_cred_id_rec contains a pointer to
-    * the replay cache.
-    * This allows us to override the replay cache function vector with
-    * our own one.
-    * Note that this is a dirty hack to get things working and there may
-    * well be unknown side-effects.
-    */
-   {
-      krb5_gss_cred_id_t gss_creds = (krb5_gss_cred_id_t) *server_creds;
-
-      if (gss_creds && gss_creds->rcache && gss_creds->rcache->ops &&
-	  gss_creds->rcache->ops->type &&  
-	  memcmp(gss_creds->rcache->ops->type, "dfl", 3) == 0)
-          /* Override the rcache operations */
-	 gss_creds->rcache->ops = &mod_auth_kerb_rc_ops;
-   }
-#endif
    
    return 0;
 }
@@ -1455,6 +1405,8 @@
       		  apr_pool_t *ptemp, server_rec *s)
 {
    ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
+   if (getenv("KRB5RCACHETYPE") == NULL)
+      putenv("KRB5RCACHETYPE=none");
    return OK;
 }
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:19:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:19:01 -0400
Subject: rpms/sendmail/FC-5 sendmail.etc-mail-Makefile, 1.10,
	1.11 sendmail.spec, 1.67, 1.68
Message-ID: <200607201019.k6KAJ1dd016265@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16070

Modified Files:
	sendmail.etc-mail-Makefile sendmail.spec 
Log Message:
[tw]
- dropped chown of /etc/mail/authinfo.db (#199455)




Index: sendmail.etc-mail-Makefile
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.etc-mail-Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sendmail.etc-mail-Makefile	18 Jul 2006 15:42:53 -0000	1.10
+++ sendmail.etc-mail-Makefile	20 Jul 2006 10:18:58 -0000	1.11
@@ -11,9 +11,6 @@
 
 
 all: ${CFFILES} ${POSSIBLE} virtusertable.db access.db domaintable.db mailertable.db
-	@if test -f /etc/mail/authinfo.db; then \
-		/bin/chown smmsp:smmsp /etc/mail/authinfo.db; \
-	fi
 
 userdb.db: userdb
 	@makemap btree $@ < $<


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sendmail.spec	18 Jul 2006 15:42:53 -0000	1.67
+++ sendmail.spec	20 Jul 2006 10:18:59 -0000	1.68
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.7
-Release: 2.fc5.1
+Release: 2.fc5.2
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -587,6 +587,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Thu Jul 20 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc5.2
+- dropped chown of /etc/mail/authinfo.db (#199455)
+
 * Tue Jul 18 2006 Thomas Woerner <twoerner at redhat.com> 8.13.7-2.fc5.1
 - using new syntax for access database (#177566)
 - fixed failure message while shutting down sm-client (#119429)



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:25:43 -0400
Subject: rpms/vim/devel 7.0.036, NONE, 1.1 7.0.037, NONE, 1.1 7.0.038, NONE,
	1.1 7.0.039, NONE, 1.1 README.patches, 1.50, 1.51 vim.spec,
	1.127, 1.128
Message-ID: <200607201025.k6KAPhNQ018366@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18285

Modified Files:
	README.patches vim.spec 
Added Files:
	7.0.036 7.0.037 7.0.038 7.0.039 
Log Message:
- patchlevel 39
- allow usage of $VIM variable (#199465)



--- NEW FILE 7.0.036 ---
To: vim-dev at vim.org
Subject: Patch 7.0.036
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.036
Problem:    Can't compile with small features and syntax highlighting or the
	    diff feature.
Solution:   Define LINE_ATTR whenever syntax highlighting or the diff feature
	    is enabled.
Files:	    src/screen.c


*** ../vim-7.0.035/src/screen.c	Fri May  5 23:13:04 2006
--- src/screen.c	Tue Jul 11 21:33:53 2006
***************
*** 2612,2618 ****
  #ifdef FEAT_LINEBREAK
      int		need_showbreak = FALSE;
  #endif
! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS))
  # define LINE_ATTR
      int		line_attr = 0;		/* atrribute for the whole line */
  #endif
--- 2612,2619 ----
  #ifdef FEAT_LINEBREAK
      int		need_showbreak = FALSE;
  #endif
! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
! 	|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
  # define LINE_ATTR
      int		line_attr = 0;		/* atrribute for the whole line */
  #endif
***************
*** 2626,2632 ****
      int		prev_c = 0;		/* previous Arabic character */
      int		prev_c1 = 0;		/* first composing char for prev_c */
  #endif
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
      int		did_line_attr = 0;
  #endif
  
--- 2627,2633 ----
      int		prev_c = 0;		/* previous Arabic character */
      int		prev_c1 = 0;		/* first composing char for prev_c */
  #endif
! #if defined(LINE_ATTR)
      int		did_line_attr = 0;
  #endif
  
***************
*** 4116,4132 ****
  		    --ptr;	    /* put it back at the NUL */
  		}
  #endif
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		else if ((
  # ifdef FEAT_DIFF
! 			    diff_hlf != (hlf_T)0
! #  ifdef LINE_ATTR
! 			    ||
! #  endif
  # endif
- # ifdef LINE_ATTR
  			    line_attr != 0
- # endif
  			) && (
  # ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? (col >= 0) :
--- 4117,4128 ----
  		    --ptr;	    /* put it back at the NUL */
  		}
  #endif
! #if defined(LINE_ATTR)
  		else if ((
  # ifdef FEAT_DIFF
! 			    diff_hlf != (hlf_T)0 ||
  # endif
  			    line_attr != 0
  			) && (
  # ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? (col >= 0) :
***************
*** 4237,4243 ****
  	 * At end of the text line or just after the last character.
  	 */
  	if (c == NUL
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		|| did_line_attr == 1
  #endif
  		)
--- 4233,4239 ----
  	 * At end of the text line or just after the last character.
  	 */
  	if (c == NUL
! #if defined(LINE_ATTR)
  		|| did_line_attr == 1
  #endif
  		)
***************
*** 4258,4264 ****
  				|| prevcol == (long)match_hl[0].startcol
  				|| prevcol == (long)match_hl[1].startcol
  				|| prevcol == (long)match_hl[2].startcol)
! # if defined(FEAT_DIFF) || defined(LINE_ATTR)
  			    && did_line_attr <= 1
  # endif
  			   )
--- 4254,4260 ----
  				|| prevcol == (long)match_hl[0].startcol
  				|| prevcol == (long)match_hl[1].startcol
  				|| prevcol == (long)match_hl[2].startcol)
! # if defined(LINE_ATTR)
  			    && did_line_attr <= 1
  # endif
  			   )
*** ../vim-7.0.035/src/version.c	Fri Jun 23 21:36:49 2006
--- src/version.c	Tue Jul 11 21:36:50 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     36,
  /**/

-- 
Every engineer dreams about saving the universe and having sex with aliens.
This is much more glamorous than the real life of an engineer, which consists
of hiding from the universe and having sex without the participation of other
life forms.                     (Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.037 ---
To: vim-dev at vim.org
Subject: Patch 7.0.037
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.037
Problem:    Crash when resizing the GUI window vertically when there is a line
	    that doesn't fit.
Solution:   Don't redraw while the screen data is invalid.
Files:	    src/screen.c


*** ../vim-7.0.036/src/screen.c	Tue Jul 11 22:36:19 2006
--- src/screen.c	Tue Jul 11 21:33:53 2006
***************
*** 7129,7134 ****
--- 7129,7140 ----
  	return;
      entered = TRUE;
  
+     /*
+      * Note that the window sizes are updated before reallocating the arrays,
+      * thus we must not redraw here!
+      */
+     ++RedrawingDisabled;
+ 
      win_new_shellsize();    /* fit the windows in the new sized shell */
  
      comp_col();		/* recompute columns for shown command and ruler */
***************
*** 7363,7368 ****
--- 7369,7375 ----
  #endif
  
      entered = FALSE;
+     --RedrawingDisabled;
  
  #ifdef FEAT_AUTOCMD
      if (starting == 0)
*** ../vim-7.0.036/src/version.c	Tue Jul 11 22:36:19 2006
--- src/version.c	Tue Jul 11 22:38:39 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     37,
  /**/

-- 
For society, it's probably a good thing that engineers value function over
appearance.  For example, you wouldn't want engineers to build nuclear power
plants that only _look_ like they would keep all the radiation inside.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.038 ---
To: vim-dev at vim.org
Subject: Patch 7.0.038
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.038
Problem:    When calling complete() from an Insert mode expression mapping
	    text could be inserted in an improper way.
Solution:   Make undo_allowed() global and use it in complete().
Files:	    src/undo.c, src/proto/undo.pro, src/eval.c


*** ../vim-7.0.037/src/undo.c	Sat Apr 22 00:01:05 2006
--- src/undo.c	Mon Jul  3 22:23:22 2006
***************
*** 84,90 ****
  static void u_unch_branch __ARGS((u_header_T *uhp));
  static u_entry_T *u_get_headentry __ARGS((void));
  static void u_getbot __ARGS((void));
- static int undo_allowed __ARGS((void));
  static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
  static void u_doit __ARGS((int count));
  static void u_undoredo __ARGS((int undo));
--- 84,89 ----
***************
*** 196,202 ****
   * Return TRUE when undo is allowed.  Otherwise give an error message and
   * return FALSE.
   */
!     static int
  undo_allowed()
  {
      /* Don't allow changes when 'modifiable' is off.  */
--- 195,201 ----
   * Return TRUE when undo is allowed.  Otherwise give an error message and
   * return FALSE.
   */
!     int
  undo_allowed()
  {
      /* Don't allow changes when 'modifiable' is off.  */
*** ../vim-7.0.037/src/proto/undo.pro	Mon Apr 10 16:38:50 2006
--- src/proto/undo.pro	Mon Jul  3 22:25:07 2006
***************
*** 4,9 ****
--- 4,10 ----
  extern int u_savesub __ARGS((linenr_T lnum));
  extern int u_inssub __ARGS((linenr_T lnum));
  extern int u_savedel __ARGS((linenr_T lnum, long nlines));
+ extern int undo_allowed __ARGS((void));
  extern void u_undo __ARGS((int count));
  extern void u_redo __ARGS((int count));
  extern void undo_time __ARGS((long step, int sec, int absolute));
*** ../vim-7.0.037/src/eval.c	Thu Jun 22 21:01:19 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 8252,8257 ****
--- 8252,8263 ----
  	EMSG(_("E785: complete() can only be used in Insert mode"));
  	return;
      }
+ 
+     /* Check for undo allowed here, because if something was already inserted
+      * the line was already saved for undo and this check isn't done. */
+     if (!undo_allowed())
+ 	return;
+ 
      if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL)
      {
  	EMSG(_(e_invarg));
*** ../vim-7.0.037/src/version.c	Tue Jul 11 22:59:04 2006
--- src/version.c	Wed Jul 12 20:31:49 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     38,
  /**/

-- 
If someone questions your market projections, simply point out that your
target market is "People who are nuts" and "People who will buy any damn
thing".  Nobody is going to tell you there aren't enough of those people
to go around.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.039 ---
To: vim-dev at vim.org
Subject: Patch 7.0.039
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.039
Problem:    Calling inputdialog() with a third argument in the console doesn't
            work.
Solution:   Make a separate function for input() and inputdialog(). (Yegappan
            Lakshmanan)
Files:      src/eval.c


*** ../vim-7.0.038/src/eval.c	Wed Jul 12 21:48:56 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 11321,11334 ****
  
  static int inputsecret_flag = 0;
  
  /*
!  * "input()" function
!  *     Also handles inputsecret() when inputsecret is set.
   */
      static void
! f_input(argvars, rettv)
      typval_T	*argvars;
      typval_T	*rettv;
  {
      char_u	*prompt = get_tv_string_chk(&argvars[0]);
      char_u	*p = NULL;
--- 11321,11339 ----
  
  static int inputsecret_flag = 0;
  
+ static void get_user_input __ARGS((typval_T *argvars, typval_T *rettv, int inputdialog));
+ 
  /*
!  * This function is used by f_input() and f_inputdialog() functions. The third
!  * argument to f_input() specifies the type of completion to use at the
!  * prompt. The third argument to f_inputdialog() specifies the value to return
!  * when the user cancels the prompt.
   */
      static void
! get_user_input(argvars, rettv, inputdialog)
      typval_T	*argvars;
      typval_T	*rettv;
+     int		inputdialog;
  {
      char_u	*prompt = get_tv_string_chk(&argvars[0]);
      char_u	*p = NULL;
***************
*** 11378,11384 ****
  	    if (defstr != NULL)
  		stuffReadbuffSpec(defstr);
  
! 	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
  		int	xp_namelen;
--- 11383,11389 ----
  	    if (defstr != NULL)
  		stuffReadbuffSpec(defstr);
  
! 	    if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
  		int	xp_namelen;
***************
*** 11413,11418 ****
--- 11418,11435 ----
  }
  
  /*
+  * "input()" function
+  *     Also handles inputsecret() when inputsecret is set.
+  */
+     static void
+ f_input(argvars, rettv)
+     typval_T	*argvars;
+     typval_T	*rettv;
+ {
+     get_user_input(argvars, rettv, FALSE);
+ }
+ 
+ /*
   * "inputdialog()" function
   */
      static void
***************
*** 11452,11458 ****
      }
      else
  #endif
! 	f_input(argvars, rettv);
  }
  
  /*
--- 11469,11475 ----
      }
      else
  #endif
! 	get_user_input(argvars, rettv, TRUE);
  }
  
  /*
*** ../vim-7.0.038/src/version.c	Wed Jul 12 21:48:56 2006
--- src/version.c	Wed Jul 12 21:56:30 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     39,
  /**/

-- 
A consultant is a person who takes your money and annoys your employees while
tirelessly searching for the best way to extend the consulting contract.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- README.patches	27 Jun 2006 09:24:13 -0000	1.50
+++ README.patches	20 Jul 2006 10:25:40 -0000	1.51
@@ -60,3 +60,7 @@
   2431  7.0.033  pasting after autoindent removes the indent
   2042  7.0.034  repeating completion was wrong after typing text or using BS
   5905  7.0.035  repeating Insert mode completion doesn't work properly
+  3990  7.0.036  can't compile with small features and syntax HL
+  1880  7.0.037  crash when resizing Vim window when a line doesn't fit
+  3236  7.0.038  complete() can be used from expr. mapping after inserting text
+  3240  7.0.039  third argument for inputdialog() doesn't work in the console


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- vim.spec	12 Jul 2006 08:42:59 -0000	1.127
+++ vim.spec	20 Jul 2006 10:25:40 -0000	1.128
@@ -24,12 +24,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 035
+%define patchlevel 039
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1.1
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -89,6 +89,10 @@
 Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
 Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
 Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
+Patch036: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.036
+Patch037: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.037
+Patch038: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.038
+Patch039: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.039
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -258,6 +262,10 @@
 %patch033 -p0
 %patch034 -p0
 %patch035 -p0
+%patch036 -p0
+%patch037 -p0
+%patch038 -p0
+%patch039 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -287,8 +295,8 @@
 %build
 cd src
 autoconf
-perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
-perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
+#perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
+#perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
 
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
@@ -594,6 +602,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jul 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.039-1
+- patchlevel 39
+- allow usage of $VIM variable (#199465)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:7.0.035-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:30:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:30:26 -0400
Subject: rpms/cups/devel .cvsignore, 1.20, 1.21 cups.spec, 1.231,
	1.232 sources, 1.22, 1.23 cups-compile.patch, 1.1,
	NONE cups-svn5754.patch, 1.1, NONE
Message-ID: <200607201030.k6KAUQBq020205@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20111

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-compile.patch cups-svn5754.patch 
Log Message:
* Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-2
- 1.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	22 May 2006 21:19:04 -0000	1.20
+++ .cvsignore	20 Jul 2006 10:30:23 -0000	1.21
@@ -11,3 +11,4 @@
 cups-1.2rc3-source.tar.bz2
 cups-1.2.0-source.tar.bz2
 cups-1.2.1-source.tar.bz2
+cups-1.2.2-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- cups.spec	19 Jul 2006 12:15:49 -0000	1.231
+++ cups.spec	20 Jul 2006 10:30:23 -0000	1.232
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.1
-Release: 21 
+Version: 1.2.2
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,6 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5754.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -28,7 +27,6 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch8: cups-compile.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch16: cups-no-export-ssllibs.patch
@@ -115,7 +113,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5754
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -123,7 +120,6 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch8 -p1 -b .compile
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch16 -p1 -b .no-export-ssllibs
@@ -393,6 +389,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-2
+- 1.2.2.
+
 * Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-21
 - Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	22 May 2006 21:19:04 -0000	1.22
+++ sources	20 Jul 2006 10:30:23 -0000	1.23
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-f804995e3f469bdefedc033510f6e6a5  cups-1.2.1-source.tar.bz2
+091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2


--- cups-compile.patch DELETED ---


--- cups-svn5754.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:42:36 -0400
Subject: rpms/kdenetwork/devel kdenetwork-3.5.3-kde#77626.patch, NONE,
	1.1 kdenetwork.spec, 1.83, 1.84
Message-ID: <200607201042.k6KAgaGw023055@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22970

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-3.5.3-kde#77626.patch 
Log Message:
apply upstream patches, fix kde#77626



kdenetwork-3.5.3-kde#77626.patch:
 configurationwidget.ui |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdenetwork-3.5.3-kde#77626.patch ---
Index: krfb/kcm_krfb/configurationwidget.ui
===================================================================
--- krfb/kcm_krfb/configurationwidget.ui	(Revision 564233)
+++ krfb/kcm_krfb/configurationwidget.ui	(Revision 564234)
@@ -418,7 +418,7 @@
                                             <number>1024</number>
                                         </property>
                                         <property name="maxValue">
-                                            <number>32767</number>
+                                            <number>65535</number>
                                         </property>
                                         <property name="toolTip" stdset="0">
                                             <string>Enter the TCP port number here</string>


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdenetwork.spec	17 Jul 2006 19:18:29 -0000	1.83
+++ kdenetwork.spec	20 Jul 2006 10:42:34 -0000	1.84
@@ -13,7 +13,7 @@
 
 Name: kdenetwork
 Version: 3.5.3
-Release: 4
+Release: 5
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -36,6 +36,7 @@
 
 # upstream patches
 Patch100: kdenetwork-3.5.3.diff
+Patch101: kdenetwork-3.5.3-kde#77626.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -82,6 +83,7 @@
 
 # upstream patches
 %patch100 -p0 -b .setuid-check
+%patch101 -p0 -b .kde#77626
 
 echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 
@@ -225,6 +227,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 20 2006 Than Ngo <than at redhat.com> 7:3.5.3-5
+- apply upstream patches, fix kde#77626
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:47:12 -0400
Subject: rpms/cups/FC-5 .cvsignore, 1.18, 1.19 cups.spec, 1.198,
	1.199 sources, 1.20, 1.21 cups-compile.patch, 1.1,
	NONE cups-svn5754.patch, 1.1, NONE
Message-ID: <200607201047.k6KAlCOR007197@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5589

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-compile.patch cups-svn5754.patch 
Log Message:
* Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.1
- 1.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 May 2006 22:07:30 -0000	1.18
+++ .cvsignore	20 Jul 2006 10:47:09 -0000	1.19
@@ -9,3 +9,4 @@
 cups-1.2rc3-source.tar.bz2
 cups-1.2.0-source.tar.bz2
 cups-1.2.1-source.tar.bz2
+cups-1.2.2-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- cups.spec	19 Jul 2006 13:36:27 -0000	1.198
+++ cups.spec	20 Jul 2006 10:47:09 -0000	1.199
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.1
-Release: 1.13
+Version: 1.2.2
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,11 +20,9 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5754.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-compile.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -116,11 +114,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5754
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .compile
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -402,6 +398,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.1
+- 1.2.2.
+
 * Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-1.13
 - Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 May 2006 22:07:30 -0000	1.20
+++ sources	20 Jul 2006 10:47:09 -0000	1.21
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-f804995e3f469bdefedc033510f6e6a5  cups-1.2.1-source.tar.bz2
+091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2


--- cups-compile.patch DELETED ---


--- cups-svn5754.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:49:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:49:18 -0400
Subject: rpms/kdepim/devel kdepim-3.5.3-kde#192416.patch, NONE,
	1.1 kdepim.spec, 1.94, 1.95
Message-ID: <200607201049.k6KAnIbG008039@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7984

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.3-kde#192416.patch 
Log Message:
- apply upstream pacthes,
  fix crash on logout when only a message pane is shown kde#192416



kdepim-3.5.3-kde#192416.patch:
 kmkernel.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdepim-3.5.3-kde#192416.patch ---
Index: kmail/kmkernel.cpp
===================================================================
--- kmail/kmkernel.cpp	(Revision 564165)
+++ kmail/kmkernel.cpp	(Revision 564166)
@@ -1569,6 +1569,7 @@
 
 void KMKernel::closeAllKMailWindows()
 {
+  if (!KMainWindow::memberList) return;
   QPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
   KMainWindow *window = 0;
   while ((window = it.current()) != 0) {


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kdepim.spec	18 Jul 2006 15:57:57 -0000	1.94
+++ kdepim.spec	20 Jul 2006 10:49:16 -0000	1.95
@@ -11,7 +11,7 @@
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -37,6 +37,7 @@
 Patch102: kdepim-3.5.3-kmail-encryption.patch
 Patch103: kdepim-3.5.3-kmail-127538.patch
 Patch104: kdepim-3.5.3-kde#118112.patch
+Patch105: kdepim-3.5.3-kde#192416.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post,postun): /sbin/ldconfig
@@ -96,6 +97,7 @@
 %patch102 -p1 -b .kmail-encryption
 %patch103 -p1 -b .kmail-127538.patch
 %patch104 -p0 -b .kde#118112
+%patch105 -p0 -b .kde#192416
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -193,6 +195,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
+- apply upstream pacthes,
+  fix crash on logout when only a message pane is shown kde#192416
+
 * Mon Jul 17 2006 Petr Rockai <prockai at redhat.com> 6:3.5.3-7
 - fix compilation with new g++ (see patch kdepim-3.5.3-gcc-4.1.1-8)
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 10:50:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 06:50:25 -0400
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.84,1.85
Message-ID: <200607201050.k6KAoPj5008513@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8451

Modified Files:
	kdenetwork.spec 
Log Message:
Allow listening on all TCP ports between 1024 and 65535, kde#77626



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdenetwork.spec	20 Jul 2006 10:42:34 -0000	1.84
+++ kdenetwork.spec	20 Jul 2006 10:50:22 -0000	1.85
@@ -228,7 +228,8 @@
 
 %changelog
 * Thu Jul 20 2006 Than Ngo <than at redhat.com> 7:3.5.3-5
-- apply upstream patches, fix kde#77626
+- apply upstream patches,
+   Allow listening on all TCP ports between 1024 and 65535, kde#77626
 
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-4
 - rebuild



From fedora-cvs-commits at redhat.com  Thu Jul 20 11:06:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:06:45 -0400
Subject: rpms/openssh/devel openssh-4.3p2-pam-session.patch, NONE,
	1.1 openssh.spec, 1.93, 1.94
Message-ID: <200607201106.k6KB6jYu020859@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20842

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p2-pam-session.patch 
Log Message:
* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-7
- dropped old ssh obsoletes
- call the pam_session_open/close from the monitor when privsep is
  enabled so it is always called as root (patch by Darren Tucker)


openssh-4.3p2-pam-session.patch:
 auth-pam.c |    6 ++++--
 monitor.c  |    9 +++++++++
 session.c  |    6 +++---
 3 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE openssh-4.3p2-pam-session.patch ---
Index: auth-pam.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-pam.c,v
retrieving revision 1.134
diff -u -p -r1.134 auth-pam.c
--- auth-pam.c	15 May 2006 07:22:33 -0000	1.134
+++ auth-pam.c	22 May 2006 08:50:59 -0000
@@ -573,15 +573,17 @@ static struct pam_conv store_conv = { ss
 void
 sshpam_cleanup(void)
 {
-	debug("PAM: cleanup");
-	if (sshpam_handle == NULL)
+	if (sshpam_handle == NULL || (use_privsep && !mm_is_monitor()))
 		return;
+	debug("PAM: cleanup");
 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
 	if (sshpam_cred_established) {
+		debug("PAM: deleting credentials");
 		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
 		sshpam_cred_established = 0;
 	}
 	if (sshpam_session_open) {
+		debug("PAM: closing session");
 		pam_close_session(sshpam_handle, PAM_SILENT);
 		sshpam_session_open = 0;
 	}
Index: monitor.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/monitor.c,v
retrieving revision 1.104
diff -u -p -r1.104 monitor.c
--- monitor.c	21 May 2006 08:26:40 -0000	1.104
+++ monitor.c	22 May 2006 08:37:58 -0000
@@ -354,6 +354,10 @@ monitor_child_preauth(Authctxt *_authctx
 				    MONITOR_REQ_PAM_ACCOUNT, &m);
 				authenticated = mm_answer_pam_account(pmonitor->m_sendfd, &m);
 				buffer_free(&m);
+				if (authenticated) {
+					do_pam_session();
+					do_pam_setcred(0);
+				}
 			}
 #endif
 		}
@@ -1531,6 +1535,11 @@ mm_answer_term(int sock, Buffer *req)
 	/* The child is terminating */
 	session_destroy_all(&mm_session_close);
 
+#ifdef USE_PAM
+	if (options.use_pam)
+		sshpam_cleanup();
+#endif
+
 	while (waitpid(pmonitor->m_pid, &status, 0) == -1)
 		if (errno != EINTR)
 			exit(1);
Index: session.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/session.c,v
retrieving revision 1.328
diff -u -p -r1.328 session.c
--- session.c	4 May 2006 06:24:34 -0000	1.328
+++ session.c	22 May 2006 08:14:24 -0000
@@ -541,7 +541,7 @@ do_exec_pty(Session *s, const char *comm
 	ttyfd = s->ttyfd;
 
 #if defined(USE_PAM)
-	if (options.use_pam) {
+	if (options.use_pam && !use_privsep) {
 		do_pam_set_tty(s->tty);
 		if (!use_privsep)
 			do_pam_setcred(1);
@@ -1284,7 +1284,7 @@ do_setusercontext(struct passwd *pw)
 		}
 #endif
 # ifdef USE_PAM
-		if (options.use_pam) {
+		if (options.use_pam && !use_privsep) {
 			do_pam_session();
 			do_pam_setcred(0);
 		}
@@ -1326,7 +1326,7 @@ do_setusercontext(struct passwd *pw)
 		 * These will have been wiped by the above initgroups() call.
 		 * Reestablish them here.
 		 */
-		if (options.use_pam) {
+		if (options.use_pam && !use_privsep) {
 			do_pam_session();
 			do_pam_setcred(0);
 		}


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- openssh.spec	17 Jul 2006 14:09:15 -0000	1.93
+++ openssh.spec	20 Jul 2006 11:06:42 -0000	1.94
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 4.3p2
-%define rel 6
+%define rel 7
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -92,11 +92,10 @@
 Patch36: openssh-4.3p2-buffer-len.patch
 Patch37: openssh-4.3p2-configure-typo.patch
 Patch38: openssh-4.3p2-askpass-grab-info.patch
+Patch39: openssh-4.3p2-pam-session.patch
 License: BSD
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Obsoletes: ssh
-Provides: ssh
 %if %{nologin}
 Requires: /sbin/nologin
 %endif
@@ -140,14 +139,10 @@
 Summary: The OpenSSH client applications
 Requires: openssh = %{version}-%{release}
 Group: Applications/Internet
-Obsoletes: ssh-clients
-Provides: ssh-clients
 
 %package server
 Summary: The OpenSSH server daemon
 Group: System Environment/Daemons
-Obsoletes: ssh-server
-Provides: ssh-server
 Requires: openssh = %{version}-%{release}
 Requires(post): chkconfig >= 0.9, /sbin/service
 Requires(pre): /usr/sbin/useradd
@@ -157,8 +152,8 @@
 Summary: A passphrase dialog for OpenSSH and X
 Group: Applications/Internet
 Requires: openssh = %{version}-%{release}
-Obsoletes: ssh-extras, openssh-askpass-gnome
-Provides: ssh-extras, openssh-askpass-gnome
+Obsoletes: openssh-askpass-gnome
+Provides: openssh-askpass-gnome
 
 %description
 SSH (Secure SHell) is a program for logging into and executing
@@ -225,6 +220,7 @@
 %patch36 -p0 -b .buffer-len
 %patch37 -p1 -b .typo
 %patch38 -p1 -b .grab-info
+%patch39 -p0 -b .pam-session
 
 autoreconf
 
@@ -466,6 +462,11 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-7
+- dropped old ssh obsoletes
+- call the pam_session_open/close from the monitor when privsep is
+  enabled so it is always called as root (patch by Darren Tucker)
+
 * Mon Jul 17 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-6
 - improve selinux patch (by Jan Kiszka)
 - upstream patch for buffer append space error (#191940)



From fedora-cvs-commits at redhat.com  Thu Jul 20 11:06:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:06:48 -0400
Subject: rpms/ruby/devel ruby-1.8.4-fix-alias-safe-level.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-dir-operation.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-regexp-modification.patch, NONE,
	1.1 ruby-fix-autoconf-magic-code.patch, NONE, 1.1 ruby.spec,
	1.71, 1.72
Message-ID: <200607201106.k6KB6mML020878@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20852

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.4-fix-alias-safe-level.patch 
	ruby-1.8.4-fix-insecure-dir-operation.patch 
	ruby-1.8.4-fix-insecure-regexp-modification.patch 
	ruby-fix-autoconf-magic-code.patch 
Log Message:
* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-11
- security fixes.
  - ruby-1.8.4-fix-insecure-dir-operation.patch:
  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
    operations in the certain safe-level restrictions. (#199538)
  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
    safe-level restrictions. (#199543)

ruby-1.8.4-fix-alias-safe-level.patch:
 eval.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE ruby-1.8.4-fix-alias-safe-level.patch ---
diff -ruN ruby-1.8.4.orig/eval.c ruby-1.8.4/eval.c
--- ruby-1.8.4.orig/eval.c	2005-12-20 22:41:47.000000000 +0900
+++ ruby-1.8.4/eval.c	2006-07-20 18:33:50.000000000 +0900
@@ -2097,7 +2097,8 @@
 	}
     }
     st_insert(RCLASS(klass)->m_tbl, name,
-      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
+	     (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
+				   NOEX_WITH_SAFE(orig->nd_noex)));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -5638,6 +5639,11 @@
     TMP_PROTECT;
     volatile int safe = -1;
 
+    if (NOEX_SAFE(flags) > ruby_safe_level &&
+       !(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+       rb_raise(rb_eSecurityError, "calling insecure method: %s",
+		rb_id2name(id));
+    }
     switch (ruby_iter->iter) {
       case ITER_PRE:
       case ITER_PAS:
@@ -5742,10 +5748,6 @@
 	    b2 = body = body->nd_next;
 
 	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		if (!(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-		    rb_raise(rb_eSecurityError, "calling insecure method: %s",
-			     rb_id2name(id));
-		}
 		safe = ruby_safe_level;
 		ruby_safe_level = NOEX_SAFE(flags);
 	    }

ruby-1.8.4-fix-insecure-dir-operation.patch:
 dir.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE ruby-1.8.4-fix-insecure-dir-operation.patch ---
diff -ruN ruby-1.8.4.orig/dir.c ruby-1.8.4/dir.c
--- ruby-1.8.4.orig/dir.c	2005-09-14 22:40:58.000000000 +0900
+++ ruby-1.8.4/dir.c	2006-07-19 22:14:05.000000000 +0900
@@ -325,7 +325,17 @@
     rb_raise(rb_eIOError, "closed directory");
 }
 
+static void
+dir_check(dir)
+    VALUE dir;
+{
+    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    rb_check_frozen(dir);
+}
+
 #define GetDIR(obj, dirp) do {\
+    dir_check(dir);\
     Data_Get_Struct(obj, struct dir_data, dirp);\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
@@ -536,6 +546,9 @@
 {
     struct dir_data *dirp;
 
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
+       rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
     GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;

ruby-1.8.4-fix-insecure-regexp-modification.patch:
 intern.h |    6 +++---
 re.c     |   15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE ruby-1.8.4-fix-insecure-regexp-modification.patch ---
diff -ruN ruby-1.8.4.orig/re.c ruby-1.8.4/re.c
--- ruby-1.8.4.orig/re.c	2005-12-13 12:27:51.000000000 +0900
+++ ruby-1.8.4/re.c	2006-07-19 18:07:59.000000000 +0900
@@ -70,10 +70,11 @@
 #endif
 
 int
-rb_memcicmp(p1, p2, len)
-    char *p1, *p2;
+rb_memcicmp(x, y, len)
+    const void *x, *y;
     long len;
 {
+    const unsigned char *p1 = x, *p2 = y;
     int tmp;
 
     while (len--) {
@@ -85,7 +86,7 @@
 
 int
 rb_memcmp(p1, p2, len)
-    char *p1, *p2;
+    const void *p1, *p2;
     long len;
 {
     if (!ruby_ignorecase) {
@@ -96,11 +97,11 @@
 
 long
 rb_memsearch(x0, m, y0, n)
-    char *x0, *y0;
+    const void *x0, *y0;
     long m, n;
 {
-    unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
-    unsigned char *s, *e;
+    const unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
+    const unsigned char *s, *e;
     long i;
     int d;
     unsigned long hx, hy;
@@ -1332,6 +1333,8 @@
 {
     struct RRegexp *re = RREGEXP(obj);
 
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
diff -ruN ruby-1.8.4.orig/intern.h ruby-1.8.4/intern.h
--- ruby-1.8.4.orig/intern.h	2006-07-19 18:13:49.000000000 +0900
+++ ruby-1.8.4/intern.h	2006-07-19 18:20:34.000000000 +0900
@@ -353,9 +353,9 @@
 VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
 VALUE rb_length_by_each _((VALUE));
 /* re.c */
-int rb_memcmp _((char*,char*,long));
-int rb_memcicmp _((char*,char*,long));
-long rb_memsearch _((char*,long,char*,long));
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
 VALUE rb_reg_last_match _((VALUE));

ruby-fix-autoconf-magic-code.patch:
 mkconfig.rb |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ruby-fix-autoconf-magic-code.patch ---
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2006-07-19 20:39:48.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-07-19 20:40:12.000000000 +0900
@@ -37,6 +37,7 @@
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
+  line.gsub!(/\|#_!!_#\|/, '')
   if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
     next if $install_name
     ptn = $1.sub(/\$\$/, '$').split(/,/)	#'


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ruby.spec	12 Jul 2006 08:02:58 -0000	1.71
+++ ruby.spec	20 Jul 2006 11:06:45 -0000	1.72
@@ -5,10 +5,10 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	10.fc6.1
+Release:	11%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
 %ifnarch ppc64
 BuildRequires:	emacs
@@ -27,12 +27,16 @@
 
 Patch1:		ruby-1.8.2-deadcode.patch
 Patch2:		ruby-1.8.4-no-eaccess.patch
-Patch3:		ruby-rubyprefix.patch
-Patch4:		ruby-deprecated-sitelib-search-path.patch
-Patch5:		ruby-deprecated-search-path.patch
-Patch6:		ruby-multilib.patch
-Patch7:		ruby-tcltk-multilib.patch
-Patch8:		ruby-1.8.4-64bit-pack.patch
+Patch3:		ruby-1.8.4-64bit-pack.patch
+Patch4:		ruby-1.8.4-fix-insecure-dir-operation.patch
+Patch5:		ruby-1.8.4-fix-insecure-regexp-modification.patch
+Patch6:		ruby-1.8.4-fix-alias-safe-level.patch
+Patch20:	ruby-rubyprefix.patch
+Patch21:	ruby-deprecated-sitelib-search-path.patch
+Patch22:	ruby-deprecated-search-path.patch
+Patch23:	ruby-multilib.patch
+Patch24:	ruby-tcltk-multilib.patch
+Patch25:	ruby-fix-autoconf-magic-code.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -146,12 +150,16 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch20 -p1
+%patch21 -p1
+%ifarch ppc64 s390x sparc64 x86_64
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 %endif
+%patch25 -p1
 popd
 
 %build
@@ -190,7 +198,7 @@
 popd
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %ifnarch ppc64
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -367,7 +375,7 @@
 __EOF__
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 rm -f *.files
 rm -rf tmp-ruby-docs
 
@@ -446,6 +454,14 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-11
+- security fixes.
+  - ruby-1.8.4-fix-insecure-dir-operation.patch:
+  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
+    operations in the certain safe-level restrictions. (#199538)
+  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
+    safe-level restrictions. (#199543)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-10.fc6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 11:23:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:23:34 -0400
Subject: rpms/man-pages/devel man-pages-2.34-wait16.patch, NONE,
	1.1 man-pages.spec, 1.46, 1.47
Message-ID: <200607201123.k6KBNYGN003388@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3373

Modified Files:
	man-pages.spec 
Added Files:
	man-pages-2.34-wait16.patch 
Log Message:
--- man-pages-2.34/man2/wait.2.16bit    2006-07-18 08:36:25.000000000 +0200
+++ man-pages-2.34/man2/wait.2  2006-07-20 10:37:00.000000000 +0200
@@ -183,7 +183,7 @@
 .TP
 .BI WEXITSTATUS( status )
 returns the exit status of the child.
-This consists of the least significant 8 bits of the
+This consists of the least significant 16-8 bits of the
 .I status
 argument that the child specified in a call to
 .BR exit ()



man-pages-2.34-wait16.patch:
 wait.2 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-2.34-wait16.patch ---
--- man-pages-2.34/man2/wait.2.16bit	2006-07-18 08:36:25.000000000 +0200
+++ man-pages-2.34/man2/wait.2	2006-07-20 10:37:00.000000000 +0200
@@ -183,7 +183,7 @@
 .TP
 .BI WEXITSTATUS( status )
 returns the exit status of the child.
-This consists of the least significant 8 bits of the
+This consists of the least significant 16-8 bits of the
 .I status
 argument that the child specified in a call to
 .BR exit ()


Index: man-pages.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- man-pages.spec	18 Jul 2006 09:35:39 -0000	1.46
+++ man-pages.spec	20 Jul 2006 11:23:32 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project.
 Name: man-pages
 Version: 2.36
-Release: 1
+Release: 2
 License: distributable
 Group: Documentation
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
@@ -33,6 +33,7 @@
 Patch29: man-pages-2.34-getrlimit.patch
 Patch30: man-pages-2.34-libaio-includes.patch
 Patch31: man-pages-2.34-write.patch
+Patch32: man-pages-2.34-wait16.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreq: false
@@ -73,6 +74,7 @@
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 
 %build
 
@@ -172,6 +174,9 @@
 %{_mandir}/en/man*
 
 %changelog
+* Thu Jul 20 2006 Marcela Maslanova <mmaslano at redhat.com> 2.36-2
+- fix (#198903)
+
 * Fri Jul 14 2006 Ivana Varekova <varekova at redhat.com> 2.36-1
 - add nscd_conf options (nscd_conf.patch)
 - added {create,query}_module.2, get_kernel_syms.2 man-pages 



From fedora-cvs-commits at redhat.com  Thu Jul 20 11:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:33:55 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.15,
	1.16 openoffice.org.spec, 1.777, 1.778
Message-ID: <200607201133.k6KBXtUe003630@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3615

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org.spec 
Log Message:
rh#199535# presentation templates duplicated in zh-CN

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                                    |   14 
 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           |    4 
 registry/schema/org/openoffice/Office/Common.xcs                     |    0 
 sfx2/source/appl/sfxhelp.cxx                                         |   69 ++
 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      |   20 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    2 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    6 
 30 files changed, 347 insertions(+), 182 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	5 May 2006 10:27:57 -0000	1.15
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	20 Jul 2006 11:33:52 -0000	1.16
@@ -408,15 +408,6 @@
  				</prop>
  				<prop oor:name="Backup" oor:type="xs:string">
  					<info>
-@@ -1408,7 +1408,7 @@ Dymamic border coloring means that when 
- 						<author>MBA</author>
- 						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
- 				</prop>
- 				<prop oor:name="UIConfig" oor:type="oor:string-list">
- 					<info>
 @@ -1460,7 +1460,7 @@ Dymamic border coloring means that when 
  					<info>
  						<desc>Specifies the default directory where the AutoText modules are located.</desc>
@@ -426,15 +417,6 @@
  				</prop>
  				<prop oor:name="Backup" oor:type="xs:string">
  					<info>
-@@ -1556,7 +1556,7 @@ Dymamic border coloring means that when 
- 					<info>
- 						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
- 					</info>
--					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
-+					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
- 				</prop>
- 				<prop oor:name="UIConfig" oor:type="oor:string-list">
- 					<info>
 Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
 ===================================================================
 RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- openoffice.org.spec	17 Jul 2006 17:52:47 -0000	1.777
+++ openoffice.org.spec	20 Jul 2006 11:33:52 -0000	1.778
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -3335,6 +3335,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
+- rh#199535# presentation templates duplicated in zh-CN
+
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 - add openoffice.org-2.0.3.rh187919.gtkunderkde.patch



From fedora-cvs-commits at redhat.com  Thu Jul 20 11:51:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:51:35 -0400
Subject: rpms/wireshark/FC-5 - New directory
Message-ID: <200607201151.k6KBpZhH000438@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv403/FC-5

Log Message:
Directory /cvs/dist/rpms/wireshark/FC-5 added to the repository




From fedora-cvs-commits at redhat.com  Thu Jul 20 11:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 07:52:32 -0400
Subject: rpms/wireshark/FC-5 wireshark-0.99.1-pie.patch, NONE,
	1.1 wireshark-nfsv4-opts.patch, NONE, 1.1 wireshark.console,
	NONE, 1.1 wireshark.desktop, NONE, 1.1 wireshark.pam, NONE,
	1.1 wireshark.spec, NONE, 1.1
Message-ID: <200607201152.k6KBqWI5000811@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv779

Added Files:
	wireshark-0.99.1-pie.patch wireshark-nfsv4-opts.patch 
	wireshark.console wireshark.desktop wireshark.pam 
	wireshark.spec 
Log Message:
wireshark for FC5

wireshark-0.99.1-pie.patch:
 Makefile.in     |    8 ++++----
 gtk/Makefile.in |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE wireshark-0.99.1-pie.patch ---
--- wireshark-0.99.1pre1/Makefile.in.pie	2006-06-07 21:50:27.000000000 +0200
+++ wireshark-0.99.1pre1/Makefile.in	2006-06-08 12:26:53.000000000 +0200
@@ -979,7 +979,7 @@
 	$(wireshark_additional_libs)	\
 	$(plugin_libs)
 
- at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@wireshark_LDFLAGS = -export-dynamic -pie
 
 # This automake variable adds to the link-line for the executable.
 #
@@ -1024,7 +1024,7 @@
 	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
 	@LIBGNUTLS_LIBS@
 
- at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic
+ at ENABLE_STATIC_FALSE@tshark_LDFLAGS = -export-dynamic -pie
 @ENABLE_STATIC_TRUE at tshark_LDFLAGS = -Wl,-static -all-static
 
 # Optional objects that I know how to build, and that are needed by
@@ -1543,14 +1543,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version_info.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--- wireshark-0.99.1pre1/gtk/Makefile.in.pie	2006-06-07 21:50:12.000000000 +0200
+++ wireshark-0.99.1pre1/gtk/Makefile.in	2006-06-08 12:20:07.000000000 +0200
@@ -899,14 +899,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wsp_stat.Po at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@	if $(COMPILE) $(PIECFLAGS) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

wireshark-nfsv4-opts.patch:
 packet-nfs.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

--- NEW FILE wireshark-nfsv4-opts.patch ---
--- ethereal-0.10.14/epan/dissectors/packet-nfs.c.orig	2005-12-26 21:21:11.000000000 -0500
+++ ethereal-0.10.14/epan/dissectors/packet-nfs.c	2006-01-02 13:57:05.000000000 -0500
@@ -7040,6 +7040,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
 
 	if (ftree == NULL) return offset;
 
+	proto_item_append_text(tree, ", Ops(%d):", ops);
+
 	for (ops_counter=0; ops_counter<ops; ops_counter++)
 	{
 		opcode = tvb_get_ntohl(tvb, offset);
@@ -7064,6 +7066,15 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of
 
 		if (newftree == NULL)	break;
 
+		if (opcode != NFS4_OP_PUTFH) {
+			if (check_col(pinfo->cinfo, COL_INFO)) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s", 
+					names_nfsv4_operation[opcode - 3].strptr);
+			}
+		}
+		proto_item_append_text(tree, " %s", 
+			names_nfsv4_operation[opcode - 3].strptr);
+
 		switch(opcode)
 		{
 		case NFS4_OP_ACCESS:
@@ -7391,6 +7402,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
 
 	if (ftree == NULL)	return offset;		/* error adding new subtree */
 
+	proto_item_append_text(tree, ", Ops(%d):", ops);
+
 	for (ops_counter = 0; ops_counter < ops; ops_counter++)
 	{
 		opcode = tvb_get_ntohl(tvb, offset);
@@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of
 
 		offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status);
 
+		if (check_col(pinfo->cinfo, COL_INFO)) {
+			if (status != NFS4_OK) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%d)", 
+					names_nfsv4_operation[opcode - 3].strptr, status);
+			} else if (opcode != NFS4_OP_PUTFH) {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " %s", 
+					names_nfsv4_operation[opcode - 3].strptr);
+			}
+		}
+		proto_item_append_text(tree, " %s(%d)", 
+			names_nfsv4_operation[opcode - 3].strptr, status);
 		/*
 		 * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and
 		 * NFS4_OP_SETATTR, all other ops do *not* return data with the
@@ -7662,7 +7686,7 @@ static const value_string nfsv3_proc_val
 static const vsff nfs4_proc[] = {
 	{ 0, "NULL",
 	dissect_nfs3_null_call,		dissect_nfs3_null_reply },
-	{ 1, "COMPOUND",
+	{ 1, "COMP",
 	dissect_nfs4_compound_call, dissect_nfs4_compound_reply },
 	{ 0, NULL, NULL, NULL }
 };


--- NEW FILE wireshark.console ---
USER=root
PROGRAM=/usr/sbin/wireshark
SESSION=true
FALLBACK=true


--- NEW FILE wireshark.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Wireshark Network Analyzer
Name[fi]=Wireshark
Name[sv]=Wireshark
Comment=Wireshark traffic and network analyzer
Comment[fi]=Verkkoanalysaattori
Comment[sv]=N??tverkstrafikanalysator
TryExec=wireshark
Exec=wireshark
Icon=wireshark.png
Terminal=false
Type=Application
Categories=X-Red-Hat-Extra;Application;Network;GTK;


--- NEW FILE wireshark.pam ---
#%PAM-1.0
auth		include		config-util
account		include		config-util
session		include		config-util


--- NEW FILE wireshark.spec ---
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
%define svn_version 18188

Summary: 	Network traffic analyzer
Name: 		wireshark
Version:	0.99.2
Release: 	1
License: 	GPL
Group: 		Applications/Internet
Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
Source1:	wireshark.pam
Source2:	wireshark.console
Source3:	wireshark.desktop
Patch1:		wireshark-0.99.1-pie.patch
Patch3:		wireshark-nfsv4-opts.patch
Url: 		http://www.wireshark.org/
BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	libpcap-devel
BuildRequires: 	net-snmp-devel >= 5.3
BuildRequires: 	net-snmp-utils >= 5.3
BuildRequires: 	zlib-devel, bzip2-devel
BuildRequires:  openssl-devel
BuildRequires:	glib2-devel, gtk2-devel
BuildRequires:  elfutils-devel, krb5-devel
BuildRequires:  python, pcre-devel, libselinux
BuildRequires:  gnutls-devel
BuildRequires:  desktop-file-utils, automake, libtool
Obsoletes:	ethereal
Provides:	ethereal


%package	gnome
Summary:	Gnome desktop integration for wireshark and wireshark-usermode
Group:		Applications/Internet
Requires: 	gtk2
Requires:	usermode >= 1.37
Requires:	wireshark = %{version}-%{release}
Obsoletes:	ethereal-gnome
Provides:	ethereal-gnome


%description
Wireshark is a network traffic analyzer for Unix-ish operating systems.

This package lays base for libpcap, a packet capture and filtering 
library, contains command-line utilities, contains plugins and 
documentation for wireshark. A graphical user interface is packaged 
separately to GTK+ package.

%description gnome
Contains wireshark for Gnome 2 and desktop integration file


%prep
#%setup -q -n %{name}-%{version}-SVN-%{svn_version}
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .pie
%patch3 -p1 

%build
%ifarch s390 s390x
export PIECFLAGS="-fPIE"
%else
export PIECFLAGS="-fpie"
%endif
# FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"
export LDFLAGS="$LDFLAGS -lm -lcrypto"
./autogen.sh
%configure \
   --bindir=%{_sbindir} \
   --enable-zlib \
   --enable-ipv6 \
   --with-net-snmp \
   --with-gnu-ld \
   --disable-static \
   --disable-usr-local \
   --enable-gtk2 \
   --with-pic \
   --with-ssl \
   --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
time make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

# The evil plugins hack
perl -pi -e 's|-L../../epan|-L../../epan/.libs|' plugins/*/*.la

make DESTDIR=$RPM_BUILD_ROOT install

#symlink tshark to tethereal
ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal

#empty?!
rm -f $RPM_BUILD_ROOT%{_sbindir}/idl2wrs

# install support files for usermode, gnome and kde
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/wireshark
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wireshark

# install man
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 644 *.1 $RPM_BUILD_ROOT/%{_mandir}/man1

# Install python stuff.
mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  $RPM_BUILD_ROOT%{python_sitelib}

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE3}

mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png


# Remove .la files
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la

# Remove .la files in libdir
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* 
%{_sbindir}/editcap
#%{_sbindir}/idl2wrs
%{_sbindir}/tshark
%{_sbindir}/mergecap
%{_sbindir}/text2pcap
%{_sbindir}/dftest
%{_sbindir}/capinfos
%{_sbindir}/randpkt
%{_sbindir}/dumpcap
%{_sbindir}/tethereal
%{python_sitelib}/*
%{_libdir}/lib*
%{_mandir}/man1/editcap.*
%{_mandir}/man1/tshark.*
%{_mandir}/man1/idl2wrs.*
%{_mandir}/man1/mergecap.*
%{_mandir}/man1/text2pcap.*
%{_mandir}/man1/capinfos.*
%{_mandir}/man1/dumpcap.*
%{_mandir}/man4/wireshark-filter.*
%{_libdir}/wireshark
%config(noreplace) %{_sysconfdir}/pam.d/wireshark
%config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
%{_datadir}/wireshark

%files gnome
%defattr(-,root,root)
%{_datadir}/applications/fedora-wireshark.desktop
%{_datadir}/pixmaps/wireshark.png
%{_bindir}/wireshark
%{_sbindir}/wireshark
%{_mandir}/man1/wireshark.*


%changelog
* Tue Jul 18 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-1
- upgrade to 0.99.2

* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.99.2-0.pre1.1
- rebuild

* Tue Jul 11 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-0.pre1
- upgrade to 0.99.2pre1, fixes (#198242)

* Tue Jun 13 2006 Radek Vokal <rvokal at redhat.com> 0.99.1-0.pre1
- spec file changes

* Fri Jun  9 2006 Radek Vokal <rvokal at redhat.com> 0.99.1pre1-1
- initial build for Fedora Core



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:09:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:09:56 -0400
Subject: rpms/wireshark/FC-5 wireshark-0.99.1-pie.patch, 1.1,
	NONE wireshark-nfsv4-opts.patch, 1.1, NONE wireshark.console,
	1.1, NONE wireshark.desktop, 1.1, NONE wireshark.pam, 1.1,
	NONE wireshark.spec, 1.1, NONE
Message-ID: <200607201209.k6KC9uI3005513@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5484

Removed Files:
	wireshark-0.99.1-pie.patch wireshark-nfsv4-opts.patch 
	wireshark.console wireshark.desktop wireshark.pam 
	wireshark.spec 
Log Message:
not a correct way to branch it


--- wireshark-0.99.1-pie.patch DELETED ---


--- wireshark-nfsv4-opts.patch DELETED ---


--- wireshark.console DELETED ---


--- wireshark.desktop DELETED ---


--- wireshark.pam DELETED ---


--- wireshark.spec DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:28:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:28:10 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-kde#130774.patch, NONE,
	1.1 kdebase.spec, 1.202, 1.203
Message-ID: <200607201228.k6KCSA9P026712@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26653

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kde#130774.patch 
Log Message:
- apply upstream patches,
    fix kde#130774, Strange lonesome icon in KInfocenter's start page



kdebase-3.5.3-kde#130774.patch:
 aboutwidget.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.3-kde#130774.patch ---
Index: kcontrol/kcontrol/aboutwidget.cpp
===================================================================
--- kcontrol/kcontrol/aboutwidget.cpp	(Revision 563925)
+++ kcontrol/kcontrol/aboutwidget.cpp	(Revision 563926)
@@ -151,8 +151,11 @@
     else
     {
         KIconLoader *loader = KGlobal::instance()->iconLoader();
-        QString iconPath = loader->iconPath( _icon, KIcon::Toolbar );
-        content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
+        QString iconPath;
+        if (!_icon.isEmpty()) {
+            iconPath = loader->iconPath( _icon, KIcon::Toolbar );
+            content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
+        }
 
         content += "<table class=\"kc_table\">\n";
         // traverse the list


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- kdebase.spec	19 Jul 2006 14:51:27 -0000	1.202
+++ kdebase.spec	20 Jul 2006 12:28:07 -0000	1.203
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 14
+Release: 15
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -64,6 +64,7 @@
 Patch103: kdebase-3.5.3-kxkb-kcmlayout.patch
 Patch104: kdebase-3.5.3.diff
 Patch105: kdebase-3.5.3-kde#127971.patch
+Patch106: kdebase-3.5.3-kde#130774.patch
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -183,6 +184,7 @@
 %patch103 -p1 -b .kxkb-kcmlayout
 %patch104 -p0 -b .setuid-check
 %patch105 -p0 -b .kde#127971
+%patch106 -p0 -b .kde#130774
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
@@ -554,6 +556,10 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-15
+- apply upstream patches,
+    fix kde#130774, Strange lonesome icon in KInfocenter's start page
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> 6:3.5.3-14
 - rebuild for dbus
 - fixed deprecated dbus functions



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:37:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:37:40 -0400
Subject: rpms/ruby/FC-5 ruby-1.8.4-fix-alias-safe-level.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-dir-operation.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-regexp-modification.patch, NONE,
	1.1 ruby-fix-autoconf-magic-code.patch, NONE, 1.1 ruby.spec,
	1.61, 1.62
Message-ID: <200607201237.k6KCbemM029076@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29022

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.4-fix-alias-safe-level.patch 
	ruby-1.8.4-fix-insecure-dir-operation.patch 
	ruby-1.8.4-fix-insecure-regexp-modification.patch 
	ruby-fix-autoconf-magic-code.patch 
Log Message:
* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-8
- security fixes.
  - ruby-1.8.4-fix-insecure-dir-operation.patch:
  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
    operations in the certain safe-level restrictions. (#199538)
  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
    safe-level restrictions. (#199543)

ruby-1.8.4-fix-alias-safe-level.patch:
 eval.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE ruby-1.8.4-fix-alias-safe-level.patch ---
diff -ruN ruby-1.8.4.orig/eval.c ruby-1.8.4/eval.c
--- ruby-1.8.4.orig/eval.c	2005-12-20 22:41:47.000000000 +0900
+++ ruby-1.8.4/eval.c	2006-07-20 18:33:50.000000000 +0900
@@ -2097,7 +2097,8 @@
 	}
     }
     st_insert(RCLASS(klass)->m_tbl, name,
-      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
+	     (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
+				   NOEX_WITH_SAFE(orig->nd_noex)));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -5638,6 +5639,11 @@
     TMP_PROTECT;
     volatile int safe = -1;
 
+    if (NOEX_SAFE(flags) > ruby_safe_level &&
+       !(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+       rb_raise(rb_eSecurityError, "calling insecure method: %s",
+		rb_id2name(id));
+    }
     switch (ruby_iter->iter) {
       case ITER_PRE:
       case ITER_PAS:
@@ -5742,10 +5748,6 @@
 	    b2 = body = body->nd_next;
 
 	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		if (!(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-		    rb_raise(rb_eSecurityError, "calling insecure method: %s",
-			     rb_id2name(id));
-		}
 		safe = ruby_safe_level;
 		ruby_safe_level = NOEX_SAFE(flags);
 	    }

ruby-1.8.4-fix-insecure-dir-operation.patch:
 dir.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE ruby-1.8.4-fix-insecure-dir-operation.patch ---
diff -ruN ruby-1.8.4.orig/dir.c ruby-1.8.4/dir.c
--- ruby-1.8.4.orig/dir.c	2005-09-14 22:40:58.000000000 +0900
+++ ruby-1.8.4/dir.c	2006-07-19 22:14:05.000000000 +0900
@@ -325,7 +325,17 @@
     rb_raise(rb_eIOError, "closed directory");
 }
 
+static void
+dir_check(dir)
+    VALUE dir;
+{
+    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    rb_check_frozen(dir);
+}
+
 #define GetDIR(obj, dirp) do {\
+    dir_check(dir);\
     Data_Get_Struct(obj, struct dir_data, dirp);\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
@@ -536,6 +546,9 @@
 {
     struct dir_data *dirp;
 
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
+       rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
     GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;

ruby-1.8.4-fix-insecure-regexp-modification.patch:
 intern.h |    6 +++---
 re.c     |   15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE ruby-1.8.4-fix-insecure-regexp-modification.patch ---
diff -ruN ruby-1.8.4.orig/re.c ruby-1.8.4/re.c
--- ruby-1.8.4.orig/re.c	2005-12-13 12:27:51.000000000 +0900
+++ ruby-1.8.4/re.c	2006-07-19 18:07:59.000000000 +0900
@@ -70,10 +70,11 @@
 #endif
 
 int
-rb_memcicmp(p1, p2, len)
-    char *p1, *p2;
+rb_memcicmp(x, y, len)
+    const void *x, *y;
     long len;
 {
+    const unsigned char *p1 = x, *p2 = y;
     int tmp;
 
     while (len--) {
@@ -85,7 +86,7 @@
 
 int
 rb_memcmp(p1, p2, len)
-    char *p1, *p2;
+    const void *p1, *p2;
     long len;
 {
     if (!ruby_ignorecase) {
@@ -96,11 +97,11 @@
 
 long
 rb_memsearch(x0, m, y0, n)
-    char *x0, *y0;
+    const void *x0, *y0;
     long m, n;
 {
-    unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
-    unsigned char *s, *e;
+    const unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
+    const unsigned char *s, *e;
     long i;
     int d;
     unsigned long hx, hy;
@@ -1332,6 +1333,8 @@
 {
     struct RRegexp *re = RREGEXP(obj);
 
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
diff -ruN ruby-1.8.4.orig/intern.h ruby-1.8.4/intern.h
--- ruby-1.8.4.orig/intern.h	2006-07-19 18:13:49.000000000 +0900
+++ ruby-1.8.4/intern.h	2006-07-19 18:20:34.000000000 +0900
@@ -353,9 +353,9 @@
 VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
 VALUE rb_length_by_each _((VALUE));
 /* re.c */
-int rb_memcmp _((char*,char*,long));
-int rb_memcicmp _((char*,char*,long));
-long rb_memsearch _((char*,long,char*,long));
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
 VALUE rb_reg_last_match _((VALUE));

ruby-fix-autoconf-magic-code.patch:
 mkconfig.rb |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ruby-fix-autoconf-magic-code.patch ---
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2006-07-19 20:39:48.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-07-19 20:40:12.000000000 +0900
@@ -37,6 +37,7 @@
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
+  line.gsub!(/\|#_!!_#\|/, '')
   if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
     next if $install_name
     ptn = $1.sub(/\$\$/, '$').split(/,/)	#'


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ruby.spec	19 Jun 2006 08:42:39 -0000	1.61
+++ ruby.spec	20 Jul 2006 12:37:36 -0000	1.62
@@ -5,10 +5,10 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	7.fc5
+Release:	8%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc
 %ifnarch ppc64
 BuildRequires:	emacs
@@ -27,12 +27,16 @@
 
 Patch1:		ruby-1.8.2-deadcode.patch
 Patch2:		ruby-1.8.4-no-eaccess.patch
-Patch3:		ruby-rubyprefix.patch
-Patch4:		ruby-deprecated-sitelib-search-path.patch
-Patch5:		ruby-deprecated-search-path.patch
-Patch6:		ruby-multilib.patch
-Patch7:		ruby-tcltk-multilib.patch
-Patch8:		ruby-1.8.4-64bit-pack.patch
+Patch3:		ruby-1.8.4-64bit-pack.patch
+Patch4:		ruby-1.8.4-fix-insecure-dir-operation.patch
+Patch5:		ruby-1.8.4-fix-insecure-regexp-modification.patch
+Patch6:		ruby-1.8.4-fix-alias-safe-level.patch
+Patch20:	ruby-rubyprefix.patch
+Patch21:	ruby-deprecated-sitelib-search-path.patch
+Patch22:	ruby-deprecated-search-path.patch
+Patch23:	ruby-multilib.patch
+Patch24:	ruby-tcltk-multilib.patch
+Patch25:	ruby-fix-autoconf-magic-code.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -146,12 +150,16 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch20 -p1
+%patch21 -p1
+%ifarch ppc64 s390x sparc64 x86_64
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 %endif
+%patch25 -p1
 popd
 
 %build
@@ -190,7 +198,7 @@
 popd
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %ifnarch ppc64
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@@ -367,7 +375,7 @@
 __EOF__
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 rm -f *.files
 rm -rf tmp-ruby-docs
 
@@ -446,6 +454,14 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-8
+- security fixes.
+  - ruby-1.8.4-fix-insecure-dir-operation.patch:
+  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
+    operations in the certain safe-level restrictions. (#199538)
+  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
+    safe-level restrictions. (#199543)
+
 * Mon Jun 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-7.fc5
 - fixed the wrong file list again. moved tcltk library into ruby-tcltk.
   (#195872)



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:38:16 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2424,1.2425
Message-ID: <200607201238.k6KCcGu7029208@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29171

Modified Files:
	kernel-2.6.spec 
Log Message:
guess for a fix of the debuginfo xen problem???


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2424
retrieving revision 1.2425
diff -u -r1.2424 -r1.2425
--- kernel-2.6.spec	20 Jul 2006 00:27:30 -0000	1.2424
+++ kernel-2.6.spec	20 Jul 2006 12:38:13 -0000	1.2425
@@ -1609,7 +1609,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-%build_debuginfo boot xen
+%build_debuginfo %{?kernel_image_elf:%{image_install_path}} xen
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:49:39 -0400
Subject: rpms/ruby/FC-4 ruby-1.8.4-fix-alias-safe-level.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-dir-operation.patch, NONE,
	1.1 ruby-1.8.4-fix-insecure-regexp-modification.patch, NONE,
	1.1 ruby-fix-autoconf-magic-code.patch, NONE, 1.1 ruby.spec,
	1.37, 1.38
Message-ID: <200607201249.k6KCndIs015513@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15476

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.4-fix-alias-safe-level.patch 
	ruby-1.8.4-fix-insecure-dir-operation.patch 
	ruby-1.8.4-fix-insecure-regexp-modification.patch 
	ruby-fix-autoconf-magic-code.patch 
Log Message:
* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
- security fixes.
  - ruby-1.8.4-fix-insecure-dir-operation.patch:
  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
    operations in the certain safe-level restrictions. (#199538)
  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
    safe-level restrictions. (#199543)

ruby-1.8.4-fix-alias-safe-level.patch:
 eval.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE ruby-1.8.4-fix-alias-safe-level.patch ---
diff -ruN ruby-1.8.4.orig/eval.c ruby-1.8.4/eval.c
--- ruby-1.8.4.orig/eval.c	2005-12-20 22:41:47.000000000 +0900
+++ ruby-1.8.4/eval.c	2006-07-20 18:33:50.000000000 +0900
@@ -2097,7 +2097,8 @@
 	}
     }
     st_insert(RCLASS(klass)->m_tbl, name,
-      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
+	     (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
+				   NOEX_WITH_SAFE(orig->nd_noex)));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -5638,6 +5639,11 @@
     TMP_PROTECT;
     volatile int safe = -1;
 
+    if (NOEX_SAFE(flags) > ruby_safe_level &&
+       !(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+       rb_raise(rb_eSecurityError, "calling insecure method: %s",
+		rb_id2name(id));
+    }
     switch (ruby_iter->iter) {
       case ITER_PRE:
       case ITER_PAS:
@@ -5742,10 +5748,6 @@
 	    b2 = body = body->nd_next;
 
 	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		if (!(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-		    rb_raise(rb_eSecurityError, "calling insecure method: %s",
-			     rb_id2name(id));
-		}
 		safe = ruby_safe_level;
 		ruby_safe_level = NOEX_SAFE(flags);
 	    }

ruby-1.8.4-fix-insecure-dir-operation.patch:
 dir.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE ruby-1.8.4-fix-insecure-dir-operation.patch ---
diff -ruN ruby-1.8.4.orig/dir.c ruby-1.8.4/dir.c
--- ruby-1.8.4.orig/dir.c	2005-09-14 22:40:58.000000000 +0900
+++ ruby-1.8.4/dir.c	2006-07-19 22:14:05.000000000 +0900
@@ -325,7 +325,17 @@
     rb_raise(rb_eIOError, "closed directory");
 }
 
+static void
+dir_check(dir)
+    VALUE dir;
+{
+    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    rb_check_frozen(dir);
+}
+
 #define GetDIR(obj, dirp) do {\
+    dir_check(dir);\
     Data_Get_Struct(obj, struct dir_data, dirp);\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
@@ -536,6 +546,9 @@
 {
     struct dir_data *dirp;
 
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
+       rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
     GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;

ruby-1.8.4-fix-insecure-regexp-modification.patch:
 intern.h |    6 +++---
 re.c     |   15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE ruby-1.8.4-fix-insecure-regexp-modification.patch ---
diff -ruN ruby-1.8.4.orig/re.c ruby-1.8.4/re.c
--- ruby-1.8.4.orig/re.c	2005-12-13 12:27:51.000000000 +0900
+++ ruby-1.8.4/re.c	2006-07-19 18:07:59.000000000 +0900
@@ -70,10 +70,11 @@
 #endif
 
 int
-rb_memcicmp(p1, p2, len)
-    char *p1, *p2;
+rb_memcicmp(x, y, len)
+    const void *x, *y;
     long len;
 {
+    const unsigned char *p1 = x, *p2 = y;
     int tmp;
 
     while (len--) {
@@ -85,7 +86,7 @@
 
 int
 rb_memcmp(p1, p2, len)
-    char *p1, *p2;
+    const void *p1, *p2;
     long len;
 {
     if (!ruby_ignorecase) {
@@ -96,11 +97,11 @@
 
 long
 rb_memsearch(x0, m, y0, n)
-    char *x0, *y0;
+    const void *x0, *y0;
     long m, n;
 {
-    unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
-    unsigned char *s, *e;
+    const unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
+    const unsigned char *s, *e;
     long i;
     int d;
     unsigned long hx, hy;
@@ -1332,6 +1333,8 @@
 {
     struct RRegexp *re = RREGEXP(obj);
 
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
diff -ruN ruby-1.8.4.orig/intern.h ruby-1.8.4/intern.h
--- ruby-1.8.4.orig/intern.h	2006-07-19 18:13:49.000000000 +0900
+++ ruby-1.8.4/intern.h	2006-07-19 18:20:34.000000000 +0900
@@ -353,9 +353,9 @@
 VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
 VALUE rb_length_by_each _((VALUE));
 /* re.c */
-int rb_memcmp _((char*,char*,long));
-int rb_memcicmp _((char*,char*,long));
-long rb_memsearch _((char*,long,char*,long));
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
 VALUE rb_reg_nth_defined _((int, VALUE));
 VALUE rb_reg_nth_match _((int, VALUE));
 VALUE rb_reg_last_match _((VALUE));

ruby-fix-autoconf-magic-code.patch:
 mkconfig.rb |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ruby-fix-autoconf-magic-code.patch ---
diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
--- ruby-1.8.4.orig/mkconfig.rb	2006-07-19 20:39:48.000000000 +0900
+++ ruby-1.8.4/mkconfig.rb	2006-07-19 20:40:12.000000000 +0900
@@ -37,6 +37,7 @@
 has_version = false
 File.foreach "config.status" do |line|
   next if /^#/ =~ line
+  line.gsub!(/\|#_!!_#\|/, '')
   if /^s[%,]@program_transform_name@[%,]s,(.*)/ =~ line
     next if $install_name
     ptn = $1.sub(/\$\$/, '$').split(/,/)	#'


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ruby.spec	8 Jun 2006 02:23:05 -0000	1.37
+++ ruby.spec	20 Jul 2006 12:49:36 -0000	1.38
@@ -5,10 +5,10 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	2.fc4
+Release:	3%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u -n})
 BuildRequires:	readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl tk xorg-x11-devel autoconf gcc unzip openssl-devel db4-devel emacs byacc
 
 Source0:	ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
@@ -23,12 +23,16 @@
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-1.8.2-deadcode.patch
-Patch3:		ruby-rubyprefix.patch
-Patch4:		ruby-deprecated-sitelib-search-path.patch
-Patch5:		ruby-deprecated-search-path.patch
-Patch6:		ruby-multilib.patch
-Patch7:		ruby-tcltk-multilib.patch
-Patch8:		ruby-1.8.4-64bit-pack.patch
+Patch3:		ruby-1.8.4-64bit-pack.patch
+Patch4:		ruby-1.8.4-fix-insecure-dir-operation.patch
+Patch5:		ruby-1.8.4-fix-insecure-regexp-modification.patch
+Patch6:		ruby-1.8.4-fix-alias-safe-level.patch
+Patch20:	ruby-rubyprefix.patch
+Patch21:	ruby-deprecated-sitelib-search-path.patch
+Patch22:	ruby-deprecated-search-path.patch
+Patch23:	ruby-multilib.patch
+Patch24:	ruby-tcltk-multilib.patch
+Patch25:	ruby-fix-autoconf-magic-code.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -133,12 +137,16 @@
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch20 -p1
+%patch21 -p1
+%ifarch ppc64 s390x sparc64 x86_64
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 %endif
+%patch25 -p1
 popd
 
 %build
@@ -174,7 +182,7 @@
 popd
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
@@ -354,7 +362,7 @@
 __EOF__
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 rm -f *.files
 rm -rf tmp-ruby-docs
 
@@ -431,6 +439,14 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
+- security fixes.
+  - ruby-1.8.4-fix-insecure-dir-operation.patch:
+  - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
+    operations in the certain safe-level restrictions. (#199538)
+  - ruby-1.8.4-fix-alias-safe-level.patch: fixed to not bypass the certain
+    safe-level restrictions. (#199543)
+
 * Thu Jun  8 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2.fc4
 - backport from devel.
   - correct sitelibdir.



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:54:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:54:18 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.30,1.31
Message-ID: <200607201254.k6KCsI2B017376@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17344

Modified Files:
	autoconf.spec 
Log Message:
temporarily disable checks


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- autoconf.spec	19 Jul 2006 10:20:46 -0000	1.30
+++ autoconf.spec	20 Jul 2006 12:54:16 -0000	1.31
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release:    9
+Release:	10
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -37,8 +37,8 @@
 %configure
 make
 
-%check
-make check || make check VERBOSE=yes
+#check
+#make check VERBOSE=yes
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -69,6 +69,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Thu Jul 20 2006 Karsten Hopp <karsten at redhat.de> 2.59-10
+- rebuild
+
 * Wed Jul 19 2006 Karsten Hopp <karsten at redhat.de> 2.59-9
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:55:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:55:56 -0400
Subject: rpms/kdelibs/devel kdelibs-3.5.3-kde#116092.patch, NONE,
	1.1 kdelibs.spec, 1.159, 1.160
Message-ID: <200607201255.k6KCtuwn018051@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17978

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-kde#116092.patch 
Log Message:
- apply upstream patches,
   fix kde#130831, remember when the last replacement string was the empty string


kdelibs-3.5.3-kde#116092.patch:
 kreplacedialog.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.3-kde#116092.patch ---
Index: kutils/kreplacedialog.cpp
===================================================================
--- kutils/kreplacedialog.cpp	(Revision 563821)
+++ kutils/kreplacedialog.cpp	(Revision 563822)
@@ -28,6 +28,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kdebug.h>
 
 /**
  * we need to insert the strings after the dialog is set
@@ -101,7 +102,11 @@
 
 QStringList KReplaceDialog::replacementHistory() const
 {
-    return m_replace->historyItems();
+    QStringList lst = m_replace->historyItems();
+    // historyItems() doesn't tell us about the case of replacing with an empty string
+    if ( m_replace->lineEdit()->text().isEmpty() )
+        lst.prepend( QString::null );
+    return lst;
 }
 
 void KReplaceDialog::setOptions(long options)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdelibs.spec	18 Jul 2006 20:34:59 -0000	1.159
+++ kdelibs.spec	20 Jul 2006 12:55:54 -0000	1.160
@@ -17,7 +17,7 @@
 %define arts 1
 
 Version: 3.5.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -65,6 +65,7 @@
 Patch113: kdelibs-3.5.3-kde#106795.patch
 Patch114: kdelibs-3.5.3-kde#130605.patch
 Patch115: kdelibs-3.5.3-kde#129187.patch
+Patch116: kdelibs-3.5.3-kde#116092.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -209,6 +210,7 @@
 %patch113 -p0 -b .kde#106795
 %patch114 -p0 -b .kde#130605
 %patch115 -p0 -b .kde#129187
+%patch116 -p0 -b .kde#116092
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -433,6 +435,10 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-11
+- apply upstream patches,
+   fix kde#130831, remember when the last replacement string was the empty string
+
 * Tue Jul 18 2006 Petr Rockai <prockai at redhat.com> - 6:3.5.3-10
 - do not ship the dummy kdnssd implementation, depend on external one
   (there is one provided by kdnssd-avahi now)



From fedora-cvs-commits at redhat.com  Thu Jul 20 12:58:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 08:58:51 -0400
Subject: rpms/openssl/devel openssl-0.9.8b-aes-cachecol.patch, NONE,
	1.1 openssl-0.9.8b-bn-threadsafety.patch, NONE,
	1.1 openssl-0.9.8b-ipv6-apps.patch, NONE,
	1.1 openssl-0.9.8b-pkcs7-leak.patch, NONE, 1.1 openssl.spec,
	1.78, 1.79
Message-ID: <200607201258.k6KCwp8w019441@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19346

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8b-aes-cachecol.patch 
	openssl-0.9.8b-bn-threadsafety.patch 
	openssl-0.9.8b-ipv6-apps.patch openssl-0.9.8b-pkcs7-leak.patch 
Log Message:
* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
- add ipv6 support to s_client and s_server (by Jan Pazdziora) (#198737)
- add patches for BN threadsafety, AES cache collision attack hazard fix and
  pkcs7 code memleak fix from upstream CVS


openssl-0.9.8b-aes-cachecol.patch:
 aes_core.c     |  311 +++++++++++++++++----------------------------------------
 asm/aes-586.pl |  207 +++++++++++++++++++------------------
 2 files changed, 202 insertions(+), 316 deletions(-)

--- NEW FILE openssl-0.9.8b-aes-cachecol.patch ---
openssl/crypto/aes/aes_core.c     1.7 -> 1.7.2.1

--- openssl/crypto/aes/aes_core.c 2005/01/24 14:22:05 1.7
+++ openssl/crypto/aes/aes_core.c 2006/06/28 08:58:15 1.7.2.1
@@ -44,22 +44,14 @@
 Te1[x] = S [x].[03, 02, 01, 01];
 Te2[x] = S [x].[01, 03, 02, 01];
 Te3[x] = S [x].[01, 01, 03, 02];
-Te4[x] = S [x].[01, 01, 01, 01];
 
 Td0[x] = Si[x].[0e, 09, 0d, 0b];
 Td1[x] = Si[x].[0b, 0e, 09, 0d];
 Td2[x] = Si[x].[0d, 0b, 0e, 09];
 Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01, 01, 01, 01];
+Td4[x] = Si[x].[01];
 */
 
-#ifdef AES_ASM
-extern const u32 AES_Te[5][256];
-#define Te0 AES_Te[0]
-#define Te1 AES_Te[1]
-#define Te2 AES_Te[2]
-#define Te3 AES_Te[3]
-#else
 static const u32 Te0[256] = {
     0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
     0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
@@ -324,81 +316,7 @@
     0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
     0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
 };
-#endif
-static const u32 Te4[256] = {
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
 
-#ifdef AES_ASM
-extern const u32 AES_Td[5][256];
-#define Td0 AES_Td[0]
-#define Td1 AES_Td[1]
-#define Td2 AES_Td[2]
-#define Td3 AES_Td[3]
-#else
 static const u32 Td0[256] = {
     0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
     0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
@@ -663,72 +581,39 @@
     0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
     0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
 };
-#endif
-static const u32 Td4[256] = {
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
+static const u8 Td4[256] = {
+    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
 };
 static const u32 rcon[] = {
 	0x01000000, 0x02000000, 0x04000000, 0x08000000,
@@ -768,10 +653,10 @@
 		while (1) {
 			temp  = rk[3];
 			rk[4] = rk[0] ^
-				(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp >> 24)       ] & 0x000000ff) ^
+				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
+				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
+				(Te1[(temp >> 24)       ] & 0x000000ff) ^
 				rcon[i];
 			rk[5] = rk[1] ^ rk[4];
 			rk[6] = rk[2] ^ rk[5];
@@ -788,10 +673,10 @@
 		while (1) {
 			temp = rk[ 5];
 			rk[ 6] = rk[ 0] ^
-				(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp >> 24)       ] & 0x000000ff) ^
+				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
+				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
+				(Te1[(temp >> 24)       ] & 0x000000ff) ^
 				rcon[i];
 			rk[ 7] = rk[ 1] ^ rk[ 6];
 			rk[ 8] = rk[ 2] ^ rk[ 7];
@@ -810,10 +695,10 @@
 		while (1) {
 			temp = rk[ 7];
 			rk[ 8] = rk[ 0] ^
-				(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp >> 24)       ] & 0x000000ff) ^
+				(Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+				(Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
+				(Te0[(temp      ) & 0xff] & 0x0000ff00) ^
+				(Te1[(temp >> 24)       ] & 0x000000ff) ^
 				rcon[i];
 			rk[ 9] = rk[ 1] ^ rk[ 8];
 			rk[10] = rk[ 2] ^ rk[ 9];
@@ -823,10 +708,10 @@
 			}
 			temp = rk[11];
 			rk[12] = rk[ 4] ^
-				(Te4[(temp >> 24)       ] & 0xff000000) ^
-				(Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-				(Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-				(Te4[(temp      ) & 0xff] & 0x000000ff);
+				(Te2[(temp >> 24)       ] & 0xff000000) ^
+				(Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
+				(Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
+				(Te1[(temp      ) & 0xff] & 0x000000ff);
 			rk[13] = rk[ 5] ^ rk[12];
 			rk[14] = rk[ 6] ^ rk[13];
 			rk[15] = rk[ 7] ^ rk[14];
@@ -865,25 +750,25 @@
 	for (i = 1; i < (key->rounds); i++) {
 		rk += 4;
 		rk[0] =
-			Td0[Te4[(rk[0] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[0]      ) & 0xff] & 0xff];
+			Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
+			Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
+			Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
+			Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
 		rk[1] =
-			Td0[Te4[(rk[1] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[1]      ) & 0xff] & 0xff];
+			Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
+			Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
+			Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
+			Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
 		rk[2] =
-			Td0[Te4[(rk[2] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[2]      ) & 0xff] & 0xff];
+			Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
+			Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
+			Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
+			Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
 		rk[3] =
-			Td0[Te4[(rk[3] >> 24)       ] & 0xff] ^
-			Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
-			Td2[Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-			Td3[Te4[(rk[3]      ) & 0xff] & 0xff];
+			Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
+			Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
+			Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
+			Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
 	}
 	return 0;
 }
@@ -1051,31 +936,31 @@
 	 * map cipher state to byte array block:
 	 */
 	s0 =
-		(Te4[(t0 >> 24)       ] & 0xff000000) ^
-		(Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t3      ) & 0xff] & 0x000000ff) ^
+		(Te2[(t0 >> 24)       ] & 0xff000000) ^
+		(Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+		(Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
+		(Te1[(t3      ) & 0xff] & 0x000000ff) ^
 		rk[0];
 	PUTU32(out     , s0);
 	s1 =
-		(Te4[(t1 >> 24)       ] & 0xff000000) ^
-		(Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t0      ) & 0xff] & 0x000000ff) ^
+		(Te2[(t1 >> 24)       ] & 0xff000000) ^
+		(Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+		(Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
+		(Te1[(t0      ) & 0xff] & 0x000000ff) ^
 		rk[1];
 	PUTU32(out +  4, s1);
 	s2 =
-		(Te4[(t2 >> 24)       ] & 0xff000000) ^
-		(Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t1      ) & 0xff] & 0x000000ff) ^
+		(Te2[(t2 >> 24)       ] & 0xff000000) ^
+		(Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+		(Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
+		(Te1[(t1      ) & 0xff] & 0x000000ff) ^
 		rk[2];
 	PUTU32(out +  8, s2);
 	s3 =
-		(Te4[(t3 >> 24)       ] & 0xff000000) ^
-		(Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(t2      ) & 0xff] & 0x000000ff) ^
+		(Te2[(t3 >> 24)       ] & 0xff000000) ^
+		(Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+		(Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
+		(Te1[(t2      ) & 0xff] & 0x000000ff) ^
 		rk[3];
 	PUTU32(out + 12, s3);
 }
@@ -1242,31 +1127,31 @@
 	 * map cipher state to byte array block:
 	 */
    	s0 =
-   		(Td4[(t0 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t1      ) & 0xff] & 0x000000ff) ^
+   		(Td4[(t0 >> 24)       ] << 24) ^
+   		(Td4[(t3 >> 16) & 0xff] << 16) ^
+   		(Td4[(t2 >>  8) & 0xff] <<  8) ^
+   		(Td4[(t1      ) & 0xff])       ^
    		rk[0];
 	PUTU32(out     , s0);
    	s1 =
-   		(Td4[(t1 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t2      ) & 0xff] & 0x000000ff) ^
+   		(Td4[(t1 >> 24)       ] << 24) ^
+   		(Td4[(t0 >> 16) & 0xff] << 16) ^
+   		(Td4[(t3 >>  8) & 0xff] <<  8) ^
+   		(Td4[(t2      ) & 0xff])       ^
    		rk[1];
 	PUTU32(out +  4, s1);
    	s2 =
-   		(Td4[(t2 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t3      ) & 0xff] & 0x000000ff) ^
+   		(Td4[(t2 >> 24)       ] << 24) ^
+   		(Td4[(t1 >> 16) & 0xff] << 16) ^
+   		(Td4[(t0 >>  8) & 0xff] <<  8) ^
+   		(Td4[(t3      ) & 0xff])       ^
    		rk[2];
 	PUTU32(out +  8, s2);
    	s3 =
-   		(Td4[(t3 >> 24)       ] & 0xff000000) ^
-   		(Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-   		(Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-   		(Td4[(t0      ) & 0xff] & 0x000000ff) ^
+   		(Td4[(t3 >> 24)       ] << 24) ^
+   		(Td4[(t2 >> 16) & 0xff] << 16) ^
+   		(Td4[(t1 >>  8) & 0xff] <<  8) ^
+   		(Td4[(t0      ) & 0xff])       ^
    		rk[3];
 	PUTU32(out + 12, s3);
 }
openssl/crypto/aes/asm/aes-586.pl     1.11 -> 1.11.2.1

--- openssl/crypto/aes/asm/aes-586.pl 2005/05/09 21:48:00 1.11
+++ openssl/crypto/aes/asm/aes-586.pl 2006/06/28 09:01:40 1.11.2.1
@@ -6,7 +6,7 @@
 # forms are granted according to the OpenSSL license.
 # ====================================================================
 #
-# Version 3.4.
+# Version 3.6.
 #
 # You might fail to appreciate this module performance from the first
 # try. If compared to "vanilla" linux-ia32-icc target, i.e. considered
@@ -66,6 +66,13 @@
 # stack. This unfortunately has rather strong impact on small block CBC
 # performance, ~2x deterioration on 16-byte block if compared to 3.3.
 #
+# Version 3.5 checks if there is L1 cache aliasing between user-supplied
+# key schedule and S-boxes and abstains from copying the former if
+# there is no. This allows end-user to consciously retain small block
+# performance by aligning key schedule in specific manner.
+#
+# Version 3.6 compresses Td4 to 256 bytes and prefetches it in ECB.
+#
 # Current ECB performance numbers for 128-bit key in CPU cycles per
 # processed byte [measure commonly used by AES benchmarkers] are:
 #
@@ -505,28 +512,27 @@
 	if($i==3)   {	&mov	($key,&DWP(12,"esp"));		}
 	else        {	&mov	($out,$s[0]);			}
 			&and	($out,0xFF);
-			&mov	($out,&DWP(2048,$td,$out,4));
-			&and	($out,0x000000ff);
+			&movz	($out,&DWP(2048,$td,$out,1));
 
 	if ($i==3)  {	$tmp=$s[1];				}
 			&movz	($tmp,&HB($s[1]));
-			&mov	($tmp,&DWP(2048,$td,$tmp,4));
-			&and	($tmp,0x0000ff00);
+			&movz	($tmp,&DWP(2048,$td,$tmp,1));
+			&shl	($tmp,8);
 			&xor	($out,$tmp);
 
 	if ($i==3)  {	$tmp=$s[2]; &mov ($s[1],$acc);		}
 	else        {	mov	($tmp,$s[2]);			}
 			&shr	($tmp,16);
 			&and	($tmp,0xFF);
-			&mov	($tmp,&DWP(2048,$td,$tmp,4));
-			&and	($tmp,0x00ff0000);
+			&movz	($tmp,&DWP(2048,$td,$tmp,1));
+			&shl	($tmp,16);
 			&xor	($out,$tmp);
 
 	if ($i==3)  {	$tmp=$s[3]; &mov ($s[2],&DWP(8,"esp"));	}
 	else        {	&mov	($tmp,$s[3]);			}
 			&shr	($tmp,24);
-			&mov	($tmp,&DWP(2048,$td,$tmp,4));
-			&and	($tmp,0xff000000);
+			&movz	($tmp,&DWP(2048,$td,$tmp,1));
+			&shl	($tmp,24);
 			&xor	($out,$tmp);
 	if ($i<2)   {	&mov	(&DWP(4+4*$i,"esp"),$out);	}
 	if ($i==3)  {	&mov	($s[3],&DWP(4,"esp"));		}
@@ -687,70 +693,38 @@
 	&_data_word(0x7101a839, 0xdeb30c08, 0x9ce4b4d8, 0x90c15664);
 	&_data_word(0x6184cb7b, 0x70b632d5, 0x745c6c48, 0x4257b8d0);
 #Td4:
-	&data_word(0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5);
-	&data_word(0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838);
-	&data_word(0xbfbfbfbf, 0x40404040, 0xa3a3a3a3, 0x9e9e9e9e);
-	&data_word(0x81818181, 0xf3f3f3f3, 0xd7d7d7d7, 0xfbfbfbfb);
-	&data_word(0x7c7c7c7c, 0xe3e3e3e3, 0x39393939, 0x82828282);
-	&data_word(0x9b9b9b9b, 0x2f2f2f2f, 0xffffffff, 0x87878787);
-	&data_word(0x34343434, 0x8e8e8e8e, 0x43434343, 0x44444444);
-	&data_word(0xc4c4c4c4, 0xdededede, 0xe9e9e9e9, 0xcbcbcbcb);
-	&data_word(0x54545454, 0x7b7b7b7b, 0x94949494, 0x32323232);
-	&data_word(0xa6a6a6a6, 0xc2c2c2c2, 0x23232323, 0x3d3d3d3d);
-	&data_word(0xeeeeeeee, 0x4c4c4c4c, 0x95959595, 0x0b0b0b0b);
-	&data_word(0x42424242, 0xfafafafa, 0xc3c3c3c3, 0x4e4e4e4e);
-	&data_word(0x08080808, 0x2e2e2e2e, 0xa1a1a1a1, 0x66666666);
-	&data_word(0x28282828, 0xd9d9d9d9, 0x24242424, 0xb2b2b2b2);
-	&data_word(0x76767676, 0x5b5b5b5b, 0xa2a2a2a2, 0x49494949);
-	&data_word(0x6d6d6d6d, 0x8b8b8b8b, 0xd1d1d1d1, 0x25252525);
-	&data_word(0x72727272, 0xf8f8f8f8, 0xf6f6f6f6, 0x64646464);
-	&data_word(0x86868686, 0x68686868, 0x98989898, 0x16161616);
-	&data_word(0xd4d4d4d4, 0xa4a4a4a4, 0x5c5c5c5c, 0xcccccccc);
-	&data_word(0x5d5d5d5d, 0x65656565, 0xb6b6b6b6, 0x92929292);
-	&data_word(0x6c6c6c6c, 0x70707070, 0x48484848, 0x50505050);
-	&data_word(0xfdfdfdfd, 0xedededed, 0xb9b9b9b9, 0xdadadada);
-	&data_word(0x5e5e5e5e, 0x15151515, 0x46464646, 0x57575757);
-	&data_word(0xa7a7a7a7, 0x8d8d8d8d, 0x9d9d9d9d, 0x84848484);
-	&data_word(0x90909090, 0xd8d8d8d8, 0xabababab, 0x00000000);
-	&data_word(0x8c8c8c8c, 0xbcbcbcbc, 0xd3d3d3d3, 0x0a0a0a0a);
-	&data_word(0xf7f7f7f7, 0xe4e4e4e4, 0x58585858, 0x05050505);
-	&data_word(0xb8b8b8b8, 0xb3b3b3b3, 0x45454545, 0x06060606);
-	&data_word(0xd0d0d0d0, 0x2c2c2c2c, 0x1e1e1e1e, 0x8f8f8f8f);
-	&data_word(0xcacacaca, 0x3f3f3f3f, 0x0f0f0f0f, 0x02020202);
-	&data_word(0xc1c1c1c1, 0xafafafaf, 0xbdbdbdbd, 0x03030303);
-	&data_word(0x01010101, 0x13131313, 0x8a8a8a8a, 0x6b6b6b6b);
-	&data_word(0x3a3a3a3a, 0x91919191, 0x11111111, 0x41414141);
-	&data_word(0x4f4f4f4f, 0x67676767, 0xdcdcdcdc, 0xeaeaeaea);
-	&data_word(0x97979797, 0xf2f2f2f2, 0xcfcfcfcf, 0xcececece);
-	&data_word(0xf0f0f0f0, 0xb4b4b4b4, 0xe6e6e6e6, 0x73737373);
-	&data_word(0x96969696, 0xacacacac, 0x74747474, 0x22222222);
-	&data_word(0xe7e7e7e7, 0xadadadad, 0x35353535, 0x85858585);
-	&data_word(0xe2e2e2e2, 0xf9f9f9f9, 0x37373737, 0xe8e8e8e8);
-	&data_word(0x1c1c1c1c, 0x75757575, 0xdfdfdfdf, 0x6e6e6e6e);
-	&data_word(0x47474747, 0xf1f1f1f1, 0x1a1a1a1a, 0x71717171);
-	&data_word(0x1d1d1d1d, 0x29292929, 0xc5c5c5c5, 0x89898989);
-	&data_word(0x6f6f6f6f, 0xb7b7b7b7, 0x62626262, 0x0e0e0e0e);
-	&data_word(0xaaaaaaaa, 0x18181818, 0xbebebebe, 0x1b1b1b1b);
-	&data_word(0xfcfcfcfc, 0x56565656, 0x3e3e3e3e, 0x4b4b4b4b);
-	&data_word(0xc6c6c6c6, 0xd2d2d2d2, 0x79797979, 0x20202020);
-	&data_word(0x9a9a9a9a, 0xdbdbdbdb, 0xc0c0c0c0, 0xfefefefe);
-	&data_word(0x78787878, 0xcdcdcdcd, 0x5a5a5a5a, 0xf4f4f4f4);
-	&data_word(0x1f1f1f1f, 0xdddddddd, 0xa8a8a8a8, 0x33333333);
-	&data_word(0x88888888, 0x07070707, 0xc7c7c7c7, 0x31313131);
-	&data_word(0xb1b1b1b1, 0x12121212, 0x10101010, 0x59595959);
-	&data_word(0x27272727, 0x80808080, 0xecececec, 0x5f5f5f5f);
-	&data_word(0x60606060, 0x51515151, 0x7f7f7f7f, 0xa9a9a9a9);
-	&data_word(0x19191919, 0xb5b5b5b5, 0x4a4a4a4a, 0x0d0d0d0d);
-	&data_word(0x2d2d2d2d, 0xe5e5e5e5, 0x7a7a7a7a, 0x9f9f9f9f);
-	&data_word(0x93939393, 0xc9c9c9c9, 0x9c9c9c9c, 0xefefefef);
-	&data_word(0xa0a0a0a0, 0xe0e0e0e0, 0x3b3b3b3b, 0x4d4d4d4d);
-	&data_word(0xaeaeaeae, 0x2a2a2a2a, 0xf5f5f5f5, 0xb0b0b0b0);
-	&data_word(0xc8c8c8c8, 0xebebebeb, 0xbbbbbbbb, 0x3c3c3c3c);
-	&data_word(0x83838383, 0x53535353, 0x99999999, 0x61616161);
-	&data_word(0x17171717, 0x2b2b2b2b, 0x04040404, 0x7e7e7e7e);
-	&data_word(0xbabababa, 0x77777777, 0xd6d6d6d6, 0x26262626);
-	&data_word(0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363);
-	&data_word(0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d);
+	&data_byte(0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38);
+	&data_byte(0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb);
+	&data_byte(0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87);
+	&data_byte(0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb);
+	&data_byte(0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d);
+	&data_byte(0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e);
+	&data_byte(0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2);
+	&data_byte(0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25);
+	&data_byte(0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16);
+	&data_byte(0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92);
+	&data_byte(0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda);
+	&data_byte(0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84);
+	&data_byte(0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a);
+	&data_byte(0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06);
+	&data_byte(0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02);
+	&data_byte(0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b);
+	&data_byte(0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea);
+	&data_byte(0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73);
+	&data_byte(0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85);
+	&data_byte(0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e);
+	&data_byte(0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89);
+	&data_byte(0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b);
+	&data_byte(0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20);
+	&data_byte(0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4);
+	&data_byte(0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31);
+	&data_byte(0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f);
+	&data_byte(0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d);
+	&data_byte(0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef);
+	&data_byte(0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0);
+	&data_byte(0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61);
+	&data_byte(0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26);
+	&data_byte(0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d);
 &function_end_B("_x86_AES_decrypt");
 
 # void AES_decrypt (const void *inp,void *out,const AES_KEY *key);
@@ -770,6 +744,18 @@
 	&blindpop("ebp");
 	&lea    ("ebp",&DWP(&label("AES_Td")."-".&label("pic_point"),"ebp"));
 
+	# prefetch Td4
+	&lea	("ebp",&DWP(2048+128,"ebp"));
+	&mov	($s0,&DWP(0-128,"ebp"));
+	&mov	($s1,&DWP(32-128,"ebp"));
+	&mov	($s2,&DWP(64-128,"ebp"));
+	&mov	($s3,&DWP(96-128,"ebp"));
+	&mov	($s0,&DWP(128-128,"ebp"));
+	&mov	($s1,&DWP(160-128,"ebp"));
+	&mov	($s2,&DWP(192-128,"ebp"));
+	&mov	($s3,&DWP(224-128,"ebp"));
+	&lea	("ebp",&DWP(-2048-128,"ebp"));
+
 	&mov	($s0,&DWP(0,$acc));		# load input data
 	&mov	($s1,&DWP(4,$acc));
 	&mov	($s2,&DWP(8,$acc));
@@ -805,6 +791,7 @@
 my $_tmp=&DWP(40,"esp");	#volatile variable
 my $ivec=&DWP(44,"esp");	#ivec[16]
 my $aes_key=&DWP(60,"esp");	#copy of aes_key
+my $mark=&DWP(60+240,"esp");	#copy of aes_key->rounds
 
 &public_label("AES_Te");
 &public_label("AES_Td");
@@ -865,18 +852,27 @@
 	&mov	($_key,$s3);		# save copy of key
 	&mov	($_ivp,$acc);		# save copy of ivp
 
+	&mov	($mark,0);		# copy of aes_key->rounds = 0;
 	if ($compromise) {
 		&cmp	($s2,$compromise);
 		&jb	(&label("skip_ecopy"));
 	}
-	# copy key schedule to stack
-	&mov	("ecx",244/4);
+	# do we copy key schedule to stack?
+	&mov	($s1 eq "ebx" ? $s1 : "",$s3);
+	&mov	($s2 eq "ecx" ? $s2 : "",244/4);
+	&sub	($s1,"ebp");
 	&mov	("esi",$s3);
+	&and	($s1,0xfff);
 	&lea	("edi",$aes_key);
-	&mov	($_key,"edi");
+	&cmp	($s1,2048);
+	&jb	(&label("do_ecopy"));
+	&cmp	($s1,4096-244);
+	&jb	(&label("skip_ecopy"));
 	&align	(4);
-	&data_word(0xF689A5F3);	# rep movsd
-	&set_label("skip_ecopy") if ($compromise);
+	&set_label("do_ecopy");
+		&mov	($_key,"edi");
+		&data_word(0xA5F3F689);	# rep movsd
+	&set_label("skip_ecopy");
 
 	&mov	($acc,$s0);
 	&mov	($key,16);
@@ -942,18 +938,16 @@
 	&mov	(&DWP(8,$acc),$s2);
 	&mov	(&DWP(12,$acc),$s3);
 
+	&cmp	($mark,0);		# was the key schedule copied?
 	&mov	("edi",$_key);
 	&mov	("esp",$_esp);
-	if ($compromise) {
-		&cmp	(&wparam(2),$compromise);
-		&jb	(&label("skip_ezero"));
-	}
+	&je	(&label("skip_ezero"));
 	# zero copy of key schedule
 	&mov	("ecx",240/4);
 	&xor	("eax","eax");
 	&align	(4);
-	&data_word(0xF689ABF3);	# rep stosd
-	&set_label("skip_ezero") if ($compromise);
+	&data_word(0xABF3F689);	# rep stosd
+	&set_label("skip_ezero")
 	&popf	();
     &set_label("enc_out");
 	&function_end_A();
@@ -968,7 +962,7 @@
 	&cmp	($key,$acc);			# compare with inp
 	&je	(&label("enc_in_place"));
 	&align	(4);
-	&data_word(0xF689A4F3);	# rep movsb	# copy input
+	&data_word(0xA4F3F689);	# rep movsb	# copy input
 	&jmp	(&label("enc_skip_in_place"));
     &set_label("enc_in_place");
 	&lea	($key,&DWP(0,$key,$s2));
@@ -976,7 +970,7 @@
 	&mov	($s2,$s1);
 	&xor	($s0,$s0);
 	&align	(4);
-	&data_word(0xF689AAF3);	# rep stosb	# zero tail
+	&data_word(0xAAF3F689);	# rep stosb	# zero tail
 	&pop	($key);				# pop ivp
 
 	&mov	($acc,$_out);			# output as input
@@ -996,10 +990,10 @@
 
 	# ... and make sure it doesn't alias with AES_Td modulo 4096
 	&mov	($s0,"ebp");
-	&lea	($s1,&DWP(3072,"ebp"));
+	&lea	($s1,&DWP(2048+256,"ebp"));
 	&mov	($s3,$key);
 	&and	($s0,0xfff);		# s = %ebp&0xfff
-	&and	($s1,0xfff);		# e = (%ebp+3072)&0xfff
+	&and	($s1,0xfff);		# e = (%ebp+2048+256)&0xfff
 	&and	($s3,0xfff);		# p = %esp&0xfff
 
 	&cmp	($s3,$s1);		# if (p>=e) %esp =- (p-e);
@@ -1030,21 +1024,30 @@
 	&mov	($_key,$s3);		# save copy of key
 	&mov	($_ivp,$acc);		# save copy of ivp
 
+	&mov	($mark,0);		# copy of aes_key->rounds = 0;
 	if ($compromise) {
 		&cmp	($s2,$compromise);
 		&jb	(&label("skip_dcopy"));
 	}
-	# copy key schedule to stack
-	&mov	("ecx",244/4);
+	# do we copy key schedule to stack?
+	&mov	($s1 eq "ebx" ? $s1 : "",$s3);
+	&mov	($s2 eq "ecx" ? $s2 : "",244/4);
+	&sub	($s1,"ebp");
 	&mov	("esi",$s3);
+	&and	($s1,0xfff);
 	&lea	("edi",$aes_key);
-	&mov	($_key,"edi");
+	&cmp	($s1,2048+256);
+	&jb	(&label("do_dcopy"));
+	&cmp	($s1,4096-244);
+	&jb	(&label("skip_dcopy"));
 	&align	(4);
-	&data_word(0xF689A5F3);	# rep movsd
-	&set_label("skip_dcopy") if ($compromise);
+	&set_label("do_dcopy");
+		&mov	($_key,"edi");
+		&data_word(0xA5F3F689);	# rep movsd
+	&set_label("skip_dcopy");
 
 	&mov	($acc,$s0);
-	&mov	($key,24);
+	&mov	($key,18);
 	&align	(4);
 	&set_label("prefetch_td");
 		&mov	($s0,&DWP(0,"ebp"));
@@ -1054,7 +1057,7 @@
 		&lea	("ebp",&DWP(128,"ebp"));
 		&dec	($key);
 	&jnz	(&label("prefetch_td"));
-	&sub	("ebp",3072);
+	&sub	("ebp",2048+256);
 
 	&cmp	($acc,$_out);
 	&je	(&label("dec_in_place"));	# in-place processing...
@@ -1121,7 +1124,7 @@
 	&lea	($s2 eq "ecx" ? $s2 : "",&DWP(16,$acc));
 	&mov	($acc eq "esi" ? $acc : "",$key);
 	&mov	($key eq "edi" ? $key : "",$_out);	# load out
-	&data_word(0xF689A4F3);	# rep movsb		# copy output
+	&data_word(0xA4F3F689);	# rep movsb		# copy output
 	&mov	($key,$_inp);				# use inp as temp ivp
 	&jmp	(&label("dec_end"));
 
@@ -1188,22 +1191,20 @@
 	&lea	($key,&DWP(0,$key,$s2));
 	&lea	($acc,&DWP(16,$acc,$s2));
 	&neg	($s2 eq "ecx" ? $s2 : "");
-	&data_word(0xF689A4F3);	# rep movsb	# restore tail
+	&data_word(0xA4F3F689);	# rep movsb	# restore tail
 
     &align	(4);
     &set_label("dec_out");
+    &cmp	($mark,0);		# was the key schedule copied?
     &mov	("edi",$_key);
     &mov	("esp",$_esp);
-    if ($compromise) {
-	&cmp	(&wparam(2),$compromise);
-	&jb	(&label("skip_dzero"));
-    }
+    &je		(&label("skip_dzero"));
     # zero copy of key schedule
     &mov	("ecx",240/4);
     &xor	("eax","eax");
     &align	(4);
-    &data_word(0xF689ABF3);	# rep stosd
-    &set_label("skip_dzero") if ($compromise);
+    &data_word(0xABF3F689);	# rep stosd
+    &set_label("skip_dzero")
     &popf	();
 &function_end("AES_cbc_encrypt");
 }

openssl-0.9.8b-bn-threadsafety.patch:
 crypto/bn/bn_mont.c  |   89 ++++++++++++++++++++++++++++++++++++++------
 crypto/err/err.c     |   15 ++++++-
 crypto/rsa/rsa_eay.c |   57 +++++++++++++++++++---------
 ssl/ssl_cert.c       |   28 +++++++++----
 ssl/ssl_ciph.c       |  103 +++++++++++++++++++++++++++++++++++++++++----------
 5 files changed, 234 insertions(+), 58 deletions(-)

--- NEW FILE openssl-0.9.8b-bn-threadsafety.patch ---
--- openssl-0.9.8b/crypto/rsa/rsa_eay.c.bn-threadsafe	2005-09-23 01:32:49.000000000 +0200
+++ openssl-0.9.8b/crypto/rsa/rsa_eay.c	2006-07-20 13:41:44.000000000 +0200
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -238,40 +238,63 @@
 	return(r);
 	}
 
-static BN_BLINDING *rsa_get_blinding(RSA *rsa, BIGNUM **r, int *local, BN_CTX *ctx)
+static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
 {
 	BN_BLINDING *ret;
+	int got_write_lock = 0;
+
+	CRYPTO_r_lock(CRYPTO_LOCK_RSA);
 
 	if (rsa->blinding == NULL)
 		{
+		CRYPTO_r_unlock(CRYPTO_LOCK_RSA);
+		CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+		got_write_lock = 1;
+
 		if (rsa->blinding == NULL)
-			{
-			CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-			if (rsa->blinding == NULL)
-				rsa->blinding = RSA_setup_blinding(rsa, ctx);
-			CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-			}
+			rsa->blinding = RSA_setup_blinding(rsa, ctx);
 		}
 
 	ret = rsa->blinding;
 	if (ret == NULL)
-		return NULL;
+		goto err;
 
-	if (BN_BLINDING_get_thread_id(ret) != CRYPTO_thread_id())
+	if (BN_BLINDING_get_thread_id(ret) == CRYPTO_thread_id())
 		{
-		*local = 0;
+		/* rsa->blinding is ours! */
+
+		*local = 1;
+		}
+	else
+		{
+		/* resort to rsa->mt_blinding instead */
+
+		*local = 0; /* instructs rsa_blinding_convert(), rsa_blinding_invert()
+		             * that the BN_BLINDING is shared, meaning that accesses
+		             * require locks, and that the blinding factor must be
+		             * stored outside the BN_BLINDING
+		             */
+
 		if (rsa->mt_blinding == NULL)
 			{
-			CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+			if (!got_write_lock)
+				{
+				CRYPTO_r_unlock(CRYPTO_LOCK_RSA);
+				CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+				got_write_lock = 1;
+				}
+			
 			if (rsa->mt_blinding == NULL)
 				rsa->mt_blinding = RSA_setup_blinding(rsa, ctx);
-			CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
 			}
 		ret = rsa->mt_blinding;
 		}
-	else
-		*local = 1;
 
+ err:
+	if (got_write_lock)
+		CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+	else
+		CRYPTO_r_unlock(CRYPTO_LOCK_RSA);
 	return ret;
 }
 
@@ -358,7 +381,7 @@
 
 	if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
 		{
-		blinding = rsa_get_blinding(rsa, &br, &local_blinding, ctx);
+		blinding = rsa_get_blinding(rsa, &local_blinding, ctx);
 		if (blinding == NULL)
 			{
 			RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, ERR_R_INTERNAL_ERROR);
@@ -479,7 +502,7 @@
 
 	if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
 		{
-		blinding = rsa_get_blinding(rsa, &br, &local_blinding, ctx);
+		blinding = rsa_get_blinding(rsa, &local_blinding, ctx);
 		if (blinding == NULL)
 			{
 			RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT, ERR_R_INTERNAL_ERROR);
--- openssl-0.9.8b/crypto/bn/bn_mont.c.bn-threadsafe	2005-11-11 13:59:39.000000000 +0100
+++ openssl-0.9.8b/crypto/bn/bn_mont.c	2006-07-20 13:42:07.000000000 +0200
@@ -55,6 +55,59 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
 
 /*
  * Details about Montgomery multiplication algorithms can be found at
@@ -353,18 +406,32 @@
 BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
 					const BIGNUM *mod, BN_CTX *ctx)
 	{
-	if (*pmont)
-		return *pmont;
-	CRYPTO_w_lock(lock);
+	int got_write_lock = 0;
+	BN_MONT_CTX *ret;
+
+	CRYPTO_r_lock(lock);
 	if (!*pmont)
 		{
-		BN_MONT_CTX *mtmp;
-		mtmp = BN_MONT_CTX_new();
-		if (mtmp && !BN_MONT_CTX_set(mtmp, mod, ctx))
-			BN_MONT_CTX_free(mtmp);
-		else
-			*pmont = mtmp;
+		CRYPTO_r_unlock(lock);
+		CRYPTO_w_lock(lock);
+		got_write_lock = 1;
+
+		if (!*pmont)
+			{
+			ret = BN_MONT_CTX_new();
+			if (ret && !BN_MONT_CTX_set(ret, mod, ctx))
+				BN_MONT_CTX_free(ret);
+			else
+				*pmont = ret;
+			}
 		}
-	CRYPTO_w_unlock(lock);
-	return *pmont;
+	
+	ret = *pmont;
+	
+	if (got_write_lock)
+		CRYPTO_w_unlock(lock);
+	else
+		CRYPTO_r_unlock(lock);
+		
+	return ret;
 	}
--- openssl-0.9.8b/crypto/err/err.c.bn-threadsafe	2006-02-08 20:16:16.000000000 +0100
+++ openssl-0.9.8b/crypto/err/err.c	2006-07-20 13:41:44.000000000 +0200
@@ -548,9 +548,20 @@
 	int i;
 	static int init = 1;
 
-	if (!init) return;
-
+	CRYPTO_r_lock(CRYPTO_LOCK_ERR);
+	if (!init)
+		{
+		CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
+		return;
+		}
+	
+	CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
 	CRYPTO_w_lock(CRYPTO_LOCK_ERR);
+	if (!init)
+		{
+		CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
+		return;
+		}
 
 	for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
 		{
--- openssl-0.9.8b/ssl/ssl_ciph.c.bn-threadsafe	2006-04-15 02:22:34.000000000 +0200
+++ openssl-0.9.8b/ssl/ssl_ciph.c	2006-07-20 13:41:44.000000000 +0200
@@ -56,6 +56,59 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+/* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  * ECC cipher suite support in OpenSSL originally developed by 
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
@@ -203,36 +256,46 @@
 
 static void load_builtin_compressions(void)
 	{
-	if (ssl_comp_methods != NULL)
-		return;
+	int got_write_lock = 0;
 
-	CRYPTO_w_lock(CRYPTO_LOCK_SSL);
+	CRYPTO_r_lock(CRYPTO_LOCK_SSL);
 	if (ssl_comp_methods == NULL)
 		{
-		SSL_COMP *comp = NULL;
-
-		MemCheck_off();
-		ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
-		if (ssl_comp_methods != NULL)
+		CRYPTO_r_unlock(CRYPTO_LOCK_SSL);
+		CRYPTO_w_lock(CRYPTO_LOCK_SSL);
+		got_write_lock = 1;
+		
+		if (ssl_comp_methods == NULL)
 			{
-			comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
-			if (comp != NULL)
+			SSL_COMP *comp = NULL;
+
+			MemCheck_off();
+			ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
+			if (ssl_comp_methods != NULL)
 				{
-				comp->method=COMP_zlib();
-				if (comp->method
-					&& comp->method->type == NID_undef)
-					OPENSSL_free(comp);
-				else
+				comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
+				if (comp != NULL)
 					{
-					comp->id=SSL_COMP_ZLIB_IDX;
-					comp->name=comp->method->name;
-					sk_SSL_COMP_push(ssl_comp_methods,comp);
+					comp->method=COMP_zlib();
+					if (comp->method
+						&& comp->method->type == NID_undef)
+						OPENSSL_free(comp);
+					else
+						{
+						comp->id=SSL_COMP_ZLIB_IDX;
+						comp->name=comp->method->name;
+						sk_SSL_COMP_push(ssl_comp_methods,comp);
+						}
 					}
 				}
+			MemCheck_on();
 			}
-		MemCheck_on();
 		}
-	CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+	
+	if (got_write_lock)
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
+	else
+		CRYPTO_r_unlock(CRYPTO_LOCK_SSL);
 	}
 #endif
 
--- openssl-0.9.8b/ssl/ssl_cert.c.bn-threadsafe	2006-02-24 18:58:35.000000000 +0100
+++ openssl-0.9.8b/ssl/ssl_cert.c	2006-07-20 13:41:44.000000000 +0200
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -73,12 +73,12 @@
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
  *
  * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
- *    openssl-core at OpenSSL.org.
+ *    openssl-core at openssl.org.
  *
  * 5. Products derived from this software may not be called "OpenSSL"
  *    nor may "OpenSSL" appear in their names without prior written
@@ -87,7 +87,7 @@
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
  *
  * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -102,6 +102,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
@@ -130,21 +135,28 @@
 int SSL_get_ex_data_X509_STORE_CTX_idx(void)
 	{
 	static volatile int ssl_x509_store_ctx_idx= -1;
+	int got_write_lock = 0;
+
+	CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
 
 	if (ssl_x509_store_ctx_idx < 0)
 		{
-		/* any write lock will do; usually this branch
-		 * will only be taken once anyway */
+		CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
 		CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
+		got_write_lock = 1;
 		
 		if (ssl_x509_store_ctx_idx < 0)
 			{
 			ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index(
 				0,"SSL for verify callback",NULL,NULL,NULL);
 			}
-		
-		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
 		}
+
+	if (got_write_lock)
+		CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
+	else
+		CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
+	
 	return ssl_x509_store_ctx_idx;
 	}
 

openssl-0.9.8b-ipv6-apps.patch:
 s_apps.h   |    7 -
 s_client.c |    9 -
 s_server.c |    9 -
 s_socket.c |  318 ++++++++++++++++++++++++-------------------------------------
 4 files changed, 140 insertions(+), 203 deletions(-)

--- NEW FILE openssl-0.9.8b-ipv6-apps.patch ---
diff --exclude-from=exclude-diff-openssl-0.9.8b -bru openssl-0.9.8b.orig/apps/s_apps.h openssl-0.9.8b/apps/s_apps.h
--- openssl-0.9.8b.orig/apps/s_apps.h	2006-07-11 16:14:29.000000000 +0200
+++ openssl-0.9.8b/apps/s_apps.h	2006-07-13 08:44:29.000000000 +0200
@@ -148,7 +148,7 @@
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(char *port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -156,10 +156,9 @@
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 #endif
-int init_client(int *sock, char *server, int port, int type);
+int init_client(int *sock, char *server, char *port, int type);
 int should_retry(int i);
-int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+int extract_host_port(char *str,char **host_ptr,char **port_ptr);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 	int argi, long argl, long ret);
diff --exclude-from=exclude-diff-openssl-0.9.8b -bru openssl-0.9.8b.orig/apps/s_client.c openssl-0.9.8b/apps/s_client.c
--- openssl-0.9.8b.orig/apps/s_client.c	2005-11-25 14:46:41.000000000 +0100
+++ openssl-0.9.8b/apps/s_client.c	2006-07-13 08:44:29.000000000 +0200
@@ -246,7 +246,7 @@
 	int cbuf_len,cbuf_off;
 	int sbuf_len,sbuf_off;
 	fd_set readfds,writefds;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	int full_log=1;
 	char *host=SSL_HOST_NAME;
 	char *cert_file=NULL,*key_file=NULL;
@@ -330,13 +330,12 @@
 		else if	(strcmp(*argv,"-port") == 0)
 			{
 			if (--argc < 1) goto bad;
-			port=atoi(*(++argv));
-			if (port == 0) goto bad;
+			port_str= *(++argv);
 			}
 		else if (strcmp(*argv,"-connect") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_host_port(*(++argv),&host,NULL,&port))
+			if (!extract_host_port(*(++argv),&host,&port_str))
 				goto bad;
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
@@ -619,7 +618,7 @@
 
 re_start:
 
-	if (init_client(&s,host,port,sock_type) == 0)
+	if (init_client(&s,host,port_str,sock_type) == 0)
 		{
 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
 		SHUTDOWN(s);
diff --exclude-from=exclude-diff-openssl-0.9.8b -bru openssl-0.9.8b.orig/apps/s_server.c openssl-0.9.8b/apps/s_server.c
--- openssl-0.9.8b.orig/apps/s_server.c	2005-09-02 14:27:02.000000000 +0200
+++ openssl-0.9.8b/apps/s_server.c	2006-07-13 08:44:29.000000000 +0200
@@ -532,7 +532,7 @@
 	{
 	X509_STORE *store = NULL;
 	int vflags = 0;
-	short port=PORT;
+	char *port_str = PORT_STR;
 	char *CApath=NULL,*CAfile=NULL;
 	unsigned char *context = NULL;
 	char *dhfile = NULL;
@@ -597,8 +597,7 @@
 			 (strcmp(*argv,"-accept") == 0))
 			{
 			if (--argc < 1) goto bad;
-			if (!extract_port(*(++argv),&port))
-				goto bad;
+			port_str= *(++argv);
 			}
 		else if	(strcmp(*argv,"-verify") == 0)
 			{
@@ -1086,9 +1085,9 @@
 
 	BIO_printf(bio_s_out,"ACCEPT\n");
 	if (www)
-		do_server(port,sock_type,&accept_socket,www_body, context);
+		do_server(port_str,sock_type,&accept_socket,www_body, context);
 	else
-		do_server(port,sock_type,&accept_socket,sv_body, context);
+		do_server(port_str,sock_type,&accept_socket,sv_body, context);
 	print_stats(bio_s_out,ctx);
 	ret=0;
 end:
diff --exclude-from=exclude-diff-openssl-0.9.8b -bru openssl-0.9.8b.orig/apps/s_socket.c openssl-0.9.8b/apps/s_socket.c
--- openssl-0.9.8b.orig/apps/s_socket.c	2005-06-13 05:21:00.000000000 +0200
+++ openssl-0.9.8b/apps/s_socket.c	2006-07-13 08:44:29.000000000 +0200
@@ -96,9 +96,7 @@
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
-static int init_server(int *sock, int port, int type);
-static int init_server_long(int *sock, int port,char *ip, int type);
+static int init_server(int *sock, char *port, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
 
@@ -228,60 +226,69 @@
 	return(1);
 	}
 
-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, char *host, char *port, int type)
 	{
-	unsigned char ip[4];
-	short p=0;
-
-	if (!host_ip(host,&(ip[0])))
-		{
-		return(0);
-		}
-	if (p != 0) port=p;
-	return(init_client_ip(sock,ip,port,type));
-	}
-
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
-	{
-	unsigned long addr;
-	struct sockaddr_in them;
-	int s,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&them,0,sizeof(them));
-	them.sin_family=AF_INET;
-	them.sin_port=htons((unsigned short)port);
-	addr=(unsigned long)
-		((unsigned long)ip[0]<<24L)|
-		((unsigned long)ip[1]<<16L)|
-		((unsigned long)ip[2]<< 8L)|
-		((unsigned long)ip[3]);
-	them.sin_addr.s_addr=htonl(addr);
-
-	if (type == SOCK_STREAM)
-		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-	else /* ( type == SOCK_DGRAM) */
-		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
-			
-	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_ADDRCONFIG;
+
+	e = getaddrinfo(host, port, &hints, &res);
+	if (e)
+	{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #ifndef OPENSSL_SYS_MPE
 	if (type == SOCK_STREAM)
 		{
-		i=0;
-		i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-		if (i < 0) { perror("keepalive"); return(0); }
+			int i=0;
+			i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,
+				(char *)&i,sizeof(i));
+			if (i < 0) {
+				failed_call = "keepalive";
+				goto nextres;
+				}
 		}
 #endif
-
-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-		{ close(s); perror("connect"); return(0); }
+		if (connect(s,(struct sockaddr *)res->ai_addr,
+			res->ai_addrlen) == 0)
+			{
+			freeaddrinfo(res0);
 	*sock=s;
 	return(1);
 	}
+		failed_call = "socket";
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
+		}
+	freeaddrinfo(res0);
+
+	perror(failed_call);
+	return(0);
+	}
 
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+int do_server(char *port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
 	{
 	int sock;
 	char *name = NULL;
@@ -319,33 +326,38 @@
 		}
 	}
 
-static int init_server_long(int *sock, int port, char *ip, int type)
+static int init_server(int *sock, char *port, int type)
 	{
-	int ret=0;
-	struct sockaddr_in server;
-	int s= -1,i;
+	struct addrinfo *res, *res0, hints;
+	char * failed_call = NULL;
+	char port_name[8];
+	int s;
+	int e;
 
 	if (!ssl_sock_init()) return(0);
 
-	memset((char *)&server,0,sizeof(server));
-	server.sin_family=AF_INET;
-	server.sin_port=htons((unsigned short)port);
-	if (ip == NULL)
-		server.sin_addr.s_addr=INADDR_ANY;
-	else
-/* Added for T3E, address-of fails on bit field (beckman at acl.lanl.gov) */
-#ifndef BIT_FIELD_LIMITS
-		memcpy(&server.sin_addr.s_addr,ip,4);
-#else
-		memcpy(&server.sin_addr,ip,4);
-#endif
-	
-		if (type == SOCK_STREAM)
-			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-		else /* type == SOCK_DGRAM */
-			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
+	memset(&hints, '\0', sizeof(hints));
+	hints.ai_socktype = type;
+	hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+	
+	e = getaddrinfo(NULL, port, &hints, &res);
+	if (e)
+		{
+		fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(e));
+		if (e == EAI_SYSTEM)
+			perror("getaddrinfo");
+		return (0);
+		}
 
-	if (s == INVALID_SOCKET) goto err;
+	res0 = res;
+	while (res)
+		{
+		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+		if (s == INVALID_SOCKET)
+			{
+			failed_call = "socket";
+			goto nextres;
+			}
 #if defined SOL_SOCKET && defined SO_REUSEADDR
 		{
 		int j = 1;
@@ -353,36 +365,39 @@
 			   (void *) &j, sizeof j);
 		}
 #endif
-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
+
+		if (bind(s,(struct sockaddr *)res->ai_addr, res->ai_addrlen) == -1)
 		{
-#ifndef OPENSSL_SYS_WINDOWS
-		perror("bind");
-#endif
-		goto err;
+			failed_call = "bind";
+			goto nextres;
 		}
-	/* Make it 128 for linux */
-	if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
-	i=0;
-	*sock=s;
-	ret=1;
-err:
-	if ((ret == 0) && (s != -1))
+		if (type==SOCK_STREAM && listen(s,128) == -1)
 		{
-		SHUTDOWN(s);
+			failed_call = "listen";
+			goto nextres;
 		}
-	return(ret);
+
+		*sock=s;
+		return(1);
+
+nextres:
+		if (s != INVALID_SOCKET)
+			close(s);
+		res = res->ai_next;
 	}
+	freeaddrinfo(res0);
 
-static int init_server(int *sock, int port, int type)
-	{
-	return(init_server_long(sock, port, NULL, type));
+	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+
+	perror(failed_call);
+	return(0);
 	}
 
 static int do_accept(int acc_sock, int *sock, char **host)
 	{
-	int ret,i;
-	struct hostent *h1,*h2;
-	static struct sockaddr_in from;
+	static struct sockaddr_storage from;
+	char buffer[NI_MAXHOST];
+	int ret;
 	int len;
 /*	struct linger ling; */
 
@@ -427,137 +442,62 @@
 	if (i < 0) { perror("keepalive"); return(0); }
 */
 
-	if (host == NULL) goto end;
-#ifndef BIT_FIELD_LIMITS
-	/* I should use WSAAsyncGetHostByName() under windows */
-	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
-		sizeof(from.sin_addr.s_addr),AF_INET);
-#else
-	h1=gethostbyaddr((char *)&from.sin_addr,
-		sizeof(struct in_addr),AF_INET);
-#endif
-	if (h1 == NULL)
+	if (host == NULL)
 		{
-		BIO_printf(bio_err,"bad gethostbyaddr\n");
-		*host=NULL;
-		/* return(0); */
-		}
-	else
-		{
-		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
-			{
-			perror("OPENSSL_malloc");
+		*sock=ret;
 			return(0);
 			}
-		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
 
-		h2=GetHostByName(*host);
-		if (h2 == NULL)
+	if (getnameinfo((struct sockaddr *)&from, sizeof(from),
+		buffer, sizeof(buffer),
+		NULL, 0, 0))
 			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
+		BIO_printf(bio_err,"getnameinfo failed\n");
+		*host=NULL;
 			return(0);
 			}
-		i=0;
-		if (h2->h_addrtype != AF_INET)
+	else
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+		if ((*host=(char *)OPENSSL_malloc(strlen(buffer)+1)) == NULL)
+			{
+			perror("OPENSSL_malloc");
 			return(0);
 			}
-		}
-end:
+		strcpy(*host, buffer);
 	*sock=ret;
 	return(1);
 	}
+	}
 
-int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
-	     short *port_ptr)
+int extract_host_port(char *str, char **host_ptr, 
+	     char **port_ptr)
 	{
-	char *h,*p;
+	char *h,*p,*x;
 
-	h=str;
-	p=strchr(str,':');
+	x=h=str;
+	if (*h == '[')
+		{
+		h++;
+		p=strchr(h,']');
 	if (p == NULL)
 		{
-		BIO_printf(bio_err,"no port defined\n");
+			BIO_printf(bio_err,"no ending bracket for IPv6 address\n");
 		return(0);
 		}
 	*(p++)='\0';
-
-	if ((ip != NULL) && !host_ip(str,ip))
-		goto err;
-	if (host_ptr != NULL) *host_ptr=h;
-
-	if (!extract_port(p,port_ptr))
-		goto err;
-	return(1);
-err:
-	return(0);
+		x = p;
 	}
-
-static int host_ip(char *str, unsigned char ip[4])
-	{
-	unsigned int in[4]; 
-	int i;
-
-	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-		{
-		for (i=0; i<4; i++)
-			if (in[i] > 255)
-				{
-				BIO_printf(bio_err,"invalid IP address\n");
-				goto err;
-				}
-		ip[0]=in[0];
-		ip[1]=in[1];
-		ip[2]=in[2];
-		ip[3]=in[3];
-		}
-	else
-		{ /* do a gethostbyname */
-		struct hostent *he;
-
-		if (!ssl_sock_init()) return(0);
-
-		he=GetHostByName(str);
-		if (he == NULL)
-			{
-			BIO_printf(bio_err,"gethostbyname failure\n");
-			goto err;
-			}
-		/* cast to short because of win16 winsock definition */
-		if ((short)he->h_addrtype != AF_INET)
+	p=strchr(x,':');
+	if (p == NULL)
 			{
-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
-			return(0);
-			}
-		ip[0]=he->h_addr_list[0][0];
-		ip[1]=he->h_addr_list[0][1];
-		ip[2]=he->h_addr_list[0][2];
-		ip[3]=he->h_addr_list[0][3];
-		}
-	return(1);
-err:
+		BIO_printf(bio_err,"no port defined\n");
 	return(0);
 	}
+	*(p++)='\0';
 
-int extract_port(char *str, short *port_ptr)
-	{
-	int i;
-	struct servent *s;
+	if (host_ptr != NULL) *host_ptr=h;
+	if (port_ptr != NULL) *port_ptr=p;
 
-	i=atoi(str);
-	if (i != 0)
-		*port_ptr=(unsigned short)i;
-	else
-		{
-		s=getservbyname(str,"tcp");
-		if (s == NULL)
-			{
-			BIO_printf(bio_err,"getservbyname failure for %s\n",str);
-			return(0);
-			}
-		*port_ptr=ntohs((unsigned short)s->s_port);
-		}
 	return(1);
 	}
 

openssl-0.9.8b-pkcs7-leak.patch:
 pk7_smime.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openssl-0.9.8b-pkcs7-leak.patch ---
--- openssl-0.9.8b/crypto/pkcs7/pk7_smime.c.pk7-leak	2005-08-05 00:10:05.000000000 +0200
+++ openssl-0.9.8b/crypto/pkcs7/pk7_smime.c	2006-07-20 13:53:16.000000000 +0200
@@ -127,6 +127,8 @@
 		}
 	}
 
+	if(flags & PKCS7_DETACHED) PKCS7_set_detached(p7, 1);
+
 	if (flags & PKCS7_STREAM)
 		return p7;
 
@@ -138,8 +140,6 @@
 
 	SMIME_crlf_copy(data, p7bio, flags);
 
-	if(flags & PKCS7_DETACHED)PKCS7_set_detached(p7, 1);
-
         if (!PKCS7_dataFinal(p7,p7bio)) {
 		PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_DATASIGN);
 		PKCS7_free(p7);


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- openssl.spec	12 Jul 2006 07:35:49 -0000	1.78
+++ openssl.spec	20 Jul 2006 12:58:48 -0000	1.79
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 3.1
+Release: 4
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -47,9 +47,13 @@
 Patch35: openssl-0.9.7-beta5-version-add-engines.patch
 Patch36: openssl-0.9.8a-use-poll.patch
 Patch38: openssl-0.9.8a-reuse-cipher-change.patch
+Patch39: openssl-0.9.8b-ipv6-apps.patch
 # Backported fixes including security fixes
 Patch51: openssl-0.9.8b-block-padding.patch
 Patch52: openssl-0.9.8b-pkcs12-fix.patch
+Patch53: openssl-0.9.8b-bn-threadsafety.patch
+Patch54: openssl-0.9.8b-aes-cachecol.patch
+Patch55: openssl-0.9.8b-pkcs7-leak.patch
 
 License: BSDish
 Group: System Environment/Libraries
@@ -106,9 +110,13 @@
 %patch35 -p1 -b .version-add-engines
 %patch36 -p1 -b .use-poll
 %patch38 -p1 -b .cipher-change
+%patch39 -p1 -b .ipv6-apps
 
 %patch51 -p1 -b .block-padding
 %patch52 -p1 -b .pkcs12-fix
+%patch53 -p1 -b .bn-threadsafety
+%patch54 -p1 -b .cachecol
+%patch55 -p1 -b .pkcs7-leak
 
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
@@ -264,11 +272,11 @@
 # Do an opensslconf.h switcheroo to avoid file conflicts on systems where you
 # can have both a 32- and 64-bit version of the library, and they each need
 # their own correct-but-different versions of opensslconf.h to be usable.
-install -m644 $RPM_SOURCE_DIR/opensslconf-new-warning.h \
+install -m644 %{SOURCE10} \
    $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
 cat $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h >> \
    $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf-${basearch}.h
-install -m644 $RPM_SOURCE_DIR/opensslconf-new.h \
+install -m644 %{SOURCE9} \
    $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
 %endif
 
@@ -342,6 +350,11 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
+- add ipv6 support to s_client and s_server (by Jan Pazdziora) (#198737)
+- add patches for BN threadsafety, AES cache collision attack hazard fix and
+  pkcs7 code memleak fix from upstream CVS
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8b-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 13:13:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 09:13:51 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2425,1.2426
Message-ID: <200607201313.k6KDDpMg023176@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22926

Modified Files:
	kernel-2.6.spec 
Log Message:
quick fix for build_debuginfo to not collect stripped vmlinuz kernels




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2425
retrieving revision 1.2426
diff -u -r1.2425 -r1.2426
--- kernel-2.6.spec	20 Jul 2006 12:38:13 -0000	1.2425
+++ kernel-2.6.spec	20 Jul 2006 13:13:48 -0000	1.2426
@@ -1357,9 +1357,6 @@
 This is required to use SystemTap with %{name}%{?2:-%{2}}-%{KVERREL}.\
 %%files %{?2:%{2}-}debuginfo\
 %defattr(-,root,root)\
-%if "%{?1}" != ""\
-/usr/lib/debug/%{?1}/*-%{KVERREL}%{?3}%{!?3:%{?2}}.debug\
-%endif\
 /usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
 /usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
 %endif\
@@ -1695,7 +1692,10 @@
 %endif
 
 %changelog
-* Tue Jul 19 2006 Don Zickus <dzickus at redhat.com>
+* Thu Jul 20 2006 Don Zickus <dzickus at redhat.com>
+- fixed build_debuginfo to not collect a stripped kernel
+
+* Wed Jul 19 2006 Don Zickus <dzickus at redhat.com>
 - Add in support for nfs superblock sharing and cachefs
   patches from David Howells
 - Disable 'make prepare' hack as it is breaking ppc symlinks  



From fedora-cvs-commits at redhat.com  Thu Jul 20 13:15:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 09:15:17 -0400
Subject: rpms/alsa-lib/devel .cvsignore, 1.20, 1.21 alsa-lib.spec, 1.46,
	1.47 sources, 1.22, 1.23 alsa-lib-1.0.10-ainit-2.patch, 1.1,
	NONE alsa-lib-1.0.11-ainit-start.patch, 1.1,
	NONE alsa-lib-1.0.11-group.patch, 1.1, NONE
Message-ID: <200607201315.k6KDFHX7023769@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23743

Modified Files:
	.cvsignore alsa-lib.spec sources 
Removed Files:
	alsa-lib-1.0.10-ainit-2.patch 
	alsa-lib-1.0.11-ainit-start.patch alsa-lib-1.0.11-group.patch 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Jan 2006 15:52:56 -0000	1.20
+++ .cvsignore	20 Jul 2006 13:15:15 -0000	1.21
@@ -7,3 +7,4 @@
 alsa-lib-1.0.10.tar.bz2
 alsa-lib-1.0.11rc2.tar.bz2
 ainit-0.7.tar.gz
+alsa-lib-1.0.12rc1.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- alsa-lib.spec	19 Jul 2006 14:51:53 -0000	1.46
+++ alsa-lib.spec	20 Jul 2006 13:15:15 -0000	1.47
@@ -1,18 +1,14 @@
-%define prever         rc2
-%define version_main   1.0.11
-%define version_ainit  0.7
+%define prever         rc1
+%define version_main   1.0.12
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 6.rc2
+Release: 1.rc1
 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
+Patch:   alsa-lib-1.0.12rc1-config.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -39,10 +35,8 @@
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version_main}%{?prever} -a 1
-%patch0 -p1 -b .ainit
-%patch1 -p1 -b .group
-%patch2 -p1 -b .start
+%setup -q -n %{name}-%{version_main}%{?prever}
+%patch -p1 -b .config
 
 %build
 %configure \
@@ -52,11 +46,6 @@
 make %{?_smp_mflags}
 make doc
 
-# Compile ainit
-cd ainit
-./compile
-cd ..
-
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -69,73 +58,24 @@
 
 mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
 
-# install ainit binaries
-install -m 755 ainit/ainit %{buildroot}%{_bindir}
-
-# install ainit config files
-install -m 644 ainit/config/ainit.conf %{buildroot}%{_sysconfdir}/alsa/ainit.conf
-
-install -m 644 ainit/config/dmix.template %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.template
-install -m 644 ainit/config/dsnoop.template %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.template
-
-install -m 644 ainit/config/dmix.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.lock
-install -m 644 ainit/config/dsnoop.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
-
-cp %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.back
-cp %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.back
-
-# install ainit man pages
-mkdir -p %{buildroot}%{_mandir}/man8
-install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8
-
-mkdir -p %{buildroot}%{_mandir}/man5
-install -m 644 ainit/doc/ainit.conf.5 %{buildroot}%{_mandir}/man5/ainit.conf.5
-install -m 644 ainit/doc/ainit.template.5 %{buildroot}%{_mandir}/man5/ainit.template.5
-
 %clean
 rm -rf %{buildroot}
 
-%post
-/sbin/ldconfig 
-
-# Upgrade - remove the current buffers
-if [ $1 = 2 ] && [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` stop
-fi
-# Create the new ones
-if [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` start
-fi
+%post -p /sbin/ldconfig 
 
 %postun -p /sbin/ldconfig
 
-%preun 
-# Only if we're removing the package
-if [ $1 = 0 ] && [ -f /var/run/console/console.lock ]; then
-   /usr/bin/ainit `cat /var/run/console/console.lock` stop
-fi
-
 %triggerpostun -- alsa-lib < 1.0.6-2
 ln -snf ../../etc/alsa %{_datadir}/alsa
 
 %files
 %defattr(-, root, root)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%{_bindir}/alsalisp
 %{_bindir}/aserver
 /%{_lib}/libasound.so.*
 %{_libdir}/alsa-lib/smixer/*
 %{_sysconfdir}/alsa
 %config %{_sysconfdir}/alsa/alsa.conf
-%{_bindir}/ainit
-%{_mandir}/man?/*
-%config %{_sysconfdir}/alsa/pcm/dmix.template
-%config %{_sysconfdir}/alsa/pcm/dsnoop.template
-%ghost  %{_sysconfdir}/alsa/pcm/dmix.conf.lock
-%ghost  %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock
-%config %{_sysconfdir}/alsa/pcm/dmix.conf
-%config %{_sysconfdir}/alsa/pcm/dsnoop.conf
-%config %{_sysconfdir}/alsa/ainit.conf
 
 %files devel
 %defattr(-, root, root)
@@ -149,6 +89,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Thu Jul 20 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc1
+- new upstream
+- removed ainit (no longer needed in the new upstream)
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-6.rc2
 - fix release for upgrade path
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Jan 2006 15:52:56 -0000	1.22
+++ sources	20 Jul 2006 13:15:15 -0000	1.23
@@ -1,2 +1 @@
-4e73229d7f88a6610993470011d39ee6  alsa-lib-1.0.11rc2.tar.bz2
-062cf16b02de99ddea47a76884d7fe3d  ainit-0.7.tar.gz
+8a3f6d218a9285426556fb3006054725  alsa-lib-1.0.12rc1.tar.bz2


--- alsa-lib-1.0.10-ainit-2.patch DELETED ---


--- alsa-lib-1.0.11-ainit-start.patch DELETED ---


--- alsa-lib-1.0.11-group.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 13:23:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 09:23:06 -0400
Subject: rpms/alsa-lib/devel alsa-lib-1.0.12rc1-config.patch,NONE,1.1
Message-ID: <200607201323.k6KDN6Yq008120@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8082

Added Files:
	alsa-lib-1.0.12rc1-config.patch 
Log Message:
added config patch

alsa-lib-1.0.12rc1-config.patch:
 alsa.conf       |    3 +--
 pcm/dmix.conf   |    4 ----
 pcm/dsnoop.conf |    4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE alsa-lib-1.0.12rc1-config.patch ---
--- alsa-lib-1.0.12rc1/src/conf/alsa.conf.old	2006-06-21 17:31:58.000000000 +0200
+++ alsa-lib-1.0.12rc1/src/conf/alsa.conf	2006-07-20 15:01:53.000000000 +0200
@@ -55,8 +55,7 @@
 defaults.pcm.subdevice -1
 defaults.pcm.nonblock 1
 defaults.pcm.ipc_key 5678293
-defaults.pcm.ipc_gid audio
-defaults.pcm.ipc_perm 0660
+defaults.pcm.ipc_perm 0600
 defaults.pcm.dmix_max_periods 0
 defaults.pcm.dmix_rate 48000
 defaults.pcm.dmix_format S16_LE
--- alsa-lib-1.0.12rc1/src/conf/pcm/dmix.conf.old	2006-06-21 17:31:58.000000000 +0200
+++ alsa-lib-1.0.12rc1/src/conf/pcm/dmix.conf	2006-07-20 15:02:27.000000000 +0200
@@ -35,10 +35,6 @@
 		@func refer
 		name defaults.pcm.ipc_key
 	}
-	ipc_gid {
-		@func refer
-		name defaults.pcm.ipc_gid
-	}
 	ipc_perm {
 		@func refer
 		name defaults.pcm.ipc_perm
--- alsa-lib-1.0.12rc1/src/conf/pcm/dsnoop.conf.old	2006-06-21 17:31:58.000000000 +0200
+++ alsa-lib-1.0.12rc1/src/conf/pcm/dsnoop.conf	2006-07-20 15:02:37.000000000 +0200
@@ -35,10 +35,6 @@
 		@func refer
 		name defaults.pcm.ipc_key
 	}
-	ipc_gid {
-		@func refer
-		name defaults.pcm.ipc_gid
-	}
 	ipc_perm {
 		@func refer
 		name defaults.pcm.ipc_perm



From fedora-cvs-commits at redhat.com  Thu Jul 20 13:36:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 09:36:31 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec, 1.41, 1.42 alsaunmute.c, 1.8,
	1.9 sources, 1.18, 1.19
Message-ID: <200607201336.k6KDaVoM011724@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11676

Modified Files:
	alsa-utils.spec alsaunmute.c sources 
Log Message:
new upstream


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- alsa-utils.spec	12 Jul 2006 05:08:17 -0000	1.41
+++ alsa-utils.spec	20 Jul 2006 13:36:28 -0000	1.42
@@ -1,7 +1,9 @@
+%define prever rc1
+
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
-Version: 	1.0.11
-Release: 	7.1
+Version: 	1.0.12
+Release: 	1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -65,6 +67,9 @@
 /usr/share/locale/*
 
 %changelog
+* Thu Jul 20 2006 Martin Stransky <stransky at redhat.com> 1.0.12-1.rc1
+- new upstream
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: alsaunmute.c
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsaunmute.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsaunmute.c	3 May 2006 08:46:12 -0000	1.8
+++ alsaunmute.c	20 Jul 2006 13:36:29 -0000	1.9
@@ -288,7 +288,7 @@
   printf("This software may be freely redistributed under the terms of the GNU\n");
   printf("public license.\n\n");
 
-  printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n", p_name);
+  printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n");
   printf("  card_number       - number of unmuted card\n");
   printf("  [-v]              - verbose mode\n");
   printf("  [-s volume]       - set this volume level instead of the default (75%)\n");


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 May 2006 08:10:30 -0000	1.18
+++ sources	20 Jul 2006 13:36:29 -0000	1.19
@@ -1 +1 @@
-ba9b8010120701d0f6daf061d392cfa2  alsa-utils-1.0.11.tar.bz2
+fe05a1cad553547e991fd159e22ff5bf  alsa-utils-1.0.12rc1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 20 13:37:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 09:37:35 -0400
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.42,1.43
Message-ID: <200607201337.k6KDbZAT011930@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11899

Modified Files:
	alsa-utils.spec 
Log Message:
release change


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- alsa-utils.spec	20 Jul 2006 13:36:28 -0000	1.42
+++ alsa-utils.spec	20 Jul 2006 13:37:32 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.12
-Release: 	1
+Release: 	1.rc1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:12:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:12:21 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2426,1.2427
Message-ID: <200607201412.k6KECLTN010589@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10576

Modified Files:
	kernel-2.6.spec 
Log Message:
I guess this was wrong




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2426
retrieving revision 1.2427
diff -u -r1.2426 -r1.2427
--- kernel-2.6.spec	20 Jul 2006 13:13:48 -0000	1.2426
+++ kernel-2.6.spec	20 Jul 2006 14:12:16 -0000	1.2427
@@ -1357,6 +1357,9 @@
 This is required to use SystemTap with %{name}%{?2:-%{2}}-%{KVERREL}.\
 %%files %{?2:%{2}-}debuginfo\
 %defattr(-,root,root)\
+%if "%{?1}" != ""\
+/usr/lib/debug/%{?1}/*-%{KVERREL}%{?3}%{!?3:%{?2}}.debug\
+%endif\
 /usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
 /usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
 %endif\
@@ -1693,6 +1696,9 @@
 
 %changelog
 * Thu Jul 20 2006 Don Zickus <dzickus at redhat.com>
+- apparently I was wrong and was fixed already
+
+* Thu Jul 20 2006 Don Zickus <dzickus at redhat.com>
 - fixed build_debuginfo to not collect a stripped kernel
 
 * Wed Jul 19 2006 Don Zickus <dzickus at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:18:57 -0400
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.17,
	1.18
Message-ID: <200607201418.k6KEIvMV023299@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22842

Modified Files:
	gnome-python-desktop.spec 
Log Message:
rebuild



Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-python-desktop.spec	13 Jul 2006 04:37:07 -0000	1.17
+++ gnome-python-desktop.spec	20 Jul 2006 14:18:54 -0000	1.18
@@ -15,7 +15,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.15.4
-Release: 1
+Release: 2
 License: GPL/LGPL
 Group: Development/Languages
 Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2
@@ -254,6 +254,9 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Thu Jul 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-2
+- Rebuild against dbus
+
 * Thu Jul 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:23:14 -0400
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.93,1.94
Message-ID: <200607201423.k6KENEXN025786@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25772

Modified Files:
	gnome-screensaver.spec 
Log Message:
fix requires



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-screensaver.spec	19 Jul 2006 18:50:04 -0000	1.93
+++ gnome-screensaver.spec	20 Jul 2006 14:23:11 -0000	1.94
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 4 
+Release: 5 
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -49,7 +49,7 @@
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
-Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libglade2 >= %{libglade2_version}
 Requires: libxml2 >= %{libxml2_version}
 Requires: GConf2 >= %{gconf2_version}
@@ -157,6 +157,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Thu Jul 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-5
+- Fix Requires for dbus-glib
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-4
 - Add BR on dbus-glib-devel
 - Add patch to fix deprecated dbus functions



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:40:05 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec, 1.20, 1.21 sources, 1.6,
	1.7
Message-ID: <200607201440.k6KEe5m0026211@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26198

Modified Files:
	eclipse-pydev.spec sources 
Log Message:
* Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3-16fc
- Rebuild older, buildable, version for fc6-test2.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-pydev.spec	19 Jul 2006 17:28:28 -0000	1.20
+++ eclipse-pydev.spec	20 Jul 2006 14:40:03 -0000	1.21
@@ -4,10 +4,10 @@
 %define pkg_summary		Eclipse Python development plug-in
 %define section			free
 %define eclipse_name 		eclipse
-%define	version_major		1
-%define version_minor		0
+%define	version_major		0
+%define version_minor		9
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	8
+%define version_micro   	3
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -21,14 +21,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}
-Release:	3fc
+Release:	16fc
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
 Requires: eclipse-platform
 Requires: python
-Requires:       commons-codec >= 1.3
-Requires:       junit >= 3.8.1
 
 # Note that following the Eclipse Releng process we do not distribute a 
 # real .tar.gz file.  Instead, you must build it by hand.  The way to do 
@@ -39,10 +37,8 @@
 # contents.  See the java command to see how to invoke
 # things in the releng build.xml.
 
-Source0: eclipse-pydev-fetched-%{version_majmin}.%{version_micro}.tar.gz
+Source0: eclipse-pydev-fetched-HEAD-0.9.3.tar.gz
 Patch1: %{name}-2.4-default.patch
-Patch2: %{name}-%{version_majmin}.%{version_micro}-backport-megapatch.patch
-Patch3: %{name}-noretroweaver.patch
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
@@ -55,12 +51,9 @@
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  junit >= 3.8.1
-BuildRequires:  commons-codec >= 1.3
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc ia64
 %else
 BuildArch:     noarch
 %endif
@@ -72,77 +65,49 @@
 
 %prep
 %setup -q -c 
-pushd eclipse-pydev-%{version_majmin}.%{version_micro}
-%patch2 -p0
-%patch3 -p0
-
-# Replace all references to 0.9.7.1 with the correct version number
-for f in `grep -rl '0.9.7.1' *` ; do 
-    if [ -f $f ]; then
-        sed --in-place "s/0.9.7.1/%{version_majmin}.%{version_micro}/g" $f
-    fi
-done 
-
-# Remove retroweaver.jar, this is backported to Java 1.4, so we don't use it
-find . -name 'retroweaver-rt.jar' -exec rm {} \;
-
-#list all jars
-
-# Link to system jars
-# TODO link to jython once it's in Extras.
-rm -f org.python.pydev.core/commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar org.python.pydev.core/commons-codec.jar
-
-rm -f org.python.pydev.core/lib/junit.jar
-ln -sf %{_datadir}/java/junit.jar org.python.pydev.core/lib/junit.jar
-
+%patch1 -p0
 
 %build
+
+# See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-SDK=$(cd SDK > /dev/null && pwd)
+SDK=$(cd SDK && pwd)
 
-# Eclipse may try to write to the home directory.
 mkdir home
+
 homedir=$(cd home > /dev/null && pwd)
 
-# build the main pydev feature
-java -cp %{eclipse_base}/startup.jar                   \
-     -Duser.home=$homedir                              \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-	 -verbose \
-     -Dtype=feature                                    \
-     -Did=org.python.pydev.feature                     \
-     -DbaseLocation=$SDK                               \
-     -DsourceDirectory=$(pwd)                          \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/templates/package-build \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build_3.1.2/scripts/build.xml
-# See comments in the script to understand this.
+pushd `pwd` 
+cd org.python.pydev.releng
+
+# Call eclipse headless to process pydev releng build scripts
+# need -Dosgi.install.area for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20198
+java -cp  $SDK/startup.jar \
+    -Duser.home=$homedir \
+    -Dosgi.install.area=%{eclipse_base} \
+     org.eclipse.core.launcher.Main \
+    -application org.eclipse.ant.core.antRunner \
+    -DjavacFailOnError=false \
+    -DdontUnzip=true \
+    -DbaseLocation=$SDK \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
+    -DdontFetchAnything=true 
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.python.pydev.feature.zip
+rm -rf ${RPM_BUILD_ROOT}
 
+install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
 
-pushd $RPM_BUILD_ROOT%{_datadir}/%{eclipse_name}
-rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/jakarta-commons-codec.jar
-
-mkdir plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib
-rm -rf plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
-ln -sf %{_datadir}/java/junit.jar plugins/org.python.pydev.core_%{version_majmin}.%{version_micro}/lib/junit.jar
-
-## Dump the files from the releng tarball into the build root
-#for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
-#  case $file in
-#    *org.python.pydev*)
-#      # The ".." is needed since the zip files contain "eclipse/foo".
-#      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
-#      ;;
-#  esac
-#done
+# Dump the files from the releng tarball into the build root
+for file in $(pwd)/org.python.pydev.releng/results/I.*/*.tar.gz; do
+  case $file in
+    *org.python.pydev*)
+      # The ".." is needed since the zip files contain "eclipse/foo".
+      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
+      ;;
+  esac
+done
 
 %if %{gcj_support}
 aot-compile-rpm
@@ -168,12 +133,18 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3-16fc
+- Rebuild older, buildable, version for fc6-test2.
+
 * Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 1.0.8-3fc
 - Rebuild.
 
 * Mon Jun 05 2006 Igor Foox <ifoox at redhat.com> 1.0.8-1fc
 - Building upstream version 1.0.8 backported to Java 1.4.
 
+* Tue Apr 04 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-15
+- Add ia64.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-14
 - Build against 3.1.2.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Jun 2006 18:38:56 -0000	1.6
+++ sources	20 Jul 2006 14:40:03 -0000	1.7
@@ -1 +1 @@
-55064b5934b569ef6c9d19dd0037051d  eclipse-pydev-fetched-1.0.8.tar.gz
+82d262473b1c7e789938225e0304f00d  eclipse-pydev-fetched-HEAD-0.9.3.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:48:58 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.21,1.22
Message-ID: <200607201448.k6KEmwLJ021379@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21355

Modified Files:
	eclipse-pydev.spec 
Log Message:
Switch to versionless pde.build plugin


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- eclipse-pydev.spec	20 Jul 2006 14:40:03 -0000	1.21
+++ eclipse-pydev.spec	20 Jul 2006 14:48:56 -0000	1.22
@@ -90,7 +90,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
     -DdontFetchAnything=true 
 popd
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 14:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 10:49:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2427,1.2428
Message-ID: <200607201449.k6KEnURU021603@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21575

Modified Files:
	kernel-2.6.spec 
Log Message:
next guess at fixing xen debuginfo problems


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2427
retrieving revision 1.2428
diff -u -r1.2427 -r1.2428
--- kernel-2.6.spec	20 Jul 2006 14:12:16 -0000	1.2427
+++ kernel-2.6.spec	20 Jul 2006 14:49:27 -0000	1.2428
@@ -1277,6 +1277,8 @@
   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 ..
+  mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+  mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/
 %endif
 %endif
 
@@ -1362,6 +1364,9 @@
 %endif\
 /usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
 /usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
+%if "%{?2}" == "xen" \
+/usr/lib/debug/boot/xen-syms-%{KVERREL}.debug\
+%endif\
 %endif\
 %endif\
 %{nil}
@@ -1695,6 +1700,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Juan Quintela <quintela at redhat.com>
+- Fix to get xen debug info files in the right position.
+
 * Thu Jul 20 2006 Don Zickus <dzickus at redhat.com>
 - apparently I was wrong and was fixed already
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 15:03:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 11:03:01 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.36,1.37
Message-ID: <200607201503.k6KF31VR026029@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25973

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Thu Jul 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-3
- Mass rebuild for FC6 test2.



Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- eclipse-changelog.spec	20 Jun 2006 21:48:14 -0000	1.36
+++ eclipse-changelog.spec	20 Jul 2006 15:02:58 -0000	1.37
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        1
+Release:        3
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-3
+- Mass rebuild for FC6 test2.
+
 * Tue Jun 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-1
 - Updated to version 2.1.0.
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 15:43:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 11:43:34 -0400
Subject: rpms/bsf/devel bsf.spec,1.10,1.11
Message-ID: <200607201543.k6KFhYvI020612@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20504

Modified Files:
	bsf.spec 
Log Message:

- Added conditional native compilation.
- From gbenson at redhat:
-   Build without Jython or Rhino for now.
-   Build with servletapi5.
-   Avoid Sun-specific classes.




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bsf.spec	5 Jun 2006 22:52:17 -0000	1.10
+++ bsf.spec	20 Jul 2006 15:43:31 -0000	1.11
@@ -1,28 +1,70 @@
-%define name		bsf
-%define version		2.3.0
-%define release 6jpp_4fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}
+Name:		bsf
+Version:	2.3.0
+Release:	10jpp_1fc
 Epoch:		0
 Summary:        Bean Scripting Framework
 License:        Apache License
 Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
+Vendor:         JPackage Project
+Distribution:	JPackage
+#http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
 Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
-Patch1:		bsf-javac.patch
+Patch1:			%{name}-javac.patch
 BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:  ant
-BuildRequires:	servletapi5
-BuildRequires:  xalan-j2
+BuildRequires:	servlet
 BuildRequires:	tomcat5-jsp-2.0-api
-Requires:	servletapi5
-Requires:	xalan-j2
-Requires: 	tomcat5-jsp-2.0-api
+BuildRequires:  xalan-j2
+Requires:		servletapi5
+Requires:		xalan-j2
+Requires:		tomcat5-jsp-2.0-api
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
+%endif
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
@@ -53,61 +95,81 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
+%{__rm} -fr %{buildroot}
 %setup -q
-%patch1 -p1
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.zip" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
-find . -name "*.tar.gz" -exec rm -f {} \;
-rmdir $RPM_BUILD_DIR/bsf
+find . -name "*.jar" -exec %{__rm} -f {} \;
+%{__rm} -fr bsf
+
+%patch1 -p1
 
 %build
-export CLASSPATH=`build-classpath xalan-j2 servletapi5 jspapi`
+[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
+export CLASSPATH=$(build-classpath xalan-j2 servlet jspapi)
 cd src
 ant realclean
 ant compile
-rm -rf bsf/src/org/apache/bsf/engines/java
+%{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
 %install
 # jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 src/build/lib/%{name}.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
+%{__install} -d -m 755 %{buildroot}%{_javadir}
+%{__install} -m 644 src/build/lib/%{name}.jar \
+%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr src/build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
-
-# docs
-cp -f src/{AUTHORS,BUILDING,CHANGES,CHANGES.old,INSTALL,README,TODO} .
+%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr src/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
+%{__rm} -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ $1 -eq 0 ]; then
-  rm -f %{_javadocdir}/%{name}
+  %{__rm} -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
-%doc license.txt AUTHORS BUILDING CHANGES CHANGES.old INSTALL README TODO
+%doc license.txt src/AUTHORS src/BUILDING src/CHANGES src/CHANGES.old src/INSTALL src/README src/TODO
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %dir %{_javadocdir}/%{name}-%{version}
@@ -115,34 +177,21 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
-* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.3.0-6jpp_4fc
-- Add missing Requires/BuildRequires for tomcat5-jsp-2.0-api and others.
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.3.0-6jpp_3fc
-- stop scriptlet spew
-
-* 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
-
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> 0:2.3.0-6jpp_2fc
-- Remove classes and tarballs from the tarball too.
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:2.3.0-6jpp_1fc
-- Build into Fedora.
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-10jpp_1fc
+- Added conditional native compilation.
+- From gbenson at redhat:
+-   Build without Jython or Rhino for now.
+-   Build with servletapi5.
+-   Avoid Sun-specific classes.
 
-* Wed Jun  8 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles and zipfiles from the tarball.
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com>  0:2.3.0-9jpp
+- First JPP 1.7 build
 
-* Thu Jun  2 2005 Gary Benson <gbenson at redhat.com>
-- Build without Jython or Rhino for now.
-- Build with servletapi5.
-- Avoid Sun-specific classes.
+* Wed Nov 3 2004 Nicolas Mailhot <nim at jpackage.org>  0:2.3.0-8jpp
+- Clean up specfile a bit
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.3.0-6jpp_1rh
-- RH vacuuming
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:2.3.0-7jpp
+- Build with ant-1.6.2
 
 * Thu Oct 09 2003 David Walluck <david at anti-microsoft.org> 0:2.3.0-6jpp
 - add javadoc symlinks



From fedora-cvs-commits at redhat.com  Thu Jul 20 16:13:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 12:13:59 -0400
Subject: rpms/antlr/devel antlr.spec,1.19,1.20
Message-ID: <200607201613.k6KGDx26012035@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11972

Modified Files:
	antlr.spec 
Log Message:

- From gbenson at redhat:
-   Omit the jedit subpackage to fix dependencies.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- antlr.spec	19 Jul 2006 19:41:20 -0000	1.19
+++ antlr.spec	20 Jul 2006 16:13:57 -0000	1.20
@@ -31,6 +31,7 @@
 %define _with_gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define build_jedit  %{?_with_jedit:1}%{!?_without_jedit:0}
 
 %define section free
 %define native  %{?_with_native:1}%{!?_without_native:0}
@@ -38,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -111,6 +112,7 @@
 %description    javadoc
 Javadoc for %{name}.
 
+%if %{build_jedit}
 %package        jedit
 Group:          Text Editors
 Summary:        ANTLR mode for jEdit
@@ -121,7 +123,7 @@
 %{_datadir}/jedit/modes/catalog:
 
   <MODE NAME="antlr" FILE="antlr.xml" FILE_NAME_GLOB="*.g"/>
-
+%endif
 
 %prep
 %setup -q
@@ -170,9 +172,11 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # jedit mode
+%if %{build_jedit}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/jedit/modes
 cp -p extras/antlr-jedit.xml $RPM_BUILD_ROOT%{_datadir}/jedit/modes/antlr.xml
 %endif
+%endif
 
 
 %if %{gcj_support}
@@ -266,13 +270,19 @@
 %doc %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
+%if %{build_jedit}
 %files jedit
 %defattr(0644,root,root,0755)
 %{_datadir}/jedit/modes/*
 %endif
+%endif
 
 
 %changelog
+* Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_2fc
+- From gbenson at redhat:
+-   Omit the jedit subpackage to fix dependencies. 
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_1fc
 - Added conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 16:34:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 12:34:40 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, NONE,
	1.1 openoffice.org.spec, 1.778, 1.779
Message-ID: <200607201634.k6KGYeX3000828@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv779

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
Log Message:
future proof OOo against new gcj libjvm

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    5 +++++
 plugins/sunmajor/pluginlib/gnujre.cxx        |    0 
 2 files changed, 5 insertions(+)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch ---
Index: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.7
diff -u -r1.7 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	20 Jul 2006 16:33:05 -0000
@@ -63,6 +63,11 @@
 char const* const* GnuInfo::getRuntimePaths(int * size)
 {
     static char const* ar[]= {
+#ifdef WNT
+          "/bin/client/jvm.dll",
+#elif UNX
+          "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+#endif
 #ifdef X86_64
           "/lib64/libgcj.so.7",
           "/lib64/libgcj.so.6"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- openoffice.org.spec	20 Jul 2006 11:33:52 -0000	1.778
+++ openoffice.org.spec	20 Jul 2006 16:34:38 -0000	1.779
@@ -115,6 +115,7 @@
 Patch49: openoffice.org.2.0.3.gcc28409.anonymousexternc.patch
 Patch50: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 Patch51: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+Patch52: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -857,6 +858,7 @@
 %patch49 -p1 -b .gcc28409.anonymousexternc.patch
 %patch50 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
 %patch51 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
+%patch52 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
 
 tar xzf %{SOURCE1}
 
@@ -3337,6 +3339,7 @@
 %changelog
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
+- add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Thu Jul 20 16:45:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 12:45:40 -0400
Subject: rpms/bsh/devel bsh.spec,1.6,1.7
Message-ID: <200607201645.k6KGjejK004762@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4491

Modified Files:
	bsh.spec 
Log Message:

Add conditional native compilation.




Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bsh.spec	12 Jul 2006 05:29:21 -0000	1.6
+++ bsh.spec	20 Jul 2006 16:45:38 -0000	1.7
@@ -1,27 +1,66 @@
-%define name		bsh
-%define Name		BeanShell
-%define version		1.3.0
-%define fversion	1.3.0
-%define release 5jpp_1fc.1.1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: %{release}.1.1
+Name:           bsh
+Version:        1.3.0
+Release:        8jpp_1fc
 Epoch:		0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
-Source0:        %{name}-%{fversion}-src.tar.bz2
+Source0:        %{name}-%{version}-src.tar.bz2
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-readline.patch
+BuildRequires:  ant, bsf, perl
 Requires:	bsf
-Requires:	jpackage-utils >= 0:1.5
-BuildRequires:  ant bsf
+Requires:	jpackage-utils >= 0:1.6
 #BuildRequires:  libreadline-java
 Url:            http://www.beanshell.org/
 Group:          Development/Java
+%if ! %{gcj_support}
 Buildarch:      noarch
+%endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
+Distribution:   JPackage
+Vendor:         JPackage Project
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 BeanShell is a small, free, embeddable, Java source interpreter with
@@ -68,7 +107,7 @@
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{Name}
+%setup -q -n BeanShell
 %patch0 -p1
 #%patch1 -p1
 find . -name "*.jar" -exec rm -f {} \;
@@ -92,7 +131,7 @@
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}-%{fversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # manual
 find docs -name ".cvswrappers" -exec rm -f {} \;
@@ -165,9 +204,29 @@
 EOF
 cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc src/Changes.html src/License.txt src/README.txt
@@ -176,6 +235,10 @@
 %{_javadir}/*
 %dir %{_datadir}/%{name}
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files manual
 %defattr(-,root,root)
 %doc docs/*
@@ -189,18 +252,14 @@
 %{_datadir}/%{name}/*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.0-5jpp_1fc.1.1.1.1
-- rebuild
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.3.0-8jpp_1fc
+- Add conditional native compilation.
 
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> 0:1.3.0-5jpp_1fc
-- Build into Fedora.
+* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.3.0-7jpp
+- First JPP-1.7 release
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.3.0-5jpp_1rh
-- RH vacuuming
-- added bsf build-prereq
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:1.3.0-6jpp
+- Build with ant-1.6.2
 
 * Mon Jan 26 2004 David Walluck <david at anti-microsoft.org> 0:1.3.0-5jpp
 - really drop readline patch



From fedora-cvs-commits at redhat.com  Thu Jul 20 17:02:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 13:02:53 -0400
Subject: rpms/python/devel python-2.4.3-cflags.patch, NONE, 1.1 python.spec,
	1.84, 1.85
Message-ID: <200607201702.k6KH2rbP032410@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32392

Modified Files:
	python.spec 
Added Files:
	python-2.4.3-cflags.patch 
Log Message:
Fixed bug #199373 (on some platforms CFLAGS is needed when linking)

python-2.4.3-cflags.patch:
 Makefile.pre.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.4.3-cflags.patch ---
--- Python-2.4.3/Makefile.pre.in.BAD	2006-07-13 18:22:35.000000000 -0400
+++ Python-2.4.3/Makefile.pre.in	2006-07-13 18:22:55.000000000 -0400
@@ -309,7 +309,7 @@
 
 # Build the interpreter
 $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
-		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+		$(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
 			Modules/$(MAINOBJ) \
 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- python.spec	17 Jul 2006 13:14:06 -0000	1.84
+++ python.spec	20 Jul 2006 17:02:51 -0000	1.85
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -43,6 +43,7 @@
 Patch15: python-2.4.1-canonicalize.patch
 Patch16: python-2.4-gen-assert.patch
 Patch17: python-2.4-webbrowser.patch
+Patch18: python-2.4.3-cflags.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -150,6 +151,7 @@
 %patch15 -p1 -b .canonicalize
 %patch16 -p2 -b .gen-assert
 %patch17 -p0 -b .web-browser
+%patch18 -p1 -b .cflags
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -392,6 +394,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Thu Jul 20 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-13
+- Fixed bug #199373 (on some platforms CFLAGS is needed when linking)
+
 * Mon Jul 17 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-12
 - added dist tag back
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 17:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 13:52:41 -0400
Subject: rpms/gstreamer/devel .cvsignore, 1.21, 1.22 gstreamer.spec, 1.55,
	1.56 sources, 1.22, 1.23
Message-ID: <200607201752.k6KHqfh9022513@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22336

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
- Update to upstream 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Jun 2006 13:37:05 -0000	1.21
+++ .cvsignore	20 Jul 2006 17:52:38 -0000	1.22
@@ -1 +1,2 @@
 gstreamer-0.10.8.tar.bz2
+gstreamer-0.10.9.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gstreamer.spec	19 Jul 2006 06:27:32 -0000	1.55
+++ gstreamer.spec	20 Jul 2006 17:52:38 -0000	1.56
@@ -5,8 +5,8 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.8
-Release: 	4
+Version: 	0.10.9
+Release: 	1
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.9-1
+- Update to new upstream version
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.8-4
 - Re-add the gstreamer-plugins-good dependency
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Jun 2006 13:37:06 -0000	1.22
+++ sources	20 Jul 2006 17:52:38 -0000	1.23
@@ -1 +1 @@
-a094ea86d4cea4f23ef2eb8c6e7bfc10  gstreamer-0.10.8.tar.bz2
+e59aaced7000ddfdaa81c52b9a238786  gstreamer-0.10.9.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 20 17:54:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 13:54:54 -0400
Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.5,
	1.6 gstreamer-plugins-base.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200607201754.k6KHss6x023521@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23437

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Log Message:
- Update to upstream 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 May 2006 03:41:42 -0000	1.5
+++ .cvsignore	20 Jul 2006 17:54:52 -0000	1.6
@@ -1 +1,2 @@
 gst-plugins-base-0.10.7.tar.bz2
+gst-plugins-base-0.10.9.tar.bz2


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gstreamer-plugins-base.spec	12 Jul 2006 06:15:19 -0000	1.13
+++ gstreamer-plugins-base.spec	20 Jul 2006 17:54:52 -0000	1.14
@@ -4,8 +4,8 @@
 %define         _gst            0.10.6
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.7
-Release:  	1.1	
+Version: 	0.10.9
+Release:  	1	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -190,6 +190,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.9-1
+- Update to 0.10.9
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2006 03:41:42 -0000	1.6
+++ sources	20 Jul 2006 17:54:52 -0000	1.7
@@ -1 +1 @@
-d66b09de993aefd22d8fc341e5f50521  gst-plugins-base-0.10.7.tar.bz2
+cf0aa58f066c3a0e0258909b3ad9d4ad  gst-plugins-base-0.10.9.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 20 17:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 13:56:53 -0400
Subject: rpms/dbus-python/devel dbus-python.spec,1.6,1.7
Message-ID: <200607201756.k6KHurhg024351@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dbus-python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24304

Modified Files:
	dbus-python.spec 
Log Message:
fix improper obsoletes


Index: dbus-python.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dbus-python.spec	18 Jul 2006 21:28:06 -0000	1.6
+++ dbus-python.spec	20 Jul 2006 17:56:50 -0000	1.7
@@ -7,7 +7,7 @@
 Summary: D-Bus Python Bindings 
 Name: dbus-python
 Version: 0.70
-Release: 4 
+Release: 5 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: dbus-python-0.70-fix-binary-modules-dir.patch
@@ -17,7 +17,6 @@
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: Pyrex >= %{pyrex_version}
-Obsoletes: dbus-python < 0.90
 
 %description
 
@@ -48,6 +47,9 @@
 %{python_sitearch}/dbus/*.py*
 
 %changelog
+* Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.70-5
+- Remove unnecessary obsoletes
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.70-4
 - Try python_sitearch this time
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 17:58:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 13:58:16 -0400
Subject: rpms/dbus-glib/devel dbus-glib.spec,1.5,1.6
Message-ID: <200607201758.k6KHwGX9024940@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dbus-glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24913

Modified Files:
	dbus-glib.spec 
Log Message:
fix improper obsoletes


Index: dbus-glib.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbus-glib.spec	18 Jul 2006 19:36:50 -0000	1.5
+++ dbus-glib.spec	20 Jul 2006 17:58:13 -0000	1.6
@@ -8,7 +8,7 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.70
-Release: 3 
+Release: 4
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0: dbus-glib-0.70-fix-includes.patch
@@ -26,7 +26,6 @@
 BuildRequires: gettext
 BuildRequires: autoconf
 
-Obsoletes: dbus-glib < 0.90
 
 %description
 
@@ -112,6 +111,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.70-4
+- remove improper obsoletes
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.70-3
 - Pregenerate the xml introspect file so you don't need dbus running during
   the build 



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:05:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:05:50 -0400
Subject: rpms/kernel/devel Makefile.config, 1.44, 1.45 kernel-2.6.spec,
	1.2428, 1.2429
Message-ID: <200607201805.k6KI5oeN026299@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26279

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
xenPAE code is history


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Makefile.config	19 Jul 2006 23:44:31 -0000	1.44
+++ Makefile.config	20 Jul 2006 18:05:47 -0000	1.45
@@ -12,7 +12,6 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
-	$(CFG)-i686-xen-PAE.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -130,9 +129,6 @@
 kernel-$(VERSION)-i686-xen.config: configs/config-i686-PAE temp-x86-xen-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xen-PAE.config: configs/config-i686-PAE temp-x86-xen-generic
-	perl merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-x86_64-xen.config: configs/config-x86_64 temp-x86_64-xen-generic
 	perl merge.pl $^ x86_64 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2428
retrieving revision 1.2429
diff -u -r1.2428 -r1.2429
--- kernel-2.6.spec	20 Jul 2006 14:49:27 -0000	1.2428
+++ kernel-2.6.spec	20 Jul 2006 18:05:47 -0000	1.2429
@@ -10,7 +10,6 @@
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
-%define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
 %define buildheaders 0
@@ -67,11 +66,6 @@
 %define buildkdump 1
 %endif
 
-# ... and XenPAE only on i686
-%ifnarch i686
-%define buildxenPAE 0
-%endif
-
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch ppc64iseries i686
@@ -243,7 +237,6 @@
 Source33: kernel-%{kversion}-i686-xen.config
 Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
-Source36: kernel-%{kversion}-i686-xen-PAE.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -607,41 +600,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package xen-PAE
-Summary: The Linux kernel compiled for Xen VM operations with PAE support
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
-Prereq: %{kernel_prereq}
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# the hypervisor kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReq: no
-AutoProv: yes
-
-%description xen-PAE
-This package includes a version of the Linux kernel which runs in Xen
-VM with PAE. It works for both priviledged and unpriviledged guests.
-
-%package xen-PAE-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xen-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xen-PAE
-Prereq: /usr/bin/find
-
-%description xen-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
 
@@ -1267,13 +1225,7 @@
 %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 ..
@@ -1297,10 +1249,6 @@
 %endif
 
 %if %{includexen}
-%if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz xen-PAE
-%endif
-
 %if %{buildxen}
 BuildKernel vmlinuz vmlinuz xen
 %endif
@@ -1486,23 +1434,6 @@
   popd > /dev/null
 fi
 
-%post xen-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen-PAE
-if [ -e /proc/xen/xsd_kva ]; then
-	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen-PAE
-else
-	/sbin/new-kernel-pkg --package kernel-xen-PAE --mkinitrd --depmod --install %{KVERREL}xen-PAE
-fi
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen-PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
@@ -1530,10 +1461,6 @@
 %preun xen
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
-%preun xen-PAE
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen-PAE
-
-
 ###
 ### file lists
 ###
@@ -1639,31 +1566,6 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
-%build_debuginfo boot xen-PAE -PAE
-%files xen-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen-PAE
-/boot/System.map-%{KVERREL}xen-PAE
-/boot/symvers-%{KVERREL}xen-PAE.gz
-/boot/symsets-%{KVERREL}xen-PAE.tar.gz
-/boot/config-%{KVERREL}xen-PAE
-/boot/xen.gz-%{KVERREL}-PAE
-/boot/xen-syms-%{KVERREL}-PAE
-%dir /lib/modules/%{KVERREL}xen-PAE
-/lib/modules/%{KVERREL}xen-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen-PAE/build
-/lib/modules/%{KVERREL}xen-PAE/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen-PAE/extra
-/lib/modules/%{KVERREL}xen-PAE/updates
-/lib/modules/%{KVERREL}xen-PAE/weak-updates
-
-%files xen-PAE_devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen-PAE-%{_target_cpu}
-%endif
 %endif
 
 %if %{buildkdump}
@@ -1700,6 +1602,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Juan Quintela <quintela at anano.mitica>
+- remove xenPAE option, as now the i686 xen kernel is PAE.
+
 * Thu Jul 20 2006 Juan Quintela <quintela at redhat.com>
 - Fix to get xen debug info files in the right position.
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:20:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:20:29 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.22,1.23
Message-ID: <200607201820.k6KIKTXI013769@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13743

Modified Files:
	eclipse-pydev.spec 
Log Message:
* Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3_fc-16
- Fix upgrade path from fc5.



Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- eclipse-pydev.spec	20 Jul 2006 14:48:56 -0000	1.22
+++ eclipse-pydev.spec	20 Jul 2006 18:20:27 -0000	1.23
@@ -20,8 +20,8 @@
 
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
-Version: 	%{version_majmin}.%{version_micro}
-Release:	16fc
+Version: 	%{version_majmin}.%{version_micro}_fc
+Release:	16
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -133,6 +133,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3_fc-16
+- Fix upgrade path from fc5.
+
 * Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3-16fc
 - Rebuild older, buildable, version for fc6-test2.
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:38:08 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.203,1.204
Message-ID: <200607201838.k6KIc8vi019295@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19171

Modified Files:
	kdebase.spec 
Log Message:
- disable dbus support temporary, dbus-0.90 seems broken!
  enable it again when the bug is fixed




Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- kdebase.spec	20 Jul 2006 12:28:07 -0000	1.203
+++ kdebase.spec	20 Jul 2006 18:38:01 -0000	1.204
@@ -166,14 +166,16 @@
 %patch8 -p1 -b .logo
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-%patch12 -p1 -b .kioslave_media_dbus
-%patch13 -p1 -b .dbus
+## disable dbus support temporary, dbus-0.90 seems broken!
+## enable again when the bug is fixed
+#%patch12 -p1 -b .kioslave_media_dbus
+#%patch13 -p1 -b .dbus
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
-%patch19 -p1 -b .fuser
+#%patch19 -p1 -b .fuser
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 
@@ -189,7 +191,6 @@
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449
 
-
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:38:16 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.4, 1.5 setroubleshoot.spec,
	1.6, 1.7 sources, 1.6, 1.7
Message-ID: <200607201838.k6KIcFVW019343@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19309/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.9-1 on branch devel from setroubleshoot-0.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jul 2006 20:22:42 -0000	1.4
+++ .cvsignore	20 Jul 2006 18:38:12 -0000	1.5
@@ -1 +1 @@
-setroubleshoot-0.8.tar.gz
+setroubleshoot-0.9.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setroubleshoot.spec	19 Jul 2006 20:22:42 -0000	1.6
+++ setroubleshoot.spec	20 Jul 2006 18:38:12 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.8
+Version: 0.9
 Release: 1
 License: GPL
 Group: Applications/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jul 2006 20:22:42 -0000	1.6
+++ sources	20 Jul 2006 18:38:12 -0000	1.7
@@ -1 +1 @@
-69a6ff3f48ebc58e92d8b5872db35840  setroubleshoot-0.8.tar.gz
+7cf0bad535fc7c3e778340efd96dc0f2  setroubleshoot-0.9.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:40:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:40:17 -0400
Subject: rpms/bind/devel bind.spec, 1.114, 1.115 named.init, 1.43,
	1.44 named.sysconfig, 1.3, 1.4
Message-ID: <200607201840.k6KIeHjX019933@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19895

Modified Files:
	bind.spec named.init named.sysconfig 
Log Message:
update to auto-enable of D-BUS if NetworkManager enabled


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- bind.spec	19 Jul 2006 19:35:24 -0000	1.114
+++ bind.spec	20 Jul 2006 18:40:14 -0000	1.115
@@ -676,7 +676,6 @@
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
-%{_libdir}/libbind.so
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.init,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- named.init	19 Jul 2006 18:46:43 -0000	1.43
+++ named.init	20 Jul 2006 18:40:14 -0000	1.44
@@ -64,13 +64,6 @@
    fi;
 fi;
 
-NetworkManagerEnabled=0
-for l in 0 1 2 3 4 5 6; do 
-    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
-	NetworkManagerEnabled=1; 
-    fi; 
-done
-
 dbusEnabled=0;
 for a in $OPTIONS; do
     if [ $a  = "-D" ]; then
@@ -78,9 +71,17 @@
     fi;
 done
 
-if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then
-   OPTIONS="$OPTIONS -D";
-   dbusEnabled=1;
+if [ $dbusEnabled -eq 0 ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
+    NetworkManagerEnabled=0
+    for l in 0 1 2 3 4 5 6; do 
+	if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
+	    NetworkManagerEnabled=1; 
+	fi; 
+    done
+    if [ $NetworkManagerEnabled -eq 1 ]; then
+	OPTIONS="$OPTIONS -D";
+    fi;
+    dbusEnabled=1;
 fi
 
 start() {


Index: named.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- named.sysconfig	17 Feb 2005 06:43:28 -0000	1.3
+++ named.sysconfig	20 Jul 2006 18:40:14 -0000	1.4
@@ -21,3 +21,9 @@
 # ENABLE_SDB=yes         --  This enables use of 'named_sdb', which has support
 #		         --  for the ldap, pgsql and dir zone database backends
 #		         --  compiled in, to be used instead of named.
+#
+# DISABLE_NAMED_DBUS=[1y]--  If NetworkManager is enabled in any runlevel, then 
+# 			     the initscript will by default enable named's D-BUS
+#			     support with the named -D option. This setting disables
+#			     this behavior.
+#



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:52:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:52:08 -0400
Subject: rpms/pykickstart/devel .cvsignore, 1.32, 1.33 pykickstart.spec, 1.33,
	1.34 sources, 1.34, 1.35
Message-ID: <200607201852.k6KIq8ZF006581@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6535

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	20 Jun 2006 20:47:00 -0000	1.32
+++ .cvsignore	20 Jul 2006 18:52:06 -0000	1.33
@@ -21,3 +21,4 @@
 pykickstart-0.29.tar.gz
 pykickstart-0.30.tar.gz
 pykickstart-0.31.tar.gz
+pykickstart-0.32.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pykickstart.spec	20 Jun 2006 20:47:00 -0000	1.33
+++ pykickstart.spec	20 Jul 2006 18:52:06 -0000	1.34
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.31
+Version: 0.32
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,10 @@
 /usr/share/locale/*/*/*
 
 %changelog
+* Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 0.32-1
+- Limit --bootproto to what anaconda supports.
+- Add --noipv4 and --noipv6 network options.
+
 * Tue Jun 20 2006 Chris Lumens <clumens at redhat.com> 0.31-1
 - Handle nfs --opts (katzj).
 - RAID devices should be integers instead of strings (#176537).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	20 Jun 2006 20:47:00 -0000	1.34
+++ sources	20 Jul 2006 18:52:06 -0000	1.35
@@ -1 +1 @@
-5cf3759c08c93a44fc8dd4db30e96a7b  pykickstart-0.31.tar.gz
+e639f2f8b1cbc057b6bf113279840e7f  pykickstart-0.32.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 18:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 14:52:19 -0400
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.7,1.8
Message-ID: <200607201852.k6KIqJEi006732@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6675

Modified Files:
	setroubleshoot.spec 
Log Message:
Fix spec


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- setroubleshoot.spec	20 Jul 2006 18:38:12 -0000	1.7
+++ setroubleshoot.spec	20 Jul 2006 18:52:17 -0000	1.8
@@ -86,6 +86,9 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Tue Jul 20 2006 Dan Walsh <dwalsh at redhat.com> - 0.9-1
+- Additional Plugins plus a lot of cleanup 
+
 * Mon Jul 19 2006 Dan Walsh <dwalsh at redhat.com> - 0.8-1
 - Added a bunch more plugins
 - From 2006-07-19  Karl MacMillan  <kmacmill at localhost.localdomain>



From fedora-cvs-commits at redhat.com  Thu Jul 20 19:00:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 15:00:11 -0400
Subject: rpms/tcl/devel tcl-8.4.13-cflags.patch,NONE,1.1 tcl.spec,1.22,1.23
Message-ID: <200607201900.k6KJ0Bwj009811@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9763

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.4.13-cflags.patch 
Log Message:
- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199375)


tcl-8.4.13-cflags.patch:
 tcl8.4.13/unix/tcl.m4 |    2 +-
 tk8.4.13/unix/tcl.m4  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tcl-8.4.13-cflags.patch ---
--- tcl8.4.13/unix/tcl.m4.BAD 2006-07-13 14:05:38.000000000 -0400
+++ tcl8.4.13/unix/tcl.m4  2006-07-13 14:07:58.000000000 -0400
@@ -1340,7 +1340,7 @@
       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
       if test "$have_dl" = yes; then
-     SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+     SHLIB_LD='${CC} $(CFLAGS) -shared -Wl,-soname,${@}'
      DL_OBJS="tclLoadDl.o"
      DL_LIBS="-ldl"
      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--- tk8.4.13/unix/tcl.m4.BAD  2006-07-13 13:57:14.000000000 -0400
+++ tk8.4.13/unix/tcl.m4   2006-07-13 13:57:26.000000000 -0400
@@ -1340,7 +1340,7 @@
       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
       if test "$have_dl" = yes; then
-     SHLIB_LD="${CC} -shared"
+     SHLIB_LD="${CC} $(CFLAGS) -shared"
      DL_OBJS="tclLoadDl.o"
      DL_LIBS="-ldl"
      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tcl.spec	12 Jul 2006 17:02:04 -0000	1.22
+++ tcl.spec	20 Jul 2006 19:00:09 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 1.2
+Release: 2%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -16,6 +16,7 @@
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
 Patch4: tcl-8.4-no_rpath.patch
 Patch5: tcl-8.4.13-autoconf.patch
+Patch6: tcl-8.4.13-cflags.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -66,6 +67,7 @@
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 %patch5 -p1 -b .5-ac213
+%patch6 -p1 -b .6-cflags
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
@@ -148,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-2
+- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199375)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-1.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 19:01:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 15:01:17 -0400
Subject: rpms/gcc/devel gcc41-java-backport.patch.bz2, NONE,
	1.1 gcc41-java-backport2.patch, NONE,
	1.1 gcc41-java-libdotdotlib.patch, NONE,
	1.1 gcc41-java-plugins.patch, NONE, 1.1 gcc41-pr28407.patch,
	NONE, 1.1 .cvsignore, 1.160, 1.161 gcc41-java-pr13212.patch,
	1.1, 1.2 gcc41-pr26885.patch, 1.1, 1.2 gcc41.spec, 1.81,
	1.82 sources, 1.162, 1.163 gcc41-checking-identifier.patch,
	1.1, NONE gcc41-duplicate-eh.patch, 1.1,
	NONE gcc41-pr27889.patch, 1.1, NONE gcc41-pr28150.patch, 1.1,
	NONE gcc41-pr28170.patch, 1.1, NONE gcc41-pr28390.patch, 1.1,
	NONE gcc41-reassoc1.patch, 1.1, NONE gcc41-reassoc2.patch, 1.1,
	NONE gcc41-reassoc3.patch, 1.1, NONE gcc41-reassoc4.patch, 1.1,
	NONE gcc41-reassoc5.patch, 1.1, NONE gcc41-rh198849.patch, 1.1,
	NONE gcc41-testsuite-scantree.patch, 1.1, NONE
Message-ID: <200607201901.k6KJ1HE3009887@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9836

Modified Files:
	.cvsignore gcc41-java-pr13212.patch gcc41-pr26885.patch 
	gcc41.spec sources 
Added Files:
	gcc41-java-backport.patch.bz2 gcc41-java-backport2.patch 
	gcc41-java-libdotdotlib.patch gcc41-java-plugins.patch 
	gcc41-pr28407.patch 
Removed Files:
	gcc41-checking-identifier.patch gcc41-duplicate-eh.patch 
	gcc41-pr27889.patch gcc41-pr28150.patch gcc41-pr28170.patch 
	gcc41-pr28390.patch gcc41-reassoc1.patch gcc41-reassoc2.patch 
	gcc41-reassoc3.patch gcc41-reassoc4.patch gcc41-reassoc5.patch 
	gcc41-rh198849.patch gcc41-testsuite-scantree.patch 
Log Message:
4.1.1-10


--- NEW FILE gcc41-java-backport.patch.bz2 ---
BZh91AY&SY???,???????????????cm???[$?III}?T?
???Yv
NM??
??u??Pyx?:K???j???s??w???DH?6??-?uG??

?]h{??d$_^?^???a-W???kA??@??????6?????o}?ov??????}??????4?j7v!%]gA?w??
r??a@?
P?B=??W8?meY?}[?6?
??(?????????=?{?]??eU?ou???????s?)??v6?x?:fs=w????????k?/k?G????5{?V<?????k?qm?[??
??4?;????U?n???:??q?h^'T:wKvV??k2????$?oq?v?????]85??`??????|???|^????}??b???????eS????????JZQ???????k??{?q?7???4????=????[?n??{b??oMu????f??f2?[???u;w???nu??????/??????????/??????}????u???????o?a???N?????]?????{?????:??Uk??V?'?????g????
i??&?&?MT?5T???OI?z???T?C?i??hC???*M???l?H+ ??A!n1?d"?H*H+"?A at R"??H??a	&?0
?!# ??$??A??? DE?Y$?*? ?2B?(*?DH??\*(??"?QXDBE
6m)Mv??,.?JY?^??K?sM????SgS6?XKJ8\??J???????)?kE[kc%c2?B?M&
>x???????B??S???????????????????T?g???h???fV?/w?????!?@?3??????u?O???il??1?jNvA???a??x~????????S-i???,d?-???d?Q@?b?????D??????$5?c?2?a.?D????Q???H???-?l??o??a-???h?G???S?9@???IAZ?-????i????H
e?	m*A at j	U?????`(
1i)m??X??	??????	Y?	p???Di?$??2?XFO4`????L?a?G??
?)	xU1Gsd2???
?.?iS????%%c8MH[??W	o?nY??b??
[R?X??o)???????
jLB?xb??K??
~??HN?-	???3Js??k?hda?ur
2F?de?t1???%?UD6?????4?CAY?G,??*kM?????????d?[?Y!5F'+%??????]?6??k\h?!1?
??Ry?!?F????8XFm, at iX??[!?BP??X??????4?A???dR??0??ta?
r??2?	?4P?B?':???????4+?/???p?"6???{_(?{2?????'????w??s???&ZW??0Ip???TS?2Z?Wc???????i????????V%????>??Rc???L??<???%?Z???\A????????/??I?~?3y?K?CB6g??/?S"?wF??b??El?))??zN=D L?P?&I?zq????)H??R?,?*?A*????H$????7?????[}z=J???q"IM????????`??X?c??_???A??B?????L????;?????
F+?Ns?d?,(C?aWV@?w??h?k??bWYf?
.6RZ{a??)|?S??yP?!????KP3??????6??o???)a?qo+1?fZ!?>qK?[f??f????55?????"ZR????(??????m? ???vf??j??`v?C4V??	?%?????$?!??~?i?_La???????	R?-(4P?$??????BO?????-???R????Ka??oI???\;???Sk+p[?N%???E??b6????x?z???>?{q??7I?:??h??K???/?f/%?????3Z???7s???*?????{#???G??O?6???s?l??/????#T??G)????@?BE?@%??E???>?;i??]w?????K??)?
??N?????????=V?b,??]??o??i???L?q/m?I:??????=???B?#??/_E?4	??a??????qaaQDQ?=\??jf??y??M???N??*??&??????M?x??=q?I????2?<???IG/?Q?6?Y???8????d??4?j8va???t??=z1??L?~~9&??T????R!MXo?|?8???g??
4????b
?
S?
??:?h??????w?:?J????^??K???iX???*??X????q$-??G?????Qj?xJz!?????????)??**
??
?
??v8PP???z
TB?=?u*?????o??P???yA?,???$??"H?:?(Cf^?N?????w??]?n??P?AV?????&?Ot3??????x???l????>??4<??g)	+$&??l?9?PZ???J???m?r??$????j$M??c??g???W??]i?#m?7?XN?5Pg?q&?b??I.?F???^????1?Jh`???+D???<??Q??v????`??n3?_&?3?????y???g?
???	?????[???
????:??9?w?l0?????cM?_9?w?
&???xu?????1?+??XA
?K?????\?\?v??X??x?x????y?]lx???????>?|?'	,OE?$????1=n?
"?fC??^??[g!ho???f ,!?c=Y'????????Tr?*?lpt?50R??R?@?E??Qc?I???????O?T??>??q6N#_?#?=c??	??sP???+?_???H??N?s??6g?+????D????[6??y?%U??,?P?4o?7UJ??AJMG'????7vZg?tY^?L?xW??????????y?-?g!??11}?)???P?4O?;?I???%?5Pv?k?}??????????<??????i??y???X?$!??]?l??HLw???@????
?}<>???o?X^@{?uYU,l?W????tj???i?|????U??Bms?????gB?IQ??!%?T=Q;????f???x??C?_w????rx?]	X???e?"=.??'??????i?&~???$<??Zf?9D!:$&?=n$>??7u?~???T?#??W??????????!QC?|?t???c!????1Y?h? k	???F?W???Civ??Y???A?v4(?s?G??~???o??i"L?'?/>}]?
????????<???o?}}?1? ?,X,((??,
?d??`?X

?u?n??>0*???g????R???????u??jy??)???i??oAS?^?TtW*???????ra???????????t??>?T;$B?_?,?0rb?h?b???mjQ???Q+m-(??\???:?k?s??????"??Se?c'm'`????????Gc???Xe?-M???????Vp??QUD?_~i4????P?g?s????????!U?????D<2M]8?JQ45v?'?]c?"1???o*N?c?W#'???kt?BL$	0????w???x%
?<??|:????(3?eU4??E???%????s??e???W?s2p????f??BnOo
????uU5????????j_???0IA?

??
!????N??w???R?,?#s%B??;??WWg"?P??N??s?.??e?y?4k!??/????g??W????????f??8?@?A?H3??:?N	D???l~???m??Xr?.?4Skp?NaH?%W?"|?"?t?a?(?rr.??N??d??F??J+??,?[??t>d*L#eJG_?q?h???|c????#c,?2w????!???u?????1R$s??Igc?]?t?5|??BH?F>?8C$????O??|'OJ???K\^?&I?????
?"?d????S???vtet??
?
?d?2?Z??C%??M?3M?4???O??^R???1?E??U_)1i??_?n??}n??
?pA?$??\?
z????:??B??p?(??J?k?w??A??T?00V?uA/???tJq?????o?)(\?7?=3?
?zD>????m???3*?
h9???9??????x???)??5!?n???)????m???L????????w/??z?~C
???^?????
0?m&???.?+??I???N?K????V at J?=Q??w?d???(W???r??|???_G???Sk?:?O??????????)i?{(Cf?r??g?:?K'?Mr??,~|?M??x??_?????$??}???e???}?z? V?v5??????N]*C]?<?????F|???{?3?)?zv-V?Z/ZyO?&??"E?4&??-@?@??????L@??

?4;.????+uw9W~[????????t????????6#?x??????=???=[n?/??????\0??g(E????[?9p???X??v?t?pY1h?-Nh????G%???1?c?????o????#?}"???w????@t?6U?#?VT8???d@_??_????~??!e?om?{?oC?w?? y?V?q???0???MG?\]\7?GA?????D?8?y69O?N????????Gt %?{i???T???1e?5????l???bt??H?jW??$FYs?????????ln??????H&F1??(L??%??A?t?ExTP?o?K??n?@??	?7L
f?Z??????6W?}?????.b??fK??L??E8StNw?????2?_uo???????S+?<??????S?]u??????mu]?n????	??<?????n?U??????y?w???0?N?AJ?y??)?????V????
"?f?6??g??;??s?VA?g???Y?	$c/?????#?G?A!{V????
5??`@????]?c8\$a??5q?D????????g?\b?{<?
?:?b?!?3L?t???s?a 8#x????Ba
????????H?
?'
,z??w??l?X?
???}?~	?*???]]??????????h?(>mr9~vo2???(?H???z??n???e??3?^??????K?S?
UL?v/??'\?hc??cm?.4B??Q????A?[?
L??Z?
&C?oq????????{?~3???|?C??@x>?????b?n??? ???????#?Y???gy
q??]Hp?????v???c
?@?JF ??????q?{??^4i?h????{?L?L$???W?b??f>?"????R?????NB????A???An@???!$?N????o3??????w?gt>T???u;???E???>A??
?"]?S?n???<??z	H??Z????u?#????2BI!1}????<va???p?DA]Zl???????s????0|?az??(lO??mM???(??????Xy?q??*&C????b???Y??I?xq????f?S*`F??[@f?%H5@?vX??Y???o?F0S??????~&)?G/0n?|?????af?@ePl??a?-$????	?S?|K??????0??J???N??~ax???Yl??
?T?t?U??Rg?I??k?q???K???F0???ag??H???G??g??87p?nUX?;w????%????Cw?7??????????S9A}?Y????.D,?D?????T}*?dO/?(??}?Z???&?j???Ie?Mw?>?M???u?7u???;t?$??^?D?R?D*?Q?9vV??8?"S5?K?6~J8/4??-??i???u?f?u(???????Uf?,??i?fjWKU?`?B??g$Z?1)Bd?,?X??????{?"X?????*??S??5n4-??s?/)?,[|?>dg;??K?&??vd??>???vWN?Ofr
&??-%?#H	P?C?9r????c??C1^{6R?KV?`????????*46???r>G ?#?`?b?E?%??dm?2d?Na???_???#??_??0a???,?t?L?A	??$?SQ???B??i???7V%??V????M|iM6L?V?1`?t??6?^?e&q?!??? ?:??.m0??f?NpN.???xE????#???+???L~????'??v??~??{8?r(????v)EQUEX??T?8????gif?B2?gn~9??d??(????aC?Q	Aj?????????5QV)Br?G?9u?oK<a??????$??f??""G?[S?\??*???Q?FS??92(?'????o-Y?????U?lMf?O??X????=?}?%	??<h???YOA?x??%L?????????/??K
???I?????L?>??a??@??????t]?xk??(9?????#?k1?\n????????HN??;?O?i???JhI??U?R?p?-????w?+H???YaLV
?G?4i]S?5&m)4???^?_)??[?A{g'&?L?QU??z?*1??^
k????e?:??r=9?a???Ob??*???~???
w???STPx(R??\"?+R???M?Y??????A???TZq??5??+????z?1?M??i???o??I???????vu?{????|????e???A??????>???9p?UW??ev??g.gm??-???qp?6?s?:?"?k?????I??,???z?"#?]UV&fjff""t?E?c???????Y???<sej?mx??^$?BQM?~q)&'????b??'????Q.?nP?C??f?	?k?g?D?a?d????gx6?8?g??E;|Z??|V???????FE?0?)???T??3	G:???.??$????]??c??iU?Ib^C??uT?E??<??D?I0.?;z????]??|??s?_
????????????!
 ?y]0?B?`?
??R*??T???Z???????????tr????_\?#
?~?J?]?v?????-k??WCl?o???'=?-??A??Arw??k?????/R???;)???J?n?]e??{?#?Kpw??????????J&'?V???}?????U?
0?*N,?rx?"<???mh???yY"Nw|ff&}?x???:e??9??;(??3??4%????[OKg??I?D%
?
g??{j????*??7????:?????9?????e?-&^nkH????vm????2d??B?d$?rS??????P???M0o?=G????(>?W{?
?k@:?y?????????*CC???qU$?i.7>Y??/?>0?g$??????S?^3????!?A?
z?/c?h}_=???W=??M???d?d?'???WF$R?9??/?N?%???#lZ?{?H??UW4?????`?|???^??*????^?4t???^??^????u?
?x)dR@?Q"#$
????FB????K?
????*
 H^???>???????I$?A???!"	pIdDn(?
DA at XV?b
??_$??'?OL??]????X0&?Uh?$??$	+????)????BIY??+
?PP ??$X?(E	?B*y,$?P
H"?}???:?K;P??????oj???R>x,M?K????D?	?2?Y@???6`?f?4b
,Sk@????C"*I??B????????y????c???????e
i(????h>j1v???
??CT???b^Nw??3G???&??d?_? ????Y'?)+=8?l at 9???#?'?@?=?B?????t??????Z?????D$??ah?T????t?<???p???:?51@HD?=q~H??s???B??AH"H!?`T?
?y'T"?
 ?y?
B"??I!???g?(???&??2Pe(?!??V[b??T?=??i7????d????V??k?M????M?N?4?
s?I?*???(?1d{?|??&?~??:Z
4?O???C?????Kjb?`?????e??)D?4??%?????6?X?g???l?3h?6?????????EJhv
B??	????	
5??B?UE?U??h?K6?q??3a?Z?
X*???C
??R?
?	?\?c::??9X
?S at k#??????-?F?-Z???!Lt???l??:K4?????????]?,e??*JcA,??RIn?SHZo???:??Z?@?F@Z???
Ed??[Z?-"s5?D?7X#3
(???"lXc?????W(???%R?(R?!,?b"H1iR??UIHQ$?A??0??H?
$Y(?p?D?????o??????31R?RyX??6????n??9?G?`k<?g@?p??Z|C?,??b?{?z?]??????,m?|?9???
??,???x??????[|????9!vN
??d???b2 ?d$?n?????c?I0?Q	?,??11]q QU?U?],???8?"8?.??b?,??f?!q?Ea
?m????-??0????_C??U*Edx?&?Mae?C%i??1PX???&)?Pe?qe)C1)NKP?jss?z?H|5
???????y????	?ZR1TZ?'????*E?-?y?#?	AU=4+?
?G??:H??-???????p$A??(?"????i?????/???z?I?W??c???/?E?}?B?U?b??????????U??	??&???M??o?s?i9r???fJ?
?d?
?ZCb.n?bT???]??h???b?
???:N??????????$??=???K~Y]???Q???l??Q??W4?P??j?
o?5?ER",(*EX?QI? ?R)?>?}8;?????1?????S????Y??X?A?l?%?	?KBK?H??%$?JY	?i?}??w0????z)L?e????=?-??.??2?-?v
?v@???V?6I?i?IQ$?R?=V?#T?1LD??J8d?4??(??G??,?_
^0??z\??9?w?|???????-?JY34? ?CRI6?????A.?m)K;2??(??
?8?? ?`M(?hjB??:k4h??$??aF??es??b???zp,???	$???8L?p???h)?gjp?????X?1?7d)n-3?(n.??`L???NP?????2B?[?????kB????????eGUX{?7???^??Waa?
????@?????d?:i{1:n???t?$6F?1?	????*????y]?!Zz\??g?r????EW?@
! ??@?`??+r"0?O???PR)?%DAbH???????@??bl`n?J??DX*,?d?2Q??????Q?"D?cDY???:??U?_?~~fWEG??;?????8??????F?:??	?l?r]???T???A???~?f????????G???&@`?eX????)h\jc???????#_{Vl??(zL????M??!Y??????/?e$D??Db??y~??x{???~H{S????Nle at R(?p{-?EV?kZ?J??*?V*?**???j???-??UUUUUU[UUUUUUUUT[UU?TUmU[kT[kUX???t?K????V
?l??%UG??Yl?D???+
?
dP???J?!s?])Ap?p
?
?r!???-???l?????v9N??	~???*????"}???=f??g??7s??R??7t??b+??0~? :?g6?t?x?>Ca???_??????0X?)!*!?9???y????K0?&]??a
x?"???4v???
?A?w?????]g5q??ha?/?:?Y&
?^?o=x?????????1???q?S?o??S?e{~?X-a?/p?c3??	???.?|??8Y\???
ph!J:7???*???O????v\~???.9?{ *??????,???????0?????;I???P%=?+_ ???X?????0h36%???_vz6???4 9?-?1
(@??!X?Ed
J
T,Q!!$?i????9z$??`[2e@???O??e???
?a???'??????+??6`???f???Y????	?????#2??s?6????B?0??@z?
??G{??
X??????I?
x?
Ql?????.?E+?B*?????Ix????_H>Wt?L?????4&??????H???;-_?d?????? s??m??r??ya??@=???sE???5#1}??-J_e??y???)R???
?wgL??x?_?H??q??????Hh?b?!?!d??%sW??w???O?q????????e??,??????
??<?9?????W??
=zx?H??? n?]?_yMz??????(?x????N?S?3?~p?>"o?G??qE}4??zBa0?n??i????????y????}?!6#?I#"H??y??3D????C?W??^?s????????M??2!"{ t??7'n6;LC&$#??l?CLX??my?z????3o????bY	???K?bkOkc??[?:E?ZyubA?????ud??z??*?C???_v? U?w??p???q????_?h????Gq ??~p???M???7A?W?\?o?r+????#??????7????}m??Vc?M?t??????7'????;??<?JT??FE??mv?UJ3m?M??.`{QcZ?o??!?i at L?6eg0[?S?????s??\? ??[d?????????Q?P?eJ??u?i??>?6?u???B>}l
???D?`Y???Ds?zwwOu?t??k???9)?4%?Un??Qu???z?bTg??????
??8??R?V(??[
???7???,????dc???i7??:??.???????????<?fQW??G??3q?@?1)n(Tp?n??t}m?D?@?Il?=u5 ,?jBc??a??YX?U??<?Y7m??hVR??s???b????Z???r?D?m+J????????J?C?6?h&H,?0???\a?y??wv}3aL???U??I
"??q;?????K???m??I(fJ%???Y??h??s??]j}F?}4gM?V(S1M?'???????E???v5s?l?B?o?Y?`?????K?d??_???????\s??????q???M??? <??{???r?d=
?#?)?????E9???WZ????D@?o?=??U]?'(???l?q???.?Mql????xfB?R+?????j?@?J)?K7????}j??\?Dd??wtY\????>???? ??????r???u????o??%???<0????owk?Ip"????!??????????Z??d???Q?????'^??7?F?G?3????????_???x??J'y+b{????????iL???gA?t?????8}~7"0?%0?O???
?8 ???6i? ???????F:??*h?=o(' ?AE?(0??OH??l??????????M[?????N????7{ax?yQKcD%??
????,??Q
??:???????H??????%?^??????????M'z?p??m????./?d?s????7[U?B?`p?3l???4??????n??????{??{?????/?Z]z?	?&????W??$
?0N
?&$???vH????"
?N
?F??????4??J?3??3Z_$???????
B?5j+?d?:???:
??<???z4x?l??k?o??2
?e??????I?afM??d ???T?KI?M???mq:?k?\5?????Z?'?}&?J?F?Z\M???S=????{zMO? ?tQ???wWe???/h?=!?acU	e??3???M??+:?D?/??????????R?? u?L??r??zN?H??wI+x??kQ?CMj'K+W?s&Q???r?QY????Wa??J?kwt;?._)?J???;?=;eJjF?p??"???)???uS??K???R?*?T?9?%?'?????>j??Z?)????O??J?7?O>|t????P???>?Pf??T?J?RZ??E????8?%????S?Z?gN<?
?S.f<r??r???Z|<ZB<j?^????N?	?|Vp?V??b?0B?]$????:1P?	=\?}\??6?V??a	?t?;???!2?Vtj5y2-e???[?{\\??JS?||:??M???RU+|C?%S?iVh?Y?;Z`|??P?:!??,?????m-?
??a??Jq????-????g??e;?V?,??9?}M|?g?w?????L,.o???h$(S?????(?E??m?z????,-?8??????d?ss?KW??>??^?8??H??yP?Z?KD?-?`?'@?7f?????J?? ?V?V?dZ??z??3Hg?X?eZ???t5?3???;????>??????????O?c?h???4??-????9zF|????????????00
:s?@I???
??@*fY??UD??v?????O?W??6??]#??d??K!?+w-?U???OW??|???g??-?4??????A:?>?*???k?????>O??a?]???????????o>????{q&^f??
??m4??b+?^&?QW?S?????Y?(V???????????04~`c?k?#:????M
?T??cP?%#l??T"ln?1XVCq? ?Mnn?4??5???Z??????F)cl*? ??(V? ??4h???-?rE?h??=?gKP??JK~@?a???I????I?,?|?E??a?n?H???ET|iX
F*E'?????3??c??-?????N???:?h?uJ????	??[?W???&?z????mo????T???????i{??/??S???o????h>BRV[?V?Hb??NfM&!???B?V?*?&??"?'???RNfw?
?&?s???$
8?i??C?BD?? ????A	??C?/??D????<}?>??c?/?)9?f??uz?d?	?????/?%???#?!?e?Q??x?~s?1r????8??{?W?/?h????????>]?hd???v??? d at m}??v??? ???~?I?o?_*
?L?[b??\?a???=???:??????????h~`????????????](???F?????@?
A?(?? ?1??A??#??8}? ???"???S??Y?~???)???{?M???p!t=_??r[?9B?j554%k?np?
Dvl6;L??????X*;P
F??A?~ QAF?Ai????/?;??4|??^8??pc4???:?????>??h??LD?,0D>?E^2L????>[?<ho?A?M?K??v?;A?vo?????}??%?o???&??????\???=B\X??????4?L?W??s?????kP?er?<dF?>b1A?F???y?????????N?Z?ff?1?w??/?;??,`G?/??????z????k??B???????0?Q;'?Si??yj#?!??Mn?zbiP2?:?|^MQ???:?#
l??We0?? q?????CAWEt?B??b??,@??$K ?W??w?!QXx????E{?c?c?s?cH???z?>"?????c??f?h?`?j?Ga!??/??2c6
?v>??7
_5?????j???r?3?Gi05??o2k?????E?W?>???G??EU??=?q??^????D??s?K??V????&?l4???8??X????fp at iZ_?8?1?M%?s???[?)+?&?.f?
?_A???fz?2???????A?J4 ????(+??A??F,?????????
????i
???wt??=6?k?N?sl:????~on?	???????o?\8?}???P#J?a\?M???^??3???$??????hm
?jD?</???5?	?t???i??????b????
P?,??????cS#(2?#WK?????????v?[FR?r?????P??Y?>-?c??d???????l?.???	p?Y????sn?[t??~yo?s?>h	??)&/????$?cdKO3?W-??l?<?sE??7m??:?9 at 1????????h*P@?O???/??T??????

<5$??2?????ki?? ?p????
????Q;/?t??{k
?A??&?}9?????V?w[m:?\?'z??.w?&????J??????3o*?]????*??.??9?Y???4k:?!?j|?c?mF??D??s		?"?5???oJ???E7?Ul?K?ehPgx3???9?:7??:??\??W ??????T?5?i??Y?OQ?????)6^(T!A???g???????7????????vQ?=IV?(kL???s??!??E]?L??g?|?h????$?Dj???";??Hh?3k?TpT??La?[T????tF<m????c?N??4?m?*??
&??5??
???????c?U?UK4????
i@??nb??&??9?p?gI6D?YEC?b]?"t????FJ?D?]!?o#????B"?F?$?*?bQ?v???'??D?T??R?
jj?L5??b???Ii???M?]??U\T;?K?bafC&5?Ci???L&?????S?????*??E??V?$?,??5u???e][%I[?G
????????ky?xs???T9?-???????z+M????;+?R?fZq?T?????y?h?i????
P?AJ??)??'?5?E?J??b????,?J(J?3?????\	c" ?Z?Q?????G"H+??? ?#/Bj??,??)D?a???r?[=.??7???($?Ex,????P??$X??E ?D
R? |???1????{??8?~???x???d,d??NV5???c??:a8<pY\>?????o??????D?7?
r?Tb<?_`?;??f?8????,?=?|???=,!???'?D`???w
%?!U?@?N"@<Lm??$????e?:)?,?
$?Z???T??????LU<	??????????s?2?/?qYoQ???>?g?:|??????V05?C=?j?&9C??43r^"']??O?'??Bc4??????????P?A????????g}^??"??f???U?k?vdF?~W????-???U?
pvcx?iBI1?[???
????s?:YV??!.\d	r?M
???,Oi??n?#????Hd???Ey*@?????
?F??5$?H*ff5@?k???C ???y^?a?5?,<v?,??p3?????*{Ed?N??f??ih??? b???i53??qI?????M?k?F?ft?gu????
!?I?3?KH?aO%x??????y?F??Q?7??;????J?_??VC?pI^q??'???????i??<|?U??z??????/??$??$?20EX{K9???Z????K??p?P? `??|?=?B?(S???
??????;a?|?v}??D???:oS??P.??7?????Z
???/?0&????.?t?{???$"<???Ho?;????u???95R?	
????????#<??^?????C??&f
??6vbT?$;?????J?z5?XZu?
?g,??1??O???A?y??e
?lk???FM?p|qp??/??6vgr?l
V???b?.\UC}?_??????K??KUj?[!"?L,$7??y>.??????????z?????+??4??$BI$?H?U? ?A`?Q`
????(E??"?Y
?E?H??$"??)B,?R
A at Y@Q`??AH?$P????d`??!"??Ya9Z?Rf.J????4.??HG?
??U??6>????????X?I^^=???&???Wgb? ?	
???[???;:a????;Z??m*4d?#?????B?'2?%??y??N????r??a?`????O?N??y????zi??M??l??\?????]??tx?2 at H?!?Y7?,?FE????U~;??$?6??53RW?y?y??? zBAD?qX????,?H?3?]A???6?
?????5?????
?Nyz?i'??7#? X??????7Q?-!'??~CU?N,?x?1???u?x?V?C{???9/??X?
??`I!_?=???9????}f?)L$>?????,??Ie???1?k??7?Vjo:?????e;^?,9??|^U?}?2???\????i????^???????e?;?r`??f?????K??A??1?????MJ?????/
?V?r?f6?\????rK?H????2???\??T[lr??4??lp???a???????#/?%F???1??ga	???!hq??
5K??WW????
???m??i??W#+l?????E?g
??~_?}f????P?g??)?|D;:??QuS?~????1
n?c?2??!r?d????d?Sv??????>?VVg??k????????'1m|?0?-???}???$???o?8?H?F0,??????q	q???P?O$?????Q???.5?Qs
Z?!z?%???????%~3'??Q?????C???7??<??a?NN??d?0??????@?w???????l?Ui??*??U???Z1?h_???M?I??P	N?0?7?m??`?pp
?<?]rW?ia<?x???NS?|?
??W??xR??(??<?8L?LKR?3???t??s???mz??e??k?ea
'??&??t?s??<?8c?|&?????7zi}?]?????^#??
??6Tn?)?B?K????Ww??TvT)I??)K?u?
??k?}????g????~???????%UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU????????!_^??]H????Y?????-<?^?!?HI?4
?]?Ybn??O???<D?j????????]HN?k?"??vR?:??=???T?~^??(??E?I???????xz=?K?"? H????f??M?F???????5;0o?Z?????
???b???m?s??
???5}?3H?(_m??d-??>??????+_??0??`?h??O)?k-?`???jT??IU???pahrpl+?????;??ehrV?q??
7?i???Eh?35?? I??C?5[N?Q?73~7|?-m?W?c???'va??%8m!?
X?Q?6??%N?3??>???ex'???Djc9???/~L<u??y?	i?jj?H??a
$Ho??????Zol??~??^YmPe???fr#Z?????
???
????D??Nu??ec at tQ?uU?j!A??%?2??Qk??B`M47(?p?L???????Z+m????m???l?9?Q?????`q)?E????Fxpz_?3?!<??L?T????b[o~?[b,|??B????<??A???(??!?@?S{H (???N???s???i???@???4<26???0?`1???iF??dTb??TEb2
?????@????@?#???X??R?X?????,??3?????9tU???>??;q???\b?s0?Bf?|??59
C?????[?z??EA????0??6?????U)?hX*?V?zm?u?f?c?D?EX|l?4?'K?]??GR??????-?T???	Zdq?N?' Tf????Kh?q?B???M??7?6??]?
4??vr?4??n??O???P?QR>?(3u???	;??D????9?x???*#A?=???????tH?L??nhCM??v??i???\w[Q}?\?"???|
 5?c
"#??????Z|???}*M???1F??+Y??7-9c??An v????(ZYQ"?Q?????Pw??<?Q??g ???p????S????0nsb?y??????N?????Z?_??|??qA???f??T??6?RJ???6+??tt?&??U]5?#Q6?(?D?p?#7)??? {@?l???K??????e??O\?-???]T=2g???/dN?1?L[??}W?:=?1U?????G???kkf*??L??r????S???????]<y????j?&???j???n???8L?!??"???????Kj?? ?[????4yN????????-}R,t?????
iB?CKl???+~]wwwwwwwuUUUUUUUUUUUUUUUUUUUUUUU_?~0????L???tL?????p???t???ow)??Q?[??u:????j????`????62'u???????
]??????}_L??y??%???????OX?#g?f??|?5UMUUTUT?Rxr??(??i?????`?H?-?E5??A;?u?????????m4>6?x?????-???????f&I???do???`?^w??t:7?u???t1?????9?x??x?6?+?????<y??m?m?????ox????????l??+?????l??+?????l??<y??Wm??eUUUv?]?V??E???]N??k??|:k"????r?)???%\?E?N?J?;\3?(???>U A??3ll???4:/???F????
bY_?_??8?@??)y??F????_Ye[?V-h"?S?????D???????9;<?H?9J?D0?_??q_<K?|^<88?Y{O?t?7 0???7x????2???_?w????lN??;?W??1??0'????'?~3:?s???????"C????+V?????!rT??=?s?u&=?h?T????3??? ??|??4??
??Qp?f0?#?)RV??^?w??Q???x{D??'"??S?y????#!6??pB9$ay??y??QpT6??L>NN?Z]?I??>?@x=????m???.????>?b??X???2??k??z
?u?=???????K?\4XI??j?0?Zy?)??d???q??>?.,?????`?X??O

?+c?,fjO??????Xy?M]A?N?01v??Cg?Y$??%???jR0|{???rn??A??G?e
B??;??vcD?5????gZ?v????E?S?gG??@?|2$d????JQ+?B?D?????????#?.?2?'????#?2?? ?!Q??=??%?7???g??-?G?M(?2??A??`???t??R?J??i????Y??02???7??I?????l??hG??Y?4f????D??"??c?Rm??_???%T?9??iq$??(4*?+
??S?w??]h??????j??P?3???5?Q?,???9??c-)??????KH?????%?H?c?!?rv+???}???C?y?Jl??!?>$?0x?&c??/?????_xfH????W?c??T9?Q??n???s`vR?????OY??D'
???Q#
???M?[??? i??6_]??.??i??WsV???F?6JD,k??!?p?{2Y???D?<?D??-?-???d???????G????????W?hW?aK??s???D???e'?e???j?E<nv*hir??f?5-?Au5?6I???l?E?\?85?:???n?f??Nk?????????V?
UBpt??`I??v?????O?O?????`yM?????}*C?????/???j??????-?????????L4??V?P???g??3???C?m?r)F? t????'$??#??R????0??]?R?4??3?Y??"?????\?
/?,q??&?c??eg??~O?E89?,???k?????w??~?<r???=?
??Q<|,Q???&f
X<&3O?|3k	?:/f??:???d?
??][W?g????????s?I???k3_*???0Efs?????P?/n?????(?O?C??????#V??<]C??iLi.0V?z/?8?<??Z?#?M8j????~?Ls????? ??B???f??C??]bK3?????
h?????$??5LPQj???O8*?c^? ?
?Oi???5??`? T??a??UW??????X???F?????d?O??b!????
???4??v???`?K97f?6????qJU????&??U3T?T~?p9????C&$<?;??;?????4^1!????{T?os??4?
|???sn??????t.8-{????8?FP??%l@?$h?o?R??>?????[?7???????????bE??[>????w?t??(.b???dd????????A?.8Y?<??`?????
qB?????Wt???;????????????????????????????????????????????????????????????????????????????}a?????? $E	E*??\?}?l?DC?_6a?y?????????Z???m#?+?#????>????+O??%???H:?b<":?????i;???????TM??ZcA??%????U??c?3??I????????!7#?????N'?/r??^??H5??P?Wh???|u?U`?s?2???*??n??????xQkp8ts\^sL{??r?)?Q;?#??U???1?HH??i????p?/?
sBc???#r????A??????D??/v???K???^?-?\7W?U"#?t???\????}??-Q
?H????+?????|?@?F?L7[^<?3?7??O`9?	??Uz??Y`????7?0\???sX?L?4<????.?m?>pjs??Kq???	?3?8??????q???*??e???:??yTJ]?;s?pN?+???z#L?9??~	?j&~???D7????:?>?+?p?Z???????,????&^??#??-?,?K???#???'???bUU3???8R)????x?????.1}9S???r??KM`?3?(?&??2?.4???2?????'???=;????7K~??;???#??????Vi#!
 ?
c??????E?U?JzE?F????????J?s??yF?DFf)?L??s?1?R?f`B?*y?^???????KF{????1?3y??8XU?=?N??L????u?}?V??1u?	g?????<%(?9??7?$Ey??1?'????%?
uK?X/-i??W?3?&?xS??v?5E?R??[?X????y?6J?sb?kf?K?L?d??w??????i?y?D????0???3?NYwb6???????eOu^??d4?{??#?????
????%??H??H[??S???VZ??5C:l?????????H?{?^??)(??j???'6?Sf?8???)ODZ?	
0??(??0??:.y?@???AK"?p???$f??????|Dd?l1?V]?GE??log?????????????????"????C?M&???/?T?~3???_?S0???dm.??????l_?7U???????\c?l1b?*?k?B!??#??vGWC_n???[???#d??Q?5?7?0?????:?>?4X`?Y???A?????
a???<lzgq,s?????????/JJH,?si??5??0?{???o#?T[??&JO??H?l?]QH???=O?o$? ?????Xg3?g{\??????????^Z'/????<{??f?n?t?ag5?d
?????C??S?xv??????nL^-!?l???;???

?u???%?/??F?i?O[?.?r????n??c???g?Ls2?B?#?z?s???? ?m?L?N????b???F?3?cs!D#???
?Z,^Z>?$?o?N?????<I?L?aB*+??[??el?|/Y????(C?FB%PZ?u?o'? ?*2i??i?WH??
??c?~?6?W?t?*?/H3BP?h??9.hFO ??1?DKC?gP"LXRJi'?y???5,???26v?
???i??tN??59?????.$??hq??&|?????????cD?~??
??~(p???3@?!n?%??$[&?%??O??y???????C1?2?O3?w???????z5r???FW:d?io?R??????>???Ei?c??6??????&?Y*???Zz?=?%??}????$m?$??7<??????X?/?xp???S?2#?n??o?y????6T??c\p??Yr?3 +??>4???Z??Y?1??/?V:^0w?Mjo?{??
???Uu>??1r?1?Ywd?7?g??}??D$???????X??:??y???a?#???$???2??a|	???#?y?7I??iXH+E???`6"????,??w????N?s?[!?ehs????":??????6!??4????|????#?3
y?f}Eo?????w?I?j???)??Lwd8A?T?r?A????GB	???q?$??&???p?1]E2&_
???0??????f-???5
?c?/??5??Cn????YU;??y??FGz|\??7E????]g?????????5?FZ??9g!?0?<[T1?
???u?\pq?8?\?;??m?2?:*?SzA?\?X???????
?"?*?.z?}???6???=??N3?PA??>yH?MM?'???@?D???S?R"?:?a?bG?$x?$A&?T^?_|h|???w??L&???I???u?:???0?????D??z????X??????T9?e?F:3$[?eP2 ZH?H??n??D?mv=???Q???_?Y{1?6?S???b<??~?8L_[????L???Z55?:"???H?9?8???/????XuY1?6?????+?????0????9&vvk??B??w<V??<??~?b+??r#??`?$io-T??????%T??iWw?//MF??????8??8?m?C(???e???5?cE
v
???>?KsWm?3Ndl{6?8L?*??X?s/?c???M?Li?6???4? 3}?v???Z%??6??V?]?lL?i???J?+?
?"$B????f????G?s:}?????C?Kq?X?Qa?
??bWt?)!-N?iK*????Nk?Gd?o-?XX??
9
??]??^??K?$$?5X;??e8^??eDJ?+????V???v07???F?
???Hm?>pt:d????iD.???%???????A5??,????S?Y??O??>????e?i.
??5<\I?????!??????7??5	?`[w?8x??l???<l?Zt??kGL?Y??b??+6??BCjvWEF?V?w?|??z?l?}??qx?????6
(??	???
y)?CL:?M#@qL????Y#?????
<??f?]!I?n???88??9????O?.h??????p???=?H?|Mo?????	OxT333?+#*C?K?ZJ??#(?6q?n?t/U???>???5?a[??$i&P9?j???Ou?/?
????L?8Ym?f`??a??pB?'?
eS?	??z???'4?3C$
??XA?&?fYB???UUUQM??Mqw_
??????F/???E?}G????U|?t?????@??Hw?S]??B?	????}?Wd?E??\C????e?<??e????K?+"?p??E5??\GU?p??*?+?????n???J?9??<???????"&2??*.amz0?6]H????Wg?h??oXG???????~??^??[S??G?L0n???y??<??XqvLQ??Q?????O@)?P??y???o?*??VTS?Xcx,?g9k ?$?W?Q{???x9???n?c?8?D??yr???#?:?????=I?8?X??x'?????o???????o?5?_=?y?S\??:?|??&??????
????'???kU??{?q??I8????.>R??u?O????x)?????O5?Z?????D`=?????0f?
????3#?S?6?????r+????u??9?s???j5c?#??/;F?{?6?????0??xq?	78?^??U?p???)??\1k??{??iv?-M????p?????B???!N=????????B?JUl&ggME??d?Tk?l??n]?T??0?A"???!?d??D?z??i*?y?Xdb????<?F????A?%7?>??LD?????F??5#)?????:?<%=?g????????
????Sg? ?t??????z<?>o?
z????`7?=?=p?3??t.5????? A?{???iHV?
GC?t???%x??>C]??u?dk??5e??_Z?l???P?y??$B??M\??^?????{?gi?X??/??E?qMK?????sL>S?5p	U'|TX????>.k??w????3NH??UY\(#???N{</y?<T?c??,?[??5!W??r;??D??????/H???aN????;:?????L??b$I????`??q?oY0????'T?kbk,6n??aMAKO{Y??a?8f???R?5~??fUm4?WR{M???????;?????Z???/??g???7??@1???k???8M??&?T?-?
2???e?~X
?i<&p?v??Aq[9??lC?g??@?|Z??l?6???s?%?]??v?????J???	Z?t??G??Ny
???v0??=trG0#?\}??JN?P??E?*3?|?,?????4??f?
????m??????2????Ui?2?d??'??X?
8&???T?x^n??U?R?J?`TA?2x??c????UC?~ede; h???e{?3???T?@xY???v?\??I?+?F??N?y?0=???0?6??u??????>????Y?z?E4u5rL??Su?????F???6l?31?H???"B??Z-???SK?h??????AX^?????=?A$?!?V?m5dD?M|L??&o??1?A?3?]?>?E~?aR???/6?o?l2???????b??????X???t??T????????s?????!UHT??7???BP2?8??^K)94?&?
?YZJ?\?a?O?? ??C???9K??i?4?M?-?D:?)???????lo?F??????9??}?*6td???
,?2?&?wC?z?g.t?[?k?t??dY??s??
2??UJt)Q?n?-?|VkZ??p+?????S????if'????.m??W??9=??:z????]93?gXy<??<sc?"?????s_
?Ke??.???m?????U.???J????J$wi?????D??p??IO??????'??7?????d{?:'y?y
???4?????/?m??PI@2?m,??&t!???9??????e`?7??O?"tV???l_??s???o???Fad?????????p? ??JH????p??5?e??`?u???.???A&?{??A??	?`cK??"mr??Y????b???_W?UQ?19|????r&???J8 ??H6;?/v0???)Xt?q??m~Wf????,z???X_F?X6?v?b?
tY??T?a?Q???u^?`??
??
kC_?\??=*????<??j0L?a?lS?XUl??f?lz??fA$??
??{???
??4"??C\hb??IXI3??1?l?3?l???Q???EE?????
?X?U?{??
?g???
???&?Z??{?????m?????
k??????I????mQf?c???f9?}?v%?,??;8?e??`?@Xsu???????t???????8?e??????3k??~??%??????Px??`8??w??!&???v'9?[???9!?]u????zX?9????)?????4|Z???xKm<??Oh?B?L?Y??D??7?XQA??P?????j???~????:?*???gO???????g??x??^j??@?K1???i??u??ZX*??Mu?r???B???hR??T??????5E??e??c
?????q?D'Fg`++???$?????We??7	?&vb?B??g?x_"????????'???E???????J????5???o{F???l1\r1?f?i?r?e?$?<?????*?ZU?:????mn??zG??<9???|?/[?>????P?T??????YV0d?U
?"?#
H??H??b??? @mH?P?i
	 '???B	"2?Z"VPH??R(X??iL"??$
!??????))?J?C?????w$?tOT?
0D>???o?????L?N?$tp	?^ C??????K[?I7
A???^)0H??L??c?c?t?d?={!S???Q?PIJQ??'??E??;`??=[:??=???^????OD?]???L&m?S	]eL???E???E??o1(??CnZ?	?@K???e?
X@?4??cM??C??`49?? Y??????N?P? =?	??b??6/?=?'?#e??$m?TV2?V?F?[?????6p?????!??R???j??kZ*{??QJ}y??2??jQQcIa}????%???'????W??O8?0?$ddDA?'??u?)?A?
"????(?X08?2?`?XJ????,Z?.??>?????????g:=?-??(??K??????%l??H?V-?Z
D?Z?E??1EQ(($'???a???j???$5?????B??)h?lZU??U??J?m?J??m???2?+m?T????(?'@???'
??"??/??U`({iOHk???X<????P!8E??B??H???(???(??`??F
,????(,QAb??
,X?b?????????,X???,X?b??X?((???E?PPQAb??,*"O?????2??X?EdH?(?@QE"<!??#?Dd(?FE?"2s????????2???????I o4?h@??()?"*????8v%!?!?7?6Y????4?,?	UI?|?4jQ?|??J?&????i?w?P`K3???9?0???H?$????
??*?????M??S?????Ye?%?PB"^S???$??u???LQ`??d??!??1!a?H?????T?Qrdt??86j????
?q?a?
?-ALeI??;??{d
%?L?X?$??P7??jR???'????'??5??X?q????Z4K?z
s??????n~{
?
?hsV??'???j???o???6?>?w?n>??%??ApH????????hA?=???O????????V0??iQ?#XT}?a=d??2!?????:[?[.?????????R??:????^ 6c`??=?k??>?	"A!
xC????yXz?qT?A(v?6p???? ?#?{?6???]??????C??_??D???YO???8_!???-???K!???5??v?Oj?t??????#??J
A?p!???]??-????????MK?t`?z??????=/?????|?rFU?f?}H??&???-???,?FLD??;?7\??"?????????h??6e????#???Z6?;?2?t????U?P???
?,?Y??
5?U?p^C?????????~?4???PY:?,?!Y?????W3$??9?26?{??:?`???.v????~(i?9??D?X?d?%?s?+(?????)?M?h"????yr_???>Ns?N??????]??F?|????HFA?zC?i???!???????? 
Pqg????(??p?a?w6p?>???? ?][J]G?????`??????,??????l?
f???y????>en8Q?{M{OY)}p^??????h?1?*
??>$??????<???
 ?? ??I??6???AH ???7R?o?Hd"???>K/)????????0?????Hp??X? ?D???( w???H~c?y?????
????o???-???N???#?????>x~??p*O?
$?)?1q?_,???'?@P!?>???b?q_?BF?
?J
8G?S"? ?W|?{???A_Tx?w?e??!#??M?????Y
?VQJ?
???+?W*Qb"???>??
_?F?k??>|??z??????/P?OU?(???,>????T[????B1???Y*?Bz????^?v8???w?????O?i?8/v?????~????g?1????B???gj??*???^?*?[?????i?B????l?2?l|???f.???????M=???<?????'si????q????????G?B?`??}??=?t???}????^Sj???x?JN??wtR??k?????K.?????????ImMe?????]pf????"n??????34???h??]tlP@X??l2G?3?????bQ?????a????o??m?0??'?"M7q&*?2?7]???4J??8?F?????S~b??&?I??:?????#o???
?g??o???3???#?
?l???k???????v?L?7??%y?\?D?}??\"?????23???m??_7???R???;?UQ????(??c?VV??V??j?PN?qx???5@??????]????:B???)G????_??N?bS?y??s3???G\5a?z<,?????f???E?l???[?o6???y?i?rCp?$????????_?k?m'??????)>?L??????G]??nT???
?c??\????,?1y_?XE??g????????T??g??????G?{??c?U????K??r?=???[m?????
H??1T`??B?<??vM\???\?sy???????s?~??|?^???????T?U?D?'l<?????i??#?????|??A9OG?p
Cn??G?>?=^?C??}2f?q?rFhU`v???d
????$f?/d?XY??y)oV??2`"`??|.w???:{j????(?{?:|??;=?<?S??E??ZgG??C??p5?yO?????$$!?\e*?M??????Hj??J??}tPb0{??
G?r?C+?8>;?uk????????'D?????????>??\??4?????&m??#?l?0?????tY??R?YD??g??:b??H?}J6???q????z(.V?~?6?ov6[A!9???H0Q1?a?F???C|?s??wX??????????R]?_5?tC}p???WU????vU?zK????f?F????X;:a?????e?????!???U?:???;??????]4yv[:???????#?*??Sm?g????m??????+?2w?????<HC????????t??????????F?VV?k?????S?E???#AS???	f???????~?a??x???(???b>;?5_=?r??l0??>?#~??y?/??????`??kL/(q?[??Lms??A??????K??QUF??#T??????]yq??5?????????????Nl??????
??* u?D%????-??~X??3y?13??ZX?>5?6?|p?~?Q??????????g??f??'B?????e??b??????????V?j???r???
?/???'?DL"??s??B????0?X?U?1??????????8???????G?z_+??^???$???r?
9^V?wl??P????:F???g?@Z???0?)9??'[s?2&?r??G???(, ????}?*??\??X?[???T????0?8?I?D?;?P??q?~??JPx? ??w?y??W?1?g?????%????lU?????-;d?7N??,o'e(k?>.?_{z??
(?H?H????:3/&X??FI?t????f{???4n?T?F?!5?id_??T6y
)?? ??e?^?>'???T??it??????w??????????tR/G??
??
??.&???
???_?vd?%????k???)?	????&HQ?u#????J????????x??z??L?l??h???? v?!q??q?qEkg?"}C
?? ?FB)L*1T???B??"?"?"2
AH??(?9??I?C
??.???bo?8??D??`>??;5K?'?8??331?a???S?:?Dk?%\?A?	r_ds?#a{c?K????????`??s?]`(&g?O?
?
L([?j79?]?;??i?_}???;??JY	??S??N?d??%?~^?????c??a?????m????n?J?q?F?G??d??w???A?'A???gm?Z??a??k+????Zf??
?(?	XD??c?Lc??mTn?/k??&???C?l|``fb{?lod??4.????=j?x@?*?B/_3F??MJ?q??s}?tsC?????????l???^??v(???2?h??v_???w?z???-?`?????BH2)#TGQ???y_?l,?
??4??0A|z??g[?i????7????q????z?oa????aW
@?n8????ghNK
???~?????????i?qv???7??f??
??,?6????]??ws{f??rA??a??36??^Z?;=}??A ??????n,?{?|?0'?F!5k???????p??HE
?!??\
?F>??q(K?k??9???&??:????????)?AC?k?_???`???=???????w?,F?To?????3w#????y??<??????v
??????????c?W?G??
??0??_>?rr?;?Mk8;D?
???{??
?a??zUXG?>n????GH?e??]?_.????CI??6?&????J??????o???3?????UZC}pE[&NY?4&Vs??????PI?/+
?U??e??d<?J?O???*`?I?i??????x????hNx????'?
?b?L??Yq???1??q??sW6%*??^[?tZ??????n??SO?????0
"??rB
??z?p??H?<@???"?8??_??C?q?5k???%V
=?A?KF??L?????4??
?!????????K???3{?Q??9u???!	5J?=????o?fT?%?????C?
??$?q?^_??(9?}??????V??????r??
U?q?'??????{?????d?<<?1??6i?u??????????nG_??R?U?1????W??D?d	?f,???'S??W???8?????I??xm???5&?Z?
DI?Z?'K:??i?0s\?42.$,???????b
@??ur?'????n=W?:>L??????Q:%??,p??E?y????1T???)??????????M??O??Q?'?Q1"?B}F.J???.?_?????j?? N?J?;K???x?q5?K?.?:=D}9?????s?<??}?O????Sa?????????$???????^??kZ??pk????j??MB?xwZ????>??F????<'?&?PF&^)jh?S??????,&?3b?e?c"z?0??6F????z??SLfV??U??4ZY??g!k???X??p??2??k4?W?????j???g&^??<M????X?^?19??.?e,x?????????o,??J??"?????'Z?5????}c???3P????M?????%???????j??iTa?9?J?{Z5?????????????<c??d??cDK?]gW?)P??????(?????(??U5K
x?2????\N&2?3?????f????1\\J?????b??Z????V???p????D??J?TjEw19???mY?F?:???????N?F????3?g??I?p?-o{?,oY???#:?W?9??bl1&?Nk8?R?$y|?N0????R??j???j?Fh?TC?.??P?Ui?7NU??F???P?zJ??'VU*?5K-?4??X?f????$?f?u????&?raX??)??NuV$?1???|?(|??:??&?<,???OC???9EV?-??6"p??1?U7F"?q?`???o?Q?*??Z???2-kX?????+&???u5Y?g????h3?T?+???o%??a???S(D?6j????v?[W???
?%?UY?2Y?8??1?xmV?5QH???a*??q4>k1?H??FD?V????bhZ???1eh????Tg4[?:Y??2b?V???+??2????@?k??,??g?k19?j4??s????D??NC?1?'?d?,??u?'O???)?D?j?f'H|?b?z??"?%"1?K?j%???Nu??r?"?????b?/???kQVa????e???(O??^*m-??l??j59O?Yz?J???cI????f??^'????i-<'Y|?qD^F/xF?t?????Z???Y1??R?j???*???3?I???-+????X?2????}Z?Jy???|b?y?????b$?;?jS??#T`38????J3C???l??+P??Q??I??0?5Qe?eA???U?/???
U?BKV?3?????)??3?????:??B?SP???S???T???=?????=?Dj????,??*+Fj??	??Z??+
s??H?N?TN??J?H???|?~??J????N??<b???Z?)?????[???w???f?T?X?L?_M?B(?H
`C??E@??(??Q?/??S????)?.?O9
??????`H??????f;,|$3?o?G?
[...14513 lines suppressed...]
+#?
`????V??P`?Hc*?P????C?$D&??5?4bBK??A8pI??????f?j?$?Vd),????h[a?XA??9A?? 
!i?
???yI????V??@??ik?=,$"???F ,XHB(3C??Ol?BP???8mn~?/??p??????*???????r?G?d,<5??@??_P~???~'?dc???^????HI$?f300?m??'????z?*?????n?)~?
?U{t?La	??aRE???Z??
y3y???~Yr??X?\
	???$??G?2??6z?H?"???C????sZ??_f?
8M
???{??'?????0?y*T???2B??h?c??@k??BF?v?? ??,???|/d?l?????	u8??7VO???H??z?w??D2?\m????D?z?<4?NW???%???2??f?????????'????o7??K???????^?<????ST?47???,?,????U6f0?EjE/y??Uf"??LSk??IlO?{?NOM5j=-???^t??~y??g{?!???W?5_???#??????????(?D??????:??q?|????????q??Wa???y5bh??d?vK?????i????&?x3???eh4?o?{:?/>??0z?????????p????w???M?.?????\d?????1?=;3 q?81I?n??cT?n\8n?%I?V?3iZJ??0??[???;????1?????.~???R??|4?p	????h????!?]4U?]????&8???=xY?2*??%	??m??\?i?eH??L$?M?3???X?EN?k8????3??k???	?,p???h??O'?W'?5E?Yk?2???(4??c?f\???3-?W1mnR?A?L?@c	??(?\????eU1?B?;l?
I
G[??B???????N???GHl???_8???]
?9?-}????? rnBq?b??b?v??Y,?_{???????
??<:h?Ll???mho?R??f??p?+?"?
?){&(?*9??4T??????????.?v?????q??_??K???7wf/B?????Z??? ?-??IKD=d??H??Bj??oDk/l*??
K??A?^?cO?0?3????@u2X?
??
h
," `HL?-n????,?K6?V??V?4d??@Z??c?fg?7??:2?)?@??????>)RF$X#????;?
? ?P"???????s?wc?=????? S$$H?D9-C0???d`4???A??8???
?Gr?M??????Yg?BH?C?Pqo?????R?????z4?}Z?k?*C?A??w8(hhYB=2? Q???%b?,?1\??2??THI????H?JI?`??!R?&b05?d?a1??????
,I*IC??A????@????X#CPxI%
z?>b-??C???V~??i???D????"?l?@???*??
}?
*??
?6)H??Qv?#?X??BD???- at l"4?}??
?Eq??~?J?????l_??!?{??E??t???O??r\???~???|0KjCQ?b??8,Clw#E$?Q	?$?:1???jH????S?????43??^?7?a_?}!~??(D?L

??+Y*L?e???[	Se*A4b?1	B?????=?+??'#??AS?????l??????X?Wo?????K-?(s|Bt?@?@]?p?*?"??	D_???"??DU?aEXAWP????

?)Q??&?L???I??CR??F???2?$2?????&????w?GeXs??<????OGnv???<????
??T!S`???,`$l??p??v??G?2?#?\A???o???p?QA??@ $B91??????C/?0??*L?????'?5M?{pY??????0;??wu????F?DQ?0??;?g?8??
5&?NC??cM0)l??sT???(??p=???C?c????\}4??<
:?]^5?d(
A(y?( \?m??^?>2?Ca@??OD.??/5?Q??
??h
Hd?V?X??
J?&???Z??
?m??rC????~??e;???P\	(B]
z?8???m
i0?BQD?Z?"??r2I?K,IQ????(a???,?sm???^?????E????}?WW(?	T???0?Y? ?	?$?3?`-$"?????*I?L??&;[-???h5~??(
e?~V?j
&!l,?F??2`?X?9@?,X`????al,X?Y$???YP?i>?????l?z?jqF???t????
2 E???Ox??-}X?)?@!Or!?76bqH ??PxrM????a??RH?61`|
?h{???Evn??~|6Q??AJ?7??!$P?A??*UU"y?T?v??HH??d?@?<?????@???*?UI0RBBB@h?4z??@dT?????????(;??????8?c??4W?
'jw?F????~?G	?)$????NJrH$"1 D?T???
??1?????TP?Ki?Ed??e??*2"?????y?A??@?u?i?h?R
????b
A?
?!"???dc,??0
"???Ad?*#$?dTHH!"$? (H
$U???mI??b???*??$???`??"
Gd?F0?@db?@X??tqz?&??????
4+-?!"?	?2??R? ???3O?6?$-$dd??????M???F??E(d
:?qH
???N?_??2??v??????
?E<$5Y????????h?V?N?NP47?V?$Ty at h?!xk????:@rH?ayQ????sp???SSQ(y?7????-'?a'/????
?1 A?Q?yA??
??J1V???
? k%`?b?AF??2?$Aa????j?D?????D?z1A?]$0?P????j???"uH??1K?	 D?~??!??I,?J??n(1?? b@??
0?CjG?????%A"J!??O?Y?Lh???????HhG??+??????}??	(??????d)V?@??@_?
~?Q?p????
J?P<;F?+u??I
h;{V??#??|j????K7??-y???IA??-pb4U?6?S?	c?????A??W?I??)LL
.R?????e/?XXl???f???EC??$???+? BC?"y?????????G:NA\????}a?z_?C??:'L?????}??JF?X?6???????C???F2?Id}H???P??N?
sC 4(?C?4FM0?a X???
P?6?%?A$F??X2I%d?@?%??[c?0?4b?U?
`??
~?E?YP?E
d(??J1b1E?hP??+XAFFAA$d["$X)??F??.e(*?cD$I`???{
??????	?? `?B????3?%`???WE??D???D^???.?p1\ $F!QD???!"??hJ?7?"f?Fh?O?83L$???r????4 ?&%S?,??C4?MYl?H?
??a??C:r? ??~??Ho>c????
jQ?A?D"?,X??bFH?1#??1?]dS???'F??TbFYA??~??bAf@
X?b&,??O???3\N?????P????`??h?????^HH?k???X?2?$?B??O?[?*??? ?B??
H?`?*??U
t???]??H7?i?>?"2??,?3?????OB_??3?up???S?????)b0????n}?v?{??=?????g?]y~?U??'"??L????S/?z??P?F?????#:?1?L????M?3?.?????Z??d?$7??!
?u?aP?d?IIDUEod??+?|dIW?z?s???5Z!!??1??R?R&H?G?k??????B??q[????????&?*??K>Y????Xm???????????MU??????j??0??aigCM5?????
H?\{?"??F#?C~?v??B????S7??XR??a??6DBF ???*??U
E?D?EEQEQE????F;??N?v? ??????<^6D???G???^??*????.?b?b??b?BT??J>@???$@??BA?"@??=?_1?I?.?E?X?i
??H? ?d@????*? ?Dc?|O?I at D?j?^G+`??9?T?'??N&?M??lq????A???Y??W?J'???x~l??????
??Z`?XA^Ra?'???????_?M
q??
?3???@??Z????_??Lys???We at MK??A????H?3 ?????H?J?Z??"?????i??1?)???M)?9
c ?~R?T????(nB!F?a?>O?"~?lS???\Q7!bh??JM?p}4i|8?*??B1
I
?,
?? ?Y?P?a2
??,4?P??@!V
?
"
?
?"????2?'?$?Hi??????
!??_?0??D?2?U4
?E???e>??????(?????P<p??8
??$!EED??UEQ+Q??7$??I
???E?S?}+g87?????w??????x????CU??)?XwI=????F
"
??

9?\
:Rc??BW???*`????q?#l????3?P?#?!
??>$a?S?`B!?? ?
??)@?F??? ??v????0?+ |??E?j"64?3?????>W?=?i????l?
?ED?fkD????m??G??_
???>a????uj???Eh{?B???X??@?B??)
$????~G?)`+ ? ?N???ys??;????(??s)
,????
?M+m???8?	FI ?cv???C????`?"????iQ.&??
??#q??Pc?Bi??T?G
??%e??????JJ?	=N?!C??a*1EN??x??A?n`??????E
8???m[?
t,?2
~?i\??t??a2?Q?1????fK
C-	m?H?T

?R%
4??bY`?e??TAIY
?d??H,dW???&?P?B?c!???JP?=??8???!nz?X??:?Q?????T??x@@s}iC??H??(eN??`QQ?I????I$^???(a6????3??T`
?P4??_????P?D??I.j2s
???CI
? L??
?eIb???`???HL?1?*`M?8?!6???m?Z?-&??u??d????????e????T\Nx?P???????;???h?????????$-?aMY?VM?n??(??????`?i??z??
??
???u	.:????{X@??T*????|n??"???6?E49b?F??
L?
?[?&??(?BH+"?)d?6D?Y?????P???y?3A`??4?H"??@?c?JE??Q3v"O3~?J?
????????^+E????y?9^P??????`I???????{?????????? ??????????'??????????2?R"z?
?K<?c???,)??Q
3?)ALX?p?hf?g?????|	#{????t?i)l?B?e3\l??6d
?TF????^?k????X7Fa?
??m?p????[?c
??w
 ??BP?@DYQ-eb0?X?m?
m@?,?E???H?V?!# 
???aVD@?
?b???"$H2 ?I??<B?????j?,?%pbEB???M??{?????;??????c??`-j??[?????
???B? @3?/*???U7r????N?
?eH`R??b?CE1??$V?aU?1OL
2C?i"	

?p?8??(????c4?u@?7???E?j??X?%
!R??a5!????*)Pn$?(C??????mD?4???RbX?p?
	Q$B??2_B4?	3-lc:???]B????m*g?w??=3?D??]????TRA?L#H?>s?6(?>??bW?????q?d?]?e8bcg??
W?7?
???KK2?EE??$?K??/?5Z\?EPh??????2Cv???f?X?tM?P2ePT(?J ?A??M?^?*(2M????^?&Pp???x??74Mc|??<!X????z?h6?~?????
???????;?t?FA?z???.?G?N]?$M??>???)u2????????"??e???dL?UU?8?j???Y?A????????$??#????c+?????	??
DQ?V?o?=?Q&?as????
'DKn?JdSy,?2??y??$
???r??????????
I?R??-i?2TrL<??{6?i?????+???L??%????????1??v?d????????2????B
|XjqY
,?P??b?E?6|9?A?>2O????q??(???K\?????p???-t)n?_r????0??>
????(??k`d?T?p??0{?F????D???v
??s?+?;?}"?1??}j?~?????????>?~p???????&fs????O5???FOu#D?JjB??"?<hs?;<?s?9?i???)?m?w??g?Xs?????s?.H?C??a#??3????? "?C?}???H!???v??,#!$???`lT??)??G?!?
????@?gh)?$??
J????#%F???6??`c
sE???d`?q?5?B*X??R)A?!?kR???b?

@?A?.????/?)????D?D????B???U???(d
b5-?????JT"`?|?H??$?CQH?Yp??E?<s	D?V
qH?
?ZQ?
H??"(L?*@?P?,?HQ(???2
??$???>CR_??]?????)????v?o???p?F?????:?hM??-S?nx
???J?2;??]???C???;??bn2?X??`@??&??M???{:]4?7T?]?!G.%?&?r??X"?TM????)?77k(qC9?P:N?@6???x????q?????R??d???
???dI"???i????8?[/b<
$??????I?\`
p??LB?????w2??
?i??acZFLB?J$(???\? d???E?J$??"6??A% P?$-im???K?
???Z?????a???&?Z??BJP??jY?4
0?)L?,7FD
$0t?-?P??A????R@??@?8Ep$1@&?
?"????Y(?????ai%Q?`El? 4??????B1??K??YP??2*
!}V????
B+??tQbC??dQP

??7?@?
"HrRJI!""?P
?
V?Y)2?D rB??*kD?
!?P?D$??  ?

)
[+
V?+Q???b?F)?7???*BjA??,??#$?,??????c??j`??L?!???dT????@?pX@?%GBa'???Q5h6%?(`?????h?D?!*C,??x*1P?
:??D?@$Cq
MF
Dg?e????F *149T
?:???

B?X??)(@??X?D?O1?1??$
2??6r?dq&?`?H#e dHX at I?A??"B( ?E#??]h??w???? B?T??h???(?E??2?O!?3?
?m?j"??
?]?qK?	^F?d???S??d??b???{?.??????<?7??]Y???????_?Y$AI??? ???F`'??????y??z
??)2??</
d_5?????%?????3??l?D?H?=????	????tR?&?.?9Lr?3?4r???5??!)??$
???????(?L?8??@?"H?Uh^=p?!?'?
9?(????$\W???m??@?#,L???pojF??y?s ????0	
???9BX5?\?{#c
??#A??	K?Ec E??A??(?H2????C?~F`d8!?
???)F?k"?/???"?\(??7=j??? ??PI @.*40?c
`)??????t?(L)?@MB?k@?X 2?
?C?$`?@?Y
T?<???????0?4;??!???y?@w??a??z??#,?D6'???7O?We
???M
m^?B`pb???*T?tB?[FT??XA??#?wl????!$??!???s???R?
P????????9?$P^?;????I??`?0c?@`D$?
@B$?Bp)??Pdr1`?D? "!???
?#(B ?$$?
C???"?E?R(TVYl(P??%
?)?vT?"?????F;
???OH???#"???F3?0?
???
=??pf???|?MIusr@?$?? ,dEP/?3???????|???a?<\:Y???P??`??
-???v:?=1B?"??! ?? K???6??"??1?e&8??
?#O??t]?`???\!
?~Av???????-z?:???W???+?.|??6.?Ahry%?/?2jj???pMf???6?[?oCF?C? ??99?v5?3???x?????DD???LJ?+?>????????qE?f?m???.?2_;;??IM1?f??+oU5c???p????4?????e????????+
?I@??
?????
???1??
??$???s]???L8????A?XE??B$???
?<??"?????P?
"!?&*;?????*)
(??:?J?"?y
?e;L
Y?CL?#5???S?????J?!h?9?b:?,??!?Y	?I??H?
??X??e(?-fP,TD?[??????(?S????????
6?V??dD at I?l?*??n?,PIo?i??y?l???C`?6??X??d?????(-d?@??@?&Vt?>?5? ?O????*R???4((???w-?4uB??S
SIL??1?4P@?YDQ"x??????$???3?G?
???9?X`?7t37
%??$?????F?\3?F?;??Y??????0$?4??rd,?2(i?of??a2?j?/??7s'??????i??????)u??,miF?T
V??E
[
?h?????<u?W?xCpQ"n
	"??i?6?0,	&H?0" ?A?(?Q??#
V"E??Ho%
?7??Bd?{03%O|1?W?C
 ?
???a??P? -??,4N??0QNCFCRF4??dP??? ?"*!?""?I>???
???r?&\0?a?r?
3?O?RR?ZP??	(??9?~????2???8"?0?i???w?R:X?G?>????!????On??wt"???2
A#e1>D?!'$??rP?k????0?P?~?????????o?Cnr?$?A???a@:
x???L?sRY?S??i??????????????????S??G????7?(#S???
z?V?u????m\??<?E$pUv`;??7wF???????;O?raV?U_h??
?a?v?7*?w?w??c$???6?H3??4{??>?|??\[
SDC??*????as
???x
?O?z???!)<j?{@???	vTa????!*??'??=?0a??%g[?@R????Z???'?H??,`?????KT???}E?
%B??1mX
?H}???4~??????D?D?D?F
s??R)?@{H E7?????$?*A$a;*1?_H?(?x?d
??@J??1>????/

??w}z at .??#?! ?AXH
?3(?p??B1????\??P?)j???(4??
AM ?4??MR??	Y1?n??j7l)??h??A?>NM?]]?6??C*??
T$?8???$?R??,?Y?????&a??{?????2#??QG??
?y????ry&
UI?P
?L??? ??3!d??Us!,
?,??B??k$.!B.6P?(DeB??X????
?0????m?-?l?U???zz?(?{~???qcV???????;?dCO/??'(????C;?DCd?"?[[,"QM???????lf????%?6??????P??????"0P at 9VNl??>???c#?	?
iI;=??P??}?Y?3??P??!U??s?
?@?^?JW?M???j
?Z9?e???;-Q?X?A?`?;??S{????????|?1,??3?
?????????4aBc=}???M??
\?m
??D?-A?u-?A?6??gM_S?FQ???$`j?????n]???b???c????X????^????m???G??3T(??Y5
Z?5?gi?w??y??x?K,???CO??
y??S??p?~9????N_}To???b.t?.?.r&??/6Q
?2J ????o??e;??D?
U??a????2"??Y?al
2???q??M????? &??-H-aL?????<0q??!??Lq?G(???u??L??` !????Q5??9S)???}?p(?5{b?5DX$v|?HI?PJ0????<S"?????8??????47u??iFw?Xm?ip??r???#????$????>3x?1??+????t???n#???T?U????h%?8?cKI?0?fxP?(:?"???B5o??Dh????68m??$B??-???????J?C?U?"0hizJ?=???*??
?bP)J?<???z?AZp????B,?K?)B???8-K*0Q"??b?t?????ZH???R?c???S	???!?U?j?R ~qRh??y???}Y??5zxT?????s?33+?@$?N???m???k??S94??!.V?????|???@?]???x.EK?????x??DA?67??4??4P??MD&?"???\?`(?.????Y?a?z?f:R+?????b??]?	?!?q,.Yk??m??
?b???p??????????~5??9?fe???s8???~??8???<C??M?fh?s?]?Wa??!z?yST9t?!??Y:`???"{????
?t~C????1(?(? ??Ic]<Hk/F??a??S?3?!?????I{	C??????5?
??sS
?jk?Y
??K??A/G59???35?0???JkWx^Gc???L	??N?
???@R@?NWk????o?D???I?0NNw?Q|???????&H????[m,??8|U>??
???ID??K
Q?bH\?P?_?C???n?2ya|??6??0?e??eO?????8??Um????O????????
H{,S????NJ?!E^??,?%?c?F1T?(Q?>?????B|???v???Z.Q??e<?$
??C?
G0k???7- Y??
.?H??? ?????????!POA?=??Xp?????=?ZdD?Z???X????u???"?,?3l?
???_a???;(???]Ow?n?s2}"A?|????jl?0s?????Q????
e?BUR
?^?"6???wW??W??f??p??G8????8?????5??cUeyt?_???\d$	zQ? !?
.?.?"?	?[??????d*B????jI???:*0{c?????
?jU)?Is?Hwxry??"??L?	??r~?J????m*Q?`?Q??g<?!!??pNp?a?:?@??UQb???!?g?|}?zC?O?^????,AF"A
$"2??H???K??E	?????#??!+?U-???
$#IdVA?e2
??O?'?PRH??"
????????]A?
??PQ?S??@Y????????;??
??~?UR???l????d?i$??????>"R??`\??(??pz?????X?"?B???4i??D?
?.74n??J??
.??hZ#`?<??;I????????B???@?'??$?~&?J9uJ?"5?'<????
?C?
?????????O???U+A+}?!?Z?Z??TC??p]2??H*??5)?P???c????v???????????w?}???t????F?xw?&???D??O02I?????-eJXS?Aw?0?!???!?????EM???V?"?v??J7J]#!?|????w?l??a?>????`U??????>??O????oo????u?????eh[z}?8??$>?l??r^?????P?e	??U?|???L?4p
'/????Ax[?\?\n	
UXM6?fg>?P?m??}?'???D??>8???????z??M???!?)?u?G!?=?_;????l?I??m?4PD?h`???k?t?W?H???????q?W?x?s8jg{?hD???}?I$???^????R{h
w%??e	?A????'?B???-??oq???13?*?:????????F??~I%LF8??m????80[z?R?dt?Db?8PzPF?????C???????????
j?$??????L?6f???UU?J?w??[?????0
Bk?}{????G?542?xtR?g?0????	?-J?Q??x??????I?Jp?E?s5f????????d??)#?:uF?$??&?E??"iF?9w?"?	?;??t\??FW??r?????????????+?I????????l??g?USX???????F?zFD??Q?"#@??Vb?????6???MG?1?a0?b???Fhgl?Y???W?v?s?V??9w?*?)???BP??a??b??T?2p?C$Ff??B??r??3d?oF?<?{u??H??	?c?o?$vF??@???6??I7?E5?$?w??`?Sd?ZX`???ud
N~??d??N???Xq?/4?>?QEH??

???`?@?iK?k2g65??p?!?"?K????c??h?????@?/)W?c"	<?nF("c&???????Q
Bh8pB?,,R???R
-?1b0?!h?En
4?a?$&????
?=+g3??`p???H?H?xI?%y?????0B??C??0M?????B?r????8r?h?_??q s,A?:i??S?L@?????ri?C?^??ob?0I?zFy<<?^
?4???
dYp?*?@L
???\g???dz?:Wx???eK
(???
(??i???JA?jm&??J??g??<??6?
???ja
j?$?M'1
??D
??6*?IJDQ?"?ab^???KK???L??Y+????vM?1
?u?uy?????
Pfl?d???
?M????	?]u??????????<??I?z1i?MJ?N?b?5b?(?b???B??D??8@{C?C??Dc`QI?F@???*L??Wl?????MZv?i%R?R??j?????D@@??(K41I?2?????{*?+9???L?21?1AH??b?+?b??+,X??N?i?PX+?JH?S !^ ?????q4??????Z?
??DIXi? Y?MS5?
Z\q?.8e?.9??0?8??,n???S????0???s2?x?g(q??1+?naq????0??Z????5
???1-?,?7VD??????9?1?)?aLs
c?S!:5?E^?Tj?
??	???o???$`D?B ?'???O>!q???AJR????
?6l?
?QEM?d??T?	a,(???%?
_A=h?
x?"
??@?P?R?'??(b b?W?pW?a??~?H(??(?D`&??h!??\g?o??
W???v??
?YB?Z?'a?T=1A?>5QTU?)d?$$??>?M_?(??k^Y=m??&Ip?????k??R?.??J??k?E?#?:'N??KB???????U??=?~@?m?
??\3??hW??d??H?"2H(??
?\"(?P???X?
aKX?p???l???
4b?#????*????8??0R?0
?h??aj6?,FMa  ,? H^p%?Qj?HR%f?2Ye$?D

?ZRL
?????q???n`?v?w?C6?RCeac??s???H?!??,?A????h0???????\?t????qGU?,?"5WP??????8?t9?~?
R.???X??hmA??B???0I??C?'
????'?? ,,>??u??A"r?*#??{?0???>I?E??X???Rr.Z?,<?F?q?Bs??v?$
E ?:?!I2????|?B,D?? 0FE???
?w??{6>a^???"?*B#??C?j#?T~????/?3Hn?-I?y????????5fM1??>?34&k?o??????cY???????f??]J??juhvfn?:?)?;?4??
oe?x?3???????\ ???????h??8?
?,?)V????dK0T=Wg????
?EP?{???)?
!?J????!?iK??-?U???"?"H??"?D8>G?	?a???D???@!??m?????VDV?P??A=???b[f?????PAy???????0??5???-jbth?b??Q???
??????ai??????V??9????R???LG???K?tM?Cz??=?x)????N???????AH?@VI??%?(x?
?????|?????|?n+?<[b?#
?7^?#$?H???*#??
?	??s?`?m:),?A'??D?bF|??wz??@?`v"?4e???8#9???:M??I!2??\L??9"??????S<
.{??)T?#?????????&??w?????[?_????? ?a?J*ntp at x?!v????QAH???f????=?????jOE
?????d
8??????$???Aj(?)]?.NJ|dX?# }[?8?L
??_?????	m??Q*F1?(?B??????Eat?!?D,&`?u?KN????O?<??1???u?z?=Y-???
?? ???????DH$A??p?e?B?G?'O?>K.???-z?/?_??/?~???~hDIqGQ?><??Yt??
T]$?l??;F??5 ??Q?A	?
??U?$"????8gX??aD?X??t`????"A?	??#
` 	?

"?D?8?LV??^5?S???)??
%Z
cI???d??Y*dF"V?Aa???u?"?+C?????Ab?]{?!????D??????$bR
	?5????a]5)_?

????????f?a?????s??`??
e??l??}JB?
`??Yq|E:L?ta?*?u?c?5<+Tq????NJ????}I L
?@?ZQ@???S??H@!?H0??c
`???	c?9??z??@5???v ??`D?
??
??t?? ??O(?;?R?O>7?? ????????`??????!????ct????P??A$"DA?V????????????"}?????]????o?\j??9Ej?Pd<???5?:J4!i?E#?x.?
g???1??!D??1????)A?A?i	T???J??p8S???H??Y?YP??
SPNX1(??u????T`w??$?5 ????n???Az?{{{u?=x?db??????b???a??)=???O??????d$`?f??PE?C?-rw?????}???Y?C??????
;4^?G????RN?[L??G????)???t??
gcc41-java-backport2.patch:
 Makefile.am |   26 ++++++++++++++++++++++++--
 Makefile.in |   24 ++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

--- NEW FILE gcc41-java-backport2.patch ---
--- libjava/Makefile.am.jj	2006-07-20 13:56:09.000000000 +0200
+++ libjava/Makefile.am	2006-07-20 19:27:41.000000000 +0200
@@ -316,8 +316,30 @@ $(propertyo_files): %.lo: classpath/reso
 	$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
 
 libgcj-$(gcc_version).jar: classpath/lib/compile-classes
-	cd classpath/lib; $(JAR) -cfM \
-	    ../../libgcj-$(gcc_version).jar gnu java javax org
+## The following is an attempt to have libgcj-*.jar files
+## from the same GCC version identical across the architectures.
+	javasrcdir=`cd $(srcdir) && pwd`; \
+	cd classpath/lib; \
+	JARDIR=`mktemp -d ../$@.XXXXXX` || exit 1; \
+	for d in `find gnu java javax org -type d | LC_ALL=C sort`; do \
+	    mkdir -p $$JARDIR/$$d; \
+	done; \
+	touch -r $$javasrcdir/../gcc/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/../gcc/java/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/../gcc/java/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/ChangeLog $$JARDIR.stamp; \
+	for f in `find gnu java javax org -type f | LC_ALL=C sort`; do \
+	    cp $$f $$JARDIR/$$f; \
+	    touch -r $$JARDIR.stamp $$JARDIR/$$f; \
+	done; \
+	touch -r $$JARDIR.stamp `find $$JARDIR -type d`; \
+	cd $$JARDIR; \
+	find gnu java javax org | LC_ALL=C sort \
+	  | $(JAR) -cfM at E \
+	    ../../libgcj-$(gcc_version).jar || exit; \
+	cd -; \
+	rm -rf $$JARDIR $$JARDIR.stamp
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
 	cp $< $@
--- libjava/Makefile.in.jj	2006-07-20 13:55:59.000000000 +0200
+++ libjava/Makefile.in	2006-07-20 19:27:53.000000000 +0200
@@ -8880,8 +8880,28 @@ $(propertyo_files): %.lo: classpath/reso
 	$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
 
 libgcj-$(gcc_version).jar: classpath/lib/compile-classes
-	cd classpath/lib; $(JAR) -cfM \
-	    ../../libgcj-$(gcc_version).jar gnu java javax org
+	javasrcdir=`cd $(srcdir) && pwd`; \
+	cd classpath/lib; \
+	JARDIR=`mktemp -d ../$@.XXXXXX` || exit 1; \
+	for d in `find gnu java javax org -type d | LC_ALL=C sort`; do \
+	    mkdir -p $$JARDIR/$$d; \
+	done; \
+	touch -r $$javasrcdir/../gcc/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/../gcc/java/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/../gcc/java/ChangeLog $$JARDIR.stamp; \
+	[ $$javasrcdir/ChangeLog -nt $$JARDIR.stamp ] \
+	    && touch -r $$javasrcdir/ChangeLog $$JARDIR.stamp; \
+	for f in `find gnu java javax org -type f | LC_ALL=C sort`; do \
+	    cp $$f $$JARDIR/$$f; \
+	    touch -r $$JARDIR.stamp $$JARDIR/$$f; \
+	done; \
+	touch -r $$JARDIR.stamp `find $$JARDIR -type d`; \
+	cd $$JARDIR; \
+	find gnu java javax org | LC_ALL=C sort \
+	  | $(JAR) -cfM at E \
+	    ../../libgcj-$(gcc_version).jar || exit; \
+	cd -; \
+	rm -rf $$JARDIR $$JARDIR.stamp
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
 	cp $< $@

gcc41-java-libdotdotlib.patch:
 configure    |    5 +++++
 configure.ac |    5 +++++
 2 files changed, 10 insertions(+)

--- NEW FILE gcc41-java-libdotdotlib.patch ---
2006-07-20  Jakub Jelinek  <jakub at redhat.com>

	* configure.ac (toolexeclibdir, dbexecdir): Canonicalize /lib/../lib
	to /lib.
	* configure: Rebuilt.

--- libjava/configure.ac.jj	2006-07-20 14:01:02.000000000 +0200
+++ libjava/configure.ac	2006-07-20 16:36:31.000000000 +0200
@@ -1262,6 +1262,7 @@ case ${version_specific_libs} in
     multi_os_directory=`$CC -print-multi-os-directory`
     case $multi_os_directory in
       .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
+      ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;;
       *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
     esac
     ;;
@@ -1278,6 +1279,10 @@ case $multi_os_directory in
    dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
    ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
    ;;
+  ../lib*)
+   dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))'
+   ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
+   ;;
   *)
    dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
    ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
--- libjava/configure.jj	2006-07-20 14:01:02.000000000 +0200
+++ libjava/configure	2006-07-20 16:45:24.000000000 +0200
@@ -14863,6 +14864,7 @@ case ${version_specific_libs} in
     multi_os_directory=`$CC -print-multi-os-directory`
     case $multi_os_directory in
       .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
+      ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;;
       *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
     esac
     ;;
@@ -14879,6 +14881,10 @@ case $multi_os_directory in
    dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
    ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
    ;;
+  ../lib*)
+   dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))'
+   ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"
+   ;;
   *)
    dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
    ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`"

gcc41-java-plugins.patch:
 Makefile.am                                |    4 +---
 Makefile.in                                |    4 +---
 classpath/native/jawt/Makefile.am          |    1 +
 classpath/native/jawt/Makefile.in          |    1 +
 classpath/native/jni/gtk-peer/Makefile.am  |    1 +
 classpath/native/jni/gtk-peer/Makefile.in  |    1 +
 classpath/native/jni/midi-alsa/Makefile.am |    1 +
 classpath/native/jni/midi-alsa/Makefile.in |    1 +
 classpath/native/jni/midi-dssi/Makefile.am |    1 +
 classpath/native/jni/midi-dssi/Makefile.in |    1 +
 classpath/native/jni/qt-peer/Makefile.am   |    3 +--
 classpath/native/jni/qt-peer/Makefile.in   |    2 +-
 12 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE gcc41-java-plugins.patch ---
--- libjava/classpath/native/jni/midi-alsa/Makefile.am.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/midi-alsa/Makefile.am	2006-07-20 19:34:50.000000000 +0200
@@ -5,6 +5,7 @@ gnu_javax_sound_midi_alsa_AlsaPortDevice
 gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
 
 libgjsmalsa_la_LIBADD = -lasound
+libgjsmalsa_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
--- libjava/classpath/native/jni/midi-alsa/Makefile.in.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/midi-alsa/Makefile.in	2006-07-20 19:37:14.000000000 +0200
@@ -303,6 +304,7 @@ gnu_javax_sound_midi_alsa_AlsaPortDevice
 gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
 
 libgjsmalsa_la_LIBADD = -lasound
+libgjsmalsa_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa`
--- libjava/classpath/native/jni/midi-dssi/Makefile.am.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/midi-dssi/Makefile.am	2006-07-20 19:35:13.000000000 +0200
@@ -5,6 +5,7 @@ libgjsmdssi_la_SOURCES = gnu_javax_sound
 			 dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+libgjsmdssi_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
--- libjava/classpath/native/jni/midi-dssi/Makefile.in.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/midi-dssi/Makefile.in	2006-07-20 19:37:14.000000000 +0200
@@ -303,6 +304,7 @@ libgjsmdssi_la_SOURCES = gnu_javax_sound
 			 dssi_data.h
 
 libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack
+libgjsmdssi_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ 
 AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
--- libjava/classpath/native/jni/qt-peer/Makefile.am.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/qt-peer/Makefile.am	2006-07-20 19:35:59.000000000 +0200
@@ -77,9 +77,8 @@ libqtpeer_la_SOURCES = \
         slotcallbacks.cpp \
         slotcallbacks.h 
 
-## GCJ LOCAL: encode the library path and  use GCJ's library version
 libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-	-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+	-avoid-version
 
 BUILT_SOURCES = $(libqtpeer_la_MOC)
 
--- libjava/classpath/native/jni/qt-peer/Makefile.in.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/qt-peer/Makefile.in	2006-07-20 19:37:14.000000000 +0200
@@ -389,7 +390,7 @@ libqtpeer_la_SOURCES = \
         slotcallbacks.h 
 
 libqtpeer_la_LDFLAGS = -rpath $(gcjversionedlibdir) \
-	-version-info `grep -v '^\#' $(top_srcdir)/../libtool-version`
+	-avoid-version
 
 BUILT_SOURCES = $(libqtpeer_la_MOC)
 CLEANFILES = so_locations $(BUILT_SOURCES)
--- libjava/classpath/native/jni/gtk-peer/Makefile.am.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/gtk-peer/Makefile.am	2006-07-20 19:34:15.000000000 +0200
@@ -52,6 +52,7 @@ libgtkpeer_la_SOURCES = gnu_java_awt_pee
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
+libgtkpeer_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
--- libjava/classpath/native/jni/gtk-peer/Makefile.in.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jni/gtk-peer/Makefile.in	2006-07-20 19:37:12.000000000 +0200
@@ -392,6 +393,7 @@ libgtkpeer_la_SOURCES = gnu_java_awt_pee
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \
 		       $(top_builddir)/native/jni/classpath/jcl.lo
 
+libgtkpeer_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
 
--- libjava/classpath/native/jawt/Makefile.am.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jawt/Makefile.am	2006-07-20 19:36:51.000000000 +0200
@@ -2,6 +2,7 @@ nativeexeclib_LTLIBRARIES = libjawt.la
 
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
+libjawt_la_LDFLAGS = -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
--- libjava/classpath/native/jawt/Makefile.in.jj	2006-07-20 13:56:00.000000000 +0200
+++ libjava/classpath/native/jawt/Makefile.in	2006-07-20 19:37:11.000000000 +0200
@@ -298,6 +299,7 @@ vm_classes = @vm_classes@
 nativeexeclib_LTLIBRARIES = libjawt.la
 libjawt_la_SOURCES = jawt.c
 libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
+libjawt_la_LDFLAGS = -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
--- libjava/Makefile.am.jj	2006-07-20 19:27:41.000000000 +0200
+++ libjava/Makefile.am	2006-07-20 19:32:28.000000000 +0200
@@ -251,9 +251,7 @@ libjvm_la_SOURCES = jni-libjvm.cc
 libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
 ## See jv_convert_LDADD.
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-## The mysterious backslash in the grep pattern is consumed by make.
-libjvm_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 
 ## The .db file.  This rule is only used for native builds, so it is
 ## safe to invoke gcj-dbtool.
--- libjava/Makefile.in.jj	2006-07-20 19:27:53.000000000 +0200
+++ libjava/Makefile.in	2006-07-20 19:37:45.000000000 +0200
@@ -801,9 +801,7 @@ libgcj_tools_la_LINK = $(LIBLINK)
 libjvm_la_SOURCES = jni-libjvm.cc
 libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
 libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
-libjvm_la_LDFLAGS = \
-        -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
-
+libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
 lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
 lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
 lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \

gcc41-pr28407.patch:
 0 files changed

--- NEW FILE gcc41-pr28407.patch ---
2006-07-20  Jason Merrill  <jason at redhat.com>

	* tree.c (remove_attribute): New fn.

	PR c++/28407
	* decl.c (grokvardecl): Set DECL_THIS_STATIC on file-scope
	const variables with implicit internal linkage.
	* tree.c (decl_linkage): Only return lk_external if it's set.

	PR c++/28409
	* decl2.c (constrain_visibility): Ignore the anonymous namespace 
	for extern "C" decls.
	(VISIBILITY_STATIC): Rename to VISIBILITY_ANON.

	* decl2.c (constrain_visibility): Remove specified and reason 
	parameters.  Don't touch decls that already have explicit visibility.
	(determine_visibility): Do copy DECL_VISIBILITY_SPECIFIED from 
	template.
	(determine_visibility_from_class): Reverse sense of 
	DECL_VISIBILITY_SPECIFIED test for target-specific visibility rules.
	(constrain_class_visibility): Only complain about member visibility
	if the member type is another class.  Don't change visibility of the
	current class.

--- gcc/doc/extend.texi	(revision 115621)
+++ gcc/doc/extend.texi	(revision 115622)
@@ -2346,6 +2346,9 @@ restriction is implicitly propagated to 
 Otherwise, template instantiations and specializations default to the
 visibility of their template.
 
+If both the template and enclosing class have explicit visibility, the
+visibility from the template is used.
+
 @item warn_unused_result
 @cindex @code{warn_unused_result} attribute
 The @code{warn_unused_result} attribute causes a warning to be emitted
@@ -3465,6 +3468,13 @@ applied to class, struct, union and enum
 attributes, the attribute must appear between the initial keyword and
 the name of the type; it cannot appear after the body of the type.
 
+Note that the type visibility is applied to vague linkage entities
+associated with the class (vtable, typeinfo node, etc.).  In
+particular, if a class is thrown as an exception in one shared object
+and caught in another, the class must have default visibility.
+Otherwise the two shared objects will be unable to use the same
+typeinfo node and exception handling will break.
+
 @subsection ARM Type Attributes
 
 On those ARM targets that support @code{dllimport} (such as Symbian
--- gcc/tree.c	(revision 115621)
+++ gcc/tree.c	(revision 115622)
@@ -3499,6 +3499,28 @@ lookup_attribute (const char *attr_name,
   return NULL_TREE;
 }
 
+/* Remove any instances of attribute ATTR_NAME in LIST and return the
+   modified list.  */
+
+tree
+remove_attribute (const char *attr_name, tree list)
+{
+  tree *p;
+  size_t attr_len = strlen (attr_name);
+
+  for (p = &list; *p; )
+    {
+      tree l = *p;
+      gcc_assert (TREE_CODE (TREE_PURPOSE (l)) == IDENTIFIER_NODE);
+      if (is_attribute_with_length_p (attr_name, attr_len, TREE_PURPOSE (l)))
+	*p = TREE_CHAIN (l);
+      else
+	p = &TREE_CHAIN (l);
+    }
+
+  return list;
+}
+
 /* Return an attribute list that is the union of a1 and a2.  */
 
 tree
--- gcc/tree.h	(revision 115621)
+++ gcc/tree.h	(revision 115622)
@@ -3696,6 +3696,11 @@ extern int is_attribute_p (const char *,
 
 extern tree lookup_attribute (const char *, tree);
 
+/* Remove any instances of attribute ATTR_NAME in LIST and return the
+   modified list.  */
+
+extern tree remove_attribute (const char *, tree);
+
 /* Given two attributes lists, return a list of their union.  */
 
 extern tree merge_attributes (tree, tree);
--- gcc/testsuite/g++.dg/ext/visibility/template6.C	(revision 0)
+++ gcc/testsuite/g++.dg/ext/visibility/template6.C	(revision 115622)
@@ -0,0 +1,17 @@
+// Test for explicit visibility taking precedence
+
+// { dg-require-visibility "" }
+// { dg-final { scan-not-hidden "_ZN1AIiE1fEv" } }
+
+template <class T> struct A
+{
+  // This attribute takes precedence over...
+  __attribute ((visibility ("default"))) void f ();
+};
+
+template <class T>
+void A<T>::f ()
+{ }
+
+// ...this attribute.
+template struct __attribute ((visibility ("hidden"))) A<int>;
--- gcc/testsuite/g++.dg/ext/visibility/warn2.C	(revision 115621)
+++ gcc/testsuite/g++.dg/ext/visibility/warn2.C	(revision 115622)
@@ -14,6 +14,6 @@ struct B
   N::A a;
 };
 
-B f () { }			// { dg-warning "visibility" }
+N::A f () { }			// { dg-warning "visibility" }
 
 struct C: public N::A { };	// { dg-warning "visibility" }
--- gcc/testsuite/g++.dg/ext/visibility/warn3.C	(revision 115621)
+++ gcc/testsuite/g++.dg/ext/visibility/warn3.C	(revision 115622)
@@ -1,11 +1,32 @@
-// Warn when a class member is specified to have greater visibility than
-// its class.
+// Tests for various visibility mismatch situations.
 
 // { dg-require-visibility "" }
 
+// { dg-final { scan-not-hidden "_ZN1A1fEv" } }
+
 struct __attribute ((visibility ("hidden"))) A
 {
-  __attribute ((visibility ("default"))) void f (); // { dg-warning "visibility" }
+  // This is OK, A::f gets default visibility.
+  __attribute ((visibility ("default"))) void f ();
 };
 
 void A::f() { }
+
+// This gets a warning; it should have explicit visibility of some sort.
+A* afactory1() { return new A; }	// { dg-warning "visibility" }
+
+// This is OK.
+__attribute ((visibility ("default"))) A*
+afactory2 () { return new A; }
+
+// This gets a warning.
+struct B
+{				// { dg-warning "visibility" }
+  A a;
+};
+
+// This one has explicit visibility, so it doesn't get a warning.
+struct __attribute ((visibility ("default"))) C
+{
+  A a;
+};
--- gcc/testsuite/g++.dg/lookup/anon5.C	(revision 0)
+++ gcc/testsuite/g++.dg/lookup/anon5.C	(revision 115622)
@@ -0,0 +1,21 @@
+// PR c++/28409
+// shouldIbevisible should be emitted because it's an extern "C" decl with
+// external linkage, even though it's in the anonymous namespace.
+
+namespace
+{
+  extern "C" int shouldIbevisible()
+  {
+    return 0;
+  }
+}
+
+namespace t
+{
+  extern "C" int shouldIbevisible(void);
+}
+
+int main(void)
+{
+  return t::shouldIbevisible();
+}
--- gcc/testsuite/g++.dg/template/anon4.C	(revision 0)
+++ gcc/testsuite/g++.dg/template/anon4.C	(revision 115622)
@@ -0,0 +1,10 @@
+// PR c++/28407
+// A declaration in the anonymous namespace still has external linkage.
+
+template <int *P> class A { };
+namespace
+{
+  int i;
+}
+
+A<&i> a;
--- gcc/cp/decl.c	(revision 115621)
+++ gcc/cp/decl.c	(revision 115622)
@@ -5246,6 +5246,14 @@ cp_finish_decl (tree decl, tree init, bo
 	{
 	  layout_var_decl (decl);
 	  maybe_commonize_var (decl);
+	  if (DECL_NAMESPACE_SCOPE_P (decl) && !TREE_PUBLIC (decl)
+	      && !DECL_THIS_STATIC (decl) && !DECL_ARTIFICIAL (decl))
+	    {
+	      /* This is a const variable with implicit 'static'.  Set
+		 DECL_THIS_STATIC so we can tell it from variables that are
+		 !TREE_PUBLIC because of the anonymous namespace.  */
+	      DECL_THIS_STATIC (decl) = 1;
+	    }
 	}
 
       make_rtl_for_nonlocal_decl (decl, init, asmspec);
--- gcc/cp/tree.c	(revision 115621)
+++ gcc/cp/tree.c	(revision 115622)
@@ -2189,7 +2189,10 @@ decl_linkage (tree decl)
   /* Things that are TREE_PUBLIC have external linkage.  */
   if (TREE_PUBLIC (decl))
     return lk_external;
-  
+
+  if (TREE_CODE (decl) == NAMESPACE_DECL)
+    return lk_external;
+
   /* Linkage of a CONST_DECL depends on the linkage of the enumeration 
      type.  */
   if (TREE_CODE (decl) == CONST_DECL)
@@ -2209,6 +2212,14 @@ decl_linkage (tree decl)
   if (decl_function_context (decl))
     return lk_none;
 
+  /* Members of the anonymous namespace also have TREE_PUBLIC unset, but
+     are considered to have external linkage for language purposes.  DECLs
+     really meant to have internal linkage have DECL_THIS_STATIC set.  */
+  if (TREE_CODE (decl) == TYPE_DECL
+      || ((TREE_CODE (decl) == VAR_DECL || TREE_CODE (decl) == FUNCTION_DECL)
+	  && !DECL_THIS_STATIC (decl)))
+    return lk_external;
+
   /* Everything else has internal linkage.  */
   return lk_internal;
 }
--- gcc/cp/pt.c	(revision 115621)
+++ gcc/cp/pt.c	(revision 115622)
@@ -6589,7 +6589,12 @@ tsubst_decl (tree t, tree args, tsubst_f
 
 	/* Possibly limit visibility based on template args.  */
 	DECL_VISIBILITY (r) = VISIBILITY_DEFAULT;
-	DECL_VISIBILITY_SPECIFIED (r) = 0;
+	if (DECL_VISIBILITY_SPECIFIED (t))
+	  {
+	    DECL_VISIBILITY_SPECIFIED (r) = 0;
+	    DECL_ATTRIBUTES (r)
+	      = remove_attribute ("visibility", DECL_ATTRIBUTES (r));
+	  }
 	determine_visibility (r);
       }
       break;
@@ -6791,7 +6796,12 @@ tsubst_decl (tree t, tree args, tsubst_f
 	  {
 	    /* Possibly limit visibility based on template args.  */
 	    DECL_VISIBILITY (r) = VISIBILITY_DEFAULT;
-	    DECL_VISIBILITY_SPECIFIED (r) = 0;
+	    if (DECL_VISIBILITY_SPECIFIED (t))
+	      {
+		DECL_VISIBILITY_SPECIFIED (r) = 0;
+		DECL_ATTRIBUTES (r)
+		  = remove_attribute ("visibility", DECL_ATTRIBUTES (r));
+	      }
 	    determine_visibility (r);
 	  }
 
--- gcc/cp/decl2.c	(revision 115621)
+++ gcc/cp/decl2.c	(revision 115622)
@@ -1572,7 +1572,7 @@ maybe_emit_vtables (tree ctype)
 /* A special return value from type_visibility meaning internal
    linkage.  */
 
-enum { VISIBILITY_STATIC = VISIBILITY_INTERNAL+1 };
+enum { VISIBILITY_ANON = VISIBILITY_INTERNAL+1 };
 
 /* walk_tree helper function for type_visibility.  */
 
@@ -1588,7 +1588,7 @@ min_vis_r (tree *tp, int *walk_subtrees,
     {
       if (!TREE_PUBLIC (TYPE_MAIN_DECL (*tp)))
 	{
-	  *vis_p = VISIBILITY_STATIC;
+	  *vis_p = VISIBILITY_ANON;
 	  return *tp;
 	}
       else if (CLASSTYPE_VISIBILITY (*tp) > *vis_p)
@@ -1608,29 +1608,28 @@ type_visibility (tree type)
   return vis;
 }
 
-/* Limit the visibility of DECL to VISIBILITY.  SPECIFIED is true if the
-   constraint comes from an attribute or pragma; REASON is the source of
-   the constraint.  */
+/* Limit the visibility of DECL to VISIBILITY, if not explicitly
+   specified (or if VISIBILITY is static).  */
 
 static bool
-constrain_visibility (tree decl, int visibility, bool specified,
-		      const char *reason)
+constrain_visibility (tree decl, int visibility)
 {
-  if (visibility == VISIBILITY_STATIC)
+  if (visibility == VISIBILITY_ANON)
     {
-      TREE_PUBLIC (decl) = 0;
-      DECL_INTERFACE_KNOWN (decl) = 1;
-      if (DECL_LANG_SPECIFIC (decl))
-	DECL_NOT_REALLY_EXTERN (decl) = 1;
+      /* extern "C" declarations aren't affected by the anonymous
+	 namespace.  */
+      if (!DECL_EXTERN_C_P (decl))
+	{
+	  TREE_PUBLIC (decl) = 0;
+	  DECL_INTERFACE_KNOWN (decl) = 1;
+	  if (DECL_LANG_SPECIFIC (decl))
+	    DECL_NOT_REALLY_EXTERN (decl) = 1;
+	}
     }
-  else if (visibility > DECL_VISIBILITY (decl))
+  else if (visibility > DECL_VISIBILITY (decl)
+	   && !DECL_VISIBILITY_SPECIFIED (decl))
     {
-      if (lookup_attribute ("visibility", DECL_ATTRIBUTES (decl)))
-	warning (OPT_Wattributes, "%q+D: visibility attribute requests "
-		 "greater visibility than its %s allows", decl, reason);
       DECL_VISIBILITY (decl) = visibility;
-      if (!DECL_VISIBILITY_SPECIFIED (decl))
-	DECL_VISIBILITY_SPECIFIED (decl) = specified;
       return true;
     }
   return false;
@@ -1663,13 +1662,13 @@ constrain_visibility_for_template (tree 
 	      || TREE_CODE (arg) == FUNCTION_DECL)
 	    {
 	      if (! TREE_PUBLIC (arg))
-		vis = VISIBILITY_STATIC;
+		vis = VISIBILITY_ANON;
 	      else
 		vis = DECL_VISIBILITY (arg);
 	    }
 	}
       if (vis)
-	constrain_visibility (decl, vis, false, "template parameter");
+	constrain_visibility (decl, vis);
     }
 }
 
@@ -1764,8 +1763,7 @@ determine_visibility (tree decl)
 	{
 	  /* tinfo visibility is based on the type it's for.  */
 	  constrain_visibility
-	    (decl, type_visibility (TREE_TYPE (DECL_NAME (decl))),
-	     false, "type");
+	    (decl, type_visibility (TREE_TYPE (DECL_NAME (decl))));
 	}
       else if (use_template)
 	/* Template instantiations and specializations get visibility based
@@ -1781,24 +1779,25 @@ determine_visibility (tree decl)
 
   if (use_template)
     {
+      /* If the specialization doesn't specify visibility, use the
+	 visibility from the template.  */
       tree tinfo = (TREE_CODE (decl) == TYPE_DECL
 		    ? TYPE_TEMPLATE_INFO (TREE_TYPE (decl))
 		    : DECL_TEMPLATE_INFO (decl));
       tree args = TI_ARGS (tinfo);
       int depth = TMPL_ARGS_DEPTH (args);
+      tree pattern = DECL_TEMPLATE_RESULT (TI_TEMPLATE (tinfo));
 
-      /* If the template has explicit visibility and the specialization
-	 doesn't, use the visibility from the template.  */
       if (!DECL_VISIBILITY_SPECIFIED (decl))
 	{
-	  tree pattern = DECL_TEMPLATE_RESULT (TI_TEMPLATE (tinfo));
 	  DECL_VISIBILITY (decl) = DECL_VISIBILITY (pattern);
+	  DECL_VISIBILITY_SPECIFIED (decl)
+	    = DECL_VISIBILITY_SPECIFIED (pattern);
 	}
 
       /* FIXME should TMPL_ARGS_DEPTH really return 1 for null input? */
       if (args && depth > template_class_depth (class_type))
-	/* Don't let it have more visibility than its template type
-	   arguments.  */
+	/* Limit visibility based on its template arguments.  */
 	constrain_visibility_for_template (decl, args);
     }
 
@@ -1807,17 +1806,15 @@ determine_visibility (tree decl)
 
   /* Don't let it have more visibility than its type.  */
   if (TREE_CODE (decl) != TYPE_DECL)
-    if (constrain_visibility (decl, type_visibility (TREE_TYPE (decl)),
-			      false, "type"))
+    if (constrain_visibility (decl, type_visibility (TREE_TYPE (decl))))
       warning (OPT_Wattributes, "\
-%q+D declared with greater visibility than its type",
+lowering visibility of %q+D to match its type",
 	       decl);
 
   if (decl_anon_ns_mem_p (decl))
     /* Names in an anonymous namespace get internal linkage.
        This might change once we implement export.  */
-    constrain_visibility (decl, VISIBILITY_STATIC,
-			  false, "namespace");
+    constrain_visibility (decl, VISIBILITY_ANON);
 }
 
 /* By default, static data members and function members receive
@@ -1835,11 +1832,13 @@ determine_visibility_from_class (tree de
       && TREE_CODE (decl) == FUNCTION_DECL
       && DECL_DECLARED_INLINE_P (decl))
     DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN;
-
-  /* The decl can't have more visibility than its class.  */
-  constrain_visibility (decl, CLASSTYPE_VISIBILITY (class_type),
-			CLASSTYPE_VISIBILITY_SPECIFIED (class_type),
-			"class");
+  else if (!DECL_VISIBILITY_SPECIFIED (decl))
+    {
+      /* Default to the class visibility.  */
+      DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type);
+      DECL_VISIBILITY_SPECIFIED (decl)
+	= CLASSTYPE_VISIBILITY_SPECIFIED (class_type);
+    }
 
   /* Give the target a chance to override the visibility associated
      with DECL.  */
@@ -1852,8 +1851,8 @@ determine_visibility_from_class (tree de
 	      && !DECL_CONSTRUCTION_VTABLE_P (decl)))
       && TREE_PUBLIC (decl)
       && !DECL_REALLY_EXTERN (decl)
-      && DECL_VISIBILITY_SPECIFIED (decl)
-      && (!class_type || !CLASSTYPE_VISIBILITY_SPECIFIED (class_type)))
+      && !DECL_VISIBILITY_SPECIFIED (decl)
+      && !CLASSTYPE_VISIBILITY_SPECIFIED (class_type))
     targetm.cxx.determine_class_data_visibility (decl);
 }
 
@@ -1863,25 +1862,50 @@ determine_visibility_from_class (tree de
 void
 constrain_class_visibility (tree type)
 {
-  tree decl = TYPE_MAIN_DECL (type);
-  tree binfo = TYPE_BINFO (type);
+  tree binfo;
   tree t;
   int i;
 
+  int vis = type_visibility (type);
+
+  if (vis == VISIBILITY_ANON)
+    return;
+
+  /* Don't warn about visibility if the class has explicit visibility.  */
+  if (CLASSTYPE_VISIBILITY_SPECIFIED (type))
+    vis = VISIBILITY_INTERNAL;
+
   for (t = TYPE_FIELDS (type); t; t = TREE_CHAIN (t))
-    if (TREE_CODE (t) == FIELD_DECL)
-      if (constrain_visibility (decl, type_visibility (TREE_TYPE (t)),
-				false, "field type"))
-	warning (OPT_Wattributes, "\
+    if (TREE_CODE (t) == FIELD_DECL && TREE_TYPE (t) != error_mark_node)
+      {
+	int subvis = type_visibility (TREE_TYPE (t));
+
+	if (subvis == VISIBILITY_ANON)
+	  warning (0, "\
+%qT has a field %qD whose type uses the anonymous namespace",
+		   type, t);
+	else if (vis < VISIBILITY_HIDDEN
+		 && subvis >= VISIBILITY_HIDDEN)
+	  warning (OPT_Wattributes, "\
 %qT declared with greater visibility than the type of its field %qD",
-		 type, t);
+		   type, t);
+      }
 
+  binfo = TYPE_BINFO (type);
   for (i = 0; BINFO_BASE_ITERATE (binfo, i, t); ++i)
-    if (constrain_visibility (decl, type_visibility (TREE_TYPE (t)),
-			      false, "base type"))
-      warning (OPT_Wattributes, "\
+    {
+      int subvis = type_visibility (TREE_TYPE (t));
+
+      if (subvis == VISIBILITY_ANON)
+	warning (0, "\
+%qT has a base %qT whose type uses the anonymous namespace",
+		 type, TREE_TYPE (t));
+      else if (vis < VISIBILITY_HIDDEN
+	       && subvis >= VISIBILITY_HIDDEN)
+	warning (OPT_Wattributes, "\
 %qT declared with greater visibility than its base %qT",
-	       type, TREE_TYPE (t));
+		 type, TREE_TYPE (t));
+    }
 }
 
 /* DECL is a FUNCTION_DECL or VAR_DECL.  If the object file linkage


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- .cvsignore	18 Jul 2006 19:45:31 -0000	1.160
+++ .cvsignore	20 Jul 2006 19:00:54 -0000	1.161
@@ -1 +1 @@
-gcc-4.1.1-20060718.tar.bz2
+gcc-4.1.1-20060720.tar.bz2

gcc41-java-pr13212.patch:
 0 files changed

Index: gcc41-java-pr13212.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-java-pr13212.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-java-pr13212.patch	6 Apr 2006 16:56:54 -0000	1.1
+++ gcc41-java-pr13212.patch	20 Jul 2006 19:00:55 -0000	1.2
@@ -19,10 +19,10 @@
 
 --- libjava/boehm.cc	(revision 112312)
 +++ libjava/boehm.cc	(working copy)
-@@ -713,3 +713,15 @@
-   // For now, always reclaim soft references.  FIXME.
-   return true;
+@@ -694,3 +694,15 @@ _Jv_ResumeThread (_Jv_Thread_t *thread)
  }
+ 
+ #endif
 +
 +void
 +_Jv_GCAttachThread ()

gcc41-pr26885.patch:
 0 files changed

Index: gcc41-pr26885.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr26885.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr26885.patch	25 May 2006 09:47:00 -0000	1.1
+++ gcc41-pr26885.patch	20 Jul 2006 19:00:55 -0000	1.2
@@ -49,8 +49,6 @@
 cp/
 	PR driver/26885
 	* Make-lang.in (GXX_OBJS): Replace gcc.o with $(GCC_OBJS).
-java/
-	* lang.opt (femit-class-file): Remove VarExists.
 
 	PR driver/26885
 	* Make-lang.in ($(GCJ)$(exeext)): Replace gcc.o with
@@ -342,17 +340,6 @@
  
  # Create a version of the $(GCJ) driver which calls the cross-compiler.
  $(GCJ)-cross$(exeext): $(GCJ)$(exeext)
---- gcc/java/lang.opt	(revision 113823)
-+++ gcc/java/lang.opt	(revision 113874)
-@@ -119,7 +119,7 @@ fcompile-resource=
- Java Joined RejectNegative
- 
- femit-class-file
--Java Var(flag_emit_class_files) VarExists
-+Java Var(flag_emit_class_files)
- Output a class file
- 
- femit-class-files
 --- gcc/gcc.c	(revision 113823)
 +++ gcc/gcc.c	(revision 113874)
 @@ -86,6 +86,7 @@ compilation is specified by a string cal


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- gcc41.spec	18 Jul 2006 19:45:31 -0000	1.81
+++ gcc41.spec	20 Jul 2006 19:00:55 -0000	1.82
@@ -1,6 +1,6 @@
-%define DATE 20060718
+%define DATE 20060720
 %define gcc_version 4.1.1
-%define gcc_release 9
+%define gcc_release 10
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -39,6 +39,7 @@
 # Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
 BuildRequires: binutils >= 2.17.50.0.2-8
 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils
+BuildRequires: /usr/bin/fastjar
 # Make sure pthread.h doesn't contain __thread tokens
 # Make sure glibc supports stack protector
 # Make sure glibc supports DT_GNU_HASH
@@ -104,6 +105,7 @@
 Prereq: /sbin/install-info
 AutoReq: true
 
+Patch0: gcc41-java-backport.patch.bz2
 Patch1: gcc41-ice-hack.patch
 Patch2: gcc41-ppc64-m32-m64-multilib-only.patch
 Patch3: gcc41-ia64-libunwind.patch
@@ -130,22 +132,13 @@
 Patch24: gcc41-pr26885.patch
 Patch25: gcc41-hash-style-gnu.patch
 Patch26: gcc41-visibility.patch
-Patch27: gcc41-pr28150.patch
-Patch28: gcc41-pr28170.patch
-Patch29: gcc41-pr28370.patch
-Patch30: gcc41-pr28390.patch
-Patch31: gcc41-reassoc1.patch
-Patch32: gcc41-reassoc2.patch
-Patch33: gcc41-reassoc3.patch
-Patch34: gcc41-reassoc4.patch
-Patch35: gcc41-reassoc5.patch
-Patch36: gcc41-power6.patch
-Patch37: gcc41-CVE-2006-3619.patch
-Patch38: gcc41-checking-identifier.patch
-Patch39: gcc41-duplicate-eh.patch
-Patch40: gcc41-pr27889.patch
-Patch41: gcc41-rh198849.patch
-Patch42: gcc41-testsuite-scantree.patch
+Patch27: gcc41-pr28370.patch
+Patch28: gcc41-pr28407.patch
+Patch29: gcc41-power6.patch
+Patch30: gcc41-CVE-2006-3619.patch
+Patch31: gcc41-java-backport2.patch
+Patch32: gcc41-java-libdotdotlib.patch
+Patch33: gcc41-java-plugins.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -314,6 +307,7 @@
 Provides: gcc4-java
 Prereq: /sbin/install-info
 Autoreq: true
+Autoprov: false
 
 %description java
 This package adds support for compiling Java(tm) programs and
@@ -424,6 +418,7 @@
 
 %prep
 %setup -q -n gcc-%{version}-%{DATE}
+%patch0 -p0 -E -b .java-backport~
 %patch1 -p0 -b .ice-hack~
 %patch2 -p0 -b .ppc64-m32-m64-multilib-only~
 %patch3 -p0 -b .ia64-libunwind~
@@ -450,28 +445,17 @@
 %patch24 -p0 -b .pr26885~
 %patch25 -p0 -b .hash-style-gnu~
 %patch26 -p0 -b .visibility~
-%patch27 -p0 -b .pr28150~
-%patch28 -p0 -b .pr28170~
-%patch29 -p0 -b .pr28370~
-%patch30 -p0 -b .pr28390~
-%patch31 -p0 -b .reassoc1~
-%patch32 -p0 -b .reassoc2~
-%patch33 -p0 -b .reassoc3~
-%patch34 -p0 -b .reassoc4~
-%patch35 -p0 -b .reassoc5~
-%patch36 -p0 -b .power6~
-%patch37 -p0 -b .CVE-2006-3619~
-%patch38 -p0 -b .checking-identifier~
-%patch39 -p0 -b .duplicate-eh~
-%patch40 -p0 -b .pr27889~
-%patch41 -p0 -b .rh198849~
-%patch42 -p0 -b .testsuite-scantree~
+%patch27 -p0 -b .pr28370~
+%patch28 -p0 -b .pr28407~
+%patch29 -p0 -b .power6~
+%patch30 -p0 -b .CVE-2006-3619~
+%patch31 -p0 -b .java-backport2~
+%patch32 -p0 -b .java-libdotdotlib~
+%patch33 -p0 -b .java-plugins~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
-sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in}
-
 cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
 # Hack to avoid building multilib libjava
@@ -558,7 +542,7 @@
 %if !%{build_java}
 	--disable-libgcj \
 %else
-	--enable-java-awt=gtk --disable-dssi \
+	--enable-java-awt=gtk --disable-dssi --enable-plugin \
 	--with-java-home=%{_prefix}/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre \
 %endif
 %ifarch ppc ppc64
@@ -751,9 +735,9 @@
 if [ "%{build_java}" -gt 0 ]; then
 # gcj -static doesn't work properly anyway, unless using --whole-archive
 # and saving 35MB is not bad.
-find $RPM_BUILD_ROOT -name libgcj.a -o -name lib-gnu-java-awt-peer-gtk.a \
-		     -o -name libgjsmalsa.a \
-		     -o -name libgij.a -o -name libgcjawt.a | xargs rm -f
+find $RPM_BUILD_ROOT -name libgcj.a -o -name libgtkpeer.a \
+		     -o -name libgjsmalsa.a -o libgcj-tools.a -o libjvm.a \
+		     -o -name libgij.a -o name libgcj.a | xargs rm -f
 
 mv $RPM_BUILD_ROOT%{_prefix}/lib/libgcj.spec $FULLPATH/
 sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' \
@@ -789,11 +773,6 @@
 fi
 
 %if %{build_java}
-#mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/classpath/libgjsmalsa.so* \
-#      $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
-mv -f $RPM_BUILD_ROOT%{_prefix}/lib/classpath/libgjsmalsa.so* \
-      $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
-
 if [ "%{_lib}" != "lib" ]; then
   mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}/pkgconfig
   sed '/^libdir/s/lib$/%{_lib}/' $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/libgcj.pc \
@@ -810,11 +789,10 @@
 ln -sf ../../../libmudflap.so.0.* libmudflap.so
 ln -sf ../../../libmudflapth.so.0.* libmudflapth.so
 %if %{build_java}
-ln -sf ../../../libgcj.so.7.* libgcj.so
-ln -sf ../../../lib-gnu-java-awt-peer-gtk.so.7.* lib-gnu-java-awt-peer-gtk.so
-ln -sf ../../../libgjsmalsa.so.0.* libgjsmalsa.so
-ln -sf ../../../libgij.so.7.* libgij.so
-ln -sf ../../../libgcjawt.so.7.* libgcjawt.so
+ln -sf ../../../libgcj.so.7rh.* libgcj.so
+ln -sf ../../../libgcj-tools.so.7rh.* libgcj-tools.so
+ln -sf ../../../libgij.so.7rh.* libgij.so
+mv ../../../libgcj_bc.so libgcj_bc.so
 %endif
 %if %{build_ada}
 cd adalib
@@ -832,11 +810,10 @@
 ln -sf ../../../../%{_lib}/libmudflap.so.0.* libmudflap.so
 ln -sf ../../../../%{_lib}/libmudflapth.so.0.* libmudflapth.so
 %if %{build_java}
-ln -sf ../../../../%{_lib}/libgcj.so.7.* libgcj.so
-ln -sf ../../../../%{_lib}/lib-gnu-java-awt-peer-gtk.so.7.* lib-gnu-java-awt-peer-gtk.so
-ln -sf ../../../../%{_lib}/libgjsmalsa.so.0.* libgjsmalsa.so
-ln -sf ../../../../%{_lib}/libgij.so.7.* libgij.so
-ln -sf ../../../../%{_lib}/libgcjawt.so.7.* libgcjawt.so
+ln -sf ../../../../%{_lib}/libgcj.so.7rh.* libgcj.so
+ln -sf ../../../../%{_lib}/libgcj-tools.so.7rh.* libgcj-tools.so
+ln -sf ../../../../%{_lib}/libgij.so.7rh.* libgij.so
+mv ../../../../%{_lib}/libgcj_bc.so libgcj_bc.so
 %endif
 %if %{build_ada}
 cd adalib
@@ -864,11 +841,10 @@
 ln -sf ../`echo ../../../../lib/libmudflap.so.0.* | sed s~/lib/~/lib64/~` 64/libmudflap.so
 ln -sf ../`echo ../../../../lib/libmudflapth.so.0.* | sed s~/lib/~/lib64/~` 64/libmudflapth.so
 if [ "%{build_java}" -gt 0 ]; then
-ln -sf ../`echo ../../../../lib/libgcj.so.7.* | sed s~/lib/~/lib64/~` 64/libgcj.so
-ln -sf ../`echo ../../../../lib/lib-gnu-java-awt-peer-gtk.so.7.* | sed s~/lib/~/lib64/~` 64/lib-gnu-java-awt-peer-gtk.so
-ln -sf ../`echo ../../../../lib/libgjsmalsa.so.0.* | sed s~/lib/~/lib64/~` 64/libgjsmalsa.so
-ln -sf ../`echo ../../../../lib/libgij.so.7.* | sed s~/lib/~/lib64/~` 64/libgij.so
-ln -sf ../`echo ../../../../lib/libgcjawt.so.7.* | sed s~/lib/~/lib64/~` 64/libgcjawt.so
+ln -sf ../`echo ../../../../lib/libgcj.so.7rh.* | sed s~/lib/~/lib64/~` 64/libgcj.so
+ln -sf ../`echo ../../../../lib/libgcj-tools.so.7rh.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
+ln -sf ../`echo ../../../../lib/libgij.so.7rh.* | sed s~/lib/~/lib64/~` 64/libgij.so
+mv ../../../../lib64/libgcj_bc.so 64/libgcj_bc.so
 fi
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libsupc++.*a 64/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib64/libgfortran.*a 64/
@@ -888,11 +864,10 @@
 ln -sf ../`echo ../../../../lib64/libmudflap.so.0.* | sed s~/../lib64/~/~` 32/libmudflap.so
 ln -sf ../`echo ../../../../lib64/libmudflapth.so.0.* | sed s~/../lib64/~/~` 32/libmudflapth.so
 if [ "%{build_java}" -gt 0 ]; then
-ln -sf ../`echo ../../../../lib64/libgcj.so.7.* | sed s~/../lib64/~/~` 32/libgcj.so
-ln -sf ../`echo ../../../../lib64/lib-gnu-java-awt-peer-gtk.so.7.* | sed s~/../lib64/~/~` 32/lib-gnu-java-awt-peer-gtk.so
-ln -sf ../`echo ../../../../lib64/libgjsmalsa.so.0.* | sed s~/../lib64/~/~` 32/libgjsmalsa.so
-ln -sf ../`echo ../../../../lib64/libgij.so.7.* | sed s~/../lib64/~/~` 32/libgij.so
-ln -sf ../`echo ../../../../lib64/libgcjawt.so.7.* | sed s~/../lib64/~/~` 32/libgcjawt.so
+ln -sf ../`echo ../../../../lib64/libgcj.so.7rh.* | sed s~/../lib64/~/~` 32/libgcj.so
+ln -sf ../`echo ../../../../lib64/libgcj-tools.so.7rh.* | sed s~/../lib64/~/~` 32/libgcj-tools.so
+ln -sf ../`echo ../../../../lib64/libgij.so.7rh.* | sed s~/../lib64/~/~` 32/libgij.so
+mv ../../../../lib/libgcj_bc.so 32/libgcj_bc.so
 fi
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libsupc++.*a 32/
 mv -f $RPM_BUILD_ROOT%{_prefix}/lib/libgfortran.*a 32/
@@ -907,12 +882,6 @@
 %else
 %ifarch %{multilib_64_archs}
 ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libstdc++.a 32/libstdc++.a
-if [ "%{build_java}" -gt 0 ]; then
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj.a 32/libgcj.a
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/lib-gnu-java-awt-peer-gtk.a 32/lib-gnu-java-awt-peer-gtk.a
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgij.a 32/libgij.a
-ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcjawt.a 32/libgcjawt.a
-fi
 %endif
 %endif
 
@@ -1381,6 +1350,9 @@
 %{_prefix}/bin/grmic
 %{_prefix}/bin/grmiregistry
 %{_prefix}/bin/gcj-dbtool
+%{_prefix}/bin/gappletviewer
+%{_prefix}/bin/gjarsigner
+%{_prefix}/bin/gkeytool
 %{_mandir}/man1/fastjar.1*
 %{_mandir}/man1/grepjar.1*
 %{_mandir}/man1/jv-convert.1*
@@ -1390,17 +1362,21 @@
 %{_mandir}/man1/gcj-dbtool.1*
 %{_infodir}/fastjar*
 %{_prefix}/%{_lib}/libgcj.so.*
-%{_prefix}/%{_lib}/lib-gnu-java-awt-peer-gtk.so.*
-%{_prefix}/%{_lib}/libgjsmalsa.so.*
+%{_prefix}/%{_lib}/libgcj-tools.so.*
+%{_prefix}/%{_lib}/libgcj_bc.so.*
 %{_prefix}/%{_lib}/libgij.so.*
-%{_prefix}/%{_lib}/libgcjawt.so.*
+%dir %{_prefix}/%{_lib}/gcj-%{version}
+%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so*
+%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so*
+%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so*
+%{_prefix}/%{_lib}/gcj-%{version}/libgcjwebplugin.so
+%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so.*
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/[^s]*
 %dir %{_prefix}/lib/security
 %config(noreplace) %{_prefix}/lib/security/classpath.security
 %config(noreplace) %{_prefix}/lib/security/libgcj.security
 %{_prefix}/lib/logging.properties
-%dir %{_prefix}/%{_lib}/gcj-%{version}
 %dir %{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_prefix}/%{_lib}/gcj-%{version}/classmap.db
 
@@ -1419,22 +1395,25 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jvmpi.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib-gnu-java-awt-peer-gtk.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libjvm.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcjawt.so
 %ifarch sparc ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/lib-gnu-java-awt-peer-gtk.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj-tools.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libjvm.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgij.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcjawt.so
 %endif
 %ifarch %{multilib_64_archs}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/lib-gnu-java-awt-peer-gtk.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj-tools.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libjvm.so
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgij.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcjawt.so
 %endif
 %dir %{_prefix}/include/c++
 %dir %{_prefix}/include/c++/%{gcc_version}
@@ -1510,6 +1489,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Jul 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-10
+- Java backport of from GCC trunk (Tom Tromey, Bryce McKinlay)
+  - include libgcjwebplugin.so, gappletviewer, gjarsigner, gkeytool
+- C++ visibility changes (Jason Merrill, PRs c++/28407, c++/28409)
+
 * Tue Jul 18 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-9
 - update from gcc-4_1-branch (-r115330:115565)
   - PRs c++/28016, c++/28051, c++/28249, c++/28291, c++/28294, c++/28304,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- sources	18 Jul 2006 19:45:31 -0000	1.162
+++ sources	20 Jul 2006 19:00:55 -0000	1.163
@@ -1 +1 @@
-6db40175ac03098074d07466152145e4  gcc-4.1.1-20060718.tar.bz2
+f30458ebae00dacc055bf0969bbd51d1  gcc-4.1.1-20060720.tar.bz2


--- gcc41-checking-identifier.patch DELETED ---


--- gcc41-duplicate-eh.patch DELETED ---


--- gcc41-pr27889.patch DELETED ---


--- gcc41-pr28150.patch DELETED ---


--- gcc41-pr28170.patch DELETED ---


--- gcc41-pr28390.patch DELETED ---


--- gcc41-reassoc1.patch DELETED ---


--- gcc41-reassoc2.patch DELETED ---


--- gcc41-reassoc3.patch DELETED ---


--- gcc41-reassoc4.patch DELETED ---


--- gcc41-reassoc5.patch DELETED ---


--- gcc41-rh198849.patch DELETED ---


--- gcc41-testsuite-scantree.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 19:15:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 15:15:20 -0400
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.58,
	1.59 sources, 1.71, 1.72 system-config-securitylevel.spec,
	1.82, 1.83
Message-ID: <200607201915.k6KJFKTL013671@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13624

Modified Files:
	.cvsignore sources system-config-securitylevel.spec 
Log Message:
Update.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	17 Jul 2006 19:08:50 -0000	1.58
+++ .cvsignore	20 Jul 2006 19:15:17 -0000	1.59
@@ -46,3 +46,4 @@
 system-config-securitylevel-1.6.20.tar.bz2
 system-config-securitylevel-1.6.21.tar.bz2
 system-config-securitylevel-1.6.22.tar.bz2
+system-config-securitylevel-1.6.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	17 Jul 2006 19:08:50 -0000	1.71
+++ sources	20 Jul 2006 19:15:17 -0000	1.72
@@ -1 +1 @@
-a1ab9bf6d2e817e0b852f6c7cba34b99  system-config-securitylevel-1.6.22.tar.bz2
+701347260923c7e4587aec457c3fac18  system-config-securitylevel-1.6.23.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- system-config-securitylevel.spec	17 Jul 2006 19:08:50 -0000	1.82
+++ system-config-securitylevel.spec	20 Jul 2006 19:15:17 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.22
-Release: 2
+Version: 1.6.23
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -93,6 +93,9 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 1.6.23-1
+- Add NFSv4 as a trusted service (#138138).
+
 * Mon Jul 17 2006 Chris Lumens <clumens at redhat.com> 1.6.22-2
 - Don't remove .pyc files (#198950).
 - Pick up new translations. 



From fedora-cvs-commits at redhat.com  Thu Jul 20 19:20:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 15:20:37 -0400
Subject: rpms/tcl/devel tcl-8.4.13-cflags.patch,1.1,1.2 tcl.spec,1.23,1.24
Message-ID: <200607201920.k6KJKbEx008007@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7990

Modified Files:
	tcl-8.4.13-cflags.patch tcl.spec 
Log Message:
- Fix cflags patch so it applies correctly
- Changes $(CFLAGS) to ${CFLAGS} in cflags patch


tcl-8.4.13-cflags.patch:
 tcl8.4.13/unix/tcl.m4 |    2 +-
 tk8.4.13/unix/tcl.m4  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: tcl-8.4.13-cflags.patch
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl-8.4.13-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcl-8.4.13-cflags.patch	20 Jul 2006 19:00:09 -0000	1.1
+++ tcl-8.4.13-cflags.patch	20 Jul 2006 19:20:34 -0000	1.2
@@ -1,22 +1,22 @@
---- tcl8.4.13/unix/tcl.m4.BAD 2006-07-13 14:05:38.000000000 -0400
-+++ tcl8.4.13/unix/tcl.m4  2006-07-13 14:07:58.000000000 -0400
+--- tcl-8.4.13/tcl8.4.13/unix/tcl.m4.6-cflags	2006-07-20 15:11:19.000000000 -0400
++++ tcl-8.4.13/tcl8.4.13/unix/tcl.m4	2006-07-20 15:12:40.000000000 -0400
 @@ -1340,7 +1340,7 @@
-       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
-       if test "$have_dl" = yes; then
--     SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
-+     SHLIB_LD='${CC} $(CFLAGS) -shared -Wl,-soname,${@}'
-      DL_OBJS="tclLoadDl.o"
-      DL_LIBS="-ldl"
-      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
---- tk8.4.13/unix/tcl.m4.BAD  2006-07-13 13:57:14.000000000 -0400
-+++ tk8.4.13/unix/tcl.m4   2006-07-13 13:57:26.000000000 -0400
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
++		SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+--- tcl-8.4.13/tk8.4.13/unix/tcl.m4.6-cflags	2006-04-19 08:29:38.000000000 -0400
++++ tcl-8.4.13/tk8.4.13/unix/tcl.m4	2006-07-20 15:13:04.000000000 -0400
 @@ -1340,7 +1340,7 @@
-       #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
-       if test "$have_dl" = yes; then
--     SHLIB_LD="${CC} -shared"
-+     SHLIB_LD="${CC} $(CFLAGS) -shared"
-      DL_OBJS="tclLoadDl.o"
-      DL_LIBS="-ldl"
-      LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD="${CC} -shared"
++		SHLIB_LD="${CC} ${CFLAGS} -shared"
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tcl.spec	20 Jul 2006 19:00:09 -0000	1.23
+++ tcl.spec	20 Jul 2006 19:20:34 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -67,7 +67,9 @@
 %patch3 -p1 -b .3-pkgpath
 %patch4 -p1 -b .4-rpath
 %patch5 -p1 -b .5-ac213
+pushd ..
 %patch6 -p1 -b .6-cflags
+popd
 
 # patch1 touches tcl.m4, and patch3 touches configure.in
 cd unix
@@ -150,6 +152,10 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-3
+- Fix cflags patch so it applies correctly
+- Changes $(CFLAGS) to ${CFLAGS} in cflags patch
+
 * Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-2
 - Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199375)
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:04:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:04:24 -0400
Subject: rpms/tk/devel tk-8.4.13-cflags.patch,NONE,1.1 tk.spec,1.21,1.22
Message-ID: <200607202004.k6KK4OW9008907@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8873

Modified Files:
	tk.spec 
Added Files:
	tk-8.4.13-cflags.patch 
Log Message:
- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199378)


tk-8.4.13-cflags.patch:
 tcl.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tk-8.4.13-cflags.patch ---
--- tk8.4.13/unix/tcl.m4.5-cflags	2006-07-20 15:59:01.000000000 -0400
+++ tk8.4.13/unix/tcl.m4	2006-07-20 16:01:36.000000000 -0400
@@ -1340,7 +1340,7 @@
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
 	    if test "$have_dl" = yes; then
-		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+		SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS="-ldl"
 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1379,7 +1379,7 @@
 	    SHLIB_SUFFIX=".so"
 
 	    if test "$have_dl" = yes; then
-		SHLIB_LD="${CC} -shared"
+		SHLIB_LD="${CC} ${CFLAGS} -shared"
 		DL_OBJS=""
 		DL_LIBS="-ldl"
 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tk.spec	12 Jul 2006 18:47:04 -0000	1.21
+++ tk.spec	20 Jul 2006 20:04:17 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.13
-Release: 2
+Release: 3%{?dist}
 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.13-autoconf.patch
+Patch5: tk-8.4.13-cflags.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-cflags
 
 # patch1 touches tcl.m4
 cd unix
@@ -115,6 +117,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 8.4.13-3
+- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199378)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.4.13-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:11:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:11:57 -0400
Subject: rpms/gcc/devel gcc41.spec,1.82,1.83
Message-ID: <200607202011.k6KKBvkx010910@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10886

Modified Files:
	gcc41.spec 
Log Message:
4.1.1-10


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gcc41.spec	20 Jul 2006 19:00:55 -0000	1.82
+++ gcc41.spec	20 Jul 2006 20:11:54 -0000	1.83
@@ -323,6 +323,7 @@
 Requires: glib2 >= 2.4.0
 BuildRequires: glib2-devel >= 2.4.0
 Requires: libart_lgpl >= 2.1.0
+BuildRequires: mozilla-devel
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:13:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:13:34 -0400
Subject: rpms/concurrent/devel .cvsignore, 1.3, 1.4 concurrent.spec, 1.7,
	1.8 concurrent-1.3.2.build.xml, 1.1, NONE
Message-ID: <200607202013.k6KKDYkC011600@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11315

Modified Files:
	.cvsignore concurrent.spec 
Removed Files:
	concurrent-1.3.2.build.xml 
Log Message:
Merged with upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jun 2005 16:31:46 -0000	1.3
+++ .cvsignore	20 Jul 2006 20:13:31 -0000	1.4
@@ -1,4 +1 @@
 concurrent.tar.gz
-concurrent-1.3.2
-noarch
-*.src.rpm


Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- concurrent.spec	12 Jul 2006 04:52:36 -0000	1.7
+++ concurrent.spec	20 Jul 2006 20:13:31 -0000	1.8
@@ -1,18 +1,62 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 
 Name:           concurrent
-Version:        1.3.2
-Release: 2jpp_3fc
+Version:        1.3.4
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
+Vendor:         JPackage Project
+Distribution:   JPackage
 Source0:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
 Source1:	%{name}-%{version}.build.xml
 URL:            http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/
 Group:          Development/Libraries/Java
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:	jpackage-utils >= 0:1.5, ant, /usr/bin/perl, /bin/bash
+%endif
+BuildRequires:	jpackage-utils >= 0:1.5, ant, /bin/bash
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description 
 This package provides standardized, efficient versions of utility classes
@@ -25,7 +69,6 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -51,6 +94,10 @@
 cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,30 +107,50 @@
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/concurrent-1.3.4.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.2-2jpp_3fc
-- rebuild
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_1fc
+- Merge with upstream version
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3.2-2jpp_2fc
-- stop scriptlet spew
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp
+- Added conditional native compiling
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.3.4-2jpp
+- First JPP 1.7 build
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.3.2-2jpp_1fc
-- Build into Fedora.
+* Thu Dec 23 2004 Sebastiano Vigna <vigna at acm.org> 0:1.3.4-1jpp
+- New release.
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.3.2-2jpp_1rh
-- RH vacuuming
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:1.3.2-3jpp
+- Build with ant-1.6.2
 
 * Wed Nov 19 2003 Sebastiano Vigna <vigna at acm.org> 0:1.3.2-2jpp
 - Package name restored to EDU.


--- concurrent-1.3.2.build.xml DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:18:57 -0400
Subject: rpms/concurrent/devel concurrent-1.3.4.build.xml,NONE,1.1
Message-ID: <200607202018.k6KKIvCP028434@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28253

Added Files:
	concurrent-1.3.4.build.xml 
Log Message:
Add new build script



--- NEW FILE concurrent-1.3.4.build.xml ---
<project name="concurrent" default="jar" basedir=".">

  <property name="src"      value="src"/>
  <property name="docs"     value="docs"/>
  <property name="build"    value="build"/>
  <property name="j2se.apiurl"
    value="http://java.sun.com/j2se/1.4/docs/api/"/>

  <target name="init">
    <mkdir dir="${build}"/>
  </target>

  <target name="compile" depends="init">
    <javac srcdir="${src}" 
	debug="on"
	optimize="on"
        destdir="${build}"
    />
  </target>

  <target name="jar" depends="compile">
    <jar jarfile="concurrent-${version}.jar" 
         basedir="${build}"
		 />
  </target>

  <target name="javadoc">
    <mkdir dir="${docs}"/>
    <javadoc destdir="${docs}" 
			 packagenames = "EDU.oswego.cs.dl.util.concurrent,EDU.oswego.cs.dl.util.concurrent.misc.*"
			 sourcepath="${src}" 
			 private="off"
			 >
	<link href="${j2se.apiurl}"/>
    </javadoc>
  </target>

  <target name="clean">
    <delete dir="${build}"/>
    <delete>
      <fileset dir="." includes="concurrent-*.jar"/>
    </delete>
  </target>

</project>



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:19:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:19:20 -0400
Subject: rpms/tix/devel tix-8.4.0-cflags.patch,NONE,1.1 tix.spec,1.18,1.19
Message-ID: <200607202019.k6KKJK1S028616@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28579

Modified Files:
	tix.spec 
Added Files:
	tix-8.4.0-cflags.patch 
Log Message:
- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199377)


tix-8.4.0-cflags.patch:
 tcl.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tix-8.4.0-cflags.patch ---
--- tix-8.4.0/tclconfig/tcl.m4.cflags	2006-07-20 16:16:57.000000000 -0400
+++ tix-8.4.0/tclconfig/tcl.m4	2006-07-20 16:17:58.000000000 -0400
@@ -1231,7 +1231,7 @@
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
 	    if test "$have_dl" = yes; then
-		SHLIB_LD="${CC} -shared"
+		SHLIB_LD="${CC} ${CFLAGS} -shared"
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS="-ldl"
 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1265,7 +1265,7 @@
 	    SHLIB_SUFFIX=".so"
 
 	    if test "$have_dl" = yes; then
-		SHLIB_LD="${CC} -shared"
+		SHLIB_LD="${CC} ${CFLAGS} -shared"
 		DL_OBJS=""
 		DL_LIBS="-ldl"
 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"


Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tix.spec	12 Jul 2006 08:29:03 -0000	1.18
+++ tix.spec	20 Jul 2006 20:19:18 -0000	1.19
@@ -5,13 +5,14 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 10.1
+Release: 11%{?dist}
 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
+Patch2: tix-%{version}-cflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
 Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
@@ -54,6 +55,7 @@
 %setup -q
 %patch0 -p1 -b .relid
 %patch1 -p1 -b .soname
+%patch2 -p1 -b .cflags
 
 # patch 0 touches tcl.m4
 autoconf
@@ -126,6 +128,9 @@
 %doc docs/*
 
 %changelog
+* Thu Jul 20 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-11
+- Patch from Dennis Gilmore <dennis at ausil.us> for sparc64 (#199377)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:8.4.0-10.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:28:19 -0400
Subject: rpms/gcc/devel gcc41-java-backport2.patch,1.1,1.2
Message-ID: <200607202028.k6KKSJCv032197@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32163

Modified Files:
	gcc41-java-backport2.patch 
Log Message:
4.1.1-10

gcc41-java-backport2.patch:
 Makefile.am  |   26 ++++++++++++++++++++++++--
 Makefile.in  |   24 ++++++++++++++++++++++--
 configure    |    2 +-
 configure.ac |    2 +-
 4 files changed, 48 insertions(+), 6 deletions(-)

Index: gcc41-java-backport2.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-java-backport2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-java-backport2.patch	20 Jul 2006 19:00:55 -0000	1.1
+++ gcc41-java-backport2.patch	20 Jul 2006 20:28:17 -0000	1.2
@@ -1,3 +1,25 @@
+--- libjava/configure.ac	2006-07-20 15:26:02.000000000 -0400
++++ libjava/configure.ac	2006-07-20 16:24:25.000000000 -0400
+@@ -136,7 +136,7 @@ if test "$ZIP" = no; then
+   if test "$JAR" = no; then
+     AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue])
+   fi
+-else
++elif test "$JAR" = no; then
+   # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
+   JAR=`pwd`/scripts/jar
+ fi
+--- libjava/configure	2006-07-20 15:26:02.000000000 -0400
++++ libjava/configure	2006-07-20 16:25:47.000000000 -0400
+@@ -4156,7 +4156,7 @@ if test "$ZIP" = no; then
+ echo "$as_me: error: cannot find neither zip nor jar, cannot continue" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+-else
++elif test "$JAR" = no; then
+   # InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
+   JAR=`pwd`/scripts/jar
+ fi
 --- libjava/Makefile.am.jj	2006-07-20 13:56:09.000000000 +0200
 +++ libjava/Makefile.am	2006-07-20 19:27:41.000000000 +0200
 @@ -316,8 +316,30 @@ $(propertyo_files): %.lo: classpath/reso



From fedora-cvs-commits at redhat.com  Thu Jul 20 20:55:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 16:55:41 -0400
Subject: rpms/castor/devel castor.spec,1.9,1.10
Message-ID: <200607202055.k6KKtfsT023207@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22954

Modified Files:
	castor.spec 
Log Message:

Added conditional native compilation.




Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- castor.spec	8 Jun 2006 17:57:49 -0000	1.9
+++ castor.spec	20 Jul 2006 20:55:39 -0000	1.10
@@ -1,12 +1,13 @@
-%define name            castor
-%define version         0.9.5
-%define release         1jpp_4fc
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define section         free
 
 Summary:        An open source data binding framework for Java
-Name:           %{name}
-Version:        %{version}
-Release: %{release}
+Name:           castor
+Version:        0.9.5
+Release:        1jpp_5fc
 Epoch:          0
 Group:          Development/Libraries/Java
 License:        Exolab Software License
@@ -15,7 +16,9 @@
 Patch0:		example-servletapi4.patch
 Patch1:		example-servletapi5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       adaptx
 Requires:       jdbc-stdext
@@ -39,6 +42,12 @@
 # excluded due to eclipse
 ExcludeArch: s390 s390x ppc64
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Castor is an open source data binding framework for Java. It's basically
 the shortest path between Java objects, XML documents and SQL tables.
@@ -51,6 +60,12 @@
 Requires:       servletapi5
 BuildRequires:  servletapi5 
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description demo
 Demonstrations and samples for %{name}.
 
@@ -61,6 +76,12 @@
 Requires:       junit
 BuildRequires:  junit
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description test
 Tests for %{name}.
 
@@ -69,6 +90,12 @@
 Summary:        XML support for %{name}.
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description xml
 XML support for Castor.
 
@@ -131,6 +158,10 @@
 # like magic
 %jpackage_script org.exolab.castor.builder.SourceGenerator %{nil} %{nil} xerces-j2:%{name} %{name}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm --exclude %{_datadir}/%{name}/examples/webapp-example-castor.war --exclude %{_datadir}/%{name}/examples/webapp/WEB-INF/lib/castor-0.9.5.jar
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -143,6 +174,70 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post test
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun test
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post xml
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun xml
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc src/etc/{CHANGELOG,LICENSE,README}
@@ -151,15 +246,30 @@
 %{_javadir}/%{name}.jar
 %dir %{_datadir}/%{name}
 
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/castor-0.9.5.jar.*
+%endif
+
 %files demo
 %defattr(0644,root,root,0755)
 %{_datadir}/%{name}/examples
 
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/examples.*
+%endif
+
 %files test
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-tests-%{version}.jar
 %{_javadir}/%{name}-tests.jar
 
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/castor-tests-0.9.5.jar.*
+%endif
+
 %files xml
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-xml-%{version}.jar
@@ -174,6 +284,9 @@
 %doc build/doc/*
 
 %changelog
+* Thu Jul  20 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_5fc
+- Added conditional native compilation.
+
 * Thu Jun  8 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_4fc
 - Updated project URL -- fix for Bug #180586
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:05:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:05:23 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-blkid-devname.patch, NONE,
	1.1 e2fsprogs.spec, 1.61, 1.62
Message-ID: <200607202105.k6KL5NUD025519@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25425

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.39-blkid-devname.patch 
Log Message:
add patch to fix device mapper naming in libblkid


e2fsprogs-1.39-blkid-devname.patch:
 devname.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE e2fsprogs-1.39-blkid-devname.patch ---
--- e2fsprogs-1.39/lib/blkid/devname.c.foo	2006-07-20 16:48:07.000000000 -0400
+++ e2fsprogs-1.39/lib/blkid/devname.c	2006-07-20 16:48:18.000000000 -0400
@@ -291,7 +291,7 @@
 
 		names = (void *)names + next;
 
-		rc = asprintf(&device, "/dev/mapper/%s", names->name);
+		rc = asprintf(&device, "mapper/%s", names->name);
 		if (rc < 0)
 			goto try_next;
 


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- e2fsprogs.spec	12 Jul 2006 05:43:14 -0000	1.61
+++ e2fsprogs.spec	20 Jul 2006 21:05:10 -0000	1.62
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 2.1
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
 Patch36: e2fsprogs-1.38-etcblkid.patch
 Patch37: e2fsprogs-1.39-blkid-gfs.patch
+Patch38: e2fsprogs-1.39-blkid-devname.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -71,6 +72,8 @@
 %patch36 -p1 -b .etcblkid
 # GFS/GFS2 detection
 %patch37 -p1 -b .gfs
+# Fix device mapper names in blkid
+%patch38 -p1 -b .devname
 
 %build
 aclocal
@@ -222,7 +225,10 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 20 2006 Bill Nottingham <notting at redhat.com> - 1.39-3
+- prevent libblkid returning /dev/dm-X
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.39-2.1
 - rebuild
 
 * Mon Jul 10 2006 Karel Zak <kzak at redhat.com> - 1.39-2



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:06:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:06:02 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.57, 1.58 firstboot.spec, 1.78,
	1.79 sources, 1.74, 1.75
Message-ID: <200607202106.k6KL6171025621@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25566

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	19 Jul 2006 19:00:40 -0000	1.57
+++ .cvsignore	20 Jul 2006 21:05:58 -0000	1.58
@@ -29,3 +29,4 @@
 firstboot-1.4.12.tar.bz2
 firstboot-1.4.13.tar.bz2
 firstboot-1.4.14.tar.bz2
+firstboot-1.4.15.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- firstboot.spec	19 Jul 2006 19:00:40 -0000	1.78
+++ firstboot.spec	20 Jul 2006 21:05:58 -0000	1.79
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.14
+Version: 1.4.15
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 1.4.15-1
+- Really disable the display module.
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 1.4.14-1
 - Disable the display module for now.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- sources	19 Jul 2006 19:00:40 -0000	1.74
+++ sources	20 Jul 2006 21:05:58 -0000	1.75
@@ -1 +1 @@
-2f7975390510c68886db62e98b8bcee0  firstboot-1.4.14.tar.bz2
+3c44138efaff47523746d3ff70343d38  firstboot-1.4.15.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:10:59 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec, 1.43, 1.44 sources, 1.18,
	1.19
Message-ID: <200607202110.k6KLAxiW027203@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27138

Modified Files:
	eclipse-cdt.spec sources 
Log Message:

* Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_4fc
- Add Autotools plug-ins via additional source tarball.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- eclipse-cdt.spec	19 Jul 2006 17:33:31 -0000	1.43
+++ eclipse-cdt.spec	20 Jul 2006 21:10:56 -0000	1.44
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_3fc
+Release: 	1jpp_4fc
 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
@@ -31,18 +31,19 @@
 # 
 # mkdir temp && cd temp
 # mkdir home
-# cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co \
+# cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co -r CDT_3_1_0 \
 #   org.eclipse.cdt-releng/org.eclipse.cdt.releng 
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/cdt_3_1/' maps/cdt.map
+# sed --in-place 's/@cdtTag@/CDT_3_1_0/' maps/cdt.map
 # java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \
 #   org.eclipse.core.launcher.Main \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
 #   -DdontUnzip=true fetch
-# cd .. && tar zcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng
 Source0: %{name}-fetched-src-%{version}.tar.bz2
+Source1: %{name}-autotools-0.0.2.tar.gz
 
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
@@ -84,6 +85,13 @@
 %patch5 -p0
 popd
 
+# Autotools stuff
+
+mkdir autotools
+pushd autotools
+tar -xzf %{SOURCE1}
+popd
+
 # Upstream CVS includes random .so files.  Let's remove them now.
 # We actually remove the entire "os" directory since otherwise
 # we wind up with some empty directories that we don't want.
@@ -129,6 +137,31 @@
 fi
 popd
 
+# Autotools has dependencies on CDT so we must add these to the SDK directory
+for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.tar.gz; do
+  case $file in
+    */org.eclipse.cdt-*-linux.$buildArch.*)
+      # The ".." is needed since the zip files contain "eclipse/foo".
+      (cd $SDK && tar --strip-components=1 -zxvf $file)
+      ;;
+  esac
+done
+
+# Autotools build
+pushd autotools
+java -cp %{eclipse_base}/startup.jar                   \
+     -Duser.home=$homedir                              \
+     org.eclipse.core.launcher.Main                    \
+     -application org.eclipse.ant.core.antRunner       \
+     -Dtype=feature                                    \
+     -Did=com.redhat.eclipse.cdt.autotools.feature         \
+     -DsourceDirectory=$(pwd)                          \
+     -DbaseLocation=$SDK                               \
+     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
+     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+
+popd
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -169,6 +202,11 @@
 rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
 rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
 
+# Autotools install
+pushd autotools
+unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
+popd
+
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -187,53 +225,20 @@
 %files
 %defattr(-,root,root)
 %{eclipse_base}/features/org.eclipse.cdt*
+%{eclipse_base}/features/com.redhat.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
+%{eclipse_base}/plugins/com.redhat.eclipse.cdt*
 #%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
-# Cannot get dir name org.eclipse.cdt.source.linux.*.x86_2.0.2 to glob
-# properly. Will fix later  
-#%{eclipse_base}/features/org.eclipse.cdt.sdk_%{majmin}.%{micro}
-#%{eclipse_base}/features/org.eclipse.cdt_%{majmin}.%{micro}
-#%{eclipse_base}/features/org.eclipse.cdt.source_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.doc.user_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.sdk_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.source_%{majmin}.%{micro}
-#%{eclipse_base}/plugins/org.eclipse.cdt.source.linux*
-#%{eclipse_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro}
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0
-#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro}
-
-
 %changelog
-* Wed Jul 19 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_3fc
+* Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_4fc
+- Add Autotools plug-ins via additional source tarball.
+
+* Wed Jul 19 2006 Igor Foox  <ifoox at redhat.com> 3.1.0-1jpp_3fc
 - Rebuild.
 
 * Wed Jul 12 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_2fc


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	10 Jul 2006 22:38:32 -0000	1.18
+++ sources	20 Jul 2006 21:10:56 -0000	1.19
@@ -1 +1,2 @@
-25eebd7f854faf0bccf091afa8232118  eclipse-cdt-fetched-src-3.1.0.tar.bz2
+8ea0a06e13227728d3922bab3496509e  eclipse-cdt-fetched-src-3.1.0.tar.bz2
+c21690f7f337db8e8aa39949ff136428  eclipse-cdt-autotools-0.0.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:18:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:18:28 -0400
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.10,
	1.11
Message-ID: <200607202118.k6KLISmc012265@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12165

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
Merged with upstream version



Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-codec.spec	12 Jul 2006 16:57:22 -0000	1.10
+++ jakarta-commons-codec.spec	20 Jul 2006 21:18:26 -0000	1.11
@@ -1,13 +1,44 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name  codec
 %define short_name commons-%{base_name}
-%define name       jakarta-%{short_name}
-%define version    1.3
-%define release    2jpp_5.1fc
 %define section    free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           jakarta-commons-codec
+Version:        1.3
+Release:        4jpp_1fc
 Summary:        Jakarta Commons Codec Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -15,16 +46,23 @@
 URL:            http://jakarta.apache.org/commons/codec/
 Source0:        http://www.apache.org/dist/jakarta/commons/codec/source/commons-codec-%{version}-src.tar.gz
 Patch0:		jakarta-commons-codec-1.3-buildscript.patch
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  ant >= 1.6.2
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 0:1.6.2
 BuildRequires:  ant-junit
 BuildRequires:  junit
-BuildRequires:  java-javadoc
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Provides:       %{short_name}
 Obsoletes:      %{short_name}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Commons Codec is an attempt to provide definitive implementations of
 commonly used encoders and decoders.
@@ -32,7 +70,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -81,6 +118,10 @@
 
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -96,11 +137,31 @@
 fi
 # -----------------------------------------------------------------------------
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-codec-1.3.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
@@ -108,29 +169,15 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5.1fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3-2jpp_4fc
-- BR java-javadoc
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.3-2jpp_3fc
-- stop the scriptlet spew 
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.3-2jpp_2fc
-- rebuilt again
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-4jpp_1fc
+- Merged with upstream version
+- Now is natively compiled
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.3-2jpp_1fc
-- Build into Fedora.
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-4jpp
+- Added conditional native compiling
 
-* Thu May 05 2005 Fernando Nasser <fnasser at redhat.com> 0:1.3-2jpp_1rh
-- First Red Hat build
+* Tue Apr 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.3-3jpp
+- First JPP-1.7 release
 
 * Wed Sep 08 2004 Fernando Nasser <fnasser at redhat.com> 0:1.3-2jpp
 - Do not stop on test failure



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:22:56 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.8,1.9
Message-ID: <200607202122.k6KLMutV013902@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13801

Modified Files:
	concurrent.spec 
Log Message:
Removed vendor and distribution tags



Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- concurrent.spec	20 Jul 2006 20:13:31 -0000	1.8
+++ concurrent.spec	20 Jul 2006 21:22:53 -0000	1.9
@@ -36,12 +36,10 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
-Vendor:         JPackage Project
-Distribution:   JPackage
 Source0:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
 Source1:	%{name}-%{version}.build.xml
 URL:            http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/
@@ -137,6 +135,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_2fc
+- Removed vendor and distribution tags
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_1fc
 - Merge with upstream version
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:31:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:31:21 -0400
Subject: rpms/gcc/devel gcc41.spec,1.83,1.84
Message-ID: <200607202131.k6KLVLYm016801@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16720

Modified Files:
	gcc41.spec 
Log Message:
4.1.1-10


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gcc41.spec	20 Jul 2006 20:11:54 -0000	1.83
+++ gcc41.spec	20 Jul 2006 21:31:10 -0000	1.84
@@ -457,6 +457,8 @@
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
+find . -name \*.java-backport~ | xargs rm
+
 cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
 # Hack to avoid building multilib libjava



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:39:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:39:18 -0400
Subject: rpms/notification-daemon/devel notification-daemon.spec,1.7,1.8
Message-ID: <200607202139.k6KLdICw018719@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/notification-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18695

Modified Files:
	notification-daemon.spec 
Log Message:
don't kill gconf


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- notification-daemon.spec	19 Jul 2006 17:29:50 -0000	1.7
+++ notification-daemon.spec	20 Jul 2006 21:39:15 -0000	1.8
@@ -5,7 +5,7 @@
 Summary: Notification Daemon 
 Name: notification-daemon
 Version: 0.3.5
-Release: 5 
+Release: 6 
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -61,14 +61,12 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || :
-      killall -HUP gconfd-2 || :
 fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/notification-daemon.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
 
 %files
 %defattr(-,root,root)
@@ -82,10 +80,13 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-6
+- Remove gconf kills, no longer necessary
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.5-5
 - add BR on dbus-glib-devel
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-4.1
 - rebuild
 
 * Fri Jun 09 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.5-4



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:41:10 -0400
Subject: rpms/castor/devel castor.spec,1.10,1.11
Message-ID: <200607202141.k6KLfAvx019112@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19026

Modified Files:
	castor.spec 
Log Message:

Rebuilding with -d to see why this is failing on brew, but not on other reference machines.




Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- castor.spec	20 Jul 2006 20:55:39 -0000	1.10
+++ castor.spec	20 Jul 2006 21:41:08 -0000	1.11
@@ -153,7 +153,7 @@
 
 # do this last, since it will delete all build directories
 export CLASSPATH=%(build-classpath adaptx)
-ant -buildfile src/build.xml doc
+ant -d -buildfile src/build.xml doc
 
 # like magic
 %jpackage_script org.exolab.castor.builder.SourceGenerator %{nil} %{nil} xerces-j2:%{name} %{name}



From fedora-cvs-commits at redhat.com  Thu Jul 20 21:59:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 17:59:06 -0400
Subject: rpms/castor/devel castor.spec,1.11,1.12
Message-ID: <200607202159.k6KLx6ht015434@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15422

Modified Files:
	castor.spec 
Log Message:

Added missing BR/R for log4j.




Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- castor.spec	20 Jul 2006 21:41:08 -0000	1.11
+++ castor.spec	20 Jul 2006 21:58:59 -0000	1.12
@@ -25,10 +25,12 @@
 Requires:       jndi
 Requires:       jta
 Requires:       ldapjdk
+Requires:       log4j
 Requires:       oro
 Requires:       regexp
 Requires:       xerces-j2
 BuildRequires:  adaptx
+BuildRequires:  log4j
 BuildRequires:  ant
 BuildRequires:  jdbc-stdext
 BuildRequires:  jndi
@@ -39,9 +41,6 @@
 BuildRequires:  regexp
 BuildRequires:  xerces-j2
 
-# excluded due to eclipse
-ExcludeArch: s390 s390x ppc64
-
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
 Requires(post):		java-gcj-compat
@@ -152,8 +151,8 @@
 cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # do this last, since it will delete all build directories
-export CLASSPATH=%(build-classpath adaptx)
-ant -d -buildfile src/build.xml doc
+export CLASSPATH=%(build-classpath log4j adaptx)
+ant -buildfile src/build.xml doc
 
 # like magic
 %jpackage_script org.exolab.castor.builder.SourceGenerator %{nil} %{nil} xerces-j2:%{name} %{name}
@@ -286,6 +285,7 @@
 %changelog
 * Thu Jul  20 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_5fc
 - Added conditional native compilation.
+- Added missing BR/R for log4j.
 
 * Thu Jun  8 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_4fc
 - Updated project URL -- fix for Bug #180586



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:00:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:00:40 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.14,
	1.15
Message-ID: <200607202200.k6KM0eV7015511@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15498

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

Added conditional native compilation.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-dbcp.spec	12 Jul 2006 06:28:12 -0000	1.14
+++ jakarta-commons-dbcp.spec	20 Jul 2006 22:00:38 -0000	1.15
@@ -1,43 +1,117 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+%define _without_maven 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
 %define base_name	dbcp
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.2.1
-%define release 	3jpp_4fc
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		jakarta-commons-dbcp
+Version:	1.2.1
+Release:	5jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
-License:	Apache Software License
+License:	Apache Software License 2.0
 Group:		Development/Libraries/Java
+Vendor:		JPackage Project
+Distribution:	JPackage
 Source0:	%{short_name}-%{version}-src-RHCLEAN.tar.bz2
+Source1:        pom-maven2jpp-depcat.xsl
+Source2:        pom-maven2jpp-newdepmap.xsl
+Source3:        pom-maven2jpp-mapdeps.xsl
+Source4:        %{base_name}-%{version}-jpp-depmap.xml
+Source5:        commons-build.tar.gz
+
+Patch0:		commons-dbcp-1.2.1-project_xml.patch
+Patch1:		commons-dbcp-1.2.1-TestJOCLed.patch
+Patch2:		commons-dbcp-1.2.1-TestConnectionPool.patch
+Patch3:		commons-dbcp-1.2.1-navigation_xml.patch
+Patch4:		commons-dbcp-1.2.1-project_properties.patch
+
 Url:		http://jakarta.apache.org/commons/%{base_name}
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 2.0
 BuildRequires:	jakarta-commons-pool >= 1.1
 BuildRequires:	jdbc-stdext >= 2.0
-BuildRequires:	xml-commons-apis
-BuildRequires:  jpackage-utils > 1.4
-BuildRequires:	junit >= 3.7
+BuildRequires:	xerces-j2
+BuildRequires:	xml-commons-apis >= 0:1.3
+BuildRequires:  jpackage-utils > 1.6
+BuildRequires:	junit >= 3.8
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+BuildRequires:  saxon
+BuildRequires:  saxon-scripts
+%endif
+
 Requires:  /usr/sbin/update-alternatives
 Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-commons-pool >= 1.1
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+Provides:	%{short_name}
 Provides:  hibernate_jdbc_cache
-# FC2
-Obsoletes:	%{short_name} <= 1.1
+Obsoletes:	%{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
-The DBCP package shall create and maintain a database connection pool
-package written in the Java language to be distributed under the ASF
-license. The package shall be available as a pseudo-JDBC driver and
-via a DataSource interface. The package shall also support multiple
-logins to multiple database systems, reclamation of stale or dead
-connections, testing for valid connections, PreparedStatement
-pooling, and other features.
+Many Jakarta projects support interaction with a relational 
+database. Creating a new connection for each user can be time 
+consuming (often requiring multiple seconds of clock time), 
+in order to perform a database transaction that might take 
+milliseconds. Opening a connection per user can be unfeasible 
+in a publicly-hosted Internet application where the number of 
+simultaneous users can be very large. Accordingly, developers 
+often wish to share a "pool" of open connections between all 
+of the application's current users. The number of users actually 
+performing a request at any given time is usually a very small 
+percentage of the total number of active users, and during 
+request processing is the only time that a database connection 
+is required. The application itself logs into the DBMS, and 
+handles any user account issues internally.
 
 %package javadoc
 Summary:	Javadoc for %{name}
@@ -46,27 +120,105 @@
 %description javadoc
 Javadoc for %{name}.
 
+%if %{with_maven}
+%package manual
+Summary:        Documents for %{name}
+Group:          Development/Documentation
+
+%description manual
+%{summary}.
+%endif
+
 %prep
+cat <<EOT
+
+                If you dont want to build with maven,
+                give rpmbuild option '--without maven'
+
+EOT
+
 rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{short_name}-%{version}
 # quick hack
 cp LICENSE.txt ../LICENSE
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+gzip -dc %{SOURCE5} | tar xf -
+
+%patch0 -b .sav
+%patch1 -b .sav
+%patch2 -b .sav
+%patch3 -b .sav
+%patch4 -b .sav
 
 %build
-export CLASSPATH=$(build-classpath commons-collections commons-pool jdbc-stdext junit)
-ant -Djava.io.tmpdir=. dist
+%if %{with_maven}
+export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
+echo '<depset>' >> $DEPCAT
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+    popd
+done
+echo >> $DEPCAT
+echo '</depset>' >> $DEPCAT
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
+
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    cp project.xml project.xml.orig
+    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+    popd
+done
+mkdir -p .maven/repository/JPP/jars
+pushd .maven/repository/JPP/jars
+    ln -sf $(build-classpath jdbc-stdext) jdbc.jar
+popd
+
+maven \
+        -Dmaven.repo.remote=file:/usr/share/maven/repository \
+        -Dmaven.home.local=$(pwd)/.maven \
+        jar javadoc xdoc:transform
+%else
+
+export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
+ant \
+	-Dbuild.sysclasspath=first \
+	-Dcommons-pool.jar=$(build-classpath commons-pool) \
+	-Dcommons-collections.jar=$(build-classpath commons-collections) \
+	-Djunit.jar=$(build-classpath junit) \
+	-Djndi.jar=$(build-classpath jndi) \
+	-Dsax2.jar=$(build-classpath xml-commons-apis) \
+	-Djava.io.tmpdir=. \
+	dist test
+%endif
 
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%if %{with_maven}
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%else
 install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%endif
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -rf target/docs/apidocs
+%else
 cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+
+%if %{with_maven}
+# manual
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%endif
 
 # quick hack clean up
 rm ../LICENSE
@@ -76,6 +228,10 @@
   $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,59 +239,72 @@
 update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
   hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 {
   [ $1 -eq 0 ] || exit 0
   update-alternatives --remove hibernate_jdbc_cache %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt
 %{_javadir}/*
 %ghost %{_javadir}/hibernate_jdbc_cache.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-3jpp_4fc
-- rebuild
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.1-3jpp_3fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.1-3jpp_2fc
-- Remove jarfile from the tarball.
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
+%endif
 
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.1-3jpp_1fc
-- Build into Fedora.
+%changelog
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_1fc
+- Added conditional native compilation.
 
-* Tue Nov 02 2004 Fernando Nasser <fnasser at redhat.com> 0:1.2.1-0.hjc.3jpp_1rh
-- Import latest community version
+* Wed Apr 12 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.1-4jpp
+- First JPP-1.7 release
+- Build with maven by default
+- Add option to build with straight ant
+- Add -manual subpackage when built with maven
+- Backported TestJOCLed from HEAD
 
-* Tue Nov 02 2004 Fernando Nasser <fnasser at redhat.com> 0:1.2.1-0.hjc.3jpp
-- Bump version to make provide hibernate_jdbc_cache official
+* Tue Nov 02 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.2.1-3jpp
+- Bump release to make provide hibernate_jdbc_cache official
 
 * Tue Aug 24 2004 Randy Watler <rwatler at finali.com> - 0:1.2.1-0.hjc.2jpp
 - Rebuild with ant-1.6.2
 
-* Wed Jul 21 2004 Fernando Nasser <fnasser at redhat.com> 0:1.2.1-1jpp_1rh
-- Import latest community version
-
 * Fri Jul 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2.1-0.hjc.1jpp
 - Provide hibernate_jdbc_cache and di update-alternatives, prio 60
 
 * Thu Jun 24 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.2.1-1jpp
 - Update to 1.2.1 (tomcat 5.0.27 wants it)
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-1jpp_1rh
-- RH vacuuming
-
 * Mon Oct 27 2003 Henri Gomez <hgomez at users.sourceforge.net> 1.1-1jpp
 - common-dbcp 1.1
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:02:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:02:53 -0400
Subject: rpms/beagle/devel beagle.spec,1.60,1.61
Message-ID: <200607202202.k6KM2r7J015629@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15614

Modified Files:
	beagle.spec 
Log Message:
don't remove a user that doesn't exist


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- beagle.spec	14 Jul 2006 16:05:20 -0000	1.60
+++ beagle.spec	20 Jul 2006 22:02:50 -0000	1.61
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	3 
+Release:       	4 
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -140,8 +140,8 @@
 %pre
 %define beagle_user_uid 58
 # Remove old username, we switched to an 8 char one
-/usr/sbin/userdel beagleindex
-/usr/sbin/groupdel beagleindex
+for x in $(cut -d: -f1 /etc/passwd) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/userdel beagleindex; break; fi; done
+for x in $(cut -d: -f1 /etc/group) ; do if [ "$x" == "beagleindex" ]; then /usr/sbin/groupdel beagleindex; break; fi; done
 /usr/sbin/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || :
 /usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || :
 
@@ -216,6 +216,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-4
+- Only remove beagleindex user/group if they exist (#196665)
+
 * Fri Jul 14 2006 Matthias Clasen <mclasen at redhat.com> - 0.2.7-3
 - Make beagle_util_daemon_is_running work with NFS homedirs
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:09:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:09:20 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.17, 1.18
Message-ID: <200607202209.k6KM9KZR015736@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15721

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:

Added conditional native compilation.




Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-fileupload.spec	18 Jul 2006 19:50:56 -0000	1.17
+++ jakarta-commons-fileupload.spec	20 Jul 2006 22:09:16 -0000	1.18
@@ -1,18 +1,49 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name       fileupload
 %define short_name      commons-%{base_name}
-%define name            jakarta-%{short_name}
-%define version         1.0
-%define release 	3jpp_8fc
 %define section         free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           jakarta-%{short_name}
+Version:        1.0
+Release:        5jpp_1fc
 Summary:        Jakarta Commons Fileupload Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
+Vendor:         JPackage Project
+Distribution:   JPackage
 Epoch:          1
 Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupload-1.0-src.tar.gz
 Patch0:         %{name}-crosslink.patch
@@ -22,13 +53,21 @@
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  junit >= 0:3.8.1
-BuildRequires:  servletapi5
+BuildRequires:  servlet24
 BuildRequires:  servletapi5-javadoc
 Requires:       servletapi5
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# RHEL3 and FC2
-Obsoletes:      %{short_name} <= 0:1.0
+Provides:       %{short_name}
+Obsoletes:      %{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The javax.servlet package lacks support for rfc 1867, html file
@@ -40,7 +79,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -81,6 +119,10 @@
 
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,11 +139,31 @@
 
 # -----------------------------------------------------------------------------
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
@@ -109,29 +171,11 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-3jpp_8fc
-- Build on all archs.
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-5jpp_1fc
+- Added conditional native compilation.
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-3jpp_7fc
-- rebuild
-
-* Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 1:1.0-3jpp_6fc
-- excluded s390[x] and ppc64 due to eclipse
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:1.0-3jpp_5fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 1:1.0-3jpp_3fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1:1.0-3jpp_2fc
-- rebuilt
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 1:1.0-3jpp_1fc
-- Build into Fedora.
-
-* Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> 1:1.0-3jpp_1rh
-- Merge with upstream version
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 1:1.0-4jpp
+- First JPP 1.7 build
 
 * Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> - 1:1.0-3jpp
 - Patch to build with servletapi5
@@ -140,18 +184,6 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:1.0-2jpp
 - Rebuild with ant-1.6.2
 
-* Tue Jul 27 2004 Fernando Nasser <fnasser at redhat.com> 1:1.0-1jpp_4rh
-- Fixes to build with servletapi5
-
-* Fri Jul 18 2004 Fernando Nasser <fnasser at redhat.com> 1:1.0-1jpp_3rh
-- Update dependency on servletapi
-
-* Mon Mar  8 2004 Frank Ch. Eigler <fche at redhat.com> 1:1.0-1jpp_2rh
-- RH vacuuming part II
-
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 1:1.0-1jpp_1rh
-- RH vacuuming
-
 * Sat Jun 28 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:1.0-1jpp
 - Update to 1.0.
 - Add Epochs to dependencies.



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:11:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:11:34 -0400
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-2.0.0-ainit.patch, NONE,
	1.1 system-config-soundcard.spec, 1.42, 1.43
Message-ID: <200607202211.k6KMBYtd015824@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15809

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.0-ainit.patch 
Log Message:
removed ainit parts

system-config-soundcard-2.0.0-ainit.patch:
 soundcard.py        |   14 +-------
 soundcardBackend.py |   89 +++-------------------------------------------------
 2 files changed, 8 insertions(+), 95 deletions(-)

--- NEW FILE system-config-soundcard-2.0.0-ainit.patch ---
--- system-config-soundcard-2.0.0/src/soundcardBackend.py.old	2006-07-20 21:43:45.000000000 +0200
+++ system-config-soundcard-2.0.0/src/soundcardBackend.py	2006-07-20 23:50:16.000000000 +0200
@@ -136,14 +136,12 @@
         self.default_device = 0
             
         self.hardware_device = 0
-        self.dynamic_keys = 0        
-        
+                
         self.card_max_index = 7
         self.card_min_index = 0
         
         self.card_index_changed = False
-        self.card_default_changed = False
-        self.card_dyn_keys_generate = False        
+        self.card_default_changed = False        
 
         self.readAlsaConfig()
         
@@ -153,27 +151,13 @@
         print "default_card %d" % self.default_card
             
         print "hardware_device %d" % self.hardware_device
-        print "dynamic_keys %d" % self.dynamic_keys
-        
+                
         print "card_max_index %d" % self.card_max_index
         print "card_min_index %d" % self.card_min_index
     
         print "\n"
     
-        return
-
-    def reconfigureDynamicKeys(self):
-        try:
-          if self.dynamic_keys :
-            if os.path.exists("/usr/bin/ainit") and os.path.exists("/var/run/console/console.lock"):
-                os.system("/usr/bin/ainit `cat /var/run/console/console.lock` start")
-          else:
-            if os.path.exists("/usr/bin/ainit") and os.path.exists("/var/run/console/console.lock"):
-                os.system("/usr/bin/ainit `cat /var/run/console/console.lock` stop")
-          return True
-        except:
-          return False
-          
+        return          
 
     def readAlsaConfig(self):
         # Check alsa configuration
@@ -192,21 +176,6 @@
             self.hardware_device = 0
             self.default_device = 0
 
-        # Check ainit configuration
-        try:
-            fd = open('/etc/alsa/ainit.conf', 'r')
-            lines = fd.readlines()
-            fd.close()
-
-            for line in lines:                
-                line = string.split(string.strip(line))
-                if line != [] and cmp(string.lower(line[0]),"enable") == 0:
-                    self.dynamic_keys = (cmp(string.lower(line[2]),'yes') == 0)
-                    break;
-                    
-        except:
-            self.dynamic_keys = 0
-
         try:
             self.default_card = int(commands.getoutput('/bin/alsacard'))
         except:
@@ -242,32 +211,6 @@
 	        fd.write(line)
 	    fd.close()
 
-        try:          
-          if os.path.exists("/etc/alsa/ainit.conf"):
-
-              # re-writing ainit.conf
-              fd = open('/etc/alsa/ainit.conf', 'r')
-              lines = fd.readlines()
-              fd.close()
-
-              lines_out = []
-              for line in lines:                
-                line_tmp = string.split(string.strip(line))
-                if line_tmp != [] and cmp(string.lower(line_tmp[0]),"enable") == 0:
-                    if self.dynamic_keys:
-                       lines_out.append("enable = yes\n")
-                    else:
-                       lines_out.append("enable = no\n")
-                else:
-                    lines_out.append(line)
-
-              fd = open('/etc/alsa/ainit.conf', 'w')
-              fd.writelines(lines_out)
-              fd.close()
-              
-        except:
-          return False
-          
         return True
 
     def cardIndexChanged(self):
@@ -277,9 +220,6 @@
     def cardDefaultChanged(self):
         self.card_default_changed = True
         
-    def cardDynKeysGenerate(self):
-        self.card_dyn_keys_generate = True
-
     # ------------------------------------------------------------------------
     # Configuring routines - modprobe.conf
     # ------------------------------------------------------------------------        
@@ -421,7 +361,7 @@
         self.card_index_changed = False
 
     def writeConfig(self, cardArray):
-        ret_alsa = ret_mod = dyn_keys = True
+        ret_alsa = ret_mod = True
         if self.card_index_changed:
             ret_mod = self.rewriteModprobe(cardArray)
             if not ret_mod:
@@ -438,14 +378,7 @@
             else:
                 errorDialog(_("Unable to write ALSA configuration files!"))
 
-        if self.card_dyn_keys_generate:
-            dyn_keys = self.reconfigureDynamicKeys()
-            if dyn_keys:
-                self.card_dyn_keys_generate = False
-            else:
-                errorDialog(_("Unable to generate ALSA SHM keys!"))
-
-        return ret_mod and ret_alsa and dyn_keys
+        return ret_mod and ret_alsa
         
 
 class soundcardBackend:
@@ -629,13 +562,6 @@
     # Other conrols
     # --------------
     
-    def setDynamicKeys(self, state):
-        self.soundConfig.dynamic_keys = state;
-        self.soundConfig.cardDefaultChanged()        
-
-    def getDynamicKeys(self):
-        return self.soundConfig.dynamic_keys
-
     def setDefaultCard(self, index):
         self.soundConfig.default_card = index
         self.soundConfig.cardDefaultChanged()
@@ -655,9 +581,6 @@
 
     def cardIndexChanged(self):
         self.soundConfig.cardIndexChanged()
-
-    def cardDynKeysGenerate(self):
-        self.soundConfig.cardDynKeysGenerate()
     
     def writeConfig(self):
         self.soundConfig.writeConfig(self.cardArray)
--- system-config-soundcard-2.0.0/src/soundcard.py.old	2006-07-20 21:43:45.000000000 +0200
+++ system-config-soundcard-2.0.0/src/soundcard.py	2006-07-21 00:06:29.000000000 +0200
@@ -195,10 +195,7 @@
                 
     def changeHW(self, widget, data=None):
         self.soundcardBackend.setHardwareDevice(widget.get_active())
-        
-    def changeDynKeys(self, widget, data=None):
-        self.soundcardBackend.setDynamicKeys(widget.get_active())
-        
+                
     def applyChanges(self, *args):
         self.soundcardBackend.writeConfig()
 
@@ -642,18 +639,11 @@
         configBox = gtk.VBox(False, 0)
 
         #Create a check-box for hw/sw config
-        button = gtk.CheckButton(_("Disable software mixing (dmix, dsnoop)"))
+        button = gtk.CheckButton(_("Disable specific card configuration"))
         button.set_active(self.soundcardBackend.getHardwareDevice())
         button.connect("toggled", self.changeHW)
         
         configBox.pack_start(button)
-
-        #Create a check-box for key config
-        button = gtk.CheckButton(_("Dynamic keys for software mixer (more secure)"))
-        button.set_active(self.soundcardBackend.getDynamicKeys())
-        button.connect("toggled", self.changeDynKeys)
-           
-        configBox.pack_start(button)
         configBox.show_all()
 
         configBox = self.create_frame(self.create_frame(configBox,8),0,_("ALSA plugins"),gtk.SHADOW_ETCHED_IN)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-soundcard.spec	20 Jul 2006 09:46:39 -0000	1.42
+++ system-config-soundcard.spec	20 Jul 2006 22:11:31 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.0
-Release: 3
+Release: 4
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -10,6 +10,7 @@
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
 Patch: system-config-soundcard-2.0.0-update.patch
+Patch1: system-config-soundcard-2.0.0-ainit.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -34,6 +35,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 make
@@ -88,6 +90,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Fri Jul 21 2006 Martin Stransky <stransky at redhat.com> 2.0.0-4
+- removed ainit parts
+
 * Tue Jul 20 2006 Martin Stransky <stransky at redhat.com> 2.0.0-3
 - fixed pycairo Requires
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:18:19 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.15,
	1.16
Message-ID: <200607202218.k6KMIJkr030726@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30710

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

Removing Vendor and Distribution tags.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jakarta-commons-dbcp.spec	20 Jul 2006 22:00:38 -0000	1.15
+++ jakarta-commons-dbcp.spec	20 Jul 2006 22:18:16 -0000	1.16
@@ -50,8 +50,6 @@
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0
 Group:		Development/Libraries/Java
-Vendor:		JPackage Project
-Distribution:	JPackage
 Source0:	%{short_name}-%{version}-src-RHCLEAN.tar.bz2
 Source1:        pom-maven2jpp-depcat.xsl
 Source2:        pom-maven2jpp-newdepmap.xsl



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:19:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:19:00 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.18, 1.19
Message-ID: <200607202219.k6KMIxLJ030783@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30766

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:

Removing Vendor and Distribution tags.




Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-fileupload.spec	20 Jul 2006 22:09:16 -0000	1.18
+++ jakarta-commons-fileupload.spec	20 Jul 2006 22:18:57 -0000	1.19
@@ -42,8 +42,6 @@
 Summary:        Jakarta Commons Fileupload Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
-Vendor:         JPackage Project
-Distribution:   JPackage
 Epoch:          1
 Source0:        http://www.apache.org/dist/jakarta/commons/fileupload/source/commons-fileupload-1.0-src.tar.gz
 Patch0:         %{name}-crosslink.patch



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:20:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:20:14 -0400
Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec,
	1.8, 1.9
Message-ID: <200607202220.k6KMKE1M030815@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30798

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
Merge with upstream version
Natively compile packages



Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jakarta-commons-discovery.spec	12 Jul 2006 06:28:30 -0000	1.8
+++ jakarta-commons-discovery.spec	20 Jul 2006 22:20:12 -0000	1.9
@@ -1,23 +1,64 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define short_name commons-discovery
 %define section    free
 
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.3
-Release: 	1jpp_4fc
+Release:        3jpp_1fc
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
 URL:            http://jakarta.apache.org/commons/discovery/
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 Source0:        http://www.apache.org/dist/jakarta/commons/discovery/source/commonsdiscovery0.3src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  ant
+BuildRequires:  ant, jpackage-utils >= 0:1.5
 BuildRequires:  junit >= 0:3.7
 BuildRequires:  jakarta-commons-logging >= 0:1.0.1
 Requires:       jakarta-commons-logging >= 0:1.0.1
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Discovery component is about discovering, or finding, implementations for
 pluggable interfaces.  Pluggable interfaces are specified with the intent that
@@ -68,16 +109,40 @@
 
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 # -----------------------------------------------------------------------------
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-discovery-0.3.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
@@ -85,34 +150,23 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.3-1jpp_4fc
-- rebuild
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> -1:1:0.3-1jpp_3fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> -1:1:0.3-1jpp_2fc
-- rebuilt
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-3jpp_1fc
+- Merge with upstream version
+- Natively compile packages
 
-* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> - 1:1:0.3-1jpp_1fc
-- Build into Fedora.
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-3jpp
+- Added conditional native compiling
 
-* Sat Jun 04 2005 Fernando Nasser <fnasser at redhat.com> - 1:1:0.3-1jpp_1rh
-- Merge for update
+* Thu Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 1:0.3-2jpp
+- First JPP 1.7 build
 
 * Sat Jun 04 2005 Fernando Nasser <fnasser at redhat.com> - 1:1:0.3-1jpp
 - Update to 0.3
 
-* Wed Nov 03 2004 Fernando Nasser <fnasser at redhat.com> 0:4.1.29-2jpp_2rh
-- Rebuild
-
-* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:1:0.2-2jpp
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 1:0.2-2jpp
 - Rebuild with ant-1.6.2
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 1:1.0-1jpp_1rh
-- RH vacuuming
-
-* Thu Apr 17 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:1:0.2-1jpp
+* Thu Apr 17 2003 Ville Skytt? <ville.skytta at iki.fi> - 1:0.2-1jpp
 - Update to 0.2 and JPackage 1.5.
 
 * Fri Sep 13 2002 Ville Skytt? <ville.skytta at iki.fi> 1:0.1-1jpp



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:21:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:21:47 -0400
Subject: rpms/jakarta-commons-dbcp/devel commons-build.tar.gz, NONE,
	1.1 commons-dbcp-1.2.1-TestConnectionPool.patch, NONE,
	1.1 commons-dbcp-1.2.1-TestJOCLed.patch, NONE,
	1.1 commons-dbcp-1.2.1-navigation_xml.patch, NONE,
	1.1 commons-dbcp-1.2.1-project_properties.patch, NONE,
	1.1 commons-dbcp-1.2.1-project_xml.patch, NONE,
	1.1 dbcp-1.2.1-jpp-depmap.xml, NONE,
	1.1 pom-maven2jpp-depcat.xsl, NONE,
	1.1 pom-maven2jpp-mapdeps.xsl, NONE,
	1.1 pom-maven2jpp-newdepmap.xsl, NONE, 1.1
Message-ID: <200607202221.k6KMLlJp030870@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30850

Added Files:
	commons-build.tar.gz 
	commons-dbcp-1.2.1-TestConnectionPool.patch 
	commons-dbcp-1.2.1-TestJOCLed.patch 
	commons-dbcp-1.2.1-navigation_xml.patch 
	commons-dbcp-1.2.1-project_properties.patch 
	commons-dbcp-1.2.1-project_xml.patch dbcp-1.2.1-jpp-depmap.xml 
	pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl 
	pom-maven2jpp-newdepmap.xsl 
Log Message:

Add new files to cvs.




--- NEW FILE commons-build.tar.gz ---
???
C
:G at I??l?@Ux??@??O?a?1??F4? ????E???
????73;{,? VBX????<g??E[%>;??6?j?a?I!'l??FQ??????F=? u,%?8{Hb$??&????b??@??,??-7?"??a
????n????????
+?N?c??$?&{?1
c??=?(Z??????3?V????;9?X?>?)?<?hG??V??uS?\@??'?J?[?u
Ru?k?
???8???2U?A?????
1C?q/???[V$??	a??&?\}*????>C?#?S0?
??X??35??6?????I?dEr?&????????4??:???CV???O=???v??w?????A<?h??????p?+-???H???X??NJ??4N&ic?4?	?TK???Xw?ervd 2?%???-C???????u?u?}??%????2\s???`??V???`#`??y@????????`??5??U8qhH+v??o??Fz??z_'[dZ7?O3HQ??pX?a??.?????l???8,4?o`??????y???B?Q?Bu!?%?B?d?Q{A??sX)??!?????"n?XX??qaxT??f?*????(?0TcQq???35?ujQ&??a?\}???N'?X7H?R<?~WJ}?u???tE
???u]??L?,???A6P??@c???v????e???nh#<??U$??/P??U???2g?'4???n???????????!???U`u????OO?<,k???=??B?u?%$#?-D!69&??
#???D?8?Y6?9n??m???C ???=v?m1"
??PbF?N?88??ek}?????~'?*?o????
?>BI-?@h	??????G@???`
A?q??Q??a?}??????????(D??4????fU?*d`68$Q???x?~?2?si???Y???Z??M??f?9D['?????nch8?
ap
??|?"@q?Z?`p
~?=y???I????U*Q?Q?|*?
?6????=???T%??_'???B? ????H????v1!?,?8?????6??(??	VP?hxT%

v
??`v??]?9.????n_?n@??T?%7??M?.o?)?j?????&?,???|?rik?????y??h?H????Y?
?H;+[?O???
?DD0r?Z?pe???
?%????*??C??ju~i)??
	s^??F0?+???F?-Te???yFe????L??[0X??JB??S??#^?BJYS?????{?V?????a/???????0?Y)Q?vM<!?????5?CC???H?F?q"r????%?gU???m?JIj?????L?v>U?s??:.zq?xr???[?{A1m???l
??0?x??L?? 
?Jh?1??
???n?&FM`??X????m???$?1??+d+9?????w??/???GV??????|??W??^R?rIB??;F?[b?Hr
???D2??2??db{%??Z?%u*???IVF??-??(???t????'???
?_?2
?a[v????pQ 
0*	???Y6?????+k?????Bo?&?B?????n????Yf??2[M
???k???
?&3b?8?NH!??:L???eR??bX}??????bV.??z[?????6??ez??a????ZH?F?P`??,?=????,??x??]??1'??r~d=
?Q?RZ?o???4=?R???%?]-??D?|0Q?????IA?#???e?d?R??5L?X???D?g?ma?b@?S??%?Q?sMe?s??MN??1??? ?8?:
~?/?????_???I,????-????]/R?-?-?? fR???sN???Z??<??G?`??%?H??%?T)&?]?O??1-L???jL	?????I??"???QP?~1????O??\w?)??????`bv?:x???a\e??????/?j???~a???i??????`??BU?'AV??t5
Q??
~B???U
?E=?6cY??;????????E????3??????-??????:????O?^(????4???k??Y??q????????ct?gV{
??9?\ZXZn???YZZz?yW\|???(?|??lY??Xp	~??????T???????????/?????.?O????/?CF1B?#1?@}???s???qIC?_*?_?{???T*kO*???~?)????A?????????w%?S?S<%??????H+?c??}??????k?yO?S????w???P?1??W??7????T*?????????a????????+??|rr???ow.???9????On??w???{????8}?????0q???o/??{???t??N??o?8=??&`xr????;
l?
F?J?I?0?L???;H?? yF??_W???w]3Qu#h??al??????r?Xyt??PD??A?>	,4?3$???%wD????801?T??H:g)=B??CH??[???f??$&?????+?i@?L?_^_?J?f?3(???\????	YE??>????????
jo0PHv
?a??
U=?j??!n??PKE?~??+?~?&?J?? ?&)?s??|r]Lm?O1?o_??<?~?I'?qn?<\????<?????h??`l_??7???W??3p???^<???#?
?{???)-?])?????|?*J?q2??&??????O)?+j????
g?B at d?4V?wI?+?)$#L?~!a????dL	oHwu??%???}UJ-?B??J?@????h?m???C???U?????-?g}Fn???g???zz??Qe???J?#b5??"`???:+??i=?~??VX?8~?????????+?~M]??;t????\s~???^???N?,?L??o at e?e???Y,A???9???*aW?J??,6??W???c?K????7?y?F??<???????]?.??? ??V???H?????Q???*(,*.-+/?`W|V^VZRTHr??#I%?T?_?9?Iy??????????????????/jk*?K1g??????L??u???R\X?.xS??????????????vNG??????J???UT?64???q8??)??%??%0???J??j[?;???C?????jo??,+-???M????????????????z????S?\RQ?????78??$2?T4???Z_S?in????"?D"?vs??kk?a?%?????=0??e
?nl|L???7544?s?G?D?L?Pit?N-r?[Z? ???!se]KW??PJ?-??)?E/??l?t????*
[?s?F?7Zl????????z`/???WP\Q???T-[?g:?????????e????a?B7n2?t:???1=???vU???a???????j????a?8??B6???????V*?	eZ?mr?n?j4z?cvy}s}ifB+????????????!??d?M?j?Zo??]\^?u???2???57?;5aP??*?????????*??_T^??/?ML??6?F&?????Yl?I?????U????
b??????E???q,??	?_R????'???g?c
??O?1???I??`0M??????]Fh`X??y|?T:\???I
??e?m2?kquy??????	z??4?????k?P???4??????F?v???8?[t?????/?h??i????y?F??????7*?+Ul???5N-?????5?N???????L???//???????????/????G?-?d?????????Qr}J3??????[?C??F???????V??'<;??o???l???e???7??g6?Gg???)?pGCm]s?????~??"?_?
6?WXZ?>??\
F???I?HGCUEEe
????a???;{p?r??9??5??<????||??]?%??j9#Z??A"q????:?????6?t???;??.?i??????3?qm?/]@~7???cT7?=:?????????????????~???N??S?Y=??????:?={p~Xa?s ?7vr??[?)?8
????u;??cn???????Q?m?????n???O?;????Oo??.Oc?3c?>NS=0?F??A?a??????	i_k}]c??jrm?u????????mH=?;{??(???
???[[??;?z??z?F???????$LMscK??zru/???W?q??@K???
t\$??G?z???W_???Xk_
?.???g?>N?W??Z	??sz!W6v?L?????>8??'?j?X????????[????C??E1??????????g?<F
Hu?E?n???I?dthX?0:a?/:?z-?a??&???~??$?\tON??????@>?\??c????Y-
?????????U((f@????~p??????xhgm?eWKxC?<?8?xwgm?>?V(Tz?cz??0j?"	??JkZ?`?m??//NS????,r??^.?oT>>?????<7	??h
?	??lP?x#*???z??????RG??????0?????VN??To????????:?alL?????????43f?????lA??J~gKC}Ck??H5>a??,F?V?V?R?%??????>"H??J????????????y?uL!??l?????m???J?Z?^?Q)dR?H0:???r??CEe???|???b?2????:&???'rH"	????}????Z)	XPTVU???
?R*d??
n[C5?^?
v?s?
a???"?6_????????????(??d+`?s???????
l???????
s`???M>+
??/"?
F6????2???
gx?\?55D?5???,`(?W?PWVT????????????]?cr]3@gHQS[O??66????[~
?eJ?~lL?Q???<?D????`???????hEl??b?D???n????3?- ?u?q??9=3=e5??J????0Bw{sswH?2?,f#B?q??53??	z?uM?l???????????l?
@???gg	??Q:??,5??S3+7?k?T?[???K???$??1??????kSz?Lc??t~????9???1??????]?????A!????????R?| a???o????C??K,?8??S??00?8~2???? +q~?p?2??>?????IxV?W#????3?g?{??~????H??T~j?P?'???F=6???&?'?a?bb1??Z|?S2B:??@?ql??S/?????qx?m??f??????.N(q??p?,s???I2+D????t?>Xw??????6????L????	???d1p?<)t???$???F(??W?2?P1>????Y ???/?L???,*`G?	`]b???N? ?97??2???o????u???R???S&?n?>??{?X?6*?|??4???S???7??=S?r???Hm?Y??n.?L*?'????????	?Z?3;=??[??6??7????sk"??9;7?S8<08*?N???
?<??j!?a?R*Uh?????i?A???c?BD??l??C????#b?H#??#?==??bL5?????%J?R?c)o???3??i?[:?GE?D0???ik?????2?pt??????g`/E?!@q}??B?L*??t???w????}%0?G?Z9hK???rZA??6H]vwB???????v???!VT???omin???XV?????1?>@o??O
?????745??}?U??_T?
. 0??????K^???
j??T?,GS?d???t?v?*??????.??? @???.y
??
??u1??O
?^?K???%?/K?	??E??
?)??@?U^!?L??/,???(
V?
?J?Ey???
???{???-??=b?Rb??bAyo?yjcg?v
o#?)@>?|8T?U?0??F??9?}X?????K?????????q?a_MeY	??>?
{??????
???vL?????><???d??u??_b
?r?????9?8GH???2????$?X?&.@??o?-?????OjY?=<>???{?o?d???	???ul??#Pv?Awkc3g at f???????????????~????A
?
*??V<?{? !??
v??sG?V?w???[?uM/l??I~???hhwqy?BK??$??:4?~??ma+?V?)????????S
?;?hU?G??	@?

{?8}?

	6p??`????XE??as????]u??_?W?5s???lknt?S???M?
???bv??!??/J?]??WQ]?HH?U?H??7??5?
???9????????=/?LYy?/i?.??_1y??>????^f?}???s????|?9?&,?,uE??+@'@k_P?[?
?i??_i?
?HO[]iC??/???E?????Q6:00"??N'
H?q???^??<Sc???s?????Z????;?j?????Zo???P?w?J????^4????:L:9????:C,U??????*??<???R???yPp?C]?5?Et3R?k#rrq??1*e
T?#???d4???2?????H;???$?=3.KTf??^?????pge???j?&?????@?X??:????|?D?o?????$??????t?l????*?
E=m????c?
?\????Ri??????om?(?F??F??c?????qlg??W)T(??{???8V?W??Z>???,??0????[sV=?Z?@????N???? ???X??????}+.?F.S??z?O?]&l?l??L???U&???wk?m?aX??:?\&z?V%?n?+?W???y?yj??	?L02<?[?F$d? 6???{?%?????Ro???X?v??

}<???
????3??tt?+??X`?h????????v?????W???B?ZZ??@?755B??r?????/kQyf????UV??_U]]?_???,s
P??+????t???IK;L????Q$?(??Iy4???TD???j??e)?o5?B?????4?
zx?b?Q>Y??|
Y/UWO8?>?k??6???E????h?+???.???"~8??+??_G??? q??c??\]?;duS>??_??	Zs?a,t8U& ??U|U?z?~?W0?t??T???=o?0=??????sf???M9???????"~??S:???a??h??b?H????/'b?i&???	???wr|Wi??]?4???N~???.?qrG?|?K?z?2d?lIY?<B??b~?????C*?&C??`HTA??Fd`?????k??g??0?c4E%?????+?F)??7]K?????3?9y?,????	??s???Fe?^?r???(O[z?o??
?0_??3?b?yo????????&????R?*&t??vR??EH{K??.d<?oRdZ?%??MH?2eU@?&???%???gh??-4v??3,?F??5?F??*L??	??X??????
VC?
?+?Y?%?/?`]
?E\???eq???}????mWTt?;s<???uEW?{???+????
????E{?o???????#??Z?????4?:?Pk at MME2I?~YVV??d???UW?ya?\\=?d???u.S??C8?L??g0he?????H?(????(2?????j$??W?????
?R????=s??a????????ajt4???/a?2K??m?F?0?2??YZ>?I5?+c"=1?-????o???rSo??????yUnr?[,*7??m???\?6??M?|?	?J??zr?+??7??os????b-?T\??y
CK?q?????????3?^?T?????D??!?x??\Q??4??????gW:8?.??b??S??*&???_>?
?C?m=??g=,x???]L?????s=???O1
ag?WW?]?? ???+?$???%??lJf?>|J?eV??P]]?=??T\,?	?i4???$,??U?R?m?'??^A&b???'[??xv?F??+J^?????>?_?
>?W?Dg?|????????tf?M?N???MJ??????4??5?oY?Pf??[H?g??59????g??
??@6??
Pg???/hL??????2BL???;????????	
	?N????????P
S?S??-?i???io?*E???	????a?X"??4?O?U???????e????
??K?8??n?hP
??	}~!?)?H?z?J4??XU???J??H???=|?ir??????T?"???WLFm?f ^?F??????,?dh????&?|??F?????Q?}???Xu?xt?????\76??w5U?????k{?Ddg?(??????B?Z%??sk`9?????N???N?$??'????T??u	D"^??GyA)?g??<;C??)?&?2????A????5T3C???_???Bt?,.?????Q??mLbH?3?#.??k?p{z????
t??ZLG???}i?J`???0rry??RC???uT
k?????????s~y%:?7?????@)??(?k??????Sy??
????????????b?'?D?;~L?
TT?????
??\?l?Nm3??h?}D+??+?I

?r???kj???e??jg?]???E?P?`??\]]??
<?P$F/Q!zC754?0??n#q?S??FX?r?????B??????Q????K?????c@??/?w?,????????????G{8m??
\??|??,V;:(x}]?!?me??Nzl??7,???!9???.L?I?{????q?c?a??N???{????w??(1??E*?2E??}???kK???m?]#?C???vM??Sn????gj\6???S?WN>8>??erW7??f6B?Xhcf\::4*?Z\ss??{ne????????@?X?
????7:<??????xp{}mk7v|
???'?K???%:?l??{??1m??-3?????Ql????????S??{jrz?N???[y???k?q?Jo?#GW???????????~`c?e?;???X$??q??]??,?db??:????m?z??.?????????f6[?k^?wma?????~?>F?`?M??`z?	??4?pNOO?L??`v??{???F
-eJI???d:?_0?G?zxR
9??*?m
???i{mRHYTxgC}	\~?Gw?wB??C?}?U??h
??U??!AR??'1c
?5??@???hK?B???W??`;??<??ETlV?}N?"???z??P+?|??
w4?TU?W>?(?h?v??+l~??e?'?iO??2?{???A?@d?[???????bv???E?-%~??[?VS[Km?????'??r
???
????yj\????!???U?G?????.??????????&?x???a??????
U7???_6bt<??'?>K\5????2???5yh,?
A?????)T?W?9q?-"??u~aQ>??????????[?t??????
x?GEH???Bv??
Cy,???`??C?o??/??+d?Y?T}?
????????7????/??%V?c?X??o??Y??1k?C[?1?????n?9?4?????T?*?O?h??@?B?N=?(??s??|9??z?????????!3?7?'?~?e???r?????9
t,;F=a8??u?M????????>g??{???]???F=???~??~??B??f?pWK?xs['(f???
??	??1Q5???RE??~???????d?????T$S??
F??e?>h??!?X????|?Qbg?(?????c??~a??;??W?B????????I$
&:28?D??U???U"t??x??O?x??:????O?
$??????W	Z??W???r|?/?????/?e?w???}/??2?m_??{????5^?K5??|?/??>^??{/o????W?????}{??r?????{????uxS\lW"?p]??@?K???????$??9?????+??e"%y?5_$?K\?D#Wh??U?????????	|{0??p,(??????s^2L?$?????`?(j&??X?J??????;????07?????0??Q??*???nwP??kY??????'?
????????4SJ$?
U?????(y??5???R??@????P

??
???????p2@'???V
??}*?@??c??{?f??8Hr??`??c?9????`?/?*??????s??q?h0????r?????'?O????&la??^???
s?H!L???1@;?p??:SRp??\???S????J!n??????%???c?P
T??C
?E?G? ?X?o(l??R????b?{r?????x??j?%?Jv?]?F?|W*?xdxI???fvG??E???~?????h,?R4Ie?]t?
?g?tg?&?B?c7
??)??>?T(??y?7|?cQXT??f??????/??,8I?9???x@??MP/??k?????sK
?^???Q????b?L???T,?I????J?o???w??C?rD?h?=b???
?V??
W:?p?R
K?,
?A?IJ?2"?4?-*????6"??hP'??"????DKMR/e?vu?I]??~U??FL
?+?{w-X?FI??/?B:Na??$??z??gn[HN?7??4'3???}?m%z
O?????'8???????;`?1????e? ??js??)??U???r??o???(@<???$g??]Jj re?eo????Fd???K??7F???????
??????`?;??9J$??T??V?7'????c`nsjrg???z?C?3?H???;;??&??????3?&?|???^??[?dzy?[:af????
??"?H,?*d,???r???????????
f??	?h?oY????%??D&S?d2???R?o??:2???R	???<5? ???5?T{??b?)?A???%??????$?a???`?o???X?D
)?D<?>

???v?c~?G?I<?? ?Af?????gg?8?~g?0??????D?{??????B???d??FC?t?:?????"?V??????9????????
??s?n1??h???M?	?,'???r??u?8?~
?????>STY????C???aj??-\????????=t??\G?????QA'/?(??q?k??????f??|???8:dl`?Y?r?V?
?}?v
??i4y????w
?-
$B>.R?	%r?@b???p?X??@?)<?d\?xRE?n$??F`]????????<?/>???????a?"|("?M?E??c0?Ml(?*?:c???3n???dn~?k?tU`+??????I???K]??
?f??2|??7??5<<6????$?#?#?xR????q???0??CbU??????Qa7%?V??(r?p??
?????0w???{X6IP$??f(?5``?Ns????c'@l*????`
0f?D3?5?`???$9?G?')??M?#dr?r???@
?????B~N??????Lv<D2???B???n(????"n7;?FN????Nq9????????7N???????????????}_?nv???4???
?$??}?C???(&'??????q?k??r'??Et!?6???w?
?(j!?/
?K?aqj???????r???? ???X????LQX)??T????c?S??Wp ?
??7?M?D??!??D?T?????s???8?7y?k??'??K?8@|?v??6??t??7.????????C?
FQ&Q3Lzz??!-??&?Q?f?M
L?X?Z?
?kd??,????
??
D?
2x?q?8?r???wo??H??7??|????Ec?$?`(	????M??`?T?\?????j?B???'4MvK???????"{????q`?sY?M~?]?)?0?Q(????d*???I$?A??]N??;7-5???w???2?AQ???W?n(?NP?r>?w??????n???.?o6?~L?_n????J?M??D$U(c?????m??F???	#???c????x?"??
|I?"
b??
m???l?????? $S?`?65?
@:?C?l??&?
????y\{???5
?V?????z???}?6c?&}?\??X!k????t??1vv?8h??I*
r??Fg)h?P*c?????Dl?Yw/??g"R? ?
??j????B????%Y??3Q??3?" O?
?g;\?????h???f??~,{?o1?	?4???D??b????k??nS?c?13????d
????}P^?N??;??01??ig??Jp%???hv????K$@!??Tq?X????3??????y7????6?]?????f_?V at aV5S9U?????l!=Sy?c_H]d???:??'?j?????uI0W^?<??i?n'!4???????????`sh?????|V.0??;?/??'??)???/8x?E?Bah:q?Mw?????{?<?F8h`&{F?}?O?q???n????????
U?#dO?(?
??G?
nh0?
n???s???{?&	Hi??'?W??w?]?=???\#??
??x?Tx?m?b?\\?1???R??/<j??Gq
????6E???????
??RH??E@&g???$?d?J?	??xn<??!#???O??B?caENfRI?6???????z???!hdK?
?h?T??H?0?R?M??X??5?	??m!	I?KN?=??
z??k??Hj???Z??A?%??q@????8?9?d?r???yD(U1?"MU?	?<j?r??k?Z????J1?
?a?D??e?	????????z	?b????4"?Ii???'????0Gmn?@W??0?_?wR]O?????-?G?????c??R???=????g????????7A|nO?1?E??V??X?????8~-n??dG?^?g?H7YQ??9N??S??
ju?????c?a?
?Nt[I??I?!?d?W??1L~????P4?Actp?^????????xW????#?<z???????~iu?????jy~ay????]Y??D???No?O??????wW??Q%`;8?e?e????U?????w?_??_G??)????wa??"??????"?????O;D??A
?C???G(T?u?`?E	??RG?????Z2 
1????e?G?????A??#??-?2?e??[.??"o/l????F!??3Qe????i?
?Krq^Q;?}??"??<?@??b?p\P???^?>k*??'3X?????(??c??O???t1X????e@???t???k????r?|????c??Q?';?K1:Z??E	V?*?s????5:???@S??|^?;????J?xC	?????D???k?Z??:???*???)D?
YEE.???M
3]Q`??X3?????????d???:??ql??D??a(b???Pp?M=g???1???Si??T????????G?C-??????_Q\V??EYieE	??,?%?????`B??T!?c5?1?_Q???????]?Bg?vE???
????:n?#???????g?M0+???'h?M?<??zU?Vo?X??z?????B???l?Fe??L??f?'&??K2?
??b+???h????f?,??lDt<&9w?|?In?yi:i?h<????Q?~?C?:A???HhB??g??=0i???
?(?s?@@(??}*?E??l8??s????y??};?kH?6Z??
c???5?7
V,f???,??H?)t?{
:?	?v?
DQ???a????P#?????Kf"?	?G?,b??X?OQ??~?
????? Q@GHEgOxu#??B;??@??A7????ZQ??&rm$2?0??5??<?BzAT^?M??d????w?? D@\????@Q?M^?-l0?@?????RB?s ?SW?H:c38??g8???????b??HF??h?Ri??(?#???Am??A6?[hJF???	;?!
????L?`???0?
//???
???9>??X?&4?As8|??o>??8DER'/=?????H?j?`?B?[:?9???wC??jP?H???`?F?bi?H(uD????,??B????)d!????4?)?8???? ~?b??<K?R??p??:???"???'????gu??8??#????????`??o?????F????u?w??%??U?oh??????W?	?4,??v?:?=?|???Ub???S?CoNX?TD???a
?KK+???>?}J????
'?{????5???@;&p?v?????7e???zT?(???sN????8?E??????
g??7?k?T??H???U??>???
q,???cT?:???Gi?
?m?_??^QQR????3?r??lL?v(b??u???iUYi???W?W???;????FD???N???{?K?$j??A???7=K?",?4????
??{`w?r?m??;???????W?^?P?,?L????
?? ?
?"I?
?(
??]u?g?>??38?+nX/
?XI??????%v??k?????He?/$?:??????v?w???v?????@8?U:?<??C?a???x?????\?
??d_????3??Gm???????d?G???$^?o??#?|????s1[e?mF[?0K??nz???_YGh??#?bc??	>???"?W?o`?????2e`H\.?Kw7??????????2u??1?><0c?e???? )?d??~?WV?9??v????\F???R?\6???C?F?????y??S???T^?????(???????J???V?????????$????r!OM??????XXI?E?_T????'*
R{?I????@?gR????rjy'??>9//?w3?C?K??w
s??E???
?????g,[??????|??????2?????&q???
r
???*!R?O?%?K??f??hL?!???vTY??????????&L??b????U??$???D?P?J??/~?8??0????????l??xl
?????7???C?]?<?{[I5??b?4:????m4?h??
???"?(?l??n/??pj??*????A\N6	NG??rp???51?O??
^??bx?)?)???
?q.?N???_W???t?R???,%?
?????????:Kh??Xv??4???=??Z?7@?	5?J3??z?d????Q??<????V????t?i~?]????_????r?L*al?(???WYZQ???JK*Jv??)E=?n?
?k??0
v?6???`???63 i??K`?i
???l?];6v
?,BX???o?????[????HF???/D?D???Q????`????fw
du?27?9???? h9????Duux?;????;?{
????2[?+???? ???jD??7Wt?g%????D";~%<*?????<U?$?qG?x?&?
^e??[?)???T
?)j??"?,?@??????y?\???Fx?X&?fDc?8P?D??{?@ ?????GAJ7?G&(?jG??'????|?????+d[Z???$U?i?i:{???
?}?:b?5Elp?)??SB??`6U?Ii??)#???v/???b?J???rSSZ?l??2D???Z-?n???????LI????vNZ?x?????TS[???9??`???"?]???KM??????~??}??1?u??????g????????????*?u??N??u????~w?????r??5??!??}??????^=?5??/?7>?sK??`????|?4V9??yc???D{??1???PJ?x
?k5??t3?A???33?e?x???~?)T?{wZ??]????n?2?(?"?,M]o6??6dbt{
te??N#e??z?hu??????_x??/?<???di?:
8#?????????*?????7??
y???2?????exG?Iy/??"~?
??#?&?? W#????.?C?0??????}?GK?.zH%?,?????i??i??
H?f?1?H??5???\3???,3
?]???"??????
$?F02x??J??&?O? ?A??Tv?w?I?x?%?>??P??.?is?s??M
Q????X?
?$????k
?CPk?Z
w???J!?4??	?kF???@?6b8????M?c??-??yK?-`??)"!?L?(?R?"?
n'o??,yt8????T??????y?????-??=?AA?L??????3?>-????bh?2I-?.???LA???b`??*??
?u?1???2f?6???a5?9???1g?j?9????@*?1A????W?H:u??#B'V?&??.Q???
"??E^D??]??1?/?@?'qC????S\c?h"@>HW?$?\??:???y?`GG?	?k????????dh??$?u.e??!??? P??????QZ>?t&??bR?R"?@~bV???xo?8!???\}????,?2[?+4?R?A?j?'?0???A???Agq???#?$?l)??8_D??N??Q?M????s????????n??0%?N??K?bZ?
k??(?????\??=?M??????#	??z;? ????
??????t?q`g?????=?&G:???q????P8?D{???$??(?????|o@?a[??9c?7g???r.?v4?P???????[I-??L?????/?N[?B?+???
??<???R??J,?\1??S???
??~E??}?????????9?>???U????@X??Q?B?'=i?*??C??k?????????:??????~921??Z??%?????L???du???l???j???~?z;?sr1)????Pq?'??
?L6???
?
????=??Q??
)J;?i?Au#l?t??`X?uVJ?F(*???F
?
?$s??*{t?.95
?7??????q?
?,???,?b?q*S*??:]?????m??/??t?P??G	j ???6???J?\c??F???????
??????G??NM?????cgP?j??
}????Ta?????q???!'?B?R?_??e{??wL?????x???/*?*??	?0?[?"s?t????e4??
4???N?~(?;?l?x!vy"?m\Y???????S????,??
??R??Ba??*?Z?@\V<!??`S)??&
f?|R?????9?
&?x3???
??D?.?u?O?HUd
?q~?.?c??_=?~D??P??z
????R*???8?]Kf?p??	&?8?RG6?rG?s?1	m????~???i????~B!??{?	a8s??|?-????h??f??j???,zH<???0i??????7?Iy?{?g????D?I??
??P?d?n6????$q?0?????-???2??23Rj?YTS!
?	0$_?Y g?@2?A?2`{'??I?YT? ????????
???:?F??`!?Z?????Y????Y?o9?`/??|?DS????SvW???|q#<$??w??????S?AB????N???B???
A?N4P??<?	?d???E>,-?"???&?(????????f
)\(m?L?0~N??3N?<???K?V^J
???Ij?G??
?????X?K???SF?i0??#??????i=?h??>b?T?h??l?*??????r?YV?l???L?3?p?HZ?j?9dF?6j4?	???#??BE?????Jfl??P4
J??
??gqk7?????@???4?????M?M???C??e(4?/?????
R?1?;!??H?"???zX???????D?Dux2?X.b??pmq?[?V4???0??3Af?p?uBJ?glEL?*5????GvSG?MI?/aA??_N'Fz^???
?|??i?v?????j???p82i)aC?/?
???a?B?d?
???Y?q?RI??K]hS?J????#F?Uj??+%?A????%?*:,X8?????n?Id+?n?'q0??U?K??tB_?;??!&???/?????????q???
?-
m?8r5????es?,?Y?????l?c?`n
??H??P?b?v{?<
?U$^E??A?s1???I????9E5?;??<??????l? 
N?vp? :??,?/u]cU??%???"&L?jf???????
/$?*?rF#?.Pi_+??
??9Y!5v???\??z????=l?A?????J???H?v??d???dy?9???!_?Y?????H k51$?7?Tg,	s?H+?d?+????
N?????N$?Os????x?8??m???????qi
??DN?p?
??K???l?????????>r????[
{v??'$????4?*?)?Z?????1?[/??fw??)$?2Y?K?Pq$?I:xK???????L??]?ZTH?(4zC?B?????H%?&c?tl)4???V?_&&I???(|??ePF~?g??}(ptw??x????3q???p?"?;??2????I???E????:??slGjV??J,??????EdEpS%MDp?T???#0???ri?"?Hf?_B${)|"?y????	.??7??e???a??aP
b?????
ak?	+?>??u????
#?$
<??????E?6?;ST!?eF??'?0??
%?j???h:$?P???????g'?X?*??X?.????;+=???f
??>?-??$?D-,?,b?
P?$????XE???`??f?*??C"???)?E???m?Z????jK??/X? ?3??V{???(???Z?b,??R,2?V?Z??9kK
@??#S??t<?Z?z2-2e??????!??p?b???Y"I?*?
Y\nd?Rb?4??
)?h6(???S??tz?Jh??0R
???]*Y??u???L??2?????
/r*#?C8??u??I)?
?CD?O???(?<?J??!j&????
DK???????f?~???`b?+V?????5h?
?:W
'?I?
5+?Y1?<e?D???#3
:??????2???????
??B??2rU=v?VX?10Jq????)?`!:?'J???D\S@???q???8?D	?\#?\?kWOM?R!???????r?l8X~J????X?{R5????s??I???}??Pn?r5?l??
Y=????m?B???
{&???e?\??????X?W'_B??-(k?a?&??G%?-?RO??f	j???H%O?LE?@?????&7?cJ?;eT7????T?<???x?^?????-???=b????P?P??q?@??+?%??R*?t$?=??$T??????????0??=r.?	?&l?B???u
???&5 ??!?0d???CyU???8?z??OT?1T?T?M????D2??/?rI??????d???Dv???????????YN??h??0A'h??oDB?Tf??-???R at Q????D?:X?N4S???j-z?y-(T^????yp??}??^?t??E??????nx?Kd>lQ??0????W?#<EcE???lZHcF?,=?Lfi?tcU????Yy?5Z^?
?"???H?$Z????~)??v???q???'?S???Y??? ?????jO??,_L??"??w?l?9??W??z??pHU?q??<Qd???@?)vJd?3x^
x?za?d?????*???K3??5c%$??fb?N???????6??f8?*??-??EC??&8?????\D]??)?W?;??A=?0x?+?
???x9????69???	m??R*MW?B?;?3	2a?	?&Uf?^u???s%X???4fQ???O?A:??H
??"2?	?A????(c?#?1??Ti???z
1c?y??P?L?GE???#?	et?e????a,FbS?XLO??Nu???0???
?W+??p|a?&?~??x?1x?
)?l/3????'???<?FgmX???U?]???;t??????^;???9?M?????'
(10????JX?7??=?+.e??B!??K???@>d???8kE1?VZ??:nq
}??c??d@??{????_6?????R22J?
???\?Pp???c???Q?6QT?S+?P??2???Y?B]???QH??ND
V?	`U????P!??k??0??jc:*?lh?`'?I??I??9T?Zwh???,????\????X??A?xg?b??Y????????nT$:?.??DU???????c?i)?uU]7?9 ??i?
?}+?R?@?????a?%3?1????	n????$?Ml??&b5&?R???00Z???k8??S^?RhH???)vh?a?`?
B0???k?e?DnW???%????\(=B<_-[B???1?*?'?j?]39??[9!Y????
?A	5?(.?(j/3?v(?"??f
Yl?r65"J???)?u?=??1?+?k?~C??????t???)??J4`TX???cm?\A??Hw;?d
????Z????	?????????
?!?-T`??j
9(Qk?nbe?????y??`*??
/k5?5
	S?$???l(???Xg?l?
?| (I????`T?w??	?C?-,3?y??aGRL~??ZeO
q???X(P?5????|??c$??k?b??b??e<?????@y?i+?????1?u??N?1$ep%??wLWH?d?f??X???????X?}?s?
?gR?AL?s?
???-???H??xn?$??+??????@|&??p?????H
#f?0??F?t(E??k?4q2??X)?!A<?'
G?J?^?D&?I?e??o	? ?es?D?2El*????????x$???>c(? q????N
?c???,?????p?
?=??LH96
???$?A??F)
EV$?i,??\??=~????I?X??%????|pNLO??p)f?{?<?m??"C?M	??!?OX?A|
9
??f?:e???PL6?$?M?9????f??q?9?
$lTR at K???9???c?5?]>AA?dC?E???N??M:??G? O? ?e?9?&jp?8?????3??>??\^G?5s?????	?Q???KH?iqB??D?"b?%x?#Wr???Z?m|	2|F-?
?H??JH????@c	J???s??v?L;+?H?{?z??`i'???)???|
?@t???????vfa??W?????|L???QV?F?2'?????l???]???qn?S	.???].?	??f?	:/)?6???W?S"g?.p4??-\w??????:?$H???? %?Z????"????s?sn???f???????SY????6	???I??????8q??
E4`Cq?H?4g~=?? .??S??!o?? ???q???2?8	qY??>).O???????a?S?Z?y?1??O?????V?	lF??sj? ??fG?t?V??$????R1N??"?H	???.h???????)?L?)r?w???m?Y?|g`?]
??5Y?
3H?%eq????9?j??E???*m@<
???????a??U??pcn???P???B????c?cF]?q?/!???;??0????????q??,?$????`?sQC\0&??DS?????u??&fQ??6?3??_?(bLo???iD?E?1?????|q?????`.~??kuN??B?E?(?A??ZYk???l?Ps~?????|????q9?6t~?lm?3_$?E?v1?????????5??Vi?`<?`?h??L???S+]8F?x':??X??Y??9?M}?n$[????????????DE?????C?=f?$?Kd??AnK??????U?k??-m??e4*cC???]qd9+??
??uZ?w??X at m?w?4?l?;6
?J'\
ul/????Oa.z??
!?t??	?!]$???
K2???D???!??a??@?W(l~S	??%?e????Eh?|?cSm?BZ^???(??*???^??3??_???vD??????c??
?RVUQ???????xW??????????/??_4o?????VQ??S?S	F?`h<O1e^?%3^?0f?? z?	v3'?????)x?@
I6??E??E???????z??
????MA?Qln4'@????0?|?????,?????4??c?c??>Le??
?H8?Vx~>h??R+?Ff???h?33???f???D??&???e?????h??????????A0
K???EO???A&??(
?E????6?
?2?????A?????J???
-?~S
0?-?R??O?'?
??	m??1??????,D3??D??@v?&???6?GJc?v<????z????
?
$,????&,G???$????????P??J\??????&b??????o?'u??f\?c?f??~?d???y$?????L?0???M&+T?j??]?O??
?4S???????#J?nfFZT??h?4????K&B???-k??E#?^??84???"j???)H}?dI?h??!??v?]?fP:Oo?w
J?$!??q&*h+???:?aw????b????x??
?8
???B8#Q?U"5?AB???s?v??lr????????0J-??Q?oC??P???~
. ???????R???T????	|?:~qa
k?.??R|?i7??4??????
??5a!??8k??@????7?7????),4????v??ADh?y@?X??????m?hS7???2#6|?k?c]?Shi?4?*,GwD?-m?n?V???????a	?#	?AK?>?8??????a??????????????????T???????????,.?e?????\?????~?????
~???m??oG??~??o?Y?v?i?v=WYg????????k??o???C?8?????v}?Q?y0???bS?yjK??o?x?I??W???v???(]??<1?JT`?	e?iC6O??Z??(?$\??z?\??{????y???
yJ
??	???0~??????-???j??s???????
?
?m?Q?0?L*?j???H???L*h??"???pi??fe?X?rL???q?<LO??R????!??
??D)??"???
?p	3????`????WfMU?(??]st?	??
??? ?i???#*qkSq7??15?????????????????9D?E	#?+[K?
")???u??*w?uf>?O
?O:??q??Q??+' 9???_x at G???s???X?Rh'0?]???dn??O?I??O???0A?l'??????N?D1+u?????m???j?:?He??D??????x&?.?r?l[?R??.?s?Y???c????N??	{?l/?cQ-
???d?,?<???????=?y?9?a<R?*?P??R?&'@?P(??<?eD???d6&D?????}??r??d?F???e?P9??%?w\?oE?!q??7?6\3b?S??&??i?Jp?4"J0?Rh??????4???
8B?2[
h4i???^?S????#^??R-15'?rE??=??z?o??????5????eu?4Dg?????y~O,?R
iO?^7??J?K?-(???2?JaK?g"? 6D?)??L???Al?3SbX??UF?87?Uv?????!??l???te'???H	a?8y.???Td?9???!Z@?^?j?$??
??)
Kw8?3?*???+???P?f?9yA
??? ??Z?S`??H?1??)%???j?s?KI?[#??^
??d"5W?????{N?tqc* I^?????B?U????r9!??i????<?Z??????(A?G?????
~????b62c?q
???).-??????J?w???S?|??tO???F??)????wa	?

SS?y???~????M??R???????P4??+?|WT?N?*?'?x?=??<?nQ?#?5$????G????0?I?:??????????D(?2?q?W??f!???W??QD?Q???5??)[?YV?s?Hb??????????C???,Q??? ~_U????,).+.+??K?0?D?.Z???@{????????+?
"`?_yYU9???UT??????]?;??O??H???&???O??????vI{?k9?u???/???5?	AV?<???Y
0?0
??O)??%;??Zc??]m'??9x?
+?6?X?Q^?w6t?6???)?iL?
{????-T?X??R?:?Z????kN`?/~O?X?X?+P=p?S?T??o???t^H??_??????|????u]:o???	G???	???J<?
?l at UK?:@1mYW?9?1%?l??]?? 0?	%?*8h?P'n?P?l|p?hr'??/?BD????})??[	?v?K????K????H????c?9?{???!??z????????{
Ldn?
?,??V!??j?(????F??????d??M	vY?????@?F?Uv????U??_QYZ?K?????j?B?D?O?}????????W?X\J???]????w?????CZ?u?????t?Y!|??bO?????0??3<j??.?????|????????.]~?k?????y????^??C?z??????C??
????Ka3j:???sOkY??/?U7a?~G??????z??????;?=?l??_????C?w??w????????s????%?:?_W??????Ug}???[Z*?j{??????j?????>p`??z??{???Kl?]o???C+?_??5C0I????^????Gom????&M????X?M\??????]?~???-=???u????/????/?5????g?u???G?????6?b+/=?f????@????@?????}X
T???x???????????????H??/??
P?W??????i??~?U=F????m7]3wR???????{????]h?r?c/?s???~??8??????F?+.<??}??vV??????????????6?>??
?@`?;=??5?t????=?X?????^??S??s????????????????????'????>?o?%???????,S~????}??W=??k????y????o??????????s?=w??c?\???????~v?a'?????????????
?q?	K?]??#???a???'??e?_ox??}9????W?{e??uO?????GV^??k?c?8?)o]??????????????o?zo??q?L_4???A4??????????^=?i?????????m?\l|??K???Y?x???????W?~m?UE?g?]s?sG?m~??_}????kk/???#?8??e?k[}?#n?o?Y_????e????~?Mf_z???=???/{??Cm????????
????????????;?t???xw???G\w?f???2?????c???|?????N?v?A?O?
L?KC???x???W??f???7?Y????\3?????z????m?}?????m????=d?7N????k?h??d?||???/:?b???^???}O\??zi??????~?????/>????2?O??^z??YW=?????5??.????L~z???w???|????'????n??`??u???~G??w?n#7?x????^]=??=?N0?-?q???^y????G/??M??????_}?]/?;?;l?g?,X??Q??{?:?????;o?%g}???????????v??}?????%??????/?????????y??=?~?????
???w?}w?5??????Y+/?vt??????????W????=?????l?;o????6m?????y????r??c??????M??><?????????l4?q??nx?c??????7<u????_y???=n^?????7>}???+?3?T???#?x>????:????x?	K??	?????w???mT>?????g??j?Gj?`??y?~???

???????k??????vY?z???????4??W?????v??f???@B<????{????Ru?}????????.??..
???c'????y?5???{???/?;????3?? tC??>k??>}?o????????????
???bs?1????CL?,?M??o?|?????<0??=?o??k=?????@*?WrQ??-?>?V?6@???N;(???U?^????_t9{??O?$x?u?]???SVm"?*`-
??;???%S<?xw3[eR._?I^?j??'$??????F??o?\?P>H?8??j?Di?7???'??R?:??MLr)??jn???`??7?j??b???????L7?j]????????????A?????????vU???m????S?55!a???r??h?.?,?7q#??????????l?????a??.o??????{3Q9?G??7????|^{sc???k_?1??]??t$'?[??2.zM??f??s!?????6???R??u??F'L=sdD???E??Y??h_"???N?Q?????F???H????
ZU?????J?Wl?I?????7??????????????%?3???,09???Z?_`?M}|? ?oZ|y????b????????6????i??=w4???p???t_??}M"?
??}?s>_!??2H?|?l?aRL?z;??AUU???\??k???V?Xb???3jJD?????|????X?N????h??]???U?\??????&??_Sw??9U7+?????s????v?y?%?:1;???s{?TC'?_?".o????\??)	??Yj????????a??g8c?\??%??y{p]@v????V??F/?5?~?m?O?/E?BU?????&%????m??l??????+??+?3??'v??~yt??????:?sN?t?\??????J?????Y????8?D??7-7?t???
SUT????
?l|?????S??????Wk?lm???????8??????[c?6???x{??cy???",,?????S[??V?plZsKRr???G??{????????Hf?????"M??}???z???)>Z#=???????kY?Y???zS??h??A?????6???4??/????<4T???Lji????
?tf???3?e????f???r?t?????8????!??@n???q???U?i?X?kI(i\??}?9??r?????%'Nt?7o???E??%?B???????\v?????^`?s????????
9?q???#N??-,???
????=~\:n????6?]|??=#????			?[n?|????????????????;???
'?,???\?s?????g{??h?r???K?w???!??[??g&G??r?Te???}@E??.}?	~??@A?????Q?~?{?^S??t??mh?
?R-??j?WS??ko??y??+?#??????????=????9???>|?m???????>6?f????p?K????zg?>|u???3?n?????X???6}????j[???}k;?`9??h:???????????X?????jN^?????(?t ?? ?2F1?m????l???c???.?5?]???yJ?x?V{.P?W??b?????Lx????UQ?.?f????g???p?Y!?F????jO??|=51?7>?xx/&{??????JFg???
L???+?
%/.~`????2?bb????i1r??W????O?x??
???????$}??{y??If?K??o??n???55????w?x???
no_{n?1 p.-????)?????/79J??_?[?d??+?X?iik?W?
??9??+C???}??s????"??O
A3?^??w[??????Hw??,|???_?E????3M??????>?:!QJ&=?xv?V??$?40[N4???????????????y6W{<C4,???{?f =wV?jjjzW
H;o??T????]dx4??????1o????X}?3???ve???wM??x???k;?\?bW??a?F??????????u?Z??i??Z7?~!???g?x/?????????????????
/?9?&s_}?u?l??
?????d???h???js?????K??h4??I`kw?????????Ds?>;F.~?%???\?<???5????Q?ZZZ'i?F????
?e??o
Z|c???S%?9???????:qb???O?yw?toU g??~+EgP??!?KZ???|i}??kW??|?wd????1??)+_??o??i?4O?????PsH???8?l+lU?&??p??)?m;)4????R????W???6????1?[U?va?/)o?_?CU?????s??T???!?&?{s????;??????????5?o???I????????`:???sg?L(???2'
_?uH??t?kh??0?5J?xQ???/?O?o????u?G?^??7~_?}7???8{????LZ??j?*?N???O_?????Q??YP`?? ??????m?{<??JLH?F?>?b? ?><??
?nI?Z?????"??.??M?8{???	????q;?R[??h?????;?V8??????G
?????????g}???#G???\?r?mc??????????fJK??'?k???q???{??[??w??d????t5^?PoR??b`????~N????????%%E??????.7k???????o?;?qJ????|w_I??/k)F????????yx?uAb?????????}?????clI??$i?`Q"E????6?1n?z`?VU9?k??X3^??????Y.???\??~:?}???{k??]>\??
??}m??????????V???Y??
??:(8s??l?(????C??????6?/Y?1?P?4
??Mb?g???8?{??????s
??N????_\<>?N??d(???8o?>{???\????????,?z???HU??1-?Vb?$??o0???puO?????)??=??.5??i???:????*_???;)lMs?&u????Gz???R???o?????)???W|?^u???????8?;??9??2??d~?p7?cFhh??wzG6I??X?O??l"wV_^????????eqq#??&-?O?C?.????d??M?
??t?7?>?????w??VtJ?X8??|\z?YMI5?K???]??\???f_R????N???;?/^?M?k????^?$?????ZtD?H???#m!?c??_??6D?K|D?esIy??a?bb-?
rnu6??/
?????6??}??aJ?????`???U???v???????????????}??????R??8eO9?&??\????ag#??Tkq?<$][{?????}y?qK?5q???3\?L?\???y?x?w??????<?^?:??^???g@?J/9????/?d}???6??=S$??????4;???X?\yF?]?????u5?}??)?nN???R??????'K?5?'y\v,?Z?bU??*=?????????1??M??3^??*?@??? ?Ion<?gq?Lx?R?????R?????n??D????9C?F?wW3?x?|???|;??R?j?%??x?9?????????????V?65??rv?????B?c???????5???$?[O?|b??a??????E??2?r?,?]?????x??4e|<????????#qX{?82?_?d???E????xY?n?????xR?R???K???){?[?0??9?W?????-o6q?5?m???]$?'????*??]?l??y??O?/J?}2`?[?5??m???M?t??c??<3p?h????^????????v????.??s??x?)??.5n??????;???^?t??S??w|??u^????U[??????tI?[`???????U???6i?v/?;?u?72??O9??z????nN???_?3B??????S???o?^?qu???????sii$??r??j????S???6r?m??????}??k?r^???T?L??n2?@UC?#??lFc/3?????Z?9??z?{??7L??
(\?MVf?
?????S?]:???:???nBV??????,VH;???J|?1??{???;
?O????????8????=?UB??????S,c?L?J??c??k???e(????n?g3??K??{>??S???G"j?km~:,???C?@S??I????;????.d????e??_??\??????p??8??:v?c?????b?]?MV??V?n?W!?^?p?????g??7x?~???^???@??#??>?mOZ?h?Wm??????_????:%?6????????????N??%??}R??????6?W?b???dfe8k????V?P???????eqw,?k?~[?xj????7Y????~?x&??AL??^????E??g??HVdl????s??????}????V????o?g??%?>?G??$?????%,o?=^?f??c??O\?)??{?>?????9?.???"??K?T?Tu???u??????s???s??c??EI9?$????n,7???0????????zC?qn?F?XZ?p????R?Y???.?????sxJ???eC#B?+6?L??#???X?Z???????O8??t?n???O?M??7???h?\WN?? ?0??,?{???g^*\???p??E?%???^?[?Wb??????p??n??6?F??!??Y??????{?v??q^?????Q?j??]l8ypl?e??vS>?+?Ms?z??8?????_p"?*l/??~????S_??z? ?Z????['3^??o?(9"?3??V??
%?m&???|.????
'V??c?dF:7&?h?????[?P?P.?c???py1???{????dh??
??T~|??????\?m??4+?s?????Gc%?=??????{??cQ?????X0?t?,????G????w ?:r????UIC?????o2?j???W
???)6M?V?d?:?_p???iA????X????t?^??F???2I??B36+??1???? #K9=??????Iu?k8?>?\?T??k????E???'^S?>??????pzy???????8S??S?{?Q?????g??&/~24??<t?5
??eZRScs2?jnK?;??b??;?X??Uy?1??z?sx??????o??
?5?????]??v?L??h5#65i??4Z?????y???>`???q???)oM??d???)	YUSu)?@d?6d??f?p?-jFxL?????2?]?D???????g?4/?3???R?
Rz?[?O>c???
???=n?4*`?????cd?2?n?
N1O?u??p&Q5O?????+1?p????????:m?j???V[w)?52`??W???2????s?Q[*msW????S??y???1\??9?r{??t5K???}[-V??oY:]RkH}?W?=??????f{?X?????"l???e?{F?G??????l?|y???????)3?????r7??r??
?	?v??<Z'1_?L??nYI?S5Cz?5?????y??g?5M?;??H????oT?z{v^7?Xs&?:D???~????S????}>];???'4x?
?Y?-????g?%)YL???O??5??v????????M?b?yr?_,??W???}
?
?|w?m??u;x???????9?_???S?\?bow?????9????mp8?1?x?W??^*???
Od??}?Z_??w??????9??G?~??e?ukA??i?O6????|o??]H??3? ???j??K???y?@?????V???K?;?#????????$??w?H?n?Whi?9?d????z?;??u?)??U??en7???9??????????"?D??????e?M??$d??HiM??v??x?9?k??W?????????????:?m??????q?}???<?5??#9/?"v?????????f00?????????is4=h?t???R???&?{????????Dz?.7z???Og????*?cr????T+?'?????z%???????,??1?cK71l?P?l[+f??N]????Z?!)?J??;??_x%(cA??n?????C?>?O
??9?J??,?%G?I5?3AQ??h???~???w???^xY?(}?h?????7???h??3???\??G\????.>&?h?T.????U????9?*?s????????
?y??U?X??=?????f??$?l???~???7??j??5?9???_F~??;(? ?,_??GkN?V?hN?3?D????bK>
?4V??;=W?c?????&l?;?????J??plX?o??Kk#?????????*??-??
{????G8{P????,u?R??????[??x'+Kq???????v?K?k???%?_+??|????;?e??/???N?P??E???8?q?$???a)?za[3??)?^?bG???G?D?????2?????Yj??l?pt?R???f?9?n????????????L??<f????9A?+??9??SU?>(?!??????1/?V?7nz4|????s???k??8TS????sVZ??~'%?6???}&B?h[Z???O?v*i?
E?:?T|;?c????'+?g?????)??,??J???????xH??SE??W???_:?lK?????jz????7c/?M?)*?~???#???b?S???J?????v??oZ?8?????<???????????x???9j?|v?+???????n7???)Z?E??@?????????[???4??G???q??????1??+?E?6[z???pt?q?????|*??????????@q9????y?^????#?3e?=2?2???????b??????F&?xDs?????%%???=? ?P????5l???
?ZW?p??]???U? W??g??y?????3TB?Rb?eVX??v???
7>9??T??^g???^?????e|?9?Z??a??b?{?\?/???7??]>????3?????,4??????c?0??;G?Sw<g?&u,?~n?
??9H?L?ge?+o_????b???I79?UO$+iY???l?5??????!zww???R??C;c^\???X??f?R?[?[?3?r??Tf/57-?q?m?^?,?V?}???/??u?????N=???B????%?1?q??Q??"??'?]???=td????n????P	<c???3+17??????????znp9????L??g??v]??Q????/??? "-??cI??I
?1#<#Cd?ENu4~????????)?????W?_6?l??s{Rm???;uRz??uzn?H?x??????e?????????M?*v^?d???b??????|???H??
E?:j?????%==s??>???????\G?)???}??????'?y?LR?????=m?z??A?u?????F3?~Q?X?a?e)??:????EI???>??la???\?G????S?S??*{??(<??$at?@9J??<???5?o??zj|r???O?s2TJ2!Cvw?>?+"?w={C????w?M???1?J?B?q?K?q#?[
?????6])??1?j??e??????v??
S????$<SyX?LP~+?:?c?r~?????H??S?,???s5?=?????????????UA?B??w?F??j?????>???mMkB?v?????9?????
?.??=?z7?|?
?w???Z?o:???????;&Qfi:R?-W?)?hT???SK_?i??X?4?3???????vHK?X?v??????z?^?????b???O??	?<?U}hI?????AG??6??I???S????x*?????/?g?+??????zkQ3Iz??1???????1?0??+VL6n??|??Zhk?W???:ps??????%?PW??????2???????????5e????='???}??J??I?ch??/????????3O\>2????Y??4?i?a??]?*??8t????9;??c??
?E9va??+?;7?{?x??s??X
?{???????LT?&??p??c???^?Q3????\?????CMu?	?Sb?~{?0@??gi?q????=?P9??Sc??
??;7???m?o:.>??N???
r?,??Uy???#???O1?6?????X]???0j[????????#???r???????l???w[????^?p?1?????e?4?tK??s??{??????W?l*=[?@??aWp?T??t?|?????z???????4???,?M
????l?u????????,9hp?$zVEe???$#?l??-??]?
u??j?>????.?<}?g???????t/]Q?(??JQi??'J??n???????k??????k??????6<;F2?????y?o?R?GI?]?'N,l_???M?][??;{}w?t????;??Y?F????w?OuHU?2/?q??7V??n>E?n{?1l???7??cv???4??)VX????1?d?L?=?f??>&?[W??9?S?5Y??2?????#?`??????7s????????u
^/,??$?PR?g??k%??o[??`X?????'???6<?r?)??S???????{?vE????X?6??????v}??4?6ql?Y??B?;?95??e??j?OY_??L???????VF?:s?K??N?M\??=s?d?;????????y??????n??N???????fg?u???v???;T?W
?r?UM?ti??n#0^?R??Zq?v??!??r?[???]????{???k?]???P[9??V???:?.*??0??#Y???
\U?:}G?5:b%???=??T_[e???.5?
?*^%?H???x?????????bj?%??^?U???*???W???S??;??m?nY?Oci?????]?{????????L<MV???Yl?Z???:?:?y}??I??c?4K??X?K?&?~?v???Q?F?a?????@?????{?g?S??~??u?????*?\??~g???7V?NC?2
?
??x"???y????[???n???bx?r?a[X
^????ms\G4?y?|?@??????[h?T?^W,:}??5???Vy
$?cX/L??v??W?ny????5????Y????g2???j??O?N??2????m}B??o?sf`??4?c~???h??tBA???=&?w??? 9$???	???]?nh??0?,?lCFy??}W??R??>?2?g??Hj\??z???&??x??9????????u[?]???h?Q?|?S?????v??c$??X????p?S?????{{?>???f????e??gxL?6?r??]?_??????????t71s?]?uVY3??M????eRjS???????|?????r????
????????dl/rz?=???G??=?T?k??F?g?v?l?uo??YV??lz?Fk?}?K?S??u?\q?O?i???\?H??G

*H???3_?~r??????
#?NO?|??h?y`?o?????..?????%?\3?;?cAg???_?^???????c???
mq??GZ?z?t??A~???m?d?-????s?zy??q??D???w???.?iI??.H??X?C??L]???w?G?CVzf??????Om???;l????f)????????062??O{?????k???#??f??M-?#?*?>?$\.??????y?????}??N?????jS6?Jk????V??/Q?H?????<f?!?????????U????[?Z?T{'w^y?h?e?l???m????m}_}??1?"?>Z????&K}???u[???;%t?????>?{w?.\??/S??Xt????h?}???:~8~??!2WIRs?6??-?8?E??cluVc?????g??Wi+r??Hy?i??6?i??.';?M{?M??2.Q??6?|?Q??5^NzX[_?I8?Z?ltn??3??p????2??a????x?\u??gl???????
_G?qH??L???m???????w?????
?+?',><??{??V??z??#??,t?+
|?a?x??????r>F')P??]?\!??e?S,??d???)?????<???]???.6??r?o?O??Zw???X??dh?%???K?????V???~?????egW$f??
*'?kf??)??am?N??????Y???????A??awf?m	???z????????g?????????~?R?i?x?^???5u+??zzV?s
W???vm|?v????e?S
??;????bA??;C???V?#?j??iQ\???C?2sve?h1L?+????b?AS??2

?Q?
?;???{?O???????MW??*?~?|???k,???!??F?t?[?s??b@?=???????4?@&?H>??%?????5???;?rN??
??e????|???4~????r?c?=????|?N?=`?`???KGg?V???3????????????(?V4}JWd?h??hO?	?y??M?R??A???????9?6
??SP?????o???p??.????_?,?+	??m^E[?qhlV?5?????????9:?I1CO?t???F?Ce????b
??8?Sl}M???
T?]z?	Z?u?]?ex?wgR?&?M	?-D?a??????9?y?La???Am???+?"?=????0zKZ?p)t??:?I???N?g?6E?@b?*??6??????)?~?o>????L?@$`RC`??p:?E!?
?3???!????5?
5?N??)VB.8???????
??C
??
???WHj
X?l?G???A?x??N?`	????*??@?"??EB?????ZF"v????D?R	?w?  ? :K? ??}?Pq
?i?`?M???g`?h5?4 ?C?L]?????l??O???_??????X?n?/??h
j??
?%B?c>|?b?}??3- ?
??yxp	???jLa??
F?}?/N`????C:o?P???X'?/?[?8?l????`?hg~?065?)g{3{['gcg'??qb?(??2??U??]?R??"?? ??A?I??!)??????p?????rp?????????????5SSKg?????????????$d?h?\O7?t?4u)?z????u<(???g?O??_??&??4h3`"?m
??A?-???6w?
???\OK???X??M; ??U?Gep(,~???r?>x!?d|???_?B?ge2@]c?`SZB?G?????v?`:??3ah at Q?(?}?q?A???`??v?/?@??B??Bv??
?
 {?15_DrH?P0???bB?j ???C???????H??E?v????D?@A?\??K????h?L,?$???#"9?=`??/?I'????,?^:?F?`??=???	F?)???%?h4F~???C?G?`??i??3a_^?h,
?????????J4??!P?FgO?!#????F?1|t<`]"?-?????
l??????y
???C0?6?&l?}MQC?A&*???&0??&?1?	?????!??e?i@??yl?4}?
)q??#???7?t?
X?V??8|?
?c?(?i???tD$p$%me|?]??{??rE??
??[??#?a?=?k>F@??`+?@??
W)??@_R?^
``?!?q??*??t?%/??Z k?????A??a????v??SpFd$7z?.x"]T??????@?v
?"?T~?#
&?B?=???`? ??????_)?8K???`hv?
?W?PL	'/???>??jh?}pC?0?1t`Q??

KqG8jS!??b??IE????10?'9?#?[?P
?
?"?q-?E??????j?#??????%??;t???YJD?R???(??t??]f???3?=?F?1|F????
?n???^?????????N0??.~PB<Dh???!\??B?_(??X??p*??=???a(?UB?????+?3LPD???????%??+??P???B
??.?s?J-E
g??bu	???C?*?n	??F??`?
??G?.?(<a_??I??????`*?H?VB
`?
t%?8~?????????	`???wq2W?8?;8??????U?SfVN??V&.?4??:???,,`?NlY?u??{?OA`V0????Y?r/??r?4>BU|(t?".l@?pJ?58a???h
2??0??xD???t[?
4l????G??hl2d???(J?t<?
??KY?x???U&?:???I???cq(d???G??2?]?
?3"?
???9!?$?|?]1-%?pp?,?@`e?)??4(?0	C?????6&?0	LH]??[U?I??`??????s0&??????#?U??c??T2?????[???
C??'L???R0???TE7???e?P-B?!??a???
?GD6L?^(??L?A?L?1?^dy?nlNP7?
???C ???]&z???HG?,?<????P>v???P?%?????)P???
?4?f??$?s?????\]?$
?YX3???^
OByo?TV
,?n?as?j`??J??a#?*???3xp?L??H??M?_?H?W??C2
[87????
'??q?HS?"???.?H?L?1?S
ahiy?V?IH???\?r	?
???'?.???a?@[??H'{???i
g???
???[?????J~?/EW??y&??q?	a?b	'$7?????#?x?&*dq??X
<??w%LQ?>}&???????1%f p??m??????N???41?@GKE??>|?6? L@)QB'???.)3?jT,??r????>7?n???`1s(??F????|
??c?0XD2!_%{?~'V??dc?????0?m?m?H'????QLx??????I,???s&J??????????*?]q?g:??@AR<?????@$7??c??N1F7" ?g6
jQ?@?]?\?n#?P?
?????e????Dw'p'?jw??O$?l7?U??T???????6
??!?????=??????#V??"o
???=?~??.?%???|AO??&j5P
'?8??9U?%??????@@0?x?ty
`???BY
?C?	\?	???U???KZ??d????N???(c???*?? Xn??6)6??G~!?"???#
K8?k-]??\=??
?2tI?]?6??*?????`?Q?? |Q?Hy?,Q??[?\&v???arD?U??:9??
??u?????5?u???CKS????????hfo???`??<??
??????lnKQTW?@`?V??h???@?_???@$.r?H\?@d?^???kCsaH\???8~a?%ze????e???V???o?K?3????\?qm???F?
T?wNs?|???/??'???*6?s???^N
?
?A?g??W_?>,Z ???%#d???p@???g?~??cAVaL.???]?q?xBO?s
??#H??D?w??'????a?4???????k?=?
2.D????K??d??B?L-?z?m???????+??OG
?3??[????L??^?=,???????w_Y?R?????N?W?????
xeQ?~?k
???]?'2Wa>9????_b??d`?tT?X???1?i?x?*sjC???H?<Z?.????%:j?+??XV4L9Xd`?S:v?G?????-???? ?y^?$???>P%x)???y?L??cD?	G??>
~lV ?R??i??}4??@???1m???Q??(????C??4??5?0_??C?U????)w??xu?`?PE`??"Ku
.????????R?Q?I???+?@g????	??wS6?>?9`??@(!
?C?0???8?!)G$?
?&q
K??.?i?????!???KYA-?@6????o?N?M
??,	Q?M'??g??
??	???#??)"?5???qo;???w??8????|??F?b?O???t???J?@?
?^ ?6\4P,?$?7L???e{]??
X?????B
v????2Jn?K? ??j??W`6^L/AL?H?RE?1?q??0?(p?????f????k?*????o?o?**??
?b??
??f+4?z?	7?E?Tu|??e@@?;??*9R?^N@Q?????0_????w?p
?Y?HI?'?}??GP??O?"?8?*?4??
k(g?2G?9r
2?GMh?b?V$Y^cI- at e???V}??????7?? ??_?nD0???+?`O???{~?
PS??p1.X
J???	`?LT??/w????r
&7?#.??za???WL???E???$?????4
l?D
??P?T??]X$??yGn?A??|?
)????V)j]?f
???f?????`?BBO?B??z?/	B7?J?`t?M??L?z-?'
???F6??@W?
?????N???CHX???hc?!??+??>j?@?
,[?&???5Y?:????O?Fjj?m???J??]??w?{`CX?e???^	?("?
?<?;
5???ae???8???V?L:?_?j??
 &?<|???????k??A??A???N?
???Wp????\??2??5hTxgB??
]b??NQ<b?<?E??????V?????"?,SP"??W
?@?rz0J???h????1X???D???G?+r@?H/Dg@??X
?J?????????\w#?!1{?V?Kg??U???.(???????W?5u_?{??/
Kq????!
A??rZ?*!?
?	????Kv??!\??O????h?
;???Yp??????1??
???+?,??a-+ ?? ??8???"`=8???T$%?????yQ??
?b9?vv??`%??T?g??d q??'*a?????K>?_?ZU?Y????x?
???????Z???	O
;#???i???h??p??Z$<?n_?????????(?s?L?[?????
??RF&#???? t?_?{	#???~???i??C???;?s?(	?y
??5e?X?Q?9,??
h?E?VIB??I?C'-0????4?)??*4v{??b`X???EX??v???Z!???H6?$?+xII{Hp?_?????&?Z????p???.? F6????k"C`???Lk]^?}YxQ	^?R?zd??z?=?
?O??8?@?'???@?n.VWU???D????v?]"&?
,s?`}o{V???FO??$??????.?"????F?5?1?^Upy?T?_???j1BI??{"i??7
+?	3_??B5???????1HI????
??+(??2?|?ef?eo??9??X?T@?(8??a!P????z???pWt?a?d1?Cd?u???P?
???l???D6???8Xf????????m??
`?/?1??+??#T
?
????"h??
?MG??Da ??p?????A???Ax\??}?X6??	?T?3@??'??
?G3P??.PP???
&/?6???.9A??a??_
??%??K?)!?{
O???otr1??/?BW?]X???`?<????E??G??GGL????.?$Q???	?@??????[??d\??/?@??p\y?+?d4??h

?(?kKTk???g}???1?bQZ?????8?[??P????????F0k?T?????9??.Cd???i]???>E?????B?? HJ)?S??#??????9]?c??T????E?????(????@?+?wM?????~8?V???4?F?_5????3?F?E7)?)???c??lX?\oU?%?}?U??
??L>??0?WQ??P]e?tu=umU?\???ypp??5?u?????D9?p??j?1???}D??????&o?(?)`p????%K???p????????x??#??H???@?????r??'?$??@??ap??????\U?xm?*???-??P????
?j???(p?)	P???9?$???G?1U??V??????Q?En?????.r?H??%ep??JB?	f??'?C?7?
?FC?{j????`u?HW????b??v
????[?[XQ??Ow??{V?Q?
??E?
;Kt??"V?]??3????rlUP|n[???d??]?Py:O?S?$L*?P?X??p?p?=????,?p*??2X"???Ez
/Y???ux??,P?? u?
?A??Xm??e??u????%??@????PBs
v????@?
???2?^$?.?%?8?>?y??V??N?"@??C?I?????b?!0s?
?(r?6:???????D????0\??k?N?@??Z?]????????3XuAK]`"????x?_?.+\)????+??
??v?\?????R??>?tvt???C?G`???=??C=j@?8vW??l??&`,?r?I?u?#??=.?%?@?N1?YT?}?????&
???H??^<??;?i??m?e-At??#?v"?q????F"?~???nQz(???vE?????ox9??i+????1??i????????????P?ddtA?lc?8!cl?I??'?WI*???*=U%????????s??$0&?iz??Tu?????????[{[{?[O??s[??O6??o??)??	????[??}??]U?m??????X???n.?Z%???)???WkX?L???f???$??*d[?????s!(???r???i?? C?????	?!????C#??}-\6*kE?8???????K?]?a`??????\??
?qW?(I?Vj??$26?C?@?K?[????nn?=~U???TX at b[{??w??I?????_??R?G????s??PM?9"?P?o?N*??_???.?
??9??
?A?>??P??cE?eJ??)????e5UX??[???d????J?^?0w?????B?.?C?c??c.?????zO?
?e0?>d??????\??a?:E??2??3o?#$GBX??TUS????;??ZR??????5???##???d}??R??@??Jj?5????ui at 4??|?%T??-U?)??H?[9Mq?(??a??[V??7
?
??e??f??S????Iw???5P???a?P@?i?Q
:??}Y???!@T???r=J ?LvQ?<(??????#?
Q???0????|?a7`
o?UL???????T~?%b5??ES??It?H??c|??D#?Ie???9m??=????;
$0??E?U???T]???n?????~??^????4?{???????P;???????????I??
=?a?
^/???y?!/??
p???*?h?????Z??????gE?_???D?_?P??n;8.X
a?o
?m??KmE`?B{?h???1OM??vEO[????~?$?T??qC??
h?}?????B??D9??????1*?9u?r?~?9???	h??Vl?8<Z??lJ??	?B???"A????7??
*&J?b????}vy????T/?MC?ui?3????l?R?Yr?_ke???r,??4S7???W
?
=?;&?]??#??US
?Rm
??b???`???5x?^???V<{???J?a?+??????;(????I????Y?iSsl{?	c?e?????s8???$?~?O4Z?]k+Q??8?????*R?	\yl???d?s>???*???RO??n?<????????h?l?0?gFs????B??y#/????~)?????`|Q??M???9??GiF?3=??????{R???*???????<-f[??_??n??D?,?4?3@?^z?P$?R?L?i????p?v??x8?Q????,??Q??????????{?$?GF???????<y?Qk?<??GT?w}???.?O?|?_M???k??I???z?????O5??????"???dy?I%??????*MT??)?Yl??Qo
???d??F?t???U?c+9
Ju?KN?"?5?;-?x"?(???F#??)4appi?:?\????????/????-?C???????p??,? ?Y???n"??X??D???>?????A?? -?6?-A8yAO%?I?????Y??8Hi)?n??I?)DW?.??????O.??g??{??#??s4h?a???<???????(??meQ??j~?&?T?8F?
H??A???<UOr???
#?q????????!
?L-0?????L	??4?Z?rG?B@;H?????E)??W
???????]-EDN,?f Jz?T?8S?P?
E???????"a'l????????U2????n.??pXi??????z???(?}Ej?
??A?#%vpC?@'???E.?? P*??2?	??4?[?$B?]
?wF?f??????8(?V.cF???+?s?}??p?Ku??{BuuE?,????&&O?F?}?dwK????G??1?r?Y8H??"M??^)zYDs??wl?>1^??K?Z- S????A??X????k??4
o???>???????@?o????????????o?$)~+r$3:?f??P??9?Fc???S?z?5??t
?
?2/???8
Z????MI??????;?9?4??k?i?%???/$??????
?{??2?
]B????
??tY??o0?$QQ????>16$y!k#? ??0??b??n?+\?JC}?H???%???J????1?
?%?nU???'+^?a?T?+??-?`a?~j???_?Gq??+,"b???Mp??IH??7????E?????S7f?????d)??9??YnVu?;q???????[???????	??????1?K?]???+V?<?>?I)??
S???E^?n?f?7?
?????S;?yheG??@?d???Og'W??????Z????m?????I?9fe??VK?k?)?????????&???????
?z+;?Q|??~????u|?w????????e?)*`???	??:??:`???1???,
 ?????+w?k???UN?G????|?d?,?
'E??0z at v?	?w??73oR3?????q???u??eE??	??sFV,S.????P
D'*???<6?>`o???6?=r???7??R?????????bV?Rv(?C%???Qv,?k\?$6?Q??_?cT??j??4?(?3??1?????W+?9i?A{T??
	
?4?? jQ???|*??????dV????zZ
k???t?~??6?	???2??sx|?g??/Z????pkT???}??w?Z?}?E?(Q??6e3D??)^?W???P???#I?v??
?6?????
????r.EbK?????h/}JRD??i?w????7?^?N???o#??	bu
Y?x8?S-*=g?qaI?0??#i??6????T?9G	b\287?Dy?RS?	??:s?????@???b?????<???TU?<G?E??bu63	N???[????.stX)??i???3tM??	V?????0R?!g'?'??f\?3?\???
b";?o??;??3Y?d?AH?\?v???-:??hBWi?
????3L??????b#?????????	?????????M???7U??g??????H?????t?m?)0
B?M?m&?)8?T	???C??rhaZN?\???>S??vG>?&LP(??av&????2?????@@pg?LKup->??????7???>+???;Q??a?a?????Wi???F??X????q??
???g?
????4?h?T?'?2NI?Z???W
^?9?q???)*?pI??+??????
?9??+???J?"'??b?????????^6???=?Z??6?&! S?
o$?e
??)?????-??T?:\?k???@'${J#$Y????&R?V_I&y??j*?
J9`??????
|?v?>J???S???>'?v??5?????)Tc????RI?6?a??q#?o??????n?G???j$ ?.Y???"?O7???\? ?_?VBp?u$???v?0k?U?:?sn??????^??n???q??v??}??????????>
?CbZ?D?
?{b?d???@(Y?????
??b???(???Y.????f?`????z???+>f~??x>k at ez??u?
am??????????=????????????[??e???????????????C??[???k??\?3???E?
???x?F????6????%??a?????e@~xk	??`q6!??w%MP}5??,?:????x????}?$?]????X8a?H
9?@??
?T???????'
????4#O??o_V?d?Bi?>?4?n???MuvABMe4@|??H???A?K??w
4?$$z??l??H7?p???yV?|?????(bn?????n?}?^?oJ^W_???
?_B?7u?!?)?L?A????)??????i'???>?$?`50?a??
??????isU?c?????R]??'/n?:??Yt?W{l`a]J???0?{?Y[??~??Zt?i?Z??0?.??c?H?????F?????*]????&}/(\-????????oh6/-?2s??a?????#?j
?<??+Z??V??????????a?S}?@???A???EH
?b?3`>ha???rh???>??????5_??@?>??;?I?/?y!Cy?
q?????h1V?~(<?:_7?	?C?'?K21?6FT5?_?XwK???i!?B???&[?za8??x?{?eAX??4BS:???????Pz??\1{o??WH#??X
s3??P???E?o???8_??u-?p??
 ??!??:???5??5?&?'}???$S`.?:?N??lt????u??Z#?-w????HJ
?,x????5tu,????E!'t???)?A<???0??F!??8IkF?A1h?????a?s????????M?-?Z*??s?A?{X~
_??q??sZ.
Q1?=?????k?z?\I~2J?$?<??4?^P?z?j!??????~???G?
,+Bl~?ZN??6??s)??/y??|%?Y	?t??x????#WSE6??H?T??f??U5#??a?????~?3???z?^???W?????N???n????????l??o?y???????2~d6?L?"???B%uN????
yZ???(u*?SR(???~@^XT?????{??b@???-u??

??2??I???b?x?>m??B?GW??????k??D"@j???Z?v-??v????-?ImH?\?T
Ym?}y??k??;3???5?Dy???????mn?6???m??l{g??}wv??a?n?w?????o?^0:<?-3w????x?B????g????g????????O5?j
?~^t?[??{??;?????mt?\*E???1??j?Gz<?N(I?????Y
??M???f?{0u4lA?!?f@???????1??e6???B,
;???????7???v?:T????"??????????ion?????????z??N???W???????>?j(???J????\=?}???E?oHw??n"
??????n?Z`??_$?
????6?K5?p%?a)3??Q/?
jYh??&???-TM?8/6?ap at b?8ay#????'?? !g??"7???;??????u ??R?U?$8|u?L??H,?g?R
?]x?v,??P????po0????F??0??d???????1E?5?B0?3b?M4?b????mTL?/?D?P?P?2?q?!?[?u?}Fa^6v??0Wy??D?`$U?j??j?&?0?`C^??X???hE?
lEm?]?E?"????~bMJ???????}0m?l???2?=????M??>?Pb8*????\':=???????):YO7
???*?/????s??[3e?^nt9]^,B\\??6w?HB?$??i?????CJ:?[??a5?>?y?p????6v U#?????G?^?T7???[?q<?????k??FsS??z?]0?Peg??p??bq9KI.????.&T?g]z?+?i,I?v??????I?{???l?tt?cT?=B?jGXb?5?~E8?M?/?????N?"?T???????3F?
?.??????XS??q?N?=??)??qB.$???;1	??.?z?M?=???hV*e?S<?.???
?;?????82??OAN????~~N???I??k????;(????"~E??B&?-?h?_^k?D4??GbB9?[??u????w??{????n?w%?*uC5<qs?y?u?[?M??A????a?s?u???$????XD??o?E?(????:?K
?)???Q??)$?s`P?	(???
?????)???mA
?d%FV??
nv9?i?.?u???EH	???`bI??B?????-C?.?o:?@(???~?<pV??L????u?
?2??l)~??<e???u???\??v$????i?#?4]TAk?~,S3A???T?6[.?/???????;?	(?I?????????>??z*X???/y???s?u?5,=???????Kk5?k{?f-?95~??.Z?k??y??5?P??
?R?&????]41??DW???$i?D??(??	?. at S???Iw2ca?.??{??pL,???T?L$???*?'??=?%?H??TY?,??=?\T-???^RK????+0??
R????LC?0?<?]?X?7???????????]??}?:?ry?=??@X8?JP?M?Z@,,0???s->ZJ62Y?]J?????*?3????`?????'vk????
?X???z?? $xb?1?9K??1?^?a?MP1??G??!?d?_??????
|?F???
??-u??@?3:?@????a??p$??? Xf??YUq????4??=TG,M-WW?[???m??p??F?N63?%k?J(c?u!W?z?a??????5??-\?bh??y??Pj?Q|????%??. n?8?A&VR4???1B?I0??/?XD?:????y1?4? X??r[P?!#?}???J?[???v??*?????<?s@;/????
??e?_Xtv?t1?.{%Q??EC?%????????
??N
W???V?
"h?xO??"??r+??e6ZI???
?U,u/?|m??x?P?????????x?
???????iW?d?
?I?J?
?X???AqQ????88D$???mP???\?eq?X?7??v?~\???c3Fkeq<4?2J?	??Wt?w
62:?J?C
????KuU???6????H=?\????(??w???g=??B)ur7 at zM???&?u?$??????r?P??~':J???"?(?PqH*?B	??`???1X?????\?BSn???e?h??{?V?_X?oh???9?
d??IJ?c!??{?v-?,??G???lL%
8?$n??)6.?`Ve???;?"??EuR???!???2D?'=?i????R%|=????.<????$??
?{??????V???
\:???X5,<,66???f???Rr????u??0?hM?r????S???Z6?*?b
?D?{???p??????	?C	
R?n?4??b???u?|??????????O&/?????Ig
?J?"
	E?[?????Yd??P?7Mz
?%?F???0qad?%3?3????s?=????
^??_:???*?????%h?s@?????p??L2????x<????)	??Y??
c?4??[?86?Z??Lz.??<???%???N??[25????[qO,???0
G?2s3??a???$???
?XI??????,??u?}T"DJ%??!???1(?C|?8gx,??VM
??&`\???? ????Gv??n????????/??$????W^???i4??}4???}????o?{%5O???@~???[????a????5??5??yx?????_%????J?5?Jl???*m??;Uz??????F??i??/&?(??lgo(Bk`r?4U??8?>??ST???1??NS=??r?????zaRSO'????1?G?A??#??`?}??????? ???
x
?I?
?(o|m??????4(XH?z???Bm?>?-?X?????o5??{8?
???????S9??lA?m??
???????*?R27??h`
m???_?@?qS1??/????0=?P?B?u???H_/?pk?Uw@??l;Yx?????r
?Qf?h??N????????????T5????\^??{????]a??6?????f?P?m%?'? S??0?g?????{?i3))?%????Rks
??????h?Z?oNW&??]$?????bb5T?Y???j???uv?8??/?
r?5A?????@???dY?G????q|??|??Y}H2@??4???a?]Ktyi?%?>??|?9A?G?(n	$?Z?T?R??
#?F?]|GI??;??O??????Z??q3r?????CO?|W^?????^???`4-{8????LFcc<8????h~?????$?J5??o??w?
?G?z?*??????????~A????[????,?d???I???4@yoz???N??G#????~z??????cC@^@^???S???e[:???R?
?
?????fu9?qp??A?c??y???Q6,vC[?ym???L?????K??????I?:??u^ar
??9l?4??????R2???
?T?	=?uaG?gD??c???5????!v.??
??????Hz?X??!'~
???Q~rV??CCu,??o?:Sw?b/
??+?T?WW?m??W???!(??2L_?h???,??*?9??63w??>??

?d4??+s`n?b?qR/??/??e?b??d???????
?Jk#?Sj?$w8|??cM???6?^?M??,??Z???
-r?????{N?O?X7 ?z?????c!?O?3????"1 ???0??
?8PH&y?????[?.??*Pl?Z?1??Y?V@#`?LrXt??rK$xc?+qQ3??(????n?
???V?"?uN%l???yf
???G1d?zA
8?6?/???sx????8wyB?-y?
?N?Pm???!??%?sI<N?TL??s?!?????????i?d"????0E????P????????X??ZTf???6??????????Ct?????)?'??:???j??N5F
?P'?A??y:
???a?X????????C??u??Y???w?t?????c?????q????? ??C?=5BL\?I????oJ??G???-?P????![?Pni
?
?7?J??~
?
???-hB?J????6????hhyC???n4????H
????c?(??K?El?)??O?????????Bo(??Wb:??r"??*??<I?-c?1D?c?C6???v????
3?)??YS-??Z?h??z,D?'o??^-??????#????U?Q?^1?~???j_??\-?B??(\k????:5	??$m?n4?~@<uA??NL?^?@Qf?o??4?C??vS!&????Y?t?[???5/`?Qi??j???2???8X;??m?7g%?*~?I;BQ??
`=&,??.|??????Y?Ee??j??c?????	L?
??? ?XS?C?5???i????/T?/
???WN???<c?:???8?6U?_?????t??e?eY?wY?w????wt??3?SQ??!`_?g?????'??????jo??f{o{ww????
???K@??5?T`J2?&?*?xx?}?2?W?W??w??????A??K?N?n?D??q?t????c???!?*
U`??iY??/7?\?@2?Rd
????????4H%?D???jhW?????????????nV
?
?'??~{Eroi?k?(?fz?y??jn??/??Ju?,??"???3?????bue???G?mmL??'oN?Vo?\?/9?G??????d?&?O???gJR? '??$m=?x??????P\jonono??????????7o??R??_.?????E?fy?>????;?<??????#}P?G?-?=?/*??bi?"?[v7?? ?QZ??????^}????k?@??v?J:D????9A>?u??s$?
vcB?T*?v????kV?thH8???a?
??{	???{?m???vv?l??l???????????'?9.7wH=@?~?U???z???{r??z}?W4???????_?q|??iu{?Q?????
?????~????f?^??????
??fs?[?k^?h?????y?????`wr?z?zy????K?r??;?qi????r?f???q????L?p??zE?i??????^?????3?p????UH????
????_????x??{?T0N?????W

!??^??]|????w???a\??????R?K???O%[x????o?|?{?????Zi?o|W_?c????h7??????zE???u_?1?????????M??6}V??7=?????
??????K?~d??4?G?<?????????&?
?p?{1??~????V????W???+
??Fxe ?+=?j????l??'?KY????*mz&?i|?M??a2??_?x?=\????????|??????????=?
???9??d8D ?f?y?P?|o:???g?.)z/?????????J:t?????????>e?_j?>H??????;?[?n?G[??????)ph???????,]????????
:?f*bF??vO??????S@?????????&H??b?
????o????]P$x??;zc?Is?????????3y??=z?f????%
@w?qU3???[F??~y????????I????>?>+?I??-i???=|?????|
?	?????pI&????rUg????[?	};H6
]?v????????B?*????b??%??]??????????D????5?{O???_?????????0??<?ok? ?m?-??????????X??wJ????J?/???S?@??
??????????Z??G??????sN?~jvp???+???l=l??^?L?[+?!k={?k?i?J+ZZ??>e?????z??????~?S??Y??=???
@_?:?=B3??vR'???N5^(?fwXF??K?1q??|#?1;~?\=?W??4h???z_?G?t?\?)Lr
a?V?4??|>?U?i??"b&?K?X?	?
?????X'?>!???????(?"?_?????????????????????_
?c??[??7?-????"]?k???c??go+?????????1??K??9?y???WH?\8?r??Wl?)G?x?~?Vz????j?3???	??????h????p?ww?????????{?;z6+(y?????C?????q???W??}?=?;y???yy????_???%rR]???7?0c????5?????Z?2???{????`??>?????????/???SZ???P????
??
?5
commons-dbcp-1.2.1-TestConnectionPool.patch:
 TestConnectionPool.java | 1006 ++++++++++++++++++++++++------------------------
 1 files changed, 516 insertions(+), 490 deletions(-)

--- NEW FILE commons-dbcp-1.2.1-TestConnectionPool.patch ---
--- src/test/org/apache/commons/dbcp/TestConnectionPool.java.sav	2006-04-12 16:04:03.000000000 +0200
+++ src/test/org/apache/commons/dbcp/TestConnectionPool.java	2006-04-12 16:08:30.000000000 +0200
@@ -1,490 +1,516 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.dbcp;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import junit.framework.TestCase;
-
-// XXX FIX ME XXX
-// this class still needs some cleanup, but at least
-// this consolidates most of the relevant test code
-// in a fairly re-usable fashion
-// XXX FIX ME XXX
-
-/**
- * Base test suite for DBCP pools.
- * 
- * @author Rodney Waldhoff
- * @author Sean C. Sullivan
- * @author John McNally
- * @author Dirk Verbeeck
- * @version $Revision: 1.14 $ $Date: 2004/02/28 12:18:18 $
- */
-public abstract class TestConnectionPool extends TestCase {
-    public TestConnectionPool(String testName) {
-        super(testName);
-    }
-
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    protected abstract Connection getConnection() throws Exception;
-    
-    protected int getMaxActive() {
-        return 10;
-    }
-    
-    protected long getMaxWait() {
-        return 100L;
-    }
-
-    // ----------- Utility Methods --------------------------------- 
-
-    protected String getUsername(Connection conn) throws SQLException {
-        Statement stmt = conn.createStatement();
-        ResultSet rs = stmt.executeQuery("select username");
-        if (rs.next()) {
-            return rs.getString(1);
-        }
-        return null;
-    }
-
-    // ----------- tests --------------------------------- 
-
-    public void testClearWarnings() throws Exception {
-        Connection[] c = new Connection[getMaxActive()];
-        for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
-            assertTrue(c[i] != null);
-            
-            // generate SQLWarning on connection
-            c[i].prepareCall("warning");
-        }
-
-        for (int i = 0; i < c.length; i++) {
-            assertNotNull(c[i].getWarnings());
-        }
-
-        for (int i = 0; i < c.length; i++) {
-            c[i].close();
-        }
-        
-        for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
-        }        
-
-        for (int i = 0; i < c.length; i++) {
-            // warnings should have been cleared by putting the connection back in the pool
-            assertNull(c[i].getWarnings());
-        }
-
-        for (int i = 0; i < c.length; i++) {
-            c[i].close();
-        }
-    }
-
-    public void testIsClosed() throws Exception {
-        for(int i=0;i<getMaxActive();i++) {
-            Connection conn = getConnection();
-            assertTrue(null != conn);
-            assertTrue(!conn.isClosed());
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-            conn.close();
-            assertTrue(conn.isClosed());
-        }
-    }
-
-    public void testCantCloseConnectionTwice() throws Exception {
-        for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
-            Connection conn = getConnection();
-            assertTrue(null != conn);
-            assertTrue(!conn.isClosed());
-            conn.close();
-            assertTrue(conn.isClosed());
-            try {
-                conn.close();
-                fail("Expected SQLException on second attempt to close (" + conn.getClass().getName() + ")");
-            } catch(SQLException e) {
-                // expected
-            }
-            assertTrue(conn.isClosed());
-        }
-    }
-
-    public void testCantCloseStatementTwice() throws Exception {
-        Connection conn = getConnection();
-        assertTrue(null != conn);
-        assertTrue(!conn.isClosed());
-        for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            stmt.close();
-            try {
-                stmt.close();
-                fail("Expected SQLException on second attempt to close (" + stmt.getClass().getName() + ")");
-            } catch(SQLException e) {
-                // expected
-            }
-        }
-        conn.close();
-    }
-
-    public void testSimple() throws Exception {
-        Connection conn = getConnection();
-        assertTrue(null != conn);
-        PreparedStatement stmt = conn.prepareStatement("select * from dual");
-        assertTrue(null != stmt);
-        ResultSet rset = stmt.executeQuery();
-        assertTrue(null != rset);
-        assertTrue(rset.next());
-        rset.close();
-        stmt.close();
-        conn.close();
-    }
-
-    public void testRepeatedBorrowAndReturn() throws Exception {
-        for(int i=0;i<100;i++) {
-            Connection conn = getConnection();
-            assertTrue(null != conn);
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-            conn.close();
-        }
-    }
-
-    public void testSimple2() throws Exception {
-        Connection conn = getConnection();
-        assertTrue(null != conn);
-        {
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-        }
-        {
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-        }
-        conn.close();
-        try {
-            conn.createStatement();
-            fail("Can't use closed connections");
-        } catch(SQLException e) {
-            ; // expected
-        }
-
-        conn = getConnection();
-        assertTrue(null != conn);
-        {
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-        }
-        {
-            PreparedStatement stmt = conn.prepareStatement("select * from dual");
-            assertTrue(null != stmt);
-            ResultSet rset = stmt.executeQuery();
-            assertTrue(null != rset);
-            assertTrue(rset.next());
-            rset.close();
-            stmt.close();
-        }
-        conn.close();
-        conn = null;
-    }
-
-    public void testPooling() throws Exception {
-        Connection conn = getConnection();
-        Connection underconn = null;
-        if(conn instanceof DelegatingConnection) {
-            underconn = ((DelegatingConnection)conn).getInnermostDelegate();
-        } else {
-            return; // skip this test
-        }
-        assertTrue(underconn != null);
-        Connection conn2 = getConnection();
-        Connection underconn2 = null;
-        if(conn2 instanceof DelegatingConnection) {
-            underconn2 = ((DelegatingConnection)conn2).getInnermostDelegate();
-        } else {
-            return; // skip this test
-        }
-        assertTrue(underconn2 != null);
-        assertTrue(underconn != underconn2);
-        conn2.close();
-        conn.close();
-        Connection conn3 = getConnection();
-        Connection underconn3 = null;
-        if(conn3 instanceof DelegatingConnection) {
-            underconn3 = ((DelegatingConnection)conn3).getInnermostDelegate();
-        } else {
-            return; // skip this test
-        }
-        assertTrue( underconn3 == underconn || underconn3 == underconn2 );
-        conn3.close();
-    }
-    
-    public void testAutoCommitBehavior() throws Exception {
-        Connection conn = getConnection();
-        assertTrue(conn != null);
-        assertTrue(conn.getAutoCommit());
-        conn.setAutoCommit(false);
-        conn.close();
-        
-        Connection conn2 = getConnection();
-        assertTrue( conn2.getAutoCommit() );
-        
-        Connection conn3 = getConnection();
-        assertTrue( conn3.getAutoCommit() );
-
-        conn2.close();
-        
-        conn3.close();
-    }
-    
-    /** @see http://issues.apache.org/bugzilla/show_bug.cgi?id=12400 */
-    public void testConnectionsAreDistinct() throws Exception {
-        Connection[] conn = new Connection[getMaxActive()];
-        for(int i=0;i<conn.length;i++) {
-            conn[i] = getConnection();
-            for(int j=0;j<i;j++) {
-                assertTrue(conn[j] != conn[i]);
-                assertTrue(!conn[j].equals(conn[i]));
-            }
-        }
-        for(int i=0;i<conn.length;i++) {
-            conn[i].close();
-        }
-    }
-
-
-    public void testOpening() throws Exception {
-        Connection[] c = new Connection[getMaxActive()];
-        // test that opening new connections is not closing previous
-        for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
-            assertTrue(c[i] != null);
-            for (int j = 0; j <= i; j++) {
-                assertTrue(!c[j].isClosed());
-            }
-        }
-
-        for (int i = 0; i < c.length; i++) {
-            c[i].close();
-        }
-    }
-
-    public void testClosing() throws Exception {
-        Connection[] c = new Connection[getMaxActive()];
-        // open the maximum connections
-        for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
-        }
-
-        // close one of the connections
-        c[0].close();
-        assertTrue(c[0].isClosed());
-
-        // get a new connection
-        c[0] = getConnection();
-
-        for (int i = 0; i < c.length; i++) {
-            c[i].close();
-        }
-    }
-
-    public void testMaxActive() throws Exception {
-        Connection[] c = new Connection[getMaxActive()];
-        for (int i = 0; i < c.length; i++) {
-            c[i] = getConnection();
-            assertTrue(c[i] != null);
-        }
-
-        try {
-            getConnection();
-            fail("Allowed to open more than DefaultMaxActive connections.");
-        } catch (java.sql.SQLException e) {
-            // should only be able to open 10 connections, so this test should
-            // throw an exception
-        }
-
-        for (int i = 0; i < c.length; i++) {
-            c[i].close();
-        }
-    }
-
-    public void testThreaded() {
-        TestThread[] threads = new TestThread[getMaxActive()];
-        for(int i=0;i<threads.length;i++) {
-            threads[i] = new TestThread(50,50);
-            Thread t = new Thread(threads[i]);
-            t.start();
-        }
-        for(int i=0;i<threads.length;i++) {
-            while(!(threads[i]).complete()) {
-                try {
-                    Thread.sleep(100L);
-                } catch(Exception e) {
-                    // ignored
-                }
-            }
-            if(threads[i].failed()) {
-                fail();
-            }
-        }
-    }
-
-    class TestThread implements Runnable {
-        java.util.Random _random = new java.util.Random();
-        boolean _complete = false;
-        boolean _failed = false;
-        int _iter = 100;
-        int _delay = 50;
-
-        public TestThread() {
-        }
-
-        public TestThread(int iter) {
-            _iter = iter;
-        }
-
-        public TestThread(int iter, int delay) {
-            _iter = iter;
-            _delay = delay;
-        }
-
-        public boolean complete() {
-            return _complete;
-        }
-
-        public boolean failed() {
-            return _failed;
-        }
-
-        public void run() {
-            for(int i=0;i<_iter;i++) {
-                try {
-                    Thread.sleep((long)_random.nextInt(_delay));
-                } catch(Exception e) {
-                    // ignored
-                }
-                Connection conn = null;
-                PreparedStatement stmt = null;
-                ResultSet rset = null;
-                try {
-                    conn = getConnection();
-                    stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
-                    rset = stmt.executeQuery();
-                    try {
-                        Thread.sleep((long)_random.nextInt(_delay));
-                    } catch(Exception e) {
-                        // ignored
-                    }
-                } catch(Exception e) {
-                    e.printStackTrace();
-                    _failed = true;
-                    _complete = true;
-                    break;
-                } finally {
-                    try { rset.close(); } catch(Exception e) { }
-                    try { stmt.close(); } catch(Exception e) { }
-                    try { conn.close(); } catch(Exception e) { }
-                }
-            }
-            _complete = true;
-        }
-    }
-
-    // Bugzilla Bug 24328: PooledConnectionImpl ignores resultsetType 
-    // and Concurrency if statement pooling is not enabled
-    // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
-    public void testPrepareStatementOptions() throws Exception 
-    {
-        Connection conn = getConnection();
-        assertTrue(null != conn);
-        PreparedStatement stmt = conn.prepareStatement("select * from dual", 
-            ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
-        assertTrue(null != stmt);
-        ResultSet rset = stmt.executeQuery();
-        assertTrue(null != rset);
-        assertTrue(rset.next());
-        
-        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, rset.getType());
-        assertEquals(ResultSet.CONCUR_UPDATABLE, rset.getConcurrency());
-        
-        rset.close();
-        stmt.close();
-        conn.close();
-    }
-
-    // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
-    // wrong order of passivate/close when a rset isn't closed
-    public void testNoRsetClose() throws Exception {
-        Connection conn = getConnection();
-        assertNotNull(conn);
-        PreparedStatement stmt = conn.prepareStatement("test");
-        assertNotNull(stmt);
-        ResultSet rset = stmt.getResultSet();
-        assertNotNull(rset);
-        // forget to close the resultset: rset.close();
-        stmt.close();
-        conn.close();
-    }
-    
-    // Bugzilla Bug 26966: Connectionpool's connections always returns same
-    public void testHashCode() throws Exception {
-        Connection conn1 = getConnection();
-        assertNotNull(conn1);
-        Connection conn2 = getConnection();
-        assertNotNull(conn2);
-
-        assertTrue(conn1.hashCode() != conn2.hashCode());
-    }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.dbcp;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Stack;
+
+import junit.framework.TestCase;
+
+// XXX FIX ME XXX
+// this class still needs some cleanup, but at least
+// this consolidates most of the relevant test code
+// in a fairly re-usable fashion
+// XXX FIX ME XXX
+
+/**
+ * Base test suite for DBCP pools.
+ * 
+ * @author Rodney Waldhoff
+ * @author Sean C. Sullivan
+ * @author John McNally
+ * @author Dirk Verbeeck
+ * @version $Revision$ $Date$
+ */
+public abstract class TestConnectionPool extends TestCase {
+    public TestConnectionPool(String testName) {
+        super(testName);
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void tearDown() throws Exception {
+        super.tearDown();
+        // Close any connections opened by the test
+        while (!connections.isEmpty()) {
+            Connection conn = (Connection) connections.pop();
+            try {
+                conn.close();
+            } catch (Exception ex) { 
+                // ignore
+            } finally {
+                conn = null;
+            }
+        }
+    }
+
+    protected abstract Connection getConnection() throws Exception;
+    
+    protected int getMaxActive() {
+        return 10;
+    }
+    
+    protected long getMaxWait() {
+        return 100L;
+    }
+    
+    /** Connections opened during the course of a test */
+    protected Stack connections = new Stack();
+    
+    /** Acquire a connection and push it onto the connections stack */
+    protected Connection newConnection() throws Exception {
+        Connection connection = getConnection();
+        connections.push(connection);
+        return connection;
+    }
+
+    // ----------- Utility Methods --------------------------------- 
+
+    protected String getUsername(Connection conn) throws SQLException {
+        Statement stmt = conn.createStatement();
+        ResultSet rs = stmt.executeQuery("select username");
+        if (rs.next()) {
+            return rs.getString(1);
+        }
+        return null;
+    }
+
+    // ----------- tests --------------------------------- 
+
+    public void testClearWarnings() throws Exception {
+        Connection[] c = new Connection[getMaxActive()];
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+            assertTrue(c[i] != null);
+            
+            // generate SQLWarning on connection
+            c[i].prepareCall("warning");
+        }
+
+        for (int i = 0; i < c.length; i++) {
+            assertNotNull(c[i].getWarnings());
+        }
+
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+        }
+        
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+        }        
+
+        for (int i = 0; i < c.length; i++) {
+            // warnings should have been cleared by putting the connection back in the pool
+            assertNull(c[i].getWarnings());
+        }
+
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+        }
+    }
+
+    public void testIsClosed() throws Exception {
+        for(int i=0;i<getMaxActive();i++) {
+            Connection conn = newConnection();
+            assertTrue(null != conn);
+            assertTrue(!conn.isClosed());
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+            conn.close();
+            assertTrue(conn.isClosed());
+        }
+    }
+
+    public void testCantCloseConnectionTwice() throws Exception {
+        for(int i=0;i<getMaxActive();i++) { // loop to show we *can* close again once we've borrowed it from the pool again
+            Connection conn = newConnection();
+            assertTrue(null != conn);
+            assertTrue(!conn.isClosed());
+            conn.close();
+            assertTrue(conn.isClosed());
+            try {
+                conn.close();
+                fail("Expected SQLException on second attempt to close (" + conn.getClass().getName() + ")");
+            } catch(SQLException e) {
+                // expected
+            }
+            assertTrue(conn.isClosed());
+        }
+    }
+
+    public void testCantCloseStatementTwice() throws Exception {
+        Connection conn = newConnection();
+        assertTrue(null != conn);
+        assertTrue(!conn.isClosed());
+        for(int i=0;i<2;i++) { // loop to show we *can* close again once we've borrowed it from the pool again
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            stmt.close();
+            try {
+                stmt.close();
+                fail("Expected SQLException on second attempt to close (" + stmt.getClass().getName() + ")");
+            } catch(SQLException e) {
+                // expected
+            }
+        }
+        conn.close();
+    }
+
+    public void testSimple() throws Exception {
+        Connection conn = newConnection();
+        assertTrue(null != conn);
+        PreparedStatement stmt = conn.prepareStatement("select * from dual");
+        assertTrue(null != stmt);
+        ResultSet rset = stmt.executeQuery();
+        assertTrue(null != rset);
+        assertTrue(rset.next());
+        rset.close();
+        stmt.close();
+        conn.close();
+    }
+
+    public void testRepeatedBorrowAndReturn() throws Exception {
+        for(int i=0;i<100;i++) {
+            Connection conn = newConnection();
+            assertTrue(null != conn);
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+            conn.close();
+        }
+    }
+
+    public void testSimple2() throws Exception {
+        Connection conn = newConnection();
+        assertTrue(null != conn);
+        {
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+        }
+        {
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+        }
+        conn.close();
+        try {
+            conn.createStatement();
+            fail("Can't use closed connections");
+        } catch(SQLException e) {
+            ; // expected
+        }
+
+        conn = newConnection();
+        assertTrue(null != conn);
+        {
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+        }
+        {
+            PreparedStatement stmt = conn.prepareStatement("select * from dual");
+            assertTrue(null != stmt);
+            ResultSet rset = stmt.executeQuery();
+            assertTrue(null != rset);
+            assertTrue(rset.next());
+            rset.close();
+            stmt.close();
+        }
+        conn.close();
+        conn = null;
+    }
+
+    public void testPooling() throws Exception {  
+        // Grab a maximal set of open connections from the pool
+        Connection[] c = new Connection[getMaxActive()];
+        Connection[] u = new Connection[getMaxActive()];
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+            if (c[i] instanceof DelegatingConnection) {
+                u[i] = ((DelegatingConnection) c[i]).getInnermostDelegate();
+            } else {
+                for (int j = 0; j <= i; j++) {
+                    c[j].close();
+                }
+                return; // skip this test   
+            }
+        }        
+        // Close connections one at a time and get new ones, making sure
+        // the new ones come from the pool
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+            Connection con = newConnection();
+            Connection underCon = 
+                ((DelegatingConnection) con).getInnermostDelegate();
+            assertTrue("Failed to get connection", underCon != null);
+            boolean found = false;
+            for (int j = 0; j < c.length; j++) {
+                if (underCon == u[j]) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue("New connection not from pool", found);
+            con.close();
+        }
+    }
+    
+    public void testAutoCommitBehavior() throws Exception {
+        Connection conn = newConnection();
+        assertTrue(conn != null);
+        assertTrue(conn.getAutoCommit());
+        conn.setAutoCommit(false);
+        conn.close();
+        
+        Connection conn2 = newConnection();
+        assertTrue( conn2.getAutoCommit() );
+        
+        Connection conn3 = newConnection();
+        assertTrue( conn3.getAutoCommit() );
+
+        conn2.close();
+        
+        conn3.close();
+    }
+    
+    /** @see http://issues.apache.org/bugzilla/show_bug.cgi?id=12400 */
+    public void testConnectionsAreDistinct() throws Exception {
+        Connection[] conn = new Connection[getMaxActive()];
+        for(int i=0;i<conn.length;i++) {
+            conn[i] = newConnection();
+            for(int j=0;j<i;j++) {
+                assertTrue(conn[j] != conn[i]);
+                assertTrue(!conn[j].equals(conn[i]));
+            }
+        }
+        for(int i=0;i<conn.length;i++) {
+            conn[i].close();
+        }
+    }
+
+
+    public void testOpening() throws Exception {
+        Connection[] c = new Connection[getMaxActive()];
+        // test that opening new connections is not closing previous
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+            assertTrue(c[i] != null);
+            for (int j = 0; j <= i; j++) {
+                assertTrue(!c[j].isClosed());
+            }
+        }
+
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+        }
+    }
+
+    public void testClosing() throws Exception {
+        Connection[] c = new Connection[getMaxActive()];
+        // open the maximum connections
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+        }
+
+        // close one of the connections
+        c[0].close();
+        assertTrue(c[0].isClosed());
+
+        // get a new connection
+        c[0] = newConnection();
+
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+        }
+    }
+
+    public void testMaxActive() throws Exception {
+        Connection[] c = new Connection[getMaxActive()];
+        for (int i = 0; i < c.length; i++) {
+            c[i] = newConnection();
+            assertTrue(c[i] != null);
+        }
+
+        try {
+            newConnection();
+            fail("Allowed to open more than DefaultMaxActive connections.");
+        } catch (java.sql.SQLException e) {
+            // should only be able to open 10 connections, so this test should
+            // throw an exception
+        }
+
+        for (int i = 0; i < c.length; i++) {
+            c[i].close();
+        }
+    }
+
+    public void testThreaded() {
+        TestThread[] threads = new TestThread[getMaxActive()];
+        for(int i=0;i<threads.length;i++) {
+            threads[i] = new TestThread(50,50);
+            Thread t = new Thread(threads[i]);
+            t.start();
+        }
+        for(int i=0;i<threads.length;i++) {
+            while(!(threads[i]).complete()) {
+                try {
+                    Thread.sleep(100L);
+                } catch(Exception e) {
+                    // ignored
+                }
+            }
+            if(threads[i].failed()) {
+                fail();
+            }
+        }
+    }
+
+    class TestThread implements Runnable {
+        java.util.Random _random = new java.util.Random();
+        boolean _complete = false;
+        boolean _failed = false;
+        int _iter = 100;
+        int _delay = 50;
+
+        public TestThread() {
+        }
+
+        public TestThread(int iter) {
+            _iter = iter;
+        }
+
+        public TestThread(int iter, int delay) {
+            _iter = iter;
+            _delay = delay;
+        }
+
+        public boolean complete() {
+            return _complete;
+        }
+
+        public boolean failed() {
+            return _failed;
+        }
+
+        public void run() {
+            for(int i=0;i<_iter;i++) {
+                try {
+                    Thread.sleep((long)_random.nextInt(_delay));
+                } catch(Exception e) {
+                    // ignored
+                }
+                Connection conn = null;
+                PreparedStatement stmt = null;
+                ResultSet rset = null;
+                try {
+                    conn = newConnection();
+                    stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
+                    rset = stmt.executeQuery();
+                    try {
+                        Thread.sleep((long)_random.nextInt(_delay));
+                    } catch(Exception e) {
+                        // ignored
+                    }
+                } catch(Exception e) {
+                    e.printStackTrace();
+                    _failed = true;
+                    _complete = true;
+                    break;
+                } finally {
+                    try { rset.close(); } catch(Exception e) { }
+                    try { stmt.close(); } catch(Exception e) { }
+                    try { conn.close(); } catch(Exception e) { }
+                }
+            }
+            _complete = true;
+        }
+    }
+
+    // Bugzilla Bug 24328: PooledConnectionImpl ignores resultsetType 
+    // and Concurrency if statement pooling is not enabled
+    // http://issues.apache.org/bugzilla/show_bug.cgi?id=24328
+    public void testPrepareStatementOptions() throws Exception 
+    {
+        Connection conn = newConnection();
+        assertTrue(null != conn);
+        PreparedStatement stmt = conn.prepareStatement("select * from dual", 
+            ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+        assertTrue(null != stmt);
+        ResultSet rset = stmt.executeQuery();
+        assertTrue(null != rset);
+        assertTrue(rset.next());
+        
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, rset.getType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, rset.getConcurrency());
+        
+        rset.close();
+        stmt.close();
+        conn.close();
+    }
+
+    // Bugzilla Bug 24966: NullPointer with Oracle 9 driver
+    // wrong order of passivate/close when a rset isn't closed
+    public void testNoRsetClose() throws Exception {
+        Connection conn = newConnection();
+        assertNotNull(conn);
+        PreparedStatement stmt = conn.prepareStatement("test");
+        assertNotNull(stmt);
+        ResultSet rset = stmt.getResultSet();
+        assertNotNull(rset);
+        // forget to close the resultset: rset.close();
+        stmt.close();
+        conn.close();
+    }
+    
+    // Bugzilla Bug 26966: Connectionpool's connections always returns same
+    public void testHashCode() throws Exception {
+        Connection conn1 = newConnection();
+        assertNotNull(conn1);
+        Connection conn2 = newConnection();
+        assertNotNull(conn2);
+
+        assertTrue(conn1.hashCode() != conn2.hashCode());
+    }
+}

commons-dbcp-1.2.1-TestJOCLed.patch:
 TestJOCLed.java |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE commons-dbcp-1.2.1-TestJOCLed.patch ---
--- src/test/org/apache/commons/dbcp/TestJOCLed.java.sav	2006-04-12 15:57:50.000000000 +0200
+++ src/test/org/apache/commons/dbcp/TestJOCLed.java	2006-04-12 15:58:27.000000000 +0200
@@ -45,6 +45,7 @@
     private PoolingDriver driver = null;
     
     public void setUp() throws Exception {
+        super.setUp();
         driver = new PoolingDriver();
         PoolingDriver.setAccessToUnderlyingConnectionAllowed(true);
     }
@@ -52,6 +53,7 @@
     public void tearDown() throws Exception {
         driver.closePool("testpool");
         DriverManager.deregisterDriver(driver);
+        super.tearDown();
     }
 
 }

commons-dbcp-1.2.1-navigation_xml.patch:
 navigation.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE commons-dbcp-1.2.1-navigation_xml.patch ---
--- xdocs/navigation.xml.sav	2006-04-12 16:11:56.000000000 +0200
+++ xdocs/navigation.xml	2006-04-12 16:12:07.000000000 +0200
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM '../commons-build/menus/menus.dtd'>
 <project name="Commons DBCP">
     <title>Commons DBCP</title>
     <body>

commons-dbcp-1.2.1-project_properties.patch:
 project.properties |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE commons-dbcp-1.2.1-project_properties.patch ---
--- project.properties.sav	2006-04-12 16:17:46.000000000 +0200
+++ project.properties	2006-04-12 16:17:55.000000000 +0200
@@ -6,7 +6,7 @@
 maven.javadoc.author=false
 maven.javadoc.links=http://java.sun.com/j2se/1.4.2/docs/api,http://jakarta.apache.org/commons/pool/apidocs
 
-maven.xdoc.jsl=../commons-build/commons-site.jsl
+maven.xdoc.jsl=commons-build/commons-site.jsl
 maven.xdoc.date=bottom
 maven.xdoc.poweredby.image=maven-feather.png
 maven.xdoc.version=${pom.currentVersion}

commons-dbcp-1.2.1-project_xml.patch:
 project.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE commons-dbcp-1.2.1-project_xml.patch ---
--- ./project.xml.sav	2004-06-12 09:42:20.000000000 -0400
+++ ./project.xml	2006-07-20 17:14:46.000000000 -0400
@@ -219,6 +219,7 @@
       </resource>
       <resource>
         <targetPath>META-INF</targetPath>
+        <directory>${basedir}</directory>
         <includes>
           <include>NOTICE.txt</include>
         </includes>
@@ -227,7 +228,6 @@
   </build>
   
   <reports>
-    <report>maven-changelog-plugin</report>
     <report>maven-changes-plugin</report>
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>


--- NEW FILE dbcp-1.2.1-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
         <version>2.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>commons-collections</artifactId>
         <jar>commons-collections.jar</jar>
         <version>2.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>commons-pool</groupId>
         <artifactId>commons-pool</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>commons-pool</artifactId>
         <jar>commons-pool.jar</jar>
         <version>1.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>jdbc</groupId>
         <artifactId>jdbc</artifactId>
         <version>2.0</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>jdbc</artifactId>
         <jar>jdbc.jar</jar>
         <version>2.0</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <jar>junit.jar</jar>
         <version>3.8.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>xerces</groupId>
         <artifactId>xerces</artifactId>
         <version>2.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>xerces</artifactId>
         <jar>xerces-j2.jar</jar>
         <version>2.0.2</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
         <version>2.0.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>xml-apis</artifactId>
         <jar>xml-commons-apis.jar</jar>
         <version>2.0.2</version>
      </jpp>
   </dependency>
</depset>


--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="*[name() != 'dependencies']|*/text()">
     <xsl:apply-templates/>
 </xsl:template>
 <xsl:template match="//dependencies">
  <xsl:for-each select="./dependency">
   <xsl:element name="dependency">
    <xsl:element name="maven">
     <xsl:choose>
      <xsl:when test="./groupId">
       <xsl:copy-of select="./groupId"/>
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-before(./id/text(),':') != ''">
         <xsl:element name="groupId">
          <xsl:value-of select="substring-before(./id/text(),':')"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="groupId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
    <xsl:element name="jpp">
     <xsl:element name="groupId">JPP</xsl:element>
     <xsl:choose>
      <xsl:when test="./artifactId">
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-after(./id/text(),':') != ''">
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:element name="jar">
      <xsl:choose>
       <xsl:when test="./artifactId">
        <xsl:value-of select="./artifactId/text()"/>
       </xsl:when>
       <xsl:when test="./id">
        <xsl:choose>
         <xsl:when test="substring-after(./id/text(),':') != ''">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:when>
         <xsl:otherwise>
          <xsl:value-of select="./id/text()"/>
         </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
ERROR
       </xsl:otherwise>
      </xsl:choose>
      <xsl:choose>
       <xsl:when test="./type">
        <xsl:choose>
         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>.jar</xsl:otherwise>
      </xsl:choose>
     </xsl:element>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
   </xsl:element>
  </xsl:for-each>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:param name="map" /> 
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/project" >
  <xsl:element name="project">
   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
   <xsl:if test="not(./dependencies)">
    <xsl:element name="dependencies">
     <xsl:for-each select="document($map)//add/dependency">
       <xsl:copy-of select="."/>
     </xsl:for-each>
    </xsl:element>
   </xsl:if>
   <xsl:apply-templates select="dependencies"/>
  </xsl:element>
 </xsl:template>
 <xsl:template match="dependencies" >
  <xsl:element name="dependencies">
   <xsl:for-each select="dependency">
    <xsl:if test="./artifactId">
     <xsl:call-template name="replace">
      <xsl:with-param name="artifact" select="./artifactId/text()"/>
     </xsl:call-template>
    </xsl:if>
    <xsl:if test="./id">
     <xsl:choose>
      <xsl:when test="substring-after(./id/text(),':') != ''">
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
       </xsl:call-template>
      </xsl:when>
      <xsl:otherwise>
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="./id/text()"/>
       </xsl:call-template>
      </xsl:otherwise>
     </xsl:choose>
    </xsl:if>
   </xsl:for-each>
   <xsl:for-each select="document($map)//add/dependency">
    <xsl:copy-of select="."/>
   </xsl:for-each>
  </xsl:element>
 </xsl:template>
 <xsl:template name="replace">
  <xsl:param name="artifact"/>
  <xsl:variable name="this" select="."/>
  <xsl:element name="dependency">
   <xsl:choose>
    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
      <xsl:copy-of select="../jpp/*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
     <xsl:copy-of select="./*"/>
    </xsl:otherwise>
   </xsl:choose>
  </xsl:element>
  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
    <xsl:for-each select="../add/dependency">
     <xsl:element name="dependency">
      <xsl:copy-of select="./*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:element>
    </xsl:for-each>
   </xsl:for-each>
  </xsl:if>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
	xmlns:saxon="http://icl.com/saxon"
	extension-element-prefixes="saxon">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/" >
  <xsl:element name="depset">
   <saxon:group select="//dependency" group-by="./maven/artifactId">
    <xsl:sort select="./maven/artifactId"/>
    <xsl:element name="dependency">
     <xsl:element name="maven">
      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
     </xsl:element>
     <xsl:element name="jpp">
      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
     </xsl:element>
    </xsl:element>
    <saxon:item/>
   </saxon:group>
  </xsl:element>
 </xsl:template>
</xsl:stylesheet>



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:26:30 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.300, 1.301 anaconda.spec, 1.425,
	1.426 sources, 1.422, 1.423
Message-ID: <200607202226.k6KMQU64031076@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31053/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.62-1 on branch devel from anaconda-11.1.0.62-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- .cvsignore	19 Jul 2006 21:41:27 -0000	1.300
+++ .cvsignore	20 Jul 2006 22:26:28 -0000	1.301
@@ -1 +1 @@
-anaconda-11.1.0.61.tar.bz2
+anaconda-11.1.0.62.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- anaconda.spec	19 Jul 2006 21:41:27 -0000	1.425
+++ anaconda.spec	20 Jul 2006 22:26:28 -0000	1.426
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.61
+Version: 11.1.0.62
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 20 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.62-1
+- Fix drivelist sensitivity when adding devices
+- Fix text mode package selection (clumens, #186043)
+- Make GMT offset timezones available (clumens, #199076)
+- Use attr=2 for xfs per sandeen
+- Fix labels of stuff created before install starts (#199605)
+- Add Malayalam and Oriya (#197783)
+- Fix partitioning (#199459)
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 11.1.0.61-1
 - Bring down network interface after fetching files (dcantrel).
 - Use dejavu fonts instead of vera (katzj).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -r1.422 -r1.423
--- sources	19 Jul 2006 21:41:27 -0000	1.422
+++ sources	20 Jul 2006 22:26:28 -0000	1.423
@@ -1 +1 @@
-549ad31828cb011ad62494e506376fed  anaconda-11.1.0.61.tar.bz2
+0bf0f9f1c2e7b16f28c940be00ab8b9d  anaconda-11.1.0.62.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:28:54 -0400
Subject: rpms/jakarta-commons-httpclient/devel .cvsignore, 1.4,
	1.5 jakarta-commons-httpclient.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200607202228.k6KMSs57031178@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31162

Modified Files:
	.cvsignore jakarta-commons-httpclient.spec sources 
Log Message:

Added conditional native compilation.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jun 2005 09:15:05 -0000	1.4
+++ .cvsignore	20 Jul 2006 22:28:52 -0000	1.5
@@ -1,5 +1 @@
-commons-httpclient-2.0.2-src.tar.gz
-commons-httpclient-3.0-rc2-src.tar.gz
-commons-httpclient-3.0-rc2
-noarch
-*.src.rpm
+commons-httpclient-3.0-src.tar.gz


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-httpclient.spec	12 Jul 2006 16:58:23 -0000	1.10
+++ jakarta-commons-httpclient.spec	20 Jul 2006 22:28:52 -0000	1.11
@@ -1,20 +1,53 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define short_name httpclient
-%define name       jakarta-commons-%{short_name}
-%define version    3.0
-%define release    0.rc2.0jpp_5.1fc
 %define section    free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           jakarta-commons-httpclient
+Version:        3.0
+Release:        6jpp_1fc
 Epoch:          1
 Summary:        Jakarta Commons HTTPClient Package
 License:        Apache Software License
-Source0:        http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0-rc2-src.tar.gz
-Patch1:		%{name}-examples.patch
+# http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0-src.tar.gz
+Source0:        commons-httpclient-3.0-src.tar.gz
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries/Java
+%if ! %{gcj_support}
 Buildarch:      noarch
+%endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires:  jpackage-utils >= 0:1.5
@@ -23,13 +56,22 @@
 BuildRequires:  jakarta-commons-logging >= 0:1.0.3
 BuildRequires:  jce >= 0:1.2.2
 BuildRequires:  jsse >= 0:1.0.3.01
-BuildRequires:  java-javadoc
+#BuildRequires:  java-javadoc
 BuildRequires:  jakarta-commons-logging-javadoc
+BuildRequires:  jaxp = 1.3
 
 Requires:       jakarta-commons-logging >= 0:1.0.3
 
-Provides:       commons-%{short_name}
-Obsoletes:      commons-%{short_name}
+Provides:       commons-httpclient
+Obsoletes:      commons-httpclient
+Provides:       jakarta-commons-httpclient3
+Obsoletes:      jakarta-commons-httpclient3
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The Hyper-Text Transfer Protocol (HTTP) is perhaps the most significant
@@ -52,7 +94,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -74,11 +115,19 @@
 
 
 %prep
-%setup -q -n commons-httpclient-%{version}-rc2
-%patch1 -p1
+%setup -q -n commons-httpclient-%{version}
 mkdir lib # duh
 rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
 
+# Use javax classes, not com.sun ones
+# assume no filename contains spaces
+pushd src
+    for j in $(find . -name "*.java" -exec grep -l 'com\.sun\.net\.ssl' {} \;); do
+        sed -e 's|com\.sun\.net\.ssl|javax.net.ssl|' $j > tempf
+        cp tempf $j
+    done
+    rm tempf
+popd
 
 %build
 export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging)
@@ -86,7 +135,7 @@
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
   -Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
-  dist
+  dist test
 
 
 %install
@@ -94,10 +143,14 @@
 
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/commons-%{short_name}.jar \
+cp -p dist/commons-httpclient.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# compat symlink
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s commons-httpclient.jar commons-httpclient3.jar
+popd
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
@@ -113,6 +166,10 @@
 ln -s %{_javadocdir}/%{name} dist/docs/apidocs
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -122,11 +179,31 @@
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt README.txt RELEASE_NOTES.txt
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -142,34 +219,33 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_5.1fc
-- rebuild
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:3.0-6jpp_1fc
+- Added conditional native compilation.
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 1:3.0-0.rc2.0jpp_4fc
-- stop scriptlet spew
+* Thu Apr 06 2006 Fernando Nasser <fnasser at redhat.com> - 1:3.0-5jpp
+- Improve backwards compatibility and force removal of older versioned
+  packages
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_3fc
-- rebuilt again
+* Thu Apr 06 2006 Fernando Nasser <fnasser at redhat.com> - 1:3.0-4jpp
+- Remove duplicate release definition
+- Require simply a jaxp 1.3
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1:3.0-0.rc2.0jpp_2fc
-- rebuilt
+* Thu Apr 06 2006 Fernando Nasser <fnasser at redhat.com> - 1:3.0-3jpp
+- BR xml-commons-jaxp-1.3-apis
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 1:3.0-0.rc2.0jpp_1fc
-- Build into Fedora.
+* Thu Apr 06 2006 Ralph Apel <r.apel at r-apel.de> - 1:3.0-2jpp
+- Fix tarball typo
+- assure javax classes are used instead of com.sun. ones
 
-* Tue Jun  7 2005 Gary Benson <gbenson at redhat.com>
-- Avoid an API hole in libgcj's Swing implementation.
-- Skip tests (suite is full of Sun-specific classes).
+* Wed Apr 05 2006 Ralph Apel <r.apel at r-apel.de> - 1:3.0-1jpp
+- 3.0 final, drop main version in name
 
-* Thu May 05 2005 Fernando Nasser <fnasser at redhat.com> - 1:3.0-0.rc2.1jpp_1rh
-- First Red Hat build
+* Thu Oct 20 2005 Jason Corley <jason.corley at gmail.com> - 1:3.0-0.rc4.1jpp
+- 3.0rc4
 
 * Thu May 05 2005 Fernando Nasser <fnasser at redhat.com> - 1:3.0-0.rc2.1jpp
 - Update to 3.0 rc2.
 
-* Tue Nov 23 2004 Fernando Nasser <fnasser at redhat.com> - 1:2.0.2-1jpp_1rh
-- Merge with upstream for upgrade
-
 * Thu Nov  4 2004 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.0.2-1jpp
 - Update to 2.0.2.
 - Fix Group tag in -manual.
@@ -177,10 +253,6 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.0-2jpp
 - Rebuild with ant-1.6.2
 
-* Fri Mar 12 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.0-1jpp_1rh
-- RH vacuuming
-- added jch-javaxssl.patch
-
 * Mon Feb 16 2004 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:2.0-1jpp
 - 2.0 final
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jun 2005 09:15:05 -0000	1.4
+++ sources	20 Jul 2006 22:28:52 -0000	1.5
@@ -1 +1 @@
-23dd6fa9d713b00343fe060f831b5669  commons-httpclient-3.0-rc2-src.tar.gz
+e440ab39e3103f7e47adfaed17e365e3  commons-httpclient-3.0-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:29:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:29:35 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient-examples.patch, 1.1, NONE
Message-ID: <200607202229.k6KMTZPj031231@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31219

Removed Files:
	jakarta-commons-httpclient-examples.patch 
Log Message:

Removing obsolete file.




--- jakarta-commons-httpclient-examples.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:35:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:35:56 -0400
Subject: rpms/gcc/devel gcc41-java-backport2.patch, 1.2, 1.3 gcc41.spec, 1.84,
	1.85
Message-ID: <200607202235.k6KMZu5u031383@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31368

Modified Files:
	gcc41-java-backport2.patch gcc41.spec 
Log Message:
4.1.1-10

gcc41-java-backport2.patch:
 Makefile.am  |   26 ++++++++++++++++++++++++--
 Makefile.in  |   32 ++++++++++++++++++++++++++------
 configure    |    2 +-
 configure.ac |    2 +-
 4 files changed, 52 insertions(+), 10 deletions(-)

Index: gcc41-java-backport2.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-java-backport2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-java-backport2.patch	20 Jul 2006 20:28:17 -0000	1.2
+++ gcc41-java-backport2.patch	20 Jul 2006 22:35:51 -0000	1.3
@@ -88,3 +88,34 @@
  
  libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
  	cp $< $@
+--- gcc/java/Make-lang.in	(revision 115597)
++++ gcc/java/Make-lang.in	(working copy)
+@@ -180,8 +180,8 @@
+ java.srcinfo: doc/gcj.info
+ 	-cp -p $^ $(srcdir)/doc
+ 
+-java.dvi: doc/gcj.dvi
+-java.html: $(build_htmldir)/java/index.html
++dvi:: doc/gcj.dvi
++html:: $(htmldir)/java/index.html
+ JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
+                 doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1 \
+ 		doc/gcj-dbtool.1 doc/gjnih.1
+@@ -247,7 +247,7 @@
+ 	-rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext)
+ 
+-java.install-info: $(DESTDIR)$(infodir)/gcj.info
++install-info:: $(DESTDIR)$(infodir)/gcj.info
+ 
+ #
+ # Clean hooks:
+@@ -401,7 +401,7 @@
+ doc/gcj.dvi: $(TEXI_JAVA_FILES)
+ 	$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
+ 
+-$(build_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
++$(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
+ 	$(mkinstalldirs) $(@D)
+ 	rm -f $(@D)/*
+ 	$(TEXI2HTML) -I $(docdir)/include -I $(srcdir)/java -o $(@D) $<


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gcc41.spec	20 Jul 2006 21:31:10 -0000	1.84
+++ gcc41.spec	20 Jul 2006 22:35:51 -0000	1.85
@@ -306,7 +306,7 @@
 Obsoletes: gcc4-java
 Provides: gcc4-java
 Prereq: /sbin/install-info
-Autoreq: true
+Autoreq: false
 Autoprov: false
 
 %description java
@@ -608,6 +608,26 @@
 make -C gcc generated-manpages
 for i in ../gcc/doc/*.texi; do mv -f $i.orig $i; done
 
+%if %{build_java}
+LIBGCJ_BC_CFLAGS=
+%ifarch sparc ppc
+LIBGCJ_BC_CFLAGS=-m64
+%endif
+%ifarch %{multilib_64_archs}
+LIBGCJ_BC_CFLAGS=-m32
+%endif
+%ifarch s390x
+LIBGCJ_BC_CFLAGS=-m31
+%endif
+if [ -n "$LIBGCJ_BC_CFLAGS" ]; then
+  mkdir libgcj_bc
+  gcc/xgcc -B gcc/ $OPT_FLAGS $LIBGCJ_BC_CFLAGS -shared -fpic -xc /dev/null \
+      -o libgcj_bc/libgcj.so -Wl,-soname,libgcj.so.7rh -nostdlib
+  gcc/xgcc -B gcc/ $OPT_FLAGS $LIBGCJ_BC_CFLAGS -shared -fpic ../libjava/libgcj_bc.c \
+      -o libgcj_bc/libgcj_bc.so -Wl,-soname,libgcj_bc.so.1 libgcj_bc/libgcj.so -shared-libgcc 
+fi
+%endif
+
 # Copy various doc files here and there
 cd ..
 mkdir -p rpm.doc/gfortran rpm.doc/objc
@@ -670,6 +690,12 @@
   infodir=$RPM_BUILD_ROOT%{_infodir} install
 %if %{build_java}
 make DESTDIR=$RPM_BUILD_ROOT -C %{gcc_target_platform}/libjava install-src.zip
+%ifarch %{multilib_64_archs}
+install -m755 libgcj_bc/libgcj_bc.so $RPM_BUILD_ROOT%{_prefix}/lib/libgcj_bc.so
+%endif
+%ifarch sparc ppc
+install -m755 libgcj_bc/libgcj_bc.so $RPM_BUILD_ROOT%{_prefix}/lib64/libgcj_bc.so
+%endif
 %endif
 %if %{build_ada}
 chmod 644 $RPM_BUILD_ROOT%{_infodir}/gnat*
@@ -1369,11 +1395,11 @@
 %{_prefix}/%{_lib}/libgcj_bc.so.*
 %{_prefix}/%{_lib}/libgij.so.*
 %dir %{_prefix}/%{_lib}/gcj-%{version}
-%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so*
-%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so*
-%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so*
+%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so
+%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so
+%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so
 %{_prefix}/%{_lib}/gcj-%{version}/libgcjwebplugin.so
-%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so.*
+%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so
 %dir %{_prefix}/share/java
 %{_prefix}/share/java/[^s]*
 %dir %{_prefix}/lib/security
@@ -1399,14 +1425,12 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libjvm.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
 %ifarch sparc ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj-tools.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libjvm.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgij.so
 %endif
@@ -1414,7 +1438,6 @@
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj-tools.so
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libjvm.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj_bc.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgij.so
 %endif



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:36:35 -0400
Subject: rpms/dbus/devel dbus-0.90-ref-unlocked.patch, NONE, 1.1 dbus.spec,
	1.91, 1.92
Message-ID: <200607202236.k6KMaZJj031453@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31438

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.90-ref-unlocked.patch 
Log Message:
- add patch to fix taking a connection ref when it is locked


dbus-0.90-ref-unlocked.patch:
 dbus-pending-call.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dbus-0.90-ref-unlocked.patch ---
--- dbus-0.90/dbus/dbus-pending-call.c.ref-unlocked	2006-07-20 16:34:37.000000000 -0400
+++ dbus-0.90/dbus/dbus-pending-call.c	2006-07-20 16:35:08.000000000 -0400
@@ -119,7 +119,7 @@
   
   pending->refcount.value = 1;
   pending->connection = connection;
-  dbus_connection_ref (pending->connection);
+  _dbus_connection_ref_unlocked (pending->connection);
 
   pending->timeout = timeout;
 


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- dbus.spec	19 Jul 2006 15:39:29 -0000	1.91
+++ dbus.spec	20 Jul 2006 22:36:33 -0000	1.92
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 6 
+Release: 7 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -31,6 +31,7 @@
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
 Patch4: dbus-0.90-remove-glib.patch
+Patch5: dbus-0.90-ref-unlocked.patch
 
 %description
 
@@ -64,6 +65,7 @@
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
 %patch4 -p1 -b .remove-glib
+%patch5 -p1 -b .ref-unlocked
 
 autoreconf -f -i
 
@@ -169,6 +171,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-7
+- add patch to fix taking a connection ref when it is locked
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-6
 - change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
   in the dbus-1.pc file after compile



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:46:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:46:21 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.11, 1.12
Message-ID: <200607202246.k6KMkLDc018050@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17130

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:

Disable certain ssl related tests that are known to fail with libgcj.




Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-httpclient.spec	20 Jul 2006 22:28:52 -0000	1.11
+++ jakarta-commons-httpclient.spec	20 Jul 2006 22:46:18 -0000	1.12
@@ -43,6 +43,7 @@
 License:        Apache Software License
 # http://archive.apache.org/dist/jakarta/commons/httpclient/source/commons-httpclient-3.0-src.tar.gz
 Source0:        commons-httpclient-3.0-src.tar.gz
+Patch0:         %{name}-disablecryptotests.patch
 URL:            http://jakarta.apache.org/commons/httpclient/
 Group:          Development/Libraries/Java
 %if ! %{gcj_support}
@@ -58,7 +59,7 @@
 BuildRequires:  jsse >= 0:1.0.3.01
 #BuildRequires:  java-javadoc
 BuildRequires:  jakarta-commons-logging-javadoc
-BuildRequires:  jaxp = 1.3
+#BuildRequires:  jaxp = 1.3
 
 Requires:       jakarta-commons-logging >= 0:1.0.3
 
@@ -119,6 +120,8 @@
 mkdir lib # duh
 rm -rf docs/apidocs docs/*.patch docs/*.orig docs/*.rej
 
+%patch0
+
 # Use javax classes, not com.sun ones
 # assume no filename contains spaces
 pushd src
@@ -129,6 +132,10 @@
     rm tempf
 popd
 
+# FIXME: These tests fail due to absence of jks in libgcj. Disable them for now.
+rm -f src/test/org/apache/commons/httpclient/TestProxy.java
+rm -f src/test/org/apache/commons/httpclient/params/TestSSLTunnelParams.java
+
 %build
 export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging)
 ant \
@@ -221,6 +228,7 @@
 %changelog
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:3.0-6jpp_1fc
 - Added conditional native compilation.
+- Disable certain ssl related tests that are known to fail with libgcj.
 
 * Thu Apr 06 2006 Fernando Nasser <fnasser at redhat.com> - 1:3.0-5jpp
 - Improve backwards compatibility and force removal of older versioned



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:47:00 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient-disablecryptotests.patch, NONE, 1.1
Message-ID: <200607202247.k6KMl0Wv022881@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21294

Added Files:
	jakarta-commons-httpclient-disablecryptotests.patch 
Log Message:

Add new patch file.



jakarta-commons-httpclient-disablecryptotests.patch:
 TestAll.java              |    1 -
 params/TestParamsAll.java |    1 -
 2 files changed, 2 deletions(-)

--- NEW FILE jakarta-commons-httpclient-disablecryptotests.patch ---
--- ./src/test/org/apache/commons/httpclient/params/TestParamsAll.java.sav	2006-07-20 18:42:17.000000000 -0400
+++ ./src/test/org/apache/commons/httpclient/params/TestParamsAll.java	2006-07-20 18:42:26.000000000 -0400
@@ -43,7 +43,6 @@
     public static Test suite() {
         TestSuite suite = new TestSuite();
         suite.addTest(TestHttpParams.suite());
-        suite.addTest(TestSSLTunnelParams.suite());
         return suite;
     }
 
--- ./src/test/org/apache/commons/httpclient/TestAll.java.sav	2006-07-20 18:42:56.000000000 -0400
+++ ./src/test/org/apache/commons/httpclient/TestAll.java	2006-07-20 18:43:01.000000000 -0400
@@ -100,7 +100,6 @@
         // Non compliant behaviour
         suite.addTest(TestNoncompliant.suite());
         // Proxy
-        suite.addTest(TestProxy.suite());
         suite.addTest(TestProxyWithRedirect.suite());
         return suite;
     }



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:47:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:47:28 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec,
	1.11, 1.12
Message-ID: <200607202247.k6KMlSJu026720@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23727

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
- Merge with upstream version
- Natively compile packages



Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-launcher.spec	12 Jul 2006 06:29:07 -0000	1.11
+++ jakarta-commons-launcher.spec	20 Jul 2006 22:47:25 -0000	1.12
@@ -1,3 +1,37 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name       launcher
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
@@ -5,20 +39,26 @@
 
 Name:           %{name}
 Version:        0.9
-Release: 	3jpp_4fc
+Release:        5jpp_1fc
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 URL:            http://jakarta.apache.org/commons/launcher/
 Source:         http://archive.apache.org/dist/jakarta/commons/launcher/source/launcher-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5.30
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Commons-launcher eliminates the need for a batch or shell script to launch a Java class. Some situations where elimination of a batch or shell script may be desirable are:
 
@@ -34,7 +74,6 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -69,6 +108,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,11 +121,31 @@
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt STATUS.html
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-launcher-0.9.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -90,30 +153,20 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9-3jpp_4fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:0.9-3jpp_3fc
-- stop scriptlet spew
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com> - 0:0.9-3jpp_2fc
-- rebuilt for new gcj
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-5jpp_1fc
+- Merge with upstream version
+- Natively compile packages
+
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-5jpp
+- Add conditional native compiling
+- Change section from 'devel' to 'free'
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:0.9-3jpp_1fc
-- Build into Fedora.
-
-* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:0.9-3jpp_1rh
-- Merge with upstream
+* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> - 0:0.9-4jpp
+- First JPP 1.7 build
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:0.9-3jpp
 - Rebuild with ant-1.6.2
 
-* Wed Jul 14 2004 Fernando Nasser <fnasser at redhat.com> - 0:0.9-2jpp_1rh
-- Merge with upstream to remove dependency on ant-optional
-
 * Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.9-2jpp
 - Upgrade to Ant 1.6.X
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 22:53:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 18:53:22 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.12, 1.13
Message-ID: <200607202253.k6KMrM6S028820@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28754

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:

Add missing junit requirement.




Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-httpclient.spec	20 Jul 2006 22:46:18 -0000	1.12
+++ jakarta-commons-httpclient.spec	20 Jul 2006 22:53:20 -0000	1.13
@@ -59,6 +59,7 @@
 BuildRequires:  jsse >= 0:1.0.3.01
 #BuildRequires:  java-javadoc
 BuildRequires:  jakarta-commons-logging-javadoc
+BuildRequires:  junit
 #BuildRequires:  jaxp = 1.3
 
 Requires:       jakarta-commons-logging >= 0:1.0.3
@@ -137,7 +138,7 @@
 rm -f src/test/org/apache/commons/httpclient/params/TestSSLTunnelParams.java
 
 %build
-export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging)
+export CLASSPATH=%(build-classpath jsse jce junit jakarta-commons-codec jakarta-commons-logging junit)
 ant \
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:03:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:03:51 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.13, 1.14
Message-ID: <200607202303.k6KN3p72032143@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32014

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:

Set failonerror=false because certain tests are expected to have errors on brew.




Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jakarta-commons-httpclient.spec	20 Jul 2006 22:53:20 -0000	1.13
+++ jakarta-commons-httpclient.spec	20 Jul 2006 23:03:48 -0000	1.14
@@ -143,6 +143,7 @@
   -Dbuild.sysclasspath=first \
   -Djavadoc.j2sdk.link=%{_javadocdir}/java \
   -Djavadoc.logging.link=%{_javadocdir}/jakarta-commons-logging \
+  -Dtest.failonerror=false \
   dist test
 
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:08:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:08:46 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.17, 1.18
Message-ID: <200607202308.k6KN8kB7000753@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv669

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:
Merge with upstream version
Natively compile package



Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-taglibs-standard.spec	18 Jul 2006 19:52:57 -0000	1.17
+++ jakarta-taglibs-standard.spec	20 Jul 2006 23:08:43 -0000	1.18
@@ -1,26 +1,58 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define base_name       standard
 %define short_name      taglibs-%{base_name}
-%define name            jakarta-%{short_name}
-%define section         free
 %define jversion	1.1.1
-%define version		1.1.1
-%define release 	4jpp_6fc
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+%define section         free
+
+Name:           jakarta-taglibs-standard
+Version:        1.1.1
+Release:        6jpp_1fc
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        Apache Software License
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 URL:            http://jakarta.apache.org/taglibs/
 Source:         http://www.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{jversion}-src.tar.gz
 Patch0:		jakarta-taglibs-standard-%{version}-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRequires:  jpackage-utils >= 0:1.5.30
 BuildRequires:  ant
 BuildRequires:  servletapi5 >= 0:5.0.16
@@ -30,6 +62,12 @@
 Requires:       tomcat5-jsp-2.0-api >= 0:5.0.16
 Requires:       xalan-j2 >= 2.6.0
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 This directory contains releases for the 1.1.x versions of the Standard
 Tag Library, Jakarta Taglibs's open-source implementation of the JSP
@@ -40,7 +78,6 @@
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 BuildRequires:  java-javadoc
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -82,6 +119,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,11 +132,32 @@
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-taglibs-core-1.1.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-taglibs-standard-1.1.1.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -103,29 +165,17 @@
 
 
 %changelog
-* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_6fc
-- Build on all archs.
-
-* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1.1-4jpp_5fc
-- Add missing BuildRequires for tomcat5-jsp-2.0-api and xalan-j2
-
-* Wed Mar  8 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.1-4jpp_4fc
-- excluded s390[x] and ppc64 due to eclipse
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1.1-4jpp_3fc
-- stop scriptlet spew
-
-* Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1.1-4jpp_2fc
-- rebuilt again
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.1.1-6jpp_1fc
+- Merge with upstream version
+- Natively compile package
+
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.1.1-6jpp
+- Add conditional native compilation
+- Add missing BuildRequires and Requires for tomcat5-jsp-2.0-api and xalan-j2
+  (from Deepak Bhole <dbhole at redhat.com>)
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.1.1-4jpp_1fc
-- Build into Fedora.
-
-* Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-4jpp_1rh
-- Merge with upstream for new version
+* Thu Apr 27 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-5jpp
+- First JPP 1.7 build
 
 * Fri Oct 22 2004 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-4jpp
 - Rebuild to replace incorrect patch file
@@ -139,9 +189,6 @@
 * Tue Jul 27 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.1.1-1jpp
 - 1.1.1
 
-* Tue Apr 13 2004 Fernando Nasser <fnasser at redhat.com> 0:1.1.0-1jpp_2rh
-- Remove hack for 1.3 Java that would break building with an IBM SDK.
-
 * Tue Feb 17 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.1.0-1jpp
 - 1.1.0 final
 



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:24:58 -0400
Subject: rpms/jdepend/devel jdepend.spec,1.15,1.16
Message-ID: <200607202324.k6KNOwq2020096@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/jdepend/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19951

Modified Files:
	jdepend.spec 
Log Message:
Merge with upstream version
Natively compile packages



Index: jdepend.spec
===================================================================
RCS file: /cvs/dist/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jdepend.spec	12 Jul 2006 17:24:01 -0000	1.15
+++ jdepend.spec	20 Jul 2006 23:24:55 -0000	1.16
@@ -1,21 +1,60 @@
-%define name		jdepend
-%define version		2.6
-%define release 2jpp_4fc.1.1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}.1.1
+Name:		jdepend
+Version:	2.6
+Release:	5jpp_1fc
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
 Url:            http://www.clarkware.com/
 Group:          Development/Libraries/Java
-Source0:        %{name}-%{version}-RHCLEAN.zip
+Source0:        %{url}software/%{name}-%{version}-RHCLEAN.zip
 BuildRequires:  ant
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JDepend traverses a set of Java class and source file directories and
 generates design quality metrics for each Java package. JDepend allows
@@ -62,14 +101,38 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jdepend-2.6.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
@@ -79,23 +142,18 @@
 %{_datadir}/%{name}
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6-2jpp_4fc.1.1.1.1
-- rebuild
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0:2.6-2jpp_4fc
-- Remove jarfile from the tarball.
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-5jpp_1fc
+- Merge with upstream version
+- Natively compile packages
 
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:2.6-2jpp_3fc
-- Reenable building of classes that require javax.swing (#130006).
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-5jpp
+- Add conditional native compiling
 
-* Wed Nov  3 2004 Gary Benson <gbenson at redhat.com> 0:2.6-2jpp_2fc
-- Build into Fedora.
+* Wed May 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.6-4jpp
+- First JPP 1.7 build
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:2.6-2jpp_1rh
-- RH vacuuming
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.6-3jpp
+- Rebuild with ant-1.6.2
 
 * Fri Apr 11 2003 David Walluck <david at anti-microsoft.org> 0:2.6-2jpp
 - fix strange permissions



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:33:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:33:58 -0400
Subject: rpms/jakarta-commons-pool/devel pom-maven2jpp-depcat.xsl, NONE,
	1.1 pom-maven2jpp-mapdeps.xsl, NONE,
	1.1 pom-maven2jpp-newdepmap.xsl, NONE,
	1.1 pool-1.3-jpp-depmap.xml, NONE, 1.1 .cvsignore, 1.5,
	1.6 jakarta-commons-pool.spec, 1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200607202333.k6KNXwHF022946@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22711

Modified Files:
	.cvsignore jakarta-commons-pool.spec sources 
Added Files:
	pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl 
	pom-maven2jpp-newdepmap.xsl pool-1.3-jpp-depmap.xml 
Log Message:

Added conditional native compilation.




--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="*[name() != 'dependencies']|*/text()">
     <xsl:apply-templates/>
 </xsl:template>
 <xsl:template match="//dependencies">
  <xsl:for-each select="./dependency">
   <xsl:element name="dependency">
    <xsl:element name="maven">
     <xsl:choose>
      <xsl:when test="./groupId">
       <xsl:copy-of select="./groupId"/>
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-before(./id/text(),':') != ''">
         <xsl:element name="groupId">
          <xsl:value-of select="substring-before(./id/text(),':')"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="groupId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
    <xsl:element name="jpp">
     <xsl:element name="groupId">JPP</xsl:element>
     <xsl:choose>
      <xsl:when test="./artifactId">
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-after(./id/text(),':') != ''">
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:element name="jar">
      <xsl:choose>
       <xsl:when test="./artifactId">
        <xsl:value-of select="./artifactId/text()"/>
       </xsl:when>
       <xsl:when test="./id">
        <xsl:choose>
         <xsl:when test="substring-after(./id/text(),':') != ''">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:when>
         <xsl:otherwise>
          <xsl:value-of select="./id/text()"/>
         </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
ERROR
       </xsl:otherwise>
      </xsl:choose>
      <xsl:choose>
       <xsl:when test="./type">
        <xsl:choose>
         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>.jar</xsl:otherwise>
      </xsl:choose>
     </xsl:element>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
   </xsl:element>
  </xsl:for-each>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:param name="map" /> 
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/project" >
  <xsl:element name="project">
   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
   <xsl:if test="not(./dependencies)">
    <xsl:element name="dependencies">
     <xsl:for-each select="document($map)//add/dependency">
       <xsl:copy-of select="."/>
     </xsl:for-each>
    </xsl:element>
   </xsl:if>
   <xsl:apply-templates select="dependencies"/>
  </xsl:element>
 </xsl:template>
 <xsl:template match="dependencies" >
  <xsl:element name="dependencies">
   <xsl:for-each select="dependency">
    <xsl:if test="./artifactId">
     <xsl:call-template name="replace">
      <xsl:with-param name="artifact" select="./artifactId/text()"/>
     </xsl:call-template>
    </xsl:if>
    <xsl:if test="./id">
     <xsl:choose>
      <xsl:when test="substring-after(./id/text(),':') != ''">
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
       </xsl:call-template>
      </xsl:when>
      <xsl:otherwise>
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="./id/text()"/>
       </xsl:call-template>
      </xsl:otherwise>
     </xsl:choose>
    </xsl:if>
   </xsl:for-each>
   <xsl:for-each select="document($map)//add/dependency">
    <xsl:copy-of select="."/>
   </xsl:for-each>
  </xsl:element>
 </xsl:template>
 <xsl:template name="replace">
  <xsl:param name="artifact"/>
  <xsl:variable name="this" select="."/>
   <xsl:choose>
    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
      <xsl:if test="../jpp">
       <xsl:element name="dependency">
        <xsl:copy-of select="../jpp/*"/>
        <xsl:copy-of select="$this/properties"/>
       </xsl:element>
      </xsl:if>
     </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
     <xsl:element name="dependency">
      <xsl:copy-of select="./*"/>
     </xsl:element>
    </xsl:otherwise>
   </xsl:choose>
  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
    <xsl:for-each select="../add/dependency">
     <xsl:element name="dependency">
      <xsl:copy-of select="./*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:element>
    </xsl:for-each>
   </xsl:for-each>
  </xsl:if>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
	xmlns:saxon="http://icl.com/saxon"
	extension-element-prefixes="saxon">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/" >
  <xsl:element name="depset">
   <saxon:group select="//dependency" group-by="./maven/artifactId">
    <xsl:sort select="./maven/artifactId"/>
    <xsl:element name="dependency">
     <xsl:element name="maven">
      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
     </xsl:element>
     <xsl:element name="jpp">
      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
     </xsl:element>
    </xsl:element>
    <saxon:item/>
   </saxon:group>
  </xsl:element>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pool-1.3-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit</artifactId>
         <jar>junit.jar</jar>
         <version>3.8.1</version>
      </jpp>
   </dependency>
   <dependency>
      <maven>
         <groupId>maven</groupId>
         <artifactId>maven-changes-plugin</artifactId>
         <version>1.6</version>
         <url>http://maven.apache.org/maven-1.x/plugins/changes/</url>
         <type>plugin</type>
      </maven>
   </dependency>
   <dependency>
      <maven>
         <groupId>maven</groupId>
         <artifactId>maven-jdiff-plugin</artifactId>
         <version>1.5</version>
         <url>http://maven.apache.org/maven-1.x/plugins/jdiff/</url>
         <type>plugin</type>
      </maven>
   </dependency>
   <dependency>
      <maven>
         <groupId>maven</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <version>1.7</version>
         <url>http://maven.apache.org/maven-1.x/plugins/plugin/</url>
         <type>plugin</type>
      </maven>
   </dependency>
   <dependency>
      <maven>
         <groupId>maven</groupId>
         <artifactId>maven-scm-plugin</artifactId>
         <version>1.5</version>
         <url>http://maven.apache.org/maven-1.x/plugins/scm/</url>
         <type>plugin</type>
      </maven>
   </dependency>
</depset>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 14:18:28 -0000	1.5
+++ .cvsignore	20 Jul 2006 23:33:55 -0000	1.6
@@ -1,4 +1,2 @@
-commons-pool-1.2-src-RHCLEAN.tar.bz2
-commons-pool-1.2
-noarch
-*.src.rpm
+commons-build.tar.gz
+commons-pool-1.3-src-RHCLEAN.tar.gz


Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-pool.spec	12 Jul 2006 06:29:34 -0000	1.11
+++ jakarta-commons-pool.spec	20 Jul 2006 23:33:55 -0000	1.12
@@ -1,27 +1,84 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _without_maven 1
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
 %define base_name	pool
 %define short_name	commons-%{base_name}
-%define name		jakarta-%{short_name}
-%define version		1.2
-%define release 	2jpp_5fc
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		jakarta-commons-pool
+Version:	1.3
+Release:	2jpp_1fc
 Epoch:		0
 Summary:	Jakarta Commons Pool Package
-License:	Apache Software License
+License:	Apache Software License 2.0
 Group:		Development/Libraries/Java
-Source0:	commons-pool-%{version}-src-RHCLEAN.tar.bz2
+# http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-%{version}-src.tar.gz
+Source0:	    commons-pool-%{version}-src-RHCLEAN.tar.gz
+Source1:        pom-maven2jpp-depcat.xsl
+Source2:        pom-maven2jpp-newdepmap.xsl
+Source3:        pom-maven2jpp-mapdeps.xsl
+Source4:        %{base_name}-%{version}-jpp-depmap.xml
+Source5:        commons-build.tar.gz
+
 Url:		http://jakarta.apache.org/commons/%{base_name}/
 BuildRequires:	ant
-BuildRequires:	jakarta-commons-collections >= 0:2.0
-BuildRequires:  jpackage-utils > 0:1.5
-Requires:	jakarta-commons-collections >= 0:2.0
+BuildRequires:	junit
+BuildRequires:  jpackage-utils > 0:1.6
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+BuildRequires:  saxon
+BuildRequires:  saxon-scripts
+%endif
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
-# FC2
-Obsoletes:	%{short_name} <= 1.1
+Provides:	%{short_name}
+Obsoletes:	%{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The goal of Pool package it to create and maintain an object 
@@ -33,31 +90,82 @@
 %package javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
 
+%if %{with_maven}
+%package manual
+Summary:        Documents for %{name}
+Group:          Development/Documentation
+
+%description manual
+%{summary}.
+%endif
+
 %prep
+cat <<EOT
+
+                If you dont want to build with maven,
+                give rpmbuild option '--without maven'
+
+EOT
+
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-src
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
+gzip -dc %{SOURCE5} | tar xf -
+
 
 %build
 mkdir ./tmp
-export CLASSPATH=%(build-classpath commons-collections)
+%if %{with_maven}
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    cp project.xml project.xml.orig
+    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+    popd
+done
+
+maven \
+        -Dmaven.javadoc.source=1.4 \
+        -Dmaven.repo.remote=file:/usr/share/maven/repository \
+        -Dmaven.home.local=$(pwd)/.maven \
+        jar javadoc xdoc:transform
+%else
 ant -Djava.io.tmpdir=. clean dist
+%endif
 
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%if %{with_maven}
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%else
+install -m 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%endif
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|jakarta-||g"`; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -rf target/docs/apidocs
+%else
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+
+%if %{with_maven}
+# manual
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%endif
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,49 +179,59 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc README.txt LICENSE.txt
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2-2jpp_5fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2-2jpp_4fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2-2jpp_3fc
-- rebuilt again
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:1.2-2jpp_2fc
-- Remove jarfile from the tarball.
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
+%endif
 
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.2-2jpp_1fc
-- Build into Fedora.
+%changelog
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.3-2jpp_1fc
+- Added conditional native compilation.
 
-* Tue Nov 23 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.2-2jpp_1rh
-- Merge with upstream for upgrade
+* Wed Apr 12 2006 Randy Watler <rwatler at finali.com> - 0:1.3-1jpp
+- Upgrade to 1.3
+- First JPP-1.7 release
+- Build with maven by default
+- Add option to build with straight ant
+- Add -manual subpackage when built with maven
+- This version doesn't require commons-collections
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.2-2jpp
 - Rebuild with ant-1.6.2
-
 * Thu Jun 24 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:1.2-1jpp
 - Update to 1.2 (tomcat 5.0.27 wants it)
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1-1jpp_1rh
-- RH vacuuming
-
 * Mon Oct 27 2003 Henri Gomez <hgomez at users.sourceforge.net>  0:1.1-1jpp
 - commons-pool 1.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2005 14:18:28 -0000	1.4
+++ sources	20 Jul 2006 23:33:55 -0000	1.5
@@ -1 +1,2 @@
-e99b9f75ab2cdb5e36b961ec630fa524  commons-pool-1.2-src-RHCLEAN.tar.bz2
+a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz
+c958a49e4e12dd9288d72f1ba2de7ed6  commons-pool-1.3-src-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:42:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:42:27 -0400
Subject: rpms/jakarta-commons-dbcp/devel .cvsignore, 1.5,
	1.6 jakarta-commons-dbcp.spec, 1.16, 1.17 sources, 1.4,
	1.5 commons-build.tar.gz, 1.1, NONE
Message-ID: <200607202342.k6KNgRuG024849@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23512

Modified Files:
	.cvsignore jakarta-commons-dbcp.spec sources 
Removed Files:
	commons-build.tar.gz 
Log Message:

Moved a binary to lookaside repo.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jun 2005 13:26:07 -0000	1.5
+++ .cvsignore	20 Jul 2006 23:42:25 -0000	1.6
@@ -1,4 +1,2 @@
 commons-dbcp-1.2.1-src-RHCLEAN.tar.bz2
-commons-dbcp-1.2.1
-noarch
-*.src.rpm
+commons-build.tar.gz


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jakarta-commons-dbcp.spec	20 Jul 2006 22:18:16 -0000	1.16
+++ jakarta-commons-dbcp.spec	20 Jul 2006 23:42:25 -0000	1.17
@@ -281,6 +281,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_2fc
+- Rebuild.
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_1fc
 - Added conditional native compilation.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2005 13:26:07 -0000	1.4
+++ sources	20 Jul 2006 23:42:25 -0000	1.5
@@ -1 +1,2 @@
 e278f00dcafddaead0caa5c1ba991b1b  commons-dbcp-1.2.1-src-RHCLEAN.tar.bz2
+a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz


--- commons-build.tar.gz DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:42:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:42:29 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.298,1.299 sources,1.34,1.35
Message-ID: <200607202342.k6KNgTAE024868@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24752

Modified Files:
	eclipse.spec sources 
Log Message:
* Thu Jul 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_5fc
- New splash screen from Diana Fong (rh#199456).



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- eclipse.spec	19 Jul 2006 02:44:16 -0000	1.298
+++ eclipse.spec	20 Jul 2006 23:42:25 -0000	1.299
@@ -41,7 +41,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/
@@ -1634,6 +1634,9 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_5fc
+- New splash screen from Diana Fong (rh#199456).
+
 * Tue Jul 18 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_4fc
 - Add patch from Tom Tromey for ecj-gcj branch of gcj.
 - Fix SWT symlinks.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	4 Jul 2006 21:27:47 -0000	1.34
+++ sources	20 Jul 2006 23:42:26 -0000	1.35
@@ -1,2 +1,2 @@
 67b41802092d4b2f779fb756dcaec85c  eclipse-sourceBuild-srcIncluded-3.2.zip
-5839c46d1080ddd08d3de669e2091189  eclipse-fedora-splash-3.2.png
+a86209ba94fc9ccdda63a781bd4ea0d8  eclipse-fedora-splash-3.2.png



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:47:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:47:53 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.17,
	1.18
Message-ID: <200607202347.k6KNlrtE008783@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8725

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:

Bumped release.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-dbcp.spec	20 Jul 2006 23:42:25 -0000	1.17
+++ jakarta-commons-dbcp.spec	20 Jul 2006 23:47:50 -0000	1.18
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	5jpp_1fc
+Release:	5jpp_2fc
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0



From fedora-cvs-commits at redhat.com  Thu Jul 20 23:56:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 19:56:51 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.18,
	1.19
Message-ID: <200607202356.k6KNupEw011956@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11875

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:


Set failonerror=false.




Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-commons-dbcp.spec	20 Jul 2006 23:47:50 -0000	1.18
+++ jakarta-commons-dbcp.spec	20 Jul 2006 23:56:49 -0000	1.19
@@ -180,6 +180,7 @@
         jar javadoc xdoc:transform
 %else
 
+# FIXME: There are some failures with no specific pattern.
 export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2)
 ant \
 	-Dbuild.sysclasspath=first \
@@ -189,6 +190,7 @@
 	-Djndi.jar=$(build-classpath jndi) \
 	-Dsax2.jar=$(build-classpath xml-commons-apis) \
 	-Djava.io.tmpdir=. \
+    -Dtest.failonerror=false \
 	dist test
 %endif
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 00:18:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 20:18:47 -0400
Subject: rpms/jrefactory/devel jrefactory-2.8.9-fixcrlf.patch, NONE,
	1.1 jrefactory.spec, 1.9, 1.10 jrefactory-htmleditorkit.patch,
	1.1, NONE jrefactory-pr21880.patch, 1.1, NONE
Message-ID: <200607210018.k6L0IlKg032141@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jrefactory/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27278

Modified Files:
	jrefactory.spec 
Added Files:
	jrefactory-2.8.9-fixcrlf.patch 
Removed Files:
	jrefactory-htmleditorkit.patch jrefactory-pr21880.patch 
Log Message:

- Added conditional native compilation.
- From gbenson at redhat:
-    Remove classes that don't build without said jarfiles.
-    Avoid Sun-specific classes.



jrefactory-2.8.9-fixcrlf.patch:
 Pretty.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletion(-)

--- NEW FILE jrefactory-2.8.9-fixcrlf.patch ---
--- src/org/acm/seguin/ant/Pretty.java.fixcrlf	2003-08-28 19:42:38.000000000 +0200
+++ src/org/acm/seguin/ant/Pretty.java	2005-04-19 19:03:23.776430224 +0200
@@ -166,7 +166,20 @@
    private void configureFixCrlfTask( FixCRLF fixcrlf_task ) {
       fixcrlf_task.setOwningTarget( getOwningTarget() );
       FixCRLF.CrLf eol = new FixCRLF.CrLf();
-      eol.setValue("cr");
+      FileSettings prettySettings = FileSettings.getRefactoryPrettySettings();
+      String lineEnding = prettySettings.getString("end.line");
+      if (lineEnding==null || lineEnding.length()==0) {
+          lineEnding = "asis";
+      } else {
+          lineEnding = lineEnding.toLowerCase();
+          //handle legacy use of obsolete "nl" and "crnl" config values
+          if (lineEnding.equals("nl")) {
+              lineEnding = "lf";
+          } else if (lineEnding.equals("crnl")) {
+              lineEnding = "crlf";
+          }
+      }
+      eol.setValue(lineEnding);
       fixcrlf_task.setEol(eol);
    }
 


Index: jrefactory.spec
===================================================================
RCS file: /cvs/dist/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jrefactory.spec	12 Jul 2006 06:35:14 -0000	1.9
+++ jrefactory.spec	21 Jul 2006 00:18:43 -0000	1.10
@@ -1,38 +1,73 @@
-%define	name	jrefactory
-%define	version	2.8.9
-%define release 3jpp_1fc.1.1
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define	section	devel
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}.1.1
+Name:		jrefactory
+Version:	2.8.9
+Release:	6jpp_1fc
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
 Group:		Development/Libraries/Java
 Source0:	%{name}-%{version}-full-RHCLEAN.zip
-Patch0:		%{name}-pr21880.patch
-Patch1:		%{name}-htmleditorkit.patch
-Patch2:		%{name}-savejpg.patch
+Patch0:	jrefactory-2.8.9-fixcrlf.patch
+Patch1: jrefactory-savejpg.patch
 Url:		http://jrefactory.sourceforge.net/
-BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	ant
+BuildRequires:	jpackage-utils >= 0:1.5
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JRefactory provides a variety of refactoring and pretty printing tools
 
 %prep
 %setup -q -c -n %{name}
 mv settings/.Refactory settings/sample
-%patch0 -p1
+%patch0 -p0 -b .fixcrlf
 %patch1 -p1
-%patch2 -p1
-rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
 
-# clean jarfiles
-find . -name "*.jar" -exec rm -f {} \;
+rm -f src/org/acm/seguin/pmd/swingui/PMDLookAndFeel.java
 
 # remove classes that don't build without said jarfiles
 find -name '*.java' | \
@@ -51,34 +86,50 @@
 
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0664,root,root,0755)
 %doc docs/{*.html,*.jpg,*.gif,*.txt} settings/sample
 %{_javadir}/*
 
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.8.9-3jpp_1fc.1.1.1.1
-- rebuild
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:2.8.9-3jpp_1fc
-- Build into Fedora.
-
-* Wed Jun  8 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
-- Remove classes that don't build without said jarfiles.
+%changelog
+* Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp_1fc
+- Added conditional native compilation.
+- From gbenson at redhat:
+-    Remove classes that don't build without said jarfiles.
+-    Avoid Sun-specific classes.
 
-* Thu Jun  2 2005 Gary Benson <gbenson at redhat.com>
-- Avoid some API holes in libgcj's Swing implementation.
-- Avoid Sun-specific classes.
+* Fri Apr 28 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.8.9-5jpp
+- First JPP 1.7 build
 
-* Fri Oct 15 2004 Fernando Nasser <fnasser at redhat.com> - 0:2.8.9-3jpp_1rh
-- First Red Hat build
+* Tue Apr 19 2005 Ralph Apel <r.apel at r-apel.de> - 0:2.8.9-4jpp
+- Patch to fix CRLF problem; THX to Richard Bullington-McGuire
 
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:2.8.9-3jpp
 - Rebuild with ant-1.6.2


--- jrefactory-htmleditorkit.patch DELETED ---


--- jrefactory-pr21880.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 21 01:20:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 21:20:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2429,
	1.2430 linux-2.6-utrace.patch, 1.6, 1.7
Message-ID: <200607210120.k6L1KQKj020292@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5408

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
* Thu Jul 20 2006 Roland McGrath <roland at redhat.com>
- Clean up spec changes for debuginfo generation to cover Xen case.
- New version of utrace patch, fixes /proc permissions. (#199014)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2429
retrieving revision 1.2430
diff -u -r1.2429 -r1.2430
--- kernel-2.6.spec	20 Jul 2006 18:05:47 -0000	1.2429
+++ kernel-2.6.spec	21 Jul 2006 01:20:21 -0000	1.2430
@@ -1086,7 +1086,7 @@
 
     # Create the kABI metadata for use in packaging
     echo "**** GENERATING kernel ABI metadata ****"
-    gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz 
+    gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
     chmod 0755 %_sourcedir/kabitool
     if [ ! -e $RPM_SOURCE_DIR/kabi_whitelist ]; then
         %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -k $KernelVer -l -w $RPM_BUILD_ROOT/kabi_whitelist
@@ -1294,6 +1294,7 @@
 #				may be empty
 # Second argument, optional:	subpackage name (e.g. smp)
 # Third argument, optional:	suffix in %1 dir, if not -%2 (e.g. -PAE)
+# Fourth argument, optional:	glob of extra ELF files (e.g. boot/xen*-V-R)
 %define build_debuginfo() \
 %if "%{_enable_debug_packages}" == "1"\
 %ifnarch noarch\
@@ -1312,8 +1313,8 @@
 %endif\
 /usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
 /usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
-%if "%{?2}" == "xen" \
-/usr/lib/debug/boot/xen-syms-%{KVERREL}.debug\
+%if "%{?4}" != ""\
+/usr/lib/debug/%{?4}.debug\
 %endif\
 %endif\
 %endif\
@@ -1465,8 +1466,12 @@
 ### file lists
 ###
 
+# This is %{image_install_path} on an arch where that includes ELF files,
+# or empty otherwise.
+%define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
+
 %if %{buildup}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}}
+%build_debuginfo %{elf_image_install_path}
 %files
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1494,7 +1499,7 @@
 %endif
 
 %if %{buildpae}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} PAE
+%build_debuginfo %{elf_image_install_path} PAE
 %files PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1517,7 +1522,7 @@
 %endif
 
 %if %{buildsmp}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} smp
+%build_debuginfo %{elf_image_install_path} smp
 %files smp
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1541,7 +1546,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} xen
+%build_debuginfo %{elf_image_install_path} xen xen boot/xen*-%{KVERREL}
 %files xen
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1569,6 +1574,7 @@
 %endif
 
 %if %{buildkdump}
+# The kdump kernel is always installed as an ELF file in %{image_install_path}.
 %build_debuginfo %{image_install_path} kdump
 %files kdump
 %defattr(-,root,root)
@@ -1602,6 +1608,10 @@
 %endif
 
 %changelog
+* Thu Jul 20 2006 Roland McGrath <roland at redhat.com>
+- Clean up spec changes for debuginfo generation to cover Xen case.
+- New version of utrace patch, fixes /proc permissions. (#199014)
+
 * Thu Jul 20 2006 Juan Quintela <quintela at anano.mitica>
 - remove xenPAE option, as now the i686 xen kernel is PAE.
 
@@ -1617,11 +1627,11 @@
 * Wed Jul 19 2006 Don Zickus <dzickus at redhat.com>
 - Add in support for nfs superblock sharing and cachefs
   patches from David Howells
-- Disable 'make prepare' hack as it is breaking ppc symlinks  
+- Disable 'make prepare' hack as it is breaking ppc symlinks
 - Added tracking dirty pages patch from Peter Zijlstra
 - Fix for Opteron timer scaling
 - Fix for Calgary pci hang
-  
+
 * Wed Jul 19 2006 Juan Quintela <quintela at redhat>
 - big xen patch.
 - enable xen again.

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   82 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1470 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1477 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6853 insertions(+), 3188 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace.patch	19 Jul 2006 12:45:49 -0000	1.6
+++ linux-2.6-utrace.patch	21 Jul 2006 01:20:23 -0000	1.7
@@ -53,7 +53,7 @@
  fs/binfmt_som.c                         |    2 
  fs/exec.c                               |   11 
  fs/proc/array.c                         |    7 
- fs/proc/base.c                          |   18 
+ fs/proc/base.c                          |   17 
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
@@ -77,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1477 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6847 insertions(+), 3185 deletions(-)
+ 79 files changed, 6848 insertions(+), 3183 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -6507,48 +6507,33 @@
  static int proc_pid_environ(struct task_struct *task, char * buffer)
  {
  	int res = 0;
-@@ -421,7 +415,7 @@ static int proc_pid_environ(struct task_
- 		if (len > PAGE_SIZE)
- 			len = PAGE_SIZE;
- 		res = access_process_vm(task, mm->env_start, buffer, len, 0);
--		if (!ptrace_may_attach(task))
-+		if (!tracehook_allow_access_process_vm(task))
- 			res = -ESRCH;
- 		mmput(mm);
- 	}
-@@ -545,7 +539,7 @@ static int proc_fd_access_allowed(struct
- 	 */
- 	task = get_proc_task(inode);
- 	if (task) {
--		allowed = ptrace_may_attach(task);
-+		allowed = tracehook_allow_access_process_vm(task);
- 		put_task_struct(task);
- 	}
- 	return allowed;
-@@ -736,7 +730,7 @@ static ssize_t mem_read(struct file * fi
+@@ -736,7 +730,8 @@ static ssize_t mem_read(struct file * fi
  	if (!task)
  		goto out_no_task;
  
 -	if (!MAY_PTRACE(task) || !ptrace_may_attach(task))
-+	if (!tracehook_allow_access_process_vm(task))
++	if (!tracehook_allow_access_process_vm(task)
++	    || !ptrace_may_attach(task))
  		goto out;
  
  	ret = -ENOMEM;
-@@ -762,7 +756,7 @@ static ssize_t mem_read(struct file * fi
+@@ -762,7 +757,8 @@ static ssize_t mem_read(struct file * fi
  
  		this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
  		retval = access_process_vm(task, src, page, this_len, 0);
 -		if (!retval || !MAY_PTRACE(task) || !ptrace_may_attach(task)) {
-+		if (!retval || !tracehook_allow_access_process_vm(task)) {
++		if (!retval || !tracehook_allow_access_process_vm(task)
++		    || !ptrace_may_attach(task)) {
  			if (!ret)
  				ret = -EIO;
  			break;
-@@ -806,7 +800,7 @@ static ssize_t mem_write(struct file * f
+@@ -806,7 +802,8 @@ static ssize_t mem_write(struct file * f
  	if (!task)
  		goto out_no_task;
  
 -	if (!MAY_PTRACE(task) || !ptrace_may_attach(task))
-+	if (!tracehook_allow_access_process_vm(task))
++	if (!tracehook_allow_access_process_vm(task)
++	    || !ptrace_may_attach(task))
  		goto out;
  
  	copied = -ENOMEM;



From fedora-cvs-commits at redhat.com  Fri Jul 21 02:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 22:01:27 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch,
	NONE, 1.1 vixie-cron-4.1-_54_bz198019_database_changes.patch,
	NONE, 1.1 vixie-cron.spec, 1.71, 1.72
Message-ID: <200607210201.k6L21Rbt003000@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2981

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_53_bz199294_selinux_mls.patch 
	vixie-cron-4.1-_54_bz198019_database_changes.patch 
Log Message:
fix bugs 198019, 199294

vixie-cron-4.1-_53_bz199294_selinux_mls.patch:
 crontab.1  |    8 ++
 crontab.5  |   13 +++
 crontab.c  |   52 ++++++++++----
 funcs.h    |    4 -
 security.c |  219 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 5 files changed, 242 insertions(+), 54 deletions(-)

--- NEW FILE vixie-cron-4.1-_53_bz199294_selinux_mls.patch ---
--- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
+++ vixie-cron-4.1/crontab.c	2006-07-20 20:10:27.000000000 -0400
@@ -43,10 +43,19 @@
 
 #if DEBUGGING
 static char	*Options[] = { "???", "list", "delete", "edit", "replace" };
+#   ifdef WITH_SELINUX
+static char	*getoptargs = "u:lerisx:";
+#   else
 static char	*getoptargs = "u:lerix:";
+#   endif
 #else
+#   ifdef WITH_SELINUX
+static char	*getoptargs = "u:leris";
+#   else
 static char	*getoptargs = "u:leri";
+#   endif
 #endif
+static char     *selinux_context = 0;
 
 static	PID_T		Pid;
 static	char		User[MAX_UNAME], RealUser[MAX_UNAME];
@@ -75,6 +84,9 @@
 	fprintf(stderr, "\t-l\t(list user's crontab)\n");
 	fprintf(stderr, "\t-r\t(delete user's crontab)\n");
 	fprintf(stderr, "\t-i\t(prompt before deleting user's crontab)\n");
+#ifdef WITH_SELINUX
+	fprintf(stderr, "\t-s\t(selinux context)\n");
+#endif
 	exit(ERROR_EXIT);
 }
 
@@ -198,6 +210,16 @@
 		case 'i':
        		        PromptOnDelete = 1;
 			break;
+#ifdef WITH_SELINUX
+	        case 's':
+		        if ( getprevcon( (security_context_t*)&(selinux_context) ) ) 
+			{
+				fprintf(stderr,
+					"Cannot obtain SELinux process context\n");
+				exit(ERROR_EXIT);
+			}
+			break;
+#endif 
 		default:
 			usage("unrecognized option");
 		}
@@ -317,7 +339,7 @@
 edit_cmd(void) {
 	char n[MAX_FNAME], q[MAX_TEMPSTR], *editor;
 	FILE *f;
-	int ch='\0', t, x;
+	int ch='\0', t;
 	struct stat statbuf;
 	struct utimbuf utimebuf;
 	WAIT_T waiter;
@@ -379,26 +401,22 @@
 	}
 
 	Set_LineNum(1)
-
-	/* ignore the top NHEADER_LINES comment lines since we put them there.
+	/* 
+	 * NHEADER_LINES processing removed for clarity
+	 * (NHEADER_LINES == 0 in all Red Hat crontabs)
 	 */
-	x = 0;
-	while ((x < NHEADER_LINES) && (EOF != (ch = get_char(f)))) {
-		if ('#' != ch) {
-			putc(ch, NewCrontab);
-			break;
-		}
-		while (EOF != (ch = get_char(f)))
-			if (ch == '\n')
-				break;
-		++x;
-	}
-
+	
 	/* copy the rest of the crontab (if any) to the temp file.
 	 */
 	if (EOF != ch)
 		while (EOF != (ch = get_char(f)))
 			putc(ch, NewCrontab);
+
+#ifdef WITH_SELINUX
+	if ( selinux_context )
+		fprintf(NewCrontab,"SELINUX_ROLE_TYPE=%s\n", selinux_context);
+#endif
+
 	fclose(f);
 	if (fflush(NewCrontab) < OK) {
 		perror(Filename);
@@ -610,6 +628,10 @@
 	 *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now));
 	 *fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, rcsid);
 	 */
+#ifdef WITH_SELINUX
+	if ( selinux_context )
+		fprintf(tmp,"SELINUX_ROLE_TYPE=%s\n", selinux_context);
+#endif
 
 	/* copy the crontab to the tmp
 	 */
--- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 20:10:27.000000000 -0400
+++ vixie-cron-4.1/funcs.h	2006-07-20 20:10:27.000000000 -0400
@@ -88,7 +88,9 @@
 
 int cron_change_user( struct passwd *pw );
 
-int cron_change_selinux_context( user *u );
+int cron_get_job_context( user *u, void *scontextp, void *file_contextp, char **envp );
+
+int cron_change_selinux_context( user *, void *scontext, void *file_context );
 
 int get_security_context(const char *name, 
 			 int crontab_fd, 
--- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 20:10:26.000000000 -0400
+++ vixie-cron-4.1/crontab.1	2006-07-20 20:10:27.000000000 -0400
@@ -32,6 +32,7 @@
 .RB [ -u
 .IR user ]
 .RB [ -l " | " -r " | " -e ] [ -i ]
+.RB [ -s ]
 .SH DESCRIPTION
 .I Crontab
 is the program used to install, deinstall or list the tables
@@ -89,6 +90,13 @@
 .I -i
 option modifies the -r option to prompt the user for a 'y/Y' response
 before actually removing the crontab.
+.PP
+The
+.I -s
+option will append the current SELinux security context string as an
+SELINUX_ROLE_TYPE setting to the crontab file before editing / replacement
+occurs - see the documentation of SELINUX_ROLE_TYPE in 
+.IR crontab(5) .
 .SH "SEE ALSO"
 crontab(5), cron(8)
 .SH FILES
--- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 20:10:27.000000000 -0400
+++ vixie-cron-4.1/crontab.5	2006-07-20 20:10:27.000000000 -0400
@@ -87,6 +87,19 @@
 setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
 to the correct values of the mail headers of those names.  
 .PP
+The SELINUX_ROLE_TYPE environment variable provides support for multiple per-job 
+SELinux security contexts in the same crontab.
+By default, cron jobs execute with the default SELinux security context of the 
+user that created the crontab file.
+When using multiple security levels and roles, this may not be sufficient, because
+the same user may be running in a different role or at a different security level.
+You can set SELINUX_ROLE_TYPE to the SELinux security context string specifying
+the SELinux security context in which you want the job to run, and crond will set 
+the execution context of the or jobs to which the setting applies to the specified 
+context.
+See also the 
+.IR crontab(1) -s option.
+.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,
--- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
+++ vixie-cron-4.1/security.c	2006-07-20 20:29:32.000000000 -0400
@@ -49,23 +49,49 @@
 	      );
 	return -1;
     }
-    
+
+    *jobenv = build_env( e->envp );
+
+#ifdef WITH_SELINUX
+
+    /* we must get the crontab context BEFORE changing user, else
+     * we'll not be permitted to read the cron spool directory :-)
+     */
+
+    security_context_t scontext=0, file_context=0; 
+
+    if ( cron_get_job_context(u, &scontext, &file_context, *jobenv) < OK )
+    {
+	syslog(LOG_ERR, "CRON (%s) ERROR: failed to get selinux context: %s", 
+	       e->pwd->pw_name, strerror(errno)
+	      );
+	return -1;
+    }
+
+#endif
+
     if ( cron_change_user( e->pwd ) != 0 )
     {
 	syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", 
 	       e->pwd->pw_name, strerror(errno)
 	      );
 	return -1;
-    }
-	
-    if ( cron_change_selinux_context( u ) != 0 )
+    }	
+
+    if ( cron_change_selinux_context( u, scontext, file_context ) != 0 )
     {
         syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", 
 	       e->pwd->pw_name);
+#if WITH_SELINUX
+	if ( file_context )
+		freecon(file_context);
+#endif
 	return -1;
     }
-
-    *jobenv = build_env( e->envp );
+#if WITH_SELINUX
+    if ( file_context )
+	freecon(file_context);
+#endif
 
     log_close();
     openlog(ProgramName, LOG_PID, LOG_CRON);
@@ -167,23 +193,145 @@
     return 0;
 }
 
-int cron_change_selinux_context( user *u )
+static int 
+cron_authorize_context
+( 
+	security_context_t scontext,
+	security_context_t file_context
+)	
 {
 #ifdef WITH_SELINUX
-    if ((is_selinux_enabled() >0) && (u->scontext != 0L)) {
-	if (setexeccon(u->scontext) < 0) {
-	    if (security_getenforce() > 0) {
-		syslog(LOG_INFO,
-		       "CRON (%s) ERROR:"
-		       "Could not set exec context to %s for user\n", 
-		       u->name, u->scontext
-		      );
+	struct av_decision avd;
+	int retval;
+	/*
+	 * Since crontab files are not directly executed,
+	 * crond must ensure that the crontab file has
+	 * a context that is appropriate for the context of
+	 * the user cron job.  It performs an entrypoint
+	 * permission check for this purpose.
+	 */
+	retval = security_compute_av(scontext,
+				     file_context,
+				     SECCLASS_FILE,
+				     FILE__ENTRYPOINT,
+				     &avd);
+
+	if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT))
+		return 0;
+#endif
+	return 1;
+}
+
+int cron_get_job_context( user *u, void *scontextp, void *file_contextp, char **jobenv )
+{
+#if WITH_SELINUX
+	char *sroletype;
+
+	if ( is_selinux_enabled() <= 0 )
+		return 0;
+	if ( (file_contextp == 0) || (scontextp == 0L) )
 		return -1;
-	    }
+
+	*((security_context_t*)scontextp) = u->scontext;
+	*((void **)file_contextp) = 0L;
+
+	if ( (sroletype = env_get("SELINUX_ROLE_TYPE",jobenv)) != 0L )
+	{
+	        *((security_context_t*)scontextp) = (security_context_t) sroletype;
+		
+		char crontab[MAX_FNAME];
+		if ( strcmp(u->name,"*system*") == 0 )
+			strncpy(crontab, u->tabname, MAX_FNAME);
+		else
+			snprintf(crontab, MAX_FNAME, "%s/%s", CRONDIR, u->tabname);
+
+		if ( getfilecon( crontab, file_contextp ) == -1 )
+		{		
+			if ( security_getenforce() > 0 ) 
+			{
+				log_it(u->name, 
+				       getpid(), "getfilecon FAILED for SELINUX_ROLE_TYPE", 
+				       sroletype
+				      );
+				return -1;
+			} else
+			if ( access( crontab, F_OK ) )
+				log_it(u->name,
+				       getpid(), 
+				       "getfilecon FAILED but SELinux in permissive mode, continuing "
+				       "- SELINUX_ROLE_TYPE=", sroletype
+				       );
+		}		       
 	}
-    }
 #endif
-    return 0;
+	return 0;
+}
+
+int cron_change_selinux_context( user *u, void *scontext, void *file_context )
+{
+#ifdef WITH_SELINUX
+	if ( is_selinux_enabled() <= 0 )
+		return 0;
+
+	if ( scontext == 0L )
+	{
+		if (security_getenforce() > 0) 
+		{
+			log_it( u->name, getpid(), 
+				"NULL security context for user", 
+				""
+			      );
+			return -1;
+		}else
+		{
+			log_it( u->name, getpid(), 
+				"NULL security context for user, "
+				"but SELinux in permissive mode, continuing",
+				""
+				);
+			return 0;
+		}
+	}
+	
+	if ( file_context )
+	{		
+		if ( ! cron_authorize_context( scontext, file_context ) )
+		{
+			if ( security_getenforce() > 0 ) 
+			{
+				syslog(LOG_ERR,
+				       "CRON (%s) ERROR:"
+				       "Unauthorized exec context to SELINUX_ROLE_TYPE %s for user", 
+				       u->name, (char*)scontext
+				      );
+				return -1;
+			} else
+			{
+				syslog(LOG_INFO,
+				       "CRON (%s) WARNING:"
+				       "Unauthorized exec context to SELINUX_ROLE_TYPE %s for user,"
+				       " but SELinux in permissive mode, continuing", 
+				       u->name, (char*)scontext
+				      );
+			}
+		}
+	} 
+
+	if ( setexeccon(scontext) < 0 ) 
+	{
+		if (security_getenforce() > 0) 
+		{
+			syslog(LOG_ERR,
+			       "CRON (%s) ERROR:"
+			       "Could not set exec context to %s for user", 
+			       u->name, (char*)scontext
+			      );
+
+			return -1;
+		}
+	}
+#endif
+	return 0;
 }
 
 int get_security_context( const char *name, 
@@ -192,8 +340,7 @@
 			  const char *tabname) {
 #ifdef WITH_SELINUX
 	security_context_t scontext=NULL;
-	security_context_t  file_context=NULL;
-	struct av_decision avd;
+	security_context_t file_context=NULL;
 	int retval=0;
 	char *seuser=NULL;
 	char *level=NULL;
@@ -233,28 +380,24 @@
 		}
 	}
     
-	/*
-	 * Since crontab files are not directly executed,
-	 * crond must ensure that the crontab file has
-	 * a context that is appropriate for the context of
-	 * the user cron job.  It performs an entrypoint
-	 * permission check for this purpose.
-	 */
-	retval = security_compute_av(scontext,
-				     file_context,
-				     SECCLASS_FILE,
-				     FILE__ENTRYPOINT,
-				     &avd);
-	freecon(file_context);
-	if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
+	if ( ! cron_authorize_context( scontext, file_context ) )
+	{
+		freecon(scontext);
+		freecon(file_context);
 		if (security_getenforce() > 0) {
-			log_it(name, getpid(), "ENTRYPOINT FAILED", tabname);
-			freecon(scontext);
+			log_it(name, getpid(), "Unauthorized SELinux context", tabname);
 			return -1;
-		} else {
-			log_it(name, getpid(), "ENTRYPOINT FAILED but SELinux in permissive mode, continuing", tabname);
+		} else
+		{
+			log_it(name, getpid(), 
+			       "Unauthorized SELinux context, but SELinux in permissive mode, continuing",
+			       tabname
+			      );
+			return  0;
 		}
 	}
+	freecon(file_context);
+
 	*rcontext=scontext;
 #endif
 	return 0;

vixie-cron-4.1-_54_bz198019_database_changes.patch:
 database.c |  129 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 86 insertions(+), 43 deletions(-)

--- NEW FILE vixie-cron-4.1-_54_bz198019_database_changes.patch ---
--- vixie-cron-4.1/database.c.bz198019	2006-07-20 21:42:01.000000000 -0400
+++ vixie-cron-4.1/database.c	2006-07-20 21:46:51.000000000 -0400
@@ -34,6 +34,12 @@
 					const char *, struct stat *,
 					cron_db *, cron_db *);
 
+static int not_a_crontab( DIR_T *dp ); 
+/* return 1 if we should skip this file */
+
+static void max_mtime( char *dir_name, struct stat *max_st ); 
+/* record max mtime of any file under dir_name in max_st */
+
 void
 load_database(cron_db *old_db) {
 	struct stat statbuf, syscron_stat, crond_stat;
@@ -52,12 +58,20 @@
 		log_it("CRON", getpid(), "STAT FAILED", SPOOL_DIR);
 		(void) exit(ERROR_EXIT);
 	}
+	
+	/* As pointed out in Red Hat bugzilla 198019, with modern Linux it
+	 * is possible to modify a file without modifying the mtime of the
+         * containing directory. Hence, we must check the mtime of each file:
+         */
+	max_mtime(SPOOL_DIR, &statbuf);
 
 	if (stat(RH_CROND_DIR, &crond_stat) < OK) {
 		log_it("CRON", getpid(), "STAT FAILED", RH_CROND_DIR);
 		(void) exit(ERROR_EXIT);
 	}
 
+	max_mtime(RH_CROND_DIR, &crond_stat);
+
 	/* track system crontab file
 	 */
 	if (stat(SYSCRONTAB, &syscron_stat) < OK)
@@ -97,40 +111,12 @@
 	}
 
 	while (NULL != (dp = readdir(dir))) {
-		char	fname[MAXNAMLEN+1],
-			tabname[MAXNAMLEN+1];
-		size_t len;
-
-		/* avoid file names beginning with ".".  this is good
-		 * because we would otherwise waste two guaranteed calls
-		 * to getpwnam() for . and .., and there shouldn't be 
-		 * hidden files in here anyway
-		 */
-		if (dp->d_name[0] == '.')
-			continue;
-
-		/* ignore files starting with # and ending with ~ */
-		if (dp->d_name[0] == '#')
-			continue;
-		
-		len = strlen(dp->d_name);
-
-		if (len >= sizeof fname)
-			continue;	/* XXX log? */
-
-		if ((len > 0) && (dp->d_name[len - 1] == '~'))
-			continue;
+		char   tabname[MAXNAMLEN+1];
 
-		(void) strcpy(fname, dp->d_name);
-		
-		if ((len > 8) && (strncmp(fname + len - 8, ".rpmsave", 8) == 0))
-			continue;
-		if ((len > 8) && (strncmp(fname + len - 8, ".rpmorig", 8) == 0))
-			continue;
-		if ((len > 7) && (strncmp(fname + len - 7, ".rpmnew", 7) == 0))
+		if ( not_a_crontab( dp ) )
 			continue;
 
-		if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, fname, '/'))
+		if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/'))
 			continue;	/* XXX log? */
 
 		process_crontab("root", NULL, tabname,
@@ -142,6 +128,7 @@
 	 * efficiency.  however, we need to close it in every fork, and
 	 * we fork a lot more often than the mtime of the dir changes.
 	 */
+
 	if (!(dir = opendir(SPOOL_DIR))) {
 		log_it("CRON", getpid(), "OPENDIR FAILED", SPOOL_DIR);
 		(void) exit(ERROR_EXIT);
@@ -150,20 +137,12 @@
 	while (NULL != (dp = readdir(dir))) {
 		char fname[MAXNAMLEN+1], tabname[MAXNAMLEN+1];
 
-		/* avoid file names beginning with ".".  this is good
-		 * because we would otherwise waste two guaranteed calls
-		 * to getpwnam() for . and .., and also because user names
-		 * starting with a period are just too nasty to consider.
-		 */
-		if (dp->d_name[0] == '.')
+		if ( not_a_crontab( dp ) )
 			continue;
 
-		if (strlen(dp->d_name) >= sizeof fname)
-			continue;	/* XXX log? */
-		(void) strcpy(fname, dp->d_name);
-		
-		if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR,
-				  fname, '/'))
+		strncpy(fname, dp->d_name, MAXNAMLEN);
+
+		if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, fname, '/'))
 			continue;	/* XXX log? */
 
 		process_crontab(fname, fname, tabname,
@@ -322,3 +301,67 @@
 		close(crontab_fd);
 	}
 }
+
+static int not_a_crontab( DIR_T *dp )
+{
+	int len;
+
+	/* avoid file names beginning with ".".  this is good
+	 * because we would otherwise waste two guaranteed calls
+	 * to getpwnam() for . and .., and there shouldn't be 
+	 * hidden files in here anyway
+	 */
+	if (dp->d_name[0] == '.')
+		return(1);
+
+	/* ignore files starting with # and ending with ~ */
+	if (dp->d_name[0] == '#')
+		return(1);
+
+	len = strlen(dp->d_name);
+
+	if (len >= MAXNAMLEN)
+		return(1);	/* XXX log? */
+
+	if ((len > 0) && (dp->d_name[len - 1] == '~'))
+		return(1);
+
+	if ((len > 8) && (strncmp(dp->d_name + len - 8, ".rpmsave", 8) == 0))
+		return(1);
+	if ((len > 8) && (strncmp(dp->d_name + len - 8, ".rpmorig", 8) == 0))
+		return(1);
+	if ((len > 7) && (strncmp(dp->d_name + len - 7, ".rpmnew", 7) == 0))
+		return(1);
+
+	return(0);
+}
+
+static void max_mtime( char *dir_name, struct stat *max_st )
+{
+	DIR * dir;
+	DIR_T *dp;
+	struct stat st;
+
+	if (!(dir = opendir(dir_name))) {
+		log_it("CRON", getpid(), "OPENDIR FAILED", dir_name);
+		(void) exit(ERROR_EXIT);
+	}
+
+	while (NULL != (dp = readdir(dir))) 
+	{
+		char tabname[MAXNAMLEN+1];
+
+		if ( not_a_crontab ( dp ) )
+			continue;
+
+		if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, dp->d_name, '/'))
+			continue;	/* XXX log? */
+
+		if ( stat( tabname, &st ) < OK )
+			continue;       /* XXX log? */
+		
+		if ( st.st_mtime > max_st->st_mtime )
+			max_st->st_mtime = st.st_mtime;		
+	}
+	closedir(dir);
+}


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vixie-cron.spec	15 Jul 2006 00:27:50 -0000	1.71
+++ vixie-cron.spec	21 Jul 2006 02:01:22 -0000	1.72
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 56.FC6
+Release: 58%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -70,6 +70,8 @@
 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
+Patch53: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
+Patch54: vixie-cron-4.1-_54_bz198019_database_changes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -158,6 +160,8 @@
 %patch50 -p1 -b .bz178931
 %patch51 -p1 -b .mail_i18n
 %patch52 -p1 -b .bz181439
+%patch53 -p1 -b .selinux_mls
+%patch54 -p1 -b .bz198019
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
@@ -225,6 +229,11 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Thu Jul 20 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-58
+- fix bug 199294: support for LSPP multiple per-job SELinux contexts
+- fix bug 198019: make database.c correct if crontab mtime changes 
+                  while spool dir mtime does not.
+
 * Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-56.FC6
 - fix bug 198893 - change permissions of cron spool directories to 0700
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 02:12:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 22:12:16 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch,
	1.1, 1.2
Message-ID: <200607210212.k6L2CGsP013986@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13946

Modified Files:
	vixie-cron-4.1-_53_bz199294_selinux_mls.patch 
Log Message:
fix bugs 198019, 199294

vixie-cron-4.1-_53_bz199294_selinux_mls.patch:
 crontab.1  |    8 ++
 crontab.5  |   13 +++
 crontab.c  |   55 +++++++++++----
 funcs.h    |    4 -
 security.c |  219 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 5 files changed, 245 insertions(+), 54 deletions(-)

Index: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_53_bz199294_selinux_mls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:01:21 -0000	1.1
+++ vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:12:09 -0000	1.2
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/crontab.c	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/crontab.c	2006-07-20 22:03:57.000000000 -0400
 @@ -43,10 +43,19 @@
  
  #if DEBUGGING
@@ -56,7 +56,7 @@
  	struct stat statbuf;
  	struct utimbuf utimebuf;
  	WAIT_T waiter;
-@@ -379,26 +401,22 @@
+@@ -379,26 +401,25 @@
  	}
  
  	Set_LineNum(1)
@@ -87,13 +87,16 @@
 +
 +#ifdef WITH_SELINUX
 +	if ( selinux_context )
++	{
 +		fprintf(NewCrontab,"SELINUX_ROLE_TYPE=%s\n", selinux_context);
++		selinux_context = 0;
++	}
 +#endif
 +
  	fclose(f);
  	if (fflush(NewCrontab) < OK) {
  		perror(Filename);
-@@ -610,6 +628,10 @@
+@@ -610,6 +631,10 @@
  	 *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now));
  	 *fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, rcsid);
  	 */
@@ -104,8 +107,8 @@
  
  	/* copy the crontab to the tmp
  	 */
---- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/funcs.h	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/funcs.h	2006-07-20 21:47:56.000000000 -0400
 @@ -88,7 +88,9 @@
  
  int cron_change_user( struct passwd *pw );
@@ -117,8 +120,8 @@
  
  int get_security_context(const char *name, 
  			 int crontab_fd, 
---- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 20:10:26.000000000 -0400
-+++ vixie-cron-4.1/crontab.1	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 21:47:55.000000000 -0400
++++ vixie-cron-4.1/crontab.1	2006-07-20 21:47:56.000000000 -0400
 @@ -32,6 +32,7 @@
  .RB [ -u
  .IR user ]
@@ -141,8 +144,8 @@
  .SH "SEE ALSO"
  crontab(5), cron(8)
  .SH FILES
---- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/crontab.5	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/crontab.5	2006-07-20 21:47:56.000000000 -0400
 @@ -87,6 +87,19 @@
  setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
  to the correct values of the mail headers of those names.  
@@ -163,8 +166,8 @@
  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,
---- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/security.c	2006-07-20 20:29:32.000000000 -0400
+--- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/security.c	2006-07-20 21:47:56.000000000 -0400
 @@ -49,23 +49,49 @@
  	      );
  	return -1;



From fedora-cvs-commits at redhat.com  Fri Jul 21 02:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 22:16:15 -0400
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch,
	1.2, 1.3
Message-ID: <200607210216.k6L2GFp5015094@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14810

Modified Files:
	vixie-cron-4.1-_53_bz199294_selinux_mls.patch 
Log Message:
fix bugs 198019, 199294

vixie-cron-4.1-_53_bz199294_selinux_mls.patch:
 crontab.1  |    8 ++
 crontab.5  |   13 +++
 crontab.c  |   55 +++++++++++----
 funcs.h    |    4 -
 security.c |  219 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 5 files changed, 245 insertions(+), 54 deletions(-)

Index: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_53_bz199294_selinux_mls.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:12:09 -0000	1.2
+++ vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:15:57 -0000	1.3
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
-+++ vixie-cron-4.1/crontab.c	2006-07-20 22:03:57.000000000 -0400
+--- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 22:05:13.000000000 -0400
++++ vixie-cron-4.1/crontab.c	2006-07-20 22:05:13.000000000 -0400
 @@ -43,10 +43,19 @@
  
  #if DEBUGGING
@@ -107,8 +107,8 @@
  
  	/* copy the crontab to the tmp
  	 */
---- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 21:47:56.000000000 -0400
-+++ vixie-cron-4.1/funcs.h	2006-07-20 21:47:56.000000000 -0400
+--- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 22:05:13.000000000 -0400
++++ vixie-cron-4.1/funcs.h	2006-07-20 22:05:13.000000000 -0400
 @@ -88,7 +88,9 @@
  
  int cron_change_user( struct passwd *pw );
@@ -120,8 +120,8 @@
  
  int get_security_context(const char *name, 
  			 int crontab_fd, 
---- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 21:47:55.000000000 -0400
-+++ vixie-cron-4.1/crontab.1	2006-07-20 21:47:56.000000000 -0400
+--- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 22:05:13.000000000 -0400
++++ vixie-cron-4.1/crontab.1	2006-07-20 22:05:13.000000000 -0400
 @@ -32,6 +32,7 @@
  .RB [ -u
  .IR user ]
@@ -144,8 +144,8 @@
  .SH "SEE ALSO"
  crontab(5), cron(8)
  .SH FILES
---- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 21:47:56.000000000 -0400
-+++ vixie-cron-4.1/crontab.5	2006-07-20 21:47:56.000000000 -0400
+--- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 22:05:13.000000000 -0400
++++ vixie-cron-4.1/crontab.5	2006-07-20 22:05:13.000000000 -0400
 @@ -87,6 +87,19 @@
  setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
  to the correct values of the mail headers of those names.  
@@ -166,8 +166,8 @@
  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,
---- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
-+++ vixie-cron-4.1/security.c	2006-07-20 21:47:56.000000000 -0400
+--- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 22:05:13.000000000 -0400
++++ vixie-cron-4.1/security.c	2006-07-20 22:15:31.000000000 -0400
 @@ -49,23 +49,49 @@
  	      );
  	return -1;
@@ -300,7 +300,7 @@
 +				      );
 +				return -1;
 +			} else
-+			if ( access( crontab, F_OK ) )
++			if ( access( crontab, F_OK ) == 0 )
 +				log_it(u->name,
 +				       getpid(), 
 +				       "getfilecon FAILED but SELinux in permissive mode, continuing "



From fedora-cvs-commits at redhat.com  Fri Jul 21 02:26:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 20 Jul 2006 22:26:13 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2430,
	1.2431 linux-2.6-utrace.patch, 1.7, 1.8
Message-ID: <200607210226.k6L2QDH1032487@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32394

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
Second rev of last utrace update.



linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +--
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |   79 -
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 ++++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  568 ++++++++++++
 include/linux/utrace.h                  |  459 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1470 ++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1477 ++++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 79 files changed, 6857 insertions(+), 3188 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-utrace.patch	21 Jul 2006 01:20:23 -0000	1.7
+++ linux-2.6-utrace.patch	21 Jul 2006 02:26:08 -0000	1.8
@@ -63,7 +63,7 @@
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |  105 ++
  include/linux/init_task.h               |    3 
- include/linux/ptrace.h                  |   82 +-
+ include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 -
  include/linux/tracehook.h               |  568 ++++++++++++
  include/linux/utrace.h                  |  459 ++++++++++
@@ -77,7 +77,7 @@
  kernel/timer.c                          |    6 
  kernel/utrace.c                         | 1477 +++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6848 insertions(+), 3183 deletions(-)
+ 79 files changed, 6852 insertions(+), 3183 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
@@ -1225,26 +1225,23 @@
 +#endif	/* linux/utrace.h */
 --- linux-2.6/include/linux/ptrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/ptrace.h
-@@ -49,66 +49,38 @@
+@@ -49,66 +49,42 @@
  #include <asm/ptrace.h>
  
  #ifdef __KERNEL__
+-/*
+- * Ptrace flags
+- *
+- * The owner ship rules for task->ptrace which holds the ptrace
+- * flags is simple.  When a task is running it owns it's task->ptrace
+- * flags.  When the a task is stopped the ptracer owns task->ptrace.
+- */
 +#include <linux/compiler.h>
 +#include <linux/types.h>
 +struct task_struct;
 +struct siginfo;
 +struct rusage;
 +
-+#ifdef CONFIG_PTRACE
- /*
-- * Ptrace flags
-- *
-- * The owner ship rules for task->ptrace which holds the ptrace
-- * flags is simple.  When a task is running it owns it's task->ptrace
-- * flags.  When the a task is stopped the ptracer owns task->ptrace.
-+ * Called in do_exit, after setting PF_EXITING, no locks are held.
-  */
-+void ptrace_exit(struct task_struct *tsk);
  
 -#define PT_PTRACED	0x00000001
 -#define PT_DTRACE	0x00000002	/* delayed trace (used on m68k, i386) */
@@ -1285,8 +1282,8 @@
 -			  struct task_struct *new_parent);
 -extern void __ptrace_unlink(struct task_struct *child);
 -extern void ptrace_untrace(struct task_struct *child);
--extern int ptrace_may_attach(struct task_struct *task);
--
+ extern int ptrace_may_attach(struct task_struct *task);
+ 
 -static inline void ptrace_link(struct task_struct *child,
 -			       struct task_struct *new_parent)
 -{
@@ -1294,6 +1291,13 @@
 -		__ptrace_link(child, new_parent);
 -}
 -static inline void ptrace_unlink(struct task_struct *child)
++
++#ifdef CONFIG_PTRACE
++/*
++ * Called in do_exit, after setting PF_EXITING, no locks are held.
++ */
++void ptrace_exit(struct task_struct *tsk);
++
 +/*
 + * Called in do_wait, with tasklist_lock held for reading.
 + * This reports any ptrace-child that is ready as do_wait would a normal child.



From fedora-cvs-commits at redhat.com  Fri Jul 21 06:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 02:45:35 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.36,1.37
Message-ID: <200607210645.k6L6jZRH029317@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29250

Modified Files:
	gjdoc.spec 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-5
- Bump release number.
- Rebuild for libgcj.so.7rh.




Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gjdoc.spec	14 Jul 2006 23:12:39 -0000	1.36
+++ gjdoc.spec	21 Jul 2006 06:45:30 -0000	1.37
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 4
+Release: 5
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -53,6 +53,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-5
+- Bump release number.
+- Rebuild for libgcj.so.7rh.
+
 * Fri Jul 14 2006 Ben Konrath <bkonrath at redhat.com> - 0.7.7-4
 - Add timestamp patch.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 07:16:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 03:16:40 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.155,
	1.156 sources, 1.54, 1.55
Message-ID: <200607210716.k6L7Ge3d023982@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-serv21697

Modified Files:
	java-1.4.2-gcj-compat.spec sources 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_93rh
- Import java-gcj-compat 1.0.59.
- Use standard BuildRoot tag.
- Remove gnu-crypto and jessie requires.
- Remove static compile method patch.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- java-1.4.2-gcj-compat.spec	18 Jul 2006 01:20:22 -0000	1.155
+++ java-1.4.2-gcj-compat.spec	21 Jul 2006 07:16:37 -0000	1.156
@@ -3,6 +3,7 @@
 %{!?custom:	%define custom 0}
 %{!?gcjprefix: 	%define gcjprefix %{nil}}
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define gccsuffix	%{nil}
 %define gccsoversion	6
 %define priority	1420
@@ -10,11 +11,11 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.52
+%define jgcver		1.0.59
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_89rh
+%define release 	40jpp_93rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -37,8 +38,7 @@
 Source0:        java-gcj-compat-%{jgcver}.tar.gz
 Source1:	eclipse-ecj-3.1.0_fc-12.jar
 Source2:	ecj.sh.in
-Patch0:		java-gcj-compat-static-compile.patch
-BuildRoot:	%{_tmppath}/%{name}-buildroot
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires:	gjdoc
@@ -47,11 +47,6 @@
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	zip
-Requires:	jessie >= 1.0.1
-Requires:	gnu-crypto >= 0:2.1.0
-# SASL and JCE are provided by libgcj.
-Obsoletes:	gnu-crypto-sasl-jdk1.4
-Obsoletes:	gnu-crypto-jce-jdk1.4
 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
@@ -124,7 +119,6 @@
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
-%patch0 -p1
 
 %build
 %if %{custom}
@@ -158,6 +152,9 @@
 %if %{custom}
 rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile-rpm
 rm -f $RPM_BUILD_ROOT%{_bindir}/rebuild-gcj-db
+rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/aotcompile.py*
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/classfile.py*
 %endif
 
 %if %{custom}
@@ -517,6 +514,9 @@
 %dir %{jvmjardir}
 %if ! %{custom}
 %{_bindir}/rebuild-gcj-db
+%{_bindir}/aot-compile
+%{python_sitelib}/aotcompile.py*
+%{python_sitelib}/classfile.py*
 %endif
 %{jvmjardir}/*.jar
 %{_jvmdir}/%{jrelnk}
@@ -555,6 +555,12 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_93rh
+- Import java-gcj-compat 1.0.59.
+- Use standard BuildRoot tag.
+- Remove gnu-crypto and jessie requires.
+- Remove static compile method patch.
+
 * Mon Jul 17 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_89rh
 - Remove BouncyCastle.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	18 Jul 2006 22:22:35 -0000	1.54
+++ sources	21 Jul 2006 07:16:37 -0000	1.55
@@ -1,4 +1,3 @@
 40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
-43d63ac889427a0f2d79fe7994180996  java-gcj-compat-static-compile.patch



From fedora-cvs-commits at redhat.com  Fri Jul 21 07:20:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 03:20:29 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.779,1.780
Message-ID: <200607210720.k6L7KTrN002782@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2713

Modified Files:
	openoffice.org.spec 
Log Message:
gcc has bumped


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- openoffice.org.spec	20 Jul 2006 16:34:38 -0000	1.779
+++ openoffice.org.spec	21 Jul 2006 07:20:25 -0000	1.780
@@ -48,7 +48,7 @@
 Source12:       ooo64726.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
-BuildRequires:	gcc, gcc-c++ >= 4.1.1-8, binutils, gcc-java >= 4.1.1 
+BuildRequires:	gcc, gcc-c++ >= 4.1.1-10, binutils, gcc-java >= 4.1.1 
 BuildRequires:	libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
 BuildRequires:	freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
 BuildRequires:	cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
@@ -112,10 +112,9 @@
 Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org.2.0.3.gcc28409.anonymousexternc.patch
-Patch50: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
-Patch51: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
-Patch52: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch49: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
+Patch50: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -855,10 +854,9 @@
 %patch46 -p1 -b .rh187919.gtkunderkde.patch
 %patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .gcc28409.anonymousexternc.patch
-%patch50 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
-%patch51 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
-%patch52 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch49 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
+%patch50 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
+%patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
 
 tar xzf %{SOURCE1}
 
@@ -880,8 +878,6 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-# visibility is all whacked now with gcc >= 4.1.1-7 :-(
-unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
@@ -3339,7 +3335,9 @@
 %changelog
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
+- drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
+- try and reanable visibility
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Fri Jul 21 08:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 04:28:45 -0400
Subject: rpms/openssl/devel openssl.spec,1.79,1.80
Message-ID: <200607210828.k6L8SjxK027307@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27295

Modified Files:
	openssl.spec 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
- add a temporary workaround for sha512 test failure on s390 (#199604)



Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- openssl.spec	20 Jul 2006 12:58:48 -0000	1.79
+++ openssl.spec	21 Jul 2006 08:28:43 -0000	1.80
@@ -143,7 +143,8 @@
 sslarch=linux-alpha-gcc
 %endif
 %ifarch s390
-sslarch="linux-generic32 -DB_ENDIAN -DNO_ASM"
+# The -fno-regmove is a workaround for bug #199604
+sslarch="linux-generic32 -DB_ENDIAN -DNO_ASM -fno-regmove"
 %endif
 %ifarch s390x
 sslarch="linux-generic64 -DB_ENDIAN -DNO_ASM"
@@ -350,7 +351,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
+- add a temporary workaround for sha512 test failure on s390 (#199604)
+
+* Thu Jul 20 2006 Tomas Mraz <tmraz at redhat.com>
 - add ipv6 support to s_client and s_server (by Jan Pazdziora) (#198737)
 - add patches for BN threadsafety, AES cache collision attack hazard fix and
   pkcs7 code memleak fix from upstream CVS



From fedora-cvs-commits at redhat.com  Fri Jul 21 08:39:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 04:39:22 -0400
Subject: rpms/jpackage-utils/devel .cvsignore, 1.7, 1.8 jpackage-utils.spec,
	1.27, 1.28 sources, 1.7, 1.8
Message-ID: <200607210839.k6L8dMLY027434@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27392

Modified Files:
	.cvsignore jpackage-utils.spec sources 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_4rh
- Enable GCJ support in macros.jpackage.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2006 20:11:05 -0000	1.7
+++ .cvsignore	21 Jul 2006 08:39:20 -0000	1.8
@@ -1 +1,2 @@
 jpackage-utils-1.6.6.tar.bz2
+jpackage-utils-enable-gcj-support.patch


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jpackage-utils.spec	12 Jul 2006 06:34:40 -0000	1.27
+++ jpackage-utils.spec	21 Jul 2006 08:39:20 -0000	1.28
@@ -5,12 +5,13 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp_3rh
+Release:        1jpp_4rh
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
 URL:            http://www.jpackage.org/
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:         %{name}-enable-gcj-support.patch
 Group:          Utilities
 # Vendor:         JPackage Project
 # Distribution:   JPackage
@@ -54,7 +55,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
 echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
@@ -207,6 +208,9 @@
 
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_4rh
+- Enable GCJ support in macros.jpackage.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.6-1jpp_3rh
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2006 20:11:05 -0000	1.7
+++ sources	21 Jul 2006 08:39:20 -0000	1.8
@@ -1 +1,2 @@
 85336e72018ecefa2f9999fc4e6f3eb8  jpackage-utils-1.6.6.tar.bz2
+652715135a35d6c70ac6e149d558379e  jpackage-utils-enable-gcj-support.patch



From fedora-cvs-commits at redhat.com  Fri Jul 21 08:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 04:49:50 -0400
Subject: rpms/system-config-soundcard/devel .cvsignore, 1.12, 1.13 sources,
	1.15, 1.16 system-config-soundcard.spec, 1.43,
	1.44 system-config-soundcard-2.0.0-ainit.patch, 1.1,
	NONE system-config-soundcard-2.0.0-update.patch, 1.1, NONE
Message-ID: <200607210849.k6L8noNa022812@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22787

Modified Files:
	.cvsignore sources system-config-soundcard.spec 
Removed Files:
	system-config-soundcard-2.0.0-ainit.patch 
	system-config-soundcard-2.0.0-update.patch 
Log Message:
removed ainit parts, sync. with upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Jun 2006 12:56:15 -0000	1.12
+++ .cvsignore	21 Jul 2006 08:49:48 -0000	1.13
@@ -6,3 +6,4 @@
 system-config-soundcard-1.2.16.tar.bz2
 system-config-soundcard-1.2.17.tar.bz2
 system-config-soundcard-2.0.0.tar.bz2
+system-config-soundcard-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Jun 2006 12:56:15 -0000	1.15
+++ sources	21 Jul 2006 08:49:48 -0000	1.16
@@ -1 +1 @@
-0fed96e5d778c8290d525d2956c69fb2  system-config-soundcard-2.0.0.tar.bz2
+1f8a6af8825eb94e857653e6a54b30d5  system-config-soundcard-2.0.1.tar.bz2


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- system-config-soundcard.spec	20 Jul 2006 22:11:31 -0000	1.43
+++ system-config-soundcard.spec	21 Jul 2006 08:49:48 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
-Version: 2.0.0
-Release: 4
+Version: 2.0.1
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,8 +9,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
-Patch: system-config-soundcard-2.0.0-update.patch
-Patch1: system-config-soundcard-2.0.0-ainit.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -34,8 +32,6 @@
 
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
 
 %build
 make
@@ -90,8 +86,8 @@
 %ghost /root/scsound.log
 
 %changelog
-* Fri Jul 21 2006 Martin Stransky <stransky at redhat.com> 2.0.0-4
-- removed ainit parts
+* Fri Jul 21 2006 Martin Stransky <stransky at redhat.com> 2.0.1-1
+- removed ainit parts, sync. with upstream
 
 * Tue Jul 20 2006 Martin Stransky <stransky at redhat.com> 2.0.0-3
 - fixed pycairo Requires


--- system-config-soundcard-2.0.0-ainit.patch DELETED ---


--- system-config-soundcard-2.0.0-update.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 21 10:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 06:05:32 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67644.sw.spacing.patch, NONE,
	1.1 openoffice.org.spec, 1.780, 1.781
Message-ID: <200607211005.k6LA5WMI009059@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8995

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67644.sw.spacing.patch 
Log Message:
a little extra goodness

openoffice.org-2.0.3.ooo67644.sw.spacing.patch:
 source/ui/envelp/label.src    |    0 
 sw/source/ui/envelp/label.src |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo67644.sw.spacing.patch ---
Index: source/ui/envelp/label.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/envelp/label.src,v
retrieving revision 1.56
diff -u -r1.56 label.src
--- openoffice.org.orig/sw/source/ui/envelp/label.src	23 Sep 2005 13:01:31 -0000	1.56
+++ openoffice.org/sw/source/ui/envelp/label.src	21 Jul 2006 08:39:29 -0000
@@ -408,7 +408,7 @@
 		Pos = MAP_APPFONT ( 12 ,  32) ;
 		Size = MAP_APPFONT ( 90 , 8 ) ;
 		Text [ de ] = "~Vor-/Name/K??rzel 2" ;
-		Text [ en-US ] = "First / Last ~Name / Initials 2";
+		Text [ en-US ] = "First/Last ~name/Initials 2";
 	};
 	Edit ED_FIRSTNAME_2
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.780
retrieving revision 1.781
diff -u -r1.780 -r1.781
--- openoffice.org.spec	21 Jul 2006 07:20:25 -0000	1.780
+++ openoffice.org.spec	21 Jul 2006 10:05:28 -0000	1.781
@@ -115,6 +115,7 @@
 Patch49: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 Patch50: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -857,6 +858,7 @@
 %patch49 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
 %patch50 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
 %patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch52 -p1 -b .ooo67644.sw.spacing.patch
 
 tar xzf %{SOURCE1}
 
@@ -3335,6 +3337,7 @@
 %changelog
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
+- rh#199664# openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
 - drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - try and reanable visibility



From fedora-cvs-commits at redhat.com  Fri Jul 21 10:27:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 06:27:46 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.49,
	1.50 java-1.4.2-gcj-compat.spec, 1.156, 1.157 sources, 1.55, 1.56
Message-ID: <200607211027.k6LARke1030958@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-serv30899

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_94rh
- Add plugin subpackage.
- Install libjawt.so and libjvm.so symlinks.
- Install appletviewer, jarsigner and keytool symlinks.
- Import java-gcj-compat 1.0.60.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	20 Jun 2006 21:44:09 -0000	1.49
+++ .cvsignore	21 Jul 2006 10:27:43 -0000	1.50
@@ -1,5 +1,3 @@
-java-gcj-compat-1.0.52.tar.gz
-bcprov-jdk14-131.tar.gz
+java-gcj-compat-1.0.60.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar
-java-gcj-compat-static-compile.patch


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- java-1.4.2-gcj-compat.spec	21 Jul 2006 07:16:37 -0000	1.156
+++ java-1.4.2-gcj-compat.spec	21 Jul 2006 10:27:43 -0000	1.157
@@ -11,11 +11,11 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.59
+%define jgcver		1.0.60
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_93rh
+%define release 	40jpp_94rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -26,6 +26,8 @@
 %define jrebindir	%{_jvmdir}/%{jrelnk}/bin
 %define jvmjardir       %{_jvmjardir}/%{cname}-%{version}
 
+%define plugindir       %{_libdir}/mozilla/plugins
+
 Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
@@ -65,10 +67,6 @@
 Provides:	jce
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
 PreReq:		chkconfig
-%if %{custom}
-# prevent autogeneration of libjawt.so dependencies
-AutoReqProv:    no
-%endif
 
 %description
 This package installs directory structures, shell scripts and symbolic
@@ -117,6 +115,19 @@
 %description javadoc
 This package installs Javadoc API documentation for libgcj.
 
+%package plugin
+Summary:	Web browser plugin that handles applets
+Group:		Applications/Internet
+Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:       %{_sbindir}/update-alternatives
+Requires(post):       %{_sbindir}/update-alternatives
+Requires(postun):     %{_sbindir}/update-alternatives
+Requires:	%{plugindir}
+
+%description plugin
+This package installs gcjwebplugin, a Mozilla plugin for applets.
+
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
 
@@ -241,10 +252,14 @@
 popd
 
 %ifarch x86_64
-ln -s %{_jvmdir}/%{jredir}/lib/%{_arch} \
+ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
   $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
 %endif
 
+# install libjvm.so directories
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/client
+mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/%{_arch}/server
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -258,6 +273,7 @@
   --install %{_bindir}/java java %{jrebindir}/java %{priority} \
   --slave %{_jvmdir}/jre          jre          %{_jvmdir}/%{jrelnk} \
   --slave %{_jvmjardir}/jre       jre_exports  %{_jvmjardir}/%{jrelnk} \
+  --slave %{_bindir}/keytool      keytool      %{jrebindir}/keytool \
   --slave %{_bindir}/rmiregistry  rmiregistry  %{jrebindir}/rmiregistry
 
 update-alternatives \
@@ -318,6 +334,17 @@
 then
   %{_bindir}/rebuild-gcj-db
 fi
+{
+  # libjawt.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjawt.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
+
+  # libjvm.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+} || :
 
 %post devel
 
@@ -332,6 +359,8 @@
   --slave %{_bindir}/javadoc  javadoc           %{sdkbindir}/javadoc \
   --slave %{_bindir}/javah    javah             %{sdkbindir}/javah \
   --slave %{_bindir}/jar      jar               %{sdkbindir}/jar \
+  --slave %{_bindir}/jarsigner jarsigner        %{sdkbindir}/jarsigner \
+  --slave %{_bindir}/appletviewer appletviewer  %{sdkbindir}/appletviewer \
   --slave %{_bindir}/rmic     rmic              %{sdkbindir}/rmic
 
 update-alternatives \
@@ -384,6 +413,11 @@
   ln -sf %{name}-%{version} %{_javadocdir}/java
 } || :
 
+%post plugin
+
+  update-alternatives --install %{plugindir}/libjavaplugin.so \
+    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+
 %postun
 if [ $1 -eq 0 ] ; then
 
@@ -425,6 +459,11 @@
    update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
+%postun plugin
+if [ $1 -eq 0 ] ; then
+   update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
+fi
+
 %triggerin -- libgcj%{gccsuffix} > %{gccver}
 {
 
@@ -463,6 +502,17 @@
     jaxp_parser_impl \
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20
 %endif
+
+  # libjawt.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjawt.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
+
+  # libjvm.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
+  ln -sf %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libjvm.so \
+    %{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
+
 } || :
 
 # gcc-java requires libgcj-devel which provides jni.h
@@ -506,6 +556,18 @@
     %{_jvmdir}/%{cname}-%{version}/src.zip
 } || :
 
+%triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
+{
+
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
+
+  # plugin
+  update-alternatives --install %{plugindir}/libjavaplugin.so \
+    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+} || :
+
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %dir %{_libdir}/gcj
@@ -528,6 +590,8 @@
 %ifarch x86_64
 %{_jvmdir}/%{jredir}/lib/amd64
 %endif
+%{_jvmdir}/%{jredir}/lib/%{_arch}/client
+%{_jvmdir}/%{jredir}/lib/%{_arch}/server
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -554,7 +618,16 @@
 %ghost %doc %{_javadocdir}/%{name}
 %ghost %doc %{_javadocdir}/java
 
+%files plugin
+%defattr(-,root,root)
+
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_94rh
+- Add plugin subpackage.
+- Install libjawt.so and libjvm.so symlinks.
+- Install appletviewer, jarsigner and keytool symlinks.
+- Import java-gcj-compat 1.0.60.
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_93rh
 - Import java-gcj-compat 1.0.59.
 - Use standard BuildRoot tag.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	21 Jul 2006 07:16:37 -0000	1.55
+++ sources	21 Jul 2006 10:27:43 -0000	1.56
@@ -1,3 +1,3 @@
-40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
+ab3bbc4c6346f2e3a6a76a894fd79083  java-gcj-compat-1.0.60.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:15:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:15:24 -0400
Subject: rpms/ruby/devel ruby.spec,1.72,1.73
Message-ID: <200607211115.k6LBFORO001122@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1108

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ruby.spec	20 Jul 2006 11:06:45 -0000	1.72
+++ ruby.spec	21 Jul 2006 11:15:22 -0000	1.73
@@ -455,7 +455,7 @@
 
 %changelog
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-11
-- security fixes.
+- security fixes [CVE-2006-3694]
   - ruby-1.8.4-fix-insecure-dir-operation.patch:
   - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
     operations in the certain safe-level restrictions. (#199538)



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:16:15 -0400
Subject: rpms/ruby/FC-5 ruby.spec,1.62,1.63
Message-ID: <200607211116.k6LBGFR9008324@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6400

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-5/ruby.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ruby.spec	20 Jul 2006 12:37:36 -0000	1.62
+++ ruby.spec	21 Jul 2006 11:16:13 -0000	1.63
@@ -455,7 +455,7 @@
 
 %changelog
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-8
-- security fixes.
+- security fixes [CVE-2006-3694]
   - ruby-1.8.4-fix-insecure-dir-operation.patch:
   - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
     operations in the certain safe-level restrictions. (#199538)



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:17:11 -0400
Subject: rpms/ruby/FC-4 ruby.spec,1.38,1.39
Message-ID: <200607211117.k6LBHB8g016062@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16048

Modified Files:
	ruby.spec 
Log Message:



Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ruby.spec	20 Jul 2006 12:49:36 -0000	1.38
+++ ruby.spec	21 Jul 2006 11:17:09 -0000	1.39
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	3%{?dist}
+Release:	3.fc4
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u -n})
@@ -440,7 +440,7 @@
 
 %changelog
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
-- security fixes.
+- security fixes [CVE-2006-3694]
   - ruby-1.8.4-fix-insecure-dir-operation.patch:
   - ruby-1.8.4-fix-insecure-regexp-modification.patch: fixed the insecure
     operations in the certain safe-level restrictions. (#199538)



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:23:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:23:43 -0400
Subject: rpms/cups/devel cups.spec,1.232,1.233
Message-ID: <200607211123.k6LBNhdh016315@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16302

Modified Files:
	cups.spec 
Log Message:
* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
- Renumbered patches.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- cups.spec	20 Jul 2006 10:30:23 -0000	1.232
+++ cups.spec	21 Jul 2006 11:23:41 -0000	1.233
@@ -27,16 +27,16 @@
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch11: cups-serverbin-compat.patch
-Patch12: cups-locale.patch
-Patch16: cups-no-export-ssllibs.patch
-Patch17: cups-paps.patch
-Patch18: cups-language.patch
-Patch20: cups-direct-usb.patch
-Patch22: cups-dest-cache-v2.patch
-Patch24: cups-maxlogsize.patch
-Patch32: cups-pid.patch
-Patch41: cups-relro.patch
+Patch8: cups-serverbin-compat.patch
+Patch9: cups-locale.patch
+Patch10: cups-no-export-ssllibs.patch
+Patch11: cups-paps.patch
+Patch12: cups-language.patch
+Patch13: cups-direct-usb.patch
+Patch14: cups-dest-cache-v2.patch
+Patch15: cups-maxlogsize.patch
+Patch16: cups-pid.patch
+Patch17: cups-relro.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -120,16 +120,16 @@
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch11 -p1 -b .serverbin-compat
-%patch12 -p1 -b .locale
-%patch16 -p1 -b .no-export-ssllibs
-%patch17 -p1 -b .paps
-%patch18 -p1 -b .language
-%patch20 -p1 -b .direct-usb
-%patch22 -p1 -b .dest-cache-v2
-%patch24 -p1 -b .maxlogsize
-%patch32 -p1 -b .pid
-%patch41 -p1 -b .relro
+%patch8 -p1 -b .serverbin-compat
+%patch9 -p1 -b .locale
+%patch10 -p1 -b .no-export-ssllibs
+%patch11 -p1 -b .paps
+%patch12 -p1 -b .language
+%patch13 -p1 -b .direct-usb
+%patch14 -p1 -b .dest-cache-v2
+%patch15 -p1 -b .maxlogsize
+%patch16 -p1 -b .pid
+%patch17 -p1 -b .relro
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -389,6 +389,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
+- Renumbered patches.
+
 * Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-2
 - 1.2.2.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:25:24 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch,
	NONE, 1.1 openoffice.org.spec, 1.781, 1.782
Message-ID: <200607211125.k6LBPOAI016339@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16324

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch 
Log Message:
openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch

openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch:
 source/window/window.cxx     |    0 
 vcl/source/window/window.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.234.22.2
diff -u -r1.234.22.2 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx	18 May 2006 07:03:13 -0000	1.234.22.2
+++ openoffice.org/vcl/source/window/window.cxx	21 Jul 2006 10:56:06 -0000
@@ -822,7 +827,8 @@
         if( nStyle & WB_NOSHADOW )
             nFrameStyle |= SAL_FRAME_STYLE_NOSHADOW;
 
-        if( mpWindowImpl->mnType == WINDOW_DIALOG           ||
+        if( mpWindowImpl->mnType == WINDOW_DIALOG          ||
+            mpWindowImpl->mnType == WINDOW_TABDIALOG       ||
             mpWindowImpl->mnType == WINDOW_MODALDIALOG     ||
             mpWindowImpl->mnType == WINDOW_MODELESSDIALOG )
             nFrameStyle |= SAL_FRAME_STYLE_DIALOG;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.781
retrieving revision 1.782
diff -u -r1.781 -r1.782
--- openoffice.org.spec	21 Jul 2006 10:05:28 -0000	1.781
+++ openoffice.org.spec	21 Jul 2006 11:25:22 -0000	1.782
@@ -116,6 +116,7 @@
 Patch50: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
 Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch53: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -859,6 +860,7 @@
 %patch50 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
 %patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
 %patch52 -p1 -b .ooo67644.sw.spacing.patch
+%patch53 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
 
 tar xzf %{SOURCE1}
 
@@ -3338,6 +3340,7 @@
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
 - rh#199664# openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
+- rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 - drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - try and reanable visibility



From fedora-cvs-commits at redhat.com  Fri Jul 21 11:35:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 07:35:04 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.782, 1.783
Message-ID: <200607211135.k6LBZ4eH016470@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16455

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch 
Log Message:
openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch

openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch:
 sfx2/source/doc/objxtor.cxx |   11 ++++++++++-
 source/doc/objxtor.cxx      |    0 
 2 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch ---
Index: source/doc/objxtor.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/doc/objxtor.cxx,v
retrieving revision 1.64
diff -u -r1.64 objxtor.cxx
--- openoffice.org.orig/sfx2/source/doc/objxtor.cxx	2 May 2006 16:44:39 -0000	1.64
+++ openoffice.org/sfx2/source/doc/objxtor.cxx	21 Jul 2006 11:31:23 -0000
@@ -279,7 +279,16 @@
     }
 
     if ( pImp->bOwnsStorage && pImp->m_xDocStorage.is() )
-    	pImp->m_xDocStorage->dispose();
+    {
+	try
+	{
+    	    pImp->m_xDocStorage->dispose();
+	}
+	catch( Exception& )
+	{
+            /* what to do ? */
+	}
+    }
 
 	// The removing of the temporary file must be done as the latest step in the document destruction
     if ( pImp->aTempName.Len() )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -r1.782 -r1.783
--- openoffice.org.spec	21 Jul 2006 11:25:22 -0000	1.782
+++ openoffice.org.spec	21 Jul 2006 11:35:02 -0000	1.783
@@ -117,6 +117,7 @@
 Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
 Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
 Patch53: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -861,6 +862,7 @@
 %patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
 %patch52 -p1 -b .ooo67644.sw.spacing.patch
 %patch53 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
+%patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3341,6 +3343,7 @@
 - rh#199535# presentation templates duplicated in zh-CN
 - rh#199664# openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
 - rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+- rh#199665# openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 - drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - try and reanable visibility



From fedora-cvs-commits at redhat.com  Fri Jul 21 12:00:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 08:00:07 -0400
Subject: rpms/cups/devel cups-lspp.patch,NONE,1.1 cups.spec,1.233,1.234
Message-ID: <200607211200.k6LC07Nt016850@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16754

Modified Files:
	cups.spec 
Added Files:
	cups-lspp.patch 
Log Message:
* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-3
- Apply Matt Anderson's LSPP patch.

cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++++
 config.h.in                 |    7 +
 configure.in                |    2 
 cups/cups.h                 |    8 +
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile          |    6 
 scheduler/access.c          |   56 ++++++++
 scheduler/client.c          |   93 ++++++++++++++
 scheduler/client.h          |   14 ++
 scheduler/conf.c            |   42 ++++++
 scheduler/conf.h            |    8 +
 scheduler/ipp.c             |  213 +++++++++++++++++++++++++++++++++
 scheduler/job.c             |  141 ++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/main.c            |   20 +++
 scheduler/printers.c        |   16 ++
 20 files changed, 1505 insertions(+), 6 deletions(-)

--- NEW FILE cups-lspp.patch ---
--- /dev/null	2006-07-21 09:48:40.571484750 +0100
+++ cups-1.2.2/config-scripts/cups-lspp.m4	2006-07-21 12:42:40.000000000 +0100
@@ -0,0 +1,36 @@
+dnl
+dnl   LSPP code for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 2005-2006 by Hewlett-Packard Development Company, L.P.
+dnl
+dnl   This program is free software; you can redistribute it and/or modify
+dnl   it under the terms of the GNU General Public License as published by
+dnl   the Free Software Foundation; version 2.
+dnl
+dnl   This program is distributed in the hope that it will be useful, but
+dnl   WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl   General Public License for more details.
+dnl
+dnl   You should have received a copy of the GNU General Public License
+dnl   along with this program; if not, write to the Free Software Foundation,
+dnl   Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA
+dnl
+
+dnl Are we trying to meet LSPP requirements
+AC_ARG_ENABLE(lspp, [  --enable-lspp           turn on auditing and label support, default=no])
+
+if test x"$enable_lspp" != xno; then
+    case "$uname" in
+        Linux)
+            AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)])
+            AC_CHECK_HEADER(libaudit.h)
+            AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)])
+            AC_CHECK_HEADER(selinux/selinux.h)
+            AC_DEFINE(WITH_LSPP)
+            ;;
+        *)
+            # All others
+            ;;
+    esac
+fi
--- cups-1.2.2/configure.in.lspp	2006-05-30 21:31:10.000000000 +0100
+++ cups-1.2.2/configure.in	2006-07-21 12:42:40.000000000 +0100
@@ -47,6 +47,8 @@
 sinclude(config-scripts/cups-pdf.m4)
 sinclude(config-scripts/cups-scripting.m4)
 
+sinclude(config-scripts/cups-lspp.m4)
+
 INSTALL_LANGUAGES=""
 UNINSTALL_LANGUAGES=""
 LANGFILES=""
--- cups-1.2.2/Makedefs.in.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/Makedefs.in	2006-07-21 12:42:40.000000000 +0100
@@ -135,7 +135,7 @@
 			@LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
 LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+LIBS		=	$(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
--- /dev/null	2006-07-21 09:48:40.571484750 +0100
+++ cups-1.2.2/data/mls	2006-07-21 12:42:40.000000000 +0100
@@ -0,0 +1,277 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
+%%Pages: 1
+%%LanguageLevel: 1
+%%DocumentData: Clean7Bit
+%%DocumentSuppliedResources: procset bannerprint/1.0
+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
+%%Creator: Michael Sweet, Easy Software Products
+%%CreationDate: May 10, 2000
+%%Title: Test Page
+%%EndComments
+%%BeginProlog
+%%BeginResource procset bannerprint 1.1 0
+%
+%   PostScript banner page for the Common UNIX Printing System ("CUPS").
+%
+%   Copyright 1993-2005 by Easy Software Products
+%
+%   These coded instructions, statements, and computer programs are the
+%   property of Easy Software Products and are protected by Federal
+%   copyright law.  Distribution and use rights are outlined in the file
+%   "LICENSE.txt" which should have been included with this file.  If this
+%   file is missing or damaged please contact Easy Software Products
+%   at:
+%
+%       Attn: CUPS Licensing Information
+%       Easy Software Products
+%       44141 Airport View Drive, Suite 204
+%       Hollywood, Maryland 20636 USA
+%
+%       Voice: (301) 373-9600
+%       EMail: cups-info at cups.org
+%         WWW: http://www.cups.org
+%
+/CENTER {			% Draw centered text
+				% (name) CENTER -
+  dup stringwidth pop		% Get the width of the string
+  0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
+  show				% Show the string
+} bind def
+/RIGHT {			% Draw right-justified text
+				% (name) RIGHT -
+  dup stringwidth pop		% Get the width of the string
+  neg 0 rmoveto			% Shift left the entire distance
+  show				% Show the string
+} bind def
+/NUMBER {			% Draw a number
+				% power n NUMBER -
+  1 index 1 eq {		% power == 1?
+    round cvi exch pop		% Convert "n" to integer
+  } {
+    1 index mul round exch div	% Truncate extra decimal places
+  } ifelse
+  100 string cvs show		% Convert to a string and show it...
+} bind def
+/CUPSLOGO {			% Draw the CUPS logo
+				% height CUPSLOGO
+  % Start with a big C...
+  /Helvetica findfont 1 index scalefont setfont
+  0 setgray
+  0 0 moveto
+  (C) show
+
+  % Then "UNIX Printing System" much smaller...
+  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
+  0.25 mul
+  dup dup 2.0 mul moveto
+  (UNIX) show
+  dup dup 1.6 mul moveto
+  (Printing) show
+  dup 1.2 mul moveto
+  (System) show
+} bind def
+/ESPLOGO {			% Draw the ESP logo
+				% height ESPLOGO
+  % Compute the size of the logo...
+  0 0
+  2 index 1.5 mul 3 index
+
+  % Do the "metallic" fill from 10% black to 40% black...
+  1 -0.001 0 {
+    dup			% loopval
+    -0.15 mul		% loopval * -0.15
+    0.9 add		% 0.9 - loopval * 0.15
+    setgray		% set gray shade
+
+    0			% x
+    1 index neg		% loopval
+    1 add		% 1 - loopval
+    3 index		% height
+    mul			% height * (1 - loopval)
+    moveto		% starting point
+
+    dup			% loopval
+    3 index		% width
+    mul			% loopval * width
+    2 index		% height
+    lineto		% Next point
+
+    0			% x
+    2 index		% height
+    lineto		% Next point
+
+    closepath
+    fill
+
+    dup			% loopval
+    0.15 mul		% loopval * 0.15
+    0.6 add		% 0.6 + loopval * 0.15
+    setgray
+
+    dup			% loopval
+    neg 1 add		% 1 - loopval
+    3 index		% width
+    mul			% (1 - loopval) * width
+    0			% y
+    moveto		% Starting point
+
+    2 index		% width
+    exch		% loopval
+    2 index		% height
+    mul			% loopval * height
+    lineto		% Next point
+
+    1 index		% width
+    0			% y
+    lineto		% Next point
+
+    closepath
+    fill
+  } for
+
+  0 setgray rectstroke
+
+  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
+  dup 40 div
+
+  dup 4 mul 1 index 25 mul moveto (E) show
+  dup 10 mul 1 index 15 mul moveto (S) show
+  dup 16 mul 1 index 5 mul moveto (P) show
+
+  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
+  dup 14 mul 1 index 29 mul moveto (asy) show
+  dup 20 mul 1 index 19 mul moveto (oftware) show
+  dup 26 mul 1 index 9 mul moveto (roducts) show
+
+  pop
+} bind def
+%%EndResource
+%%EndProlog
+%%Page: 1 1
+gsave
+
+  % Determine the imageable area and device resolution...
+  initclip newpath clippath pathbbox	% Get bounding rectangle
+  72 div /pageTop exch def		% Get top margin in inches
+  72 div /pageRight exch def		% Get right margin in inches
+  72 div /pageBottom exch def		% Get bottom margin in inches
+  72 div /pageLeft exch def		% Get left margin in inches
+
+  /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
+  /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
+
+  /boxWidth				% width of text box
+  pageWidth pageHeight lt
+  { pageWidth 54 mul }
+  { pageHeight 42 mul }
+  ifelse def
+
+  newpath				% Clear bounding path
+
+  % Create fonts...
+  /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
+  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+
+  /mediumFont /Helvetica findfont	% mediumFont = Helvetica
+  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+
+  % Offset page to account for lower-left margin...
+  pageLeft 72 mul
+  pageBottom 72 mul
+  translate
+
+  % Draw the label at the top and bottom...
+  0 setgray				% Color
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 72 mul			% Top of page
+  pageWidth -7 mul add			% - 2 lines
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 6 mul			% Bottom of page
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  % Job information box...
+  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  0.5 setgray rectfill			% Draw a shadow
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+
+  4 copy 1 setgray rectfill		% Clear the box to white
+  0 setgray rectstroke			% Draw a black box around it...
+
+  % Job information text...
+  mediumFont setfont			% Medium sized font
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 5 mul add			% y += 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Job ID: ) RIGHT
+  moveto
+  ({printer-name}-{job-id}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 2 mul add			% y += 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Title: ) RIGHT
+  moveto
+  ({job-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -1 mul add			% y -= 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Requesting User: ) RIGHT
+  moveto
+  ({job-originating-user-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -4 mul add			% y -= 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Billing Info: ) RIGHT
+  moveto
+  ({?job-billing}) show
+
+  % Then the CUPS logo....
+  gsave
+    pageWidth 4 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 9 mul CUPSLOGO
+  grestore
+
+  % And the ESP logo....
+  gsave
+    pageWidth 59 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 6 mul ESPLOGO
+  grestore
+% Show the page...
+grestore
+showpage
+%
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+%
+%%EOF
--- /dev/null	2006-07-21 09:48:40.571484750 +0100
+++ cups-1.2.2/data/selinux	2006-07-21 12:42:40.000000000 +0100
@@ -0,0 +1,277 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
+%%Pages: 1
+%%LanguageLevel: 1
+%%DocumentData: Clean7Bit
+%%DocumentSuppliedResources: procset bannerprint/1.0
+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
+%%Creator: Michael Sweet, Easy Software Products
+%%CreationDate: May 10, 2000
+%%Title: Test Page
+%%EndComments
+%%BeginProlog
+%%BeginResource procset bannerprint 1.1 0
+%
+%   PostScript banner page for the Common UNIX Printing System ("CUPS").
+%
+%   Copyright 1993-2005 by Easy Software Products
+%
+%   These coded instructions, statements, and computer programs are the
+%   property of Easy Software Products and are protected by Federal
+%   copyright law.  Distribution and use rights are outlined in the file
+%   "LICENSE.txt" which should have been included with this file.  If this
+%   file is missing or damaged please contact Easy Software Products
+%   at:
+%
+%       Attn: CUPS Licensing Information
+%       Easy Software Products
+%       44141 Airport View Drive, Suite 204
+%       Hollywood, Maryland 20636 USA
+%
+%       Voice: (301) 373-9600
+%       EMail: cups-info at cups.org
+%         WWW: http://www.cups.org
+%
+/CENTER {			% Draw centered text
+				% (name) CENTER -
+  dup stringwidth pop		% Get the width of the string
+  0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
+  show				% Show the string
+} bind def
+/RIGHT {			% Draw right-justified text
+				% (name) RIGHT -
+  dup stringwidth pop		% Get the width of the string
+  neg 0 rmoveto			% Shift left the entire distance
+  show				% Show the string
+} bind def
+/NUMBER {			% Draw a number
+				% power n NUMBER -
+  1 index 1 eq {		% power == 1?
+    round cvi exch pop		% Convert "n" to integer
+  } {
+    1 index mul round exch div	% Truncate extra decimal places
+  } ifelse
+  100 string cvs show		% Convert to a string and show it...
+} bind def
+/CUPSLOGO {			% Draw the CUPS logo
+				% height CUPSLOGO
+  % Start with a big C...
+  /Helvetica findfont 1 index scalefont setfont
+  0 setgray
+  0 0 moveto
+  (C) show
+
+  % Then "UNIX Printing System" much smaller...
+  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
+  0.25 mul
+  dup dup 2.0 mul moveto
+  (UNIX) show
+  dup dup 1.6 mul moveto
+  (Printing) show
+  dup 1.2 mul moveto
+  (System) show
+} bind def
+/ESPLOGO {			% Draw the ESP logo
+				% height ESPLOGO
+  % Compute the size of the logo...
+  0 0
+  2 index 1.5 mul 3 index
+
+  % Do the "metallic" fill from 10% black to 40% black...
+  1 -0.001 0 {
+    dup			% loopval
+    -0.15 mul		% loopval * -0.15
+    0.9 add		% 0.9 - loopval * 0.15
+    setgray		% set gray shade
+
+    0			% x
+    1 index neg		% loopval
+    1 add		% 1 - loopval
+    3 index		% height
+    mul			% height * (1 - loopval)
+    moveto		% starting point
+
+    dup			% loopval
+    3 index		% width
+    mul			% loopval * width
+    2 index		% height
+    lineto		% Next point
+
+    0			% x
+    2 index		% height
+    lineto		% Next point
+
+    closepath
+    fill
+
+    dup			% loopval
+    0.15 mul		% loopval * 0.15
+    0.6 add		% 0.6 + loopval * 0.15
+    setgray
+
+    dup			% loopval
+    neg 1 add		% 1 - loopval
+    3 index		% width
+    mul			% (1 - loopval) * width
+    0			% y
+    moveto		% Starting point
+
+    2 index		% width
+    exch		% loopval
+    2 index		% height
+    mul			% loopval * height
+    lineto		% Next point
+
+    1 index		% width
+    0			% y
+    lineto		% Next point
+
+    closepath
+    fill
+  } for
+
+  0 setgray rectstroke
+
+  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
+  dup 40 div
+
+  dup 4 mul 1 index 25 mul moveto (E) show
+  dup 10 mul 1 index 15 mul moveto (S) show
+  dup 16 mul 1 index 5 mul moveto (P) show
+
+  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
+  dup 14 mul 1 index 29 mul moveto (asy) show
+  dup 20 mul 1 index 19 mul moveto (oftware) show
+  dup 26 mul 1 index 9 mul moveto (roducts) show
+
+  pop
+} bind def
+%%EndResource
+%%EndProlog
+%%Page: 1 1
+gsave
+
+  % Determine the imageable area and device resolution...
+  initclip newpath clippath pathbbox	% Get bounding rectangle
+  72 div /pageTop exch def		% Get top margin in inches
+  72 div /pageRight exch def		% Get right margin in inches
+  72 div /pageBottom exch def		% Get bottom margin in inches
+  72 div /pageLeft exch def		% Get left margin in inches
+
+  /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
+  /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
+
+  /boxWidth				% width of text box
+  pageWidth pageHeight lt
+  { pageWidth 54 mul }
+  { pageHeight 42 mul }
+  ifelse def
+
+  newpath				% Clear bounding path
+
+  % Create fonts...
+  /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
+  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+
+  /mediumFont /Helvetica findfont	% mediumFont = Helvetica
+  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+
+  % Offset page to account for lower-left margin...
+  pageLeft 72 mul
+  pageBottom 72 mul
+  translate
+
+  % Draw the label at the top and bottom...
+  0 setgray				% Color
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 72 mul			% Top of page
+  pageWidth -7 mul add			% - 2 lines
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 6 mul			% Bottom of page
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  % Job information box...
+  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  0.5 setgray rectfill			% Draw a shadow
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+
+  4 copy 1 setgray rectfill		% Clear the box to white
+  0 setgray rectstroke			% Draw a black box around it...
+
+  % Job information text...
+  mediumFont setfont			% Medium sized font
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 5 mul add			% y += 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Job ID: ) RIGHT
+  moveto
+  ({printer-name}-{job-id}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 2 mul add			% y += 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Title: ) RIGHT
+  moveto
+  ({job-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -1 mul add			% y -= 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Requesting User: ) RIGHT
+  moveto
+  ({job-originating-user-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -4 mul add			% y -= 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Billing Info: ) RIGHT
+  moveto
+  ({?job-billing}) show
+
+  % Then the CUPS logo....
+  gsave
+    pageWidth 4 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 9 mul CUPSLOGO
+  grestore
+
+  % And the ESP logo....
+  gsave
+    pageWidth 59 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 6 mul ESPLOGO
+  grestore
+% Show the page...
+grestore
+showpage
+%
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+%
+%%EOF
--- /dev/null	2006-07-21 09:48:40.571484750 +0100
+++ cups-1.2.2/data/te	2006-07-21 12:42:40.000000000 +0100
@@ -0,0 +1,277 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
+%%Pages: 1
+%%LanguageLevel: 1
+%%DocumentData: Clean7Bit
+%%DocumentSuppliedResources: procset bannerprint/1.0
+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
+%%Creator: Michael Sweet, Easy Software Products
+%%CreationDate: May 10, 2000
+%%Title: Test Page
+%%EndComments
+%%BeginProlog
+%%BeginResource procset bannerprint 1.1 0
+%
+%   PostScript banner page for the Common UNIX Printing System ("CUPS").
+%
+%   Copyright 1993-2005 by Easy Software Products
+%
+%   These coded instructions, statements, and computer programs are the
+%   property of Easy Software Products and are protected by Federal
+%   copyright law.  Distribution and use rights are outlined in the file
+%   "LICENSE.txt" which should have been included with this file.  If this
+%   file is missing or damaged please contact Easy Software Products
+%   at:
+%
+%       Attn: CUPS Licensing Information
+%       Easy Software Products
+%       44141 Airport View Drive, Suite 204
+%       Hollywood, Maryland 20636 USA
+%
+%       Voice: (301) 373-9600
+%       EMail: cups-info at cups.org
+%         WWW: http://www.cups.org
+%
+/CENTER {			% Draw centered text
+				% (name) CENTER -
+  dup stringwidth pop		% Get the width of the string
+  0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
+  show				% Show the string
+} bind def
+/RIGHT {			% Draw right-justified text
+				% (name) RIGHT -
+  dup stringwidth pop		% Get the width of the string
+  neg 0 rmoveto			% Shift left the entire distance
+  show				% Show the string
+} bind def
+/NUMBER {			% Draw a number
+				% power n NUMBER -
+  1 index 1 eq {		% power == 1?
+    round cvi exch pop		% Convert "n" to integer
+  } {
+    1 index mul round exch div	% Truncate extra decimal places
+  } ifelse
+  100 string cvs show		% Convert to a string and show it...
+} bind def
+/CUPSLOGO {			% Draw the CUPS logo
+				% height CUPSLOGO
+  % Start with a big C...
+  /Helvetica findfont 1 index scalefont setfont
+  0 setgray
+  0 0 moveto
+  (C) show
+
+  % Then "UNIX Printing System" much smaller...
+  /Helvetica-Bold findfont 1 index 9 div scalefont setfont
+  0.25 mul
+  dup dup 2.0 mul moveto
+  (UNIX) show
+  dup dup 1.6 mul moveto
+  (Printing) show
+  dup 1.2 mul moveto
+  (System) show
+} bind def
+/ESPLOGO {			% Draw the ESP logo
+				% height ESPLOGO
+  % Compute the size of the logo...
+  0 0
+  2 index 1.5 mul 3 index
+
+  % Do the "metallic" fill from 10% black to 40% black...
+  1 -0.001 0 {
+    dup			% loopval
+    -0.15 mul		% loopval * -0.15
+    0.9 add		% 0.9 - loopval * 0.15
+    setgray		% set gray shade
+
+    0			% x
+    1 index neg		% loopval
+    1 add		% 1 - loopval
+    3 index		% height
+    mul			% height * (1 - loopval)
+    moveto		% starting point
+
+    dup			% loopval
+    3 index		% width
+    mul			% loopval * width
+    2 index		% height
+    lineto		% Next point
+
+    0			% x
+    2 index		% height
+    lineto		% Next point
+
+    closepath
+    fill
+
+    dup			% loopval
+    0.15 mul		% loopval * 0.15
+    0.6 add		% 0.6 + loopval * 0.15
+    setgray
+
+    dup			% loopval
+    neg 1 add		% 1 - loopval
+    3 index		% width
+    mul			% (1 - loopval) * width
+    0			% y
+    moveto		% Starting point
+
+    2 index		% width
+    exch		% loopval
+    2 index		% height
+    mul			% loopval * height
+    lineto		% Next point
+
+    1 index		% width
+    0			% y
+    lineto		% Next point
+
+    closepath
+    fill
+  } for
+
+  0 setgray rectstroke
+
+  /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
+  dup 40 div
+
+  dup 4 mul 1 index 25 mul moveto (E) show
+  dup 10 mul 1 index 15 mul moveto (S) show
+  dup 16 mul 1 index 5 mul moveto (P) show
+
+  /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
+  dup 14 mul 1 index 29 mul moveto (asy) show
+  dup 20 mul 1 index 19 mul moveto (oftware) show
+  dup 26 mul 1 index 9 mul moveto (roducts) show
+
+  pop
+} bind def
+%%EndResource
+%%EndProlog
+%%Page: 1 1
+gsave
+
+  % Determine the imageable area and device resolution...
+  initclip newpath clippath pathbbox	% Get bounding rectangle
+  72 div /pageTop exch def		% Get top margin in inches
+  72 div /pageRight exch def		% Get right margin in inches
+  72 div /pageBottom exch def		% Get bottom margin in inches
+  72 div /pageLeft exch def		% Get left margin in inches
+
+  /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
+  /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
+
+  /boxWidth				% width of text box
+  pageWidth pageHeight lt
+  { pageWidth 54 mul }
+  { pageHeight 42 mul }
+  ifelse def
+
+  newpath				% Clear bounding path
+
+  % Create fonts...
+  /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
+  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+
+  /mediumFont /Helvetica findfont	% mediumFont = Helvetica
+  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+
+  % Offset page to account for lower-left margin...
+  pageLeft 72 mul
+  pageBottom 72 mul
+  translate
+
+  % Draw the label at the top and bottom...
+  0 setgray				% Color
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 72 mul			% Top of page
+  pageWidth -7 mul add			% - 2 lines
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 6 mul			% Bottom of page
+  moveto				% Position text
+  bigFont setfont			% Font
+  ({mls-label}) CENTER		% Show text centered
+
+  % Job information box...
+  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  0.5 setgray rectfill			% Draw a shadow
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  boxWidth 0.5 mul sub			% x-= 1/2 box width
+  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
+  boxWidth				% w = box width
+  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+
+  4 copy 1 setgray rectfill		% Clear the box to white
+  0 setgray rectstroke			% Draw a black box around it...
+
+  % Job information text...
+  mediumFont setfont			% Medium sized font
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 5 mul add			% y += 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Job ID: ) RIGHT
+  moveto
+  ({printer-name}-{job-id}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight 2 mul add			% y += 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Title: ) RIGHT
+  moveto
+  ({job-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -1 mul add			% y -= 1 line
+  2 copy				% Copy X & Y
+  moveto
+  (Requesting User: ) RIGHT
+  moveto
+  ({job-originating-user-name}) show
+
+  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
+  pageHeight 36 mul			% y = pageHeight * 1/2 * 72
+  pageHeight -4 mul add			% y -= 2 lines
+  2 copy				% Copy X & Y
+  moveto
+  (Billing Info: ) RIGHT
+  moveto
+  ({?job-billing}) show
+
+  % Then the CUPS logo....
+  gsave
+    pageWidth 4 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 9 mul CUPSLOGO
+  grestore
+
+  % And the ESP logo....
+  gsave
+    pageWidth 59 mul
+    pageWidth 6 mul
+    translate
+    pageWidth 6 mul ESPLOGO
+  grestore
+% Show the page...
+grestore
+showpage
+%
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+%
+%%EOF
--- cups-1.2.2/data/Makefile.lspp	2006-03-19 03:23:34.000000000 +0000
+++ cups-1.2.2/data/Makefile	2006-07-21 12:42:40.000000000 +0100
@@ -34,7 +34,10 @@
 		secret \
 		standard \
 		topsecret \
-		unclassified
+		unclassified \
+		selinux \
+		mls \
+		te
 
 CHARMAPS =	\
 		euc-cn.txt \
--- cups-1.2.2/config.h.in.lspp	2006-06-05 19:42:53.000000000 +0100
+++ cups-1.2.2/config.h.in	2006-07-21 12:42:40.000000000 +0100
@@ -443,6 +443,13 @@
 #undef HAVE_APPLETALK_AT_PROTO_H
 
 
+/*
+ * Are we trying to meet LSPP requirements?
+ */
+
+#undef WITH_LSPP
+
+
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
--- cups-1.2.2/scheduler/printers.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/printers.c	2006-07-21 12:42:40.000000000 +0100
@@ -57,6 +57,8 @@
  *                                 printing desktop tools.
  */
 
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
 /*
  * Include necessary headers...
  */
@@ -79,6 +81,9 @@
 static void	write_irix_state(cupsd_printer_t *p);
 #endif /* __sgi */
 
+#ifdef WITH_LSPP
+#  include <libaudit.h>
+#endif /* WITH_LSPP */
 
 /*
  * 'cupsdAddPrinter()' - Add a printer to the system.
@@ -1472,6 +1477,9 @@
 		  "two-sided-long-edge",
 		  "two-sided-short-edge"
 		};
+#ifdef WITH_LSPP
+  char		*audit_message;		/* Audit message string */
+#endif /* WITH_LSPP */
 
 
   DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
@@ -1578,6 +1586,14 @@
       attr->values[1].string.text = _cupsStrAlloc(Classification ?
 	                                   Classification : p->job_sheets[1]);
     }
+#ifdef WITH_LSPP
+    audit_message = NULL;
+    cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s",
+                    p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1]);
+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
+                           ServerName, NULL, NULL, 1);
+    free(audit_message);
+#endif /* WITH_LSPP */
   }
 
   printer_type = p->type;
--- cups-1.2.2/scheduler/job.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/job.c	2006-07-21 12:42:40.000000000 +0100
@@ -68,6 +68,9 @@
  *   unload_job()               - Unload a job from memory.
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
 /*
  * Include necessary headers...
  */
@@ -77,6 +80,11 @@
 #include <cups/backend.h>
 #include <cups/dir.h>
 
+#ifdef WITH_LSPP
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#include <libaudit.h>
+#endif /* WITH_LSPP */
 
 /*
  * Local globals...
@@ -985,6 +993,23 @@
     cupsdSetString(&job->dest, dest);
   }
 
+#ifdef WITH_LSPP
+  if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL)
+    cupsdSetString(&job->scon, attr->values[0].string.text);
+  else if (is_lspp_config())
+  {
+   /*
+    * There was no security context so delete the job
+    */
+    cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!",
+                    jobfile);
+    ippDelete(job->attrs);
+    job->attrs = NULL;
+    unlink(jobfile);
+    return;
+  }
+#endif /* WITH_LSPP */
+
   job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                      IPP_TAG_INTEGER);
   job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
@@ -2428,6 +2453,17 @@
   int			remote_job;	/* Remote print job? */
   static char		*options = NULL;/* Full list of options */
   static int		optlength = 0;	/* Length of option buffer */
+#ifdef WITH_LSPP
+  int			acstatus = 0;	/* return value of the access check */
+  pid_t			acpid = -1;	/* pid for the access check */
+  const char		*mls_label = NULL;	/* SL to put in classification env var */
+  char			*audit_message = NULL;	/* Audit message string */
+  char			*printerfile = NULL;	/* Device file pointed to by the printer */
+  char			*acargv[3];	/* Command line args */
+  char			buffer[1024] = {0};	/* argv[0] buffer */
+  char			*acenvp[MAX_ENV];	/* Environment */
+  context_t		job_context;	/* SELinux context of the job */
+#endif /* WITH_LSPP */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d",
@@ -2709,6 +2745,76 @@
 
   cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page);
 
+#ifdef WITH_LSPP
+  if (is_lspp_config())
+  {
+   /*
+    * Perform an access check before printing, but only if the printer starts with /dev/
+    */
+    printerfile = strdup(printer->device_uri);
+    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
+    {
+      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to determine printer device file");
+        cupsdCancelJob(job, 0);
+        return;
+      }
+    }
+
+    printerfile++;
+    if (strncmp(printerfile, "/dev/", 5) == 0)
+    {
+      if (setexeccon(job->scon) != 0)
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon);
+        cupsdCancelJob(job, 0);
+        return;
+      }
+
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s",
+                      printerfile);
+
+      snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin);
+      acargv[0] = "access";
+      acargv[1] = printerfile;
+      acargv[2] = NULL;
+
+      cupsdLoadEnv(acenvp, (int)(sizeof(acenvp) / sizeof(acenvp[0])));
+
+      if (!cupsdStartProcess(buffer, acargv, acenvp, -1, -1, -1, -1, 0, &acpid))
+      {
+        waitpid(acpid, &acstatus, 0);
+        if (WIFEXITED(acstatus))
+        {
+          if (WEXITSTATUS(acstatus) != 0) 
+          {
+           /*
+            * The access check failed, so cancel the job and send an audit message
+            */
+            audit_message = NULL;
+            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled,"
+                                            " unable to access printer=%s",
+                            job->id, job->auid, job->username, job->scon, printer->name);
+            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+                                   ServerName, NULL, NULL, 0);
+            free(audit_message);
+
+            cupsdCancelJob(job, 0);
+
+            return;
+          }
+          else
+          {
+            cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: access check succeeded (returned %d)",
+                            WEXITSTATUS(acstatus));
+          }
+        }
+      }
+    }
+  }
+#endif /* WITH_LSPP */
+
  /*
   * Building the options string is harder than it needs to be, but
   * for the moment we need to pass strings for command-line args and
@@ -3026,6 +3132,41 @@
     envp[envc ++] = final_content_type;
   }
 
+#ifdef WITH_LSPP
+  if (is_lspp_config())
+  {
+    if (job->scon == NULL)
+    {
+      audit_message = NULL;
+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s",
+                      job->id, job->auid, job->username, printer->name);
+      audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
+                             ServerName, NULL, NULL, 1);
+      free(audit_message);
+    }
+    else 
+    {
+      job_context = context_new(job->scon);
+      if (strcasecmp(Classification, MLS_CONFIG) == 0)
+        mls_label = context_range_get(job_context);
+      else if (strcasecmp(Classification, TE_CONFIG) == 0)
+        mls_label = context_type_get(job_context);
+      else  // default is SELinux which means print the whole context
+        mls_label = context_str(job_context);
+      snprintf(classification, sizeof(classification), "CLASSIFICATION=%s",
+               mls_label);
+      envp[envc ++] = classification;
+      audit_message = NULL;
+      cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s obj=%s",
+                      job->id, job->auid, job->username, printer->name, job->scon);
+      audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+                             ServerName, NULL, NULL, 1);
+      context_free(job_context);
+      free(audit_message);
+    }
+  }
+  else 
+#endif /* WITH_LSPP */
   if (Classification && !banner_page)
   {
     if ((attr = ippFindAttribute(job->attrs, "job-sheets",
--- cups-1.2.2/scheduler/client.h.lspp	2006-03-18 03:05:12.000000000 +0000
+++ cups-1.2.2/scheduler/client.h	2006-07-21 12:42:40.000000000 +0100
@@ -22,6 +22,13 @@
  *         WWW: http://www.cups.org
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
+#ifdef WITH_LSPP
+#include <selinux/selinux.h>
+#endif /* WITH_LSPP */
+
 /*
  * HTTP client structure...
  */
@@ -55,6 +62,10 @@
   http_addr_t		clientaddr;	/* Client address */
   char			servername[256];/* Server name for connection */
   int			serverport;	/* Server port for connection */
+#ifdef WITH_LSPP
+  security_context_t	scon;		/* Security context of connection */
+  uid_t			auid;		/* Audit loginuid of the client */
+#endif /* WITH_LSPP */
 };
 
 #define HTTP(con) &((con)->http)
@@ -118,6 +129,9 @@
 extern void	cupsdStopListening(void);
 extern void	cupsdUpdateCGI(void);
 extern int	cupsdWriteClient(cupsd_client_t *con);
+#ifdef WITH_LSPP
+extern uid_t	client_pid_to_auid(pid_t clipid);
+#endif /* WITH_LSPP */
 
 
 /*
--- cups-1.2.2/scheduler/main.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/main.c	2006-07-21 12:42:40.000000000 +0100
@@ -47,6 +47,8 @@
  *   usage()                   - Show scheduler usage.
  */
 
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
 /*
  * Include necessary headers...
  */
@@ -69,6 +71,9 @@
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef WITH_LSPP
+#  include <libaudit.h>
+#endif /* WITH_LSPP */
 
 /*
  * Local functions...
@@ -351,6 +356,17 @@
 #endif /* DEBUG */
   }
 
+#ifdef WITH_LSPP
+  if ((AuditLog = audit_open()) < 0 )
+  {
+    if (is_lspp_config())
+    {
+      fprintf(stderr, "cupsd: unable to start auditing");
+      return -1;
+    }
+  }
+#endif /* WITH_LSPP */
+
  /*
   * Set the timezone info...
   */
@@ -1115,6 +1131,10 @@
   free(input);
   free(output);
 
+#ifdef WITH_LSPP
+  audit_close(AuditLog);
+#endif /* WITH_LSPP */
+
   return (!stop_scheduler);
 }
 
--- cups-1.2.2/scheduler/job.h.lspp	2006-04-14 19:17:18.000000000 +0100
+++ cups-1.2.2/scheduler/job.h	2006-07-21 12:42:40.000000000 +0100
@@ -22,6 +22,13 @@
  *         WWW: http://www.cups.org
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
+#ifdef WITH_LSPP
+#include <selinux/selinux.h>
+#endif /* WITH_LSPP */
+
 /*
  * Job request structure...
  */
@@ -55,6 +62,10 @@
   int			status;		/* Status code from filters */
   cupsd_printer_t	*printer;	/* Printer this job is assigned to */
   int			tries;		/* Number of tries for this job */
+#ifdef WITH_LSPP
+  security_context_t	scon;		/* Security context of job */
+  uid_t			auid;		/* Audit loginuid for this job */
+#endif /* WITH_LSPP */
 } cupsd_job_t;
 
 
--- cups-1.2.2/scheduler/ipp.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/ipp.c	2006-07-21 12:42:40.000000000 +0100
@@ -96,6 +96,9 @@
  *   validate_user()             - Validate the user for the request.
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
 /*
  * Include necessary headers...
  */
@@ -106,6 +109,14 @@
 #  include <paper.h>
 #endif /* HAVE_LIBPAPER */
 
+#ifdef WITH_LSPP
+#include <libaudit.h>
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#include <selinux/avc.h>
+#include <selinux/flask.h>
+#include <selinux/av_permissions.h>
+#endif /* WITH_LSPP */
 
 /*
  * PPD default choice structure...
@@ -1166,6 +1177,15 @@
   int		kbytes;			/* Size of print file */
   int		i;			/* Looping var */
   int		lowerpagerange;		/* Page range bound */
+#ifdef WITH_LSPP
+  char		*argv[3];		/* Command line args */
+  char		*envp[MAX_ENV];		/* Environment */
+  char		*audit_message;		/* Audit message string */
+  char		buffer[1024] = {0};	/* argv[0] buffer */
+  int		acstatus;		/* return value of the access check */
+  pid_t		acpid;			/* pid for the access check */
+  char		*printerfile;		/* device file pointed to by the printer */
+#endif /* WITH_LSPP */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con,
@@ -1342,6 +1362,97 @@
     return (NULL);
   }
 
+#ifdef WITH_LSPP
+  if (is_lspp_config())
+  {
+    if (!con->scon || strlen(con->scon) == 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: missing classification for connection \'%s\'!", dest);
+      send_ipp_status(con, IPP_INTERNAL_ERROR, _("Missing required secuirty attributes."));
+      return (NULL);
+    }
+    else
+    {
+     /*
+      * duplicate the security context and auid of the connection into the job structure
+      */
+      job->scon    = strdup(con->scon);
+      job->auid    = con->auid;
+
+     /* 
+      * add the security context to the request so that on a restart the security
+      * attributes will be able to be restored
+      */
+      ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "security-context", 
+                   NULL, job->scon);
+    }
+
+   /*
+    * Perform an access check so that if the user gets feedback at enqueue time
+    */
+
+    printerfile = strdup(printer->device_uri);
+    if ((printerfile = strrchr(printer->device_uri, '=')) == NULL)
+    {
+      if ((printerfile = strrchr(printer->device_uri, ':')) == NULL)
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: Unable to determine printer device file");
+        send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to perform printer access check"));
+        return (NULL); 
+      }
+    }
+
+    printerfile++;
+    if (strncmp(printerfile, "/dev/", 5) == 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s",
+                      printerfile);
+
+      if (setexeccon(job->scon) != 0)
+      {
+        cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: Unable to setexeccon to %s", job->scon);
+        send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error"));
+        return (NULL);
+      }
+
+      snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin);
+      argv[0] = "access";
+      argv[1] = printerfile;
+      argv[2] = NULL;
+
+      cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0])));
+    
+      if (!cupsdStartProcess(buffer, argv, envp, -1, -1, -1, -1, 0, &acpid))
+      {
+        waitpid(acpid, &acstatus, 0);
+        if (WIFEXITED(acstatus))
+        {
+          if (WEXITSTATUS(acstatus) != 0)
+          {
+           /*
+            * The access check failed, so cancel the job and send an audit message
+            */
+            audit_message = NULL;
+            cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s refused, unable to access printer=%s",
+                            job->id, con->auid, con->username, con->scon, printer->name);
+            audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+                                   ServerName, NULL, NULL, 0);
+            free(audit_message);
+
+            send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer"));
+            return (NULL);
+          }
+          else
+          {
+            cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: access check succeeded (returned %d)",
+                            WEXITSTATUS(acstatus));
+          }
+        }
+      }
+    }
+  }
+#endif /* WITH_LSPP */
+
   job->dtype   = dtype;
   job->attrs   = con->request;
   con->request = NULL;
@@ -1553,6 +1664,19 @@
 
       if (ClassifyOverride)
       {
+#ifdef WITH_LSPP
+       /*
+        * The configuration allows for user's to Override the banner, so let them
+        */
+        audit_message = NULL;
+        cupsdSetStringf(&audit_message, "job=%d user supplied classification \"%s\" \"%s\"",
+                        job->id,
+                        (attr->values[0].string.text)?attr->values[0].string.text:"none",
+                        (attr->values[1].string.text)?attr->values[1].string.text:"none");
+        audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
+                               ServerName, NULL, NULL, 1);
+        free(audit_message);
+#endif /* WITH_LSPP */
         if (!strcmp(attr->values[0].string.text, "none") &&
 	    (attr->num_values == 1 ||
 	     !strcmp(attr->values[1].string.text, "none")))
@@ -3501,6 +3625,11 @@
   char		attrname[255],		/* Name of attribute */
 		*s;			/* Pointer into name */
   ipp_attribute_t *attr;		/* Attribute */
+#ifdef WITH_LSPP
+  const char	*mls_label = NULL;	/* SL of print job */
+  context_t	job_context;		/* SELinux context of the job */
+#endif /* WITH_LSPP */
+
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
@@ -3628,6 +3757,24 @@
       else
         s = attrname;
 
+#ifdef WITH_LSPP
+      if (strcmp(s, "mls-label") == 0)
+      {
+        if (con->scon != NULL && strcmp(con->scon, UNKNOWN_SL) != 0)
+        {
+          job_context = context_new(con->scon);
+          if (strcasecmp(name, MLS_CONFIG) == 0)
+            mls_label = context_range_get(job_context);
+          else if (strcasecmp(name, TE_CONFIG) == 0)
+            mls_label = context_type_get(job_context);
+          else // default to using the whole context string
+            mls_label = context_str(job_context);
+          cupsFilePuts(out, mls_label);
+          context_free(job_context);
+        }
+        continue;
+      }
+#endif /* WITH_LSPP */
       if (!strcmp(s, "printer-name"))
       {
         cupsFilePuts(out, job->dest);
@@ -5353,6 +5500,15 @@
   cupsd_printer_t *printer;		/* Printer */
   cups_array_t	*list;			/* Which job list... */
   cups_array_t	*ra;			/* Requested attributes array */
+#ifdef WITH_LSPP
+  int			selinuxcheck;	/* perform the SELinux access check? */
+  security_id_t		clisid;		/* SELinux SID of the client */
+  security_id_t		jobsid;		/* SELinux SID of the job */
+  struct av_decision	avd;		/* SELinux decision stuct */
+  struct avc_entry_ref	avcref;		/* AVC entry cache pointer */
+  security_class_t	tclass;		/* SELinux security class */
+  access_vector_t	avr;		/* SELinux access being queried */
+#endif /* WITH_LSPP */
 
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd,
@@ -5470,6 +5626,40 @@
 
   ra = create_requested_array(con->request);
 
+#ifdef WITH_LSPP
+ /*
+  * Determine outside the loop if we are concerned about SELinux
+  */
+  selinuxcheck = is_lspp_config();
+  if (selinuxcheck)
+  {
+    selinuxcheck = security_getenforce();
+    if (selinuxcheck == -1)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable to determine SELinux enforcement");
+      send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (getenforce)."));
+      return;
+    }
+    if (avc_init("cups", NULL, NULL, NULL, NULL) < 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable avc_init");
+      send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (avc_init)."));
+      return;
+    } 
+    if (avc_context_to_sid(con->scon, &clisid) != 0)
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable to convert %s to SELinux sid", con->scon);
+      send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (avc_context_to_sid)."));
+      return;
+    }
+    cupsdLogMessage(CUPSD_LOG_DEBUG, "get_jobs: client context %s", con->scon);
+
+    avr = FILE__READ;
+    tclass = SECCLASS_FILE;
+  }
+#endif /* WITH_LSPP */
+
+
  /*
   * OK, build a list of jobs for this printer...
   */
@@ -5507,6 +5697,19 @@
     if (count > 0)
       ippAddSeparator(con->response);
 
+#ifdef WITH_LSPP
+    if (selinuxcheck)
+    {
+      cupsdLogMessage(CUPSD_LOG_DEBUG, "get_jobs: job context %s", job->scon);
+
+      avc_context_to_sid(job->scon, &jobsid);
+      avc_entry_ref_init(&avcref);
+      
+      if (avc_has_perm_noaudit(clisid, jobsid, tclass, avr, &avcref, &avd) != 0)
+        continue;
+    }
+#endif /* WITH_LSPP */
+
     count ++;
 
     cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
@@ -7935,12 +8138,22 @@
     * See if we need to add the ending sheet...
     */
 
+#ifdef WITH_LSPP
+    if (printer &&
+        ( is_lspp_config() ||
+        !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ) &&
+        (attr = ippFindAttribute(job->attrs, "job-sheets",
+	                         IPP_TAG_ZERO)) != NULL &&
+        attr->num_values > 1)
+    {
+#else /* !WITH_LSPP */
     if (printer &&
         !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
         (attr = ippFindAttribute(job->attrs, "job-sheets",
 	                         IPP_TAG_ZERO)) != NULL &&
         attr->num_values > 1)
     {
+#endif /* WITH_LSPP */
      /*
       * Yes...
       */
--- cups-1.2.2/scheduler/conf.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/conf.c	2006-07-21 12:42:40.000000000 +0100
@@ -35,6 +35,7 @@
  *   read_configuration()     - Read a configuration file.
  *   read_location()          - Read a <Location path> definition.
  *   read_policy()            - Read a <Policy name> definition.
+ *   is_lspp_config()         - Is the system configured for LSPP
  */
 
 /*
@@ -60,6 +61,9 @@
 #  define INADDR_NONE	0xffffffff
 #endif /* !INADDR_NONE */
 
+#ifdef WITH_LSPP
+#  include <libaudit.h>
+#endif /* WITH_LSPP */
 
 /*
  * Configuration variable structure...
@@ -161,6 +165,9 @@
   { "ServerKey",		&ServerKey,		CUPSD_VARTYPE_STRING },
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
+#ifdef WITH_LSPP
+  { "AuditLog",			&AuditLog,		CUPSD_VARTYPE_INTEGER },
+#endif /* WITH_LSPP */
 #ifdef HAVE_LAUNCHD
   { "LaunchdTimeout",		&LaunchdTimeout,	CUPSD_VARTYPE_INTEGER },
   { "LaunchdConf",		&LaunchdConf,		CUPSD_VARTYPE_STRING },
@@ -223,6 +230,9 @@
 		*old_requestroot;	/* Old RequestRoot */
   const char	*tmpdir;		/* TMPDIR environment variable */
   struct stat	tmpinfo;		/* Temporary directory info */
+#ifdef WITH_LSPP
+  char		*audit_message;		/* Audit message string */
+#endif /* WITH_LSPP */
 
 
  /*
@@ -377,6 +387,16 @@
     }
   }
 
+#ifdef WITH_LSPP
+  /*
+   * ClassifyOverride is set during read_configuration, if its on, report it now
+   */
+  if (ClassifyOverride)
+    audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG,
+              "[Config] ClassifyOverride=enabled Users can override print banners",
+              ServerName, NULL, NULL, 1);
+#endif /* WITH_LSPP */
+
  /*
   * Numeric options...
   */
@@ -779,7 +799,16 @@
     cupsdClearString(&Classification);
 
   if (Classification)
+  {
     cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification);
+#ifdef WITH_LSPP
+    audit_message = NULL;
+    cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification);
+    audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
+                           ServerName, NULL, NULL, 1);
+    free(audit_message);
+#endif /* WITH_LSPP */
+  }
 
  /*
   * Update the MaxClientsPerHost value, as needed...
@@ -2233,7 +2262,6 @@
 
       cupsd_dirsvc_addr_t	*dira;	/* New browse address array */
 
-
       if (NumBrowsers == 0)
         dira = malloc(sizeof(cupsd_dirsvc_addr_t));
       else
@@ -3286,6 +3314,18 @@
   return (0);
 }
 
+#ifdef WITH_LSPP
+int is_lspp_config()
+{
+  if (Classification != NULL)
+    return ((strcasecmp(Classification, MLS_CONFIG) == 0) 
+            || (strcasecmp(Classification, TE_CONFIG) == 0)
+            || (strcasecmp(Classification, SELINUX_CONFIG) == 0));
+  else
+    return 0;
+}
+#endif /* WITH_LSPP */
+
 
 /*
  * End of "$Id: conf.c 5736 2006-07-13 19:59:36Z mike $".
--- /dev/null	2006-07-21 09:48:40.571484750 +0100
+++ cups-1.2.2/scheduler/access.c	2006-07-21 12:42:40.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ *   Copyright (C) Hewlett-Packard Development Company, L.P., 2006
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Contents:
+ *
+ *   main()               - Main entry for the access checker.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+int main(int argc, char *argv[]) {
+  int status = -1;
+  char filename[FILENAME_MAX+1] = {0};
+
+  if (argc < 2)
+  {
+    printf("Check for access to which file? ");
+    scanf("%s", (char *)&filename);
+  }
+  else
+  {
+    strncpy(filename, argv[1], FILENAME_MAX);
+  }
+
+  status = access(filename, R_OK|W_OK);
+
+  if (argc < 2)
+  {
+   /*
+    * Assume the user would like to hear the answer on the terminal
+    * since the filename was received interactively.
+    */
+    if (status != 0)
+      printf("Unable to access that file.\n");
+    else
+      printf("Access Granted\n");
+  }
+  
+  return status;
+}
--- cups-1.2.2/scheduler/Makefile.lspp	2006-07-13 20:59:36.000000000 +0100
+++ cups-1.2.2/scheduler/Makefile	2006-07-21 12:42:40.000000000 +0100
@@ -54,6 +54,7 @@
 OBJS	=	\
 		$(CUPSDOBJS) \
 		$(MIMEOBJS) \
+		access.o \
 		cups-deviced.o \
 		cups-driverd.o \
 		cups-lpd.o \
@@ -63,6 +64,7 @@
 		testspeed.o \
 		util.o
 TARGETS	=	\
+		access \
 		cupsd \
 		cups-deviced \
 		cups-driverd \
@@ -111,7 +113,8 @@
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)
 	echo Creating $(SERVERBIN)/daemon...
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
-	echo Installing cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
+	echo Installing access cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
+	$(INSTALL_BIN) access $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
@@ -157,6 +160,7 @@
 
 uninstall:	all
 	$(RM) $(SBINDIR)/cupsd
+	$(RM) $(SERVERBIN)/daemon/access
 	$(RM) $(SERVERBIN)/daemon/cups-deviced
 	$(RM) $(SERVERBIN)/daemon/cups-driverd
 	$(RM) $(SERVERBIN)/daemon/cups-lpd
--- cups-1.2.2/scheduler/conf.h.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/conf.h	2006-07-21 12:42:40.000000000 +0100
@@ -182,7 +182,6 @@
 					/* Number of MIME types */
 VAR const char		**MimeTypes		VALUE(NULL);
 					/* Array of MIME types */
-
 #ifdef HAVE_SSL
 VAR char		*ServerCertificate	VALUE(NULL);
 					/* Server certificate file */
@@ -191,6 +190,10 @@
 					/* Server key file */
 #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
 #endif /* HAVE_SSL */
+#ifdef WITH_LSPP
+VAR int			AuditLog		VALUE(-1);
+					/* File descriptor for audit */
+#endif /* WITH_LSPP */
 
 #ifdef HAVE_LAUNCHD
 VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
@@ -213,6 +216,9 @@
 ;
 extern int	cupsdLogPage(cupsd_job_t *job, const char *page);
 
+#ifdef WITH_LSPP
+extern int	is_lspp_config(void);
+#endif /* WITH_LSPP */
 
 /*
  * End of "$Id: conf.h 5696 2006-06-26 18:34:20Z mike $".
--- cups-1.2.2/scheduler/client.c.lspp	2006-07-21 12:42:35.000000000 +0100
+++ cups-1.2.2/scheduler/client.c	2006-07-21 12:43:29.000000000 +0100
@@ -43,12 +43,17 @@
  *   make_certificate()      - Make a self-signed SSL/TLS certificate.
  *   pipe_command()          - Pipe the output of a command to the remote client.
  *   write_file()            - Send a file via HTTP.
+ *   client_pid_to_auid()    - Get the audit login uid of the client.
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */
+
 /*
  * Include necessary headers...
  */
 
+#define _GNU_SOURCE
 #include <cups/http-private.h>
 #include "cupsd.h"
 
@@ -64,6 +69,11 @@
 #  include <gnutls/x509.h>
 #endif /* HAVE_GNUTLS */
 
+#ifdef WITH_LSPP
+#include <selinux/selinux.h>
+#include <fcntl.h>
+#endif /* WITH_LSPP */
+
 
 /*
  * Local functions...
@@ -380,6 +390,45 @@
                   "cupsdAcceptClient: %d connected to server on %s:%d",
                   con->http.fd, con->servername, con->serverport);
 
+#ifdef WITH_LSPP
+  if (is_lspp_config())
+  {
+    struct ucred cr;
+    unsigned int cl=sizeof(cr);
+
+    if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl)==0) {
+     /*
+      * client_pid_to_auid() can be racey
+      * In this case the pid is based on a socket connected to the client
+      */
+      con->auid = client_pid_to_auid(cr.pid);
+      cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d",
+                      cr.pid, cr.uid, cr.gid, con->auid);
+    } else {
+      close(con->http.fd);
+      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed");
+      return (cupsdCloseClient(con));
+    }
+
+   /*
+    * get the context of the peer connection
+    */
+    if (getpeercon(con->http.fd, &con->scon))
+    {
+      cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed");
+      cupsdSetString(&con->scon, UNKNOWN_SL);
+    }
+
+    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon);
+
+  }
+  else
+  {
+    cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: skipping getpeercon()");
+    cupsdSetString(&con->scon, UNKNOWN_SL);
+  }
+#endif /* WITH_LSPP */
+
  /*
   * Using TCP_NODELAY improves responsiveness, especially on systems
   * with a slow loopback interface...  Since we write large buffers
@@ -3465,7 +3514,6 @@
   time_t		curtime;	/* Current time */
   int			result;		/* Result of GNU TLS calls */
 
-
  /*
   * Create the encryption key...
   */
@@ -3664,6 +3712,49 @@
 #endif /* HAVE_SSL */
 
 
+#ifdef WITH_LSPP
+/*
+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid.
+ */
+
+uid_t client_pid_to_auid(pid_t clipid)
+{
+  uid_t uid;
+  int len, in;
+  char buf[16] = {0};
+  char fname[32] = {0};
+
+
+ /*
+  * Hopefully this pid is still the one we are interested in.
+  */
+  snprintf(fname, 32, "/proc/%d/loginuid", clipid);
+  in = open(fname, O_NOFOLLOW|O_RDONLY);
+
+  if (in < 0)
+    return -1;
+
+  errno = 0;
+
+  do {
+    len = read(in, buf, sizeof(buf));
+  } while (len < 0 && errno == EINTR);
+
+  close(in);
+
+  if (len < 0 || len >= sizeof(buf))
+    return -1;
+
+  buf[len] = 0;
+  uid = strtol(buf, 0, 10);
+
+  if (errno != 0)
+    return -1;
+  else
+    return uid;
+}
+#endif /* WITH_LSPP */
+
 /*
  * 'pipe_command()' - Pipe the output of a command to the remote client.
  */
--- cups-1.2.2/cups/cups.h.lspp	2006-03-06 03:39:28.000000000 +0000
+++ cups-1.2.2/cups/cups.h	2006-07-21 12:42:40.000000000 +0100
@@ -24,6 +24,8 @@
  *   This file is subject to the Apple OS-Developed Software exception.
  */
 
+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */
+
 #ifndef _CUPS_CUPS_H_
 #  define _CUPS_CUPS_H_
 
@@ -68,6 +70,12 @@
 #  define CUPS_DATE_ANY		-1
 
 
+# ifdef WITH_LSPP
+# define MLS_CONFIG "mls"
+# define TE_CONFIG "te"
+# define SELINUX_CONFIG "SELinux"
+# define UNKNOWN_SL "UNKNOWN SL"
+# endif /* WITH_LSPP */
 /*
  * Types and structures...
  */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- cups.spec	21 Jul 2006 11:23:41 -0000	1.233
+++ cups.spec	21 Jul 2006 12:00:05 -0000	1.234
@@ -1,11 +1,12 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
+%define lspp 1
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -37,6 +38,7 @@
 Patch15: cups-maxlogsize.patch
 Patch16: cups-pid.patch
 Patch17: cups-relro.patch
+Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -63,6 +65,13 @@
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 
+%if %lspp
+BuildPrereq: libselinux-devel >= 1.23
+BuildPrereq: audit-libs-devel >= 1.1
+Requires: audit-libs-devel >= 1.1
+Requires: libselinux >= 1.23
+%endif
+
 # -fstack-protector-all requires GCC 4.0.1
 BuildRequires: gcc >= 4.0.1
 
@@ -130,6 +139,11 @@
 %patch15 -p1 -b .maxlogsize
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .relro
+
+%if %lspp
+%patch100 -p1 -b .lspp
+%endif
+
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -144,6 +158,9 @@
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
+%if %lspp
+	--enable-lspp \
+%endif
 	--with-log-file-perm=0700 --enable-pie
 
 # If we got this far, all prerequisite libraries must be here.
@@ -341,6 +358,9 @@
 %{cups_serverbin}/backend
 %{cups_serverbin}/cgi-bin
 %dir %{cups_serverbin}/daemon
+%if %lspp
+%{cups_serverbin}/daemon/access
+%endif
 %{cups_serverbin}/daemon/cups-polld
 %{cups_serverbin}/daemon/cups-deviced
 %{cups_serverbin}/daemon/cups-driverd
@@ -389,7 +409,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-3
+- Apply Matt Anderson's LSPP patch.
 - Renumbered patches.
 
 * Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-2



From fedora-cvs-commits at redhat.com  Fri Jul 21 12:09:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 08:09:04 -0400
Subject: rpms/pam_ccreds/devel pam_ccreds-3-chkpwd.patch, 1.3,
	1.4 pam_ccreds.spec, 1.16, 1.17
Message-ID: <200607211209.k6LC94lJ018451@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18408

Modified Files:
	pam_ccreds-3-chkpwd.patch pam_ccreds.spec 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 3-4
- fixed mistake in chkpwd patch causing update creds to fail


pam_ccreds-3-chkpwd.patch:
 Makefile.am   |    6 +
 README        |   13 +-
 cc.h          |    4 
 cc_lib.c      |   79 +++++++++++++++++
 cc_pam.c      |  121 +++++++++++++++-----------
 cc_validate.c |  268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 434 insertions(+), 57 deletions(-)

Index: pam_ccreds-3-chkpwd.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds-3-chkpwd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam_ccreds-3-chkpwd.patch	18 Jan 2006 15:48:19 -0000	1.3
+++ pam_ccreds-3-chkpwd.patch	21 Jul 2006 12:09:01 -0000	1.4
@@ -444,7 +444,7 @@
 +         */
 +        if (! geteuid()) {
 +            rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0),
-+                             ccredsfile, CC_FLAGS_READ_ONLY, &pamcch);
++                             ccredsfile, 0, &pamcch);
 +            if (rc != PAM_SUCCESS) {
 +                return rc;
 +            }


Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pam_ccreds.spec	12 Jul 2006 07:37:18 -0000	1.16
+++ pam_ccreds.spec	21 Jul 2006 12:09:01 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 3
-Release: 3.2.1
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %attr(4755,root,root) %{_sbindir}/ccreds_validate
 
 %changelog
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 3-4
+- fixed mistake in chkpwd patch causing update creds to fail
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3-3.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 12:41:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 08:41:57 -0400
Subject: rpms/python/devel python-2.4.3-locale.patch, NONE, 1.1 python.spec,
	1.85, 1.86
Message-ID: <200607211241.k6LCfv4R011586@cvs.devel.redhat.com>

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11507

Modified Files:
	python.spec 
Added Files:
	python-2.4.3-locale.patch 
Log Message:
Fixed bug #198971 (case conversion not locale safe in logging library)

python-2.4.3-locale.patch:
 handlers.py |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

--- NEW FILE python-2.4.3-locale.patch ---
--- python/trunk/Lib/logging/handlers.py	2006/06/27 07:34:37	47121
+++ python/trunk/Lib/logging/handlers.py	2006/07/20 23:20:12	50740
@@ -562,6 +562,18 @@
         "local7":   LOG_LOCAL7,
         }
 
+    #The map below appears to be trivially lowercasing the key. However,
+    #there's more to it than meets the eye - in some locales, lowercasing
+    #gives unexpected results. See SF #1524081: in the Turkish locale,
+    #"INFO".lower() != "info"
+    priority_map = {
+        "DEBUG" : "debug",
+        "INFO" : "info",
+        "WARNING" : "warning",
+        "ERROR" : "error",
+        "CRITICAL" : "critical"
+    }
+
     def __init__(self, address=('localhost', SYSLOG_UDP_PORT), facility=LOG_USER):
         """
         Initialize a handler.
@@ -598,7 +610,7 @@
     #   necessary.
     log_format_string = '<%d>%s\000'
 
-    def encodePriority (self, facility, priority):
+    def encodePriority(self, facility, priority):
         """
         Encode the facility and priority. You can pass in strings or
         integers - if strings are passed, the facility_names and
@@ -619,6 +631,16 @@
             self.socket.close()
         logging.Handler.close(self)
 
+    def mapPriority(self, levelName):
+        """
+        Map a logging level name to a key in the priority_names map.
+        This is useful in two scenarios: when custom levels are being
+        used, and in the case where you can't do a straightforward
+        mapping by lowercasing the logging level name because of locale-
+        specific issues (see SF #1524081).
+        """
+        return self.priority_map.get(levelName, "warning")
+
     def emit(self, record):
         """
         Emit a record.
@@ -633,8 +655,8 @@
         """
         msg = self.log_format_string % (
             self.encodePriority(self.facility,
-                                string.lower(record.levelname)),
-            msg)
+                                self.mapPriority(record.levelname)),
+                                msg)
         try:
             if self.unixsocket:
                 try:


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- python.spec	20 Jul 2006 17:02:51 -0000	1.85
+++ python.spec	21 Jul 2006 12:41:54 -0000	1.86
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -44,6 +44,7 @@
 Patch16: python-2.4-gen-assert.patch
 Patch17: python-2.4-webbrowser.patch
 Patch18: python-2.4.3-cflags.patch
+Patch19: python-2.4.3-locale.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -152,6 +153,7 @@
 %patch16 -p2 -b .gen-assert
 %patch17 -p0 -b .web-browser
 %patch18 -p1 -b .cflags
+%patch19 -p2 -b .locale
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -394,6 +396,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Fri Jul 21 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-14
+- Fixed bug #198971 (case conversion not locale safe in logging library)
+
 * Thu Jul 20 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-13
 - Fixed bug #199373 (on some platforms CFLAGS is needed when linking)
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:26:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:26:32 -0400
Subject: rpms/coreutils/devel coreutils-setsid.patch, 1.1, 1.2 coreutils.spec,
	1.129, 1.130
Message-ID: <200607211326.k6LDQWri022677@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22622

Modified Files:
	coreutils-setsid.patch coreutils.spec 
Log Message:
* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
- Added su '--session-command' option (bug #199066).


coreutils-setsid.patch:
 su.c |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

Index: coreutils-setsid.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-setsid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-setsid.patch	14 Nov 2005 10:57:28 -0000	1.1
+++ coreutils-setsid.patch	21 Jul 2006 13:26:30 -0000	1.2
@@ -1,15 +1,29 @@
---- coreutils-5.93/src/su.c.setsid	2005-11-14 10:35:48.000000000 +0000
-+++ coreutils-5.93/src/su.c	2005-11-14 10:53:03.000000000 +0000
-@@ -497,6 +497,8 @@
+--- coreutils-5.97/src/su.c.setsid	2006-07-21 14:09:29.000000000 +0100
++++ coreutils-5.97/src/su.c	2006-07-21 14:20:28.000000000 +0100
+@@ -199,9 +199,13 @@
+ /* If true, change some environment vars to indicate the user su'd to.  */
+ static bool change_environment;
+ 
++/* If true, then don't call setsid() with a command. */
++int same_session = 0;
++
+ static struct option const longopts[] =
+ {
+   {"command", required_argument, NULL, 'c'},
++  {"session-command", required_argument, NULL, 'C'},
+   {"fast", no_argument, NULL, 'f'},
+   {"login", no_argument, NULL, 'l'},
+   {"preserve-environment", no_argument, NULL, 'p'},
+@@ -497,6 +501,8 @@
    if (child == 0) {  /* child shell */
    change_identity (pw);
    pam_end(pamh, 0);
-+  if (command)
++  if (!same_session)
 +    setsid ();
  #endif
  
    if (simulate_login)
-@@ -551,13 +553,27 @@
+@@ -551,13 +557,27 @@
      sigemptyset(&action.sa_mask);
      action.sa_flags = 0;
      sigemptyset(&ourset);
@@ -17,7 +31,7 @@
 -        || sigaddset(&ourset, SIGALRM)
 -        || sigaction(SIGTERM, &action, NULL)
 -        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+    if (command)
++    if (!same_session)
 +      {
 +	if (sigaddset(&ourset, SIGINT) || sigaddset(&ourset, SIGQUIT))
 +	  {
@@ -32,8 +46,8 @@
        fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
        caught = 1;
      }
-+    if (!caught && command && (sigaction(SIGINT, &action, NULL)
-+			       || sigaction(SIGQUIT, &action, NULL)))
++    if (!caught && !same_session && (sigaction(SIGINT, &action, NULL)
++				     || sigaction(SIGQUIT, &action, NULL)))
 +      {
 +	fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
 +	caught = 1;
@@ -41,3 +55,42 @@
    }
    if (!caught) {
      do {
+@@ -628,6 +648,8 @@
+ \n\
+   -, -l, --login               make the shell a login shell\n\
+   -c, --commmand=COMMAND       pass a single COMMAND to the shell with -c\n\
++  --session-command=COMMAND    pass a single COMMAND to the shell with -c\n\
++                               and do not create a new session\n\
+   -f, --fast                   pass -f to the shell (for csh or tcsh)\n\
+   -m, --preserve-environment   do not reset environment variables\n\
+   -p                           same as -m\n\
+@@ -650,6 +672,7 @@
+   int optc;
+   const char *new_user = DEFAULT_USER;
+   char *command = NULL;
++  int request_same_session = 0;
+   char *shell = NULL;
+   struct passwd *pw;
+   struct passwd pw_copy;
+@@ -675,6 +698,11 @@
+ 	  command = optarg;
+ 	  break;
+ 
++	case 'C':
++	  command = optarg;
++	  request_same_session = 1;
++	  break;
++
+ 	case 'f':
+ 	  fast_startup = true;
+ 	  break;
+@@ -744,6 +772,9 @@
+     }
+ #endif
+ 
++  if (request_same_session || !command || !pw->pw_uid)
++    same_session = 1;
++
+   if (!shell && !change_environment)
+     shell = getenv ("SHELL");
+   if (shell && getuid () != 0 && restricted_shell (pw->pw_shell))


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- coreutils.spec	18 Jul 2006 20:15:19 -0000	1.129
+++ coreutils.spec	21 Jul 2006 13:26:30 -0000	1.130
@@ -280,6 +280,9 @@
 /sbin/runuser
 
 %changelog
+* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
+- Added su '--session-command' option (bug #199066).
+
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 5.97-5
 - 'include' su and runuser scripts in su-l and runuser-l scripts
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:27:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:27:25 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch, 1.2, 1.3 audit.spec,
	1.101, 1.102
Message-ID: <200607211327.k6LDRPgU023040@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23008

Modified Files:
	audit-setroubleshoot.patch audit.spec 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
- Eliminate avc package from audisp


audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 audispd     |   41 +++++++++++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 23 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audit-setroubleshoot.patch	19 Jul 2006 13:12:02 -0000	1.2
+++ audit-setroubleshoot.patch	21 Jul 2006 13:27:22 -0000	1.3
@@ -1,5 +1,17 @@
 --- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-07-19 09:11:40.000000000 -0400
++++ audit-1.2.5/audisp/audispd	2006-07-21 09:18:48.000000000 -0400
+@@ -1,9 +1,9 @@
+ #! /usr/bin/env python
+ import os, string, select, syslog
+-import audit, avc, traceback
++import audit, traceback
+ import AuditMsg
+ import subprocess, signal
+-PLUGIN_DIRS = ['/etc/audisp.d', "/usr/lib/audit", "/usr/lib32/audit"]
++PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib32/audit"]
+ import glob
+ 
+ HUP=False
 @@ -15,8 +15,7 @@
      def __init__(self, cmd):
          self.cmd = cmd
@@ -90,7 +102,7 @@
  except Exception, e:
      syslog.syslog("Unexpected exception %s " % e)
 --- audit-1.2.5/audisp/AuditMsg.py.setroubleshoot	2006-07-13 13:36:08.000000000 -0400
-+++ audit-1.2.5/audisp/AuditMsg.py	2006-07-19 09:11:11.000000000 -0400
++++ audit-1.2.5/audisp/AuditMsg.py	2006-07-21 09:08:55.000000000 -0400
 @@ -1,33 +1,55 @@
  import struct, os
 +


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- audit.spec	19 Jul 2006 13:12:02 -0000	1.101
+++ audit.spec	21 Jul 2006 13:27:22 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -168,6 +168,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
+- Eliminate avc package from audisp
+
 * Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-3
 - More fixes for setroubleshoot to handle failing plugin
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:28:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:28:15 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.32,
	1.33 selinux-policy.spec, 1.229, 1.230
Message-ID: <200607211328.k6LDSFos023379@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23354

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-7
- Fixes to make setroubleshoot work


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/inetd.te          |   12 +-
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 76 files changed, 789 insertions(+), 225 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- policy-20060608.patch	20 Jul 2006 01:56:13 -0000	1.32
+++ policy-20060608.patch	21 Jul 2006 13:28:12 -0000	1.33
@@ -332,11 +332,20 @@
  # Defaults for reserved ports.  Earlier portcon entries take precedence;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-17 11:43:02.000000000 -0400
-@@ -89,6 +89,7 @@
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-20 14:37:36.000000000 -0400
+@@ -20,6 +20,7 @@
+ /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
+ /dev/full		-c	gen_context(system_u:object_r:null_device_t,s0)
+ /dev/hw_random		-c	gen_context(system_u:object_r:random_device_t,s0)
++/dev/hwrng		-c	gen_context(system_u:object_r:random_device_t,s0)
+ /dev/i915		-c	gen_context(system_u:object_r:dri_device_t,s0)
+ /dev/irlpt[0-9]+	-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/js.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
+@@ -89,6 +90,8 @@
  
  /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
  
++/dev/hiddev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
 +/dev/usbdev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
  /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
@@ -1225,8 +1234,8 @@
  allow nmbd_t samba_var_t:dir rw_dir_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-17 11:43:02.000000000 -0400
-@@ -0,0 +1,8 @@
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-21 08:40:27.000000000 -0400
+@@ -0,0 +1,11 @@
 +# setroubleshoot executables
 +
 +/usr/lib/audit/setroubleshoot_dispatcher	--	gen_context(system_u:object_r:setroubleshoot_exec_t,s0)
@@ -1234,7 +1243,10 @@
 +/usr/sbin/setroubleshootd		--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
 +
 +/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
++
 +/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
++
++/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
 +++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-17 11:43:02.000000000 -0400
@@ -1265,8 +1277,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-19 09:09:36.000000000 -0400
-@@ -0,0 +1,128 @@
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-21 08:40:09.000000000 -0400
+@@ -0,0 +1,135 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -1292,6 +1304,9 @@
 +type setroubleshoot_var_run_t;
 +files_pid_file(setroubleshoot_var_run_t)
 +
++type setroubleshoot_var_lib_t;
++files_type(setroubleshoot_var_lib_t)
++
 +########################################
 +#
 +# setroubleshootd local policy
@@ -1316,6 +1331,11 @@
 +allow setroubleshootd_t setroubleshoot_var_log_t:dir { rw_dir_perms setattr };
 +logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
 +
++# database files
++allow setroubleshootd_t setroubleshoot_var_lib_t:file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
++files_var_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
++
 +allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
 +
 +corenet_tcp_bind_generic_node(setroubleshootd_t)
@@ -1353,7 +1373,8 @@
 +
 +miscfiles_read_localization(setroubleshoot_t)
 +
-+allow setroubleshoot_t self:capability dac_override;
++allow setroubleshootd_t self:capability { dac_override sys_tty_config };
++
 +allow setroubleshoot_t self:process { signal getattr };
 +allow setroubleshoot_t self:fifo_file { read write };
 +allow setroubleshoot_t self:unix_stream_socket create_stream_socket_perms;
@@ -1393,8 +1414,6 @@
 +	rpm_read_db(setroubleshoot_t)
 +	rpm_dontaudit_manage_db(setroubleshoot_t)
 +')
-+
-+
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-19 11:33:04.000000000 -0400
@@ -1696,7 +1715,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-18 11:04:16.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-20 11:25:38.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -1762,7 +1781,13 @@
  corecmd_exec_bin(semanage_t)
  corecmd_exec_sbin(semanage_t)
  
-@@ -595,6 +610,10 @@
+@@ -590,11 +605,15 @@
+ userdom_search_sysadm_home_dirs(semanage_t)
+ 
+ ifdef(`targeted_policy',`
+-# Handle pp files created in homedir and /tmp
++	# Handle pp files created in homedir and /tmp
+ 	files_read_generic_tmp_files(semanage_t)
  	userdom_read_generic_user_home_content_files(semanage_t)
  ')
  
@@ -1822,7 +1847,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-20 14:48:42.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -1831,6 +1856,20 @@
  
  	# Transition to myself, to make get_ordered_context_list happy.
  	allow $1 self:process transition;
+@@ -52,9 +53,10 @@
+ 		allow $1 self:process execmem;
+ 	')
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1 self:process execstack;
++	tunable_policy(`allow_execstack',`
++		# Allow making the stack executable via mprotect;
++		# execstack implies execmem;
++		allow $1 self:process { execstack execmem };
+ #		auditallow $1 self:process execstack;
+ 	')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-17 11:43:02.000000000 -0400
@@ -2234,7 +2273,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-18 09:34:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-20 16:21:02.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -2250,6 +2289,15 @@
  ifdef(`targeted_policy',`
  	# Define some type aliases to help with compatibility with
  	# macros and domains from the "strict" policy.
+@@ -85,7 +77,7 @@
+ 	# compatibility for switching from strict
+ #	dominance { role secadm_r { role system_r; }}
+ #	dominance { role auditadm_r { role system_r; }}
+-#	dominance { role sysadm_r { role system_r; }}
++	dominance { role sysadm_r { role system_r; }}
+ #	dominance { role user_r { role system_r; }}
+ #	dominance { role staff_r { role system_r; }}
+ 
 @@ -124,34 +116,34 @@
  
  	# user role change rules:


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- selinux-policy.spec	19 Jul 2006 20:27:22 -0000	1.229
+++ selinux-policy.spec	21 Jul 2006 13:28:12 -0000	1.230
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-7
+- Fixes to make setroubleshoot work
+
 * Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-6
 - Cups needs to be able to read domain state off of printer client
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:42:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:42:16 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.5, 1.6 setroubleshoot.init,
	1.1, 1.2 setroubleshoot.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200607211342.k6LDgGt8026842@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26807/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.10-1 on branch devel from setroubleshoot-0.10-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jul 2006 18:38:12 -0000	1.5
+++ .cvsignore	21 Jul 2006 13:42:14 -0000	1.6
@@ -1 +1 @@
-setroubleshoot-0.9.tar.gz
+setroubleshoot-0.10.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setroubleshoot.init	18 Jul 2006 19:49:13 -0000	1.1
+++ setroubleshoot.init	21 Jul 2006 13:42:14 -0000	1.2
@@ -2,7 +2,7 @@
 #
 # setroubleshoot       This starts and stops setroubleshoot daemon
 #
-# chkconfig: - 12 87
+# chkconfig: 345 13 87
 # description: This starts the SELinux Troubleshooting Daemon
 #
 # processname: /usr/sbin/setroubleshootd


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- setroubleshoot.spec	20 Jul 2006 18:52:17 -0000	1.8
+++ setroubleshoot.spec	21 Jul 2006 13:42:14 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.9
+Version: 0.10
 Release: 1
 License: GPL
 Group: Applications/System
@@ -62,6 +62,10 @@
     /sbin/chkconfig --del %{name}
 fi
 
+%triggerpostun -- setroubleshoot <= 0.9-1
+/sbin/chkconfig --del %{name}
+/sbin/chkconfig --add %{name}
+
 %postun 
 /usr/bin/update-desktop-database %{_datadir}/applications
 
@@ -86,6 +90,10 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.10-1
+- Fix startup order for setrobleshoot
+- Fix Plugins
+
 * Tue Jul 20 2006 Dan Walsh <dwalsh at redhat.com> - 0.9-1
 - Additional Plugins plus a lot of cleanup 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Jul 2006 18:38:12 -0000	1.7
+++ sources	21 Jul 2006 13:42:14 -0000	1.8
@@ -1 +1 @@
-7cf0bad535fc7c3e778340efd96dc0f2  setroubleshoot-0.9.tar.gz
+2c9705455a789208a51cbe1e3ef67fb3  setroubleshoot-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:42:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:42:33 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.19,1.20
Message-ID: <200607211342.k6LDgXjo026927@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26709

Modified Files:
	man-pages-fr.spec 
Log Message:
Changes in spec file #199621



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- man-pages-fr.spec	19 Jul 2006 14:01:49 -0000	1.19
+++ man-pages-fr.spec	21 Jul 2006 13:42:30 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.22.0
-Release:	2
+Release:	3
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -30,7 +30,7 @@
 %install
 rm -fr $RPM_BUILD_ROOT
 # Create all the directories to be sure this package owns them
-for n in 1 2 3 4 5 6 7 8 9 n; do
+for n in 1 2 3 4 5 6 7 8 9 ; do
   mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man${n}
 done
 
@@ -88,6 +88,8 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{getspnam,shadow}.3
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{faillog,shadow}.5
 rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{adduser,chpasswd,faillog,groupadd,groupdel,groupmod,grpck,lastlog,newusers,pwck,pwconv,useradd,userdel,usermod}.8
+# vim
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{rview,view,vim,vimdiff,vimtutor}.1
 
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
@@ -101,6 +103,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Fri Jul 21 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-3
+- deleting conflicts in man-pages
+
 * Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-2
 - make from sources from Alain Portal new version of French man-pages
 - man-pages-fr-aumix_missTH.patch - missed header



From fedora-cvs-commits at redhat.com  Fri Jul 21 13:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 09:50:40 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.204,1.205
Message-ID: <200607211350.k6LDoewg012318@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12249

Modified Files:
	kdebase.spec 
Log Message:
rebuild against new dbus




Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- kdebase.spec	20 Jul 2006 18:38:01 -0000	1.204
+++ kdebase.spec	21 Jul 2006 13:50:37 -0000	1.205
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 15
+Release: 16
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -166,16 +166,14 @@
 %patch8 -p1 -b .logo
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-## disable dbus support temporary, dbus-0.90 seems broken!
-## enable again when the bug is fixed
-#%patch12 -p1 -b .kioslave_media_dbus
-#%patch13 -p1 -b .dbus
+%patch12 -p1 -b .kioslave_media_dbus
+%patch13 -p1 -b .dbus
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 %patch16 -p1 -b .krdb-xresource
 %patch17 -p1 -b .pam_krb5-bz#191049
 %patch18 -p1 -b .klipper
-#%patch19 -p1 -b .fuser
+%patch19 -p1 -b .fuser
 %patch20 -p1 -b .keyinit
 %patch21 -p1 -b .khelpcenter-sort
 
@@ -557,6 +555,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Fri Jul 21 2006 Than Ngo <than at redhat.com> 6:3.5.3-16
+- rebuild against new dbus
+
 * Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-15
 - apply upstream patches,
     fix kde#130774, Strange lonesome icon in KInfocenter's start page



From fedora-cvs-commits at redhat.com  Fri Jul 21 14:03:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:03:29 -0400
Subject: rpms/kdebase/devel kdebase-3.5.3-kde#116209.patch, NONE,
	1.1 kdebase.spec, 1.205, 1.206
Message-ID: <200607211403.k6LE3TPq023739@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23724

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kde#116209.patch 
Log Message:
apply upstream patch to fix kde#116209


kdebase-3.5.3-kde#116209.patch:
 kio_media_mounthelper.cpp |   13 -------------
 1 files changed, 13 deletions(-)

--- NEW FILE kdebase-3.5.3-kde#116209.patch ---
Index: kioslave/media/mounthelper/kio_media_mounthelper.cpp
===================================================================
--- kioslave/media/mounthelper/kio_media_mounthelper.cpp	(Revision 551889)
+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp	(Revision 551890)
@@ -91,19 +91,6 @@
 	}
 	else if (args->isSet("s") || args->isSet("e"))
 	{
-		if (medium.isMounted())
-		{
-		  DCOPRef mediamanager("kded", "mediamanager");
-		  DCOPReply reply = mediamanager.call( "unmount", medium.id());
-		  if (reply.isValid())
-		    reply.get(m_errorStr);
-		  m_device = device;
-		  if (!m_errorStr.isNull()) 
-		    {
-		      error();
-		      return;
-		    }
-		}
 		invokeEject(device, true);
 	}
 	else


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- kdebase.spec	21 Jul 2006 13:50:37 -0000	1.205
+++ kdebase.spec	21 Jul 2006 14:03:27 -0000	1.206
@@ -65,6 +65,7 @@
 Patch104: kdebase-3.5.3.diff
 Patch105: kdebase-3.5.3-kde#127971.patch
 Patch106: kdebase-3.5.3-kde#130774.patch
+Patch107: kdebase-3.5.3-kde#116209.patch
 
 # Security fixes
 # Patch 300, KDE Security Advisory, CVE-2006-2449, kdm file disclosure
@@ -185,6 +186,7 @@
 %patch104 -p0 -b .setuid-check
 %patch105 -p0 -b .kde#127971
 %patch106 -p0 -b .kde#130774
+%patch107 -p0 -b .kde#116209
 
 # security fixes
 %patch300 -p0 -b .CVE-2006-2449



From fedora-cvs-commits at redhat.com  Fri Jul 21 14:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:22:59 -0400
Subject: rpms/pam/devel pam-0.99.5.0-console-no-ainit.patch, NONE,
	1.1 pam.spec, 1.124, 1.125
Message-ID: <200607211422.k6LEMxUa019409@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19372

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-console-no-ainit.patch 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-4
- drop ainit from console.handlers (#199561)


pam-0.99.5.0-console-no-ainit.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'pam-0.99.5.0-console-no-ainit.patch'




From fedora-cvs-commits at redhat.com  Fri Jul 21 14:26:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:26:38 -0400
Subject: rpms/specspo/devel .cvsignore, 1.17, 1.18 sources, 1.26,
	1.27 specspo.spec, 1.32, 1.33
Message-ID: <200607211426.k6LEQcBO020154@cvs.devel.redhat.com>

Author: mbacovsk

Update of /cvs/dist/rpms/specspo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20094

Modified Files:
	.cvsignore sources specspo.spec 
Log Message:
* Fri Jul 21 2006 Martin Bacovsky <mbacovsk at redhat.com> 11-1
- New version of catalogues



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/specspo/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	3 Mar 2006 04:09:19 -0000	1.17
+++ .cvsignore	21 Jul 2006 14:26:35 -0000	1.18
@@ -1 +1 @@
-specspo-10.tar.bz2
+specspo-11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/specspo/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	3 Mar 2006 04:09:19 -0000	1.26
+++ sources	21 Jul 2006 14:26:35 -0000	1.27
@@ -1 +1 @@
-7ea77743f8d250f344f2708fdbe6b2b1  specspo-10.tar.bz2
+2d225acef8df4429622f0002479e175c  specspo-11.tar.bz2


Index: specspo.spec
===================================================================
RCS file: /cvs/dist/rpms/specspo/devel/specspo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- specspo.spec	6 Jun 2006 19:29:52 -0000	1.32
+++ specspo.spec	21 Jul 2006 14:26:35 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary: Fedora package descriptions, summaries, and groups.
 Name: specspo
-Version: 10
-Release: 2
+Version: 11
+Release: 1
 Group: Documentation
 Source: specspo-%{version}.tar.bz2
 License: GPL
@@ -39,6 +39,9 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.specspo
 
 %changelog
+* Fri Jul 21 2006 Martin Bacovsky <mbacovsk at redhat.com> 11-1
+- New version of catalogues
+
 * Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> 10-2
 - Added missing BR of gettext
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 14:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:26:48 -0400
Subject: rpms/pam/devel pam.spec,1.125,1.126
Message-ID: <200607211426.k6LEQmaf020224@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20184

Modified Files:
	pam.spec 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-4
- drop ainit from console.handlers (#199561)



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- pam.spec	21 Jul 2006 14:22:56 -0000	1.125
+++ pam.spec	21 Jul 2006 14:26:46 -0000	1.126
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -35,6 +35,7 @@
 Patch83: pam-0.99.4.0-succif-service.patch
 Patch84: pam-0.99.5.0-access-gai.patch
 Patch85: pam-0.99.5.0-selinux-enoent.patch
+Patch86: pam-0.99.5.0-console-no-ainit.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -98,6 +99,7 @@
 %patch83 -p1 -b .service
 %patch84 -p0 -b .gai
 %patch85 -p1 -b .enoent
+%patch86 -p1 -b .no-ainit
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do



From fedora-cvs-commits at redhat.com  Fri Jul 21 14:50:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:50:15 -0400
Subject: rpms/coreutils/devel coreutils-5.2.1-runuser.patch, 1.9,
	1.10 coreutils.spec, 1.130, 1.131
Message-ID: <200607211450.k6LEoFPf031640@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31272

Modified Files:
	coreutils-5.2.1-runuser.patch coreutils.spec 
Log Message:
* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
- Added runuser '-g' and '-G' options (bug #199344).

coreutils-5.2.1-runuser.patch:
 AUTHORS            |    1 
 README             |    2 
 man/Makefile.am    |    3 -
 man/runuser.1      |   59 ++++++++++++++++++++++++++
 man/runuser.x      |    4 +
 src/Makefile.am    |    8 ++-
 src/su.c           |  118 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 tests/help-version |    1 
 8 files changed, 183 insertions(+), 13 deletions(-)

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- coreutils-5.2.1-runuser.patch	22 Jun 2006 22:41:57 -0000	1.9
+++ coreutils-5.2.1-runuser.patch	21 Jul 2006 14:50:12 -0000	1.10
@@ -1,5 +1,5 @@
---- coreutils-5.96/src/su.c.runuser	2006-06-22 23:31:37.000000000 +0100
-+++ coreutils-5.96/src/su.c	2006-06-22 23:31:37.000000000 +0100
+--- coreutils-5.97/src/su.c.runuser	2006-07-21 14:32:13.000000000 +0100
++++ coreutils-5.97/src/su.c	2006-07-21 15:40:16.000000000 +0100
 @@ -132,9 +132,15 @@
  #include "error.h"
  
@@ -27,7 +27,31 @@
  char *getpass ();
  char *getusershell ();
  void endusershell ();
-@@ -303,10 +313,12 @@
+@@ -180,7 +190,11 @@
+ extern char **environ;
+ 
+ static void run_shell (char const *, char const *, char **, size_t,
+-	const struct passwd *)
++	const struct passwd *
++#ifdef RUNUSER
++		       , gid_t *groups, int num_groups
++#endif
++	)
+ #ifdef USE_PAM
+ 	;
+ #else
+@@ -210,6 +224,10 @@
+   {"login", no_argument, NULL, 'l'},
+   {"preserve-environment", no_argument, NULL, 'p'},
+   {"shell", required_argument, NULL, 's'},
++#ifdef RUNUSER
++  {"group", required_argument, NULL, 'g'},
++  {"supp-group", required_argument, NULL, 'G'},
++#endif
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+   {NULL, 0, NULL, 0}
+@@ -307,10 +325,12 @@
    retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
    PAM_BAIL_P;
  
@@ -40,7 +64,7 @@
  
    caller = getpwuid(getuid());
    if(caller != NULL && caller->pw_name != NULL) {
-@@ -323,6 +335,11 @@
+@@ -327,6 +347,11 @@
      retval = pam_set_item(pamh, PAM_TTY, tty_name);
      PAM_BAIL_P;
    }
@@ -52,7 +76,7 @@
    retval = pam_authenticate(pamh, 0);
    PAM_BAIL_P;
    retval = pam_acct_mgmt(pamh, 0);
-@@ -332,6 +349,7 @@
+@@ -336,6 +361,7 @@
      PAM_BAIL_P;
    }
    PAM_BAIL_P;
@@ -60,17 +84,166 @@
    /* must be authenticated if this point was reached */
    return 1;
  #else /* !USE_PAM */
-@@ -746,7 +764,7 @@
+@@ -417,11 +443,22 @@
+ /* Become the user and group(s) specified by PW.  */
+ 
+ static void
+-change_identity (const struct passwd *pw)
++change_identity (const struct passwd *pw
++#ifdef RUNUSER
++		 , gid_t *groups, int num_groups
++#endif
++	)
+ {
+ #ifdef HAVE_INITGROUPS
++  int rc = 0;
+   errno = 0;
+-  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
++#ifdef RUNUSER
++  if (num_groups)
++    rc = setgroups(num_groups, groups);
++  else
++#endif
++    rc = initgroups(pw->pw_name, pw->pw_gid);
++  if (rc == -1) {
+ #ifdef USE_PAM
+     pam_close_session(pamh, 0);
+     pam_end(pamh, PAM_ABORT);
+@@ -468,7 +505,11 @@
+ 
+ static void
+ run_shell (char const *shell, char const *command, char **additional_args,
+-	   size_t n_additional_args, const struct passwd *pw)
++	   size_t n_additional_args, const struct passwd *pw
++#ifdef RUNUSER
++	   , gid_t *groups, int num_groups
++#endif
++	)
+ {
+   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
+   char const **args = xnmalloc (n_args, sizeof *args);
+@@ -499,7 +540,11 @@
+ 
+   child = fork();
+   if (child == 0) {  /* child shell */
+-  change_identity (pw);
++  change_identity (pw
++#ifdef RUNUSER
++		   , groups, num_groups
++#endif
++	  );
+   pam_end(pamh, 0);
+   if (!same_session)
+     setsid ();
+@@ -647,6 +692,8 @@
+ Change the effective user id and group id to that of USER.\n\
+ \n\
+   -, -l, --login               make the shell a login shell\n\
++  -g --group=group             specify the primary group\n\
++  -G --supp-group=group        specify a supplemental group\n\
+   -c, --commmand=COMMAND       pass a single COMMAND to the shell with -c\n\
+   --session-command=COMMAND    pass a single COMMAND to the shell with -c\n\
+                                and do not create a new session\n\
+@@ -676,6 +723,12 @@
+   char *shell = NULL;
+   struct passwd *pw;
+   struct passwd pw_copy;
++#ifdef RUNUSER
++  struct group *gr;
++  gid_t groups[NGROUPS_MAX];
++  int num_supp_groups = 0;
++  int use_gid = 0;
++#endif
+ 
+   initialize_main (&argc, &argv);
+   program_name = argv[0];
+@@ -690,7 +743,11 @@
+   simulate_login = false;
+   change_environment = true;
+ 
+-  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
++  while ((optc = getopt_long (argc, argv, "c:flmps:"
++#ifdef RUNUSER
++			      "g:G:"
++#endif
++			      , longopts, NULL)) != -1)
+     {
+       switch (optc)
+ 	{
+@@ -720,6 +777,28 @@
+ 	  shell = optarg;
+ 	  break;
+ 
++#ifdef RUNUSER
++	case 'g':
++	  gr = getgrnam(optarg);
++	  if (!gr)
++	    error (EXIT_FAIL, 0, _("group %s does not exist"), optarg);
++	  use_gid = 1;
++	  groups[0] = gr->gr_gid;
++	  break;
++
++	case 'G':
++	  num_supp_groups++;
++	  if (num_supp_groups >= NGROUPS_MAX)
++	    error (EXIT_FAIL, 0,
++		   _("Can't specify more than %d supplemental groups"),
++		   NGROUPS_MAX - 1);
++	  gr = getgrnam(optarg);
++	  if (!gr)
++	    error (EXIT_FAIL, 0, _("group %s does not exist"), optarg);
++	  groups[num_supp_groups] = gr->gr_gid;
++	  break;
++#endif
++
+ 	case_GETOPT_HELP_CHAR;
+ 
+ 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+@@ -758,7 +837,20 @@
  			  : DEFAULT_SHELL);
    endpwent ();
  
 -  if (!correct_password (pw))
++#ifdef RUNUSER
++  if (num_supp_groups && !use_gid)
++  {
++    pw->pw_gid = groups[1];
++    memmove (groups, groups + 1, sizeof(gid_t) * num_supp_groups);
++  }
++  else if (use_gid)
++  {
++    pw->pw_gid = groups[0];
++    num_supp_groups++;
++  }
++#endif
++
 +  if (CHECKPASSWD && !correct_password (pw))
      {
  #ifdef SYSLOG_FAILURE
        log_su (pw, false);
---- coreutils-5.96/src/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
-+++ coreutils-5.96/src/Makefile.am	2006-06-22 23:31:37.000000000 +0100
+@@ -790,10 +882,18 @@
+   modify_environment (pw, shell);
+ 
+ #ifndef USE_PAM
+-  change_identity (pw);
++  change_identity (pw
++#ifdef RUNUSER
++		   , groups, num_supp_groups
++#endif
++		   );
+ #endif
+   if (simulate_login && chdir (pw->pw_dir) != 0)
+     error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
+ 
+-  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
++  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw
++#ifdef RUNUSER
++	     , groups, num_supp_groups
++#endif
++	     );
+ }
+--- coreutils-5.97/src/Makefile.am.runuser	2006-07-21 14:32:13.000000000 +0100
++++ coreutils-5.97/src/Makefile.am	2006-07-21 14:32:13.000000000 +0100
 @@ -17,7 +17,7 @@
  ## along with this program; if not, write to the Free Software Foundation,
  ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -100,8 +273,8 @@
  
  installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
  
---- coreutils-5.96/tests/help-version.runuser	2006-02-07 09:13:43.000000000 +0000
-+++ coreutils-5.96/tests/help-version	2006-06-22 23:31:37.000000000 +0100
+--- coreutils-5.97/tests/help-version.runuser	2006-06-01 08:26:09.000000000 +0100
++++ coreutils-5.97/tests/help-version	2006-07-21 14:32:13.000000000 +0100
 @@ -137,6 +137,7 @@
  seq_args=10
  sleep_args=0
@@ -110,8 +283,8 @@
  test_args=foo
  
  # This is necessary in the unusual event that there is
---- coreutils-5.96/AUTHORS.runuser	2006-06-22 23:31:37.000000000 +0100
-+++ coreutils-5.96/AUTHORS	2006-06-22 23:31:37.000000000 +0100
+--- coreutils-5.97/AUTHORS.runuser	2006-07-21 14:32:13.000000000 +0100
++++ coreutils-5.97/AUTHORS	2006-07-21 14:32:13.000000000 +0100
 @@ -60,6 +60,7 @@
  readlink: Dmitry V. Levin
  rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering
@@ -120,8 +293,8 @@
  seq: Ulrich Drepper
  sha1sum: Ulrich Drepper, Scott Miller, David Madore
  sha224sum: Ulrich Drepper, Scott Miller, David Madore
---- coreutils-5.96/README.runuser	2006-06-22 23:31:37.000000000 +0100
-+++ coreutils-5.96/README	2006-06-22 23:32:02.000000000 +0100
+--- coreutils-5.97/README.runuser	2006-07-21 14:32:13.000000000 +0100
++++ coreutils-5.97/README	2006-07-21 14:32:13.000000000 +0100
 @@ -12,7 +12,7 @@
    df dir dircolors dirname du echo env expand expr factor false fmt fold
    ginstall groups head hostid hostname id join kill link ln logname ls
@@ -131,15 +304,15 @@
    sha256sum sha384sum sha512sum shred sleep sort
    split stat stty su sum sync tac tail tee test touch tr true tsort tty
    uname unexpand uniq unlink uptime users vdir wc who whoami yes
---- /dev/null	2006-06-22 09:01:01.637265000 +0100
-+++ coreutils-5.96/man/runuser.x	2006-06-22 23:31:37.000000000 +0100
+--- /dev/null	2006-07-21 09:48:40.571484750 +0100
++++ coreutils-5.97/man/runuser.x	2006-07-21 14:32:13.000000000 +0100
 @@ -0,0 +1,4 @@
 +[NAME]
 +runuser \- run a shell with substitute user and group IDs
 +[DESCRIPTION]
 +.\" Add any additional description here
---- /dev/null	2006-06-22 09:01:01.637265000 +0100
-+++ coreutils-5.96/man/runuser.1	2006-06-22 23:31:37.000000000 +0100
+--- /dev/null	2006-07-21 09:48:40.571484750 +0100
++++ coreutils-5.97/man/runuser.1	2006-07-21 14:32:13.000000000 +0100
 @@ -0,0 +1,59 @@
 +.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
 +.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands"
@@ -200,8 +373,8 @@
 +.B info coreutils su
 +.PP
 +should give you access to the complete manual.
---- coreutils-5.96/man/Makefile.am.runuser	2006-06-22 23:31:37.000000000 +0100
-+++ coreutils-5.96/man/Makefile.am	2006-06-22 23:31:37.000000000 +0100
+--- coreutils-5.97/man/Makefile.am.runuser	2006-07-21 14:32:13.000000000 +0100
++++ coreutils-5.97/man/Makefile.am	2006-07-21 14:32:13.000000000 +0100
 @@ -7,7 +7,7 @@
    link.1 ln.1 logname.1 \
    ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- coreutils.spec	21 Jul 2006 13:26:30 -0000	1.130
+++ coreutils.spec	21 Jul 2006 14:50:12 -0000	1.131
@@ -281,6 +281,7 @@
 
 %changelog
 * Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
+- Added runuser '-g' and '-G' options (bug #199344).
 - Added su '--session-command' option (bug #199066).
 
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 5.97-5



From fedora-cvs-commits at redhat.com  Fri Jul 21 14:55:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 10:55:07 -0400
Subject: rpms/coreutils/devel coreutils.spec,1.131,1.132
Message-ID: <200607211455.k6LEt7Qg007336@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7262

Modified Files:
	coreutils.spec 
Log Message:
5.97-6


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- coreutils.spec	21 Jul 2006 14:50:12 -0000	1.131
+++ coreutils.spec	21 Jul 2006 14:55:05 -0000	1.132
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 5
+Release: 6
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,7 +280,7 @@
 /sbin/runuser
 
 %changelog
-* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com>
+* Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com> 5.97-6
 - Added runuser '-g' and '-G' options (bug #199344).
 - Added su '--session-command' option (bug #199066).
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 15:26:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 11:26:11 -0400
Subject: rpms/gcc/devel .cvsignore, 1.161, 1.162 gcc41.spec, 1.85,
	1.86 sources, 1.163, 1.164
Message-ID: <200607211526.k6LFQBb5031311@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31243

Modified Files:
	.cvsignore gcc41.spec sources 
Log Message:
4.1.1-11


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- .cvsignore	20 Jul 2006 19:00:54 -0000	1.161
+++ .cvsignore	21 Jul 2006 15:26:08 -0000	1.162
@@ -1 +1 @@
-gcc-4.1.1-20060720.tar.bz2
+gcc-4.1.1-20060721.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gcc41.spec	20 Jul 2006 22:35:51 -0000	1.85
+++ gcc41.spec	21 Jul 2006 15:26:08 -0000	1.86
@@ -1,6 +1,6 @@
-%define DATE 20060720
+%define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 10
+%define gcc_release 11
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -306,8 +306,7 @@
 Obsoletes: gcc4-java
 Provides: gcc4-java
 Prereq: /sbin/install-info
-Autoreq: false
-Autoprov: false
+Autoreq: true
 
 %description java
 This package adds support for compiling Java(tm) programs and
@@ -342,12 +341,13 @@
 %package -n libgcj-devel
 Summary: Libraries for Java development using GCC
 Group: Development/Languages
-Requires: zip >= 2.1, libgcj = %{version}-%{release}
+Requires: zip >= 2.1, libgcj = %{version}-%{release}, /bin/awk
 Obsoletes: libgcj3-devel
 Obsoletes: libgcj34-devel
 Obsoletes: libgcj4-devel
 Provides: libgcj4-devel
-Autoreq: true
+Autoreq: false
+Autoprov: false
 
 %description -n libgcj-devel
 The Java(tm) static libraries and C header files. You will need this
@@ -766,7 +766,7 @@
 # and saving 35MB is not bad.
 find $RPM_BUILD_ROOT -name libgcj.a -o -name libgtkpeer.a \
 		     -o -name libgjsmalsa.a -o libgcj-tools.a -o libjvm.a \
-		     -o -name libgij.a -o name libgcj.a | xargs rm -f
+		     -o -name libgij.a -o -name libgcj_bc.a | xargs rm -f
 
 mv $RPM_BUILD_ROOT%{_prefix}/lib/libgcj.spec $FULLPATH/
 sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' \
@@ -1515,6 +1515,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Jul 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-11
+- update from gcc-4_1-branch (-r115565:115644)
+  - PRs target/27363, c++/27495, c++/28048, c++/28235, c++/28337, c++/28338,
+	c++/28363, middle-end/28283
+- turn back autoprov/autoreq on gcc-java, instead disable it on
+  libgcj-devel
+
 * Thu Jul 20 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-10
 - Java backport of from GCC trunk (Tom Tromey, Bryce McKinlay)
   - include libgcjwebplugin.so, gappletviewer, gjarsigner, gkeytool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- sources	20 Jul 2006 19:00:55 -0000	1.163
+++ sources	21 Jul 2006 15:26:08 -0000	1.164
@@ -1 +1 @@
-f30458ebae00dacc055bf0969bbd51d1  gcc-4.1.1-20060720.tar.bz2
+e5945134c55627b8e8d40d02966607df  gcc-4.1.1-20060721.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 15:56:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 11:56:56 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.44,1.45
Message-ID: <200607211556.k6LFuuX5023191@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23100

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_5fc
- Split into main package and sdk sub-package.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- eclipse-cdt.spec	20 Jul 2006 21:10:56 -0000	1.44
+++ eclipse-cdt.spec	21 Jul 2006 15:56:54 -0000	1.45
@@ -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
@@ -71,10 +71,18 @@
 %endif
 BuildRoot: 	%{_tmppath}/%{name}-buildroot
 
+%package sdk
+Summary: 	%{pkg_summary} SDK
+Group: 		Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name} = %{version}-%{release}
+
 %description
 The eclipse-cdt package contains Eclipse features and plugins that are
 useful for C and C++ development.
 
+%description sdk
+This is the SDK version of the eclipse-cdt package.
+
 %prep
 %setup -q -c 
 pushd "org.eclipse.cdt.releng"
@@ -179,6 +187,10 @@
       # The ".." is needed since the zip files contain "eclipse/foo".
       (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file)
       ;;
+    */org.eclipse.cdt.sdk-*-linux.$buildArch.*)
+      # The ".." is needed since the zip files contain "eclipse/foo".
+      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file)
+      ;;
   esac
 done
 
@@ -199,8 +211,8 @@
 )
 
 # These are in the SDK packages
-rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
-rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
+#rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html
+#rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html
 
 # Autotools install
 pushd autotools
@@ -224,17 +236,40 @@
 
 %files
 %defattr(-,root,root)
+%{eclipse_base}/features/org.eclipse.cdt_*
+%{eclipse_base}/features/com.redhat.eclipse.cdt*
+%{eclipse_base}/plugins/org.eclipse.cdt_*
+%{eclipse_base}/plugins/org.eclipse.cdt.core*
+%{eclipse_base}/plugins/org.eclipse.cdt.debug*
+%{eclipse_base}/plugins/org.eclipse.cdt.doc*
+%{eclipse_base}/plugins/org.eclipse.cdt.launch*
+%{eclipse_base}/plugins/org.eclipse.cdt.make*
+%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder*
+%{eclipse_base}/plugins/org.eclipse.cdt.refactoring*
+%{eclipse_base}/plugins/org.eclipse.cdt.ui*
+%{eclipse_base}/plugins/com.redhat.eclipse.cdt*
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}
+%endif
+
+%files sdk
+%defattr(-,root,root)
 %{eclipse_base}/features/org.eclipse.cdt*
 %{eclipse_base}/features/com.redhat.eclipse.cdt*
 %{eclipse_base}/plugins/org.eclipse.cdt*
 %{eclipse_base}/plugins/com.redhat.eclipse.cdt*
-#%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch}
+%{eclipse_base}/epl-v10.html
+%{eclipse_base}/notice.html
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_5fc
+- Split into main package and sdk sub-package.
+
 * Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_4fc
 - Add Autotools plug-ins via additional source tarball.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 16:00:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 12:00:07 -0400
Subject: rpms/rpm/devel rpm.spec,1.212,1.213
Message-ID: <200607211600.k6LG07mK024426@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24397

Modified Files:
	rpm.spec 
Log Message:
Apply matchpathcon patch


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- rpm.spec	19 Jul 2006 19:56:10 -0000	1.212
+++ rpm.spec	21 Jul 2006 16:00:04 -0000	1.213
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 30
+Release: 31
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -196,7 +196,7 @@
 %patch25 -p1 -b .develdeps
 %patch26 -p1 -b .fcskip
 %patch27 -p0 -b .nosever
-#patch6 -p1  -b .matchpathcon
+%patch6 -p1  -b .matchpathcon
 %patch28 -p1 -b .aslist
 %patch29 -p1 -b .ipv6
 %patch30 -p1 -b .gnuhash
@@ -597,6 +597,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Jul 21 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-31
+- Apply matchpathcon patch
+
 * Wed Jul 19 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-30
 - Fix debugedit for ppc relocations (#199473)
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 16:11:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 12:11:22 -0400
Subject: rpms/MySQL-python/devel .cvsignore, 1.6, 1.7 MySQL-python.spec, 1.23,
	1.24 sources, 1.6, 1.7
Message-ID: <200607211611.k6LGBMlF026206@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/MySQL-python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26176

Modified Files:
	.cvsignore MySQL-python.spec sources 
Log Message:
Update to current upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Apr 2005 05:37:12 -0000	1.6
+++ .cvsignore	21 Jul 2006 16:11:19 -0000	1.7
@@ -1 +1 @@
-MySQL-python-1.2.0.tar.gz
+MySQL-python-1.2.1.tar.gz


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MySQL-python.spec	12 Jul 2006 07:25:37 -0000	1.23
+++ MySQL-python.spec	21 Jul 2006 16:11:19 -0000	1.24
@@ -1,17 +1,18 @@
-%define pybasever 2.4
+# Python major version.
+%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
 
 Summary: An interface to MySQL
 Name: MySQL-python
-Version: 1.2.0
-Release: 3.2.2.1
+Version: 1.2.1
+Release: 1
 License: GPL
 Group: Development/Libraries
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-buildroot
 URL: http://sourceforge.net/projects/mysql-python/
 Requires: python mx mysql
-Requires: python >= %{pybasever}
-BuildRequires: python-devel >= %{pybasever}
+Requires: python >= %{pyver}
+BuildRequires: python-devel >= %{pyver}
 BuildRequires: mysql-devel python Distutils gcc zlib-devel
 
 %description
@@ -41,6 +42,8 @@
 CFLAGS="$RPM_OPT_FLAGS" python setup.py build
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 export libdirname=%{_lib}
 python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 
@@ -50,13 +53,17 @@
 %files -f INSTALLED_FILES
 %defattr(-,root,root)
 %doc README doc/*
-%dir /usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb
-/usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/*.pyo
-/usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/constants/*.pyo
-/usr/%{_lib}/python%{pybasever}/site-packages/*.pyo
-%dir /usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/constants
+%dir /usr/%{_lib}/python%{pyver}/site-packages/MySQLdb
+/usr/%{_lib}/python%{pyver}/site-packages/MySQLdb/*.pyo
+/usr/%{_lib}/python%{pyver}/site-packages/MySQLdb/constants/*.pyo
+/usr/%{_lib}/python%{pyver}/site-packages/*.pyo
+%dir /usr/%{_lib}/python%{pyver}/site-packages/MySQLdb/constants
 
 %changelog
+* Fri Jul 21 2006 Tom Lane <tgl at redhat.com> 1.2.1-1
+- Update to 1.2.1
+- Remove hardwired python version number in favor of asking Python
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2.2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Apr 2005 05:37:12 -0000	1.6
+++ sources	21 Jul 2006 16:11:19 -0000	1.7
@@ -1 +1 @@
-b0eb974cc3c917276e015275e1ec996f  MySQL-python-1.2.0.tar.gz
+305328bfaea8a03738a88112df50461c  MySQL-python-1.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 16:48:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 12:48:18 -0400
Subject: rpms/xorg-x11-xinit/devel localuser.sh, NONE,
	1.1 xorg-x11-xinit.spec, 1.25, 1.26
Message-ID: <200607211648.k6LGmIVS012857@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12846

Modified Files:
	xorg-x11-xinit.spec 
Added Files:
	localuser.sh 
Log Message:
* Fri Jul 21 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-7.fc6
- Added localuser.sh.



--- NEW FILE localuser.sh ---
#!/bin/sh
# Copyright (C) 2006 Red Hat, Inc. All rights reserved. This
# copyrighted material is made available to anyone wishing to use, modify,
# copy, or redistribute it subject to the terms and conditions of the
# GNU General Public License version 2.
#
# 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.
#
[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
    xhost +si:localuser:`id -un`


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-xinit.spec	19 Jul 2006 10:31:02 -0000	1.25
+++ xorg-x11-xinit.spec	21 Jul 2006 16:48:16 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -17,6 +17,7 @@
 Source13: Xmodmap
 Source14: Xresources
 Source15: xinput.sh
+Source16: localuser.sh
 # NOTE: Xsession is used by xdm/kdm/gdm and possibly others, so we keep it
 #       here instead of the xdm package.
 Source16: Xsession
@@ -28,6 +29,9 @@
 # NOTE: startx needs xauth in order to run, but that is not picked up
 #       automatically by rpm.  (Bug #173684)
 Requires: xauth
+# next two are for localuser.sh
+Requires: coreutils
+Requires: xorg-x11-server-utils
 
 # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
 # modularization.  These Obsoletes lines ensure upgrades work smoothly.
@@ -68,6 +72,7 @@
 
     mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
     install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
+    install -m 755 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
 
     mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
 }
@@ -96,6 +101,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Fri Jul 21 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-7.fc6
+- Added localuser.sh.
+
 * Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.2-6.fc6
 - Added fix to Xclients script, based on patch from bug (#190799)
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 17:32:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 13:32:58 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.783,1.784
Message-ID: <200607211732.k6LHWwIn012832@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12784

Modified Files:
	openoffice.org.spec 
Log Message:
foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- openoffice.org.spec	21 Jul 2006 11:35:02 -0000	1.783
+++ openoffice.org.spec	21 Jul 2006 17:32:55 -0000	1.784
@@ -151,7 +151,7 @@
 Requires: libbluecurve.so, libcrux-engine.so
 %endif
 Requires: libgcj >= 4.0.0
-Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
+Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -3347,6 +3347,7 @@
 - drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - try and reanable visibility
+- drop hard requirement on bsh
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:03:40 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.45,1.46
Message-ID: <200607211803.k6LI3e1e005170@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5100

Modified Files:
	xalan-j2.spec 
Log Message:
Resync with latest from JPP.




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xalan-j2.spec	20 Jul 2006 05:43:53 -0000	1.45
+++ xalan-j2.spec	21 Jul 2006 18:03:37 -0000	1.46
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        3jpp_1fc
+Release:        4jpp_1fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -322,6 +322,9 @@
 %endif
 
 %changelog
+* Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_1fc
+- Resync with latest JPP version.
+
 * Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-3jpp_1fc
 - Merge with latest version from jpp.
 - Undo ExcludeArch since eclipse available for all arch-es.



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:05:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:05:10 -0400
Subject: rpms/gdm/devel gdm-2.15.5-process-all-ops.patch, 1.2, 1.3 gdm.spec,
	1.182, 1.183
Message-ID: <200607211805.k6LI5A0A005435@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5353

Modified Files:
	gdm-2.15.5-process-all-ops.patch gdm.spec 
Log Message:
- really fix annoying dialog problem mentioned in 2.15.6-6


gdm-2.15.5-process-all-ops.patch:
 gdmlogin.c        |  121 +++++++++++++++++++++---------------------------------
 greeter/greeter.c |  119 +++++++++++++++++++++--------------------------------
 2 files changed, 96 insertions(+), 144 deletions(-)

Index: gdm-2.15.5-process-all-ops.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.5-process-all-ops.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdm-2.15.5-process-all-ops.patch	17 Jul 2006 23:06:11 -0000	1.2
+++ gdm-2.15.5-process-all-ops.patch	21 Jul 2006 18:05:03 -0000	1.3
@@ -37,8 +37,8 @@
 +    p = memchr (buf, STX, len);
 +    if (p != NULL) {
 +      len = p - buf;
-+      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
-+      memset (buf + len, '\0', sizeof (buf) - len);
++      g_io_channel_seek_position (source, -(((sizeof (buf) - 1) - 1) - len), G_SEEK_CUR, NULL);
++      memset (buf + len, '\0', ((sizeof (buf) - 1) - 1) - len);
 +    }
 +    buf[len - 1] = '\0';  
 + 
@@ -393,8 +393,8 @@
 +    p = memchr (buf, STX, len);
 +    if (p != NULL) {
 +      len = p - buf;
-+      g_io_channel_seek_position (source, -(sizeof (buf) - len), G_SEEK_CUR, NULL);
-+      memset (buf + len, '\0', sizeof (buf) - len);
++      g_io_channel_seek_position (source, -((sizeof (buf) - 1) - len), G_SEEK_CUR, NULL);
++      memset (buf + len, '\0', (sizeof (buf) - 1) - len);
 +    }
 +    buf[len - 1] = '\0';  
 +


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- gdm.spec	19 Jul 2006 20:30:03 -0000	1.182
+++ gdm.spec	21 Jul 2006 18:05:04 -0000	1.183
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 10
+Release: 11
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -331,6 +331,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-11
+- really fix annoying dialog problem mentioned in 2.15.6-6
+
 * Wed Jul 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-10
 - center cursor on xinerama head (bug 180085)
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:44:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:44:00 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.24, 1.25 rhpxl.spec, 1.28,
	1.29 sources, 1.27, 1.28
Message-ID: <200607211844.k6LIi0oO031355@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31305

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	19 Jul 2006 20:46:26 -0000	1.24
+++ .cvsignore	21 Jul 2006 18:43:58 -0000	1.25
@@ -2,3 +2,4 @@
 rhpxl-0.19.tar.gz
 rhpxl-0.20.tar.gz
 rhpxl-0.21.tar.gz
+rhpxl-0.22.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rhpxl.spec	19 Jul 2006 20:46:26 -0000	1.28
+++ rhpxl.spec	21 Jul 2006 18:43:58 -0000	1.29
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.21
+Version: 0.22
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Fri Jul 21 2006 Chris Lumens <clumens at redhat.com> 0.22-1
+- Fix traceback on default log file location.
+- Restore driver options to config file to fix ppc installs.
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 0.21-1
 - Don't traceback if no monitor, screen, or device is found in the
   X config file.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	19 Jul 2006 20:46:26 -0000	1.27
+++ sources	21 Jul 2006 18:43:58 -0000	1.28
@@ -1 +1 @@
-ae9bafab5a755e085f92a79e63f7e579  rhpxl-0.21.tar.gz
+c9d63727def9c6dd1dc792f5ea4ab606  rhpxl-0.22.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:48:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:48:10 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.102, 1.103 initscripts.spec,
	1.118, 1.119 sources, 1.113, 1.114
Message-ID: <200607211848.k6LImAZg015261@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15226

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.36-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	12 Jun 2006 19:39:32 -0000	1.102
+++ .cvsignore	21 Jul 2006 18:48:08 -0000	1.103
@@ -1 +1 @@
-initscripts-8.35.tar.bz2
+initscripts-8.36.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- initscripts.spec	12 Jul 2006 06:24:35 -0000	1.118
+++ initscripts.spec	21 Jul 2006 18:48:08 -0000	1.119
@@ -1,9 +1,9 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.35
+Version: 8.36
 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/
 BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -112,10 +112,10 @@
 %config(noreplace) /etc/sysconfig/init
 %config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
-%config /sbin/ifdown
+/sbin/ifdown
 %config /etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifup
-%config /sbin/ifup
+/sbin/ifup
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/modules
 %dir /etc/sysconfig/networking
@@ -133,6 +133,7 @@
 %config /etc/sysconfig/network-scripts/ifup-ppp
 %config /etc/sysconfig/network-scripts/ifup-sl
 %config /etc/sysconfig/network-scripts/ifup-routes
+%config /etc/sysconfig/network-scripts/ifdown-routes
 %config /etc/sysconfig/network-scripts/ifup-plip
 %config /etc/sysconfig/network-scripts/ifup-plusb
 %config /etc/sysconfig/network-scripts/ifup-bnep
@@ -209,6 +210,27 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Jul 21 2006 Bill Nottingham <notting at redhat.com> 8.36-1
+- rework automatic swapon - only run if AUTOSWAP=yes, and fix errors
+  (#198695, #196179, #196208)
+- redo single so it starts last in runlevel 1, and doesn't kill/start
+  services itself
+- add configurable delay for killproc() (#198429, <jorton at redhat.com>)
+- fix loop in rename_device (#199242, <markmc at redhat.com>)
+- rc.sysinit: stateless updates (#197972, <law at redhat.com>)
+- support for copying dhcp leases from initramfs (#198601, <markmc at redhat.com>)
+- readonly-root: SELinux works now in the kernel, allow it
+- init.d/network: don't bring down network if root is on a network device
+- init.d/halt: don't use -i to halt; causes problems with iscsi
+- add support for routing rule-$device (#132252, <mitr at redhat.com>)
+- fix rhgb output (#192604, <tonynelson at georgeanelson.com>)
+- fix crypttab options for LUKS (#197656, <mitr at redhat.com>)
+- ipsec: various fixes & new features (#150682, #168972, <mitr at redhat.com>, <alex at milivojevic.org>)
+- ipsec: add check for IKE_METHOD (#197576, <john_smyth at mail.ru>)
+- rename_device: ignore alias devices, fix race (#186355)
+- ifup/ifdown: don't mark as %config
+- rwtab: some additions/cleanup
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.35-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources	12 Jun 2006 19:39:32 -0000	1.113
+++ sources	21 Jul 2006 18:48:08 -0000	1.114
@@ -1 +1 @@
-1da30d32edad78687034067556b41cc7  initscripts-8.35.tar.bz2
+34240f026fe72d774b8eeff45f207149  initscripts-8.36.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:51:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:51:15 -0400
Subject: rpms/system-config-bind/devel .cvsignore, 1.28, 1.29 sources, 1.45,
	1.46 system-config-bind.spec, 1.55, 1.56
Message-ID: <200607211851.k6LIpFBK016419@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/system-config-bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16399

Modified Files:
	.cvsignore sources system-config-bind.spec 
Log Message:
ship updated translations; fix release tag


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	15 Jun 2006 03:01:35 -0000	1.28
+++ .cvsignore	21 Jul 2006 18:51:13 -0000	1.29
@@ -25,3 +25,4 @@
 system-config-bind-4.0.0-41_FC5.tar.gz
 system-config-bind-4.0.0-41_FC6.tar.gz
 system-config-bind-4.0.0-42_FC6.tar.gz
+system-config-bind-4.0.0-44.fc6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	15 Jun 2006 03:01:35 -0000	1.45
+++ sources	21 Jul 2006 18:51:13 -0000	1.46
@@ -1 +1 @@
-f91cf8fa3fc6c349dd3aaf16baede334  system-config-bind-4.0.0-42_FC6.tar.gz
+55032fbd685249583e3c8ab3c905b39f  system-config-bind-4.0.0-44.fc6.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- system-config-bind.spec	19 Jul 2006 14:34:19 -0000	1.55
+++ system-config-bind.spec	21 Jul 2006 18:51:13 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.0
-Release: 	43%{?dist}
+Release: 	44%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -91,6 +91,10 @@
 fi
 
 %changelog
+* Fri Jul 21 2006 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-44
+- ship updated translations
+- fix build and release tag (update release to 44).
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-43
 - fix release tag
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:56:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:56:38 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.37,1.38
Message-ID: <200607211856.k6LIuc4b018480@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18450

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Fri Jul 21 2006 Kyu Lee <klee at redhat.com> 2.2.0-1
- Import version 2.2.0 that has new prepare-changelog functionality.



Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eclipse-changelog.spec	20 Jul 2006 15:02:58 -0000	1.37
+++ eclipse-changelog.spec	21 Jul 2006 18:56:36 -0000	1.38
@@ -5,7 +5,7 @@
 %define section			free
 %define eclipse_name 		eclipse
 %define	changelog_major		2
-%define changelog_minor		1
+%define changelog_minor		2
 %define changelog_majmin	%{changelog_major}.%{changelog_minor}
 %define changelog_micro   	0
 %define eclipse_base   %{_datadir}/%{eclipse_name}
@@ -20,8 +20,8 @@
 
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
-Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        3
+Version: 	%{changelog_majmin}.%{changelog_micro}
+Release:        3%{?dist}
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Fri Jul 21 2006 Kyu Lee <klee at redhat.com> 2.2.0-1
+- Import version 2.2.0 that has new prepare-changelog functionality.
+
 * Thu Jul 20 2006 Igor Foox <ifoox at redhat.com> 2.1.0_fc-3
 - Mass rebuild for FC6 test2.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:57:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:57:27 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.38,1.39
Message-ID: <200607211857.k6LIvRvi018843@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18809

Modified Files:
	eclipse-changelog.spec 
Log Message:
fix release


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- eclipse-changelog.spec	21 Jul 2006 18:56:36 -0000	1.38
+++ eclipse-changelog.spec	21 Jul 2006 18:57:25 -0000	1.39
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}
-Release:        3%{?dist}
+Release:        1%{?dist}
 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



From fedora-cvs-commits at redhat.com  Fri Jul 21 18:59:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 14:59:49 -0400
Subject: rpms/compiz/devel glfinish.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 compiz.spec, 1.4, 1.5 composite-cube-logo.patch, 1.1,
	1.2 fbconfig-depth-fix.patch, 1.1, 1.2 fedora-logo.patch, 1.1,
	1.2 gl-include-inferiors.patch, 1.1, 1.2 sources, 1.2,
	1.3 tfp-server-extension.patch, 1.1, 1.2
Message-ID: <200607211859.k6LIxngZ019825@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19795

Modified Files:
	.cvsignore compiz.spec composite-cube-logo.patch 
	fbconfig-depth-fix.patch fedora-logo.patch 
	gl-include-inferiors.patch sources tfp-server-extension.patch 
Added Files:
	glfinish.patch 
Log Message:
Add glfinish workaround and drop scale plugin.

glfinish.patch:
 display.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE glfinish.patch ---
Add glFinish() after drawing a frame to work-around throttling problems.

From: Kristian H??gsberg <krh at redhat.com>


---

 src/display.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/display.c b/src/display.c
index 250abb7..bc9b0bb 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1482,6 +1482,8 @@ eventLoop (void)
 
 		    (*s->donePaintScreen) (s);
 
+		    glFinish ();
+
 		    /* remove destroyed windows */
 		    while (s->pendingDestroys)
 		    {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2006 17:15:07 -0000	1.2
+++ .cvsignore	21 Jul 2006 18:59:46 -0000	1.3
@@ -1 +1 @@
-compiz-99c96865db7b46b881fcd44f709008043ecfcb66.tar.bz2
+compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compiz.spec	18 Jul 2006 18:09:40 -0000	1.4
+++ compiz.spec	21 Jul 2006 18:59:46 -0000	1.5
@@ -1,11 +1,14 @@
-%define		sha1 99c96865db7b46b881fcd44f709008043ecfcb66
+#						-*- mode: rpm-spec -*-
+
+%define		sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
+%define		snapshot 20060721
 
 Name:           compiz
 Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.6.20060717git%{?dist}
+Release:        0.8.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +35,7 @@
 Patch103: composite-cube-logo.patch
 Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
+Patch106: glfinish.patch
 
 
 %description
@@ -51,11 +55,12 @@
 %patch103 -p1 -b .composite-cube-logo
 %patch104 -p1 -b .fbconfig-depth-fix
 %patch105 -p1 -b .fedora-logo
+%patch106 -p1 -b .glfinish
 
 %build
 %configure --disable-libsvg-cairo
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +97,12 @@
 %{_datadir}/locale/*/LC_MESSAGES/compiz.mo
 
 %changelog
+* Fri Jul 21 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.8.20060720git
+- Add workaround for AIGLX throttling problem.
+
+* Thu Jul 20 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.7.20060720git
+- Drop scale plugin from snapshot.
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 0.0.13-0.6.20060717git
 - Don't build on s390
 
@@ -103,7 +114,7 @@
 
 * Fri Jul  7 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13.fedora1-4
 - Drop the fullscreen hardcode patch and require X server that has
-GLX_MESA_copy_sub_buffer.
+  GLX_MESA_copy_sub_buffer.
 
 * Tue Jun 27 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13.fedora1-3
 - Unbreak --replace.
@@ -113,4 +124,4 @@
 
 * Wed Jun 14 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13.fedora1-1
 - Spec file for compiz, borrowing bits and pieces from Alphonse Van
-Assches spec file (#192432).
+  Assches spec file (#192432).

composite-cube-logo.patch:
 cube.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

Index: composite-cube-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/composite-cube-logo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- composite-cube-logo.patch	18 Jul 2006 17:15:08 -0000	1.1
+++ composite-cube-logo.patch	21 Jul 2006 18:59:46 -0000	1.2
@@ -9,7 +9,7 @@
  1 files changed, 17 insertions(+), 0 deletions(-)
 
 diff --git a/plugins/cube.c b/plugins/cube.c
-index b605e22..6439b9e 100644
+index b222685..0576b8d 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -1204,11 +1204,28 @@ cubePaintTransformedScreen (CompScreen		

fbconfig-depth-fix.patch:
 screen.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: fbconfig-depth-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fbconfig-depth-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fbconfig-depth-fix.patch	18 Jul 2006 17:15:08 -0000	1.1
+++ fbconfig-depth-fix.patch	21 Jul 2006 18:59:46 -0000	1.2
@@ -9,7 +9,7 @@
  1 files changed, 10 insertions(+), 0 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index 0a13d9b..7b02aaa 100644
+index 14e7083..a9f1b99 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -1309,6 +1309,16 @@ addScreen (CompDisplay *display,

fedora-logo.patch:
 compiz.schemas.in.in |    4 ++--
 cube.c               |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: fedora-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fedora-logo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-logo.patch	18 Jul 2006 17:15:08 -0000	1.1
+++ fedora-logo.patch	21 Jul 2006 18:59:46 -0000	1.2
@@ -10,7 +10,7 @@
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/plugins/compiz.schemas.in.in b/plugins/compiz.schemas.in.in
-index 949cfe6..59c3e81 100644
+index 899622d..dddbfcd 100644
 --- a/plugins/compiz.schemas.in.in
 +++ b/plugins/compiz.schemas.in.in
 @@ -913,7 +913,7 @@
@@ -32,7 +32,7 @@
                  <short>Image files</short>
                  <long>
 diff --git a/plugins/cube.c b/plugins/cube.c
-index 6439b9e..6563cca 100644
+index 0576b8d..e9e8299 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -44,14 +44,14 @@ #include <X11/Xproto.h>

gl-include-inferiors.patch:
 include/compiz.h |    2 ++
 src/display.c    |   17 +++++++++++++++++
 2 files changed, 19 insertions(+)

Index: gl-include-inferiors.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/gl-include-inferiors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gl-include-inferiors.patch	18 Jul 2006 17:15:08 -0000	1.1
+++ gl-include-inferiors.patch	21 Jul 2006 18:59:46 -0000	1.2
@@ -10,10 +10,10 @@
  2 files changed, 19 insertions(+), 0 deletions(-)
 
 diff --git a/include/compiz.h b/include/compiz.h
-index 6188f25..42a3e98 100644
+index 920d3ce..2e21d44 100644
 --- a/include/compiz.h
 +++ b/include/compiz.h
-@@ -647,6 +647,8 @@ struct _CompDisplay {
+@@ -664,6 +664,8 @@ struct _CompDisplay {
  
      GLenum textureFilter;
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2006 17:15:08 -0000	1.2
+++ sources	21 Jul 2006 18:59:46 -0000	1.3
@@ -1 +1 @@
-4f652f76edac9e0cc7d6c0fe329de802  compiz-99c96865db7b46b881fcd44f709008043ecfcb66.tar.bz2
+16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2

tfp-server-extension.patch:
 screen.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: tfp-server-extension.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/tfp-server-extension.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tfp-server-extension.patch	18 Jul 2006 17:15:08 -0000	1.1
+++ tfp-server-extension.patch	21 Jul 2006 18:59:46 -0000	1.2
@@ -9,7 +9,7 @@
  1 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index f45663c..0a13d9b 100644
+index b9be10b..14e7083 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -897,7 +897,7 @@ addScreen (CompDisplay *display,



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:00:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:00:03 -0400
Subject: rpms/eclipse-changelog/devel .cvsignore,1.4,1.5 sources,1.9,1.10
Message-ID: <200607211900.k6LJ0382019958@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19916

Modified Files:
	.cvsignore sources 
Log Message:
Upload 2.2.0 sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jun 2006 21:48:13 -0000	1.4
+++ .cvsignore	21 Jul 2006 19:00:01 -0000	1.5
@@ -1 +1 @@
-eclipse-changelog-fetched-2.1.0.tar.gz
+eclipse-changelog-fetched-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Jun 2006 21:48:14 -0000	1.9
+++ sources	21 Jul 2006 19:00:01 -0000	1.10
@@ -1 +1 @@
-b1c2a74e300880c29d896502160432aa  eclipse-changelog-fetched-2.1.0.tar.gz
+270fbbdd75f1127e67802c74929c4446  eclipse-changelog-fetched-2.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:02:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:02:56 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.16,1.17
Message-ID: <200607211902.k6LJ2ukl020364@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20315

Modified Files:
	libnotify.spec 
Log Message:
- Update to upstream version 0.4.2
- Add dist tag to release
- Add Requires to devel package



Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libnotify.spec	19 Jul 2006 18:29:56 -0000	1.16
+++ libnotify.spec	21 Jul 2006 19:02:39 -0000	1.17
@@ -1,17 +1,22 @@
 %define gtk2_version		2.4.0
 %define glib2_version		2.2.2
+%define dbus_version		0.90
+%define dbus_glib_version	0.70
 
 Summary: libnotify notification library 
 Name: libnotify 
-Version: 0.4.0
-Release: 3.2
+Version: 0.4.2
+Release: 1%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: libtool
-BuildRequires: glib2-devel >= %{glib2_version} dbus-devel dbus-glib-devel gtk2-devel
+BuildRequires: glib2-devel >= %{glib2_version} 
+BuildRequires: dbus-devel >= %{dbus_version} 
+BuildRequires: dbus-glib-devel >= %{dbus_glib_devel}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 Requires: glib2 >= %{glib2_version}
 Requires: desktop-notification-daemon
 
@@ -25,6 +30,8 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:       glib2-devel >= %{glib2_version}
+Requires:	dbus-devel >= %{dbus_version} 
+Requires:	dbus-glib-devel >= %{dbus_glib_devel}
 
 %description devel
 
@@ -70,6 +77,11 @@
 
 
 %changelog
+* Fri Jul 21 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.2-1
+- Update to upstream version 0.4.2
+- Add dist tag to release
+- Add Requires to devel package
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0-3.2
 - reinstate desktop-notification dependency
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:04:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:04:01 -0400
Subject: rpms/libnotify/devel .cvsignore,1.6,1.7 sources,1.7,1.8
Message-ID: <200607211904.k6LJ41h2020532@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20503

Modified Files:
	.cvsignore sources 
Log Message:
- Add the 0.4.2 source



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 May 2006 20:23:41 -0000	1.6
+++ .cvsignore	21 Jul 2006 19:03:58 -0000	1.7
@@ -1,3 +1,4 @@
 libnotify-0.0.2.tar.gz
 libnotify-0.3.0.tar.gz
 libnotify-0.4.0.tar.bz2
+libnotify-0.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2006 20:23:41 -0000	1.7
+++ sources	21 Jul 2006 19:03:58 -0000	1.8
@@ -1 +1 @@
-60391383dda7035c8823af1152c23b0d  libnotify-0.4.0.tar.bz2
+154a302504cb95077698bccbbda1aeec  libnotify-0.4.2.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:09:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:09:12 -0400
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.19, 1.20 sources, 1.17,
	1.18 xorg-x11-proto-devel.spec, 1.37, 1.38
Message-ID: <200607211909.k6LJ9CpE021339@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21299/devel

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
auto-import xorg-x11-proto-devel-7.1-4.fc6 on branch devel from xorg-x11-proto-devel-7.1-4.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Jun 2006 00:34:40 -0000	1.19
+++ .cvsignore	21 Jul 2006 19:09:10 -0000	1.20
@@ -1,3 +1,30 @@
-*.tar.bz2
-*.tar.gz
-clog
+bigreqsproto-1.0.2.tar.bz2
+compositeproto-0.3.1.tar.bz2
+damageproto-1.0.3.tar.bz2
+dmxproto-2.2.2.tar.bz2
+evieext-1.0.2.tar.bz2
+fixesproto-4.0.tar.bz2
+fontcacheproto-0.1.2.tar.bz2
+fontsproto-2.0.2.tar.bz2
+glproto-1.4.7.tar.bz2
+inputproto-1.3.2.tar.bz2
+printproto-1.0.3.tar.bz2
+randrproto-1.1.2.tar.bz2
+recordproto-1.13.2.tar.bz2
+renderproto-0.9.2.tar.bz2
+resourceproto-1.0.2.tar.bz2
+scrnsaverproto-1.1.0.tar.bz2
+trapproto-3.4.3.tar.bz2
+videoproto-2.2.2.tar.bz2
+xcmiscproto-1.1.2.tar.bz2
+xextproto-7.0.2.tar.bz2
+xf86bigfontproto-1.1.2.tar.bz2
+xf86dgaproto-2.0.2.tar.bz2
+xf86driproto-2.0.3.tar.bz2
+xf86miscproto-0.9.2.tar.bz2
+xf86rushproto-1.1.2.tar.bz2
+xf86vidmodeproto-2.2.2.tar.bz2
+xineramaproto-1.1.2.tar.bz2
+xproto-7.0.7.tar.bz2
+xproxymanagementprotocol-1.0.2.tar.bz2
+kbproto-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	22 Jun 2006 00:33:35 -0000	1.17
+++ sources	21 Jul 2006 19:09:10 -0000	1.18
@@ -8,7 +8,6 @@
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 e4b1c5a323149d97f29434e5ace921c8  glproto-1.4.7.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
-3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.tar.bz2
 8e72173ad7aa8abe218e6e7fe0903842  randrproto-1.1.2.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
@@ -28,3 +27,4 @@
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 d0b9334f2cde90ad19ff94038395347d  xproto-7.0.7.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
+6092cdb0a1225f95356ddbe6c2abaad5  kbproto-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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-proto-devel.spec	13 Jul 2006 05:18:56 -0000	1.37
+++ xorg-x11-proto-devel.spec	21 Jul 2006 19:09:10 -0000	1.38
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 3.fc5.aiglx
+Release: 4%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -26,7 +26,7 @@
 Source7:  ftp://ftp.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/proto/glproto-1.4.7.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/proto/inputproto-1.3.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.2.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Source12: ftp://ftp.x.org/pub/individual/proto/printproto-1.0.3.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/proto/randrproto-1.1.2.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/proto/recordproto-1.13.2.tar.bz2
@@ -275,6 +275,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Jul 21 2006 Adam Jackson <ajackson at redhat.com> 7.1-4
+- Use dist tag.  Update to kbproto-1.0.3.
+
 * Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> 7.1-3
 - Tag as 7.1-3.fc5.aiglx.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:24:29 -0400
Subject: rpms/gdm/devel gdm-2.15.6-change-defaults.patch, NONE, 1.1 gdm.spec,
	1.183, 1.184 gdm-2.14.1-change-defaults.patch, 1.2, NONE
Message-ID: <200607211924.k6LJOTkV009272@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9161

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.15.6-change-defaults.patch 
Removed Files:
	gdm-2.14.1-change-defaults.patch 
Log Message:
- move authcookies out of home directories to prevent problems
  on nfs/afs mounted home directories (bug 178233).


gdm-2.15.6-change-defaults.patch:
 gdm.conf.in |   46 ++++++++++++++++++++++------------------------
 1 files changed, 22 insertions(+), 24 deletions(-)

--- NEW FILE gdm-2.15.6-change-defaults.patch ---
--- gdm-2.15.6/config/gdm.conf.in.change-defaults	2006-04-27 20:43:31.000000000 -0400
+++ gdm-2.15.6/config/gdm.conf.in	2006-07-21 15:20:33.000000000 -0400
@@ -59,9 +59,9 @@
 # should leave this alone.
 #Chooser=@libexecdir@/gdmchooser
 
-# The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
-# get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+# The greeter for local (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@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,16 +78,14 @@
 # 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
-# always true and this configuration setting is ignored.
-#AlwaysRestartServer=false
+# Whether to restart X server after the user logs out or not.
+AlwaysRestartServer=true
 
 # User and group used for running GDM GUI applicaitons.  By default this is set
 # to user "gdm" and group "gdm".  This user/group should have very limited
@@ -118,22 +116,21 @@
 XKeepsCrashing=@gdmconfdir@/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@
-#SuspendCommand=@SUSPEND_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
 # Probably should not touch the below this is the standard setup.
 ServAuthDir=@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=@gdmconfdir@/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 <dmconfdir>/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@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.
@@ -141,11 +138,11 @@
 # is the home directory the UserAuthFBDir will still be used in case the home
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
 # behavior.
-UserAuthDir=
+UserAuthDir=/tmp
 # Fallback directory for writing authorization file if user's home directory
 # is not writable.
 UserAuthFBDir=/tmp
-UserAuthFile=.Xauthority
+#UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
 StandardXServer=@X_SERVER@
 # The maximum number of flexible X servers to run.
@@ -288,7 +285,7 @@
 #GtkRC=@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.
@@ -309,7 +306,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
@@ -333,7 +330,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.
@@ -359,7 +356,7 @@
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@gdmlocaledir@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -406,8 +403,9 @@
 # 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
@@ -428,7 +426,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
@@ -448,7 +446,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=@datadir@/gdm/themes/
 GraphicalThemeRand=false


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- gdm.spec	21 Jul 2006 18:05:04 -0000	1.183
+++ gdm.spec	21 Jul 2006 19:24:27 -0000	1.184
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 11
+Release: 12
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -26,7 +26,7 @@
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
 
-Patch1: gdm-2.14.1-change-defaults.patch
+Patch1: gdm-2.15.6-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
 Patch3: gdm-2.8.0.2-session-errors-in-tmp.patch
 Patch4: gdm-2.13.0.4-update-switchdesk-location.patch
@@ -331,6 +331,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-12
+- move authcookies out of home directories to prevent problems
+  on nfs/afs mounted home directories (bug 178233).
+
 * Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-11
 - really fix annoying dialog problem mentioned in 2.15.6-6
 


--- gdm-2.14.1-change-defaults.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 21 19:35:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 15:35:18 -0400
Subject: rpms/libnotify/devel libnotify.spec,1.17,1.18
Message-ID: <200607211935.k6LJZHVB020379@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20367

Modified Files:
	libnotify.spec 
Log Message:
- Add developer docs to the devel section



Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libnotify.spec	21 Jul 2006 19:02:39 -0000	1.17
+++ libnotify.spec	21 Jul 2006 19:35:15 -0000	1.18
@@ -6,7 +6,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -74,9 +74,13 @@
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/pkgconfig/libnotify.pc
-
+%dir %{_datadir}/gtk-doc/html/libnotify
+%{_datadir}/gtk-doc/html/libnotify/*
 
 %changelog
+* Fri Jul 21 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.2-2
+- Add developer docs to the devel section
+
 * Fri Jul 21 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.2-1
 - Update to upstream version 0.4.2
 - Add dist tag to release



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:18:34 -0400
Subject: rpms/mockobjects/devel mockobjects-AssertMo.patch, NONE,
	1.1 mockobjects.spec, 1.10, 1.11
Message-ID: <200607212018.k6LKIYcN031595@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/mockobjects/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31185

Modified Files:
	mockobjects.spec 
Added Files:
	mockobjects-AssertMo.patch 
Log Message:
Merge with upstream version
Natively compile packages


mockobjects-AssertMo.patch:
 AssertMo.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mockobjects-AssertMo.patch ---
--- src/core/com/mockobjects/util/AssertMo.java.sav	2006-05-05 17:49:14.000000000 +0200
+++ src/core/com/mockobjects/util/AssertMo.java	2006-05-05 17:49:46.000000000 +0200
@@ -77,7 +77,7 @@
         assertTrue("Should not have verified", threwException);
     }
 
-    static protected void failNotEquals(
+    public static void failNotEquals(
         String message,
         Object expected,
         Object actual) {


Index: mockobjects.spec
===================================================================
RCS file: /cvs/dist/rpms/mockobjects/devel/mockobjects.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mockobjects.spec	12 Jul 2006 07:22:24 -0000	1.10
+++ mockobjects.spec	21 Jul 2006 20:18:32 -0000	1.11
@@ -1,21 +1,53 @@
-%define name		mockobjects
-%define version		0.09
-%define release 	12jpp_5fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 %define j2ee12  %{?_with_j2ee12:1}%{!?_without_j2ee12:0}
 %define j2ee13  %{?_with_j2ee13:1}%{!?_without_j2ee13:0}
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		mockobjects
+Version:	0.09
+Release:	14jpp_1fc
 Epoch:		0
 Summary:	Java MockObjects package
 License:	BSD Style
 URL:		http://www.mockobjects.com/
 Group:		Development/Testing
-Source0:	%{name}-%{version}-RHCLEAN.tar.bz2
+Source0:	http://www.mockobjects.com/dist/%{name}-%{version}-RHCLEAN.tar.bz2
 Patch0:		%{name}-buildjdk.patch
 Patch1:		%{name}-ext-httpmethod-abstract.patch
+Patch2:		%{name}-AssertMo.patch
 Requires:	junit
 Requires:	/usr/sbin/update-alternatives
 BuildRequires:	ant >= 1.6.1
@@ -30,9 +62,17 @@
 %if %{j2ee13}
 BuildRequires:	j2sdkee-1.3-sun
 %endif
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Mock Objects project is a generic unit testing framework whose goal
 is to facilitate developing unit tests in the mock object style. The
@@ -50,6 +90,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4
 MockObjects specific to JDK 1.4.x
 
@@ -60,6 +106,12 @@
 Requires:	/usr/sbin/update-alternatives
 Requires:	jakarta-commons-httpclient
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description httpclient
 MockObjects for Jakarta Commons HttpClient
 
@@ -71,6 +123,12 @@
 Requires:	%{name}-httpclient = %{epoch}:%{version}-%{release}
 Requires:	jakarta-commons-httpclient
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description alt-httpclient
 Alternative API for Jakarta Commons HttpClient to allow for testing
 
@@ -82,6 +140,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description alt-jdk1.4
 Alternative API for JDK 1.4 to allow for testing
 
@@ -93,6 +157,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4-j2ee1.2
 API for JDK 1.4 to allow testing with J2EE 1.2 mocks
 
@@ -104,6 +174,12 @@
 Requires:	java-devel >= 1.4
 Requires:	java-devel < 1.5
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description jdk1.4-j2ee1.3
 API for JDK 1.4 to allow testing with J2EE 1.3 mocks
 
@@ -111,8 +187,7 @@
 %setup -q -n %{name}-%{version}
 %patch0
 %patch1 -p1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+%patch2
 
 %build
 
@@ -206,14 +281,102 @@
     popd
 done
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
+%post jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post alt-httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun alt-httpclient
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post alt-jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun alt-jdk1.4
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc doc/README
 %{_javadir}/%{name}-core*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-core-0.09.jar.*
+%endif
+
 %files jdk1.4
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-%{version}.jar
@@ -225,10 +388,18 @@
 %{_javadir}-1.4.2/%{name}-%{version}.jar
 %{_javadir}-1.4.2/%{name}.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-0.09.jar.*
+%endif
+
 %files httpclient
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-httpclient*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-httpclient-0.09.jar.*
+%endif
+
 %files alt-jdk1.4
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-alt-jdk1.4/*
@@ -239,11 +410,19 @@
 %{_javadir}-1.4.2/%{name}-alt-%{version}.jar
 %{_javadir}-1.4.2/%{name}-alt.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-0.09.jar.*
+%endif
+
 %files alt-httpclient
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-alt-httpclient*
 
 %if %{j2ee12}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
+
 %files jdk1.4-j2ee1.2
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-j2ee1.2-%{version}.jar
@@ -257,6 +436,10 @@
 %endif
 
 %if %{j2ee13}
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
+
 %files jdk1.4-j2ee1.3
 %defattr(0644,root,root,0755)
 %{_javadir}-ext/%{name}-jdk1.4/%{name}-j2ee1.3-%{version}.jar
@@ -269,28 +452,24 @@
 %{_javadir}-1.4.2/%{name}-j2ee1.3.jar
 %endif
 
-%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.09-12jpp_5fc
-- rebuild
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:09-11jpp_4fc
-- rebuilt again
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0:09-11jpp_3fc
-- rebuilt
-
-* Thu Sep 08 2005 Florian La Roche <laroche at redhat.com>
-- remove empty post/postun scripts
-- remove unneeded provides
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mockobjects-alt-httpclient-0.09.jar.*
+%endif
 
-* Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0.09-11jpp_2fc
-- Remove jarfile from the tarball.
+%changelog
+* Fri Jul 21 2006 Matt Wringe <mwringe at redhat.com> 0.09-14jpp_1fc
+- Merge with upstream version
+- Natively compile packages
+
+* Fri Jul 21 2006 Matt Wringe <mwringe at redhat.com> 0.09-14jpp
+- Add conditional native compiling
+- Remove unnecessary provides and empty %pre and %post section
 
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0.09-11jpp_1fc
-- Build into Fedora.
+* Fri Apr 28 2006 Fernando Nasser <fnasser at redhat.com> 0.09-13jpp
+- First JPP 1.7 build
 
-* Fri Oct 15 2004 Fernando Nasser <fnasser at redhat.com> 0.09-11jpp_1rh
-- First Red Hat build
+* Mon Dec 13 2004 Ralph Apel <r.apel at r-apel.de> 0.09-12jpp
+- Build j2ee mockobjects
 
 * Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0.09-11jpp
 - Optionally activate j2ee mockobjects



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:23:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:23:08 -0400
Subject: rpms/xsri/devel xsri.spec,1.15,1.16
Message-ID: <200607212023.k6LKN8ne000883@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv803

Modified Files:
	xsri.spec 
Log Message:
* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1:2.1.0-10.fc6
- Added manpage for xsri (#13197)
- Use {dist} tag in release field.
- Add missing docs to doc tag.



Index: xsri.spec
===================================================================
RCS file: /cvs/dist/rpms/xsri/devel/xsri.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xsri.spec	12 Jul 2006 09:24:14 -0000	1.15
+++ xsri.spec	21 Jul 2006 20:23:06 -0000	1.16
@@ -1,14 +1,15 @@
-# Note that this is NOT a relocatable package
 Summary:   X Set Root Image
 Name:      xsri
 Version:   2.1.0
-Release: 9.2.2
+Release:   10%{?dist}
 Epoch:     1
 License:   GPL
 Group:     System Environment/Base
-Source0:   %{name}-%{PACKAGE_VERSION}.tar.gz
+Source0:   %{name}-%{version}.tar.gz
+Source1:   xsri.1
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel >= 1.3.13
 BuildRequires: popt
 
@@ -25,29 +26,37 @@
 %install
 export CFLAGS=$RPM_OPT_FLAGS
 make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc README
-%{_bindir}/*
+%doc COPYING ChangeLog README INSTALL NEWS
+%{_bindir}/xsri
+%{_mandir}/man1/xsri.1*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2.2
+* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1:2.1.0-10.fc6
+- Added manpage for xsri (#13197)
+- Use {dist} tag in release field.
+- Add missing docs to doc tag.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1:2.1.0-9.2.2
 - rebuild
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2.1
+* 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
+* 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
 
-* Thu Mar  3 2005 Mike A. Harris <mharris at redhat.com> 2.1.0-9
+* Thu Mar  3 2005 Mike A. Harris <mharris at redhat.com> 1:2.1.0-9
 - I seem to have just unknowingly won the xsri package in a game of package
   roulette.  I pledge my allegiance to make it the best eye-candy app on the
   desktop for 2005.



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:25:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:25:09 -0400
Subject: rpms/xsri/devel xsri.1,NONE,1.1
Message-ID: <200607212025.k6LKP9WI001698@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1669

Added Files:
	xsri.1 
Log Message:
add xsri.1 manpage


--- NEW FILE xsri.1 ---
.\" Process this file with
.\" groff -man -Tascii xsri.1
.\"
.TH XSRI 1 "2004-01-25" "xsri 2.1.0" 
.SH NAME
xsri \- set the root window background in X
.SH SYNOPSIS
\fBxsri\fR [\fIOPTION\fR]...
.SH DESCRIPTION
Allows the display of text, patterns, and images in the root window, so users can customize the XDM-style login screen and/or the normal X background.

The image displayed by \fBxsri\fR is composed of three layers:
.IP 1)
A background color or gradient
.IP 2)
An optional tiled image
.IP 3)
An optional \(lqemblem\(rq image


.SH OPTIONS
.SS Mode Selection Options 

.TP
\fB--set
Set the background, by the standard method used for setting a users background (_XROOTPMAP_ID, ESETROOT_PMAP_I point to the pixmap ID, pixmap ID is owned by a persistant X connection which must be killed with XKillClient). This is the default mode.

.TP
\fB--run
Maintains the background while running, but does not set it. This mode may take less memory than SET, since \fBxsri\fR can use multiple windows to display the image, and will work better on Pseudo-color displays. On exit, the background will be in an undefined state.

.TP
\fB--test
The image is displayed in a window which is half the width and height of the screen.


.SS Background Color and Gradient Options

.TP
\fB--color\fR=\fICOLOR1
Set the background color.

.TP
\fB--color2\fR=\fICOLOR2
If set, the background will be a gradient.

.TP
\fB--hgradient
Draw a horizontal gradient from \fICOLOR1\fR at the left to \fICOLOR2\fR at the right. (Default if \fB--color2\fR is given.)

.TP
\fB--vgradient
Draw a vertical gradient from \fICOLOR1\fR at the top to \fICOLOR2\fR at the bottom. (Default if \fB--color2\fR is given.)


.SS Tiled Image Options
.TP
\fB--tile\fR=\fIIMAGE
The \fIimage\fR to tile.

.TP
\fB--tile-alpha\fR={\fI0-255\fR}
The alpha value of the tile (255 == fully opaque, default)


.SS Emblem Options
.TP
\fB--emblem\fR=\fIIMAGE
Set the emblem image to \fIIMAGE\fR.

.TP
\fB--emblem-alpha\fR={\fI0-255\fR}
Set the alpha value of the emblem. The default is 255 ( == fully opaque).

.TP
\fB--emboss
Emboss the emblem on the background.

.TP
\fB--geometry\fR=[\fIWIDTH\fRx\fIHEIGHT\fR][+\fIX\fR+\fIY\fR]
Set the location or size of the emblem. Either the width and height or the location may be omitted.

.TP
\fB--center-x
Center the emblem in the X direction.

.TP
\fB--center-y
Center the emblem in the Y direction.

.TP
\fB--scale-width\fR[=\fIPERCENT\fR]
Scale the emblem horizontally to a fraction of the width of the screen. 100% is the default.

.TP
\fB--scale-height\fR[=\fIPERCENT\fR]
Scale the emblem vertically to a fraction of the height of the screen. 100% is the default.

.TP
\fB--avoid\fR=\fIWIDTH\fRx\fIHEIGHT\fR[+\fIX\fR+\fIY\fR]
Shrink the width and/or height of the emblem as necessary to avoid the given rectangle. If \fIX\fR and \fIY\fR are not specified, the rectangle is centered. (Implies \fB--keep-aspect\fR.)

.TP
\fB--keep-aspect
The width or height of the emblem will be shrunk as needed to maintain the aspect ratio.


.SH PLACEMENT AND SCALING
The placement and scaling item algorithm, specified exactly:

Set w and h to width and height of the image.

If \fB--geometry\fR=\fIW\fRx\fIH\fR was specifed, set w to \fIW\fR, h to \fIH\fR. If \fB--scale-width\fR=\fIPERCENT\fR was specified, set w to (\fIPERCENT\fR/100) * screen_width. If \fB--scale-height\fR=\fIPERCENT\fR was specified, set h to (\fIPERCENT\fR/100) * screen_height.

Define the horizontal gravity point to be at center if \fI--center-x\fR was specified; otherwise, at right if \fB--geometry\fR=-\fIX\fR was specified; otherwise at left.

Define the vertical gravity point to be at center if \fI--center-y\fR was specified; otherwise, at bottom if \fB--geometry\fR=-\fIY\fR was specified; otherwise at top.

If \fB--center-x\fR, was specified, set x to center the image on the screen; otherwise, if the position was specified via geometry, use that; otherwise set x = 0.

If \fB--center-y\fR, was specified, set y to center the image on the screen; otherwise, if the position was specified via geometry, use that; otherwise set y = 0.

If \fB--keep-aspect\fR or \fB--avoid\fR was specified, then if the aspect ratio is narrower than that of the image, shrink the height to make the aspect ratio match; if the aspect ratio is wider than that of the image, shrink the height to make the apsect ratio match, keeping the gravity point at the same location.

If \fB--avoid\fR was specified, shrink the image, keeping the aspect ratio the same and the gravity point in the same place to avoid the given rectangle. If this isn't possible, do not display the emblem.

.SH AUTHOR
Owen Taylor <otaylor at redhat.com>

.SH COPYRIGHT
Copyright \(co 2001, Red Hat, Inc.
xsri is distributed under the terms of the GNU General Public License.
See the included file \(lqCOPYING\(rq.

.SH SEE ALSO
\fBEsetroot\fR(1), \fBxsetroot\fR(1)



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:29:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:29:44 -0400
Subject: rpms/initscripts/devel .cvsignore, 1.103, 1.104 initscripts.spec,
	1.119, 1.120 sources, 1.114, 1.115
Message-ID: <200607212029.k6LKTi7V003777@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3730

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
8.37-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	21 Jul 2006 18:48:08 -0000	1.103
+++ .cvsignore	21 Jul 2006 20:29:42 -0000	1.104
@@ -1 +1 @@
-initscripts-8.36.tar.bz2
+initscripts-8.37.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- initscripts.spec	21 Jul 2006 18:48:08 -0000	1.119
+++ initscripts.spec	21 Jul 2006 20:29:42 -0000	1.120
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.36
+Version: 8.37
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -210,6 +210,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Jul 21 2006 Bill Nottingham <notting at redhat.com> 8.37-1
+- update translations
+
 * Fri Jul 21 2006 Bill Nottingham <notting at redhat.com> 8.36-1
 - rework automatic swapon - only run if AUTOSWAP=yes, and fix errors
   (#198695, #196179, #196208)
@@ -231,9 +234,6 @@
 - ifup/ifdown: don't mark as %config
 - rwtab: some additions/cleanup
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 8.35-1.1
-- rebuild
-
 * Mon Jun 12 2006 Bill Nottingham <notting at redhat.com> 8.35-1
 - readonly root enhancments (modified from <law at redhat.com>, #193164)
 - encrypted swap, non-root filesystem support (#127378, <mitr at redhat.com, <redhat at flyn.org>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sources	21 Jul 2006 18:48:08 -0000	1.114
+++ sources	21 Jul 2006 20:29:42 -0000	1.115
@@ -1 +1 @@
-34240f026fe72d774b8eeff45f207149  initscripts-8.36.tar.bz2
+1146a7833cfc5cff00cddf815f29b666  initscripts-8.37.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:34:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:34:19 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.121,1.122
Message-ID: <200607212034.k6LKYJkY004327@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4284

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-7.fc6
- Only ship pcitweak manpage if we are building it (#199653)
- Fix dist tag usage (Was {dist}, should be {?dist})



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- xorg-x11-server.spec	18 Jul 2006 19:41:37 -0000	1.121
+++ xorg-x11-server.spec	21 Jul 2006 20:34:16 -0000	1.122
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   6%{dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -558,8 +558,10 @@
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/gtf.1x*
+%if %{with_developer_utils}
 %{_mandir}/man1/pcitweak.1x*
+%endif
+%{_mandir}/man1/gtf.1x*
 %{_mandir}/man1/scanpci.1x*
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
@@ -645,13 +647,17 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 1.1.1-6.fc6
+* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-7.fc6
+- Only ship pcitweak manpage if we are building it (#199653)
+- Fix dist tag usage (Was {dist}, should be {?dist})
+
+* Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> 1.1.1-6.fc6
 - Saner defaults for hsync/vrefresh on monitors that can't be probed
 
-* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc6
+* Thu Jul 13 2006 Kristian H??gsberg <krh at redhat.com>  1.1.1-5.fc6
 - Tag as 1.1.1-5.fc6.
 
-* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-5.fc5.aiglx
+* Wed Jul 12 2006 Kristian H??gsberg <krh at redhat.com>  1.1.1-5.fc5.aiglx
 - Enable composite by default.
 - Split spiffiffity patch into one patch per change:
   xorg-x11-server-1.1.0-no-move-damage.patch and
@@ -669,17 +675,17 @@
 * Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-2.fc6
 - Remove nonsensical runtime perl dependency.
 
-* Sat Jul  8 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
+* Sat Jul 08 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-1.fc6
 - Update to 1.1.1.
 
-* Sat Jul  8 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-27%{dist}
+* Sat Jul 08 2006 Kristian H??gsberg <krh at redhat.com>  1.1.0-27.fc6
 - Enable TLS for GLX to match the mesa build config.
 
-* Fri Jul  7 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.0-26
+* Fri Jul 07 2006 Kristian H??gsberg <krh at redhat.com>  1.1.0-26
 - Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
   GLX_MESA_copy_sub_buffer extension.
 
-* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc5
+* Fri Jun 30 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-25.fc6
 - Start using the new %%{dist} tag <http://fedoraproject.org/wiki/DistTag>
   experimentally in the package Release field to help prevent problems like
   (#197266) from occuring in the future.



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:36:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:36:47 -0400
Subject: rpms/bind/devel bind-chroot-admin.in, 1.9, 1.10 bind.spec, 1.115,
	1.116
Message-ID: <200607212036.k6LKalGC005200@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5170

Modified Files:
	bind-chroot-admin.in bind.spec 
Log Message:
fix addenda to bugs 189789, 196398


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bind-chroot-admin.in	14 Jun 2006 05:26:43 -0000	1.9
+++ bind-chroot-admin.in	21 Jul 2006 20:36:45 -0000	1.10
@@ -52,10 +52,7 @@
 
 function selinux_enabled()
 {
-    [ -e /etc/selinux/config ] && . /etc/selinux/config;
-    if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then
-	return 0;
-    fi;
+    while read d mp fs rest; do if [ "$fs" = "selinuxfs" ]; then return 0; fi; done < /proc/mounts
     return 1;
 }
 


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- bind.spec	20 Jul 2006 18:40:14 -0000	1.115
+++ bind.spec	21 Jul 2006 20:36:45 -0000	1.116
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	30%{?dist}
+Release: 	32%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -844,6 +844,14 @@
 :;
 
 %changelog
+* Fri Jul 21 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-32
+- fix addenda to bug 189789: 
+  determination of selinux enabled was still not 100% correct in bind-chroot-admin
+- fix addenda to bug 196398:
+  make named.init test for NetworkManager being enabled AFTER testing for -D absence;
+  named.init now supports a 'DISABLE_NAMED_DBUS' /etc/sysconfig/named setting to disable
+  auto-enable of named dbus support if NetworkManager enabled.
+
 * Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-30
 - fix bug 196398 - Enable -D option automatically in initscript
   if NetworkManager enabled in any runlevel.



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:38:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:38:05 -0400
Subject: rpms/bsf/devel bsf.spec,1.11,1.12
Message-ID: <200607212038.k6LKc542005500@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5465

Modified Files:
	bsf.spec 
Log Message:

Removing vendor and distribution tags.




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bsf.spec	20 Jul 2006 15:43:31 -0000	1.11
+++ bsf.spec	21 Jul 2006 20:38:01 -0000	1.12
@@ -36,14 +36,12 @@
 
 Name:		bsf
 Version:	2.3.0
-Release:	10jpp_1fc
+Release:	10jpp_2fc
 Epoch:		0
 Summary:        Bean Scripting Framework
 License:        Apache License
 Url:            http://jakarta.apache.org/bsf/
 Group:          Development/Libraries/Java
-Vendor:         JPackage Project
-Distribution:	JPackage
 #http://jakarta.apache.org/builds/jakarta-%{name}/dev/v%{version}/src/%{name}-src-%{version}.tar.gz
 Source0:        %{name}-src-%{version}-RHCLEAN.tar.bz2
 Patch1:			%{name}-javac.patch
@@ -177,6 +175,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-10jpp_2fc
+- Removing vendor and distribution tags.
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-10jpp_1fc
 - Added conditional native compilation.
 - From gbenson at redhat:



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:41:49 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.122,1.123
Message-ID: <200607212041.k6LKfn44006523@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6485

Modified Files:
	xorg-x11-server.spec 
Log Message:
- Added xorg-x11-server-libxf86config-dont-write-empty-sections.patch to
  prevent config file parser/writer from writing out empty sections (#198653)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- xorg-x11-server.spec	21 Jul 2006 20:34:16 -0000	1.122
+++ xorg-x11-server.spec	21 Jul 2006 20:41:46 -0000	1.123
@@ -22,6 +22,7 @@
 Patch1:    xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.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-x11-server-libxf86config-dont-write-empty-sections.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -296,6 +297,7 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .init-origins-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
+%patch5 -p0 -b .libxf86config-dont-write-empty-sections
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -303,6 +305,7 @@
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
+%patch106 -p0 -b .libxf86config-dont-write-empty-sections
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
@@ -650,6 +653,8 @@
 * Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-7.fc6
 - Only ship pcitweak manpage if we are building it (#199653)
 - Fix dist tag usage (Was {dist}, should be {?dist})
+- Added xorg-x11-server-libxf86config-dont-write-empty-sections.patch to
+  prevent config file parser/writer from writing out empty sections (#198653)
 
 * Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> 1.1.1-6.fc6
 - Saner defaults for hsync/vrefresh on monitors that can't be probed



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:42:11 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-libxf86config-dont-write-empty-sections.patch,
	NONE, 1.1
Message-ID: <200607212042.k6LKgBit006690@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6652

Added Files:
	xorg-x11-server-libxf86config-dont-write-empty-sections.patch 
Log Message:
add xorg-x11-server-libxf86config-dont-write-empty-sections.patch

xorg-x11-server-libxf86config-dont-write-empty-sections.patch:
 write.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

--- NEW FILE xorg-x11-server-libxf86config-dont-write-empty-sections.patch ---
--- hw/xfree86/parser/write.c.orig	2006-07-12 11:15:49.000000000 -0400
+++ hw/xfree86/parser/write.c	2006-07-12 11:19:59.000000000 -0400
@@ -108,13 +108,19 @@
 
 	xf86printLayoutSection (cf, cptr->conf_layout_lst);
 
-	fprintf (cf, "Section \"Files\"\n");
-	xf86printFileSection (cf, cptr->conf_files);
-	fprintf (cf, "EndSection\n\n");
-
-	fprintf (cf, "Section \"Module\"\n");
-	xf86printModuleSection (cf, cptr->conf_modules);
-	fprintf (cf, "EndSection\n\n");
+	if (cptr->conf_files != NULL)
+	{
+		fprintf (cf, "Section \"Files\"\n");
+		xf86printFileSection (cf, cptr->conf_files);
+		fprintf (cf, "EndSection\n\n");
+	}
+
+	if (cptr->conf_modules != NULL)
+	{
+		fprintf (cf, "Section \"Module\"\n");
+		xf86printModuleSection (cf, cptr->conf_modules);
+		fprintf (cf, "EndSection\n\n");
+	}
 
 	xf86printVendorSection (cf, cptr->conf_vendor_lst);
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:43:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:43:07 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.123,1.124
Message-ID: <200607212043.k6LKh7ab007080@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7041

Modified Files:
	xorg-x11-server.spec 
Log Message:
fix spec


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- xorg-x11-server.spec	21 Jul 2006 20:41:46 -0000	1.123
+++ xorg-x11-server.spec	21 Jul 2006 20:43:04 -0000	1.124
@@ -305,7 +305,6 @@
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
-%patch106 -p0 -b .libxf86config-dont-write-empty-sections
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:47:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:47:14 -0400
Subject: rpms/bsh/devel bsh.spec,1.7,1.8
Message-ID: <200607212047.k6LKlE7v023479@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23438

Modified Files:
	bsh.spec 
Log Message:

Removing vendor and distribution tags.




Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bsh.spec	20 Jul 2006 16:45:38 -0000	1.7
+++ bsh.spec	21 Jul 2006 20:47:12 -0000	1.8
@@ -36,7 +36,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        8jpp_1fc
+Release:        8jpp_2fc
 Epoch:		0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -53,8 +53,6 @@
 Buildarch:      noarch
 %endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
-Distribution:   JPackage
-Vendor:         JPackage Project
 
 %if %{gcj_support}
 BuildRequires:		java-gcj-compat-devel
@@ -252,6 +250,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> 0:1.3.0-8jpp_2fc
+- Removing vendor and distribution tags.
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.3.0-8jpp_1fc
 - Add conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 20:51:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 16:51:45 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.124,1.125
Message-ID: <200607212051.k6LKpjAV025352@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25315

Modified Files:
	xorg-x11-server.spec 
Log Message:
Add dependency on xorg-x11-fonts-base to all X server subpackages (#186091)


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- xorg-x11-server.spec	21 Jul 2006 20:43:04 -0000	1.124
+++ xorg-x11-server.spec	21 Jul 2006 20:51:43 -0000	1.125
@@ -197,13 +197,16 @@
 %package Xnest
 Summary: A nested server.
 Group: User Interface/X
-#Requires: %{name} = %{version}-%{release}
 Obsoletes: XFree86-Xnest, xorg-x11-Xnest
 # NOTE: This virtual provide should be used by packages which want to depend
 # on an implementation nonspecific Xnest X server.  It is intentionally not
 # versioned, since it should be agnostic.
 Provides: Xnest
 
+# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
+# by xorg-x11-fonts-base
+Requires: xorg-x11-fonts-base
+
 %description Xnest
 Xnest is an X server, which has been implemented as an ordinary
 X application.  It runs in a window just like other X applications,
@@ -216,13 +219,16 @@
 %package Xdmx
 Summary: Distributed Multihead X Server and utilities
 Group: User Interface/X
-#Requires: %{name}-Xorg = %{version}-%{release}
 Obsoletes: xorg-x11-Xdmx
 # NOTE: This virtual provide should be used by packages which want to depend
 # on an implementation nonspecific Xdmx X server.  It is intentionally not
 # versioned, since it should be agnostic.
 Provides: Xdmx
 
+# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
+# by xorg-x11-fonts-base
+Requires: xorg-x11-fonts-base
+
 %description Xdmx
 Xdmx is proxy X server that provides multi-head support for multiple displays
 attached to different machines (each of which is running a typical X server).
@@ -244,6 +250,10 @@
 # versioned, since it should be agnostic.
 Provides: Xvfb
 
+# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
+# by xorg-x11-fonts-base
+Requires: xorg-x11-fonts-base
+
 %description Xvfb
 Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
 machines with no display hardware and no physical input devices.
@@ -256,12 +266,15 @@
 %package Xephyr
 Summary: A nested server.
 Group: User Interface/X
-#Requires: %{name} = %{version}-%{release}
 # NOTE: This virtual provide should be used by packages which want to depend
 # on an implementation nonspecific Xephyr X server.  It is intentionally not
 # versioned, since it should be agnostic.
 Provides: Xephyr
 
+# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
+# by xorg-x11-fonts-base
+Requires: xorg-x11-fonts-base
+
 %description Xephyr
 Xephyr is an X server, which has been implemented as an ordinary
 X application.  It runs in a window just like other X applications,
@@ -654,6 +667,7 @@
 - Fix dist tag usage (Was {dist}, should be {?dist})
 - Added xorg-x11-server-libxf86config-dont-write-empty-sections.patch to
   prevent config file parser/writer from writing out empty sections (#198653)
+- Add dependency on xorg-x11-fonts-base to all X server subpackages (#186091)
 
 * Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> 1.1.1-6.fc6
 - Saner defaults for hsync/vrefresh on monitors that can't be probed



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:06:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:06:11 -0400
Subject: rpms/bind/FC-5 bind-chroot-admin.in, 1.7, 1.8 bind.spec, 1.104,
	1.105 named.init, 1.43, 1.44 named.sysconfig, 1.3, 1.4
Message-ID: <200607212106.k6LL6Bc1029418@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29361

Modified Files:
	bind-chroot-admin.in bind.spec named.init named.sysconfig 
Log Message:
fix addenda to bugs 189789, 196398


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind-chroot-admin.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bind-chroot-admin.in	19 Jul 2006 21:05:53 -0000	1.7
+++ bind-chroot-admin.in	21 Jul 2006 21:06:09 -0000	1.8
@@ -52,10 +52,7 @@
 
 function selinux_enabled()
 {
-    [ -e /etc/selinux/config ] && . /etc/selinux/config;
-    if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then
-	return 0;
-    fi;
+    while read d mp fs rest; do if [ "$fs" = "selinuxfs" ]; then return 0; fi; done < /proc/mounts
     return 1;
 }
 


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- bind.spec	19 Jul 2006 21:05:53 -0000	1.104
+++ bind.spec	21 Jul 2006 21:06:09 -0000	1.105
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	22%{?dist}
+Release: 	24%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -676,7 +676,6 @@
 %{_libdir}/libbind.so*
 %defattr(0644,root,root,0755) 
 %{_libdir}/libbind.a
-%{_libdir}/libbind.so
 %{_libdir}/pkgconfig/libbind.pc
 %{_includedir}/bind
 %{_mandir}/man3/libbind-*
@@ -845,6 +844,14 @@
 :;
 
 %changelog
+* Fri Jul 21 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-32
+- fix addenda to bug 189789: 
+  determination of selinux enabled was still not 100% correct in bind-chroot-admin
+- fix addenda to bug 196398:
+  make named.init test for NetworkManager being enabled AFTER testing for -D absence;
+  named.init now supports a 'DISABLE_NAMED_DBUS' /etc/sysconfig/named setting to disable
+  auto-enable of named dbus support if NetworkManager enabled.
+
 * Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-30
 - fix bug 196398 - Enable -D option automatically in initscript
   if NetworkManager enabled in any runlevel.


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/named.init,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- named.init	19 Jul 2006 21:05:53 -0000	1.43
+++ named.init	21 Jul 2006 21:06:09 -0000	1.44
@@ -64,13 +64,6 @@
    fi;
 fi;
 
-NetworkManagerEnabled=0
-for l in 0 1 2 3 4 5 6; do 
-    if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
-	NetworkManagerEnabled=1; 
-    fi; 
-done
-
 dbusEnabled=0;
 for a in $OPTIONS; do
     if [ $a  = "-D" ]; then
@@ -78,9 +71,17 @@
     fi;
 done
 
-if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then
-   OPTIONS="$OPTIONS -D";
-   dbusEnabled=1;
+if [ $dbusEnabled -eq 0 ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
+    NetworkManagerEnabled=0
+    for l in 0 1 2 3 4 5 6; do 
+	if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then 
+	    NetworkManagerEnabled=1; 
+	fi; 
+    done
+    if [ $NetworkManagerEnabled -eq 1 ]; then
+	OPTIONS="$OPTIONS -D";
+    fi;
+    dbusEnabled=1;
 fi
 
 start() {


Index: named.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/named.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- named.sysconfig	17 Feb 2005 06:43:28 -0000	1.3
+++ named.sysconfig	21 Jul 2006 21:06:09 -0000	1.4
@@ -21,3 +21,9 @@
 # ENABLE_SDB=yes         --  This enables use of 'named_sdb', which has support
 #		         --  for the ldap, pgsql and dir zone database backends
 #		         --  compiled in, to be used instead of named.
+#
+# DISABLE_NAMED_DBUS=[1y]--  If NetworkManager is enabled in any runlevel, then 
+# 			     the initscript will by default enable named's D-BUS
+#			     support with the named -D option. This setting disables
+#			     this behavior.
+#



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:08:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:08:46 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.125,1.126
Message-ID: <200607212108.k6LL8k8e029775@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29754

Modified Files:
	xorg-x11-server.spec 
Log Message:
Delete pcitweak.1 if we're not packaging it


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- xorg-x11-server.spec	21 Jul 2006 20:51:43 -0000	1.125
+++ xorg-x11-server.spec	21 Jul 2006 21:08:44 -0000	1.126
@@ -412,6 +412,7 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/outl
     rm -f $RPM_BUILD_ROOT%{_bindir}/outw
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
 %endif
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1x*
     rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5x*



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:11:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:11:37 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.301, 1.302 anaconda.spec, 1.426,
	1.427 sources, 1.423, 1.424
Message-ID: <200607212111.k6LLBbHO030604@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30564/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.63-1 on branch devel from anaconda-11.1.0.63-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- .cvsignore	20 Jul 2006 22:26:28 -0000	1.301
+++ .cvsignore	21 Jul 2006 21:11:35 -0000	1.302
@@ -1 +1 @@
-anaconda-11.1.0.62.tar.bz2
+anaconda-11.1.0.63.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- anaconda.spec	20 Jul 2006 22:26:28 -0000	1.426
+++ anaconda.spec	21 Jul 2006 21:11:35 -0000	1.427
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.62
+Version: 11.1.0.63
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.63-1
+- Fix serial kickstart installs (clumens)
+- Add labels for LVM and RAID (clumens)
+- Show preexisting labels when they exist (clumens, #149375)
+- Fix traceback for no dosFilesystems (pnasrat)
+- Clean up to handle packages in $PRODUCTPATH or $PRODUCTPATH/RPMS
+- Various iscsi fixups 
+
 * Thu Jul 20 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.62-1
 - Fix drivelist sensitivity when adding devices
 - Fix text mode package selection (clumens, #186043)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- sources	20 Jul 2006 22:26:28 -0000	1.423
+++ sources	21 Jul 2006 21:11:35 -0000	1.424
@@ -1 +1 @@
-0bf0f9f1c2e7b16f28c940be00ab8b9d  anaconda-11.1.0.62.tar.bz2
+8d463708d3074bd6c2acc9e094bd1b90  anaconda-11.1.0.63.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:12:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:12:39 -0400
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.16,
	1.17 iscsi.init, 1.1, 1.2
Message-ID: <200607212112.k6LLCd0R030995@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30971

Modified Files:
	iscsi-initiator-utils.spec iscsi.init 
Log Message:
* Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com> - 6.1.1.645-1
- fix shutdown with root on iscsi



Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- iscsi-initiator-utils.spec	13 Jul 2006 21:57:49 -0000	1.16
+++ iscsi-initiator-utils.spec	21 Jul 2006 21:12:37 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.1.1.645
-Release: 0
+Release: 1
 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
 Source1: iscsi.init
 Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com> - 6.1.1.645-1
+- fix shutdown with root on iscsi
+
 * Thu Jul 13 2006 Mike Christie <mchristie at redhat.com> - 6.1.1.645
 - update to upstream 1.1.645
 - Note DB and interface changed so you must update kernel, tools and DB


Index: iscsi.init
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iscsi.init	21 Jun 2006 03:56:34 -0000	1.1
+++ iscsi.init	21 Jul 2006 21:12:37 -0000	1.2
@@ -42,10 +42,10 @@
 {
 	echo -n $"Stopping iSCSI initiator service: "
 	sync
-	TARGETS=`iscsiadm -m session | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
-	for rec in $TARGETS; do
-	    iscsiadm -m node -r $rec -u
-	done
+#	TARGETS=`iscsiadm -m session | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
+#	for rec in $TARGETS; do
+#	    iscsiadm -m node -r $rec -u
+#	done
 
 	killproc iscsid
 	echo



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:26:30 -0400
Subject: rpms/freeglut/devel freeglut.spec,1.20,1.21
Message-ID: <200607212126.k6LLQUth017700@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/freeglut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17653

Modified Files:
	freeglut.spec 
Log Message:
* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-7.fc6
- Use {?dist} tag in release field
- Update BuildRoot to comply with Fedora packaging guidelines



Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- freeglut.spec	12 Jul 2006 22:48:57 -0000	1.20
+++ freeglut.spec	21 Jul 2006 21:26:24 -0000	1.21
@@ -1,12 +1,12 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   6
+Release:   7%{?dist}
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
 Group:     System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /sbin/ldconfig
 BuildRequires: pkgconfig
@@ -86,11 +86,14 @@
 %defattr(-,root,root,-)
 %{_includedir}/GL/*.h
 %{_libdir}/libglut*.a
-#%{_libdir}/libglut*.la
 %{_libdir}/libglut.so
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-6
+* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-7.fc6
+- Use {?dist} tag in release field
+- Update BuildRoot to comply with Fedora packaging guidelines
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 2.4.0-6
 - rebuild
 - Try to build w/out glib
 
@@ -122,12 +125,12 @@
   - freeglut-2.2.0-gcc4-fix-invalid-lvalue-in-assignment-cvsps-392-393.patch
 - Use "-p /sbin/ldconfig" in post/postun scripts instead of a separate script.
 
-* Sat Mar  5 2005 Mike A. Harris <mharris at redhat.com> 2.2.0-16
+* Sat Mar 05 2005 Mike A. Harris <mharris at redhat.com> 2.2.0-16
 - Added freeglut-2.2.0-gcc4-fix-invalid-lvalue-in-assignment-cvsps-392-393.patch
   to fix "invalid lvalue in assignment" bugs reported by gcc 4
 - Added "-Wall" to CFLAGS in specfile.
 
-* Thu Mar  3 2005 Mike A. Harris <mharris at redhat.com> 2.2.0-15
+* Thu Mar 03 2005 Mike A. Harris <mharris at redhat.com> 2.2.0-15
 - Rebuild with gcc 4 for FC4 development
 
 * Sat Aug 14 2004 Mike A. Harris <mharris at redhat.com> 2.2.0-14
@@ -144,10 +147,10 @@
   "Obsoletes: glut-devel" to be "Obsoletes: glut-devel <= 3.7" as per
   suggestion from Matthias Saou in comment #14 of bug (#107228)
 
-* Sun Mar  7 2004 Mike A. Harris <mharris at redhat.com>
+* Sun Mar 07 2004 Mike A. Harris <mharris at redhat.com>
 - Made "glut-devel" virtual provides be "glut-devel = 3.7"
 
-* Sun Mar  7 2004 Mike A. Harris <mharris at redhat.com> 2.2.0-10
+* Sun Mar 07 2004 Mike A. Harris <mharris at redhat.com> 2.2.0-10
 - Initial Red Hat packaging created by taking the ATrpms src.rpm package from
   http://tinyurl.com/2goog as suggested in bugzilla bug (#107228)
 - Bumped the Release field to "10" so our package is newer when people
@@ -173,11 +176,11 @@
 * Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
 - rebuilt
 
-* Tue Jun  3 2003 Mike A. Harris <mharris at www.linux.org.uk> 1.3-0.20020125.3
+* Tue Jun 03 2003 Mike A. Harris <mharris at www.linux.org.uk> 1.3-0.20020125.3
 - Add BuildRequires on /sbin/ldconfig
 - Change ldconfig call to explicit /sbin/ldconfig
 
-* Sun Jun  1 2003 Mike A. Harris <mharris at www.linux.org.uk> 1.3-0.20020125.2
+* Sun Jun 01 2003 Mike A. Harris <mharris at www.linux.org.uk> 1.3-0.20020125.2
 - Oddly, when I build this on my workstation, it only builds static libs, but
   when I build it in the buildsystem it builds shared and static libs.  Must
   be a twilight zone thing going on.  Add shared libs to file lists.



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:27:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:27:03 -0400
Subject: rpms/bind/FC-5 bind.spec,1.105,1.106
Message-ID: <200607212127.k6LLR3pt017941@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17904

Modified Files:
	bind.spec 
Log Message:
fix addenda to bugs 189789, 196398


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- bind.spec	21 Jul 2006 21:06:09 -0000	1.105
+++ bind.spec	21 Jul 2006 21:27:00 -0000	1.106
@@ -855,7 +855,6 @@
 * Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-30
 - fix bug 196398 - Enable -D option automatically in initscript
   if NetworkManager enabled in any runlevel.
-- fix bug 
 - fix bugs 191093, 189789
 - fix bug 196962 (fixed by backported 9.3.3b1 fixes to lib/isc/unix/ifiter_ioctl.c)
 - backport selected fixes from upstream bind9 'v9_3_3b1' CVS version:



From fedora-cvs-commits at redhat.com  Fri Jul 21 21:59:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 17:59:11 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.133,1.134
Message-ID: <200607212159.k6LLxBlv008776@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8657

Modified Files:
	redhat-artwork.spec 
Log Message:
- remove gtk+ 1.0 dependencies



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- redhat-artwork.spec	12 Jul 2006 07:58:21 -0000	1.133
+++ redhat-artwork.spec	21 Jul 2006 21:59:08 -0000	1.134
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.243
-Release: 2.1
+Release: 3 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -14,6 +14,7 @@
 Patch2: redhat-artwork-0.122-padding-fix.patch
 patch3: redhat-artwork-0.124-throbbers.patch
 Patch4: redhat-artwork-0.129-remove-throbber.patch
+Patch5: redhat-artwork-0.243-remove-gtk1.patch 
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-root
@@ -26,8 +27,6 @@
 # we don't want to require gtk/qt
 Autoreq: 0
 
-BuildRequires: gtk+-devel >= 1.2.9
-BuildRequires: gdk-pixbuf-devel
 BuildRequires: gtk2-devel >= 2.9.0
 #BuildRequires: qt-devel >= 1:3.3.4-10
 BuildRequires: kdebase-devel >= 3.2.0
@@ -37,6 +36,7 @@
 BuildRequires: perl-XML-Parser
 # for translations to work
 BuildRequires: gettext
+BuildRequires: autoconf
 # for splash screens, and a logo in gdm theme
 Requires: redhat-logos >= 1.1.22
 Prereq: gtk2 >= 2.9.0
@@ -54,10 +54,11 @@
 %patch0 -p1 -b .clearlooks
 %patch2 -p1 -b .padding-fix
 %patch4 -p1 -b .remove-throbber
-
+%patch5 -p1 -b .remove-gtk1
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 
+autoreconf
 %build
 
 ## this is apparently how Qt finds itself.
@@ -175,6 +176,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Fri Jul 21 2006 John (J5) Palmieri <johnp at redhat.com> - 0.243-3
+- Remove gtk1.0 dependencies 
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.243-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:00:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:00:10 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.134,1.135
Message-ID: <200607212200.k6LM0AMp009187@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9099

Modified Files:
	redhat-artwork.spec 
Log Message:
* add dist tag



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- redhat-artwork.spec	21 Jul 2006 21:59:08 -0000	1.134
+++ redhat-artwork.spec	21 Jul 2006 22:00:08 -0000	1.135
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.243
-Release: 3 
+Release: 3%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:07:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:07:34 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork-0.243-remove-gtk1.patch,
	NONE, 1.1
Message-ID: <200607212207.k6LM7YWn010939@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10905

Added Files:
	redhat-artwork-0.243-remove-gtk1.patch 
Log Message:
- add patch


redhat-artwork-0.243-remove-gtk1.patch:
 Makefile.am  |    2 +-
 configure.in |    7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE redhat-artwork-0.243-remove-gtk1.patch ---
--- redhat-artwork-0.243/Makefile.am.remove-gtk1	2006-07-21 17:50:31.000000000 -0400
+++ redhat-artwork-0.243/Makefile.am	2006-07-21 17:50:54.000000000 -0400
@@ -1,5 +1,5 @@
 
 SUBDIRS=art po
 
-EXTRA_DIST=gtkrc1-skel gtkrc2-default COPYING theme.ogg easter.c \
+EXTRA_DIST=gtkrc2-default COPYING theme.ogg easter.c \
 	intltool-extract.in intltool-merge.in intltool-update.in
--- redhat-artwork-0.243/configure.in.remove-gtk1	2006-07-21 17:51:17.000000000 -0400
+++ redhat-artwork-0.243/configure.in	2006-07-21 17:51:53.000000000 -0400
@@ -44,13 +44,6 @@
 #AC_SUBST(DESKTOP_FILE_UTILS_CFLAGS)
 #AC_SUBST(DESKTOP_FILE_UTILS_LIBS)
 
-AM_PATH_GTK(1.2.9, , 
-	AC_MSG_ERROR([*** GTK+-1.2.9 not installed - please install first ***]))
-AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,
-	     AC_MSG_ERROR([*** gtk_style_set_prop_experimental() not found; perhaps you have an old CVS version of GTK+ ***]),
-             $GTK_LIBS)
-AM_PATH_GDK_PIXBUF
-	
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
 	          AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:15:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:15:54 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.135,1.136
Message-ID: <200607212215.k6LMFsVU012527@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12459

Modified Files:
	redhat-artwork.spec 
Log Message:
- add BR on automake



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- redhat-artwork.spec	21 Jul 2006 22:00:08 -0000	1.135
+++ redhat-artwork.spec	21 Jul 2006 22:15:41 -0000	1.136
@@ -37,6 +37,7 @@
 # for translations to work
 BuildRequires: gettext
 BuildRequires: autoconf
+BuildRequires: automake
 # for splash screens, and a logo in gdm theme
 Requires: redhat-logos >= 1.1.22
 Prereq: gtk2 >= 2.9.0



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:26:51 -0400
Subject: rpms/log4j/devel .cvsignore, 1.4, 1.5 log4j-javadoc-xlink.patch, 1.1,
	1.2 log4j-logfactor5-userdir.patch, 1.1, 1.2 log4j.spec, 1.17,
	1.18 sources, 1.3, 1.4
Message-ID: <200607212226.k6LMQpEK031327@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30844

Modified Files:
	.cvsignore log4j-javadoc-xlink.patch 
	log4j-logfactor5-userdir.patch log4j.spec sources 
Log Message:
- Merge spec and patches with latest from JPP.
- Clean source tar ball off prebuilt jars and classes.
- Use classpathx-jaf and jms for buildrequires for the time being.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 09:35:37 -0000	1.4
+++ .cvsignore	21 Jul 2006 22:26:48 -0000	1.5
@@ -1,4 +1 @@
-jakarta-log4j-1.2.8-RHCLEAN.tar.bz2
-jakarta-log4j-1.2.8
-noarch
-*.src.rpm
+logging-log4j-1.2.13-RHCLEAN.tar.gz

log4j-javadoc-xlink.patch:
 build.xml |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

Index: log4j-javadoc-xlink.patch
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j-javadoc-xlink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j-javadoc-xlink.patch	9 Sep 2004 07:59:04 -0000	1.1
+++ log4j-javadoc-xlink.patch	21 Jul 2006 22:26:48 -0000	1.2
@@ -1,14 +1,12 @@
---- build.xml~	2003-02-20 03:07:31.000000000 +0200
-+++ build.xml	2003-08-31 03:41:21.000000000 +0300
-@@ -383,8 +383,11 @@
-            header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
- 	   bottom="Copyright 2000-2002 Apache Software Foundation.">
- 
-+      <link href="/usr/share/javadoc/xml-commons-apis"/>
-+      <!--
-       <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
-       <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
-+      -->
-       <classpath refid="compile.classpath"/>
-     </javadoc>
-   </target>
+--- build.xml.sav	2006-04-03 19:34:39.000000000 +0200
++++ build.xml	2006-04-03 19:35:22.000000000 +0200
+@@ -434,8 +434,7 @@
+              header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
+              bottom="Copyright 2000-2005 Apache Software Foundation.">
+ 
+-      <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+-      <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
++      <link href="${jdk.javadoc}"/>
+       <classpath refid="compile.classpath"/>
+     </javadoc>
+ 

log4j-logfactor5-userdir.patch:
 ConfigurationManager.java |    2 +-
 MRUFileManager.java       |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: log4j-logfactor5-userdir.patch
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j-logfactor5-userdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j-logfactor5-userdir.patch	9 Sep 2004 07:59:04 -0000	1.1
+++ log4j-logfactor5-userdir.patch	21 Jul 2006 22:26:48 -0000	1.2
@@ -1,53 +1,46 @@
-diff -Naru jakarta-log4j-1.2.8.orig/docs/lf5/configuration.html jakarta-log4j-1.2.8/docs/lf5/configuration.html
---- jakarta-log4j-1.2.8.orig/docs/lf5/configuration.html	2003-02-20 03:07:31.000000000 +0200
-+++ jakarta-log4j-1.2.8/docs/lf5/configuration.html	2003-08-31 03:22:21.000000000 +0300
-@@ -120,7 +120,7 @@
- 	Configure-&gt;Save menu option saves your current GUI
- 	configuration to a file called
- 	<b>lf5_configuration.xml</b>. This configuration file is a
--	saved to the location &lt;USER_HOME&gt;/lf5 on your local
-+	saved to the location &lt;USER_HOME&gt;/.logfactor5 on your local
- 	drive.
-       </p>
-                                                 <p>The information saved in the configuration file is as
-diff -Naru jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
---- jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2003-02-20 03:07:41.000000000 +0200
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2003-08-31 03:21:27.000000000 +0300
-@@ -332,7 +332,7 @@
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
- 
--    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
-+    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
-   }
- 
-   //--------------------------------------------------------------------------
-diff -Naru jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java
---- jakarta-log4j-1.2.8.orig/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2003-02-20 03:07:38.000000000 +0200
-+++ jakarta-log4j-1.2.8/src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2003-08-31 03:22:23.000000000 +0300
-@@ -158,14 +158,14 @@
- 
-   /**
-    * Creates the directory where the MRU file list will be written.
--   * The "lf5" directory is created in the Documents and Settings
-+   * The ".logfactor5" directory is created in the Documents and Settings
-    * directory on Windows 2000 machines and where ever the user.home
-    * variable points on all other platforms.
-    */
-   public static void createConfigurationDirectory() {
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
--    File f = new File(home + sep + "lf5");
-+    File f = new File(home + sep + ".logfactor5");
-     if (!f.exists()) {
-       try {
-         f.mkdir();
-@@ -251,7 +251,7 @@
-     String home = System.getProperty("user.home");
-     String sep = System.getProperty("file.separator");
- 
--    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
-+    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
-   }
- 
-   /**
+--- src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java.sav	2006-04-03 19:30:42.000000000 +0200
++++ src/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java	2006-04-03 19:31:35.000000000 +0200
+@@ -340,7 +340,7 @@
+     String home = System.getProperty("user.home");
+     String sep = System.getProperty("file.separator");
+ 
+-    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
++    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
+   }
+ 
+   //--------------------------------------------------------------------------
+--- src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java.sav	2006-04-03 19:32:18.000000000 +0200
++++ src/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java	2006-04-03 19:32:40.000000000 +0200
+@@ -166,14 +166,14 @@
+ 
+   /**
+    * Creates the directory where the MRU file list will be written.
+-   * The "lf5" directory is created in the Documents and Settings
++   * The ".logfactor5" directory is created in the Documents and Settings
+    * directory on Windows 2000 machines and where ever the user.home
+    * variable points on all other platforms.
+    */
+   public static void createConfigurationDirectory() {
+     String home = System.getProperty("user.home");
+     String sep = System.getProperty("file.separator");
+-    File f = new File(home + sep + "lf5");
++    File f = new File(home + sep + ".logfactor5");
+     if (!f.exists()) {
+       try {
+         f.mkdir();
+@@ -259,7 +259,7 @@
+     String home = System.getProperty("user.home");
+     String sep = System.getProperty("file.separator");
+ 
+-    return home + sep + "lf5" + sep + CONFIG_FILE_NAME;
++    return home + sep + ".logfactor5" + sep + CONFIG_FILE_NAME;
+   }
+ 
+   /**
+@@ -281,4 +281,4 @@
+   //--------------------------------------------------------------------------
+   //   Nested Top-Level Classes or Interfaces
+   //--------------------------------------------------------------------------
+-}
+\ No newline at end of file
++}


Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- log4j.spec	12 Jul 2006 07:14:27 -0000	1.17
+++ log4j.spec	21 Jul 2006 22:26:48 -0000	1.18
@@ -1,13 +1,48 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section	free
 
 Name:           log4j
-Version:        1.2.8
-Release: 	7jpp_9fc
+Version:        1.2.13
+Release:        2jpp_1fc
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
-URL:            http://jakarta.apache.org/log4j/
-Source0:        jakarta-log4j-1.2.8-RHCLEAN.tar.bz2
+URL:            http://logging.apache.org/log4j/
+#Source0:        http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.tar.gz
+Source0:        logging-log4j-1.2.13-RHCLEAN.tar.gz
 # Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif
 Source1:        %{name}-logfactor5.png
 Source2:        %{name}-logfactor5.sh
@@ -20,14 +55,34 @@
 Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
 Patch2:         %{name}-bz157585.patch
-BuildRequires:  ant, jaf >= 0:1.0.1-5jpp, javamail >= 0:1.2-5jpp
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant
+#Use classpathx-jaf for now
+#BuildRequires:  geronimo-jaf-1.0.2-api
+BuildRequires:  classpathx-jaf
+BuildRequires:  classpathx-mail
+# Use JMS for now
+#BuildRequires:  geronimo-jms-1.1-api
 BuildRequires:  jms
-BuildRequires:  jndi, jpackage-utils >= 0:1.5, xml-commons-apis-javadoc
-Requires:       jpackage-utils >= 0:1.5, xml-commons-apis, jaxp_parser_impl
+BuildRequires:  mx4j
+BuildRequires:  jndi
+BuildRequires:  java-javadoc
+BuildRequires:  %{__perl}
+Requires:       jpackage-utils >= 0:1.6
+Requires:       xml-commons-apis
+Requires:       jaxp_parser_impl
 Group:          System/Logging
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Log4j is a tool to help the programmer output log statements to a
 variety of output targets.
@@ -42,66 +97,89 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          System/Logging
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
 
 
 %prep
-%setup -q -n jakarta-%{name}-%{version}
-%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
+%setup -q -n logging-%{name}-%{version}
+%patch0 -b .sav
+%patch1 -b .sav
+#%patch2 -p1
+
+%{__perl} -pi -e 's/\r//g' LICENSE.txt
+
+# remove all the stuff we'll build ourselves
+find . \( -name "*.jar" -o -name "*.class" \) -exec %__rm -f {} \;
+%__rm -rf docs/api
 
 
 %build
-export CLASSPATH=%(build-classpath jaf javamail/mailapi jms)
-ant jar javadoc
+#export CLASSPATH=$(build-classpath jaf javamail/mailapi jms mx4j/mx4j)
+# javac.source=1.1 doesn't work with Sun's 1.4.2_09/1.5.0_05
+%ant \
+	-Djavamail.jar=$(build-classpath javamail/mailapi) \
+	-Dactivation.jar=$(build-classpath jaf) \
+	-Djaxp.jaxp.jar.jar=$(build-classpath jaxp_parser_impl) \
+	-Djms.jar=$(build-classpath jms) \
+	-Djmx.jar=$(build-classpath mx4j/mx4j) \
+	-Djmx-extra.jar=$(build-classpath mx4j/mx4j-tools) \
+	-Djndi.jar=$(build-classpath jndi) \
+	-Djavac.source=1.2 \
+	-Djdk.javadoc=%{_javadocdir}/java \
+	jar javadoc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 dist/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+%__mkdir_p %{buildroot}%{_javadir}
+%__cp -a dist/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf docs/api
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
+%__rm -rf docs/api
+ln -s %{_javadocdir}/log4j docs/api
 
 # scripts
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/logfactor5
-install -p -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/chainsaw
+%__mkdir_p %{buildroot}%{_bindir}
+%__install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5
+%__install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw
 
 # freedesktop.org menu entries and icons
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
-install -p -m 644 %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/logfactor5.png
-install -p -m 644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/applications/jpackage-logfactor5.desktop
-install -p -m 644 %{SOURCE4} \
-  $RPM_BUILD_ROOT%{_datadir}/pixmaps/chainsaw.png
-install -p -m 644 %{SOURCE6} \
-  $RPM_BUILD_ROOT%{_datadir}/applications/jpackage-chainsaw.desktop
+%__mkdir_p %{buildroot}%{_datadir}/{applications,pixmaps}
+%__cp -a %{SOURCE1} \
+  %{buildroot}%{_datadir}/pixmaps/logfactor5.png
+%__cp -a %{SOURCE3} \
+  %{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop
+%__cp -a %{SOURCE4} \
+  %{buildroot}%{_datadir}/pixmaps/chainsaw.png
+%__cp -a %{SOURCE6} \
+  %{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop
 
 # DTD and the SGML catalog (XML catalog handled in scriptlets)
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-install -p -m 644 src/java/org/apache/log4j/xml/log4j.dtd \
-  $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-install -p -m 644 %{SOURCE7} \
-  $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/catalog
+%__mkdir_p %{buildroot}%{_datadir}/sgml/%{name}
+%__cp -a src/java/org/apache/log4j/xml/log4j.dtd \
+  %{buildroot}%{_datadir}/sgml/%{name}
+%__cp -a %{SOURCE7} \
+  %{buildroot}%{_datadir}/sgml/%{name}/catalog
+
+# fix perl location
+%__perl -p -i -e 's|/opt/perl5/bin/perl|%{__perl}|' \
+contribs/KitchingSimon/udpserver.pl
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf %{buildroot}
 
 
 %post
@@ -117,6 +195,13 @@
     > /dev/null || :
 fi
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %preun
 if [ $1 -eq 0 ]; then
   if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
@@ -125,6 +210,13 @@
   fi
 fi
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %postun
 # Note that we're using versioned catalog, so this is always ok.
 if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
@@ -133,35 +225,53 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+%__rm -f %{_javadocdir}/%{name}
+%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ $1 -eq 0 ]; then
-  rm -f %{_javadocdir}/%{name}
+  %__rm -f %{_javadocdir}/%{name}
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc INSTALL LICENSE.txt
+%doc LICENSE.txt
 %{_bindir}/*
 %{_javadir}/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/sgml/%{name}
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/log4j-1.2.13.jar.*
+%endif
+
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/* contribs
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%dir %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}/*
+%ghost %dir %{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-2jpp_1fc
+- Merge spec and patches with latest from JPP.
+- Clean source tar ball off prebuilt jars and classes.
+- Use classpathx-jaf and jms for buildrequires for the time being.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.8-7jpp_9fc
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jun 2005 09:35:37 -0000	1.3
+++ sources	21 Jul 2006 22:26:48 -0000	1.4
@@ -1 +1 @@
-e4dc1b4bbac931e9da296463622b17d6  jakarta-log4j-1.2.8-RHCLEAN.tar.bz2
+0bd096035bc7ccbb9a055eef8b0755ab  logging-log4j-1.2.13-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:36:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:36:18 -0400
Subject: rpms/pam/devel pam-0.99.5.0-keyinit-no-debug.patch, NONE,
	1.1 pam.spec, 1.126, 1.127
Message-ID: <200607212236.k6LMaImZ010986@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10972

Modified Files:
	pam.spec 
Added Files:
	pam-0.99.5.0-keyinit-no-debug.patch 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5
- don't log pam_keyinit debug messages by default (#199783)


pam-0.99.5.0-keyinit-no-debug.patch:
 pam_keyinit.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam-0.99.5.0-keyinit-no-debug.patch ---
--- Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c.no-debug	2006-06-28 09:22:43.000000000 +0200
+++ Linux-PAM-0.99.5.0/modules/pam_keyinit/pam_keyinit.c	2006-07-22 00:35:04.000000000 +0200
@@ -32,7 +32,7 @@
 
 static int my_session_keyring;
 static int do_revoke;
-static int xdebug = 1;
+static int xdebug = 0;
 
 static void debug(pam_handle_t *pamh, const char *fmt, ...)
 	__attribute__((format(printf, 2, 3)));


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- pam.spec	21 Jul 2006 14:26:46 -0000	1.126
+++ pam.spec	21 Jul 2006 22:36:15 -0000	1.127
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 0.99.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -36,6 +36,7 @@
 Patch84: pam-0.99.5.0-access-gai.patch
 Patch85: pam-0.99.5.0-selinux-enoent.patch
 Patch86: pam-0.99.5.0-console-no-ainit.patch
+Patch87: pam-0.99.5.0-keyinit-no-debug.patch
 Patch90: pam-0.99.5.0-namespace-init.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -100,6 +101,7 @@
 %patch84 -p0 -b .gai
 %patch85 -p1 -b .enoent
 %patch86 -p1 -b .no-ainit
+%patch87 -p1 -b .no-debug
 %patch90 -p1 -b .namespace-init
 
 for readme in modules/pam_*/README ; do
@@ -367,6 +369,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-5
+- don't log pam_keyinit debug messages by default (#199783)
+
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> 0.99.5.0-4
 - drop ainit from console.handlers (#199561)
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:36:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:36:56 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.136,1.137
Message-ID: <200607212236.k6LMau6U011043@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10998

Modified Files:
	redhat-artwork.spec 
Log Message:
- Add BR for libtool and intltool



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- redhat-artwork.spec	21 Jul 2006 22:15:41 -0000	1.136
+++ redhat-artwork.spec	21 Jul 2006 22:36:53 -0000	1.137
@@ -38,6 +38,8 @@
 BuildRequires: gettext
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: intltool
 # for splash screens, and a logo in gdm theme
 Requires: redhat-logos >= 1.1.22
 Prereq: gtk2 >= 2.9.0



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:40:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:40:36 -0400
Subject: rpms/authconfig/devel .cvsignore, 1.48, 1.49 authconfig.spec, 1.63,
	1.64 sources, 1.55, 1.56
Message-ID: <200607212240.k6LMeaBg011158@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11143

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.3-1
- don't start sceventd when smartcard login is enabled
- improve pam config for smartcard login



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	18 Jul 2006 15:30:21 -0000	1.48
+++ .cvsignore	21 Jul 2006 22:40:33 -0000	1.49
@@ -1 +1 @@
-authconfig-5.3.2.tar.bz2
+authconfig-5.3.3.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- authconfig.spec	18 Jul 2006 15:30:21 -0000	1.63
+++ authconfig.spec	21 Jul 2006 22:40:33 -0000	1.64
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.2
+Version: 5.3.3
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -95,6 +95,10 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.3-1
+- don't start sceventd when smartcard login is enabled
+- improve pam config for smartcard login
+
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.2-1
 - don't require pam_pkcs11 to run
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	18 Jul 2006 15:30:21 -0000	1.55
+++ sources	21 Jul 2006 22:40:33 -0000	1.56
@@ -1 +1 @@
-f47012e4163cdf35503db28a35e3c999  authconfig-5.3.2.tar.bz2
+13b63e9d3ee8c345de9f4ac65ee08768  authconfig-5.3.3.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:44:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:44:44 -0400
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.12,
	1.13
Message-ID: <200607212244.k6LMihGV011229@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xml-commons-resolver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11217

Modified Files:
	xml-commons-resolver.spec 
Log Message:

Added conditional native compilation.




Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xml-commons-resolver.spec	12 Jul 2006 08:54:30 -0000	1.12
+++ xml-commons-resolver.spec	21 Jul 2006 22:44:34 -0000	1.13
@@ -1,11 +1,13 @@
-%define name		xml-commons-resolver
-%define version         1.1
-%define release 	1jpp_9fc
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           xml-commons-resolver
+Version:        1.1
+Release: 	    1jpp_10fc
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        Apache Software License
@@ -21,9 +23,17 @@
 #BuildRequires:  %{_bindir}/xsltproc
 #BuildRequires:  docbook-style-xsl
 Group:          Text Processing/Markup/XML
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Resolver subproject of xml-commons.
 
@@ -76,6 +86,10 @@
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,17 +102,40 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc KEYS LICENSE.resolver.txt
 %{_javadir}/*
 %attr(0755,root,root) %{_bindir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_10fc
+- Added conditional native compilation.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-1jpp_9fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 21 22:59:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 18:59:18 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.37,1.38
Message-ID: <200607212259.k6LMxIbM026308@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26291

Modified Files:
	gjdoc.spec 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-6
- Bump release number.




Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gjdoc.spec	21 Jul 2006 06:45:30 -0000	1.37
+++ gjdoc.spec	21 Jul 2006 22:59:16 -0000	1.38
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 5
+Release: 6
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -53,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-6
+- Bump release number.
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-5
 - Bump release number.
 - Rebuild for libgcj.so.7rh.



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:08:51 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.6, 1.7 setroubleshoot.spec,
	1.9, 1.10 sources, 1.8, 1.9
Message-ID: <200607212308.k6LN8khF026560@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26533/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.11-1 on branch devel from setroubleshoot-0.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Jul 2006 13:42:14 -0000	1.6
+++ .cvsignore	21 Jul 2006 23:08:43 -0000	1.7
@@ -1 +1 @@
-setroubleshoot-0.10.tar.gz
+setroubleshoot-0.11.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- setroubleshoot.spec	21 Jul 2006 13:42:14 -0000	1.9
+++ setroubleshoot.spec	21 Jul 2006 23:08:43 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.10
+Version: 0.11
 Release: 1
 License: GPL
 Group: Applications/System
@@ -27,6 +27,9 @@
 Requires: audit-libs-python
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
+Requires: notifiy-python
+
+BuildRequires: intltool gettext python
 
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Jul 2006 13:42:14 -0000	1.8
+++ sources	21 Jul 2006 23:08:43 -0000	1.9
@@ -1 +1 @@
-2c9705455a789208a51cbe1e3ef67fb3  setroubleshoot-0.10.tar.gz
+14ab150fb68bb6172c6472b60710199c  setroubleshoot-0.11.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:10:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:10:05 -0400
Subject: rpms/antlr/devel antlr.spec,1.20,1.21
Message-ID: <200607212310.k6LNA5bS026703@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26684

Modified Files:
	antlr.spec 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_3fc
- Bump release number.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- antlr.spec	20 Jul 2006 16:13:57 -0000	1.20
+++ antlr.spec	21 Jul 2006 23:10:02 -0000	1.21
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        3jpp_2fc
+Release:        3jpp_3fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -279,6 +279,9 @@
 
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_3fc
+- Bump release number.
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_2fc
 - From gbenson at redhat:
 -   Omit the jedit subpackage to fix dependencies. 



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:21:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:21:04 -0400
Subject: rpms/antlr/devel antlr.spec,1.21,1.22
Message-ID: <200607212321.k6LNL4sV022419@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22336

Modified Files:
	antlr.spec 
Log Message:
- Require hack-libgcj for build.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- antlr.spec	21 Jul 2006 23:10:02 -0000	1.21
+++ antlr.spec	21 Jul 2006 23:21:01 -0000	1.22
@@ -61,6 +61,7 @@
 %endif
 BuildRequires:  ant
 BuildRequires:  %{__perl}, java-javadoc
+BuildRequires:  hack-libgcj
 Requires:       jpackage-utils
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -280,6 +281,7 @@
 
 %changelog
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_3fc
+- Require hack-libgcj for build.
 - Bump release number.
 
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_2fc



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:28:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:28:29 -0400
Subject: rpms/antlr/devel antlr.spec,1.22,1.23
Message-ID: <200607212328.k6LNSTpm025206@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25094

Modified Files:
	antlr.spec 
Log Message:
Stub docs. (dist-fc6-java)




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- antlr.spec	21 Jul 2006 23:21:01 -0000	1.22
+++ antlr.spec	21 Jul 2006 23:28:27 -0000	1.23
@@ -169,7 +169,8 @@
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+#cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/stub
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # jedit mode
@@ -281,7 +282,8 @@
 
 %changelog
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_3fc
-- Require hack-libgcj for build.
+- Stub docs. (dist-fc6-java)
+- Require hack-libgcj for build. (dist-fc6-java)
 - Bump release number.
 
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.om> = 0:2.7.6-3jpp_2fc



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:41:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:41:56 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.38,1.39
Message-ID: <200607212341.k6LNfuGE028552@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28450

Modified Files:
	gjdoc.spec 
Log Message:
- Require hack-libgcj for build. (dist-fc6-java)




Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gjdoc.spec	21 Jul 2006 22:59:16 -0000	1.38
+++ gjdoc.spec	21 Jul 2006 23:41:54 -0000	1.39
@@ -14,6 +14,7 @@
 BuildPrereq: gcc-java >= 4.0.0-8
 BuildPrereq: antlr
 Requires: libgcj >= 4.0.0-8
+BuildRequires:  hack-libgcj
 
 %description
 A documentation generation system for "javadoc"-style comments.
@@ -54,6 +55,7 @@
 
 %changelog
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-6
+- Require hack-libgcj for build. (dist-fc6-java)
 - Bump release number.
 
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-5



From fedora-cvs-commits at redhat.com  Fri Jul 21 23:54:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 19:54:24 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.157,
	1.158
Message-ID: <200607212354.k6LNsOtH015559@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-serv15466

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
- Require hack-libgcj for build. (dist-fc6-java)




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.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- java-1.4.2-gcj-compat.spec	21 Jul 2006 10:27:43 -0000	1.157
+++ java-1.4.2-gcj-compat.spec	21 Jul 2006 23:54:21 -0000	1.158
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_94rh
+%define release 	40jpp_95rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -46,6 +46,7 @@
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
 BuildRequires:	eclipse-ecj
+BuildRequires:  hack-libgcj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	zip
@@ -622,6 +623,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
+- Require hack-libgcj for build. (dist-fc6-java)
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_94rh
 - Add plugin subpackage.
 - Install libjawt.so and libjvm.so symlinks.



From fedora-cvs-commits at redhat.com  Sat Jul 22 01:13:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 21:13:29 -0400
Subject: rpms/perl/devel perl-5.8.8-bz199736.patch, NONE, 1.1 perl.spec, 1.97,
	1.98
Message-ID: <200607220113.k6M1DTDb002913@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2887

Modified Files:
	perl.spec 
Added Files:
	perl-5.8.8-bz199736.patch 
Log Message:
fix bug 199736

perl-5.8.8-bz199736.patch:
 C.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE perl-5.8.8-bz199736.patch ---
--- perl-5.8.8/ext/B/B/C.pm.bz199736	2006-01-13 09:47:39.000000000 -0500
+++ perl-5.8.8/ext/B/B/C.pm	2006-07-21 20:25:39.000000000 -0400
@@ -647,7 +647,7 @@
     return $sym if defined $sym;
     my $val= $sv->NVX;
     $val .= '.00' if $val =~ /^-?\d+$/;
-    $xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->IVX, $val));
+    $xpvnvsect->add(sprintf("0, 0, 0, %d, %s", $sv->NVX, $val));
     $svsect->add(sprintf("&xpvnv_list[%d], %lu, 0x%x",
 			 $xpvnvsect->index, $sv->REFCNT , $sv->FLAGS));
     return savesym($sv, sprintf("&sv_list[%d]", $svsect->index));


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- perl.spec	19 Jul 2006 22:57:26 -0000	1.97
+++ perl.spec	22 Jul 2006 01:13:26 -0000	1.98
@@ -0,0 +1,1194 @@
+%define threading  1
+%define largefiles 1
+%define suidperl   1
+
+%define multilib_64_archs x86_64 s390x ppc64 sparc64
+
+%define perlver    5.8.8
+%define perlrel    8
+%define perlepoch  4
+
+%{?!perl_debugging:    %define perl_debugging 0}
+%if %{perl_debugging}
+%define debug_package %{nil}
+# don't build debuginfo and disable stripping
+%endif
+
+Provides: perl(:WITH_PERLIO)
+
+%if %{threading}
+%define thread_arch -thread-multi
+Provides: perl(:WITH_ITHREADS)
+Provides: perl(:WITH_THREADS)
+%else
+%define thread_arch %{nil}
+Provides: perl(:WITHOUT_ITHREADS)
+Provides: perl(:WITHOUT_THREADS)
+%endif
+
+%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)
+%else
+Provides: perl(:WITHOUT_LARGEFILES)
+%endif
+
+
+Name:           perl
+Version:        %{perlver}
+Release:        %{perlrel}
+Epoch:          %{perlepoch}
+Summary:        The Perl programming language
+
+Group:          Development/Languages
+License:        Artistic or GPL
+Url:            http://www.perl.org/
+
+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
+# Patch8:         perl-5.8.0-errno.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.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
+
+# make sure we get the proper ldflags on libperl.so
+Patch17:        perl-5.8.0-sharedlinker.patch
+
+# perl 5.8.0 likes to use man3ext for BOTH directories AND files.  not kosher.
+# Patch18:        perl-5.8.0-manext.patch
+
+# lynx is deprecated, use links instead
+Patch19:        perl-5.8.8-links.patch
+
+# work around annoying rpath issue
+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
+
+# 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
+
+# CAN-2005-0155 and CAN-2005-0156 fix (now in 5.8.7!)
+# Patch27:        perl-5.8.5-CAN-2005-0155+0156.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)
+# (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
+# (now in 5.8.8!)
+# Patch32:        perl-5.8.7-IOC_SIZE.patch
+
+# arch-specific patches
+Patch100:       perl-5.8.1-fpic.patch
+Patch101:       perl-5.8.0-libdir64.patch
+
+Patch32002:     perl-5.8.0-nptlhint.patch
+
+Patch32003:     perl-5.8.6-libresolv.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 (bug still in 5.8.8!):
+Patch25084:     perl-5.8.7-25084.patch
+
+Patch172396:	perl-5.8.7-172396.patch
+
+# now in 5.8.8:
+# Patch172587:    perl-5.8.7-bz172587.patch
+
+Patch040976:	perl-5.8.8-CAN-2004-0976.patch
+
+# now in 5.8.8:
+# Patch172739:    perl-5.8.7-bz172739_obz36521.patch
+
+#Patch136009:     perl-5.8.7-MM_Unix-rpath-136009.patch
+
+# now in 5.8.8:
+#Patch174684:	perl-5.8.7-CVE-2005-3962-bz174684.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
+#
+# 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
+# Upstream patch 27284:
+Patch34:	perl-5.8.8-up27284.patch
+# Fix for bug 183553 / upstream bug 38657:
+Patch35:	perl-5.8.8-bz183553_ubz38657.patch
+#
+Patch188841:	perl-5.8.8-bz188441.patch
+#
+Patch191416:	perl-5.8.8-bz191416.patch
+
+Patch27116:	perl-5.8.8-U27116.patch
+Patch27391:     perl-5.8.8-U27391.patch
+Patch27426:	perl-5.8.8-U27426.patch
+Patch27509:     perl-5.8.8-U27509.patch
+Patch27512:     perl-5.8.8-U27512.patch
+Patch27604:     perl-5.8.8-U27604.patch
+Patch27605:     perl-5.8.8-U27605.patch
+Patch27914:     perl-5.8.8-U27914.patch
+Patch27329:     perl-5.8.8-U27329.patch
+Patch36:	perl-5.8.8-R-switch.patch
+Patch37:	perl-5.8.8-no_asm_page_h.patch
+#               ^- stop IPC/SysV.c including <asm/page.h> for getpagesize(), which
+#               is now declared by including <unistd.h> .
+#
+Patch28006:     perl-5.8.8-U34297_C28006.patch
+#
+Patch38:	perl-5.8.8-useCFLAGSwithCC.patch
+Patch39:	perl-5.8.8-bz199736.patch
+#
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
+BuildRequires:  gdbm-devel, db4-devel
+
+
+# By definition of 'do' (see 'man perlfunc') this package provides all
+# versions of perl previous to it.
+Provides: perl <= %{epoch}:%{version}
+
+# These provides are needed by the perl pkg itself with auto-generated perl.req
+Provides: perl(VMS::Filespec)
+Provides: perl(VMS::Stdio)
+
+Provides: perl(abbrev.pl)
+Provides: perl(assert.pl)
+Provides: perl(bigfloat.pl)
+Provides: perl(bigint.pl)
+Provides: perl(bigrat.pl)
+Provides: perl(bytes_heavy.pl)
+Provides: perl(cacheout.pl)
+Provides: perl(complete.pl)
+Provides: perl(ctime.pl)
+Provides: perl(dotsh.pl)
+Provides: perl(dumpvar.pl)
+Provides: perl(exceptions.pl)
+Provides: perl(fastcwd.pl)
+Provides: perl(find.pl)
+Provides: perl(finddepth.pl)
+Provides: perl(flush.pl)
+Provides: perl(ftp.pl)
+Provides: perl(getcwd.pl)
+Provides: perl(getopt.pl)
+Provides: perl(getopts.pl)
+Provides: perl(hostname.pl)
+Provides: perl(importenv.pl)
+Provides: perl(look.pl)
+Provides: perl(newgetopt.pl)
+Provides: perl(open2.pl)
+Provides: perl(open3.pl)
+Provides: perl(perl5db.pl)
+Provides: perl(pwd.pl)
+Provides: perl(shellwords.pl)
+Provides: perl(stat.pl)
+Provides: perl(syslog.pl)
+Provides: perl(tainted.pl)
+Provides: perl(termcap.pl)
+Provides: perl(timelocal.pl)
+Provides: perl(utf8_heavy.pl)
+Provides: perl(validate.pl)
+
+Provides: perl(Carp::Heavy)
+
+# These modules appear to be missing or break assumptions made by the
+# dependency analysis tools.  Typical problems include refering to
+# CGI::Apache as Apache and having no package line in CPAN::Nox.pm. I
+# hope that the perl people fix these to work with our dependency
+# engine or give us better dependency tools.
+#
+# Provides: perl(Apache)
+# Provides: perl(ExtUtils::MM_Mac)
+# Provides: perl(ExtUtils::XSSymSet)
+# Provides: perl(LWP::UserAgent)
+# Provides: perl(URI::URL)
+
+# Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
+
+Obsoletes: perl-Digest-MD5
+Obsoletes: perl-MIME-Base64
+Obsoletes: perl-libnet
+Obsoletes: perl-Storable
+Obsoletes: perl-CGI
+Obsoletes: perl-CPAN
+Obsoletes: perl-DB_File
+Obsoletes: perl-Filter
+Obsoletes: perl-Filter-Simple
+Obsoletes: perl-Time-HiRes
+Obsoletes: perl-Test-Builder-Tester
+
+%define __perl_requires %{SOURCE11}
+
+
+%description
+Perl is a high-level programming language with roots in C, sed, awk
+and shell scripting.  Perl is good at handling processes and files,
+and is especially good at handling text.  Perl's hallmarks are
+practicality and efficiency.  While it is used to do a lot of
+different things, Perl's most common applications are system
+administration utilities and web programming.  A large proportion of
+the CGI scripts on the web are written in Perl.  You need the perl
+package installed on your system so that your system can handle Perl
+scripts.
+
+Install this package if you want to program in Perl or enable your
+system to handle Perl scripts.
+
+
+%if %{suidperl}
+%package suidperl
+Summary:        suidperl, for use with setuid perl scripts
+Group:          Development/Languages
+Requires:       perl = %{perlepoch}:%{perlver}-%{perlrel}
+
+%description suidperl
+suidperl is a setuid binary copy of perl that allows for (hopefully)
+more secure running of setuid perl scripts.
+%endif
+
+
+%prep
+%setup -q
+%patch5 -p1
+# %%patch8 -p1 
+
+# perl 5.8.7: reject
+# %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
+%patch17 -p1
+
+%patch19 -p1
+
+%patch21 -p1
+# %patch24 -p1
+
+# perl 5.8.7: reject
+# %patch26 -p1
+# perl 5.8.7: Already in ?
+# %patch27 -p0
+# %patch28 -p1
+
+# %patch30 -p1
+
+%if !%{perl_debugging}
+%patch31 -p1
+%endif
+
+# %patch32 -p1
+
+%patch100 -p1
+
+%ifarch %{multilib_64_archs}
+%patch101 -p1
+%endif
+
+%patch32002 -p1
+
+%patch32003 -p1
+
+# %patch172236 -p1
+
+%patch25084 -p1
+
+%patch172396 -p1
+
+# %patch172587 -p1
+
+%patch040976 -p1
+
+# %patch172739 -p1
+
+# %patch136009 -p1
+
+# %patch174684 -p1
+
+%patch1360090 -p1
+
+%patch178343 -p1
+
+%patch32 -p1
+
+%patch33 -p1
+
+%patch34 -p1
+
+%patch35 -p1
+
+%patch188841 -p1
+
+%patch191416 -p1
+
+%patch27116 -p1
+
+%patch27391 -p1
+
+%patch27426 -p1
+
+%patch27509 -p1
+
+%patch27512 -p1
+
+%patch27604 -p1
+
+%patch27605 -p1
+
+%patch27914 -p1
+
+%patch27329 -p1
+
+%patch36    -p1
+
+%patch37    -p1
+
+%patch28006 -p1
+
+%patch38    -p1
+%patch39    -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()
+{
+	iconv -f "$2" -t utf-8 < "$1" > "${1}_"
+	mv -f "${1}_" "$1"
+}
+recode README.cn euc-cn
+recode README.jp euc-jp
+recode README.ko euc-kr
+recode README.tw big5
+recode pod/perlebcdic.pod iso-8859-1
+recode pod/perlhack.pod iso-8859-1
+recode pod/perlhist.pod iso-8859-1
+recode pod/perlothrtut.pod iso-8859-1
+recode pod/perlthrtut.pod iso-8859-1
+recode lib/Unicode/Collate.pm iso-8859-1
+# recode not needed (5.8.7):
+# ext/Encode/t/Mod_EUCJP.pm, ext/Encode/lib/Encode/CJKConstants.pm,
+# ext/Encode/lib/Encode/JP/H2Z.pm, lib/ExtUtils/MM_MacOS.pm,
+# lib/Pod/Checker.pm, lib/Net/README.libnet
+
+find . -name \*.orig -exec rm -fv {} \;
+
+
+%build
+echo "RPM Build arch: %{_arch}"
+
+# yes; don't use %_libdir so that noarch packages from other OSs
+# arches work correctly :\ the Configure lines below hardcode lib for
+# similar reasons.
+
+sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
+	-Dversion=%{perlver} \
+	-Dmyhostname=localhost \
+	-Dperladmin=root at localhost \
+	-Dcc='%{__cc}' \
+	-Dcf_by='Red Hat, Inc.' \
+	-Dinstallprefix=%{_prefix} \
+	-Dprefix=%{_prefix} \
+%ifarch %{multilib_64_archs}
+	-Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
+	-Dprivlib="/usr/lib/perl5/%{version}" \
+	-Dsitelib="/usr/lib/perl5/site_perl/%{version}" \
+	-Dvendorlib="/usr/lib/perl5/vendor_perl/%{version}" \
+	-Darchlib="%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
+	-Dsitearch="%{_libdir}/perl5/site_perl/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
+	-Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perlver}/%{_arch}-%{_os}%{thread_arch}" \
+%endif
+	-Darchname=%{_arch}-%{_os} \
+%ifarch sparc
+	-Ud_longdbl \
+%endif
+	-Dvendorprefix=%{_prefix} \
+	-Dsiteprefix=%{_prefix} \
+	-Duseshrplib \
+%if %threading
+	-Dusethreads \
+	-Duseithreads \
+%else
+	-Uusethreads \
+	-Uuseithreads \
+%endif
+%if %largefiles
+	-Duselargefiles \
+%else
+	-Uuselargefiles \
+%endif
+	-Dd_dosuid \
+	-Dd_semctl_semun \
+	-Di_db \
+	-Ui_ndbm \
+	-Di_gdbm \
+	-Di_shadow \
+	-Di_syslog \
+	-Dman3ext=3pm \
+	-Duseperlio \
+	-Dinstallusrbinperl=n \
+	-Ubincompat5005 \
+	-Uversiononly \
+	-Dpager='/usr/bin/less -isr' \
+	-Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto \
+	-Ud_endprotoent_r_proto -Ud_setprotoent_r_proto \
+	-Ud_endservent_r_proto -Ud_setservent_r_proto \
+	-Dinc_version_list='%{perlmodcompat}' \
+	-Dscriptdir='%{_bindir}'
+
+make %{?_smp_mflags}
+make test
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%ifarch %{multilib_64_archs}
+	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
+	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/site_perl/%{perlver}
+	mkdir -p -m 755 $RPM_BUILD_ROOT/usr/lib/perl5/vendor_perl/%{perlver}
+%endif
+
+%ifarch %{multilib_64_archs}
+mkdir -p -m 755 ${RPM_BUILD_ROOT}/usr/lib64/perl5/vendor_perl/%{perlver}/%{_arch}-%{_os}
+%endif
+
+
+#
+# Compatibility directories
+#
+pushd $RPM_BUILD_ROOT/%{_libdir}/perl5
+for i in %{perlmodcompat}; do
+    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/CORE
+    mkdir -pm 755 $i/%{_arch}-%{_os}%{thread_arch}/auto
+    pushd $i/%{_arch}-%{_os}%{thread_arch}/CORE
+      ln -s ../../../%{perlver}/%{_arch}-%{_os}%{thread_arch}/CORE/libperl.so libperl.so
+    popd
+  done
+popd
+
+
+install -p -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_bindir}/pl2pm
+
+
+#
+
+%define new_perl_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}:$RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
+%define comp_perl_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}:$RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}
+%define new_arch_lib  $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}
+%define comp_arch_lib $RPM_BUILD_ROOT/usr/lib/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}
+
+%define new_perl_flags LD_PRELOAD=/%{new_arch_lib}/CORE/libperl.so LD_LIBRARY_PATH=%{new_arch_lib}/CORE PERL5LIB=%{new_perl_lib}:%{comp_perl_lib}
+%define new_perl %{new_perl_flags} $RPM_BUILD_ROOT/%{_bindir}/perl
+
+for i in asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h sys/socket.h sys/time.h wait.h
+do
+  %{new_perl} $RPM_BUILD_ROOT/%{_bindir}/h2ph -a \
+              -d $RPM_BUILD_ROOT%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch} $i || /bin/true
+done
+
+
+for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^/usr/lib')
+do
+  mkdir -p $RPM_BUILD_ROOT/$dir
+done
+
+for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_libdir}')
+do
+  mkdir -p $RPM_BUILD_ROOT/$dir
+done
+
+for i in %{perlver} %{perlmodcompat} ; do
+  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
+  mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/$i/%{_arch}-%{_os}%{thread_arch}/auto
+done
+
+
+#
+# libnet configuration file
+#
+mkdir -p -m 755 $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net
+install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net/libnet.cfg
+
+#
+# Core modules removal
+#
+find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
+
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';'
+
+chmod -R u+w $RPM_BUILD_ROOT/*
+%if %{perl_debugging}
+exit 0
+# disable brp-strip
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
+%{_bindir}/*
+%{_libdir}/perl5/
+%ifarch %{multilib_64_archs}
+/usr/lib/perl5/
+%endif
+%if %{suidperl}
+%exclude %{_bindir}/suidperl
+%exclude %{_bindir}/sperl%{perlver}
+%endif
+
+%if %{suidperl}
+%files suidperl
+%{_bindir}/suidperl
+%{_bindir}/sperl%{perlver}
+%endif
+
+%changelog
+* Fri Jul 21 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
+- fix bug 199736: make perlcc handle floating point values
+
+* Wed Jul 19 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
+- fix bug 199372: add .so cflags for sparc64
+
+* Fri Jul 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-8
+- Fix upstream perl bug #34297:
+  'utf8 overload stringify bug (utf8 caching maybe)'
+  upstream patch #28006 applied
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:5.8.8-6.1
+- rebuild
+
+* Thu Jun 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
+- Fix upstream perl bug #38454:
+  'rindex corrects for $[ on bytes rather than UTF-8'
+  apply upstream patch #27116
+- Fix upstream perl bug 24816:
+  'Magic vars seem unsure if they are purely numeric' 
+  ( perl -wle 'print $? = $? ^ "3"' -> 'Argument "^C" isn't numeric' )
+  apply upstream patch #27391
+- Avoid writing over the input string in the case 'F' in moreswitches.
+  apply upstream patch #27426
+- Fix upstream perl bug 34925 - 'overload and rebless' -
+  apply upstream patches #27509, #27512
+- Fix upstream perl bug 3038 - '$qr = qr/^a$/m; $x =~ $qr; fails'
+  apply upstream patch #27604
+- apply upstream patch #27605 - 'Fix off-by-one in $0 set magic.'
+- Fix upstream perl bug 23141 - '($_) = () fails to set $_ to undef'
+  apply upstream patch #27914
+- Fix upstream perl bug #38619 - 
+  'Bug in lc and uc (interaction between UTF-8, substr, and lc/uc)'
+  apply upstream patch #27329
+- Give users the '-R' option to disable the Red Hat
+  module compatibility default search path extension (incpush.patch).
+
+* Thu May 11 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
+- Fix bug 191416: make h2ph generate correct code for cpp statements
+  like: '#if defined A || defined B'
+- Fix 172396.patch for non-threaded builds
+
+* Wed Apr 12 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-6
+- Fix bug 188841: make CGI.pm's url(-relative) handle rewrites
+
+* Tue Mar 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-4
+- Fix bug 183553 / upstream bug 38657: fix -d:Foo=bar processing
+- rebuild with new gcc-4.1.0-1, released today
+
+* Mon Feb 27 2006 Jason Vas Dias <jvdias at redhat.com>
+- Apply upstream patch #28284
+
+* 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)
+
+* 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
+
+* 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
+
+* 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
+- Apply upstream patches 26283 and 26284 : complete, revised fixes
+  for CVE-2005-3962 and CVE-2005-3912 and 
+  "Sys::Syslog security vulnerabilities" issues.
+- Fix bug 136009 / MakeMaker LD_RUN_PATH issue: 
+  restore previous default Red Hat behavior of removing the MakeMaker
+  generated LD_RUN_PATH setting from the link command .
+  Document this removal, as it contravenes upstream default behavior, and 
+  provide a USE_MM_LD_RUN_PATH MakeMaker member to enable use of the 
+  MakeMaker generated LD_RUN_PATH .
+
+* Thu Dec 01 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.8
+- fix bug 174684 / CVE-2005-3962: sprintf integer overflow vulnerability
+  backport upstream patch #26240
+
+* Wed Nov 09 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 136009: restore MakeMaker support for LD_RUN_PATH, 
+  while removing empty LD_RUN_PATH
+
+* Tue Nov 08 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 172739: upstream bug 36521 : deep recursion and segfault
+  in CGI::Carp::warn with 'use diagnostics' : applied patch 25160.
+- fix CAN-2004-0976: insecure use of temp files (ala Debian)
+
+* Mon Nov 07 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 172587: apply upstream patches 26009, 26011
+
+* Thu Nov 03 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 172396 / upstream bug 26136: insert tzset() call before localtime_r() calls
+
+* Wed Nov 02 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 172336 / upstream bug 37056: reentr ERANGE realloc recursion
+
+* Tue Nov 01 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.7
+- fix bug 172236 : missing C standard headers -
+  use gcc4's '-print-search-path' option in h2ph
+
+* Tue Oct 25 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-0.6
+- fix bug 171111 : define ioctl length macro IOCPARM_LEN(x)
+  macro to be _IOC_SIZE(x), not 256 - upstream bug #37535 raised.
+- provide 'perl_debugging' .spec file option to enable -DDEBUGGING
+  and disable stripping / debuginfo generation - default: 0
+
+* Sun Oct 09 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.4
+- rebuild for db4 (#170235)
+
+* Mon Sep 05 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.3
+- convert docs to UTF-8 (#140871)
+
+* Sat Sep 03 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.2
+- scriptdir to /usr/bin (#167205)
+
+* Sun Aug 28 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.7-0.1
+- patch12 from Marius Feraru (#165907)
+  TODO: patch11, patch26 and patch27 clash and need verification
+- Build without -DDEBUGGING (#156113)
+
+* Sun Aug 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.7-0
+- 5.8.7
+- Dropped the CGI.pm update patches (patch25 and patch29).
+
+* Fri Aug 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-17
+- Don't remove the core modules:
+    Filter::Util::Call, Filter::Simple, and Time::HiRes.
+- Obsoletes perl-{Filter,Filter-Simple,Time-HiRes}.
+
+* Tue Aug  9 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-16
+- Reformatted the specfile.
+- Added the Source0 URL.
+- Dropped the MANIFEST.all file for the perl package.
+- Dropped the MANIFEST.suidperl file for the suidperl subpackage.
+
+* Wed May 18 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-15
+- remove unused /tmp/MANIFEST.all (#151801)
+
+* Tue May 17 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-14
+- CGI.pm 3.10 fixes mod_perl problems (#158036)
+
+* Sun May 15 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-13
+- Better patch for FindBin.pm (#127023#c37)
+
+* Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-12
+- New findbin-selinux patch: it now passes the FindBin.t tests
+  (patch28 replaces patch23). #118877 #127023
+- Remove 5.8.2 ABI compat (#154295 comments 6 and 7).
+
+* Thu Apr 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 3:5.8.6-10
+- Apply fixes for CAN-2004-0452, CAN-2005-0155 and CAN-2005-0156 (#156128).
+
+* Tue Apr 26 2005 Warren Togami <wtogami at redhat.com. - 3:5.8.6-8
+- -Dinstallusrbinperl=n (#141182 Aaron Sherman)
+- remove 5.8.0 and 5.8.1 ABI compat (#154295)
+
+* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-7
+- Updating CGI.pm from version 3.05 to 3.08 (mod_perl 2.0.0 RC5). (#155839)
+
+* Wed Apr 20 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-6
+- FCGI is not provided by perl (#148847).
+- Drop the '.1' suffix from the perl-suidperl subpackage.
+
+* Thu Mar 17 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-5
+- bug 151127: fix to use libresolv instead of libbind (perl-5.8.6-libresolv.patch).
+
+* Tue Mar  8 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-4
+- add patch to put site_perl and vendor_perl before core perl dirs, to
+  allow for overriding modules
+
+* Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-3
+- bugzilla: 127025, fix strip warnings
+
+* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-2
+- bugzilla: 145448, fix invalid utf8 in changelog
+
+* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-1
+- bugzilla: 145447, add 5.8.5 to perlmodcompat list
+
+* Mon Jan 17 2005 Chip Turner <cturner at redhat.com> - 3:5.8.6-1
+- update to 5.8.6
+
+* Wed Dec  1 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-13
+- rebuild
+
+* Wed Dec  1 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-11
+- bugzilla: 140563, nptl doesn't act like linuxthreads; threads have no PIDs
+
+* Thu Nov 11 2004 Jeff Johnson <jbj at jbj.org> 3:5.8.5-10
+- rebuild against db-4.3.21.
+
+* Tue Oct 12 2004 Jose Pedro Oliveira <jpo at di.uminho.pt>
+- Corrected the license information (missing GPL).
+- Added the URL tag.
+- Removed empty .bs files.
+- Eliminated several strip generated messages (bug 127025).
+- Corrected problems mentioned in bug 120772
+  (updated Ville Skytta)
+
+* Tue Oct 12 2004 Chip Turner <cturner at redhat.com>
+- bugzilla: 135303, add more missing 5.8.4 paths
+
+* Mon Oct 11 2004 Tim Waugh <twaugh at redhat.com>
+- Build requires groff (bug #135101).
+
+* Tue Oct  5 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-7
+- update perlbug patch to strip build date as well
+
+* Mon Aug 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-2
+- fix conflicting file when building on x86_64 and i386
+
+* Sat Jul 24 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-1
+- Add Provides: Carp::Heavy to fix new dep error (bz 128507)
+
+* Thu Jul 22 2004 Chip Turner <cturner at redhat.com> 3:5.8.5-1
+- update to 5.8.5
+
+* Mon Jun 28 2004 Chip Turner <cturner at redhat.com> 3:5.8.4-1
+- update to 5.8.4, remove patch 8
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Apr 15 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-18
+- add patch to fix empty RPATH issue on perl module compile
+
+* Sat Apr 03 2004 Colin Walters <walters at redhat.com> 3:5.8.3-17
+- Apply patch to fix FindBin module when access to cwd is disallowed,
+  should solve the MRTG/SELinux cron spam issue
+
+* Tue Mar 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-14
+- make sure multilib boxes also own the entries in @INC that are in /usr/lib, not just %_libdir
+
+* Tue Mar  9 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-%{perlrel}.1
+- fix i386-specifics in %%install to arch generic
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Feb 25 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-10
+- add perl(:MODULE_COMPAT_*) provides; make sure all of @INC is owned by perl package
+
+* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-8
+- rebuild
+
+* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7.9.rhl9
+- rebuild
+
+ patch for perl 5.8.4).
+
+* Thu Feb 19 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7.10.fc1
+- rebuild
+
+* Sun Feb 15 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-6
+- fix very broken @INC calculations with slightly less broken @INC
+  calculations (not perfectly handled but the result is correct)
+- fix broken -Dsitearch declaration
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jan 28 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-5
+- update incpush patch to better handle multilib
+
+* Fri Jan 23 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-2
+- add a dependency filter on perl(Tie::RangeHash)
+
+* Thu Jan 22 2004 Chip Turner <cturner at redhat.com> 3:5.8.3-7
+- upgrade to 5.8.3
+
+* Mon Dec 15 2003 Chip Turner <cturner at redhat.com> 3:5.8.2-7
+- fix @INC so that all dirs go into it, not just those that exist at buildtime in the build system
+
+* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 3:5.8.2-4
+- rebuild against db-4.2.52.
+
+* Sun Dec  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3:5.8.2-3
+- Own site and vendor auto directories (#73970).
+
+* Wed Dec  3 2003 Chip Turner <cturner at redhat.com> 3:5.8.2-2
+- upgrade to 5.8.2
+
+* Fri Oct 31 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-92
+- remove Vendor and Distribution macros from specfile (#108567)
+
+* Wed Oct 15 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-92
+- add srand on fork patch from upstream, as well as test case
+
+* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 3:5.8.1-91.1
+- rebuild against db-4.2.42.
+
+* Thu Sep 25 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-91
+- perl 5.8.1 final
+
+* Mon Sep 22 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc5.3
+- ensure inc_version_list is always set properly
+
+* Mon Sep 22 2003 Chip Turner <cturner at redhat.com>
+- update to RC5
+
+* Wed Aug 20 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc4.2
+- rebuild
+
+* Wed Aug  6 2003 Chip Turner <cturner at redhat.com>
+- bugzilla 101767, make sure threads.so links directly to -lpthread
+
+* Fri Aug  1 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc2.1
+- RC4
+- remove perl-5.8.0-fhs.patch since it is integrated now
+- remove perl-5.8.0-Safe2.09.patch, unnecessary now
+
+* Fri Jul 11 2003 Chip Turner <cturner at redhat.com> 3:5.8.1-90.rc2.1
+- rc2 snapshot
+
+* Thu Jul 10 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-90.rc1
+- upgrade to 5.8.1 RC1
+
+* Mon Jul  7 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-89.pre%{PRELEVEL}.0
+- integrate another pre-5.8.1 release
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon May 19 2003 Chip Turner <cturner at redhat.com> 3:5.8.0-89.pre%{PRELEVEL}.0
+- bump epoch since we went from perl 5.8.1-pre to 5.8.0-pre (ie,
+  changed what version perl thought of itself as)
+
+* Mon May  5 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.3
+- rebuild
+
+* Thu May  1 2003 Chip Turner <cturner at redhat.com>
+- bump for rebuilg
+
+* Sun Apr 27 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.1
+- fix the fix for RPM_BUILD_ROOT substitution
+
+* Tue Apr 22 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}.3
+- fix Config.pm; lost when h2ph changes made
+
+* Thu Apr 17 2003 Chip Turner <cturner at redhat.com> 2:5.8.1-0.pre%{PRELEVEL}
+- move to latest snapshot, 19261
+
+* Tue Feb 18 2003 Chip Turner <cturner at redhat.com>
+- fix MANIFEST.DB_File handling for #83410; problem was unsubstituted
+  %{_libdir} that crept in with multilib
+
+* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 5.8.0-87
+- clean up backup files from patches (#82838)
+
+* Wed Feb 05 2003 Elliot Lee <sopwith at redhat.com> 5.8.0-86
+- Fix up multilib handling to use multilib_64_archs macro, add ppc64.
+- Patch100 probably makes sense on all archs, and ifarch'd patches are Bad(tm).
+
+* Mon Jan 27 2003 Chip Turner <cturner at redhat.com>
+- version the Obsoleted on perl-NDBM_File so users can install newer
+- change the Obsoletes on NDBM_File to a Conflicts
+  ones than what shipped with 7.3, yet still keep anaconda happy
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Thu Jan  9 2003 Chip Turner <cturner at redhat.com>
+- rebuild
+
+* Sat Jan  4 2003 Jeff Johnson <jbj at redhat.com> 5.8.0-82
+- use internal dep generator.
+
+* Thu Jan  2 2003 Chip Turner <cturner at redhat.com>
+- fix issue with -Dpager in Pod::Perldoc.pm to properly respect setting once more
+
+* Tue Dec 31 2002 Chip Turner <cturner at redhat.com>
+- add rpath fix to prevent building perl from using installed system perl
+- massive re-integration of upstream patches to come to common basis (head of perl-maint branch)
+
+* Mon Dec 16 2002 Chip Turner <cturner at redhat.com>
+- rebuild
+
+* Sun Dec 15 2002 Chip Turner <cturner at redhat.com>
+- add numerous upstream patches to fix utf8/perlio issues
+- upgrade Storable, Safe, and Encoding to latest CPAN versions
+
+* Thu Nov  7 2002 Chip Turner <cturner at redhat.com>
+- multilib support when building noarch perl modules
+- integrate upstream bugfix patches
+
+* Tue Sep 10 2002 Chip Turner <cturner at redhat.com>
+- integrate patch for /usr/lib64 instead of /usr/lib from Than Ngo
+
+* Mon Sep  9 2002 Chip Turner <cturner at redhat.com>
+- integrate s390/s390x patch from Florian La Roche
+
+* Sun Sep  1 2002 Chip Turner <cturner at redhat.com>
+- fix pager issues; default to /usr/bin/less -isr
+- more work on pager bug (72125)
+
+* Thu Aug 29 2002 Chip Turner <cturner at redhat.com>
+- add a few new directories to h2ph to produce better .ph files
+
+* Thu Aug 15 2002 Chip Turner <cturner at redhat.com>
+- change from lynx to links in CPAN.pm
+
+* Tue Aug  6 2002 Chip Turner <cturner at redhat.com>
+- automated release bump and build
+- remove Filter packages and use CPAN ones
+
+* Fri Jul 19 2002 Chip Turner <cturner at redhat.com>
+- move to final perl 5.8.0, huzzah!
+
+* Tue Jul 16 2002 Chip Turner <cturner at redhat.com>
+- update CPAN, CGI, and DB_File versions; obsolete perl-libnet
+- libnet.cfg supplied, default to passive ftp in all cases
+
+* Tue Jun 18 2002 Chip Turner <cturner at redhat.com>
+- add patch to ensire libperl.so is linked properly
+
+* Mon May 20 2002 Nalin Dahyabhai <nalin at redhat.com>
+- always build with -fPIC
+
+* Thu May  9 2002 Jeff Johnson <jbj at redhat.com>
+- rebuild in rawhide
+
+* Sun Mar 31 2002 Chip Turner <cturner at redhat.com>
+- split suidperl back out (bug #62215)
+
+* Tue Mar 26 2002 Chip Turner <cturner at redhat.com>
+- restructuring of some directories, alteration of @INC
+
+* Thu Dec 20 2001 Chip Turner <cturner at redhat.com>
+- remove ndbm completely
+
+* Sun Dec 16 2001 Chip Turner <cturner at redhat.com>
+- make rpmlint happy, split out NDBM_File, clean up other spots
+- stopped doing grep -v etc in favor of custom script
+
+* Wed Dec 12 2001 Chip Turner <cturner at redhat.com>
+- cleaning up of ia64 issues, as well as compatibility with gcc 3.1
+  and glibc 2.2.4
+
+* Mon Sep 24 2001 Chip Turner <cturner at redhat.com>
+- changing building of extra modules out of the core perl rpm
+
+* Mon Sep 17 2001 Chip Turner <cturner at redhat.com>
+- upgrade to 5.6.1, added old INC dirs to maintain compat
+
+* Fri Mar 23 2001 Preston Brown <pbrown at redhat.com>
+- bzip2 source, save some space.
+
+* Thu Dec  7 2000 Crutcher Dunnavant <crutcher at redhat.com>
+- initial rebuild for 7.1
+
+* Tue Sep 12 2000 Bill Nottingham <notting at redhat.com>
+- fix dependencies on ia64/sparc64
+
+* Mon Aug  7 2000 Nalin Dahyabhai <nalin at redhat.com>
+- replace the deprecated MD5 with Digest::MD5 (has to be here for cleanfeed)
+- obsolete: perl-Digest-MD5
+- use syslog instead of mail to report possible attempts to break into suidperl
+- force syslog on at build-time
+
+* Mon Jul 31 2000 Nalin Dahyabhai <nalin at redhat.com>
+- add Owen's fix for #14779/#14863
+- specify cc=%{__cc}; continue to let cpp sort itself out
+- switch shadow support on (#8646)
+- release 7
+
+* Tue Jul 18 2000 Nalin Dahyabhai <nalin at redhat.com>
+- strip buildroot from perl pods (#14040)
+- release 6
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild (release 5)
+
+* Wed Jun 21 2000 Preston Brown <pbrown at redhat.com>
+- don't require tcsh to install, only to build
+- release 4
+
+* Mon Jun 19 2000 Nalin Dahyabhai <nalin at redhat.com>
+- rebuild against new db3 package
+- release 3
+
+* Sat Jun 17 2000 Nalin Dahyabhai <nalin at redhat.com>
+- disable 64-bit file support
+- change name of package that Perl expects gcc to be in from "egcs" to "gcc"
+- move man pages to /usr/share via hints/linux.sh and MM_Unix.pm
+- fix problems prefixifying with empty prefixes
+- disable long doubles on sparc (they're the same as doubles anyway)
+- add an Epoch to make sure we can upgrade from perl-5.00503
+- release 2
+
+* Thu Mar 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 2.6.0
+
+* Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
+- fix description
+
+* Fri Jan 14 2000 Jeff Johnson <jbj at redhat.com>
+- add provides for perl modules (from kestes at staff.mail.com).
+
+* Mon Oct 04 1999 Cristian Gafton <gafton at redhat.com>
+- fix the %%install so that the MD5 module gets actually installed correctly
+
+* Mon Aug 30 1999 Cristian Gafton <gafton at redhat.com>
+- make sure the package builds even when we don't have perl installed on the
+  system
+
+* Fri Aug 06 1999 Cristian Gafton <gafton at redhat.com>
+- merged with perl-MD5
+- get rid of the annoying $RPM_BUILD_ROOT paths in the installed tree
+
+* Mon Jul 26 1999 Cristian Gafton <gafton at redhat.com>
+- do not link anymore against the system db library (and make each module
+  link against it separately, so that we can have Berkeley db1 and db2 mixed
+  up)
+
+* Wed Jun 16 1999 Cristian Gafton <gafton at redhat.com>
+- use wildcards for files in /usr/bin and /usr/man
+
+* Tue Apr 06 1999 Cristian Gafton <gafton at redhat.com>
+- version 5.00503
+- make the default man3 install dir be release independent
+- try to link against db1 to preserve compatibility with older databases;
+  abandoned idea because perl is too broken to allow such an easy change
+  (hardcoded names *everywhere* !!!)
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 3)
+
+* Thu Jan 07 1999 Cristian Gafton <gafton at redhat.com>
+- guilty of the inlined Makefile in the spec file
+- adapted for the arm build
+
+* Wed Sep 09 1998 Preston Brown <pbrown at redhat.com>
+- added newer CGI.pm to the build
+- changed the version naming scheme around to work with RPM
+
+* Sun Jul 19 1998 Jeff Johnson <jbj at redhat.com>
+- attempt to generate *.ph files reproducibly
+
+* Mon Jun 15 1998 Jeff Johnson <jbj at redhat.com>
+- update to 5.004_04-m4 (pre-5.005 maintenance release)
+
+* Tue Jun 12 1998 Christopher McCrory <chrismcc at netus.com
+- need stdarg.h from gcc shadow to fix "use Sys::Syslog" (problem #635)
+
+* Fri May 08 1998 Cristian Gafton <gafton at redhat.com>
+- added a patch to correct the .ph constructs unless defined (foo) to read
+  unless(defined(foo))
+
+* Thu May 07 1998 Prospector System <bugs at redhat.com>
+- translations modified for de, fr, tr
+
+* Tue Mar 10 1998 Cristian Gafton <gafton at redhat.com>
+- fixed strftime problem
+
+* Sun Mar 08 1998 Cristian Gafton <gafton at redhat.com>
+- added a patch to fix a security race
+- do not use setres[ug]id - those are not implemented on 2.0.3x kernels
+
+* Mon Mar 02 1998 Cristian Gafton <gafton at redhat.com>
+- upgraded to 5.004_04 - 5.004_01 had some nasty memory leaks.
+- fixed the spec file to be version-independent
+
+* Fri Dec 05 1997 Erik Troan <ewt at redhat.com>
+- Config.pm wasn't right do to the builtrooting
+
+* Mon Oct 20 1997 Erik Troan <ewt at redhat.com>
+- fixed arch-specfic part of spec file
+
+* Sun Oct 19 1997 Erik Troan <ewt at redhat.com>
+- updated to perl 5.004_01
+- users a build root
+
+* Thu Jun 12 1997 Erik Troan <ewt at redhat.com>
+- built against glibc
+
+* Tue Apr 22 1997 Erik Troan <ewt at redhat.com>
+- Incorporated security patch from Chip Salzenberg <salzench at nielsenmedia.com>
+
+* Fri Feb 07 1997 Erik Troan <ewt at redhat.com>
+- Use -Darchname=i386-linux 
+- Require csh (for glob)
+- Use RPM_ARCH during configuration and installation for arch independence



From fedora-cvs-commits at redhat.com  Sat Jul 22 02:41:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 22:41:42 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-ocsp.patch, NONE,
	1.1 pam_pkcs11-0.5.3-putenv-login-token.patch, NONE,
	1.1 pam_pkcs11.spec, 1.5, 1.6
Message-ID: <200607220241.k6M2fgrI016624@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16582/devel

Modified Files:
	pam_pkcs11.spec 
Added Files:
	pam_pkcs11-0.5.3-ocsp.patch 
	pam_pkcs11-0.5.3-putenv-login-token.patch 
Log Message:
auto-import pam_pkcs11-0.5.3-6 on branch devel from pam_pkcs11-0.5.3-6.src.rpm

pam_pkcs11-0.5.3-ocsp.patch:
 pkcs11.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE pam_pkcs11-0.5.3-ocsp.patch ---
--- ./src/common/pkcs11.c.ocsp	2006-07-20 15:22:43.623000000 -0700
+++ ./src/common/pkcs11.c	2006-07-20 17:24:39.570716000 -0700
@@ -20,7 +20,7 @@
 
 #ifdef HAVE_NSS
 
-#define NSS_3_9 1
+/*#define NSS_3_9 1 */
 
 #include "nss.h"
 #include "cert.h"
@@ -80,6 +80,7 @@
     }
     /* register a callback */
     PK11_SetPasswordFunc(password_passthrough);
+    CERT_EnableOCSPChecking(CERT_GetDefaultCertDB());
     DBG("...  NSS Complete");
     return 0;
 }
@@ -178,6 +179,20 @@
     return 0; /* NSS initialized the module on load */
 }
 
+int isInitialized(SECMODModule *mod, PK11SlotInfo *slot)
+{
+    CK_TOKEN_INFO tokenInfo;
+
+    /* don't fail old tokens, let them be.. */
+    if ((mod->cryptokiVersion.major == 2) && (mod->cryptokiVersion.minor < 10)) {
+	return 1;
+    }
+
+    PK11_GetTokenInfo(slot, &tokenInfo);
+
+    return (tokenInfo.flags & CKF_TOKEN_INITIALIZED);
+}
+
 int find_slot_by_number(pkcs11_handle_t *h, int slot_num)
 {
     SECMODModule *module = h->module;
@@ -187,14 +202,16 @@
         /* threaded applications should also acquire the
          * DefaultModuleListLock */
 	for (i=0; i < module->slotCount; i++) {
-	    if (module->slots[i] && PK11_IsPresent(module->slots[i])) {
+	    if (module->slots[i] && PK11_IsPresent(module->slots[i])
+			&& isInitialized(module, module->slots[i])) {
 		return i;
 	    }
 	}
     }
     slot_num--;
     if (slot_num >= 0 && slot_num < module->slotCount && module->slots &&
-	    module->slots[i] && PK11_IsPresent(module->slots[i])) {
+	    module->slots[i] && PK11_IsPresent(module->slots[i])
+			&& isInitialized(module, module->slots[i])) {
 	return slot_num;
     }
     return -1;

pam_pkcs11-0.5.3-putenv-login-token.patch:
 pam_pkcs11.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE pam_pkcs11-0.5.3-putenv-login-token.patch ---
--- src/pam_pkcs11/pam_pkcs11.c.putenv-login-token	2006-07-17 00:05:27.000000000 +0200
+++ src/pam_pkcs11/pam_pkcs11.c	2006-07-17 00:15:40.000000000 +0200
@@ -126,6 +126,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
   unsigned char random_value[128];
   unsigned char *signature;
   unsigned long signature_length;
+  char token_name_env[64] = "";
 
   /* first of all check whether debugging should be enabled */
   for (i = 0; i < argc; i++)
@@ -379,6 +382,19 @@ PAM_EXTERN int pam_sm_authenticate(pam_h
     return PAM_AUTH_ERR;
   }
 
+  snprintf(token_name_env, sizeof(token_name_env) - 1,
+	   "PKCS11_LOGIN_TOKEN_NAME=%.*s", 
+	   (sizeof(token_name_env) - 1) - strlen("PKCS11_LOGIN_TOKEN_NAME="),
+	   get_slot_label(ph));
+  rv = pam_putenv(pamh, token_name_env);
+
+  if (rv != PAM_SUCCESS) {
+    DBG1("could not put token name in environment: %s",
+         pam_strerror(pamh, rv)); 
+    syslog(LOG_ERR, "could not put token name in environment: %s",
+           pam_strerror(pamh, rv)); 
+  }
+
   /* close pkcs #11 session */
   rv = close_pkcs11_session(ph);
   if (rv != 0) {


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pam_pkcs11.spec	18 Jul 2006 20:45:11 -0000	1.5
+++ pam_pkcs11.spec	22 Jul 2006 02:41:39 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        5
+Release:        6
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -19,6 +19,8 @@
 Patch1:		pam_pkcs11-0.5.3-nss.patch
 Patch2:		pam_pkcs11-0.5.3-cardonly.patch
 Patch3:		pam_pkcs11-0.5.3-setup-tool.patch
+Patch4:		pam_pkcs11-0.5.3-putenv-login-token.patch
+Patch5:		pam_pkcs11-0.5.3-ocsp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -51,6 +53,8 @@
 %patch1 -p0 -b .nss
 %patch2 -p0 -b .card-only
 %patch3 -p1 -b .setup
+%patch4 -p0 -b .putenv
+%patch5 -p0 -b .ocsp
 
 %build
 
@@ -149,6 +153,12 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Thu Jul 20 2006 Robert Relyea  <rrelyea at redhat.com> 0.5.3-6
+- Include the login token in the environment
+- Conditionally turn on OCSP
+- Treat uninitialized tokens as not present.
+
+- Use the TEXT_INFO field for smart card prompting
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
 - added a simple pkcs11_setup tool
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 03:08:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 23:08:43 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.7, 1.8 setroubleshoot.spec,
	1.10, 1.11 sources, 1.9, 1.10
Message-ID: <200607220308.k6M38hYX007231@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7192/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.12-1 on branch devel from setroubleshoot-0.12-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Jul 2006 23:08:43 -0000	1.7
+++ .cvsignore	22 Jul 2006 03:08:40 -0000	1.8
@@ -1 +1 @@
-setroubleshoot-0.11.tar.gz
+setroubleshoot-0.12.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- setroubleshoot.spec	21 Jul 2006 23:08:43 -0000	1.10
+++ setroubleshoot.spec	22 Jul 2006 03:08:40 -0000	1.11
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.11
+Version: 0.12
 Release: 1
 License: GPL
 Group: Applications/System
@@ -93,6 +93,13 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-1
+	* Fix problem in dispatcher
+
+* Fri Jul 21 2006 John Dennis <jdennis at redhat.com> - 0.11-1 
+	* add email alerts
+	* stop the status icon from blinking, add notification balloon.
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.10-1
 - Fix startup order for setrobleshoot
 - Fix Plugins


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Jul 2006 23:08:43 -0000	1.9
+++ sources	22 Jul 2006 03:08:40 -0000	1.10
@@ -1 +1 @@
-14ab150fb68bb6172c6472b60710199c  setroubleshoot-0.11.tar.gz
+21d5c9cde7cabb03f58d01586f90072a  setroubleshoot-0.12.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jul 22 03:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 21 Jul 2006 23:11:35 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.33,
	1.34 selinux-policy.spec, 1.230, 1.231
Message-ID: <200607220311.k6M3BZnf008067@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8023

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8
- Fixes for mls use of ssh
- named  has a new conf file


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/inetd.te          |   12 +-
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 78 files changed, 792 insertions(+), 226 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- policy-20060608.patch	21 Jul 2006 13:28:12 -0000	1.33
+++ policy-20060608.patch	22 Jul 2006 03:11:32 -0000	1.34
@@ -489,6 +489,19 @@
  
  userdom_dontaudit_use_unpriv_user_fds(avahi_t)
  userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.3.3/policy/modules/services/bind.fc
+--- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-07-21 11:20:26.000000000 -0400
+@@ -28,7 +28,8 @@
+ ')
+ 
+ ifdef(`distro_redhat',`
+-/etc/named\.conf	--	gen_context(system_u:object_r:named_conf_t,s0)
++/etc/named\.rfc1912.zones  --	gen_context(system_u:object_r:named_conf_t,s0)
++/etc/named\.conf	   --	gen_context(system_u:object_r:named_conf_t,s0)
+ /etc/named\.caching-nameserver\.conf -- gen_context(system_u:object_r:named_conf_t,s0)
+ /var/named(/.*)?		gen_context(system_u:object_r:named_zone_t,s0)
+ /var/named/slaves(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
 --- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-17 11:43:02.000000000 -0400
@@ -1438,6 +1451,17 @@
  #squid requires the following when run in diskd mode, the recommended setting
  allow squid_t tmpfs_t:file { read write };
  ') dnl end TODO
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-07-21 09:52:20.000000000 -0400
+@@ -71,6 +71,7 @@
+ 	allow $1_ssh_t self:msgq create_msgq_perms;
+ 	allow $1_ssh_t self:msg { send receive };
+ 	allow $1_ssh_t self:tcp_socket create_socket_perms;
++	allow $1_ssh_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	# for rsync
+ 	allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
 --- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-17 11:43:02.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- selinux-policy.spec	21 Jul 2006 13:28:12 -0000	1.230
+++ selinux-policy.spec	22 Jul 2006 03:11:32 -0000	1.231
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,10 @@
 %endif
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8
+- Fixes for mls use of ssh
+- named  has a new conf file
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-7
 - Fixes to make setroubleshoot work
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 04:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 00:10:37 -0400
Subject: rpms/gaim/devel gaim.spec,1.130,1.131
Message-ID: <200607220410.k6M4Ab0Z022807@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22748

Modified Files:
	gaim.spec 
Log Message:
move gaim.pc to -devel (#199761)



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gaim.spec	19 Jul 2006 21:24:04 -0000	1.130
+++ gaim.spec	22 Jul 2006 04:10:18 -0000	1.131
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.7.%{betaver}%{?dist}
+Release:	0.8.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -272,7 +272,6 @@
 %doc doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
 %{_bindir}/*
 %{_libdir}/gaim/
-%{_libdir}/pkgconfig/gaim.pc
 %{_libdir}/libgaim-client.so.*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
@@ -293,8 +292,12 @@
 %defattr(-,root,root,-)
 %{_includedir}/gaim/
 %{_libdir}/libgaim-client.so
+%{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Sat Jul 22 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.8.beta3
+- move gaim.pc to -devel (#199761)
+
 * Wed Jul 19 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.7.beta3
 - cleanup spec and update default pref
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 04:13:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 00:13:23 -0400
Subject: rpms/gdm/devel gdm-2.15.6-security-tokens.patch, 1.5,
	1.6 gdm-2.15.6-session-keyring.patch, 1.1, 1.2 gdm.spec, 1.184,
	1.185
Message-ID: <200607220413.k6M4DNb1023423@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23351

Modified Files:
	gdm-2.15.6-security-tokens.patch 
	gdm-2.15.6-session-keyring.patch gdm.spec 
Log Message:
- simplify all the security token code by only using one pam stack
- drop lame kill on token removal feature


gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   31 +
 config/gdm                    |   16 
 config/gdm-autologin          |   17 
 config/gdm.conf.in            |    4 
 config/securitytokens.conf.in |    3 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |   93 ++++
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    3 
 13 files changed, 1780 insertions(+), 21 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdm-2.15.6-security-tokens.patch	19 Jul 2006 18:20:18 -0000	1.5
+++ gdm-2.15.6-security-tokens.patch	22 Jul 2006 04:13:19 -0000	1.6
@@ -1,13 +1,5 @@
 --- gdm-2.15.6/config/Makefile.am
 +++ gdm-2.15.6/config/Makefile.am
-@@ -26,6 +26,7 @@ EXTRA_DIST = \
- 	Xsession.in \
- 	gdm \
- 	gdm-autologin \
-+	gdm-securitytokens \
- 	locale.alias \
- 	Init.in \
- 	PreSession.in \
 @@ -34,9 +35,10 @@ EXTRA_DIST = \
  	XKeepsCrashing \
  	gettextfoo.h \
@@ -69,16 +61,6 @@
  
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
-@@ -237,6 +265,9 @@ install-data-hook: gdm.conf gdm.conf-cus
- 	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; then \
- 		$(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
- 	   fi; \
-+	   if test $$system = Linux && test '!' -f $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; then \
-+		$(INSTALL_DATA) gdm-securitytokens $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-securitytokens; \
-+	   fi; \
- 	   if test $$system = SunOS; then \
- 		echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
- 	   fi; \
 --- gdm-2.15.6/config/gdm
 +++ gdm-2.15.6/config/gdm
 @@ -1,8 +1,10 @@
@@ -119,20 +101,6 @@
 +session    include     system-auth
 +session    required    pam_loginuid.so
 +session    optional    pam_console.so
-new file mode 100644
---- /dev/null
-+++ gdm-2.15.6/config/gdm-securitytokens
-@@ -0,0 +1,10 @@
-+#%PAM-1.0
-+auth       required	pam_env.so
-+auth       sufficient   pam_pkcs11.so
-+auth       required     pam_deny.so
-+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.15.6/config/gdm.conf.in
 +++ gdm-2.15.6/config/gdm.conf.in
 @@ -196,6 +196,10 @@ # How long gdm should wait before it ass
@@ -146,25 +114,12 @@
  [security]
  # Allow root to login.  It makes sense to turn this off for kiosk use, when
  # you want to minimize the possibility of break in.
-@@ -242,6 +246,9 @@ #PasswordRequired=false
- # Specifies the PAM Stack to use, "gdm" by default.
- PamStack=gdm
- 
-+# Specifies the PAM Stack to use when smart cards are inserted
-+SecurityTokensPamStack=gdm-securitytokens
-+
- # XDMCP is the protocol that allows remote login.  If you want to log into GDM
- # remotely (I'd never turn this on on open network, use ssh for such remote
- # usage that).  You can then run X with -query <thishost> to log in, or
-new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/config/securitytokens.conf.in
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,3 @@
 +[SecurityTokens]
 +Enable=true
 +#Driver=@libdir@/pkcs11/libcoolkeypk11.so
-+#PamStack=gdm-securitytokens
-+#KillSessionOnRemove=false
 --- gdm-2.15.6/configure.ac
 +++ gdm-2.15.6/configure.ac
 @@ -19,6 +19,7 @@ LIBRSVG_REQUIRED=1.1.1
@@ -226,25 +181,18 @@
  extern GSList *displays;
  
  /* Local functions */
-@@ -80,6 +83,17 @@ static void gdm_handle_message (GdmConne
+@@ -80,6 +83,10 @@ static void gdm_handle_message (GdmConne
  static void gdm_handle_user_message (GdmConnection *conn,
  				     const gchar *msg,
  				     gpointer data);
 +
-+static void gdm_reset_pam (void);
-+
-+static void gdm_handle_security_token_insertion (ScSecurityTokenMonitor *monitor,
-+						 ScSecurityToken *token,
-+						 const gchar     *pam_stack);
-+static void gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+					       ScSecurityToken *token,
-+					       gboolean should_restart);
++static void gdm_reset_local_displays (void);
 +static void gdm_watch_for_security_tokens (void);
 +
  static void gdm_daemonify (void);
  static void gdm_safe_restart (void);
  static void gdm_try_logout_action (GdmDisplay *disp);
-@@ -150,7 +164,6 @@ static GMainLoop *main_loop = NULL;
+@@ -150,7 +157,6 @@ static GMainLoop *main_loop = NULL;
  
  static gboolean monte_carlo_sqrt2 = FALSE;
  
@@ -252,7 +200,7 @@
  /*
   * lookup display number if the display number is
   * exists then clear the remove flag and return TRUE
-@@ -1402,6 +1415,8 @@ main (int argc, char *argv[])
+@@ -1402,6 +1408,8 @@ main (int argc, char *argv[])
      /* Initialize runtime environment */
      umask (022);
  
@@ -261,84 +209,37 @@
      ctx = g_option_context_new (_("- The GNOME login manager"));
      g_option_context_add_main_entries (ctx, options, _("main options"));
  
-@@ -1639,6 +1654,9 @@ #endif  /* HAVE_LOGINDEVPERM */
+@@ -1639,6 +1647,8 @@ #endif  /* HAVE_LOGINDEVPERM */
  	gdm_xdmcp_run ();
      }
  
-+    gdm_reset_pam ();
 +    gdm_watch_for_security_tokens ();
 +
      /* We always exit via exit (), and sadly we need to g_main_quit ()
       * at times not knowing if it's this main or a recursive one we're
       * quitting.
-@@ -3429,4 +3447,147 @@ #endif
+@@ -3429,4 +3440,85 @@ #endif
  	}
  }
  
 +static void
-+gdm_handle_security_token_insertion (ScSecurityTokenMonitor *monitor,
-+				     ScSecurityToken        *token,
-+				     const gchar            *pam_stack)
++gdm_reset_local_displays (void)
 +{
 +    GSList *li;
 +
-+    gdm_debug ("notifying local displays about token insertion");
 +    for (li = displays; li != NULL; li = li->next) {
 +	    GdmDisplay *d = li->data;
 +
-+	    if (SERVER_IS_LOCAL (d)) {
-+		    gdm_debug ("notifying display '%s'", d->name);
-+
-+		    if (ve_string_empty (pam_stack))
-+			    pam_stack = (const gchar *) gdm_get_value_string (GDM_KEY_PAM_STACK);
-+		    gdm_set_value_string_per_display (d->name,
-+						      GDM_KEY_PAM_STACK,
-+						      (gchar *) pam_stack);
++	    if (d->attached)
 +		    send_slave_command (d, GDM_NOTIFY_RESET);
-+	    } else {
-+		    gdm_debug ("display '%s' is not local", d->name);
-+	    }
 +    }
 +}
 +
-+static void
-+gdm_reset_pam (void)
-+{
-+    GSList *li;
 +
-+    gdm_debug ("resetting pam stack of all local displays to default values");
-+    for (li = displays; li != NULL; li = li->next) {
-+	    GdmDisplay *d = li->data;
 +
-+	    if (SERVER_IS_LOCAL (d)) {
-+		    gchar *pam_stack;
-+		    pam_stack = gdm_get_value_string (GDM_KEY_PAM_STACK);
-+		    gdm_debug ("setting pam stack to '%s'", pam_stack);
-+		    gdm_set_value_string_per_display (d->name,
-+						      GDM_KEY_PAM_STACK,
-+						      pam_stack);
-+		    send_slave_command (d, GDM_NOTIFY_RESET);
 +
-+	    } else {
-+		    gdm_debug ("display '%s' is not local", d->name);
-+	    }
-+    }
-+}
 +
-+static void
-+gdm_handle_security_token_removal (ScSecurityTokenMonitor *monitor,
-+				   ScSecurityToken        *token,
-+				   gboolean                should_restart)
-+{
-+    /* FIXME: should only kill the session associated with the token
-+     */
-+    if (should_restart) {
-+	    gdm_restart_now ();
-+    } else {
-+	    gdm_debug ("notifying local displays about token removal");
-+	    gdm_reset_pam ();
-+    }
-+}
++
 +
 +#ifndef GDM_SECURITY_TOKENS_CONF
 +#define GDM_SECURITY_TOKENS_CONF GDMCONFDIR "/securitytokens.conf"
@@ -352,21 +253,12 @@
 +#define GDM_SECURITY_TOKENS_KEY_DRIVER "SecurityTokens/Driver"
 +#endif
 +
-+#ifndef GDM_SECURITY_TOKENS_KEY_PAM_STACK
-+#define GDM_SECURITY_TOKENS_KEY_PAM_STACK "SecurityTokens/PamStack=gdm-securitytokens" 
-+#endif
-+
-+#ifndef GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE
-+#define GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE "SecurityTokens/KillSessionOnRemove=false"
-+#endif
-+
 +static void
 +gdm_watch_for_security_tokens (void)
 +{
 +    GError *error;
 +    ScSecurityTokenMonitor *monitor;
-+    gchar *driver, *pam_stack;
-+    gboolean should_restart;
++    gchar *driver;
 +    VeConfig *cfg;
 +
 +    cfg = ve_config_new (GDM_SECURITY_TOKENS_CONF);
@@ -384,22 +276,15 @@
 +    monitor = sc_security_token_monitor_new (driver);
 +    g_free (driver);
 +    
-+    pam_stack = ve_config_get_string (cfg, GDM_SECURITY_TOKENS_KEY_PAM_STACK);
-+
-+    gdm_debug ("security tokens pam stack is set to '%s'", 
-+	       ve_string_empty (pam_stack)? "<default>" : pam_stack);
 +    g_signal_connect (monitor,
 +		      "security-token-inserted",
-+		      G_CALLBACK (gdm_handle_security_token_insertion), 
-+		      pam_stack);
-+    g_object_weak_ref (G_OBJECT (monitor), (GWeakNotify) g_free, pam_stack);
++		      G_CALLBACK (gdm_reset_local_displays), 
++		      NULL);
 +
-+    should_restart = ve_config_get_bool (cfg,
-+					 GDM_SECURITY_TOKENS_KEY_KILL_SESSION_ON_REMOVE);
 +    g_signal_connect (monitor,
 +		      "security-token-removed",
-+		      G_CALLBACK (gdm_handle_security_token_removal), 
-+		      GINT_TO_POINTER (should_restart));
++		      G_CALLBACK (gdm_reset_local_displays), 
++		      NULL);
 +
 +    error = NULL;
 +    if (!sc_security_token_monitor_start (monitor, &error)) {
@@ -419,54 +304,6 @@
 +    ve_config_destroy (cfg);
 +}
  /* EOF */
---- gdm-2.15.6/daemon/gdmconfig.c
-+++ gdm-2.15.6/daemon/gdmconfig.c
-@@ -1432,6 +1432,32 @@ gdm_set_value (VeConfig *cfg, GdmConfigT
-    return FALSE;
- }
- 
-+
-+/**
-+ * gdm_set_value_string_per_display
-+ *
-+ * Writes a value to the per display config file
-+ *
-+ * FIXME: doesn't do validation, error handling,
-+ * caching, notification or support more than just 
-+ * raw values
-+ */
-+void
-+gdm_set_value_string_per_display (gchar *display,
-+				  gchar *key,
-+				  gchar *value)
-+{
-+    gchar *file;
-+    VeConfig *cfg;
-+
-+    file = gdm_get_per_display_custom_config_file (display);
-+    cfg = ve_config_new (file);
-+    g_free (file);
-+    ve_config_set_string (cfg, key, value);
-+    ve_config_save (cfg, TRUE);
-+    ve_config_destroy (cfg);
-+}
-+
- /**
-  * gdm_find_xserver
-  *
---- gdm-2.15.6/daemon/gdmconfig.h
-+++ gdm-2.15.6/daemon/gdmconfig.h
-@@ -41,6 +41,9 @@ void           gdm_set_value_bool       
-                                          gboolean value);
- void           gdm_set_value_int        (gchar *key,
-                                          gint value);
-+void           gdm_set_value_string_per_display (gchar *display,
-+						 gchar *key,
-+                                                 gchar *value);
- void           gdm_config_key_to_string_per_display
-                                         (gchar *file,
-                                          gchar *key,
-new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytoken.c
 @@ -0,0 +1,602 @@
@@ -1072,7 +909,6 @@
 +    return 0;
 +}
 +#endif
-new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytoken.h
 @@ -0,0 +1,101 @@
@@ -1177,7 +1013,6 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
-new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytokenmonitor.c
 @@ -0,0 +1,840 @@
@@ -2021,7 +1856,6 @@
 +    return 0;
 +}
 +#endif
-new file mode 100644
 --- /dev/null
 +++ gdm-2.15.6/daemon/securitytokenmonitor.h
 @@ -0,0 +1,81 @@
@@ -2125,12 +1959,3 @@
  /*
   * audit_success_login - audit successful login
   *
-@@ -847,6 +848,8 @@ authenticate_again:
-      */
-     pam_stack = gdm_get_value_string_per_display (display, GDM_KEY_PAM_STACK);
- 
-+    gdm_debug ("using pam stack '%s'", pam_stack);
-+
-     if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
- 	    if (started_timer)
- 		    gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, "");

gdm-2.15.6-session-keyring.patch:
 gdm           |    1 +
 gdm-autologin |    1 +
 2 files changed, 2 insertions(+)

Index: gdm-2.15.6-session-keyring.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-session-keyring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.15.6-session-keyring.patch	18 Jul 2006 13:36:00 -0000	1.1
+++ gdm-2.15.6-session-keyring.patch	22 Jul 2006 04:13:19 -0000	1.2
@@ -8,16 +8,6 @@
  session    include     system-auth
  session    required    pam_loginuid.so
  session    optional    pam_console.so
---- gdm-2.15.6/config/gdm-securitytokens.session-keyring	2006-07-18 09:32:39.000000000 +0200
-+++ gdm-2.15.6/config/gdm-securitytokens	2006-07-18 09:32:39.000000000 +0200
-@@ -5,6 +5,7 @@ auth       required     pam_deny.so
- account    required     pam_nologin.so
- account    include      system-auth
- password   include      system-auth
-+session    optional     pam_keyinit.so force revoke
- session    include      system-auth
- session    required     pam_loginuid.so
- session    optional     pam_console.so
 --- gdm-2.15.6/config/gdm.session-keyring	2006-07-18 09:32:39.000000000 +0200
 +++ gdm-2.15.6/config/gdm	2006-07-18 09:33:27.000000000 +0200
 @@ -4,6 +4,7 @@ auth       include     system-auth


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gdm.spec	21 Jul 2006 19:24:27 -0000	1.184
+++ gdm.spec	22 Jul 2006 04:13:19 -0000	1.185
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.15.6
-Release: 12
+Release: 13
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -307,7 +307,6 @@
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdmsetup
 %config %{_sysconfdir}/pam.d/gdm-autologin
-%config %{_sysconfdir}/pam.d/gdm-securitytokens
 %config %{_sysconfdir}/security/console.apps/gdmsetup
 #%config %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/gdm/Init
@@ -331,6 +330,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-13
+- simply all the security token code by only using one pam stack
+- drop lame kill on token removal feature
+
 * Fri Jul 21 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.6-12
 - move authcookies out of home directories to prevent problems
   on nfs/afs mounted home directories (bug 178233).



From fedora-cvs-commits at redhat.com  Sat Jul 22 04:21:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 00:21:11 -0400
Subject: rpms/control-center/devel control-center-2.15.4-finish.patch, NONE,
	1.1 control-center.spec, 1.156, 1.157
Message-ID: <200607220421.k6M4LBhR001487@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv634

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.4-finish.patch 
Log Message:
fix background capplet close button


control-center-2.15.4-finish.patch:
 gnome-background-properties.glade |   66 +-------------------------------------
 1 files changed, 2 insertions(+), 64 deletions(-)

--- NEW FILE control-center-2.15.4-finish.patch ---
--- control-center-2.15.4/capplets/background/gnome-background-properties.glade.finish	2006-07-22 00:17:25.000000000 -0400
+++ control-center-2.15.4/capplets/background/gnome-background-properties.glade	2006-07-22 00:20:08.000000000 -0400
@@ -52,73 +52,11 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment1">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox6">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image1">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-apply</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label10">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Finish</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
 	    </widget>
 	  </child>
 	</widget>


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- control-center.spec	19 Jul 2006 15:22:57 -0000	1.156
+++ control-center.spec	22 Jul 2006 04:21:04 -0000	1.157
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 4 
+Release: 5 
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -36,6 +36,8 @@
 Patch7: control-center-2.14.2-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
 Patch9: control-center-2.15.4-add-dbus-flags.patch
+# Dobey being unreasonable again
+Patch10: control-center-2.15.4-finish.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -130,6 +132,7 @@
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
 %patch9 -p1 -b .add-dbus-flags
+%patch10 -p1 -b .finish
 
 %build
 
@@ -248,6 +251,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-5
+- Fix the close button of the background capplet
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-4
 - Add patch to use the dbus cflags and libs instead of relying on hal
   flags to populate them



From fedora-cvs-commits at redhat.com  Sat Jul 22 04:36:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 00:36:00 -0400
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.55,1.56
Message-ID: <200607220436.k6M4a0IR026096@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17451

Modified Files:
	bug-buddy.spec 
Log Message:
hide from menus



Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- bug-buddy.spec	12 Jul 2006 05:29:29 -0000	1.55
+++ bug-buddy.spec	22 Jul 2006 04:35:53 -0000	1.56
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.15.0
-Release: 2.1
+Release: 3
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -62,6 +62,9 @@
 %configure --disable-scrollkeeper
 make
 
+# bug 197878
+echo "NoDisplay=true" >> src/bug-buddy.desktop
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,6 +112,10 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.0-3
+- Hide bug-buddy from the menus, since it is now strictly
+  a crash-reporting tool
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:2.15.0-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 06:30:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 02:30:16 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.158,
	1.159
Message-ID: <200607220630.k6M6UGwm016887@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-serv16778

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
- Remove hack-libgcj requirement.
- Work around gjdoc failure by not building javadocs.




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.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- java-1.4.2-gcj-compat.spec	21 Jul 2006 23:54:21 -0000	1.158
+++ java-1.4.2-gcj-compat.spec	22 Jul 2006 06:30:02 -0000	1.159
@@ -46,7 +46,6 @@
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
 BuildRequires:	eclipse-ecj
-BuildRequires:  hack-libgcj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	zip
@@ -235,22 +234,23 @@
 # build and install api documentation
 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
-  if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-  then
-    fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-    rm -rf gnu
-    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}/%{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}/%{name}-%{version}/package-list
-  fi
-popd
+# mkdir docsbuild
+# pushd docsbuild
+# # work around ppc64 file system corruption
+#   if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+#   then
+#     fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+#     rm -rf gnu
+#     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}/%{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}/%{name}-%{version}/package-list
+#   fi
+# popd
+touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
 
 %ifarch x86_64
 ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
@@ -623,6 +623,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
+- Remove hack-libgcj requirement.
+- Work around gjdoc failure by not building javadocs.
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
 - Require hack-libgcj for build. (dist-fc6-java)
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 06:31:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 02:31:47 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, 1.3,
	1.4 xorg-x11-server.spec, 1.126, 1.127
Message-ID: <200607220631.k6M6VlMc017033@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17001

Modified Files:
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 
	xorg-x11-server.spec 
Log Message:
* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com>
- Added "1152x864 @ 100.00" GTF mode to Red-Hat-extramodes patch (#49264)


xorg-x11-server-1.0.1-Red-Hat-extramodes.patch:
 extramodes |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 118 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	27 Jun 2006 22:15:12 -0000	1.3
+++ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch	22 Jul 2006 06:31:44 -0000	1.4
@@ -26,7 +26,7 @@
  
  # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
  Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-@@ -31,3 +40,107 @@
+@@ -31,3 +40,110 @@
  # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
  Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
  
@@ -54,6 +54,9 @@
 +# 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
 +
++# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
++Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -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
 +


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- xorg-x11-server.spec	21 Jul 2006 21:08:44 -0000	1.126
+++ xorg-x11-server.spec	22 Jul 2006 06:31:44 -0000	1.127
@@ -663,6 +663,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com>
+- Added "1152x864 @ 100.00" GTF mode to Red-Hat-extramodes patch (#49264)
+
 * Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-7.fc6
 - Only ship pcitweak manpage if we are building it (#199653)
 - Fix dist tag usage (Was {dist}, should be {?dist})



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:21:16 -0400
Subject: rpms/bsf/devel bsf.spec,1.12,1.13
Message-ID: <200607220821.k6M8LG2R027365@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27287

Modified Files:
	bsf.spec 
Log Message:
Rebuilt


Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bsf.spec	21 Jul 2006 20:38:01 -0000	1.12
+++ bsf.spec	22 Jul 2006 08:21:13 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:		bsf
 Version:	2.3.0
-Release:	10jpp_2fc
+Release:	10jpp_3fc
 Epoch:		0
 Summary:        Bean Scripting Framework
 License:        Apache License
@@ -175,6 +175,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:2.3.0-10jpp_2fc
+- Rebuilt
+
 * Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> 0:2.3.0-10jpp_2fc
 - Removing vendor and distribution tags.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:34:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:34:45 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.10,1.11
Message-ID: <200607220834.k6M8Yjon031563@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31538

Modified Files:
	adaptx.spec 
Log Message:
Rebuilt


Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- adaptx.spec	19 Jul 2006 18:27:43 -0000	1.10
+++ adaptx.spec	22 Jul 2006 08:34:30 -0000	1.11
@@ -36,7 +36,7 @@
 
 Name:		adaptx
 Version:	0.9.13
-Release:	2jpp_1fc
+Release:	2jpp_2fc
 Epoch:		0
 Summary:	AdaptX
 License:	Exolab Software License
@@ -159,6 +159,9 @@
 %doc build/doc/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9.13-2jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-2jpp_1fc
 - Add conditional native compiling.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:35:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:35:08 -0400
Subject: rpms/ant/devel ant.spec,1.74,1.75
Message-ID: <200607220835.k6M8Z8Uc031663@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31638

Modified Files:
	ant.spec 
Log Message:
Rebuilt


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ant.spec	12 Jul 2006 05:09:42 -0000	1.74
+++ ant.spec	22 Jul 2006 08:34:54 -0000	1.75
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_10fc
+Release: 	%{jpprelease}_11fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -755,6 +755,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.5-1jpp_11fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_10fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:35:17 -0400
Subject: rpms/antlr/devel antlr.spec,1.23,1.24
Message-ID: <200607220835.k6M8ZH3l031801@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31776

Modified Files:
	antlr.spec 
Log Message:
Rebuilt


Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- antlr.spec	21 Jul 2006 23:28:27 -0000	1.23
+++ antlr.spec	22 Jul 2006 08:35:15 -0000	1.24
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        3jpp_3fc
+Release:        3jpp_4fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -61,7 +61,6 @@
 %endif
 BuildRequires:  ant
 BuildRequires:  %{__perl}, java-javadoc
-BuildRequires:  hack-libgcj
 Requires:       jpackage-utils
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -281,6 +280,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.6-3jpp_4fc
+- Remove hack-libgcj requirement.
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_3fc
 - Stub docs. (dist-fc6-java)
 - Require hack-libgcj for build. (dist-fc6-java)



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:35:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:35:27 -0400
Subject: rpms/avalon-framework/devel avalon-framework.spec,1.18,1.19
Message-ID: <200607220835.k6M8ZRTY031892@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/avalon-framework/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31866

Modified Files:
	avalon-framework.spec 
Log Message:
Rebuilt


Index: avalon-framework.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-framework/devel/avalon-framework.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- avalon-framework.spec	19 Jul 2006 19:40:44 -0000	1.18
+++ avalon-framework.spec	22 Jul 2006 08:35:25 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:		avalon-%{short_name}
 Version:	4.1.4
-Release:	2jpp_11fc
+Release:	2jpp_12fc
 Epoch:		0
 Summary:	Java components interfaces
 License:	Apache Software License
@@ -128,6 +128,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.1.4-2jpp_12fc
+- Rebuilt
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:4.1.4-2jpp_11fc
 - Removed separate definition of name, version and release.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:35:47 -0400
Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.21,1.22
Message-ID: <200607220835.k6M8ZlVk031977@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/avalon-logkit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31952

Modified Files:
	avalon-logkit.spec 
Log Message:
Rebuilt


Index: avalon-logkit.spec
===================================================================
RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- avalon-logkit.spec	19 Jul 2006 20:44:32 -0000	1.21
+++ avalon-logkit.spec	22 Jul 2006 08:35:45 -0000	1.22
@@ -38,7 +38,7 @@
 
 Name:		avalon-%{short_name}
 Version:	1.2
-Release:	4jpp_1fc
+Release:	4jpp_2fc
 Epoch:		0
 Summary:	Java logging toolkit
 License:	Apache Software License
@@ -155,6 +155,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2-4jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2-4jpp_1fc
 - Added conditional native compilation.
 - Removed name/release/version defines as applicable.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:35:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:35:54 -0400
Subject: rpms/axis/devel axis.spec,1.19,1.20
Message-ID: <200607220835.k6M8ZsTM032060@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/axis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32036

Modified Files:
	axis.spec 
Log Message:
Rebuilt


Index: axis.spec
===================================================================
RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- axis.spec	19 Jul 2006 22:19:27 -0000	1.19
+++ axis.spec	22 Jul 2006 08:35:51 -0000	1.20
@@ -8,7 +8,7 @@
 
 Name:          axis
 Version:       1.2.1
-Release:       2jpp_4fc
+Release:       2jpp_5fc
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
@@ -210,6 +210,9 @@
 %doc docs/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.1-2jpp_5fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.1-2jpp_4fc
 - Added conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:36:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:36:09 -0400
Subject: rpms/bcel/devel bcel.spec,1.16,1.17
Message-ID: <200607220836.k6M8a9CT032125@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32105

Modified Files:
	bcel.spec 
Log Message:
Rebuilt


Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bcel.spec	12 Jul 2006 05:26:16 -0000	1.16
+++ bcel.spec	22 Jul 2006 08:36:07 -0000	1.17
@@ -1,6 +1,6 @@
 %define name    bcel
 %define version 5.1
-%define release 1jpp_7fc
+%define release 1jpp_8fc
 %define section free
 
 Name:           %{name}
@@ -112,6 +112,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:5.1-1jpp_8fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.1-1jpp_7fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:36:22 -0400
Subject: rpms/bsh/devel bsh.spec,1.8,1.9
Message-ID: <200607220836.k6M8aMA4032231@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/bsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32197

Modified Files:
	bsh.spec 
Log Message:
Rebuilt


Index: bsh.spec
===================================================================
RCS file: /cvs/dist/rpms/bsh/devel/bsh.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bsh.spec	21 Jul 2006 20:47:12 -0000	1.8
+++ bsh.spec	22 Jul 2006 08:36:19 -0000	1.9
@@ -36,7 +36,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        8jpp_2fc
+Release:        8jpp_3fc
 Epoch:		0
 Summary:        Lightweight Scripting for Java
 License:        LGPL
@@ -250,6 +250,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.3.0-8jpp_3fc
+- Rebuilt
+
 * Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> 0:1.3.0-8jpp_2fc
 - Removing vendor and distribution tags.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:36:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:36:35 -0400
Subject: rpms/castor/devel castor.spec,1.12,1.13
Message-ID: <200607220836.k6M8aZ2M032295@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/castor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32282

Modified Files:
	castor.spec 
Log Message:
Rebuilt


Index: castor.spec
===================================================================
RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- castor.spec	20 Jul 2006 21:58:59 -0000	1.12
+++ castor.spec	22 Jul 2006 08:36:32 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:        An open source data binding framework for Java
 Name:           castor
 Version:        0.9.5
-Release:        1jpp_5fc
+Release:        1jpp_6fc
 Epoch:          0
 Group:          Development/Libraries/Java
 License:        Exolab Software License
@@ -283,6 +283,9 @@
 %doc build/doc/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9.5-1jpp_6fc
+- Rebuilt
+
 * Thu Jul  20 2006 Deepak Bhole <dbhole at redhat.com> - 0:0.9.5-1jpp_5fc
 - Added conditional native compilation.
 - Added missing BR/R for log4j.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:36:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:36:41 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.16,1.17
Message-ID: <200607220836.k6M8af2g032370@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32343

Modified Files:
	classpathx-jaf.spec 
Log Message:
Rebuilt


Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- classpathx-jaf.spec	20 Jul 2006 09:17:42 -0000	1.16
+++ classpathx-jaf.spec	22 Jul 2006 08:36:39 -0000	1.17
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        7jpp_2fc
+Release:        7jpp_3fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.0-7jpp_3fc
+- Rebuilt
+
 * Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-7jpp_2fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:36:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:36:50 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.19,1.20
Message-ID: <200607220836.k6M8aoTO032473@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32441

Modified Files:
	classpathx-mail.spec 
Log Message:
Rebuilt


Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- classpathx-mail.spec	12 Jul 2006 04:50:22 -0000	1.19
+++ classpathx-mail.spec	22 Jul 2006 08:36:47 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           classpathx-mail
 Version:        1.0
-Release: 	4jpp_6fc
+Release: 	4jpp_7fc
 Epoch:          0
 Summary:        GNU JavaMail(tm)
 
@@ -154,7 +154,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-4jpp_7fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-4jpp_5fc



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:37:11 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.9,1.10
Message-ID: <200607220837.k6M8bB5e032569@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32543

Modified Files:
	concurrent.spec 
Log Message:
Rebuilt


Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- concurrent.spec	20 Jul 2006 21:22:53 -0000	1.9
+++ concurrent.spec	22 Jul 2006 08:37:08 -0000	1.10
@@ -36,7 +36,7 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_2fc
+Release:        3jpp_3fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -135,6 +135,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3.4-3jpp_3fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_2fc
 - Removed vendor and distribution tags
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:37:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:37:28 -0400
Subject: rpms/cryptix-asn1/devel cryptix-asn1.spec,1.5,1.6
Message-ID: <200607220837.k6M8bSun032650@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/cryptix-asn1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32628

Modified Files:
	cryptix-asn1.spec 
Log Message:
Rebuilt


Index: cryptix-asn1.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cryptix-asn1.spec	12 Jul 2006 04:54:13 -0000	1.5
+++ cryptix-asn1.spec	22 Jul 2006 08:37:26 -0000	1.6
@@ -2,12 +2,12 @@
 %define name		cryptix-asn1
 %define version		20011119
 %define snapshot	20011119
-%define release 4jpp_2fc.1.1
+%define release 4jpp_3fc
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1.1
+Release: %{release}
 Epoch:		0
 Summary:	Cryptix ASN1 implementation
 License:	BSD style
@@ -62,6 +62,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 20011119-4jpp_3fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:20011119-4jpp_2fc.1.1.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:37:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:37:50 -0400
Subject: rpms/cryptix/devel cryptix.spec,1.8,1.9
Message-ID: <200607220837.k6M8boWo032752@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/cryptix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32729

Modified Files:
	cryptix.spec 
Log Message:
Rebuilt


Index: cryptix.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cryptix.spec	19 Jul 2006 20:21:27 -0000	1.8
+++ cryptix.spec	22 Jul 2006 08:37:36 -0000	1.9
@@ -38,7 +38,7 @@
 
 Name:		cryptix
 Version:	3.2.0
-Release:	8jpp_1fc
+Release:	8jpp_2fc
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -131,6 +131,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-8jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Matt Weinge <mwringe at redhat.com> 3.2.0-8jpp_1rh
 - Merged with upstream verison.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:38:00 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.45,1.46
Message-ID: <200607220838.k6M8c0lU000353@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv331

Modified Files:
	eclipse-cdt.spec 
Log Message:
Rebuilt


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- eclipse-cdt.spec	21 Jul 2006 15:56:54 -0000	1.45
+++ eclipse-cdt.spec	22 Jul 2006 08:37:58 -0000	1.46
@@ -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
@@ -267,6 +267,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.1.0-1jpp_6fc
+- Rebuilt
+
 * Thu Jul 20 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_5fc
 - Split into main package and sdk sub-package.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:38:36 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.299,1.300
Message-ID: <200607220838.k6M8caZ5000440@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv404

Modified Files:
	eclipse.spec 
Log Message:
Rebuilt


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- eclipse.spec	20 Jul 2006 23:42:25 -0000	1.299
+++ eclipse.spec	22 Jul 2006 08:38:34 -0000	1.300
@@ -41,7 +41,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/
@@ -1634,6 +1634,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1jpp_6fc
+- Rebuilt
+
 * Thu Jul 20 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_5fc
 - New splash screen from Diana Fong (rh#199456).
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:38:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:38:46 -0400
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.17,1.18
Message-ID: <200607220838.k6M8ck1J000548@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv516

Modified Files:
	geronimo-specs.spec 
Log Message:
Rebuilt


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- geronimo-specs.spec	13 Jul 2006 21:01:42 -0000	1.17
+++ geronimo-specs.spec	22 Jul 2006 08:38:44 -0000	1.18
@@ -9,7 +9,7 @@
 
 Name:           geronimo-specs
 Version:        1.0
-Release: 	0.%{mstone}.2jpp_10fc
+Release: 	0.%{mstone}.2jpp_11fc
 Epoch:          0
 License:        Apache Software License 2
 Group:          Development/Libraries/Java
@@ -119,6 +119,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-0.M2.2jpp_11fc
+- Rebuilt
+
 * Thu Jul 13 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.M2.2jpp_10fc
 - Reenable s390 s390x ppc64 excluded due to eclipse
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:39:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:39:09 -0400
Subject: rpms/gjdoc/devel gjdoc.spec,1.39,1.40
Message-ID: <200607220839.k6M8d9dJ000660@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv629

Modified Files:
	gjdoc.spec 
Log Message:
Rebuilt


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gjdoc.spec	21 Jul 2006 23:41:54 -0000	1.39
+++ gjdoc.spec	22 Jul 2006 08:39:06 -0000	1.40
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 6
+Release: 7
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -14,7 +14,6 @@
 BuildPrereq: gcc-java >= 4.0.0-8
 BuildPrereq: antlr
 Requires: libgcj >= 4.0.0-8
-BuildRequires:  hack-libgcj
 
 %description
 A documentation generation system for "javadoc"-style comments.
@@ -54,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.7.7-7
+- Remove hack-libgcj requirement.
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.7.7-6
 - Require hack-libgcj for build. (dist-fc6-java)
 - Bump release number.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:39:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:39:24 -0400
Subject: rpms/gnu-crypto/devel gnu-crypto.spec,1.25,1.26
Message-ID: <200607220839.k6M8dOmE000731@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv711

Modified Files:
	gnu-crypto.spec 
Log Message:
Rebuilt


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnu-crypto.spec	12 Jul 2006 06:11:36 -0000	1.25
+++ gnu-crypto.spec	22 Jul 2006 08:39:21 -0000	1.26
@@ -2,7 +2,7 @@
 
 Name:           gnu-crypto
 Version:        2.1.0
-Release:        1jpp_3fc
+Release:        1jpp_4fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -143,7 +143,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.1.0-1jpp_4fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.1.0-1jpp_3fc
 - rebuild
 
 * Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:2.1.0-1jpp_2fc



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:39:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:39:38 -0400
Subject: rpms/gnu.getopt/devel gnu.getopt.spec,1.9,1.10
Message-ID: <200607220839.k6M8dcH8000843@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gnu.getopt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv818

Modified Files:
	gnu.getopt.spec 
Log Message:
Rebuilt


Index: gnu.getopt.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu.getopt/devel/gnu.getopt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnu.getopt.spec	12 Jul 2006 06:11:53 -0000	1.9
+++ gnu.getopt.spec	22 Jul 2006 08:39:36 -0000	1.10
@@ -1,6 +1,6 @@
 %define name		gnu.getopt
 %define version		1.0.9
-%define release 	4jpp_5fc
+%define release 	4jpp_6fc
 %define	section		free
 
 Name:		%{name}
@@ -76,6 +76,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0.9-4jpp_6fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.9-4jpp_5fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:39:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:39:53 -0400
Subject: rpms/hsqldb/devel hsqldb.spec,1.20,1.21
Message-ID: <200607220839.k6M8dr0I000915@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv903

Modified Files:
	hsqldb.spec 
Log Message:
Rebuilt


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hsqldb.spec	12 Jul 2006 06:22:44 -0000	1.20
+++ hsqldb.spec	22 Jul 2006 08:39:51 -0000	1.21
@@ -3,7 +3,7 @@
 %define name		hsqldb
 %define version		1.80.1
 %define cvs_version	1_8_0_1
-%define release 	1jpp_10fc
+%define release 	1jpp_11fc
 
 Name:		%{name}
 Version:	%{version}
@@ -212,6 +212,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.80.1-1jpp_11fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_10fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:39:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:39:59 -0400
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.37, 1.38
Message-ID: <200607220839.k6M8dxZb000990@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv967

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
Rebuilt


Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jakarta-commons-beanutils.spec	17 Jul 2006 20:38:10 -0000	1.37
+++ jakarta-commons-beanutils.spec	22 Jul 2006 08:39:57 -0000	1.38
@@ -39,7 +39,7 @@
 
 Name:		jakarta-commons-beanutils
 Version:	1.7.0
-Release:	4jpp_1fc
+Release:	4jpp_2fc
 Epoch:		0
 Summary:	Jakarta Commons BeanUtils Package
 License:	Apache Software License
@@ -151,6 +151,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.7.0-4jpp_2fc
+- Rebuilt
+
 * Fri Jul 14 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-4jpp_1fc
 - Merge with upstream
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:40:16 -0400
Subject: rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.11,
	1.12
Message-ID: <200607220840.k6M8eGbC001103@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-codec/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1089

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
Rebuilt


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-codec.spec	20 Jul 2006 21:18:26 -0000	1.11
+++ jakarta-commons-codec.spec	22 Jul 2006 08:40:13 -0000	1.12
@@ -38,7 +38,7 @@
 
 Name:           jakarta-commons-codec
 Version:        1.3
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Summary:        Jakarta Commons Codec Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -169,6 +169,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3-4jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.3-4jpp_1fc
 - Merged with upstream version
 - Now is natively compiled



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:40:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:40:33 -0400
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.42, 1.43
Message-ID: <200607220840.k6M8eXWw001207@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1177

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
Rebuilt


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- jakarta-commons-collections.spec	20 Jul 2006 07:53:01 -0000	1.42
+++ jakarta-commons-collections.spec	22 Jul 2006 08:40:30 -0000	1.43
@@ -44,7 +44,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	3.1
-Release:	5jpp_1fc
+Release:	5jpp_2fc
 Epoch:		0
 Summary:	Jakarta Commons Collections Package
 License:	Apache Software License v2
@@ -329,6 +329,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.1-5jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:3.1-5jpp-1fc
 - Resync with latest JPP version.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:40:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:40:58 -0400
Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.10,
	1.11
Message-ID: <200607220840.k6M8ewr6001358@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1333

Modified Files:
	jakarta-commons-daemon.spec 
Log Message:
Rebuilt


Index: jakarta-commons-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jakarta-commons-daemon.spec	19 Jul 2006 19:48:16 -0000	1.10
+++ jakarta-commons-daemon.spec	22 Jul 2006 08:40:56 -0000	1.11
@@ -40,7 +40,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.1
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:          1
 Summary:        Jakarta Commons Daemon Package
 License:        Apache Software License 2.0
@@ -186,6 +186,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0.1-4jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0.1-4jpp_1fc
 - Remove name/release/version defines as applicable.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:41:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:41:23 -0400
Subject: rpms/jakarta-commons-dbcp/devel jakarta-commons-dbcp.spec, 1.19,
	1.20
Message-ID: <200607220841.k6M8fNET001473@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-dbcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1443

Modified Files:
	jakarta-commons-dbcp.spec 
Log Message:
Rebuilt


Index: jakarta-commons-dbcp.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-dbcp/devel/jakarta-commons-dbcp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-commons-dbcp.spec	20 Jul 2006 23:56:49 -0000	1.19
+++ jakarta-commons-dbcp.spec	22 Jul 2006 08:41:20 -0000	1.20
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	5jpp_2fc
+Release:	5jpp_3fc
 Epoch:		0
 Summary:	Jakarta Commons DataBase Pooling Package
 License:	Apache Software License 2.0
@@ -283,6 +283,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.2.1-5jpp_3fc
+- Rebuilt
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> 0:1.2.1-5jpp_2fc
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:41:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:41:45 -0400
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.31, 1.32
Message-ID: <200607220841.k6M8fjer001565@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1541

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
Rebuilt


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jakarta-commons-digester.spec	19 Jul 2006 21:04:21 -0000	1.31
+++ jakarta-commons-digester.spec	22 Jul 2006 08:41:43 -0000	1.32
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
@@ -152,6 +152,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.7-4jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-4jpp_1fc
 - Merged with upstream version
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:41:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:41:59 -0400
Subject: rpms/jakarta-commons-discovery/devel jakarta-commons-discovery.spec,
	1.9, 1.10
Message-ID: <200607220841.k6M8fxMY001649@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-discovery/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1623

Modified Files:
	jakarta-commons-discovery.spec 
Log Message:
Rebuilt


Index: jakarta-commons-discovery.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-discovery/devel/jakarta-commons-discovery.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-discovery.spec	20 Jul 2006 22:20:12 -0000	1.9
+++ jakarta-commons-discovery.spec	22 Jul 2006 08:41:57 -0000	1.10
@@ -38,7 +38,7 @@
 Summary:        Jakarta Commons Discovery
 Name:           jakarta-commons-discovery
 Version:        0.3
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          1
 Group:          Development/Libraries/Java
 License:        Apache Software License
@@ -150,6 +150,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.3-3jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 1:0:3-3jpp_1fc
 - Merge with upstream version
 - Natively compile packages



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:21 -0400
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.32,1.33
Message-ID: <200607220842.k6M8gLVH001836@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1805

Modified Files:
	jakarta-commons-el.spec 
Log Message:
Rebuilt


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-commons-el.spec	12 Jul 2006 06:28:38 -0000	1.32
+++ jakarta-commons-el.spec	22 Jul 2006 08:42:19 -0000	1.33
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release:        5jpp_3fc
+Release:        5jpp_4fc
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -161,6 +161,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-5jpp_4fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-5jpp_3fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:28 -0400
Subject: rpms/jakarta-commons-fileupload/devel
	jakarta-commons-fileupload.spec, 1.19, 1.20
Message-ID: <200607220842.k6M8gSu0001927@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1893

Modified Files:
	jakarta-commons-fileupload.spec 
Log Message:
Rebuilt


Index: jakarta-commons-fileupload.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jakarta-commons-fileupload.spec	20 Jul 2006 22:18:57 -0000	1.19
+++ jakarta-commons-fileupload.spec	22 Jul 2006 08:42:25 -0000	1.20
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0
-Release:        5jpp_1fc
+Release:        5jpp_2fc
 Summary:        Jakarta Commons Fileupload Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -169,6 +169,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.0-5jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.0-5jpp_1fc
 - Added conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:34 -0400
Subject: rpms/jakarta-commons-httpclient/devel
	jakarta-commons-httpclient.spec, 1.14, 1.15
Message-ID: <200607220842.k6M8gYLW002015@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-httpclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1986

Modified Files:
	jakarta-commons-httpclient.spec 
Log Message:
Rebuilt


Index: jakarta-commons-httpclient.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/devel/jakarta-commons-httpclient.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jakarta-commons-httpclient.spec	20 Jul 2006 23:03:48 -0000	1.14
+++ jakarta-commons-httpclient.spec	22 Jul 2006 08:42:32 -0000	1.15
@@ -37,7 +37,7 @@
 
 Name:           jakarta-commons-httpclient
 Version:        3.0
-Release:        6jpp_1fc
+Release:        6jpp_2fc
 Epoch:          1
 Summary:        Jakarta Commons HTTPClient Package
 License:        Apache Software License
@@ -228,6 +228,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:3.0-6jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:3.0-6jpp_1fc
 - Added conditional native compilation.
 - Disable certain ssl related tests that are known to fail with libgcj.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:42 -0400
Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.17,
	1.18
Message-ID: <200607220842.k6M8ggkw002106@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-lang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2078

Modified Files:
	jakarta-commons-lang.spec 
Log Message:
Rebuilt


Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jakarta-commons-lang.spec	19 Jul 2006 19:52:16 -0000	1.17
+++ jakarta-commons-lang.spec	22 Jul 2006 08:42:39 -0000	1.18
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        2.1
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:          0
 Summary:        Jakarta Commons Lang Package
 License:        Apache Software License
@@ -162,6 +162,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.1-4jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.1-4jpp_1fc
 - Remove name/release/version defines as applicable.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:51 -0400
Subject: rpms/jakarta-commons-launcher/devel jakarta-commons-launcher.spec,
	1.12, 1.13
Message-ID: <200607220842.k6M8gpUZ002194@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-launcher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2167

Modified Files:
	jakarta-commons-launcher.spec 
Log Message:
Rebuilt


Index: jakarta-commons-launcher.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-launcher/devel/jakarta-commons-launcher.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-launcher.spec	20 Jul 2006 22:47:25 -0000	1.12
+++ jakarta-commons-launcher.spec	22 Jul 2006 08:42:49 -0000	1.13
@@ -39,7 +39,7 @@
 
 Name:           %{name}
 Version:        0.9
-Release:        5jpp_1fc
+Release:        5jpp_2fc
 Epoch:          0
 Summary:        The Launcher Component is designed to be a cross platform Java application launcher.
 License:        Apache Software License
@@ -153,6 +153,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9-5jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:0.9-5jpp_1fc
 - Merge with upstream version
 - Natively compile packages



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:42:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:42:57 -0400
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.33, 1.34
Message-ID: <200607220842.k6M8gvtg002274@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2251

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
Rebuilt


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jakarta-commons-logging.spec	19 Jul 2006 19:56:46 -0000	1.33
+++ jakarta-commons-logging.spec	22 Jul 2006 08:42:54 -0000	1.34
@@ -38,7 +38,7 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.0.4
-Release:        5jpp_1fc
+Release:        5jpp_2fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -178,6 +178,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.0.4-5jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.0.4-5jpp_1fc
 - Remove name/release/version defines as applicable.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:02 -0400
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.32, 1.33
Message-ID: <200607220843.k6M8h2Ca002359@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2330

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
Rebuilt


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jakarta-commons-modeler.spec	19 Jul 2006 22:15:00 -0000	1.32
+++ jakarta-commons-modeler.spec	22 Jul 2006 08:43:00 -0000	1.33
@@ -38,7 +38,7 @@
 
 Name:		jakarta-%{short_name}
 Version:	1.1
-Release:	7jpp_1fc
+Release:	7jpp_2fc
 Epoch:		0
 Summary:	Jakarta Commons Modeler Package
 License:	Apache Software License
@@ -159,6 +159,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-7jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-7jpp_1fc
 - Merged with upstream version
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:08 -0400
Subject: rpms/jakarta-commons-pool/devel jakarta-commons-pool.spec, 1.12,
	1.13
Message-ID: <200607220843.k6M8h8Bo002443@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-pool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2414

Modified Files:
	jakarta-commons-pool.spec 
Log Message:
Rebuilt


Index: jakarta-commons-pool.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-pool/devel/jakarta-commons-pool.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-pool.spec	20 Jul 2006 23:33:55 -0000	1.12
+++ jakarta-commons-pool.spec	22 Jul 2006 08:43:06 -0000	1.13
@@ -45,7 +45,7 @@
 
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	2jpp_1fc
+Release:	2jpp_2fc
 Epoch:		0
 Summary:	Jakarta Commons Pool Package
 License:	Apache Software License 2.0
@@ -216,6 +216,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:1.3-2jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 1:1.3-2jpp_1fc
 - Added conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:14 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.11, 1.12
Message-ID: <200607220843.k6M8hES8002527@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2499

Modified Files:
	jakarta-commons-validator.spec 
Log Message:
Rebuilt


Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jakarta-commons-validator.spec	12 Jul 2006 06:29:39 -0000	1.11
+++ jakarta-commons-validator.spec	22 Jul 2006 08:43:11 -0000	1.12
@@ -7,7 +7,7 @@
 Summary:        Jakarta Commons Validator
 Name:           %{name}
 Version:        1.1.4
-Release: 	1jpp_6fc
+Release: 	1jpp_7fc
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
@@ -143,6 +143,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1.4-1jpp_7fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1.4-1jpp_6fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:19 -0400
Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec,
	1.18, 1.19
Message-ID: <200607220843.k6M8hJAC002604@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2582

Modified Files:
	jakarta-taglibs-standard.spec 
Log Message:
Rebuilt


Index: jakarta-taglibs-standard.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jakarta-taglibs-standard.spec	20 Jul 2006 23:08:43 -0000	1.18
+++ jakarta-taglibs-standard.spec	22 Jul 2006 08:43:17 -0000	1.19
@@ -40,7 +40,7 @@
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        6jpp_1fc
+Release:        6jpp_2fc
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        Apache Software License
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1.1-6jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:1.1.1-6jpp_1fc
 - Merge with upstream version
 - Natively compile package



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:25 -0400
Subject: rpms/javacc/devel javacc.spec,1.18,1.19
Message-ID: <200607220843.k6M8hPml002689@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2660

Modified Files:
	javacc.spec 
Log Message:
Rebuilt


Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- javacc.spec	18 Jul 2006 19:23:32 -0000	1.18
+++ javacc.spec	22 Jul 2006 08:43:22 -0000	1.19
@@ -36,7 +36,7 @@
 
 Name:           javacc
 Version:        4.0
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -146,6 +146,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.0-3jpp_2fc
+- Rebuilt
+
 * Tue Jul 18 2006 Matthew Wringe <mwringe at redhat.com> - 0:4.0-3jpp_1fc
 - Merged with upstream version
 - Changed directory locations to rpm macros



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:30 -0400
Subject: rpms/java_cup/devel java_cup.spec,1.17,1.18
Message-ID: <200607220843.k6M8hUsA002769@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2747

Modified Files:
	java_cup.spec 
Log Message:
Rebuilt


Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- java_cup.spec	20 Jul 2006 08:45:25 -0000	1.17
+++ java_cup.spec	22 Jul 2006 08:43:28 -0000	1.18
@@ -37,7 +37,7 @@
 
 Name:		java_cup
 Version:	0.10
-Release:	0.k.5jpp_1fc
+Release:	0.k.5jpp_2fc
 Epoch:		1
 Summary:	Java source interpreter
 License:	BSD-style
@@ -153,6 +153,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 1:0.10-0.k.5jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Vivek Lakshmanan <vivekl at redhat.com> - 1:0.10-0.k.5jpp_1fc
 - Re-sync with latest version from JPP.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:36 -0400
Subject: rpms/jdepend/devel jdepend.spec,1.16,1.17
Message-ID: <200607220843.k6M8haQC002858@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jdepend/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2830

Modified Files:
	jdepend.spec 
Log Message:
Rebuilt


Index: jdepend.spec
===================================================================
RCS file: /cvs/dist/rpms/jdepend/devel/jdepend.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jdepend.spec	20 Jul 2006 23:24:55 -0000	1.16
+++ jdepend.spec	22 Jul 2006 08:43:34 -0000	1.17
@@ -36,7 +36,7 @@
 
 Name:		jdepend
 Version:	2.6
-Release:	5jpp_1fc
+Release:	5jpp_2fc
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
@@ -142,6 +142,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.6-5jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-5jpp_1fc
 - Merge with upstream version
 - Natively compile packages



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:42 -0400
Subject: rpms/jdom/devel jdom.spec,1.15,1.16
Message-ID: <200607220843.k6M8hgYA002941@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jdom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2914

Modified Files:
	jdom.spec 
Log Message:
Rebuilt


Index: jdom.spec
===================================================================
RCS file: /cvs/dist/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jdom.spec	12 Jul 2006 06:31:54 -0000	1.15
+++ jdom.spec	22 Jul 2006 08:43:40 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           jdom
 Version:        1.0
-Release:        1jpp_6fc
+Release:        1jpp_7fc
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        Apache Software License-like
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-1jpp_7fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-1jpp_6fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:48 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.10,1.11
Message-ID: <200607220843.k6M8hmaR003020@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2999

Modified Files:
	jgroups.spec 
Log Message:
Rebuilt


Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jgroups.spec	12 Jul 2006 17:33:55 -0000	1.10
+++ jgroups.spec	22 Jul 2006 08:43:46 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		jgroups
 Version:	2.2.6
-Release: 	1jpp_6fc
+Release: 	1jpp_7fc
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -104,6 +104,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.2.6-1jpp_7fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.2.6-1jpp_6fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:54 -0400
Subject: rpms/jlex/devel jlex.spec,1.11,1.12
Message-ID: <200607220843.k6M8hsXY003106@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jlex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3073

Modified Files:
	jlex.spec 
Log Message:
Rebuilt


Index: jlex.spec
===================================================================
RCS file: /cvs/dist/rpms/jlex/devel/jlex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jlex.spec	19 Jul 2006 19:53:48 -0000	1.11
+++ jlex.spec	22 Jul 2006 08:43:51 -0000	1.12
@@ -36,7 +36,7 @@
 
 Name:           jlex
 Version:        1.2.6
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:		0
 Summary:        A Lexical Analyzer Generator for Java
 License:        Free
@@ -122,6 +122,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.6-4jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.6-4jpp_1fc
 - Conditional native compilation for GCJ.
 - Remove clean up of build root in prep section.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:43:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:43:59 -0400
Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.28,1.29
Message-ID: <200607220843.k6M8hx5V003184@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3159

Modified Files:
	jpackage-utils.spec 
Log Message:
Rebuilt


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jpackage-utils.spec	21 Jul 2006 08:39:20 -0000	1.28
+++ jpackage-utils.spec	22 Jul 2006 08:43:57 -0000	1.29
@@ -5,7 +5,7 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp_4rh
+Release:        1jpp_5rh
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -208,6 +208,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.6-1jpp_5rh
+- Rebuilt
+
 * Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_4rh
 - Enable GCJ support in macros.jpackage.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:05 -0400
Subject: rpms/jrefactory/devel jrefactory.spec,1.10,1.11
Message-ID: <200607220844.k6M8i5UJ003273@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jrefactory/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3245

Modified Files:
	jrefactory.spec 
Log Message:
Rebuilt


Index: jrefactory.spec
===================================================================
RCS file: /cvs/dist/rpms/jrefactory/devel/jrefactory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jrefactory.spec	21 Jul 2006 00:18:43 -0000	1.10
+++ jrefactory.spec	22 Jul 2006 08:44:03 -0000	1.11
@@ -36,7 +36,7 @@
 
 Name:		jrefactory
 Version:	2.8.9
-Release:	6jpp_1fc
+Release:	6jpp_2fc
 Epoch:		0
 Summary:	JRefactory and Pretty Print
 License:	Apache Software License
@@ -119,6 +119,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.8.9-6jpp_2fc
+- Rebuilt
+
 * Thu Jul 20 2006 Deepak Bhole <dbhole at redhat.com> - 0:2.8.9-6jpp_1fc
 - Added conditional native compilation.
 - From gbenson at redhat:



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:12 -0400
Subject: rpms/jsch/devel jsch.spec,1.16,1.17
Message-ID: <200607220844.k6M8iCHd003360@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jsch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3332

Modified Files:
	jsch.spec 
Log Message:
Rebuilt


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jsch.spec	12 Jul 2006 06:35:23 -0000	1.16
+++ jsch.spec	22 Jul 2006 08:44:10 -0000	1.17
@@ -3,7 +3,7 @@
 
 Name:           jsch
 Version:        0.1.28
-Release:        1jpp_2fc
+Release:        1jpp_3fc
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.1.28-1jpp_3fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.28-1jpp_2fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:18 -0400
Subject: rpms/junit/devel junit.spec,1.17,1.18
Message-ID: <200607220844.k6M8iICH003443@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/junit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3420

Modified Files:
	junit.spec 
Log Message:
Rebuilt


Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- junit.spec	12 Jul 2006 06:35:33 -0000	1.17
+++ junit.spec	22 Jul 2006 08:44:16 -0000	1.18
@@ -1,6 +1,6 @@
 %define	name		junit
 %define	version		3.8.1
-%define release 	3jpp_8fc
+%define release 	3jpp_9fc
 %define	section		free
 
 Name:		%{name}
@@ -106,6 +106,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.8.1-3jpp_9fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.8.1-3jpp_8fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:24 -0400
Subject: rpms/jzlib/devel jzlib.spec,1.6,1.7
Message-ID: <200607220844.k6M8iOBf003527@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3499

Modified Files:
	jzlib.spec 
Log Message:
Rebuilt


Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jzlib.spec	12 Jul 2006 06:35:54 -0000	1.6
+++ jzlib.spec	22 Jul 2006 08:44:22 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           jzlib
 Version:        1.0.5
-Release: 2jpp_3fc
+Release: 2jpp_4fc
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
@@ -96,6 +96,9 @@
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0.5-2jpp_4fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.5-2jpp_3fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:30 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.9,1.10
Message-ID: <200607220844.k6M8iUcC003606@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3582

Modified Files:
	ldapjdk.spec 
Log Message:
Rebuilt


Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ldapjdk.spec	19 Jul 2006 13:42:21 -0000	1.9
+++ ldapjdk.spec	22 Jul 2006 08:44:27 -0000	1.10
@@ -6,7 +6,7 @@
 
 Name:		ldapjdk
 Version:	4.17
-Release: 	1jpp_4fc
+Release: 	1jpp_5fc
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -136,6 +136,9 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.17-1jpp_5fc
+- Rebuilt
+
 * Wed Jul 19 2006 Jesse Keating <jkeating at redhat.com> - 0:4.17-1jpp_4fc
 - fix release
 - remove silly name, version, release defines.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:36 -0400
Subject: rpms/log4j/devel log4j.spec,1.18,1.19
Message-ID: <200607220844.k6M8iaEs003696@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/log4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3667

Modified Files:
	log4j.spec 
Log Message:
Rebuilt


Index: log4j.spec
===================================================================
RCS file: /cvs/dist/rpms/log4j/devel/log4j.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- log4j.spec	21 Jul 2006 22:26:48 -0000	1.18
+++ log4j.spec	22 Jul 2006 08:44:34 -0000	1.19
@@ -36,7 +36,7 @@
 
 Name:           log4j
 Version:        1.2.13
-Release:        2jpp_1fc
+Release:        2jpp_2fc
 Epoch:          0
 Summary:        Java logging package
 License:        Apache Software License
@@ -267,6 +267,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.13-2jpp_2fc
+- Rebuilt
+
 * Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.2.13-2jpp_1fc
 - Merge spec and patches with latest from JPP.
 - Clean source tar ball off prebuilt jars and classes.



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:42 -0400
Subject: rpms/lucene/devel lucene.spec,1.18,1.19
Message-ID: <200607220844.k6M8ig7v003783@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/lucene/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3752

Modified Files:
	lucene.spec 
Log Message:
Rebuilt


Index: lucene.spec
===================================================================
RCS file: /cvs/dist/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lucene.spec	12 Jul 2006 07:15:18 -0000	1.18
+++ lucene.spec	22 Jul 2006 08:44:40 -0000	1.19
@@ -4,7 +4,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        1.4.3
-Release:	1jpp_12fc
+Release:	1jpp_13fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://jakarta.apache.org/lucene/
@@ -168,6 +168,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.4.3-1jpp_13fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.3-1jpp_12fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:49 -0400
Subject: rpms/mockobjects/devel mockobjects.spec,1.11,1.12
Message-ID: <200607220844.k6M8inRh003868@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/mockobjects/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3846

Modified Files:
	mockobjects.spec 
Log Message:
Rebuilt


Index: mockobjects.spec
===================================================================
RCS file: /cvs/dist/rpms/mockobjects/devel/mockobjects.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mockobjects.spec	21 Jul 2006 20:18:32 -0000	1.11
+++ mockobjects.spec	22 Jul 2006 08:44:46 -0000	1.12
@@ -38,7 +38,7 @@
 
 Name:		mockobjects
 Version:	0.09
-Release:	14jpp_1fc
+Release:	14jpp_2fc
 Epoch:		0
 Summary:	Java MockObjects package
 License:	BSD Style
@@ -457,6 +457,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.09-14jpp_2fc
+- Rebuilt
+
 * Fri Jul 21 2006 Matt Wringe <mwringe at redhat.com> 0.09-14jpp_1fc
 - Merge with upstream version
 - Natively compile packages



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:44:56 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.48,1.49
Message-ID: <200607220844.k6M8iu0B003954@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3929

Modified Files:
	mx4j.spec 
Log Message:
Rebuilt


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mx4j.spec	19 Jul 2006 19:47:09 -0000	1.48
+++ mx4j.spec	22 Jul 2006 08:44:54 -0000	1.49
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_2fc
+Release:        4jpp_3fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -261,6 +261,9 @@
 %doc dist/docs/*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.0.1-4jpp_3fc
+- Rebuilt
+
 * Wed Jul 19 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp_2fc
 - Add x86_64 to the build
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:01 -0400
Subject: rpms/oro/devel oro.spec,1.11,1.12
Message-ID: <200607220845.k6M8j1d3004036@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/oro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4007

Modified Files:
	oro.spec 
Log Message:
Rebuilt


Index: oro.spec
===================================================================
RCS file: /cvs/dist/rpms/oro/devel/oro.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- oro.spec	12 Jul 2006 07:36:56 -0000	1.11
+++ oro.spec	22 Jul 2006 08:44:59 -0000	1.12
@@ -1,7 +1,7 @@
 %define name		oro
 %define full_name	jakarta-%{name}
 %define version		2.0.8
-%define release 	1jpp_5fc
+%define release 	1jpp_6fc
 %define section		free
 
 Name:           %{name}
@@ -71,6 +71,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.0.8-1jpp_6fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.8-1jpp_5fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:10 -0400
Subject: rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.4,1.5
Message-ID: <200607220845.k6M8jAM9004141@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/postgresql-jdbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4115

Modified Files:
	postgresql-jdbc.spec 
Log Message:
Rebuilt


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- postgresql-jdbc.spec	12 Jul 2006 07:52:10 -0000	1.4
+++ postgresql-jdbc.spec	22 Jul 2006 08:45:07 -0000	1.5
@@ -5,7 +5,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.1.407
-Release:	1jpp.1
+Release:	1jpp.2
 Epoch:		0
 License:	BSD
 Group:		Applications/Databases
@@ -99,6 +99,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 8.1.407-1jpp.2
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:8.1.407-1jpp.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:16 -0400
Subject: rpms/puretls/devel puretls.spec,1.10,1.11
Message-ID: <200607220845.k6M8jGui004228@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4197

Modified Files:
	puretls.spec 
Log Message:
Rebuilt


Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- puretls.spec	12 Jul 2006 17:36:51 -0000	1.10
+++ puretls.spec	22 Jul 2006 08:45:13 -0000	1.11
@@ -1,7 +1,7 @@
 %define name		puretls
 %define rversion	0.9
 %define beta		b4
-%define release 	0.%{beta}.1jpp_5fc
+%define release 	0.%{beta}.1jpp_6fc
 %define section		free
 
 Name:		%{name}
@@ -124,6 +124,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.9-0.b4.1jpp_6fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-0.b4.1jpp_5fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:23 -0400
Subject: rpms/regexp/devel regexp.spec,1.31,1.32
Message-ID: <200607220845.k6M8jNL3004314@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4291

Modified Files:
	regexp.spec 
Log Message:
Rebuilt


Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- regexp.spec	12 Jul 2006 07:58:33 -0000	1.31
+++ regexp.spec	22 Jul 2006 08:45:21 -0000	1.32
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release 	2jpp_8fc
+%define release 	2jpp_9fc
 %define section		free
 
 Name:           %{name}
@@ -95,6 +95,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3-2jpp_9fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_8fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:34 -0400
Subject: rpms/struts/devel struts.spec,1.33,1.34
Message-ID: <200607220845.k6M8jYMP004419@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4392

Modified Files:
	struts.spec 
Log Message:
Rebuilt


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- struts.spec	12 Jul 2006 08:19:03 -0000	1.33
+++ struts.spec	22 Jul 2006 08:45:32 -0000	1.34
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.8
-%define release 	2jpp_13fc
+%define release 	2jpp_14fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -213,6 +213,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.8-2jpp_14fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.8-2jpp_13fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:43 -0400
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.19,1.20
Message-ID: <200607220845.k6M8jhYe004935@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4744

Modified Files:
	tanukiwrapper.spec 
Log Message:
Rebuilt


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tanukiwrapper.spec	12 Jul 2006 08:25:25 -0000	1.19
+++ tanukiwrapper.spec	22 Jul 2006 08:45:40 -0000	1.20
@@ -1,6 +1,6 @@
 %define name		tanukiwrapper
 %define version		3.1.1
-%define release 	4jpp_8fc
+%define release 	4jpp_9fc
 %define section		devel
 
 Summary:	Java Service Wrapper
@@ -153,6 +153,9 @@
 %{_datadir}/%{name}-%{version}/test
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.1.1-4jpp_9fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_8fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:45:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:45:49 -0400
Subject: rpms/tomcat5/devel tomcat5.spec,1.88,1.89
Message-ID: <200607220845.k6M8jnQv005443@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5282

Modified Files:
	tomcat5.spec 
Log Message:
Rebuilt


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- tomcat5.spec	14 Jul 2006 04:00:06 -0000	1.88
+++ tomcat5.spec	22 Jul 2006 08:45:47 -0000	1.89
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_3fc
+Release: 3jpp_4fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1209,6 +1209,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:5.5.17-3jpp_4fc
+- Rebuilt
+
 * Thu Jul 13 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_3fc
 - Rebuild in full
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:00 -0400
Subject: rpms/velocity/devel velocity.spec,1.16,1.17
Message-ID: <200607220846.k6M8k0lm006151@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5862

Modified Files:
	velocity.spec 
Log Message:
Rebuilt


Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- velocity.spec	18 Jul 2006 19:48:59 -0000	1.16
+++ velocity.spec	22 Jul 2006 08:45:57 -0000	1.17
@@ -5,7 +5,7 @@
 
 Name:           velocity
 Version:        %{my_version}
-Release: 	3jpp_7fc
+Release: 	3jpp_8fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -173,6 +173,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.4-3jpp_8fc
+- Rebuilt
+
 * Tue Jul 18 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.4-3jpp_7fc
 - Build on all archs.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:06 -0400
Subject: rpms/werken.xpath/devel werken.xpath.spec,1.19,1.20
Message-ID: <200607220846.k6M8k648006705@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/werken.xpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6536

Modified Files:
	werken.xpath.spec 
Log Message:
Rebuilt


Index: werken.xpath.spec
===================================================================
RCS file: /cvs/dist/rpms/werken.xpath/devel/werken.xpath.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- werken.xpath.spec	12 Jul 2006 08:47:37 -0000	1.19
+++ werken.xpath.spec	22 Jul 2006 08:46:04 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           werken.xpath
 Version:        0.9.4
-Release: 	0.beta.9jpp_4fc
+Release: 	0.beta.9jpp_5fc
 Epoch:          0
 Summary:        XPath implementation using JDOM
 License:        Apache Software License-like
@@ -100,6 +100,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9.4-0.beta.9jpp_5fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:0.9.4-0.beta.9jpp_4fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:11 -0400
Subject: rpms/wsdl4j/devel wsdl4j.spec,1.12,1.13
Message-ID: <200607220846.k6M8kBVF007169@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/wsdl4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6980

Modified Files:
	wsdl4j.spec 
Log Message:
Rebuilt


Index: wsdl4j.spec
===================================================================
RCS file: /cvs/dist/rpms/wsdl4j/devel/wsdl4j.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wsdl4j.spec	19 Jul 2006 20:05:27 -0000	1.12
+++ wsdl4j.spec	22 Jul 2006 08:46:09 -0000	1.13
@@ -39,7 +39,7 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.5.2
-Release:        3jpp_1jpp
+Release:        3jpp_2jpp
 Epoch:          0
 Group:          Text Processing/Markup/XML
 License:        IBM Common Public License
@@ -150,6 +150,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.5.2-3jpp_2fc
+- Rebuilt
+
 * Wed Jul 19 2006 Deepak Bhole <dbhole at redhat.com> 0:1.5.2-3jpp_1fc
 - Remove name/release/version defines as applicable.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:18 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.46,1.47
Message-ID: <200607220846.k6M8kIDR007912@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7560

Modified Files:
	xalan-j2.spec 
Log Message:
Rebuilt


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xalan-j2.spec	21 Jul 2006 18:03:37 -0000	1.46
+++ xalan-j2.spec	22 Jul 2006 08:46:16 -0000	1.47
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_1fc
+Release:        4jpp_2fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -322,6 +322,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.0-4jpp_2fc
+- Rebuilt
+
 * Fri Jul 21 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_1fc
 - Resync with latest JPP version.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:24 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.16,1.17
Message-ID: <200607220846.k6M8kOon008339@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8215

Modified Files:
	xdoclet.spec 
Log Message:
Rebuilt


Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xdoclet.spec	7 Jun 2006 18:23:12 -0000	1.16
+++ xdoclet.spec	22 Jul 2006 08:46:22 -0000	1.17
@@ -9,7 +9,7 @@
 
 Name:		xdoclet
 Version:	1.2.2
-Release: 	2jpp_6fc
+Release: 	2jpp_7fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -199,6 +199,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.2-2jpp_7fc
+- Rebuilt
+
 * Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.2-2jpp_6fc
 - Add missing BR for ant-nodeps
 - Other spec file cleanup



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:31 -0400
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.44,1.45
Message-ID: <200607220846.k6M8kVSu009022@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8674

Modified Files:
	xerces-j2.spec 
Log Message:
Rebuilt


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xerces-j2.spec	12 Jul 2006 08:52:55 -0000	1.44
+++ xerces-j2.spec	22 Jul 2006 08:46:28 -0000	1.45
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.7.1
 %define cvs_version	2_7_1
-%define release 	6jpp_8fc
+%define release 	6jpp_9fc
 %define section		free
 
 Name:		%{name}
@@ -264,6 +264,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.1-6jpp_9fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.7.1-6jpp_8fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:38 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.12,1.13
Message-ID: <200607220846.k6M8kc2i009655@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xjavadoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9372

Modified Files:
	xjavadoc.spec 
Log Message:
Rebuilt


Index: xjavadoc.spec
===================================================================
RCS file: /cvs/dist/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xjavadoc.spec	5 Jun 2006 22:14:42 -0000	1.12
+++ xjavadoc.spec	22 Jul 2006 08:46:35 -0000	1.13
@@ -1,6 +1,6 @@
 %define name		xjavadoc
 %define version		1.1
-%define release		1jpp_5fc
+%define release		1jpp_6fc
 %define section		free
 
 Name:		%{name}
@@ -118,6 +118,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-1jpp_6fc
+- Rebuilt
+
 * Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_5fc
 - Added missing BuildRequires for ant-nodeps.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:44 -0400
Subject: rpms/xml-commons/devel xml-commons.spec,1.36,1.37
Message-ID: <200607220846.k6M8kiJa010175@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10014

Modified Files:
	xml-commons.spec 
Log Message:
Rebuilt


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xml-commons.spec	12 Jul 2006 08:54:23 -0000	1.36
+++ xml-commons.spec	22 Jul 2006 08:46:42 -0000	1.37
@@ -4,7 +4,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.3.02
-Release: 	0.b2.7jpp_8fc
+Release: 	0.b2.7jpp_9fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -206,6 +206,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3.02-0.b2.7jpp_9fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3.02-0.b2.7jpp_8fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:46:54 -0400
Subject: rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.13,
	1.14
Message-ID: <200607220846.k6M8ksiP010865@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xml-commons-resolver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10737

Modified Files:
	xml-commons-resolver.spec 
Log Message:
Rebuilt


Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xml-commons-resolver.spec	21 Jul 2006 22:44:34 -0000	1.13
+++ xml-commons-resolver.spec	22 Jul 2006 08:46:51 -0000	1.14
@@ -7,7 +7,7 @@
 
 Name:           xml-commons-resolver
 Version:        1.1
-Release: 	    1jpp_10fc
+Release: 	    1jpp_11fc
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        Apache Software License
@@ -133,6 +133,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-1jpp_11fc
+- Rebuilt
+
 * Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_10fc
 - Added conditional native compilation.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 08:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 04:47:00 -0400
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.14,1.15
Message-ID: <200607220847.k6M8l0f5011357@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11219

Modified Files:
	xmlrpc.spec 
Log Message:
Rebuilt


Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xmlrpc.spec	12 Jul 2006 17:10:47 -0000	1.14
+++ xmlrpc.spec	22 Jul 2006 08:46:58 -0000	1.15
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_8.1fc
+%define release		1jpp_8.2fc
 %define	section		free
 %define gcj_support     1
 
@@ -114,6 +114,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.0.1-1jpp_8.2fc
+- Rebuilt
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_8.1fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 11:11:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 07:11:07 -0400
Subject: rpms/setroubleshoot/devel setroubleshoot.spec,1.11,1.12
Message-ID: <200607221111.k6MBB7aq032741@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32712

Modified Files:
	setroubleshoot.spec 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-2
	* Fix Requires line



Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setroubleshoot.spec	22 Jul 2006 03:08:40 -0000	1.11
+++ setroubleshoot.spec	22 Jul 2006 11:11:03 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 0.12
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 URL: http://www.redhat.com/ 
@@ -27,7 +27,7 @@
 Requires: audit-libs-python
 Requires: libselinux >= 1.30.15-1
 Requires: pygtk2 >= 2.9.2
-Requires: notifiy-python
+Requires: notify-python
 
 BuildRequires: intltool gettext python
 
@@ -93,6 +93,9 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-2
+	* Fix Requires line
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-1
 	* Fix problem in dispatcher
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 14:39:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 10:39:30 -0400
Subject: rpms/kernel/devel/configs config-xen-xen,1.2,NONE
Message-ID: <200607221439.k6MEdUuD020343@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv20316/configs

Removed Files:
	config-xen-xen 
Log Message:
xen configs files got reconfigured yesterday


--- config-xen-xen DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 22 14:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 10:52:55 -0400
Subject: rpms/kernel/devel/configs config-xen-ia64,NONE,1.1
Message-ID: <200607221452.k6MEqtcT007524@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7476/configs

Added Files:
	config-xen-ia64 
Log Message:
add ia64-xen support


--- NEW FILE config-xen-ia64 ---
# override i686 xen

# CONFIG_X86 is not set
# CONFIG_X86_XEN is not set
CONFIG_IA64=y
CONFIG_XEN=y
CONFIG_XEN_IA64_DOM0_VP=y
CONFIG_XEN_DISABLE_SERIAL=y

# override ia64 generic

# CONFIG_IA64_GENERIC is not set
CONFIG_IA64_DIG=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM_MANUAL=y
CONFIG_FORCE_MAX_ZONEORDER=11

# internal #defines conflict with xen-ia64
# CONFIG_FB_NEOMAGIC is not set



From fedora-cvs-commits at redhat.com  Sat Jul 22 14:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 10:52:55 -0400
Subject: rpms/kernel/devel Makefile.config, 1.45, 1.46 kernel-2.6.spec,
	1.2432, 1.2433
Message-ID: <200607221452.k6MEqtEG007515@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7476

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
add ia64-xen support


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile.config	20 Jul 2006 18:05:47 -0000	1.45
+++ Makefile.config	22 Jul 2006 14:52:52 -0000	1.46
@@ -12,7 +12,8 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
-	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
+	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
+	$(CFG)-ia64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -20,8 +21,10 @@
 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
+	@rm -f temp-generic temp-xen-generic \
+		temp-x86-xen-generic \
+		temp-x86_64-xen-generic temp-x86_64-xen-generic-tmp \
+		temp-ia64-xen-generic temp-ia64-xen-generic-tmp
 
 # Augment the clean target to clean up our own cruft
 clean ::
@@ -69,6 +72,12 @@
 temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp
 	perl merge.pl $^ > $@
 
+temp-ia64-xen-generic-tmp: configs/config-xen-generic temp-ia64-generic
+	perl merge.pl $^ > $@
+
+temp-ia64-xen-generic: configs/config-xen-ia64 temp-ia64-xen-generic-tmp
+	perl merge.pl $^ > $@
+
 kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
@@ -132,3 +141,6 @@
 kernel-$(VERSION)-x86_64-xen.config: configs/config-x86_64 temp-x86_64-xen-generic
 	perl merge.pl $^ x86_64 > $@
 
+kernel-$(VERSION)-ia64-xen.config: configs/config-ia64 temp-ia64-xen-generic
+	perl merge.pl $^ ia64 > $@
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2432
retrieving revision 1.2433
diff -u -r1.2432 -r1.2433
--- kernel-2.6.spec	21 Jul 2006 20:26:59 -0000	1.2432
+++ kernel-2.6.spec	22 Jul 2006 14:52:52 -0000	1.2433
@@ -237,6 +237,7 @@
 Source33: kernel-%{kversion}-i686-xen.config
 Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
+Source36: kernel-%{kversion}-ia64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -1619,6 +1620,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>
+- add ia64-xen config
+
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com>
 - Patch from jakub to use sysv style hash for VDSO to fix booting 
   on ia64 (#199634, #199595)



From fedora-cvs-commits at redhat.com  Sat Jul 22 15:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 11:04:19 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2433,1.2434
Message-ID: <200607221504.k6MF4J4P010564@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10524

Modified Files:
	kernel-2.6.spec 
Log Message:
ia64 xen support, disabled by default


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2433
retrieving revision 1.2434
diff -u -r1.2433 -r1.2434
--- kernel-2.6.spec	22 Jul 2006 14:52:52 -0000	1.2433
+++ kernel-2.6.spec	22 Jul 2006 15:04:14 -0000	1.2434
@@ -36,6 +36,9 @@
 %define xen_version 20060719
 %define make_target bzImage
 %define kernel_image x86
+%define xen_flags verbose=y debug=y crash_debug=y
+%define xen_target vmlinuz
+%define xen_image vmlinuz
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -56,12 +59,18 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
-# Xen and kdump only build on i686 and x86_64 ...
+# kdump only builds on i686 and x86_64 ...
 %ifnarch i686 x86_64
-%define buildxen 0
 %define buildkdump 0
 %endif
 
+# Xen only builds on i686, x86_64 and ia64 ...
+#%ifnarch i686 x86_64 ia64
+%ifnarch i686 x86_64
+%define buildxen 0
+%endif
+
+
 %ifarch ppc64
 %define buildkdump 1
 %endif
@@ -80,6 +89,8 @@
 
 %ifarch i686
 %define buildpae 1
+# we build always xen HV with pae
+%define xen_flags verbose=y debug=y crash_debug=y pae=y
 %endif
 
 %ifarch x86_64
@@ -134,11 +145,15 @@
 %endif
 
 %ifarch ia64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
 %define image_install_path boot/efi/EFI/redhat
 #define signmodules 1
 %define make_target compressed
 %define kernel_image vmlinux.gz
+# ia64 xen HV doesn't building with debug=y at the moment
+%define xen_flags verbose=y crash_debug=y
+%define xen_target compressed
+%define xen_image vmlinux.gz
 %endif
 
 #
@@ -1236,9 +1251,9 @@
 %if %{includexen}
 %if %{buildxen}
   cd xen
-  mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
-  make debug=y verbose=y crash_debug=y pae=y
-  install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
+  mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
+  make %{?_smp_mflags} %{xen_flags}
+  install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
   mkdir -p $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
@@ -1262,7 +1277,7 @@
 
 %if %{includexen}
 %if %{buildxen}
-BuildKernel vmlinuz vmlinuz xen
+BuildKernel %xen_target %xen_image xen
 %endif
 %endif
 
@@ -1433,7 +1448,7 @@
 %post xen
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
 if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then
-	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/%{image_install_path}/xen.gz-%{KVERREL} %{KVERREL}xen
 else
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
@@ -1566,7 +1581,7 @@
 /boot/symvers-%{KVERREL}xen.gz
 /boot/symsets-%{KVERREL}xen.tar.gz
 /boot/config-%{KVERREL}xen
-/boot/xen.gz-%{KVERREL}
+/%{image_install_path}/xen.gz-%{KVERREL}
 /boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}xen
 /lib/modules/%{KVERREL}xen/kernel
@@ -1621,6 +1636,7 @@
 
 %changelog
 * Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>
+- addia64-xen support, not enabled by default.
 - add ia64-xen config
 
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com>



From fedora-cvs-commits at redhat.com  Sat Jul 22 15:42:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 11:42:19 -0400
Subject: rpms/dbus/devel dbus.spec,1.92,1.93
Message-ID: <200607221542.k6MFgJpC019589@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19460

Modified Files:
	dbus.spec 
Log Message:
- add patch to fix timeout removal assertion



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- dbus.spec	20 Jul 2006 22:36:33 -0000	1.92
+++ dbus.spec	22 Jul 2006 15:42:16 -0000	1.93
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.90
-Release: 7 
+Release: 8 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -32,6 +32,7 @@
 Patch3: dbus-0.60-start-early.patch
 Patch4: dbus-0.90-remove-glib.patch
 Patch5: dbus-0.90-ref-unlocked.patch
+Patch6: dbus-0.90-fix-remove-timeout.patch
 
 %description
 
@@ -66,6 +67,7 @@
 %patch3 -p1 -b .start-early
 %patch4 -p1 -b .remove-glib
 %patch5 -p1 -b .ref-unlocked
+%patch6 -p1 -b .fix-remove-timeout
 
 autoreconf -f -i
 
@@ -171,6 +173,9 @@
 %{_includedir}/*
 
 %changelog
+* Thu Jul 22 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-8
+- add patch to fix timeout removal assertion
+
 * Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.90-7
 - add patch to fix taking a connection ref when it is locked
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 15:44:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 11:44:49 -0400
Subject: rpms/dbus/devel dbus-0.90-fix-remove-timeout.patch,NONE,1.1
Message-ID: <200607221544.k6MFinWr020579@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20465

Added Files:
	dbus-0.90-fix-remove-timeout.patch 
Log Message:
- Add the patch


dbus-0.90-fix-remove-timeout.patch:
 dbus-connection.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dbus-0.90-fix-remove-timeout.patch ---
--- dbus-0.90/dbus/dbus-connection.c.fix-remove-timeout	2006-07-22 11:07:49.000000000 -0400
+++ dbus-0.90/dbus/dbus-connection.c	2006-07-22 11:09:35.000000000 -0400
@@ -798,6 +798,7 @@
     {
       _dbus_connection_remove_timeout_unlocked (connection, timeout);
 
+      _dbus_pending_call_set_timeout_added (pending, FALSE);
       HAVE_LOCK_CHECK (connection);
       return FALSE;
     }
@@ -2501,7 +2502,8 @@
                                               connection);
       _dbus_connection_remove_timeout_unlocked (connection,
                                                 _dbus_pending_call_get_timeout (pending));
-   
+
+      _dbus_pending_call_set_timeout_added (pending, FALSE); 
       _dbus_hash_iter_remove_entry (&iter);
 
       dbus_pending_call_unref (pending);



From fedora-cvs-commits at redhat.com  Sat Jul 22 18:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 14:03:15 -0400
Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.58,
	1.59 booleans-targeted.conf, 1.10, 1.11 modules-targeted.conf,
	1.24, 1.25 policy-20060608.patch, 1.3, 1.4 selinux-policy.spec,
	1.176, 1.177 sources, 1.62, 1.63
Message-ID: <200607221803.k6MI3Fed012928@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12906

Modified Files:
	.cvsignore booleans-targeted.conf modules-targeted.conf 
	policy-20060608.patch selinux-policy.spec sources 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8.fc5
- Bump for FC5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	9 Jul 2006 10:46:56 -0000	1.58
+++ .cvsignore	22 Jul 2006 18:03:11 -0000	1.59
@@ -70,3 +70,4 @@
 serefpolicy-2.2.43.tgz
 serefpolicy-2.2.47.tgz
 serefpolicy-2.3.2.tgz
+serefpolicy-2.3.3.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/booleans-targeted.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- booleans-targeted.conf	9 Jul 2006 10:46:56 -0000	1.10
+++ booleans-targeted.conf	22 Jul 2006 18:03:11 -0000	1.11
@@ -46,14 +46,14 @@
 # 
 allow_smbd_anon_write = false
 
-# Allow sysadm to ptrace all processes
-# 
-allow_ptrace = false
-
 # Allow system to run with NIS
 # 
 allow_ypbind = false
 
+# Allow zebra to write it own configuration files
+# 
+allow_zebra_write_config = true
+
 # Enable extra rules in the cron domainto support fcron.
 # 
 fcron_crond = false
@@ -138,10 +138,6 @@
 # 
 squid_connect_any = false
 
-# Allow ssh logins as sysadm_r:sysadm_t
-# 
-ssh_sysadm_login = false
-
 # Configure stunnel to be a standalone daemon orinetd service.
 # 
 stunnel_is_daemon = false
@@ -170,7 +166,7 @@
 # 
 allow_user_mysql_connect = false
 
-# Allow system cron jobs to relabel filesystemfor restoring file contexts.
+# Allow system cron jobs to relabel filesystem for restoring file contexts.
 # 
 cron_can_relabel = false
 
@@ -190,10 +186,6 @@
 # 
 spamd_enable_home_dirs = true
 
-# Allow staff_r users to search the sysadm homedir and read files (such as ~/.bashrc)
-# 
-staff_read_sysadm_file = false
-
 # Allow regular users direct mouse access
 # 
 user_direct_mouse = false


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/modules-targeted.conf,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- modules-targeted.conf	15 Jun 2006 14:12:52 -0000	1.24
+++ modules-targeted.conf	22 Jul 2006 18:03:11 -0000	1.25
@@ -1093,5 +1093,12 @@
 # 
 openvpn = base
 
+# Layer: services
+# Module: setroubleshoot
+#
+# Policy for the SELinux troubleshooting utility
+# 
+setroubleshoot = base
+
 
 

policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/inetd.te          |   12 +-
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 77 files changed, 791 insertions(+), 225 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060608.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060608.patch	9 Jul 2006 10:46:56 -0000	1.3
+++ policy-20060608.patch	22 Jul 2006 18:03:11 -0000	1.4
@@ -1,7 +1,41 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.2/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-06-08 08:45:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/global_tunables	2006-07-07 07:37:00.000000000 -0400
-@@ -89,6 +89,13 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.3.3/policy/global_booleans
+--- nsaserefpolicy/policy/global_booleans	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_booleans	2006-07-19 15:59:32.000000000 -0400
+@@ -4,6 +4,7 @@
+ # file should be used.
+ #
+ 
++ifdef(`strict_policy',`
+ ## <desc>
+ ## <p>
+ ## Enabling secure mode disallows programs, such as
+@@ -12,6 +13,7 @@
+ ## </p>
+ ## </desc>
+ gen_bool(secure_mode,false)
++')
+ 
+ ## <desc>
+ ## <p>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.3.3/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/global_tunables	2006-07-19 16:01:14.000000000 -0400
+@@ -19,6 +19,14 @@
+ 
+ ## <desc>
+ ## <p>
++## Allow zebra daemon to write it configuration files
++## </p>
++## </desc>
++#
++gen_tunable(allow_zebra_write_config,false)
++
++## <desc>
++## <p>
+ ## Allow making the heap executable.
+ ## </p>
+ ## </desc>
+@@ -89,6 +97,13 @@
  
  ## <desc>
  ## <p>
@@ -15,9 +49,161 @@
  ## Allow java executable stack
  ## </p>
  ## </desc>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.2/policy/modules/admin/consoletype.te
---- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/admin/consoletype.te	2006-07-07 07:37:00.000000000 -0400
+@@ -132,12 +147,6 @@
+ ## </desc>
+ gen_tunable(allow_smbd_anon_write,false)
+ 
+-## <desc>
+-## <p>
+-## Allow sysadm to ptrace all processes
+-## </p>
+-## </desc>
+-gen_tunable(allow_ptrace,false)
+ 
+ ## <desc>
+ ## <p>
+@@ -290,13 +299,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow ssh to run from inetd instead of as a daemon.
+-## </p>
+-## </desc>
+-gen_tunable(run_ssh_inetd,false)
+-
+-## <desc>
+-## <p>
+ ## Allow samba to export user home directories.
+ ## </p>
+ ## </desc>
+@@ -311,13 +313,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow spamassassin to do DNS lookups
+-## </p>
+-## </desc>
+-gen_tunable(spamassasin_can_network,false)
+-
+-## <desc>
+-## <p>
+ ## Allow squid to connect to all ports, not just
+ ## HTTP, FTP, and Gopher ports.
+ ## </p>
+@@ -326,13 +321,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow ssh logins as sysadm_r:sysadm_t
+-## </p>
+-## </desc>
+-gen_tunable(ssh_sysadm_login,false)
+-
+-## <desc>
+-## <p>
+ ## Configure stunnel to be a standalone daemon or
+ ## inetd service.
+ ## </p>
+@@ -353,6 +341,19 @@
+ ## </desc>
+ gen_tunable(use_samba_home_dirs,false)
+ 
++########################################
++#
++# Strict policy specific
++#
++
++ifdef(`strict_policy',`
++## <desc>
++## <p>
++## Allow ssh to run from inetd instead of as a daemon.
++## </p>
++## </desc>
++gen_tunable(run_ssh_inetd,false)
++
+ ## <desc>
+ ## <p>
+ ## Control users use of ping and traceroute
+@@ -360,12 +361,28 @@
+ ## </desc>
+ gen_tunable(user_ping,false)
+ 
+-########################################
+-#
+-# Strict policy specific
+-#
++## <desc>
++## <p>
++## Allow sysadm to ptrace all processes
++## </p>
++## </desc>
++gen_tunable(allow_ptrace,false)
++
++## <desc>
++## <p>
++## Allow ssh logins as sysadm_r:sysadm_t
++## </p>
++## </desc>
++gen_tunable(ssh_sysadm_login,false)
++
++## <desc>
++## <p>
++## Allow staff_r users to search the sysadm home 
++## dir and read files (such as ~/.bashrc)
++## </p>
++## </desc>
++gen_tunable(staff_read_sysadm_file,false)
+ 
+-ifdef(`strict_policy',`
+ ## <desc>
+ ## <p>
+ ## Allow gpg executable stack
+@@ -489,14 +506,6 @@
+ 
+ ## <desc>
+ ## <p>
+-## Allow staff_r users to search the sysadm home 
+-## dir and read files (such as ~/.bashrc)
+-## </p>
+-## </desc>
+-gen_tunable(staff_read_sysadm_file,false)
+-
+-## <desc>
+-## <p>
+ ## Allow regular users direct mouse access 
+ ## </p>
+ ## </desc>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
+--- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-17 11:43:02.000000000 -0400
+@@ -48,7 +48,7 @@
+ # bootloader local policy
+ #
+ 
+-allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
++allow bootloader_t self:capability { dac_override dac_read_search fsetid sys_rawio sys_admin mknod chown };
+ allow bootloader_t self:process { sigkill sigstop signull signal execmem };
+ allow bootloader_t self:fifo_file rw_file_perms;
+ 
+@@ -67,6 +67,7 @@
+ files_root_filetrans(bootloader_t,bootloader_tmp_t,file)
+ 
+ kernel_getattr_core_if(bootloader_t)
++kernel_read_network_state(bootloader_t)
+ kernel_read_system_state(bootloader_t)
+ kernel_read_software_raid_state(bootloader_t)
+ kernel_read_kernel_sysctls(bootloader_t)
+@@ -86,6 +87,7 @@
+ dev_read_raw_memory(bootloader_t)
+ 
+ fs_getattr_xattr_fs(bootloader_t)
++fs_getattr_tmpfs(bootloader_t)
+ fs_read_tmpfs_symlinks(bootloader_t)
+ 
+ mls_file_read_up(bootloader_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
+--- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-17 11:43:02.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -32,9 +218,141 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.2/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-05-19 10:07:51.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/files.fc	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-07-19 12:37:56.000000000 -0400
+@@ -211,11 +211,11 @@
+ ifdef(`targeted_policy',`
+ 	term_use_unallocated_ttys(traceroute_t)
+ 	term_use_generic_ptys(traceroute_t)
+-')
+-
+-tunable_policy(`user_ping',`
+-	term_use_all_user_ttys(traceroute_t)
+-	term_use_all_user_ptys(traceroute_t)
++',`
++	tunable_policy(`user_ping',`
++		term_use_all_user_ttys(traceroute_t)
++		term_use_all_user_ptys(traceroute_t)
++	')
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.3.3/policy/modules/admin/prelink.te
+--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/prelink.te	2006-07-18 08:54:22.000000000 -0400
+@@ -48,6 +48,7 @@
+ corecmd_relabel_all_executables(prelink_t)
+ corecmd_mmap_all_executables(prelink_t)
+ corecmd_read_sbin_symlinks(prelink_t)
++corecmd_read_bin_symlinks(prelink_t)
+ 
+ dev_read_urand(prelink_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.3.3/policy/modules/admin/rpm.fc
+--- nsaserefpolicy/policy/modules/admin/rpm.fc	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.fc	2006-07-17 15:30:08.000000000 -0400
+@@ -19,6 +19,8 @@
+ /usr/sbin/pup			--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/rhn_check		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ /usr/sbin/up2date		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-get		--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/usr/bin/apt-shell		--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ ')
+ 
+ /var/lib/alternatives(/.*)?		gen_context(system_u:object_r:rpm_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.3.3/policy/modules/admin/rpm.if
+--- nsaserefpolicy/policy/modules/admin/rpm.if	2006-07-14 17:04:45.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/rpm.if	2006-07-18 09:52:40.000000000 -0400
+@@ -211,7 +211,7 @@
+ 
+ 	files_search_var_lib($1)
+ 	allow $1 rpm_var_lib_t:dir r_dir_perms;
+-	allow $1 rpm_var_lib_t:file { getattr read };
++	allow $1 rpm_var_lib_t:file r_file_perms;
+ 	allow $1 rpm_var_lib_t:lnk_file r_file_perms;
+ ')
+ 
+@@ -232,7 +232,7 @@
+ 
+ 	files_search_var_lib($1)
+ 	allow $1 rpm_var_lib_t:dir rw_dir_perms;
+-	allow $1 rpm_var_lib_t:file { getattr create read write append unlink };
++	allow $1 rpm_var_lib_t:file { getattr create read write append unlink lock };
+ 	allow $1 rpm_var_lib_t:lnk_file { getattr read write unlink };
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-07-17 11:43:02.000000000 -0400
+@@ -260,6 +260,7 @@
+ ')
+ 
+ optional_policy(`
++	nscd_exec(groupadd_t)
+ 	nscd_socket_use(groupadd_t)
+ ')
+ 
+@@ -534,6 +535,7 @@
+ ')
+ 
+ optional_policy(`
++	nscd_exec(useradd_t)
+ 	nscd_socket_use(useradd_t)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-07-14 17:04:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/corenetwork.te.in	2006-07-17 11:43:02.000000000 -0400
+@@ -62,7 +62,7 @@
+ network_port(amavisd_send, tcp,10025,s0)
+ network_port(asterisk, tcp,1720,s0, udp,2427,s0, udp,2727,s0, udp,4569,s0, udp,5060,s0)
+ network_port(auth, tcp,113,s0)
+-network_port(bgp, tcp,179,s0, udp,179,s0)
++network_port(bgp, tcp,179,s0, udp,179,s0, tcp,2605,s0, udp,2605,s0)
+ type biff_port_t, port_type, reserved_port_type; dnl network_port(biff) # no defined portcon in current strict
+ network_port(clamd, tcp,3310,s0)
+ network_port(clockspeed, udp,4041,s0)
+@@ -73,6 +73,7 @@
+ network_port(dhcpc, udp,68,s0)
+ network_port(dhcpd, udp,67,s0, tcp,647,s0, udp,647,s0, tcp,847,s0, udp,847,s0)
+ network_port(dict, tcp,2628,s0)
++network_port(setroubleshoot, tcp,3267,s0)
+ network_port(distccd, tcp,3632,s0)
+ network_port(dns, udp,53,s0, tcp,53,s0)
+ network_port(fingerd, tcp,79,s0)
+@@ -145,7 +146,7 @@
+ network_port(vnc, tcp,5900,s0)
+ network_port(xen, tcp,8002,s0)
+ network_port(xserver, tcp, 6000, s0, 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(zebra, tcp,2601,s0)
++network_port(zebra, tcp,2600,s0, tcp,2601,s0, tcp,2602,s0, tcp,2603,s0, tcp,2604,s0, tcp,2606,s0, udp,2600,s0, udp,2601,s0, udp,2602,s0, udp,2603,s0, udp,2604,s0, udp,2606,s0)
+ network_port(zope, tcp,8021,s0)
+ 
+ # Defaults for reserved ports.  Earlier portcon entries take precedence;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.3.3/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/devices.fc	2006-07-20 14:37:36.000000000 -0400
+@@ -20,6 +20,7 @@
+ /dev/fb[0-9]*		-c	gen_context(system_u:object_r:framebuf_device_t,s0)
+ /dev/full		-c	gen_context(system_u:object_r:null_device_t,s0)
+ /dev/hw_random		-c	gen_context(system_u:object_r:random_device_t,s0)
++/dev/hwrng		-c	gen_context(system_u:object_r:random_device_t,s0)
+ /dev/i915		-c	gen_context(system_u:object_r:dri_device_t,s0)
+ /dev/irlpt[0-9]+	-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/js.*		-c	gen_context(system_u:object_r:mouse_device_t,s0)
+@@ -89,6 +90,8 @@
+ 
+ /dev/s(ou)?nd/.*	-c	gen_context(system_u:object_r:sound_device_t,s0)
+ 
++/dev/hiddev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
++/dev/usbdev.*		-c	gen_context(system_u:object_r:usb_device_t,s0)
+ /dev/usb/dc2xx.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ /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)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.3.3/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/files.fc	2006-07-17 11:43:02.000000000 -0400
 @@ -11,6 +11,7 @@
  ifdef(`distro_redhat',`
  /\.autofsck		--	gen_context(system_u:object_r:etc_runtime_t,s0)
@@ -43,9 +361,9 @@
  /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.2/policy/modules/kernel/kernel.if
---- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-07 07:35:30.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/kernel/kernel.if	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.3.3/policy/modules/kernel/kernel.if
+--- nsaserefpolicy/policy/modules/kernel/kernel.if	2006-07-14 17:04:30.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/kernel.if	2006-07-17 11:43:02.000000000 -0400
 @@ -2099,3 +2099,41 @@
  
  	typeattribute $1 kern_unconfined;
@@ -88,10 +406,42 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.2/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/automount.te	2006-07-07 07:37:00.000000000 -0400
-@@ -40,6 +40,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
+--- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -23,6 +23,7 @@
+ /dev/loop.*		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/lvm			-c	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/mcdx?		-b	gen_context(system_u:object_r:removable_device_t,s0)
++/dev/mmcblk.*		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/nb[^/]+		-b	gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255)
+ /dev/optcd		-b	gen_context(system_u:object_r:removable_device_t,s0)
+ /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
+--- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-07-17 12:03:46.000000000 -0400
+@@ -62,10 +62,12 @@
+ allow amavis_t amavis_quarantine_t:dir create_dir_perms;
+ 
+ # Spool Files
++files_search_spool(amavis_t)
+ allow amavis_t amavis_spool_t:dir manage_dir_perms;
+ allow amavis_t amavis_spool_t:file manage_file_perms;
+ allow amavis_t amavis_spool_t:sock_file manage_file_perms;
+ files_spool_filetrans(amavis_t,amavis_spool_t,{ dir file })
++type_transition amavis_t amavis_spool_t:sock_file amavis_var_run_t;
+ 
+ # tmp files
+ allow amavis_t amavis_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-17 11:43:02.000000000 -0400
+@@ -36,10 +36,12 @@
+ allow automount_t self:unix_dgram_socket create_socket_perms;
+ allow automount_t self:tcp_socket create_stream_socket_perms;
+ allow automount_t self:udp_socket create_socket_perms;
++allow automount_t self:netlink_route_socket r_netlink_socket_perms;
+ 
  allow automount_t automount_etc_t:file { getattr read };
  # because config files can be shell scripts
  can_exec(automount_t, automount_etc_t)
@@ -99,9 +449,43 @@
  
  allow automount_t automount_lock_t:file create_file_perms;
  files_lock_filetrans(automount_t,automount_lock_t,file)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.2/policy/modules/services/bluetooth.if
---- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.if	2006-07-07 07:37:00.000000000 -0400
+@@ -183,3 +185,9 @@
+ optional_policy(`
+ 	udev_read_db(automount_t)
+ ')
++
++optional_policy(`
++	kerberos_read_config(automount_t)
++	kerberos_read_keytab(automount_t)
++	kerberos_dontaudit_write_config(automount_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.3.3/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/avahi.te	2006-07-17 11:43:02.000000000 -0400
+@@ -78,6 +78,7 @@
+ miscfiles_read_localization(avahi_t)
+ 
+ sysnet_read_config(avahi_t)
++sysnet_use_ldap(avahi_t)
+ 
+ userdom_dontaudit_use_unpriv_user_fds(avahi_t)
+ userdom_dontaudit_search_sysadm_home_dirs(avahi_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.3.3/policy/modules/services/bind.fc
+--- nsaserefpolicy/policy/modules/services/bind.fc	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bind.fc	2006-07-21 11:20:26.000000000 -0400
+@@ -28,7 +28,8 @@
+ ')
+ 
+ ifdef(`distro_redhat',`
+-/etc/named\.conf	--	gen_context(system_u:object_r:named_conf_t,s0)
++/etc/named\.rfc1912.zones  --	gen_context(system_u:object_r:named_conf_t,s0)
++/etc/named\.conf	   --	gen_context(system_u:object_r:named_conf_t,s0)
+ /etc/named\.caching-nameserver\.conf -- gen_context(system_u:object_r:named_conf_t,s0)
+ /var/named(/.*)?		gen_context(system_u:object_r:named_zone_t,s0)
+ /var/named/slaves(/.*)?		gen_context(system_u:object_r:named_cache_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.if serefpolicy-2.3.3/policy/modules/services/bluetooth.if
+--- nsaserefpolicy/policy/modules/services/bluetooth.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.if	2006-07-17 11:43:02.000000000 -0400
 @@ -111,3 +111,26 @@
  	dontaudit $1 bluetooth_helper_t:dir search;
  	dontaudit $1 bluetooth_helper_t:file { read getattr };
@@ -129,9 +513,9 @@
 +	allow bluetooth_t $1:process sigchld;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.2/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-06-08 08:45:57.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/bluetooth.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-17 11:43:02.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -148,9 +532,169 @@
  	')
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.2/policy/modules/services/cyrus.te
---- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-07 07:35:31.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/cyrus.te	2006-07-08 15:28:24.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
+--- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-07-17 12:08:12.000000000 -0400
+@@ -8,8 +8,9 @@
+ /usr/sbin/clamd			--	gen_context(system_u:object_r:clamd_exec_t,s0)
+ 
+ /var/run/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_run_t,s0)
+-/var/run/clamav/clamd.ctl	-s	gen_context(system_u:object_r:clamd_sock_t,s0)
++/var/run/amavis(d)?/clamd.pid	--	gen_context(system_u:object_r:clamd_var_run_t,s0)
+ /var/lib/clamav(/.*)?			gen_context(system_u:object_r:clamd_var_lib_t,s0)
+ /var/log/clamav			-d	gen_context(system_u:object_r:clamd_var_log_t,s0)
+ /var/log/clamav/clamav.*	--	gen_context(system_u:object_r:clamd_var_log_t,s0)
+ /var/log/clamav/freshclam.*	--	gen_context(system_u:object_r:freshclam_var_log_t,s0)
++/var/spool/amavisd/clamd.sock	-s	gen_context(system_u:object_r:clamd_var_run_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.if serefpolicy-2.3.3/policy/modules/services/clamav.if
+--- nsaserefpolicy/policy/modules/services/clamav.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.if	2006-07-17 12:07:25.000000000 -0400
+@@ -35,11 +35,11 @@
+ #
+ interface(`clamav_stream_connect',`
+ 	gen_require(`
+-		type clamd_t, clamd_sock_t, clamd_var_run_t;
++		type clamd_t, clamd_var_run_t;
+ 	')
+ 
+ 	allow $1 clamd_var_run_t:dir search;
+-	allow $1 clamd_sock_t:sock_file write;
++	allow $1 clamd_var_run_t:sock_file write;
+ 	allow $1 clamd_t:unix_stream_socket connectto;
+ ')
+ 
+@@ -102,3 +102,21 @@
+ 	allow clamscan_t $1:fifo_file rw_file_perms;
+ 	allow clamscan_t $1:process sigchld;
+ ')
++
++########################################
++## <summary>
++##    Access /var/lib/clamav
++## </summary>
++## <param name="domain">
++##    <summary>
++##    Domain allowed to transition.
++##    </summary>
++## </param>
++#
++interface(`access_clam_home',`
++	gen_require(`
++		type clamd_var_lib_t;
++	')
++
++	allow $1 clamd_var_lib_t:dir search;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.3.3/policy/modules/services/clamav.te
+--- nsaserefpolicy/policy/modules/services/clamav.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/clamav.te	2006-07-17 12:11:30.000000000 -0400
+@@ -15,10 +15,6 @@
+ type clamd_etc_t;
+ files_type(clamd_etc_t)
+ 
+-# named socket type
+-type clamd_sock_t;
+-files_type(clamd_sock_t)
+-
+ # tmp files
+ type clamd_tmp_t;
+ files_tmp_file(clamd_tmp_t)
+@@ -34,6 +30,7 @@
+ # pid files
+ type clamd_var_run_t;
+ files_pid_file(clamd_var_run_t)
++typealias clamd_var_run_t alias clamd_sock_t;
+ 
+ type clamscan_t;
+ type clamscan_exec_t;
+@@ -67,12 +64,6 @@
+ allow clamd_t clamd_etc_t:file r_file_perms;
+ allow clamd_t clamd_etc_t:lnk_file { getattr read };
+ 
+-# socket file
+-allow clamd_t clamd_sock_t:file manage_file_perms;
+-allow clamd_t clamd_sock_t:sock_file manage_file_perms;
+-allow clamd_t clamd_sock_t:dir rw_dir_perms;
+-files_pid_filetrans(clamd_t,clamd_sock_t,sock_file)
+-
+ # tmp files
+ allow clamd_t clamd_tmp_t:file create_file_perms;
+ allow clamd_t clamd_tmp_t:dir create_dir_perms;
+@@ -80,14 +71,10 @@
+ 
+ # var/lib files for clamd
+ allow clamd_t clamd_var_lib_t:file create_file_perms;
+-allow clamd_t clamd_var_lib_t:sock_file create_file_perms;
+ allow clamd_t clamd_var_lib_t:dir create_dir_perms;
+-files_var_filetrans(clamd_t,clamd_var_lib_t,{ file dir sock_file })
+-files_var_lib_filetrans(clamd_t,clamd_var_lib_t,file)
+ 
+ # log files
+ allow clamd_t clamd_var_log_t:file create_file_perms;
+-allow clamd_t clamd_var_log_t:sock_file create_file_perms;
+ allow clamd_t clamd_var_log_t:dir { rw_dir_perms setattr };
+ logging_log_filetrans(clamd_t,clamd_var_log_t,file)
+ 
+@@ -161,10 +148,7 @@
+ 
+ # var/lib files together with clamd
+ allow freshclam_t clamd_var_lib_t:file create_file_perms;
+-allow freshclam_t clamd_var_lib_t:sock_file create_file_perms;
+ allow freshclam_t clamd_var_lib_t:dir create_dir_perms;
+-files_var_filetrans(freshclam_t,clamd_var_lib_t,{ file dir sock_file })
+-files_var_lib_filetrans(freshclam_t,clamd_var_lib_t,file)
+ 
+ # pidfiles- var/run together with clamd
+ allow freshclam_t clamd_var_run_t:file manage_file_perms;
+@@ -174,7 +158,6 @@
+ 
+ # log files (own logfiles only)
+ allow freshclam_t freshclam_var_log_t:file create_file_perms;
+-allow freshclam_t freshclam_var_log_t:sock_file create_file_perms;
+ allow freshclam_t freshclam_var_log_t:dir { rw_dir_perms setattr };
+ allow freshclam_t clamd_var_log_t:dir search;
+ logging_log_filetrans(freshclam_t,freshclam_var_log_t,file)
+@@ -234,7 +217,6 @@
+ 
+ # var/lib files together with clamd
+ allow clamscan_t clamd_var_lib_t:file r_file_perms;
+-allow clamscan_t clamd_var_lib_t:sock_file rw_file_perms;
+ allow clamscan_t clamd_var_lib_t:dir r_dir_perms;
+ 
+ kernel_read_kernel_sysctls(clamscan_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 16:27:33.000000000 -0400
+@@ -81,6 +81,7 @@
+ allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow cupsd_t self:unix_dgram_socket create_socket_perms;
+ allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow cupsd_t self:netlink_selinux_socket create_socket_perms;
+ allow cupsd_t self:netlink_route_socket r_netlink_socket_perms;
+ allow cupsd_t self:tcp_socket { create_stream_socket_perms connectto acceptfrom recvfrom };
+ allow cupsd_t self:udp_socket create_socket_perms;
+@@ -153,6 +154,8 @@
+ dev_read_sysfs(cupsd_t)
+ dev_read_usbfs(cupsd_t)
+ 
++domain_read_all_domains_state(cupsd_t)
++
+ fs_getattr_all_fs(cupsd_t)
+ fs_search_auto_mountpoints(cupsd_t)
+ # from old usercanread attrib:
+@@ -202,7 +205,8 @@
+ # invoking ghostscript needs to read fonts
+ miscfiles_read_fonts(cupsd_t)
+ 
+-seutil_dontaudit_read_config(cupsd_t)
++seutil_read_config(cupsd_t)
++selinux_compute_access_vector(cupsd_t)
+ 
+ sysnet_read_config(cupsd_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
+--- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-17 11:43:02.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -159,17 +703,79 @@
  
  allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.3.2/policy/modules/services/hal.fc
---- nsaserefpolicy/policy/modules/services/hal.fc	2005-10-06 17:29:17.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.fc	2006-07-07 07:37:00.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /etc/hal/device\.d/printer_remove\.hal -- 	gen_context(system_u:object_r:hald_exec_t,s0)
- /etc/hal/capability\.d/printer_update\.hal --	gen_context(system_u:object_r:hald_exec_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.2/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-06-21 16:21:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/hal.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
+--- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -29,6 +29,7 @@
+ /var/run/dovecot(-login)?(/.*)?		gen_context(system_u:object_r:dovecot_var_run_t,s0)
+ 
+ /var/spool/dovecot(/.*)?		gen_context(system_u:object_r:dovecot_spool_t,s0)
++/var/lib/dovecot(/.*)?			gen_context(system_u:object_r:dovecot_var_lib_t,s0)
+ 
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.3.3/policy/modules/services/dovecot.te
+--- nsaserefpolicy/policy/modules/services/dovecot.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/dovecot.te	2006-07-17 11:43:02.000000000 -0400
+@@ -30,6 +30,10 @@
+ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t)
+ role system_r types dovecot_auth_t;
+ 
++# /var/lib/dovecot holds SSL parameters file
++type dovecot_var_lib_t;
++files_type(dovecot_var_lib_t) 
++
+ ########################################
+ #
+ # dovecot local policy
+@@ -186,6 +190,11 @@
+ 
+ sysnet_dns_name_resolve(dovecot_auth_t)
+ 
++# Allow dovecot to create and read SSL parameters file
++files_search_var_lib(dovecot_t)
++allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms;
++allow dovecot_t dovecot_var_lib_t:file manage_file_perms;
++
+ optional_policy(`
+ 	kerberos_use(dovecot_auth_t)
+ ')
+@@ -201,3 +210,4 @@
+ optional_policy(`
+ 	nscd_socket_use(dovecot_auth_t)
+ ')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.3.3/policy/modules/services/ftp.te
+--- nsaserefpolicy/policy/modules/services/ftp.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ftp.te	2006-07-17 11:43:02.000000000 -0400
+@@ -50,6 +50,7 @@
+ allow ftpd_t self:unix_stream_socket create_stream_socket_perms;
+ allow ftpd_t self:tcp_socket create_stream_socket_perms;
+ allow ftpd_t self:udp_socket create_socket_perms;
++allow ftpd_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow ftpd_t ftpd_etc_t:file r_file_perms;
+ 
+@@ -185,6 +186,7 @@
+ 
+ 	ifdef(`targeted_policy',`
+ 		userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file })
++	       apache_search_sys_content(ftpd_t)
+ 	')
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-17 11:43:02.000000000 -0400
+@@ -22,7 +22,7 @@
+ #
+ 
+ # execute openvt which needs setuid
+-allow hald_t self:capability { chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
++allow hald_t self:capability { audit_write chown setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio sys_tty_config };
+ dontaudit hald_t self:capability sys_tty_config;
+ allow hald_t self:process signal_perms;
+ allow hald_t self:fifo_file rw_file_perms;
 @@ -163,6 +163,10 @@
  ')
  
@@ -181,14 +787,203 @@
  	clock_domtrans(hald_t)
  ')
  
-@@ -238,3 +242,4 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.3.3/policy/modules/services/inetd.te
+--- nsaserefpolicy/policy/modules/services/inetd.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/inetd.te	2006-07-19 21:52:57.000000000 -0400
+@@ -218,10 +218,6 @@
+ 
+ sysnet_read_config(inetd_child_t)
+ 
+-tunable_policy(`run_ssh_inetd',`
+-	corenet_tcp_bind_ssh_port(inetd_t)
+-')
+-
+ optional_policy(`
+ 	tunable_policy(`ftpd_is_daemon',`
+ 		# Allows it to check exec privs on daemon
+@@ -240,3 +236,11 @@
+ optional_policy(`
+ 	nscd_socket_use(inetd_child_t)
+ ')
++
++ifdef(`strict_policy', `
++	tunable_policy(`run_ssh_inetd',`
++		corenet_tcp_bind_ssh_port(inetd_t)
++	')
++')
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
+--- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-18 10:41:23.000000000 -0400
+@@ -62,7 +62,7 @@
+ 	allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms;
+ 	allow $1_lpr_t self:tcp_socket create_socket_perms;
+ 	allow $1_lpr_t self:udp_socket create_socket_perms;
+-	
++	allow $1_lpr_t self:netlink_route_socket r_netlink_socket_perms;	
+ 	# lpr can run in lightweight mode, without a local print spooler.
+ 	allow $1_lpr_t lpd_var_run_t:dir search;
+ 	allow $1_lpr_t lpd_var_run_t:sock_file write;
+@@ -108,8 +108,13 @@
+ 	allow lpd_t $1_print_spool_t:file r_file_perms;
+ 	allow lpd_t $1_print_spool_t:file link_file_perms;
+ 
++	dev_read_rand($1_lpr_t)
++	dev_read_urand($1_lpr_t)
++
+ 	kernel_tcp_recvfrom($1_lpr_t)
++	kernel_read_kernel_sysctls($1_lpr_t)
+ 
++	corenet_non_ipsec_sendrecv($1_lpr_t)
+ 	corenet_tcp_sendrecv_generic_if($1_lpr_t)
+ 	corenet_udp_sendrecv_generic_if($1_lpr_t)
+ 	corenet_tcp_sendrecv_all_nodes($1_lpr_t)
+@@ -149,6 +154,8 @@
+ 	userdom_read_user_tmp_symlinks($1,$1_lpr_t)
+ 	# Write to the user domain tty.
+ 	userdom_use_user_terminals($1,$1_lpr_t)
++	userdom_read_user_home_content_files($1,$1_lpr_t)
++	userdom_read_user_tmp_files($1,$1_lpr_t)
+ 
+ 	tunable_policy(`read_default_t',`
+ 		files_list_default($1_lpr_t)
+@@ -158,8 +165,6 @@
+ 
+ 	tunable_policy(`read_untrusted_content',`
+ 		#list and read user specific untrusted content
+-		files_list_home($1_lpr_t)
+-		userdom_list_user_home_dirs($1,$1_lpr_t)
+ 		userdom_read_user_untrusted_content_files($1,$1_lpr_t)
+ 
+ 		#list and read user specific temporary untrusted content
+@@ -186,6 +191,7 @@
+ 		cups_tcp_connect($1_lpr_t)
+ 		cups_read_config($2)
+ 		cups_tcp_connect($2)
++		cups_stream_connect($1_lpr_t)
+ 	')
+ 
+ 	optional_policy(`
+@@ -199,14 +205,6 @@
+ 	optional_policy(`
+ 		nis_use_ypbind($1_lpr_t)
+ 	')
+-
+-	ifdef(`TODO',`
+-	optional_policy(`
+-		allow $1_lpr_t xdm_t:fd use;
+-		allow $1_lpr_t xdm_var_run_t:dir search;
+-		allow $1_lpr_t xdm_t:fifo_file { getattr read write ioctl };
+-	')
+-	') dnl end TODO
+ ')
+ 
+ #######################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.te serefpolicy-2.3.3/policy/modules/services/mailman.te
+--- nsaserefpolicy/policy/modules/services/mailman.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/mailman.te	2006-07-17 12:13:02.000000000 -0400
+@@ -6,8 +6,6 @@
+ # Declarations
+ #
+ 
+-mailman_domain_template(cgi)
+-
+ type mailman_data_t;
+ files_type(mailman_data_t)
+ 
+@@ -25,17 +23,28 @@
+ 
+ mailman_domain_template(queue)
+ 
++mailman_domain_template(cgi)
++
+ ########################################
+ #
+ # Mailman CGI local policy
+ #
+ 
+-# cjp: the template invocation for queue should be
++# cjp: the template invocation for queue and cgi should be
+ # in the below optional policy; however, there are no
+ # optionals for file contexts yet, so it is promoted
+ # to global scope until such facilities exist.
+ 
  optional_policy(`
- 	vbetool_domtrans(hald_t)
++	allow mailman_cgi_t self:netlink_route_socket r_netlink_socket_perms;
++
++	nscd_socket_use(mailman_cgi_t)
++
++	allow mailman_cgi_t urandom_device_t:chr_file { getattr read };
++
++# for python pre-compile foolishness
++	dontaudit mailman_cgi_t lib_t:dir write;
++
+ 	allow mailman_cgi_t mailman_archive_t:dir create_dir_perms;
+ 	allow mailman_cgi_t mailman_archive_t:lnk_file create_lnk_perms;
+ 	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-07-17 11:43:02.000000000 -0400
+@@ -144,3 +144,23 @@
+ 
+ 	allow $1 nscd_t:nscd *;
  ')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.2/policy/modules/services/pegasus.if
---- nsaserefpolicy/policy/modules/services/pegasus.if	2005-10-25 13:40:18.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.if	2006-07-07 07:37:00.000000000 -0400
++########################################
++## <summary>
++##	Allow the specified domain to execute nscd
++##	in the caller domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`nscd_exec',`
++	gen_require(`
++		type nscd_exec_t;
++	')
++
++	can_exec($1,nscd_exec_t)
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
+--- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 15:55:47.000000000 -0400
+@@ -33,6 +33,10 @@
+ allow openvpn_t self:unix_stream_socket { create_stream_socket_perms connectto };
+ allow openvpn_t self:udp_socket create_socket_perms;
+ allow openvpn_t self:tcp_socket create_socket_perms;
++allow openvpn_t self:netlink_route_socket r_netlink_socket_perms;
++
++# Need to interact with terminals if config option "auth-user-pass" is used
++term_use_generic_ptys(openvpn_t)
+ 
+ allow openvpn_t openvpn_etc_t:dir r_dir_perms;
+ allow openvpn_t openvpn_etc_t:file r_file_perms;
+@@ -67,6 +71,9 @@
+ corenet_sendrecv_openvpn_server_packets(openvpn_t)
+ corenet_rw_tun_tap_dev(openvpn_t)
+ 
++init_use_fds(openvpn_t)
++
++dev_search_sysfs(openvpn_t)
+ dev_read_rand(openvpn_t)
+ dev_read_urand(openvpn_t)
+ 
+@@ -80,6 +87,7 @@
+ 
+ miscfiles_read_localization(openvpn_t)
+ 
++sysnet_dns_name_resolve(openvpn_t)
+ sysnet_exec_ifconfig(openvpn_t)
+ 
+ ifdef(`targeted_policy',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.3.3/policy/modules/services/pegasus.if
+--- nsaserefpolicy/policy/modules/services/pegasus.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.if	2006-07-17 11:43:02.000000000 -0400
 @@ -1 +1,32 @@
  ## <summary>The Open Group Pegasus CIM/WBEM Server.</summary>
 +
@@ -222,9 +1017,9 @@
 +	allow pegasus_t $1:fifo_file rw_file_perms;
 +	allow pegasus_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.2/policy/modules/services/pegasus.te
---- nsaserefpolicy/policy/modules/services/pegasus.te	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/pegasus.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.3.3/policy/modules/services/pegasus.te
+--- nsaserefpolicy/policy/modules/services/pegasus.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/pegasus.te	2006-07-17 11:43:02.000000000 -0400
 @@ -100,13 +100,12 @@
  
  auth_use_nsswitch(pegasus_t)
@@ -241,9 +1036,381 @@
  files_read_var_lib_symlinks(pegasus_t)
  
  hostname_exec(pegasus_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.2/policy/modules/services/squid.te
---- nsaserefpolicy/policy/modules/services/squid.te	2006-07-07 07:35:32.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/squid.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-07-17 12:13:57.000000000 -0400
+@@ -160,7 +160,7 @@
+ 
+ init_use_script_ptys(postfix_master_t)
+ 
+-miscfiles_dontaudit_search_man_pages(postfix_master_t)
++miscfiles_read_man_pages(postfix_master_t)
+ 
+ seutil_sigchld_newrole(postfix_master_t)
+ # postfix does a "find" on startup for some reason - keep it quiet
+@@ -593,3 +593,7 @@
+ optional_policy(`
+ 	sasl_connect(postfix_smtpd_t)
+ ')
++
++optional_policy(`
++	postgrey_socket_access(postfix_smtpd_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.fc serefpolicy-2.3.3/policy/modules/services/postgrey.fc
+--- nsaserefpolicy/policy/modules/services/postgrey.fc	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.fc	2006-07-17 12:18:17.000000000 -0400
+@@ -6,3 +6,5 @@
+ /var/run/postgrey\.pid	--	gen_context(system_u:object_r:postgrey_var_run_t,s0)
+ 
+ /var/lib/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_lib_t,s0)
++
++/var/run/postgrey(/.*)?		gen_context(system_u:object_r:postgrey_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.if serefpolicy-2.3.3/policy/modules/services/postgrey.if
+--- nsaserefpolicy/policy/modules/services/postgrey.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.if	2006-07-17 13:32:46.000000000 -0400
+@@ -1 +1,20 @@
+ ## <summary>Postfix grey-listing server</summary>
++
++########################################
++## <summary>
++##      Write to postgrey socket
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed to talk to postgrey
++##      </summary>
++## </param>
++#
++interface(`postgrey_socket_access',`
++        gen_require(`
++                type postgrey_var_run_t, postgrey_t;
++        ')
++
++        allow $1 postgrey_var_run_t:sock_file write;
++	allow $1 postgrey_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postgrey.te serefpolicy-2.3.3/policy/modules/services/postgrey.te
+--- nsaserefpolicy/policy/modules/services/postgrey.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postgrey.te	2006-07-17 12:19:30.000000000 -0400
+@@ -40,6 +40,7 @@
+ allow postgrey_t postgrey_var_run_t:file create_file_perms;
+ allow postgrey_t postgrey_var_run_t:dir rw_dir_perms;
+ files_pid_filetrans(postgrey_t,postgrey_var_run_t,file)
++allow postgrey_t postgrey_var_run_t:sock_file manage_file_perms;
+ 
+ kernel_read_system_state(postgrey_t)
+ kernel_read_kernel_sysctls(postgrey_t)
+@@ -103,3 +104,22 @@
+ optional_policy(`
+ 	udev_read_db(postgrey_t)
+ ')
++
++########################################
++## <summary>
++##      Write to postgrey socket
++## </summary>
++## <param name="domain">
++##      <summary>
++##      Domain allowed to talk to postgrey
++##      </summary>
++## </param>
++#
++interface(`postgrey_socket_access',`
++        gen_require(`
++                type postgrey_var_run_t, postgrey_t;
++        ')
++
++        allow $1 postgrey_var_run_t:sock_file write;
++	allow $1 postgrey_t:unix_stream_socket connectto;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.3.3/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/procmail.te	2006-07-17 12:16:02.000000000 -0400
+@@ -29,6 +29,7 @@
+ kernel_read_kernel_sysctls(procmail_t)
+ 
+ corenet_non_ipsec_sendrecv(procmail_t)
++corenet_udp_bind_inaddr_any_node(procmail_t)
+ corenet_tcp_sendrecv_all_if(procmail_t)
+ corenet_udp_sendrecv_all_if(procmail_t)
+ corenet_tcp_sendrecv_all_nodes(procmail_t)
+@@ -82,6 +83,10 @@
+ ')
+ 
+ optional_policy(`
++	access_clam_home(procmail_t)
++')
++
++optional_policy(`
+ 	logging_send_syslog_msg(procmail_t)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.fc serefpolicy-2.3.3/policy/modules/services/radius.fc
+--- nsaserefpolicy/policy/modules/services/radius.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -3,6 +3,7 @@
+ /etc/cron\.(daily|weekly|monthly)/freeradius -- gen_context(system_u:object_r:radiusd_exec_t,s0)
+ 
+ /etc/raddb(/.*)?                gen_context(system_u:object_r:radiusd_etc_t,s0)
++/etc/raddb/db.daily     --      gen_context(system_u:object_r:radiusd_etc_rw_t,s0)
+ 
+ /usr/sbin/radiusd	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
+ /usr/sbin/freeradius	--	gen_context(system_u:object_r:radiusd_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radius.te serefpolicy-2.3.3/policy/modules/services/radius.te
+--- nsaserefpolicy/policy/modules/services/radius.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/radius.te	2006-07-17 11:43:02.000000000 -0400
+@@ -13,6 +13,9 @@
+ type radiusd_etc_t;
+ files_config_file(radiusd_etc_t)
+ 
++type radiusd_etc_rw_t;
++files_type(radiusd_etc_rw_t)
++
+ type radiusd_log_t;
+ logging_log_file(radiusd_log_t)
+ 
+@@ -39,6 +42,11 @@
+ allow radiusd_t radiusd_etc_t:lnk_file { getattr read };
+ files_search_etc(radiusd_t)
+ 
++allow radiusd_t radiusd_etc_rw_t:dir create_dir_perms;
++allow radiusd_t radiusd_etc_rw_t:file create_file_perms;
++allow radiusd_t radiusd_etc_rw_t:lnk_file create_lnk_perms;
++type_transition radiusd_t radiusd_etc_t:{ dir file lnk_file } radiusd_etc_rw_t;
++
+ allow radiusd_t radiusd_log_t:file create_file_perms;
+ allow radiusd_t radiusd_log_t:dir create_dir_perms;
+ logging_log_filetrans(radiusd_t,radiusd_log_t,{ file dir })
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.3.3/policy/modules/services/remotelogin.te
+--- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/remotelogin.te	2006-07-17 11:43:02.000000000 -0400
+@@ -37,6 +37,7 @@
+ allow remote_login_t self:sem create_sem_perms;
+ allow remote_login_t self:msgq create_msgq_perms;
+ allow remote_login_t self:msg { send receive };
++allow remote_login_t self:key write;
+ 
+ allow remote_login_t remote_login_tmp_t:dir create_dir_perms;
+ allow remote_login_t remote_login_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
+--- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-07-17 12:16:42.000000000 -0400
+@@ -186,11 +186,12 @@
+ allow smbd_t self:udp_socket create_socket_perms;
+ allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
+ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
++allow smbd_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow smbd_t samba_etc_t:dir rw_dir_perms;
+ allow smbd_t samba_etc_t:file { rw_file_perms setattr };
+ 
+-allow smbd_t samba_log_t:dir ra_dir_perms;
++allow smbd_t samba_log_t:dir { ra_dir_perms setattr };
+ dontaudit smbd_t samba_log_t:dir remove_name;
+ allow smbd_t samba_log_t:file { create ra_file_perms };
+ 
+@@ -313,6 +314,7 @@
+ 
+ optional_policy(`
+ 	cups_read_rw_config(smbd_t)
++	cups_stream_connect(smbd_t)
+ ')
+ 
+ optional_policy(`
+@@ -365,7 +367,7 @@
+ allow nmbd_t samba_etc_t:dir { search getattr };
+ allow nmbd_t samba_etc_t:file { getattr read };
+ 
+-allow nmbd_t samba_log_t:dir ra_dir_perms;
++allow nmbd_t samba_log_t:dir { ra_dir_perms setattr };
+ allow nmbd_t samba_log_t:file { create ra_file_perms };
+ 
+ allow nmbd_t samba_var_t:dir rw_dir_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.fc serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.fc	2006-07-21 08:40:27.000000000 -0400
+@@ -0,0 +1,11 @@
++# setroubleshoot executables
++
++/usr/lib/audit/setroubleshoot_dispatcher	--	gen_context(system_u:object_r:setroubleshoot_exec_t,s0)
++
++/usr/sbin/setroubleshootd		--	gen_context(system_u:object_r:setroubleshootd_exec_t,s0)
++
++/var/run/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_run_t,s0)
++
++/var/log/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_log_t,s0)
++
++/var/lib/setroubleshoot(/.*)?			gen_context(system_u:object_r:setroubleshoot_var_lib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.if	2006-07-17 11:43:02.000000000 -0400
+@@ -0,0 +1,24 @@
++## <summary>policy for setroubleshoot</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run setroubleshoot.
++## </summary>
++## <param name="domain">
++## <summary>
++##	Domain allowed to transition.
++## </summary>
++## </param>
++#
++interface(`setroubleshoot_domtrans',`
++	gen_require(`
++		type setroubleshoot_t, setroubleshoot_exec_t;
++	')
++
++	domain_auto_trans($1,setroubleshoot_exec_t,setroubleshoot_t)
++
++	allow $1 setroubleshoot_t:fd use;
++	allow setroubleshoot_t $1:fd use;
++	allow setroubleshoot_t $1:fifo_file rw_file_perms;
++	allow setroubleshoot_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
+--- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-21 08:40:09.000000000 -0400
+@@ -0,0 +1,135 @@
++policy_module(setroubleshoot,1.0.0)
++
++########################################
++#
++# Declarations 
++#
++
++type setroubleshootd_t;
++type setroubleshootd_exec_t;
++domain_type(setroubleshootd_t)
++init_daemon_domain(setroubleshootd_t, setroubleshootd_exec_t)
++
++type setroubleshoot_t;
++type setroubleshoot_exec_t;
++domain_type(setroubleshoot_t)
++corecmd_executable_file(setroubleshoot_exec_t)
++
++# log files
++type setroubleshoot_var_log_t;
++logging_log_file(setroubleshoot_var_log_t)
++
++# pid files
++type setroubleshoot_var_run_t;
++files_pid_file(setroubleshoot_var_run_t)
++
++type setroubleshoot_var_lib_t;
++files_type(setroubleshoot_var_lib_t)
++
++########################################
++#
++# setroubleshootd local policy
++#
++
++files_read_etc_files(setroubleshootd_t)
++libs_use_ld_so(setroubleshootd_t)
++libs_use_shared_libs(setroubleshootd_t)
++miscfiles_read_localization(setroubleshootd_t)
++
++logging_send_syslog_msg(setroubleshootd_t)
++
++# pid file
++allow setroubleshootd_t setroubleshoot_var_run_t:file manage_file_perms;
++allow setroubleshootd_t setroubleshoot_var_run_t:sock_file manage_file_perms;
++allow setroubleshootd_t setroubleshoot_var_run_t:dir rw_dir_perms;
++files_pid_filetrans(setroubleshootd_t,setroubleshoot_var_run_t, { file sock_file })
++
++# log files
++allow setroubleshootd_t setroubleshoot_var_log_t:file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_log_t:sock_file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_log_t:dir { rw_dir_perms setattr };
++logging_log_filetrans(setroubleshootd_t,setroubleshoot_var_log_t,{ file dir })
++
++# database files
++allow setroubleshootd_t setroubleshoot_var_lib_t:file create_file_perms;
++allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
++files_var_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
++
++allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
++
++corenet_tcp_bind_generic_node(setroubleshootd_t)
++corenet_tcp_bind_lo_node(setroubleshootd_t)
++corenet_tcp_bind_setroubleshoot_port(setroubleshootd_t)
++
++corecmd_exec_sbin(setroubleshootd_t)
++corecmd_exec_bin(setroubleshootd_t)
++
++dev_read_urand(setroubleshootd_t)
++
++kernel_read_kernel_sysctls(setroubleshootd_t)
++kernel_read_system_state(setroubleshootd_t)
++
++sysnet_read_config(setroubleshootd_t)
++
++init_read_utmp(setroubleshootd_t)
++init_dontaudit_write_utmp(setroubleshootd_t)
++init_use_fds(setroubleshootd_t)
++
++term_dontaudit_use_console(setroubleshootd_t)
++term_dontaudit_use_generic_ptys(setroubleshootd_t)
++
++########################################
++#
++# setroubleshoot local policy
++#
++
++
++files_dontaudit_search_home(setroubleshootd_t)
++files_read_etc_files(setroubleshoot_t)
++
++libs_use_ld_so(setroubleshoot_t)
++libs_use_shared_libs(setroubleshoot_t)
++
++miscfiles_read_localization(setroubleshoot_t)
++
++allow setroubleshootd_t self:capability { dac_override sys_tty_config };
++
++allow setroubleshoot_t self:process { signal getattr };
++allow setroubleshoot_t self:fifo_file { read write };
++allow setroubleshoot_t self:unix_stream_socket create_stream_socket_perms;
++allow setroubleshoot_t self:unix_dgram_socket create_socket_perms;
++
++corecmd_exec_sbin(setroubleshoot_t)
++corecmd_exec_bin(setroubleshoot_t)
++
++logging_send_syslog_msg(setroubleshoot_t)
++
++kernel_read_kernel_sysctls(setroubleshoot_t)
++kernel_read_system_state(setroubleshoot_t)
++
++files_dontaudit_getattr_tmp_dirs(setroubleshoot_t)
++files_read_usr_files(setroubleshoot_t)
++files_read_usr_symlinks(setroubleshoot_t)
++
++seutil_read_config(setroubleshoot_t)
++selinux_get_enforce_mode(setroubleshoot_t)
++
++# log files
++logging_search_logs(setroubleshoot_t)
++allow setroubleshoot_t setroubleshoot_var_log_t:file create_file_perms;
++allow setroubleshoot_t setroubleshoot_var_log_t:sock_file rw_file_perms;
++allow setroubleshoot_t setroubleshoot_var_log_t:dir r_dir_perms;
++
++files_search_pids(setroubleshoot_t)
++allow setroubleshoot_t setroubleshoot_var_run_t:dir r_dir_perms;
++allow setroubleshoot_t setroubleshoot_var_run_t:sock_file rw_file_perms;
++
++
++allow setroubleshoot_t setroubleshootd_t:unix_stream_socket { connectto rw_stream_socket_perms };
++
++allow setroubleshoot_t setroubleshoot_exec_t:file { entrypoint getattr ioctl read };
++
++optional_policy(`
++	rpm_read_db(setroubleshoot_t)
++	rpm_dontaudit_manage_db(setroubleshoot_t)
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
+--- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-19 11:33:04.000000000 -0400
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -255,9 +1422,30 @@
  corenet_tcp_connect_ftp_port(squid_t)
  corenet_tcp_connect_gopher_port(squid_t)
  corenet_tcp_connect_http_port(squid_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.2/policy/modules/services/tftp.te
---- nsaserefpolicy/policy/modules/services/tftp.te	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/tftp.te	2006-07-07 07:37:00.000000000 -0400
+@@ -176,9 +178,6 @@
+ ')
+ 
+ ifdef(`TODO',`
+-ifdef(`apache.te',`
+-can_tcp_connect(squid_t, httpd_t)
+-')
+ #squid requires the following when run in diskd mode, the recommended setting
+ allow squid_t tmpfs_t:file { read write };
+ ') dnl end TODO
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.3.3/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ssh.if	2006-07-21 09:52:20.000000000 -0400
+@@ -71,6 +71,7 @@
+ 	allow $1_ssh_t self:msgq create_msgq_perms;
+ 	allow $1_ssh_t self:msg { send receive };
+ 	allow $1_ssh_t self:tcp_socket create_socket_perms;
++	allow $1_ssh_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ 	# for rsync
+ 	allow $1_ssh_t $2:unix_stream_socket rw_socket_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/tftp.te serefpolicy-2.3.3/policy/modules/services/tftp.te
+--- nsaserefpolicy/policy/modules/services/tftp.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/tftp.te	2006-07-17 11:43:02.000000000 -0400
 @@ -78,6 +78,7 @@
  miscfiles_read_localization(tftpd_t)
  
@@ -266,9 +1454,21 @@
  
  userdom_dontaudit_use_unpriv_user_fds(tftpd_t)
  userdom_dontaudit_use_sysadm_ttys(tftpd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.2/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-06-08 08:45:58.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/services/xserver.if	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.3.3/policy/modules/services/xfs.te
+--- nsaserefpolicy/policy/modules/services/xfs.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xfs.te	2006-07-17 15:49:07.000000000 -0400
+@@ -59,6 +59,8 @@
+ term_dontaudit_use_console(xfs_t)
+ 
+ auth_use_nsswitch(xfs_t)
++dev_read_urand(xfs_t)
++dev_read_rand(xfs_t)
+ 
+ init_use_fds(xfs_t)
+ init_use_script_ptys(xfs_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.3.3/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.if	2006-07-17 11:43:02.000000000 -0400
 @@ -317,7 +317,6 @@
  	')
  
@@ -305,9 +1505,113 @@
 +	allow $1 xdm_xserver_tmp_t:dir search_dir_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.2/policy/modules/system/hostname.te
---- nsaserefpolicy/policy/modules/system/hostname.te	2006-03-02 18:45:56.000000000 -0500
-+++ serefpolicy-2.3.2/policy/modules/system/hostname.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-07-17 11:43:02.000000000 -0400
+@@ -88,6 +88,7 @@
+ allow xdm_t self:unix_dgram_socket create_socket_perms;
+ allow xdm_t self:tcp_socket create_stream_socket_perms;
+ allow xdm_t self:udp_socket create_socket_perms;
++allow xdm_t self:key write;
+ 
+ # Supress permission check on .ICE-unix
+ dontaudit xdm_t ice_tmp_t:dir { getattr setattr };
+@@ -331,7 +332,7 @@
+ ')
+ 
+ optional_policy(`
+-	consoletype_domtrans(xdm_t)
++	consoletype_exec(xdm_t)
+ ')
+ 
+ optional_policy(`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.3.3/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/zebra.te	2006-07-19 15:07:01.000000000 -0400
+@@ -42,6 +42,11 @@
+ allow zebra_t zebra_conf_t:file r_file_perms;
+ allow zebra_t zebra_conf_t:lnk_file { getattr read };
+ 
++tunable_policy(`allow_zebra_write_config',`
++	allow zebra_t zebra_conf_t:dir write;
++	allow zebra_t zebra_conf_t:file write;
++')
++
+ allow zebra_t zebra_log_t:file create_file_perms;
+ allow zebra_t zebra_log_t:sock_file create_file_perms;
+ allow zebra_t zebra_log_t:dir { rw_dir_perms setattr };
+@@ -73,9 +78,11 @@
+ corenet_tcp_bind_all_nodes(zebra_t)
+ corenet_udp_bind_all_nodes(zebra_t)
+ corenet_tcp_bind_zebra_port(zebra_t)
++corenet_tcp_bind_bgp_port(zebra_t)
+ corenet_udp_bind_router_port(zebra_t)
+ corenet_sendrecv_zebra_server_packets(zebra_t)
+ corenet_sendrecv_router_server_packets(zebra_t)
++corenet_tcp_connect_bgp_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/authlogin.if serefpolicy-2.3.3/policy/modules/system/authlogin.if
+--- nsaserefpolicy/policy/modules/system/authlogin.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.if	2006-07-17 11:43:02.000000000 -0400
+@@ -1336,3 +1336,6 @@
+ 	typeattribute $1 can_write_shadow_passwords;
+ 	typeattribute $1 can_relabelto_shadow_passwords;
+ ')
++
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.3.3/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/authlogin.te	2006-07-17 12:30:07.000000000 -0400
+@@ -193,6 +193,7 @@
+ term_setattr_console(pam_console_t)
+ term_getattr_unallocated_ttys(pam_console_t)
+ term_setattr_unallocated_ttys(pam_console_t)
++term_use_unallocated_ttys(pam_console_t)
+ 
+ auth_use_nsswitch(pam_console_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.3.3/policy/modules/system/fstools.fc
+--- nsaserefpolicy/policy/modules/system/fstools.fc	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/fstools.fc	2006-07-17 12:25:16.000000000 -0400
+@@ -1,3 +1,4 @@
++/sbin/blkid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/blockdev		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/cfdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+ /sbin/dosfsck		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.fc serefpolicy-2.3.3/policy/modules/system/getty.fc
+--- nsaserefpolicy/policy/modules/system/getty.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -9,3 +9,4 @@
+ /var/run/mgetty\.pid.*	--	gen_context(system_u:object_r:getty_var_run_t,s0)
+ 
+ /var/spool/fax		--	gen_context(system_u:object_r:getty_var_run_t,s0)
++/var/spool/voice	--	gen_context(system_u:object_r:getty_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.3.3/policy/modules/system/getty.te
+--- nsaserefpolicy/policy/modules/system/getty.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/getty.te	2006-07-17 11:43:02.000000000 -0400
+@@ -37,7 +37,7 @@
+ #
+ 
+ # Use capabilities.
+-allow getty_t self:capability { dac_override chown sys_resource sys_tty_config fowner fsetid };
++allow getty_t self:capability { dac_override chown setgid sys_resource sys_tty_config fowner fsetid };
+ dontaudit getty_t self:capability sys_tty_config;
+ allow getty_t self:process { getpgid getsession signal_perms };
+ 
+@@ -90,6 +90,7 @@
+ files_rw_generic_pids(getty_t)
+ files_read_etc_runtime_files(getty_t)
+ files_read_etc_files(getty_t)
++files_search_spool(getty_t)
+ 
+ init_rw_utmp(getty_t)
+ init_use_script_ptys(getty_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
+--- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-17 11:43:02.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -320,9 +1624,21 @@
  role system_r types hostname_t;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.2/policy/modules/system/init.if
---- nsaserefpolicy/policy/modules/system/init.if	2006-06-06 22:21:56.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/init.if	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
+--- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-07-17 11:43:02.000000000 -0400
+@@ -136,7 +136,7 @@
+ 	term_dontaudit_use_generic_ptys(hotplug_t)
+ 
+ 	optional_policy(`
+-		consoletype_domtrans(hotplug_t)
++		consoletype_exec(hotplug_t)
+ 	')
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.3.3/policy/modules/system/init.if
+--- nsaserefpolicy/policy/modules/system/init.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/init.if	2006-07-17 11:43:02.000000000 -0400
 @@ -158,13 +158,6 @@
  	allow $1 initrc_t:fifo_file rw_file_perms;
  	allow $1 initrc_t:process sigchld;
@@ -337,10 +1653,84 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.2/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-06-13 07:03:48.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/selinuxutil.te	2006-07-07 07:37:00.000000000 -0400
-@@ -352,6 +352,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -198,7 +198,7 @@
+ # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
+ /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libavformat-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-07-17 11:43:02.000000000 -0400
+@@ -51,6 +51,7 @@
+ allow local_login_t self:sem create_sem_perms;
+ allow local_login_t self:msgq create_msgq_perms;
+ allow local_login_t self:msg { send receive };
++allow local_login_t self:key write;
+ 
+ allow local_login_t local_login_lock_t:file create_file_perms;
+ files_lock_filetrans(local_login_t,local_login_lock_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
+--- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-18 09:01:57.000000000 -0400
+@@ -165,6 +165,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 auditd_etc_t:dir rw_dir_perms;
+ 	allow $1 auditd_etc_t:file create_file_perms;
+ ')
+ 
+@@ -287,6 +288,7 @@
+ 	')
+ 
+ 	files_search_etc($1)
++	allow $1 auditd_etc_t:dir r_dir_perms;
+ 	allow $1 auditd_etc_t:file r_file_perms;
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-17 11:43:02.000000000 -0400
+@@ -140,7 +140,7 @@
+ # Probably want a transition, and a new auditd_helper app
+ corecmd_exec_sbin(auditd_t)
+ corecmd_exec_bin(auditd_t)
+-
++corecmd_exec_shell(auditd_t)
+ 
+ domain_use_interactive_fds(auditd_t)
+ 
+@@ -176,6 +176,10 @@
+ ')
+ 
+ optional_policy(`
++	setroubleshoot_domtrans(auditd_t)
++')
++
++optional_policy(`
+ 	seutil_sigchld_newrole(auditd_t)
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-20 11:25:38.000000000 -0400
+@@ -258,6 +258,8 @@
+ allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
+ allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
+ 
++domain_interactive_fd(semanage_t)
++
+ kernel_read_system_state(newrole_t)
+ kernel_read_kernel_sysctls(newrole_t)
+ 
+@@ -352,6 +354,8 @@
  kernel_relabelfrom_unlabeled_symlinks(restorecon_t)
  kernel_relabelfrom_unlabeled_pipes(restorecon_t)
  kernel_relabelfrom_unlabeled_sockets(restorecon_t)
@@ -349,9 +1739,170 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.2/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.if	2006-07-07 07:37:00.000000000 -0400
+@@ -423,6 +427,7 @@
+ 
+ allow restorecond_t self:capability { dac_override dac_read_search fowner };
+ allow restorecond_t self:fifo_file rw_file_perms;
++allow restorecond_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow restorecond_t restorecond_var_run_t:file create_file_perms;
+ files_pid_filetrans(restorecond_t,restorecond_var_run_t, file)
+@@ -430,6 +435,9 @@
+ auth_relabel_all_files_except_shadow(restorecond_t )
+ auth_read_all_files_except_shadow(restorecond_t)
+ fs_relabelfrom_noxattr_fs(restorecond_t)
++fs_dontaudit_list_nfs(restorecond_t)
++
++init_dontaudit_use_script_ptys(restorecond_t)
+ 
+ kernel_use_fds(restorecond_t)
+ kernel_rw_pipes(restorecond_t)
+@@ -534,20 +542,27 @@
+ # semodule local policy
+ #
+ 
+-allow semanage_t self:capability { dac_override audit_write };
++allow semanage_t self:capability { audit_write dac_override };
+ allow semanage_t self:unix_stream_socket create_stream_socket_perms;
+ allow semanage_t self:unix_dgram_socket create_socket_perms;
+ allow semanage_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay };
++allow semanage_t self:netlink_route_socket r_netlink_socket_perms;
+ 
+ allow semanage_t policy_config_t:file { read write };
+ 
+ allow semanage_t semanage_tmp_t:dir create_dir_perms;
+ allow semanage_t semanage_tmp_t:file create_file_perms;
++
++# Running genhomedircon requires this for finding all users
++auth_use_nsswitch(semanage_t)
++
+ files_tmp_filetrans(semanage_t, semanage_tmp_t, { file dir })
+ 
+ kernel_read_system_state(semanage_t)
+ kernel_read_kernel_sysctls(semanage_t)
+ 
++locallogin_use_fds(semanage_t)
++
+ corecmd_exec_bin(semanage_t)
+ corecmd_exec_sbin(semanage_t)
+ 
+@@ -590,11 +605,15 @@
+ userdom_search_sysadm_home_dirs(semanage_t)
+ 
+ ifdef(`targeted_policy',`
+-# Handle pp files created in homedir and /tmp
++	# Handle pp files created in homedir and /tmp
+ 	files_read_generic_tmp_files(semanage_t)
+ 	userdom_read_generic_user_home_content_files(semanage_t)
+ ')
+ 
++ifdef(`enable_mls',`
++	userdom_read_user_tmp_files(secadm, semanage_t)
++')
++
+ optional_policy(`
+ 	nscd_socket_use(semanage_t)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/setrans.te serefpolicy-2.3.3/policy/modules/system/setrans.te
+--- nsaserefpolicy/policy/modules/system/setrans.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/setrans.te	2006-07-17 11:43:02.000000000 -0400
+@@ -68,3 +68,8 @@
+ miscfiles_read_localization(setrans_t)
+ 
+ seutil_read_config(setrans_t)
++
++optional_policy(`
++	rpm_use_script_fds(setrans_t)
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.3.3/policy/modules/system/sysnetwork.te
+--- nsaserefpolicy/policy/modules/system/sysnetwork.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/sysnetwork.te	2006-07-17 11:43:02.000000000 -0400
+@@ -277,6 +277,7 @@
+ # for /sbin/ip
+ allow ifconfig_t self:packet_socket create_socket_perms;
+ allow ifconfig_t self:netlink_route_socket create_netlink_socket_perms;
++allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read };
+ allow ifconfig_t self:tcp_socket { create ioctl };
+ files_read_etc_files(ifconfig_t);
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.3.3/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/udev.te	2006-07-17 12:22:21.000000000 -0400
+@@ -39,9 +39,9 @@
+ # 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 setuid setgid 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 setuid setgid sys_nice sys_ptrace };
+ 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 ~{ setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow udev_t self:process { execmem setfscreate };
+ allow udev_t self:fd use;
+ allow udev_t self:fifo_file rw_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.3.3/policy/modules/system/unconfined.fc
+--- nsaserefpolicy/policy/modules/system/unconfined.fc	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.fc	2006-07-17 11:43:02.000000000 -0400
+@@ -9,4 +9,5 @@
+ /usr/bin/valgrind 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/local/RealPlay/realplay.bin --	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ /usr/bin/mplayer	 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
++/usr/bin/xine		 	--	gen_context(system_u:object_r:unconfined_execmem_exec_t,s0)
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-20 14:48:42.000000000 -0400
+@@ -20,6 +20,7 @@
+ 	# Use any Linux capability.
+ 	allow $1 self:capability *;
+ 	allow $1 self:fifo_file create_file_perms;
++	allow $1 self:key *;
+ 
+ 	# Transition to myself, to make get_ordered_context_list happy.
+ 	allow $1 self:process transition;
+@@ -52,9 +53,10 @@
+ 		allow $1 self:process execmem;
+ 	')
+ 
+-	tunable_policy(`allow_execmem && allow_execstack',`
+-		# Allow making the stack executable via mprotect.
+-		allow $1 self:process execstack;
++	tunable_policy(`allow_execstack',`
++		# Allow making the stack executable via mprotect;
++		# execstack implies execmem;
++		allow $1 self:process { execstack execmem };
+ #		auditallow $1 self:process execstack;
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-17 11:43:02.000000000 -0400
+@@ -56,10 +56,6 @@
+ 	')
+ 
+ 	optional_policy(`
+-		amanda_domtrans_recover(unconfined_t)
+-	')
+-
+-	optional_policy(`
+ 		apache_domtrans_helper(unconfined_t)
+ 	')
+ 
+@@ -98,6 +94,10 @@
+ 	')
+ 
+ 	optional_policy(`
++		bootloader_domtrans(unconfined_t)
++	')
++
++	optional_policy(`
+ 		dmidecode_domtrans(unconfined_t)
+ 	')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-18 09:32:58.000000000 -0400
 @@ -8,11 +8,10 @@
  ## <desc>
  ##	<p>
@@ -647,7 +2198,41 @@
  	kernel_read_software_raid_state($1_t)
  	kernel_getattr_core_if($1_t)
  	kernel_getattr_message_if($1_t)
-@@ -4128,7 +4150,7 @@
+@@ -855,6 +877,7 @@
+ 	domain_getattr_all_sockets($1_t)
+ 
+ 	files_exec_usr_src_files($1_t)
++	files_create_boot_flag($1_t)
+ 
+ 	init_rw_initctl($1_t)
+ 
+@@ -3408,6 +3431,25 @@
+ 
+ ########################################
+ ## <summary>
++##	Do not audit attempts to append to the sysadm
++##	users home directory.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`userdom_dontaudit_append_sysadm_home_content_files',`
++	gen_require(`
++		type sysadm_home_t;
++	')
++
++	dontaudit $1 sysadm_home_t:file append;
++')
++
++########################################
++## <summary>
+ ##	Read files in the staff users home directory.
+ ## </summary>
+ ## <param name="domain">
+@@ -4128,7 +4170,7 @@
  	gen_require(`
  		type user_home_dir_t;
  	')
@@ -656,7 +2241,7 @@
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
  
-@@ -4789,3 +4811,34 @@
+@@ -4789,3 +4831,34 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_home_filetrans($1,user_home_dir_t,dir)
  ')
@@ -691,9 +2276,9 @@
 +        dontaudit $1_t { $2_devpts_t $2_tty_device_t }:chr_file ioctl;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.2/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-06-22 15:12:02.000000000 -0400
-+++ serefpolicy-2.3.2/policy/modules/system/userdomain.te	2006-07-07 07:37:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-20 16:21:02.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -709,6 +2294,15 @@
  ifdef(`targeted_policy',`
  	# Define some type aliases to help with compatibility with
  	# macros and domains from the "strict" policy.
+@@ -85,7 +77,7 @@
+ 	# compatibility for switching from strict
+ #	dominance { role secadm_r { role system_r; }}
+ #	dominance { role auditadm_r { role system_r; }}
+-#	dominance { role sysadm_r { role system_r; }}
++	dominance { role sysadm_r { role system_r; }}
+ #	dominance { role user_r { role system_r; }}
+ #	dominance { role staff_r { role system_r; }}
+ 
 @@ -124,34 +116,34 @@
  
  	# user role change rules:
@@ -756,3 +2350,35 @@
  	')
  
  	allow privhome home_root_t:dir { getattr search };
+@@ -172,6 +164,8 @@
+ 
+ 	mls_process_read_up(sysadm_t)
+ 
++	term_getattr_all_user_ttys(sysadm_t)
++
+ 	init_exec(sysadm_t)
+ 
+ 	ifdef(`direct_sysadm_daemon',`
+@@ -210,7 +204,9 @@
+ 		init_exec(secadm_t)
+ 		logging_read_audit_log(secadm_t)
+ 	        logging_read_generic_logs(secadm_t)
+-		userdom_dontaudit_append_staff_home_content_files(secadm_t)
++		userdom_dontaudit_append_sysadm_home_content_files(secadm_t)
++		userdom_dontaudit_read_sysadm_home_content_files(secadm_t)
++
+ 	', `
+ 		logging_manage_audit_log(sysadm_t)
+ 		logging_manage_audit_config(sysadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
+--- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-17 11:43:02.000000000 -0400
+@@ -171,7 +171,7 @@
+ netutils_domtrans(xend_t)
+ 
+ optional_policy(`
+-	consoletype_domtrans(xend_t)
++	consoletype_exec(xend_t)
+ ')
+ 
+ ########################################


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- selinux-policy.spec	9 Jul 2006 10:46:56 -0000	1.176
+++ selinux-policy.spec	22 Jul 2006 18:03:11 -0000	1.177
@@ -15,8 +15,8 @@
 %define CHECKPOLICYVER 1.30.3-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.2
-Release: 1.fc5
+Version: 2.3.3
+Release: 8.fc5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -323,6 +323,47 @@
 %endif
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8.fc5
+- Bump for FC5
+
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8
+- Fixes for mls use of ssh
+- named  has a new conf file
+
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-7
+- Fixes to make setroubleshoot work
+
+* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-6
+- Cups needs to be able to read domain state off of printer client
+
+* Wed Jul 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-5
+- add boolean to allow zebra to write config files
+
+* Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-4
+- setroubleshootd fixes
+
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-3
+- Allow prelink to read bin_t symlink
+- allow xfs to read random devices
+- Change gfs to support xattr
+
+
+* Mon Jul 17 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-2
+- Remove spamassassin_can_network boolean
+
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-1
+- Update to upstream
+- Fix lpr domain for mls
+
+* Fri Jul 14 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-4
+- Add setroubleshoot policy
+
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-3
+- Turn off auditallow on setting booleans
+
+* Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-2
+- Multiple fixes
+
 * Fri Jul 7 2006 Dan Walsh <dwalsh at redhat.com> 2.3.2-1.fc5
 - Bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	9 Jul 2006 10:46:56 -0000	1.62
+++ sources	22 Jul 2006 18:03:11 -0000	1.63
@@ -1 +1 @@
-de57afb1e83b5110b90f2aaeeca0c535  serefpolicy-2.3.2.tgz
+ccd4a3f6ed18a4309d0369e3d18bcd57  serefpolicy-2.3.3.tgz



From fedora-cvs-commits at redhat.com  Sat Jul 22 18:53:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 14:53:49 -0400
Subject: rpms/kernel/devel/configs config-generic,1.234,1.235
Message-ID: <200607221853.k6MIrneM002744@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv2698/configs

Modified Files:
	config-generic 
Log Message:
enable connector proc events


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- config-generic	20 Jul 2006 00:27:30 -0000	1.234
+++ config-generic	22 Jul 2006 18:53:47 -0000	1.235
@@ -2638,7 +2638,8 @@
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 
 CONFIG_IBMASR=m
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 18:53:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 14:53:49 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2434,1.2435
Message-ID: <200607221853.k6MIrnv0002734@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2698

Modified Files:
	kernel-2.6.spec 
Log Message:
enable connector proc events


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2434
retrieving revision 1.2435
diff -u -r1.2434 -r1.2435
--- kernel-2.6.spec	22 Jul 2006 15:04:14 -0000	1.2434
+++ kernel-2.6.spec	22 Jul 2006 18:53:46 -0000	1.2435
@@ -1635,6 +1635,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Dave Jones <davej at redhat.com>
+- Enable connector proc events.
+
 * Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>
 - addia64-xen support, not enabled by default.
 - add ia64-xen config



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:01:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:01:02 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.34,
	1.35 selinux-policy.spec, 1.231, 1.232
Message-ID: <200607221901.k6MJ129A005213@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5187

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-9
- Fix setroubleshoot policy


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |    6 -
 modules/services/inetd.te          |   12 +-
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 78 files changed, 792 insertions(+), 226 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- policy-20060608.patch	22 Jul 2006 03:11:32 -0000	1.34
+++ policy-20060608.patch	22 Jul 2006 19:00:43 -0000	1.35
@@ -1290,7 +1290,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-21 08:40:09.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-22 14:32:53.000000000 -0400
 @@ -0,0 +1,135 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1347,7 +1347,7 @@
 +# database files
 +allow setroubleshootd_t setroubleshoot_var_lib_t:file create_file_perms;
 +allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
-+files_var_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
++files_var_lib_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
 +
 +allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- selinux-policy.spec	22 Jul 2006 03:11:32 -0000	1.231
+++ selinux-policy.spec	22 Jul 2006 19:00:47 -0000	1.232
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-9
+- Fix setroubleshoot policy
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-8
 - Fixes for mls use of ssh
 - named  has a new conf file



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:02:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:02:40 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.8, 1.9 setroubleshoot.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200607221902.k6MJ2eFu005478@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5442/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.13-1 on branch devel from setroubleshoot-0.13-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Jul 2006 03:08:40 -0000	1.8
+++ .cvsignore	22 Jul 2006 19:02:37 -0000	1.9
@@ -1 +1 @@
-setroubleshoot-0.12.tar.gz
+setroubleshoot-0.13.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setroubleshoot.spec	22 Jul 2006 11:11:03 -0000	1.12
+++ setroubleshoot.spec	22 Jul 2006 19:02:37 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.12
-Release: 2
+Version: 0.13
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://www.redhat.com/ 
@@ -93,8 +93,9 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
-* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-2
-	* Fix Requires line
+* Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.13-1
+- Fixes to plugins
+- Fixes to dispatcher
 
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> - 0.12-1
 	* Fix problem in dispatcher


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Jul 2006 03:08:40 -0000	1.10
+++ sources	22 Jul 2006 19:02:37 -0000	1.11
@@ -1 +1 @@
-21d5c9cde7cabb03f58d01586f90072a  setroubleshoot-0.12.tar.gz
+ffe81b6872dfdcd1ca6a95abd7eeca8e  setroubleshoot-0.13.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:14:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:14:40 -0400
Subject: rpms/jzlib/devel .cvsignore, 1.2, 1.3 jzlib.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <200607221914.k6MJEeGG008856@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8708

Modified Files:
	.cvsignore jzlib.spec sources 
Log Message:
- Merge with latest version from JPP.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2005 14:50:31 -0000	1.2
+++ .cvsignore	22 Jul 2006 19:14:37 -0000	1.3
@@ -1 +1 @@
-jzlib-1.0.5.tar.gz
+jzlib-1.0.7.tar.gz


Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jzlib.spec	22 Jul 2006 08:44:22 -0000	1.7
+++ jzlib.spec	22 Jul 2006 19:14:37 -0000	1.8
@@ -1,20 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section   free
 
 Name:           jzlib
-Version:        1.0.5
-Release: 2jpp_4fc
+Version:        1.0.7
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
 Group:          Development/Libraries/Java
 License:        BSD-style
 URL:            http://www.jcraft.com/jzlib/
-Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.5.tar.gz
+Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
 Source1:        %{name}_build.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.5.31, ant >= 0:1.5.4
+%endif
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 0:1.6
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The zlib is designed to be a free, general-purpose, legally unencumbered 
@@ -26,7 +69,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -34,7 +76,6 @@
 %package        demo
 Summary:        Examples for %{name}
 Group:          Development/Libraries/Java
-Prereq: coreutils
 
 %description    demo
 %{summary}.
@@ -67,6 +108,10 @@
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,11 +125,31 @@
 ln -s %{name}-%{version} %{_datadir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 %doc LICENSE.txt
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jzlib-1.0.7.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -96,6 +161,9 @@
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-3jpp_1fc
+- Merge with latest version from JPP.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0.5-2jpp_4fc
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2005 14:50:31 -0000	1.2
+++ sources	22 Jul 2006 19:14:37 -0000	1.3
@@ -1 +1 @@
-8880066f474d94b6a629502e32ffafb8  jzlib-1.0.5.tar.gz
+3c52a0afb970e8a1fb2d34f30d330a83  jzlib-1.0.7.tar.gz



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:17:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:17:41 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git1.bz2.sign, NONE,
	1.1 .cvsignore, 1.491, 1.492 kernel-2.6.spec, 1.2435,
	1.2436 sources, 1.448, 1.449 upstream, 1.399,
	1.400 linux-2.6-e1000-crc.patch, 1.1,
	NONE linux-2.6-net-ipw2200-monitor.patch, 1.1, NONE
Message-ID: <200607221917.k6MJHfFv024752@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24724

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2-git1.bz2.sign 
Removed Files:
	linux-2.6-e1000-crc.patch linux-2.6-net-ipw2200-monitor.patch 
Log Message:
rc2-git1


--- NEW FILE patch-2.6.18-rc2-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEwc1syGugalF9Dw4RAt9zAJ4suBO0oDM9DrzHCXX5PA0plZ3rFACfVxux
ZtZT2wNBO5Ml+N3IyWZirN8=
=KCm2
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- .cvsignore	19 Jul 2006 17:27:25 -0000	1.491
+++ .cvsignore	22 Jul 2006 19:17:38 -0000	1.492
@@ -8,3 +8,4 @@
 find-provides
 kernel-2.6.spec
 xen-20060719.tar.bz2
+patch-2.6.18-rc2-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2435
retrieving revision 1.2436
diff -u -r1.2435 -r1.2436
--- kernel-2.6.spec	22 Jul 2006 18:53:46 -0000	1.2435
+++ kernel-2.6.spec	22 Jul 2006 19:17:38 -0000	1.2436
@@ -264,6 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
+Patch2: patch-2.6.18-rc2-git1.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -367,8 +368,6 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
-Patch1304: linux-2.6-net-ipw2200-monitor.patch
-Patch1310: linux-2.6-e1000-crc.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -712,6 +711,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -888,10 +888,6 @@
 %patch1203 -p1
 
 # NIC driver fixes.
-# add IPW2200_MONITOR config option
-%patch1304 -p1
-# fix problem between e1000 and xen, headed upstream
-%patch1310 -p1
 
 # Filesystem patches.
 # Squashfs
@@ -1637,6 +1633,7 @@
 %changelog
 * Sat Jul 22 2006 Dave Jones <davej at redhat.com>
 - Enable connector proc events.
+- 2.6.18rc2-git1
 
 * Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>
 - addia64-xen support, not enabled by default.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -r1.448 -r1.449
--- sources	19 Jul 2006 17:27:25 -0000	1.448
+++ sources	22 Jul 2006 19:17:38 -0000	1.449
@@ -5,3 +5,4 @@
 9d18e6231257537219ea5228e353c6ae  kabitool
 82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec
 d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
+44918b4fc778fa0439672e9f788a4ff2  patch-2.6.18-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -r1.399 -r1.400
--- upstream	15 Jul 2006 23:20:49 -0000	1.399
+++ upstream	22 Jul 2006 19:17:38 -0000	1.400
@@ -1,2 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
+patch-2.6.18-rc2-git1.bz2


--- linux-2.6-e1000-crc.patch DELETED ---


--- linux-2.6-net-ipw2200-monitor.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:26:50 -0400
Subject: rpms/glib2/devel .cvsignore, 1.55, 1.56 glib2.spec, 1.103,
	1.104 sources, 1.55, 1.56
Message-ID: <200607221926.k6MJQoPq028327@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28283

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	2 Jul 2006 20:23:15 -0000	1.55
+++ .cvsignore	22 Jul 2006 19:26:48 -0000	1.56
@@ -1 +1 @@
-glib-2.12.0.tar.bz2
+glib-2.12.1.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- glib2.spec	12 Jul 2006 05:57:10 -0000	1.103
+++ glib2.spec	22 Jul 2006 19:26:48 -0000	1.104
@@ -2,8 +2,8 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.12.0
-Release: 1.1
+Version: 2.12.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-1
+- Update to 2.12.1
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	2 Jul 2006 20:23:15 -0000	1.55
+++ sources	22 Jul 2006 19:26:48 -0000	1.56
@@ -1 +1 @@
-ea8c7733ba443e3db04cf7a84060f408  glib-2.12.0.tar.bz2
+97786d2a03f0f190bd782749139dc10c  glib-2.12.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:28:45 -0400
Subject: rpms/kernel/devel/configs config-powerpc-generic,1.23,1.24
Message-ID: <200607221928.k6MJSjYZ029152@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv29072/configs

Modified Files:
	config-powerpc-generic 
Log Message:
Try ppc64 mem hotplug.



Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config-powerpc-generic	15 Jul 2006 06:49:37 -0000	1.23
+++ config-powerpc-generic	22 Jul 2006 19:28:43 -0000	1.24
@@ -74,7 +74,7 @@
 # CONFIG_3C515 is not set
 # CONFIG_ELPLUS is not set
 
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
 
 # Stuff which wants bus_to_virt() or virt_to_bus()
 # CONFIG_BLK_CPQ_DA is not set



From fedora-cvs-commits at redhat.com  Sat Jul 22 19:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 15:28:45 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2436,1.2437
Message-ID: <200607221928.k6MJSj6T029145@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29072

Modified Files:
	kernel-2.6.spec 
Log Message:
Try ppc64 mem hotplug.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2436
retrieving revision 1.2437
diff -u -r1.2436 -r1.2437
--- kernel-2.6.spec	22 Jul 2006 19:17:38 -0000	1.2436
+++ kernel-2.6.spec	22 Jul 2006 19:28:43 -0000	1.2437
@@ -1633,6 +1633,7 @@
 %changelog
 * Sat Jul 22 2006 Dave Jones <davej at redhat.com>
 - Enable connector proc events.
+- Enable PPC64 memory hotplug.
 - 2.6.18rc2-git1
 
 * Sat Jul 22 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Sat Jul 22 20:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 16:59:03 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.26,1.27
Message-ID: <200607222059.k6MKx3JI018214@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18181

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* Sat Jul 22 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8.fc6
- Fix SourceN line for localuser.sh to not collide.



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-xinit.spec	21 Jul 2006 16:48:16 -0000	1.26
+++ xorg-x11-xinit.spec	22 Jul 2006 20:59:00 -0000	1.27
@@ -17,10 +17,10 @@
 Source13: Xmodmap
 Source14: Xresources
 Source15: xinput.sh
-Source16: localuser.sh
 # NOTE: Xsession is used by xdm/kdm/gdm and possibly others, so we keep it
 #       here instead of the xdm package.
 Source16: Xsession
+Source17: localuser.sh
 
 Patch0: ftp://ftp.freedesktop.org/pub/xorg/X11R7.1/patches/xinit-1.0.2-setuid.diff
 
@@ -72,7 +72,7 @@
 
     mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
     install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
-    install -m 755 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
+    install -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
 
     mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
 }
@@ -101,6 +101,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Sat Jul 22 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-8.fc6
+- Fix SourceN line for localuser.sh to not collide.
+
 * Fri Jul 21 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-7.fc6
 - Added localuser.sh.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 20:59:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 16:59:26 -0400
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.27,1.28
Message-ID: <200607222059.k6MKxQaa018410@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18367

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
bump



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-xinit.spec	22 Jul 2006 20:59:00 -0000	1.27
+++ xorg-x11-xinit.spec	22 Jul 2006 20:59:23 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org



From fedora-cvs-commits at redhat.com  Sat Jul 22 21:51:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 17:51:04 -0400
Subject: rpms/antlr/devel antlr.spec,1.24,1.25
Message-ID: <200607222151.k6MLp4um031202@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/antlr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31134

Modified Files:
	antlr.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_5fc
- Unstub docs.




Index: antlr.spec
===================================================================
RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- antlr.spec	22 Jul 2006 08:35:15 -0000	1.24
+++ antlr.spec	22 Jul 2006 21:51:01 -0000	1.25
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.6
-Release:        3jpp_4fc
+Release:        3jpp_5fc
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -168,8 +168,7 @@
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-#cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/stub
+cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # jedit mode
@@ -280,6 +279,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.7.6-3jpp_5fc
+- Unstub docs.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.6-3jpp_4fc
 - Remove hack-libgcj requirement.
 



From fedora-cvs-commits at redhat.com  Sat Jul 22 22:13:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 18:13:21 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.159,
	1.160
Message-ID: <200607222213.k6MMDLvU005254@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-serv5182

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_96rh
- Remove gjdoc workaround.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- java-1.4.2-gcj-compat.spec	22 Jul 2006 06:30:02 -0000	1.159
+++ java-1.4.2-gcj-compat.spec	22 Jul 2006 22:13:18 -0000	1.160
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_95rh
+%define release 	40jpp_96rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -234,23 +234,22 @@
 # build and install api documentation
 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
-#   if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-#   then
-#     fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-#     rm -rf gnu
-#     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}/%{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}/%{name}-%{version}/package-list
-#   fi
-# popd
-touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
+mkdir docsbuild
+pushd docsbuild
+# work around ppc64 file system corruption
+  if unzip -tq /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+  then
+    fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+    rm -rf gnu
+    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}/%{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}/%{name}-%{version}/package-list
+  fi
+popd
 
 %ifarch x86_64
 ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
@@ -623,6 +622,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_96rh
+- Remove gjdoc workaround.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_95rh
 - Remove hack-libgcj requirement.
 - Work around gjdoc failure by not building javadocs.



From fedora-cvs-commits at redhat.com  Sun Jul 23 00:58:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 20:58:25 -0400
Subject: rpms/glib-java/devel glib-java.spec,1.39,1.40
Message-ID: <200607230058.k6N0wPYO030300@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30204

Modified Files:
	glib-java.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.2.5-3
- Bump release number. (dist-fc6-java)




Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- glib-java.spec	12 Jul 2006 13:34:19 -0000	1.39
+++ glib-java.spec	23 Jul 2006 00:58:22 -0000	1.40
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.5
-Release:   2
+Release:   3
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.2/%{name_base}-%{version}.tar.bz2
 License:   LGPL
@@ -116,6 +116,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.2.5-3
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.2.5-2
 - Do not use macro {?dist}.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 01:14:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 21:14:59 -0400
Subject: rpms/cairo-java/devel cairo-java.spec,1.35,1.36
Message-ID: <200607230114.k6N1ExpW002140@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2082

Modified Files:
	cairo-java.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.0.4-2
- Bump release number. (dist-fc6-java)




Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cairo-java.spec	12 Jul 2006 14:59:25 -0000	1.35
+++ cairo-java.spec	23 Jul 2006 01:14:57 -0000	1.36
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.4
-Release: 	1
+Release: 	2
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.0.4-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 1.0.4-1
 - Release 0 is not allowed.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 02:14:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 22:14:26 -0400
Subject: rpms/junit/devel junit3.8.2-build.xml, NONE, 1.1 .cvsignore, 1.6,
	1.7 junit.spec, 1.18, 1.19 sources, 1.5, 1.6
Message-ID: <200607230214.k6N2EQvD031044@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/junit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30979

Modified Files:
	.cvsignore junit.spec sources 
Added Files:
	junit3.8.2-build.xml 
Log Message:

Added conditional native compilation.
Fix path where demo is located.




--- NEW FILE junit3.8.2-build.xml ---
<!-- JUnit build script using ant 1.4 -->
<project name="junit" default="dist" basedir=".">
	<property file="${user.home}/.junit.properties" />
	<property name="build.compiler" value="classic" />
	<property name="version" value="3.8.2" />
	<property name="dist"  value="junit${version}" />
	<property name="versionfile"  value="junit/runner/Version.java" />
	<property name="zipfile"  value="${dist}.zip" />
	<target name="init">
		<tstamp/>
	</target>

	<target name="versiontag" depends="init">
		<filter token="version" value="${version}" />
		<copy 
			file="${versionfile}" 
			tofile="${versionfile}tmp" 
			filtering="on"
		/>
		<move file="${versionfile}tmp" tofile="${versionfile}" />
	</target>

	<target name="build" depends="versiontag">
		<javac 
			srcdir="."
			destdir="."
			debug="on"
  		/>	
	</target>

	<target name="dist" depends="build">
		<delete dir="${dist}" />
		<mkdir dir="${dist}" />
		<jar 
			jarfile="${dist}/src.jar"
			basedir="."
			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, .classpath, .project, cpl-v10.html"
		/>
		<jar 
			jarfile="${dist}/junit.jar"
			basedir="."
			excludes="**/*.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html,  build.xml, jar-manifest.txt, .classpath, .project, cpl-v10.html"
		/>
		<copy todir="${dist}/junit/samples">
			<fileset dir="junit/samples" />
		</copy>
		<copy todir="${dist}/junit/tests">
			<fileset dir="junit/tests" />
		</copy>


		<delete file="${dist}/junit/tests/runner/test.jar"/> 
		<jar jarfile="${dist}/junit/tests/runner/test.jar" 
	 	     basedir="." 
		     includes="junit/tests/runner/LoadedFromJar.class"
		 /> 

		<mkdir dir="${dist}/javadoc" />
		<javadoc 
			sourcepath="."
			packagenames="junit.framework.*, junit.extensions.*"
			destdir="${dist}/javadoc"
			author="false"
			version="false"
			use="false"
			windowtitle="JUnit API"
			stylesheetfile="stylesheet.css"
		/>
		<copy todir="${dist}/doc">
			<fileset dir="doc"/>
		</copy>		
		<copy file="README.html" tofile="${dist}/README.html" />
		<copy file="cpl-v10.html" tofile="${dist}/cpl-v10.html" />
		
		<java classname="junit.textui.TestRunner" fork="yes">
			<arg value="junit.samples.AllTests" />
			<classpath>
				<pathelement location="${dist}" />
				<pathelement location="${dist}/junit.jar" />
			</classpath>
		</java>
	</target>
	
	<target name="zip" depends="dist">
		<zip 
			zipfile="${zipfile}"
			basedir="."
			includes="${dist}/**"
		/>
	</target>
	
	<target name="awtui" depends="dist">
		<java classname="junit.awtui.TestRunner" fork="yes">
			<arg value="junit.samples.AllTests" />
			<classpath>
				<pathelement location="${dist}" />
				<pathelement location="${dist}/junit.jar" />
			</classpath>
		</java>
	</target>
	
	<target name="swingui" depends="dist">
		<java classname="junit.swingui.TestRunner" fork="yes">
			<arg value="junit.samples.AllTests" />
			<classpath>
				<pathelement location="${dist}" />
				<pathelement location="${dist}/junit.jar" />
			</classpath>
		</java>
	</target>

	<target name="clean">
		<delete dir="${dist}" quiet="true"/>			
		<delete file="${zipfile}" quiet="true"/> 
		<delete>
			<fileset dir="${basedir}" includes="**/*.class" /> 
		</delete>
	</target>
</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Jun 2005 09:11:11 -0000	1.6
+++ .cvsignore	23 Jul 2006 02:14:22 -0000	1.7
@@ -1,4 +1 @@
-junit3.8.1-RHCLEAN.zip
-junit3.8.1
-noarch
-*.src.rpm
+junit3.8.2-RHCLEAN.zip


Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- junit.spec	22 Jul 2006 08:44:16 -0000	1.18
+++ junit.spec	23 Jul 2006 02:14:22 -0000	1.19
@@ -1,24 +1,63 @@
-%define	name		junit
-%define	version		3.8.1
-%define release 	3jpp_9fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define	section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		junit
+Version:	3.8.2
+Release:	2jpp_1fc
 Epoch:		0
 Summary:	Java regression test package
-License:	IBM Public License
+License:	Common Public License
 Url:		http://www.junit.org/
 Group:		Development/Testing
-Source:		junit3.8.1-RHCLEAN.zip
+#http://osdn.dl.sourceforge.net/junit/junit3.8.2.zip
+Source0:	junit3.8.2-RHCLEAN.zip
+Source1:	junit3.8.2-build.xml
 BuildRequires:	ant
-BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:  coreutils
-Requires(pre): coreutils
+BuildRequires:	jpackage-utils >= 0:1.6
+%if ! %{gcj_support}
 Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JUnit is a regression testing framework written by Erich Gamma and Kent
 Beck. It is used by the developer who implements unit tests in Java.
@@ -35,7 +74,6 @@
 %package javadoc
 Group:		Development/Documentation
 Summary:	Javadoc for %{name}
-Requires(post,postun): coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -45,6 +83,12 @@
 Summary:	Demos for %{name}
 Requires:	%{name} = %{version}-%{release}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description demo
 Demonstrations and samples for %{name}.
 
@@ -53,9 +97,8 @@
 %setup -q -n %{name}%{version}
 # extract sources
 jar xf src.jar
-# clean binary files
-find . -name "*.jar" -exec rm -f {} \;
-find . -name "*.class" -exec rm -f {} \;
+rm -f src.jar
+cp %{SOURCE1} build.xml
 
 %build
 ant dist
@@ -69,15 +112,17 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr %{name}%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 # demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is 
+                                                                # part of package name
+cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{name}.jar
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -87,11 +132,47 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc README.html
 %{_javadir}/*
-%dir %{_datadir}/%{name}
+
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/junit-3.8.2.jar.*
+%endif
 
 %files manual
 %defattr(0644,root,root,0755)
@@ -103,46 +184,23 @@
 
 %files demo
 %defattr(0644,root,root,0755)
-%{_datadir}/%{name}/*
-
-%changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.8.1-3jpp_9fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:3.8.1-3jpp_8fc
-- rebuild
-
-* 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
+%{_datadir}/%{name}
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.*
+%endif
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jun 22 2005 Gary Benson <gbenson at redhat.com> 0:3.8.1-3jpp_5fc
-- Remove classes and jarfiles from the tarball.
-
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:3.8.1-3jpp_4fc
-- Reenable building of classes that require javax.swing (#130006).
-- Sync with RHAPS.
-
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:3.8.1-3jpp_3fc
-- Build into Fedora.
-
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 0:3.8.1-3jpp_3rh
-- add coreutils BuildRequires
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:3.8.1-3jpp_2rh
-- add RHUG upgrade cleanup
+%changelog
+* Sat Jun 22 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-2jpp_1fc
+- Added conditional native compilation.
+- Fix path where demo is located.
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:3.8.1-3jpp_1rh
-- RH vacuuming
+* Mon Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
+- First JPP-1.7 release
 
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
+- Rebuild with ant-1.6.2
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:3.8.1-3jpp
 - update for JPackage 1.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Jun 2005 09:11:11 -0000	1.5
+++ sources	23 Jul 2006 02:14:22 -0000	1.6
@@ -1 +1 @@
-da35d7c6c38a728c473579af7d4f35e7  junit3.8.1-RHCLEAN.zip
+517b116b00bafbde176aa0b55189c163  junit3.8.2-RHCLEAN.zip



From fedora-cvs-commits at redhat.com  Sun Jul 23 02:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 22 Jul 2006 22:14:58 -0400
Subject: rpms/junit/devel junit.spec,1.19,1.20
Message-ID: <200607230214.k6N2EwXH031278@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/junit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31189

Modified Files:
	junit.spec 
Log Message:

Added a changelog entry re: updating to 3.8.2




Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- junit.spec	23 Jul 2006 02:14:22 -0000	1.19
+++ junit.spec	23 Jul 2006 02:14:55 -0000	1.20
@@ -193,6 +193,7 @@
 
 %changelog
 * Sat Jun 22 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-2jpp_1fc
+- Upgrade to 3.8.2
 - Added conditional native compilation.
 - Fix path where demo is located.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 04:26:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 00:26:41 -0400
Subject: rpms/xdoclet/devel xdoclet-AbstractProgramElementTagsHandler.patch,
	NONE, 1.1 xdoclet-project_xml.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 sources, 1.4, 1.5 xdoclet.spec, 1.17, 1.18
Message-ID: <200607230426.k6N4Qf9r029360@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29173

Modified Files:
	.cvsignore sources xdoclet.spec 
Added Files:
	xdoclet-AbstractProgramElementTagsHandler.patch 
	xdoclet-project_xml.patch 
Log Message:
Merge with upstream version
Natively compile packages


xdoclet-AbstractProgramElementTagsHandler.patch:
 AbstractProgramElementTagsHandler.java |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xdoclet-AbstractProgramElementTagsHandler.patch ---
--- core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java.sav	2006-06-08 11:58:43.000000000 +0200
+++ core/src/xdoclet/tagshandler/AbstractProgramElementTagsHandler.java	2006-06-08 12:00:07.000000000 +0200
@@ -728,7 +728,7 @@
         if (sort) {
             // sort fields, but we should make a copy first, because members is not a new copy, it's shared by all
             List sortedMembers = new ArrayList(members);
-
+            Collections.sort(sortedMembers);
             members = sortedMembers;
         }
 

xdoclet-project_xml.patch:
 project.xml |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE xdoclet-project_xml.patch ---
--- project.xml.sav	2005-04-16 02:01:41.000000000 +0200
+++ project.xml	2006-02-21 18:15:29.000000000 +0100
@@ -276,7 +276,6 @@
         </contributor>
         <contributor>
             <name>Andreas &quot;Mad&quot; Schaefer</name>
-            <id>schaefera</id>
             <email>schaefera at users.sourceforge.net</email>
             <organization>JBossGroup</organization>
         </contributor>
@@ -301,7 +300,6 @@
 		</contributor>
         <contributor>
             <name>Christian Amor Kvalheim</name>
-            <id>christkv</id>
             <email>christkv at users.sourceforge.net</email>
         </contributor>
         <contributor>
@@ -381,7 +379,6 @@
         </contributor>
         <contributor>
             <name>Joel Rosi-Schwatz</name>
-            <id>joelrs</id>
             <email>joelrs at users.sourceforge.net</email>
             <roles>
                 <role>Hibernate Module</role>
@@ -539,7 +536,6 @@
         </contributor>
         <contributor>
             <name>Vincent Harcq</name>
-            <id>vharcq</id>
             <email>vharcq at users.sourceforge.net</email>
             <roles>
                 <role>EJB Module - Value Objects</role>
@@ -591,12 +587,12 @@
     </build>
     
     <reports>
-        <report>maven-changelog-plugin</report>
-        <report>maven-changes-plugin</report>
-        <report>maven-developer-activity-plugin</report>
+        <!--<report>maven-changelog-plugin</report>-->
+        <!--<report>maven-changes-plugin</report>-->
+        <!--<report>maven-developer-activity-plugin</report>-->
         <!-- Enable to see the elaborate CVS statistics. -->
         <!--<report>maven-statcvs-plugin</report>-->
-        <report>maven-file-activity-plugin</report>
+        <!--<report>maven-file-activity-plugin</report>-->
         <report>maven-linkcheck-plugin</report>
     </reports>
 </project>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2005 16:36:10 -0000	1.4
+++ .cvsignore	23 Jul 2006 04:26:35 -0000	1.5
@@ -1,5 +1,2 @@
-xdoclet-src-1.2.2-RHCLEAN.tar.bz2
-xdoclet-modules-objectweb-4.3.tgz
-xdoclet-1.2.2
-noarch
-*.src.rpm
+xdoclet-src-1.2.3-RHCLEAN.tgz
+xdoclet-modules-objectweb-4.6.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Jun 2005 16:36:10 -0000	1.4
+++ sources	23 Jul 2006 04:26:35 -0000	1.5
@@ -1,2 +1,2 @@
-bddf71612583d238ad6baa1cf14cbbdf  xdoclet-src-1.2.2-RHCLEAN.tar.bz2
-523c7b9d8892c93235aeb4d4f3ff4de2  xdoclet-modules-objectweb-4.3.tgz
+cd3e46f6470bba5f786e0d5555e252f8  xdoclet-src-1.2.3-RHCLEAN.tgz
+a4bf2dddfcc204f538dfc633f0aeed30  xdoclet-modules-objectweb-4.6.tgz


Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xdoclet.spec	22 Jul 2006 08:46:22 -0000	1.17
+++ xdoclet.spec	23 Jul 2006 04:26:35 -0000	1.18
@@ -1,39 +1,79 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 
+# FIXME: JPP 1.7 lacks webwork and xwork, needed for the demo
+%define _without_demo 1
+
 # If you do not want to build samples in demo subpackage because of their 
 # runtime deps, give rpmbuild option '--without demo'
 %define with_demo %{!?_without_demo:1}%{?_without_demo:0}
-# We do not ship webwork nor jsf, which are required for the demo
-# One can always get the demo subpackage directly from http://jpackage.org
-%define with_demo 0
 
 Name:		xdoclet
-Version:	1.2.2
-Release: 	2jpp_7fc
+Version:	1.2.3
+Release:	6jpp_1fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
 Group:		Development/Framework
 URL:		http://xdoclet.sourceforge.net
-Source0:	%{name}-src-%{version}-RHCLEAN.tar.bz2
-Source1:	%{name}-modules-objectweb-4.3.tgz
+Source0:	%{name}-src-%{version}-RHCLEAN.tgz
+Source1:	%{name}-modules-objectweb-4.6.tgz
 Patch0:		xdoclet-build_xml.patch
 Patch1:		xdoclet-XDocletModulesEjbMessages.patch
 Patch2:		xdoclet-ant.not-required.patch
 Patch3:		xdoclet-WebLogicSubTask.patch
-Patch4:		xdoclet-modules_common_ent.patch
-Patch5:		xdoclet-build_docs_xml.patch
+Patch4:		xdoclet-project_xml.patch
+Patch5:		xdoclet-AbstractProgramElementTagsHandler.patch
+Patch6:		xdoclet-build_docs_xml.patch
+
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot: 	%{_tmppath}/%{name}-root
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 0:1.4.2
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  ant >= 0:1.5
+BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-nodeps >= 0:1.5
+BuildRequires:	ant-trax
 BuildRequires:  junit
 BuildRequires:  javacc
 BuildRequires:  jrefactory
 BuildRequires:  bsf 
 BuildRequires:  jakarta-commons-collections 
+BuildRequires:  jakarta-commons-lang 
 BuildRequires:  jakarta-commons-logging 
 BuildRequires:  log4j
 BuildRequires:  mockobjects 
@@ -41,8 +81,7 @@
 BuildRequires:  velocity 
 BuildRequires:  xalan-j2
 BuildRequires:  xml-commons-apis 
-BuildRequires:  xjavadoc = 0:1.1
-BuildRequires:	ant-trax
+BuildRequires:  xjavadoc >= 0:1.1
 
 Requires:  bsf
 Requires:  jakarta-commons-collections
@@ -54,6 +93,12 @@
 Requires:  xml-commons-apis
 Requires:  xjavadoc = 0:1.1
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 This package contains the XDoclet Attribute Orientated Programming Framework
 
@@ -64,16 +109,18 @@
 BuildRequires:  servletapi4
 BuildRequires:  struts
 BuildRequires:  velocity
-BuildRequires:  webwork
-BuildRequires:  ejb
-BuildRequires:  jsf
-BuildRequires:  jms
+BuildRequires:  webwork >= 0:2.1
+BuildRequires:  xwork
+BuildRequires:  geronimo-ejb-2.1-api
+BuildRequires:  myfaces
+BuildRequires:  geronimo-jms-1.1-api
 BuildRequires:  mx4j
 Requires:  %{name} = %{version}-%{release}
-Requires:  ejb
-Requires:  jsf
-Requires:  jms
+Requires:  geronimo-ejb-2.1-api
+Requires:  myfaces
+Requires:  geronimo-jms-1.1-api
 Requires:  webwork
+Requires:  xwork
 Requires:  mx4j
 Requires:  struts
 Requires:  servletapi4
@@ -85,7 +132,6 @@
 %package javadoc
 Summary:	XDoclet Javadoc
 Group:		Development/Documentation
-Prereq:  coreutils
 
 %description javadoc
 This package contains XDoclet javadoc
@@ -99,8 +145,10 @@
 
 %prep
 %setup -q
-find . -name "*.jar" -exec rm {} \;
-find . -name "*.class" -exec rm {} \;
+#find . -name "*.jar" -exec rm {} \;
+for j in $(find . -name "*.jar"); do
+    mv $j $j.no
+done
 
 # Replace JOnAS specific tasks with code blessed by ObjectWeb
 pushd modules
@@ -108,33 +156,18 @@
 tar xzf %{SOURCE1}
 popd
 
-build-jar-repository lib \
-		xjavadoc-1.1 \
-		jrefactory \
-		javacc \
-		junit \
-		bsf \
-		commons-collections \
-		commons-logging \
-		log4j \
-		velocity \
-		xalan-j2 \
-		xjavadoc \
-		xml-commons-apis \
-		mockobjects-core
+for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis mockobjects-core; do
+	ln -s $(build-classpath $j) lib
+done
 
 %if %{with_demo}
-    build-jar-repository samples/lib \
-		servletapi4 \
-		struts \
-		velocity \
-		webwork \
-		ejb \
-		jsf-api \
-		jms \
-		mx4j/mx4j-jmx \
-		mx4j/mx4j-tools
-
+for j in servletapi4 struts velocity webwork-migration xwork geronimo-ejb-2.1-api myfaces/myfaces-jsf-api geronimo-jms-1.1-api; do
+	ln -s $(build-classpath $j) samples/lib
+done
+for j in mx4j/mx4j-jmx mx4j/mx4j-tools; do
+        i=$(build-classpath $j)
+	ln -s $(build-classpath $j) samples/lib
+done
 %endif
 
 %patch0 -b .sav
@@ -143,6 +176,7 @@
 %patch3 -b .sav
 %patch4 -b .sav
 %patch5 -b .sav
+%patch6 -b .sav
 
 %build
 export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
@@ -153,6 +187,7 @@
 %endif
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -m 644 target/lib/xdoclet*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -171,6 +206,10 @@
 cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -178,11 +217,65 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-, root, root, -)
 %{_javadir}/%{name}
 #%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-apache-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-bea-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-borland-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-caucho-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ejb-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-exolab-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hibernate-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-hp-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-ibm-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-java-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jboss-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jdo-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jmx-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-jsf-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-libelis-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-macromedia-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mockobjects-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mvcsoft-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-mx4j-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-objectweb-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-openejb-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-oracle-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-orion-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-portlet-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-pramati-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-solarmetric-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-spring-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sun-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-sybase-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-tjdo-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-web-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-webwork-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-wsee-module-1.2.3.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xdoclet-xdoclet-module-1.2.3.jar.*
+%endif
+
 %if %{with_demo}
 %files demo
 %defattr(-, root, root, -)
@@ -199,58 +292,42 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.2-2jpp_7fc
-- Rebuilt
-
-* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.2-2jpp_6fc
-- Add missing BR for ant-nodeps
-- Other spec file cleanup
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.2.2-2jpp_5fc
-- fix scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.2-2jpp_4fc
-- rebuilt again
-
-* Mon Dec 19 2005 Archit Shah <ashah at redhat.com> - 0:1.2.2-2jpp_3fc
-- Remove use of external javadoc URLs from javadoc task.
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.2-2jpp_2fc
-- rebuilt
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> - 0:1.2.2-2jpp_1fc
-- Add missing javadoc %ghost symlink.
-- Build into Fedora.
-
-* Thu Jun  9 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles and classfiles from the tarball.
-
-* Tue Jun  7 2005 Gary Benson <gbenson at redhat.com>
-- Don't build maven stuff.
-- Add missing dependency on ant-trax.
+* Sat Jul 22 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_1fc
+- Merge with upstream version
+- Remove dependency on maven, use ant instead
+- Natively compile jpackages
+
+* Sat Jul 22 2006 Matt Wringe <mringe at redhat.com> - 0:1.2.3-6jpp
+- Add conditional native compiling
+- Add missing buildrequires: ant-nodeps and ant-trax
+- Add missing javadoc %ghost symlink
+
+* Thu Jun 08 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.3-5jpp
+- Update objectweb module to match JOnAS 4.6.x
+- Build without demo because JPP 1.7 lacks webwork and xwork
+
+* Thu Jun 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-4jpp
+- Patch AbstractProgramElementTagsHandler to sort members, 
+  Thx Jesus Rodriguez
+
+* Thu Apr 06 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-3jpp
+- Replace non-free (B)Rs in -demo with free ones
+
+* Tue Feb 21 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-2jpp
+- Adapt project.xml (docs) to maven-1.1
+
+* Tue Dec 20 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.2.3-1jpp
+- Upgrade to 1.2.3
+- Build docs with maven
 
-* Wed May 04 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-2jpp_1rh
-- Equivalent to 2jpp upstream
+* Fri Sep 23 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-3jpp
+- Adapt to build samples with webwork-2.1.7
 
-* Thu Apr 28 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-1jpp_7rh
-- Rebuild with the docs as maven is now available
-- Fix patch to correct xjavadoc building logic
-- Don't try and build twice
-
-* Fri Feb 25 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-1jpp_4rh
-- Remove extra file from objectweb module
-
-* Fri Feb 25 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-1jpp_3rh
-- Do not save copies of the java files when patching.
-
-* Thu Feb 24 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-1jpp_2rh
-- Replace JOnAS specific tasks with code blessed by ObjectWeb
-
-* Wed Feb 16 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-1jpp_1rh
-- Merge with upstream for upgrade
+* Fri Mar 04 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.2.2-2jpp
 - Add patch to prevent attempt to load DTD from the net, when it comes with
   the source and is locally available
-- Temporarely disable documentation and mave plugin building for lack of maven
+- Replace JOnAS specific tasks with code blessed by ObjectWeb
+- Do not save copies of the java files when patching.
 
 * Tue Feb 15 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.2.2-1jpp
 - Upgrade to 1.2.2
@@ -259,9 +336,6 @@
 - Drop servletapi and mx4j requirement for main package
 - Buildrequire maven and use it to build docs
 
-* Thu Oct 14 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.2.1-2jpp_1rh
-* First Red Hat build
-
 * Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.2.1-2jpp
 - Build with ant-1.6.2
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 05:33:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 01:33:18 -0400
Subject: rpms/xdoclet/devel xdoclet-ant.not-required.patch, 1.2,
	1.3 xdoclet-build_xml.patch, 1.2, 1.3
Message-ID: <200607230533.k6N5XIs9010862@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10787

Modified Files:
	xdoclet-ant.not-required.patch xdoclet-build_xml.patch 
Log Message:
Update patches to upstream version


xdoclet-ant.not-required.patch:
 core/src/xdoclet/TemplateSubTask.java                                          |    8 ++++----
 core/src/xdoclet/XmlSubTask.java                                               |    4 ++--
 modules/apache/src/xdoclet/modules/apache/struts/StrutsConfigXmlSubTask.java   |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/EjbDocletTask.java                         |    4 ++--
 modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java              |    2 +-
 modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java             |    2 +-
 modules/hibernate/src/xdoclet/modules/hibernate/HibernateSubTask.java          |    2 +-
 modules/hp/src/xdoclet/modules/hp/hpas/ejb/HPASSubTask.java                    |   10 +++++-----
 modules/libelis/src/xdoclet/modules/libelis/jdo/LidoSubTask.java               |    2 +-
 modules/mvcsoft/src/xdoclet/modules/mvcsoft/ejb/MVCSoftSubTask.java            |    4 ++--
 modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java    |    2 +-
 modules/objectweb/src/xdoclet/modules/objectweb/jonas/web/JonasWebSubTask.java |    2 +-
 modules/solarmetric/src/xdoclet/modules/solarmetric/jdo/KodoSubTask.java       |    2 +-
 modules/sun/src/xdoclet/modules/sun/sunone/ejb/SunONESubTask.java              |    6 +++---
 modules/tjdo/src/xdoclet/modules/triactive/jdo/TJDOSubTask.java                |    2 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

Index: xdoclet-ant.not-required.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-ant.not-required.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdoclet-ant.not-required.patch	7 Jun 2005 10:05:58 -0000	1.2
+++ xdoclet-ant.not-required.patch	23 Jul 2006 05:33:03 -0000	1.3
@@ -193,10 +193,10 @@
      {
 --- modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java.orig	2004-06-30 20:49:02.000000000 +0200
 +++ modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java	2004-06-30 20:39:18.000000000 +0200
-@@ -216,7 +216,7 @@
-      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2
+@@ -228,7 +228,7 @@
+      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
       *
-      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2
+      * @param version      The new version value. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0, 3.2, 3.3.2, 4.0, 4.2, 4.6
 -     * @ant.not-required   No, default is "2.6".
 +     * @ant.not-required   "No, default is '2.6'."
       */

xdoclet-build_xml.patch:
 build.xml                  |    9 +++++----
 core/build.xml             |    2 +-
 modules/modules-common.ent |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

Index: xdoclet-build_xml.patch
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet-build_xml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdoclet-build_xml.patch	7 Jun 2005 10:05:58 -0000	1.2
+++ xdoclet-build_xml.patch	23 Jul 2006 05:33:03 -0000	1.3
@@ -20,44 +20,36 @@
  
          <pretty2 settingsDir="${config.dir}" cvs="true" compileDir="${module.classes.dir}">
              <fileset dir="${module.src.dir}">
---- build.xml.orig	2005-05-04 09:59:46.000000000 -0400
-+++ build.xml	2005-05-04 11:09:49.000000000 -0400
-@@ -6,14 +6,19 @@
+--- build.xml.orig	2004-06-21 15:14:10.000000000 -0400
++++ build.xml	2005-03-07 12:34:42.000000000 -0500
+@@ -6,6 +6,7 @@
      <property file="${user.home}/build.properties"/>
      <property name="xjavadoc.jar" location="${lib.dir}/xjavadoc-${xjavadoc.version}.jar"/>
      <property environment="env"/>
 +    <property name="xjavadoc.uptodate" value="true"/>
-+    <property name="xjavadoc.sources.present" value="true"/>
  
      <target name="xjavadoc-determine-presence">
          <available property="xjavadoc.sources.present"
-                    file="${basedir}/../xjavadoc"
+@@ -13,7 +14,7 @@
                     type="dir"/>
-+        <condition property="xjavadoc.sources.available">
-+            <istrue value="${xjavadoc.sources.present}" />
-+        </condition>
      </target>
  
 -    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present">
-+    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
++    <target name="xjavadoc-determine-uptodate" depends="xjavadoc-determine-presence,download-xjavadoc" if="xjavadoc.sources.present">
          <echo>XJavaDoc sources are available. Checking against ${xjavadoc.jar}</echo>
          <uptodate property="xjavadoc.uptodate"
                    targetfile="${xjavadoc.jar}">
-@@ -23,7 +28,7 @@
-         </uptodate>
+@@ -36,7 +37,7 @@
+         <echo>The XJavaDoc binaries are up to date. No need to build.</echo>
      </target>
  
--    <target name="build-xjavadoc" depends="xjavadoc-determine-uptodate" if="xjavadoc.sources.present" unless="xjavadoc.uptodate">
-+    <target name="build-xjavadoc" depends="download-xjavadoc,xjavadoc-determine-uptodate" if="xjavadoc.sources.available" unless="xjavadoc.uptodate">
-         <echo>XJavaDoc sources modified after jar file. Building XJavaDoc...</echo>
-         <ant dir="${basedir}/../xjavadoc">
-             <property name="rootdir" value="${basedir}/../xjavadoc"/>
-@@ -47,9 +52,11 @@
-         
-         <get src="http://xdoclet.sourceforge.net/repository/xjavadoc/jars/xjavadoc-${xjavadoc.version}.jar"
+-    <target name="download-xjavadoc" depends="xjavadoc-determine-presence" unless="xjavadoc.sources.present">
++    <target name="download-xjavadoc" depends="xjavadoc-determine-presence" unless="xjavadoc.uptodate">
+         <echo>
+         XJavaDoc's sources are not available in ${basedir}/../xjavadoc
+         Trying to download xjavadoc via HTTP. If you're behind a proxy, you should uncomment
+@@ -49,7 +50,7 @@
               dest="${xjavadoc.jar}"/>
-+
-+        <property name="xjavadoc.sources.available" value="true"/>
      </target>
  
 -    <target name="xjavadoc" depends="build-xjavadoc,dont-build-xjavadoc,download-xjavadoc"/>
@@ -65,7 +57,7 @@
  
      <target name="core">
          <ant dir="${core.dir}"/>
-@@ -145,7 +152,7 @@
+@@ -145,7 +146,7 @@
          <copy file="${lib.dir}/log4j.jar" todir="${dist.lib.dir}"/>
  
          <!-- Copy the Jakarta Commons Collections jar to the dist.lib directory -->



From fedora-cvs-commits at redhat.com  Sun Jul 23 06:47:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 02:47:15 -0400
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.59,1.60
Message-ID: <200607230647.k6N6lFtG020198@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20185

Modified Files:
	libgtk-java.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.8.5-2
- Bump release number. (dist-fc6-java)




Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libgtk-java.spec	12 Jul 2006 15:40:28 -0000	1.59
+++ libgtk-java.spec	23 Jul 2006 06:47:13 -0000	1.60
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.5
-Release: 	1
+Release: 	2
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.8.5-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.8.5-1
 - Release 0 is not allowed.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 07:21:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 03:21:37 -0400
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.32,1.33
Message-ID: <200607230721.k6N7LbNf017307@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17230

Modified Files:
	libgconf-java.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-3
- Bump release number. (dist-fc6-java)




Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgconf-java.spec	16 Jul 2006 19:04:19 -0000	1.32
+++ libgconf-java.spec	23 Jul 2006 07:21:34 -0000	1.33
@@ -15,7 +15,7 @@
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.3
-Release: 	2
+Release: 	3
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-3
+- Bump release number. (dist-fc6-java)
+
 * Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
 - Move the pkgconfig file to the devel package.
 - BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel



From fedora-cvs-commits at redhat.com  Sun Jul 23 07:31:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 03:31:35 -0400
Subject: rpms/libvte-java/devel libvte-java.spec,1.22,1.23
Message-ID: <200607230731.k6N7VZOA020750@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20694

Modified Files:
	libvte-java.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.12.0-2
- Bump release number. (dist-fc6-java)




Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvte-java.spec	12 Jul 2006 15:49:26 -0000	1.22
+++ libvte-java.spec	23 Jul 2006 07:31:25 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.12.0
-Release:   1
+Release:   2
 URL:       http://java-gnome.sourceforge.net
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name_base}/0.12/%{name}-%{version}.tar.bz2
 License:   LGPL
@@ -96,6 +96,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.12.0-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 0.12.0-1
 - Release 0 is not allowed.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 07:41:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 03:41:32 -0400
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.37,1.38
Message-ID: <200607230741.k6N7fWbw023325@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23249

Modified Files:
	libgnome-java.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-2
- Bump release number. (dist-fc6-java)




Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libgnome-java.spec	12 Jul 2006 15:45:55 -0000	1.37
+++ libgnome-java.spec	23 Jul 2006 07:41:30 -0000	1.38
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
 Version:	2.12.3
-Release: 	1
+Release: 	2
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -107,6 +107,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - Release 0 is not allowed.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 07:54:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 03:54:10 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.41,1.42
Message-ID: <200607230754.k6N7sAc8010414@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10347

Modified Files:
	libglade-java.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.4-2
- Bump release number. (dist-fc6-java)




Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libglade-java.spec	12 Jul 2006 15:48:02 -0000	1.41
+++ libglade-java.spec	23 Jul 2006 07:54:08 -0000	1.42
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.4
-Release: 	1
+Release: 	2
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -118,6 +118,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.4-2
+- Bump release number. (dist-fc6-java)
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
 - Release 0 is not allowed.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 08:06:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 04:06:38 -0400
Subject: rpms/frysk/devel frysk.spec,1.74,1.75
Message-ID: <200607230806.k6N86cIh013844@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13801

Modified Files:
	frysk.spec 
Log Message:
* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.0.1.2006.07.18.rh1-2
- Bump release number. (dist-fc6-java)




Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- frysk.spec	18 Jul 2006 17:13:09 -0000	1.74
+++ frysk.spec	23 Jul 2006 08:06:36 -0000	1.75
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.18.rh1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -97,6 +97,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.0.1.2006.07.18.rh1-2
+- Bump release number. (dist-fc6-java)
+
 * Tue Jul 18 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.18.rh1-1
 - New upstream version, incorporates the previous two patches.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 08:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 04:27:18 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.300,1.301
Message-ID: <200607230827.k6N8RIOv004567@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4531

Modified Files:
	eclipse.spec 
Log Message:
Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- eclipse.spec	22 Jul 2006 08:38:34 -0000	1.300
+++ eclipse.spec	23 Jul 2006 08:27:15 -0000	1.301
@@ -41,7 +41,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/
@@ -1140,9 +1140,9 @@
 %if %{gcj_support}
 %ifarch ia64
 # FIXME: auto get version number; tweak aot-compile-rpm to fix this
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar --exclude %{_datadir}/%[name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar.so 
 %else
-aot-compile-rpm
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar.so
 %endif
 %endif
 
@@ -1634,6 +1634,9 @@
 %endif
 
 %changelog
+* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc
+- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1jpp_6fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 14:36:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 10:36:36 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.301,1.302
Message-ID: <200607231436.k6NEaaAt022170@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22137

Modified Files:
	eclipse.spec 
Log Message:
exclude jar not jar.so


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- eclipse.spec	23 Jul 2006 08:27:15 -0000	1.301
+++ eclipse.spec	23 Jul 2006 14:36:34 -0000	1.302
@@ -1140,9 +1140,9 @@
 %if %{gcj_support}
 %ifarch ia64
 # FIXME: auto get version number; tweak aot-compile-rpm to fix this
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar --exclude %{_datadir}/%[name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar.so 
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar --exclude %{_datadir}/%[name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar 
 %else
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar.so
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar
 %endif
 %endif
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 15:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 11:19:21 -0400
Subject: rpms/velocity/devel velocity-build-testcases.patch, NONE,
	1.1 velocity.spec, 1.17, 1.18 velocity-notexentests.patch, 1.1, NONE
Message-ID: <200607231519.k6NFJLqY015789@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15441

Modified Files:
	velocity.spec 
Added Files:
	velocity-build-testcases.patch 
Removed Files:
	velocity-notexentests.patch 
Log Message:
- Merge with latest from JPP.
- Remove fileversion and my_version macros.
- Remove notexentests patch and replace with a patch to disable
- failure on tests.



velocity-build-testcases.patch:
 testcases.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE velocity-build-testcases.patch ---
--- ./build/testcases.xml.save	2006-07-22 21:26:04.000000000 -0400
+++ ./build/testcases.xml	2006-07-22 21:25:43.000000000 -0400
@@ -13,7 +13,7 @@
   <property name="velocity.test.runner" value="junit.textui.TestRunner"/>
 
   <!-- Turns on/off overall failure if one test fails -->
- <property name="testbed.failonerror" value="true"/>
+ <property name="testbed.failonerror" value="false"/>
 
   <!-- Build classpath -->
   <path id="classpath">


Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- velocity.spec	22 Jul 2006 08:45:57 -0000	1.17
+++ velocity.spec	23 Jul 2006 15:19:19 -0000	1.18
@@ -1,11 +1,43 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section free
 
-%define my_version 1.4
-%define fileversion %{my_version}
 
 Name:           velocity
-Version:        %{my_version}
-Release: 	3jpp_8fc
+Version:        1.4
+Release:        5jpp_1fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -13,32 +45,46 @@
 Patch0:		velocity-AnakiaJDOMFactory-jdom-DefaultJDOMFactory.patch
 Patch1:		velocity-AnakiaTask-jdom-XMLOutputter.patch
 Patch2:		velocity-servletapi5.patch
-Patch3:		velocity-notexentests.patch
+#Disable failure-on-tests rather than not running tests. 
+Patch3:		velocity-build-testcases.patch
+#Patch3:		velocity-notexentests.patch
 URL:            http://jakarta.apache.org/velocity/
 Group:          Development/Libraries/Java
 Requires:       jakarta-commons-collections
+# Use servletapi5 instead of servletapi3
 Requires:       servletapi5
 Requires:       oro
 Requires:	werken.xpath
 Requires:       jdom >= 0:1.0-1
 Requires:       bcel
 Requires:       log4j >= 0:1.1
+#FIXME replace with excalibur-avalon-logkit when available
 Requires:       avalon-logkit
 BuildRequires:	werken.xpath
 BuildRequires:  ant
 BuildRequires:  antlr
 BuildRequires:  junit
 BuildRequires:  jakarta-commons-collections
+# Use servletapi5 instead of servletapi3
 BuildRequires:  servletapi5
 BuildRequires:  oro
 BuildRequires:  jdom >= 0:1.0-1
 BuildRequires:  bcel
 BuildRequires:  log4j >= 0:1.1
+#FIXME replace with excalibur-avalon-logkit when available
 BuildRequires:  avalon-logkit
-BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  jpackage-utils >= 0:1.6
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
 simple yet powerful template language to reference objects defined in
@@ -70,7 +116,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 Javadoc for %{name}.
@@ -80,13 +125,19 @@
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description    demo
 Demonstrations and samples for %{name}.
 
 # -----------------------------------------------------------------------------
 
 %prep
-%setup -q -n %{name}-%{fileversion}
+%setup -q -n %{name}-%{version}
 # Remove all binary libs used in compiling the package.
 # Note that velocity has some jar files containing macros under
 # examples and test that should not be removed.
@@ -94,11 +145,14 @@
 
 %patch0 -b .sav
 %patch1 -b .sav
+#Apply patch to remove explicit dependency on servletapi3
 %patch2 -p1
 %patch3 -p1
 # -----------------------------------------------------------------------------
 
 %build
+# Use servletapi5 instead of servletapi3 in CLASSPATH
+#FIXME Replace avalon-logkit with excalibur-avalon-logkit when ready
 export CLASSPATH=$(build-classpath \
 antlr \
 jakarta-commons-collections \
@@ -123,12 +177,12 @@
 
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 bin/%{name}-%{fileversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{fileversion}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{fileversion}*; do ln -sf ${jar} `echo $jar| sed "s|-%{fileversion}||g"`; done)
+install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{fileversion}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{fileversion}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
 
 # data
@@ -137,6 +191,12 @@
 
 # -----------------------------------------------------------------------------
 
+echo `pwd`
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -144,7 +204,7 @@
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{fileversion} %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ "$1" = "0" ]; then
@@ -153,18 +213,59 @@
 
 # -----------------------------------------------------------------------------
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.4.jar.*
+#FIXME: This was not generated by spec-convert-gcj-* script
+#but natively compiled by aot-compile-rpm. There doesnt seem
+#to be a jar in the buildroot for classloader, yet it is
+#compiled by aot-compile-rpm! Find out why.
+%attr(-,root,root) %{_libdir}/gcj/%{name}/classloader.*
+%endif
+
 %files manual
 %defattr(0644,root,root,0755)
 %doc docs/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{fileversion}
+%{_javadocdir}/%{name}-%{version}
 
 %files demo
 %defattr(0644,root,root,0755)
@@ -172,7 +273,25 @@
 
 # -----------------------------------------------------------------------------
 
+#FIXME: Generated by spec-convert-gcj-* script. These cant be natively compiled
+#since they only contain *.vm files. Check if these are ignored in subsequent versions
+#of spec-convert-gcj-* script.
+#%if %{gcj_support}
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/template.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/test1.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/test2.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/test.jar.*
+#%endif
+
 %changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-5jpp_1fc
+- Merge with latest from JPP.
+- Remove fileversion and my_version macros.
+- Remove notexentests patch and replace with a patch to disable
+- failure on tests.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.4-3jpp_8fc
 - Rebuilt
 
@@ -232,7 +351,7 @@
 - Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
   build problems.
 
-* Sun May 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.3.1-2jpp
+* Sun May 25 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:1.3.1-2jpp
 - Add Epochs to dependencies.
 - Add explicit defattrs.
 - Add non-versioned javadoc symlinks.


--- velocity-notexentests.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul 23 15:30:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 11:30:22 -0400
Subject: rpms/velocity/devel velocity.spec,1.18,1.19
Message-ID: <200607231530.k6NFUMjw019894@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19519

Modified Files:
	velocity.spec 
Log Message:
- Remove debug statements for the spec.




Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- velocity.spec	23 Jul 2006 15:19:19 -0000	1.18
+++ velocity.spec	23 Jul 2006 15:30:17 -0000	1.19
@@ -191,8 +191,6 @@
 
 # -----------------------------------------------------------------------------
 
-echo `pwd`
-
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif



From fedora-cvs-commits at redhat.com  Sun Jul 23 15:34:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 11:34:47 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.302,1.303
Message-ID: <200607231534.k6NFYliE020270@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20234

Modified Files:
	eclipse.spec 
Log Message:
fix typo


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- eclipse.spec	23 Jul 2006 14:36:34 -0000	1.302
+++ eclipse.spec	23 Jul 2006 15:34:35 -0000	1.303
@@ -1140,7 +1140,7 @@
 %if %{gcj_support}
 %ifarch ia64
 # FIXME: auto get version number; tweak aot-compile-rpm to fix this
-aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar --exclude %{_datadir}/%[name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar 
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_3.2.0.M20060628.jar --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar 
 %else
 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_3.2.0.v20060531.jar
 %endif
@@ -1635,7 +1635,7 @@
 
 %changelog
 * Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc
-- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar.
+- Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar from aot-compile-rpm.
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.2.0-1jpp_6fc
 - Rebuilt



From fedora-cvs-commits at redhat.com  Sun Jul 23 15:57:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 11:57:31 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.160,
	1.161
Message-ID: <200607231557.k6NFvVee010648@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-serv10576

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_97rh
- Link jsse.jar to libgcj.jar.




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.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- java-1.4.2-gcj-compat.spec	22 Jul 2006 22:13:18 -0000	1.160
+++ java-1.4.2-gcj-compat.spec	23 Jul 2006 15:57:29 -0000	1.161
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_96rh
+%define release 	40jpp_97rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -172,10 +172,6 @@
 ln -sf %{_bindir}/ecj-%{cname} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
 %endif
 
-# create extensions symlinks
-# jessie
-ln -s %{_javadir}/jsse.jar $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/jsse.jar
-
 # extensions handling
 install -dm 755 $RPM_BUILD_ROOT%{jvmjardir}
 pushd $RPM_BUILD_ROOT%{jvmjardir}
@@ -298,6 +294,11 @@
   %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
   %{_jvmdir}/%{cname}-%{version}/jre/lib/jaas.jar
 
+# jsse.jar
+ln -sf \
+  %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
+  %{_jvmdir}/%{cname}-%{version}/jre/lib/jsse.jar
+
 # jdbc-stdext.jar
 ln -sf \
   %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
@@ -481,6 +482,11 @@
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
     %{_jvmdir}/%{cname}-%{version}/jre/lib/jaas.jar
 
+  # jsse.jar
+  ln -sf \
+    %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
+    %{_jvmdir}/%{cname}-%{version}/jre/lib/jsse.jar
+
   # jdbc-stdext.jar
   ln -sf \
     %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar \
@@ -622,6 +628,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_97rh
+- Link jsse.jar to libgcj.jar.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_96rh
 - Remove gjdoc workaround.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 16:31:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 12:31:38 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.18,1.19
Message-ID: <200607231631.k6NGVcWn003392@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3300

Modified Files:
	xdoclet.spec 
Log Message:
Add xalan-j2 to ant OPT_JAR_LIST



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdoclet.spec	23 Jul 2006 04:26:35 -0000	1.18
+++ xdoclet.spec	23 Jul 2006 16:31:21 -0000	1.19
@@ -179,7 +179,7 @@
 %patch6 -b .sav
 
 %build
-export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
+export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2"
 ant xjavadoc core modules docs l10n
 
 %if %{with_demo}



From fedora-cvs-commits at redhat.com  Sun Jul 23 17:09:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 13:09:57 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.303,1.304
Message-ID: <200607231709.k6NH9v6h029315@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29046

Modified Files:
	eclipse.spec 
Log Message:
* Sun Jul 23 2006 Andrew Overholt <bkonrath at redhat.com> 3.2.0-1jpp_7fc
- Remove org.eclipse.ant.ui* from %%files.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- eclipse.spec	23 Jul 2006 15:34:35 -0000	1.303
+++ eclipse.spec	23 Jul 2006 17:09:54 -0000	1.304
@@ -1526,7 +1526,7 @@
 %{_libdir}/gcj/%{name}/startup.jar*
 %{_libdir}/gcj/%{name}/com.jcraft.jsch_*
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
+#%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.expressions_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
@@ -1634,6 +1634,9 @@
 %endif
 
 %changelog
+* Sun Jul 23 2006 Andrew Overholt <bkonrath at redhat.com> 3.2.0-1jpp_7fc
+- Remove org.eclipse.ant.ui* from %%files.
+
 * Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc
 - Exclude org.eclipse.ant.ui_3.2.0.v20060531.jar from aot-compile-rpm.
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 17:30:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 13:30:16 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.19,1.20
Message-ID: <200607231730.k6NHUFCd024572@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24543

Modified Files:
	xdoclet.spec 
Log Message:
Use ant verbose option for testing



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xdoclet.spec	23 Jul 2006 16:31:21 -0000	1.19
+++ xdoclet.spec	23 Jul 2006 17:30:13 -0000	1.20
@@ -180,7 +180,7 @@
 
 %build
 export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2"
-ant xjavadoc core modules docs l10n
+ant -v xjavadoc core modules docs l10n
 
 %if %{with_demo}
 ant samples



From fedora-cvs-commits at redhat.com  Sun Jul 23 17:39:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 13:39:49 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.20,1.21
Message-ID: <200607231739.k6NHdnoW032720@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24642

Modified Files:
	xdoclet.spec 
Log Message:
Testing



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xdoclet.spec	23 Jul 2006 17:30:13 -0000	1.20
+++ xdoclet.spec	23 Jul 2006 17:39:47 -0000	1.21
@@ -180,7 +180,7 @@
 
 %build
 export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2"
-ant -v xjavadoc core modules docs l10n
+ant -d xjavadoc core modules docs l10n
 
 %if %{with_demo}
 ant samples



From fedora-cvs-commits at redhat.com  Sun Jul 23 18:43:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 14:43:29 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.21,1.22
Message-ID: <200607231843.k6NIhTi0019545@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19175

Modified Files:
	xdoclet.spec 
Log Message:
Add missing xalan-j2-serializer from ant OPT_JAR_LIST



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xdoclet.spec	23 Jul 2006 17:39:47 -0000	1.21
+++ xdoclet.spec	23 Jul 2006 18:43:26 -0000	1.22
@@ -79,7 +79,7 @@
 BuildRequires:  mockobjects 
 BuildRequires:  struts 
 BuildRequires:  velocity 
-BuildRequires:  xalan-j2
+BuildRequires:  xalan-j2 >= 0:2.7.0
 BuildRequires:  xml-commons-apis 
 BuildRequires:  xjavadoc >= 0:1.1
 
@@ -89,7 +89,7 @@
 Requires:  log4j
 Requires:  mockobjects
 Requires:  velocity
-Requires:  xalan-j2
+Requires:  xalan-j2 >= 0:2.7.0
 Requires:  xml-commons-apis
 Requires:  xjavadoc = 0:1.1
 
@@ -179,8 +179,8 @@
 %patch6 -b .sav
 
 %build
-export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2"
-ant -d xjavadoc core modules docs l10n
+export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2 xalan-j2-serializer"
+ant xjavadoc core modules docs l10n
 
 %if %{with_demo}
 ant samples



From fedora-cvs-commits at redhat.com  Sun Jul 23 19:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 15:37:11 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.22,1.23
Message-ID: <200607231937.k6NJbBPW000961@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv901

Modified Files:
	xdoclet.spec 
Log Message:
Rebuild



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xdoclet.spec	23 Jul 2006 18:43:26 -0000	1.22
+++ xdoclet.spec	23 Jul 2006 19:37:08 -0000	1.23
@@ -43,7 +43,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	6jpp_1fc
+Release:	6jpp_2fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -292,6 +292,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_2fc
+- Rebuild
+
 * Sat Jul 22 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_1fc
 - Merge with upstream version
 - Remove dependency on maven, use ant instead



From fedora-cvs-commits at redhat.com  Sun Jul 23 20:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 16:22:00 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.10,1.11
Message-ID: <200607232022.k6NKM0D1026640@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26556

Modified Files:
	concurrent.spec 
Log Message:
Rebuilt



Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- concurrent.spec	22 Jul 2006 08:37:08 -0000	1.10
+++ concurrent.spec	23 Jul 2006 20:21:58 -0000	1.11
@@ -36,7 +36,7 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_3fc
+Release:        3jpp_4fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -135,6 +135,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_4fc
+- Rebuilt
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.3.4-3jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 21:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 17:52:49 -0400
Subject: rpms/bcel/devel bcel-5.1-build.patch, NONE,
	1.1 bcel-5.1-jpp-depmap.xml, NONE,
	1.1 bcel-5.1-project_xml.patch, NONE,
	1.1 pom-maven2jpp-depcat.xsl, NONE,
	1.1 pom-maven2jpp-mapdeps.xsl, NONE,
	1.1 pom-maven2jpp-newdepmap.xsl, NONE, 1.1 .cvsignore, 1.6,
	1.7 bcel.spec, 1.17, 1.18 sources, 1.5, 1.6
Message-ID: <200607232152.k6NLqnDM002418@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2180

Modified Files:
	.cvsignore bcel.spec sources 
Added Files:
	bcel-5.1-build.patch bcel-5.1-jpp-depmap.xml 
	bcel-5.1-project_xml.patch pom-maven2jpp-depcat.xsl 
	pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl 
Log Message:
Merge with upstream version
Natively compile packages


bcel-5.1-build.patch:
 Pass2Verifier.java        |    8 ++++----
 StringRepresentation.java |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bcel-5.1-build.patch ---
--- bcel-5.1/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java~	2004-10-16 15:06:59.231184305 -0400
+++ bcel-5.1/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java	2004-10-16 15:07:47.577200177 -0400
@@ -345,7 +345,7 @@
 
 			for (int i=0; i<atts.length; i++){
 				if ((! (atts[i] instanceof SourceFile)) &&
-				    (! (atts[i] instanceof Deprecated))     &&
+				    (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))     &&
 				    (! (atts[i] instanceof InnerClasses)) &&
 				    (! (atts[i] instanceof Synthetic))){
 					addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of the ClassFile structure '"+tostring(obj)+"' is unknown and will therefore be ignored.");
@@ -519,7 +519,7 @@
 			for (int i=0; i<atts.length; i++){
 				if ((! (atts[i] instanceof ConstantValue)) &&
 				    (! (atts[i] instanceof Synthetic))     &&
-				    (! (atts[i] instanceof Deprecated))){
+				    (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){
 					addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Field '"+tostring(obj)+"' is unknown and will therefore be ignored.");
 				}
 				if  (! (atts[i] instanceof ConstantValue)){
@@ -660,7 +660,7 @@
 				if ((! (atts[i] instanceof Code)) &&
 				    (! (atts[i] instanceof ExceptionTable))     &&
 				    (! (atts[i] instanceof Synthetic)) &&
-				    (! (atts[i] instanceof Deprecated))){
+				    (! (atts[i] instanceof org.apache.bcel.classfile.Deprecated))){
 					addMessage("Attribute '"+tostring(atts[i])+"' as an attribute of Method '"+tostring(obj)+"' is unknown and will therefore be ignored.");
 				}
 				if ((! (atts[i] instanceof Code)) &&
@@ -702,7 +702,7 @@
 				addMessage("SourceFile attribute '"+tostring(obj)+"' has a funny name: remember not to confuse certain parsers working on javap's output. Also, this name ('"+sourcefilename+"') is considered an unqualified (simple) file name only.");
 			}
 		}
-		public void visitDeprecated(Deprecated obj){//vmspec2 4.7.10
+		public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){//vmspec2 4.7.10
 			checkIndex(obj, obj.getNameIndex(), CONST_Utf8);
 
 			String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes();
--- bcel-5.1/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java~	2004-10-16 15:09:58.664972664 -0400
+++ bcel-5.1/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java	2004-10-16 15:10:15.874842037 -0400
@@ -172,7 +172,7 @@
 	public void visitConstantValue(ConstantValue obj){
 		tostring = toString(obj);
 	}
-	public void visitDeprecated(Deprecated obj){
+	public void visitDeprecated(org.apache.bcel.classfile.Deprecated obj){
 		tostring = toString(obj);
 	}
 	public void visitExceptionTable(ExceptionTable obj){


--- NEW FILE bcel-5.1-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
   <dependency>
      <maven>
         <groupId>regexp</groupId>
         <artifactId>regexp</artifactId>
         <version>1.2</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>regexp</artifactId>
         <jar>regexp.jar</jar>
         <version>1.2</version>
      </jpp>
   </dependency>
</depset>
bcel-5.1-project_xml.patch:
 project.xml |   16 ----------------
 1 files changed, 16 deletions(-)

--- NEW FILE bcel-5.1-project_xml.patch ---
--- project.xml.sav	2003-04-25 10:25:37.000000000 +0200
+++ project.xml	2006-04-11 16:23:12.000000000 +0200
@@ -21,7 +21,6 @@
   </description>
 
   <url>http://jakarta.apache.org/bcel/</url>
-  <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-bcel/</cvsWebUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/jakarta.apache.org/bcel/</siteDirectory>
 
@@ -73,22 +72,7 @@
   <build>
 
     <sourceDirectory>src/java</sourceDirectory>
-    <aspectSourceDirectory/>
-    <testSourceDirectory>src/java</testSourceDirectory>
 
-    <!-- Unit test classes -->
-    <unitTestPatterns>
-      <unitTestPattern>exclude = **/*.class</unitTestPattern>
-    </unitTestPatterns>
-
-    <!-- J A R  R E S O U R C E S -->
-    <!-- Resources that are packaged up inside the JAR file -->
-
-    <jarResources>
-    </jarResources>
-
-    <jars>
-    </jars>
   </build>
 </project>
 


--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="*[name() != 'dependencies']|*/text()">
     <xsl:apply-templates/>
 </xsl:template>
 <xsl:template match="//dependencies">
  <xsl:for-each select="./dependency">
   <xsl:element name="dependency">
    <xsl:element name="maven">
     <xsl:choose>
      <xsl:when test="./groupId">
       <xsl:copy-of select="./groupId"/>
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-before(./id/text(),':') != ''">
         <xsl:element name="groupId">
          <xsl:value-of select="substring-before(./id/text(),':')"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="groupId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
    <xsl:element name="jpp">
     <xsl:element name="groupId">JPP</xsl:element>
     <xsl:choose>
      <xsl:when test="./artifactId">
       <xsl:copy-of select="./artifactId"/>
      </xsl:when>
      <xsl:when test="./id">
       <xsl:choose>
        <xsl:when test="substring-after(./id/text(),':') != ''">
         <xsl:element name="artifactId">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:element>
        </xsl:when>
        <xsl:otherwise>
         <xsl:element name="artifactId">
          <xsl:value-of select="./id/text()"/>
         </xsl:element>
        </xsl:otherwise>
       </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
ERROR
      </xsl:otherwise>
     </xsl:choose>
     <xsl:element name="jar">
      <xsl:choose>
       <xsl:when test="./artifactId">
        <xsl:value-of select="./artifactId/text()"/>
       </xsl:when>
       <xsl:when test="./id">
        <xsl:choose>
         <xsl:when test="substring-after(./id/text(),':') != ''">
          <xsl:value-of select="substring-after(./id/text(),':')"/>
         </xsl:when>
         <xsl:otherwise>
          <xsl:value-of select="./id/text()"/>
         </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
ERROR
       </xsl:otherwise>
      </xsl:choose>
      <xsl:choose>
       <xsl:when test="./type">
        <xsl:choose>
         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
        </xsl:choose>
       </xsl:when>
       <xsl:otherwise>.jar</xsl:otherwise>
      </xsl:choose>
     </xsl:element>
     <xsl:for-each select="./*">
      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
       <xsl:copy-of select="."/>
      </xsl:if>
     </xsl:for-each>
    </xsl:element>
   </xsl:element>
  </xsl:for-each>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:param name="map" /> 
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/project" >
  <xsl:element name="project">
   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
   <xsl:if test="not(./dependencies)">
    <xsl:element name="dependencies">
     <xsl:for-each select="document($map)//add/dependency">
       <xsl:copy-of select="."/>
     </xsl:for-each>
    </xsl:element>
   </xsl:if>
   <xsl:apply-templates select="dependencies"/>
  </xsl:element>
 </xsl:template>
 <xsl:template match="dependencies" >
  <xsl:element name="dependencies">
   <xsl:for-each select="dependency">
    <xsl:if test="./artifactId">
     <xsl:call-template name="replace">
      <xsl:with-param name="artifact" select="./artifactId/text()"/>
     </xsl:call-template>
    </xsl:if>
    <xsl:if test="./id">
     <xsl:choose>
      <xsl:when test="substring-after(./id/text(),':') != ''">
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
       </xsl:call-template>
      </xsl:when>
      <xsl:otherwise>
       <xsl:call-template name="replace">
        <xsl:with-param name="artifact" select="./id/text()"/>
       </xsl:call-template>
      </xsl:otherwise>
     </xsl:choose>
    </xsl:if>
   </xsl:for-each>
   <xsl:for-each select="document($map)//add/dependency">
    <xsl:copy-of select="."/>
   </xsl:for-each>
  </xsl:element>
 </xsl:template>
 <xsl:template name="replace">
  <xsl:param name="artifact"/>
  <xsl:variable name="this" select="."/>
  <xsl:element name="dependency">
   <xsl:choose>
    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
      <xsl:copy-of select="../jpp/*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:for-each>
    </xsl:when>
    <xsl:otherwise>
     <xsl:copy-of select="./*"/>
    </xsl:otherwise>
   </xsl:choose>
  </xsl:element>
  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
    <xsl:for-each select="../add/dependency">
     <xsl:element name="dependency">
      <xsl:copy-of select="./*"/>
      <xsl:copy-of select="$this/properties"/>
     </xsl:element>
    </xsl:for-each>
   </xsl:for-each>
  </xsl:if>
 </xsl:template>
</xsl:stylesheet>


--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
	xmlns:saxon="http://icl.com/saxon"
	extension-element-prefixes="saxon">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
 <xsl:strip-space elements="*"/> 
 <xsl:template match="/" >
  <xsl:element name="depset">
   <saxon:group select="//dependency" group-by="./maven/artifactId">
    <xsl:sort select="./maven/artifactId"/>
    <xsl:element name="dependency">
     <xsl:element name="maven">
      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
     </xsl:element>
     <xsl:element name="jpp">
      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
     </xsl:element>
    </xsl:element>
    <saxon:item/>
   </saxon:group>
  </xsl:element>
 </xsl:template>
</xsl:stylesheet>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Oct 2004 13:55:29 -0000	1.6
+++ .cvsignore	23 Jul 2006 21:52:46 -0000	1.7
@@ -1,4 +1,2 @@
-bcel-5.1-src.tar.gz
-bcel-5.1
-noarch
-*.src.rpm
+bcel-5.1-src-RHCLEAN.tar.gz
+jakarta-site2.tar.gz


Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bcel.spec	22 Jul 2006 08:36:07 -0000	1.17
+++ bcel.spec	23 Jul 2006 21:52:46 -0000	1.18
@@ -1,26 +1,93 @@
-%define name    bcel
-%define version 5.1
-%define release 1jpp_8fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#For fedora, we want a native gcj compilation
+%define _with_gcj_support 1
+#Fedora currently does not support maven
+%define _without_maven 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
 %define section free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           bcel
+Version:        5.1
+Release:        7jpp_1fc
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
-Source0:        http://jakarta.apache.org/builds/jakarta-bcel/release/v5.1/bcel-5.1-src.tar.gz
+Source0:        bcel-5.1-src-RHCLEAN.tar.gz
+# svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
+Source1:        pom-maven2jpp-depcat.xsl
+Source2:        pom-maven2jpp-newdepmap.xsl
+Source3:        pom-maven2jpp-mapdeps.xsl
+Source4:        bcel-5.1-jpp-depmap.xml
+Source5:        jakarta-site2.tar.gz
+
+Patch0:         bcel-5.1-build.patch
+Patch1:         bcel-5.1-project_xml.patch
 URL:            http://jakarta.apache.org/%{name}/
 Group:          Development/Libraries/Java
-#Vendor:         JPackage Project
-#Distribution:   JPackage
 Requires:       regexp
 BuildRequires:  ant
+%if %{with_maven}
+BuildRequires:  maven >= 0:1.1
+BuildRequires:  saxon
+BuildRequires:  saxon-scripts
+%endif
+#excalibur-avalong-logkit should be used once Maven is supported in Fedora
+BuildRequires: avalon-logkit
+#BuildRequires:  excalibur-avalon-logkit
+BuildRequires:  jakarta-commons-collections
+BuildRequires:  jdom
+BuildRequires:  velocity
 BuildRequires:  regexp
-BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  werken.xpath
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The Byte Code Engineering Library (formerly known as JavaClass) is
 intended to give users a convenient possibility to analyze, create, and
@@ -40,110 +107,203 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description javadoc
-Javadoc for %{name}.
+%{summary}.
 
-%if 0
 %package manual
 Summary:        Manual for %{name}
 Group:          Development/Libraries/Java
 
 %description manual
-Documentation for %{name}.
-%endif
+%{summary}.
 
-%prep
-%setup -q
+%package demo
+Summary:        Examples for %{name}
+Group:          Development/Libraries/Java
+
+%description demo
+%{summary}.
+
+#%prep
+#cat <<EOT
+#
+#                If you dont want to build with maven,
+#                give rpmbuild option '--without maven'
+#
+#EOT
+
+%setup -q -n BCEL_5_1
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+#find . -name "*.jar" -exec rm -f {} \;
+for j in $(find . -name "*.jar"); do
+    mv $j $j.no
+done
+gzip -dc %{SOURCE5} | tar xf -
+mkdir jakarta-site2/lib
+pushd jakarta-site2/lib/
+  build-jar-repository -s -p . jdom
+  build-jar-repository -s -p . velocity
+  build-jar-repository -s -p . commons-collections
+  build-jar-repository -s -p . avalon-logkit
+  build-jar-repository -s -p . werken.xpath
+popd
+pushd lib
+  ln -sf $(build-classpath regexp) Regexp.jar
+popd
+%patch0 -p1
+%patch1 -b .sav
 
 # very broken build
 perl -p -i -e 's| depends=\"examples\"||g;' build.xml
 touch manifest.txt
 
 %build
-export CLASSPATH=%(build-classpath regexp)
-ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} compile
-ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} jar
-ant -Dbuild.dest=./build -Dbuild.dir=./build -Dname=%{name} apidocs
+%if %{with_maven}
+export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
+echo '<depset>' >> $DEPCAT
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+    popd
+done
+echo >> $DEPCAT
+echo '</depset>' >> $DEPCAT
+/usr/bin/saxon $DEPCAT %{SOURCE2} > bcel-5.1-depmap.new.xml
+
+for p in $(find . -name project.xml); do
+    pushd $(dirname $p)
+    cp project.xml project.xml.orig
+    /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+    popd
+done
+
+export MAVEN_HOME_LOCAL=$(pwd)/.maven
+
+maven \
+        -Dmaven.repo.remote=file:/usr/share/maven/repository \
+        -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
+        jar:jar javadoc:generate xdoc:transform
+%else
+ant 	-d -Dbuild.dest=build/classes -Dbuild.dir=build \
+	-Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
+	compile jar apidocs xdocs
+%endif
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+%__mkdir_p %{buildroot}%{_javadir}
+%if %{with_maven}
+%__install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%else
+%__install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%endif
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf docs/api
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+%__cp -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__rm -rf target/docs/apidocs
+%else
+%__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%__rm -rf docs/api
+%endif
+# samples
+%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
+%__cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version}
+# manual
+%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
+%if %{with_maven}
+%__cp -pr target/docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%else
+%__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
+%endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
-%pre
-rm -f %{_javadir}/bcel.jar
+%clean
+%__rm -rf %{buildroot}
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
+%__rm -f %{_javadocdir}/%{name}
+%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
 
 %postun javadoc
 if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
+    %__rm -f %{_javadocdir}/%{name}
+fi
+
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
 fi
+%endif
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt 
 %{_javadir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/bcel-5.1.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
-%if 0
 %files manual
 %defattr(0644,root,root,0755)
-%doc docs/*
-%endif
+%doc %{_docdir}/%{name}-%{version}
+
+%files demo
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}-%{version}
 
 # -----------------------------------------------------------------------------
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:5.1-1jpp_8fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:5.1-1jpp_7fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.1-1jpp_6fc
-- stop the scriptlet spew 
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:5.1-1jpp_5fc
-- rebuilt again
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Tue Nov  8 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:5.1-1jpp_4fc
-- Converted from ISO-8859-1 to UTF-8
-
-* Tue Jan 11 2005 Gary Benson <gbenson at redhat.com> 0:5.1-1jpp_4fc
-- Reenable building of classes that require javax.swing (#130006).
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_1fc
+- Merged with upstream version
+- set to build with Ant instead of Maven
+
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
+- Add missing werken.xpath to the build requires
+- Added conditional native compilation
+- Changed spec file encoding from ISO-8859-1 to UTF-8 
+
+* Tue Apr 11 2006 Ralph Apel <r.apel at r-apel.de> 0:5.1-6jpp
+- First JPP-1.7 release
+- Use tidyed sources from svn
+- Add resources to build the manual
+- Add examples to -demo subpackage
+- Build with maven by default
+- Add option to build with straight ant
+
+* Fri Nov 19 2004 David Walluck <david at jpackage.org> 0:5.1-5jpp
+- rebuild to fix packager
 
-* Thu Nov  4 2004 Gary Benson <gbenson at redhat.com> 0:5.1-1jpp_3fc
-- Build into Fedora.
+* Sat Nov 06 2004 David Walluck <david at jpackage.org> 0:5.1-4jpp
+- rebuild with javac 1.4.2
 
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:5.1-1jpp_2rh
-- add RHUG upgrade cleanup
+* Sat Oct 16 2004 David Walluck <david at jpackage.org> 0:5.1-3jpp
+- rebuild for JPackage 1.6
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:5.1-1jpp_1rh
-- RH vacuuming
+* Fri Aug 20 2004 Ralph Apel <r.apel at r-apel.de> 0:5.1-2jpp
+- Build with ant-1.6.2
 
 * Sun May 11 2003 David Walluck <david at anti-microsoft.org> 0:5.1-1jpp
 - 5.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 03:28:53 -0000	1.5
+++ sources	23 Jul 2006 21:52:46 -0000	1.6
@@ -1 +1,2 @@
-c9ebfa7373eb4416e590205fd0005039  bcel-5.1-src.tar.gz
+67e0be2f572e10516061b6903a713ed9  bcel-5.1-src-RHCLEAN.tar.gz
+2c511b30e00109b501c6f3bd757a1ce1  jakarta-site2.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jul 23 21:53:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 17:53:08 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.49,1.50
Message-ID: <200607232153.k6NLr8NE002605@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2547

Modified Files:
	mx4j.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_4fc
- Bump release number. (dist-fc6-java)




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mx4j.spec	22 Jul 2006 08:44:54 -0000	1.49
+++ mx4j.spec	23 Jul 2006 21:53:06 -0000	1.50
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_3fc
+Release:        4jpp_4fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -261,6 +261,9 @@
 %doc dist/docs/*
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_4fc
+- Bump release number. (dist-fc6-java)
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:3.0.1-4jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 22:03:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 18:03:25 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.304,1.305
Message-ID: <200607232203.k6NM3PNO005585@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5560

Modified Files:
	eclipse.spec 
Log Message:
bump release number for rebuild


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- eclipse.spec	23 Jul 2006 17:09:54 -0000	1.304
+++ eclipse.spec	23 Jul 2006 22:03:21 -0000	1.305
@@ -41,7 +41,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/
@@ -1634,7 +1634,10 @@
 %endif
 
 %changelog
-* Sun Jul 23 2006 Andrew Overholt <bkonrath at redhat.com> 3.2.0-1jpp_7fc
+* Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_8fc
+- Rebuild.
+
+* Sun Jul 23 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_7fc
 - Remove org.eclipse.ant.ui* from %%files.
 
 * Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_7fc



From fedora-cvs-commits at redhat.com  Sun Jul 23 22:05:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 18:05:11 -0400
Subject: rpms/bcel/devel bcel.spec,1.18,1.19
Message-ID: <200607232205.k6NM5BvC005920@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5830

Modified Files:
	bcel.spec 
Log Message:
rebuild



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bcel.spec	23 Jul 2006 21:52:46 -0000	1.18
+++ bcel.spec	23 Jul 2006 22:05:08 -0000	1.19
@@ -77,6 +77,7 @@
 BuildRequires:  regexp
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  werken.xpath
+BuildRequires:  ant-apache-regexp
 %if ! %{gcj_support}
 BuildArch:      noarch
 %endif



From fedora-cvs-commits at redhat.com  Sun Jul 23 22:28:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 18:28:40 -0400
Subject: rpms/bcel/devel bcel.spec,1.19,1.20
Message-ID: <200607232228.k6NMSeOv002080@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2067

Modified Files:
	bcel.spec 
Log Message:
Remove ant debug option



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bcel.spec	23 Jul 2006 22:05:08 -0000	1.19
+++ bcel.spec	23 Jul 2006 22:28:38 -0000	1.20
@@ -45,7 +45,7 @@
 
 Name:           bcel
 Version:        5.1
-Release:        7jpp_1fc
+Release:        7jpp_2fc
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
@@ -187,7 +187,7 @@
         -Dmaven.home.local=${MAVEN_HOME_LOCAL} \
         jar:jar javadoc:generate xdoc:transform
 %else
-ant 	-d -Dbuild.dest=build/classes -Dbuild.dir=build \
+ant 	-Dbuild.dest=build/classes -Dbuild.dir=build \
 	-Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
 	compile jar apidocs xdocs
 %endif
@@ -277,12 +277,15 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_2fc
+- rebuild
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_1fc
 - Merged with upstream version
 - set to build with Ant instead of Maven
 
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp
-- Add missing werken.xpath to the build requires
+- Add missing BR werken.xpath and ant-apache-regexp
 - Added conditional native compilation
 - Changed spec file encoding from ISO-8859-1 to UTF-8 
 



From fedora-cvs-commits at redhat.com  Sun Jul 23 23:18:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 19:18:38 -0400
Subject: rpms/jgroups/devel jgroups-2.2.9-build_xml.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 jgroups.spec, 1.11, 1.12 sources, 1.3, 1.4
Message-ID: <200607232318.k6NNIcBX021818@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21732

Modified Files:
	.cvsignore jgroups.spec sources 
Added Files:
	jgroups-2.2.9-build_xml.patch 
Log Message:
- Merge with latest version from JPP.
- Remove jars from the source tarball.
- Remove tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
  temporarily since it needs BouncyCastle.



jgroups-2.2.9-build_xml.patch:
 build.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE jgroups-2.2.9-build_xml.patch ---
--- build.xml.sav	2006-05-16 14:02:20.000000000 +0200
+++ build.xml	2006-05-31 16:07:18.000000000 +0200
@@ -225,6 +225,7 @@
         depends="prepare"
         description="Create Javadoc documentation in the ./dist/javadoc directory">
         <javadoc packagenames="${javadoc.packages}"
+            source="1.4"
             sourcepath="${src.dir}"
             destdir="${javadoc.dir}"
             classpathref="jg.classpath"
@@ -339,6 +340,7 @@
         description="Runs all unit tests in tests/junit and prints results to stdout">
         <junit printsummary="yes" timeout="${unittest.timeout.low}" fork="yes">
             <classpath refid="jg.classpath"/>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <formatter type="brief" usefile="false"/>
             <batchtest todir="${tmp.dir}">
                 <fileset dir="${junit.dir}"
@@ -354,7 +356,8 @@
         <mkdir dir="${tmp.dir}/tests-results"/>
         <junit printsummary="yes" timeout="${unittest.timeout.low}" fork="yes">
             <jvmarg value="-Dtests.tmp.dir=${tmp.dir}"/>
-            <jvmarg value="-Dlog4j.configuration=file:c:\log4j.properties"/>
+            <jvmarg value="-Dlog4j.configuration=file:${conf.dir}/log4j.properties"/>
+            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
             <classpath refid="jg.classpath"/>
             <formatter type="xml" usefile="true"/>
             <batchtest todir="${tmp.dir}/tests-results">


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Jun 2005 17:28:16 -0000	1.4
+++ .cvsignore	23 Jul 2006 23:18:36 -0000	1.5
@@ -1,4 +1 @@
-JGroups-2.2.6.src-RHCLEAN.tar.bz2
-JGroups-2.2.6.src
-noarch
-*.src.rpm
+JGroups-2.2.9.2.src-RHCLEAN.tar.gz


Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jgroups.spec	22 Jul 2006 08:43:46 -0000	1.11
+++ jgroups.spec	23 Jul 2006 23:18:36 -0000	1.12
@@ -1,32 +1,90 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+# If you don't want to run the unit tests
+# give rpmbuild option '--without tests'
+
+%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
+%define without_tests %{?_without_tests:1}%{!?_without_tests:0}
+
+
 %define section	free
 
 Name:		jgroups
-Version:	2.2.6
-Release: 	1jpp_7fc
+Version:	2.2.9.2
+Release:	2jpp_1fc
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
 URL:		http://www.jgroups.org/
 Group:		Development/LIbraries/Java
-Source0:	JGroups-2.2.6.src-RHCLEAN.tar.bz2
+Source0:	JGroups-2.2.9.2.src-RHCLEAN.tar.gz
+Patch0:		jgroups-2.2.9-build_xml.patch
 Requires:	bsh
 Requires:	concurrent
 Requires:	jakarta-commons-logging
 Requires:	jaxp_parser_impl
 Requires:	jms
 Requires:	log4j
+Requires:	mx4j
+Requires:	xalan-j2
+#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
+#Requires:	bouncycastle
 BuildRequires:	ant >= 0:1.6
 BuildRequires:	bsh
 BuildRequires:	concurrent
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jms
-BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	junit
 BuildRequires:	log4j
+BuildRequires:	mx4j
+BuildRequires:	xalan-j2
+#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
+#BuildRequires:	bouncycastle
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 JGroups is a toolkit for reliable multicast communication. (Note that
 this doesn't necessarily mean IP Multicast, JGroups can also use
@@ -44,27 +102,49 @@
 %package	javadoc
 Summary:	Javadoc for %{name}
 Group:		Development/Documentation
-Prereq: coreutils
 
 %description	javadoc
-Javadoc for %{name}.
+%{summary}.
+
+%package	manual
+Summary:	Documents for %{name}
+Group:		Development/Documentation
+
+%description	manual
+%{summary}.
 
 %prep
-%setup -q -n JGroups-2.2.6.src
-find . -name "*.jar" -exec rm -f {} \;
+%setup -q -n JGroups-2.2.9.2.src
+for j in $(find . -name "*.jar"); do
+    mv $j $j.no
+done
+
+# this test requires bouncycastle
+#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
+rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
+
+%patch0 -b .sav
 
 %build
-export OPT_JAR_LIST=""
-export CLASSPATH=$(build-classpath \
-bsh \
-concurrent \
-commons-logging \
-jaxp_parser_impl \
-jms \
-junit \
-log4j \
-ant ant-launcher)
-ant jar javadoc
+export OPT_JAR_LIST="ant-launcher ant/ant-junit junit"
+pushd lib
+ln -sf $(build-classpath bsh) .
+ln -sf $(build-classpath commons-logging) .
+ln -sf $(build-classpath concurrent) .
+ln -sf $(build-classpath jms) .
+ln -sf $(build-classpath junit) .
+ln -sf $(build-classpath log4j) .
+ln -sf $(build-classpath mx4j/mx4j-jmx) .
+popd
+#FIXME: Dont we ship bouncycastle with gcj-compat anyway?
+#ln -sf $(build-classpath build-classpath gcj-endorsed/bcprov) .
+%if %{without_tests}
+ant jar javadoc jboss-service jgroups-service
+%else
+export ANT_OPTS="-Djava.net.preferIPv4Stack=true"
+export CLASSPATH=$CLASSPATH:`build-classpath xalan-j2 xalan-j2-serializer`
+ant jar javadoc jboss-service jgroups-service unittests testreport
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,7 +152,9 @@
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{name}-all.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/%{name}-core.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
 ln -sf ${jar} ${jar/-%{version}/}; done)
 
@@ -81,6 +163,19 @@
 cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 (cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
 
+# services
+install -p -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+install -m 644 dist/%{name}*.sar \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+
+# docs
+install -p -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -93,17 +188,50 @@
   rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*
+%{_datadir}/%{name}-%{version}
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jgroups-2.2.9.2.jar.*
+#This is generated by spec-convert-gcj-* but this is a subset...
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/jgroups-core-2.2.9.2.jar.*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%doc %{_javadocdir}/%{name}-%{version}/*
 %ghost %dir %{_javadocdir}/%{name}
 
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}
+
 %changelog
+* Sun Jul 23 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_1fc
+- Merge with latest version from JPP.
+- Remove jars from the source tarball.
+- Remove tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
+  temporarily since it needs BouncyCastle.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.2.6-1jpp_7fc
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jun 2005 17:28:16 -0000	1.3
+++ sources	23 Jul 2006 23:18:36 -0000	1.4
@@ -1 +1 @@
-07b0e18d3f35016a52842f48fbbb04ea  JGroups-2.2.6.src-RHCLEAN.tar.bz2
+9c021f2a090a9e6045a205186abd6935  JGroups-2.2.9.2.src-RHCLEAN.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 00:14:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 20:14:24 -0400
Subject: rpms/fedora-release/devel fedora-release.spec,1.36,1.37
Message-ID: <200607240014.k6O0EOCc021503@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21435

Modified Files:
	fedora-release.spec 
Log Message:
- Bump for FC6 Test2
- Remove release-notes content, now standalone package
- Cleanups




Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fedora-release.spec	19 Jun 2006 20:58:55 -0000	1.36
+++ fedora-release.spec	24 Jul 2006 00:14:21 -0000	1.37
@@ -1,50 +1,32 @@
-%define release_version 5.90
-%define release_name Test
-%define builtin_release_version Rawhide
-%define builtin_release_name Rawhide
-%define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}}
-%define real_release_name %{?release_name}%{!?release_name:%{builtin_release_name}}
-Summary: Fedora Core release file
-Name: fedora-release
-Version: %{real_release_version}
-Release: 3
-License: GFDL
-Group: System Environment/Base
-Source: fedora-release-%{real_release_version}.tar.gz
-Source1: fedora-release-notes-%{real_release_version}.tar.gz
-Obsoletes: rawhide-release
-Obsoletes: redhat-release
-Obsoletes: indexhtml
-Provides: redhat-release
-Provides: indexhtml
-BuildRoot: %{_tmppath}/fedora-release-root
-BuildArchitectures: noarch
-BuildRequires: xmlto
-BuildRequires: desktop-file-utils
+%define release_name FC6 Test2
+%define release_version 5.91
+
+Summary:	Fedora Core release files
+Name:		fedora-release
+Version:	5.91
+Release:	3
+License:	GFDL
+Group:		System Environment/Base
+URL:		http://fedoraproject.org
+Source:		fedora-release-%{version}.tar.gz
+Obsoletes:	rawhide-release
+Obsoletes:	redhat-release
+Provides:	redhat-release
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
 
 %description
-Fedora Core release file
+Fedora Core release files
 
 %prep
-%setup -q -n fedora-release-%{version} -a 1
+%setup -q -n fedora-release-%{version}
 
 %build
-MAINDIR=`pwd`
-pushd release-notes
-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 figs stylesheet-images ../
-cp -r about ../
-popd
-rm -f */*.eps
-make index.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
-echo "Fedora Core release %{real_release_version} (%{real_release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
+echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
 cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue
 cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
@@ -59,48 +41,14 @@
 	install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 done
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
-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
-
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
-# about fedora stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release
-install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications 
-install -m 644 release-notes/about-fedora.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# If this is the first time a package containing /etc/issue
-# is installed, we want the new files there. Otherwise, we
-# want %config(noreplace) to take precedence.
-%triggerpostun  -- redhat-release < 7.1.93-1
-if [ -f /etc/issue.rpmnew ] ; then
-   mv -f /etc/issue /etc/issue.rpmsave
-   mv -f /etc/issue.rpmnew /etc/issue
-fi
-if [ -f /etc/issue.net.rpmnew ] ; then
-   mv -f /etc/issue.net /etc/issue.net.rpmsave
-   mv -f /etc/issue.net.rpmnew /etc/issue.net
-fi
-
-%post
-[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update
-[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database
-exit 0
-
-%postun
-[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update
-[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database
-exit 0
-
 %files
 %defattr(-,root,root)
 %attr(0644,root,root) /etc/fedora-release
@@ -108,18 +56,19 @@
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/*
 %doc eula.txt GPL 
-%doc about
 %config %attr(0644,root,root) /etc/issue
 %config %attr(0644,root,root) /etc/issue.net
 /usr/share/firstboot/modules/eula.py*
 /usr/share/eula/eula.en_US
-%{_defaultdocdir}/HTML
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
-%{_datadir}/omf/fedora-release
-%{_datadir}/applications/*.desktop
 
 %changelog
+* Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-1
+- Bump for FC6 Test2
+- Remove release-notes content, now standalone package
+- Cleanups
+
 * Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-3
 - Cleanups
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 00:18:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 20:18:10 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.12,1.13
Message-ID: <200607240018.k6O0IACN005205@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5118

Modified Files:
	jgroups.spec 
Log Message:
- Add ant-junit as a build requires.




Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jgroups.spec	23 Jul 2006 23:18:36 -0000	1.12
+++ jgroups.spec	24 Jul 2006 00:18:08 -0000	1.13
@@ -69,6 +69,7 @@
 BuildRequires:	jms
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	junit
+BuildRequires:	ant-junit
 BuildRequires:	log4j
 BuildRequires:	mx4j
 BuildRequires:	xalan-j2
@@ -229,6 +230,7 @@
 * Sun Jul 23 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_1fc
 - Merge with latest version from JPP.
 - Remove jars from the source tarball.
+- Add ant-junit as a build requires.
 - Remove tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java
   temporarily since it needs BouncyCastle.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 00:20:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 20:20:59 -0400
Subject: rpms/fedora-release/devel fedora-release.spec, 1.37, 1.38 sources,
	1.28, 1.29
Message-ID: <200607240020.k6O0KxVA006322@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6206

Modified Files:
	fedora-release.spec sources 
Log Message:
New tarball
fixes in the spec



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fedora-release.spec	24 Jul 2006 00:14:21 -0000	1.37
+++ fedora-release.spec	24 Jul 2006 00:20:56 -0000	1.38
@@ -4,14 +4,14 @@
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	5.91
-Release:	3
+Release:	4
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
 Source:		fedora-release-%{version}.tar.gz
-Obsoletes:	rawhide-release
 Obsoletes:	redhat-release
 Provides:	redhat-release
+Requires:	fedora-release-notes = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -56,17 +56,19 @@
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/*
 %doc eula.txt GPL 
-%config %attr(0644,root,root) /etc/issue
-%config %attr(0644,root,root) /etc/issue.net
+%config(noreplace) %attr(0644,root,root) /etc/issue
+%config(noreplace) %attr(0644,root,root) /etc/issue.net
 /usr/share/firstboot/modules/eula.py*
 /usr/share/eula/eula.en_US
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-1
+* Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-4
 - Bump for FC6 Test2
 - Remove release-notes content, now standalone package
+- Don't replace issue and issue.net if the end user has modified it
+- Require fedora-release-notes
 - Cleanups
 
 * Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Jun 2006 20:58:55 -0000	1.28
+++ sources	24 Jul 2006 00:20:56 -0000	1.29
@@ -1,2 +1,3 @@
 b688647c2945d4982b16e404aa6a3fff  fedora-release-5.90.tar.gz
 5cbca2b54653efee1d014e572b133e1f  fedora-release-notes-5.90.tar.gz
+9b2fce1a73195895df5220588d237c73  fedora-release-5.91.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 00:43:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 20:43:32 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2437,
	1.2438 linux-2.6-xen-compile-fixes.patch, 1.12,
	1.13 linux-2.6-xen.patch, 1.34,
	1.35 linux-2.6-xen-no-tls-warn.patch, 1.1, NONE
Message-ID: <200607240043.k6O0hWA5013235@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13103

Modified Files:
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen.patch 
Removed Files:
	linux-2.6-xen-no-tls-warn.patch 
Log Message:
new xen patch, fixen gso, xenoprof, vDSO


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2437
retrieving revision 1.2438
diff -u -r1.2437 -r1.2438
--- kernel-2.6.spec	22 Jul 2006 19:28:43 -0000	1.2437
+++ kernel-2.6.spec	24 Jul 2006 00:43:28 -0000	1.2438
@@ -320,7 +320,6 @@
 # 950 - 999 Xen
 Patch950: linux-2.6-xen.patch
 Patch951: linux-2.6-xen-compile-fixes.patch
-Patch952: linux-2.6-xen-no-tls-warn.patch
 Patch955: linux-2.6-xen_remap_vma_flags.patch
 Patch960: linux-2.6-execshield-xen.patch
 Patch961: linux-2.6-xen-vdso-note.patch
@@ -814,7 +813,6 @@
 find -name "*.p.xen" | xargs rm -f
 
 %patch951 -p1
-%patch952 -p1
 %patch955 -p1
 
 # Xen exec-shield bits
@@ -1631,6 +1629,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Juan Quintela <quintela at redhat.com>
+- New xen patch, fixes gso, xenoprof, vDSO.
+
 * Sat Jul 22 2006 Dave Jones <davej at redhat.com>
 - Enable connector proc events.
 - Enable PPC64 memory hotplug.

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 +-
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 +
 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c            |    6 ----
 linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c                  |    2 -
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h        |   14 +++++++++++
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h     |    1 
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h   |    7 ++++-
 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h     |    1 
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h   |    7 +++++
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h   |    2 -
 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h |    2 +
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 +
 linux-2.6.17.noarch/arch/i386/kernel/Makefile                |    3 --
 linux-2.6.17.noarch/arch/i386/kernel/time-xen.c              |    2 +
 linux-2.6.17.noarch/arch/i386/kernel/tsc.c                   |    2 +
 16 files changed, 45 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-xen-compile-fixes.patch	19 Jul 2006 20:15:48 -0000	1.12
+++ linux-2.6-xen-compile-fixes.patch	24 Jul 2006 00:43:28 -0000	1.13
@@ -245,136 +245,3 @@
  
  static unsigned long calculate_cpu_khz(void)
  {
-diff -r 9ffbaea14aad arch/i386/kernel/asm-offsets.c
---- a/arch/i386/kernel/asm-offsets.c	Wed Jul 19 15:55:00 2006 +0200
-+++ b/arch/i386/kernel/asm-offsets.c	Fri Jul 21 06:34:30 2006 -0400
-@@ -55,7 +55,9 @@ void foo(void)
- 	OFFSET(TI_preempt_count, thread_info, preempt_count);
- 	OFFSET(TI_addr_limit, thread_info, addr_limit);
- 	OFFSET(TI_restart_block, thread_info, restart_block);
-+#ifndef CONFIG_XEN
- 	OFFSET(TI_sysenter_return, thread_info, sysenter_return);
-+#endif
- 	BLANK();
- 
- 	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
-diff -r 9ffbaea14aad arch/i386/kernel/entry-xen.S
---- a/arch/i386/kernel/entry-xen.S	Wed Jul 19 15:55:00 2006 +0200
-+++ b/arch/i386/kernel/entry-xen.S	Fri Jul 21 06:34:30 2006 -0400
-@@ -313,12 +313,16 @@ sysenter_past_esp:
- 	pushl $(__USER_CS)
- 	CFI_ADJUST_CFA_OFFSET 4
- 	/*CFI_REL_OFFSET cs, 0*/
-+#ifndef CONFIG_XEN
- 	/*
- 	 * 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)
-+#else
-+	pushl $SYSENTER_RETURN
-+#endif
- 	CFI_ADJUST_CFA_OFFSET 4
- 	CFI_REL_OFFSET eip, 0
- 
-diff -r 9ffbaea14aad arch/i386/kernel/entry.S
---- a/arch/i386/kernel/entry.S	Wed Jul 19 15:55:00 2006 +0200
-+++ b/arch/i386/kernel/entry.S	Fri Jul 21 06:34:30 2006 -0400
-@@ -288,7 +288,11 @@ sysenter_past_esp:
- 	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
- 	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
- 	 */
-+#ifndef CONFIG_XEN
- 	pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
-+#else
-+	pusl $SYSENTER_RETURN
-+#endif
- 	CFI_ADJUST_CFA_OFFSET 4
- 	CFI_REL_OFFSET eip, 0
- 
-diff -r 9ffbaea14aad arch/i386/kernel/sysenter.c
---- a/arch/i386/kernel/sysenter.c	Wed Jul 19 15:55:00 2006 +0200
-+++ b/arch/i386/kernel/sysenter.c	Fri Jul 21 06:34:30 2006 -0400
-@@ -90,6 +90,7 @@ int __init sysenter_setup(void)
- 	}
- #endif
- 
-+#ifndef CONFIG_XEN
- #ifdef CONFIG_COMPAT_VDSO
- 	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_READONLY);
- 	printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
-@@ -99,6 +100,7 @@ int __init sysenter_setup(void)
- 	 */
- 	__set_fixmap(FIX_VDSO, __pa(syscall_page), PAGE_KERNEL_RO);
- #endif
-+#endif
- 
- 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
- 		memcpy(syscall_page,
-@@ -144,7 +146,11 @@ int arch_setup_additional_pages(struct l
- 	int ret;
- 
- 	down_write(&mm->mmap_sem);
-+#ifndef CONFIG_XEN
- 	addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
-+#else
-+	addr = VDSO_BASE;
-+#endif
- 	if (IS_ERR_VALUE(addr)) {
- 		ret = addr;
- 		goto up_fail;
-diff -r 9ffbaea14aad include/asm-i386/elf.h
---- a/include/asm-i386/elf.h	Wed Jul 19 15:55:00 2006 +0200
-+++ b/include/asm-i386/elf.h	Fri Jul 21 06:34:30 2006 -0400
-@@ -130,15 +130,24 @@ extern int dump_task_extended_fpu (struc
- #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
- #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
- 
-+#ifndef CONFIG_XEN
- #define VDSO_HIGH_BASE		(__fix_to_virt(FIX_VDSO))
- #define VDSO_BASE		((unsigned long)current->mm->context.vdso)
-+#else
-+#define VDSO_HIGH_BASE		VDSO_BASE
-+#define VDSO_BASE		(PAGE_OFFSET - 2*PAGE_SIZE)
-+#endif
- 
- #ifdef CONFIG_COMPAT_VDSO
- # define VDSO_COMPAT_BASE	VDSO_HIGH_BASE
- # define VDSO_PRELINK		VDSO_HIGH_BASE
- #else
- # define VDSO_COMPAT_BASE	VDSO_BASE
-+#ifndef CONFIG_XEN
- # define VDSO_PRELINK		0
-+#else
-+# define VDSO_PRELINK		VDSO_BASE
-+#endif
- #endif
- 
- #define VDSO_COMPAT_SYM(x) \
-diff -r 9ffbaea14aad include/asm-i386/fixmap.h
---- a/include/asm-i386/fixmap.h	Wed Jul 19 15:55:00 2006 +0200
-+++ b/include/asm-i386/fixmap.h	Fri Jul 21 06:34:30 2006 -0400
-@@ -51,7 +51,9 @@ extern unsigned long __FIXADDR_TOP;
-  */
- enum fixed_addresses {
- 	FIX_HOLE,
-+#ifndef CONFIG_XEN
- 	FIX_VDSO,
-+#endif
- #ifdef CONFIG_X86_LOCAL_APIC
- 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
- #endif
-diff -r 9ffbaea14aad include/asm-i386/mach-xen/asm/fixmap.h
---- a/include/asm-i386/mach-xen/asm/fixmap.h	Wed Jul 19 15:55:00 2006 +0200
-+++ b/include/asm-i386/mach-xen/asm/fixmap.h	Fri Jul 21 06:34:30 2006 -0400
-@@ -52,7 +52,9 @@ extern unsigned long __FIXADDR_TOP;
-  */
- enum fixed_addresses {
- 	FIX_HOLE,
-+#ifndef CONFIG_XEN
- 	FIX_VDSO,
-+#endif
- #ifdef CONFIG_X86_LOCAL_APIC
- 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
- #endif

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   13 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85145 insertions(+), 873 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.34 -r 1.35 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- linux-2.6-xen.patch	19 Jul 2006 17:25:02 -0000	1.34
+++ linux-2.6-xen.patch	24 Jul 2006 00:43:29 -0000	1.35
@@ -1,6 +1,6 @@
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
---- ../upstream/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/boot-xen/Makefile	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
+--- linux-2.6.18-rc2/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	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 --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
---- ../upstream/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig	2006-07-18 23:33:32.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
+--- linux-2.6.18-rc2/arch/i386/Kconfig	2006-07-23 11:24:31.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-22 20:37:34.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -303,9 +303,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
---- ../upstream/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.cpu	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
+--- linux-2.6.18-rc2/arch/i386/Kconfig.cpu	2006-07-23 11:24:31.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -322,9 +322,9 @@
 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
  	default y
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
---- ../upstream/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.debug	2006-07-18 21:37:02.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
+--- linux-2.6.18-rc2/arch/i386/Kconfig.debug	2006-07-23 11:24:31.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-22 20:37:34.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -341,9 +341,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
---- ../upstream/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6.18-rc2/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1513,9 +1513,9 @@
 +
 +	return 0;
 +}
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
---- ../upstream/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/acpi/Makefile	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
+--- linux-2.6.18-rc2/arch/i386/kernel/acpi/Makefile	2006-07-23 11:24:31.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1524,9 +1524,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/alternative.c compiling/arch/i386/kernel/alternative.c
---- ../upstream/linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/alternative.c	2006-07-18 23:20:08.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
+--- linux-2.6.18-rc2/arch/i386/kernel/alternative.c	2006-07-23 11:24:32.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-07-22 20:37:34.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1539,9 +1539,9 @@
  static int smp_alt_once      = 0;
  static int debug_alternative = 0;
  
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
---- ../upstream/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/apic-xen.c	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
+--- linux-2.6.18-rc2/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1703,9 +1703,9 @@
 +
 +	return 0;
 +}
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
---- ../upstream/linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/asm-offsets.c	2006-07-19 13:35:45.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
+--- linux-2.6.18-rc2/arch/i386/kernel/asm-offsets.c	2006-07-23 11:24:32.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-22 21:45:45.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1722,9 +1722,9 @@
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/cpu/common-xen.c compiling/arch/i386/kernel/cpu/common-xen.c
---- ../upstream/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/common-xen.c	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6.18-rc2/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2466,9 +2466,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/cpu/Makefile compiling/arch/i386/kernel/cpu/Makefile
---- ../upstream/linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/Makefile	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
+--- linux-2.6.18-rc2/arch/i386/kernel/cpu/Makefile	2006-07-23 11:24:32.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2478,9 +2478,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c compiling/arch/i386/kernel/cpu/mtrr/main-xen.c
---- ../upstream/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6.18-rc2/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2679,9 +2679,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile compiling/arch/i386/kernel/cpu/mtrr/Makefile
---- ../upstream/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6.18-rc2/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-23 11:24:32.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2693,15 +2693,15 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/early_printk-xen.c compiling/arch/i386/kernel/early_printk-xen.c
---- ../upstream/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/early_printk-xen.c	2006-07-18 19:30:35.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6.18-rc2/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/arch/i386/kernel/entry.S compiling/arch/i386/kernel/entry.S
---- ../upstream/linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/entry.S	2006-07-19 13:35:45.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
+--- linux-2.6.18-rc2/arch/i386/kernel/entry.S	2006-07-23 11:24:32.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-07-22 21:45:45.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2729,9 +2729,9 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
[...4963 lines suppressed...]
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -89171,9 +89215,9 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/mm/highmem.c compiling/mm/highmem.c
---- ../upstream/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/highmem.c	2006-07-18 19:31:26.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
+--- linux-2.6.18-rc2/mm/highmem.c	2006-07-23 11:26:10.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -89192,9 +89236,9 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/mm/Kconfig compiling/mm/Kconfig
---- ../upstream/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/Kconfig	2006-07-18 19:31:26.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
+--- linux-2.6.18-rc2/mm/Kconfig	2006-07-23 11:26:10.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -89210,9 +89254,9 @@
  	default "4"
  
  #
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/mm/memory.c compiling/mm/memory.c
---- ../upstream/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/mm/memory.c	2006-07-19 01:12:57.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
+--- linux-2.6.18-rc2/mm/memory.c	2006-07-23 11:26:10.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -89353,9 +89397,9 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/mm/mmap.c compiling/mm/mmap.c
---- ../upstream/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/mmap.c	2006-07-18 19:31:26.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
+--- linux-2.6.18-rc2/mm/mmap.c	2006-07-23 11:26:11.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -89367,9 +89411,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
---- ../upstream/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/page_alloc.c	2006-07-18 19:31:26.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
+--- linux-2.6.18-rc2/mm/page_alloc.c	2006-07-23 11:26:11.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -89390,9 +89434,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/core/dev.c compiling/net/core/dev.c
---- ../upstream/linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/dev.c	2006-07-19 01:12:57.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
+--- linux-2.6.18-rc2/net/core/dev.c	2006-07-23 11:26:12.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -89450,19 +89494,19 @@
  /**
   *	dev_queue_xmit - transmit a buffer
   *	@skb: buffer to transmit
-@@ -1442,6 +1485,12 @@ int dev_queue_xmit(struct sk_buff *skb)
- 	    __skb_linearize(skb))
- 		goto out_kfree_skb;
+@@ -1424,6 +1467,12 @@ int dev_queue_xmit(struct sk_buff *skb)
+ 	struct Qdisc *q;
+ 	int rc = -ENOMEM;
  
 + 	/* If a checksum-deferred packet is forwarded to a device that needs a
 + 	 * checksum, correct the pointers and force checksumming.
 + 	 */
-+ 	if(skb_checksum_setup(skb))
++ 	if (skb_checksum_setup(skb))
 + 		goto out_kfree_skb;
-+  
- 	/* If packet is not checksummed and device does not support
- 	 * checksumming for this protocol, complete checksumming here.
- 	 */
++
+ 	/* GSO will handle the following emulations directly. */
+ 	if (netif_needs_gso(dev, skb))
+ 		goto gso;
 @@ -1813,6 +1862,19 @@ int netif_receive_skb(struct sk_buff *sk
  	}
  #endif
@@ -89491,9 +89535,9 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
---- ../upstream/linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/pktgen.c	2006-07-19 12:56:21.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
+--- linux-2.6.18-rc2/net/core/pktgen.c	2006-07-23 11:26:13.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -89503,9 +89547,9 @@
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
---- ../upstream/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/net/core/skbuff.c	2006-07-19 01:12:57.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
+--- linux-2.6.18-rc2/net/core/skbuff.c	2006-07-23 11:26:13.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -89592,9 +89636,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 19:31:28.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 11:26:14.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -89609,9 +89653,9 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../upstream/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-19 12:54:55.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 11:26:14.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -89626,9 +89670,9 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
---- ../upstream/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/xfrm4_output.c	2006-07-19 01:12:57.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
+--- linux-2.6.18-rc2/net/ipv4/xfrm4_output.c	2006-07-23 11:26:14.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -89649,9 +89693,9 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
---- ../upstream/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ compiling/net/ipv6/addrconf.c	2006-07-19 01:12:57.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
+--- linux-2.6.18-rc2/net/ipv6/addrconf.c	2006-07-23 11:26:15.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -89668,9 +89712,9 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff --exclude=.hg -uNrp ../upstream/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
---- ../upstream/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/scripts/Makefile.xen	2006-07-18 19:31:30.000000000 +0200
+diff --exclude='.hg*' -urNp linux-2.6.18-rc2/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
+--- linux-2.6.18-rc2/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)


--- linux-2.6-xen-no-tls-warn.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 00:50:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 20:50:54 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-wait-for-card.patch, NONE,
	1.1 pam_pkcs11.spec, 1.6, 1.7
Message-ID: <200607240050.k6O0os1l007487@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7469

Modified Files:
	pam_pkcs11.spec 
Added Files:
	pam_pkcs11-0.5.3-wait-for-card.patch 
Log Message:
- add new wait_for_card option that stalls auth process
  until a card is inserted
- if the user is reauthenticating (already logged in, but
  say unlocking the screen) then only treat the token the
  user logged in with as a valid authentication token
- clean up "smart card" word.  Before we had a mix of 
  "smartcard", "Smart Card", "SmartCard", and "smart card" 
  i think.
- only say "Please insert your smart card." instead of
  "Please insert your Smart Card or enter username" if 
  username based login isn't allowed.


pam_pkcs11-0.5.3-wait-for-card.patch:
 common/pkcs11.c         |   71 +++++++++++++++++++++++++++++++++++++++++++++++-
 common/smartcard.h      |    7 ++++
 pam_pkcs11/pam_config.c |   12 ++++++++
 pam_pkcs11/pam_config.h |    1 
 pam_pkcs11/pam_pkcs11.c |   66 +++++++++++++++++++++++++++++---------------
 5 files changed, 134 insertions(+), 23 deletions(-)

--- NEW FILE pam_pkcs11-0.5.3-wait-for-card.patch ---
--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c.wait-for-card	2006-07-23 16:44:36.000000000 -0400
+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c	2006-07-23 18:05:17.000000000 -0400
@@ -40,6 +40,7 @@
         0,				/* int use_first_pass; */
         0,				/* int use_authok; */
         0,				/* int card_only; */
+        0,				/* int wait_for_card; */
         "default", 			/* const char *pkcs11_module; */
         "/etc/pam_pkcs11/pkcs11_module.so", /* const char *pkcs11_module_path; */
         0,				/* int slot_num; */
@@ -57,6 +58,7 @@
         DBG1("use_first_pass %d", configuration.use_first_pass);
         DBG1("use_authok %d", configuration.use_authok);
         DBG1("card_only %d", configuration.card_only);
+        DBG1("wait_for_card %d", configuration.card_only);
         DBG1("pkcs11_module %s",configuration.pkcs11_module);
         DBG1("slot_num %d",configuration.slot_num);
         DBG1("ca_dir %s",configuration.ca_dir);
@@ -104,6 +106,8 @@
 	    scconf_get_bool(root,"use_authok",configuration.use_authok);
 	configuration.card_only = 
 	    scconf_get_bool(root,"card_only",configuration.card_only);
+	configuration.wait_for_card = 
+	    scconf_get_bool(root,"wait_for_card",configuration.wait_for_card);
 	configuration.pkcs11_module = ( char * )
 	    scconf_get_str(root,"use_pkcs11_module",configuration.pkcs11_module);
 	/* search pkcs11 module options */
@@ -181,6 +185,14 @@
       		configuration.use_first_pass = 1;
 		continue;
 	   }
+    	   if (strcmp("wait_for_card", argv[i]) == 0) {
+      		configuration.wait_for_card = 1;
+		continue;
+	   }
+    	   if (strcmp("dont_wait_for_card", argv[i]) == 0) {
+      		configuration.wait_for_card = 0;
+		continue;
+	   }
     	   if (strcmp("debug", argv[i]) == 0) {
       		configuration.debug = 1;
 		set_debug_level(1);
--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c.wait-for-card	2006-07-23 16:44:36.000000000 -0400
+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c	2006-07-23 18:31:51.000000000 -0400
@@ -26,6 +26,7 @@
 #endif
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
+#include <security/pam_ext.h>
 #include <syslog.h>
 #include <ctype.h>
 #include <string.h>
@@ -110,7 +113,6 @@
   return PAM_CRED_INSUFFICIENT;
 }
 
-static const char *bad_user = "bad_user";
 PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
 {
   int i, rv;
@@ -130,6 +132,7 @@
   unsigned char *signature;
   unsigned long signature_length;
   char token_name_env[64] = "";
+  const char *login_token_name = NULL;
 
   /* first of all check whether debugging should be enabled */
   for (i = 0; i < argc; i++)
@@ -174,6 +177,16 @@
    *  1) always get the userid from the certificate.
    *  2) don't prompt for the user name if the card is present.
    *  3) if the token is present, then we must use the cardAuth mechanism.
+   *
+   * wait_for_card means:
+   *  1) nothing if card_only isn't set
+   *  2) if logged in, block in pam conversation until the token used for login
+   *     is inserted
+   *  3) if not logged in, block until a token that could be used for logging in 
+   *     is inserted
+   * right now, logged in means PKC11_LOGIN_TOKEN_NAME is set,
+   * but we could something else later (like set some per-user state in
+   * a pam session module keyed off uid)
    */
   if (configuration->card_only) {
 	pkcs11_pam_fail = PAM_CRED_INSUFFICIENT;
@@ -217,25 +227,43 @@
     return PAM_AUTHINFO_UNAVAIL;
   }
 
+  login_token_name = getenv("PKCS11_LOGIN_TOKEN_NAME");
+
   /* open pkcs #11 session */
-  slot_num = find_slot_by_number(ph, configuration->slot_num);
+  slot_num = find_slot_by_number_and_label(ph, configuration->slot_num,
+					   login_token_name);
   if (slot_num < 0) {
-    DBG("no token available");
-    syslog(LOG_ERR, "no token available");
+
+    DBG("no suitable token available");
+    syslog(LOG_ERR, "no suitable token available");
+
     /* prompt for the card or smartCard */
-    if (user || !configuration->card_only) {
+    if ((user && !configuration->wait_for_card) || !configuration->card_only) {
       release_pkcs11_module(ph);
       return PAM_AUTHINFO_UNAVAIL;
     }
     
-    pam_prompt(pamh, PAM_TEXT_INFO, NULL,
-               "Please insert your Smart Card or enter username.");
-    rv = pam_get_user(pamh, &user, NULL);
-    /* check one more time for the smart card... */
-    slot_num = find_slot_by_number(ph, configuration->slot_num);
-    if (slot_num < 0) {
-      release_pkcs11_module(ph);
-      return PAM_AUTHINFO_UNAVAIL;
+    if (configuration->wait_for_card) {
+      pam_prompt(pamh, PAM_TEXT_INFO, NULL,
+                 "Please insert your smart card.");
+      slot_num = wait_for_token(ph, 
+				configuration->slot_num,
+				login_token_name);
+      if (slot_num < 0) {
+        release_pkcs11_module(ph);
+        return PAM_AUTHINFO_UNAVAIL;
+      }
+    } else {
+      pam_prompt(pamh, PAM_TEXT_INFO, NULL,
+                 "Please insert your smart card or enter your username.");
+      rv = pam_get_user(pamh, &user, NULL);
+      /* check one more time for the smart card... */
+      slot_num = find_slot_by_number_and_label(ph, configuration->slot_num,
+					       login_token_name);
+      if (slot_num < 0) {
+        release_pkcs11_module(ph);
+        return PAM_AUTHINFO_UNAVAIL;
+      }
     }
   } else {
     pam_prompt(pamh, PAM_TEXT_INFO, NULL,
@@ -247,7 +275,6 @@
     release_pkcs11_module(ph);
     DBG1("open_pkcs11_session() failed: %s", get_error());
     syslog(LOG_ERR, "open_pkcs11_session() failed: %s", get_error());
-    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
     return pkcs11_pam_fail;
   }
 
@@ -257,14 +284,13 @@
   if (configuration->use_first_pass) {
     rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
   } else if (configuration->try_first_pass) {
-    rv = pam_get_pwd(pamh, &password, "SmartCard Password:", PAM_AUTHTOK, PAM_AUTHTOK);
+    rv = pam_get_pwd(pamh, &password, "Smart Card Password:", PAM_AUTHTOK, PAM_AUTHTOK);
   } else {
-    rv = pam_get_pwd(pamh, &password, "SmartCard Password:", 0, PAM_AUTHTOK);
+    rv = pam_get_pwd(pamh, &password, "Smart Card Password:", 0, PAM_AUTHTOK);
   }
   if (rv != PAM_SUCCESS) {
     release_pkcs11_module(ph);
     syslog(LOG_ERR, "pam_get_pwd() failed: %s", pam_strerror(pamh, rv));
-    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
     return pkcs11_pam_fail;
   }
 #ifndef DEBUG_HIDE_PASSWORD
@@ -277,7 +303,6 @@
     memset(password, 0, strlen(password));
     free(password);
     syslog(LOG_ERR, "password length is zero but the 'nullok' argument was not defined.");
-    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
     return PAM_AUTH_ERR;
   }
 
@@ -289,7 +314,6 @@
     release_pkcs11_module(ph);
     DBG1("open_pkcs11_login() failed: %s", get_error());
     syslog(LOG_ERR, "open_pkcs11_login() failed: %s", get_error());
-    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
     return pkcs11_pam_fail;
   }
 
@@ -300,7 +324,6 @@
     release_pkcs11_module(ph);
     DBG1("get_certificates() failed: %s", get_error());
     syslog(LOG_ERR, "get_certificates failed: %s", get_error());
-    if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
     return pkcs11_pam_fail;
   }
 
@@ -322,7 +345,6 @@
         unload_mappers();
         DBG1("verify_certificate() failed: %s", get_error());
         syslog(LOG_ERR, "verify_certificate() failed: %s", get_error());
-        if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
         return pkcs11_pam_fail;
       } else if (rv != 1) {
         DBG1("verify_certificate() failed: %s", get_error());
@@ -343,7 +365,6 @@
 	  unload_mappers();
           DBG1("find_user() failed: %s", get_error());
           syslog(LOG_ERR,"find_user() failed: %s",get_error());
-          if (set_user) pam_set_item(pamh, PAM_USER,(const void *)bad_user);
           return pkcs11_pam_fail;
 	} else {
           DBG1("certificate is valid and matches user %s",user);
--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h.wait-for-card	2006-07-23 16:44:36.000000000 -0400
+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h	2006-07-23 16:44:36.000000000 -0400
@@ -33,6 +33,7 @@
 	int use_first_pass;
 	int use_authok;
 	int card_only;
+	int wait_for_card;
 	char *pkcs11_module;
 	char *pkcs11_modulepath;
 	int slot_num;
--- pam_pkcs11-0.5.3/src/common/smartcard.h.wait-for-card	2006-07-23 15:32:38.000000000 -0400
+++ pam_pkcs11-0.5.3/src/common/smartcard.h	2006-07-23 18:03:44.000000000 -0400
@@ -33,11 +33,18 @@
 void release_pkcs11_module(pkcs11_handle_t *h);
 
 int find_slot_by_number(pkcs11_handle_t *h, int slot_num);
+int find_slot_by_number_and_label(pkcs11_handle_t *h, 
+				  int slot_num,
+				  const char *slot_label);
 
 int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot);
 
 const char *get_slot_label(pkcs11_handle_t *h);
 
+int wait_for_token(pkcs11_handle_t *h, 
+                   int wanted_slot_num,
+                   const char *wanted_slot_label);
+
 int pkcs11_login(pkcs11_handle_t *h, char *password);
 
 int close_pkcs11_session(pkcs11_handle_t *h);
--- pam_pkcs11-0.5.3/src/common/pkcs11.c.wait-for-card	2006-07-23 15:31:42.000000000 -0400
+++ pam_pkcs11-0.5.3/src/common/pkcs11.c	2006-07-23 18:04:26.000000000 -0400
@@ -29,9 +29,14 @@
 #include "cert_st.h"
 #include "secutil.h"
 #include "cryptohi.h"
+#include "ocsp.h"
 #include <unistd.h>
 #include <errno.h>
 
+#ifndef PAM_PKCS11_POLL_TIME
+#define PAM_PKCS11_POLL_TIME 500 /* ms */
+#endif
+
 struct pkcs11_handle_str {
   SECMODModule *module;
   PRBool	is_user_module;
@@ -242,7 +247,6 @@
     }
 }
 	
-
 int open_pkcs11_session(pkcs11_handle_t *h, unsigned int slot_num)
 {
     SECMODModule *module = h->module;
@@ -284,6 +288,64 @@
     return PK11_GetTokenName(h->slot);
 }
 
+int find_slot_by_number_and_label(pkcs11_handle_t *h, 
+				  int wanted_slot_id,
+				  const char *wanted_slot_label)
+{
+  int slot_num;
+  const char *slot_label;
+
+  slot_num = find_slot_by_number(h, wanted_slot_id);
+  slot_label = PK11_GetTokenName(h->module->slots[slot_num]);
+
+  if ((slot_num >= 0) &&
+      ((wanted_slot_label == NULL) || 
+       ((slot_label != NULL) && 
+	(strcmp (wanted_slot_label, slot_label) == 0))))
+    return slot_num;
+
+  return -1;
+}
+
+int wait_for_token(pkcs11_handle_t *h, 
+                   int wanted_slot_id,
+                   const char *wanted_slot_label)
+{
+  int slot_num;
+
+  if (h->module == NULL)
+    return -1;
+
+  slot_num = -1;
+  do {
+    /* see if the card we're looking for is inserted */
+    slot_num = find_slot_by_number_and_label (h, wanted_slot_id,
+					      wanted_slot_label);
+    if (slot_num < 0) {
+      PK11SlotInfo *slot;
+      PRIntervalTime slot_poll_interval; /* only for legacy hardware */
+
+      /* if the card is not inserted, then block until something happens */
+      slot_poll_interval = PR_MillisecondsToInterval(PAM_PKCS11_POLL_TIME);
+      slot = SECMOD_WaitForAnyTokenEvent(h->module, 0 /* flags */,
+                                         slot_poll_interval);
+
+      /* unexpected error */
+      if (slot == NULL) {
+        break;
+      }
+
+      /* something happened, continue loop and check if the card
+       * we're looking for is inserted
+       */
+      PK11_FreeSlot(slot);
+      continue;
+    }
+  } while (slot_num < 0);
+
+  return slot_num;
+}
+
 int get_user_certificates(pkcs11_handle_t *h, cert_object_t ***certs, int *count)
 {
     CERTCertList * certList;
@@ -1087,6 +1149,13 @@
     return h->slots[h->current_slot].label;
 }
 
+int wait_for_smart_card(pkcs11_handle_t *h, 
+			int wanted_slot_num,
+			const char *wanted_slot_label)
+{
+    return 0;
+}
+
 const X509 *get_X509_certificate(cert_object_t *cert)
 {
 	return cert->x509;


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pam_pkcs11.spec	22 Jul 2006 02:41:39 -0000	1.6
+++ pam_pkcs11.spec	24 Jul 2006 00:50:51 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        6
+Release:        7
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -21,6 +21,7 @@
 Patch3:		pam_pkcs11-0.5.3-setup-tool.patch
 Patch4:		pam_pkcs11-0.5.3-putenv-login-token.patch
 Patch5:		pam_pkcs11-0.5.3-ocsp.patch
+Patch6:		pam_pkcs11-0.5.3-wait-for-card.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -55,6 +56,7 @@
 %patch3 -p1 -b .setup
 %patch4 -p0 -b .putenv
 %patch5 -p0 -b .ocsp
+%patch6 -p1 -b .wait-for-card
 
 %build
 
@@ -153,12 +155,24 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> 0.5.3-7
+- add new wait_for_card option that stalls auth process
+  until a card is inserted
+- if the user is reauthenticating (already logged in, but
+  say unlocking the screen) then only treat the token the
+  user logged in with as a valid authentication token
+- clean up "smart card" word.  Before we had a mix of 
+  "smartcard", "Smart Card", "SmartCard", and "smart card" 
+  i think.
+- only say "Please insert your smart card." instead of
+  "Please insert your Smart Card or enter username" if 
+  username based login isn't allowed.
+
 * Thu Jul 20 2006 Robert Relyea  <rrelyea at redhat.com> 0.5.3-6
 - Include the login token in the environment
 - Conditionally turn on OCSP
 - Treat uninitialized tokens as not present.
 
-- Use the TEXT_INFO field for smart card prompting
 * Tue Jul 18 2006 Tomas Mraz <tmraz at redhat.com> 0.5.3-5
 - added a simple pkcs11_setup tool
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 01:36:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 21:36:25 -0400
Subject: rpms/authconfig/devel authconfig-5.3.3-fixup-for-freeze.patch, NONE,
	1.1 authconfig.spec, 1.64, 1.65
Message-ID: <200607240136.k6O1aP1d008607@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8518

Modified Files:
	authconfig.spec 
Added Files:
	authconfig-5.3.3-fixup-for-freeze.patch 
Log Message:
- write out new "wait_for_card" config option if we're
  forcing smart card authentication
- add "use_uid" option to smart card pam_succeed_if line to
  work around bug where pam_succeed_if checks user information
  even in cases where the conditional doesn't depend on it.
- remove unimplemented "logout" smart card removal action from
  settings
- remove unnecessary "card_only" argument


authconfig-5.3.3-fixup-for-freeze.patch:
 authinfo.py |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

--- NEW FILE authconfig-5.3.3-fixup-for-freeze.patch ---
--- authconfig-5.3.3/authinfo.py.fixup-for-freeze	2006-07-21 18:26:31.000000000 -0400
+++ authconfig-5.3.3/authinfo.py	2006-07-23 21:29:11.000000000 -0400
@@ -257,7 +257,6 @@
 ]
 
 argv_pkcs11_auth = [
-	"card_only"
 ]
 
 argv_krb5_auth = [
@@ -281,8 +280,8 @@
 	"use_authtok"
 ]
 
-argv_pkcs11_auth = [
-	"card_only"
+argv_force_pkcs11_auth = [
+	"wait_for_card"
 ]
 
 # This probably won't work straight-off because pam_unix won't give the right
@@ -308,7 +307,8 @@
 
 argv_succeed_if_nonlogin = [
 	"service notin login:gdm:xdm:kdm:xscreensaver:gnome-screensaver:kscreensaver",
-	"quiet"
+	"quiet",
+	"use_uid",
 ]
 
 argv_winbind_auth = [
@@ -641,7 +641,7 @@
 	return mods
 
 def getSmartcardActions():
-	return [_("Logout"), _("Lock"), _("Ignore")]
+	return [_("Lock"), _("Ignore")]
 		
 def read(msgcb):
 	info = AuthInfo(msgcb)
@@ -953,7 +953,6 @@
 		return True
 
 	def readSmartcard(self):
-		logout = False
 		lock = False
 		self.smartcardModule = callPKCS11Setup(["use_module"])
 		if self.smartcardModule == None:
@@ -963,13 +962,9 @@
    		if rmactions == None:
    			return False
    		for action in rmactions:
-   			if "gdm-restart" in action:
-   				logout = True
    			if "lockhelper.sh" in action:
    				lock = True
-		if logout:
-   			self.smartcardAction = _("Logout")
-   		elif lock:
+   		if lock:
    			self.smartcardAction = _("Lock")
    		else:
    			self.smartcardAction = _("Ignore")
@@ -2075,10 +2070,7 @@
 
 	def writeSmartcard(self):
 		insact = "/usr/sbin/gdm-safe-restart"
-		if self.smartcardAction == _("Logout"):
-			rmact = "/usr/sbin/gdm-restart"
-		else:
-			rmact = "/usr/sbin/gdm-safe-restart"
+		rmact = "/usr/sbin/gdm-safe-restart"
 		if self.smartcardAction == _("Lock"):
 			insact += ",/etc/pkcs11/lockhelper.sh -lock"
 			rmact += ",/etc/pkcs11/lockhelper.sh -deactivate"
@@ -2661,8 +2653,10 @@
 					if self.enableSmartcard and module[NAME] == "pkcs11":
 						if self.forceSmartcard:
 							module[LOGIC] = LOGIC_FORCE_PKCS11
+							module[ARGV] = argv_force_pkcs11_auth 
 						else:
 							module[LOGIC] = LOGIC_PKCS11
+							module[ARGV] = argv_pkcs11_auth 
 					output += self.formatPAMModule(module)
 
 			# Write it out and close it.


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- authconfig.spec	21 Jul 2006 22:40:33 -0000	1.64
+++ authconfig.spec	24 Jul 2006 01:36:22 -0000	1.65
@@ -3,7 +3,10 @@
 Version: 5.3.3
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1
+# rstrode: i'm bumping release here instead of doing elvis CVS
+# upstream release because we're freezing tomorrow and I don't
+# want to do an upstream release without patch review
+Release: 2
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -15,6 +18,8 @@
 BuildRequires: glib2-devel, python, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
+Patch0: authconfig-5.3.3-fixup-for-freeze.patch
+
 %description 
 Authconfig is a command line utility which can configure a workstation
 to use shadow (more secure) passwords.  Authconfig can also configure a
@@ -35,6 +40,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .fixup-for-freeze
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -95,6 +101,16 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> - 5.3.3-2
+- write out new "wait_for_card" config option if we're
+  forcing smart card authentication
+- add "use_uid" option to smart card pam_succeed_if line to
+  work around bug where pam_succeed_if checks user information
+  even in cases where the conditional doesn't depend on it.
+- remove unimplemented "logout" smart card removal action from
+  settings
+- remove unnecessary "card_only" argument
+
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 5.3.3-1
 - don't start sceventd when smartcard login is enabled
 - improve pam config for smartcard login



From fedora-cvs-commits at redhat.com  Mon Jul 24 01:45:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 21:45:48 -0400
Subject: rpms/openais/devel .cvsignore, 1.5, 1.6 openais.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200607240145.k6O1jm79011044@cvs.devel.redhat.com>

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10937/devel

Modified Files:
	.cvsignore openais.spec sources 
Log Message:
auto-import openais-0.80-1.0 on branch devel from openais-0.80-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Jul 2006 22:48:29 -0000	1.5
+++ .cvsignore	24 Jul 2006 01:45:46 -0000	1.6
@@ -1 +1 @@
-openais-0.79.tar.gz
+openais-0.80.tar.gz


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openais.spec	17 Jul 2006 22:48:29 -0000	1.8
+++ openais.spec	24 Jul 2006 01:45:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
-Version: 0.79
+Version: 0.80
 Release: 1.0
 License: BSD
 Group: System Environment/Base
@@ -45,6 +45,7 @@
 install -m 644 CHANGELOG LICENSE SECURITY README.devmap README.amf \
 	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 install -m 755 init/redhat $RPM_BUILD_ROOT%{_initrddir}/openais
+install -m 755 test/openais-cfgtool $RPM_BUILD_ROOT%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +78,7 @@
 %doc %{_docdir}/%{name}-%{version}/README.amf
 %{_sbindir}/aisexec
 %{_sbindir}/ais-keygen
+%{_sbindir}/openais-cfgtool
 %dir /etc/ais
 %config(noreplace) /etc/ais/openais.conf
 %config(noreplace) /etc/ais/amf.conf
@@ -108,6 +110,7 @@
 %{_libdir}/openais/libais.so*
 %{_libdir}/openais/libcpg.so*
 %{_libdir}/openais/libevs.so*
+%{_libdir}/openais/libcfg.so*
 %{_libdir}/openais/libSaAmf.so*
 %{_libdir}/openais/libSaCkpt.so*
 %{_libdir}/openais/libSaClm.so*
@@ -117,6 +120,7 @@
 %{_libdir}/openais/libtotem_pg.so*
 %dir %{_includedir}/openais/
 %{_includedir}/openais/cpg.h
+%{_includedir}/openais/cfg.h
 %{_includedir}/openais/evs.h
 %{_includedir}/openais/saAis.h
 %{_includedir}/openais/saAmf.h
@@ -160,6 +164,11 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Sun Jul 23 2006 Steven Dake <sdake at redhat.com> - 0.80-1.0
+- New upstream release.
+- Added openais-cfgtool tool to install.
+- Added openais/cfg.h header file.
+
 * Mon Jul 17 2006 Steven Dake <sdake at redhat.com> - 0.79-1.0
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jul 2006 22:48:29 -0000	1.5
+++ sources	24 Jul 2006 01:45:46 -0000	1.6
@@ -1 +1 @@
-63d3fd0db66260204d1fcc40779ad5b5  openais-0.79.tar.gz
+4e26b613d64a1e43968ef955258da153  openais-0.80.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 01:57:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 21:57:26 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2438, 1.2439 sources, 1.449,
	1.450
Message-ID: <200607240157.k6O1vQhn030110@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29918

Modified Files:
	kernel-2.6.spec sources 
Log Message:
Make kabitool store interim kabi deps per $KernelVer



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2438
retrieving revision 1.2439
diff -u -r1.2438 -r1.2439
--- kernel-2.6.spec	24 Jul 2006 00:43:28 -0000	1.2438
+++ kernel-2.6.spec	24 Jul 2006 01:57:23 -0000	1.2439
@@ -458,7 +458,7 @@
 
 # Override find_provides to use a script that provides "kernel(symbol) = hash".
 %global _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-%{KVERREL}-kabideps
+%define __find_provides %_sourcedir/find-provides %{_tmppath}/kernel-$KernelVer-kabideps
 %define __find_requires /usr/lib/rpm/redhat/find-requires kernel
 
 %ifarch x86_64
@@ -1114,8 +1114,8 @@
     else
 	cp $RPM_SOURCE_DIR/kabi_whitelist $RPM_BUILD_ROOT/kabi_whitelist
     fi
-    rm -f %{_tmppath}/kernel-%{KVERREL}-kabideps
-    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kernel-%{KVERREL}-kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
+    rm -f %{_tmppath}/kernel-$KernelVer-kabideps
+    %_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -d %{_tmppath}/kernel-$KernelVer-kabideps -k $KernelVer -w $RPM_BUILD_ROOT/kabi_whitelist
     rm -f $RPM_BUILD_ROOT/kabi_whitelist
 
     # And save the headers/makefiles etc for building modules against
@@ -1629,6 +1629,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Jon Masters <jcm at redhat.com>
+- Change kabideps location.
+
 * Mon Jul 24 2006 Juan Quintela <quintela at redhat.com>
 - New xen patch, fixes gso, xenoprof, vDSO.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- sources	22 Jul 2006 19:17:38 -0000	1.449
+++ sources	24 Jul 2006 01:57:23 -0000	1.450
@@ -3,6 +3,5 @@
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
-82bc687e473c67e6d4d437878c219b5d  kernel-2.6.spec
 d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
 44918b4fc778fa0439672e9f788a4ff2  patch-2.6.18-rc2-git1.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 02:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 22:17:10 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.50,1.51
Message-ID: <200607240217.k6O2HAu4016759@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14941

Modified Files:
	mx4j.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_5fc
- Stub docs.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mx4j.spec	23 Jul 2006 21:53:06 -0000	1.50
+++ mx4j.spec	24 Jul 2006 02:17:07 -0000	1.51
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_4fc
+Release:        4jpp_5fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -175,7 +175,7 @@
 
 cd build
 #ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
-ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -199,7 +199,10 @@
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+# cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/stub
+mkdir -p dist/docs
+touch dist/docs/stub
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -261,6 +264,9 @@
 %doc dist/docs/*
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_5fc
+- Stub docs.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_4fc
 - Bump release number. (dist-fc6-java)
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 02:35:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 22:35:33 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-wait-for-card.patch, 1.1,
	1.2 pam_pkcs11.spec, 1.7, 1.8
Message-ID: <200607240235.k6O2ZXSl023652@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23531

Modified Files:
	pam_pkcs11-0.5.3-wait-for-card.patch pam_pkcs11.spec 
Log Message:
- fix bug where it was ignoring first argument of module
  command line


pam_pkcs11-0.5.3-wait-for-card.patch:
 common/pkcs11.c         |   71 +++++++++++++++++++++++++++++++++++++++++++++++-
 common/smartcard.h      |    7 ++++
 pam_pkcs11/pam_config.c |   16 +++++++++-
 pam_pkcs11/pam_config.h |    1 
 pam_pkcs11/pam_pkcs11.c |   66 +++++++++++++++++++++++++++++---------------
 5 files changed, 136 insertions(+), 25 deletions(-)

Index: pam_pkcs11-0.5.3-wait-for-card.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-wait-for-card.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11-0.5.3-wait-for-card.patch	24 Jul 2006 00:50:51 -0000	1.1
+++ pam_pkcs11-0.5.3-wait-for-card.patch	24 Jul 2006 02:35:29 -0000	1.2
@@ -1,5 +1,5 @@
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c.wait-for-card	2006-07-23 16:44:36.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c	2006-07-23 18:05:17.000000000 -0400
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.c	2006-07-23 22:31:06.000000000 -0400
 @@ -40,6 +40,7 @@
          0,				/* int use_first_pass; */
          0,				/* int use_authok; */
@@ -25,6 +25,17 @@
  	configuration.pkcs11_module = ( char * )
  	    scconf_get_str(root,"use_pkcs11_module",configuration.pkcs11_module);
  	/* search pkcs11 module options */
+@@ -167,8 +171,8 @@
+ 	parse_config_file();
+ 	/* display_config(); */
+ 	/* finally parse provided arguments */
+-	/* skip argv[0] :-) */
+-	for (i = 1; i < argc; i++) {
++	/* dont skip argv[0] */
++	for (i = 0; i < argc; i++) {
+ 	   if (strcmp("nullok", argv[i]) == 0) {
+ 		configuration.nullok = 1;
+ 		continue;
 @@ -181,6 +185,14 @@
        		configuration.use_first_pass = 1;
  		continue;
@@ -40,8 +51,8 @@
      	   if (strcmp("debug", argv[i]) == 0) {
        		configuration.debug = 1;
  		set_debug_level(1);
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c.wait-for-card	2006-07-23 16:44:36.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c	2006-07-23 18:31:51.000000000 -0400
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_pkcs11.c	2006-07-23 22:15:22.000000000 -0400
 @@ -26,6 +26,7 @@
  #endif
  #include <security/pam_appl.h>
@@ -50,7 +61,7 @@
  #include <syslog.h>
  #include <ctype.h>
  #include <string.h>
-@@ -110,7 +113,6 @@
+@@ -110,7 +111,6 @@
    return PAM_CRED_INSUFFICIENT;
  }
  
@@ -58,7 +69,7 @@
  PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
  {
    int i, rv;
-@@ -130,6 +132,7 @@
+@@ -130,6 +130,7 @@
    unsigned char *signature;
    unsigned long signature_length;
    char token_name_env[64] = "";
@@ -66,7 +77,7 @@
  
    /* first of all check whether debugging should be enabled */
    for (i = 0; i < argc; i++)
-@@ -174,6 +177,16 @@
+@@ -174,6 +175,16 @@
     *  1) always get the userid from the certificate.
     *  2) don't prompt for the user name if the card is present.
     *  3) if the token is present, then we must use the cardAuth mechanism.
@@ -83,7 +94,7 @@
     */
    if (configuration->card_only) {
  	pkcs11_pam_fail = PAM_CRED_INSUFFICIENT;
-@@ -217,25 +227,43 @@
+@@ -217,25 +228,43 @@
      return PAM_AUTHINFO_UNAVAIL;
    }
  
@@ -139,7 +150,7 @@
      }
    } else {
      pam_prompt(pamh, PAM_TEXT_INFO, NULL,
-@@ -247,7 +275,6 @@
+@@ -247,7 +276,6 @@
      release_pkcs11_module(ph);
      DBG1("open_pkcs11_session() failed: %s", get_error());
      syslog(LOG_ERR, "open_pkcs11_session() failed: %s", get_error());
@@ -147,7 +158,7 @@
      return pkcs11_pam_fail;
    }
  
-@@ -257,14 +284,13 @@
+@@ -257,14 +285,13 @@
    if (configuration->use_first_pass) {
      rv = pam_get_pwd(pamh, &password, NULL, PAM_AUTHTOK, 0);
    } else if (configuration->try_first_pass) {
@@ -164,7 +175,7 @@
      return pkcs11_pam_fail;
    }
  #ifndef DEBUG_HIDE_PASSWORD
-@@ -277,7 +303,6 @@
+@@ -277,7 +304,6 @@
      memset(password, 0, strlen(password));
      free(password);
      syslog(LOG_ERR, "password length is zero but the 'nullok' argument was not defined.");
@@ -172,7 +183,7 @@
      return PAM_AUTH_ERR;
    }
  
-@@ -289,7 +314,6 @@
+@@ -289,7 +315,6 @@
      release_pkcs11_module(ph);
      DBG1("open_pkcs11_login() failed: %s", get_error());
      syslog(LOG_ERR, "open_pkcs11_login() failed: %s", get_error());
@@ -180,7 +191,7 @@
      return pkcs11_pam_fail;
    }
  
-@@ -300,7 +324,6 @@
+@@ -300,7 +325,6 @@
      release_pkcs11_module(ph);
      DBG1("get_certificates() failed: %s", get_error());
      syslog(LOG_ERR, "get_certificates failed: %s", get_error());
@@ -188,7 +199,7 @@
      return pkcs11_pam_fail;
    }
  
-@@ -322,7 +345,6 @@
+@@ -322,7 +346,6 @@
          unload_mappers();
          DBG1("verify_certificate() failed: %s", get_error());
          syslog(LOG_ERR, "verify_certificate() failed: %s", get_error());
@@ -196,7 +207,7 @@
          return pkcs11_pam_fail;
        } else if (rv != 1) {
          DBG1("verify_certificate() failed: %s", get_error());
-@@ -343,7 +365,6 @@
+@@ -343,7 +366,6 @@
  	  unload_mappers();
            DBG1("find_user() failed: %s", get_error());
            syslog(LOG_ERR,"find_user() failed: %s",get_error());
@@ -204,8 +215,8 @@
            return pkcs11_pam_fail;
  	} else {
            DBG1("certificate is valid and matches user %s",user);
---- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h.wait-for-card	2006-07-23 16:44:36.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h	2006-07-23 16:44:36.000000000 -0400
+--- pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h.wait-for-card	2006-07-23 22:15:22.000000000 -0400
++++ pam_pkcs11-0.5.3/src/pam_pkcs11/pam_config.h	2006-07-23 22:15:22.000000000 -0400
 @@ -33,6 +33,7 @@
  	int use_first_pass;
  	int use_authok;
@@ -214,8 +225,8 @@
  	char *pkcs11_module;
  	char *pkcs11_modulepath;
  	int slot_num;
---- pam_pkcs11-0.5.3/src/common/smartcard.h.wait-for-card	2006-07-23 15:32:38.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/common/smartcard.h	2006-07-23 18:03:44.000000000 -0400
+--- pam_pkcs11-0.5.3/src/common/smartcard.h.wait-for-card	2006-07-23 22:15:22.000000000 -0400
++++ pam_pkcs11-0.5.3/src/common/smartcard.h	2006-07-23 22:15:22.000000000 -0400
 @@ -33,11 +33,18 @@
  void release_pkcs11_module(pkcs11_handle_t *h);
  
@@ -235,8 +246,8 @@
  int pkcs11_login(pkcs11_handle_t *h, char *password);
  
  int close_pkcs11_session(pkcs11_handle_t *h);
---- pam_pkcs11-0.5.3/src/common/pkcs11.c.wait-for-card	2006-07-23 15:31:42.000000000 -0400
-+++ pam_pkcs11-0.5.3/src/common/pkcs11.c	2006-07-23 18:04:26.000000000 -0400
+--- pam_pkcs11-0.5.3/src/common/pkcs11.c.wait-for-card	2006-07-23 22:15:22.000000000 -0400
++++ pam_pkcs11-0.5.3/src/common/pkcs11.c	2006-07-23 22:15:22.000000000 -0400
 @@ -29,9 +29,14 @@
  #include "cert_st.h"
  #include "secutil.h"


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pam_pkcs11.spec	24 Jul 2006 00:50:51 -0000	1.7
+++ pam_pkcs11.spec	24 Jul 2006 02:35:29 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        7
+Release:        8
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -155,6 +155,10 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> 0.5.3-8
+- fix bug where it was ignoring first argument of module
+  command line
+
 * Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> 0.5.3-7
 - add new wait_for_card option that stalls auth process
   until a card is inserted



From fedora-cvs-commits at redhat.com  Mon Jul 24 02:39:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 22:39:13 -0400
Subject: rpms/classpathx-jaf/devel classpathx-jaf.spec,1.17,1.18
Message-ID: <200607240239.k6O2dDhq024642@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/classpathx-jaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24584

Modified Files:
	classpathx-jaf.spec 
Log Message:
* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0-7jpp_4fc
- Install versionless jaf.jar symlink.




Index: classpathx-jaf.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-jaf/devel/classpathx-jaf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- classpathx-jaf.spec	22 Jul 2006 08:36:39 -0000	1.17
+++ classpathx-jaf.spec	24 Jul 2006 02:39:11 -0000	1.18
@@ -37,7 +37,7 @@
 
 Name:           classpathx-jaf
 Version:        1.0
-Release:        7jpp_3fc
+Release:        7jpp_4fc
 Epoch:          0
 Summary:        GNU JavaBeans(tm) Activation Framework
 
@@ -106,6 +106,7 @@
 mv activation.jar %{name}-%{version}.jar
 ln -s %{name}-%{version}.jar %{name}.jar
 ln -s %{name}-%{version}.jar jaf-%{jafver}.jar
+ln -s %{name}-%{version}.jar jaf.jar
 ln -s %{name}-%{version}.jar activation.jar
 #touch jaf.jar
 cd -
@@ -153,6 +154,7 @@
 %doc AUTHORS ChangeLog COPYING
 %{_javadir}/activation.jar
 %{_javadir}/jaf-%{jafver}.jar
+%{_javadir}/jaf.jar
 #%ghost %{_javadir}/jaf*.jar
 %{_javadir}/%{name}*.jar
 
@@ -167,6 +169,9 @@
 
 
 %changelog
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0-7jpp_4fc
+- Install versionless jaf.jar symlink.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:1.0-7jpp_3fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 02:50:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 22:50:49 -0400
Subject: rpms/eclipse/devel eclipse.spec,1.305,1.306
Message-ID: <200607240250.k6O2onam011188@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11159

Modified Files:
	eclipse.spec 
Log Message:
Disable build.index doc generation on i386.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- eclipse.spec	23 Jul 2006 22:03:21 -0000	1.305
+++ eclipse.spec	24 Jul 2006 02:50:47 -0000	1.306
@@ -649,8 +649,8 @@
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
-# FIXME: figure out what's going on with build.index on ppc64 and s390x   
-%ifarch ppc64 s390x
+# FIXME: figure out what's going on with build.index on ppc64, s390x and i386   
+%ifarch ppc64 s390x i386
   find plugins -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
 %endif
 
@@ -1635,7 +1635,7 @@
 
 %changelog
 * Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_8fc
-- Rebuild.
+- Disable build.index doc generation on i386.
 
 * Sun Jul 23 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_7fc
 - Remove org.eclipse.ant.ui* from %%files.



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:06:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:06:00 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-securitytoken.patch, 1.6,
	1.7 gnome-screensaver.spec, 1.94,
	1.95 gnome-screensaver-0.0.22-lock-dialog.patch, 1.1,
	NONE gnome-screensaver-0.0.23-use-floaters-by-default.patch,
	1.2, NONE gnome-screensaver-2.13.5-use-less-cpu.patch, 1.1,
	NONE gnome-screensaver-2.13.90-lock-dialog.patch, 1.1,
	NONE gnome-screensaver-2.13.90-shrink-em.patch, 1.1,
	NONE gnome-screensaver-2.13.91-lock-dialog.patch, 1.1,
	NONE gnome-screensaver-2.13.91-shrink-em.patch, 1.1,
	NONE gnome-screensaver-2.14.0-fix-timeout.patch, 1.1,
	NONE gnome-screensaver-2.14.0-pass-krb-environment.patch, 1.1,
	NONE gnome-screensaver-2.14.1-unlock-with-scrolls.patch, 1.1,
	NONE gnome-screensaver-2.15.1-use-floaters-by-default.patch,
	1.1, NONE gnome-screensaver-2.15.1-username.patch, 1.1, NONE
Message-ID: <200607240306.k6O360Nu015335@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15278

Modified Files:
	gnome-screensaver-2.15.4-securitytoken.patch 
	gnome-screensaver.spec 
Removed Files:
	gnome-screensaver-0.0.22-lock-dialog.patch 
	gnome-screensaver-0.0.23-use-floaters-by-default.patch 
	gnome-screensaver-2.13.5-use-less-cpu.patch 
	gnome-screensaver-2.13.90-lock-dialog.patch 
	gnome-screensaver-2.13.90-shrink-em.patch 
	gnome-screensaver-2.13.91-lock-dialog.patch 
	gnome-screensaver-2.13.91-shrink-em.patch 
	gnome-screensaver-2.14.0-fix-timeout.patch 
	gnome-screensaver-2.14.0-pass-krb-environment.patch 
	gnome-screensaver-2.14.1-unlock-with-scrolls.patch 
	gnome-screensaver-2.15.1-use-floaters-by-default.patch 
	gnome-screensaver-2.15.1-username.patch 
Log Message:
- don't listen for smart card events unless session was
  initiated after smart card authentication.
- update lock dialog UI in between individual pam messages


gnome-screensaver-2.15.4-securitytoken.patch:
 configure.ac                           |   14 
 src/Makefile.am                        |    1 
 src/cut-n-paste/Makefile.am            |   13 
 src/cut-n-paste/securitytoken.c        |  602 ++++++++++++++++++++++
 src/cut-n-paste/securitytoken.h        |  101 +++
 src/cut-n-paste/securitytokenmonitor.c |  868 +++++++++++++++++++++++++++++++++
 src/cut-n-paste/securitytokenmonitor.h |   82 +++
 src/gs-auth-pam.c                      |    7 
 src/gs-monitor.c                       |  120 +++-
 src/gs-window-x11.c                    |    1 
 10 files changed, 1786 insertions(+), 23 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 gnome-screensaver-2.15.4-securitytoken.patch
Index: gnome-screensaver-2.15.4-securitytoken.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-2.15.4-securitytoken.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-screensaver-2.15.4-securitytoken.patch	17 Jul 2006 18:16:27 -0000	1.6
+++ gnome-screensaver-2.15.4-securitytoken.patch	24 Jul 2006 03:05:54 -0000	1.7
@@ -1,197 +1,43 @@
---- gnome-screensaver-2.15.4/src/gs-monitor.c.securitytoken	2006-07-05 20:59:14.000000000 +0200
-+++ gnome-screensaver-2.15.4/src/gs-monitor.c	2006-07-17 14:02:26.000000000 +0200
-@@ -41,10 +41,15 @@
- #include "gs-prefs.h"
- #include "gs-debug.h"
- 
-+#include "securitytokenmonitor.h"
-+
- static void     gs_monitor_class_init (GSMonitorClass *klass);
- static void     gs_monitor_init       (GSMonitor      *monitor);
- static void     gs_monitor_finalize   (GObject        *object);
- 
-+static void     gs_monitor_simulate_user_activity (GSMonitor *monitor);
-+static void     gs_monitor_lock_screen (GSMonitor *monitor);
-+
- #define GS_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_MONITOR, GSMonitorPrivate))
- 
- struct GSMonitorPrivate
-@@ -56,6 +61,8 @@ struct GSMonitorPrivate
-         GSFade         *fade;
-         GSGrab         *grab;
- 
-+	ScSecurityTokenMonitor *security_token_monitor;
-+
-         guint           release_grab_id;
- };
- 
-@@ -100,6 +107,33 @@ manager_auth_request_end_cb (GSManager *
-         gs_listener_emit_auth_request_end (monitor->priv->listener);
- }
- 
-+static void
-+security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
-+			    ScSecurityToken        *token,
-+			    GSMonitor              *monitor)
-+{
-+	gs_monitor_simulate_user_activity (monitor);
-+}
-+
-+static void
-+security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
-+			   ScSecurityToken        *token,
-+			   GSMonitor              *monitor)
-+{
-+	gboolean locking_is_enabled;
-+
-+	/* FIXME: why isn't there a getter for this? Should I be 
-+	 * looking it up from the prefs object instead?
-+	 */
-+	locking_is_enabled = FALSE;
-+	g_object_get (monitor->priv->manager,
-+		      "lock-enabled", &locking_is_enabled, NULL);
-+
-+	if (locking_is_enabled &&
-+	    sc_security_token_is_login_token (token))
-+		gs_monitor_lock_screen (monitor);
-+}
-+
- static gboolean
- watcher_idle_cb (GSWatcher *watcher,
-                  gboolean   is_idle,
-@@ -183,20 +217,7 @@ static void
- listener_lock_cb (GSListener *listener,
-                   GSMonitor  *monitor)
- {
--        gboolean res;
--        gboolean locked;
--
--        /* set lock flag before trying to activate screensaver
--           in case something tries to react to the ActiveChanged signal */
--
--        gs_manager_get_lock_active (monitor->priv->manager, &locked);
--        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
--        res = gs_listener_set_active (monitor->priv->listener, TRUE);
--        if (! res) {
--                /* If we've failed then restore lock status */
--                gs_manager_set_lock_active (monitor->priv->manager, locked);
--                gs_debug ("Unable to lock the screen");
--        }
-+	gs_monitor_lock_screen (monitor);
- }
- 
- static void
-@@ -257,13 +278,7 @@ static void
- listener_simulate_user_activity_cb (GSListener *listener,
-                                     GSMonitor  *monitor)
- {
--        /* in case the screen isn't blanked reset the
--           idle watcher */
--        gs_watcher_reset (monitor->priv->watcher);
--
--        /* request that the manager unlock -
--           will pop up a dialog if necessary */
--        gs_manager_request_unlock (monitor->priv->manager);
-+	gs_monitor_simulate_user_activity (monitor);
- }
- 
- static void
-@@ -375,6 +390,27 @@ connect_manager_signals (GSMonitor *moni
- }
- 
- static void
-+disconnect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_removed_cb, monitor);
-+
-+        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
-+					      security_token_inserted_cb, monitor);
-+}
-+
-+static void
-+connect_security_token_monitor_signals (GSMonitor *monitor)
-+{
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-removed",
-+			  G_CALLBACK (security_token_removed_cb), monitor);
-+	g_signal_connect (monitor->priv->security_token_monitor, 
-+			  "security-token-inserted",
-+			  G_CALLBACK (security_token_inserted_cb), monitor);
-+}
-+
-+static void
- disconnect_prefs_signals (GSMonitor *monitor)
- {
-         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
-@@ -408,6 +444,11 @@ gs_monitor_init (GSMonitor *monitor)
-         monitor->priv->manager = gs_manager_new ();
-         connect_manager_signals (monitor);
- 
-+	monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
-+	sc_security_token_monitor_start (monitor->priv->security_token_monitor,
-+					 NULL);
-+	connect_security_token_monitor_signals (monitor);
-+
-         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
- }
- 
-@@ -423,6 +464,9 @@ gs_monitor_finalize (GObject *object)
- 
-         g_return_if_fail (monitor->priv != NULL);
+--- gnome-screensaver-2.15.4/configure.ac
++++ gnome-screensaver-2.15.4/configure.ac
+@@ -42,6 +42,7 @@ GLADE_REQUIRED_VERSION=2.5.0
+ LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
+ LIBEXIF_REQUIRED_VERSION=0.6.12
+ GLIB_REQUIRED_VERSION=2.7.0
++NSS_REQUIRED_VERSION=3.11.2
  
-+	sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
-+	disconnect_security_token_monitor_signals (monitor);
-+
-         disconnect_watcher_signals (monitor);
-         disconnect_listener_signals (monitor);
-         disconnect_manager_signals (monitor);
-@@ -434,6 +478,7 @@ gs_monitor_finalize (GObject *object)
-         g_object_unref (monitor->priv->listener);
-         g_object_unref (monitor->priv->manager);
-         g_object_unref (monitor->priv->prefs);
-+        g_object_unref (monitor->priv->security_token_monitor);
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(crypt.h sys/select.h)
+@@ -55,7 +56,8 @@ PKG_CHECK_MODULES(GNOME_SCREENSAVER,
+         gtk+-2.0 >= $GTK_REQUIRED_VERSION
+         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+         gconf-2.0 >= $GCONF_REQUIRED_VERSION
+-        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
++        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
++	nss >= $NSS_REQUIRED_VERSION)
+ AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
+ AC_SUBST(GNOME_SCREENSAVER_LIBS)
  
-         G_OBJECT_CLASS (gs_monitor_parent_class)->finalize (object);
- }
-@@ -460,3 +505,34 @@ gs_monitor_start (GSMonitor *monitor,
+@@ -229,6 +231,16 @@ fi
+ AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
+ AC_SUBST(HAVE_USER_SWITCHING)
  
-         return TRUE;
- }
-+
-+static void     
-+gs_monitor_simulate_user_activity (GSMonitor *monitor)
-+{
-+        /* in case the screen isn't blanked reset the
-+           idle watcher */
-+        gs_watcher_reset (monitor->priv->watcher);
 +
-+        /* request that the manager unlock -
-+           will pop up a dialog if necessary */
[...2805 lines suppressed...]
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
-         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-         gconf-2.0 >= $GCONF_REQUIRED_VERSION
--        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
-+        libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
- AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
- AC_SUBST(GNOME_SCREENSAVER_LIBS)
++	ScSecurityTokenMonitor *security_token_monitor;
++
+         guint           release_grab_id;
+ };
  
-@@ -89,8 +91,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
+@@ -100,6 +107,29 @@ manager_auth_request_end_cb (GSManager *
+         gs_listener_emit_auth_request_end (monitor->priv->listener);
+ }
  
- AM_GCONF_SOURCE_2
++static void
++security_token_inserted_cb (ScSecurityTokenMonitor *token_monitor,
++			    ScSecurityToken        *token,
++			    GSMonitor              *monitor)
++{
++	gs_monitor_simulate_user_activity (monitor);
++}
++
++static void
++security_token_removed_cb (ScSecurityTokenMonitor *token_monitor,
++			   ScSecurityToken        *token,
++			   GSMonitor              *monitor)
++{
++	gboolean locking_is_enabled;
++
++	/* FIXME: lame hack
++	 */
++	locking_is_enabled = system ("pkcs11_setup rm_action | grep -q lock") == 0;
++	if (locking_is_enabled &&
++	    sc_security_token_is_login_token (token))
++		gs_monitor_lock_screen (monitor);
++}
++
+ static gboolean
+ watcher_idle_cb (GSWatcher *watcher,
+                  gboolean   is_idle,
+@@ -183,20 +213,7 @@ static void
+ listener_lock_cb (GSListener *listener,
+                   GSMonitor  *monitor)
+ {
+-        gboolean res;
+-        gboolean locked;
+-
+-        /* set lock flag before trying to activate screensaver
+-           in case something tries to react to the ActiveChanged signal */
+-
+-        gs_manager_get_lock_active (monitor->priv->manager, &locked);
+-        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
+-        res = gs_listener_set_active (monitor->priv->listener, TRUE);
+-        if (! res) {
+-                /* If we've failed then restore lock status */
+-                gs_manager_set_lock_active (monitor->priv->manager, locked);
+-                gs_debug ("Unable to lock the screen");
+-        }
++	gs_monitor_lock_screen (monitor);
+ }
  
--GNOME_COMPILE_WARNINGS(yes)
+ static void
+@@ -257,13 +274,7 @@ static void
+ listener_simulate_user_activity_cb (GSListener *listener,
+                                     GSMonitor  *monitor)
+ {
+-        /* in case the screen isn't blanked reset the
+-           idle watcher */
+-        gs_watcher_reset (monitor->priv->watcher);
 -
- # Solaris requires libresolv for daemon()
- AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
-  
-@@ -229,6 +229,16 @@ fi
- AM_CONDITIONAL(HAVE_USER_SWITCHING, test x$enable_user_switching = xyes)
- AC_SUBST(HAVE_USER_SWITCHING)
+-        /* request that the manager unlock -
+-           will pop up a dialog if necessary */
+-        gs_manager_request_unlock (monitor->priv->manager);
++	gs_monitor_simulate_user_activity (monitor);
+ }
+ 
+ static void
+@@ -375,6 +386,27 @@ connect_manager_signals (GSMonitor *moni
+ }
  
+ static void
++disconnect_security_token_monitor_signals (GSMonitor *monitor)
++{
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_removed_cb, monitor);
 +
-+# security token support
-+PKG_CHECK_MODULES(SECURITY_TOKEN,
-+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
-+	nss >= $NSS_REQUIRED_VERSION)
-+AC_SUBST(SECURITY_TOKEN_CFLAGS)
-+AC_SUBST(SECURITY_TOKEN_LIBS)
++        g_signal_handlers_disconnect_by_func (monitor->priv->security_token_monitor,
++					      security_token_inserted_cb, monitor);
++}
 +
++static void
++connect_security_token_monitor_signals (GSMonitor *monitor)
++{
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-removed",
++			  G_CALLBACK (security_token_removed_cb), monitor);
++	g_signal_connect (monitor->priv->security_token_monitor, 
++			  "security-token-inserted",
++			  G_CALLBACK (security_token_inserted_cb), monitor);
++}
++
++static void
+ disconnect_prefs_signals (GSMonitor *monitor)
+ {
+         g_signal_handlers_disconnect_by_func (monitor->priv->prefs, _gs_monitor_update_from_prefs, monitor);
+@@ -408,6 +440,15 @@ gs_monitor_init (GSMonitor *monitor)
+         monitor->priv->manager = gs_manager_new ();
+         connect_manager_signals (monitor);
+ 
++	if (g_getenv ("PKCS11_LOGIN_TOKEN_NAME") != NULL) {
++		monitor->priv->security_token_monitor = sc_security_token_monitor_new (NULL);
++		sc_security_token_monitor_start (monitor->priv->security_token_monitor,
++						 NULL);
++		connect_security_token_monitor_signals (monitor);
++	} else {
++		monitor->priv->security_token_monitor = NULL;
++	}
 +
+         _gs_monitor_update_from_prefs (monitor, monitor->priv->prefs);
+ }
+ 
+@@ -423,6 +464,12 @@ gs_monitor_finalize (GObject *object)
+ 
+         g_return_if_fail (monitor->priv != NULL);
+ 
++	if (monitor->priv->security_token_monitor != NULL) {
++		sc_security_token_monitor_stop (monitor->priv->security_token_monitor);
++		disconnect_security_token_monitor_signals (monitor);
++		g_object_unref (monitor->priv->security_token_monitor);
++	}
 +
- dnl ---------------------------------------------------------------------------
- dnl - Where should we put documentation ?
- dnl ---------------------------------------------------------------------------
+         disconnect_watcher_signals (monitor);
+         disconnect_listener_signals (monitor);
+         disconnect_manager_signals (monitor);
+@@ -460,3 +507,34 @@ gs_monitor_start (GSMonitor *monitor,
+ 
+         return TRUE;
+ }
++
++static void     
++gs_monitor_simulate_user_activity (GSMonitor *monitor)
++{
++        /* in case the screen isn't blanked reset the
++           idle watcher */
++        gs_watcher_reset (monitor->priv->watcher);
++
++        /* request that the manager unlock -
++           will pop up a dialog if necessary */
++        gs_manager_request_unlock (monitor->priv->manager);
++}
++
++static void     
++gs_monitor_lock_screen (GSMonitor *monitor)
++{
++        gboolean res;
++        gboolean locked;
++
++        /* set lock flag before trying to activate screensaver
++           in case something tries to react to the ActiveChanged signal */
++
++        gs_manager_get_lock_active (monitor->priv->manager, &locked);
++        gs_manager_set_lock_active (monitor->priv->manager, TRUE);
++        res = gs_listener_set_active (monitor->priv->listener, TRUE);
++        if (! res) {
++                /* If we've failed then restore lock status */
++                gs_manager_set_lock_active (monitor->priv->manager, locked);
++                gs_debug ("Unable to lock the screen");
++        }
++}
+--- gnome-screensaver-2.15.4/src/gs-window-x11.c
++++ gnome-screensaver-2.15.4/src/gs-window-x11.c
+@@ -658,6 +658,7 @@ get_env_vars (GtkWidget *widget)
+                 "XAUTHLOCALHOSTNAME",
+                 "KRB5CCNAME",
+                 "KRBTKFILE",
++                "PKCS11_LOGIN_TOKEN_NAME",
+                 "LANG",
+                 "LANGUAGE",
+                 "RUNNING_UNDER_GDM"


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-screensaver.spec	20 Jul 2006 14:23:11 -0000	1.94
+++ gnome-screensaver.spec	24 Jul 2006 03:05:54 -0000	1.95
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.15.4
-Release: 5 
+Release: 6
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -157,6 +157,11 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> - 2.15.4-6
+- don't listen for smart card events unless session was
+  initiated after smart card authentication.
+- update lock dialog UI in between individual pam messages
+
 * Thu Jul 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-5
 - Fix Requires for dbus-glib
 


--- gnome-screensaver-0.0.22-lock-dialog.patch DELETED ---


--- gnome-screensaver-0.0.23-use-floaters-by-default.patch DELETED ---


--- gnome-screensaver-2.13.5-use-less-cpu.patch DELETED ---


--- gnome-screensaver-2.13.90-lock-dialog.patch DELETED ---


--- gnome-screensaver-2.13.90-shrink-em.patch DELETED ---


--- gnome-screensaver-2.13.91-lock-dialog.patch DELETED ---


--- gnome-screensaver-2.13.91-shrink-em.patch DELETED ---


--- gnome-screensaver-2.14.0-fix-timeout.patch DELETED ---


--- gnome-screensaver-2.14.0-pass-krb-environment.patch DELETED ---


--- gnome-screensaver-2.14.1-unlock-with-scrolls.patch DELETED ---


--- gnome-screensaver-2.15.1-use-floaters-by-default.patch DELETED ---


--- gnome-screensaver-2.15.1-username.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:15:55 -0400
Subject: rpms/gtk2/devel .cvsignore, 1.57, 1.58 gtk2.spec, 1.165,
	1.166 sources, 1.62, 1.63
Message-ID: <200607240315.k6O3Ft38020595@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19613

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.10.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	4 Jul 2006 03:53:05 -0000	1.57
+++ .cvsignore	24 Jul 2006 03:15:53 -0000	1.58
@@ -40,3 +40,4 @@
 gtk+-2.9.3.tar.bz2
 gtk+-2.9.4.tar.bz2
 gtk+-2.10.0.tar.bz2
+gtk+-2.10.1.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- gtk2.spec	19 Jul 2006 20:25:48 -0000	1.165
+++ gtk2.spec	24 Jul 2006 03:15:53 -0000	1.166
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.0
+%define base_version 2.10.1
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -277,6 +277,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sun Jul 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-1
+- Update to 2.10.1
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-5
 - Fix a typo in the Search support patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	4 Jul 2006 04:46:08 -0000	1.62
+++ sources	24 Jul 2006 03:15:53 -0000	1.63
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-37cdf73719e8b2af6b0d065df6236542  gtk+-2.10.0.tar.bz2
+7f1d39031d50de8228211aa3230d4acd  gtk+-2.10.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:41:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:41:18 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.11,1.12
Message-ID: <200607240341.k6O3fIvK024325@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24197

Modified Files:
	adaptx.spec 
Log Message:

Adding missing dependency.




Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- adaptx.spec	22 Jul 2006 08:34:30 -0000	1.11
+++ adaptx.spec	24 Jul 2006 03:41:16 -0000	1.12
@@ -51,6 +51,7 @@
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	log4j
 BuildRequires:  xml-commons-apis
+BuildRequires:	xerces-j2
 %if ! %{gcj_support}
 BuildArch:	noarch
 %endif
@@ -94,7 +95,7 @@
 %build
 perl -p -i -e 's|classic|modern|' src/build.xml
 #export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis)
-export CLASSPATH=$(build-classpath xml-commons-apis log4j)
+export CLASSPATH=$(build-classpath xml-commons-apis log4j xerces-j2)
 ant -buildfile src/build.xml jar javadoc
 CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar
 ant -buildfile src/build.xml doc
@@ -159,6 +160,9 @@
 %doc build/doc/*
 
 %changelog
+* Sun Jul 23 2006 Deepak Bhole <dbhole at redhat.com> 0:0.9.13-2jpp_3fc
+- Adding missing dependency
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:0.9.13-2jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:44:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:44:10 -0400
Subject: rpms/gtk2/devel gtk+-2.10.1-search.patch, NONE, 1.1 gtk2.spec, 1.166,
	1.167
Message-ID: <200607240344.k6O3iAh6025440@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25358

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.10.1-search.patch 
Log Message:
update search patch


gtk+-2.10.1-search.patch:
 gtkfilechooserdefault.c | 1442 +++++++++++++++++++++++++++++++++++++++---------
 gtkfilechooserprivate.h |   42 +
 2 files changed, 1237 insertions(+), 247 deletions(-)

--- NEW FILE gtk+-2.10.1-search.patch ---
--- gtk+-2.10.1/gtk/gtkfilechooserprivate.h.search	2006-07-18 12:36:18.000000000 -0400
+++ gtk+-2.10.1/gtk/gtkfilechooserprivate.h	2006-07-23 23:29:10.000000000 -0400
@@ -147,6 +147,20 @@
   LOCATION_MODE_FILENAME_ENTRY
 } LocationMode;
 
+typedef enum {
+  OPERATION_MODE_BROWSE,
+  OPERATION_MODE_SEARCH
+} OperationMode;
+
+typedef struct _BeagleHit BeagleHit;
+typedef struct _BeagleQuery BeagleQuery;
+typedef struct _BeagleClient BeagleClient;
+typedef struct _BeagleRequest BeagleRequest;
+typedef struct _BeagleFinishedResponse BeagleFinishedResponse;
+typedef struct _BeagleHitsAddedResponse BeagleHitsAddedResponse;
+typedef struct _BeagleQueryPartProperty BeagleQueryPartProperty;
+typedef struct _BeagleQueryPart BeagleQueryPart;
+
 struct _GtkFileChooserDefault
 {
   GtkVBox parent_instance;
@@ -175,11 +189,19 @@
   GtkWidget *browse_files_popup_menu_add_shortcut_item;
   GtkWidget *browse_files_popup_menu_hidden_files_item;
   GtkWidget *browse_new_folder_button;
+  GtkWidget *browse_path_bar_hbox;
   GtkWidget *browse_path_bar;
 
   GtkFileSystemModel *browse_files_model;
   char *browse_files_last_selected_name;
 
+  /* Widgets for searching */
+  GtkWidget *search_hbox;
+  GtkWidget *search_entry;
+  BeagleClient *search_client;
+  BeagleQuery *search_query;
+  GtkListStore *search_model;
+
   GtkWidget *filter_combo_hbox;
   GtkWidget *filter_combo;
   GtkWidget *preview_box;
@@ -195,7 +217,16 @@
   LocationMode location_mode;
 
   GtkListStore *shortcuts_model;
-  GtkTreeModel *shortcuts_filter_model;
+
+  /* Filter for the shortcuts pane.  We filter out the "current folder" row and
+   * the separator that we use for the "Save in folder" combo.
+   */
+  GtkTreeModel *shortcuts_pane_filter_model;
+  
+  /* Filter for the "Save in folder" combo.  We filter out the Search row and
+   * its separator.
+   */
+  GtkTreeModel *shortcuts_combo_filter_model;
 
   GtkTreeModelSort *sort_model;
 
@@ -214,6 +245,8 @@
   ReloadState reload_state;
   guint load_timeout_id;
 
+  OperationMode operation_mode;
+
   GSList *pending_select_paths;
 
   GtkFileFilter *current_filter;
@@ -221,9 +254,6 @@
 
   GtkTooltips *tooltips;
 
-  gboolean has_home;
-  gboolean has_desktop;
-
   int num_volumes;
   int num_shortcuts;
   int num_bookmarks;
@@ -238,6 +268,7 @@
 
   GtkTreeViewColumn *list_name_column;
   GtkCellRenderer *list_name_renderer;
+  GtkTreeViewColumn *list_mtime_column;
 
   GSource *edited_idle;
   char *edited_new_text;
@@ -264,6 +295,9 @@
   guint list_sort_ascending : 1;
   guint changing_folder : 1;
   guint shortcuts_current_folder_active : 1;
+  guint has_home : 1;
+  guint has_desktop : 1;
+  guint has_search : 1;
 
 #if 0
   guint shortcuts_drag_outside : 1;
--- gtk+-2.10.1/gtk/gtkfilechooserdefault.c.search	2006-07-18 12:36:16.000000000 -0400
+++ gtk+-2.10.1/gtk/gtkfilechooserdefault.c	2006-07-23 23:42:57.000000000 -0400
@@ -78,6 +78,8 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 
 
@@ -171,13 +173,20 @@
   SHORTCUTS_COL_PIXBUF,
   SHORTCUTS_COL_NAME,
   SHORTCUTS_COL_DATA,
-  SHORTCUTS_COL_IS_VOLUME,
+  SHORTCUTS_COL_TYPE,
   SHORTCUTS_COL_REMOVABLE,
   SHORTCUTS_COL_PIXBUF_VISIBLE,
   SHORTCUTS_COL_HANDLE,
   SHORTCUTS_COL_NUM_COLUMNS
 };
 
+typedef enum {
+  SHORTCUT_TYPE_PATH,
+  SHORTCUT_TYPE_VOLUME,
+  SHORTCUT_TYPE_SEPARATOR,
+  SHORTCUT_TYPE_SEARCH
+} ShortcutType;
+
 /* Column numbers for the file list */
 enum {
   FILE_LIST_COL_NAME,
@@ -186,6 +195,16 @@
   FILE_LIST_COL_NUM_COLUMNS
 };
 
+/* Column numbers for the search model.  
+ * Keep this in sync with search_setup_model() 
+ */
+enum {
+  SEARCH_MODEL_COL_PATH,
+  SEARCH_MODEL_COL_DISPLAY_NAME,
+  SEARCH_MODEL_COL_COLLATION_KEY,
+  SEARCH_MODEL_COL_STAT
+};
+
 /* Identifiers for target types */
 enum {
   GTK_TREE_MODEL_ROW,
@@ -225,9 +244,140 @@
 static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
 					       / sizeof (file_list_dest_targets[0]));
 
+/* We dlopen() all the following from libbeagle at runtime */
+#define BEAGLE_HIT(x) ((BeagleHit *)(x))
+#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
+#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
+
+typedef enum {
+        BEAGLE_QUERY_PART_LOGIC_REQUIRED   = 1,
+	BEAGLE_QUERY_PART_LOGIC_PROHIBITED = 2
+} BeagleQueryPartLogic;
+
+typedef enum {
+	BEAGLE_PROPERTY_TYPE_UNKNOWN = 0,
+	BEAGLE_PROPERTY_TYPE_TEXT    = 1,
+	BEAGLE_PROPERTY_TYPE_KEYWORD = 2,
+	BEAGLE_PROPERTY_TYPE_DATE    = 3,
+	BEAGLE_PROPERTY_TYPE_LAST    = 4
+} BeaglePropertyType;
+
+/* *static* wrapper function pointers */
+static gboolean (*beagle_client_send_request_async) (BeagleClient  *client,
+                                                    BeagleRequest  *request,
+                                                    GError        **err) = NULL;
+static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
+static BeagleQuery *(*beagle_query_new) (void) = NULL;
+static void (*beagle_query_add_text) (BeagleQuery     *query,
+				      const char      *str) = NULL;
+static void (*beagle_query_add_hit_type) (BeagleQuery *query,
+					  const char  *hit_type) = NULL;
+static BeagleQueryPartProperty *(*beagle_query_part_property_new) (void) = NULL;
+static void (*beagle_query_part_set_logic) (BeagleQueryPart      *part, 
+					    BeagleQueryPartLogic  logic) = NULL;
+static void (*beagle_query_part_property_set_key) (BeagleQueryPartProperty *part, 
+						   const char              *key) = NULL;
+static void (*beagle_query_part_property_set_value) (BeagleQueryPartProperty *part, 
+						     const char *             value) = NULL;
+static void (*beagle_query_part_property_set_property_type) (BeagleQueryPartProperty *part, 
+							     BeaglePropertyType       prop_type) = NULL;
+static void (*beagle_query_add_part) (BeagleQuery     *query, 
+				      BeagleQueryPart *part) = NULL;
+static GType (*beagle_request_get_type) (void) = NULL;
+static GType (*beagle_query_part_get_type) (void) = NULL;
+static gboolean (*beagle_util_daemon_is_running) (void) = NULL;
+static BeagleClient *(*beagle_client_new_real) (const char *client_name) = NULL;
+
+static struct BeagleDlMapping
+{
[...2075 lines suppressed...]
 
       return;
@@ -8252,6 +9177,7 @@
   g_object_set (cell,
 		"text", gtk_file_info_get_display_name (info),
 		"sensitive", sensitive,
+		"ellipsize", PANGO_ELLIPSIZE_END,
 		NULL);
 }
 
@@ -8313,7 +9239,6 @@
 		      gpointer           data)
 {
   GtkFileChooserDefault *impl;
-  const GtkFileInfo *info;
   GtkFileTime time_mtime;
   GDate mtime, now;
   int days_diff;
@@ -8322,17 +9247,35 @@
 
   impl = data;
 
-  info = get_list_file_info (impl, iter);
-  if (!info)
+  if (impl->operation_mode == OPERATION_MODE_SEARCH)
     {
-      g_object_set (cell,
-		    "text", "",
-		    "sensitive", TRUE,
-		    NULL);
-      return;
+      struct stat *statbuf;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (impl->search_model), iter,
+			  SEARCH_MODEL_COL_STAT, &statbuf,
+			  -1);
+      time_mtime = statbuf->st_mtime;
     }
+  else
+    {
+      const GtkFileInfo *info;
 
-  time_mtime = gtk_file_info_get_modification_time (info);
+      info = get_list_file_info (impl, iter);
+      if (!info)
+	{
+	  g_object_set (cell,
+			"text", "",
+			"sensitive", TRUE,
+			NULL);
+	  return;
+	}
+
+      time_mtime = gtk_file_info_get_modification_time (info);
+
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+	  impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+	sensitive = gtk_file_info_get_is_folder (info);
+    }
 
   if (time_mtime == 0)
     strcpy (buf, _("Unknown"));
@@ -8363,10 +9306,6 @@
 	}
     }
 
-  if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
-      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
-    sensitive = gtk_file_info_get_is_folder (info);
-
   g_object_set (cell,
 		"text", buf,
 		"sensitive", sensitive,
@@ -8384,7 +9323,23 @@
 static void
 location_popup_handler (GtkFileChooserDefault *impl,
 			const gchar           *path)
-{
+{ 
+  if (impl->operation_mode == OPERATION_MODE_SEARCH)
+    {
+      GtkWidget *widget_to_focus;
+
+      search_switch_to_browse_mode (impl); /* This will give us the location widgets back */
+      if (impl->current_folder)
+        change_folder_and_display_error (impl, impl->current_folder);
+
+      if (impl->location_mode == LOCATION_MODE_PATH_BAR)
+        widget_to_focus = impl->browse_files_tree_view;
+      else
+        widget_to_focus = impl->location_entry;
+
+      gtk_widget_grab_focus (widget_to_focus);
+      return; 
+    }
   if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
       || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
     {
@@ -8439,6 +9394,7 @@
     g_assert_not_reached ();
 
   shortcuts_activate_iter (impl, &iter);
+  focus_browse_tree_view_if_possible (impl);
 }
 
 /* Handler for the "home-folder" keybinding signal */
@@ -8483,26 +9439,26 @@
 /* Drag and drop interfaces */
 
 static void
-_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
+_shortcuts_pane_model_filter_class_init (ShortcutsPaneModelFilterClass *class)
 {
 }
 
 static void
-_shortcuts_model_filter_init (ShortcutsModelFilter *model)
+_shortcuts_pane_model_filter_init (ShortcutsPaneModelFilter *model)
 {
   model->impl = NULL;
 }
 
 /* GtkTreeDragSource::row_draggable implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path)
+shortcuts_pane_model_filter_row_draggable (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
   int pos;
   int bookmarks_pos;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   pos = *gtk_tree_path_get_indices (path);
   bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
@@ -8512,13 +9468,13 @@
 
 /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
 static gboolean
-shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
-				      GtkTreePath       *path,
-				      GtkSelectionData  *selection_data)
+shortcuts_pane_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
+				           GtkTreePath       *path,
+				           GtkSelectionData  *selection_data)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+  model = SHORTCUTS_PANE_MODEL_FILTER (drag_source);
 
   /* FIXME */
 
@@ -8527,30 +9483,30 @@
 
 /* Fill the GtkTreeDragSourceIface vtable */
 static void
-shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
+shortcuts_pane_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
 {
-  iface->row_draggable = shortcuts_model_filter_row_draggable;
-  iface->drag_data_get = shortcuts_model_filter_drag_data_get;
+  iface->row_draggable = shortcuts_pane_model_filter_row_draggable;
+  iface->drag_data_get = shortcuts_pane_model_filter_drag_data_get;
 }
 
 #if 0
 /* Fill the GtkTreeDragDestIface vtable */
 static void
-shortcuts_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
+shortcuts_pane_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
 {
-  iface->drag_data_received = shortcuts_model_filter_drag_data_received;
-  iface->row_drop_possible = shortcuts_model_filter_row_drop_possible;
+  iface->drag_data_received = shortcuts_pane_model_filter_drag_data_received;
+  iface->row_drop_possible = shortcuts_pane_model_filter_row_drop_possible;
 }
 #endif
 
 static GtkTreeModel *
-shortcuts_model_filter_new (GtkFileChooserDefault *impl,
-			    GtkTreeModel          *child_model,
-			    GtkTreePath           *root)
+shortcuts_pane_model_filter_new (GtkFileChooserDefault *impl,
+			         GtkTreeModel          *child_model,
+			         GtkTreePath           *root)
 {
-  ShortcutsModelFilter *model;
+  ShortcutsPaneModelFilter *model;
 
-  model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE,
+  model = g_object_new (SHORTCUTS_PANE_MODEL_FILTER_TYPE,
 			"child-model", child_model,
 			"virtual-root", root,
 			NULL);


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gtk2.spec	24 Jul 2006 03:15:53 -0000	1.166
+++ gtk2.spec	24 Jul 2006 03:44:08 -0000	1.167
@@ -27,7 +27,7 @@
 # Fedora patch
 Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Filechooser search
-Patch2: gtk+-2.10.0-search.patch
+Patch2: gtk+-2.10.1-search.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:46:36 -0400
Subject: rpms/adaptx/devel adaptx.spec,1.12,1.13
Message-ID: <200607240346.k6O3kaCF002396@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/adaptx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1643

Modified Files:
	adaptx.spec 
Log Message:

Updating tag.




Index: adaptx.spec
===================================================================
RCS file: /cvs/dist/rpms/adaptx/devel/adaptx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- adaptx.spec	24 Jul 2006 03:41:16 -0000	1.12
+++ adaptx.spec	24 Jul 2006 03:46:34 -0000	1.13
@@ -36,7 +36,7 @@
 
 Name:		adaptx
 Version:	0.9.13
-Release:	2jpp_2fc
+Release:	2jpp_3fc
 Epoch:		0
 Summary:	AdaptX
 License:	Exolab Software License



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:48:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:48:14 -0400
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.15.4-compile-warnings.patch, NONE,
	1.1 gnome-screensaver.spec, 1.95, 1.96
Message-ID: <200607240348.k6O3mEDg009251@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9096

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.15.4-compile-warnings.patch 
Log Message:
-remove compile warnings macro


gnome-screensaver-2.15.4-compile-warnings.patch:
 configure.ac |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE gnome-screensaver-2.15.4-compile-warnings.patch ---
--- gnome-screensaver-2.15.4/configure.ac.compile-warnings	2006-07-23 23:46:35.000000000 -0400
+++ gnome-screensaver-2.15.4/configure.ac	2006-07-23 23:46:41.000000000 -0400
@@ -91,8 +91,6 @@
 
 AM_GCONF_SOURCE_2
 
-GNOME_COMPILE_WARNINGS(yes)
-
 # Solaris requires libresolv for daemon()
 AC_CHECK_LIB(resolv, daemon, [GNOME_SCREENSAVER_LIBS="$GNOME_SCREENSAVER_LIBS -lresolv"])
  


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-screensaver.spec	24 Jul 2006 03:05:54 -0000	1.95
+++ gnome-screensaver.spec	24 Jul 2006 03:48:11 -0000	1.96
@@ -25,6 +25,7 @@
 Patch3: gnome-screensaver-2.15.1-invisible-char.patch
 Patch4: gnome-screensaver-2.15.4-securitytoken.patch
 Patch5: gnome-screensaver-2.15.4-dbus-deprecated.patch
+Patch6: gnome-screensaver-2.15.4-compile-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -68,6 +69,7 @@
 %patch3 -p1 -b .invisible-char
 %patch4 -p1 -b .securitytoken
 %patch5 -p1 -b .dbus-deprecated
+%patch6 -p1 -b .compile-warnings
 
 %build
 autoreconf



From fedora-cvs-commits at redhat.com  Mon Jul 24 03:57:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 23 Jul 2006 23:57:07 -0400
Subject: rpms/velocity/devel velocity.spec,1.19,1.20
Message-ID: <200607240357.k6O3v7uF012678@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/velocity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12595

Modified Files:
	velocity.spec 
Log Message:
- Rebuild.




Index: velocity.spec
===================================================================
RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- velocity.spec	23 Jul 2006 15:30:17 -0000	1.19
+++ velocity.spec	24 Jul 2006 03:57:05 -0000	1.20
@@ -37,7 +37,7 @@
 
 Name:           velocity
 Version:        1.4
-Release:        5jpp_1fc
+Release:        5jpp_2fc
 Epoch:          0
 Summary:        Java-based template engine
 License:        Apache Software License
@@ -284,6 +284,9 @@
 #%endif
 
 %changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-5jpp_2fc
+- Rebuilt
+
 * Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.4-5jpp_1fc
 - Merge with latest from JPP.
 - Remove fileversion and my_version macros.



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:10:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:10:49 -0400
Subject: rpms/junit/devel junit.spec,1.20,1.21
Message-ID: <200607240410.k6O4An35015416@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/junit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15284

Modified Files:
	junit.spec 
Log Message:

rebuilding.




Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- junit.spec	23 Jul 2006 02:14:55 -0000	1.20
+++ junit.spec	24 Jul 2006 04:10:46 -0000	1.21
@@ -36,7 +36,7 @@
 
 Name:		junit
 Version:	3.8.2
-Release:	2jpp_1fc
+Release:	2jpp_2fc
 Epoch:		0
 Summary:	Java regression test package
 License:	Common Public License
@@ -192,6 +192,9 @@
 %endif
 
 %changelog
+* Sun Jun 23 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-2jpp_2fc
+- Rebuilt.
+
 * Sat Jun 22 2006 Deepak Bhole <dbhole at redhat.com> -  0:3.8.2-2jpp_1fc
 - Upgrade to 3.8.2
 - Added conditional native compilation.



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:27:04 -0400
Subject: rpms/jzlib/devel jzlib.spec,1.8,1.9
Message-ID: <200607240427.k6O4R4KI032585@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jzlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32528

Modified Files:
	jzlib.spec 
Log Message:
- Rebuild.




Index: jzlib.spec
===================================================================
RCS file: /cvs/dist/rpms/jzlib/devel/jzlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jzlib.spec	22 Jul 2006 19:14:37 -0000	1.8
+++ jzlib.spec	24 Jul 2006 04:26:58 -0000	1.9
@@ -36,7 +36,7 @@
 
 Name:           jzlib
 Version:        1.0.7
-Release:        3jpp_1fc
+Release:        3jpp_2fc
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
@@ -161,6 +161,9 @@
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-3jpp_2fc
+- Rebuild.
+
 * Sat Jul 22 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-3jpp_1fc
 - Merge with latest version from JPP.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:41:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:41:39 -0400
Subject: rpms/control-center/devel control-center-2.15.4-gecos.patch, NONE,
	1.1 control-center.spec, 1.157, 1.158
Message-ID: <200607240441.k6O4fdmS002272@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2209

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.4-gecos.patch 
Log Message:
fix gnome-about-me


control-center-2.15.4-gecos.patch:
 capplets/about-me/Makefile.am          |    7 -
 capplets/about-me/gnome-about-me.c     |  229 ++++++++++++++++++++++++++++++---
 capplets/about-me/gnome-about-me.glade |   41 +++--
 configure.in                           |    2 
 4 files changed, 238 insertions(+), 41 deletions(-)

--- NEW FILE control-center-2.15.4-gecos.patch ---
--- control-center-2.15.4/configure.in.gecos	2006-07-11 10:34:26.000000000 -0400
+++ control-center-2.15.4/configure.in	2006-07-24 00:36:51.000000000 -0400
@@ -1,7 +1,6 @@
 AC_INIT([control-center], [2.15.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
-AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([control-center])
 AC_CONFIG_HEADERS([config.h])
 
@@ -344,6 +343,7 @@
        
      PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
   fi
+  PKG_CHECK_MODULES(EEL, eel-2.0)
 fi
 
 if test -n "$LIBEBOOK_REQUIREMENT"; then
--- control-center-2.15.4/capplets/about-me/gnome-about-me.c.gecos	2006-07-24 00:36:51.000000000 -0400
+++ control-center-2.15.4/capplets/about-me/gnome-about-me.c	2006-07-24 00:36:51.000000000 -0400
@@ -36,6 +36,7 @@
 #include <libebook/e-book.h>
 
 #include "e-image-chooser.h"
+#include <eel/eel-editable-label.h>
 
 #include "capplet-util.h"
 
@@ -58,6 +59,7 @@
 	gboolean      	 have_image;
 	gboolean      	 image_changed;
 	gboolean      	 create_self;
+        gboolean         editing_username;
 
 	gchar        	*person;
 	gchar 		*login;
@@ -132,7 +134,7 @@
 
 
 static void about_me_set_address_field (EContactAddress *, guint, gchar *);
-
+static gchar *about_me_get_address_field (EContactAddress *, guint);
 
 /*** Utility functions ***/
 static void
@@ -196,6 +198,54 @@
 	me->create_self = FALSE;
 }
 
+static void
+update_gecos (GnomeAboutMe *me)
+{
+       const gchar *argv[12];
+       gint i = 0;
+       const gchar *fullname;
+       const gchar *office;
+       const gchar *office_phone;
+       const gchar *home_phone;
+
+       argv[i++] = "/usr/bin/userinfo";
+
+       fullname = e_contact_get_const (me->contact, E_CONTACT_FULL_NAME);
+       office = about_me_get_address_field (me->addr2, ADDRESS_LOCALITY);
+       office_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_BUSINESS);
+       home_phone = e_contact_get_const (me->contact, E_CONTACT_PHONE_HOME);
+
+       if (fullname) {
+               argv[i++] = "-f";
+               argv[i++] = fullname;
+       }
+
+       if (office) {
+               argv[i++] = "-o";
+               argv[i++] = office;
+       }
+
+       if (office_phone) {
+               argv[i++] = "-p";
+               argv[i++] = office_phone;
+       }
+
+       if (home_phone) {
+               argv[i++] = "-h";
+               argv[i++] = home_phone;
+       }
+
+       argv[i++] = "-x";
+       argv[i++] = NULL;
+
+       g_print ("calling");
+       for (i = 0; argv[i]; i++)
+         g_print (" %s", argv[i]);
+       g_print ("\n");
+       g_spawn_sync (NULL, (gchar **)argv, NULL, 0,
+                     NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
 static gboolean 
 about_me_commit_from_timeout (GnomeAboutMe *me)
 {
@@ -262,22 +312,6 @@
 	return FALSE;
 }
 
-static char *
-get_user_login (void)
-{
-	char buf[LINE_MAX * 4];
-	struct passwd pwd, *err;
-
-	int i;
-#if __sun
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
-	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
-#else
-	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf), &err);
-	return ((i == 0) && (err == &pwd)) ? g_strdup (pwd.pw_name) : NULL;
-#endif
-}
-
 /*
  * Helpers
  */
@@ -692,6 +726,8 @@
 			about_me_commit (me);
 		}
 
+		update_gecos (me);
+
 		e_contact_address_free (me->addr1);
 		e_contact_address_free (me->addr2);
 
@@ -710,13 +746,149 @@
 about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me)
 {
         gchar *argv[2]; 
-	GladeXML *dialog;
 	
         argv[0] = "/usr/bin/userpasswd";
         argv[1] = NULL;
 	g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
+static GtkWidget *
+find_fullname_editable_label (GnomeAboutMe *me)
+{
+       GtkWidget    *widget;
+       GList        *list;
+       GtkWidget    *c;
+       GladeXML     *dialog;
+
+       dialog = me->dialog;
+
+       widget = WID ("fullnamebox");
+
+       list = gtk_container_get_children (GTK_CONTAINER (widget->parent));
+
+       while (list) {
+               c = list->data;
+
+               if (EEL_IS_EDITABLE_LABEL (c))
+                      break;
+
+               c = NULL;
+
+               list = list->next;
+       }
+
+       g_list_free (list);
+
+       return c;
+}
+
+static void
+about_me_button_clicked (GtkWidget      *button,
+                        GnomeAboutMe   *me)
+{
+       GtkWidget    *label;
+       GtkWidget    *entry;
+       PangoFontDescription *font;
+       gint size;
+       const gchar *text;
+
+       label = gtk_bin_get_child (GTK_BIN (button));
+       entry = find_fullname_editable_label (me);
+
+       font = pango_font_description_copy (label->style->font_desc);
+        size = pango_font_description_get_size (font);
+        if (size == 0)
+               size = 10;
+       pango_font_description_set_size (font, size * PANGO_SCALE_XX_LARGE);
+       pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD);
+
+       eel_editable_label_set_font_description (EEL_EDITABLE_LABEL (entry), font);
+       pango_font_description_free (font);
+
+       gtk_misc_set_alignment (GTK_MISC (entry), 0.0, 0.5);
+
+        me->editing_username = TRUE;
+
+        text = gtk_label_get_text (GTK_LABEL (label));
+        eel_editable_label_set_text (EEL_EDITABLE_LABEL (entry), text);
+
+       gtk_widget_hide (button);
+       gtk_widget_show (entry);
+       gtk_widget_grab_focus (entry);
+}
+
+static void stop_editing (GnomeAboutMe *me, gboolean commit)
+{
+       GtkWidget   *button;
+       GtkWidget   *label;
+       GtkWidget   *entry;
+       GtkWidget   *main_dialog;
+       const gchar *text;
+       gchar *str;
+       GladeXML     *dialog;
+
+       if (!me->editing_username)
+               return;
+
+       me->editing_username = FALSE;
+
+       dialog = me->dialog;
+
+       button = WID ("fullnamebox");
+       label = gtk_bin_get_child (GTK_BIN (button));
+       entry = find_fullname_editable_label (me);
+
+       if (commit) {
+               text = eel_editable_label_get_text (EEL_EDITABLE_LABEL (entry));
+               str = g_strdup_printf ("<b><span size=\"xx-large\">%s</span></b>", text);
+               gtk_label_set_markup (GTK_LABEL (label), str);
+               g_free (str);
+
+               g_free (me->username);
+               me->username = g_strdup (text);
+               e_contact_set (me->contact, E_CONTACT_FULL_NAME, me->username);
+
+               main_dialog = WID ("about-me-dialog");
+               str = g_strdup_printf (_("About %s"), me->username);
+               gtk_window_set_title (GTK_WINDOW (main_dialog), str);
+               g_free (str);
+       }
+
+       gtk_widget_hide (entry);
+       gtk_widget_show (button);
+}
+
+static gboolean
+about_me_entry_focus_out (GtkWidget     *entry,
+                         GdkEventFocus *event,
+                         GnomeAboutMe  *me)
+{
+       stop_editing (me, TRUE);
+
+       return FALSE;
+}
+
+static gboolean
+about_me_entry_key_press (GtkWidget    *entry,
+                         GdkEventKey  *event,
+                         GnomeAboutMe *me)
+{
+        switch (event->keyval)
+        {
+        case GDK_Return:
+        case GDK_KP_Enter:
+                stop_editing (me, TRUE);
+                return TRUE;
+        case GDK_Escape:
+                stop_editing (me, FALSE);
+                return TRUE;
+        default:
+                break;
+        }
+
+        return FALSE;
+}
+
 static gint
 about_me_setup_dialog (void)
 {
@@ -726,6 +898,8 @@
 	GladeXML     *dialog;
 	GError 	     *error = NULL;
 	gchar        *str;
+       GtkWidget    *entry;
+       GtkWidget    *button;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -804,6 +978,25 @@
 	gtk_label_set_markup (GTK_LABEL (widget), str);
 	g_free (str);
 
+       button = WID ("fullnamebox");
+       g_signal_connect (button, "clicked",
+                         G_CALLBACK (about_me_button_clicked), me);
+
+       entry = eel_editable_label_new (me->username);
+       eel_editable_label_set_line_wrap (EEL_EDITABLE_LABEL (entry), TRUE);
+        gtk_container_add (GTK_CONTAINER (button->parent), entry);
+       gtk_box_reorder_child (GTK_BOX (button->parent), entry, 3);
+       g_signal_connect (entry, "focus-out-event",
+                         G_CALLBACK (about_me_entry_focus_out), me);
+       g_signal_connect (entry, "key-press-event",
+                         G_CALLBACK (about_me_entry_key_press), me);
+
+       gtk_widget_set_no_show_all (button, TRUE);
+       gtk_widget_set_no_show_all (entry, TRUE);
+       gtk_widget_show (widget);
+       gtk_widget_show (button);
+       gtk_widget_hide (entry);
+
 	widget = WID ("login");
 	gtk_label_set_text (GTK_LABEL (widget), me->login);
 
--- control-center-2.15.4/capplets/about-me/Makefile.am.gecos	2006-05-17 07:15:53.000000000 -0400
+++ control-center-2.15.4/capplets/about-me/Makefile.am	2006-07-24 00:36:51.000000000 -0400
@@ -5,12 +5,9 @@
 	gnome-about-me-lock.png		\
 	gnome-about-me-lock-open.png
 
-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(ABOUTME_LIBS)
+gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) $(ABOUTME_LIBS) $(EEL_LIBS)
 gnome_about_me_LDFLAGS = -export-dynamic
 gnome_about_me_SOURCES = 		\
-	eel-alert-dialog.c		\
-	eel-alert-dialog.h		\
-	eel-gtk-macros.h		\
 	gnome-about-me-password.c	\
 	gnome-about-me-password.h	\
 	e-image-chooser.c		\
@@ -26,6 +23,6 @@
 Gladedir   = $(GNOMECC_GLADE_DIR)
 Glade_DATA = gnome-about-me.glade
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS) $(EEL_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)
--- control-center-2.15.4/capplets/about-me/gnome-about-me.glade.gecos	2006-05-26 16:00:08.000000000 -0400
+++ control-center-2.15.4/capplets/about-me/gnome-about-me.glade	2006-07-24 00:39:30.000000000 -0400
@@ -113,23 +113,30 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="fullname">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Full Name</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
+                    <widget class="GtkButton" id="fullnamebox">
+                      <property name="relief">GTK_RELIEF_NONE</property>
+                      <property name="focus_on_click">True</property>
+ 
+                      <child>
+                        <widget class="GtkLabel" id="fullname">
+                          <property name="visible">True</property>
+                          <property name="label" translatable="yes">Full Name</property>
+                          <property name="use_underline">False</property>
+                          <property name="use_markup">False</property>
+                          <property name="justify">GTK_JUSTIFY_LEFT</property>
+                          <property name="wrap">False</property>
+                          <property name="selectable">False</property>
+                          <property name="xalign">0</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                          <property name="width_chars">-1</property>
+                          <property name="single_line_mode">False</property>
+                          <property name="angle">0</property>
+                        </widget>
+                      </child>
+                    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- control-center.spec	22 Jul 2006 04:21:04 -0000	1.157
+++ control-center.spec	24 Jul 2006 04:41:35 -0000	1.158
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 5 
+Release: 6 
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -33,7 +33,7 @@
 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.14.2-gecos.patch
+Patch7: control-center-2.15.4-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
 Patch9: control-center-2.15.4-add-dbus-flags.patch
 # Dobey being unreasonable again
@@ -251,6 +251,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-6
+- Make gnome-about-me start 
+
 * Sat Jul 22 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-5
 - Fix the close button of the background capplet
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:45:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:45:07 -0400
Subject: rpms/bcel/devel bcel.spec,1.20,1.21
Message-ID: <200607240445.k6O4j7YE003035@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3002

Modified Files:
	bcel.spec 
Log Message:
rebuild



Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bcel.spec	23 Jul 2006 22:28:38 -0000	1.20
+++ bcel.spec	24 Jul 2006 04:45:01 -0000	1.21
@@ -45,7 +45,7 @@
 
 Name:           bcel
 Version:        5.1
-Release:        7jpp_2fc
+Release:        7jpp_333fc
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        Apache Software License
@@ -277,6 +277,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp-3fc
+- rebuild
+
 * Thu Jul 20 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-7jpp_2fc
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:49:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:49:44 -0400
Subject: rpms/control-center/devel control-center.spec,1.158,1.159
Message-ID: <200607240449.k6O4niDP019069@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19000

Modified Files:
	control-center.spec 
Log Message:
drop patch



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- control-center.spec	24 Jul 2006 04:41:35 -0000	1.158
+++ control-center.spec	24 Jul 2006 04:49:42 -0000	1.159
@@ -34,7 +34,6 @@
 Patch5: control-center-2.12.0-run-power-manager.patch
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.15.4-gecos.patch
-Patch8: control-center-2.13.5-m4.patch
 Patch9: control-center-2.15.4-add-dbus-flags.patch
 # Dobey being unreasonable again
 Patch10: control-center-2.15.4-finish.patch
@@ -130,7 +129,6 @@
 %patch5 -p1 -b .run-power-manager
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
-%patch8 -p1 -b .m4
 %patch9 -p1 -b .add-dbus-flags
 %patch10 -p1 -b .finish
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:52:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:52:44 -0400
Subject: rpms/jgroups/devel jgroups.spec,1.13,1.14
Message-ID: <200607240452.k6O4qiei020299@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/jgroups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20223

Modified Files:
	jgroups.spec 
Log Message:
- Rebuild.




Index: jgroups.spec
===================================================================
RCS file: /cvs/dist/rpms/jgroups/devel/jgroups.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jgroups.spec	24 Jul 2006 00:18:08 -0000	1.13
+++ jgroups.spec	24 Jul 2006 04:52:41 -0000	1.14
@@ -43,7 +43,7 @@
 
 Name:		jgroups
 Version:	2.2.9.2
-Release:	2jpp_1fc
+Release:	2jpp_2fc
 Epoch:		0
 Summary:	Toolkit for reliable multicast communication.
 License:	LGPL
@@ -227,6 +227,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_2fc
+- Rebuild.
+
 * Sun Jul 23 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.2.9.2-2jpp_1fc
 - Merge with latest version from JPP.
 - Remove jars from the source tarball.



From fedora-cvs-commits at redhat.com  Mon Jul 24 04:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 00:55:48 -0400
Subject: rpms/concurrent/devel concurrent.spec,1.11,1.12
Message-ID: <200607240455.k6O4tmxc021541@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18907

Modified Files:
	concurrent.spec 
Log Message:
Rebuild



Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- concurrent.spec	23 Jul 2006 20:21:58 -0000	1.11
+++ concurrent.spec	24 Jul 2006 04:55:46 -0000	1.12
@@ -36,7 +36,7 @@
 
 Name:           concurrent
 Version:        1.3.4
-Release:        3jpp_4fc
+Release:        3jpp_55555fc
 Epoch:          0
 Summary:        Utility classes for concurrent Java programming
 License:        Public domain
@@ -135,6 +135,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp-5fc
+- Rebuilt
+
 * Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-3jpp_4fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 05:26:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 01:26:42 -0400
Subject: rpms/xjavadoc/devel xjavadoc.spec,1.13,1.14
Message-ID: <200607240526.k6O5QgGm013320@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/xjavadoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13224

Modified Files:
	xjavadoc.spec 
Log Message:

- Added conditional native compilation.
- BR fixes.




Index: xjavadoc.spec
===================================================================
RCS file: /cvs/dist/rpms/xjavadoc/devel/xjavadoc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xjavadoc.spec	22 Jul 2006 08:46:35 -0000	1.13
+++ xjavadoc.spec	24 Jul 2006 05:26:39 -0000	1.14
@@ -1,43 +1,83 @@
-%define name		xjavadoc
-%define version		1.1
-%define release		1jpp_6fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
+Name:		xjavadoc
+Version:	1.1
+Release:	3jpp_1fc
 Epoch:		0
 Summary:	The XJavaDoc engine
 License:	BSD Style
 URL:		http://xdoclet.sourceforge.net/xjavadoc/
 Group:		Development/Testing
-Source0:	%{name}-src-%{version}-RHCLEAN.tar.bz2
+Source0:	xjavadoc-src-1.1-RHCLEAN.tar.bz2
 # cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xdoclet login
 # cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc
 Patch0:		%{name}-build_xml.patch
 BuildRequires:	java
-BuildRequires:	java-devel
+BuildRequires:	java-devel >= 0:1.4.2
+BuildRequires:	jpackage-utils
 BuildRequires:	junit
-BuildRequires:	ant >= 0:1.5
-BuildRequires:	ant-nodeps >= 0:1.5
+BuildRequires:	ant >= 0:1.6
+BuildRequires:	ant-nodeps >= 0:1.6
+BuildRequires:	ant-junit >= 0:1.6
 BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	xml-commons-apis
 BuildRequires:	log4j
-BuildRequires:	java-devel 
 BuildRequires:	javacc
 BuildRequires:	xalan-j2
 BuildRequires:	jrefactory
-BuildRequires:	ant-junit
+Requires:	java
 Requires:	jakarta-commons-logging
 Requires:	jakarta-commons-collections
 Requires:	xml-commons-apis
 Requires:	log4j
 Requires:	xalan-j2
 Requires:	jrefactory
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 The XJavaDoc engine is a complete rewrite of Sun's 
 JavaDoc engine that is faster and more suited for 
@@ -51,7 +91,6 @@
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -64,7 +103,7 @@
 %patch0 -b .sav
 
 %build
-build-jar-repository lib \
+build-jar-repository -s -p lib \
 xalan-j2 \
 junit \
 javacc \
@@ -74,7 +113,7 @@
 xml-commons-apis \
 jrefactory \
 ant \
-ant/ant-nodeps
+
 
 #Fix these binary deps
 #BINCLASSPATH=$PWD/lib/ConfigLog4j.jar
@@ -100,6 +139,10 @@
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -107,54 +150,48 @@
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*
 %{_docdir}/%{name}-%{version}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1-1jpp_6fc
-- Rebuilt
-
-* Mon Jun  5 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_5fc
-- Added missing BuildRequires for ant-nodeps.
+* Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> 1.1-3jpp_1fc
+- Added conditional native compilation.
+- BR fixes.
 
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.1-1jpp_4fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 1.1-1jpp_2fc
-- rebuilt again
-
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- bump for new gcj
-
-* Thu Sep 08 2005 Florian La Roche <laroche at redhat.com>
-- no need to Provide: the name of this package again
-
-* Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 1.1-1jpp_1fc
-- Build into Fedora.
-
-* Wed Jun  8 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles and zipfiles from the tarball.
-
-* Mon Jun  6 2005 Gary Benson <gbenson at redhat.com>
-- Add build dependency on ant-junit.
-
-* Wed Feb 16 2005 Fernando Nasser <fnasser at redhat.com> 1.1-1jpp_1rh
-- Merge with upstream for upgrade
+* Thu Apr 06 2005 Ralph Apel <r.apel at r-apel.de> 1.1-2jpp
+- First JPP-1.7 release
 
 * Tue Feb 15 2005 Ralph Apel <r.apel at r-apel.de> 1.1-1jpp
 - upgrade to 1.1
 - replace requirement of xml-commons by xml-commons-apis
 
-* Fri Oct 15 2004 Fernando Nasser <fnasser at redhat.com> 1.0.3-2jpp_1rh
-- First Red Hat build
-
 * Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 1.0.3-2jpp
 - Build with ant-1.6.2
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 07:34:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 03:34:59 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.127,
	1.128 xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, 1.4, NONE
Message-ID: <200607240734.k6O7YxGA027730@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27695

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 
Log Message:
* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
- Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- xorg-x11-server.spec	22 Jul 2006 06:31:44 -0000	1.127
+++ xorg-x11-server.spec	24 Jul 2006 07:34:56 -0000	1.128
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -35,7 +35,7 @@
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
-Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
+Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
 
@@ -663,6 +663,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
+- Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)
+
 * Fri Jul 21 2006 Mike A. Harris <mharris at redhat.com>
 - Added "1152x864 @ 100.00" GTF mode to Red-Hat-extramodes patch (#49264)
 


--- xorg-x11-server-1.0.1-Red-Hat-extramodes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 07:36:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 03:36:27 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-Red-Hat-extramodes.patch,
	NONE, 1.1
Message-ID: <200607240736.k6O7aRl2028324@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28286

Added Files:
	xorg-x11-server-Red-Hat-extramodes.patch 
Log Message:
add xorg-x11-server-Red-Hat-extramodes.patch

xorg-x11-server-Red-Hat-extramodes.patch:
 extramodes |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 122 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-Red-Hat-extramodes.patch ---
--- xorg-server-1.0.1/hw/xfree86/common/extramodes.Red-Hat-extramodes	2004-04-23 15:53:57.000000000 -0400
+++ xorg-server-1.0.1/hw/xfree86/common/extramodes	2006-03-06 15:09:19.000000000 -0500
@@ -10,14 +10,23 @@
 # 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
 
-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -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
+
+# 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 +40,114 @@
 # 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
+
+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
+Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -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
+
+# 1440x900 @ 60.00 Hz (CVT)
+#   field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
+Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -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 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
+Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
+
+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
+Modeline "1680x1050"  174.00  1680 1800 1976 2272  1050 1053 1059 1096 -hsync +vsync
+
+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
+Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
+Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
+
+# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
+Modeline "1280x720"  74.48  1280 1336 1472 1664  720 721 724 746  -HSync +Vsync
+
+# 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
+
+# 1600x1024 for SGI 1600 SW
+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
+



From fedora-cvs-commits at redhat.com  Mon Jul 24 07:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 03:45:42 -0400
Subject: rpms/im-chooser/devel .cvsignore, 1.2, 1.3 im-chooser.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200607240745.k6O7jgLT031920@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31590

Modified Files:
	.cvsignore im-chooser.spec sources 
Log Message:
* Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-1
- New upstream release.
- add libgnomeui-devel to BR.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jul 2006 17:35:40 -0000	1.2
+++ .cvsignore	24 Jul 2006 07:45:40 -0000	1.3
@@ -1 +1,2 @@
 im-chooser-0.2.2.tar.gz
+im-chooser-0.3.0.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-chooser.spec	20 Jul 2006 03:02:26 -0000	1.2
+++ im-chooser.spec	24 Jul 2006 07:45:40 -0000	1.3
@@ -1,10 +1,10 @@
 Name:		im-chooser
-Version:	0.2.2
-Release:	2%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel intltool gettext
+BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
 
@@ -51,6 +51,10 @@
 %{_datadir}/applications/im-chooser.desktop
 
 %changelog
+* Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-1
+- New upstream release.
+- add libgnomeui-devel to BR.
+
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jul 2006 17:35:40 -0000	1.2
+++ sources	24 Jul 2006 07:45:40 -0000	1.3
@@ -1 +1 @@
-ebb6d52cebdb2bfc769a9282217122a6  im-chooser-0.2.2.tar.gz
+8b70fdc7dee7899fc08edbd259e47772  im-chooser-0.3.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:21:19 -0400
Subject: rpms/xorg-x11-xdm/devel xdm-1.0.5-sessreg-utmp-fix-bug177890.patch,
	NONE, 1.1 xorg-x11-xdm.spec, 1.31, 1.32
Message-ID: <200607240821.k6O8LI50007035@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7008

Modified Files:
	xorg-x11-xdm.spec 
Added Files:
	xdm-1.0.5-sessreg-utmp-fix-bug177890.patch 
Log Message:
* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-5.fc6
- Added xdm-1.0.5-sessreg-utmp-fix-bug177890.patch to restore GiveConsole to
  what we shipped in 6.8.2, and also fix bug (#177890)


xdm-1.0.5-sessreg-utmp-fix-bug177890.patch:
 GiveConsole |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xdm-1.0.5-sessreg-utmp-fix-bug177890.patch ---
--- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
+++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
@@ -8,3 +8,5 @@
 # causing serious grief.
 #
 chown $USER /dev/console
+exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
+        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-xdm.spec	19 Jul 2006 23:14:16 -0000	1.31
+++ xorg-x11-xdm.spec	24 Jul 2006 08:21:16 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT/X11
@@ -20,6 +20,7 @@
 # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
 # of "-c" to fix bug (#86505)
 Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
+Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
 
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
@@ -70,6 +71,7 @@
 %setup -q -n %{pkgname}-%{version}
 
 %patch10 -p0 -b .redhat-xdm-config-fix
+%patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
 
 %build
 # FIXME: Work around pointer aliasing warnings from compiler for now
@@ -148,6 +150,10 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-5.fc6
+- Added xdm-1.0.5-sessreg-utmp-fix-bug177890.patch to restore GiveConsole to
+  what we shipped in 6.8.2, and also fix bug (#177890)
+
 * Wed Jul 19 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.5-4.fc6
 - Remove app-defaults dir from file manifest, as it is owned by libXt (#174021)
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:24:35 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-shuangpin.patch,1.1,1.2
Message-ID: <200607240824.k6O8OZZu008185@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8089

Modified Files:
	scim-pinyin-shuangpin.patch 
Log Message:
qshen: remove all shuangpin plans


scim-pinyin-shuangpin.patch:
 scim_pinyin_imengine.cpp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

Index: scim-pinyin-shuangpin.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin-shuangpin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-pinyin-shuangpin.patch	13 Feb 2006 03:20:45 -0000	1.1
+++ scim-pinyin-shuangpin.patch	24 Jul 2006 08:24:32 -0000	1.2
@@ -1,13 +1,22 @@
---- 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 @@
+diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
+--- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp	2006-07-24 15:33:56.000000000 +0800
++++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-07-24 15:34:39.000000000 +0800
+@@ -1140,12 +1140,12 @@
+ 
+     proplist.push_back (_pinyin_scheme_property);
      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_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_abc_property);
+-    proplist.push_back (_pinyin_sp_liushi_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_abc_property);
-     proplist.push_back (_pinyin_sp_liushi_property);
++    //proplist.push_back (_pinyin_sp_abc_property);
++    //proplist.push_back (_pinyin_sp_liushi_property);
      proplist.push_back (_status_property);
+     proplist.push_back (_letter_property);
+     proplist.push_back (_punct_property);



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:25:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:25:28 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin-helper.patch,1.3,1.4
Message-ID: <200607240825.k6O8PS30008520@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8306

Modified Files:
	scim-pinyin-helper.patch 
Log Message:
qshen: remove shuangpin plans in scim-pinyin-imengine.cpp


scim-pinyin-helper.patch:
 configure.ac                           |    9 
 po/POTFILES.in                         |    1 
 po/zh_CN.po                            |  135 +++
 src/Makefile.am                        |   19 
 src/scim_pinyin_helper.cpp             | 1123 +++++++++++++++++++++++++++++++++
 src/scim_pinyin_helper.h               |   56 +
 src/scim_pinyin_imengine.cpp           |  303 ++++++++
 src/scim_pinyin_imengine.h             |    8 
 src/scim_pinyin_imengine_config_keys.h |    3 
 src/scim_pinyin_imengine_setup.cpp     |   31 
 src/scim_pinyin_phrase.h               |    6 
 11 files changed, 1685 insertions(+), 9 deletions(-)

Index: scim-pinyin-helper.patch
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin-helper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-pinyin-helper.patch	20 Jul 2006 09:42:34 -0000	1.3
+++ scim-pinyin-helper.patch	24 Jul 2006 08:25:26 -0000	1.4
@@ -1771,16 +1771,7 @@
      } else if (property == SCIM_PROP_PINYIN_SCHEME_QUAN_PIN) {
          m_factory->m_shuang_pin = false;
          update_pinyin_scheme = true;
-@@ -1142,13 +1431,16 @@
-     proplist.push_back (_pinyin_quan_pin_property);
-     proplist.push_back (_pinyin_sp_stone_property);
-     proplist.push_back (_pinyin_sp_zrm_property);
--    //proplist.push_back (_pinyin_sp_ms_property);
--    //proplist.push_back (_pinyin_sp_ziguang_property);
-+    proplist.push_back (_pinyin_sp_ms_property);
-+    proplist.push_back (_pinyin_sp_ziguang_property);
-     proplist.push_back (_pinyin_sp_abc_property);
-     proplist.push_back (_pinyin_sp_liushi_property);
+@@ -1149,6 +1439,9 @@
      proplist.push_back (_status_property);
      proplist.push_back (_letter_property);
      proplist.push_back (_punct_property);



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:27:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:27:02 -0400
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.27,1.28
Message-ID: <200607240827.k6O8R2AN009085@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8993

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: remove all shuangpin plans



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- scim-pinyin.spec	20 Jul 2006 09:46:19 -0000	1.27
+++ scim-pinyin.spec	24 Jul 2006 08:27:00 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        11.2%{?dist}
+Release:        11.3%{?dist}
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Mon Jul 24 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11.3
+- remove all ShuangPin plans
+
 * Thu Jul 20 2006 Qian Shen <qshen at redhat.com> - 0.5.91-11.2
 - remove " g_object_set ( renderer_num, "alignment", 0.5, NULL) " in add_column() to fit gtk2.10 in fc6
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:50:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:50:03 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.30,1.31
Message-ID: <200607240850.k6O8o37b029853@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29813

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
fix changelog


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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-ati.spec	12 Jul 2006 08:56:59 -0000	1.30
+++ xorg-x11-drv-ati.spec	24 Jul 2006 08:50:00 -0000	1.31
@@ -87,7 +87,7 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 6.6.1-4.1
 - rebuild
 
 * Wed Jun 28 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-4



From fedora-cvs-commits at redhat.com  Mon Jul 24 08:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 04:59:00 -0400
Subject: rpms/xorg-x11-drv-ati/devel
	r128-missing-xf86ForceHWCursor-symbol-bug168753.patch, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.31, 1.32
Message-ID: <200607240859.k6O8x0fV008919@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8905

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r128-missing-xf86ForceHWCursor-symbol-bug168753.patch 
Log Message:
* Mon Jul 24 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-5.fc6
- Added r128-missing-xf86ForceHWCursor-symbol-bug168753.patch to fix (#168753)
- Add {?dist} tag to Release field


r128-missing-xf86ForceHWCursor-symbol-bug168753.patch:
 r128_driver.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE r128-missing-xf86ForceHWCursor-symbol-bug168753.patch ---
--- src/r128_driver.c.ati-r128-missing-xf86ForceHWCursor-symbol-bug168753	2006-07-24 04:58:03.000000000 -0400
+++ src/r128_driver.c	2006-07-24 04:58:20.000000000 -0400
@@ -270,6 +270,7 @@
 static const char *ramdacSymbols[] = {
     "xf86CreateCursorInfoRec",
     "xf86DestroyCursorInfoRec",
+    "xf86ForceHWCursor",
     "xf86InitCursor",
     NULL
 };


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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-drv-ati.spec	24 Jul 2006 08:50:00 -0000	1.31
+++ xorg-x11-drv-ati.spec	24 Jul 2006 08:58:57 -0000	1.32
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   4.1
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -25,6 +25,8 @@
 Source3:   radeon.xinf
 
 Patch0:    radeon-6.6.1-dotclock-filter.patch
+# Rage 128 patches
+Patch100:  r128-missing-xf86ForceHWCursor-symbol-bug168753.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
@@ -44,6 +46,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .dotclock-filter
+%patch100 -p0 -b .r128-missing-xf86ForceHWCursor-symbol-bug168753
 
 %build
 %configure --disable-static
@@ -87,6 +90,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Jul 24 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-5.fc6
+- Added r128-missing-xf86ForceHWCursor-symbol-bug168753.patch to fix (#168753)
+- Add {?dist} tag to Release field
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 6.6.1-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:19:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67716.svx.overflow.patch, NONE,
	1.1 openoffice.org.2.0.3-gcc28409.anonymousexternc.patch, NONE,
	1.1 openoffice.org.spec, 1.784, 1.785
Message-ID: <200607240919.k6O9JwaG024050@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24034

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67716.svx.overflow.patch 
	openoffice.org.2.0.3-gcc28409.anonymousexternc.patch 
Log Message:
another little fix

openoffice.org-2.0.3.ooo67716.svx.overflow.patch:
 source/dialog/cuihyperdlg.cxx     |    0 
 svx/source/dialog/cuihyperdlg.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.3.ooo67716.svx.overflow.patch ---
Index: source/dialog/cuihyperdlg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/cuihyperdlg.cxx,v
retrieving revision 1.4
diff -u -r1.4 cuihyperdlg.cxx
--- openoffice.org.orig/svx/source/dialog/cuihyperdlg.cxx	8 Sep 2005 20:52:04 -0000	1.4
+++ openoffice.org/svx/source/dialog/cuihyperdlg.cxx	24 Jul 2006 09:07:43 -0000
@@ -368,7 +368,7 @@
 
 	SvxHyperlinkTabPageBase* pCurrentPage = (SvxHyperlinkTabPageBase*)GetTabPage( nPageId );
 
-	mbIsHTMLDoc = BOOL( pItem->GetInsertMode() & HLINK_HTMLMODE );
+	mbIsHTMLDoc = (pItem->GetInsertMode() & HLINK_HTMLMODE) ? true : false;
 
 	SfxItemSet& aPageSet =  (SfxItemSet&)GetTabPage (nPageId)->GetItemSet ();
 	aPageSet.Put ( *pItem );

openoffice.org.2.0.3-gcc28409.anonymousexternc.patch:
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |    3 +++
 source/uno/lbenv.cxx                                |    5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org.2.0.3-gcc28409.anonymousexternc.patch ---
Index: source/uno/lbenv.cxx
===================================================================
RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v
retrieving revision 1.33
diff -u -r1.33 lbenv.cxx
--- openoffice.org.orig/cppu/source/uno/lbenv.cxx	6 Mar 2006 10:16:59 -0000	1.33
+++ openoffice.org/source/uno/lbenv.cxx	13 Jul 2006 15:43:37 -0000
@@ -1049,6 +1049,8 @@
     }
 }
 
+}
+
 extern "C"
 {
 
@@ -1158,6 +1160,3 @@
 }
 
 } // extern "C"
-
-}
-
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:20:10.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2006-07-14 09:21:29.000000000 +0100
@@ -224,6 +224,7 @@
 	}
 }
 
+}
 
 //==================================================================================================
 extern "C" void cpp_vtable_call(
@@ -358,6 +359,8 @@
 extern "C" void privateSnippetExecutorClass();
 extern "C" typedef void (*PrivateSnippetExecutor)();
 
+namespace {
+
 int const codeSnippetSize = 16;
 
 unsigned char * codeSnippet(


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -r1.784 -r1.785
--- openoffice.org.spec	21 Jul 2006 17:32:55 -0000	1.784
+++ openoffice.org.spec	24 Jul 2006 09:19:56 -0000	1.785
@@ -48,7 +48,7 @@
 Source12:       ooo64726.sdf
 BuildRequires:	tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
 BuildRequires:	autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
-BuildRequires:	gcc, gcc-c++ >= 4.1.1-10, binutils, gcc-java >= 4.1.1 
+BuildRequires:	gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1 
 BuildRequires:	libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
 BuildRequires:	freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
 BuildRequires:	cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
@@ -118,6 +118,8 @@
 Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
 Patch53: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -150,7 +152,7 @@
 # rpm doesn't "do the right thing" if only the packages are Required.
 Requires: libbluecurve.so, libcrux-engine.so
 %endif
-Requires: libgcj >= 4.0.0
+Requires: libgcj >= 4.0.0, bsh
 Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
@@ -863,6 +865,8 @@
 %patch52 -p1 -b .ooo67644.sw.spacing.patch
 %patch53 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
 %patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch55 -p1 -b .ooo67716.svx.overflow.patch
+%patch56 -p1 -b .gcc28409.anonymousexternc.patch
 
 tar xzf %{SOURCE1}
 
@@ -884,6 +888,8 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#gcc problem, will be fixed in >= 4.1.1-11
+unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
@@ -3344,10 +3350,8 @@
 - rh#199664# openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
 - rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 - rh#199665# openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-- drop openoffice.org.2.0.3.gcc28409.anonymousexternc.patch as fixed
+- rh#199894# add openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
-- try and reanable visibility
-- drop hard requirement on bsh
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:32:36 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.46,1.47
Message-ID: <200607240932.k6O9WaYk024157@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24145

Modified Files:
	eclipse-cdt.spec 
Log Message:
bump release and rebuild.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- eclipse-cdt.spec	22 Jul 2006 08:37:58 -0000	1.46
+++ eclipse-cdt.spec	24 Jul 2006 09:32:26 -0000	1.47
@@ -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
@@ -267,6 +267,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Ben Konrath <bkonrath at redhat.com> 3.1.0-1jpp_7fc
+- Rebuld.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 3.1.0-1jpp_6fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:36:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:36:04 -0400
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.46,1.47
Message-ID: <200607240936.k6O9a4wX024224@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24211

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
bump release and rebuild


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- eclipse-bugzilla.spec	19 Jul 2006 17:17:22 -0000	1.46
+++ eclipse-bugzilla.spec	24 Jul 2006 09:36:00 -0000	1.47
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	7
+Release:	8
 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
+* Mon Jul 24 2006 Ben Konrath <bkonrath at redhat.com> 0.2.2-8
+- Rebuild.
+
 * Wed Jul 19 2006 Igor Foox <ifoox at redhat.com> 0.2.2-7
 - Rebuild.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:39:25 -0400
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.39,1.40
Message-ID: <200607240939.k6O9dPQe024351@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24338

Modified Files:
	eclipse-changelog.spec 
Log Message:
bump release and rebuild


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eclipse-changelog.spec	21 Jul 2006 18:57:25 -0000	1.39
+++ eclipse-changelog.spec	24 Jul 2006 09:39:22 -0000	1.40
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Ben Konrath <bkonrath at redhat.com> 2.2.0-2
+- Rebuild.
+
 * Fri Jul 21 2006 Kyu Lee <klee at redhat.com> 2.2.0-1
 - Import version 2.2.0 that has new prepare-changelog functionality.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:45:01 -0400
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.23,1.24
Message-ID: <200607240945.k6O9j18R003240@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3199

Modified Files:
	eclipse-pydev.spec 
Log Message:
bump release and rebuild


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eclipse-pydev.spec	20 Jul 2006 18:20:27 -0000	1.23
+++ eclipse-pydev.spec	24 Jul 2006 09:44:59 -0000	1.24
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	16
+Release:	17
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -133,6 +133,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Ben Konrath <bkonrath at rehdat.com> 0.9.3_fc-17
+- Rebuild.
+
 * Thu Jul 20 2006 Igor Foox <ifoox at rehdat.com> 0.9.3_fc-16
 - Fix upgrade path from fc5.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 09:55:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 05:55:38 -0400
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.20,1.21
Message-ID: <200607240955.k6O9tc7N021731@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21573

Modified Files:
	man-pages-fr.spec 
Log Message:
New spec file for better encoding.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- man-pages-fr.spec	21 Jul 2006 13:42:30 -0000	1.20
+++ man-pages-fr.spec	24 Jul 2006 09:55:35 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.22.0
-Release:	3
+Release:	4
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -34,26 +34,25 @@
   mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man${n}
 done
 
-# Conversion to UTF-8 only when needed
+# gawk haven't coding, but it's in latin1
 for i in man?/*; do
-        iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
-        mv -f $i.new $i
+  CODING=`file -i ${i} | cut -d"=" -f2`;
+    if [[ "${CODING}" == "utf-8" ||  "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]]
+    then
+      if [ "${CODING}" != "UTF-8" ]
+      then
+	iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
+        install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+	rm -rf ${i}.new
+      else
+	install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+      fi
+    else 
+	iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new
+        install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+        rm -rf ${i}.new
+    fi
 done
-for i in man?; do
-        install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
-done
-                    
-#for i in man?/*; do
-#  CODING=`file -i ${i}`
-#  if [ "${CODING}" != "UTF-8" ]
-#  then
-#    iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
-#    install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-#    rm -rf ${i}.new
-#  else
-#    install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-#  fi
-#done
 
 ##make install-install DESTDIR=$RPM_BUILD_ROOT
 
@@ -103,6 +102,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Mon Jul 24 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-4
+- new spec file for better encoding
+
 * Fri Jul 21 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-3
 - deleting conflicts in man-pages
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 10:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 06:44:27 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch, NONE,
	1.1 openoffice.org.spec, 1.785, 1.786
Message-ID: <200607241044.k6OAiRs9018901@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18828

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch 
Log Message:
some sort of gcc bug

openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch:
 basegfx/source/polygon/b2dpolypolygoncutter.cxx |   26 ++++++++++++------------
 source/polygon/b2dpolypolygoncutter.cxx         |    0 
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch ---
Index: source/polygon/b2dpolypolygoncutter.cxx
===================================================================
RCS file: /cvs/graphics/basegfx/source/polygon/b2dpolypolygoncutter.cxx,v
retrieving revision 1.11
diff -u -r1.11 b2dpolypolygoncutter.cxx
--- openoffice.org.orig/basegfx/source/polygon/b2dpolypolygoncutter.cxx	26 Jan 2006 17:17:33 -0000	1.11
+++ openoffice.org/basegfx/source/polygon/b2dpolypolygoncutter.cxx	24 Jul 2006 10:43:46 -0000
@@ -112,25 +112,27 @@
 			sal_uInt32								mnIndex;
 
 			// sort operator to be able to sort on coordinates to later see common points
-			bool operator<(const impSortNode& rComp) const
+			bool operator<(const impSortNode& rComp) const;
+		};
+
+		bool impSortNode::operator<(const impSortNode& rComp) const
+		{
+			if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
 			{
-				if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
+				if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
 				{
-					if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
-					{
-						return (mnIndex < rComp.mnIndex);
-					}
-					else
-					{
-						return fTools::less(maPoint.getY(), rComp.maPoint.getY());
-					}
+					return (mnIndex < rComp.mnIndex);
 				}
 				else
 				{
-					return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+					return fTools::less(maPoint.getY(), rComp.maPoint.getY());
 				}
 			}
-		};
+			else
+			{
+				return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+			}
+		}
 
 		//////////////////////////////////////////////////////////////////////////////
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -r1.785 -r1.786
--- openoffice.org.spec	24 Jul 2006 09:19:56 -0000	1.785
+++ openoffice.org.spec	24 Jul 2006 10:44:24 -0000	1.786
@@ -120,6 +120,7 @@
 Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
+Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -867,6 +868,7 @@
 %patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
 %patch55 -p1 -b .ooo67716.svx.overflow.patch
 %patch56 -p1 -b .gcc28409.anonymousexternc.patch
+%patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3351,6 +3353,7 @@
 - rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 - rh#199665# openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 - rh#199894# add openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+- rh#199870# add openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5



From fedora-cvs-commits at redhat.com  Mon Jul 24 10:54:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 06:54:31 -0400
Subject: rpms/cups/devel cups.spec,1.234,1.235
Message-ID: <200607241054.k6OAsVKV004905@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4844

Modified Files:
	cups.spec 
Log Message:
* Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-4
- Fixed package requirements (bug #199903).



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- cups.spec	21 Jul 2006 12:00:05 -0000	1.234
+++ cups.spec	24 Jul 2006 10:54:28 -0000	1.235
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -68,8 +68,6 @@
 %if %lspp
 BuildPrereq: libselinux-devel >= 1.23
 BuildPrereq: audit-libs-devel >= 1.1
-Requires: audit-libs-devel >= 1.1
-Requires: libselinux >= 1.23
 %endif
 
 # -fstack-protector-all requires GCC 4.0.1
@@ -409,6 +407,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-4
+- Fixed package requirements (bug #199903).
+
 * Fri Jul 21 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-3
 - Apply Matt Anderson's LSPP patch.
 - Renumbered patches.



From fedora-cvs-commits at redhat.com  Mon Jul 24 10:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 06:56:16 -0400
Subject: rpms/tar/devel tar-1.15.90-incompatibility.patch, NONE, 1.1 tar.spec,
	1.40, 1.41
Message-ID: <200607241056.k6OAuGum005629@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5526

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.90-incompatibility.patch 
Log Message:
- fix incompatibilities in appending files to the end
  of an archive (#199515)


tar-1.15.90-incompatibility.patch:
 create.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tar-1.15.90-incompatibility.patch ---
--- tar-1.15.90/src/create.c.incompatibility	2006-07-24 12:03:06.000000000 +0200
+++ tar-1.15.90/src/create.c	2006-07-24 12:03:28.000000000 +0200
@@ -291,7 +291,8 @@
       && S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC
       && archive_format != POSIX_FORMAT
       && archive_format != USTAR_FORMAT
-      && archive_format != GNU_FORMAT)
+      && archive_format != GNU_FORMAT
+      && archive_format != OLDGNU_FORMAT)
     {
       negative = v < 0;
       u = v;


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tar.spec	18 Jul 2006 14:34:14 -0000	1.40
+++ tar.spec	24 Jul 2006 10:56:14 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.90
-Release: 4
+Release: 5
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -13,7 +13,7 @@
 Patch3: tar-1.15.1-vfatTruncate.patch
 Patch4: tar-1.15.90-makeCheck.patch
 Patch5: tar-1.15.90-permissions.patch
-
+Patch6: tar-1.15.90-incompatibility.patch
 Prereq: info
 BuildRequires: autoconf automake gzip
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +37,8 @@
 %patch3 -p1 -b .vfatTruncate
 %patch4 -p1 -b .makeCheck
 %patch5 -p1 -b .permissions
+%patch6 -p1 -b .incompatibility
+
 %build
 
 %ifos linux
@@ -106,6 +108,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Jul 24 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-5
+- fix incompatibilities in appending files to the end 
+  of an archive (#199515)
+
 * Tue Jul 18 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.90-4
 - fix problem with unpacking archives in a directory for which 
   one has write permission but does not own (such as /tmp) (#149686)



From fedora-cvs-commits at redhat.com  Mon Jul 24 11:55:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 07:55:12 -0400
Subject: rpms/arts/devel arts-1.5.3-1.5.4.patch, NONE, 1.1 arts.spec, 1.62,
	1.63
Message-ID: <200607241155.k6OBtCW7029751@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/arts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29736

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.3-1.5.4.patch 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)


arts-1.5.3-1.5.4.patch:
 admin/acinclude.m4.in       |    2 +-
 admin/cvs.sh                |    6 +++---
 arts.lsm                    |    4 ++--
 configure.in.in             |    2 +-
 flow/gsl/gslmagic.c         |    2 +-
 soundserver/artswrapper.c   |    4 ++++
 soundserver/crashhandler.cc |    7 ++++++-
 7 files changed, 18 insertions(+), 9 deletions(-)

--- NEW FILE arts-1.5.3-1.5.4.patch ---
Index: soundserver/artswrapper.c
===================================================================
--- soundserver/artswrapper.c	(.../1.5.3/arts)	(Revision 565763)
+++ soundserver/artswrapper.c	(.../1.5.4/arts)	(Revision 565763)
@@ -95,6 +95,10 @@
 #else
 		setreuid(-1, getuid());
 #endif
+		if (geteuid() != getuid()) {
+			perror("setuid()");
+			return 2;
+		}
 	}
 
 	if(argc == 0)
Index: soundserver/crashhandler.cc
===================================================================
--- soundserver/crashhandler.cc	(.../1.5.3/arts)	(Revision 565763)
+++ soundserver/crashhandler.cc	(.../1.5.4/arts)	(Revision 565763)
@@ -196,7 +196,12 @@
           argv[i++] = NULL;
 
           setgid(getgid());
-          setuid(getuid());
+          if (getuid() != geteuid())
+            setuid(getuid());
+          if (getuid() != geteuid()) {
+	    perror("setuid()");
+            exit(255);
+          }
 
           execvp(crashApp, argv);
 
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh	(.../1.5.3/arts)	(Revision 565763)
+++ admin/cvs.sh	(.../1.5.4/arts)	(Revision 565763)
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.3\""
+     VERSION="\"3.5.4\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(.../1.5.3/arts)	(Revision 565763)
+++ admin/acinclude.m4.in	(.../1.5.4/arts)	(Revision 565763)
@@ -2747,7 +2747,7 @@
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
Index: configure.in.in
===================================================================
--- configure.in.in	(.../1.5.3/arts)	(Revision 565763)
+++ configure.in.in	(.../1.5.4/arts)	(Revision 565763)
@@ -17,7 +17,7 @@
 dnl Version (we /might/ want to use libtool versioning, too)
 ARTS_MAJOR_VERSION=1
 ARTS_MINOR_VERSION=5
-ARTS_MICRO_VERSION=3
+ARTS_MICRO_VERSION=4
 ARTS_VERSION=$ARTS_MAJOR_VERSION.$ARTS_MINOR_VERSION.$ARTS_MICRO_VERSION
 
 dnl Automake doc recommends to do this only here. (Janos)
Index: arts.lsm
===================================================================
--- arts.lsm	(.../1.5.3/arts)	(Revision 565763)
+++ arts.lsm	(.../1.5.4/arts)	(Revision 565763)
@@ -1,7 +1,7 @@
 Begin4
 Title:          arts
-Version:        1.5.3
-Entered-date:   2006-05-23
+Version:        1.5.4
+Entered-date:   2006-08-02
 Description:    Soundserver for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt 
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: flow/gsl/gslmagic.c
===================================================================
--- flow/gsl/gslmagic.c	(.../1.5.3/arts)	(Revision 565763)
+++ flow/gsl/gslmagic.c	(.../1.5.4/arts)	(Revision 565763)
@@ -616,7 +616,7 @@
     return FALSE;
 
   do
-    ret = fstat (bfile->fd, &buf) < 0;
+    ret = fstat (bfile->fd, &buf);
   while (ret < 0 && errno == EINTR);
   if (ret < 0)
     {


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- arts.spec	18 Jul 2006 08:10:58 -0000	1.62
+++ arts.spec	24 Jul 2006 11:55:10 -0000	1.63
@@ -3,14 +3,12 @@
 %define debug 0
 %define final 0
 
-%define alsa 1
 %define qt_version 3.3.6
 
 %define make_cvs 1
-%define disable_gcc_check_and_hidden_visibility 1
 
-Version: 1.5.3
-Release: 2
+Version: 1.5.4
+Release: 0.pre1
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -18,10 +16,10 @@
 Epoch: 8
 Url: http://www.kde.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-1.5.3.tar.bz2
 Source1: gslconfig-wrapper.h
 
-Patch0: kde-libtool.patch
+Patch0: arts-1.5.3-1.5.4.patch
 Patch1: arts-1.1.4-debug.patch
 Patch2: arts-1.3.92-glib2.patch
 Patch5: arts-1.3.1-alsa.patch
@@ -34,11 +32,10 @@
 Obsoletes: kdelibs-sound
 Provides: kdelibs-sound
 
-%if %{alsa}
 BuildRequires: alsa-lib-devel >= 1.0.2
-%endif
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
+BuildRequires: libtool
 BuildRequires: qt-devel >= 1:%{qt_version}
 BuildRequires: perl
 BuildRequires: glib2-devel
@@ -67,9 +64,7 @@
 Requires: glib2-devel
 Requires: libvorbis-devel
 Requires: audiofile-devel
-%if %{alsa}
 Requires: alsa-lib-devel
-%endif
 Obsoletes: kdelibs-sound-devel
 Provides: kdelibs-sound-devel
 
@@ -89,8 +84,8 @@
 KDE applications using sound).
 
 %prep
-%setup -q
-%patch0 -p1 -b .libtool
+%setup -q -n %{name}-1.5.3
+%patch0 -p0 -b .libtool
 %patch1 -p1 -b .debug
 %patch2 -p1 -b .glib
 %patch5 -p1 -b .alsa
@@ -100,10 +95,6 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$FLAGS"
-export CFLAGS="$FLAGS"
-export PATH=`pwd`:$PATH
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
@@ -112,12 +103,8 @@
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
-%if %{alsa}
    --with-alsa \
-%endif
 %if %{final}
    --enable-final \
 %endif
@@ -175,6 +162,9 @@
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 8:1.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Tue Jul 18 2006 Than Ngo <than at redhat.com> 8:1.5.3-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:14:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:14:37 -0400
Subject: rpms/kdepim/devel kdepim-3.5.3-3.5.4.patch, NONE, 1.1 kdepim.spec,
	1.95, 1.96
Message-ID: <200607241214.k6OCEbnp009772@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9702

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-3.5.3-3.5.4.patch 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)


kdepim-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                                         |    2 
 admin/cvs.sh                                                                  |    6 
 akregator/ChangeLog                                                           |   11 
 akregator/src/aboutdata.h                                                     |    2 
 akregator/src/akregator.desktop                                               |    8 
 akregator/src/akregator_part.cpp                                              |    2 
 akregator/src/akregator_plugin.desktop                                        |    2 
 akregator/src/eventsrc                                                        |   13 
 akregator/src/librss/tools_p.cpp                                              |    2 
 akregator/src/mk4storage/akregator_mk4storage_plugin.desktop                  |    3 
 akregator/src/mk4storage/metakit/include/mk4.h                                |    2 
 akregator/src/pageviewer.cpp                                                  |   30 
 akregator/src/progressmanager.cpp                                             |    6 
 akregator/src/viewer.cpp                                                      |    2 
 certmanager/conf/kleopatra_config_appear.desktop                              |    1 
 certmanager/conf/kleopatra_config_dirserv.desktop                             |    2 
 certmanager/conf/kleopatra_config_dnorder.desktop                             |    2 
 certmanager/lib/libkleopatrarc.desktop                                        |   12 
 doc/kalarm/index.docbook                                                      |   29 
 doc/knode/commands.docbook                                                    |  190 
 kaddressbook/csv-templates/kaddressbook.desktop                               |    1 
 kaddressbook/csv-templates/yahoo.desktop                                      |    1 
 kaddressbook/dcopaddressbook.desktop                                          |    1 
 kaddressbook/editors/cryptosettings.desktop                                   |    1 
 kaddressbook/editors/imaddresseditor.desktop                                  |    2 
 kaddressbook/editors/kaddressbookimprotocol.desktop                           |    1 
 kaddressbook/editors/protocols/aimprotocol.desktop                            |    1 
 kaddressbook/editors/protocols/gaduprotocol.desktop                           |    1 
 kaddressbook/editors/protocols/groupwiseprotocol.desktop                      |    2 
 kaddressbook/editors/protocols/icqprotocol.desktop                            |    1 
 kaddressbook/editors/protocols/ircprotocol.desktop                            |    1 
 kaddressbook/editors/protocols/jabberprotocol.desktop                         |    1 
 kaddressbook/editors/protocols/meanwhileprotocol.desktop                      |    2 
 kaddressbook/editors/protocols/skypeprotocol.desktop                          |    2 
 kaddressbook/editors/protocols/smsprotocol.desktop                            |    1 
 kaddressbook/editors/protocols/yahooprotocol.desktop                          |    1 
 kaddressbook/features/distributionlist.desktop                                |    1 
 kaddressbook/features/resourceselection.desktop                               |    2 
 kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop              |    1 
 kaddressbook/interfaces/kaddressbook_extension.desktop                        |    1 
 kaddressbook/interfaces/kaddressbook_xxport.desktop                           |    1 
 kaddressbook/kaddressbook.desktop                                             |    2 
 kaddressbook/kaddressbook_view.desktop                                        |    1 
 kaddressbook/kcmconfigs/kabconfig.desktop                                     |    2 
 kaddressbook/kcmconfigs/kabcustomfields.desktop                               |    1 
 kaddressbook/kcmconfigs/kabldapconfig.desktop                                 |    1 
 kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop                      |    3 
 kaddressbook/views/cardview.desktop                                           |    3 
 kaddressbook/views/iconview.desktop                                           |    1 
 kaddressbook/views/tableview.desktop                                          |    1 
 kaddressbook/xxport/bookmark_xxport.desktop                                   |    2 
 kaddressbook/xxport/csv_xxport.desktop                                        |    2 
 kaddressbook/xxport/eudora_xxport.desktop                                     |    2 
 kaddressbook/xxport/gnokii_xxport.cpp                                         |  894 ++++
 kaddressbook/xxport/gnokii_xxport.desktop                                     |    2 
 kaddressbook/xxport/kde2_xxport.desktop                                       |    2 
 kaddressbook/xxport/ldif_xxport.desktop                                       |    2 
 kaddressbook/xxport/opera_xxport.desktop                                      |    2 
 kaddressbook/xxport/pab_xxport.desktop                                        |    2 
 kaddressbook/xxport/vcard_xxport.desktop                                      |    2 
 kalarm/ACKNOWLEDGEMENTS                                                       |    6 
 kalarm/Changelog                                                              |   10 
 kalarm/alarmcalendar.cpp                                                      |  133 
 kalarm/alarmcalendar.h                                                        |    3 
 kalarm/alarmevent.cpp                                                         |   10 
 kalarm/alarmlistview.cpp                                                      |  202 -
 kalarm/alarmlistview.h                                                        |   28 
 kalarm/alarmtimewidget.cpp                                                    |    5 
 kalarm/dcophandler.cpp                                                        |    2 
 kalarm/dcophandler.h                                                          |    2 
 kalarm/functions.cpp                                                          |    2 
 kalarm/functions.h                                                            |    2 
 kalarm/kalarm.desktop                                                         |    1 
 kalarm/kalarm.h                                                               |    4 
 kalarm/kalarm.tray.desktop                                                    |    1 
 kalarm/kalarmapp.cpp                                                          |    2 
 kalarm/kalarmapp.h                                                            |    2 
 kalarm/kalarmd/kalarmd.autostart.desktop                                      |    4 
 kalarm/kalarmd/kalarmd.desktop                                                |    2 
 kalarm/kalarmiface.h                                                          |    2 
 kalarm/kalarmui.rc                                                            |    1 
 kalarm/main.cpp                                                               |    2 
 kalarm/mainwindow.cpp                                                         |   64 
 kalarm/mainwindow.h                                                           |    4 
 kalarm/messagewin.cpp                                                         |    6 
 kalarm/recurrenceedit.cpp                                                     |    4 
 kalarm/soundpicker.cpp                                                        |    1 
 kalarm/undo.cpp                                                               |    2 
 kandy/src/kandy.desktop                                                       |    1 
 kandy/src/mobilegui.cpp                                                       |    1 
 kandy/src/modem.cpp                                                           |    3 
 karm/mainwindow.cpp                                                           |    2 
 kdepim.lsm                                                                    |    4 
 kfile-plugins/ics/kfile_ics.desktop                                           |    2 
 kfile-plugins/palm-databases/kfile_palm.desktop                               |    2 
 kfile-plugins/rfc822/kfile_rfc822.desktop                                     |    1 
 kioslaves/sieve/sieve.protocol                                                |    1 
 kitchensync/kitchensync/backup/backup.desktop                                 |    1 
 kitchensync/kitchensync/backup/restore.desktop                                |    1 
 kitchensync/kitchensync/debugger/debugger.desktop                             |    1 
 kitchensync/kitchensync/plucker/kitchensync-pluck-rdf.desktop                 |    2 
 kitchensync/kitchensync/plucker/kitchensync-pluck.desktop                     |    2 
 kitchensync/kitchensync/viewer/viewer.desktop                                 |    1 
 kitchensync/libkonnector2/filter.desktop                                      |    2 
 kitchensync/libkonnector2/filters/addressbookfilter.desktop                   |    4 
 kitchensync/libkonnector2/filters/calendarfilter.desktop                      |    4 
 kitchensync/libkonnector2/konnector.desktop                                   |    2 
 kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop |    1 
 kitchensync/multisynk/multisynk.desktop                                       |    2 
 kmail/KMail.desktop                                                           |    1 
 kmail/accountmanager.cpp                                                      |    3 
 kmail/dcopimap.desktop                                                        |    1 
 kmail/dcopmail.desktop                                                        |    1 
 kmail/eventsrc                                                                |    2 
 kmail/headerstyle.cpp                                                         |    8 
 kmail/imapjob.cpp                                                             |    2 
 kmail/kmaccount.cpp                                                           |    5 
 kmail/kmacctimap.cpp                                                          |    3 
 kmail/kmail.antispamrc                                                        |   49 
 kmail/kmail.upd                                                               |    5 
 kmail/kmail_config_accounts.desktop                                           |    4 
 kmail/kmail_config_appearance.desktop                                         |    1 
 kmail/kmail_config_composer.desktop                                           |    2 
 kmail/kmail_config_identity.desktop                                           |    2 
 kmail/kmail_config_misc.desktop                                               |    3 
 kmail/kmail_config_security.desktop                                           |    3 
 kmail/kmcommands.cpp                                                          |   30 
 kmail/kmcommands.h                                                            |    1 
 kmail/kmcomposewin.cpp                                                        |    6 
 kmail/kmfolderimap.cpp                                                        |   43 
 kmail/kmfolderseldlg.cpp                                                      |  216 +
 kmail/kmfolderseldlg.h                                                        |   12 
 kmail/kmheaders.cpp                                                           |   23 
 kmail/kmkernel.cpp                                                            |    1 
 kmail/kmmainwidget.cpp                                                        |   80 
 kmail/kmmainwidget.h                                                          |    3 
 kmail/kmmessage.cpp                                                           |    2 
 kmail/kmmsgpart.cpp                                                           |    2 
 kmail/kmstartup.cpp                                                           |    3 
 kmail/kmsystemtray.cpp                                                        |    1 
 kmail/kmversion.h                                                             |    2 
 kmail/messagecomposer.cpp                                                     |   52 
 kmail/messagecomposer.h                                                       |    1 
 kmail/newfolderdialog.cpp                                                     |   20 
 kmail/partmetadata.h                                                          |    7 
 kmail/popaccount.cpp                                                          |   51 
 kmail/profiles/profile-default-rc.desktop                                     |    2 
 kmail/profiles/profile-high-contrast-rc.desktop                               |    3 
 kmail/profiles/profile-html-rc.desktop                                        |    1 
 kmail/profiles/profile-purist-rc.desktop                                      |    2 
 kmail/profiles/profile-secure-rc.desktop                                      |    4 
 kmail/renamejob.cpp                                                           |   20 
 kmail/searchjob.cpp                                                           |    3 
 kmobile/devices/digicam/libkmobile_digicam.desktop                            |    3 
 kmobile/devices/gammu/libkmobile_gammu.desktop                                |    4 
 kmobile/devices/gnokii/libkmobile_gnokii.desktop                              |    4 
 kmobile/devices/skeleton/libkmobile_skeleton.desktop                          |    4 
 kmobile/kioslave/mimetypes/mobile_addressbook.desktop                         |    2 
 kmobile/kioslave/mimetypes/mobile_calendar.desktop                            |    2 
 kmobile/kioslave/mimetypes/mobile_device.desktop                              |    2 
 kmobile/kioslave/mimetypes/mobile_notes.desktop                               |    2 
 kmobile/kmobile.desktop                                                       |    5 
 kmobile/libkmobile.desktop                                                    |    2 
 knode/KNode.desktop                                                           |    1 
 knode/knode_config_accounts.desktop                                           |    2 
 knode/knode_config_appearance.desktop                                         |    1 
 knode/knode_config_cleanup.desktop                                            |    3 
 knode/knode_config_identity.desktop                                           |    2 
 knode/knode_config_post_news.desktop                                          |    1 
 knode/knode_config_privacy.desktop                                            |    2 
 knode/knode_config_read_news.desktop                                          |    1 
 knode/resource.h                                                              |    2 
 knotes/ChangeLog                                                              |    8 
 knotes/KNotesAppIface.h                                                       |   53 
 knotes/knote.cpp                                                              |  135 
 knotes/knote.h                                                                |    9 
 knotes/knotes_manager.desktop                                                 |    1 
 knotes/knotesapp.cpp                                                          |   63 
 knotes/knotesapp.h                                                            |   12 
 knotes/local.desktop                                                          |    1 
 konsolekalendar/konsolekalendar.desktop                                       |    2 
 konsolekalendar/main.cpp                                                      |    5 
 kontact/interfaces/kontactplugin.desktop                                      |    1 
 kontact/plugins/akregator/akregatorplugin.desktop                             |    6 
 kontact/plugins/akregator/akregatorplugin3.2.desktop                          |    6 
 kontact/plugins/kaddressbook/kaddressbookplugin.desktop                       |    2 
 kontact/plugins/karm/karmplugin.desktop                                       |    2 
 kontact/plugins/kitchensync/kitchensync.desktop                               |    2 
 kontact/plugins/kmail/kcmkmailsummary.desktop                                 |    3 
 kontact/plugins/kmail/kmailplugin.desktop                                     |    2 
 kontact/plugins/knode/knodeplugin.desktop                                     |    2 
 kontact/plugins/knotes/knotesplugin.desktop                                   |    2 
 kontact/plugins/korganizer/journalplugin.desktop                              |    4 
 kontact/plugins/korganizer/kcmkorgsummary.desktop                             |    6 
 kontact/plugins/korganizer/korganizerplugin.desktop                           |    5 
 kontact/plugins/korganizer/todoplugin.desktop                                 |    4 
 kontact/plugins/kpilot/kpilotplugin.desktop                                   |    2 
 kontact/plugins/multisynk/multisynk.desktop                                   |    3 
 kontact/plugins/newsticker/kcmkontactknt.desktop                              |    5 
 kontact/plugins/newsticker/newstickerplugin.desktop                           |    3 
 kontact/plugins/specialdates/kcmsdsummary.desktop                             |    6 
 kontact/plugins/specialdates/sdsummarywidget.cpp                              |    9 
 kontact/plugins/specialdates/specialdatesplugin.desktop                       |    6 
 kontact/plugins/summary/kcmkontactsummary.desktop                             |    4 
 kontact/plugins/summary/summaryplugin.desktop                                 |    2 
 kontact/plugins/test/kptestplugin.desktop                                     |    3 
 kontact/plugins/weather/weatherplugin.desktop                                 |    4 
 kontact/src/Kontact.desktop                                                   |    3 
 kontact/src/kontact.setdlg                                                    |   37 
 korganizer/actionmanager.cpp                                                  |    9 
 korganizer/dcopcalendar.desktop                                               |    2 
 korganizer/interfaces/calendar/calendardecoration.desktop                     |    2 
 korganizer/interfaces/calendar/calendarplugin.desktop                         |    2 
 korganizer/koagendaview.cpp                                                   |   17 
 korganizer/kocorehelper.cpp                                                   |    2 
 korganizer/kodaymatrix.cpp                                                    |   22 
 korganizer/koeditoralarms.cpp                                                 |    2 
 korganizer/koeditorrecurrence.cpp                                             |    2 
 korganizer/koglobals.cpp                                                      |   27 
 korganizer/koglobals.h                                                        |    2 
 korganizer/kogroupware.cpp                                                    |    2 
 korganizer/komonthview.cpp                                                    |    4 
 korganizer/korgac/korgac.desktop                                              |    4 
 korganizer/korganizer-import.desktop                                          |    3 
 korganizer/korganizer.desktop                                                 |    6 
 korganizer/korganizer_configcolors.desktop                                    |    5 
 korganizer/korganizer_configdesignerfields.desktop                            |    1 
 korganizer/korganizer_configfonts.desktop                                     |    5 
 korganizer/korganizer_configfreebusy.desktop                                  |    2 
 korganizer/korganizer_configgroupautomation.desktop                           |    2 
 korganizer/korganizer_configgroupscheduling.desktop                           |    2 
 korganizer/korganizer_configmain.desktop                                      |    5 
 korganizer/korganizer_configplugins.desktop                                   |    7 
 korganizer/korganizer_configtime.desktop                                      |    5 
 korganizer/korganizer_configviews.desktop                                     |    3 
 korganizer/plugins/datenums/datenums.desktop                                  |    6 
 korganizer/plugins/exchange/exchange.desktop                                  |    3 
 korganizer/plugins/hebrew/hebrew.desktop                                      |    6 
 korganizer/plugins/printing/journal/journalprint.desktop                      |    4 
 korganizer/plugins/printing/list/listprint.desktop                            |    4 
 korganizer/plugins/printing/whatsnext/whatsnextprint.desktop                  |    6 
 korganizer/plugins/projectview/projectview.desktop                            |    2 
 korganizer/plugins/timespanview/timespanview.desktop                          |    4 
 korn/KOrn.desktop                                                             |    1 
 korn/main.cpp                                                                 |    2 
 korn/subjectsdlg.cpp                                                          |   12 
 kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop                    |    2 
 kpilot/conduits/docconduit/doc_conduit.desktop                                |    2 
 kpilot/conduits/docconduit/kpalmdoc.desktop                                   |    1 
 kpilot/conduits/knotes/knotes-conduit.desktop                                 |    1 
 kpilot/conduits/malconduit/mal_conduit.desktop                                |    2 
 kpilot/conduits/memofileconduit/memofile-conduit.desktop                      |    4 
 kpilot/conduits/notepadconduit/notepad-conduit.desktop                        |    2 
 kpilot/conduits/null/null-conduit.desktop                                     |    1 
 kpilot/conduits/perlconduit/perl-conduit.desktop                              |    4 
 kpilot/conduits/popmail/popmail-conduit.desktop                               |    3 
 kpilot/conduits/pythonconduit/python-conduit.desktop                          |    4 
 kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop                        |    4 
 kpilot/conduits/timeconduit/time_conduit.desktop                              |    2 
 kpilot/conduits/vcalconduit/todo-conduit.desktop                              |    3 
 kpilot/conduits/vcalconduit/vcal-conduit.desktop                              |    6 
 kpilot/kpilot/kpilot_config.desktop                                           |    3 
 kresources/birthdays/kabc.desktop                                             |    1 
 kresources/blogging/blogging.desktop                                          |    2 
 kresources/egroupware/debugdialog.cpp                                         |    4 
 kresources/egroupware/kabc_xmlrpc.desktop                                     |    2 
 kresources/egroupware/kcal_resourcexmlrpc.cpp                                 |    2 
 kresources/egroupware/kcal_xmlrpc.desktop                                     |    2 
 kresources/egroupware/knotes_xmlrpc.desktop                                   |    2 
 kresources/exchange/exchange.desktop                                          |    2 
 kresources/exchange/exchange_deprecated.desktop                               |    2 
 kresources/featureplan/kcal_resourcefeatureplan.desktop                       |    2 
 kresources/groupdav/kabc_groupdav.desktop                                     |    2 
 kresources/groupdav/kcal_groupdav.desktop                                     |    2 
 kresources/groupware/kabc_groupware.desktop                                   |    1 
 kresources/groupware/kcal_groupware.desktop                                   |    1 
 kresources/groupwise/kabc_groupwise.desktop                                   |    1 
 kresources/groupwise/kcal_groupwise.desktop                                   |    1 
 kresources/groupwise/soap/Makefile.am                                         |    2 
 kresources/groupwise/soap/incidenceconverter.cpp                              |    1 
 kresources/groupwise/soap/stdsoap2.cpp                                        |  174 
 kresources/groupwise/soap/stdsoap2.h                                          |   18 
 kresources/kolab/kabc/kolab.desktop                                           |    2 
 kresources/kolab/kcal/kolab.desktop                                           |    2 
 kresources/kolab/knotes/kolabresource.desktop                                 |    2 
 kresources/newexchange/kabc_newexchange.desktop                               |    2 
 kresources/newexchange/kabc_newexchange_final.desktop                         |    2 
 kresources/newexchange/kcal_newexchange.desktop                               |    2 
 kresources/newexchange/kcal_newexchange_final.desktop                         |    2 
 kresources/remote/remote.desktop                                              |    1 
 kresources/slox/kabc_ox.desktop                                               |    1 
 kresources/slox/kabc_slox.desktop                                             |    1 
 kresources/slox/kcal_ox.desktop                                               |    1 
 kresources/slox/kcal_slox.desktop                                             |    1 
 kresources/tvanytime/kcal_tvanytime.desktop                                   |    2 
 ktnef/gui/ktnef.desktop                                                       |    3 
 ktnef/gui/ms-tnef.desktop                                                     |    1 
 libkcal/htmlexport.cpp                                                        |    6 
 libkcal/kcal_manager.desktop                                                  |    3 
 libkcal/local.desktop                                                         |    1 
 libkcal/localdir.desktop                                                      |    1 
 libkdenetwork/gpgmepp/key.cpp                                                 |   11 
 libkdenetwork/gpgmepp/key.h                                                   |    4 
 libkdepim/addresseelineedit.cpp                                               |    2 
 libkdepim/komposer/core/komposereditor.desktop                                |    1 
 libkdepim/komposer/core/komposerplugin.desktop                                |    1 
 libkdepim/komposer/plugins/default/defaulteditor.desktop                      |    4 
 libkdepim/kxface.cpp                                                          |    5 
 libkdepim/kxface.h                                                            |    2 
 libkholidays/Makefile.am                                                      |    2 
 libkholidays/holidays/holiday_au                                              |    2 
 libkholidays/holidays/holiday_se                                              |    1 
 libkholidays/kholidays.cpp                                                    |   44 
 libkholidays/kholidays.h                                                      |   16 
 libkholidays/parseholiday.c                                                   | 1942 ++++------
 libkholidays/parseholiday.h                                                   |   57 
 libkholidays/parseholiday.y                                                   |  271 -
 libkholidays/scanholiday.c                                                    | 1834 +++++----
 libkholidays/scanholiday.lex                                                  |    3 
 libkpgp/kpgp.cpp                                                              |    2 
 libkpgp/kpgpbase.cpp                                                          |    3 
 libkpgp/kpgpbase2.cpp                                                         |    2 
 libkpgp/kpgpbase5.cpp                                                         |    2 
 libkpgp/kpgpbase6.cpp                                                         |    2 
 mimelib/dwstring.cpp                                                          |    1 
 networkstatus/networkstatus.desktop                                           |    6 
 plugins/kmail/bodypartformatter/text_calendar.desktop                         |    1 
 plugins/kmail/bodypartformatter/text_vcard.desktop                            |    1 
 plugins/kmail/bodypartformatter/text_xdiff.desktop                            |    2 
 wizards/groupwarewizard.desktop                                               |    2 
 330 files changed, 4986 insertions(+), 2720 deletions(-)

--- NEW FILE kdepim-3.5.3-3.5.4.patch ---
Index: akregator/ChangeLog
===================================================================
--- akregator/ChangeLog	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/ChangeLog	(.../3.5.4/kdepim)	(Revision 565765)
@@ -2,6 +2,17 @@
 ===================
 (c) 2004-2006 the Akregator authors.
 
+Changes after 1.2.3:
+-----------------------------
+
+Bug fixes:
+
+ 2006/07/07 Remove tray icon when disabling Akregator part in Kontact (#130127) -fo
+ 2006/07/07 Fix a crash on shutdown occurring in ProgressManager (#130377) -fo
+ 2006/06/25 Fix context menus in browser tab, show appriopriate entries when
+            text is selected (copy action) or the cursor is over a link 
+            (#121957) -fo
+ 
 Changes after 1.2.2:
 -----------------------------
 
Index: akregator/src/progressmanager.cpp
===================================================================
--- akregator/src/progressmanager.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/progressmanager.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -80,8 +80,8 @@
             delete *it;
         d->handlers.clear();
         
-        disconnect(feedList, SIGNAL(signalNodeAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*)));
-        disconnect(feedList, SIGNAL(signalNodeRemoved(TreeNode*)), this, SLOT(slotNodeRemoved(TreeNode*)));
+        disconnect(d->feedList, SIGNAL(signalNodeAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*)));
+        disconnect(d->feedList, SIGNAL(signalNodeRemoved(TreeNode*)), this, SLOT(slotNodeRemoved(TreeNode*)));
     }
 
     d->feedList = feedList;
@@ -91,7 +91,7 @@
         QValueList<TreeNode*> list = feedList->asFlatList();
     
         for (QValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it)
-        slotNodeAdded(*it);
+            slotNodeAdded(*it);
         connect(feedList, SIGNAL(signalNodeAdded(TreeNode*)), this, SLOT(slotNodeAdded(TreeNode*)));
         connect(feedList, SIGNAL(signalNodeRemoved(TreeNode*)), this, SLOT(slotNodeRemoved(TreeNode*)));
     }
Index: akregator/src/librss/tools_p.cpp
===================================================================
--- akregator/src/librss/tools_p.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/librss/tools_p.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -230,8 +230,6 @@
     
     if (name.isNull())
         name = email;
-            
-    QString author;
     
     if (!email.isNull())
         return QString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
Index: akregator/src/mk4storage/metakit/include/mk4.h
===================================================================
--- akregator/src/mk4storage/metakit/include/mk4.h	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/mk4storage/metakit/include/mk4.h	(.../3.5.4/kdepim)	(Revision 565765)
@@ -100,7 +100,7 @@
 
     // and here's the other end of the scale...
 #if !defined (_WIN32) && !defined (q4_LONG64)
-#if defined (_PA_RISC2_0) || defined (__powerpc64__) || defined(__sparcv9) || \
+#if (defined (_PA_RISC2_0) && defined(__hpux)) || defined (__powerpc64__) || defined(__sparcv9) || \
     defined (__x86_64__) || defined (__s390x__) || defined (__alpha) || \
     (defined (__ia64) && (!defined (__HP_aCC) || defined(__LP64__)))
 #define q4_LONG64 1
Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
===================================================================
--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -32,6 +32,7 @@
 Name[sv]=Metakit lagringsgr??nssnitt
 Name[uk]=???????????????? ???????????????????? Metakit
 Name[zh_CN]=Metakit ????????????
+Name[zh_TW]=Metakit ??????????????????
 X-KDE-Library=libakregator_mk4storage_plugin
 Comment=Plugin for Akregator
 Comment[bg]=?????????????????? ???? Akregator
@@ -62,6 +63,7 @@
 Comment[pt]='Plugin' para o Akregator
 Comment[pt_BR]=Plugin para o Akregator
 Comment[ru]=???????????? ?????? Akregator
+Comment[sk]=Modul pre Akregator
 Comment[sl]=Vstavek za Akregator
 Comment[sr]=?????????????????? ???? Akregator
 Comment[sr at Latn]=Priklju??ak za Akregator
@@ -70,6 +72,7 @@
 Comment[uk]=???????????? ?????? Akregator
 Comment[uz]=Akregator ???????? ????????????
 Comment[zh_CN]=Akregator ??????
+Comment[zh_TW]=Akregator ????????????
 ServiceTypes=Akregator/Plugin
 
 X-KDE-akregator-plugintype=storage
Index: akregator/src/akregator_part.cpp
===================================================================
--- akregator/src/akregator_part.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/akregator_part.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -263,6 +263,8 @@
     saveTagSet(m_tagSetPath);
     m_view->slotOnShutdown();
     //delete m_view;
+    delete TrayIcon::getInstance();
+    TrayIcon::setInstance(0L);
     delete m_storage;
     m_storage = 0;
     //delete m_actionManager;
Index: akregator/src/pageviewer.cpp
===================================================================
--- akregator/src/pageviewer.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/pageviewer.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -411,9 +411,12 @@
 {
     m_url = kurl;
     QString url = kurl.url(); // maximal url confusion
-
-    const bool isLink = (kpf & KParts::BrowserExtension::ShowNavigationItems) == 0;
-
+    
+    const bool showReload = (kpf & KParts::BrowserExtension::ShowReload) != 0;
+    const bool showNavigationItems = (kpf & KParts::BrowserExtension::ShowNavigationItems) != 0;
+    const bool isLink = (kpf & (KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowTextSelectionItems)) == 0;
+    const bool isSelection = (kpf & KParts::BrowserExtension::ShowTextSelectionItems) != 0;
+        
     KPopupMenu popup(this->widget());
 
     int idNewWindow = -2;
@@ -434,15 +437,24 @@
     }
     else // we are not on a link
     {
+        if (showNavigationItems)
+        {
+            d->backAction->plug( &popup );
+            d->forwardAction->plug( &popup );
+        }
 
-        d->backAction->plug( &popup );
-        d->forwardAction->plug( &popup );
-        d->reloadAction->plug(&popup);
+        if (showReload)
+            d->reloadAction->plug(&popup);
+        
         d->stopAction->plug(&popup);
-
+        
         popup.insertSeparator();
-        action("viewer_copy")->plug(&popup);
-        popup.insertSeparator();
+        
+        if (isSelection)
+        {
+            action("viewer_copy")->plug(&popup);
+            popup.insertSeparator();
+        }
 
         KAction* incFontAction = this->action("incFontSizes");
         KAction* decFontAction = this->action("decFontSizes");
Index: akregator/src/viewer.cpp
===================================================================
--- akregator/src/viewer.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/viewer.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -170,7 +170,7 @@
 
 void Viewer::slotPopupMenu(KXMLGUIClient*, const QPoint& p, const KURL& kurl, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags kpf, mode_t)
 {
-   const bool isLink = (kpf & KParts::BrowserExtension::ShowNavigationItems) == 0;
+   const bool isLink = (kpf & (KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowTextSelectionItems)) == 0;
    const bool isSelection = (kpf & KParts::BrowserExtension::ShowTextSelectionItems) != 0;
     
    QString url = kurl.url();
Index: akregator/src/aboutdata.h
===================================================================
--- akregator/src/aboutdata.h	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/aboutdata.h	(.../3.5.4/kdepim)	(Revision 565765)
@@ -28,7 +28,7 @@
 #include <kaboutdata.h>
 #include <kdepimmacros.h>
 
-#define AKREGATOR_VERSION "1.2.3"
+#define AKREGATOR_VERSION "1.2.4"
 
 namespace Akregator {
 /**
Index: akregator/src/akregator_plugin.desktop
===================================================================
--- akregator/src/akregator_plugin.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ akregator/src/akregator_plugin.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -30,6 +30,7 @@
 Comment[pt]='Plugin' para o Akregator
 Comment[pt_BR]=Plugin para o Akregator
 Comment[ru]=???????????? ?????? Akregator
+Comment[sk]=Modul pre Akregator
[...16973 lines suppressed...]
--- korganizer/koagendaview.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/koagendaview.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -775,15 +775,14 @@
     dayLayout->addWidget(dayLabel);
 
     // if a holiday region is selected, show the holiday name
-    if ( KOGlobals::self()->holidays() ) {
-      QString text = KOGlobals::self()->holidays()->shortText( date );
-      if ( !text.isEmpty() ) {
-        // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
-        KOAlternateLabel*label = new KOAlternateLabel( text, text, QString::null, mDayLabels );
-        label->setMinimumWidth(1);
-        label->setAlignment(AlignCenter);
-        dayLayout->addWidget(label);
-      }
+    QStringList texts = KOGlobals::self()->holiday( date );
+    QStringList::ConstIterator textit = texts.begin();
+    for ( ; textit != texts.end(); ++textit ) {
+      // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
+      KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), QString::null, mDayLabels );
+      label->setMinimumWidth(1);
+      label->setAlignment(AlignCenter);
+      dayLayout->addWidget(label);
     }
 
 #ifndef KORG_NOPLUGINS
Index: korganizer/korganizer_configgroupautomation.desktop
===================================================================
--- korganizer/korganizer_configgroupautomation.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/korganizer_configgroupautomation.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -55,6 +55,7 @@
 Name[tr]=Grup Otomasyonu
 Name[uk]=?????????????????????????? ????????
 Name[zh_CN]=????????????
+Name[zh_TW]=???????????????
 Comment=KOrganizer Group Automation Configuration
 Comment[bg]=?????????????????? ???? ?????????????????????? ???? KOrganizer
 Comment[bs]=KOrganizer pode??avanje automatizacije grupe
@@ -97,6 +98,7 @@
 Comment[tr]=KOrganizer Grup Otomasyon Yap??land??rmas??
 Comment[uk]=???????????????????????? ?????????????????????????? ???????? ?? KOrganizer
 Comment[zh_CN]=KOrganizer ??????????????????
+Comment[zh_TW]=KOrganizer ?????????????????????
 Keywords=korganizer,group,automation
 Keywords[bg]=??????????????????????, ??????????????????????, ??????????????????, korganizer, group, automation
 Keywords[bs]=korganizer,group,automation,automatizacija,grupa,grupe
Index: korganizer/korganizer_configviews.desktop
===================================================================
--- korganizer/korganizer_configviews.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/korganizer_configviews.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -31,6 +31,7 @@
 Name[fr]=Vues
 Name[ga]=Amhairc
 Name[gl]=Vistas
+Name[he]=????????????
 Name[hi]=???????????????
 Name[hu]=N??zetek
 Name[is]=S??n
@@ -60,6 +61,7 @@
 Name[uk]=??????????????????
 Name[uz]=????????????????????
 Name[zh_CN]=??????
+Name[zh_TW]=??????
 Comment=KOrganizer View Configuration
 Comment[be]=???????????????????????? ?????????????? "K ????????????????????????"
 Comment[bg]=?????????????????? ???? ?????????????? ???? KOrganizer
@@ -102,6 +104,7 @@
 Comment[tr]=KOrganizer G??r??n??m Yap??land??rmas??
 Comment[uk]=???????????????????????? ???????????????????? ?? KOrganizer
 Comment[zh_CN]=KOrganizer ????????????
+Comment[zh_TW]=KOrganizer ????????????
 Keywords=korganizer,view
 Keywords[be]=K ??????????????????????,????????????,korganizer,view
 Keywords[bg]=??????????????????????, ????????????, ??????????????, ??????????????????, korganizer, view
Index: korganizer/korganizer-import.desktop
===================================================================
--- korganizer/korganizer-import.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/korganizer-import.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -23,6 +23,7 @@
 Name[fi]=Tuo kalenteri
 Name[fr]=Importer un calendrier
 Name[ga]=Iomp??rt??il F??ilire
+Name[he]=?????????? ?????? ??????
 Name[hu]=Napt??r import??l??sa
 Name[is]=Flytja inn dagatal
 Name[it]=Importa calendario
@@ -38,6 +39,7 @@
 Name[pt]=Importar Calend??rio
 Name[pt_BR]=Importar Calend??rio
 Name[ru]=???????????? ??????????????????
+Name[sk]=Import kalend??ra
 Name[sl]=Uvozi koledar
 Name[sr]=?????????? ????????????????
 Name[sr at Latn]=Uvezi kalendar
@@ -46,6 +48,7 @@
 Name[tr]=Takvim Aktar
 Name[uk]=???????????? ??????????????????
 Name[zh_CN]=????????????
+Name[zh_TW]=???????????????
 ServiceTypes=Browser/View,DCOP/Organizer
 X-KDE-Library=libkorganizerpart
 X-KDE-StartupNotify=true
Index: korganizer/koeditoralarms.cpp
===================================================================
--- korganizer/koeditoralarms.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/koeditoralarms.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -137,7 +137,7 @@
 
 KOEditorAlarms::KOEditorAlarms( KCal::Alarm::List *alarms, QWidget *parent,
                                 const char *name )
-  : KDialogBase( parent, name, true, i18n("Edit Reminders"), Ok | Apply | Cancel ), mAlarms( alarms )
+  : KDialogBase( parent, name, true, i18n("Edit Reminders"), Ok | Apply | Cancel ), mAlarms( alarms ),mCurrentItem(0L)
 {
   setMainWidget( mWidget = new KOEditorAlarms_base( this ) );
   mWidget->mAlarmList->setColumnWidthMode( 0, QListView::Maximum );
Index: korganizer/korganizer_configmain.desktop
===================================================================
--- korganizer/korganizer_configmain.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ korganizer/korganizer_configmain.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -29,6 +29,7 @@
 Name[fr]=Personnel
 Name[ga]=Pearsanta
 Name[gl]=Persoal
+Name[he]=????????
 Name[hi]=????????????
 Name[hu]=Alapbe??ll??t??sok
 Name[is]=Pers??nulegt
@@ -57,6 +58,7 @@
 Name[uk]=????????????????
 Name[uz]=????????????
 Name[zh_CN]=??????
+Name[zh_TW]=?????? 
 Comment=KOrganizer Main Configuration
 Comment[bg]=???????????? ?????????????????? ???? KOrganizer
 Comment[br]=Kefluniadur kenta?? KOrganizer
@@ -74,6 +76,7 @@
 Comment[fr]=Configuration principale de KOrganizer
 Comment[ga]=Pr??omhchumra??ocht KOrganizer
 Comment[gl]=Configuraci??n Principal de KOrganizer
+Comment[he]=?????????? ?????????? ???? ????????????????
 Comment[hi]=??????-????????????????????????????????? ??????????????? ????????????????????????????????????
 Comment[hu]=A KOrganizer alapbe??ll??t??sai
 Comment[is]=A??alstillingar KOrganizer
@@ -101,6 +104,7 @@
 Comment[tr]=KOrganizer Temel Yap??land??rmas??
 Comment[uk]=???????????????????????? ?????????????????? ?????????? ?? KOrganizer
 Comment[zh_CN]=KOrganizer ????????????
+Comment[zh_TW]=KOrganizer ?????????
 Keywords=korganizer,main,personal
 Keywords[bg]=??????????????????????, ????????????, ????????????????????, ??????????????????, korganizer, main, personal
 Keywords[bs]=korganizer,main,personal,li??no
@@ -116,6 +120,7 @@
 Keywords[fi]=korganizer,p????,henkil??kohtainen
 Keywords[fr]=KOrganizer,principal,personnel
 Keywords[gl]=korganizer,principal,persoal
+Keywords[he]=korganizer,main,personal,??????????????,??????????,??????????,????????????
 Keywords[hi]=??????-?????????????????????????????????,???????????????,????????????
 Keywords[hu]=korganizer,alapbe??ll??t??sok,szem??lyes
 Keywords[is]=korganizer,a??al,pers??nulegt
Index: konsolekalendar/konsolekalendar.desktop
===================================================================
--- konsolekalendar/konsolekalendar.desktop	(.../3.5.3/kdepim)	(Revision 565765)
+++ konsolekalendar/konsolekalendar.desktop	(.../3.5.4/kdepim)	(Revision 565765)
@@ -5,7 +5,7 @@
 Name[de]=Konsolen-Kalender
 Name[hi]=???????????????-?????????????????????
 Name[hu]=Konsole-napt??r
-Name[ja]=???????????????????????????
+Name[ja]=??????????????????????????????
 Name[ms]=Kalendar Konsole
 Name[nb]=KonsoleKalender
 Name[nds]=Konsole-Kalenner
Index: konsolekalendar/main.cpp
===================================================================
--- konsolekalendar/main.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ konsolekalendar/main.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -681,9 +681,8 @@
                 << endl;
 
       if ( remote ) {
-        //TODO: uncomment after 3.5 string freeze
-        //cout << i18n( "Attempting to create a remote file %1" ).
-        // arg( variables.getCalendarFile() ).local8Bit() << endl;
+        cout << i18n( "Attempting to create a remote file %1" ).
+          arg( variables.getCalendarFile() ).local8Bit() << endl;
         return 1;
       } else {
         if ( exists ) {
Index: mimelib/dwstring.cpp
===================================================================
--- mimelib/dwstring.cpp	(.../3.5.3/kdepim)	(Revision 565765)
+++ mimelib/dwstring.cpp	(.../3.5.4/kdepim)	(Revision 565765)
@@ -227,6 +227,7 @@
     static int pagesize = -1;
     if (pagesize < 0)
 	pagesize = getpagesize();
+    assert(pagesize != 0);
     int tell = ftell(aFile);
     mPageMod = tell % pagesize;
     mSize = aSize;


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kdepim.spec	20 Jul 2006 10:49:16 -0000	1.95
+++ kdepim.spec	24 Jul 2006 12:14:34 -0000	1.96
@@ -10,8 +10,8 @@
 
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.3
-Release: 8%{?dist}
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Epoch: 6
@@ -20,11 +20,12 @@
 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
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
 Source1: cr48-app-kandy.png
 Source2: cr32-app-kandy.png
 Source3: cr16-app-kandy.png
 
+Patch0: kdepim-3.5.3-3.5.4.patch 
 Patch1: kde-libtool.patch
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
@@ -79,7 +80,8 @@
 Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %prep
-%setup -q
+%setup -q -n %{name}-3.5.3
+%patch0 -p0
 %patch1 -p1 -b .libtool
 
 %ifarch s390 s390x
@@ -92,12 +94,12 @@
 %patch5 -p1 -b .gcc-4.1.1-8
 
 # upstream patches
-%patch100 -p1 -b .korganizer-kogroupware
-%patch101 -p1 -b .kmail-typo
-%patch102 -p1 -b .kmail-encryption
-%patch103 -p1 -b .kmail-127538.patch
-%patch104 -p0 -b .kde#118112
-%patch105 -p0 -b .kde#192416
+#%patch100 -p1 -b .korganizer-kogroupware
+#%patch101 -p1 -b .kmail-typo
+#%patch102 -p1 -b .kmail-encryption
+#%patch103 -p1 -b .kmail-127538.patch
+#%patch104 -p0 -b .kde#118112
+#%patch105 -p0 -b .kde#192416
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -195,6 +197,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Thu Jul 20 2006 Than Ngo <than at redhat.com> 6:3.5.3-8
 - apply upstream pacthes,
   fix crash on logout when only a message pane is shown kde#192416



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:18:44 -0400
Subject: rpms/logrotate/devel logrotate.spec,1.48,1.49 sources,1.20,1.21
Message-ID: <200607241218.k6OCIiYr026044@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25968

Modified Files:
	logrotate.spec sources 
Log Message:
- make error message, about ignoring certain config files,
  a debug message instead (#196052)




Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- logrotate.spec	12 Jul 2006 07:14:36 -0000	1.48
+++ logrotate.spec	24 Jul 2006 12:18:42 -0000	1.49
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.4
-Release: 3.1
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,10 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Mon Jul 24 2006 Peter Vrabec <pvrabec at redhat.com> 3.7.4-4
+- make error message, about ignoring certain config files,
+  a debug message instead (#196052)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	13 Jun 2006 12:56:30 -0000	1.20
+++ sources	24 Jul 2006 12:18:42 -0000	1.21
@@ -1 +1 @@
-0d8d8b9df8fd9ddcd0c1692186474779  logrotate-3.7.4.tar.gz
+dcf518fe08ae3825e00b38b909d152d9  logrotate-3.7.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:20:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:20:00 -0400
Subject: rpms/system-config-soundcard/devel system-config-soundcard.spec,
	1.44, 1.45
Message-ID: <200607241220.k6OCK0q9026606@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26574

Modified Files:
	system-config-soundcard.spec 
Log Message:
removed %preun part, it was redundant (#199691, #199838)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- system-config-soundcard.spec	21 Jul 2006 08:49:48 -0000	1.44
+++ system-config-soundcard.spec	24 Jul 2006 12:19:58 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.1
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -60,11 +60,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%preun
-if [ -d /usr/share/system-config-soundcard ] ; then
-  rm -rf /usr/share/system-config-soundcard/*.pyc
-fi
-
 %postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -86,6 +81,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Mon Jul 24 2006 Martin Stransky <stransky at redhat.com> 2.0.1-2
+- removed %preun part, it was redundant (#199691, #199838)
+
 * Fri Jul 21 2006 Martin Stransky <stransky at redhat.com> 2.0.1-1
 - removed ainit parts, sync. with upstream
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:45:05 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia-3.5.3-3.5.4.patch, NONE,
	1.1 kdemultimedia.spec, 1.72, 1.73
Message-ID: <200607241245.k6OCj551002093@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2033

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)


kdemultimedia-3.5.3-3.5.4.patch:
 akode_artsplugin/Makefile.am                                     |    4 +-
 akode_artsplugin/akodePlayObject_impl.cpp                        |    9 +++---
 arts/tools/artscontrolapplet.desktop                             |    4 ++
 audiofile_artsplugin/Makefile.am                                 |   12 ++++----
 audiofile_artsplugin/audiofilePlayObject.mcopclass               |    2 -
 juk/juk.desktop                                                  |    1 
 juk/jukservicemenu.desktop                                       |    1 
 kappfinder-data/ams.desktop                                      |    1 
 kappfinder-data/ardour.desktop                                   |    1 
 kappfinder-data/djplay.desktop                                   |    1 
 kappfinder-data/freebirth.desktop                                |    1 
 kappfinder-data/galan.desktop                                    |    1 
 kappfinder-data/hydrogen.desktop                                 |    1 
 kappfinder-data/jamin.desktop                                    |    1 
 kappfinder-data/kde-multimedia-music.directory                   |    3 ++
 kappfinder-data/meterbridge.desktop                              |    1 
 kappfinder-data/mixxx.desktop                                    |    1 
 kappfinder-data/muse.desktop                                     |    1 
 kappfinder-data/qjackctl.desktop                                 |    1 
 kappfinder-data/qsynth.desktop                                   |    1 
 kappfinder-data/rezound.desktop                                  |    1 
 kappfinder-data/vkeybd.desktop                                   |    1 
 kappfinder-data/zynaddsubfx.desktop                              |    1 
 kaudiocreator/audiocd_extract.desktop                            |    3 ++
 kaudiocreator/eventsrc                                           |   14 ++++++++++
 kaudiocreator/kaudiocreator.desktop                              |    1 
 kaudiocreator/ripper.cpp                                         |   10 +++----
 kdemultimedia.lsm                                                |    4 +-
 kfile-plugins/au/kfile_au.desktop                                |    2 -
 kfile-plugins/avi/kfile_avi.desktop                              |    2 -
 kfile-plugins/flac/kfile_flac.desktop                            |    3 +-
 kfile-plugins/m3u/kfile_m3u.desktop                              |    2 -
 kfile-plugins/mp3/kfile_mp3.desktop                              |    2 -
 kfile-plugins/mpc/kfile_mpc.desktop                              |    3 +-
 kfile-plugins/mpeg/kfile_mpeg.desktop                            |    2 +
 kfile-plugins/ogg/kfile_ogg.desktop                              |    2 -
 kfile-plugins/sid/kfile_sid.desktop                              |    3 +-
 kfile-plugins/theora/kfile_theora.desktop                        |    2 +
 kfile-plugins/wav/kfile_wav.desktop                              |    2 -
 kioslave/audiocd/audiocd.cpp                                     |    8 +++++
 kioslave/audiocd/kcmaudiocd/audiocd.desktop                      |    4 +-
 kmid/kmid.desktop                                                |    3 --
 kmid/x-karaoke.desktop                                           |    1 
 kmix/kmixapplet.desktop                                          |    4 ++
 kmix/kmixprefdlg.cpp                                             |    4 +-
 kmix/restore_kmix_volumes.desktop                                |    1 
 krec/kcm_krec.desktop                                            |    2 +
 krec/kcm_krec_files.desktop                                      |    2 +
 krec/krec_exportitem.desktop                                     |    1 
 krec/krec_exportwave.desktop                                     |    1 
 krec/mp3_export/krec_exportmp3.desktop                           |    1 
 krec/ogg_export/krec_exportogg.desktop                           |    1 
 kscd/audiocd_play.desktop                                        |    1 
 kscd/cddaslave.c                                                 |    3 ++
 kscd/libwm/cddaslave.c                                           |    3 ++
 libkcddb/kcmcddb/cddbconfigwidget.cpp                            |    2 -
 libkcddb/kcmcddb/libkcddb.desktop                                |    3 ++
 noatun/modules/htmlexport/htmlexport.plugin                      |    1 
 noatun/modules/infrared/infrared.plugin                          |    1 
 noatun/modules/keyz/keyz.plugin                                  |    1 
 noatun/modules/kjofol-skin/kjofolui.plugin                       |    1 
 noatun/modules/splitplaylist/splitplaylist.plugin                |    1 
 noatun/modules/voiceprint/voiceprint.plugin                      |    1 
 noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop |    1 
 noatun/modules/winskin/winskin.plugin                            |    1 
 xine_artsplugin/Makefile.am                                      |    2 -
 66 files changed, 125 insertions(+), 38 deletions(-)

--- NEW FILE kdemultimedia-3.5.3-3.5.4.patch ---
Index: kmid/kmid.desktop
===================================================================
--- kmid/kmid.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kmid/kmid.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -8,7 +8,6 @@
 Name[sv]=Kmid
 Name[th]=??????????????? - K
 Name[zh_HK]=KMidi
-Name[zh_TW]=KMidi
 Name[zu]=KMidi
 MimeType=audio/x-karaoke;audio/x-midi;audio/midi
 GenericName=Midi/Karaoke Player
@@ -66,7 +65,7 @@
 GenericName[xh]=Umdlali we Midi/Karaoke
 GenericName[zh_CN]=Midi/?????? OK ?????????
 GenericName[zh_HK]=Midi/??????OK ?????????
-GenericName[zh_TW]=Midi/Karaoke ?????????
+GenericName[zh_TW]=Midi/??????OK?????????
 GenericName[zu]=Umdlali weMidi/Karaoke
 Exec=kmid %u
 Icon=kmid
Index: kmid/x-karaoke.desktop
===================================================================
--- kmid/x-karaoke.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kmid/x-karaoke.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -50,3 +50,4 @@
 Comment[uz]=?????????????? ??????????
 Comment[zh_CN]=?????? OK ??????
 Comment[zh_HK]=??????OK ??????
+Comment[zh_TW]=??????OK??????
Index: krec/krec_exportwave.desktop
===================================================================
--- krec/krec_exportwave.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/krec_exportwave.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -44,6 +44,7 @@
 Name[uz]=Wave ??????????????
 Name[zh_CN]=??????-??????
 Name[zh_HK]=Wave-??????
+Name[zh_TW]=Wave ??????
 X-KDE-Library=libkrecexport_wave
 ServiceTypes=KRec/exportplugin
 X-KDE-ExportSuffix=wav,WAV
Index: krec/kcm_krec.desktop
===================================================================
--- krec/kcm_krec.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/kcm_krec.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -45,6 +45,7 @@
 Name[uz]=????????????
 Name[zh_CN]=??????
 Name[zh_HK]=??????
+Name[zh_TW]=??????
 Comment=Global Configuration
 Comment[bg]=???????? ??????????????????
 Comment[bn]=????????????????????? ??????????????????????????????
@@ -88,4 +89,5 @@
 Comment[uk]=?????????????????? ????????????????????????
 Comment[zh_CN]=????????????
 Comment[zh_HK]=????????????
+Comment[zh_TW]=????????????
 
Index: krec/kcm_krec_files.desktop
===================================================================
--- krec/kcm_krec_files.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/kcm_krec_files.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -59,6 +59,7 @@
 Name[wa]=Noveas fitch??s
 Name[zh_CN]=????????????
 Name[zh_HK]=?????????
+Name[zh_TW]=?????????
 Comment=Default Properties for New Files
 Comment[bg]=?????????????????? ???? ?????????????????? ???? ???????? ??????????????
 Comment[bs]=Podrazumijevane postavke za nove datoteke
@@ -103,4 +104,5 @@
 Comment[uz]=???????? ?????????????????????? ???????????? ??????????????????
 Comment[zh_CN]=????????????????????????
 Comment[zh_HK]=?????????????????????
+Comment[zh_TW]=????????????????????????
 
Index: krec/krec_exportitem.desktop
===================================================================
--- krec/krec_exportitem.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/krec_exportitem.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -46,6 +46,7 @@
 Comment[uz]=KRec ???????? ?????????????? ??????????????
 Comment[zh_CN]=KRec ????????????
 Comment[zh_HK]=?????? KRec ??? ????????????
+Comment[zh_TW]=KRec ????????????
 
 [PropertyDef::X-KDE-ExportSuffix]
 Type=QStringList
Index: krec/ogg_export/krec_exportogg.desktop
===================================================================
--- krec/ogg_export/krec_exportogg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/ogg_export/krec_exportogg.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -46,6 +46,7 @@
 Name[uz]=OGG ??????????????
 Name[zh_CN]=OGG ??????
 Name[zh_HK]=OGG-??????
+Name[zh_TW]=OGG ??????
 X-KDE-Library=libkrecexport_ogg
 ServiceTypes=KRec/exportplugin
 X-KDE-ExportSuffix=ogg,OGG
Index: krec/mp3_export/krec_exportmp3.desktop
===================================================================
--- krec/mp3_export/krec_exportmp3.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ krec/mp3_export/krec_exportmp3.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -46,6 +46,7 @@
 Name[uz]=MP3 ??????????????
 Name[zh_CN]=MP3-??????
 Name[zh_HK]=MP3-??????
+Name[zh_TW]=MP3 ??????
 X-KDE-Library=libkrecexport_mp3
 ServiceTypes=KRec/exportplugin
 X-KDE-ExportSuffix=mp3,MP3
Index: kscd/audiocd_play.desktop
===================================================================
--- kscd/audiocd_play.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kscd/audiocd_play.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -40,5 +40,6 @@
 Name[uk]=????????
 Name[zh_CN]=??????
 Name[zh_HK]=??????
+Name[zh_TW]=??????
 Exec=kscd -s -caption "%c" %i %m %u
 Icon=kscd
Index: kscd/cddaslave.c
===================================================================
--- kscd/cddaslave.c	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kscd/cddaslave.c	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -418,7 +418,10 @@
 	 * superuser access.
 	 */
 	nice(-14);
+	setgid(getgid());
 	setuid(getuid());
+	if (getuid() != geteuid())
+		return 255;
 
 	FD_ZERO(&dummyfd);
 	FD_ZERO(&readfd);
Index: kscd/libwm/cddaslave.c
===================================================================
--- kscd/libwm/cddaslave.c	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kscd/libwm/cddaslave.c	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -489,7 +489,10 @@
    * superuser access.
    */
   nice(-14);
+  setgid(getgid());
   setuid(getuid());
+  if (geteuid() != getuid())
+    return 255;
 
   FD_ZERO(&dummyfd);
   FD_ZERO(&readfd);
Index: juk/juk.desktop
===================================================================
--- juk/juk.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ juk/juk.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -57,5 +57,6 @@
 GenericName[uz]=???????????? ????????????
 GenericName[zh_CN]=???????????????
 GenericName[zh_HK]=???????????????
+GenericName[zh_TW]=???????????????
 MimeType=application/x-ogg;audio/mpeg;audio/mpegurl;audio/vorbis;audio/x-adpcm;audio/x-flac;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-musepack;audio/x-oggflac;audio/x-speex;audio/x-vorbis;audio/x-wav;
 Categories=Qt;KDE;AudioVideo;
Index: juk/jukservicemenu.desktop
===================================================================
--- juk/jukservicemenu.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ juk/jukservicemenu.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -48,5 +48,6 @@
 Name[uk]=???????????? ???? ???????????? JuK
 Name[uz]=JuK ?????????????????? ??????????
 Name[zh_CN]=????????? JuK ??????
+Name[zh_TW]=????????? JuK ????????????
 Icon=juk
 Exec=dcop juk Player openFile %u
Index: kappfinder-data/muse.desktop
===================================================================
--- kappfinder-data/muse.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/muse.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -45,5 +45,6 @@
 GenericName[uk]=?????????????????? ????????????
 GenericName[zh_CN]=???????????????
 GenericName[zh_HK]=???????????????
+GenericName[zh_TW]=?????????????????????
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/freebirth.desktop
===================================================================
--- kappfinder-data/freebirth.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/freebirth.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -46,6 +46,7 @@
 GenericName[uk]=????????????????
 GenericName[zh_CN]=??????
 GenericName[zh_HK]=?????????
+GenericName[zh_TW]=????????????
 StartupNotify=true
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/mixxx.desktop
===================================================================
--- kappfinder-data/mixxx.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/mixxx.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -46,6 +46,7 @@
 GenericName[uk]=???????????? ???? ?????????????????? DJ
 GenericName[zh_CN]=DJ-Mixer ????????????
 GenericName[zh_HK]=DJ-?????????????????????
+GenericName[zh_TW]=DJ ?????????????????????
 StartupNotify=true
 Type=Application
 Categories=Qt;Music;AudioVideo;
Index: kappfinder-data/hydrogen.desktop
===================================================================
--- kappfinder-data/hydrogen.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/hydrogen.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -49,6 +49,7 @@
 GenericName[uk]=????????????????
 GenericName[zh_CN]=??????
 GenericName[zh_HK]=?????????
+GenericName[zh_TW]=????????????
 StartupNotify=true
 Type=Application
 Categories=Qt;Music;AudioVideo;
Index: kappfinder-data/ams.desktop
===================================================================
--- kappfinder-data/ams.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/ams.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -42,6 +42,7 @@
 GenericName[uk]=?????????????????? ???????????????????? ALSA
 GenericName[zh_CN]=Alsa ??????????????????
 GenericName[zh_HK]=Alsa ??????????????????
+GenericName[zh_TW]=Alsa ???????????????
 StartupNotify=true
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/galan.desktop
===================================================================
--- kappfinder-data/galan.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/galan.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -42,6 +42,7 @@
 GenericName[uk]=?????????????????? ????????????????????
 GenericName[zh_CN]=????????????
 GenericName[zh_HK]=??????????????????
+GenericName[zh_TW]=???????????????
 StartupNotify=true
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/djplay.desktop
===================================================================
--- kappfinder-data/djplay.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/djplay.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -49,6 +49,7 @@
 GenericName[uk]=???????????? ???? ?????????????????? DJ
 GenericName[zh_CN]=DJ-Mixer ????????????
 GenericName[zh_HK]=DJ-?????????????????????
+GenericName[zh_TW]=DJ ?????????????????????
 StartupNotify=true
 Type=Application
 Categories=Qt;Music;AudioVideo;
Index: kappfinder-data/vkeybd.desktop
===================================================================
--- kappfinder-data/vkeybd.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/vkeybd.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -48,6 +48,7 @@
 GenericName[uk]=???????????????????? MIDI ????????????????????
 GenericName[zh_CN]=?????? MIDI ??????
 GenericName[zh_HK]=?????? MIDI ??????
+GenericName[zh_TW]=?????? MIDI ??????
 StartupNotify=false
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/qsynth.desktop
===================================================================
--- kappfinder-data/qsynth.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/qsynth.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -48,5 +48,6 @@
 GenericName[uk]=?????????????????? ?????? FluidSynth
 GenericName[zh_CN]=FluidSynth ?????????
 GenericName[zh_HK]=?????? FluidSynth ????????????
+GenericName[zh_TW]=FluidSynth ?????????
 Type=Application
 Categories=Qt;Music;AudioVideo;
Index: kappfinder-data/rezound.desktop
===================================================================
--- kappfinder-data/rezound.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/rezound.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -53,6 +53,7 @@
 GenericName[uz]=?????????? ????????????????
 GenericName[zh_CN]=???????????????
 GenericName[zh_HK]=???????????????
+GenericName[zh_TW]=???????????????
 StartupNotify=true
 Type=Application
 Categories=AudioVideo;AudioVideo;
Index: kappfinder-data/meterbridge.desktop
===================================================================
--- kappfinder-data/meterbridge.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/meterbridge.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -44,6 +44,7 @@
 GenericName[uk]=???????????????????????? VU-??????????????????
 GenericName[zh_CN]=????????? VU ?????????
 GenericName[zh_HK]=????????? VU-Meter
+GenericName[zh_TW]=????????? VU ??????
 Name=Meterbridge
 Name[bn]=???????????????-???????????????
 Name[nl]=Meterbrug
Index: kappfinder-data/ardour.desktop
===================================================================
--- kappfinder-data/ardour.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/ardour.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -44,6 +44,7 @@
 GenericName[uk]=?????????????????????? ?? ???????????????? ??????????????????
 GenericName[zh_CN]=????????????????????????
 GenericName[zh_HK]=???????????????????????????
+GenericName[zh_TW]=????????????????????????
 StartupNotify=true
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/qjackctl.desktop
===================================================================
--- kappfinder-data/qjackctl.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/qjackctl.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -47,5 +47,6 @@
 GenericName[uk]=?????????????????? ?????? Jack
 GenericName[zh_CN]=Jack ?????????
 GenericName[zh_HK]=?????? Jack ????????????
+GenericName[zh_TW]=Jack ?????????
 Type=Application
 Categories=Qt;Music;AudioVideo;
Index: kappfinder-data/jamin.desktop
===================================================================
--- kappfinder-data/jamin.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/jamin.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -33,6 +33,7 @@
 GenericName[pt]=Ferramenta de Masteriza????o do Jack
 GenericName[pt_BR]=Ferramenta de masteriza????o Jack 
 GenericName[ru]=?????????????? ???????????????????? Jack
+GenericName[sk]=Jack Mastering n??stroj
 GenericName[sl]=Orodje za Jack Mastering
 GenericName[sr]=Jack-???? ???????? ???? ??????????????????????
 GenericName[sr at Latn]=Jack-ov alat za masterovanje
Index: kappfinder-data/zynaddsubfx.desktop
===================================================================
--- kappfinder-data/zynaddsubfx.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/zynaddsubfx.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -40,6 +40,7 @@
 GenericName[uk]=???????????????????? ????????????????????
 GenericName[zh_CN]=?????????
 GenericName[zh_HK]=???????????????
+GenericName[zh_TW]=???????????????
 StartupNotify=false
 Type=Application
 Categories=Music;AudioVideo;
Index: kappfinder-data/kde-multimedia-music.directory
===================================================================
--- kappfinder-data/kde-multimedia-music.directory	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kappfinder-data/kde-multimedia-music.directory	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,6 +26,7 @@
 Name[pl]=Muzyka
 Name[pt]=M??sica
 Name[pt_BR]=M??sica
+Name[sk]=Hudba
 Name[sl]=Glasba
 Name[sr]=????????????
 Name[sr at Latn]=Muzika
@@ -62,6 +63,7 @@
 GenericName[pt]=??udio Profissional
 GenericName[pt_BR]=??udio Profissional
 GenericName[ru]=???????????????????????????????? ??????????
+GenericName[sk]=Profesion??lne audio
 GenericName[sl]=Profesionalni zvok
 GenericName[sr]=?????????????????????????? ????????
 GenericName[sr at Latn]=Profesionalni zvuk
@@ -69,5 +71,6 @@
 GenericName[uk]=???????????????????? ??????????
 GenericName[zh_CN]=????????????
 GenericName[zh_HK]=????????????
+GenericName[zh_TW]=????????????
 Icon=package
 
Index: akode_artsplugin/akodePlayObject_impl.cpp
===================================================================
--- akode_artsplugin/akodePlayObject_impl.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ akode_artsplugin/akodePlayObject_impl.cpp	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -82,6 +82,8 @@
 
 akodePlayObject_impl::~akodePlayObject_impl()
 {
+    delete m_packetQueue;
+
     unload();
 }
 
@@ -219,10 +221,9 @@
         delete bufferedDecoder;
         bufferedDecoder = 0;
     }
-#else
-    delete frameDecoder
+#endif
+    delete frameDecoder;
     frameDecoder = 0;
-#endif
     decoder = 0;
     if (buffer != inBuffer)
         delete inBuffer;
@@ -301,7 +302,7 @@
 {
     arts_debug("akode: readFrame");
 
-    if (!buffer || !decoder) return false;
+    if (!inBuffer || !decoder) return false;
     if (m_bytebuffer) processQueue();
     if(!decoder->readFrame(inBuffer)) {
         if (decoder->eof()) {
Index: akode_artsplugin/Makefile.am
===================================================================
--- akode_artsplugin/Makefile.am	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ akode_artsplugin/Makefile.am	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -8,8 +8,8 @@
         akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp \
         akodeFFMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \
         akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
-libarts_akode_la_LDFLAGS = -module $(KDE_PLUGIN)
-libarts_akode_la_LIBADD =  $(akode_libs) -lkmedia2_idl -lsoundserver_idl $(top_builddir)/arts/runtime/libartsbuilder.la
+libarts_akode_la_LDFLAGS = $(all_libraries) -module -no-undefined
+libarts_akode_la_LIBADD =  $(akode_libs) -lkmedia2_idl -lsoundserver_idl -lartsflow
 libarts_akode_la_METASOURCES = AUTO
 libarts_akode_la_COMPILE_FIRST = akodearts.h
 
Index: kaudiocreator/audiocd_extract.desktop
===================================================================
--- kaudiocreator/audiocd_extract.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kaudiocreator/audiocd_extract.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,11 +26,13 @@
 Name[lt]=Nuskaityti ir ??koduoti audio takelius
 Name[nb]=Pakk ut og dekod lydfiler
 Name[nl]=Audio-tracks rippen en coderen
+Name[nn]=Hent og kod lydspor
 Name[pa]=???????????? ???????????? ???????????? ????????? ???????????????
 Name[pl]=Odzyskaj i przekoduj ??cie??ki audio
 Name[pt]=Extrac????o e Codifica????o de Faixas de ??udio
 Name[pt_BR]=Extrac????o e Codifica????o de Faixas de ??udio
 Name[ru]=?????????????? ?? ???????????????????????? ??????????????
+Name[sk]=Vytiahnu?? a zak??dova?? audio stopy
 Name[sl]=Zajemite in zakodirajte glasbo
 Name[sr]=?????????????? ?? ???????????? ?????????? ??????????
 Name[sr at Latn]=Izdvaja i kodira audio staze
@@ -38,5 +40,6 @@
 Name[uk]=?????????????? ?? ?????????? ?????????????? ??????????????
 Name[zh_CN]=?????????????????????
 Name[zh_HK]=????????????????????????
+Name[zh_TW]=?????????????????????
 Exec=kaudiocreator %u
 Icon=kaudiocreator
Index: kaudiocreator/ripper.cpp
===================================================================
--- kaudiocreator/ripper.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kaudiocreator/ripper.cpp	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -53,11 +53,10 @@
 	for( it = jobs.begin(); it != jobs.end(); ++it ){
 		 KIO::Job* ioJob = it.key();
 		Job *job = it.data();
-		if(job){
-			delete job;
-		}
+		delete job;
+	
 		if(ioJob){
-			KIO::FileCopyJob *copyJob = dynamic_cast<KIO::FileCopyJob*> (ioJob);
+			KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob*> (ioJob);
 			disconnect(copyJob, SIGNAL(result(KIO::Job*)), this, SLOT(copyJobResult(KIO::Job*)));
 			disconnect(copyJob, SIGNAL(percent ( KIO::Job *, unsigned long)), this, SLOT(updateProgress ( KIO::Job *, unsigned long)));
 			QString fileDestination = (copyJob->destURL()).path();
@@ -221,9 +220,10 @@
 		file.remove();
 		emit updateProgress(newJob->id, -1);
 		delete newJob;
+		newJob = 0;
 	}
 
-	if(newJob->lastSongInAlbum){
+	if(newJob && newJob->lastSongInAlbum){
 		if(Prefs::autoEjectAfterRip()){
 			// Don't eject device if a pending job has that device
 			Job *job = pendingJobs.first();
Index: kaudiocreator/eventsrc
===================================================================
--- kaudiocreator/eventsrc	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kaudiocreator/eventsrc	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -33,11 +33,13 @@
 Name[mk]=???????? ???????????? ???? ????????????????
 Name[nb]=Alle jobbene er utf??rt
 Name[nl]=Alle taken voltooid
+Name[nn]=Alle jobbar ferdige
 Name[pa]=?????? ????????? ?????????
 Name[pl]=Wszystkie zadania uko??czone
 Name[pt]=Todos os trabalhos terminados
 Name[pt_BR]=Todos os trabalhos terminados
 Name[ru]=?????? ?????????????? ??????????????????
+Name[sk]=V??etky ??lohy skon??ili
 Name[sl]=Vsa opravila zaklju??ena
 Name[sr]=?????? ?????????????? ????????????????
 Name[sr at Latn]=Svi poslovi zavr??eni
@@ -45,6 +47,7 @@
 Name[uk]=?????? ???????????? ????????????????
 Name[zh_CN]=????????????????????????
 Name[zh_HK]=??????????????????
+Name[zh_TW]=????????????????????????
 Comment=All of the jobs in the queue have been finished
 Comment[bg]=???????????? ???????????? ?? ???????????????? ??????????????????
 Comment[br]=Echu eo pep dlead el lost
@@ -69,11 +72,13 @@
 Comment[mk]=???????? ???????????? ???? ???????????????? ????????????????
 Comment[nb]=Alle jobbene i k??en er utf??rt
 Comment[nl]=Alle taken in de wachtrij zijn voltooid
+Comment[nn]=Alle jobbane i k??en er ferdige
 Comment[pa]=???????????? ???????????? ?????? ??????????????? ????????? ????????? ?????? ??????????????? ????????? ??????
 Comment[pl]=Wszystkie zadania z kolejko zosta??y uko??czone
 Comment[pt]=Todos os trabalhos em fila foram terminados
 Comment[pt_BR]=Todos os trabalhos em fila foram terminados
 Comment[ru]=?????? ?????????????? ?????????????? ??????????????????
+Comment[sk]=V??etky ??lohy v rade skon??ili
 Comment[sl]=Vsa opravila iz vrste so bila zaklju??ena
 Comment[sr]=?????? ?????????????? ???? ?????????????????? ???? ????????????????
 Comment[sr at Latn]=Svi poslovi iz redosleda su zavr??eni
@@ -81,6 +86,7 @@
 Comment[uk]=?????????????????? ?????? ???????????? ?? ??????????
 Comment[zh_CN]=????????????????????????????????????
 Comment[zh_HK]=??????????????????????????????
+Comment[zh_TW]=????????????????????????????????????
 
 [track ripped]
 Name=Track Ripped
@@ -125,6 +131,7 @@
 Name[uk]=?????????????????? ??????????????
 Name[zh_CN]=???????????????
 Name[zh_HK]=??????????????????
+Name[zh_TW]=???????????????
 Comment=Track finished ripping
 Comment[bg]=???????????????????? ???? ?????????? ???? ??????????????
 Comment[bn]=????????????????????? ????????? ????????? ?????????
@@ -166,6 +173,7 @@
 Comment[uk]=?????????????????????? ?????????????? ??????????????????
 Comment[zh_CN]=??????????????????
 Comment[zh_HK]=????????????????????????
+Comment[zh_TW]=?????????????????????
 
 [cd ripped]
 Name=CD Ripped
@@ -212,6 +220,7 @@
 Name[uz]=??????????????-???????? ????????????
 Name[zh_CN]=CD ?????????
 Name[zh_HK]=???????????? CD
+Name[zh_TW]=???????????????
 Comment=CD finished ripping
 Comment[bg]=???????????????????? ???? ?????????? ???? ?????????? ????????
 Comment[bn]=???????????? ????????? ????????? ?????????
@@ -254,6 +263,7 @@
 Comment[uk]=?????????????????? ???? ??????????????????
 Comment[zh_CN]=CD ????????????
 Comment[zh_HK]=?????????????????? CD
+Comment[zh_TW]=?????????????????????
 
 [track encoded]
 Name=Track Encoded
@@ -299,6 +309,7 @@
 Name[uk]=???????????????????? ??????????????
 Name[zh_CN]=???????????????
 Name[zh_HK]=??????????????????
+Name[zh_TW]=???????????????
 Comment=Track finished encoding
 Comment[bg]=???????????????????? ???? ???????????????? ???? ??????????????
 Comment[bn]=????????????????????? ????????????????????? ????????? ?????????
@@ -340,6 +351,7 @@
 Comment[uk]=?????????????????? ?????????????? ??????????????????
 Comment[zh_CN]=??????????????????
 Comment[zh_HK]=????????????????????????
+Comment[zh_TW]=?????????????????????
 
 [cd encoded]
 Name=CD Encoded
@@ -385,6 +397,7 @@
 Name[uk]=???????????????????? ????
 Name[zh_CN]=CD ?????????
 Name[zh_HK]=???????????? CD
+Name[zh_TW]=???????????????
 Comment=CD finished encoding
 Comment[bg]=???????????????????? ???? ???????????????? ???? ?????????? ????????
 Comment[bn]=???????????? ????????????????????? ????????? ?????????
@@ -426,5 +439,6 @@
 Comment[uk]=?????????????????? ???? ??????????????????
 Comment[zh_CN]=CD ????????????
 Comment[zh_HK]=?????????????????? CD
+Comment[zh_TW]=?????????????????????
 default_presentation=17
 default_sound=KDE_ClockChime.wav
Index: kaudiocreator/kaudiocreator.desktop
===================================================================
--- kaudiocreator/kaudiocreator.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kaudiocreator/kaudiocreator.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -110,6 +110,7 @@
 GenericName[uz]=??????????????-???????? ????????????
 GenericName[zh_CN]=CD ?????????
 GenericName[zh_HK]=CD ?????????
+GenericName[zh_TW]=???????????????
 MimeType=
 Exec=kaudiocreator
 Icon=kaudiocreator
Index: libkcddb/kcmcddb/libkcddb.desktop
===================================================================
--- libkcddb/kcmcddb/libkcddb.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ libkcddb/kcmcddb/libkcddb.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -53,6 +53,7 @@
 Name[xh]=CDDB Ukukangela
 Name[zh_CN]=CDDB ??????
 Name[zh_HK]=CDDB ????????????
+Name[zh_TW]=CDDB ????????????
 
 GenericName=CDDB Configuration
 GenericName[ar]=???????????? CDDB
@@ -108,6 +109,7 @@
 GenericName[wa]=Apontiaedje di CDDB
 GenericName[zh_CN]=CDDB ??????
 GenericName[zh_HK]=CDDB ??????
+GenericName[zh_TW]=CDDB ??????
 GenericName[zu]=Uhlanganiso lwe CDDB
 
 Comment=Configure the CDDB Retrieval
@@ -151,6 +153,7 @@
 Comment[uk]=???????????????????????? ?????????????????????? CDDB
 Comment[zh_CN]=?????? CDDB ??????
 Comment[zh_HK]=?????? CDDB ????????????
+Comment[zh_TW]=CDDB ??????????????????
 
 Keywords=cddb
 Keywords[bg]=??????????????????????, ????????, ??????????????????, ????????????????????, ??????????, ????????, ??????????, cddb
Index: libkcddb/kcmcddb/cddbconfigwidget.cpp
===================================================================
--- libkcddb/kcmcddb/cddbconfigwidget.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ libkcddb/kcmcddb/cddbconfigwidget.cpp	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -76,7 +76,7 @@
       i18n("Select one of these mirrors"), keys.keys(),
       QStringList(), false, &ok, this);
 
-    if (&ok && result.count() == 1)
+    if (ok && result.count() == 1)
     {
       KCDDB::Mirror m = keys[*(result.begin())];
 
Index: noatun/modules/keyz/keyz.plugin
===================================================================
--- noatun/modules/keyz/keyz.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/keyz/keyz.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -58,3 +58,4 @@
 Comment[uk]=?????????????????? ???????????????????? ?????? ?????????????????? ??????
 Comment[zh_CN]=?????????????????????????????????
 Comment[zh_HK]=??????????????????????????????
+Comment[zh_TW]=????????????????????????????????????????????????
Index: noatun/modules/voiceprint/voiceprint.plugin
===================================================================
--- noatun/modules/voiceprint/voiceprint.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/voiceprint/voiceprint.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -81,3 +81,4 @@
 Comment[uk]=?????????????????????? voiseprint
 Comment[zh_CN]=?????????????????????
 Comment[zh_HK]=?????????????????????
+Comment[zh_TW]=?????????????????????
Index: noatun/modules/winskin/winskin.plugin
===================================================================
--- noatun/modules/winskin/winskin.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/winskin/winskin.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -104,3 +104,4 @@
 Comment[uk]=???????????????????????? ?????????????? Winamp
 Comment[zh_CN]=Winamp ???????????????
 Comment[zh_HK]=Winamp Skin ?????????
+Comment[zh_TW]=Winamp ???????????????
Index: noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop
===================================================================
--- noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -47,3 +47,4 @@
 Comment[uk]=?????????????????? ?????????? Winamp
 Comment[zh_CN]=????????? Winamp ??????
 Comment[zh_HK]=???????????? Winamp skin
+Comment[zh_TW]=????????? Winamp ??????
Index: noatun/modules/kjofol-skin/kjofolui.plugin
===================================================================
--- noatun/modules/kjofol-skin/kjofolui.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/kjofol-skin/kjofolui.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -51,3 +51,4 @@
 Comment[uk]=???????????????????????? ?????????????? ?????? K-Jofol
 Comment[zh_CN]=K-Jofol ???????????????
 Comment[zh_HK]=?????? K-Jofol ????????????????????????
+Comment[zh_TW]= K-Jofol ???????????????
Index: noatun/modules/infrared/infrared.plugin
===================================================================
--- noatun/modules/infrared/infrared.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/infrared/infrared.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -102,3 +102,4 @@
 Comment[uk]=?????????? Noatun ?? ?????????????????????? ???????????????????????????? ???????????? ??????????????????
 Comment[zh_CN]=????????????????????? Noatun
 Comment[zh_HK]=??????????????????????????? Noatun
+Comment[zh_TW]=?????? Noatun ?????????????????????
Index: noatun/modules/htmlexport/htmlexport.plugin
===================================================================
--- noatun/modules/htmlexport/htmlexport.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/htmlexport/htmlexport.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -45,6 +45,7 @@
 Name[uk]=?????????????? ???????????? ???????????????????? ???? HTML
 Name[zh_CN]=HTML ??????????????????
 Name[zh_HK]=HTML ??????????????????
+Name[zh_TW]=HTML ??????????????????
 Comment=Creates a HTML file from the playlist
 Comment[af]=Skep 'n Html l??er van die liedjielys
 Comment[ar]=?????????? ?????? HTML ???? ?????????? ??????????????
Index: noatun/modules/splitplaylist/splitplaylist.plugin
===================================================================
--- noatun/modules/splitplaylist/splitplaylist.plugin	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ noatun/modules/splitplaylist/splitplaylist.plugin	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -103,3 +103,4 @@
 Comment[uk]=???????????????? ???????????????????? ???????????? ????????????????????
 Comment[zh_CN]=??????????????????????????????
 Comment[zh_HK]=?????????????????????????????????
+Comment[zh_TW]=??????????????????????????????
Index: kdemultimedia.lsm
===================================================================
--- kdemultimedia.lsm	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kdemultimedia.lsm	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdemultimedia
-Version:        3.5.3
-Entered-date:   2006-05-23
+Version:        3.5.4
+Entered-date:   2006-08-02
 Description:    Multimedia written for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt 
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: kmix/kmixapplet.desktop
===================================================================
--- kmix/kmixapplet.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kmix/kmixapplet.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -48,6 +48,7 @@
 Name[wa]=Maxheu d'??sons
 Name[zh_CN]=?????????
 Name[zh_HK]=???????????????
+Name[zh_TW]=???????????????
 
 Comment=Volume and sound channel mixer control
 Comment[bg]=???????????????????? ???? ???????????? ???? ?????????? ?? ????????????????
@@ -72,10 +73,12 @@
 Comment[lt]=Garso lygio ir kanal?? mikserio valdymas
 Comment[nb]=Miksekontroll for lydniv??et og lydkanalene
 Comment[nl]=Bedieningspaneel voor het regelen van het volume en de geluidskanalen
+Comment[nn]=Lydstyrke- og kanalmiksarkontroll
 Comment[pl]=Sterowanie mikserem d??wi??ku i kana????w
 Comment[pt]=Controlo de volume e canais de som
 Comment[pt_BR]=Controlo de volume e canais de som
 Comment[ru]=???????????????????? ???????????????????? ?? ?????????????????? ????????????????
+Comment[sk]=Riadenie hlasitosti a zvukov??ho kan??lu mix??ru
 Comment[sl]=Nadzor glasnosti in me??alnik zvo??nih kanalov
 Comment[sr]=???????????????? ???????????? ?? ?????????????? ?????????????? ????????????
 Comment[sr at Latn]=Kontrola ja??ine i mikseta zvu??nih kanala
@@ -83,6 +86,7 @@
 Comment[uk]=?????????????????? ???????????????? ?? ???????????????? ???????????????? ??????????????
 Comment[zh_CN]=??????????????????????????????
 Comment[zh_HK]=??????????????????????????????
+Comment[zh_TW]=??????????????????????????????
 
 Icon=kmix
 X-KDE-Library=kmix_panelapplet
Index: kmix/kmixprefdlg.cpp
===================================================================
--- kmix/kmixprefdlg.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kmix/kmixprefdlg.cpp	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -71,7 +71,7 @@
    QBoxLayout *numbersLayout = new QHBoxLayout( layout );
    QButtonGroup *numbersGroup = new QButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
    numbersGroup->setRadioButtonExclusive(true);
-   QLabel* qlbl = new QLabel(  i18n("Volume Values"), m_generalTab );
+   QLabel* qlbl = new QLabel(  i18n("Volume Values: "), m_generalTab );
    _rbNone = new QRadioButton( i18n("&None"), m_generalTab );
    _rbAbsolute = new QRadioButton( i18n("A&bsolute"), m_generalTab );
    _rbRelative   = new QRadioButton( i18n("&Relative"), m_generalTab );
@@ -90,7 +90,7 @@
    QButtonGroup* orientationGroup = new QButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab );
    //orientationLayout->add(orientationGroup);
    orientationGroup->setRadioButtonExclusive(true);
-   QLabel* qlb = new QLabel( i18n("Orientation"), m_generalTab );
+   QLabel* qlb = new QLabel( i18n("Slider Orientation: "), m_generalTab );
    _rbHorizontal = new QRadioButton(i18n("&Horizontal"), m_generalTab );
    _rbVertical   = new QRadioButton(i18n("&Vertical"  ), m_generalTab );
    orientationGroup->insert(_rbHorizontal);
Index: kmix/restore_kmix_volumes.desktop
===================================================================
--- kmix/restore_kmix_volumes.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kmix/restore_kmix_volumes.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -47,4 +47,5 @@
 Name[uk]=?????????????????? ?????????????????? ??????????????
 Name[zh_CN]=?????????????????????
 Name[zh_HK]=?????????????????????
+Name[zh_TW]=?????????????????????
 
Index: audiofile_artsplugin/audiofilePlayObject.mcopclass
===================================================================
--- audiofile_artsplugin/audiofilePlayObject.mcopclass	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ audiofile_artsplugin/audiofilePlayObject.mcopclass	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -1,5 +1,5 @@
 Interface=Arts::audiofilePlayObject,Arts::PitchablePlayObject,Arts::PlayObject,Arts::SynthModule,Arts::Object
-Library=libaudiofilearts.la
+Library=libarts_audiofile.la
 Language=C++
 Author=Neil Stevens <neil at qualityassistant.com>
 Extension=wav,au,aiff,snd
Index: audiofile_artsplugin/Makefile.am
===================================================================
--- audiofile_artsplugin/Makefile.am	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ audiofile_artsplugin/Makefile.am	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -2,12 +2,12 @@
 
 noinst_HEADERS = audiofilePlayObjectI.h
 
-lib_LTLIBRARIES = libaudiofilearts.la
-libaudiofilearts_la_COMPILE_FIRST = audiofilearts.h
-libaudiofilearts_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp
-libaudiofilearts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-libaudiofilearts_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile
-libaudiofilearts_la_METASOURCES = AUTO
+lib_LTLIBRARIES = libarts_audiofile.la
+libarts_audiofile_la_COMPILE_FIRST = audiofilearts.h
+libarts_audiofile_la_SOURCES = audiofilearts.cc audiofilePlayObjectI.cpp
+libarts_audiofile_la_LDFLAGS = $(all_libraries) -module -no-undefined
+libarts_audiofile_la_LIBADD =  -lkmedia2_idl -lsoundserver_idl -lartsflow -laudiofile
+libarts_audiofile_la_METASOURCES = AUTO
 
 audiofilearts.mcopclass: audiofilearts.h
 audiofilearts.mcoptype: audiofilearts.h
Index: arts/tools/artscontrolapplet.desktop
===================================================================
--- arts/tools/artscontrolapplet.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ arts/tools/artscontrolapplet.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,10 +26,12 @@
 Comment[mk]=???? ???????????????????? ???????????????? ???????????? aRts
 Comment[nb]=Styr lydtjeneren aRts
 Comment[nl]=Bedien de aRts geluidsserver
+Comment[nn]=Styr aRts-lydtenaren
 Comment[pl]=Sterowanie serwerem d??wi??ku aRts
 Comment[pt]=Controlar o servidor de som aRts
 Comment[pt_BR]=Controlar o servidor de som aRts
 Comment[ru]=???????????????????? ???????????????? ???????????????? aRts
+Comment[sk]=Ovl??danie zvukov??ho servera aRts
 Comment[sl]=Nadzorujte zvo??ni stre??nik aRts
 Comment[sr]=???????????????????? aRts ???????????? ????????????
 Comment[sr at Latn]=Kontroli??e aRts zvu??ni server
@@ -37,6 +39,7 @@
 Comment[uk]=?????????? ???????????????? ???????????????? aRts
 Comment[zh_CN]=?????? aRts ???????????????
 Comment[zh_HK]=?????? aRts ???????????????
+Comment[zh_TW]=?????? aRts ???????????????
 Name=aRts Control
 Name[bn]=????????????????????? ???????????????????????????
 Name[br]=Renadur aRts
@@ -80,6 +83,7 @@
 Name[uz]=aRts ??????????????????
 Name[zh_CN]=aRts ??????
 Name[zh_HK]=aRts ?????????
+Name[zh_TW]=aRts ??????
 X-KDE-Library=libartscontrolapplet
 Icon=artscontrol
 OnlyShowIn=KDE;
Index: kfile-plugins/avi/kfile_avi.desktop
===================================================================
--- kfile-plugins/avi/kfile_avi.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/avi/kfile_avi.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -25,7 +25,7 @@
 Name[hu]=AVI-jellemz??k
 Name[is]=AVI uppl??singar
 Name[it]=Informazioni AVI
-Name[ja]=AVI??????
+Name[ja]=AVI ??????
 Name[km]=????????????????????? AVI
 Name[lt]=AVI informacija
 Name[mk]=AVI ????????????????????
Index: kfile-plugins/mp3/kfile_mp3.desktop
===================================================================
--- kfile-plugins/mp3/kfile_mp3.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/mp3/kfile_mp3.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,7 +26,7 @@
 Name[hu]=MP3-jellemz??k
 Name[is]=MP3 uppl??singar
 Name[it]=Informazioni MP3
-Name[ja]=MP3??????
+Name[ja]=MP3 ??????
 Name[km]=????????????????????? MP3
 Name[lt]=MP3 informacija
 Name[mk]=MP3 ????????????????????
Index: kfile-plugins/mpc/kfile_mpc.desktop
===================================================================
--- kfile-plugins/mpc/kfile_mpc.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/mpc/kfile_mpc.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -18,7 +18,7 @@
 Name[hu]=Musepack-jellemz??k
 Name[is]=Musepack uppl??singar
 Name[it]=Informazioni Musepack
-Name[ja]=Musepack??????
+Name[ja]=Musepack ??????
 Name[km]=????????????????????? Musepack
 Name[lt]=Musepack informacija
 Name[mk]=Musepack ????????????????????
@@ -40,6 +40,7 @@
 Name[uk]=???????????????????? ???? Musepack
 Name[zh_CN]=Musepack ??????
 Name[zh_HK]=Musepack ??????
+Name[zh_TW]=Musepack ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_mpc
 MimeType=audio/x-musepack
Index: kfile-plugins/sid/kfile_sid.desktop
===================================================================
--- kfile-plugins/sid/kfile_sid.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/sid/kfile_sid.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -20,7 +20,7 @@
 Name[hu]=SID-jellemz??k
 Name[is]=SID uppl??singar
 Name[it]=Informazioni SID
-Name[ja]=SID??????
+Name[ja]=SID ??????
 Name[km]=????????????????????? SID
 Name[lt]=SID informacija
 Name[mk]=SID ????????????????????
@@ -44,6 +44,7 @@
 Name[uk]=???????????????????? ???? SID
 Name[zh_CN]=SID ??????
 Name[zh_HK]=SID ??????
+Name[zh_TW]=SID ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_sid
 MimeType=audio/prs.sid
Index: kfile-plugins/theora/kfile_theora.desktop
===================================================================
--- kfile-plugins/theora/kfile_theora.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/theora/kfile_theora.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -31,6 +31,7 @@
 Name[pt]=Informa????o do theora
 Name[pt_BR]=Informa????o sobre theora
 Name[ru]=???????????????? ?? theora
+Name[sk]=theora info
 Name[sl]=Podatki o Theora
 Name[sr]=?????????????????????? ?? theora-??
 Name[sr at Latn]=Informacije o theora-i
@@ -40,6 +41,7 @@
 Name[uk]=???????????????????? ???? theora
 Name[zh_CN]=theora ??????
 Name[zh_HK]=theora ??????
+Name[zh_TW]=theora ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_theora
 # change MimeType here! (example: inode/directory)
Index: kfile-plugins/m3u/kfile_m3u.desktop
===================================================================
--- kfile-plugins/m3u/kfile_m3u.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/m3u/kfile_m3u.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -27,7 +27,7 @@
 Name[hu]=Az M3U lej??tsz??si lista jellemz??i
 Name[is]=M3U lagalistauppl??singar
 Name[it]=Informazioni playlist M3U
-Name[ja]=M3U????????????????????????
+Name[ja]=M3U ????????????????????????
 Name[km]=?????????????????????????????????????????????????????? M3U
 Name[lt]=M3U grojara????io informacija
 Name[lv]=M3U Plejlistu Info
Index: kfile-plugins/au/kfile_au.desktop
===================================================================
--- kfile-plugins/au/kfile_au.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/au/kfile_au.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -24,7 +24,7 @@
 Name[hu]=AU-jellemz??k
 Name[is]=AU uppl??singar
 Name[it]=Informazioni AU
-Name[ja]=AU??????
+Name[ja]=AU ??????
 Name[km]=????????????????????? AU
 Name[lt]=AU informacija
 Name[mk]=AU ????????????????????
Index: kfile-plugins/flac/kfile_flac.desktop
===================================================================
--- kfile-plugins/flac/kfile_flac.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/flac/kfile_flac.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -22,7 +22,7 @@
 Name[hu]=FLAC-jellemz??k
 Name[is]=AU uppl??singar
 Name[it]=Informazioni FLAC
-Name[ja]=FLAC??????
+Name[ja]=FLAC ??????
 Name[km]=????????????????????? FLAC
 Name[lt]=FLAC informacija
 Name[mk]=FLAC ????????????????????
@@ -47,6 +47,7 @@
 Name[uz]=FLAC ???????????? ????????????????
 Name[zh_CN]=FLAC ??????
 Name[zh_HK]=FLAC ??????
+Name[zh_TW]=FLAC ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_flac
 MimeType=audio/x-flac;audio/x-oggflac
Index: kfile-plugins/mpeg/kfile_mpeg.desktop
===================================================================
--- kfile-plugins/mpeg/kfile_mpeg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/mpeg/kfile_mpeg.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,6 +26,7 @@
 Name[lt]=MPEG informacija
 Name[nb]=MPEG informasjon
 Name[nl]=MPEG-info
+Name[nn]=MPEG-info
 Name[pa]=MPEG ?????????????????????
 Name[pl]=Informacja o pliku MPEG
 Name[pt]=Informa????o do MPEG
@@ -38,6 +39,7 @@
 Name[uk]=???????????????????? ?????? MPEG
 Name[zh_CN]=MPEG ??????
 Name[zh_HK]=MPEG ??????
+Name[zh_TW]=MPEG ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_mpeg
 MimeType=video/mpeg
Index: kfile-plugins/ogg/kfile_ogg.desktop
===================================================================
--- kfile-plugins/ogg/kfile_ogg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/ogg/kfile_ogg.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -26,7 +26,7 @@
 Name[hu]=OGG-jellemz??k
 Name[is]=OGG uppl??singar
 Name[it]=Informazioni OGG
-Name[ja]=OGG??????
+Name[ja]=OGG ??????
 Name[km]=????????????????????? OGG
 Name[lt]=OGG informacija
 Name[mk]=OGG ????????????????????
Index: kfile-plugins/wav/kfile_wav.desktop
===================================================================
--- kfile-plugins/wav/kfile_wav.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kfile-plugins/wav/kfile_wav.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -25,7 +25,7 @@
 Name[hu]=WAV-jellemz??k
 Name[is]=WAV uppl??singar
 Name[it]=Informazioni WAV
-Name[ja]=WAV??????
+Name[ja]=WAV ??????
 Name[km]=????????????????????? WAV
 Name[lt]=WAV informacija
 Name[mk]=WAV ????????????????????
Index: xine_artsplugin/Makefile.am
===================================================================
--- xine_artsplugin/Makefile.am	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ xine_artsplugin/Makefile.am	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -7,7 +7,7 @@
 libarts_xine_la_SOURCES = xinePlayObject.cc \
 			  xinePlayObject_impl.cpp \
 			  audio_fifo_out.c
-libarts_xine_la_LDFLAGS = $(all_libraries) -module -avoid-version -pthread
+libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
 libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
 
Index: kioslave/audiocd/kcmaudiocd/audiocd.desktop
===================================================================
--- kioslave/audiocd/kcmaudiocd/audiocd.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kioslave/audiocd/kcmaudiocd/audiocd.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -59,7 +59,7 @@
 Name[xh]=CDs Zokuvakalayo
 Name[zh_CN]=?????? CD
 Name[zh_HK]=?????? CD
-Name[zh_TW]=?????? CD
+Name[zh_TW]=????????????
 Name[zu]=Ama-CD Okuzwakalayo
 Comment=Audiocd IO Slave Configuration
 Comment[af]=Klank cd Io Slaaf Opstelling
@@ -115,7 +115,7 @@
 Comment[xh]=Video-DVD IO Slave Uqwalaselo
 Comment[zh_CN]=?????? CD ??????????????????????????????
 Comment[zh_HK]=?????? CD IO Slave ??????
-Comment[zh_TW]=?????? CD IO Slave ??????
+Comment[zh_TW]=???????????? IO Slave ??????
 Comment[zu]=Inhlanganiselo ye-Audiocd IO Slave
 Keywords=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate
 Keywords[bg]=??????????, ????????, ??????????????????????, ????, ??????????, ????????????, Audio CD, CD, Ogg, Vorbis, Encoding, CDDA, Bitrate
Index: kioslave/audiocd/audiocd.cpp
===================================================================
--- kioslave/audiocd/audiocd.cpp	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
+++ kioslave/audiocd/audiocd.cpp	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
@@ -213,7 +213,13 @@
 		return 0;
 
 	// Update our knowledge of the disc
-	d->cd.setDevice(drive->ioctl_device_name, 50, false);
+
+#if defined(__linux__)
+        d->cd.setDevice(drive->ioctl_device_name, 50, false);
+#else
+        d->cd.setDevice(drive->cdda_device_name, 50, false);
+#endif
+
 #if 0
 	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
 	// support for non-SCSI devices. Although it finds ATA cdroms just

Eigenschafts??nderungen: .
___________________________________________________________________
Name: svn:externals
   + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin




Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdemultimedia.spec	17 Jul 2006 17:55:23 -0000	1.72
+++ kdemultimedia.spec	24 Jul 2006 12:45:02 -0000	1.73
@@ -11,8 +11,8 @@
 
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.3
-Release: 7
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -21,7 +21,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3-patched.tar.bz2
+Patch0: kdemultimedia-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
@@ -81,14 +82,15 @@
 noatun plugins.
 
 %prep
-%setup -q -n %{name}-%{version}-patched
+%setup -q -n %{name}-3.5.3-patched
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
 
 # upstream patches
-%patch100 -p0 -b .setuid-check
+#%patch100 -p0 -b .setuid-check
 %patch101 -p1 -b .noatun
 
 %if %{make_cvs}
@@ -196,6 +198,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 6:3.5.3-7
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:49:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:49:01 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia-3.5.3-3.5.4.patch,1.1,1.2
Message-ID: <200607241249.k6OCn1U5018363@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18150

Modified Files:
	kdemultimedia-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)


kdemultimedia-3.5.3-3.5.4.patch:
 akode_artsplugin/Makefile.am                                     |    4 +-
 akode_artsplugin/akodePlayObject_impl.cpp                        |    9 +++---
 arts/tools/artscontrolapplet.desktop                             |    4 ++
 audiofile_artsplugin/Makefile.am                                 |   12 ++++----
 audiofile_artsplugin/audiofilePlayObject.mcopclass               |    2 -
 juk/juk.desktop                                                  |    1 
 juk/jukservicemenu.desktop                                       |    1 
 kappfinder-data/ams.desktop                                      |    1 
 kappfinder-data/ardour.desktop                                   |    1 
 kappfinder-data/djplay.desktop                                   |    1 
 kappfinder-data/freebirth.desktop                                |    1 
 kappfinder-data/galan.desktop                                    |    1 
 kappfinder-data/hydrogen.desktop                                 |    1 
 kappfinder-data/jamin.desktop                                    |    1 
 kappfinder-data/kde-multimedia-music.directory                   |    3 ++
 kappfinder-data/meterbridge.desktop                              |    1 
 kappfinder-data/mixxx.desktop                                    |    1 
 kappfinder-data/muse.desktop                                     |    1 
 kappfinder-data/qjackctl.desktop                                 |    1 
 kappfinder-data/qsynth.desktop                                   |    1 
 kappfinder-data/rezound.desktop                                  |    1 
 kappfinder-data/vkeybd.desktop                                   |    1 
 kappfinder-data/zynaddsubfx.desktop                              |    1 
 kaudiocreator/audiocd_extract.desktop                            |    3 ++
 kaudiocreator/eventsrc                                           |   14 ++++++++++
 kaudiocreator/kaudiocreator.desktop                              |    1 
 kaudiocreator/ripper.cpp                                         |   10 +++----
 kdemultimedia.lsm                                                |    4 +-
 kfile-plugins/au/kfile_au.desktop                                |    2 -
 kfile-plugins/avi/kfile_avi.desktop                              |    2 -
 kfile-plugins/flac/kfile_flac.desktop                            |    3 +-
 kfile-plugins/m3u/kfile_m3u.desktop                              |    2 -
 kfile-plugins/mpc/kfile_mpc.desktop                              |    3 +-
 kfile-plugins/ogg/kfile_ogg.desktop                              |    2 -
 kfile-plugins/sid/kfile_sid.desktop                              |    3 +-
 kfile-plugins/theora/kfile_theora.desktop                        |    2 +
 kfile-plugins/wav/kfile_wav.desktop                              |    2 -
 kioslave/audiocd/audiocd.cpp                                     |    8 +++++
 kioslave/audiocd/kcmaudiocd/audiocd.desktop                      |    4 +-
 kmid/kmid.desktop                                                |    3 --
 kmid/x-karaoke.desktop                                           |    1 
 kmix/kmixapplet.desktop                                          |    4 ++
 kmix/kmixprefdlg.cpp                                             |    4 +-
 kmix/restore_kmix_volumes.desktop                                |    1 
 krec/kcm_krec.desktop                                            |    2 +
 krec/kcm_krec_files.desktop                                      |    2 +
 krec/krec_exportitem.desktop                                     |    1 
 krec/krec_exportwave.desktop                                     |    1 
 krec/mp3_export/krec_exportmp3.desktop                           |    1 
 krec/ogg_export/krec_exportogg.desktop                           |    1 
 kscd/audiocd_play.desktop                                        |    1 
 kscd/cddaslave.c                                                 |    3 ++
 kscd/libwm/cddaslave.c                                           |    3 ++
 libkcddb/kcmcddb/cddbconfigwidget.cpp                            |    2 -
 libkcddb/kcmcddb/libkcddb.desktop                                |    3 ++
 noatun/modules/htmlexport/htmlexport.plugin                      |    1 
 noatun/modules/infrared/infrared.plugin                          |    1 
 noatun/modules/keyz/keyz.plugin                                  |    1 
 noatun/modules/kjofol-skin/kjofolui.plugin                       |    1 
 noatun/modules/splitplaylist/splitplaylist.plugin                |    1 
 noatun/modules/voiceprint/voiceprint.plugin                      |    1 
 noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop |    1 
 noatun/modules/winskin/winskin.plugin                            |    1 
 xine_artsplugin/Makefile.am                                      |    2 -
 64 files changed, 122 insertions(+), 37 deletions(-)

Index: kdemultimedia-3.5.3-3.5.4.patch
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia-3.5.3-3.5.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdemultimedia-3.5.3-3.5.4.patch	24 Jul 2006 12:45:02 -0000	1.1
+++ kdemultimedia-3.5.3-3.5.4.patch	24 Jul 2006 12:48:58 -0000	1.2
@@ -883,19 +883,6 @@
  Name[km]=????????????????????? AVI
  Name[lt]=AVI informacija
  Name[mk]=AVI ????????????????????
-Index: kfile-plugins/mp3/kfile_mp3.desktop
-===================================================================
---- kfile-plugins/mp3/kfile_mp3.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
-+++ kfile-plugins/mp3/kfile_mp3.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
-@@ -26,7 +26,7 @@
- Name[hu]=MP3-jellemz??k
- Name[is]=MP3 uppl??singar
- Name[it]=Informazioni MP3
--Name[ja]=MP3??????
-+Name[ja]=MP3 ??????
- Name[km]=????????????????????? MP3
- Name[lt]=MP3 informacija
- Name[mk]=MP3 ????????????????????
 Index: kfile-plugins/mpc/kfile_mpc.desktop
 ===================================================================
 --- kfile-plugins/mpc/kfile_mpc.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
@@ -1005,26 +992,6 @@
  ServiceTypes=KFilePlugin
  X-KDE-Library=kfile_flac
  MimeType=audio/x-flac;audio/x-oggflac
-Index: kfile-plugins/mpeg/kfile_mpeg.desktop
-===================================================================
---- kfile-plugins/mpeg/kfile_mpeg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)
-+++ kfile-plugins/mpeg/kfile_mpeg.desktop	(.../branches/KDE/3.5/kdemultimedia)	(Revision 565770)
-@@ -26,6 +26,7 @@
- Name[lt]=MPEG informacija
- Name[nb]=MPEG informasjon
- Name[nl]=MPEG-info
-+Name[nn]=MPEG-info
- Name[pa]=MPEG ?????????????????????
- Name[pl]=Informacja o pliku MPEG
- Name[pt]=Informa????o do MPEG
-@@ -38,6 +39,7 @@
- Name[uk]=???????????????????? ?????? MPEG
- Name[zh_CN]=MPEG ??????
- Name[zh_HK]=MPEG ??????
-+Name[zh_TW]=MPEG ??????
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_mpeg
- MimeType=video/mpeg
 Index: kfile-plugins/ogg/kfile_ogg.desktop
 ===================================================================
 --- kfile-plugins/ogg/kfile_ogg.desktop	(.../tags/KDE/3.5.3/kdemultimedia)	(Revision 565770)



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:52:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:52:02 -0400
Subject: rpms/authd/devel authd-1.4.3-locale.patch, NONE, 1.1 authd.spec,
	1.38, 1.39
Message-ID: <200607241252.k6OCq2Mi019596@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19509

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-locale.patch 
Log Message:
locale patch

authd-1.4.3-locale.patch:
 authd.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE authd-1.4.3-locale.patch ---
--- authd-1.4.3/authd.c~	2006-07-21 22:32:26.000000000 +0930
+++ authd-1.4.3/authd.c	2006-07-22 00:32:11.000000000 +0930
@@ -979,6 +979,8 @@
     mtrace();
 #   endif
     if (setlocale(LC_ALL, "") == NULL) abort();
+    errno = 0;			/* not an error for some locale files to
+				   be missing */
     if (signal(SIGALRM, catch_signal) == SIG_ERR) abort();
     if (textdomain(PACKAGE) == NULL) handle_error(NULL);
     if (bindtextdomain(PACKAGE, NULL) == NULL) handle_error(NULL);


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- authd.spec	12 Jul 2006 05:23:53 -0000	1.38
+++ authd.spec	24 Jul 2006 12:51:59 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 8.1
+Release: 9
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -11,6 +11,7 @@
 Patch0: authd-1.4.3-gcc4.patch
 Patch1: authd-1.4.3-disable.patch
 Patch2: authd-1.4.3-ipv6-mapping.patch
+Patch3: authd-1.4.3-locale.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel gettext
 Prereq: xinetd
@@ -26,6 +27,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1 -b .ipv6map
+%patch3 -p1 -b .locale
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -66,6 +68,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Mon Jul 24 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-9
+- added locale patch (#199721)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-8.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 12:55:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 08:55:06 -0400
Subject: rpms/postfix/devel .cvsignore, 1.18, 1.19 postfix.spec, 1.41,
	1.42 sources, 1.18, 1.19 postfix-hostname-fqdn.patch, 1.2, NONE
Message-ID: <200607241255.k6OCt6cc020764@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20647

Modified Files:
	.cvsignore postfix.spec sources 
Removed Files:
	postfix-hostname-fqdn.patch 
Log Message:
[tw]
- new version 2.3.0
- dropped hostname-fqdn patch




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Apr 2006 15:48:16 -0000	1.18
+++ .cvsignore	24 Jul 2006 12:55:03 -0000	1.19
@@ -1,2 +1,3 @@
 pflogsumm-1.1.0.tar.gz
 postfix-2.2.10.tar.gz
+postfix-2.3.0.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- postfix.spec	12 Jul 2006 07:51:33 -0000	1.41
+++ postfix.spec	24 Jul 2006 12:55:03 -0000	1.42
@@ -42,8 +42,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.2.10
-Release: 2.1
+Version: 2.3.0
+Release: 1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -76,7 +76,6 @@
 
 Patch1: postfix-2.1.1-config.patch
 Patch3: postfix-alternatives.patch
-Patch4: postfix-hostname-fqdn.patch
 Patch6: postfix-2.1.1-obsolete.patch
 Patch7: postfix-2.1.5-aliases.patch
 Patch8: postfix-large-fs.patch
@@ -131,7 +130,6 @@
 # Apply obligatory patches
 %patch1 -p1 -b .config
 %patch3 -p1 -b .alternatives
-%patch4 -p1 -b .postfix-hostname-fqdn
 %patch6 -p1 -b .obsolete
 %patch7 -p1 -b .aliases
 %patch8 -p1 -b .large-fs
@@ -440,6 +438,7 @@
 %attr(0755, root, root) %{postfix_command_dir}/postsuper
 %attr(0644, root, root) %{postfix_config_dir}/LICENSE
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/access
+%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/bounce.cf.default
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/canonical
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/generic
 %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks
@@ -469,6 +468,10 @@
 
 
 %changelog
+* Mon Jul 24 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.0-1
+- new version 2.3.0
+- dropped hostname-fqdn patch
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Apr 2006 15:48:17 -0000	1.18
+++ sources	24 Jul 2006 12:55:03 -0000	1.19
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-440a4702182a79ac2f51e8974fb742c9  postfix-2.2.10.tar.gz
+72a714e0cc8a5fdbe770359ae965e09b  postfix-2.3.0.tar.gz


--- postfix-hostname-fqdn.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:09:27 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-parse-and-submounts.patch,
	NONE, 1.1 autofs.spec, 1.131, 1.132
Message-ID: <200607241309.k6OD9Ra1024328@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24250

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-parse-and-submounts.patch 
Log Message:
* Thu Jul 24 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.6
- cthon more parser corrections and attempt to fix multi-mounts
  with various combinations of submounts (still not right).


autofs-5.0.1-rc1-cthon-parse-and-submounts.patch:
 CHANGELOG                |    2 
 daemon/automount.c       |  172 ++++++++++++---------------------------
 daemon/direct.c          |   16 ++-
 daemon/indirect.c        |   44 ++++------
 daemon/state.c           |  176 +++++++++++++++++++++++++---------------
 include/automount.h      |   57 ++++++++++---
 include/master.h         |   16 +++
 include/parse_subs.h     |    3 
 lib/alarm.c              |   77 ++++++++---------
 lib/master.c             |  204 ++++++++++++++++++++---------------------------
 lib/parse_subs.c         |   84 ++++++++++++++++---
 modules/lookup_file.c    |  106 ++++++++++++++----------
 modules/lookup_hosts.c   |    2 
 modules/lookup_ldap.c    |  158 +++++++++++++++++++-----------------
 modules/lookup_nisplus.c |   33 ++-----
 modules/lookup_yp.c      |   37 ++------
 modules/mount_autofs.c   |   39 ++++----
 modules/parse_sun.c      |   31 ++-----
 18 files changed, 661 insertions(+), 596 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-parse-and-submounts.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 2ffaba6..111c6af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,8 @@
 - cthon more cleanup and corrections.
 - cthon correction to host validation.
 - cthon fix submount operation broken by above.
+- cthon more parser corrections and attempt to fix multi-mounts
+  with various combinations of submounts (still broken).
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 21f0378..8fcf19a 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -243,8 +243,6 @@ static int umount_offsets(struct autofs_
 
 		sched_yield();
 
-		debug(ap->logopt, "umount offset %s", offset);
-
 		strcpy(key, base);
 		strcat(key, offset);
 		oe = cache_lookup_distinct(mc, key);
@@ -254,6 +252,8 @@ static int umount_offsets(struct autofs_
 			continue;
 		}
 
+		warn(ap->logopt, "umount offset %s", key);
+
 		/*
 		 * We're in trouble if umounting the triggers fails.
 		 * It should always succeed due to the expire design.
@@ -306,26 +306,16 @@ static int umount_ent(struct autofs_poin
 		rv = spawnll(log_debug, PATH_UMOUNT, PATH_UMOUNT, path, NULL);
 	}
 
-	status = pthread_mutex_lock(&ap->state_mutex);
-	if (status)
-		fatal(status);
-
 	/* We are doing a forced shutcwdown down so unlink busy mounts */
 	if (rv && (ap->state == ST_SHUTDOWN_FORCE || ap->state == ST_SHUTDOWN)) {
 		ret = stat(path, &st);
 		if (ret == -1 && errno == ENOENT) {
 			warn(ap->logopt, "mount point does not exist");
-			status = pthread_mutex_unlock(&ap->state_mutex);
-			if (status)
-				fatal(status);
 			return 0;
 		}
 
 		if (ret == 0 && !S_ISDIR(st.st_mode)) {
 			warn(ap->logopt, "mount point is not a directory");
-			status = pthread_mutex_unlock(&ap->state_mutex);
-			if (status)
-				fatal(status);
 			return 0;
 		}
 
@@ -353,10 +343,6 @@ static int umount_ent(struct autofs_poin
 		}
 	}
 
-	status = pthread_mutex_unlock(&ap->state_mutex);
-	if (status)
-		fatal(status);
-
 	return rv;
 }
 
@@ -559,7 +545,7 @@ int umount_multi(struct autofs_point *ap
 	if (!tree_get_mnt_list(mnts, &list, path, incl)) {
 		debug(ap->logopt, "no mounts found under %s", path);
 		check_rm_dirs(ap, path, incl);
-		return 1;
+		return 0;
 	}
 
 	left = 0;
@@ -581,6 +567,8 @@ int umount_multi(struct autofs_point *ap
 		debug(ap->logopt, "unmounting dir = %s", mptr->path);
 
 		if (umount_ent(ap, mptr->path, mptr->fs_type)) {
+			warn(ap->logopt, "could not umount dir %s",
+				mptr->path);
 			left++;
 		}
 	}
@@ -612,13 +600,11 @@ int umount_multi(struct autofs_point *ap
 				break;
 			}
 
-			if (!tree_is_mounted(mnts, buf)) {
-				if (umount_offsets(ap, mnts, buf)) {
-					warn(ap->logopt,
-					  "could not umount some offsets under %s",
-					  buf);
-					left++;
-				}
+			if (umount_offsets(ap, mnts, buf)) {
+				warn(ap->logopt,
+				     "could not umount some offsets under %s",
+				     buf);
+				left++;
 			}
 			free(de[n]);
 		}
@@ -670,35 +656,16 @@ int umount_autofs(struct autofs_point *a
 	/*
 	 * Since lookup.c is lazy about closing lookup modules
 	 * to prevent unneeded opens, we need to clean them up
-	 * before umount or the fs will be busy.
+	 * before umount.
 	 */
 	lookup_close_lookup(ap);
 
 	if (ap->type == LKP_INDIRECT) {
 		if (umount_all(ap, force) && !force)
 			return -1;
-
 		ret = umount_autofs_indirect(ap);
-	} else {
+	} else
 		ret = umount_autofs_direct(ap);
-	}
-
-	if (ap->submount) {
-		int status;
-
-		status = pthread_mutex_lock(&ap->parent->mounts_mutex);
-		if (status)
-			fatal(status);
-		ap->parent->submnt_count--;
-		list_del_init(&ap->mounts);
-		status = pthread_cond_signal(&ap->parent->mounts_cond);
-		if (status)
-			error(ap->logopt,
-			  "failed to signal submount umount notify condition");
-		status = pthread_mutex_unlock(&ap->parent->mounts_mutex);
-		if (status)
-			fatal(status);
-	}
 
 	return ret;
 }
@@ -778,28 +745,35 @@ static int get_pkt(struct autofs_point *
 		}
 
 		if (fds[1].revents & POLLIN) {
-			enum states next_state;
+			enum states next_state, post_state;
+			size_t read_size = sizeof(next_state);
+			int state_pipe;
 			int status;
 
-			status = pthread_mutex_lock(&ap->state_mutex);
-			if (status)
-				fatal(status);
+			next_state = post_state = ST_INVAL;
+
+			state_mutex_lock(ap);
 
-			if (fullread(ap->state_pipe[0], &next_state, sizeof(next_state)))
+			state_pipe = ap->state_pipe[0];
+
+			if (fullread(state_pipe, &next_state, read_size)) {
+				state_mutex_unlock(ap);
 				continue;
+			}
 
-			if (next_state != ap->state) {
+			if (next_state != ST_INVAL && next_state != ap->state) {
 				if (next_state != ST_SHUTDOWN)
-					st_add_task(ap, next_state);
+					post_state = next_state;
 				else
 					ap->state = ST_SHUTDOWN;
 			}
 
-			status = pthread_mutex_unlock(&ap->state_mutex);
-			if (status)
-				fatal(status);
+			state_mutex_unlock(ap);
 
-			if (ap->state == ST_SHUTDOWN)
+			if (post_state != ST_INVAL)
+				st_add_task(ap, post_state);
+
+			if (next_state == ST_SHUTDOWN)
 				return -1;
 		}
 
@@ -837,7 +811,7 @@ int do_expire(struct autofs_point *ap, c
 	if (ret == 0)
 		msg("expired %s", buf);
 	else
[...2259 lines suppressed...]
 	ret = cache_update(mc, source, key, mapent, age);
 	cache_unlock(mc);
 
 	free(key);
-	free(mapent);
 
 	if (ret == CHE_FAIL)
 		return -1;
@@ -301,16 +286,18 @@ int lookup_read_map(struct autofs_point 
 	struct lookup_context *ctxt = (struct lookup_context *) context;
 	struct ypall_callback ypcb;
 	struct callback_data ypcb_data;
+	struct map_source *source;
 	char *mapname;
 	int err;
 
-	ypcb_data.ap = ap;
-	ypcb_data.source = ap->entry->current;
-	ypcb_data.age = age;
-
+	source = ap->entry->current;
 	ap->entry->current = NULL;
 	master_source_current_signal(ap->entry);
 
+	ypcb_data.ap = ap;
+	ypcb_data.source = source;
+	ypcb_data.age = age;
+
 	ypcb.foreach = yp_all_callback;
 	ypcb.data = (char *) &ypcb_data;
 
@@ -342,6 +329,8 @@ int lookup_read_map(struct autofs_point 
 		return NSS_STATUS_NOTFOUND;
 	}
 
+	source->age = age;
+
 	return NSS_STATUS_SUCCESS;
 }
 
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 768bcbf..95fe00d 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -58,28 +58,26 @@ int mount_mount(struct autofs_point *ap,
 	struct autofs_point *nap;
 	char buf[MAX_ERR_BUF];
 	char *options, *p;
-	int ret, rlen;
+	int ret;
+	struct list_head *l;
 
-	/* Root offset of multi-mount */
-	if (*name == '/' && name_len == 1) {
-		rlen = strlen(root);
-		name_len = 0;
-	} else if (*name == '/')
-		rlen = 0;
-	else
-		rlen = strlen(root);
-
-	fullpath = alloca(rlen + name_len + 2);
+	fullpath = alloca(strlen(root) + name_len + 2);
 	if (!fullpath) {
 		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 		error(ap->logopt, MODPREFIX "alloca: %s", estr);
 		return 1;
 	}
 
-	if (rlen)
-		sprintf(fullpath, "%s/%s", root, name);
-	else
-		sprintf(fullpath, "%s", name);
+	/* Root offset of multi-mount */
+	if (*name == '/' && name_len == 1)
+		strcpy(fullpath, root);
+	else if (*name == '/')
+		strcpy(fullpath, name);
+	else {
+		strcpy(fullpath, root);
+		strcat(fullpath, "/");
+		strcat(fullpath, name);
+	}
 
 	if (is_mounted(_PATH_MOUNTED, fullpath, MNTS_REAL)) {
 		error(ap->logopt,
@@ -201,14 +199,14 @@ int mount_mount(struct autofs_point *ap,
 	suc.done = 0;
 	suc.status = 0;
 
-	pthread_mutex_lock(&ap->mounts_mutex);
+	mounts_mutex_lock(ap);
 
 	if (pthread_create(&thid, &thread_attr, handle_mounts, nap)) {
 		crit(ap->logopt,
 		     MODPREFIX
 		     "failed to create mount handler thread for %s",
 		     fullpath);
-		pthread_mutex_unlock(&ap->mounts_mutex);
+		mounts_mutex_unlock(ap);
 		status = pthread_mutex_unlock(&suc.mutex);
 		if (status)
 			fatal(status);
@@ -221,7 +219,7 @@ int mount_mount(struct autofs_point *ap,
 	while (!suc.done) {
 		status = pthread_cond_wait(&suc.cond, &suc.mutex);
 		if (status) {
-			pthread_mutex_unlock(&ap->mounts_mutex);
+			mounts_mutex_unlock(ap);
 			pthread_mutex_unlock(&suc.mutex);
 			fatal(status);
 		}
@@ -230,17 +228,18 @@ int mount_mount(struct autofs_point *ap,
 	if (suc.status) {
 		crit(ap->logopt,
 		     MODPREFIX "failed to create submount for %s", fullpath);
-		pthread_mutex_unlock(&ap->mounts_mutex);
+		mounts_mutex_unlock(ap);
 		status = pthread_mutex_unlock(&suc.mutex);
 		if (status)
 			fatal(status);
+		master_free_mapent(entry);
 		return 1;
 	}
 
 	ap->submnt_count++;
 	list_add(&nap->mounts, &ap->submounts);
 
-	pthread_mutex_unlock(&ap->mounts_mutex);
+	mounts_mutex_unlock(ap);
 
 	status = pthread_mutex_unlock(&suc.mutex);
 	if (status)
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 50f086d..c6dffef 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -807,7 +807,7 @@ static int parse_mapent(const char *ent,
 	l = chunklen(p, check_colon(p));
 	loc = dequote(p, l, logopt);
 	if (!loc) {
-		error(logopt, MODPREFIX "out of memory");
+		warn(logopt, MODPREFIX "possible missing location");
 		free(myoptions);
 		return 0;
 	}
@@ -1039,45 +1039,32 @@ int parse_mount(struct autofs_point *ap,
 
 		/* It's a multi-mount; deal with it */
 		do {
-			char *tmp, *path, *myoptions, *loc;
+			char *path, *myoptions, *loc;
+			unsigned int s_len = 0;
 			int status;
 
 			if (*p != '/') {
 				l = 0;
-				tmp = dequote("/", 1, ap->logopt);
+				path = dequote("/", 1, ap->logopt);
 				debug(ap->logopt,
-				      MODPREFIX "dequote(\"/\") -> %s", tmp);
+				      MODPREFIX "dequote(\"/\") -> %s", path);
 			} else {
-				l = chunklen(p, 0);
-				tmp = dequote(p, l, ap->logopt);
+				l = span_space(p, mapent_len - (p - pmapent));
+				path = sanitize_path(p, l, LKP_MULTI, ap->logopt);
 				debug(ap->logopt, MODPREFIX
-				      "dequote(\"%.*s\") -> %s", l, p, tmp);
+				      "dequote(\"%.*s\") -> %s", l, p, path);
 			}
 
-			if (!tmp) {
-				error(ap->logopt, MODPREFIX "out of memory");
-				cache_readlock(mc);
-				cache_multi_lock(mc);
-				cache_delete_offset_list(mc, name);
-				cache_multi_unlock(mc);
-				cache_unlock(mc);
-				free(options);
-				return 1;
-			}
-
-			path = sanitize_path(tmp, strlen(tmp));
 			if (!path) {
-				warn(ap->logopt, MODPREFIX "invalid path");
+				error(ap->logopt, MODPREFIX "out of memory");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
 				cache_multi_unlock(mc);
 				cache_unlock(mc);
-				free(tmp);
 				free(options);
 				return 1;
 			}
-			free(tmp);
 
 			p += l;
 			p = skipspace(p);


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- autofs.spec	19 Jul 2006 16:14:50 -0000	1.131
+++ autofs.spec	24 Jul 2006 13:09:24 -0000	1.132
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.5
+%define release 0.rc1.6
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -22,6 +22,7 @@
 Patch9: autofs-5.0.1-rc1-cthon-more-cleanup.patch
 Patch10: autofs-5.0.1-rc1-cthon-host-name-validation.patch
 Patch11: autofs-5.0.1-rc1-cthon-submount-fix.patch
+Patch12: autofs-5.0.1-rc1-cthon-parse-and-submounts.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -72,6 +73,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -128,6 +130,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jul 24 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.6
+- cthon more parser corrections and attempt to fix multi-mounts
+  with various combinations of submounts (still not right).
+
 * Wed Jul 19 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.5
 - Add conflicts kernel < 2.6.17.
 - Fix submount operation broken by connectathon updates.



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:13:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:13:04 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.50,
	1.51 java-1.4.2-gcj-compat.spec, 1.161, 1.162 sources, 1.56, 1.57
Message-ID: <200607241313.k6ODD47J025576@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-serv25469

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_98rh
- Import java-gcj-compat 1.0.61.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	21 Jul 2006 10:27:43 -0000	1.50
+++ .cvsignore	24 Jul 2006 13:13:02 -0000	1.51
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.60.tar.gz
+java-gcj-compat-1.0.61.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar


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.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- java-1.4.2-gcj-compat.spec	23 Jul 2006 15:57:29 -0000	1.161
+++ java-1.4.2-gcj-compat.spec	24 Jul 2006 13:13:02 -0000	1.162
@@ -11,11 +11,11 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.60
+%define jgcver		1.0.61
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_97rh
+%define release 	40jpp_98rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -628,6 +628,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_98rh
+- Import java-gcj-compat 1.0.61.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_97rh
 - Link jsse.jar to libgcj.jar.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	21 Jul 2006 10:27:43 -0000	1.56
+++ sources	24 Jul 2006 13:13:02 -0000	1.57
@@ -1,3 +1,3 @@
-ab3bbc4c6346f2e3a6a76a894fd79083  java-gcj-compat-1.0.60.tar.gz
+bf21552084a1753ded9bdb71ba9374f3  java-gcj-compat-1.0.61.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:20:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:20:17 -0400
Subject: rpms/im-chooser/devel im-chooser-suffix-r37.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 im-chooser.spec, 1.3, 1.4
Message-ID: <200607241320.k6ODKHrb009968@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9933

Modified Files:
	.cvsignore im-chooser.spec 
Added Files:
	im-chooser-suffix-r37.patch 
Log Message:
- im-chooser-suffix-r37.patch: applied to support the recent change
  in the xinput files.

im-chooser-suffix-r37.patch:
 ChangeLog        |    7 +++++++
 configure.ac     |   18 ++++++++++++++++++
 src/Makefile.am  |    1 +
 src/im-chooser.c |    6 +++---
 src/xinput.c     |    6 ++++--
 5 files changed, 33 insertions(+), 5 deletions(-)

--- NEW FILE im-chooser-suffix-r37.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(??????????????? 37)
+++ configure.ac	(???????????????)
@@ -85,6 +85,10 @@
 	AC_HELP_STRING([--with-xinitdir], [build with the specific xinit directory])
 	,,
 	with_xinitdir=no)
+AC_ARG_WITH(xinput-suffix,
+	AC_HELP_STRING([--with-xinput-suffix], [specify the xinput file suffix])
+	,,
+	with_xinput_suffix=no)
 
 dnl ======================================================================
 dnl options - xinputdir
@@ -113,6 +117,19 @@
 AC_SUBST(XINIT_PATH)
 
 dnl ======================================================================
+dnl options - xinitdir
+dnl ======================================================================
+AC_MSG_CHECKING(whether to build the specific xinput suffix)
+if test "x$with_xinput_suffix" = xno; then
+   	with_xinput_suffix=""
+	AC_MSG_RESULT(no)
+else
+	AC_MSG_RESULT(yes)
+fi
+XINPUT_SUFFIX=$with_xinput_suffix
+AC_SUBST(XINPUT_SUFFIX)
+
+dnl ======================================================================
 dnl output
 dnl ======================================================================
 AC_CONFIG_FILES([
@@ -133,5 +150,6 @@
 echo " LIBS:                       $IMCHOOSE_LIBS"
 echo " XINPUT_PATH:                $XINPUT_PATH"
 echo " XINIT_PATH:                 $XINIT_PATH"
+echo " XINPUT_SUFFIX:              $XINPUT_SUFFIX"
 echo " GNOME support:              $use_gnome"
 echo ""
Index: ChangeLog
===================================================================
--- ChangeLog	(??????????????? 37)
+++ ChangeLog	(???????????????)
@@ -1,6 +1,13 @@
 2006-07-24  Akira TAGOH  <at at gclab.org>
 
+	* src/xinput.c (xinput_get_im_list): lookup the xiput file with
+	the suffix.
+
+	* src/im-chooser.c (im_chooser_get_widget): fixed to make
+	a non-sensitive when no options available on custom.
+
 	* configure.ac: bumped to 0.3.0.
+	added --with-xinput-suffix option.
 
 	* src/im-chooser.c (im_chooser_get_widget): fixed a typo.
 
Index: src/im-chooser.c
===================================================================
--- src/im-chooser.c	(??????????????? 37)
+++ src/im-chooser.c	(???????????????)
@@ -47,9 +47,9 @@
 /* name that uses to be determined which IM is used for default. */
 #define IM_DEFAULT_NAME		"xinputrc"
 /* name that uses to be determined that IM is never used no matter what */
-#define IM_NONE_NAME		"none"
+#define IM_NONE_NAME		"none" XINPUT_SUFFIX
 /* name that uses to be determined that XIM is always used no matter what */
-#define IM_XIM_NAME		"xim"
+#define IM_XIM_NAME		"xim" XINPUT_SUFFIX
 /* label that uses to indicate their own .xinputrc */
 #define IM_USER_SPECIFIC_LABEL	"User Specific"
 /* label that uses to indicate "unknown" xinput script */
@@ -564,7 +564,7 @@
 		gtk_alignment_set_padding(GTK_ALIGNMENT (align2), 10, 0, 0, 0);
 		gtk_container_add(GTK_CONTAINER (align2), label3);
 		gtk_box_pack_start(GTK_BOX (vbox), align2, FALSE, FALSE, 0);
-		if (DECODE_MODE (im->mode) == IM_MODE_CUSTOM)
+		if (DECODE_MODE (im->mode) == IM_MODE_CUSTOM && !no_custom)
 			gtk_widget_set_sensitive(im->option, TRUE);
 
 		im->widget = vbox;
Index: src/xinput.c
===================================================================
--- src/xinput.c	(??????????????? 37)
+++ src/xinput.c	(???????????????)
@@ -80,7 +80,7 @@
 	GSList *retval = NULL;
 	GDir *dir;
 	const gchar *name;
-	gchar *filename;
+	gchar *filename, *confname;
 	struct stat st;
 
 	if (path == NULL) {
@@ -89,13 +89,15 @@
 	if ((dir = g_dir_open(path, 0, NULL)) == NULL)
 		return NULL;
 	while ((name = g_dir_read_name(dir)) != NULL) {
-		filename = g_build_filename(path, name, NULL);
+		confname = g_strdup_printf("%s%s", name, XINPUT_SUFFIX);
+		filename = g_build_filename(path, confname, NULL);
 		if (lstat(filename, &st) == 0) {
 			if (S_ISREG (st.st_mode) && !S_ISLNK (st.st_mode)) {
 				retval = g_slist_append(retval, g_strdup(filename));
 			}
 		}
 		g_free(filename);
+		g_free(confname);
 	}
 	g_dir_close(dir);
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(??????????????? 37)
+++ src/Makefile.am	(???????????????)
@@ -4,6 +4,7 @@
 	-DG_LOG_DOMAIN="\"IM-Chooser\""				\
 	-DXINIT_PATH="\"$(XINIT_PATH)\""			\
 	-DXINPUT_PATH="\"$(XINPUT_PATH)\""			\
+	-DXINPUT_SUFFIX="\"$(XINPUT_SUFFIX)\""			\
 	$(IMCHOOSE_CFLAGS)					\
 	$(GNOME_CFLAGS)						\
 	$(NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Jul 2006 07:45:40 -0000	1.3
+++ .cvsignore	24 Jul 2006 13:20:14 -0000	1.4
@@ -1,2 +1,5 @@
+*.bz2
+*.gz
+*.rpm
 im-chooser-0.2.2.tar.gz
 im-chooser-0.3.0.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-chooser.spec	24 Jul 2006 07:45:40 -0000	1.3
+++ im-chooser.spec	24 Jul 2006 13:20:14 -0000	1.4
@@ -4,9 +4,10 @@
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel
+BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel automake autoconf
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:		im-chooser-suffix-r37.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -20,9 +21,12 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .0-suffix
+automake
+autoconf
 
 %build
-%configure
+%configure --with-xinput-suffix=.conf
 make %{?_smp_mflags}
 
 %install
@@ -54,6 +58,8 @@
 * Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-1
 - New upstream release.
 - add libgnomeui-devel to BR.
+- im-chooser-suffix-r37.patch: applied to support the recent change
+  in the xinput files.
 
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2
 - rebuilt



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:20:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:20:52 -0400
Subject: rpms/im-chooser/devel im-chooser.spec,1.4,1.5
Message-ID: <200607241320.k6ODKqpu010144@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10117

Modified Files:
	im-chooser.spec 
Log Message:



Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- im-chooser.spec	24 Jul 2006 13:20:14 -0000	1.4
+++ im-chooser.spec	24 Jul 2006 13:20:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,7 +55,7 @@
 %{_datadir}/applications/im-chooser.desktop
 
 %changelog
-* Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-1
+* Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-2
 - New upstream release.
 - add libgnomeui-devel to BR.
 - im-chooser-suffix-r37.patch: applied to support the recent change



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:31:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:31:22 -0400
Subject: rpms/vim/devel 7.0.040,NONE,1.1
Message-ID: <200607241331.k6ODVMh7013595@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13555

Added Files:
	7.0.040 
Log Message:
patchlevel 40


--- NEW FILE 7.0.040 ---
To: vim-dev at vim.org
Subject: Patch 7.0.040
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.040
Problem:    When 'cmdheight' is larger than 1 using inputlist() or selecting
	    a spell suggestion with the mouse gets the wrong entry.
Solution:   Start listing the first alternative on the last line of the screen.
Files:	    src/eval.c, src/spell.c


*** ../vim-7.0.039/src/eval.c	Thu Jul 13 08:30:50 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 11497,11502 ****
--- 11497,11503 ----
      }
  
      msg_start();
+     msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
      lines_left = Rows;	/* avoid more prompt */
      msg_scroll = TRUE;
      msg_clr_eos();
*** ../vim-7.0.039/src/spell.c	Sat May 13 14:12:51 2006
--- src/spell.c	Mon Jul 10 23:03:04 2006
***************
*** 10071,10076 ****
--- 10071,10077 ----
  
  	/* List the suggestions. */
  	msg_start();
+ 	msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
  	lines_left = Rows;	/* avoid more prompt */
  	vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"),
  						sug.su_badlen, sug.su_badptr);
*** ../vim-7.0.039/src/version.c	Thu Jul 13 08:30:50 2006
--- src/version.c	Sun Jul 23 21:51:04 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     40,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
40. You tell the cab driver you live at
    http://123.elm.street/house/bluetrim.html
41. You actually try that 123.elm.street address.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:31:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:31:21 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.15,1.16
Message-ID: <200607241331.k6ODVLOP013587@cvs.devel.redhat.com>

Author: markmc

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13475

Modified Files:
	libvirt.spec 
Log Message:
* Mon Jul 24 2006 Mark McLoughlin <markmc at redhat.com> - 0.1.3-2
- Add BuildRequires: xen-devel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libvirt.spec	12 Jul 2006 06:58:34 -0000	1.15
+++ libvirt.spec	24 Jul 2006 13:31:15 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.1.3
-Release: 1.1
+Release: 2
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Requires: libxml2
 Requires: readline
 Requires: ncurses
+BuildRequires: xen-devel
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
@@ -106,6 +107,9 @@
 %doc docs/examples/python
 
 %changelog
+* Mon Jul 24 2006 Mark McLoughlin <markmc at redhat.com> - 0.1.3-2
+- Add BuildRequires: xen-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:31:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:31:46 -0400
Subject: rpms/vim/devel 7.0.041,NONE,1.1
Message-ID: <200607241331.k6ODVkXG013701@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13650

Added Files:
	7.0.041 
Log Message:
patchlevel 41


--- NEW FILE 7.0.041 ---
To: vim-dev at vim.org
Subject: Patch 7.0.041
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.041
Problem:    cursor([1, 1]) doesn't work. (Peter Hodge)
Solution:   Allow leaving out the third item of the list and use zero for the
	    virtual column offset.
Files:	    src/eval.c


*** ../vim-7.0.040/src/eval.c	Sun Jul 23 21:52:16 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 16465,16473 ****
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd] */
!     if (arg->v_type != VAR_LIST || l == NULL
! 				      || l->lv_len != (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
--- 16465,16476 ----
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
!      * when "fnump" isn't NULL and "coladd" is optional. */
!     if (arg->v_type != VAR_LIST
! 	    || l == NULL
! 	    || l->lv_len < (fnump == NULL ? 2 : 3)
! 	    || l->lv_len > (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
***************
*** 16493,16500 ****
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	return FAIL;
!     posp->coladd = n;
  #endif
  
      return OK;
--- 16496,16504 ----
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	posp->coladd = 0;
!     else
! 	posp->coladd = n;
  #endif
  
      return OK;
*** ../vim-7.0.040/src/version.c	Sun Jul 23 21:52:16 2006
--- src/version.c	Sun Jul 23 21:59:43 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     41,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
43. You tell the kids they can't use the computer because "Daddy's got work to
    do" and you don't even have a job.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:32:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:32:09 -0400
Subject: rpms/vim/devel 7.0.042,NONE,1.1
Message-ID: <200607241332.k6ODW9am013790@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13742

Added Files:
	7.0.042 
Log Message:
patchlevel 42


--- NEW FILE 7.0.042 ---
To: vim-dev at vim.org
Subject: Patch 7.0.042
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.042
Problem:    When pasting a block of text in Insert mode Vim hangs or crashes.
	    (Noam Halevy)
Solution:   Avoid that the cursor is positioned past the NUL of a line.
Files:	    src/ops.c


*** ../vim-7.0.041/src/ops.c	Tue Jun 20 20:29:13 2006
--- src/ops.c	Sun Jul 23 22:36:39 2006
***************
*** 3493,3500 ****
--- 3493,3507 ----
  # endif
  	if (flags & PUT_CURSEND)
  	{
+ 	    colnr_T len;
+ 
  	    curwin->w_cursor = curbuf->b_op_end;
  	    curwin->w_cursor.col++;
+ 
+ 	    /* in Insert mode we might be after the NUL, correct for that */
+ 	    len = (colnr_T)STRLEN(ml_get_curline());
+ 	    if (curwin->w_cursor.col > len)
+ 		curwin->w_cursor.col = len;
  	}
  	else
  	    curwin->w_cursor.lnum = lnum;
*** ../vim-7.0.041/src/version.c	Sun Jul 23 22:07:55 2006
--- src/version.c	Sun Jul 23 22:35:13 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     42,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
45. You buy a Captain Kirk chair with a built-in keyboard and mouse.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:32:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:32:43 -0400
Subject: rpms/vim/devel README.patches,1.51,1.52 vim.spec,1.128,1.129
Message-ID: <200607241332.k6ODWhCw013921@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13884

Modified Files:
	README.patches vim.spec 
Log Message:
Patchlevel 42


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- README.patches	20 Jul 2006 10:25:40 -0000	1.51
+++ README.patches	24 Jul 2006 13:32:41 -0000	1.52
@@ -64,3 +64,6 @@
   1880  7.0.037  crash when resizing Vim window when a line doesn't fit
   3236  7.0.038  complete() can be used from expr. mapping after inserting text
   3240  7.0.039  third argument for inputdialog() doesn't work in the console
+  1946  7.0.040  mouse selection with "z=" and inputlist() gets wrong entry
+  2229  7.0.041  cursor([1, 2]) failed, required third item in the list
+  1603  7.0.042  crash or hang when pasting a block in Insert mode


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- vim.spec	20 Jul 2006 10:25:40 -0000	1.128
+++ vim.spec	24 Jul 2006 13:32:41 -0000	1.129
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 039
+%define patchlevel 042
 
 Summary: The VIM editor.
 Name: vim
@@ -93,6 +93,9 @@
 Patch037: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.037
 Patch038: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.038
 Patch039: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.039
+Patch040: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.040
+Patch041: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.041
+Patch042: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.042
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -266,6 +269,9 @@
 %patch037 -p0
 %patch038 -p0
 %patch039 -p0
+%patch040 -p0
+%patch041 -p0
+%patch042 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -602,6 +608,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Jul 24 2006 Karsten Hopp <karsten at redhat.de> 7.0.042-1
+- patchlevel 42
+
 * Wed Jul 20 2006 Karsten Hopp <karsten at redhat.de> 7.0.039-1
 - patchlevel 39
 - allow usage of $VIM variable (#199465)



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:38:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:38:27 -0400
Subject: rpms/kdebase/devel kdebase.spec,1.207,1.208
Message-ID: <200607241338.k6ODcRVl015314@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15275

Modified Files:
	kdebase.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- kdebase.spec	24 Jul 2006 12:22:30 -0000	1.207
+++ kdebase.spec	24 Jul 2006 13:38:24 -0000	1.208
@@ -7,7 +7,7 @@
 %define include_kappfinder 0
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define kde_version 3.5.4
 %define kdelibs_epoch 6
 %define arts_epoch 8
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 0.pre1
+Release: 0.pre1%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -158,8 +158,7 @@
 
 %prep
 %setup -q -n %{name}-3.5.3
-%patch200 -p1 -b .libtool
-%patch0 -p0 -b .kde3.5.4
+%patch0 -p0
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .vroot
 %patch3 -p1 -b .shortcuts



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:51:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:51:55 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.23,1.24
Message-ID: <200607241351.k6ODptYD000603@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv527

Modified Files:
	xdoclet.spec 
Log Message:
Rebuild on new gcc



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xdoclet.spec	23 Jul 2006 19:37:08 -0000	1.23
+++ xdoclet.spec	24 Jul 2006 13:51:53 -0000	1.24
@@ -43,7 +43,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	6jpp_2fc
+Release:	6jpp_3fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -292,6 +292,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_3fc
+- Rebuild on new gcj
+
 * Sun Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_2fc
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:53:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:53:49 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.68,1.69
Message-ID: <200607241353.k6ODrnDJ001379@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1317

Modified Files:
	sane-backends.spec 
Log Message:
version 1.0.18
unify spec file between OS releases



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sane-backends.spec	12 Jul 2006 17:37:46 -0000	1.68
+++ sane-backends.spec	24 Jul 2006 13:53:46 -0000	1.69
@@ -1,13 +1,27 @@
-# Disable gphoto2 backend by using "--without gphoto2"
-%define gphoto2_support 0%{!?_without_gphoto2:1}
+# --with/--without options:
+# gphoto2:        support gphoto2 backend
+# gphoto2_split:  ship gphoto2 backend in separate subpackage
+# libs_split:     ship libraries in separate subpackage
+# docs_split:     ship documentation in separate subpackage
+# programs_split: ship programs in separate subpackage
 
-# Enable splitting out gphoto2 backends by using "--with gphoto2_split"
+%define gphoto2_support 0%{!?_without_gphoto2:1}
 %define gphoto2_split 0%{!?_without_gphoto2:%{?_with_gphoto2_split:1}}
 
+%if 0%{?fedora} >= 6 || 0%{?redhat} >= 5
+%define libs_split 0%{?!_without_libs_split:1}
+%define docs_split 0%{?_with_docs_split:1}
+%define programs_split 0%{?_with_programs_split:1}
+%else
+%define libs_split 0%{?_with_libs_split:1}
+%define docs_split 0%{?!_without_docs_split:1}
+%define programs_split 0%{?!_without_programs_split:1}
+%endif
+
 Summary: Scanner access software
 Name: sane-backends
-Version: 1.0.17
-Release: 13.1
+Version: 1.0.18
+Release: 1%{?dist}
 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
@@ -28,8 +42,12 @@
 Requires: pam >= 0.78-2
 Requires: udev
 Requires: libsane-hpaio
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%if ! %{docs_split}
 Obsoletes: sane-backends-docs <= 1.0.17-12
-Provides: sane-backends-docs
+Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%endif
 ExcludeArch: s390 s390x
 
 %description
@@ -53,6 +71,16 @@
 This package contains static libraries and header files for writing Scanner
 Access Now Easy (SANE) modules.
 
+%if %{docs_split}
+%package docs
+Summary: Additional documentation for SANE
+Group: Documentation
+
+%description docs
+Additional documentation for SANE, a universal scanner interface.
+%endif
+
+%if %{libs_split}
 %package libs
 Summary: SANE libraries
 Group: System Environment/Libraries
@@ -73,7 +101,9 @@
 This package contains the SANE libraries which are needed by applications that
 want to access digital cameras.
 %endif
+%endif
 
+%if %{programs_split}
 %package programs
 Summary: SANE programs
 Group: Applications/Multimedia
@@ -81,6 +111,7 @@
 %description programs
 This package contains SANE Utilities and the SANE daemon needed for scanning
 over a network.
+%endif
 
 %prep
 %setup -q
@@ -138,9 +169,13 @@
 %clean
 rm -rf %{buildroot}
 
+%if %{libs_split}
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
+%else
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%endif
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -148,10 +183,50 @@
 %config(noreplace) /etc/sane.d/*
 %{_sysconfdir}/udev/rules.d/*
 %{_mandir}/*/*
-%exclude %{_mandir}/man1/*
-%exclude %{_mandir}/man8/*
 %{_datadir}/pixmaps/sane.png
+
+%if ! %{libs_split}
+%{_libdir}/libsane*.so.*
+%dir %{_libdir}/sane
+%{_libdir}/sane/*.so.*
+%endif
+
+%if %{docs_split}
+%{_docdir}/*
+%exclude %{_docdir}/%{name}-%{version}/sane-backends.html
+%exclude %{_docdir}/%{name}-%{version}/sane-backends-external.html
+%exclude %{_docdir}/%{name}-%{version}/sane-mfgs.html
+%exclude %{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%exclude %{_docdir}/%{name}-%{version}/sane.dvi
+%exclude %{_docdir}/%{name}-%{version}/sane.ps
+%else
 %doc %{_docdir}/*
+%endif
+
+%if %{programs_split}
+%exclude %{_mandir}/man1/*
+%exclude %{_mandir}/man8/*
+
+%files programs
+%defattr(-, root, root)
+%{_mandir}/man1/sane-find-scanner.1*
+%{_mandir}/man1/scanimage.1*
+%{_mandir}/man8/saned.8*
+%endif
+%{_bindir}/sane-find-scanner
+%{_bindir}/scanimage
+%{_sbindir}/*
+
+%if %{docs_split}
+%files docs
+%defattr(-, root, root)
+%{_docdir}/%{name}-%{version}/sane-backends.html
+%{_docdir}/%{name}-%{version}/sane-backends-external.html
+%{_docdir}/%{name}-%{version}/sane-mfgs.html
+%{_docdir}/%{name}-%{version}/sane-mfgs-external.html
+%{_docdir}/%{name}-%{version}/sane.dvi
+%{_docdir}/%{name}-%{version}/sane.ps
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -163,6 +238,7 @@
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/sane-backends.pc
 
+%if %{libs_split}
 %files libs
 %defattr(-, root, root)
 %{_libdir}/libsane*.so.*
@@ -175,18 +251,14 @@
 %defattr(-, root, root)
 %{_libdir}/sane/*gphoto2.so.*
 %endif
-
-%files programs
-%defattr(-, root, root)
-%{_bindir}/sane-find-scanner
-%{_bindir}/scanimage
-%{_mandir}/man1/sane-find-scanner.1*
-%{_mandir}/man1/scanimage.1*
-%{_sbindir}/*
-%{_mandir}/man8/saned.8*
+%endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-1
+- version 1.0.18
+- unify spec file between OS releases
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-13.1
 - rebuild
 
 * Fri Jun 09 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-13



From fedora-cvs-commits at redhat.com  Mon Jul 24 13:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 09:54:44 -0400
Subject: rpms/im-chooser/devel im-chooser-suffix-r40.patch, NONE,
	1.1 im-chooser.spec, 1.5, 1.6 im-chooser-suffix-r37.patch, 1.1, NONE
Message-ID: <200607241354.k6ODsiSs001780@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/im-chooser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1739

Modified Files:
	im-chooser.spec 
Added Files:
	im-chooser-suffix-r40.patch 
Removed Files:
	im-chooser-suffix-r37.patch 
Log Message:


im-chooser-suffix-r40.patch:
 ChangeLog        |   13 +++++++++++++
 configure.ac     |   18 ++++++++++++++++++
 src/Makefile.am  |    1 +
 src/im-chooser.c |   23 +++++++++++++++--------
 src/xinput.c     |    5 +++++
 5 files changed, 52 insertions(+), 8 deletions(-)

--- NEW FILE im-chooser-suffix-r40.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(??????????????? 37)
+++ configure.ac	(???????????????)
@@ -85,6 +85,10 @@
 	AC_HELP_STRING([--with-xinitdir], [build with the specific xinit directory])
 	,,
 	with_xinitdir=no)
+AC_ARG_WITH(xinput-suffix,
+	AC_HELP_STRING([--with-xinput-suffix], [specify the xinput file suffix])
+	,,
+	with_xinput_suffix=no)
 
 dnl ======================================================================
 dnl options - xinputdir
@@ -113,6 +117,19 @@
 AC_SUBST(XINIT_PATH)
 
 dnl ======================================================================
+dnl options - xinitdir
+dnl ======================================================================
+AC_MSG_CHECKING(whether to build the specific xinput suffix)
+if test "x$with_xinput_suffix" = xno; then
+   	with_xinput_suffix=""
+	AC_MSG_RESULT(no)
+else
+	AC_MSG_RESULT(yes)
+fi
+XINPUT_SUFFIX=$with_xinput_suffix
+AC_SUBST(XINPUT_SUFFIX)
+
+dnl ======================================================================
 dnl output
 dnl ======================================================================
 AC_CONFIG_FILES([
@@ -133,5 +150,6 @@
 echo " LIBS:                       $IMCHOOSE_LIBS"
 echo " XINPUT_PATH:                $XINPUT_PATH"
 echo " XINIT_PATH:                 $XINIT_PATH"
+echo " XINPUT_SUFFIX:              $XINPUT_SUFFIX"
 echo " GNOME support:              $use_gnome"
 echo ""
Index: ChangeLog
===================================================================
--- ChangeLog	(??????????????? 37)
+++ ChangeLog	(???????????????)
@@ -1,6 +1,19 @@
 2006-07-24  Akira TAGOH  <at at gclab.org>
 
+	* src/xinput.c (xinput_get_im_list): exactly lookup with the suffix.
+
+	* src/im-chooser.c (im_chooser_instance_init): put the xinput name
+	without the suffix.
+	(im_chooser_update_xinputrc): make a symlink with the suffix.
+
+	* src/xinput.c (xinput_get_im_list): lookup the xiput file with
+	the suffix.
+
+	* src/im-chooser.c (im_chooser_get_widget): fixed to make
+	a non-sensitive when no options available on custom.
+
 	* configure.ac: bumped to 0.3.0.
+	added --with-xinput-suffix option.
 
 	* src/im-chooser.c (im_chooser_get_widget): fixed a typo.
 
Index: src/im-chooser.c
===================================================================
--- src/im-chooser.c	(??????????????? 37)
+++ src/im-chooser.c	(???????????????)
@@ -227,10 +227,15 @@
 		xinput = xinput_data_new(l->data);
 		if (xinput != NULL) {
 			gchar *name = g_path_get_basename(l->data);
+			size_t suffixlen = strlen(XINPUT_SUFFIX), len;
 
 			if (name != NULL &&
 			    GPOINTER_TO_UINT (xinput_data_get_value(xinput, XINPUT_VALUE_IGNORE_ME)) != TRUE) {
-				g_hash_table_replace(im->im_table, name, xinput);
+				len = strlen(name);
+				if (len > suffixlen) {
+					name[len - suffixlen] = 0;
+					g_hash_table_replace(im->im_table, name, xinput);
+				}
 			}
 		}
 	}
@@ -265,10 +270,10 @@
 					 */
 					mode = IM_MODE_SYSTEM;
 					retval = TRUE;
-				} else if (strcmp(name, IM_NONE_NAME) == 0) {
+				} else if (strcmp(name, IM_NONE_NAME XINPUT_SUFFIX) == 0) {
 					mode = IM_MODE_NEVER;
 					retval = TRUE;
-				} else if (strcmp(name, IM_XIM_NAME) == 0) {
+				} else if (strcmp(name, IM_XIM_NAME XINPUT_SUFFIX) == 0) {
 					mode = IM_MODE_LEGACY;
 					retval = TRUE;
 				} else {
@@ -564,7 +569,7 @@
 		gtk_alignment_set_padding(GTK_ALIGNMENT (align2), 10, 0, 0, 0);
 		gtk_container_add(GTK_CONTAINER (align2), label3);
 		gtk_box_pack_start(GTK_BOX (vbox), align2, FALSE, FALSE, 0);
-		if (DECODE_MODE (im->mode) == IM_MODE_CUSTOM)
+		if (DECODE_MODE (im->mode) == IM_MODE_CUSTOM && !no_custom)
 			gtk_widget_set_sensitive(im->option, TRUE);
 
 		im->widget = vbox;
@@ -592,7 +597,7 @@
 			   IMChooserSubMode  submode,
 			   const gchar      *xinputname)
 {
-	gchar *srcfile = NULL, *dstfile = NULL, *backupfile = NULL;
+	gchar *srcfile = NULL, *dstfile = NULL, *backupfile = NULL, *confname;
 	const gchar *home;
 	gboolean retval = FALSE;
 	struct stat st;
@@ -630,14 +635,14 @@
 		    retval = TRUE;
 		    break;
 	    case IM_MODE_NEVER:
-		    srcfile = g_build_filename(XINPUT_PATH, IM_NONE_NAME, NULL);
+		    srcfile = g_build_filename(XINPUT_PATH, IM_NONE_NAME XINPUT_SUFFIX, NULL);
 		    if (symlink(srcfile, dstfile) == -1) {
 			    g_warning("Failed to create a symlink %s from %s", dstfile, srcfile);
 		    }
 		    retval = TRUE;
 		    break;
 	    case IM_MODE_LEGACY:
-		    srcfile = g_build_filename(XINPUT_PATH, IM_XIM_NAME, NULL);
+		    srcfile = g_build_filename(XINPUT_PATH, IM_XIM_NAME XINPUT_SUFFIX, NULL);
 		    if (symlink(srcfile, dstfile) == -1) {
 			    g_warning("Failed to create a symlink %s from %s", dstfile, srcfile);
 		    }
@@ -654,7 +659,9 @@
 					g_warning("no xinputname given.");
 					break;
 				}
-				srcfile = g_build_filename(XINPUT_PATH, xinputname, NULL);
+				confname = g_strdup_printf("%s%s", xinputname, XINPUT_SUFFIX);
+				srcfile = g_build_filename(XINPUT_PATH, confname, NULL);
+				g_free(confname);
 				if (symlink(srcfile, dstfile) == -1) {
 					g_warning("Failed to create a symlink %s from %s", dstfile, srcfile);
 				}
Index: src/xinput.c
===================================================================
--- src/xinput.c	(??????????????? 37)
+++ src/xinput.c	(???????????????)
@@ -82,6 +82,7 @@
 	const gchar *name;
 	gchar *filename;
 	struct stat st;
+	size_t len, suffixlen = strlen(XINPUT_SUFFIX);
 
 	if (path == NULL) {
 		path = XINPUT_PATH;
@@ -89,6 +90,10 @@
 	if ((dir = g_dir_open(path, 0, NULL)) == NULL)
 		return NULL;
 	while ((name = g_dir_read_name(dir)) != NULL) {
+		len = strlen(name);
+		if (len < suffixlen ||
+		    strcmp(&name[len - suffixlen], XINPUT_SUFFIX) != 0)
+			continue;
 		filename = g_build_filename(path, name, NULL);
 		if (lstat(filename, &st) == 0) {
 			if (S_ISREG (st.st_mode) && !S_ISLNK (st.st_mode)) {
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(??????????????? 37)
+++ src/Makefile.am	(???????????????)
@@ -4,6 +4,7 @@
 	-DG_LOG_DOMAIN="\"IM-Chooser\""				\
 	-DXINIT_PATH="\"$(XINIT_PATH)\""			\
 	-DXINPUT_PATH="\"$(XINPUT_PATH)\""			\
+	-DXINPUT_SUFFIX="\"$(XINPUT_SUFFIX)\""			\
 	$(IMCHOOSE_CFLAGS)					\
 	$(GNOME_CFLAGS)						\
 	$(NULL)


Index: im-chooser.spec
===================================================================
RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- im-chooser.spec	24 Jul 2006 13:20:50 -0000	1.5
+++ im-chooser.spec	24 Jul 2006 13:54:42 -0000	1.6
@@ -7,7 +7,7 @@
 BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel automake autoconf
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
-Patch0:		im-chooser-suffix-r37.patch
+Patch0:		im-chooser-suffix-r40.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -33,6 +33,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# rename the xinput files with .conf suffix
+mv $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/none{,.conf}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/xim{,.conf}
 
 %find_lang %{name}
 
@@ -40,12 +43,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none 10
-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim 30
+alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
+alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
 
 %postun
-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none
-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim
+alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
+alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -58,7 +61,7 @@
 * Mon Jul 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.3.0-2
 - New upstream release.
 - add libgnomeui-devel to BR.
-- im-chooser-suffix-r37.patch: applied to support the recent change
+- im-chooser-suffix-r40.patch: applied to support the recent change
   in the xinput files.
 
 * Thu Jul 20 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-2


--- im-chooser-suffix-r37.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:11:47 -0400
Subject: rpms/pam_pkcs11/devel pam_pkcs11.spec,1.8,1.9
Message-ID: <200607241411.k6OEBlHY005998@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5926

Modified Files:
	pam_pkcs11.spec 
Log Message:
- compile with better debugging flags



Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pam_pkcs11.spec	24 Jul 2006 02:35:29 -0000	1.8
+++ pam_pkcs11.spec	24 Jul 2006 14:11:45 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.5.3
-Release:        8
+Release:        9
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -77,7 +77,7 @@
     --with-debug  \
     --disable-dependency-tracking  \
     %{curl_flags} %{ldap_flags} 
-make %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS -O0 -ggdb3" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -155,6 +155,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> 0.5.3-9
+- compile with better debugging flags
+
 * Sun Jul 23 2006 Ray Strode <rstrode at redhat.com> 0.5.3-8
 - fix bug where it was ignoring first argument of module
   command line



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:25:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:25:03 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility-3.5.3-3.5.4.patch, NONE,
	1.1 kdeaccessibility.spec, 1.19, 1.20
Message-ID: <200607241425.k6OEP34x025021@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15249

Modified Files:
	kdeaccessibility.spec 
Added Files:
	kdeaccessibility-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)


kdeaccessibility-3.5.3-3.5.4.patch:
 IconThemes/mono/index.theme                                     |    3 
 admin/acinclude.m4.in                                           |    2 
 admin/cvs.sh                                                    |    6 
 doc/kmag/index.docbook                                          |   24 
 doc/kmousetool/index.docbook                                    |    8 
 doc/kmouth/index.docbook                                        |   14 
 kbstateapplet/kbstate.cpp                                       |    2 
 kbstateapplet/kbstateapplet.desktop                             |    6 
 kmag/kmag.cpp                                                   |    2 
 kmag/kmag.desktop                                               |    3 
 kmousetool/kmousetool/kmousetool.desktop                        |    1 
 kmouth/books/de.desktop                                         |    1 
 kmouth/books/en.desktop                                         |    1 
 kmouth/books/nl.desktop                                         |    4 
 kmouth/books/sv.desktop                                         |    1 
 kmouth/kmouth.desktop                                           |    1 
 ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop               |    4 
 ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop       |    4 
 ksayit/src/ksayit.desktop                                       |    5 
 kttsd/app-plugins/kate/ktexteditor_kttsd.desktop                |    6 
 kttsd/compat/interfaces/kspeech/dcoptexttospeech.desktop        |    3 
 kttsd/filters/sbd/kttsd_sbdplugin.desktop                       |    6 
 kttsd/filters/stringreplacer/abbreviations.xml                  |    9 
 kttsd/filters/stringreplacer/chat-de.xml                        |  101 +++
 kttsd/filters/stringreplacer/chat.xml                           |  101 +++
 kttsd/filters/stringreplacer/editreplacementwidget.ui           |  267 +++++++---
 kttsd/filters/stringreplacer/emoticons.xml                      |   49 +
 kttsd/filters/stringreplacer/festival_unspeakable_chars.xml     |   15 
 kttsd/filters/stringreplacer/kmail.xml                          |    4 
 kttsd/filters/stringreplacer/kttsd_stringreplacerplugin.desktop |    6 
 kttsd/filters/stringreplacer/polish_festival_fixes.xml          |    1 
 kttsd/filters/stringreplacer/polish_festival_unspeakables.xml   |   12 
 kttsd/filters/stringreplacer/qt2plaintext.xml                   |   59 ++
 kttsd/filters/stringreplacer/stringreplacerconf.cpp             |   54 +-
 kttsd/filters/stringreplacer/stringreplacerconf.h               |    2 
 kttsd/filters/stringreplacer/stringreplacerconfwidget.ui        |   13 
 kttsd/filters/stringreplacer/stringreplacerproc.cpp             |    8 
 kttsd/filters/stringreplacer/stringreplacerproc.h               |    2 
 kttsd/filters/talkerchooser/kttsd_talkerchooserplugin.desktop   |    6 
 kttsd/filters/xmltransformer/kttsd_xmltransformerplugin.desktop |    6 
 kttsd/kcmkttsmgr/kcmkttsd.desktop                               |    7 
 kttsd/kcmkttsmgr/kcmkttsd_testmessage.desktop                   |    3 
 kttsd/kttsd/kttsd.desktop                                       |    4 
 kttsd/kttsd/kttsd.h                                             |    2 
 kttsd/kttsjobmgr/kttsjobmgr.desktop                             |    3 
 kttsd/kttsmgr/kttsmgr.desktop                                   |    6 
 kttsd/libkttsd/kttsd_synthplugin.desktop                        |    1 
 kttsd/players/akodeplayer/kttsd_akodeplugin.desktop             |    8 
 kttsd/players/alsaplayer/Makefile.am                            |    1 
 kttsd/players/alsaplayer/alsaplayer.cpp                         |   16 
 kttsd/players/alsaplayer/kttsd_alsaplugin.desktop               |    8 
 kttsd/players/artsplayer/kttsd_artsplugin.desktop               |    6 
 kttsd/players/gstplayer/kttsd_gstplugin.desktop                 |    6 
 kttsd/players/kttsd_audioplugin.desktop                         |    3 
 kttsd/plugins/command/kttsd_commandplugin.desktop               |    6 
 kttsd/plugins/epos/eposconfwidget.ui                            |    2 
 kttsd/plugins/epos/kttsd_eposplugin.desktop                     |    6 
 kttsd/plugins/festivalint/kttsd_festivalintplugin.desktop       |    4 
 kttsd/plugins/flite/kttsd_fliteplugin.desktop                   |    4 
 kttsd/plugins/freetts/kttsd_freettsplugin.desktop               |    3 
 kttsd/plugins/hadifix/kttsd_hadifixplugin.desktop               |    3 
 61 files changed, 788 insertions(+), 136 deletions(-)

--- NEW FILE kdeaccessibility-3.5.3-3.5.4.patch ---
Index: kmag/kmag.desktop
===================================================================
--- kmag/kmag.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kmag/kmag.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -9,10 +9,12 @@
 Terminal=false
 Name=KMag
 Name[el]=K ???????????????????????? ??????????
+Name[sk]=KLupa
 Name[sv]=Kmag
 Name[tg]=KMag 
 Name[th]=???????????????????????? - K
 Name[vi]=K??nh l??p K
+Name[zh_TW]=K-?????????
 GenericName=Screen Magnifier
 GenericName[ar]=?????????? ????????????
 GenericName[bg]=???????? ???? ????????????
@@ -38,6 +40,7 @@
 GenericName[it]=Lente di ingrandimento per lo schermo
 GenericName[ja]=???????????????
 GenericName[lt]=Ekrano didintojas
+GenericName[mk]=???????????????????? ???? ??????????????
 GenericName[ms]=Pembesar Skrin
 GenericName[nb]=Skjermforst??rrer
 GenericName[nds]=Schirmluup
Index: kmag/kmag.cpp
===================================================================
--- kmag/kmag.cpp	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kmag/kmag.cpp	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -97,7 +97,7 @@
   fpsArray.push_back(15); // high
   fpsArray.push_back(25); // very high
 
-  rotationArrayString << i18n("&No Rotation (0??)") << i18n("&Left (90??)") << i18n("&Upside Down (180??)") << i18n("&Right (270??)");
+  rotationArrayString << i18n("&No Rotation (0 Degrees)") << i18n("&Left (90 Degrees)") << i18n("&Upside Down (180 Degrees)") << i18n("&Right (270 Degrees)");
 
   rotationArray.push_back(0); // no rotation
   rotationArray.push_back(90); // left
Index: kmousetool/kmousetool/kmousetool.desktop
===================================================================
--- kmousetool/kmousetool/kmousetool.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kmousetool/kmousetool/kmousetool.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -94,6 +94,7 @@
 GenericName[it]=Clic automatico del mouse
 GenericName[ja]=???????????????????????????
 GenericName[lt]=Automatiniai pel??s paspaudimai
+GenericName[mk]=???????????????????? ???????????????????? ???? ????????????????
 GenericName[ms]=Klik Tetikus Automatik
 GenericName[mt]=Klikk tal-Maws Awtomatiku
 GenericName[nb]=Automatisk museklikk
Index: kbstateapplet/kbstateapplet.desktop
===================================================================
--- kbstateapplet/kbstateapplet.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kbstateapplet/kbstateapplet.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -22,6 +22,7 @@
 Name[it]=Applet per lo stato della tastiera
 Name[ja]=????????????????????????????????????
 Name[lt]=Klaviat??ros b??kl??s ??skiepis
+Name[mk]=?????????? ???? ???????????? ???? ??????????????????????
 Name[ms]=Aplet Status Papan Kekunci
 Name[nb]=Miniprogram for tastaturstatus
 Name[nds]=Tastatuurstatus-L??ttprogramm
@@ -31,6 +32,7 @@
 Name[pt]='Applet' de estado do teclado
 Name[pt_BR]=Mini-aplicativo de status do teclado
 Name[ru]=?????????? ?????????????????? ????????????????????
+Name[sk]=Stav kl??vesnice applet
 Name[sl]=Vstavek za stanje tipkovnice
 Name[sr]=?????????? ???? ???????????? ??????????????????
 Name[sr at Latn]=Aplet za status tastature
@@ -42,6 +44,7 @@
 Name[uk]=?????????? ?????????? ????????????????????
 Name[vi]=Ti???u d???ng Tr???ng th??i B??n ph??m
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 Comment=Panel applet that shows the state of the modifier keys
 Comment[bg]=?????????? ???? ?????????????????? ??????????, ?????????? ?????????????? ?????????????????????? ???? ?????????????????? ????????????????????????
 Comment[bs]=Panel applet koji pokazuje stanje modifikatorskih tipaka
@@ -62,6 +65,7 @@
 Comment[it]=Applet del pannello che mostra lo stato dei tasti modificatori
 Comment[ja]=????????????????????????????????????????????????????????????
 Comment[lt]=Pulto ??skiepis rodantis klaviat??ros modifikuojan??i??j?? klavi???? b??sen??
+Comment[mk]=?????????? ???? ?????????????? ?????? ???? ???????????????? ???????????????????? ???? ?????????????????? ???? ????????????????
 Comment[ms]=Panel aplet yang menayangkan keadaan kekunci pengubah suai
 Comment[nb]=Panel-miniprogram som viser tilstanden for valgtastene
 Comment[nds]=Paneel-L??ttprogramm, dat den Tostand vun de S??nnertasten wiest
@@ -71,6 +75,7 @@
 Comment[pt]='Applet' do painel que mostra o estado das teclas modificadoras
 Comment[pt_BR]=??cone de painel que mostra o estado das teclas modificadoras
 Comment[ru]=??????????, ???????????????????????? ?????????????????? ?????????????????????? ????????????
+Comment[sk]=Applet panelu, ktor?? zobraz?? stav modifika??n??ch kl??ves
 Comment[sl]=Pultni vstavek, ki prikazuje stanje modifikatorskih tipk (modifikatorjev)
 Comment[sr]=?????????????? ?????????? ???????? ?????????????????? ?????????? ?????????????????????????????? ??????????????
 Comment[sr at Latn]=Panelni aplet koji prikazuje stanje modifikatorskih tastera
@@ -82,5 +87,6 @@
 Comment[uk]=?????????? ????????????, ???????? ?????????????? ???????? ????????????-??????????????????????????
 Comment[vi]=Ti???u d???ng b???ng ??i???u khi???n hi???n th??? tr???ng th??i ph??m b??? tr???
 Comment[zh_CN]=???????????????????????????????????????
+Comment[zh_TW]=??????????????????????????????????????????
 Icon=key_enter
 X-KDE-Library=kbstate_panelapplet
Index: kbstateapplet/kbstate.cpp
===================================================================
--- kbstateapplet/kbstate.cpp	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kbstateapplet/kbstate.cpp	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -526,7 +526,7 @@
    }
    state = 0;
    
-   for (int i = 0; modifierKeys[i].name; i++) {
+   for (int i = 0; strcmp(modifierKeys[i].name, "") != 0; i++) {
       int mask = modifierKeys[i].mask;
       if (mask == 0)
          if (modifierKeys[i].keysym != 0)
Index: ksayit/src/ksayit.desktop
===================================================================
--- ksayit/src/ksayit.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ ksayit/src/ksayit.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -7,6 +7,8 @@
 Terminal=false
 Name=KSayIt
 Name[hi]=??????-??????-??????
+Name[mk]=KSaylt
+Name[sk]=PovedzTo
 Name[sv]=Ksayit
 Name[tg]=KSayIt 
 Name[vi]=N??i K
@@ -30,6 +32,7 @@
 GenericName[it]=Interfaccia di pronuncia
 GenericName[ja]=?????????????????????????????????????????????
 GenericName[lt]=Teksto vertimo kalba naudotojo s??saja
+GenericName[mk]=???????????? ?????? ???? ??????????-????-??????????
 GenericName[ms]=Antaramuka Teks-ke-Tutur
 GenericName[mt]=Programm g??al Test-g??al-Vu??i
 GenericName[nb]=Brukerflate for tekst til tale
@@ -40,6 +43,7 @@
 GenericName[pt]=Interface de Texto para Fala
 GenericName[pt_BR]=Interface para a Convers??o de Texto para Fala
 GenericName[ru]=?????????????????? ?? ?????????????????? ?????????????? ????????
+GenericName[sk]=Text-na-re?? rozhranie
 GenericName[sl]=Vmesnik ??besedila v govor??
 GenericName[sr]=?????????????????? ???? ??????????-??-??????????
 GenericName[sr at Latn]=Interfejs za tekst-u-govor
@@ -51,4 +55,5 @@
 GenericName[uk]=?????????????????? ?????????????? ???????????????? ?? ????????????
 GenericName[vi]=Giao di???n chuy???n V??n b???n th??nh Ti???ng n??i
 GenericName[zh_CN]=?????????????????????
+GenericName[zh_TW]=???????????????????????????
 Categories=Qt;KDE;Accessibility;Utility;
Index: ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop
===================================================================
--- ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -21,6 +21,7 @@
 Comment[it]=Un plugin per Freeverb per KTTSD
 Comment[ja]=KSayIt ??? Freeverb ???????????????
 Comment[lt]=Freeverb priedas skirtas KSayIt
+Comment[mk]=Freeverb-?????????????????? ???? Ksaylt
 Comment[nb]=A Freeverb programtillegg for KSayIt
 Comment[nds]=En Freeverb-Moduul f??r KSayIt
 Comment[nl]=Een Freeverb-plugin vor KSayIt
@@ -29,6 +30,8 @@
 Comment[pt]='Plugin' de Reverbera????o para o KTTSD
 Comment[pt_BR]='Plugin' de Reverbera????o para o KTTSD
 Comment[ru]=???????????? Freeverb ?????? KSayIt
+Comment[sk]=Freeverb modul pre PovedzTo
+Comment[sl]=Vstavek Freeverb za KSayIt
 Comment[sr]=Freeverb ?????????????????? ???? KSayIt
 Comment[sr at Latn]=Freeverb priklju??ak za KSayIt
 Comment[sv]=Freeverb-insticksprogram f??r Ksayit
@@ -36,6 +39,7 @@
 Comment[uk]=???????????? Freeverb ?????? KSayIt
 Comment[vi]=Tr??nh b??? sung "?????ng t??? t??? do" cho "N??i K"
 Comment[zh_CN]=KSayIt ??? Freeverb ??????
+Comment[zh_TW]=KSayIt ??? Freeverb ????????????
 ServiceTypes=KSayIt/FXPlugin
 Type=Service
 X-KDE-Library=libFreeverb_plugin
Index: ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop
===================================================================
--- ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -21,6 +21,7 @@
 Comment[it]=Un plugin per Freeverb per KTTSD
 Comment[ja]=KSayIt ??? Freeverb ???????????????
 Comment[lt]=Freeverb priedas skirtas KSayIt
+Comment[mk]=Freeverb-?????????????????? ???? Ksaylt
 Comment[nb]=A Freeverb programtillegg for KSayIt
 Comment[nds]=En Freeverb-Moduul f??r KSayIt
 Comment[nl]=Een Freeverb-plugin vor KSayIt
@@ -29,6 +30,8 @@
 Comment[pt]='Plugin' de Reverbera????o para o KTTSD
 Comment[pt_BR]='Plugin' de Reverbera????o para o KTTSD
 Comment[ru]=???????????? Freeverb ?????? KSayIt
+Comment[sk]=Freeverb modul pre PovedzTo
+Comment[sl]=Vstavek Freeverb za KSayIt
 Comment[sr]=Freeverb ?????????????????? ???? KSayIt
 Comment[sr at Latn]=Freeverb priklju??ak za KSayIt
 Comment[sv]=Freeverb-insticksprogram f??r Ksayit
[...3901 lines suppressed...]
   <subst><![CDATA[what the heck]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[wth]]></match>
   <subst><![CDATA[what the heck]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[wtg]]></match>
   <subst><![CDATA[way to go]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[wtgp]]></match>
   <subst><![CDATA[want to go private]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[wth]]></match>
   <subst><![CDATA[what the heck]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[wygiswypf]]></match>
   <subst><![CDATA[what you get is what you pay for]]></subst>
  </word>
  <word>
   <type>Word</type>
+  <case>No</case>
   <match><![CDATA[yw]]></match>
   <subst><![CDATA[your welcome]]></subst>
  </word>
  <word>
   <type>RegExp</type>
+  <case>No</case>
   <match><![CDATA[\_]]></match>
   <subst><![CDATA[]]></subst>
  </word>
  <word>
   <type>RegExp</type>
+  <case>No</case>
   <match><![CDATA[\|]]></match>
   <subst><![CDATA[ ]]></subst>
  </word>
  <word>
   <type>RegExp</type>
+  <case>No</case>
   <match><![CDATA[\\o\/]]></match>
   <subst><![CDATA[ cheers ]]></subst>
  </word>
  <word>
   <type>RegExp</type>
+  <case>No</case>
   <match><![CDATA[\/o\\]]></match>
   <subst><![CDATA[ covers ears ]]></subst>
  </word>
  <word>
   <type>RegExp</type>
+  <case>No</case>
   <match><![CDATA[\:\-\/]]></match>
   <subst><![CDATA[ frowns ]]></subst>
  </word>
Index: kttsd/filters/talkerchooser/kttsd_talkerchooserplugin.desktop
===================================================================
--- kttsd/filters/talkerchooser/kttsd_talkerchooserplugin.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kttsd/filters/talkerchooser/kttsd_talkerchooserplugin.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -16,6 +16,7 @@
 Name[is]=Talveljari
 Name[it]=Selezione dell'oratore
 Name[ja]=????????????
+Name[mk]=?????????????? ???? ????????????????????
 Name[ms]=Pemilih Penutur
 Name[nb]=Snakkevelger
 Name[nds]=Snacker-Utwahl
@@ -25,6 +26,7 @@
 Name[pt]=Escolha de Orador
 Name[pt_BR]=Escolha do Talker
 Name[ru]=????????????
+Name[sk]=Vo??ba hovorcu
 Name[sl]=Izbirnik govornika
 Name[sr]=?????????? ??????????????????
 Name[sr at Latn]=Bira?? govornika
@@ -34,6 +36,7 @@
 Name[tr]=Konu??mac?? Se??ici
 Name[uk]=?????????? ??????????????
 Name[vi]=Tr??nh ch???n M??y n??i
+Name[zh_TW]=???????????????
 Comment=Generic Talker Chooser Filter Plugin for KTTS
 Comment[bg]=?????????????????? ???? ?????????? ???? ???????? ???? KTTS
 Comment[ca]=Connector del filtre selector gen??ric de parla pel KTTS
@@ -50,6 +53,7 @@
 Comment[is]=Almennt talvals??forrit fyrir KTTS
 Comment[it]=Plugin generico per il filtro di scelta dell'oratore per KTTS
 Comment[ja]=KTTS ????????????????????????????????????????????????
+Comment[mk]=???????????? ???? KTTS ???? ?????????????? ???? ???????? ????????????????
 Comment[ms]=Plugin Penapis Pemilih Penutur Generik bagi KTTS
 Comment[nb]=Filter-programtillegg til KTTS for snakkervalg
 Comment[nds]=KTTS-Moduul f??r dat Uts??ken vun den Snacker
@@ -59,6 +63,7 @@
 Comment[pt]='Plugin' Gen??rico de Escolha de Orador para o KTTS
 Comment[pt_BR]=Plug-in de Filtro Gen??rico Para Escolha do Talker do KTTS
 Comment[ru]=???????????? ???????????? ?????????????? ?????? KTTS
+Comment[sk]=V??eobecn?? modul filra pre vo??bu hovorcu v KTTS
 Comment[sl]=Filtrni vstavek KTTS za generi??ni izbirnik govorca
 Comment[sr]=?????????????????? ?????????????????? ?????????????????? KTTS-?? ???? ?????????? ??????????????????
 Comment[sr at Latn]=Generi??ki filterski priklju??ak KTTS-a za bira?? govornika
@@ -68,6 +73,7 @@
 Comment[tr]=KTTS i??in Genel Konu??ma Se??ici S??zgeci Eklentisi
 Comment[uk]=?????????????????? ???????????? ?????????????? ???????????? ?????????????? ?????? KTTS
 Comment[vi]=Tr??nh b??? sung L???c Ch???n M??y n??i Chung cho KTTS
+Comment[zh_TW]=KTTS ?????????????????????????????????
 Type=Service
 ServiceTypes=KTTSD/FilterPlugin
 X-KDE-Library=libkttsd_talkerchooserplugin
Index: kttsd/filters/sbd/kttsd_sbdplugin.desktop
===================================================================
--- kttsd/filters/sbd/kttsd_sbdplugin.desktop	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ kttsd/filters/sbd/kttsd_sbdplugin.desktop	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -17,6 +17,7 @@
 Name[it]=Rilevatore del limite delle frasi
 Name[ja]=??????????????????????????????
 Name[lt]=Sakinio rib?? aptikiklis
+Name[mk]=???????????????? ???? ?????????????? ???? ????????????????
 Name[ms]=Pengesan Sempadan Ayat
 Name[nb]=Finner setningsgrenser
 Name[nds]=Satzgrenz-Faststellen
@@ -25,6 +26,7 @@
 Name[pt]=Detector de Limite de Frase
 Name[pt_BR]=Detector de Fim de Senten??as
 Name[ru]=???????????????????????? ???????????? ??????????????????????
+Name[sk]=Detekcia okraja vety
 Name[sl]=Detektor meje stavkov
 Name[sr]=???????????????? ?????????????? ????????????????
 Name[sr at Latn]=Detektor granica re??enice
@@ -35,6 +37,7 @@
 Name[uk]=?????????????????? ?????? ????????????
 Name[vi]=Tr??nh nh???n d???ng Ranh gi???i C??u v??n
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 Comment=Sentence Boundary Detection Filter Plugin for KTTS
 Comment[bg]=?????????????????? ???????????? ???? ???????????????????? ?????????????????? ???? ??????????????????????
 Comment[ca]=Connector del filtre detector de l??mit de frase pel KTTS
@@ -52,6 +55,7 @@
 Comment[it]=Plugin per il filtro di rilevazione del limite delle frasi per KTTS
 Comment[ja]=KTTS ????????????????????????????????????????????????????????????
 Comment[lt]=Sakinio rib?? aptikiklio filtro priedas, skirtas KTTS
+Comment[mk]=???????????? ???? KTTS ???? ?????????????????? ???? ?????????????????? ???? ????????????????
 Comment[ms]=Plugin Penapis Pengesan Sempadan Ayat bagi KTTS
 Comment[nb]=Tilleggsprogram for KTTS som finner setningsgrenser
 Comment[nds]=KTTS-Moduul f??r dat Faststellen vun Satzgrenzen
@@ -60,6 +64,7 @@
 Comment[pt]='Plugin' de Filtro de Detec????o de Limite de Frase para o KTTS
 Comment[pt_BR]=Plug-in de Detector de Fim de Senten??as para o KTTSD
 Comment[ru]=???????????? ???????????? ?????????????????????? ?????? KTTS
+Comment[sk]=Modul filtra pre detekciu okraja vety v KTTS
 Comment[sl]=Filtrni vstavek KTTS za zanavanje mej stavka
 Comment[sr]=?????????????????? ?????????????????? KTTS-?? ???? ?????????????????? ?????????????? ????????????????
 Comment[sr at Latn]=Filterski priklju??ak KTTS-a za otkrivanje granica re??enice
@@ -69,6 +74,7 @@
 Comment[tr]=KTTS i??in C??mle S??n??rlama Alg??lay??c?? S??zgeci Eklentisi
 Comment[uk]=???????????? ?????????????? ?????????????????? ?????? ?????? KTTS
 Comment[vi]=Tr??nh b??? sung L???c Nh???n d???ng Ranh gi???i C??u v??n cho KTTS
+Comment[zh_TW]=KTTS ???????????????????????????????????????????????????
 Type=Service
 ServiceTypes=KTTSD/FilterPlugin
 X-KDE-Library=libkttsd_sbdplugin
Index: IconThemes/mono/index.theme
===================================================================
--- IconThemes/mono/index.theme	(.../3.5.3/kdeaccessibility)	(Revision 565812)
+++ IconThemes/mono/index.theme	(.../3.5.4/kdeaccessibility)	(Revision 565812)
@@ -35,6 +35,7 @@
 Name[tr]=Siyah-beyaz
 Name[uk]=??????????-????????
 Name[vi]=????n s???c
+Name[zh_TW]=??????
 Comment=By Danny Allen (danny at dannyallen.co.uk)
 Comment[bs]=Autor: Danny Allen (danny at dannyallen.co.uk)
 Comment[ca]=Per Danny Allen (danny at dannyallen.co.uk)
@@ -54,6 +55,7 @@
 Comment[is]=Eftir Danny Allen (danny at dannyallen.co.uk)
 Comment[it]=Di Danny Allen (danny at dannyallen.co.uk)
 Comment[lt]=Suk??r?? Danny Allen (danny at dannyallen.co.uk)
+Comment[mk]=???? Danny Allen (danny at dannyallen.co.uk)
 Comment[ms]=Oleh Danny Allen (danny at dannyallen.co.uk)
 Comment[mt]=Ta' Danny Allen (danny at dannyallen.co.uk)
 Comment[nb]=av Danny Allen (danny at dannyallen.co.uk)
@@ -64,6 +66,7 @@
 Comment[pt]=Por Danny Allen (danny at dannyallen.co.uk)
 Comment[pt_BR]=Por Danny Allen (danny at dannyallen.co.uk)
 Comment[ru]=?????????????? ?????????? ?????????? (Danny Allen) (danny at dannyallen.co.uk)
+Comment[sk]=Danny Allen (danny at dannyallen.co.uk)
 Comment[sl]=Napisal Danny Allen (danny at dannyallen.co.uk)
 Comment[sr]=???? ???????????? ?????????? (Danny Allen, danny at dannyallen.co.uk)
 Comment[sr at Latn]=Od Denija Alena (Danny Allen, danny at dannyallen.co.uk)


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kdeaccessibility.spec	17 Jul 2006 17:13:28 -0000	1.19
+++ kdeaccessibility.spec	24 Jul 2006 14:25:01 -0000	1.20
@@ -4,20 +4,18 @@
 %define qt_version 3.3.6
 %define kdebase_epoch 6
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 2
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
 Prefix: /usr
 License: GPL
 Group: Amusements/Games
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch: kde-libtool.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Patch0: kdeaccessibility-3.5.3-3.5.4.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 
@@ -44,7 +42,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .libtool
+%patch0 -p0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -52,14 +50,10 @@
 make -f admin/Makefile.common cvs
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --disable-rpath \
-%if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endif
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
@@ -110,6 +104,9 @@
 
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 1:3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 1:3.5.3-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:28:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:28:27 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.20,1.21
Message-ID: <200607241428.k6OESR3q004173@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4159

Modified Files:
	kdeaccessibility.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kdeaccessibility.spec	24 Jul 2006 14:25:01 -0000	1.20
+++ kdeaccessibility.spec	24 Jul 2006 14:28:25 -0000	1.21
@@ -41,7 +41,7 @@
 to let their computer speak for them.
 
 %prep
-%setup -q
+%setup -q -n %{name}-3.5.3
 %patch0 -p0
 
 %build



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:31:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:31:59 -0400
Subject: rpms/kdeaddons/devel kdeaddons-3.5.3-3.5.4.patch, NONE,
	1.1 kdeaddons.spec, 1.53, 1.54
Message-ID: <200607241431.k6OEVxPt004262@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4247

Modified Files:
	kdeaddons.spec 
Added Files:
	kdeaddons-3.5.3-3.5.4.patch 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)


kdeaddons-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                        |    2 
 admin/cvs.sh                                                 |    6 -
 atlantikdesigner/atlantikdesigner.desktop                    |    5 
 doc/kate-plugins/index.docbook                               |    6 -
 doc/kate-plugins/insertcommand.docbook                       |   22 +--
 doc/kate-plugins/xmlcheck.docbook                            |   22 +--
 doc/kate-plugins/xmltools.docbook                            |   28 ++--
 doc/konq-plugins/babel/index.docbook                         |   12 +-
 doc/konq-plugins/imgallery/index.docbook                     |    7 +
 doc/konq-plugins/index.docbook                               |   11 +
 doc/konq-plugins/kuick/index.docbook                         |   64 +++++++++--
 kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop          |    6 +
 kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop  |    4 
 kate/cppsymbolviewer/katecppsymbolviewer.desktop             |    4 
 kate/filelistloader/katefll.desktop                          |    2 
 kate/filelistloader/katefll_initplugin.desktop               |    6 -
 kate/filelistloader/katefll_plugin.desktop                   |    4 
 kate/filetemplates/plugin/katefiletemplates.desktop          |    4 
 kate/helloworld/katehelloworld.desktop                       |    5 
 kate/htmltools/katehtmltools.desktop                         |    2 
 kate/insertcommand/kateinsertcommand.desktop                 |    6 -
 kate/kjswrapper/samples/katekjsconsolewindow.desktop         |    5 
 kate/kjswrapper/samples/katekjsselect.desktop                |    3 
 kate/kjswrapper/samples/katekjstest1.desktop                 |    4 
 kate/kpybrowser/katepybrowse.desktop                         |    4 
 kate/make/katemake.desktop                                   |    4 
 kate/modeline/katemodeline.desktop                           |    4 
 kate/openheader/kateopenheader.desktop                       |    2 
 kate/scripts/html-tidy.desktop                               |    3 
 kate/snippets/katesnippets.desktop                           |    5 
 kate/tabbarextension/katetabbarextension.desktop             |    4 
 kate/tabbarextension/plugin_katetabbarextension.cpp          |    3 
 kate/textfilter/katetextfilter.desktop                       |    2 
 kate/xmlcheck/katexmlcheck.desktop                           |    4 
 kate/xmltools/katexmltools.desktop                           |    3 
 kdeaddons.lsm                                                |    4 
 kfile-plugins/cert/kfile_cert.desktop                        |    3 
 kfile-plugins/desktop/kfile_desktop.desktop                  |    2 
 kfile-plugins/folder/kfile_folder.desktop                    |    2 
 kfile-plugins/html/kfile_html.desktop                        |    2 
 kfile-plugins/lnk/kfile_lnk.desktop                          |    2 
 kfile-plugins/lnk/lnkforward.desktop                         |    4 
 kfile-plugins/lnk/x-win-lnk.desktop                          |    2 
 kfile-plugins/mhtml/kfile_mhtml.desktop                      |    3 
 kfile-plugins/txt/kfile_txt.desktop                          |    2 
 kicker-applets/kbinaryclock/kbinaryclock.desktop             |    7 +
 kicker-applets/kolourpicker/kolourpicker.desktop             |    4 
 kicker-applets/ktimemon/ktimemon.desktop                     |    5 
 kicker-applets/math/mathapplet.desktop                       |    6 -
 kicker-applets/mediacontrol/mediacontrol.desktop             |    5 
 konq-plugins/akregator/akregator_konqfeedicon.desktop        |   10 +
 konq-plugins/akregator/akregator_konqplugin.desktop          |    5 
 konq-plugins/arkplugin/ark_plugin.desktop                    |    2 
 konq-plugins/arkplugin/arkplugin.desktop                     |    2 
 konq-plugins/autorefresh/autorefresh.desktop                 |    6 +
 konq-plugins/babelfish/plugin_babelfish.desktop              |    4 
 konq-plugins/crashes/crashesplugin.desktop                   |    4 
 konq-plugins/dirfilter/dirfilterplugin.desktop               |    4 
 konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop      |    4 
 konq-plugins/fsview/fsview.desktop                           |    6 -
 konq-plugins/fsview/fsview_part.desktop                      |    2 
 konq-plugins/imagerotation/Makefile.am                       |    5 
 konq-plugins/imagerotation/imageconverter.desktop            |    4 
 konq-plugins/imagerotation/jpegorient                        |    8 +
 konq-plugins/imagerotation/jpegorient.desktop                |   12 ++
 konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop |    4 
 konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop       |    6 -
 konq-plugins/kuick/kcmkuick/kcmkuick.desktop                 |    4 
 konq-plugins/kuick/kuick_plugin.desktop                      |    1 
 konq-plugins/kuick/kuickplugin.desktop                       |    1 
 konq-plugins/mediarealfolder/media_realfolder.desktop        |    4 
 konq-plugins/microformat/mf_konqmficon.desktop               |    8 +
 konq-plugins/minitools/minitoolsplugin.desktop               |    2 
 konq-plugins/rellinks/plugin_rellinks.desktop                |    6 +
 konq-plugins/searchbar/searchbar.cpp                         |   15 ++
 konq-plugins/searchbar/searchbar.desktop                     |    4 
 konq-plugins/sidebar/delicious/delicious_add.desktop         |    3 
 konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop   |    4 
 konq-plugins/sidebar/mediaplayer/mplayer_add.desktop         |    2 
 konq-plugins/sidebar/metabar/src/metabar.desktop             |    6 +
 konq-plugins/sidebar/metabar/src/metabar_add.desktop         |    4 
 konq-plugins/sidebar/newsticker/news_add.desktop             |    1 
 konq-plugins/uachanger/uachangerplugin.desktop               |    3 
 konq-plugins/validators/plugin_validators.desktop            |    4 
 konq-plugins/webarchiver/archivedialog.cpp                   |    2 
 konq-plugins/webarchiver/plugin_webarchiver.desktop          |    4 
 konq-plugins/webarchiver/webarchivethumbnail.desktop         |    1 
 ksig/ksig.desktop                                            |    2 
 noatun-plugins/alarm/wakeup.plugin                           |    3 
 noatun-plugins/alsaplayer/alsaplayerui.plugin                |    2 
 noatun-plugins/blurscope/blurscope.plugin                    |    1 
 noatun-plugins/charlatan/charlatanui.plugin                  |    2 
 noatun-plugins/dub/dub/dub.plugin                            |    2 
 noatun-plugins/ffrs/ffrs.plugin                              |    3 
 noatun-plugins/luckytag/luckytag.plugin                      |    4 
 noatun-plugins/lyrics/lyrics.plugin                          |    3 
 noatun-plugins/nexscope/nexscope.plugin                      |    2 
 noatun-plugins/noatunmadness/madness.plugin                  |    2 
 noatun-plugins/oblique/oblique.plugin                        |    2 
 noatun-plugins/pitchablespeed/pitchablespeed.plugin          |    4 
 noatun-plugins/synaescope/synaescope.plugin                  |    2 
 noatun-plugins/tippercanoe/tippecanoe.plugin                 |    1 
 noatun-plugins/tyler/tyler.plugin                            |    2 
 noatun-plugins/wavecapture/wavecapture.plugin                |    3 
 renamedlgplugins/audio/renaudiodlg.desktop                   |    2 
 renamedlgplugins/images/renimagedlg.desktop                  |    1 
 106 files changed, 452 insertions(+), 89 deletions(-)

--- NEW FILE kdeaddons-3.5.3-3.5.4.patch ---
Index: noatun-plugins/noatunmadness/madness.plugin
===================================================================
--- noatun-plugins/noatunmadness/madness.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/noatunmadness/madness.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -21,6 +21,7 @@
 Name[km]=????????????????????????
 Name[lt]=Beprotyb??
 Name[mk]=??????????????
+Name[nds]=Mallheit
 Name[nl]=Gekheid
 Name[nn]=Galskap
 Name[nso]=Bogafa
@@ -65,6 +66,7 @@
 Comment[mk]=?????????? ?? ?????????????? ???????????????????? ?????? ???? ???? ?????????? ????????????????????
 Comment[ms]=Skop yang pelik untuk memerhati pergerakan pada tetingkap anda
 Comment[nb]=En rar og irriterende ting som flytter vinduene dine
+Comment[nds]=En snaaksch un piesacken Frequenzkieker, de Finster verschufft
 Comment[nl]=Een maffe en nerveuze Oscilloscoop die uw vensters verplaatst
 Comment[nn]=Ein rar og irriterande ting som flyttar vindauga dine
 Comment[pl]=Przesuwa twoje okna w rytm muzyki
Index: noatun-plugins/luckytag/luckytag.plugin
===================================================================
--- noatun-plugins/luckytag/luckytag.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/luckytag/luckytag.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -29,6 +29,7 @@
 Name[mk]=?????????? ???? ???????????? ???? ??????????
 Name[ms]=Pembaca tag Bertuah
 Name[nb]=Tagleser med flaks
+Name[nds]=Metainfo-Leser
 Name[nl]=Gelukkige notitielezer
 Name[nn]=Taglesar med lukke
 Name[pl]=Zgadywacz oznacze?? plik??w
@@ -48,6 +49,7 @@
 Name[uz]=???????? ?????? ????????????
 Name[xh]=Umfundi onentlahla weTag
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 Comment=Guesses tag information from the filename
 Comment[af]=Raaiskote etiket informasie van die l??ernaam
 Comment[ar]=???????? ?????????????? ???????????????? ???? ?????? ??????????
@@ -76,6 +78,7 @@
 Comment[mk]=???? ???????????????? ???????????????????????? ???? ???????????????? ???? ?????????? ???? ????????????????????
 Comment[ms]=Meneka maklumat tag dari nama fail
 Comment[nb]=Gjetter tag-informasjon fra filnavnen
+Comment[nds]=Raad Betekerinformatschonen ut den Dateinaam
 Comment[nl]=Raadt de notitie-informatie uit de bestandsnaam
 Comment[nn]=Gissar tag-informasjon fr?? filnamnet
 Comment[pl]=Zgaduje oznaczenia dla pliku z jego nazwy
@@ -95,3 +98,4 @@
 Comment[uz]=?????? ?????????????????????? ???????????????? ?????????????? ???????????? ??????????
 Comment[xh]=Iqikelela ulwazi lwe tag ukusuka kwi gama lefayile
 Comment[zh_CN]=?????????????????????????????????
+Comment[zh_TW]=?????????????????????
Index: noatun-plugins/nexscope/nexscope.plugin
===================================================================
--- noatun-plugins/nexscope/nexscope.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/nexscope/nexscope.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -41,6 +41,7 @@
 Comment[mk]=??????????-?????????????????????????? ??????????????????????????
 Comment[ms]=Visualisasi ultra boleh selenggara
 Comment[nb]=Den ekstremt tilpasningsdyktige visualiseringen
+Comment[nds]=Filmmaker mit bannig vele Instellen
 Comment[nl]=Zeer goed aan te passen visualisatie
 Comment[nn]=Den ekstremt tiplasningsdyktige visualiseringa
 Comment[pl]=Wizualizacja z bardzo wieloma mo??liwo??ciami dostosowania
@@ -59,3 +60,4 @@
 Comment[uk]=?????????????? ???????????? ??????????????????????????
 Comment[xh]=Okubonakalayo okungaphezulu kwemfuneko
 Comment[zh_CN]=??????????????????????????????
+Comment[zh_TW]=??????????????????
Index: noatun-plugins/wavecapture/wavecapture.plugin
===================================================================
--- noatun-plugins/wavecapture/wavecapture.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/wavecapture/wavecapture.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -27,6 +27,7 @@
 Name[lt]=Wave ??ra??ymas
 Name[mk]=?????????????? ????????
 Name[nb]=Wave-opptak
+Name[nds]=Wave-Datei opnehmen
 Name[nl]=Wave-vanger
 Name[nn]=Wave-opptak
 Name[nso]=Tshwaro ya Lephoto
@@ -71,6 +72,7 @@
 Comment[mk]=?????????????? ???? wave-????????????????
 Comment[ms]=Cekup ke fail wave
 Comment[nb]=Opptak til wav-file
+Comment[nds]=Wave-Datei opnehmen
 Comment[nl]=Opnemen als wave-bestand
 Comment[nn]=Opptak til wave-file
 Comment[pl]=Zgrywanie do pliku WAV
@@ -89,3 +91,4 @@
 Comment[uk]=???????????????????? ?? ???????? wave
 Comment[xh]=Ibanjwe kwifayile yamaza 
 Comment[zh_CN]=?????????????????????
+Comment[zh_TW]=?????? wave ???
Index: noatun-plugins/alarm/wakeup.plugin
===================================================================
--- noatun-plugins/alarm/wakeup.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/alarm/wakeup.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -24,6 +24,7 @@
 Name[lt]=??adintuvas
 Name[mk]=??????????????????
 Name[nb]=V??knopp
+Name[nds]=Weckklock
 Name[nl]=Wekker
 Name[nn]=Vakn-opp
 Name[nso]=Tsoga
@@ -70,6 +71,7 @@
 Comment[mk]=???????????????????? ???????????????????????? ??????????
 Comment[ms]=Jam loceng mudah selenggara
 Comment[nb]=En enkel vekkeklokke som kan tilpasses
+Comment[nds]=En eenfache Weckklock mit mennige Instellen
 Comment[nl]=Een eenvoudig in te stellen alarm
 Comment[nn]=Ei enkel vekkjarklokke som kan tilpassast
 Comment[nso]=Alamo ye bonolo, yago amanyega
@@ -91,3 +93,4 @@
 Comment[uz]=?????????? ??????????????????????????
 Comment[xh]=I alamu elula, yokwenza into ngokwemfuneko
 Comment[zh_CN]=?????????????????????????????????
+Comment[zh_TW]=??????????????????????????????
Index: noatun-plugins/charlatan/charlatanui.plugin
===================================================================
--- noatun-plugins/charlatan/charlatanui.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/charlatan/charlatanui.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -43,6 +43,7 @@
 Comment[mk]=?????????????????????? ???? ?????????????? ??????????
 Comment[ms]=Antaramuka lelaki mati
 Comment[nb]=D??d manns grensesnitt
+Comment[nds]=Doodmann's Koppelsteed
 Comment[nl]=Interface van een dode man
 Comment[nn]=Daudmannsgrensesnitt
 Comment[pl]=Motyw ascetyczny
@@ -61,3 +62,4 @@
 Comment[uk]=?????????????????? ??????????????
 Comment[xh]=Ubuso bendoda ubujongeneyo
 Comment[zh_CN]=????????????
+Comment[zh_TW]=The dead man ??????
Index: noatun-plugins/alsaplayer/alsaplayerui.plugin
===================================================================
--- noatun-plugins/alsaplayer/alsaplayerui.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/alsaplayer/alsaplayerui.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -47,6 +47,7 @@
 Comment[mk]=???????? ???? AlsaPlayer
 Comment[ms]=Klon UI AlsaPlayer
 Comment[nb]=UI-klon for Alsa-spiller
+Comment[nds]=AlsaPlayer-B??versietkloon
 Comment[nl]=Kloon van AlsaPlayer UI
 Comment[nn]=UI-klon av AlsaPlayer
 Comment[pl]=Klon interfejsu u??ytkownika dla AlsaPlayer
@@ -66,3 +67,4 @@
 Comment[uz]=Alsa ???????????? ???????? ???????????? ??????????????????
 Comment[xh]=Umdlali weAlsa Indlela yokwenza into efana nenye ye UI
 Comment[zh_CN]=Alsa ???????????????????????????
+Comment[zh_TW]=AlsaPlayer ???????????????
Index: noatun-plugins/blurscope/blurscope.plugin
===================================================================
--- noatun-plugins/blurscope/blurscope.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/blurscope/blurscope.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -41,6 +41,7 @@
 Comment[mk]=????????, ???????????????????????? ????????????????????
 Comment[ms]=Monoskop luntur dan cantik
 Comment[nb]=Et pent, hend??ende monoskop
+Comment[nds]=En smuck, utblennen Monoskop
 Comment[nl]=Een fraaie, vervagende monoscoop
 Comment[nn]=Eit pent, monoskop som tonar ut
 Comment[pl]=??adny, gasn??cy monoskop
Index: noatun-plugins/tyler/tyler.plugin
===================================================================
--- noatun-plugins/tyler/tyler.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/tyler/tyler.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -39,6 +39,7 @@
 Comment[mk]=?????????????????? ???? Infinity ???? XMMS
 Comment[ms]=Diangkut dari Infiniti dari  XMMS
 Comment[nb]=Overf??rt fra XMMS til Infinity
+Comment[nds]=Vun Infinity vun XMMS porteert
 Comment[nl]=Overgedragen vanuit Infinity van XMMS
 Comment[nn]=Overf??rt fr?? Infinity fr?? XMMS
 Comment[pl]=Przeniesiona wtyczka Infinity z XMMS
@@ -57,3 +58,4 @@
 Comment[uk]=???????????????????? ?? Infinity ?????? XMMS
 Comment[xh]=Iphathe okusuka kokungenasiphelo ukusuka kwi XMMS
 Comment[zh_CN]=??? XMMS ??? Infinity ???????????????
+Comment[zh_TW]=?????? XMMS ??? Infinity
Index: noatun-plugins/oblique/oblique.plugin
===================================================================
--- noatun-plugins/oblique/oblique.plugin	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ noatun-plugins/oblique/oblique.plugin	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -40,6 +40,7 @@
 Comment[mk]=???????????????????????????????? ?????????? ???? ????????????
 Comment[ms]=Mengumpul semak senarai main
 Comment[nb]=Selvjusterende spilleliste
+Comment[nds]=Automaatsch de Afspeellist tosamenstellen
 Comment[nl]=Auto-plakkende afspeellijst
 Comment[nn]=Sj??lvjusterande speleliste
 Comment[pl]=Automatycznie zestawiaj??ca si?? lista odtwarzania
@@ -56,3 +57,4 @@
 Comment[tr]=Otomatik kar????la??t??r??lm???? ??alma listesi
 Comment[uk]=???????????? ????????????????????, ???????? ?????????????????????? ????'??????????????????
 Comment[zh_CN]=????????????????????????
[...2878 lines suppressed...]
 Name[sr]=?????????????????????? ?? ??????????????????????
 Name[sr at Latn]=Informacije o sertifikatu
@@ -39,6 +41,7 @@
 Name[uk]=???????????????????? ?????? ????????????????????
 Name[uz]=???????????????????? ???????????? ????????????????
 Name[zh_CN]=????????????
+Name[zh_TW]=????????????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_cert
 MimeType=application/x-x509-ca-cert
Index: kicker-applets/mediacontrol/mediacontrol.desktop
===================================================================
--- kicker-applets/mediacontrol/mediacontrol.desktop	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ kicker-applets/mediacontrol/mediacontrol.desktop	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -22,16 +22,20 @@
 Name[lt]=Media valdymas
 Name[mk]=???????????????? ???? ??????????????????????
 Name[nb]=Mediastyring
+Name[nds]=Medienkuntrull
 Name[pl]=Zarz??dzanie mediami
 Name[pt]=Controlo Multim??dia
 Name[pt_BR]=Controle de M??dia
 Name[ru]=???????????????????? ??????????????????????
+Name[sk]=Ovl??danie m??di??
+Name[sl]=Nadzor predvajalnikov
 Name[sr]=???????????????? ????????????
 Name[sr at Latn]=Kontrola medija
 Name[sv]=Mediakontroll
 Name[uk]=?????????????????? ????????????
 Name[uz]=??????????-???????????? ??????????????????
 Name[zh_CN]=????????????
+Name[zh_TW]=????????????
 Comment=Applet to control mediaplayers
 Comment[af]=Miniprogram na kontrole media spelers
 Comment[ar]=?????????? ???????????? ?????????????? ?????????????? ????????????????
@@ -66,6 +70,7 @@
 Comment[ms]=Aplet untuk kawal pemain media
 Comment[mt]=Applet biex tikkontrolla players ta' media
 Comment[nb]=Miniprogram for ?? styre multimediaspillere
+Comment[nds]=L??ttprogramm f??r't St??ern vun Medienafspelers
 Comment[nl]=Applet om mediaspelers te besturen
 Comment[nn]=Applet for kontroll av mediespelarar
 Comment[pa]=??????????????? ??????????????? ?????????????????? ?????? ???????????????
Index: kicker-applets/ktimemon/ktimemon.desktop
===================================================================
--- kicker-applets/ktimemon/ktimemon.desktop	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ kicker-applets/ktimemon/ktimemon.desktop	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -27,17 +27,21 @@
 Comment[lt]=Paprasta sistemos steb??jimo priemon??
 Comment[mk]=???????????????????? ???????????????????? ???? ????????????????
 Comment[nb]=En enkel systemoverv??ker
+Comment[nds]=En eenfach Systeemmonitor
 Comment[nl]=Een eenvoudige systeemmonitor
 Comment[pl]=Prosty monitor systemu
 Comment[pt]=Um monitor do sistema simples
 Comment[pt_BR]=Um monitor de sistema simples
 Comment[ru]=?????????????? ?????????????????? ??????????????
+Comment[sk]=Jednoduch?? monitor syst??mu
+Comment[sl]=Preprost nadzornik sistema
 Comment[sr]=?????????????????????? ???????????????????? ??????????????
 Comment[sr at Latn]=Jednostavno nadgledanje sistema
 Comment[sv]=En enkel system??vervakare
 Comment[uk]=?????????????? ?????????????????? ??????????????
 Comment[uz]=?????????????? ?????????????? ?????????? ???????? ?????????? ????????????
 Comment[zh_CN]=????????????????????????
+Comment[zh_TW]=????????????????????????
 Name=System Monitor
 Name[af]=Stelsel Monitor
 Name[ar]=?????????? ????????????
@@ -75,6 +79,7 @@
 Name[ms]=Monitor Sistem
 Name[mt]=Monitur tas-sistema
 Name[nb]=Systemoverv??ker
+Name[nds]=Systeem-Monitor
 Name[nl]=Systeemmonitor
 Name[nn]=Systemovervakar
 Name[pa]=??????????????? ??????????????????
Index: kicker-applets/kolourpicker/kolourpicker.desktop
===================================================================
--- kicker-applets/kolourpicker/kolourpicker.desktop	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ kicker-applets/kolourpicker/kolourpicker.desktop	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -12,7 +12,7 @@
 Name[cs]=V??b??r barev
 Name[cy]=Dewisydd Lliw
 Name[da]=Farveplukker
-Name[de]=Farbw??hler
+Name[de]=Farbauswahl
 Name[el]=?????????????? ????????????????
 Name[en_GB]=Colour Picker
 Name[eo]=Kolorelektilo
@@ -37,6 +37,7 @@
 Name[ms]=Pengutip Warna
 Name[mt]=Ag????el kulur
 Name[nb]=Fargevelger
+Name[nds]=Kl??renutwahl
 Name[nl]=Kleurenkiezer
 Name[nn]=Fargeveljar
 Name[pa]=????????? ??????????????????
@@ -98,6 +99,7 @@
 Comment[ms]=Memungut warna dari mana-mana dan dapatkan nilainya
 Comment[mt]=Ag????el kulur minn fejn trid u ??u l-valur tieg??u
 Comment[nb]=Plukk opp farger fra hvor som helst og se verdiene deres
+Comment[nds]=Kl??ren jichtenswo uts??ken un ehr Weerten faststellen
 Comment[nl]=Kies kleuren van elke willekeurige plek en verkrijg hun waarden
 Comment[nn]=Plukk fargar fr?? kvar som helst og finn verdien deira
 Comment[pa]=??????????????? ?????? ????????? ?????? ??????????????? ????????? ??????????????? ?????? ???????????? ?????????
Index: kicker-applets/math/mathapplet.desktop
===================================================================
--- kicker-applets/math/mathapplet.desktop	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ kicker-applets/math/mathapplet.desktop	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -7,7 +7,7 @@
 Name[ca]=Avaluador d'expressions matem??tiques
 Name[cs]=Vyhodnocen?? matematick??ho v??razu
 Name[da]=Evaluering af matematiske udtryk
-Name[de]=Auswertung mathematische Ausdr??cke
+Name[de]=Auswertung mathematischer Ausdr??cke
 Name[el]=???????????????? ?????????????????????? ?????????????????????? ????????????????
 Name[en_GB]=Maths Expression Evaluator
 Name[es]=Evaluador de expresiones matem??ticas
@@ -27,6 +27,7 @@
 Name[mk]=?????????????????????? ???? ?????????????????????? ????????????
 Name[ms]=Penilaian Ungkapan Matematik
 Name[nb]=Matematikkberegner
+Name[nds]=Mathemaatsche Utdr??ck utreken
 Name[nl]=Kleine rekenmachine
 Name[nn]=Matteuttrykkevaluerar
 Name[pl]=Program wyliczaj??cy wyra??enia matematyczne
@@ -44,6 +45,7 @@
 Name[uk]=?????????????????? ???????????????????????? ??????????????
 Name[uz]=?????????????????? ???????????????????? ????????????????????
 Name[zh_CN]=????????????????????????
+Name[zh_TW]=?????????????????????
 Comment=A mathematical expression evaluator
 Comment[bg]=???????????????????? ???? ?????????????????????????? ????????????
 Comment[bs]=Procjena matemati??kih izraza
@@ -69,6 +71,7 @@
 Comment[mk]=???????????????????????? ?????????????????????? ????????????
 Comment[ms]=Penilai ungkapan matematik 
 Comment[nb]=En beregner for matematiske uttrykk
+Comment[nds]=Utreken vun mathemaatsche Utdr??ck
 Comment[nl]=Een applet waarmee u wiskundige uitdrukkingen kunt evalueren
 Comment[nn]=Ein utreknar for matematiske uttrykk
 Comment[pl]=Program wyliczaj??cy wyra??enia matematyczne
@@ -86,6 +89,7 @@
 Comment[uk]=?????????????????? ???????????????????????? ??????????????
 Comment[uz]=?????????????????? ???????????????????? ????????????????????
 Comment[zh_CN]=????????????????????????
+Comment[zh_TW]=?????????????????????
 Icon=math_int
 X-KDE-Library=math_panelapplet
 X-KDE-UniqueApplet=true
Index: kicker-applets/kbinaryclock/kbinaryclock.desktop
===================================================================
--- kicker-applets/kbinaryclock/kbinaryclock.desktop	(.../3.5.3/kdeaddons)	(Revision 565812)
+++ kicker-applets/kbinaryclock/kbinaryclock.desktop	(.../3.5.4/kdeaddons)	(Revision 565812)
@@ -27,12 +27,14 @@
 Name[mk]=?????????????? ????????????????
 Name[ms]=Jam Binari
 Name[nb]=Bin??rklokke
+Name[nds]=Bineerklock
 Name[nl]=Binaire klok
 Name[pa]=?????????????????? ?????????
 Name[pl]=Zegar binarny
 Name[pt]=Rel??gio Bin??rio
 Name[pt_BR]=Rel??gio Bin??rio
 Name[ru]=???????????????? ????????
+Name[sk]=Bin??rne hodiny
 Name[sl]=Dvoji??ka ura
 Name[sr]=?????????????? ????????????????
 Name[sr at Latn]=Binarni ??asovnik
@@ -42,6 +44,7 @@
 Name[uk]=KBinaryClock
 Name[uz]=?????????? ????????
 Name[zh_CN]=???????????????
+Name[zh_TW]=????????????
 Comment=Shows the time in binary format
 Comment[bg]=?????????????????? ???? ?????????????? ?? ?????????????? ????????????
 Comment[ca]=Mostra l'hora en format binari
@@ -62,17 +65,21 @@
 Comment[lt]=Rodo laik?? skaitmeniniu formatu
 Comment[mk]=???? ?????????????????? ?????????????? ???? ?????????????? ????????????
 Comment[nb]=Viser klokkeslett i bin??rt format
+Comment[nds]=Wiest de Tiet in bineer Formaat
 Comment[nl]=Toont de tijd in een binair formaat
 Comment[pl]=Pokazuje czas w postaci binarnej
 Comment[pt]=Mostra a hora em formato bin??rio
 Comment[pt_BR]=Mostra a hora em formato bin??rio
 Comment[ru]=?????????? ?????????????? ?? ???????????????? ??????????????
+Comment[sk]=Zobraz?? ??as v bin??rnom form??te
+Comment[sl]=Prikazuje ??as v dvoji??ki obliki
 Comment[sr]=?????????????????? ?????????? ?? ???????????????? ??????????????
 Comment[sr at Latn]=Prikazuje vreme u binarnom formatu
 Comment[sv]=Visar tiden med bin??rformat
 Comment[uk]=?????????????? ?????? ?? ???????????????????? ??????????????
 Comment[uz]=???????????? ???????????? ?????????? ???????????????? ????????????????
 Comment[zh_CN]=??????????????????????????????
+Comment[zh_TW]=??????????????????????????????
 Icon=kbinaryclock
 X-KDE-Library=kbinaryclock_panelapplet
 X-KDE-UniqueApplet = false


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeaddons.spec	12 Jul 2006 06:38:25 -0000	1.53
+++ kdeaddons.spec	24 Jul 2006 14:31:57 -0000	1.54
@@ -4,7 +4,7 @@
 %define make_cvs 0
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %define sdl_version 1.2.0
 
 %define kdelibs_epoch 6
@@ -12,17 +12,16 @@
 %define arts_epoch 8
 %define arts 1
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 2.1
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Patch0: kdeaddons-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 Patch2: kdeaddons-3.5.1-rgb.txt-path.patch
 Patch3: kdeaddons-3.5.3-sdl.patch
@@ -78,8 +77,8 @@
 
 
 %prep
-%setup -q
-%patch1 -p1 -b .libtool
+%setup -q -n %{name}-3.5.3
+%patch0 -p0
 %patch2 -p0 -b .rgb.txt-path
 %patch3 -p1 -b .sdl
 
@@ -90,18 +89,12 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export KDEDIR=%{prefix}
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-
 %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
@@ -178,6 +171,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:52:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:52:24 -0400
Subject: rpms/sane-backends/devel sane-backends-1.0.18-rpath.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 sane-backends.spec, 1.69,
	1.70 sources, 1.13, 1.14 sane-backends-1.0.11-rpath.patch, 1.2, NONE
Message-ID: <200607241452.k6OEqOUb019387@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19368

Modified Files:
	.cvsignore sane-backends.spec sources 
Added Files:
	sane-backends-1.0.18-rpath.patch 
Removed Files:
	sane-backends-1.0.11-rpath.patch 
Log Message:
update rpath patch


sane-backends-1.0.18-rpath.patch:
 configure            |    1 +
 tools/sane-config.in |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE sane-backends-1.0.18-rpath.patch ---
--- sane-backends-1.0.18/tools/sane-config.in.rpath	2004-07-09 16:39:05.000000000 +0200
+++ sane-backends-1.0.18/tools/sane-config.in	2006-07-24 16:47:58.000000000 +0200
@@ -7,7 +7,7 @@
 PACKAGE="@PACKAGE@"
 scriptname="sane-config"
 
-LINKER_RPATH="@LINKER_RPATH@"
+LINKER_RPATH=""
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
--- sane-backends-1.0.18/configure.rpath	2006-07-03 00:22:09.000000000 +0200
+++ sane-backends-1.0.18/configure	2006-07-24 16:50:13.000000000 +0200
@@ -4159,6 +4159,7 @@
     esac
 
 fi
+LINKER_RPATH=
 { echo "$as_me:$LINENO: result: $LINKER_RPATH" >&5
 echo "${ECHO_T}$LINKER_RPATH" >&6; }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Dec 2005 12:32:06 -0000	1.13
+++ .cvsignore	24 Jul 2006 14:52:22 -0000	1.14
@@ -1 +1 @@
-sane-backends-1.0.17.tar.gz
+sane-backends-1.0.18.tar.gz


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sane-backends.spec	24 Jul 2006 13:53:46 -0000	1.69
+++ sane-backends.spec	24 Jul 2006 14:52:22 -0000	1.70
@@ -257,6 +257,7 @@
 * Mon Jul 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.18-1
 - version 1.0.18
 - unify spec file between OS releases
+- update rpath patch
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-13.1
 - rebuild


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Dec 2005 12:32:07 -0000	1.13
+++ sources	24 Jul 2006 14:52:22 -0000	1.14
@@ -1 +1 @@
-b51c10da8a81a04e1bae88c9e6556df2  sane-backends-1.0.17.tar.gz
+7ca7e2908e24721471de92cf40c75e60  sane-backends-1.0.18.tar.gz


--- sane-backends-1.0.11-rpath.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:53:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:53:00 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.70,1.71
Message-ID: <200607241453.k6OEr0Nh019416@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19401

Modified Files:
	sane-backends.spec 
Log Message:
do it



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sane-backends.spec	24 Jul 2006 14:52:22 -0000	1.70
+++ sane-backends.spec	24 Jul 2006 14:52:57 -0000	1.71
@@ -26,7 +26,7 @@
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
-Patch1: sane-backends-1.0.11-rpath.patch
+Patch1: sane-backends-1.0.18-rpath.patch
 Patch2: sane-backends-1.0.12-badcode.patch
 Patch3: sane-backends-multilib.patch
 Patch4: sane-backends-1.0.17-newmodels.patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:54:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:54:12 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-multilib.patch, NONE,
	1.1 e2fsprogs.spec, 1.62, 1.63
Message-ID: <200607241454.k6OEsCYV019480@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19465

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.39-multilib.patch 
Log Message:
[tw]
- fixed multilib devel conflicts (#192665)



e2fsprogs-1.39-multilib.patch:
 configure.in               |   16 ++++++++--------
 lib/blkid/blkid_types.h.in |   11 +++++++++++
 lib/ext2fs/ext2_types.h.in |   11 +++++++++++
 lib/uuid/uuid_types.h.in   |   11 +++++++++++
 4 files changed, 41 insertions(+), 8 deletions(-)

--- NEW FILE e2fsprogs-1.39-multilib.patch ---
--- e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in.multilib	2006-04-09 03:39:39.000000000 +0200
+++ e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in	2006-07-24 16:14:11.000000000 +0200
@@ -9,6 +9,17 @@
 
 @ASM_TYPES_HEADER@
 
+# define SIZEOF_SHORT     2
+# define SIZEOF_INT       4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG      8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG      4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
 #ifdef __U8_TYPEDEF
 typedef __U8_TYPEDEF __u8;
 #else
--- e2fsprogs-1.39/lib/blkid/blkid_types.h.in.multilib	2006-04-09 03:43:44.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/blkid_types.h.in	2006-07-24 16:14:56.000000000 +0200
@@ -9,6 +9,17 @@
 
 @ASM_TYPES_HEADER@
 
+# define SIZEOF_SHORT     2
+# define SIZEOF_INT       4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG      8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG      4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
 #ifdef __U8_TYPEDEF
 typedef __U8_TYPEDEF __u8;
 #else
--- e2fsprogs-1.39/lib/uuid/uuid_types.h.in.multilib	2006-07-24 16:08:53.000000000 +0200
+++ e2fsprogs-1.39/lib/uuid/uuid_types.h.in	2006-07-24 16:10:46.000000000 +0200
@@ -9,6 +9,17 @@
 typedef unsigned char uint8_t;
 typedef signed char int8_t;
 
+# define SIZEOF_SHORT     2
+# define SIZEOF_INT       4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG      8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG      4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
 #if (@SIZEOF_INT@ == 8)
 typedef int		int64_t;
 typedef unsigned int	uint64_t;
--- e2fsprogs-1.39/configure.in.multilib	2006-07-24 16:06:33.000000000 +0200
+++ e2fsprogs-1.39/configure.in	2006-07-24 16:07:46.000000000 +0200
@@ -611,14 +611,14 @@
   ac_cv_sizeof_long_long=8
   AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8])
 fi
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-SIZEOF_SHORT=$ac_cv_sizeof_short
-SIZEOF_INT=$ac_cv_sizeof_int
-SIZEOF_LONG=$ac_cv_sizeof_long
-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+dnl AC_CHECK_SIZEOF(short)
+dnl AC_CHECK_SIZEOF(int)
+dnl AC_CHECK_SIZEOF(long)
+dnl AC_CHECK_SIZEOF(long long)
+SIZEOF_SHORT="SIZEOF_SHORT"
+SIZEOF_INT="SIZEOF_INT"
+SIZEOF_LONG="SIZEOF_LONG"
+SIZEOF_LONG_LONG="SIZEOF_LONG_LONG"
 AC_SUBST(SIZEOF_SHORT)
 AC_SUBST(SIZEOF_INT)
 AC_SUBST(SIZEOF_LONG)


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- e2fsprogs.spec	20 Jul 2006 21:05:10 -0000	1.62
+++ e2fsprogs.spec	24 Jul 2006 14:54:10 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.39
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch36: e2fsprogs-1.38-etcblkid.patch
 Patch37: e2fsprogs-1.39-blkid-gfs.patch
 Patch38: e2fsprogs-1.39-blkid-devname.patch
+Patch39: e2fsprogs-1.39-multilib.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -74,6 +75,8 @@
 %patch37 -p1 -b .gfs
 # Fix device mapper names in blkid
 %patch38 -p1 -b .devname
+# Fix multilib conflicts
+%patch39 -p1 -b .multilib
 
 %build
 aclocal
@@ -225,6 +228,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Mon Jul 24 2006 Thomas Woerner <twoerner at redhat.com> - 1.39-4
+- fixed multilib devel conflicts (#192665)
+
 * Thu Jul 20 2006 Bill Nottingham <notting at redhat.com> - 1.39-3
 - prevent libblkid returning /dev/dm-X
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:55:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:55:45 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.9,
	1.10 setroubleshoot.logrotate, 1.1, 1.2 setroubleshoot.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200607241455.k6OEtjX0019611@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19584/devel

Modified Files:
	.cvsignore setroubleshoot.logrotate setroubleshoot.spec 
	sources 
Log Message:
auto-import setroubleshoot-0.14-1 on branch devel from setroubleshoot-0.14-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Jul 2006 19:02:37 -0000	1.9
+++ .cvsignore	24 Jul 2006 14:55:43 -0000	1.10
@@ -1 +1 @@
-setroubleshoot-0.13.tar.gz
+setroubleshoot-0.14.tar.gz


Index: setroubleshoot.logrotate
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setroubleshoot.logrotate	18 Jul 2006 19:49:13 -0000	1.1
+++ setroubleshoot.logrotate	24 Jul 2006 14:55:43 -0000	1.2
@@ -3,5 +3,6 @@
     rotate 2
     missingok
     sharedscripts
-    endscript
+#    postrotate
+#    endscript
 }


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setroubleshoot.spec	22 Jul 2006 19:02:37 -0000	1.13
+++ setroubleshoot.spec	24 Jul 2006 14:55:43 -0000	1.14
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.13
+Version: 0.14
 Release: 1
 License: GPL
 Group: Applications/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	22 Jul 2006 19:02:37 -0000	1.11
+++ sources	24 Jul 2006 14:55:43 -0000	1.12
@@ -1 +1 @@
-ffe81b6872dfdcd1ca6a95abd7eeca8e  setroubleshoot-0.13.tar.gz
+22558c35056acc87ca6b04da8cd9c722  setroubleshoot-0.14.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 14:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 10:58:35 -0400
Subject: rpms/kdeadmin/devel kdeadmin-3.5.3-3.5.4.patch, NONE,
	1.1 kdeadmin.spec, 1.62,
	1.63 kdeadmin-3.5.2-knetworkconf-fedora.patch, 1.1, NONE
Message-ID: <200607241458.k6OEwZ4n019697@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19682

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-3.5.3-3.5.4.patch 
Removed Files:
	kdeadmin-3.5.2-knetworkconf-fedora.patch 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)
- drop kdeadmin-3.5.2-knetworkconf-fedora.patch, it's include in 3.5.4 upstream


kdeadmin-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                    |    2 
 admin/cvs.sh                                             |    6 
 doc/knetworkconf/index.docbook                           |  144 +++++++++------
 kcron/main.cpp                                           |    3 
 kdeadmin.lsm                                             |    4 
 kfile-plugins/deb/kfile_deb.desktop                      |    1 
 kfile-plugins/rpm/kfile_rpm.desktop                      |    1 
 knetworkconf/backends/network-conf.in                    |    2 
 knetworkconf/backends/network.pl.in                      |    7 
 knetworkconf/backends/platform.pl.in                     |    1 
 knetworkconf/backends/service.pl.in                      |    4 
 knetworkconf/knetworkconf/kadddnsserverdlg.ui.h          |   21 +-
 knetworkconf/knetworkconf/kaddressvalidator.cpp          |    6 
 knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop |    8 
 knetworkconf/knetworkconf/knetworkconf.cpp               |   22 ++
 knetworkconf/knetworkconf/knetworkconf.desktop           |    6 
 knetworkconf/knetworkconf/knetworkconfigparser.cpp       |   29 ++-
 ksysv/ksysv.desktop                                      |    3 
 ksysv/x-ksysv-log.desktop                                |    1 
 lilo-config/kde/lilo.desktop                             |    1 
 20 files changed, 189 insertions(+), 83 deletions(-)

--- NEW FILE kdeadmin-3.5.3-3.5.4.patch ---
Index: ksysv/ksysv.desktop
===================================================================
--- ksysv/ksysv.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ ksysv/ksysv.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -34,6 +34,8 @@
 GenericName[pt_BR]=Editor do SysV-Init
 GenericName[ro]=Manager de servicii SysV
 GenericName[ru]=???????????????? ?????????????????? SysV
+GenericName[se]=Sysv-init-doaimmaheapmi
+GenericName[sk]=SysV-Init editor
 GenericName[sl]=Urejevalnik za??etnih nastavitev SysV
 GenericName[sr]=???????????????? SysV-init-??
 GenericName[sr at Latn]=Ure??iva?? SysV-init-a
@@ -42,6 +44,7 @@
 GenericName[uk]=???????????????? KSysV-Init
 GenericName[zh_CN]=SysV Init ?????????
 GenericName[zh_HK]=SysV-Init ?????????
+GenericName[zh_TW]=SysV-Init ?????????
 MimeType=
 Exec=ksysv -caption "%c" %i %m
 Icon=ksysv
Index: ksysv/x-ksysv-log.desktop
===================================================================
--- ksysv/x-ksysv-log.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ ksysv/x-ksysv-log.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -53,6 +53,7 @@
 Comment[wa]=Fitch?? djourn?? di l'??aspougneu po SysV-Init
 Comment[zh_CN]=SysV-Init ?????????????????????
 Comment[zh_HK]=SysV-Init ?????????????????????
+Comment[zh_TW]=SysV Init ?????????????????????
 Icon=ksysv
 Type=MimeType
 MimeType=text/x-ksysv-log
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ admin/cvs.sh	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.3\""
+     VERSION="\"3.5.4\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ admin/acinclude.m4.in	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -2747,7 +2747,7 @@
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
Index: lilo-config/kde/lilo.desktop
===================================================================
--- lilo-config/kde/lilo.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ lilo-config/kde/lilo.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -131,6 +131,7 @@
 Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux)
 Comment[zh_CN]=?????? LILO (Linux ??????????????????)
 Comment[zh_HK]=?????? LILO (Linux ??????????????????)
+Comment[zh_TW]=?????????????????? LILO (Linux ?????????????????????)
 
 Keywords=lilo,boot,bootup,boot manager,linux,Other OS,MBR,startup,start
 Keywords[az]=lilo,a????l????,ba??lan????c,a????l???? idar????isi,linuks,dig??r ??m??liyyat sisteml??ri, MBR
Index: doc/knetworkconf/index.docbook
===================================================================
--- doc/knetworkconf/index.docbook	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ doc/knetworkconf/index.docbook	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -25,7 +25,7 @@
 <firstname>Christoph</firstname>
 <surname>Eckert</surname>
 <affiliation>
-<address><email>mchristoph.eckert.at.t-online.de</email></address>
+<address><email>ce.at.christeck.de</email></address>
 </affiliation>
 </author>
 
@@ -61,18 +61,17 @@
 </revhistory> -->
 
 <date>2005-03-24</date>
-<releaseinfo><!-- FIXME: Keep this synched with the current version of -->
-<!-- &kappname; --></releaseinfo>
+<releaseinfo>1.0</releaseinfo>
 
 <abstract>
-<para>This manual explains how to install and use &kappname;, a module for
-&kcontrol; that enables management of Network Interfaces, Routing and DNS
+<para>This manual explains how to install and use &knetworkconf;, a module for
+&kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
 properties.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>Package-this-will-be-in</keyword>
+<keyword>kdeadmin</keyword>
 <keyword>network</keyword>
 <keyword>ethernet</keyword>
 </keywordset>
@@ -81,15 +80,15 @@
 
 <chapter id="introduction">
 <title>Introduction</title>
-<para>The &kcontrolcenter; (&kcontrol;) provides users with a single
+<para>The &kcontrolcenter; (&kcontrolcenter;) provides users with a single
 integrated interface from which to manage a wide variety of system and
-desktop settings and preferences. &kcontrol; can be started by selecting
+desktop settings and preferences. &kcontrolcenter; can be started by selecting
 <menuchoice><guimenu>K Menu</guimenu><guimenuitem>Control
 Center</guimenuitem></menuchoice>.</para>
 
-<para>The &kappname; package was developed to enable users to manage TCP/IP
+<para>The &knetworkconf; package was developed to enable users to manage TCP/IP
 networking settings in the same way they manage other system settings from
-&kcontrol;. Tasks enabled by &kappname; provide users with a simple
+&kcontrolcenter;. Tasks enabled by &knetworkconf; provide users with a simple
 interface from which to perform the following tasks:</para>
 
 <itemizedlist>
@@ -117,28 +116,28 @@
 </itemizedlist>
 
 <para>Once installed a new module called <guibutton>Network
-Settings</guibutton> is displayed in the &kcontrol; <guibutton>Internet &amp;
+Settings</guibutton> is displayed in the &kcontrolcenter; <guibutton>Internet &amp;
 Network</guibutton> module group. To start the <application>Network
-Settings</application> (&kappname;) module select <menuchoice>
+Settings</application> (&knetworkconf;) module select <menuchoice>
 <guibutton>Index</guibutton> <guimenu>Internet &amp; Network</guimenu>
 <guimenuitem>Network Settings</guimenuitem> </menuchoice>.</para>
 
 <mediaobject>
 <imageobject>
-<imagedata fileref="figures/knetwork-conf-kcontrol-user-mode.png" format="PNG"/>
+<imagedata fileref="11.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&kappname; in user mode</phrase>
+<phrase>&knetworkconf; in user mode</phrase>
 </textobject>
 </mediaobject>
 
-<para>It is important to understand that &kappname; cannot install
+<para>It is important to understand that &knetworkconf; cannot install
 networking hardware. As such physical devices and their drivers must be
-properly installed and configured in order for &kappname; to display the
-device and enable management of networking properties.</para> 
+properly installed and configured in order for &knetworkconf; to display the
+device and enable management of networking properties.</para>
 
 <para>In most cases drivers for networking hardware and other devices are
-installed and configured while installing Linux. If you add networking
+installed and configured while installing &Linux;. If you add networking
 hardware after installation, you will have to define the drivers to be
 loaded by editing one of the following files depending on your kernel
 version:</para>
@@ -170,10 +169,20 @@
 
 <para>The <application>Network Settings</application> module is loaded when
 the <guibutton>Network Settings</guibutton> option is selected in the
-&kcontrol; index. When started the <application>Network
+&kcontrolcenter; index. When started the <application>Network
 Settings</application> module attempts to automatically detect the platform
 running on the system.</para>
 
+<screenshot>
+<screeninfo>Detecting the platform</screeninfo>
+<mediaobject>
+<imageobject>
+<imagedata fileref="02.png"
+format="PNG"/>
+</imageobject>
+</mediaobject>
+</screenshot>
+
 <para>When the platform is not a recognized you will be prompted to manually
 select the platform. Select a platform from the list that most closely
 corresponds to your distro and its release.  Check the <guibutton>Don't ask
@@ -181,7 +190,8 @@
 <guibutton>Network Settings</guibutton> is started the system will
 automatically default to the selected platform option.</para>
 
-<screenshot>
+<!--FIXME: several screenshots that were linked in this doc are missing-->
+<!--screenshot>
 <screeninfo>Selecting a platform</screeninfo>
 <mediaobject>
 <imageobject>
@@ -192,7 +202,7 @@
 <phrase>Selecting a platform</phrase>
 </textobject>
 </mediaobject>
-</screenshot>
+</screenshot-->
 
 <para>To manage the system network settings you must enter
 <quote>administrator mode.</quote> Prior to this all options will be
@@ -202,14 +212,14 @@
 left of the module. Enter your password when prompted.</para>
 
 <screenshot>
-<screeninfo>&kappname; in administrator mode</screeninfo>
+<screeninfo>&knetworkconf; in administrator mode</screeninfo>
 <mediaobject>
 <imageobject>
-<imagedata fileref="figures/knetwork-conf-runasroot.png"
+<imagedata fileref="01.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&kappname; in administrator mode</phrase>
+<phrase>&knetworkconf; in administrator mode</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -264,11 +274,11 @@
 <mediaobject>
 <imageobject>
 <imagedata
-fileref="figures/knetwork-conf-kcontrol-interface.png"
+fileref="03.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>The &kappname; interface</phrase>
+<phrase>The &knetworkconf; interface</phrase>
 </textobject>
 </mediaobject>
 
@@ -324,7 +334,7 @@
 <mediaobject>
 <imageobject>
 <imagedata
-fileref="figures/knetwork-conf-kcontrol-eth-configure.png"
+fileref="04.png"
 format="PNG"/>
 </imageobject>
 <textobject>
@@ -339,7 +349,7 @@
 
 <mediaobject>
 <imageobject>
-<imagedata fileref="figures/knetwork-conf-kcontrol-eth-configure-advanced.png"
+<imagedata fileref="05.png"
 format="PNG"/>
 </imageobject>
 <textobject>
@@ -439,6 +449,16 @@
 <para>The <guibutton>Routes</guibutton> tab enables management of
 the system routing configuration.</para>
 
+<mediaobject>
+<imageobject>
+<imagedata fileref="06.png"
+format="PNG"/>
+</imageobject>
+<textobject>
+<phrase>Advanced device configuration</phrase>
+</textobject>
+</mediaobject>
+
 <variablelist>
 <varlistentry>
 <term><guilabel>Default Gateway</guilabel></term>
@@ -465,6 +485,16 @@
 <para>The <guibutton>Domain Name System</guibutton> tab enables management
 of the system DNS configuration.</para>
 
+<mediaobject>
+<imageobject>
+<imagedata fileref="07.png"
+format="PNG"/>
+</imageobject>
+<textobject>
+<phrase>Advanced device configuration</phrase>
+</textobject>
+</mediaobject>
+
 <variablelist>
 <varlistentry>
 <term><guilabel>Host name</guilabel></term>
@@ -516,14 +546,14 @@
 <para>From the <guilabel>Domain Name Servers</guilabel> group click the
 <guibutton>Add</guibutton> button.  The <interface>Add new DNS</interface>
 dialog is displayed.</para>
-<mediaobject>
+<!--mediaobject>
 <imageobject>
 <imagedata
 fileref="knetwork-conf-kcontrol-add-dns.png"
 format="PNG"/>
 </imageobject>
 <textobject><phrase>Adding a DNS server</phrase></textobject>
-</mediaobject>
+</mediaobject-->
 </step>
 
 <step>
@@ -542,7 +572,7 @@
 <mediaobject>
 <imageobject>
 <imagedata
-fileref="knetwork-conf-kcontrol-add-editdns.png"
+fileref="09.png"
 format="PNG"/>
 </imageobject>
 <textobject>
@@ -575,20 +605,20 @@
 <step>
 <para>Click the <guibutton>Add</guibutton> button. The <interface>Add new
 Static host</interface> dialog is displayed.</para>
-<mediaobject>
+<!--mediaobject>
 <imageobject>
 <imagedata
 fileref="figures/knetwork-conf-kcontrol-statichost.png"
 format="PNG"/>
 </imageobject>
 <textobject><phrase>Adding static hosts</phrase></textobject>
-</mediaobject>
+</mediaobject-->
 </step>
 <step>
 <para>Enter the IP-address of the known host then click
 <guibutton>Add</guibutton>. The <interface>Add New Alias</interface> is
 displayed.</para>
-<mediaobject>
+<!--mediaobject>
 <imageobject>
 <imagedata
 fileref="knetwork-conf-kcontrol-statichost-add.png"
@@ -597,7 +627,7 @@
 <textobject>
 <phrase>Adding a static host</phrase>
 </textobject>
-</mediaobject>
+</mediaobject-->
 </step>
 <step>
 <para>Enter the name of the known host then click the
@@ -617,7 +647,7 @@
 <para>Select a static host record from the list, then click the
 <guibutton>Edit</guibutton> button. The <interface>Edit Static
 Host</interface> dialog is displayed.</para>
-<mediaobject>
+<!--mediaobject>
 <imageobject>
 <imagedata
 fileref="figures/knetwork-conf-kcontrol-statichost-record-edit.png"
@@ -626,7 +656,7 @@
 <textobject>
 <phrase>Editing static hosts</phrase>
 </textobject>
-</mediaobject>
+</mediaobject-->
 </step>
 <step>
 <para>Perform any of the following tasks, then click
@@ -660,7 +690,7 @@
 
 <para>Changes made via the <application>Network Settings</application>
 module are not automatically applied to the system environment. To apply the
-changes made, start <application>Konsole</application> and execute the
+changes made, start &konsole; and execute the
 following command.</para>
 
 <screen>
@@ -675,7 +705,7 @@
 <sect1 id="requirements">
 <title>Requirements</title>
 
-<para>You need KDE 3.x and QT 3.x installed to use knetwork-conf. </para>
+<para>You need &kde; 3.x and QT 3.x installed to use knetwork-conf. </para>
 <para>knetwork-conf can be used with the following platforms: </para>
 
 <itemizedlist>
@@ -698,7 +728,7 @@
 <para>Gentoo</para>
 </listitem>
 <listitem>
-<para>Mandrake</para>
+<para>&Mandrake;</para>
 </listitem>
 <listitem>
 <para>PLD</para>
@@ -707,10 +737,10 @@
 <para>OpenNA</para>
 </listitem>
 <listitem>
-<para>Red Hat</para>
+<para>&RedHat;</para>
 </listitem>
 <listitem>
-<para>SuSE</para>
+<para>&SuSE;</para>
 </listitem>
 </itemizedlist>
 </sect1>
@@ -728,9 +758,9 @@
 <title>Installing binaries</title>
 
 <para>When using the binary distributions (most often rpm packages), it is
-enough to have the KDE and QT binaries installed. </para> <para>Installing
+enough to have the &kde; and QT binaries installed. </para> <para>Installing
 binaries is recommended for less experienced users.  Simply download the rpm
-packages. Install them from <application>Konsole</application> using
+packages. Install them from &konsole; using
 <application>RPM</application> as follows:</para>
 
 <para>
@@ -745,11 +775,11 @@
 <sect1 id="compilation-and-installation">
 <title>Compilation and Installation</title>
 
-<para>In this case, it is not enough to have the binaries of QT and KDE
+<para>In this case, it is not enough to have the binaries of QT and &kde;
 installed; you also need the development packages which include libraries
 and other stuff. </para>
 
-<para>Recommended for advanced users only. Otherwise, compiling &kappname;
+<para>Recommended for advanced users only. Otherwise, compiling &knetworkconf;
 is not difficult.  The following commands should do it.</para>
 
 <screen>
@@ -772,7 +802,7 @@
 
 <para>In the first section of this chapter, you'll find some valuable
 information about networking basics. In the second, all configuration files
-on your disk which can be changed by &kappname; will be discussed. </para>
+on your disk which can be changed by &knetworkconf; will be discussed. </para>
 
 <sect1 id="networking-overview">
 <title>IPv4 Networking</title>
@@ -836,7 +866,7 @@
 <para>Furthermore, the netmask is most often set to 255.255.255.0, so that
 all of these machines are members of the same subnet. </para>
 
-<para>Some addresses are reserved for special things, e.g. 0.0.0.0 and
+<para>Some addresses are reserved for special things, &eg; 0.0.0.0 and
 127.0.0.1. The first one is the so called default route, the second the
 loopback address. The default route is needed by IP routing. </para>
 
@@ -865,7 +895,7 @@
 <title>Configuration files</title>
 
 <para>In this section you'll find the configuration files which are touched
-by &kappname; and where they reside in the filesystem of the different
+by &knetworkconf; and where they reside in the file system of the different
 distributions. </para>
 
 <sect2 id="resolv.conf">
@@ -904,11 +934,11 @@
 </row>
 <row>
 <entry>Gentoo</entry>
-<entry></entry>
+<entry>2005.0</entry>
 <entry>/etc/resolv.conf</entry>
 </row>
 <row>
-<entry>Mandrake</entry>
+<entry>&Mandrake;</entry>
 <entry>9.2</entry>
 <entry>/etc/resolv.conf</entry>
 </row>
@@ -923,12 +953,12 @@
 <entry>/etc/resolv.conf</entry>
 </row>
 <row>
-<entry>Red Hat</entry>
+<entry>&RedHat;</entry>
 <entry>9.0</entry>
 <entry>/etc/resolv.conf</entry>
 </row>
 <row>
-<entry>SuSE</entry>
+<entry>&SuSE;</entry>
 <entry>9.0</entry>
 <entry>/etc/resolv.conf</entry>
 </row>
@@ -982,7 +1012,7 @@
 <entry>/etc/hosts</entry>
 </row>
 <row>
-<entry>Mandrake</entry>
+<entry>&Mandrake;</entry>
 <entry>9.2</entry>
 <entry>/etc/hosts</entry>
 </row>
@@ -997,12 +1027,12 @@
 <entry>/etc/hosts</entry>
 </row>
 <row>
-<entry>Red Hat</entry>
+<entry>&RedHat;</entry>
 <entry>9.0</entry>
 <entry>/etc/hosts</entry>
 </row>
 <row>
-<entry>SuSE</entry>
+<entry>&SuSE;</entry>
 <entry>9.0</entry>
 <entry>/etc/hosts</entry>
 </row>
@@ -1010,7 +1040,7 @@
 </tgroup>
 </table>
 
-<para>On SuSE it is known that this file gets occasionally resorted by the
+<para>On &SuSE; it is known that this file gets occasionally resorted by the
 script SuSEconfig. So do not wonder if you do not find in a state you have
 expected. </para>
 </sect2>
Index: kdeadmin.lsm
===================================================================
--- kdeadmin.lsm	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ kdeadmin.lsm	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdeadmin
-Version:        3.5.3
-Entered-date:   2006-05-23
+Version:        3.5.4
+Entered-date:   2006-08-02
 Description:    Administrative GUIs written for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt 
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: kfile-plugins/deb/kfile_deb.desktop
===================================================================
--- kfile-plugins/deb/kfile_deb.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ kfile-plugins/deb/kfile_deb.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -55,6 +55,7 @@
 Name[wa]=Sitatistikes DEB
 Name[zh_CN]=DEB ??????
 Name[zh_HK]=DEB ??????
+Name[zh_TW]=DEB ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_deb
 MimeType=application/x-deb
Index: kfile-plugins/rpm/kfile_rpm.desktop
===================================================================
--- kfile-plugins/rpm/kfile_rpm.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ kfile-plugins/rpm/kfile_rpm.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -56,6 +56,7 @@
 Name[wa]=Sitatistikes RPM
 Name[zh_CN]=RPM ??????
 Name[zh_HK]=RPM ??????
+Name[zh_TW]=RPM ??????
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_rpm
 MimeType=application/x-rpm
Index: knetworkconf/knetworkconf/knetworkconf.cpp
===================================================================
--- knetworkconf/knetworkconf/knetworkconf.cpp	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/knetworkconf.cpp	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -352,7 +352,7 @@
         //If the interface is wireless, then save the wireless configuration options
         if (dev->getType() == WIRELESS_IFACE_TYPE){
           wifiDev->setEssid(configDlg.extDlg->kleEssid->text());
-          wifiDev->setWepKey(configDlg.extDlg->kleWepKey->text());
+          wifiDev->setWepKey(configDlg.extDlg->kleWepKey->password());
           wifiDev->setKeyType(configDlg.extDlg->qcbKeyType->currentText());
           dev = wifiDev;          
         }
@@ -824,6 +824,16 @@
 
 void KNetworkConf::enableInterfaceSlot()
 {
+  if (modified) {
+    if (KMessageBox::warningContinueCancel(this,
+                     i18n("The new configuration has not been saved.\nApply changes?"),
+                     i18n("New Configuration Not Saved"),
+                     KStdGuiItem::apply()) == KMessageBox::Continue)
+      saveInfoSlot();
+    else    
+      return;
+  }
+
   KNetworkInterface *dev = getDeviceInfo(klvCardList->currentItem()->text(0));
   if (dev->isActive())
     changeDeviceState(dev->getDeviceName(),DEVICE_DOWN);
@@ -833,6 +843,16 @@
 
 void KNetworkConf::disableInterfaceSlot()
 {
+  if (modified) {
+    if (KMessageBox::warningContinueCancel(this,
+                     i18n("The new configuration has not been saved.\nApply changes?"),
+                     i18n("New Configuration Not Saved"),
+                     KStdGuiItem::apply()) == KMessageBox::Continue)
+      saveInfoSlot();
+    else    
+      return;
+  }
+
   KNetworkInterface *dev = getDeviceInfo(klvCardList->currentItem()->text(0));
   if (dev->isActive())
     changeDeviceState(dev->getDeviceName(),DEVICE_DOWN);
Index: knetworkconf/knetworkconf/knetworkconf.desktop
===================================================================
--- knetworkconf/knetworkconf/knetworkconf.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/knetworkconf.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -36,6 +36,8 @@
 Comment[pt]=Configurar op????es TCP/IP
 Comment[pt_BR]=Configura os ajustes TCP/IP
 Comment[ru]=?????????????????? ???????????????????? TCP/IP
+Comment[se]=Heivet TCP/IP:a
+Comment[sk]=Konfigur??cia nastaven?? TCP/IP
 Comment[sl]=Nastavite TCP/IP nastavitve
 Comment[sr]=???????????????? TCP/IP ????????????????
 Comment[sr at Latn]=Podesite TCP/IP postavke
@@ -43,6 +45,7 @@
 Comment[uk]=?????????????????????? ?????????????????? TCP/IP
 Comment[zh_CN]=?????? TCP/IP ??????
 Comment[zh_HK]=?????? TCP/IP ??????
+Comment[zh_TW]=?????? TCP/IP
 Terminal=false
 Name=KNetworkConf
 Name[bn]=??????-???????????????????????????-????????????
@@ -80,6 +83,8 @@
 GenericName[pt]=Configurar op????es TCP/IP
 GenericName[pt_BR]=Configura os ajustes TCP/IP
 GenericName[ru]=???????????????????????? TCP/IP
+GenericName[se]=Heivet TCP/IP:a
+GenericName[sk]=Konfigur??cia nastaven?? TCP/IP
 GenericName[sl]=Nastavite TCP/IP nastavitve
 GenericName[sr]=???????????? TCP/IP ????????????????
 GenericName[sr at Latn]=Podesi TCP/IP postavke
@@ -87,3 +92,4 @@
 GenericName[uk]=?????????????????????? ?????????????????? TCP/IP
 GenericName[zh_CN]=?????? TCP/IP ??????
 GenericName[zh_HK]=?????? TCP/IP ??????
+GenericName[zh_TW]=?????? TCP/IP
Index: knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
===================================================================
--- knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -42,6 +42,8 @@
 Comment[pt]=Configurar Op????es de Rede
 Comment[pt_BR]=Configurar rede 
 Comment[ru]=?????????????? ?????????????????? ????????
+Comment[se]=Heivet fierpm??daga
+Comment[sk]=Konfigur??cia sie??ov??ch nastaven??
 Comment[sl]=Nastavite omre??ne nastavitve
 Comment[sr]=???????????????????? ???????????????? ??????????
 Comment[sr at Latn]=Pode??avanje postavki mre??e
@@ -49,6 +51,7 @@
 Comment[uk]=?????????????????????? ?????????????? ??????????????????
 Comment[zh_CN]=??????????????????
 Comment[zh_HK]=??????????????????
+Comment[zh_TW]=????????????
 Terminal=false
 Name=Network Settings
 Name[bg]=?????????????? ??????????????????
@@ -81,6 +84,8 @@
 Name[pt]=Configura????o da Rede
 Name[pt_BR]=Configura????es de Rede
 Name[ru]=?????????????????? ????????
+Name[se]=Fierpm??datheivehusat
+Name[sk]=Sie??ov?? nastavenia
 Name[sl]=Omre??ne nastavitve
 Name[sr]=???????????????? ??????????
 Name[sr at Latn]=Postavke mre??e
@@ -88,6 +93,7 @@
 Name[uk]=?????????????? ??????????????????
 Name[zh_CN]=????????????
 Name[zh_HK]=????????????
+Name[zh_TW]=????????????
 Keywords=Network,DNS,routes,interfaces
 Keywords[bg]=??????????, ??????????, ??????????????????, ??????????????, ??????????, Network, DNS, routes, interfaces
 Keywords[br]=Rouedad,DNS,hento??,etrefaso??
@@ -116,6 +122,7 @@
 Keywords[pl]=sie??,Internet,DNS,trasy,routowanie,rutowanie,interfejsy
 Keywords[pt]=rede,DNS,rotas,interfaces
 Keywords[pt_BR]=Rede,DNS,rotas,interfaces
+Keywords[se]=Fierpm??dat,DNS,routes,lavttat
 Keywords[sl]=Network,DNS,routes,interfaces,omre??je,vmesniki,poti,usmerjanje
 Keywords[sr]=??????????,DNS,????????,????????????????????
 Keywords[sr at Latn]=Mre??a,DNS,rute,interfejsi
@@ -123,3 +130,4 @@
 Keywords[uk]=Network,DNS,routes,interfaces,????????????,????????????????????
 Keywords[zh_CN]=Network,DNS,routes,interfaces,??????,??????,??????
 Keywords[zh_HK]=Network,DNS,routes,interfaces,??????,??????,??????
+Keywords[zh_TW]=??????,DNS,??????,??????
Index: knetworkconf/knetworkconf/kaddressvalidator.cpp
===================================================================
--- knetworkconf/knetworkconf/kaddressvalidator.cpp	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/kaddressvalidator.cpp	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -43,7 +43,7 @@
       return false;
     if ((i == 0) && (number == 0))
       return false;
-    if ((number < 0) || (number >= 255))
+    if ((number < 0) || (number > 255))
       return false;
     if ((i == 3) && (number == 0))
       return false;      
@@ -188,6 +188,8 @@
   struct in_addr _addr, _netmask, _network;
   int prefix = 0;
   QString s;  
+  if (addr.isNull() || netmask.isNull())
+    return NULL; //bad address
   if (!inet_pton(AF_INET,addr.latin1(),&_addr))
     return NULL; //bad address
   else
@@ -214,6 +216,8 @@
   struct in_addr _addr, _netmask, _network;
   int prefix = 0;
   QString s;
+  if (addr.isNull() || netmask.isNull())
+    return NULL; //bad address
   if (!inet_pton(AF_INET,addr.latin1(),&_addr))
     return NULL; //bad address
   else
Index: knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
===================================================================
--- knetworkconf/knetworkconf/kadddnsserverdlg.ui.h	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/kadddnsserverdlg.ui.h	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -30,15 +30,6 @@
 
 void KAddDNSServerDlg::validateAddressSlot()
 {
-  if (addingAlias && kleNewServer->text() !="")
-  {
-     _modified2 = true; 
-     close();  
-  }
-  else
-  {
-    KMessageBox::error(this,i18n("You have to type an alias first."),i18n("Invalid Text"));
-  }  
   if (!addingAlias)
   {
     if (KAddressValidator::isValidIPAddress(kleNewServer->text()))
@@ -51,6 +42,18 @@
       KMessageBox::error(this,i18n("The format of the specified IP address is not valid."),i18n("Invalid IP Address"));
     }  
   }
+  else 
+  {
+    if (kleNewServer->text() !="")
+    {
+       _modified2 = true; 
+       close();  
+    }
+    else
+    {
+       KMessageBox::error(this,i18n("You have to type an alias first."),i18n("Invalid Text"));
+    }
+  }  
 }
 
 
Index: knetworkconf/knetworkconf/knetworkconfigparser.cpp
===================================================================
--- knetworkconf/knetworkconf/knetworkconfigparser.cpp	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/knetworkconf/knetworkconfigparser.cpp	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -220,6 +220,8 @@
   QString dec2 = "";
   QString temp = "";
   QString temp2 = "";
+
+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
   temp = hex.mid(6,2);
   temp2 = temp2.setNum(temp.toInt(&ok,16));
   dec.append(temp2);
@@ -235,6 +237,23 @@
   temp = hex.mid(0,2);
   temp2 = temp2.setNum(temp.toInt(&ok,16));
   dec.append(temp2);
+#else
+  temp = hex.mid(0,2);
+  temp2 = temp2.setNum(temp.toInt(&ok,16));
+  dec.append(temp2);
+  dec.append('.');
+  temp = hex.mid(2,2);
+  temp2 = temp2.setNum(temp.toInt(&ok,16));  
+  dec.append(temp2);
+  dec.append('.');
+  temp = hex.mid(4,2);
+  temp2 = temp2.setNum(temp.toInt(&ok,16));  
+  dec.append(temp2);
+  dec.append('.');
+  temp = hex.mid(6,2);
+  temp2 = temp2.setNum(temp.toInt(&ok,16));
+  dec.append(temp2);
+#endif
 
   dec2 = dec;
   if (ok)
@@ -355,6 +374,10 @@
   while ( (device = devIt.current()) != 0 )
   {
     ++devIt;
+    // if protocol is not specified, then should not have entry in config
+    if (device->getBootProto().isEmpty())
+      continue;
+
     QDomElement tag = doc->createElement( "interface" );
     tag.setAttribute("type",device->getType());
     root->appendChild( tag );
@@ -741,12 +764,6 @@
       tempDevice->setDescription(i18n("Wireless Network Device"));
   }
 
-  //If the backend reports that the interface is up (even if it isn't true),
-  //and the interface doesn't have an IP address assgined it means that effectively
-  //the interface is down and should be marked as inactive.
-  if (tempDevice->isActive() && tempDevice->getIpAddress().isEmpty())
-    tempDevice->setActive(false);
-    
   //Clear IP address settings if boot protocol is dhcp or bootp, in case that they are
   //setted in the config files.
   if ((tempDevice->getBootProto().lower() == "dhcp") || (tempDevice->getBootProto().lower() == "bootp"))
Index: knetworkconf/backends/service.pl.in
===================================================================
--- knetworkconf/backends/service.pl.in	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/backends/service.pl.in	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -99,6 +99,7 @@
        "fedora-2"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-3"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "fedora-4"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+       "fedora-5"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "rpath"        => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
 
        "vine-3.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -169,6 +170,7 @@
        "fedora-2"       => [3, 5],
        "fedora-3"       => [3, 5],
        "fedora-4"       => [3, 5],
+       "fedora-5"       => [3, 5],
        "rpath"          => [3, 5],
        
        "vine-3.0"       => [3, 5],
@@ -236,6 +238,7 @@
      "fedora-2"       => "redhat-5.2",
      "fedora-3"       => "redhat-5.2",
      "fedora-4"       => "redhat-5.2",
+     "fedora-5"       => "redhat-5.2",
      "rpath"          => "redhat-5.2",
 
      "vine-3.0"       => "redhat-5.2",
@@ -1713,6 +1716,7 @@
        "fedora-2"     => \&gst_service_redhat_get_status,
        "fedora-3"     => \&gst_service_redhat_get_status,
        "fedora-4"     => \&gst_service_redhat_get_status,
+       "fedora-5"     => \&gst_service_redhat_get_status,
 
        "rpath"        => \&gst_service_redhat_get_status,
 
Index: knetworkconf/backends/network-conf.in
===================================================================
--- knetworkconf/backends/network-conf.in	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/backends/network-conf.in	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -71,7 +71,7 @@
               "debian-2.2", "debian-3.0", "debian-sarge",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06",
               "suse-7.0", "suse-9.0", "suse-9.1",
-              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
+              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",
Index: knetworkconf/backends/platform.pl.in
===================================================================
--- knetworkconf/backends/platform.pl.in	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/backends/platform.pl.in	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -96,6 +96,7 @@
   "fedora-2"        => "Fedora Core 2 (Tettnang)",
   "fedora-3"        => "Fedora Core 3 (Heidelberg)",
   "fedora-4"        => "Fedora Core 4 (Stentz)",
+  "fedora-5"        => "Fedora Core 5 (Bordeaux)",
   "rpath"           => "rPath Linux",
   "ark"             => "Ark Linux",
 };
Index: knetworkconf/backends/network.pl.in
===================================================================
--- knetworkconf/backends/network.pl.in	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ knetworkconf/backends/network.pl.in	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -523,6 +523,7 @@
        "fedora-2"     => "redhat-6.2",
        "fedora-3"     => "redhat-6.2",
        "fedora-4"     => "redhat-6.2",
+       "fedora-5"     => "redhat-6.2",
        "rpath"        => "redhat-6.2",
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
@@ -1827,6 +1828,7 @@
           "fedora-2"     => \&gst_network_rh72_get_file,
           "fedora-3"     => \&gst_network_rh72_get_file,
           "fedora-4"     => \&gst_network_rh72_get_file,
+          "fedora-5"     => \&gst_network_rh72_get_file,
           "rpath"        => \&gst_network_rh72_get_file,
           "vine-3.0"     => \&gst_network_rh62_get_file,
           "vine-3.1"     => \&gst_network_rh62_get_file,
@@ -3947,6 +3949,7 @@
           "fedora-2"     => "",
           "fedora-3"     => "",
           "fedora-4"     => "",
+          "fedora-5"     => "",
           "rpath"        => "",
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
@@ -4112,6 +4115,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -4533,6 +4537,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
@@ -5371,6 +5376,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -5777,6 +5783,7 @@
           "fedora-2"     => "redhat-7.2",
           "fedora-3"     => "redhat-7.2",
           "fedora-4"     => "redhat-7.2",
+          "fedora-5"     => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
Index: kcron/main.cpp
===================================================================
--- kcron/main.cpp	(.../3.5.3/kdeadmin)	(Revision 565820)
+++ kcron/main.cpp	(.../3.5.4/kdeadmin)	(Revision 565820)
@@ -30,8 +30,7 @@
 
     KCmdLineArgs::init(argc, argv, &aboutData);
   
-    KApplication app(&aboutData);
- 
+    KApplication app;
       
     if (app.isRestored())
       { 


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdeadmin.spec	17 Jul 2006 17:33:04 -0000	1.62
+++ kdeadmin.spec	24 Jul 2006 14:58:33 -0000	1.63
@@ -23,27 +23,25 @@
 %define kdebase_epoch 6
 %define appdir %{_datadir}/applications/kde
 
-Version: 3.5.3
-Release: 2
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
 Source1: kuser.pam
 Source2: kuser.pamd
 Source3: kpackage.pam
 Source4: kpackage.pamd
 Source5: kpackagerc
 
+Patch0: kdeadmin-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 
-# upstream patches
-Patch100: kdeadmin-3.5.2-knetworkconf-fedora.patch
-
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
@@ -158,10 +156,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .libtool
-
-# upstream patches
-%patch100 -p1 -b .knetworkconf-fedora
+%patch0 -p0
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -401,6 +396,10 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 7:3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+- drop kdeadmin-3.5.2-knetworkconf-fedora.patch, it's include in 3.5.4 upstream
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 7:3.5.3-2
 - rebuild
 


--- kdeadmin-3.5.2-knetworkconf-fedora.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:06:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:06:01 -0400
Subject: rpms/kdeartwork/devel kdeartwork-3.5.3-3.5.4.patch, NONE,
	1.1 kdeartwork.spec, 1.49, 1.50
Message-ID: <200607241506.k6OF61oW019874@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19859

Modified Files:
	kdeartwork.spec 
Added Files:
	kdeartwork-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)


kdeartwork-3.5.3-3.5.4.patch:
 IconThemes/Makefile.am                                     |    6 ------
 IconThemes/kdeclassic/22x22/actions/kde.png                |    0 
 IconThemes/kdeclassic/32x32/actions/kde.png                |    0 
 IconThemes/kdeclassic/index.theme                          |    3 +++
 IconThemes/kids/index.theme                                |    1 +
 IconThemes/slick/index.theme                               |    3 +++
 admin/acinclude.m4.in                                      |    2 +-
 admin/cvs.sh                                               |    6 +++---
 emoticons/KMess/emoticons.xml                              |    1 +
 kdeartwork.lsm                                             |    4 ++--
 kscreensaver/kdesavers/KBanner.desktop                     |    4 +++-
 kscreensaver/kdesavers/KBlob.desktop                       |    4 +++-
 kscreensaver/kdesavers/KClock.desktop                      |    4 +++-
 kscreensaver/kdesavers/KEuphoria.desktop                   |    4 +++-
 kscreensaver/kdesavers/KFiresaver.desktop                  |    5 ++++-
 kscreensaver/kdesavers/KFlux.desktop                       |    4 +++-
 kscreensaver/kdesavers/KFountain.desktop                   |    4 +++-
 kscreensaver/kdesavers/KGravity.desktop                    |    4 +++-
 kscreensaver/kdesavers/KLines-saver.desktop                |    4 +++-
 kscreensaver/kdesavers/KLorenz.desktop                     |    4 +++-
 kscreensaver/kdesavers/KPendulum.desktop                   |    4 +++-
 kscreensaver/kdesavers/KPolygon.desktop                    |    4 +++-
 kscreensaver/kdesavers/KRotation.desktop                   |    4 +++-
 kscreensaver/kdesavers/KScience.desktop                    |    4 +++-
 kscreensaver/kdesavers/KSlideshow.desktop                  |    4 +++-
 kscreensaver/kdesavers/KSolarWinds.desktop                 |    4 +++-
 kscreensaver/kdesavers/KVm.desktop                         |    4 +++-
 kscreensaver/kdesavers/KWave.desktop                       |    4 +++-
 kscreensaver/kpartsaver/kpartsaver.desktop                 |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/anemone.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/ant.desktop            |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop        |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop   |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/apple2.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/attraction.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/barcode.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/blaster.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/boing.desktop          |    7 ++++++-
 kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop    |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/boxed.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop         |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/braid.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/bsod.desktop           |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/bumps.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/cage.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/carousel.desktop       |    7 ++++++-
 kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/celtic.desktop         |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/circuit.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/compass.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/coral.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/critical.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/crystal.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/cube21.desktop         |    7 ++++++-
 kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/deco.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/demon.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/discrete.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/distort.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/drift.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/endgame.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/engine.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/eruption.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop      |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/flag.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/flame.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop   |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop       |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/flow.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop     |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/flurry.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/forest.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop    |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/gears.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/gflux.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/glblur.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop   |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop        |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/glknots.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/gltext.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/goop.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/grav.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/halftone.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/halo.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/helix.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop     |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/ifs.desktop            |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/interference.desktop   |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/juggle.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop      |    6 +++++-
 kscreensaver/kxsconfig/ScreenSavers/julia.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop   |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/klein.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lament.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/laser.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lightning.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lisa.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lissie.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/loop.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/maze.desktop           |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/menger.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/moebius.desktop        |    6 ++++--
 kscreensaver/kxsconfig/ScreenSavers/moire.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/moire2.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/molecule.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/mountain.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/munch.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/noof.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/pacman.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/pedal.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/penrose.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/petri.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/pinion.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/pipes.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/pong.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/providence.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/pyro.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/qix.desktop            |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/queens.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/ripples.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/rocks.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/rotor.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/rubik.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/sballs.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop   |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/slip.desktop           |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/sonar.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/sphere.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop   |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/spiral.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/squiral.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/stairs.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/starfish.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/starwars.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/strange.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/substrate.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop  |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/swirl.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/t3d.desktop            |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/tangram.desktop        |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop      |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop     |    7 ++++++-
 kscreensaver/kxsconfig/ScreenSavers/triangle.desktop       |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/truchet.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/twang.desktop          |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop    |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop     |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/vines.desktop          |    6 ++++--
 kscreensaver/kxsconfig/ScreenSavers/wander.desktop         |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop     |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop  |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/worm.desktop           |    6 ++++--
 kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop       |    5 ++++-
 kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xflame.desktop         |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xjack.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop          |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop      |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop    |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop        |    4 +++-
 kscreensaver/kxsconfig/ScreenSavers/zoom.desktop           |    5 ++++-
 kscreensaver/xsavers/KSpace.desktop                        |    6 ++++--
 kscreensaver/xsavers/KSwarm.desktop                        |    4 +++-
 kwin-styles/smooth-blend/client/smoothblend.desktop        |    1 +
 styles/phase/phase.themerc                                 |    3 +++
 wallpapers/alien-night.jpg.desktop                         |    1 +
 239 files changed, 805 insertions(+), 242 deletions(-)

--- NEW FILE kdeartwork-3.5.3-3.5.4.patch ---
Index: emoticons/KMess/emoticons.xml
===================================================================
--- emoticons/KMess/emoticons.xml	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ emoticons/KMess/emoticons.xml	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -170,6 +170,7 @@
 
 <emoticon file="shade">
 	<string>(H)</string>
+	<string>(h)</string>
 	<string>8-)</string>
 	<string>8)</string>
 </emoticon>
Index: styles/phase/phase.themerc
===================================================================
--- styles/phase/phase.themerc	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ styles/phase/phase.themerc	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -27,6 +27,7 @@
 Name[tr]=Faz
 Name[uk]=????????
 Name[vi]=Pha
+Name[zh_TW]=???
 ConfigPage=kstyle_phase_config
 Comment=Clean classical look
 Comment[bg]=???????????? ?? ???????????????? ????????
@@ -56,6 +57,7 @@
 Comment[pt]=Um estilo cl??ssico limpo
 Comment[pt_BR]=Uma apr??ncia cl??ssica limpa
 Comment[ru]=?????????????? ???????????????????????? ??????????
+Comment[sk]=Jednoduch?? klasick?? vzh??ad
 Comment[sl]=??ist klasi??en izgled
 Comment[sr]=???????? ???????????????? ????????????
 Comment[sr at Latn]=??ist klasi??an izgled
@@ -65,5 +67,6 @@
 Comment[uk]=??????????????????, ?????????????????? ??????????
 Comment[vi]=S???ch, ki???u d??ng truy???n th???ng
 Comment[zh_CN]=?????????????????????
+Comment[zh_TW]=?????????????????????
 [KDE]
 WidgetStyle=Phase
Index: kdeartwork.lsm
===================================================================
--- kdeartwork.lsm	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kdeartwork.lsm	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdeartwork
-Version:        3.5.3
-Entered-date:   2006-05-23
+Version:        3.5.4
+Entered-date:   2006-08-02
 Description:    Artwork for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt 
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ admin/cvs.sh	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.3\""
+     VERSION="\"3.5.4\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ admin/acinclude.m4.in	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -2747,7 +2747,7 @@
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
Index: kwin-styles/smooth-blend/client/smoothblend.desktop
===================================================================
--- kwin-styles/smooth-blend/client/smoothblend.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kwin-styles/smooth-blend/client/smoothblend.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -28,4 +28,5 @@
 Name[sv]=J??mn blandning
 Name[uk]=???????????? ????????????????
 Name[vi]=Tr???n m??u M?????t m??
+Name[zh_TW]=????????????
 X-KDE-Library=kwin3_smoothblend
Index: wallpapers/alien-night.jpg.desktop
===================================================================
--- wallpapers/alien-night.jpg.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ wallpapers/alien-night.jpg.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -28,5 +28,6 @@
 Name[uk]=?????????????????????? ??????
 Name[vi]=????m t???i Ng?????i ngo??i h??nh tinh
 Name[zh_CN]=????????????
+Name[zh_TW]=?????????
 ImageType=pixmap
 Author=Rob Cosgrove
Index: kscreensaver/kpartsaver/kpartsaver.desktop
===================================================================
--- kscreensaver/kpartsaver/kpartsaver.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/kpartsaver/kpartsaver.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -49,6 +49,7 @@
 Name[ven]=Tshivhulungi tsha tshikirini tsha Media
 Name[vi]=N??m=H??nh ???nh B???o v??? M??n h??nh
 Name[zh_CN]=????????????????????????
+Name[zh_TW]=????????????????????????
 Name[zu]=Umgcini Wesikrini Somculo
 
 Type=Application
@@ -115,7 +116,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -168,6 +169,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
 
 [Desktop Action Root]
@@ -219,4 +221,5 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
Index: kscreensaver/kdesavers/KWave.desktop
===================================================================
--- kscreensaver/kdesavers/KWave.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/kdesavers/KWave.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -119,7 +119,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -172,6 +172,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
 
 [Desktop Action Root]
@@ -223,4 +224,5 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
Index: kscreensaver/kdesavers/KBanner.desktop
===================================================================
--- kscreensaver/kdesavers/KBanner.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/kdesavers/KBanner.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -112,7 +112,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -165,6 +165,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
[...6922 lines suppressed...]
 
 [Desktop Action Root]
@@ -191,5 +192,6 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
 
Index: kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop
===================================================================
--- kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -115,7 +115,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -168,6 +168,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
 
 [Desktop Action Root]
@@ -219,4 +220,5 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
Index: kscreensaver/xsavers/KSwarm.desktop
===================================================================
--- kscreensaver/xsavers/KSwarm.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/xsavers/KSwarm.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -115,7 +115,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -168,6 +168,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
 
 [Desktop Action Root]
@@ -219,4 +220,5 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
Index: kscreensaver/xsavers/KSpace.desktop
===================================================================
--- kscreensaver/xsavers/KSpace.desktop	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ kscreensaver/xsavers/KSpace.desktop	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -56,7 +56,7 @@
 Name[vi]=V?? tr??? (GL)
 Name[xh]=Isithuba (GL)
 Name[zh_CN]=????????????(GL)
-Name[zh_TW]=?????? (GL)
+Name[zh_TW]=?????? (GL)
 Name[zu]=Isikhala (GL)
 
 [Desktop Action Setup]
@@ -118,7 +118,7 @@
 Name[vi]=Thi???t l???p...
 Name[xh]=Iyacwangciswa...
 Name[zh_CN]=??????...
-Name[zh_TW]=??????...
+Name[zh_TW]=?????????
 Name[zu]=Iyalungiselela...
 Icon=kscreensaver
 
@@ -171,6 +171,7 @@
 Name[uk]=?????????????????????? ?? ?????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? ???? ?????nh
 Name[zh_CN]=???????????????????????????
+Name[zh_TW]=???????????????????????????
 NoDisplay=true
 
 [Desktop Action Root]
@@ -222,4 +223,5 @@
 Name[uk]=?????????????????????? ?? ???????????????????? ??????????
 Name[vi]=Hi???n th??? trong C???a s??? G???c
 Name[zh_CN]=?????????????????????
+Name[zh_TW]=?????????????????????
 NoDisplay=true
Index: IconThemes/kdeclassic/22x22/actions/kde.png
===================================================================
Kann nicht anzeigen: Dateityp ist als bin??r angegeben.
svn:mime-type = application/octet-stream

Eigenschafts??nderungen: IconThemes/kdeclassic/22x22/actions/kde.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: IconThemes/kdeclassic/32x32/actions/kde.png
===================================================================
Kann nicht anzeigen: Dateityp ist als bin??r angegeben.
svn:mime-type = application/octet-stream

Eigenschafts??nderungen: IconThemes/kdeclassic/32x32/actions/kde.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: IconThemes/kdeclassic/index.theme
===================================================================
--- IconThemes/kdeclassic/index.theme	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ IconThemes/kdeclassic/index.theme	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -40,6 +40,7 @@
 Name[vi]=KDE-Truy???n th???ng
 Name[xh]=KDE-Endala
 Name[zh_CN]=KDE ??????
+Name[zh_TW]=KDE-??????
 Name[zu]=Okwasendulo kwe-KDE
 Comment=KDE Classic Icon Theme
 Comment[bg]=???????????????????????? ???????? ?? ?????????? ???? ??????
@@ -91,9 +92,11 @@
 Comment[vi]=S???c th??i Bi???u t?????ng Truy???n th???ng KDE
 Comment[xh]=Umxholo Wephawu lomfanekiso We KDE Wakudala
 Comment[zh_CN]=KDE ??????????????????
+Comment[zh_TW]=KDE ??????????????????
 Comment[zu]=Ithimu Yophawu lwesithombe se-KDE Yasendulo
 DisplayDepth=32
 Example=exec
+Inherits=default
 LinkOverlay=link
 LockOverlay=lockoverlay
 ZipOverlay=zip
Index: IconThemes/slick/index.theme
===================================================================
--- IconThemes/slick/index.theme	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ IconThemes/slick/index.theme	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -38,6 +38,7 @@
 Name[uk]=???????????????? ????????????????????
 Name[vi]=Bi???u t?????ng B??ng m?????t
 Name[zh_CN]=????????????
+Name[zh_TW]=Slick ??????
 Comment=Slick Icons Version 1.6
 Comment[bg]=???????????? ?????????? - ???????????? 1.6
 Comment[bs]=Slick ikone verzija 1.6
@@ -64,6 +65,7 @@
 Comment[pt]=??cones Slick Vers??o 1.6
 Comment[pt_BR]=??cones Slick Vers??o 1.6
 Comment[ru]=?????????????????? ??????????????????????, ???????????? 1.6
+Comment[sk]=Slick ikony verzia 1.6
 Comment[sl]=Ikone Slick razli??ica 1.6
 Comment[sr]=Slick ?????????? ???????????? 1.6
 Comment[sr at Latn]=Slick ikone izdanje 1.6
@@ -71,6 +73,7 @@
 Comment[uk]=???????????????? ????????????????????, ???????????? 1.6
 Comment[vi]=Bi???u t?????ng B??ng m?????t Phi??n b???n 1.6
 Comment[zh_CN]=?????????????????? 1.6
+Comment[zh_TW]=Slick ?????? 1.6 ???
 DisplayDepth=32
 Inherits=crystalsvg
 Example=folder
Index: IconThemes/Makefile.am
===================================================================
--- IconThemes/Makefile.am	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ IconThemes/Makefile.am	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -26,12 +26,6 @@
 		    for mng in $$mngs; do \
 		         $(INSTALL_DATA) $(top_srcdir)/IconThemes/$$theme/$$size/$$group/$$mng \
 			 $(DESTDIR)$(kde_icondir)/$$theme/$$size/$$group/$$mng ; done; \
-		    if [ $$group = "actions" -a -d $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde ]; then \
-		      (cd $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde && \
-		      $(bindir)/kimage_concat kde- kde.png) ;\
-		      $(INSTALL_DATA) $(top_srcdir)/IconThemes/$$theme/$$size/$$group/kde/kde.png \
-			      $(DESTDIR)$(kde_icondir)/$$theme/$$size/$$group ; \
-		    fi  ; \
 		  fi ; \
 	        done ; \
 	      fi ; \
Index: IconThemes/kids/index.theme
===================================================================
--- IconThemes/kids/index.theme	(.../3.5.3/kdeartwork)	(Revision 565821)
+++ IconThemes/kids/index.theme	(.../3.5.4/kdeartwork)	(Revision 565821)
@@ -69,6 +69,7 @@
 Comment[uk]=???????? ?????????????????? ???? ???????????? ?????????????? Everaldo.com
 Comment[vi]=S???c th??i Bi???u t?????ng b???i Everaldo.com Design Studio
 Comment[zh_CN]=??? Everaldo ???????????????(www.everaldo.com)?????????????????????
+Comment[zh_TW]=??? Everaldo.com ?????????????????????????????????
 DisplayDepth=32
 
 Inherits=hicolor


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdeartwork.spec	12 Jul 2006 06:39:05 -0000	1.49
+++ kdeartwork.spec	24 Jul 2006 15:05:50 -0000	1.50
@@ -4,25 +4,24 @@
 %define make_cvs 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.3
+%define arts_version 1.5.4
 %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.3
-Release: 1.1
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch: kde-libtool.patch
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Patch0: kdeartwork-3.5.3-3.5.4.patch
+Patch1: kde-libtool.patch
 
 BuildRequires: perl
 BuildRequires: kdebase-devel
@@ -54,29 +53,21 @@
 for KDE
 
 %prep
-%setup -q
-%patch -p1 -b .libtool
+%setup -q -n %{name}-3.5.3
+%patch0 -p0
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-export PATH=`pwd`:$PATH
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
-%if 0
    --enable-new-ldflags \
-%endif
    --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
-%if %{disable_gcc_check_and_hidden_visibility}
    --enable-gcc-hidden-visibility \
-%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -116,17 +107,17 @@
 
 %post icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i || :
+  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
   if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null|| :
   fi
 done
 
 %postun icons
 for i in locolor ikons kdeclassic kids slick ; do
-  touch --no-create %{_datadir}/icons/$i || :
+  touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
   if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
   fi
 done
 
@@ -156,6 +147,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:06:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:06:06 -0400
Subject: rpms/system-config-printer/devel .cvsignore, 1.82, 1.83 sources,
	1.85, 1.86 system-config-printer.spec, 1.47, 1.48
Message-ID: <200607241506.k6OF6588019897@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/system-config-printer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19870

Modified Files:
	.cvsignore sources system-config-printer.spec 
Log Message:
* Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 0.7.23-1
- 0.7.23.  Fixes bug #197866.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	7 Jul 2006 15:09:13 -0000	1.82
+++ .cvsignore	24 Jul 2006 15:06:02 -0000	1.83
@@ -62,3 +62,4 @@
 pycups-1.9.12.tar.bz2
 system-config-printer-0.7.21.tar.bz2
 system-config-printer-0.7.22.tar.bz2
+system-config-printer-0.7.23.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	7 Jul 2006 15:09:13 -0000	1.85
+++ sources	24 Jul 2006 15:06:02 -0000	1.86
@@ -1,2 +1,2 @@
 c853b55286216568f14dde8a5ae21a21  pycups-1.9.12.tar.bz2
-3026f265515fc756d01359fef8ed3942  system-config-printer-0.7.22.tar.bz2
+a2c8d3a92e107a7f5deab234c1b5bc08  system-config-printer-0.7.23.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- system-config-printer.spec	12 Jul 2006 08:24:04 -0000	1.47
+++ system-config-printer.spec	24 Jul 2006 15:06:02 -0000	1.48
@@ -2,8 +2,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 0.7.22
-Release: 1.1
+Version: 0.7.23
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: system-config-printer-%{version}.tar.bz2
@@ -114,6 +114,9 @@
 exit 0
 
 %changelog
+* Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 0.7.23-1
+- 0.7.23.  Fixes bug #197866.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.7.22-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:07:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:07:25 -0400
Subject: rpms/nfs-utils/devel .cvsignore, 1.15, 1.16 nfs-utils.spec, 1.98,
	1.99 sources, 1.16, 1.17 nfs-utils-1.0.8-mountd-debug.patch,
	1.1, NONE nfs-utils-1.0.8-nfsd-ports.patch, 1.1,
	NONE nfs-utils-1.0.8-nfsd-vers.patch, 1.1, NONE
Message-ID: <200607241507.k6OF7PQg020018@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20004

Modified Files:
	.cvsignore nfs-utils.spec sources 
Removed Files:
	nfs-utils-1.0.8-mountd-debug.patch 
	nfs-utils-1.0.8-nfsd-ports.patch 
	nfs-utils-1.0.8-nfsd-vers.patch 
Log Message:
Updated to 1.0.9 release



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Jun 2006 09:15:24 -0000	1.15
+++ .cvsignore	24 Jul 2006 15:07:21 -0000	1.16
@@ -5,3 +5,4 @@
 nfs.doc.tar.gz
 nfs-utils-1.0.8-rc4.tar.gz
 nfs-utils-1.0.8.tar.gz
+nfs-utils-1.0.9.tar.bz2


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- nfs-utils.spec	12 Jul 2006 07:28:10 -0000	1.98
+++ nfs-utils.spec	24 Jul 2006 15:07:21 -0000	1.99
@@ -1,13 +1,13 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
-Version: 1.0.8
-Release: 5.1%{?dist}
-Epoch: 1
+Version: 1.0.9
+Release: 1%{?dist}
+#Epoch: 1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8.tar.gz
+Source0: http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-1.0.9.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
@@ -19,11 +19,8 @@
 Patch50: nfs-utils-1.0.5-statdpath.patch
 Patch51: nfs-utils-1.0.6-mountd.patch
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
-Patch53: nfs-utils-1.0.8-nfsd-vers.patch
-Patch54: nfs-utils-1.0.8-nfsd-ports.patch
-Patch55: nfs-utils-1.0.8-mountd-debug.patch
-Patch56: nfs-utils-1.0.6-gssd_mixed_case.patch
-Patch57: nfs-utils-1.0.8-privports.patch
+Patch53: nfs-utils-1.0.6-gssd_mixed_case.patch
+Patch54: nfs-utils-1.0.8-privports.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -68,9 +65,6 @@
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
 
 # Do the magic to get things to compile
 %patch100 -p1
@@ -104,7 +98,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 make DESTDIR=$RPM_BUILD_ROOT install
-install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
+install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/usr/sbin
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
 install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
@@ -120,6 +114,7 @@
 mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
 
 # we are using quotad from quota utils
 rm %{buildroot}/%{_mandir}/man8/rquotad*
@@ -174,6 +169,8 @@
     /usr/sbin/userdel rpcuser 2>/dev/null || :
     /usr/sbin/groupdel rpcuser 2>/dev/null || :
     /usr/sbin/userdel nfsnobody 2>/dev/null || :
+	rm -rf /var/lib/nfs/statd
+	rm -rf /var/lib/nfs/v4recovery
 fi
 
 %postun
@@ -199,6 +196,7 @@
 %config /etc/rc.d/init.d/rpcgssd
 %config /etc/rc.d/init.d/rpcsvcgssd
 %config(noreplace) /etc/idmapd.conf
+%dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
@@ -207,12 +205,12 @@
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
 %doc linux-nfs/*
-/sbin/rpcdebug
 /sbin/rpc.lockd
 /sbin/rpc.statd
 /usr/sbin/exportfs
 /usr/sbin/nfsstat
 /usr/sbin/nhfs*
+/usr/sbin/rpcdebug
 /usr/sbin/rpc.mountd
 /usr/sbin/rpc.nfsd
 /usr/sbin/showmount
@@ -225,6 +223,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Mon Jul 24 2006 <SteveD at RedHat.com> 1.0.9-1
+- Updated to 1.0.9 release
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.8-5.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	21 Jun 2006 09:15:24 -0000	1.16
+++ sources	24 Jul 2006 15:07:22 -0000	1.17
@@ -1,2 +1,2 @@
 ae7db9c61c5ad04f83bb99e5caed73da  nfs.doc.tar.gz
-74fc2dd04b40c9d619ca41d3787ef8db  nfs-utils-1.0.8.tar.gz
+66fe1a9c4e5bf411fd54740518e7d2f0  nfs-utils-1.0.9.tar.bz2


--- nfs-utils-1.0.8-mountd-debug.patch DELETED ---


--- nfs-utils-1.0.8-nfsd-ports.patch DELETED ---


--- nfs-utils-1.0.8-nfsd-vers.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:08:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:08:14 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-multilib.patch,1.1,1.2
Message-ID: <200607241508.k6OF8Eio020050@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20034

Modified Files:
	e2fsprogs-1.39-multilib.patch 
Log Message:
[tw] fixed missing include for bits/wordsize.h


e2fsprogs-1.39-multilib.patch:
 configure.in               |   16 ++++++++--------
 lib/blkid/blkid_types.h.in |   12 ++++++++++++
 lib/ext2fs/ext2_types.h.in |   12 ++++++++++++
 lib/uuid/uuid_types.h.in   |   12 ++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

Index: e2fsprogs-1.39-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.39-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.39-multilib.patch	24 Jul 2006 14:54:10 -0000	1.1
+++ e2fsprogs-1.39-multilib.patch	24 Jul 2006 15:08:10 -0000	1.2
@@ -1,9 +1,10 @@
 --- e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in.multilib	2006-04-09 03:39:39.000000000 +0200
 +++ e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in	2006-07-24 16:14:11.000000000 +0200
-@@ -9,6 +9,17 @@
+@@ -9,6 +9,18 @@
  
  @ASM_TYPES_HEADER@
  
++#include <bits/wordsize.h>
 +# define SIZEOF_SHORT     2
 +# define SIZEOF_INT       4
 +#if __WORDSIZE == 64
@@ -20,10 +21,11 @@
  #else
 --- e2fsprogs-1.39/lib/blkid/blkid_types.h.in.multilib	2006-04-09 03:43:44.000000000 +0200
 +++ e2fsprogs-1.39/lib/blkid/blkid_types.h.in	2006-07-24 16:14:56.000000000 +0200
-@@ -9,6 +9,17 @@
+@@ -9,6 +9,18 @@
  
  @ASM_TYPES_HEADER@
- 
+
++#include <bite/wordsize.h>
 +# define SIZEOF_SHORT     2
 +# define SIZEOF_INT       4
 +#if __WORDSIZE == 64
@@ -40,10 +42,11 @@
  #else
 --- e2fsprogs-1.39/lib/uuid/uuid_types.h.in.multilib	2006-07-24 16:08:53.000000000 +0200
 +++ e2fsprogs-1.39/lib/uuid/uuid_types.h.in	2006-07-24 16:10:46.000000000 +0200
-@@ -9,6 +9,17 @@
+@@ -9,6 +9,18 @@
  typedef unsigned char uint8_t;
  typedef signed char int8_t;
  
++#include <bits/wordsize.h>
 +# define SIZEOF_SHORT     2
 +# define SIZEOF_INT       4
 +#if __WORDSIZE == 64



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:09:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:09:46 -0400
Subject: rpms/e2fsprogs/devel e2fsprogs-1.39-multilib.patch,1.2,1.3
Message-ID: <200607241509.k6OF9koV027923@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20093

Modified Files:
	e2fsprogs-1.39-multilib.patch 
Log Message:
fixed typo


e2fsprogs-1.39-multilib.patch:
 configure.in               |   16 ++++++++--------
 lib/blkid/blkid_types.h.in |   12 ++++++++++++
 lib/ext2fs/ext2_types.h.in |   12 ++++++++++++
 lib/uuid/uuid_types.h.in   |   12 ++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

Index: e2fsprogs-1.39-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.39-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.39-multilib.patch	24 Jul 2006 15:08:10 -0000	1.2
+++ e2fsprogs-1.39-multilib.patch	24 Jul 2006 15:09:43 -0000	1.3
@@ -25,7 +25,7 @@
  
  @ASM_TYPES_HEADER@
 
-+#include <bite/wordsize.h>
++#include <bits/wordsize.h>
 +# define SIZEOF_SHORT     2
 +# define SIZEOF_INT       4
 +#if __WORDSIZE == 64



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:12:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:12:27 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.68, 1.69 hwdata.spec, 1.70,
	1.71 sources, 1.71, 1.72
Message-ID: <200607241512.k6OFCRoS031267@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31170

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- Added one more entry for missing Philips LCD monitor (#199828)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	18 Jul 2006 12:51:07 -0000	1.68
+++ .cvsignore	24 Jul 2006 15:12:24 -0000	1.69
@@ -1 +1 @@
-hwdata-0.183.tar.gz
+hwdata-0.184.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- hwdata.spec	18 Jul 2006 12:51:07 -0000	1.70
+++ hwdata.spec	24 Jul 2006 15:12:24 -0000	1.71
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.183
+Version: 0.184
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,9 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Mon Jul 24 2006 Phil Knirsch <pknirsch at redhat.com> - 0.184-1
+- Added one more entry for missing Philips LCD monitor (#199828)
+
 * Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> - 0.183-1
 - Updated pci.ids before FC6 final (#198994)
 - Added several missing Samsung monitors (#197463)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	18 Jul 2006 12:51:08 -0000	1.71
+++ sources	24 Jul 2006 15:12:24 -0000	1.72
@@ -1 +1 @@
-763547a88cf4ea2aa05cd00e541ae0ea  hwdata-0.183.tar.gz
+43b7cea1c119c1d4dbb2949db46aff92  hwdata-0.184.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:14:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:14:44 -0400
Subject: rpms/sane-backends/devel sane-backends.spec, 1.71,
	1.72 sane-backends-1.0.17-newmodels.patch, 1.1, NONE
Message-ID: <200607241514.k6OFEio4032240@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32181

Modified Files:
	sane-backends.spec 
Removed Files:
	sane-backends-1.0.17-newmodels.patch 
Log Message:
remove obsolete newmodels patch



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sane-backends.spec	24 Jul 2006 14:52:57 -0000	1.71
+++ sane-backends.spec	24 Jul 2006 15:14:41 -0000	1.72
@@ -29,7 +29,6 @@
 Patch1: sane-backends-1.0.18-rpath.patch
 Patch2: sane-backends-1.0.12-badcode.patch
 Patch3: sane-backends-multilib.patch
-Patch4: sane-backends-1.0.17-newmodels.patch
 Patch5: sane-backends-1.0.17-pkgconfig.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
@@ -119,7 +118,6 @@
 %patch1 -p1 -b .rpath
 %patch2 -p1 -b .badcode
 %patch3 -p1 -b .multilib
-%patch4 -p1 -b .newmodels
 %patch5 -p1 -b .pkgconfig
 
 # Fix bug #62847.
@@ -258,6 +256,7 @@
 - version 1.0.18
 - unify spec file between OS releases
 - update rpath patch
+- remove obsolete newmodels patch
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-13.1
 - rebuild


--- sane-backends-1.0.17-newmodels.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:16:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:16:00 -0400
Subject: rpms/struts/devel struts.spec,1.34,1.35
Message-ID: <200607241516.k6OFG0pP003759@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2818

Modified Files:
	struts.spec 
Log Message:

- Fixed classpath issue.
- Removed spurious macros.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- struts.spec	22 Jul 2006 08:45:32 -0000	1.34
+++ struts.spec	24 Jul 2006 15:15:57 -0000	1.35
@@ -1,16 +1,13 @@
-%define name		struts
 %define full_name	jakarta-%{name}
-%define version		1.2.8
-%define release 	2jpp_14fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
 %define webapps		blank documentation example examples tiles-documentation
 %define webapplibs commons-beanutils commons-digester commons-fileupload commons-validator oro struts
 
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
+Name:		struts
+Version:	1.2.8
+Release: 	2jpp_15fc
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -118,7 +115,8 @@
 %build
 
 # build struts
-export CLASSPATH=
+# The new xalan needs xalan-j2-serializer
+export CLASSPATH=`build-classpath xalan-j2-serializer`
 ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
@@ -213,6 +211,10 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
+- Fixed classpath issue.
+- Removed spurious macros.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.8-2jpp_14fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:18:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:18:48 -0400
Subject: rpms/kdeedu/devel kdeedu-3.5.3-3.5.4.patch, NONE, 1.1 kdeedu.spec,
	1.49, 1.50
Message-ID: <200607241518.k6OFIm3L016075@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16027

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



kdeedu-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                       |    2 
 admin/cvs.sh                                |    6 
 applnk/miscellaneous.desktop                |    1 
 blinken/src/blinken.desktop                 |    4 
 doc/khangman/index.docbook                  |   37 +-
 doc/klettres/index.docbook                  |   32 +-
 doc/kmplot/introduction.docbook             |    4 
 doc/kturtle/using-kturtle.docbook           |    2 
 doc/kvoctrain/index.docbook                 |  392 ++++++++++++++--------------
 doc/kvoctrain/verb-query-dlg.png            |    0 
 kalzium/src/detailinfodlg.cpp               |   10 
 kalzium/src/kalzium.desktop                 |    6 
 kanagram/src/kanagram.desktop               |    5 
 kbruch/src/kbruch.desktop                   |    2 
 kdeedu.lsm                                  |    4 
 keduca/resources/keduca.desktop             |    8 
 keduca/resources/x-edugallery.desktop       |    2 
 kgeography/data/flags/Makefile.am           |    3 
 kgeography/data/flags/liechtenstein.png     |    0 
 kgeography/data/world.kgm                   |   10 
 kgeography/src/kgeography.desktop           |    4 
 kgeography/src/main.cpp                     |    2 
 kgeography/src/mapsdatatranslation.cpp      |    6 
 khangman/khangman/khangman.desktop          |    7 
 kig/TODO                                    |    1 
 kig/configure.in.in                         |    2 
 kig/kfile/kfile_drgeo.desktop               |    1 
 kig/kfile/kfile_kig.desktop                 |    1 
 kig/kig/kig.desktop                         |    8 
 kig/mimetypes/x-cabri.desktop               |    1 
 kig/mimetypes/x-drgeo.desktop               |    1 
 kig/mimetypes/x-kgeo.desktop                |    1 
 kig/mimetypes/x-kig.desktop                 |    1 
 kig/mimetypes/x-kseg.desktop                |    1 
 kig/misc/guiaction.cc                       |    2 
 kig/misc/kigpainter.h                       |    2 
 kig/modes/popup.cc                          |   44 +++
 kig/scripting/newscriptwizard.cc            |    2 
 kig/scripting/newscriptwizard.h             |    6 
 kig/scripting/script_mode.cc                |  142 ++++++++--
 kig/scripting/script_mode.h                 |   50 +++
 klatin/klatin/klatin.desktop                |    4 
 klettres/klettres/data/langs/Makefile.am    |    4 
 klettres/klettres/data/langs/de.txt         |    4 
 klettres/klettres/klettres.cpp              |    4 
 klettres/klettres/klettres.desktop          |    7 
 klettres/klettres/main.cpp                  |    2 
 klettres/klettres/version.h                 |    2 
 kmplot/kmplot/kmplot.desktop                |    3 
 kmplot/kmplot/x-kmplot.desktop              |    1 
 kpercentage/kpercentage/kpercentage.desktop |    2 
 kstars/kstars/indi/fli/libfli-parport.c     |   12 
 kstars/kstars/kstars.desktop                |    1 
 kstars/kstars/main.cpp                      |    2 
 kstars/kstars/skymap.cpp                    |    7 
 kstars/kstars/skymapdraw.cpp                |    2 
 kstars/kstars/tools/altvstime.cpp           |   31 +-
 kturtle/src/kturtle.desktop                 |    2 
 kverbos/kverbos/kverbos.desktop             |    1 
 kwordquiz/src/eventsrc                      |    4 
 kwordquiz/src/kwordquiz.cpp                 |    5 
 kwordquiz/src/kwordquiz.desktop             |    1 
 kwordquiz/src/x-kwordquiz.desktop           |    2 
 libkdeedu/extdate/extdatetime.cpp           |   28 +-
 64 files changed, 646 insertions(+), 300 deletions(-)

--- NEW FILE kdeedu-3.5.3-3.5.4.patch ---
Index: blinken/src/blinken.desktop
===================================================================
--- blinken/src/blinken.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ blinken/src/blinken.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -29,12 +29,14 @@
 GenericName[pt]=Jogo o Sim??o Diz
 GenericName[pt_BR]=Jogo o Sim??o Diz
 GenericName[ru]=???????? "???????????? ????????????"
+GenericName[sk]=Hra Simon Says
 GenericName[sl]=Igra ponavljanja
 GenericName[sr]=???????? ???????? ????????
 GenericName[sr at Latn]=Igra Sima ka??e
 GenericName[sv]=Simon s??ger lek
 GenericName[uk]=?????? "???????????? ????????"
 GenericName[vi]=Tr?? ch??i Ph??t ??m Simon
+GenericName[zh_TW]=???????????????
 Exec=blinken
 Icon=blinken
 Type=Application
@@ -63,11 +65,13 @@
 Comment[pt]=Um jogo antigo para melhorar a mem??ria
 Comment[pt_BR]=Um jogo antigo para melhorar a mem??ria
 Comment[ru]=???????? ?????? ???????????????? ????????????
+Comment[sk]=Retro hra na zlep??enie pam??te
 Comment[sl]=Igra za izbolj??anje spomina
 Comment[sr]=?????????? ???????? ???? ?????????????????????? ????????????????
 Comment[sr at Latn]=Stara igra za pobolj??avanje memorije
 Comment[sv]=Ett gammalmodigt program f??r att f??rb??ttra minnet
 Comment[uk]=?????? ?????? ???????????????? ??????'??????
 Comment[vi]=M???t tr?? ch??i t??ng c?????ng tr?? nh??? qu?? kh???
+Comment[zh_TW]=????????????????????????
 Terminal=false
 Categories=Qt;KDE;Education;
Index: khangman/khangman/khangman.desktop
===================================================================
--- khangman/khangman/khangman.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ khangman/khangman/khangman.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -57,7 +57,7 @@
 GenericName[vi]=Tr?? ch??i Hangman
 GenericName[xh]=Umdlalo Wendoda ejingayo
 GenericName[zh_CN]=???????????????
-GenericName[zh_TW]=???????????????
+GenericName[zh_TW]=????????????hangman?????????
 GenericName[zu]=Umdlalo WeHangman
 Comment=KDE Hangman Game
 Comment[bn]=??????.??????.???. ??????????????????????????? ?????????????????????????????? ????????????
@@ -65,7 +65,7 @@
 Comment[bs]=KDE igra vje??ala
 Comment[ca]=Joc del penjat per a KDE
 Comment[cs]=Hra 'ob????enec' pro KDE
-Comment[da]=Hangman-spil
+Comment[da]=Hangman-spil for KDE
 Comment[de]=Ein Buchstabierspiel f??r KDE
 Comment[es]=Juego del ahorcado de KDE
 Comment[et]=KDE poomism??ng
@@ -74,10 +74,12 @@
 Comment[fr]=Jeu du pendu de KDE
 Comment[hu]=KDE-s akaszt??f??s j??t??k
 Comment[it]=Gioco dell'impiccato per KDE
+Comment[ja]=????????????????????????
 Comment[nl]=Het spel Galgje voor KDE
 Comment[pl]=Gra w wisielca dla KDE
 Comment[pt]=Jogo da Forca do KDE
 Comment[pt_BR]=Jogo da Forca do KDE
+Comment[sk]=KDE hra Hangman
 Comment[sl]=Igra vislic
 Comment[sr]=KDE-?????? ???????? ????????????
 Comment[sr at Latn]=KDE-ova igra ve??ala
@@ -85,6 +87,7 @@
 Comment[uk]=?????? Hangman
 Comment[vi]=Tr?? ch??i Hangman KDE
 Comment[zh_CN]=KDE ???????????????
+Comment[zh_TW]=KDE ????????????hangman?????????
 Terminal=false
 Name=KHangMan
 Name[af]=K-hangman
Index: libkdeedu/extdate/extdatetime.cpp
===================================================================
--- libkdeedu/extdate/extdatetime.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ libkdeedu/extdate/extdatetime.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -46,20 +46,32 @@
 uint ExtDate::m_monthOrigin[] = { 0, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
 QString ExtDate::m_shortMonthNames[12] = {
-	i18n("Jan"), i18n("Feb"), i18n("Mar"), i18n("Apr"), i18n("May"), i18n("Jun"),
-	i18n("Jul"), i18n("Aug"), i18n("Sep"), i18n("Oct"), i18n("Nov"), i18n("Dec")
+	i18n("Short month name", "Jan"), i18n("Short month name", "Feb"), 
+	i18n("Short month name", "Mar"), i18n("Short month name", "Apr"), 
+	i18n("Short month name", "May"), i18n("Short month name", "Jun"),
+	i18n("Short month name", "Jul"), i18n("Short month name", "Aug"), 
+	i18n("Short month name", "Sep"), i18n("Short month name", "Oct"), 
+	i18n("Short month name", "Nov"), i18n("Short month name", "Dec")
 };
 QString ExtDate::m_shortDayNames[7] = {
-	i18n("Mon"), i18n("Tue"), i18n("Wed"), i18n("Thu"), i18n("Fri"), i18n("Sat"), i18n("Sun")
+	i18n("Short day name", "Mon"), i18n("Short day name", "Tue"), 
+	i18n("Short day name", "Wed"), i18n("Short day name", "Thu"), 
+	i18n("Short day name", "Fri"), i18n("Short day name", "Sat"), 
+	i18n("Short day name", "Sun")
 };
 QString ExtDate::m_longMonthNames[12] = {
-	i18n("January"), i18n("February"), i18n("March"), i18n("April"), i18n("May"),
-	i18n("June"), i18n("July"), i18n("August"), i18n("September"), i18n("October"),
-	i18n("November"), i18n("December")
+	i18n("Long month name", "January"), i18n("Long month name", "February"), 
+	i18n("Long month name", "March"), i18n("Long month name", "April"), 
+	i18n("Long month name", "May"), i18n("Long month name", "June"), 
+	i18n("Long month name", "July"), i18n("Long month name", "August"), 
+	i18n("Long month name", "September"), i18n("Long month name", "October"),
+	i18n("Long month name", "November"), i18n("Long month name", "December")
 };
 QString ExtDate::m_longDayNames[7] = {
-	i18n("Monday"), i18n("Tuesday"), i18n("Wednesday"), i18n("Thursday"),
-	i18n("Friday"), i18n("Saturday"), i18n("Sunday")
+	i18n("Long day name", "Monday"), i18n("Long day name", "Tuesday"), 
+	i18n("Long day name", "Wednesday"), i18n("Long day name", "Thursday"),
+	i18n("Long day name", "Friday"), i18n("Long day name", "Saturday"), 
+	i18n("Long day name", "Sunday")
 };
 
 ExtDate::ExtDate( int y, int m, int d)
Index: kpercentage/kpercentage/kpercentage.desktop
===================================================================
--- kpercentage/kpercentage/kpercentage.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kpercentage/kpercentage/kpercentage.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -33,6 +33,7 @@
 GenericName[fi]=Harjoittele prosentteja
 GenericName[fr]=Exercices pratiques avec des pourcentages
 GenericName[gl]=Exercicios de porcentaxes
+GenericName[he]=?????????? ????????????
 GenericName[hi]=????????????????????? ??????????????????
 GenericName[hu]=Sz??zal??ksz??m??t??
 GenericName[is]=??fa pr??sentureikninga
@@ -57,6 +58,7 @@
 GenericName[uk]=???????????? ?? ????????????????????
 GenericName[vi]=B??i t???p t??nh Ph???n tr??m
 GenericName[zh_CN]=???????????????
+GenericName[zh_TW]=?????????????????????
 Comment=
 Comment[bn]=?????????????????????
 Comment[sl]=Periodna tabela elementov
Index: kturtle/src/kturtle.desktop
===================================================================
--- kturtle/src/kturtle.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kturtle/src/kturtle.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -50,6 +50,7 @@
 GenericName[uk]=???????????????????? ?????????????????????????? ???? ???????? Logo
 GenericName[vi]=M??i tr?????ng L???p tr??nh Logo
 GenericName[zh_CN]=Logo ????????????
+GenericName[zh_TW]=Logo ????????????
 Exec=kturtle -caption "%c" %i %m
 Icon=kturtle
 Type=Application
@@ -94,6 +95,7 @@
 Comment[uk]=KDE ???????????????????? ?????????????????????????? ???? ???????? Logo
 Comment[vi]=M???t m??i tr?????ng l???p tr??nh Logo cho KDE
 Comment[zh_CN]=KDE Logo ????????????
+Comment[zh_TW]=KDE ??? Logo ??????????????????
 Path=
 Terminal=false
 X-KDE-StartupNotify=true
Index: kdeedu.lsm
===================================================================
--- kdeedu.lsm	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kdeedu.lsm	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdeedu
-Version:        3.5.3
-Entered-date:   2006-05-23
+Version:        3.5.4
+Entered-date:   2006-08-02
 Description:    Edutainment applications for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt 
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: klettres/klettres/main.cpp
===================================================================
--- klettres/klettres/main.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ klettres/klettres/main.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -35,7 +35,7 @@
               "letters in this language.\n"
               "10 languages are available: Czech, Danish, Dutch, English, French,\nItalian, Luganda, Romanized Hindi, Spanish and Slovak.");
 
-static const char version[] = "1.5";
+static const char version[] = "1.5.1";
 
 static KCmdLineOptions options[] =
     {
Index: klettres/klettres/klettres.desktop
===================================================================
--- klettres/klettres/klettres.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ klettres/klettres/klettres.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -10,19 +10,22 @@
 Comment[bs]= KDE program za u??enje abecede
 Comment[ca]=Un programa per a KDE per ajudar l'aprenentatge de l'alfabet
 Comment[cs]=KDE program pro v??uku abecedy
-Comment[da]=Et program til at hj??lpe med at l??re alfabetet
+Comment[da]=Et KDE program for at l??re sig alfabetet
 Comment[de]=Ein KDE-Programm zum Erlernen des Alphabets
[...2732 lines suppressed...]
 	KSNumbers *oldNum = 0;
 	dms LST = geo->GSTtoLST( today.gst() );
-	
+
 	//First determine time of sunset and sunrise
 	computeSunRiseSetTimes();
-	
+
 	for ( unsigned int i = 0; i < avtUI->PlotList->count(); ++i ) {
 		QString oName = avtUI->PlotList->text( i ).lower();
 		ObjectNameList &ObjNames = ks->data()->ObjNames;
@@ -409,15 +411,16 @@
 				//restore original position
 				if ( o->isSolarSystem() ) {
 					o->updateCoords( oldNum, true, ks->data()->geo()->lat(), ks->LST() );
-					delete oldNum;
+                                        delete oldNum;
 					oldNum = 0;
 				}
+                                o->EquatorialToHorizontal( ks->LST(), ks->data()->geo()->lat() );
 
 				objFound = true;
 				break;
 			}
 		}
-		
+
 		if ( ! objFound ) {  //assume unfound object is a custom object
 			pList.at(i)->updateCoords( num ); //precess to desired epoch
 
@@ -435,7 +438,7 @@
 	setLSTLimits();
 	slotHighlight();
 	View->repaint();
-	
+
 	delete num;
 }
 
@@ -458,7 +461,7 @@
 void AltVsTime::setLSTLimits(void) {
 	//UT at noon on target date
 	KStarsDateTime ut = getDate().addSecs( ((double)DayOffset + 0.5)*86400. );
-	
+
 	dms lst = geo->GSTtoLST( ut.gst() );
 	View->setSecondaryLimits( lst.Hours(), lst.Hours() + 24.0, -90.0, 90.0 );
 }
@@ -496,7 +499,7 @@
 	: KStarsPlotWidget( x1, x2, y1, y2, parent, name )
 {
 	//Default SunRise/SunSet values
-	SunRise = 0.25; 
+	SunRise = 0.25;
 	SunSet = 0.75;
 }
 
@@ -543,9 +546,9 @@
 
 	//draw daytime sky if the Sun rises for the current date/location
 	//(when Sun does not rise, SunSet = -1.0)
-	if ( SunSet != -1.0 ) { 
+	if ( SunSet != -1.0 ) {
 		//If Sun does not set, then just fill the daytime sky color
-		if ( SunSet == 1.0 ) { 
+		if ( SunSet == 1.0 ) {
 			p.fillRect( 0, 0, pW, int(0.5*pH), QColor( 0, 100, 200 ) );
 		} else {
 			//Display centered on midnight, so need to modulate dawn/dusk by 0.5
Index: kstars/kstars/skymap.cpp
===================================================================
--- kstars/kstars/skymap.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kstars/kstars/skymap.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -450,6 +450,13 @@
 //Slots
 
 void SkyMap::slotTransientTimeout( void ) {
+	//Don't fade label if the transientObject is now the focusObject!
+	if ( transientObject() == focusObject() && Options::useAutoLabel() ) {
+		setTransientObject( NULL );
+		TransientTimer.stop();
+		return;
+	}
+
 	//to fade the labels, we will need to smoothly transition from UserLabelColor to SkyColor.
 	QColor c1 = data->colorScheme()->colorNamed( "UserLabelColor" );
 	QColor c2 = data->colorScheme()->colorNamed( "SkyColor" );
Index: kstars/kstars/main.cpp
===================================================================
--- kstars/kstars/main.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kstars/kstars/main.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -29,7 +29,7 @@
 #include "ksnumbers.h"
 #include "Options.h"
 
-#define KSTARS_VERSION "1.2.0"
+#define KSTARS_VERSION "1.2.4"
 
 static const char description[] =
 	I18N_NOOP("Desktop Planetarium");
Index: kstars/kstars/skymapdraw.cpp
===================================================================
--- kstars/kstars/skymapdraw.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kstars/kstars/skymapdraw.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -344,7 +344,7 @@
 		cur = o;
 		psky.moveTo( o.x(), o.y() );
 
-		double dRA = 1./15.; //180 points along full circle of RA
+		double dRA = 1./5.; //120 points along full circle of RA
 		for ( register double RA=dRA; RA<24.; RA+=dRA ) {
 			sp->set( RA, Dec );
 			if ( Options::useAltAz() ) sp->EquatorialToHorizontal( data->LST, data->geo()->lat() );
Index: kalzium/src/kalzium.desktop
===================================================================
--- kalzium/src/kalzium.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kalzium/src/kalzium.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -10,7 +10,7 @@
 Comment[bs]=KDE periodna tablica elemenata
 Comment[ca]=Taula peri??dica dels elements per a KDE
 Comment[cs]=Periodick?? tabulka prvk?? pro KDE
-Comment[da]=Grundstoffernes periodiske system
+Comment[da]=Det periodiske system af grundstoffer for KDE
 Comment[de]=Periodensystem der Elemente
 Comment[es]=Tabla peri??dica de los elementos de KDE
 Comment[et]=KDE keemiliste elementide tabel
@@ -19,16 +19,19 @@
 Comment[fr]=Classification p??riodique des ??l??ments de KDE
 Comment[hu]=KDE-alap?? peri??dusos rendszer
 Comment[it]=Tavola periodica degli elementi per KDE
+Comment[ja]=???????????????
 Comment[nl]=Periodieke Tabel der Elementen
 Comment[pl]=Uk??ad okresowy pierwiastk??w dla KDE
 Comment[pt]=Tabela Peri??dica de Elementos do KDE
 Comment[pt_BR]=Tabela Peri??dica de Elementos do KDE
+Comment[sk]=KDE Periodick?? tabu??ka prvkov
 Comment[sl]=Periodni sistem elementov
 Comment[sr]=???????????????? ???????????? ?????????????????? ???? KDE
 Comment[sr at Latn]=Periodni sistem elemenata za KDE
 Comment[sv]=Periodiska systemet f??r KDE
 Comment[uk]=???????????????????? ?????????????? ??????????????????
 Comment[vi]=B???ng Tu???n ho??n c??c Nguy??n t??? Ho?? h???c KDE
+Comment[zh_TW]=KDE ???????????????
 Terminal=false
 Name=Kalzium
 Name[bn]=??????????????????????????????
@@ -85,4 +88,5 @@
 GenericName[uk]=???????????????????? ?????????????? ??????????????????
 GenericName[vi]=B???ng Tu???n ho??n c??c Nguy??n t???
 GenericName[zh_CN]=???????????????
+GenericName[zh_TW]=???????????????
 Categories=Qt;KDE;Education;Science;
Index: kalzium/src/detailinfodlg.cpp
===================================================================
--- kalzium/src/detailinfodlg.cpp	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kalzium/src/detailinfodlg.cpp	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -348,11 +348,6 @@
 	QVBoxLayout *modelLayout = new QVBoxLayout( m_pModelTab );
 	modelLayout->setMargin( 0 );
 	wOrbits = new OrbitsWidget( m_pModelTab );
-	QWhatsThis::add( wOrbits,
-	    i18n( "Here you can see the atomic hull of %1. %2 has the configuration %3." )
-	    .arg( m_element->elname() )
-	    .arg( m_element->elname() )
-	    .arg( m_element->parsedOrbits() ) );
 	modelLayout->addWidget( wOrbits );
 
 	// html tabs
@@ -399,6 +394,11 @@
 
 	// updating atomic model tab
 	wOrbits->setElementNumber( m_elementNumber );
+	QWhatsThis::add( wOrbits,
+	    i18n( "Here you can see the atomic hull of %1. %2 has the configuration %3." )
+	    .arg( m_element->elname() )
+	    .arg( m_element->elname() )
+	    .arg( m_element->parsedOrbits() ) );
 
 	// updating html tabs
 	fillHTMLTab( m_htmlpages["chemical"], getHtml( CHEMICAL ) );
Index: kbruch/src/kbruch.desktop
===================================================================
--- kbruch/src/kbruch.desktop	(.../3.5.3/kdeedu)	(Revision 565826)
+++ kbruch/src/kbruch.desktop	(.../3.5.4/kdeedu)	(Revision 565826)
@@ -47,6 +47,7 @@
 GenericName[uk]=???????????? ?? ??????????????
 GenericName[vi]=B??i t???p Ph??n s???
 GenericName[zh_CN]=????????????
+GenericName[zh_TW]=????????????
 Comment=Practice exercises with fractions
 Comment[af]=Doen oefeninge met breuke
 Comment[ar]=???????????? ???????????? ?????? ????????????
@@ -92,6 +93,7 @@
 Comment[uk]=?????????????????? ???????????? ?? ??????????????
 Comment[vi]=B??i luy???n t???p t??nh to??n v???i ph??n s???
 Comment[zh_CN]=????????????
+Comment[zh_TW]=?????????????????????
 Terminal=false
 Name=KBruch
 Name[bn]=??????-???????????????


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdeedu.spec	14 Jul 2006 09:30:30 -0000	1.49
+++ kdeedu.spec	24 Jul 2006 15:18:46 -0000	1.50
@@ -10,15 +10,16 @@
 %define qt_epoch 1
 
 Name: kdeedu
-Version: 3.5.3
-Release: 2
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: User Interface/Desktops
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
 
+Patch0: kdeedu-3.5.3-3.5.4.patch
 Patch1: kde-libtool.patch
 
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -60,8 +61,8 @@
 This package contains header files for kdeedu.
 
 %prep
-%setup -q
-%patch1 -p1 -b .libtool
+%setup -q -n %{name}-3.5.3
+%patch0 -p0
 
 %ifarch s390 s390x ppc ppc64
   rm -rf doc/kstars kstars
@@ -132,6 +133,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Fri Jul 14 2006 Than Ngo <than at redhat.com> 3.5.3-2
 - BR: autoconf automake libtool
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:24:30 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.51,1.52
Message-ID: <200607241524.k6OFOUii018236@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18156

Modified Files:
	mx4j.spec 
Log Message:
* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_6fc
- Build using interpreted ant.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mx4j.spec	24 Jul 2006 02:17:07 -0000	1.51
+++ mx4j.spec	24 Jul 2006 15:24:28 -0000	1.52
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_5fc
+Release:        4jpp_6fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -175,6 +175,7 @@
 
 cd build
 #ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+export ANT_OPTS="-Dgnu.gcj.precompiled.db.path='' -verbose"
 ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools
 
 %install
@@ -264,6 +265,9 @@
 %doc dist/docs/*
 
 %changelog
+* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_6fc
+- Build using interpreted ant.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_5fc
 - Stub docs.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:26:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:26:41 -0400
Subject: rpms/kdegames/devel kdegames-3.5.3-3.5.4.patch, NONE,
	1.1 kdegames.spec, 1.53, 1.54
Message-ID: <200607241526.k6OFQfxm019100@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegames/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19050

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-3.5.3-3.5.4.patch 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)


kdegames-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                  |    2 
 admin/cvs.sh                                           |    6 +-
 atlantik/atlantik.desktop                              |    1 
 atlantik/eventsrc                                      |    8 +++
 doc/kbackgammon/index.docbook                          |   16 +++++--
 doc/kfouleggs/index.docbook                            |    9 ----
 doc/klickety/index.docbook                             |    2 
 doc/kmahjongg/index.docbook                            |   33 ++--------------
 doc/kpoker/index.docbook                               |    3 -
 doc/kreversi/index.docbook                             |   18 +++++++-
 doc/kshisen/index.docbook                              |    8 +--
 doc/ktuberling/index.docbook                           |   22 ++++++----
 doc/ktuberling/technical-reference.docbook             |   10 ++--
 doc/kwin4/index.docbook                                |   23 ++++-------
 kasteroids/kasteroids.desktop                          |    3 +
 katomic/katomic.desktop                                |    4 +
 kbackgammon/eventsrc                                   |   15 ++++++-
 kbackgammon/kbackgammon.desktop                        |    5 ++
 kbackgammon/kbackgammonui.rc                           |    3 -
 kblackbox/kblackbox.desktop                            |    3 +
 kbounce/kbounce.desktop                                |    4 +
 kdegames.lsm                                           |    4 -
 kenolaba/kenolaba.desktop                              |    4 +
 kfouleggs/eventsrc                                     |    7 +++
 kfouleggs/kfouleggs.desktop                            |    5 ++
 kgoldrunner/src/KGoldrunner.desktop                    |    4 +
 kgoldrunner/src/kgrdialog.cpp                          |    2 
 kjumpingcube/kjumpingcube.desktop                      |    1 
 klickety/eventsrc                                      |    5 ++
 klickety/klickety.desktop                              |    1 
 klines/klines.desktop                                  |    1 
 kmahjongg/Editor.cpp                                   |    3 -
 kmahjongg/kmahjongg.desktop                            |    4 +
 kmahjongg/version.h                                    |    2 
 kmines/data/eventsrc                                   |   30 ++++++++++++++
 kmines/data/kmines.desktop                             |    3 +
 knetwalk/src/eventsrc                                  |    6 ++
 kolf/kolf.desktop                                      |    1 
 kolf/newgame.cpp                                       |    2 
 kolf/x-kolf.desktop                                    |    1 
 kolf/x-kourse.desktop                                  |    4 +
 konquest/konquest.desktop                              |    4 +
 kpat/dealer.cpp                                        |    7 +++
 kpat/kpat.desktop                                      |    2 
 kpoker/kpoker.desktop                                  |    4 +
 kreversi/ChangeLog                                     |   30 ++++++++++++++
 kreversi/Position.cpp                                  |    4 +
 kreversi/kreversi.cpp                                  |    2 
 kreversi/kreversi.desktop                              |    6 ++
 kreversi/qreversigameview.cpp                          |   17 +++++---
 kreversi/qreversigameview.h                            |    5 +-
 kreversi/sounds/eventsrc                               |   21 +++++++++-
 kreversi/version.h                                     |    2 
 ksame/eventsrc                                         |    8 +++
 ksame/ksame.desktop                                    |    1 
 kshisen/board.cpp                                      |   30 +++++++++-----
 kshisen/board.h                                        |    1 
 kshisen/kshisen.desktop                                |    4 +
 ksirtet/ksirtet/eventsrc                               |    7 +++
 ksirtet/ksirtet/ksirtet.desktop                        |    4 +
 ksmiletris/ksmiletris.desktop                          |    4 +
 ksnake/ksnake.desktop                                  |    5 ++
 kspaceduel/kspaceduel.desktop                          |    3 +
 ktuberling/ktuberling.desktop                          |    2 
 ktuberling/x-tuberling.desktop                         |    1 
 kwin4/kwin4.desktop                                    |    1 
 libkdegames/carddecks/cards-default/index.desktop      |    1 
 libkdegames/carddecks/cards-konqi-modern/index.desktop |    3 +
 libkdegames/carddecks/cards-penguins/index.desktop     |    1 
 libkdegames/carddecks/cards-warwick/index.desktop      |    1 
 libkdegames/carddecks/cards-xskat-french/index.desktop |    2 
 libkdegames/carddecks/cards-xskat-german/index.desktop |    2 
 libkdegames/carddecks/decks/deck0.desktop              |    1 
 libkdegames/carddecks/decks/deck10.desktop             |    1 
 libkdegames/carddecks/decks/deck11.desktop             |    1 
 libkdegames/carddecks/decks/deck13.desktop             |    1 
 libkdegames/carddecks/decks/deck14.desktop             |    1 
 libkdegames/carddecks/decks/deck16.desktop             |    1 
 libkdegames/carddecks/decks/deck17.desktop             |    1 
 libkdegames/carddecks/decks/deck2.desktop              |    1 
 libkdegames/carddecks/decks/deck20.desktop             |    1 
 libkdegames/carddecks/decks/deck21.desktop             |    1 
 libkdegames/carddecks/decks/deck22.desktop             |    1 
 libkdegames/carddecks/decks/deck24.desktop             |    3 +
 libkdegames/carddecks/decks/deck3.desktop              |    1 
 libkdegames/carddecks/decks/deck5.desktop              |    1 
 libkdegames/carddecks/decks/deck6.desktop              |    1 
 libkdegames/carddecks/decks/deck8.desktop              |    1 
 libkdegames/kgame/kgamepropertylist.h                  |   14 +++---
 libksirtet/base/board.h                                |    5 +-
 libksirtet/base/field.h                                |    3 -
 libksirtet/base/gtetris.h                              |    3 -
 libksirtet/base/highscores.h                           |    4 -
 libksirtet/base/kzoommainwindow.h                      |    4 +
 libksirtet/common/ai.h                                 |    8 +--
 libksirtet/common/board.h                              |    4 -
 libksirtet/common/factory.h                            |    4 -
 libksirtet/common/field.h                              |    5 +-
 libksirtet/common/highscores.h                         |    4 -
 libksirtet/common/inter.h                              |    4 -
 libksirtet/common/main.h                               |    4 -
 libksirtet/common/misc_ui.h                            |   10 ++--
 libksirtet/common/settings.h                           |    6 +-
 libksirtet/common/types.cpp                            |   12 ++---
 libksirtet/common/types.h                              |   15 +++----
 libksirtet/lib/libksirtet_export.h                     |   35 +++++++++++++++++
 libksirtet/lib/mp_simple_board.h                       |    4 +
 lskat/lskat.desktop                                    |    1 
 108 files changed, 480 insertions(+), 160 deletions(-)

--- NEW FILE kdegames-3.5.3-3.5.4.patch ---
Index: klickety/klickety.desktop
===================================================================
--- klickety/klickety.desktop	(.../3.5.3/kdegames)	(Revision 565826)
+++ klickety/klickety.desktop	(.../3.5.4/kdegames)	(Revision 565826)
@@ -50,6 +50,7 @@
 GenericName[ro]=Un joc de table
 GenericName[ru]=???????????????????? ????????
 GenericName[rw]=Umukino w'Ikibaho
+GenericName[se]=Duolbb????speallu
 GenericName[sk]=Stolov?? hra
 GenericName[sl]=Namizna igra
 GenericName[sr]=???????? ???? ??????????
Index: klickety/eventsrc
===================================================================
--- klickety/eventsrc	(.../3.5.3/kdegames)	(Revision 565826)
+++ klickety/eventsrc	(.../3.5.4/kdegames)	(Revision 565826)
@@ -44,6 +44,7 @@
 Name[pt_BR]=Linha removida
 Name[ro]=Linie eliminat??
 Name[ru]=?????????? ??????????????
+Name[se]=Linnj?? lea eretv??ldon
 Name[sk]=??iara odstr??nen??
 Name[sl]=Vrstica odstranjena
 Name[sr]=???????????????? ????????????
@@ -91,6 +92,7 @@
 Comment[pt_BR]=Linha removida
 Comment[ro]=Linie eliminat??
 Comment[ru]=?????????? ??????????????
+Comment[se]=Linnj?? lea eretv??ldon
 Comment[sk]=??iara odstr??nen??
 Comment[sl]=Odstranjena vrstica
 Comment[sr]=???????????????? ????????????
@@ -151,6 +153,7 @@
 Name[pt_BR]=Fim do jogo
 Name[ro]=Joc terminat
 Name[ru]=?????????? ????????
+Name[se]=Speallu nogai
 Name[sk]=Koniec hry
 Name[sl]=Konec igre
 Name[sr]=???????? ????????
@@ -201,6 +204,7 @@
 Comment[pt]=Fim do jogo
 Comment[pt_BR]=Fim do Jogo
 Comment[ru]=?????????? ????????
+Comment[se]=Speallu nogai
 Comment[sk]=Koniec hry
 Comment[sl]=Konec igre
 Comment[sr]=???????? ????????
@@ -210,4 +214,5 @@
 Comment[tr]=Oyun bitti
 Comment[uk]=???????????? ??????
 Comment[zh_CN]=????????????
+Comment[zh_TW]=????????????
 default_presentation=0
Index: knetwalk/src/eventsrc
===================================================================
--- knetwalk/src/eventsrc	(.../3.5.3/kdegames)	(Revision 565826)
+++ knetwalk/src/eventsrc	(.../3.5.4/kdegames)	(Revision 565826)
@@ -38,6 +38,7 @@
 Name[pt]=Carregar
 Name[pt_BR]=Clicar
 Name[ru]=????????????
+Name[se]=Coahkkal
 Name[sk]=Kliknutie
 Name[sl]=Klik
 Name[sr]=????????????
@@ -48,6 +49,7 @@
 Name[tr]=T??k
 Name[uk]=????????
 Name[zh_CN]=??????
+Name[zh_TW]=??????
 default_sound=click.wav
 default_presentation=0
 
@@ -83,6 +85,7 @@
 Name[sr at Latn]=Pove??i se
 Name[sv]=Anslut
 Name[uk]=??'????????????
+Name[zh_TW]=??????
 default_sound=connect.wav
 default_presentation=0
 
@@ -123,6 +126,7 @@
 Name[pt_BR]=Jogo ganho
 Name[ro]=Joc c????tigat
 Name[ru]=????????????
+Name[se]=Don vuitet
 Name[sk]=Vyhran?? hra
 Name[sl]=Igra je dobljena
 Name[sr]=???????? ???? ????????????????
@@ -170,6 +174,7 @@
 Name[sr at Latn]=Pove??i se
 Name[sv]=Anslut
 Name[uk]=??'????????????
+Name[zh_TW]=??????
 default_sound=start.wav
 default_presentation=1
 
@@ -180,6 +185,7 @@
 Name[bs]=Okreni
 Name[cs]=Tah
 Name[de]=Runde
+Name[el]=??????????
 Name[et]=K??ik
 Name[eu]=Biratu
 Name[fi]=K????nn??
Index: kspaceduel/kspaceduel.desktop
===================================================================
--- kspaceduel/kspaceduel.desktop	(.../3.5.3/kdegames)	(Revision 565826)
+++ kspaceduel/kspaceduel.desktop	(.../3.5.4/kdegames)	(Revision 565826)
@@ -42,6 +42,7 @@
 GenericName[hu]=L??v??ld??z??s
 GenericName[is]=Skotgeimleikur
 GenericName[it]=Gioco arcade nello spazio
+GenericName[ja]=??????????????????????????????
 GenericName[km]=????????????????????????????????????
 GenericName[mk]=?????????????????? ?????????????? ????????
 GenericName[nb]=Arkade-romspill
@@ -51,12 +52,14 @@
 GenericName[pt]=Jogo de Arcada Espacial
 GenericName[pt_BR]=Jogo de Arcade espacial
 GenericName[ru]=?????????????????????? ???????????????? ????????
+GenericName[sk]=Vesm??rna dobrodru??n?? hra
 GenericName[sl]=Vesoljska arkadna igra
 GenericName[sr]=?????????????????? ?????????????? ????????
 GenericName[sr at Latn]=Svemirska arkadna igra
 GenericName[sv]=Rymdarkadspel
 GenericName[ta]=???????????????????????? ????????????????????? ??????????????????????????????
 GenericName[uk]=???????????????? ?????????????? ??????
+GenericName[zh_TW]=?????????????????????
 Icon=kspaceduel
 Path=
 DocPath=kspaceduel/index.html
Index: ksirtet/ksirtet/eventsrc
===================================================================
--- ksirtet/ksirtet/eventsrc	(.../3.5.3/kdegames)	(Revision 565826)
+++ ksirtet/ksirtet/eventsrc	(.../3.5.4/kdegames)	(Revision 565826)
@@ -49,6 +49,7 @@
 Name[pt_BR]=Linha removida
 Name[ro]=Linie eliminat??
 Name[ru]=?????????? ??????????????
+Name[se]=Linnj?? lea eretv??ldon
 Name[sk]=??iara odstr??nen??
 Name[sl]=Vrstica odstranjena
 Name[sr]=???????????????? ????????????
@@ -96,6 +97,7 @@
 Comment[pt_BR]=Linha removida
 Comment[ro]=Linie eliminat??
 Comment[ru]=?????????? ??????????????
+Comment[se]=Linnj?? lea eretv??ldon
 Comment[sk]=??iara odstr??nen??
 Comment[sl]=Odstranjena vrstica
 Comment[sr]=???????????????? ????????????
@@ -156,6 +158,7 @@
 Name[pt_BR]=Fim do jogo
 Name[ro]=Joc terminat
 Name[ru]=?????????? ????????
+Name[se]=Speallu nogai
 Name[sk]=Koniec hry
 Name[sl]=Konec igre
 Name[sr]=???????? ????????
@@ -206,6 +209,7 @@
 Comment[pt]=Fim do jogo
 Comment[pt_BR]=Fim do Jogo
 Comment[ru]=?????????? ????????
+Comment[se]=Speallu nogai
 Comment[sk]=Koniec hry
 Comment[sl]=Konec igre
 Comment[sr]=???????? ????????
@@ -215,6 +219,7 @@
 Comment[tr]=Oyun bitti
 Comment[uk]=???????????? ??????
 Comment[zh_CN]=????????????
+Comment[zh_TW]=????????????
 default_presentation=0
 
 [glued]
@@ -250,6 +255,7 @@
 Name[pt]=Pe??a colada
 Name[pt_BR]=Pe??a colada
 Name[ru]=???????????????? ??????
+Name[se]=Bihtt?? lea liibmejuvvon
 Name[sk]=Kus zlepen??
 Name[sl]=Kos prilepljen
 Name[sr]=?????????????????? ??????????
@@ -293,6 +299,7 @@
 Comment[pt]=Pe??a colada
 Comment[pt_BR]=Pe??a colada
 Comment[ru]=???????????????? ??????
+Comment[se]=Bihtt?? lea liibmejuvvon
 Comment[sk]=Kus zlepen??
 Comment[sl]=Kos prilepljen
 Comment[sr]=?????????????????? ??????????
Index: ksirtet/ksirtet/ksirtet.desktop
===================================================================
--- ksirtet/ksirtet/ksirtet.desktop	(.../3.5.3/kdegames)	(Revision 565826)
+++ ksirtet/ksirtet/ksirtet.desktop	(.../3.5.4/kdegames)	(Revision 565826)
@@ -36,6 +36,7 @@
 GenericName[hu]=Tetrisz
[...2732 lines suppressed...]
 class Shadow;
@@ -14,7 +15,7 @@
 class KGameProgress;
 class KGameLCDClock;
 
-class KDE_EXPORT Field : public MPSimpleBoard, public BaseField
+class LIBKSIRTET_EXPORT Field : public MPSimpleBoard, public BaseField
 {
  Q_OBJECT
  public:
Index: libksirtet/common/main.h
===================================================================
--- libksirtet/common/main.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/common/main.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -3,9 +3,9 @@
 
 #include "base/main.h"
 
-#include <kdemacros.h>
+#include "lib/libksirtet_export.h"
 
-class KDE_EXPORT MainWindow : public BaseMainWindow
+class LIBKSIRTET_EXPORT MainWindow : public BaseMainWindow
 {
     Q_OBJECT
 public:
Index: libksirtet/common/board.h
===================================================================
--- libksirtet/common/board.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/common/board.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -3,12 +3,12 @@
 
 #include "base/board.h"
 
-#include <kdemacros.h>
+#include "lib/libksirtet_export.h"
 
 class GiftPool;
 class AI;
 
-class KDE_EXPORT Board : public BaseBoard
+class LIBKSIRTET_EXPORT Board : public BaseBoard
 {
  Q_OBJECT
  public:
Index: libksirtet/common/misc_ui.h
===================================================================
--- libksirtet/common/misc_ui.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/common/misc_ui.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -6,12 +6,12 @@
 #include <qhbox.h>
 
 #include <kgameprogress.h>
-#include <kdemacros.h>
+#include "lib/libksirtet_export.h"
 
 #include "base/board.h"
 
 /*****************************************************************************/
-class KDE_EXPORT ShowNextPiece : public FixedCanvasView
+class LIBKSIRTET_EXPORT ShowNextPiece : public FixedCanvasView
 {
  Q_OBJECT
  public:
@@ -19,7 +19,7 @@
 };
 
 /*****************************************************************************/
-class KDE_EXPORT Shadow : public QWidget
+class LIBKSIRTET_EXPORT Shadow : public QWidget
 {
  Q_OBJECT
  public:
@@ -40,7 +40,7 @@
 /*****************************************************************************/
 class Led;
 
-class KDE_EXPORT GiftPool : public QHBox
+class LIBKSIRTET_EXPORT GiftPool : public QHBox
 {
  Q_OBJECT
  public:
@@ -65,7 +65,7 @@
 
 
 /*****************************************************************************/
-class KDE_EXPORT PlayerProgress : public KGameProgress
+class LIBKSIRTET_EXPORT PlayerProgress : public KGameProgress
 {
   Q_OBJECT
 public:
Index: libksirtet/base/kzoommainwindow.h
===================================================================
--- libksirtet/base/kzoommainwindow.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/base/kzoommainwindow.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -21,7 +21,9 @@
 #define KZOOMMAINWINDOW_H
 
 #include <kmainwindow.h>
+#include <kdemacros.h>
 
+
 class KToggleAction;
 
 /**
@@ -39,7 +41,7 @@
  * This class also has a "show/hide menubar" action and allows the use
  * of a context popup menu (useful to restore the menubar when hidden).
  */
-class KZoomMainWindow : public KMainWindow
+class KDE_EXPORT KZoomMainWindow : public KMainWindow
 {
   Q_OBJECT
 public:
Index: libksirtet/base/highscores.h
===================================================================
--- libksirtet/base/highscores.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/base/highscores.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -2,9 +2,9 @@
 #define BASE_HIGHSCORES_H
 
 #include <kexthighscore.h>
+#include <kdemacros.h>
 
-
-class BaseHighscores : public KExtHighscore::Manager
+class KDE_EXPORT BaseHighscores : public KExtHighscore::Manager
 {
  public:
     BaseHighscores();
Index: libksirtet/base/gtetris.h
===================================================================
--- libksirtet/base/gtetris.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/base/gtetris.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -96,6 +96,7 @@
 #include <krandomsequence.h>
 #include <kgrid2d.h>
 
+#include <kdemacros.h>
 
 class Piece;
 class BlockInfo;
@@ -106,7 +107,7 @@
     uint initLevel;
 };
 
-class GenericTetris
+class KDE_EXPORT GenericTetris
 {
  public:
     GenericTetris(uint width, uint height, bool withPieces, bool graphic);
Index: libksirtet/base/field.h
===================================================================
--- libksirtet/base/field.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/base/field.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -3,6 +3,7 @@
 
 #include <kexthighscore.h>
 
+#include <kdemacros.h>
 
 class QVBoxLayout;
 class QGridLayout;
@@ -14,7 +15,7 @@
 class GTInitData;
 class KCanvasRootPixmap;
 
-class BaseField
+class KDE_EXPORT BaseField
 {
  public:
     BaseField(QWidget *widget);
Index: libksirtet/base/board.h
===================================================================
--- libksirtet/base/board.h	(.../3.5.3/kdegames)	(Revision 565826)
+++ libksirtet/base/board.h	(.../3.5.4/kdegames)	(Revision 565826)
@@ -6,12 +6,13 @@
 
 #include "gtetris.h"
 
+#include <kdemacros.h>
 
 class SequenceArray;
 class BlockInfo;
 
 //-----------------------------------------------------------------------------
-class FixedCanvasView : public QCanvasView
+class KDE_EXPORT FixedCanvasView : public QCanvasView
 {
   Q_OBJECT
 public:
@@ -24,7 +25,7 @@
 };
 
 //-----------------------------------------------------------------------------
-class BaseBoard : public FixedCanvasView, public GenericTetris
+class KDE_EXPORT BaseBoard : public FixedCanvasView, public GenericTetris
 {
  Q_OBJECT
  public:


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdegames.spec	13 Jul 2006 17:03:05 -0000	1.53
+++ kdegames.spec	24 Jul 2006 15:26:38 -0000	1.54
@@ -16,22 +16,20 @@
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 2.2
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
-Prefix: /usr
 License: GPL
 Group: Amusements/Games
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3%{patch_name}.tar.bz2
 
-Patch: kde-libtool.patch
-Patch1: kdegames-3.1.1-konquest.patch
+Patch0: kdegames-3.5.3-3.5.4.patch
+Patch1: kde-libtool.patch
+Patch2: kdegames-3.1.1-konquest.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -69,9 +67,9 @@
 KDE desktop.
 
 %prep
-%setup -q -n %{name}-%{version}%{patch_name}
-%patch -p1 -b .libtool
-%patch1 -p1 -b .konquest
+%setup -q -n %{name}-3.5.3%{patch_name}
+%patch0 -p0
+%patch2 -p1 -b .konquest
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -80,17 +78,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="%{optflags}"
-
-CFLAGS="$FLAGS" \
-CXXFLAGS="$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
@@ -154,6 +146,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Thu Jul 13 2006 Dennis Gregorovic <dgregor at redhat.com> - 6:3.5.3-2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:29:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:29:22 -0400
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.21,1.22
Message-ID: <200607241529.k6OFTMsf020188@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20146

Modified Files:
	kdeaccessibility.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdeaccessibility.spec	24 Jul 2006 14:28:25 -0000	1.21
+++ kdeaccessibility.spec	24 Jul 2006 15:29:19 -0000	1.22
@@ -22,7 +22,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: kdebase-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:31:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:31:08 -0400
Subject: rpms/createrepo/devel createrepo.spec,1.18,1.19
Message-ID: <200607241531.k6OFV83Z020735@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/createrepo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20675

Modified Files:
	createrepo.spec 
Log Message:
add dist tag


Index: createrepo.spec
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/createrepo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- createrepo.spec	19 Jul 2006 11:51:59 -0000	1.18
+++ createrepo.spec	24 Jul 2006 15:30:57 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.4.4
-Release: 2
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:33:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:33:44 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.52,1.53
Message-ID: <200607241533.k6OFXiXD021275@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21254

Modified Files:
	mx4j.spec 
Log Message:
* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_7fc
- Require xerces-j2.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mx4j.spec	24 Jul 2006 15:24:28 -0000	1.52
+++ mx4j.spec	24 Jul 2006 15:33:41 -0000	1.53
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_6fc
+Release:        4jpp_7fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -75,6 +75,7 @@
 BuildRequires:  docbook-style-xsl >= 0:1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
+BuildRequires:  xerces-j2
 #BuildRequires:  xmlunit
 %if ! %{gcj_support}
 Buildarch:      noarch
@@ -265,6 +266,9 @@
 %doc dist/docs/*
 
 %changelog
+* Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_7fc
+- Require xerces-j2.
+
 * Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_6fc
 - Build using interpreted ant.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:38:08 -0400
Subject: rpms/sane-backends/devel sane-backends.spec,1.72,1.73
Message-ID: <200607241538.k6OFc852022432@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22354

Modified Files:
	sane-backends.spec 
Log Message:
use *.desc created udev rules



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sane-backends.spec	24 Jul 2006 15:14:41 -0000	1.72
+++ sane-backends.spec	24 Jul 2006 15:38:05 -0000	1.73
@@ -157,9 +157,7 @@
 rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
 mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/
 
-sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap
-
-sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
+sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' tools/udev/libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules
 
 %find_lang %name
 
@@ -257,6 +255,7 @@
 - unify spec file between OS releases
 - update rpath patch
 - remove obsolete newmodels patch
+- use *.desc created udev rules
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-13.1
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:38:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:38:39 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.96,1.97
Message-ID: <200607241538.k6OFcd69022570@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22531

Modified Files:
	kdepim.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- kdepim.spec	24 Jul 2006 12:14:34 -0000	1.96
+++ kdepim.spec	24 Jul 2006 15:38:35 -0000	1.97
@@ -17,7 +17,7 @@
 Epoch: 6
 Group: Applications/Productivity
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.kde.org
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
@@ -47,7 +47,7 @@
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: desktop-file-utils
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: kdebase-devel
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel
@@ -82,7 +82,6 @@
 %prep
 %setup -q -n %{name}-3.5.3
 %patch0 -p0
-%patch1 -p1 -b .libtool
 
 %ifarch s390 s390x
 %patch2 -p1 -b .s390



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:39:37 -0400
Subject: rpms/hal/devel hal-0.5.7-expand-sysfs-names.patch, NONE,
	1.1 hal.spec, 1.100, 1.101
Message-ID: <200607241539.k6OFdbTe022844@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22793

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.7-expand-sysfs-names.patch 
Log Message:
- Add patch to handle longer sysfs names
- add dist tag to release


hal-0.5.7-expand-sysfs-names.patch:
 hotplug_helper.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hal-0.5.7-expand-sysfs-names.patch ---
--- hal-0.5.7/hald/linux2/hotplug_helper.h.expand-sysfs-names	2006-07-24 11:32:17.000000000 -0400
+++ hal-0.5.7/hald/linux2/hotplug_helper.h	2006-07-24 11:34:05.000000000 -0400
@@ -28,7 +28,7 @@
 
 #define HALD_HELPER_MAGIC 0x68616c64
 #define HALD_HELPER_SOCKET_PATH "/var/run/hal/hotplug_socket2"
-#define HALD_HELPER_STRLEN 256
+#define HALD_HELPER_STRLEN 512 
 
 struct hald_helper_msg
 {


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- hal.spec	18 Jul 2006 22:34:07 -0000	1.100
+++ hal.spec	24 Jul 2006 15:39:34 -0000	1.101
@@ -22,7 +22,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 13
+Release: 14%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -31,6 +31,7 @@
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
 Patch3: hal-0.5.7-pcmcia-readers.patch
 Patch4: hal-0.5.7-dbus-deprecated.patch
+Patch5: hal-0.5.7-expand-sysfs-names.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -104,7 +105,7 @@
 %patch2 -p1 -b .fix-for-nfs-and-autofs
 %patch3 -p0 -b .pcmcia-readers
 %patch4 -p1 -b .dbus-deprecated
-
+%patch5 -p1 -b .expand-sysfs-names
 %build
 
 %configure --disable-docbook-docs --with-os-type=redhat
@@ -209,6 +210,10 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Jul 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-14
+- Add patch to handle longer sysfs names
+- add dist tag to release
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-13
 - BR dbus-glib-devel
 - Fix a deprecated function



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:42:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:42:24 -0400
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.73,1.74
Message-ID: <200607241542.k6OFgOcP023807@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23761

Modified Files:
	kdemultimedia.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdemultimedia.spec	24 Jul 2006 12:45:02 -0000	1.73
+++ kdemultimedia.spec	24 Jul 2006 15:42:22 -0000	1.74
@@ -37,7 +37,7 @@
 Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
-BuildRequires: kdebase-devel >= %{version}
+BuildRequires: kdebase-devel
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel
 BuildRequires: perl
@@ -84,7 +84,6 @@
 %prep
 %setup -q -n %{name}-3.5.3-patched
 %patch0 -p0
-%patch1 -p1
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:50:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:50:16 -0400
Subject: rpms/kernel/devel/configs config-generic,1.235,1.236
Message-ID: <200607241550.k6OFoF7t008684@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv8512/configs

Modified Files:
	config-generic 
Log Message:
git2


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- config-generic	22 Jul 2006 18:53:47 -0000	1.235
+++ config-generic	24 Jul 2006 15:50:13 -0000	1.236
@@ -2805,7 +2805,20 @@
 
 CONFIG_MIGRATION=y
 CONFIG_RESOURCES_64BIT=y
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CORGI is not set
+# CONFIG_LEDS_LOCOMO is not set
+# CONFIG_LEDS_SPITZ is not set
+# CONFIG_LEDS_IXP4XX is not set
+# CONFIG_LEDS_TOSA is not set
+# CONFIG_LEDS_S3C24XX is not set
+# CONFIG_LEDS_AMS_DELTA is not set
+# CONFIG_LEDS_NET48XX is not set
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 
 CONFIG_DMA_ENGINE=y
 CONFIG_NET_DMA=y



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:50:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:50:15 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.492, 1.493 kernel-2.6.spec, 1.2439,
	1.2440 sources, 1.450, 1.451 upstream, 1.400,
	1.401 patch-2.6.18-rc2-git1.bz2.sign, 1.1, NONE
Message-ID: <200607241550.k6OFoFsB008676@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8512

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2-git2.bz2.sign 
Removed Files:
	patch-2.6.18-rc2-git1.bz2.sign 
Log Message:
git2


--- NEW FILE patch-2.6.18-rc2-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExHBsyGugalF9Dw4RAum1AJ9HaoNDg6AT8G1RV869jLqGEhwpXQCeIQVZ
7w8RwZxPO4cs3oz5L5LLWfE=
=fO6t
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- .cvsignore	22 Jul 2006 19:17:38 -0000	1.492
+++ .cvsignore	24 Jul 2006 15:50:12 -0000	1.493
@@ -8,4 +8,4 @@
 find-provides
 kernel-2.6.spec
 xen-20060719.tar.bz2
-patch-2.6.18-rc2-git1.bz2
+patch-2.6.18-rc2-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2439
retrieving revision 1.2440
diff -u -r1.2439 -r1.2440
--- kernel-2.6.spec	24 Jul 2006 01:57:23 -0000	1.2439
+++ kernel-2.6.spec	24 Jul 2006 15:50:12 -0000	1.2440
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git1.bz2
+Patch2: patch-2.6.18-rc2-git2.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1629,6 +1629,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc2-git2
+
 * Mon Jul 24 2006 Jon Masters <jcm at redhat.com>
 - Change kabideps location.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- sources	24 Jul 2006 01:57:23 -0000	1.450
+++ sources	24 Jul 2006 15:50:12 -0000	1.451
@@ -4,4 +4,4 @@
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
 d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
-44918b4fc778fa0439672e9f788a4ff2  patch-2.6.18-rc2-git1.bz2
+4f79ea8e626a13bcddf7eb1402058854  patch-2.6.18-rc2-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- upstream	22 Jul 2006 19:17:38 -0000	1.400
+++ upstream	24 Jul 2006 15:50:12 -0000	1.401
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git1.bz2
+patch-2.6.18-rc2-git2.bz2


--- patch-2.6.18-rc2-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:52:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:52:31 -0400
Subject: rpms/kdeedu/devel kdeedu.spec,1.50,1.51
Message-ID: <200607241552.k6OFqVTn009737@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9688

Modified Files:
	kdeedu.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdeedu.spec	24 Jul 2006 15:18:46 -0000	1.50
+++ kdeedu.spec	24 Jul 2006 15:52:29 -0000	1.51
@@ -27,7 +27,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
+BuildRequires: kdebase-devel
 BuildRequires: perl
 BuildRequires: autoconf
 BuildRequires: automake



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:52:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:52:42 -0400
Subject: rpms/bind/devel bind.spec,1.117,1.118
Message-ID: <200607241552.k6OFqgiB009886@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9759

Modified Files:
	bind.spec 
Log Message:
fix bug 199876


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- bind.spec	24 Jul 2006 10:01:56 -0000	1.117
+++ bind.spec	24 Jul 2006 15:52:39 -0000	1.118
@@ -17,7 +17,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.3.2
-Release: 	33%{?dist}
+Release: 	34%{?dist}
 Epoch:   	30
 Url: 		http://www.isc.org/products/BIND/
 Buildroot: 	%{_tmppath}/%{name}-root
@@ -610,7 +610,9 @@
 %{_libdir}/libisccc.a
 %{_libdir}/libisccfg.a
 %{_libdir}/liblwres.a
+%if %{LIBBIND}
 %exclude %{_libdir}/libbind.so
+%endif
 %{_libdir}/*so
 %{_includedir}/bind9
 %{_includedir}/dns
@@ -845,6 +847,9 @@
 :;
 
 %changelog
+* Mon Jul 24 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-34
+- fix bug 199876: make '%exclude libbbind.*' conditional on %{LIBBIND}
+
 * Mon Jul 24 2006 Florian La Roche <laroche at redhat.com> - 30:9.3.2-33
 - fix #195881, perms are not packaged correctly
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 15:58:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 11:58:47 -0400
Subject: rpms/xorg-x11-drv-sis/devel sis.xinf, 1.1, 1.2 xorg-x11-drv-sis.spec,
	1.14, 1.15
Message-ID: <200607241558.k6OFwldR012297@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12264

Modified Files:
	sis.xinf xorg-x11-drv-sis.spec 
Log Message:
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-4
- Update sis.xinf for XGI cards.  (#186024)



Index: sis.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/sis.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sis.xinf	3 Feb 2006 13:38:30 -0000	1.1
+++ sis.xinf	24 Jul 2006 15:58:45 -0000	1.2
@@ -1,17 +1,22 @@
-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
+# SiS block
+alias pcivideo:v00001039d00000200sv*sd*bc*sc*i* sis # 5597/5598/6326
+alias pcivideo:v00001039d00000205sv*sd*bc*sc*i* sis # 86C205
+alias pcivideo:v00001039d00000300sv*sd*bc*sc*i* sis # 300 and 305
+alias pcivideo:v00001039d00000310sv*sd*bc*sc*i* sis # 315H
+alias pcivideo:v00001039d00000315sv*sd*bc*sc*i* sis # 315
+alias pcivideo:v00001039d00000325sv*sd*bc*sc*i* sis # 315PRO
+alias pcivideo:v00001039d00000330sv*sd*bc*sc*i* sis # 330 (Xabre)
+alias pcivideo:v00001039d00000340sv*sd*bc*sc*i* sis # 340
+alias pcivideo:v00001039d00005300sv*sd*bc*sc*i* sis # 540
+alias pcivideo:v00001039d00005315sv*sd*bc*sc*i* sis # 550
+alias pcivideo:v00001039d00005597sv*sd*bc*sc*i* sis # 5597/5582
+alias pcivideo:v00001039d00006236sv*sd*bc*sc*i* sis # 6236
+alias pcivideo:v00001039d00006300sv*sd*bc*sc*i* sis # 661/741/760/761
+alias pcivideo:v00001039d00006306sv*sd*bc*sc*i* sis # 530/620
+alias pcivideo:v00001039d00006325sv*sd*bc*sc*i* sis # 65x/M650/740
+alias pcivideo:v00001039d00006326sv*sd*bc*sc*i* sis # 6326
+alias pcivideo:v00001039d00006330sv*sd*bc*sc*i* sis # 661/741/760/761
+
+# XGI block
+alias pcivideo:v000018cad00000020sv*sd*bc*sc*i* sis # XGI G20 (Z7)
+alias pcivideo:v000018cad00000040sv*sd*bc*sc*i* sis # XGI G50 (V3XT, V5, V8)


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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-sis.spec	12 Jul 2006 09:09:35 -0000	1.14
+++ xorg-x11-drv-sis.spec	24 Jul 2006 15:58:45 -0000	1.15
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.9.1
-Release:   3.1
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -64,7 +64,10 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 0.9.1-4
+- Update sis.xinf for XGI cards.  (#186024)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 0.9.1-3.1
 - rebuild
 
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 0.9.1-3



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:07:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:07:26 -0400
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.63,1.64
Message-ID: <200607241607.k6OG7QOw014005@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13956

Modified Files:
	kdeadmin.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)




Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdeadmin.spec	24 Jul 2006 14:58:33 -0000	1.63
+++ kdeadmin.spec	24 Jul 2006 16:07:23 -0000	1.64
@@ -155,7 +155,7 @@
 kxconfig is a tool that allows you to configure the X server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-3.5.3
 %patch0 -p0
 
 %if ! %{kpackage}



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:09:59 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.88,1.89
Message-ID: <200607241609.k6OG9wD0014557@cvs.devel.redhat.com>

Author: timp

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14418

Modified Files:
	kdegraphics.spec 
Log Message:
bump for rebuild because for some reason the on-disk copy is a symlink pointing to itself in Brew



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdegraphics.spec	24 Jul 2006 12:29:07 -0000	1.88
+++ kdegraphics.spec	24 Jul 2006 16:09:55 -0000	1.89
@@ -16,7 +16,7 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.5.4
-Release: 0.pre1%{?dist}
+Release: 0.pre2%{?dist}
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:10:57 -0400
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.89,1.90
Message-ID: <200607241610.k6OGAvng014867@cvs.devel.redhat.com>

Author: timp

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14790

Modified Files:
	kdegraphics.spec 
Log Message:
woops, needed a changelog



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kdegraphics.spec	24 Jul 2006 16:09:55 -0000	1.89
+++ kdegraphics.spec	24 Jul 2006 16:10:55 -0000	1.90
@@ -194,6 +194,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Mon Jul 24 2006 Tim Powers <timp at redhat.com> - 7:3.5.4-0.pre2
+- rebuild
+
 * Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 7:3.5.4-0.pre1
 - prerelease of 3.5.4 (from the first-cut tag)
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:23:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:23:18 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.35,
	1.36 selinux-policy.spec, 1.232, 1.233
Message-ID: <200607241623.k6OGNIUn001749@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1714

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Mon Jul 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-10
- Add policy for /var/run/ldapi


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    1 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 81 files changed, 800 insertions(+), 228 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- policy-20060608.patch	22 Jul 2006 19:00:43 -0000	1.35
+++ policy-20060608.patch	24 Jul 2006 16:23:16 -0000	1.36
@@ -785,7 +785,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.3.3/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/hal.te	2006-07-24 07:04:46.000000000 -0400
 @@ -22,7 +22,7 @@
  #
  
@@ -795,7 +795,18 @@
  dontaudit hald_t self:capability sys_tty_config;
  allow hald_t self:process signal_perms;
  allow hald_t self:fifo_file rw_file_perms;
-@@ -163,6 +163,10 @@
+@@ -153,6 +153,10 @@
+ ')
+ 
+ optional_policy(`
++	bootloader_domtrans(hald_t)
++')
++
++optional_policy(`
+ 	# For /usr/libexec/hald-addon-acpi
+ 	# writes to /var/run/acpid.socket
+ 	apm_stream_connect(hald_t)
+@@ -163,6 +167,10 @@
  ')
  
  optional_policy(`
@@ -832,6 +843,26 @@
 +')
 +
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.fc serefpolicy-2.3.3/policy/modules/services/ldap.fc
+--- nsaserefpolicy/policy/modules/services/ldap.fc	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.fc	2006-07-24 12:21:11.000000000 -0400
+@@ -9,3 +9,4 @@
+ /var/run/openldap(/.*)?		gen_context(system_u:object_r:slapd_var_run_t,s0)
+ /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
+ /var/run/slapd\.pid	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
++/var/run/ldapi		-s	gen_context(system_u:object_r:slapd_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.3/policy/modules/services/ldap.te
+--- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-07-24 12:21:35.000000000 -0400
+@@ -72,7 +72,7 @@
+ 
+ allow slapd_t slapd_var_run_t:file create_file_perms;
+ allow slapd_t slapd_var_run_t:dir rw_dir_perms;
+-files_pid_filetrans(slapd_t,slapd_var_run_t,file)
++files_pid_filetrans(slapd_t,slapd_var_run_t,{ file socket })
+ 
+ kernel_read_system_state(slapd_t)
+ kernel_read_kernel_sysctls(slapd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.3.3/policy/modules/services/lpd.if
 --- nsaserefpolicy/policy/modules/services/lpd.if	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/lpd.if	2006-07-18 10:41:23.000000000 -0400
@@ -1737,6 +1768,26 @@
  	seutil_sigchld_newrole(auditd_t)
  ')
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.3.3/policy/modules/system/lvm.te
+--- nsaserefpolicy/policy/modules/system/lvm.te	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/lvm.te	2006-07-23 12:48:10.000000000 -0400
+@@ -125,7 +125,7 @@
+ 
+ # DAC overrides and mknod for modifying /dev entries (vgmknodes)
+ # rawio needed for dmraid
+-allow lvm_t self:capability { dac_override ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
++allow lvm_t self:capability { dac_override fowner ipc_lock sys_admin sys_nice mknod chown sys_resource sys_rawio };
+ dontaudit lvm_t self:capability sys_tty_config;
+ allow lvm_t self:process { sigchld sigkill sigstop signull signal };
+ # LVM will complain a lot if it cannot set its priority.
+@@ -200,6 +200,7 @@
+ 
+ fs_getattr_xattr_fs(lvm_t)
+ fs_search_auto_mountpoints(lvm_t)
++fs_list_tmpfs(lvm_t)
+ fs_read_tmpfs_symlinks(lvm_t)
+ fs_dontaudit_read_removable_files(lvm_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-20 11:25:38.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- selinux-policy.spec	22 Jul 2006 19:00:47 -0000	1.232
+++ selinux-policy.spec	24 Jul 2006 16:23:16 -0000	1.233
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-10
+- Add policy for /var/run/ldapi
+
 * Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-9
 - Fix setroubleshoot policy
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:24:37 -0400
Subject: rpms/system-config-users/devel .cvsignore, 1.33, 1.34 sources, 1.33,
	1.34 system-config-users.spec, 1.39, 1.40
Message-ID: <200607241624.k6OGOb9q002286@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-users/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2206

Modified Files:
	.cvsignore sources system-config-users.spec 
Log Message:
ask user when hitting duplicate group name or gid (#199836)
clarify comments, add new variables in /etc/sysconfig/system-config-users
use new method to choose GID when creating groups as well
actually set new user's GID
remove debugging statements



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	13 Jul 2006 17:28:06 -0000	1.33
+++ .cvsignore	24 Jul 2006 16:24:34 -0000	1.34
@@ -1 +1 @@
-system-config-users-1.2.45.tar.bz2
+system-config-users-1.2.46.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	13 Jul 2006 17:28:06 -0000	1.33
+++ sources	24 Jul 2006 16:24:34 -0000	1.34
@@ -1 +1 @@
-3cb63a85b4802f7eb27d1bbbcbd3b9c3  system-config-users-1.2.45.tar.bz2
+2c685d88291fcca0d609a155873a91e3  system-config-users-1.2.46.tar.bz2


Index: system-config-users.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- system-config-users.spec	13 Jul 2006 17:28:06 -0000	1.39
+++ system-config-users.spec	24 Jul 2006 16:24:34 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A graphical interface for administering users and groups
 Name: system-config-users
-Version: 1.2.45
+Version: 1.2.46
 Release: 1%{?dist}
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -77,6 +77,15 @@
 %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users
 
 %changelog
+* Mon Jul 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.46
+- ask user when hitting duplicate group name or gid (#199836)
+
+* Mon Jul 17 2006 Nils Philippsen <nphilipp at redhat.com>
+- clarify comments, add new variables in /etc/sysconfig/system-config-users
+- use new method to choose GID when creating groups as well
+- actually set new user's GID
+- remove debugging statements
+
 * Thu Jul 13 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.45
 - revamp uid/gid number selection to honor preferences and avoid primary
   group/created group discrepancies (#198152)



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:30:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:30:04 -0400
Subject: rpms/kdepim/devel kdepim.spec,1.97,1.98
Message-ID: <200607241630.k6OGU4b1004456@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4401

Modified Files:
	kdepim.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdepim.spec	24 Jul 2006 15:38:35 -0000	1.97
+++ kdepim.spec	24 Jul 2006 16:30:02 -0000	1.98
@@ -47,7 +47,7 @@
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: desktop-file-utils
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: audiofile-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: lockdev-devel



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:41:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:41:36 -0400
Subject: rpms/kdewebdev/devel kdewebdev-3.5.3-3.5.4.patch, NONE,
	1.1 kdewebdev.spec, 1.32, 1.33
Message-ID: <200607241641.k6OGfaRU007156@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7077

Modified Files:
	kdewebdev.spec 
Added Files:
	kdewebdev-3.5.3-3.5.4.patch 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)



kdewebdev-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                        |    2 
 admin/cvs.sh                                                 |    6 +-
 kdewebdev.lsm                                                |    4 -
 kfilereplace/kfilereplace.desktop                            |    2 
 kfilereplace/kfilereplacepart.desktop                        |    3 +
 kimagemapeditor/kimagemapeditor.desktop                      |    2 
 kimagemapeditor/kimagemapeditorpart.desktop                  |    2 
 klinkstatus/src/klinkstatus.desktop                          |    2 
 klinkstatus/src/klinkstatus_part.desktop                     |    1 
 kommander/editor/kmdr-editor.desktop                         |    2 
 kommander/executor/kmdr-executor.desktop                     |    2 
 kommander/x-kommander.desktop                                |    1 
 kxsldbg/kxsldbg.desktop                                      |    1 
 quanta/ChangeLog                                             |   10 +++
 quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop   |    1 
 quanta/components/debugger/gubed/quantadebuggergubed.desktop |    1 
 quanta/components/debugger/interfaces/quantadebugger.desktop |    1 
 quanta/data/config/quanta_preview_config.desktop             |    1 
 quanta/data/tips                                             |    2 
 quanta/dialogs/actionconfigdialog.cpp                        |    6 +-
 quanta/dialogs/donationdialog.ui                             |    2 
 quanta/project/project.cpp                                   |   14 +++++
 quanta/project/projectnewgeneral.cpp                         |   12 +---
 quanta/quanta.kdevelop                                       |   28 ++++++----
 quanta/src/main.cpp                                          |    8 ++-
 quanta/src/quanta.cpp                                        |   29 +++++++----
 quanta/src/quanta.desktop                                    |    2 
 quanta/src/quanta.h                                          |    2 
 quanta/src/quanta_be.desktop                                 |    2 
 quanta/src/x-webprj.desktop                                  |    1 
 quanta/treeviews/structtreeview.cpp                          |    4 -
 31 files changed, 115 insertions(+), 41 deletions(-)

--- NEW FILE kdewebdev-3.5.3-3.5.4.patch ---
Index: kfilereplace/kfilereplacepart.desktop
===================================================================
--- kfilereplace/kfilereplacepart.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kfilereplace/kfilereplacepart.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -31,6 +31,7 @@
 Comment[pt]=Uma ferramenta de procura e substitui????o por atacado
 Comment[pt_BR]=Uma ferramenta de substitui????o e pesquisa batch
 Comment[ru]=???????????????? ?????????? ?? ????????????
+Comment[sk]=D??vkovac?? n??stroj pre n??js?? a zameni??
 Comment[sl]=Orodje serijskega iskanja in zamenjevanja
 Comment[sr]=???????? ???? ?????????????? ???????????????? ?? ????????????
 Comment[sr at Latn]=Alat za paketnu pretragu i zamenu
@@ -43,6 +44,7 @@
 Comment[zh_HK]=???????????????????????????
 Name=KFileReplace
 Name[hi]=??????-???????????????-?????????????????????
+Name[sk]=KFile zameni??
 Name[sv]=Kfilereplace
 Name[ta]=K?????????????????? ????????????????????????
 Name[tg]=K???????????? ???????????????? ????????????
@@ -70,6 +72,7 @@
 GenericName[pt]=Vista de Substitui????o de Ficheiros
 GenericName[pt_BR]=Vis??ai de Substitui????o de Arquivos
 GenericName[ru]=???????????????? ???????????? ?? ???????????? ?? ????????????
+GenericName[sk]=Poh??ad z??meny s??boru
 GenericName[sl]=Prikaz zamenjave datotek
 GenericName[sr]=???????????? ???????????? ?? ??????????????????
 GenericName[sr at Latn]=Prikaz zamena u fajlovima
Index: kfilereplace/kfilereplace.desktop
===================================================================
--- kfilereplace/kfilereplace.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kfilereplace/kfilereplace.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=KFileReplace
 Name[hi]=??????-???????????????-?????????????????????
+Name[sk]=KFile zameni??
 Name[sv]=Kfilereplace
 Name[ta]=K?????????????????? ????????????????????????
 Name[tg]=K???????????? ???????????????? ????????????
@@ -34,6 +35,7 @@
 GenericName[pt]=Ferramenta de Procura e Substitui????o
 GenericName[pt_BR]=Ferramenta de Procura & Substitui????o
 GenericName[ru]=?????????? ?? ????????????
+GenericName[sk]=N??js?? a zameni??
 GenericName[sl]=Orodje za iskanje in zamenjavo
 GenericName[sr]=???????? ???? ???????????????? ?? ????????????
 GenericName[sr at Latn]=Alat za pretragu i zamenu
Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ admin/cvs.sh	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -316,7 +316,7 @@
    fi
 fi
 if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.5.3\""
+     VERSION="\"3.5.4\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
    modulename=`pwd`; 
Index: admin/acinclude.m4.in
===================================================================
--- admin/acinclude.m4.in	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ admin/acinclude.m4.in	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -2747,7 +2747,7 @@
            EXRSTATUS=old
         else
            kde_save_LIBS="$LIBS"
-           LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
            AC_LANG_SAVE
            AC_LANG_CPLUSPLUS
            kde_save_CXXFLAGS="$CXXFLAGS"
Index: quanta/dialogs/actionconfigdialog.cpp
===================================================================
--- quanta/dialogs/actionconfigdialog.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/dialogs/actionconfigdialog.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -482,10 +482,14 @@
   if (customShortcut->isChecked())
   {
     s = selectedShortcut.toString();
+    currentAction->setShortcut(selectedShortcut);
+  } else
+  {
+    currentAction->setShortcut(KShortcut());
   }
   el.setAttribute("shortcut", s);
-  currentAction->setShortcut(selectedShortcut);
 
+
 //update the tree view
   QListViewItem *listItem;
   QListViewItemIterator it(actionTreeView);
Index: quanta/dialogs/donationdialog.ui
===================================================================
--- quanta/dialogs/donationdialog.ui	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/dialogs/donationdialog.ui	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -72,7 +72,7 @@
 &lt;div align="center"&gt;&lt;h3&gt;Could Quanta die without your support?&lt;/h3&gt;&lt;/div&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;We'd like to think not! But from February 2001 to June 2002 there was very little activity and many months with no work done at all. This came about because of cash flow problems which led to the original developers leaving to do a commercial project. The fact remains that our most productive volunteer developers, as much as we think they're wonderful, go long periods where they just can't make time to code on the project. We estimate our active users number well over a million, yet we have only a few dozen people a year supporting the project. In fact 3-4 people account for over half of our current support. Clearly the actions of a few people make a huge difference, and yours can make a difference too.
 &lt;br&gt;&lt;div align="center"&gt;&lt;h3&gt;Will you help make a difference?&lt;/h3&gt;&lt;/div&gt;
 &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;If you wish to donate through PayPal
-(online money transfer or credit card), visit our &lt;a href="http://quanta.sourceforge.net/main1.php?actfile=donate"&gt;donation page&lt;/a&gt;.
+(online money transfer or credit card), visit our &lt;a href="http://kdewebdev.org/donate.php"&gt;donation page&lt;/a&gt;.
 &lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;If you are outside the PayPal area or wish to discuss corporate sponsorship contact the project manager:&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp; Eric Laffoon, &lt;a href="mailto:sequitur at kde.org?subject=Quanta%20sponsorship%20inquiry"&gt;sequitur at kde.org&lt;/a&gt;</string>
             </property>
         </widget>
Index: quanta/components/debugger/interfaces/quantadebugger.desktop
===================================================================
--- quanta/components/debugger/interfaces/quantadebugger.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/components/debugger/interfaces/quantadebugger.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -25,6 +25,7 @@
 Comment[pt]=Um 'plugin' de depura????o para o Quanta
 Comment[pt_BR]=Um plugin do Debugger do Quanta
 Comment[ru]=???????????? ?????????????? Quanta
+Comment[sk]=Quanta debuger modul
 Comment[sl]=Vstavek razhro????evanja v Quanti
 Comment[sr]=?????????????????????? ?????????????????? Quanta-??
 Comment[sr at Latn]=Ispravlja??ki priklju??ak Quanta-e
Index: quanta/components/debugger/gubed/quantadebuggergubed.desktop
===================================================================
--- quanta/components/debugger/gubed/quantadebuggergubed.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/components/debugger/gubed/quantadebuggergubed.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -25,6 +25,7 @@
 Comment[pt]='Plugin' de Depura????o do Quanta para interagir com o depurador de PHP Gubed, veja http://gubed.sf.net
 Comment[pt_BR]=Plugin do debugger do Quanta para interagir com o debugger PHP Gubed, olhe http://gubed.sf.net
 Comment[ru]=???????????? ?????????????????? Quanta ?????? ?????????? ?? Gubed, ???????????????????? PHP, ????. http://gubed.sf.net
+Comment[sk]=Quanta debuger modul pre interakciu s Gubed PHP debugerom, pozrihttp://gubed.sf.net
 Comment[sl]=Vstavek razhro????evanja v Quanti, ki sodeluje z razhro????evalnikom Gubed PHP, glejte http://gubed.sf.net
 Comment[sr]=?????????????????????? ?????????????????? Quanta-?? ???? ?????????????????????? ???? ?????????????????????? PHP-?? Gubed, ???????????????????? http://gubed.sf.net
 Comment[sr at Latn]=Ispravlja??ki priklju??ak Quanta-e za interakciju sa ispravlja??em PHP-a Gubed, pogledajte http://gubed.sf.net
Index: quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop
===================================================================
--- quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -24,6 +24,7 @@
 Comment[pt]='Plugin' de depura????o DBGp, veja http://xdebug.org
 Comment[pt_BR]='Plugin' de depura????o DBGp, veja http://xdebug.org
 Comment[ru]=???????????? ??????  ?????????????????? DBGp, http://xdebug.org
+Comment[sk]=DBGp debuger modul, pozri http://xdebug.org
 Comment[sl]=Vstavek za razhoro????evanje DBGp, glej http://xdebug.org
 Comment[sr]=DBGp ??????????????????, ???????? http://xdebug.org
 Comment[sr at Latn]=DBGp priklju??ak, vidi http://xdebug.org
Index: quanta/ChangeLog
===================================================================
--- quanta/ChangeLog	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/ChangeLog	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -1,5 +1,15 @@
 This files contains the changes since Quanta 2.0 until the current 3.5.x series.
 
+Version 3.5.4 (Release date: xx-xx-2006; Started 24-06-2005):
+ - bugfixes:
+      - make Open File in context menu work for remote projects as well
+      - make possible to remove a shortcut assigned to an action
+      - don't become confused if exitting is cancelled during the toolbar
+        saving process
+      - default to a better place when saving a global toolbar to the local
+        toolbar directory and improve the error message if a toolbar cannot be
+        saved [#130236]
+
 Version 3.5.3 (Release date: 23-05-2006; Started 18-03-2005):
  - bugfixes:
       - another round of VPL fixes. Requires KDE 3.5.3 to work properly [#125434]
Index: quanta/src/quanta.h
===================================================================
--- quanta/src/quanta.h	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/quanta.h	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -19,7 +19,7 @@
 #define QUANTA_H
 
 #define QUANTA_PACKAGE "quanta"
-#define QUANTA_VERSION "3.5.3"
+#define QUANTA_VERSION "3.5.4"
 
 #define IDS_STATUS      1
 #define IDS_INS_OVR     2
Index: quanta/src/quanta.desktop
===================================================================
--- quanta/src/quanta.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/quanta.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -36,6 +36,7 @@
 GenericName[pt]=Ambiente de Desenvolvimento Web
 GenericName[pt_BR]=Ambiente de Desenvolvimento Web
 GenericName[ru]=?????????? web-????????????????????
+GenericName[sk]=Prostredie na v??voj Web aplik??ci??
 GenericName[sl]=Spletno razvijalno okolje
 GenericName[sr]=???????????????? ???? ?????? ????????????
 GenericName[sr at Latn]=Okru??enje za veb razvoj
@@ -72,6 +73,7 @@
 Comment[pt]=Ambiente de desenvolvimento Web
 Comment[pt_BR]=Ambiente de Desenvolvimento Web
 Comment[ru]=?????????? web-????????????????????
+Comment[sk]=Prostredie na v??voj Web aplik??ci??
 Comment[sl]=Spletno razvijalno okolje
 Comment[sr]=???????????????? ???? ?????? ????????????
 Comment[sr at Latn]=Okru??enje za veb razvoj
Index: quanta/src/main.cpp
===================================================================
--- quanta/src/main.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/main.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -49,6 +49,7 @@
 versions of Quanta. \
 \n\nWe hope you enjoy Quanta Plus.\n\n");
 
+static const char *developers = I18N_NOOP("The Quanta+ developers");
 
 static KCmdLineOptions options[] =
 {
@@ -62,10 +63,13 @@
 
 int main(int argc, char *argv[])
 {
+  char *copyright = new char[200]; //this should be enough
+  strcpy(copyright, "(C) 2000-2006 - ");
+  strcat(copyright, developers);
   KAboutData
     aboutData( QUANTA_PACKAGE, I18N_NOOP("Quanta"),
-    QUANTA_VERSION, description, KAboutData::License_GPL_V2,
-    I18N_NOOP("(C) 2000-2005 - The Quanta+ developers"),
+    QUANTA_VERSION, description, KAboutData::License_GPL_V2,    
+    copyright,
     othertext,
     "http://kdewebdev.org"
     );
Index: quanta/src/x-webprj.desktop
===================================================================
--- quanta/src/x-webprj.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/x-webprj.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -26,6 +26,7 @@
 Comment[pt_BR]=Projeto do Quanta
 Comment[ro]=Proiect Quanta
 Comment[ru]=???????????? Quanta
+Comment[sk]=Quanta projekt
 Comment[sl]=Projekt Quante
 Comment[sr]=Quanta ????????????????
 Comment[sr at Latn]=Quanta projekat
Index: quanta/src/quanta_be.desktop
===================================================================
--- quanta/src/quanta_be.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/quanta_be.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -29,6 +29,7 @@
 GenericName[pt]=Ambiente de Desenvolvimento Web
 GenericName[pt_BR]=Ambiente de Desenvolvimento Web
 GenericName[ru]=?????????? web-????????????????????
+GenericName[sk]=Prostredie na v??voj Web aplik??ci??
 GenericName[sl]=Spletno razvijalno okolje
 GenericName[sr]=???????????????? ???? ?????? ????????????
 GenericName[sr at Latn]=Okru??enje za veb razvoj
@@ -70,6 +71,7 @@
 Comment[pt]=Ambiente de desenvolvimento Web
 Comment[pt_BR]=Ambiente de Desenvolvimento Web
 Comment[ru]=?????????? web-????????????????????
+Comment[sk]=Prostredie na v??voj Web aplik??ci??
 Comment[sl]=Spletno razvijalno okolje
 Comment[sr]=???????????????? ???? ?????? ????????????
 Comment[sr at Latn]=Okru??enje za veb razvoj
Index: quanta/src/quanta.cpp
===================================================================
--- quanta/src/quanta.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/src/quanta.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -1958,9 +1958,9 @@
     {
       if (!name.isEmpty())
       {
-        urlUnderCursor = KURL();
+        KURL baseUrl = QExtFileInfo::path(w->url());
+        urlUnderCursor = baseUrl;
         QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace());
-        KURL baseUrl = QExtFileInfo::path(w->url());
         urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
         action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
         action->setEnabled(true);
@@ -2455,7 +2455,7 @@
   if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
   {
     KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>"
-        "Check that you have write permissions for<br><b>%2</b></qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
+        "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
     tarFile = KURL();
     delete p_toolbar->dom;
     p_toolbar->dom = oldDom;
@@ -2506,7 +2506,19 @@
   {
     toolbarName = toolbarToSave;
   }
-
+  ToolbarEntry *p_toolbar = m_toolbarList[toolbarName];
+  QString toolbarFileName = p_toolbar->url.fileName(false);
+  QString toolbarRelPath = p_toolbar->url.url();
+  if (toolbarRelPath.startsWith("file://" + qConfig.globalDataDir))
+  {
+    toolbarRelPath.remove("file://" + qConfig.globalDataDir + resourceDir + "toolbars/");
+    toolbarRelPath.remove(toolbarFileName);
+  }
+  else
+  {
+    toolbarRelPath = "";
+  }
+  toolbarFileName.remove(".toolbar.tgz");
   if (destURL.isEmpty())
   {
     do {
@@ -2514,10 +2526,10 @@
 
       if (localToolbar)
       {
-        url = KFileDialog::getSaveURL(localToolbarsDir, "*"+toolbarExtension, this);
+        url = KFileDialog::getSaveURL(localToolbarsDir + toolbarRelPath + toolbarFileName, "*"+toolbarExtension, this);
       } else
       {
-        url = KFileDialog::getSaveURL(Project::ref()->toolbarURL().url(), "*"+toolbarExtension, this);
+        url = KFileDialog::getSaveURL(Project::ref()->toolbarURL().url() + toolbarFileName, "*"+toolbarExtension, this);
       }
 
       if (url.isEmpty())
@@ -3132,7 +3144,7 @@
 
 void QuantaApp::slotHelpHomepage()
 {
-  kapp->invokeBrowser("http://kdewebdev.org");
+  kapp->invokeBrowser("http://quanta.kdewebdev.org");
 }
 
 void QuantaApp::slotHelpUserList()
@@ -4142,7 +4154,8 @@
     saveOptions();
    // kdDebug(24000) << "Quanta will exit" << endl;
     emit eventHappened("quanta_exit", QDateTime::currentDateTime().toString(Qt::ISODate), QString::null);
-  }
+  } else
+    slotFileNew();
   return canExit;
 }
 
Index: quanta/quanta.kdevelop
===================================================================
--- quanta/quanta.kdevelop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/quanta.kdevelop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -18,6 +18,7 @@
     <absoluteprojectpath>false</absoluteprojectpath>
     <secondaryLanguages/>
     <versioncontrol/>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevautoproject>
     <general>
@@ -57,7 +58,7 @@
     <configurations>
       <default>
         <configargs>--enable-debug=full --prefix=/opt/kde3 --enable-editors</configargs>
-        <builddir>/home/andris/development/build/kde-head/kdewebdev</builddir>
+        <builddir>/home/andris/development/build/kde-3.5/kdewebdev</builddir>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevpgf77options</f77compiler>
@@ -167,7 +168,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns></hidepatterns>
+      <hidepatterns/>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
@@ -190,16 +191,16 @@
   </kdevdoctreeview>
   <kdevdebugger>
     <general>
-      <dbgshell/>
-      <programargs/>
-      <gdbpath>/usr/bin/</gdbpath>
+      <dbgshell></dbgshell>
+      <programargs></programargs>
+      <gdbpath>/usr/bin/gdb</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
       <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
       <staticmembers>false</staticmembers>
@@ -242,10 +243,10 @@
   </kdevcvs>
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" name="C++ header" create="template" >
+      <type icon="" ext="h" create="template" name="C++ header" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -266,7 +267,7 @@
     </codecompletion>
     <references/>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -281,6 +282,11 @@
     <designerintegration>
       <qtdesigner/>
     </designerintegration>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
   </kdevcppsupport>
   <kdevcvsservice>
     <recursivewhenupdate>true</recursivewhenupdate>
Index: quanta/project/project.cpp
===================================================================
--- quanta/project/project.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/project/project.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -61,6 +61,7 @@
 #include "teammembersdlg.h"
 #include "uploadprofilespage.h"
 #include "viewmanager.h"
+#include "qpevents.h"
 
 extern QString simpleMemberStr;
 extern QString taskLeaderStr;
@@ -1255,7 +1256,20 @@
           canExit = true;
     }
     if (canExit)
+    {
       emit eventHappened("after_project_close", d->baseURL.url(), QString::null);
+  // empty dom tree
+      d->dom.clear();
+      d->m_sessionDom.clear();
+      d->m_events->clear();
+      d->init();
+      newProjectLoaded(d->projectName, d->baseURL, d->templateURL);
+      reloadTree( &(d->m_projectFiles), true, QStringList());
+      d->adjustActions();
+      d->m_projectRecent->setCurrentItem(-1);
+      newStatus();
+//      kapp->processEvents(QEventLoop::ExcludeUserInput | QEventLoop::ExcludeSocketNotifiers);
+    }
   }
   return canExit;
 }
Index: quanta/project/projectnewgeneral.cpp
===================================================================
--- quanta/project/projectnewgeneral.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/project/projectnewgeneral.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -177,8 +177,7 @@
      linePrjTmpl->setText(KURL::relativeURL(baseUrl, url));
    } else
    {
-//TODO: Use better text in Quanta4, or when message freeze is lifted up
-      KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));   
+     KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
     }
 }
 
@@ -192,8 +191,7 @@
      linePrjToolbar->setText(KURL::relativeURL(baseUrl, url));
    }
    {
-//TODO: Use better text in Quanta4, or when message freeze is lifted up
-      KMessageBox::sorry(0,i18n("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>")
+      KMessageBox::sorry(0, i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
                                   .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
    }
 }
@@ -227,8 +225,7 @@
       url = QExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
-//TODO: Use better text in Quanta4, or when message freeze is lifted up
-        KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+        KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjTmpl->setFocus();
         emit enableNextButton(this, false);
       } else
@@ -241,8 +238,7 @@
       url = QExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
-//TODO: Use better text in Quanta4, or when message freeze is lifted up
-        KMessageBox::sorry(0,i18n("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>")
+        KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
                                     .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjToolbar->setFocus();
         emit enableNextButton(this, false);
Index: quanta/data/tips
===================================================================
--- quanta/data/tips	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/data/tips	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -145,7 +145,7 @@
 
 <tip category="Information">
 <html>
-<p>...that you can help to financially support our program of sponsoring developers? <b><a href="http://quanta.sourceforge.net/main1.php?actfile=donate">Click here to help</a></b>.
+<p>...that you can help to financially support our program of sponsoring developers? <b><a href="http://kdewebdev.org/donate.php">Click here to help</a></b>.
 </p>
 </html>
 </tip>
Index: quanta/data/config/quanta_preview_config.desktop
===================================================================
--- quanta/data/config/quanta_preview_config.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/data/config/quanta_preview_config.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -26,6 +26,7 @@
 Name[pt]=Configurar a Parte de Navega????o HTML
 Name[pt_BR]=Configurar o Componente KHTML do Navegador
 Name[ru]=?????????????????? ?????????????????? ???????????????? KHTML
+Name[sk]=Nastavi?? KHTML prehliada?? Part
 Name[sl]=Nastavite del brskalnika KHTML
 Name[sr]=?????? ???? ???????????????????? KHTML ????????????????????
 Name[sr at Latn]=Deo za pode??avanje KHTML pregleda??a
Index: quanta/treeviews/structtreeview.cpp
===================================================================
--- quanta/treeviews/structtreeview.cpp	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ quanta/treeviews/structtreeview.cpp	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -991,9 +991,9 @@
   {
     QString text = item->groupTag->name;
     text.remove(item->fileNameRx);
-    KURL url;
+    KURL baseUrl = QExtFileInfo::path(write->url());
+    KURL url = baseUrl;
     QuantaCommon::setUrl(url, text.stripWhiteSpace());
-    KURL baseUrl = QExtFileInfo::path(write->url());
     url = QExtFileInfo::toAbsolute(url, baseUrl);
     if (QExtFileInfo::exists(url, true, this))
     {
Index: kdewebdev.lsm
===================================================================
--- kdewebdev.lsm	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kdewebdev.lsm	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -1,7 +1,7 @@
 Begin4
 Title:          kdewebdev
-Version:        3.5.3
-Entered-date:   2006-05-23
+Version:        3.5.4
+Entered-date:   2006-08-02
 Description:    Web Development Applications for the K Desktop Environment (KDE)
 Keywords:       KDE X11 desktop Qt
 Author:         http://bugs.kde.org/ (KDE Bugtracking System)
Index: kxsldbg/kxsldbg.desktop
===================================================================
--- kxsldbg/kxsldbg.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kxsldbg/kxsldbg.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -30,6 +30,7 @@
 GenericName[pt_BR]=Debugger para XSLT
 GenericName[ro]=Depanator XSLT
 GenericName[ru]=???????????????? XSLT
+GenericName[sk]=XSLT debuger
 GenericName[sl]=Razhro????evalnik XSLT
 GenericName[sr]=?????????????????? XSLT-??
 GenericName[sr at Latn]=Ispravlja?? XSLT-a
Index: kimagemapeditor/kimagemapeditorpart.desktop
===================================================================
--- kimagemapeditor/kimagemapeditorpart.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kimagemapeditor/kimagemapeditorpart.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -28,6 +28,7 @@
 Comment[pt]=Editor de Mapas de Imagem HTML
 Comment[pt_BR]=Um editor de mapeamento de imagem HTML
 Comment[ru]=???????????????? HTML imagemap
+Comment[sk]=Editor HTML mapy obr??zkov
 Comment[sl]=Urejevalnik slikovnih zemljevidov v HTML
 Comment[sr]=???????????????? HTML ???????????????? ????????
 Comment[sr at Latn]=Ure??iva?? HTML slikovne mape
@@ -40,6 +41,7 @@
 Comment[zh_HK]=?????? HTML ????????????????????????
 Name=KImageMapEditor
 Name[pt_BR]=KEditor de Mapeamento de Imagem
+Name[sk]=KImage editor mapy
 Name[sv]=Kimagemapeditor
 Name[ta]=K?????????????????? ??????????????????????????? ????????????????????????
 Name[tg]=K?????????????????? ?????????????? ????????????
Index: kimagemapeditor/kimagemapeditor.desktop
===================================================================
--- kimagemapeditor/kimagemapeditor.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kimagemapeditor/kimagemapeditor.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -7,6 +7,7 @@
 Terminal=false
 Name=KImageMapEditor
 Name[pt_BR]=KEditor de Mapeamento de Imagem
+Name[sk]=KImage editor mapy
 Name[sv]=Kimagemapeditor
 Name[ta]=K?????????????????? ??????????????????????????? ????????????????????????
 Name[tg]=K?????????????????? ?????????????? ????????????
@@ -32,6 +33,7 @@
 GenericName[pl]=Edytor map obrazk??w HTML
 GenericName[pt]=Editor de Mapas de Imagem HTML
 GenericName[pt_BR]=Editor de Mapeamento de Imagem HTML
+GenericName[sk]=Editor HTML mapy obr??zkov
 GenericName[sl]=Urejevalnik slikovnih zemljevidov v HTML
 GenericName[sr]=???????????????? HTML ???????????????? ????????
 GenericName[sr at Latn]=Ure??iva?? HTML slikovne mape
Index: klinkstatus/src/klinkstatus.desktop
===================================================================
--- klinkstatus/src/klinkstatus.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ klinkstatus/src/klinkstatus.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=KLinkStatus
+Name[sk]=KLink status
 Name[sv]=Klinkstatus
 Name[ta]=K?????????????????? ??????????????????
 Name[tr]=K K??pr?? Durumu
@@ -32,6 +33,7 @@
 GenericName[pt]=Verifica????o de Liga????es
 GenericName[pt_BR]=Verificador de Links
 GenericName[ru]=???????????????? ????????????
+GenericName[sk]=Kontrole spojenia
 GenericName[sl]=Preverjalnik povezav
 GenericName[sr]=?????????????? ????????
 GenericName[sr at Latn]=Provera veze
Index: klinkstatus/src/klinkstatus_part.desktop
===================================================================
--- klinkstatus/src/klinkstatus_part.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ klinkstatus/src/klinkstatus_part.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -5,6 +5,7 @@
 Name[fr]=Composant de KLinkStatus
 Name[pt_BR]=Componente do KLinkStatus
 Name[ru]=?????????????????? KLinkStatus
+Name[sk]=KLink status Part
 Name[sv]=Klinkstatus-delprogram
 Name[ta]=K?????????????????? ?????????????????? ???????????????
 Name[tg]=?????????? KLinkStatus
Index: kommander/editor/kmdr-editor.desktop
===================================================================
--- kommander/editor/kmdr-editor.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kommander/editor/kmdr-editor.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -26,6 +26,7 @@
 GenericName[pt]=Editor de Di??logos Din??micos
 GenericName[pt_BR]=Editor de Di??logo Din??mico
 GenericName[ru]=???????????????????????? ???????????????? ????????????????
+GenericName[sk]=Dynamick?? editor dial??gov
 GenericName[sl]=Urejevalnik dinami??nih pogovornih oken
 GenericName[sr]=???????????????? ???????????????????? ????????????????
 GenericName[sr at Latn]=Ure??iva?? dinami??kih dijaloga
@@ -102,6 +103,7 @@
 Comment[pt]=Editor de di??logos din??micos
 Comment[pt_BR]=Editor de Di??logo Din??mico
 Comment[ru]=???????????????????????? ???????????????? ????????????????
+Comment[sk]=Dynamick?? editor dial??gov
 Comment[sl]=Urejevalnik dinami??nih pogovornih oken
 Comment[sr]=???????????????? ???????????????????? ????????????????
 Comment[sr at Latn]=Ure??iva?? dinami??kih dijaloga
Index: kommander/x-kommander.desktop
===================================================================
--- kommander/x-kommander.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kommander/x-kommander.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -28,6 +28,7 @@
 Comment[pt]=Ficheiro do Kommander
 Comment[pt_BR]=Arquivo do Kommander
 Comment[ru]=???????? Kommander
+Comment[sk]=Kommander s??bor
 Comment[sl]=Datoteka Kommanderja
 Comment[sr]=Kommander-???? ????????
 Comment[sr at Latn]=Kommander-ov fajl
Index: kommander/executor/kmdr-executor.desktop
===================================================================
--- kommander/executor/kmdr-executor.desktop	(.../3.5.3/kdewebdev)	(Revision 565838)
+++ kommander/executor/kmdr-executor.desktop	(.../3.5.4/kdewebdev)	(Revision 565838)
@@ -31,6 +31,7 @@
 Comment[pt]=Executor dos di??logos do Kommander
 Comment[pt_BR]=Executor para di??logos do Kommander
 Comment[ru]=???????????????????? ???????????????? Kommander
+Comment[sk]=Sp????ta?? pre Kommander dial??gy
 Comment[sl]=Izvajalnik za pogovorna okna Kommanderja
 Comment[sr]=?????????????????? ???? Kommander-?????? ????????????????
 Comment[sr at Latn]=Izvr??ava?? za Kommander-ove dijaloge
@@ -62,6 +63,7 @@
 Name[pt]=Executor do Kommander
 Name[pt_BR]=Executor do Kommander
 Name[ru]=Kommander
+Name[sk]=Kommander sp????ta??
 Name[sl]=Izvajalnik Kommander
 Name[sr]=Kommander ??????????????????
 Name[sr at Latn]=Kommander izvr??ava??


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdewebdev.spec	14 Jul 2006 09:13:05 -0000	1.32
+++ kdewebdev.spec	24 Jul 2006 16:41:33 -0000	1.33
@@ -5,22 +5,19 @@
 %define arts 1
 
 %define qt_version 3.3.6
-%define kde_version 3.5.3
+%define kde_version 3.5.4
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.3
-Release: 2
+Version: 3.5.4
+Release: 0.pre1%{?dist}
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
 Epoch: 6
 Group: Applications/Editors
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
@@ -28,7 +25,8 @@
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
 
-Patch0: javascript.patch
+Patch0: kdewebdev-3.5.3-3.5.4.patch
+Patch1: javascript.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -62,8 +60,9 @@
 
 
 %prep
-%setup -q -a 1 -a 2 -a 3 -a 4
-%patch0 -p0 -b .javascript
+%setup -q -n %{name}-3.5.3 -a 1 -a 2 -a 3 -a 4
+%patch0 -p0
+%patch1 -p0 -b .javascript
 
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -146,6 +145,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 6:3.5.4-0.pre1
+- prerelease of 3.5.4 (from the first-cut tag)
+
 * Fri Jul 14 2006 Than Ngo <than at redhat.com> 6:3.5.3-2
 - BR: autoconf automake libtool
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:49:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:49:16 -0400
Subject: rpms/samba/devel samba-3.0.23a-samr_alias.patch, NONE,
	1.1 .cvsignore, 1.31, 1.32 samba.spec, 1.67, 1.68 sources,
	1.33, 1.34
Message-ID: <200607241649.k6OGnGno024785@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24723

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.0.23a-samr_alias.patch 
Log Message:
3.0.23a


samba-3.0.23a-samr_alias.patch:
 srv_samr_nt.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.23a-samr_alias.patch ---
diff -urN --exclude-from=/home/drizzt/jerry/tmp/diff.excludes samba-3.0.23a/source/rpc_server/srv_samr_nt.c samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c
--- samba-3.0.23a/source/rpc_server/srv_samr_nt.c	2006-07-21 11:22:56.000000000 -0500
+++ samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c	2006-07-24 06:50:15.000000000 -0500
@@ -3758,7 +3758,9 @@
 
 	DEBUG(10, ("sid is %s\n", sid_string_static(&alias_sid)));
 
+	become_root();
 	status = pdb_enum_aliasmem(&alias_sid, &sids, &num_sids);
+	unbecome_root();
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -4589,7 +4591,11 @@
 
 	/* get the current group information */
 
-	if ( !pdb_get_aliasinfo( &group_sid, &info ) ) {
+	become_root();
+	ret = pdb_get_aliasinfo( &group_sid, &info );
+	unbecome_root();
+
+	if ( !ret ) {
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	11 Jul 2006 16:02:58 -0000	1.31
+++ .cvsignore	24 Jul 2006 16:49:14 -0000	1.32
@@ -1 +1 @@
-samba-3.0.23.tar.gz
+samba-3.0.23a.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- samba.spec	11 Jul 2006 16:02:58 -0000	1.67
+++ samba.spec	24 Jul 2006 16:49:14 -0000	1.68
@@ -2,7 +2,7 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.23
+Version: 3.0.23a
 Release: 2
 Epoch: 0
 License: GNU GPL Version 2
@@ -28,7 +28,7 @@
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-# (none at the moment)
+Patch1: samba-3.0.23a-samr_alias.patch
 
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
@@ -112,7 +112,7 @@
 cp %{SOURCE8} packaging/Fedora/winbind.init
 
 # Upstream patches
-#(none)
+%patch1 -p1
 
 # generic patches
 %patch101 -p1 -b .smbw
@@ -446,6 +446,10 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-2
+- Upgrade to new upstream 3.0.23a
+- include upstream samr_alias patch
+
 * Tue Jul 11 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-2
 - New upstream release.
 - Use modified filter-requires-samba.sh from packaging/RHEL/setup/


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	11 Jul 2006 16:02:58 -0000	1.33
+++ sources	24 Jul 2006 16:49:14 -0000	1.34
@@ -1 +1 @@
-f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz
+e48f196fa51c22ff67463680ce95a58d  samba-3.0.23a.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:49:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:49:17 -0400
Subject: rpms/kdevelop/devel kdevelop-3.5.3-3.5.4.patch, NONE,
	1.1 kdevelop.spec, 1.51, 1.52
Message-ID: <200607241649.k6OGnHgW024806@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24716

Modified Files:
	kdevelop.spec 
Added Files:
	kdevelop-3.5.3-3.5.4.patch 
Log Message:
- prerelease of 3.3.4 (from the first-cut tag)


kdevelop-3.5.3-3.5.4.patch:
 admin/acinclude.m4.in                                                        |    2 -
 admin/cvs.sh                                                                 |    6 ++---
 buildtools/ada/kdevadaproject.desktop                                        |    3 ++
 buildtools/ant/kdevantproject.desktop                                        |    3 ++
 buildtools/autotools/kdevautoproject.desktop                                 |    3 ++
 buildtools/autotools/kdevkdeautoproject.desktop                              |    3 ++
 buildtools/custommakefiles/kdevcustomproject.desktop                         |    3 ++
 buildtools/haskell/kdevhaskellproject.desktop                                |    3 ++
 buildtools/pascal/kdevpascalproject.desktop                                  |    3 ++
 buildtools/projectmanager/builders/makebuilder/kdevmakebuilder.desktop       |    2 +
 buildtools/projectmanager/importers/automake/kdevautomakeimporter.desktop    |    4 +++
 buildtools/projectmanager/importers/custom/kdevcustomimporter.desktop        |    3 ++
 buildtools/projectmanager/importers/qmake/kdevqmakeimporter.desktop          |    2 +
 buildtools/projectmanager/interfaces/kdevelopprojectbuilder.desktop          |    2 +
 buildtools/projectmanager/interfaces/kdevelopprojectimporter.desktop         |    2 +
 buildtools/projectmanager/kdevprojectmanager.desktop                         |    3 ++
 buildtools/qmake/kdevtmakeproject.desktop                                    |    3 ++
 buildtools/qmake/kdevtrollproject.desktop                                    |    3 ++
 buildtools/script/kdevscriptproject.desktop                                  |    3 ++
 configure.in.in                                                              |    2 -
 editors/editor-chooser/kdeveditorchooser.desktop                             |    3 ++
 editors/qeditor/qeditor_part.desktop                                         |    3 ++
 embedded/visualboyadvance/kdevvisualboyadvance.desktop                       |    2 +
 kdevassistant.desktop                                                        |    2 +
 kdevdesigner/src/kdevdesigner.desktop                                        |    4 +++
 kdevelop.desktop                                                             |    2 +
 kdevelop.lsm                                                                 |    4 +--
 kdevelop_c_cpp.desktop                                                       |    2 +
 kdevelop_kde_cpp.desktop                                                     |    2 +
 kdevelop_ruby.desktop                                                        |    2 +
 kdevelop_scripting.desktop                                                   |    4 +++
 languages/ada/app_templates/adahello/adahello.kdevtemplate                   |    6 +++++
 languages/ada/kdevadasupport.desktop                                         |    3 ++
 languages/bash/app_templates/bashhello/bashhello.kdevtemplate                |    6 +++++
 languages/bash/kdevbashsupport.desktop                                       |    3 ++
 languages/cpp/app_templates/chello/chello.kdevtemplate                       |   12 ++++++++++
 languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate                |    6 +++++
 languages/cpp/app_templates/clanlib/clanlib.kdevtemplate                     |    6 +++++
 languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate                 |    5 ++++
 languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate             |    5 ++++
 languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate             |    5 ++++
 languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate           |    5 ++++
 languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate       |    3 ++
 languages/cpp/app_templates/cpphello/cpphello.kdevtemplate                   |    4 +++
 languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate             |    4 +++
 languages/cpp/app_templates/dcopservice/dcopservice.desktop                  |    1 
 languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate             |    4 +++
 languages/cpp/app_templates/generichello/generichello.kdevtemplate           |    2 +
 languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate             |    3 ++
 languages/cpp/app_templates/gnomeapp/gnomeapp.kdevtemplate                   |    3 ++
 languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate                 |    4 +++
 languages/cpp/app_templates/kapp/app.desktop                                 |    3 +-
 languages/cpp/app_templates/kapp/kapp.kdevtemplate                           |    5 ++++
 languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate               |    5 ++++
 languages/cpp/app_templates/kateplugin/plugin.desktop                        |    3 ++
 languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate             |    3 ++
 languages/cpp/app_templates/kateplugin2/plugin.desktop                       |    3 ++
 languages/cpp/app_templates/kbearimportfilter/kbearimportfilter.kdevtemplate |    3 ++
 languages/cpp/app_templates/kbearplugin/kbearplugin.kdevtemplate             |    4 +++
 languages/cpp/app_templates/kcmodule/kcmodule.kdevtemplate                   |    3 ++
 languages/cpp/app_templates/kcmodule/module.desktop                          |    3 ++
 languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate                     |    3 ++
 languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate                   |    4 +++
 languages/cpp/app_templates/kdevpart/kdevpart.desktop                        |    4 +++
 languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate                   |    6 +++++
 languages/cpp/app_templates/kdevpart2/kdevpart.desktop                       |    4 +++
 languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate                 |    6 +++++
 languages/cpp/app_templates/kfileplugin/kfile_plugin.desktop                 |    1 
 languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate             |    3 ++
 languages/cpp/app_templates/khello/app.desktop                               |    1 
 languages/cpp/app_templates/khello/khello.kdevtemplate                       |    4 +++
 languages/cpp/app_templates/khello2/app.desktop                              |    1 
 languages/cpp/app_templates/khello2/khello2.kdevtemplate                     |    4 +++
 languages/cpp/app_templates/kicker/applet.desktop                            |    1 
 languages/cpp/app_templates/kicker/kicker.kdevtemplate                       |    4 +++
 languages/cpp/app_templates/kioslave/kioslave.kdevtemplate                   |    3 ++
 languages/cpp/app_templates/kioslave/slave.protocol                          |    1 
 languages/cpp/app_templates/kmake/app.desktop                                |    3 +-
 languages/cpp/app_templates/kmake/kmake.kdevtemplate                         |    3 ++
 languages/cpp/app_templates/kmod/kmod.kdevtemplate                           |    2 +
 languages/cpp/app_templates/kofficepart/kopart.kdevtemplate                  |    2 +
 languages/cpp/app_templates/kofficepart/x-kopart.desktop                     |    1 
 languages/cpp/app_templates/konqnavpanel/konqnavpanel.desktop                |    2 +
 languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate           |    4 +++
 languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate                   |    3 ++
 languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate             |    6 +++++
 languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate             |    5 ++++
 languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate               |    5 ++++
 languages/cpp/app_templates/kscreensaver/kscreensaver.desktop                |    3 ++
 languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate           |    4 +++
 languages/cpp/app_templates/kxt/app.desktop                                  |    1 
 languages/cpp/app_templates/kxt/kxt.kdevtemplate                             |    3 ++
 languages/cpp/app_templates/noatunui/noatunui.kdevtemplate                   |    4 +++
 languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate           |    3 ++
 languages/cpp/app_templates/opieapp/example.desktop                          |    1 
 languages/cpp/app_templates/opieapp/opieapp.kdevtemplate                     |    6 +++++
 languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate               |    5 ++++
 languages/cpp/app_templates/opieinput/opieinput.kdevtemplate                 |    4 +++
 languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate                   |    4 +++
 languages/cpp/app_templates/opienet/opienet.kdevtemplate                     |    3 ++
 languages/cpp/app_templates/opietoday/opietoday.kdevtemplate                 |    4 +++
 languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate                   |    6 +++++
 languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate                   |    4 +++
 languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate             |    4 +++
 languages/cpp/app_templates/qtopiaapp/example.desktop                        |    1 
 languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate                 |    4 +++
 languages/cpp/app_templates/win32gui/win32gui.kdevtemplate                   |    3 ++
 languages/cpp/app_templates/win32hello/win32hello.kdevtemplate               |    3 ++
 languages/cpp/app_templates/wxhello/app.desktop                              |    1 
 languages/cpp/app_templates/wxhello/wxhello.kdevtemplate                     |    5 ++++
 languages/cpp/compiler/gccoptions/kdevg77options.desktop                     |    2 +
 languages/cpp/compiler/gccoptions/kdevgccoptions.desktop                     |    2 +
 languages/cpp/compiler/gccoptions/kdevgppoptions.desktop                     |    2 +
 languages/cpp/debugger/kdevdebugger.desktop                                  |    3 ++
 languages/cpp/kdevcppsupport.desktop                                         |    3 ++
 languages/cpp/kdevcsupport.desktop                                           |    3 ++
 languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop       |    2 +
 languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.desktop        |    2 +
 languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop                  |    2 +
 languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate       |    4 +++
 languages/fortran/compiler/pgioptions/kdevpgf77options.desktop               |    2 +
 languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop               |    2 +
 languages/fortran/kdevfortransupport.desktop                                 |    3 ++
 languages/haskell/app_templates/haskellhello/haskellhello.kdevtemplate       |    4 +++
 languages/haskell/compiler/ghcoptions/kdevghcoptions.desktop                 |    2 +
 languages/haskell/kdevhaskellsupport.desktop                                 |    3 ++
 languages/java/app_templates/javahello/javahello.kdevtemplate                |    6 +++++
 languages/java/app_templates/kappjava/app.desktop                            |    3 +-
 languages/java/app_templates/kappjava/kappjava.kdevtemplate                  |    3 ++
 languages/java/app_templates/superwaba/superwaba.kdevtemplate                |    6 +++++
 languages/java/debugger/kdevjavadebugger.desktop                             |    3 ++
 languages/java/kdevjavasupport.desktop                                       |    3 ++
 languages/kjssupport/kdevkjssupport.desktop                                  |    4 +++
 languages/lib/interfaces/kdeveloppcsimporter.desktop                         |    1 
 languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate                    |    4 +++
 languages/pascal/app_templates/fpchello/fpchello.kdevtemplate                |    3 ++
 languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate        |    3 ++
 languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate          |    4 +++
 languages/pascal/compiler/dccoptions/kdevdccoptions.desktop                  |    2 +
 languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop                  |    2 +
 languages/pascal/kdevpascalsupport.desktop                                   |    3 ++
 languages/perl/app_templates/perlhello/perlhello.kdevtemplate                |    4 +++
 languages/perl/kdevperlsupport.desktop                                       |    3 ++
 languages/php/app_templates/phphello/phphello.kdevtemplate                   |    4 +++
 languages/php/kdevphpsupport.desktop                                         |    3 ++
 languages/python/app_templates/pyqt/pyqt.kdevtemplate                        |    4 +++
 languages/python/app_templates/pythonhello/pythonhello.kdevtemplate          |    3 ++
 languages/python/app_templates/pytk/pytk.kdevtemplate                        |    3 ++
 languages/python/kdevpythonsupport.desktop                                   |    3 ++
 languages/ruby/app_templates/dcopservice/dcopservice.desktop                 |    1 
 languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate        |    4 +++
 languages/ruby/app_templates/kapp/app.desktop                                |    3 +-
 languages/ruby/app_templates/kapp/kappruby.kdevtemplate                      |    4 +++
 languages/ruby/app_templates/kxt/app.desktop                                 |    1 
 languages/ruby/app_templates/kxt/kxtruby.kdevtemplate                        |    3 ++
 languages/ruby/app_templates/qtruby/qtruby.kdevtemplate                      |    4 +++
 languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate                |    4 +++
 languages/ruby/app_templates/rails/rails.kdevtemplate                        |    4 +++
 languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate                |    3 ++
 languages/ruby/debugger/kdevrbdebugger.desktop                               |    5 ++++
 languages/ruby/doc/ruby_bugs.toc                                             |    4 +--
 languages/ruby/kdevrubysupport.desktop                                       |    3 ++
 languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate                 |    5 ++++
 languages/sql/kdevsqlsupport.desktop                                         |    3 ++
 lib/interfaces/extensions/kdevelopappfrontend.desktop                        |    1 
 lib/interfaces/extensions/kdevelopcreatefile.desktop                         |    2 +
 lib/interfaces/extensions/kdevelopdifffrontend.desktop                       |    1 
 lib/interfaces/extensions/kdevelopmakefrontend.desktop                       |    1 
 lib/interfaces/extensions/kdevelopsourceformatter.desktop                    |    1 
 lib/interfaces/extensions/kdevelopversioncontrol.desktop                     |    1 
 lib/interfaces/extras/kdevelopcompileroptions.desktop                        |    1 
 lib/interfaces/extras/kdevelopvcsintegrator.desktop                          |    2 +
 lib/interfaces/kdeveloplanguagesupport.desktop                               |    1 
 lib/interfaces/kdevelopplugin.desktop                                        |    1 
 lib/interfaces/kdevelopproject.desktop                                       |    1 
 mimetypes/x-fortran.desktop                                                  |    1 
 parts/abbrev/kdevabbrev.desktop                                              |    3 ++
 parts/annotation/kdevannotation.desktop                                      |    5 ++++
 parts/appwizard/common/dockbook.kdevtemplate                                 |    2 +
 parts/appwizard/common/kde-app.desktop                                       |    3 +-
 parts/appwizard/kdevappwizard.desktop                                        |    3 ++
 parts/astyle/kdevastyle.desktop                                              |    3 ++
 parts/bookmarks/kdevbookmarks.desktop                                        |    3 ++
 parts/classview/kdevclassview.desktop                                        |    3 ++
 parts/copyto/kdevcopyto.desktop                                              |    3 ++
 parts/ctags2/kdevctags2.desktop                                              |    3 ++
 parts/diff/kdevdiff.desktop                                                  |    3 ++
 parts/distpart/kdevdistpart.desktop                                          |    3 ++
 parts/documentation/interfaces/kdevelopdocumentationplugins.desktop          |    1 
 parts/documentation/kdevdocumentation.desktop                                |    3 ++
 parts/documentation/plugins/chm/docchmplugin.desktop                         |    2 +
 parts/documentation/plugins/custom/doccustomplugin.desktop                   |    2 +
 parts/documentation/plugins/devhelp/docdevhelpplugin.desktop                 |    2 +
 parts/documentation/plugins/djvu/docdjvuplugin.desktop                       |    2 +
 parts/documentation/plugins/doxygen/docdoxygenplugin.desktop                 |    2 +
 parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop                 |    2 +
 parts/documentation/plugins/pdb/docpdbplugin.desktop                         |    2 +
 parts/documentation/plugins/pdf/docpdfplugin.desktop                         |    2 +
 parts/documentation/plugins/qt/docqtplugin.desktop                           |    2 +
 parts/documentation/protocols/chm/chm.protocol                               |    1 
 parts/documentation/protocols/chm/kchmpart.desktop                           |    1 
 parts/doxygen/kdevdoxygen.desktop                                            |    3 ++
 parts/filecreate/kdevfilecreate.desktop                                      |    3 ++
 parts/filelist/kdevfilelist.desktop                                          |    3 ++
 parts/fileselector/kdevfileselector.desktop                                  |    3 ++
 parts/fileview/kdevfilegroups.desktop                                        |    3 ++
 parts/fileview/kdevfileview.desktop                                          |    3 ++
 parts/filter/kdevfilter.desktop                                              |    3 ++
 parts/fullscreen/kdevfullscreen.desktop                                      |    3 ++
 parts/grepview/kdevgrepview.desktop                                          |    3 ++
 parts/konsole/kdevkonsoleview.desktop                                        |    3 ++
 parts/openwith/kdevopenwith.desktop                                          |    3 ++
 parts/outputviews/kdevappoutputview.desktop                                  |    3 ++
 parts/outputviews/kdevmakeview.desktop                                       |    3 ++
 parts/partexplorer/kdevpartexplorer.desktop                                  |    3 ++
 parts/quickopen/kdevquickopen.desktop                                        |    3 ++
 parts/regexptest/kdevregexptest.desktop                                      |    3 ++
 parts/replace/kdevreplace.desktop                                            |    3 ++
 parts/scripting/kdevscripting.desktop                                        |    3 ++
 parts/security/kdevsecurity.desktop                                          |    4 +++
 parts/snippet/kdevsnippet.desktop                                            |    3 ++
 parts/texttools/kdevtexttools.desktop                                        |    3 ++
 parts/tipofday/kdevtipofday.desktop                                          |    3 ++
 parts/tools/kdevtools.desktop                                                |    3 ++
 parts/uimode/kdevuichooser.desktop                                           |    3 ++
 parts/valgrind/kdevvalgrind.desktop                                          |    3 ++
 parts/vcsmanager/kdevvcsmanager.desktop                                      |    3 ++
 src/eventsrc                                                                 |    4 +++
 vcs/clearcase/integrator/kdevclearcaseintegrator.desktop                     |    3 ++
 vcs/clearcase/kdevclearcase.desktop                                          |    3 ++
 vcs/compat/svn/ksvnd/ksvnd.desktop                                           |    2 +
 vcs/compat/svn/svn+file.protocol                                             |    1 
 vcs/compat/svn/svn+http.protocol                                             |    1 
 vcs/compat/svn/svn+https.protocol                                            |    1 
 vcs/compat/svn/svn+ssh.protocol                                              |    1 
 vcs/compat/svn/svn.protocol                                                  |    1 
 vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop                   |    3 ++
 vcs/cvsservice/kdevcvsservice.desktop                                        |    4 +++
 vcs/perforce/integrator/kdevperforceintegrator.desktop                       |    3 ++
 vcs/perforce/kdevperforce.desktop                                            |    3 ++
 vcs/subversion/integrator/kdevsubversionintegrator.desktop                   |    3 ++
 vcs/subversion/kdevsubversion.desktop                                        |    1 
 x-kdevelop.desktop                                                           |    1 
 243 files changed, 719 insertions(+), 14 deletions(-)

--- NEW FILE kdevelop-3.5.3-3.5.4.patch ---
Index: buildtools/projectmanager/interfaces/kdevelopprojectbuilder.desktop
===================================================================
--- buildtools/projectmanager/interfaces/kdevelopprojectbuilder.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/interfaces/kdevelopprojectbuilder.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -15,10 +15,12 @@
 Name[ga]=T??g??la?? Tionscadal KDevelop
 Name[hu]=KDevelop projektkezel??
 Name[it]=Compilatore di progetto di KDevelop
+Name[ja]=KDevelop ?????????????????? ?????????
 Name[pl]=Budowanie projektu w KDevelopie
 Name[pt]=Construtor de Projectos do KDevelop
 Name[pt_BR]=Construtor de Projeto do KDevelop
 Name[ru]=?????????????????? ???????????? ???????????????? KDevelop
+Name[sk]=KDevelop tvorca projektu
 Name[sl]=Projektni graditelj v KDevelopu
 Name[sr]=KDevelop-???? ???????????????? ????????????????
 Name[sr at Latn]=KDevelop-ov gradilac projekta
Index: buildtools/projectmanager/interfaces/kdevelopprojectimporter.desktop
===================================================================
--- buildtools/projectmanager/interfaces/kdevelopprojectimporter.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/interfaces/kdevelopprojectimporter.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -15,10 +15,12 @@
 Name[ga]=Iomp??rt??la?? Tionscadal KDevelop
 Name[hu]=KDevelop projektimport??l??
 Name[it]=Importatore di progetto di KDevelop
+Name[ja]=KDevelop ?????????????????? ???????????????
 Name[pl]=KDevelop: import projektu
 Name[pt]=Importador de Projectos do KDevelop
 Name[pt_BR]=Importador de Projeto para o KDevelop
 Name[ru]=???????????? ???????????????? KDevelop
+Name[sk]=KDevelop import??r projektu
 Name[sl]=Uvoz projektov v KDevelop
 Name[sr]=KDevelop-???? ?????????????? ???? ????????????????
 Name[sr at Latn]=KDevelop-ov uvoznik za projekte
Index: buildtools/projectmanager/kdevprojectmanager.desktop
===================================================================
--- buildtools/projectmanager/kdevprojectmanager.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/kdevprojectmanager.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -4,13 +4,16 @@
 Exec=blubb
 Comment=KDevProjectManager
 Comment[da]=KDevelop Projekth??ndtering
+Comment[sk]=KDevProjektMana????r
 Comment[sv]=KDevelop projekthantering
 Comment[zh_CN]=KDev ???????????????
 Name=KDevProjectManager
 Name[da]=KDevelop Projekth??ndtering
+Name[sk]=KDevProjektMana????r
 Name[sv]=KDevelop projekthantering
 GenericName=KDevProjectManager
 GenericName[da]=KDevelop Projekth??ndtering
+GenericName[sk]=KDevProjektMana????r
 GenericName[sv]=KDevelop projekthantering
 Icon=kdevelop
 ServiceTypes=KDevelop/Project
Index: buildtools/projectmanager/importers/automake/kdevautomakeimporter.desktop
===================================================================
--- buildtools/projectmanager/importers/automake/kdevautomakeimporter.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/importers/automake/kdevautomakeimporter.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -2,7 +2,9 @@
 Type=Service
 Name=KDevAutomakeImporter
 Name[da]=KDevelop Automake-import??r
+Name[ja]=KDevCustomInporter
 Name[pl]=KDevImportAutomake
+Name[sk]=KDevAutomakeImport??r
 Name[sv]=KDevelop Automake-import
 Name[tr]=KDevAutoMakeImporter
 Comment=KDevelop Automake Importer
@@ -18,10 +20,12 @@
 Comment[hu]=KDevelop Automake-import??l??
 Comment[is]=KDevelop Automake innflytjandi
 Comment[it]=Importatore per automake di KDevelop
+Comment[ja]=KDevelop Automake ???????????????
 Comment[pl]=KDevelop: importowanie automake
 Comment[pt]=Importador de Automake do KDevelop
 Comment[pt_BR]=Importador Automake do KDevelop Automake
 Comment[ru]=???????????? ???????????????? Automake
+Comment[sk]=KDevelop Automake import??r
 Comment[sr]=KDevelop-???? automake ??????????????
 Comment[sr at Latn]=KDevelop-ov automake uvoznik
 Comment[sv]=KDevelop Automake-import
Index: buildtools/projectmanager/importers/custom/kdevcustomimporter.desktop
===================================================================
--- buildtools/projectmanager/importers/custom/kdevcustomimporter.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/importers/custom/kdevcustomimporter.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -6,6 +6,7 @@
 Name[hi]=??????-?????????-???????????????-???????????????????????????
 Name[ja]=KDevCustomInporter
 Name[pl]=KDevW??asnyImport
+Name[sk]=KDevVlastn??Import??r
 Name[sv]=KDevelop egen import
 Name[ta]=?????????????????? ?????????????????? ??????????????????????????????????????????
 Comment=KDevelop Custom Importer
@@ -21,10 +22,12 @@
 Comment[hu]=KDevelop egy??ni import??l??
 Comment[is]=KDevelop Custom innflytjandi
 Comment[it]=Importatore personalizzato di KDevelop
+Comment[ja]=KDevelop ???????????? ???????????????
 Comment[pl]=KDevelop: w??asny import
 Comment[pt]=Importador Personalizado do KDevelop
 Comment[pt_BR]=Importador Personalizado para o KDevelop
 Comment[ru]=???????????? ?????????????? ???????????????? ?????? KDevelop
+Comment[sk]=KDevelop vlastn?? import??r
 Comment[sr]=KDevelop-???? ?????????????????????? ??????????????
 Comment[sr at Latn]=KDevelop-ov prilago??eni uvoznik
 Comment[sv]=KDevelop egen import
Index: buildtools/projectmanager/importers/qmake/kdevqmakeimporter.desktop
===================================================================
--- buildtools/projectmanager/importers/qmake/kdevqmakeimporter.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/importers/qmake/kdevqmakeimporter.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -14,11 +14,13 @@
 Comment[ga]=Iomp??rt??il tionscadail qmake agus cuir iad in eagar
 Comment[hu]=Qmake-projektek import??l??sa ??s szerkeszt??se
 Comment[it]=Importa e modifica i progetti qmake
+Comment[ja]=qmake ?????????????????????????????????????????????
 Comment[nl]=Importeert en bewerkt qmake-projecten
 Comment[pl]=Import i modyfikacja projekt??w qmake
 Comment[pt]=Importa e edita projectos qmake.
 Comment[pt_BR]=Importa e edita projectos qmake.
 Comment[ru]=???????????? ?? ???????????????????????????? ???????????????? qmake
+Comment[sk]=Importuje a edituje qmake projekty
 Comment[sr]=?????????? ?? ?????????????? qmake ????????????????
 Comment[sr at Latn]=Uvozi i ure??uje qmake projekte
 Comment[sv]=Importerar och redigerar Qmake-projekt
Index: buildtools/projectmanager/builders/makebuilder/kdevmakebuilder.desktop
===================================================================
--- buildtools/projectmanager/builders/makebuilder/kdevmakebuilder.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/projectmanager/builders/makebuilder/kdevmakebuilder.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -16,10 +16,12 @@
 Comment[hu]=KDevelop Automake-import??l??
 Comment[is]=KDevelop Automake innflytjandi
 Comment[it]=Importatore per automake di KDevelop
+Comment[ja]=KDevelop Automake ???????????????
 Comment[pl]=KDevelop: importowanie automake
 Comment[pt]=Importador de Automake do KDevelop
 Comment[pt_BR]=Importador Automake do KDevelop Automake
 Comment[ru]=???????????? ???????????????? Automake
+Comment[sk]=KDevelop Automake import??r
 Comment[sr]=KDevelop-???? automake ??????????????
 Comment[sr at Latn]=KDevelop-ov automake uvoznik
 Comment[sv]=KDevelop Automake-import
Index: buildtools/ant/kdevantproject.desktop
===================================================================
--- buildtools/ant/kdevantproject.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/ant/kdevantproject.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -25,6 +25,7 @@
 Comment[pt]=Projecto Ant
 Comment[pt_BR]=Projeto Ant
 Comment[ru]=???????????? Ant
+Comment[sk]=Ant projekt
 Comment[sl]=Projekt Ant
 Comment[sr]=Ant ????????????????
 Comment[sr at Latn]=Ant projekat
@@ -41,6 +42,7 @@
 Name[hi]=??????-?????????-???????????????-????????????????????????
 Name[nb]=KDevAnt-prosjekt
 Name[pl]=KDevProjektAnt
+Name[sk]=KDevAntProjekt
 Name[sv]=KDevelop Ant-projekt
 Name[ta]=????????????????????????????????? ???????????????????????????
 Name[tg]=???????????? KDevAnt
@@ -65,6 +67,7 @@
 GenericName[pt]=Projecto Ant
 GenericName[pt_BR]=Projeto Ant
 GenericName[ru]=???????????? Ant
+GenericName[sk]=Ant projekt
 GenericName[sl]=Projekt Ant
 GenericName[sr]=Ant ????????????????
 GenericName[sr at Latn]=Ant projekat
Index: buildtools/haskell/kdevhaskellproject.desktop
===================================================================
--- buildtools/haskell/kdevhaskellproject.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ buildtools/haskell/kdevhaskellproject.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -24,6 +24,7 @@
 Comment[pt]=Projecto de Haskell
 Comment[pt_BR]=Projeto Haskell
 Comment[ru]=???????????? Haskell
+Comment[sk]=Haskell projekt
 Comment[sl]=Projekt Haskell
 Comment[sr]=Haskell ????????????????
 Comment[sr at Latn]=Haskell projekat
@@ -38,6 +39,7 @@
 Name[de]=Haskell-Projekt (KDevelop)
 Name[hi]=??????-?????????-?????????????????????-????????????????????????
 Name[pl]=KDevProjektHaskell
+Name[sk]=KDevHaskellProjekt
 Name[sv]=KDevelop Haskell-projekt
 Name[ta]=?????????????????? ???????????????????????? ???????????????????????????
 Name[tg]=???????????? KDevHaskell
@@ -62,6 +64,7 @@
 GenericName[pt]=Projecto de Haskell
 GenericName[pt_BR]=Projeto Haskell
 GenericName[ru]=???????????? Haskell
+GenericName[sk]=Haskell projekt
 GenericName[sl]=Projekt Haskell
 GenericName[sr]=Haskell ????????????????
 GenericName[sr at Latn]=Haskell projekat
Index: buildtools/pascal/kdevpascalproject.desktop
[...6002 lines suppressed...]
Index: languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate
===================================================================
--- languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate	(.../3.5.3/kdevelop)	(Revision 565844)
+++ languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -11,10 +11,12 @@
 Name[fr]=Simple programme ????Hello world????
 Name[hu]=Egyszer?? Hello world program
 Name[it]=Semplice programma di "Hello world"
+Name[ja]=????????? Hello world ???????????????
 Name[nl]=Eenvoudig 'Hello World' programma
 Name[pl]=Prosty program witaj ??wiecie
 Name[pt]=Programa simples Ol?? Mundo
 Name[pt_BR]=Programa simples Ol?? Mundo
+Name[sk]=Jednoduch?? "Ahoj svet" program
 Name[sl]=Preprost program Hello world
 Name[sr]=?????????????????????? ??????????????? ????????????? ??????????????
 Name[sr at Latn]=Jednostavan ???Zdravo svete??? program
@@ -39,6 +41,7 @@
 Comment[pt]=Gera um programa simples Ol?? Mundo em Fortran
 Comment[pt_BR]=Gera um programa simples Ol?? Mundo em Fortran
 Comment[ru]=???????????????? ???????????????? ???????????????????? Hello world ???? Fortran
+Comment[sk]=Vygeneruje jednoduch?? "Ahoj svet" program vo Fortran
 Comment[sr]=?????????? ?????????????????????? ??????????????? ????????????? ?? Fortran-??
 Comment[sr at Latn]=Pravi jednostavan ???Zdravo svete??? u Fortran-u
 Comment[sv]=Skapar ett enkelt Hello world-program i Fortran
@@ -108,6 +111,7 @@
 Comment[pl]=Prosty program "Witaj ??wiecie" w Fortranie zosta?? utworzony w %{dest}
 Comment[pt]=Foi criado um programa simples "Ol?? mundo" em Fortran em %{dest}
 Comment[pt_BR]=Foi criado um programa simples "Ol?? mundo" em Fortran em %{dest}
+Comment[sk]=Jednoduch?? "Ahoj svet" program vo Fortran bol vytvoren?? v %{dest}
 Comment[sr]=?????????????????????? ??????????????? ????????????? ?? Fortran-?? ?????????????????? ???? ?? %{dest}
 Comment[sr at Latn]=Jednostavan ???Zdravo svete??? u Fortran-u napravljen je u %{dest}
 Comment[sv]=Ett enkelt "Hello world"-program i Fortran skapades i %{dest}
Index: languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop
===================================================================
--- languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -21,6 +21,7 @@
 Comment[pt]=Compilador Portland Group High Performance Fortran
 Comment[pt_BR]=Compilador Portland Group Alta Performance
 Comment[ru]=???????????????????? Portland Group High Performance Fortran
+Comment[sk]=Portland Group vysoko v??konn?? Fortran kompil??tor
 Comment[sr]=???????????????????? Fortran-?? ?????????????? ??????????????????????, ???? Portland Group-??
 Comment[sr at Latn]=Prevodilac Fortran-a visokih performansi, iz Portland Group-a
 Comment[sv]=Portland gruppens h??gprestanda Fortran 77-kompilator
@@ -33,6 +34,7 @@
 Name[de]=Pghpf-Einstellungen (KDevelop)
 Name[hi]=?????????????????????????????????-??????????????????
 Name[pl]=Opcje Pghpf
+Name[sk]=Pghpf mo??nosti
 Name[sv]=Alternativ f??r pghpf
 Name[ta]=Pghpf ???????????????????????????????????? 
 Name[tg]=Pghpf??????????????????
Index: languages/fortran/compiler/pgioptions/kdevpgf77options.desktop
===================================================================
--- languages/fortran/compiler/pgioptions/kdevpgf77options.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ languages/fortran/compiler/pgioptions/kdevpgf77options.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -22,6 +22,7 @@
 Comment[pt]=Compilador de Fortran77 do Portland Group
 Comment[pt_BR]=Compilador Portland Group Fortran77
 Comment[ru]=???????????????????? Portland Group Fortran77
+Comment[sk]=Portland Group Fortran77 kompil??tor
 Comment[sl]=Prevajalnik za Portland Group Fortran77
 Comment[sr]=???????????????????? Fortran-?? 77 ???? Portland Group-??
 Comment[sr at Latn]=Prevodilac Fortran-a 77 od Portland Group-a
@@ -35,6 +36,7 @@
 Name[de]=Pgf77-Einstellungen (KDevelop)
 Name[hi]=?????????????????????77??????????????????
 Name[pl]=Opcje Pgf77
+Name[sk]=Pgf77 mo??nosti
 Name[sl]=Mo??nosti Pgf77
 Name[sv]=Alternativ f??r pgf77
 Name[ta]=Pgf77 ???????????????????????????????????? 
Index: languages/bash/kdevbashsupport.desktop
===================================================================
--- languages/bash/kdevbashsupport.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ languages/bash/kdevbashsupport.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -23,6 +23,7 @@
 Comment[pt]=Suporte a Bash
 Comment[pt_BR]=Suporte ao Bash
 Comment[ru]=?????????????????? ?????????? bash
+Comment[sk]=Podpora Bash
 Comment[sl]=Podpora bash
 Comment[sr]=Bash ??????????????
 Comment[sr at Latn]=Bash podr??ka
@@ -37,6 +38,7 @@
 Name[de]=Unterst??tzung f??r Bash (KDevelop)
 Name[hi]=??????-?????????-?????????-??????????????????
 Name[pl]=KDevObs??ugaBasha
+Name[sk]=KDevBashPodpora
 Name[sv]=KDevelop Bash-st??d
 Name[ta]=?????????????????????????????? ???????????????
 GenericName=Bash Support
@@ -59,6 +61,7 @@
 GenericName[pt]=Suporte de Bash
 GenericName[pt_BR]=Suporte ao Bash
 GenericName[ru]=?????????????????? ?????????? bash
+GenericName[sk]=Podpora Bash
 GenericName[sl]=Podpora bash
 GenericName[sr]=Bash ??????????????
 GenericName[sr at Latn]=Bash podr??ka
Index: languages/bash/app_templates/bashhello/bashhello.kdevtemplate
===================================================================
--- languages/bash/app_templates/bashhello/bashhello.kdevtemplate	(.../3.5.3/kdevelop)	(Revision 565844)
+++ languages/bash/app_templates/bashhello/bashhello.kdevtemplate	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -12,10 +12,12 @@
 Name[ga]=Script Shimpl?? Bhlaoisce Bash
 Name[hu]=Egyszer?? Bash-szkript
 Name[it]=Semplice script shell Bash
+Name[ja]=????????? Bash ????????? ???????????????
 Name[nl]=Eenvoudig Bash-shellscript
 Name[pl]=Prosty skrypt pow??oki Bash
 Name[pt]=Programa Simples da 'Shell' Bash
 Name[pt_BR]=Programa Simples da 'Shell' Bash
+Name[sk]=Jednoduch?? skript pre Bash Shell
 Name[sr]=?????????????????????? ?????????????? ???????????? Bash
 Name[sr at Latn]=Jednostavna skripta ??koljke Bash
 Name[sv]=Enkelt Bash-skalskript
@@ -34,10 +36,12 @@
 Comment[fr]=G??n??re un simple programme ????Hello world???? en Bash
 Comment[hu]=L??trehoz egy egyszer?? Hello world programot a Bash parancs??rtelmez??h??z
 Comment[it]=Questo genera un semplice programma shell di "Hello world" in Bash
+Comment[ja]=????????? Hello world ?????????????????? Bash ???????????????????????????
 Comment[nl]=Dit genereert een eenvoudig "Hello World" programma in Bash-shell
 Comment[pl]=Generuje prosty program 'Witaj ??wiecie' jako skrypt pow??oki Bash
 Comment[pt]=Isto gera um programa simplista 'Ol?? mundo' para a linha de comandos Bash
 Comment[pt_BR]=Isto gera um programa simplista 'Ol?? mundo' para a linha de comandos Bash
+Comment[sk]=Vygeneruje jednoduch?? "Ahoj svet" program v Bash Shell
 Comment[sr]=?????? ?????????? ?????????????????????? ??????????????? ????????????? ?????????????? ???? ???????????? Bash
 Comment[sr at Latn]=Ovo pravi jednostavan ???Zdravo svete??? program za ??koljku Bash
 Comment[sv]=Detta skapar ett f??renklat 'Hello world'-program f??r Bash-skalet
@@ -72,10 +76,12 @@
 Comment[ga]=Crutha??odh tionscadal simpl?? bash i %{dest}
 Comment[hu]=L??trej??tt egy egyszer?? Bash-szkript (projekt) itt: %{dest}
 Comment[it]=?? stato creato un semplice progetto di script shell in Bash in %{dest}
+Comment[ja]=????????? bash ????????? ?????????????????? %{dest} ?????????????????????
 Comment[nl]=Een eenvoudig Bash-shellscript is aangemaakt in %{dest}
 Comment[pl]=Prosty skrypt pow??oki zosta?? utworzony w %{dest}
 Comment[pt]=Foi criado um programa simples "Ol?? mundo" em Bash em %{dest}
 Comment[pt_BR]=Foi criado um programa simples "Ol?? mundo" em Bash em %{dest}
+Comment[sk]=Jednoduch?? Bash Shell projekt bol vytvoren?? v %{dest}
 Comment[sr]=???????????????? ?????????????????????? ?????????????? ???? ???????????? Bash ?????????????????? ???? ?? %{dest}
 Comment[sr at Latn]=Projekat jednostavne skripte za ??koljku Bash napravljen je u %{dest}
 Comment[sv]=Ett enkelt Bash skalskriptprojekt skapades i %{dest}
Index: editors/editor-chooser/kdeveditorchooser.desktop
===================================================================
--- editors/editor-chooser/kdeveditorchooser.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ editors/editor-chooser/kdeveditorchooser.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -23,6 +23,7 @@
 Comment[pt]=Fornece um di??logo para a selec????o de Editor.
 Comment[pt_BR]=Prov?? um di??logo para sele????o do Editor.
 Comment[ru]=?????????????????????????? ???????????? ???????????? ??????????????????.
+Comment[sk]=Poskytuje dial??gov?? okno pre vo??bu editora.
 Comment[sl]=Ponuja pogovorno okno za izbiro urejevalnika
 Comment[sr]=???????????????????? ???????????? ???? ?????????? ??????????????????.
 Comment[sr at Latn]=Obezbe??uje prozor za izbor ure??iva??a.
@@ -37,6 +38,7 @@
 Name[de]=Editor-Auswahl (KDevelop)
 Name[hi]=??????-?????????-???????????????-????????????
 Name[pl]=KDevWyb??rEdytora
+Name[sk]=KDevEditorVoli??
 Name[sv]=KDevelop editorv??ljare
 Name[ta]=?????????????????? ????????????????????????????????? ???????????????????????????
 Name[tg]=KDev????????????????????????????????????????????
@@ -60,6 +62,7 @@
 GenericName[pt]=Selec????o de Editor
 GenericName[pt_BR]=Sele????o de Editor
 GenericName[ru]=?????????? ??????????????????
+GenericName[sk]=Vo??ba editora
 GenericName[sl]=Izbira urejevalnika
 GenericName[sr]=?????????? ??????????????????
 GenericName[sr at Latn]=Izbor ure??iva??a
Index: editors/qeditor/qeditor_part.desktop
===================================================================
--- editors/qeditor/qeditor_part.desktop	(.../3.5.3/kdevelop)	(Revision 565844)
+++ editors/qeditor/qeditor_part.desktop	(.../3.5.4/kdevelop)	(Revision 565844)
@@ -20,6 +20,7 @@
 Comment[pt]=Editor de Texto Baseado no Qt Designer
 Comment[pt_BR]=Editor de Texto Baseado no Qt Designer
 Comment[ru]=?????????????????? ???????????????? ???? Qt Designer
+Comment[sk]=Textov?? editor zalo??en?? na Qt Dizajn??ri
 Comment[sl]=Urejevalnik besedil na osnovi Qt Designerja
 Comment[sr]=???????????????? ???????????? ???????????????? ???? QT Designer-??
 Comment[sr at Latn]=Ure??iva?? teksta zasnovan na QT Designer-u
@@ -48,6 +49,7 @@
 Name[pt]=Editor de Texto Baseado no Qt Designer
 Name[pt_BR]=Editor de Texto Baseado no Qt Designer
 Name[ru]=Qt Designer Based Editor
+Name[sk]=Textov?? editor zalo??en?? na Qt Dizajn??ri
 Name[sl]=Urejevalnik besedil na osnovi Qt Designerja
 Name[sr]=???????????????? ???????????? ???????????????? ???? QT Designer-??
 Name[sr at Latn]=Ure??iva?? teksta zasnovan na QT Designer-u
@@ -76,6 +78,7 @@
 GenericName[pt]=Suporte ao QEditor
 GenericName[pt_BR]=Suporte ao QEditor
 GenericName[ru]=?????????????????? QEditor
+GenericName[sk]=QEditor podpora
 GenericName[sl]=Podpora QEditor
 GenericName[sr]=?????????????? ???? QEditor
 GenericName[sr at Latn]=Podr??ka za QEditor


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdevelop.spec	17 Jul 2006 19:45:39 -0000	1.51
+++ kdevelop.spec	24 Jul 2006 16:49:15 -0000	1.52
@@ -1,7 +1,7 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.3
+%define kde_version 3.5.4
 %define qt_version 3.3.6
 %define qt_epoch 1
 %define kdelibs_epoch 6
@@ -10,8 +10,8 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.3
-Release: 3
+Version: 3.3.4
+Release: 0.pre1%{?dist}
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -21,6 +21,7 @@
 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
 
+Patch0: kdevelop-3.5.3-3.5.4.patch
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
@@ -71,9 +72,9 @@
 
 %prep
 
-%setup -q -a1
+%setup -q -n %{name}-3.3.3 -a1
+%patch0 -p0
 %patch1 -p0 -b .config
-%patch2 -p1 -b .libtool
 %patch3 -p1 -b .doc
 
 %build
@@ -159,6 +160,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Mon Jul 24 2006 Than Ngo <than at redhat.com> 9:3.3.4-0.pre1
+- prerelease of 3.3.4 (from the first-cut tag)
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 9:3.3.3-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:52:43 -0400
Subject: rpms/kdevelop/devel kdevelop.spec,1.52,1.53
Message-ID: <200607241652.k6OGqhkB026164@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26121

Modified Files:
	kdevelop.spec 
Log Message:
prerelease of 3.3.4 (from the first-cut tag)




Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdevelop.spec	24 Jul 2006 16:49:15 -0000	1.52
+++ kdevelop.spec	24 Jul 2006 16:52:40 -0000	1.53
@@ -18,7 +18,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPL
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.3.3.tar.bz2
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
 Patch0: kdevelop-3.5.3-3.5.4.patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:55:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:55:14 -0400
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.21,1.22
Message-ID: <200607241655.k6OGtEDn027171@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27136

Modified Files:
	scim-hangul.spec 
Log Message:
* Tue Jul 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-6
- scim-hangul-0.2.2-swap-keybinding.patch: swap the keybindings to move
  the cursor on the candidate window according to the candidate window's
  orientation.


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scim-hangul.spec	12 Jul 2006 08:08:20 -0000	1.21
+++ scim-hangul.spec	24 Jul 2006 16:55:12 -0000	1.22
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.2
-Release:        5.1%{?dist}
+Release:        6%{?dist}
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -14,6 +14,7 @@
 Source0:        http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz
 Patch0:		scim-hangul-0.2.2-ascii-mode.patch
 Patch1:		scim-hangul-0.2.2-help.patch
+Patch2:		scim-hangul-0.2.2-swap-keybinding.patch
 
 
 Summary:        Hangul Input Method Engine for SCIM
@@ -28,6 +29,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .0-ascii-mode
 %patch1 -p1 -b .1-help
+%patch2 -p1 -b .2-swap-key
 
 
 %build
@@ -67,7 +69,12 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Tue Jul 25 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-6
+- scim-hangul-0.2.2-swap-keybinding.patch: swap the keybindings to move
+  the cursor on the candidate window according to the candidate window's
+  orientation.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-5.1
 - rebuild
 
 * Wed Jul  5 2006 Akira TAGOH <tagoh at redhat.com> - 0.2.2-5



From fedora-cvs-commits at redhat.com  Mon Jul 24 16:55:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 12:55:41 -0400
Subject: rpms/scim-hangul/devel scim-hangul-0.2.2-swap-keybinding.patch, NONE,
	1.1
Message-ID: <200607241655.k6OGtfSU027382@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27348

Added Files:
	scim-hangul-0.2.2-swap-keybinding.patch 
Log Message:


scim-hangul-0.2.2-swap-keybinding.patch:
 scim_hangul_imengine.cpp |   85 +++++++++++++++++++++++++++++++++++++----------
 scim_hangul_imengine.h   |    6 +++
 scim_hangul_private.h    |    2 +
 3 files changed, 75 insertions(+), 18 deletions(-)

--- NEW FILE scim-hangul-0.2.2-swap-keybinding.patch ---
diff -ruN -x '*o' scim-hangul-0.2.2.orig/src/scim_hangul_imengine.cpp scim-hangul-0.2.2/src/scim_hangul_imengine.cpp
--- scim-hangul-0.2.2.orig/src/scim_hangul_imengine.cpp	2006-07-18 14:15:09.000000000 +0900
+++ scim-hangul-0.2.2/src/scim_hangul_imengine.cpp	2006-07-18 16:42:53.000000000 +0900
@@ -259,6 +259,11 @@
 
 	m_input_layout = config->read (String (SCIM_CONFIG_IMENGINE_HANGUL_INPUT_LAYOUT),
 				       String (SCIM_CONFIG_IMENGINE_HANGUL_INPUT_LAYOUT_DEFAULT));
+	/* it may be the wrong assumption that it may be false
+	 * if no /Panel/Gtk/LookupTableVertical defined. any APIs to get it may be needed?
+	 */
+	m_lookup_table_vertical = config->read (String (SCIM_CONFIG_PANEL_LOOKUP_TABLE_VERTICAL),
+						false);
     }
 
     if (!m_hangul_hanja_keys.size ()) {
@@ -339,6 +344,38 @@
     install_properties ();
 }
 
+void
+HangulInstance::cursor_up_on_lookup_table(void)
+{
+	m_lookup_table.cursor_up ();
+	update_lookup_table (m_lookup_table);
+	hangul_update_aux_string ();
+}
+
+void
+HangulInstance::cursor_down_on_lookup_table(void)
+{
+	m_lookup_table.cursor_down ();
+	update_lookup_table (m_lookup_table);
+	hangul_update_aux_string ();
+}
+
+void
+HangulInstance::page_up_on_lookup_table(void)
+{
+	m_lookup_table.page_up ();
+	update_lookup_table (m_lookup_table);
+	hangul_update_aux_string ();
+}
+
+void
+HangulInstance::page_down_on_lookup_table(void)
+{
+	m_lookup_table.page_down ();
+	update_lookup_table (m_lookup_table);
+	hangul_update_aux_string ();
+}
+
 bool
 HangulInstance::candidate_key_event (const KeyEvent &key)
 {
@@ -352,35 +389,47 @@
             hangul_update_preedit_string ();
 	    update_candidates ();
             break;
+        case SCIM_KEY_KP_Subtract:
+            cursor_up_on_lookup_table();
+            break;
         case SCIM_KEY_Left:
         case SCIM_KEY_h:
-        case SCIM_KEY_KP_Subtract:
-            m_lookup_table.cursor_up ();
-            update_lookup_table (m_lookup_table);
-            hangul_update_aux_string ();
+            if (m_factory->m_lookup_table_vertical)
+                page_up_on_lookup_table();
+            else
+                cursor_up_on_lookup_table();
             break;
-        case SCIM_KEY_Right:
-        case SCIM_KEY_l:
         case SCIM_KEY_space:
         case SCIM_KEY_KP_Add:
-            m_lookup_table.cursor_down ();
-            update_lookup_table (m_lookup_table);
-            hangul_update_aux_string ();
+            cursor_down_on_lookup_table();
+            break;
+        case SCIM_KEY_Right:
+        case SCIM_KEY_l:
+            if (m_factory->m_lookup_table_vertical)
+                page_down_on_lookup_table();
+            else
+                cursor_down_on_lookup_table();
             break;
-        case SCIM_KEY_Up:
         case SCIM_KEY_Page_Up:
+            page_up_on_lookup_table();
+            break;
+        case SCIM_KEY_Up:
         case SCIM_KEY_k:
-            m_lookup_table.page_up ();
-            update_lookup_table (m_lookup_table);
-            hangul_update_aux_string ();
+            if (m_factory->m_lookup_table_vertical)
+                cursor_up_on_lookup_table();
+            else
+                page_up_on_lookup_table();
             break;
-        case SCIM_KEY_Down:
         case SCIM_KEY_Page_Down:
-        case SCIM_KEY_j:
         case SCIM_KEY_KP_Tab:
-            m_lookup_table.page_down ();
-            update_lookup_table (m_lookup_table);
-            hangul_update_aux_string ();
+            page_down_on_lookup_table();
+            break;
+        case SCIM_KEY_Down:
+        case SCIM_KEY_j:
+            if (m_factory->m_lookup_table_vertical)
+                cursor_down_on_lookup_table();
+            else
+                page_down_on_lookup_table();
             break;
         case SCIM_KEY_Escape:
             delete_candidates ();
diff -ruN -x '*o' scim-hangul-0.2.2.orig/src/scim_hangul_imengine.h scim-hangul-0.2.2/src/scim_hangul_imengine.h
--- scim-hangul-0.2.2.orig/src/scim_hangul_imengine.h	2006-07-18 14:15:09.000000000 +0900
+++ scim-hangul-0.2.2/src/scim_hangul_imengine.h	2006-07-18 16:42:31.000000000 +0900
@@ -73,6 +73,7 @@
     bool                     m_show_candidate_comment;
     bool                     m_use_ascii_mode;
     bool                     m_hide_layout;
+    bool                     m_lookup_table_vertical;
 
     KeyEventList             m_trigger_keys;
     KeyEventList             m_hangul_hanja_keys;
@@ -220,6 +221,11 @@
 
     void            set_input_mode (HangulInputMode mode);
     HangulInputMode get_input_mode (void);
+
+    void cursor_up_on_lookup_table   (void);
+    void cursor_down_on_lookup_table (void);
+    void page_up_on_lookup_table     (void);
+    void page_down_on_lookup_table   (void);
 };
 #endif
 
diff -ruN -x '*o' scim-hangul-0.2.2.orig/src/scim_hangul_private.h scim-hangul-0.2.2/src/scim_hangul_private.h
--- scim-hangul-0.2.2.orig/src/scim_hangul_private.h	2006-07-18 14:15:09.000000000 +0900
+++ scim-hangul-0.2.2/src/scim_hangul_private.h	2006-07-18 16:24:48.000000000 +0900
@@ -36,6 +36,8 @@
 #define SCIM_CONFIG_IMENGINE_HANGUL_INPUT_LAYOUT		"/IMEngine/Hangul/InputLayout"
 #define SCIM_CONFIG_IMENGINE_HANGUL_HIDE_LAYOUT			"/IMEngine/Hangul/HideLayout"
 
+#define SCIM_CONFIG_PANEL_LOOKUP_TABLE_VERTICAL			"/Panel/Gtk/LookupTableVertical"
+
 /* default values */
 #define SCIM_CONFIG_IMENGINE_HANGUL_USE_ASCII_MODE_DEFAULT	false
 #define SCIM_CONFIG_IMENGINE_HANGUL_HANGUL_HANJA_KEY_DEFAULT	"Hangul_Hanja,Control+Control_R+KeyRelease,F9"



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:36:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:36:46 -0400
Subject: rpms/sox/devel sox-12.18.1-multilib.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 sources, 1.9, 1.10 sox.spec, 1.25, 1.26
Message-ID: <200607241736.k6OHak1i028656@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28639

Modified Files:
	.cvsignore sources sox.spec 
Added Files:
	sox-12.18.1-multilib.patch 
Log Message:
[tw]
- new version 12.18.1
- fixed multilib devel conflict in libst-config (#192751)



sox-12.18.1-multilib.patch:
 libst-config.in |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE sox-12.18.1-multilib.patch ---
--- sox-12.18.1/src/libst-config.in.multilib	2004-09-01 21:49:24.000000000 +0200
+++ sox-12.18.1/src/libst-config.in	2006-07-24 19:19:31.000000000 +0200
@@ -6,7 +6,14 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 includedir="@includedir@"
-libdir="@libdir@"
+arch=$(/bin/arch)
+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
+    -o "$arch" = "ia64" ]; 
+then
+    libdir="@prefix@/lib64"
+else
+    libdir="@prefix@/lib"
+fi
 libs='@LIBS@'
 
 case "$1" in


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Dec 2005 13:44:05 -0000	1.9
+++ .cvsignore	24 Jul 2006 17:36:44 -0000	1.10
@@ -1 +1,2 @@
 sox-12.17.9.tar.gz
+sox-12.18.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Dec 2005 13:44:05 -0000	1.9
+++ sources	24 Jul 2006 17:36:44 -0000	1.10
@@ -1 +1 @@
-a463ef9ff2ec00007a3a42ced9572b03  sox-12.17.9.tar.gz
+b12507493d3c8571fa8b6e70a01d5438  sox-12.18.1.tar.gz


Index: sox.spec
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sox.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sox.spec	12 Jul 2006 08:16:33 -0000	1.25
+++ sox.spec	24 Jul 2006 17:36:44 -0000	1.26
@@ -1,10 +1,11 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
-Version: 12.17.9
-Release: 1.2.1
+Version: 12.18.1
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
+Patch1: sox-12.18.1-multilib.patch
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q 
+%patch1 -p1 -b .multilib
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-gsm --includedir=%{_includedir}/sox
@@ -66,6 +68,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 24 2006 Thomas Woerner <twoerner at redhat.com> 12.18.1-1
+- new version 12.18.1
+- fixed multilib devel conflict in libst-config (#192751)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:42:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:42:15 -0400
Subject: rpms/struts/devel struts.spec,1.35,1.36
Message-ID: <200607241742.k6OHgFkI007554@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7437

Modified Files:
	struts.spec 
Log Message:

Add debug flag to trace issue happening only on brew.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- struts.spec	24 Jul 2006 15:15:57 -0000	1.35
+++ struts.spec	24 Jul 2006 17:42:13 -0000	1.36
@@ -117,7 +117,7 @@
 # build struts
 # The new xalan needs xalan-j2-serializer
 export CLASSPATH=`build-classpath xalan-j2-serializer`
-ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
+ant -d -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
 	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:44:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:44:04 -0400
Subject: rpms/samba/FC-5 samba-3.0.23a-samr_alias.patch, NONE, 1.1 .cvsignore,
	1.28, 1.29 samba.spec, 1.64, 1.65 sources, 1.31, 1.32
Message-ID: <200607241744.k6OHi4xm008355@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8295

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.0.23a-samr_alias.patch 
Log Message:
3.0.23a


samba-3.0.23a-samr_alias.patch:
 srv_samr_nt.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.23a-samr_alias.patch ---
diff -urN --exclude-from=/home/drizzt/jerry/tmp/diff.excludes samba-3.0.23a/source/rpc_server/srv_samr_nt.c samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c
--- samba-3.0.23a/source/rpc_server/srv_samr_nt.c	2006-07-21 11:22:56.000000000 -0500
+++ samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c	2006-07-24 06:50:15.000000000 -0500
@@ -3758,7 +3758,9 @@
 
 	DEBUG(10, ("sid is %s\n", sid_string_static(&alias_sid)));
 
+	become_root();
 	status = pdb_enum_aliasmem(&alias_sid, &sids, &num_sids);
+	unbecome_root();
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -4589,7 +4591,11 @@
 
 	/* get the current group information */
 
-	if ( !pdb_get_aliasinfo( &group_sid, &info ) ) {
+	become_root();
+	ret = pdb_get_aliasinfo( &group_sid, &info );
+	unbecome_root();
+
+	if ( !ret ) {
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Jul 2006 18:57:09 -0000	1.28
+++ .cvsignore	24 Jul 2006 17:44:02 -0000	1.29
@@ -1 +1,2 @@
 samba-3.0.23.tar.gz
+samba-3.0.23a.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- samba.spec	12 Jul 2006 19:43:21 -0000	1.64
+++ samba.spec	24 Jul 2006 17:44:02 -0000	1.65
@@ -2,7 +2,7 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.23
+Version: 3.0.23a
 Release: 1.fc5
 Epoch: 0
 License: GNU GPL Version 2
@@ -28,7 +28,7 @@
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-# (none at the moment)
+Patch1: samba-3.0.23a-samr_alias.patch
 
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
@@ -110,7 +110,7 @@
 cp %{SOURCE8} packaging/Fedora/winbind.init
 
 # Upstream patches
-#(none)
+%patch1 -p1
 
 # generic patches
 %patch101 -p1 -b .smbw
@@ -446,6 +446,10 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc5
+- Upgrade to new upstream 3.0.23a
+- include upstream samr_alias patch
+
 * Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc5
 - Upgrade to 3.0.23 to close
   bz#197836 CVE-2006-3403 Samba denial of service


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	12 Jul 2006 18:57:09 -0000	1.31
+++ sources	24 Jul 2006 17:44:02 -0000	1.32
@@ -1 +1 @@
-f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz
+e48f196fa51c22ff67463680ce95a58d  samba-3.0.23a.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:46:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:46:09 -0400
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.50,1.51
Message-ID: <200607241746.k6OHk9cx013409@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeartwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12545

Modified Files:
	kdeartwork.spec 
Log Message:
- prerelease of 3.5.4 (from the first-cut tag)



Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdeartwork.spec	24 Jul 2006 15:05:50 -0000	1.50
+++ kdeartwork.spec	24 Jul 2006 17:46:06 -0000	1.51
@@ -24,7 +24,7 @@
 Patch1: kde-libtool.patch
 
 BuildRequires: perl
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: arts-devel
 BuildRequires: autoconf
 BuildRequires: automake



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:47:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:47:51 -0400
Subject: rpms/kernel/devel linux-2.6-pifutex-crash.patch, NONE,
	1.1 kernel-2.6.spec, 1.2440, 1.2441
Message-ID: <200607241747.k6OHlpdm024566@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24368

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-pifutex-crash.patch 
Log Message:
fix PI futex exit crash

linux-2.6-pifutex-crash.patch:
 futex.c |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-pifutex-crash.patch ---

Subject: pi-futex: robust-futex exit crash fix
From: Ingo Molnar <mingo at elte.hu>

fix pi_state->list handling bugs: list handling mishap, locking error. 
Plus add more debug checks and fix a few style issues i noticed while 
debugging this.

(reported by Ulrich Drepper and Jakub Jelinek.)

Signed-off-by: Ingo Molnar <mingo at elte.hu>
---
 kernel/futex.c |   32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

Index: linux/kernel/futex.c
===================================================================
--- linux.orig/kernel/futex.c
+++ linux/kernel/futex.c
@@ -415,15 +415,15 @@ out_unlock:
  */
 void exit_pi_state_list(struct task_struct *curr)
 {
-	struct futex_hash_bucket *hb;
 	struct list_head *next, *head = &curr->pi_state_list;
 	struct futex_pi_state *pi_state;
+	struct futex_hash_bucket *hb;
 	union futex_key key;
 
 	/*
 	 * We are a ZOMBIE and nobody can enqueue itself on
 	 * pi_state_list anymore, but we have to be careful
-	 * versus waiters unqueueing themselfs
+	 * versus waiters unqueueing themselves:
 	 */
 	spin_lock_irq(&curr->pi_lock);
 	while (!list_empty(head)) {
@@ -431,21 +431,24 @@ void exit_pi_state_list(struct task_stru
 		next = head->next;
 		pi_state = list_entry(next, struct futex_pi_state, list);
 		key = pi_state->key;
+		hb = hash_futex(&key);
 		spin_unlock_irq(&curr->pi_lock);
 
-		hb = hash_futex(&key);
 		spin_lock(&hb->lock);
 
 		spin_lock_irq(&curr->pi_lock);
+		/*
+		 * We dropped the pi-lock, so re-check whether this
+		 * task still owns the PI-state:
+		 */
 		if (head->next != next) {
 			spin_unlock(&hb->lock);
 			continue;
 		}
 
-		list_del_init(&pi_state->list);
-
 		WARN_ON(pi_state->owner != curr);
-
+		WARN_ON(list_empty(&pi_state->list));
+		list_del_init(&pi_state->list);
 		pi_state->owner = NULL;
 		spin_unlock_irq(&curr->pi_lock);
 
@@ -470,7 +473,7 @@ lookup_pi_state(u32 uval, struct futex_h
 	head = &hb->chain;
 
 	list_for_each_entry_safe(this, next, head, list) {
-		if (match_futex (&this->key, &me->key)) {
+		if (match_futex(&this->key, &me->key)) {
 			/*
 			 * Another waiter already exists - bump up
 			 * the refcount and return its pi_state:
@@ -482,6 +485,8 @@ lookup_pi_state(u32 uval, struct futex_h
 			if (unlikely(!pi_state))
 				return -EINVAL;
 
+			WARN_ON(!atomic_read(&pi_state->refcount));
+
 			atomic_inc(&pi_state->refcount);
 			me->pi_state = pi_state;
 
@@ -510,6 +515,7 @@ lookup_pi_state(u32 uval, struct futex_h
 	pi_state->key = me->key;
 
 	spin_lock_irq(&p->pi_lock);
+	WARN_ON(!list_empty(&pi_state->list));
 	list_add(&pi_state->list, &p->pi_state_list);
 	pi_state->owner = p;
 	spin_unlock_irq(&p->pi_lock);
@@ -584,9 +590,17 @@ static int wake_futex_pi(u32 __user *uad
 	if (curval != uval)
 		return -EINVAL;
 
-	list_del_init(&pi_state->owner->pi_state_list);
+	spin_lock_irq(&pi_state->owner->pi_lock);
+	WARN_ON(list_empty(&pi_state->list));
+	list_del_init(&pi_state->list);
+	spin_unlock_irq(&pi_state->owner->pi_lock);
+
+	spin_lock_irq(&new_owner->pi_lock);
+	WARN_ON(!list_empty(&pi_state->list));
 	list_add(&pi_state->list, &new_owner->pi_state_list);
 	pi_state->owner = new_owner;
+	spin_unlock_irq(&new_owner->pi_lock);
+
 	rt_mutex_unlock(&pi_state->pi_mutex);
 
 	return 0;
@@ -1236,6 +1250,7 @@ static int do_futex_lock_pi(u32 __user *
 		/* Owner died? */
 		if (q.pi_state->owner != NULL) {
 			spin_lock_irq(&q.pi_state->owner->pi_lock);
+			WARN_ON(list_empty(&q.pi_state->list));
 			list_del_init(&q.pi_state->list);
 			spin_unlock_irq(&q.pi_state->owner->pi_lock);
 		} else
@@ -1244,6 +1259,7 @@ static int do_futex_lock_pi(u32 __user *
 		q.pi_state->owner = current;
 
 		spin_lock_irq(&current->pi_lock);
+		WARN_ON(!list_empty(&q.pi_state->list));
 		list_add(&q.pi_state->list, &current->pi_state_list);
 		spin_unlock_irq(&current->pi_lock);
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2440
retrieving revision 1.2441
diff -u -r1.2440 -r1.2441
--- kernel-2.6.spec	24 Jul 2006 15:50:12 -0000	1.2440
+++ kernel-2.6.spec	24 Jul 2006 17:47:49 -0000	1.2441
@@ -395,6 +395,7 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
+Patch1650: linux-2.6-pifutex-crash.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
@@ -919,6 +920,8 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
+# Fix PI Futex crash
+%patch1650 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.
@@ -1631,6 +1634,7 @@
 %changelog
 * Mon Jul 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc2-git2
+- Fix PI Futex exit crash.
 
 * Mon Jul 24 2006 Jon Masters <jcm at redhat.com>
 - Change kabideps location.



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:48:06 -0400
Subject: rpms/xorg-x11-drv-nv/devel nv.xinf, 1.4, 1.5 xorg-x11-drv-nv.spec,
	1.24, 1.25
Message-ID: <200607241748.k6OHm6lP024705@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24674

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc6
- Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
  says aren't video cards, and comments galore.



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nv.xinf	10 Jun 2006 08:01:50 -0000	1.4
+++ nv.xinf	24 Jul 2006 17:48:02 -0000	1.5
@@ -1,222 +1,272 @@
-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: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
-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: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
-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
-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: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
-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:v000010DEd00000184sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv
-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
-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
-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: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
-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: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
-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: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
-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
+# Secret decoder ring:
+# nv3-6:    Riva and TNT
+# nv10:	    GeForce, GeForce 2, GeForce 4MX
+# nv20:	    GeForce 3Ti and 4Ti
+# nv30:	    GeForce FX
+# nv40:	    GeForce 6
+# g70:	    GeForce 7
+#
+# GL suffix tends to mean Quadro workstation card
+# M suffix tends to mean laptop/mobility chip
+#
+# Entries without a chip series number should get fixed.
+
+# Diamond (Misbadged Viper series, I guess)
+# This is wildly inaccurate, the driver won't recognize these, but I assume
+# they were added for a reason so bring on the bug reports.
+alias pcivideo:v00001092d00000550sv*sd*bc*sc*i* nv # Viper V550
+alias pcivideo:v00001092d00001092sv*sd*bc*sc*i* nv # Viper V330
+
+# nVidia
+alias pcivideo:v000010DEd00000020sv*sd*bc*sc*i* nv # nv4
+alias pcivideo:v000010DEd00000028sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd00000029sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Asv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Bsv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Csv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd0000002Dsv*sd*bc*sc*i* nv # nv5m64
+alias pcivideo:v000010DEd0000002Esv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd0000002Fsv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd00000040sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000041sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000042sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000044sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000046sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000047sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000048sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv # nv40 GL
+alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000004Esv*sd*bc*sc*i* nv # nv40 GL
+alias pcivideo:v000010DEd00000090sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000091sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000092sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000093sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000094sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000095sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000098sv*sd*bc*sc*i* nv # g70 M
+alias pcivideo:v000010DEd00000099sv*sd*bc*sc*i* nv # g70 M
+alias pcivideo:v000010DEd0000009Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000009Dsv*sd*bc*sc*i* nv # g70 GL
+alias pcivideo:v000010DEd0000009Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000000A0sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd000000C0sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C1sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C2sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C3sv*sd*bc*sc*i* nv # nv42
+alias pcivideo:v000010DEd000000C8sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C9sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CCsv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CDsv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CEsv*sd*bc*sc*i* nv # nv41 GL
+alias pcivideo:v000010DEd000000F0sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd000000F1sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F2sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F3sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F4sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F5sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd000000F6sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F8sv*sd*bc*sc*i* nv # nv45 GL
+alias pcivideo:v000010DEd000000F9sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd000000FAsv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd000000FBsv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd000000FCsv*sd*bc*sc*i* nv # nv37 GL
+alias pcivideo:v000010DEd000000FDsv*sd*bc*sc*i* nv # nv37 GL
+alias pcivideo:v000010DEd000000FEsv*sd*bc*sc*i* nv # nv38 GL
+alias pcivideo:v000010DEd000000FFsv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000100sv*sd*bc*sc*i* nv # nv10
+alias pcivideo:v000010DEd00000101sv*sd*bc*sc*i* nv # nv10
+alias pcivideo:v000010DEd00000103sv*sd*bc*sc*i* nv # nv10 GL
+alias pcivideo:v000010DEd00000110sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000111sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000112sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000113sv*sd*bc*sc*i* nv # nv11 GL
+alias pcivideo:v000010DEd00000140sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000141sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000142sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000143sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000144sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000145sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000146sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000147sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000148sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000149sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd0000014Asv*sd*bc*sc*i* nv # Quadro NVS 440
+alias pcivideo:v000010DEd0000014Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000014Csv*sd*bc*sc*i* nv # Quadro FX 550
+alias pcivideo:v000010DEd0000014Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000014Esv*sd*bc*sc*i* nv # nv43 GL
+alias pcivideo:v000010DEd0000014Fsv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000150sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000151sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000152sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000153sv*sd*bc*sc*i* nv # nv15 GL
+alias pcivideo:v000010DEd00000160sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000161sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000162sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000163sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000164sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000165sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000166sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000167sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000168sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000169sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000170sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000171sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000172sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000173sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000174sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000175sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000176sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000177sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000178sv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd00000179sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd0000017Asv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Bsv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Csv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Dsv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000181sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000182sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000183sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000184sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd00000188sv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd00000189sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000018Asv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Bsv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd000001D1sv*sd*bc*sc*i* nv # GeForce 7300 LE
+alias pcivideo:v000010DEd000001D6sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001D7sv*sd*bc*sc*i* nv # GeForce Go 7300
+alias pcivideo:v000010DEd000001D8sv*sd*bc*sc*i* nv # GeForce Go 7400
+alias pcivideo:v000010DEd000001DAsv*sd*bc*sc*i* nv # Quadro NVS 110M
+alias pcivideo:v000010DEd000001DBsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001DCsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001DEsv*sd*bc*sc*i* nv # Quadro FX 350
+alias pcivideo:v000010DEd000001DFsv*sd*bc*sc*i* nv # GeForce 7300 GS
+alias pcivideo:v000010DEd000001F0sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000200sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000201sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000202sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000203sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000210sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000212sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000215sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000218sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000220sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000221sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000222sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000228sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000240sv*sd*bc*sc*i* nv # C51
+#alias pcivideo:v000010DEd00000241sv*sd*bc*sc*i* nv # XXX pcie bridge?
+alias pcivideo:v000010DEd00000242sv*sd*bc*sc*i* nv # C51
+#alias pcivideo:v000010DEd00000244sv*sd*bc*sc*i* nv # XXX pcie bridge?
+#alias pcivideo:v000010DEd00000247sv*sd*bc*sc*i* nv # XXX pcie bridge?
+alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000252sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000253sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000258sv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd00000259sv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd0000025Bsv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd00000280sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000281sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000282sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000286sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000288sv*sd*bc*sc*i* nv # nv28 GL
+alias pcivideo:v000010DEd00000289sv*sd*bc*sc*i* nv # nv28 GL
+alias pcivideo:v000010DEd0000028Csv*sd*bc*sc*i* nv # nv28 GL M
+alias pcivideo:v000010DEd00000290sv*sd*bc*sc*i* nv # GeForce 7900 GTX
+alias pcivideo:v000010DEd00000291sv*sd*bc*sc*i* nv # GeForce 7900 GT
+alias pcivideo:v000010DEd00000298sv*sd*bc*sc*i* nv # GeForce Go 7900 GS
+alias pcivideo:v000010DEd00000299sv*sd*bc*sc*i* nv # GeForce Go 7900 GTX
+alias pcivideo:v000010DEd0000029Asv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Bsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Csv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Dsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Esv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Fsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd00000300sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000301sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000302sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000308sv*sd*bc*sc*i* nv # nv30 GL
+alias pcivideo:v000010DEd00000309sv*sd*bc*sc*i* nv # nv30 GL
+alias pcivideo:v000010DEd00000311sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000312sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000313sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000314sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000316sv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd00000317sv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Asv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Bsv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Csv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Dsv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Esv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Fsv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd00000320sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000321sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000322sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000323sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000324sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000325sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000326sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000327sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000328sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000329sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd0000032Asv*sd*bc*sc*i* nv # nv34 GL
+alias pcivideo:v000010DEd0000032Bsv*sd*bc*sc*i* nv # nv34 GL
+alias pcivideo:v000010DEd0000032Csv*sd*bc*sc*i* nv # nv34 GL M
+alias pcivideo:v000010DEd0000032Dsv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd0000032Fsv*sd*bc*sc*i* nv # nv4 GL
+alias pcivideo:v000010DEd00000330sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000331sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000332sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000333sv*sd*bc*sc*i* nv # nv38
+alias pcivideo:v000010DEd00000334sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000338sv*sd*bc*sc*i* nv # nv35 GL
+alias pcivideo:v000010DEd0000033Fsv*sd*bc*sc*i* nv # nv35 GL
+alias pcivideo:v000010DEd00000341sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000342sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000343sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000344sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000345sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000347sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000348sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000349sv*sd*bc*sc*i* nv # nv36 M
+alias pcivideo:v000010DEd0000034Bsv*sd*bc*sc*i* nv # nv36 M
+alias pcivideo:v000010DEd0000034Csv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd0000034Esv*sd*bc*sc*i* nv # nv36 GL
+alias pcivideo:v000010DEd0000034Fsv*sd*bc*sc*i* nv # nv36 GL
+alias pcivideo:v000010DEd00000391sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000392sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000398sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000399sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Asv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # Quadro FX 560
+alias pcivideo:v000010DEd000003D0sv*sd*bc*sc*i* nv # GF 6100 nForce 430
+alias pcivideo:v000010DEd000003D1sv*sd*bc*sc*i* nv # GF 6100 nForce 405
+alias pcivideo:v000010DEd000003D2sv*sd*bc*sc*i* nv # GF 6100 nForce 400
+
+# SGS Thompson joint venture
+# This is a bit inaccurate - the driver only knows about 12d2:0018 -
+# but I'd rather get bug reports if these cards are actually in the field.
+alias pcivideo:v000012D2d00000018sv*sd*bc*sc*i* nv # Riva 128
+alias pcivideo:v000012D2d00000019sv*sd*bc*sc*i* nv # Riva 128 ZX
+alias pcivideo:v000012D2d00000020sv*sd*bc*sc*i* nv # TNT
+alias pcivideo:v000012D2d00000028sv*sd*bc*sc*i* nv # TNT2
+alias pcivideo:v000012D2d00000029sv*sd*bc*sc*i* nv # UTNT2
+alias pcivideo:v000012D2d0000002Csv*sd*bc*sc*i* nv # VTNT2
+alias pcivideo:v000012D2d000000A0sv*sd*bc*sc*i* nv # ITNT2


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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-nv.spec	12 Jul 2006 09:05:21 -0000	1.24
+++ xorg-x11-drv-nv.spec	24 Jul 2006 17:48:03 -0000	1.25
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   1.1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -65,7 +65,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc6
+- Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
+  says aren't video cards, and comments galore.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.0-1.1.fc6
 - rebuild
 
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc6



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:48:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:48:40 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.119, 1.120 kudzu.spec, 1.136,
	1.137 sources, 1.133, 1.134
Message-ID: <200607241748.k6OHmeg2024949@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24913/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.39-1 on branch devel from kudzu-1.2.39-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- .cvsignore	15 Jun 2006 20:05:55 -0000	1.119
+++ .cvsignore	24 Jul 2006 17:48:37 -0000	1.120
@@ -1 +1 @@
-kudzu-1.2.38.tar.gz
+kudzu-1.2.39.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kudzu.spec	12 Jul 2006 06:43:38 -0000	1.136
+++ kudzu.spec	24 Jul 2006 17:48:37 -0000	1.137
@@ -1,6 +1,6 @@
 Name: kudzu
-Version: 1.2.38
-Release: 1.1
+Version: 1.2.39
+Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,8 +79,8 @@
 %{_includedir}/kudzu
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.38-1.1
-- rebuild
+* Mon Jul 24 2006 Jeremy Katz <katzj at redhat.com> - 1.2.39-1
+- fix probing of xenblk as a module
 
 * Thu Jun 15 2006 Jeremy Katz <katzj at redhat.com> - 1.2.38-1
 - more s390 segfault fixing


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sources	15 Jun 2006 20:05:55 -0000	1.133
+++ sources	24 Jul 2006 17:48:37 -0000	1.134
@@ -1 +1 @@
-fe6ef43a355f5b8472b2aa62f37c152b  kudzu-1.2.38.tar.gz
+5388ecf30f147ad5a0547b456e84a660  kudzu-1.2.39.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 17:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 13:59:23 -0400
Subject: rpms/libgnome/devel libgnome-2.15.1-turn-off-im-menu.patch, NONE,
	1.1 libgnome.spec, 1.61, 1.62
Message-ID: <200607241759.k6OHxNFB029114@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29043

Modified Files:
	libgnome.spec 
Added Files:
	libgnome-2.15.1-turn-off-im-menu.patch 
Log Message:
- turn off im menu by default (bug 199967)


libgnome-2.15.1-turn-off-im-menu.patch:
 desktop_gnome_interface.schemas    |    2 +-
 desktop_gnome_interface.schemas.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libgnome-2.15.1-turn-off-im-menu.patch ---
--- libgnome-2.15.1/schemas/desktop_gnome_interface.schemas.in.turn-off-im-menu	2006-07-24 13:57:24.000000000 -0400
+++ libgnome-2.15.1/schemas/desktop_gnome_interface.schemas.in	2006-07-24 13:57:36.000000000 -0400
@@ -265,7 +265,7 @@
       <applyto>/desktop/gnome/interface/show_input_method_menu</applyto>
       <owner>gnome</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
 	<short>Show the 'Input Methods' menu</short>
 	<long>Whether the context menus of entries and text views 
--- libgnome-2.15.1/schemas/desktop_gnome_interface.schemas.turn-off-im-menu	2006-07-24 13:57:17.000000000 -0400
+++ libgnome-2.15.1/schemas/desktop_gnome_interface.schemas	2006-07-24 13:57:49.000000000 -0400
@@ -7927,7 +7927,7 @@
       <applyto>/desktop/gnome/interface/show_input_method_menu</applyto>
       <owner>gnome</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
 	<short>Show the 'Input Methods' menu</short>
 	<long>Whether the context menus of entries and text views 


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- libgnome.spec	12 Jul 2006 20:20:38 -0000	1.61
+++ libgnome.spec	24 Jul 2006 17:59:21 -0000	1.62
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.15.1
-Release: 1
+Release: 2
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -49,6 +49,7 @@
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch
 Patch6: libgnome-2.15.1-stat-homedir.patch
+Patch7: libgnome-2.15.1-turn-off-im-menu.patch
 
 # Added to avoid the warning messages about utmp group, bug #24171
 # fixme, just libzvt?
@@ -100,6 +101,7 @@
 %patch4 -p1 -b .default-cursor
 %patch5 -p1 -b .default-browser
 %patch6 -p1 -b .stat-homedir
+%patch7 -p1 -b .turn-off-im-menu
 
 %build
 %configure --disable-gtk-doc
@@ -158,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.1-2
+- turn off im menu by default (bug 199967)
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
 - Update to 2.15.1
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:02:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:02:18 -0400
Subject: rpms/xorg-x11-drv-nv/FC-5 nv.xinf, 1.4, 1.5 xorg-x11-drv-nv.spec,
	1.13, 1.14
Message-ID: <200607241802.k6OI2IlV029617@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv29584

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc5
- Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
  says aren't video cards, and comments galore. (#186652)



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/nv.xinf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nv.xinf	10 Jun 2006 09:25:24 -0000	1.4
+++ nv.xinf	24 Jul 2006 18:02:15 -0000	1.5
@@ -1,222 +1,272 @@
-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: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
-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: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
-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
-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: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
-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:v000010DEd00000184sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
-alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv
-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
-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
-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: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
-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: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
-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: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
-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
+# Secret decoder ring:
+# nv3-6:    Riva and TNT
+# nv10:	    GeForce, GeForce 2, GeForce 4MX
+# nv20:	    GeForce 3Ti and 4Ti
+# nv30:	    GeForce FX
+# nv40:	    GeForce 6
+# g70:	    GeForce 7
+#
+# GL suffix tends to mean Quadro workstation card
+# M suffix tends to mean laptop/mobility chip
+#
+# Entries without a chip series number should get fixed.
+
+# Diamond (Misbadged Viper series, I guess)
+# This is wildly inaccurate, the driver won't recognize these, but I assume
+# they were added for a reason so bring on the bug reports.
+alias pcivideo:v00001092d00000550sv*sd*bc*sc*i* nv # Viper V550
+alias pcivideo:v00001092d00001092sv*sd*bc*sc*i* nv # Viper V330
+
+# nVidia
+alias pcivideo:v000010DEd00000020sv*sd*bc*sc*i* nv # nv4
+alias pcivideo:v000010DEd00000028sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd00000029sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Asv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Bsv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd0000002Csv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd0000002Dsv*sd*bc*sc*i* nv # nv5m64
+alias pcivideo:v000010DEd0000002Esv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd0000002Fsv*sd*bc*sc*i* nv # nv6
+alias pcivideo:v000010DEd00000040sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000041sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000042sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000044sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000046sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000047sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000048sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv # nv40 GL
+alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000004Esv*sd*bc*sc*i* nv # nv40 GL
+alias pcivideo:v000010DEd00000090sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000091sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000092sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000093sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000094sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000095sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000098sv*sd*bc*sc*i* nv # g70 M
+alias pcivideo:v000010DEd00000099sv*sd*bc*sc*i* nv # g70 M
+alias pcivideo:v000010DEd0000009Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000009Dsv*sd*bc*sc*i* nv # g70 GL
+alias pcivideo:v000010DEd0000009Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000000A0sv*sd*bc*sc*i* nv # nv5
+alias pcivideo:v000010DEd000000C0sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C1sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C2sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C3sv*sd*bc*sc*i* nv # nv42
+alias pcivideo:v000010DEd000000C8sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000C9sv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CCsv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CDsv*sd*bc*sc*i* nv # nv41
+alias pcivideo:v000010DEd000000CEsv*sd*bc*sc*i* nv # nv41 GL
+alias pcivideo:v000010DEd000000F0sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd000000F1sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F2sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F3sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F4sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F5sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd000000F6sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd000000F8sv*sd*bc*sc*i* nv # nv45 GL
+alias pcivideo:v000010DEd000000F9sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd000000FAsv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd000000FBsv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd000000FCsv*sd*bc*sc*i* nv # nv37 GL
+alias pcivideo:v000010DEd000000FDsv*sd*bc*sc*i* nv # nv37 GL
+alias pcivideo:v000010DEd000000FEsv*sd*bc*sc*i* nv # nv38 GL
+alias pcivideo:v000010DEd000000FFsv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000100sv*sd*bc*sc*i* nv # nv10
+alias pcivideo:v000010DEd00000101sv*sd*bc*sc*i* nv # nv10
+alias pcivideo:v000010DEd00000103sv*sd*bc*sc*i* nv # nv10 GL
+alias pcivideo:v000010DEd00000110sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000111sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000112sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd00000113sv*sd*bc*sc*i* nv # nv11 GL
+alias pcivideo:v000010DEd00000140sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000141sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000142sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000143sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000144sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000145sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000146sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000147sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000148sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000149sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd0000014Asv*sd*bc*sc*i* nv # Quadro NVS 440
+alias pcivideo:v000010DEd0000014Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000014Csv*sd*bc*sc*i* nv # Quadro FX 550
+alias pcivideo:v000010DEd0000014Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000014Esv*sd*bc*sc*i* nv # nv43 GL
+alias pcivideo:v000010DEd0000014Fsv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000150sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000151sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000152sv*sd*bc*sc*i* nv # nv15
+alias pcivideo:v000010DEd00000153sv*sd*bc*sc*i* nv # nv15 GL
+alias pcivideo:v000010DEd00000160sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000161sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000162sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000163sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000164sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000165sv*sd*bc*sc*i* nv # nv44
+alias pcivideo:v000010DEd00000166sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000167sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000168sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000169sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000016Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000170sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000171sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000172sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000173sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000174sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000175sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000176sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000177sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000178sv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd00000179sv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd0000017Asv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Bsv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Csv*sd*bc*sc*i* nv # nv17 GL
+alias pcivideo:v000010DEd0000017Dsv*sd*bc*sc*i* nv # nv17
+alias pcivideo:v000010DEd00000181sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000182sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000183sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000184sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd00000188sv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd00000189sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000018Asv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Bsv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv # nv18 GL
+alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv # nv18 M
+alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv # nv11
+alias pcivideo:v000010DEd000001D1sv*sd*bc*sc*i* nv # GeForce 7300 LE
+alias pcivideo:v000010DEd000001D6sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001D7sv*sd*bc*sc*i* nv # GeForce Go 7300
+alias pcivideo:v000010DEd000001D8sv*sd*bc*sc*i* nv # GeForce Go 7400
+alias pcivideo:v000010DEd000001DAsv*sd*bc*sc*i* nv # Quadro NVS 110M
+alias pcivideo:v000010DEd000001DBsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001DCsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd000001DEsv*sd*bc*sc*i* nv # Quadro FX 350
+alias pcivideo:v000010DEd000001DFsv*sd*bc*sc*i* nv # GeForce 7300 GS
+alias pcivideo:v000010DEd000001F0sv*sd*bc*sc*i* nv # nv18
+alias pcivideo:v000010DEd00000200sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000201sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000202sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000203sv*sd*bc*sc*i* nv # nv20
+alias pcivideo:v000010DEd00000210sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000212sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000215sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd00000218sv*sd*bc*sc*i* nv # nv40
+alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000220sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000221sv*sd*bc*sc*i* nv # nv43
+alias pcivideo:v000010DEd00000222sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000228sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd00000240sv*sd*bc*sc*i* nv # C51
+#alias pcivideo:v000010DEd00000241sv*sd*bc*sc*i* nv # XXX pcie bridge?
+alias pcivideo:v000010DEd00000242sv*sd*bc*sc*i* nv # C51
+#alias pcivideo:v000010DEd00000244sv*sd*bc*sc*i* nv # XXX pcie bridge?
+#alias pcivideo:v000010DEd00000247sv*sd*bc*sc*i* nv # XXX pcie bridge?
+alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000252sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000253sv*sd*bc*sc*i* nv # nv25
+alias pcivideo:v000010DEd00000258sv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd00000259sv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd0000025Bsv*sd*bc*sc*i* nv # nv25 GL
+alias pcivideo:v000010DEd00000280sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000281sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000282sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000286sv*sd*bc*sc*i* nv # nv28
+alias pcivideo:v000010DEd00000288sv*sd*bc*sc*i* nv # nv28 GL
+alias pcivideo:v000010DEd00000289sv*sd*bc*sc*i* nv # nv28 GL
+alias pcivideo:v000010DEd0000028Csv*sd*bc*sc*i* nv # nv28 GL M
+alias pcivideo:v000010DEd00000290sv*sd*bc*sc*i* nv # GeForce 7900 GTX
+alias pcivideo:v000010DEd00000291sv*sd*bc*sc*i* nv # GeForce 7900 GT
+alias pcivideo:v000010DEd00000298sv*sd*bc*sc*i* nv # GeForce Go 7900 GS
+alias pcivideo:v000010DEd00000299sv*sd*bc*sc*i* nv # GeForce Go 7900 GTX
+alias pcivideo:v000010DEd0000029Asv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Bsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Csv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Dsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Esv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd0000029Fsv*sd*bc*sc*i* nv # g71
+alias pcivideo:v000010DEd00000300sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000301sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000302sv*sd*bc*sc*i* nv # nv30
+alias pcivideo:v000010DEd00000308sv*sd*bc*sc*i* nv # nv30 GL
+alias pcivideo:v000010DEd00000309sv*sd*bc*sc*i* nv # nv30 GL
+alias pcivideo:v000010DEd00000311sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000312sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000313sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000314sv*sd*bc*sc*i* nv # nv31
+alias pcivideo:v000010DEd00000316sv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd00000317sv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Asv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Bsv*sd*bc*sc*i* nv # nv31 M
+alias pcivideo:v000010DEd0000031Csv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Dsv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Esv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd0000031Fsv*sd*bc*sc*i* nv # nv31 GL M
+alias pcivideo:v000010DEd00000320sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000321sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000322sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000323sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000324sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000325sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000326sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000327sv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd00000328sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd00000329sv*sd*bc*sc*i* nv # nv34 M
+alias pcivideo:v000010DEd0000032Asv*sd*bc*sc*i* nv # nv34 GL
+alias pcivideo:v000010DEd0000032Bsv*sd*bc*sc*i* nv # nv34 GL
+alias pcivideo:v000010DEd0000032Csv*sd*bc*sc*i* nv # nv34 GL M
+alias pcivideo:v000010DEd0000032Dsv*sd*bc*sc*i* nv # nv34
+alias pcivideo:v000010DEd0000032Fsv*sd*bc*sc*i* nv # nv4 GL
+alias pcivideo:v000010DEd00000330sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000331sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000332sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000333sv*sd*bc*sc*i* nv # nv38
+alias pcivideo:v000010DEd00000334sv*sd*bc*sc*i* nv # nv35
+alias pcivideo:v000010DEd00000338sv*sd*bc*sc*i* nv # nv35 GL
+alias pcivideo:v000010DEd0000033Fsv*sd*bc*sc*i* nv # nv35 GL
+alias pcivideo:v000010DEd00000341sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000342sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000343sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000344sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000345sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000347sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000348sv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd00000349sv*sd*bc*sc*i* nv # nv36 M
+alias pcivideo:v000010DEd0000034Bsv*sd*bc*sc*i* nv # nv36 M
+alias pcivideo:v000010DEd0000034Csv*sd*bc*sc*i* nv # nv36
+alias pcivideo:v000010DEd0000034Esv*sd*bc*sc*i* nv # nv36 GL
+alias pcivideo:v000010DEd0000034Fsv*sd*bc*sc*i* nv # nv36 GL
+alias pcivideo:v000010DEd00000391sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000392sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000398sv*sd*bc*sc*i* nv # g70
+alias pcivideo:v000010DEd00000399sv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Asv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # XXX not in pci.ids
+alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # Quadro FX 560
+alias pcivideo:v000010DEd000003D0sv*sd*bc*sc*i* nv # GF 6100 nForce 430
+alias pcivideo:v000010DEd000003D1sv*sd*bc*sc*i* nv # GF 6100 nForce 405
+alias pcivideo:v000010DEd000003D2sv*sd*bc*sc*i* nv # GF 6100 nForce 400
+
+# SGS Thompson joint venture
+# This is a bit inaccurate - the driver only knows about 12d2:0018 -
+# but I'd rather get bug reports if these cards are actually in the field.
+alias pcivideo:v000012D2d00000018sv*sd*bc*sc*i* nv # Riva 128
+alias pcivideo:v000012D2d00000019sv*sd*bc*sc*i* nv # Riva 128 ZX
+alias pcivideo:v000012D2d00000020sv*sd*bc*sc*i* nv # TNT
+alias pcivideo:v000012D2d00000028sv*sd*bc*sc*i* nv # TNT2
+alias pcivideo:v000012D2d00000029sv*sd*bc*sc*i* nv # UTNT2
+alias pcivideo:v000012D2d0000002Csv*sd*bc*sc*i* nv # VTNT2
+alias pcivideo:v000012D2d000000A0sv*sd*bc*sc*i* nv # ITNT2


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/xorg-x11-drv-nv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-nv.spec	7 Jul 2006 23:03:01 -0000	1.13
+++ xorg-x11-drv-nv.spec	24 Jul 2006 18:02:16 -0000	1.14
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 Source0:   http://www.x.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -59,6 +59,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc5
+- Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
+  says aren't video cards, and comments galore. (#186652)
+
 * Fri Jul  7 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-1.fc5
 - Update to 1.2.0 release.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:08:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:08:34 -0400
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog-pegs-cpu.patch, NONE,
	1.1 .cvsignore, 1.7, 1.8 krb5-auth-dialog.spec, 1.22,
	1.23 sources, 1.7, 1.8
Message-ID: <200607241808.k6OI8YJc030698@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30666

Modified Files:
	.cvsignore krb5-auth-dialog.spec sources 
Added Files:
	krb5-auth-dialog-pegs-cpu.patch 
Log Message:
* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 0.7-1
- Update to 0.7
- Don't peg the network and CPU when the KDC is unavailable


krb5-auth-dialog-pegs-cpu.patch:
 krb5-auth-dialog.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE krb5-auth-dialog-pegs-cpu.patch ---
Index: src/krb5-auth-dialog.c
===================================================================
RCS file: /cvs/gnome/krb5-auth-dialog/src/krb5-auth-dialog.c,v
retrieving revision 1.27
diff -u -d -p -U10 -r1.27 krb5-auth-dialog.c
--- src/krb5-auth-dialog.c	18 Mar 2006 00:21:08 -0000	1.27
+++ src/krb5-auth-dialog.c	24 Jul 2006 14:52:49 -0000
@@ -277,20 +277,21 @@ auth_dialog_prompter (krb5_context ctx,
 				password = gtk_entry_get_text (GTK_ENTRY (entry));
 				password_len = strlen (password);
 				errcode = 0;
 				break;
 			case GTK_RESPONSE_CANCEL:
 				canceled = TRUE;
 				break;
 			case GTK_RESPONSE_DELETE_EVENT:
 				break;
 			default:
+				g_warning ("Unknown Response: %d", response);
 				g_assert_not_reached ();
 		}
 
 		g_source_remove (source_id);
 
 		prompts[i].reply->data = (char *) password;
 		prompts[i].reply->length = password_len;
 	}
 
 	/* Reset this, so we know the next time we get a TRUE value, it is accurate. */
@@ -368,21 +369,25 @@ credentials_expiring (gpointer *data)
 	gboolean give_up;
 	gboolean renewable;
 
 	if (credentials_expiring_real (&renewable) && is_online) {
 		give_up = canceled && (creds_expiry == canceled_creds_expiry);
 		if (!give_up) {
 			do {
 				retval = grab_credentials (renewable);
 				give_up = canceled &&
 					  (creds_expiry == canceled_creds_expiry);
-			} while ((retval != 0) && !give_up);
+			} while ((retval != 0) && 
+			         (retval != KRB5_REALM_CANT_RESOLVE) &&
+			         (retval != KRB5_KDC_UNREACH) &&
+				 invalid_password &&
+			         !give_up);
 		}
 	}
 
 	return TRUE;
 }
 
 static void
 set_options_using_creds(krb5_context context,
 			krb5_creds *creds,
 			krb5_get_init_creds_opt *opts)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	13 Feb 2006 07:16:55 -0000	1.7
+++ .cvsignore	24 Jul 2006 18:08:31 -0000	1.8
@@ -1,6 +1 @@
-krb5-auth-dialog-0.2.tar.gz
-krb5-auth-dialog-0.3.tar.gz
-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
+krb5-auth-dialog-0.7.tar.bz2


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- krb5-auth-dialog.spec	19 Jul 2006 19:19:24 -0000	1.22
+++ krb5-auth-dialog.spec	24 Jul 2006 18:08:32 -0000	1.23
@@ -5,8 +5,8 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.6.cvs20060212
-Release: 4 
+Version: 0.7
+Release: 1
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -52,6 +52,10 @@
 
 
 %changelog
+* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 0.7-1
+- Update to 0.7
+- Don't peg the network and CPU when the KDC is unavailable
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.6.cvs20060212-4
 - rebuild for dbus 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Feb 2006 07:16:55 -0000	1.7
+++ sources	24 Jul 2006 18:08:32 -0000	1.8
@@ -1 +1 @@
-d61e435a3ff8a6c1fbfc58ce22886c73  krb5-auth-dialog-0.6.cvs20060212.tar.bz2
+0c37b6d9d5a195ffbbf7c9dbbc6391f9  krb5-auth-dialog-0.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:09:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:09:35 -0400
Subject: rpms/ppp/devel ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch,
	NONE, 1.1 ppp-2.4.4-cbcp.patch, NONE,
	1.1 ppp-2.4.4-lib64.patch, NONE, 1.1 ppp-2.4.4-no_strip.patch,
	NONE, 1.1 .cvsignore, 1.6, 1.7 ppp.spec, 1.38, 1.39 sources,
	1.6, 1.7 ppp-2.4.2-argv.patch, 1.1,
	NONE ppp-2.4.3-dontwriteetc.patch, 1.1,
	NONE ppp-2.4.3-lib64.patch, 1.1, NONE ppp-2.4.3-no_strip.patch,
	1.1, NONE ppp-2.4.3-radiusplugin.patch, 1.1, NONE
Message-ID: <200607241809.k6OI9Z9V031009@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30918

Modified Files:
	.cvsignore ppp.spec sources 
Added Files:
	ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch 
	ppp-2.4.4-cbcp.patch ppp-2.4.4-lib64.patch 
	ppp-2.4.4-no_strip.patch 
Removed Files:
	ppp-2.4.2-argv.patch ppp-2.4.3-dontwriteetc.patch 
	ppp-2.4.3-lib64.patch ppp-2.4.3-no_strip.patch 
	ppp-2.4.3-radiusplugin.patch 
Log Message:
[tw]
- new version 2.4.4 with lots of fixes
- fixed reesolv.conf docs (#165072)
  Thanks to Matt Domsch for the initial patch 
- enabled CBCP (#199278)



ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch:
 pppd/pppd.8                                  |    2 +-
 scripts/ip-down.local.add.change_resolv_conf |    2 +-
 scripts/ip-up.local.add.change_resolv_conf   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch ---
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8
--- ppp-2.4.3.orig/pppd/pppd.8	2004-11-13 06:22:49.000000000 -0600
+++ ppp-2.4.3/pppd/pppd.8	2005-08-03 22:10:34.000000000 -0500
@@ -1035,7 +1035,7 @@ Ask the peer for up to 2 DNS server addr
 by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
 environment variables DNS1 and DNS2, and the environment variable
 USEPEERDNS will be set to 1.  In addition, pppd will create an
-/etc/ppp/resolv.conf file containing one or two nameserver lines with
+/var/run/ppp/resolv.conf file containing one or two nameserver lines with
 the address(es) supplied by the peer.
 .TP
 .B user \fIname
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf
--- ppp-2.4.3.orig/scripts/ip-down.local.add.change_resolv_conf	1999-02-26 22:32:42.000000000 -0600
+++ ppp-2.4.3/scripts/ip-down.local.add.change_resolv_conf	2005-08-03 22:11:17.000000000 -0500
@@ -10,7 +10,7 @@
 # Nick Walker (nickwalker at email.com)
 #
 
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
 	if [ -f /etc/ppp/resolv.prev ]; then
 		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
 	else
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf
--- ppp-2.4.3.orig/scripts/ip-up.local.add.change_resolv_conf	1999-11-14 21:28:10.000000000 -0600
+++ ppp-2.4.3/scripts/ip-up.local.add.change_resolv_conf	2005-08-03 22:11:29.000000000 -0500
@@ -10,15 +10,15 @@
 # Nick Walker (nickwalker at email.com)
 #
 
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
 	rm -f /etc/ppp/resolv.prev
 	if [ -f /etc/resolv.conf ]; then
 		cp /etc/resolv.conf /etc/ppp/resolv.prev
 		grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
 		grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
-		cat /etc/ppp/resolv.conf >> /etc/resolv.conf
+		cat /var/run/ppp/resolv.conf >> /etc/resolv.conf
 	else
-		cp /etc/ppp/resolv.conf /etc
+		cp /var/run/ppp/resolv.conf /etc
 	fi
 fi
 

ppp-2.4.4-cbcp.patch:
 Makefile.linux |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ppp-2.4.4-cbcp.patch ---
--- ppp-2.4.4/pppd/Makefile.linux.cbcp	2006-07-19 16:11:41.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-19 16:11:42.000000000 +0200
@@ -69,7 +69,7 @@
 PLUGIN=y
 
 # Enable Microsoft proprietary Callback Control Protocol
-#CBCP=y
+CBCP=y
 
 # Enable EAP SRP-SHA1 authentication (requires libsrp)
 #USE_SRP=y

ppp-2.4.4-lib64.patch:
 Makefile.linux                 |    3 ++-
 pathnames.h                    |    2 +-
 plugins/Makefile.linux         |    2 +-
 plugins/pppoatm/Makefile.linux |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE ppp-2.4.4-lib64.patch ---
--- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-19 14:25:03.000000000 +0200
@@ -8,6 +8,7 @@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 INCDIR = $(DESTDIR)/include
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
 
 TARGETS = pppd
 
@@ -32,7 +33,7 @@
 
 CC = gcc
 #
-COPTS = -Wall $(RPM_OPT_FLAGS)
+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
 LIBS = -lutil
 
 # Uncomment the next 2 lines to include support for Microsoft's
--- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-19 14:21:08.000000000 +0200
@@ -7,7 +7,7 @@
 DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
 
 SUBDIRS := rp-pppoe pppoatm
 # Uncomment the next line to include the radius authentication plugin
--- ppp-2.4.4/pppd/pathnames.h.lib64	2005-08-26 01:59:34.000000000 +0200
+++ ppp-2.4.4/pppd/pathnames.h	2006-07-19 14:26:24.000000000 +0200
@@ -57,7 +57,7 @@
 
 #ifdef PLUGIN
 #ifdef __STDC__
-#define _PATH_PLUGIN	DESTDIR "/lib/pppd/" VERSION
+#define _PATH_PLUGIN	LIBDIR "/pppd/" VERSION
 #else /* __STDC__ */
 #define _PATH_PLUGIN	"/usr/lib/pppd"
 #endif /* __STDC__ */
--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64	2006-07-19 15:29:53.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2006-07-19 15:30:23.000000000 +0200
@@ -6,7 +6,7 @@
 
 #***********************************************************************
 
-DESTDIR = @DESTDIR@
+DESTDIR = $(INSTROOT)@DESTDIR@
 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 
 VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)

ppp-2.4.4-no_strip.patch:
 chat/Makefile.linux                       |    2 +-
 chat/Makefile.linux.make                  |    2 +-
 pppd/Makefile.linux                       |    4 ++--
 pppd/Makefile.linux.lib64                 |    4 ++--
 pppd/Makefile.linux.make                  |    4 ++--
 pppd/Makefile.linux.pie                   |    4 ++--
 pppd/plugins/radius/Makefile.linux        |    6 +++---
 pppd/plugins/radius/Makefile.linux.make   |    6 +++---
 pppd/plugins/rp-pppoe/Makefile.linux      |    4 ++--
 pppd/plugins/rp-pppoe/Makefile.linux.make |    4 ++--
 pppdump/Makefile.linux                    |    2 +-
 pppdump/Makefile.linux.make               |    2 +-
 pppstats/Makefile.linux                   |    2 +-
 pppstats/Makefile.linux.make              |    2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE ppp-2.4.4-no_strip.patch ---
--- ppp-2.4.4/pppd/Makefile.linux.make.no_strip	2006-06-04 07:07:46.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
@@ -99,7 +99,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -200,7 +200,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.4/pppd/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
@@ -100,7 +100,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -201,7 +201,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.make.no_strip	2006-06-04 07:04:14.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
@@ -36,9 +36,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
--- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
@@ -36,9 +36,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.make.no_strip	2006-06-04 07:07:46.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
@@ -39,9 +39,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
 	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
 
 clean:
 	rm -f *.o *.so
--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
@@ -39,9 +39,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
 	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
 
 clean:
 	rm -f *.o *.so
--- ppp-2.4.4/pppd/Makefile.linux.lib64.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-19 14:29:41.000000000 +0200
@@ -99,7 +99,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -200,7 +200,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.4/pppd/Makefile.linux.pie.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppd/Makefile.linux.pie	2006-07-19 14:29:41.000000000 +0200
@@ -100,7 +100,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -201,7 +201,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.4/pppdump/Makefile.linux.make.no_strip	2006-06-04 07:04:14.000000000 +0200
+++ ppp-2.4.4/pppdump/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
@@ -17,5 +17,5 @@
 
 install:
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c pppdump $(BINDIR)
+	$(INSTALL) -c pppdump $(BINDIR)
 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
--- ppp-2.4.4/pppdump/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppdump/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
@@ -17,5 +17,5 @@
 
 install:
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c pppdump $(BINDIR)
+	$(INSTALL) -c pppdump $(BINDIR)
 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
--- ppp-2.4.4/pppstats/Makefile.linux.make.no_strip	2006-06-04 07:07:46.000000000 +0200
+++ ppp-2.4.4/pppstats/Makefile.linux.make	2006-07-19 14:29:41.000000000 +0200
@@ -22,7 +22,7 @@
 
 install: pppstats
 	-mkdir -p $(MANDIR)
-	$(INSTALL) -s -c pppstats $(BINDIR)
+	$(INSTALL) -c pppstats $(BINDIR)
 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 
 pppstats: $(PPPSTATSRCS)
--- ppp-2.4.4/pppstats/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/pppstats/Makefile.linux	2006-07-19 14:29:41.000000000 +0200
@@ -22,7 +22,7 @@
 
 install: pppstats
 	-mkdir -p $(MANDIR)
-	$(INSTALL) -s -c pppstats $(BINDIR)
+	$(INSTALL) -c pppstats $(BINDIR)
 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 
 pppstats: $(PPPSTATSRCS)
--- ppp-2.4.4/chat/Makefile.linux.make.no_strip	2006-06-04 07:07:46.000000000 +0200
+++ ppp-2.4.4/chat/Makefile.linux.make	2006-07-19 14:30:26.000000000 +0200
@@ -25,7 +25,7 @@
 
 install: chat
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
+	$(INSTALL) -c chat $(BINDIR)
 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:
--- ppp-2.4.4/chat/Makefile.linux.no_strip	2006-07-19 14:29:41.000000000 +0200
+++ ppp-2.4.4/chat/Makefile.linux	2006-07-19 14:31:11.000000000 +0200
@@ -25,7 +25,7 @@
 
 install: chat
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
+	$(INSTALL) -c chat $(BINDIR)
 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Jul 2005 11:55:59 -0000	1.6
+++ .cvsignore	24 Jul 2006 18:09:31 -0000	1.7
@@ -1,2 +1,3 @@
 ppp-2.4.2.tar.gz
 ppp-2.4.3.tar.gz
+ppp-2.4.4.tar.gz


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ppp.spec	12 Jul 2006 07:52:33 -0000	1.38
+++ ppp.spec	24 Jul 2006 18:09:32 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
-Version: 2.4.3
-Release: 6.2.2
+Version: 2.4.4
+Release: 1
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -11,19 +11,18 @@
 Patch1: ppp-2.3.6-sample.patch
 Patch2: ppp-2.4.2-libutil.patch
 Patch3: ppp-2.4.1-varargs.patch
-Patch4: ppp-2.4.3-lib64.patch
-Patch6: ppp-2.4.3-dontwriteetc.patch
+Patch4: ppp-2.4.4-lib64.patch
 Patch7: ppp-2.4.2-pie.patch
 Patch8: ppp-2.4.3-fix.patch
 Patch9: ppp-2.4.3-fix64.patch
 Patch11: ppp-2.4.2-change_resolv_conf.patch
-Patch13: ppp-2.4.3-no_strip.patch
-Patch14: ppp-2.4.2-argv.patch
+Patch13: ppp-2.4.4-no_strip.patch
 Patch16: ppp-2.4.2-pppoatm-mtu.patch
 Patch17: ppp-2.4.2-pppoatm-make.patch
-Patch18: ppp-2.4.3-radiusplugin.patch
 Patch19: ppp-2.4.3-local.patch
 Patch20: ppp-2.4.3-ipv6-accept-remote.patch
+Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
+Patch22: ppp-2.4.4-cbcp.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap
@@ -45,19 +44,17 @@
 %patch3 -p1 -b .varargs
 # patch 4 depends on the -lutil in patch 0
 %patch4 -p1 -b .lib64
-%patch6 -p1 -b .dontwriteetc
 %patch7 -p1 -b .pie
 %patch8 -p1 -b .fix
 %patch9 -p1 -b .fix64
 %patch11 -p1 -b .change_resolv_conf
 %patch13 -p1 -b .no_strip
-%patch14 -p1 -b .argv
 %patch16 -p1 -b .atm-mtu
 %patch17 -p1 -b .atm-make
-%patch18 -p1 -b .radiusplugin
 %patch19 -p1 -b .local
 %patch20 -p1 -b .ipv6cp
-
+%patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
+%patch22 -p1 -b .cbcp
 
 find . -type f -name "*.sample" | xargs rm -f 
 
@@ -69,10 +66,8 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir}/man8 BINDIR=$RPM_BUILD_ROOT%{_sbindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pppd/%{version}/
-
-## it shouldn't be SUID root be default
-#chmod 755 $RPM_BUILD_ROOT/usr/sbin/pppd
+export INSTROOT=$RPM_BUILD_ROOT
+make install install-etcppp
 
 chmod -R a+rX scripts
 find scripts -type f | xargs chmod a-x
@@ -118,6 +113,12 @@
 
 
 %changelog
+* Wed Jul 19 2006 Thomas Woerner <twoerner at redhat.com> 2.4.4-1
+- new version 2.4.4 with lots of fixes
+- fixed reesolv.conf docs (#165072)
+  Thanks to Matt Domsch for the initial patch 
+- enabled CBCP (#199278)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-6.2.2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Jul 2005 11:55:59 -0000	1.6
+++ sources	24 Jul 2006 18:09:32 -0000	1.7
@@ -1 +1,2 @@
 848f6c3cafeb6074ffeb293c3af79b7c  ppp-2.4.3.tar.gz
+183800762e266132218b204dfb428d29  ppp-2.4.4.tar.gz


--- ppp-2.4.2-argv.patch DELETED ---


--- ppp-2.4.3-dontwriteetc.patch DELETED ---


--- ppp-2.4.3-lib64.patch DELETED ---


--- ppp-2.4.3-no_strip.patch DELETED ---


--- ppp-2.4.3-radiusplugin.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:23:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:23:26 -0400
Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.12, 1.13 sources, 1.12,
	1.13 xorg-x11-drv-i810.spec, 1.27, 1.28
Message-ID: <200607241823.k6OINQM9018264@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18230/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-12.20060717modeset.fc6 on branch devel from xorg-x11-drv-i810-1.6.0-12.20060717modeset.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Jul 2006 21:44:17 -0000	1.12
+++ .cvsignore	24 Jul 2006 18:23:23 -0000	1.13
@@ -1 +1 @@
-xf86-video-intel-1.6.0-git-modesetting-20060713.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060717.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Jul 2006 21:44:17 -0000	1.12
+++ sources	24 Jul 2006 18:23:23 -0000	1.13
@@ -1 +1 @@
-c2da336622b7bb617f7ea59460a47cab  xf86-video-intel-1.6.0-git-modesetting-20060713.tar.bz2
+2a94ea7a4714f02d71a4f50935a0893b  xf86-video-intel-1.6.0-git-modesetting-20060717.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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xorg-x11-drv-i810.spec	13 Jul 2006 23:34:53 -0000	1.27
+++ xorg-x11-drv-i810.spec	24 Jul 2006 18:23:23 -0000	1.28
@@ -8,13 +8,13 @@
 %define with_dri        0
 %endif
 
-%define gitdate 20060713
+%define gitdate 20060717
 
 # GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   11.%{gitdate}modeset%{?dist}
+Release:   12.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -99,6 +99,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-12.20060717modeset.gc6
+- Disable spread-spectrum LVDS, various crash and hang fixes, saner output
+  probing.
+
 * Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-11.20060713modeset.fc6
 - Update again for a mode comparison bugfix.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:24:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:24:47 -0400
Subject: rpms/struts/devel struts-1.2.8.build.patch, 1.1, 1.2 struts.spec,
	1.36, 1.37
Message-ID: <200607241824.k6OIOlCM018821@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18767

Modified Files:
	struts-1.2.8.build.patch struts.spec 
Log Message:

 Disable failonerror for xml validation for now.



struts-1.2.8.build.patch:
 build-webapp.xml  |    7 ++++++-
 build-webapps.xml |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

Index: struts-1.2.8.build.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.8.build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-1.2.8.build.patch	22 Feb 2006 04:46:42 -0000	1.1
+++ struts-1.2.8.build.patch	24 Jul 2006 18:24:44 -0000	1.2
@@ -1,6 +1,6 @@
---- 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 @@
+--- ./build-webapp.xml.sav	2005-11-08 03:55:28.000000000 -0500
++++ ./build-webapp.xml	2006-07-24 14:12:52.000000000 -0400
+@@ -219,6 +219,7 @@
    <mkdir   dir="${webapp.target}" />
    <mkdir   dir="${webapp.target}/WEB-INF" />
    <mkdir   dir="${webapp.target}/WEB-INF/classes" />
@@ -8,7 +8,7 @@
    <mkdir   dir="${webapp.target}" />
  </target>
  
-@@ -272,7 +272,7 @@
+@@ -279,7 +280,7 @@
          The "static" target copies the static web resources portion of your
          web application source into the build target area.
  -->
@@ -17,7 +17,7 @@
          description="Copy static files">
    <echo    message="Processing webapp ${webapp.name}"/>
    <copy  todir="${webapp.target}">
-@@ -301,6 +301,10 @@
+@@ -312,6 +313,10 @@
        <exclude name="**/*.java"/>
      </fileset>
    </copy>
@@ -28,3 +28,14 @@
  </target>
  
  
+--- ./build-webapps.xml.sav	2006-07-24 14:21:33.000000000 -0400
++++ ./build-webapps.xml	2006-07-24 14:21:39.000000000 -0400
+@@ -290,7 +290,7 @@
+         documentation against the DTDs
+ -->
+ <target name="validate.docs" description="Validate generated XHTML documents">
+-    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
++    <xmlvalidate warn="yes" failonerror="no" lenient="no">
+        <fileset dir="${build.home}/documentation">
+         <include name="**/*.html"/>
+         <exclude name="download.html"/>


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- struts.spec	24 Jul 2006 17:42:13 -0000	1.36
+++ struts.spec	24 Jul 2006 18:24:44 -0000	1.37
@@ -214,6 +214,7 @@
 * Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
 - Fixed classpath issue.
 - Removed spurious macros.
+- Disable failonerror for xml validation for now.
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.2.8-2jpp_14fc
 - Rebuilt



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:30:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:30:00 -0400
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.33,1.34
Message-ID: <200607241830.k6OIU0DI020585@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20547

Modified Files:
	kdewebdev.spec 
Log Message:
prerelease of 3.5.4 (from the first-cut tag)



Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kdewebdev.spec	24 Jul 2006 16:41:33 -0000	1.33
+++ kdewebdev.spec	24 Jul 2006 18:29:57 -0000	1.34
@@ -19,7 +19,7 @@
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
 Source1: http://download.sourceforge.net/quanta/css.tar.bz2
 Source2: http://download.sourceforge.net/quanta/html.tar.bz2
 Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:41:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:41:26 -0400
Subject: rpms/samba/FC-4 samba-3.0.23a-samr_alias.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 samba.spec, 1.52, 1.53 sources, 1.27, 1.28
Message-ID: <200607241841.k6OIfQ8E023211@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23108

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.0.23a-samr_alias.patch 
Log Message:
3.0.23a


samba-3.0.23a-samr_alias.patch:
 srv_samr_nt.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.23a-samr_alias.patch ---
diff -urN --exclude-from=/home/drizzt/jerry/tmp/diff.excludes samba-3.0.23a/source/rpc_server/srv_samr_nt.c samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c
--- samba-3.0.23a/source/rpc_server/srv_samr_nt.c	2006-07-21 11:22:56.000000000 -0500
+++ samba-3.0.23a-patched/source/rpc_server/srv_samr_nt.c	2006-07-24 06:50:15.000000000 -0500
@@ -3758,7 +3758,9 @@
 
 	DEBUG(10, ("sid is %s\n", sid_string_static(&alias_sid)));
 
+	become_root();
 	status = pdb_enum_aliasmem(&alias_sid, &sids, &num_sids);
+	unbecome_root();
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -4589,7 +4591,11 @@
 
 	/* get the current group information */
 
-	if ( !pdb_get_aliasinfo( &group_sid, &info ) ) {
+	become_root();
+	ret = pdb_get_aliasinfo( &group_sid, &info );
+	unbecome_root();
+
+	if ( !ret ) {
 		return NT_STATUS_NO_SUCH_ALIAS;
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Jul 2006 00:30:01 -0000	1.25
+++ .cvsignore	24 Jul 2006 18:41:23 -0000	1.26
@@ -1 +1,2 @@
 samba-3.0.23.tar.gz
+samba-3.0.23a.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/samba.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- samba.spec	13 Jul 2006 00:30:01 -0000	1.52
+++ samba.spec	24 Jul 2006 18:41:23 -0000	1.53
@@ -2,7 +2,7 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.23
+Version: 3.0.23a
 Release: 1.fc4
 Epoch: 0
 License: GNU GPL Version 2
@@ -28,7 +28,7 @@
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-# (none at the moment)
+Patch1: samba-3.0.23a-samr_alias.patch
 
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
@@ -110,7 +110,7 @@
 cp %{SOURCE8} packaging/Fedora/winbind.init
 
 # Upstream patches
-#(none)
+%patch1 -p1
 
 # generic patches
 %patch101 -p1 -b .smbw
@@ -451,6 +451,10 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc4
+- Upgrade to new upstream 3.0.23a
+- include upstream samr_alias patch
+
 * Wed Jul 12 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23-1.fc4
 - Update to 3.0.23 to close
   bz#197836 CVE-2006-3403 Samba denial of service


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Jul 2006 00:30:01 -0000	1.27
+++ sources	24 Jul 2006 18:41:23 -0000	1.28
@@ -1 +1 @@
-f2f8722248021ca0e8f31b1853d3bf66  samba-3.0.23.tar.gz
+e48f196fa51c22ff67463680ce95a58d  samba-3.0.23a.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:42:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:42:50 -0400
Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.94,1.95
Message-ID: <200607241842.k6OIgoL2023556@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23406

Modified Files:
	nfs-utils.spec 
Log Message:
Fixed the spec file so /var/lib/nfs/v4recovery is created 
and destoryed (bz 169685)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- nfs-utils.spec	2 Jul 2006 14:40:03 -0000	1.94
+++ nfs-utils.spec	24 Jul 2006 18:42:48 -0000	1.95
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -109,6 +109,7 @@
 mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
 
 # we are using quotad from quota utils
 rm %{buildroot}/%{_mandir}/man8/rquotad*
@@ -163,6 +164,8 @@
     /usr/sbin/userdel rpcuser 2>/dev/null || :
     /usr/sbin/groupdel rpcuser 2>/dev/null || :
     /usr/sbin/userdel nfsnobody 2>/dev/null || :
+	rm -rf /var/lib/nfs/statd
+	rm -rf /var/lib/nfs/v4recovery
 fi
 
 %postun
@@ -214,6 +217,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Mon Jul 24 2006 Steve Dickson <SteveD at RedHat.com> 1:1.0.8-3
+* Fixed the spec file so /var/lib/nfs/v4recovery is created
+  and destoryed (bz 169685)
+
 * Sun Jul  2 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.8-2
 - Introduce epoch for proper upgrade path.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:43:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:43:39 -0400
Subject: rpms/struts/devel struts-1.2.8.build.patch,1.2,1.3
Message-ID: <200607241843.k6OIhd5U023841@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23720

Modified Files:
	struts-1.2.8.build.patch 
Log Message:

Setting failonerror=false on all locations for xmlvalidate



struts-1.2.8.build.patch:
 build-webapp.xml  |    7 ++++++-
 build-webapps.xml |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

Index: struts-1.2.8.build.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.8.build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-1.2.8.build.patch	24 Jul 2006 18:24:44 -0000	1.2
+++ struts-1.2.8.build.patch	24 Jul 2006 18:43:37 -0000	1.3
@@ -1,5 +1,5 @@
 --- ./build-webapp.xml.sav	2005-11-08 03:55:28.000000000 -0500
-+++ ./build-webapp.xml	2006-07-24 14:12:52.000000000 -0400
++++ ./build-webapp.xml	2006-07-24 14:41:30.000000000 -0400
 @@ -219,6 +219,7 @@
    <mkdir   dir="${webapp.target}" />
    <mkdir   dir="${webapp.target}/WEB-INF" />
@@ -28,8 +28,17 @@
  </target>
  
  
---- ./build-webapps.xml.sav	2006-07-24 14:21:33.000000000 -0400
-+++ ./build-webapps.xml	2006-07-24 14:21:39.000000000 -0400
+--- ./build-webapps.xml.sav	2005-11-08 03:56:16.000000000 -0500
++++ ./build-webapps.xml	2006-07-24 14:42:07.000000000 -0400
+@@ -189,7 +189,7 @@
+     </copy>
+ 
+     <!-- Validate tiles docs -->
+-    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
++    <xmlvalidate warn="yes" failonerror="no" lenient="no">
+        <fileset dir="${build.home}/tiles-documentation" includes="**/*.html"/>
+ 
+       <!-- Reference local DTDS to avoid network lookup -->
 @@ -290,7 +290,7 @@
          documentation against the DTDs
  -->



From fedora-cvs-commits at redhat.com  Mon Jul 24 18:51:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 14:51:41 -0400
Subject: rpms/ppp/devel ppp-2.4.4-lib64.patch,1.1,1.2
Message-ID: <200607241851.k6OIpfAj008374@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8288

Modified Files:
	ppp-2.4.4-lib64.patch 
Log Message:
[tw] two more libdir fixes


ppp-2.4.4-lib64.patch:
 Makefile.linux                  |    3 ++-
 pathnames.h                     |    2 +-
 plugins/Makefile.linux          |    2 +-
 plugins/pppoatm/Makefile.linux  |    4 ++--
 plugins/radius/Makefile.linux   |    2 +-
 plugins/rp-pppoe/Makefile.linux |    2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

Index: ppp-2.4.4-lib64.patch
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp-2.4.4-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppp-2.4.4-lib64.patch	24 Jul 2006 18:09:32 -0000	1.1
+++ ppp-2.4.4-lib64.patch	24 Jul 2006 18:51:38 -0000	1.2
@@ -1,5 +1,51 @@
---- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
-+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-19 14:25:03.000000000 +0200
+--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux	2006-07-24 20:44:56.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(PPPDVERSION)
+ 
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/radius/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux	2006-07-24 20:44:45.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64	2004-11-14 02:12:10.000000000 +0100
++++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2006-07-24 20:44:29.000000000 +0200
+@@ -6,8 +6,8 @@
+ 
+ #***********************************************************************
+ 
+-DESTDIR = @DESTDIR@
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++DESTDIR = $(INSTROOT)@DESTDIR@
++LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ 
+--- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-24 20:43:40.000000000 +0200
+@@ -7,7 +7,7 @@
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+ MANDIR = $(DESTDIR)/share/man/man8
+-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
+ 
+ SUBDIRS := rp-pppoe pppoatm
+ # Uncomment the next line to include the radius authentication plugin
+--- ppp-2.4.4/pppd/Makefile.linux.lib64	2006-07-24 20:43:40.000000000 +0200
++++ ppp-2.4.4/pppd/Makefile.linux	2006-07-24 20:43:40.000000000 +0200
 @@ -8,6 +8,7 @@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
@@ -17,19 +63,8 @@
  LIBS = -lutil
  
  # Uncomment the next 2 lines to include support for Microsoft's
---- ppp-2.4.4/pppd/plugins/Makefile.linux.lib64	2006-07-19 14:16:01.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-19 14:21:08.000000000 +0200
-@@ -7,7 +7,7 @@
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- SUBDIRS := rp-pppoe pppoatm
- # Uncomment the next line to include the radius authentication plugin
 --- ppp-2.4.4/pppd/pathnames.h.lib64	2005-08-26 01:59:34.000000000 +0200
-+++ ppp-2.4.4/pppd/pathnames.h	2006-07-19 14:26:24.000000000 +0200
++++ ppp-2.4.4/pppd/pathnames.h	2006-07-24 20:43:40.000000000 +0200
 @@ -57,7 +57,7 @@
  
  #ifdef PLUGIN
@@ -39,14 +74,3 @@
  #else /* __STDC__ */
  #define _PATH_PLUGIN	"/usr/lib/pppd"
  #endif /* __STDC__ */
---- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.lib64	2006-07-19 15:29:53.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux	2006-07-19 15:30:23.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- #***********************************************************************
- 
--DESTDIR = @DESTDIR@
-+DESTDIR = $(INSTROOT)@DESTDIR@
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:26:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:26:39 -0400
Subject: rpms/firefox/devel firefox.spec,1.120,1.121
Message-ID: <200607241926.k6OJQdTH001107@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1077

Modified Files:
	firefox.spec 
Log Message:
* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.4-4
- Ugh:
  - Mozilla the platform is deprecated
  - XULrunner has been promised for a while but is still not 1.0
  - Ship a firefox-devel for now as we need a devel platform.
  - The plan is to kill firefox-devel when xulrunner 1.0 ships. 
- Clean up the files list a little bit.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- firefox.spec	15 Jun 2006 12:14:34 -0000	1.120
+++ firefox.spec	24 Jul 2006 19:26:36 -0000	1.121
@@ -3,13 +3,14 @@
 %define nspr_version 4.6
 %define nss_version 3.10
 %define cairo_version 0.5
+%define builddir %{_builddir}/mozilla
 
 %define official_branding 1
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.4
-Release:        3
+Release:        4
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -92,6 +93,20 @@
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
 
+%package devel
+Summary: Development files for Firefox
+Group: Development/Libraries
+Obsoletes: mozilla-devel
+Requires: firefox = %{version}-%{release}
+Requires: nspr-devel >= %{nspr_version}
+Requires: nss-devel >= %{nss_version}
+
+%description devel
+Development files for Firefox.  This package exists temporarily.
+When xulrunner has reached version 1.0, firefox-devel will be
+removed in favor of xulrunner-devel.
+
+
 #---------------------------------------------------------------------
 
 %prep
@@ -231,6 +246,26 @@
 done
 %{__rm} -rf firefox-langpacks
 
+# Prepare our devel package
+%{__mkdir_p} $RPM_BUILD_ROOT/fftemp
+DESTDIR=$RPM_BUILD_ROOT/fftemp \
+   make install
+
+%{__rm} -f %{builddir}/firefox-devel.list
+echo %defattr\(-,root,root\) > %{builddir}/firefox-devel.list
+find $RPM_BUILD_ROOT/fftemp%{_includedir}/firefox-%{version}/ -type f | \
+  sed -e "s,$RPM_BUILD_ROOT,," >> \
+  %{builddir}/firefox-devel.list
+find $RPM_BUILD_ROOT/fftemp%{_datadir}/idl/firefox-%{version}/ -type f | \
+  sed -e "s,$RPM_BUILD_ROOT,," >> \
+  %{builddir}/firefox-devel.list
+install -c -m 755 dist/bin/xpcshell \
+  dist/bin/xpidl \
+  dist/bin/xpt_dump \
+  dist/bin/xpt_link \
+  $RPM_BUILD_ROOT/%{ffdir}
+%{__rm} -rf $RPM_BUILD_ROOT/fftemp
+
 # ghost files
 touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat
@@ -261,16 +296,54 @@
 %{_mandir}/man1/*
 %{_datadir}/applications/mozilla-%{name}.desktop
 %{_datadir}/pixmaps/firefox.png
-%{ffdir}
 %{_libdir}/mozilla
 
+%dir %{ffdir}
+%{ffdir}/LICENSE
+%{ffdir}/README.txt
+%{ffdir}/*.properties
+%{ffdir}/chrome
+%{ffdir}/components
+%{ffdir}/defaults
+%{ffdir}/extensions
+%{ffdir}/greprefs
+%{ffdir}/icons
+%{ffdir}/init.d
+%{ffdir}/plugins
+%{ffdir}/res
+%{ffdir}/searchplugins
+%{ffdir}/*.so
+%{ffdir}/firefox
+%{ffdir}/firefox-bin
+%{ffdir}/firefox-xremote-client
+%{ffdir}/mozilla-xremote-client
+%{ffdir}/run-mozilla.sh
+# XXX See if these are needed still
+%{ffdir}/updater*
+
 %ghost %{ffdir}/components/compreg.dat
 %ghost %{ffdir}/components/xpti.dat
 
+%files devel -f firefox-devel.list
+%defattr(-,root,root)
+%{_datadir}/idl/firefox-%{version}/*
+%{ffdir}/xpcshell
+%{ffdir}/xpicleanup
+%{ffdir}/xpidl
+%{ffdir}/xpt_dump
+%{ffdir}/xpt_link
 
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.4-4
+- Ugh:
+  - Mozilla the platform is deprecated
+  - XULrunner has been promised for a while but is still not 1.0
+  - Ship a firefox-devel for now as we need a devel platform.
+  - The plan is to kill firefox-devel when xulrunner 1.0 ships. 
+- Clean up the files list a little bit.
+
 * Thu Jun 15 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-3
 - Force "gmake -j1" on ppc ppc64 s390 s390x
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:29:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:29:55 -0400
Subject: rpms/ldapjdk/devel ldapjdk.spec,1.10,1.11
Message-ID: <200607241929.k6OJTtXS002147@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/ldapjdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2016

Modified Files:
	ldapjdk.spec 
Log Message:
- Add conditional native compilation for GCJ.




Index: ldapjdk.spec
===================================================================
RCS file: /cvs/dist/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ldapjdk.spec	22 Jul 2006 08:44:27 -0000	1.10
+++ ldapjdk.spec	24 Jul 2006 19:29:52 -0000	1.11
@@ -1,3 +1,7 @@
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 %define spname		ldapsp
 %define tar_name	ldapsdk_java
 %define tar_version	20020819
@@ -6,7 +10,7 @@
 
 Name:		ldapjdk
 Version:	4.17
-Release: 	1jpp_5fc
+Release:	1jpp_6fc
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPL
@@ -27,10 +31,10 @@
 Requires:	jndi
 Requires:	jpackage-utils >= 0:1.5
 %if %{use_nonfree}
-Requires:	jaas
+Requires:       jaas
 Requires:	jsse
 %endif
-Requires:  	java-sasl
+Requires:	java-sasl
 BuildRequires:	oro
 BuildRequires:	jndi
 BuildRequires:	jpackage-utils >= 0:1.5
@@ -41,10 +45,16 @@
 BuildRequires:  java-devel
 BuildRequires:  java-sasl
 Provides:	jndi-ldap = 1.3.0
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-#Distribution:	JPackage
-#Vendor:		JPackage Project
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -120,9 +130,29 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc buildjsdk.txt java-sdk/*.htm
@@ -130,12 +160,20 @@
 %{_javadir}/%{spname}*.jar
 %{_javadir}-1.3.0/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ldapjdk-4.17.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ldapsp-4.17.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:4.17-1jpp_6fc
+- Add conditional native compilation.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:4.17-1jpp_5fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:33:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:33:42 -0400
Subject: rpms/compiz/devel compiz.spec,1.5,1.6
Message-ID: <200607241933.k6OJXgQ6003071@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3058

Modified Files:
	compiz.spec 
Log Message:
* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.9.20060721git
- Add devel package and require redhat-logos instead of fedora-logos (#199757).



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compiz.spec	21 Jul 2006 18:59:46 -0000	1.5
+++ compiz.spec	24 Jul 2006 19:33:40 -0000	1.6
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.8.%{snapshot}git%{?dist}
+Release:        0.9.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +18,7 @@
 
 Requires:	xorg-x11-server-Xorg >= 1.1.0-26
 Requires:	mesa-libGL >= 6.5-9
-Requires:       fedora-logos
+Requires:       redhat-logos
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
@@ -46,6 +46,19 @@
 that use Compiz use EXT_texture_from_pixmap OpenGL extension extension
 for binding redirected top-level windows to texture objects.
 
+
+%package devel
+Summary: Development packages for compiz.
+Group: Development/Libraries
+Requires: compiz = %{PACKAGE_VERSION}
+
+%description devel
+The compiz-devel package includes the header files,
+and developer docs for the compiz package.
+
+Install compiz-devel if you want to develop plugins for the compiz
+windows and compositing manager.
+
 %prep
 %setup -q -n %{name}-%{sha1}
 
@@ -96,7 +109,15 @@
 %{_datadir}/gnome/wm-properties/compiz.desktop
 %{_datadir}/locale/*/LC_MESSAGES/compiz.mo
 
+%files devel
+%defattr(-, root, root)
+%{_libdir}/pkgconfig/compiz.pc
+%{_includedir}/compiz
+
 %changelog
+* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.9.20060721git
+- Add devel package and require redhat-logos instead of fedora-logos (#199757).
+
 * Fri Jul 21 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.8.20060720git
 - Add workaround for AIGLX throttling problem.
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:39:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:39:35 -0400
Subject: rpms/libao/devel libao.spec,1.21,1.22
Message-ID: <200607241939.k6OJdZ5d004297@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/libao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4265

Modified Files:
	libao.spec 
Log Message:
- remove all .la files (bug 199058)



Index: libao.spec
===================================================================
RCS file: /cvs/dist/rpms/libao/devel/libao.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libao.spec	12 Jul 2006 06:45:35 -0000	1.21
+++ libao.spec	24 Jul 2006 19:39:30 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Cross Platform Audio Output Library.
 Name: libao
 Version: 0.8.6
-Release: 2.1
+Release: 3
 Group: System Environment/Libraries
 License: GPL
 URL: http://www.xiph.org/
@@ -40,7 +40,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 
 %files
 %defattr(-,root,root)
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> - 0.8.6-3
+- remove all .la files (bug 199058)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:43:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:43:47 -0400
Subject: rpms/compiz/devel compiz.spec,1.6,1.7
Message-ID: <200607241943.k6OJhliJ005181@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5154

Modified Files:
	compiz.spec 
Log Message:
Remove rm -rf of files I'm trying to package...


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compiz.spec	24 Jul 2006 19:33:40 -0000	1.6
+++ compiz.spec	24 Jul 2006 19:43:44 -0000	1.7
@@ -83,9 +83,6 @@
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
-rm -rf $RPM_BUILD_ROOT%{_includedir}/compiz
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-
 %post
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/compiz.schemas > /dev/null



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:50:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:50:05 -0400
Subject: rpms/cman/devel .cvsignore, 1.9, 1.10 cman.spec, 1.52, 1.53 sources,
	1.18, 1.19
Message-ID: <200607241950.k6OJo5NA021812@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21783

Modified Files:
	.cvsignore cman.spec sources 
Log Message:
Rebuilt w/ new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Jul 2006 22:27:31 -0000	1.9
+++ .cvsignore	24 Jul 2006 19:50:03 -0000	1.10
@@ -1 +1 @@
-cman-2.0.3.tar.gz
+cman-2.0.4.tar.gz


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cman.spec	18 Jul 2006 19:02:20 -0000	1.52
+++ cman.spec	24 Jul 2006 19:50:03 -0000	1.53
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -10,11 +10,11 @@
 ###############################################################################
 ###############################################################################
 %define cman_major 2
-%define cman_minor 0.3
+%define cman_minor 0.4
 
 Name: cman
 Version: %{cman_major}.%{cman_minor}
-Release: 0.fc6.1
+Release: 0.fc6.0
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Jul 2006 22:27:31 -0000	1.18
+++ sources	24 Jul 2006 19:50:03 -0000	1.19
@@ -1 +1 @@
-43ca7eef19382475017e1482b168621d  cman-2.0.3.tar.gz
+33ff33830b0c8dc0925e6791c64f80ef  cman-2.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:52:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:52:23 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.19,1.20
Message-ID: <200607241952.k6OJqNr2022590@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22548

Modified Files:
	gnome-mount.spec 
Log Message:
- Update to a CVS version of gnome-mount
- create nautilus-properties sub package



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-mount.spec	18 Jul 2006 23:11:43 -0000	1.19
+++ gnome-mount.spec	24 Jul 2006 19:52:20 -0000	1.20
@@ -1,12 +1,10 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
-Version: 0.4
-Release: 8 
+Version: 0.4.0.2006.07.24
+Release: 1%{?dist} 
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
-Patch0: gnome-mount-0.4-drive-mount.patch
-Patch1: gnome-mount-0.4-no-media.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.90, dbus-glib-devel >= 0.70
 BuildRequires: gnome-keyring-devel
@@ -28,12 +26,19 @@
 %description devel
 Development files for gnome-mount
 
+%package nautilus-properties
+Summary: Nautilus extention for gnome-mount
+Group: Applications/System 
+
+%description nautilus-properties 
+ Nautilus extention which adds property pages to volume and drive mount 
+ properties dialog for manipulating mount options.
+
+
 %prep
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q 
-%patch0 -p0 -b .drive-mount
-%patch1 -p0 -b .no-media
 
 %build
 
@@ -43,6 +48,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
+find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -62,12 +70,21 @@
 %{_bindir}/gnome-mount
 %{_bindir}/gnome-umount
 %{_datadir}/gnome-mount/gnome-mount-properties.glade
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/gnome-mount.pc
 
+%files nautilus-properties
+%defattr(-, root, root)
+%{_libdir}/nautilus/extensions-1.0/libgnome-mount.so
+
 %changelog
+* Mon Jul 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0.2006.07.24-1
+- Update to a CVS version of gnome-mount
+- create nautilus-properties sub package
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-8
 - Add BR for dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 19:56:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 15:56:15 -0400
Subject: rpms/compiz/devel compiz.spec,1.7,1.8
Message-ID: <200607241956.k6OJuF4U023968@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23885

Modified Files:
	compiz.spec 
Log Message:
* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.10.20060721git
- Bump version to work around tagging weirdness.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- compiz.spec	24 Jul 2006 19:43:44 -0000	1.7
+++ compiz.spec	24 Jul 2006 19:56:12 -0000	1.8
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.9.%{snapshot}git%{?dist}
+Release:        0.10.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +112,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.10.20060721git
+- Bump version to work around tagging weirdness.
+
 * Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.9.20060721git
 - Add devel package and require redhat-logos instead of fedora-logos (#199757).
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:01:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:01:14 -0400
Subject: rpms/gnome-mount/devel .cvsignore,1.6,1.7 sources,1.6,1.7
Message-ID: <200607242001.k6OK1Elg025278@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25113

Modified Files:
	.cvsignore sources 
Log Message:
- upload tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Feb 2006 17:43:47 -0000	1.6
+++ .cvsignore	24 Jul 2006 20:01:11 -0000	1.7
@@ -3,3 +3,4 @@
 gnome-mount-0.4-0.cvs20060117.tar.gz
 gnome-mount-0.4-0.cvs20060213.tar.gz
 gnome-mount-0.4.tar.gz
+gnome-mount-0.4.0.2006.07.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Feb 2006 17:43:47 -0000	1.6
+++ sources	24 Jul 2006 20:01:11 -0000	1.7
@@ -1 +1 @@
-75f260ea6b0ec3c5e0af3c722fbd9568  gnome-mount-0.4.tar.gz
+aba1a381a0c403e12521fd0be33d6929  gnome-mount-0.4.0.2006.07.24.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:04:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:04:28 -0400
Subject: rpms/gcc/devel gcc41-java-backport-gcjplugin.patch, NONE,
	1.1 gcc41.spec, 1.86, 1.87
Message-ID: <200607242004.k6OK4SHs025949@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25643

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-java-backport-gcjplugin.patch 
Log Message:
* Mon Jul 24 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-12
- Backport fix for NullPointerException in GCJ web plugin.


gcc41-java-backport-gcjplugin.patch:
 0 files changed

--- NEW FILE gcc41-java-backport-gcjplugin.patch ---
Patch in trunk at http://gcc.gnu.org/ml/java-patches/2006-q3/msg00180.html

for libjava/ChangeLog
2006-07-21  Mark Wielaard  <mark at klomp.org>

        * java/io/OutputStreamWriter.java (flush): Create work if null.

--- libjava/java/io/OutputStreamWriter.java     (revision 115595)
+++ libjava/java/io/OutputStreamWriter.java     (working copy)
@@ -203,6 +203,8 @@
 
 	// Always write -- if we are close()ing then we want to make
 	// sure the converter is flushed.
+	if (work == null)
+	  work = new char[100];
 	writeChars(work, 0, wcount);
 	wcount = 0;
 


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gcc41.spec	21 Jul 2006 15:26:08 -0000	1.86
+++ gcc41.spec	24 Jul 2006 20:04:26 -0000	1.87
@@ -1,6 +1,6 @@
 %define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 11
+%define gcc_release 12
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -139,6 +139,8 @@
 Patch31: gcc41-java-backport2.patch
 Patch32: gcc41-java-libdotdotlib.patch
 Patch33: gcc41-java-plugins.patch
+Patch34: gcc41-java-backport-gcjplugin.patch
+
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -453,6 +455,7 @@
 %patch31 -p0 -b .java-backport2~
 %patch32 -p0 -b .java-libdotdotlib~
 %patch33 -p0 -b .java-plugins~
+%patch34 -p0 -b .java-gcjplugin~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1515,6 +1518,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Jul 24 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-12
+- Backport fix for NullPointerException in GCJ web plugin.
+
 * Fri Jul 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-11
 - update from gcc-4_1-branch (-r115565:115644)
   - PRs target/27363, c++/27495, c++/28048, c++/28235, c++/28337, c++/28338,



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:05:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:05:36 -0400
Subject: rpms/samba/FC-4 samba-3.0.23-logfiles.patch, 1.1, 1.2 samba.spec,
	1.53, 1.54
Message-ID: <200607242005.k6OK5aQa026189@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26090

Modified Files:
	samba-3.0.23-logfiles.patch samba.spec 
Log Message:
 bz#199607 Samba compiled with wrong log path.
 bz#199206 smb.conf has incorrect log file path



samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: samba-3.0.23-logfiles.patch
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/samba-3.0.23-logfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.0.23-logfiles.patch	13 Jul 2006 00:30:01 -0000	1.1
+++ samba-3.0.23-logfiles.patch	24 Jul 2006 20:05:33 -0000	1.2
@@ -46,7 +46,7 @@
  # this tells Samba to use a separate log file for each machine
  # that connects
 -   log file = /usr/local/samba/var/log.%m
-+   log file = /usr/local/samba/var/%m.log
++   log file = /var/log/samba/%m.log
  
  # Put a capping on the size of the log files (in Kb).
     max log size = 50


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-4/samba.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- samba.spec	24 Jul 2006 18:41:23 -0000	1.53
+++ samba.spec	24 Jul 2006 20:05:34 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.23a
-Release: 1.fc4
+Release: 1.fc4.1
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -451,6 +451,11 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc4.1
+- Fix the -logfiles patch to close 
+  bz#199607 Samba compiled with wrong log path.
+  bz#199206 smb.conf has incorrect log file path
+
 * Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc4
 - Upgrade to new upstream 3.0.23a
 - include upstream samr_alias patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:08:51 -0400
Subject: rpms/samba/FC-5 samba-3.0.23-logfiles.patch, 1.1, 1.2 samba.spec,
	1.65, 1.66
Message-ID: <200607242008.k6OK8px4026949@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26917

Modified Files:
	samba-3.0.23-logfiles.patch samba.spec 
Log Message:
* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc5.1
- Fix the -logfiles patch to close
  bz#199607 Samba compiled with wrong log path.
  bz#199206 smb.conf has incorrect log file path



samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: samba-3.0.23-logfiles.patch
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba-3.0.23-logfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.0.23-logfiles.patch	12 Jul 2006 18:57:09 -0000	1.1
+++ samba-3.0.23-logfiles.patch	24 Jul 2006 20:08:36 -0000	1.2
@@ -46,7 +46,7 @@
  # this tells Samba to use a separate log file for each machine
  # that connects
 -   log file = /usr/local/samba/var/log.%m
-+   log file = /usr/local/samba/var/%m.log
++   log file = /var/log/samba/%m.log
  
  # Put a capping on the size of the log files (in Kb).
     max log size = 50


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- samba.spec	24 Jul 2006 17:44:02 -0000	1.65
+++ samba.spec	24 Jul 2006 20:08:36 -0000	1.66
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.23a
-Release: 1.fc5
+Release: 1.fc5.1
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -446,6 +446,11 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc5.1
+- Fix the -logfiles patch to close
+  bz#199607 Samba compiled with wrong log path.
+  bz#199206 smb.conf has incorrect log file path
+
 * Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-1.fc5
 - Upgrade to new upstream 3.0.23a
 - include upstream samr_alias patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:13:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:13:42 -0400
Subject: rpms/beagle/devel beagle.spec,1.61,1.62
Message-ID: <200607242013.k6OKDgIe005495@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5438

Modified Files:
	beagle.spec 
Log Message:
- reenable beagle by default 



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- beagle.spec	20 Jul 2006 22:02:50 -0000	1.61
+++ beagle.spec	24 Jul 2006 20:13:40 -0000	1.62
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	4 
+Release:       	5 
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -97,8 +97,8 @@
 
 # Add an autostart file so beagled gets run by default
 # (temporarily disabled)
-#mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
-#cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
+mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
+cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
 
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
@@ -216,6 +216,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> - 0.2.7-5
+- reenable beagle by default 
+
 * Thu Jul 20 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-4
 - Only remove beagleindex user/group if they exist (#196665)
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:15:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:15:18 -0400
Subject: rpms/firefox/devel firefox.spec,1.121,1.122
Message-ID: <200607242015.k6OKFIvv005664@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5648

Modified Files:
	firefox.spec 
Log Message:
disable visibility for i386 too since it appears to go BOOM on linking.  =(


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- firefox.spec	24 Jul 2006 19:26:36 -0000	1.121
+++ firefox.spec	24 Jul 2006 20:15:05 -0000	1.122
@@ -117,9 +117,10 @@
 # Pragma visibility is broken on most platforms for some reason.
 # It works on i386 so leave it alone there.  Disable elsewhere.
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
-%ifnarch i386
+# UPDATE: 2006-07-24: i386 is also broken now.
+#%ifnarch i386
 %patch5  -p0
-%endif
+#%endif
 
 %patch20 -p0
 %patch21 -p1



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:22:29 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.58, 1.59 firstboot.spec, 1.79,
	1.80 sources, 1.75, 1.76
Message-ID: <200607242022.k6OKMTEH020865@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20851

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	20 Jul 2006 21:05:58 -0000	1.58
+++ .cvsignore	24 Jul 2006 20:22:26 -0000	1.59
@@ -30,3 +30,4 @@
 firstboot-1.4.13.tar.bz2
 firstboot-1.4.14.tar.bz2
 firstboot-1.4.15.tar.bz2
+firstboot-1.4.16.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- firstboot.spec	20 Jul 2006 21:05:58 -0000	1.79
+++ firstboot.spec	24 Jul 2006 20:22:26 -0000	1.80
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.15
+Version: 1.4.16
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,11 @@
 
 
 %changelog
+* Mon Jul 24 2006 Chris Lumens <clumens at redhat.com> 1.4.16-1
+- Fix system-config-soundcard API change.
+- Make sure firstboot starts after HAL (#199899).
+- Fix X startup race condition (Charlotte Richardson).
+
 * Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 1.4.15-1
 - Really disable the display module.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- sources	20 Jul 2006 21:05:58 -0000	1.75
+++ sources	24 Jul 2006 20:22:26 -0000	1.76
@@ -1 +1 @@
-3c44138efaff47523746d3ff70343d38  firstboot-1.4.15.tar.bz2
+55bcfa76fa5b76f892d21008a851d4e2  firstboot-1.4.16.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 20:29:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 16:29:26 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.25, 1.26 rhpxl.spec, 1.29,
	1.30 sources, 1.28, 1.29
Message-ID: <200607242029.k6OKTQqL021125@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21113

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	21 Jul 2006 18:43:58 -0000	1.25
+++ .cvsignore	24 Jul 2006 20:29:23 -0000	1.26
@@ -3,3 +3,4 @@
 rhpxl-0.20.tar.gz
 rhpxl-0.21.tar.gz
 rhpxl-0.22.tar.gz
+rhpxl-0.23.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rhpxl.spec	21 Jul 2006 18:43:58 -0000	1.29
+++ rhpxl.spec	24 Jul 2006 20:29:23 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.22
+Version: 0.23
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,11 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Mon Jul 24 2006 Chris Lumens <clumens at redhat.com> 0.23-1
+- Remove -terminate flag to fix X startup race condition
+  (Charlotte Richardson).
+- Fix synaptics detection and config file write out.
+
 * Fri Jul 21 2006 Chris Lumens <clumens at redhat.com> 0.22-1
 - Fix traceback on default log file location.
 - Restore driver options to config file to fix ppc installs.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	21 Jul 2006 18:43:58 -0000	1.28
+++ sources	24 Jul 2006 20:29:23 -0000	1.29
@@ -1 +1 @@
-c9d63727def9c6dd1dc792f5ea4ab606  rhpxl-0.22.tar.gz
+82cb61aad1df885acc79dfe227d4e136  rhpxl-0.23.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:01:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:01:36 -0400
Subject: rpms/mesa/devel mesa-6.5-r300-free-gart-mem.patch, NONE,
	1.1 mesa.spec, 1.68, 1.69
Message-ID: <200607242101.k6OL1adS019212@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19137

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-r300-free-gart-mem.patch 
Log Message:
* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-14.fc6
- Add mesa-6.5-r300-free-gart-mem.patch to make r300 driver free gart
  memory on context destroy.


mesa-6.5-r300-free-gart-mem.patch:
 r300_context.c |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 deletion(-)

--- NEW FILE mesa-6.5-r300-free-gart-mem.patch ---
diff-tree 17b5b882aefafabd1aad3dc759ff355165536b75 (from 3e9203e28680192dbbc54f38c2af9648205d6a01)
Author: Adam Jackson <ajax at freedesktop.org>
Date:   Fri Apr 21 19:53:52 2006 +0000

    Ensure all GART allocations are freed on context destruction, rather than
    waiting for the DRM to reap them at process exit.  Fixes (fatal) allocation
    failures in AIGLX configurations.
    
    Reviewed by: Aapo Tahkola

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 4943d54..21a474b 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -372,6 +372,53 @@ #endif
 	return GL_TRUE;
 }
 
+static void r300FreeGartAllocations(r300ContextPtr r300)
+{
+    int i, ret;
+    drm_radeon_mem_free_t memfree;
+
+    memfree.region = RADEON_MEM_REGION_GART;
+
+#if 0
+    if (r300->rmm->u_last + 1 >= r300->rmm->u_size)
+	resize_u_list(r300);
+#endif
+
+    for (i = r300->rmm->u_last + 1; i > 0; i--) {
+	if (r300->rmm->u_list[i].ptr == NULL) {
+	    continue;
+	}
+
+	if (r300->rmm->u_list[i].h_pending == 0 &&
+		r300->rmm->u_list[i].pending) {
+	    memfree.region_offset = (char *)r300->rmm->u_list[i].ptr -
+			(char *)r300->radeon.radeonScreen->gartTextures.map;
+	    ret = drmCommandWrite(r300->radeon.radeonScreen->driScreen->fd,
+				  DRM_RADEON_FREE, &memfree, sizeof(memfree));
+	    if (ret) {
+		fprintf(stderr, "Failed to free at %p\nret = %s\n",
+			r300->rmm->u_list[i].ptr, strerror(-ret));
+	    } else {
+		fprintf(stderr, "Really freed %d at age %x\n", i,
+			radeonGetAge((radeonContextPtr)r300));
+		if (i == r300->rmm->u_last)
+		    r300->rmm->u_last--;
+		r300->rmm->u_list[i].pending = 0;
+		r300->rmm->u_list[i].ptr = NULL;
+		if (r300->rmm->u_list[i].fb) {
+		    LOCK_HARDWARE(&(r300->radeon));
+		    ret = mmFreeMem(r300->rmm->u_list[i].fb);
+		    UNLOCK_HARDWARE(&(r300->radeon));
+		    if (ret) fprintf(stderr, "failed to free!\n");
+		    r300->rmm->u_list[i].fb = NULL;
+		}
+		r300->rmm->u_list[i].ref_count = 0;
+	    }
+	}
+    }
+    r300->rmm->u_head = i;
+}
+
 /* Destroy the device specific context.
  */
 void r300DestroyContext(__DRIcontextPrivate * driContextPriv)
@@ -408,7 +455,8 @@ void r300DestroyContext(__DRIcontextPriv
 			r300ReleaseDmaRegion(r300, &r300->dma.current, __FUNCTION__ );
 			r300FlushCmdBuf(r300, __FUNCTION__ );
 		}
-				
+
+		r300FreeGartAllocations(r300); // XXX SO MUCH HATE		
 		r300DestroyCmdBuf(r300);
 
 		if (radeon->state.scissor.pClipRects) {


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mesa.spec	12 Jul 2006 07:20:09 -0000	1.68
+++ mesa.spec	24 Jul 2006 21:01:30 -0000	1.69
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 13.1%{?dist}
+Release: 14%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -82,6 +82,7 @@
 Patch15: mesa-6.5-noexecstack.patch
 Patch16: mesa-6.5-force-r300.patch
 Patch17: mesa-6.5-fix-pbuffer-dispatch.patch
+Patch18: mesa-6.5-r300-free-gart-mem.patch
 
 # General patches from upstream go here:
 
@@ -266,6 +267,7 @@
 %patch15 -p0 -b .noexecstack
 %patch16 -p0 -b .force-r300
 %patch17 -p0 -b .fix-pbuffer-dispatch
+%patch18 -p1 -b .r300-free-gart-mem
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -457,7 +459,11 @@
 %{_bindir}/glxinfo
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-14.fc6
+- Add mesa-6.5-r300-free-gart-mem.patch to make r300 driver free gart
+  memory on context destroy.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 6.5-13.1.fc6
 - rebuild
 
 * Wed Jul 05 2006 Mike A. Harris <mharris at redhat.com> 6.5-13.fc6



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:15:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:15:24 -0400
Subject: rpms/samba/devel samba-3.0.23-logfiles.patch, 1.1, 1.2 samba.spec,
	1.68, 1.69
Message-ID: <200607242115.k6OLFOKF022295@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22151

Modified Files:
	samba-3.0.23-logfiles.patch samba.spec 
Log Message:
- Fix the -logfiles patch to close
  bz#199607 Samba compiled with wrong log path.
  bz#199206 smb.conf has incorrect log file path


samba-3.0.23-logfiles.patch:
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.23/packaging/Fedora/smb.conf     |    2 +-
 samba-3.0.23rc2/source/lib/popt_common.c   |    2 +-
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

Index: samba-3.0.23-logfiles.patch
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba-3.0.23-logfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.0.23-logfiles.patch	11 Jul 2006 16:02:58 -0000	1.1
+++ samba-3.0.23-logfiles.patch	24 Jul 2006 21:15:21 -0000	1.2
@@ -46,7 +46,7 @@
  # this tells Samba to use a separate log file for each machine
  # that connects
 -   log file = /usr/local/samba/var/log.%m
-+   log file = /usr/local/samba/var/%m.log
++   log file = /var/log/samba/%m.log
  
  # Put a capping on the size of the log files (in Kb).
     max log size = 50


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- samba.spec	24 Jul 2006 16:49:14 -0000	1.68
+++ samba.spec	24 Jul 2006 21:15:21 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.23a
-Release: 2
+Release: 3
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -446,6 +446,11 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-3
+- Fix the -logfiles patch to close
+  bz#199607 Samba compiled with wrong log path.
+  bz#199206 smb.conf has incorrect log file path
+
 * Mon Jul 24 2006 Jay Fenlason <fenlason at redhat.com> 3.0.23a-2
 - Upgrade to new upstream 3.0.23a
 - include upstream samr_alias patch



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:23:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:23:48 -0400
Subject: rpms/puretls/devel .cvsignore, 1.3, 1.4 puretls.spec, 1.11,
	1.12 sources, 1.2, 1.3
Message-ID: <200607242123.k6OLNmET006654@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/puretls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6569

Modified Files:
	.cvsignore puretls.spec sources 
Log Message:
- Merge with upstream version
- Natively compile packages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jan 2005 14:17:39 -0000	1.3
+++ .cvsignore	24 Jul 2006 21:23:45 -0000	1.4
@@ -1,4 +1 @@
-puretls-0.9b4.tar.gz
-puretls-0.9b4
-noarch
-*.src.rpm
+puretls-0.9b5.tar.gz


Index: puretls.spec
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/puretls.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- puretls.spec	22 Jul 2006 08:45:13 -0000	1.11
+++ puretls.spec	24 Jul 2006 21:23:45 -0000	1.12
@@ -1,16 +1,48 @@
-%define name		puretls
-%define rversion	0.9
-%define beta		b4
-%define release 	0.%{beta}.1jpp_6fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define beta		b5
+
 %define section		free
 
-Name:		%{name}
-Version:	%{rversion}
-Release: 	%{release}
+Name:		puretls
+Version:	0.9
+Release:	0.%{beta}.3jpp_1fc
 Summary:	Java implementation of SSLv3 and TLSv1
 License:	BSD style
 Group:		Development/Libraries/Java
-Source0:	%{name}-%{rversion}%{beta}.tar.gz
+Source0:	%{name}-%{version}%{beta}.tar.gz
 Url:		http://www.rtfm.com/puretls
 Requires:	cryptix
 Requires:	cryptix-asn1
@@ -19,10 +51,16 @@
 BuildRequires:	cryptix-asn1
 BuildRequires:	gnu.getopt
 BuildRequires:  java-devel >= 1.4.0
+%if ! %{gcj_support}
 Buildarch:	noarch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
-#Vendor:		JPackage Project
-#Distribution:	JPackage
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 PureTLS is a free Java-only implementation of the SSLv3 and TLSv1
@@ -33,7 +71,6 @@
 %package javadoc
 Group:	Development/Libraries/Java
 Summary:	Javadoc for %{name}
-Prereq: coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -43,12 +80,18 @@
 Summary:	Demo for %{name}
 Requires:	%{name}
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description demo
 Demo for %{name}.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -q -n %{name}-%{rversion}%{beta}
+%setup -q -n %{name}-%{version}%{beta}
 # fix perl location
 find . -type f |
     xargs grep -l "/usr/local/bin/perl5" | \
@@ -61,19 +104,22 @@
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
-# remove an empty .java source file (?!?!) that upsets javadoc
+# remove an empty .java source file that upsets javadoc
 rm src/COM/claymoresystems/sslg/CertVerifyPolicy.java
 
-# delete stuff that refers to sun.* classes.
+# delete test as it contains sun.* classes which will not work on different jvms
 rm src/COM/claymoresystems/provider/test/DSATest.java
 
 %build
 mkdir dist
 
-javaver=1.4
-export CLASSPATH=$(build-classpath cryptix cryptix-asn1 gnu.getopt)
-ant -Djdk.version=$javaver clean compile
-mv build/%{name}.jar dist/%{name}$javaver.jar
+for javaver in 1.4 ; do
+	export JAVA_HOME=$(find /usr/lib/jvm -name "java-$javaver*" -type d | sort | tail -1)
+	export CLASSPATH=$(build-classpath cryptix cryptix-asn1 gnu.getopt)
+	ant -Djdk.version=$javaver clean compile
+        mv build/%{name}.jar dist/%{name}$javaver.jar
+done
+
 ant javadoc
 
 %install
@@ -96,6 +142,10 @@
 install -m 644 *.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m 755 test.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,12 +159,48 @@
 fi
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%post demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun demo
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc ChangeLog COPYRIGHT INSTALL LICENSE README
 %{_javadir}-*/*.jar
 
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/puretls1.4-0.9.b5.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
@@ -123,38 +209,30 @@
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
-%changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0.9-0.b4.1jpp_6fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.9-0.b4.1jpp_5fc
-- rebuild
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0.9-0.%{beta}.1jpp_4fc
-- stop scriptlet spew
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0.9-0.b4.1jpp_2fc
-- rebuilt again
+# FIX ME: its building with an empty demo jar
+#%if %{gcj_support}
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/puretls-demo.jar.*
+#%endif
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Wed Jan 26 2005 Florian La Roche <laroche at redhat.com> 0.9-0.b4.1jpp_2fc
-- Remove additional "/" from perl path.
-
-* Fri Jan 21 2005 Gary Benson <gbenson at redhat.com> 0.9-0.b4.1jpp_1fc
-- Build into Fedora.
-
-* Mon Nov 22 2004 Fernando Nasser <fnasser at redhat.com> 0.9-0.b4.1jpp_2rh
-- Rebuild
-
-* Mon Mar  8 2004 Frank Ch. Eigler <fche at redhat.com> 0.9-0.b4.1jpp_1rh
-- RH vacuuming
-- limit attention to jdk 1.4
-- remove empty java source file
+%changelog
+* Mon Jul 24 2006 Matt Wringe <mwringe at redhat.com> - 0.9-0.b5.3jpp_1fc
+- Merge with upstream version
+- Natively compile packages
+
+* Mon Jul 24 2006 Matt Wringe <mwringe at redhat.com> - 0.9-0.b5.3jpp
+- Add conditional native compiling
+- Remove test that depends on sun.* classes
+- Remove additional "/" from perl path
+
+* Mon Jul 24 2006 Fernando Nasser <fnasser at redhat.com> - 0.9-0.b5.2jpp
+- First JPP 1.7 build
+
+* Mon Oct 17 2005 Jason Corley <jason.corley at gmail.com> - 0.9-0.b5.1jpp
+- 0.9b5
+
+* Wed Aug 25 2004 Fernando Nasser <fnasser at redhat.com> - 0.9-0.b4.2jpp
+- Remove support for JDK 1.3
+- Rebuild with Ant 1.6.2
 
 * Wed Jul 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-0.b4.1jpp
 - Update to 0.9b4.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/puretls/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 10:50:27 -0000	1.2
+++ sources	24 Jul 2006 21:23:45 -0000	1.3
@@ -1 +1 @@
-b2e4e947af30387b86dbf3473fdbd103  puretls-0.9b4.tar.gz
+f14690ef749f21dc3b98a7293191fff3  puretls-0.9b5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:25:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:25:13 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.493, 1.494 kernel-2.6.spec, 1.2441,
	1.2442 sources, 1.451, 1.452 upstream, 1.401,
	1.402 patch-2.6.18-rc2-git2.bz2.sign, 1.1, NONE
Message-ID: <200607242125.k6OLPDue007084@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6965

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.18-rc2-git2.bz2.sign 
Log Message:
git3


--- NEW FILE patch-2.6.18-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExRkryGugalF9Dw4RAl9cAKCMAyTKb5YJ8r/lKM9114rMGleleACfUurF
94Sg1EiQgHv9L8BU+wrCMjY=
=+1O/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- .cvsignore	24 Jul 2006 15:50:12 -0000	1.493
+++ .cvsignore	24 Jul 2006 21:25:08 -0000	1.494
@@ -8,4 +8,4 @@
 find-provides
 kernel-2.6.spec
 xen-20060719.tar.bz2
-patch-2.6.18-rc2-git2.bz2
+patch-2.6.18-rc2-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2441
retrieving revision 1.2442
diff -u -r1.2441 -r1.2442
--- kernel-2.6.spec	24 Jul 2006 17:47:49 -0000	1.2441
+++ kernel-2.6.spec	24 Jul 2006 21:25:08 -0000	1.2442
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git2.bz2
+Patch2: patch-2.6.18-rc2-git3.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1633,7 +1633,7 @@
 
 %changelog
 * Mon Jul 24 2006 Dave Jones <davej at redhat.com>
-- 2.6.18rc2-git2
+- 2.6.18rc2-git2 & git3
 - Fix PI Futex exit crash.
 
 * Mon Jul 24 2006 Jon Masters <jcm at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- sources	24 Jul 2006 15:50:12 -0000	1.451
+++ sources	24 Jul 2006 21:25:09 -0000	1.452
@@ -4,4 +4,4 @@
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
 d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
-4f79ea8e626a13bcddf7eb1402058854  patch-2.6.18-rc2-git2.bz2
+f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- upstream	24 Jul 2006 15:50:12 -0000	1.401
+++ upstream	24 Jul 2006 21:25:09 -0000	1.402
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git2.bz2
+patch-2.6.18-rc2-git3.bz2


--- patch-2.6.18-rc2-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:40:47 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.302, 1.303 anaconda.spec, 1.427,
	1.428 sources, 1.424, 1.425
Message-ID: <200607242140.k6OLel6d010940@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10888/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.64-1 on branch devel from anaconda-11.1.0.64-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- .cvsignore	21 Jul 2006 21:11:35 -0000	1.302
+++ .cvsignore	24 Jul 2006 21:40:44 -0000	1.303
@@ -1 +1 @@
-anaconda-11.1.0.63.tar.bz2
+anaconda-11.1.0.64.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- anaconda.spec	21 Jul 2006 21:11:35 -0000	1.427
+++ anaconda.spec	24 Jul 2006 21:40:44 -0000	1.428
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.63
+Version: 11.1.0.64
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 24 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.64-1
+- Fix build failure (pjones)
+- Fix error handling when adding iscsi 
+- Make things a bit more flexible based on the install class
+- Fix noipv4 (dcantrel)
+- Try not to run dmidecode a bazillion times
+- Cleanups for various package selection things
+
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.63-1
 - Fix serial kickstart installs (clumens)
 - Add labels for LVM and RAID (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -r1.424 -r1.425
--- sources	21 Jul 2006 21:11:35 -0000	1.424
+++ sources	24 Jul 2006 21:40:44 -0000	1.425
@@ -1 +1 @@
-8d463708d3074bd6c2acc9e094bd1b90  anaconda-11.1.0.63.tar.bz2
+41c40c612e40102118c7be12288e90b0  anaconda-11.1.0.64.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:44:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:44:26 -0400
Subject: rpms/beagle/devel beagle.spec,1.62,1.63
Message-ID: <200607242144.k6OLiQVw011808@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11746

Modified Files:
	beagle.spec 
Log Message:
add beagle.desktop to file list



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- beagle.spec	24 Jul 2006 20:13:40 -0000	1.62
+++ beagle.spec	24 Jul 2006 21:44:24 -0000	1.63
@@ -200,7 +200,7 @@
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes
-#%{_sysconfdir}/xdg/autostart/beagle.desktop
+%{_sysconfdir}/xdg/autostart/beagle.desktop
 
 %files -n libbeagle
 %defattr(-, root, root)



From fedora-cvs-commits at redhat.com  Mon Jul 24 21:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 17:48:52 -0400
Subject: rpms/gfs2-utils/devel .cvsignore, 1.3, 1.4 gfs2-utils.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200607242148.k6OLmq0F027738@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gfs2-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27706

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
Build with new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Jul 2006 21:10:45 -0000	1.3
+++ .cvsignore	24 Jul 2006 21:48:50 -0000	1.4
@@ -1 +1 @@
-gfs2-utils-0.1.1.tar.gz
+gfs2-utils-0.1.2.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gfs2-utils.spec	14 Jul 2006 21:10:45 -0000	1.5
+++ gfs2-utils.spec	24 Jul 2006 21:48:50 -0000	1.6
@@ -11,7 +11,7 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.1
+Version: 0.1.2
 Release: 0.fc6.0
 License: GPL
 Group: System Environment/Kernel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Jul 2006 21:10:45 -0000	1.3
+++ sources	24 Jul 2006 21:48:50 -0000	1.4
@@ -1 +1 @@
-5d2557915c3b6360922336ec7444be06  gfs2-utils-0.1.1.tar.gz
+bfcd7fc17d5330b45e2d7196ef2d9404  gfs2-utils-0.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:04:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:04:31 -0400
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.4,1.5
Message-ID: <200607242204.k6OM4Vt4031675@cvs.devel.redhat.com>

Author: rrelyea

Update of /cvs/dist/rpms/pcsc-lite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31503

Modified Files:
	pcsc-lite.spec 
Log Message:


start pcscd when pcsc-lite is installed.



Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/dist/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pcsc-lite.spec	16 Jul 2006 18:43:32 -0000	1.4
+++ pcsc-lite.spec	24 Jul 2006 22:04:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.3.1
-Release:        4
+Release:        5
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -13,8 +13,11 @@
 
 BuildRequires:  libusb-devel >= 0.1.7
 BuildRequires:  doxygen
+Requires(post): initscripts
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
 Requires:       pcsc-ifd-handler
 # 390 does not have libusb or smartCards
 ExcludeArch: s390 s390x
@@ -93,7 +96,13 @@
 
 
 %post
-/sbin/chkconfig --add pcscd
+if [ $1 -eq 1 ] ; then
+  /sbin/chkconfig --add pcscd
+  /sbin/chkconfig --level 345 pcscd on
+  %{_initrddir}/pcscd start 
+else
+  %{_initrddir}/pcscd try-restart  || :
+fi
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -102,7 +111,7 @@
 fi
 
 %postun
-[ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart >/dev/null || :
+[ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart  || :
 
 %post libs -p /sbin/ldconfig
 
@@ -141,6 +150,9 @@
 
 
 %changelog
+* Sun Jul 24 2006 Bob Relyea <rrelyea at redhat.com> - 1.3.1-5
+- start pcscd when pcsc-lite is installed
+
 * Sun Jul 16 2006 Florian La Roche <laroche at redhat.com> - 1.3.1-4
 - fix excludearch line
 



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:04:55 -0400
Subject: rpms/eclipse-cdt/devel .cvsignore, 1.17, 1.18 eclipse-cdt.spec, 1.47,
	1.48 sources, 1.19, 1.20
Message-ID: <200607242204.k6OM4tor031767@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31716

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Mon Jul 24 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_8fc
- Update autotools sources.
- Rebuild.





Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Jul 2006 22:38:32 -0000	1.17
+++ .cvsignore	24 Jul 2006 22:04:52 -0000	1.18
@@ -1 +1,2 @@
 eclipse-cdt-fetched-src-3.1.0.tar.bz2
+eclipse-cdt-autotools-0.0.3.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- eclipse-cdt.spec	24 Jul 2006 09:32:26 -0000	1.47
+++ eclipse-cdt.spec	24 Jul 2006 22:04:53 -0000	1.48
@@ -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
@@ -43,7 +43,7 @@
 #   -DdontUnzip=true fetch
 # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng
 Source0: %{name}-fetched-src-%{version}.tar.bz2
-Source1: %{name}-autotools-0.0.2.tar.gz
+Source1: %{name}-autotools-0.0.3.tar.gz
 
 Patch1: %{name}-no-cvs2-patch
 Patch2: %{name}-platform-build-linux.patch
@@ -267,6 +267,10 @@
 %endif
 
 %changelog
+* Mon Jul 24 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_8fc
+- Update autotools sources.
+- Rebuild.
+
 * Mon Jul 24 2006 Ben Konrath <bkonrath at redhat.com> 3.1.0-1jpp_7fc
 - Rebuld.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	20 Jul 2006 21:10:56 -0000	1.19
+++ sources	24 Jul 2006 22:04:53 -0000	1.20
@@ -1,2 +1,2 @@
 8ea0a06e13227728d3922bab3496509e  eclipse-cdt-fetched-src-3.1.0.tar.bz2
-c21690f7f337db8e8aa39949ff136428  eclipse-cdt-autotools-0.0.2.tar.gz
+c475012b6bf7e3cd3aea20a690b50c15  eclipse-cdt-autotools-0.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:22:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:22:53 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2442,
	1.2443 linux-2.6-lockdep-fixes.patch, 1.11, 1.12
Message-ID: <200607242222.k6OMMr05017996@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17343

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Log Message:
inotify locking bugfix



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2442
retrieving revision 1.2443
diff -u -r1.2442 -r1.2443
--- kernel-2.6.spec	24 Jul 2006 21:25:08 -0000	1.2442
+++ kernel-2.6.spec	24 Jul 2006 22:22:49 -0000	1.2443
@@ -1635,6 +1635,7 @@
 * Mon Jul 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc2-git2 & git3
 - Fix PI Futex exit crash.
+- Fix an inotify locking bug.
 
 * Mon Jul 24 2006 Jon Masters <jcm at redhat.com>
 - Change kabideps location.

linux-2.6-lockdep-fixes.patch:
 linux-2.6.17-mm6/include/net/sock.h           |   33 +++++++++++++++++++++++---
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 ++--
 linux-2.6.18-rc1/fs/inotify_user.c            |    3 --
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++++++++-
 linux-2.6.18-rc1/net/socket.c                 |    8 +++++-
 5 files changed, 52 insertions(+), 10 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-2.6-lockdep-fixes.patch	15 Jul 2006 07:25:06 -0000	1.11
+++ linux-2.6-lockdep-fixes.patch	24 Jul 2006 22:22:50 -0000	1.12
@@ -338,3 +338,147 @@
  asmlinkage long sys_socket(int family, int type, int protocol)
 
 
+From davej  Mon Jul 24 15:24:41 2006
+Return-Path: <>
+Received: from pobox.devel.redhat.com [10.11.255.8]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Mon, 24 Jul 2006 15:24:41 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+	 Mon, 24 Jul 2006 15:23:20 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6OJNKqN031227
+	for <davej at pobox.devel.redhat.com>; Mon, 24 Jul 2006 15:23:20 -0400
+Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6OJNK16004919
+	for <davej at redhat.com>; Mon, 24 Jul 2006 15:23:20 -0400
+Received: from pimp.vs19.net (pimp.vs19.net [81.171.100.24])
+	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k6OJND2O024693
+	for <davej at redhat.com>; Mon, 24 Jul 2006 15:23:13 -0400
+Received: from www-data by pimp.vs19.net with local (Exim 4.50)
+	id 1G561D-0004O8-2F
+	for davej at redhat.com; Mon, 24 Jul 2006 19:23:07 +0000
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932233AbWGXRWO (ORCPT <rfc822;linux-kernel-outgoing>); Mon, 24 Jul 2006 13:22:14 -0400
+Received: from a222036.upc-a.chello.nl ([62.163.222.36]:11908 "EHLO laptopd505.fenrus.org") by vger.kernel.org with ESMTP id S932231AbWGXRWL (ORCPT <rfc822;linux-kernel at vger.kernel.org>); Mon, 24 Jul 2006 13:22:11 -0400
+Received: from laptopd505.fenrus.org (localhost.localdomain [127.0.0.1]) by laptopd505.fenrus.org (8.13.4/8.13.4) with ESMTP id k6OHLCCi006591; Mon, 24 Jul 2006 19:21:12 +0200
+Received: (from arjan at localhost) by laptopd505.fenrus.org (8.13.4/8.13.4/Submit) id k6OHLB13006590; Mon, 24 Jul 2006 19:21:11 +0200
+X-Authentication-Warning: laptopd505.fenrus.org: arjan set sender to arjan at linux.intel.com using -f
+Subject: [patch] inotify: fix deadlock found by lockdep
+From: Arjan van de Ven <arjan at linux.intel.com>
+To: Reuben Farrelly <reuben-lkml at reub.net>
+Cc: Linux Kernel <linux-kernel at vger.kernel.org>, Ingo Molnar <mingo at elte.hu>,
+        John McCutchan <john at johnmccutchan.com>, Andrew Morton <akpm at osdl.org>,
+        rml at novell.com, viro at zeniv.linux.org.uk
+In-Reply-To: <44C2C90B.6090108 at reub.net>
+References: <20060713224800.6cbdbf5d.akpm at osdl.org>  <44C2C90B.6090108 at reub.net>
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+Date: 	Mon, 24 Jul 2006 19:21:10 +0200
+Message-Id: <1153761671.3043.89.camel at laptopd505.fenrus.org>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4)
+Sender: linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+X-Mailing-List: 	linux-kernel at vger.kernel.org
+X-RedHat-Spam-Score: 0 
+Status: RO
+Content-Length: 2993
+Lines: 95
+
+Subject: [patch] inotify: fix deadlock found by lockdep
+From: Arjan van de Ven <arjan at linux.intel.com>
+
+This is a real deadlock, a nice complex one:
+(warning: long explanation follows so that Andrew can have a complete
+patch description)
+
+it's an ABCDA deadlock:
+
+A iprune_mutex 
+B inode->inotify_mutex
+C ih->mutex
+D dev->ev_mutex
+
+
+The AB relationship comes straight from invalidate_inodes()
+ 
+int invalidate_inodes(struct super_block * sb)
+{
+        int busy;
+        LIST_HEAD(throw_away);
+
+        mutex_lock(&iprune_mutex);
+        spin_lock(&inode_lock);
+        inotify_unmount_inodes(&sb->s_inodes);
+
+where inotify_umount_inodes() takes the 
+                mutex_lock(&inode->inotify_mutex);
+
+The BC relationship comes directly from inotify_find_update_watch():
+s32 inotify_find_update_watch(struct inotify_handle *ih, struct inode *inode,
+                              u32 mask)
+{
+   ...
+        mutex_lock(&inode->inotify_mutex);
+        mutex_lock(&ih->mutex);
+
+
+The CD relationship comes from inotify_rm_wd:
+inotify_rm_wd does
+        mutex_lock(&inode->inotify_mutex);
+        mutex_lock(&ih->mutex)
+and then calls inotify_remove_watch_locked() which calls
+notify_dev_queue_event() which does
+	        mutex_lock(&dev->ev_mutex);
+
+(this strictly is a BCD relationship)
+
+
+The DA relationship comes from the most interesting part:
+
+  [<ffffffff8022d9f2>] shrink_icache_memory+0x42/0x270
+  [<ffffffff80240dc4>] shrink_slab+0x11d/0x1c9
+  [<ffffffff802b5104>] try_to_free_pages+0x187/0x244
+  [<ffffffff8020efed>] __alloc_pages+0x1cd/0x2e0
+  [<ffffffff8025e1f8>] cache_alloc_refill+0x3f8/0x821
+  [<ffffffff8020a5e5>] kmem_cache_alloc+0x85/0xcb
+  [<ffffffff802db027>] kernel_event+0x2e/0x122
+  [<ffffffff8021d61c>] inotify_dev_queue_event+0xcc/0x140
+
+inotify_dev_queue_event schedules a kernel_event which does a
+kmem_cache_alloc( , GFP_KERNEL) which may try to shrink slabs, including
+the inode cache .. which then takes iprune_mutex. 
+
+And voila, there is an AB, a BC, a CD relationship (even a direct BCD),
+and also now a DA relationship -> a circular type AB-BA deadlock but
+involving 4 locks.
+
+The solution is simple: kernel_event() is NOT allowed to use GFP_KERNEL,
+but must use GFP_NOFS to not cause recursion into the VFS.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+
+Index: linux-2.6.18-rc1/fs/inotify_user.c
+===================================================================
+--- linux-2.6.18-rc1.orig/fs/inotify_user.c
++++ linux-2.6.18-rc1/fs/inotify_user.c
+@@ -187,7 +187,7 @@ static struct inotify_kernel_event * ker
+ {
+ 	struct inotify_kernel_event *kevent;
+ 
+-	kevent = kmem_cache_alloc(event_cachep, GFP_KERNEL);
++	kevent = kmem_cache_alloc(event_cachep, GFP_NOFS);
+ 	if (unlikely(!kevent))
+ 		return NULL;
+ 
+
+
+
+-
+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/
+
+



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:33:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:33:11 -0400
Subject: rpms/mesa/devel mesa.spec,1.69,1.70
Message-ID: <200607242233.k6OMXA75020588@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20552

Modified Files:
	mesa.spec 
Log Message:
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 6.5-15.fc6
- Attempt to add selinux awareness; check if we can map executable memory
  and fail softly if not.  Removes the need for allow_execmem from huge
  chunks of the desktop.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mesa.spec	24 Jul 2006 21:01:30 -0000	1.69
+++ mesa.spec	24 Jul 2006 22:33:06 -0000	1.70
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -82,7 +82,8 @@
 Patch15: mesa-6.5-noexecstack.patch
 Patch16: mesa-6.5-force-r300.patch
 Patch17: mesa-6.5-fix-pbuffer-dispatch.patch
-Patch18: mesa-6.5-r300-free-gart-mem.patch
+Patch18: mesa-6.5-selinux-awareness.patch
+Patch19: mesa-6.5-r300-free-gart-mem.patch
 
 # General patches from upstream go here:
 
@@ -102,6 +103,7 @@
 BuildRequires: glut-devel
 BuildRequires: libXt-devel
 BuildRequires: makedepend
+BuildRequires: libselinux-devel
 
 %if %{with_motif}
 BuildRequires: openmotif-devel
@@ -117,6 +119,7 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+Requires: libselinux
 
 Provides: libGL
 
@@ -267,7 +270,8 @@
 %patch15 -p0 -b .noexecstack
 %patch16 -p0 -b .force-r300
 %patch17 -p0 -b .fix-pbuffer-dispatch
-%patch18 -p1 -b .r300-free-gart-mem
+%patch18 -p1 -b .selinux-awareness
+%patch19 -p1 -b .r300-free-gart-mem
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -459,6 +463,11 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 6.5-15.fc6
+- Attempt to add selinux awareness; check if we can map executable memory
+  and fail softly if not.  Removes the need for allow_execmem from huge
+  chunks of the desktop.
+
 * Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-14.fc6
 - Add mesa-6.5-r300-free-gart-mem.patch to make r300 driver free gart
   memory on context destroy.



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:40:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:40:46 -0400
Subject: rpms/kernel/devel/scripts reconfig.sh,1.3,1.4
Message-ID: <200607242240.k6OMekLf022277@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv22235/scripts

Modified Files:
	reconfig.sh 
Log Message:
reconfig all configs, not only xen ones


Index: reconfig.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/reconfig.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- reconfig.sh	19 Jul 2006 17:27:25 -0000	1.3
+++ reconfig.sh	24 Jul 2006 22:40:43 -0000	1.4
@@ -6,7 +6,7 @@
 rm -f kernel-*.config
 cp ../../kernel-2.6.$V-*.config .
 
-for i in kernel-*xen.config
+for i in kernel-*.config
 do
 	echo $i
 	rm -f .config



From fedora-cvs-commits at redhat.com  Mon Jul 24 22:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 18:45:50 -0400
Subject: rpms/kernel/devel/scripts rebase-xen.sh,1.4,1.5
Message-ID: <200607242245.k6OMjoLl023367@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/scripts
In directory cvs.devel.redhat.com:/tmp/cvs-serv23324/scripts

Modified Files:
	rebase-xen.sh 
Log Message:
rebase xen now uses cset number instead of date


Index: rebase-xen.sh
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/scripts/rebase-xen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rebase-xen.sh	3 May 2006 19:36:56 -0000	1.4
+++ rebase-xen.sh	24 Jul 2006 22:45:43 -0000	1.5
@@ -8,11 +8,11 @@
 make clean
 popd
 
-DATE=`date +%Y%m%d`
-tar cvf xen-$DATE.tar xen || exit 1
-rm -f xen-$DATE.tar.bz2
-bzip2 -v9 xen-$DATE.tar || exit 1
+CSET=`hg tip | grep changeset | cut -f2 -d':' | sed 's/ //g'`
+tar cvf xen-$CSET.tar xen || exit 1
+rm -f xen-$CSET.tar.bz2
+bzip2 -v9 xen-$CSET.tar || exit 1
 
 set +x
 
-ls -l xen-$DATE.tar.bz2
+ls -l xen-$CSET.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 23:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 19:07:24 -0400
Subject: rpms/kernel/devel .cvsignore, 1.494, 1.495 kernel-2.6.spec, 1.2443,
	1.2444 sources, 1.452, 1.453
Message-ID: <200607242307.k6ON7O4U010952@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10908

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
use version 10712 for xen HV


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- .cvsignore	24 Jul 2006 21:25:08 -0000	1.494
+++ .cvsignore	24 Jul 2006 23:07:18 -0000	1.495
@@ -1,11 +1,10 @@
 kernel-2.6.*.config
 temp-*
 kernel-2.6.17
-xen-20060610.tar.bz2
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
 kabitool
 find-provides
 kernel-2.6.spec
-xen-20060719.tar.bz2
 patch-2.6.18-rc2-git3.bz2
+xen-10712.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2443
retrieving revision 1.2444
diff -u -r1.2443 -r1.2444
--- kernel-2.6.spec	24 Jul 2006 22:22:49 -0000	1.2443
+++ kernel-2.6.spec	24 Jul 2006 23:07:18 -0000	1.2444
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_version 20060719
+%define xen_hv_cset 10712
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags verbose=y debug=y crash_debug=y
@@ -222,7 +222,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-%{xen_version}.tar.bz2
+Source1: xen-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -696,13 +696,13 @@
   rm -rf deleteme2 &
 fi
 
-if [ ! -d xen-%{xen_version} ]; then
+if [ ! -d xen-%{xen_hv_cset} ]; then
   # Ok, first time we do a make prep
 %setup -D -T -q -n %{name}-%{version} -a1
   cp %{SOURCE2} .
-  mv xen xen-%{xen_version}
+  mv xen xen-%{xen_hv_cset}
 fi
-cp -rl xen-%{xen_version} xen
+cp -rl xen-%{xen_hv_cset} xen
 
 # Any necessary hypervisor patches go here
 %endif
@@ -1632,6 +1632,10 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Juan Quintela <quintela at redhat.com>
+- Use cset number instead of date for xen hypervisor.
+- Update xen hypervisor to cset 10712.
+
 * Mon Jul 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc2-git2 & git3
 - Fix PI Futex exit crash.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- sources	24 Jul 2006 21:25:09 -0000	1.452
+++ sources	24 Jul 2006 23:07:18 -0000	1.453
@@ -1,7 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-7f29344672bce4bd7304f61abc7893c1  xen-20060610.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
-d42bd8204e87f318eef05c847484205b  xen-20060719.tar.bz2
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
+45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 24 23:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 19:17:58 -0400
Subject: rpms/kernel/devel xen-sched-sedf.patch,1.2,NONE
Message-ID: <200607242317.k6ONHwXG017068@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16863

Removed Files:
	xen-sched-sedf.patch 
Log Message:
remove old xen patch not used anymore


--- xen-sched-sedf.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 25 00:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 20:41:29 -0400
Subject: rpms/mesa/devel mesa-6.5-selinux-awareness.patch, NONE,
	1.1 mesa.spec, 1.70, 1.71
Message-ID: <200607250041.k6P0fTea025962@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25919

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-selinux-awareness.patch 
Log Message:
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 6.5-15.fc6
- Attempt to add selinux awareness; check if we can map executable memory
  and fail softly if not.  Removes the need for allow_execmem from huge
  chunks of the desktop.


mesa-6.5-selinux-awareness.patch:
 configs/linux-dri                            |    3 ++-
 src/mesa/drivers/dri/r200/r200_context.c     |    8 ++++++--
 src/mesa/drivers/dri/radeon/radeon_context.c |    8 ++++++--
 src/mesa/main/execmem.c                      |   17 ++++++++++++++---
 src/mesa/shader/slang/slang_execute_x86.c    |    3 ++-
 src/mesa/tnl/t_vb_arbprogram_sse.c           |    3 ++-
 src/mesa/tnl/t_vertex_sse.c                  |    8 ++++++--
 src/mesa/x86/rtasm/x86sse.c                  |    8 +++++---
 src/mesa/x86/rtasm/x86sse.h                  |    4 ++--
 9 files changed, 45 insertions(+), 17 deletions(-)

--- NEW FILE mesa-6.5-selinux-awareness.patch ---
--- Mesa-6.5/configs/linux-dri.selinux-awareness	2006-07-24 18:26:19.000000000 -0400
+++ Mesa-6.5/configs/linux-dri	2006-07-24 18:26:19.000000000 -0400
@@ -38,7 +38,8 @@
 EXTRA_LIB_PATH =
 
 LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
+		-lselinux
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
                 $(LIBDRM_LIB)
 
--- Mesa-6.5/src/mesa/main/execmem.c.selinux-awareness	2006-01-25 10:09:47.000000000 -0500
+++ Mesa-6.5/src/mesa/main/execmem.c	2006-07-24 19:21:13.000000000 -0400
@@ -36,7 +36,7 @@
 
 
 
-#if defined(__linux__) && !defined(XFree86Server)
+#if defined(__linux__)
 
 /*
  * Allocate a large block of memory which can hold code then dole it out
@@ -46,6 +46,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include "mm.h"
+#include <selinux/selinux.h>
 
 #define EXEC_HEAP_SIZE (128*1024)
 
@@ -55,9 +56,16 @@
 static unsigned char *exec_mem = NULL;
 
 
-static void
+static int
 init_heap(void)
 {
+
+   if (is_selinux_enabled()) {
+      if (!security_get_boolean_active("allow_execmem") ||
+	  !security_get_boolean_pending("allow_execmem"))
+	 return 0;
+   }
+
    if (!exec_heap)
       exec_heap = mmInit( 0, EXEC_HEAP_SIZE );
    
@@ -65,6 +73,8 @@
       exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE, 
 					PROT_EXEC | PROT_READ | PROT_WRITE, 
 					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+   return (exec_mem != NULL);
 }
 
 
@@ -76,7 +86,8 @@
 
    _glthread_LOCK_MUTEX(exec_mutex);
 
-   init_heap();
+   if (!init_heap())
+       return NULL;
 
    if (exec_heap) {
       size = (size + 31) & ~31;
--- Mesa-6.5/src/mesa/drivers/dri/r200/r200_context.c.selinux-awareness	2006-03-31 12:29:46.000000000 -0500
+++ Mesa-6.5/src/mesa/drivers/dri/r200/r200_context.c	2006-07-24 18:26:19.000000000 -0400
@@ -539,8 +539,12 @@
    }
 
    if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	 r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      void *test = NULL;
+      if ((test = _mesa_exec_malloc(64)))
+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+	    r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      if (test)
+         _mesa_exec_free(test);
 
       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
    }
--- Mesa-6.5/src/mesa/drivers/dri/radeon/radeon_context.c.selinux-awareness	2006-03-31 12:29:46.000000000 -0500
+++ Mesa-6.5/src/mesa/drivers/dri/radeon/radeon_context.c	2006-07-24 18:26:19.000000000 -0400
@@ -471,8 +471,12 @@
    }
 
    if (rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_TCL) {
-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	 radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      void *test = NULL;
+      if ((test = _mesa_exec_malloc(64)))
+         if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
+	    radeonVtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
+      if (test)
+         _mesa_exec_free(test);
 
       _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
    }
--- Mesa-6.5/src/mesa/shader/slang/slang_execute_x86.c.selinux-awareness	2006-03-21 20:30:38.000000000 -0500
+++ Mesa-6.5/src/mesa/shader/slang/slang_execute_x86.c	2006-07-24 18:26:19.000000000 -0400
@@ -464,7 +464,8 @@
 	 * The built-in library occupies 450K, so we can be safe for now.
 	 * It is going to change in the future, when we get assembly analysis running.
 	 */
-	x86_init_func_size (&G.f, 1048576);
+	if (!x86_init_func_size (&G.f, 1048576))
+	    return GL_FALSE;
 	G.r_eax = x86_make_reg (file_REG32, reg_AX);
 	G.r_ecx = x86_make_reg (file_REG32, reg_CX);
 	G.r_edx = x86_make_reg (file_REG32, reg_DX);
--- Mesa-6.5/src/mesa/x86/rtasm/x86sse.c.selinux-awareness	2006-02-28 12:53:53.000000000 -0500
+++ Mesa-6.5/src/mesa/x86/rtasm/x86sse.c	2006-07-24 18:26:19.000000000 -0400
@@ -1027,15 +1027,17 @@
 }
 
 
-void x86_init_func( struct x86_function *p )
+int x86_init_func( struct x86_function *p )
 {
-   x86_init_func_size(p, 1024);
+   return x86_init_func_size(p, 1024);
 }
 
-void x86_init_func_size( struct x86_function *p, GLuint code_size )
+int x86_init_func_size( struct x86_function *p, GLuint code_size )
 {
    p->store = _mesa_exec_malloc(code_size);
    p->csr = p->store;
+
+   return (p->store != NULL);
 }
 
 void x86_release_func( struct x86_function *p )
--- Mesa-6.5/src/mesa/x86/rtasm/x86sse.h.selinux-awareness	2006-02-28 12:53:53.000000000 -0500
+++ Mesa-6.5/src/mesa/x86/rtasm/x86sse.h	2006-07-24 18:26:19.000000000 -0400
@@ -80,8 +80,8 @@
  */
 
 
-void x86_init_func( struct x86_function *p );
-void x86_init_func_size( struct x86_function *p, GLuint code_size );
+int x86_init_func( struct x86_function *p );
+int x86_init_func_size( struct x86_function *p, GLuint code_size );
 void x86_release_func( struct x86_function *p );
 void (*x86_get_func( struct x86_function *p ))( void );
 
--- Mesa-6.5/src/mesa/tnl/t_vb_arbprogram_sse.c.selinux-awareness	2006-03-14 10:23:16.000000000 -0500
+++ Mesa-6.5/src/mesa/tnl/t_vb_arbprogram_sse.c	2006-07-24 18:26:19.000000000 -0400
@@ -1236,7 +1236,8 @@
       p->compiled_func = NULL;
    }
 
-   x86_init_func(&cp.func);
+   if (!x86_init_func(&cp.func))
+       return GL_FALSE;
 
    cp.fpucntl = RESTORE_FPU;
 
--- Mesa-6.5/src/mesa/tnl/t_vertex_sse.c.selinux-awareness	2005-09-16 14:14:25.000000000 -0400
+++ Mesa-6.5/src/mesa/tnl/t_vertex_sse.c	2006-07-24 18:26:19.000000000 -0400
@@ -348,7 +348,8 @@
    struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
    GLubyte *fixup, *label;
 
-   x86_init_func(&p->func);
+   if (!x86_init_func(&p->func))
+       return GL_FALSE;
    
    /* Push a few regs?
     */
@@ -646,7 +647,10 @@
    p.identity = x86_make_reg(file_XMM, 6);
    p.chan0 = x86_make_reg(file_XMM, 7);
 
-   x86_init_func(&p.func);
+   if (!x86_init_func(&p.func)) {
+      vtx->codegen_emit = NULL;
+      return;
+   }
 
    if (build_vertex_emit(&p)) {
       _tnl_register_fastpath( vtx, GL_TRUE );


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mesa.spec	24 Jul 2006 22:33:06 -0000	1.70
+++ mesa.spec	25 Jul 2006 00:41:25 -0000	1.71
@@ -271,7 +271,7 @@
 %patch16 -p0 -b .force-r300
 %patch17 -p0 -b .fix-pbuffer-dispatch
 %patch18 -p1 -b .selinux-awareness
-%patch19 -p1 -b .r300-free-gart-mem
+#%patch19 -p1 -b .r300-free-gart-mem
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -467,6 +467,7 @@
 - Attempt to add selinux awareness; check if we can map executable memory
   and fail softly if not.  Removes the need for allow_execmem from huge
   chunks of the desktop.
+- Disable the r300 gart fix for not compiling.
 
 * Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-14.fc6
 - Add mesa-6.5-r300-free-gart-mem.patch to make r300 driver free gart



From fedora-cvs-commits at redhat.com  Tue Jul 25 02:27:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 22:27:16 -0400
Subject: rpms/kernel/devel linux-2.6-dm-mirroring.patch, NONE,
	1.1 kernel-2.6.spec, 1.2444, 1.2445
Message-ID: <200607250227.k6P2RGXO020435@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20253

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-dm-mirroring.patch 
Log Message:
dm mirroring


linux-2.6-dm-mirroring.patch:
 drivers/md/dm-log.c                    |  132 ++++--
 drivers/md/dm-log.h                    |   31 +
 drivers/md/dm-raid1.c                  |  708 +++++++++++++++++++++++++++------
 linux-2.6.18-rc2/drivers/md/dm-log.c   |   15 
 linux-2.6.18-rc2/drivers/md/dm-log.h   |   10 
 linux-2.6.18-rc2/drivers/md/dm-raid1.c |   48 ++
 6 files changed, 786 insertions(+), 158 deletions(-)

--- NEW FILE linux-2.6-dm-mirroring.patch ---
>From jbrassow at redhat.com Mon Jul 24 19:01:26 2006
Subject: [PATCH 5 of 14] - device-mapper mirroring (rebase)
From: Jonathan Brassow <jbrassow at redhat.com>
To: davej at redhat.com
Content-Type: text/plain
Date: Mon, 24 Jul 2006 18:01:24 -0500
Message-Id: <1153782084.20161.21.camel at hydrogen.msp.redhat.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 (2.2.3-4.fc4) 
Content-Transfer-Encoding: 7bit
X-Mailman-Version: 2.0.13
Precedence: bulk
Reply-To: davej at redhat.com
Status: RO
Content-Length: 2947
Lines: 97

After checking out the code properly, I see patches 1 - 4 are not
needed.  5 - 14 are.

 brassow

This patch adds read balancing.  The round-robin method is used, with
MIN_READS (128) requests going to each device.
Index: linux-2.6.18-rc2/drivers/md/dm-raid1.c
===================================================================
--- linux-2.6.18-rc2.orig/drivers/md/dm-raid1.c	2006-07-17 14:54:43.000000000 -0500
+++ linux-2.6.18-rc2/drivers/md/dm-raid1.c	2006-07-17 14:55:21.000000000 -0500
@@ -135,6 +135,8 @@ struct mirror_set {
 	struct mirror *default_mirror;	/* Default mirror */
 
 	unsigned int nr_mirrors;
+	atomic_t read_count;      /* Read counter for read balancing */
+	struct mirror *read_mirror; /* Last mirror read. */
 	struct mirror mirror[0];
 };
 
@@ -684,10 +686,45 @@ static void do_recovery(struct mirror_se
 /*-----------------------------------------------------------------
  * Reads
  *---------------------------------------------------------------*/
-static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
+/* Switch to next dev, via round-robin, after MIN_READS reads */
+#define MIN_READS 128
+
+/* choose_mirror
+ * @ms: the mirror set
+ *
+ * This function is used for read balancing.
+ *
+ * Returns: chosen mirror, or NULL on failure
+ */
+static struct mirror *choose_mirror(struct mirror_set *ms)
 {
-	/* FIXME: add read balancing */
-	return ms->default_mirror;
+	struct mirror *start_mirror = ms->read_mirror;
+
+	/*
+	 * Perform MIN_READS on each working mirror then
+	 * advance to the next one.  start_mirror stores
+	 * the first we tried, so we know when we're done.
+	 */
+	do {
+		if (likely(!atomic_read(&ms->read_mirror->error_count)) &&
+		    !atomic_dec_and_test(&ms->read_count))
+			goto use_mirror;
+
+		atomic_set(&ms->read_count, MIN_READS);
+
+		if (ms->read_mirror-- == ms->mirror)
+			ms->read_mirror += ms->nr_mirrors;
+	} while (ms->read_mirror != start_mirror);
+
+	/*
+	 * We've rejected every mirror.
+	 * Confirm the start_mirror can be used.
+	 */
+	if (unlikely(atomic_read(&ms->read_mirror->error_count)))
+		return NULL;
+
+use_mirror:
+	return ms->read_mirror;
 }
 
 /*
@@ -712,7 +749,7 @@ static void do_reads(struct mirror_set *
 		 * We can only read balance if the region is in sync.
 		 */
 		if (rh_in_sync(&ms->rh, region, 0))
-			m = choose_mirror(ms, bio->bi_sector);
+			m = choose_mirror(ms);
 		else
 			m = ms->default_mirror;
 
@@ -905,6 +942,7 @@ static struct mirror_set *alloc_context(
 	ms->nr_mirrors = nr_mirrors;
 	ms->nr_regions = dm_sector_div_up(ti->len, region_size);
 	ms->in_sync = 0;
+	ms->read_mirror = &ms->mirror[DEFAULT_MIRROR];
 	ms->default_mirror = &ms->mirror[DEFAULT_MIRROR];
 
 	if (rh_init(&ms->rh, ms, dl, region_size, ms->nr_regions)) {
@@ -1145,7 +1183,7 @@ static int mirror_map(struct dm_target *
 		return 0;
 	}
 
-	m = choose_mirror(ms, bio->bi_sector);
+	m = choose_mirror(ms);
 	if (!m)
 		return -EIO;
 





From fedora-cvs-commits at redhat.com  Tue Jul 25 03:21:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 23:21:28 -0400
Subject: rpms/xorg-x11-drv-savage/devel savage-disable-dri-bug196011.patch,
	NONE, 1.1 xorg-x11-drv-savage.spec, 1.15, 1.16
Message-ID: <200607250321.k6P3LSMC012269@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12230

Modified Files:
	xorg-x11-drv-savage.spec 
Added Files:
	savage-disable-dri-bug196011.patch 
Log Message:
* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-5.fc6
- Added savage-disable-dri-bug196011.patch to disable DRI by default on various
  Savage chipsets reported in bug (#196011) and (fdo#6357)
- Added {?dist} tag to Release field.


savage-disable-dri-bug196011.patch:
 savage_driver.c |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE savage-disable-dri-bug196011.patch ---
--- src/savage_driver.c.savage-disable-dri-bug196011	2006-02-08 09:39:34.000000000 -0500
+++ src/savage_driver.c	2006-07-24 23:17:28.000000000 -0400
@@ -213,6 +213,7 @@
     ,OPTION_DISABLE_XVMC
     ,OPTION_DISABLE_TILE
     ,OPTION_DISABLE_COB
+    ,OPTION_DRI
     ,OPTION_BCI_FOR_XV
     ,OPTION_DVI
     ,OPTION_BUS_TYPE
@@ -243,8 +244,9 @@
     { OPTION_DISABLE_XVMC, "DisableXVMC", OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DISABLE_TILE, "DisableTile", OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DISABLE_COB,  "DisableCOB",  OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_BCI_FOR_XV,   "BCIforXv",    OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_DVI,          "DVI",       OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_DRI,	"DRI",		OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_BCI_FOR_XV,   "BCIforXv",	OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_DVI,	"DVI",		OPTV_BOOLEAN, {0}, FALSE },
 #ifdef XF86DRI
     { OPTION_BUS_TYPE,	"BusType",	OPTV_ANYSTR,  {0}, FALSE },
     { OPTION_DMA_TYPE,	"DmaType",	OPTV_ANYSTR,  {0}, FALSE },
@@ -1550,6 +1552,32 @@
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
                    "Option: %s the COB\n",(psav->disableCOB?"Disable":"Enable"));
     }
+
+#ifdef XF86DRI
+    psav->directRenderingEnabled =
+        !xf86ReturnOptValBool(psav->Options, OPTION_DRI, FALSE);
+
+/* Disable DRI by default on the following Savage chipsets for the following
+ * bug reports:
+ *
+ * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196011
+ * https://bugs.freedesktop.org/show_bug.cgi?id=6357
+ */
+
+    if (psav->directRenderingEnabled) {
+        if (psav->ChipId == PCI_CHIP_SUPSAV_IXCSDR ||
+            psav->ChipId == PCI_CHIP_SUPSAV_IXCDDR ||
+            psav->ChipId == PCI_CHIP_PROSAVAGE_DDRK ||
+            psav->ChipId == PCI_CHIP_SAVAGE_IX_MV) {
+            xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "DRI is disabled by default "
+                  "on this chipset as it is experimental and unstable.\n"
+                  "Please refer to https://bugs.freedesktop.org/show_bug.cgi?id=6357 for more\n"
+                  "details.\n");
+            psav->directRenderingEnabled=FALSE;
+        }
+    }
+#endif
+
     if (psav->Chipset == S3_PROSAVAGE ||
 	psav->Chipset == S3_TWISTER   ||
 	psav->Chipset == S3_PROSAVAGEDDR)


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-savage.spec	15 Jul 2006 04:21:32 -0000	1.15
+++ xorg-x11-drv-savage.spec	25 Jul 2006 03:21:22 -0000	1.16
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.1.1
-Release:   4
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
 
+Patch0:    savage-disable-dri-bug196011.patch
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
@@ -38,6 +40,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0 -b .savage-disable-dri-bug196011
 
 %build
 %configure --disable-static \
@@ -70,11 +73,15 @@
 %dir %{driverdir}
 %{driverdir}/savage_drv.so
 %{_datadir}/hwdata/videoaliases/savage.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/savage.4*
 
 %changelog
-* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-4
+* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-5.fc6
+- Added savage-disable-dri-bug196011.patch to disable DRI by default on various
+  Savage chipsets reported in bug (#196011) and (fdo#6357)
+- Added {?dist} tag to Release field.
+
+* Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 2.1.1-4
 - rebuild
 
 * Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 2.1.1-3



From fedora-cvs-commits at redhat.com  Tue Jul 25 03:42:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 23:42:12 -0400
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.65,1.66
Message-ID: <200607250342.k6P3gCtu017316@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17280

Modified Files:
	ImageMagick.spec 
Log Message:
Add missing BRs



Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ImageMagick.spec	12 Jul 2006 06:23:58 -0000	1.65
+++ ImageMagick.spec	25 Jul 2006 03:42:08 -0000	1.66
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 1.1
+Release: 2
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -30,6 +30,7 @@
 BuildRequires: ghostscript-devel
 BuildRequires: libwmf-devel
 BuildRequires: libX11-devel, libXext-devel, libXt-devel
+BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
 
 %description
 ImageMagick(TM) is an image display and manipulation tool for the X
@@ -125,6 +126,9 @@
            --with-magick_plus_plus \
 	   --with-gslib \
            --with-wmf \
+           --with-lcms \
+           --with-rsvg \
+	   --with-xml \
            --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
            --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
 	   --without-dps
@@ -247,6 +251,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Mon Jul 24 2006 Matthias Clasen <mclasen at redhat.com> - 6.2.8.0-2
+- Add missing BRs
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6.2.8.0-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 03:52:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 24 Jul 2006 23:52:52 -0400
Subject: rpms/m17n-db/devel m17n-db.spec,1.28,1.29
Message-ID: <200607250352.k6P3qq2C001665@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/m17n-db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27338

Modified Files:
	m17n-db.spec 
Log Message:
- move bopomofo to chinese subpackage



Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- m17n-db.spec	17 Jul 2006 12:41:19 -0000	1.28
+++ m17n-db.spec	25 Jul 2006 03:52:30 -0000	1.29
@@ -3,7 +3,7 @@
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.3
-Release:	13%{?dist}
+Release:	14%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -74,19 +74,11 @@
 %description bengali
 m17n-db Bengali input table.
 
-
-%package bopomofo
-Summary:	m17n-db input table for Bopomofo
-Group:		System Environment/Libraries
-
-%description bopomofo
-m17n-db Bopomofo input table.
-
-
 %package chinese
 Summary:	m17n-db input table for Chinese
 Group:		System Environment/Libraries
 Requires:	%{name}-common-cjk
+Obsoletes:	%{name}-bopomofo < 1.3.3-13.fc6
 
 %description chinese
 m17n-db Chinese input map.
@@ -447,18 +439,13 @@
 %{_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
+%{_datadir}/m17n/bopo-*.mim
+%{_datadir}/m17n/icons/bopo-*.png
 
 
 %files croatian
@@ -695,7 +682,10 @@
 
 
 %changelog
-* Mon Jul 17 2006 Mayank Jain <majain at redhat.com>
+* Tue Jul 25 2006 Jens Petersen <petersen at redhat.com> - 1.3.3-14
+- move bopomofo to chinese subpackage
+
+* Mon Jul 17 2006 Mayank Jain <majain at redhat.com> - 1.3.3-13
 - Removed ta-typewriter.mim keymap as its not working
 - Added ml-inscript.png
 - Added hi-inscript.png



From fedora-cvs-commits at redhat.com  Tue Jul 25 04:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 00:09:50 -0400
Subject: rpms/firefox/devel firefox-mozconfig, 1.6, 1.7 firefox.spec, 1.122,
	1.123
Message-ID: <200607250409.k6P49oHF005635@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5600

Modified Files:
	firefox-mozconfig firefox.spec 
Log Message:
* Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com>
- Make sure that the prefix is properly set.



Index: firefox-mozconfig
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefox-mozconfig	16 Dec 2005 07:15:58 -0000	1.6
+++ firefox-mozconfig	25 Jul 2006 04:09:33 -0000	1.7
@@ -1,5 +1,6 @@
 . $topsrcdir/browser/config/mozconfig
 
+ac_add_options --prefix="$PREFIX"
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- firefox.spec	24 Jul 2006 20:15:05 -0000	1.122
+++ firefox.spec	25 Jul 2006 04:09:33 -0000	1.123
@@ -151,6 +151,7 @@
 %build
 
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
+export PREFIX='%{_prefix}'
 
 %ifarch ppc ppc64 s390 s390x
 %define moz_make_flags -j1



From fedora-cvs-commits at redhat.com  Tue Jul 25 05:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 01:16:52 -0400
Subject: rpms/kernel/devel find-provides,1.10,1.11 sources,1.453,1.454
Message-ID: <200607250516.k6P5Gqrw027924@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23560

Modified Files:
	find-provides sources 
Log Message:
fix kabitool provided find-provides



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- find-provides	18 Jul 2006 20:27:53 -0000	1.10
+++ find-provides	25 Jul 2006 05:16:49 -0000	1.11
@@ -1,11 +1,40 @@
-#! /bin/sh
+#!/usr/bin/python
+#
+# find-provides: munge the provides dependencies from the kabideps file
+#
+# This software may be freely redistributed under the terms of the GNU
+# General Public License (GPL).
 
-IFS=$'\n'
-filelist=($(cat))
+__author__ = "Jon Masters <jcm at redhat.com>"
+__version__ = "1.0"
+__date__ = "Tue 25 Jul 2006 04:00 GMT"
+__copyright__ = "Copyright (C) 2006 Red Hat, Inc"
+__license__ = "GPL"
 
-kabideps=$1
+import os
+import re
+import string
+import sys
 
-if [ -e "$kabideps" ];
-then
-    cat "$kabideps"
-fi
+false = 0
+true = 1
+
+kabideps=""
+p = re.compile('^(.*)/boot/symsets-(.*).tar.gz$')
+while true:
+	foo = sys.stdin.readline()
+	if foo == "":
+		break
+	string.split(foo)
+	m = p.match(foo)
+	if m:
+		kabideps=m.group(1) + "/kernel-" + m.group(2) + "-kabideps"
+	
+if kabideps == "":
+	sys.exit(1)
+
+if (os.path.isfile(kabideps)):
+	os.system("cat " + kabideps)
+else:
+	print sys.argv[0] + ": cannot find kabideps file: " + kabideps
+	sys.exit(1)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- sources	24 Jul 2006 23:07:18 -0000	1.453
+++ sources	25 Jul 2006 05:16:49 -0000	1.454
@@ -1,6 +1,6 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-0b9dc750399fac03d77fe89907652518  find-provides
 9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
+b1d38a1dd9a737f9ddbaa75affb15344  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 05:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 01:18:43 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2445,1.2446
Message-ID: <200607250518.k6P5IhVW031603@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31484

Modified Files:
	kernel-2.6.spec 
Log Message:
fixup kernel spec with comment about last commit



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2445
retrieving revision 1.2446
diff -u -r1.2445 -r1.2446
--- kernel-2.6.spec	25 Jul 2006 02:27:14 -0000	1.2445
+++ kernel-2.6.spec	25 Jul 2006 05:18:41 -0000	1.2446
@@ -1639,6 +1639,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
+- Fix kabitool provided find-provides
+
 * Tue Jul 25 2006 Juan Quintela <quintela at redhat.com>
 - Use cset number instead of date for xen hypervisor.
 - Update xen hypervisor to cset 10712.



From fedora-cvs-commits at redhat.com  Tue Jul 25 06:03:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 02:03:14 -0400
Subject: rpms/kernel/devel find-provides,1.11,1.12 sources,1.454,1.455
Message-ID: <200607250603.k6P63EUX004866@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4847

Modified Files:
	find-provides sources 
Log Message:
updated find-provides



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- find-provides	25 Jul 2006 05:16:49 -0000	1.11
+++ find-provides	25 Jul 2006 06:03:11 -0000	1.12
@@ -31,10 +31,10 @@
 		kabideps=m.group(1) + "/kernel-" + m.group(2) + "-kabideps"
 	
 if kabideps == "":
+	sys.stdout.write(sys.argv[0] + ": cannot locate kabideps\n")
 	sys.exit(1)
 
 if (os.path.isfile(kabideps)):
-	os.system("cat " + kabideps)
+	sys.stdout.write(sys.argv[0] + ": cannot find kabideps data: " + kabideps + "\n")
 else:
-	print sys.argv[0] + ": cannot find kabideps file: " + kabideps
 	sys.exit(1)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- sources	25 Jul 2006 05:16:49 -0000	1.454
+++ sources	25 Jul 2006 06:03:11 -0000	1.455
@@ -3,4 +3,4 @@
 9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-b1d38a1dd9a737f9ddbaa75affb15344  find-provides
+9f59ad2036efb3fe399ad8965e0b8399  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 06:10:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 02:10:40 -0400
Subject: rpms/xorg-x11-drv-trident/devel
	trident-missing-symbols-bug168713.patch, NONE,
	1.1 xorg-x11-drv-trident.spec, 1.12, 1.13
Message-ID: <200607250610.k6P6Aef7004943@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4925

Modified Files:
	xorg-x11-drv-trident.spec 
Added Files:
	trident-missing-symbols-bug168713.patch 
Log Message:
* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 1.2.1-3.fc6
- Added trident-missing-symbols-bug168713.patch to fix bug (#168713)
- Remove moduledir/driverdir directory ownership (#198294)
- Added {?dist} tag to Release field.


trident-missing-symbols-bug168713.patch:
 trident_driver.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE trident-missing-symbols-bug168713.patch ---
--- src/trident_driver.c.trident-missing-symbols	2006-07-25 02:09:00.000000000 -0400
+++ src/trident_driver.c	2006-07-25 02:09:39.000000000 -0400
@@ -494,6 +494,7 @@
     "XAADestroyInfoRec",
     "XAAInit",
     "XAAGetPatternROP",
+    "XAAGetScreenIndex",
     NULL
 };
 


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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-trident.spec	12 Jul 2006 09:13:00 -0000	1.12
+++ xorg-x11-drv-trident.spec	25 Jul 2006 06:10:37 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 trident video driver
 Name:      xorg-x11-drv-trident
 Version:   1.2.1
-Release:   2.1
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   trident.xinf
 
+Patch0:    trident-missing-symbols-bug168713.patch
+
 ExclusiveArch: %{ix86} x86_64 ppc
 
 BuildRequires: pkgconfig
@@ -28,6 +30,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0 -b .trident-missing-symbols-bug168713
 
 %build
 %configure --disable-static
@@ -50,27 +53,29 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{moduledir}
-%dir %{driverdir}
 %{driverdir}/trident_drv.so
 %{_datadir}/hwdata/videoaliases/trident.xinf
-#%dir %{_mandir}/man4x
 %{_mandir}/man4/trident.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 1.2.1-3.fc6
+- Added trident-missing-symbols-bug168713.patch to fix bug (#168713)
+- Remove moduledir/driverdir directory ownership (#198294)
+- Added {?dist} tag to Release field.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.1-2.1
 - rebuild
 
 * Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-2
 - Rebuild for 7.1 ABI fix.
 
-* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-1
+* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-1
 - Update to 1.2.1 from 7.1RC1.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.2-1.2
+* 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
+* 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
@@ -83,15 +88,15 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.2-1
 - Updated xorg-x11-drv-trident to version 1.0.0.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-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
+* Tue Oct 04 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-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> 1.0.0-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
 - Initial spec file for trident video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Tue Jul 25 06:20:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 02:20:59 -0400
Subject: rpms/kernel/devel find-provides,1.12,1.13 sources,1.455,1.456
Message-ID: <200607250620.k6P6KxPi020227@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20213

Modified Files:
	find-provides sources 
Log Message:
fix find-provides



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- find-provides	25 Jul 2006 06:03:11 -0000	1.12
+++ find-provides	25 Jul 2006 06:20:57 -0000	1.13
@@ -38,3 +38,5 @@
 	sys.stdout.write(sys.argv[0] + ": cannot find kabideps data: " + kabideps + "\n")
 else:
 	sys.exit(1)
+
+os.system("cat " + kabideps)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- sources	25 Jul 2006 06:03:11 -0000	1.455
+++ sources	25 Jul 2006 06:20:57 -0000	1.456
@@ -3,4 +3,4 @@
 9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-9f59ad2036efb3fe399ad8965e0b8399  find-provides
+92169020dcb83f723519e43749be5bd6  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 06:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 02:23:30 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2446,1.2447
Message-ID: <200607250623.k6P6NUT6020317@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20304

Modified Files:
	kernel-2.6.spec 
Log Message:
find-provides again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2446
retrieving revision 1.2447
diff -u -r1.2446 -r1.2447
--- kernel-2.6.spec	25 Jul 2006 05:18:41 -0000	1.2446
+++ kernel-2.6.spec	25 Jul 2006 06:23:27 -0000	1.2447
@@ -1640,7 +1640,7 @@
 
 %changelog
 * Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
-- Fix kabitool provided find-provides
+- Fix kabitool provided find-provides some more.
 
 * Tue Jul 25 2006 Juan Quintela <quintela at redhat.com>
 - Use cset number instead of date for xen hypervisor.



From fedora-cvs-commits at redhat.com  Tue Jul 25 07:12:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 03:12:51 -0400
Subject: rpms/firefox/devel firefox.spec,1.123,1.124
Message-ID: <200607250712.k6P7CpV1023462@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23432

Modified Files:
	firefox.spec 
Log Message:
evil hack to work around prefix not getting respected


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- firefox.spec	25 Jul 2006 04:09:33 -0000	1.123
+++ firefox.spec	25 Jul 2006 07:12:48 -0000	1.124
@@ -261,6 +261,7 @@
 find $RPM_BUILD_ROOT/fftemp%{_datadir}/idl/firefox-%{version}/ -type f | \
   sed -e "s,$RPM_BUILD_ROOT,," >> \
   %{builddir}/firefox-devel.list
+sed -i -e 's,^%{_prefix}/local,%{_prefix},' %{builddir}/firefox-devel.list
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \



From fedora-cvs-commits at redhat.com  Tue Jul 25 08:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 04:08:30 -0400
Subject: rpms/kernel/devel find-provides, 1.13, 1.14 kernel-2.6.spec, 1.2447,
	1.2448 sources, 1.456, 1.457
Message-ID: <200607250808.k6P88UWL005400@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5305

Modified Files:
	find-provides kernel-2.6.spec sources 
Log Message:
test build



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- find-provides	25 Jul 2006 06:20:57 -0000	1.13
+++ find-provides	25 Jul 2006 08:08:27 -0000	1.14
@@ -31,12 +31,12 @@
 		kabideps=m.group(1) + "/kernel-" + m.group(2) + "-kabideps"
 	
 if kabideps == "":
-	sys.stdout.write(sys.argv[0] + ": cannot locate kabideps\n")
+	sys.stderr.write(sys.argv[0] + ": cannot locate kabideps\n")
 	sys.exit(1)
 
-if (os.path.isfile(kabideps)):
-	sys.stdout.write(sys.argv[0] + ": cannot find kabideps data: " + kabideps + "\n")
-else:
+if not (os.path.isfile(kabideps)):
+	sys.stderr.write(sys.argv[0] + ": cannot find kabideps data: " + kabideps + "\n")
 	sys.exit(1)
 
+sys.stderr.write(sys.argv[0] + ": processing kABI: " + kabideps)
 os.system("cat " + kabideps)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2447
retrieving revision 1.2448
diff -u -r1.2447 -r1.2448
--- kernel-2.6.spec	25 Jul 2006 06:23:27 -0000	1.2447
+++ kernel-2.6.spec	25 Jul 2006 08:08:27 -0000	1.2448
@@ -1640,7 +1640,7 @@
 
 %changelog
 * Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
-- Fix kabitool provided find-provides some more.
+- Fix kabitool provided find-provides.
 
 * Tue Jul 25 2006 Juan Quintela <quintela at redhat.com>
 - Use cset number instead of date for xen hypervisor.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.456
retrieving revision 1.457
diff -u -r1.456 -r1.457
--- sources	25 Jul 2006 06:20:57 -0000	1.456
+++ sources	25 Jul 2006 08:08:28 -0000	1.457
@@ -3,4 +3,4 @@
 9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-92169020dcb83f723519e43749be5bd6  find-provides
+8cfb1133777928602c61a2843eac0dab  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 08:19:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 04:19:20 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, NONE,
	1.1 openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch, 1.7,
	1.8 openoffice.org.spec, 1.786, 1.787
Message-ID: <200607250819.k6P8JKNg023722@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23661

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch 
Log Message:
rh#198337# add doublefree fix

openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch:
 source/cxxhelp/qe/Search.cxx         |    0 
 xmlhelp/source/cxxhelp/qe/Search.cxx |    2 ++
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch ---
Index: source/cxxhelp/qe/Search.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/qe/Search.cxx,v
retrieving revision 1.7
diff -u -r1.7 Search.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/qe/Search.cxx	9 Sep 2005 12:23:53 -0000	1.7
+++ openoffice.org/xmlhelp/source/cxxhelp/qe/Search.cxx	25 Jul 2006 07:47:28 -0000
@@ -468,9 +468,11 @@
     }
 	while( nextDocGenHeap_.isNonEmpty() );
 
+#if 0
 	for( sal_Int32 i = 0; i < start.size(); ++i )
 		if( start[i] != RoleFiller::STOP() )
 			delete start[i];
+#endif
 }
 
 

openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch:
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |   18 +-
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   18 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |    8 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx  |    8 -
 bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx   |    2 
 bridges/source/cpp_uno/shared/vtablefactory.cxx       |  136 +++++++++++-------
 inc/bridges/cpp_uno/shared/vtablefactory.hxx          |    0 
 source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           |    0 
 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         |    0 
 source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx          |    0 
 source/cpp_uno/shared/cppinterfaceproxy.cxx           |    0 
 source/cpp_uno/shared/vtablefactory.cxx               |    0 
 12 files changed, 116 insertions(+), 74 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	17 May 2006 16:20:53 -0000	1.7
+++ openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch	25 Jul 2006 08:19:17 -0000	1.8
@@ -262,7 +262,7 @@
      sal_Size pagesize;
  #if defined SAL_UNX
  #if defined FREEBSD || defined NETBSD
-@@ -77,39 +84,86 @@
+@@ -77,39 +84,89 @@
      GetSystemInfo(&info);
      pagesize = info.dwPageSize;
  #endif
@@ -292,10 +292,13 @@
 +    strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
 +    if ((fd = mkstemp(tmpfname)) == -1)
 +	perror("creation of executable memory area failed");
-+    delete[] tmpfname;
 +    if (fd == -1)
++    {
++        delete[] tmpfname;
 +        return;
++    }
 +    unlink(tmpfname);
++    delete[] tmpfname;
 +    ftruncate(fd, nSize);
 +    writep = mmap(NULL, n, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 +    if (writep == MAP_FAILED) {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- openoffice.org.spec	24 Jul 2006 10:44:24 -0000	1.786
+++ openoffice.org.spec	25 Jul 2006 08:19:17 -0000	1.787
@@ -121,6 +121,7 @@
 Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
 Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch58: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -839,7 +840,7 @@
 %patch25 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch27 -p1 -b .workspace.bfsixtyfour.patch
-%patch28 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
+# %patch28 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
 %patch29 -p1 -b .ooo65318.agg24.canvas.patch
 %patch30 -p1 -b .ooo65308.notespaste.sd.patch
 %patch31 -p1 -b .ooo65327.builddep.writerperfect.patch
@@ -869,6 +870,7 @@
 %patch55 -p1 -b .ooo67716.svx.overflow.patch
 %patch56 -p1 -b .gcc28409.anonymousexternc.patch
 %patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch58 -p1 -b .ooo67740.xmlhelp.doublefree.patch
 
 tar xzf %{SOURCE1}
 
@@ -3349,12 +3351,14 @@
 %changelog
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
-- rh#199664# openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
-- rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-- rh#199665# openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-- rh#199894# add openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-- rh#199870# add openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+- rh#199664# -> openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing
+- rh#199659# -> openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+- rh#199665# -> openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+- rh#199894# -> openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+- rh#199870# ->openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+- rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
+- see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Tue Jul 25 08:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 04:37:20 -0400
Subject: rpms/kernel/devel find-provides, 1.14, 1.15 kernel-2.6.spec, 1.2448,
	1.2449 sources, 1.457, 1.458
Message-ID: <200607250837.k6P8bKAt028967@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28795

Modified Files:
	find-provides kernel-2.6.spec sources 
Log Message:
hopefully works again now



Index: find-provides
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/find-provides,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- find-provides	25 Jul 2006 08:08:27 -0000	1.14
+++ find-provides	25 Jul 2006 08:37:13 -0000	1.15
@@ -20,7 +20,7 @@
 true = 1
 
 kabideps=""
-p = re.compile('^(.*)/boot/symsets-(.*).tar.gz$')
+p = re.compile('^(.*)/(.*)/boot/symsets-(.*).tar.gz$')
 while true:
 	foo = sys.stdin.readline()
 	if foo == "":
@@ -28,7 +28,7 @@
 	string.split(foo)
 	m = p.match(foo)
 	if m:
-		kabideps=m.group(1) + "/kernel-" + m.group(2) + "-kabideps"
+		kabideps=m.group(1) + "/kernel-" + m.group(3) + "-kabideps"
 	
 if kabideps == "":
 	sys.stderr.write(sys.argv[0] + ": cannot locate kabideps\n")


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2448
retrieving revision 1.2449
diff -u -r1.2448 -r1.2449
--- kernel-2.6.spec	25 Jul 2006 08:08:27 -0000	1.2448
+++ kernel-2.6.spec	25 Jul 2006 08:37:15 -0000	1.2449
@@ -1640,7 +1640,7 @@
 
 %changelog
 * Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
-- Fix kabitool provided find-provides.
+- Fix kabitool provided find-provides once again.
 
 * Tue Jul 25 2006 Juan Quintela <quintela at redhat.com>
 - Use cset number instead of date for xen hypervisor.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- sources	25 Jul 2006 08:08:28 -0000	1.457
+++ sources	25 Jul 2006 08:37:17 -0000	1.458
@@ -3,4 +3,4 @@
 9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-8cfb1133777928602c61a2843eac0dab  find-provides
+df0a1c0e9c1d57470768cb6351388cd9  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 08:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 04:42:39 -0400
Subject: rpms/squid/devel squid-2.6.STABLE1-20060725.patch, NONE,
	1.1 squid.spec, 1.67, 1.68 squid-2.6.STABLE1-20060719.patch,
	1.1, NONE
Message-ID: <200607250842.k6P8gdLo030069@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30015

Modified Files:
	squid.spec 
Added Files:
	squid-2.6.STABLE1-20060725.patch 
Removed Files:
	squid-2.6.STABLE1-20060719.patch 
Log Message:
the latest CVS upstream snapshot

squid-2.6.STABLE1-20060725.patch:
 ChangeLog                                               |   45 
 RELEASENOTES.html                                       |   97 -
 configure                                               |  909 ++++++++++++++--
 configure.in                                            |   66 -
 helpers/external_acl/mswin_lm_group/win32_check_group.c |   59 -
 include/autoconf.h.in                                   |   25 
 include/version.h                                       |    2 
 src/CacheDigest.c                                       |    5 
 src/HttpHeader.c                                        |   26 
 src/HttpHeaderTools.c                                   |   12 
 src/HttpRequest.c                                       |    3 
 src/access_log.c                                        |   15 
 src/acl.c                                               |   30 
 src/auth/basic/auth_basic.c                             |   20 
 src/auth/basic/auth_basic.h                             |    1 
 src/auth/digest/auth_digest.c                           |   19 
 src/auth/digest/auth_digest.h                           |    1 
 src/auth/negotiate/auth_negotiate.c                     |    6 
 src/auth/ntlm/auth_ntlm.c                               |    6 
 src/authenticate.c                                      |   16 
 src/cache_cf.c                                          |   30 
 src/cf.data.pre                                         |   21 
 src/client_side.c                                       |  137 +-
 src/comm_poll.c                                         |   11 
 src/debug.c                                             |    5 
 src/enums.h                                             |    3 
 src/errorpage.c                                         |    5 
 src/event.c                                             |    6 
 src/fs/aufs/store_asyncufs.h                            |    1 
 src/fs/aufs/store_dir_aufs.c                            |   45 
 src/fs/aufs/store_io_aufs.c                             |   17 
 src/fs/coss/store_coss.h                                |    1 
 src/fs/coss/store_dir_coss.c                            |   18 
 src/fs/coss/store_io_coss.c                             |   27 
 src/fs/diskd/store_dir_diskd.c                          |   45 
 src/fs/diskd/store_diskd.h                              |    1 
 src/fs/diskd/store_io_diskd.c                           |   22 
 src/fs/ufs/store_dir_ufs.c                              |   50 
 src/fs/ufs/store_io_ufs.c                               |   19 
 src/fs/ufs/store_ufs.h                                  |    1 
 src/helper.c                                            |    4 
 src/logfile.c                                           |    7 
 src/main.c                                              |   14 
 src/protos.h                                            |    5 
 src/redirect.c                                          |   15 
 src/ssl.c                                               |   12 
 src/ssl_support.c                                       |    6 
 src/stat.c                                              |   23 
 src/store.c                                             |   20 
 src/store_digest.c                                      |    4 
 src/store_io.c                                          |    7 
 src/store_rebuild.c                                     |    5 
 src/structs.h                                           |    6 
 src/tools.c                                             |   22 
 src/typedefs.h                                          |    3 
 src/wccp2.c                                             |    5 
 tools/Makefile.am                                       |    6 
 tools/Makefile.in                                       |   19 
 tools/cossdump.c                                        |  218 +++
 59 files changed, 1684 insertions(+), 545 deletions(-)

--- NEW FILE squid-2.6.STABLE1-20060725.patch ---
Differences from squid-2.6.STABLE1 to squid-2.6.STABLE1-20060725
diff -ruN squid-2.6.STABLE1/ChangeLog squid-2.6.STABLE1-20060725/ChangeLog
--- squid-2.6.STABLE1/ChangeLog	Sat Jul  1 12:41:21 2006
+++ squid-2.6.STABLE1-20060725/ChangeLog	Tue Jul 18 16:24:19 2006
@@ -1,4 +1,47 @@
-Changes to squid-2.6 (1 Jul 2006)
+Changes to squid-2.6.STABLE2 (not yet released)
+
+	- WCCP2 doesn't update statCounter.syscalls.sock.sendtos counter.
+	- Releasenotes Table of contents should use relative links without
+	  filename.
+	- Reject HTTP/0.9 formatted CONNECT requests. 
+	- Cosmetic cleanup to use safe_free instead of xfree + manual
+	  assign to NULL
+	- Bug #1650: transparent interception "Unable to forward this
+	  request at this time"
+	- Bug #1658: Memory corruption when using client-side SSL certificates
+	- Add storeRecycle; a storeIO method to delete a StoreEntry w/out
+	  deleting the underlying object.
+	- Many COSS fixes and new coss data dumper utility for diagnostics
+	- Bug #1669: SEGV in storeAddVaryReadOld
+	- Many fixes in debug sections and spelling of debug messages
+	- Don't keep client connection persistent if there was a mismatch in
+	  the response size.
+	- Move eventCleanup debug messages to debug level 2 (was 0)
+	- Add the missing concurrency parameters to basic and digest auth
+	  schemes
+	- Bug #1670: assertion failure: i->prefix_size > 0 in client_side.c:2509
+	- Log SSL user id in the custom log User name format (%un)
+	- Bug #1653: Username info not logged into Cachemgr active_requests
+	  statistics
+	- Added to the redirectors interface the support for SSL client
+	  certificate
+	- squid.conf.default cleanup to remove references to old options
+	- Fix many filedescriptors in combination with TPROXY
+	- Fix connection pinning in transparently intercepted connections
+	- Bug #1679: LDFLAGS not honored in some programs.
+	- Minor cleanup of port numbers in transparent interception or
+	  vhost + vport
+	- Bug #1671: transparent interception fails with FreeBSD ipfw or
+	  Linux-2.2 ipchains
+	- Bug #1660: Accept-Encoding related memory corruption
+	- Bug #1651: Odd results if url_rewriter defined multiple times
+	- Bug #1655: Squid does not produce coredumps under linux when
+	  started as root
+	- Bug #1673: cache digests not served to other caches
+	- Cleanup of Linux capability code used by tproxy
+	- Bug #1684: xstrdup: tried to dup a NULL pointer!
+
+Changes to squid-2.6.STABLE1 (1 Jul 2006)
 	
 	- New --enable-default-hostsfile configure option
 	- Added username info to active_requests cachemgr stats
diff -ruN squid-2.6.STABLE1/RELEASENOTES.html squid-2.6.STABLE1-20060725/RELEASENOTES.html
--- squid-2.6.STABLE1/RELEASENOTES.html	Sat Jul  1 12:43:07 2006
+++ squid-2.6.STABLE1-20060725/RELEASENOTES.html	Mon Jul 24 18:13:10 2006
@@ -2,33 +2,36 @@
 <HTML>
 <HEAD>
  <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 2.6.STABLE1 release notes</TITLE>
+ <TITLE>Squid 2.6 release notes</TITLE>
 </HEAD>
 <BODY>
-<H1>Squid 2.6.STABLE1 release notes</H1>
+<H1>Squid 2.6 release notes</H1>
 
-<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.18 2006/06/30 21:21:37 hno Exp $
+<H2>Squid Developers</H2>$Id: release-2.6.html,v 1.23 2006/07/18 22:22:54 hno Exp $
 <HR>
 <EM>This document contains the release notes for version 2.6 of Squid.
 Squid is a WWW Cache application developed by the Web Caching community.</EM>
 <HR>
 <P>
-<H2><A NAME="toc1">1.</A> <A HREF="release-2.6.html#s1">Key changes from squid 2.5</A></H2>
+<H2><A NAME="toc1">1.</A> <A HREF="#s1">Key changes from squid 2.5</A></H2>
 
 <P>
-<H2><A NAME="toc2">2.</A> <A HREF="release-2.6.html#s2">Changes to squid.conf</A></H2>
+<H2><A NAME="toc2">2.</A> <A HREF="#s2">Changes to squid.conf</A></H2>
 
 <P>
-<H2><A NAME="toc3">3.</A> <A HREF="release-2.6.html#s3">Known issues</A></H2>
+<H2><A NAME="toc3">3.</A> <A HREF="#s3">Known issues</A></H2>
 
 <P>
-<H2><A NAME="toc4">4.</A> <A HREF="release-2.6.html#s4">Known limitations</A></H2>
+<H2><A NAME="toc4">4.</A> <A HREF="#s4">Known limitations</A></H2>
 
 <P>
-<H2><A NAME="toc5">5.</A> <A HREF="release-2.6.html#s5">Other issues</A></H2>
+<H2><A NAME="toc5">5.</A> <A HREF="#s5">Other issues</A></H2>
 
 <P>
-<H2><A NAME="toc6">6.</A> <A HREF="release-2.6.html#s6">Windows support</A></H2>
+<H2><A NAME="toc6">6.</A> <A HREF="#s6">Windows support</A></H2>
+
+<P>
+<H2><A NAME="toc7">7.</A> <A HREF="#s7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
 
 
 <HR>
@@ -121,6 +124,7 @@
 <DT><B>url_rewrite_concurrency</B><DD><P>Activates a new and more efficient helper protocol. Requires changes in the helper.</P>
 <DT><B>location_rewrite_*</B><DD><P>New helper hook for rewriting Location headers</P>
 <DT><B>auth_param basic blankpassword</B><DD><P>New option to allow the use of blank passwords.</P>
+<DT><B>auth_param basic/digest concurrency</B><DD><P>New option enabling a multiplexed helper protocol allowing the same helper to process multiple concurrent requests in an efficient manner. Requires support from the helper. (2.6.STABLE2 and later)</P>
 <DT><B>auth_param ntlm max_challenge_reuse / max_challenge_lifetime</B><DD><P>No longer supported</P>
 <DT><B>auth_param ntlm use_ntlm_negotiate</B><DD><P>Directive no longer supported. Use of NTLM negotiate packet is always on.</P>
 <DT><B>auth_param ntlm keep_alive</B><DD><P>New option to fine-tune the use of HTTP keep-alive in combination with NTLM</P>
@@ -150,46 +154,31 @@
 
 <P>There is a few known issues in this version of Squid which we hope to correct in a later release</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</A></B><DD><P>"ETag Loop" warnings in cache.log</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</A></B><DD><P>assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</A></B><DD><P>unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</A></B><DD><P>Need to implement TCP fallback on truncated (large) DNS responses</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1590">#1590</a>: "ETag Loop" warnings in cache.log</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=761">#761</a>: assertion failed: cbdata.c:249: "c-&gt;locks &gt; 0" when using diskd</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1640">#1640</a>: unstable if mixing coss cache_dir type with other cache_dir types (ufs/aufs/diskd).</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1602">#1602</a>: Need to implement TCP fallback on truncated (large) DNS responses</LI>
+</UL>
 </P>
 
 <H2><A NAME="s4">4.</A> <A HREF="#toc4">Known limitations</A></H2>
 
 <P>In addition there is a set of limitations in this version of Squid which we hope to correct later</P>
 <P>
-<DL>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</A></B><DD><P>302 responses with an Expires header is always cached</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</A></B><DD><P>WCCPv2 unable to register with more than one router on Linux</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</A></B><DD><P>mime.conf and referenced icons must be within chroot</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</A></B><DD><P>tcp_outgoing_address using an ident ACL does not work</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</A></B><DD><P>acl max_user_ip and multiple authentication schemes</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</A></B><DD><P>miss_access fails on "slow" acl types such as dst.</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</A></B><DD><P>squid -F is starting server sockets to early</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</A></B><DD><P>does not handle swap.state corruption properly</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</A></B><DD><P>unstable if runs out of disk space</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</A></B><DD><P>diskd may appear slow on low loads</P>
-<DT><B>Bug 
-<A HREF="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</A></B><DD><P>delay_pools stops working on -k reconfigure</P>
-</DL>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1420">#1420</a>: 302 responses with an Expires header is always cached</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1584">#1584</a>: WCCPv2 unable to register with more than one router on Linux</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1059">#1059</a>: mime.conf and referenced icons must be within chroot</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=692">#692</a>: tcp_outgoing_address using an ident ACL does not work</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=581">#581</a>: acl max_user_ip and multiple authentication schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=528">#528</a>: miss_access fails on "slow" acl types such as dst.</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=513">#513</a>: squid -F is starting server sockets to early</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=457">#457</a>: does not handle swap.state corruption properly</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=410">#410</a>: unstable if runs out of disk space</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=355">#355</a>: diskd may appear slow on low loads</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=219">#219</a>: delay_pools stops working on -k reconfigure</LI>
+</UL>
 </P>
 
 <H2><A NAME="s5">5.</A> <A HREF="#toc5">Other issues</A></H2>
@@ -319,6 +308,28 @@
 </P>
 </DL>
 </P>
+
+
+<H2><A NAME="s7">7.</A> <A HREF="#toc7">Key changes squid-2.6.STABLE1 to 2.6.STABLE2</A></H2>
+
+<P>
+<UL>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1650">#1650</a>: transparent interception "Unable to forward this request at this time"</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1658">#1658</a>: Memory corruption when using client-side SSL certificates</LI>
+<LI>Multiple fixes to the expreimental COSS cache_dir type</LI>
+<LI>Added the missing concurrency parameter to basic/digest auth schemes</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1669">#1669</a>: SEGV in storeAddVaryReadOld</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1670">#1670</a>: assertion failure: i-&gt;prefix_size &gt; 0 in client_side.c:2509</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1671">#1671</a>: transparent interception fails with FreeBSD ipfw or Linux-2.2 ipchains</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1660">#1660</a>: Accept-Encoding related memory corruption</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1673">#1673</a>: cache digests not served to other caches</LI>
+<LI>Bug <a href="http://www.squid-cache.org/bugs/show_bug.cgi?id=1684">#1684</a>: xstrdup: tried to dup a NULL pointer!</LI>
+<LI>a number of other minor and cosmetic bugfixes. See the list of 
+<A HREF="http://www.squid-cache.org/Versions/v2/2.6/changesets/">squid-2.6 changes</A> and the 
+<A HREF="ChangeLog">ChangeLog</A> file for details.</LI>
[...3706 lines suppressed...]
+    tlv *next;
+};
+
+#undef debug
+#define	debug(a, b)	printf
+
+#define	MEM_TLV	sizeof(tlv)
+#define	memAllocate(a)	malloc(a)
+#define	memFree(a, b)	free(a)
+#define xmemcpy(a, b, c) memcpy(a, b, c)
+#define xmalloc(a) malloc(a)
+#define xfree(a) free(a)
+
+#if SIZEOF_INT64_T > SIZEOF_LONG && HAVE_STRTOLL
+typedef int64_t squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_INT64_T
+#define PRINTF_OFF_T PRId64
+#define strto_off_t (int64_t)strtoll
+#else
+typedef long squid_off_t;
+#define SIZEOF_SQUID_OFF_T SIZEOF_LONG
+#define PRINTF_OFF_T "ld"
+#define strto_off_t strtol
+#endif
+
+static tlv **
+storeSwapTLVAdd(int type, const void *ptr, size_t len, tlv ** tail)
+{
+    tlv *t = memAllocate(MEM_TLV);
+    t->type = (char) type;
+    t->length = (int) len;
+    t->value = xmalloc(len);
+    xmemcpy(t->value, ptr, len);
+    *tail = t;
+    return &t->next;		/* return new tail pointer */
+}
+
+#if UNUSED_CODE
+static void
+storeSwapTLVFree(tlv * n)
+{
+    tlv *t;
+    while ((t = n) != NULL) {
+	n = t->next;
+	xfree(t->value);
+	memFree(t, MEM_TLV);
+    }
+}
+#endif
+
+#if UNUSED_CODE
+static char *
+storeSwapMetaPack(tlv * tlv_list, int *length)
+{
+    int buflen = 0;
+    tlv *t;
+    int j = 0;
+    char *buf;
+    assert(length != NULL);
+    buflen++;			/* STORE_META_OK */
+    buflen += sizeof(int);	/* size of header to follow */
+    for (t = tlv_list; t; t = t->next)
+	buflen += sizeof(char) + sizeof(int) + t->length;
+    buflen++;			/* STORE_META_END */
+    buf = xmalloc(buflen);
+    buf[j++] = (char) STORE_META_OK;
+    xmemcpy(&buf[j], &buflen, sizeof(int));
+    j += sizeof(int);
+    for (t = tlv_list; t; t = t->next) {
+	buf[j++] = (char) t->type;
+	xmemcpy(&buf[j], &t->length, sizeof(int));
+	j += sizeof(int);
+	xmemcpy(&buf[j], t->value, t->length);
+	j += t->length;
+    }
+    buf[j++] = (char) STORE_META_END;
+    assert((int) j == buflen);
+    *length = buflen;
+    return buf;
+}
+#endif
+
+static tlv *
+storeSwapMetaUnpack(const char *buf, int *hdr_len)
+{
+    tlv *TLV;			/* we'll return this */
+    tlv **T = &TLV;
+    char type;
+    int length;
+    int buflen;
+    int j = 0;
+    assert(buf != NULL);
+    assert(hdr_len != NULL);
+    if (buf[j++] != (char) STORE_META_OK)
+	return NULL;
+    xmemcpy(&buflen, &buf[j], sizeof(int));
+    j += sizeof(int);
+    /*
+     * sanity check on 'buflen' value.  It should be at least big
+     * enough to hold one type and one length.
+     */
+    if (buflen <= (sizeof(char) + sizeof(int)))
+	    return NULL;
+    while (buflen - j > (sizeof(char) + sizeof(int))) {
+	type = buf[j++];
+	/* VOID is reserved, but allow some slack for new types.. */
+	if (type <= STORE_META_VOID || type > STORE_META_END + 10) {
+	    debug(20, 0) ("storeSwapMetaUnpack: bad type (%d)!\n", type);
+	    break;
+	}
+	xmemcpy(&length, &buf[j], sizeof(int));
+	if (length < 0 || length > (1 << 16)) {
+	    debug(20, 0) ("storeSwapMetaUnpack: insane length (%d)!\n", length);
+	    break;
+	}
+	j += sizeof(int);
+	if (j + length > buflen) {
+	    debug(20, 0) ("storeSwapMetaUnpack: overflow!\n");
+	    debug(20, 0) ("\ttype=%d, length=%d, buflen=%d, offset=%d\n",
+		type, length, buflen, (int) j);
+	    break;
+	}
+	T = storeSwapTLVAdd(type, &buf[j], (size_t) length, T);
+	j += length;
+    }
+    *hdr_len = buflen;
+    return TLV;
+}
+
+
+#define	STRIPESIZE 1048576
+#define	BLOCKSIZE 1024
+#define BLKBITS 10
+
+static void
+parse_stripe(int stripeid, char *buf, int len)
+{
+	int j = 0;
+	int bl = 0;
+	tlv *t, *tlv_list;
+	int64_t *l;
+	int tmp;
+
+	while (j < len) {
+		l = NULL;
+		bl = 0;
+		tlv_list = storeSwapMetaUnpack(&buf[j], &bl);
+		if (tlv_list == NULL) {
+			printf("  Object: NULL\n");
+			return;
+		}
+		printf("  Object: (filen %d) hdr size %d\n", j / BLOCKSIZE + (stripeid * STRIPESIZE / BLOCKSIZE), bl);
+		for (t = tlv_list; t; t = t->next) {
+			switch(t->type) {
+				case STORE_META_URL:
+					/* XXX Is this OK? Is the URL guaranteed to be \0 terminated? */
+					printf("    URL: %s\n", (char *)t->value);
+					break;
+				case STORE_META_OBJSIZE:
+					l = t->value;
+					printf("Size: %" PRINTF_OFF_T " (len %d)\n", *l, t->length);
+					break;
+			}
+		}
+		if (l == NULL) {
+			printf("  STRIPE: Completed, got an object with no size\n");
+			return;
+		}
+		j = j + *l + bl;
+		/* And now, the blocksize! */
+		tmp = j / BLOCKSIZE;
+		tmp = (tmp+1) * BLOCKSIZE;
+		j = tmp;
+	}
+}
+
+int
+main(int argc, char *argv[])
+{
+	int fd;
+	char buf[STRIPESIZE];
+	int i = 0, len;
+
+	if (argc < 2) {
+		printf("Usage: %s <path to COSS datafile>\n", argv[0]);
+		exit(1);
+	}
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		perror("open");
+		exit(1);
+	}
+	while ((len = read(fd, buf, STRIPESIZE)) > 0) {
+		printf("STRIPE: %d (len %d)\n", i, len);
+		parse_stripe(i, buf, len);
+		i++;
+	}
+	return 0;
+}


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- squid.spec	19 Jul 2006 07:34:04 -0000	1.67
+++ squid.spec	25 Jul 2006 08:42:36 -0000	1.68
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -20,7 +20,7 @@
 
 # Upstream patches
 # the latest upstream CVS snapshot
-Patch100: squid-2.6.STABLE1-20060719.patch
+Patch100: squid-2.6.STABLE1-20060725.patch
 
 # External patches
 
@@ -324,6 +324,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Wed Jul 25 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-3
+- the latest CVS upstream snapshot
+
 * Wed Jul 19 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-2
 - the latest CVS snapshot
 


--- squid-2.6.STABLE1-20060719.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 25 09:37:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 05:37:33 -0400
Subject: rpms/rhpl/devel .cvsignore, 1.61, 1.62 rhpl.spec, 1.75, 1.76 sources,
	1.67, 1.68
Message-ID: <200607250937.k6P9bXdR008783@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8768

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	21 Jun 2006 19:22:39 -0000	1.61
+++ .cvsignore	25 Jul 2006 09:37:31 -0000	1.62
@@ -1,3 +1 @@
-rhpl-0.185.tar.gz
-rhpl-0.186.tar.gz
-rhpl-0.187.tar.gz
+rhpl-0.188.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- rhpl.spec	12 Jul 2006 07:59:07 -0000	1.75
+++ rhpl.spec	25 Jul 2006 09:37:31 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.187
-Release: 1.1
+Version: 0.188
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,8 +39,8 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.187-1.1
-- rebuild
+* Tue Jul 25 2006 Harald Hoyer <harald at redhat.com> - 0.188-1
+- correctly parse bool values in genClass.py
 
 * Wed Jun 21 2006 Chris Lumens <clumens at redhat.com> 0.187-1
 - Remove deprecated comps.py.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	21 Jun 2006 19:34:20 -0000	1.67
+++ sources	25 Jul 2006 09:37:31 -0000	1.68
@@ -1 +1 @@
-7979e7677a5cb32c06d176052403c707  rhpl-0.187.tar.gz
+ef38fe0e4e82107c8de41d98dbb8c918  rhpl-0.188.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 09:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 05:39:37 -0400
Subject: rpms/mesa/devel mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch,
	NONE, 1.1 mesa.spec, 1.71, 1.72
Message-ID: <200607250939.k6P9dbOR008877@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8862

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch 
Log Message:
* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 6.5-16.fc6
- Added mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch to prevent libglut
  and other libs from being linked into glxgears/glxinfo even though they
  are not actually used.  This was the final package linking to freeglut in
  Fedora Core, blocking freeglut from being moved to Extras.


mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch:
 Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch ---
--- progs/xdemos/Makefile.dont-libglut-me-harder-ok-thx-bye	2006-07-25 05:27:36.000000000 -0400
+++ progs/xdemos/Makefile	2006-07-25 05:33:57.000000000 -0400
@@ -49,8 +49,13 @@
 	-rm -f $(PROGS)
 	-rm -f *.o *~
 
-
 # special cases
+glxgears:
+	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
+
+glxinfo:
+	$(CC) $(CFLAGS) glxinfo.c -lGL -lGLU -o $@
+
 pbinfo: pbinfo.o pbutil.o
 	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
 


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mesa.spec	25 Jul 2006 00:41:25 -0000	1.71
+++ mesa.spec	25 Jul 2006 09:39:35 -0000	1.72
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -73,11 +73,12 @@
 Patch0: mesa-6.5-build-config.patch
 Patch1: mesa-6.5-glx-use-tls.patch
 Patch2: mesa-6.5-fix-opt-flags-bug197640.patch
+Patch3: mesa-6.4.1-libGLw-enable-motif-support.patch
+Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
 
 Patch10: mesa-6.3.2-fix-installmesa.patch
 Patch11: mesa-6.4-multilib-fix.patch
 Patch12: mesa-modular-dri-dir.patch
-Patch13: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch14: mesa-6.5-drop-static-inline.patch
 Patch15: mesa-6.5-noexecstack.patch
 Patch16: mesa-6.5-force-r300.patch
@@ -260,12 +261,15 @@
 %patch1 -p0 -b .glx-use-tls
 %patch2 -p1 -b .fix-opt-flags-bug197640
 
+%if %{with_motif}
+%patch3 -p0 -b .libGLw-enable-motif-support
+%endif
+
+%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
+
 %patch10 -p0 -b .fix-installmesa
 %patch11 -p0 -b .multilib-fix
 %patch12 -p1 -b .modular
-%if %{with_motif}
-%patch13 -p0 -b .libGLw-enable-motif-support
-%endif
 %patch14 -p0 -b .drop-static-inline
 %patch15 -p0 -b .noexecstack
 %patch16 -p0 -b .force-r300
@@ -463,13 +467,19 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 6.5-16.fc6
+- Added mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch to prevent libglut
+  and other libs from being linked into glxgears/glxinfo even though they
+  are not actually used.  This was the final package linking to freeglut in
+  Fedora Core, blocking freeglut from being moved to Extras.
+
 * Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 6.5-15.fc6
 - Attempt to add selinux awareness; check if we can map executable memory
   and fail softly if not.  Removes the need for allow_execmem from huge
   chunks of the desktop.
 - Disable the r300 gart fix for not compiling.
 
-* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-14.fc6
+* Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> 6.5-14.fc6
 - Add mesa-6.5-r300-free-gart-mem.patch to make r300 driver free gart
   memory on context destroy.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 09:59:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 05:59:18 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch, NONE,
	1.1 openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch,
	NONE, 1.1 openoffice.org.spec, 1.787, 1.788
Message-ID: <200607250959.k6P9xIqt008670@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8607

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch 
	openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch 
Log Message:
more goodies

openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch:
 sfx2/source/dialog/versdlg.cxx |   14 +++++++++-----
 source/dialog/versdlg.cxx      |    0 
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch ---
Index: source/dialog/versdlg.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/versdlg.cxx,v
retrieving revision 1.10
diff -u -r1.10 versdlg.cxx
--- openoffice.org.orig/sfx2/source/dialog/versdlg.cxx	2 May 2006 16:39:52 -0000	1.10
+++ openoffice.org/sfx2/source/dialog/versdlg.cxx	25 Jul 2006 09:30:40 -0000
@@ -293,15 +293,12 @@
 	aSaveCheckBox.Check( pObjShell->GetDocInfo().IsSaveVersionOnClose() );
 
 	aOpenButton.Enable( FALSE );
+	aViewButton.Enable( FALSE );
+	aCompareButton.Enable( FALSE );
 	aSaveButton.Enable( !pObjShell->IsReadOnly() );
 	aSaveCheckBox.Enable( !pObjShell->IsReadOnly() );
 	aDeleteButton.Enable( FALSE );
 
-	const SfxPoolItem *pDummy=NULL;
-	SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy );
-	eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy );
-	aCompareButton.Enable( eState >= SFX_ITEM_AVAILABLE );
-
 	// set dialog title (filename or docinfo title)
 	String sText = GetText();
 	( sText += ' ' ) += pObjShell->GetTitle();
@@ -340,6 +337,13 @@
 	aVersionBox.FirstSelected(); // -Wall required??
 	aDeleteButton.Enable( !pObjShell->IsReadOnly() );
 	aOpenButton.Enable( TRUE );
+	aViewButton.Enable( TRUE );
+
+	const SfxPoolItem *pDummy=NULL;
+	SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy );
+	eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy );
+	aCompareButton.Enable( eState >= SFX_ITEM_AVAILABLE );
+
 	return 0L;
 }
 

openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch:
 sfx2/source/dialog/versdlg.cxx |   10 +++++-----
 source/dialog/versdlg.cxx      |    0 
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch ---
Index: source/dialog/versdlg.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/versdlg.cxx,v
retrieving revision 1.10
diff -u -r1.10 versdlg.cxx
--- openoffice.org.orig/sfx2/source/dialog/versdlg.cxx	2 May 2006 16:39:52 -0000	1.10
+++ openoffice.org/sfx2/source/dialog/versdlg.cxx	25 Jul 2006 09:49:54 -0000
@@ -242,6 +242,11 @@
 	aVersionBox.SetTabs( &nTabs_Impl[0], MAP_APPFONT );
 	aVersionBox.Resize();	// OS: Hack fuer richtige Selektion
 	Init_Impl();
+
+	// set dialog title (filename or docinfo title)
+	String sText = GetText();
+	( sText += ' ' ) += pViewFrame->GetObjectShell()->GetTitle();
+	SetText( sText );
 }
 
 String ConvertWhiteSpaces_Impl( const String& rText )
@@ -301,11 +306,6 @@
 	SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy );
 	eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy );
 	aCompareButton.Enable( eState >= SFX_ITEM_AVAILABLE );
-
-	// set dialog title (filename or docinfo title)
-	String sText = GetText();
-	( sText += ' ' ) += pObjShell->GetTitle();
-	SetText( sText );
 }
 
 SfxVersionDialog::~SfxVersionDialog ()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- openoffice.org.spec	25 Jul 2006 08:19:17 -0000	1.787
+++ openoffice.org.spec	25 Jul 2006 09:59:15 -0000	1.788
@@ -122,6 +122,8 @@
 Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
 Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 Patch58: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch59: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch60: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -871,6 +873,8 @@
 %patch56 -p1 -b .gcc28409.anonymousexternc.patch
 %patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
 %patch58 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch59 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch60 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
 
 tar xzf %{SOURCE1}
 
@@ -3357,6 +3361,8 @@
 - rh#199894# -> openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 - rh#199870# ->openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 - rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+- rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+- rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:09:59 -0400
Subject: rpms/libsoup/devel .cvsignore, 1.19, 1.20 libsoup.spec, 1.38,
	1.39 sources, 1.19, 1.20
Message-ID: <200607251009.k6PA9xVJ012152@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12079

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
- Update to 2.2.96
- Bump glib2 requirement to >= 2.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	12 Jul 2006 11:33:01 -0000	1.19
+++ .cvsignore	25 Jul 2006 10:09:54 -0000	1.20
@@ -1 +1 @@
-libsoup-2.2.95.1.tar.bz2
+libsoup-2.2.96.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libsoup.spec	12 Jul 2006 11:33:01 -0000	1.38
+++ libsoup.spec	25 Jul 2006 10:09:56 -0000	1.39
@@ -1,7 +1,7 @@
 ### Abstract ###
 
 Name: libsoup
-Version: 2.2.95.1
+Version: 2.2.96
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -12,7 +12,7 @@
 
 ### Dependencies ###
 
-Requires: glib2 >= 2.0
+Requires: glib2 >= 2.6
 Requires: gnutls
 Requires: libxml2
 
@@ -80,6 +80,10 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.96
+- Update to 2.2.96
+- Bump glib2 requirement to >= 2.6.
+
 * Wed Jul 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.95.1-1
 - Update to 2.2.95.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	12 Jul 2006 11:33:01 -0000	1.19
+++ sources	25 Jul 2006 10:09:56 -0000	1.20
@@ -1 +1 @@
-60963fc61299baaa88072297ca7f23c6  libsoup-2.2.95.1.tar.bz2
+2704961ca2b9597819f21b40d4a0e0aa  libsoup-2.2.96.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:10:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:10:29 -0400
Subject: rpms/system-config-network/devel .cvsignore, 1.15, 1.16 sources,
	1.17, 1.18 system-config-network.spec, 1.20, 1.21
Message-ID: <200607251010.k6PAATg6012396@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/system-config-network/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12361

Modified Files:
	.cvsignore sources system-config-network.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Jul 2006 15:55:05 -0000	1.15
+++ .cvsignore	25 Jul 2006 10:10:26 -0000	1.16
@@ -1 +1 @@
-system-config-network-1.3.90.tar.gz
+system-config-network-1.3.91.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	19 Jul 2006 15:55:05 -0000	1.17
+++ sources	25 Jul 2006 10:10:26 -0000	1.18
@@ -1 +1 @@
-9ae2e62104862ee3e8e979d2754a06ba  system-config-network-1.3.90.tar.gz
+8fc499795b9f90ad41c156576eddb57a  system-config-network-1.3.91.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- system-config-network.spec	19 Jul 2006 15:55:23 -0000	1.20
+++ system-config-network.spec	25 Jul 2006 10:10:26 -0000	1.21
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the NEtwork Adminstration Tool
 Name: system-config-network
-Version: 1.3.90
+Version: 1.3.91
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-network.html
 Source0: %{name}-%{version}.tar.gz
@@ -89,7 +89,11 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
+* Tue Jul 25 2006 Harald Hoyer <harald at redhat.com> - 1.3.91
+- fixed "New Device" in text-mode
+
 * Tue Jul 18 2006 Harald Hoyer <harald at redhat.com> - 1.3.90
+- fixed:
 - [135014] MTU and MRU should be confiurable for ADSL
 - [141055] system-config-network needs to be able to set MTU
 - [149780] no GATEWAY, IPADDR and NETMASK, if BOOTPROTO=dhcp 
@@ -110,12 +114,6 @@
 * Fri Jul 14 2006 Nils Philippsen <nphilipp at redhat.com>
 - enable ml, or, sr, sr at Latn translations (#176145)
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.3.30-2.1.1
-- rebuild
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
 * Wed Nov 02 2005 Harald Hoyer <harald at redhat.com> - 1.3.30
 - removed interdruid
 - reversed Cancel/Ok button ordering



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:15:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:15:25 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.1,
	1.2 openoffice.org.spec, 1.788, 1.789
Message-ID: <200607251015.k6PAFPsQ014268@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14213

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
	openoffice.org.spec 
Log Message:
new gcc

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    3 ++-
 config_office/configure.in                   |    3 ++-
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 4 files changed, 6 insertions(+), 2 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	20 Jul 2006 16:34:38 -0000	1.1
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	25 Jul 2006 10:15:22 -0000	1.2
@@ -1,19 +1,43 @@
-Index: plugins/sunmajor/pluginlib/gnujre.cxx
+--- openoffice.org.orig/config_office/configure.in	2006-07-20 20:38:59.000000000 +0100
++++ openoffice.org/config_office/configure.in	2006-07-20 20:41:08.000000000 +0100
+@@ -2236,7 +2236,8 @@
+       AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB=-ljawt ] )
+    fi
+    if test -z "$AWTLIB"; then
+-      AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
++      AC_MSG_WARN([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
++      AWTLIB="-ljawt"
+    fi
+    AC_SUBST(AWTLIB)
+ 
+Index: native/unix/makefile.mk
 ===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
+RCS file: /cvs/api/bean/native/unix/makefile.mk,v
 retrieving revision 1.7
-diff -u -r1.7 gnujre.cxx
---- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
-+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	20 Jul 2006 16:33:05 -0000
-@@ -63,6 +63,11 @@
- char const* const* GnuInfo::getRuntimePaths(int * size)
- {
-     static char const* ar[]= {
-+#ifdef WNT
-+          "/bin/client/jvm.dll",
-+#elif UNX
-+          "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-+#endif
+diff -u -r1.7 makefile.mk
+--- openoffice.org.orig/bean/native/unix/makefile.mk	16 Jun 2005 14:38:39 -0000	1.7
++++ openoffice.org/bean/native/unix/makefile.mk	21 Jul 2006 08:58:02 -0000
+@@ -27,7 +27,8 @@
+ 
+ SHL1TARGET=$(TARGET)
+ SHL1LIBS=	$(SLB)$/$(TARGET).lib
+-SHL1STDLIBS=$(AWTLIB)
++SHL1STDLIBS=-L/usr/lib/gcj-4.1.1 $(AWTLIB)
++SHL1NOCHECK=yes
+ .IF "$(JDK)" == "gcj"
+ SHL1STDLIBS+=-lgcj
+ .ENDIF
+--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:37:37.000000000 +0100
++++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:40:28.000000000 +0100
+@@ -69,9 +69,11 @@
+           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ #endif
  #ifdef X86_64
++          "/lib64/gcj-4.1.1/libjvm.so",
            "/lib64/libgcj.so.7",
            "/lib64/libgcj.so.6"
+ #else
++          "/lib/gcj-4.1.1/libjvm.so",
+           "/lib/libgcj.so.7",
+           "/lib/libgcj.so.6"
+ #endif


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- openoffice.org.spec	25 Jul 2006 09:59:15 -0000	1.788
+++ openoffice.org.spec	25 Jul 2006 10:15:22 -0000	1.789
@@ -896,8 +896,6 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
-#gcc problem, will be fixed in >= 4.1.1-11
-unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
@@ -3365,6 +3363,7 @@
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
+- reenable visibility support
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:20:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:20:05 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch, 1.1, 1.2
Message-ID: <200607251020.k6PAK51V030798@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30750

Modified Files:
	openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch 
Log Message:
clean up a bit

openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch:
 sfx2/source/dialog/versdlg.cxx |   10 +++++-----
 source/dialog/versdlg.cxx      |    0 
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch	25 Jul 2006 09:59:15 -0000	1.1
+++ openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch	25 Jul 2006 10:20:02 -0000	1.2
@@ -17,10 +17,10 @@
  }
  
  String ConvertWhiteSpaces_Impl( const String& rText )
-@@ -301,11 +306,6 @@
- 	SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy );
- 	eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy );
- 	aCompareButton.Enable( eState >= SFX_ITEM_AVAILABLE );
+@@ -298,11 +303,6 @@
+ 	aSaveButton.Enable( !pObjShell->IsReadOnly() );
+ 	aSaveCheckBox.Enable( !pObjShell->IsReadOnly() );
+ 	aDeleteButton.Enable( FALSE );
 -
 -	// set dialog title (filename or docinfo title)
 -	String sText = GetText();



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:33:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:33:39 -0400
Subject: rpms/frysk/devel .cvsignore, 1.22, 1.23 frysk.spec, 1.75,
	1.76 sources, 1.22, 1.23
Message-ID: <200607251033.k6PAXduL002879@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2854

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
- New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Jul 2006 17:13:09 -0000	1.22
+++ .cvsignore	25 Jul 2006 10:33:35 -0000	1.23
@@ -1 +1 @@
-frysk-0.0.1.2006.07.18.rh1.tar.bz2
+frysk-0.0.1.2006.07.25.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- frysk.spec	23 Jul 2006 08:06:36 -0000	1.75
+++ frysk.spec	25 Jul 2006 10:33:35 -0000	1.76
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.07.18.rh1
+Version:	0.0.1.2006.07.25.rh1
 Release:	2%{?dist}
 License:	GPL
 Group:		Development/System
@@ -97,6 +97,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Jul 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-1
+- New upstream version.
+
 * Sat Jul 22 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.0.1.2006.07.18.rh1-2
 - Bump release number. (dist-fc6-java)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	18 Jul 2006 17:13:09 -0000	1.22
+++ sources	25 Jul 2006 10:33:35 -0000	1.23
@@ -1 +1 @@
-4706503a724921bd07ae0fe4ea170675  frysk-0.0.1.2006.07.18.rh1.tar.bz2
+68e9a2c795e6ea34f42e0375caf10c72  frysk-0.0.1.2006.07.25.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 10:55:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 06:55:31 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.789,1.790
Message-ID: <200607251055.k6PAtVVs024971@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24921

Modified Files:
	openoffice.org.spec 
Log Message:
set java home location


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- openoffice.org.spec	25 Jul 2006 10:15:22 -0000	1.789
+++ openoffice.org.spec	25 Jul 2006 10:55:29 -0000	1.790
@@ -892,7 +892,7 @@
 fi
 cd config_office
 autoconf
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh



From fedora-cvs-commits at redhat.com  Tue Jul 25 11:25:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 07:25:54 -0400
Subject: rpms/wireshark/FC-5 wireshark.spec,1.4,1.5
Message-ID: <200607251125.k6PBPs0b016658@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16628

Modified Files:
	wireshark.spec 
Log Message:
- build for FC5


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/FC-5/wireshark.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wireshark.spec	18 Jul 2006 06:50:33 -0000	1.4
+++ wireshark.spec	25 Jul 2006 11:25:51 -0000	1.5
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.2
-Release: 	1
+Release: 	fc5.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Tue Jul 25 2006 Radek Vokal <rvokal at redhat.com> 0.99.2-fc5.1
+- build for FC5
+
 * Tue Jul 18 2006 Radek Vok??l <rvokal at redhat.com> 0.99.2-1
 - upgrade to 0.99.2
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 11:28:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 07:28:09 -0400
Subject: rpms/gtkhtml3/devel .cvsignore, 1.37, 1.38 gtkhtml3.spec, 1.66,
	1.67 sources, 1.37, 1.38
Message-ID: <200607251128.k6PBS9MV017643@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17548

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
- Update to 3.11.90.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	12 Jul 2006 11:38:03 -0000	1.37
+++ .cvsignore	25 Jul 2006 11:28:07 -0000	1.38
@@ -1 +1 @@
-gtkhtml-3.11.4.tar.bz2
+gtkhtml-3.11.90.1.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gtkhtml3.spec	12 Jul 2006 22:18:00 -0000	1.66
+++ gtkhtml3.spec	25 Jul 2006 11:28:07 -0000	1.67
@@ -5,8 +5,8 @@
 ### Abstract ###
 
 Name: gtkhtml3
-Version: 3.11.4
-Release: 2
+Version: 3.11.90.1
+Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -108,6 +108,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 3.11.90.1-1
+- Update to 3.11.90.1
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 3.11.4-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	12 Jul 2006 11:38:05 -0000	1.37
+++ sources	25 Jul 2006 11:28:07 -0000	1.38
@@ -1 +1 @@
-abb0e217fb16ecd0d83bfaf217f6ac5b  gtkhtml-3.11.4.tar.bz2
+b379e9a9117f50e13a7310a821023be6  gtkhtml-3.11.90.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 11:33:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 07:33:59 -0400
Subject: rpms/bouncycastle/devel bouncycastle.spec,1.1,1.2
Message-ID: <200607251133.k6PBXxVt019010@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/bouncycastle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18978

Modified Files:
	bouncycastle.spec 
Log Message:
* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.33-3
- Bump release number.




Index: bouncycastle.spec
===================================================================
RCS file: /cvs/dist/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bouncycastle.spec	17 Jul 2006 20:11:47 -0000	1.1
+++ bouncycastle.spec	25 Jul 2006 11:33:56 -0000	1.2
@@ -3,7 +3,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          1.33
-Release:          2
+Release:          3
 Group:            System Environment/Libraries
 License:          BSD
 URL:              http://www.%{name}.org/
@@ -88,6 +88,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %changelog
+* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.33-3
+- Bump release number.
+
 * Mon Jul 10 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.33-2
 - Fix problems pointed out by reviewer.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 11:52:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 07:52:45 -0400
Subject: rpms/jessie/devel jessie.spec,1.24,1.25
Message-ID: <200607251152.k6PBqjkT014294@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14281

Modified Files:
	jessie.spec 
Log Message:
* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-4
- Bump release number.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jessie.spec	12 Jul 2006 06:32:35 -0000	1.24
+++ jessie.spec	25 Jul 2006 11:52:43 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:		jessie
 Version:	1.0.1
-Release:	3.1
+Release:	4
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
@@ -112,6 +112,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-4
+- Bump release number.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.1-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 12:30:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 08:30:52 -0400
Subject: rpms/mesa/devel mesa.spec,1.72,1.73
Message-ID: <200607251230.k6PCUqeQ014711@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14662

Modified Files:
	mesa.spec 
Log Message:
Update spec file comments for #200069


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mesa.spec	25 Jul 2006 09:39:35 -0000	1.72
+++ mesa.spec	25 Jul 2006 12:30:31 -0000	1.73
@@ -121,7 +121,14 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: libselinux
-
+# NOTE: This libGL virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGL.  If a particular software
+# package requires a specific GL feature which is unique to Mesa, or to
+# another GL implementation, then by definition that software is not OpenGL
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGL-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGL
 
 # libGL used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -144,6 +151,14 @@
 Requires: mesa-libGL = %{version}-%{release}
 Requires: libX11-devel
 
+# NOTE: This libGL virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGL.  If a particular software
+# package requires a specific GL feature which is unique to Mesa, or to
+# another GL implementation, then by definition that software is not OpenGL
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGL-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGL-devel
 
 # libGL devel files were in Mesa-devel package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -163,6 +178,14 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+# NOTE: This libGLU virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGLU.  If a particular software
+# package requires a specific GLU feature which is unique to Mesa, or to
+# another GLU implementation, then by definition that software is not GLU
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGLU-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGLU
 
 # libGLU used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -185,6 +208,14 @@
 Requires: mesa-libGLU = %{version}-%{release}
 Requires: libGL-devel
 
+# NOTE: This libGLU virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGLU.  If a particular software
+# package requires a specific GLU feature which is unique to Mesa, or to
+# another GLU implementation, then by definition that software is not GLU
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGLU-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGLU-devel
 
 # libGLU devel files were in Mesa-devel package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -204,6 +235,14 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+# NOTE: This libGLw virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGLw.  If a particular software
+# package requires a specific GLw feature which is unique to Mesa, or to
+# another GLw implementation, then by definition that software is not GLw
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGLw-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGLw
 
 # libGLw used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -221,6 +260,14 @@
 Group: Development/Libraries
 Requires: libGLw = %{version}-%{release}
 
+# NOTE: This libGLw virtual provide is intentionally non-versioned, and is
+# intended to be used as a generic dependency in other packages which require
+# _any_ implementation and version of libGLw.  If a particular software
+# package requires a specific GLw feature which is unique to Mesa, or to
+# another GLw implementation, then by definition that software is not GLw
+# implementation agnostic, and should not be using these virtual provides.
+# Instead, they should use "Requires: mesa-libGLw-devel >= version-release"
+# or substitute another implementation as appropriate.
 Provides: libGLw-devel
 
 # libGLw devel files were in Mesa-devel package in RHL 6.x, 7.[0-2], RHEL 2.1
@@ -472,6 +519,10 @@
   and other libs from being linked into glxgears/glxinfo even though they
   are not actually used.  This was the final package linking to freeglut in
   Fedora Core, blocking freeglut from being moved to Extras.
+- Commented all of the virtual provides in the spec file to document clearly
+  how they should be used by other developers in specifying build and runtime
+  dependencies when packaging software which links to libGL, libGLU, and
+  libGLw. (#200069)
 
 * Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 6.5-15.fc6
 - Attempt to add selinux awareness; check if we can map executable memory



From fedora-cvs-commits at redhat.com  Tue Jul 25 12:42:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 08:42:12 -0400
Subject: rpms/s390utils/devel s390utils.spec,1.43,1.44
Message-ID: <200607251242.k6PCgCo3017588@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17427

Modified Files:
	s390utils.spec 
Log Message:
- Included zfcpdbf, dbginfo.sh and the man1 manpages to package (#184812)



Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- s390utils.spec	18 Jul 2006 11:57:33 -0000	1.43
+++ s390utils.spec	25 Jul 2006 12:42:09 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.3
-Release: 6
+Release: 7
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -115,9 +115,6 @@
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 install -m 700 %{SOURCE5} $RPM_BUILD_ROOT/%{_sbindir}
-rm -f $RPM_BUILD_ROOT/bin/dbginfo.sh
-rm -f $RPM_BUILD_ROOT/bin/zfcpdbf
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1
 
 install -m 700 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/%{_sbindir}
 install -m 700 cmsfs-%{cmsfsver}/cmsfslst $RPM_BUILD_ROOT/%{_sbindir}
@@ -151,10 +148,14 @@
 /bin/*
 %{_libdir}/*.so
 %attr(755,root,root) /etc/profile.d/*
+%{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jul 25 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-7
+- Included zfcpdbf, dbginfo.sh and the man1 manpages to package (#184812)
+
 * Tue Jul 18 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.3-6
 - Disabled sysfs support due to API changes in sysfs-2.0.0
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 13:24:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 09:24:23 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.48,1.49
Message-ID: <200607251324.k6PDONlg027509@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27472

Modified Files:
	eclipse-cdt.spec 
Log Message:
Add epoch to sdk requires.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- eclipse-cdt.spec	24 Jul 2006 22:04:53 -0000	1.48
+++ eclipse-cdt.spec	25 Jul 2006 13:24:19 -0000	1.49
@@ -74,7 +74,7 @@
 %package sdk
 Summary: 	%{pkg_summary} SDK
 Group: 		Text Editors/Integrated Development Environments (IDE)
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description
 The eclipse-cdt package contains Eclipse features and plugins that are
@@ -267,6 +267,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.1.0-1jpp_8fc
+- Add epoch to sdk requires.
+
 * Mon Jul 24 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_8fc
 - Update autotools sources.
 - Rebuild.



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:19:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:19:54 -0400
Subject: rpms/pango/devel .cvsignore, 1.36, 1.37 pango.spec, 1.75,
	1.76 sources, 1.36, 1.37
Message-ID: <200607251419.k6PEJsMn006950@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6895

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.13.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	11 Jul 2006 01:34:22 -0000	1.36
+++ .cvsignore	25 Jul 2006 14:19:51 -0000	1.37
@@ -1 +1 @@
-pango-1.13.3.tar.bz2
+pango-1.13.4.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- pango.spec	13 Jul 2006 18:42:05 -0000	1.75
+++ pango.spec	25 Jul 2006 14:19:51 -0000	1.76
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.13.3
-Release: 1.1
+Version: 1.13.4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 1.13.4-1
+- Update to 1.13.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.13.3-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	11 Jul 2006 01:34:26 -0000	1.36
+++ sources	25 Jul 2006 14:19:52 -0000	1.37
@@ -1 +1 @@
-9441c965bbf50d637a3e8016c628ee7e  pango-1.13.3.tar.bz2
+73dc3a691a7832aeca200a6a3c5490db  pango-1.13.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:27:18 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.20,1.21
Message-ID: <200607251427.k6PERIYX008945@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8897

Modified Files:
	gnome-mount.spec 
Log Message:
- Add BR for nautilus and eel2 



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-mount.spec	24 Jul 2006 19:52:20 -0000	1.20
+++ gnome-mount.spec	25 Jul 2006 14:27:13 -0000	1.21
@@ -11,6 +11,8 @@
 BuildRequires: libgnomeui-devel
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
+BuildRequires: nautilus
+BuildRequires: eel2
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.90
 Requires: dbus-glib >= 0.70
@@ -84,6 +86,7 @@
 * Mon Jul 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4.0.2006.07.24-1
 - Update to a CVS version of gnome-mount
 - create nautilus-properties sub package
+- Add BR for nautilus and eel2 
 
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-8
 - Add BR for dbus-glib-devel



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:32:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:32:58 -0400
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.21,1.22
Message-ID: <200607251432.k6PEWvSl010070@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9993

Modified Files:
	gnome-mount.spec 
Log Message:
- s/eel2/eel2-devel



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-mount.spec	25 Jul 2006 14:27:13 -0000	1.21
+++ gnome-mount.spec	25 Jul 2006 14:32:44 -0000	1.22
@@ -12,7 +12,7 @@
 BuildRequires: gettext
 BuildRequires: perl-XML-Parser
 BuildRequires: nautilus
-BuildRequires: eel2
+BuildRequires: eel2-devel
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.90
 Requires: dbus-glib >= 0.70



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:35:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:35:02 -0400
Subject: rpms/kernel/devel kabitool,NONE,1.1 sources,1.458,1.459
Message-ID: <200607251435.k6PEZ2Hr010441@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10291

Modified Files:
	sources 
Added Files:
	kabitool 
Log Message:
move kabitool to cvs.



***** Error reading new file: [Errno 2] No such file or directory: 'kabitool'

Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -r1.458 -r1.459
--- sources	25 Jul 2006 08:37:17 -0000	1.458
+++ sources	25 Jul 2006 14:34:58 -0000	1.459
@@ -1,6 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-9d18e6231257537219ea5228e353c6ae  kabitool
 f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-df0a1c0e9c1d57470768cb6351388cd9  find-provides



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:41:15 -0400
Subject: rpms/vim/FC-5 7.0.036, NONE, 1.1 7.0.037, NONE, 1.1 7.0.038, NONE,
	1.1 7.0.039, NONE, 1.1 7.0.040, NONE, 1.1 7.0.041, NONE,
	1.1 7.0.042, NONE, 1.1 README.patches, 1.42, 1.43 vim.spec,
	1.103, 1.104
Message-ID: <200607251441.k6PEfFTd021393@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21377

Modified Files:
	README.patches vim.spec 
Added Files:
	7.0.036 7.0.037 7.0.038 7.0.039 7.0.040 7.0.041 7.0.042 
Log Message:
- patchlevel 42
- allow VIM environment variable



--- NEW FILE 7.0.036 ---
To: vim-dev at vim.org
Subject: Patch 7.0.036
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.036
Problem:    Can't compile with small features and syntax highlighting or the
	    diff feature.
Solution:   Define LINE_ATTR whenever syntax highlighting or the diff feature
	    is enabled.
Files:	    src/screen.c


*** ../vim-7.0.035/src/screen.c	Fri May  5 23:13:04 2006
--- src/screen.c	Tue Jul 11 21:33:53 2006
***************
*** 2612,2618 ****
  #ifdef FEAT_LINEBREAK
      int		need_showbreak = FALSE;
  #endif
! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS))
  # define LINE_ATTR
      int		line_attr = 0;		/* atrribute for the whole line */
  #endif
--- 2612,2619 ----
  #ifdef FEAT_LINEBREAK
      int		need_showbreak = FALSE;
  #endif
! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
! 	|| defined(FEAT_SYN_HL) || defined(FEAT_DIFF)
  # define LINE_ATTR
      int		line_attr = 0;		/* atrribute for the whole line */
  #endif
***************
*** 2626,2632 ****
      int		prev_c = 0;		/* previous Arabic character */
      int		prev_c1 = 0;		/* first composing char for prev_c */
  #endif
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
      int		did_line_attr = 0;
  #endif
  
--- 2627,2633 ----
      int		prev_c = 0;		/* previous Arabic character */
      int		prev_c1 = 0;		/* first composing char for prev_c */
  #endif
! #if defined(LINE_ATTR)
      int		did_line_attr = 0;
  #endif
  
***************
*** 4116,4132 ****
  		    --ptr;	    /* put it back at the NUL */
  		}
  #endif
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		else if ((
  # ifdef FEAT_DIFF
! 			    diff_hlf != (hlf_T)0
! #  ifdef LINE_ATTR
! 			    ||
! #  endif
  # endif
- # ifdef LINE_ATTR
  			    line_attr != 0
- # endif
  			) && (
  # ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? (col >= 0) :
--- 4117,4128 ----
  		    --ptr;	    /* put it back at the NUL */
  		}
  #endif
! #if defined(LINE_ATTR)
  		else if ((
  # ifdef FEAT_DIFF
! 			    diff_hlf != (hlf_T)0 ||
  # endif
  			    line_attr != 0
  			) && (
  # ifdef FEAT_RIGHTLEFT
  			    wp->w_p_rl ? (col >= 0) :
***************
*** 4237,4243 ****
  	 * At end of the text line or just after the last character.
  	 */
  	if (c == NUL
! #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		|| did_line_attr == 1
  #endif
  		)
--- 4233,4239 ----
  	 * At end of the text line or just after the last character.
  	 */
  	if (c == NUL
! #if defined(LINE_ATTR)
  		|| did_line_attr == 1
  #endif
  		)
***************
*** 4258,4264 ****
  				|| prevcol == (long)match_hl[0].startcol
  				|| prevcol == (long)match_hl[1].startcol
  				|| prevcol == (long)match_hl[2].startcol)
! # if defined(FEAT_DIFF) || defined(LINE_ATTR)
  			    && did_line_attr <= 1
  # endif
  			   )
--- 4254,4260 ----
  				|| prevcol == (long)match_hl[0].startcol
  				|| prevcol == (long)match_hl[1].startcol
  				|| prevcol == (long)match_hl[2].startcol)
! # if defined(LINE_ATTR)
  			    && did_line_attr <= 1
  # endif
  			   )
*** ../vim-7.0.035/src/version.c	Fri Jun 23 21:36:49 2006
--- src/version.c	Tue Jul 11 21:36:50 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     36,
  /**/

-- 
Every engineer dreams about saving the universe and having sex with aliens.
This is much more glamorous than the real life of an engineer, which consists
of hiding from the universe and having sex without the participation of other
life forms.                     (Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.037 ---
To: vim-dev at vim.org
Subject: Patch 7.0.037
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.037
Problem:    Crash when resizing the GUI window vertically when there is a line
	    that doesn't fit.
Solution:   Don't redraw while the screen data is invalid.
Files:	    src/screen.c


*** ../vim-7.0.036/src/screen.c	Tue Jul 11 22:36:19 2006
--- src/screen.c	Tue Jul 11 21:33:53 2006
***************
*** 7129,7134 ****
--- 7129,7140 ----
  	return;
      entered = TRUE;
  
+     /*
+      * Note that the window sizes are updated before reallocating the arrays,
+      * thus we must not redraw here!
+      */
+     ++RedrawingDisabled;
+ 
      win_new_shellsize();    /* fit the windows in the new sized shell */
  
      comp_col();		/* recompute columns for shown command and ruler */
***************
*** 7363,7368 ****
--- 7369,7375 ----
  #endif
  
      entered = FALSE;
+     --RedrawingDisabled;
  
  #ifdef FEAT_AUTOCMD
      if (starting == 0)
*** ../vim-7.0.036/src/version.c	Tue Jul 11 22:36:19 2006
--- src/version.c	Tue Jul 11 22:38:39 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     37,
  /**/

-- 
For society, it's probably a good thing that engineers value function over
appearance.  For example, you wouldn't want engineers to build nuclear power
plants that only _look_ like they would keep all the radiation inside.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.038 ---
To: vim-dev at vim.org
Subject: Patch 7.0.038
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.038
Problem:    When calling complete() from an Insert mode expression mapping
	    text could be inserted in an improper way.
Solution:   Make undo_allowed() global and use it in complete().
Files:	    src/undo.c, src/proto/undo.pro, src/eval.c


*** ../vim-7.0.037/src/undo.c	Sat Apr 22 00:01:05 2006
--- src/undo.c	Mon Jul  3 22:23:22 2006
***************
*** 84,90 ****
  static void u_unch_branch __ARGS((u_header_T *uhp));
  static u_entry_T *u_get_headentry __ARGS((void));
  static void u_getbot __ARGS((void));
- static int undo_allowed __ARGS((void));
  static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
  static void u_doit __ARGS((int count));
  static void u_undoredo __ARGS((int undo));
--- 84,89 ----
***************
*** 196,202 ****
   * Return TRUE when undo is allowed.  Otherwise give an error message and
   * return FALSE.
   */
!     static int
  undo_allowed()
  {
      /* Don't allow changes when 'modifiable' is off.  */
--- 195,201 ----
   * Return TRUE when undo is allowed.  Otherwise give an error message and
   * return FALSE.
   */
!     int
  undo_allowed()
  {
      /* Don't allow changes when 'modifiable' is off.  */
*** ../vim-7.0.037/src/proto/undo.pro	Mon Apr 10 16:38:50 2006
--- src/proto/undo.pro	Mon Jul  3 22:25:07 2006
***************
*** 4,9 ****
--- 4,10 ----
  extern int u_savesub __ARGS((linenr_T lnum));
  extern int u_inssub __ARGS((linenr_T lnum));
  extern int u_savedel __ARGS((linenr_T lnum, long nlines));
+ extern int undo_allowed __ARGS((void));
  extern void u_undo __ARGS((int count));
  extern void u_redo __ARGS((int count));
  extern void undo_time __ARGS((long step, int sec, int absolute));
*** ../vim-7.0.037/src/eval.c	Thu Jun 22 21:01:19 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 8252,8257 ****
--- 8252,8263 ----
  	EMSG(_("E785: complete() can only be used in Insert mode"));
  	return;
      }
+ 
+     /* Check for undo allowed here, because if something was already inserted
+      * the line was already saved for undo and this check isn't done. */
+     if (!undo_allowed())
+ 	return;
+ 
      if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL)
      {
  	EMSG(_(e_invarg));
*** ../vim-7.0.037/src/version.c	Tue Jul 11 22:59:04 2006
--- src/version.c	Wed Jul 12 20:31:49 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     38,
  /**/

-- 
If someone questions your market projections, simply point out that your
target market is "People who are nuts" and "People who will buy any damn
thing".  Nobody is going to tell you there aren't enough of those people
to go around.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.039 ---
To: vim-dev at vim.org
Subject: Patch 7.0.039
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.039
Problem:    Calling inputdialog() with a third argument in the console doesn't
            work.
Solution:   Make a separate function for input() and inputdialog(). (Yegappan
            Lakshmanan)
Files:      src/eval.c


*** ../vim-7.0.038/src/eval.c	Wed Jul 12 21:48:56 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 11321,11334 ****
  
  static int inputsecret_flag = 0;
  
  /*
!  * "input()" function
!  *     Also handles inputsecret() when inputsecret is set.
   */
      static void
! f_input(argvars, rettv)
      typval_T	*argvars;
      typval_T	*rettv;
  {
      char_u	*prompt = get_tv_string_chk(&argvars[0]);
      char_u	*p = NULL;
--- 11321,11339 ----
  
  static int inputsecret_flag = 0;
  
+ static void get_user_input __ARGS((typval_T *argvars, typval_T *rettv, int inputdialog));
+ 
  /*
!  * This function is used by f_input() and f_inputdialog() functions. The third
!  * argument to f_input() specifies the type of completion to use at the
!  * prompt. The third argument to f_inputdialog() specifies the value to return
!  * when the user cancels the prompt.
   */
      static void
! get_user_input(argvars, rettv, inputdialog)
      typval_T	*argvars;
      typval_T	*rettv;
+     int		inputdialog;
  {
      char_u	*prompt = get_tv_string_chk(&argvars[0]);
      char_u	*p = NULL;
***************
*** 11378,11384 ****
  	    if (defstr != NULL)
  		stuffReadbuffSpec(defstr);
  
! 	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
  		int	xp_namelen;
--- 11383,11389 ----
  	    if (defstr != NULL)
  		stuffReadbuffSpec(defstr);
  
! 	    if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
  		int	xp_namelen;
***************
*** 11413,11418 ****
--- 11418,11435 ----
  }
  
  /*
+  * "input()" function
+  *     Also handles inputsecret() when inputsecret is set.
+  */
+     static void
+ f_input(argvars, rettv)
+     typval_T	*argvars;
+     typval_T	*rettv;
+ {
+     get_user_input(argvars, rettv, FALSE);
+ }
+ 
+ /*
   * "inputdialog()" function
   */
      static void
***************
*** 11452,11458 ****
      }
      else
  #endif
! 	f_input(argvars, rettv);
  }
  
  /*
--- 11469,11475 ----
      }
      else
  #endif
! 	get_user_input(argvars, rettv, TRUE);
  }
  
  /*
*** ../vim-7.0.038/src/version.c	Wed Jul 12 21:48:56 2006
--- src/version.c	Wed Jul 12 21:56:30 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     39,
  /**/

-- 
A consultant is a person who takes your money and annoys your employees while
tirelessly searching for the best way to extend the consulting contract.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.040 ---
To: vim-dev at vim.org
Subject: Patch 7.0.040
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.040
Problem:    When 'cmdheight' is larger than 1 using inputlist() or selecting
	    a spell suggestion with the mouse gets the wrong entry.
Solution:   Start listing the first alternative on the last line of the screen.
Files:	    src/eval.c, src/spell.c


*** ../vim-7.0.039/src/eval.c	Thu Jul 13 08:30:50 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 11497,11502 ****
--- 11497,11503 ----
      }
  
      msg_start();
+     msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
      lines_left = Rows;	/* avoid more prompt */
      msg_scroll = TRUE;
      msg_clr_eos();
*** ../vim-7.0.039/src/spell.c	Sat May 13 14:12:51 2006
--- src/spell.c	Mon Jul 10 23:03:04 2006
***************
*** 10071,10076 ****
--- 10071,10077 ----
  
  	/* List the suggestions. */
  	msg_start();
+ 	msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
  	lines_left = Rows;	/* avoid more prompt */
  	vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"),
  						sug.su_badlen, sug.su_badptr);
*** ../vim-7.0.039/src/version.c	Thu Jul 13 08:30:50 2006
--- src/version.c	Sun Jul 23 21:51:04 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     40,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
40. You tell the cab driver you live at
    http://123.elm.street/house/bluetrim.html
41. You actually try that 123.elm.street address.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.041 ---
To: vim-dev at vim.org
Subject: Patch 7.0.041
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.041
Problem:    cursor([1, 1]) doesn't work. (Peter Hodge)
Solution:   Allow leaving out the third item of the list and use zero for the
	    virtual column offset.
Files:	    src/eval.c


*** ../vim-7.0.040/src/eval.c	Sun Jul 23 21:52:16 2006
--- src/eval.c	Mon Jul 10 23:03:13 2006
***************
*** 16465,16473 ****
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd] */
!     if (arg->v_type != VAR_LIST || l == NULL
! 				      || l->lv_len != (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
--- 16465,16476 ----
      long	i = 0;
      long	n;
  
!     /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
!      * when "fnump" isn't NULL and "coladd" is optional. */
!     if (arg->v_type != VAR_LIST
! 	    || l == NULL
! 	    || l->lv_len < (fnump == NULL ? 2 : 3)
! 	    || l->lv_len > (fnump == NULL ? 3 : 4))
  	return FAIL;
  
      if (fnump != NULL)
***************
*** 16493,16500 ****
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	return FAIL;
!     posp->coladd = n;
  #endif
  
      return OK;
--- 16496,16504 ----
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
      if (n < 0)
! 	posp->coladd = 0;
!     else
! 	posp->coladd = n;
  #endif
  
      return OK;
*** ../vim-7.0.040/src/version.c	Sun Jul 23 21:52:16 2006
--- src/version.c	Sun Jul 23 21:59:43 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     41,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
43. You tell the kids they can't use the computer because "Daddy's got work to
    do" and you don't even have a job.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


--- NEW FILE 7.0.042 ---
To: vim-dev at vim.org
Subject: Patch 7.0.042
Fcc: outbox
From: Bram Moolenaar <Bram at moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.0.042
Problem:    When pasting a block of text in Insert mode Vim hangs or crashes.
	    (Noam Halevy)
Solution:   Avoid that the cursor is positioned past the NUL of a line.
Files:	    src/ops.c


*** ../vim-7.0.041/src/ops.c	Tue Jun 20 20:29:13 2006
--- src/ops.c	Sun Jul 23 22:36:39 2006
***************
*** 3493,3500 ****
--- 3493,3507 ----
  # endif
  	if (flags & PUT_CURSEND)
  	{
+ 	    colnr_T len;
+ 
  	    curwin->w_cursor = curbuf->b_op_end;
  	    curwin->w_cursor.col++;
+ 
+ 	    /* in Insert mode we might be after the NUL, correct for that */
+ 	    len = (colnr_T)STRLEN(ml_get_curline());
+ 	    if (curwin->w_cursor.col > len)
+ 		curwin->w_cursor.col = len;
  	}
  	else
  	    curwin->w_cursor.lnum = lnum;
*** ../vim-7.0.041/src/version.c	Sun Jul 23 22:07:55 2006
--- src/version.c	Sun Jul 23 22:35:13 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     42,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
45. You buy a Captain Kirk chair with a built-in keyboard and mouse.

 /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/README.patches,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- README.patches	26 Jun 2006 15:17:23 -0000	1.42
+++ README.patches	25 Jul 2006 14:41:05 -0000	1.43
@@ -60,3 +60,10 @@
   2431  7.0.033  pasting after autoindent removes the indent
   2042  7.0.034  repeating completion was wrong after typing text or using BS
   5905  7.0.035  repeating Insert mode completion doesn't work properly
+  3990  7.0.036  can't compile with small features and syntax HL
+  1880  7.0.037  crash when resizing Vim window when a line doesn't fit
+  3236  7.0.038  complete() can be used from expr. mapping after inserting text
+  3240  7.0.039  third argument for inputdialog() doesn't work in the console
+  1946  7.0.040  mouse selection with "z=" and inputlist() gets wrong entry
+  2229  7.0.041  cursor([1, 2]) failed, required third item in the list
+  1603  7.0.042  crash or hang when pasting a block in Insert mode


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vim.spec	12 Jul 2006 13:57:14 -0000	1.103
+++ vim.spec	25 Jul 2006 14:41:12 -0000	1.104
@@ -24,12 +24,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 035
+%define patchlevel 042
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 0.fc5.1
+Release: 0.fc5
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -89,6 +89,13 @@
 Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
 Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
 Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
+Patch036: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.036
+Patch037: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.037
+Patch038: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.038
+Patch039: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.039
+Patch040: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.040
+Patch041: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.041
+Patch042: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.042
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -255,6 +262,13 @@
 %patch033 -p0
 %patch034 -p0
 %patch035 -p0
+%patch036 -p0
+%patch037 -p0
+%patch038 -p0
+%patch039 -p0
+%patch040 -p0
+%patch041 -p0
+%patch042 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -284,8 +298,8 @@
 %build
 cd src
 autoconf
-perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
-perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
+#perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
+#perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
 
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
@@ -596,6 +610,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Jul 25 2006 Karsten Hopp <karsten at redhat.de> 7.0.042-0.fc5
+- patchlevel 42
+- allow usage of VIM environment variable
+
 * Wed Jul 12 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-0.fc5.1
 - fix a typo in http.conf syntax file
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:42:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:42:56 -0400
Subject: rpms/frysk/devel frysk.spec,1.76,1.77
Message-ID: <200607251442.k6PEguJb021459@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21445

Modified Files:
	frysk.spec 
Log Message:
Fix a typo


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- frysk.spec	25 Jul 2006 10:33:35 -0000	1.76
+++ frysk.spec	25 Jul 2006 14:42:53 -0000	1.77
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.25.rh1
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:54:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:54:35 -0400
Subject: rpms/wireshark/FC-5 wireshark.spec,1.5,1.6
Message-ID: <200607251454.k6PEsZft003973@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3960

Modified Files:
	wireshark.spec 
Log Message:
no libpcap-devel in FC5


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/FC-5/wireshark.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wireshark.spec	25 Jul 2006 11:25:51 -0000	1.5
+++ wireshark.spec	25 Jul 2006 14:54:32 -0000	1.6
@@ -15,7 +15,7 @@
 Patch3:		wireshark-nfsv4-opts.patch
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libpcap-devel
+BuildRequires:	libpcap
 BuildRequires: 	net-snmp-devel >= 5.3
 BuildRequires: 	net-snmp-utils >= 5.3
 BuildRequires: 	zlib-devel, bzip2-devel



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:55:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:55:47 -0400
Subject: rpms/hal/FC-5 hal-0.5.7-expand-sysfs-names.patch, NONE, 1.1 hal.spec,
	1.90, 1.91
Message-ID: <200607251455.k6PEtl2l004050@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4027

Modified Files:
	hal.spec 
Added Files:
	hal-0.5.7-expand-sysfs-names.patch 
Log Message:
- Add patch so HAL can work with the larger sysfs name length in newer kernel


hal-0.5.7-expand-sysfs-names.patch:
 hotplug_helper.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hal-0.5.7-expand-sysfs-names.patch ---
--- hal-0.5.7/hald/linux2/hotplug_helper.h.expand-sysfs-names	2006-07-24 11:32:17.000000000 -0400
+++ hal-0.5.7/hald/linux2/hotplug_helper.h	2006-07-24 11:34:05.000000000 -0400
@@ -28,7 +28,7 @@
 
 #define HALD_HELPER_MAGIC 0x68616c64
 #define HALD_HELPER_SOCKET_PATH "/var/run/hal/hotplug_socket2"
-#define HALD_HELPER_STRLEN 256
+#define HALD_HELPER_STRLEN 512 
 
 struct hald_helper_msg
 {


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- hal.spec	24 May 2006 22:05:01 -0000	1.90
+++ hal.spec	25 Jul 2006 14:55:45 -0000	1.91
@@ -19,13 +19,14 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 3.fc5.3
+Release: 3.fc5.4
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Patch0: hal-0.5.7-fix-fedora-power-save.patch
 Patch1: hal-0.5.7-lid-open-fix.patch
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
+Patch3: hal-0.5.7-expand-sysfs-names.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -90,7 +91,7 @@
 %patch0 -p0 -b .fix-fedora-powersave
 %patch1 -p1 -b .lid-open-fix
 %patch2 -p1 -b .fix-for-nfs-and-autofs
-
+%patch3 -p1 -b .expand-sysfs-names
 %build
 
 %configure --disable-docbook-docs --with-os-type=redhat
@@ -195,6 +196,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Tue Jul 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3.fc5.4
+- Add patch so HAL can work with the larger sysfs name length in newer kernel
+
 * Wed May 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3.fc5.3
 - Update autofs fix
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:56:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:56:07 -0400
Subject: rpms/hwdata/devel .cvsignore, 1.69, 1.70 hwdata.spec, 1.71,
	1.72 sources, 1.72, 1.73
Message-ID: <200607251456.k6PEu77W004085@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4067

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- Added the 17inch Philips LCD monitor entry (#199828)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	24 Jul 2006 15:12:24 -0000	1.69
+++ .cvsignore	25 Jul 2006 14:56:03 -0000	1.70
@@ -1 +1 @@
-hwdata-0.184.tar.gz
+hwdata-0.185.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- hwdata.spec	24 Jul 2006 15:12:24 -0000	1.71
+++ hwdata.spec	25 Jul 2006 14:56:03 -0000	1.72
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.184
+Version: 0.185
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,9 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* Tue Jul 25 2006 Phil Knirsch <pknirsch at redhat.com> - 0.185-1
+- Added the 17inch Philips LCD monitor entry (#199828)
+
 * Mon Jul 24 2006 Phil Knirsch <pknirsch at redhat.com> - 0.184-1
 - Added one more entry for missing Philips LCD monitor (#199828)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	24 Jul 2006 15:12:24 -0000	1.72
+++ sources	25 Jul 2006 14:56:03 -0000	1.73
@@ -1 +1 @@
-43b7cea1c119c1d4dbb2949db46aff92  hwdata-0.184.tar.gz
+2c3f10095780106114e12944b764a396  hwdata-0.185.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 14:56:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 10:56:15 -0400
Subject: rpms/firefox/devel firefox.spec,1.124,1.125
Message-ID: <200607251456.k6PEuFHc004137@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4093

Modified Files:
	firefox.spec 
Log Message:
grumble, let's try once more to hack this in


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- firefox.spec	25 Jul 2006 07:12:48 -0000	1.124
+++ firefox.spec	25 Jul 2006 14:56:13 -0000	1.125
@@ -261,7 +261,9 @@
 find $RPM_BUILD_ROOT/fftemp%{_datadir}/idl/firefox-%{version}/ -type f | \
   sed -e "s,$RPM_BUILD_ROOT,," >> \
   %{builddir}/firefox-devel.list
-sed -i -e 's,^%{_prefix}/local,%{_prefix},' %{builddir}/firefox-devel.list
+sed -i -e 's,fftemp/,,' \
+       -e 's,^%{_prefix}/local,%{_prefix},' \
+       %{builddir}/firefox-devel.list
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:01:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:01:19 -0400
Subject: rpms/ypbind/devel ypbind.spec,1.26,1.27
Message-ID: <200607251501.k6PF1JWQ004314@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4274

Modified Files:
	ypbind.spec 
Log Message:
rebuilt



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ypbind.spec	18 Jul 2006 13:42:15 -0000	1.26
+++ ypbind.spec	25 Jul 2006 15:01:05 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 0.2
+Release: 0.3
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -80,6 +80,9 @@
 %doc README NEWS
 
 %changelog
+* Tue Jul 25 2006 Steve Dickson <steved at redhat.com> - 3:1.19-0.3
+- rebuild
+
 * Tue Jul 18 2006 Steve Dickson <steved at redhat.com> - 3:1.19-0.2
 - Added NISTIMEOUT variable to init scrip (bz 196078)
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:04:04 -0400
Subject: rpms/ypbind/FC-5 ypbind.spec,1.24,1.25
Message-ID: <200607251504.k6PF44nF004429@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4416

Modified Files:
	ypbind.spec 
Log Message:
Rebuild



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/FC-5/ypbind.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ypbind.spec	13 Feb 2006 16:37:24 -0000	1.24
+++ ypbind.spec	25 Jul 2006 15:04:02 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.19
-Release: 0
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -80,6 +80,7 @@
 %doc README NEWS
 
 %changelog
+* Tue Jul 25 11:03:18 Steve Dickson <steved at redhat> 3:1.19.1
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 3:1.19
 - Build for latest version of ypbind-mt
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:05:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:05:02 -0400
Subject: rpms/ypbind/FC-5 ypbind.spec,1.25,1.26
Message-ID: <200607251505.k6PF524v004451@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypbind/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4440

Modified Files:
	ypbind.spec 
Log Message:
fixed typo



Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/FC-5/ypbind.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ypbind.spec	25 Jul 2006 15:04:02 -0000	1.25
+++ ypbind.spec	25 Jul 2006 15:04:59 -0000	1.26
@@ -80,7 +80,9 @@
 %doc README NEWS
 
 %changelog
-* Tue Jul 25 11:03:18 Steve Dickson <steved at redhat> 3:1.19.1
+* Tue Jul 25 2006 Steve Dickson <steved at redhat> 3:1.19.1
+- rebuild
+
 * Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 3:1.19
 - Build for latest version of ypbind-mt
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:10:37 -0400
Subject: rpms/frysk/devel frysk.spec,1.77,1.78
Message-ID: <200607251510.k6PFAbnk004569@cvs.devel.redhat.com>

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4557

Modified Files:
	frysk.spec 
Log Message:
Add /usr/bin/ftrace to the file list


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- frysk.spec	25 Jul 2006 14:42:53 -0000	1.77
+++ frysk.spec	25 Jul 2006 15:10:32 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.25.rh1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -87,6 +87,7 @@
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
 %{_bindir}/frysk
+%{_bindir}/ftrace
 %{_libdir}/*so*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*   
@@ -97,6 +98,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Jul 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-2
+- Add ftrace to the file list.
+
 * Tue Jul 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-1
 - New upstream version.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:11:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:11:36 -0400
Subject: rpms/lksctp-tools/devel .cvsignore, 1.3, 1.4 lksctp-tools.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200607251511.k6PFBaL3004638@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/lksctp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4621

Modified Files:
	.cvsignore lksctp-tools.spec sources 
Log Message:
- update to 1.0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Jan 2006 06:39:58 -0000	1.3
+++ .cvsignore	25 Jul 2006 15:11:34 -0000	1.4
@@ -1 +1 @@
-lksctp-tools-1.0.5.tar.gz
+lksctp-tools-1.0.6.tar.gz


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lksctp-tools.spec	12 Jul 2006 07:14:02 -0000	1.12
+++ lksctp-tools.spec	25 Jul 2006 15:11:34 -0000	1.13
@@ -1,16 +1,16 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
-Version: 1.0.5
-Release: 1.fc5.2.1
+Version: 1.0.6
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
-URL: http://lksctp.sourceforge.net/
-Source: http://dl.sf.net/lksctp/lksctp-tools-%{version}.tar.gz
-Patch0: lksctp-tools-1.0.5-syntax.patch
+URL: http://lksctp.sourceforge.net
+Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #BuildRequires: tetex, tetex-latex, tetex-xdvi, tetex-dvips
 #BuildRequires: ghostscript, enscript
 BuildRequires: libtool, automake, autoconf
+Conflicts: kernel < 2.6.10
 
 %description
 This is the lksctp-tools package for Linux Kernel SCTP (Stream Control
@@ -44,7 +44,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 [ ! -x ./configure ] && sh bootstrap
@@ -53,6 +52,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+rm -f doc/rfc2960.txt doc/states.txt
 make install DESTDIR="$RPM_BUILD_ROOT"
 
 %clean
@@ -85,10 +85,13 @@
 %{_mandir}/man3/*
 
 %files doc
-%defattr(-,root,root,0755)
+%defattr(0644,root,root,0755)
 %doc doc/*.txt
 
 %changelog
+* Tue Jul 25 2006 Karsten Hopp <karsten at redhat.de> 1.0.6-1
+- update to 1.0.6
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Jan 2006 06:39:58 -0000	1.3
+++ sources	25 Jul 2006 15:11:34 -0000	1.4
@@ -1 +1 @@
-aa6d09d392849f5456c6fbd1ebbb525e  lksctp-tools-1.0.5.tar.gz
+6dcacb7cf4ce8c21b343e5578ccdaa2f  lksctp-tools-1.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:29:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:29:19 -0400
Subject: rpms/compiz/devel compiz.spec,1.8,1.9
Message-ID: <200607251529.k6PFTJZo019859@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19846

Modified Files:
	compiz.spec 
Log Message:
* Tue Jul 25 2006 Kristian H??gsberg <krh at redhat.com>
- Require system-logos instead.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compiz.spec	24 Jul 2006 19:56:12 -0000	1.8
+++ compiz.spec	25 Jul 2006 15:29:17 -0000	1.9
@@ -18,7 +18,7 @@
 
 Requires:	xorg-x11-server-Xorg >= 1.1.0-26
 Requires:	mesa-libGL >= 6.5-9
-Requires:       redhat-logos
+Requires:       system-logos
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
@@ -112,6 +112,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Tue Jul 25 2006 Kristian H??gsberg <krh at redhat.com>
+- Require system-logos instead.
+
 * Mon Jul 24 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.10.20060721git
 - Bump version to work around tagging weirdness.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:31:42 -0400
Subject: rpms/vte/devel .cvsignore, 1.42, 1.43 sources, 1.42, 1.43 vte.spec,
	1.86, 1.87
Message-ID: <200607251531.k6PFVgls019943@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19922

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
- Update to 0.13.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	11 Jul 2006 01:31:37 -0000	1.42
+++ .cvsignore	25 Jul 2006 15:31:40 -0000	1.43
@@ -1 +1 @@
-vte-0.13.3.tar.bz2
+vte-0.13.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	11 Jul 2006 01:31:38 -0000	1.42
+++ sources	25 Jul 2006 15:31:40 -0000	1.43
@@ -1 +1 @@
-f61fce149c8f3b4db1bd5cbcec8d664b  vte-0.13.3.tar.bz2
+6b963ce0b5999d83b382089ef94d2874  vte-0.13.4.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vte.spec	13 Jul 2006 18:42:06 -0000	1.86
+++ vte.spec	25 Jul 2006 15:31:40 -0000	1.87
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.13.3
-Release: 1.1
+Version: 0.13.4
+Release: 1
 Summary: A terminal emulator
 License: LGPL
 Group: User Interface/X
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jul 25 2006 Behdad Esfahbod <besfahbo at redhat.com> 0.13.4-1
+- Update to 0.13.4
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.13.3-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:35:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:35:57 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail-remove-inetlib.patch,
	NONE, 1.1 .cvsignore, 1.4,
	1.5 classpath-inetlib-docbuild.patch, 1.2,
	1.3 classpathx-mail-add-inetlib.patch, 1.1,
	1.2 classpathx-mail-docbuild.patch, 1.2,
	1.3 classpathx-mail.spec, 1.20, 1.21 sources, 1.3,
	1.4 classpath-inetlib-crosslink.patch, 1.1,
	NONE classpathx-mail-crosslink.patch, 1.1, NONE
Message-ID: <200607251535.k6PFZuRu020083@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20053/devel

Modified Files:
	.cvsignore classpath-inetlib-docbuild.patch 
	classpathx-mail-add-inetlib.patch 
	classpathx-mail-docbuild.patch classpathx-mail.spec sources 
Added Files:
	classpathx-mail-remove-inetlib.patch 
Removed Files:
	classpath-inetlib-crosslink.patch 
	classpathx-mail-crosslink.patch 
Log Message:
auto-import classpathx-mail-1.1.1-3jpp_1fc on branch devel from classpathx-mail-1.1.1-3jpp_1fc.src.rpm

classpathx-mail-remove-inetlib.patch:
 build.xml |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE classpathx-mail-remove-inetlib.patch ---
--- ../mail-20050512.orig/build.xml	2005-05-12 14:26:00.000000000 -0400
+++ build.xml	2005-05-12 17:56:59.000000000 -0400
@@ -64,18 +64,13 @@
   <!-- Targets -->
   <target name='preinit'>
     <available file='${activation.jar}' property='activation.available'/>
-    <available file='${inetlib.jar}' property='inetlib.available'/>
   </target>
 
   <target name='activation.jar.unavailable' depends='preinit' unless='activation.available'>
     <fail message='Can&apos;t find ${activation.jar} - see INSTALL'/>
   </target>
 
-  <target name='inetlib.jar.unavailable' depends='preinit' unless='inetlib.available'>
-    <fail message='Can&apos;t find ${inetlib.jar} - see INSTALL'/>
-  </target>
-
-  <target name='init' depends='preinit,activation.jar.unavailable,inetlib.jar.unavailable'>
+  <target name='init' depends='preinit,activation.jar.unavailable'>
     <echo>WARNING: compilation using Ant is not supported, see the file INSTALL for details</echo>
     <tstamp/>
     <mkdir dir='${dst}'/>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jan 2005 13:51:01 -0000	1.4
+++ .cvsignore	25 Jul 2006 15:35:53 -0000	1.5
@@ -1,5 +1,2 @@
-mail-1.0.tar.gz
-inetlib-1.0.tar.gz
-mail-1.0
-noarch
-*.src.rpm
+inetlib-1.1.1.tar.gz
+mail-1.1.1.tar.gz

classpath-inetlib-docbuild.patch:
 build.xml |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

Index: classpath-inetlib-docbuild.patch
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpath-inetlib-docbuild.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classpath-inetlib-docbuild.patch	11 Nov 2005 16:06:21 -0000	1.2
+++ classpath-inetlib-docbuild.patch	25 Jul 2006 15:35:53 -0000	1.3
@@ -1,11 +1,12 @@
---- ./build.xml.orig	2005-11-10 17:48:27.000000000 -0500
-+++ ./build.xml	2005-11-10 17:49:05.000000000 -0500
-@@ -233,7 +233,7 @@
+--- ../inetlib-20050512.orig/build.xml	2005-05-12 16:33:48.000000000 -0400
++++ build.xml	2005-05-12 16:36:23.000000000 -0400
+@@ -155,8 +155,7 @@
+ 	<target name='doc' depends='init'>
  		<mkdir dir='${doc}'/>
  		<javadoc destdir='${doc}' use='true' author='true'
- 			windowtitle='GNU inetlib API documentation'
--			classpathref='nntp.classpath'>
-+			classpathref='inetlib.classpath'>
+-			windowtitle='GNU inetlib API documentation'
+-			classpathref='provider.classpath'>
++			windowtitle='GNU inetlib API documentation'>
  			<doctitle><![CDATA[<h3>GNU inetlib</h3>]]></doctitle>
  			<bottom><![CDATA[&copy;]]> Copyright 2003 The Free Software Foundation,
  			all rights reserved</bottom>

classpathx-mail-add-inetlib.patch:
 build.xml |    7 +++++++
 1 files changed, 7 insertions(+)

Index: classpathx-mail-add-inetlib.patch
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail-add-inetlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classpathx-mail-add-inetlib.patch	11 Jan 2005 13:51:01 -0000	1.1
+++ classpathx-mail-add-inetlib.patch	25 Jul 2006 15:35:53 -0000	1.2
@@ -1,16 +1,16 @@
---- ../mail-1.0.orig/build.xml	2004-06-13 14:10:25.000000000 -0400
-+++ build.xml	2004-10-29 14:13:00.000000000 -0400
-@@ -162,6 +162,13 @@
-     			<include name='javamail.providers'/>
-     			<include name='javamail.address.map'/>
-             </metainf>
-+			<include name='org/jpackage/mail/inet/ftp/*.class'/>
-+			<include name='org/jpackage/mail/inet/util/*.class'/>
-+			<include name='org/jpackage/mail/inet/smtp/*.class'/>
-+			<include name='org/jpackage/mail/inet/imap/*.class'/>
-+			<include name='org/jpackage/mail/inet/pop3/*.class'/>
-+			<include name='org/jpackage/mail/inet/nntp/*.class'/>
-+			<include name='org/jpackage/mail/inet/gopher/*.class'/>
- 			<include name='gnu/mail/treeutil/*.class'/>
- 			<include name='gnu/mail/providers/*.class'/>
- 			<include name='gnu/mail/providers/smtp/*.class' unless='disable-smtp'/>
+--- ../mail-20050512.orig/build.xml	2005-05-12 14:26:00.000000000 -0400
++++ build.xml	2005-05-12 14:35:00.000000000 -0400
+@@ -177,6 +180,13 @@
+         <include name='javamail.providers'/>
+         <include name='javamail.address.map'/>
+       </metainf>
++      <include name='org/jpackage/mail/inet/ftp/*.class'/>
++      <include name='org/jpackage/mail/inet/util/*.class'/>
++      <include name='org/jpackage/mail/inet/smtp/*.class'/>
++      <include name='org/jpackage/mail/inet/imap/*.class'/>
++      <include name='org/jpackage/mail/inet/pop3/*.class'/>
++      <include name='org/jpackage/mail/inet/nntp/*.class'/>
++      <include name='org/jpackage/mail/inet/gopher/*.class'/>
+       <include name='gnu/mail/treeutil/*.class'/>
+       <include name='gnu/mail/providers/*.class'/>
+       <include name='gnu/mail/providers/smtp/*.class' unless='disable-smtp'/>

classpathx-mail-docbuild.patch:
 build.xml |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

Index: classpathx-mail-docbuild.patch
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail-docbuild.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classpathx-mail-docbuild.patch	11 Nov 2005 16:06:21 -0000	1.2
+++ classpathx-mail-docbuild.patch	25 Jul 2006 15:35:53 -0000	1.3
@@ -1,11 +1,12 @@
---- ./build.xml.orig	2005-11-10 17:39:02.000000000 -0500
-+++ ./build.xml	2005-11-10 17:39:31.000000000 -0500
-@@ -194,7 +194,7 @@
- 		<mkdir dir='${doc}'/>
- 		<javadoc destdir='${doc}' use='true' author='true'
- 			windowtitle='GNU JavaMail API documentation'
--			classpathref='nntp.classpath'>
-+			classpathref='provider.classpath'>
- 			<doctitle><![CDATA[<h3>GNU JavaMail</h3>]]></doctitle>
- 			<bottom><![CDATA[&copy;]]> Copyright 2003, 2004
+--- ../mail-20050512.orig/build.xml	2005-05-12 14:26:00.000000000 -0400
++++ build.xml	2005-05-12 14:29:01.000000000 -0400
+@@ -208,8 +211,7 @@
+   <target name='javadoc' depends='init' description='Build the JavaDoc API documentation'>
+     <mkdir dir='${doc}'/>
+     <javadoc destdir='${doc}' use='true' author='true'
+-      windowtitle='GNU JavaMail API documentation'
+-      classpathref='nntp.classpath'>
++      windowtitle='GNU JavaMail API documentation'>
+       <doctitle><![CDATA[<h3>GNU JavaMail</h3>]]></doctitle>
+       <bottom><![CDATA[&copy;]]> Copyright 2003, 2004
              The Free Software Foundation, All rights reserved</bottom>


Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- classpathx-mail.spec	22 Jul 2006 08:36:47 -0000	1.20
+++ classpathx-mail.spec	25 Jul 2006 15:35:53 -0000	1.21
@@ -1,60 +1,94 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define jmailver 1.3.1
-%define inetlibver 1.0
+%define inetlibver 1.1.1
 
 Name:           classpathx-mail
-Version:        1.0
-Release: 	4jpp_7fc
+Version:        1.1.1
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        GNU JavaMail(tm)
 
 Group:          System Environment/Libraries
 License:        GPL with library exception
 URL:            http://www.gnu.org/software/classpathx/
-Source0:        http://ftp.gnu.org/gnu/classpathx/mail-1.0.tar.gz
-Source1:        http://ftp.gnu.org/gnu/classpath/inetlib-1.0.tar.gz
-Patch0:         %{name}-crosslink.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157685#c2
+Source0:        http://ftp.gnu.org/gnu/classpathx/mail-%{version}.tar.gz
+Source1:        http://ftp.gnu.org/gnu/classpath/inetlib-1.1.1.tar.gz
+# see bz157685
 Patch1:         %{name}-docbuild.patch
 Patch2:         %{name}-add-inetlib.patch
-Patch3:         classpath-inetlib-crosslink.patch
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157685#c2
+Patch3:         %{name}-remove-inetlib.patch
+# see bz157685
 Patch4:         classpath-inetlib-docbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRequires:  jpackage-utils >= 0:1.5
 BuildRequires:  ant
 BuildRequires:  jaf >= 0:1.0
 BuildRequires:  %{_bindir}/perl
 BuildRequires:  jce
-BuildRequires:  java-sasl
+# gnu-crypto is required for pre-1.5 JVMs only
+BuildRequires:  gnu-crypto
+#BuildRequires:  java-sasl
 Requires:       jaf >= 0:1.0
 Requires:       jce
 Requires:       java-sasl
+Requires(preun):  /usr/sbin/update-alternatives
+Requires(post):  /usr/sbin/update-alternatives
 Provides:       javamail = 0:%{jmailver}
-# RHEL3 and FC2
-Obsoletes:	javamail >= 0:20000000
+# For backward compatibility with former monolithic subpackages
+Provides:       javamail-monolithic = 0:%{jmailver}
+Obsoletes:      classpathx-mail-monolithic <= 0:1.1.1_2jpp_6rh
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 GNU JavaMail(tm) is a free implementation of the JavaMail API.
 
-%package monolithic
-Summary:	All %{name} in one monolithic jar
-Group:		Development/Libraries/Java
-Requires:       jaf >= 0:1.0
-Requires:       jce
-Requires:       java-sasl
-Provides:       javamail-monolithic = 0:%{jmailver}
-
-%description monolithic
-All %{name} in one monolithic jar.
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
 Provides:       javamail-javadoc = 0:%{jmailver}
 BuildRequires:  java-javadoc, jaf-javadoc
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -62,13 +96,12 @@
 
 %prep
 %setup -q -n mail-%{version}
-%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 rm -f libmail.so
 gzip -dc %{SOURCE1} | tar -xf -
 pushd inetlib-%{inetlibver}
-%patch3 -p0
 %patch4 -p0
   mkdir -p source/org/jpackage/mail
   mv source/gnu/inet source/org/jpackage/mail
@@ -91,10 +124,11 @@
   -Dj2se.apidoc=%{_javadocdir}/java \
   -Djaf.apidoc=%{_javadocdir}/jaf \
   dist javadoc
+
 # build monolithic
 mkdir monolithic
 pushd monolithic
-for jar in providers gnumail; do jar xf ../$jar.jar; done
+for jar in gnumail gnumail-providers ; do jar xf ../$jar.jar; done
 rm -f META-INF/MANIFEST.MF
 jar cf ../monolithic.jar *
 popd
@@ -104,56 +138,118 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/javamail
-install -pm 644 gnumail.jar \
-  $RPM_BUILD_ROOT%{_javadir}/javamail/mailapi-%{jmailver}.jar
-ln -s mailapi-%{jmailver}.jar $RPM_BUILD_ROOT%{_javadir}/javamail/mailapi.jar
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}/classpathx-mail
 
-install -pm 644 providers.jar \
-  $RPM_BUILD_ROOT%{_javadir}/javamail/providers-%{jmailver}.jar
-ln -s providers-%{jmailver}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/javamail/providers.jar
+# API
+install -pm 644 gnumail.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar
+ln -s mail-%{jmailver}-api-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar
+ln -s mail-%{jmailver}-api.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mailapi.jar
+
+# Providers
+install -pm 644 gnumail-providers.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar
+ln -s mail-%{jmailver}-providers-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar
+ln -s mail-%{jmailver}-providers.jar \
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/providers.jar
 for prov in imap nntp pop3 smtp ; do
-  ln -s providers.jar $RPM_BUILD_ROOT%{_javadir}/javamail/$prov.jar
-  ln -s providers-%{jmailver}.jar \
-    $RPM_BUILD_ROOT%{_javadir}/javamail/$prov-%{jmailver}.jar
+  ln -s mail-%{jmailver}-providers.jar \
+    $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov-%{jmailver}.jar
+  ln -s providers.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov.jar
 done
 
 install -pm 644 monolithic.jar \
-  $RPM_BUILD_ROOT%{_javadir}/javamail-%{jmailver}.jar
-ln -s javamail-%{jmailver}.jar $RPM_BUILD_ROOT%{_javadir}/javamail.jar
+  $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar
+ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar
+touch $RPM_BUILD_ROOT%{_javadir}/javamail.jar # for %ghost
+
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail-%{jmailver}
+cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail-%{jmailver}
+ln -s classpathx-mail-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/classpathx-mail
 
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/javamail-%{jmailver}
-cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/javamail-%{jmailver}
-ln -s javamail-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/javamail
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post javadoc
-rm -f %{_javadocdir}/javamail
-ln -s javamail-%{jmailver} %{_javadocdir}/javamail
+%triggerpostun -- classpathx-mail-monolithic <= 0:1.1.1-1jpp
+# Remove file from old monolithic subpackage
+rm -f %{_javadir}/javamail.jar
+# Recreate the link as update-alternatives could not do it
+ln -s %{_sysconfdir}/alternatives/javamail %{_javadir}/javamail.jar
+
+%post
+/usr/sbin/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%preun
+if [ "$1" = "0" ]; then
+    /usr/sbin/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar
+fi
 
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING
-%{_javadir}/javamail
-
-%files monolithic
-%defattr(644,root,root,755)
-%{_javadir}/javamail-%{jmailver}.jar
-%{_javadir}/javamail.jar
+%dir %{_javadir}/classpathx-mail
+%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar
+%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar
+%{_javadir}/classpathx-mail/mailapi.jar
+%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar
+%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar
+%{_javadir}/classpathx-mail/providers.jar
+%{_javadir}/classpathx-mail/imap-%{jmailver}.jar
+%{_javadir}/classpathx-mail/imap.jar
+%{_javadir}/classpathx-mail/nntp-%{jmailver}.jar
+%{_javadir}/classpathx-mail/nntp.jar
+%{_javadir}/classpathx-mail/pop3-%{jmailver}.jar
+%{_javadir}/classpathx-mail/pop3.jar
+%{_javadir}/classpathx-mail/smtp-%{jmailver}.jar
+%{_javadir}/classpathx-mail/smtp.jar
+# Monolithic jar
+%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar
+%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar
+%ghost %{_javadir}/javamail.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/classpathx-mail-1.3.1-monolithic-1.1.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-api-1.1.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-providers-1.1.1.jar.*
+%endif
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/javamail-%{jmailver}
-%ghost %doc %{_javadocdir}/javamail
+%doc %{_javadocdir}/classpathx-mail-%{jmailver}
+%doc %{_javadocdir}/classpathx-mail
 
 
 %changelog
+* Tue Jul 25 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-3jpp_1fc
+- Merge with upstream
+
+* Tue Jul 25 2006 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-3jpp
+- Add trigger to remove old javamail.jar file from monolithic subpackage
+- Fold -monolithic subpackage into main package to simplify dependency
+  specifications in other packages
+- Require update-alternatives to be present during install/uninstall
+- Fix versioned providers jar file name
+- Install/remove alternatives in the monolithic subpackage
+- Fix providers jar names
+- Add AOT bits
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-4jpp_7fc
 - Rebuilt
 
@@ -169,9 +265,23 @@
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
+* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-2jpp
+- Change handling of alternatives to 6-digit scheme
+- Change handling of javadocs to new %{_netsharedpath} and 
+  "/usr/share mounted read only" friendly scheme
+
 * Fri Nov 11 2005 Vadim Nasardinov <vadimn at redhat.com> - 0:1.0-4jpp_3fc
 - BZ 157685
 
+* Thu Jul 28 2005 Fernando Nasser <fnasser at redhat.com> 0:1.1.1-1jpp
+- Upgrade to Classpathx-Mail 1.1.1
+
+* Fri Jun 17 2005 Fernando Nasser <fnasser at redhat.com> 0:1.1-1jpp
+- Upgrade to Classpathx-Mail 1.1
+- Add fix for handling of Mime multipart messages from Archit Shah
+  From Gary Benson <gbenson at redhat.com>:
+- Add a javamail-monolithic equivalent.
+
 * Wed Jun  1 2005 Gary Benson <gbenson at redhat.com> 0:1.0-4jpp_2fc
 - Fix location of monolithic jarfile.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jan 2005 13:51:01 -0000	1.3
+++ sources	25 Jul 2006 15:35:53 -0000	1.4
@@ -1,2 +1,2 @@
-64742f096c13146ec07734a449194bd7  mail-1.0.tar.gz
-f615733ca01b38d545a4b911678e8952  inetlib-1.0.tar.gz
+bccc7c74338b18216f8bb69e78857a5d  inetlib-1.1.1.tar.gz
+27bb68ef61dd9a967b375b7798c2524d  mail-1.1.1.tar.gz


--- classpath-inetlib-crosslink.patch DELETED ---


--- classpathx-mail-crosslink.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:37:11 -0400
Subject: rpms/cryptix-asn1/devel cryptix-asn1.spec,1.6,1.7
Message-ID: <200607251537.k6PFbB9o020195@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/cryptix-asn1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20156

Modified Files:
	cryptix-asn1.spec 
Log Message:
- Remove duplicate NVR defines.
- Conditional native compilation for GCJ.
- Continuing to use the same version for now since the original package
  version is too big.
- May need an epoch bump next time to bring it inline with JPP version number.




Index: cryptix-asn1.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptix-asn1/devel/cryptix-asn1.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cryptix-asn1.spec	22 Jul 2006 08:37:26 -0000	1.6
+++ cryptix-asn1.spec	25 Jul 2006 15:37:08 -0000	1.7
@@ -1,13 +1,47 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+
 %define pname		Cryptix-asn1
-%define name		cryptix-asn1
-%define version		20011119
 %define snapshot	20011119
-%define release 4jpp_3fc
 %define section		free
 
-Name:		%{name}
-Version:	%{version}
-Release: %{release}
+Name:		cryptix-asn1
+#FIXME: We will have to tackle this obscene version number soon.
+#Perhaps this package will just die before then.
+Version:	20011119
+Release:	7jpp_1fc
 Epoch:		0
 Summary:	Cryptix ASN1 implementation
 License:	BSD style
@@ -16,10 +50,18 @@
 Source0:	%{pname}-%{snapshot}-RHCLEAN.tar.bz2
 Source1:	%{name}.build.script
 Requires:	cryptix
-BuildRequires:	ant, cryptix, jpackage-utils > 1.4
+BuildRequires:	ant, cryptix, jpackage-utils > 1.5
+%if ! %{gcj_support}
 BuildArch:	noarch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Java crypto package and asn1 implementation.
 
@@ -35,7 +77,6 @@
 cp %{SOURCE1} build.xml
 # remove all binary libs
 rm -fr $(find . -name "*.jar")
-rm -fr $(find . -name "*.class")
 
 %build
 ant clean jar javadoc
@@ -49,20 +90,51 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(-,root,root)
 %doc cryptix/asn1/docs/*
 %{_javadir}/*.jar
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/cryptix-asn1-%{version}.jar.*
+%endif
+
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 20011119-4jpp_3fc
+* Mon Jul 24 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:20011119-7jpp_1fc
+- Remove duplicate NVR defines.
+- Conditional native compilation for GCJ.
+- Continuing to use the same version for now since the original package
+  version is too big.
+- May need an epoch bump next time to bring it inline with JPP version number.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> 0:20011119-4jpp_3fc
 - Rebuilt
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:20011119-4jpp_2fc.1.1.1.1



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:38:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:38:26 -0400
Subject: rpms/hal/FC-5 hal.spec,1.91,1.92
Message-ID: <200607251538.k6PFcQgr020338@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20316

Modified Files:
	hal.spec 
Log Message:
- Add BR for pkg-config



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- hal.spec	25 Jul 2006 14:55:45 -0000	1.91
+++ hal.spec	25 Jul 2006 15:38:24 -0000	1.92
@@ -31,6 +31,7 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 PreReq: chkconfig
+BuildRequires: pkg-config
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:47:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:47:59 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch, NONE,
	1.1 openoffice.org.spec, 1.790, 1.791
Message-ID: <200607251547.k6PFlxYC015782@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15720

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch 
Log Message:
build failed, merge new bits into current

openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch:
 _viewsh.sdi |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch ---
Index: sdi/_viewsh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_viewsh.sdi,v
retrieving revision 1.28.82.1
retrieving revision 1.28
diff -u -r1.28.82.1 -r1.28
--- openoffice.org.orig/sw/sdi/_viewsh.sdi	30 Jun 2006 05:47:01 -0000	1.28.82.1
+++ openoffice.org/sw/sdi/_viewsh.sdi	2 May 2006 15:16:04 -0000	1.28
@@ -622,6 +622,12 @@
         Export = FALSE;
     ]
 
+    FN_PRINT_LAYOUT
+    [
+        ExecMethod = ExecViewOptions ;
+        StateMethod = StateViewOptions ;
+        Export = FALSE;
+    ]
      // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren
     FN_RULER // status()
     [


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- openoffice.org.spec	25 Jul 2006 10:55:29 -0000	1.790
+++ openoffice.org.spec	25 Jul 2006 15:47:56 -0000	1.791
@@ -91,39 +91,38 @@
 Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch27: workspace.bfsixtyfour.patch
-Patch28: openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
-Patch29: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
-Patch30: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
-Patch31: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
-Patch32: workspace.fpicker6.patch
-Patch33: workspace.vcl59.patch
-Patch34: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
-Patch35: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch36: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
-Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
-Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
-Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch41: workspace.sixtyfour06.patch
-Patch42: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch43: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
-Patch44: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch45: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
-Patch46: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch47: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch48: ooobuild.VBAObjects.patch
-Patch49: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
-Patch50: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
-Patch51: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
-Patch52: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch53: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
-Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch58: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch59: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch60: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch28: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
+Patch29: openoffice.org-2.0.3.ooo65308.notespaste.sd.patch
+Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
+Patch31: workspace.fpicker6.patch
+Patch32: workspace.vcl59.patch
+Patch33: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
+Patch34: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch35: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
+Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch38: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
+Patch39: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch40: workspace.sixtyfour06.patch
+Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
+Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch44: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
+Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch47: ooobuild.VBAObjects.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
+Patch49: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+Patch50: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch51: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch52: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+Patch53: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch54: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch55: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch56: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch59: openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -842,39 +841,38 @@
 %patch25 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch27 -p1 -b .workspace.bfsixtyfour.patch
-# %patch28 -p1 -b .gccXXXXX.svtools.R_X86_64_PC32.patch
-%patch29 -p1 -b .ooo65318.agg24.canvas.patch
-%patch30 -p1 -b .ooo65308.notespaste.sd.patch
-%patch31 -p1 -b .ooo65327.builddep.writerperfect.patch
-%patch32 -p1 -b .workspace.fpicker6.patch
-%patch33 -p1 -b .workspace.vcl59.patch
-%patch34 -p1 -b .oooXXXXX.atkbroken.vcl.patch
-%patch35 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch36 -p1 -b .ooo65767.vcl.removemenukey.patch
-%patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
-%patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
-%patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .ooo65519.printing.samba.patch
-%patch41 -p1 -b .workspace.sixtyfour06.patch
-%patch42 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch43 -p1 -b .ooo66851.i18npool.x86_64.patch
-%patch44 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch45 -p1 -b .ooo66510.shell.recentlyused.patch
-%patch46 -p1 -b .rh187919.gtkunderkde.patch
-%patch47 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch48 -p0 -b .ooobuild.VBAObjects.patch
-%patch49 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
-%patch50 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
-%patch51 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
-%patch52 -p1 -b .ooo67644.sw.spacing.patch
-%patch53 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch55 -p1 -b .ooo67716.svx.overflow.patch
-%patch56 -p1 -b .gcc28409.anonymousexternc.patch
-%patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch58 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch59 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch60 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch28 -p1 -b .ooo65318.agg24.canvas.patch
+%patch29 -p1 -b .ooo65308.notespaste.sd.patch
+%patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
+%patch31 -p1 -b .workspace.fpicker6.patch
+%patch32 -p1 -b .workspace.vcl59.patch
+%patch33 -p1 -b .oooXXXXX.atkbroken.vcl.patch
+%patch34 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch35 -p1 -b .ooo65767.vcl.removemenukey.patch
+%patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch38 -p1 -b .ooo66067.embeddedobj.crash.patch
+%patch39 -p1 -b .ooo65519.printing.samba.patch
+%patch40 -p1 -b .workspace.sixtyfour06.patch
+%patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
+%patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch44 -p1 -b .ooo66510.shell.recentlyused.patch
+%patch45 -p1 -b .rh187919.gtkunderkde.patch
+%patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch47 -p0 -b .ooobuild.VBAObjects.patch
+%patch48 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
+%patch49 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
+%patch50 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch51 -p1 -b .ooo67644.sw.spacing.patch
+%patch52 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
+%patch53 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch54 -p1 -b .ooo67716.svx.overflow.patch
+%patch55 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch56 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch59 -p1 -b .ooo65081.sw.layoutsmenu.patch
 
 tar xzf %{SOURCE1}
 
@@ -3361,6 +3359,9 @@
 - rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+- rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
+- drop openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
+- drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - reenable visibility support



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:54:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:54:47 -0400
Subject: rpms/hal/FC-5 hal.spec,1.92,1.93
Message-ID: <200607251554.k6PFsltE018360@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18272

Modified Files:
	hal.spec 
Log Message:
- s/pkg-config/pkgconfig



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- hal.spec	25 Jul 2006 15:38:24 -0000	1.92
+++ hal.spec	25 Jul 2006 15:54:44 -0000	1.93
@@ -31,7 +31,7 @@
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 PreReq: chkconfig
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}



From fedora-cvs-commits at redhat.com  Tue Jul 25 15:54:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 11:54:50 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.21,1.22
Message-ID: <200607251554.k6PFsouq018397@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18265

Modified Files:
	classpathx-mail.spec 
Log Message:
Remove subsetted .so's




Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- classpathx-mail.spec	25 Jul 2006 15:35:53 -0000	1.21
+++ classpathx-mail.spec	25 Jul 2006 15:54:48 -0000	1.22
@@ -226,8 +226,9 @@
 
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/classpathx-mail-1.3.1-monolithic-1.1.1.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-api-1.1.1.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-providers-1.1.1.jar.*
+# These ones are included in the monolithic one above
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-api-1.1.1.jar.*
+#%attr(-,root,root) %{_libdir}/gcj/%{name}/mail-1.3.1-providers-1.1.1.jar.*
 %endif
 
 %files javadoc



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:03:13 -0400
Subject: rpms/mesa/devel mesa.spec,1.73,1.74
Message-ID: <200607251603.k6PG3DgW020890@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20861

Modified Files:
	mesa.spec 
Log Message:
* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 6.5-16.fc6
- Remove glut-devel dependency, as nothing actually uses it that we ship.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mesa.spec	25 Jul 2006 12:30:31 -0000	1.73
+++ mesa.spec	25 Jul 2006 16:03:10 -0000	1.74
@@ -101,7 +101,6 @@
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel
 BuildRequires: xorg-x11-proto-devel >= 7.0-3
-BuildRequires: glut-devel
 BuildRequires: libXt-devel
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
@@ -515,6 +514,7 @@
 
 %changelog
 * Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 6.5-16.fc6
+- Remove glut-devel dependency, as nothing actually uses it that we ship.
 - Added mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch to prevent libglut
   and other libs from being linked into glxgears/glxinfo even though they
   are not actually used.  This was the final package linking to freeglut in



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:03:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:03:58 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.495, 1.496 kernel-2.6.spec, 1.2449,
	1.2450 linux-2.6-xen.patch, 1.35, 1.36 sources, 1.459,
	1.460 upstream, 1.402, 1.403 patch-2.6.18-rc2-git3.bz2.sign,
	1.1, NONE
Message-ID: <200607251603.k6PG3wcK021024@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20902

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen.patch sources 
	upstream 
Added Files:
	patch-2.6.18-rc2-git4.bz2.sign 
Removed Files:
	patch-2.6.18-rc2-git3.bz2.sign 
Log Message:
git4


--- NEW FILE patch-2.6.18-rc2-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExcInyGugalF9Dw4RAnKqAJ9FBJeauOrubmAl6fmhblFjvNt5WwCfR4I8
2KBlxtXn7UAzUdKKdiGhbA8=
=u8nL
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- .cvsignore	24 Jul 2006 23:07:18 -0000	1.495
+++ .cvsignore	25 Jul 2006 16:03:52 -0000	1.496
@@ -3,8 +3,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-kabitool
-find-provides
-kernel-2.6.spec
-patch-2.6.18-rc2-git3.bz2
 xen-10712.tar.bz2
+patch-2.6.18-rc2-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2449
retrieving revision 1.2450
diff -u -r1.2449 -r1.2450
--- kernel-2.6.spec	25 Jul 2006 08:37:15 -0000	1.2449
+++ kernel-2.6.spec	25 Jul 2006 16:03:52 -0000	1.2450
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git3.bz2
+Patch2: patch-2.6.18-rc2-git4.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1639,6 +1639,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc2-git4
+
 * Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
 - Fix kabitool provided find-provides once again.
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   11 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85144 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- linux-2.6-xen.patch	24 Jul 2006 00:43:29 -0000	1.35
+++ linux-2.6-xen.patch	25 Jul 2006 16:03:53 -0000	1.36
@@ -82645,15 +82645,6 @@
  extern void	       kfree_skbmem(struct sk_buff *skb);
  extern struct sk_buff *skb_clone(struct sk_buff *skb,
  				 gfp_t priority);
-@@ -1088,7 +1097,7 @@ static inline struct sk_buff *__dev_allo
- 	return skb;
- }
- #else
--extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
-+extern struct sk_buff *__dev_alloc_skb(unsigned int length, gfp_t gfp_mask);
- #endif
- 
- /**
 diff --exclude='.hg*' -urNp linux-2.6.18-rc2/include/scsi/scsi_eh.h linux-2.6-xen-fedora/include/scsi/scsi_eh.h
 --- linux-2.6.18-rc2/include/scsi/scsi_eh.h	2006-07-23 11:26:08.000000000 +0200
 +++ linux-2.6-xen-fedora/include/scsi/scsi_eh.h	2006-07-18 03:28:32.000000000 +0200


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- sources	25 Jul 2006 14:34:58 -0000	1.459
+++ sources	25 Jul 2006 16:03:55 -0000	1.460
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-f4a7157f2d32fac7528dae1dd2e62f60  patch-2.6.18-rc2-git3.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
+c48692a855ea8aa1b08fb9745ed951b0  patch-2.6.18-rc2-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- upstream	24 Jul 2006 21:25:09 -0000	1.402
+++ upstream	25 Jul 2006 16:03:55 -0000	1.403
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git3.bz2
+patch-2.6.18-rc2-git4.bz2


--- patch-2.6.18-rc2-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:06:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:06:57 -0400
Subject: rpms/classpathx-mail/devel classpathx-mail.spec,1.22,1.23
Message-ID: <200607251606.k6PG6vMi021582@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/classpathx-mail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21501

Modified Files:
	classpathx-mail.spec 
Log Message:
Add missing underscore to gcj_compat macro definition




Index: classpathx-mail.spec
===================================================================
RCS file: /cvs/dist/rpms/classpathx-mail/devel/classpathx-mail.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- classpathx-mail.spec	25 Jul 2006 15:54:48 -0000	1.22
+++ classpathx-mail.spec	25 Jul 2006 16:06:54 -0000	1.23
@@ -28,7 +28,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 1
+%define _gcj_support 1
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:11:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:11:52 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.791,1.792
Message-ID: <200607251611.k6PGBq1R022906@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22852

Modified Files:
	openoffice.org.spec 
Log Message:
some xalan problem killing me


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- openoffice.org.spec	25 Jul 2006 15:47:56 -0000	1.791
+++ openoffice.org.spec	25 Jul 2006 16:11:49 -0000	1.792
@@ -123,6 +123,7 @@
 Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 Patch59: openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
+Patch60: openoffice.org-2.0.3.rhXXXXX.filter.xalanbroken.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -873,6 +874,7 @@
 %patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
 %patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
 %patch59 -p1 -b .ooo65081.sw.layoutsmenu.patch
+%patch60 -p1 -b .rhXXXXX.filter.xalanbroken.patch
 
 tar xzf %{SOURCE1}
 
@@ -3365,6 +3367,7 @@
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - reenable visibility support
+- add openoffice.org-2.0.3.rhXXXXX.filter.xalanbroken.patch to workaround some new xalan problem
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:14:18 -0400
Subject: rpms/SDL/devel SDL-1.2.10-multilib.patch, NONE, 1.1 SDL.spec, 1.46,
	1.47
Message-ID: <200607251614.k6PGEHd0023837@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23731

Modified Files:
	SDL.spec 
Added Files:
	SDL-1.2.10-multilib.patch 
Log Message:
[tw]
- dropped libXt build requires, because libSDL does not need libXt at all - 
  this was an autofoo bug (fixed already)
- fixed multilib devel conflicts (#192749)
- added buidrequires for imake: AC_PATH_X needs imake currently



SDL-1.2.10-multilib.patch:
 sdl-config.in |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE SDL-1.2.10-multilib.patch ---
--- SDL-1.2.10/sdl-config.in.multilib	2006-05-01 10:03:00.000000000 +0200
+++ SDL-1.2.10/sdl-config.in	2006-07-24 19:45:20.000000000 +0200
@@ -9,6 +9,15 @@
 @ENABLE_STATIC_TRUE at usage="\
 @ENABLE_STATIC_TRUE at Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
 
+arch=$(/bin/arch)
+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
+    -o "$arch" = "ia64" ]; 
+then
+    libdir="@prefix@/lib64"
+else
+    libdir="@prefix@/lib"
+fi
+
 if test $# -eq 0; then
       echo "${usage}" 1>&2
       exit 1
@@ -44,11 +53,11 @@
       echo -I at includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
- at ENABLE_SHARED_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ at ENABLE_SHARED_TRUE@      echo -L$libdir @SDL_RLD_FLAGS@ @SDL_LIBS@
 @ENABLE_SHARED_TRUE@      ;;
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
- at ENABLE_STATIC_TRUE@      echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ at ENABLE_STATIC_TRUE@      echo -L$libdir @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
     *)
       echo "${usage}" 1>&2


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- SDL.spec	13 Jul 2006 02:15:35 -0000	1.46
+++ SDL.spec	25 Jul 2006 16:14:15 -0000	1.47
@@ -1,12 +1,13 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 5
+Release: 6
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
 Patch19: SDL-1.2.10-preferalsa.patch
 Patch20: SDL-1.2.10-pagesize.patch
+Patch21: SDL-1.2.10-multilib.patch
 URL: http://www.libsdl.org/
 License: LGPL
 Group: System Environment/Libraries
@@ -16,6 +17,7 @@
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
 BuildRequires: libXt-devel libXrender-devel libXrandr-devel gettext-devel
+BuildRequires: imake
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -46,12 +48,11 @@
 %patch17 -p1 -b .libdir
 %patch19 -p1 -b .preferalsa
 %patch20 -p1 -b .pagesize
+%patch21 -p1 -b .multilib
 
 %build
-#libtoolize --copy --force
-#aclocal
-#autoconf
-#automake --foreign --include-deps --add-missing --force-missing --copy -a
+aclocal
+autoconf
 CFLAGS="$RPM_OPT_FLAGS -O3" CXXFLAGS="$RPM_OPT_FLAGS -O3" \
 %configure \
    --disable-video-svga --disable-video-ggi --disable-video-aalib \
@@ -98,6 +99,12 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Tue Jul 25 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6
+- dropped libXt build requires, because libSDL does not need libXt at all - 
+  this was an autofoo bug (fixed already)
+- fixed multilib devel conflicts (#192749)
+- added buidrequires for imake: AC_PATH_X needs imake currently
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.2.10-5
 - rebuild
 - use %%configure macro



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:18:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:18:37 -0400
Subject: rpms/gettext/devel gettext.spec,1.53,1.54
Message-ID: <200607251618.k6PGIbvD007444@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7373

Modified Files:
	gettext.spec 
Log Message:
* Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.14.5-4
- Bump release number.




Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gettext.spec	12 Jul 2006 05:54:45 -0000	1.53
+++ gettext.spec	25 Jul 2006 16:18:35 -0000	1.54
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.5
-Release: 3.1
+Release: 4
 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 Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0.14.5-4
+- Bump release number.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:20:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:20:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch, NONE,
	1.1 openoffice.org.spec, 1.792, 1.793
Message-ID: <200607251620.k6PGKwmR008352@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8283

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch 
Log Message:
work around for broken new xalan problem, I *did* suggest that we move to the new xalan months ago, if we had done so then I'd know if it was the new xalan, or the new gcc

openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch:
 langfilter.xsl |   22 +++++++++++++++++++---
 makefile.mk    |   15 +++++++++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch ---
--- openoffice.org.orig/filter/source/config/fragments/langfilter.xsl	2005-10-27 20:38:20.000000000 +0200
+++ openoffice.org/filter/source/config/fragments/langfilter.xsl	2005-10-27 20:38:44.000000000 +0200
@@ -2,19 +2,35 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:oor="http://openoffice.org/2001/registry">
 <xsl:output method="xml" indent="yes" omit-xml-declaration="no" version="1.0" encoding="UTF-8"/>
 <xsl:param name="lang"/>
-<xsl:template match="*[.//*[@xml:lang=$lang]] | @*">
+<xsl:template match="*">
+    <xsl:if test="count(.//*[@xml:lang=$lang])&gt;0">
     <xsl:copy>
         <xsl:apply-templates select="*|@*"/>
     </xsl:copy>
+    </xsl:if>
 </xsl:template>
 
-<xsl:template match="value[@xml:lang=$lang] | text()[../@xml:lang=$lang]">
+<xsl:template match="@*">
+    <xsl:copy>
+        <xsl:apply-templates select="*|@*"/>
+    </xsl:copy>
+</xsl:template>
+
+<xsl:template match="value">
+    <xsl:if test="@xml:lang=$lang">
     <xsl:copy>
         <xsl:apply-templates select="@*|text()"/>
     </xsl:copy>
+    </xsl:if>
 </xsl:template>
  
-<xsl:template match="text()"/>
+<xsl:template match="text()">
+    <xsl:if test="../@xml:lang=$lang">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|text()"/>
+        </xsl:copy>
+    </xsl:if>
+</xsl:template>
 
 
 </xsl:stylesheet>
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	2006-07-25 16:55:21.000000000 +0100
+++ openoffice.org/filter/source/config/fragments/makefile.mk	2006-07-25 17:09:10.000000000 +0100
@@ -155,15 +155,26 @@
 #cmc, hack to workaround the java build requirement
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
-.IF "$(JAVAAOTCOMPILER)" != ""
+.IF "$(JAVAAOTCOMPILER)" == ""
 MERGE    := $(BIN)$/FCFGMerge
 .ELSE
 MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
 .ENDIF
+.ENDIF
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
 PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+PACKLANG_IN := -IN
+PACKLANG_PARAM := -PARAM
+PACKLANG_XSL := -XSL
+.ELSE
+PACKLANG := $(XSLTPROC)
+PACKLANG_IN :=
+PACKLANG_PARAM := --stringparam
+PACKLANG_XSL :=
 .ENDIF
 
+
 # -----------------------------------------------------------------------------
 # build every module seperated
 # -----------------------------------------------------------------------------
@@ -190,7 +201,7 @@
      + at echo Building language packages $(@:b:s/Filter_//) for filters
      + at echo ===================================================================
      +-$(MKDIRHIER) $(@:d)
-     +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
+     +$(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $< > $@
 
 $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS_PACKED) : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- openoffice.org.spec	25 Jul 2006 16:11:49 -0000	1.792
+++ openoffice.org.spec	25 Jul 2006 16:20:56 -0000	1.793
@@ -123,7 +123,7 @@
 Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 Patch59: openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
-Patch60: openoffice.org-2.0.3.rhXXXXX.filter.xalanbroken.patch
+Patch60: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -874,7 +874,7 @@
 %patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
 %patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
 %patch59 -p1 -b .ooo65081.sw.layoutsmenu.patch
-%patch60 -p1 -b .rhXXXXX.filter.xalanbroken.patch
+%patch60 -p1 -b .rh200118.filter.xalanbroken.patch
 
 tar xzf %{SOURCE1}
 
@@ -3367,7 +3367,8 @@
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 - see if we can drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - reenable visibility support
-- add openoffice.org-2.0.3.rhXXXXX.filter.xalanbroken.patch to workaround some new xalan problem
+- add openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch to work around the new
+  xalan problem
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:31:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:31:07 -0400
Subject: rpms/postfix/devel postfix.spec,1.42,1.43
Message-ID: <200607251631.k6PGV7j3012183@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12154

Modified Files:
	postfix.spec 
Log Message:
[tw]
- fixed SASL build (#200079)
  thanks to Kaj J. Niemi for the patch




Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- postfix.spec	24 Jul 2006 12:55:03 -0000	1.42
+++ postfix.spec	25 Jul 2006 16:31:00 -0000	1.43
@@ -43,7 +43,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.3.0
-Release: 1
+Release: 2
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -180,7 +180,7 @@
 %if %{SASL}
   %define sasl_v1_lib_dir %{_libdir}/sasl
   %define sasl_v2_lib_dir %{_libdir}/sasl2
-  CCARGS="${CCARGS} -DUSE_SASL_AUTH"
+  CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL"
   %if %{SASL} <= 1
     %define sasl_lib_dir %{sasl_v1_lib_dir}
     AUXLIBS="${AUXLIBS} -L%{sasl_lib_dir} -lsasl"
@@ -468,6 +468,10 @@
 
 
 %changelog
+* Tue Jul 25 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.0-2
+- fixed SASL build (#200079)
+  thanks to Kaj J. Niemi for the patch
+
 * Mon Jul 24 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.0-1
 - new version 2.3.0
 - dropped hostname-fqdn patch



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:31:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:31:18 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.49,1.50
Message-ID: <200607251631.k6PGVELR012207@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12149

Modified Files:
	eclipse-cdt.spec 
Log Message:

* Tue Jul 25 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_9fc
- Remove redundant runtime packages from sdk.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- eclipse-cdt.spec	25 Jul 2006 13:24:19 -0000	1.49
+++ eclipse-cdt.spec	25 Jul 2006 16:31:02 -0000	1.50
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_8fc
+Release: 	1jpp_9fc
 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
@@ -255,18 +255,20 @@
 
 %files sdk
 %defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.cdt*
-%{eclipse_base}/features/com.redhat.eclipse.cdt*
-%{eclipse_base}/plugins/org.eclipse.cdt*
-%{eclipse_base}/plugins/com.redhat.eclipse.cdt*
+%{eclipse_base}/features/org.eclipse.cdt.sdk*
+%{eclipse_base}/features/org.eclipse.cdt.source*
+%{eclipse_base}/plugins/org.eclipse.cdt.source*
+%{eclipse_base}/plugins/org.eclipse.cdt.sdk*
 %{eclipse_base}/epl-v10.html
 %{eclipse_base}/notice.html
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Tue Jul 25 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_9fc
+- Remove redundant runtime packages from sdk.
+
 * Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.1.0-1jpp_8fc
 - Add epoch to sdk requires.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:32:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:32:39 -0400
Subject: rpms/mesa/devel mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch,
	1.1, 1.2
Message-ID: <200607251632.k6PGWdB8012516@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12490

Modified Files:
	mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch 
Log Message:
fix includes for glxutils

mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch:
 Makefile |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch	25 Jul 2006 09:39:35 -0000	1.1
+++ mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch	25 Jul 2006 16:32:36 -0000	1.2
@@ -10,7 +10,7 @@
 +	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
 +
 +glxinfo:
-+	$(CC) $(CFLAGS) glxinfo.c -lGL -lGLU -o $@
++	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -lGL -lGLU -o $@
 +
  pbinfo: pbinfo.o pbutil.o
  	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@



From fedora-cvs-commits at redhat.com  Tue Jul 25 16:57:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 12:57:45 -0400
Subject: rpms/gaim/devel gaim-2.0.0-beta3-utf8-name-crash.patch, NONE,
	1.1 gaim.spec, 1.131, 1.132
Message-ID: <200607251657.k6PGvjil003190@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2919

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-utf8-name-crash.patch 
Log Message:
fix crash with certain UTF-8 names in buddy list (#199590)


gaim-2.0.0-beta3-utf8-name-crash.patch:
 gtkblist.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-2.0.0-beta3-utf8-name-crash.patch ---
Index: src/gtkblist.c
===================================================================
--- src/gtkblist.c	(revision 16086)
+++ src/gtkblist.c	(revision 16087)
@@ -3428,7 +3428,7 @@
 	len = g_utf8_strlen(normalized, -1);
 	log_attrs = g_new(PangoLogAttr, len + 1);
 
-	pango_get_log_attrs(normalized, len, -1, NULL, log_attrs, len + 1);
+	pango_get_log_attrs(normalized, strlen(normalized), -1, NULL, log_attrs, len + 1);
 
 	word = normalized;
 	result = TRUE;


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gaim.spec	22 Jul 2006 04:10:18 -0000	1.131
+++ gaim.spec	25 Jul 2006 16:57:43 -0000	1.132
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.8.%{betaver}%{?dist}
+Release:	0.9.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -56,6 +56,7 @@
 
 ## Patches 100+: To be Included in Future Upstream
 Patch181: gaim-2.0.0-beta3-silc-realname.patch
+Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -158,6 +159,7 @@
 %patch5 -p1
 ## Patches 100+: To be Included in Future Upstream
 %patch181 -p2
+%patch182 -p0
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -295,6 +297,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Tue Jul 25 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.9.beta3
+- fix crash with certain UTF-8 names in buddy list (#199590)
+
 * Sat Jul 22 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.8.beta3
 - move gaim.pc to -devel (#199761)
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 17:04:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 13:04:36 -0400
Subject: rpms/firefox/devel firefox.spec,1.125,1.126
Message-ID: <200607251704.k6PH4aMO004571@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4547

Modified Files:
	firefox.spec 
Log Message:
try again...


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- firefox.spec	25 Jul 2006 14:56:13 -0000	1.125
+++ firefox.spec	25 Jul 2006 17:04:33 -0000	1.126
@@ -249,27 +249,17 @@
 %{__rm} -rf firefox-langpacks
 
 # Prepare our devel package
-%{__mkdir_p} $RPM_BUILD_ROOT/fftemp
-DESTDIR=$RPM_BUILD_ROOT/fftemp \
-   make install
-
-%{__rm} -f %{builddir}/firefox-devel.list
-echo %defattr\(-,root,root\) > %{builddir}/firefox-devel.list
-find $RPM_BUILD_ROOT/fftemp%{_includedir}/firefox-%{version}/ -type f | \
-  sed -e "s,$RPM_BUILD_ROOT,," >> \
-  %{builddir}/firefox-devel.list
-find $RPM_BUILD_ROOT/fftemp%{_datadir}/idl/firefox-%{version}/ -type f | \
-  sed -e "s,$RPM_BUILD_ROOT,," >> \
-  %{builddir}/firefox-devel.list
-sed -i -e 's,fftemp/,,' \
-       -e 's,^%{_prefix}/local,%{_prefix},' \
-       %{builddir}/firefox-devel.list
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
+install -c -m 644 dist/include/* \
+  $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
+install -c -m 644 dist/idl/* \
+  $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
   $RPM_BUILD_ROOT/%{ffdir}
-%{__rm} -rf $RPM_BUILD_ROOT/fftemp
 
 # ghost files
 touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
@@ -329,9 +319,10 @@
 %ghost %{ffdir}/components/compreg.dat
 %ghost %{ffdir}/components/xpti.dat
 
-%files devel -f firefox-devel.list
+%files devel
 %defattr(-,root,root)
-%{_datadir}/idl/firefox-%{version}/*
+%{_datadir}/idl/firefox-%{version}
+%{_includedir}/firefox-%{version}
 %{ffdir}/xpcshell
 %{ffdir}/xpicleanup
 %{ffdir}/xpidl



From fedora-cvs-commits at redhat.com  Tue Jul 25 17:26:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 13:26:49 -0400
Subject: rpms/pyparted/devel .cvsignore, 1.8, 1.9 pyparted.spec, 1.22,
	1.23 sources, 1.11, 1.12
Message-ID: <200607251726.k6PHQnPt026713@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26664

Modified Files:
	.cvsignore pyparted.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 May 2006 14:37:53 -0000	1.8
+++ .cvsignore	25 Jul 2006 17:26:46 -0000	1.9
@@ -1,3 +1 @@
-pyparted-1.6.10.tar.gz
-pyparted-1.7.0.tar.gz
-pyparted-1.7.1.tar.gz
+pyparted-1.7.2.tar.gz


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pyparted.spec	12 Jul 2006 07:55:45 -0000	1.22
+++ pyparted.spec	25 Jul 2006 17:26:46 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: python module for parted
 Name: pyparted
-Version: 1.7.1
-Release: 1.1
+Version: 1.7.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -32,15 +32,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
 %dir %{_libdir}/python?.?/site-packages/
 %{_libdir}/python?.?/site-packages/*.so
 
-
 %changelog
+* Tue Jul 25 2006 David Cantrell <dcantrell at redhat.com> - 1.7.2-1
+- Add HPSERVICE, PALO, PREP, and MSFT_RESERVED to partition types list
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.7.1-1.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 May 2006 14:37:54 -0000	1.11
+++ sources	25 Jul 2006 17:26:46 -0000	1.12
@@ -1 +1 @@
-e0adfda76ed5346bf8012b62e0785e31  pyparted-1.7.1.tar.gz
+4a79032a90f8aa9bcf5b5a606f5b1f84  pyparted-1.7.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 17:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 13:29:04 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.303, 1.304 anaconda.spec, 1.428,
	1.429 sources, 1.425, 1.426
Message-ID: <200607251729.k6PHT4ek027630@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27590/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.65-1 on branch devel from anaconda-11.1.0.65-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- .cvsignore	24 Jul 2006 21:40:44 -0000	1.303
+++ .cvsignore	25 Jul 2006 17:29:01 -0000	1.304
@@ -1 +1 @@
-anaconda-11.1.0.64.tar.bz2
+anaconda-11.1.0.65.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- anaconda.spec	24 Jul 2006 21:40:44 -0000	1.428
+++ anaconda.spec	25 Jul 2006 17:29:01 -0000	1.429
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.64
+Version: 11.1.0.65
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -100,6 +100,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jul 25 2006 Paul Nasrat <pnasrat at redhat.com> - 11.1.0.65-1
+- Fix noipv6 (pjones)
+- Fix nodmraid and nompath (katzj)
+- Make kickstart inherit from used installclass (katzj)
+- Hide rhel installclass by default (katzj)
+- Remove gstreamer/gstreamer-tools whiteout (#197139, katzj)
+
 * Mon Jul 24 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.64-1
 - Fix build failure (pjones)
 - Fix error handling when adding iscsi 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- sources	24 Jul 2006 21:40:44 -0000	1.425
+++ sources	25 Jul 2006 17:29:01 -0000	1.426
@@ -1 +1 @@
-41c40c612e40102118c7be12288e90b0  anaconda-11.1.0.64.tar.bz2
+91e660f1a080b62b02e3a2f828809f93  anaconda-11.1.0.65.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:02:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:02:52 -0400
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.122,1.123
Message-ID: <200607251802.k6PI2q54027523@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27510

Modified Files:
	gnome-utils.spec 
Log Message:
obsolete baobab



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnome-utils.spec	12 Jul 2006 06:10:44 -0000	1.122
+++ gnome-utils.spec	25 Jul 2006 18:02:47 -0000	1.123
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.15.3
-Release:        1.1
+Release:        2
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -55,6 +55,9 @@
 Requires:	gucharmap
 Requires:	zenity
 
+# obsolete the standalone baobab package from Extras 
+Obsoletes: baobab
+
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 GUI applications and desktop tools to be used in conjunction with a
@@ -220,7 +223,10 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-2
+- Obsolete the baobab package from Extras (#191298)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.15.3-1.1
 - rebuild
 
 * Tue Jun 13 2006 Matthias Clasen <mclasen at redhat.com> 2.15.3-1



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:10:45 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.236,
	1.236.2.1 config-x86-generic, 1.63,
	1.63.4.1 config-x86_64-generic, 1.50, 1.50.4.1
Message-ID: <200607251810.k6PIAj88005861@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv5800/configs

Modified Files:
      Tag: private-linville-jwltest-fc6-2-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.236
retrieving revision 1.236.2.1
diff -u -r1.236 -r1.236.2.1
--- config-generic	24 Jul 2006 15:50:13 -0000	1.236
+++ config-generic	25 Jul 2006 18:10:42 -0000	1.236.2.1
@@ -1071,9 +1071,13 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_ZD1211RW_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.63.4.1
diff -u -r1.63 -r1.63.4.1
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	25 Jul 2006 18:10:42 -0000	1.63.4.1
@@ -242,6 +242,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.50.4.1
diff -u -r1.50 -r1.50.4.1
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	25 Jul 2006 18:10:42 -0000	1.50.4.1
@@ -112,6 +112,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:10:45 -0400
Subject: rpms/kernel/devel jwltest-e1000-7_1_6.patch, NONE,
	1.1.2.1 jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.6.1 kernel-2.6.spec, 1.2450, 1.2450.2.1
Message-ID: <200607251810.k6PIAjNZ005850@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5800

Modified Files:
      Tag: private-linville-jwltest-fc6-2-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-2-branch
	jwltest-e1000-7_1_6.patch jwltest-ipw3945-1_0_5.patch 
Log Message:


jwltest-e1000-7_1_6.patch:
 e1000.h         |   28 -
 e1000_ethtool.c |   41 +
 e1000_hw.c      | 1377 +++++++++++++++++++++++++-------------------------------
 e1000_hw.h      |   83 ++-
 e1000_main.c    |  342 ++++++-------
 e1000_osdep.h   |    4 
 e1000_param.c   |   94 ++-
 7 files changed, 923 insertions(+), 1046 deletions(-)

--- NEW FILE jwltest-e1000-7_1_6.patch ---
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c	2006-07-25 13:52:41.000000000 -0400
@@ -342,9 +342,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		tx_ring->count = TxDescriptors[bd];
-		e1000_validate_option(&tx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+			tx_ring->count = TxDescriptors[bd];
+			e1000_validate_option(&tx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(tx_ring->count,
+						REQ_TX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -363,9 +364,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		rx_ring->count = RxDescriptors[bd];
-		e1000_validate_option(&rx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+			rx_ring->count = RxDescriptors[bd];
+			e1000_validate_option(&rx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(rx_ring->count,
+						REQ_RX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -377,9 +379,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		int rx_csum = XsumRX[bd];
-		e1000_validate_option(&rx_csum, &opt, adapter);
-		adapter->rx_csum = rx_csum;
+			int rx_csum = XsumRX[bd];
+			e1000_validate_option(&rx_csum, &opt, adapter);
+			adapter->rx_csum = rx_csum;
 	}
 	{ /* Flow Control */
 
@@ -399,9 +401,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		int fc = FlowControl[bd];
-		e1000_validate_option(&fc, &opt, adapter);
-		adapter->hw.fc = adapter->hw.original_fc = fc;
+			int fc = FlowControl[bd];
+			e1000_validate_option(&fc, &opt, adapter);
+			adapter->hw.fc = adapter->hw.original_fc = fc;
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -413,8 +415,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		adapter->tx_int_delay = TxIntDelay[bd];
-		e1000_validate_option(&adapter->tx_int_delay, &opt, adapter);
+			adapter->tx_int_delay = TxIntDelay[bd];
+			e1000_validate_option(&adapter->tx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -426,9 +429,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -440,8 +443,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		adapter->rx_int_delay = RxIntDelay[bd];
-		e1000_validate_option(&adapter->rx_int_delay, &opt, adapter);
+			adapter->rx_int_delay = RxIntDelay[bd];
+			e1000_validate_option(&adapter->rx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -453,9 +457,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -467,19 +471,21 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		adapter->itr = InterruptThrottleRate[bd];
-		switch (adapter->itr) {
-		case 0:
-			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);
-			break;
-		case 1:
-			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-				opt.name);
-			break;
-		default:
-			e1000_validate_option(&adapter->itr, &opt, adapter);
-			break;
-		}
+			adapter->itr = InterruptThrottleRate[bd];
+			switch (adapter->itr) {
+			case 0:
+				DPRINTK(PROBE, INFO, "%s turned off\n",
+					opt.name);
+				break;
+			case 1:
+				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
+					opt.name);
+				break;
+			default:
+				e1000_validate_option(&adapter->itr, &opt,
+					adapter);
+				break;
+			}
 	}
 	{ /* Smart Power Down */
 		struct e1000_option opt = {
@@ -489,9 +495,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_DISABLED
 		};
 
-		int spd = SmartPowerDownEnable[bd];
-		e1000_validate_option(&spd, &opt, adapter);
-		adapter->smart_power_down = spd;
+			int spd = SmartPowerDownEnable[bd];
+			e1000_validate_option(&spd, &opt, adapter);
+			adapter->smart_power_down = spd;
 	}
 	{ /* Kumeran Lock Loss Workaround */
 		struct e1000_option opt = {
@@ -577,8 +583,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = speed_list }}
 		};
 
-		speed = Speed[bd];
-		e1000_validate_option(&speed, &opt, adapter);
+			speed = Speed[bd];
+			e1000_validate_option(&speed, &opt, adapter);
 	}
 	{ /* Duplex */
 		struct e1000_opt_list dplx_list[] = {{           0, "" },
@@ -600,8 +606,8 @@ e1000_check_copper_options(struct e1000_
 			        "Speed/Duplex/AutoNeg parameter ignored.\n");
 			return;
 		}
-		dplx = Duplex[bd];
-		e1000_validate_option(&dplx, &opt, adapter);
+			dplx = Duplex[bd];
+			e1000_validate_option(&dplx, &opt, adapter);
 	}
 
 	if (AutoNeg[bd] != OPTION_UNSET && (speed != 0 || dplx != 0)) {
@@ -653,8 +659,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = an_list }}
 		};
 
-		an = AutoNeg[bd];
-		e1000_validate_option(&an, &opt, adapter);
+			an = AutoNeg[bd];
+			e1000_validate_option(&an, &opt, adapter);
 		adapter->hw.autoneg_advertised = an;
 	}
 
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h	2006-07-25 13:28:17.000000000 -0400
@@ -306,6 +306,7 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
+int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -313,8 +314,10 @@ void e1000_set_media_type(struct e1000_h
 int32_t e1000_setup_link(struct e1000_hw *hw);
[...5055 lines suppressed...]
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-
-	if (pci_enable_device(pdev)) {
-		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
-		return PCI_ERS_RESULT_DISCONNECT;
-	}
-	pci_set_master(pdev);
-
-	pci_enable_wake(pdev, 3, 0);
-	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
-
-	/* Perform card reset only on one instance of the card */
-	if (PCI_FUNC (pdev->devfn) != 0)
-		return PCI_ERS_RESULT_RECOVERED;
-
-	e1000_reset(adapter);
-	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
-
-	return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-	uint32_t manc, swsm;
-
-	if (netif_running(netdev)) {
-		if (e1000_up(adapter)) {
-			printk("e1000: can't bring device back up after reset\n");
-			return;
-		}
-	}
-
-	netif_device_attach(netdev);
-
-	if (adapter->hw.mac_type >= e1000_82540 &&
-	    adapter->hw.media_type == e1000_media_type_copper) {
-		manc = E1000_READ_REG(&adapter->hw, MANC);
-		manc &= ~(E1000_MANC_ARP_EN);
-		E1000_WRITE_REG(&adapter->hw, MANC, manc);
-	}
-
-	switch (adapter->hw.mac_type) {
-	case e1000_82573:
-		swsm = E1000_READ_REG(&adapter->hw, SWSM);
-		E1000_WRITE_REG(&adapter->hw, SWSM,
-				swsm | E1000_SWSM_DRV_LOAD);
-		break;
-	default:
-		break;
-	}
-
-	if (netif_running(netdev))
-		mod_timer(&adapter->watchdog_timer, jiffies);
-}
-
 /* e1000_main.c */
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c	2006-07-25 13:28:17.000000000 -0400
@@ -33,6 +33,21 @@
 
 #include <asm/uaccess.h>
 
+extern char e1000_driver_name[];
+extern char e1000_driver_version[];
+
+extern int e1000_up(struct e1000_adapter *adapter);
+extern void e1000_down(struct e1000_adapter *adapter);
+extern void e1000_reinit_locked(struct e1000_adapter *adapter);
+extern void e1000_reset(struct e1000_adapter *adapter);
+extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_update_stats(struct e1000_adapter *adapter);
+
+
 struct e1000_stats {
 	char stat_string[ETH_GSTRING_LEN];
 	int sizeof_stat;
@@ -415,12 +430,12 @@ e1000_get_regs(struct net_device *netdev
 		regs_buff[23] = regs_buff[18]; /* mdix mode */
 		e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
 	} else {
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
 		regs_buff[13] = (uint32_t)phy_data; /* cable length */
 		regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 		regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
 		regs_buff[18] = regs_buff[13]; /* cable polarity */
 		regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
@@ -629,7 +644,7 @@ e1000_set_ringparam(struct net_device *n
 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
-	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+	if (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
 		msleep(1);
 
 	if (netif_running(adapter->netdev))
@@ -696,7 +711,6 @@ e1000_set_ringparam(struct net_device *n
 	}
 
 	clear_bit(__E1000_RESETTING, &adapter->flags);
-
 	return 0;
 err_setup_tx:
 	e1000_free_all_rx_resources(adapter);
@@ -751,7 +765,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* The status register is Read Only, so a write should fail.
 	 * Some bits that get toggled are ignored.
 	 */
-        switch (adapter->hw.mac_type) {
+	switch (adapter->hw.mac_type) {
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
@@ -882,10 +896,10 @@ e1000_intr_test(struct e1000_adapter *ad
 	*data = 0;
 
 	/* Hook up test interrupt handler just for this test */
-	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
-			 netdev->name, netdev)) {
- 		shared_int = FALSE;
- 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
+	                 netdev))
+		shared_int = FALSE;
+	else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
 			      netdev->name, netdev)){
 		*data = 1;
 		return -1;
@@ -1208,7 +1222,7 @@ e1000_nonintegrated_phy_loopback(struct 
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8100);
 
 	/* Wait for reset to complete. */
-	udelay(500);
+	usec_delay(500);
 
 	/* Have to setup TX_CLK and TX_CRS after software reset */
 	e1000_phy_reset_clk_and_crs(adapter);
@@ -1306,7 +1320,7 @@ e1000_integrated_phy_loopback(struct e10
 	if (adapter->hw.phy_type == e1000_phy_m88)
 		e1000_phy_disable_receiver(adapter);
 
-	udelay(500);
+	usec_delay(500);
 
 	return 0;
 }
@@ -1705,6 +1719,7 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
+
 		wol->wolopts = 0;
 
 do_defaults:
@@ -1908,7 +1923,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,
@@ -1922,7 +1937,7 @@ 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,
+	.get_perm_addr  		= ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)

jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16651 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20702 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- linux-2.6.17.noarch/Documentation/networking/README.ipw3945.orig	2006-06-26 12:09:00.000000000 -0400
+++ linux-2.6.17.noarch/Documentation/networking/README.ipw3945	2006-06-26 12:09:05.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20347 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2450
retrieving revision 1.2450.2.1
diff -u -r1.2450 -r1.2450.2.1
--- kernel-2.6.spec	25 Jul 2006 16:03:52 -0000	1.2450
+++ kernel-2.6.spec	25 Jul 2006 18:10:41 -0000	1.2450.2.1
@@ -367,6 +367,8 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
+Patch1300: jwltest-ipw3945-1_0_5.patch
+Patch1301: jwltest-e1000-7_1_6.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -890,6 +892,10 @@
 %patch1203 -p1
 
 # NIC driver fixes.
+# ipw3945 1.0.5
+%patch1300 -p1
+# e1000 7.1.6
+%patch1301 -p1
 
 # Filesystem patches.
 # Squashfs



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:18:52 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.82,1.83
Message-ID: <200607251818.k6PIIqBl023774@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23703

Modified Files:
	gnome-games.spec 
Log Message:
require librsvg2



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-games.spec	12 Jul 2006 19:53:19 -0000	1.82
+++ gnome-games.spec	25 Jul 2006 18:18:50 -0000	1.83
@@ -14,7 +14,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.15.4
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -29,6 +29,8 @@
 Requires(post): GConf2
 Requires(postun): scrollkeeper >= 0.1.4
 
+Requires: librsvg2
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -247,6 +249,9 @@
 
 
 %changelog
+* Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-2
+- Require librsvg2 (#191576)
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-1
 - Update to 2.15.4
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:24:30 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.36,
	1.37 selinux-policy.spec, 1.233, 1.234
Message-ID: <200607251824.k6PIOUIe025982@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25933

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Tue Jul 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
- Allow pidof from initrc to ptrace higher level domains


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 84 files changed, 828 insertions(+), 230 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policy-20060608.patch	24 Jul 2006 16:23:16 -0000	1.36
+++ policy-20060608.patch	25 Jul 2006 18:24:28 -0000	1.37
@@ -173,6 +173,20 @@
  ## Allow regular users direct mouse access 
  ## </p>
  ## </desc>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.3.3/policy/mcs
+--- nsaserefpolicy/policy/mcs	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/mcs	2006-07-25 11:04:06.000000000 -0400
+@@ -159,8 +159,9 @@
+ mlsconstrain process { transition dyntransition }
+ 	(( h1 dom h2 ) or ( t1 == mcssetcats ));
+ 
++# initrc_t needs to do a pidof which requires ptrace so set to mlsfileread
+ mlsconstrain process { ptrace }
+-	( h1 dom h2 );
++	(( h1 dom h2) or ( t1 == mlsfileread ));
+ 
+ mlsconstrain process { sigkill sigstop }
+ 	(( h1 dom h2 ) or ( t1 == mcskillall ));
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-17 11:43:02.000000000 -0400
@@ -713,7 +727,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-25 14:23:55.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -722,6 +736,14 @@
  
  allow cyrus_t cyrus_tmp_t:dir create_dir_perms;
  allow cyrus_t cyrus_tmp_t:file create_file_perms;
+@@ -137,3 +138,7 @@
+ optional_policy(`
+ 	udev_read_db(cyrus_t)
+ ')
++
++optional_policy(`
++	ldap__stream_connect(cyrus_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/dovecot.fc	2006-07-17 11:43:02.000000000 -0400
@@ -851,6 +873,34 @@
  /var/run/slapd\.args	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
  /var/run/slapd\.pid	--	gen_context(system_u:object_r:slapd_var_run_t,s0)
 +/var/run/ldapi		-s	gen_context(system_u:object_r:slapd_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.if serefpolicy-2.3.3/policy/modules/services/ldap.if
+--- nsaserefpolicy/policy/modules/services/ldap.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ldap.if	2006-07-25 14:23:31.000000000 -0400
+@@ -57,3 +57,24 @@
+ 	allow slapd_t $1:tcp_socket { acceptfrom recvfrom };
+ 	kernel_tcp_recvfrom($1)
+ ')
++
++
++########################################
++## <summary>
++##	Connect to slapd over an unix stream socket.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`ldap_stream_connect',`
++	gen_require(`
++		type slapd_t, slapd_var_run_t;
++	')
++
++	files_search_pids($1)
++	allow $1 slapd_var_run_t:sock_file write;
++	allow $1 slapd_t:unix_stream_socket connectto;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.3.3/policy/modules/services/ldap.te
 --- nsaserefpolicy/policy/modules/services/ldap.te	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/ldap.te	2006-07-24 12:21:35.000000000 -0400
@@ -999,6 +1049,18 @@
 +	can_exec($1,nscd_exec_t)
 +')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.3.3/policy/modules/services/ntp.te
+--- nsaserefpolicy/policy/modules/services/ntp.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/ntp.te	2006-07-24 14:57:00.000000000 -0400
+@@ -32,7 +32,7 @@
+ 
+ # sys_resource and setrlimit is for locking memory
+ # ntpdate wants sys_nice
+-allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock sys_chroot sys_nice sys_resource };
++allow ntpd_t self:capability { chown dac_override kill setgid setuid sys_time ipc_lock net_bind_service sys_chroot sys_nice sys_resource };
+ dontaudit ntpd_t self:capability { net_admin sys_tty_config fsetid sys_nice };
+ allow ntpd_t self:process { signal_perms setcap setsched setrlimit };
+ allow ntpd_t self:fifo_file { read write getattr };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.3.3/policy/modules/services/openvpn.te
 --- nsaserefpolicy/policy/modules/services/openvpn.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/openvpn.te	2006-07-17 15:55:47.000000000 -0400
@@ -1321,7 +1383,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-22 14:32:53.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-25 09:09:41.000000000 -0400
 @@ -0,0 +1,135 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1380,6 +1442,7 @@
 +allow setroubleshootd_t setroubleshoot_var_lib_t:dir { rw_dir_perms setattr };
 +files_var_lib_filetrans(setroubleshootd_t,setroubleshoot_var_lib_t,{ file dir })
 +
++allow setroubleshootd_t self:capability { dac_override sys_tty_config };
 +allow setroubleshootd_t self:tcp_socket create_stream_socket_perms;
 +
 +corenet_tcp_bind_generic_node(setroubleshootd_t)
@@ -1417,8 +1480,7 @@
 +
 +miscfiles_read_localization(setroubleshoot_t)
 +
-+allow setroubleshootd_t self:capability { dac_override sys_tty_config };
-+
++allow setroubleshoot_t self:capability dac_override;
 +allow setroubleshoot_t self:process { signal getattr };
 +allow setroubleshoot_t self:fifo_file { read write };
 +allow setroubleshoot_t self:unix_stream_socket create_stream_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- selinux-policy.spec	24 Jul 2006 16:23:16 -0000	1.233
+++ selinux-policy.spec	25 Jul 2006 18:24:28 -0000	1.234
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 10
+Release: 11
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -341,6 +341,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
+- Allow pidof from initrc to ptrace higher level domains
+
 * Mon Jul 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-10
 - Add policy for /var/run/ldapi
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:27:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:27:26 -0400
Subject: rpms/gcc/devel gcc41-java-backport-class-loader.patch, NONE,
	1.1 gcc41.spec, 1.87, 1.88
Message-ID: <200607251827.k6PIRQBa027154@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26854

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-java-backport-class-loader.patch 
Log Message:
* Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
- Backport fix by Andrew Haley for build problems related with the
bootstrap ClassLoader.


gcc41-java-backport-class-loader.patch:
 natSharedLibLoader.cc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-java-backport-class-loader.patch ---
From: Andrew Haley <aph at redhat.com>

I found a libjava bug that may be causing these build failures.  Here
is the patch; please apply it and rebuild.

2006-07-25  Andrew Haley  <aph at redhat.com>

	* gnu/gcj/runtime/natSharedLibLoader.cc (init): Don't set
	curLoader to VMClassLoader::bootLoader.

--- libjava/gnu/gcj/runtime/natSharedLibLoader.cc~	2006-07-25 16:47:05.000000000 +0100
+++ libjava/gnu/gcj/runtime/natSharedLibLoader.cc	2006-07-25 18:11:25.000000000 +0100
@@ -20,6 +20,8 @@
 #include <java/lang/UnsupportedOperationException.h>
 #include <java/lang/UnknownError.h>
 
+#include <java/lang/VMClassLoader.h>
+
 // If we're using the Boehm GC, then we need this include to override dlopen.
 #ifdef HAVE_BOEHM_GC
 // Set GC_DEBUG before including gc.h!
@@ -87,7 +89,8 @@
     flags = RTLD_GLOBAL | RTLD_LAZY;
   JvSynchronize dummy1(&java::lang::Class::class$);
   SharedLibDummy dummy2;
-  curLoader = loader;
+  curLoader = ((void*)loader == java::lang::VMClassLoader::bootLoader
+	       ? NULL : loader);
   curHelper = this;
   _Jv_RegisterClassHook = _Jv_sharedlib_register_hook;
   _Jv_RegisterCoreHook = core_hook;


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gcc41.spec	24 Jul 2006 20:04:26 -0000	1.87
+++ gcc41.spec	25 Jul 2006 18:27:23 -0000	1.88
@@ -1,6 +1,6 @@
 %define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 12
+%define gcc_release 13
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -140,6 +140,7 @@
 Patch32: gcc41-java-libdotdotlib.patch
 Patch33: gcc41-java-plugins.patch
 Patch34: gcc41-java-backport-gcjplugin.patch
+Patch35: gcc41-java-backport-class-loader.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -456,6 +457,7 @@
 %patch32 -p0 -b .java-libdotdotlib~
 %patch33 -p0 -b .java-plugins~
 %patch34 -p0 -b .java-gcjplugin~
+%patch35 -p0 -b .java-class-loader~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1518,8 +1520,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
+- Backport fix by Andrew Haley for build problems related with the
+bootstrap ClassLoader.
+
 * Mon Jul 24 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-12
-- Backport fix for NullPointerException in GCJ web plugin.
+- Backport fix by Mark Wielaard for NullPointerException in GCJ web plugin.
 
 * Fri Jul 21 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-11
 - update from gcc-4_1-branch (-r115565:115644)



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:28:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:28:41 -0400
Subject: rpms/mesa/devel mesa.spec,1.74,1.75 redhat-mesa-target,1.1,1.2
Message-ID: <200607251828.k6PISfTH027692@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27667

Modified Files:
	mesa.spec redhat-mesa-target 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-17.fc6
- mesa-6.5-fix-linux-indirect-build.patch: Added.
- mesa-6.5-fix-glxinfo-link.patch: Added.
- Build libOSMesa never instead of inconsistently; to be fixed later.
- Updates to redhat-mesa-target:
  - Always select linux-indirect when not building for DRI
  - Enable DRI to be built on PPC64 (still disabled in the spec file though)
  - MIT licence boilerplate



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mesa.spec	25 Jul 2006 16:03:10 -0000	1.74
+++ mesa.spec	25 Jul 2006 18:28:38 -0000	1.75
@@ -39,10 +39,14 @@
 # seems next to impossible using the totally broken Mesa buildsystem to build
 # both DRI drivers and OSMesa in a single build.  If someone feels like fixing
 # all this to build on all 7 architectures, be my guest.
+#
+# DOUBLE FIXME: OSMesa is only ever built when trying to build the 'linux'
+# target, but we now only build linux-indirect.  We need a separate build pass
+# now on _all_ architectures.
 %if %{with_dri}
 %define with_OSMesa	0
 %else
-%define with_OSMesa	1
+%define with_OSMesa	0
 %endif
 
 # NOTE: This option enables motif support in libGLw for bug #175251
@@ -53,7 +57,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,6 +79,8 @@
 Patch2: mesa-6.5-fix-opt-flags-bug197640.patch
 Patch3: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
+Patch5: mesa-6.5-fix-linux-indirect-build.patch
+Patch6: mesa-6.5-fix-glxinfo-link.patch
 
 Patch10: mesa-6.3.2-fix-installmesa.patch
 Patch11: mesa-6.4-multilib-fix.patch
@@ -306,12 +312,12 @@
 %patch0 -p0 -b .build-config
 %patch1 -p0 -b .glx-use-tls
 %patch2 -p1 -b .fix-opt-flags-bug197640
-
 %if %{with_motif}
 %patch3 -p0 -b .libGLw-enable-motif-support
 %endif
-
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
+%patch5 -p1 -b .linux-indirect
+%patch6 -p1 -b .glxinfo
 
 %patch10 -p0 -b .fix-installmesa
 %patch11 -p0 -b .multilib-fix
@@ -407,14 +413,7 @@
 %files libGL
 %defattr(-,root,root,-)
 %{_libdir}/libGL.so.1
-
-# NOTE: The software libGL is OpenGL 1.5, however the DRI enabled libGL is
-# only OpenGL 1.2
-%if %{with_dri}
 %{_libdir}/libGL.so.1.2
-%else
-%{_libdir}/libGL.so.1.5.*
-%endif
 
 %if %{with_dri}
 # DRI modules
@@ -476,7 +475,7 @@
 %{_includedir}/GL/xmesa_x.h
 %{_includedir}/GL/xmesa_xf86.h
 %{_libdir}/libGL.so
-%if ! %{with_dri}
+%if %{with_OSMesa}
 %{_libdir}/libOSMesa.so
 %endif
 
@@ -513,6 +512,15 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-17.fc6
+- mesa-6.5-fix-linux-indirect-build.patch: Added.
+- mesa-6.5-fix-glxinfo-link.patch: Added.
+- Build libOSMesa never instead of inconsistently; to be fixed later.
+- Updates to redhat-mesa-target:
+  - Always select linux-indirect when not building for DRI
+  - Enable DRI to be built on PPC64 (still disabled in the spec file though)
+  - MIT licence boilerplate
+
 * Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 6.5-16.fc6
 - Remove glut-devel dependency, as nothing actually uses it that we ship.
 - Added mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch to prevent libglut


Index: redhat-mesa-target
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-target,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-mesa-target	12 Sep 2005 18:32:57 -0000	1.1
+++ redhat-mesa-target	25 Jul 2006 18:28:38 -0000	1.2
@@ -4,78 +4,56 @@
 # Author: Mike A. Harris <mharris at redhat.com>
 #
 # License: MIT/X11
-# <FIXME: Insert legal terms here>
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS 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.
 
 WITH_DRI=$1
 ARCH=$2
 
-case $ARCH in
-    i386|i486|i586|i686|athlon)
-        if [ $WITH_DRI -eq 1 ] ; then
-            MESATARGET=linux-dri-x86
-        else
-            MESATARGET=linux-x86
-        fi
-        ;;
+if [ $WITH_DRI -eq 0 ] ; then
+    MESATARGET=linux-indirect
+else
+    case $ARCH in
+	i386|i486|i586|i686|athlon)
+	    MESATARGET=linux-dri-x86
+	    ;;
 
-    x86_64)
-        if [ $WITH_DRI -eq 1 ] ; then
+	x86_64)
             MESATARGET=linux-dri-x86-64
-        else
-            MESATARGET=linux-x86-64
-        fi
-        ;;
+	    ;;
 
-    ppc)
-        if [ $WITH_DRI -eq 1 ] ; then
+        ppc)
             MESATARGET=linux-dri-ppc
-        else
-            MESATARGET=linux-ppc
-        fi
-        ;;
+            ;;
 
-    ia64)
-        if [ $WITH_DRI -eq 1 ] ; then
+	ia64|alpha|sparc|sparc64|ppc64)
             MESATARGET=linux-dri
-        else
-            MESATARGET=linux
-        fi
-        ;;
+            ;;
 
-    alpha)
-        if [ $WITH_DRI -eq 1 ] ; then
-            MESATARGET=linux-dri
-        else
-            MESATARGET=linux-alpha
-        fi
-        ;;
-
-    sparc)
-        if [ $WITH_DRI -eq 1 ] ; then
-            MESATARGET=linux-dri
-        else
-            MESATARGET=linux-sparc
-        fi
-        ;;
-
-    sparc64)
-        if [ $WITH_DRI -eq 1 ] ; then
-            MESATARGET=linux-dri
-        else
-            MESATARGET=linux-ultrasparc
-        fi
-        ;;
-
-    *)
-        if [ $WITH_DRI -eq 1 ] ; then
+        *)
             MESATARGET=invalid
             echo "Error: WITH_DRI enabled on arch with no DRI target"
             exit 1
-        else
-            MESATARGET=linux
-        fi
-        ;;
-esac
+      	    ;;
+    esac
+fi
+
 # Display target name on stdout.
 echo $MESATARGET
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:30:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:30:42 -0400
Subject: rpms/mesa/devel mesa-6.5-fix-linux-indirect-build.patch,NONE,1.1
Message-ID: <200607251830.k6PIUgC9028312@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28271

Added Files:
	mesa-6.5-fix-linux-indirect-build.patch 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-17.fc6
- mesa-6.5-fix-linux-indirect-build.patch: Added.
- mesa-6.5-fix-glxinfo-link.patch: Added.
- Build libOSMesa never instead of inconsistently; to be fixed later.
- Updates to redhat-mesa-target:
  - Always select linux-indirect when not building for DRI
  - Enable DRI to be built on PPC64 (still disabled in the spec file though)
  - MIT licence boilerplate


mesa-6.5-fix-linux-indirect-build.patch:
 configs/linux-dri     |    1 +
 src/glx/x11/Makefile  |    2 +-
 src/glx/x11/XF86dri.c |    4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE mesa-6.5-fix-linux-indirect-build.patch ---
--- Mesa-6.5/configs/linux-dri.jx	2006-07-24 18:26:19.000000000 -0400
+++ Mesa-6.5/configs/linux-dri	2006-07-25 11:09:02.000000000 -0400
@@ -37,6 +37,7 @@
 # Library/program dependencies
 EXTRA_LIB_PATH =
 
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
 		-lselinux
--- Mesa-6.5/src/glx/x11/XF86dri.c.jx	2005-12-03 16:45:23.000000000 -0500
+++ Mesa-6.5/src/glx/x11/XF86dri.c	2006-07-25 11:07:40.000000000 -0400
@@ -37,6 +37,8 @@
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
+#ifdef GLX_DIRECT_RENDERING
+
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
@@ -617,3 +619,5 @@
     (void) drawable;
     return True;
 }
+
+#endif /* GLX_DIRECT_RENDERING */
--- Mesa-6.5/src/glx/x11/Makefile.jx	2006-07-24 18:26:19.000000000 -0400
+++ Mesa-6.5/src/glx/x11/Makefile	2006-07-25 11:08:59.000000000 -0400
@@ -47,7 +47,7 @@
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/glapi \
 	-I$(TOP)/src/mesa/drivers/dri/common \
-        `pkg-config --cflags libdrm` \
+	$(LIBDRM_CFLAGS) \
 	$(X11_INCLUDES)
 
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:30:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:30:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.793,
	1.794 openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch, 1.1, NONE
Message-ID: <200607251830.k6PIUrYJ028345@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28299

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch 
Log Message:
clearly that wasn't the fix then


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- openoffice.org.spec	25 Jul 2006 16:20:56 -0000	1.793
+++ openoffice.org.spec	25 Jul 2006 18:30:47 -0000	1.794
@@ -122,8 +122,7 @@
 Patch56: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-Patch59: openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
-Patch60: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch59: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -873,8 +872,7 @@
 %patch56 -p1 -b .ooo67740.xmlhelp.doublefree.patch
 %patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
 %patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
-%patch59 -p1 -b .ooo65081.sw.layoutsmenu.patch
-%patch60 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch59 -p1 -b .rh200118.filter.xalanbroken.patch
 
 tar xzf %{SOURCE1}
 
@@ -3361,7 +3359,6 @@
 - rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-- rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch
 - drop openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
 - drop openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj


--- openoffice.org-2.0.3.ooo65081.sw.layoutsmenu.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:34:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:34:38 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch,1.37,1.38
Message-ID: <200607251834.k6PIYcVE028803@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28760

Modified Files:
	policy-20060608.patch 
Log Message:
* Tue Jul 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
- Allow pidof from initrc to ptrace higher level domains


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    4 
 modules/admin/consoletype.te       |    7 +
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    2 
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   23 +++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 85 files changed, 829 insertions(+), 230 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- policy-20060608.patch	25 Jul 2006 18:24:28 -0000	1.37
+++ policy-20060608.patch	25 Jul 2006 18:34:36 -0000	1.38
@@ -1022,6 +1022,17 @@
  	allow mailman_cgi_t mailman_archive_t:dir create_dir_perms;
  	allow mailman_cgi_t mailman_archive_t:lnk_file create_lnk_perms;
  	allow mailman_cgi_t mailman_archive_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.3.3/policy/modules/services/nis.te
+--- nsaserefpolicy/policy/modules/services/nis.te	2006-07-14 17:04:40.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/nis.te	2006-07-25 14:33:15.000000000 -0400
+@@ -86,6 +86,7 @@
+ corenet_tcp_bind_reserved_port(ypbind_t)
+ corenet_udp_bind_reserved_port(ypbind_t)
+ corenet_tcp_bind_all_rpc_ports(ypbind_t)
++corenet_udp_bind_all_rpc_ports(ypbind_t)
+ corenet_tcp_connect_all_ports(ypbind_t)
+ corenet_dontaudit_tcp_bind_all_reserved_ports(ypbind_t)
+ corenet_dontaudit_udp_bind_all_reserved_ports(ypbind_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.3.3/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/nscd.if	2006-07-17 11:43:02.000000000 -0400



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:35:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:35:11 -0400
Subject: rpms/mesa/devel mesa-6.5-fix-glxinfo-link.patch,NONE,1.1
Message-ID: <200607251835.k6PIZBZW029070@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29037

Added Files:
	mesa-6.5-fix-glxinfo-link.patch 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-17.fc6
- mesa-6.5-fix-linux-indirect-build.patch: Added.
- mesa-6.5-fix-glxinfo-link.patch: Added.
- Build libOSMesa never instead of inconsistently; to be fixed later.
- Updates to redhat-mesa-target:
  - Always select linux-indirect when not building for DRI
  - Enable DRI to be built on PPC64 (still disabled in the spec file though)
  - MIT licence boilerplate


mesa-6.5-fix-glxinfo-link.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mesa-6.5-fix-glxinfo-link.patch ---
--- Mesa-6.5/progs/xdemos/Makefile.glxinfo	2006-07-25 13:51:53.000000000 -0400
+++ Mesa-6.5/progs/xdemos/Makefile	2006-07-25 14:07:55.000000000 -0400
@@ -54,7 +54,7 @@
 	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
 
 glxinfo:
-	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -lGL -lGLU -o $@
+	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -L$(TOP)/lib -lGL -lGLU -o $@
 
 pbinfo: pbinfo.o pbutil.o
 	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:40:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:40:53 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.120, 1.121 kudzu.spec, 1.137,
	1.138 sources, 1.134, 1.135
Message-ID: <200607251840.k6PIerEv030844@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30740

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- .cvsignore	24 Jul 2006 17:48:37 -0000	1.120
+++ .cvsignore	25 Jul 2006 18:40:50 -0000	1.121
@@ -1 +1 @@
-kudzu-1.2.39.tar.gz
+kudzu-1.2.40.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kudzu.spec	24 Jul 2006 17:48:37 -0000	1.137
+++ kudzu.spec	25 Jul 2006 18:40:50 -0000	1.138
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.39
+Version: 1.2.40
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Jul 25 2006 Bill Nottingham <notting at redhat.com> - 1.2.40-1
+- ignore comments in videoaliases (<clumens at redhat.com>)
+- grab mac address for ibmveth devices (#195934, in theory)
+
 * Mon Jul 24 2006 Jeremy Katz <katzj at redhat.com> - 1.2.39-1
 - fix probing of xenblk as a module
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	24 Jul 2006 17:48:37 -0000	1.134
+++ sources	25 Jul 2006 18:40:50 -0000	1.135
@@ -1 +1 @@
-5388ecf30f147ad5a0547b456e84a660  kudzu-1.2.39.tar.gz
+184875af472e6f7125de5ceec162803e  kudzu-1.2.40.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:44:18 -0400
Subject: rpms/xorg-x11-drv-nv/FC-5 nv.xinf, 1.5, 1.6 xorg-x11-drv-nv.spec,
	1.14, 1.15
Message-ID: <200607251844.k6PIiIwY032202@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-nv/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32176

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc5
- Strip comments from nv.xinf, kudzu is too lame to parse them.



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/nv.xinf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nv.xinf	24 Jul 2006 18:02:15 -0000	1.5
+++ nv.xinf	25 Jul 2006 18:44:16 -0000	1.6
@@ -1,272 +1,247 @@
-# Secret decoder ring:
-# nv3-6:    Riva and TNT
-# nv10:	    GeForce, GeForce 2, GeForce 4MX
-# nv20:	    GeForce 3Ti and 4Ti
-# nv30:	    GeForce FX
-# nv40:	    GeForce 6
-# g70:	    GeForce 7
-#
-# GL suffix tends to mean Quadro workstation card
-# M suffix tends to mean laptop/mobility chip
-#
-# Entries without a chip series number should get fixed.
-
-# Diamond (Misbadged Viper series, I guess)
-# This is wildly inaccurate, the driver won't recognize these, but I assume
-# they were added for a reason so bring on the bug reports.
-alias pcivideo:v00001092d00000550sv*sd*bc*sc*i* nv # Viper V550
-alias pcivideo:v00001092d00001092sv*sd*bc*sc*i* nv # Viper V330
-
-# nVidia
-alias pcivideo:v000010DEd00000020sv*sd*bc*sc*i* nv # nv4
-alias pcivideo:v000010DEd00000028sv*sd*bc*sc*i* nv # nv5
-alias pcivideo:v000010DEd00000029sv*sd*bc*sc*i* nv # nv5
-alias pcivideo:v000010DEd0000002Asv*sd*bc*sc*i* nv # nv5
-alias pcivideo:v000010DEd0000002Bsv*sd*bc*sc*i* nv # nv5
-alias pcivideo:v000010DEd0000002Csv*sd*bc*sc*i* nv # nv6
-alias pcivideo:v000010DEd0000002Dsv*sd*bc*sc*i* nv # nv5m64
-alias pcivideo:v000010DEd0000002Esv*sd*bc*sc*i* nv # nv6
-alias pcivideo:v000010DEd0000002Fsv*sd*bc*sc*i* nv # nv6
-alias pcivideo:v000010DEd00000040sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000041sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000042sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000044sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000046sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000047sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000048sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv # nv40 GL
-alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000004Esv*sd*bc*sc*i* nv # nv40 GL
-alias pcivideo:v000010DEd00000090sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000091sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000092sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000093sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000094sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000095sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000098sv*sd*bc*sc*i* nv # g70 M
-alias pcivideo:v000010DEd00000099sv*sd*bc*sc*i* nv # g70 M
-alias pcivideo:v000010DEd0000009Csv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000009Dsv*sd*bc*sc*i* nv # g70 GL
-alias pcivideo:v000010DEd0000009Esv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd000000A0sv*sd*bc*sc*i* nv # nv5
-alias pcivideo:v000010DEd000000C0sv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000C1sv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000C2sv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000C3sv*sd*bc*sc*i* nv # nv42
-alias pcivideo:v000010DEd000000C8sv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000C9sv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000CCsv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000CDsv*sd*bc*sc*i* nv # nv41
-alias pcivideo:v000010DEd000000CEsv*sd*bc*sc*i* nv # nv41 GL
-alias pcivideo:v000010DEd000000F0sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd000000F1sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd000000F2sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd000000F3sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd000000F4sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd000000F5sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd000000F6sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd000000F8sv*sd*bc*sc*i* nv # nv45 GL
-alias pcivideo:v000010DEd000000F9sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd000000FAsv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd000000FBsv*sd*bc*sc*i* nv # nv35
-alias pcivideo:v000010DEd000000FCsv*sd*bc*sc*i* nv # nv37 GL
-alias pcivideo:v000010DEd000000FDsv*sd*bc*sc*i* nv # nv37 GL
-alias pcivideo:v000010DEd000000FEsv*sd*bc*sc*i* nv # nv38 GL
-alias pcivideo:v000010DEd000000FFsv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000100sv*sd*bc*sc*i* nv # nv10
-alias pcivideo:v000010DEd00000101sv*sd*bc*sc*i* nv # nv10
-alias pcivideo:v000010DEd00000103sv*sd*bc*sc*i* nv # nv10 GL
-alias pcivideo:v000010DEd00000110sv*sd*bc*sc*i* nv # nv11
-alias pcivideo:v000010DEd00000111sv*sd*bc*sc*i* nv # nv11
-alias pcivideo:v000010DEd00000112sv*sd*bc*sc*i* nv # nv11
-alias pcivideo:v000010DEd00000113sv*sd*bc*sc*i* nv # nv11 GL
-alias pcivideo:v000010DEd00000140sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000141sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000142sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000143sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000144sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000145sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000146sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000147sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000148sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000149sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd0000014Asv*sd*bc*sc*i* nv # Quadro NVS 440
-alias pcivideo:v000010DEd0000014Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000014Csv*sd*bc*sc*i* nv # Quadro FX 550
-alias pcivideo:v000010DEd0000014Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000014Esv*sd*bc*sc*i* nv # nv43 GL
-alias pcivideo:v000010DEd0000014Fsv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000150sv*sd*bc*sc*i* nv # nv15
-alias pcivideo:v000010DEd00000151sv*sd*bc*sc*i* nv # nv15
-alias pcivideo:v000010DEd00000152sv*sd*bc*sc*i* nv # nv15
-alias pcivideo:v000010DEd00000153sv*sd*bc*sc*i* nv # nv15 GL
-alias pcivideo:v000010DEd00000160sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000161sv*sd*bc*sc*i* nv # nv44
-alias pcivideo:v000010DEd00000162sv*sd*bc*sc*i* nv # nv44
-alias pcivideo:v000010DEd00000163sv*sd*bc*sc*i* nv # nv44
-alias pcivideo:v000010DEd00000164sv*sd*bc*sc*i* nv # nv44
-alias pcivideo:v000010DEd00000165sv*sd*bc*sc*i* nv # nv44
-alias pcivideo:v000010DEd00000166sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000167sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000168sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000169sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000016Bsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000016Csv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000016Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000016Esv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000170sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000171sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000172sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000173sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000174sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000175sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000176sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000177sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000178sv*sd*bc*sc*i* nv # nv17 GL
-alias pcivideo:v000010DEd00000179sv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd0000017Asv*sd*bc*sc*i* nv # nv17 GL
-alias pcivideo:v000010DEd0000017Bsv*sd*bc*sc*i* nv # nv17 GL
-alias pcivideo:v000010DEd0000017Csv*sd*bc*sc*i* nv # nv17 GL
-alias pcivideo:v000010DEd0000017Dsv*sd*bc*sc*i* nv # nv17
-alias pcivideo:v000010DEd00000181sv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000182sv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000183sv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000184sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv # nv18 M
-alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv # nv18 M
-alias pcivideo:v000010DEd00000188sv*sd*bc*sc*i* nv # nv18 GL
-alias pcivideo:v000010DEd00000189sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000018Asv*sd*bc*sc*i* nv # nv18 GL
-alias pcivideo:v000010DEd0000018Bsv*sd*bc*sc*i* nv # nv18 GL
-alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv # nv18 GL
-alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv # nv18 M
-alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv # nv11
-alias pcivideo:v000010DEd000001D1sv*sd*bc*sc*i* nv # GeForce 7300 LE
-alias pcivideo:v000010DEd000001D6sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd000001D7sv*sd*bc*sc*i* nv # GeForce Go 7300
-alias pcivideo:v000010DEd000001D8sv*sd*bc*sc*i* nv # GeForce Go 7400
-alias pcivideo:v000010DEd000001DAsv*sd*bc*sc*i* nv # Quadro NVS 110M
-alias pcivideo:v000010DEd000001DBsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd000001DCsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd000001DEsv*sd*bc*sc*i* nv # Quadro FX 350
-alias pcivideo:v000010DEd000001DFsv*sd*bc*sc*i* nv # GeForce 7300 GS
-alias pcivideo:v000010DEd000001F0sv*sd*bc*sc*i* nv # nv18
-alias pcivideo:v000010DEd00000200sv*sd*bc*sc*i* nv # nv20
-alias pcivideo:v000010DEd00000201sv*sd*bc*sc*i* nv # nv20
-alias pcivideo:v000010DEd00000202sv*sd*bc*sc*i* nv # nv20
-alias pcivideo:v000010DEd00000203sv*sd*bc*sc*i* nv # nv20
-alias pcivideo:v000010DEd00000210sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000212sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000215sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd00000218sv*sd*bc*sc*i* nv # nv40
-alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000220sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000221sv*sd*bc*sc*i* nv # nv43
-alias pcivideo:v000010DEd00000222sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000228sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd00000240sv*sd*bc*sc*i* nv # C51
-#alias pcivideo:v000010DEd00000241sv*sd*bc*sc*i* nv # XXX pcie bridge?
-alias pcivideo:v000010DEd00000242sv*sd*bc*sc*i* nv # C51
-#alias pcivideo:v000010DEd00000244sv*sd*bc*sc*i* nv # XXX pcie bridge?
-#alias pcivideo:v000010DEd00000247sv*sd*bc*sc*i* nv # XXX pcie bridge?
-alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv # nv25
-alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv # nv25
-alias pcivideo:v000010DEd00000252sv*sd*bc*sc*i* nv # nv25
-alias pcivideo:v000010DEd00000253sv*sd*bc*sc*i* nv # nv25
-alias pcivideo:v000010DEd00000258sv*sd*bc*sc*i* nv # nv25 GL
-alias pcivideo:v000010DEd00000259sv*sd*bc*sc*i* nv # nv25 GL
-alias pcivideo:v000010DEd0000025Bsv*sd*bc*sc*i* nv # nv25 GL
-alias pcivideo:v000010DEd00000280sv*sd*bc*sc*i* nv # nv28
-alias pcivideo:v000010DEd00000281sv*sd*bc*sc*i* nv # nv28
-alias pcivideo:v000010DEd00000282sv*sd*bc*sc*i* nv # nv28
-alias pcivideo:v000010DEd00000286sv*sd*bc*sc*i* nv # nv28
-alias pcivideo:v000010DEd00000288sv*sd*bc*sc*i* nv # nv28 GL
-alias pcivideo:v000010DEd00000289sv*sd*bc*sc*i* nv # nv28 GL
-alias pcivideo:v000010DEd0000028Csv*sd*bc*sc*i* nv # nv28 GL M
-alias pcivideo:v000010DEd00000290sv*sd*bc*sc*i* nv # GeForce 7900 GTX
-alias pcivideo:v000010DEd00000291sv*sd*bc*sc*i* nv # GeForce 7900 GT
-alias pcivideo:v000010DEd00000298sv*sd*bc*sc*i* nv # GeForce Go 7900 GS
-alias pcivideo:v000010DEd00000299sv*sd*bc*sc*i* nv # GeForce Go 7900 GTX
-alias pcivideo:v000010DEd0000029Asv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd0000029Bsv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd0000029Csv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd0000029Dsv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd0000029Esv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd0000029Fsv*sd*bc*sc*i* nv # g71
-alias pcivideo:v000010DEd00000300sv*sd*bc*sc*i* nv # nv30
-alias pcivideo:v000010DEd00000301sv*sd*bc*sc*i* nv # nv30
-alias pcivideo:v000010DEd00000302sv*sd*bc*sc*i* nv # nv30
-alias pcivideo:v000010DEd00000308sv*sd*bc*sc*i* nv # nv30 GL
-alias pcivideo:v000010DEd00000309sv*sd*bc*sc*i* nv # nv30 GL
-alias pcivideo:v000010DEd00000311sv*sd*bc*sc*i* nv # nv31
-alias pcivideo:v000010DEd00000312sv*sd*bc*sc*i* nv # nv31
-alias pcivideo:v000010DEd00000313sv*sd*bc*sc*i* nv # nv31
-alias pcivideo:v000010DEd00000314sv*sd*bc*sc*i* nv # nv31
-alias pcivideo:v000010DEd00000316sv*sd*bc*sc*i* nv # nv31 M
-alias pcivideo:v000010DEd00000317sv*sd*bc*sc*i* nv # nv31 M
-alias pcivideo:v000010DEd0000031Asv*sd*bc*sc*i* nv # nv31 M
-alias pcivideo:v000010DEd0000031Bsv*sd*bc*sc*i* nv # nv31 M
-alias pcivideo:v000010DEd0000031Csv*sd*bc*sc*i* nv # nv31 GL M
-alias pcivideo:v000010DEd0000031Dsv*sd*bc*sc*i* nv # nv31 GL M
-alias pcivideo:v000010DEd0000031Esv*sd*bc*sc*i* nv # nv31 GL M
-alias pcivideo:v000010DEd0000031Fsv*sd*bc*sc*i* nv # nv31 GL M
-alias pcivideo:v000010DEd00000320sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000321sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000322sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000323sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000324sv*sd*bc*sc*i* nv # nv34 M
-alias pcivideo:v000010DEd00000325sv*sd*bc*sc*i* nv # nv34 M
-alias pcivideo:v000010DEd00000326sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000327sv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd00000328sv*sd*bc*sc*i* nv # nv34 M
-alias pcivideo:v000010DEd00000329sv*sd*bc*sc*i* nv # nv34 M
-alias pcivideo:v000010DEd0000032Asv*sd*bc*sc*i* nv # nv34 GL
-alias pcivideo:v000010DEd0000032Bsv*sd*bc*sc*i* nv # nv34 GL
-alias pcivideo:v000010DEd0000032Csv*sd*bc*sc*i* nv # nv34 GL M
-alias pcivideo:v000010DEd0000032Dsv*sd*bc*sc*i* nv # nv34
-alias pcivideo:v000010DEd0000032Fsv*sd*bc*sc*i* nv # nv4 GL
-alias pcivideo:v000010DEd00000330sv*sd*bc*sc*i* nv # nv35
-alias pcivideo:v000010DEd00000331sv*sd*bc*sc*i* nv # nv35
-alias pcivideo:v000010DEd00000332sv*sd*bc*sc*i* nv # nv35
-alias pcivideo:v000010DEd00000333sv*sd*bc*sc*i* nv # nv38
-alias pcivideo:v000010DEd00000334sv*sd*bc*sc*i* nv # nv35
-alias pcivideo:v000010DEd00000338sv*sd*bc*sc*i* nv # nv35 GL
-alias pcivideo:v000010DEd0000033Fsv*sd*bc*sc*i* nv # nv35 GL
-alias pcivideo:v000010DEd00000341sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000342sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000343sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000344sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000345sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000347sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000348sv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd00000349sv*sd*bc*sc*i* nv # nv36 M
-alias pcivideo:v000010DEd0000034Bsv*sd*bc*sc*i* nv # nv36 M
-alias pcivideo:v000010DEd0000034Csv*sd*bc*sc*i* nv # nv36
-alias pcivideo:v000010DEd0000034Esv*sd*bc*sc*i* nv # nv36 GL
-alias pcivideo:v000010DEd0000034Fsv*sd*bc*sc*i* nv # nv36 GL
-alias pcivideo:v000010DEd00000391sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000392sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000398sv*sd*bc*sc*i* nv # g70
-alias pcivideo:v000010DEd00000399sv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000039Asv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # XXX not in pci.ids
-alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv # Quadro FX 560
-alias pcivideo:v000010DEd000003D0sv*sd*bc*sc*i* nv # GF 6100 nForce 430
-alias pcivideo:v000010DEd000003D1sv*sd*bc*sc*i* nv # GF 6100 nForce 405
-alias pcivideo:v000010DEd000003D2sv*sd*bc*sc*i* nv # GF 6100 nForce 400
-
-# SGS Thompson joint venture
-# This is a bit inaccurate - the driver only knows about 12d2:0018 -
-# but I'd rather get bug reports if these cards are actually in the field.
-alias pcivideo:v000012D2d00000018sv*sd*bc*sc*i* nv # Riva 128
-alias pcivideo:v000012D2d00000019sv*sd*bc*sc*i* nv # Riva 128 ZX
-alias pcivideo:v000012D2d00000020sv*sd*bc*sc*i* nv # TNT
-alias pcivideo:v000012D2d00000028sv*sd*bc*sc*i* nv # TNT2
-alias pcivideo:v000012D2d00000029sv*sd*bc*sc*i* nv # UTNT2
-alias pcivideo:v000012D2d0000002Csv*sd*bc*sc*i* nv # VTNT2
-alias pcivideo:v000012D2d000000A0sv*sd*bc*sc*i* nv # ITNT2
+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:v000010DEd00000044sv*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 
+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: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 
+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:v000010DEd000000F0sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F1sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F2sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F3sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F4sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F5sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F6sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F8sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000F9sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FAsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FBsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FCsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FDsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FEsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000000FFsv*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:v000010DEd0000014Asv*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: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 
+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:v000010DEd00000184sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd00000185sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv 
+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 
+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 
+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: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:v000010DEd00000242sv*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:v000010DEd00000290sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd00000291sv*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:v000010DEd0000029Csv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd0000029Dsv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd0000029Esv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd0000029Fsv*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:v000010DEd00000391sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd00000392sv*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:v000010DEd0000039Csv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000003D0sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000003D1sv*sd*bc*sc*i* nv 
+alias pcivideo:v000010DEd000003D2sv*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: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/FC-5/xorg-x11-drv-nv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-nv.spec	24 Jul 2006 18:02:16 -0000	1.14
+++ xorg-x11-drv-nv.spec	25 Jul 2006 18:44:16 -0000	1.15
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.2.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 Source0:   http://www.x.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -59,6 +59,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc5
+- Strip comments from nv.xinf, kudzu is too lame to parse them.
+
 * Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.2.0-2.fc5
 - Update nv.xinf: Add about 30 new cards, disable a handful that pci.ids
   says aren't video cards, and comments galore. (#186652)



From fedora-cvs-commits at redhat.com  Tue Jul 25 18:52:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 14:52:09 -0400
Subject: rpms/jakarta-commons-validator/devel jakarta-commons-validator.spec,
	1.12, 1.13
Message-ID: <200607251852.k6PIq9o4017584@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17499

Modified Files:
	jakarta-commons-validator.spec 
Log Message:

- Added conditional native compilation.
- Converted spec file to UTF8.




Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jakarta-commons-validator.spec	22 Jul 2006 08:43:11 -0000	1.12
+++ jakarta-commons-validator.spec	25 Jul 2006 18:52:07 -0000	1.13
@@ -1,19 +1,55 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define with_tests %{?_with_tests:1}%{!?_without_tests:0}
+
 %define base_name  validator
 %define short_name commons-%{base_name}
-%define name       jakarta-%{short_name}
 %define section    free
-%define with_tests %{?_with_tests:1}%{!?_without_tests:0}
 
 Summary:        Jakarta Commons Validator
-Name:           %{name}
+Name:           jakarta-%{short_name}
 Version:        1.1.4
-Release: 	1jpp_7fc
+Release:        3jpp_1fc
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
 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)
+# Obtainable from:
+# http://svn.apache.org/repos/asf/jakarta/commons/proper/validator/tags/VALIDATOR_1_1_4/conf/
 Source2:        commons-validator-%{version}-conf.tar.gz
 Patch1:         jakarta-commons-validator-%{version}-build.patch
 URL:            http://jakarta.apache.org/commons/validator/
@@ -32,10 +68,18 @@
 Requires:       jakarta-commons-logging >= 0:1.0.2
 Requires:       oro >= 0:2.0.6
 Requires:       xml-commons-apis
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides:       %{short_name}
+Obsoletes:      %{short_name}
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 A common issue when receiving data either electronically or from user
@@ -57,11 +101,11 @@
 
 %prep
 %setup -q -n %{short_name}-%{version}
+
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 tar xzvf %{SOURCE2}
-
 cp -p %{SOURCE1} conf/share/catalog
 
 %patch1
@@ -98,10 +142,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
-
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,7 +161,19 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
-%{_bindir}/rebuild-gcj-db
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun
 # Note that we're using versioned catalog, so this is always ok.
@@ -125,16 +183,24 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
-%{_bindir}/rebuild-gcj-db
-
 # -----------------------------------------------------------------------------
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/*
 %{_datadir}/sgml/%{name}
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -143,29 +209,15 @@
 # -----------------------------------------------------------------------------
 
 %changelog
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.1.4-1jpp_7fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1.4-1jpp_6fc
-- rebuild
-
-* 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
+* Tue Jul 25 2006 Deepak Bhole <dbhole at redhat.com> -  0:1.1.4-3jpp_1fc
+- Added conditional native compilation.
+- Converted spec file to UTF8.
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1.3-1jpp_3fc
-- rebuilt
+* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.1.4-2jpp
+- First JPP 1.7 build
 
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> - 0:1.1.3-1jpp_2fc
-- Remove jarfile from the tarball.
-
-* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.1.3-1jpp_1fc
-- Build into Fedora.
-
-* Fri Nov 26 2004 Fernando Nasser <fnasser at redhat.com> 0:1.1.3-1jpp_1rh
-- Merge with upstream for upgrade
+* Tue Jul 26 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.1.4-1jpp
+- Upgrade to 1.1.4
 
 * Tue Sep 07 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.1.3-1jpp
 - Upgrade to 1.1.3
@@ -173,22 +225,19 @@
 * Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0.2-3jpp
 - Rebuild with ant-1.6.2
 
-* Thu Mar  4 2004 Frank Ch. Eigler <fche at redhat.com> 0:4.1.29-2jpp_1rh
-- RH vacuuming
-
-* Fri Apr 18 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:1.0.2-2jpp
+* Fri Apr 18 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.2-2jpp
 - Move DTDs from %%{_datadir}/%{name} to %%{_datadir}/sgml/%%{name} for FHS
   compliance, <http://www.pathname.com/fhs/2.2/fhs-4.11.html#4.11.7>.
 
-* Fri Apr 18 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:1.0.2-1jpp
+* Fri Apr 18 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0.2-1jpp
 - Update to 1.0.2 and JPackage 1.5.
 - Move DTDs from %%doc to %%{_datadir}/%%{name}.
 - Include catalog for DTDs, and install it if %%{_bindir}/install-catalog
   is available.
 
-* Mon Dec 16 2002 Ville Skytt? <ville.skytta at iki.fi> - 1.0.1-1jpp
+* Mon Dec 16 2002 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1jpp
 - 1.0.1.
 - Include the DTD in the package (as documentation).
 
-* Sat Nov  2 2002 Ville Skytt? <ville.skytta at iki.fi> - 1.0-1jpp
+* Sat Nov  2 2002 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1jpp
 - 1.0, initial JPackage release.



From fedora-cvs-commits at redhat.com  Tue Jul 25 19:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 15:03:40 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2450.2.1,1.2450.2.2
Message-ID: <200607251903.k6PJ3eAd021028@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21003

Modified Files:
      Tag: private-linville-jwltest-fc6-2-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.2450.2.1
retrieving revision 1.2450.2.2
diff -u -r1.2450.2.1 -r1.2450.2.2
--- kernel-2.6.spec	25 Jul 2006 18:10:41 -0000	1.2450.2.1
+++ kernel-2.6.spec	25 Jul 2006 19:03:28 -0000	1.2450.2.2
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.jwltest.2
 %define signmodules 0
 %define xen_hv_cset 10712
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Tue Jul 25 19:15:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 15:15:31 -0400
Subject: rpms/firefox/devel firefox.spec,1.126,1.127
Message-ID: <200607251915.k6PJFVU0024462@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24430

Modified Files:
	firefox.spec 
Log Message:



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- firefox.spec	25 Jul 2006 17:04:33 -0000	1.126
+++ firefox.spec	25 Jul 2006 19:15:28 -0000	1.127
@@ -251,9 +251,9 @@
 # Prepare our devel package
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
-install -c -m 644 dist/include/* \
+%{__cp} -r dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
-install -c -m 644 dist/idl/* \
+%{__cp} -r dist/idl/* \
   $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \



From fedora-cvs-commits at redhat.com  Tue Jul 25 19:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 15:31:42 -0400
Subject: rpms/pyxf86config/devel .cvsignore, 1.16, 1.17 pyxf86config.spec,
	1.30, 1.31 sources, 1.16, 1.17
Message-ID: <200607251931.k6PJVgOL012519@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12479

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Jul 2006 21:04:03 -0000	1.16
+++ .cvsignore	25 Jul 2006 19:31:39 -0000	1.17
@@ -3,3 +3,4 @@
 pyxf86config-0.3.24.tar.gz
 pyxf86config-0.3.25.tar.gz
 pyxf86config-0.3.26.tar.gz
+pyxf86config-0.3.27.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pyxf86config.spec	19 Jul 2006 21:04:09 -0000	1.30
+++ pyxf86config.spec	25 Jul 2006 19:31:39 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.26
+Version: 0.3.27
 Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -44,6 +44,10 @@
 
 
 %changelog
+* Tue Jul 25 2006 Chris Lumens <clumens at redhat.com> 0.3.27-1
+- Remove gigantic keyboard comment.
+- Don't write out an empty modules section.
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 0.3.26-1
 - Don't traceback when given empty section identifiers.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 Jul 2006 21:04:09 -0000	1.16
+++ sources	25 Jul 2006 19:31:39 -0000	1.17
@@ -1 +1 @@
-310b1b167df0bd67b9a42b7553f015e2  pyxf86config-0.3.26.tar.gz
+d0e29685fb495dc6ac7482edbc7c8947  pyxf86config-0.3.27.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 19:36:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 15:36:24 -0400
Subject: rpms/mesa/devel mesa-6.5-fix-glxinfo-link.patch, 1.1, 1.2 mesa.spec,
	1.75, 1.76
Message-ID: <200607251936.k6PJaODM013648@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13625

Modified Files:
	mesa-6.5-fix-glxinfo-link.patch mesa.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-18.fc6
- mesa-6.5-fix-glxinfo-link.patch: lib64 fix.


mesa-6.5-fix-glxinfo-link.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: mesa-6.5-fix-glxinfo-link.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5-fix-glxinfo-link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5-fix-glxinfo-link.patch	25 Jul 2006 18:35:08 -0000	1.1
+++ mesa-6.5-fix-glxinfo-link.patch	25 Jul 2006 19:36:20 -0000	1.2
@@ -1,11 +1,11 @@
---- Mesa-6.5/progs/xdemos/Makefile.glxinfo	2006-07-25 13:51:53.000000000 -0400
-+++ Mesa-6.5/progs/xdemos/Makefile	2006-07-25 14:07:55.000000000 -0400
+--- Mesa-6.5/progs/xdemos/Makefile.glxinfo	2006-07-25 14:10:01.000000000 -0400
++++ Mesa-6.5/progs/xdemos/Makefile	2006-07-25 15:30:25.000000000 -0400
 @@ -54,7 +54,7 @@
  	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
  
  glxinfo:
 -	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -lGL -lGLU -o $@
-+	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -L$(TOP)/lib -lGL -lGLU -o $@
++	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -L$(TOP)/lib -L$(TOP)/lib64 -lGL -lGLU -o $@
  
  pbinfo: pbinfo.o pbutil.o
  	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- mesa.spec	25 Jul 2006 18:28:38 -0000	1.75
+++ mesa.spec	25 Jul 2006 19:36:20 -0000	1.76
@@ -57,7 +57,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -512,6 +512,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-18.fc6
+- mesa-6.5-fix-glxinfo-link.patch: lib64 fix.
+
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-17.fc6
 - mesa-6.5-fix-linux-indirect-build.patch: Added.
 - mesa-6.5-fix-glxinfo-link.patch: Added.



From fedora-cvs-commits at redhat.com  Tue Jul 25 20:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 16:26:30 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch, NONE,
	1.1 xorg-x11-server-1.1.1-no-composite-in-xnest.patch, NONE,
	1.1 xorg-x11-server-1.1.1-selinux-awareness.patch, NONE,
	1.1 xorg-x11-server.spec, 1.128, 1.129
Message-ID: <200607252026.k6PKQUCp023898@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23877

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch 
	xorg-x11-server-1.1.1-no-composite-in-xnest.patch 
	xorg-x11-server-1.1.1-selinux-awareness.patch 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
  selinux code.
- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
  fix for Xdmx.
- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
  Xnest, as it's known not to work.


xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch:
 dmxpict.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch ---
4c225a3a8b2e7e5e5510347d8473f1318bbac769
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 9a76a66..9cdd123 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -662,7 +662,7 @@ static int dmxProcRenderSetPictureFilter
     int             nparams;
     REQUEST(xRenderSetPictureFilterReq);
 
-    REQUEST_SIZE_MATCH(xRenderSetPictureFilterReq);
+    REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);
     VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityWriteAccess,
 		   RenderErrBase + BadPicture);
 

xorg-x11-server-1.1.1-no-composite-in-xnest.patch:
 Args.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-no-composite-in-xnest.patch ---
--- xorg-server-1.1.1/hw/xnest/Args.c.no-xnest-composite	2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xnest/Args.c	2006-07-25 14:02:33.000000000 -0400
@@ -51,9 +51,12 @@
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 
+/* XXX terrible hack */
+extern Bool noCompositeExtension;
 /* ddxInitGlobals - called by |InitGlobals| from os/util.c */
 void ddxInitGlobals(void)
 {
+    noCompositeExtension = TRUE;
 }
 
 int

xorg-x11-server-1.1.1-selinux-awareness.patch:
 configure.ac                   |    4 +++-
 hw/xfree86/dixmods/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-selinux-awareness.patch ---
--- xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am.selinux-awareness	2006-07-05 14:38:47.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am	2006-07-25 15:45:47.000000000 -0400
@@ -40,7 +40,7 @@
            -I$(top_srcdir)/GL/glx
 
 libGLcore_la_LDFLAGS = -avoid-version
-libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux
 libGLcore_la_SOURCES = GLcoremodule.c
 
 libafb_la_LDFLAGS = -avoid-version
--- xorg-server-1.1.1/configure.ac.selinux-awareness	2006-07-07 19:44:45.000000000 -0400
+++ xorg-server-1.1.1/configure.ac	2006-07-25 16:06:24.000000000 -0400
@@ -233,6 +233,8 @@
 	;;
 esac
 
+SYS_LIBS="${SYS_LIBS} -lselinux"
+
 dnl BSD *_video.c selection
 AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
 AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
@@ -954,7 +956,7 @@
 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
 
 if test "x$XNEST" = xyes; then
-	XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+	XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $XSERVER_LIBS"
 	AC_SUBST([XNEST_LIBS])
 fi
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- xorg-x11-server.spec	24 Jul 2006 07:34:56 -0000	1.128
+++ xorg-x11-server.spec	25 Jul 2006 20:26:27 -0000	1.129
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -31,6 +31,7 @@
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
+Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -38,10 +39,12 @@
 Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
+Patch1004:  xorg-x11-server-1.1.1-selinux-awareness.patch
 
 # Backports of post-1.1 stuff.
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
+Patch2005:  xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -143,7 +146,7 @@
 # Needed at least for DRI enabled builds
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.5-1
-BuildRequires: mesa-source >= 6.5-1
+BuildRequires: mesa-source >= 6.5-17
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description
@@ -318,14 +321,17 @@
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
+%patch106 -p1 -b .no-xnest-composite
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
 %patch1003 -p1 -b .fpic
+%patch1004 -p1 -b .selinux-awareness
 
 %patch2001 -p1 -b .pci-scan
 %patch2004 -p1 -b .zlib
+%patch2005 -p1 -b .Xdmx
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -663,6 +669,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
+- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
+  selinux code.
+- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
+  fix for Xdmx.
+- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
+  Xnest, as it's known not to work.
+
 * Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
 - Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 20:28:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 16:28:43 -0400
Subject: rpms/ypserv/devel ypserv-ypxfrd.init,1.2,1.3 ypserv.spec,1.32,1.33
Message-ID: <200607252028.k6PKShQg024816@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24715

Modified Files:
	ypserv-ypxfrd.init ypserv.spec 
Log Message:
fixed typo in ypxfrd initscript (bz 185403)




Index: ypserv-ypxfrd.init
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv-ypxfrd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ypserv-ypxfrd.init	9 Sep 2004 15:15:29 -0000	1.2
+++ ypserv-ypxfrd.init	25 Jul 2006 20:28:41 -0000	1.3
@@ -21,7 +21,7 @@
 start() {
 	echo -n $"Starting YP map server: "
         daemon rpc.ypxfrd $YPXFRD_ARGS
-        ETVAL=$?
+        RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ypxfrd
 	return $RETVAL


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ypserv.spec	15 Jul 2006 04:19:20 -0000	1.32
+++ ypserv.spec	25 Jul 2006 20:28:41 -0000	1.33
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Tue Jul 25 2006 Steve Dickson <steved at redhat.com> - 2.19-2
+- fixed typo in ypxfrd initscript (bz 185403)
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 2.19-1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 21:05:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 17:05:21 -0400
Subject: rpms/conga/FC-5 conga.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200607252105.k6PL5LKT019251@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19229/FC-5

Modified Files:
	conga.spec sources 
Log Message:
auto-import conga-0.8-8 on branch FC-5 from conga-0.8-8.src.rpm


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conga.spec	27 Jun 2006 21:58:36 -0000	1.4
+++ conga.spec	25 Jul 2006 21:05:07 -0000	1.5
@@ -11,18 +11,21 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel 6.FC5
+%define rel  8%{?dist}
 
+%define include_zope_and_plone     no
+%define zope_archive               Zope-2.9.3
+%define plone_archive              Plone-2.5
+%define zope_archive_file          %{zope_archive}.tgz
+%define plone_archive_file         %{plone_archive}.tar.gz
 
-%ifarch x86_64
-%define _libdir /usr/lib64
-%endif
 
 %define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
 
 
 
 
+
 ############  SRPM  ###################
 
 
@@ -30,13 +33,24 @@
 Version: %vers
 Release: %rel
 License: GPL
+URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
-Summary: conga source rpm
+Summary: Conga Remote Management System - source code
 
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+%if "%{include_zope_and_plone}" == yes
+Source1: %{zope_archive_file}
+Source2: %{plone_archive_file}
+Patch2:  Plone-2.5_Marhsall_ro_file.patch
+%endif
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
 
+
+%if "%{include_zope_and_plone}" == yes
+BuildRequires: python >= 2.4.1
+BuildRequires: python-devel >= 2.4.1
+%endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel make
 BuildRequires: openssl-devel dbus-devel pam-devel
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -52,17 +66,37 @@
 
 %prep
 %setup -q
+%if "%{include_zope_and_plone}" == yes
+CURRENT_DIR=`pwd`
+# Zope
+%setup -q -T -D -a 1
+ln -s ../%{zope_archive} luci/zope
+# Plone
+%setup -q -T -D -a 2
+ln -s ../%{plone_archive} luci/plone
+cd luci/plone
+%patch2 -p1
+rm -rf Five README.txt
+cd $CURRENT_DIR
+%endif
+
 
 %build
-#./autogen.sh
+rm -rf $RPM_BUILD_ROOT
 #./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
-%configure --arch=%{_arch} --docdir=%{_docdir} --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR}
+%configure      --arch=%{_arch} \
+		--docdir=%{_docdir} \
+		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
+		--include_zope_and_plone=%{include_zope_and_plone}
+#make %{?_smp_mflags}
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,37 +111,44 @@
 
 %package -n luci
 Group: System Environment/Base
-Summary: luci
+Summary: Conga Remote Management System - Management Station
+URL: http://sources.redhat.com/cluster/conga
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: python zope plone
-Requires: openssl mailcap stunnel
-Requires: ricci 
-Provides: luci 
+%if "%{include_zope_and_plone}" == yes
+Requires: python >= 2.4.1
+%else
+Requires: python
+Requires: zope
+Requires: plone
+%endif
+Requires: openssl mailcap stunnel 
+Requires: sed util-linux
+Requires: ricci = %{version}-%{release}
 
 
 %description -n luci
 Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+It consists of luci, https frontend, and ricci, secure daemon that 
+dispatches incoming messages to underlying management modules. 
 
 This package contains Luci website.
 
 
 %files -n luci
 %defattr(-,root,root)
-%config				%{_sysconfdir}/rc.d/init.d/luci
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
+				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
-%attr(-,luci,root)		%{_localstatedir}/lib/luci
-%attr(600,luci,root)%config	%{_localstatedir}/lib/luci/var/Data.fs
-%config				%{_localstatedir}/lib/luci/etc/zope.conf
-%config(noreplace)		%{_localstatedir}/lib/luci/etc/logrotate.conf
-%config				%{_localstatedir}/lib/luci/etc/stunnel.conf
+%if "%{include_zope_and_plone}" == yes
+				%{_libdir}/luci/
+%endif
+				%{_docdir}/luci-%{version}/
+%defattr(-,luci,root)
+				%{_localstatedir}/lib/luci
 
 %pre -n luci
 /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g luci luci >/dev/null 2>&1
+/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 exit 0
 
 %post -n luci
@@ -165,32 +206,30 @@
 
 %package -n ricci
 Group: System Environment/Base
-Summary: Remote management system, including basic management modules
+Summary: Conga Remote Management System - Managed Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob dbus libxml2 openssl pam
-Requires: ricci = %{version}-%{release}
-Requires: ricci-modrpm = %{version}-%{release}
-Requires: ricci-modstorage = %{version}-%{release}
-Requires: ricci-modservice = %{version}-%{release}
-Requires: ricci-modlog = %{version}-%{release}
+Requires: oddjob dbus openssl pam
+Requires: sed util-linux
 Requires: ricci-modcluster = %{version}-%{release}
 
-Provides: ricci ricci-modreboot 
+# modreboot
+Provides: ricci-modreboot = %{version}-%{release}
 
 # modrpm
-Provides: ricci-modrpm 
+Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
 Requires: parted
-Provides: ricci-modstorage
+Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
 Requires: chkconfig initscripts
-Provides: ricci-modservice
+Provides: ricci-modservice = %{version}-%{release}
 
 # modlog
-Provides: ricci-modlog
+Provides: ricci-modlog = %{version}-%{release}
 
 %description -n ricci
 Conga is a project developing management system for remote stations. 
@@ -203,41 +242,40 @@
 
 %files -n ricci
 %defattr(-,root,root)
-
 # ricci
-#%doc README COPYING
-%config			%{_sysconfdir}/rc.d/init.d/ricci
 %config(noreplace)	%{_sysconfdir}/pam.d/ricci
-			%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci
 %attr(-,ricci,root)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
 			%{_sbindir}/ricci-worker
+			%{_docdir}/ricci-%{version}/
 # modrpm
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
 			%{_sbindir}/ricci-modrpm
 			%{_sbindir}/ricci-modrpm.exe
 # modstorage
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
 			%{_sbindir}/ricci-modstorage
 			%{_sbindir}/ricci-modstorage.exe
 # modservice
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
 			%{_sbindir}/ricci-modservice
 			%{_sbindir}/ricci-modservice.exe
 # modlog
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
 			%{_sbindir}/ricci-modlog
 			%{_sbindir}/ricci-modlog.exe
 
 %pre -n ricci
 /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g ricci ricci >/dev/null 2>&1
+/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 exit 0
 
 %post -n ricci
@@ -252,9 +290,9 @@
 fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ $STATE = "on" ]; then
    /sbin/service ricci restart > /dev/null 2>&1
 fi
@@ -269,9 +307,9 @@
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
 if [ "$1" -ge "1" ]; then
-   RUNS=(`runlevel`)
+   RUNS=(`/sbin/runlevel`)
    RUNLEVEL=${RUNS[1]}
-   STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+   STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
    if [ $STATE = "on" ]; then
       /sbin/service ricci restart > /dev/null 2>&1
    fi
@@ -286,11 +324,12 @@
 
 %package -n ricci-modcluster
 Group: System Environment/Base
-Summary: ricci-modcluster summary
+Summary: Conga Remote Management System - Managed Clustered Station
+URL: http://sources.redhat.com/cluster/conga
+
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modcluster
+Requires: oddjob openssl
+Requires: sed util-linux
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -298,26 +337,27 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches 
 incoming messages to underlying management modules. 
 
-This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+This package contains Red Hat Enterprise Linux Cluster Suite 
+ricci management module. 
 
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
-#%doc README
-%config			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
-			%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
-			%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
 			%{_sbindir}/ricci-modcluster
 			%{_sbindir}/ricci-modcluster.exe
 			%{_sbindir}/ricci-modclusterd
+			%{_docdir}/ricci-modcluster-%{version}/
 
 %post -n ricci-modcluster
 /sbin/chkconfig --add ricci-modclusterd
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
@@ -345,10 +385,11 @@
 %package -n cluster-snmp
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-Requires: /bin/bash
-Requires: net-snmp ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-snmp
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: net-snmp 
+Requires: oddjob openssl
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
@@ -357,11 +398,12 @@
 %files -n cluster-snmp
 %defattr(-,root,root)
 			%{_libdir}/cluster-snmp/
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-MIB
-%attr(644,root,root)	%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
+			%{_datadir}/snmp/mibs/REDHAT-MIB
+			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
 			%{_docdir}/cluster-snmp-%{version}/
 
 %pre -n cluster-snmp
+exit 0
 
 %post -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -370,6 +412,7 @@
 exit 0
 
 %preun -n cluster-snmp
+exit 0
 
 %postun -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -387,10 +430,11 @@
 %package -n cluster-cim
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-Requires: /bin/bash
-Requires: tog-pegasus ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-cim
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: tog-pegasus 
+Requires: oddjob openssl
 Conflicts: clumon-cim
 
 %description -n cluster-cim
@@ -398,10 +442,11 @@
 
 %files -n cluster-cim
 %defattr(-,root,root)
-%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
-%{_docdir}/cluster-cim-%{version}/
+			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
+			%{_docdir}/cluster-cim-%{version}/
 
 %pre -n cluster-cim
+exit 0
 
 %post -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -410,6 +455,7 @@
 exit 0
 
 %preun -n cluster-cim
+exit 0
 
 %postun -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -426,6 +472,11 @@
 
 
 %changelog
+* Tue Jul 25 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-8
+- New build with a lot of implementation details on Luci
+- Last build with plone 2.1.2
+* Thu Jul 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-7
+- More compliant specfile, minor fixes
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-6
 - Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2006 21:58:36 -0000	1.5
+++ sources	25 Jul 2006 21:05:07 -0000	1.6
@@ -1 +1 @@
-134d1801b7db475801f364cd690c581b  conga-0.8.tar.gz
+df0abe025066e7a1df29686160f9f84d  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 21:09:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 17:09:13 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.26, 1.27 rhpxl.spec, 1.30,
	1.31 sources, 1.29, 1.30
Message-ID: <200607252109.k6PL9Du2019373@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19328

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	24 Jul 2006 20:29:23 -0000	1.26
+++ .cvsignore	25 Jul 2006 21:09:11 -0000	1.27
@@ -4,3 +4,4 @@
 rhpxl-0.21.tar.gz
 rhpxl-0.22.tar.gz
 rhpxl-0.23.tar.gz
+rhpxl-0.24.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- rhpxl.spec	24 Jul 2006 20:29:23 -0000	1.30
+++ rhpxl.spec	25 Jul 2006 21:09:11 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.23
+Version: 0.24
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Jul 25 2006 Chris Lumens <clumens at redhat.com> 0.24-1
+- Add -extension Composite to X startup flags to avoid tracebacks.
+
 * Mon Jul 24 2006 Chris Lumens <clumens at redhat.com> 0.23-1
 - Remove -terminate flag to fix X startup race condition
   (Charlotte Richardson).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	24 Jul 2006 20:29:23 -0000	1.29
+++ sources	25 Jul 2006 21:09:11 -0000	1.30
@@ -1 +1 @@
-82cb61aad1df885acc79dfe227d4e136  rhpxl-0.23.tar.gz
+bede8dbcd6a8f859a2724e3ea757e8a0  rhpxl-0.24.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 21:20:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 17:20:07 -0400
Subject: rpms/eclipse-changelog/devel .cvsignore, 1.5,
	1.6 eclipse-changelog.spec, 1.40, 1.41 sources, 1.10, 1.11
Message-ID: <200607252120.k6PLK7aY015237@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15136

Modified Files:
	.cvsignore eclipse-changelog.spec sources 
Log Message:
* Tue Jul 25 2006 Kyu Lee <klee at redhat.com> 2.2.1-1
- Import version 2.2.1 that has prepare-changelog functionality for 3.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Jul 2006 19:00:01 -0000	1.5
+++ .cvsignore	25 Jul 2006 21:20:04 -0000	1.6
@@ -1 +1 @@
-eclipse-changelog-fetched-2.2.0.tar.gz
+eclipse-changelog-fetched-2.2.1.tar.gz


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- eclipse-changelog.spec	24 Jul 2006 09:39:22 -0000	1.40
+++ eclipse-changelog.spec	25 Jul 2006 21:20:04 -0000	1.41
@@ -7,7 +7,7 @@
 %define	changelog_major		2
 %define changelog_minor		2
 %define changelog_majmin	%{changelog_major}.%{changelog_minor}
-%define changelog_micro   	0
+%define changelog_micro   	1
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -138,6 +138,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Kyu Lee <klee at redhat.com> 2.2.1-1
+- Import version 2.2.1 that has prepare-changelog functionality for 3.2.
+
 * Mon Jul 24 2006 Ben Konrath <bkonrath at redhat.com> 2.2.0-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Jul 2006 19:00:01 -0000	1.10
+++ sources	25 Jul 2006 21:20:04 -0000	1.11
@@ -1 +1 @@
-270fbbdd75f1127e67802c74929c4446  eclipse-changelog-fetched-2.2.0.tar.gz
+e87bacb5569f0a9e132034485c5f14f5  eclipse-changelog-fetched-2.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 21:25:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 17:25:39 -0400
Subject: rpms/mesa/devel mesa.spec,1.76,1.77
Message-ID: <200607252125.k6PLPdtv017177@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17148

Modified Files:
	mesa.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-19.fc6
- Disable TLS dispatch, it's selinux-hostile.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mesa.spec	25 Jul 2006 19:36:20 -0000	1.76
+++ mesa.spec	25 Jul 2006 21:25:36 -0000	1.77
@@ -75,7 +75,7 @@
 
 # Patches 0-9 reserved for mesa Makefiles/config fixes
 Patch0: mesa-6.5-build-config.patch
-Patch1: mesa-6.5-glx-use-tls.patch
+#Patch1: mesa-6.5-glx-use-tls.patch
 Patch2: mesa-6.5-fix-opt-flags-bug197640.patch
 Patch3: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
@@ -310,7 +310,7 @@
 install -m 755 %{SOURCE12} ./
 
 %patch0 -p0 -b .build-config
-%patch1 -p0 -b .glx-use-tls
+#%patch1 -p0 -b .glx-use-tls
 %patch2 -p1 -b .fix-opt-flags-bug197640
 %if %{with_motif}
 %patch3 -p0 -b .libGLw-enable-motif-support
@@ -512,6 +512,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-19.fc6
+- Disable TLS dispatch, it's selinux-hostile.
+
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-18.fc6
 - mesa-6.5-fix-glxinfo-link.patch: lib64 fix.
 



From fedora-cvs-commits at redhat.com  Tue Jul 25 21:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 17:55:30 -0400
Subject: rpms/conga/FC-5 sources,1.6,1.7
Message-ID: <200607252155.k6PLtUG8007808@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7776

Modified Files:
	sources 
Log Message:
New source tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	25 Jul 2006 21:05:07 -0000	1.6
+++ sources	25 Jul 2006 21:55:27 -0000	1.7
@@ -1 +1 @@
-df0abe025066e7a1df29686160f9f84d  conga-0.8.tar.gz
+e6cbc0962668216ae643bc8ef8d9d818  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Tue Jul 25 22:54:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 18:54:51 -0400
Subject: rpms/beagle/devel beagle-autostart.desktop, NONE, 1.1 beagle.spec,
	1.63, 1.64 sources, 1.14, 1.15
Message-ID: <200607252254.k6PMsp9W023381@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23251

Modified Files:
	beagle.spec sources 
Added Files:
	beagle-autostart.desktop 
Log Message:
* Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-6lexander Larsson <alexl at redhat.com> - 0.2.7-6
- Pass --autostarted in autostart desktop file to make autostart switch work




--- NEW FILE beagle-autostart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Beagle
Comment=A system for searching and managing your personal information space
Icon=/usr/share/pixmaps/system-search.png
Exec=beagled --autostarted
Terminal=false
Type=Application
Categories=
OnlyShowIn=GNOME;
X-GNOME-Autostart-enabled=true


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- beagle.spec	24 Jul 2006 21:44:24 -0000	1.63
+++ beagle.spec	25 Jul 2006 22:54:48 -0000	1.64
@@ -1,12 +1,12 @@
 Name:           beagle
 Version:        0.2.7
-Release:       	5 
+Release:       	6
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://beagle-project.org/
 Source0:        %{name}-%{version}.tar.bz2
-Source1:	beagle.desktop
+Source1:	beagle-autostart.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel >= 1.1.13.5
@@ -98,7 +98,7 @@
 # Add an autostart file so beagled gets run by default
 # (temporarily disabled)
 mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
+cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart/beagle.desktop
 
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
@@ -216,6 +216,9 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 0.2.7-6
+- Pass --autostarted in autostart desktop file to make autostart switch work
+
 * Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> - 0.2.7-5
 - reenable beagle by default 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Jun 2006 12:07:00 -0000	1.14
+++ sources	25 Jul 2006 22:54:48 -0000	1.15
@@ -1,2 +1 @@
-6f0f121a9269662071eb5c260b54f86f  beagle.desktop
 d4c8e93db23c9b7d06104ce97a182502  beagle-0.2.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Jul 25 23:05:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 19:05:23 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.36,1.37
Message-ID: <200607252305.k6PN5NOl026312@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26147

Modified Files:
	linux-2.6-xen.patch 
Log Message:
fix xen build

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85148 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- linux-2.6-xen.patch	25 Jul 2006 16:03:53 -0000	1.36
+++ linux-2.6-xen.patch	25 Jul 2006 23:05:07 -0000	1.37
@@ -82645,6 +82645,24 @@
  extern void	       kfree_skbmem(struct sk_buff *skb);
  extern struct sk_buff *skb_clone(struct sk_buff *skb,
  				 gfp_t priority);
+@@ -1075,6 +1075,7 @@ static inline void __skb_queue_purge(str
+ 		kfree_skb(skb);
+ }
+ 
++#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SK
+ /**
+  *	__dev_alloc_skb - allocate an skbuff for receiving
+  *	@length: length to allocate
+@@ -1095,6 +1096,9 @@ static inline struct sk_buff *__dev_allo
+ 		skb_reserve(skb, NET_SKB_PAD);
+ 	return skb;
+ }
++#else
++extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
++#endif
+ 
+ /**
+  *	dev_alloc_skb - allocate an skbuff for receiving
 diff --exclude='.hg*' -urNp linux-2.6.18-rc2/include/scsi/scsi_eh.h linux-2.6-xen-fedora/include/scsi/scsi_eh.h
 --- linux-2.6.18-rc2/include/scsi/scsi_eh.h	2006-07-23 11:26:08.000000000 +0200
 +++ linux-2.6-xen-fedora/include/scsi/scsi_eh.h	2006-07-18 03:28:32.000000000 +0200



From fedora-cvs-commits at redhat.com  Tue Jul 25 23:11:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 19:11:35 -0400
Subject: rpms/mesa/devel mesa.spec,1.77,1.78
Message-ID: <200607252311.k6PNBZdG027596@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27567

Modified Files:
	mesa.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-19.fc6
- Disable TLS dispatch, it's selinux-hostile.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mesa.spec	25 Jul 2006 21:25:36 -0000	1.77
+++ mesa.spec	25 Jul 2006 23:11:33 -0000	1.78
@@ -57,7 +57,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org



From fedora-cvs-commits at redhat.com  Tue Jul 25 23:43:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 19:43:09 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.37,1.38
Message-ID: <200607252343.k6PNh8s6026830@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26816

Modified Files:
	linux-2.6-xen.patch 
Log Message:
missed a bit.

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85148 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- linux-2.6-xen.patch	25 Jul 2006 23:05:07 -0000	1.37
+++ linux-2.6-xen.patch	25 Jul 2006 23:43:05 -0000	1.38
@@ -82658,7 +82658,7 @@
  	return skb;
  }
 +#else
-+extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
++extern struct sk_buff *__dev_alloc_skb(unsigned int length, gfp_t gfp_mask);
 +#endif
  
  /**



From fedora-cvs-commits at redhat.com  Tue Jul 25 23:49:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 19:49:09 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.496, 1.497 kernel-2.6.spec, 1.2450,
	1.2451 sources, 1.460, 1.461 upstream, 1.403,
	1.404 patch-2.6.18-rc2-git4.bz2.sign, 1.1, NONE
Message-ID: <200607252349.k6PNn9YT009230@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9216

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2-git5.bz2.sign 
Removed Files:
	patch-2.6.18-rc2-git4.bz2.sign 
Log Message:
git5


--- NEW FILE patch-2.6.18-rc2-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExmqryGugalF9Dw4RAkT9AJ0V125AtmFLcTBcIjr3E9V+y0JflwCgigC4
VhCKFuYm4jqD6QBsGI08+9c=
=xuPX
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- .cvsignore	25 Jul 2006 16:03:52 -0000	1.496
+++ .cvsignore	25 Jul 2006 23:49:06 -0000	1.497
@@ -4,4 +4,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
 xen-10712.tar.bz2
-patch-2.6.18-rc2-git4.bz2
+patch-2.6.18-rc2-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2450
retrieving revision 1.2451
diff -u -r1.2450 -r1.2451
--- kernel-2.6.spec	25 Jul 2006 16:03:52 -0000	1.2450
+++ kernel-2.6.spec	25 Jul 2006 23:49:06 -0000	1.2451
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git4.bz2
+Patch2: patch-2.6.18-rc2-git5.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1640,7 +1640,7 @@
 
 %changelog
 * Tue Jul 25 2006 Dave Jones <davej at redhat.com>
-- 2.6.18rc2-git4
+- 2.6.18rc2-git4 & git5
 
 * Tue Jul 25 2006 Jon Masters <jcm at redhat.com>
 - Fix kabitool provided find-provides once again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- sources	25 Jul 2006 16:03:55 -0000	1.460
+++ sources	25 Jul 2006 23:49:07 -0000	1.461
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
-c48692a855ea8aa1b08fb9745ed951b0  patch-2.6.18-rc2-git4.bz2
+f30096f49c2a8b4da67854b8350ad929  patch-2.6.18-rc2-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- upstream	25 Jul 2006 16:03:55 -0000	1.403
+++ upstream	25 Jul 2006 23:49:07 -0000	1.404
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git4.bz2
+patch-2.6.18-rc2-git5.bz2


--- patch-2.6.18-rc2-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 26 00:00:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 20:00:27 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-module-list.patch,
	NONE, 1.1 xorg-x11-server.spec, 1.129, 1.130
Message-ID: <200607260000.k6Q00RXu009394@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9372

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-module-list.patch 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
  selinux code.
- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
  fix for Xdmx.
- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
  Xnest, as it's known not to work.
- Fix default font path to match the config file we used to generate.
- Fix default module set to match the config file we used to generate.
- Disable use of TLS GLX dispatch to match Mesa selinux nonsense.


xorg-x11-server-1.1.1-module-list.patch:
 xf86AutoConfig.c |    3 +++
 xf86Config.c     |   18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-module-list.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.module-list	2006-07-25 19:14:44.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-07-25 19:36:32.000000000 -0400
@@ -65,7 +65,7 @@
 #include "xf86Config.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
-
+#include "configProcs.h"
 #include "globals.h"
 
 #ifdef XINPUT
@@ -274,9 +274,21 @@
 	    count++;
 	    modp = (XF86LoadPtr) modp->list.next;
 	}
+    } else {
+	xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
+    }
+
+    if (count == 0) {
+	XF86ConfModulePtr ptr = xf86configptr->conf_modules;
+	ptr = xf86addNewLoadDirective(ptr, "extmod", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "dbe", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "glx", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "freetype", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "type1", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
+	ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
+	count = 7;
     }
-    if (count == 0)
-	return NULL;
 
     /*
      * allocate the memory and walk the list again to fill in the pointers
--- xorg-server-1.1.1/hw/xfree86/common/xf86AutoConfig.c.module-list	2006-07-25 19:14:44.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/common/xf86AutoConfig.c	2006-07-25 19:14:44.000000000 -0400
@@ -55,6 +55,9 @@
 	"\tLoad\t\"dbe\"\n" \
 	"\tLoad\t\"glx\"\n" \
 	"\tLoad\t\"freetype\"\n" \
+	"\tLoad\t\"type1\"\n" \
+	"\tLoad\t\"record\"\n" \
+	"\tLoad\t\"dri\"\n" \
 	"EndSection\n\n"
 
 #define BUILTIN_DEVICE_NAME \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- xorg-x11-server.spec	25 Jul 2006 20:26:27 -0000	1.129
+++ xorg-x11-server.spec	26 Jul 2006 00:00:25 -0000	1.130
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -55,6 +55,7 @@
 Patch3006:  xorg-x11-server-1.1.1-dpms-on-by-default.patch
 Patch3007:  xorg-x11-server-1.1.1-edid-root-window-properties.patch
 Patch3008:  xorg-x11-server-1.1.1-sanedefaultmode.patch
+Patch3009:  xorg-x11-server-1.1.1-module-list.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -341,6 +342,7 @@
 %patch3006 -p1 -b .dpms-on-by-default
 %patch3007 -p1 -b .edid-on-root-window
 %patch3008 -p1 -b .sanedefaultmode
+%patch3009 -p1 -b .module-list
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -358,6 +360,7 @@
 	--enable-xtrap \
 	--enable-xcsecurity \
 	--enable-xevie \
+	--with-default-font-path="unix/:7100" \
 	--with-module-dir=%{moduledir} \
 	--with-os-name="Fedora Core 5" \
 	--with-os-vendor="Red Hat, Inc." \
@@ -368,7 +371,6 @@
 	--with-fontdir=%(pkg-config --variable=fontdir fontutil) \
 %if %{with_dri}
 	--enable-dri \
-	--enable-glx-tls \
 	--with-mesa-source=%{_datadir}/mesa/source \
 	--with-dri-driver-path=%{drimoduledir} \
 %else
@@ -676,6 +678,9 @@
   fix for Xdmx.
 - xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
   Xnest, as it's known not to work.
+- Fix default font path to match the config file we used to generate.
+- Fix default module set to match the config file we used to generate.
+- Disable use of TLS GLX dispatch to match Mesa selinux nonsense.
 
 * Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
 - Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)



From fedora-cvs-commits at redhat.com  Wed Jul 26 00:12:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 20:12:10 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.130,1.131
Message-ID: <200607260012.k6Q0CAv7020495@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20417

Modified Files:
	xorg-x11-server.spec 
Log Message:
Bump buildreqs, whoops.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- xorg-x11-server.spec	26 Jul 2006 00:00:25 -0000	1.130
+++ xorg-x11-server.spec	26 Jul 2006 00:12:08 -0000	1.131
@@ -147,7 +147,7 @@
 # Needed at least for DRI enabled builds
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.5-1
-BuildRequires: mesa-source >= 6.5-17
+BuildRequires: mesa-source >= 6.5-19
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description



From fedora-cvs-commits at redhat.com  Wed Jul 26 00:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 20:44:09 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.38,1.39
Message-ID: <200607260044.k6Q0i9Jn013067@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13037

Modified Files:
	linux-2.6-xen.patch 
Log Message:
shooting aimlessly

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   16 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85149 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- linux-2.6-xen.patch	25 Jul 2006 23:43:05 -0000	1.38
+++ linux-2.6-xen.patch	26 Jul 2006 00:44:06 -0000	1.39
@@ -82612,6 +82612,14 @@
 diff --exclude='.hg*' -urNp linux-2.6.18-rc2/include/linux/skbuff.h linux-2.6-xen-fedora/include/linux/skbuff.h
 --- linux-2.6.18-rc2/include/linux/skbuff.h	2006-07-23 11:26:06.000000000 +0200
 +++ linux-2.6-xen-fedora/include/linux/skbuff.h	2006-07-22 20:37:56.000000000 +0200
+@@ -14,6 +14,7 @@
+ #ifndef _LINUX_SKBUFF_H
+ #define _LINUX_SKBUFF_H
+ 
++#include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/compiler.h>
+ #include <linux/time.h>
 @@ -203,6 +203,8 @@ enum {
   *	@local_df: allow local fragmentation
   *	@cloned: Head may be cloned (check refcnt to be sure)



From fedora-cvs-commits at redhat.com  Wed Jul 26 00:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 20:46:40 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.39,1.40
Message-ID: <200607260046.k6Q0keUL022589@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17665

Modified Files:
	linux-2.6-xen.patch 
Log Message:
typo

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   16 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85149 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- linux-2.6-xen.patch	26 Jul 2006 00:44:06 -0000	1.39
+++ linux-2.6-xen.patch	26 Jul 2006 00:46:36 -0000	1.40
@@ -82657,7 +82657,7 @@
  		kfree_skb(skb);
  }
  
-+#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SK
++#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
  /**
   *	__dev_alloc_skb - allocate an skbuff for receiving
   *	@length: length to allocate



From fedora-cvs-commits at redhat.com  Wed Jul 26 00:47:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 20:47:16 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.40,1.41
Message-ID: <200607260047.k6Q0lGjA026506@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26266

Modified Files:
	linux-2.6-xen.patch 
Log Message:
remove nonsense

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   24 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1094 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85148 insertions(+), 872 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- linux-2.6-xen.patch	26 Jul 2006 00:46:36 -0000	1.40
+++ linux-2.6-xen.patch	26 Jul 2006 00:47:12 -0000	1.41
@@ -82612,14 +82612,6 @@
 diff --exclude='.hg*' -urNp linux-2.6.18-rc2/include/linux/skbuff.h linux-2.6-xen-fedora/include/linux/skbuff.h
 --- linux-2.6.18-rc2/include/linux/skbuff.h	2006-07-23 11:26:06.000000000 +0200
 +++ linux-2.6-xen-fedora/include/linux/skbuff.h	2006-07-22 20:37:56.000000000 +0200
-@@ -14,6 +14,7 @@
- #ifndef _LINUX_SKBUFF_H
- #define _LINUX_SKBUFF_H
- 
-+#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/compiler.h>
- #include <linux/time.h>
 @@ -203,6 +203,8 @@ enum {
   *	@local_df: allow local fragmentation
   *	@cloned: Head may be cloned (check refcnt to be sure)



From fedora-cvs-commits at redhat.com  Wed Jul 26 01:25:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 21:25:01 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.131,1.132
Message-ID: <200607260125.k6Q1P1Gl022552@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22522

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
- Bump to appease brew.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- xorg-x11-server.spec	26 Jul 2006 00:12:08 -0000	1.131
+++ xorg-x11-server.spec	26 Jul 2006 01:24:57 -0000	1.132
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -671,6 +671,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
+- Bump to appease brew.
+
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
 - xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
   selinux code.



From fedora-cvs-commits at redhat.com  Wed Jul 26 02:11:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 22:11:40 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.132,1.133
Message-ID: <200607260211.k6Q2BeDi018529@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18497

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
- Add selinux{,-devel} buildreqs.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- xorg-x11-server.spec	26 Jul 2006 01:24:57 -0000	1.132
+++ xorg-x11-server.spec	26 Jul 2006 02:11:38 -0000	1.133
@@ -92,8 +92,6 @@
 BuildRequires: autoconf
 BuildRequires: libtool
 
-
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 0.99.1
 BuildRequires: xorg-x11-proto-devel >= 7.1-1
@@ -150,6 +148,9 @@
 BuildRequires: mesa-source >= 6.5-19
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
+
+BuildRequires: libselinux-devel
+
 %description
 X.Org X11 X server
 
@@ -672,7 +673,7 @@
 
 %changelog
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
-- Bump to appease brew.
+- Add selinux{,-devel} buildreqs.
 
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
 - xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:00:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:00:45 -0400
Subject: rpms/kernel/devel/configs config-generic,1.236,1.237
Message-ID: <200607260300.k6Q30jbE015637@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15536/configs

Modified Files:
	config-generic 
Log Message:
enable serio_raw


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- config-generic	24 Jul 2006 15:50:13 -0000	1.236
+++ config-generic	26 Jul 2006 03:00:34 -0000	1.237
@@ -1348,7 +1348,7 @@
 CONFIG_SERIO=y
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_RAW=m
 
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PARKBD is not set



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:01:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:01:36 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.170,1.171
Message-ID: <200607260301.k6Q31aNp015778@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15648/configs

Modified Files:
	config-generic 
Log Message:
* Tue Jul 25 2006 Dave Jones <davej at redhat.com>
- Enable serio_raw (#199387)



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- config-generic	14 Jul 2006 14:58:05 -0000	1.170
+++ config-generic	26 Jul 2006 03:01:18 -0000	1.171
@@ -1341,7 +1341,7 @@
 CONFIG_SERIO=y
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_RAW=m
 
 # CONFIG_SERIO_CT82C710 is not set
 # CONFIG_SERIO_PARKBD is not set



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:01:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:01:32 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2160,1.2161
Message-ID: <200607260301.k6Q31WH9015726@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15648

Modified Files:
	kernel-2.6.spec 
Log Message:
* Tue Jul 25 2006 Dave Jones <davej at redhat.com>
- Enable serio_raw (#199387)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2160
retrieving revision 1.2161
diff -u -r1.2160 -r1.2161
--- kernel-2.6.spec	16 Jul 2006 04:09:12 -0000	1.2160
+++ kernel-2.6.spec	26 Jul 2006 03:01:17 -0000	1.2161
@@ -1548,6 +1548,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Dave Jones <davej at redhat.com>
+- Enable serio_raw (#199387)
+
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:09:59 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2451,1.2452
Message-ID: <200607260309.k6Q39xHS017162@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17139

Modified Files:
	kernel-2.6.spec 
Log Message:
disable debug=y hypervisor build option because of stack overflow (#198932)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2451
retrieving revision 1.2452
diff -u -r1.2451 -r1.2452
--- kernel-2.6.spec	25 Jul 2006 23:49:06 -0000	1.2451
+++ kernel-2.6.spec	26 Jul 2006 03:09:48 -0000	1.2452
@@ -36,7 +36,7 @@
 %define xen_hv_cset 10712
 %define make_target bzImage
 %define kernel_image x86
-%define xen_flags verbose=y debug=y crash_debug=y
+%define xen_flags verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
 
@@ -90,7 +90,7 @@
 %ifarch i686
 %define buildpae 1
 # we build always xen HV with pae
-%define xen_flags verbose=y debug=y crash_debug=y pae=y
+%define xen_flags verbose=y crash_debug=y pae=y
 %endif
 
 %ifarch x86_64
@@ -1639,6 +1639,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Rik van Riel <riel at redhat.com>
+- disable debug=y hypervisor build option because of stack overflow (#198932)
+
 * Tue Jul 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc2-git4 & git5
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:11:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:11:38 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2161,1.2162
Message-ID: <200607260311.k6Q3BcsM017747@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17711

Modified Files:
	kernel-2.6.spec 
Log Message:
disable debug=y hypervisor build option because of stack overflow (#198932)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2161
retrieving revision 1.2162
diff -u -r1.2161 -r1.2162
--- kernel-2.6.spec	26 Jul 2006 03:01:17 -0000	1.2161
+++ kernel-2.6.spec	26 Jul 2006 03:11:35 -0000	1.2162
@@ -1217,11 +1217,11 @@
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
 # FixMe: Juan Quintela (when no PAE is not needed anymore)
-  make debug=y verbose=y crash_debug=y pae=y
+  make 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
-  make debug=y verbose=y crash_debug=y
+  make 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 ..
@@ -1548,6 +1548,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Rik van Riel <riel at redhat.com>
+- disable debug=y hypervisor build option because of stack overflow (#198932)
+
 * Tue Jul 25 2006 Dave Jones <davej at redhat.com>
 - Enable serio_raw (#199387)
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:17:23 -0400
Subject: rpms/kernel/devel Config.mk,1.2,1.3
Message-ID: <200607260317.k6Q3HNbH002206@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2186

Modified Files:
	Config.mk 
Log Message:
update Config.mk


Index: Config.mk
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Config.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.mk	19 Jul 2006 17:27:25 -0000	1.2
+++ Config.mk	26 Jul 2006 03:17:21 -0000	1.3
@@ -3,8 +3,8 @@
 # A debug build of Xen and tools?
 debug ?= n
 
-# Currently supported architectures: x86_32, x86_64
-XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
+XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
+                                              -e s/ppc/powerpc/)
 XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
 XEN_TARGET_X86_PAE  ?= n
 
@@ -42,22 +42,21 @@
 
 ifeq ($(XEN_TARGET_ARCH),x86_32)
 CONFIG_X86 := y
-CONFIG_PLAN9 := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
+CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 CONFIG_MBOOTPACK := y
 
 CFLAGS += -m32 -march=i686
 LIBDIR := lib
-
 endif
 
 ifeq ($(XEN_TARGET_ARCH),x86_64)
 CONFIG_X86 := y
-CONFIG_PLAN9 := y
 CONFIG_HVM := y
 CONFIG_MIGRATE := y
+CONFIG_XCUTILS := y
 CONFIG_IOEMU := y
 CONFIG_MBOOTPACK := y
 
@@ -68,6 +67,7 @@
 ifeq ($(XEN_TARGET_ARCH),ia64)
 CONFIG_IA64 := y
 CONFIG_IOEMU := y
+CONFIG_XCUTILS := y
 
 LIBDIR := lib
 endif



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:23:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:23:17 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.90.1-missing-function-decl.patch,
	NONE, 1.1 .cvsignore, 1.46, 1.47 evolution-data-server.spec,
	1.102, 1.103 sources, 1.46,
	1.47 evolution-data-server-1.7.4-with-libdb-fix.patch, 1.1, NONE
Message-ID: <200607260323.k6Q3NHK3004486@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4318

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-1.7.90.1-missing-function-decl.patch 
Removed Files:
	evolution-data-server-1.7.4-with-libdb-fix.patch 
Log Message:
- Update to 1.7.90.1
- Add patch for Gnome.org bug #348725.
- Remove patch to make --with-db configure option work (fixed upstream).


evolution-data-server-1.7.90.1-missing-function-decl.patch:
 e-gw-item.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE evolution-data-server-1.7.90.1-missing-function-decl.patch ---
--- evolution-data-server-1.7.90.1/servers/groupwise/e-gw-item.h.missing-function-decl	2006-07-25 22:22:13.000000000 -0400
+++ evolution-data-server-1.7.90.1/servers/groupwise/e-gw-item.h	2006-07-25 22:24:46.000000000 -0400
@@ -186,6 +186,7 @@
 void        e_gw_item_set_message (EGwItem *item, const char *new_message);
 const char *e_gw_item_get_place (EGwItem *item);
 void        e_gw_item_set_place (EGwItem *item, const char *new_place);
+void        e_gw_item_set_security (EGwItem *item, const char *new_class);
 gboolean    e_gw_item_get_completed (EGwItem *item);
 void        e_gw_item_set_completed (EGwItem *item, gboolean new_completed);
 gboolean    e_gw_item_get_is_allday_event (EGwItem *item);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	12 Jul 2006 12:10:10 -0000	1.46
+++ .cvsignore	26 Jul 2006 03:23:15 -0000	1.47
@@ -1 +1 @@
-evolution-data-server-1.7.4.tar.bz2
+evolution-data-server-1.7.90.1.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- evolution-data-server.spec	19 Jul 2006 17:25:58 -0000	1.102
+++ evolution-data-server.spec	26 Jul 2006 03:23:15 -0000	1.103
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.4
-Release: 2
+Version: 1.7.90.1
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -43,8 +43,8 @@
 
 Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
 
-# Gnome.org bug #344693
-Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+# Gnome.org bug #348725
+Patch17: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -128,7 +128,7 @@
 %patch14 -p0 -b .fix-uid-leak
 %patch15 -p0 -b .fix-comp-ref-leak
 %patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .with-libdb-fix
+%patch17 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -328,6 +328,11 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-1
+- Update to 1.7.90.1
+- Add patch for Gnome.org bug #348725.
+- Remove patch to make --with-db configure option work (fixed upstream).
+
 * Tue Jul 19 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-2
 - Dynamically link to BDB.
 - Add patch to make --with-db configure option work.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	12 Jul 2006 12:10:10 -0000	1.46
+++ sources	26 Jul 2006 03:23:15 -0000	1.47
@@ -1 +1 @@
-b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2
+07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2


--- evolution-data-server-1.7.4-with-libdb-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:25:37 -0400
Subject: rpms/redhat-artwork/devel .cvsignore, 1.74, 1.75 redhat-artwork.spec,
	1.137, 1.138 sources, 1.76, 1.77
Message-ID: <200607260325.k6Q3Pb5U005453@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5386

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
0.244



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- .cvsignore	5 May 2006 19:38:45 -0000	1.74
+++ .cvsignore	26 Jul 2006 03:25:35 -0000	1.75
@@ -11,3 +11,4 @@
 redhat-artwork-0.241.tar.gz
 redhat-artwork-0.242.tar.gz
 redhat-artwork-0.243.tar.gz
+redhat-artwork-0.244.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- redhat-artwork.spec	21 Jul 2006 22:36:53 -0000	1.137
+++ redhat-artwork.spec	26 Jul 2006 03:25:35 -0000	1.138
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.243
+Version: 0.244
 Release: 3%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -179,6 +179,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.244-1
+- Fix themeing of menuitems in Bluecurve (#180181)
+
 * Fri Jul 21 2006 John (J5) Palmieri <johnp at redhat.com> - 0.243-3
 - Remove gtk1.0 dependencies 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	5 May 2006 19:38:45 -0000	1.76
+++ sources	26 Jul 2006 03:25:35 -0000	1.77
@@ -1,4 +1,4 @@
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-93e969bb72985bd7ffaf4f6ec0881295  redhat-artwork-0.243.tar.gz
+bcf4152f7c7d6495ff554845f873a0ef  redhat-artwork-0.244.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:26:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:26:43 -0400
Subject: rpms/gnome-games/devel gnome-games.spec,1.83,1.84
Message-ID: <200607260326.k6Q3QhRG005940@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5831

Modified Files:
	gnome-games.spec 
Log Message:
- install new gconf schemas. rework the way we do it to be more
  future proof (bug 193777)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gnome-games.spec	25 Jul 2006 18:18:50 -0000	1.83
+++ gnome-games.spec	26 Jul 2006 03:26:41 -0000	1.84
@@ -14,7 +14,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.15.4
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -183,10 +183,26 @@
 %endif
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="%{sol_schemas} gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas %{bj_schemas} glines.schemas gnibbles.schemas gnomine.schemas %{gtali_schemas} mahjongg.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+(cd %{_sysconfdir}/gconf/schemas;   \
+gconftool-2 --makefile-install-rule \
+	%{sol_schemas}              \
+	%{bj_schemas}               \
+	gataxx.schemas              \
+	glines.schemas              \
+	gnect.schemas               \
+	gnibbles.schemas            \
+	gnobots2.schemas            \
+	gnometris.schemas           \
+	gnomine.schemas             \
+	gnotravex.schemas           \
+	gnotski.schemas             \
+	gtali.schemas               \
+	iagno.schemas               \
+	libgnomegames.schemas       \
+	mahjongg.schemas            \
+	same-gnome.schemas          \
+> /dev/null)
+
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -218,10 +234,29 @@
 %endif
 %{_datadir}/omf/gnome-games
 %{_datadir}/icons/hicolor/
-%{_sysconfdir}/gconf/schemas/*
 %config %{_sysconfdir}/sound/events/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
+%dir %{_sysconfdir}/gconf/schemas
+%if %{build_card}
+%{_sysconfdir}/gconf/schemas/aisleriot.schemas
+%{_sysconfdir}/gconf/schemas/blackjack.schemas
+%endif
+%{_sysconfdir}/gconf/schemas/gataxx.schemas
+%{_sysconfdir}/gconf/schemas/glines.schemas
+%{_sysconfdir}/gconf/schemas/gnect.schemas
+%{_sysconfdir}/gconf/schemas/gnibbles.schemas
+%{_sysconfdir}/gconf/schemas/gnobots2.schemas
+%{_sysconfdir}/gconf/schemas/gnometris.schemas
+%{_sysconfdir}/gconf/schemas/gnomine.schemas
+%{_sysconfdir}/gconf/schemas/gnotravex.schemas
+%{_sysconfdir}/gconf/schemas/gnotski.schemas
+%{_sysconfdir}/gconf/schemas/gtali.schemas
+%{_sysconfdir}/gconf/schemas/iagno.schemas
+%{_sysconfdir}/gconf/schemas/libgnomegames.schemas
+%{_sysconfdir}/gconf/schemas/mahjongg.schemas
+%{_sysconfdir}/gconf/schemas/same-gnome.schemas
+
 # these are not setgid games
 %{_bindir}/gnect
 %if %{build_card}
@@ -249,6 +284,10 @@
 
 
 %changelog
+* Tue Jul 25 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.4-3
+- install new gconf schemas. rework the way we do it to be more
+  future proof (bug 193777)
+
 * Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.4-2
 - Require librsvg2 (#191576)
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:26:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:26:48 -0400
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.138,1.139
Message-ID: <200607260326.k6Q3QmGE005994@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5923

Modified Files:
	redhat-artwork.spec 
Log Message:
0.244



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- redhat-artwork.spec	26 Jul 2006 03:25:35 -0000	1.138
+++ redhat-artwork.spec	26 Jul 2006 03:26:46 -0000	1.139
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.244
-Release: 3%{?dist} 
+Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:33:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:33:02 -0400
Subject: rpms/kernel/devel xen-fix_huge_timeouts.patch, NONE,
	1.1 kernel-2.6.spec, 1.2452, 1.2453
Message-ID: <200607260333.k6Q3X2k6007641@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7617

Modified Files:
	kernel-2.6.spec 
Added Files:
	xen-fix_huge_timeouts.patch 
Log Message:
workaround xen HV huge timeout bug

xen-fix_huge_timeouts.patch:
 schedule.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-fix_huge_timeouts.patch ---
diff -ur xen-10712/common/schedule.c xen/common/schedule.c
--- xen-10712/common/schedule.c	2006-07-15 16:59:55.000000000 +0200
+++ xen/common/schedule.c	2006-07-25 15:56:24.000000000 +0200
@@ -409,7 +409,7 @@
         DPRINTK("Warning: huge timeout set by domain %d (vcpu %d):"
                 " %"PRIx64"\n",
                 v->domain->domain_id, v->vcpu_id, (uint64_t)timeout);
-        send_timer_event(v);
+//        send_timer_event(v);
     }
     else
     {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2452
retrieving revision 1.2453
diff -u -r1.2452 -r1.2453
--- kernel-2.6.spec	26 Jul 2006 03:09:48 -0000	1.2452
+++ kernel-2.6.spec	26 Jul 2006 03:33:00 -0000	1.2453
@@ -456,6 +456,9 @@
 
 # Xen hypervisor patches
 
+# Don't hang with huge timeouts
+Patch20000: xen-fix_huge_timeouts.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -708,6 +711,10 @@
 cp -rl xen-%{xen_hv_cset} xen
 
 # Any necessary hypervisor patches go here
+cd xen
+%patch20000 -p1
+cd ..
+
 %endif
 
 cd linux-%{kversion}.%{_target_cpu}
@@ -1639,6 +1646,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
+- Workaround the huge timeouts problems on xen HV x86.
+
 * Tue Jul 25 2006 Rik van Riel <riel at redhat.com>
 - disable debug=y hypervisor build option because of stack overflow (#198932)
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 03:44:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 25 Jul 2006 23:44:29 -0400
Subject: rpms/evince/devel evince.spec,1.55,1.56
Message-ID: <200607260344.k6Q3iTeZ011143@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11062

Modified Files:
	evince.spec 
Log Message:
Don't ship an icon cache



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- evince.spec	19 Jul 2006 04:31:34 -0000	1.55
+++ evince.spec	26 Jul 2006 03:44:27 -0000	1.56
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.4
-Release:	2
+Release:	3
 Summary:	Document viewer
 
 License: 	GPL
@@ -54,12 +54,14 @@
 %find_lang %name
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 # Get rid of static libs and .la files.
-/bin/rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.a
-/bin/rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.la
+/bin/rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a
+/bin/rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
 
+# don't ship icon caches
+/bin/rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,6 +134,9 @@
 
 
 %changelog
+* Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-3
+- Don't ship an icon cache file
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-2
 - Rebuild against new dbus
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 04:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 00:08:51 -0400
Subject: rpms/kernel/devel linux-2.6-xen-execshield.patch, NONE,
	1.1 linux-2.6-xen-x86_64-add-ppoll-pselect.patch, NONE,
	1.1 linux-2.6-xen-x86_64-silence-up-apic-errors.patch, NONE,
	1.1 kernel-2.6.spec, 1.2453,
	1.2454 linux-2.6-xen-compile-fixes.patch, 1.13,
	1.14 linux-2.6-xen.patch, 1.41, 1.42
Message-ID: <200607260408.k6Q48pL6000698@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv520

Modified Files:
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen.patch 
Added Files:
	linux-2.6-xen-execshield.patch 
	linux-2.6-xen-x86_64-add-ppoll-pselect.patch 
	linux-2.6-xen-x86_64-silence-up-apic-errors.patch 
Log Message:
big xen update and reorganization/cleanup of patches

linux-2.6-xen-execshield.patch:
 arch/i386/kernel/cpu/common-xen.c         |    7 ++
 arch/i386/kernel/process-xen.c            |   60 +++++++++++++++++++
 arch/i386/kernel/smp-xen.c                |    3 
 arch/i386/kernel/traps-xen.c              |   94 +++++++++++++++++++++++++++++-
 arch/i386/mm/init-xen.c                   |    8 +-
 arch/x86_64/ia32/syscall32-xen.c          |    4 -
 arch/x86_64/kernel/process-xen.c          |    6 -
 arch/x86_64/kernel/setup64-xen.c          |   25 -------
 arch/x86_64/mm/fault-xen.c                |    2 
 include/asm-i386/mach-xen/asm/desc.h      |   14 ++++
 include/asm-i386/mach-xen/asm/mmu.h       |    4 +
 include/asm-i386/mach-xen/asm/pgalloc.h   |    1 
 include/asm-i386/mach-xen/asm/processor.h |    8 ++
 include/asm-x86_64/mach-xen/asm/pgalloc.h |    8 ++
 include/asm-x86_64/mach-xen/asm/pgtable.h |    2 
 15 files changed, 210 insertions(+), 36 deletions(-)

--- NEW FILE linux-2.6-xen-execshield.patch ---
diff -r 095d53b0d1a6 arch/i386/kernel/cpu/common-xen.c
--- a/arch/i386/kernel/cpu/common-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/i386/kernel/cpu/common-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -431,6 +431,13 @@ void __cpuinit 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;
diff -r 095d53b0d1a6 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/i386/kernel/process-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -528,6 +528,9 @@ struct task_struct fastcall * __switch_t
 	else BUG_ON(!(read_cr0() & 8));
 #endif
 
+	if (next_p->mm)
+		load_user_cs_desc(cpu, next_p->mm);
+
 	/*
 	 * Reload esp0.
 	 * This is load_esp0(tss, next) with a multicall.
@@ -810,3 +813,60 @@ 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) {
+			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 = PAGE_SIZE;
+
+	if (old_end == mm->context.exec_limit) {
+		for (vma = mm->mmap; vma; vma = vma->vm_next)
+			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
+				limit = vma->vm_end;
+
+		mm->context.exec_limit = limit;
+		set_user_cs(&mm->context.user_cs, limit);
+		if (mm == current->mm) {
+			preempt_disable();
+			load_user_cs_desc(smp_processor_id(), mm);
+			preempt_enable();
+		}
+	}
+}
+
+void arch_flush_exec_range(struct mm_struct *mm)
+{
+	mm->context.exec_limit = 0;
+	set_user_cs(&mm->context.user_cs, 0);
+}
+
+/*
+ * 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;
+
+	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 -r 095d53b0d1a6 arch/i386/kernel/smp-xen.c
--- a/arch/i386/kernel/smp-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/i386/kernel/smp-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -23,6 +23,7 @@
 
 #include <asm/mtrr.h>
 #include <asm/tlbflush.h>
+#include <asm/desc.h>
 #if 0
 #include <mach_apic.h>
 #endif
@@ -285,6 +286,8 @@ irqreturn_t smp_invalidate_interrupt(int
 	unsigned long cpu;
 
 	cpu = get_cpu();
+	if (current->active_mm)
+		load_user_cs_desc(cpu, current->active_mm);
 
 	if (!cpu_isset(cpu, flush_cpumask))
 		goto out;
diff -r 095d53b0d1a6 arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/i386/kernel/traps-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -558,11 +558,89 @@ DO_ERROR(11, SIGBUS,  "segment not prese
 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)
+
+
+/*
+ * lazy-check for CS validity on exec-shield binaries:
+ *
+ * the original non-exec stack patch was written by
+ * Solar Designer <solar at openwall.com>. Thanks!
+ */
+static int
+check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code)
+{
+	struct desc_struct *desc1, *desc2;
+	struct vm_area_struct *vma;
+	unsigned long limit;
+
+	if (current->mm == NULL)
+		return 0;
+
+	limit = -1UL;
+	if (current->mm->context.exec_limit != -1UL) {
+		limit = PAGE_SIZE;
+		spin_lock(&current->mm->page_table_lock);
+		for (vma = current->mm->mmap; vma; vma = vma->vm_next)
+			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
+				limit = vma->vm_end;
+		spin_unlock(&current->mm->page_table_lock);
+		if (limit >= TASK_SIZE)
+			limit = -1UL;
+		current->mm->context.exec_limit = limit;
+	}
+	set_user_cs(&current->mm->context.user_cs, limit);
+
+	desc1 = &current->mm->context.user_cs;
+	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
+
+	if (desc1->a != desc2->a || desc1->b != desc2->b) {
+		/*
+		 * The CS was not in sync - reload it and retry the
+		 * instruction. If the instruction still faults then
+		 * we won't hit this branch next time around.
+		 */
+		if (print_fatal_signals >= 2) {
+			printk("#GPF fixup (%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, CPU_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
+		}
+		load_user_cs_desc(cpu, current->mm);
+		return 1;
+	}
+
+	return 0;
+}
+
+/*
+ * The fixup code for errors in iret jumps to here (iret_exc).  It loses
+ * the original trap number and error code.  The bogus trap 32 and error
+ * code 0 are what the vanilla kernel delivers via:
+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
+ *
+ * In case of a general protection fault in the iret instruction, we
+ * need to check for a lazy CS update for exec-shield.
+ */
+fastcall void do_iret_error(struct pt_regs *regs, long 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) {
+		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);
+	}
+}
 
 fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 					      long error_code)
 {
+	int cpu = get_cpu();
+	int ok;
+
 	current->thread.error_code = error_code;
 	current->thread.trap_no = 13;
 
@@ -572,17 +650,31 @@ fastcall void __kprobes do_general_prote
 	if (!user_mode(regs))
 		goto gp_in_kernel;
 
+	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);
+	}
+
 	current->thread.error_code = error_code;
 	current->thread.trap_no = 13;
 	force_sig(SIGSEGV, current);
 	return;
 
 gp_in_vm86:
+	put_cpu();
 	local_irq_enable();
 	handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
 	return;
 
 gp_in_kernel:
+	put_cpu();
 	if (!fixup_exception(regs)) {
 		if (notify_die(DIE_GPF, "general protection fault", regs,
 				error_code, 13, SIGSEGV) == NOTIFY_STOP)
diff -r 095d53b0d1a6 arch/i386/mm/init-xen.c
--- a/arch/i386/mm/init-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/i386/mm/init-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -465,7 +465,7 @@ EXPORT_SYMBOL(__supported_pte_mask);
  * Control non executable mappings.
  *
  * on      Enable
- * off     Disable
+ * off     Disable (disables exec-shield too)
  */
 void __init noexec_setup(const char *str)
 {
@@ -475,6 +475,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;
 	}
 }
 
@@ -541,7 +542,10 @@ void __init paging_init(void)
 	set_nx();
 	if (nx_enabled)
 		printk("NX (Execute Disable) protection: active\n");
-#endif
+	else
+#endif
+	if (exec_shield)
+		printk("Using x86 segment limits to approximate NX protection\n");
 
 	pagetable_init();
 
diff -r 095d53b0d1a6 arch/x86_64/ia32/syscall32-xen.c
--- a/arch/x86_64/ia32/syscall32-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/ia32/syscall32-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -47,7 +47,9 @@ struct linux_binprm;
 struct linux_binprm;
 
 /* Setup a VMA at program startup for the vsyscall page */
-int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
+int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
+			  unsigned long start_code,
+			  unsigned long interp_map_address)
 {
 	int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
 	struct vm_area_struct *vma;
diff -r 095d53b0d1a6 arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/kernel/process-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -590,12 +590,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 -r 095d53b0d1a6 arch/x86_64/kernel/setup64-xen.c
--- a/arch/x86_64/kernel/setup64-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/kernel/setup64-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -55,7 +55,7 @@ on	Enable(default)
 on	Enable(default)
 off	Disable
 */ 
-int __init nonx_setup(char *str)
+void __init nonx_setup(char *str)
 {
 	if (!strncmp(str, "on", 2)) {
                 __supported_pte_mask |= _PAGE_NX; 
@@ -64,28 +64,7 @@ int __init nonx_setup(char *str)
 		do_not_nx = 1;
 		__supported_pte_mask &= ~_PAGE_NX;
         }
-	return 1;
-} 
-__setup("noexec=", nonx_setup);	/* parsed early actually */
-
-int force_personality32 = 0; 
-
-/* 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 1;
-}
-__setup("noexec32=", nonx32_setup);
+}
 
 /*
  * Great future plan:
diff -r 095d53b0d1a6 arch/x86_64/mm/fault-xen.c
--- a/arch/x86_64/mm/fault-xen.c	Tue Jul 25 21:53:33 2006 +0200
+++ b/arch/x86_64/mm/fault-xen.c	Tue Jul 25 23:02:25 2006 +0200
@@ -114,7 +114,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 -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/desc.h
--- a/include/asm-i386/mach-xen/asm/desc.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/desc.h	Tue Jul 25 23:02:25 2006 +0200
@@ -159,6 +159,20 @@ static inline unsigned long get_desc_bas
 	return base;
 }
 
+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;
+}
+
+#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 -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/mmu.h
--- a/include/asm-i386/mach-xen/asm/mmu.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/mmu.h	Tue Jul 25 23:02:25 2006 +0200
@@ -7,11 +7,15 @@
  * we put the segment information here.
  *
  * cpu_vm_mask is used to optimize ldt flushing.
+ * exec_limit is used to track the range PROT_EXEC
+ * mappings span.
  */
 typedef struct { 
 	int size;
 	struct semaphore sem;
 	void *ldt;
+	struct desc_struct user_cs;
+	unsigned long exec_limit;
 	void *vdso;
 } mm_context_t;
 
diff -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/pgalloc.h
--- a/include/asm-i386/mach-xen/asm/pgalloc.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/pgalloc.h	Tue Jul 25 23:02:25 2006 +0200
@@ -2,6 +2,7 @@
 #define _I386_PGALLOC_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 -r 095d53b0d1a6 include/asm-i386/mach-xen/asm/processor.h
--- a/include/asm-i386/mach-xen/asm/processor.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-i386/mach-xen/asm/processor.h	Tue Jul 25 23:02:25 2006 +0200
@@ -333,7 +333,10 @@ 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
+extern unsigned long arch_align_stack(unsigned long sp);
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
@@ -526,6 +529,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)
 
 /*
diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgalloc.h
--- a/include/asm-x86_64/mach-xen/asm/pgalloc.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-x86_64/mach-xen/asm/pgalloc.h	Tue Jul 25 23:02:25 2006 +0200
@@ -8,6 +8,14 @@
 #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
 
 #include <xen/features.h>
+
+#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)
+
 void make_page_readonly(void *va, unsigned int feature);
 void make_page_writable(void *va, unsigned int feature);
 void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);
diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgtable.h
--- a/include/asm-x86_64/mach-xen/asm/pgtable.h	Tue Jul 25 21:53:33 2006 +0200
+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h	Tue Jul 25 23:02:25 2006 +0200
@@ -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);
 

linux-2.6-xen-x86_64-add-ppoll-pselect.patch:
 ia32entry-xen.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-x86_64-add-ppoll-pselect.patch ---
diff -r ac10ebc851a5 arch/x86_64/ia32/ia32entry-xen.S
--- a/arch/x86_64/ia32/ia32entry-xen.S	Tue Jul 25 21:18:49 2006 +0200
+++ b/arch/x86_64/ia32/ia32entry-xen.S	Tue Jul 25 21:19:29 2006 +0200
@@ -730,8 +730,8 @@ ia32_sys_call_table:
 	.quad sys_readlinkat		/* 305 */
 	.quad sys_fchmodat
 	.quad sys_faccessat
-	.quad quiet_ni_syscall		/* pselect6 for now */
-	.quad quiet_ni_syscall		/* ppoll for now */
+	.quad compat_sys_pselect6
+	.quad compat_sys_ppoll
 	.quad sys_unshare		/* 310 */
 	.quad compat_sys_set_robust_list
 	.quad compat_sys_get_robust_list

linux-2.6-xen-x86_64-silence-up-apic-errors.patch:
 apic-xen.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-x86_64-silence-up-apic-errors.patch ---
diff -r 00cc4568f10f arch/x86_64/kernel/apic-xen.c
--- a/arch/x86_64/kernel/apic-xen.c	Tue Jul 25 21:07:37 2006 +0200
+++ b/arch/x86_64/kernel/apic-xen.c	Tue Jul 25 21:17:54 2006 +0200
@@ -174,7 +174,8 @@ asmlinkage void smp_error_interrupt(void
 	   6: Received illegal vector
 	   7: Illegal register address
 	*/
-	printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
+	if (num_online_cpus() > 1)
+		printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
 	        smp_processor_id(), v , v1);
 	irq_exit();
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2453
retrieving revision 1.2454
diff -u -r1.2453 -r1.2454
--- kernel-2.6.spec	26 Jul 2006 03:33:00 -0000	1.2453
+++ kernel-2.6.spec	26 Jul 2006 04:07:57 -0000	1.2454
@@ -319,11 +319,13 @@
 
 # 950 - 999 Xen
 Patch950: linux-2.6-xen.patch
-Patch951: linux-2.6-xen-compile-fixes.patch
-Patch955: linux-2.6-xen_remap_vma_flags.patch
-Patch960: linux-2.6-execshield-xen.patch
-Patch961: linux-2.6-xen-vdso-note.patch
-Patch962: linux-2.6-xen-utrace.patch
+Patch951: linux-2.6-xen-utrace.patch
+Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
+Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
+Patch954: linux-2.6-xen-execshield.patch
+
+Patch990: linux-2.6-xen-compile-fixes.patch
+Patch991: linux-2.6-xen_remap_vma_flags.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -808,7 +810,7 @@
 %if %{includexen}
 #
 # Apply the main xen patch...
-#
+#%patch951 -p1
 %patch950 -p1 -b .p.xen
 #
 # ... and back out all the ia64-specific sections, as they currently prevent
@@ -823,14 +825,16 @@
 # Delete the rest of the backup files, they just confuse the build later
 find -name "*.p.xen" | xargs rm -f
 
+# utrace
 %patch951 -p1
-%patch955 -p1
-
+%patch952 -p1
+%patch953 -p1
 # Xen exec-shield bits
-%patch960 -p1
-%patch961 -p1
-# utrace
-%patch962 -p1
+%patch954 -p1
+
+
+%patch990 -p1
+%patch991 -p1
 
 %endif
 
@@ -1648,6 +1652,7 @@
 %changelog
 * Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
 - Workaround the huge timeouts problems on xen HV x86.
+- xen update and cleanup/reorgatization of xen patches.
 
 * Tue Jul 25 2006 Rik van Riel <riel at redhat.com>
 - disable debug=y hypervisor build option because of stack overflow (#198932)

linux-2.6-xen-compile-fixes.patch:
 arch/i386/kernel/acpi/boot-xen.c                             |    3 ++-
 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c                |    2 ++
 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/processor.h |    2 ++
 linux-2.6.16.noarch/include/asm-x86_64/ipi.h                 |    2 ++
 5 files changed, 9 insertions(+), 1 deletion(-)

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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-xen-compile-fixes.patch	24 Jul 2006 00:43:28 -0000	1.13
+++ linux-2.6-xen-compile-fixes.patch	26 Jul 2006 04:08:13 -0000	1.14
@@ -1,90 +1,3 @@
-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;
- }
- 
-+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;
-+}
-+
-+#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/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)
- 
- /*
 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
@@ -96,35 +9,6 @@
  
  /* 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
@@ -137,17 +21,6 @@
  /* This decides where the kernel will search for a free chunk of vm
   * space during mmap's.
   */
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/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
 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
@@ -193,55 +66,3 @@
 +#endif
  
  #endif /* __ASM_IPI_H */
-diff -urNp linux-2.6.17.previous/arch/i386/kernel/Makefile linux-2.6.17.noarch/arch/i386/kernel/Makefile
---- linux-2.6.17.previous/arch/i386/kernel/Makefile	2006-07-19 16:27:09.000000000 +0200
-+++ linux-2.6.17.noarch/arch/i386/kernel/Makefile	2006-07-19 21:45:09.000000000 +0200
-@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
- obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o \
- 		ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
- 		pci-dma.o i386_ksyms.o i387.o bootflag.o \
--		quirks.o i8237.o topology.o alternative.o i8253.o
-+		quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
- 
- obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
- obj-y				+= cpu/
-@@ -37,7 +37,6 @@ 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_X86_TSC)		+= tsc.o
- obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
- obj-$(CONFIG_K8_NB)		+= k8.o
- obj-$(CONFIG_AUDIT)		+= audit.o
-diff -urNp linux-2.6.17.previous/arch/i386/kernel/time-xen.c linux-2.6.17.noarch/arch/i386/kernel/time-xen.c
---- linux-2.6.17.previous/arch/i386/kernel/time-xen.c	2006-07-19 16:27:09.000000000 +0200
-+++ linux-2.6.17.noarch/arch/i386/kernel/time-xen.c	2006-07-19 21:49:54.000000000 +0200
-@@ -164,7 +164,9 @@ static int __init __permitted_clock_jitt
- }
- __setup("permitted_clock_jitter=", __permitted_clock_jitter);
- 
-+#ifndef CONFIG_X86
- int tsc_disable __devinitdata = 0;
-+#endif
- 
- static void delay_tsc(unsigned long loops)
- {
-diff -urNp linux-2.6.17.previous/arch/i386/kernel/tsc.c linux-2.6.17.noarch/arch/i386/kernel/tsc.c
---- linux-2.6.17.previous/arch/i386/kernel/tsc.c	2006-07-19 16:27:02.000000000 +0200
-+++ linux-2.6.17.noarch/arch/i386/kernel/tsc.c	2006-07-19 21:49:03.000000000 +0200
-@@ -101,6 +101,7 @@ static inline unsigned long long cycles_
- 	return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR;
- }
- 
-+#ifndef CONFIG_XEN
- /*
-  * Scheduler clock - returns current time in nanosec units.
-  */
-@@ -124,6 +125,7 @@ unsigned long long sched_clock(void)
- 	/* return the value in ns */
- 	return cycles_2_ns(this_offset);
- }
-+#endif
- 
- static unsigned long calculate_cpu_khz(void)
- {

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Kconfig~                                  | 1242 ++++++++
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1096 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 409 files changed, 86392 insertions(+), 870 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.41 -r 1.42 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- linux-2.6-xen.patch	26 Jul 2006 00:47:12 -0000	1.41
+++ linux-2.6-xen.patch	26 Jul 2006 04:08:14 -0000	1.42
@@ -1,6 +1,6 @@
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
---- linux-2.6.18-rc2/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/boot-xen/Makefile	2006-07-23 00:15:23.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	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 --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
---- linux-2.6.18-rc2/arch/i386/Kconfig	2006-07-23 11:24:31.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-22 20:37:34.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig	2006-07-26 05:37:14.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -176,7 +176,15 @@
  	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
-@@ -808,18 +829,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
+@@ -792,6 +813,7 @@ config HOTPLUG_CPU
+ config COMPAT_VDSO
+ 	bool "Compat VDSO support"
+ 	default y
++	depends on !X86_XEN
+ 	help
+ 	  Map the VDSO to the predictable old-style address too.
+ 	---help---
+@@ -808,18 +830,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
  	depends on HIGHMEM
  
  menu "Power management options (ACPI, APM)"
@@ -200,7 +208,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -1004,6 +1027,7 @@ choice
+@@ -1004,6 +1028,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -208,7 +216,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -1011,6 +1035,13 @@ config PCI_GOMMCONFIG
+@@ -1011,6 +1036,13 @@ config PCI_GOMMCONFIG
  config PCI_GODIRECT
  	bool "Direct"
  
@@ -222,7 +230,7 @@
  config PCI_GOANY
  	bool "Any"
  
-@@ -1018,7 +1049,7 @@ endchoice
+@@ -1018,7 +1050,7 @@ endchoice
  
  config PCI_BIOS
  	bool
@@ -231,7 +239,7 @@
  	default y
  
  config PCI_DIRECT
-@@ -1031,6 +1062,18 @@ config PCI_MMCONFIG
+@@ -1031,6 +1063,18 @@ config PCI_MMCONFIG
  	depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
  	default y
  
@@ -250,7 +258,7 @@
  source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pci/Kconfig"
-@@ -1041,7 +1084,7 @@ config ISA_DMA_API
+@@ -1041,7 +1085,7 @@ config ISA_DMA_API
  
  config ISA
  	bool "ISA support"
@@ -259,7 +267,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
-@@ -1068,7 +1111,7 @@ config EISA
+@@ -1068,7 +1112,7 @@ config EISA
  source "drivers/eisa/Kconfig"
  
  config MCA
@@ -268,7 +276,7 @@
  	default y if X86_VOYAGER
  	help
  	  MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1144,6 +1187,8 @@ source "security/Kconfig"
+@@ -1144,6 +1188,8 @@ source "security/Kconfig"
  
  source "crypto/Kconfig"
  
@@ -277,7 +285,7 @@
  source "lib/Kconfig"
  
  #
-@@ -1169,7 +1214,7 @@ config X86_SMP
+@@ -1169,7 +1215,7 @@ config X86_SMP
  
  config X86_HT
  	bool
@@ -286,7 +294,7 @@
  	default y
  
  config X86_BIOS_REBOOT
-@@ -1182,6 +1227,16 @@ config X86_TRAMPOLINE
+@@ -1182,6 +1228,16 @@ config X86_TRAMPOLINE
  	depends on X86_SMP || (X86_VOYAGER && SMP)
  	default y
  
@@ -303,9 +311,1255 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
---- linux-2.6.18-rc2/arch/i386/Kconfig.cpu	2006-07-23 11:24:31.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~ compiling/arch/i386/Kconfig~
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/Kconfig~	2006-07-23 00:15:23.000000000 +0200
+@@ -0,0 +1,1242 @@
++#
++# For a description of the syntax of this configuration file,
++# see Documentation/kbuild/kconfig-language.txt.
++#
++
++mainmenu "Linux Kernel Configuration"
++
++config X86_32
++	bool
++	default y
++	help
++	  This is Linux's home port.  Linux was originally native to the Intel
++	  386, and runs on all the later x86 processors including the Intel
++	  486, 586, Pentiums, and various instruction-set-compatible chips by
++	  AMD, Cyrix, and others.
++
++config GENERIC_TIME
++	bool
++	depends on !X86_XEN
++	default y
++
++config LOCKDEP_SUPPORT
++	bool
++	depends on !X86_XEN
++	default y
++
++config STACKTRACE_SUPPORT
++	bool
++	default y
++
++config SEMAPHORE_SLEEPERS
++	bool
++	default y
++
++config X86
++	bool
++	default y
++
++config MMU
++	bool
++	default y
++
++config SBUS
++	bool
++
++config GENERIC_ISA_DMA
++	bool
++	default y
++
++config GENERIC_IOMAP
++	bool
++	default y
++
++config GENERIC_HWEIGHT
++	bool
++	default y
++
++config ARCH_MAY_HAVE_PC_FDC
++	bool
++	default y
[...6278 lines suppressed...]
+--- /mnt/ro/repos/hg/linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
++++ compiling/kernel/timer.c	2006-07-23 00:17:57.000000000 +0200
 @@ -554,6 +554,22 @@ found:
  	if (time_before(expires, jiffies))
  		return jiffies;
@@ -89199,9 +90446,9 @@
  	if (time_before(hr_expires, expires))
  		return hr_expires;
  
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
---- linux-2.6.18-rc2/lib/Kconfig.debug	2006-07-23 11:26:10.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-07-22 20:37:56.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
+--- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
++++ compiling/lib/Kconfig.debug	2006-07-23 00:17:57.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
@@ -89211,9 +90458,9 @@
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
---- linux-2.6.18-rc2/lib/Makefile	2006-07-23 11:26:10.000000000 +0200
-+++ linux-2.6-xen-fedora/lib/Makefile	2006-07-22 20:37:56.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
+--- /mnt/ro/repos/hg/linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
++++ compiling/lib/Makefile	2006-07-23 00:17:57.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -89224,9 +90471,9 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
---- linux-2.6.18-rc2/mm/highmem.c	2006-07-23 11:26:10.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
+--- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/mm/highmem.c	2006-07-23 00:17:57.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -89245,9 +90492,9 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
---- linux-2.6.18-rc2/mm/Kconfig	2006-07-23 11:26:10.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
+--- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
++++ compiling/mm/Kconfig	2006-07-23 00:17:57.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -89263,9 +90510,9 @@
  	default "4"
  
  #
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
---- linux-2.6.18-rc2/mm/memory.c	2006-07-23 11:26:10.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
+--- /mnt/ro/repos/hg/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
++++ compiling/mm/memory.c	2006-07-23 00:17:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -89406,9 +90653,9 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
---- linux-2.6.18-rc2/mm/mmap.c	2006-07-23 11:26:11.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
+--- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/mm/mmap.c	2006-07-23 00:17:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -89420,9 +90667,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
---- linux-2.6.18-rc2/mm/page_alloc.c	2006-07-23 11:26:11.000000000 +0200
-+++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
+--- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/mm/page_alloc.c	2006-07-23 00:17:58.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -89443,9 +90690,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
---- linux-2.6.18-rc2/net/core/dev.c	2006-07-23 11:26:12.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
+--- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/net/core/dev.c	2006-07-23 00:46:36.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -89544,9 +90791,9 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
---- linux-2.6.18-rc2/net/core/pktgen.c	2006-07-23 11:26:13.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
+--- /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
++++ compiling/net/core/pktgen.c	2006-07-23 00:17:59.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -89556,9 +90803,9 @@
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
---- linux-2.6.18-rc2/net/core/skbuff.c	2006-07-23 11:26:13.000000000 +0200
-+++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
+--- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
++++ compiling/net/core/skbuff.c	2006-07-23 00:17:59.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -89645,9 +90892,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 11:26:14.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -89662,9 +90909,9 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
---- linux-2.6.18-rc2/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 11:26:14.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -89679,9 +90926,9 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
---- linux-2.6.18-rc2/net/ipv4/xfrm4_output.c	2006-07-23 11:26:14.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
++++ compiling/net/ipv4/xfrm4_output.c	2006-07-23 00:18:03.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -89702,9 +90949,9 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
---- linux-2.6.18-rc2/net/ipv6/addrconf.c	2006-07-23 11:26:15.000000000 +0200
-+++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+--- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
++++ compiling/net/ipv6/addrconf.c	2006-07-23 00:18:03.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -89721,9 +90968,9 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff --exclude='.hg*' -urNp linux-2.6.18-rc2/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
---- linux-2.6.18-rc2/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
+diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
+--- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ compiling/scripts/Makefile.xen	2006-07-23 00:18:07.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Wed Jul 26 04:09:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 00:09:54 -0400
Subject: rpms/cpuspeed/devel cpuspeed.init, 1.11, 1.12 cpuspeed.spec, 1.38,
	1.39
Message-ID: <200607260409.k6Q49sE4000884@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv849

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
- Fix up retval & /var/lock/subsys/cpuspeed handling in initscript.



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cpuspeed.init	20 Jul 2006 20:07:55 -0000	1.11
+++ cpuspeed.init	26 Jul 2006 04:09:51 -0000	1.12
@@ -44,8 +44,8 @@
 			do
 				echo ondemand > $i/cpufreq/scaling_governor
 			done
+			RETVAL=0
 			;;
-
 		*)
 			echo -n $"Starting $prog: "
 			daemon cpuspeed -d $OPTS
@@ -53,7 +53,6 @@
 			echo
 			[ $RETVAL = 0 ] && touch /var/lock/subsys/cpuspeed
 		esac
-
 	else
 		return 0
 	fi
@@ -61,17 +60,26 @@
 }
 
 stop() {
-	if test "x`pidof cpuspeed`" != x; then
-		echo -n $"Stopping $prog: "
-		killproc cpuspeed -USR1
-		killproc cpuspeed -INT
-		echo
-	fi
-	if test "x`pidof cpuspeed`" != x; then
-		killproc cpuspeed
-	fi
-	RETVAL=$?
-	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/cpuspeed
+	drv=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver)
+	case "$drv" in
+	centrino|powernow-k8)
+		/sbin/rmmod cpufreq-ondemand
+		RETVAL=0
+		;;
+	*)
+		if test "x`pidof cpuspeed`" != x; then
+			echo -n $"Stopping $prog: "
+			killproc cpuspeed -USR1
+			killproc cpuspeed -INT
+			echo
+		fi
+		if test "x`pidof cpuspeed`" != x; then
+			killproc cpuspeed
+		fi
+		RETVAL=$?
+		[ $RETVAL = 0 ] && rm -f /var/lock/subsys/cpuspeed
+	esac
+
 	return $RETVAL
 }
 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cpuspeed.spec	20 Jul 2006 20:07:55 -0000	1.38
+++ cpuspeed.spec	26 Jul 2006 04:09:51 -0000	1.39
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
+- Fix up retval & /var/lock/subsys/cpuspeed handling in initscript.
+
 * Thu Jul 20 2006 Jim Paradis <jparadis at redhat.com>
 - Enable on-demand governor usage for powernow-k8 as well as centrino
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 04:10:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 00:10:38 -0400
Subject: rpms/kernel/devel linux-2.6-execshield-xen.patch, 1.7,
	NONE linux-2.6-xen-move-vdso-fixmap.patch, 1.3,
	NONE linux-2.6-xen-vdso-note.patch, 1.2,
	NONE linux-2.6-xen-vsyscall_base.patch, 1.4, NONE
Message-ID: <200607260410.k6Q4AbGo001039@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv945

Removed Files:
	linux-2.6-execshield-xen.patch 
	linux-2.6-xen-move-vdso-fixmap.patch 
	linux-2.6-xen-vdso-note.patch 
	linux-2.6-xen-vsyscall_base.patch 
Log Message:
remove old xen patches


--- linux-2.6-execshield-xen.patch DELETED ---


--- linux-2.6-xen-move-vdso-fixmap.patch DELETED ---


--- linux-2.6-xen-vdso-note.patch DELETED ---


--- linux-2.6-xen-vsyscall_base.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 26 04:30:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 00:30:51 -0400
Subject: rpms/libgnomeui/devel libgnomeui-2.15.2-undead-code.patch, NONE,
	1.1 libgnomeui.spec, 1.50, 1.51
Message-ID: <200607260430.k6Q4Up09018865@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18835

Modified Files:
	libgnomeui.spec 
Added Files:
	libgnomeui-2.15.2-undead-code.patch 
Log Message:
Fix GnomeIconList


libgnomeui-2.15.2-undead-code.patch:
 gnome-icon-list.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE libgnomeui-2.15.2-undead-code.patch ---
--- libgnomeui-2.15.2/libgnomeui/gnome-icon-list.c.undead-code	2006-07-26 00:30:18.000000000 -0400
+++ libgnomeui-2.15.2/libgnomeui/gnome-icon-list.c	2006-07-26 00:31:38.000000000 -0400
@@ -1082,6 +1082,7 @@
 	priv = gil->_priv;
 
 	g_array_append_val(priv->icon_list, icon);
+	priv->icons++;
 
 	switch (priv->selection_mode) {
 	case GTK_SELECTION_BROWSE:


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libgnomeui.spec	12 Jul 2006 19:24:41 -0000	1.50
+++ libgnomeui.spec	26 Jul 2006 04:30:47 -0000	1.51
@@ -18,9 +18,10 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.15.2
-Release: 1
+Release: 2
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
+Patch0: libgnomeui-2.15.2-undead-code.patch
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -116,6 +117,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .undead-code
 
 %build
 %configure --disable-gtk-doc
@@ -162,6 +164,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
+- Make GnomeIconList work again
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-1
 - Update to 2.15.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 04:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 00:35:46 -0400
Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch, 1.9,
	1.10 eclipse.spec, 1.306, 1.307 eclipse-tomcat55-build.2.patch,
	1.4, NONE eclipse-tomcat55-build.3.patch, 1.4, NONE
Message-ID: <200607260435.k6Q4ZklZ019460@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19421

Modified Files:
	eclipse-tomcat55-build.patch eclipse.spec 
Removed Files:
	eclipse-tomcat55-build.2.patch eclipse-tomcat55-build.3.patch 
Log Message:
Use sed instead of patches for tomcat version numbers.

eclipse-tomcat55-build.patch:
 build.xml |   94 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 50 insertions(+), 44 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-tomcat55-build.patch	6 Jul 2006 18:22:19 -0000	1.9
+++ eclipse-tomcat55-build.patch	26 Jul 2006 04:35:40 -0000	1.10
@@ -1,14 +1,5 @@
 --- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
 +++ build.xml	2006-07-05 12:50:49.000000000 -0400
-@@ -58,7 +58,7 @@
- 		<antcall target="gather.bin.parts">
- 			<param name="destination.temp.folder" value="${temp.folder}/"/>
- 		</antcall>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" filesonly="false" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
 @@ -144,50 +144,56 @@
  			<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
  			<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
@@ -110,61 +101,3 @@
  		</path>
  		<!-- compile the source code -->
  		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-@@ -224,37 +230,37 @@
- 	</target>
- 
- 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
- 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
- 		</copy>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
- 		</copy>
--		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
-+		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" version="5.5.17.v20060601"/>
- 	</target>
- 
- 	<target name="build.zips" depends="init">
- 	</target>
- 
- 	<target name="gather.sources" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
--		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.130.v20060601"/>
--		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.130.v20060601.jar"/>
--		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
-@@ -277,7 +283,7 @@
- 		<delete>
- 			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
- 		</delete>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- eclipse.spec	24 Jul 2006 02:50:47 -0000	1.306
+++ eclipse.spec	26 Jul 2006 04:35:40 -0000	1.307
@@ -41,7 +41,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/
@@ -106,8 +106,6 @@
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
 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
 Patch56: 	%{name}-webapp-tomcat55-newarches.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 
@@ -405,8 +403,10 @@
 %patch28 -p0
 %patch29 -p0
 popd
-%patch30 -p0
-%patch50 -p1
+sed --in-place "s/4.1.130/5.5.17/"                      \
+                features/org.eclipse.platform/build.xml \
+                plugins/org.eclipse.tomcat/build.xml    \
+                assemble.*.xml
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
@@ -1634,6 +1634,9 @@
 %endif
 
 %changelog
+* Tue Jul 25 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_9fc
+- Use sed instead of patches for tomcat version numbers.
+
 * Sun Jul 23 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_8fc
 - Disable build.index doc generation on i386.
 


--- eclipse-tomcat55-build.2.patch DELETED ---


--- eclipse-tomcat55-build.3.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Jul 26 06:26:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 02:26:26 -0400
Subject: rpms/rhgb/devel rhgb.spec,1.55,1.56
Message-ID: <200607260626.k6Q6QQwo027576@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27539

Modified Files:
	rhgb.spec 
Log Message:
* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.16.3-5
- Bump libxf86config-devel dep to ensure the fix for (#198653) is present.
- Ensure the package has ownership of the dirs it creates.
- Use Fedora Extras style BuildRoot tag.



Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- rhgb.spec	12 Jul 2006 07:58:58 -0000	1.55
+++ rhgb.spec	26 Jul 2006 06:26:23 -0000	1.56
@@ -3,16 +3,16 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.3
-Release: 4.1
+Release: 5%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: s390 s390x ppc64
 BuildRequires: vte-devel
 BuildRequires: gettext
-BuildRequires: libxf86config-devel >= 1.0.0-3
+BuildRequires: libxf86config-devel >= 1.1.1-7
 Requires: initscripts >= 7.22-1
 Requires: system-logos
 
@@ -62,14 +62,20 @@
 
 %files -f %{gettext_package}.lang
 %defattr(-,root,root)
-
+%doc doc/HOW_IT_WORKS
 %{_bindir}/*
+%dir %{_datadir}/rhgb
 %{_datadir}/rhgb
-/etc/rhgb
-/etc/rhgb/temp
-%doc doc/HOW_IT_WORKS
+%dir %{_sysconfdir}/rhgb
+%{_sysconfdir}/rhgb/*
+%dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.16.3-5
+- Bump libxf86config-devel dep to ensure the fix for (#198653) is present.
+- Ensure the package has ownership of the dirs it creates.
+- Use Fedora Extras style BuildRoot tag.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.16.3-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 07:38:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 03:38:03 -0400
Subject: rpms/pyxf86config/devel pyxf86config.spec,1.31,1.32
Message-ID: <200607260738.k6Q7c3jD014149@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14120

Modified Files:
	pyxf86config.spec 
Log Message:
* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.3.27-2.fc6
- Remove dependency on xorg-x11-server-sdk, and replace it with correct dep
  on "libxf86config-devel >= 1.1.1-7", and rebuild in order to pick up
  necessary fixes in the static library.
- Use Fedora Extras style BuildRoot tag.
- Use {?dist} tag in Release



Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pyxf86config.spec	25 Jul 2006 19:31:39 -0000	1.31
+++ pyxf86config.spec	26 Jul 2006 07:38:00 -0000	1.32
@@ -3,18 +3,19 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.27
-Release: 1
+Release: 2%{?dist}
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: glib2
 Requires: python-abi = %{pyver}
 BuildRequires: glib2-devel
 BuildRequires: libX11-devel
 BuildRequires: python-devel
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: libxf86config-devel >= 1.1.1-7
+
 ExcludeArch: s390 s390x
 
 %description
@@ -44,6 +45,13 @@
 
 
 %changelog
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.3.27-2.fc6
+- Remove dependency on xorg-x11-server-sdk, and replace it with correct dep
+  on "libxf86config-devel >= 1.1.1-7", and rebuild in order to pick up
+  necessary fixes in the static library.
+- Use Fedora Extras style BuildRoot tag.
+- Use {?dist} tag in Release
+
 * Tue Jul 25 2006 Chris Lumens <clumens at redhat.com> 0.3.27-1
 - Remove gigantic keyboard comment.
 - Don't write out an empty modules section.



From fedora-cvs-commits at redhat.com  Wed Jul 26 07:56:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 03:56:45 -0400
Subject: rpms/xterm/devel xterm.spec,1.46,1.47
Message-ID: <200607260756.k6Q7uju3010244@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10231

Modified Files:
	xterm.spec 
Log Message:
* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 215-2.fc6
- Replace BuildRequires utempter with libutempter-devel
- Change BuildRoot tag to comply with Fedora packaging guidelines
- Use pkg-config to autodetect the location of the system app-defaults dir
- Add BuildRequires: pkgconfig



Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xterm.spec	17 Jul 2006 22:19:56 -0000	1.46
+++ xterm.spec	26 Jul 2006 07:56:43 -0000	1.47
@@ -1,16 +1,18 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 215
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 #Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
 #         ^-  now shipped in upstream source tarball
 Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz
 Source3: ftp://invisible-island.net/xterm/16colors.txt
+
 Patch0: xterm-can-2003-0063.patch
 Patch1: xterm-resources-redhat.patch
 Patch2: xterm-179-ppc-fix-bug-101472.patch
@@ -27,6 +29,8 @@
 Patch13: xterm-212-redhat-resources.patch
 Patch14: xterm-212-man-page_paths.patch
 Patch15: xterm-213-bz189161.patch
+
+BuildRequires: pkgconfig
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -43,7 +47,7 @@
 BuildRequires: expat-devel
 BuildRequires: zlib-devel
 BuildRequires: libtermcap-devel
-BuildRequires: utempter
+BuildRequires: libutempter-devel
 
 %{?!DEBUGINFO:     %define DEBUGINFO    1}
 %{?!enable_trace:  %define enable_trace 0}
@@ -51,7 +55,8 @@
 %define debug_package %{nil}
 %endif
 
-%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
+%define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
+
 %{?!_with_256_color: %define _with_256_color 1}
 %{?!_with_tek4014: %define _with_tek4014 1}
 
@@ -128,10 +133,11 @@
 %endif
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 %{_bindir}/resize
 %{_bindir}/uxterm
 %{_bindir}/xterm
@@ -140,9 +146,14 @@
 %{x11_app_defaults_dir}/UXTerm
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm-color
-%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 215-2.fc6
+- Replace BuildRequires utempter with libutempter-devel
+- Change BuildRoot tag to comply with Fedora packaging guidelines
+- Use pkg-config to autodetect the location of the system app-defaults dir
+- Add BuildRequires: pkgconfig
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 215-1.fc6
 - Upgrade to upstream version 215
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 08:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 04:24:30 -0400
Subject: rpms/utempter/devel utempter.spec,1.16,1.17
Message-ID: <200607260824.k6Q8OUQm008251@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/utempter/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8213

Modified Files:
	utempter.spec 
Log Message:
* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.5.5-8
- Add utempter-devel subpackage for (#193190)
- Change BuildRoot to comply with Fedora packaging policies
- Add Provides: libutempter to runtime package, and Provides: libutempter-devel
  to devel subpackage to help ease transition from utempter to the new
  libutempter package which will replace this one soon.
- Replace PreReq usage with more detailed Requires(<script>) deps.



Index: utempter.spec
===================================================================
RCS file: /cvs/dist/rpms/utempter/devel/utempter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- utempter.spec	12 Jul 2006 08:38:50 -0000	1.16
+++ utempter.spec	26 Jul 2006 08:24:28 -0000	1.17
@@ -1,12 +1,18 @@
 Summary:   A privileged helper for utmp/wtmp updates.
 Name:      utempter
 Version:   0.5.5
-Release: 7.2.2
+Release:   8
 License:   MIT/LGPL
-Group:     System Environment/Base
+Group:     System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source:    utempter-%{version}.tar.gz
-Prereq:    /usr/sbin/groupadd, /sbin/ldconfig, fileutils
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+Requires(pre): /usr/sbin/groupadd
+Requires(post): /sbin/ldconfig fileutils
+Requires(postun): /sbin/ldconfig
+
+Provides: libutempter = %{version}-%{release}
 
 %description
 Utempter is a utility which allows some non-privileged programs to
@@ -14,6 +20,17 @@
 security. Utempter accomplishes this feat by acting as a buffer
 between root and the programs.
 
+%package devel
+Summary: utempter development
+Group: Development/Libraries
+Provides: libutempter-devel = %{version}-%{release}
+
+%description devel
+Utempter is a utility which allows some non-privileged programs to
+have required root access without compromising system
+security. Utempter accomplishes this feat by acting as a buffer
+between root and the programs.
+
 %prep
 %setup  -q
 
@@ -49,17 +66,29 @@
 %defattr(-,root,root)
 %attr(02755, root, utmp) %{_sbindir}/utempter
 %doc COPYING
-%{_libdir}/libutempter.so*
+%{_libdir}/libutempter.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libutempter.so
 %{_includedir}/utempter.h
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2.2
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 0.5.5-8
+- Add utempter-devel subpackage for (#193190)
+- Change BuildRoot to comply with Fedora packaging policies
+- Add Provides: libutempter to runtime package, and Provides: libutempter-devel
+  to devel subpackage to help ease transition from utempter to the new
+  libutempter package which will replace this one soon.
+- Replace PreReq usage with more detailed Requires(<script>) deps.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 0.5.5-7.2.2
 - rebuild
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2.1
+* 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
+* 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>



From fedora-cvs-commits at redhat.com  Wed Jul 26 09:11:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 05:11:21 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch, NONE,
	1.1 openoffice.org.spec, 1.794, 1.795
Message-ID: <200607260911.k6Q9BJ67003349@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3284

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch 
Log Message:
openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch

openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch:
 source/dialog/cfg.cxx     |    0 
 svx/source/dialog/cfg.cxx |    3 +++
 2 files changed, 3 insertions(+)

--- NEW FILE openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch ---
Index: source/dialog/cfg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/cfg.cxx,v
retrieving revision 1.32
diff -u -r1.32 cfg.cxx
--- openoffice.org.orig/svx/source/dialog/cfg.cxx	28 Feb 2006 12:53:48 -0000	1.32
+++ openoffice.org/svx/source/dialog/cfg.cxx	26 Jul 2006 08:58:29 -0000
@@ -1705,6 +1705,9 @@
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     aDescriptionField.SetAutoScroll( TRUE );
     aDescriptionField.EnableCursor( FALSE );
+
+    aMoveUpButton.Enable( FALSE );
+    aMoveDownButton.Enable( FALSE );
 }
 
 SvxConfigPage::~SvxConfigPage()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- openoffice.org.spec	25 Jul 2006 18:30:47 -0000	1.794
+++ openoffice.org.spec	26 Jul 2006 09:11:15 -0000	1.795
@@ -123,6 +123,7 @@
 Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 Patch59: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch60: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -873,6 +874,7 @@
 %patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
 %patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
 %patch59 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch60 -p1 -b .ooo67779.svx.toolbarcrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3349,6 +3351,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
+- rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
+
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
 - rh#199664# -> openoffice.org-2.0.3.ooo67644.sw.spacing.patch, dialog spacing



From fedora-cvs-commits at redhat.com  Wed Jul 26 09:38:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 05:38:46 -0400
Subject: rpms/wireshark/FC-5 wireshark.spec,1.6,1.7
Message-ID: <200607260938.k6Q9cjNk025810@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/wireshark/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25778

Modified Files:
	wireshark.spec 
Log Message:
- fix BuildRequires


Index: wireshark.spec
===================================================================
RCS file: /cvs/dist/rpms/wireshark/FC-5/wireshark.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wireshark.spec	25 Jul 2006 14:54:32 -0000	1.6
+++ wireshark.spec	26 Jul 2006 09:38:38 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.2
-Release: 	fc5.1
+Release: 	fc5.2
 License: 	GPL
 Group: 		Applications/Internet
 Source0:	http://www.wireshark.org/download/prerelease/%{name}-%{version}.tar.gz
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Wed Jul 26 2006 Radek Vokal <rvokal at redhat.com> 0.99.2-fc5.2
+- fix BuildRequires
+
 * Tue Jul 25 2006 Radek Vokal <rvokal at redhat.com> 0.99.2-fc5.1
 - build for FC5
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 10:35:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 06:35:35 -0400
Subject: rpms/minicom/devel minicom-2.1-debug.patch, NONE, 1.1 minicom.spec,
	1.22, 1.23
Message-ID: <200607261035.k6QAZZI4016637@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/minicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16605

Modified Files:
	minicom.spec 
Added Files:
	minicom-2.1-debug.patch 
Log Message:
removed unnecessary debug output (#199707)

minicom-2.1-debug.patch:
 minicom.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE minicom-2.1-debug.patch ---
--- minicom-2.1/src/minicom.c.old	2006-07-24 14:41:37.000000000 +0200
+++ minicom-2.1/src/minicom.c	2006-07-26 12:25:24.000000000 +0200
@@ -998,7 +998,7 @@
       if (lang != NULL) {
 	unsigned int j = 0;
 	for (; j < sizeof(l)/sizeof(*l); j++) {
-	  printf("%s/%s\n", v[i], l[j]);
+	  //printf("%s/%s\n", v[i], l[j]);
 	  if (!strncmp(lang, l[j], strlen(l[j]))) {
 	    args[argk++] = "-8";
 	    done = 1;


Index: minicom.spec
===================================================================
RCS file: /cvs/dist/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- minicom.spec	18 Jul 2006 13:17:38 -0000	1.22
+++ minicom.spec	26 Jul 2006 10:35:33 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
 Version: 2.1
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
@@ -25,6 +25,7 @@
 Patch13: minicom-2.00.0-gotodir.patch
 Patch14: minicom-2.00.0-offby1.patch
 Patch15: minicom-2.00.0-gcc4.patch
+Patch16: minicom-2.1-debug.patch
 
 %description
 Minicom is a simple text-based modem control and terminal emulation
@@ -43,6 +44,7 @@
 %patch13 -p1 -b .gotodir
 %patch14 -p1 -b .offby1
 %patch15 -p1 -b .gcc4
+%patch16 -p1
 
 
 %build
@@ -81,6 +83,9 @@
 %endif
 
 %changelog
+* Tue Jul 18 2006 Martin Stransky <stransky at redhat.com> 2.1-3
+- removed unnecessary debug output (#199707)
+
 * Tue Jul 18 2006 Martin Stransky <stransky at redhat.com> 2.1-2
 - added ncurses-devel to BuildPrereq
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 10:47:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 06:47:04 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.2,
	1.3 openoffice.org.spec, 1.795, 1.796
Message-ID: <200607261047.k6QAl4GU031618@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31601

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
	openoffice.org.spec 
Log Message:
fix stuff to not link against -lgcj

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 4 files changed, 9 insertions(+), 5 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	25 Jul 2006 10:15:22 -0000	1.2
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	26 Jul 2006 10:47:01 -0000	1.3
@@ -1,15 +1,25 @@
 --- openoffice.org.orig/config_office/configure.in	2006-07-20 20:38:59.000000000 +0100
 +++ openoffice.org/config_office/configure.in	2006-07-20 20:41:08.000000000 +0100
-@@ -2236,7 +2236,8 @@
+@@ -2064,7 +2064,9 @@
+       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
+         JDK=gcj
+         AC_MSG_RESULT([checked (gcj)]) 
+-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
++        if test -z "$JAVA_HOME"; then
++         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
++        fi
+       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
+         JDK=bea
+ 
+@@ -2236,7 +2238,7 @@
        AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB=-ljawt ] )
     fi
     if test -z "$AWTLIB"; then
 -      AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
 +      AC_MSG_WARN([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
-+      AWTLIB="-ljawt"
+       AWTLIB="-ljawt"
     fi
     AC_SUBST(AWTLIB)
- 
 Index: native/unix/makefile.mk
 ===================================================================
 RCS file: /cvs/api/bean/native/unix/makefile.mk,v
@@ -17,16 +27,19 @@
 diff -u -r1.7 makefile.mk
 --- openoffice.org.orig/bean/native/unix/makefile.mk	16 Jun 2005 14:38:39 -0000	1.7
 +++ openoffice.org/bean/native/unix/makefile.mk	21 Jul 2006 08:58:02 -0000
-@@ -27,7 +27,8 @@
- 
+@@ -28,9 +28,9 @@
  SHL1TARGET=$(TARGET)
  SHL1LIBS=	$(SLB)$/$(TARGET).lib
--SHL1STDLIBS=$(AWTLIB)
-+SHL1STDLIBS=-L/usr/lib/gcj-4.1.1 $(AWTLIB)
-+SHL1NOCHECK=yes
- .IF "$(JDK)" == "gcj"
- SHL1STDLIBS+=-lgcj
- .ENDIF
+ SHL1STDLIBS=$(AWTLIB)
+-.IF "$(JDK)" == "gcj"
+-SHL1STDLIBS+=-lgcj
+-.ENDIF
++#.IF "$(JDK)" == "gcj"
++#SHL1STDLIBS+=-lgcj
++#.ENDIF
+ 
+ .IF "$(OS)" == "LINUX"
+ .IF "$(CPUNAME)" == "S390"
 --- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:37:37.000000000 +0100
 +++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:40:28.000000000 +0100
 @@ -69,9 +69,11 @@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- openoffice.org.spec	26 Jul 2006 09:11:15 -0000	1.795
+++ openoffice.org.spec	26 Jul 2006 10:47:01 -0000	1.796
@@ -3361,7 +3361,7 @@
 - rh#199665# -> openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 - rh#199894# -> openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 - rh#199870# ->openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-- rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+- rh#199907# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 - drop openoffice.org.2.0.3-gcc28409.anonymousexternc.patch



From fedora-cvs-commits at redhat.com  Wed Jul 26 11:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 07:20:20 -0400
Subject: rpms/evolution/devel .cvsignore, 1.51, 1.52 evolution.spec, 1.166,
	1.167 sources, 1.51, 1.52
Message-ID: <200607261120.k6QBKKok028196@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28084

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
- Update to 2.7.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	12 Jul 2006 22:10:15 -0000	1.51
+++ .cvsignore	26 Jul 2006 11:20:17 -0000	1.52
@@ -1 +1 @@
-evolution-2.7.4.tar.bz2
+evolution-2.7.90.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- evolution.spec	19 Jul 2006 15:28:55 -0000	1.166
+++ evolution.spec	26 Jul 2006 11:20:17 -0000	1.167
@@ -47,8 +47,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.4
-Release: 3
+Version: 2.7.90
+Release: 1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -91,7 +91,7 @@
 Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch22: evolution-2.6.0-prototypes.patch
 
-# Gnome.org #343331
+# Gnome.org bug #343331
 Patch23: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
@@ -630,6 +630,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
+- Update to 2.7.90
+
 * Tue Jul 18 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-3
 - Clean up spec file, renumber patches.
 - Add BuildRequires for dbus-glib-devel.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	12 Jul 2006 22:10:15 -0000	1.51
+++ sources	26 Jul 2006 11:20:17 -0000	1.52
@@ -1 +1 @@
-5d9770b3d86953e8edcd36ec9f9b8852  evolution-2.7.4.tar.bz2
+aae1aac8c521aef1aa9dbb1aed9a9f6e  evolution-2.7.90.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 11:54:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 07:54:22 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-Red-Hat-extramodes.patch,
	1.1, 1.2 xorg-x11-server.spec, 1.133, 1.134
Message-ID: <200607261154.k6QBsM3h021250@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21214

Modified Files:
	xorg-x11-server-Red-Hat-extramodes.patch xorg-x11-server.spec 
Log Message:
* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-12.fc6
- Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
- Sorted the extramodes file by X res, then Y res for ease of maintenance.


xorg-x11-server-Red-Hat-extramodes.patch:
 extramodes |  137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 135 insertions(+), 2 deletions(-)

Index: xorg-x11-server-Red-Hat-extramodes.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-Red-Hat-extramodes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-Red-Hat-extramodes.patch	24 Jul 2006 07:36:25 -0000	1.1
+++ xorg-x11-server-Red-Hat-extramodes.patch	26 Jul 2006 11:54:20 -0000	1.2
@@ -1,34 +1,17 @@
---- xorg-server-1.0.1/hw/xfree86/common/extramodes.Red-Hat-extramodes	2004-04-23 15:53:57.000000000 -0400
-+++ xorg-server-1.0.1/hw/xfree86/common/extramodes	2006-03-06 15:09:19.000000000 -0500
-@@ -10,14 +10,23 @@
- # 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
- 
--# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
--Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -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
-+
-+# 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
+Please keep the modes in the extramodes file sorted by the X resolution, then
+by the Y resolution for readability and ease of maintenance.
+
+--- hw/xfree86/common/extramodes.Red-Hat-extramodes	2006-07-05 14:31:40.000000000 -0400
++++ hw/xfree86/common/extramodes	2006-07-26 07:52:01.000000000 -0400
+@@ -3,21 +3,143 @@
+ //
+ // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
+ //
++// NOTE:  Please keep all video modes sorted in order of X res, then Y res for
++//        ease of maintenance and readability.
  
- # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
- Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-@@ -31,3 +40,114 @@
- # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
- Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
+ # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
+ ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -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
@@ -42,6 +25,9 @@
 +# 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
 +
+ # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
+ ModeLine "1152x768"   64.995 1152 1178 1314 1472  768  771  777  806 +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
 +
@@ -54,18 +40,23 @@
 +# 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
 +
++# 1152x864 @ 85Hz (Red Hat custom modeline)
++ModeLine "1152x864"  121.5 1152 1216 1344 1568    864  865  868  911 +hsync -vsync
++
 +# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
 +Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -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
++# 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
 +
-+# 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
++# 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
 +
-+# 1440x900 @ 60.00 Hz (CVT)
-+#   field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
-+Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -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
 +
 +# 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
@@ -79,6 +70,44 @@
 +# 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
 +
++# 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
++
+ # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +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 @ 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
+ 
+-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
+-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -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
++
++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
++ModeLine "1400x1050" 184.0 1400 1464 1656 1960   1050 1051 1054 1100 +hsync +vsync
++
++# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
++Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -HSync +Vsync
++
++# 1600x1024 for SGI 1600 SW
++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
++
 +# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
 +Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
 +
@@ -87,32 +116,21 @@
 +
 +# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
 +Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
++
 +# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
 +Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
 +
-+# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
-+Modeline "1280x720"  74.48  1280 1336 1472 1664  720 721 724 746  -HSync +Vsync
++# 1920x1080 59.96 Hz (CVT 2.07M9) hsync: 67.16 kHz; pclk: 173.00 MHz
++Modeline "1920x1080"  173.00  1920 2048 2248 2576  1080 1083 1088 1120 -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
++# 1920x1080 69.92 Hz (CVT) hsync: 78.80 kHz; pclk: 204.25 MHz
++Modeline "1920x1080"  204.25  1920 2056 2256 2592  1080 1083 1088 1127 -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
++# 1920x1080 74.91 Hz (CVT 2.07M9) hsync: 84.64 kHz; pclk: 220.75 MHz
++Modeline "1920x1080"  220.75  1920 2064 2264 2608  1080 1083 1088 1130 -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
++# 1920x1080 84.88 Hz (CVT 2.07M9) hsync: 96.51 kHz; pclk: 253.25 MHz
++Modeline "1920x1080"  253.25  1920 2064 2272 2624  1080 1083 1088 1137 -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
@@ -120,12 +138,21 @@
 +# 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 @ 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
++
 +# 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
-+
+ 
+ # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
+ Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
+@@ -31,3 +153,14 @@
+ # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
+ Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -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
 +
@@ -137,7 +164,3 @@
 +
 +# 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
-+
-+# 1600x1024 for SGI 1600 SW
-+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
-+


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- xorg-x11-server.spec	26 Jul 2006 02:11:38 -0000	1.133
+++ xorg-x11-server.spec	26 Jul 2006 11:54:20 -0000	1.134
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -326,7 +326,7 @@
 %patch106 -p1 -b .no-xnest-composite
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
-%patch1001 -p1 -b .Red-Hat-extramodes
+%patch1001 -p0 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
 %patch1003 -p1 -b .fpic
 %patch1004 -p1 -b .selinux-awareness
@@ -672,6 +672,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-12.fc6
+- Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
+- Sorted the extramodes file by X res, then Y res for ease of maintenance.
+
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-11.fc6
 - Add selinux{,-devel} buildreqs.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 12:07:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 08:07:55 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch, NONE,
	1.1 openoffice.org.spec, 1.796, 1.797
Message-ID: <200607261207.k6QC7tED024565@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24512

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch 
Log Message:
more goodies

openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch:
 source/ui/ribbar/inputwin.cxx    |    0 
 sw/source/ui/ribbar/inputwin.cxx |   13 ++++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch ---
Index: source/ui/ribbar/inputwin.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/ribbar/inputwin.cxx,v
retrieving revision 1.13
diff -u -r1.13 inputwin.cxx
--- openoffice.org.orig/sw/source/ui/ribbar/inputwin.cxx	9 Sep 2005 10:44:29 -0000	1.13
+++ openoffice.org/sw/source/ui/ribbar/inputwin.cxx	26 Jul 2006 11:53:19 -0000
@@ -329,14 +329,13 @@
 	switch ( nCurID )
 	{
 		case FN_FORMULA_CALC :
-		{
-			Point aBL = GetItemRect( FN_FORMULA_CALC ).BottomLeft();
-			Point aPt(aBL.X(), aBL.Y());
-			aPopMenu.Execute( this, aPt );
-		}
-    }
+			aPopMenu.Execute( this, GetItemRect( FN_FORMULA_CALC ), POPUPMENU_NOMOUSEUPCLOSE );
+			break;
+		default:
+			break;
+	}
 
-    return TRUE;
+	return TRUE;
 }
 
 //==================================================================


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -r1.796 -r1.797
--- openoffice.org.spec	26 Jul 2006 10:47:01 -0000	1.796
+++ openoffice.org.spec	26 Jul 2006 12:07:53 -0000	1.797
@@ -124,6 +124,7 @@
 Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 Patch59: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
 Patch60: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
+Patch61: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -875,6 +876,7 @@
 %patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
 %patch59 -p1 -b .rh200118.filter.xalanbroken.patch
 %patch60 -p1 -b .ooo67779.svx.toolbarcrash.patch
+%patch61 -p1 -b .ooo67793.sw.stickymenu.patch
 
 tar xzf %{SOURCE1}
 
@@ -3353,6 +3355,7 @@
 %changelog
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
+- rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN



From fedora-cvs-commits at redhat.com  Wed Jul 26 12:56:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 08:56:30 -0400
Subject: rpms/ftp/devel netkit-ftp-0.17-longnames.patch, NONE, 1.1 ftp.spec,
	1.27, 1.28
Message-ID: <200607261256.k6QCuUgo004933@cvs.devel.redhat.com>

Author: mmaslano

Update of /cvs/dist/rpms/ftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4163

Modified Files:
	ftp.spec 
Added Files:
	netkit-ftp-0.17-longnames.patch 
Log Message:
--- netkit-ftp-0.17/ftp/cmds.c.longnames        2006-07-25 11:13:55.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c  2006-07-24 17:52:10.000000000 +0200
@@ -1057,10 +1057,9 @@
 status(void)
 {
        int i;
-
-       if (connected)
+       if (connected)
                printf("Connected to %s.\n", hostname);
-       else
+       else
                printf("Not connected.\n");
        if (!proxy) {
                pswitch(1);
@@ -1081,7 +1080,7 @@
                onoff(runique));
        printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
        if (ntflag) {
-               printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
+               printf("Ntrans: (in) %s (out) %s\n",ntin,ntout);
        }
        else {
                printf("Ntrans: off\n");
@@ -1948,14 +1947,14 @@
        }
        ntflag++;
        code = ntflag;
-       (void) strncpy(ntin, argv[1], 16);
-       ntin[16] = '\0';
+       (void) strncpy(ntin, argv[1], NTRANS_MAX);
+       ntin[NTRANS_MAX] = '\0';
        if (argc == 2) {
                ntout[0] = '\0';
                return;
        }
-       (void) strncpy(ntout, argv[2], 16);
-       ntout[16] = '\0';
+       (void) strncpy(ntout, argv[2], NTRANS_MAX);
+       ntout[NTRANS_MAX] = '\0';
 }

 static char *
@@ -1965,10 +1964,10 @@
        char *cp1, *cp2 = new;
        register int i, ostop, found;

-       for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
+       for (ostop = 0; *(ntout + ostop) && ostop < NTRANS_MAX; ostop++);
        for (cp1 = name; *cp1; cp1++) {
                found = 0;
-               for (i = 0; *(ntin + i) && i < 16; i++) {
+               for (i = 0; *(ntin + i) && i < NTRANS_MAX; i++) {
                        if (*cp1 == *(ntin + i)) {
                                found++;
                                if (i < ostop) {
--- netkit-ftp-0.17/ftp/ftp.c.longnames 2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c   2006-07-24 17:46:14.000000000 +0200
@@ -1656,8 +1656,8 @@
                int runqe;
                int mcse;
                int ntflg;
-               char nti[17];
-               char nto[17];
+               char nti[NTRANS_MAX+1];
+               char nto[NTRANS_MAX+1];
                int mapflg;
                char mi[MAXPATHLEN];
                char mo[MAXPATHLEN];
@@ -1712,11 +1712,11 @@
        mcase = op->mcse;
        ip->ntflg = ntflag;
        ntflag = op->ntflg;
-       (void) strncpy(ip->nti, ntin, 16);
-       (ip->nti)[16] = '\0';           /* shouldn't use strlen */
+       (void) strncpy(ip->nti, ntin, NTRANS_MAX);
+       (ip->nti)[NTRANS_MAX] = '\0';           /* shouldn't use strlen */
        (void) strcpy(ntin, op->nti);
-       (void) strncpy(ip->nto, ntout, 16);
-       (ip->nto)[16] = '\0';
+       (void) strncpy(ip->nto, ntout, NTRANS_MAX);
+       (ip->nto)[NTRANS_MAX] = '\0';
        (void) strcpy(ntout, op->nto);
        ip->mapflg = mapflag;
        mapflag = op->mapflg;
--- netkit-ftp-0.17/ftp/ftp_var.h.longnames     2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp_var.h       2006-07-24 15:49:37.000000000 +0200
@@ -42,6 +42,7 @@

 #include <setjmp.h>
 #include <sys/param.h>
+#define NTRANS_MAX     64

 /*
  * Tick counter step size.
@@ -82,8 +83,8 @@
 Extern char     pasv[64];       /* passive port for proxy data connection */
 Extern int      passivemode;    /* passive mode enabled */
 Extern char    *altarg;        /* argv[1] with no shell-like preprocessing  */
-Extern char    ntin[17];       /* input translation table */
-Extern char    ntout[17];      /* output translation table */
+Extern char    ntin[NTRANS_MAX+1];     /* input translation table */
+Extern char    ntout[NTRANS_MAX+1];    /* output translation table */
 Extern char    mapin[MAXPATHLEN];      /* input map template */
 Extern char    mapout[MAXPATHLEN];     /* output map template */
 Extern char    typename[32];           /* name of file transfer type */


netkit-ftp-0.17-longnames.patch:
 cmds.c    |   19 +++++++++----------
 ftp.c     |   12 ++++++------
 ftp_var.h |    5 +++--
 3 files changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE netkit-ftp-0.17-longnames.patch ---
--- netkit-ftp-0.17/ftp/cmds.c.longnames	2006-07-25 11:13:55.000000000 +0200
+++ netkit-ftp-0.17/ftp/cmds.c	2006-07-24 17:52:10.000000000 +0200
@@ -1057,10 +1057,9 @@
 status(void)
 {
 	int i;
-
-	if (connected)
+	if (connected) 
 		printf("Connected to %s.\n", hostname);
-	else
+	else 
 		printf("Not connected.\n");
 	if (!proxy) {
 		pswitch(1);
@@ -1081,7 +1080,7 @@
 		onoff(runique));
 	printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag));
 	if (ntflag) {
-		printf("Ntrans: (in) %s (out) %s\n", ntin,ntout);
+		printf("Ntrans: (in) %s (out) %s\n",ntin,ntout);
 	}
 	else {
 		printf("Ntrans: off\n");
@@ -1948,14 +1947,14 @@
 	}
 	ntflag++;
 	code = ntflag;
-	(void) strncpy(ntin, argv[1], 16);
-	ntin[16] = '\0';
+	(void) strncpy(ntin, argv[1], NTRANS_MAX);
+	ntin[NTRANS_MAX] = '\0';
 	if (argc == 2) {
 		ntout[0] = '\0';
 		return;
 	}
-	(void) strncpy(ntout, argv[2], 16);
-	ntout[16] = '\0';
+	(void) strncpy(ntout, argv[2], NTRANS_MAX);
+ 	ntout[NTRANS_MAX] = '\0';
 }
 
 static char *
@@ -1965,10 +1964,10 @@
 	char *cp1, *cp2 = new;
 	register int i, ostop, found;
 
-	for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
+	for (ostop = 0; *(ntout + ostop) && ostop < NTRANS_MAX; ostop++);
 	for (cp1 = name; *cp1; cp1++) {
 		found = 0;
-		for (i = 0; *(ntin + i) && i < 16; i++) {
+		for (i = 0; *(ntin + i) && i < NTRANS_MAX; i++) {
 			if (*cp1 == *(ntin + i)) {
 				found++;
 				if (i < ostop) {
--- netkit-ftp-0.17/ftp/ftp.c.longnames	2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c	2006-07-24 17:46:14.000000000 +0200
@@ -1656,8 +1656,8 @@
 		int runqe;
 		int mcse;
 		int ntflg;
-		char nti[17];
-		char nto[17];
+		char nti[NTRANS_MAX+1];
+		char nto[NTRANS_MAX+1];
 		int mapflg;
 		char mi[MAXPATHLEN];
 		char mo[MAXPATHLEN];
@@ -1712,11 +1712,11 @@
 	mcase = op->mcse;
 	ip->ntflg = ntflag;
 	ntflag = op->ntflg;
-	(void) strncpy(ip->nti, ntin, 16);
-	(ip->nti)[16] = '\0';		/* shouldn't use strlen */
+	(void) strncpy(ip->nti, ntin, NTRANS_MAX);
+	(ip->nti)[NTRANS_MAX] = '\0';		/* shouldn't use strlen */
 	(void) strcpy(ntin, op->nti);
-	(void) strncpy(ip->nto, ntout, 16);
-	(ip->nto)[16] = '\0';
+	(void) strncpy(ip->nto, ntout, NTRANS_MAX);
+	(ip->nto)[NTRANS_MAX] = '\0';
 	(void) strcpy(ntout, op->nto);
 	ip->mapflg = mapflag;
 	mapflag = op->mapflg;
--- netkit-ftp-0.17/ftp/ftp_var.h.longnames	2006-07-25 11:13:56.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp_var.h	2006-07-24 15:49:37.000000000 +0200
@@ -42,6 +42,7 @@
 
 #include <setjmp.h>
 #include <sys/param.h>
+#define NTRANS_MAX	64
 
 /*
  * Tick counter step size.
@@ -82,8 +83,8 @@
 Extern char     pasv[64];       /* passive port for proxy data connection */
 Extern int      passivemode;    /* passive mode enabled */
 Extern char	*altarg;	/* argv[1] with no shell-like preprocessing  */
-Extern char	ntin[17];	/* input translation table */
-Extern char	ntout[17];	/* output translation table */
+Extern char	ntin[NTRANS_MAX+1];	/* input translation table */
+Extern char	ntout[NTRANS_MAX+1];	/* output translation table */
 Extern char	mapin[MAXPATHLEN];	/* input map template */
 Extern char	mapout[MAXPATHLEN];	/* output map template */
 Extern char	typename[32];		/* name of file transfer type */


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ftp.spec	12 Jul 2006 05:52:25 -0000	1.27
+++ ftp.spec	26 Jul 2006 12:56:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2.1
+Release: 32.1.2.2
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -18,6 +18,8 @@
 Patch11: netkit-ftp-0.17-C-Frame121.patch
 Patch12: netkit-ftp-0.17-data.patch
 Patch13: netkit-ftp-0.17-multihome.patch
+Patch14: netkit-ftp-0.17-longnames.patch
+
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
 
@@ -44,6 +46,7 @@
 %patch11 -p1 -b .C-Frame121
 %patch12 -p1 -b .data
 %patch13 -p1 -b .multihome
+%patch14 -p1 -b .longnames
 
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
@@ -77,6 +80,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Thu Jul 25 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.2
+- fix (#196103) patch for long filenames
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 14:09:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 10:09:38 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.103,
	1.104
Message-ID: <200607261409.k6QE9c5k007151@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7078

Modified Files:
	evolution-data-server.spec 
Log Message:
- Rebuild



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- evolution-data-server.spec	26 Jul 2006 03:23:15 -0000	1.103
+++ evolution-data-server.spec	26 Jul 2006 14:09:36 -0000	1.104
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.90.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -328,6 +328,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-2
+- Rebuild
+
 * Tue Jul 25 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-1
 - Update to 1.7.90.1
 - Add patch for Gnome.org bug #348725.



From fedora-cvs-commits at redhat.com  Wed Jul 26 14:14:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 10:14:23 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.132,1.133
Message-ID: <200607261414.k6QEENfq009039@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9002

Modified Files:
	util-linux.spec 
Log Message:
fix spec file


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- util-linux.spec	18 Jul 2006 22:19:58 -0000	1.132
+++ util-linux.spec	26 Jul 2006 14:14:21 -0000	1.133
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.33
+Release: 0.34
 License: distributable
 Group: System Environment/Base
 
@@ -706,6 +706,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Jul 26 2006 Karel Zak <kzak at redhat.com> 2.13-0.34
+- rebuild
+
 * Tue Jul 18 2006 Karel Zak <kzak at redhat.com> 2.13-0.33
 - add Requires(post): libselinux
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 14:39:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 10:39:17 -0400
Subject: rpms/SDL/devel SDL.spec,1.47,1.48
Message-ID: <200607261439.k6QEdHSV031850@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31809

Modified Files:
	SDL.spec 
Log Message:
[tw]
- added build requires for automake and autoconf




Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- SDL.spec	25 Jul 2006 16:14:15 -0000	1.47
+++ SDL.spec	26 Jul 2006 14:39:11 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 6
+Release: 6.1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -17,7 +17,7 @@
 BuildRequires: libXext-devel libX11-devel
 BuildRequires: libGL-devel libGLU-devel
 BuildRequires: libXt-devel libXrender-devel libXrandr-devel gettext-devel
-BuildRequires: imake
+BuildRequires: imake automake autoconf
 
 %description
 Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
@@ -99,6 +99,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Wed Jul 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6.1
+- added build requires for automake and autoconf
+
 * Tue Jul 25 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6
 - dropped libXt build requires, because libSDL does not need libXt at all - 
   this was an autofoo bug (fixed already)



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:26:57 -0400
Subject: rpms/system-config-display/devel .cvsignore, 1.26, 1.27 sources,
	1.32, 1.33 system-config-display.spec, 1.37, 1.38
Message-ID: <200607261526.k6QFQvEd011294@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11203

Modified Files:
	.cvsignore sources system-config-display.spec 
Log Message:
New version to fix translation problems.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	7 Mar 2006 23:12:31 -0000	1.26
+++ .cvsignore	26 Jul 2006 15:26:54 -0000	1.27
@@ -3,3 +3,4 @@
 system-config-display-1.0.35.tar.bz2
 system-config-display-1.0.36.tar.bz2
 system-config-display-1.0.37.tar.bz2
+system-config-display-1.0.38.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	9 Mar 2006 16:11:23 -0000	1.32
+++ sources	26 Jul 2006 15:26:54 -0000	1.33
@@ -1 +1 @@
-232a802580134c1f885dc9fbf8c19e8f  system-config-display-1.0.37.tar.bz2
+ffe4376744ad844324f4e74d1e415902  system-config-display-1.0.38.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- system-config-display.spec	6 Jun 2006 01:40:09 -0000	1.37
+++ system-config-display.spec	26 Jul 2006 15:26:54 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
-Version: 1.0.37
-Release: 3
+Version: 1.0.38
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -13,7 +13,7 @@
 ExcludeArch: s390 s390x ppc64
 Obsoletes: redhat-config-xfree86
 BuildRequires: desktop-file-utils
-BuildRequires: intltool gettext
+BuildRequires: intltool
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2
@@ -83,8 +83,8 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
-* Mon Jun 05 2006 Jesse Keating <jkeating at redhat.com> 1.0.37-3
-- Added BuildRequires gettext
+* Wed Jul 26 2006 Chris Lumens <clumens at redhat.com> 1.0.38-1
+- Fix CHARSET in te and kn translations (#200203).
 
 * Thu Mar 09 2006 Chris Lumens <clumens at redhat.com> 1.0.37-2
 - Add back spec file parts that got lost on last rebuild.



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:32:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:32:39 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.14.2-xio-error.patch, NONE,
	1.1 gnome-panel.spec, 1.133, 1.134
Message-ID: <200607261532.k6QFWdEl012920@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12836

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.14.2-xio-error.patch 
Log Message:
- don't try to talk to X if the connection is dead (bug 200149)


gnome-panel-2.14.2-xio-error.patch:
 panel-applet-frame.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

--- NEW FILE gnome-panel-2.14.2-xio-error.patch ---
--- gnome-panel-2.14.2/gnome-panel/panel-applet-frame.c.xio-error	2006-03-06 15:19:20.000000000 -0500
+++ gnome-panel-2.14.2/gnome-panel/panel-applet-frame.c	2006-07-26 11:01:06.000000000 -0400
@@ -31,6 +31,8 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
+#include <X11/Xlib.h>
+
 #include "panel-applet-frame.h"
 #include "panel-profile.h"
 #include "panel-util.h"
@@ -105,6 +107,10 @@ static void panel_applet_frame_activated
 					  CORBA_Environment *ev,
 					  gpointer          *data);
 
+static int (* panel_applet_frame_old_xio_error_handler) (Display *);
+static int panel_applet_frame_xio_error_handler (Display *display);
+static gboolean panel_applet_frame_display_is_dead = FALSE;
+
 void
 panel_applet_frame_sync_menu_state (PanelAppletFrame *frame)
 {
@@ -943,6 +949,9 @@ panel_applet_frame_cnx_broken (ORBitConn
 
 	g_return_if_fail (PANEL_IS_APPLET_FRAME (frame));
 
+	if (panel_applet_frame_display_is_dead)
+		return;
+
 	screen = gtk_widget_get_screen (GTK_WIDGET (frame));
 
 	if (frame->priv->iid)
@@ -1236,6 +1245,17 @@ panel_applet_frame_event_listener (Bonob
 		panel_applet_frame_set_size_hints_from_any (frame, any);
 }
 
+static int
+panel_applet_frame_xio_error_handler (Display *display)
+{
+    panel_applet_frame_display_is_dead = TRUE;
+
+    if (panel_applet_frame_old_xio_error_handler)
+	    return panel_applet_frame_old_xio_error_handler (display);
+
+    return 0;
+}
+
 static void
 panel_applet_frame_activated (Bonobo_Unknown     object,
 			      CORBA_Environment *ev,
@@ -1373,6 +1393,8 @@ panel_applet_frame_activated (Bonobo_Unk
 	ORBit_small_listen_for_broken (object,
 				       G_CALLBACK (panel_applet_frame_cnx_broken),
 				       frame);
+	panel_applet_frame_old_xio_error_handler = 
+           XSetIOErrorHandler (panel_applet_frame_xio_error_handler);
 
 	gtk_container_add (GTK_CONTAINER (frame), widget);
 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-panel.spec	18 Jul 2006 23:35:54 -0000	1.133
+++ gnome-panel.spec	26 Jul 2006 15:32:36 -0000	1.134
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 6
+Release: 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
@@ -80,6 +80,7 @@
 Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
 # support transparent background in the notification area
 Patch11: transparent-systray.patch
+Patch12: gnome-panel-2.14.2-xio-error.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -112,6 +113,7 @@
 %patch9 -p1 -b .ignore-unknown-options
 %patch10 -p1 -b .remove-duplicate-entry
 %patch11 -p1 -b .transparent-systray
+%patch12 -p1 -b .xio-error
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -227,6 +229,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Jul 26 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-7
+- don't try to talk to X if the connection is dead (bug 200149)
+
 * Tue Jul 18 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-6
 - change "Suspend" to "Hibernate" where appropriate (bug 190791)
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:32:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:32:58 -0400
Subject: rpms/system-config-display/devel sources, 1.33,
	1.34 system-config-display.spec, 1.38, 1.39
Message-ID: <200607261532.k6QFWwib012982@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12953

Modified Files:
	sources system-config-display.spec 
Log Message:
Fix buildrequires.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	26 Jul 2006 15:26:54 -0000	1.33
+++ sources	26 Jul 2006 15:32:56 -0000	1.34
@@ -1 +1 @@
-ffe4376744ad844324f4e74d1e415902  system-config-display-1.0.38.tar.bz2
+49054b619a227f5be01ee169b1baa0ee  system-config-display-1.0.38.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- system-config-display.spec	26 Jul 2006 15:26:54 -0000	1.38
+++ system-config-display.spec	26 Jul 2006 15:32:56 -0000	1.39
@@ -13,7 +13,7 @@
 ExcludeArch: s390 s390x ppc64
 Obsoletes: redhat-config-xfree86
 BuildRequires: desktop-file-utils
-BuildRequires: intltool
+BuildRequires: intltool, gettext
 Requires: pygtk2 >= 1.99.11
 Requires: pygtk2-libglade
 Requires: python2
@@ -85,6 +85,7 @@
 %changelog
 * Wed Jul 26 2006 Chris Lumens <clumens at redhat.com> 1.0.38-1
 - Fix CHARSET in te and kn translations (#200203).
+- Add gettext to buildrequires.
 
 * Thu Mar 09 2006 Chris Lumens <clumens at redhat.com> 1.0.37-2
 - Add back spec file parts that got lost on last rebuild.



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:35:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:35:28 -0400
Subject: rpms/libnl/devel libnl.spec,1.15,1.16 sources,1.5,1.6
Message-ID: <200607261535.k6QFZSE7013470@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12972

Modified Files:
	libnl.spec sources 
Log Message:
Fix 64bit issues



Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnl.spec	12 Jul 2006 06:54:41 -0000	1.15
+++ libnl.spec	26 Jul 2006 15:35:25 -0000	1.16
@@ -5,10 +5,9 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.10.%{preversion}.1
+Release: 0.10.%{preversion}.2
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz
-Source1: %{name}-1.pc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
 Patch1: libnl-64bit.patch
@@ -48,7 +47,20 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-%{__install} -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
+cat >libnl-1.pc <<EOF
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+libdir=%{_libdir}
+includedir=%{_includedir}
+
+Name: libnl
+Description: Convenience library for netlink sockets
+Version: %{version}-%{release}
+Libs: -L${libdir} -lnl
+Cflags:
+EOF
+
+%{__install} -m 644 libnl-1.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -70,6 +82,9 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 1.0-0.10.pre5.2
+- Fix the pkgconfig file on 64-bit systems (#197176)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.10.pre5.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Nov 2005 21:48:46 -0000	1.5
+++ sources	26 Jul 2006 15:35:25 -0000	1.6
@@ -1,2 +1 @@
-d8e0c9170a12cf86a832f1810829016f  libnl-1.pc
 2cece8968bb36b4cc34b907b6e3c2178  libnl-1.0-pre5.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:37:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:37:18 -0400
Subject: rpms/python-pyblock/devel .cvsignore, 1.14, 1.15 python-pyblock.spec,
	1.24, 1.25 sources, 1.18, 1.19
Message-ID: <200607261537.k6QFbI8U014236@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14201

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.17-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jul 2006 22:24:28 -0000	1.14
+++ .cvsignore	26 Jul 2006 15:37:15 -0000	1.15
@@ -1 +1 @@
-pyblock-0.16.tar.bz2
+pyblock-0.17.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-pyblock.spec	19 Jul 2006 20:28:42 -0000	1.24
+++ python-pyblock.spec	26 Jul 2006 15:37:15 -0000	1.25
@@ -4,8 +4,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.16
-Release: 2
+Version: 0.17
+Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -40,6 +40,10 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 0.17-1
+- make multipath support more robust
+- fix leaky file descriptor on volumes without partition tables
+
 * Wed Jul 19 2006 Jeremy Katz <katzj at redhat.com> - 0.16-2
 - require libbdevid
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	17 Jul 2006 22:24:29 -0000	1.18
+++ sources	26 Jul 2006 15:37:15 -0000	1.19
@@ -1 +1 @@
-cb8b78823c19d9e5e143c9bb3dd11ed2  pyblock-0.16.tar.bz2
+0eb2cd51b2d36557c55baf9a1c65870c  pyblock-0.17.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:41:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:41:48 -0400
Subject: rpms/kdebase/FC-4 kdebase.spec,1.123,1.124
Message-ID: <200607261541.k6QFfmYB015508@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15386

Modified Files:
	kdebase.spec 
Log Message:
 BR lm_sensors-devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdebase.spec	14 Jun 2006 22:58:16 -0000	1.123
+++ kdebase.spec	26 Jul 2006 15:41:46 -0000	1.124
@@ -21,7 +21,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.3
-Release: 0.2.fc4
+Release: 0.3.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -106,6 +106,9 @@
 %ifnarch s390 s390x
 BuildPrereq: libraw1394-devel
 %endif
+%ifarch alpha %{ix86} x86_64
+BuildRequires: lm_sensors-devel
+%endif
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -430,6 +433,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Wed Jul 26 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.3.fc4
+- BR lm_sensors-devel
+
 * Thu Jun 15 2006 Than Ngo <than at redhat.com> 6:3.5.3-0.2.fc4
 - apply patch to to fix #194659, CVE-2006-2449 KDM symlink attack vulnerability
   thanks to KDE security team



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:44:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:44:30 -0400
Subject: rpms/xalan-j2/devel xalan-j2-src-MANIFEST-MF.patch, NONE,
	1.1 xalan-j2.spec, 1.47, 1.48
Message-ID: <200607261544.k6QFiUZd016634@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16552

Modified Files:
	xalan-j2.spec 
Added Files:
	xalan-j2-src-MANIFEST-MF.patch 
Log Message:
- Apply patch to replace serializer.jar in MANIFEST file with
  xalan-j2-serializer.jar.



xalan-j2-src-MANIFEST-MF.patch:
 MANIFEST.MF |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xalan-j2-src-MANIFEST-MF.patch ---
--- ./src/MANIFEST.MF.sav	2006-07-26 11:11:43.000000000 -0400
+++ ./src/MANIFEST.MF	2006-07-26 11:11:28.000000000 -0400
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Created-By: @java.version@ (@java.vendor@)
 Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
 
 
 Name: org/apache/xalan/


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- xalan-j2.spec	22 Jul 2006 08:46:16 -0000	1.47
+++ xalan-j2.spec	26 Jul 2006 15:44:28 -0000	1.48
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_2fc
+Release:        4jpp_3fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -46,6 +46,8 @@
 Patch0:         %{name}-noxsltcdeps.patch
 Patch1:         %{name}-manifest.patch
 Patch2:         %{name}-crosslink.patch
+#This patch uses xalan-j2-serializer.jar in the MANIFEST file instead of serializer
+Patch3:		%{name}-src-MANIFEST-MF.patch
 URL:            http://xalan.apache.org/
 Group:          Text Processing/Markup/XML
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -133,6 +135,7 @@
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
+%patch3 -p0
 #%patch1 -p0
 #%patch2 -p0
 # Remove all binary libs, except ones needed to build docs and N/A elsewhere.
@@ -322,6 +325,10 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_3fc
+- Apply patch to replace serializer.jar in MANIFEST file with 
+  xalan-j2-serializer.jar.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:2.7.0-4jpp_2fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:55:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:55:37 -0400
Subject: rpms/kernel/devel .cvsignore, 1.497, 1.498 kernel-2.6.spec, 1.2454,
	1.2455 sources, 1.461, 1.462
Message-ID: <200607261555.k6QFtbft011646@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11631

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Log Message:
update to xen HV 10730


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- .cvsignore	25 Jul 2006 23:49:06 -0000	1.497
+++ .cvsignore	26 Jul 2006 15:55:34 -0000	1.498
@@ -3,5 +3,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-xen-10712.tar.bz2
 patch-2.6.18-rc2-git5.bz2
+xen-10730.tar.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2454
retrieving revision 1.2455
diff -u -r1.2454 -r1.2455
--- kernel-2.6.spec	26 Jul 2006 04:07:57 -0000	1.2454
+++ kernel-2.6.spec	26 Jul 2006 15:55:34 -0000	1.2455
@@ -33,7 +33,7 @@
 %define rpmversion 2.6.%{sublevel}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
 %define signmodules 0
-%define xen_hv_cset 10712
+%define xen_hv_cset 10730
 %define make_target bzImage
 %define kernel_image x86
 %define xen_flags verbose=y crash_debug=y
@@ -458,9 +458,6 @@
 
 # Xen hypervisor patches
 
-# Don't hang with huge timeouts
-Patch20000: xen-fix_huge_timeouts.patch
-
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -712,9 +709,9 @@
 fi
 cp -rl xen-%{xen_hv_cset} xen
 
-# Any necessary hypervisor patches go here
 cd xen
-%patch20000 -p1
+# Any necessary hypervisor patches go here
+
 cd ..
 
 %endif
@@ -1651,6 +1648,9 @@
 
 %changelog
 * Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
+- update xen-hv to 10730 cset, should really fix huge timeout problems.
+
+* Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
 - Workaround the huge timeouts problems on xen HV x86.
 - xen update and cleanup/reorgatization of xen patches.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- sources	25 Jul 2006 23:49:07 -0000	1.461
+++ sources	26 Jul 2006 15:55:34 -0000	1.462
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-45199f1222ccd78d70b08b1133d24192  xen-10712.tar.bz2
 f30096f49c2a8b4da67854b8350ad929  patch-2.6.18-rc2-git5.bz2
+4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 15:56:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 11:56:27 -0400
Subject: rpms/evolution/devel evolution-2.7.90-deleting-preedit-buffer.patch,
	NONE, 1.1 evolution.spec, 1.167, 1.168
Message-ID: <200607261556.k6QFuR3E011675@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11659

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.90-deleting-preedit-buffer.patch 
Log Message:
- Add patch for RH bug #178295.


evolution-2.7.90-deleting-preedit-buffer.patch:
 e-text.c |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

--- NEW FILE evolution-2.7.90-deleting-preedit-buffer.patch ---
--- evolution-2.7.90/widgets/text/e-text.c.deleting-preedit-buffer	2006-07-26 10:16:02.000000000 -0400
+++ evolution-2.7.90/widgets/text/e-text.c	2006-07-26 10:25:29.000000000 -0400
@@ -284,7 +284,7 @@
 	PangoAttrList *preedit_attrs = NULL;
 	gchar *preedit_string = NULL;
 	GString *tmp_string = g_string_new (NULL);
-	gint length = 0, cpos = 0, preedit_length = 0;
+        gint length = 0, cpos = 0;
 	gboolean new_attrs = FALSE;
 
 	if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context))
@@ -295,19 +295,15 @@
 
 	g_string_prepend_len (tmp_string, text->text,length); 
 
-	if (text->preedit_len)
-		gtk_im_context_get_preedit_string (text->im_context,
-					   &preedit_string, &preedit_attrs,
-					   NULL);
+        /* we came into this function only when text->preedit_len was not 0
+           so we can saftely fetch the preedit string */
+        gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL);
 
 	if (preedit_string && g_utf8_validate (preedit_string, -1, NULL))
-		text->preedit_len = preedit_length = strlen (preedit_string);
-	else
-		text->preedit_len  = preedit_length = 0;
-
-	cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;	
+        {
+                text->preedit_len = strlen (preedit_string);
+                cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
 
-	if (preedit_length) {
 		g_string_insert (tmp_string, cpos, preedit_string);
 
 		reset_layout_attrs (text);
@@ -320,15 +316,17 @@
 
 		pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len);
 
-		pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length);
+                pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len);
 
 		if (new_attrs) {
 			pango_layout_set_attributes (text->layout, attrs);
 			pango_attr_list_unref (attrs);
-		}
+                }
 
 		update_im_cursor_position (text);
 	}
+        else
+                text->preedit_len = 0;
 
 	if (preedit_string)
 		g_free (preedit_string);
@@ -385,9 +383,12 @@
 			pango_attr_list_insert_before (attrs, attr);
 		}
 	}
+
 	pango_layout_set_attributes (text->layout, attrs);
+	
 	if (attrs)
 		pango_attr_list_unref (attrs);
+	
 	calc_height (text);
 }
 
@@ -1510,9 +1511,14 @@
 		}
 	}
 
-
-	if (text->im_context_signals_registered)
-		insert_preedit_text (text);
+        /* Insert preedit text only when im_context signals are connected & text->preedit_len is not zero */
+        if (text->im_context_signals_registered && text->preedit_len)
+                insert_preedit_text (text);
+
+        /* Need to reset the layout to cleanly clear the preedit buffer
+         * when typing in CJK & using backspace on the preedit */
+        if(!text->preedit_len)
+                reset_layout (text);
 
 	if (!pango_layout_get_text (text->layout))
 		return;
@@ -2220,11 +2226,12 @@
 				 */
 
 				if (save_text && save_text->im_context) {
+                                        gtk_im_context_focus_out(save_text->im_context);
 					g_signal_handlers_disconnect_matched (save_text->im_context,
 									      G_SIGNAL_MATCH_DATA,
                                                                              0, 0, NULL,
                                                                              NULL, save_text);
-					save_text->im_context_signals_registered = FALSE;
+                                        save_text->im_context_signals_registered = FALSE;
 					reset_layout (save_text);
                                 }
 
@@ -2240,6 +2247,7 @@
 								  G_CALLBACK (e_text_delete_surrounding_cb), text);
 						text->im_context_signals_registered = TRUE;
 					}
+                                        gtk_im_context_focus_in(text->im_context);
 				}
 				start_editing (text);
 				text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- evolution.spec	26 Jul 2006 11:20:17 -0000	1.167
+++ evolution.spec	26 Jul 2006 15:56:25 -0000	1.168
@@ -48,7 +48,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -109,6 +109,9 @@
 # RH bug #197834 / Gnome.org bug #346797
 Patch28: evolution-2.7.3-submit-bug-report.patch
 
+# RH bug #178295 / Gnome.org bug #348638
+Patch29: evolution-2.7.90-deleting-preedit-buffer.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -240,6 +243,7 @@
 %patch26 -p1 -b .filter-datespec
 %patch27 -p1 -b .replicated-cjk-input
 %patch28 -p1 -b .submit-bug-report
+%patch29 -p1 -b .deleting-preedit-buffer
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -630,6 +634,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
+- Add patch for RH bug #178295.
+
 * Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
 - Update to 2.7.90
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 16:06:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 12:06:20 -0400
Subject: rpms/SDL/devel SDL.spec,1.48,1.49
Message-ID: <200607261606.k6QG6K8i011898@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11869

Modified Files:
	SDL.spec 
Log Message:
[tw]
- setting the X11 lib and include paths hard to get shared X11 support on all
  architectures




Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SDL.spec	26 Jul 2006 14:39:11 -0000	1.48
+++ SDL.spec	26 Jul 2006 16:06:17 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.10
-Release: 6.1
+Release: 6.2
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
@@ -62,7 +62,8 @@
    --enable-arts-shared \
    --enable-esd-shared \
    --enable-alsa \
-   --disable-rpath
+   --disable-rpath \
+   --x-includes=/usr/include --x-libraries=/usr/%{_lib}
 export tagname=CC
 make %{?_smp_mflags}
 
@@ -99,6 +100,10 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Wed Jul 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6.2
+- setting the X11 lib and include paths hard to get shared X11 support on all
+  architectures
+
 * Wed Jul 26 2006 Thomas Woerner <twoerner at redhat.com> 1.2.10-6.1
 - added build requires for automake and autoconf
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 16:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 12:18:34 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2455,1.2456
Message-ID: <200607261618.k6QGIYBj007240@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7209

Modified Files:
	kernel-2.6.spec 
Log Message:
* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
- Enable sparsemem on ia64. (#108848)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2455
retrieving revision 1.2456
diff -u -r1.2455 -r1.2456
--- kernel-2.6.spec	26 Jul 2006 15:55:34 -0000	1.2455
+++ kernel-2.6.spec	26 Jul 2006 16:18:31 -0000	1.2456
@@ -1647,6 +1647,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
+- Enable sparsemem on ia64. (#108848)
+
 * Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
 - update xen-hv to 10730 cset, should really fix huge timeout problems.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 16:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 12:18:34 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.37,1.38
Message-ID: <200607261618.k6QGIYur007250@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv7209/configs

Modified Files:
	config-ia64-generic 
Log Message:
* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
- Enable sparsemem on ia64. (#108848)



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- config-ia64-generic	15 Jul 2006 06:49:37 -0000	1.37
+++ config-ia64-generic	26 Jul 2006 16:18:32 -0000	1.38
@@ -29,7 +29,9 @@
 CONFIG_IA64_L1_CACHE_SHIFT=7
 CONFIG_VIRTUAL_MEM_MAP=y
 CONFIG_NUMA=y
-CONFIG_DISCONTIGMEM=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_MEMORY_HOTPLUG=y
 CONFIG_IA64_MCA_RECOVERY=m
 CONFIG_IA64_CYCLONE=y
 # CONFIG_MMTIMER is not set
@@ -122,6 +124,7 @@
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set



From fedora-cvs-commits at redhat.com  Wed Jul 26 16:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 12:21:24 -0400
Subject: rpms/compiz/devel compiz.spec,1.9,1.10
Message-ID: <200607261621.k6QGLOCU008335@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8301

Modified Files:
	compiz.spec 
Log Message:
* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git
- Bump and build for fc5 AIGLX repo.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compiz.spec	25 Jul 2006 15:29:17 -0000	1.9
+++ compiz.spec	26 Jul 2006 16:21:21 -0000	1.10
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.10.%{snapshot}git%{?dist}
+Release:        0.11.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +112,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git
+- Bump and build for fc5 AIGLX repo.
+
 * Tue Jul 25 2006 Kristian H??gsberg <krh at redhat.com>
 - Require system-logos instead.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:14:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:14:00 -0400
Subject: rpms/xalan-j2/devel xalan-j2-src-MANIFEST-MF.patch,1.1,1.2
Message-ID: <200607261714.k6QHE0Pd007180@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6781

Modified Files:
	xalan-j2-src-MANIFEST-MF.patch 
Log Message:
- Extend patch to cover all applicable MANIFEST files in src directory.



xalan-j2-src-MANIFEST-MF.patch:
 MANIFEST.MF                 |    2 +-
 manifest.xalan-interpretive |    2 +-
 manifest.xsltc              |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: xalan-j2-src-MANIFEST-MF.patch
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2-src-MANIFEST-MF.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xalan-j2-src-MANIFEST-MF.patch	26 Jul 2006 15:44:28 -0000	1.1
+++ xalan-j2-src-MANIFEST-MF.patch	26 Jul 2006 17:13:57 -0000	1.2
@@ -1,5 +1,26 @@
---- ./src/MANIFEST.MF.sav	2006-07-26 11:11:43.000000000 -0400
-+++ ./src/MANIFEST.MF	2006-07-26 11:11:28.000000000 -0400
+--- ./src/manifest.xalan-interpretive.sav	2006-07-26 13:03:51.000000000 -0400
++++ ./src/manifest.xalan-interpretive	2006-07-26 13:04:05.000000000 -0400
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Created-By: @java.version@ (@java.vendor@)
+ Main-Class: org.apache.xalan.xslt.Process
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
++Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
+ 
+ Name: org/apache/xalan/
+ Comment: Main Xalan engine implementing TrAX/JAXP
+--- ./src/manifest.xsltc.sav	2006-07-26 13:04:32.000000000 -0400
++++ ./src/manifest.xsltc	2006-07-26 13:04:49.000000000 -0400
+@@ -1,6 +1,6 @@
+ Manifest-Version: 1.0
+ Created-By: @java.version@ (@java.vendor@)
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
++Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
+ 
+ Name: org/apache/xalan/xsltc/
+ Comment: Main XSLTC engine implementing TrAX/JAXP
+--- ./src/MANIFEST.MF.sav	2006-07-26 13:05:16.000000000 -0400
++++ ./src/MANIFEST.MF	2006-07-26 13:05:28.000000000 -0400
 @@ -1,7 +1,7 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:14:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:14:29 -0400
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.48,1.49
Message-ID: <200607261714.k6QHESfk007389@cvs.devel.redhat.com>

Author: vivekl

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7312

Modified Files:
	xalan-j2.spec 
Log Message:
- Extend patch to cover all applicable MANIFEST files in src directory.




Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xalan-j2.spec	26 Jul 2006 15:44:28 -0000	1.48
+++ xalan-j2.spec	26 Jul 2006 17:14:26 -0000	1.49
@@ -37,7 +37,7 @@
 
 Name:           xalan-j2
 Version:        2.7.0
-Release:        4jpp_3fc
+Release:        4jpp_4fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -46,7 +46,7 @@
 Patch0:         %{name}-noxsltcdeps.patch
 Patch1:         %{name}-manifest.patch
 Patch2:         %{name}-crosslink.patch
-#This patch uses xalan-j2-serializer.jar in the MANIFEST file instead of serializer
+#This patch uses xalan-j2-serializer.jar in the MANIFEST files instead of serializer
 Patch3:		%{name}-src-MANIFEST-MF.patch
 URL:            http://xalan.apache.org/
 Group:          Text Processing/Markup/XML
@@ -325,6 +325,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_4fc
+- Extend patch to cover all applicable MANIFEST files in src directory.
+
 * Wed Jul 26 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.7.0-4jpp_3fc
 - Apply patch to replace serializer.jar in MANIFEST file with 
   xalan-j2-serializer.jar.



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:17:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:17:22 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.119, 1.120 mkinitrd.spec, 1.143,
	1.144 sources, 1.143, 1.144
Message-ID: <200607261717.k6QHHMHZ023268@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16334

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update libbdevid
- bump up to 5.1.1-2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- .cvsignore	18 Jul 2006 15:40:13 -0000	1.119
+++ .cvsignore	26 Jul 2006 17:17:19 -0000	1.120
@@ -1,5 +1,2 @@
-bdevid-0.1.tar.bz2
-mkinitrd-5.0.47.tar.bz2
-mkinitrd-5.1.0.tar.bz2
-bdevid-0.2.tar.bz2
+bdevid-0.3.tar.bz2
 mkinitrd-5.1.1.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mkinitrd.spec	18 Jul 2006 15:40:14 -0000	1.143
+++ mkinitrd.spec	26 Jul 2006 17:17:19 -0000	1.144
@@ -4,11 +4,11 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.1.1
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
-%define BDEVID_VERSION 0.2
+%define BDEVID_VERSION 0.3
 Source1: bdevid-%{BDEVID_VERSION}.tar.bz2
 
 ExclusiveOs: Linux
@@ -113,6 +113,9 @@
 %{_includedir}/bdevid
 
 %changelog
+* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.1-2
+- pull in new libbdevid for scsi probing fix
+
 * Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 5.1.1-1
 - build with -fPIC
 - pull in new libbdevid for linking fix


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- sources	18 Jul 2006 15:40:14 -0000	1.143
+++ sources	26 Jul 2006 17:17:19 -0000	1.144
@@ -1,3 +1,2 @@
-fd3fe7e971eaf78cd249bc6364b88724  mkinitrd-5.1.0.tar.bz2
-fd4c0f871c668765d2dee3aa01bcfb0c  bdevid-0.2.tar.bz2
+5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2
 6be51fcb8cf14cc8e26683495a276728  mkinitrd-5.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:26:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:26:34 -0400
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.39,1.40
Message-ID: <200607261726.k6QHQYQr026759@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26734

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 200246: man-page permissions


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tog-pegasus.spec	19 Jul 2006 23:22:28 -0000	1.39
+++ tog-pegasus.spec	26 Jul 2006 17:26:31 -0000	1.40
@@ -264,10 +264,10 @@
 %ghost /var/run/tog-pegasus/cimserver.pid
 %ghost /var/run/tog-pegasus/cimserver_start.lock
 %ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/cimxml.socket
-/usr/share/man/man8/*
 %defattr(0644, root, pegasus, 0755)
 %dir /usr/share/Pegasus
 /usr/share/Pegasus/mof
+/usr/share/man/man8/*
 /usr/share/man/man1/*
 %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:26:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:26:45 -0400
Subject: rpms/shared-mime-info/devel defaults.list, 1.13,
	1.14 shared-mime-info.spec, 1.42, 1.43
Message-ID: <200607261726.k6QHQjqI026856@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26713

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
add an inode/directory default handler



Index: defaults.list
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- defaults.list	13 Feb 2006 16:09:30 -0000	1.13
+++ defaults.list	26 Jul 2006 17:26:43 -0000	1.14
@@ -84,3 +84,4 @@
 application/x-rpm=system-install-packages.desktop
 text/plain=gnome-gedit.desktop
 text/html=redhat-web.desktop
+inode/directory=gnome-nautilus-folder-handler.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- shared-mime-info.spec	12 Jul 2006 08:14:50 -0000	1.42
+++ shared-mime-info.spec	26 Jul 2006 17:26:43 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.18
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.18-2
+- add an inode/directory entry to defaults.list
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.18-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:26:57 -0400
Subject: rpms/emacs/devel ppc64-unexelf.patch,NONE,1.1 emacs.spec,1.72,1.73
Message-ID: <200607261726.k6QHQvp8026953@cvs.devel.redhat.com>

Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26922

Modified Files:
	emacs.spec 
Added Files:
	ppc64-unexelf.patch 
Log Message:
BZ#183304 fix unexelf.c to build on PowerPC64

ppc64-unexelf.patch:
 unexelf.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

--- NEW FILE ppc64-unexelf.patch ---
--- emacs-21.4/src/unexelf.c	2002-10-15 10:21:44.000000000 -0400
+++ emacs-21.4.works/src/unexelf.c	2006-07-26 11:08:05.000000000 -0400
@@ -697,7 +697,7 @@ unexec (new_name, old_name, data_start, 
   ElfW(Addr) new_data2_addr;
 
   int n, nn;
-  int old_bss_index, old_sbss_index;
+  int old_bss_index, old_sbss_index, old_plt_index;
   int old_data_index, new_data2_index;
   int old_mdebug_index;
   struct stat stat_buf;
@@ -759,12 +759,31 @@ unexec (new_name, old_name, data_start, 
     if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
       old_sbss_index = -1;
 
-  if (old_sbss_index == -1)
+  /* PowerPC64 has .plt in the BSS section.  */
+  old_plt_index = find_section (".plt", old_section_names,
+				old_name, old_file_h, old_section_h, 1);
+  if (old_plt_index != -1)
+    if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+      old_plt_index = -1;
+
+  if (old_sbss_index == -1 && old_plt_index == -1)
     {
       old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
       old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
       new_data2_index = old_bss_index;
     }
+  else if (old_plt_index != -1
+	   && (old_sbss_index == -1
+	       || (OLD_SECTION_H (old_sbss_index).sh_addr
+		   > OLD_SECTION_H (old_plt_index).sh_addr)))
+    {
+      old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+      old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+	+ OLD_SECTION_H (old_plt_index).sh_size;
+      if (old_sbss_index != -1)
+	old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+      new_data2_index = old_plt_index;
+    }
   else
     {
       old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -955,7 +974,7 @@ unexec (new_name, old_name, data_start, 
       if (n == old_bss_index
 	  /* The new bss and sbss section's size is zero, and its file offset
 	     and virtual address should be off by NEW_DATA2_SIZE.  */
-	  || n == old_sbss_index
+	  || n == old_sbss_index || n == old_plt_index
 	  )
 	{
 	  /* NN should be `old_s?bss_index + 1' at this point. */
@@ -986,9 +1005,8 @@ unexec (new_name, old_name, data_start, 
 	      >= OLD_SECTION_H (old_bss_index-1).sh_offset)
 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #else
-	  if (round_up (NEW_SECTION_H (nn).sh_offset,
-			OLD_SECTION_H (old_bss_index).sh_addralign)
-	      >= new_data2_offset)
+	  if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
+	      > new_data2_offset)
 	    NEW_SECTION_H (nn).sh_offset += new_data2_size;
 #endif
 	  /* Any section that was originally placed after the section


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- emacs.spec	12 Jul 2006 05:44:29 -0000	1.72
+++ emacs.spec	26 Jul 2006 17:26:54 -0000	1.73
@@ -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: 14.1.1
+Release: 15
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -102,6 +100,8 @@
 Patch26: xfree86-4.3-modifiers.dpatch
 # generated from ftp://fly.isti.cnr.it/pub/etags.c.gz
 Patch27: etags-update-to-cvs.patch
+# required to build on PowerPC64
+Patch34: ppc64-unexelf.patch
 %endif
 
 # Lisp and doc patches
@@ -231,6 +231,7 @@
 %patch25 -p1 -b .25-scroll-margin
 %patch26 -p1 -b .26-xmodifier
 %patch27 -p1 -b .27-14.21
+%patch34 -p1 -b .34-ppc64-unexelf
 %endif
 
 # patches 2 and 3 touch configure.in
@@ -549,6 +550,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Chip Coldwell <coldwell at redhat.com> - 21.4-15
+- fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 21.4-14.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:27:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:27:02 -0400
Subject: rpms/tog-pegasus/FC-5 tog-pegasus.spec,1.30,1.31
Message-ID: <200607261727.k6QHR2kp027008@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26983

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 200246: man-page permissions


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/FC-5/tog-pegasus.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tog-pegasus.spec	8 Jul 2006 00:08:01 -0000	1.30
+++ tog-pegasus.spec	26 Jul 2006 17:27:00 -0000	1.31
@@ -237,10 +237,10 @@
 %ghost /var/run/tog-pegasus/cimserver.pid
 %ghost /var/run/tog-pegasus/cimserver_start.lock
 %ghost %attr(1640,root,pegasus) /var/run/tog-pegasus/cimxml.socket
-/usr/share/man/man8/*
 %defattr(0644, root, pegasus, 0755)
 %dir /usr/share/Pegasus
 /usr/share/Pegasus/mof
+/usr/share/man/man8/*
 /usr/share/man/man1/*
 %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:27:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:27:31 -0400
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.43,1.44
Message-ID: <200607261727.k6QHRVEM027249@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27198

Modified Files:
	shared-mime-info.spec 
Log Message:
Add bug ref



Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- shared-mime-info.spec	26 Jul 2006 17:26:43 -0000	1.43
+++ shared-mime-info.spec	26 Jul 2006 17:27:28 -0000	1.44
@@ -64,7 +64,7 @@
 
 %changelog
 * Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.18-2
-- add an inode/directory entry to defaults.list
+- add an inode/directory entry to defaults.list (#187021)
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.18-1.1
 - rebuild



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:52:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:52:59 -0400
Subject: rpms/mkinitrd/devel .cvsignore, 1.120, 1.121 mkinitrd.spec, 1.144,
	1.145 sources, 1.144, 1.145
Message-ID: <200607261752.k6QHqxFg017660@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17539

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to mkinitrd-5.1.2-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- .cvsignore	26 Jul 2006 17:17:19 -0000	1.120
+++ .cvsignore	26 Jul 2006 17:52:56 -0000	1.121
@@ -1,2 +1,2 @@
 bdevid-0.3.tar.bz2
-mkinitrd-5.1.1.tar.bz2
+mkinitrd-5.1.2.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- mkinitrd.spec	26 Jul 2006 17:17:19 -0000	1.144
+++ mkinitrd.spec	26 Jul 2006 17:52:56 -0000	1.145
@@ -3,8 +3,8 @@
 
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.1.1
-Release: 2
+Version: 5.1.2
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -46,12 +46,19 @@
 %package devel
 Summary: C header files and library for functionality exported by libnash.
 Group: Development/Libraries
-Requires: glibc-devel, pkgconfig, e2fsprogs-devel
+Requires: glibc-devel, pkgconfig, e2fsprogs-devel, mkinitrd-devel, glib2-devel
+Requires: libbdevid
 
 %package -n libbdevid
 Summary: Library for probing block devices for their unique hardware IDs.
-Group: Development/Libraries
-Requires: mkinitrd-devel, python >= %{pyver}, pkgconfig
+Group: System Environment/Libraries
+Requires: glib2, e2fsprogs, libselinux, libsepol, device-mapper
+
+%package -n libbdevid-python
+Summary: Python bindings for libbdevid
+Group: System Environment/Libraries
+Requires: mkinitrd-devel, glib2, e2fsprogs, libselinux, libsepol, device-mapper
+Requires: libbdevid, python >= %{pyver}
 
 %description devel
 C header files and library for functionality exported by libnash.
@@ -59,6 +66,9 @@
 %description -n libbdevid
 Library for probing block devices for their unique hardware IDs.
 
+%description -n libbdevid-python
+Python bindings for libbdevid.
+
 %prep
 %setup -q -c -a 0
 %setup -q -c -a 1
@@ -99,22 +109,30 @@
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libnash.a
+%{_libdir}/libbdevid.a
+%{_libdir}/libbdevid.so
 %{_libdir}/pkgconfig/libnash.pc
+%{_libdir}/pkgconfig/libbdevid.pc
 %{_includedir}/nash.h
 %{_includedir}/nash
+%{_includedir}/bdevid.h
+%{_includedir}/bdevid
 
 %files -n libbdevid
 /%{_lib}/bdevid
-%{_libdir}/libbdevid.so*
-%{_libdir}/libbdevid.a
-%{_libdir}/pkgconfig/libbdevid.pc
+%{_libdir}/libbdevid.so.*
+
+%files -n libbdevid-python
 /%{python_sitelib}/bdevid.so
-%{_includedir}/bdevid.h
-%{_includedir}/bdevid
 
 %changelog
-* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.1-2
+* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 5.1.2-1
 - pull in new libbdevid for scsi probing fix
+- restructure package so things can include libbdevid (and its modules)
+  without depending on python
+
+* Wed Jul 19 2006 Bill Nottingham <notting at redhat.com>
+- support for loopback root (including loop-over-NFS)
 
 * Tue Jul 18 2006 Jeremy Katz <katzj at redhat.com> - 5.1.1-1
 - build with -fPIC


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	26 Jul 2006 17:17:19 -0000	1.144
+++ sources	26 Jul 2006 17:52:56 -0000	1.145
@@ -1,2 +1,2 @@
 5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2
-6be51fcb8cf14cc8e26683495a276728  mkinitrd-5.1.1.tar.bz2
+29d7eba0d6c5f5f9ecaf69208220740d  mkinitrd-5.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:54:52 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.134,1.135
Message-ID: <200607261754.k6QHsqBx018384@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18358

Modified Files:
	control-center.spec 
Log Message:
* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-2
- Add devel package.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- control-center.spec	30 May 2006 02:59:22 -0000	1.134
+++ control-center.spec	26 Jul 2006 17:54:49 -0000	1.135
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.2
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -94,6 +94,21 @@
 
 If you install GNOME, you need to install control-center.
 
+%package devel
+Summary: GNOME Control Center development libraries and header files
+Group: Development/Libraries
+Requires: %{name} = %{?epoch}:%{version}-%{release}
+
+%description devel
+GNOME (the GNU Network Object Model Environment) is an attractive and
+easy-to-use GUI desktop environment. The control-center package
+provides the GNOME Control Center utilities that allow you to setup
+and configure your system's GNOME environment (things like the desktop
+background and theme, the screensaver, system sounds, and mouse
+behavior).
+
+This packages development files for GNOME Control Center.
+
 %prep
 %setup -q
 
@@ -167,10 +182,7 @@
 # fix installed but not packaged
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-/bin/rm -rf $RPM_BUILD_ROOT%{_includedir}/gnome-window-settings-2.0
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnome-window-settings.*a
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/libgnome-window-settings.so
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnome-window-settings*
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
 /bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
 
@@ -228,10 +240,17 @@
 %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
 %{_libdir}/gnome-vfs-2.0/modules/*.so
 
-# deliberately leaving out pkgconfig files and devel libs for libgnome-window-settings
-# (also its headers)
+%files devel
+%defattr(-,root,root)
+%{_includedir}/gnome-window-settings-2.0
+%{_includedir}/gnome-settings-daemon-2.0
+%{_libdir}/libgnome-window-settings.so
+%{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-2
+- Add devel package.
+
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:57:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:57:31 -0400
Subject: rpms/nfs-utils-lib/devel librpcsecgss-0.13-compile.patch, NONE,
	1.1 nfs-utils-lib.spec, 1.9, 1.10
Message-ID: <200607261757.k6QHvVnn019401@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19365

Modified Files:
	nfs-utils-lib.spec 
Added Files:
	librpcsecgss-0.13-compile.patch 
Log Message:
Added GSSLIBS to the linking of librpcsecgss (bz 198238)


librpcsecgss-0.13-compile.patch:
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE librpcsecgss-0.13-compile.patch ---
--- nfs-utils-lib-1.0.8/librpcsecgss-0.13/src/Makefile.am.orig	2006-04-14 13:03:09.000000000 -0400
+++ nfs-utils-lib-1.0.8/librpcsecgss-0.13/src/Makefile.am	2006-07-26 11:52:01.348163000 -0400
@@ -1,3 +1,5 @@
+LIBS = $(GSSAPI_LIBS)
+
 lib_LTLIBRARIES = librpcsecgss.la
 librpcsecgss_la_LDFLAGS = -version-info 2:0:0
 librpcsecgss_la_SOURCES = \


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nfs-utils-lib.spec	12 Jul 2006 07:28:26 -0000	1.9
+++ nfs-utils-lib.spec	26 Jul 2006 17:57:29 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 5.1
+Release: 6
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -14,6 +14,8 @@
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}.tar.gz
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}.tar.gz
 
+Patch0: librpcsecgss-0.13-compile.patch
+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig, gettext, autoconf
@@ -38,6 +40,7 @@
 
 %prep
 %setup -c -q -a1
+%patch -p1
 
 %build
 top=`pwd`
@@ -115,6 +118,8 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Wed Jul 26 2006 Steve Dickson <steved at redhat.com> 1.0.8-6
+- Added GSSLIBS to the linking of librpcsecgss (bz 198238)
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 17:58:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 13:58:30 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.38,
	1.39 selinux-policy.spec, 1.234, 1.235
Message-ID: <200607261758.k6QHwUJS019823@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19792

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
- Added Paul Howorth patch to only load policy packages shipped 
  with this package
- Allow pidof from initrc to ptrace higher level domains
- Allow firstboot to communicate with hal via dbus


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |    7 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    2 
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   27 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 89 files changed, 877 insertions(+), 240 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- policy-20060608.patch	25 Jul 2006 18:34:36 -0000	1.38
+++ policy-20060608.patch	26 Jul 2006 17:58:28 -0000	1.39
@@ -189,7 +189,7 @@
  	(( h1 dom h2 ) or ( t1 == mcskillall ));
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-26 13:52:04.000000000 -0400
 @@ -48,7 +48,7 @@
  # bootloader local policy
  #
@@ -207,14 +207,17 @@
  kernel_read_system_state(bootloader_t)
  kernel_read_software_raid_state(bootloader_t)
  kernel_read_kernel_sysctls(bootloader_t)
-@@ -86,6 +87,7 @@
+@@ -86,7 +87,10 @@
  dev_read_raw_memory(bootloader_t)
  
  fs_getattr_xattr_fs(bootloader_t)
 +fs_getattr_tmpfs(bootloader_t)
  fs_read_tmpfs_symlinks(bootloader_t)
++#Needed for ia64
++fs_manage_dos_files(bootloader_t)
  
  mls_file_read_up(bootloader_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-17 11:43:02.000000000 -0400
@@ -232,6 +235,25 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
+--- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:04:45.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-07-26 12:55:01.000000000 -0400
+@@ -120,6 +120,10 @@
+ 	usermanage_domtrans_useradd(firstboot_t)
+ ')
+ 
++optional_policy(`
++	hal_dbus_send(firstboot_t)
++')
++
+ ifdef(`TODO',`
+ allow firstboot_t proc_t:file write;
+ 
+@@ -136,3 +140,4 @@
+ 	domain_auto_trans(firstboot_t, xserver_exec_t, xdm_xserver_t)
+ ')
+ ') dnl end TODO
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.3.3/policy/modules/admin/netutils.te
 --- nsaserefpolicy/policy/modules/admin/netutils.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/netutils.te	2006-07-19 12:37:56.000000000 -0400
@@ -375,6 +397,37 @@
  /fastboot 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /forcefsck 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
  /fsckoptions 		--	gen_context(system_u:object_r:etc_runtime_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.3.3/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.if	2006-07-26 13:51:17.000000000 -0400
+@@ -1019,6 +1019,27 @@
+ 
+ ########################################
+ ## <summary>
++##	Create, read, write, and delete files
++##	on a DOS filesystem.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`fs_manage_dos_files',`
++	gen_require(`
++		type dosfs_t;
++	')
++
++	allow $1 dosfs_t:dir rw_dir_perms;
++	allow $1 dosfs_t:file create_file_perms;
++')
++
++
++########################################
++## <summary>
+ ##	Read eventpollfs files.
+ ## </summary>
+ ## <desc>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.3.3/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-07-14 17:04:29.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/kernel/filesystem.te	2006-07-18 08:50:02.000000000 -0400
@@ -439,6 +492,85 @@
 +	dontaudit $1 proc_type:dir list_dir_perms;
 +	dontaudit $1 proc_type:file getattr;
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.if serefpolicy-2.3.3/policy/modules/kernel/selinux.if
+--- nsaserefpolicy/policy/modules/kernel/selinux.if	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.if	2006-07-26 13:02:05.000000000 -0400
+@@ -55,7 +55,7 @@
+ 		type security_t;
+ 	')
+ 
+-	allow $1 security_t:dir search;
++	allow $1 security_t:dir search_dir_perms;
+ ')
+ 
+ ########################################
+@@ -73,7 +73,7 @@
+ 		type security_t;
+ 	')
+ 
+-	dontaudit $1 security_t:dir search;
++	dontaudit $1 security_t:dir search_dir_perms;
+ ')
+ 
+ ########################################
+@@ -92,7 +92,7 @@
+ 		type security_t;
+ 	')
+ 
+-	dontaudit $1 security_t:dir search;
++	dontaudit $1 security_t:dir search_dir_perms;
+ 	dontaudit $1 security_t:file { getattr read };
+ ')
+ 
+@@ -150,7 +150,10 @@
+ 
+ 	if(!secure_mode_policyload) {
+ 		allow $1 security_t:security setenforce;
+-		auditallow $1 security_t:security setenforce;
++		ifdef(`distro_rhel4',`
++			# needed for systems without audit support
++			auditallow $1 security_t:security setenforce;
++		')
+ 	}
+ ')
+ 
+@@ -177,7 +180,10 @@
+ 
+ 	if(!secure_mode_policyload) {
+ 		allow $1 security_t:security load_policy;
+-		auditallow $1 security_t:security load_policy;
++		ifdef(`distro_rhel4',`
++			# needed for systems without audit support
++			auditallow $1 security_t:security load_policy;
++		')
+ 	}
+ ')
+ 
+@@ -208,7 +214,7 @@
+ 		bool secure_mode_policyload;
+ 	')
+ 
+-	allow $1 security_t:dir search;
++	allow $1 security_t:dir search_dir_perms;
+ 	allow $1 security_t:dir { getattr search read };
+ 	allow $1 security_t:file { getattr read write };
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-2.3.3/policy/modules/kernel/selinux.te
+--- nsaserefpolicy/policy/modules/kernel/selinux.te	2006-07-14 17:04:29.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/kernel/selinux.te	2006-07-26 12:46:07.000000000 -0400
+@@ -40,10 +40,10 @@
+ 
+ if(!secure_mode_policyload) {
+ 	allow selinux_unconfined_type security_t:security { load_policy setenforce setbool };
+-	auditallow selinux_unconfined_type security_t:security { load_policy setenforce };
+-
+ 	ifdef(`distro_rhel4',`
+ 		# needed for systems without audit support
++		auditallow selinux_unconfined_type security_t:security { load_policy setenforce };
++
+ 		auditallow selinux_unconfined_type security_t:security setbool;
+ 	')
+ }
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.3.3/policy/modules/kernel/storage.fc
 --- nsaserefpolicy/policy/modules/kernel/storage.fc	2006-07-14 17:04:29.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/kernel/storage.fc	2006-07-17 11:43:02.000000000 -0400
@@ -727,7 +859,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cyrus.te serefpolicy-2.3.3/policy/modules/services/cyrus.te
 --- nsaserefpolicy/policy/modules/services/cyrus.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-25 14:23:55.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cyrus.te	2006-07-26 13:06:30.000000000 -0400
 @@ -41,6 +41,7 @@
  allow cyrus_t self:unix_stream_socket connectto;
  allow cyrus_t self:tcp_socket create_stream_socket_perms;
@@ -742,7 +874,7 @@
  ')
 +
 +optional_policy(`
-+	ldap__stream_connect(cyrus_t)
++	ldap_stream_connect(cyrus_t)
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.fc serefpolicy-2.3.3/policy/modules/services/dovecot.fc
 --- nsaserefpolicy/policy/modules/services/dovecot.fc	2006-07-14 17:04:41.000000000 -0400
@@ -1801,7 +1933,7 @@
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-18 09:01:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-26 13:00:20.000000000 -0400
 @@ -165,6 +165,7 @@
  	')
  
@@ -1818,6 +1950,24 @@
  	allow $1 auditd_etc_t:file r_file_perms;
  ')
  
+@@ -308,7 +310,7 @@
+ 	')
+ 
+ 	files_search_var($1)
+-	allow $1 var_log_t:dir search;
++	allow $1 var_log_t:dir search_dir_perms;
+ ')
+ 
+ #######################################
+@@ -326,7 +328,7 @@
+ 		type var_log_t;
+ 	')
+ 
+-	dontaudit $1 var_log_t:dir search;
++	dontaudit $1 var_log_t:dir search_dir_perms;
+ ')
+ 
+ #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-17 11:43:02.000000000 -0400
@@ -1863,7 +2013,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-20 11:25:38.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-25 15:18:08.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -1900,7 +2050,18 @@
  
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
-@@ -534,20 +542,27 @@
+@@ -456,6 +464,10 @@
+ 
+ miscfiles_read_localization(restorecond_t)
+ 
++optional_policy(`
++	nis_use_ypbind(restorecond_t)
++')
++
+ #################################
+ #
+ # Run_init local policy
+@@ -534,20 +546,27 @@
  # semodule local policy
  #
  
@@ -1929,7 +2090,7 @@
  corecmd_exec_bin(semanage_t)
  corecmd_exec_sbin(semanage_t)
  
-@@ -590,11 +605,15 @@
+@@ -590,11 +609,15 @@
  userdom_search_sysadm_home_dirs(semanage_t)
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- selinux-policy.spec	25 Jul 2006 18:24:28 -0000	1.234
+++ selinux-policy.spec	26 Jul 2006 17:58:28 -0000	1.235
@@ -68,6 +68,9 @@
 %{_usr}/share/selinux/devel/policygentool
 %{_usr}/share/selinux/devel/example.*
 %attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
+%dir %{_usr}/share/selinux/targeted
+%dir %{_usr}/share/selinux/strict
+%dir %{_usr}/share/selinux/mls
 
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 bare \
@@ -75,6 +78,9 @@
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
+%define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
+awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "-i %%s.pp ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+
 %define installCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 base.pp \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 modules \
@@ -101,7 +107,6 @@
 
 %define fileList() \
 %defattr(-,root,root) \
-%dir %{_usr}/share/selinux/%1 \
 %{_usr}/share/selinux/%1/*.pp \
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
@@ -140,8 +145,7 @@
 
 %define rebuildpolicy() \
 ( cd /usr/share/selinux/%1; \
-x=`ls *.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
-semodule -b base.pp $x -s %1; \
+semodule -b base.pp %{expand:%%moduleList %1} -s %1; \
 );\
 rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
 
@@ -170,6 +174,9 @@
 touch %{buildroot}%{_sysconfdir}/selinux/config
 touch %{buildroot}%{_sysconfdir}/sysconfig/selinux
 
+# Always create policy module package directories
+mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,strict,mls}/
+
 # Install devel
 make clean
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%3 install-headers install-docs
@@ -333,7 +340,7 @@
 semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init -r libraries -r locallogin -r logging -r lvm -r miscfiles -r modutils -r mount -r mta -r netutils -r selinuxutil -r storage -r sysnetwork -r udev -r userdomain -r vpnc -r xend $x -s strict
 
 %triggerpostun strict -- strict <= 2.0.7
-%{rebuildpolicy} strict 
+%rebuildpolicy strict 
 
 %files strict
 %fileList strict
@@ -341,8 +348,11 @@
 %endif
 
 %changelog
-* Tue Jul 25 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
+- Added Paul Howorth patch to only load policy packages shipped 
+  with this package
 - Allow pidof from initrc to ptrace higher level domains
+- Allow firstboot to communicate with hal via dbus
 
 * Mon Jul 24 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-10
 - Add policy for /var/run/ldapi



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:00:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:00:30 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.135,1.136
Message-ID: <200607261800.k6QI0UE8020436@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20397

Modified Files:
	control-center.spec 
Log Message:
* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-4.fc5
- Add devel package.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- control-center.spec	26 Jul 2006 17:54:49 -0000	1.135
+++ control-center.spec	26 Jul 2006 18:00:19 -0000	1.136
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.14.2
-Release: 2
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -248,7 +248,7 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-2
+* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-4.fc5
 - Add devel package.
 
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:16:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:16:44 -0400
Subject: rpms/desktop-backgrounds/devel .cvsignore, 1.10, 1.11 sources, 1.14,
	1.15
Message-ID: <200607261816.k6QIGi8w002590@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1114

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Oct 2005 17:59:59 -0000	1.10
+++ .cvsignore	26 Jul 2006 18:16:42 -0000	1.11
@@ -1,6 +1 @@
-Propaganda-1.0.0.tar.gz
-redhat-backgrounds-6.tar.bz2
-redhat-backgrounds-7.tar.bz2
-redhat-backgrounds-8.tar.bz2
-redhat-backgrounds-9.tar.bz2
-redhat-backgrounds-10.tar.bz2
+redhat-backgrounds-11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Oct 2005 17:59:59 -0000	1.14
+++ sources	26 Jul 2006 18:16:42 -0000	1.15
@@ -1,2 +1 @@
-9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
-2cca986209f06acf1bbc2cb1e6c5e6cd  redhat-backgrounds-10.tar.bz2
+0c9c02e17509c64d218551c0464f47e3  redhat-backgrounds-11.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:22:09 -0400
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.28,1.29
Message-ID: <200607261822.k6QIM9ja019287@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19273

Modified Files:
	desktop-file-utils.spec 
Log Message:
bump


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- desktop-file-utils.spec	12 Jul 2006 05:34:04 -0000	1.28
+++ desktop-file-utils.spec	26 Jul 2006 18:22:07 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 6.2
+Release: 7
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch
@@ -57,7 +57,7 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.10-6.2
+* Wed Jul 26 2006 Jesse Keating <jkeating at redhat.com> - 0.10-7
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-6.1



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:22:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:22:53 -0400
Subject: rpms/conga/FC-5 conga.spec,1.5,1.6 sources,1.7,1.8
Message-ID: <200607261822.k6QIMr6q019374@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19360

Modified Files:
	conga.spec sources 
Log Message:
Update Luci to Plone 2.5


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- conga.spec	25 Jul 2006 21:05:07 -0000	1.5
+++ conga.spec	26 Jul 2006 18:22:51 -0000	1.6
@@ -11,7 +11,7 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel  8%{?dist}
+%define rel  9%{?dist}
 
 %define include_zope_and_plone     no
 %define zope_archive               Zope-2.9.3
@@ -119,7 +119,7 @@
 %else
 Requires: python
 Requires: zope
-Requires: plone
+Requires: plone >= 2.5
 %endif
 Requires: openssl mailcap stunnel 
 Requires: sed util-linux
@@ -472,6 +472,8 @@
 
 
 %changelog
+* Wed Jul 26 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-9
+- Update Luci to Plone 2.5
 * Tue Jul 25 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-8
 - New build with a lot of implementation details on Luci
 - Last build with plone 2.1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Jul 2006 21:55:27 -0000	1.7
+++ sources	26 Jul 2006 18:22:51 -0000	1.8
@@ -1 +1 @@
-e6cbc0962668216ae643bc8ef8d9d818  conga-0.8.tar.gz
+f13297cac0fdc989981e4a766e698649  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:28:22 -0400
Subject: rpms/gnuplot/devel gnuplot.spec,1.27,1.28
Message-ID: <200607261828.k6QISMlc019525@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnuplot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19512

Modified Files:
	gnuplot.spec 
Log Message:
bump


Index: gnuplot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnuplot.spec	12 Jul 2006 06:12:12 -0000	1.27
+++ gnuplot.spec	26 Jul 2006 18:28:20 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A program for plotting mathematical expressions and data.
 Name: gnuplot
 Version: 4.0.0
-Release: 11.1
+Release: 12
 License: Redistributable, with restrictions
 Group: Applications/Engineering
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -92,7 +92,7 @@
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-11.1
+* Wed Jul 26 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-12
 - rebuild
 
 * Wed Mar 01 2006 Karsten Hopp <karsten at redhat.de> 4.0.0-11



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:34:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:34:39 -0400
Subject: rpms/firefox/devel firefox.spec,1.127,1.128
Message-ID: <200607261834.k6QIYdM9019863@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19804

Modified Files:
	firefox.spec 
Log Message:



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- firefox.spec	25 Jul 2006 19:15:28 -0000	1.127
+++ firefox.spec	26 Jul 2006 18:34:34 -0000	1.128
@@ -10,7 +10,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.4
-Release:        4
+Release:        5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:37:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:37:48 -0400
Subject: rpms/mx4j/devel mx4j.spec,1.53,1.54
Message-ID: <200607261837.k6QIbmE7020072@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20042

Modified Files:
	mx4j.spec 
Log Message:
* Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_8fc
- Unstub docs.




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mx4j.spec	24 Jul 2006 15:33:41 -0000	1.53
+++ mx4j.spec	26 Jul 2006 18:37:46 -0000	1.54
@@ -36,7 +36,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        4jpp_7fc
+Release:        4jpp_8fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -173,11 +173,9 @@
 %build
 export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl"
 
-
 cd build
-#ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
-export ANT_OPTS="-Dgnu.gcj.precompiled.db.path='' -verbose"
-ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools
+# ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -201,10 +199,7 @@
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/stub
-mkdir -p dist/docs
-touch dist/docs/stub
+cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -266,6 +261,9 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_8fc
+- Unstub docs.
+
 * Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:3.0.1-4jpp_7fc
 - Require xerces-j2.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:40:05 -0400
Subject: rpms/mkinitrd/devel sources,1.145,1.146
Message-ID: <200607261840.k6QIe5wp030597@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30566

Modified Files:
	sources 
Log Message:
- update the tarball


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- sources	26 Jul 2006 17:52:56 -0000	1.145
+++ sources	26 Jul 2006 18:40:03 -0000	1.146
@@ -1,2 +1,2 @@
 5fb48a0a1d1c641c96194e429742d53c  bdevid-0.3.tar.bz2
-29d7eba0d6c5f5f9ecaf69208220740d  mkinitrd-5.1.2.tar.bz2
+7979cdacfbbb428e996469752e63e69c  mkinitrd-5.1.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:54:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:54:02 -0400
Subject: rpms/hal/devel .cvsignore, 1.39, 1.40 hal.spec, 1.101, 1.102 sources,
	1.40, 1.41
Message-ID: <200607261854.k6QIs2VE017643@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17571

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
- Point release from upstream that fixes HAL with new kernels



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	24 Feb 2006 17:17:34 -0000	1.39
+++ .cvsignore	26 Jul 2006 18:53:59 -0000	1.40
@@ -27,3 +27,4 @@
 hal-0.5.5.1.cvs20060111.tar.gz
 hal-0.5.7-0.cvs20060213.tar.gz
 hal-0.5.7.tar.gz
+hal-0.5.7.1.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- hal.spec	24 Jul 2006 15:39:34 -0000	1.101
+++ hal.spec	26 Jul 2006 18:53:59 -0000	1.102
@@ -21,8 +21,8 @@
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.7
-Release: 14%{?dist}
+Version: 0.5.7.1
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -31,7 +31,6 @@
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
 Patch3: hal-0.5.7-pcmcia-readers.patch
 Patch4: hal-0.5.7-dbus-deprecated.patch
-Patch5: hal-0.5.7-expand-sysfs-names.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -105,7 +104,6 @@
 %patch2 -p1 -b .fix-for-nfs-and-autofs
 %patch3 -p0 -b .pcmcia-readers
 %patch4 -p1 -b .dbus-deprecated
-%patch5 -p1 -b .expand-sysfs-names
 %build
 
 %configure --disable-docbook-docs --with-os-type=redhat
@@ -210,6 +208,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
+- Point release from upstream that fixes HAL with new kernels
+
 * Mon Jul 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-14
 - Add patch to handle longer sysfs names
 - add dist tag to release


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	24 Feb 2006 17:17:34 -0000	1.40
+++ sources	26 Jul 2006 18:53:59 -0000	1.41
@@ -1 +1 @@
-4163afb8285db64e00e7b1392b401d92  hal-0.5.7.tar.gz
+d7a7741808ba130f8aff3f5d3b5689e4  hal-0.5.7.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 18:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 14:57:20 -0400
Subject: rpms/hal/devel hal.spec,1.102,1.103
Message-ID: <200607261857.k6QIvK3b019013@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18873

Modified Files:
	hal.spec 
Log Message:
- Upping kernel version to 2.6.15



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- hal.spec	26 Jul 2006 18:53:59 -0000	1.102
+++ hal.spec	26 Jul 2006 18:57:17 -0000	1.103
@@ -10,7 +10,7 @@
 %define util_linux_version      2.12a-16
 %define doxygen_version         1.3.9.1-1
 %define initscripts_version     8.04-1
-%define kernel_version          2.6.11
+%define kernel_version          2.6.15
 %define gettext_version	        0.14.1-14
 %define libusb_version          0.1.10a-1
 %define dmidecode_version       2.7
@@ -210,6 +210,7 @@
 %changelog
 * Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
 - Point release from upstream that fixes HAL with new kernels
+- Up minimum kernel version to 2.6.15
 
 * Mon Jul 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-14
 - Add patch to handle longer sysfs names



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:03:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:03:32 -0400
Subject: rpms/anaconda/devel anaconda.spec,1.429,1.430
Message-ID: <200607261903.k6QJ3W6X020562@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20527

Modified Files:
	anaconda.spec 
Log Message:
- update to 11.1.0.66-1


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- anaconda.spec	25 Jul 2006 17:29:01 -0000	1.429
+++ anaconda.spec	26 Jul 2006 19:03:29 -0000	1.430
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.65
+Version: 11.1.0.66
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -15,15 +15,17 @@
 BuildPreReq: libsepol-devel
 BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
 BuildPreReq: glib2-devel >= 2.11.1-5
-BuildPreReq: libdhcp-devel >= 1.9, mkinitrd-devel
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
+BuildPreReq: libdhcp-devel >= 1.9, mkinitrd-devel >= 5.1.2-1
+Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
+Requires: parted >= 1.7.1, pyparted >= 1.7.2
 Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0
-Requires: pyparted, libxml2-python, python-urlgrabber
+Requires: libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart, system-config-date
 Requires: device-mapper >= 1.01.05-3
 Requires: dosfstools e2fsprogs
 %ifnarch s390 s390x
-Requires: python-pyblock >= 0.16-1, libbdevid >= 5.1.0-1
+Requires: python-pyblock >= 0.17-1
+Requires: libbdevid >= 5.1.2-1, libbdevid-python
 %endif
 %ifnarch s390 s390x ppc64
 Requires: rhpxl
@@ -100,6 +102,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 11.1.0.66-1
+- Be smarter about log files during kickstart (clumens)
+- Make multipath and dmraid work
+- Add Kannada language (katzj)
+- Don't show onboot for rescue mode (katzj)
+- Fix AF_INET6 usage when making in6_addr (dcantrell)
+
 * Tue Jul 25 2006 Paul Nasrat <pnasrat at redhat.com> - 11.1.0.65-1
 - Fix noipv6 (pjones)
 - Fix nodmraid and nompath (katzj)



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:04:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:04:21 -0400
Subject: rpms/hal/FC-5 hal-0.5.7-pcmcia-readers.patch, NONE, 1.1 .cvsignore,
	1.39, 1.40 hal.spec, 1.93, 1.94 sources, 1.40, 1.41
Message-ID: <200607261904.k6QJ4LhE020747@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20687

Modified Files:
	.cvsignore hal.spec sources 
Added Files:
	hal-0.5.7-pcmcia-readers.patch 
Log Message:
- Point release from upstream that fixes HAL with new kernels
- Up minimum kernel version to 2.6.15
- Make PCMCIA card readers work again (#185557)



hal-0.5.7-pcmcia-readers.patch:
 fdi/information/10freedesktop/10-usb-card-readers.fdi |    7 +++++++
 hald/linux2/blockdev.c                                |    6 ++++++
 2 files changed, 13 insertions(+)

--- NEW FILE hal-0.5.7-pcmcia-readers.patch ---
Index: fdi/information/10freedesktop/10-usb-card-readers.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi,v
retrieving revision 1.6
diff -u -p -r1.6 10-usb-card-readers.fdi
--- fdi/information/10freedesktop/10-usb-card-readers.fdi	15 Jan 2006 16:54:05 -0000	1.6
+++ fdi/information/10freedesktop/10-usb-card-readers.fdi	26 Mar 2006 20:44:28 -0000
@@ -3,6 +3,13 @@
 <deviceinfo version="0.2">
   <device>
 
+    <!-- Should probably move to separate file for pcmcia devices -->
+    <match key="storage.bus" string="pcmcia">
+      <match key="storage.model" contains="FLASH">
+        <merge key="storage.drive_type" type="string">compact_flash</merge>
+      </match>
+    </match>
+
     <!-- Should probably move to separate file for firewire devices -->
     <match key="storage.bus" string="ieee1394">
       <match key="storage.model" string="FWIRE CF READER">
Index: hald/linux2/blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.39
diff -u -p -r1.39 blockdev.c
--- hald/linux2/blockdev.c	10 Mar 2006 18:46:16 -0000	1.39
+++ hald/linux2/blockdev.c	26 Mar 2006 20:44:29 -0000
@@ -768,6 +768,12 @@ hotplug_event_begin_add_blockdev (const 
 					physdev = d_it;
 					physdev_udi = udi_it;
 					hal_device_property_set_string (d, "storage.bus", "ide");
+					/* want to continue here, because it may be pcmcia */
+				} else if (strcmp (bus, "pcmcia") == 0) {
+					physdev = d_it;
+					physdev_udi = udi_it;
+					is_hotpluggable = TRUE;
+					hal_device_property_set_string (d, "storage.bus", "pcmcia");
 					break;
 				} else if (strcmp (bus, "mmc") == 0) {
 					physdev = d_it;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	24 Feb 2006 17:17:34 -0000	1.39
+++ .cvsignore	26 Jul 2006 19:04:18 -0000	1.40
@@ -27,3 +27,4 @@
 hal-0.5.5.1.cvs20060111.tar.gz
 hal-0.5.7-0.cvs20060213.tar.gz
 hal-0.5.7.tar.gz
+hal-0.5.7.1.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- hal.spec	25 Jul 2006 15:54:44 -0000	1.93
+++ hal.spec	26 Jul 2006 19:04:18 -0000	1.94
@@ -8,7 +8,7 @@
 %define util_linux_version      2.12a-16
 %define doxygen_version         1.3.9.1-1
 %define initscripts_version     8.04-1
-%define kernel_version          2.6.11
+%define kernel_version          2.6.15
 %define gettext_version	        0.14.1-14
 %define libusb_version          0.1.10a-1
 %define dmidecode_version       2.7
@@ -18,15 +18,15 @@
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.7
-Release: 3.fc5.4
+Version: 0.5.7.1
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Patch0: hal-0.5.7-fix-fedora-power-save.patch
 Patch1: hal-0.5.7-lid-open-fix.patch
 Patch2: hal-0.5.7-fix-for-nfs-and-autofs.patch
-Patch3: hal-0.5.7-expand-sysfs-names.patch
+Patch3: hal-0.5.7-pcmcia-readers.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -92,7 +92,8 @@
 %patch0 -p0 -b .fix-fedora-powersave
 %patch1 -p1 -b .lid-open-fix
 %patch2 -p1 -b .fix-for-nfs-and-autofs
-%patch3 -p1 -b .expand-sysfs-names
+%patch3 -p1 -b .pcmcia-readers
+
 %build
 
 %configure --disable-docbook-docs --with-os-type=redhat
@@ -197,6 +198,11 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
+- Point release from upstream that fixes HAL with new kernels
+- Up minimum kernel version to 2.6.15
+- Make PCMCIA card readers work again (#185557)
+
 * Tue Jul 25 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7-3.fc5.4
 - Add patch so HAL can work with the larger sysfs name length in newer kernel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	24 Feb 2006 17:17:34 -0000	1.40
+++ sources	26 Jul 2006 19:04:18 -0000	1.41
@@ -1 +1 @@
-4163afb8285db64e00e7b1392b401d92  hal-0.5.7.tar.gz
+d7a7741808ba130f8aff3f5d3b5689e4  hal-0.5.7.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:07:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:07:44 -0400
Subject: rpms/hal/devel hal.spec,1.103,1.104
Message-ID: <200607261907.k6QJ7ipf021464@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21395

Modified Files:
	hal.spec 
Log Message:
- Bump and rebuild



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- hal.spec	26 Jul 2006 18:57:17 -0000	1.103
+++ hal.spec	26 Jul 2006 19:07:42 -0000	1.104
@@ -22,7 +22,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -208,6 +208,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-2%{?dist}
+- Bump and rebuild
+
 * Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
 - Point release from upstream that fixes HAL with new kernels
 - Up minimum kernel version to 2.6.15



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:08:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:08:15 -0400
Subject: rpms/desktop-backgrounds/devel default-wide-background-fc.png, NONE,
	1.1 Makefile, 1.2, 1.3 desktop-backgrounds.spec, 1.35,
	1.36 sources, 1.15, 1.16
Message-ID: <200607261908.k6QJ8F5P021536@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21429

Modified Files:
	Makefile desktop-backgrounds.spec sources 
Added Files:
	default-wide-background-fc.png 
Log Message:
Added wide default desktop background



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	30 Sep 2004 16:00:01 -0000	1.2
+++ Makefile	26 Jul 2006 19:08:11 -0000	1.3
@@ -3,12 +3,4 @@
 NAME := desktop-backgrounds
 SPECFILE = $(firstword $(wildcard *.spec))
 
-TARGETS = generate-default-background
-
-.PHONY :: generate-default-background
-
-generate-default-background:
-	cp default-background-fc.png default-background.png
-	if echo $(COLLECTION) | grep -q -e "^dist-[^-]*E\($$\|-\)"; then cp default-background-rhel.png default-background.png; fi
-
 include ../common/Makefile.common


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- desktop-backgrounds.spec	6 Jun 2006 01:57:01 -0000	1.35
+++ desktop-backgrounds.spec	26 Jul 2006 19:08:12 -0000	1.36
@@ -1,9 +1,9 @@
-%define rh_backgrounds_version 10 
+%define rh_backgrounds_version 11 
 
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 33
+Release: 34
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -70,6 +70,7 @@
 
 # default background is now in fedora-logos
 rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default.png
+rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/default-wide.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,6 +108,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 2.0-34
+- Add wide desktop background
+
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redaht.com> 2.0-33
 - Really remove the default background
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Jul 2006 18:16:42 -0000	1.15
+++ sources	26 Jul 2006 19:08:12 -0000	1.16
@@ -1 +1,2 @@
+9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
 0c9c02e17509c64d218551c0464f47e3  redhat-backgrounds-11.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:12:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:12:29 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.26, 1.27 fedora-logos.spec,
	1.32, 1.33 sources, 1.28, 1.29
Message-ID: <200607261912.k6QJCTe6022320@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22269

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
+* Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.45-1
+- Add wide version of default desktop background




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	11 Jul 2006 19:25:57 -0000	1.26
+++ .cvsignore	26 Jul 2006 19:12:17 -0000	1.27
@@ -1,2 +1 @@
-fedora-logos-1.1.43.tar.bz2
-fedora-logos-1.1.44.tar.bz2
+fedora-logos-1.1.45.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fedora-logos.spec	11 Jul 2006 19:21:39 -0000	1.32
+++ fedora-logos.spec	26 Jul 2006 19:12:17 -0000	1.33
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.44
+Version: 1.1.45
 Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -8,8 +8,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Obsoletes: redhat-logos
-Provides: redhat-logos
-Provides: system-logos
+Provides: redhat-logos = %{version}-%{release}
+Provides: system-logos = %{version}-%{release}
 conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 
@@ -147,12 +147,15 @@
 # end i386 bits
 
 %changelog
+* Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.45-1
+- Add wide version of default desktop background
+
+* Tue Jul 25 2006 Florian La Roche <laroche at redhat.com>
+- add version/release to the Provides: in the specfile
+
 * Tue Jul 11 2006 Matthias Clasen <mclasen at redhat.com> 1.1.44-1
 - Move the complete lock dialog theme here
 
-* Wed Jun 28 2006 Jesse Keating <jkeating at redhat.com> 1.1.43-5
-- Test build using dist tag
-
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> 1.1.43-1
 - Add branded desktop background and move the lock dialog
   background to the right directory


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	11 Jul 2006 19:25:57 -0000	1.28
+++ sources	26 Jul 2006 19:12:17 -0000	1.29
@@ -1 +1 @@
-7fcc24120809c44babb36239b3e819e8  fedora-logos-1.1.44.tar.bz2
+e89cc7065404ab1a848e0299cd9ab0e4  fedora-logos-1.1.45.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:20:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:20:28 -0400
Subject: rpms/kernel/devel/configs config-generic, 1.237,
	1.237.2.1 config-x86-generic, 1.63,
	1.63.6.1 config-x86_64-generic, 1.50, 1.50.6.1
Message-ID: <200607261920.k6QJKSgO006388@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24578/configs

Modified Files:
      Tag: private-linville-jwltest-fc6-3-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.237
retrieving revision 1.237.2.1
diff -u -r1.237 -r1.237.2.1
--- config-generic	26 Jul 2006 03:00:34 -0000	1.237
+++ config-generic	26 Jul 2006 19:20:25 -0000	1.237.2.1
@@ -1071,6 +1071,10 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IPW3945_DEBUG is not set
+# CONFIG_IPW3945_MONITOR is not set
+# CONFIG_IPW3945_PROMISCUOUS is not set
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.63.6.1
diff -u -r1.63 -r1.63.6.1
--- config-x86-generic	15 Jul 2006 06:49:38 -0000	1.63
+++ config-x86-generic	26 Jul 2006 19:20:25 -0000	1.63.6.1
@@ -242,6 +242,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.50
retrieving revision 1.50.6.1
diff -u -r1.50 -r1.50.6.1
--- config-x86_64-generic	15 Jul 2006 06:49:38 -0000	1.50
+++ config-x86_64-generic	26 Jul 2006 19:20:25 -0000	1.50.6.1
@@ -112,6 +112,9 @@
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
+CONFIG_IPW3945=m
+CONFIG_IPW3945_MONITOR=y
+CONFIG_IPW3945_PROMISCUOUS=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:20:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:20:28 -0400
Subject: rpms/kernel/devel jwltest-e1000-7_1_6.patch, NONE,
	1.1.4.1 jwltest-e1000-7_1_9-k4.patch, NONE,
	1.1.2.1 jwltest-ipw3945-1_0_5.patch, NONE,
	1.1.8.1 kernel-2.6.spec, 1.2456, 1.2456.2.1
Message-ID: <200607261920.k6QJKSe5006385@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24578

Modified Files:
      Tag: private-linville-jwltest-fc6-3-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc6-3-branch
	jwltest-e1000-7_1_6.patch jwltest-e1000-7_1_9-k4.patch 
	jwltest-ipw3945-1_0_5.patch 
Log Message:


jwltest-e1000-7_1_6.patch:
 e1000.h         |   28 -
 e1000_ethtool.c |   41 +
 e1000_hw.c      | 1377 +++++++++++++++++++++++++-------------------------------
 e1000_hw.h      |   83 ++-
 e1000_main.c    |  342 ++++++-------
 e1000_osdep.h   |    4 
 e1000_param.c   |   94 ++-
 7 files changed, 923 insertions(+), 1046 deletions(-)

--- NEW FILE jwltest-e1000-7_1_6.patch ---
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c	2006-07-25 13:52:41.000000000 -0400
@@ -342,9 +342,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		tx_ring->count = TxDescriptors[bd];
-		e1000_validate_option(&tx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+			tx_ring->count = TxDescriptors[bd];
+			e1000_validate_option(&tx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(tx_ring->count,
+						REQ_TX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -363,9 +364,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		rx_ring->count = RxDescriptors[bd];
-		e1000_validate_option(&rx_ring->count, &opt, adapter);
-		E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+			rx_ring->count = RxDescriptors[bd];
+			e1000_validate_option(&rx_ring->count, &opt, adapter);
+			E1000_ROUNDUP(rx_ring->count,
+						REQ_RX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -377,9 +379,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		int rx_csum = XsumRX[bd];
-		e1000_validate_option(&rx_csum, &opt, adapter);
-		adapter->rx_csum = rx_csum;
+			int rx_csum = XsumRX[bd];
+			e1000_validate_option(&rx_csum, &opt, adapter);
+			adapter->rx_csum = rx_csum;
 	}
 	{ /* Flow Control */
 
@@ -399,9 +401,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		int fc = FlowControl[bd];
-		e1000_validate_option(&fc, &opt, adapter);
-		adapter->hw.fc = adapter->hw.original_fc = fc;
+			int fc = FlowControl[bd];
+			e1000_validate_option(&fc, &opt, adapter);
+			adapter->hw.fc = adapter->hw.original_fc = fc;
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -413,8 +415,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		adapter->tx_int_delay = TxIntDelay[bd];
-		e1000_validate_option(&adapter->tx_int_delay, &opt, adapter);
+			adapter->tx_int_delay = TxIntDelay[bd];
+			e1000_validate_option(&adapter->tx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -426,9 +429,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -440,8 +443,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		adapter->rx_int_delay = RxIntDelay[bd];
-		e1000_validate_option(&adapter->rx_int_delay, &opt, adapter);
+			adapter->rx_int_delay = RxIntDelay[bd];
+			e1000_validate_option(&adapter->rx_int_delay, &opt,
+								adapter);
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -453,9 +457,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-		e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-		                      adapter);
+			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+								adapter);
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -467,19 +471,21 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		adapter->itr = InterruptThrottleRate[bd];
-		switch (adapter->itr) {
-		case 0:
-			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);
-			break;
-		case 1:
-			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-				opt.name);
-			break;
-		default:
-			e1000_validate_option(&adapter->itr, &opt, adapter);
-			break;
-		}
+			adapter->itr = InterruptThrottleRate[bd];
+			switch (adapter->itr) {
+			case 0:
+				DPRINTK(PROBE, INFO, "%s turned off\n",
+					opt.name);
+				break;
+			case 1:
+				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
+					opt.name);
+				break;
+			default:
+				e1000_validate_option(&adapter->itr, &opt,
+					adapter);
+				break;
+			}
 	}
 	{ /* Smart Power Down */
 		struct e1000_option opt = {
@@ -489,9 +495,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_DISABLED
 		};
 
-		int spd = SmartPowerDownEnable[bd];
-		e1000_validate_option(&spd, &opt, adapter);
-		adapter->smart_power_down = spd;
+			int spd = SmartPowerDownEnable[bd];
+			e1000_validate_option(&spd, &opt, adapter);
+			adapter->smart_power_down = spd;
 	}
 	{ /* Kumeran Lock Loss Workaround */
 		struct e1000_option opt = {
@@ -577,8 +583,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = speed_list }}
 		};
 
-		speed = Speed[bd];
-		e1000_validate_option(&speed, &opt, adapter);
+			speed = Speed[bd];
+			e1000_validate_option(&speed, &opt, adapter);
 	}
 	{ /* Duplex */
 		struct e1000_opt_list dplx_list[] = {{           0, "" },
@@ -600,8 +606,8 @@ e1000_check_copper_options(struct e1000_
 			        "Speed/Duplex/AutoNeg parameter ignored.\n");
 			return;
 		}
-		dplx = Duplex[bd];
-		e1000_validate_option(&dplx, &opt, adapter);
+			dplx = Duplex[bd];
+			e1000_validate_option(&dplx, &opt, adapter);
 	}
 
 	if (AutoNeg[bd] != OPTION_UNSET && (speed != 0 || dplx != 0)) {
@@ -653,8 +659,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = an_list }}
 		};
 
-		an = AutoNeg[bd];
-		e1000_validate_option(&an, &opt, adapter);
+			an = AutoNeg[bd];
+			e1000_validate_option(&an, &opt, adapter);
 		adapter->hw.autoneg_advertised = an;
 	}
 
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h	2006-07-25 13:28:17.000000000 -0400
@@ -306,6 +306,7 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
+int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -313,8 +314,10 @@ void e1000_set_media_type(struct e1000_h
 int32_t e1000_setup_link(struct e1000_hw *hw);
[...5055 lines suppressed...]
-/**
- * e1000_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot. Implementation
- * resembles the first-half of the e1000_resume routine.
- */
-static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-
-	if (pci_enable_device(pdev)) {
-		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
-		return PCI_ERS_RESULT_DISCONNECT;
-	}
-	pci_set_master(pdev);
-
-	pci_enable_wake(pdev, 3, 0);
-	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
-
-	/* Perform card reset only on one instance of the card */
-	if (PCI_FUNC (pdev->devfn) != 0)
-		return PCI_ERS_RESULT_RECOVERED;
-
-	e1000_reset(adapter);
-	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
-
-	return PCI_ERS_RESULT_RECOVERED;
-}
-
-/**
- * e1000_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells us that
- * its OK to resume normal operation. Implementation resembles the
- * second-half of the e1000_resume routine.
- */
-static void e1000_io_resume(struct pci_dev *pdev)
-{
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct e1000_adapter *adapter = netdev->priv;
-	uint32_t manc, swsm;
-
-	if (netif_running(netdev)) {
-		if (e1000_up(adapter)) {
-			printk("e1000: can't bring device back up after reset\n");
-			return;
-		}
-	}
-
-	netif_device_attach(netdev);
-
-	if (adapter->hw.mac_type >= e1000_82540 &&
-	    adapter->hw.media_type == e1000_media_type_copper) {
-		manc = E1000_READ_REG(&adapter->hw, MANC);
-		manc &= ~(E1000_MANC_ARP_EN);
-		E1000_WRITE_REG(&adapter->hw, MANC, manc);
-	}
-
-	switch (adapter->hw.mac_type) {
-	case e1000_82573:
-		swsm = E1000_READ_REG(&adapter->hw, SWSM);
-		E1000_WRITE_REG(&adapter->hw, SWSM,
-				swsm | E1000_SWSM_DRV_LOAD);
-		break;
-	default:
-		break;
-	}
-
-	if (netif_running(netdev))
-		mod_timer(&adapter->watchdog_timer, jiffies);
-}
-
 /* e1000_main.c */
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c.orig	2006-07-25 13:27:03.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c	2006-07-25 13:28:17.000000000 -0400
@@ -33,6 +33,21 @@
 
 #include <asm/uaccess.h>
 
+extern char e1000_driver_name[];
+extern char e1000_driver_version[];
+
+extern int e1000_up(struct e1000_adapter *adapter);
+extern void e1000_down(struct e1000_adapter *adapter);
+extern void e1000_reinit_locked(struct e1000_adapter *adapter);
+extern void e1000_reset(struct e1000_adapter *adapter);
+extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
+extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
+extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
+extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
+extern void e1000_update_stats(struct e1000_adapter *adapter);
+
+
 struct e1000_stats {
 	char stat_string[ETH_GSTRING_LEN];
 	int sizeof_stat;
@@ -415,12 +430,12 @@ e1000_get_regs(struct net_device *netdev
 		regs_buff[23] = regs_buff[18]; /* mdix mode */
 		e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
 	} else {
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
 		regs_buff[13] = (uint32_t)phy_data; /* cable length */
 		regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 		regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
 		regs_buff[18] = regs_buff[13]; /* cable polarity */
 		regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
@@ -629,7 +644,7 @@ e1000_set_ringparam(struct net_device *n
 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
-	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+	if (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
 		msleep(1);
 
 	if (netif_running(adapter->netdev))
@@ -696,7 +711,6 @@ e1000_set_ringparam(struct net_device *n
 	}
 
 	clear_bit(__E1000_RESETTING, &adapter->flags);
-
 	return 0;
 err_setup_tx:
 	e1000_free_all_rx_resources(adapter);
@@ -751,7 +765,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* The status register is Read Only, so a write should fail.
 	 * Some bits that get toggled are ignored.
 	 */
-        switch (adapter->hw.mac_type) {
+	switch (adapter->hw.mac_type) {
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
@@ -882,10 +896,10 @@ e1000_intr_test(struct e1000_adapter *ad
 	*data = 0;
 
 	/* Hook up test interrupt handler just for this test */
-	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
-			 netdev->name, netdev)) {
- 		shared_int = FALSE;
- 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
+	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
+	                 netdev))
+		shared_int = FALSE;
+	else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
 			      netdev->name, netdev)){
 		*data = 1;
 		return -1;
@@ -1208,7 +1222,7 @@ e1000_nonintegrated_phy_loopback(struct 
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8100);
 
 	/* Wait for reset to complete. */
-	udelay(500);
+	usec_delay(500);
 
 	/* Have to setup TX_CLK and TX_CRS after software reset */
 	e1000_phy_reset_clk_and_crs(adapter);
@@ -1306,7 +1320,7 @@ e1000_integrated_phy_loopback(struct e10
 	if (adapter->hw.phy_type == e1000_phy_m88)
 		e1000_phy_disable_receiver(adapter);
 
-	udelay(500);
+	usec_delay(500);
 
 	return 0;
 }
@@ -1705,6 +1719,7 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
+
 		wol->wolopts = 0;
 
 do_defaults:
@@ -1908,7 +1923,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,
@@ -1922,7 +1937,7 @@ 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,
+	.get_perm_addr  		= ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)

jwltest-e1000-7_1_9-k4.patch:
 e1000.h         |   28 +
 e1000_ethtool.c |   41 -
 e1000_hw.c      | 1377 ++++++++++++++++++++++++++++++--------------------------
 e1000_hw.h      |   83 ---
 e1000_main.c    |  342 +++++++------
 e1000_osdep.h   |    4 
 e1000_param.c   |   94 +--
 7 files changed, 1046 insertions(+), 923 deletions(-)

--- NEW FILE jwltest-e1000-7_1_9-k4.patch ---
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_param.c	2006-07-26 14:36:39.000000000 -0400
@@ -342,10 +342,9 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-			tx_ring->count = TxDescriptors[bd];
-			e1000_validate_option(&tx_ring->count, &opt, adapter);
-			E1000_ROUNDUP(tx_ring->count,
-						REQ_TX_DESCRIPTOR_MULTIPLE);
+		tx_ring->count = TxDescriptors[bd];
+		e1000_validate_option(&tx_ring->count, &opt, adapter);
+		E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -364,10 +363,9 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-			rx_ring->count = RxDescriptors[bd];
-			e1000_validate_option(&rx_ring->count, &opt, adapter);
-			E1000_ROUNDUP(rx_ring->count,
-						REQ_RX_DESCRIPTOR_MULTIPLE);
+		rx_ring->count = RxDescriptors[bd];
+		e1000_validate_option(&rx_ring->count, &opt, adapter);
+		E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE);
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -379,9 +377,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-			int rx_csum = XsumRX[bd];
-			e1000_validate_option(&rx_csum, &opt, adapter);
-			adapter->rx_csum = rx_csum;
+		int rx_csum = XsumRX[bd];
+		e1000_validate_option(&rx_csum, &opt, adapter);
+		adapter->rx_csum = rx_csum;
 	}
 	{ /* Flow Control */
 
@@ -401,9 +399,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-			int fc = FlowControl[bd];
-			e1000_validate_option(&fc, &opt, adapter);
-			adapter->hw.fc = adapter->hw.original_fc = fc;
+		int fc = FlowControl[bd];
+		e1000_validate_option(&fc, &opt, adapter);
+		adapter->hw.fc = adapter->hw.original_fc = fc;
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -415,9 +413,8 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-			adapter->tx_int_delay = TxIntDelay[bd];
-			e1000_validate_option(&adapter->tx_int_delay, &opt,
-								adapter);
+		adapter->tx_int_delay = TxIntDelay[bd];
+		e1000_validate_option(&adapter->tx_int_delay, &opt, adapter);
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -429,9 +426,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
-			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
-								adapter);
+		adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
+		e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
+		                      adapter);
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -443,9 +440,8 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-			adapter->rx_int_delay = RxIntDelay[bd];
-			e1000_validate_option(&adapter->rx_int_delay, &opt,
-								adapter);
+		adapter->rx_int_delay = RxIntDelay[bd];
+		e1000_validate_option(&adapter->rx_int_delay, &opt, adapter);
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -457,9 +453,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
-			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
-								adapter);
+		adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
+		e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
+		                      adapter);
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -471,21 +467,19 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-			adapter->itr = InterruptThrottleRate[bd];
-			switch (adapter->itr) {
-			case 0:
-				DPRINTK(PROBE, INFO, "%s turned off\n",
-					opt.name);
-				break;
-			case 1:
-				DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
-					opt.name);
-				break;
-			default:
-				e1000_validate_option(&adapter->itr, &opt,
-					adapter);
-				break;
-			}
+		adapter->itr = InterruptThrottleRate[bd];
+		switch (adapter->itr) {
+		case 0:
+			DPRINTK(PROBE, INFO, "%s turned off\n", opt.name);
+			break;
+		case 1:
+			DPRINTK(PROBE, INFO, "%s set to dynamic mode\n",
+				opt.name);
+			break;
+		default:
+			e1000_validate_option(&adapter->itr, &opt, adapter);
+			break;
+		}
 	}
 	{ /* Smart Power Down */
 		struct e1000_option opt = {
@@ -495,9 +489,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_DISABLED
 		};
 
-			int spd = SmartPowerDownEnable[bd];
-			e1000_validate_option(&spd, &opt, adapter);
-			adapter->smart_power_down = spd;
+		int spd = SmartPowerDownEnable[bd];
+		e1000_validate_option(&spd, &opt, adapter);
+		adapter->smart_power_down = spd;
 	}
 	{ /* Kumeran Lock Loss Workaround */
 		struct e1000_option opt = {
@@ -583,8 +577,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = speed_list }}
 		};
 
-			speed = Speed[bd];
-			e1000_validate_option(&speed, &opt, adapter);
+		speed = Speed[bd];
+		e1000_validate_option(&speed, &opt, adapter);
 	}
 	{ /* Duplex */
 		struct e1000_opt_list dplx_list[] = {{           0, "" },
@@ -606,8 +600,8 @@ e1000_check_copper_options(struct e1000_
 			        "Speed/Duplex/AutoNeg parameter ignored.\n");
 			return;
 		}
-			dplx = Duplex[bd];
-			e1000_validate_option(&dplx, &opt, adapter);
+		dplx = Duplex[bd];
+		e1000_validate_option(&dplx, &opt, adapter);
 	}
 
 	if (AutoNeg[bd] != OPTION_UNSET && (speed != 0 || dplx != 0)) {
@@ -659,8 +653,8 @@ e1000_check_copper_options(struct e1000_
 					 .p = an_list }}
 		};
 
-			an = AutoNeg[bd];
-			e1000_validate_option(&an, &opt, adapter);
+		an = AutoNeg[bd];
+		e1000_validate_option(&an, &opt, adapter);
 		adapter->hw.autoneg_advertised = an;
 	}
 
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_hw.h	2006-07-26 14:36:39.000000000 -0400
@@ -306,7 +306,6 @@ typedef enum {
 /* Initialization */
 int32_t e1000_reset_hw(struct e1000_hw *hw);
 int32_t e1000_init_hw(struct e1000_hw *hw);
-int32_t e1000_id_led_init(struct e1000_hw * hw);
 int32_t e1000_set_mac_type(struct e1000_hw *hw);
 void e1000_set_media_type(struct e1000_hw *hw);
 
@@ -314,10 +313,8 @@ void e1000_set_media_type(struct e1000_h
 int32_t e1000_setup_link(struct e1000_hw *hw);
[...5055 lines suppressed...]
+/**
+ * e1000_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot. Implementation
+ * resembles the first-half of the e1000_resume routine.
+ */
+static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct e1000_adapter *adapter = netdev->priv;
+
+	if (pci_enable_device(pdev)) {
+		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+	pci_set_master(pdev);
+
+	pci_enable_wake(pdev, 3, 0);
+	pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+
+	/* Perform card reset only on one instance of the card */
+	if (PCI_FUNC (pdev->devfn) != 0)
+		return PCI_ERS_RESULT_RECOVERED;
+
+	e1000_reset(adapter);
+	E1000_WRITE_REG(&adapter->hw, WUS, ~0);
+
+	return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * e1000_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation. Implementation resembles the
+ * second-half of the e1000_resume routine.
+ */
+static void e1000_io_resume(struct pci_dev *pdev)
+{
+	struct net_device *netdev = pci_get_drvdata(pdev);
+	struct e1000_adapter *adapter = netdev->priv;
+	uint32_t manc, swsm;
+
+	if (netif_running(netdev)) {
+		if (e1000_up(adapter)) {
+			printk("e1000: can't bring device back up after reset\n");
+			return;
+		}
+	}
+
+	netif_device_attach(netdev);
+
+	if (adapter->hw.mac_type >= e1000_82540 &&
+	    adapter->hw.media_type == e1000_media_type_copper) {
+		manc = E1000_READ_REG(&adapter->hw, MANC);
+		manc &= ~(E1000_MANC_ARP_EN);
+		E1000_WRITE_REG(&adapter->hw, MANC, manc);
+	}
+
+	switch (adapter->hw.mac_type) {
+	case e1000_82573:
+		swsm = E1000_READ_REG(&adapter->hw, SWSM);
+		E1000_WRITE_REG(&adapter->hw, SWSM,
+				swsm | E1000_SWSM_DRV_LOAD);
+		break;
+	default:
+		break;
+	}
+
+	if (netif_running(netdev))
+		mod_timer(&adapter->watchdog_timer, jiffies);
+}
+
 /* e1000_main.c */
--- linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c.orig	2006-07-26 14:35:27.000000000 -0400
+++ linux-2.6.17.noarch/drivers/net/e1000/e1000_ethtool.c	2006-07-26 14:36:39.000000000 -0400
@@ -33,21 +33,6 @@
 
 #include <asm/uaccess.h>
 
-extern char e1000_driver_name[];
-extern char e1000_driver_version[];
-
-extern int e1000_up(struct e1000_adapter *adapter);
-extern void e1000_down(struct e1000_adapter *adapter);
-extern void e1000_reinit_locked(struct e1000_adapter *adapter);
-extern void e1000_reset(struct e1000_adapter *adapter);
-extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
-extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);
-extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter);
-extern void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
-extern void e1000_update_stats(struct e1000_adapter *adapter);
-
-
 struct e1000_stats {
 	char stat_string[ETH_GSTRING_LEN];
 	int sizeof_stat;
@@ -430,12 +415,12 @@ e1000_get_regs(struct net_device *netdev
 		regs_buff[23] = regs_buff[18]; /* mdix mode */
 		e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0);
 	} else {
-		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
+        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data);
 		regs_buff[13] = (uint32_t)phy_data; /* cable length */
 		regs_buff[14] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[15] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
 		regs_buff[16] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
-		e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
+        	e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 		regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */
 		regs_buff[18] = regs_buff[13]; /* cable polarity */
 		regs_buff[19] = 0;  /* Dummy (to align w/ IGP phy reg dump) */
@@ -644,7 +629,7 @@ e1000_set_ringparam(struct net_device *n
 	tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
 	rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
 
-	if (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
+	while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
 		msleep(1);
 
 	if (netif_running(adapter->netdev))
@@ -711,6 +696,7 @@ e1000_set_ringparam(struct net_device *n
 	}
 
 	clear_bit(__E1000_RESETTING, &adapter->flags);
+
 	return 0;
 err_setup_tx:
 	e1000_free_all_rx_resources(adapter);
@@ -765,7 +751,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* The status register is Read Only, so a write should fail.
 	 * Some bits that get toggled are ignored.
 	 */
-	switch (adapter->hw.mac_type) {
+        switch (adapter->hw.mac_type) {
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
@@ -896,10 +882,10 @@ e1000_intr_test(struct e1000_adapter *ad
 	*data = 0;
 
 	/* Hook up test interrupt handler just for this test */
-	if (!request_irq(irq, &e1000_test_intr, SA_PROBEIRQ, netdev->name,
-	                 netdev))
-		shared_int = FALSE;
-	else if (request_irq(irq, &e1000_test_intr, SA_SHIRQ,
+	if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
+			 netdev->name, netdev)) {
+ 		shared_int = FALSE;
+ 	} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
 			      netdev->name, netdev)){
 		*data = 1;
 		return -1;
@@ -1222,7 +1208,7 @@ e1000_nonintegrated_phy_loopback(struct 
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8100);
 
 	/* Wait for reset to complete. */
-	usec_delay(500);
+	udelay(500);
 
 	/* Have to setup TX_CLK and TX_CRS after software reset */
 	e1000_phy_reset_clk_and_crs(adapter);
@@ -1320,7 +1306,7 @@ e1000_integrated_phy_loopback(struct e10
 	if (adapter->hw.phy_type == e1000_phy_m88)
 		e1000_phy_disable_receiver(adapter);
 
-	usec_delay(500);
+	udelay(500);
 
 	return 0;
 }
@@ -1719,7 +1705,6 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
 
 do_defaults:
@@ -1923,7 +1908,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,
@@ -1937,7 +1922,7 @@ 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,
+	.get_perm_addr		= ethtool_op_get_perm_addr,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)

jwltest-ipw3945-1_0_5.patch:
 Documentation/networking/README.ipw3945 |  984 +
 drivers/net/wireless/Kconfig            |  106 
 drivers/net/wireless/Makefile           |    2 
 drivers/net/wireless/ipw3945.c          |16651 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/ipw3945.h          | 2556 ++++
 drivers/net/wireless/ipw3945_daemon.h   |  403 
 6 files changed, 20702 insertions(+)

--- NEW FILE jwltest-ipw3945-1_0_5.patch ---
--- linux-2.6.17.noarch/Documentation/networking/README.ipw3945.orig	2006-06-26 12:09:00.000000000 -0400
+++ linux-2.6.17.noarch/Documentation/networking/README.ipw3945	2006-06-26 12:09:05.000000000 -0400
@@ -0,0 +1,998 @@
+
+Intel(R) PRO/Wireless 3945ABG Network Connection driver for Linux* in 
+support of:
+
+Intel(R) PRO/Wireless 3945ABG Network Connection Adapter
+Intel(R) PRO/Wireless 3945BG Network Connection Adapter
+
+Note: The Intel(R) PRO/Wireless 3945ABG Network Connection driver for 
+Linux is a unified driver that works on both hardware adapters listed 
+above. In this document the Intel(R) PRO/Wireless 3945ABG Network Connection 
+driver for Linux will be used to reference the unified driver.
+
+Copyright (C) 2005 - 2006, Intel Corporation
+
+README.ipw3945
+
+Version: 1.0.5
+Date   : May 22, 2006
+
+
+Index
+-----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+1.   Introduction
+1.1. Overview of Features
+2.   Loading the Driver
+3.   Feature Details
+3.1. LEDs
+3.2. Association Details
+3.3. Roaming Details
+3.4. Scanning Details
+3.5. Antenna Selection and "Diversity"
+3.6. IEEE 802.11h Details 
+3.7. Tx Power 
+3.8. Security Details
+3.9. Power Management
+4.   Configuring the driver
+4.1. Command Line Parameters
+4.3. Sysfs Helper Files:
+5.   Wireless Tools Details
+5.1. iwlist
+5.2. iwpriv
+5.3. iwconfig
+6.   Support
+7.   License
+
+
+===============================================
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+===============================================
+
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+
+
+===============================================
+1.   Introduction
+===============================================
+The following sections attempt to provide a brief introduction to using 
+the Intel(R) PRO/Wireless 3945ABG driver for Linux.
+
+This document is not meant to be a comprehensive manual on 
+understanding or using wireless technologies, but should be sufficient 
+to get you moving without wires on Linux.
+
+For information on building and installing the driver, see the INSTALL
+file.
+
+
+1.1. Overview of Features
+-----------------------------------------------
+The current release (1.0.5) supports the following features:
+
++ BSS mode (Infrastructure, Managed)
++ IBSS mode (Ad-Hoc)
++ WEP (OPEN and SHARED KEY mode)
++ 802.1x EAP via wpa_supplicant and xsupplicant
++ 802.11i (WPA/WPA2)
++ Wireless Extension support 
++ Full B and G rate support
++ Full A rate support (ABG only)
++ Transmit power control
++ S state support (ACPI suspend/resume)
+
+The following features are currently enabled, but not officially
+supported:
+
++ QoS
++ Monitor mode (aka RFMon)
++ Associated RF promiscuous mode
++ Frame Rx simulation
+
+The distinction between officially supported and enabled is a reflection 
+of the amount of validation and interoperability testing that has been
+performed on a given feature. Note: in addition, the features may not have 
+all of the code in the driver to fully enable the feature.
+
+
+===============================================
+2. Loading the Driver
+===============================================
+
+See the INSTALL document for information on installing the driver.
+
+Once installed, a typical method for launching the driver and the 
+regulatory daemon is via the load script provided in the source package:
+
+	# ./load debug=0x43fff   <--- You need to be root for this
+
+NOTE:  You will not be able to rmmod the driver so long as the 
+ipw3945d daemon is running.  
+
+If you followed the steps of the INSTALL document to set up your
+modprobe.conf, you can load the module by simply running:
+
+	# modprobe ipw3945       <--- You need to be root for this
+
+If you did not configure your modprobe.conf to automatically launch the 
+regulatory daemon (see INSTALL), you must do so manually after loading 
+the module:
+
+	# /sbin/ipw3945d	<--- You need to be root for this
+
+If you want to unload the module (and kill the deamon as well), you can 
+simply use the unload script:
+
+	# ./unload               <--- You need to be root for this
+
+or likewise if you configured modprobe.conf:
+
+	# modprobe -r ipw3945       <--- You need to be root for this
+
+If you did not configure modprobe.conf to unload the regulatory daemon 
+and are not using the unload script, you need to kill the regulatory 
+daemon before you will be able to unload the module:
+
+	# /sbin/ipw3945d --kill	<--- You need to be root for this
+	# modprobe -r ipw3945
+
+
+===============================================
+3. Feature Details
+===============================================
+
+3.1. LEDs
+-----------------------------------------------
+
+The driver will attempt to control the wireless LED, if one is 
+configured in hardware.  There are typically two LEDs:
+
+	Activity -- used to indicate wireless activity
+	Link     -- used to indicate wireless link
[...20347 lines suppressed...]
+ * a command to appear. Currently set to 60s. */
+#define DAEMON_POLL_INTERVAL 60000
+
+#define DAEMON_BUF_SIZE 3000
+
+struct daemon_cmd_hdr {
+	u8 cmd;
+	u8 flags;
+	u8 token;
+	u8 reserved1;
+	u16 version;
+	u16 data_len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+struct daemon_cmd {
+	struct daemon_cmd_hdr hdr;
+	u8 data[DAEMON_BUF_SIZE];
+} __attribute__ ((packed));
+
+/*  driver <- daemon error response */
+struct daemon_error {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon synchronous command done */
+struct daemon_cmd_done {
+	u8 cmd_requested;
+	u8 reserved1;
+	u16 reserved2;
+	s32 return_code;
+} __attribute__ ((packed));
+
+/*  driver <- daemon regulatory information
+ *
+ * The following is sent from the daemon to the driver
+ * to inform the driver of current channel capabilities and
+ * restrictions.
+ *
+ * Immediately after INIT is provided from the driver the
+ * daemon will send the full channel map.
+ *
+ * After a channel has been selected via rx_config, the
+ * daemon will send periodic updates when the channel limits
+ * change for a specific channel.
+ *
+ * NOTE:  The txpower field represents the current configured
+ * power as directed by either the user (sent to the daemon
+ * through the DAEMON_SYNC::DAEMON_SYNC_TXPOWER_LIMIT command)
+ * or as specified through the currently associated access
+ * point.  The max_txpower is the highest the channel is
+ * allowed to transmit.
+ *
+ */
+enum {
+	DAEMON_A_BAND = (1 << 0),	/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	DAEMON_IBSS_ALLOWED = (1 << 1),
+	DAEMON_ACTIVE_ALLOWED = (1 << 2),
+	DAEMON_RADAR_DETECT = (1 << 3),
+};
+struct daemon_channel_info {
+	u8 channel;
+	u8 flags;
+	s8 txpower;
+	s8 max_txpower;
+};
+struct daemon_regulatory_info {
+	u16 count;		/* Number of channels provided */
+	struct daemon_channel_info channel_info[0];
+} __attribute__ ((packed));
+
+/* driver <- daemon information request */
+struct daemon_request_info {
+	u8 request;
+} __attribute__ ((packed));
+
+/* driver <- daemon set state */
+struct daemon_set_state {
+	u8 state;
+} __attribute__ ((packed));
+
+/* driver -> daemon scan request */
+#define DAEMON_MIN_24GHZ_CHANNEL 1
+#define DAEMON_MAX_24GHZ_CHANNEL 14
+#define DAEMON_MIN_52GHZ_CHANNEL 34
+#define DAEMON_MAX_52GHZ_CHANNEL 165
+
+#define DAEMON_SCAN_FLAG_24GHZ  (1<<0)
+#define DAEMON_SCAN_FLAG_52GHZ  (1<<1)
+#define DAEMON_SCAN_FLAG_ACTIVE (1<<2)
+#define DAEMON_SCAN_FLAG_DIRECT (1<<3)
+
+#define DAEMON_MAX_CMD_SIZE 1024
+
+enum {
+	DAEMON_TXRATE_1 = 0xa,
+	DAEMON_TXRATE_2 = 0x14,
+	DAEMON_TXRATE_5_5 = 0x37,
+	DAEMON_TXRATE_6 = 0xd,
+	DAEMON_TXRATE_9 = 0xf,
+	DAEMON_TXRATE_11 = 0x6e,
+	DAEMON_TXRATE_12 = 0x5,
+	DAEMON_TXRATE_18 = 0x7,
+	DAEMON_TXRATE_24 = 0x9,
+	DAEMON_TXRATE_36 = 0xb,
+	DAEMON_TXRATE_48 = 0x1,
+	DAEMON_TXRATE_54 = 0x3,
+};
+
+struct daemon_scan_channel {
+	u8 channel;
+	u8 request_active;
+	u16 active_dwell;
+	u16 passive_dwell;
+} __attribute__ ((packed));
+
+struct daemon_ssid_ie {
+	u8 id;
+	u8 len;
+	u8 ssid[32];
+} __attribute__ ((packed));
+
+struct daemon_rx_config {
+	u8 dev_type;
+	u16 channel;
+	u32 flags;
+	u32 filter_flags;
+	u8 ofdm_basic_rates;
+	u8 cck_basic_rates;
+	u8 node_addr[6];
+	u8 bssid_addr[6];
+	u16 assoc_id;
+	u16 beacon_interval;
+} __attribute__ ((packed));
+
+#define DAEMON_MAX_SCAN_SIZE 1024
+struct daemon_scan_request {
+	u8 flags;		/* 0 - 2.4Ghz, 1 - 5.2Ghz */
+	u8 channel_count;
+	u16 probe_request_len;
+	u16 quiet_time;		/* dwell only this long on quiet chnl (active scan) */
+	u16 quiet_plcp_th;	/* quiet chnl is < this # pkts (typ. 1) */
+	u32 suspend_time;	/* pause scan this long when returning to svc chnl */
+	u32 max_out_time;	/* max msec to be out of associated (service) chnl */
+	u8 probe_request_rate;	/* rate to send probe request */
+	u32 filter_flags;
+	u32 rxon_flags;
+	struct daemon_ssid_ie direct_scan;
+	u8 data[0];
+	/*
+	   The channels start after the probe request payload and are of type:
+
+	   struct daemon_scan_channel channels[0];
+
+	   NOTE:  Only one band of channels can be scanned per pass.  You
+	   can not mix 2.4Ghz channels and 5.2Ghz channels and must
+	   request a scan multiple times (not concurrently)
+
+	 */
+} __attribute__ ((packed));
+
+/* driver -> daemon 11h frame */
+struct daemon_80211_frame {
+	u8 channel;
+	u8 reserved1;
+	u16 rssi;
+	u16 reserved2;
+	u64 tsf;
+	u32 beacon_time;
+	u16 frame_len;
+	u8 frame[0];
+} __attribute__ ((packed));
+
+struct daemon_sync_txpower_limit {
+	u8 channel;
+	s8 power;
+} __attribute__ ((packed));
+
+enum {
+	DAEMON_SYNC_UNINIT = 0,
+	DAEMON_SYNC_INIT,
+	DAEMON_SYNC_SCAN_COMPLETE,
+	DAEMON_SYNC_TXPOWER_LIMIT,
+	DAEMON_SYNC_MEASURE_REPORT,
+	DAEMON_SYNC_TX_STATUS,
+	DAEMON_SYNC_SUSPEND,
+	DAEMON_SYNC_RESUME,
+};
+
+/* driver  -> daemon */
+struct daemon_sync_cmd {
+	u16 state;
+	u16 len;
+	u8 data[0];
+} __attribute__ ((packed));
+
+#endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2456
retrieving revision 1.2456.2.1
diff -u -r1.2456 -r1.2456.2.1
--- kernel-2.6.spec	26 Jul 2006 16:18:31 -0000	1.2456
+++ kernel-2.6.spec	26 Jul 2006 19:20:24 -0000	1.2456.2.1
@@ -31,7 +31,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.jwltest.3
 %define signmodules 0
 %define xen_hv_cset 10730
 %define make_target bzImage
@@ -369,6 +369,9 @@
 Patch1203: linux-2.6-NFSD-badness.patch
 
 # NIC driver updates
+Patch1300: jwltest-ipw3945-1_0_5.patch
+Patch1301: jwltest-e1000-7_1_6.patch
+Patch1302: jwltest-e1000-7_1_9-k4.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -898,6 +901,12 @@
 %patch1203 -p1
 
 # NIC driver fixes.
+# ipw3945 1.0.5
+%patch1300 -p1
+# e1000 7.1.6
+%patch1301 -p1
+# e1000 7.1.9-k4
+%patch1302 -p1
 
 # Filesystem patches.
 # Squashfs



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:28:03 -0400
Subject: rpms/struts/devel struts-1.2.8.build.patch, 1.3, 1.4 struts.spec,
	1.37, 1.38
Message-ID: <200607261928.k6QJS353008278@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8188

Modified Files:
	struts-1.2.8.build.patch struts.spec 
Log Message:

Remove xalan-j2-serializer from classpath.



struts-1.2.8.build.patch:
 build-webapp.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: struts-1.2.8.build.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.8.build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- struts-1.2.8.build.patch	24 Jul 2006 18:43:37 -0000	1.3
+++ struts-1.2.8.build.patch	26 Jul 2006 19:28:00 -0000	1.4
@@ -1,5 +1,5 @@
 --- ./build-webapp.xml.sav	2005-11-08 03:55:28.000000000 -0500
-+++ ./build-webapp.xml	2006-07-24 14:41:30.000000000 -0400
++++ ./build-webapp.xml	2006-07-26 15:25:26.000000000 -0400
 @@ -219,6 +219,7 @@
    <mkdir   dir="${webapp.target}" />
    <mkdir   dir="${webapp.target}/WEB-INF" />
@@ -28,23 +28,3 @@
  </target>
  
  
---- ./build-webapps.xml.sav	2005-11-08 03:56:16.000000000 -0500
-+++ ./build-webapps.xml	2006-07-24 14:42:07.000000000 -0400
-@@ -189,7 +189,7 @@
-     </copy>
- 
-     <!-- Validate tiles docs -->
--    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
-+    <xmlvalidate warn="yes" failonerror="no" lenient="no">
-        <fileset dir="${build.home}/tiles-documentation" includes="**/*.html"/>
- 
-       <!-- Reference local DTDS to avoid network lookup -->
-@@ -290,7 +290,7 @@
-         documentation against the DTDs
- -->
- <target name="validate.docs" description="Validate generated XHTML documents">
--    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
-+    <xmlvalidate warn="yes" failonerror="no" lenient="no">
-        <fileset dir="${build.home}/documentation">
-         <include name="**/*.html"/>
-         <exclude name="download.html"/>


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- struts.spec	24 Jul 2006 18:24:44 -0000	1.37
+++ struts.spec	26 Jul 2006 19:28:00 -0000	1.38
@@ -7,7 +7,7 @@
 
 Name:		struts
 Version:	1.2.8
-Release: 	2jpp_15fc
+Release: 	2jpp_16fc
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -115,9 +115,7 @@
 %build
 
 # build struts
-# The new xalan needs xalan-j2-serializer
-export CLASSPATH=`build-classpath xalan-j2-serializer`
-ant -d -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
+ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
 	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
@@ -211,6 +209,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Wed Jul 26 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_16fc
+- Remove xalan-j2-serializer from classpath.
+
 * Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
 - Fixed classpath issue.
 - Removed spurious macros.



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:29:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:29:47 -0400
Subject: rpms/hal/FC-5 hal.spec,1.94,1.95
Message-ID: <200607261929.k6QJTlxm008881@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8794

Modified Files:
	hal.spec 
Log Message:
- patch level typo fixed



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- hal.spec	26 Jul 2006 19:04:18 -0000	1.94
+++ hal.spec	26 Jul 2006 19:29:44 -0000	1.95
@@ -92,7 +92,7 @@
 %patch0 -p0 -b .fix-fedora-powersave
 %patch1 -p1 -b .lid-open-fix
 %patch2 -p1 -b .fix-for-nfs-and-autofs
-%patch3 -p1 -b .pcmcia-readers
+%patch3 -p0 -b .pcmcia-readers
 
 %build
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:36:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:36:01 -0400
Subject: rpms/redhat-artwork/devel .cvsignore, 1.75, 1.76 redhat-artwork.spec,
	1.139, 1.140 sources, 1.77, 1.78
Message-ID: <200607261936.k6QJa1XF010378@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10042

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
use default sans font



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- .cvsignore	26 Jul 2006 03:25:35 -0000	1.75
+++ .cvsignore	26 Jul 2006 19:35:56 -0000	1.76
@@ -12,3 +12,4 @@
 redhat-artwork-0.242.tar.gz
 redhat-artwork-0.243.tar.gz
 redhat-artwork-0.244.tar.gz
+redhat-artwork-0.245.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- redhat-artwork.spec	26 Jul 2006 03:26:46 -0000	1.139
+++ redhat-artwork.spec	26 Jul 2006 19:35:56 -0000	1.140
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.244
+Version: 0.245
 Release: 1%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -179,6 +179,9 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.245-1
+- Use default Sans font in gdm login screens
+
 * Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 0.244-1
 - Fix themeing of menuitems in Bluecurve (#180181)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- sources	26 Jul 2006 03:25:35 -0000	1.77
+++ sources	26 Jul 2006 19:35:56 -0000	1.78
@@ -1,4 +1,4 @@
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-bcf4152f7c7d6495ff554845f873a0ef  redhat-artwork-0.244.tar.gz
+93f4248f1308cea83f5901c26a138ee7  redhat-artwork-0.245.tar.gz



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:43:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:43:12 -0400
Subject: rpms/hal/FC-5 hal.spec,1.95,1.96
Message-ID: <200607261943.k6QJhCRH012399@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/hal/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12347

Modified Files:
	hal.spec 
Log Message:
- Add BR on dbus-glib since dbus-devel doesn't pull it in



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/FC-5/hal.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- hal.spec	26 Jul 2006 19:29:44 -0000	1.95
+++ hal.spec	26 Jul 2006 19:43:09 -0000	1.96
@@ -19,7 +19,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -35,6 +35,7 @@
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
+BuildRequires: dbus-glib >= %{dbus_version}
 BuildRequires: python-devel
 BuildRequires: hwdata
 BuildRequires: libselinux-devel >= %{libselinux_version}
@@ -198,6 +199,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-2
+- Add BR on dbus-glib since dbus-devel doesn't pull it in
+
 * Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.7.1-1
 - Point release from upstream that fixes HAL with new kernels
 - Up minimum kernel version to 2.6.15



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:46:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:46:33 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.136,1.137
Message-ID: <200607261946.k6QJkXjQ020902@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20739

Modified Files:
	control-center.spec 
Log Message:
* Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-4.fc5
- Add devel package.
- Add gnome-doc-utils build requires.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- control-center.spec	26 Jul 2006 18:00:19 -0000	1.136
+++ control-center.spec	26 Jul 2006 19:46:31 -0000	1.137
@@ -83,6 +83,7 @@
 BuildRequires: evolution-data-server-devel
 BuildRequires: libXxf86misc-devel 
 BuildRequires: libxkbfile-devel
+BuildRequires: gnome-doc-utils
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -250,6 +251,7 @@
 %changelog
 * Wed Jul 26 2006 Kristian H?gsberg <krh at redhat.com> - 2.14.2-4.fc5
 - Add devel package.
+- Add gnome-doc-utils build requires.
 
 * Mon May 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-1
 - Update to 2.14.2



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:53:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:53:12 -0400
Subject: rpms/anaconda/devel .cvsignore,1.304,1.305 sources,1.426,1.427
Message-ID: <200607261953.k6QJrCiv030939@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30859

Modified Files:
	.cvsignore sources 
Log Message:
- update to 11.1.0.66-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- .cvsignore	25 Jul 2006 17:29:01 -0000	1.304
+++ .cvsignore	26 Jul 2006 19:53:09 -0000	1.305
@@ -1 +1 @@
-anaconda-11.1.0.65.tar.bz2
+anaconda-11.1.0.66.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- sources	25 Jul 2006 17:29:01 -0000	1.426
+++ sources	26 Jul 2006 19:53:09 -0000	1.427
@@ -1 +1 @@
-91e660f1a080b62b02e3a2f828809f93  anaconda-11.1.0.65.tar.bz2
+9411321e71118f0285192797e4af456d  anaconda-11.1.0.66.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:54:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:54:19 -0400
Subject: rpms/dasher/devel dasher.spec,1.48,1.49
Message-ID: <200607261954.k6QJsJo0031423@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31322

Modified Files:
	dasher.spec 
Log Message:
- Add dist tag and rebuild



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dasher.spec	12 Jul 2006 21:10:30 -0000	1.48
+++ dasher.spec	26 Jul 2006 19:54:17 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 4.1.7
-Release: 2
+Release: 3%{?dist} 
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -99,6 +99,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Wed Jul 26 2006 John (J5) Palmieri <johnp at redhat.com> - 4.1.7-3%{?dist}
+- Add dist tag and rebuild
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 4.1.7-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 19:57:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 15:57:42 -0400
Subject: rpms/control-center/FC-5 control-center.spec,1.137,1.138
Message-ID: <200607261957.k6QJvgto032730@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/control-center/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv32704

Modified Files:
	control-center.spec 
Log Message:
Don't try to package non-existing gnome-settings-daemon-2.0 include files.



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/FC-5/control-center.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- control-center.spec	26 Jul 2006 19:46:31 -0000	1.137
+++ control-center.spec	26 Jul 2006 19:57:40 -0000	1.138
@@ -244,7 +244,6 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/gnome-window-settings-2.0
-%{_includedir}/gnome-settings-daemon-2.0
 %{_libdir}/libgnome-window-settings.so
 %{_libdir}/pkgconfig/*
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 20:06:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 16:06:37 -0400
Subject: rpms/firefox/devel firefox.spec,1.128,1.129
Message-ID: <200607262006.k6QK6bdW002737@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2708

Modified Files:
	firefox.spec 
Log Message:
fix up double listings of files...


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- firefox.spec	26 Jul 2006 18:34:34 -0000	1.128
+++ firefox.spec	26 Jul 2006 20:06:35 -0000	1.129
@@ -298,7 +298,12 @@
 %{ffdir}/README.txt
 %{ffdir}/*.properties
 %{ffdir}/chrome
-%{ffdir}/components
+%dir %{ffdir}/components
+%ghost %{ffdir}/components/compreg.dat
+%ghost %{ffdir}/components/xpti.dat
+%{ffdir}/components/*.so
+%{ffdir}/components/*.xpt
+%{ffdir}/components/*.js
 %{ffdir}/defaults
 %{ffdir}/extensions
 %{ffdir}/greprefs
@@ -314,10 +319,9 @@
 %{ffdir}/mozilla-xremote-client
 %{ffdir}/run-mozilla.sh
 # XXX See if these are needed still
+%{ffdir}/dependentlibs.list
 %{ffdir}/updater*
-
-%ghost %{ffdir}/components/compreg.dat
-%ghost %{ffdir}/components/xpti.dat
+%{ffdir}/removed-files
 
 %files devel
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Wed Jul 26 20:17:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 16:17:19 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.39,
	1.40 selinux-policy.spec, 1.235, 1.236
Message-ID: <200607262017.k6QKHJxc019161@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17912

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-12
-  fixes for setroubleshoot


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |    7 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    5 
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |    5 
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.te              |    2 
 89 files changed, 884 insertions(+), 240 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- policy-20060608.patch	26 Jul 2006 17:58:28 -0000	1.39
+++ policy-20060608.patch	26 Jul 2006 20:17:15 -0000	1.40
@@ -680,7 +680,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.3.3/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/bluetooth.te	2006-07-26 15:13:57.000000000 -0400
 @@ -173,6 +173,7 @@
  allow bluetooth_helper_t self:shm create_shm_perms;
  allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto };
@@ -697,6 +697,15 @@
  	')
  ')
  
+@@ -244,3 +246,8 @@
+ optional_policy(`
+        	xserver_stream_connect_xdm(bluetooth_helper_t)
+ ')	
++
++optional_policy(`
++	nis_use_ypbind(bluetooth_helper_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.fc serefpolicy-2.3.3/policy/modules/services/clamav.fc
 --- nsaserefpolicy/policy/modules/services/clamav.fc	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/clamav.fc	2006-07-17 12:08:12.000000000 -0400
@@ -1526,7 +1535,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-25 09:09:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-26 15:21:01.000000000 -0400
 @@ -0,0 +1,135 @@
 +policy_module(setroubleshoot,1.0.0)
 +
@@ -1646,12 +1655,12 @@
 +
 +# log files
 +logging_search_logs(setroubleshoot_t)
++allow setroubleshoot_t setroubleshoot_var_log_t:dir rw_dir_perms;
 +allow setroubleshoot_t setroubleshoot_var_log_t:file create_file_perms;
 +allow setroubleshoot_t setroubleshoot_var_log_t:sock_file rw_file_perms;
-+allow setroubleshoot_t setroubleshoot_var_log_t:dir r_dir_perms;
 +
 +files_search_pids(setroubleshoot_t)
-+allow setroubleshoot_t setroubleshoot_var_run_t:dir r_dir_perms;
++allow setroubleshoot_t setroubleshoot_var_run_t:dir rw_dir_perms;
 +allow setroubleshoot_t setroubleshoot_var_run_t:sock_file rw_file_perms;
 +
 +
@@ -1762,7 +1771,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.3.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/xserver.te	2006-07-26 15:58:46.000000000 -0400
 @@ -88,6 +88,7 @@
  allow xdm_t self:unix_dgram_socket create_socket_perms;
  allow xdm_t self:tcp_socket create_stream_socket_perms;
@@ -2013,7 +2022,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-25 15:18:08.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-26 15:14:33.000000000 -0400
 @@ -258,6 +258,8 @@
  allow newrole_t { selinux_config_t default_context_t }:file r_file_perms;
  allow newrole_t { selinux_config_t default_context_t }:lnk_file r_file_perms;
@@ -2032,15 +2041,17 @@
  
  dev_relabel_all_dev_nodes(restorecon_t)
  # cjp: why is this needed?
-@@ -423,6 +427,7 @@
+@@ -423,6 +427,9 @@
  
  allow restorecond_t self:capability { dac_override dac_read_search fowner };
  allow restorecond_t self:fifo_file rw_file_perms;
 +allow restorecond_t self:netlink_route_socket r_netlink_socket_perms;
++allow restorecond_t self:tcp_socket create_socket_perms;
++allow restorecond_t self:udp_socket create_socket_perms;
  
  allow restorecond_t restorecond_var_run_t:file create_file_perms;
  files_pid_filetrans(restorecond_t,restorecond_var_run_t, file)
-@@ -430,6 +435,9 @@
+@@ -430,6 +437,9 @@
  auth_relabel_all_files_except_shadow(restorecond_t )
  auth_read_all_files_except_shadow(restorecond_t)
  fs_relabelfrom_noxattr_fs(restorecond_t)
@@ -2050,7 +2061,7 @@
  
  kernel_use_fds(restorecond_t)
  kernel_rw_pipes(restorecond_t)
-@@ -456,6 +464,10 @@
+@@ -456,6 +466,10 @@
  
  miscfiles_read_localization(restorecond_t)
  
@@ -2061,7 +2072,7 @@
  #################################
  #
  # Run_init local policy
-@@ -534,20 +546,27 @@
+@@ -534,20 +548,27 @@
  # semodule local policy
  #
  
@@ -2090,7 +2101,7 @@
  corecmd_exec_bin(semanage_t)
  corecmd_exec_sbin(semanage_t)
  
-@@ -590,11 +609,15 @@
+@@ -590,11 +611,15 @@
  userdom_search_sysadm_home_dirs(semanage_t)
  
  ifdef(`targeted_policy',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- selinux-policy.spec	26 Jul 2006 17:58:28 -0000	1.235
+++ selinux-policy.spec	26 Jul 2006 20:17:15 -0000	1.236
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 11
+Release: 12
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-12
+-  fixes for setroubleshoot
+
 * Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
 - Added Paul Howorth patch to only load policy packages shipped 
   with this package



From fedora-cvs-commits at redhat.com  Wed Jul 26 20:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 16:19:49 -0400
Subject: rpms/anaconda/devel anaconda.spec,1.430,1.431 sources,1.427,1.428
Message-ID: <200607262019.k6QKJnGT021039@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21010

Modified Files:
	anaconda.spec sources 
Log Message:
- update the tarball again


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- anaconda.spec	26 Jul 2006 19:03:29 -0000	1.430
+++ anaconda.spec	26 Jul 2006 20:19:47 -0000	1.431
@@ -103,6 +103,8 @@
 
 %changelog
 * Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 11.1.0.66-1
+- Fix md raid request class
+- Check for busybox utilties in /usr/sbin (katzj)
 - Be smarter about log files during kickstart (clumens)
 - Make multipath and dmraid work
 - Add Kannada language (katzj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- sources	26 Jul 2006 19:53:09 -0000	1.427
+++ sources	26 Jul 2006 20:19:47 -0000	1.428
@@ -1 +1 @@
-9411321e71118f0285192797e4af456d  anaconda-11.1.0.66.tar.bz2
+6dfbfb29e4441c1be9cdec07088524fd  anaconda-11.1.0.66.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Jul 26 20:35:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 16:35:38 -0400
Subject: rpms/struts/devel struts-1.2.8.build.patch,1.4,1.5
Message-ID: <200607262035.k6QKZcuZ025847@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25787

Modified Files:
	struts-1.2.8.build.patch 
Log Message:

Reverting/setting failonerror=true again.



struts-1.2.8.build.patch:
 build-webapp.xml  |    7 ++++++-
 build-webapps.xml |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

Index: struts-1.2.8.build.patch
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts-1.2.8.build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-1.2.8.build.patch	26 Jul 2006 19:28:00 -0000	1.4
+++ struts-1.2.8.build.patch	26 Jul 2006 20:35:36 -0000	1.5
@@ -1,5 +1,5 @@
 --- ./build-webapp.xml.sav	2005-11-08 03:55:28.000000000 -0500
-+++ ./build-webapp.xml	2006-07-26 15:25:26.000000000 -0400
++++ ./build-webapp.xml	2006-07-26 16:34:13.000000000 -0400
 @@ -219,6 +219,7 @@
    <mkdir   dir="${webapp.target}" />
    <mkdir   dir="${webapp.target}/WEB-INF" />
@@ -28,3 +28,23 @@
  </target>
  
  
+--- ./build-webapps.xml.sav	2006-07-26 16:34:29.000000000 -0400
++++ ./build-webapps.xml	2006-07-26 16:35:02.000000000 -0400
+@@ -189,7 +189,7 @@
+     </copy>
+ 
+     <!-- Validate tiles docs -->
+-    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
++    <xmlvalidate warn="yes" failonerror="no" lenient="no">
+        <fileset dir="${build.home}/tiles-documentation" includes="**/*.html"/>
+ 
+       <!-- Reference local DTDS to avoid network lookup -->
+@@ -290,7 +290,7 @@
+         documentation against the DTDs
+ -->
+ <target name="validate.docs" description="Validate generated XHTML documents">
+-    <xmlvalidate warn="yes" failonerror="yes" lenient="no">
++    <xmlvalidate warn="yes" failonerror="no" lenient="no">
+        <fileset dir="${build.home}/documentation">
+         <include name="**/*.html"/>
+         <exclude name="download.html"/>



From fedora-cvs-commits at redhat.com  Wed Jul 26 20:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 16:55:18 -0400
Subject: rpms/struts/devel struts.spec,1.38,1.39
Message-ID: <200607262055.k6QKtIhh015165@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15112

Modified Files:
	struts.spec 
Log Message:

Added missing BR for xhtml1-dtds.




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- struts.spec	26 Jul 2006 19:28:00 -0000	1.38
+++ struts.spec	26 Jul 2006 20:55:16 -0000	1.39
@@ -42,6 +42,7 @@
 BuildRequires:  jakarta-commons-validator >= 0:1.1.4
 BuildRequires:  oro >= 0:2.0.7
 BuildRequires:  tomcat5-jsp-2.0-api
+BuildRequires:	xhtml1-dtds
 
 Group:		Development/Java
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -211,6 +212,7 @@
 %changelog
 * Wed Jul 26 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_16fc
 - Remove xalan-j2-serializer from classpath.
+- Added missing BR for xhtml1-dtds.
 
 * Mon Jul 24 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.8-2jpp_15fc
 - Fixed classpath issue.



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:02:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:02:55 -0400
Subject: rpms/xdoclet/devel xdoclet.spec,1.24,1.25
Message-ID: <200607262102.k6QL2t1u017166@cvs.devel.redhat.com>

Author: mwringe

Update of /cvs/dist/rpms/xdoclet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17128

Modified Files:
	xdoclet.spec 
Log Message:
Remove xalan-j2 and xalan-j2-serializer from the ant OPT_JAR_LIST



Index: xdoclet.spec
===================================================================
RCS file: /cvs/dist/rpms/xdoclet/devel/xdoclet.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xdoclet.spec	24 Jul 2006 13:51:53 -0000	1.24
+++ xdoclet.spec	26 Jul 2006 21:02:40 -0000	1.25
@@ -43,7 +43,7 @@
 
 Name:		xdoclet
 Version:	1.2.3
-Release:	6jpp_3fc
+Release:	6jpp_4fc
 Epoch:		0
 Summary:	XDoclet Attribute Orientated Programming Framework
 License:	XDoclet Open Source Licence
@@ -179,7 +179,7 @@
 %patch6 -b .sav
 
 %build
-export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax xalan-j2 xalan-j2-serializer"
+export OPT_JAR_LIST="ant/ant-nodeps jrefactory jaxp_transform_impl ant/ant-trax"
 ant xjavadoc core modules docs l10n
 
 %if %{with_demo}
@@ -292,6 +292,9 @@
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Jul 26 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_4fc
+- Remove xalan-j2 and xalan-j2-serializer from the ant OPT_JAR_LIST
+
 * Mon Jul 23 2006 Matt Wringe <mwringe at redhat.com> - 0:1.2.3-6jpp_3fc
 - Rebuild on new gcj
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:04:17 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2456,
	1.2457 linux-2.6-xen.patch, 1.42, 1.43
Message-ID: <200607262104.k6QL4HYi017264@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17135

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
daily update xen patch


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2456
retrieving revision 1.2457
diff -u -r1.2456 -r1.2457
--- kernel-2.6.spec	26 Jul 2006 16:18:31 -0000	1.2456
+++ kernel-2.6.spec	26 Jul 2006 21:03:28 -0000	1.2457
@@ -1647,6 +1647,10 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Juan Quintela <quintela at anano.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+- new xen patch based on linux-2.6-xen cset 22749.
+  and linux-2.6 cset 33089.
+
 * Wed Jul 26 2006 Dave Jones <davej at redhat.com>
 - Enable sparsemem on ia64. (#108848)
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/time-xen.c.orig                    | 1096 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Kconfig.orig                            |  706 +++++
 arch/x86_64/Kconfig~                                |  706 +++++
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/netfront/netfront.c.orig                | 1604 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h.orig                      | 1017 +++++++
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 413 files changed, 90294 insertions(+), 870 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.42 -r 1.43 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- linux-2.6-xen.patch	26 Jul 2006 04:08:14 -0000	1.42
+++ linux-2.6-xen.patch	26 Jul 2006 21:03:29 -0000	1.43
@@ -1,4 +1,4 @@
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
 --- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/arch/i386/boot-xen/Makefile	2006-07-23 00:15:23.000000000 +0200
 @@ -0,0 +1,21 @@
@@ -23,7 +23,7 @@
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
 --- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
 +++ compiling/arch/i386/Kconfig	2006-07-26 05:37:14.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
@@ -311,13679 +311,12433 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~ compiling/arch/i386/Kconfig~
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig~	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/Kconfig~	2006-07-23 00:15:23.000000000 +0200
-@@ -0,0 +1,1242 @@
-+#
-+# For a description of the syntax of this configuration file,
-+# see Documentation/kbuild/kconfig-language.txt.
-+#
-+
-+mainmenu "Linux Kernel Configuration"
-+
-+config X86_32
-+	bool
-+	default y
-+	help
-+	  This is Linux's home port.  Linux was originally native to the Intel
-+	  386, and runs on all the later x86 processors including the Intel
-+	  486, 586, Pentiums, and various instruction-set-compatible chips by
-+	  AMD, Cyrix, and others.
-+
-+config GENERIC_TIME
-+	bool
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.cpu	2006-07-23 00:15:23.000000000 +0200
+@@ -251,7 +251,7 @@ config X86_PPRO_FENCE
+ 
+ config X86_F00F_BUG
+ 	bool
+-	depends on M586MMX || M586TSC || M586 || M486 || M386
++	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !X86_NO_IDT
+ 	default y
+ 
+ config X86_WP_WORKS_OK
+@@ -311,5 +311,5 @@ config X86_OOSTORE
+ 
+ config X86_TSC
+ 	bool
+-	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
++	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
+ 	default y
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
++++ compiling/arch/i386/Kconfig.debug	2006-07-23 00:15:23.000000000 +0200
+@@ -2,6 +2,7 @@ menu "Kernel hacking"
+ 
+ config TRACE_IRQFLAGS_SUPPORT
+ 	bool
 +	depends on !X86_XEN
-+	default y
+ 	default y
+ 
+ source "lib/Kconfig.debug"
+@@ -79,6 +80,7 @@ config X86_MPPARSE
+ config DOUBLEFAULT
+ 	default y
+ 	bool "Enable doublefault exception handler" if EMBEDDED
++	depends on !X86_NO_TSS
+ 	help
+           This option allows trapping of rare doublefault exceptions that
+           would otherwise cause a system to silently reboot. Disabling this
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
+--- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-07-23 00:15:23.000000000 +0200
+@@ -0,0 +1,1168 @@
++/*
++ *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
++ *
++ *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh at intel.com>
++ *  Copyright (C) 2001 Jun Nakajima <jun.nakajima at intel.com>
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
 +
-+config LOCKDEP_SUPPORT
-+	bool
-+	depends on !X86_XEN
-+	default y
++#include <linux/init.h>
++#include <linux/acpi.h>
++#include <linux/efi.h>
++#include <linux/module.h>
++#include <linux/dmi.h>
++#include <linux/irq.h>
 +
-+config STACKTRACE_SUPPORT
-+	bool
-+	default y
++#include <asm/pgtable.h>
++#include <asm/io_apic.h>
++#include <asm/apic.h>
++#include <asm/io.h>
++#include <asm/mpspec.h>
 +
-+config SEMAPHORE_SLEEPERS
-+	bool
-+	default y
++#ifdef	CONFIG_X86_64
 +
-+config X86
-+	bool
-+	default y
++extern void __init clustered_apic_check(void);
 +
-+config MMU
-+	bool
-+	default y
++extern int gsi_irq_sharing(int gsi);
++#include <asm/proto.h>
 +
-+config SBUS
-+	bool
++static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
 +
-+config GENERIC_ISA_DMA
-+	bool
-+	default y
 +
-+config GENERIC_IOMAP
-+	bool
-+	default y
++#else				/* X86 */
 +
-+config GENERIC_HWEIGHT
-+	bool
-+	default y
++#ifdef	CONFIG_X86_LOCAL_APIC
++#include <mach_apic.h>
++#include <mach_mpparse.h>
++#endif				/* CONFIG_X86_LOCAL_APIC */
 +
-+config ARCH_MAY_HAVE_PC_FDC
-+	bool
-+	default y
++static inline int gsi_irq_sharing(int gsi) { return gsi; }
 +
-+config DMI
-+	bool
-+	default y
++#endif				/* X86 */
 +
-+source "init/Kconfig"
++#define BAD_MADT_ENTRY(entry, end) (					    \
++		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
++		((acpi_table_entry_header *)entry)->length != sizeof(*entry))
 +
-+menu "Processor type and features"
++#define PREFIX			"ACPI: "
 +
-+config SMP
-+	bool "Symmetric multi-processing support"
-+	---help---
-+	  This enables support for systems with more than one CPU. If you have
-+	  a system with only one CPU, like most personal computers, say N. If
-+	  you have a system with more than one CPU, say Y.
++int acpi_noirq __initdata;	/* skip ACPI IRQ initialization */
++int acpi_pci_disabled __initdata;	/* skip ACPI PCI scan and IRQ initialization */
[...81514 lines suppressed...]
 +++ compiling/include/xen/public/privcmd.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,79 @@
@@ -90047,7 +93965,7 @@
 +	_IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
 +
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h compiling/include/xen/xenbus.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h compiling/include/xen/xenbus.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xenbus.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xenbus.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,299 @@
@@ -90350,7 +94268,7 @@
 +
 +
 +#endif /* _XEN_XENBUS_H */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h compiling/include/xen/xencons.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h compiling/include/xen/xencons.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xencons.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,14 @@
@@ -90368,7 +94286,7 @@
 +int xencons_ring_send(const char *data, unsigned len);
 +
 +#endif /* __ASM_XENCONS_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h compiling/include/xen/xen_proc.h
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h compiling/include/xen/xen_proc.h
 --- /mnt/ro/repos/hg/linux-2.6/include/xen/xen_proc.h	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/include/xen/xen_proc.h	2006-07-23 00:17:53.000000000 +0200
 @@ -0,0 +1,13 @@
@@ -90385,7 +94303,7 @@
 +	const char *name);
 +
 +#endif /* __ASM_XEN_PROC_H__ */
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/fork.c compiling/kernel/fork.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/fork.c compiling/kernel/fork.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/fork.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/kernel/fork.c	2006-07-23 00:17:54.000000000 +0200
 @@ -275,6 +275,9 @@ static inline int dup_mmap(struct mm_str
@@ -90398,7 +94316,7 @@
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c compiling/kernel/irq/manage.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c compiling/kernel/irq/manage.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/irq/manage.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/kernel/irq/manage.c	2006-07-23 00:17:54.000000000 +0200
 @@ -326,7 +326,6 @@ void free_irq(unsigned int irq, void *de
@@ -90409,7 +94327,7 @@
  	if (irq >= NR_IRQS)
  		return;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt compiling/kernel/Kconfig.preempt
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt compiling/kernel/Kconfig.preempt
 --- /mnt/ro/repos/hg/linux-2.6/kernel/Kconfig.preempt	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/kernel/Kconfig.preempt	2006-07-23 00:17:54.000000000 +0200
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
@@ -90420,7 +94338,7 @@
  	help
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/kernel/timer.c compiling/kernel/timer.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/kernel/timer.c compiling/kernel/timer.c
 --- /mnt/ro/repos/hg/linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/kernel/timer.c	2006-07-23 00:17:57.000000000 +0200
 @@ -554,6 +554,22 @@ found:
@@ -90446,7 +94364,7 @@
  	if (time_before(hr_expires, expires))
  		return hr_expires;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
 --- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/lib/Kconfig.debug	2006-07-23 00:17:57.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
@@ -90458,7 +94376,7 @@
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
 --- /mnt/ro/repos/hg/linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/lib/Makefile	2006-07-23 00:17:57.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
@@ -90471,7 +94389,7 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/highmem.c	2006-07-23 00:17:57.000000000 +0200
 @@ -142,6 +142,17 @@ start:
@@ -90492,7 +94410,7 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
 --- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/Kconfig	2006-07-23 00:17:57.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
@@ -90510,7 +94428,7 @@
  	default "4"
  
  #
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/mm/memory.c	2006-07-23 00:17:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
@@ -90653,7 +94571,7 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/mmap.c	2006-07-23 00:17:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
@@ -90667,7 +94585,7 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
 --- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/mm/page_alloc.c	2006-07-23 00:17:58.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
@@ -90690,7 +94608,7 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/net/core/dev.c	2006-07-23 00:46:36.000000000 +0200
 @@ -117,6 +117,12 @@
@@ -90791,7 +94709,7 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
 +++ compiling/net/core/pktgen.c	2006-07-23 00:17:59.000000000 +0200
 @@ -6,7 +6,7 @@
@@ -90803,7 +94721,7 @@
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
 --- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
 +++ compiling/net/core/skbuff.c	2006-07-23 00:17:59.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
@@ -90892,7 +94810,7 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
@@ -90909,7 +94827,7 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 00:18:01.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
@@ -90926,7 +94844,7 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
 +++ compiling/net/ipv4/xfrm4_output.c	2006-07-23 00:18:03.000000000 +0200
 @@ -18,6 +18,8 @@
@@ -90949,7 +94867,7 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
 --- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
 +++ compiling/net/ipv6/addrconf.c	2006-07-23 00:18:03.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
@@ -90968,7 +94886,7 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff --exclude='.hg*' -urNp /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
+diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
 --- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
 +++ compiling/scripts/Makefile.xen	2006-07-23 00:18:07.000000000 +0200
 @@ -0,0 +1,14 @@



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:11:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:11:16 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 .cvsignore, 1.47,
	1.48 java-1.4.2-gcj-compat.spec, 1.146, 1.147 sources, 1.51, 1.52
Message-ID: <200607262111.k6QLBGfP028430@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28415

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh.1
- Fix BouncyCastle bug. (200196)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	2 Feb 2006 19:28:51 -0000	1.47
+++ .cvsignore	26 Jul 2006 21:11:13 -0000	1.48
@@ -1,3 +1,4 @@
 bcprov-jdk14-131.tar.gz
 eclipse-ecj-3.1.0_fc-12.jar
 java-gcj-compat-1.0.52.tar.gz
+java-gcj-compat-bcprov-X962NamedCurves.patch


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- java-1.4.2-gcj-compat.spec	4 Mar 2006 02:15:45 -0000	1.146
+++ java-1.4.2-gcj-compat.spec	26 Jul 2006 21:11:13 -0000	1.147
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_83rh
+%define release 	40jpp_83rh.1
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 %define bcfullver	1.31
@@ -47,6 +47,7 @@
 Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
 Source2:	eclipse-ecj-3.1.0_fc-12.jar
 Source3:	ecj.sh.in
+Source4:	java-gcj-compat-bcprov-X962NamedCurves.patch
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
@@ -171,6 +172,8 @@
 %endif
 
 gzip -dc %{SOURCE1} | tar -xf -
+patch -p0 < %{SOURCE4}
+
 # build bouncy castle provider
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
@@ -640,6 +643,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh.1
+- Fix BouncyCastle bug. (200196)
+
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh
 - Make javadoc post scriplet pass unconditionally.
 - Force symlinks in javadoc post scriptlet.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	2 Feb 2006 19:28:51 -0000	1.51
+++ sources	26 Jul 2006 21:11:13 -0000	1.52
@@ -1,3 +1,4 @@
 830237b359ad7245ec67a972e58ac098  bcprov-jdk14-131.tar.gz
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
 40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz
+524f4e63e320d1c9ec8e749554efbae2  java-gcj-compat-bcprov-X962NamedCurves.patch



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:19:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:19:16 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.43,1.44
Message-ID: <200607262119.k6QLJGes010911@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10895

Modified Files:
	linux-2.6-xen.patch 
Log Message:
remove straneous *.orig *~ files, thanks davej

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 409 files changed, 85166 insertions(+), 871 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.43 -r 1.44 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- linux-2.6-xen.patch	26 Jul 2006 21:03:29 -0000	1.43
+++ linux-2.6-xen.patch	26 Jul 2006 21:19:12 -0000	1.44
@@ -14711,1106 +14711,6 @@
 +	return 0;
 +}
 +__initcall(xen_sysctl_init);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/time-xen.c.orig compiling/arch/i386/kernel/time-xen.c.orig
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/time-xen.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/time-xen.c.orig	2006-07-26 17:17:33.000000000 +0200
-@@ -0,0 +1,1096 @@
-+/*
-+ *  linux/arch/i386/kernel/time.c
-+ *
-+ *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
-+ *
-+ * This file contains the PC-specific time handling details:
-+ * reading the RTC at bootup, etc..
-+ * 1994-07-02    Alan Modra
-+ *	fixed set_rtc_mmss, fixed time.year for >= 2000, new mktime
-+ * 1995-03-26    Markus Kuhn
-+ *      fixed 500 ms bug at call to set_rtc_mmss, fixed DS12887
-+ *      precision CMOS clock update
-+ * 1996-05-03    Ingo Molnar
-+ *      fixed time warps in do_[slow|fast]_gettimeoffset()
-+ * 1997-09-10	Updated NTP code according to technical memorandum Jan '96
-+ *		"A Kernel Model for Precision Timekeeping" by Dave Mills
-+ * 1998-09-05    (Various)
-+ *	More robust do_fast_gettimeoffset() algorithm implemented
-+ *	(works with APM, Cyrix 6x86MX and Centaur C6),
-+ *	monotonic gettimeofday() with fast_get_timeoffset(),
-+ *	drift-proof precision TSC calibration on boot
-+ *	(C. Scott Ananian <cananian at alumni.princeton.edu>, Andrew D.
-+ *	Balsa <andrebalsa at altern.org>, Philip Gladstone <philip at raptor.com>;
-+ *	ported from 2.0.35 Jumbo-9 by Michael Krause <m.krause at tu-harburg.de>).
-+ * 1998-12-16    Andrea Arcangeli
-+ *	Fixed Jumbo-9 code in 2.1.131: do_gettimeofday was missing 1 jiffy
-+ *	because was not accounting lost_ticks.
-+ * 1998-12-24 Copyright (C) 1998  Andrea Arcangeli
-+ *	Fixed a xtime SMP race (we need the xtime_lock rw spinlock to
-+ *	serialize accesses to xtime/lost_ticks).
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/sched.h>
-+#include <linux/kernel.h>
-+#include <linux/param.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/interrupt.h>
-+#include <linux/time.h>
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/smp.h>
-+#include <linux/module.h>
-+#include <linux/sysdev.h>
-+#include <linux/bcd.h>
-+#include <linux/efi.h>
-+#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>
-+#include <asm/irq.h>
-+#include <asm/msr.h>
-+#include <asm/delay.h>
-+#include <asm/mpspec.h>
-+#include <asm/uaccess.h>
-+#include <asm/processor.h>
-+#include <asm/timer.h>
-+#include <asm/sections.h>
-+
-+#include "mach_time.h"
-+
-+#include <linux/timex.h>
-+
-+#include <asm/hpet.h>
-+
-+#include <asm/arch_hooks.h>
-+
-+#include <xen/evtchn.h>
-+#include <xen/interface/vcpu.h>
-+
-+#if defined (__i386__)
-+#include <asm/i8259.h>
-+#endif
-+
-+int pit_latch_buggy;              /* extern */
-+
-+#if defined(__x86_64__)
-+unsigned long vxtime_hz = PIT_TICK_RATE;
-+struct vxtime_data __vxtime __section_vxtime;   /* for vsyscalls */
-+volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
-+unsigned long __wall_jiffies __section_wall_jiffies = INITIAL_JIFFIES;
-+struct timespec __xtime __section_xtime;
-+struct timezone __sys_tz __section_sys_tz;
-+#endif
-+
-+#define USEC_PER_TICK (USEC_PER_SEC / HZ)
-+#define NSEC_PER_TICK (NSEC_PER_SEC / HZ)
-+#define FSEC_PER_TICK (FSEC_PER_SEC / HZ)
-+
-+#define NS_SCALE	10 /* 2^10, carefully chosen */
-+#define US_SCALE	32 /* 2^32, arbitralrily chosen */
-+
-+unsigned int cpu_khz;	/* Detected as we calibrate the TSC */
-+EXPORT_SYMBOL(cpu_khz);
-+
-+extern unsigned long wall_jiffies;
-+
-+DEFINE_SPINLOCK(rtc_lock);
-+EXPORT_SYMBOL(rtc_lock);
-+
-+extern struct init_timer_opts timer_tsc_init;
-+extern struct timer_opts timer_tsc;
-+#define timer_none timer_tsc
-+
-+/* These are peridically updated in shared_info, and then copied here. */
-+struct shadow_time_info {
-+	u64 tsc_timestamp;     /* TSC at last update of time vals.  */
-+	u64 system_timestamp;  /* Time, in nanosecs, since boot.    */
-+	u32 tsc_to_nsec_mul;
-+	u32 tsc_to_usec_mul;
-+	int tsc_shift;
-+	u32 version;
-+};
-+static DEFINE_PER_CPU(struct shadow_time_info, shadow_time);
-+static struct timespec shadow_tv;
-+static u32 shadow_tv_version;
-+
-+/* 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);
-+
-+/* Current runstate of each CPU (updated automatically by the hypervisor). */
-+static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate);
-+
-+/* Must be signed, as it's compared with s64 quantities which can be -ve. */
-+#define NS_PER_TICK (1000000000LL/HZ)
-+
-+static inline void __normalize_time(time_t *sec, s64 *nsec)
-+{
-+	while (*nsec >= NSEC_PER_SEC) {
-+		(*nsec) -= NSEC_PER_SEC;
-+		(*sec)++;
-+	}
-+	while (*nsec < 0) {
-+		(*nsec) += NSEC_PER_SEC;
-+		(*sec)--;
-+	}
-+}
-+
-+/* Does this guest OS track Xen time, or set its wall clock independently? */
-+static int independent_wallclock = 0;
-+static int __init __independent_wallclock(char *str)
-+{
-+	independent_wallclock = 1;
-+	return 1;
-+}
-+__setup("independent_wallclock", __independent_wallclock);
-+
-+/* Permitted clock jitter, in nsecs, beyond which a warning will be printed. */
-+static unsigned long permitted_clock_jitter = 10000000UL; /* 10ms */
-+static int __init __permitted_clock_jitter(char *str)
-+{
-+	permitted_clock_jitter = simple_strtoul(str, NULL, 0);
-+	return 1;
-+}
-+__setup("permitted_clock_jitter=", __permitted_clock_jitter);
-+
-+#ifndef CONFIG_X86
-+int tsc_disable __devinitdata = 0;
-+#endif
-+
-+static void delay_tsc(unsigned long loops)
-+{
-+	unsigned long bclock, now;
-+
-+	rdtscl(bclock);
-+	do {
-+		rep_nop();
-+		rdtscl(now);
-+	} while ((now - bclock) < loops);
-+}
-+
-+struct timer_opts timer_tsc = {
-+	.name = "tsc",
-+	.delay = delay_tsc,
[...58157 lines suppressed...]
-+		return default_msg_enable_bits;
-+	if (debug_value == 0)	/* no output */
-+		return 0;
-+	/* set low N bits */
-+	return (1 << debug_value) - 1;
-+}
-+
-+/* Test if receive needs to be scheduled */
-+static inline int __netif_rx_schedule_prep(struct net_device *dev)
-+{
-+	return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
-+}
-+
-+/* Test if receive needs to be scheduled but only if up */
-+static inline int netif_rx_schedule_prep(struct net_device *dev)
-+{
-+	return netif_running(dev) && __netif_rx_schedule_prep(dev);
-+}
-+
-+/* Add interface to tail of rx poll list. This assumes that _prep has
-+ * already been called and returned 1.
-+ */
-+
-+extern void __netif_rx_schedule(struct net_device *dev);
-+
-+/* Try to reschedule poll. Called by irq handler. */
-+
-+static inline void netif_rx_schedule(struct net_device *dev)
-+{
-+	if (netif_rx_schedule_prep(dev))
-+		__netif_rx_schedule(dev);
-+}
-+
-+/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().
-+ * Do not inline this?
-+ */
-+static inline int netif_rx_reschedule(struct net_device *dev, int undo)
-+{
-+	if (netif_rx_schedule_prep(dev)) {
-+		unsigned long flags;
-+
-+		dev->quota += undo;
-+
-+		local_irq_save(flags);
-+		list_add_tail(&dev->poll_list, &__get_cpu_var(softnet_data).poll_list);
-+		__raise_softirq_irqoff(NET_RX_SOFTIRQ);
-+		local_irq_restore(flags);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+/* Remove interface from poll list: it must be in the poll list
-+ * on current cpu. This primitive is called by dev->poll(), when
-+ * it completes the work. The device cannot be out of poll list at this
-+ * moment, it is BUG().
-+ */
-+static inline void netif_rx_complete(struct net_device *dev)
-+{
-+	unsigned long flags;
-+
-+	local_irq_save(flags);
-+	BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));
-+	list_del(&dev->poll_list);
-+	smp_mb__before_clear_bit();
-+	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
-+	local_irq_restore(flags);
-+}
-+
-+static inline void netif_poll_disable(struct net_device *dev)
-+{
-+	while (test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state))
-+		/* No hurry. */
-+		schedule_timeout_interruptible(1);
-+}
-+
-+static inline void netif_poll_enable(struct net_device *dev)
-+{
-+	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
-+}
-+
-+/* same as netif_rx_complete, except that local_irq_save(flags)
-+ * has already been issued
-+ */
-+static inline void __netif_rx_complete(struct net_device *dev)
-+{
-+	BUG_ON(!test_bit(__LINK_STATE_RX_SCHED, &dev->state));
-+	list_del(&dev->poll_list);
-+	smp_mb__before_clear_bit();
-+	clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
-+}
-+
-+static inline void netif_tx_lock(struct net_device *dev)
-+{
-+	spin_lock(&dev->_xmit_lock);
-+	dev->xmit_lock_owner = smp_processor_id();
-+}
-+
-+static inline void netif_tx_lock_bh(struct net_device *dev)
-+{
-+	spin_lock_bh(&dev->_xmit_lock);
-+	dev->xmit_lock_owner = smp_processor_id();
-+}
-+
-+static inline int netif_tx_trylock(struct net_device *dev)
-+{
-+	int ok = spin_trylock(&dev->_xmit_lock);
-+	if (likely(ok))
-+		dev->xmit_lock_owner = smp_processor_id();
-+	return ok;
-+}
-+
-+static inline void netif_tx_unlock(struct net_device *dev)
-+{
-+	dev->xmit_lock_owner = -1;
-+	spin_unlock(&dev->_xmit_lock);
-+}
-+
-+static inline void netif_tx_unlock_bh(struct net_device *dev)
-+{
-+	dev->xmit_lock_owner = -1;
-+	spin_unlock_bh(&dev->_xmit_lock);
-+}
-+
-+static inline void netif_tx_disable(struct net_device *dev)
-+{
-+	netif_tx_lock_bh(dev);
-+	netif_stop_queue(dev);
-+	netif_tx_unlock_bh(dev);
-+}
-+
-+/* These functions live elsewhere (drivers/net/net_init.c, but related) */
-+
-+extern void		ether_setup(struct net_device *dev);
-+
-+/* Support for loadable net-drivers */
-+extern struct net_device *alloc_netdev(int sizeof_priv, const char *name,
-+				       void (*setup)(struct net_device *));
-+extern int		register_netdev(struct net_device *dev);
-+extern void		unregister_netdev(struct net_device *dev);
-+/* Functions used for multicast support */
-+extern void		dev_mc_upload(struct net_device *dev);
-+extern int 		dev_mc_delete(struct net_device *dev, void *addr, int alen, int all);
-+extern int		dev_mc_add(struct net_device *dev, void *addr, int alen, int newonly);
-+extern void		dev_mc_discard(struct net_device *dev);
-+extern void		dev_set_promiscuity(struct net_device *dev, int inc);
-+extern void		dev_set_allmulti(struct net_device *dev, int inc);
-+extern void		netdev_state_change(struct net_device *dev);
-+extern void		netdev_features_change(struct net_device *dev);
-+/* Load a device via the kmod */
-+extern void		dev_load(const char *name);
-+extern void		dev_mcast_init(void);
-+extern int		netdev_max_backlog;
-+extern int		weight_p;
-+extern int		netdev_set_master(struct net_device *dev, struct net_device *master);
-+extern int skb_checksum_help(struct sk_buff *skb, int inward);
-+extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
-+#ifdef CONFIG_BUG
-+extern void netdev_rx_csum_fault(struct net_device *dev);
-+#else
-+static inline void netdev_rx_csum_fault(struct net_device *dev)
-+{
-+}
-+#endif
-+/* rx skb timestamps */
-+extern void		net_enable_timestamp(void);
-+extern void		net_disable_timestamp(void);
-+
-+#ifdef CONFIG_PROC_FS
-+extern void *dev_seq_start(struct seq_file *seq, loff_t *pos);
-+extern void *dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
-+extern void dev_seq_stop(struct seq_file *seq, void *v);
-+#endif
-+
-+extern void linkwatch_run_queue(void);
-+
-+static inline int net_gso_ok(int features, int gso_type)
-+{
-+	int feature = gso_type << NETIF_F_GSO_SHIFT;
-+	return (features & feature) == feature;
-+}
-+
-+static inline int skb_gso_ok(struct sk_buff *skb, int features)
-+{
-+	return net_gso_ok(features, skb_shinfo(skb)->gso_type);
-+}
-+
-+static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
-+{
-+	return skb_is_gso(skb) &&
-+	       (!skb_gso_ok(skb, dev->features) ||
-+		unlikely(skb->ip_summed != CHECKSUM_HW));
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif	/* _LINUX_DEV_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/linux/oprofile.h compiling/include/linux/oprofile.h
 --- /mnt/ro/repos/hg/linux-2.6/include/linux/oprofile.h	2006-07-13 00:51:40.000000000 +0200
 +++ compiling/include/linux/oprofile.h	2006-07-23 00:17:47.000000000 +0200



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:35:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:35:35 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 ecj.sh.in,1.1,1.2
Message-ID: <200607262135.k6QLZZQ4011144@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11122

Modified Files:
	ecj.sh.in 
Log Message:
- call gij, not java in ecj.sh.in.




Index: ecj.sh.in
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/ecj.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ecj.sh.in	8 Jul 2005 11:10:17 -0000	1.1
+++ ecj.sh.in	26 Jul 2006 21:35:33 -0000	1.2
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 CLASSPATH=@JAVADIR@/eclipse-ecj.jar${CLASSPATH:+:}$CLASSPATH \
-java org.eclipse.jdt.internal.compiler.batch.Main "$@"
+gij org.eclipse.jdt.internal.compiler.batch.Main "$@"



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:48:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:48:30 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.147,
	1.148
Message-ID: <200607262148.k6QLmU1I006995@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6935

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Add eclipse-ecj build requires on non-bootstrap architectures.
- Remove ifnarch ia64 sections.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- java-1.4.2-gcj-compat.spec	26 Jul 2006 21:11:13 -0000	1.147
+++ java-1.4.2-gcj-compat.spec	26 Jul 2006 21:48:28 -0000	1.148
@@ -1,6 +1,6 @@
 %define section		free
 
-%ifarch %{ix86} x86_64 ppc
+%ifarch %{ix86} x86_64 ppc ia64
 %define bootstrap	0
 %else
 %define bootstrap	1
@@ -53,6 +53,10 @@
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
+BuildRequires:	libgcj%{gccsuffix} >= %{gccver}
+%if ! %{bootstrap}
+BuildRequires:	eclipse-ecj
+%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.1
@@ -161,13 +165,11 @@
 %if %{bootstrap}
 mkdir tmp
 cp -a %{SOURCE2} eclipse-ecj.jar
-%ifnarch ia64
 mv eclipse-ecj.jar tmp
 # close your eyes...
 RPM_BUILD_ROOT=tmp python aot-compile-rpm
 mv tmp/eclipse-ecj.jar tmp%{_libdir}/gcj/%{name}/* .
 # (you can open them again now)
-%endif
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj
 %endif
 
@@ -290,7 +292,6 @@
 %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}
@@ -627,9 +628,7 @@
 %endif
 %if %{bootstrap}
 %{_bindir}/ecj
-%ifnarch ia64
 %{_libdir}/gcj/%{name}
-%endif
 %{_javadir}/eclipse-ecj.jar
 %endif
 
@@ -644,6 +643,8 @@
 
 %changelog
 * Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh.1
+- Add eclipse-ecj build requires on non-bootstrap architectures.
+- Remove ifnarch ia64 sections.
 - Fix BouncyCastle bug. (200196)
 
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:49:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:49:30 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.148,
	1.149
Message-ID: <200607262149.k6QLnUD8007469@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7363

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Fix typo.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- java-1.4.2-gcj-compat.spec	26 Jul 2006 21:48:28 -0000	1.148
+++ java-1.4.2-gcj-compat.spec	26 Jul 2006 21:49:28 -0000	1.149
@@ -295,7 +295,6 @@
 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



From fedora-cvs-commits at redhat.com  Wed Jul 26 21:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 17:58:37 -0400
Subject: rpms/compiz/devel compiz.spec,1.10,1.11
Message-ID: <200607262158.k6QLwbEI010971@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10951

Modified Files:
	compiz.spec 
Log Message:
* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.12.20060721git
- Fix gconf hooks.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- compiz.spec	26 Jul 2006 16:21:21 -0000	1.10
+++ compiz.spec	26 Jul 2006 21:58:34 -0000	1.11
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.11.%{snapshot}git%{?dist}
+Release:        0.12.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,7 +77,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=0
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -85,11 +85,15 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/compiz.schemas > /dev/null
+/usr/bin/gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/compiz.schemas > /dev/null
 
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz.schemas > /dev/null
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/compiz.schemas > /dev/null
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,6 +116,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.12.20060721git
+- Fix gconf hooks.
+
 * Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git
 - Bump and build for fc5 AIGLX repo.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 22:24:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 18:24:00 -0400
Subject: rpms/mesa/devel mesa.spec,1.78,1.79
Message-ID: <200607262224.k6QMO0hN000839@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv815

Modified Files:
	mesa.spec 
Log Message:
* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-19.fc5.aiglx
- Build for fc5 aiglx repo.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mesa.spec	25 Jul 2006 23:11:33 -0000	1.78
+++ mesa.spec	26 Jul 2006 22:23:58 -0000	1.79
@@ -57,7 +57,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 19%{?dist}
+Release: 19.fc5.aiglx
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -512,6 +512,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-19.fc5.aiglx
+- Build for fc5 aiglx repo.
+
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-19.fc6
 - Disable TLS dispatch, it's selinux-hostile.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 22:32:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 18:32:19 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.16,1.17
Message-ID: <200607262232.k6QMWJV0003389@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3369

Modified Files:
	libdrm.spec 
Log Message:
* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 2.0.2-2.fc5.aiglx
- Build for fc5 aiglx repo.



Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libdrm.spec	12 Jul 2006 06:48:17 -0000	1.16
+++ libdrm.spec	26 Jul 2006 22:32:14 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.2
-Release: 1.1
+Release: 2.fc5.aiglx
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -74,7 +74,10 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 2.0.2-2.fc5.aiglx
+- Build for fc5 aiglx repo.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 2.0.2-2.1
 - rebuild
 
 * Tue Jun 27 2006 Adam Jackson <ajackson at redhat.com> 2.0.2-2



From fedora-cvs-commits at redhat.com  Wed Jul 26 22:32:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 18:32:32 -0400
Subject: rpms/kernel/devel/configs config-s390-generic,1.19,1.20
Message-ID: <200607262232.k6QMWWQJ003491@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3375/configs

Modified Files:
	config-s390-generic 
Log Message:
New utrace patch: unsafe_exec fix; s390 build enabled (but non-working).


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-s390-generic	15 Jul 2006 06:49:38 -0000	1.19
+++ config-s390-generic	26 Jul 2006 22:32:29 -0000	1.20
@@ -182,6 +182,3 @@
 # CONFIG_DETECT_SOFTLOCKUP is not set
 
 CONFIG_S390_HYPFS_FS=y
-
-# FIXME
-# CONFIG_UTRACE is not set



From fedora-cvs-commits at redhat.com  Wed Jul 26 22:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 18:32:31 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2457,
	1.2458 linux-2.6-utrace.patch, 1.8, 1.9
Message-ID: <200607262232.k6QMWV1M003488@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3375

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
New utrace patch: unsafe_exec fix; s390 build enabled (but non-working).


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2457
retrieving revision 1.2458
diff -u -r1.2457 -r1.2458
--- kernel-2.6.spec	26 Jul 2006 21:03:28 -0000	1.2457
+++ kernel-2.6.spec	26 Jul 2006 22:32:28 -0000	1.2458
@@ -767,9 +767,9 @@
 # Check properly for successful RTAS instantiation
 %patch314 -p1
 
-# Ensure that the vdso is built with sysv hashing to fix 
+# Ensure that the vdso is built with sysv hashing to fix
 # ia64 booting (#199634, #199595)
-%patch400 -p1 
+%patch400 -p1
 
 #
 # Patches 500 through 1000 are reserved for bugfixes to the core system
@@ -1647,7 +1647,10 @@
 %endif
 
 %changelog
-* Wed Jul 26 2006 Juan Quintela <quintela at anano.mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}
+* Wed Jul 26 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch: unsafe_exec fix; s390 build enabled (but non-working).
+
+* Wed Jul 26 2006 Juan Quintela <quintela at redhat.com>
 - new xen patch based on linux-2.6-xen cset 22749.
   and linux-2.6 cset 33089.
 
@@ -1696,10 +1699,10 @@
 - add ia64-xen config
 
 * Fri Jul 21 2006 Jeremy Katz <katzj at redhat.com>
-- Patch from jakub to use sysv style hash for VDSO to fix booting 
+- Patch from jakub to use sysv style hash for VDSO to fix booting
   on ia64 (#199634, #199595)
 - Fix e1000 crc calculation for things to work with xen
-- Update gfs2 patchset 
+- Update gfs2 patchset
 
 * Thu Jul 20 2006 Roland McGrath <roland at redhat.com>
 - Clean up spec changes for debuginfo generation to cover Xen case.

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 +++++++++---------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  690 +++++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 +++++++------
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-s390/tracehook.h            |  103 ++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  566 +++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1531 ++++++++++++++++++++++++--------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1501 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 82 files changed, 7671 insertions(+), 3192 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-utrace.patch	21 Jul 2006 02:26:08 -0000	1.8
+++ linux-2.6-utrace.patch	26 Jul 2006 22:32:28 -0000	1.9
@@ -7,7 +7,7 @@
  arch/i386/kernel/entry.S                |    7 
  arch/i386/kernel/i387.c                 |  143 ++-
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  862 ++++++++++--------
+ arch/i386/kernel/ptrace.c               |  862 +++++++++--------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
  arch/ia64/ia32/sys_ia32.c               |    2 
@@ -21,7 +21,7 @@
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  842 +++++++++---------
+ arch/powerpc/kernel/ptrace.c            |  842 +++++++++--------
  arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
@@ -30,15 +30,17 @@
  arch/powerpc/platforms/cell/spufs/run.c |    2 
  arch/ppc/kernel/asm-offsets.c           |    2 
  arch/s390/kernel/compat_linux.c         |    3 
+ arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |   79 +-
+ arch/s390/kernel/ptrace.c               |  690 +++++++++++++-
+ arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
  arch/sparc64/kernel/ptrace.c            |   18 
- arch/x86_64/ia32/fpu32.c                |   92 ++
+ arch/x86_64/ia32/fpu32.c                |   92 +-
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  699 ++++++++++-----
+ arch/x86_64/ia32/ptrace32.c             |  699 +++++++++-----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
  arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
@@ -57,32 +59,34 @@
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
- include/asm-i386/tracehook.h            |   73 ++
+ include/asm-i386/tracehook.h            |   73 +
  include/asm-powerpc/tracehook.h         |  302 ++++++
+ include/asm-s390/tracehook.h            |  103 ++
  include/asm-x86_64/fpu32.h              |    3 
  include/asm-x86_64/thread_info.h        |    2 
  include/asm-x86_64/tracehook.h          |  105 ++
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   86 +-
  include/linux/sched.h                   |   25 -
- include/linux/tracehook.h               |  568 ++++++++++++
- include/linux/utrace.h                  |  459 ++++++++++
+ include/linux/tracehook.h               |  566 +++++++++++
+ include/linux/utrace.h                  |  471 ++++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
  kernel/exit.c                           |  251 +----
  kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1470 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1531 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1477 +++++++++++++++++++++++++++++++
+ kernel/utrace.c                         | 1501 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 79 files changed, 6852 insertions(+), 3183 deletions(-)
+ 82 files changed, 7666 insertions(+), 3187 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
+ create mode 100644 include/asm-s390/tracehook.h
  create mode 100644 include/asm-x86_64/tracehook.h
  create mode 100644 include/linux/tracehook.h
  create mode 100644 include/linux/utrace.h
@@ -544,6 +548,112 @@
 +
 +
 +#endif
+--- linux-2.6/include/asm-s390/tracehook.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-s390/tracehook.h
+@@ -0,0 +1,103 @@
++/*
++ * Tracing hooks, s390/s390x support.
++ */
++
++#ifndef _ASM_TRACEHOOK_H
++#define _ASM_TRACEHOOK_H	1
++
++#include <linux/sched.h>
++#include <asm/ptrace.h>
++
++/*
++ * See linux/tracehook.h for the descriptions of what these need to do.
++ */
++
++/* These three are defined in arch/s390/kernel/ptrace.c.  */
++void tracehook_enable_single_step(struct task_struct *tsk);
++void tracehook_disable_single_step(struct task_struct *tsk);
++int tracehook_single_step_enabled(struct task_struct *tsk);
++
++
++static inline void tracehook_enable_syscall_trace(struct task_struct *tsk)
++{
++	set_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline void tracehook_disable_syscall_trace(struct task_struct *tsk)
++{
++	clear_tsk_thread_flag(tsk, TIF_SYSCALL_TRACE);
++}
++
++static inline void tracehook_abort_syscall(struct pt_regs *regs)
++{
++	regs->gprs[2] = -1L;
++}
++
++
++extern const struct utrace_regset_view utrace_s390_native_view;
++static inline const struct utrace_regset_view *
++utrace_native_view(struct task_struct *tsk)
++{
++#ifdef CONFIG_COMPAT
++        extern const struct utrace_regset_view utrace_s390_compat_view;
++
++        if (test_tsk_thread_flag(tsk, TIF_31BIT))
++                return &utrace_s390_compat_view;
++#endif
++        return &utrace_s390_native_view;
++}
++
++
++#ifdef CONFIG_PTRACE
++#include <linux/ptrace.h>
++#include <linux/mm.h>
++#include <asm/uaccess.h>
++
++static inline int arch_ptrace(long request, struct task_struct *child,
++			      unsigned long addr, long data,
++			      const struct utrace_regset_view **view,
++			      int *regset, int *rw,
++			      void __user **uaddr, int *nregs)
++{
++	unsigned long tmp;
++	int copied;
++
++	switch (request) {
++	case PTRACE_PEEKTEXT:
++	case PTRACE_PEEKDATA:
++		/* Remove high order bit from address (only for 31 bit). */
++		addr &= PSW_ADDR_INSN;
++		/* read word at location addr. */
++		copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
++		if (copied != sizeof(tmp))
++			return -EIO;
++		return put_user(tmp, (unsigned long __user *) data);
++
++	case PTRACE_POKETEXT:
++	case PTRACE_POKEDATA:
++		/* Remove high order bit from address (only for 31 bit). */
++		addr &= PSW_ADDR_INSN;
++		/* write the word at location addr. */
++		copied = access_process_vm(child, addr, &data, sizeof(data),1);
++		if (copied != sizeof(data))
++			return -EIO;
++		return 0;
++	}
++
++	return -ENOSYS;
++}
++
++#ifdef CONFIG_COMPAT
++static inline int arch_compat_ptrace(long request, struct task_struct *child,
++				     unsigned long addr, long data,
++				     const struct utrace_regset_view **view,
++				     int *regset, int *rw,
++				     void __user **uaddr, int *nregs)
++{
++	return -ENOSYS;
++}
++#endif	/* CONFIG_COMPAT */
++#endif	/* CONFIG_PTRACE */
++
++
++#endif
 --- linux-2.6/include/asm-x86_64/fpu32.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-x86_64/fpu32.h
 @@ -7,4 +7,7 @@ int restore_i387_ia32(struct task_struct
@@ -763,7 +873,7 @@
  extern int send_sig(int, struct task_struct *, int);
 --- linux-2.6/include/linux/utrace.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/utrace.h
-@@ -0,0 +1,459 @@
+@@ -0,0 +1,471 @@
 +/*
 + * User Debugging Data & Event Rendezvous
 + *
@@ -1128,6 +1238,17 @@
 +				       struct task_struct *caller);
 +
 +	/*
++	 * Return LSM_UNSAFE_* bits that apply to the exec in progress
++	 * due to tracing done by this engine.  These bits indicate that
++	 * someone is able to examine the process and so a set-UID or similar
++	 * privilege escalation may not be safe to permit.
++	 *
++	 * Called with task_lock held.
++	 */
++	int (*unsafe_exec)(struct utrace_attached_engine *engine,
++			   struct task_struct *target);
++
++	/*
 +	 * Return the value to display after "TracerPid:" in /proc/PID/status.
 +	 * If this engine returns zero, another engine may supply the value.
 +	 */
@@ -1219,6 +1340,7 @@
 +void utrace_report_syscall(struct pt_regs *regs, int is_exit);
 +pid_t utrace_tracer_pid(struct task_struct *);
 +int utrace_allow_access_process_vm(struct task_struct *);
++int utrace_unsafe_exec(struct task_struct *);
 +void utrace_signal_handler_singlestep(struct task_struct *, struct pt_regs *);
 +
 +
@@ -1337,7 +1459,7 @@
  	.sibling	= LIST_HEAD_INIT(tsk.sibling),			\
 --- linux-2.6/include/linux/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/linux/tracehook.h
-@@ -0,0 +1,568 @@
+@@ -0,0 +1,566 @@
 +/*
 + * Tracing hooks
 + *
@@ -1735,13 +1857,11 @@
 + */
 +static inline int tracehook_unsafe_exec(struct task_struct *tsk)
 +{
++#ifdef CONFIG_UTRACE
++	if (tsk->utrace_flags)
++		return utrace_unsafe_exec(tsk);
++#endif
 +	return 0;
-+//	if (p->ptrace & PT_PTRACED) {
-+//		if (p->ptrace & PT_PTRACE_CAP)
-+//			unsafe |= LSM_UNSAFE_PTRACE_CAP;
-+//		else
-+//			unsafe |= LSM_UNSAFE_PTRACE;
-+//	}
 +}
 +
 +/*
@@ -2872,7 +2992,7 @@
  EXPORT_SYMBOL(sigprocmask);
 --- linux-2.6/kernel/utrace.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/utrace.c
-@@ -0,0 +1,1477 @@
+@@ -0,0 +1,1501 @@
 +#include <linux/utrace.h>
 +#include <linux/tracehook.h>
 +#include <linux/err.h>
@@ -4350,6 +4470,30 @@
 +
 +	return ret;
 +}
++
++/*
++ * Called on the current task to return LSM_UNSAFE_* bits implied by tracing.
++ * Called with task_lock held.
++ */
++int
++utrace_unsafe_exec(struct task_struct *tsk)
++{
++	struct utrace *utrace = tsk->utrace;
++	struct list_head *pos, *next;
++	struct utrace_attached_engine *engine;
++	const struct utrace_engine_ops *ops;
++	int unsafe = 0;
++
++	/* XXX must change for sharing */
++	list_for_each_safe_rcu(pos, next, &utrace->engines) {
++		engine = list_entry(pos, struct utrace_attached_engine, entry);
++		ops = rcu_dereference(engine->ops);
++		if (ops->unsafe_exec)
++			unsafe |= (*ops->unsafe_exec)(engine, tsk);
++	}
++
++	return unsafe;
++}
 --- linux-2.6/kernel/exit.c.utrace-ptrace-compat
 +++ linux-2.6/kernel/exit.c
 @@ -21,6 +21,7 @@
@@ -5076,7 +5220,7 @@
  /*
   * Access another process' address space.
   * Source/target buffer must be kernel space, 
-@@ -295,249 +125,1211 @@ int access_process_vm(struct task_struct
+@@ -295,249 +125,1272 @@ int access_process_vm(struct task_struct
  	return buf - old_buf;
  }
  
@@ -5133,6 +5277,7 @@
 +			unsigned int sysemu:1; /* PTRACE_SYSEMU in progress. */
 +#endif
 +			unsigned int have_eventmsg:1; /* u.eventmsg valid. */
++			unsigned int cap_sys_ptrace:1; /* Tracer capable.  */
 +
 +			union
 +			{
@@ -5169,7 +5314,7 @@
 -		int this_len, retval;
 +static int
 +ptrace_setup(struct task_struct *target, struct utrace_attached_engine *engine,
-+	     struct task_struct *parent, u8 options)
++	     struct task_struct *parent, u8 options, int cap_sys_ptrace)
 +{
 +	struct ptrace_state *state = kzalloc(sizeof *state, GFP_USER);
 +	if (unlikely(state == NULL))
@@ -5179,6 +5324,7 @@
 +	state->task = target;
 +	state->parent = parent;
 +	state->u.live.options = options;
++	state->u.live.cap_sys_ptrace = cap_sys_ptrace;
 +	ptrace_state_link(state);
  
 -		this_len = (len > sizeof(buf)) ? sizeof(buf) : len;
@@ -5282,7 +5428,7 @@
 +		retval = security_ptrace(current->parent, current);
 +		if (!retval)
 +			retval = ptrace_setup(current, engine,
-+					      current->parent, 0);
++					      current->parent, 0, 0);
 +		if (retval)
 +			utrace_detach(current, engine);
 +		else
@@ -5325,7 +5471,8 @@
 -	if (data & PTRACE_O_TRACEVFORKDONE)
 -		child->ptrace |= PT_TRACE_VFORK_DONE;
 +	if (ptrace_may_attach(task))
-+		retval = ptrace_setup(task, engine, current, 0);
++		retval = ptrace_setup(task, engine, current, 0,
++				      capable(CAP_SYS_PTRACE));
 +	if (retval)
 +		utrace_detach(task, engine);
 +	else {
@@ -5384,8 +5531,7 @@
 +		list_for_each_entry_rcu(state, &tsk->ptracees, entry) {
 +			rcu_assign_pointer(state->engine->data, 0UL);
 +			utrace_detach(state->task, state->engine);
- 		}
--		spin_unlock_irq(&child->sighand->siglock);
++		}
 +
 +		/*
 +		 * Now clear out our list and clean up our data structures.
@@ -5395,7 +5541,8 @@
 +		list_for_each_entry_safe(state, next, &tsk->ptracees, entry) {
 +			list_del_rcu(&state->entry);
 +			ptrace_done(state);
-+		}
+ 		}
+-		spin_unlock_irq(&child->sighand->siglock);
 +		task_unlock(tsk);
  	}
 -	read_unlock(&tasklist_lock);
@@ -5486,7 +5633,7 @@
 +			return -EINVAL;
 +		pos = (addr - regset->bias) * regset->size;
 +		n = 1;
-+	}
+ 	}
 +	else
 +		n = nregs == 0 ? regset->n : nregs;
 +
@@ -5530,6 +5677,17 @@
 +	addr -= seg->start;
 +	addr += seg->offset;
 +
++	if (unlikely(seg->regset == (unsigned int) -1)) {
++		/*
++		 * This is a no-op/zero-fill portion of struct user.
++		 */
++		ret = 0;
++		if (!write && clear_user((void __user *) data,
++					 view->regsets[0].size))
++			ret = -EFAULT;
++		goto out;
++	}
++
 +	regset = utrace_regset(target, engine, view, seg->regset);
 +	if (unlikely(regset == NULL))
 +		goto out;
@@ -5559,9 +5717,9 @@
 +			default:
 +				BUG();
 +			}
- 	}
++	}
 +	else {
-+		void *datap = (void *) data;
++		void *datap = (void __user *) data;
 +		if (likely(access_ok(VERIFY_WRITE, datap, regset->size)))
 +			ret = (*regset->get)(target, regset,
 +					     addr, regset->size, NULL, datap);
@@ -5744,7 +5902,7 @@
 +	case PTRACE_GETFPREGS:
 +		ret = ptrace_regset(child, engine, utrace_native_view(current),
 +				    1, 0, 0, addr, (void __user *)data);
- 		break;
++		break;
 +	case PTRACE_SETFPREGS:
 +		ret = ptrace_regset(child, engine, utrace_native_view(current),
 +				    1, 1, 0, addr, (void __user *)data);
@@ -5757,6 +5915,40 @@
 +	case PTRACE_POKEUSR:
 +		ret = ptrace_uarea(child, engine, 1, addr, data);
 +		break;
++#ifdef PTRACE_PEEKUSR_AREA
++	case PTRACE_PEEKUSR_AREA:
++	case PTRACE_POKEUSR_AREA: {
++		ptrace_area parea;
++		int copied;
++
++		if (copy_from_user(&parea, (void __user *) addr,
++				   sizeof(parea)))
++			return -EFAULT;
++
++		copied = 0;
++		while (copied < parea.len) {
++			if (request == PTRACE_PEEKUSR_AREA)
++				ret = ptrace_uarea(child, engine,
++						   0, parea.kernel_addr,
++						   parea.process_addr);
++			else {
++				unsigned long tmp;
++				if (get_user (tmp, (unsigned long __user *)
++					      parea.process_addr))
++					return -EFAULT;
++				ret = ptrace_uarea(child, engine,
++						   1, parea.kernel_addr, tmp);
++			}
++			if (ret)
++				break;
++			parea.kernel_addr += sizeof(unsigned long);
++			parea.process_addr += sizeof(unsigned long);
++			copied += sizeof(unsigned long);
++		}
++
++		break;
++	}
++#endif
 +	}
 +
 +	return ret;
@@ -5799,7 +5991,7 @@
 +	switch (request) {
 +	default:
 +		ret = ptrace_common(request, child, engine, state, addr, data);
-+		break;
+ 		break;
 +
 +	case PTRACE_PEEKTEXT: /* read word at location addr. */
 +	case PTRACE_PEEKDATA: {
@@ -5908,9 +6100,9 @@
 +		if (copied != sizeof(tmp))
 +			break;
 +		ret = put_user(tmp, (compat_ulong_t __user *) data);
- 		break;
- 	}
- 
++		break;
++	}
++
 +	case PTRACE_POKETEXT: /* write the word at location addr. */
 +	case PTRACE_POKEDATA:
 +		ret = 0;
@@ -5938,9 +6130,9 @@
 +			    state->u.live.u.siginfo,
 +			    (struct compat_siginfo __user *) data))
 +			ret = -EFAULT;
-+		break;
-+	}
-+
+ 		break;
+ 	}
+ 
 +out_tsk:
 +	put_task_struct(child);
 +out:
@@ -6280,7 +6472,8 @@
 +	else {
 +		int ret = ptrace_setup(child, child_engine,
 +				       state->parent,
-+				       state->u.live.options);
++				       state->u.live.options,
++				       state->u.live.cap_sys_ptrace);
 +		if (unlikely(ret != 0)) {
 +			BUG_ON(ret != -ENOMEM);
 +			printk(KERN_ERR
@@ -6310,23 +6503,23 @@
 +out:
 +	return UTRACE_ACTION_RESUME;
 +}
++
  
 -	ret = arch_ptrace(child, request, addr, data);
 -	if (ret < 0)
 -		goto out_put_task_struct;
- 
-- out_put_task_struct:
--	put_task_struct(child);
-- out:
--	unlock_kernel();
--	return ret;
 +static u32
 +ptrace_report_vfork_done(struct utrace_attached_engine *engine,
 +			 struct task_struct *parent, struct task_struct *child)
 +{
 +	return ptrace_event(engine, parent, PTRACE_EVENT_VFORK_DONE);
 +}
-+
+ 
+- out_put_task_struct:
+-	put_task_struct(child);
+- out:
+-	unlock_kernel();
+-	return ret;
 +
 +static u32
 +ptrace_report_signal(struct utrace_attached_engine *engine,
@@ -6386,8 +6579,18 @@
 +	state->u.live.have_eventmsg = 1;
 +	state->u.live.u.eventmsg = *code;
 +	return ptrace_event(engine, tsk, PTRACE_EVENT_EXIT);
- }
--#endif /* __ARCH_SYS_PTRACE */
++}
++
++static int
++ptrace_unsafe_exec(struct utrace_attached_engine *engine,
++		   struct task_struct *tsk)
++{
++	struct ptrace_state *state = (struct ptrace_state *) engine->data;
++	int unsafe = LSM_UNSAFE_PTRACE;
++	if (state->u.live.cap_sys_ptrace)
++		unsafe = LSM_UNSAFE_PTRACE_CAP;
++	return unsafe;
++}
 +
 +static pid_t
 +ptrace_tracer_pid(struct utrace_attached_engine *engine,
@@ -6431,7 +6634,8 @@
 +	rcu_read_unlock();
 +
 +	return ours && security_ptrace(caller, target) == 0;
-+}
+ }
+-#endif /* __ARCH_SYS_PTRACE */
 +
 +
 +static const struct utrace_engine_ops ptrace_utrace_ops =
@@ -6445,6 +6649,7 @@
 +	.report_clone = ptrace_report_clone,
 +	.report_exit = ptrace_report_exit,
 +	.report_death = ptrace_report_death,
++	.unsafe_exec = ptrace_unsafe_exec,
 +	.tracer_pid = ptrace_tracer_pid,
 +	.allow_access_process_vm = ptrace_allow_access_process_vm,
 +};
@@ -10182,6 +10387,47 @@
  #endif
  #ifdef CONFIG_ALTIVEC
  	DEFINE(THREAD_VR0, offsetof(struct thread_struct, vr[0]));
+--- linux-2.6/arch/s390/kernel/signal.c.utrace-ptrace-compat
++++ linux-2.6/arch/s390/kernel/signal.c
+@@ -25,6 +25,7 @@
+ #include <linux/tty.h>
+ #include <linux/personality.h>
+ #include <linux/binfmts.h>
++#include <linux/tracehook.h>
+ #include <asm/ucontext.h>
+ #include <asm/uaccess.h>
+ #include <asm/lowcore.h>
+@@ -405,6 +406,9 @@ handle_signal(unsigned long sig, struct 
+ 		spin_unlock_irq(&current->sighand->siglock);
+ 	}
+ 
++	if (ret == 0) 
++		tracehook_report_handle_signal(sig, ka, oldset, regs);
++
+ 	return ret;
+ }
+ 
+--- linux-2.6/arch/s390/kernel/compat_signal.c.utrace-ptrace-compat
++++ linux-2.6/arch/s390/kernel/compat_signal.c
+@@ -28,6 +28,7 @@
+ #include <asm/ucontext.h>
+ #include <asm/uaccess.h>
+ #include <asm/lowcore.h>
++#include <linux/tracehook.h>
+ #include "compat_linux.h"
+ #include "compat_ptrace.h"
+ 
+@@ -580,6 +581,10 @@ handle_signal32(unsigned long sig, struc
+ 		recalc_sigpending();
+ 		spin_unlock_irq(&current->sighand->siglock);
+ 	}
++
++	if (ret == 0) 
++		tracehook_report_handle_signal(sig, ka, oldset, regs);
++
+ 	return ret;
+ }
+ 
 --- linux-2.6/arch/s390/kernel/process.c.utrace-ptrace-compat
 +++ linux-2.6/arch/s390/kernel/process.c
 @@ -331,9 +331,6 @@ asmlinkage long sys_execve(struct pt_reg
@@ -10237,15 +10483,25 @@
  				signal = SIGILL;
 --- linux-2.6/arch/s390/kernel/ptrace.c.utrace-ptrace-compat
 +++ linux-2.6/arch/s390/kernel/ptrace.c
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,9 @@
  #include <linux/smp_lock.h>
  #include <linux/errno.h>
  #include <linux/ptrace.h>
 +#include <linux/tracehook.h>
++#include <linux/compile.h>
++#include <linux/module.h>
  #include <linux/user.h>
  #include <linux/security.h>
  #include <linux/audit.h>
-@@ -87,19 +88,25 @@ FixPerRegisters(struct task_struct *task
+@@ -41,6 +44,7 @@
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
++#include <asm/elf.h>
+ 
+ #ifdef CONFIG_COMPAT
+ #include "compat_ptrace.h"
+@@ -87,31 +91,636 @@ FixPerRegisters(struct task_struct *task
  }
  
  void
@@ -10270,80 +10526,682 @@
 +	return task->thread.per_info.single_step;
 +}
 +
- /*
-  * Called by kernel/ptrace.c when detaching..
-  *
-@@ -109,7 +116,7 @@ void
- ptrace_disable(struct task_struct *child)
- {
- 	/* make sure the single step bit is not set. */
--	clear_single_step(child);
-+	tracehook_disable_single_step(child);
- }
- 
- #ifndef CONFIG_64BIT
-@@ -118,6 +125,7 @@ ptrace_disable(struct task_struct *child
- # define __ADDR_MASK 7
- #endif
- 
-+#if 0				/* XXX */
- /*
-  * Read the word at offset addr from the user area of a process. The
-  * trouble here is that the information is littered over different
-@@ -593,6 +601,7 @@ do_ptrace_emu31(struct task_struct *chil
- 			copied += sizeof(unsigned int);
- 		}
- 		return 0;
-+#if 0				/* XXX */
- 	case PTRACE_GETEVENTMSG:
- 		return put_user((__u32) child->ptrace_message,
- 				(unsigned int __user *) data);
-@@ -606,6 +615,7 @@ do_ptrace_emu31(struct task_struct *chil
- 			return -EINVAL;
- 		return copy_siginfo_from_user32(child->last_siginfo,
- 						(compat_siginfo_t __user *) data);
-+#endif
- 	}
- 	return ptrace_request(child, request, addr, data);
- }
-@@ -656,7 +666,7 @@ do_ptrace(struct task_struct *child, lon
- 			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
- 		child->exit_code = data;
- 		/* make sure the single step bit is not set. */
--		clear_single_step(child);
-+		tracehook_disable_single_step(child);
- 		wake_up_process(child);
- 		return 0;
- 
-@@ -670,7 +680,7 @@ do_ptrace(struct task_struct *child, lon
- 			return 0;
- 		child->exit_code = SIGKILL;
- 		/* make sure the single step bit is not set. */
--		clear_single_step(child);
-+		tracehook_disable_single_step(child);
- 		wake_up_process(child);
- 		return 0;
- 
-@@ -683,7 +693,7 @@ do_ptrace(struct task_struct *child, lon
- 		if (data)
- 			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
- 		else
--			set_single_step(child);
-+			tracehook_enable_single_step(child);
- 		/* give it a chance to run. */
- 		wake_up_process(child);
- 		return 0;
-@@ -704,31 +714,7 @@ do_ptrace(struct task_struct *child, lon
- 	/* Not reached.  */
- 	return -EIO;
- }
--
--asmlinkage long
--sys_ptrace(long request, long pid, long addr, long data)
++
++static int
++genregs_get(struct task_struct *target,
++	    const struct utrace_regset *regset,
++	    unsigned int pos, unsigned int count,
++	    void *kbuf, void __user *ubuf)
++{
++	struct pt_regs *regs = task_pt_regs(target);
++
++	/* Remove per bit from user psw. */
++	if (count > 0 && pos == PT_PSWMASK) {
++		unsigned long pswmask = regs->psw.mask & ~PSW_MASK_PER;
++		if (kbuf) {
++			*(unsigned long *) kbuf = pswmask;
++			kbuf += sizeof(unsigned long);
++		}
++		else if (put_user(pswmask, (unsigned long __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(unsigned long);
++		pos += sizeof(unsigned long);
++		count -= sizeof(unsigned long);
++	}
++
++	/* The rest of the PSW and the GPRs are directly on the stack. */
++	if (count > 0 && pos < PT_ACR0) {
++		unsigned int copy = PT_ACR0 - pos;
++		if (count < copy)
++			copy = count;
++		if (kbuf) {
++			memcpy(kbuf, (char *) &regs->psw.addr + pos, copy);
++			kbuf += copy;
++		}
++		else if (copy_to_user(ubuf, (char *) &regs->psw.addr + pos,
++				      copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++	}
++
++	/* The ACRs are kept in the thread_struct.  */
++	if (count > 0 && pos < PT_ORIGGPR2) {
++		unsigned int ofs = pos - PT_ACR0;
++		unsigned int copy = PT_ORIGGPR2 - pos;
++		if (count < copy)
++			copy = count;
++
++		if (target == current)
++			save_access_regs(target->thread.acrs);
++
++		if (kbuf) {
++			memcpy(kbuf, (char *) target->thread.acrs + ofs, copy);
++			kbuf += copy;
++		}
++		else if (copy_to_user(ubuf, (char *) target->thread.acrs + ofs,
++				      copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++	}
++
++	/* Finally, the ORIG_GPR2 value.  */
++	if (count > 0) {
++		if (kbuf)
++			*(unsigned long *) kbuf = regs->orig_gpr2;
++		else if (put_user(regs->orig_gpr2,
++				  (unsigned long __user *) ubuf))
++			return -EFAULT;
++	}
++
++	return 0;
++}
++
++static int
++genregs_set(struct task_struct *target,
++	    const struct utrace_regset *regset,
++	    unsigned int pos, unsigned int count,
++	    const void *kbuf, const void __user *ubuf)
++{
++	struct pt_regs *regs = task_pt_regs(target);
++
++	/* Check for an invalid PSW mask.  */
++	if (count > 0 && pos == PT_PSWMASK) {
++		unsigned long pswmask;
++		if (kbuf) {
++			pswmask = *(const unsigned long *) kbuf;
++			kbuf += sizeof(unsigned long);
++		}
++		else if (get_user(pswmask,
++				  (const unsigned long __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(unsigned long);
++		pos += sizeof(unsigned long);
++		count -= sizeof(unsigned long);
++
++		if (pswmask != PSW_MASK_MERGE(PSW_USER_BITS, pswmask)
++#ifdef CONFIG_COMPAT
++		    && pswmask != PSW_MASK_MERGE(PSW_USER32_BITS, pswmask)
++#endif
++			)
++			/* Invalid psw mask. */
++			return -EINVAL;
++		regs->psw.mask = pswmask;
++		FixPerRegisters(target);
++	}
++
++	/* The rest of the PSW and the GPRs are directly onto the stack. */
++	if (count > 0 && pos < PT_ACR0) {
++		unsigned int copy = PT_ACR0 - pos;
++		if (count < copy)
++			copy = count;
++		if (kbuf) {
++			memcpy((char *) &regs->psw.addr + pos, kbuf, copy);
++			kbuf += copy;
++		}
++		else if (copy_from_user((char *) &regs->psw.addr + pos,
++					ubuf, copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++
++#ifndef CONFIG_64BIT
++		/* I'd like to reject addresses without the
++		   high order bit but older gdb's rely on it */
++		regs->psw.addr |= PSW_ADDR_AMODE;
++#endif
++	}
++
++	/* The ACRs are kept in the thread_struct.  */
++	if (count > 0 && pos < PT_ORIGGPR2) {
++		unsigned int copy = PT_ORIGGPR2 - pos;
++		if (count < copy)
++			copy = count;
++
++		if (target == current
++		    && (pos != PT_ACR0 || count < sizeof(target->thread.acrs)))
++			save_access_regs(target->thread.acrs);
++
++		if (kbuf) {
++			memcpy((char *) target->thread.acrs + pos, kbuf, copy);
++			kbuf += copy;
++		}
++		else if (copy_from_user((char *) target->thread.acrs + pos,
++					ubuf, copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++
++		if (target == current)
++			restore_access_regs(target->thread.acrs);
++	}
++
++	/* Finally, the ORIG_GPR2 value.  */
++	if (count > 0) {
++		if (kbuf)
++			regs->orig_gpr2 = *(const unsigned long *) kbuf;
++		else if (get_user(regs->orig_gpr2,
++				  (const unsigned long __user *) ubuf))
++			return -EFAULT;
++	}
++
++	return 0;
++}
++
++static int
++fpregs_get(struct task_struct *target,
++	   const struct utrace_regset *regset,
++	   unsigned int pos, unsigned int count,
++	   void *kbuf, void __user *ubuf)
++{
++	if (target == current)
++		save_fp_regs(&target->thread.fp_regs);
++
++	if (kbuf)
++		memcpy(kbuf, (char *) &target->thread.fp_regs + pos, count);
++	else if (copy_to_user(ubuf, (char *) &target->thread.fp_regs + pos,
++			      count))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int
++fpregs_set(struct task_struct *target,
++	    const struct utrace_regset *regset,
++	    unsigned int pos, unsigned int count,
++	    const void *kbuf, const void __user *ubuf)
++{
++	if (target == current && (pos != 0 || count != sizeof(s390_fp_regs)))
++		save_fp_regs(&target->thread.fp_regs);
++
++	/* If setting FPC, must validate it first. */
++	if (count > 0 && pos == 0) {
++		unsigned long fpc;
++		if (kbuf) {
++			fpc = *(const unsigned long *) kbuf;
++			kbuf += sizeof(unsigned long);
++		}
++		else if (get_user(fpc, (const unsigned long __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(unsigned long);
++		pos += sizeof(unsigned long);
++		count -= sizeof(unsigned long);
++
++		if ((fpc & ~((unsigned long) FPC_VALID_MASK
++			     << (BITS_PER_LONG - 32))) != 0)
++			return -EINVAL;
++		memcpy(&target->thread.fp_regs, &fpc, sizeof(fpc));
++	}
++
++	if (kbuf)
++		memcpy((char *) &target->thread.fp_regs + pos, kbuf, count);
++	else if (copy_from_user((char *) &target->thread.fp_regs + pos,
++				ubuf, count))
++		return -EFAULT;
++
++	if (target == current)
++		restore_fp_regs(&target->thread.fp_regs);
++
++	return 0;
++}
++
++static int
++per_info_get(struct task_struct *target,
++	     const struct utrace_regset *regset,
++	     unsigned int pos, unsigned int count,
++	     void *kbuf, void __user *ubuf)
++{
++	if (kbuf)
++		memcpy(kbuf, (char *) &target->thread.per_info + pos, count);
++	else if (copy_to_user(ubuf, (char *) &target->thread.per_info + pos,
++			      count))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int
++per_info_set(struct task_struct *target,
++	     const struct utrace_regset *regset,
++	     unsigned int pos, unsigned int count,
++	     const void *kbuf, const void __user *ubuf)
++{
++	if (kbuf)
++		memcpy((char *) &target->thread.per_info + pos, kbuf, count);
++	else if (copy_from_user((char *) &target->thread.per_info + pos,
++				ubuf, count))
++		return -EFAULT;
++
++	FixPerRegisters(target);
++	return 0;
++}
++
++
+ /*
+- * Called by kernel/ptrace.c when detaching..
+- *
+- * Make sure single step bits etc are not set.
++ * These are our native regset flavors.
+  */
+-void
+-ptrace_disable(struct task_struct *child)
++static const struct utrace_regset native_regsets[] = {
++	{
++		.size = sizeof(long), .align = sizeof(long),
++		.n = sizeof(s390_regs) / sizeof(long),
++		.get = genregs_get, .set = genregs_set
++	},
++	{
++		.size = sizeof(long), .align = sizeof(long),
++		.n = sizeof(s390_fp_regs) / sizeof(long),
++		.get = fpregs_get, .set = fpregs_set
++	},
++	{
++		.size = sizeof(long), .align = sizeof(long),
++		.n = sizeof(per_struct) / sizeof(long),
++		.get = per_info_get, .set = per_info_set
++	},
++};
++
++static const struct ptrace_uarea_segment native_uarea[] = {
++	{PT_PSWMASK, PT_FPC, 0, 0},
++	{PT_FPC, PT_CR_9, 1, 0},
++	{PT_CR_9, PT_IEEE_IP, 2, 0},
++	{PT_IEEE_IP, sizeof(struct user), -1, -1},
++	{0, 0, -1, 0}
++};
++
++const struct utrace_regset_view utrace_s390_native_view = {
++	.name = UTS_MACHINE, .e_machine = ELF_ARCH,
++	.regsets = native_regsets,
++	.n = sizeof native_regsets / sizeof native_regsets[0],
++	.uarea_segments = native_uarea
++};
++EXPORT_SYMBOL_GPL(utrace_s390_native_view);
++
++
++#ifdef CONFIG_COMPAT
++static int
++s390_genregs_get(struct task_struct *target,
++		 const struct utrace_regset *regset,
++		 unsigned int pos, unsigned int count,
++		 void *kbuf, void __user *ubuf)
++{
++	struct pt_regs *regs = task_pt_regs(target);
++
++	/* Fake a 31 bit psw mask. */
++	if (count > 0 && pos == PT_PSWMASK / 2) {
++		u32 pswmask = PSW32_MASK_MERGE(PSW32_USER_BITS,
++					       (u32) (regs->psw.mask >> 32));
++		if (kbuf) {
++			*(u32 *) kbuf = pswmask;
++			kbuf += sizeof(u32);
++		}
++		else if (put_user(pswmask, (u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++	}
++
++	/* Fake a 31 bit psw address. */
++	if (count > 0 && pos == PT_PSWADDR / 2) {
++		u32 pswaddr = (u32) regs->psw.addr | PSW32_ADDR_AMODE31;
++		if (kbuf) {
++			*(u32 *) kbuf = pswaddr;
++			kbuf += sizeof(u32);
++		}
++		else if (put_user(pswaddr, (u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++	}
++
++	/* The GPRs are directly on the stack.  Just truncate them.  */
++	while (count > 0 && pos < PT_ACR0 / 2) {
++		u32 value = regs->gprs[(pos - PT_GPR0 / 2) / sizeof(u32)];
++		if (kbuf) {
++			*(u32 *) kbuf = value;
++			kbuf += sizeof(u32);
++		}
++		else if (put_user(value, (u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++	}
++
++	/* The ACRs are kept in the thread_struct.  */
++	if (count > 0 && pos < PT_ACR0 / 2 + NUM_ACRS * ACR_SIZE) {
++		unsigned int copy = PT_ACR0 / 2 + NUM_ACRS * ACR_SIZE - pos;
++		if (count < copy)
++			copy = count;
++
++		if (target == current)
++			save_access_regs(target->thread.acrs);
++
++		if (kbuf) {
++			memcpy(kbuf, (char *) target->thread.acrs + pos, copy);
++			kbuf += copy;
++		}
++		else if (copy_to_user(ubuf, (char *) target->thread.acrs + pos,
++				      copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++	}
++
++	/* Finally, the ORIG_GPR2 value.  */
++	if (count > 0) {
++		if (kbuf)
++			*(u32 *) kbuf = regs->orig_gpr2;
++		else if (put_user((u32) regs->orig_gpr2,
++				  (u32 __user *) ubuf))
++			return -EFAULT;
++	}
++
++	return 0;
++}
++
++static int
++s390_genregs_set(struct task_struct *target,
++		 const struct utrace_regset *regset,
++		 unsigned int pos, unsigned int count,
++		 const void *kbuf, const void __user *ubuf)
+ {
+-	/* make sure the single step bit is not set. */
+-	clear_single_step(child);
++	struct pt_regs *regs = task_pt_regs(target);
++
++	/* Check for an invalid PSW mask.  */
++	if (count > 0 && pos == PT_PSWMASK / 2) {
++		u32 pswmask;
++		if (kbuf) {
++			pswmask = *(const u32 *) kbuf;
++			kbuf += sizeof(u32);
++		}
++		else if (get_user(pswmask, (const u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++
++		if (pswmask != PSW_MASK_MERGE(PSW_USER32_BITS, pswmask))
++			/* Invalid psw mask. */
++			return -EINVAL;
++
++		/* Build a 64 bit psw mask from 31 bit mask. */
++		regs->psw.mask = PSW_MASK_MERGE(PSW_USER32_BITS,
++						(u64) pswmask << 32);
++		FixPerRegisters(target);
++	}
++
++	/* Build a 64 bit psw address from 31 bit address. */
++	if (count > 0 && pos == PT_PSWADDR / 2) {
++		u32 pswaddr;
++		if (kbuf) {
++			pswaddr = *(const u32 *) kbuf;
++			kbuf += sizeof(u32);
++		}
++		else if (get_user(pswaddr, (const u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++
++		/* Build a 64 bit psw mask from 31 bit mask. */
++		regs->psw.addr = pswaddr & PSW32_ADDR_INSN;
++	}
++
++	/* The GPRs are directly onto the stack. */
++	while (count > 0 && pos < PT_ACR0 / 2) {
++		u32 value;
++
++		if (kbuf) {
++			value = *(const u32 *) kbuf;
++			kbuf += sizeof(u32);
++		}
++		else if (get_user(value, (const u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++
++		regs->gprs[(pos - PT_GPR0 / 2) / sizeof(u32)] = value;
++	}
++
++	/* The ACRs are kept in the thread_struct.  */
++	if (count > 0 && pos < PT_ORIGGPR2 / 2) {
++		unsigned int ofs = pos - PT_ACR0 / 2;
++		unsigned int copy = PT_ORIGGPR2 / 2 - pos;
++		if (count < copy)
++			copy = count;
++
++		if (target == current
++		    && (pos != PT_ACR0 / 2
++			|| count < sizeof(target->thread.acrs)))
++			save_access_regs(target->thread.acrs);
++
++		if (kbuf) {
++			memcpy((char *) target->thread.acrs + ofs, kbuf, copy);
++			kbuf += copy;
++		}
++		else if (copy_from_user((char *) target->thread.acrs + ofs,
++					ubuf, copy))
++			return -EFAULT;
++		else
++			ubuf += copy;
++		pos += copy;
++		count -= copy;
++
++		if (target == current)
++			restore_access_regs(target->thread.acrs);
++	}
++
++	/* Finally, the ORIG_GPR2 value.  */
++	if (count > 0) {
++		u32 value;
++		if (kbuf)
++			value = *(const u32 *) kbuf;
++		else if (get_user(value, (const u32 __user *) ubuf))
++			return -EFAULT;
++		regs->orig_gpr2 = value;
++	}
++
++	return 0;
++}
++
++
++/*
++ * This is magic. See per_struct and per_struct32.
++ * By incident the offsets in per_struct are exactly
++ * twice the offsets in per_struct32 for all fields.
++ * The 8 byte fields need special handling though,
++ * because the second half (bytes 4-7) is needed and
++ * not the first half.
++ */
++static unsigned int
++offset_from_per32(unsigned int offset)
++{
++	if ((offset >= offsetof(per_struct32, control_regs)
++	     && offset - offsetof(per_struct32, control_regs) < 3*sizeof(u32))
++	    || (offset >= offsetof(per_struct32, starting_addr) &&
++		offset <= offsetof(per_struct32, ending_addr))
++	    || offset == offsetof(per_struct32, lowcore.words.address))
++		offset = offset*2 + 4;
++	else
++		offset = offset*2;
++	return offset;
+ }
+ 
++static int
++s390_per_info_get(struct task_struct *target,
++		  const struct utrace_regset *regset,
++		  unsigned int pos, unsigned int count,
++		  void *kbuf, void __user *ubuf)
++{
++	while (count > 0) {
++		u32 val = *(u32 *) ((char *) &target->thread.per_info
++				    + offset_from_per32 (pos));
++		if (kbuf) {
++			*(u32 *) kbuf = val;
++			kbuf += sizeof(u32);
++		}
++		else if (put_user(val, (u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++	}
++	return 0;
++}
++
++static int
++s390_per_info_set(struct task_struct *target,
++		  const struct utrace_regset *regset,
++		  unsigned int pos, unsigned int count,
++		  const void *kbuf, const void __user *ubuf)
++{
++	while (count > 0) {
++		u32 val;
++
++		if (kbuf) {
++			val = *(const u32 *) kbuf;
++			kbuf += sizeof(u32);
++		}
++		else if (get_user(val, (const u32 __user *) ubuf))
++			return -EFAULT;
++		else
++			ubuf += sizeof(u32);
++		pos += sizeof(u32);
++		count -= sizeof(u32);
++
++		*(u32 *) ((char *) &target->thread.per_info
++			  + offset_from_per32 (pos)) = val;
++	}
++	return 0;
++}
++
++
++static const struct utrace_regset s390_compat_regsets[] = {
++	{
++		.size = sizeof(u32), .align = sizeof(u32),
++		.n = sizeof(s390_regs) / sizeof(long),
++		.get = s390_genregs_get, .set = s390_genregs_set
++	},
++	{
++		.size = sizeof(u32), .align = sizeof(u32),
++		.n = sizeof(s390_fp_regs) / sizeof(u32),
++		.get = fpregs_get, .set = fpregs_set
++	},
++	{
++		.size = sizeof(u32), .align = sizeof(u32),
++		.n = sizeof(per_struct) / sizeof(u32),
++		.get = s390_per_info_get, .set = s390_per_info_set
++	},
++};
++
++static const struct ptrace_uarea_segment s390_compat_uarea[] = {
++	{PT_PSWMASK / 2, PT_FPC / 2, 0, 0},
++	{PT_FPC / 2, PT_CR_9 / 2, 1, 0},
++	{PT_CR_9 / 2, PT_IEEE_IP / 2, 2, 0},
++	{PT_IEEE_IP / 2, sizeof(struct user32), -1, -1},
++	{0, 0, -1, 0}
++};
++
++const struct utrace_regset_view utrace_s390_compat_view = {
++	.name = "s390", .e_machine = EM_S390,
++	.regsets = s390_compat_regsets,
++	.n = sizeof s390_compat_regsets / sizeof s390_compat_regsets[0],
++	.uarea_segments = s390_compat_uarea
++};
++EXPORT_SYMBOL_GPL(utrace_s390_compat_view);
++#endif	/* CONFIG_COMPAT */
++
++
++#if 0				/* XXX */
++
+ #ifndef CONFIG_64BIT
+ # define __ADDR_MASK 3
+ #else
+@@ -593,6 +1202,7 @@ do_ptrace_emu31(struct task_struct *chil
+ 			copied += sizeof(unsigned int);
+ 		}
+ 		return 0;
++#if 0				/* XXX */
+ 	case PTRACE_GETEVENTMSG:
+ 		return put_user((__u32) child->ptrace_message,
+ 				(unsigned int __user *) data);
+@@ -606,6 +1216,7 @@ do_ptrace_emu31(struct task_struct *chil
+ 			return -EINVAL;
+ 		return copy_siginfo_from_user32(child->last_siginfo,
+ 						(compat_siginfo_t __user *) data);
++#endif
+ 	}
+ 	return ptrace_request(child, request, addr, data);
+ }
+@@ -656,7 +1267,7 @@ do_ptrace(struct task_struct *child, lon
+ 			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+ 		child->exit_code = data;
+ 		/* make sure the single step bit is not set. */
+-		clear_single_step(child);
++		tracehook_disable_single_step(child);
+ 		wake_up_process(child);
+ 		return 0;
+ 
+@@ -670,7 +1281,7 @@ do_ptrace(struct task_struct *child, lon
+ 			return 0;
+ 		child->exit_code = SIGKILL;
+ 		/* make sure the single step bit is not set. */
+-		clear_single_step(child);
++		tracehook_disable_single_step(child);
+ 		wake_up_process(child);
+ 		return 0;
+ 
+@@ -683,7 +1294,7 @@ do_ptrace(struct task_struct *child, lon
+ 		if (data)
+ 			set_tsk_thread_flag(child, TIF_SINGLE_STEP);
+ 		else
+-			set_single_step(child);
++			tracehook_enable_single_step(child);
+ 		/* give it a chance to run. */
+ 		wake_up_process(child);
+ 		return 0;
+@@ -704,31 +1315,9 @@ do_ptrace(struct task_struct *child, lon
+ 	/* Not reached.  */
+ 	return -EIO;
+ }
++#endif
+ 
+-asmlinkage long
+-sys_ptrace(long request, long pid, long addr, long data)
 -{
 -	struct task_struct *child;
 -	int ret;
--
+ 
 -	lock_kernel();
 -	if (request == PTRACE_TRACEME) {
 -		 ret = ptrace_traceme();
@@ -10362,11 +11220,10 @@
 -	unlock_kernel();
 -	return ret;
 -}
-+#endif
  
  asmlinkage void
  syscall_trace(struct pt_regs *regs, int entryexit)
-@@ -736,30 +722,17 @@ syscall_trace(struct pt_regs *regs, int 
+@@ -736,30 +1325,17 @@ syscall_trace(struct pt_regs *regs, int 
  	if (unlikely(current->audit_context) && entryexit)
  		audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
  



From fedora-cvs-commits at redhat.com  Wed Jul 26 22:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 18:49:40 -0400
Subject: rpms/libdrm/devel libdrm.spec,1.17,1.18
Message-ID: <200607262249.k6QMneYI023594@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23571

Modified Files:
	libdrm.spec 
Log Message:
* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 2.0.2-3.fc6
- Build for rawhide.



Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libdrm.spec	26 Jul 2006 22:32:14 -0000	1.17
+++ libdrm.spec	26 Jul 2006 22:49:38 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0.2
-Release: 2.fc5.aiglx
+Release: 3%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -74,6 +74,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 2.0.2-3.fc6
+- Build for rawhide.
+
 * Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 2.0.2-2.fc5.aiglx
 - Build for fc5 aiglx repo.
 



From fedora-cvs-commits at redhat.com  Wed Jul 26 23:16:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 19:16:21 -0400
Subject: rpms/mesa/devel mesa.spec,1.79,1.80
Message-ID: <200607262316.k6QNGLGe005762@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3480

Modified Files:
	mesa.spec 
Log Message:
Set release back to 20%{?dist}.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mesa.spec	26 Jul 2006 22:23:58 -0000	1.79
+++ mesa.spec	26 Jul 2006 23:16:18 -0000	1.80
@@ -57,7 +57,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 19.fc5.aiglx
+Release: 20%{?dist}
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org



From fedora-cvs-commits at redhat.com  Wed Jul 26 23:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 19:21:24 -0400
Subject: rpms/compiz/devel compiz.spec,1.11,1.12
Message-ID: <200607262321.k6QNLOPg015189@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15165

Modified Files:
	compiz.spec 
Log Message:
Munge release field for fc5.aiglx build.


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compiz.spec	26 Jul 2006 21:58:34 -0000	1.11
+++ compiz.spec	26 Jul 2006 23:21:22 -0000	1.12
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.12.%{snapshot}git%{?dist}
+Release:        0.11.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -116,12 +116,12 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git.fc5.aiglx
+- Bump and build for fc5 AIGLX repo.
+
 * Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.12.20060721git
 - Fix gconf hooks.
 
-* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git
-- Bump and build for fc5 AIGLX repo.
-
 * Tue Jul 25 2006 Kristian H??gsberg <krh at redhat.com>
 - Require system-logos instead.
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 00:11:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 20:11:32 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.44,1.45
Message-ID: <200607270011.k6R0BW7W028848@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28704

Modified Files:
	linux-2.6-xen.patch 
Log Message:
this xen patch passes make prep

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 408 files changed, 85165 insertions(+), 870 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- linux-2.6-xen.patch	26 Jul 2006 21:19:12 -0000	1.44
+++ linux-2.6-xen.patch	27 Jul 2006 00:11:29 -0000	1.45
@@ -68473,18 +68473,6 @@
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
  	  ramfs. For architectures that support it, say Y here and read
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/asm-i386/a.out.h compiling/include/asm-i386/a.out.h
---- /mnt/ro/repos/hg/linux-2.6/include/asm-i386/a.out.h	2006-07-13 00:51:36.000000000 +0200
-+++ compiling/include/asm-i386/a.out.h	2006-07-23 00:17:06.000000000 +0200
-@@ -19,7 +19,7 @@ struct exec
- 
- #ifdef __KERNEL__
- 
--#define STACK_TOP	TASK_SIZE
-+#define STACK_TOP	(TASK_SIZE - 3*PAGE_SIZE)
- 
- #endif
- 
 diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/include/asm-i386/apic.h compiling/include/asm-i386/apic.h
 --- /mnt/ro/repos/hg/linux-2.6/include/asm-i386/apic.h	2006-07-13 00:51:36.000000000 +0200
 +++ compiling/include/asm-i386/apic.h	2006-07-23 00:17:06.000000000 +0200



From fedora-cvs-commits at redhat.com  Thu Jul 27 00:18:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 20:18:30 -0400
Subject: rpms/kernel/devel .cvsignore, 1.498, 1.499 kernel-2.6.spec, 1.2458,
	1.2459 sources, 1.462, 1.463 upstream, 1.404, 1.405
Message-ID: <200607270018.k6R0IUhA013756@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13722

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
- 2.6.18rc2-git6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- .cvsignore	26 Jul 2006 15:55:34 -0000	1.498
+++ .cvsignore	27 Jul 2006 00:18:27 -0000	1.499
@@ -3,5 +3,5 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git5.bz2
 xen-10730.tar.bz2
+patch-2.6.18-rc2-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2458
retrieving revision 1.2459
diff -u -r1.2458 -r1.2459
--- kernel-2.6.spec	26 Jul 2006 22:32:28 -0000	1.2458
+++ kernel-2.6.spec	27 Jul 2006 00:18:27 -0000	1.2459
@@ -264,7 +264,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git5.bz2
+Patch2: patch-2.6.18-rc2-git6.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -1647,6 +1647,9 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc2-git6
+
 * Wed Jul 26 2006 Roland McGrath <roland at redhat.com>
 - New utrace patch: unsafe_exec fix; s390 build enabled (but non-working).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- sources	26 Jul 2006 15:55:34 -0000	1.462
+++ sources	27 Jul 2006 00:18:27 -0000	1.463
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
-f30096f49c2a8b4da67854b8350ad929  patch-2.6.18-rc2-git5.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
+3b125d18adc57e55378e04393d4bbea6  patch-2.6.18-rc2-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- upstream	25 Jul 2006 23:49:07 -0000	1.404
+++ upstream	27 Jul 2006 00:18:27 -0000	1.405
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git5.bz2
+patch-2.6.18-rc2-git6.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 00:18:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 20:18:30 -0400
Subject: rpms/kernel/devel/configs config-ia64-generic,1.38,1.39
Message-ID: <200607270018.k6R0IUTF013765@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13722/configs

Modified Files:
	config-ia64-generic 
Log Message:
* Wed Jul 26 2006 Dave Jones <davej at redhat.com>
- 2.6.18rc2-git6



Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- config-ia64-generic	26 Jul 2006 16:18:32 -0000	1.38
+++ config-ia64-generic	27 Jul 2006 00:18:27 -0000	1.39
@@ -27,8 +27,8 @@
 CONFIG_IA64_PAGE_SIZE_16KB=y
 # CONFIG_IA64_PAGE_SIZE_64KB is not set
 CONFIG_IA64_L1_CACHE_SHIFT=7
-CONFIG_VIRTUAL_MEM_MAP=y
 CONFIG_NUMA=y
+# CONFIG_VIRTUAL_MEM_MAP is not set
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_MEMORY_HOTPLUG=y



From fedora-cvs-commits at redhat.com  Thu Jul 27 00:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 20:22:25 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git6.bz2.sign, NONE,
	1.1 patch-2.6.18-rc2-git5.bz2.sign, 1.1, NONE
Message-ID: <200607270022.k6R0MPUt015297@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15270

Added Files:
	patch-2.6.18-rc2-git6.bz2.sign 
Removed Files:
	patch-2.6.18-rc2-git5.bz2.sign 
Log Message:
signs


--- NEW FILE patch-2.6.18-rc2-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD4DBQBEx7wsyGugalF9Dw4RAtT9AJ9F+fBbotW99hxtHn9iXHMx/2FjHgCXQNhg
JaWHAbrMW+MPt+yoZJzYNg==
=r3sZ
-----END PGP SIGNATURE-----


--- patch-2.6.18-rc2-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 27 01:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 21:11:08 -0400
Subject: rpms/libexif/devel libexif.spec,1.24,1.25
Message-ID: <200607270111.k6R1B8Iv012263@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libexif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12180

Modified Files:
	libexif.spec 
Log Message:
rebuild
`



Index: libexif.spec
===================================================================
RCS file: /cvs/dist/rpms/libexif/devel/libexif.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libexif.spec	12 Jul 2006 06:49:07 -0000	1.24
+++ libexif.spec	27 Jul 2006 01:11:06 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
 Version: 0.6.13
-Release: 1.1
+Release: 2
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libexif.sourceforge.net/
@@ -65,6 +65,9 @@
 %{_datadir}/doc/libexif/api.html
 
 %changelog
+* Wed Jul 26 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.13-2
+- Rebuild
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.6.13-1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 03:06:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 26 Jul 2006 23:06:45 -0400
Subject: rpms/fedora-release-notes/devel fedora-release-notes.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200607270306.k6R36jSv027540@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release-notes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27509/devel

Modified Files:
	fedora-release-notes.spec sources 
Log Message:
auto-import fedora-release-notes-5.91-4 on branch devel from fedora-release-notes-5.91-4.src.rpm


Index: fedora-release-notes.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/fedora-release-notes.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-release-notes.spec	24 Jul 2006 00:06:33 -0000	1.1
+++ fedora-release-notes.spec	27 Jul 2006 03:06:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fedora-release-notes
 Version:	5.91
-Release:	3
+Release:	4
 Summary:	Release Notes for Fedora Core %{version}
 URL:		http://fedoraproject.org/wiki/Docs/Beats
 
@@ -32,8 +32,8 @@
 sed 's/.*<div class="article"/<div class="article"/g' \
 	RELEASE-NOTES-en_US.html >> index.html
 cat %{SOURCE2} >> index.html
-sed 's/@RELEASE@/%{version}/g' about-gnome.desktop
-sed 's/@DATE@/%(date +"%%Y-%%m-%%d")/g;s/@RELEASE@/%{version}/g' about-fedora.omf
+sed -i 's/@RELEASE@/%{version}/g' about-gnome.desktop
+sed -i 's/@DATE@/%(date +"%%Y-%%m-%%d")/g;s/@RELEASE@/%{version}/g' about-fedora.omf
 
 
 %install
@@ -44,6 +44,9 @@
   install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR
   find $DIR -type f -exec install -m 644 {} $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$DIR \;
 done
+for F in RELEASE-NOTES-*.html; do
+  install -m 755 -D $F $RPM_BUILD_ROOT%{_defaultdocdir}/HTML/$F
+done
 find about/ -type f -exec install -m 644 -D {} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release-%{version}/{} \;
 install -m 644 -D about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release-notes/about-fedora.omf
 install -m 644 -D about-gnome.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop
@@ -71,6 +74,10 @@
 
 
 %changelog
+* Wed Jul 26 2006 Paul W. Frields <stickster at gmail.com> - 5.91-4
+- Process paths correctly (#200266)
+- Package standalone HTML
+
 * Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-3
 - Only use tabs
 - Version the indexhtml provides/obsoletes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release-notes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2006 00:06:33 -0000	1.2
+++ sources	27 Jul 2006 03:06:43 -0000	1.3
@@ -1 +1 @@
-3f2238bbd51dc3d6d552ab77b59be376  fedora-release-notes-5.91.tar.gz
+e9b5ae7c2aeebba64f28bff746df98f2  fedora-release-notes-5.91.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 05:07:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 01:07:22 -0400
Subject: rpms/kernel/devel xen-build-with-O2.patch, NONE, 1.1 kernel-2.6.spec,
	1.2459, 1.2460
Message-ID: <200607270507.k6R57MJS030993@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30976

Modified Files:
	kernel-2.6.spec 
Added Files:
	xen-build-with-O2.patch 
Log Message:
reduce hypervisor stack use with -O2, this really fixes bug (#198932)

xen-build-with-O2.patch:
 Rules.mk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-build-with-O2.patch ---
Always build the hypervisor with -O2.  This reduces stack consumption
significantly and seems to stop the stack overflows that made Xen crash
frequently in some configurations.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- xen/Rules.mk.noop	2006-07-26 17:44:02.000000000 -0400
+++ xen/Rules.mk	2006-07-26 17:44:16.000000000 -0400
@@ -52,7 +52,7 @@
 ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 
-CFLAGS-y               += -g -D__XEN__
+CFLAGS-y               += -g -D__XEN__ -O2
 CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
 CFLAGS-$(verbose)      += -DVERBOSE
 CFLAGS-$(crash_debug)  += -DCRASH_DEBUG


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2459
retrieving revision 1.2460
diff -u -r1.2459 -r1.2460
--- kernel-2.6.spec	27 Jul 2006 00:18:27 -0000	1.2459
+++ kernel-2.6.spec	27 Jul 2006 05:07:19 -0000	1.2460
@@ -36,7 +36,7 @@
 %define xen_hv_cset 10730
 %define make_target bzImage
 %define kernel_image x86
-%define xen_flags verbose=y crash_debug=y
+%define xen_flags debug=y verbose=y crash_debug=y
 %define xen_target vmlinuz
 %define xen_image vmlinuz
 
@@ -90,7 +90,7 @@
 %ifarch i686
 %define buildpae 1
 # we build always xen HV with pae
-%define xen_flags verbose=y crash_debug=y pae=y
+%define xen_flags debug=y verbose=y crash_debug=y pae=y
 %endif
 
 %ifarch x86_64
@@ -457,6 +457,7 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
+Patch20000: xen-build-with-O2.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -711,6 +712,7 @@
 
 cd xen
 # Any necessary hypervisor patches go here
+%patch20000 -p1
 
 cd ..
 
@@ -1647,6 +1649,9 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
+- reduce hypervisor stack use with -O2, this really fixes bug (#198932)
+
 * Wed Jul 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc2-git6
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 05:09:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 01:09:40 -0400
Subject: rpms/kernel/FC-5 xen-build-with-O2.patch, NONE, 1.1 kernel-2.6.spec,
	1.2162, 1.2163
Message-ID: <200607270509.k6R59eWn031048@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31033

Modified Files:
	kernel-2.6.spec 
Added Files:
	xen-build-with-O2.patch 
Log Message:
reduce hypervisor stack use with -O2, this really fixes bug (#198932)

xen-build-with-O2.patch:
 Rules.mk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-build-with-O2.patch ---
Always build the hypervisor with -O2.  This reduces stack consumption
significantly and seems to stop the stack overflows that made Xen crash
frequently in some configurations.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- xen/Rules.mk.noop	2006-07-26 17:44:02.000000000 -0400
+++ xen/Rules.mk	2006-07-26 17:44:16.000000000 -0400
@@ -52,7 +52,7 @@
 ALL_OBJS-$(ACM_SECURITY) += $(BASEDIR)/acm/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 
-CFLAGS-y               += -g -D__XEN__
+CFLAGS-y               += -g -D__XEN__ -O2
 CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY
 CFLAGS-$(verbose)      += -DVERBOSE
 CFLAGS-$(crash_debug)  += -DCRASH_DEBUG


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2162
retrieving revision 1.2163
diff -u -r1.2162 -r1.2163
--- kernel-2.6.spec	26 Jul 2006 03:11:35 -0000	1.2162
+++ kernel-2.6.spec	27 Jul 2006 05:09:37 -0000	1.2163
@@ -406,6 +406,7 @@
 Patch10001: linux-2.6-random-patches.patch
 
 # Xen hypervisor patches
+Patch20000: xen-build-with-O2.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -670,6 +671,7 @@
 cp -rl xen-%{xen_version} xen
 
 # Any necessary hypervisor patches go here
+%patch20000 -p0
 %endif
 
 cd linux-%{kversion}.%{_target_cpu}
@@ -1217,11 +1219,11 @@
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
 # FixMe: Juan Quintela (when no PAE is not needed anymore)
-  make verbose=y crash_debug=y 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
-  make verbose=y crash_debug=y
+  make debug=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
   cd ..
@@ -1548,6 +1550,9 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
+- reduce hypervisor stack use with -O2, this really fixes bug (#198932)
+
 * Tue Jul 25 2006 Rik van Riel <riel at redhat.com>
 - disable debug=y hypervisor build option because of stack overflow (#198932)
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 05:47:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 01:47:07 -0400
Subject: rpms/gcc/devel gcc41-s390-rh199604.patch, NONE, 1.1.2.1 gcc41.spec,
	1.88, 1.88.2.1
Message-ID: <200607270547.k6R5l7OC009056@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4699

Modified Files:
      Tag: private-aoliva-gcc-4_1_1-13-branch
	gcc41.spec 
Added Files:
      Tag: private-aoliva-gcc-4_1_1-13-branch
	gcc41-s390-rh199604.patch 
Log Message:
* Thu Jul 27 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13.0.lxo.1
- Fix reload problem that breaks openssl on s390.  (BZ#199640, perhaps
also PR target/28146)


gcc41-s390-rh199604.patch:
 reload1.c |   18 +++++++++++++++---
 rtlanal.c |   26 ++++++++++++++++++--------
 2 files changed, 33 insertions(+), 11 deletions(-)

--- NEW FILE gcc41-s390-rh199604.patch ---
for gcc/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* rtlanal.c (count_occurrences): Add new flag to enable
	comparison of MEM attributes.
	* reload1.c (delete_output_reload): Use it to count the
	results of register elimination.

Index: gcc/reload1.c
===================================================================
--- gcc/reload1.c.orig	2006-06-19 11:53:32.000000000 -0300
+++ gcc/reload1.c	2006-07-26 07:07:40.000000000 -0300
@@ -7798,9 +7798,21 @@ delete_output_reload (rtx insn, int j, i
     }
   n_occurrences = count_occurrences (PATTERN (insn), reg, 0);
   if (substed)
-    n_occurrences += count_occurrences (PATTERN (insn),
-					eliminate_regs (substed, 0,
-							NULL_RTX), 0);
+    {
+      rtx elim = eliminate_regs (substed, 0, NULL_RTX);
+      int flags = 0;
+
+      /* eliminate_regs() may create simple rtxes for a pseudo mapped
+	 to memory such as (plus (reg) (const_int X)) where the
+	 reload-generated corresponding address is (plus (plus (reg)
+	 (const_int Y)) (const_int Z)), where X = Y + Z.  We have to
+	 match them otherwise we lose, so take advantage of memory
+	 attributes.  */
+      if (MEM_P (elim) && MEM_ATTRS (elim))
+	flags |= 2;
+
+      n_occurrences += count_occurrences (PATTERN (insn), elim, flags);
+    }
   if (n_occurrences > n_inherited)
     return;
 
Index: gcc/rtlanal.c
===================================================================
--- gcc/rtlanal.c.orig	2005-11-04 06:41:19.000000000 -0200
+++ gcc/rtlanal.c	2006-07-26 07:09:06.000000000 -0300
@@ -547,11 +547,15 @@ global_reg_mentioned_p (rtx x)
   return for_each_rtx (&x, global_reg_mentioned_p_1, NULL);
 }
 
-/* Return the number of places FIND appears within X.  If COUNT_DEST is
-   zero, we do not count occurrences inside the destination of a SET.  */
+/* Return the number of places FIND appears within X.  If COUNT_FLAGS
+   has the least-significant bit zero, we do not count occurrences
+   inside the destination of a SET.  If COUNT_FLAGS has the
+   second-least-significant bit one, FIND is assumed to be a MEM with
+   attributes, and we compare MEMs containing attributes with it by
+   their attributes rather than by rtx equality.  */
 
 int
-count_occurrences (rtx x, rtx find, int count_dest)
+count_occurrences (rtx x, rtx find, int flags)
 {
   int i, j;
   enum rtx_code code;
@@ -576,13 +580,19 @@ count_occurrences (rtx x, rtx find, int 
       return 0;
 
     case MEM:
-      if (MEM_P (find) && rtx_equal_p (x, find))
+      if ((flags & 2) && MEM_ATTRS (x))
+	{
+	  if (MEM_EXPR (find) == MEM_EXPR (x)
+	      && MEM_OFFSET (find) == MEM_OFFSET (x))
+	    return 1;
+	}
+      else if (MEM_P (find) && rtx_equal_p (x, find))
 	return 1;
       break;
 
     case SET:
-      if (SET_DEST (x) == find && ! count_dest)
-	return count_occurrences (SET_SRC (x), find, count_dest);
+      if (SET_DEST (x) == find && ! (flags & 1))
+	return count_occurrences (SET_SRC (x), find, flags);
       break;
 
     default:
@@ -597,12 +607,12 @@ count_occurrences (rtx x, rtx find, int 
       switch (*format_ptr++)
 	{
 	case 'e':
-	  count += count_occurrences (XEXP (x, i), find, count_dest);
+	  count += count_occurrences (XEXP (x, i), find, flags);
 	  break;
 
 	case 'E':
 	  for (j = 0; j < XVECLEN (x, i); j++)
-	    count += count_occurrences (XVECEXP (x, i, j), find, count_dest);
+	    count += count_occurrences (XVECEXP (x, i, j), find, flags);
 	  break;
 	}
     }


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -u -r1.88 -r1.88.2.1
--- gcc41.spec	25 Jul 2006 18:27:23 -0000	1.88
+++ gcc41.spec	27 Jul 2006 05:47:04 -0000	1.88.2.1
@@ -1,6 +1,6 @@
 %define DATE 20060721
 %define gcc_version 4.1.1
-%define gcc_release 13
+%define gcc_release 13.0.lxo.1
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -142,6 +142,8 @@
 Patch34: gcc41-java-backport-gcjplugin.patch
 Patch35: gcc41-java-backport-class-loader.patch
 
+Patch1001: gcc41-s390-rh199604.patch
+
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -459,6 +461,8 @@
 %patch34 -p0 -b .java-gcjplugin~
 %patch35 -p0 -b .java-class-loader~
 
+%patch1001 -p0 -b .s390-rh199604~
+
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
@@ -1520,6 +1524,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Jul 27 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13.0.lxo.1
+- Fix reload problem that breaks openssl on s390.  (BZ#199640, perhaps
+also PR target/28146)
+
 * Tue Jul 25 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.1-13
 - Backport fix by Andrew Haley for build problems related with the
 bootstrap ClassLoader.



From fedora-cvs-commits at redhat.com  Thu Jul 27 08:11:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 04:11:50 -0400
Subject: rpms/scim/devel scim_panel_gtk-systray-click-199187.patch, NONE,
	1.1 scim.spec, 1.50, 1.51
Message-ID: <200607270811.k6R8BoOB031183@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31096

Modified Files:
	scim.spec 
Added Files:
	scim_panel_gtk-systray-click-199187.patch 
Log Message:
qwang:add a new patch


scim_panel_gtk-systray-click-199187.patch:
 scim_panel_gtk.cpp |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE scim_panel_gtk-systray-click-199187.patch ---
diff -uNr scim-1.4.4-20060716.orig/extras/panel/scim_panel_gtk.cpp scim-1.4.4-20060716/extras/panel/scim_panel_gtk.cpp
--- scim-1.4.4-20060716.orig/extras/panel/scim_panel_gtk.cpp	2006-07-27 15:47:33.070827536 +0800
+++ scim-1.4.4-20060716/extras/panel/scim_panel_gtk.cpp	2006-07-27 15:50:43.763837792 +0800
@@ -440,6 +440,8 @@
 static bool               _factory_menu_activated      = false;
 static bool               _command_menu_activated      = false;
 static bool               _property_menu_activated     = false;
+static bool               _factory_menu_shown_up       = false;
+static bool               _command_menu_shown_up       = false;
 
 static int                _spot_location_x             = -1;
 static int                _spot_location_y             = -1;
@@ -1590,10 +1592,22 @@
 
     GdkEventButton *bevent = (GdkEventButton *) event;
 
-    if (bevent->button <= 1)
-        _panel_agent->request_factory_menu ();
-    else
-        action_show_command_menu ();
+    if (bevent->button <= 1) {
+        if (!_factory_menu_shown_up) {
+            _panel_agent->request_factory_menu ();
+            _factory_menu_shown_up = true;
+        } 
+        else 
+            _factory_menu_shown_up = false;
+    }
+    else {
+        if (!_command_menu_shown_up) {
+            action_show_command_menu ();
+            _command_menu_shown_up = true;
+        }
+        else 
+            _command_menu_shown_up = false;
+    }
 
     return FALSE;
 }


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- scim.spec	24 Jul 2006 12:06:05 -0000	1.50
+++ scim.spec	27 Jul 2006 08:11:46 -0000	1.51
@@ -214,6 +214,9 @@
 
 
 %changelog
+* Thu Jul 27 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-26
+- fixed the bug 199187 with scim_panel_gtk-systray-click-199187.patch
+
 * Mon Jul 24 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-25
 - suffix xinput file with .conf and bump priority to 82
 - xinput sub-scripts moved to a subdir



From fedora-cvs-commits at redhat.com  Thu Jul 27 08:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 04:15:02 -0400
Subject: rpms/scim/devel scim.spec,1.51,1.52
Message-ID: <200607270815.k6R8F1wd032464@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32365

Modified Files:
	scim.spec 
Log Message:
qwang:changelog, release



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- scim.spec	27 Jul 2006 08:11:46 -0000	1.51
+++ scim.spec	27 Jul 2006 08:14:59 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   25%{?dist}
+Release:   26%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL



From fedora-cvs-commits at redhat.com  Thu Jul 27 08:41:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 04:41:46 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-cthon-expire-nested.patch, NONE,
	1.1 autofs.spec, 1.132, 1.133
Message-ID: <200607270841.k6R8fkfE022247@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22178

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-cthon-expire-nested.patch 
Log Message:
* Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.7
- cthon fix expire of various forms of nested mounts.


autofs-5.0.1-rc1-cthon-expire-nested.patch:
 CHANGELOG              |    1 
 daemon/automount.c     |   75 ++++++++++++++++++-------------------------------
 daemon/direct.c        |   46 +++++++++++++++++++-----------
 daemon/indirect.c      |   69 ++++++++++++++++++++++-----------------------
 daemon/lookup.c        |   68 ++++++++++++++++++++++++++++++++++++++++----
 daemon/state.c         |   21 +++----------
 include/automount.h    |   10 +++---
 include/master.h       |    6 +++
 include/state.h        |   28 ++++++++++++++++++
 lib/master.c           |   28 ++++++++++++++----
 lib/mounts.c           |   26 +++++++++++++---
 modules/mount_autofs.c |    2 -
 modules/parse_sun.c    |   38 +++++++++++++++---------
 13 files changed, 268 insertions(+), 150 deletions(-)

--- NEW FILE autofs-5.0.1-rc1-cthon-expire-nested.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 111c6af..f68e16e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - cthon fix submount operation broken by above.
 - cthon more parser corrections and attempt to fix multi-mounts
   with various combinations of submounts (still broken).
+- cthon fix expire of various forms of nested mounts.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index 8fcf19a..91f4d15 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -550,21 +550,35 @@ int umount_multi(struct autofs_point *ap
 
 	left = 0;
 	list_for_each(p, &list) {
+		struct autofs_point *oap = ap;
+		char *has_opt_direct;
+		int is_autofs;
+
 		mptr = list_entry(p, struct mnt_list, list);
 
-		/* We only want real mounts */
-		if (!strcmp(mptr->fs_type, "autofs"))
+		is_autofs = !strcmp(mptr->fs_type, "autofs");
+		has_opt_direct = strstr(mptr->opts, "direct");
+
+		/* We only want real mounts and top level direct mounts */
+		if (is_autofs && !has_opt_direct)
 			continue;
 
+		if (ap->submount)
+			oap = ap->parent;
+
 		sched_yield();
 
-		if (umount_offsets(ap, mnts, mptr->path))
-			warn(ap->logopt, "could not umount some offsets under %s",
-				mptr->path);
+		if (umount_offsets(oap, mnts, mptr->path))
+			warn(ap->logopt,
+			     "could not umount some offsets under %s",
+			     mptr->path);
+
+		if (is_autofs)
+			continue;
 
 		sched_yield();
 
-		debug(ap->logopt, "unmounting dir = %s", mptr->path);
+		warn(ap->logopt, "unmounting dir = %s", mptr->path);
 
 		if (umount_ent(ap, mptr->path, mptr->fs_type)) {
 			warn(ap->logopt, "could not umount dir %s",
@@ -573,49 +587,16 @@ int umount_multi(struct autofs_point *ap
 		}
 	}
 
-	/* Lastly check for offsets with no root mount */
-	n = scandir(path, &de, 0, alphasort);
-	if (n && n != -1) {
-		char buf[PATH_MAX + 1];
-
-		while (n--) {
-			size_t size;
-			int ret;
+	/* Catch any offsets of indirect mounts with no root mount */
+	if (!left && !tree_is_mounted(mnts, path, MNTS_ALL)) {
+		struct autofs_point *rap = ap;
 
-			sched_yield();
+		if (ap->submount)
+			rap = ap->parent;
 
-			if (strcmp(de[n]->d_name, ".") == 0 ||
-			    strcmp(de[n]->d_name, "..") == 0) {
-				free(de[n]);
-				continue;
-			}
-
-			size = sizeof(buf);
-			ret = cat_path(buf, size, path, de[n]->d_name);
-			if (!ret) {
-				do {
-					free(de[n]);
-				} while (n--);
-				left++;
-				break;
-			}
-
-			if (umount_offsets(ap, mnts, buf)) {
-				warn(ap->logopt,
-				     "could not umount some offsets under %s",
-				     buf);
-				left++;
-			}
-			free(de[n]);
-		}
-		free(de);
-	}
-
-	if (!left && !tree_is_mounted(mnts, path)) {
-		sched_yield();
-		if (umount_offsets(ap, mnts, path)) {
+		if (umount_offsets(rap, mnts, path)) {
 			warn(ap->logopt,
-			      "could not umount some offsets under %s", path);
+			     "could not umount some offsets under %s", path);
 			left++;
 		}
 	}
@@ -1229,7 +1210,7 @@ static void handle_mounts_cleanup(void *
 	umount_autofs(ap, 1);
 
 	if (submount)
-		master_signal_submount(ap);
+		master_signal_submount(ap, MASTER_SUBMNT_JOIN);
 	else
 		master_remove_mapent(ap->entry);
 	master_free_mapent_sources(ap->entry, 1);
diff --git a/daemon/direct.c b/daemon/direct.c
index 89c8db2..f4f60f3 100644
--- a/daemon/direct.c
+++ b/daemon/direct.c
@@ -125,6 +125,24 @@ int do_umount_autofs_direct(struct autof
 		me->ioctlfd = open(me->key, O_RDONLY);
 
 	if (me->ioctlfd >= 0) {
+		int status = 1;
+
+		rv = ioctl(me->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);
+		if (rv) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			error(ap->logopt, "ioctl failed: %s", estr);
+			return 1;
+		} else if (!status) {
+			if (ap->state != ST_SHUTDOWN_FORCE) {
+				debug(ap->logopt, "ask umount returned busy");
+				return 1;
+			} else {
+				ioctl(me->ioctlfd, AUTOFS_IOC_CATATONIC, 0);
+				close(me->ioctlfd);
+				me->ioctlfd = -1;
+				goto force_umount;
+			}
+		}
 		ioctl(me->ioctlfd, AUTOFS_IOC_CATATONIC, 0);
 		close(me->ioctlfd);
 		me->ioctlfd = -1;
@@ -136,7 +154,7 @@ int do_umount_autofs_direct(struct autof
 	}
 
 	rv = umount(me->key);
-	if (rv != 0) {
+	if (rv == -1) {
 		switch (errno) {
 		case ENOENT:
 		case EINVAL:
@@ -468,8 +486,12 @@ int umount_autofs_offset(struct autofs_p
 	if (me->ioctlfd >= 0) {
 		int status = 1;
 
-		ioctl(me->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);
-		if (!status) {
+		rv = ioctl(me->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &status);
+		if (rv) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+			error(ap->logopt, "ioctl failed: %s", estr);
+			return 1;
+		} else if (!status) {
 			if (ap->state != ST_SHUTDOWN_FORCE) {
 				debug(ap->logopt, "ask umount returned busy");
 				return 1;
@@ -517,15 +539,7 @@ force_umount:
 		rv = umount2(me->key, MNT_DETACH);
 	} else
 		msg("umounted offset %s", me->key);
-/*
-	if (!rv && me->dir_created) {
-		if  (rmdir(me->key) == -1) {
-			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
-			warn(ap->logopt,
-			     "failed to remove dir %s: %s", me->key, estr);
-		}
-	}
-*/
+
 	return rv;
 }
 
@@ -800,25 +814,25 @@ static void kernel_callback_cleanup(void
 	mc = mt->mc;
 
 	if (mt->status) {
+		cache_writelock(mc);
 		send_ready(mt->ioctlfd, mt->wait_queue_token);
 		if (mt->type == NFY_EXPIRE) {
 			close(mt->ioctlfd);
-			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, mt->name);
 			if (me)
 				me->ioctlfd = -1;
-			cache_unlock(mc);
 		}
+		cache_unlock(mc);
 	} else {
+		cache_writelock(mc);
 		send_fail(mt->ioctlfd, mt->wait_queue_token);
 		if (mt->type == NFY_MOUNT) {
 			close(mt->ioctlfd);
-			cache_writelock(mc);
 			me = cache_lookup_distinct(mc, mt->name);
 			if (me)
 				me->ioctlfd = -1;
-			cache_unlock(mc);
 		}
+		cache_unlock(mc);
 	}
 
 	free(mt);
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 7bde7ec..737d965 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -289,40 +289,24 @@ int umount_autofs_indirect(struct autofs
 	 * to do it here. If the cache entry isn't found then there aren't
 	 * any offset mounts.
 	 */
-	if (ap->submount) {
-		struct master_mapent *entry = ap->parent->entry;
-		struct map_source *map;
-		struct mapent_cache *mc;
-		struct mapent *me;
-
-		pthread_cleanup_push(master_source_lock_cleanup, entry);
-		master_source_readlock(entry);
-		map = entry->first;
-		while (map) {
-			mc = map->mc;
-			cache_readlock(mc);
-			me = cache_lookup_distinct(mc, ap->path);
-			if (me) {
-				close(me->ioctlfd);
-				me->ioctlfd = -1;
-				cache_unlock(mc);
-				break;
-			}
-			cache_unlock(mc);
-			map = map->next;
-		}
-		pthread_cleanup_pop(1);
-	}
+	if (ap->submount)
+		lookup_source_close_ioctlfd(ap->parent, ap->path);
 
 	/* If we are trying to shutdown make sure we can umount */
-	if (!ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret)) {
-		if (!ret)
-			warn(ap->logopt, "mount still busy %s", ap->path);
+	rv = ioctl(ap->ioctlfd, AUTOFS_IOC_ASKUMOUNT, &ret);
+	if (rv) {
+		char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
+		error(ap->logopt, "ioctl failed: %s", estr);
+		return 1;
+	} else if (!ret) {
+		error(ap->logopt, "ask umount returned busy %s", ap->path);
+		busy = 1;
 	}
 
 	if (ap->ioctlfd >= 0) {
 		ioctl(ap->ioctlfd, AUTOFS_IOC_CATATONIC, 0);
 		close(ap->ioctlfd);
+		ap->ioctlfd = -1;
 		close(ap->state_pipe[0]);
 		close(ap->state_pipe[1]);
 		ap->state_pipe[0] = -1;
@@ -340,12 +324,12 @@ int umount_autofs_indirect(struct autofs
 		switch (errno) {
 		case ENOENT:
 		case EINVAL:
-			warn(ap->logopt,
+			error(ap->logopt,
 			      "mount point %s does not exist", ap->path);
 			return 0;
 			break;
 		case EBUSY:
-			warn(ap->logopt,
+			error(ap->logopt,
 			      "mount point %s is in use", ap->path);
 			if (ap->state == ST_SHUTDOWN_FORCE)
 				goto force_umount;
@@ -385,6 +369,7 @@ void *expire_proc_indirect(void *arg)
 	int offsets, submnts, count;
 	int ioctlfd;
 	int status, ret;
+	char buf[MAX_ERR_BUF];
 
 	ea = (struct expire_args *) arg;
 
@@ -470,8 +455,9 @@ void *expire_proc_indirect(void *arg)
 
 		ret = ioctl(ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
 		if (ret < 0 && errno != EAGAIN) {
+			char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 			warn(ap->logopt,
-			      "failed to expire mount %s", next->path);
+			     "failed to expire mount %s:", next->path, estr);
 			ea->status = 1;
 			break;
 		}
@@ -479,7 +465,7 @@ void *expire_proc_indirect(void *arg)
 	free_mnt_list(mnts);
 
 	count = offsets = submnts = 0;
-	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
+	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 1);
 	/* Are there any real mounts left */
 	for (next = mnts; next; next = next->next) {
 		if (strcmp(next->fs_type, "autofs"))
@@ -497,10 +483,10 @@ void *expire_proc_indirect(void *arg)
 	 * have some offset mounts with no '/' offset so we need to
 	 * umount them here.
 	 */
-	if (mnts && !ea->status && !count) {
-		int ret;
+	if (mnts) {
+		int ret, tries = (count + submnts + offsets + 2) * 2;
 
-		while (offsets--) {
+		while (tries--) {
 			ret = ioctl(ap->ioctlfd, AUTOFS_IOC_EXPIRE_MULTI, &now);
 			if (ret < 0 && errno != EAGAIN) {
 				warn(ap->logopt,
@@ -513,6 +499,21 @@ void *expire_proc_indirect(void *arg)
 	}
 	free_mnt_list(mnts);
 
+	count = offsets = submnts = 0;
+	mnts = get_mnt_list(_PROC_MOUNTS, ap->path, 0);
+	/* Are there any real mounts left */
+	for (next = mnts; next; next = next->next) {
+		if (strcmp(next->fs_type, "autofs"))
+			count++;
+		else {
+			if (strstr(next->opts, "indirect"))
+				submnts++;
+			else
+				offsets++;
+		}
+	}
+	free_mnt_list(mnts);
+
 	if (submnts) {
 		debug(ap->logopt,
 		      "%d submounts remaining in %s", submnts, ap->path);
diff --git a/daemon/lookup.c b/daemon/lookup.c
index f0f9718..a8ef518 100644
--- a/daemon/lookup.c
+++ b/daemon/lookup.c
@@ -395,6 +395,7 @@ int lookup_nss_read_map(struct autofs_po
 	struct list_head *head, *p;
 	struct nss_source *this;
 	struct map_source *map;
+	enum nsswitch_status status;
 	int result = 0;
 
 	/*
@@ -445,17 +446,16 @@ int lookup_nss_read_map(struct autofs_po
 
 		INIT_LIST_HEAD(&nsslist);
 
-		result = nsswitch_parse(&nsslist);
-		if (result) {
+		status = nsswitch_parse(&nsslist);
+		if (status) {
 			error(ap->logopt,
 			      "can't to read name service switch config.");
+			result = 1;
 			break;
 		}
 
 		head = &nsslist;
 		list_for_each(p, head) {
-			int status;
-
 			this = list_entry(p, struct nss_source, list);
 
 			debug(ap->logopt,
@@ -721,6 +721,7 @@ int lookup_nss_mount(struct autofs_point
 	struct list_head *head, *p;
 	struct nss_source *this;
 	struct map_source *map;
+	enum nsswitch_status status;
 	int result = 0;
 
 	/*
@@ -775,8 +776,8 @@ int lookup_nss_mount(struct autofs_point
 
 		INIT_LIST_HEAD(&nsslist);
 
-		result = nsswitch_parse(&nsslist);
-		if (result) {
+		status = nsswitch_parse(&nsslist);
+		if (status) {
 			error(ap->logopt,
 			      "can't to read name service switch config.");
 			result = 1;
@@ -961,3 +962,58 @@ next:
 	return 1;
 }
 
+/* Return with cache readlock held */
+struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key)
+{
+	struct master_mapent *entry = ap->entry;
+	struct map_source *map;
+	struct mapent_cache *mc;
+	struct mapent *me;
+
+	pthread_cleanup_push(master_source_lock_cleanup, entry);
+	master_source_readlock(entry);
+	map = entry->first;
+	while (map) {
+		mc = map->mc;
+		cache_readlock(mc);
+		me = cache_lookup_distinct(mc, key);
+		if (me)
+			break;
+		cache_unlock(mc);
+		map = map->next;
+	}
+	pthread_cleanup_pop(1);
+
+	return me;
+}
+
+int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key)
+{
+	struct master_mapent *entry = ap->entry;
+	struct map_source *map;
+	struct mapent_cache *mc;
+	struct mapent *me;
+	int ret = 0;
+
+	pthread_cleanup_push(master_source_lock_cleanup, entry);
+	master_source_readlock(entry);
+	map = entry->first;
+	while (map) {
+		mc = map->mc;
+		cache_readlock(mc);
+		me = cache_lookup_distinct(mc, key);
+		if (me) {
+			close(me->ioctlfd);
+			me->ioctlfd = -1;
+			cache_unlock(mc);
+			ret = 1;
+			break;
+		}
+		cache_unlock(mc);
+		map = map->next;
+	}
+	pthread_cleanup_pop(1);
+
+	return ret;
+}
+
diff --git a/daemon/state.c b/daemon/state.c
index e74674a..caeb3e3 100644
--- a/daemon/state.c
+++ b/daemon/state.c
@@ -103,7 +103,6 @@ void expire_cleanup(void *arg)
 	/* Check to see if expire process finished */
 	if (thid == ap->exp_thread) {
 		ap->exp_thread = 0;
-		st_set_thid(ap, 0);
 
 		switch (ap->state) {
 		case ST_EXPIRE:
@@ -174,7 +173,7 @@ static unsigned int st_ready(struct auto
 	ap->state = ST_READY;
 
 	if (ap->submount)
-		master_signal_submount(ap);
+		master_signal_submount(ap, MASTER_SUBMNT_CONTINUE);
 
 	return 1;
 }
@@ -362,7 +361,7 @@ static void *do_readmap(void *arg)
 			while (me) {
 				/* TODO: check return of do_... */
 				if (me->age < now) {
-					if (!tree_is_mounted(mnts, me->key))
+					if (!tree_is_mounted(mnts, me->key, MNTS_REAL))
 						do_umount_autofs_direct(ap, mnts, me);
 					else
                                 		debug(ap->logopt,
@@ -586,18 +585,14 @@ int st_add_task(struct autofs_point *ap,
 
 		state_mutex_unlock(ap);
 
-		status = pthread_mutex_lock(&mutex);
-		if (status)
-			fatal(status);
+		st_mutex_lock();
 
 		signaled = 1;
 		status = pthread_cond_signal(&cond);
 		if (status)
 			fatal(status);
 
-		status = pthread_mutex_unlock(&mutex);
-		if (status)
-			fatal(status);
+		st_mutex_unlock();
 
 		return 1;
 	}
@@ -620,9 +615,7 @@ int st_add_task(struct autofs_point *ap,
 	INIT_LIST_HEAD(&new->list);
 	INIT_LIST_HEAD(&new->pending);
 
-	status = pthread_mutex_lock(&mutex);
-	if (status)
-		fatal(status);
+	st_mutex_lock();
 
 	head = &state_queue;
 
@@ -648,9 +641,7 @@ int st_add_task(struct autofs_point *ap,
 	if (status)
 		fatal(status);
 
-	status = pthread_mutex_unlock(&mutex);
-	if (status)
-		fatal(status);
+	st_mutex_unlock();
 
 	return 1;
 }
diff --git a/include/automount.h b/include/automount.h
index a689046..b10cfad 100644
--- a/include/automount.h
+++ b/include/automount.h
@@ -224,6 +224,8 @@ int lookup_ghost(struct autofs_point *ap
 int lookup_nss_mount(struct autofs_point *ap, const char *name, int name_len);
 void lookup_close_lookup(struct autofs_point *ap);
 int lookup_prune_cache(struct autofs_point *ap, time_t age);
+struct mapent *lookup_source_mapent(struct autofs_point *ap, const char *key);
+int lookup_source_close_ioctlfd(struct autofs_point *ap, const char *key);
 
 #ifdef MODULE_LOOKUP
 int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context);
@@ -313,9 +315,9 @@ int ncat_path(char *buf, size_t len,
 
 /* mount table utilities */
 
-#define MNTS_ALL	0x0000
-#define MNTS_REAL	0x0001
-#define MNTS_AUTOFS	0x0002
+#define MNTS_ALL	0x0001
+#define MNTS_REAL	0x0002
+#define MNTS_AUTOFS	0x0004
 
 struct mnt_list {
 	char *path;
@@ -356,7 +358,7 @@ void tree_free_mnt_tree(struct mnt_list 
 struct mnt_list *tree_make_mnt_tree(const char *table, const char *path);
 int tree_get_mnt_list(struct mnt_list *mnts, struct list_head *list, const char *path, int include);
 int tree_find_mnt_ents(struct mnt_list *mnts, struct list_head *list, const char *path);
-int tree_is_mounted(struct mnt_list *mnts, const char *path);
+int tree_is_mounted(struct mnt_list *mnts, const char *path, unsigned int type);
 
 /* Core automount definitions */
 
diff --git a/include/master.h b/include/master.h
index 57760a6..ada18d4 100644
--- a/include/master.h
+++ b/include/master.h
@@ -20,6 +20,10 @@
 #ifndef MASTER_H
 #define MASTER_H
 
+#define MASTER_SUBMNT_WAIT	0
+#define MASTER_SUBMNT_CONTINUE	1
+#define MASTER_SUBMNT_JOIN	2
+
 struct map_source {
 	char *type;
 	char *format;
@@ -94,7 +98,7 @@ void master_free_mapent(struct master_ma
 struct master *master_new(const char *, unsigned int, unsigned int);
 int master_read_master(struct master *, time_t, int);
 void master_notify_submounts(struct autofs_point *, enum states);
-void master_signal_submount(struct autofs_point *);
+void master_signal_submount(struct autofs_point *, unsigned int);
 void master_notify_state_change(struct master *, int);
 int master_mount_mounts(struct master *, time_t, int);
 int master_list_empty(struct master *);
diff --git a/include/state.h b/include/state.h
index 69355b0..ea4c62a 100644
--- a/include/state.h
+++ b/include/state.h
@@ -59,6 +59,20 @@ struct expire_args {
 	int status;		 /* Return status */
 };
 
+#define expire_args_mutex_lock(ea) \
+do { \
+	int status = pthread_mutex_lock(&ea->mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
+#define expire_args_mutex_unlock(ea) \
+do { \
+	int status = pthread_mutex_unlock(&ea->mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
 struct readmap_args {
 	pthread_mutex_t mutex;
 	pthread_cond_t cond;
@@ -75,4 +89,18 @@ int st_add_task(struct autofs_point *, e
 void st_remove_tasks(struct autofs_point *);
 int st_start_handler(void);
 
+#define st_mutex_lock() \
+do { \
+	int status = pthread_mutex_lock(&mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
+#define st_mutex_unlock() \
+do { \
+	int status = pthread_mutex_unlock(&mutex); \
+	if (status) \
+		fatal(status); \
+} while (0)
+
 #endif
diff --git a/lib/master.c b/lib/master.c
index 6bf21ad..d5e58d2 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -754,15 +754,20 @@ int master_read_master(struct master *ma
 
 static void notify_submounts(struct autofs_point *ap, enum states state)
 {
-	struct list_head *p;
+	struct list_head *head, *p;
 	struct autofs_point *this;
+	pthread_t thid;
 	int status;
 
 	mounts_mutex_lock(ap);
 
-	list_for_each(p, &ap->submounts) {
+	head = &ap->submounts;
+	p = head->next;
+	while (p != head) {
 		this = list_entry(p, struct autofs_point, mounts);
 
+		p = p->next;
+
 		if (!list_empty(&this->submounts))
 			notify_submounts(this, state);
 
@@ -777,11 +782,19 @@ static void notify_submounts(struct auto
 
 		state_mutex_unlock(this);
 
-		ap->mounts_signaled = 0;
-		while (!ap->mounts_signaled) {
+		thid = this->thid;
+		ap->mounts_signaled = MASTER_SUBMNT_WAIT;
+		while (ap->mounts_signaled == MASTER_SUBMNT_WAIT) {
 			status = pthread_cond_wait(&ap->mounts_cond, &ap->mounts_mutex);
 			if (status)
 				fatal(status);
+			if (ap->mounts_signaled == MASTER_SUBMNT_JOIN) {
+				mounts_mutex_unlock(ap);
+				status = pthread_join(thid, NULL);
+				if (status)
+					fatal(status);
+				mounts_mutex_lock(ap);
+			}
 		}
 	}
 
@@ -801,7 +814,7 @@ void master_notify_submounts(struct auto
 	return;
 }
 
-void master_signal_submount(struct autofs_point *ap)
+void master_signal_submount(struct autofs_point *ap, unsigned int join)
 {
 	int status;
 
@@ -810,7 +823,10 @@ void master_signal_submount(struct autof
 
 	mounts_mutex_lock(ap->parent);
 
-	ap->parent->mounts_signaled = 1;
+	if (join)
+		ap->parent->mounts_signaled = 1;
+	else
+		ap->parent->mounts_signaled = 2;
 	status = pthread_cond_signal(&ap->parent->mounts_cond);
 	if (status)
 		fatal(status);
diff --git a/lib/mounts.c b/lib/mounts.c
index dd73f9f..b11c4c7 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -744,7 +744,7 @@ int tree_find_mnt_ents(struct mnt_list *
 	return 0;
 }
 
-int tree_is_mounted(struct mnt_list *mnts, const char *path)
+int tree_is_mounted(struct mnt_list *mnts, const char *path, unsigned int type)
 {
 	struct list_head *p;
 	struct list_head list;
@@ -760,13 +760,27 @@ int tree_is_mounted(struct mnt_list *mnt
 
 		mptr = list_entry(p, struct mnt_list, list);
 
-		/* We only want real mounts */
-		if (!strcmp(mptr->fs_type, "autofs"))
-			continue;
+		if (type) {
+			unsigned int autofs_fs;
 
-		mounted++;
-	}
+			autofs_fs = !strcmp(mptr->fs_type, "autofs");
 
+			if (type & MNTS_REAL) {
+				if (!autofs_fs) {
+					mounted = 1;
+					break;
+				}
+			} else if (type & MNTS_AUTOFS) {
+				if (autofs_fs) {
+					mounted = 1;
+					break;
+				}
+			} else {
+				mounted = 1;
+				break;
+			}
+		}
+	}
 	return mounted;
 }
 
diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c
index 95fe00d..9bccdd1 100644
--- a/modules/mount_autofs.c
+++ b/modules/mount_autofs.c
@@ -201,7 +201,7 @@ int mount_mount(struct autofs_point *ap,
 
 	mounts_mutex_lock(ap);
 
-	if (pthread_create(&thid, &thread_attr, handle_mounts, nap)) {
+	if (pthread_create(&thid, NULL, handle_mounts, nap)) {
 		crit(ap->logopt,
 		     MODPREFIX
 		     "failed to create mount handler thread for %s",
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index c6dffef..6007828 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -839,7 +839,7 @@ static int parse_mapent(const char *ent,
 		l = chunklen(p, check_colon(p));
 		ent = dequote(p, l, logopt);
 		if (!ent) {
-			error(logopt, MODPREFIX "out of memory");
+			warn(logopt, MODPREFIX "null location or out of memory");
 			free(myoptions);
 			free(loc);
 			return 0;
@@ -1056,7 +1056,7 @@ int parse_mount(struct autofs_point *ap,
 			}
 
 			if (!path) {
-				error(ap->logopt, MODPREFIX "out of memory");
+				warn(ap->logopt, MODPREFIX "null path or out of memory");
 				cache_readlock(mc);
 				cache_multi_lock(mc);
 				cache_delete_offset_list(mc, name);
@@ -1174,6 +1174,7 @@ int parse_mount(struct autofs_point *ap,
 		return rv;
 	} else {
 		/* Normal (and non-root multi-mount) entries */
+		struct autofs_point *oap = ap;
 		char *loc;
 		int loclen;
 		int l;
@@ -1185,14 +1186,11 @@ int parse_mount(struct autofs_point *ap,
 			free(options);
 			return 1;
 		}
-/*
-		if (*p == ':')
-			p++;	/* Sun escape for entries starting with / */ /*
-*/
+
 		l = chunklen(p, check_colon(p));
 		loc = dequote(p, l, ap->logopt);
 		if (!loc) {
-			error(ap->logopt, MODPREFIX "out of memory");
+			warn(ap->logopt, MODPREFIX "null location or out of memory");
 			free(options);
 			return 1;
 		}
@@ -1216,7 +1214,8 @@ int parse_mount(struct autofs_point *ap,
 			l = chunklen(p, check_colon(p));
 			ent = dequote(p, l, ap->logopt);
 			if (!ent) {
-				error(ap->logopt, MODPREFIX "out of memory");
+				warn(ap->logopt,
+				     MODPREFIX "null location or out of memory");
 				free(loc);
 				free(options);
 				return 1;
@@ -1277,13 +1276,24 @@ int parse_mount(struct autofs_point *ap,
 		 * If it's a multi-mount insert the triggers
 		 * These are always direct mount triggers so root = ""
 		 */
-		cache_readlock(mc);
-		me = cache_lookup_distinct(mc, name);
-		if (me && me->multi) {
-			char *m_key = me->multi->key;
+		if (ap->submount)
+			oap = ap->parent;
+
+		me = lookup_source_mapent(oap, name);
+		if (me) {
+			char *m_key;
 			int start;
 			char *base, *m_root;
 
+			mc = me->source->mc;
+
+			if (!me->multi) {
+				cache_unlock(mc);
+				return rv;
+			}
+
+			m_key = me->multi->key;
+
 			if (*m_key == '/') {
 				m_root = m_key;
 				start = strlen(m_key);
@@ -1308,14 +1318,14 @@ int parse_mount(struct autofs_point *ap,
 			base = &me->key[start];
 
 			cache_multi_lock(mc);
-			if (!mount_multi_triggers(ap, m_root, me->multi, base)) {
+			if (!mount_multi_triggers(oap, m_root, me->multi, base)) {
 				error(ap->logopt,
 				      MODPREFIX "failed to mount offset triggers");
 				rv = 1;
 			}
 			cache_multi_unlock(mc);
+			cache_unlock(mc);
 		}
-		cache_unlock(mc);
 	}
 	return rv;
 }


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- autofs.spec	24 Jul 2006 13:09:24 -0000	1.132
+++ autofs.spec	27 Jul 2006 08:41:42 -0000	1.133
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.6
+%define release 0.rc1.7
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -23,6 +23,7 @@
 Patch10: autofs-5.0.1-rc1-cthon-host-name-validation.patch
 Patch11: autofs-5.0.1-rc1-cthon-submount-fix.patch
 Patch12: autofs-5.0.1-rc1-cthon-parse-and-submounts.patch
+Patch13: autofs-5.0.1-rc1-cthon-expire-nested.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -74,6 +75,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -130,7 +132,10 @@
 %{_libdir}/autofs/*
 
 %changelog
-* Thu Jul 24 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.6
+* Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.7
+- cthon fix expire of various forms of nested mounts.
+
+* Mon Jul 24 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.6
 - cthon more parser corrections and attempt to fix multi-mounts
   with various combinations of submounts (still not right).
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 09:24:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 05:24:57 -0400
Subject: rpms/autofs/devel autofs-5.0.1-rc1-compile-error.patch, NONE,
	1.1 autofs.spec, 1.133, 1.134
Message-ID: <200607270924.k6R9OvHX031490@cvs.devel.redhat.com>

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31412

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc1-compile-error.patch 
Log Message:
* Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.8
- Fix compile error.


autofs-5.0.1-rc1-compile-error.patch:
 indirect.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc1-compile-error.patch ---
diff --git a/daemon/indirect.c b/daemon/indirect.c
index 737d965..079b278 100644
--- a/daemon/indirect.c
+++ b/daemon/indirect.c
@@ -300,7 +300,6 @@ int umount_autofs_indirect(struct autofs
 		return 1;
 	} else if (!ret) {
 		error(ap->logopt, "ask umount returned busy %s", ap->path);
-		busy = 1;
 	}
 
 	if (ap->ioctlfd >= 0) {


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- autofs.spec	27 Jul 2006 08:41:42 -0000	1.133
+++ autofs.spec	27 Jul 2006 09:24:54 -0000	1.134
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.7
+%define release 0.rc1.8
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -24,6 +24,7 @@
 Patch11: autofs-5.0.1-rc1-cthon-submount-fix.patch
 Patch12: autofs-5.0.1-rc1-cthon-parse-and-submounts.patch
 Patch13: autofs-5.0.1-rc1-cthon-expire-nested.patch
+Patch14: autofs-5.0.1-rc1-compile-error.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -76,6 +77,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -132,6 +134,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.8
+- Fix compile error.
+
 * Thu Jul 27 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc1.7
 - cthon fix expire of various forms of nested mounts.
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 10:08:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 06:08:31 -0400
Subject: rpms/libvirt/devel libvirt.spec,1.16,1.17
Message-ID: <200607271008.k6RA8VAY025277@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25204

Modified Files:
	libvirt.spec 
Log Message:
need rebuild since libxenstore is now versionned, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libvirt.spec	24 Jul 2006 13:31:15 -0000	1.16
+++ libvirt.spec	27 Jul 2006 10:08:11 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.1.3
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -107,6 +107,9 @@
 %doc docs/examples/python
 
 %changelog
+* Thu Jul 27 2006 Daniel Veillard <veillard at redhat.com> 0.1.3-3
+- need rebuild since libxenstore is now versionned
+
 * Mon Jul 24 2006 Mark McLoughlin <markmc at redhat.com> - 0.1.3-2
 - Add BuildRequires: xen-devel
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 10:27:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 06:27:12 -0400
Subject: rpms/autoconf/devel autoconf.spec,1.31,1.32
Message-ID: <200607271027.k6RARCT0013652@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13625

Modified Files:
	autoconf.spec 
Log Message:
- Requires imake for _AC_PATH_X


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- autoconf.spec	20 Jul 2006 12:54:16 -0000	1.31
+++ autoconf.spec	27 Jul 2006 10:27:10 -0000	1.32
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release:	10
+Release:	11
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -9,7 +9,7 @@
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info
-Requires:	gawk, m4, mktemp, perl, textutils
+Requires:	gawk, m4, mktemp, perl, textutils, imake
 BuildArchitectures:	noarch
 BuildRoot:	%{_tmppath}/%{name}-root
 
@@ -69,6 +69,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Thu Jul 27 2006 Karsten Hopp <karsten at redhat.de> 2.59-11
+- Requires imake for _AC_PATH_X
+
 * Thu Jul 20 2006 Karsten Hopp <karsten at redhat.de> 2.59-10
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 12:16:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 08:16:28 -0400
Subject: rpms/setup/devel .cvsignore, 1.34, 1.35 setup.spec, 1.39,
	1.40 sources, 1.35, 1.36
Message-ID: <200607271216.k6RCGSeD012675@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/setup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10756

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
- Added utempter gid for new libutempter package (#200240)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	6 Jul 2006 09:26:37 -0000	1.34
+++ .cvsignore	27 Jul 2006 12:16:25 -0000	1.35
@@ -1 +1 @@
-setup-2.5.52.tar.bz2
+setup-2.5.53.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- setup.spec	6 Jul 2006 09:26:37 -0000	1.39
+++ setup.spec	27 Jul 2006 12:16:25 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files.
 Name: setup
-Version: 2.5.52
+Version: 2.5.53
 Release: 1
 License: public domain
 Group: System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Jul 27 2006 Phil Knirsch <pknirsch at redhat.com> 2.5.53-1
+- Added utempter gid for new libutempter package (#200240)
+
 * Mon Jun 19 2006 Phil Knirsch <pknirsch at redhat.com> 2.5.52-1
 - Lock password for root account by default (#182206)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	6 Jul 2006 09:26:37 -0000	1.35
+++ sources	27 Jul 2006 12:16:25 -0000	1.36
@@ -1 +1 @@
-14a22d17fa5077200c7989179f32d0af  setup-2.5.52.tar.bz2
+691bd08a7ee28f6b48984c8c10c7fd01  setup-2.5.53.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 12:29:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 08:29:33 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch, NONE,
	1.1 openoffice.org.spec, 1.797, 1.798
	openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch,
	1.1, NONE
Message-ID: <200607271229.k6RCTXl5024254@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24147

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch 
Removed Files:
	openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch 
Log Message:
update font require

openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch:
 dtrans/source/X11/X11_selection.cxx |   35 +++++++++++++++++++++++++----------
 source/X11/X11_selection.cxx        |    0 
 2 files changed, 25 insertions(+), 10 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch ---
Index: source/X11/X11_selection.cxx
===================================================================
RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
retrieving revision 1.77
diff -u -r1.77 X11_selection.cxx
--- openoffice.org.orig/dtrans/source/X11/X11_selection.cxx	6 Apr 2006 15:31:43 -0000	1.77
+++ openoffice.org/dtrans/source/X11/X11_selection.cxx	27 Jul 2006 10:29:10 -0000
@@ -98,7 +98,7 @@
 
 using namespace x11;
 
-static const int nXdndProtocolRevision = 5;
+static const long nXdndProtocolRevision = 5;
 
 // mapping between mime types (or what the office thinks of mime types)
 // and X convention types
@@ -1297,7 +1297,7 @@
 	std::vector< Atom > aNativeTypes;
 	if( aAtoms.getLength() )
 	{
-		int nAtoms = aAtoms.getLength() / 4;
+		sal_Int32 nAtoms = aAtoms.getLength() / sizeof(Atom);
 		Atom* pAtoms = (Atom*)aAtoms.getArray();
 		rTypes.realloc( nAtoms );
 		aNativeTypes.resize( nAtoms );
@@ -1416,6 +1416,12 @@
     return it->second->m_pPixmap;
 }
 
+static sal_Size GetTrueFormatSize(int nFormat)
+{
+	// http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
+	return nFormat == 32 ? sizeof(long) : nFormat/8;	
+}
+
 bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
                                  Window requestor,
                                  Atom target,
@@ -1551,13 +1557,15 @@
             rInc.m_nTransferStartTime	= time( NULL );
 
             // use incr protocol, signal start to requestor
-            int nMinSize = m_nIncrementalThreshold;
+            long nMinSize = m_nIncrementalThreshold;
             XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
             XChangeProperty( m_pDisplay, requestor, property,
                              m_nINCRAtom, 32,  PropModeReplace, (unsigned char*)&nMinSize, 1 );
             XFlush( m_pDisplay );
         }
         else
+        {
+            sal_Size nUnitSize = GetTrueFormatSize(nFormat);
             XChangeProperty( m_pDisplay,
                              requestor,
                              property,
@@ -1565,7 +1573,8 @@
                              nFormat,
                              PropModeReplace,
                              (const unsigned char*)aData.getConstArray(),
-                             aData.getLength()/(nFormat/8) );
+                             aData.getLength()/nUnitSize );
+            }
     }
 #if OSL_DEBUG_LEVEL > 1
     else
@@ -1633,7 +1642,7 @@
 		}
         else if( rRequest.target == m_nTIMESTAMPAtom )
         {
-            sal_uInt32 nTimeStamp = (sal_uInt32)m_aSelections[rRequest.selection]->m_nOrigTimestamp;
+            long nTimeStamp = (long)m_aSelections[rRequest.selection]->m_nOrigTimestamp;
             XChangeProperty( m_pDisplay, rRequest.requestor, rRequest.property,
                              XA_INTEGER, 32, PropModeReplace, (const unsigned char*)&nTimeStamp, 1 );
             aNotify.xselection.property = rRequest.property;
@@ -1863,11 +1872,14 @@
 					 OUStringToOString( getString( nType ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
 					 nFormat, nBytes );
 #endif
+	
+			sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+
 			if( it->second->m_eState == Selection::WaitingForData ||
 				it->second->m_eState == Selection::WaitingForResponse )
 			{
 				// copy data
-				it->second->m_aData = Sequence< sal_Int8 >( (sal_Int8*)pData, nItems*nFormat/8 );
+				it->second->m_aData = Sequence< sal_Int8 >( (sal_Int8*)pData, nItems*nUnitSize );
 				it->second->m_eState = Selection::Inactive;
 				it->second->m_aDataArrived.set();
 			}
@@ -1876,9 +1888,9 @@
                 if( nItems )
                 {
                     // append data
-                    Sequence< sal_Int8 > aData( it->second->m_aData.getLength() + nItems*nFormat/8 );
+                    Sequence< sal_Int8 > aData( it->second->m_aData.getLength() + nItems*nUnitSize );
                     memcpy( aData.getArray(), it->second->m_aData.getArray(), it->second->m_aData.getLength() );
-                    memcpy( aData.getArray() + it->second->m_aData.getLength(), pData, nItems*nFormat/8 );
+                    memcpy( aData.getArray() + it->second->m_aData.getLength(), pData, nItems*nUnitSize );
                     it->second->m_aData = aData;
                 }
                 else
@@ -1964,6 +1976,8 @@
                          nBytes, nBytes > 32 ? 32 : nBytes,
                          (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos );
 #endif
+
+				sal_Size nUnitSize = GetTrueFormatSize(rInc.m_nFormat);
                 
                 XChangeProperty( m_pDisplay,
                                  rInc.m_aRequestor,
@@ -1972,7 +1986,7 @@
                                  rInc.m_nFormat,
                                  PropModeReplace,
                                  (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos,
-                                 nBytes/(rInc.m_nFormat/8) );
+                                 nBytes/nUnitSize );
                 rInc.m_nBufferPos += nBytes;
                 rInc.m_nTransferStartTime = nCurrentTime;
 
@@ -2059,7 +2073,8 @@
                                     &pData );
             }
             it->second->m_eState		= Selection::Inactive;
-            it->second->m_aData			= Sequence< sal_Int8 >((sal_Int8*)pData, nFormat/8 * nItems );
+            sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+            it->second->m_aData			= Sequence< sal_Int8 >((sal_Int8*)pData, nItems * nUnitSize);
             it->second->m_aDataArrived.set();
             if( pData )
                 XFree( pData );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- openoffice.org.spec	26 Jul 2006 12:07:53 -0000	1.797
+++ openoffice.org.spec	27 Jul 2006 12:29:30 -0000	1.798
@@ -111,20 +111,19 @@
 Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
 Patch47: ooobuild.VBAObjects.patch
-Patch48: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
-Patch49: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
-Patch50: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
-Patch51: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch52: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch53: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch54: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch55: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch56: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-Patch59: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch60: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
-Patch61: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch49: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch50: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+Patch51: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch52: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch53: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch54: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch55: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch56: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch57: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
+Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -149,7 +148,7 @@
 %package core
 Summary: core modules for %{name}
 Group: Applications/Productivity
-Requires: bitstream-vera-fonts
+Requires: dejavu-lgc-fonts
 Requires: urw-fonts
 %ifarch %{ppc}
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
@@ -863,20 +862,19 @@
 %patch45 -p1 -b .rh187919.gtkunderkde.patch
 %patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
 %patch47 -p0 -b .ooobuild.VBAObjects.patch
-%patch48 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
-%patch49 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
-%patch50 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
-%patch51 -p1 -b .ooo67644.sw.spacing.patch
-%patch52 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch53 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch54 -p1 -b .ooo67716.svx.overflow.patch
-%patch55 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch56 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
-%patch59 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch60 -p1 -b .ooo67779.svx.toolbarcrash.patch
-%patch61 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch48 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch49 -p1 -b .ooo67644.sw.spacing.patch
+%patch50 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
+%patch51 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch52 -p1 -b .ooo67716.svx.overflow.patch
+%patch53 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch54 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch55 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch56 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch57 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
+%patch59 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch69 -p1 -b .ooo67829.dtrans.64bitpaste.patch
 
 tar xzf %{SOURCE1}
 
@@ -3356,6 +3354,10 @@
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 - rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+- rh#199056# -> openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+- drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
+- drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+- require dejavu-lgc-fonts, Greek coverage problems begone
 
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN


--- openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 27 13:05:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 09:05:42 -0400
Subject: rpms/kernel/devel linux-2.6-crash-driver-xen.patch, NONE,
	1.1 linux-2.6-debug-sysfs-crash-debugging-xen.patch, NONE,
	1.1 linux-2.6-xen-tux.patch, NONE, 1.1 kernel-2.6.spec, 1.2460,
	1.2461 linux-2.6-compile-fixes.patch, 1.94,
	1.95 linux-2.6-devmem-xen.patch, 1.3, 1.4 linux-2.6-xen.patch,
	1.45, 1.46 linux-2.6-xen_remap_vma_flags.patch, 1.1, NONE
Message-ID: <200607271305.k6RD5gVp016865@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16734

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-devmem-xen.patch linux-2.6-xen.patch 
Added Files:
	linux-2.6-crash-driver-xen.patch 
	linux-2.6-debug-sysfs-crash-debugging-xen.patch 
	linux-2.6-xen-tux.patch 
Removed Files:
	linux-2.6-xen_remap_vma_flags.patch 
Log Message:
xen update

linux-2.6-crash-driver-xen.patch:
 i386/mm/init-xen.c   |    1 +
 x86_64/mm/init-xen.c |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-crash-driver-xen.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID ed87076d010ee2f549658308cf2298fd888ba94a
# Parent  7bad01eaf8f795b08be97187c9ed41891cca9bab
crash xen bits

diff -r 7bad01eaf8f7 -r ed87076d010e arch/i386/mm/init-xen.c
--- a/arch/i386/mm/init-xen.c	Thu Jul 27 02:44:10 2006 +0200
+++ b/arch/i386/mm/init-xen.c	Thu Jul 27 02:50:45 2006 +0200
@@ -275,6 +275,7 @@ int page_is_ram(unsigned long pagenr)
 	}
 	return 0;
 }
+EXPORT_SYMBOL_GPL(page_is_ram);
 
 /*
  * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
diff -r 7bad01eaf8f7 -r ed87076d010e arch/x86_64/mm/init-xen.c
--- a/arch/x86_64/mm/init-xen.c	Thu Jul 27 02:44:10 2006 +0200
+++ b/arch/x86_64/mm/init-xen.c	Thu Jul 27 02:50:45 2006 +0200
@@ -964,6 +964,7 @@ static inline int page_is_ram (unsigned 
 {
 	return 1;
 }
+EXPORT_SYMBOL_GPL(page_is_ram);
 
 /*
  * devmem_is_allowed() checks to see if /dev/mem access to a certain address is

linux-2.6-debug-sysfs-crash-debugging-xen.patch:
 i386/kernel/traps-xen.c   |    5 +++++
 x86_64/kernel/traps-xen.c |    5 +++++
 2 files changed, 10 insertions(+)

--- NEW FILE linux-2.6-debug-sysfs-crash-debugging-xen.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID e5168f3eb0de30d54f9d03d4afeddbb3a1e69d3f
# Parent  35d3d547d0d38754c0fc4831a7f073531245c835
sysfs-crash-debugging xen bits

diff -r 35d3d547d0d3 -r e5168f3eb0de arch/i386/kernel/traps-xen.c
--- a/arch/i386/kernel/traps-xen.c	Thu Jul 27 00:46:20 2006 +0200
+++ b/arch/i386/kernel/traps-xen.c	Thu Jul 27 00:59:37 2006 +0200
@@ -100,6 +100,8 @@ static int kstack_depth_to_print = 24;
 static int kstack_depth_to_print = 24;
 static int call_trace = 1;
 ATOMIC_NOTIFIER_HEAD(i386die_chain);
+
+extern char last_sysfs_file[];
 
 int register_die_notifier(struct notifier_block *nb)
 {
@@ -414,6 +416,9 @@ void die(const char * str, struct pt_reg
 #endif
 		if (nl)
 			printk("\n");
+#ifdef CONFIG_SYSFS
+		printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
+#endif
 		if (notify_die(DIE_OOPS, str, regs, err,
 					current->thread.trap_no, SIGSEGV) !=
 				NOTIFY_STOP) {
diff -r 35d3d547d0d3 -r e5168f3eb0de arch/x86_64/kernel/traps-xen.c
--- a/arch/x86_64/kernel/traps-xen.c	Thu Jul 27 00:46:20 2006 +0200
+++ b/arch/x86_64/kernel/traps-xen.c	Thu Jul 27 00:59:37 2006 +0200
@@ -69,6 +69,8 @@ asmlinkage void spurious_interrupt_bug(v
 asmlinkage void spurious_interrupt_bug(void);
 
 ATOMIC_NOTIFIER_HEAD(die_chain);
+
+extern char last_sysfs_file[];
 
 int register_die_notifier(struct notifier_block *nb)
 {
@@ -537,6 +539,9 @@ void __kprobes __die(const char * str, s
 	printk("DEBUG_PAGEALLOC");
 #endif
 	printk("\n");
+#ifdef CONFIG_SYSFS
+	printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file);
+#endif
 	notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
 	show_registers(regs);
 	/* Executive summary in case the oops scrolled away */

linux-2.6-xen-tux.patch:
 ia32entry-xen.S |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-tux.patch ---
# HG changeset patch
# User quintela at elfo.mitica
# Node ID 7f7c006d23578ae6d391810086b0099c1730edb9
# Parent  9be92de1dd0d02611bbd35d8649fd048e1d43cc7
tux xen bits

diff -r 9be92de1dd0d -r 7f7c006d2357 arch/x86_64/ia32/ia32entry-xen.S
--- a/arch/x86_64/ia32/ia32entry-xen.S	Wed Jul 26 23:46:46 2006 +0200
+++ b/arch/x86_64/ia32/ia32entry-xen.S	Wed Jul 26 23:53:03 2006 +0200
@@ -474,7 +474,15 @@ ia32_sys_call_table:
 	.quad quiet_ni_syscall			/* old lock syscall holder */
 	.quad compat_sys_ioctl
 	.quad compat_sys_fcntl64		/* 55 */
-	.quad quiet_ni_syscall			/* old mpx syscall holder */
+#ifdef CONFIG_TUX
+	.quad __sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+	.quad sys_tux
+# else
+	.quad quiet_ni_syscall
+# endif
+#endif
 	.quad sys_setpgid
 	.quad quiet_ni_syscall			/* old ulimit syscall holder */
 	.quad sys32_olduname


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2460
retrieving revision 1.2461
diff -u -r1.2460 -r1.2461
--- kernel-2.6.spec	27 Jul 2006 05:07:19 -0000	1.2460
+++ kernel-2.6.spec	27 Jul 2006 13:05:33 -0000	1.2461
@@ -323,9 +323,10 @@
 Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
 Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
 Patch954: linux-2.6-xen-execshield.patch
+Patch955: linux-2.6-xen-tux.patch
+
 
 Patch990: linux-2.6-xen-compile-fixes.patch
-Patch991: linux-2.6-xen_remap_vma_flags.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -340,10 +341,12 @@
 Patch1016: linux-2.6-debug-Wundef.patch
 Patch1017: linux-2.6-debug-disable-builtins.patch
 Patch1018: linux-2.6-debug-sleep-in-irq-warning.patch
-Patch1019: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch1019: linux-2.6-debug-must_check.patch
 Patch1020: linux-2.6-debug-no-quiet.patch
 Patch1021: linux-2.6-debug-boot-delay.patch
-Patch1022: linux-2.6-debug-must_check.patch
+Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
+
 
 Patch1027: linux-2.6-debug-slab-leak-detector.patch
 Patch1028: linux-2.6-debug-oops-pause.patch
@@ -356,6 +359,7 @@
 
 # Provide read only /dev/crash driver.
 Patch1060: linux-2.6-crash-driver.patch
+Patch1061: linux-2.6-crash-driver-xen.patch
 
 Patch1070: linux-2.6-sleepon.patch
 
@@ -830,10 +834,10 @@
 %patch953 -p1
 # Xen exec-shield bits
 %patch954 -p1
+%patch955 -p1
 
 
-%patch990 -p1
-%patch991 -p1
+#%patch990 -p1
 
 %endif
 
@@ -857,6 +861,9 @@
 %patch1020 -p1
 %patch1021 -p1
 %patch1022 -p1
+%if %{includexen}
+%patch1023 -p1
+%endif
 
 # Slab leak detector.
 #%patch1027 -p1
@@ -877,6 +884,9 @@
 # /dev/crash driver for the crashdump analysis tool
 #
 %patch1060 -p1
+%if %{includexen}
+%patch1061 -p1
+%endif
 
 #
 # Most^WAll users of sleep_on are broken; fix a bunch
@@ -1649,6 +1659,10 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Juan Quintela <quintela at redhat.com>
+- review all xen related patches.
+- x86_64 dom0, x86_64 domU and i386 domU should work.
+
 * Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
 - reduce hypervisor stack use with -O2, this really fixes bug (#198932)
 

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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- linux-2.6-compile-fixes.patch	15 Jul 2006 20:21:21 -0000	1.94
+++ linux-2.6-compile-fixes.patch	27 Jul 2006 13:05:34 -0000	1.95
@@ -1,14 +0,0 @@
-
---- linux-2.6.17.noarch/Makefile~	2006-06-29 17:20:17.000000000 -0400
-+++ linux-2.6.17.noarch/Makefile	2006-06-29 17:20:38.000000000 -0400
-@@ -267,10 +267,6 @@ MAKEFLAGS += --include-dir=$(srctree)
- # We need some generic definitions
- include  $(srctree)/scripts/Kbuild.include
- 
--# Do not use make's built-in rules and variables
--# This increases performance and avoid hard-to-debug behavour
--MAKEFLAGS += -rR
--
- # Make variables (CC, etc...)
- 
- AS		= $(CROSS_COMPILE)as

linux-2.6-devmem-xen.patch:
 arch/i386/mm/init-xen.c                |   19 +++++++++++++++++++
 arch/x86_64/mm/init-xen.c              |   25 +++++++++++++++++++++++++
 include/asm-i386/mach-xen/asm/page.h   |    2 ++
 include/asm-x86_64/mach-xen/asm/page.h |    4 ++++
 4 files changed, 50 insertions(+)

Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-devmem-xen.patch	22 Apr 2006 17:48:28 -0000	1.3
+++ linux-2.6-devmem-xen.patch	27 Jul 2006 13:05:34 -0000	1.4
@@ -1,10 +1,26 @@
-diff -uNp linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.16.noarch/arch/i386/mm/init-xen.c
---- linux-2.6.16.noarch/arch/i386/mm/init-xen.c.orig	2006-04-13 19:37:24.000000000 +0200
-+++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c	2006-04-13 19:39:38.000000000 +0200
-@@ -280,6 +280,17 @@ int page_is_ram(unsigned long pagenr)
- 
- #endif
+# HG changeset patch
+# User quintela at elfo.mitica
+# Node ID b5b4c76164972243479a9cb2a428a93a5aef7263
+# Parent  ad6b852bd54573cf46e8f34ffaeeae3877ec5603
+devmem xen bits
+
+diff -r ad6b852bd545 -r b5b4c7616497 arch/i386/mm/init-xen.c
+--- a/arch/i386/mm/init-xen.c	Thu Jul 27 02:02:42 2006 +0200
++++ b/arch/i386/mm/init-xen.c	Thu Jul 27 02:21:44 2006 +0200
+@@ -276,6 +276,25 @@ int page_is_ram(unsigned long pagenr)
+ 	return 0;
+ }
  
++/*
++ * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
++ * valid. The argument is a physical page number.
++ *
++ *
++ * On x86, access has to be given to the first megabyte of ram because that area
++ * contains bios code and data regions used by X and dosemu and similar apps.
++ * Access has to be given to non-kernel-ram areas as well, these contain the PCI
++ * mmio resources as well as potential bios/acpi data regions.
++ */
 +int devmem_is_allowed(unsigned long pagenr)
 +{
 +   if (pagenr <= 256)
@@ -14,29 +30,21 @@
 +   return 0;
 +}
 +
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
  #ifdef CONFIG_HIGHMEM
  pte_t *kmap_pte;
  pgprot_t kmap_prot;
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
---- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c	2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c	2006-04-13 16:16:23.000000000 +0200
-@@ -847,6 +847,10 @@ void __init clear_kernel_mapping(unsigne
- 	__flush_tlb_all();
- } 
+diff -r ad6b852bd545 -r b5b4c7616497 arch/x86_64/mm/init-xen.c
+--- a/arch/x86_64/mm/init-xen.c	Thu Jul 27 02:02:42 2006 +0200
++++ b/arch/x86_64/mm/init-xen.c	Thu Jul 27 02:21:44 2006 +0200
+@@ -960,6 +960,31 @@ int __add_pages(struct zone *z, unsigned
+ }
+ #endif /* CONFIG_MEMORY_HOTPLUG */
  
 +static inline int page_is_ram (unsigned long pagenr)
 +{
 +	return 1;
 +}
- /*
-  * Memory hotplug specific functions
-  * These are only for non-NUMA machines right now.
-@@ -891,6 +895,28 @@ EXPORT_SYMBOL_GPL(remove_memory);
- 
- #endif
- 
++
 +/*
 + * devmem_is_allowed() checks to see if /dev/mem access to a certain address is
 + * valid. The argument is a physical page number.
@@ -57,28 +65,27 @@
 +}
 +
 +
-+EXPORT_SYMBOL_GPL(devmem_is_allowed);
-+
  static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
  			 kcore_vsyscall;
  
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h
---- linux-2.6.16.orig/include/asm-i386/mach-xen/asm/page.h	2006-04-13 14:19:59.000000000 +0200
-+++ linux-2.6.16.noarch/include/asm-i386/mach-xen/asm/page.h	2006-04-13 16:19:23.000000000 +0200
-@@ -276,6 +276,7 @@ extern unsigned int __VMALLOC_RESERVE;
+diff -r ad6b852bd545 -r b5b4c7616497 include/asm-i386/mach-xen/asm/page.h
+--- a/include/asm-i386/mach-xen/asm/page.h	Thu Jul 27 02:02:42 2006 +0200
++++ b/include/asm-i386/mach-xen/asm/page.h	Thu Jul 27 02:21:44 2006 +0200
+@@ -287,6 +287,8 @@ extern unsigned int __VMALLOC_RESERVE;
  
  extern int sysctl_legacy_va_layout;
  
 +extern int devmem_is_allowed(unsigned long pagenr);
++
  extern int page_is_ram(unsigned long pagenr);
  
  #endif /* __ASSEMBLY__ */
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h
---- linux-2.6.16.orig/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/include/asm-x86_64/mach-xen/asm/page.h	2006-04-13 16:20:50.000000000 +0200
-@@ -309,6 +309,10 @@ static inline pgd_t __pgd(unsigned long 
- 
- #define __HAVE_ARCH_GATE_AREA 1	
+diff -r ad6b852bd545 -r b5b4c7616497 include/asm-x86_64/mach-xen/asm/page.h
+--- a/include/asm-x86_64/mach-xen/asm/page.h	Thu Jul 27 02:02:42 2006 +0200
++++ b/include/asm-x86_64/mach-xen/asm/page.h	Thu Jul 27 02:21:44 2006 +0200
+@@ -322,6 +322,10 @@ static inline pgd_t __pgd(unsigned long 
+ #include <asm-generic/memory_model.h>
+ #include <asm-generic/page.h>
  
 +#ifndef __ASSEMBLY__
 +extern int devmem_is_allowed(unsigned long pagenr);
@@ -86,4 +93,4 @@
 +
  #endif /* __KERNEL__ */
  
- #include <asm-generic/memory_model.h>
+ #endif /* _X86_64_PAGE_H */

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 409 files changed, 85166 insertions(+), 871 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-xen.patch	27 Jul 2006 00:11:29 -0000	1.45
+++ linux-2.6-xen.patch	27 Jul 2006 13:05:34 -0000	1.46
@@ -1,6 +1,6 @@
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile compiling/arch/i386/boot-xen/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/boot-xen/Makefile	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/boot-xen/Makefile linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile
+--- linux-2.6/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/boot-xen/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -23,9 +23,9 @@
 +	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=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig compiling/arch/i386/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig	2006-07-26 05:37:14.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig linux-2.6-xen-fedora/arch/i386/Kconfig
+--- linux-2.6/arch/i386/Kconfig	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig	2006-07-26 17:11:03.000000000 +0200
 @@ -16,10 +16,12 @@ config X86_32
  
  config GENERIC_TIME
@@ -311,9 +311,9 @@
  config KTIME_SCALAR
  	bool
  	default y
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu compiling/arch/i386/Kconfig.cpu
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.cpu	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.cpu linux-2.6-xen-fedora/arch/i386/Kconfig.cpu
+--- linux-2.6/arch/i386/Kconfig.cpu	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.cpu	2006-07-18 03:27:59.000000000 +0200
 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -330,9 +330,9 @@
 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
  	default y
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug compiling/arch/i386/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/Kconfig.debug	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/Kconfig.debug linux-2.6-xen-fedora/arch/i386/Kconfig.debug
+--- linux-2.6/arch/i386/Kconfig.debug	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/Kconfig.debug	2006-07-22 20:37:34.000000000 +0200
 @@ -2,6 +2,7 @@ menu "Kernel hacking"
  
  config TRACE_IRQFLAGS_SUPPORT
@@ -349,9 +349,9 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c compiling/arch/i386/kernel/acpi/boot-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/acpi/boot-xen.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/boot-xen.c linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c
+--- linux-2.6/arch/i386/kernel/acpi/boot-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/boot-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,1168 @@
 +/*
 + *  boot.c - Architecture-Specific Low-Level ACPI Boot Support
@@ -1521,9 +1521,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile compiling/arch/i386/kernel/acpi/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/acpi/Makefile	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/acpi/Makefile linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile
+--- linux-2.6/arch/i386/kernel/acpi/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/acpi/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
@@ -1532,9 +1532,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c compiling/arch/i386/kernel/alternative.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/alternative.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/alternative.c linux-2.6-xen-fedora/arch/i386/kernel/alternative.c
+--- linux-2.6/arch/i386/kernel/alternative.c	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/alternative.c	2006-07-22 20:37:34.000000000 +0200
 @@ -4,7 +4,11 @@
  #include <asm/alternative.h>
  #include <asm/sections.h>
@@ -1547,9 +1547,9 @@
  static int smp_alt_once      = 0;
  static int debug_alternative = 0;
  
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c compiling/arch/i386/kernel/apic-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/apic-xen.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/apic-xen.c linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c
+--- linux-2.6/arch/i386/kernel/apic-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/apic-xen.c	2006-07-22 20:37:34.000000000 +0200
 @@ -0,0 +1,160 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -1711,9 +1711,9 @@
 +
 +	return 0;
 +}
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c compiling/arch/i386/kernel/asm-offsets.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/asm-offsets.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/asm-offsets.c linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c
+--- linux-2.6/arch/i386/kernel/asm-offsets.c	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/asm-offsets.c	2006-07-22 21:45:45.000000000 +0200
 @@ -66,9 +66,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -1730,9 +1730,9 @@
  
  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
  	DEFINE(VDSO_PRELINK, VDSO_PRELINK);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c compiling/arch/i386/kernel/cpu/common-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/common-xen.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/common-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/common-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/common-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,740 @@
 +#include <linux/init.h>
 +#include <linux/string.h>
@@ -2474,9 +2474,9 @@
 +	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;
 +}
 +#endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile compiling/arch/i386/kernel/cpu/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/Makefile	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE)	+=	mcheck/
  
  obj-$(CONFIG_MTRR)	+= 	mtrr/
@@ -2486,9 +2486,9 @@
 +include $(srctree)/scripts/Makefile.xen
 +obj-y := $(call cherrypickxen, $(obj-y), $(src))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c compiling/arch/i386/kernel/cpu/mtrr/main-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/main-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/main-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,197 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2687,9 +2687,9 @@
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile compiling/arch/i386/kernel/cpu/mtrr/Makefile
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile
+--- linux-2.6/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/cpu/mtrr/Makefile	2006-07-18 03:27:59.000000000 +0200
 @@ -3,3 +3,10 @@ obj-y		+= amd.o
  obj-y		+= cyrix.o
  obj-y		+= centaur.o
@@ -2701,15 +2701,15 @@
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c compiling/arch/i386/kernel/early_printk-xen.c
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/arch/i386/kernel/early_printk-xen.c	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/early_printk-xen.c linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c
+--- linux-2.6/arch/i386/kernel/early_printk-xen.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/arch/i386/kernel/early_printk-xen.c	2006-07-18 03:27:59.000000000 +0200
 @@ -0,0 +1,2 @@
 +
 +#include "../../x86_64/kernel/early_printk-xen.c"
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S compiling/arch/i386/kernel/entry.S
---- /mnt/ro/repos/hg/linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
-+++ compiling/arch/i386/kernel/entry.S	2006-07-23 00:15:23.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/entry.S linux-2.6-xen-fedora/arch/i386/kernel/entry.S
+--- linux-2.6/arch/i386/kernel/entry.S	2006-07-13 00:51:19.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/entry.S	2006-07-22 21:45:45.000000000 +0200
 @@ -265,7 +265,7 @@ ENTRY(sysenter_entry)
  	CFI_STARTPROC simple
  	CFI_DEF_CFA esp, 0
@@ -2737,9 +2737,9 @@
  	pushfl;					\
  	pushl $__KERNEL_CS;			\
  	pushl $sysenter_past_esp
[...4888 lines suppressed...]
+--- linux-2.6/kernel/timer.c	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/kernel/timer.c	2006-07-22 20:37:56.000000000 +0200
 @@ -554,6 +554,22 @@ found:
  	if (time_before(expires, jiffies))
  		return jiffies;
@@ -89215,9 +89226,9 @@
  	if (time_before(hr_expires, expires))
  		return hr_expires;
  
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug compiling/lib/Kconfig.debug
---- /mnt/ro/repos/hg/linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/lib/Kconfig.debug	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Kconfig.debug linux-2.6-xen-fedora/lib/Kconfig.debug
+--- linux-2.6/lib/Kconfig.debug	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Kconfig.debug	2006-07-22 20:37:56.000000000 +0200
 @@ -325,7 +325,7 @@ config FRAME_POINTER
  
  config UNWIND_INFO
@@ -89227,9 +89238,9 @@
  	depends on !MODULES || !(MIPS || PPC || SUPERH || V850)
  	help
  	  If you say Y here the resulting kernel image will be slightly larger
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/lib/Makefile compiling/lib/Makefile
---- /mnt/ro/repos/hg/linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/lib/Makefile	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/lib/Makefile linux-2.6-xen-fedora/lib/Makefile
+--- linux-2.6/lib/Makefile	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/lib/Makefile	2006-07-22 20:37:56.000000000 +0200
 @@ -51,6 +51,9 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
  obj-$(CONFIG_SMP) += percpu_counter.o
  
@@ -89240,9 +89251,9 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/highmem.c compiling/mm/highmem.c
---- /mnt/ro/repos/hg/linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/highmem.c	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/highmem.c linux-2.6-xen-fedora/mm/highmem.c
+--- linux-2.6/mm/highmem.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/highmem.c	2006-07-22 20:37:56.000000000 +0200
 @@ -142,6 +142,17 @@ start:
  	return vaddr;
  }
@@ -89261,9 +89272,9 @@
  void fastcall *kmap_high(struct page *page)
  {
  	unsigned long vaddr;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/Kconfig compiling/mm/Kconfig
---- /mnt/ro/repos/hg/linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/Kconfig	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/Kconfig linux-2.6-xen-fedora/mm/Kconfig
+--- linux-2.6/mm/Kconfig	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/Kconfig	2006-07-22 20:37:56.000000000 +0200
 @@ -127,11 +127,14 @@ comment "Memory hotplug is currently inc
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -89279,9 +89290,9 @@
  	default "4"
  
  #
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/memory.c compiling/mm/memory.c
---- /mnt/ro/repos/hg/linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/mm/memory.c	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/memory.c linux-2.6-xen-fedora/mm/memory.c
+--- linux-2.6/mm/memory.c	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/mm/memory.c	2006-07-22 20:37:57.000000000 +0200
 @@ -403,7 +403,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -89422,9 +89433,9 @@
  /*
   * handle_pte_fault chooses page fault handler according to an entry
   * which was read non-atomically.  Before making any commitment, on
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/mmap.c compiling/mm/mmap.c
---- /mnt/ro/repos/hg/linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/mmap.c	2006-07-23 00:17:57.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/mmap.c linux-2.6-xen-fedora/mm/mmap.c
+--- linux-2.6/mm/mmap.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/mmap.c	2006-07-22 20:37:57.000000000 +0200
 @@ -1950,6 +1950,10 @@ void exit_mmap(struct mm_struct *mm)
  	unsigned long nr_accounted = 0;
  	unsigned long end;
@@ -89436,9 +89447,9 @@
  	lru_add_drain();
  	flush_cache_mm(mm);
  	tlb = tlb_gather_mmu(mm, 1);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c compiling/mm/page_alloc.c
---- /mnt/ro/repos/hg/linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/mm/page_alloc.c	2006-07-23 00:17:58.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/mm/page_alloc.c linux-2.6-xen-fedora/mm/page_alloc.c
+--- linux-2.6/mm/page_alloc.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/mm/page_alloc.c	2006-07-22 20:37:57.000000000 +0200
 @@ -443,7 +443,8 @@ static void __free_pages_ok(struct page 
  	int i;
  	int reserved = 0;
@@ -89459,9 +89470,9 @@
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/dev.c compiling/net/core/dev.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/dev.c	2006-07-23 00:46:36.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/dev.c linux-2.6-xen-fedora/net/core/dev.c
+--- linux-2.6/net/core/dev.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/dev.c	2006-07-23 03:42:00.000000000 +0200
 @@ -117,6 +117,12 @@
  #include <linux/dmaengine.h>
  #include <linux/err.h>
@@ -89560,9 +89571,9 @@
  
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  EXPORT_SYMBOL(br_handle_frame_hook);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c compiling/net/core/pktgen.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
-+++ compiling/net/core/pktgen.c	2006-07-23 00:17:59.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/pktgen.c linux-2.6-xen-fedora/net/core/pktgen.c
+--- linux-2.6/net/core/pktgen.c	2006-07-13 00:51:41.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/pktgen.c	2006-07-22 20:37:57.000000000 +0200
 @@ -6,7 +6,7 @@
   *
   * Alexey Kuznetsov  <kuznet at ms2.inr.ac.ru>
@@ -89572,9 +89583,9 @@
   *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c compiling/net/core/skbuff.c
---- /mnt/ro/repos/hg/linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
-+++ compiling/net/core/skbuff.c	2006-07-23 00:17:59.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/core/skbuff.c linux-2.6-xen-fedora/net/core/skbuff.c
+--- linux-2.6/net/core/skbuff.c	2006-07-16 19:14:09.000000000 +0200
++++ linux-2.6-xen-fedora/net/core/skbuff.c	2006-07-22 20:37:57.000000000 +0200
 @@ -146,6 +146,7 @@ EXPORT_SYMBOL(skb_truesize_bug);
   *	Buffers may only be allocated from interrupts using a @gfp_mask of
   *	%GFP_ATOMIC.
@@ -89661,9 +89672,9 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-23 00:18:01.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-07-18 03:28:34.000000000 +0200
 @@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -89678,9 +89689,9 @@
  					ip_nat_cheat_check(oldport ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c compiling/net/ipv4/netfilter/ip_nat_proto_udp.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-23 00:18:01.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c
+--- linux-2.6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-07-22 20:37:58.000000000 +0200
 @@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
  		portptr = &hdr->dest;
  	}
@@ -89695,9 +89706,9 @@
  					ip_nat_cheat_check(*portptr ^ 0xFFFF,
  							   newport,
  							   hdr->check));
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c compiling/net/ipv4/xfrm4_output.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
-+++ compiling/net/ipv4/xfrm4_output.c	2006-07-23 00:18:03.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv4/xfrm4_output.c linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c
+--- linux-2.6/net/ipv4/xfrm4_output.c	2006-07-13 00:51:42.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv4/xfrm4_output.c	2006-07-22 20:37:58.000000000 +0200
 @@ -18,6 +18,8 @@
  #include <net/xfrm.h>
  #include <net/icmp.h>
@@ -89718,9 +89729,9 @@
  	if (skb->ip_summed == CHECKSUM_HW) {
  		err = skb_checksum_help(skb, 0);
  		if (err)
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c compiling/net/ipv6/addrconf.c
---- /mnt/ro/repos/hg/linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
-+++ compiling/net/ipv6/addrconf.c	2006-07-23 00:18:03.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/net/ipv6/addrconf.c linux-2.6-xen-fedora/net/ipv6/addrconf.c
+--- linux-2.6/net/ipv6/addrconf.c	2006-07-16 19:14:10.000000000 +0200
++++ linux-2.6-xen-fedora/net/ipv6/addrconf.c	2006-07-22 20:37:58.000000000 +0200
 @@ -2488,6 +2488,7 @@ static void addrconf_dad_start(struct in
  	spin_lock_bh(&ifp->lock);
  
@@ -89737,9 +89748,9 @@
  	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
  		struct in6_addr all_routers;
  
-diff -urNp --exclude=TAGS --exclude='.hg*' /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen compiling/scripts/Makefile.xen
---- /mnt/ro/repos/hg/linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
-+++ compiling/scripts/Makefile.xen	2006-07-23 00:18:07.000000000 +0200
+diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/scripts/Makefile.xen linux-2.6-xen-fedora/scripts/Makefile.xen
+--- linux-2.6/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6-xen-fedora/scripts/Makefile.xen	2006-07-18 03:28:35.000000000 +0200
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)


--- linux-2.6-xen_remap_vma_flags.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 27 13:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 09:08:30 -0400
Subject: rpms/kexec-tools/devel kdump.init, 1.8, 1.9 kexec-tools.spec, 1.35,
	1.36
Message-ID: <200607271308.k6RD8UVc017673@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17651

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
fixing up missing kdump.init patch


Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdump.init	8 Mar 2006 20:39:23 -0000	1.8
+++ kdump.init	27 Jul 2006 13:08:21 -0000	1.9
@@ -26,6 +26,7 @@
 KDUMP_KERNELVER=""
 KDUMP_COMMANDLINE=""
 KEXEC_ARGS=""
+KDUMP_CONFIG_FILE="/etc/kdump.conf"
 
 standard_kexec_args="-p --args-linux"
 
@@ -41,10 +42,7 @@
 	cp /proc/vmcore $coredir/vmcore
 }
 
-# Load the kdump kerel specified in /etc/sysconfig/kdump
-# If none is specified, try to load a kdump kernel with the same version
-# as the currently running kernel.
-function load_kdump()
+function check_config()
 {
 	if [ -z "$KDUMP_KERNELVER" ]; then
 		local running_kernel=`uname -r`
@@ -70,6 +68,38 @@
 		return 1
 	fi
 
+	#check to see if config file has been modified after
+	#last build of the image file
+	config_time=0
+	if [ -f $KDUMP_CONFIG_FILE ]; then
+		config_time=`stat -c "%Y" $KDUMP_CONFIG_FILE`
+	fi
+	kernel_time=`stat -c "%Y" $kdump_kernel`
+	image_time=`stat -c "%Y" $kdump_initrd`
+
+	if [ "$config_time" -gt "$image_time" ] ||
+	   [ "$kernel_time" -gt "$image_time" ]; then
+		echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change"
+		echo "Rebuilding $kdump_initrd"
+		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+	fi
+
+	#hack until we stop making initrd for kdump during rpm install
+	#allow initrd 120 seconds to be created before considering it new
+	module_time=`stat -c "%Y" /lib/modules/${kdump_kver}`
+	let module_time=module_time+120
+	if [ ! "$image_time" -gt "$module_time" ]; then
+		echo "Detected initial rpm install"
+		echo "Rebuilding $kdump_initrd"
+		/sbin/mkdumprd -d -f $kdump_initrd $kdump_kver
+	fi
+}
+
+# Load the kdump kerel specified in /etc/sysconfig/kdump
+# If none is specified, try to load a kdump kernel with the same version
+# as the currently running kernel.
+function load_kdump()
+{
 	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'`
@@ -87,6 +117,8 @@
 	    save_core
 	    reboot
         else
+	    #TODO check raw partition for core dump image
+	    check_config
 	    load_kdump
 	fi
 	;;
@@ -98,6 +130,7 @@
 	;;
   restart)
 	$KEXEC -p -u
+	check_config
 	load_kdump
 	;;
   condrestart)


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kexec-tools.spec	20 Jul 2006 03:36:18 -0000	1.35
+++ kexec-tools.spec	27 Jul 2006 13:08:21 -0000	1.36
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 30%{dist}.1
+Release: 31%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -127,6 +127,9 @@
 %doc TODO
 
 %changelog
+* Thu Jul 27 2006 Neil Horman <nhorman at redhat.com> - 1.101-30%{dist}.1
+-fixing up missing patch to kdump.init
+
 * Wed Jul 19 2006 Neil Horman <nhorman at redhat.com> - 1.101-30%{dist}.1
 -add kexec frontend (bz 197695)
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 13:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 09:52:01 -0400
Subject: rpms/fonts-sinhala/devel fonts-sinhala.spec, 1.1, 1.2 sources, 1.2,
	1.3
Message-ID: <200607271352.k6RDq114011242@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/fonts-sinhala/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10943

Modified Files:
	fonts-sinhala.spec sources 
Log Message:
Bug Fixes (RH # 199120, 199930)



Index: fonts-sinhala.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-sinhala/devel/fonts-sinhala.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fonts-sinhala.spec	13 Jul 2006 04:27:54 -0000	1.1
+++ fonts-sinhala.spec	27 Jul 2006 13:51:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name: fonts-sinhala
 Version: 0.2
-Release: 3
+Release: 4
 License: GPL
 Source: lklug-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,6 +15,7 @@
 Haralambous and are in GPL. OTF tables are added by Anuradha 
 Ratnaweera and Harshani Devadithya.
 
+
 %prep
 %setup -q -c
 
@@ -48,6 +49,10 @@
 %{_datadir}/fonts/sinhala/*.ttf
 
 %changelog
+* Thu Jul 27 2006 Darshan Santani <dsantani at redhat.com> - 0.2.4
+- Added support for missing Unicode points U+25CC and U+0DF4 [ RH# 199120]
+- Resolves RH# 199930 
+
 * Wed Jul 12 2006 Leon Ho <llch at redhat.com> - 0.2-3
 - Improved buildroot dir
 - Removed ghost fonts.cache*


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-sinhala/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jul 2006 04:27:54 -0000	1.2
+++ sources	27 Jul 2006 13:51:58 -0000	1.3
@@ -1 +1 @@
-2ce2496357299ad6d67abddfec542dca  lklug-0.2.tar.gz
+d6c9527ad8cb60535b282ef1267a066e  lklug-0.2.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 14:28:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 10:28:37 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.10, 1.11 setroubleshoot.init,
	1.2, 1.3 setroubleshoot.spec, 1.14, 1.15 sources, 1.12, 1.13
Message-ID: <200607271428.k6RESbtq005172@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5129/devel

Modified Files:
	.cvsignore setroubleshoot.init setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.15-1 on branch devel from setroubleshoot-0.15-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	24 Jul 2006 14:55:43 -0000	1.10
+++ .cvsignore	27 Jul 2006 14:28:34 -0000	1.11
@@ -1 +1 @@
-setroubleshoot-0.14.tar.gz
+setroubleshoot-0.15.tar.gz


Index: setroubleshoot.init
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setroubleshoot.init	21 Jul 2006 13:42:14 -0000	1.2
+++ setroubleshoot.init	27 Jul 2006 14:28:34 -0000	1.3
@@ -28,36 +28,37 @@
 test `id -u` = 0  || exit 4
 
 # Check config
-test -x /usr/sbin/setroubleshootd  || exit 5
+test -x /usr/sbin/setroubleshoot  || exit 5
 
 RETVAL=0
 
-prog="setroubleshootd"
+prog="setroubleshoot"
+exe="setroubleshootd"
 
 start(){
     echo -n $"Starting $prog: "
     unset HOME MAIL USER USERNAME
-    daemon $prog "$EXTRAOPTIONS"
+    daemon $exe "$EXTRAOPTIONS"
     RETVAL=$?
     echo
     if test $RETVAL = 0 ; then
-        touch /var/lock/subsys/setroubleshootd
+        touch /var/lock/subsys/setroubleshoot
     fi
     return $RETVAL
 }
 
 stop(){
     echo -n $"Stopping $prog: "
-    killproc $prog
+    killproc $exe
     RETVAL=$?
     echo
-    rm -f /var/lock/subsys/setroubleshootd
+    rm -f /var/lock/subsys/setroubleshoot
     return $RETVAL
 }
 
 reload(){
     echo -n $"Reloading configuration: "	
-    killproc $prog -HUP
+    killproc $exe -HUP
     RETVAL=$?
     echo
     return $RETVAL


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- setroubleshoot.spec	24 Jul 2006 14:55:43 -0000	1.14
+++ setroubleshoot.spec	27 Jul 2006 14:28:34 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.14
+Version: 0.15
 Release: 1
 License: GPL
 Group: Applications/System
@@ -78,6 +78,7 @@
 %files
 %defattr(-,root,root,-)
 %doc %{pkgdocdir}
+%{_bindir}/*
 %{_sbindir}/*
 %{auditlibdir}/*
 %{pkgpythondir}
@@ -93,6 +94,11 @@
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Jul 26 2006 Dan Walsh <dwalsh at redhat.com> - 0.15-1
+-  Karl MacMillan 
+	* Add generic templating mechanism to Plugin
+	* Ported all plugins to use templating mechanism
+
 * Sat Jul 22 2006 Dan Walsh <dwalsh at redhat.com> - 0.13-1
 - Fixes to plugins
 - Fixes to dispatcher


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Jul 2006 14:55:43 -0000	1.12
+++ sources	27 Jul 2006 14:28:34 -0000	1.13
@@ -1 +1 @@
-22558c35056acc87ca6b04da8cd9c722  setroubleshoot-0.14.tar.gz
+f07dea1b1d86430559b60ffaa327e466  setroubleshoot-0.15.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 14:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 10:58:58 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo65081.sw.layout.patch, NONE,
	1.1 openoffice.org.spec, 1.798, 1.799
Message-ID: <200607271458.k6REwwv4029853@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29792

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65081.sw.layout.patch 
Log Message:
rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layout.patch

openoffice.org-2.0.3.ooo65081.sw.layout.patch:
 _viewsh.sdi |    6 ------
 1 files changed, 6 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo65081.sw.layout.patch ---
Index: _viewsh.sdi
===================================================================
RCS file: /cvs/sw/sw/sdi/_viewsh.sdi,v
retrieving revision 1.28.82.1
retrieving revision 1.28
diff -u -r1.28.82.1 -r1.28
--- openoffice.org.orig/sw/sdi/_viewsh.sdi	30 Jun 2006 05:47:01 -0000	1.28.82.1
+++ openoffice.org/sw/sdi/_viewsh.sdi	2 May 2006 15:16:04 -0000	1.28
@@ -622,12 +622,6 @@
         Export = FALSE;
     ]
 
-    FN_PRINT_LAYOUT
-    [
-        ExecMethod = ExecViewOptions ;
-        StateMethod = StateViewOptions ;
-        Export = FALSE;
-    ]
      // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren
     FN_RULER // status()
     [


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- openoffice.org.spec	27 Jul 2006 12:29:30 -0000	1.798
+++ openoffice.org.spec	27 Jul 2006 14:58:55 -0000	1.799
@@ -124,6 +124,7 @@
 Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -874,7 +875,8 @@
 %patch57 -p1 -b .rh200118.filter.xalanbroken.patch
 %patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
 %patch59 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch69 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch61 -p1 -b .ooo65081.sw.layout.patch
 
 tar xzf %{SOURCE1}
 
@@ -3355,6 +3357,7 @@
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 - rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 - rh#199056# -> openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+- rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layout.patch
 - drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 - drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 - require dejavu-lgc-fonts, Greek coverage problems begone



From fedora-cvs-commits at redhat.com  Thu Jul 27 15:08:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 11:08:49 -0400
Subject: rpms/kernel/devel linux-2.6-xen-execshield-lazy-exec-limit.patch,
	NONE, 1.1 kernel-2.6.spec, 1.2461, 1.2462
Message-ID: <200607271508.k6RF8njn031400@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30935

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-execshield-lazy-exec-limit.patch 
Log Message:
fix xen i386 dom0 boot (#200382) (sct fixed it)

linux-2.6-xen-execshield-lazy-exec-limit.patch:
 traps-xen.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-execshield-lazy-exec-limit.patch ---
diff --git a/arch/i386/kernel/traps-xen.c b/arch/i386/kernel/traps-xen.c
index 462b206..9449104 100644
--- a/arch/i386/kernel/traps-xen.c
+++ b/arch/i386/kernel/traps-xen.c
@@ -594,6 +594,8 @@ check_lazy_exec_limit(int cpu, struct pt
 	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
 
 	if (desc1->a != desc2->a || desc1->b != desc2->b) {
+		int result;
+
 		/*
 		 * The CS was not in sync - reload it and retry the
 		 * instruction. If the instruction still faults then
@@ -603,8 +605,13 @@ check_lazy_exec_limit(int cpu, struct pt
 			printk("#GPF fixup (%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, CPU_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
 		}
+		/* Only return progress if we widened the segment; on
+		 * Xen, sometimes the segment is set _too_ wide and we
+		 * try to narrow it here, but that can never make
+		 * progress towards resolving the GPF! */
+		result = (desc1->a < desc2->a || desc1->b > desc2->b);
 		load_user_cs_desc(cpu, current->mm);
-		return 1;
+		return result;
 	}
 
 	return 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2461
retrieving revision 1.2462
diff -u -r1.2461 -r1.2462
--- kernel-2.6.spec	27 Jul 2006 13:05:33 -0000	1.2461
+++ kernel-2.6.spec	27 Jul 2006 15:08:47 -0000	1.2462
@@ -324,6 +324,7 @@
 Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
 Patch954: linux-2.6-xen-execshield.patch
 Patch955: linux-2.6-xen-tux.patch
+Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
 
 
 Patch990: linux-2.6-xen-compile-fixes.patch
@@ -835,7 +836,7 @@
 # Xen exec-shield bits
 %patch954 -p1
 %patch955 -p1
-
+%patch956 -p1
 
 #%patch990 -p1
 
@@ -1662,6 +1663,7 @@
 * Thu Jul 27 2006 Juan Quintela <quintela at redhat.com>
 - review all xen related patches.
 - x86_64 dom0, x86_64 domU and i386 domU should work.
+- fix xen i386 dom0 boot (#200382).
 
 * Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
 - reduce hypervisor stack use with -O2, this really fixes bug (#198932)



From fedora-cvs-commits at redhat.com  Thu Jul 27 15:50:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 11:50:52 -0400
Subject: rpms/libglade-java/devel libglade-java.spec,1.42,1.43
Message-ID: <200607271550.k6RFoqs5009649@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9445

Modified Files:
	libglade-java.spec 
Log Message:
remove javadoc date string hack.



Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libglade-java.spec	23 Jul 2006 07:54:08 -0000	1.42
+++ libglade-java.spec	27 Jul 2006 15:50:49 -0000	1.43
@@ -15,7 +15,7 @@
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.12.4
-Release: 	2
+Release: 	3
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -64,10 +64,6 @@
 mkdir -p doc/api/
 make
 
-# need to remove date string for multilib
-rm doc/api/gjdoc.properties
-sed --in-place "s/, on.*GMT\./\./" doc/api/about.html
-
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
 jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
@@ -118,6 +114,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Thu Jul 27 2006 Ben Konrath <bkonrath at redhat.com> - 2.12.4-3
+- Remove javadoc date string hack.
+
 * Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.4-2
 - Bump release number. (dist-fc6-java)
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 15:54:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 11:54:24 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.149,
	1.150
Message-ID: <200607271554.k6RFsOYX021190@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21169

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Set classpath when running bootstrap ecj.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- java-1.4.2-gcj-compat.spec	26 Jul 2006 21:49:28 -0000	1.149
+++ java-1.4.2-gcj-compat.spec	27 Jul 2006 15:54:22 -0000	1.150
@@ -180,7 +180,7 @@
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
 %if %{bootstrap}
-  sh ../../ecj `find . -type f -name "*.java"`
+  CLASSPATH=%{SOURCE2} sh -x ../../ecj `find . -type f -name "*.java"`
 %else
   ecj `find . -type f -name "*.java"`
 %endif



From fedora-cvs-commits at redhat.com  Thu Jul 27 15:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 11:56:26 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.305, 1.306 anaconda.spec, 1.431,
	1.432 sources, 1.428, 1.429
Message-ID: <200607271556.k6RFuQCF021289@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21266/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.67-1 on branch devel from anaconda-11.1.0.67-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- .cvsignore	26 Jul 2006 19:53:09 -0000	1.305
+++ .cvsignore	27 Jul 2006 15:56:23 -0000	1.306
@@ -1 +1 @@
-anaconda-11.1.0.66.tar.bz2
+anaconda-11.1.0.67.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- anaconda.spec	26 Jul 2006 20:19:47 -0000	1.431
+++ anaconda.spec	27 Jul 2006 15:56:23 -0000	1.432
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.66
+Version: 11.1.0.67
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -80,6 +80,7 @@
 %files
 %defattr(-,root,root)
 %doc COPYING
+%doc ChangeLog
 %doc docs/command-line.txt
 %doc docs/install-methods.txt
 %doc docs/kickstart-docs.txt
@@ -102,6 +103,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.67-1
+- FTP/HTTP ipv6 fixes (dcantrel)
+- Better prepboot handling (pnasrat)
+- RHEL installclass fixes
+
 * Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 11.1.0.66-1
 - Fix md raid request class
 - Check for busybox utilties in /usr/sbin (katzj)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- sources	26 Jul 2006 20:19:47 -0000	1.428
+++ sources	27 Jul 2006 15:56:23 -0000	1.429
@@ -1 +1 @@
-6dfbfb29e4441c1be9cdec07088524fd  anaconda-11.1.0.66.tar.bz2
+0b339aef366c2ce5d91f597ad9efa638  anaconda-11.1.0.67.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:20:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:20:57 -0400
Subject: rpms/yelp/devel .cvsignore, 1.28, 1.29 sources, 1.30, 1.31 yelp.spec,
	1.68, 1.69
Message-ID: <200607271620.k6RGKvsQ017808@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17752

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.15.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Jun 2006 04:43:46 -0000	1.28
+++ .cvsignore	27 Jul 2006 16:20:55 -0000	1.29
@@ -1 +1 @@
-yelp-2.15.3.tar.bz2
+yelp-2.15.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	18 Jul 2006 16:04:55 -0000	1.30
+++ sources	27 Jul 2006 16:20:55 -0000	1.31
@@ -1 +1 @@
-0a6928685d289b67773eeff6ae90869b  yelp-2.15.2.tar.bz2
+ae48d9f1c3ce8210b40b598bbb6ac064  yelp-2.15.5.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- yelp.spec	18 Jul 2006 16:18:21 -0000	1.68
+++ yelp.spec	27 Jul 2006 16:20:55 -0000	1.69
@@ -5,7 +5,7 @@
 
 %define pango_version 1.0.99
 %define gtk2_version 2.6.0
-%define mozilla_version 1.7.13
+%define firefox_version 1.5.0.4
 %define gnome_vfs2_version 2.0.0
 %define libgnomeui_version 2.0.2
 %define libbonobo_version 2.0.0
@@ -18,8 +18,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.15.2
-Release: 2
+Version: 2.15.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
@@ -29,7 +29,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
-Requires: mozilla >= %{mozilla_version}
+Requires: firefox >= %{firefox_version}
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libbonobo >= %{libbonobo_version}
 Requires: libxml2 >= %{libxml_version}
@@ -45,7 +45,7 @@
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: mozilla-devel >= %{mozilla_version}
+BuildRequires: firefox-devel >= %{firefox_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel >= %{libglade_version}
@@ -80,11 +80,11 @@
 %patch2 -p1 -b .add-mime-handling
 
 %build
-%configure                        \
-	--enable-search	  	  \
-	--with-mozilla=mozilla    \
-	--enable-man  	          \
-	--enable-info             \
+%configure 			\
+	--enable-search		\
+	--with-mozilla=firefox 	\
+	--enable-man 		\
+	--enable-info 		\
 	--disable-schemas-install
 make
 
@@ -131,6 +131,10 @@
 %{_datadir}/yelp
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.5-1
+- Update to 2.15.5
+- Rebuild against firefox-devel
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.2-2
 - Go back to 2.15.2, since gecko 1.8 is still missing
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:27:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:27:16 -0400
Subject: rpms/yelp/devel yelp-2.15.5-fedora-docs.patch, NONE, 1.1 yelp.spec,
	1.69, 1.70
Message-ID: <200607271627.k6RGRG66020229@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20087

Modified Files:
	yelp.spec 
Added Files:
	yelp-2.15.5-fedora-docs.patch 
Log Message:
2.15.5


yelp-2.15.5-fedora-docs.patch:
 scrollkeeper.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE yelp-2.15.5-fedora-docs.patch ---
--- yelp-2.15.5/data/scrollkeeper.xml.fedora-docs	2006-07-27 12:25:20.000000000 -0400
+++ yelp-2.15.5/data/scrollkeeper.xml	2006-07-27 12:25:50.000000000 -0400
@@ -9,6 +9,7 @@
     <subject category="GNOME|Settings"/>
     <subject category="GNOME|Applications|Desktop Preferences"/>
     <subject category="GNOME|Preferences"/>
+    <subject category="General|Linux|Distributions|Other"/>
   </toc>
   <toc id="DesktopApplets">
     <subject category="GNOME|Applets"/>
@@ -243,7 +244,6 @@
     <subject category="General|Linux|Distributions|Red Hat"/>
     <subject category="General|Linux|Distributions|Slackware"/>
     <subject category="General|Linux|Distributions|SuSE"/>
-    <subject category="General|Linux|Distributions|Other"/>
     <subject category="General|Linux|General"/>
     <subject category="General|Linux|Other"/>
     <subject category="General|Other"/>


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- yelp.spec	27 Jul 2006 16:20:55 -0000	1.69
+++ yelp.spec	27 Jul 2006 16:27:13 -0000	1.70
@@ -22,7 +22,7 @@
 Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
-Patch1: yelp-2.12.1-fedora-docs.patch
+Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
 License: GPL
 Group: Applications/System



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:29:56 -0400
Subject: rpms/tomcat5/devel tomcat5-5.5.relink, 1.2, 1.3 tomcat5.spec, 1.89,
	1.90
Message-ID: <200607271629.k6RGTuqc021346@cvs.devel.redhat.com>

Author: fnasser

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21290

Modified Files:
	tomcat5-5.5.relink tomcat5.spec 
Log Message:
Fix regression in relink with patch from Matt Wringe




Index: tomcat5-5.5.relink
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.relink,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5.relink	5 Jul 2006 22:50:50 -0000	1.2
+++ tomcat5-5.5.relink	27 Jul 2006 16:29:54 -0000	1.3
@@ -15,6 +15,6 @@
     rebuild-jar-repository $repository
 done
 
-for webapp in $(find @@@TCAPP@@@ -type d -mindepth 1 -maxdepth 2) ; do
+for webapp in $(find @@@TCAPP@@@ -mindepth 1 -maxdepth 2 -type d) ; do
     [ -d "$webapp/WEB-INF/lib" ] && rebuild-jar-repository $webapp/WEB-INF/lib
 done


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- tomcat5.spec	22 Jul 2006 08:45:47 -0000	1.89
+++ tomcat5.spec	27 Jul 2006 16:29:54 -0000	1.90
@@ -69,7 +69,7 @@
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Name: tomcat5
 Version: 5.5.17
-Release: 3jpp_4fc
+Release: 3jpp_5fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -1209,6 +1209,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_5fc
+- Fix regression in relink with patch from Matt Wringe
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:5.5.17-3jpp_4fc
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:39:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:39:31 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.306, 1.307 anaconda.spec, 1.432,
	1.433 sources, 1.429, 1.430
Message-ID: <200607271639.k6RGdVsK023489@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23434/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.68-1 on branch devel from anaconda-11.1.0.68-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- .cvsignore	27 Jul 2006 15:56:23 -0000	1.306
+++ .cvsignore	27 Jul 2006 16:39:28 -0000	1.307
@@ -1 +1 @@
-anaconda-11.1.0.67.tar.bz2
+anaconda-11.1.0.68.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- anaconda.spec	27 Jul 2006 15:56:23 -0000	1.432
+++ anaconda.spec	27 Jul 2006 16:39:28 -0000	1.433
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.67
+Version: 11.1.0.68
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.68-1
+- And another fix for the RHEL installclass
+
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.67-1
 - FTP/HTTP ipv6 fixes (dcantrel)
 - Better prepboot handling (pnasrat)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- sources	27 Jul 2006 15:56:23 -0000	1.429
+++ sources	27 Jul 2006 16:39:28 -0000	1.430
@@ -1 +1 @@
-0b339aef366c2ce5d91f597ad9efa638  anaconda-11.1.0.67.tar.bz2
+a12fb120faaf0493817e9e5c55b014c1  anaconda-11.1.0.68.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:58:31 -0400
Subject: rpms/fedora-release/devel fedora-release.spec, 1.38, 1.39 sources,
	1.29, 1.30
Message-ID: <200607271658.k6RGwVlq012918@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12823

Modified Files:
	fedora-release.spec sources 
Log Message:
import from public cvs



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fedora-release.spec	24 Jul 2006 00:20:56 -0000	1.38
+++ fedora-release.spec	27 Jul 2006 16:58:29 -0000	1.39
@@ -3,15 +3,15 @@
 
 Summary:	Fedora Core release files
 Name:		fedora-release
-Version:	5.91
-Release:	4
+Version:	5.91.1
+Release:	1
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
 Source:		fedora-release-%{version}.tar.gz
 Obsoletes:	redhat-release
 Provides:	redhat-release
-Requires:	fedora-release-notes = %{version}
+Requires:	fedora-release-notes >= %{release_version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -26,7 +26,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc
-echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
+echo "Fedora Core release %{release_version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
 cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue
 cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
@@ -64,6 +64,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Thu Jul 27 2006 Jesse Keating <jkeating at redhat.com> - 5.91.1-1
+- Convert deprecated gtk calls. (#200242)
+- Fix some of the versioning
+
 * Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-4
 - Bump for FC6 Test2
 - Remove release-notes content, now standalone package


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	24 Jul 2006 00:20:56 -0000	1.29
+++ sources	27 Jul 2006 16:58:29 -0000	1.30
@@ -1,3 +1 @@
-b688647c2945d4982b16e404aa6a3fff  fedora-release-5.90.tar.gz
-5cbca2b54653efee1d014e572b133e1f  fedora-release-notes-5.90.tar.gz
-9b2fce1a73195895df5220588d237c73  fedora-release-5.91.tar.gz
+212b08a11e036c8dd9a7542c1d9d0531  fedora-release-5.91.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 16:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 12:59:09 -0400
Subject: rpms/fedora-release/devel .cvsignore,1.15,1.16
Message-ID: <200607271659.k6RGx9Zc013230@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13159

Modified Files:
	.cvsignore 
Log Message:
er forgot to update this one



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Jun 2006 17:49:44 -0000	1.15
+++ .cvsignore	27 Jul 2006 16:59:07 -0000	1.16
@@ -1 +1 @@
-fedora-release-5.90.tar.gz
+fedora-release-5.91.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 17:13:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 13:13:36 -0400
Subject: rpms/firefox/devel .cvsignore, 1.26, 1.27 firefox.spec, 1.129,
	1.130 sources, 1.29, 1.30
Message-ID: <200607271713.k6RHDacs016315@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16284

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Wed Jul 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
- Update to 1.5.0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	12 Jun 2006 22:14:17 -0000	1.26
+++ .cvsignore	27 Jul 2006 17:13:32 -0000	1.27
@@ -1,2 +1,2 @@
-firefox-1.5.0.4-source.tar.bz2
-firefox-langpacks-1.5.0.4-20060612.tar.bz2
+firefox-1.5.0.5-source.tar.bz2
+firefox-langpacks-1.5.0.5-20060726.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- firefox.spec	26 Jul 2006 20:06:35 -0000	1.129
+++ firefox.spec	27 Jul 2006 17:13:32 -0000	1.130
@@ -9,8 +9,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.4
-Release:        5
+Version:        1.5.0.5
+Release:        2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060612.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060726.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -336,6 +336,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jul 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
+- Update to 1.5.0.5
+
 * Mon Jul 24 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.4-4
 - Ugh:
   - Mozilla the platform is deprecated


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	12 Jun 2006 22:14:18 -0000	1.29
+++ sources	27 Jul 2006 17:13:32 -0000	1.30
@@ -1,2 +1,2 @@
-4cb3d7c1b5345585750766c589308b5e  firefox-1.5.0.4-source.tar.bz2
-f86cb08ab1d8d172e4cd87bb58d8fee2  firefox-langpacks-1.5.0.4-20060612.tar.bz2
+cfa7cd1af35571d3871c922c3a2b9c7f  firefox-1.5.0.5-source.tar.bz2
+b7021e012b02a745e73e51e05308cd49  firefox-langpacks-1.5.0.5-20060726.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 17:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 13:18:43 -0400
Subject: rpms/firefox/devel sources,1.30,1.31
Message-ID: <200607271718.k6RHIhS6000453@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv423

Modified Files:
	sources 
Log Message:
hmm, the wrong source got in here somehow...


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Jul 2006 17:13:32 -0000	1.30
+++ sources	27 Jul 2006 17:18:41 -0000	1.31
@@ -1,2 +1,2 @@
-cfa7cd1af35571d3871c922c3a2b9c7f  firefox-1.5.0.5-source.tar.bz2
+4ef41c8983c47c36efada10a867ffa6f  firefox-1.5.0.5-source.tar.bz2
 b7021e012b02a745e73e51e05308cd49  firefox-langpacks-1.5.0.5-20060726.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 17:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 13:36:20 -0400
Subject: rpms/libpng/devel libpng-1.2.10-pngconf.patch, NONE, 1.1 libpng.spec,
	1.36, 1.37
Message-ID: <200607271736.k6RHaKn5005985@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libpng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5909

Modified Files:
	libpng.spec 
Added Files:
	libpng-1.2.10-pngconf.patch 
Log Message:
disable asm on !i386


libpng-1.2.10-pngconf.patch:
 configure    |    1 +
 configure.ac |    3 ++-
 pngconf.h    |   19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE libpng-1.2.10-pngconf.patch ---
--- libpng-1.2.10/configure.pngconf	2006-07-02 21:01:35.000000000 +0200
+++ libpng-1.2.10/configure	2006-07-02 21:03:03.000000000 +0200
@@ -20149,6 +20149,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#define PNG_CONFIGURE_LIBPNG
 #include "pnggccrd.c"
 int
 main ()
--- libpng-1.2.10/pngconf.h.pngconf	2006-04-23 20:45:34.000000000 +0200
+++ libpng-1.2.10/pngconf.h	2006-07-02 21:01:12.000000000 +0200
@@ -35,6 +35,25 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#else
+/* pngconf.h is part of the exported API, when a libpng using application
+   includes us, PNG_CONFIGURE_LIBPNG is ofcourse not defined as we do not have
+   libpng's config.h available in this case. This means that we do not have the
+   defines added to config.h and the commandline by libpng's ./configure .
+   
+   For all defines from config.h not having them set is not a problem, however
+   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
+   on a platform on which the MMX and SSE asm code in libpng is not supported.
+   
+   We do need this define as this define is used to determine wether or not
+   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
+   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
+   (ImageMagick for example) to determine wether or not they can use the asm
+   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
+   on which the MMX and SSE asm code in libpng is not supported: */
+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
+#define PNG_NO_ASSEMBLER_CODE
+#endif
 #endif
 
 /*
--- libpng-1.2.10/configure.ac.pngconf	2006-07-02 21:01:28.000000000 +0200
+++ libpng-1.2.10/configure.ac	2006-07-02 21:03:08.000000000 +0200
@@ -60,7 +60,8 @@
 
 AC_MSG_CHECKING([if assembler code in pnggccrd.c can be compiled])
 AC_TRY_COMPILE(
-  [#include "pnggccrd.c"],
+  [#define PNG_CONFIGURE_LIBPNG
+   #include "pnggccrd.c"],
   [return 0;],
   LIBPNG_DEFINES=,
   LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)


Index: libpng.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libpng.spec	12 Jul 2006 06:55:27 -0000	1.36
+++ libpng.spec	27 Jul 2006 17:36:17 -0000	1.37
@@ -1,11 +1,12 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Version: 1.2.10
-Release: 5.1
+Release: 6
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-1.2.10-multilib.patch
+Patch1: libpng-1.2.10-pngconf.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .pngconf
 
 %build
 %configure
@@ -77,6 +79,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2:1.2.10-6
+- Disable asm on arches other than i386  (#196580)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.10-5.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 17:40:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 13:40:38 -0400
Subject: rpms/util-linux/devel util-linux-2.13-nfsmount-fsc.patch, 1.1,
	1.2 util-linux.spec, 1.133, 1.134
Message-ID: <200607271740.k6RHec57007225@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7039

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-nfsmount-fsc.patch 
Log Message:
Added the -o fsc flag to nfsmount.


util-linux-2.13-nfsmount-fsc.patch:
 nfs.5        |    8 ++++++++
 nfs4_mount.h |    1 +
 nfs4mount.c  |    8 ++++++--
 nfs_mount4.h |    1 +
 nfsmount.c   |    4 ++++
 5 files changed, 20 insertions(+), 2 deletions(-)

Index: util-linux-2.13-nfsmount-fsc.patch
===================================================================
RCS file: util-linux-2.13-nfsmount-fsc.patch
diff -N util-linux-2.13-nfsmount-fsc.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ util-linux-2.13-nfsmount-fsc.patch	27 Jul 2006 17:40:34 -0000	1.2
@@ -0,0 +1,95 @@
+--- util-linux-2.13-pre6/mount/nfs_mount4.h.fsc	2006-07-27 13:08:31.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs_mount4.h	2006-07-27 13:21:13.000000000 -0400
+@@ -58,6 +58,7 @@
+ #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
+ #define NFS_MOUNT_NOACL     0x0800  /* 4 */
+ #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
++#define NFS_MOUNT_FSCACHE       0x4000
+ 
+ /* security pseudoflavors */
+ 
+--- util-linux-2.13-pre6/mount/nfsmount.c.fsc	2006-07-27 13:08:31.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfsmount.c	2006-07-27 13:17:47.000000000 -0400
+@@ -900,6 +900,10 @@
+ 				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-07-27 13:08:31.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-07-27 13:17:47.000000000 -0400
+@@ -206,7 +206,7 @@
+ 	char *s;
+ 	int val;
+ 	int bg, soft, intr;
+-	int nocto, noac;
++	int nocto, noac, fscache;
+ 	int retry;
+ 	int retval;
+ 	time_t timeout, t;
+@@ -257,6 +257,7 @@
+ 	intr = NFS4_MOUNT_INTR;
+ 	nocto = 0;
+ 	noac = 0;
++	fscache = 0;
+ 	retry = 10000;		/* 10000 minutes ~ 1 week */
+ 
+ 	/*
+@@ -336,6 +337,8 @@
+ 				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"))
+@@ -353,7 +356,8 @@
+ 	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-07-27 13:08:31.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs4_mount.h	2006-07-27 13:17:47.000000000 -0400
+@@ -65,6 +65,7 @@
+ #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-07-27 13:08:31.000000000 -0400
++++ util-linux-2.13-pre6/mount/nfs.5	2006-07-27 13:25:18.000000000 -0400
+@@ -272,6 +272,10 @@
+ .I udp
+ Mount the NFS filesystem using the UDP protocol.  This
+ is the default.
++.TP 1.5i
++.I fsc
++Unable the use of persistent caching to the local disk using 
++the FS-Cache facility for the given mount point. 
+ .P
+ All of the non-value options have corresponding nooption forms.
+ For example, nointr means don't allow file operations to be
+@@ -428,6 +432,10 @@
+ server performance penalty but it allows two different NFS clients
+ to get reasonable good results when both clients are actively
+ writing to common filesystem on the server.
++.TP 1.5i
++.I fsc
++Unable the use of persistent caching to the local disk using 
++the FS-Cache facility for the given mount point. 
+ .P
+ All of the non-value options have corresponding nooption forms.
+ For example, nointr means don't allow file operations to be


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- util-linux.spec	26 Jul 2006 14:14:21 -0000	1.133
+++ util-linux.spec	27 Jul 2006 17:40:34 -0000	1.134
@@ -9,7 +9,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.34
+Release: 0.35
 License: distributable
 Group: System Environment/Base
 
@@ -220,6 +220,8 @@
 Patch244: util-linux-2.13-nfs4-posix_types.patch
 # IPv6 support to login command
 Patch245: util-linux-2.13-login-ipv6.patch
+# fscache bits for NFS mounts
+Patch246: util-linux-2.13-nfsmount-fsc.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -316,6 +318,7 @@
 %patch243 -p1
 %patch244 -p1
 %patch245 -p1
+%patch246 -p1
 
 %build
 unset LINGUAS || :
@@ -706,6 +709,9 @@
 /sbin/losetup
 
 %changelog
+* Thu Jul 27 2006 Steve Dickson <steved at redhat.com> 2.13-0.34
+- Added the -o fsc flag to nfsmount.
+
 * Wed Jul 26 2006 Karel Zak <kzak at redhat.com> 2.13-0.34
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 17:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 13:48:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2462,
	1.2463 linux-2.6-compile-fixes.patch, 1.95, 1.96
Message-ID: <200607271748.k6RHmPPp025032@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24849

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
* Thu Jul 27 2006 Dave Jones <davej at redhat.com>
- Add missing export for ia64 (#200396)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2462
retrieving revision 1.2463
diff -u -r1.2462 -r1.2463
--- kernel-2.6.spec	27 Jul 2006 15:08:47 -0000	1.2462
+++ kernel-2.6.spec	27 Jul 2006 17:48:23 -0000	1.2463
@@ -1259,10 +1259,10 @@
     ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
-    # Temporary fix for upstream "make prepare" bug.
-#    pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-#    make prepare
-#    popd > /dev/null
+	# Temporary fix for upstream "make prepare" bug.
+	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+	make prepare
+	popd > /dev/null
 }
 
 ###
@@ -1660,6 +1660,9 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Dave Jones <davej at redhat.com>
+- Add missing export for ia64 (#200396)
+
 * Thu Jul 27 2006 Juan Quintela <quintela at redhat.com>
 - review all xen related patches.
 - x86_64 dom0, x86_64 domU and i386 domU should work.

linux-2.6-compile-fixes.patch:
 Makefile                      |    4 ----
 arch/ia64/kernel/ia64_ksyms.c |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- linux-2.6-compile-fixes.patch	27 Jul 2006 13:05:34 -0000	1.95
+++ linux-2.6-compile-fixes.patch	27 Jul 2006 17:48:23 -0000	1.96
@@ -0,0 +1,24 @@
+
+--- linux-2.6.17.noarch/Makefile~	2006-06-29 17:20:17.000000000 -0400
++++ linux-2.6.17.noarch/Makefile	2006-06-29 17:20:38.000000000 -0400
+@@ -267,10 +267,6 @@ MAKEFLAGS += --include-dir=$(srctree)
+ # We need some generic definitions
+ include  $(srctree)/scripts/Kbuild.include
+ 
+-# Do not use make's built-in rules and variables
+-# This increases performance and avoid hard-to-debug behavour
+-MAKEFLAGS += -rR
+-
+ # Make variables (CC, etc...)
+ 
+ AS		= $(CROSS_COMPILE)as
+--- linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c~	2006-07-27 13:21:51.000000000 -0400
++++ linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 13:22:03.000000000 -0400
+@@ -42,6 +42,7 @@ EXPORT_SYMBOL(__do_clear_user);
+ EXPORT_SYMBOL(__strlen_user);
+ EXPORT_SYMBOL(__strncpy_from_user);
+ EXPORT_SYMBOL(__strnlen_user);
++EXPORT_SYMBOL(copy_page);
+ 
+ #define __KERNEL_SYSCALLS__
+ #include <asm/unistd.h>



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:02:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:02:26 -0400
Subject: rpms/libjpeg/devel jpeg-cflags.patch, NONE, 1.1 libjpeg.spec, 1.18,
	1.19
Message-ID: <200607271802.k6RI2Qj4029683@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29635

Modified Files:
	libjpeg.spec 
Added Files:
	jpeg-cflags.patch 
Log Message:
use CFLAGS consistently


jpeg-cflags.patch:
 ltconfig     |    2 +-
 makefile.cfg |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE jpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
--- jpeg-6b/ltconfig.BAD	2006-07-10 17:33:04.000000000 -0400
+++ jpeg-6b/ltconfig	2006-07-10 17:33:18.000000000 -0400
@@ -760,7 +760,7 @@
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+      archive_cmds='$CC $CFLAGS -shared ${wl}-soname $wl$soname -o $lib$libobjs'
     else
       ld_shlibs=no
     fi


Index: libjpeg.spec
===================================================================
RCS file: /cvs/dist/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libjpeg.spec	12 Jul 2006 06:54:20 -0000	1.18
+++ libjpeg.spec	27 Jul 2006 18:02:23 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: A library for manipulating JPEG image format files.
 Name: libjpeg
 Version: 6b
-Release: 36.2.2
+Release: 37
 License: distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
@@ -10,6 +10,7 @@
 Patch1: jpeg-c++.patch
 Patch2: libjpeg-shared.patch
 Patch3: libjpeg-rpath.patch
+Patch4: libjpeg-cflags.patch
 URL: http://www.ijg.org/
 Buildroot: %{_tmppath}/%{name}-root
 
@@ -42,7 +43,7 @@
 %patch0 -p1 -b .arm
 %patch1 -p1 -b .c++
 %patch2 -p1 -b .ppcshared
-%patch3 -p1
+%patch3 -p0 -b .cflags
 
 %build
 %configure --enable-shared --enable-static
@@ -87,6 +88,9 @@
 /usr/include/*.h
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 6b-37
+- Use CFLAGS consistently
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:07:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:07:31 -0400
Subject: rpms/libjpeg/devel libjpeg.spec,1.19,1.20
Message-ID: <200607271807.k6RI7VKD030667@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30137

Modified Files:
	libjpeg.spec 
Log Message:
use CFLAGS consistently



Index: libjpeg.spec
===================================================================
RCS file: /cvs/dist/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libjpeg.spec	27 Jul 2006 18:02:23 -0000	1.19
+++ libjpeg.spec	27 Jul 2006 18:07:29 -0000	1.20
@@ -43,7 +43,7 @@
 %patch0 -p1 -b .arm
 %patch1 -p1 -b .c++
 %patch2 -p1 -b .ppcshared
-%patch3 -p0 -b .cflags
+%patch3 -p1 -b .cflags
 
 %build
 %configure --enable-shared --enable-static



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:07:37 -0400
Subject: rpms/scim/devel scim_panel_gtk-systray-click-199187.patch,1.1,1.2
Message-ID: <200607271807.k6RI7bMO030722@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30570

Modified Files:
	scim_panel_gtk-systray-click-199187.patch 
Log Message:
qwang:change patch


scim_panel_gtk-systray-click-199187.patch:
 scim_panel_gtk.cpp |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 4 deletions(-)

Index: scim_panel_gtk-systray-click-199187.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim_panel_gtk-systray-click-199187.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim_panel_gtk-systray-click-199187.patch	27 Jul 2006 08:11:46 -0000	1.1
+++ scim_panel_gtk-systray-click-199187.patch	27 Jul 2006 18:07:34 -0000	1.2
@@ -1,7 +1,43 @@
 diff -uNr scim-1.4.4-20060716.orig/extras/panel/scim_panel_gtk.cpp scim-1.4.4-20060716/extras/panel/scim_panel_gtk.cpp
---- scim-1.4.4-20060716.orig/extras/panel/scim_panel_gtk.cpp	2006-07-27 15:47:33.070827536 +0800
-+++ scim-1.4.4-20060716/extras/panel/scim_panel_gtk.cpp	2006-07-27 15:50:43.763837792 +0800
-@@ -440,6 +440,8 @@
+--- scim-1.4.4-20060716.orig/extras/panel/scim_panel_gtk.cpp	2006-07-28 01:55:05.031195920 +0800
++++ scim-1.4.4-20060716/extras/panel/scim_panel_gtk.cpp	2006-07-28 01:49:17.985954816 +0800
+@@ -34,6 +34,7 @@
+ #include <gdk/gdk.h>
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
++#include <sys/timeb.h>
+ 
+ #define Uses_C_STDIO
+ #define Uses_C_STDLIB
+@@ -211,6 +212,8 @@
+                                                         gpointer        user_data);
+ static void       ui_factory_menu_deactivate_cb        (GtkMenuItem    *item,
+                                                         gpointer        user_data);
++static void       ui_factory_menu_hide_cb              (GtkWidget      *item,
++                                                        gpointer        user_data);
+ 
+ static gboolean   ui_lookup_table_vertical_click_cb    (GtkWidget      *item,
+                                                         GdkEventButton *event,
+@@ -268,6 +271,8 @@
+                                                         gpointer        user_data);
+ static void       ui_command_menu_deactivate_cb        (GtkWidget      *item,
+                                                         gpointer        user_data);
++static void       ui_command_menu_hide_cb              (GtkWidget      *item,
++                                                        gpointer        user_data);
+ 
+ #if ENABLE_TRAY_ICON
+ static void       ui_tray_icon_destroy_cb              (GtkObject      *object,
+@@ -394,6 +399,9 @@
+ 
+ static PangoFontDescription *_default_font_desc        = 0;
+ 
++static struct timeb       _factory_hide_time;
++static struct timeb       _command_hide_time;
++
+ #if ENABLE_TRAY_ICON
+ static ScimTrayIcon      *_tray_icon                   = 0;
+ static GtkWidget         *_tray_icon_factory_button    = 0;
+@@ -440,6 +448,8 @@
  static bool               _factory_menu_activated      = false;
  static bool               _command_menu_activated      = false;
  static bool               _property_menu_activated     = false;
@@ -10,30 +46,100 @@
  
  static int                _spot_location_x             = -1;
  static int                _spot_location_y             = -1;
-@@ -1590,10 +1592,22 @@
+@@ -1589,11 +1599,43 @@
+     SCIM_DEBUG_MAIN (3) << "  ui_factory_button_click_cb...\n";
  
      GdkEventButton *bevent = (GdkEventButton *) event;
- 
--    if (bevent->button <= 1)
--        _panel_agent->request_factory_menu ();
--    else
--        action_show_command_menu ();
++        
 +    if (bevent->button <= 1) {
++        struct timeb time;
++
++        ftime (&time);
++        if (int (time.time) > int (_factory_hide_time.time) ||
++                ((int (time.time) == int (_factory_hide_time.time)) && 
++                (time.millitm - _factory_hide_time.millitm > 200)))
++            _factory_menu_shown_up = false;
++        
 +        if (!_factory_menu_shown_up) {
 +            _panel_agent->request_factory_menu ();
 +            _factory_menu_shown_up = true;
 +        } 
 +        else 
 +            _factory_menu_shown_up = false;
++
 +    }
 +    else {
++        struct timeb time;
++
++        ftime (&time);
++        if (int (time.time) > int (_command_hide_time.time) ||
++                ((int (time.time) == int (_command_hide_time.time)) &&
++                (time.millitm - _command_hide_time.millitm > 200)))
++        {
++            _command_menu_shown_up = false;
++        }
++        
 +        if (!_command_menu_shown_up) {
 +            action_show_command_menu ();
 +            _command_menu_shown_up = true;
 +        }
 +        else 
 +            _command_menu_shown_up = false;
+ 
+-    if (bevent->button <= 1)
+-        _panel_agent->request_factory_menu ();
+-    else
+-        action_show_command_menu ();
 +    }
  
      return FALSE;
  }
+@@ -1617,6 +1659,13 @@
+     _factory_menu_activated = false;
+ }
+ 
++static void 
++ui_factory_menu_hide_cb (GtkWidget *item,
++                         gpointer   user_data)
++{
++    ftime (&_factory_hide_time);
++}
++
+ static gboolean
+ ui_lookup_table_vertical_click_cb (GtkWidget      *item,
+                                    GdkEventButton *event,
+@@ -2155,6 +2204,13 @@
+     _command_menu_activated = false;
+ }
+ 
++static void
++ui_command_menu_hide_cb (GtkWidget *item,
++                         gpointer   user_data)
++{
++    ftime (&_command_hide_time);
++}
++
+ #if ENABLE_TRAY_ICON
+ static void
+ ui_tray_icon_destroy_cb (GtkObject      *object,
+@@ -2335,6 +2391,9 @@
+     g_signal_connect (G_OBJECT (_command_menu), "deactivate",
+                       G_CALLBACK (ui_command_menu_deactivate_cb),
+                       NULL);
++    g_signal_connect (G_OBJECT (_command_menu), "hide",
++                      G_CALLBACK (ui_command_menu_hide_cb),
++                      NULL);
+ 
+ #if ENABLE_DEBUG
+     menu_item = gtk_separator_menu_item_new ();
+@@ -2716,6 +2775,10 @@
+         g_signal_connect (G_OBJECT (_factory_menu), "deactivate",
+                           G_CALLBACK (ui_factory_menu_deactivate_cb),
+                           NULL);
++        g_signal_connect (G_OBJECT (_factory_menu), "hide",
++                          G_CALLBACK (ui_factory_menu_hide_cb),
++                          NULL);
++ 
+         gtk_menu_popup (GTK_MENU (_factory_menu), 0, 0, 0, 0, 1, activate_time);
+     }
+ }



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:10:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:10:04 -0400
Subject: rpms/scim/devel scim.spec,1.52,1.53
Message-ID: <200607271810.k6RIA4U4031246@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31145

Modified Files:
	scim.spec 
Log Message:
qwang:change changelog, new patch



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- scim.spec	27 Jul 2006 08:14:59 -0000	1.52
+++ scim.spec	27 Jul 2006 18:09:58 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   26%{?dist}
+Release:   27%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -38,6 +38,7 @@
 Patch8:    initial-locale-hotkey-186861.patch
 Patch9:    scim_panel_gtk-icon-size-fixes.patch
 Patch10:   scim_panel_gtk-menu-recently-used-factories.patch
+Patch11:   scim_panel_gtk-menu-systray-click-199187.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -214,6 +215,9 @@
 
 
 %changelog
+* Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-27
+- fixed the patch for bug 199187 with new scim_panel_gtk-systray-click-199187.patch
+
 * Thu Jul 27 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-26
 - fixed the bug 199187 with scim_panel_gtk-systray-click-199187.patch
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:16:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:16:05 -0400
Subject: rpms/libjpeg/devel libjpeg-cflags.patch, NONE, 1.1 jpeg-cflags.patch,
	1.1, NONE
Message-ID: <200607271816.k6RIG5f8005120@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3293

Added Files:
	libjpeg-cflags.patch 
Removed Files:
	jpeg-cflags.patch 
Log Message:
fix up patch


libjpeg-cflags.patch:
 ltconfig     |    2 +-
 makefile.cfg |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libjpeg-cflags.patch ---
--- jpeg-6b/makefile.cfg.useCFLAGS	1998-03-21 14:08:57.000000000 -0500
+++ jpeg-6b/makefile.cfg	2006-07-10 17:21:14.000000000 -0400
@@ -54,7 +54,7 @@
 # miscellaneous OS-dependent stuff
 SHELL= /bin/sh
 # linker
-LN= @LN@
+LN= @LN@ $(CFLAGS) 
 # file deletion command
 RM= rm -f
 # directory creation command
@@ -168,7 +168,7 @@
 
 # with libtool:
 libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
-	$(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
 		-rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
 
 # sample programs:
--- jpeg-6b/ltconfig.BAD	2006-07-10 17:33:04.000000000 -0400
+++ jpeg-6b/ltconfig	2006-07-10 17:33:18.000000000 -0400
@@ -760,7 +760,7 @@
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+      archive_cmds='$CC $CFLAGS -shared ${wl}-soname $wl$soname -o $lib$libobjs'
     else
       ld_shlibs=no
     fi


--- jpeg-cflags.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:20:15 -0400
Subject: rpms/firefox/FC-5 firefox.spec,1.116,1.117 sources,1.27,1.28
Message-ID: <200607271820.k6RIKFn3017648@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17595

Modified Files:
	firefox.spec sources 
Log Message:
* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-1.1.fc5
- Update to 1.5.0.5



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- firefox.spec	15 Jun 2006 00:19:39 -0000	1.116
+++ firefox.spec	27 Jul 2006 18:20:13 -0000	1.117
@@ -8,8 +8,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5.0.4
-Release:        1.2.fc5
+Version:        1.5.0.5
+Release:        1.1.fc5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -19,7 +19,7 @@
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20060612.tar.bz2
+Source2:        firefox-langpacks-%{version}-20060726.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -271,6 +271,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-1.1.fc5
+- Update to 1.5.0.5
+
 * Wed Jun 14 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.2.fc5
 - Force "gmake -j1" on ppc ppc64 s390 s390x
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	12 Jun 2006 22:12:45 -0000	1.27
+++ sources	27 Jul 2006 18:20:13 -0000	1.28
@@ -1,2 +1,2 @@
-4cb3d7c1b5345585750766c589308b5e  firefox-1.5.0.4-source.tar.bz2
-f86cb08ab1d8d172e4cd87bb58d8fee2  firefox-langpacks-1.5.0.4-20060612.tar.bz2
+4ef41c8983c47c36efada10a867ffa6f  firefox-1.5.0.5-source.tar.bz2
+b7021e012b02a745e73e51e05308cd49  firefox-langpacks-1.5.0.5-20060726.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:24:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:24:12 -0400
Subject: rpms/scim/devel scim.spec,1.53,1.54
Message-ID: <200607271824.k6RIOCVi029098@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29085

Modified Files:
	scim.spec 
Log Message:
qwang:change spec file



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- scim.spec	27 Jul 2006 18:09:58 -0000	1.53
+++ scim.spec	27 Jul 2006 18:24:10 -0000	1.54
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   27%{?dist}
+Release:   28%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -92,6 +92,7 @@
 %patch8 -p1 -b .8-hotkey
 %patch9 -p0 -b .9-icon-size
 %patch10 -p1 -b .10-singlets
+%patch11 -p1 -b .11-systray
 
 %if %{snapshot}
 ./bootstrap
@@ -215,6 +216,9 @@
 
 
 %changelog
+* Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-28
+- changed scim.spec file
+
 * Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-27
 - fixed the patch for bug 199187 with new scim_panel_gtk-systray-click-199187.patch
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:28:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:28:10 -0400
Subject: rpms/scim/devel scim.spec,1.54,1.55
Message-ID: <200607271828.k6RISA6S029219@cvs.devel.redhat.com>

Author: qwang

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29180

Modified Files:
	scim.spec 
Log Message:



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- scim.spec	27 Jul 2006 18:24:10 -0000	1.54
+++ scim.spec	27 Jul 2006 18:28:08 -0000	1.55
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   28%{?dist}
+Release:   29%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -38,7 +38,7 @@
 Patch8:    initial-locale-hotkey-186861.patch
 Patch9:    scim_panel_gtk-icon-size-fixes.patch
 Patch10:   scim_panel_gtk-menu-recently-used-factories.patch
-Patch11:   scim_panel_gtk-menu-systray-click-199187.patch
+Patch11:   scim_panel_gtk-systray-click-199187.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -216,10 +216,7 @@
 
 
 %changelog
-* Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-28
-- changed scim.spec file
-
-* Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-27
+* Fri Jul 28 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-29
 - fixed the patch for bug 199187 with new scim_panel_gtk-systray-click-199187.patch
 
 * Thu Jul 27 2006 Qingyu Wang <qwang at redhat.com> - 1.4.4-26



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:39:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:39:58 -0400
Subject: rpms/firefox/devel firefox.spec,1.130,1.131
Message-ID: <200607271839.k6RIdwdI005480@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2702

Modified Files:
	firefox.spec 
Log Message:
* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-3
- Don't strip provides when building the devel package



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- firefox.spec	27 Jul 2006 17:13:32 -0000	1.130
+++ firefox.spec	27 Jul 2006 18:39:56 -0000	1.131
@@ -4,13 +4,14 @@
 %define nss_version 3.10
 %define cairo_version 0.5
 %define builddir %{_builddir}/mozilla
+%define build_devel_package 1
 
 %define official_branding 1
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        2
+Release:        3
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -85,14 +86,17 @@
 Provides:       webclient
 %define ffdir %{_libdir}/firefox-%{version}
 
+%if %{build_devel_package}
 AutoProv: 0
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}
+%endif
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
 
+%if %{build_devel_package}
 %package devel
 Summary: Development files for Firefox
 Group: Development/Libraries
@@ -105,7 +109,7 @@
 Development files for Firefox.  This package exists temporarily.
 When xulrunner has reached version 1.0, firefox-devel will be
 removed in favor of xulrunner-devel.
-
+%endif
 
 #---------------------------------------------------------------------
 
@@ -249,6 +253,7 @@
 %{__rm} -rf firefox-langpacks
 
 # Prepare our devel package
+%if %{build_devel_package}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
 %{__cp} -r dist/include/* \
@@ -260,6 +265,7 @@
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
   $RPM_BUILD_ROOT/%{ffdir}
+%endif
 
 # ghost files
 touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
@@ -323,6 +329,7 @@
 %{ffdir}/updater*
 %{ffdir}/removed-files
 
+%if %{build_devel_package}
 %files devel
 %defattr(-,root,root)
 %{_datadir}/idl/firefox-%{version}
@@ -332,10 +339,14 @@
 %{ffdir}/xpidl
 %{ffdir}/xpt_dump
 %{ffdir}/xpt_link
+%endif
 
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-3
+- Don't strip provides when building the devel package
+
 * Wed Jul 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
 - Update to 1.5.0.5
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:40:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:40:14 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2463,1.2464
Message-ID: <200607271840.k6RIeEo3007365@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2243

Modified Files:
	kernel-2.6.spec 
Log Message:
Xen, I hate you. Really.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2463
retrieving revision 1.2464
diff -u -r1.2463 -r1.2464
--- kernel-2.6.spec	27 Jul 2006 17:48:23 -0000	1.2463
+++ kernel-2.6.spec	27 Jul 2006 18:40:02 -0000	1.2464
@@ -1261,6 +1261,7 @@
 
 	# Temporary fix for upstream "make prepare" bug.
 	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+	/bin/ls
 	make prepare
 	popd > /dev/null
 }



From fedora-cvs-commits at redhat.com  Thu Jul 27 18:51:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 14:51:22 -0400
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.212,
	1.213 policycoreutils.spec, 1.294, 1.295
Message-ID: <200607271851.k6RIpMI9026220@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26186

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Jul 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-7
- Change newrole to exec a login shell to prevent suspend.


policycoreutils-rhat.patch:
 newrole/newrole.c         |    8 
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |  496 ++++++++++++++++---------------
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  142 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.8 |    4 
 restorecond/restorecond.c |   27 +
 75 files changed, 5175 insertions(+), 4820 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- policycoreutils-rhat.patch	18 Jul 2006 15:10:35 -0000	1.212
+++ policycoreutils-rhat.patch	27 Jul 2006 18:51:20 -0000	1.213
@@ -1,6 +1,38 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.17/newrole/newrole.c
+--- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
++++ policycoreutils-1.30.17/newrole/newrole.c	2006-07-27 14:47:40.000000000 -0400
+@@ -47,6 +47,7 @@
+  *
+  *************************************************************************/
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>		/* for malloc(), realloc(), free() */
+ #include <pwd.h>		/* for getpwuid() */
+@@ -855,7 +856,10 @@
+ 
+ 	if (optind < 1)
+ 		optind = 1;
+-	argv[optind - 1] = pw->pw_shell;
++	if (asprintf(&argv[optind - 1], "-%s", pw->pw_shell) < 0) {
++		fprintf(stderr, _("Error allocating shell.\n"));
++	}
++
+ #ifdef CANTSPELLGDB
+ 	{
+ 		int i;
+@@ -897,7 +901,7 @@
+ 	}
+ #endif
+ 	freecon(old_context);
+-	execv(argv[optind - 1], argv + optind - 1);
++	execv(pw->pw_shell, argv + optind - 1);
+ 
+ 	/* If we reach here, then we failed to exec the new shell. */
+ 	perror(_("failed to exec shell\n"));
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.17/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/af.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/af.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -311,7 +343,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.17/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/am.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/am.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -622,7 +654,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.30.17/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ar.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ar.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -933,7 +965,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.30.17/po/be.po
 --- nsapolicycoreutils/po/be.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/be.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/be.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1244,7 +1276,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.30.17/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2006-07-03 07:52:46.000000000 -0400
-+++ policycoreutils-1.30.17/po/bg.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/bg.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -1555,7 +1587,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.17/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/bn_IN.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/bn_IN.po	2006-07-27 14:45:27.000000000 -0400
 @@ -35,7 +35,7 @@
  msgstr ""
  "Project-Id-Version: bn_IN\n"
@@ -1870,7 +1902,7 @@
  msgstr "????????????????????? ???????????? ?????????????????????\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.30.17/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/bn.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/bn.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2181,7 +2213,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.17/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ca.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ca.po	2006-07-27 14:45:27.000000000 -0400
 @@ -21,7 +21,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -2492,7 +2524,7 @@
  msgstr "ha fallat l'autenticaci??.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.30.17/po/cs.po
 --- nsapolicycoreutils/po/cs.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/cs.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/cs.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -2803,7 +2835,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.30.17/po/cy.po
 --- nsapolicycoreutils/po/cy.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/cy.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/cy.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -3114,7 +3146,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.30.17/po/da.po
 --- nsapolicycoreutils/po/da.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/da.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/da.po	2006-07-27 14:45:27.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -3416,7 +3448,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.30.17/po/de.po
 --- nsapolicycoreutils/po/de.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/de.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/de.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,55 +1,59 @@
  # German translation of policycoreutils.
  # Copyright (C) 2006 Free Software Foundation, Inc.
@@ -4810,7 +4842,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.30.17/po/el.po
 --- nsapolicycoreutils/po/el.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/el.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/el.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,56 +1,71 @@
 -# SOME DESCRIPTIVE TITLE.
 +# translation of el.po to Greek
@@ -6093,7 +6125,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.30.17/po/en_GB.po
 --- nsapolicycoreutils/po/en_GB.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/en_GB.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/en_GB.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -6404,7 +6436,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.30.17/po/es.po
 --- nsapolicycoreutils/po/es.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/es.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/es.po	2006-07-27 14:45:27.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: \n"
@@ -6718,7 +6750,7 @@
  msgstr "fall? la autenticaci?n.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/et.po policycoreutils-1.30.17/po/et.po
 --- nsapolicycoreutils/po/et.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/et.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/et.po	2006-07-27 14:45:27.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -7020,7 +7052,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/eu_ES.po policycoreutils-1.30.17/po/eu_ES.po
 --- nsapolicycoreutils/po/eu_ES.po	2006-07-03 07:52:46.000000000 -0400
-+++ policycoreutils-1.30.17/po/eu_ES.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/eu_ES.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7331,7 +7363,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fa.po policycoreutils-1.30.17/po/fa.po
 --- nsapolicycoreutils/po/fa.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fa.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/fa.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7642,7 +7674,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fi.po policycoreutils-1.30.17/po/fi.po
 --- nsapolicycoreutils/po/fi.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fi.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/fi.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -7953,7 +7985,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.17/po/fr.po
 --- nsapolicycoreutils/po/fr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/fr.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/fr.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,418 +1,439 @@
 +# translation of Policy Core Utils.
 +# Copyright (C) 2006 Free Software Foundation, Inc.
@@ -9155,7 +9187,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gl.po policycoreutils-1.30.17/po/gl.po
 --- nsapolicycoreutils/po/gl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/gl.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/gl.po	2006-07-27 14:45:27.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -9457,7 +9489,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gu.po policycoreutils-1.30.17/po/gu.po
 --- nsapolicycoreutils/po/gu.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/gu.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/gu.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: gu\n"
@@ -9768,7 +9800,7 @@
  msgstr "?????????????????????????????? ??????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/he.po policycoreutils-1.30.17/po/he.po
 --- nsapolicycoreutils/po/he.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/he.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/he.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -10079,7 +10111,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.17/po/hi.po
 --- nsapolicycoreutils/po/hi.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/hi.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/hi.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: hi\n"
@@ -10405,7 +10437,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils-1.30.17/po/hr.po
 --- nsapolicycoreutils/po/hr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/hr.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/hr.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -10720,7 +10752,7 @@
  msgstr "Provjere autenti??nosti nije uspjela.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils-1.30.17/po/hu.po
 --- nsapolicycoreutils/po/hu.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/hu.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/hu.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -11031,7 +11063,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hy.po policycoreutils-1.30.17/po/hy.po
 --- nsapolicycoreutils/po/hy.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/hy.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/hy.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -11342,7 +11374,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/id.po policycoreutils-1.30.17/po/id.po
 --- nsapolicycoreutils/po/id.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/id.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/id.po	2006-07-27 14:45:27.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -11644,7 +11676,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/is.po policycoreutils-1.30.17/po/is.po
 --- nsapolicycoreutils/po/is.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/is.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/is.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -11955,7 +11987,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/it.po policycoreutils-1.30.17/po/it.po
 --- nsapolicycoreutils/po/it.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/it.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/it.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: it\n"
@@ -12269,7 +12301,7 @@
  msgstr "autenticazione fallita.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ja.po policycoreutils-1.30.17/po/ja.po
 --- nsapolicycoreutils/po/ja.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ja.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ja.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -12580,7 +12612,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ka.po policycoreutils-1.30.17/po/ka.po
 --- nsapolicycoreutils/po/ka.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ka.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ka.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -12891,7 +12923,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/kn.po policycoreutils-1.30.17/po/kn.po
 --- nsapolicycoreutils/po/kn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/kn.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/kn.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -13202,7 +13234,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ko.po policycoreutils-1.30.17/po/ko.po
 --- nsapolicycoreutils/po/ko.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ko.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ko.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,4 +1,5 @@
 -# translation of ko.po to 
 +# translation of ko.po to Korean
@@ -14201,7 +14233,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ku.po policycoreutils-1.30.17/po/ku.po
 --- nsapolicycoreutils/po/ku.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ku.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ku.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -14512,7 +14544,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lo.po policycoreutils-1.30.17/po/lo.po
 --- nsapolicycoreutils/po/lo.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/lo.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/lo.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -14823,7 +14855,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lt.po policycoreutils-1.30.17/po/lt.po
 --- nsapolicycoreutils/po/lt.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/lt.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/lt.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -15134,7 +15166,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lv.po policycoreutils-1.30.17/po/lv.po
 --- nsapolicycoreutils/po/lv.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/lv.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/lv.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -15445,7 +15477,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mk.po policycoreutils-1.30.17/po/mk.po
 --- nsapolicycoreutils/po/mk.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/mk.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/mk.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -15756,7 +15788,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ml.po policycoreutils-1.30.17/po/ml.po
 --- nsapolicycoreutils/po/ml.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ml.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ml.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,11 @@
  msgstr ""
  "Project-Id-Version: ml\n"
@@ -16146,7 +16178,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.17/po/mr.po
 --- nsapolicycoreutils/po/mr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/mr.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/mr.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: mr\n"
@@ -16514,7 +16546,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.17/po/ms.po
 --- nsapolicycoreutils/po/ms.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ms.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ms.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,8 +7,8 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -17359,7 +17391,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/my.po policycoreutils-1.30.17/po/my.po
 --- nsapolicycoreutils/po/my.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/my.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/my.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -17670,7 +17702,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nb.po policycoreutils-1.30.17/po/nb.po
 --- nsapolicycoreutils/po/nb.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/nb.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/nb.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -17981,7 +18013,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nl.po policycoreutils-1.30.17/po/nl.po
 --- nsapolicycoreutils/po/nl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/nl.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/nl.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,230 +1,250 @@
 +# translation of policycoreutils to Dutch
 +# This file is distributed under the same license as the policycoreutils package.
@@ -19182,7 +19214,7 @@
 +msgstr "Fout in opties: %s "
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nn.po policycoreutils-1.30.17/po/nn.po
 --- nsapolicycoreutils/po/nn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/nn.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/nn.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -19493,7 +19525,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/no.po policycoreutils-1.30.17/po/no.po
 --- nsapolicycoreutils/po/no.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/no.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/no.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -19804,7 +19836,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nso.po policycoreutils-1.30.17/po/nso.po
 --- nsapolicycoreutils/po/nso.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/nso.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/nso.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -20115,7 +20147,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/or.po policycoreutils-1.30.17/po/or.po
 --- nsapolicycoreutils/po/or.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/or.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/or.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: or\n"
@@ -20426,7 +20458,7 @@
  msgstr "????????????????????? ???????????? ????????? ????????? \n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pa.po policycoreutils-1.30.17/po/pa.po
 --- nsapolicycoreutils/po/pa.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/pa.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/pa.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -20737,7 +20769,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pl.po policycoreutils-1.30.17/po/pl.po
 --- nsapolicycoreutils/po/pl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/pl.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/pl.po	2006-07-27 14:45:27.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: pl\n"
@@ -21054,7 +21086,7 @@
  msgstr "uwierzytelnianie nie powiod??o si??.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt_BR.po policycoreutils-1.30.17/po/pt_BR.po
 --- nsapolicycoreutils/po/pt_BR.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/pt_BR.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/pt_BR.po	2006-07-27 14:45:27.000000000 -0400
 @@ -4,7 +4,7 @@
  msgstr ""
  "Project-Id-Version: pt_BR\n"
@@ -21365,7 +21397,7 @@
  msgstr "autentica????o falhou.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt.po policycoreutils-1.30.17/po/pt.po
 --- nsapolicycoreutils/po/pt.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/pt.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/pt.po	2006-07-27 14:45:27.000000000 -0400
 @@ -2,7 +2,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -21683,7 +21715,7 @@
  msgstr "a autentica????o falhou.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-1.30.17/po/ro.po
 --- nsapolicycoreutils/po/ro.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ro.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ro.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -21994,7 +22026,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-1.30.17/po/ru.po
 --- nsapolicycoreutils/po/ru.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ru.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ru.po	2006-07-27 14:45:27.000000000 -0400
 @@ -5,7 +5,7 @@
  msgstr ""
  "Project-Id-Version: ru\n"
@@ -22306,7 +22338,7 @@
  msgstr "???????? ???????????????? ??????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.30.17/po/si.po
 --- nsapolicycoreutils/po/si.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/si.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/si.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -22617,7 +22649,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.30.17/po/sk.po
 --- nsapolicycoreutils/po/sk.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sk.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sk.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -22928,7 +22960,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.30.17/po/sl.po
 --- nsapolicycoreutils/po/sl.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sl.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sl.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -23239,7 +23271,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.30.17/po/sq.po
 --- nsapolicycoreutils/po/sq.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sq.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sq.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -23550,7 +23582,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.30.17/po/sr at Latn.po
 --- nsapolicycoreutils/po/sr at Latn.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sr at Latn.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sr at Latn.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -23863,7 +23895,7 @@
  msgstr "neuspela autentifikacija.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.30.17/po/sr.po
 --- nsapolicycoreutils/po/sr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sr.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sr.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
@@ -24176,7 +24208,7 @@
  msgstr "???????????????? ??????????????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.17/po/sv.po
 --- nsapolicycoreutils/po/sv.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/sv.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/sv.po	2006-07-27 14:45:27.000000000 -0400
 @@ -3,7 +3,7 @@
  msgid "usage:  %s [-bq]\n"
  msgstr ""
@@ -24478,7 +24510,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.17/po/ta.po
 --- nsapolicycoreutils/po/ta.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ta.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ta.po	2006-07-27 14:45:27.000000000 -0400
 @@ -7,7 +7,7 @@
  msgstr ""
  "Project-Id-Version: ta\n"
@@ -24789,7 +24821,7 @@
  msgstr "???????????????????????????????????????????????????????????????.\n"
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.30.17/po/te.po
 --- nsapolicycoreutils/po/te.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/te.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/te.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25100,7 +25132,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.30.17/po/th.po
 --- nsapolicycoreutils/po/th.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/th.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/th.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25411,7 +25443,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.30.17/po/tr.po
 --- nsapolicycoreutils/po/tr.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/tr.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/tr.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -25722,7 +25754,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.30.17/po/uk.po
 --- nsapolicycoreutils/po/uk.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/uk.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/uk.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -26033,7 +26065,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.30.17/po/ur.po
 --- nsapolicycoreutils/po/ur.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/ur.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/ur.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -26344,7 +26376,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.30.17/po/vi.po
 --- nsapolicycoreutils/po/vi.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/vi.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/vi.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -26655,7 +26687,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.30.17/po/zh_CN.po
 --- nsapolicycoreutils/po/zh_CN.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zh_CN.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/zh_CN.po	2006-07-27 14:45:27.000000000 -0400
 @@ -4,6 +4,7 @@
  # translation of zh_CN.po to
  # translation of zh_CN.po to
@@ -27553,7 +27585,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.17/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zh_TW.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/zh_TW.po	2006-07-27 14:45:27.000000000 -0400
 @@ -1,246 +1,246 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -27902,7 +27934,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.17/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2006-07-03 07:52:45.000000000 -0400
-+++ policycoreutils-1.30.17/po/zu.po	2006-07-17 09:10:10.000000000 -0400
++++ policycoreutils-1.30.17/po/zu.po	2006-07-27 14:45:27.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -28213,7 +28245,7 @@
  msgstr ""
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.17/restorecond/restorecond.8
 --- nsapolicycoreutils/restorecond/restorecond.8	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.8	2006-07-18 11:11:31.000000000 -0400
++++ policycoreutils-1.30.17/restorecond/restorecond.8	2006-07-27 14:45:27.000000000 -0400
 @@ -11,7 +11,7 @@
  .BR restorecond
  program.
@@ -28234,7 +28266,7 @@
  .BR restorecon (8),
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-07-03 07:52:43.000000000 -0400
-+++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-17 09:37:26.000000000 -0400
++++ policycoreutils-1.30.17/restorecond/restorecond.c	2006-07-27 14:45:27.000000000 -0400
 @@ -30,9 +30,10 @@
   * and makes sure that there security context matches the systems defaults
   *
@@ -28276,7 +28308,23 @@
  	exit(0);
  }
  
-@@ -449,22 +452,25 @@
+@@ -433,9 +436,14 @@
+ 	/* Make sure we are root */
+ 	if (getuid() != 0) {
+ 		fprintf(stderr, "You must be root to run this program.\n");
+-		return 4;
++		return 1;
+ 	}
+ #endif
++	/* Make sure we are root */
++	if (is_selinux_enabled() != 1) {
++		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
++		return 2;
++	}
+ 
+ 	/* Register sighandlers */
+ 	sa.sa_flags = 0;
+@@ -449,22 +457,25 @@
  	if (master_fd < 0)
  		exitApp("inotify_init");
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- policycoreutils.spec	18 Jul 2006 15:10:36 -0000	1.294
+++ policycoreutils.spec	27 Jul 2006 18:51:20 -0000	1.295
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 5
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -122,6 +122,12 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Thu Jul 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-7
+- Change newrole to exec a login shell to prevent suspend.
+
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-6
+- Report error when selinux not enabled in restorecond
+
 * Tue Jul 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-5
 - Fix handling of restorecond
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 19:23:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 15:23:46 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.150,
	1.151
Message-ID: <200607271923.k6RJNklG018436@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18360

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Fix bootstrap handling.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- java-1.4.2-gcj-compat.spec	27 Jul 2006 15:54:22 -0000	1.150
+++ java-1.4.2-gcj-compat.spec	27 Jul 2006 19:23:43 -0000	1.151
@@ -180,7 +180,9 @@
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
 %if %{bootstrap}
-  CLASSPATH=%{SOURCE2} sh -x ../../ecj `find . -type f -name "*.java"`
+  cp -a %{SOURCE2} eclipse-ecj.jar
+  sed 's:@JAVADIR@:.:g' < %{SOURCE3} > ecj-bootstrap
+  sh -x ecj-bootstrap `find . -type f -name "*.java"`
 %else
   ecj `find . -type f -name "*.java"`
 %endif



From fedora-cvs-commits at redhat.com  Thu Jul 27 19:46:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 15:46:39 -0400
Subject: rpms/firefox/devel firefox.spec,1.131,1.132
Message-ID: <200607271946.k6RJkdKL002242@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1948

Modified Files:
	firefox.spec 
Log Message:
oops, reversed logic for stripping provides


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- firefox.spec	27 Jul 2006 18:39:56 -0000	1.131
+++ firefox.spec	27 Jul 2006 19:46:37 -0000	1.132
@@ -86,7 +86,7 @@
 Provides:       webclient
 %define ffdir %{_libdir}/firefox-%{version}
 
-%if %{build_devel_package}
+%if ! %{build_devel_package}
 AutoProv: 0
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}



From fedora-cvs-commits at redhat.com  Thu Jul 27 20:05:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 16:05:12 -0400
Subject: rpms/f-spot/devel f-spot.spec,1.24,1.25
Message-ID: <200607272005.k6RK5Cj8013730@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13689

Modified Files:
	f-spot.spec 
Log Message:
fix build reqs



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- f-spot.spec	12 Jul 2006 05:52:18 -0000	1.24
+++ f-spot.spec	27 Jul 2006 20:05:10 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.11
-Release:        3.1
+Release:        4
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -10,10 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
-BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 dbus-sharp
+BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 
 BuildRequires:  gtk-sharp2 >= 2.7 libgnome-devel libgnomeui-devel
 BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 BuildRequires:  gettext
+BuildRequires:  dbus-sharp-devel
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 
@@ -68,7 +69,10 @@
 %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.1.11-4
+- Fix dbus-sharp BR
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.1.11-3.1
 - rebuild
 
 * Sun Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.1.11-3



From fedora-cvs-commits at redhat.com  Thu Jul 27 20:12:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 16:12:54 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.38,
	1.39
Message-ID: <200607272012.k6RKCsKe015869@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15826

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 7.1-5.fc6
- Don't install LBX protocol headers, as LBX is obsoleted in the 7.1 release
  and no longer supported.



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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-proto-devel.spec	21 Jul 2006 19:09:10 -0000	1.38
+++ xorg-x11-proto-devel.spec	27 Jul 2006 20:12:52 -0000	1.39
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -150,7 +150,9 @@
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
+%if 0
 %{_includedir}/X11/extensions/XLbx.h
+%endif
 %{_includedir}/X11/extensions/XResproto.h
 %{_includedir}/X11/extensions/XShm.h
 %{_includedir}/X11/extensions/XTest.h
@@ -181,6 +183,7 @@
 %{_includedir}/X11/extensions/fontcache.h
 %{_includedir}/X11/extensions/fontcacheP.h
 %{_includedir}/X11/extensions/fontcachstr.h
+%if 0
 %{_includedir}/X11/extensions/lbxbuf.h
 %{_includedir}/X11/extensions/lbxbufstr.h
 %{_includedir}/X11/extensions/lbxdeltastr.h
@@ -188,6 +191,7 @@
 %{_includedir}/X11/extensions/lbxopts.h
 %{_includedir}/X11/extensions/lbxstr.h
 %{_includedir}/X11/extensions/lbxzlib.h
+%endif
 %{_includedir}/X11/extensions/mitmiscstr.h
 %{_includedir}/X11/extensions/multibuf.h
 %{_includedir}/X11/extensions/multibufst.h
@@ -275,6 +279,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 7.1-5.fc6
+- Don't install LBX protocol headers, as LBX is obsoleted in the 7.1 release
+  and no longer supported.
+
 * Fri Jul 21 2006 Adam Jackson <ajackson at redhat.com> 7.1-4
 - Use dist tag.  Update to kbproto-1.0.3.
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 20:23:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 16:23:07 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2464,1.2465
Message-ID: <200607272023.k6RKN7pR002230@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2138

Modified Files:
	kernel-2.6.spec 
Log Message:
enable the ppc64iseries kdump kernel




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2464
retrieving revision 1.2465
diff -u -r1.2464 -r1.2465
--- kernel-2.6.spec	27 Jul 2006 18:40:02 -0000	1.2464
+++ kernel-2.6.spec	27 Jul 2006 20:23:04 -0000	1.2465
@@ -71,7 +71,7 @@
 %endif
 
 
-%ifarch ppc64
+%ifarch ppc64 ppc64iseries
 %define buildkdump 1
 %endif
 
@@ -253,6 +253,7 @@
 Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
 Source36: kernel-%{kversion}-ia64-xen.config
+Source37: kernel-%{kversion}-ppc64iseries-kdump.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -1661,6 +1662,9 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Don Zickus <dzickus at redhat.com>
+- Enable kdump on ppc64iseries.  yeah more rpms..
+
 * Thu Jul 27 2006 Dave Jones <davej at redhat.com>
 - Add missing export for ia64 (#200396)
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 20:34:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 16:34:01 -0400
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.39,
	1.40
Message-ID: <200607272034.k6RKY1cK005284@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5248

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
remove lbx headers which are unused now


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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-proto-devel.spec	27 Jul 2006 20:12:52 -0000	1.39
+++ xorg-x11-proto-devel.spec	27 Jul 2006 20:33:49 -0000	1.40
@@ -91,6 +91,10 @@
 	popd
 done
 
+# NOTE: LBX has been discontinued upstream, however xextproto still installs
+# the headers for it.  Probably an upstream oversight, so we remove them here.
+rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/{XLbx,lbx}*.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 20:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 16:57:02 -0400
Subject: rpms/audit/devel audit-setroubleshoot.patch, 1.3, 1.4 audit.spec,
	1.102, 1.103
Message-ID: <200607272057.k6RKv24V004490@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4475

Modified Files:
	audit-setroubleshoot.patch audit.spec 
Log Message:
Update to fix 64 bit platform

audit-setroubleshoot.patch:
 AuditMsg.py |   63 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 audispd     |   46 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 86 insertions(+), 23 deletions(-)

Index: audit-setroubleshoot.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-setroubleshoot.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- audit-setroubleshoot.patch	21 Jul 2006 13:27:22 -0000	1.3
+++ audit-setroubleshoot.patch	27 Jul 2006 20:56:59 -0000	1.4
@@ -1,6 +1,6 @@
 --- audit-1.2.5/audisp/audispd.setroubleshoot	2006-07-13 13:37:04.000000000 -0400
-+++ audit-1.2.5/audisp/audispd	2006-07-21 09:18:48.000000000 -0400
-@@ -1,9 +1,9 @@
++++ audit-1.2.5/audisp/audispd	2006-07-27 16:56:12.000000000 -0400
+@@ -1,22 +1,25 @@
  #! /usr/bin/env python
  import os, string, select, syslog
 -import audit, avc, traceback
@@ -8,11 +8,19 @@
  import AuditMsg
  import subprocess, signal
 -PLUGIN_DIRS = ['/etc/audisp.d', "/usr/lib/audit", "/usr/lib32/audit"]
-+PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib32/audit"]
++PLUGIN_DIRS = ["/usr/lib/audit", "/usr/lib64/audit"]
  import glob
  
  HUP=False
-@@ -15,8 +15,7 @@
+ def huphandler(signum, frame):
+     global HUP
+     HUP=True
++
++def childhandler(signum, frame):
++    syslog.syslog("Child Died %d %d " % os.wait() )
++    return
+     
+ class Plugin:
      def __init__(self, cmd):
          self.cmd = cmd
          self.sub_process = None
@@ -22,7 +30,7 @@
      def run(self):
          self.sub_process = subprocess.Popen(self.cmd, \
              stdin=subprocess.PIPE, stdout=None, stderr=None, \
-@@ -27,6 +26,19 @@
+@@ -27,6 +30,19 @@
      def stop(self):
          self.stdin.close()
  
@@ -42,7 +50,7 @@
  class audit_dispatcher:
      def __init__(self):
          self.data = []
-@@ -50,6 +62,8 @@
+@@ -50,6 +66,8 @@
                      self.plugins.append(p)
                  except OSError, e:
                      syslog.syslog("plugin %s failed to start: %s" % (plugin, e))
@@ -51,7 +59,7 @@
  
          for p in self.plugins:
              if p.cmd not in new_plugins:
-@@ -68,9 +82,14 @@
+@@ -68,9 +86,14 @@
      def process(self):
          if len(self.data) > 0:
              msg=self.data.pop(0)
@@ -69,7 +77,7 @@
              return 0
          else:
              return 500
-@@ -86,6 +105,7 @@
+@@ -86,6 +109,7 @@
                      if not msg.read_from_fd(0):
                          syslog.syslog("Connection closing")
                          return
@@ -77,7 +85,7 @@
                      self.add(msg)
                      sleep=0
                  else:
-@@ -98,11 +118,11 @@
+@@ -98,22 +122,24 @@
                          self.load_plugins()
                          HUP=False
                  else:
@@ -91,7 +99,11 @@
                  syslog.syslog(traceback.format_exc())
  
  try:
-@@ -113,7 +133,8 @@
+     syslog.openlog("audispd")
+     syslog.syslog("starting audispd")
+     signal.signal(signal.SIGHUP, huphandler)
++    signal.signal(signal.SIGCHLD, childhandler)
+     dispatcher=audit_dispatcher()
      dispatcher.run()
  
  except IOError,e:


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- audit.spec	21 Jul 2006 13:27:22 -0000	1.102
+++ audit.spec	27 Jul 2006 20:56:59 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.5
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -68,7 +68,7 @@
 mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,rc.d/init.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
-mkdir -p $RPM_BUILD_ROOT/usr/{lib,lib32}/audit
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -161,13 +161,16 @@
 %attr(755,root,root) /etc/rc.d/init.d/auditd
 %attr(750,root,root) %{_var}/log/audit
 %attr(750,root,root) %dir /etc/audit
-%attr(750,root,root) %dir /usr/lib/audit
-%attr(750,root,root) %dir /usr/lib32/audit
+%attr(750,root,root) %dir %{_libdir}/audit
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
+- Fix dispatcher to handle sigchld
+- Fix library location for 64 bit
+
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
 - Eliminate avc package from audisp
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:21:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:21:23 -0400
Subject: rpms/pirut/devel .cvsignore, 1.28, 1.29 pirut.spec, 1.29,
	1.30 sources, 1.29, 1.30
Message-ID: <200607272121.k6RLLNik001528@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1485/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.7-1 on branch devel from pirut-1.1.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	12 Jul 2006 19:07:52 -0000	1.28
+++ .cvsignore	27 Jul 2006 21:21:21 -0000	1.29
@@ -1 +1 @@
-pirut-1.1.6.tar.gz
+pirut-1.1.7.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pirut.spec	12 Jul 2006 19:07:52 -0000	1.29
+++ pirut.spec	27 Jul 2006 21:21:21 -0000	1.30
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.6
+Version: 1.1.7
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,11 @@
 
 
 %changelog
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 1.1.7-1
+- Handle uncategorized groups better, especially for cdinstall-helper
+- Fix missing comma in rebootpkgs list (lmacken)
+- Fix key import
+
 * Wed Jul 12 2006 Jeremy Katz <katzj at redhat.com> - 1.1.6-1
 - Port puplet to use GtkStatusIcon instead of EggTrayIcon
 - Fix some misc bugs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	12 Jul 2006 19:07:52 -0000	1.29
+++ sources	27 Jul 2006 21:21:21 -0000	1.30
@@ -1 +1 @@
-a4c59bb9cd4527f5af065b0792c62d42  pirut-1.1.6.tar.gz
+fc7e17223768a4e81dc7c30096a22eb6  pirut-1.1.7.tar.gz



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:23:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:23:20 -0400
Subject: rpms/xorg-x11-drv-ati/devel radeon.xinf, 1.2,
	1.3 xorg-x11-drv-ati.spec, 1.32, 1.33
Message-ID: <200607272123.k6RLNKQs002327@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2299

Modified Files:
	radeon.xinf xorg-x11-drv-ati.spec 
Log Message:
* Thu Jul 27 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-6.fc6
- Updated radeon.xinf: comments, a handful of new devices.



Index: radeon.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- radeon.xinf	5 Feb 2006 17:05:09 -0000	1.2
+++ radeon.xinf	27 Jul 2006 21:23:18 -0000	1.3
@@ -1,173 +1,197 @@
-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
-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: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
-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: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
-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: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
+# Secret decoder ring:
+# R100: Original radeon through 7500 (rv200 counts as R100)
+# R200: 8500 through 9250
+# R300: 9500 through X600
+# R400: X700 through X850
+# R500: X1xxx
+#
+# TODO: add mobility series info
+#
+# There are lots of "secondary" PCI IDs for that other OS; we don't list
+# them here and the driver ignores them anyway.
+
+alias pcivideo:v00001002d00003150sv*sd*bc*sc*i* radeon # M24
+alias pcivideo:v00001002d00003151sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003152sv*sd*bc*sc*i* radeon # M22
+alias pcivideo:v00001002d00003153sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003154sv*sd*bc*sc*i* radeon # M24
+alias pcivideo:v00001002d00003156sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003E50sv*sd*bc*sc*i* radeon # rv380
+alias pcivideo:v00001002d00003E51sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003E52sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003E53sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00003E54sv*sd*bc*sc*i* radeon # rv380
+alias pcivideo:v00001002d00003E56sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00004136sv*sd*bc*sc*i* radeon # IGP 320M
+alias pcivideo:v00001002d00004137sv*sd*bc*sc*i* radeon # IGP 3[345]0
+alias pcivideo:v00001002d00004144sv*sd*bc*sc*i* radeon # R300 AD
+alias pcivideo:v00001002d00004145sv*sd*bc*sc*i* radeon # R300 AE
+alias pcivideo:v00001002d00004146sv*sd*bc*sc*i* radeon # R300 AF
+alias pcivideo:v00001002d00004147sv*sd*bc*sc*i* radeon # R300 AG
+alias pcivideo:v00001002d00004148sv*sd*bc*sc*i* radeon # R350 AH
+alias pcivideo:v00001002d00004149sv*sd*bc*sc*i* radeon # R350 AI
+alias pcivideo:v00001002d0000414Asv*sd*bc*sc*i* radeon # R350 AJ
+alias pcivideo:v00001002d0000414Bsv*sd*bc*sc*i* radeon # R350 AK
+alias pcivideo:v00001002d00004150sv*sd*bc*sc*i* radeon # RV350 AP
+alias pcivideo:v00001002d00004151sv*sd*bc*sc*i* radeon # RV350 AQ
+alias pcivideo:v00001002d00004152sv*sd*bc*sc*i* radeon # RV350 AR
+alias pcivideo:v00001002d00004153sv*sd*bc*sc*i* radeon # RV350 AS
+alias pcivideo:v00001002d00004154sv*sd*bc*sc*i* radeon # RV350 AT
+alias pcivideo:v00001002d00004155sv*sd*bc*sc*i* radeon # RV350 AU
+alias pcivideo:v00001002d00004156sv*sd*bc*sc*i* radeon # RV350 AV
+alias pcivideo:v00001002d00004157sv*sd*bc*sc*i* radeon # RV350 AW
+alias pcivideo:v00001002d00004237sv*sd*bc*sc*i* radeon # 7000 IGP
+alias pcivideo:v00001002d00004242sv*sd*bc*sc*i* radeon # R200 BB
+alias pcivideo:v00001002d00004243sv*sd*bc*sc*i* radeon # R200 DC
+alias pcivideo:v00001002d00004336sv*sd*bc*sc*i* radeon # Mobility U1
+alias pcivideo:v00001002d00004337sv*sd*bc*sc*i* radeon # IGP 3[345]0M
+alias pcivideo:v00001002d00004437sv*sd*bc*sc*i* radeon # Mobility 7000 IGP
+alias pcivideo:v00001002d00004964sv*sd*bc*sc*i* radeon # RV250 Id
+alias pcivideo:v00001002d00004965sv*sd*bc*sc*i* radeon # RV250 Ie
+alias pcivideo:v00001002d00004966sv*sd*bc*sc*i* radeon # RV250 If
+alias pcivideo:v00001002d00004967sv*sd*bc*sc*i* radeon # RV250 Ig
+alias pcivideo:v00001002d00004A48sv*sd*bc*sc*i* radeon # R420 JH
+alias pcivideo:v00001002d00004A49sv*sd*bc*sc*i* radeon # R420 JI
+alias pcivideo:v00001002d00004A4Asv*sd*bc*sc*i* radeon # R420 JJ
+alias pcivideo:v00001002d00004A4Bsv*sd*bc*sc*i* radeon # R420 JK
+alias pcivideo:v00001002d00004A4Csv*sd*bc*sc*i* radeon # R420 JL
+alias pcivideo:v00001002d00004A4Dsv*sd*bc*sc*i* radeon # R420 JM
+alias pcivideo:v00001002d00004A4Esv*sd*bc*sc*i* radeon # M18 JN
+alias pcivideo:v00001002d00004A50sv*sd*bc*sc*i* radeon # R420 JP
+alias pcivideo:v00001002d00004A54sv*sd*bc*sc*i* radeon # R420 JT
+alias pcivideo:v00001002d00004B49sv*sd*bc*sc*i* radeon # R480
+alias pcivideo:v00001002d00004B4Asv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00004B4Bsv*sd*bc*sc*i* radeon # R480
+alias pcivideo:v00001002d00004B4Csv*sd*bc*sc*i* radeon # R481
+alias pcivideo:v00001002d00004C57sv*sd*bc*sc*i* radeon # M7 LW
+alias pcivideo:v00001002d00004C58sv*sd*bc*sc*i* radeon # M7 LX
+alias pcivideo:v00001002d00004C59sv*sd*bc*sc*i* radeon # M6 LY
+alias pcivideo:v00001002d00004C5Asv*sd*bc*sc*i* radeon # M6 LZ
+alias pcivideo:v00001002d00004C64sv*sd*bc*sc*i* radeon # M9 Ld
+alias pcivideo:v00001002d00004C65sv*sd*bc*sc*i* radeon # M9 Le
+alias pcivideo:v00001002d00004C66sv*sd*bc*sc*i* radeon # R250 Lf
+alias pcivideo:v00001002d00004C67sv*sd*bc*sc*i* radeon # R250 Lg
+# alias pcivideo:v00001002d00004C6Esv*sd*bc*sc*i* radeon # secondary
+alias pcivideo:v00001002d00004E44sv*sd*bc*sc*i* radeon # R300 ND
+alias pcivideo:v00001002d00004E45sv*sd*bc*sc*i* radeon # R300 NE
+alias pcivideo:v00001002d00004E46sv*sd*bc*sc*i* radeon # RV350 NF
+alias pcivideo:v00001002d00004E47sv*sd*bc*sc*i* radeon # R300 NG
+alias pcivideo:v00001002d00004E48sv*sd*bc*sc*i* radeon # R350 NH
+alias pcivideo:v00001002d00004E49sv*sd*bc*sc*i* radeon # R350 NI
+alias pcivideo:v00001002d00004E4Asv*sd*bc*sc*i* radeon # RV350 NJ
+alias pcivideo:v00001002d00004E4Bsv*sd*bc*sc*i* radeon # R350 NK
+alias pcivideo:v00001002d00004E50sv*sd*bc*sc*i* radeon # RV350 NP
+alias pcivideo:v00001002d00004E51sv*sd*bc*sc*i* radeon # M10 NQ
+alias pcivideo:v00001002d00004E52sv*sd*bc*sc*i* radeon # RV350 NR
+alias pcivideo:v00001002d00004E53sv*sd*bc*sc*i* radeon # M10 NS
+alias pcivideo:v00001002d00004E54sv*sd*bc*sc*i* radeon # M10 NT
+alias pcivideo:v00001002d00004E56sv*sd*bc*sc*i* radeon # M10 NV
+# 4F72?  seems unlikely, in a secondary range.
+alias pcivideo:v00001002d00005144sv*sd*bc*sc*i* radeon # R100 QD
+alias pcivideo:v00001002d00005145sv*sd*bc*sc*i* radeon # R100 QE
+alias pcivideo:v00001002d00005146sv*sd*bc*sc*i* radeon # R100 QF
+alias pcivideo:v00001002d00005147sv*sd*bc*sc*i* radeon # R100 QG
+# old school method of doing magic names for subdevices
+# 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 # R200 QH
+alias pcivideo:v00001002d00005149sv*sd*bc*sc*i* radeon # R200 QI
+alias pcivideo:v00001002d0000514Asv*sd*bc*sc*i* radeon # R200 QJ
+alias pcivideo:v00001002d0000514Bsv*sd*bc*sc*i* radeon # R200 QK
+alias pcivideo:v00001002d0000514Csv*sd*bc*sc*i* radeon # R200 QL
+alias pcivideo:v00001002d0000514Dsv*sd*bc*sc*i* radeon # R200 QM
+alias pcivideo:v00001002d0000514Esv*sd*bc*sc*i* radeon # R200 QN
+alias pcivideo:v00001002d0000514Fsv*sd*bc*sc*i* radeon # R200 QO
+alias pcivideo:v00001002d00005154sv*sd*bc*sc*i* radeon # R200 QT
+alias pcivideo:v00001002d00005155sv*sd*bc*sc*i* radeon # R200 QU
+alias pcivideo:v00001002d00005157sv*sd*bc*sc*i* radeon # RV200 QW
+alias pcivideo:v00001002d00005158sv*sd*bc*sc*i* radeon # RV200 QX
+# alias pcivideo:v00001002d00005159sv00001002sd0000000Bbc*sc*i* radeon
+# alias pcivideo:v00001002d00005159sv00001002sd0000013Abc*sc*i* radeon
+alias pcivideo:v00001002d00005159sv*sd*bc*sc*i* radeon # RV200 QY
+alias pcivideo:v00001002d0000515Asv*sd*bc*sc*i* radeon # RV200 QZ
+alias pcivideo:v00001002d0000515Esv*sd*bc*sc*i* radeon # ES1000
+alias pcivideo:v00001002d0000515Fsv*sd*bc*sc*i* radeon # ES1000 (?)
+alias pcivideo:v00001002d00005168sv*sd*bc*sc*i* radeon # R200 Qh
+alias pcivideo:v00001002d00005169sv*sd*bc*sc*i* radeon # R200 Qi
+alias pcivideo:v00001002d0000516Asv*sd*bc*sc*i* radeon # R200 Qj
+alias pcivideo:v00001002d0000516Bsv*sd*bc*sc*i* radeon # R200 Qk
+alias pcivideo:v00001002d0000516Csv*sd*bc*sc*i* radeon # R200 Ql
+alias pcivideo:v00001002d00005460sv*sd*bc*sc*i* radeon # M22
+alias pcivideo:v00001002d00005461sv*sd*bc*sc*i* radeon # M24
+alias pcivideo:v00001002d00005462sv*sd*bc*sc*i* radeon # M22
+alias pcivideo:v00001002d00005463sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005464sv*sd*bc*sc*i* radeon # M22
+alias pcivideo:v00001002d00005465sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005466sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005467sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005548sv*sd*bc*sc*i* radeon # R423 UH
+alias pcivideo:v00001002d00005549sv*sd*bc*sc*i* radeon # R423 UI
+alias pcivideo:v00001002d0000554Asv*sd*bc*sc*i* radeon # R423 UJ
+alias pcivideo:v00001002d0000554Bsv*sd*bc*sc*i* radeon # R423 UK
+alias pcivideo:v00001002d0000554Csv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d0000554Dsv*sd*bc*sc*i* radeon # R430 UM
+alias pcivideo:v00001002d0000554Esv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d0000554Fsv*sd*bc*sc*i* radeon # R430 UO
+alias pcivideo:v00001002d00005550sv*sd*bc*sc*i* radeon # R423 UP
+alias pcivideo:v00001002d00005551sv*sd*bc*sc*i* radeon # R423 UQ
+alias pcivideo:v00001002d00005552sv*sd*bc*sc*i* radeon # R423 UR
+alias pcivideo:v00001002d00005554sv*sd*bc*sc*i* radeon # R423 UT
+alias pcivideo:v00001002d0000564Asv*sd*bc*sc*i* radeon # M26
+alias pcivideo:v00001002d0000564Bsv*sd*bc*sc*i* radeon # M26
+alias pcivideo:v00001002d0000564Fsv*sd*bc*sc*i* radeon # M26
+alias pcivideo:v00001002d00005652sv*sd*bc*sc*i* radeon # M26
+alias pcivideo:v00001002d00005653sv*sd*bc*sc*i* radeon # M26
+alias pcivideo:v00001002d00005834sv*sd*bc*sc*i* radeon # RS300M
+alias pcivideo:v00001002d00005835sv*sd*bc*sc*i* radeon # RS300M
+alias pcivideo:v00001002d00005836sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005837sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005944sv*sd*bc*sc*i* radeon # RV280
+alias pcivideo:v00001002d00005954sv*sd*bc*sc*i* radeon # RS480
+alias pcivideo:v00001002d00005955sv*sd*bc*sc*i* radeon # RS482
+alias pcivideo:v00001002d00005960sv*sd*bc*sc*i* radeon # RV280
+alias pcivideo:v00001002d00005961sv*sd*bc*sc*i* radeon # RV280
+alias pcivideo:v00001002d00005962sv*sd*bc*sc*i* radeon # RV280
+alias pcivideo:v00001002d00005964sv*sd*bc*sc*i* radeon # RV280
+alias pcivideo:v00001002d00005965sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005969sv*sd*bc*sc*i* radeon # ES1000
+alias pcivideo:v00001002d00005974sv*sd*bc*sc*i* radeon # RS482
+alias pcivideo:v00001002d00005975sv*sd*bc*sc*i* radeon # RS482
+alias pcivideo:v00001002d00005A41sv*sd*bc*sc*i* radeon # RS400
+alias pcivideo:v00001002d00005A42sv*sd*bc*sc*i* radeon # RS400
+alias pcivideo:v00001002d00005A61sv*sd*bc*sc*i* radeon # RC410
+alias pcivideo:v00001002d00005A62sv*sd*bc*sc*i* radeon # RC410
+alias pcivideo:v00001002d00005B60sv*sd*bc*sc*i* radeon # RV370
+alias pcivideo:v00001002d00005B61sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005B62sv*sd*bc*sc*i* radeon # RV380
+alias pcivideo:v00001002d00005B63sv*sd*bc*sc*i* radeon # RV370
+alias pcivideo:v00001002d00005B64sv*sd*bc*sc*i* radeon # RV370
+alias pcivideo:v00001002d00005B65sv*sd*bc*sc*i* radeon # RV370
+alias pcivideo:v00001002d00005B66sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005B67sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005B70sv*sd*bc*sc*i* radeon # RV370
+alias pcivideo:v00001002d00005B72sv*sd*bc*sc*i* radeon # RV380
+alias pcivideo:v00001002d00005C61sv*sd*bc*sc*i* radeon # M9+
+alias pcivideo:v00001002d00005C63sv*sd*bc*sc*i* radeon # M9+
+alias pcivideo:v00001002d00005D48sv*sd*bc*sc*i* radeon # M28
+alias pcivideo:v00001002d00005D49sv*sd*bc*sc*i* radeon # M28
+alias pcivideo:v00001002d00005D4Asv*sd*bc*sc*i* radeon # M28
+alias pcivideo:v00001002d00005D4Csv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005D4Dsv*sd*bc*sc*i* radeon # R480
+alias pcivideo:v00001002d00005D4Esv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005D4Fsv*sd*bc*sc*i* radeon # R480
+alias pcivideo:v00001002d00005D50sv*sd*bc*sc*i* radeon # XXX not in pci.ids
+alias pcivideo:v00001002d00005D52sv*sd*bc*sc*i* radeon # R480
+alias pcivideo:v00001002d00005D57sv*sd*bc*sc*i* radeon # R423
+alias pcivideo:v00001002d00005E48sv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005E49sv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005E4Asv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005E4Bsv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005E4Csv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005E4Dsv*sd*bc*sc*i* radeon # RV410
+alias pcivideo:v00001002d00005F57sv*sd*bc*sc*i* radeon # R423
+alias pcivideo:v00001002d00007834sv*sd*bc*sc*i* radeon # 9100 IGP
+alias pcivideo:v00001002d00007835sv*sd*bc*sc*i* radeon # 9200 IGP
+alias pcivideo:v00001002d00007C37sv*sd*bc*sc*i* radeon # RV350


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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-ati.spec	24 Jul 2006 08:58:57 -0000	1.32
+++ xorg-x11-drv-ati.spec	27 Jul 2006 21:23:18 -0000	1.33
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -90,7 +90,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Mon Jul 24 2006 Mike A. Harris <mharris@@redhat.com> 6.6.1-5.fc6
+* Thu Jul 27 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-6.fc6
+- Updated radeon.xinf: comments, a handful of new devices.
+
+* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 6.6.1-5.fc6
 - Added r128-missing-xf86ForceHWCursor-symbol-bug168753.patch to fix (#168753)
 - Add {?dist} tag to Release field
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:34:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:34:10 -0400
Subject: rpms/audit/devel audit.spec,1.103,1.104
Message-ID: <200607272134.k6RLYAXH005289@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5258

Modified Files:
	audit.spec 
Log Message:
* Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
- Fix dispatcher to handle sigchld
- Fix library location for 64 bit
- Add Prereq



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- audit.spec	27 Jul 2006 20:56:59 -0000	1.103
+++ audit.spec	27 Jul 2006 21:34:08 -0000	1.104
@@ -15,6 +15,7 @@
 BuildRequires: autoconf >= 2.59
 Requires: %{name}-libs = %{version}-%{release}
 Requires: chkconfig
+Prereq: coreutils
 
 %description
 The audit package contains the user space utilities for
@@ -170,6 +171,7 @@
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-5
 - Fix dispatcher to handle sigchld
 - Fix library location for 64 bit
+- Add Prereq
 
 * Fri Jul 21 2006 Dan Walsh <dwalsh at redhat.com> 1.2.5-4
 - Eliminate avc package from audisp



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:35:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:35:19 -0400
Subject: rpms/evolution/devel evolution.spec,1.168,1.169
Message-ID: <200607272135.k6RLZJJZ005590@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5505

Modified Files:
	evolution.spec 
Log Message:
- Add Requires for evolution-data-server >= 1.7.90
- Add BuildRequires for evolution-data-server-devel >= 1.7.90



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- evolution.spec	26 Jul 2006 15:56:25 -0000	1.168
+++ evolution.spec	27 Jul 2006 21:35:17 -0000	1.169
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.5.92
+%define eds_version 1.7.90
 %define use_mozilla_nss 1
 %define evo_major 2.8
 %define libbonoboui_version 2.4.2
@@ -48,7 +48,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -634,6 +634,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Jul 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-3
+- Add Requires for evolution-data-server >= 1.7.90
+- Add BuildRequires for evolution-data-server-devel >= 1.7.90
+
 * Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
 - Add patch for RH bug #178295.
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:43:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:43:44 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.2-PATH_MAX.patch, NONE,
	1.1 pegasus-2.5.2-cmpi-provider-lib.patch, NONE,
	1.1 pegasus-2.5.2-local-or-remote-auth.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 tog-pegasus.spec,
	1.40, 1.41
Message-ID: <200607272143.k6RLhihE008331@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8302

Modified Files:
	.cvsignore sources tog-pegasus.spec 
Added Files:
	pegasus-2.5.2-PATH_MAX.patch 
	pegasus-2.5.2-cmpi-provider-lib.patch 
	pegasus-2.5.2-local-or-remote-auth.patch 
Log Message:
upgrade to upstream version 2.5.2; fix bugs 198185, 200246

pegasus-2.5.2-PATH_MAX.patch:
 System.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pegasus-2.5.2-PATH_MAX.patch ---
--- pegasus/src/Pegasus/Common/System.cpp.PATH_MAX	2006-06-09 13:36:52.000000000 -0400
+++ pegasus/src/Pegasus/Common/System.cpp	2006-07-27 14:11:16.000000000 -0400
@@ -185,7 +185,7 @@
 char *System::extract_file_path(const char *fullpath, char *dirname)
 {
   char *p;
-  char buff[4096];
+  char buff[PATH_MAX];
   if (fullpath == NULL)
     {
       dirname[0] = '\0';

pegasus-2.5.2-cmpi-provider-lib.patch:
 FixedPropertyTableLinux.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pegasus-2.5.2-cmpi-provider-lib.patch ---
--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi-provider-lib	2006-06-13 14:00:13.000000000 -0400
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2006-07-27 14:01:23.000000000 -0400
@@ -65,7 +65,7 @@
     {"crlStore",             PEGASUS_SSL_SERVER_CRL},
 #endif
     {"repositoryDir",        PEGASUS_REPOSITORY_DIR},
-    {"providerDir",          PEGASUS_PROVIDER_LIB_DIR ":/usr/" PEGASUS_ARCH_LIB "/cmpi"},
+    {"providerDir",          PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"},
 #else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
     {"traceFilePath",       "/var/opt/tog-pegasus/cache/trace/cimserver.trc"},
 #if !defined(PEGASUS_USE_SYSLOGS)

pegasus-2.5.2-local-or-remote-auth.patch:
 Common/AuthenticationInfo.h                            |   16 ++
 Common/AuthenticationInfoRep.cpp                       |   12 +-
 Common/AuthenticationInfoRep.h                         |   11 +
 Common/HTTPConnection.cpp                              |   24 ++++
 Common/HTTPMessage.cpp                                 |    3 
 Common/HTTPMessage.h                                   |    3 
 Security/Authentication/BasicAuthenticationHandler.cpp |    2 
 Security/Authentication/BasicAuthenticator.h           |    3 
 Security/Authentication/PAMBasicAuthenticator.h        |   12 +-
 Security/Authentication/PAMBasicAuthenticatorStub.cpp  |    3 
 Security/Authentication/PAMBasicAuthenticatorUnix.cpp  |  100 ++++++++++++++---
 Server/HTTPAuthenticatorDelegator.cpp                  |    3 
 12 files changed, 165 insertions(+), 27 deletions(-)

--- NEW FILE pegasus-2.5.2-local-or-remote-auth.patch ---
--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth	2006-03-10 18:18:37.000000000 -0500
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -384,6 +384,9 @@
         }
     }
 
+    // Let Authenticators know whether this user is Local or Remote:
+    httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost );
+
     //
     // Handle authentication:
     //
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth	2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -48,6 +48,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>
@@ -131,7 +133,8 @@
 
 Boolean PAMBasicAuthenticator::authenticate(
     const String& userName, 
-    const String& password) 
+    const String& password,
+    Boolean isRemoteUser) 
 {
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "PAMBasicAuthenticator::authenticate()");
@@ -139,7 +142,7 @@
     Boolean authenticated;
 
 #if !defined(PEGASUS_USE_PAM_STANDALONE_PROC)
-        authenticated = _authenticateByPAM(userName, password);
+    authenticated = _authenticateByPAM(userName, password, isRemoteUser);
 #else
         //
         // Mutex to Serialize Authentication calls.
@@ -147,8 +150,9 @@
         Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
            "Authentication Mutex lock.");
         AutoMutex lock(_authSerializeMutex);
-        authenticated = _pamBasicAuthenticatorStandAlone.authenticate(
-            userName, password);
+        authenticated =
+                _pamBasicAuthenticatorStandAlone->authenticate(userName,
+                                                              password);
 #endif
 
     PEG_METHOD_EXIT();
@@ -157,7 +161,8 @@
 
 Boolean PAMBasicAuthenticator::_authenticateByPAM(
     const String& userName, 
-    const String& password) 
+    const String& password,
+    Boolean isRemoteUser) 
 {
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "PAMBasicAuthenticator::_authenticateByPAM()");
@@ -167,6 +172,7 @@
     pam_handle_t *phandle;
     char *name;
     APP_DATA mydata;
+    int retcode;
 
     //
     // Store the password for PAM authentication
@@ -180,13 +186,31 @@
 //    Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
 //       "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s",
 //       (const char *)userName.getCString(), (const char *)password.getCString());
+    
+    // NOTE: if any pam call should log anything, our syslog socket will be redirected
+    //       to the AUTH facility, so we need to redirect it back after each pam call.
 
     //
     //Call pam_start since you need to before making any other PAM calls
     //
-    if ( ( pam_start(service, 
+
+    if ( (retcode = pam_start(service, 
         (const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS ) 
     {
+	closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode));
+        PEG_METHOD_EXIT();
+        return (authenticated);
+    }
+   
+
+    if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS )
+    {
+	pam_end(phandle, 0);	
+	closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode));
         PEG_METHOD_EXIT();
         return (authenticated);
     }
@@ -194,7 +218,7 @@
     //
     //Call pam_authenticate to authenticate the user
     //
-    if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) 
+    if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) 
     {
        Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
          "pam_authenticate successful.");
@@ -203,22 +227,40 @@
         //checking for password and account expiration, as well as verifying access 
         //hour restrictions.
         //
-        if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) 
+
+        if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) 
         {
            Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4,
               "pam_acct_mgmt successful.");
             authenticated = true;
-        }
+        }else
+	{
+	    closelog();
+	    openlog("cimserver", LOG_PID, LOG_DAEMON);
+	    syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode));
+	}
+    }else
+    {
+        closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode));
     }
-
     //
     //Call pam_end to end our PAM work
     //
     pam_end(phandle, 0);
+    closelog();
+    openlog("cimserver", LOG_PID, LOG_DAEMON);
 
-    PEG_METHOD_EXIT();
+    if ( ! authenticated )
+	syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+	       isRemoteUser ? "remote" : "local",
+	       (const char*)userName.getCString()
+	      );
 
+    PEG_METHOD_EXIT();
     return (authenticated);
+
 }
 
 Boolean PAMBasicAuthenticator::validateUser(const String& userName)
@@ -233,6 +275,7 @@
     pam_handle_t *phandle;
     char *name;
     APP_DATA mydata;
+    int retcode;
 
     const char *service = "wbem";
     pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback;
@@ -241,21 +284,43 @@
     //
     // Call pam_start since you need to before making any other PAM calls
     //
-    if ( pam_start(service,
-     (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS)
-    {
+    if ( (retcode = 
+	  pam_start(service,(const char *)userName.getCString(), &pconv, &phandle) 
+	 ) != PAM_SUCCESS
+       )
+    {
+	closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode));
         PEG_METHOD_EXIT();
         return (authenticated);
     }
 
+    if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS )
+    {
+	pam_end(phandle, 0);
+	closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode));
+        PEG_METHOD_EXIT();
+        return (authenticated);
+    }
     //
     // Call pam_acct_mgmt, to check if the user account is valid. This includes
     // checking for account expiration, as well as verifying access
     // hour restrictions.
     //
-    if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS )
-    {
+    if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS )
+    {	
         authenticated = true;
+    }else
+    {
+	pam_end(phandle, 0);
+	closelog();
+	openlog("cimserver", LOG_PID, LOG_DAEMON);
+	syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode));
+        PEG_METHOD_EXIT();
+        return (authenticated);
     }
 
     //
@@ -263,6 +328,9 @@
     //
     pam_end(phandle, 0);
 
+    closelog();
+    openlog("cimserver", LOG_PID, LOG_DAEMON);
+
 #else
     //
     // Mutex to Serialize Authentication calls.
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth	2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h	2006-07-27 14:04:18.000000000 -0400
@@ -67,7 +67,8 @@
     */
     virtual Boolean authenticate(
         const String& userName, 
-        const String& password) = 0;
+        const String& password,
+	Boolean isRemoteUser) = 0;
 
     /** Construct and return the HTTP Basic authentication challenge header
         @return A string containing the authentication challenge header.
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth	2006-07-11 13:25:28.000000000 -0400
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp	2006-07-27 14:07:01.000000000 -0400
@@ -163,7 +163,7 @@
         return false;
     }
 
-    authenticated = _basicAuthenticator->authenticate(userName, password);
+    authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser());
 
     if (authenticated)
     {
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth	2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -92,7 +92,8 @@
 
 Boolean PAMBasicAuthenticator::authenticate(
     const String& userName, 
-    const String& password) 
+    const String& password,
+    Boolean isRemoteUser) 
 {
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "PAMBasicAuthenticator::authenticate()");
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth	2006-01-30 11:18:28.000000000 -0500
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h	2006-07-27 14:04:18.000000000 -0400
@@ -73,7 +73,8 @@
     */
     Boolean authenticate(
         const String& userName,
-        const String& password);
+        const String& password,
+	Boolean isRemoteUser);
 
     /** Verify PAM account management for the requesting user.
         @param userName String containing the user name
@@ -102,7 +103,8 @@
 
     Boolean _authenticateByPAM(
         const String& userName,
-        const String& password);
+        const String& password,
+	Boolean isRemoteUser);
 
     void _createPAMStandalone();
 
@@ -158,7 +160,8 @@
     */
     Boolean authenticate(
         const String& userName, 
-        const String& password);
+        const String& password,
+	Boolean isRemoteUser);
 
     /** Verify whether the user is valid.
         @param userName String containing the user name
@@ -220,7 +223,8 @@
 
     Boolean _authenticateByPAM(
 	const String& userName,
-	const String& password);
+	const String& password,
+	Boolean isRemoteUser);
 
 #if defined(PEGASUS_USE_PAM_STANDALONE_PROC)
     PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone;
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth	2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -57,7 +57,8 @@
     _privileged(false),
     _authType(String::EMPTY),
     _authStatus(NEW_REQUEST),
-    _exportConnection(false)
+    _exportConnection(false),
+    _remoteUser(true)
 { 
     PEG_METHOD_ENTER(
         TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
@@ -180,5 +181,14 @@
     PEG_METHOD_EXIT();
 }
 
+void   AuthenticationInfoRep::setRemoteUser(Boolean remoteUser)
+{
+    PEG_METHOD_ENTER(TRC_AUTHENTICATION,
+        "AuthenticationInfoRep::setRemoteUser");
+
+    _remoteUser = remoteUser;
+
+    PEG_METHOD_EXIT();
+}
 
 PEGASUS_NAMESPACE_END
--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth	2006-01-30 11:17:04.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -119,7 +119,8 @@
     queueId(queueId_),
     authInfo(0),
     acceptLanguagesDecoded(false),
-    contentLanguagesDecoded(false)
+    contentLanguagesDecoded(false),
+    fromRemoteHost(true)
 {
 	if (cimException_)
 		cimException = *cimException_;
--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth	2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h	2006-07-27 14:04:18.000000000 -0400
@@ -331,6 +331,22 @@
         _rep->setClientCertificateChain(clientCertificate);
 	}
 
+     /** Indicate whether the user is Remote 
+     */
+     Boolean isRemoteUser() const
+     {
+         _checkRep();
+         return _rep->isRemoteUser();
+     }
+
+     /** Set the Remote User flag
+     */
+     void setRemoteUser(Boolean remoteUser)
+     {
+         _checkRep();
+         _rep->setRemoteUser(remoteUser);
+     }
+
 private:
 
     AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep)
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth	2006-05-12 14:28:20.000000000 -0400
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp	2006-07-27 14:04:18.000000000 -0400
@@ -1841,6 +1841,30 @@
             "_requestCount = %d", _requestCount.get());
         message->dest = _outputMessageQueue->getQueueId();
 //        SendForget(message);
+	
+	// Allow authenticators to differentiate Remote and Local users:
+	struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ...
+	socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in);
+	uint32_t  sock = _socket.get()->getSocket() ;
+	memset(&sin_peer,'\0',slen1);
+	memset(&sin_svr, '\0',slen2);
+	if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 )
+	   ||( ::getsockname( sock, (struct sockaddr*)&sin_svr,  &slen2) == 0 )
+	   )
+	{
+	    if( sin_peer.sin_family == AF_INET )
+	    {
+		if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 )
+		    // message was sent FROM localhost interface
+		    message->fromRemoteHost = false;
+	    }
+	    if( sin_svr.sin_family == AF_INET )
+	    {
+		if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 )
+		    // message was sent TO localhost interface
+		    message->fromRemoteHost = false;
+	    }
+	}
 
         //
         // Set the entry status to BUSY.
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth	2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h	2006-07-27 14:04:18.000000000 -0400
@@ -143,6 +143,14 @@
 
     void setExportConnection(Boolean exportConnection);
 
+    Boolean isRemoteUser() const
+    {
+        return _remoteUser;
+    }
+
+    void setRemoteUser(Boolean remoteUser);
+
+
 	//PEP187
     Array<SSLCertificateInfo*> getClientCertificateChain()
 	{
@@ -173,7 +181,8 @@
 #endif
 
     Boolean _exportConnection;
-	Array<SSLCertificateInfo*> _clientCertificate;
+    Array<SSLCertificateInfo*> _clientCertificate;
+    Boolean _remoteUser;
 };
 
 PEGASUS_NAMESPACE_END
--- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth	2006-01-30 11:17:04.000000000 -0500
+++ pegasus/src/Pegasus/Common/HTTPMessage.h	2006-07-27 14:04:18.000000000 -0400
@@ -80,7 +80,8 @@
       ContentLanguageList contentLanguages;
       Boolean acceptLanguagesDecoded;
       Boolean contentLanguagesDecoded;
-			CIMException cimException;
+      Boolean fromRemoteHost;	       
+      CIMException cimException;
 
       void parse(
 	 String& startLine,


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Apr 2006 02:40:20 -0000	1.4
+++ .cvsignore	27 Jul 2006 21:43:42 -0000	1.5
@@ -1,3 +1,4 @@
 tog-pegasus-2.4.1.Beta-1.tar.gz
 pegasus-2.5.tar.gz
 pegasus-2.5.1.tar.gz
+pegasus-2.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Apr 2006 02:40:20 -0000	1.5
+++ sources	27 Jul 2006 21:43:42 -0000	1.6
@@ -1 +1 @@
-b7b392d2ff7ba9a4a3b8d7722d47314b  pegasus-2.5.1.tar.gz
+988a751af48d0eb4f298d51eca78d1cc  pegasus-2.5.2.tar.gz


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- tog-pegasus.spec	26 Jul 2006 17:26:31 -0000	1.40
+++ tog-pegasus.spec	27 Jul 2006 21:43:42 -0000	1.41
@@ -40,8 +40,8 @@
 %endif
 %endif
 
-Version: 		2.5.1
-Release: 		11%{?LINUX_VERSION:%{LINUX_VERSION}}
+Version: 		2.5.2
+Release: 		1%{?LINUX_VERSION:%{LINUX_VERSION}}
 Epoch:   		2
 #
 Summary:   		OpenPegasus WBEM Services for Linux
@@ -63,40 +63,17 @@
 Patch1:			pegasus-2.5.1-no-rpath.patch
 Patch2:			pegasus-2.5.1-linkflags.patch
 Patch3:			pegasus-2.5.1-PIE.patch
-Patch4:			pegasus-2.5.1-warnings.patch
+#
+# patches 4, 10, 12-14, 17-37 now upstream
+#
 Patch5:			pegasus-2.5.1-redhat-config.patch
-Patch6:			pegasus-2.5.1-cmpi-provider-lib.patch
-Patch7:			pegasus-2.5.1-local-or-remote-auth.patch
+Patch6:			pegasus-2.5.2-cmpi-provider-lib.patch
+Patch7:			pegasus-2.5.2-local-or-remote-auth.patch
 Patch8:			pegasus-2.5.1-pam-wbem.patch
 Patch9:			pegasus-2.5.1-parallel_make.patch
-Patch10:		pegasus-2.5.1-fix_zseries_flags.patch
 Patch11:		pegasus-2.5.1-fix_tests.patch
-Patch12:		pegasus-2.5.1-AutoPtr-Core.patch
-Patch13:		pegasus-2.5.1-obz4934.patch
-Patch14:		pegasus-2.5.1-obz4945.patch
-Patch15:		pegasus-2.5.1-PATH_MAX.patch
+Patch15:		pegasus-2.5.2-PATH_MAX.patch
 Patch16:		pegasus-2.5.1-HOSTNAME_MAX.patch
-Patch17:		pegasus-2.5.1-fix_repupgrade.patch
-Patch18:		pegasus-2.5.1-obz4968_upcalls_oop.patch
-Patch19:		pegasus-2.5.1-obz4955.patch
-Patch20:		pegasus-2.5.1-obz4956.patch
-Patch21:		pegasus-2.5.1-obz4978.patch
-Patch22:		pegasus-2.5.1-obz4983.patch
-Patch23:		pegasus-2.5.1-obz4984.patch
-Patch24:		pegasus-2.5.1-obz4986.patch
-Patch25:                pegasus-2.5.1-obz5046.patch
-Patch26:                pegasus-2.5.1-obz5047.patch
-Patch27:		pegasus-2.5.1-obz5048.patch
-Patch28:		pegasus-2.5.1-obz5049.patch
-Patch29:                pegasus-2.5.1-obz5053.patch
-Patch30:		pegasus-2.5.1-obz5059.patch
-Patch31:		pegasus-2.5.1-obz5072.patch
-Patch32:		pegasus-2.5.1-obz5083.patch
-Patch33:		pegasus-2.5.1-obz5115.patch
-Patch34:		pegasus-2.5.1-obz5119.patch
-Patch35:		pegasus-2.5.1-obz5073.patch
-Patch36:		pegasus-2.5.1-obz5090.patch
-Patch37:		pegasus-2.5.1-obz5180.patch
 Patch38:		pegasus-2.5.1-bz198185.patch
 #
 Conflicts: 		openwbem
@@ -155,42 +132,16 @@
 %patch1 -p1 -b .no-rpath
 %patch2 -p1 -b .linkflags
 %patch3 -p1 -b .PIE
-%patch4 -p1 -b .warnings
 %patch5 -p1 -b .redhat-config
 %patch6 -p1 -b .cmpi-provider-lib
 %patch7 -p1 -b .local-or-remote-auth
 %patch8 -p1 -b .pam-wbem
 %patch9 -p1 -b .parallel-make
-%patch10 -p1 -b .fix-zseries-flags
 %patch11 -p1 -b .fix-tests
-#%patch12 -p1 -b .AutoPtr-Core
-#^- now fixed with upstream obz4968 patch
-%patch13 -p1 -b .obz4934
-%patch14 -p1 -b .obz4945
 %patch15 -p1 -b .PATH_MAX
 %patch16 -p1 -b .HOSTNAME_MAX
-%patch17 -p1 -b .fix_repupgrade
-%patch18 -p1 -b .obz4968_upcalls_oop
-%patch19 -p1 -b .obz4955
-%patch20 -p1 -b .obz4956
-%patch21 -p1 -b .obz4978
-%patch22 -p1 -b .obz4983
-%patch23 -p1 -b	.obz4984
-%patch24 -p1 -b .obz4986
-%patch25 -p1 -b .obz5046
-%patch26 -p1 -b .obz5047
-%patch27 -p1 -b .obz5048
-%patch28 -p1 -b .obz5049
-%patch29 -p1 -b .obz5053
-%patch30 -p1 -b .obz5059
-%patch31 -p1 -b .obz5072
-%patch32 -p1 -b .obz5083
-%patch33 -p1 -b .obz5115
-%patch34 -p1 -b .obz5119
-%patch35 -p1 -b .obz5073
-%patch36 -p1 -b .obz5090
-%patch37 -p1 -b .obz5180
 %patch38 -p1 -b .bz198185
+find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -384,6 +335,11 @@
 
 
 %changelog
+* Thu Jul 27 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5.2-1.fc6
+- Upgrade to upstream version 2.5.2
+- fix bug 198185
+- fix bug 200246
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:2.5.1-10.FC6.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 21:50:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 17:50:23 -0400
Subject: rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.151,
	1.152
Message-ID: <200607272150.k6RLoNHS025645@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25530

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Specify ecj bootclasspath in bootstrap case.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- java-1.4.2-gcj-compat.spec	27 Jul 2006 19:23:43 -0000	1.151
+++ java-1.4.2-gcj-compat.spec	27 Jul 2006 21:50:20 -0000	1.152
@@ -180,9 +180,7 @@
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
 %if %{bootstrap}
-  cp -a %{SOURCE2} eclipse-ecj.jar
-  sed 's:@JAVADIR@:.:g' < %{SOURCE3} > ecj-bootstrap
-  sh -x ecj-bootstrap `find . -type f -name "*.java"`
+  gij -cp .:%{SOURCE2} org.eclipse.jdt.internal.compiler.batch.Main -bootclasspath %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar `find . -type f -name "*.java"`
 %else
   ecj `find . -type f -name "*.java"`
 %endif



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:07:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:07:12 -0400
Subject: rpms/tog-pegasus/devel pegasus-2.5.1-bz198185.patch,NONE,1.1
Message-ID: <200607272207.k6RM7Ca6030288@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30256

Added Files:
	pegasus-2.5.1-bz198185.patch 
Log Message:
upgrade to upstream version 2.5.2; fix bugs 198185, 200246

pegasus-2.5.1-bz198185.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pegasus-2.5.1-bz198185.patch ---
--- pegasus/src/Pegasus/Common/Makefile.bz198185	2006-07-19 16:21:06.000000000 -0400
+++ pegasus/src/Pegasus/Common/Makefile	2006-07-19 19:19:42.000000000 -0400
@@ -183,7 +183,7 @@
 SOURCES = $(SOURCES1) $(SOURCES2)
 
 ifeq ($(OS),linux)
-  EXTRA_LIBRARIES += -lcrypt
+  EXTRA_LIBRARIES += -lcrypt -lpthread
   ifdef PEGASUS_HAS_SSL
     EXTRA_LIBRARIES += -lssl -lcrypto
   endif



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:09:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:09:07 -0400
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.30, 1.31 sources,
	1.37, 1.38 system-config-kickstart.spec, 1.42, 1.43
Message-ID: <200607272209.k6RM97PQ030762@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30710

Modified Files:
	.cvsignore sources system-config-kickstart.spec 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	10 Jul 2006 14:32:16 -0000	1.30
+++ .cvsignore	27 Jul 2006 22:09:04 -0000	1.31
@@ -23,3 +23,4 @@
 system-config-kickstart-2.6.10.tar.bz2
 system-config-kickstart-2.6.11.tar.bz2
 system-config-kickstart-2.6.12.tar.bz2
+system-config-kickstart-2.6.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	10 Jul 2006 14:32:16 -0000	1.37
+++ sources	27 Jul 2006 22:09:04 -0000	1.38
@@ -1 +1 @@
-e066f5ec35fb97c5ccd783d353401b1f  system-config-kickstart-2.6.12.tar.bz2
+e3189f9b1a5d968345c8494c7df2b410  system-config-kickstart-2.6.13.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-kickstart.spec	10 Jul 2006 14:32:16 -0000	1.42
+++ system-config-kickstart.spec	27 Jul 2006 22:09:04 -0000	1.43
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.12
+Version: 2.6.13
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -79,6 +79,10 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Thu Jul 27 2006 Chris Lumens <clumens at redhat.com> 2.6.13-1
+- Fix for yum config API changes again (#200095).
+- Add 1280x800 to the resolution list (#156585).
+
 * Mon Jul 10 2006 Chris Lumens <clumens at redhat.com> 2.6.12-1
 - Fix for yum config API changes (#196841).
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:09:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:09:34 -0400
Subject: rpms/libart_lgpl/devel libart-multilib.patch, NONE,
	1.1 libart_lgpl.spec, 1.14, 1.15
Message-ID: <200607272209.k6RM9Y4F030894@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30724

Modified Files:
	libart_lgpl.spec 
Added Files:
	libart-multilib.patch 
Log Message:
fix multilib conflicts, don't ship .a


libart-multilib.patch:
 libart-config.in |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE libart-multilib.patch ---
--- libart_lgpl-2.3.17/libart-config.in.multilib	2006-07-27 18:02:06.000000000 -0400
+++ libart_lgpl-2.3.17/libart-config.in	2006-07-27 18:02:11.000000000 -0400
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+includedir=`pkg-config --variable includedir libart-2.0`
+libdir=`pkg-config --variable libdir libart-2.0`
+prefix=`pkg-config --variable prefix libart-2.0`
+exec_prefix=`pkg-config --variable exec_prefix libart-2.0`
 exec_prefix_set=no
 
 usage="\
@@ -36,15 +38,13 @@
       echo $exec_prefix
       ;;
     --version)
-      echo @LIBART_VERSION@
+      pkg-config --modversion libart-2.0
       ;;
     --cflags)
-      includes=-I at includedir@/libart-2.0
-      echo $includes
+      echo -I$includedir/libart-2.0
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -lart_lgpl_2 -lm
+      echo -L$libdir -lart_lgpl_2 -lm
       ;;
     *)
       echo "${usage}" 1>&2


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libart_lgpl.spec	12 Jul 2006 06:45:43 -0000	1.14
+++ libart_lgpl.spec	27 Jul 2006 22:09:32 -0000	1.15
@@ -1,9 +1,10 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 2.2.2
+Release: 3
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
+Patch0: libart-multilib.patch
 License: LGPL
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -14,7 +15,7 @@
 applications. libart renders vector paths and the like.
 
 %package devel
-Summary: Libraries and headers for libart_lgpl.
+Summary: Libraries and headers for libart_lgpl
 Group: Development/Libraries
 Requires: %name = %{version}
 Conflicts: gnome-libs-devel < 1:1.4.1.2
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 %build
 %configure
@@ -35,8 +37,36 @@
 rm -rf %{buildroot}
 %makeinstall
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h \
+   $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h-%{wordsize}.h
+
+cat >$RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h <<EOF
+#ifndef LIBART_MULTILIB
+#define LIBART_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "art_config-32.h"
+#elif __WORDSIZE == 64
+# include "art_config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif 
+EOF
+
 %clean
 rm -rf %{buildroot}
 
@@ -54,13 +84,16 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_bindir}/libart2-config
 %{_includedir}/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.17-3
+- Fix multilib conflicts
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-2.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:22:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:22:26 -0400
Subject: rpms/pango/devel pango.spec,1.76,1.77
Message-ID: <200607272222.k6RMMQ9b017899@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17841

Modified Files:
	pango.spec 
Log Message:
- Add umask 022 to post (#185419)



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- pango.spec	25 Jul 2006 14:19:51 -0000	1.76
+++ pango.spec	27 Jul 2006 22:22:24 -0000	1.77
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.13.4
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.13/pango-%{version}.tar.bz2
@@ -142,6 +142,7 @@
 %post
 /sbin/ldconfig
 
+umask 0022
 # Deriving /etc/pango/$host location
 #
 # autoconf changes linux to linux-gnu
@@ -189,6 +190,9 @@
 
 
 %changelog
+* Mon Jul 27 2006 Behdad Esfahbod <besfahbo at redhat.com> - 1.13.4-2
+- Add umask 022 to post (#185419)
+
 * Tue Jul 25 2006 Matthias Clasen <mclasen at redhat.com> - 1.13.4-1
 - Update to 1.13.4
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:26:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:26:52 -0400
Subject: rpms/esound/devel esound-multilib.patch, NONE, 1.1 esound.spec, 1.29,
	1.30
Message-ID: <200607272226.k6RMQqJt019670@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/esound/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19606

Modified Files:
	esound.spec 
Added Files:
	esound-multilib.patch 
Log Message:
fix multilib conflicts


esound-multilib.patch:
 esd-config.in |   32 +++++---------------------------
 1 files changed, 5 insertions(+), 27 deletions(-)

--- NEW FILE esound-multilib.patch ---
--- esound-0.2.36/esd-config.in.multilib	2006-07-27 18:15:11.000000000 -0400
+++ esound-0.2.36/esd-config.in	2006-07-27 18:23:50.000000000 -0400
@@ -1,10 +1,7 @@
 #!/bin/sh
 
-audiofile_libs="@AUDIOFILE_LIBS@"
-audiofile_cflags="@AUDIOFILE_CFLAGS@"
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix esound`
+exec_prefix=`pkg-config --variable exec_prefix esound`
 exec_prefix_set=no
 
 usage="\
@@ -39,32 +36,13 @@
       echo $exec_prefix
       ;;
     --version)
-      echo @ESD_VERSION@
+      pkg-config --modversion esound
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I at includedir@
-        for i in $audiofile_cflags ; do
-          if test $i = -I at includedir@ ; then
-            includes=""
-          fi
-        done      
-      fi
-      echo $includes $audiofile_cflags
+      pkg-config --cflags esound
       ;;
     --libs)
-      my_audiofile_libs=
-      libdirs=-L at libdir@
-      for i in $audiofile_libs ; do
-        if test $i != -L at libdir@ ; then
-          if test -z "$my_audiofile_libs" ; then
-            my_audiofile_libs="$i"
-          else
-            my_audiofile_libs="$my_audiofile_libs $i"
-          fi
-        fi
-      done
-      echo $libdirs -lesd $my_audiofile_libs @LIBS@
+      pkg-config --libs esound
       ;;
     *)
       echo "${usage}" 1>&2


Index: esound.spec
===================================================================
RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- esound.spec	12 Jul 2006 05:45:50 -0000	1.29
+++ esound.spec	27 Jul 2006 22:26:49 -0000	1.30
@@ -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.2
+Release: 3
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: esound-0.2.19-noerrors.patch
 Patch2: esound-0.2.35-64bit_install.patch
-Patch3: esound-0.2.36-link.patch
+Patch3: esound-multilib.patch
 BuildRequires: docbook-utils, audiofile-devel
 BuildRequires: alsa-lib-devel
 
@@ -41,7 +41,7 @@
 
 %patch0 -p1 -b .noerrors
 %patch2 -p1 -b .64bit
-%patch3 -p1
+%patch3 -p1 -b .multilib
 
 %build
 %configure
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.2.36-3
+- fix multilib conflicts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.36-2.2.2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:31:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:31:37 -0400
Subject: rpms/util-linux/devel util-linux.spec,1.134,1.135
Message-ID: <200607272231.k6RMVbmA021176@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21138

Modified Files:
	util-linux.spec 
Log Message:
fix %post script





From fedora-cvs-commits at redhat.com  Thu Jul 27 22:32:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:32:11 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2465,
	1.2466 linux-2.6-utrace.patch, 1.9, 1.10
Message-ID: <200607272232.k6RMWAxo021236@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21193

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
s390 utrace fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2465
retrieving revision 1.2466
diff -u -r1.2465 -r1.2466
--- kernel-2.6.spec	27 Jul 2006 20:23:04 -0000	1.2465
+++ kernel-2.6.spec	27 Jul 2006 22:31:57 -0000	1.2466
@@ -1662,6 +1662,9 @@
 %endif
 
 %changelog
+* Thu Jul 27 2006 Roland McGrath <roland at redhat.com>
+- s390 utrace fix
+
 * Thu Jul 27 2006 Don Zickus <dzickus at redhat.com>
 - Enable kdump on ppc64iseries.  yeah more rpms..
 

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  451 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  862 +++++++++---------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  842 +++++++++--------
 arch/powerpc/kernel/ptrace32.c          |  436 ---------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  690 +++++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/ptrace.c            |   18 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  709 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  632 +++++++------
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   73 +
 include/asm-powerpc/tracehook.h         |  302 ++++++
 include/asm-s390/tracehook.h            |  103 ++
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  105 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  566 +++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  251 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1531 ++++++++++++++++++++++++--------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1501 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 82 files changed, 7671 insertions(+), 3192 deletions(-)

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-utrace.patch	26 Jul 2006 22:32:28 -0000	1.9
+++ linux-2.6-utrace.patch	27 Jul 2006 22:31:59 -0000	1.10
@@ -10556,10 +10556,10 @@
 +		if (count < copy)
 +			copy = count;
 +		if (kbuf) {
-+			memcpy(kbuf, (char *) &regs->psw.addr + pos, copy);
++			memcpy(kbuf, (char *) &regs->psw.mask + pos, copy);
 +			kbuf += copy;
 +		}
-+		else if (copy_to_user(ubuf, (char *) &regs->psw.addr + pos,
++		else if (copy_to_user(ubuf, (char *) &regs->psw.mask + pos,
 +				      copy))
 +			return -EFAULT;
 +		else
@@ -10643,10 +10643,10 @@
 +		if (count < copy)
 +			copy = count;
 +		if (kbuf) {
-+			memcpy((char *) &regs->psw.addr + pos, kbuf, copy);
++			memcpy((char *) &regs->psw.mask + pos, kbuf, copy);
 +			kbuf += copy;
 +		}
-+		else if (copy_from_user((char *) &regs->psw.addr + pos,
++		else if (copy_from_user((char *) &regs->psw.mask + pos,
 +					ubuf, copy))
 +			return -EFAULT;
 +		else



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:36:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:36:45 -0400
Subject: rpms/fontconfig/devel 50-no-hint-fonts.conf, 1.3,
	1.4 fontconfig-2.3.95-defaultconfig.patch, 1.2,
	1.3 fontconfig.spec, 1.81, 1.82
Message-ID: <200607272236.k6RMajnM022151@cvs.devel.redhat.com>

Author: besfahbo

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22094

Modified Files:
	50-no-hint-fonts.conf fontconfig-2.3.95-defaultconfig.patch 
	fontconfig.spec 
Log Message:
- Do umask 0022 in post
- Update configs to reflect addition of new Indic fonts (#200381, #200397)



Index: 50-no-hint-fonts.conf
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/50-no-hint-fonts.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 50-no-hint-fonts.conf	17 Jan 2006 23:16:50 -0000	1.3
+++ 50-no-hint-fonts.conf	27 Jul 2006 22:36:43 -0000	1.4
@@ -188,4 +188,56 @@
 			<bool>false</bool>
 		</edit>
 	</match>
+
+<!--
+Disabling hinting for newly added Indic fonts (kn/or/ml/te)
+-->
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>Lohit Kannada</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+        </match>
+
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>Lohit Oriya</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+        </match>
+
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>Lohit Malayalam</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+        </match>
+
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>Lohit Telugu</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+        </match>
+
+<!--
+And Sinhala
+-->
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>LKLUG</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+
 </fontconfig>

fontconfig-2.3.95-defaultconfig.patch:
 fonts.conf.in |  117 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 92 insertions(+), 25 deletions(-)

Index: fontconfig-2.3.95-defaultconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.95-defaultconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fontconfig-2.3.95-defaultconfig.patch	27 Apr 2006 03:27:48 -0000	1.2
+++ fontconfig-2.3.95-defaultconfig.patch	27 Jul 2006 22:36:43 -0000	1.3
@@ -1,5 +1,5 @@
---- fontconfig-2.3.95/fonts.conf.in.defaultconfig	2006-04-26 13:07:47.000000000 -0400
-+++ fontconfig-2.3.95/fonts.conf.in	2006-04-26 13:07:56.000000000 -0400
+--- fontconfig-2.3.95/fonts.conf.in.defaultconfig	2006-04-14 20:24:26.000000000 -0400
++++ fontconfig-2.3.95/fonts.conf.in	2006-07-27 18:32:47.000000000 -0400
 @@ -80,6 +80,8 @@
  		<family>Nimbus Roman No9 L</family>
  		<family>Luxi Serif</family>
@@ -95,7 +95,7 @@
  	</alias>
   	<alias>
  		<family>Courier New</family>
-@@ -293,17 +320,25 @@
+@@ -293,17 +320,30 @@
  	<alias>
  		<family>serif</family>
  		<prefer>
@@ -116,6 +116,11 @@
 +			<family>Lohit Hindi</family>
 +			<family>Lohit Punjabi</family>
 +			<family>Lohit Tamil</family>
++			<family>Lohit Malayalam</family>
++			<family>Lohit Kannada</family>
++			<family>Lohit Telugu</family>
++			<family>Lohit Oriya</family>
++			<family>LKLUG</family>
 +			<family>Sazanami Mincho</family>
 +			<family>Kochi Mincho</family>
 +			<family>ZYSong18030</family>
@@ -126,7 +131,7 @@
  			<family>AR PL SungtiL GB</family>
  			<family>AR PL Mingti2L Big5</family>
  			<family>?????? ??????</family>
-@@ -313,41 +348,58 @@
+@@ -313,41 +353,68 @@
  	<alias>
  		<family>sans-serif</family>
  		<prefer>
@@ -149,6 +154,11 @@
 +			<family>Lohit Hindi</family>
 +			<family>Lohit Punjabi</family>
 +			<family>Lohit Tamil</family>
++			<family>Lohit Malayalam</family>
++			<family>Lohit Kannada</family>
++			<family>Lohit Telugu</family>
++			<family>Lohit Oriya</family>
++			<family>LKLUG</family>
 +			<family>Sazanami Gothic</family>
  			<family>Kochi Gothic</family>
 -			<family>AR PL KaitiM GB</family>
@@ -182,6 +192,11 @@
 +                        <family>Lohit Hindi</family>
 +                        <family>Lohit Punjabi</family>
 +			<family>Lohit Tamil</family>
++			<family>Lohit Malayalam</family>
++			<family>Lohit Kannada</family>
++			<family>Lohit Telugu</family>
++			<family>Lohit Oriya</family>
++			<family>LKLUG</family>
  			<family>Nimbus Mono L</family>
  			<family>Courier</family>
 -			<family>Miriam Mono</family>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- fontconfig.spec	19 Jul 2006 03:54:14 -0000	1.81
+++ fontconfig.spec	27 Jul 2006 22:36:43 -0000	1.82
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.95
-Release: 5
+Release: 6
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -98,6 +98,8 @@
 %post
 /sbin/ldconfig
 
+umask 0022
+
 mkdir -p %{_localstatedir}/cache/fontconfig
 touch %{_localstatedir}/cache/fontconfig/stamp
 
@@ -141,6 +143,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jul 27 2006 Behdad Esfahbod <besfahbo at redhat.com> - 2.3.95-6
+- Do umask 0022 in post
+- Update configs to reflect addition of new Indic fonts (#200381, #200397)
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.95-5
 - Plug a small memory leak
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:42:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:42:20 -0400
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.123,1.124
Message-ID: <200607272242.k6RMgKnW023860@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23781

Modified Files:
	gnome-vfs2.spec 
Log Message:
fix multilib conflicts



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnome-vfs2.spec	19 Jul 2006 03:36:33 -0000	1.123
+++ gnome-vfs2.spec	27 Jul 2006 22:42:17 -0000	1.124
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.15.3
-Release: 6
+Release: 7
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -126,7 +126,7 @@
 
 #needed for patch 102 (kerberos fix)
 autoconf
-%configure --enable-gtk-doc --with-gtk=no --enable-hal 
+%configure --disable-gtk-doc --with-gtk=no --enable-hal 
 
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
@@ -194,6 +194,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-7
+- Disable gtk-doc to fix multilib conflicts
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.3-6
 - Re-add gnome-mount dependency
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:43:17 -0400
Subject: rpms/mesa/devel mesa.spec,1.80,1.81
Message-ID: <200607272243.k6RMhHvu024247@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24204

Modified Files:
	mesa.spec 
Log Message:
* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 6.5-20.fc6
- Conditionalized libGLw inclusion with new with_libGLw macro defaulting
  to 1 (enabled) for now, however since nothing in Fedora Core uses libGLw
  anymore, we will be transitioning libGLw to an external package maintained
  in Fedora Extras soon.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mesa.spec	26 Jul 2006 23:16:18 -0000	1.80
+++ mesa.spec	27 Jul 2006 22:43:14 -0000	1.81
@@ -49,8 +49,16 @@
 %define with_OSMesa	0
 %endif
 
+# NOTE: Allow libGLw to be disabled since nothing in Fedora Core uses it
+# anymore, and we're planning on having it moved into Fedora Extras soon.
+%define with_libGLw	1
+
+%if %{with_libGLw}
 # NOTE: This option enables motif support in libGLw for bug #175251
 %define with_motif	1
+%else
+%define with_motif	0
+%endif
 
 #-- END DRI Build Configuration ------------------------------------------
 
@@ -512,11 +520,17 @@
 %{_bindir}/glxinfo
 
 %changelog
-* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 6.5-19.fc5.aiglx
+* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 6.5-20.fc6
+- Conditionalized libGLw inclusion with new with_libGLw macro defaulting
+  to 1 (enabled) for now, however since nothing in Fedora Core uses libGLw
+  anymore, we will be transitioning libGLw to an external package maintained
+  in Fedora Extras soon.
+
+* Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> 6.5-19.fc5.aiglx
 - Build for fc5 aiglx repo.
 
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-19.fc6
-- Disable TLS dispatch, it's selinux-hostile.
+- Disable TLS dispatch, it is selinux-hostile.
 
 * Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 6.5-18.fc6
 - mesa-6.5-fix-glxinfo-link.patch: lib64 fix.



From fedora-cvs-commits at redhat.com  Thu Jul 27 22:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 18:46:27 -0400
Subject: rpms/libbonobo/devel libbonobo.spec,1.43,1.44
Message-ID: <200607272246.k6RMkR4Z031456@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30389

Modified Files:
	libbonobo.spec 
Log Message:
Fix multilib conflicts



Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libbonobo.spec	12 Jul 2006 21:44:06 -0000	1.43
+++ libbonobo.spec	27 Jul 2006 22:46:24 -0000	1.44
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.15.0
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -58,7 +58,7 @@
 aclocal
 automake
 autoconf
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 
 make
 
@@ -73,6 +73,7 @@
 ## kill other stuff
 rm $RPM_BUILD_ROOT%{_bindir}/echo-client-2
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.*a
 rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a
 
@@ -108,7 +109,6 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -117,6 +117,10 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-2
+- disable gtk-doc to fix multilib conflicts
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.0-1
 - Update to 2.15.0
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 23:11:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 19:11:06 -0400
Subject: rpms/freetype/devel freetype-multilib.patch, NONE, 1.1 freetype.spec,
	1.35, 1.36
Message-ID: <200607272311.k6RNB6ta014508@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14454

Modified Files:
	freetype.spec 
Added Files:
	freetype-multilib.patch 
Log Message:
fix multilib issues


freetype-multilib.patch:
 freetype-config.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE freetype-multilib.patch ---
--- freetype-2.2.1/builds/unix/freetype-config.in.multilib	2006-07-27 18:50:40.000000000 -0400
+++ freetype-2.2.1/builds/unix/freetype-config.in	2006-07-27 18:58:13.000000000 -0400
@@ -9,11 +9,11 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix freetype2`
+exec_prefix=`pkg-config --variable exec_prefix freetype2`
 exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=`pkg-config --variable includedir freetype2`
+libdir=`pkg-config --variable includedir freetype2`
 enable_shared=@enable_shared@
 wl=@wl@
 hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- freetype.spec	13 Jul 2006 18:42:05 -0000	1.35
+++ freetype.spec	27 Jul 2006 23:11:03 -0000	1.36
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 2.1
+Release: 3
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -22,6 +22,9 @@
 # Enable otvalid and gxvalid modules
 Patch46:  freetype-2.2.1-enable-valid.patch
 
+# Fix multilib conflicts
+Patch88:  freetype-multilib.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -72,6 +75,8 @@
 
 %patch46  -p1 -b .enable-valid
 
+%patch88 -p1 -b .multilib
+
 %build
 # Work around code generation problem with strict-aliasing
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021
@@ -110,6 +115,32 @@
 }
 %endif
 
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \
+   $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h
+cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h <<EOF
+#ifndef __FTCONFIG_H__MULTILIB
+#define __FTCONFIG_H___MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "art_config-32.h"
+#elif __WORDSIZE == 64
+# include "art_config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif 
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,6 +192,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen  <mclasen at redhat.com> - 2.2.1-3
+- fix multilib issues
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-2.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Jul 27 23:12:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 19:12:20 -0400
Subject: rpms/freetype/devel freetype.spec,1.36,1.37
Message-ID: <200607272312.k6RNCKDW014867@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14790

Modified Files:
	freetype.spec 
Log Message:
fix multilib



Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- freetype.spec	27 Jul 2006 23:11:03 -0000	1.36
+++ freetype.spec	27 Jul 2006 23:12:17 -0000	1.37
@@ -131,9 +131,9 @@
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
-# include "art_config-32.h"
+# include "ftconfig-32.h"
 #elif __WORDSIZE == 64
-# include "art_config-64.h"
+# include "ftconfig-64.h"
 #else
 # error "unexpected value for __WORDSIZE macro"
 #endif



From fedora-cvs-commits at redhat.com  Thu Jul 27 23:29:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 19:29:03 -0400
Subject: rpms/audiofile/devel audiofile-multilib.patch, NONE,
	1.1 audiofile.spec, 1.21, 1.22
Message-ID: <200607272329.k6RNT3NC011504@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/audiofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11477

Modified Files:
	audiofile.spec 
Added Files:
	audiofile-multilib.patch 
Log Message:
Fix multilib, don't ship .a's


audiofile-multilib.patch:
 audiofile-config.in |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

--- NEW FILE audiofile-multilib.patch ---
--- audiofile-0.2.6/audiofile-config.in.multilib	2006-07-27 19:23:38.000000000 -0400
+++ audiofile-0.2.6/audiofile-config.in	2006-07-27 19:25:18.000000000 -0400
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+prefix=`pkg-config --variable prefix audiofile`
+exec_prefix=`pkg-config --variable exec_prefix audiofile`
 exec_prefix_set=no
 
 usage="\
@@ -36,17 +36,13 @@
       echo $exec_prefix
       ;;
     --version)
-      echo @AUDIOFILE_VERSION@
+      pkg-config --modversion audiofile
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I at includedir@
-      fi
-      echo $includes
+      pkg-config --cflags audiofile
       ;;
     --libs)
-      libdirs=-L at libdir@
-      echo $libdirs -laudiofile -lm
+      pkg-config --libs audiofile
       ;;
     *)
       echo "${usage}" 1>&2


Index: audiofile.spec
===================================================================
RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- audiofile.spec	12 Jul 2006 05:23:07 -0000	1.21
+++ audiofile.spec	27 Jul 2006 23:29:00 -0000	1.22
@@ -1,13 +1,14 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
 Version: 0.2.6
-Release: 4.1 
+Release: 5
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2
 Patch0: audiofile-underquoted.patch
 Patch1: audiofile-const.patch
+Patch2: audiofile-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/ldconfig
 
@@ -34,6 +35,7 @@
 %setup -q
 %patch0 -p1 -b .underquoted
 %patch1 -p1 -b .const
+%patch2 -p1 -b .multilib
 
 %build
 %configure
@@ -46,6 +48,7 @@
 %makeinstall
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f docs/Makefile*
 
 %post
@@ -68,12 +71,15 @@
 %defattr(-, root, root)
 %{_bindir}/audiofile-config
 %{_libdir}/lib*.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.2.6-5
+- Fix multilib conflicts
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.6-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 00:17:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 20:17:25 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2466,1.2467
Message-ID: <200607280017.k6S0HP33030511@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30489

Modified Files:
	kernel-2.6.spec 
Log Message:
kludge around xen borkage


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2466
retrieving revision 1.2467
diff -u -r1.2466 -r1.2467
--- kernel-2.6.spec	27 Jul 2006 22:31:57 -0000	1.2466
+++ kernel-2.6.spec	28 Jul 2006 00:17:22 -0000	1.2467
@@ -1261,10 +1261,11 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
 	# Temporary fix for upstream "make prepare" bug.
-	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-	/bin/ls
-	make prepare
-	popd > /dev/null
+	if [ -f Makefile ]; then
+		pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+		make prepare
+		popd > /dev/null
+	if
 }
 
 ###



From fedora-cvs-commits at redhat.com  Fri Jul 28 00:42:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 20:42:06 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2467,1.2468
Message-ID: <200607280042.k6S0g6VJ005659@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5633

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.2467
retrieving revision 1.2468
diff -u -r1.2467 -r1.2468
--- kernel-2.6.spec	28 Jul 2006 00:17:22 -0000	1.2467
+++ kernel-2.6.spec	28 Jul 2006 00:42:03 -0000	1.2468
@@ -1265,7 +1265,7 @@
 		pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
 		make prepare
 		popd > /dev/null
-	if
+	fi
 }
 
 ###



From fedora-cvs-commits at redhat.com  Fri Jul 28 00:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 20:44:24 -0400
Subject: rpms/firefox/devel firefox.spec,1.132,1.133
Message-ID: <200607280044.k6S0iOta006584@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6560

Modified Files:
	firefox.spec 
Log Message:
* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4
- Add pkgconfig files



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- firefox.spec	27 Jul 2006 19:46:37 -0000	1.132
+++ firefox.spec	28 Jul 2006 00:44:21 -0000	1.133
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        3
+Release:        4
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -256,6 +256,7 @@
 %if %{build_devel_package}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %{__cp} -r dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
 %{__cp} -r dist/idl/* \
@@ -265,6 +266,8 @@
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
   $RPM_BUILD_ROOT/%{ffdir}
+install -c -m 644 build/unix/*.pc \
+  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 %endif
 
 # ghost files
@@ -339,11 +342,18 @@
 %{ffdir}/xpidl
 %{ffdir}/xpt_dump
 %{ffdir}/xpt_link
+%{ffdir}/firefox-xpcom.pc
+%{ffdir}/firefox-plugin.pc
+%{ffdir}/firefox-jscom.pc
+%{ffdir}/firefox-gtkmozembed.pc
 %endif
 
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4
+- Add pkgconfig files
+
 * Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-3
 - Don't strip provides when building the devel package
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 00:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 20:53:20 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.27, 1.28 fedora-logos.spec,
	1.33, 1.34 sources, 1.29, 1.30
Message-ID: <200607280053.k6S0rKUc024678@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24568

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
- Add new default backgrounds



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Jul 2006 19:12:17 -0000	1.27
+++ .cvsignore	28 Jul 2006 00:53:18 -0000	1.28
@@ -1 +1,2 @@
 fedora-logos-1.1.45.tar.bz2
+fedora-logos-1.1.46.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fedora-logos.spec	26 Jul 2006 19:12:17 -0000	1.33
+++ fedora-logos.spec	28 Jul 2006 00:53:18 -0000	1.34
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.45
+Version: 1.1.46
 Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -147,6 +147,9 @@
 # end i386 bits
 
 %changelog
+* Thu Jul 27 2006 John (J5) Palmieri <johnp at redhat.com> - 1.1.46-1
+- Add new default backgrounds
+
 * Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 1.1.45-1
 - Add wide version of default desktop background
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	26 Jul 2006 19:12:17 -0000	1.29
+++ sources	28 Jul 2006 00:53:18 -0000	1.30
@@ -1 +1 @@
-e89cc7065404ab1a848e0299cd9ab0e4  fedora-logos-1.1.45.tar.bz2
+8b6c7931b1418b19f666edc54ff2ae3d  fedora-logos-1.1.46.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 00:56:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 20:56:13 -0400
Subject: rpms/thunderbird/devel sources, 1.16, 1.17 thunderbird.spec, 1.74,
	1.75
Message-ID: <200607280056.k6S0uDqE025841@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25763

Modified Files:
	sources thunderbird.spec 
Log Message:
* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
- Update to 1.5.0.5



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	12 Jun 2006 23:26:02 -0000	1.16
+++ sources	28 Jul 2006 00:56:11 -0000	1.17
@@ -1,2 +1,2 @@
-ada9c163f5b26fe81958e7a85340811e  thunderbird-1.5.0.4-source.tar.bz2
-b47823f68664d8a278be8b9a796cdce0  thunderbird-langpacks-1.5.0.4-20060612.tar.bz2
+b09d29f912c2133a75b44f4801fc62b0  thunderbird-1.5.0.5-source.tar.bz2
+937994ce5b8351902bd10df8da1b05aa  thunderbird-langpacks-1.5.0.5-20060726.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- thunderbird.spec	12 Jul 2006 08:28:23 -0000	1.74
+++ thunderbird.spec	28 Jul 2006 00:56:11 -0000	1.75
@@ -7,8 +7,8 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	1.5.0.4
-Release:	2.1
+Version:	1.5.0.5
+Release:	2
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -19,7 +19,7 @@
 %define tarball thunderbird-1.5rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20060612.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20060726.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -212,7 +212,10 @@
 #===============================================================================
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
+- Update to 1.5.0.5
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.4-2.1
 - rebuild
 
 * Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:06:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:06:42 -0400
Subject: rpms/gstreamer/devel gstreamer.spec,1.56,1.57
Message-ID: <200607280106.k6S16guq028618@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28554

Modified Files:
	gstreamer.spec 
Log Message:
fix multilib



Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gstreamer.spec	20 Jul 2006 17:52:38 -0000	1.56
+++ gstreamer.spec	28 Jul 2006 01:06:40 -0000	1.57
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.9
-Release: 	1
+Release: 	2
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -100,7 +100,7 @@
   --with-package-name='Fedora Core gstreamer package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
   --enable-debug \
-  --enable-gtk-doc --disable-docbook \
+  --disable-gtk-doc --disable-docbook \
   --disable-tests --disable-examples
 
 #make %{?_smp_mflags}
@@ -198,6 +198,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.9-2
+- Disable gtk-doc to fix multilib conflicts
+
 * Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.9-1
 - Update to new upstream version
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:10:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:10:35 -0400
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.14,
	1.15
Message-ID: <200607280110.k6S1AZxi029346@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29329

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
fix multilib



Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gstreamer-plugins-good.spec	19 Jul 2006 05:57:16 -0000	1.14
+++ gstreamer-plugins-good.spec	28 Jul 2006 01:10:31 -0000	1.15
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.3
-Release:  	4
+Release:  	5
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -84,7 +84,7 @@
 %configure \
   --with-package-name='Fedora Core gstreamer-plugins-good package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
-  --enable-gtk-doc
+  --disable-gtk-doc
 
 make %{?_smp_mflags}
                                                                                 
@@ -180,6 +180,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.3-5
+- Disable gtk-doc to fix multilib conflicts
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.3-4
 - Rebuild 
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:12:50 -0400
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.14,
	1.15
Message-ID: <200607280112.k6S1Coj7030179@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30136

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
fix multilib



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gstreamer-plugins-base.spec	20 Jul 2006 17:54:52 -0000	1.14
+++ gstreamer-plugins-base.spec	28 Jul 2006 01:12:47 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.9
-Release:  	1	
+Release:  	2	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -52,7 +52,7 @@
 %configure \
   --with-package-name='Fedora Core gstreamer-plugins-base package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
-  --enable-gtk-doc
+  --disable-gtk-doc
 
 make %{?_smp_mflags}
 
@@ -190,6 +190,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.9-2
+- Disable gtk-doc to fix multilib conflicts
+
 * Thu Jul 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.9-1
 - Update to 0.10.9
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:19:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:19:51 -0400
Subject: rpms/gstreamer/devel gstreamer-0.10.9-docs.patch, NONE,
	1.1 gstreamer.spec, 1.57, 1.58
Message-ID: <200607280119.k6S1Jois014534@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14500

Modified Files:
	gstreamer.spec 
Added Files:
	gstreamer-0.10.9-docs.patch 
Log Message:
Fix doc build


gstreamer-0.10.9-docs.patch:
 Makefile.in |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE gstreamer-0.10.9-docs.patch ---
--- gstreamer-0.10.9/docs/Makefile.in.docs	2006-07-27 21:18:06.000000000 -0400
+++ gstreamer-0.10.9/docs/Makefile.in	2006-07-27 21:18:43.000000000 -0400
@@ -376,12 +376,9 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- at ENABLE_GTK_DOC_FALSE@SUBDIRS_GTK_DOC = 
- at ENABLE_GTK_DOC_TRUE@SUBDIRS_GTK_DOC = gst libs
- at ENABLE_PLUGIN_DOCS_FALSE@SUBDIRS_PLUGIN_DOCS = 
- at ENABLE_PLUGIN_DOCS_TRUE@SUBDIRS_PLUGIN_DOCS = plugins
- at ENABLE_DOCBOOK_FALSE@SUBDIRS_DOCBOOK = 
- at ENABLE_DOCBOOK_TRUE@SUBDIRS_DOCBOOK = faq manual pwg
+SUBDIRS_GTK_DOC = gst libs
+SUBDIRS_PLUGIN_DOCS = plugins
+SUBDIRS_DOCBOOK = faq manual pwg
 BUILT_SOURCES = version.entities
 SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) $(SUBDIRS_PLUGIN_DOCS)
 DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gstreamer.spec	28 Jul 2006 01:06:40 -0000	1.57
+++ gstreamer.spec	28 Jul 2006 01:19:47 -0000	1.58
@@ -13,6 +13,7 @@
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source: 	http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2
+Patch0:		gstreamer-0.10.9-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gstreamer-tools >= %{version}
@@ -93,6 +94,7 @@
 
 %prep
 %setup -q -n gstreamer-%{version}
+%patch0 -p1 -b .docs
 
 %build
 # 0.10.0: manuals do not build due to an openjade error; disable for now



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:26:46 -0400
Subject: rpms/gstreamer-plugins-good/devel
	gst-plugins-good-0.10.3-docs.patch, NONE,
	1.1 gstreamer-plugins-good.spec, 1.15, 1.16
Message-ID: <200607280126.k6S1Qkp8016878@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-good/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16808

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	gst-plugins-good-0.10.3-docs.patch 
Log Message:
fix docs build


gst-plugins-good-0.10.3-docs.patch:
 Makefile.in |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gst-plugins-good-0.10.3-docs.patch ---
--- gst-plugins-good-0.10.3/docs/Makefile.in.docs	2006-07-27 21:25:10.000000000 -0400
+++ gst-plugins-good-0.10.3/docs/Makefile.in	2006-07-27 21:25:29.000000000 -0400
@@ -422,8 +422,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- at ENABLE_GTK_DOC_FALSE@GTK_DOC_DIRS = 
- at ENABLE_GTK_DOC_TRUE@GTK_DOC_DIRS = plugins
+GTK_DOC_DIRS = plugins
 SUBDIRS = $(GTK_DOC_DIRS)
 DIST_SUBDIRS = plugins
 EXTRA_DIST = \


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gstreamer-plugins-good.spec	28 Jul 2006 01:10:31 -0000	1.15
+++ gstreamer-plugins-good.spec	28 Jul 2006 01:26:43 -0000	1.16
@@ -13,6 +13,7 @@
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
+Patch0:		gst-plugins-good-0.10.3-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: 	%{gstreamer} >= %{_gst}
@@ -80,6 +81,8 @@
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
+%patch0 -p1 -b .docs
+
 %build
 %configure \
   --with-package-name='Fedora Core gstreamer-plugins-good package' \



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:28:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:28:49 -0400
Subject: rpms/gstreamer-plugins-base/devel
	gst-plugins-base-0.10.9-docs.patch, NONE, 1.1
Message-ID: <200607280128.k6S1Sn7S017724@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17664

Added Files:
	gst-plugins-base-0.10.9-docs.patch 
Log Message:
fix docs build


gst-plugins-base-0.10.9-docs.patch:
 Makefile.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE gst-plugins-base-0.10.9-docs.patch ---
--- gst-plugins-base-0.10.9/docs/Makefile.in.docs	2006-07-27 21:27:34.000000000 -0400
+++ gst-plugins-base-0.10.9/docs/Makefile.in	2006-07-27 21:27:55.000000000 -0400
@@ -384,10 +384,8 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- at ENABLE_GTK_DOC_FALSE@GTK_DOC_DIRS = 
- at ENABLE_GTK_DOC_TRUE@GTK_DOC_DIRS = libs
- at ENABLE_PLUGIN_DOCS_FALSE@PLUGIN_DOCS_DIRS = 
- at ENABLE_PLUGIN_DOCS_TRUE@PLUGIN_DOCS_DIRS = plugins
+GTK_DOC_DIRS = libs
+PLUGIN_DOCS_DIRS = plugins
 SUBDIRS = $(GTK_DOC_DIRS) $(PLUGIN_DOCS_DIRS)
 DIST_SUBDIRS = libs plugins
 EXTRA_DIST = \



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:31:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:31:06 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2468,1.2469
Message-ID: <200607280131.k6S1V6sc018549@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18449

Modified Files:
	kernel-2.6.spec 
Log Message:
fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2468
retrieving revision 1.2469
diff -u -r1.2468 -r1.2469
--- kernel-2.6.spec	28 Jul 2006 00:42:03 -0000	1.2468
+++ kernel-2.6.spec	28 Jul 2006 01:31:03 -0000	1.2469
@@ -1261,11 +1261,11 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
 	# Temporary fix for upstream "make prepare" bug.
+	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
 	if [ -f Makefile ]; then
-		pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
 		make prepare
-		popd > /dev/null
 	fi
+	popd > /dev/null
 }
 
 ###



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:33:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:33:08 -0400
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.40,1.41
Message-ID: <200607280133.k6S1X8we019065@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19022

Modified Files:
	libgnomeprint22.spec 
Log Message:
fix multilib



Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libgnomeprint22.spec	12 Jul 2006 06:51:38 -0000	1.40
+++ libgnomeprint22.spec	28 Jul 2006 01:33:06 -0000	1.41
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	7.1
+Release:	8
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -102,7 +102,7 @@
 libtoolize --force
 autoconf
 automake --add-missing
-%configure --disable-rpath --enable-gtk-doc
+%configure --disable-rpath --disable-gtk-doc
 make %{?_smp_mflags}
 
 %install
@@ -136,6 +136,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-8
+- Disable gtk-doc to fix multilib conflicts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-7.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:35:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:35:59 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.31,1.32
Message-ID: <200607280135.k6S1ZxXo019779@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19748

Modified Files:
	libgnomeprintui22.spec 
Log Message:
fix multilib



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgnomeprintui22.spec	12 Jul 2006 06:51:48 -0000	1.31
+++ libgnomeprintui22.spec	28 Jul 2006 01:35:57 -0000	1.32
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 3.1
+Release: 4
 Source0: libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -66,7 +66,7 @@
 libtoolize --force
 autoconf
 automake --add-missing
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 make
 
 %install
@@ -102,6 +102,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen  <mclasen at redhat.com> - 2.12.1-4
+- Disable gtk-doc to fix multilib conflicts
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:53:03 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.32,1.33
Message-ID: <200607280153.k6S1r39E007368@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7308

Modified Files:
	libgnomeprintui22.spec 
Log Message:
fix file lists



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgnomeprintui22.spec	28 Jul 2006 01:35:57 -0000	1.32
+++ libgnomeprintui22.spec	28 Jul 2006 01:53:00 -0000	1.33
@@ -99,7 +99,7 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-%{_datadir}/gtk-doc
+#%{_datadir}/gtk-doc
 
 %changelog
 * Thu Jul 27 2006 Matthias Clasen  <mclasen at redhat.com> - 2.12.1-4



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:55:48 -0400
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.15,
	1.16
Message-ID: <200607280155.k6S1tmQJ018401@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18388

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
fix file lists



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gstreamer-plugins-base.spec	28 Jul 2006 01:12:47 -0000	1.15
+++ gstreamer-plugins-base.spec	28 Jul 2006 01:55:46 -0000	1.16
@@ -186,8 +186,8 @@
 %{_libdir}/pkgconfig/gstreamer-plugins-base-%{majorminor}.pc
 
 # gtk-doc documentation
-%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
-%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
+#%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
+#%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.9-2



From fedora-cvs-commits at redhat.com  Fri Jul 28 01:56:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 21:56:57 -0400
Subject: rpms/pygtk2/devel pygtk-2.9.3-crazy-reload-hack.patch, NONE,
	1.1 pygtk.spec, 1.59, 1.60
Message-ID: <200607280156.k6S1uvHv018472@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18457

Modified Files:
	pygtk.spec 
Added Files:
	pygtk-2.9.3-crazy-reload-hack.patch 
Log Message:
* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
- Make sure reloading the gtk module works
- Fixes system-config-display (#199629)



pygtk-2.9.3-crazy-reload-hack.patch:
 __init__.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- NEW FILE pygtk-2.9.3-crazy-reload-hack.patch ---
--- pygtk-2.9.3/gtk/__init__.py.crazy-reload-hack	2006-07-27 21:46:37.000000000 -0400
+++ pygtk-2.9.3/gtk/__init__.py	2006-07-27 21:47:03.000000000 -0400
@@ -34,6 +34,20 @@
 if not hasattr(sys, 'argv'):
     sys.argv = []
 
+#crazy hack for reloading the gtk module
+if sys.modules.has_key ('gtk.deprecation'):
+    _Deprecated = sys.modules['gtk.deprecation']._Deprecated
+    _DeprecatedConstant = sys.modules['gtk.deprecation']._DeprecatedConstant
+
+if sys.modules.has_key ('gobject._gobject'):
+    _gobject = sys.modules['gobject._gobject']
+
+if sys.modules.has_key ('gtk._gtk'):
+    _gtk = sys.modules['gtk._gtk']
+
+if sys.modules.has_key ('gtk._lazyutils'):
+    _lazyutils = sys.modules['gtk._lazyutils']
+
 # load the required modules:
 import gobject as _gobject
 


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pygtk.spec	19 Jul 2006 21:32:05 -0000	1.59
+++ pygtk.spec	28 Jul 2006 01:56:55 -0000	1.60
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.9.3
-Release: 2
+Release: 3
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 
 Patch0: pygtk-2.9.2-use-complete-include-path.patch
 Patch1: pygtk-2.9.3-init.patch
+Patch2: pygtk-2.9.3-crazy-reload-hack.patch
 
 %description
 PyGTK is an extension module for python that gives you access to the GTK+
@@ -59,6 +60,7 @@
 %setup -q -n pygtk-%{version}
 %patch0 -p1 -b .use-complete-include-path
 %patch1 -p1
+%patch2 -p1 -b .crazy-reload-hack
 
 %build
 %configure --enable-thread --enable-numpy
@@ -117,6 +119,10 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
+- Make sure reloading the gtk module works
+- Fixes system-config-display (#199629)
+
 * Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 2.9.3-2
 - Revert to previous behavior of raising an error if $DISPLAY cannot be
   opened.



From fedora-cvs-commits at redhat.com  Fri Jul 28 02:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 22:07:24 -0400
Subject: rpms/desktop-backgrounds/devel desktop-backgrounds.spec,1.36,1.37
Message-ID: <200607280207.k6S27OYY018685@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18672

Modified Files:
	desktop-backgrounds.spec 
Log Message:
- Add dual screen backgrounds



Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- desktop-backgrounds.spec	26 Jul 2006 19:08:12 -0000	1.36
+++ desktop-backgrounds.spec	28 Jul 2006 02:07:21 -0000	1.37
@@ -1,9 +1,9 @@
-%define rh_backgrounds_version 11 
+%define rh_backgrounds_version 12 
 
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 34
+Release: 35
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -108,6 +108,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Thu Jul 27 2006 John (J5) Palmieri <johnp at redhat.com> - 2.0-35
+- Add dual screen background
+
 * Wed Jul 26 2006 Alexander Larsson <alexl at redhat.com> - 2.0-34
 - Add wide desktop background
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 02:09:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 22:09:18 -0400
Subject: rpms/desktop-backgrounds/devel .cvsignore, 1.11, 1.12 sources, 1.16,
	1.17
Message-ID: <200607280209.k6S29IN6018763@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18739

Modified Files:
	.cvsignore sources 
Log Message:
- Upload new redhat-background sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jul 2006 18:16:42 -0000	1.11
+++ .cvsignore	28 Jul 2006 02:09:14 -0000	1.12
@@ -1 +1,2 @@
 redhat-backgrounds-11.tar.bz2
+redhat-backgrounds-12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	26 Jul 2006 19:08:12 -0000	1.16
+++ sources	28 Jul 2006 02:09:14 -0000	1.17
@@ -1,2 +1,2 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
-0c9c02e17509c64d218551c0464f47e3  redhat-backgrounds-11.tar.bz2
+c9d97726a1ee0538aa2b83fa5eddc4a1  redhat-backgrounds-12.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 02:46:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 22:46:18 -0400
Subject: rpms/firefox/devel firefox.spec,1.133,1.134
Message-ID: <200607280246.k6S2kIFu020467@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20329

Modified Files:
	firefox.spec 
Log Message:
i am dumb


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- firefox.spec	28 Jul 2006 00:44:21 -0000	1.133
+++ firefox.spec	28 Jul 2006 02:46:16 -0000	1.134
@@ -342,10 +342,10 @@
 %{ffdir}/xpidl
 %{ffdir}/xpt_dump
 %{ffdir}/xpt_link
-%{ffdir}/firefox-xpcom.pc
-%{ffdir}/firefox-plugin.pc
-%{ffdir}/firefox-jscom.pc
-%{ffdir}/firefox-gtkmozembed.pc
+%{_libdir}/pkgconfig/firefox-xpcom.pc
+%{_libdir}/pkgconfig/firefox-plugin.pc
+%{_libdir}/pkgconfig/firefox-js.pc
+%{_libdir}/pkgconfig/firefox-gtkmozembed.pc
 %endif
 
 #---------------------------------------------------------------------



From fedora-cvs-commits at redhat.com  Fri Jul 28 03:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 23:23:02 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.307, 1.308 anaconda.spec, 1.433,
	1.434 sources, 1.430, 1.431
Message-ID: <200607280323.k6S3N2cT022716@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22657/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.69-1 on branch devel from anaconda-11.1.0.69-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- .cvsignore	27 Jul 2006 16:39:28 -0000	1.307
+++ .cvsignore	28 Jul 2006 03:22:59 -0000	1.308
@@ -1 +1 @@
-anaconda-11.1.0.68.tar.bz2
+anaconda-11.1.0.69.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- anaconda.spec	27 Jul 2006 16:39:28 -0000	1.433
+++ anaconda.spec	28 Jul 2006 03:22:59 -0000	1.434
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.68
+Version: 11.1.0.69
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,6 +103,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.69-1
+- Don't allow ipv6-only nfs installs (dcantrel)
+- Fix segfault with ksdevice= (pjones, #200451)
+- Fix ipv6 ftp installs (dcantrel)
+- Ignore options we don't understand to our modprobe to help fix X 
+  startup on radeon
+- Use rootpath in a few places we had /mnt/sysimage hardcoded
+- Fix method=
+
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.68-1
 - And another fix for the RHEL installclass
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- sources	27 Jul 2006 16:39:28 -0000	1.430
+++ sources	28 Jul 2006 03:22:59 -0000	1.431
@@ -1 +1 @@
-a12fb120faaf0493817e9e5c55b014c1  anaconda-11.1.0.68.tar.bz2
+2699bdc664c0e4feeb9ff0ea2f7a7141  anaconda-11.1.0.69.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 03:35:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 23:35:04 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.308, 1.309 anaconda.spec, 1.434,
	1.435 sources, 1.431, 1.432
Message-ID: <200607280335.k6S3Z4ei026176@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26142/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.70-1 on branch devel from anaconda-11.1.0.70-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- .cvsignore	28 Jul 2006 03:22:59 -0000	1.308
+++ .cvsignore	28 Jul 2006 03:35:02 -0000	1.309
@@ -1 +1 @@
-anaconda-11.1.0.69.tar.bz2
+anaconda-11.1.0.70.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- anaconda.spec	28 Jul 2006 03:22:59 -0000	1.434
+++ anaconda.spec	28 Jul 2006 03:35:02 -0000	1.435
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.69
+Version: 11.1.0.70
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,7 +103,7 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.69-1
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.70-1
 - Don't allow ipv6-only nfs installs (dcantrel)
 - Fix segfault with ksdevice= (pjones, #200451)
 - Fix ipv6 ftp installs (dcantrel)
@@ -111,6 +111,7 @@
   startup on radeon
 - Use rootpath in a few places we had /mnt/sysimage hardcoded
 - Fix method=
+- Fix translation mismatch
 
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.68-1
 - And another fix for the RHEL installclass


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- sources	28 Jul 2006 03:22:59 -0000	1.431
+++ sources	28 Jul 2006 03:35:02 -0000	1.432
@@ -1 +1 @@
-2699bdc664c0e4feeb9ff0ea2f7a7141  anaconda-11.1.0.69.tar.bz2
+ae219ad179de7d6acc0ec5a1c1440067  anaconda-11.1.0.70.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 03:44:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 23:44:58 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.309, 1.310 anaconda.spec, 1.435,
	1.436 sources, 1.432, 1.433
Message-ID: <200607280344.k6S3iwNg029518@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29466/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.71-1 on branch devel from anaconda-11.1.0.71-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- .cvsignore	28 Jul 2006 03:35:02 -0000	1.309
+++ .cvsignore	28 Jul 2006 03:44:56 -0000	1.310
@@ -1 +1 @@
-anaconda-11.1.0.70.tar.bz2
+anaconda-11.1.0.71.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- anaconda.spec	28 Jul 2006 03:35:02 -0000	1.435
+++ anaconda.spec	28 Jul 2006 03:44:56 -0000	1.436
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.70
+Version: 11.1.0.71
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,7 +103,7 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.70-1
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.71-1
 - Don't allow ipv6-only nfs installs (dcantrel)
 - Fix segfault with ksdevice= (pjones, #200451)
 - Fix ipv6 ftp installs (dcantrel)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- sources	28 Jul 2006 03:35:02 -0000	1.432
+++ sources	28 Jul 2006 03:44:56 -0000	1.433
@@ -1 +1 @@
-ae219ad179de7d6acc0ec5a1c1440067  anaconda-11.1.0.70.tar.bz2
+e02e14fccf1493c8908cb27426dcd1c4  anaconda-11.1.0.71.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 03:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 27 Jul 2006 23:54:00 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.310, 1.311 anaconda.spec, 1.436,
	1.437 sources, 1.433, 1.434
Message-ID: <200607280354.k6S3s0EW015263@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15209/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-11.1.0.72-1 on branch devel from anaconda-11.1.0.72-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- .cvsignore	28 Jul 2006 03:44:56 -0000	1.310
+++ .cvsignore	28 Jul 2006 03:53:57 -0000	1.311
@@ -1 +1 @@
-anaconda-11.1.0.71.tar.bz2
+anaconda-11.1.0.72.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -r1.436 -r1.437
--- anaconda.spec	28 Jul 2006 03:44:56 -0000	1.436
+++ anaconda.spec	28 Jul 2006 03:53:57 -0000	1.437
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.71
+Version: 11.1.0.72
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -103,7 +103,7 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.71-1
+* Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.72-1
 - Don't allow ipv6-only nfs installs (dcantrel)
 - Fix segfault with ksdevice= (pjones, #200451)
 - Fix ipv6 ftp installs (dcantrel)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- sources	28 Jul 2006 03:44:56 -0000	1.433
+++ sources	28 Jul 2006 03:53:58 -0000	1.434
@@ -1 +1 @@
-e02e14fccf1493c8908cb27426dcd1c4  anaconda-11.1.0.71.tar.bz2
+b4ff742f853b08979a7cc6ab1f775a14  anaconda-11.1.0.72.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 04:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 00:28:36 -0400
Subject: rpms/setroubleshoot/devel .cvsignore, 1.11, 1.12 setroubleshoot.spec,
	1.15, 1.16 sources, 1.13, 1.14
Message-ID: <200607280428.k6S4Sav8004036@cvs.devel.redhat.com>

Author: jdennis

Update of /cvs/dist/rpms/setroubleshoot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3995/devel

Modified Files:
	.cvsignore setroubleshoot.spec sources 
Log Message:
auto-import setroubleshoot-0.16-1 on branch devel from setroubleshoot-0.16-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	27 Jul 2006 14:28:34 -0000	1.11
+++ .cvsignore	28 Jul 2006 04:28:33 -0000	1.12
@@ -1 +1 @@
-setroubleshoot-0.15.tar.gz
+setroubleshoot-0.16.tar.gz


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- setroubleshoot.spec	27 Jul 2006 14:28:34 -0000	1.15
+++ setroubleshoot.spec	28 Jul 2006 04:28:33 -0000	1.16
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.15
+Version: 0.16
 Release: 1
 License: GPL
 Group: Applications/System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jul 2006 14:28:34 -0000	1.13
+++ sources	28 Jul 2006 04:28:33 -0000	1.14
@@ -1 +1 @@
-f07dea1b1d86430559b60ffaa327e466  setroubleshoot-0.15.tar.gz
+a0fd9b48fb28c7ee9c841fe66abaabe2  setroubleshoot-0.16.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 28 04:33:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 00:33:03 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2469,1.2470
Message-ID: <200607280433.k6S4Ww15004676@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4620

Modified Files:
	kernel-2.6.spec 
Log Message:
this is so screwed.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2469
retrieving revision 1.2470
diff -u -r1.2469 -r1.2470
--- kernel-2.6.spec	28 Jul 2006 01:31:03 -0000	1.2469
+++ kernel-2.6.spec	28 Jul 2006 04:32:46 -0000	1.2470
@@ -1261,11 +1261,11 @@
     [ -z "$DevelLink" ] || ln -sf `basename $DevelDir` $RPM_BUILD_ROOT/$DevelLink
 
 	# Temporary fix for upstream "make prepare" bug.
-	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
-	if [ -f Makefile ]; then
-		make prepare
-	fi
-	popd > /dev/null
+#	pushd $RPM_BUILD_ROOT/$DevelDir > /dev/null
+#	if [ -f Makefile ]; then
+#		make prepare
+#	fi
+#	popd > /dev/null
 }
 
 ###



From fedora-cvs-commits at redhat.com  Fri Jul 28 04:37:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 00:37:25 -0400
Subject: rpms/libgnome/devel libgnome.spec,1.62,1.63
Message-ID: <200607280437.k6S4bPOI005247@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5215

Modified Files:
	libgnome.spec 
Log Message:
* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com 2.15.1-3.fc6
- Update utempter dependency and rebuild to ensure new libutempter is used.
- Change BuildRoot to comply with Fedora packaging guidelines.
- Change legacy style PreReqs to Requires({pre,post,postun}) style and update



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- libgnome.spec	24 Jul 2006 17:59:21 -0000	1.62
+++ libgnome.spec	28 Jul 2006 04:37:19 -0000	1.63
@@ -12,13 +12,13 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.15.1
-Release: 2
-URL: ftp://ftp.gnome.org/
+Release: 3%{?dist}
+URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
 License: LGPL
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  glib2 >= %{glib2_version}
 Requires:  libbonobo >= %{libbonobo_version}
@@ -27,8 +27,12 @@
 Requires:  ORBit2 >= %{orbit2_version}
 Requires:  libxslt >= %{libxslt_version}
 ## prereq for gconftool
-PreReq:  GConf2 >= %{gconf2_version}
-PreReq: /usr/bin/gconftool-2
+Requires(pre):  GConf2 >= %{gconf2_version}
+# Added to avoid the warning messages about utmp group, bug #24171
+# fixme, just libzvt?
+Requires(pre): utempter
+Requires(post): /usr/bin/gconftool-2 /sbin/ldconfig
+Requires(postun): /usr/bin/gconftool-2 /sbin/ldconfig
 
 BuildRequires:	zlib-devel
 BuildRequires:	esound-devel >= %{esound_version}
@@ -51,9 +55,6 @@
 Patch6: libgnome-2.15.1-stat-homedir.patch
 Patch7: libgnome-2.15.1-turn-off-im-menu.patch
 
-# Added to avoid the warning messages about utmp group, bug #24171
-# fixme, just libzvt?
-PreReq:                utempter
 
 %description
 
@@ -67,7 +68,7 @@
 %package devel
 Summary: Libraries and headers for libgnome
 Group: Development/Libraries
-Requires: %name = %{version}
+Requires: %{name} = %{version}
 
 Conflicts: gnome-libs-devel < 1.4.1.2
 Requires: zlib-devel
@@ -160,6 +161,11 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Jul 27 2006 Mike A. Harris <mharris at redhat.com> 2.15.1-3.fc6
+- Update utempter dependency and rebuild to ensure new libutempter is used.
+- Change BuildRoot to comply with Fedora packaging guidelines.
+- Change legacy style PreReqs to Requires({pre,post,postun}) style and update
+
 * Mon Jul 24 2006 Ray Strode <rstrode at redhat.com> - 2.15.1-2
 - turn off im menu by default (bug 199967)
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 08:54:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 04:54:38 -0400
Subject: rpms/postfix/devel .cvsignore, 1.19, 1.20 postfix.spec, 1.43,
	1.44 sources, 1.19, 1.20
Message-ID: <200607280854.k6S8sc2F016442@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16368

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
[tw]
- new version 2.3.1
- fixes problems with TLS and Milter support




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	24 Jul 2006 12:55:03 -0000	1.19
+++ .cvsignore	28 Jul 2006 08:54:35 -0000	1.20
@@ -1,3 +1,4 @@
 pflogsumm-1.1.0.tar.gz
 postfix-2.2.10.tar.gz
 postfix-2.3.0.tar.gz
+postfix-2.3.1.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- postfix.spec	25 Jul 2006 16:31:00 -0000	1.43
+++ postfix.spec	28 Jul 2006 08:54:35 -0000	1.44
@@ -42,8 +42,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.3.0
-Release: 2
+Version: 2.3.1
+Release: 1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -468,6 +468,10 @@
 
 
 %changelog
+* Fri Jul 28 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.1-1
+- new version 2.3.1
+- fixes problems with TLS and Milter support
+
 * Tue Jul 25 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.0-2
 - fixed SASL build (#200079)
   thanks to Kaj J. Niemi for the patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jul 2006 12:55:03 -0000	1.19
+++ sources	28 Jul 2006 08:54:35 -0000	1.20
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-72a714e0cc8a5fdbe770359ae965e09b  postfix-2.3.0.tar.gz
+c4969321233186f6fc386a10b858c63b  postfix-2.3.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 28 12:35:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 08:35:44 -0400
Subject: rpms/cups/FC-5 cups-autodetected-tag.patch,1.1,NONE
Message-ID: <200607281235.k6SCZibL000366@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv336

Removed Files:
	cups-autodetected-tag.patch 
Log Message:
No longer need this patch.


--- cups-autodetected-tag.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 12:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 08:43:02 -0400
Subject: rpms/cups/FC-5 snmp-str1737.c,NONE,1.1 cups.spec,1.199,1.200
Message-ID: <200607281243.k6SCh25c002642@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2556

Modified Files:
	cups.spec 
Added Files:
	snmp-str1737.c 
Log Message:
* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.2
- Use replacement snmp.c from STR #1737 (bug #193093).



***** Error reading new file: [Errno 2] No such file or directory: 'snmp-str1737.c'

Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- cups.spec	20 Jul 2006 10:47:09 -0000	1.199
+++ cups.spec	28 Jul 2006 12:43:00 -0000	1.200
@@ -5,12 +5,13 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: snmp-str1737.c
 Source5: cups-lpd
 Source6: pstoraster
 Source7: pstoraster.convs
@@ -133,6 +134,7 @@
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
+cp %{SOURCE3} backend/snmp.c
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -398,6 +400,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.2
+- Use replacement snmp.c from STR #1737 (bug #193093).
+
 * Thu Jul 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.1
 - 1.2.2.
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 13:08:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 09:08:59 -0400
Subject: rpms/cvs/devel cvs-1.11.22-ipv6-proxy.patch, NONE, 1.1 cvs.spec,
	1.47, 1.48
Message-ID: <200607281308.k6SD8xHG025452@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/cvs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25419

Modified Files:
	cvs.spec 
Added Files:
	cvs-1.11.22-ipv6-proxy.patch 
Log Message:
added ipv6 patch (#199404)

cvs-1.11.22-ipv6-proxy.patch:
 client.c |  208 +++++++++++++++++++++++++++++++++++++--------------------------
 cvs.h    |    1 
 main.c   |   14 +++-
 server.c |   18 +++--
 4 files changed, 148 insertions(+), 93 deletions(-)

--- NEW FILE cvs-1.11.22-ipv6-proxy.patch ---
--- cvs-1.11.22/src/server.c.ipv6	2006-07-28 14:26:08.000000000 +0200
+++ cvs-1.11.22/src/server.c	2006-07-28 14:26:08.000000000 +0200
@@ -6091,8 +6091,8 @@
 {
     int status;
     char instance[INST_SZ];
-    struct sockaddr_in peer;
-    struct sockaddr_in laddr;
+    struct sockaddr_storage peer;
+    struct sockaddr_storage laddr;
     int len;
     KTEXT_ST ticket;
     AUTH_DAT auth;
@@ -6169,7 +6169,8 @@
 gserver_authenticate_connection ()
 {
     char hostname[MAXHOSTNAMELEN];
-    struct hostent *hp;
+    char hbuf[1025];
+    struct addrinfo hints, *res0;
     gss_buffer_desc tok_in, tok_out;
     char buf[1024];
     char *credbuf;
@@ -6181,11 +6182,16 @@
     gss_OID mechid;
 
     gethostname (hostname, sizeof hostname);
-    hp = gethostbyname (hostname);
-    if (hp == NULL)
+    hostname[sizeof(hostname)-1] = '\0';
+    memset (&hints, 0, sizeof(hints));
+    hints.ai_family = af;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_CANONNAME;
+    if (getaddrinfo (hostname, NULL, &hints, &res0))
 	error (1, 0, "can't get canonical hostname");
 
-    sprintf (buf, "cvs@%s", hp->h_name);
+    sprintf (buf, "cvs@%s", res0->ai_canonname);
+    freeaddrinfo (res0);
     tok_in.value = buf;
     tok_in.length = strlen (buf);
 
--- cvs-1.11.22/src/main.c.ipv6	2006-07-28 14:26:08.000000000 +0200
+++ cvs-1.11.22/src/main.c	2006-07-28 14:26:08.000000000 +0200
@@ -18,6 +18,7 @@
  */
 
 #include <assert.h>
+#include <sys/socket.h>
 #include "cvs.h"
 
 #ifdef HAVE_WINSOCK_H
@@ -47,6 +48,7 @@
 int trace = 0;
 int noexec = 0;
 int logoff = 0;
+int af = AF_UNSPEC;
 
 /*
  * Zero if compression isn't supported or requested; non-zero to indicate
@@ -164,7 +166,7 @@
        in --help as it is a rather different format from the rest.  */
 
     "Usage: %s [cvs-options] command [command-options-and-arguments]\n",
-    "  where cvs-options are -q, -n, etc.\n",
+    "  where cvs-options are -4, -6,-q, -n, etc.\n",
     "    (specify --help-options for a list of options)\n",
     "  where command is add, admin, etc.\n",
     "    (specify --help-commands for a list of commands\n",
@@ -262,6 +264,8 @@
 #endif
     "    -a           Authenticate all net traffic.\n",
 #endif
+    "    -4           Use IPv4.\n",
+    "    -6           Use IPv6.\n",
     "    -s VAR=VAL   Set CVS user variable.\n",
     "(Specify the --help option for a list of other help options)\n",
     NULL
@@ -414,7 +418,7 @@
     int help = 0;		/* Has the user asked for help?  This
 				   lets us support the `cvs -H cmd'
 				   convention to give help for cmd. */
-    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
+    static const char short_options[] = "+46Qqrwtnvb:T:e:d:Hfz:s:xa";
     static struct option long_options[] =
     {
         {"help", 0, NULL, 'H'},
@@ -521,6 +525,12 @@
 		/* --allow-root */
 		root_allow_add (optarg);
 		break;
+	    case '4':
+		af = AF_INET;
+		break;
+	    case '6':
+		af = AF_INET6;
+		break;
 	    case 'Q':
 		really_quiet = 1;
 		/* FALL THROUGH */
--- cvs-1.11.22/src/cvs.h.ipv6	2006-05-16 02:59:21.000000000 +0200
+++ cvs-1.11.22/src/cvs.h	2006-07-28 14:26:08.000000000 +0200
@@ -381,6 +381,7 @@
 extern int really_quiet, quiet;
 extern int use_editor;
 extern int cvswrite;
+extern int af;
 extern mode_t cvsumask;
 
 
--- cvs-1.11.22/src/client.c.ipv6	2006-07-28 14:26:08.000000000 +0200
+++ cvs-1.11.22/src/client.c	2006-07-28 14:30:49.000000000 +0200
@@ -81,7 +81,7 @@
 /* This is needed for GSSAPI encryption.  */
 static gss_ctx_id_t gcontext;
 
-static int connect_to_gserver PROTO((cvsroot_t *, int, struct hostent *));
+static int connect_to_gserver PROTO((cvsroot_t *, int, char *));
 
 # endif /* HAVE_GSSAPI */
 
@@ -146,7 +146,7 @@
 
 static void proxy_connect PROTO ((cvsroot_t *, int));
 static void auth_server PROTO ((cvsroot_t *, struct buffer *, struct buffer *,
-				int, int, struct hostent *));
+				int, int, char *));
 
 /* We need to keep track of the list of directories we've sent to the
    server.  This list, along with the current CVSROOT, will help us
@@ -3569,30 +3569,6 @@
 
 
 #if defined (AUTH_CLIENT_SUPPORT) || defined (HAVE_KERBEROS) || defined (HAVE_GSSAPI)
-static struct hostent *init_sockaddr PROTO ((struct sockaddr_in *, char *,
-					     unsigned int));
-
-static struct hostent *
-init_sockaddr (name, hostname, port)
-    struct sockaddr_in *name;
-    char *hostname;
-    unsigned int port;
-{
-    struct hostent *hostinfo;
-    unsigned short shortport = port;
-
-    memset (name, 0, sizeof (*name));
-    name->sin_family = AF_INET;
-    name->sin_port = htons (shortport);
-    hostinfo = gethostbyname (hostname);
-    if (hostinfo == NULL)
-    {
-	fprintf (stderr, "Unknown host %s.\n", hostname);
-	error_exit ();
-    }
-    name->sin_addr = *(struct in_addr *) hostinfo->h_addr;
-    return hostinfo;
-}
 
 
 
@@ -3768,41 +3744,63 @@
 {
     int sock;
     int port_number;
-    struct sockaddr_in client_sai;
-    struct hostent *hostinfo;
+    int gerr;
+    struct addrinfo hints, *res, *res0;
+    char pbuf[32];
     struct buffer *local_to_server, *local_from_server;
+    char *p_hostname;
 
-    sock = socket (AF_INET, SOCK_STREAM, 0);
-    if (sock == -1)
-    {
-	error (1, 0, "cannot create socket: %s", SOCK_STRERROR (SOCK_ERRNO));
-    }
     port_number = get_cvs_port_number (root);
 
-    /* if we have a proxy connect to that instead */
-    if (root->proxy_hostname)
-    {
-	hostinfo = init_sockaddr (&client_sai, root->proxy_hostname, root->proxy_port);
-    }
-    else
-    {
-	hostinfo = init_sockaddr (&client_sai, root->hostname, port_number);
+    sprintf (pbuf, "%u", port_number);
+    pbuf[sizeof(pbuf)-1] = '\0';
+    memset (&hints, 0, sizeof (hints));
+    hints.ai_family = af;
+    hints.ai_socktype = SOCK_STREAM;
+
+    /* do we have a proxy? */
+    p_hostname = (root->proxy_hostname) ? root->proxy_hostname : root->hostname;
+
+    gerr = getaddrinfo (p_hostname, pbuf, &hints, &res0);
+    if (gerr)
+    {
+       fprintf (stderr, "Unknown host %s.\n", p_hostname);
+       error_exit ();
+    }
+
+    /* Try connect to p_hostname using all available families */
+    for (res = res0; res != NULL; res = res->ai_next)
+    {
+       sock = socket (res->ai_family, res->ai_socktype, 0);
+       if (sock == -1) {
+           if (res->ai_next)
+               continue;
+           else {
+               char *sock_error = SOCK_STRERROR (SOCK_ERRNO);
+               freeaddrinfo(res0);
+               error (1, 0, "cannot create socket: %s", sock_error);
+           }
+       }
+
+       if (connect (sock, res->ai_addr, res->ai_addrlen) < 0)
+       {
+           if (res->ai_next)
+           {
+               close(sock);
+               continue;
+           }
+           else
+           {
+               char *sock_error = SOCK_STRERROR (SOCK_ERRNO);
+               freeaddrinfo(res0);
+               error (1, 0, "connect to [%s]:%s failed: %s", p_hostname,
+                       pbuf, sock_error);
+           }
+       }
+       /* success */
+       break;
     }
 
-    if (trace)
-    {
-	fprintf (stderr, " -> Connecting to %s(%s):%d\n",
-		 root->hostname,
-		 inet_ntoa (client_sai.sin_addr), port_number);
-    }
-    if (connect (sock, (struct sockaddr *) &client_sai, sizeof (client_sai))
-	< 0)
-	error (1, 0, "connect to %s(%s):%d failed: %s",
-	       root->proxy_hostname ? root->proxy_hostname : root->hostname,
-	       inet_ntoa (client_sai.sin_addr),
-	       root->proxy_hostname ? root->proxy_port : port_number,
-	       SOCK_STRERROR (SOCK_ERRNO));
-
     make_bufs_from_fds (sock, sock, 0, &local_to_server, &local_from_server, 1);
 
     if (root->proxy_hostname)
@@ -3816,7 +3814,7 @@
 	proxy_connect (root, port_number);
     }
 
-    auth_server (root, local_to_server, local_from_server, verify_only, do_gssapi, hostinfo);
+    auth_server (root, local_to_server, local_from_server, verify_only, do_gssapi, p_hostname);
 
     if (verify_only)
     {
@@ -3890,13 +3888,13 @@
 
 
 static void
-auth_server (root, lto_server, lfrom_server, verify_only, do_gssapi, hostinfo)
+auth_server (root, lto_server, lfrom_server, verify_only, do_gssapi, hostname)
     cvsroot_t *root;
     struct buffer *lto_server;
     struct buffer *lfrom_server;
     int verify_only;
     int do_gssapi;
-    struct hostent *hostinfo;
+    char *hostname;
 {
     char *username;			/* the username we use to connect */
     char no_passwd = 0;			/* gets set if no password found */
@@ -3926,7 +3924,7 @@
 	    error (1, 0, "gserver currently only enabled for socket connections");
 	}
 
-	if (! connect_to_gserver (root, fd, hostinfo))
+	if (! connect_to_gserver (root, fd, hostname))
 	{
 	    error (1, 0,
 		    "authorization failed: server %s rejected access to %s",
@@ -3942,7 +3940,7 @@
 	char *begin      = NULL;
 	char *password   = NULL;
 	char *end        = NULL;
-	
+
 	if (verify_only)
 	{
 	    begin = "BEGIN VERIFICATION REQUEST";
@@ -4124,36 +4122,74 @@
     int s;
     const char *portenv;
     int port;
-    struct hostent *hp;
-    struct sockaddr_in sin;
+    int gerr;
+    struct addrinfo hints, *res, *res0;
     char *hname;
-
-    s = socket (AF_INET, SOCK_STREAM, 0);
-    if (s < 0)
-	error (1, 0, "cannot create socket: %s", SOCK_STRERROR (SOCK_ERRNO));
+    char pbuf[32], hbuf[1025];
 
     port = get_cvs_port_number (root);
 
-    hp = init_sockaddr (&sin, root->hostname, port);
+    sprintf (pbuf, "%u", port);
+    pbuf[sizeof(pbuf)-1] = '\0';
+    memset (&hints, 0, sizeof(hints));
+    hints.ai_family = af;
+    hints.ai_socktype = SOCK_STREAM;
+    gerr = getaddrinfo (root->hostname, pbuf, &hints, &res0);
+    if (gerr) {
+	fprintf (stderr, "Unknown host %s.\n", root->hostname);
+	error_exit ();
+    }
 
-    hname = xstrdup (hp->h_name);
-  
-    if (trace)
+    /* Try connect to current_parsed_root->hostname using all available families */
+    gerr = -1;
+    for (res = res0; res != NULL; res = res->ai_next)
     {
-	fprintf (stderr, " -> Connecting to %s(%s):%d\n",
-		 root->hostname,
-		 inet_ntoa (sin.sin_addr), port);
+	s = socket (res->ai_family, res->ai_socktype, 0);
+	if (s < 0)
+	{
+	    if (res->ai_next)
+		continue;
+	    else
+	    {
+		char *sock_error = SOCK_STRERROR (SOCK_ERRNO);
+		freeaddrinfo(res0);
+		error (1, 0, "cannot create socket: %s", sock_error);
+	    }
+	}
+	if (trace)
+	{
+	    char hbuf[1025];
+	    getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
+		    NULL, 0, NI_NUMERICHOST);
+	    fprintf (stderr, " -> Connecting to %s(%s):%d\n",
+		    root->hostname, hbuf, port);
+	}
+	
+	if (connect (s, res->ai_addr, res->ai_addrlen) < 0)
+	{
+	    if (res->ai_next)
+	    {
+		close(s);
+		continue;
+	    }
+	    else
+	    {
+		char *sock_error = SOCK_STRERROR (SOCK_ERRNO);
+		freeaddrinfo(res0);
+		error (1, 0, "connect to [%s]:%s failed: %s",
+			root->hostname, pbuf, sock_error);
+	    }
+	}
+	getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf), NULL, 0, 0);
+	hname = xmalloc (strlen (hbuf) + 1);
+	strcpy (hname, hbuf);
+	/* success */
+	break;
     }
 
-    if (connect (s, (struct sockaddr *) &sin, sizeof sin) < 0)
-	error (1, 0, "connect to %s(%s):%d failed: %s",
-	       root->hostname,
-	       inet_ntoa (sin.sin_addr),
-	       port, SOCK_STRERROR (SOCK_ERRNO));
-
     {
 	const char *realm;
-	struct sockaddr_in laddr;
+	struct sockaddr_storage laddr;
 	int laddrlen;
 	KTEXT_ST ticket;
 	MSG_DAT msg_data;
@@ -4169,13 +4205,15 @@
 	/* We don't care about the checksum, and pass it as zero.  */
 	status = krb_sendauth (KOPT_DO_MUTUAL, s, &ticket, "rcmd",
 			       hname, realm, (unsigned long) 0, &msg_data,
-			       &cred, sched, &laddr, &sin, "KCVSV1.0");
+			       &cred, sched, &laddr, res->ai_addr, "KCVSV1.0");
 	if (status != KSUCCESS)
 	    error (1, 0, "kerberos authentication failed: %s",
 		   krb_get_err_text (status));
 	memcpy (kblock, cred.session, sizeof (C_Block));
     }
 
+    freeaddrinfo(res0);
+
     close_on_exec (s);
 
     free (hname);
@@ -4228,10 +4266,10 @@
  */
 #define BUFSIZE 1024
 static int
-connect_to_gserver (root, sock, hostinfo)
+connect_to_gserver (root, sock, hostname)
     cvsroot_t *root;
     int sock;
-    struct hostent *hostinfo;
+    char *hostname;
 {
     char *str;
     char buf[BUFSIZE];
@@ -4244,9 +4282,9 @@
     if (send (sock, str, strlen (str), 0) < 0)
 	error (1, 0, "cannot send: %s", SOCK_STRERROR (SOCK_ERRNO));
 
-    if (strlen (hostinfo->h_name) > BUFSIZE - 5)
+    if (strlen (hostname) > BUFSIZE - 5)
 	error (1, 0, "Internal error: hostname exceeds length of buffer");
-    sprintf (buf, "cvs@%s", hostinfo->h_name);
+    sprintf (buf, "cvs@%s", hostname);
     tok_in.length = strlen (buf);
     tok_in.value = buf;
     gss_import_name (&stat_min, &tok_in, GSS_C_NT_HOSTBASED_SERVICE,


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cvs.spec	12 Jul 2006 04:54:51 -0000	1.47
+++ cvs.spec	28 Jul 2006 13:08:44 -0000	1.48
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 3.1
+Release: 4
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -28,6 +28,7 @@
 Patch14: cvs-1.11.21-diff-kk.patch
 Patch15: cvs-1.11.21-sort.patch
 Patch16: cvs-1.11.22-free.patch
+Patch17: cvs-1.11.22-ipv6-proxy.patch
 Prereq: /sbin/install-info
 Requires: vim-minimal
 Prefix: %{_prefix}
@@ -75,10 +76,10 @@
 %patch14 -p1 -b .diff-kk
 %patch15 -p1 -b .env
 %patch16 -p1 -b .free
+%patch17 -p1 -b .ipv6
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
-#%patch5 -p1 -b .extzlib2
 
 %build
 
@@ -143,6 +144,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Thu Jul 28 2006 Martin Stransky <stransky at redhat.com> - 1.11.22-4
+- added ipv6 patch (#199404)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.11.22-3.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 13:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 09:36:03 -0400
Subject: rpms/firefox/devel firefox.spec,1.134,1.135
Message-ID: <200607281336.k6SDa3CG021829@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21815

Modified Files:
	firefox.spec 
Log Message:
add more pc files



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- firefox.spec	28 Jul 2006 02:46:16 -0000	1.134
+++ firefox.spec	28 Jul 2006 13:36:00 -0000	1.135
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        4
+Release:        5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -346,11 +346,16 @@
 %{_libdir}/pkgconfig/firefox-plugin.pc
 %{_libdir}/pkgconfig/firefox-js.pc
 %{_libdir}/pkgconfig/firefox-gtkmozembed.pc
+%{_libdir}/pkgconfig/firefox-nspr.pc
+%{_libdir}/pkgconfig/firefox-nss.pc
 %endif
 
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.4-5
+- Add more pkgconfig files
+
 * Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4
 - Add pkgconfig files
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 13:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 09:55:18 -0400
Subject: rpms/cups/devel cups.spec,1.235,1.236
Message-ID: <200607281355.k6SDtIDC019097@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19042

Modified Files:
	cups.spec 
Log Message:
* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-5
- Disable LSPP for now, since it seems to break browsing somehow.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- cups.spec	24 Jul 2006 10:54:28 -0000	1.235
+++ cups.spec	28 Jul 2006 13:55:16 -0000	1.236
@@ -1,12 +1,12 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define lspp 1
+%define lspp 0
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -407,6 +407,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-5
+- Disable LSPP for now, since it seems to break browsing somehow.
+
 * Mon Jul 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-4
 - Fixed package requirements (bug #199903).
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 14:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 10:41:13 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch, NONE,
	1.1 openoffice.org.spec, 1.799, 1.800
Message-ID: <200607281441.k6SEfD0n015168@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15068

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch 
Log Message:
openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch

openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch:
 sc/source/filter/xml/xmltabi.cxx |   12 ++----------
 source/filter/xml/xmltabi.cxx    |    0 
 2 files changed, 2 insertions(+), 10 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch ---
Index: source/filter/xml/xmltabi.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/xml/xmltabi.cxx,v
retrieving revision 1.36
diff -u -r1.36 xmltabi.cxx
--- openoffice.org.orig/sc/source/filter/xml/xmltabi.cxx	23 Sep 2005 12:44:07 -0000	1.36
+++ openoffice.org/sc/source/filter/xml/xmltabi.cxx	28 Jul 2006 14:37:26 -0000
@@ -249,15 +249,11 @@
             for (i = 0; i < nDepth; ++i)
 			{
 				sal_Int32 nCount(pColArray->GetCount(static_cast<USHORT>(i)));
-				sal_Bool bChanged(sal_False);
-				for (sal_Int32 j = 0; j < nCount && !bChanged; ++j)
+				for (sal_Int32 j = 0; j < nCount; ++j)
 				{
 					ScOutlineEntry* pEntry(pColArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
 					if (pEntry->IsHidden())
-					{
 						pColArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
-						bChanged = sal_True;
-					}
 				}
 			}
 			ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
@@ -265,15 +261,11 @@
 			for (i = 0; i < nDepth; ++i)
 			{
 				sal_Int32 nCount(pRowArray->GetCount(static_cast<USHORT>(i)));
-				sal_Bool bChanged(sal_False);
-				for (sal_Int32 j = 0; j < nCount && !bChanged; ++j)
+				for (sal_Int32 j = 0; j < nCount; ++j)
 				{
 					ScOutlineEntry* pEntry(pRowArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
 					if (pEntry->IsHidden())
-					{
 						pRowArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
-						bChanged = sal_True;
-					}
 				}
 			}
 		}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- openoffice.org.spec	27 Jul 2006 14:58:55 -0000	1.799
+++ openoffice.org.spec	28 Jul 2006 14:41:11 -0000	1.800
@@ -56,7 +56,7 @@
 BuildRequires:	pam-devel, libjpeg-devel, sane-backends-devel, libXt-devel
 BuildRequires:	libICE-devel, evolution-data-server-devel, libxslt-devel,
 BuildRequires:	desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
-BuildRequires:  db4-devel, db4-java >= 4.3.28-3, mozilla-devel, agg-devel
+BuildRequires:  db4-devel, db4-java >= 4.3.28-3, firefox-devel, agg-devel
 BuildRequires:  libwpd-devel >= 0.8.0, xmlsec1-nss-devel >= 1.2.8-2, icu >= 3.4
 BuildRequires:	hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
 BuildRequires:	libicu-devel >= 3.4, ant, perl-Archive-Zip
@@ -125,6 +125,7 @@
 Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
+Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -877,6 +878,7 @@
 %patch59 -p1 -b .ooo67793.sw.stickymenu.patch
 %patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
 %patch61 -p1 -b .ooo65081.sw.layout.patch
+%patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
 
 tar xzf %{SOURCE1}
 
@@ -894,7 +896,7 @@
 fi
 cd config_office
 autoconf
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -3358,9 +3360,11 @@
 - rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
 - rh#199056# -> openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 - rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layout.patch
+- rh#200193# -> openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
 - drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 - drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 - require dejavu-lgc-fonts, Greek coverage problems begone
+- move to firefox-devel instead of mozilla-devel, --with-firefox
 
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN



From fedora-cvs-commits at redhat.com  Fri Jul 28 14:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 10:45:43 -0400
Subject: rpms/cups/devel snmp-str1737.c,NONE,1.1 cups.spec,1.236,1.237
Message-ID: <200607281445.k6SEjhWe017910@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16762

Modified Files:
	cups.spec 
Added Files:
	snmp-str1737.c 
Log Message:
* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-6
- Use replacement snmp.c from STR #1737 (bug #193093).
- Re-enable LSPP; doesn't harm browsing after all.



***** Error reading new file: [Errno 2] No such file or directory: 'snmp-str1737.c'

Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- cups.spec	28 Jul 2006 13:55:16 -0000	1.236
+++ cups.spec	28 Jul 2006 14:45:41 -0000	1.237
@@ -1,17 +1,18 @@
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
-%define lspp 0
+%define lspp 1
 %define cups_serverbin %{_exec_prefix}/lib/cups
 
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: snmp-str1737.c
 Source5: cups-lpd
 Source6: pstoraster
 Source7: pstoraster.convs
@@ -142,6 +143,7 @@
 %patch100 -p1 -b .lspp
 %endif
 
+cp %{SOURCE3} backend/snmp.c
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -407,6 +409,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-6
+- Use replacement snmp.c from STR #1737 (bug #193093).
+- Re-enable LSPP; doesn't harm browsing after all.
+
 * Fri Jul 28 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-5
 - Disable LSPP for now, since it seems to break browsing somehow.
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 14:56:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 10:56:31 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.800,
	1.801 openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch,
	1.1, NONE
Message-ID: <200607281456.k6SEuVJg003321@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3238

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch 
Log Message:
_ZA translations


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- openoffice.org.spec	28 Jul 2006 14:41:11 -0000	1.800
+++ openoffice.org.spec	28 Jul 2006 14:56:29 -0000	1.801
@@ -16,7 +16,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu ns tn ts
+%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts
 %else
 %define langpack_langs en-US
 %endif
@@ -631,6 +631,14 @@
 %description langpack-nn_NO
 Provides additional nynorsk translations for %{name}
 
+%package langpack-nr_ZA
+Summary: Southern Ndebele language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description langpack-nr_ZA
+Provides additional Southern Ndebele translations for %{name}
+
 %package langpack-pl_PL
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
@@ -705,6 +713,22 @@
 %description langpack-sr_CS
 Provides additional serbian translations for %{name}
 
+%package langpack-ss_ZA
+Summary: Swati language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description langpack-ss_ZA
+Provides additional swati translations for %{name}
+
+%package langpack-st_ZA
+Summary: Southern Sotho language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description langpack-st_ZA
+Provides additional Southern Sotho translations for %{name}
+
 %package langpack-sv
 Summary: Swedish language pack for %{name}
 Group: Applications/Productivity
@@ -777,6 +801,22 @@
 %description langpack-tr_TR
 Provides additional turkish translations for %{name}
 
+%package langpack-ve_ZA
+Summary: Venda language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description langpack-ve_ZA
+Provides additional venda translations for %{name}
+
+%package langpack-xh_ZA
+Summary: Xhosa language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description langpack-xh_ZA
+Provides additional xhosa translations for %{name}
+
 %package langpack-zh_CN
 Summary: Simplified Chinese language pack for %{name}
 Group: Applications/Productivity
@@ -2270,6 +2310,105 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ns.xcu
 
+%files langpack-nr_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/nr
+%{instdir}/program/resource/*680nr.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_nr*
+%{instdir}/share/readme/README_nr*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/nr
+%dir %{instdir}/share/template
+%{instdir}/share/template/nr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nr.xcu
+
+%files langpack-ss_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ss
+%{instdir}/program/resource/*680ss.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ss*
+%{instdir}/share/readme/README_ss*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ss
+%dir %{instdir}/share/template
+%{instdir}/share/template/ss
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ss.xcu
+
+%files langpack-st_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/st
+%{instdir}/program/resource/*680st.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_st*
+%{instdir}/share/readme/README_st*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/st
+%dir %{instdir}/share/template
+%{instdir}/share/template/st
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-st.xcu
+
+%files langpack-ve_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ve
+%{instdir}/program/resource/*680ve.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ve*
+%{instdir}/share/readme/README_ve*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ve
+%dir %{instdir}/share/template
+%{instdir}/share/template/ve
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ve.xcu
+
+%files langpack-xh_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/xh
+%{instdir}/program/resource/*680xh.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_xh*
+%{instdir}/share/readme/README_xh*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/xh
+%dir %{instdir}/share/template
+%{instdir}/share/template/xh
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-xh.xcu
 %endif
 
 %files core
@@ -3365,6 +3504,7 @@
 - drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 - require dejavu-lgc-fonts, Greek coverage problems begone
 - move to firefox-devel instead of mozilla-devel, --with-firefox
+- rh#200512# South African translations
 
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN


--- openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:10:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:10:28 -0400
Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.15,
	1.16 libgnomeprintui22.spec, 1.33, 1.34 sources, 1.15, 1.16
Message-ID: <200607281510.k6SFAS4i008186@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5430

Modified Files:
	.cvsignore libgnomeprintui22.spec sources 
Log Message:
re-add docs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Sep 2005 04:28:12 -0000	1.15
+++ .cvsignore	28 Jul 2006 15:10:25 -0000	1.16
@@ -4,3 +4,4 @@
 libgnomeprintui-2.11.0.tar.bz2
 libgnomeprintui-2.12.0.tar.bz2
 libgnomeprintui-2.12.1.tar.bz2
+docs.tar.gz


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libgnomeprintui22.spec	28 Jul 2006 01:53:00 -0000	1.33
+++ libgnomeprintui22.spec	28 Jul 2006 15:10:25 -0000	1.34
@@ -6,8 +6,10 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 4
+Release: 5
 Source0: libgnomeprintui-%{version}.tar.bz2
+# 
+Source1: docs.tar.gz
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
 Group: System Environment/Libraries
@@ -58,6 +60,8 @@
 %prep
 %setup -q -n libgnomeprintui-%{version}
 
+tar xzf %{SOURCE1}
+
 %patch1 -p1 -b .nognomecommon
 
 %build
@@ -99,9 +103,12 @@
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
-#%{_datadir}/gtk-doc
+%{_datadir}/gtk-doc
 
 %changelog
+* Fri Jul 28 2006 Matthias Clasen  <mclasen at redhat.com> - 2.12.1-5
+- Re-add docs
+
 * Thu Jul 27 2006 Matthias Clasen  <mclasen at redhat.com> - 2.12.1-4
 - Disable gtk-doc to fix multilib conflicts
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Sep 2005 04:28:12 -0000	1.15
+++ sources	28 Jul 2006 15:10:25 -0000	1.16
@@ -1 +1,2 @@
 fa0b0410c3ba8b6899c5ed278f02cbe5  libgnomeprintui-2.12.1.tar.bz2
+49aa70260af004f3046c9fef2257e331  docs.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:13:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:13:28 -0400
Subject: rpms/gnome-panel/devel gnome-panel-2.14.2-xio-error.patch, 1.1,
	1.2 gnome-panel.spec, 1.134, 1.135
Message-ID: <200607281513.k6SFDS5E009387@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9321

Modified Files:
	gnome-panel-2.14.2-xio-error.patch gnome-panel.spec 
Log Message:
- don't get stuck in infinite recursion loop from previous
  fix.  Patch by Fredric Crozat


gnome-panel-2.14.2-xio-error.patch:
 panel-applet-frame.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: gnome-panel-2.14.2-xio-error.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.14.2-xio-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.14.2-xio-error.patch	26 Jul 2006 15:32:36 -0000	1.1
+++ gnome-panel-2.14.2-xio-error.patch	28 Jul 2006 15:13:25 -0000	1.2
@@ -48,11 +48,12 @@
  static void
  panel_applet_frame_activated (Bonobo_Unknown     object,
  			      CORBA_Environment *ev,
-@@ -1373,6 +1393,8 @@ panel_applet_frame_activated (Bonobo_Unk
+@@ -1373,6 +1393,9 @@ panel_applet_frame_activated (Bonobo_Unk
  	ORBit_small_listen_for_broken (object,
  				       G_CALLBACK (panel_applet_frame_cnx_broken),
  				       frame);
-+	panel_applet_frame_old_xio_error_handler = 
++	if (!panel_applet_frame_old_xio_error_handler) 
++         panel_applet_frame_old_xio_error_handler = 
 +           XSetIOErrorHandler (panel_applet_frame_xio_error_handler);
  
  	gtk_container_add (GTK_CONTAINER (frame), widget);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnome-panel.spec	26 Jul 2006 15:32:36 -0000	1.134
+++ gnome-panel.spec	28 Jul 2006 15:13:25 -0000	1.135
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 7
+Release: 8
 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
@@ -229,6 +229,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-8
+- don't get stuck in infinite recursion loop from previous
+  fix.  Patch by Fredric Crozat
+
 * Wed Jul 26 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-7
 - don't try to talk to X if the connection is dead (bug 200149)
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:19:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:19:22 -0400
Subject: rpms/httpd/devel httpd-2.2.3.tar.gz.asc, NONE, 1.1 .cvsignore, 1.16,
	1.17 httpd.spec, 1.96, 1.97 sources, 1.13, 1.14 upstream, 1.6,
	1.7 httpd-2.2.2.tar.gz.asc, 1.1, NONE
Message-ID: <200607281519.k6SFJMDo026430@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26400

Modified Files:
	.cvsignore httpd.spec sources upstream 
Added Files:
	httpd-2.2.3.tar.gz.asc 
Removed Files:
	httpd-2.2.2.tar.gz.asc 
Log Message:
* Fri Jul 28 2006 Joe Orton <jorton at redhat.com> 2.2.3-2
- update to 2.2.3
- trim %changelog to >=2.0.52



--- NEW FILE httpd-2.2.3.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)

iQEVAwUARMj5dfcTqHkQ/eB1AQIQ9gf9HeZ5UPY4AOWdSZmoj4SK/IPdl92OAchN
nBKsHBN8nNWN3y9U6QmkvFWStf5aWIFcwGNJXednYKhAREZA8wZHURgmzmq3jNZU
lVsfy0nv4s4W8OdvAQ9XpnIkjzhWT0BjjqEfFS16+iPxAVmmQTYUXpfi/QJT7A8/
yoUuZwg9a8d5XJf5gCfwmLyN1vTWgPI4vcbiOHOCdSmCUTNHu9UasI0yZIVJP2ma
jttvlRDz1iRyPoNP7IUnEmmojvHzlqxvTrXD5t+bvhq4+7UNe0pOK9wGoKdViTFe
O+yy50O4MBSDLKCkRFqONdIyf1+dHIU4NaEUxjH8BgH0bTXXZrTnfA==
=3Amm
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	19 Jul 2006 12:28:45 -0000	1.16
+++ .cvsignore	28 Jul 2006 15:19:20 -0000	1.17
@@ -1,4 +1 @@
-httpd-2.2.2.tar.gz
-*.rpm
-x86_64
-clog
+httpd-2.2.3.tar.gz


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- httpd.spec	20 Jul 2006 09:31:15 -0000	1.96
+++ httpd.spec	28 Jul 2006 15:19:20 -0000	1.97
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.2
-Release: 8
+Version: 2.2.3
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -481,6 +481,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Jul 28 2006 Joe Orton <jorton at redhat.com> 2.2.3-2
+- update to 2.2.3
+- trim %%changelog to >=2.0.52
+
 * Thu Jul 20 2006 Joe Orton <jorton at redhat.com> 2.2.2-8
 - fix segfault on dummy connection failure at graceful restart (#199429)
 
@@ -668,440 +672,3 @@
 * Tue Sep 28 2004 Joe Orton <jorton at redhat.com> 2.0.52-2
 - update to 2.0.52
 
-* Tue Sep 21 2004 Joe Orton <jorton at redhat.com> 2.0.51-6
-- fix 2.0.51 regression in Satisfy merging (CAN-2004-0811)
-
-* Sat Sep 18 2004 Joe Orton <jorton at redhat.com> 2.0.51-5
-- switch to Jeff Trawick's child reclaim timing logic patch
-- migration guide updates
-
-* Thu Sep 16 2004 Joe Orton <jorton at redhat.com> 2.0.51-4
-- fix pcre includes
-
-* Thu Sep 16 2004 Joe Orton <jorton at redhat.com> 2.0.51-3
-- update to 2.0.51
-
-* Tue Sep 14 2004 Joe Orton <jorton at redhat.com> 2.0.50-8
-- add improved child reclaim timing logic (#119128/#132360)
-- add BuildRequire zlib-devel for mod_deflate
-
-* Wed Sep  8 2004 Joe Orton <jorton at redhat.com> 2.0.50-7
-- prereq rather than just require httpd from -suexec (#132045)
-
-* Sun Sep  5 2004 Joe Orton <jorton at redhat.com> 2.0.50-6
-- include /etc/sysconfig/httpd template (#112085)
-- pass $OPTIONS in httpd invocations in apachectl (#115910)
-- do not pass $OPTIONS to apachectl from init script
-- start httpd in C locale by default from apachectl
-
-* Wed Sep  1 2004 Joe Orton <jorton at redhat.com> 2.0.50-5
-- move manual configuration into conf.d/manual.conf (#131208)
-- add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl
-- document AddDefaultCharset change since 1.3 in migration.html
-
-* Tue Aug 17 2004 Joe Orton <jorton at redhat.com> 2.0.50-4
-- start httpd in the C locale by default (#128002)
-- fix CustomLog comments in default httpd.conf (#43223)
-- ensure correct mod_suexec vs mod_userdir hook ordering 
-  (Joshua Slive, upstream #18156)
-
-* Tue Jun 29 2004 Joe Orton <jorton at redhat.com> 2.0.50-3
-- update -proxy11 patch
-- explain where suexec went if SuexecUserGroup is used but
-  /usr/sbin/suexec is not found
-
-* Tue Jun 29 2004 Joe Orton <jorton at redhat.com> 2.0.50-1
-- update to 2.0.50
-
-* Mon Jun 21 2004 Joe Orton <jorton at redhat.com> 2.0.49-8
-- split out suexec into httpd-suexec package (#77972)
-- link to system pcreposix.h to fix including httpd.h
-
-* Wed Jun 16 2004 Joe Orton <jorton at redhat.com> 2.0.49-7
-- don't install or use bundled pcreposix.h
-- bump default MaxClients to 256
-- drop default Timeout to 2 minutes
-- merge from upstream:
- * add fix for VirtualHost multiple address handling (Jeff Trawick)
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com> 2.0.49-6
-- rebuilt
-
-* Thu Jun 10 2004 Joe Orton <jorton at redhat.com> 2.0.49-5
-- remove comments about ScoreBoardFile in httpd.conf
-- avoid redundant name lookup in pod code
-- mod_headers: add %{...}s feature for using SSL variables
-- mod_autoindex: don't truncate output on stat() failure (#117959)
-- mod_ssl: fix shmcb corruption with small caches (Geoff Thorpe)
-- mod_ssl: security fix for overflow in FakeBasicAuth (CVE CAN-2004-0488)
-- mod_deflate: fix memory consumption for large responses
-- check that suexec is setuid root (Andr?? Malo)
-- worker: add ThreadStackSize (Jeff Trawick) and ThreadGuardSize directives
-
-* Thu May  6 2004 Joe Orton <jorton at redhat.com> 2.0.49-4
-- make "noindex" page valid XHTML 1.1 (Pascal Volk, #122020)
-- fix SEGV with no Listen directives (Michael Corcoran)
-- mod_cgi: synch with 2.0 backport proposed upstream
-
-* Thu Apr 22 2004 Joe Orton <jorton at redhat.com> 2.0.49-3
-- conflict with older pcre (#121531)
-- include mod_ext_filter
-- mod_cgi: handle concurrent stderr/stdout from script
-
-* Fri Mar 26 2004 Joe Orton <jorton at redhat.com> 2.0.49-2
-- mod_ssl: fix session cache memory leak (Madhu Mathihalli)
-- mod_ssl: fix SEGV when trying to shutdown during pool cleanup
-- merge the mod_proxy HTTP/1.1-compliance fixes
-- apply fix for #118020
-
-* Thu Mar 18 2004 Joe Orton <jorton at redhat.com> 2.0.49-1
-- update to 2.0.49 (#118798, thanks to Robert Scheck)
-- only link ab and mod_ssl against SSL_LIBS
-- open log files using APR_LARGEFILE where available
-
-* Wed Mar 17 2004 Joe Orton <jorton at redhat.com> 2.0.48-18
-- add fix for #118020
-- ssl.conf tweaks: seed SSL PRNG with 256 bytes from /dev/urandom
-
-* Mon Mar 15 2004 Joe Orton <jorton at redhat.com> 2.0.48-17
-- use "SSLMutex default" in default ssl.conf
-- limit to 128K XML request bodies in default httpd.conf; fix to 
-  give a 413 error not a 400 if the limit is exceeded
-- mod_rewrite: add %%{SSL:...} and %%{HTTPS} variable lookups
-- mod_dav: propagate executable property across COPY/MOVE
-- mod_dav: give 507 on out-of-space errors in more places
-- mod_ssl: add ssl_is_https optional function
-- mod_ssl: support indexed lookup of DN components
-- mod_ssl: optimised variable lookup
-- mod_ssl: install only minimal mod_ssl.h
-- worker: fix potential hang at restart
-
-* Tue Mar  2 2004 Elliot Lee <sopwith at redhat.com> 2.0.48-16.1
-- Rebuilt.
-
-* Mon Feb 23 2004 Joe Orton <jorton at redhat.com> 2.0.48-16
-- fix apxs -q installbuilddir
-- really update to ab from HEAD
-- remove check that accept() returns an fd < FD_SETSIZE 
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com> 2.0.48-15
-- Rebuilt.
-
-* Tue Feb  3 2004 Joe Orton <jorton at redhat.com> 2.0.48-14
-- mod_dav: fix 401 on destination and reject unescaped fragment in URI
-- remove redundant ldconfig invocation from mod_ssl %%post
-- remove unnecessary -headusage patch
-
-* Fri Jan 30 2004 Joe Orton <jorton at redhat.com> 2.0.48-13
-- allow further customisation of init script (Peter Bieringer, #114619)
-- worker fixes from upstream
-- use basename(filename) in APLOG_MARK to reduce noise levels at 
-  "LogLevel debug"
-
-* Wed Jan 28 2004 Joe Orton <jorton at redhat.com> 2.0.48-12
-- mod_ssl: cosmetic tweaks for pass phrase prompting
-- simplify rebranding a little
-
-* Tue Jan 27 2004 Joe Orton <jorton at redhat.com> 2.0.48-11
-- trim pre-2.0 history from CHANGES to limit size
-
-* Tue Jan 27 2004 Joe Orton <jorton at redhat.com> 2.0.48-10
-- update to ab from HEAD
-- remove dbmmanage man page (part of #114080)
-- mod_ssl: fix streaming nph- CGI scripts over SSL
-- mod_autoindex: fixes from 2.0 branch (Andr?? Malo)
-- add NameVirtualHost vs mod_ssl warning to httpd.conf (#114315)
-- mod_proxy: HTTP/1.1-compliance fixes from HEAD
-
-* Tue Jan 20 2004 Joe Orton <jorton at redhat.com> 2.0.48-9
-- use a large BSS in the test PIE executable to trigger bugs early
-- tighten check on CPP output in MMN check (#113934)
-
-* Mon Jan 19 2004 Joe Orton <jorton at redhat.com> 2.0.48-8
-- add man page fixes
-- mod_include: use parser rewrite+fixes from 2.0 branch (Andr?? Malo et al)
-- mod_ssl: add distcache support (Geoff Thorpe)
-- mod_ssl: SSL variable handling fixes for non-SSL connections (various)
-- allow linking modules against specific libraries found during configure
-
-* Mon Jan 19 2004 Joe Orton <jorton at redhat.com> 2.0.48-7
-- hack to ensure that /usr/sbin/suexec gets stripped
-- merges from upstream:
- * fix for CVE CAN-2003-0020 (Andr?? Malo)
- * open log files read-only (Jeff Trawick)
- * mod_cgi: fix logging of script exec failure messages (Jeff Trawick)
- * mod_proxy: fix leak in request body handling (Larry Toppi)
-- merges from Taroon:
- * move away /var/www/html/index.html before upgrade from 1.3 (#70705)
- * allow upgrade from Stronghold 4.0
- * migration guide updates 
- * mod_log_config: fix logging of timezone (upstream #23642)
- * mod_ssl: restore readable error descriptions in error log
-
-* Mon Jan 19 2004 Joe Orton <jorton at redhat.com> 2.0.48-6
-- fix httpd.init issues reported by Behdad Esfahbod
-- add fix for mod_usertrack (#113269)
-- automatically raise RLIMIT_CORE if CoreDumpDirectory is used
-- emit warning at end of %%prep if PIE support is not enabled
-- add symlink to libtool script from build directory (#113720)
-- don't link suexec against the world
-
-* Sun Jan 04 2004 Joe Orton <jorton at redhat.com> 2.0.48-5
-- use graceful restart in logrotate
-- bump default MaxRequestsPerChild for prefork to 4000
-- move vendor string for Server header into spec file
-- include mod_status extension hook and use it in mod_ssl to include
-  SSL session cache statistics in server-status output
-
-* Thu Dec 18 2003 Joe Orton <jorton at redhat.com> 2.0.48-4
-- rebuild
-
-* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org> 2.0.48-3
-- rebuild against db-4.2.52.
-
-* Tue Oct 28 2003 Joe Orton <jorton at redhat.com> 2.0.48-2
-- update to 2.0.48
-- includes security fix for CVE CAN-2003-0542
-- include mpm*.h to fix mod_fastcgi build (#108080)
-- increase DYNAMIC_MODULE_LIMIT to 128
-- re-enable ap_hack_* export trimming patch
-- only use -export-dynamic when linking httpd, not suexec etc
-- don't load mod_unique_id by default
-
-* Thu Oct 23 2003 Joe Orton <jorton at redhat.com> 2.0.47-10
-- httpd.conf: configure test page in welcome.conf, load suexec, 
- don't use custom error docs by default, sync with upstream.
-- add "Powered by Fedora" icon (Garrett LeSage)
-- migration guide updates
-- drop mod_cgid
-- enable SSL_EXPERIMENTAL_ENGINE (#106858)
-- drop minimum suexec gid to 100 (#74753, #107083)
-- speed up graceful restarts in prefork (#105725)
-- mod_ssl fixes
-
-* Wed Oct 22 2003 Joe Orton <jorton at redhat.com> 2.0.47-9
-- updated index.html (Matt Wilson, #107378)
-- change server version string comment to "(Fedora)"
-
-* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 2.0.47-8.1
-- rebuild against db-4.2.42.
-
-* Wed Oct  8 2003 Joe Orton <jorton at redhat.com> 2.0.47-8
-- use -fPIE not -fpie to fix s390x (Florian La Roche)
-- include VERSIONING in docdir
-
-* Mon Oct  6 2003 Joe Orton <jorton at redhat.com> 2.0.47-7
-- enable PIE support
-- include bug fix for #78019
-
-* Mon Sep  8 2003 Joe Orton <jorton at redhat.com> 2.0.47-6
-- update httpd.conf for manual changes (alietss at yahoo.com, #101015)
-- use anonymous shm for LDAP auth cache (#103566)
-
-* Sun Sep  7 2003 Joe Orton <jorton at redhat.com> 2.0.47-5
-- include unixd.h again
-- fix EXTRA_INCLUDES
-
-* Mon Jul 28 2003 Joe Orton <jorton at redhat.com> 2.0.47-4
-- add mod_include fixes from upstream
-- httpd.conf updates: wording fixes from upstream; load
-  mod_deflate by default, update AddLanguage section (#98455)
-- don't add eNULL cipher in default ssl.conf (#98401)
-- only bind to IPv4 addresses in default config (#98916)
-
-* Thu Jul 24 2003 Joe Orton <jorton at redhat.com> 2.0.47-3
-- fix for segfaults in php-snmp init (#97207)
-
-* Wed Jul 23 2003 Joe Orton <jorton at redhat.com> 2.0.47-2
-- fix apxs -c again
-
-* Mon Jul 14 2003 Joe Orton <jorton at redhat.com> 2.0.47-1
-- update to 2.0.47
-- add mod_logio (#100436)
-- remove Vendor tag
-
-* Thu Jul 10 2003 Joe Orton <jorton at redhat.com> 2.0.45-14
-- use libtool script included in apr
-- fix apxs -q LIBTOOL (more #92313)
-
-* Tue Jul  8 2003 Joe Orton <jorton at redhat.com> 2.0.45-13
-- use system pcre library
-
-* Thu Jul  3 2003 Joe Orton <jorton at redhat.com> 2.0.45-12
-- remove some installed headers
-- fix for use of libtool 1.5
-
-* Wed Jun 5 2003 Elliot Lee <sopwith at redhat.com>
-- Rebuilt.
-
-* Thu Jun  5 2003 Joe Orton <jorton at redhat.com> 2.0.45-10
-- fix apxs -g (#92313)
-
-* Sat May 31 2003 Joe Orton <jorton at redhat.com> 2.0.45-9
-- trim manual sources properly
-- remove ExcludeArch
-
-* Thu May 29 2003 Joe Orton <jorton at redhat.com> 2.0.45-8
-- rebuild
-
-* Mon May 19 2003 Joe Orton <jorton at redhat.com> 2.0.45-6
-- don't load /usr/sbin/envvars from apxs
-- add fix for mod_dav_fs namespace handling
-- add fix for mod_dav If header etag comparison
-- remove irrelevant warning from mod_proxy
-- don't conflict with thttpd (#91422)
-
-* Sun May 18 2003 Joe Orton <jorton at redhat.com> 2.0.45-5
-- don't package any XML sources in httpd-manual
-- fix examples in default httpd.conf for enabling caching
-
-* Sun May 18 2003 Joe Orton <jorton at redhat.com> 2.0.45-4
-- change default charset to UTF-8 (#88964)
-
-* Thu May 15 2003 Joe Orton <jorton at redhat.com> 2.0.45-3
-- update httpd.conf for changes from default in 2.0.45
-- include conf.d/*.conf after loading standard modules
-- include LDAP and cache modules (#75370, #88277)
-- run buildconf in %%build not %%prep
-
-* Tue May 13 2003 Joe Orton <jorton at redhat.com> 2.0.45-2
-- have apxs always use /usr/bin/libtool
-
-* Mon May 5 2003 Joe Orton <jorton at redhat.com> 2.0.45-1
-- update to 2.0.45 (#82227)
-- use separate apr, apr-util packages (#74951)
-- mark logrotate file as noreplace (#85654)
-- mark all of /var/www/error as %%config-not-noreplace
-- remove dates from error pages (#86474)
-- don't enable mod_cgid for worker MPM (#88819)
-
-* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 2.0.40-22
-- headusage patch to fix build on ppc64 etc.
-
-* Tue Apr  1 2003 Joe Orton <jorton at redhat.com> 2.0.40-21.1
-- add security fixes for CAN-2003-0020, CAN-2003-0132, CAN-2003-0083
-- add security fix for file descriptor leaks, #82142
-- add bug fix for #82587
-
-* Mon Feb 24 2003 Joe Orton <jorton at redhat.com> 2.0.40-21
-- add security fix for CAN-2003-0020; replace non-printable characters
-  with '!' when printing to error log.
-- disable debuginfo on IA64.
-
-* Tue Feb 11 2003 Joe Orton <jorton at redhat.com> 2.0.40-20
-- disable POSIX semaphores to support 2.4.18 kernel (#83324)
-
-* Wed Jan 29 2003 Joe Orton <jorton at redhat.com> 2.0.40-19
-- require xmlto 0.0.11 or later
-- fix apr_strerror on glibc2.3
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 2.0.40-18
-- Rebuilt.
-
-* Thu Jan 16 2003 Joe Orton <jorton at redhat.com> 2.0.40-17
-- add mod_cgid and httpd binary built with worker MPM (#75496)
-- allow choice of httpd binary in init script
-- pick appropriate CGI module based on loaded MPM in httpd.conf
-- source /etc/sysconfig/httpd in apachectl to get httpd choice
-- make "apachectl status" fail gracefully when links isn't found (#78159)
-
-* Mon Jan 13 2003 Joe Orton <jorton at redhat.com> 2.0.40-16
-- rebuild for OpenSSL 0.9.7
-
-* Fri Jan  3 2003 Joe Orton <jorton at redhat.com> 2.0.40-15
-- fix possible infinite recursion in config dir processing (#77206)
-- fix memory leaks in request body processing (#79282)
-
-* Thu Dec 12 2002 Joe Orton <jorton at redhat.com> 2.0.40-14
-- remove unstable shmht session cache from mod_ssl
-- get SSL libs from pkg-config if available (Nalin Dahyabhai)
-- stop "apxs -a -i" from inserting AddModule into httpd.conf (#78676)
-
-* Wed Nov  6 2002 Joe Orton <jorton at redhat.com> 2.0.40-13
-- fix location of installbuilddir in apxs when libdir!=/usr/lib
-
-* Wed Nov  6 2002 Joe Orton <jorton at redhat.com> 2.0.40-12
-- pass libdir to configure; clean up config_vars.mk
-- package instdso.sh, fixing apxs -i (#73428)
-- prevent build if upstream MMN differs from mmn macro
-- remove installed but unpackaged files
-
-* Wed Oct  9 2002 Joe Orton <jorton at redhat.com> 2.0.40-11
-- correct SERVER_NAME encoding in i18n error pages (thanks to Andre Malo)
-
-* Wed Oct  9 2002 Joe Orton <jorton at redhat.com> 2.0.40-10
-- fix patch for CAN-2002-0840 to also cover i18n error pages
-
-* Wed Oct  2 2002 Joe Orton <jorton at redhat.com> 2.0.40-9
-- security fixes for CAN-2002-0840 and CAN-2002-0843
-- fix for possible mod_dav segfault for certain requests
-
-* Tue Sep 24 2002 Gary Benson <gbenson at redhat.com>
-- updates to the migration guide
-
-* Wed Sep  4 2002 Nalin Dahyabhai <nalin at redhat.com> 2.0.40-8
-- link httpd with libssl to avoid library loading/unloading weirdness
-
-* Tue Sep  3 2002 Joe Orton <jorton at redhat.com> 2.0.40-7
-- add LoadModule lines for proxy modules in httpd.conf (#73349)
-- fix permissions of conf/ssl.*/ directories; add Makefiles for
-  certificate management (#73352)
-
-* Mon Sep  2 2002 Joe Orton <jorton at redhat.com> 2.0.40-6
-- provide "httpd-mmn" to manage module ABI compatibility
-
-* Sun Sep  1 2002 Joe Orton <jorton at redhat.com> 2.0.40-5
-- fix SSL session cache (#69699)
-- revert addition of LDAP support to apr-util
-
-* Mon Aug 26 2002 Joe Orton <jorton at redhat.com> 2.0.40-4
-- set SIGXFSZ disposition to "ignored" (#69520)
-- make dummy connections to the first listener in config (#72692)
-
-* Mon Aug 26 2002 Joe Orton <jorton at redhat.com> 2.0.40-3
-- allow "apachectl configtest" on a 1.3 httpd.conf
-- add mod_deflate
-- enable LDAP support in apr-util
-- don't package everything in /var/www/error as config(noreplace)
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 2.0.40-2
-- add trigger (#68657)
-
-* Mon Aug 12 2002 Joe Orton <jorton at redhat.com> 2.0.40-1
-- update to 2.0.40
-
-* Wed Jul 24 2002 Joe Orton <jorton at redhat.com> 2.0.36-8
-- improve comment on use of UserDir in default config (#66886)
-
-* Wed Jul 10 2002 Joe Orton <jorton at redhat.com> 2.0.36-7
-- use /sbin/nologin as shell for apache user (#68371)
-- add patch from CVS to fix possible infinite loop when processing
-  internal redirects
-
-* Wed Jun 26 2002 Gary Benson <gbenson at redhat.com> 2.0.36-6
-- modify init script to detect 1.3.x httpd.conf's and direct users
-  to the migration guide
-
-* Tue Jun 25 2002 Gary Benson <gbenson at redhat.com> 2.0.36-5
-- patch apachectl to detect 1.3.x httpd.conf's and direct users
-  to the migration guide
-- ship the migration guide
-
-* Fri Jun 21 2002 Joe Orton <jorton at redhat.com>
-- move /etc/httpd2 back to /etc/httpd
-- add noindex.html page and poweredby logo; tweak default config
-  to load noindex.html if no default "/" page is present.
-- add patch to prevent mutex errors on graceful restart
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 2.0.36-4
-- automated rebuild
-
-* Wed Jun 12 2002 Joe Orton <jorton at redhat.com> 2.0.36-3
-- add patch to fix SSL mutex handling
-
-* Wed Jun 12 2002 Joe Orton <jorton at redhat.com> 2.0.36-2
-- improved config directory patch
-
-* Mon May 20 2002 Joe Orton <jorton at redhat.com>
-- initial build; based heavily on apache.spec and mod_ssl.spec
-- fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 May 2006 14:14:28 -0000	1.13
+++ sources	28 Jul 2006 15:19:20 -0000	1.14
@@ -1 +1 @@
-a0d9f7f6f70110a5965340eb7f3a3e66  httpd-2.2.2.tar.gz
+f72ffb176e2dc7b322be16508c09f63c  httpd-2.2.3.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/upstream,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upstream	3 May 2006 14:14:28 -0000	1.6
+++ upstream	28 Jul 2006 15:19:20 -0000	1.7
@@ -1 +1 @@
-httpd-2.2.2.tar.gz
+httpd-2.2.3.tar.gz


--- httpd-2.2.2.tar.gz.asc DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:21:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:21:27 -0400
Subject: rpms/esc/devel esc.spec,1.5,1.6
Message-ID: <200607281521.k6SFLRBK027284@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27210

Modified Files:
	esc.spec 
Log Message:
- remove bogus gtk+ requires (and some others that will
  be automatic)



Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esc.spec	27 Jul 2006 23:26:35 -0000	1.5
+++ esc.spec	28 Jul 2006 15:21:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -20,7 +20,7 @@
 BuildRequires: pcsc-lite-devel coolkey-devel
 BuildRequires: desktop-file-utils zip binutils
 Requires: pcsc-lite ifd-egate coolkey
-Requires: gtk+ freetype zip nspr nss
+Requires: zip
 
 # 390 does not have coolkey or smartCards
 # Xulrunner won't compile on ppc64 right now.
@@ -156,6 +156,10 @@
 fi
 
 %changelog
+* Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 1.0.0-2
+- remove bogus gtk+ requires (and some others that will
+  be automatic)
+
 * Tue Jun 13 2006 Jack Magne <jmagne at redhat.com> - 1.0.0-1
 - Initial revision for fedora
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:22:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:22:16 -0400
Subject: rpms/gstreamer-plugins-base/devel
	gstreamer-plugins-base-0.10.9-docs.patch, NONE,
	1.1 gstreamer-plugins-base.spec, 1.16, 1.17
Message-ID: <200607281522.k6SFMGq1027645@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27594

Modified Files:
	gstreamer-plugins-base.spec 
Added Files:
	gstreamer-plugins-base-0.10.9-docs.patch 
Log Message:
Re-add docs


gstreamer-plugins-base-0.10.9-docs.patch:
 Makefile.in |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE gstreamer-plugins-base-0.10.9-docs.patch ---
--- gst-plugins-base-0.10.9/docs/Makefile.in.docs	2006-07-28 11:10:58.000000000 -0400
+++ gst-plugins-base-0.10.9/docs/Makefile.in	2006-07-28 11:11:11.000000000 -0400
@@ -384,11 +384,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- at ENABLE_GTK_DOC_FALSE@GTK_DOC_DIRS = 
- at ENABLE_GTK_DOC_TRUE@GTK_DOC_DIRS = libs
- at ENABLE_PLUGIN_DOCS_FALSE@PLUGIN_DOCS_DIRS = 
- at ENABLE_PLUGIN_DOCS_TRUE@PLUGIN_DOCS_DIRS = plugins
-SUBDIRS = $(GTK_DOC_DIRS) $(PLUGIN_DOCS_DIRS)
+SUBDIRS = libs plugins
 DIST_SUBDIRS = libs plugins
 EXTRA_DIST = \
         version.entities.in


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gstreamer-plugins-base.spec	28 Jul 2006 01:55:46 -0000	1.16
+++ gstreamer-plugins-base.spec	28 Jul 2006 15:22:13 -0000	1.17
@@ -5,13 +5,14 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.9
-Release:  	2	
+Release:  	4	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
+Patch0:		gstreamer-plugins-base-0.10.9-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{gstreamer} >= %{_gst}
@@ -48,6 +49,8 @@
 
 %prep
 %setup -q -n gst-plugins-base-%{version}
+%patch0 -p1 -b .docs
+
 %build
 %configure \
   --with-package-name='Fedora Core gstreamer-plugins-base package' \
@@ -186,10 +189,13 @@
 %{_libdir}/pkgconfig/gstreamer-plugins-base-%{majorminor}.pc
 
 # gtk-doc documentation
-#%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
-#%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
+%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
+%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.9-3
+- Re-add docs
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.10.9-2
 - Disable gtk-doc to fix multilib conflicts
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:39:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:39:40 -0400
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.34,1.35
Message-ID: <200607281539.k6SFdeL0032731@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32675

Modified Files:
	libgnomeprintui22.spec 
Log Message:
Add bug ref



Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgnomeprintui22.spec	28 Jul 2006 15:10:25 -0000	1.34
+++ libgnomeprintui22.spec	28 Jul 2006 15:39:38 -0000	1.35
@@ -8,7 +8,7 @@
 Version: 2.12.1
 Release: 5
 Source0: libgnomeprintui-%{version}.tar.bz2
-# 
+# http://bugzilla.gnome.org/show_bug.cgi?id=349098 
 Source1: docs.tar.gz
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:44:39 -0400
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.17,
	1.18
Message-ID: <200607281544.k6SFidNZ002201@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2162

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
add bug ref



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gstreamer-plugins-base.spec	28 Jul 2006 15:22:13 -0000	1.17
+++ gstreamer-plugins-base.spec	28 Jul 2006 15:44:37 -0000	1.18
@@ -12,6 +12,7 @@
 License: 	LGPL
 URL:		http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=349099
 Patch0:		gstreamer-plugins-base-0.10.9-docs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 15:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 11:54:53 -0400
Subject: rpms/firefox/devel firefox.spec,1.135,1.136
Message-ID: <200607281554.k6SFsrI9028639@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28626

Modified Files:
	firefox.spec 
Log Message:
* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
- Actually, those pkgconfig files really shouldn't be here as we use
  system nss and nspr.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- firefox.spec	28 Jul 2006 13:36:00 -0000	1.135
+++ firefox.spec	28 Jul 2006 15:54:50 -0000	1.136
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        5
+Release:        6
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -346,14 +346,18 @@
 %{_libdir}/pkgconfig/firefox-plugin.pc
 %{_libdir}/pkgconfig/firefox-js.pc
 %{_libdir}/pkgconfig/firefox-gtkmozembed.pc
-%{_libdir}/pkgconfig/firefox-nspr.pc
-%{_libdir}/pkgconfig/firefox-nss.pc
+%exclude %{_libdir}/pkgconfig/firefox-nspr.pc
+%exclude %{_libdir}/pkgconfig/firefox-nss.pc
 %endif
 
 #---------------------------------------------------------------------
 
 %changelog
-* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.4-5
+* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
+- Actually, those pkgconfig files really shouldn't be here as we use
+  system nss and nspr.
+
+* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-5
 - Add more pkgconfig files
 
 * Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-4



From fedora-cvs-commits at redhat.com  Fri Jul 28 16:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 12:11:30 -0400
Subject: rpms/openoffice.org/devel sources,1.186,1.187
Message-ID: <200607281611.k6SGBUkD007194@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7171

Modified Files:
	sources 
Log Message:
ignore me


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- sources	3 Jul 2006 11:23:24 -0000	1.186
+++ sources	28 Jul 2006 16:11:27 -0000	1.187
@@ -9,5 +9,5 @@
 5a7c718e63d09f42fd40017b28dffd10  AutoSaveCommon.xcu
 d57f21d70ba34ddb20f40a4d08427722  AutoSaveRecovery.xcu
 2618cff7bfdf0a9ca30233e349df73c6  openoffice.org-myspell-contrib.tar.gz
-9fdd09e15efe8e356fffbec5abbc39e1  OOC680_m7.tar.bz2
 156fca901e2850226f16dd5034b6c941  openoffice.org-simple-crash_report.sh
+927a894d9bb8b8753c8e536ce8a671ab  OOC680_m7.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 16:13:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 12:13:58 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.801,1.802
Message-ID: <200607281613.k6SGDwTn008022@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7967

Modified Files:
	openoffice.org.spec 
Log Message:
time to build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- openoffice.org.spec	28 Jul 2006 14:56:29 -0000	1.801
+++ openoffice.org.spec	28 Jul 2006 16:13:56 -0000	1.802
@@ -3500,6 +3500,7 @@
 - rh#199056# -> openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 - rh#200042# -> openoffice.org-2.0.3.ooo65081.sw.layout.patch
 - rh#200193# -> openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+- rh#200369# help build glitch
 - drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 - drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 - require dejavu-lgc-fonts, Greek coverage problems begone



From fedora-cvs-commits at redhat.com  Fri Jul 28 16:14:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 12:14:53 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.802,1.803
Message-ID: <200607281614.k6SGErmN008422@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8366

Modified Files:
	openoffice.org.spec 
Log Message:
time to build


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- openoffice.org.spec	28 Jul 2006 16:13:56 -0000	1.802
+++ openoffice.org.spec	28 Jul 2006 16:14:51 -0000	1.803
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # gcc#19664#
 %define stlvisibilityfcked 1



From fedora-cvs-commits at redhat.com  Fri Jul 28 17:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 13:07:32 -0400
Subject: rpms/util-linux/devel util-linux-2.13-nfsmount-fsc.patch,1.2,1.3
Message-ID: <200607281707.k6SH7Wp8022354@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22263

Modified Files:
	util-linux-2.13-nfsmount-fsc.patch 
Log Message:
Corrected the NFS4_MOUNT_FSCACHE value


util-linux-2.13-nfsmount-fsc.patch:
 nfs.5        |    8 ++++++++
 nfs4_mount.h |    1 +
 nfs4mount.c  |    8 ++++++--
 nfs_mount4.h |    1 +
 nfsmount.c   |    4 ++++
 5 files changed, 20 insertions(+), 2 deletions(-)

Index: util-linux-2.13-nfsmount-fsc.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-nfsmount-fsc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-2.13-nfsmount-fsc.patch	27 Jul 2006 17:40:34 -0000	1.2
+++ util-linux-2.13-nfsmount-fsc.patch	28 Jul 2006 17:07:29 -0000	1.3
@@ -65,7 +65,7 @@
  #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_FSCACHE	0x4000	/* 1 */
  #define NFS4_MOUNT_FLAGMASK	0xFFFF
  
  /* pseudoflavors: */



From fedora-cvs-commits at redhat.com  Fri Jul 28 17:41:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 13:41:07 -0400
Subject: rpms/conga/FC-5 conga.spec,1.6,1.7 sources,1.8,1.9
Message-ID: <200607281741.k6SHf7fK015173@cvs.devel.redhat.com>

Author: kupcevic

Update of /cvs/dist/rpms/conga/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15140

Modified Files:
	conga.spec sources 
Log Message:
DBusController.cpp bugfix


Index: conga.spec
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/conga.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- conga.spec	26 Jul 2006 18:22:51 -0000	1.6
+++ conga.spec	28 Jul 2006 17:41:04 -0000	1.7
@@ -11,7 +11,7 @@
 ###############################################################################
 
 %define vers 0.8
-%define rel  9%{?dist}
+%define rel  9.1%{?dist}
 
 %define include_zope_and_plone     no
 %define zope_archive               Zope-2.9.3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/conga/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	26 Jul 2006 18:22:51 -0000	1.8
+++ sources	28 Jul 2006 17:41:04 -0000	1.9
@@ -1 +1 @@
-f13297cac0fdc989981e4a766e698649  conga-0.8.tar.gz
+7235c492f32e01c68e70950364f536e8  conga-0.8.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 28 17:44:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 13:44:20 -0400
Subject: rpms/selinux-policy/devel modules-strict.conf, 1.13,
	1.14 modules-targeted.conf, 1.30, 1.31 policy-20060608.patch,
	1.40, 1.41 selinux-policy.spec, 1.236, 1.237
Message-ID: <200607281744.k6SHiK3W016430@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16403

Modified Files:
	modules-strict.conf modules-targeted.conf 
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-13
- Add nagios policy



Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- modules-strict.conf	19 Jul 2006 18:39:31 -0000	1.13
+++ modules-strict.conf	28 Jul 2006 17:44:17 -0000	1.14
@@ -1283,3 +1283,10 @@
 # Policy for the SELinux troubleshooting utility
 # 
 setroubleshoot = base
+
+# Layer: services
+# Module: nagios
+#
+# policy for nagios Host/service/network monitoring program
+# 
+nagios = module


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- modules-targeted.conf	14 Jul 2006 20:09:54 -0000	1.30
+++ modules-targeted.conf	28 Jul 2006 17:44:17 -0000	1.31
@@ -1093,6 +1093,7 @@
 # 
 openvpn = base
 
+
 # Layer: services
 # Module: setroubleshoot
 #
@@ -1100,5 +1101,11 @@
 # 
 setroubleshoot = base
 
+# Layer: services
+# Module: nagios
+#
+# policy for nagios Host/service/network monitoring program
+# 
+nagios = module
 
 

policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  135 ++++++++++++++++++++++
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |    4 
 91 files changed, 933 insertions(+), 245 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- policy-20060608.patch	26 Jul 2006 20:17:15 -0000	1.40
+++ policy-20060608.patch	28 Jul 2006 17:44:17 -0000	1.41
@@ -220,7 +220,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.3.3/policy/modules/admin/consoletype.te
 --- nsaserefpolicy/policy/modules/admin/consoletype.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/consoletype.te	2006-07-28 13:28:33.000000000 -0400
 @@ -8,7 +8,12 @@
  
  type consoletype_t;
@@ -235,6 +235,14 @@
  mls_file_read_up(consoletype_t)
  mls_file_write_down(consoletype_t)
  role system_r types consoletype_t;
+@@ -114,3 +119,7 @@
+ 	xen_append_log(consoletype_t)
+ 	xen_dontaudit_rw_unix_stream_sockets(consoletype_t)
+ ')
++
++optional_policy(`
++	xen_dontaudit_use_fds(consoletype_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:04:45.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-07-26 12:55:01.000000000 -0400
@@ -598,6 +606,17 @@
  
  # tmp files
  allow amavis_t amavis_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.3/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-07-27 12:31:07.000000000 -0400
+@@ -273,7 +273,6 @@
+ sysnet_read_config(httpd_t)
+ 
+ userdom_use_unpriv_users_fds(httpd_t)
+-userdom_dontaudit_search_sysadm_home_dirs(httpd_t)
+ 
+ mta_send_mail(httpd_t)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.3.3/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-07-14 17:04:40.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/automount.te	2006-07-17 11:43:02.000000000 -0400
@@ -1674,7 +1693,19 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-19 11:33:04.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-28 09:12:30.000000000 -0400
+@@ -28,9 +28,9 @@
+ # Local policy
+ #
+ 
+-allow squid_t self:capability { setgid setuid dac_override };
++allow squid_t self:capability { setgid setuid dac_override sys_resource };
+ dontaudit squid_t self:capability sys_tty_config;
+-allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
++allow squid_t self:process ~{ ptrace setcurrent setexec setfscreate execmem execstack execheap };
+ allow squid_t self:fifo_file rw_file_perms;
+ allow squid_t self:sock_file r_file_perms;
+ allow squid_t self:fd use;
 @@ -80,8 +80,10 @@
  corenet_tcp_bind_all_nodes(squid_t)
  corenet_udp_bind_all_nodes(squid_t)
@@ -1875,7 +1906,7 @@
  init_use_script_ptys(getty_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.3.3/policy/modules/system/hostname.te
 --- nsaserefpolicy/policy/modules/system/hostname.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/hostname.te	2006-07-28 13:28:12.000000000 -0400
 @@ -8,7 +8,10 @@
  
  type hostname_t;
@@ -1888,6 +1919,16 @@
  role system_r types hostname_t;
  
  ########################################
+@@ -56,6 +59,7 @@
+ sysnet_read_config(hostname_t)
+ sysnet_dns_name_resolve(hostname_t)
+ 
+-
+-
++optional_policy(`
++	xen_dontaudit_use_fds(hostname_t)
++')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hotplug.te serefpolicy-2.3.3/policy/modules/system/hotplug.te
 --- nsaserefpolicy/policy/modules/system/hotplug.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/hotplug.te	2006-07-17 11:43:02.000000000 -0400
@@ -2685,10 +2726,64 @@
  	', `
  		logging_manage_audit_log(sysadm_t)
  		logging_manage_audit_config(sysadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
+--- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-07-28 13:26:47.000000000 -0400
+@@ -127,3 +127,41 @@
+ 	allow xm_t $1:fifo_file rw_file_perms;
+ 	allow xm_t $1:process sigchld;
+ ')
++
++
++########################################
++## <summary>
++##	Inherit and use xen file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`xen_use_fds',`
++	gen_require(`
++		type xen_t;
++	')
++
++	allow $1 xen_t:fd use;
++')
++
++########################################
++## <summary>
++##	Do not audit attempts to inherit
++##	xen file descriptors.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`xen_dontaudit_use_fds',`
++	gen_require(`
++		type xen_t;
++	')
++
++	dontaudit $1 xen_t:fd use;
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-17 11:43:02.000000000 -0400
-@@ -171,7 +171,7 @@
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-28 13:27:17.000000000 -0400
+@@ -70,6 +70,8 @@
+ 
+ allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
+ allow xend_t self:process { signal sigkill };
++dontaudit xend_t self:process ptrace;
++
+ # internal communication is often done using fifo and unix sockets.
+ allow xend_t self:fifo_file rw_file_perms;
+ allow xend_t self:unix_stream_socket create_stream_socket_perms;
+@@ -171,7 +173,7 @@
  netutils_domtrans(xend_t)
  
  optional_policy(`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- selinux-policy.spec	26 Jul 2006 20:17:15 -0000	1.236
+++ selinux-policy.spec	28 Jul 2006 17:44:17 -0000	1.237
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 12
+Release: 13
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,11 +348,14 @@
 %endif
 
 %changelog
+* Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-13
+- Add nagios policy
+
 * Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-12
 -  fixes for setroubleshoot
 
 * Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-11
-- Added Paul Howorth patch to only load policy packages shipped 
+- Added Paul Howarth patch to only load policy packages shipped 
   with this package
 - Allow pidof from initrc to ptrace higher level domains
 - Allow firstboot to communicate with hal via dbus



From fedora-cvs-commits at redhat.com  Fri Jul 28 17:57:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 13:57:28 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2470,
	1.2471 linux-2.6-futex-death-fix.patch, 1.1, 1.2
Message-ID: <200607281757.k6SHvSue003755@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3601

Modified Files:
	kernel-2.6.spec linux-2.6-futex-death-fix.patch 
Log Message:
update patch to latest


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2470
retrieving revision 1.2471
diff -u -r1.2470 -r1.2471
--- kernel-2.6.spec	28 Jul 2006 04:32:46 -0000	1.2470
+++ kernel-2.6.spec	28 Jul 2006 17:57:26 -0000	1.2471
@@ -1663,6 +1663,9 @@
 %endif
 
 %changelog
+* Fri Jul 28 2006 Dave Jones <davej at redhat.com>
+- Update futex-death patch.
+
 * Thu Jul 27 2006 Roland McGrath <roland at redhat.com>
 - s390 utrace fix
 

linux-2.6-futex-death-fix.patch:
 include/linux/futex.h |    3 +
 kernel/futex.c        |   91 ++++++++++++++++++++++++++++++++++----------------
 kernel/futex_compat.c |   34 +++++++++++++-----
 3 files changed, 89 insertions(+), 39 deletions(-)

Index: linux-2.6-futex-death-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-futex-death-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-futex-death-fix.patch	12 Jul 2006 15:16:00 -0000	1.1
+++ linux-2.6-futex-death-fix.patch	28 Jul 2006 17:57:26 -0000	1.2
@@ -1,42 +1,307 @@
-
-Dave,
-
-could you apply the patch below to Fedora, to make sure we have this 
-tested by Ulrich before i send it upstream?
-
-Jakub, do you agree with this approach?
-
-	Ingo
-
-------->
 Subject: pi-futex: robust-futex exit
 From: Ingo Molnar <mingo at elte.hu>
 
 fix robust PI-futexes to be properly unlocked on unexpected exit.
 
+for this the kernel has to know whether a futex is a PI or a non-PI
+one, because the semantics are different. Since the space in relevant
+glibc data structures is extremely scarce, the best solution is to
+encode the 'PI' information in bit 0 of the robust list pointer.
+Existing (non-PI) glibc robust futexes have this bit always zero,
+so the ABI is kept. New glibc with PI-robust-futexes will set this
+bit.
+
+further fixes:
+
+From: Thomas Gleixner <tglx at linutronix.de>
+
 Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Ulrich Drepper <drepper at redhat.com>
+Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 ---
- kernel/futex.c |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ include/linux/futex.h |    3 +
+ kernel/futex.c        |   91 ++++++++++++++++++++++++++++++++++----------------
+ kernel/futex_compat.c |   34 +++++++++++++-----
+ 3 files changed, 89 insertions(+), 39 deletions(-)
 
-Index: linux-pi-futex.q/kernel/futex.c
+Index: linux/include/linux/futex.h
+===================================================================
+--- linux.orig/include/linux/futex.h
++++ linux/include/linux/futex.h
+@@ -96,7 +96,8 @@ struct robust_list_head {
+ long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout,
+ 	      u32 __user *uaddr2, u32 val2, u32 val3);
+ 
+-extern int handle_futex_death(u32 __user *uaddr, struct task_struct *curr);
++extern int
++handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi);
+ 
+ #ifdef CONFIG_FUTEX
+ extern void exit_robust_list(struct task_struct *curr);
+Index: linux/kernel/futex.c
 ===================================================================
---- linux-pi-futex.q.orig/kernel/futex.c
-+++ linux-pi-futex.q/kernel/futex.c
-@@ -1696,8 +1696,15 @@ retry:
+--- linux.orig/kernel/futex.c
++++ linux/kernel/futex.c
+@@ -495,10 +495,13 @@ lookup_pi_state(u32 uval, struct futex_h
+ 	}
+ 
+ 	/*
+-	 * We are the first waiter - try to look up the real owner and
+-	 * attach the new pi_state to it:
++	 * We are the first waiter - try to look up the real owner and attach
++	 * the new pi_state to it, but bail out when the owner died bit is set
++	 * and TID = 0:
+ 	 */
+ 	pid = uval & FUTEX_TID_MASK;
++	if (!pid && (uval & FUTEX_OWNER_DIED))
++		return -ESRCH;
+ 	p = futex_find_get_task(pid);
+ 	if (!p)
+ 		return -ESRCH;
+@@ -579,16 +582,17 @@ static int wake_futex_pi(u32 __user *uad
+ 	 * kept enabled while there is PI state around. We must also
+ 	 * preserve the owner died bit.)
+ 	 */
+-	newval = (uval & FUTEX_OWNER_DIED) | FUTEX_WAITERS | new_owner->pid;
+-
+-	inc_preempt_count();
+-	curval = futex_atomic_cmpxchg_inatomic(uaddr, uval, newval);
+-	dec_preempt_count();
++	if (!(uval & FUTEX_OWNER_DIED)) {
++		newval = FUTEX_WAITERS | new_owner->pid;
+ 
+-	if (curval == -EFAULT)
+-		return -EFAULT;
+-	if (curval != uval)
+-		return -EINVAL;
++		inc_preempt_count();
++		curval = futex_atomic_cmpxchg_inatomic(uaddr, uval, newval);
++		dec_preempt_count();
++		if (curval == -EFAULT)
++			return -EFAULT;
++		if (curval != uval)
++			return -EINVAL;
++	}
+ 
+ 	spin_lock_irq(&pi_state->owner->pi_lock);
+ 	WARN_ON(list_empty(&pi_state->list));
+@@ -1443,9 +1447,11 @@ retry_locked:
+ 	 * again. If it succeeds then we can return without waking
+ 	 * anyone else up:
+ 	 */
+-	inc_preempt_count();
+-	uval = futex_atomic_cmpxchg_inatomic(uaddr, current->pid, 0);
+-	dec_preempt_count();
++	if (!(uval & FUTEX_OWNER_DIED)) {
++		inc_preempt_count();
++		uval = futex_atomic_cmpxchg_inatomic(uaddr, current->pid, 0);
++		dec_preempt_count();
++	}
+ 
+ 	if (unlikely(uval == -EFAULT))
+ 		goto pi_faulted;
+@@ -1478,9 +1484,11 @@ retry_locked:
+ 	/*
+ 	 * No waiters - kernel unlocks the futex:
+ 	 */
+-	ret = unlock_futex_pi(uaddr, uval);
+-	if (ret == -EFAULT)
+-		goto pi_faulted;
++	if (!(uval & FUTEX_OWNER_DIED)) {
++		ret = unlock_futex_pi(uaddr, uval);
++		if (ret == -EFAULT)
++			goto pi_faulted;
++	}
+ 
+ out_unlock:
+ 	spin_unlock(&hb->lock);
+@@ -1699,9 +1707,9 @@ err_unlock:
+  * Process a futex-list entry, check whether it's owned by the
+  * dying task, and do notification if so:
+  */
+-int handle_futex_death(u32 __user *uaddr, struct task_struct *curr)
++int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)
+ {
+-	u32 uval, nval;
++	u32 uval, nval, mval;
+ 
+ retry:
+ 	if (get_user(uval, uaddr))
+@@ -1718,21 +1726,45 @@ retry:
+ 		 * thread-death.) The rest of the cleanup is done in
+ 		 * userspace.
+ 		 */
+-		nval = futex_atomic_cmpxchg_inatomic(uaddr, uval,
+-						     uval | FUTEX_OWNER_DIED);
++		mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED;
++		nval = futex_atomic_cmpxchg_inatomic(uaddr, uval, mval);
++
+ 		if (nval == -EFAULT)
+ 			return -1;
+ 
  		if (nval != uval)
  			goto retry;
  
 -		if (uval & FUTEX_WAITERS)
-+		if (uval & FUTEX_WAITERS) {
-+			/*
-+			 * It's either a normal futex or a PI futex,
-+			 * their wake handlers will determine this
-+			 * and only one will succeed:
-+		 	 */
- 			futex_wake(uaddr, 1);
-+			futex_unlock_pi(uaddr);
+-			futex_wake(uaddr, 1);
++		/*
++		 * Wake robust non-PI futexes here. The wakeup of
++		 * PI futexes happens in exit_pi_state():
++		 */
++		if (!pi) {
++			if (uval & FUTEX_WAITERS)
++				futex_wake(uaddr, 1);
 +		}
  	}
  	return 0;
  }
+ 
+ /*
++ * Fetch a robust-list pointer. Bit 0 signals PI futexes:
++ */
++static inline int fetch_robust_entry(struct robust_list __user **entry,
++				     struct robust_list __user **head, int *pi)
++{
++	unsigned long uentry;
++
++	if (get_user(uentry, (unsigned long *)head))
++		return -EFAULT;
++
++	*entry = (void *)(uentry & ~1UL);
++	*pi = uentry & 1;
++
++	return 0;
++}
++
++/*
+  * Walk curr->robust_list (very carefully, it's a userspace list!)
+  * and mark any locks found there dead, and notify any waiters.
+  *
+@@ -1742,14 +1774,14 @@ void exit_robust_list(struct task_struct
+ {
+ 	struct robust_list_head __user *head = curr->robust_list;
+ 	struct robust_list __user *entry, *pending;
+-	unsigned int limit = ROBUST_LIST_LIMIT;
++	unsigned int limit = ROBUST_LIST_LIMIT, pi, pip;
+ 	unsigned long futex_offset;
+ 
+ 	/*
+ 	 * Fetch the list head (which was registered earlier, via
+ 	 * sys_set_robust_list()):
+ 	 */
+-	if (get_user(entry, &head->list.next))
++	if (fetch_robust_entry(&entry, &head->list.next, &pi))
+ 		return;
+ 	/*
+ 	 * Fetch the relative futex offset:
+@@ -1760,10 +1792,11 @@ void exit_robust_list(struct task_struct
+ 	 * Fetch any possibly pending lock-add first, and handle it
+ 	 * if it exists:
+ 	 */
+-	if (get_user(pending, &head->list_op_pending))
++	if (fetch_robust_entry(&pending, &head->list_op_pending, &pip))
+ 		return;
++
+ 	if (pending)
+-		handle_futex_death((void *)pending + futex_offset, curr);
++		handle_futex_death((void *)pending + futex_offset, curr, pip);
+ 
+ 	while (entry != &head->list) {
+ 		/*
+@@ -1772,12 +1805,12 @@ void exit_robust_list(struct task_struct
+ 		 */
+ 		if (entry != pending)
+ 			if (handle_futex_death((void *)entry + futex_offset,
+-						curr))
++						curr, pi))
+ 				return;
+ 		/*
+ 		 * Fetch the next entry in the list:
+ 		 */
+-		if (get_user(entry, &entry->next))
++		if (fetch_robust_entry(&entry, &entry->next, &pi))
+ 			return;
+ 		/*
+ 		 * Avoid excessively long or circular lists:
+Index: linux/kernel/futex_compat.c
+===================================================================
+--- linux.orig/kernel/futex_compat.c
++++ linux/kernel/futex_compat.c
+@@ -12,6 +12,23 @@
+ 
+ #include <asm/uaccess.h>
+ 
++
++/*
++ * Fetch a robust-list pointer. Bit 0 signals PI futexes:
++ */
++static inline int
++fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
++		   compat_uptr_t *head, int *pi)
++{
++	if (get_user(*uentry, head))
++		return -EFAULT;
++
++	*entry = compat_ptr((*uentry) & ~1);
++	*pi = (unsigned int)(*uentry) & 1;
++
++	return 0;
++}
++
+ /*
+  * Walk curr->robust_list (very carefully, it's a userspace list!)
+  * and mark any locks found there dead, and notify any waiters.
+@@ -22,17 +39,16 @@ void compat_exit_robust_list(struct task
+ {
+ 	struct compat_robust_list_head __user *head = curr->compat_robust_list;
+ 	struct robust_list __user *entry, *pending;
++	unsigned int limit = ROBUST_LIST_LIMIT, pi;
+ 	compat_uptr_t uentry, upending;
+-	unsigned int limit = ROBUST_LIST_LIMIT;
+ 	compat_long_t futex_offset;
+ 
+ 	/*
+ 	 * Fetch the list head (which was registered earlier, via
+ 	 * sys_set_robust_list()):
+ 	 */
+-	if (get_user(uentry, &head->list.next))
++	if (fetch_robust_entry(&uentry, &entry, &head->list.next, &pi))
+ 		return;
+-	entry = compat_ptr(uentry);
+ 	/*
+ 	 * Fetch the relative futex offset:
+ 	 */
+@@ -42,11 +58,11 @@ void compat_exit_robust_list(struct task
+ 	 * Fetch any possibly pending lock-add first, and handle it
+ 	 * if it exists:
+ 	 */
+-	if (get_user(upending, &head->list_op_pending))
++	if (fetch_robust_entry(&upending, &pending,
++			       &head->list_op_pending, &pi))
+ 		return;
+-	pending = compat_ptr(upending);
+ 	if (upending)
+-		handle_futex_death((void *)pending + futex_offset, curr);
++		handle_futex_death((void *)pending + futex_offset, curr, pi);
+ 
+ 	while (compat_ptr(uentry) != &head->list) {
+ 		/*
+@@ -55,15 +71,15 @@ void compat_exit_robust_list(struct task
+ 		 */
+ 		if (entry != pending)
+ 			if (handle_futex_death((void *)entry + futex_offset,
+-						curr))
++						curr, pi))
+ 				return;
+ 
+ 		/*
+ 		 * Fetch the next entry in the list:
+ 		 */
+-		if (get_user(uentry, (compat_uptr_t *)&entry->next))
++		if (fetch_robust_entry(&uentry, &entry,
++				       (compat_uptr_t *)&entry->next, &pi))
+ 			return;
+-		entry = compat_ptr(uentry);
+ 		/*
+ 		 * Avoid excessively long or circular lists:
+ 		 */



From fedora-cvs-commits at redhat.com  Fri Jul 28 18:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 14:16:38 -0400
Subject: rpms/fedora-logos/devel .cvsignore, 1.28, 1.29 fedora-logos.spec,
	1.34, 1.35 sources, 1.30, 1.31
Message-ID: <200607281816.k6SIGcC1017234@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15495

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
- Add a 4:3 aspect ratio background
- Fix extention to be .jpg on backgrounds



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	28 Jul 2006 00:53:18 -0000	1.28
+++ .cvsignore	28 Jul 2006 18:16:35 -0000	1.29
@@ -1,2 +1,3 @@
 fedora-logos-1.1.45.tar.bz2
 fedora-logos-1.1.46.tar.bz2
+fedora-logos-1.1.47.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fedora-logos.spec	28 Jul 2006 00:53:18 -0000	1.34
+++ fedora-logos.spec	28 Jul 2006 18:16:35 -0000	1.35
@@ -1,6 +1,6 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.46
+Version: 1.1.47
 Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
@@ -147,6 +147,10 @@
 # end i386 bits
 
 %changelog
+* Fri Jul 28 2006 John (J5) Palmieri <johnp at redhat.com> - 1.1.47-1
+- Add a 4:3 aspect ratio background 
+- Fix extention to be .jpg on backgrounds 
+
 * Thu Jul 27 2006 John (J5) Palmieri <johnp at redhat.com> - 1.1.46-1
 - Add new default backgrounds
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	28 Jul 2006 00:53:18 -0000	1.30
+++ sources	28 Jul 2006 18:16:35 -0000	1.31
@@ -1 +1 @@
-8b6c7931b1418b19f666edc54ff2ae3d  fedora-logos-1.1.46.tar.bz2
+08d9101f517c61b4e3e67eba89c30f40  fedora-logos-1.1.47.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 18:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 14:22:56 -0400
Subject: rpms/desktop-backgrounds/devel .cvsignore, 1.12,
	1.13 desktop-backgrounds.spec, 1.37, 1.38 sources, 1.17, 1.18
Message-ID: <200607281822.k6SIMu3o002928@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/desktop-backgrounds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2913

Modified Files:
	.cvsignore desktop-backgrounds.spec sources 
Log Message:
- Add 4:3 aspect ration version of background



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	28 Jul 2006 02:09:14 -0000	1.12
+++ .cvsignore	28 Jul 2006 18:22:53 -0000	1.13
@@ -1,2 +1,3 @@
 redhat-backgrounds-11.tar.bz2
 redhat-backgrounds-12.tar.bz2
+redhat-backgrounds-13.tar.bz2


Index: desktop-backgrounds.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/desktop-backgrounds.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- desktop-backgrounds.spec	28 Jul 2006 02:07:21 -0000	1.37
+++ desktop-backgrounds.spec	28 Jul 2006 18:22:54 -0000	1.38
@@ -1,9 +1,9 @@
-%define rh_backgrounds_version 12 
+%define rh_backgrounds_version 13
 
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 35
+Release: 36
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -108,6 +108,9 @@
 #exclude %{_datadir}/backgrounds/images/earth_from_space.jpg
 
 %changelog
+* Fri Jul 28 2006 John (J5) Palmieri <johnp at redhat.com> - 2.0-35
+- Add 4:3 aspect ration version of background
+
 * Thu Jul 27 2006 John (J5) Palmieri <johnp at redhat.com> - 2.0-35
 - Add dual screen background
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/desktop-backgrounds/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Jul 2006 02:09:14 -0000	1.17
+++ sources	28 Jul 2006 18:22:54 -0000	1.18
@@ -1,2 +1,2 @@
 9a41ff73a67967715010ed6703898aad  Propaganda-1.0.0.tar.gz
-c9d97726a1ee0538aa2b83fa5eddc4a1  redhat-backgrounds-12.tar.bz2
+06de5e951280257b31249bdb7423ce78  redhat-backgrounds-13.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 18:44:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 14:44:10 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.3, 1.4
Message-ID: <200607281844.k6SIiASK015217@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15187

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
Log Message:
foo

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 4 files changed, 9 insertions(+), 5 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	26 Jul 2006 10:47:01 -0000	1.3
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	28 Jul 2006 18:44:08 -0000	1.4
@@ -1,6 +1,6 @@
 --- openoffice.org.orig/config_office/configure.in	2006-07-20 20:38:59.000000000 +0100
 +++ openoffice.org/config_office/configure.in	2006-07-20 20:41:08.000000000 +0100
-@@ -2064,7 +2064,9 @@
+@@ -2036,7 +2036,9 @@
        elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
          JDK=gcj
          AC_MSG_RESULT([checked (gcj)]) 
@@ -11,15 +11,15 @@
        elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
          JDK=bea
  
-@@ -2236,7 +2238,7 @@
+@@ -2208,7 +2210,7 @@
        AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB=-ljawt ] )
     fi
     if test -z "$AWTLIB"; then
 -      AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
 +      AC_MSG_WARN([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
-       AWTLIB="-ljawt"
     fi
     AC_SUBST(AWTLIB)
+ 
 Index: native/unix/makefile.mk
 ===================================================================
 RCS file: /cvs/api/bean/native/unix/makefile.mk,v



From fedora-cvs-commits at redhat.com  Fri Jul 28 19:13:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 15:13:16 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.41,
	1.42 selinux-policy.spec, 1.237, 1.238
Message-ID: <200607281913.k6SJDGmn006560@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6532

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Fri Jul 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-14
- Allow setroubleshootd to send mail


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |    4 
 91 files changed, 944 insertions(+), 245 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- policy-20060608.patch	28 Jul 2006 17:44:17 -0000	1.41
+++ policy-20060608.patch	28 Jul 2006 19:13:13 -0000	1.42
@@ -245,13 +245,13 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.te serefpolicy-2.3.3/policy/modules/admin/firstboot.te
 --- nsaserefpolicy/policy/modules/admin/firstboot.te	2006-07-14 17:04:45.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-07-26 12:55:01.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/firstboot.te	2006-07-28 15:12:28.000000000 -0400
 @@ -120,6 +120,10 @@
  	usermanage_domtrans_useradd(firstboot_t)
  ')
  
 +optional_policy(`
-+	hal_dbus_send(firstboot_t)
++	hal_dbus_chat(firstboot_t)
 +')
 +
  ifdef(`TODO',`
@@ -328,12 +328,12 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.3.3/policy/modules/admin/usermanage.te
 --- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-07-14 17:04:46.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/admin/usermanage.te	2006-07-28 13:32:21.000000000 -0400
 @@ -260,6 +260,7 @@
  ')
  
  optional_policy(`
-+	nscd_exec(groupadd_t)
++	nscd_domtrans(groupadd_t)
  	nscd_socket_use(groupadd_t)
  ')
  
@@ -341,7 +341,7 @@
  ')
  
  optional_policy(`
-+	nscd_exec(useradd_t)
++	nscd_domtrans(useradd_t)
  	nscd_socket_use(useradd_t)
  ')
  
@@ -1554,8 +1554,8 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te
 --- nsaserefpolicy/policy/modules/services/setroubleshoot.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-26 15:21:01.000000000 -0400
-@@ -0,0 +1,135 @@
++++ serefpolicy-2.3.3/policy/modules/services/setroubleshoot.te	2006-07-28 14:41:10.000000000 -0400
+@@ -0,0 +1,146 @@
 +policy_module(setroubleshoot,1.0.0)
 +
 +########################################
@@ -1657,6 +1657,17 @@
 +allow setroubleshoot_t self:unix_stream_socket create_stream_socket_perms;
 +allow setroubleshoot_t self:unix_dgram_socket create_socket_perms;
 +
++allow setroubleshootd_t self:netlink_route_socket r_netlink_socket_perms;
++
++corenet_non_ipsec_sendrecv(setroubleshootd_t)
++corenet_tcp_sendrecv_generic_if(setroubleshootd_t)
++corenet_raw_sendrecv_generic_if(setroubleshootd_t)
++corenet_tcp_sendrecv_all_nodes(setroubleshootd_t)
++corenet_raw_sendrecv_all_nodes(setroubleshootd_t)
++corenet_tcp_sendrecv_all_ports(setroubleshootd_t)
++corenet_tcp_bind_all_nodes(setroubleshootd_t)
++corenet_tcp_connect_smtp_port(setroubleshootd_t)
++
 +corecmd_exec_sbin(setroubleshoot_t)
 +corecmd_exec_bin(setroubleshoot_t)
 +


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- selinux-policy.spec	28 Jul 2006 17:44:17 -0000	1.237
+++ selinux-policy.spec	28 Jul 2006 19:13:13 -0000	1.238
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 13
+Release: 14
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Fri Jul 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-14
+- Allow setroubleshootd to send mail
+
 * Wed Jul 26 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-13
 - Add nagios policy
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 19:26:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 15:26:49 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server-Red-Hat-extramodes.patch,
	1.2, 1.3 xorg-x11-server.spec, 1.134, 1.135
Message-ID: <200607281926.k6SJQnPG026432@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26399

Modified Files:
	xorg-x11-server-Red-Hat-extramodes.patch xorg-x11-server.spec 
Log Message:
* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-13.fc6
- Comment out the 848x480 modes from the extramodes patch.  Any panel that
  wants it should be doing EDID injection by now, and it screws up
  autoconfig by _just_ fitting in the ranges for 800x600.


xorg-x11-server-Red-Hat-extramodes.patch:
 extramodes |  141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 139 insertions(+), 2 deletions(-)

Index: xorg-x11-server-Red-Hat-extramodes.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-Red-Hat-extramodes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-Red-Hat-extramodes.patch	26 Jul 2006 11:54:20 -0000	1.2
+++ xorg-x11-server-Red-Hat-extramodes.patch	28 Jul 2006 19:26:46 -0000	1.3
@@ -1,9 +1,6 @@
-Please keep the modes in the extramodes file sorted by the X resolution, then
-by the Y resolution for readability and ease of maintenance.
-
---- hw/xfree86/common/extramodes.Red-Hat-extramodes	2006-07-05 14:31:40.000000000 -0400
-+++ hw/xfree86/common/extramodes	2006-07-26 07:52:01.000000000 -0400
-@@ -3,21 +3,143 @@
+--- xorg-server-1.1.1/hw/xfree86/common/extramodes.Red-Hat-extramodes	2006-07-05 14:31:40.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/extramodes	2006-07-28 15:06:01.000000000 -0400
+@@ -3,21 +3,147 @@
  //
  // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
  //
@@ -13,17 +10,21 @@
  # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
  ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
  
++# Disable the 848x480 modes for now.  They're quite rare, and they screw up
++# the autosizing logic.  They're panel modes anyway, and EDID injection
++# should cover that now. - ajax, 2006-07-28
++
 +# 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
++# 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
++# 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
++# 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
++# Modeline "848x480"  47.39  848 888 976 1104  480 481 484 505  -HSync +Vsync
 +
  # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
  ModeLine "1152x768"   64.995 1152 1178 1314 1472  768  771  777  806 +hsync +vsync
@@ -149,7 +150,7 @@
  
  # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
  Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
-@@ -31,3 +153,14 @@
+@@ -31,3 +157,14 @@
  # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
  Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
  


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- xorg-x11-server.spec	26 Jul 2006 11:54:20 -0000	1.134
+++ xorg-x11-server.spec	28 Jul 2006 19:26:46 -0000	1.135
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -326,7 +326,7 @@
 %patch106 -p1 -b .no-xnest-composite
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
-%patch1001 -p0 -b .Red-Hat-extramodes
+%patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
 %patch1003 -p1 -b .fpic
 %patch1004 -p1 -b .selinux-awareness
@@ -672,6 +672,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-13.fc6
+- Comment out the 848x480 modes from the extramodes patch.  Any panel that
+  wants it should be doing EDID injection by now, and it screws up
+  autoconfig by _just_ fitting in the ranges for 800x600.
+
 * Wed Jul 26 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-12.fc6
 - Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
 - Sorted the extramodes file by X res, then Y res for ease of maintenance.



From fedora-cvs-commits at redhat.com  Fri Jul 28 19:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 15:38:09 -0400
Subject: rpms/nfs-utils/devel nfs-utils-1.0.9-lazy-umount.patch, NONE,
	1.1 nfs-utils-1.0.9-mount-fsc.patch, NONE,
	1.1 nfs-utils-1.0.9-mount-options-v3.patch, NONE,
	1.1 nfs-utils.spec, 1.99, 1.100
Message-ID: <200607281938.k6SJc9g6029683@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29575

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.0.9-lazy-umount.patch 
	nfs-utils-1.0.9-mount-fsc.patch 
	nfs-utils-1.0.9-mount-options-v3.patch 
Log Message:
Enabled the creating of mount.nfs and umount.nfs binaries
Added mount option fixes suggested by upstream.
Fix lazy umounts (bz 169299)
Added -o fsc mount option.


nfs-utils-1.0.9-lazy-umount.patch:
 nfsumount.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE nfs-utils-1.0.9-lazy-umount.patch ---
--- nfs-utils-1.0.9/utils/mount/nfsumount.c.orig	2006-07-28 11:12:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfsumount.c	2006-07-28 11:14:41.000000000 -0400
@@ -100,9 +100,9 @@ int nfs_call_umount(clnt_addr_t *mnt_ser
 	}
 	mnt_closeclnt(clnt, msock);
 	if (res == RPC_SUCCESS)
-		return 1;
+		return 0;
  out_bad:
-	return 0;
+	return 1;
 }
 
 u_int get_mntproto(const char *);
@@ -251,9 +251,6 @@ int add_mtab2(const char *spec, const ch
         return 1;
 }
 
-/*
- * Returns 1 if everything went well, else 0.
- */
 int _nfsumount(const char *spec, const char *opts)
 {
 	char *hostname;
@@ -309,8 +306,8 @@ int _nfsumount(const char *spec, const c
 		goto out_bad;
 	return nfs_call_umount(&mnt_server, &dirname);
  out_bad:
-	fprintf(stderr, "%s: %s: not found or not mounted\n", progname, spec);
-	return 0;
+	fprintf(stderr, "%s: %s: not found / mounted or server not reachable\n", progname, spec);
+	return 1;
 }
 
 static struct option umount_longopts[] =
@@ -393,14 +390,18 @@ int nfsumount(int argc, char *argv[])
 			}
 		}
 
-		ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
-		if(ret)
+		ret = 0;
+		if(!force && !lazy)
+			ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+		if(!ret)
 			ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,
 				mc->m.mnt_type, mc->m.mnt_opts, mc);
 	}
 	else {
-		ret = _nfsumount(spec, NULL);
-		if(ret)
+		ret = 0;
+		if(!force && !lazy)
+			ret = _nfsumount(spec, NULL);
+		if(!ret)
 			ret = add_mtab2(spec, spec, spec, spec, NULL);
 	}
 

nfs-utils-1.0.9-mount-fsc.patch:
 nfs4_mount.h |    1 +
 nfs4mount.c  |    8 ++++++--
 nfs_mount.h  |    1 +
 nfsmount.c   |    4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE nfs-utils-1.0.9-mount-fsc.patch ---
--- nfs-utils-1.0.9/utils/mount/nfs4mount.c.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfs4mount.c	2006-07-28 13:08:10.000000000 -0400
@@ -200,7 +200,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;
 	time_t timeout, t;
@@ -251,6 +251,7 @@ int nfs4mount(const char *spec, const ch
 	intr = NFS4_MOUNT_INTR;
 	nocto = 0;
 	noac = 0;
+	fscache = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 
 	/*
@@ -331,6 +332,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"))
@@ -346,7 +349,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
--- nfs-utils-1.0.9/utils/mount/nfs_mount.h.orig	2006-07-28 12:52:43.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfs_mount.h	2006-07-28 12:58:07.000000000 -0400
@@ -63,6 +63,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
 #define NFS_MOUNT_NOACL     0x0800  /* 4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE	0x4000	/* 6 */
 
 /* security pseudoflavors */
 
--- nfs-utils-1.0.9/utils/mount/nfsmount.c.orig	2006-07-28 13:02:55.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfsmount.c	2006-07-28 13:03:11.000000000 -0400
@@ -694,6 +694,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)
--- nfs-utils-1.0.9/utils/mount/nfs4_mount.h.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfs4_mount.h	2006-07-28 13:07:27.000000000 -0400
@@ -65,6 +65,7 @@ struct nfs4_mount_data {
 #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
 #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
 #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
+#define NFS4_MOUNT_FSCACHE	0x4000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 /* pseudoflavors: */

nfs-utils-1.0.9-mount-options-v3.patch:
 support/include/fstab.h      |    8 ++
 support/include/nfs_mntent.h |    8 +-
 support/nfs/fstab.c          |   57 ++++++++++++++++-
 utils/mount/Makefile.am      |    7 +-
 utils/mount/mount.c          |  141 +++++++++++++++++++++++++++++++++++++------
 utils/mount/nfs_mount.h      |    2 
 utils/mount/nfsumount.c      |   19 +++++
 7 files changed, 213 insertions(+), 29 deletions(-)

--- NEW FILE nfs-utils-1.0.9-mount-options-v3.patch ---
--- nfs-utils-1.0.9/support/include/fstab.h.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/support/include/fstab.h	2006-07-28 11:07:24.000000000 -0400
@@ -3,6 +3,10 @@
 
 #include "nfs_mntent.h"
 
+#ifndef _PATH_FSTAB
+#define _PATH_FSTAB "/etc/fstab"
+#endif
+
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 
@@ -16,6 +20,10 @@ struct mntentchn *getmntoptfile (const c
 struct mntentchn *getmntdirbackward (const char *dir, struct mntentchn *mc);
 struct mntentchn *getmntdevbackward (const char *dev, struct mntentchn *mc);
 
+struct mntentchn *fstab_head (void);
+struct mntentchn *getfsfile (const char *file);
+struct mntentchn *getfsspec (const char *spec);
+
 void lock_mtab (void);
 void unlock_mtab (void);
 void update_mtab (const char *special, nfs_mntent_t *with);
--- nfs-utils-1.0.9/support/include/nfs_mntent.h.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/support/include/nfs_mntent.h	2006-07-28 11:07:24.000000000 -0400
@@ -7,10 +7,10 @@
 #define _NFS_MNTENT_H
 
 typedef struct nfs_mntent_s {
-	const char *mnt_fsname;
-	const char *mnt_dir;
-	const char *mnt_type;
-	const char *mnt_opts;
+	char *mnt_fsname;
+	char *mnt_dir;
+	char *mnt_type;
+	char *mnt_opts;
 	int mnt_freq;
 	int mnt_passno;
 } nfs_mntent_t;
--- nfs-utils-1.0.9/support/nfs/fstab.c.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/support/nfs/fstab.c	2006-07-28 11:07:24.000000000 -0400
@@ -78,10 +78,10 @@ mtab_is_writable() {
 
 /* Contents of mtab and fstab ---------------------------------*/
 
-struct mntentchn mounttable;
-static int got_mtab = 0;
+struct mntentchn mounttable, fstab;
+static int got_mtab = 0, got_fstab = 0;
 
-static void read_mounttable(void);
+static void read_mounttable(void), read_fstab(void);
 
 struct mntentchn *
 mtab_head() {
@@ -96,6 +96,13 @@ my_free(const void *s) {
 		free((void *) s);
 }
 
+struct mntentchn *
+fstab_head() {
+	if (!got_fstab)
+		read_fstab();
+	return &fstab;
+}
+
 static void
 discard_mntentchn(struct mntentchn *mc0) {
 	struct mntentchn *mc, *mc1;
@@ -167,6 +174,26 @@ read_mounttable() {
         read_mntentchn(mfp, fnam, mc);
 }
 
+static void
+read_fstab() {
+	mntFILE *mfp = NULL;
+	const char *fnam;
+	struct mntentchn *mc = &fstab;
+
+	got_fstab = 1;
+	mc->nxt = mc->prev = NULL;
+
+	fnam = _PATH_FSTAB;
+	mfp = nfs_setmntent (fnam, "r");
+	if (mfp == NULL || mfp->mntent_fp == NULL) {
+		int errsv = errno;
+		error(_("warning: can't open %s: %s"),
+			_PATH_FSTAB, strerror (errsv));
+		return;
+	}
+	read_mntentchn(mfp, fnam, mc);
+}
+
 /*
  * Given the directory name NAME, and the place MCPREV we found it last time,
  * try to find more occurrences.
@@ -201,6 +228,30 @@ getmntdevbackward (const char *name, str
 	return NULL;
 }
 
+/* Find the dir FILE in fstab.  */
+struct mntentchn *
+getfsfile (const char *file) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq(mc->m.mnt_dir, file))
+			return mc;
+	return NULL;
+}
+
+/* Find the device SPEC in fstab.  */
+struct mntentchn *
+getfsspec (const char *spec) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq(mc->m.mnt_fsname, spec))
+			return mc;
+	return NULL;
+}
+
 /* Updating mtab ----------------------------------------------*/
 
 /* Flag for already existing lock file. */
--- nfs-utils-1.0.9/utils/mount/Makefile.am.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/Makefile.am	2006-07-28 11:09:31.000000000 -0400
@@ -14,9 +14,10 @@ MAINTAINERCLEANFILES = Makefile.in
 
 install-exec-hook:
 	(cd $(DESTDIR)$(sbindir) && \
-	  ln -sf $(sbin_PROGRAMS) mount.nfs4 && \
-	  ln -sf $(sbin_PROGRAMS) umount.nfs && \
-	  ln -sf $(sbin_PROGRAMS) umount.nfs4)
+	  chmod +s $(sbin_PROGRAMS) && \
+	  cp -p $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/mount.nfs4 && \
+	  cp -p $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/umount.nfs && \
+	  cp -p $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/umount.nfs4)
 uninstall-hook:
 	(cd $(DESTDIR)$(sbindir) && \
 	    rm -f mount.nfs4 umount.nfs umount.nfs4)
--- nfs-utils-1.0.9/utils/mount/mount.c.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/mount.c	2006-07-28 11:07:24.000000000 -0400
@@ -28,6 +28,7 @@
 #include <sys/mount.h>
 #include <getopt.h>
 #include <mntent.h>
+#include <pwd.h>
 
 #include "fstab.h"
 #include "xcommon.h"
@@ -74,6 +75,12 @@ struct opt_map {
   int  mask;                    /* flag mask value */
 };
 
+/* Custom mount options for our own purposes.  */
+/* Maybe these should now be freed for kernel use again */
+#define MS_DUMMY	0x00000000
+#define MS_USERS	0x40000000
+#define MS_USER		0x20000000
+
 static const struct opt_map opt_map[] = {
   { "defaults", 0, 0, 0         },      /* default options */
   { "ro",       1, 0, MS_RDONLY },      /* read-only */
@@ -90,6 +97,18 @@ static const struct opt_map opt_map[] = 
   { "remount",  0, 0, MS_REMOUNT},      /* Alter flags of mounted FS */
   { "bind",     0, 0, MS_BIND   },      /* Remount part of tree elsewhere */
   { "rbind",    0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
+  { "auto",     0, 0, MS_DUMMY },       /* Can be mounted using -a */
+  { "noauto",   0, 0, MS_DUMMY },       /* Can  only be mounted explicitly */
+  { "users",    0, 0, MS_USERS  },      /* Allow ordinary user to mount */
+  { "nousers",  0, 1, MS_USERS  },      /* Forbid ordinary user to mount */
+  { "user",     0, 0, MS_USER   },      /* Allow ordinary user to mount */
+  { "nouser",   0, 1, MS_USER   },      /* Forbid ordinary user to mount */
+  { "owner",    0, 0, MS_DUMMY  },      /* Let the owner of the device mount */
+  { "noowner",  0, 0, MS_DUMMY  },      /* Device owner has no special privs */
+  { "group",    0, 0, MS_DUMMY  },      /* Let the group of the device mount */
+  { "nogroup",  0, 0, MS_DUMMY  },      /* Device group has no special privs */
+  { "_netdev",  0, 0, MS_DUMMY},        /* Device requires network */
+  { "comment",  0, 0, MS_DUMMY},        /* fstab comment only (kudzu,_netdev)*/
 
   /* add new options here */
 #ifdef MS_NOSUB
@@ -104,6 +123,7 @@ static const struct opt_map opt_map[] = 
   { "mand",     0, 0, MS_MANDLOCK },    /* Allow mandatory locks on this FS */
   { "nomand",   0, 1, MS_MANDLOCK },    /* Forbid mandatory locks on this FS */
 #endif
+  { "loop",     1, 0, MS_DUMMY   },      /* use a loop device */
 #ifdef MS_NOATIME
   { "atime",    0, 1, MS_NOATIME },     /* Update access time */
   { "noatime",  0, 0, MS_NOATIME },     /* Do not update access time */
@@ -121,6 +141,12 @@ static char * fix_opts_string (int flags
 	char *new_opts;
 
 	new_opts = xstrdup((flags & MS_RDONLY) ? "ro" : "rw");
+	if (flags & MS_USER) {
+		struct passwd *pw = getpwuid(getuid());
+		if(pw)
+			new_opts = xstrconcat3(new_opts, ",user=", pw->pw_name);
+	}
+	
 	for (om = opt_map; om->opt != NULL; om++) {
 		if (om->skip)
 			continue;
@@ -132,9 +158,20 @@ static char * fix_opts_string (int flags
 	if (extra_opts && *extra_opts) {
 		new_opts = xstrconcat3(new_opts, ",", extra_opts);
 	}
+
 	return new_opts;
 }
 
+void copy_mntent(struct mntent *ment, nfs_mntent_t *nment)
+{
+	/* Not sure why nfs_mntent_t should exist */
+	strcpy(nment->mnt_fsname, ment->mnt_fsname);
+	strcpy(nment->mnt_dir, ment->mnt_dir);
+	strcpy(nment->mnt_type, ment->mnt_type);
+	strcpy(nment->mnt_opts, ment->mnt_opts);
+	nment->mnt_freq = ment->mnt_freq;
+	nment->mnt_passno = ment->mnt_passno;
+}
 
 int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opts, int freq, int passno)
 {
@@ -146,8 +183,16 @@ int add_mtab(char *fsname, char *mount_p
 	ment.mnt_dir = mount_point;
 	ment.mnt_type = fstype;
 	ment.mnt_opts = fix_opts_string(flags, opts);
-	ment.mnt_freq = 0;
-	ment.mnt_passno= 0;
+	ment.mnt_freq = freq;
+	ment.mnt_passno= passno;
+
+	if(flags & MS_REMOUNT) {
+		nfs_mntent_t nment;
+		
+		copy_mntent(&ment, &nment);
+		update_mtab(nment.mnt_dir, &nment);
+		return 0;
+	}
 
 	if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)	{
 		fprintf(stderr, "Can't get "MOUNTED"~ lock file");
@@ -242,20 +287,56 @@ static void parse_opts (const char *opti
 
 }
 
+/*
+ * Look for an option in a comma-separated list
+ */
+int
+contains(const char *list, const char *s) {
+	int n = strlen(s);
+
+	while (*list) {
+		if (strncmp(list, s, n) == 0 &&
+		  (list[n] == 0 || list[n] == ','))
+			return 1;
+		while (*list && *list++ != ',') ;
+	}
+	return 0;
+}
+
+/*
+ * If list contains "user=peter" and we ask for "user=", return "peter"
+ */
+char *
+get_value(const char *list, const char *s) {
+	const char *t;
+	int n = strlen(s);
+
+	while (*list) {
+		if (strncmp(list, s, n) == 0) {
+			s = t = list+n;
+			while (*s && *s != ',')
+				s++;
+			return xstrndup(t, s-t);
+		}
+		while (*list && *list++ != ',') ;
+	}
+	return 0;
+}
+
 static void mount_error(char *node)
 {
 	switch(errno) {
 		case ENOTDIR:
-			printf("%s: mount point %s is not a directory\n", progname, node);
+			fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
 			break;
 		case EBUSY:
-			printf("%s: %s is already mounted or busy\n", progname, node);
+			fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
 			break;
 		case ENOENT:
-			printf("%s: mount point %s does not exist\n", progname, node);
+			fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
 			break;
 		default:
-			printf("%s: %s\n", progname, strerror(errno));
+			fprintf(stderr, "%s: %s\n", progname, strerror(errno));
 	}
 }
 
@@ -264,16 +345,13 @@ int main(int argc, char *argv[])
 	int c, flags = 0, nfs_mount_vers = 0, mnt_err = 1, fake = 0;
 	char *spec, *mount_point, *extra_opts = NULL;
 	char *mount_opts = NULL, *p;
+	struct mntentchn *mc;
+	uid_t uid = getuid();
 
 	progname = argv[0];
 	if ((p = strrchr(progname, '/')) != NULL)
 		progname = p+1;
 
-	if (getuid() != 0) {
-		printf("%s: only root can do that.\n", progname);
-		exit(1);
-	}
-
 	if(!strncmp(progname, "umount", strlen("umount"))) {
 		if(argc < 2) {
 			umount_usage();
@@ -355,9 +433,33 @@ int main(int argc, char *argv[])
 
 	spec = argv[1];
 	mount_point = canonicalize(argv[2]);
-	
+
 	parse_opts(mount_opts, &flags, &extra_opts);
 
+	if (uid != 0 && !(flags & MS_USERS) && !(flags & MS_USER)) {
+		fprintf(stderr, "%s: permission denied\n", progname);
+		exit(1);
+	}
+
+	if ((flags & MS_USER || flags & MS_USERS) && uid != 0) {
+		/* check if fstab has entry, and further see if the user or users option is given */
+		if ((mc = getfsspec(spec)) == NULL &&
+		    (mc = getfsfile(spec)) == NULL) {
+			fprintf(stderr, "%s: permission denied - invalid option\n", progname);
+			exit(1);
+		}
+		else {
+			if((flags & MS_USER) && !contains(mc->m.mnt_opts, "user")) {
+				fprintf(stderr, "%s: permission denied - invalid option\n", progname);
+				exit(1);
+			}
+			if((flags & MS_USERS) && !contains(mc->m.mnt_opts, "users")) {
+				fprintf(stderr, "%s: permission denied - invalid option\n", progname);
+				exit(1);
+			}
+		}
+	}
+
 	if (!strcmp(progname, "mount.nfs4") || nfs_mount_vers == 4) {
 		nfs_mount_vers = 4;
 		mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
@@ -370,16 +472,19 @@ int main(int argc, char *argv[])
 	}
 
 	if (!mnt_err && !fake) {
-		mnt_err = do_mount_syscall(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
+		if(!(flags & MS_REMOUNT)) {
+			mnt_err = do_mount_syscall(spec, mount_point,
+					nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
 		
-		if(mnt_err) {
-			mount_error(mount_point);
-			exit(-1);
+			if(mnt_err) {
+				mount_error(mount_point);
+				exit(-1);
+			}
 		}
-
-		if(!nomtab)
+		if(!nomtab) {
 			add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
 				 flags, extra_opts, 0, 0);
+		}
 	}
 
 	return 0;
--- nfs-utils-1.0.9/utils/mount/nfs_mount.h.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfs_mount.h	2006-07-28 11:07:24.000000000 -0400
@@ -80,5 +80,7 @@ struct nfs_mount_data {
 
 int nfsmount(const char *, const char *, int *, char **, char **, int *, int);
 void mount_errors(char *, int, int);
+int contains(const char *, const char *);
+char *get_value(const char *, const char *);
 
 #endif /* _NFS_MOUNT_H */
--- nfs-utils-1.0.9/utils/mount/nfsumount.c.orig	2006-07-07 20:04:32.000000000 -0400
+++ nfs-utils-1.0.9/utils/mount/nfsumount.c	2006-07-28 11:07:24.000000000 -0400
@@ -23,12 +23,14 @@
 #include <mntent.h>
 #include <sys/mount.h>
 #include <ctype.h>
+#include <pwd.h>
 
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"
 #include "conn.h"
 
+#include "nfs_mount.h"
 #include "mount_constants.h"
 #include "mount.h"
 #include "nfsumount.h"
@@ -307,7 +309,7 @@ int _nfsumount(const char *spec, const c
 		goto out_bad;
 	return nfs_call_umount(&mnt_server, &dirname);
  out_bad:
-	printf("%s: %s: not found or not mounted\n", progname, spec);
+	fprintf(stderr, "%s: %s: not found or not mounted\n", progname, spec);
 	return 0;
 }
 
@@ -376,6 +378,21 @@ int nfsumount(int argc, char *argv[])
 		printf(_("Could not find %s in mtab\n"), spec);
 
 	if(mc) {
+		if(contains(mc->m.mnt_opts, "user") && getuid() != 0) {
+			struct passwd *pw = getpwuid(getuid());
+			if(!pw || strcmp(pw->pw_name, get_value(mc->m.mnt_opts, "user="))) {
+				fprintf(stderr, "%s: permission denied to unmount %s\n",
+						progname, spec);
+				exit(1);
+			}
+		} else {
+			if(!contains(mc->m.mnt_opts, "users") && getuid() != 0) {
+				fprintf(stderr, "%s: only root can unmount %s from %s\n",
+						progname, mc->m.mnt_fsname, mc->m.mnt_dir);
+				exit(1);
+			}
+		}
+
 		ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
 		if(ret)
 			ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- nfs-utils.spec	24 Jul 2006 15:07:21 -0000	1.99
+++ nfs-utils.spec	28 Jul 2006 19:38:07 -0000	1.100
@@ -1,12 +1,16 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.9
-Release: 1%{?dist}
-#Epoch: 1
+Release: 2%{?dist}
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
+# Create mount.nfs and umount.nfs binaries that will be
+# used by the system mount command to mount (and umount)
+# both NFS and NFS4 filesystems.
+%define enablemount 1
+
 Source0: http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-1.0.9.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
@@ -21,6 +25,9 @@
 Patch52: nfs-utils-1.0.6-idmap.conf.patch
 Patch53: nfs-utils-1.0.6-gssd_mixed_case.patch
 Patch54: nfs-utils-1.0.8-privports.patch
+Patch55: nfs-utils-1.0.9-mount-options-v3.patch
+Patch56: nfs-utils-1.0.9-lazy-umount.patch
+Patch57: nfs-utils-1.0.9-mount-fsc.patch
 
 Patch100: nfs-utils-1.0.8-compile.patch
 
@@ -65,6 +72,9 @@
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
 
 # Do the magic to get things to compile
 %patch100 -p1
@@ -73,6 +83,9 @@
 find . -name "*.orig" | xargs rm -f
 
 %build
+%if %{enablemount}
+ENABLEMOUNT="--enable-mount"
+%endif
 
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -88,7 +101,8 @@
 	CFLAGS="$CFLAGS" \
 	CPPFLAGS="$DEFINES" \
 	LDFLAGS="-pie" \
-	--prefix=$RPM_BUILD_ROOT
+	--prefix=$RPM_BUILD_ROOT \
+	$ENABLEMOUNT
 
 make all
 
@@ -113,6 +127,10 @@
 touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
 mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
 
+%if %{enablemount}
+mv $RPM_BUILD_ROOT/usr/sbin/{mount.*,umount.*} $RPM_BUILD_ROOT/sbin
+%endif
+
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
 
@@ -222,7 +240,20 @@
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
 
+%if %{enablemount}
+%attr(4755,root,root)   /sbin/mount.nfs
+%attr(4755,root,root)   /sbin/mount.nfs4
+%attr(4755,root,root)   /sbin/umount.nfs
+%attr(4755,root,root)   /sbin/umount.nfs4
+%endif
+
 %changelog
+* Fri Jul 28 2006 <SteveD at RedHat.com> 1.0.9-2
+- Enabled the creating of mount.nfs and umount.nfs binaries
+- Added mount option fixes suggested by upstream.
+- Fix lazy umounts (bz 169299)
+- Added -o fsc mount option.
+
 * Mon Jul 24 2006 <SteveD at RedHat.com> 1.0.9-1
 - Updated to 1.0.9 release
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 19:53:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 15:53:43 -0400
Subject: rpms/firefox/devel firefox.spec,1.136,1.137
Message-ID: <200607281953.k6SJrhFY017331@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17302

Modified Files:
	firefox.spec 
Log Message:
* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
- Dereference links in %install so the files get put in the
  right place.



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- firefox.spec	28 Jul 2006 15:54:50 -0000	1.136
+++ firefox.spec	28 Jul 2006 19:53:40 -0000	1.137
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        6
+Release:        7
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -257,9 +257,9 @@
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-%{__cp} -r dist/include/* \
+%{__cp} -rL dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version}
-%{__cp} -r dist/idl/* \
+%{__cp} -rL dist/idl/* \
   $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version}
 install -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
@@ -353,6 +353,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
+- Dereference links in %%install so the files get put in the
+  right place.
+
 * Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
 - Actually, those pkgconfig files really shouldn't be here as we use
   system nss and nspr.



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:07:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:07:56 -0400
Subject: rpms/prelink/devel prelink-cache-sort-crash-rh197451.patch, NONE,
	1.1 prelink.spec, 1.40, 1.41
Message-ID: <200607282007.k6SK7u7g021086@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20913

Modified Files:
	prelink.spec 
Added Files:
	prelink-cache-sort-crash-rh197451.patch 
Log Message:
* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> 0.3.9-2
- Avoid SEGFAULT when sorting cache entries (#197451)


prelink-cache-sort-crash-rh197451.patch:
 cache.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE prelink-cache-sort-crash-rh197451.patch ---
Index: src/cache.c
===================================================================
--- src/cache.c.orig	2006-06-20 10:36:40.000000000 -0300
+++ src/cache.c	2006-07-28 16:26:39.000000000 -0300
@@ -336,8 +336,8 @@ deps_cmp (const void *A, const void *B)
   struct prelink_entry *a = * (struct prelink_entry **) A;
   struct prelink_entry *b = * (struct prelink_entry **) B;
 
-  if (a == NULL && b != NULL)
-    return 1;
+  if (a == NULL)
+    return (b != NULL);
   if (a != NULL && b == NULL)
     return -1;
 


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- prelink.spec	12 Jul 2006 13:25:48 -0000	1.40
+++ prelink.spec	28 Jul 2006 20:07:53 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 %define date 20060712
@@ -18,6 +18,8 @@
 # For now
 ExclusiveArch: %{ix86} alpha sparc sparc64 s390 s390x x86_64 ppc ppc64
 
+Patch0: prelink-cache-sort-crash-rh197451.patch
+
 %description
 The prelink package contains a utility which modifies ELF shared libraries
 and executables, so that far less relocations need to be resolved at runtime
@@ -25,6 +27,7 @@
 
 %prep
 %setup -n prelink
+%patch0 -p0 -b .rh197451~
 
 %build
 %configure --disable-shared
@@ -90,6 +93,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink/prelink.log
 
 %changelog
+* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> 0.3.9-2
+- Avoid SEGFAULT when sorting cache entries (#197451)
+
 * Wed Jul 12 2006 Jakub Jelinek <jakub at redhat.com> 0.3.9-1
 - DT_GNU_HASH support
 - handle N_BNSYM and N_ENSYM stabs (#198203)



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:10:37 -0400
Subject: rpms/dmraid/devel dmraid-1.0.0.rc11-hpt37x-errorlog.patch, NONE,
	1.1 dmraid.spec, 1.55, 1.56
Message-ID: <200607282010.k6SKAbQ5021622@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21522

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-hpt37x-errorlog.patch 
Log Message:
- get rid of the .a
- package libdmraid.so* unconditionally
- fix bounds checking in hpt37x format handler.


dmraid-1.0.0.rc11-hpt37x-errorlog.patch:
 hpt37x.c |    3 ++-
 hpt37x.h |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE dmraid-1.0.0.rc11-hpt37x-errorlog.patch ---
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c.errorlog	2006-07-28 15:42:22.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.c	2006-07-28 15:56:05.000000000 -0400
@@ -124,7 +124,8 @@
 	CVT32(hpt->boot_mode);
 
 	for (l = hpt->errorlog;
-	     l < hpt->errorlog + hpt->error_log_entries;
+	     l < hpt->errorlog + hpt->error_log_entries &&
+                l < &hpt->errorlog[HPT_MAX_ERRORS];
 	     l++) {
 		CVT32(l->timestamp);
 		CVT32(l->lba);
--- dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h.errorlog	2006-07-28 15:56:20.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/format/ataraid/hpt37x.h	2006-07-28 15:56:30.000000000 -0400
@@ -90,7 +90,8 @@
 	       uint8_t        status;
 	       uint8_t        sectors;
 	       uint32_t       lba;
-       } errorlog[32];
+#define HPT_MAX_ERRORS         32
+       } errorlog[HPT_MAX_ERRORS];
        uint8_t        filler[60];
 } __attribute__ ((packed));
 #endif


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- dmraid.spec	12 Jul 2006 05:39:53 -0000	1.55
+++ dmraid.spec	28 Jul 2006 20:10:35 -0000	1.56
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc11
-Release: FC6.1.1
+Release: FC6.2
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -16,12 +16,11 @@
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
 Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
 Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
+Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
 
-%define dmraid_build_dso 0
-
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
@@ -38,6 +37,7 @@
 %setup -q -n dmraid/%{version}
 %patch0 -p2
 %patch1 -p2
+%patch2 -p2
 
 %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
@@ -45,12 +45,7 @@
 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 --enable-libsepol --disable-static_link
-%if "%{dmraid_build_dso}" == "1"
 (cd lib ; make DESTDIR=$RPM_BUILD_ROOT libdmraid.so)
-make DESTDIR=$RPM_BUILD_ROOT
-%else
-make DESTDIR=$RPM_BUILD_ROOT
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,15 +54,10 @@
 install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
 install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
 
-# install the static library
-install -m 755 lib/libdmraid.a $RPM_BUILD_ROOT%{_libdir}
-
 # if requested, install the dso
-%if "%{dmraid_build_dso}" == "1"
 install -m 755 lib/libdmraid.so \
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,22 +67,20 @@
 %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
 /%{_mandir}/man8/*
 /sbin/*
-%if "%{dmraid_build_dso}" == "1"
 %{_libdir}/libdmraid.so.*
-%endif
 /var/lock/dmraid
 
 %files -n dmraid-devel
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
 %{_includedir}/dmraid/*
-%{_libdir}/libdmraid.a
-
-%if "%{dmraid_build_dso}" == "1"
 %{_libdir}/libdmraid.so
-%endif
 
 %changelog
+* Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.2
+- Fix bounds checking on hpt37x error log
+- Only build the .so, not the .a
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc11-FC6.1.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:11:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:11:27 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2471, 1.2472 built-in-where,
	1.4, NONE make-symsets, 1.4, NONE
Message-ID: <200607282011.k6SKBRdZ021944@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21832

Modified Files:
	kernel-2.6.spec 
Removed Files:
	built-in-where make-symsets 
Log Message:
Cleaned up a few crufty files



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2471
retrieving revision 1.2472
diff -u -r1.2471 -r1.2472
--- kernel-2.6.spec	28 Jul 2006 17:57:26 -0000	1.2471
+++ kernel-2.6.spec	28 Jul 2006 20:11:24 -0000	1.2472
@@ -1663,6 +1663,9 @@
 %endif
 
 %changelog
+* Fri Jul 28 2006 Jon Masters <jcm at redhat.com>
+- Remove make-symsets and built-in-where as now handled by kabitool
+
 * Fri Jul 28 2006 Dave Jones <davej at redhat.com>
 - Update futex-death patch.
 


--- built-in-where DELETED ---


--- make-symsets DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:18:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:18:25 -0400
Subject: rpms/at-spi/devel at-spi-1.7.9-corba-refs.patch, NONE,
	1.1 at-spi.spec, 1.47, 1.48
Message-ID: <200607282018.k6SKIPGj006878@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6831

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-1.7.9-corba-refs.patch 
Log Message:
* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 1.7.9-3
- Fix segfault if a11y enabled on x86-64 (#196063)



at-spi-1.7.9-corba-refs.patch:
 atk-bridge/bridge.c |    2 +-
 libspi/util.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE at-spi-1.7.9-corba-refs.patch ---
Index: atk-bridge/bridge.c
===================================================================
RCS file: /cvs/gnome/at-spi/atk-bridge/bridge.c,v
retrieving revision 1.93
diff -u -p -r1.93 bridge.c
--- atk-bridge/bridge.c	14 Jun 2006 15:22:44 -0000	1.93
+++ atk-bridge/bridge.c	28 Jul 2006 19:20:57 -0000
@@ -696,7 +696,7 @@ spi_atk_emit_eventv (const GObject      
   
   g_free (e.type);
 
-  if (e.any_data._release) CORBA_free (&e.any_data._value);
+  if (e.any_data._release) CORBA_free (e.any_data._value);
   
   va_end (args);
 
Index: libspi/util.c
===================================================================
RCS file: /cvs/gnome/at-spi/libspi/util.c,v
retrieving revision 1.11
diff -u -p -r1.11 util.c
--- libspi/util.c	19 Jul 2006 17:27:18 -0000	1.11
+++ libspi/util.c	28 Jul 2006 19:20:57 -0000
@@ -153,7 +153,7 @@ spi_init_any_object (CORBA_any *any_deta
   details->source_name = CORBA_string_dup (name);
   
   details->any_data._type = TC_CORBA_Object;
-  details->any_data._value = o;
+  details->any_data._value = ORBit_copy_value (o, TC_CORBA_Object);
   details->any_data._release = TRUE;
 }
 


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- at-spi.spec	12 Jul 2006 21:25:10 -0000	1.47
+++ at-spi.spec	28 Jul 2006 20:18:22 -0000	1.48
@@ -7,9 +7,10 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.9
-Release: 2
+Release: 3
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
+Patch1: at-spi-1.7.9-corba-refs.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -55,6 +56,7 @@
 
 %prep
 %setup -q
+%patch1 -p0 -b .corba-refs
 
 %build
 %configure --disable-gtk-doc
@@ -95,6 +97,9 @@
 %{_includedir}/* 
 
 %changelog
+* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 1.7.9-3
+- Fix segfault if a11y enabled on x86-64 (#196063)
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.9-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:19:08 -0400
Subject: rpms/dmraid/devel dmraid-1.0.0.rc11-dupes.patch, NONE,
	1.1 dmraid.spec, 1.56, 1.57
Message-ID: <200607282019.k6SKJ8cR007168@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7039

Modified Files:
	dmraid.spec 
Added Files:
	dmraid-1.0.0.rc11-dupes.patch 
Log Message:
- fix dupes of asc.c in makefile rule
- fix make install/file list descrepencies


dmraid-1.0.0.rc11-dupes.patch:
 Makefile.in |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE dmraid-1.0.0.rc11-dupes.patch ---
--- dmraid/1.0.0.rc11/lib/Makefile.in.dupes	2006-07-28 16:13:29.000000000 -0400
+++ dmraid/1.0.0.rc11/lib/Makefile.in	2006-07-28 16:14:19.000000000 -0400
@@ -35,7 +35,6 @@
 	format/ataraid/pdc.c \
 	format/ataraid/sil.c \
 	format/ataraid/via.c \
-	format/ataraid/asr.c \
 	format/partition/dos.c
 
 OBJECTS=$(SOURCES:%.c=%.o)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- dmraid.spec	28 Jul 2006 20:10:35 -0000	1.56
+++ dmraid.spec	28 Jul 2006 20:19:06 -0000	1.57
@@ -17,6 +17,7 @@
 Patch0: dmraid-1.0.0.rc11-metadata-stride.patch
 Patch1: dmraid-1.0.0.rc11-format-handler-dos.patch
 Patch2: dmraid-1.0.0.rc11-hpt37x-errorlog.patch
+Patch3: dmraid-1.0.0.rc11-dupes.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -38,6 +39,7 @@
 %patch0 -p2
 %patch1 -p2
 %patch2 -p2
+%patch3 -p2
 
 %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
@@ -59,6 +61,8 @@
 	$RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
 (cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +84,7 @@
 * Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 1.0.0.rc11-FC6.2
 - Fix bounds checking on hpt37x error log
 - Only build the .so, not the .a
+- Fix asc.c duplication in makefile rule
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc11-FC6.1.1
 - rebuild



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:23:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:23:28 -0400
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.25,1.26
Message-ID: <200607282023.k6SKNSB4008873@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8623

Modified Files:
	python-pyblock.spec 
Log Message:
- require dmraid >= 1.0.0.rc11-FC6.2
- require libbdevid-python



Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-pyblock.spec	26 Jul 2006 15:37:15 -0000	1.25
+++ python-pyblock.spec	28 Jul 2006 20:23:26 -0000	1.26
@@ -1,20 +1,21 @@
 %define realname pyblock
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")}
+%define dmrver 1.0.0.rc11-FC6.2
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.17
-Release: 1
+Release: 2
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, gettext, device-mapper >= 1.01.05-3
-BuildRequires: dmraid-devel, libselinux-devel, libsepol-devel
+BuildRequires: dmraid-devel >= %{dmrver}, libselinux-devel, libsepol-devel
 BuildRequires: zlib-devel, libbdevid >= 5.1.0
 Requires: python >= %{pyver}, device-mapper >= 1.01.04, libselinux
-Requires: libbdevid
+Requires: libbdevid, libbdevid-python, dmraid >= %{dmrver}
 
 excludearch: s390 s390x
 
@@ -40,6 +41,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 0.17-2
+- Require dmraid, since we're using the .so now.
+
 * Wed Jul 26 2006 Peter Jones <pjones at redhat.com> - 0.17-1
 - make multipath support more robust
 - fix leaky file descriptor on volumes without partition tables



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:27:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:27:51 -0400
Subject: rpms/xen/devel xen-hvm-osync.patch,NONE,1.1 xen.spec,1.128,1.129
Message-ID: <200607282027.k6SKRpEa010595@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10526

Modified Files:
	xen.spec 
Added Files:
	xen-hvm-osync.patch 
Log Message:
* Fri Jul 28 2006 Rik van Riel <riel at redhat.com> - 3.0.2-21
- make sure disk IO from HVM guests actually hits disk (#198851)


xen-hvm-osync.patch:
 block-bochs.c |    2 +-
 block-cloop.c |    2 +-
 block-cow.c   |    2 +-
 block-qcow.c  |    2 +-
 block-vmdk.c  |    2 +-
 block.c       |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xen-hvm-osync.patch ---
Make sure disk writes really made it to disk before we report I/O
completion to the guest domain.  The DMA_MULTI_THREAD functionality
from the qemu-dm IDE emulation should make the performance overhead
of synchronous writes bearable, or at least comparable to native
hardware.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- xen-unstable-10712/tools/ioemu/block-bochs.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block-bochs.c	2006-07-28 02:21:08.000000000 -0400
@@ -91,7 +91,7 @@
     int fd, i;
     struct bochs_header bochs;
 
-    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE);
+    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE | O_SYNC);
     if (fd < 0) {
         fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd < 0)
--- xen-unstable-10712/tools/ioemu/block.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block.c	2006-07-28 02:19:27.000000000 -0400
@@ -677,7 +677,7 @@
     int rv;
 #endif
 
-    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE);
+    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE | O_SYNC);
     if (fd < 0) {
         fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd < 0)
--- xen-unstable-10712/tools/ioemu/block-cloop.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block-cloop.c	2006-07-28 02:17:13.000000000 -0400
@@ -55,7 +55,7 @@
     BDRVCloopState *s = bs->opaque;
     uint32_t offsets_size,max_compressed_block_size=1,i;
 
-    s->fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
+    s->fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE | O_SYNC);
     if (s->fd < 0)
         return -1;
     bs->read_only = 1;
--- xen-unstable-10712/tools/ioemu/block-cow.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block-cow.c	2006-07-28 02:21:34.000000000 -0400
@@ -69,7 +69,7 @@
     struct cow_header_v2 cow_header;
     int64_t size;
 
-    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE);
+    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE | O_SYNC);
     if (fd < 0) {
         fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd < 0)
--- xen-unstable-10712/tools/ioemu/block-qcow.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block-qcow.c	2006-07-28 02:20:05.000000000 -0400
@@ -95,7 +95,7 @@
     int fd, len, i, shift;
     QCowHeader header;
     
-    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE);
+    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE | O_SYNC);
     if (fd < 0) {
         fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd < 0)
--- xen-unstable-10712/tools/ioemu/block-vmdk.c.osync	2006-07-28 02:15:56.000000000 -0400
+++ xen-unstable-10712/tools/ioemu/block-vmdk.c	2006-07-28 02:20:20.000000000 -0400
@@ -96,7 +96,7 @@
     uint32_t magic;
     int l1_size;
 
-    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE);
+    fd = open(filename, O_RDWR | O_BINARY | O_LARGEFILE | O_SYNC);
     if (fd < 0) {
         fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
         if (fd < 0)


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- xen.spec	28 Jul 2006 18:39:03 -0000	1.128
+++ xen.spec	28 Jul 2006 20:27:49 -0000	1.129
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 20
+Release: 21
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -18,6 +18,7 @@
 Patch11: xen-3.0.1-cloexec.patch
 Patch12: xen-3.0.1-tempdir.patch
 Patch13: xen-noblktap.patch
+Patch14: xen-hvm-osync.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -92,6 +93,7 @@
 #patch11 -p1 -b .cloexec
 %patch12 -p1 -b .tempdir
 %patch13 -p1 -b .blktap
+%patch14 -p1 -b .osync
 
 # config patches
 %patch100 -p1
@@ -218,6 +220,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Jul 28 2006 Rik van Riel <riel at redhat.com> - 3.0.2-21
+- make sure disk IO from HVM guests actually hits disk (#198851)
+
 * Fri Jul 28 2006 Jeremy Katz <katzj at redhat.com> - 3.0.2-20
 - don't start blktapctrl for now
 - fix HVM guest creation in xenguest-install



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:41:10 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.135,1.136
Message-ID: <200607282041.k6SKfAUg013673@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13593

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Jul 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-13.fc5.aiglx
- Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and
  xorg-x11-drv-ati.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- xorg-x11-server.spec	28 Jul 2006 19:26:46 -0000	1.135
+++ xorg-x11-server.spec	28 Jul 2006 20:41:08 -0000	1.136
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   13%{?dist}
+Release:   13.fc5.aiglx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -151,6 +151,10 @@
 
 BuildRequires: libselinux-devel
 
+# Make sure we pull ABI compatible drivers.
+Conflicts: xorg-x11-drv-ati < 6.6.1
+Conflicts: xorg-x11-drv-i810 < 1.6.0
+
 %description
 X.Org X11 X server
 
@@ -672,6 +676,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jul 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-13.fc5.aiglx
+- Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and
+  xorg-x11-drv-ati.
+
 * Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-13.fc6
 - Comment out the 848x480 modes from the extramodes patch.  Any panel that
   wants it should be doing EDID injection by now, and it screws up



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:44:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:44:43 -0400
Subject: rpms/kernel/FC-4 patch-2.6.17.7.bz2.sign, NONE, 1.1 kernel-2.6.spec,
	1.1663, 1.1664 upstream, 1.122,
	1.123 linux-2.6-powernow-k7-smp.patch, 1.1,
	NONE patch-2.6.17.4.bz2.sign, 1.1,
	NONE patch-2.6.17.6.bz2.sign, 1.1, NONE
Message-ID: <200607282044.k6SKihfq015077@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15040

Modified Files:
	kernel-2.6.spec upstream 
Added Files:
	patch-2.6.17.7.bz2.sign 
Removed Files:
	linux-2.6-powernow-k7-smp.patch patch-2.6.17.4.bz2.sign 
	patch-2.6.17.6.bz2.sign 
Log Message:
17.7


--- NEW FILE patch-2.6.17.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExZPlyGugalF9Dw4RAnpEAJ9FQAEaJdFajC/Dg/ObCOB1lZfGOACaAqYS
Jwp3QExOrl/EazZt0O/b8jU=
=zeJg
-----END PGP SIGNATURE-----


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1663
retrieving revision 1.1664
diff -u -r1.1663 -r1.1664
--- kernel-2.6.spec	16 Jul 2006 04:07:13 -0000	1.1663
+++ kernel-2.6.spec	28 Jul 2006 20:44:41 -0000	1.1664
@@ -202,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.6.bz2
+Patch1: patch-2.6.17.7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -316,7 +316,6 @@
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-powernow-k7-smp.patch
 Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
@@ -657,8 +656,6 @@
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# Fix up powernow-k7 to work on SMP kernels.
-%patch1780 -p1
 # Console fixes for suspend/resume
 %patch1790 -p1
 
@@ -1079,6 +1076,9 @@
 %endif
 
 %changelog
+* Fri Jul 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.7
+
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>
 - Support up to 4GB in the 586 kernel again.
 


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- upstream	15 Jul 2006 19:59:00 -0000	1.122
+++ upstream	28 Jul 2006 20:44:41 -0000	1.123
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.6.bz2
+patch-2.6.17.7.bz2


--- linux-2.6-powernow-k7-smp.patch DELETED ---


--- patch-2.6.17.4.bz2.sign DELETED ---


--- patch-2.6.17.6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:44:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:44:44 -0400
Subject: rpms/kernel/FC-4/configs config-generic,1.63,1.64
Message-ID: <200607282044.k6SKiih0015086@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15040/configs

Modified Files:
	config-generic 
Log Message:
17.7


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- config-generic	26 Jun 2006 14:50:44 -0000	1.63
+++ config-generic	28 Jul 2006 20:44:41 -0000	1.64
@@ -1995,6 +1995,7 @@
 CONFIG_SND_AU8830=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:45:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:45:11 -0400
Subject: rpms/kernel/FC-4 .cvsignore,1.197,1.198 sources,1.181,1.182
Message-ID: <200607282045.k6SKjB9G015295@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15270

Modified Files:
	.cvsignore sources 
Log Message:
17.7


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- .cvsignore	15 Jul 2006 19:58:59 -0000	1.197
+++ .cvsignore	28 Jul 2006 20:45:08 -0000	1.198
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.17.6.bz2
+patch-2.6.17.7.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	15 Jul 2006 19:59:00 -0000	1.181
+++ sources	28 Jul 2006 20:45:08 -0000	1.182
@@ -1,2 +1,2 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-d8598f06ed1ce41b4ea51d9eb7ed4277  patch-2.6.17.6.bz2
+f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:45:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:45:49 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1664,1.1665
Message-ID: <200607282045.k6SKjnJu017421@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16933

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.1664
retrieving revision 1.1665
diff -u -r1.1664 -r1.1665
--- kernel-2.6.spec	28 Jul 2006 20:44:41 -0000	1.1664
+++ kernel-2.6.spec	28 Jul 2006 20:45:47 -0000	1.1665
@@ -1076,7 +1076,7 @@
 %endif
 
 %changelog
-* Fri Jul 28 2006 Dave Jones <davej at redhat.com>
+* Fri Jul 28 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2144_FC4]
 - 2.6.17.7
 
 * Sun Jul 16 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:54:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:54:42 -0400
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.136,1.137
Message-ID: <200607282054.k6SKsgFc010222@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10209

Modified Files:
	xorg-x11-server.spec 
Log Message:
Set release back to %{?dist}


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- xorg-x11-server.spec	28 Jul 2006 20:41:08 -0000	1.136
+++ xorg-x11-server.spec	28 Jul 2006 20:54:40 -0000	1.137
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   13.fc5.aiglx
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:58:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:58:51 -0400
Subject: rpms/kudzu/devel .cvsignore, 1.121, 1.122 kudzu.spec, 1.138,
	1.139 sources, 1.135, 1.136
Message-ID: <200607282058.k6SKwpB1010292@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10277

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
updae



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- .cvsignore	25 Jul 2006 18:40:50 -0000	1.121
+++ .cvsignore	28 Jul 2006 20:58:48 -0000	1.122
@@ -1 +1 @@
-kudzu-1.2.40.tar.gz
+kudzu-1.2.41.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- kudzu.spec	25 Jul 2006 18:40:50 -0000	1.138
+++ kudzu.spec	28 Jul 2006 20:58:48 -0000	1.139
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.40
+Version: 1.2.41
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Fri Jul 28 2006 Bill Nottingham <notting at redhat.com> - 1.2.41-1
+- disable DDC probe; let X sort it out (fixes #189602, #189131,
+  #186538, #177456, #176869)
+ 
 * Tue Jul 25 2006 Bill Nottingham <notting at redhat.com> - 1.2.40-1
 - ignore comments in videoaliases (<clumens at redhat.com>)
 - grab mac address for ibmveth devices (#195934, in theory)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	25 Jul 2006 18:40:50 -0000	1.135
+++ sources	28 Jul 2006 20:58:49 -0000	1.136
@@ -1 +1 @@
-184875af472e6f7125de5ceec162803e  kudzu-1.2.40.tar.gz
+26d66dcf1aeece30abbd76b1f9ba02ba  kudzu-1.2.41.tar.gz



From fedora-cvs-commits at redhat.com  Fri Jul 28 20:59:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 16:59:12 -0400
Subject: rpms/rhpxl/devel .cvsignore, 1.27, 1.28 rhpxl.spec, 1.32,
	1.33 sources, 1.30, 1.31 rhpxl-0.24-fp.patch, 1.1, NONE
Message-ID: <200607282059.k6SKxCue010356@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10338

Modified Files:
	.cvsignore rhpxl.spec sources 
Removed Files:
	rhpxl-0.24-fp.patch 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	25 Jul 2006 21:09:11 -0000	1.27
+++ .cvsignore	28 Jul 2006 20:59:08 -0000	1.28
@@ -5,3 +5,4 @@
 rhpxl-0.22.tar.gz
 rhpxl-0.23.tar.gz
 rhpxl-0.24.tar.gz
+rhpxl-0.25.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rhpxl.spec	27 Jul 2006 23:51:47 -0000	1.32
+++ rhpxl.spec	28 Jul 2006 20:59:09 -0000	1.33
@@ -2,10 +2,9 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.24
-Release: 2
+Version: 0.25
+Release: 1
 Source0: %{name}-%{version}.tar.gz
-Patch0: rhpxl-0.24-fp.patch
 License: GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make
@@ -45,6 +43,11 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Fri Jul 28 2006 Chris Lumens <clumens at redhat.com> 0.25-1
+- Convert x startup code into a class, simplifying startup API.
+- Restore call to xStartedCB so mini-wm gets run under anaconda.
+- Simplify looping and waiting in startup code.
+
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 0.24-2
 - Set a fontpath that's more reasonable for anaconda/firstboot/s-c-display
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	25 Jul 2006 21:09:11 -0000	1.30
+++ sources	28 Jul 2006 20:59:09 -0000	1.31
@@ -1 +1 @@
-bede8dbcd6a8f859a2724e3ea757e8a0  rhpxl-0.24.tar.gz
+69339d7f4e226299d6ae2539f9307bcb  rhpxl-0.25.tar.gz


--- rhpxl-0.24-fp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:02:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:02:50 -0400
Subject: rpms/firstboot/devel .cvsignore, 1.59, 1.60 firstboot.spec, 1.80,
	1.81 sources, 1.76, 1.77
Message-ID: <200607282102.k6SL2oVj010518@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10503

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	24 Jul 2006 20:22:26 -0000	1.59
+++ .cvsignore	28 Jul 2006 21:02:48 -0000	1.60
@@ -31,3 +31,4 @@
 firstboot-1.4.14.tar.bz2
 firstboot-1.4.15.tar.bz2
 firstboot-1.4.16.tar.bz2
+firstboot-1.4.17.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- firstboot.spec	24 Jul 2006 20:22:26 -0000	1.80
+++ firstboot.spec	28 Jul 2006 21:02:48 -0000	1.81
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.16
+Version: 1.4.17
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,10 +108,13 @@
 
 
 %changelog
+* Fri Jul 28 2006 Chris Lumens <clumens at redhat.com> 1.4.17-1
+- Pick up new or_IN translation (#200210).
+- Use new rhpxl X startup code.
+
 * Mon Jul 24 2006 Chris Lumens <clumens at redhat.com> 1.4.16-1
 - Fix system-config-soundcard API change.
 - Make sure firstboot starts after HAL (#199899).
-- Fix X startup race condition (Charlotte Richardson).
 
 * Thu Jul 20 2006 Chris Lumens <clumens at redhat.com> 1.4.15-1
 - Really disable the display module.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources	24 Jul 2006 20:22:26 -0000	1.76
+++ sources	28 Jul 2006 21:02:48 -0000	1.77
@@ -1 +1 @@
-55bcfa76fa5b76f892d21008a851d4e2  firstboot-1.4.16.tar.bz2
+d3d2e287740ff4cc114e1f7b43709214  firstboot-1.4.17.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:06:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:06:37 -0400
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.14,1.15
Message-ID: <200607282106.k6SL6bhc010651@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10638

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-2
- vesa-1.2.1-randr-crash.patch: Fix a RANDR crash.



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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-vesa.spec	12 Jul 2006 09:14:40 -0000	1.14
+++ xorg-x11-drv-vesa.spec	28 Jul 2006 21:06:35 -0000	1.15
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.2.1
-Release:   1.1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -16,6 +16,8 @@
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha sparc sparc64
 
+Patch0:	    vesa-1.2.1-randr-crash.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.1.0-1
 
@@ -27,6 +29,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch0 -p1 -b .randr-crash
+
 %build
 %configure --disable-static
 make
@@ -52,7 +56,10 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-2
+- vesa-1.2.1-randr-crash.patch: Fix a RANDR crash.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.2.1-1.1
 - rebuild
 
 * Sat Jun 17 2006 Mike A. Harris <mharris at redhat.com> 1.2.1-1



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:14:07 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.168,1.168.4.1
Message-ID: <200607282114.k6SLE72Y022547@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22506/configs

Modified Files:
      Tag: private-linville-netdev-fc5-7-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.168
retrieving revision 1.168.4.1
diff -u -r1.168 -r1.168.4.1
--- config-generic	26 Jun 2006 14:36:00 -0000	1.168
+++ config-generic	28 Jul 2006 21:14:05 -0000	1.168.4.1
@@ -638,6 +638,7 @@
 CONFIG_DECNET_ROUTE_FWMARK=y
 # CONFIG_DECNET_NF_GRABULATOR is not set
 CONFIG_BRIDGE=m
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -648,6 +649,8 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -663,9 +666,11 @@
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -677,21 +682,21 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_MATCH_RECENT=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=m
 CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -729,22 +734,22 @@
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 
 #
 # IPv6: Netfilter Configuration
 #
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=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_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
@@ -805,8 +810,8 @@
 # CONFIG_ECONET is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_DCCP_UNLOAD_HACK=y
 
@@ -861,6 +866,7 @@
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NETDEVICES=y
 
 #
@@ -923,6 +929,7 @@
 CONFIG_QSEMI_PHY=m
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
 CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -946,6 +953,7 @@
 CONFIG_DM9102=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_ULI526X=m
+# CONFIG_AT1700 is not set
 # CONFIG_HP100 is not set
 CONFIG_LNE390=m
 CONFIG_NE3210=m
@@ -1015,6 +1023,7 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_CHELSIO_T1=m
+CONFIG_MYRI10GE=m
 
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
@@ -1040,6 +1049,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -1068,6 +1078,7 @@
 # CONFIG_IPW2200 is not set
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1077,8 +1088,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1089,7 +1106,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
 
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
@@ -1154,9 +1170,9 @@
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
 CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
 CONFIG_LITELINK_DONGLE=m
 CONFIG_MA600_DONGLE=m
 CONFIG_GIRBIL_DONGLE=m
@@ -1173,6 +1189,7 @@
 CONFIG_ALI_FIR=m
 CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
 
 #
 # Bluetooth support



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:14:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:14:07 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2157,1.2157.2.1
Message-ID: <200607282114.k6SLE7fc022541@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv22506

Modified Files:
      Tag: private-linville-netdev-fc5-7-branch
	kernel-2.6.spec 
Log Message:



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2157 -r 1.2157.2.1 kernel-2.6.spec
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2157
retrieving revision 1.2157.2.1
diff -u -r1.2157 -r1.2157.2.1
--- kernel-2.6.spec	12 Jul 2006 02:34:00 -0000	1.2157
+++ kernel-2.6.spec	28 Jul 2006 21:14:04 -0000	1.2157.2.1
@@ -23,7 +23,7 @@
 %define sublevel 17
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
+%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5.netdev.7
 %define signmodules 0
 %define xen_version 20060708
 %define make_target bzImage
@@ -407,6 +407,540 @@
 
 # Xen hypervisor patches
 
+Patch30000: 0073-smc91x-add-support-for-LogicPD-PXA270-platform.txt
+Patch30001: 0074-Goramo-PCI200SYN-WAN-driver-subsystem-ID-patch.txt
+Patch30002: 0182-e1000-Remove-PM-warning-DPRINTKs-breaking-2.4.x-kernels.txt
+Patch30003: 0183-e1000-Esb2-wol-link-cycle-bug-and-uninitialized-registers.txt
+Patch30004: 0184-e1000-De-inline-functions-to-benefit-from-compiler-smartness.txt
+Patch30005: 0185-e1000-Made-an-adapter-struct-variable-into-a-local-txb2b.txt
+Patch30006: 0187-e1000-Dead-variable-cleanup.txt
+Patch30007: 0188-e1000-Buffer-optimizations-for-small-MTU.txt
+Patch30008: 0189-e1000-implement-more-efficient-tx-queue-locking.txt
+Patch30009: 0190-e1000-Version-bump-contact-fix-year-string-change.txt
+Patch30010: 0201-e1000-fix-mispatch-for-media-type-detect.txt
+Patch30011: 0202-e1000-fix-mismerge-skb_put.txt
+Patch30012: 0207-Add-VLAN-802.1q-support-to-sis900-driver.txt
+Patch30013: 0209-au1000_eth.c-probe-code-straightened-up.txt
+Patch30014: 0210-RE-PATCH-1-1-net-driver-Add-support-for-SMSC-LAN911x-line-of-ethernet-chips.txt
+Patch30015: 0211-netdrvr-smc911x-trim-trailing-whitespace.txt
+Patch30016: 0212-netdrvr-Convert-cassini-to-pci_iomap.txt
+Patch30017: 0230-powerpc-Quiet-VETH-version-printk.txt
+Patch30018: 0239-orinoco-Remove-useless-CIS-validation.txt
+Patch30019: 0240-orinoco-remove-PCMCIA-audio-support-it-s-useless-for-wireless-cards.txt
+Patch30020: 0241-orinoco-remove-underscores-from-little-endian-field-names.txt
+Patch30021: 0242-orinoco-remove-tracing-code-it-s-unused.txt
+Patch30022: 0243-orinoco-remove-debug-buffer-code-and-userspace-include-support.txt
+Patch30023: 0244-orinoco-Symbol-card-supported-by-spectrum_cs-is-LA4137-not-LA4100.txt
+Patch30024: 0245-orinoco-optimize-Tx-exception-handling-in-orinoco.txt
+Patch30025: 0246-orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.txt
+Patch30026: 0247-orinoco-replace-hermes_write_words-with-hermes_write_bytes.txt
+Patch30027: 0248-orinoco-don-t-use-any-padding-for-Tx-frames.txt
+Patch30028: 0249-orinoco-refactor-and-clean-up-Tx-error-handling.txt
+Patch30029: 0250-orinoco-simplify-802.3-encapsulation-code.txt
+Patch30030: 0251-orinoco-fix-BAP0-offset-error-after-several-days-of-operation.txt
+Patch30031: 0252-orinoco-delay-FID-allocation-after-firmware-initialization.txt
+Patch30032: 0253-orinoco_pci-disable-device-and-free-IRQ-when-suspending.txt
+Patch30033: 0254-orinoco_pci-use-pci_iomap-for-resources.txt
+Patch30034: 0255-orinoco-support-PCI-suspend-resume-for-Nortel-PLX-and-TMD-adaptors.txt
+Patch30035: 0256-orinoco-reduce-differences-between-PCI-drivers-create-orinoco_pci.h.txt
+Patch30036: 0257-orinoco-further-comment-cleanup-in-the-PCI-drivers.txt
+Patch30037: 0258-orinoco-bump-version-to-0.15.txt
+Patch30038: 0259-bcm43xx-use-pci_iomap-for-convenience.txt
+Patch30039: 0260-ieee80211-Fix-TKIP-MIC-calculation-for-QoS-frames.txt
+Patch30040: 0261-ieee80211-Fix-TX-code-doesn-t-enable-QoS-when-using-WPA-QoS.txt
+Patch30041: 0262-ieee80211-export-list-of-bit-rates-with-standard-WEXT-procddures.txt
+Patch30042: 0263-ieee80211-remove-unnecessary-CONFIG_WIRELESS_EXT-checking.txt
+Patch30043: 0264-ieee80211-replace-debug-IEEE80211_WARNING-with-each-own-debug-macro.txt
+Patch30044: 0265-ieee80211-update-version-stamp-to-1.1.13.txt
+Patch30045: 0266-ipw2200-Exponential-averaging-for-signal-and-noise-Level.txt
+Patch30046: 0267-ipw2200-Fix-TX-QoS-enabled-frames-problem.txt
+Patch30047: 0268-ipw2200-generates-a-scan-event-after-a-scan-has-completed.txt
+Patch30048: 0269-ipw2200-add-module_param-support-for-antenna-selection.txt
+Patch30049: 0270-ipw2200-fix-compile-warning-when-CONFIG_IPW2200_DEBUG.txt
+Patch30050: 0271-ipw2200-Do-not-continue-loading-the-firmware-if-kmalloc-fails.txt
+Patch30051: 0272-ipw2200-turn-off-signal-debug-log.txt
+Patch30052: 0273-ipw2200-Set-the-fixed-flags-in-wext-get_rate.txt
+Patch30053: 0274-ipw2200-Fix-endian-issues-with-v3.0-fw-image-format.txt
+Patch30054: 0277-ipw2200-version-string-rework.txt
+Patch30055: 0278-ipw2200-update-version-stamp-to-1.1.2.txt
+Patch30056: 0283-ipw2200-Fix-wpa_supplicant-association-problem.txt
+Patch30057: 0284-softmac-add-SIOCSIWMLME.txt
+Patch30058: 0285-softmac-clean-up-event-handling-code.txt
+Patch30059: 0286-wireless-airo-minimal-WPA-awareness.txt
+Patch30060: 0339-s2io-performance-improvements.txt
+Patch30061: 0340-s2io-input-parms-output-messages-update.txt
+Patch30062: 0341-s2io-fixes.txt
+Patch30063: 0342-s2io-additional-stats.txt
+Patch30064: 0343-s2io-init-shutdown-fixes.txt
+Patch30065: 0361-wireless-airo-minimal-WPA-awareness.txt
+Patch30066: 0362-softmac-deauthentication-implies-deassociation.txt
+Patch30067: 0363-ieee80211_wx.c-remove-dead-code.txt
+Patch30068: 0364-orinoco-unregister-network-device-before-releasing-PCMCIA-resources.txt
+Patch30069: 0365-orinoco-report-more-relevant-data-on-startup.txt
+Patch30070: 0366-orinoco-simplify-locking-fix-error-handling-in-PCMCIA-resume.txt
+Patch30071: 0367-orinoco-eliminate-the-suspend-resume-functions-if-CONFIG_PM-is-unset.txt
+Patch30072: 0368-orinoco-don-t-put-PCI-resource-data-to-the-network-device.txt
+Patch30073: 0369-softmac-suggest-per-frame-type-TX-rate.txt
+Patch30074: 0370-bcm43xx-fix-whitespace.txt
+Patch30075: 0371-bcm43xx-add-PCI-ID-for-bcm4319.txt
+Patch30076: 0524-unused-exports-in-wireless-drivers.txt
+Patch30077: 0611-hostap-new-pcmcia-IDs.txt
+Patch30078: 0631-ixgb-fix-rare-early-tso-completion.txt
+Patch30079: 0632-ixgb-remove-duplicate-code-setting-duplex-and-speed.txt
+Patch30080: 0633-ixgb-fix-flow-control.txt
+Patch30081: 0634-ixgb-add-NETIF_F_LLTX-analogous-to-e1000.txt
+Patch30082: 0635-ixgb-add-copper-10gig-driver-id.txt
+Patch30083: 0636-ixgb-remove-hardcoded-number.txt
+Patch30084: 0637-ixgb-use-DPRINTK-and-msglvl-and-ethtool-to-control-it.txt
+Patch30085: 0638-ixgb-add-tx-timeout-counter.txt
+Patch30086: 0639-ixgb-increment-version-to-1.0.104-k2.txt
+Patch30087: 0643-e1000-remove-backslash-r-debug-printfs.txt
+Patch30088: 0645-e1000-Fix-date-string-in-Makefile.txt
+Patch30089: 0646-e1000-remove-changelog-in-driver.txt
+Patch30090: 0647-e1000-bump-version-to-7.0.38-k4.txt
+Patch30091: 0654-pcnet_cs-Add-TRENDnet-TE-CF100-ethernet-adapter-ID.txt
+Patch30092: 0656-drivers-net-s2io.c-make-bus_speed-static.txt
+Patch30093: 0657-ibmveth-change-buffer-pools-dynamically.txt
+Patch30094: 0658-netdrvr-ibmlana-ibmveth-trim-trailing-whitespace.txt
+Patch30095: 0684-phy-new-SMSC-LAN83C185-PHY-driver.txt
+Patch30096: 0703-ixgb-add-performance-enhancements-to-the-buffer_info-struct.txt
+Patch30097: 0704-ixgb-use-rx-copybreak-skb-recycle.txt
+Patch30098: 0705-ixgb-increment-version-to-1.0.104-k4.txt
+Patch30099: 0707-ixgb-fix-smp-polling-race-condition.txt
+Patch30100: 0708-ixgb-fix-interface-losing-macaddr-on-ifdn-up.txt
+Patch30101: 0709-ixgb-revert-an-unwanted-fix-regarding-tso-descriptors.txt
+Patch30102: 0711-ixgb-remove-lock-access-in-the-fast-path.txt
+Patch30103: 0712-ixgb-remove-inlines-allow-compiler-to-choose.txt
+Patch30104: 0713-ixgb-replace-netdev-priv-with-netdev_priv.txt
+Patch30105: 0714-ixgb-remove-changelog.txt
+Patch30106: 0715-ixgb-update-version-dates.txt
+Patch30107: 0723-spidernet-replace-whitespaces-by-tabs.txt
+Patch30108: 0724-forcedeth-add-support-for-flow-control.txt
+Patch30109: 0725-pci_ids-add-new-device-ids.txt
+Patch30110: 0727-r8169-add-new-PCI-ID.txt
+Patch30111: 0745-via-velocity-allow-MTU-size-less-than-1500-bytes.txt
+Patch30112: 0858-ieee80211softmac_io.c-fix-warning-defined-but-not-used.txt
+Patch30113: 0859-softmac-complete-shared-key-authentication.txt
+Patch30114: 0860-softmac-Fix-handling-of-authentication-failure.txt
+Patch30115: 0861-softmac-unified-capabilities-computation.txt
+Patch30116: 0862-bcm43xx-quiet-down-log-spam-from-set_security.txt
+Patch30117: 0875-e100-add-PCI-Error-Recovery.txt
+Patch30118: 0876-e1000-add-PCI-Error-Recovery.txt
+Patch30119: 0883-skge-use-workq-for-PHY-handling.txt
+Patch30120: 0884-skge-TX-low-water-mark-definition.txt
+Patch30121: 0885-skge-transmit-complete-via-IRQ-not-NAPI.txt
+Patch30122: 0886-skge-dont-allow-bad-hardware-address-from-ROM.txt
+Patch30123: 0887-skge-version-1.6.txt
+Patch30124: 0953-SUNRPC-select-privileged-port-numbers-at-random.txt
+Patch30125: 0954-SUNRPC-NFS_ROOT-always-uses-the-same-XIDs.txt
+Patch30126: 0972-RPC-Allow-struc-xdr_stream-to-read-the-page-section-of-an-xdr_buf.txt
+Patch30127: 1001-e1000-prevent-statistics-from-garbling-during-bus-resets.txt
+Patch30128: 1026-forcedeth-config-tso-cleanup.txt
+Patch30129: 1030-forcedeth-config-wol.txt
+Patch30130: 1033-forcedeth-config-move-functions.txt
+Patch30131: 1035-forcedeth-config-module-parameters.txt
+Patch30132: 1036-forcedeth-config-version.txt
+Patch30133: 1039-smc911x-Kconfig-fix.txt
+Patch30134: 1041-Section-mismatch-in-drivers-net-ne.o-during-modpost.txt
+Patch30135: 1042-hp-ethernet-fix-section-mismatches.txt
+Patch30136: 1043-smc-ethernet-fix-section-mismatch-warnings.txt
+Patch30137: 1044-3c5zz-ethernet-fix-section-warnings.txt
+Patch30138: 1047-net-au1000_eth-PHY-framework-conversion.txt
+Patch30139: 1126-wireless-Changes-to-ieee80211.h-for-user-space-regulatory-daemon.txt
+Patch30140: 1129-pci-bcm43xx-avoid-pci_find_device.txt
+Patch30141: 1130-wireless-correct-dump-of-WPA-IE.txt
+Patch30142: 1131-ipw2200-locking-fix.txt
+Patch30143: 1143-NET-Export-ip_dev_find.txt
+Patch30144: 1193-I-OAT-Make-sk_eat_skb-I-OAT-aware.txt
+Patch30145: 1197-LLC-use-more-efficient-ether-address-routines.txt
+Patch30146: 1198-LLC-allow-datagram-recvmsg.txt
+Patch30147: 1199-LLC-use-rcu_dereference-on-receive-handler.txt
+Patch30148: 1200-LLC-allow-applications-to-get-copy-of-kernel-datagrams.txt
+Patch30149: 1201-LLC-add-multicast-support-for-datagrams.txt
+Patch30150: 1202-BRIDGE-optimize-conditional-in-forward-path.txt
+Patch30151: 1203-BRIDGE-fix-module-startup-error-handling.txt
+Patch30152: 1204-BRIDGE-netlink-interface-for-link-management.txt
+Patch30153: 1205-TCP-tcp_rcv_rtt_measure_ts-call-in-pure-ACK-path-is-superfluous.txt
+Patch30154: 1206-IRDA-Initial-support-for-MCS7780-based-dongles.txt
+Patch30155: 1207-IRDA-stir4200-switching-to-the-kthread-API.txt
+Patch30156: 1208-IRDA-ali-ircc-using-device-model-power-management.txt
+Patch30157: 1209-TG3-Add-5786-PCI-ID.txt
+Patch30158: 1210-TG3-Add-recovery-logic-when-MMIOs-are-re-ordered.txt
+Patch30159: 1211-TG3-update-version-and-reldate.txt
+Patch30160: 1212-IPSEC-xfrm-Undo-afinfo-lock-proliferation.txt
+Patch30161: 1216-NETFILTER-x_tables-remove-some-unnecessary-casts.txt
+Patch30162: 1217-NETFILTER-x_tables-add-SCTP-DCCP-support-where-missing.txt
+Patch30163: 1218-NETFILTER-x_tables-add-quota-match.txt
+Patch30164: 1219-NETFILTER-x_tables-add-statistic-match.txt
+Patch30165: 1220-NETFILTER-recent-match-replace-by-rewritten-version.txt
+Patch30166: 1221-NETFILTER-conntrack-don-t-call-helpers-for-related-ICMP-messages.txt
+Patch30167: 1222-NETFILTER-conntrack-add-sysctl-to-disable-checksumming.txt
+Patch30168: 1223-NETFILTER-conntrack-add-fixed-timeout-flag-in-connection-tracking.txt
+Patch30169: 1224-NETFILTER-ctnetlink-fix-NAT-configuration.txt
+Patch30170: 1225-NETFILTER-ctnetlink-change-table-dumping-not-to-require-an-unique-ID.txt
+Patch30171: 1226-NETFILTER-SNMP-helper-fix-debug-module-param-type.txt
+Patch30172: 1227-NETFILTER-FTP-helper-search-optimization.txt
+Patch30173: 1228-NETFILTER-amanda-helper-convert-to-textsearch-infrastructure.txt
+Patch30174: 1229-NETFILTER-H.323-helper-Add-support-for-Call-Forwarding.txt
+Patch30175: 1230-NETFILTER-H.323-helper-replace-internal_net_addr-parameter-by-routing-based-heuristic.txt
+Patch30176: 1231-NETFILTER-Add-SIP-connection-tracking-helper.txt
+Patch30177: 1232-NETFILTER-PPTP-helper-fixup-gre_keymap_lookup-return-type.txt
+Patch30178: 1233-LLC-Fix-double-receive-of-SKB.txt
[...1774 lines suppressed...]
+- [TCP]: Export accept queue len of a TCP listening socket via rx_queue
+- [NET]: Make illegal_highdma more anal
+- [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
+- [AF_UNIX]: Datagram getpeersec
+- [NET]: Add ECN support for TSO
+- [ATM]: basic sysfs support for ATM devices
+- [BNX2]: Use dev_kfree_skb() instead of the _irq version
+- [BNX2]: Turn off link during shutdown
+- [IrDA]: MCS7780 usb_driver struct should be static
+- [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
+- [NET]: make skb_release_data() static
+- [XFRM]: unexport xfrm_state_mtu
+- [IrDA]: Fix RCU lock pairing on error path
+- [IrDA]: Fix the AU1000 FIR dependencies
+- [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
+- [TIPC]: Improve response to requests for node/link information
+- [TIPC]: Initial activation message now includes TIPC version number
+- typo fixes: bandwith -> bandwidth
+- typo fixes: infomation -> information
+- typo fixes: occuring -> occurring
+- Kconfig: Typos in net/sched/Kconfig
+- knfsd: svcrpc: gss: simplify rsc_parse()
+- knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code
+- knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case
+- knfsd: svcrpc: gss: server-side implementation of rpcsec_gss privacy
+- pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
+- com20020_cs: more device support
+- [TG3]: Add tg3_netif_stop() in vlan functions
+- [TG3]: Add rx BD workaround
+- [TG3]: Turn on hw fix for ASF problems
+- [TG3]: Add TSO workaround using GSO
+- [TG3]: Update version and reldate
+- [IPV6]: Remove redundant length check on input
+- [NET]: Generalise TSO-specific bits from skb_setup_caps
+- bcm43xx: netlink deadlock fix
+- forcedeth: typecast cleanup
+- [AF_UNIX]: datagram getpeersec fix
+- [ROSE]: Fix dereference of skb pointer after free.
+- [AX.25]: Reference counting for AX.25 routes.
+- [NETROM]: Use socket helpers instead of direct fiddling with struct sock
+- [ROSE]: Try all routes when establishing a ROSE connections.
+- [TIPC] Fixed sk_buff panic caused by tipc_link_bundle_buf (REVISED)
+- [BRIDGE]: br_dump_ifinfo index fix
+- [Bluetooth] Correct SCO buffer size on request
+- [Bluetooth] Add automatic sniff mode support
+- [Bluetooth] Add platform device for virtual and serial devices
+- [Bluetooth] Small cleanup of the L2CAP source code
+- [Bluetooth] Allow disabling of credit based flow control
+- [Bluetooth] Add RFCOMM role switch support
+- This fixes a panic doing the first READDIR or READDIRPLUS call when:
+- [netdrvr] Remove Becker-template 'io_size' member, when invariant
+- [netdrvr] via-velocity: use netdev_priv() where appropriate
+- [netdrvr] via-velocity: misc. cleanups
+- [netdrvr] via-velocity: remove io_size struct member, it is invariant
+- [netdrvr] Use dev_printk() when ethernet interface isn't available
+- Add two PLX device IDs
+- bcm43xx: use softmac-suggested TX rate
+- ieee80211: fix not allocating IV+ICV space when usingencryption in ieee80211_tx_frame
+- skb used after passing to netif_rx in net/ieee80211/ieee80211_rx.c
+- 2.6.17 missing a call to ieee80211softmac_capabilities from ieee80211softmac_assoc_req
+- SoftMAC: Prevent multiple authentication attempts on the same network
+- SoftMAC: Add network to ieee80211softmac_call_events when associate times out
+- CONFIG_WIRELESS_EXT is neccessary after all
+- softmac: fix build-break from 881ee6999d66c8fc903b429b73bbe6045b38c549
+- ZyDAS ZD1211 USB-WLAN driver
+- zd1211rw: disable TX queue during stop
+- Add support for the Cicada 8201 PHY
+- pcnet32: Fix Section mismatch error
+- pcnet32: Use PCI_DEVICE macro
+- pcnet32: Fix off-by-one in get_ringparam
+- pcnet32: Use kcalloc instead of kmalloc and memset
+- pcnet32: Handle memory allocation failures cleanly when resizing tx/rx rings
+- pcnet32: Suspend the chip rather than restart when changing multicast/promisc
+- pcnet32: Cleanup rx buffers after loopback test.
+- NI5010 netcard cleanup
+- remove dead entry in net wan Kconfig
+- Fix freeing of net device
+- [netdrvr] 3c59x: snip changelog from source code
+- 8139too deadlock fix
+- [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
+- [PKT_SCHED]: Return ENOENT if action module is unavailable
+- [PKT_SCHED]: Fix error handling while dumping actions
+- wireless: add acx driver
+- acxsm: merge from acx 0.3.32
+- tiacx: Let only ACX_PCI/ACX_USB be user-visible
+- tiacx: revert "neither PCI nor USB is selected" change
+- tiacx: implement much more flexible firmware statistics parsing
+- tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack
+- tiacx: fix breakage of "Get rid of circular list of adev's"
+- tiacx: split module into acx-common + acx-pci + acx-usb
+- fix tiacx on alpha
+- tiacx: fix attribute packed warnings
+- tiacx: pci build fix
+- tiacx: support ia64
+- [NET]: Fix network device interface printk message priority
+- [TG3]: add amd8131 to "write reorder" chipsets
+- [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
+- [NET]: Fix IPv4/DECnet routing rule dumping
+- [PKT_SCHED]: act_api: Fix module leak while flushing actions
+- [ATM] net/atm/clip.c: fix PROC_FS=n compile
+- [AX.25]: Use kzalloc
+- bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
+- zd1211rw: usb_clear_halt not allowed in IRQ context
+- bcm43xx: improved statistics
+- zd1211rw: Add Sagem device ID's
+- tiacx - don't use UTS_RELEASE
+- release_firmware() fixes
+- [AX.25]: Get rid of the last volatile.
+- [IPV4] inetpeer: Get rid of volatile from peer_total
+- [TCP]: Remove TCP Compound
+- [DCCP]: Fix sparse warnings.
+- [IPV6]: order addresses by scope
+- [AX.25]: Fix locking of ax25 protocol function list.
+- [NETROM]: Drop lock before calling nr_destroy_socket
+- [TCP] tcp_highspeed: Fix AI updates.
+- [IPV6]: Use ipv6_addr_src_scope for link address sorting.
+- [AX.25]: Optimize AX.25 socket list lock
+- [IPV4]: Fix error handling for fib_insert_node call
+- [WAN]: converting generic HDLC to use netif_dormant\*()
+- smsc-ircc2: fix section reference mismatches
+- ixgb: fix tx unit hang - properly calculate desciptor count
+- Update smc91x driver with ARM Versatile board info
+- [Bluetooth] Remaining transitions to use kzalloc()
+- [Bluetooth] Let BT_HIDP depend on INPUT
+- [Bluetooth] Fix deadlock in the L2CAP layer
+- sky2: fix truncated collision threshold mask
+- skge: fix truncated collision threshold mask
+- sk98lin: fix truncated collision threshold mask
+- sky2: sky2_reset section mismatch
+- sky2: NAPI suspend/resume of dual port cards
+- sky2: PHY power on delays
+- sky2: optimize receive restart
+- [NET]: fix __sk_stream_mem_reclaim
+- [NET]: Update frag_list in pskb_trim
+- [IPV4]: Clear skb cb on IP input
+- e1000: Redo netpoll fix to address community concerns
+- e1000: remove CRC bytes from measured packet length
+- e1000: fix panic on large frame receive when mtu=default
+- e1000: bump version to 7.1.9-k4
+- [PKT_SCHED] HTB: initialize upper bound properly
+- per-task-delay-accounting: utilities for genetlink usage
+- sch_htb compile fix.
+- [NET] ethtool: fix oops by testing correct struct member
+- sky2: NAPI poll fix
+- spidernet: bug fix for init code
+- spidernet: rework tx queue handling
+- sky2: add another PCI ID
+- Cleanup SLHC configuration
+- Convert to kzalloc
+- Remove useless casts
+- Remove useless #ifdef MODULE stuff and printout
+- [WAN]: Added missing netif_dormant_off() to generic HDLC
+- [WAN]: Cosmetic changes to N2 and C101 drivers
+- [PKT_SCHED] netem: Fix slab corruption with netem (2nd try)
+- [SCTP]: Check for NULL arg to sctp_bucket_destroy().
+- [SCTP]: Unhash the endpoint in sctp_endpoint_free().
+- [SCTP]: Verify all the paths to a peer via heartbeat before using them.
+- [SCTP]: Set chunk->data_accepted only if we are going to accept it.
+- [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed
+- [IrDA]: Use alloc_skb() in IrDA TX path
+- [IFB] After ifb_init_one() failed, i is increased. Decrease
+- [DUMMY]: Avoid an oops when dummy_init_one() failed
+- [IPV4]: Fix nexthop realm dumping for multipath routes
+- [TIPC]: Removing useless casts
+- [DCCP]: Fix default sequence window size
+- [PKT_SCHED]: Fix regression in PSCHED_TADD{,2}.
+- [Bluetooth] Correct RFCOMM channel MTU for broken implementations
+- [IPV6] xfrm6_tunnel: Delete debugging code.
+- [VLAN]: Fix link state propagation
+- [NETFILTER]: H.323 helper: fix possible NULL-ptr dereference
+- [NETFILTER]: nf_queue: handle NF_STOP and unknown verdicts in nf_reinject
+- [NETFILTER]: conntrack: fix SYSCTL=n compile
+- [NETFILTER]: SNMP NAT: fix byteorder confusion
+- [NETFILTER]: xt_pkttype: fix mismatches on locally generated packets
+- [NETFILTER]: bridge netfilter: add deferred output hooks to feature-removal-schedule
+- [NETFILTER]: Demote xt_sctp to EXPERIMENTAL
+- [IPV6]: Clean skb cb on IPv6 input.
+- [IPV4]: Clear the whole IPCB, this clears also IPCB(skb)->flags.
+- [TG3]: Add tg3_restart_hw()
+- [TG3]: Handle tg3_init_rings() failures
+- [IPV4] ipmr: ip multicast route bug fix.
+- [IPV4/IPV6]: Setting 0 for unused port field in RAW IP recvmsg().
+- [TCP] tcp_keepalive_timer: Kill spurious assignment to elapsed.
+- [XFRM]: Fix protocol field value for outgoing IPv6 GSO packets
+- airo: should select crypto_aes
+- orinoco: fix setting transmit key only
+- ieee80211: TKIP requires CRC32
+- airo: collapse debugging-messages in issuecommand to one line
+- cleanup // comments from ipw2200
+- zd1211rw: Implement SIOCGIWNICKN
+- prism54: update to WE-19 for WPA support
+- ieee80211: small ERP handling additions
+- softmac: ERP handling and driver-level notifications
+- softmac: export highest_supported_rate function
+- ieee80211: Make ieee80211_rx_any usable
+- bcm43xx: improved statistics
+
 * Tue Jul 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.17.4
 - Disable split pagetable lock



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:23:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:23:26 -0400
Subject: rpms/gail/devel gail-1.9.0-notebook.patch, NONE, 1.1 gail.spec, 1.46,
	1.47
Message-ID: <200607282123.k6SLNQsi007790@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7726

Modified Files:
	gail.spec 
Added Files:
	gail-1.9.0-notebook.patch 
Log Message:
fix removal of notebook tabs


gail-1.9.0-notebook.patch:
 gailnotebook.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gail-1.9.0-notebook.patch ---
--- gail-1.9.0/gail/gailnotebook.c.notebook	2006-07-28 17:21:33.000000000 -0400
+++ gail-1.9.0/gail/gailnotebook.c	2006-07-28 17:21:40.000000000 -0400
@@ -522,7 +522,7 @@
   g_signal_connect (gtk_notebook_get_nth_page (notebook, index), 
                     "parent_set",
                     G_CALLBACK (gail_notebook_child_parent_set),
-                    GINT_TO_POINTER (index));
+                    obj);
 }
 
 static void
@@ -534,7 +534,7 @@
 
   gail_return_if_fail (old_parent != NULL);
   gail_notebook = GAIL_NOTEBOOK (gtk_widget_get_accessible (old_parent));
-  gail_notebook->remove_index = GPOINTER_TO_INT (data);
+  gail_notebook->remove_index = GAIL_NOTEBOOK_PAGE (data)->index;
 }
 
 static gint


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gail.spec	12 Jul 2006 20:29:39 -0000	1.46
+++ gail.spec	28 Jul 2006 21:23:20 -0000	1.47
@@ -5,9 +5,11 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.9.0
-Release: 1
+Release: 2
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=345074
+Patch0: gail-1.9.0-notebook.patch
 License: LGPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .notebook
 
 %build
 %configure --disable-gtk-doc
@@ -78,6 +81,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jul 28 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.0-2
+- Fix removal of notebook tabs
+
 * Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.0-1
 - Update to 1.9.0
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:35:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:35:41 -0400
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.1.1-revert-xkb-change.patch, NONE,
	1.1 xorg-x11-server.spec, 1.137, 1.138
Message-ID: <200607282135.k6SLZfF2011423@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11393

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-revert-xkb-change.patch 
Log Message:
* Fri Jul 28 2006 Kevin E Martin <kem at redhat.com> - 1.1.1-14.fc6
- xorg-x11-server-1.1.1-revert-xkb-change.patch: Revert change to xkb that
  broke XkbGetKeyboard().


xorg-x11-server-1.1.1-revert-xkb-change.patch:
 Makefile.am |    4 
 xkbfmisc.c  |  435 ++++++++++++++++++-
 xkbout.c    | 1051 +++++++++++++++++++++++++++++++++++++++++++++++
 xkbtext.c   | 1325 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xkmread.c   |   94 ----
 5 files changed, 2805 insertions(+), 104 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-revert-xkb-change.patch ---
--- xorg-server-1.1.1/xkb/xkbfmisc.c.revert-kbd-change	2006-07-05 14:31:44.000000000 -0400
+++ xorg-server-1.1.1/xkb/xkbfmisc.c	2006-07-28 13:59:08.000000000 -0400
@@ -50,16 +50,185 @@
 #include <X11/extensions/XKBgeom.h>
 #include "xkb.h"
 
+unsigned
+_XkbKSCheckCase(KeySym ks)
+{
+unsigned	set,rtrn;
+
+    set= (ks & (~0xff)) >> 8;
+    rtrn= 0;
+    switch (set) {
+	case 0:		/* latin 1 */
+	    if (((ks>=XK_A)&&(ks<=XK_Z))||
+		((ks>=XK_Agrave)&&(ks<=XK_THORN)&&(ks!=XK_multiply))) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if (((ks>=XK_a)&&(ks<=XK_z))||
+		((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+	case 1:		/* latin 2 */
+	    if (((ks>=XK_Aogonek)&&(ks<=XK_Zabovedot)&&(ks!=XK_breve))||
+		((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))||
+		((ks>=XK_racute)&&(ks<=XK_tcedilla))) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+	case 2:		/* latin 3 */
+	    if (((ks>=XK_Hstroke)&&(ks<=XK_Jcircumflex))||
+		((ks>=XK_Cabovedot)&&(ks<=XK_Scircumflex))) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if (((ks>=XK_hstroke)&&(ks<=XK_jcircumflex))||
+		((ks>=XK_cabovedot)&&(ks<=XK_scircumflex))) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+	case 3:		/* latin 4 */
+	    if (((ks>=XK_Rcedilla)&&(ks<=XK_Tslash))||
+	        (ks==XK_ENG)||
+		((ks>=XK_Amacron)&&(ks<=XK_Umacron))) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))||
+	        (ks==XK_eng)||
+		((ks>=XK_amacron)&&(ks<=XK_umacron))) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+	case 18:		/* latin 8 */
+	    if ((ks==XK_Babovedot)||
+                ((ks>=XK_Dabovedot)&&(ks<=XK_Wacute))||
+		((ks>=XK_Ygrave)&&(ks<=XK_Fabovedot))||
+	        (ks==XK_Mabovedot)||
+	        (ks==XK_Pabovedot)||
+	        (ks==XK_Sabovedot)||
+	        (ks==XK_Wdiaeresis)||
+		((ks>=XK_Wcircumflex)&&(ks<=XK_Ycircumflex))) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if ((ks==XK_babovedot)||
+	        (ks==XK_dabovedot)||
+	        (ks==XK_fabovedot)||
+	        (ks==XK_mabovedot)||
+                ((ks>=XK_wgrave)&&(ks<=XK_wacute))||
+	        (ks==XK_ygrave)||
+		((ks>=XK_wdiaeresis)&&(ks<=XK_ycircumflex))) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+	case 19:		/* latin 9 */
+	    if ((ks==XK_OE)||(ks==XK_Ydiaeresis)) {
+		rtrn|= _XkbKSUpper;
+	    }
+	    if (ks==XK_oe) {
+		rtrn|= _XkbKSLower;
+	    }
+	    break;
+    }
+    return rtrn;
+}
+
+/***===================================================================***/
+
+Bool
+XkbLookupGroupAndLevel(	XkbDescPtr 	xkb,
+			int 		key,
+			int *		mods_inout,
+			int *		grp_inout,
+			int *		lvl_rtrn)
+{
+int		nG,eG;
+
+    if ((!xkb)||(!XkbKeycodeInRange(xkb,key))||(!grp_inout))
+	return False;
+
+    nG= XkbKeyNumGroups(xkb,key);
+    eG= *grp_inout;
+
+    if ( nG==0 ) {
+	*grp_inout= 0;
+	if (lvl_rtrn!=NULL)
+	    *lvl_rtrn= 0;
+	return False;
+    }
+    else if ( nG==1 ) {
+	eG= 0;
+    }
+    else if ( eG>=nG ) {
+	unsigned gI= XkbKeyGroupInfo(xkb,key);
+	switch (XkbOutOfRangeGroupAction(gI)) {
+	    default:
+		eG %= nG;
+		break;
+	    case XkbClampIntoRange:
+		eG = nG-1;
+		break;
+	    case XkbRedirectIntoRange:
+		eG = XkbOutOfRangeGroupNumber(gI);
+		if (eG>=nG)
+		    eG= 0;
+		break;
+	}
+    }
+    *grp_inout= eG;
+    if (mods_inout!=NULL) {
+	XkbKeyTypePtr	type;
+	int		preserve;
+
+	type = XkbKeyKeyType(xkb,key,eG);
+	if (lvl_rtrn!=NULL)
+	    *lvl_rtrn= 0;
+	preserve= 0;
+	if (type->map) { /* find the shift level */
+	    register int i;
+	    register XkbKTMapEntryPtr entry;
+	    for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
+		if ((entry->active)&&
+			(((*mods_inout)&type->mods.mask)==entry->mods.mask)){
+		    if (lvl_rtrn!=NULL)
+			*lvl_rtrn= entry->level;
+		    if (type->preserve)
+			preserve= type->preserve[i].mask;
+		    break;
+		}
+	    }
+	}
+	(*mods_inout)&= ~(type->mods.mask&(~preserve));
+    }
+    return True;
+}
+
 /***===================================================================***/
 
 static Bool
 XkbWriteSectionFromName(FILE *file,char *sectionName,char *name)
 {
     fprintf(file,"    xkb_%-20s { include \"%s\" };\n",sectionName,name);
-    ErrorF("    xkb_%-20s { include \"%s\" };\n",sectionName,name);
     return True;
 }
 
+#define	NEED_DESC(n) ((!n)||((n)[0]=='+')||((n)[0]=='|')||(strchr((n),'%')))
+#define	COMPLETE(n)  ((n)&&(!NEED_DESC(n)))
+
+/* ARGSUSED */
+static void
+_AddIncl(	FILE *		file,
+		XkbFileInfo *	result,
+		Bool 		topLevel,
+		Bool 		showImplicit,
+		int 		index,
+		void *		priv)
+{
+    if ((priv)&&(strcmp((char *)priv,"%")!=0))
+	fprintf(file,"    include \"%s\"\n",(char *)priv);
+    return;
+}
+
 Bool
 XkbWriteXKBKeymapForNames(	FILE *			file,
 				XkbComponentNamesPtr	names,
@@ -68,29 +237,229 @@ XkbWriteXKBKeymapForNames(	FILE *			file
 				unsigned		want,
 				unsigned		need)
 {
-    if (!names || (!names->keycodes && !names->types && !names->compat &&
-                   !names->symbols && !names->geometry))
-        return False;
-
-    fprintf(file, "xkb_keymap \"%s\" {\n", names->keymap ? names->keymap :
-                                                           "default");
[...2604 lines suppressed...]
+	if ((act->mods_mask&act->mods)||(vmods_mask&vmods)) {
+	    tmp= XkbVModMaskText(dpy,xkb,act->mods_mask&act->mods,
+					 vmods_mask&vmods,XkbXKBFile);
+	    TryCopyStr(buf,",mods= ",sz);
+	    TryCopyStr(buf,tmp,sz);
+	}
+	if ((act->mods_mask&(~act->mods))||(vmods_mask&(~vmods))) {
+	    tmp= XkbVModMaskText(dpy,xkb,act->mods_mask&(~act->mods),
+					 vmods_mask&(~vmods),XkbXKBFile);
+	    TryCopyStr(buf,",clearMods= ",sz);
+	    TryCopyStr(buf,tmp,sz);
+	}
+    }
+    return True;
+}
+
+/*ARGSUSED*/
+static Bool
+CopyDeviceBtnArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+								int *sz)
+{
+XkbDeviceBtnAction *	act;
+char			tbuf[32];
+
+    act= &action->devbtn;
+    sprintf(tbuf,"device= %d",act->device); TryCopyStr(buf,tbuf,sz);
+    TryCopyStr(buf,",button=",sz);
+    sprintf(tbuf,"%d",act->button);
+    TryCopyStr(buf,tbuf,sz);
+    if (act->count>0) {
+	sprintf(tbuf,",count=%d",act->count);
+	TryCopyStr(buf,tbuf,sz);
+    }
+    if (action->type==XkbSA_LockDeviceBtn) {
+	switch (act->flags&(XkbSA_LockNoUnlock|XkbSA_LockNoLock)) {
+	    case XkbSA_LockNoLock:
+		sprintf(tbuf,",affect=unlock"); break;
+	    case XkbSA_LockNoUnlock:
+		sprintf(tbuf,",affect=lock"); break;
+	    case XkbSA_LockNoUnlock|XkbSA_LockNoLock:
+		sprintf(tbuf,",affect=neither"); break;
+	    default:
+		sprintf(tbuf,",affect=both"); break;
+	}
+	TryCopyStr(buf,tbuf,sz);
+    }
+    return True;
+}
+
+/*ARGSUSED*/
+static Bool
+CopyOtherArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
+{
+XkbAnyAction *	act;
+char		tbuf[32];
+
+    act= &action->any;
+    sprintf(tbuf,"type=0x%02x",act->type); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[0]=0x%02x",act->data[0]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[1]=0x%02x",act->data[1]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[2]=0x%02x",act->data[2]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[3]=0x%02x",act->data[3]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[4]=0x%02x",act->data[4]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[5]=0x%02x",act->data[5]); TryCopyStr(buf,tbuf,sz);
+    sprintf(tbuf,",data[6]=0x%02x",act->data[6]); TryCopyStr(buf,tbuf,sz);
+    return True;
+}
+
+typedef	Bool	(*actionCopy)(
+	Display *	/* dpy */,
+	XkbDescPtr 	/* xkb */,
+	XkbAction *	/* action */,
+	char *		/* buf */,
+	int*		/* sz */
+);
+static actionCopy	copyActionArgs[XkbSA_NumActions] = {
+	CopyNoActionArgs		/* NoAction	*/,
+	CopyModActionArgs		/* SetMods	*/,
+	CopyModActionArgs		/* LatchMods	*/,
+	CopyModActionArgs		/* LockMods	*/,
+	CopyGroupActionArgs		/* SetGroup	*/,
+	CopyGroupActionArgs		/* LatchGroup	*/,
+	CopyGroupActionArgs		/* LockGroup	*/,
+	CopyMovePtrArgs			/* MovePtr	*/,
+	CopyPtrBtnArgs			/* PtrBtn	*/,
+	CopyPtrBtnArgs			/* LockPtrBtn	*/,
+	CopySetPtrDfltArgs		/* SetPtrDflt	*/,
+	CopyISOLockArgs			/* ISOLock	*/,
+	CopyNoActionArgs		/* Terminate	*/,
+	CopySwitchScreenArgs		/* SwitchScreen	*/,
+	CopySetLockControlsArgs		/* SetControls	*/,
+	CopySetLockControlsArgs		/* LockControls	*/,
+	CopyActionMessageArgs		/* ActionMessage*/,
+	CopyRedirectKeyArgs		/* RedirectKey	*/,
+	CopyDeviceBtnArgs		/* DeviceBtn	*/,
+	CopyDeviceBtnArgs		/* LockDeviceBtn*/
+};
+
+#define	ACTION_SZ	256
+
+char *
+XkbActionText(Display *dpy,XkbDescPtr xkb,XkbAction *action,unsigned format)
+{
+char	buf[ACTION_SZ],*tmp;
+int	sz;
+
+    if (format==XkbCFile) {
+	sprintf(buf,
+	    "{ %20s, { 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x } }",
+	    XkbActionTypeText(action->type,XkbCFile),
+	    action->any.data[0],action->any.data[1],action->any.data[2],
+	    action->any.data[3],action->any.data[4],action->any.data[5],
+	    action->any.data[6]);
+    }
+    else {
+	sprintf(buf,"%s(",XkbActionTypeText(action->type,XkbXKBFile));
+	sz= ACTION_SZ-strlen(buf)+2; /* room for close paren and NULL */
+	if (action->type<(unsigned)XkbSA_NumActions)
+	     (*copyActionArgs[action->type])(dpy,xkb,action,buf,&sz);
+	else CopyOtherArgs(dpy,xkb,action,buf,&sz);
+	TryCopyStr(buf,")",&sz);
+    }
+    tmp= tbGetBuffer(strlen(buf)+1);
+    if (tmp!=NULL)
+	strcpy(tmp,buf);
+    return tmp;
+}
+
+char *
+XkbBehaviorText(XkbDescPtr xkb,XkbBehavior *behavior,unsigned format)
+{
+char	buf[256],*tmp;
+
+    if (format==XkbCFile) {
+	if (behavior->type==XkbKB_Default)
+	     sprintf(buf,"{   0,    0 }");
+	else sprintf(buf,"{ %3d, 0x%02x }",behavior->type,behavior->data);
+    }
+    else {
+	unsigned 	type,permanent;
+	type= behavior->type&XkbKB_OpMask;
+	permanent=((behavior->type&XkbKB_Permanent)!=0);
+
+	if (type==XkbKB_Lock) {
+	    sprintf(buf,"lock= %s",(permanent?"Permanent":"True"));
+	}
+	else if (type==XkbKB_RadioGroup) {
+	    int 	g;
+	    char	*tmp;
+	    g= ((behavior->data)&(~XkbKB_RGAllowNone))+1;
+	    if (XkbKB_RGAllowNone&behavior->data) {
+		sprintf(buf,"allowNone,");
+		tmp= &buf[strlen(buf)];
+	    }
+	    else tmp= buf;
+	    if (permanent)
+		 sprintf(tmp,"permanentRadioGroup= %d",g);
+	    else sprintf(tmp,"radioGroup= %d",g);
+	}
+	else if ((type==XkbKB_Overlay1)||(type==XkbKB_Overlay2)) {
+	    int ndx,kc;
+	    char *kn;
+
+	    ndx= ((type==XkbKB_Overlay1)?1:2);
+	    kc= behavior->data;
+	    if ((xkb)&&(xkb->names)&&(xkb->names->keys))
+		kn= XkbKeyNameText(xkb->names->keys[kc].name,XkbXKBFile);
+	    else {
+		static char tbuf[8];
+		sprintf(tbuf,"%d",kc);
+		kn= tbuf;
+	    }
+	    if (permanent)
+		 sprintf(buf,"permanentOverlay%d= %s",ndx,kn);
+	    else sprintf(buf,"overlay%d= %s",ndx,kn);
+	}
+    }
+    tmp= tbGetBuffer(strlen(buf)+1);
+    if (tmp!=NULL)
+	strcpy(tmp,buf);
+    return tmp;
+}
+
+/***====================================================================***/
+
+char *
+XkbIndentText(unsigned size)
+{
+static char buf[32];
+register int i;
+
+    if (size>31)
+	size= 31;
+
+    for (i=0;i<size;i++) {
+	buf[i]= ' ';
+    }
+    buf[size]= '\0';
+    return buf;
+}


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- xorg-x11-server.spec	28 Jul 2006 20:54:40 -0000	1.137
+++ xorg-x11-server.spec	28 Jul 2006 21:35:38 -0000	1.138
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -45,6 +45,7 @@
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
 Patch2005:  xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
+Patch2006:  xorg-x11-server-1.1.1-revert-xkb-change.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -338,6 +339,7 @@
 %patch2001 -p1 -b .pci-scan
 %patch2004 -p1 -b .zlib
 %patch2005 -p1 -b .Xdmx
+%patch2006 -p1 -b .revert-xkb-change
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -676,6 +678,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Jul 28 2006 Kevin E Martin <kem at redhat.com> - 1.1.1-14.fc6
+- xorg-x11-server-1.1.1-revert-xkb-change.patch: Revert change to xkb that
+  broke XkbGetKeyboard().
+
 * Fri Jul 28 2006 Kristian H??gsberg <krh at redhat.com> - 1.1.1-13.fc5.aiglx
 - Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and
   xorg-x11-drv-ati.



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:41:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:41:09 -0400
Subject: rpms/kernel/devel linux-2.6-cachefiles.patch, 1.1,
	1.2 linux-2.6-nfs-superblock-unmount-optimization.patch, 1.1,
	1.2 linux-2.6-nfs-superblock-sharing.patch, 1.1,
	1.2 linux-2.6-filesystem-caching-for-afs-and-nfs.patch, 1.1, 1.2
Message-ID: <200607282141.k6SLf9eJ012783@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12689

Modified Files:
	linux-2.6-cachefiles.patch 
	linux-2.6-nfs-superblock-unmount-optimization.patch 
	linux-2.6-nfs-superblock-sharing.patch 
	linux-2.6-filesystem-caching-for-afs-and-nfs.patch 
Log Message:
Refreshing the patch with updates



linux-2.6-cachefiles.patch:
 Documentation/filesystems/caching/cachefiles.txt |  281 ++++
 fs/Kconfig                                       |   20 
 fs/Makefile                                      |    1 
 fs/buffer.c                                      |    2 
 fs/cachefiles/Makefile                           |   18 
 fs/cachefiles/cf-bind.c                          |  279 ++++
 fs/cachefiles/cf-interface.c                     | 1299 +++++++++++++++++++++++
 fs/cachefiles/cf-key.c                           |  157 ++
 fs/cachefiles/cf-main.c                          |  129 ++
 fs/cachefiles/cf-namei.c                         |  825 ++++++++++++++
 fs/cachefiles/cf-proc.c                          |  498 ++++++++
 fs/cachefiles/cf-sysctl.c                        |   69 +
 fs/cachefiles/cf-xattr.c                         |  295 +++++
 fs/cachefiles/internal.h                         |  308 +++++
 fs/fcntl.c                                       |    2 
 fs/file_table.c                                  |    1 
 include/linux/fs.h                               |    2 
 include/linux/pagemap.h                          |    6 
 kernel/auditsc.c                                 |    2 
 mm/filemap.c                                     |   98 +
 20 files changed, 4292 insertions(+)

Index: linux-2.6-cachefiles.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cachefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-cachefiles.patch	20 Jul 2006 00:27:30 -0000	1.1
+++ linux-2.6-cachefiles.patch	28 Jul 2006 21:41:06 -0000	1.2
@@ -1,309 +1,6 @@
-Date: Fri, 14 Jul 2006 16:51:22 +0100
+Date: Thu, 27 Jul 2006 19:53:48 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 21/28] FS-Cache: Avoid ENFILE checking for kernel-specific open files
-
-Make it possible to avoid ENFILE checking for kernel specific open files, such
-as are used by the CacheFiles module.
-
-After, for example, tarring up a kernel source tree over the network, the
-CacheFiles module may easily have 20000+ files open in the backing filesystem,
-thus causing all non-root processes to be given error ENFILE when they try to
-open a file, socket, pipe, etc..
-
-Signed-Off-By: David Howells <dhowells at redhat.com>
----
-
- Documentation/sysctl/fs.txt |    6 +++++
- fs/file_table.c             |   47 +++++++++++++++++++++++++++++++++++--------
- fs/open.c                   |   20 ++++++++++++++++++
- include/linux/file.h        |    1 -
- include/linux/fs.h          |   10 +++++++++
- include/linux/sysctl.h      |    1 +
- kernel/sysctl.c             |   11 ++++++++++
- 7 files changed, 85 insertions(+), 11 deletions(-)
-
-Index: latest/Documentation/sysctl/fs.txt
-===================================================================
---- latest.orig/Documentation/sysctl/fs.txt
-+++ latest/Documentation/sysctl/fs.txt
-@@ -71,7 +71,7 @@ you might want to raise the limit.
- 
- ==============================================================
- 
--file-max & file-nr:
-+file-max, file-nr & file-kernel:
- 
- The kernel allocates file handles dynamically, but as yet it
- doesn't free them again.
-@@ -88,6 +88,10 @@ close to the maximum, but the number of 
- significantly greater than 0, you've encountered a peak in your 
- usage of file handles and you don't need to increase the maximum.
- 
-+The value in file-kernel denotes the number of internal file handles
-+that the kernel has open.  These do not contribute to ENFILE
-+accounting.
-+
- ==============================================================
- 
- inode-max, inode-nr & inode-state:
-Index: latest/fs/file_table.c
-===================================================================
---- latest.orig/fs/file_table.c
-+++ latest/fs/file_table.c
-@@ -29,10 +29,13 @@ struct files_stat_struct files_stat = {
- 	.max_files = NR_FILE
- };
- 
-+struct files_kernel_stat_struct files_kernel_stat;
-+
- /* public. Not pretty! */
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
- 
- static struct percpu_counter nr_files __cacheline_aligned_in_smp;
-+static atomic_t nr_kernel_files;
- 
- static inline void file_free_rcu(struct rcu_head *head)
- {
-@@ -42,7 +45,10 @@ static inline void file_free_rcu(struct 
- 
- static inline void file_free(struct file *f)
- {
--	percpu_counter_dec(&nr_files);
-+	if (f->f_kernel_flags & FKFLAGS_NO_ENFILE)
-+		atomic_dec(&nr_kernel_files);
-+	else
-+		percpu_counter_dec(&nr_files);
- 	call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
- }
- 
-@@ -73,45 +79,63 @@ int proc_nr_files(ctl_table *table, int 
- 	files_stat.nr_files = get_nr_files();
- 	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
- }
-+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
-+		      void __user *buffer, size_t *lenp, loff_t *ppos)
-+{
-+	files_kernel_stat.nr_kernel_files = atomic_read(&nr_kernel_files);
-+	return proc_dointvec(table, write, filp, buffer, lenp, ppos);
-+}
- #else
- int proc_nr_files(ctl_table *table, int write, struct file *filp,
-                      void __user *buffer, size_t *lenp, loff_t *ppos)
- {
- 	return -ENOSYS;
- }
-+int proc_files_kernel(ctl_table *table, int write, struct file *filp,
-+		      void __user *buffer, size_t *lenp, loff_t *ppos)
-+{
-+	return -ENOSYS;
-+}
- #endif
- 
- /* Find an unused file structure and return a pointer to it.
-  * Returns NULL, if there are no more free file structures or
-  * we run out of memory.
-  */
--struct file *get_empty_filp(void)
-+struct file *get_empty_kernel_filp(unsigned short kflags)
- {
- 	struct task_struct *tsk;
- 	static int old_max;
- 	struct file * f;
- 
- 	/*
--	 * Privileged users can go above max_files
-+	 * Privileged users can go above max_files and internal kernel users
-+	 * can avoid it completely
- 	 */
--	if (get_nr_files() >= files_stat.max_files && !capable(CAP_SYS_ADMIN)) {
-+	if (!(kflags & FKFLAGS_NO_ENFILE) &&
-+	    get_nr_files() >= files_stat.max_files &&
-+	    !capable(CAP_SYS_ADMIN)) {
- 		/*
--		 * percpu_counters are inaccurate.  Do an expensive check before
--		 * we go and fail.
-+		 * percpu_counters are inaccurate.  Do an expensive
-+		 * check before we go and fail.
- 		 */
- 		if (percpu_counter_sum(&nr_files) >= files_stat.max_files)
- 			goto over;
- 	}
- 
--	f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);
-+	f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);
- 	if (f == NULL)
- 		goto fail;
- 
--	percpu_counter_inc(&nr_files);
--	memset(f, 0, sizeof(*f));
-+	if (kflags & FKFLAGS_NO_ENFILE)
-+		atomic_inc(&nr_kernel_files);
-+	else
-+		percpu_counter_inc(&nr_files);
-+
- 	if (security_file_alloc(f))
- 		goto fail_sec;
- 
-+	f->f_kernel_flags = kflags;
- 	tsk = current;
- 	INIT_LIST_HEAD(&f->f_u.fu_list);
- 	atomic_set(&f->f_count, 1);
-@@ -137,6 +161,11 @@ fail:
- 	return NULL;
- }
- 
-+struct file *get_empty_filp(void)
-+{
-+	return get_empty_kernel_filp(0);
-+}
-+
- EXPORT_SYMBOL(get_empty_filp);
- 
- void fastcall fput(struct file *file)
-Index: latest/fs/open.c
-===================================================================
---- latest.orig/fs/open.c
-+++ latest/fs/open.c
-@@ -978,6 +978,26 @@ struct file *dentry_open(struct dentry *
- EXPORT_SYMBOL(dentry_open);
- 
- /*
-+ * open a specifically in-kernel file
-+ */
-+struct file *dentry_open_kernel(struct dentry *dentry, struct vfsmount *mnt, int flags)
-+{
-+	int error;
-+	struct file *f;
-+
-+	error = -ENFILE;
-+	f = get_empty_kernel_filp(FKFLAGS_NO_ENFILE);
-+	if (f == NULL) {
-+		dput(dentry);
-+		mntput(mnt);
-+		return ERR_PTR(error);
-+	}
-+
-+	return __dentry_open(dentry, mnt, flags, f, NULL);
-+}
-+EXPORT_SYMBOL_GPL(dentry_open_kernel);
-+
-+/*
-  * Find an empty file descriptor entry, and mark it busy.
-  */
- int get_unused_fd(void)
-Index: latest/include/linux/file.h
-===================================================================
---- latest.orig/include/linux/file.h
-+++ latest/include/linux/file.h
-@@ -79,7 +79,6 @@ extern void FASTCALL(set_close_on_exec(u
- extern void put_filp(struct file *);
- extern int get_unused_fd(void);
- extern void FASTCALL(put_unused_fd(unsigned int fd));
--struct kmem_cache;
- 
- extern struct file ** alloc_fd_array(int);
- extern void free_fd_array(struct file **, int);
-Index: latest/include/linux/fs.h
-===================================================================
---- latest.orig/include/linux/fs.h
-+++ latest/include/linux/fs.h
-@@ -37,7 +37,11 @@ struct files_stat_struct {
- 	int nr_free_files;	/* read only */
- 	int max_files;		/* tunable */
- };
-+struct files_kernel_stat_struct {
-+	int nr_kernel_files;	/* read only */
-+};
- extern struct files_stat_struct files_stat;
-+extern struct files_kernel_stat_struct files_kernel_stat;
- extern int get_max_files(void);
- 
- struct inodes_stat_t {
-@@ -73,6 +77,8 @@ extern int dir_notify_enable;
-    behavior for cross-node execution/opening_for_writing of files */
- #define FMODE_EXEC	16
- 
-+#define FKFLAGS_NO_ENFILE	1	/* kernel internal file (ignored for ENFILE accounting) */
-+
- #define RW_MASK		1
- #define RWA_MASK	2
- #define READ 0
-@@ -680,6 +686,7 @@ struct file {
- 	atomic_t		f_count;
- 	unsigned int 		f_flags;
- 	mode_t			f_mode;
-+	unsigned short		f_kernel_flags;
- 	loff_t			f_pos;
- 	struct fown_struct	f_owner;
- 	unsigned int		f_uid, f_gid;
-@@ -1424,6 +1431,7 @@ extern long do_sys_open(int fdf, const c
- 			int mode);
- extern struct file *filp_open(const char *, int, int);
- extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
-+extern struct file * dentry_open_kernel(struct dentry *, struct vfsmount *, int);
- extern int filp_close(struct file *, fl_owner_t id);
- extern char * getname(const char __user *);
- 
-@@ -1627,6 +1635,7 @@ static inline void insert_inode_hash(str
- }
- 
- extern struct file * get_empty_filp(void);
-+extern struct file * get_empty_kernel_filp(unsigned short fkflags);
- extern void file_move(struct file *f, struct list_head *list);
- extern void file_kill(struct file *f);
- struct bio;
-@@ -1652,6 +1661,7 @@ extern ssize_t generic_file_direct_write
- 		unsigned long *, loff_t, loff_t *, size_t, size_t);
- extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
- 		unsigned long, loff_t, loff_t *, size_t, ssize_t);
-+extern int generic_file_buffered_write_one_kernel_page(struct file *, pgoff_t, struct page *);
- extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
- extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
- ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov,
-Index: latest/include/linux/sysctl.h
-===================================================================
---- latest.orig/include/linux/sysctl.h
-+++ latest/include/linux/sysctl.h
-@@ -847,6 +847,7 @@ enum
- 	FS_AIO_NR=18,	/* current system-wide number of aio requests */
- 	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */
- 	FS_INOTIFY=20,	/* inotify submenu */
-+	FS_FILE_KERNEL=21,	/* int: number of internal kernel files */
- };
- 
- /* /proc/sys/fs/quota/ */
-Index: latest/kernel/sysctl.c
-===================================================================
---- latest.orig/kernel/sysctl.c
-+++ latest/kernel/sysctl.c
-@@ -52,6 +52,9 @@
- extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
-                      void __user *buffer, size_t *lenp, loff_t *ppos);
- 
-+extern int proc_files_kernel(ctl_table *table, int write, struct file *filp,
-+                     void __user *buffer, size_t *lenp, loff_t *ppos);
-+
- #if defined(CONFIG_SYSCTL)
- 
- /* External variables not in a header file. */
-@@ -1050,6 +1053,14 @@ static ctl_table fs_table[] = {
- 		.proc_handler	= &proc_dointvec,
- 	},
- 	{
-+		.ctl_name	= FS_FILE_KERNEL,
-+		.procname	= "file-kernel",
-+		.data		= &files_stat,
-+		.maxlen		= 1*sizeof(int),
-+		.mode		= 0444,
-+		.proc_handler	= &proc_files_kernel,
-+	},
-+	{
- 		.ctl_name	= FS_DENTRY,
- 		.procname	= "dentry-state",
- 		.data		= &dentry_stat,
-Date: Fri, 14 Jul 2006 16:51:31 +0100
-From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 25/28] FS-Cache: CacheFiles: A cache that backs onto a mounted filesystem
+Subject: [RHEL5 PATCH 28/30] FS-Cache: CacheFiles: A cache that backs onto a mounted filesystem
 
 Add a cache backend that permits a mounted filesystem to be used as a backing
 store for the cache.
@@ -590,26 +287,28 @@
  fs/Makefile                                      |    1 
  fs/buffer.c                                      |    2 
  fs/cachefiles/Makefile                           |   18 
- fs/cachefiles/cf-bind.c                          |  283 +++++
- fs/cachefiles/cf-interface.c                     | 1313 ++++++++++++++++++++++
- fs/cachefiles/cf-key.c                           |  160 +++
- fs/cachefiles/cf-main.c                          |  131 ++
- fs/cachefiles/cf-namei.c                         |  837 ++++++++++++++
- fs/cachefiles/cf-proc.c                          |  510 +++++++++
+ fs/cachefiles/cf-bind.c                          |  279 +++++
+ fs/cachefiles/cf-interface.c                     | 1299 ++++++++++++++++++++++
+ fs/cachefiles/cf-key.c                           |  157 +++
+ fs/cachefiles/cf-main.c                          |  129 ++
+ fs/cachefiles/cf-namei.c                         |  825 ++++++++++++++
+ fs/cachefiles/cf-proc.c                          |  498 ++++++++
  fs/cachefiles/cf-sysctl.c                        |   69 +
- fs/cachefiles/cf-xattr.c                         |  299 +++++
+ fs/cachefiles/cf-xattr.c                         |  295 +++++
  fs/cachefiles/internal.h                         |  308 +++++
  fs/fcntl.c                                       |    2 
  fs/file_table.c                                  |    1 
+ include/linux/fs.h                               |    2 
  include/linux/pagemap.h                          |    6 
  kernel/auditsc.c                                 |    2 
- mm/filemap.c                                     |  103 ++
- 19 files changed, 4346 insertions(+), 0 deletions(-)
+ mm/filemap.c                                     |   98 ++
+ 20 files changed, 4292 insertions(+), 0 deletions(-)
 
-Index: latest/Documentation/filesystems/caching/cachefiles.txt
-===================================================================
+diff --git a/Documentation/filesystems/caching/cachefiles.txt b/Documentation/filesystems/caching/cachefiles.txt
+new file mode 100644
+index 0000000..37b6385
 --- /dev/null
-+++ latest/Documentation/filesystems/caching/cachefiles.txt
++++ b/Documentation/filesystems/caching/cachefiles.txt
 @@ -0,0 +1,281 @@
 +	       ===============================================
 +	       CacheFiles: CACHE ON ALREADY MOUNTED FILESYSTEM
@@ -892,11 +591,11 @@
 +
 +Note that CacheFiles will erase from the cache any file it doesn't recognise or
 +any file of an incorrect type (such as a FIFO file or a device file).
-Index: latest/fs/Kconfig
-===================================================================
---- latest.orig/fs/Kconfig
-+++ latest/fs/Kconfig
-@@ -544,6 +544,26 @@ config FSCACHE
+diff --git a/fs/Kconfig b/fs/Kconfig
+index 36d0051..afec7e1 100644
+--- a/fs/Kconfig
++++ b/fs/Kconfig
+@@ -543,6 +543,26 @@ config FSCACHE
  
  	  See Documentation/filesystems/caching/fscache.txt for more information.
  
@@ -923,22 +622,21 @@
  endmenu
  
  menu "CD-ROM/DVD Filesystems"
-Index: latest/fs/Makefile
-===================================================================
---- latest.orig/fs/Makefile
-+++ latest/fs/Makefile
-@@ -103,6 +103,7 @@ obj-$(CONFIG_AFS_FS)		+= afs/
+diff --git a/fs/Makefile b/fs/Makefile
+index 0b0e827..e5efb4b 100644
+--- a/fs/Makefile
++++ b/fs/Makefile
+@@ -101,5 +101,6 @@ obj-$(CONFIG_AFS_FS)		+= afs/
  obj-$(CONFIG_BEFS_FS)		+= befs/
  obj-$(CONFIG_HOSTFS)		+= hostfs/
  obj-$(CONFIG_HPPFS)		+= hppfs/
 +obj-$(CONFIG_CACHEFILES)	+= cachefiles/
  obj-$(CONFIG_DEBUG_FS)		+= debugfs/
  obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_GFS2_FS)           += gfs2/
-Index: latest/fs/buffer.c
-===================================================================
---- latest.orig/fs/buffer.c
-+++ latest/fs/buffer.c
+diff --git a/fs/buffer.c b/fs/buffer.c
+index 3660dcb..31a01da 100644
+--- a/fs/buffer.c
++++ b/fs/buffer.c
 @@ -184,6 +184,8 @@ int fsync_super(struct super_block *sb)
  	return sync_blockdev(sb->s_bdev);
  }
@@ -948,10 +646,11 @@
  /*
   * Write out and wait upon all dirty data associated with this
   * device.   Filesystem data as well as the underlying block
-Index: latest/fs/cachefiles/Makefile
-===================================================================
+diff --git a/fs/cachefiles/Makefile b/fs/cachefiles/Makefile
+new file mode 100644
+index 0000000..c1522d9
 --- /dev/null
-+++ latest/fs/cachefiles/Makefile
++++ b/fs/cachefiles/Makefile
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for caching in a mounted filesystem
@@ -971,11 +670,12 @@
 +endif
 +
 +obj-$(CONFIG_CACHEFILES) := cachefiles.o
-Index: latest/fs/cachefiles/cf-bind.c
-===================================================================
+diff --git a/fs/cachefiles/cf-bind.c b/fs/cachefiles/cf-bind.c
+new file mode 100644
+index 0000000..d8cb4c3
 --- /dev/null
-+++ latest/fs/cachefiles/cf-bind.c
-@@ -0,0 +1,283 @@
++++ b/fs/cachefiles/cf-bind.c
+@@ -0,0 +1,279 @@
 +/* cf-bind.c: bind and unbind a cache from the filesystem backing it
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -1050,8 +750,7 @@
 +
 +	/* add the cache */
 +	return cachefiles_proc_add_cache(cache, NULL);
-+
-+} /* end cachefiles_proc_bind() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1104,8 +803,7 @@
 +
 +		cache->mnt = mntget(mnt);
 +		root = dget(mnt->mnt_root);
-+	}
-+	else {
++	} else {
 +		cache->mnt = nd.mnt;
 +		root = nd.dentry;
 +
@@ -1228,8 +926,7 @@
 +error_root_object:
 +	kerror("Failed to register: %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_proc_add_cache() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1257,13 +954,13 @@
 +	kfree(cache->tag);
 +
 +	_leave("");
-+
-+} /* end cachefiles_proc_unbind() */
-Index: latest/fs/cachefiles/cf-interface.c
-===================================================================
++}
+diff --git a/fs/cachefiles/cf-interface.c b/fs/cachefiles/cf-interface.c
+new file mode 100644
+index 0000000..b5ca30f
 --- /dev/null
-+++ latest/fs/cachefiles/cf-interface.c
-@@ -0,0 +1,1313 @@
++++ b/fs/cachefiles/cf-interface.c
+@@ -0,0 +1,1299 @@
 +/* cf-interface.c: CacheFiles to FS-Cache interface
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -1383,7 +1080,7 @@
 +	_leave(" = -ENOMEM");
 +	return ERR_PTR(-ENOMEM);
 +
-+} /* end cachefiles_lookup_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1404,7 +1101,7 @@
 +	atomic_inc(&object->fscache_usage);
 +	return &object->fscache;
 +
-+} /* end cachefiles_grab_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1424,7 +1121,7 @@
 +
 +	down_write(&object->sem);
 +
-+} /* end cachefiles_lock_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1439,7 +1136,7 @@
 +	object = container_of(_object, struct cachefiles_object, fscache);
 +	up_write(&object->sem);
 +
-+} /* end cachefiles_unlock_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1457,7 +1154,7 @@
 +
 +	//cachefiles_tree_update_object(super, object);
 +
-+} /* end cachefiles_update_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1467,7 +1164,6 @@
 +{
 +	struct cachefiles_object *object;
 +	struct cachefiles_cache *cache;
-+	int ret;
 +
 +	ASSERT(_object);
 +
@@ -1497,17 +1193,8 @@
 +	}
 +
 +	/* close the filesystem stuff attached to the object */
-+	if (object->backer) {
-+		if (object->backer->f_op &&
-+		    object->backer->f_op->flush
-+		    ) {
-+			ret = object->backer->f_op->flush(object->backer,
-+							  NULL);
-+			if (ret < 0)
-+				kerror("Backing file flush returned error %d",
-+				       ret);
-+		}
-+		fput(object->backer);
++	if (object->backer != object->dentry) {
++		dput(object->backer);
 +		object->backer = NULL;
 +	}
 +
@@ -1524,7 +1211,7 @@
 +
 +	_leave("");
 +
-+} /* end cachefiles_put_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1548,7 +1235,7 @@
 +				    " returned error %d",
 +				    ret);
 +
-+} /* end cachefiles_sync_cache() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1570,15 +1257,14 @@
 +	if (!object->backer)
 +		return -ENOBUFS;
 +
-+	ASSERT(S_ISREG(object->backer->f_dentry->d_inode->i_mode));
++	ASSERT(S_ISREG(object->backer->d_inode->i_mode));
 +
 +	newattrs.ia_size = i_size;
-+	newattrs.ia_file = object->backer;
-+	newattrs.ia_valid = ATTR_SIZE | ATTR_FILE;
++	newattrs.ia_valid = ATTR_SIZE;
 +
-+	mutex_lock(&object->backer->f_dentry->d_inode->i_mutex);
-+	ret = notify_change(object->backer->f_dentry, &newattrs);
-+	mutex_unlock(&object->backer->f_dentry->d_inode->i_mutex);
++	mutex_lock(&object->backer->d_inode->i_mutex);
++	ret = notify_change(object->backer, &newattrs);
++	mutex_unlock(&object->backer->d_inode->i_mutex);
 +
 +	if (ret == -EIO) {
 +		cachefiles_io_error_obj(object, "Size set failed");
@@ -1588,7 +1274,7 @@
 +	_leave(" = %d", ret);
 +	return ret;
 +
-+} /* end cachefiles_set_i_size() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1648,7 +1334,7 @@
 +	_leave(" = %d", ret);
 +	return ret;
 +
-+} /* end cachefiles_has_space() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1691,7 +1377,7 @@
 +
 +	return 0;
 +
-+} /* end cachefiles_read_waiter() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1705,7 +1391,7 @@
 +	struct pagevec pagevec;
 +	int error, max;
 +
-+	_enter("{ino=%lu}", object->backer->f_dentry->d_inode->i_ino);
++	_enter("{ino=%lu}", object->backer->d_inode->i_ino);
 +
 +	pagevec_init(&pagevec, 0);
 +
@@ -1767,7 +1453,7 @@
 +
 +	_leave("");
 +
-+} /* end cachefiles_read_copier_work() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1806,7 +1492,7 @@
 +	init_waitqueue_func_entry(&monitor->monitor, cachefiles_read_waiter);
 +
 +	/* attempt to get hold of the backing page */
-+	bmapping = object->backer->f_mapping;
++	bmapping = object->backer->d_inode->i_mapping;
 +	newpage = NULL;
 +
 +	for (;;) {
@@ -1840,7 +1526,7 @@
 +	pagevec_add(lru_pvec, backpage);
 +	__pagevec_lru_add(lru_pvec);
 +
-+	ret = bmapping->a_ops->readpage(object->backer, backpage);
++	ret = bmapping->a_ops->readpage(NULL, backpage);
 +	if (ret < 0)
 +		goto read_error;
 +
@@ -1901,8 +1587,10 @@
 +out:
 +	if (backpage)
 +		page_cache_release(backpage);
-+	fscache_put_context(object->fscache.cookie, monitor->context);
-+	kfree(monitor);
++	if (monitor) {
++		fscache_put_context(object->fscache.cookie, monitor->context);
++		kfree(monitor);
++	}
 +
 +	_leave(" = %d", ret);
 +	return ret;
@@ -1925,7 +1613,7 @@
 +	_leave(" = -ENOMEM");
 +	return -ENOMEM;
 +
-+} /* end cachefiles_read_backing_file_one() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -1965,7 +1653,7 @@
 +	if (!object->backer)
 +		return -ENOBUFS;
 +
-+	inode = object->backer->f_dentry->d_inode;
++	inode = object->backer->d_inode;
 +	ASSERT(S_ISREG(inode->i_mode));
 +	ASSERT(inode->i_mapping->a_ops->bmap);
 +	ASSERT(inode->i_mapping->a_ops->readpages);
@@ -2001,22 +1689,20 @@
 +						       page,
 +						       &pagevec);
 +		ret = 0;
-+	}
-+	else if (cachefiles_has_space(cache, 1) == 0) {
++	} else if (cachefiles_has_space(cache, 1) == 0) {
 +		/* there's space in the cache we can use */
 +		pagevec_add(&pagevec, page);
 +		cookie->def->mark_pages_cached(cookie->netfs_data,
 +					       page->mapping, &pagevec);
 +		ret = -ENODATA;
-+	}
-+	else {
++	} else {
 +		ret = -ENOBUFS;
 +	}
 +
 +	_leave(" = %d", ret);
 +	return ret;
 +
-+} /* end cachefiles_read_or_alloc_page() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2031,7 +1717,7 @@
 +					struct pagevec *lru_pvec)
 +{
 +	struct cachefiles_one_read *monitor = NULL;
-+	struct address_space *bmapping = object->backer->f_mapping;
++	struct address_space *bmapping = object->backer->d_inode->i_mapping;
 +	struct page *newpage = NULL, *netpage, *_n, *backpage = NULL;
 +	int ret = 0;
 +
@@ -2092,7 +1778,7 @@
 +			__pagevec_lru_add(lru_pvec);
 +
 +	reread_backing_page:
-+		ret = bmapping->a_ops->readpage(object->backer, backpage);
++		ret = bmapping->a_ops->readpage(NULL, backpage);
 +		if (ret < 0)
 +			goto read_error;
 +
@@ -2247,7 +1933,7 @@
 +	ret = -EIO;
 +	goto out;
 +
-+} /* end cachefiles_read_backing_file() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2284,7 +1970,7 @@
 +	if (cachefiles_has_space(cache, *nr_pages) < 0)
 +		space = 0;
 +
-+	inode = object->backer->f_dentry->d_inode;
++	inode = object->backer->d_inode;
 +	ASSERT(S_ISREG(inode->i_mode));
 +	ASSERT(inode->i_mapping->a_ops->bmap);
 +	ASSERT(inode->i_mapping->a_ops->readpages);
@@ -2325,8 +2011,7 @@
 +			list_move(&page->lru, &backpages);
 +			(*nr_pages)--;
 +			nrbackpages++;
-+		}
-+		else if (space && pagevec_add(&pagevec, page) == 0) {
++		} else if (space && pagevec_add(&pagevec, page) == 0) {
 +			cookie->def->mark_pages_cached(cookie->netfs_data,
 +						       mapping, &pagevec);
 +			pagevec_reinit(&pagevec);
@@ -2362,7 +2047,7 @@
 +	       ret, *nr_pages, list_empty(pages) ? " empty" : "");
 +	return ret;
 +
-+} /* end cachefiles_read_or_alloc_pages() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2391,7 +2076,7 @@
 +
 +	return cachefiles_has_space(cache, 1);
 +
-+} /* end cachefiles_allocate_page() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2420,14 +2105,13 @@
 +		_debug("- store {%lu}", writer->netfs_page->index);
 +
 +		ret = generic_file_buffered_write_one_kernel_page(
-+			object->backer,
++			object->backer->d_inode->i_mapping,
 +			writer->netfs_page->index,
 +			writer->netfs_page);
 +
 +		if (ret == -ENOSPC) {
 +			ret = -ENOBUFS;
-+		}
-+		else if (ret == -EIO) {
++		} else if (ret == -EIO) {
 +			cachefiles_io_error_obj(object,
 +						"write page to backing file"
 +						" failed");
@@ -2460,7 +2144,7 @@
 +	spin_unlock_irq(&object->work_lock);
 +	_leave("");
 +
-+} /* end cachefiles_write_work() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2487,7 +2171,7 @@
 +	if (!object->backer)
 +		return -ENOBUFS;
 +
-+	ASSERT(S_ISREG(object->backer->f_dentry->d_inode->i_mode));
++	ASSERT(S_ISREG(object->backer->d_inode->i_mode));
 +
 +#if 0 // set to 1 for deferred writing
 +	/* queue the operation for deferred processing by keventd */
@@ -2510,9 +2194,8 @@
 +
 +#else
 +	/* copy the page to ext3 and let it store it in its own time */
-+	ret = generic_file_buffered_write_one_kernel_page(object->backer,
-+							  page->index,
-+							  page);
++	ret = generic_file_buffered_write_one_kernel_page(
++		object->backer->d_inode->i_mapping, page->index, page);
 +
 +	if (ret != 0) {
 +		if (ret == -EIO)
@@ -2528,7 +2211,7 @@
 +	_leave(" = %d", ret);
 +	return ret;
 +
-+} /* end cachefiles_write_page() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2548,7 +2231,7 @@
 +	_enter("%p,{%lu,%lx},,,",
 +	       object, pagevec->nr, pagevec->pages[0]->index);
 +
-+} /* end cachefiles_uncache_pages() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2558,7 +2241,7 @@
 +{
 +	_enter("");
 +
-+} /* end cachefiles_dissociate_pages() */
++}
 +
 +struct fscache_cache_ops cachefiles_cache_ops = {
 +	.name			= "cachefiles",
@@ -2577,11 +2260,12 @@
 +	.uncache_pages		= cachefiles_uncache_pages,
 +	.dissociate_pages	= cachefiles_dissociate_pages,
 +};
-Index: latest/fs/cachefiles/cf-key.c
-===================================================================
+diff --git a/fs/cachefiles/cf-key.c b/fs/cachefiles/cf-key.c
+new file mode 100644
+index 0000000..cfae5a7
 --- /dev/null
-+++ latest/fs/cachefiles/cf-key.c
-@@ -0,0 +1,160 @@
++++ b/fs/cachefiles/cf-key.c
+@@ -0,0 +1,157 @@
 +/* cf-key.c: Key to pathname encoder
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -2647,8 +2331,7 @@
 +				 * is ((514 + 251) / 252) = 3
 +				 */
 +		max += 1;	/* NUL on end */
-+	}
-+	else {
++	} else {
 +		/* calculate the maximum length of the cooked key */
 +		keylen = (keylen + 2) / 3;
 +
@@ -2700,8 +2383,7 @@
 +		case FSCACHE_COOKIE_TYPE_DATAFILE:	type = 'D';	break;
 +		default:				type = 'S';	break;
 +		}
-+	}
-+	else {
++	} else {
 +		seg = 252;
 +		for (loop = keylen; loop > 0; loop--) {
 +			if (seg <= 0) {
@@ -2740,13 +2422,13 @@
 +
 +	_leave(" = %p %d:[%s]", key, len, key);
 +	return key;
-+
-+} /* end cachefiles_cook_key() */
-Index: latest/fs/cachefiles/cf-main.c
-===================================================================
++}
+diff --git a/fs/cachefiles/cf-main.c b/fs/cachefiles/cf-main.c
+new file mode 100644
+index 0000000..da8d020
 --- /dev/null
-+++ latest/fs/cachefiles/cf-main.c
-@@ -0,0 +1,131 @@
++++ b/fs/cachefiles/cf-main.c
+@@ -0,0 +1,129 @@
 +/* cf-main.c: network filesystem caching backend to use cache files on a
 + *            premounted filesystem
 + *
@@ -2862,8 +2544,7 @@
 +error_proc:
 +	kerror("failed to register: %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_init() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2876,13 +2557,13 @@
 +	kmem_cache_destroy(cachefiles_object_jar);
 +	remove_proc_entry("cachefiles", proc_root_fs);
 +	cachefiles_sysctl_cleanup();
-+
-+} /* end cachefiles_exit() */
-Index: latest/fs/cachefiles/cf-namei.c
-===================================================================
++}
+diff --git a/fs/cachefiles/cf-namei.c b/fs/cachefiles/cf-namei.c
+new file mode 100644
+index 0000000..20db88a
 --- /dev/null
-+++ latest/fs/cachefiles/cf-namei.c
-@@ -0,0 +1,837 @@
++++ b/fs/cachefiles/cf-namei.c
+@@ -0,0 +1,825 @@
 +/* cf-namei.c: CacheFiles path walking and related routines
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -2937,8 +2618,7 @@
 +	rb_insert_color(&object->active_node, &cache->active_nodes);
 +
 +	write_unlock(&cache->active_lock);
-+
-+} /* end cachefiles_mark_object_active() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -2972,8 +2652,7 @@
 +		if (ret == 0) {
 +			_debug("d_delete");
 +			d_delete(rep);
-+		}
-+		else if (ret == -EIO) {
++		} else if (ret == -EIO) {
 +			cachefiles_io_error(cache, "Unlink failed");
 +		}
 +
@@ -3109,8 +2788,7 @@
 +		fsnotify_move(dir->d_inode, cache->graveyard->d_inode,
 +			      old_name, rep->d_name.name, 1,
 +			      grave->d_inode, rep->d_inode);
-+	}
-+	else if (ret != -ENOMEM) {
++	} else if (ret != -ENOMEM) {
 +		cachefiles_io_error(cache, "Rename failed with error %d", ret);
 +	}
 +
@@ -3120,8 +2798,7 @@
 +	dput(grave);
 +	_leave(" = 0");
 +	return 0;
-+
-+} /* end cachefiles_bury_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3147,8 +2824,7 @@
 +	dput(dir);
 +	_leave(" = %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_delete_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3162,7 +2838,6 @@
 +{
 +	struct cachefiles_cache *cache;
 +	struct dentry *dir, *next = NULL, *new;
-+	struct file *file;
 +	struct qstr name;
 +	uid_t fsuid;
 +	gid_t fsgid;
@@ -3196,8 +2871,7 @@
 +	if (key) {
 +		name.len = key - (char *) name.name;
 +		*key++ = 0;
-+	}
-+	else {
++	} else {
 +		name.len = strlen(name.name);
 +	}
 +
@@ -3276,16 +2950,15 @@
 +
 +			_debug("mkdir -> %p{%p{ino=%lu}}",
 +			       next, next->d_inode, next->d_inode->i_ino);
-+		}
-+		/* we need to make sure a positive match found a directory */
-+		else if (!S_ISDIR(next->d_inode->i_mode)) {
++
++		} else if (!S_ISDIR(next->d_inode->i_mode)) {
 +			kerror("inode %lu is not a directory",
 +			       next->d_inode->i_ino);
 +			ret = -ENOBUFS;
 +			goto error;
 +		}
-+	}
-+	else {
++
++	} else {
 +		/* non-index objects start out life as files */
 +		if (!next->d_inode) {
 +			DQUOT_INIT(dir->d_inode);
@@ -3300,12 +2973,10 @@
 +
 +			_debug("create -> %p{%p{ino=%lu}}",
 +			       next, next->d_inode, next->d_inode->i_ino);
-+		}
-+		/* we need to make sure a positive match found a directory or a
-+		 * file */
-+		else if (!S_ISDIR(next->d_inode->i_mode) &&
-+			 !S_ISREG(next->d_inode->i_mode)
-+			 ) {
++
++		} else if (!S_ISDIR(next->d_inode->i_mode) &&
++			   !S_ISREG(next->d_inode->i_mode)
++			   ) {
 +			kerror("inode %lu is not a file or directory",
 +			       next->d_inode->i_ino);
 +			ret = -ENOBUFS;
@@ -3362,8 +3033,7 @@
 +		ret = cachefiles_set_object_xattr(object, auxdata);
 +		if (ret < 0)
 +			goto check_error;
-+	}
-+	else {
++	} else {
 +		/* always update the atime on an object we've just looked up
 +		 * (this is used to keep track of culling, and atimes are only
 +		 * updated by read, write and readdir but not lookup or
@@ -3374,14 +3044,17 @@
 +	/* open a file interface onto a data file */
 +	if (object->type != FSCACHE_COOKIE_TYPE_INDEX) {
 +		if (S_ISREG(object->dentry->d_inode->i_mode)) {
-+			file = dentry_open_kernel(dget(object->dentry),
-+						  mntget(cache->mnt), 0);
-+			if (IS_ERR(file))
-+				goto open_error;
++			const struct address_space_operations *aops;
 +
-+			object->backer = file;
-+		}
-+		else {
++			ret = -EPERM;
++			aops = object->dentry->d_inode->i_mapping->a_ops;
++			if (!aops->bmap ||
++			    !aops->prepare_write ||
++			    !aops->commit_write)
++				goto check_error;
++
++			object->backer = object->dentry;
++		} else {
 +			BUG(); // TODO: open file in data-class subdir
 +		}
 +	}
@@ -3398,8 +3071,6 @@
 +		cachefiles_io_error(cache, "create/mkdir failed");
 +	goto error;
 +
-+open_error:
-+	ret = PTR_ERR(file);
 +check_error:
 +	write_lock(&cache->active_lock);
 +	rb_erase(&object->active_node, &cache->active_nodes);
@@ -3435,8 +3106,7 @@
 +
 +	_leave(" = ret");
 +	return ret;
-+
-+} /* end cachefiles_walk_to_object() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3573,8 +3243,7 @@
 +	current->fsgid = fsgid;
 +	_leave(" = %d", ret);
 +	return ERR_PTR(ret);
-+
-+} /* end cachefiles_get_directory() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3629,7 +3298,8 @@
 +			dput(new);
 +	}
 +
-+	_debug("victim -> %p %s", victim, victim->d_inode ? "positive" : "negative");
++	_debug("victim -> %p %s",
++	       victim, victim->d_inode ? "positive" : "negative");
 +
 +	/* if the object is no longer there then we probably retired the object
 +	 * at the netfs's request whilst the cull was in progress
@@ -3718,13 +3388,13 @@
 +
 +	_leave(" = %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_cull() */
-Index: latest/fs/cachefiles/cf-proc.c
-===================================================================
++}
+diff --git a/fs/cachefiles/cf-proc.c b/fs/cachefiles/cf-proc.c
+new file mode 100644
+index 0000000..c14320e
 --- /dev/null
-+++ latest/fs/cachefiles/cf-proc.c
-@@ -0,0 +1,510 @@
++++ b/fs/cachefiles/cf-proc.c
+@@ -0,0 +1,498 @@
 +/* cf-proc.c: /proc/fs/cachefiles interface
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -3832,8 +3502,7 @@
 +	file->private_data = cache;
 +	cache->cachefilesd = file;
 +	return 0;
-+
-+} /* end cachefiles_proc_open() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3862,8 +3531,7 @@
 +
 +	_leave("");
 +	return 0;
-+
-+} /* end cachefiles_proc_release() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3903,8 +3571,7 @@
 +		return -EFAULT;
 +
 +	return n;
-+
-+} /* end cachefiles_proc_read() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -3989,8 +3656,7 @@
 +	if (ret == 0)
 +		ret = datalen;
 +	goto error;
-+
-+} /* end cachefiles_proc_write() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4003,8 +3669,7 @@
 +	       " 0%%<=bstop<bcull<brun<100%%");
 +
 +	return -EINVAL;
-+
-+} /* end cachefiles_proc_range_error() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4029,8 +3694,7 @@
 +
 +	cache->brun_percent = brun;
 +	return 0;
-+
-+} /* end cachefiles_proc_brun() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4055,8 +3719,7 @@
 +
 +	cache->bcull_percent = bcull;
 +	return 0;
-+
-+} /* end cachefiles_proc_bcull() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4081,8 +3744,7 @@
 +
 +	cache->bstop_percent = bstop;
 +	return 0;
-+
-+} /* end cachefiles_proc_bstop() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4111,8 +3773,7 @@
 +
 +	cache->rootdirname = dir;
 +	return 0;
-+
-+} /* end cachefiles_proc_dir() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4139,8 +3800,7 @@
 +
 +	cache->tag = tag;
 +	return 0;
-+
-+} /* end cachefiles_proc_tag() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4207,8 +3867,7 @@
 +inval:
 +	kerror("cull command requires dirfd and filename");
 +	return -EINVAL;
-+
-+} /* end cachefiles_proc_cull() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4233,12 +3892,12 @@
 +inval:
 +	kerror("debug command requires mask");
 +	return -EINVAL;
-+
-+} /* end cachefiles_proc_debug() */
-Index: latest/fs/cachefiles/cf-sysctl.c
-===================================================================
++}
+diff --git a/fs/cachefiles/cf-sysctl.c b/fs/cachefiles/cf-sysctl.c
+new file mode 100644
+index 0000000..4d6fc04
 --- /dev/null
-+++ latest/fs/cachefiles/cf-sysctl.c
++++ b/fs/cachefiles/cf-sysctl.c
 @@ -0,0 +1,69 @@
 +/* cf-sysctl.c: Control parameters
 + *
@@ -4309,11 +3968,12 @@
 +{
 +	unregister_sysctl_table(cachefiles_sysctl);
 +}
-Index: latest/fs/cachefiles/cf-xattr.c
-===================================================================
+diff --git a/fs/cachefiles/cf-xattr.c b/fs/cachefiles/cf-xattr.c
+new file mode 100644
+index 0000000..8952bf0
 --- /dev/null
-+++ latest/fs/cachefiles/cf-xattr.c
-@@ -0,0 +1,299 @@
++++ b/fs/cachefiles/cf-xattr.c
+@@ -0,0 +1,295 @@
 +/* cf-xattr.c: CacheFiles extended attribute management
 + *
 + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
@@ -4422,8 +4082,7 @@
 +	       xtype, type);
 +	ret = -EIO;
 +	goto error;
-+
-+} /* end cachefiles_check_object_type() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4460,8 +4119,7 @@
 +	mutex_unlock(&dentry->d_inode->i_mutex);
 +	_leave(" = %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_set_object_xattr() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4580,8 +4238,7 @@
 +stale:
 +	ret = -ESTALE;
 +	goto error;
-+
-+} /* end cachefiles_check_object_xattr() */
++}
 +
 +/*****************************************************************************/
 +/*
@@ -4611,12 +4268,12 @@
 +
 +	_leave(" = %d", ret);
 +	return ret;
-+
-+} /* end cachefiles_remove_object_xattr() */
-Index: latest/fs/cachefiles/internal.h
-===================================================================
++}
+diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
+new file mode 100644
+index 0000000..edda6e7
 --- /dev/null
-+++ latest/fs/cachefiles/internal.h
++++ b/fs/cachefiles/internal.h
 @@ -0,0 +1,308 @@
 +/* internal.h: general netfs cache on cache files internal defs
 + *
@@ -4670,7 +4327,7 @@
 +struct cachefiles_object {
 +	struct fscache_object		fscache;	/* fscache handle */
 +	struct dentry			*dentry;	/* the file/dir representing this object */
-+	struct file			*backer;	/* backing file */
++	struct dentry			*backer;	/* backing file */
 +	loff_t				i_size;		/* object size */
 +	atomic_t			usage;		/* basic object usage count */
 +	atomic_t			fscache_usage;	/* FSDEF object usage count */
@@ -4926,11 +4583,11 @@
 +} while(0)
 +
 +#endif
-Index: latest/fs/fcntl.c
-===================================================================
---- latest.orig/fs/fcntl.c
-+++ latest/fs/fcntl.c
-@@ -531,6 +531,8 @@ int send_sigurg(struct fown_struct *fown
+diff --git a/fs/fcntl.c b/fs/fcntl.c
+index d35cbc6..b43d821 100644
+--- a/fs/fcntl.c
++++ b/fs/fcntl.c
+@@ -529,6 +529,8 @@ int send_sigurg(struct fown_struct *fown
  	return ret;
  }
  
@@ -4939,11 +4596,11 @@
  static DEFINE_RWLOCK(fasync_lock);
  static kmem_cache_t *fasync_cache __read_mostly;
  
-Index: latest/fs/file_table.c
-===================================================================
---- latest.orig/fs/file_table.c
-+++ latest/fs/file_table.c
-@@ -263,6 +263,7 @@ struct file fastcall *fget_light(unsigne
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 0131ba0..47a3fa8 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -234,6 +234,7 @@ struct file fastcall *fget_light(unsigne
  	return file;
  }
  
@@ -4951,10 +4608,23 @@
  
  void put_filp(struct file *file)
  {
-Index: latest/include/linux/pagemap.h
-===================================================================
---- latest.orig/include/linux/pagemap.h
-+++ latest/include/linux/pagemap.h
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 2561020..3cc9657 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -1651,6 +1651,8 @@ extern ssize_t generic_file_direct_write
+ 		unsigned long *, loff_t, loff_t *, size_t, size_t);
+ extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
+ 		unsigned long, loff_t, loff_t *, size_t, ssize_t);
++extern int generic_file_buffered_write_one_kernel_page(struct address_space *,
++						       pgoff_t, struct page *);
+ extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
+ extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
+ ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov,
+diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
+index 82b2753..acc3481 100644
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
 @@ -181,6 +181,12 @@ static inline void wait_on_page_fs_misc(
  extern void fastcall end_page_fs_misc(struct page *page);
  
@@ -4968,11 +4638,11 @@
   * Fault a userspace page into pagetables.  Return non-zero on a fault.
   *
   * This assumes that two userspace pages are always sufficient.  That's
-Index: latest/kernel/auditsc.c
-===================================================================
---- latest.orig/kernel/auditsc.c
-+++ latest/kernel/auditsc.c
-@@ -1314,6 +1314,8 @@ update_context:
+diff --git a/kernel/auditsc.c b/kernel/auditsc.c
+index ae40ac8..61b484f 100644
+--- a/kernel/auditsc.c
++++ b/kernel/auditsc.c
+@@ -1314,6 +1314,8 @@ #endif
  		context->names[idx].ino   = (unsigned long)-1;
  }
  
@@ -4981,10 +4651,10 @@
  /**
   * auditsc_get_stamp - get local copies of audit_context values
   * @ctx: audit_context for the task
-Index: latest/mm/filemap.c
-===================================================================
---- latest.orig/mm/filemap.c
-+++ latest/mm/filemap.c
+diff --git a/mm/filemap.c b/mm/filemap.c
+index c71d8fd..d04f557 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
 @@ -520,6 +520,18 @@ void fastcall wait_on_page_bit(struct pa
  }
  EXPORT_SYMBOL(wait_on_page_bit);
@@ -5004,7 +4674,7 @@
  /**
   * unlock_page - unlock a locked page
   * @page: the page
-@@ -2256,6 +2268,97 @@ zero_length_segment:
+@@ -2237,6 +2249,92 @@ zero_length_segment:
  }
  EXPORT_SYMBOL(generic_file_buffered_write);
  
@@ -5015,25 +4685,30 @@
 + *   page offset
 + */
 +int
-+generic_file_buffered_write_one_kernel_page(struct file *file,
++generic_file_buffered_write_one_kernel_page(struct address_space *mapping,
 +					    pgoff_t index,
 +					    struct page *src)
 +{
-+	struct address_space *mapping = file->f_mapping;
-+	struct address_space_operations *a_ops = mapping->a_ops;
++	const struct address_space_operations *a_ops = mapping->a_ops;
 +	struct pagevec	lru_pvec;
 +	struct page *page, *cached_page = NULL;
 +	long status = 0;
 +
 +	pagevec_init(&lru_pvec, 0);
 +
++#if 0
++	if (mapping->tree_lock.magic != RWLOCK_MAGIC)
++		printk("RWLOCK magic incorrect: %x != %x\n",
++		       mapping->tree_lock.magic, RWLOCK_MAGIC);
++#endif
++
 +	page = __grab_cache_page(mapping, index, &cached_page, &lru_pvec);
 +	if (!page) {
 +		BUG_ON(cached_page);
 +		return -ENOMEM;
 +	}
 +
-+	status = a_ops->prepare_write(file, page, 0, PAGE_CACHE_SIZE);
++	status = a_ops->prepare_write(NULL, page, 0, PAGE_CACHE_SIZE);
 +	if (unlikely(status)) {
 +		loff_t isize = i_size_read(mapping->host);
 +
@@ -5054,7 +4729,7 @@
 +	copy_highpage(page, src);
 +	flush_dcache_page(page);
 +
-+	status = a_ops->commit_write(file, page, 0, PAGE_CACHE_SIZE);
++	status = a_ops->commit_write(NULL, page, 0, PAGE_CACHE_SIZE);
 +	if (status == AOP_TRUNCATED_PAGE) {
 +		page_cache_release(page);
 +		goto sync;
@@ -5076,23 +4751,13 @@
 +	if (cached_page)
 +		page_cache_release(cached_page);
 +
-+	/*
-+	 * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
-+	 */
-+	if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(mapping->host))) {
-+		if (!a_ops->writepage)
-+			status = generic_osync_inode(
-+				mapping->host, mapping,
-+				OSYNC_METADATA | OSYNC_DATA);
-+  	}
-+
-+	/*
-+	 * If we get here for O_DIRECT writes then we must have fallen through
-+	 * to buffered writes (block instantiation inside i_size).  So we sync
-+	 * the file data here, to try to honour O_DIRECT expectations.
-+	 */
-+	if (unlikely(file->f_flags & O_DIRECT))
-+		status = filemap_write_and_wait(mapping);
++	/* the caller must handle O_SYNC themselves, but we handle S_SYNC and
++	 * MS_SYNCHRONOUS here */
++	if (unlikely(IS_SYNC(mapping->host)) && !a_ops->writepage)
++		status = generic_osync_inode(mapping->host, mapping,
++					     OSYNC_METADATA | OSYNC_DATA);
++
++	/* the caller must handle O_DIRECT for themselves */
 +
 +	pagevec_lru_add(&lru_pvec);
 +	return status;
@@ -5102,3 +4767,4 @@
  static ssize_t
  __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
  				unsigned long nr_segs, loff_t *ppos)
+

linux-2.6-nfs-superblock-unmount-optimization.patch:
 fs/autofs4/autofs_i.h  |    3 -
 fs/autofs4/init.c      |    2 
 fs/autofs4/inode.c     |   22 +-------
 fs/autofs4/waitq.c     |    1 
 fs/dcache.c            |  133 +++++++++++++++++++++++++++++++++++++++++++++++++
 fs/super.c             |   12 ++--
 include/linux/dcache.h |    1 
 7 files changed, 146 insertions(+), 28 deletions(-)

Index: linux-2.6-nfs-superblock-unmount-optimization.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-superblock-unmount-optimization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-nfs-superblock-unmount-optimization.patch	20 Jul 2006 00:27:30 -0000	1.1
+++ linux-2.6-nfs-superblock-unmount-optimization.patch	28 Jul 2006 21:41:06 -0000	1.2
@@ -1,6 +1,153 @@
-Date: Fri, 14 Jul 2006 16:51:35 +0100
+Date: Thu, 27 Jul 2006 19:53:50 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 27/28] VFS: Destroy the dentries contributed by a superblock on unmounting
+Subject: [RHEL5 PATCH 29/30] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super()
+
+Make sure all dentries refs are released before calling kill_anon_super() so
+that the assumption that generic_shutdown_super() can completely destroy the
+dentry tree for there will be no external references holds true.
+
+What was being done in the put_super() superblock op, is now done in the
+kill_sb() filesystem op instead, prior to calling kill_anon_super().
+
+This makes the struct autofs_sb_info::root member variable redundant (since
+sb->s_root is still available), and so that is removed.  The calls to
+shrink_dcache_sb() are also removed since they're also redundant as
+shrink_dcache_for_umount() will now be called after the cleanup routine.
+
+Signed-Off-By: David Howells <dhowells at redhat.com>
+Acked-by: Ian Kent <raven at themaw.net>
+---
+
+ fs/autofs4/autofs_i.h |    3 +--
+ fs/autofs4/init.c     |    2 +-
+ fs/autofs4/inode.c    |   22 ++++------------------
+ fs/autofs4/waitq.c    |    1 -
+ 4 files changed, 6 insertions(+), 22 deletions(-)
+
+diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
+index d6603d0..47e38f3 100644
+--- a/fs/autofs4/autofs_i.h
++++ b/fs/autofs4/autofs_i.h
+@@ -96,7 +96,6 @@ #define AUTOFS_TYPE_OFFSET       0x0004
+ 
+ struct autofs_sb_info {
+ 	u32 magic;
+-	struct dentry *root;
+ 	int pipefd;
+ 	struct file *pipe;
+ 	pid_t oz_pgrp;
+@@ -231,4 +230,4 @@ out:
+ }
+ 
+ void autofs4_dentry_release(struct dentry *);
+-
++extern void autofs4_kill_sb(struct super_block *);
+diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
+index 5d91933..723a1c5 100644
+--- a/fs/autofs4/init.c
++++ b/fs/autofs4/init.c
+@@ -24,7 +24,7 @@ static struct file_system_type autofs_fs
+ 	.owner		= THIS_MODULE,
+ 	.name		= "autofs",
+ 	.get_sb		= autofs_get_sb,
+-	.kill_sb	= kill_anon_super,
++	.kill_sb	= autofs4_kill_sb,
+ };
+ 
+ static int __init init_autofs4_fs(void)
+diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
+index fde78b1..1bf68c5 100644
+--- a/fs/autofs4/inode.c
++++ b/fs/autofs4/inode.c
+@@ -95,7 +95,7 @@ void autofs4_free_ino(struct autofs_info
+  */
+ static void autofs4_force_release(struct autofs_sb_info *sbi)
+ {
+-	struct dentry *this_parent = sbi->root;
++	struct dentry *this_parent = sbi->sb->s_root;
+ 	struct list_head *next;
+ 
+ 	spin_lock(&dcache_lock);
+@@ -126,7 +126,7 @@ resume:
+ 		spin_lock(&dcache_lock);
+ 	}
+ 
+-	if (this_parent != sbi->root) {
++	if (this_parent != sbi->sb->s_root) {
+ 		struct dentry *dentry = this_parent;
+ 
+ 		next = this_parent->d_u.d_child.next;
+@@ -139,15 +139,9 @@ resume:
+ 		goto resume;
+ 	}
+ 	spin_unlock(&dcache_lock);
+-
+-	dput(sbi->root);
+-	sbi->root = NULL;
+-	shrink_dcache_sb(sbi->sb);
+-
+-	return;
+ }
+ 
+-static void autofs4_put_super(struct super_block *sb)
++void autofs4_kill_sb(struct super_block *sb)
+ {
+ 	struct autofs_sb_info *sbi = autofs4_sbi(sb);
+ 
+@@ -162,6 +156,7 @@ static void autofs4_put_super(struct sup
+ 	kfree(sbi);
+ 
+ 	DPRINTK("shutting down");
++	kill_anon_super(sb);
+ }
+ 
+ static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)
+@@ -188,7 +183,6 @@ static int autofs4_show_options(struct s
+ }
+ 
+ static struct super_operations autofs4_sops = {
+-	.put_super	= autofs4_put_super,
+ 	.statfs		= simple_statfs,
+ 	.show_options	= autofs4_show_options,
+ };
+@@ -314,7 +308,6 @@ int autofs4_fill_super(struct super_bloc
+ 
+ 	s->s_fs_info = sbi;
+ 	sbi->magic = AUTOFS_SBI_MAGIC;
+-	sbi->root = NULL;
+ 	sbi->pipefd = -1;
+ 	sbi->catatonic = 0;
+ 	sbi->exp_timeout = 0;
+@@ -396,13 +389,6 @@ int autofs4_fill_super(struct super_bloc
+ 	sbi->pipefd = pipefd;
+ 
+ 	/*
+-	 * Take a reference to the root dentry so we get a chance to
+-	 * clean up the dentry tree on umount.
+-	 * See autofs4_force_release.
+-	 */
+-	sbi->root = dget(root);
+-
+-	/*
+ 	 * Success! Install the root dentry now to indicate completion.
+ 	 */
+ 	s->s_root = root;
+diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
+index ce103e7..c0a6c8d 100644
+--- a/fs/autofs4/waitq.c
++++ b/fs/autofs4/waitq.c
+@@ -45,7 +45,6 @@ void autofs4_catatonic_mode(struct autof
+ 		fput(sbi->pipe);	/* Close the pipe */
+ 		sbi->pipe = NULL;
+ 	}
+-	shrink_dcache_sb(sbi->sb);
+ }
+ 
+ static int autofs4_write(struct file *file, const void *addr, int bytes)
+
+Date: Thu, 27 Jul 2006 19:53:52 +0100
+From: David Howells <dhowells at redhat.com>
+Subject: [RHEL5 PATCH 30/30] VFS: Destroy the dentries contributed by a superblock on unmounting
 
 The attached patch destroys all the dentries attached to a superblock in one go
 by:
@@ -52,11 +199,11 @@
  include/linux/dcache.h |    1 
  3 files changed, 140 insertions(+), 6 deletions(-)
 
-Index: latest/fs/dcache.c
-===================================================================
---- latest.orig/fs/dcache.c
-+++ latest/fs/dcache.c
-@@ -551,6 +551,139 @@ repeat:
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 17b392a..780f014 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -547,6 +547,139 @@ repeat:
  }
  
  /*
@@ -196,10 +343,10 @@
   * Search for at least 1 mount point in the dentry's subdirs.
   * We descend to the next level whenever the d_subdirs
   * list is non-empty and continue searching.
-Index: latest/fs/super.c
-===================================================================
---- latest.orig/fs/super.c
-+++ latest/fs/super.c
+diff --git a/fs/super.c b/fs/super.c
+index 6d4e817..3bf8e5f 100644
+--- a/fs/super.c
++++ b/fs/super.c
 @@ -228,17 +228,17 @@ static int grab_super(struct super_block
   *	that need destruction out of superblock, call generic_shutdown_super()
   *	and release aforementioned objects.  Note: dentries and inodes _are_
@@ -224,161 +371,16 @@
  		fsync_super(sb);
  		lock_super(sb);
  		sb->s_flags &= ~MS_ACTIVE;
-Index: latest/include/linux/dcache.h
-===================================================================
---- latest.orig/include/linux/dcache.h
-+++ latest/include/linux/dcache.h
-@@ -231,6 +231,7 @@ extern struct dentry * d_alloc_anon(stru
+diff --git a/include/linux/dcache.h b/include/linux/dcache.h
+index 44605be..63f64a9 100644
+--- a/include/linux/dcache.h
++++ b/include/linux/dcache.h
+@@ -230,6 +230,7 @@ extern struct dentry * d_alloc_anon(stru
  extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
  extern void shrink_dcache_sb(struct super_block *);
  extern void shrink_dcache_parent(struct dentry *);
 +extern void shrink_dcache_for_umount(struct super_block *);
  extern int d_invalidate(struct dentry *);
- extern void flush_dentry_attributes(void);
  
-Date: Fri, 14 Jul 2006 16:51:37 +0100
-From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 28/28] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super()
-
-Make sure all dentries refs are released before calling kill_anon_super() so
-that the assumption that generic_shutdown_super() can completely destroy the
-dentry tree for there will be no external references holds true.
-
-What was being done in the put_super() superblock op, is now done in the
-kill_sb() filesystem op instead, prior to calling kill_anon_super().
-
-This makes the struct autofs_sb_info::root member variable redundant (since
-sb->s_root is still available), and so that is removed.  The calls to
-shrink_dcache_sb() are also removed since they're also redundant as
-shrink_dcache_for_umount() will now be called after the cleanup routine.
-
-Signed-Off-By: David Howells <dhowells at redhat.com>
-Acked-by: Ian Kent <raven at themaw.net>
----
-
- fs/autofs4/autofs_i.h |    3 +--
- fs/autofs4/init.c     |    2 +-
- fs/autofs4/inode.c    |   22 ++++------------------
- fs/autofs4/waitq.c    |    1 -
- 4 files changed, 6 insertions(+), 22 deletions(-)
+ /* only used at mount-time */
 
-Index: latest/fs/autofs4/autofs_i.h
-===================================================================
---- latest.orig/fs/autofs4/autofs_i.h
-+++ latest/fs/autofs4/autofs_i.h
-@@ -96,7 +96,6 @@ struct autofs_wait_queue {
- 
- struct autofs_sb_info {
- 	u32 magic;
--	struct dentry *root;
- 	int pipefd;
- 	struct file *pipe;
- 	pid_t oz_pgrp;
-@@ -231,4 +230,4 @@ out:
- }
- 
- void autofs4_dentry_release(struct dentry *);
--
-+extern void autofs4_kill_sb(struct super_block *);
-Index: latest/fs/autofs4/init.c
-===================================================================
---- latest.orig/fs/autofs4/init.c
-+++ latest/fs/autofs4/init.c
-@@ -24,7 +24,7 @@ static struct file_system_type autofs_fs
- 	.owner		= THIS_MODULE,
- 	.name		= "autofs",
- 	.get_sb		= autofs_get_sb,
--	.kill_sb	= kill_anon_super,
-+	.kill_sb	= autofs4_kill_sb,
- };
- 
- static int __init init_autofs4_fs(void)
-Index: latest/fs/autofs4/inode.c
-===================================================================
---- latest.orig/fs/autofs4/inode.c
-+++ latest/fs/autofs4/inode.c
-@@ -95,7 +95,7 @@ void autofs4_free_ino(struct autofs_info
-  */
- static void autofs4_force_release(struct autofs_sb_info *sbi)
- {
--	struct dentry *this_parent = sbi->root;
-+	struct dentry *this_parent = sbi->sb->s_root;
- 	struct list_head *next;
- 
- 	spin_lock(&dcache_lock);
-@@ -126,7 +126,7 @@ resume:
- 		spin_lock(&dcache_lock);
- 	}
- 
--	if (this_parent != sbi->root) {
-+	if (this_parent != sbi->sb->s_root) {
- 		struct dentry *dentry = this_parent;
- 
- 		next = this_parent->d_u.d_child.next;
-@@ -139,15 +139,9 @@ resume:
- 		goto resume;
- 	}
- 	spin_unlock(&dcache_lock);
--
--	dput(sbi->root);
--	sbi->root = NULL;
--	shrink_dcache_sb(sbi->sb);
--
--	return;
- }
- 
--static void autofs4_put_super(struct super_block *sb)
-+void autofs4_kill_sb(struct super_block *sb)
- {
- 	struct autofs_sb_info *sbi = autofs4_sbi(sb);
- 
-@@ -162,6 +156,7 @@ static void autofs4_put_super(struct sup
- 	kfree(sbi);
- 
- 	DPRINTK("shutting down");
-+	kill_anon_super(sb);
- }
- 
- static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)
-@@ -188,7 +183,6 @@ static int autofs4_show_options(struct s
- }
- 
- static struct super_operations autofs4_sops = {
--	.put_super	= autofs4_put_super,
- 	.statfs		= simple_statfs,
- 	.show_options	= autofs4_show_options,
- };
-@@ -314,7 +308,6 @@ int autofs4_fill_super(struct super_bloc
- 
- 	s->s_fs_info = sbi;
- 	sbi->magic = AUTOFS_SBI_MAGIC;
--	sbi->root = NULL;
- 	sbi->pipefd = -1;
- 	sbi->catatonic = 0;
- 	sbi->exp_timeout = 0;
-@@ -396,13 +389,6 @@ int autofs4_fill_super(struct super_bloc
- 	sbi->pipefd = pipefd;
- 
- 	/*
--	 * Take a reference to the root dentry so we get a chance to
--	 * clean up the dentry tree on umount.
--	 * See autofs4_force_release.
--	 */
--	sbi->root = dget(root);
--
--	/*
- 	 * Success! Install the root dentry now to indicate completion.
- 	 */
- 	s->s_root = root;
-Index: latest/fs/autofs4/waitq.c
-===================================================================
---- latest.orig/fs/autofs4/waitq.c
-+++ latest/fs/autofs4/waitq.c
-@@ -45,7 +45,6 @@ void autofs4_catatonic_mode(struct autof
- 		fput(sbi->pipe);	/* Close the pipe */
- 		sbi->pipe = NULL;
- 	}
--	shrink_dcache_sb(sbi->sb);
- }
- 
- static int autofs4_write(struct file *file, const void *addr, int bytes)

linux-2.6-nfs-superblock-sharing.patch:
 b/fs/Kconfig                 |    7 
 b/fs/dcache.c                |  164 +++-
 b/fs/nfs/Makefile            |    6 
 b/fs/nfs/callback.c          |   15 
 b/fs/nfs/callback.h          |    7 
 b/fs/nfs/callback_proc.c     |    4 
 b/fs/nfs/client.c            |  312 ++++++++
 b/fs/nfs/delegation.c        |   24 
 b/fs/nfs/delegation.h        |   10 
 b/fs/nfs/dir.c               |    2 
 b/fs/nfs/file.c              |    2 
 b/fs/nfs/fscache.c           |  346 +++++++++
 b/fs/nfs/fscache.h           |  466 ++++++++++++
 b/fs/nfs/getroot.c           |  306 ++++++++
 b/fs/nfs/idmap.c             |   14 
 b/fs/nfs/inode.c             |    4 
 b/fs/nfs/internal.h          |   12 
 b/fs/nfs/namespace.c         |    3 
 b/fs/nfs/nfs3proc.c          |    2 
 b/fs/nfs/nfs4_fs.h           |   30 
 b/fs/nfs/nfs4namespace.c     |    8 
 b/fs/nfs/nfs4proc.c          |   32 
 b/fs/nfs/nfs4renewd.c        |    8 
 b/fs/nfs/nfs4state.c         |   50 -
 b/fs/nfs/nfs4xdr.c           |   14 
 b/fs/nfs/pagelist.c          |    3 
 b/fs/nfs/proc.c              |    2 
 b/fs/nfs/read.c              |    2 
 b/fs/nfs/super.c             |   40 -
 b/fs/nfs/sysctl.c            |   43 +
 b/fs/nfs/write.c             |    2 
 b/include/linux/dcache.h     |    1 
 b/include/linux/nfs4_mount.h |    1 
 b/include/linux/nfs_fs.h     |    1 
 b/include/linux/nfs_fs_sb.h  |    2 
 b/include/linux/nfs_idmap.h  |   14 
 b/include/linux/nfs_mount.h  |    1 
 b/include/linux/nfs_xdr.h    |    1 
 fs/nfs/Makefile              |    3 
 fs/nfs/callback.c            |   16 
 fs/nfs/callback_proc.c       |    9 
 fs/nfs/client.c              | 1152 ++++++++++++++++++++++++++++++
 fs/nfs/delegation.c          |   21 
 fs/nfs/dir.c                 |   16 
 fs/nfs/file.c                |   33 
 fs/nfs/getroot.c             |    5 
 fs/nfs/idmap.c               |   27 
 fs/nfs/inode.c               |   31 
 fs/nfs/internal.h            |  134 ++-
 fs/nfs/namespace.c           |   31 
 fs/nfs/nfs3proc.c            |    8 
 fs/nfs/nfs4_fs.h             |   58 -
 fs/nfs/nfs4namespace.c       |  110 ++
 fs/nfs/nfs4proc.c            |  149 +--
 fs/nfs/nfs4renewd.c          |   15 
 fs/nfs/nfs4state.c           |  156 ----
 fs/nfs/nfs4xdr.c             |   28 
 fs/nfs/proc.c                |    4 
 fs/nfs/read.c                |   30 
 fs/nfs/super.c               | 1630 +++++++++++++++----------------------------
 fs/nfs/write.c               |   11 
 include/linux/nfs_fs.h       |    7 
 include/linux/nfs_fs_sb.h    |   99 ++
 include/linux/nfs_idmap.h    |    2 
 include/linux/nfs_xdr.h      |    9 
 65 files changed, 4086 insertions(+), 1669 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-nfs-superblock-sharing.patch
Index: linux-2.6-nfs-superblock-sharing.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-superblock-sharing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-nfs-superblock-sharing.patch	20 Jul 2006 00:27:30 -0000	1.1
+++ linux-2.6-nfs-superblock-sharing.patch	28 Jul 2006 21:41:06 -0000	1.2
@@ -1,6 +1,6 @@
-Date: Fri, 14 Jul 2006 16:50:38 +0100
+Date: Thu, 27 Jul 2006 19:52:48 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 01/28] NFS: Add dentry materialisation op
+Subject: [RHEL5 PATCH 01/30] NFS: Add dentry materialisation op
 
 The attached patch adds a new directory cache management function that prepares
 a disconnected anonymous function to be connected into the dentry tree. The
@@ -40,11 +40,11 @@
  include/linux/dcache.h |    1 
  2 files changed, 151 insertions(+), 14 deletions(-)
 
-Index: latest/fs/dcache.c
-===================================================================
---- latest.orig/fs/dcache.c
-+++ latest/fs/dcache.c
-@@ -833,17 +833,19 @@ void d_instantiate(struct dentry *entry,
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 1b4a3a3..17b392a 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -828,17 +828,19 @@ void d_instantiate(struct dentry *entry,
   * (or otherwise set) by the caller to indicate that it is now
   * in use by the dcache.
   */
@@ -69,7 +69,7 @@
  	list_for_each_entry(alias, &inode->i_dentry, d_alias) {
  		struct qstr *qstr = &alias->d_name;
  
-@@ -856,19 +858,35 @@ struct dentry *d_instantiate_unique(stru
+@@ -851,19 +853,35 @@ struct dentry *d_instantiate_unique(stru
  		if (memcmp(qstr->name, name, len))
  			continue;
  		dget_locked(alias);
@@ -111,7 +111,7 @@
  EXPORT_SYMBOL(d_instantiate_unique);
  
  /**
-@@ -1240,6 +1258,11 @@ static void __d_rehash(struct dentry * e
+@@ -1235,6 +1253,11 @@ static void __d_rehash(struct dentry * e
   	hlist_add_head_rcu(&entry->d_hash, list);
  }
  
@@ -123,7 +123,7 @@
  /**
   * d_rehash	- add an entry back to the hash
   * @entry: dentry to add to the hash
-@@ -1249,11 +1272,9 @@ static void __d_rehash(struct dentry * e
+@@ -1244,11 +1267,9 @@ static void __d_rehash(struct dentry * e
   
  void d_rehash(struct dentry * entry)
  {
@@ -136,7 +136,7 @@
  	spin_unlock(&entry->d_lock);
  	spin_unlock(&dcache_lock);
  }
-@@ -1401,6 +1422,120 @@ already_unhashed:
+@@ -1386,6 +1407,120 @@ already_unhashed:
  	spin_unlock(&dcache_lock);
  }
  
@@ -257,7 +257,7 @@
  /**
   * d_path - return the path of a dentry
   * @dentry: dentry to report
-@@ -1818,6 +1953,7 @@ EXPORT_SYMBOL(d_instantiate);
+@@ -1784,6 +1919,7 @@ EXPORT_SYMBOL(d_instantiate);
  EXPORT_SYMBOL(d_invalidate);
  EXPORT_SYMBOL(d_lookup);
  EXPORT_SYMBOL(d_move);
@@ -265,11 +265,11 @@
  EXPORT_SYMBOL(d_path);
  EXPORT_SYMBOL(d_prune_aliases);
  EXPORT_SYMBOL(d_rehash);
-Index: latest/include/linux/dcache.h
-===================================================================
---- latest.orig/include/linux/dcache.h
-+++ latest/include/linux/dcache.h
-@@ -222,6 +222,7 @@ static inline int dname_external(struct 
+diff --git a/include/linux/dcache.h b/include/linux/dcache.h
+index 471781f..44605be 100644
+--- a/include/linux/dcache.h
++++ b/include/linux/dcache.h
+@@ -221,6 +221,7 @@ static inline int dname_external(struct 
   */
  extern void d_instantiate(struct dentry *, struct inode *);
  extern struct dentry * d_instantiate_unique(struct dentry *, struct inode *);
@@ -277,9 +277,10 @@
  extern void d_delete(struct dentry *);
  
  /* allocate/de-allocate */
-Date: Fri, 14 Jul 2006 16:50:40 +0100
+
+Date: Thu, 27 Jul 2006 19:52:50 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 02/28] NFS: Fix up split of fs/nfs/inode.c
+Subject: [RHEL5 PATCH 02/30] NFS: Fix up split of fs/nfs/inode.c
 
 Fix ups for the splitting of the superblock stuff out of fs/nfs/inode.c,
 including:
@@ -312,10 +313,10 @@
  fs/nfs/super.c    |   40 ++++------------------------------------
  4 files changed, 39 insertions(+), 42 deletions(-)
 
-Index: latest/fs/nfs/callback.c
-===================================================================
---- latest.orig/fs/nfs/callback.c
-+++ latest/fs/nfs/callback.c
+diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
+index fe0a6b8..d6c4bae 100644
+--- a/fs/nfs/callback.c
++++ b/fs/nfs/callback.c
 @@ -36,6 +36,21 @@ static struct svc_program nfs4_callback_
  
  unsigned int nfs_callback_set_tcpport;
@@ -338,11 +339,11 @@
  
  /*
   * This is the callback kernel thread.
-Index: latest/fs/nfs/idmap.c
-===================================================================
---- latest.orig/fs/nfs/idmap.c
-+++ latest/fs/nfs/idmap.c
-@@ -57,6 +57,20 @@
+diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
+index b81e7ed..447ae91 100644
+--- a/fs/nfs/idmap.c
++++ b/fs/nfs/idmap.c
+@@ -57,6 +57,20 @@ #define IDMAP_HASH_SZ          128
  /* Default cache timeout is 10 minutes */
  unsigned int nfs_idmap_cache_timeout = 600 * HZ;
  
@@ -363,10 +364,10 @@
  struct idmap_hashent {
  	unsigned long ih_expires;
  	__u32 ih_id;
-Index: latest/fs/nfs/internal.h
-===================================================================
---- latest.orig/fs/nfs/internal.h
-+++ latest/fs/nfs/internal.h
+diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
+index e4f4e5d..94a7870 100644
+--- a/fs/nfs/internal.h
++++ b/fs/nfs/internal.h
 @@ -15,7 +15,7 @@ struct nfs_clone_mount {
  	rpc_authflavor_t authflavor;
  };
@@ -376,7 +377,7 @@
  #ifdef CONFIG_NFS_V4
  extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry);
  #else
-@@ -46,6 +46,7 @@ extern void nfs_destroy_directcache(void
+@@ -46,6 +46,7 @@ #define nfs_destroy_directcache() do {} 
  #endif
  
  /* nfs2xdr.c */
@@ -413,10 +414,10 @@
  
  /*
   * Determine the device name as a string
-Index: latest/fs/nfs/super.c
-===================================================================
---- latest.orig/fs/nfs/super.c
-+++ latest/fs/nfs/super.c
+diff --git a/fs/nfs/super.c b/fs/nfs/super.c
+index e8a9bee..1c20ff0 100644
+--- a/fs/nfs/super.c
++++ b/fs/nfs/super.c
 @@ -187,40 +187,6 @@ static struct super_operations nfs4_sops
  };
  #endif
@@ -480,9 +481,10 @@
  	if (IS_ERR(s)) {
  		error = PTR_ERR(s);
  		goto out_free;
-Date: Fri, 14 Jul 2006 16:50:42 +0100
+
+Date: Thu, 27 Jul 2006 19:52:53 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 03/28] NFS: Disambiguate nfs_stat_to_errno()
+Subject: [RHEL5 PATCH 03/30] NFS: Disambiguate nfs_stat_to_errno()
 
 Rename the NFS4 version of nfs_stat_to_errno() so that it doesn't conflict with
 the common one used by NFS2 and NFS3.
@@ -493,11 +495,11 @@
  fs/nfs/nfs4xdr.c |   14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)
 
-Index: latest/fs/nfs/nfs4xdr.c
-===================================================================
---- latest.orig/fs/nfs/nfs4xdr.c
[...4045 lines suppressed...]
+index 7b266b7..f54315e 100644
+--- a/fs/nfs/super.c
++++ b/fs/nfs/super.c
+@@ -286,6 +286,7 @@ static void nfs_show_mount_options(struc
+ 		{ NFS_MOUNT_NOAC, ",noac", "" },
+ 		{ NFS_MOUNT_NONLM, ",nolock", "" },
+ 		{ NFS_MOUNT_NOACL, ",noacl", "" },
++		{ NFS_MOUNT_FSCACHE, ",fsc", "" },
+ 		{ 0, NULL, NULL }
+ 	};
+ 	const struct proc_nfs_info *nfs_infop;
+diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
+index 2fe3403..7a25a6d 100644
+--- a/fs/nfs/sysctl.c
++++ b/fs/nfs/sysctl.c
+@@ -14,6 +14,7 @@ #include <linux/nfs_idmap.h>
+ #include <linux/nfs_fs.h>
+ 
+ #include "callback.h"
++#include "internal.h"
+ 
+ static const int nfs_set_port_min = 0;
+ static const int nfs_set_port_max = 65535;
+@@ -55,6 +56,48 @@ #endif
+ 		.proc_handler	= &proc_dointvec_jiffies,
+ 		.strategy	= &sysctl_jiffies,
+ 	},
++#ifdef CONFIG_NFS_FSCACHE
++	{
++		.ctl_name = CTL_UNNUMBERED,
++		.procname = "fscache_from_error",
++		.data = &nfs_fscache_from_error,
++		.maxlen = sizeof(int),
++		.mode = 0644,
++		.proc_handler = &proc_dointvec,
++	},
++	{
++		.ctl_name = CTL_UNNUMBERED,
++		.procname = "fscache_to_error",
++		.data = &nfs_fscache_to_error,
++		.maxlen = sizeof(int),
++		.mode = 0644,
++		.proc_handler = &proc_dointvec,
++	},
++	{
++		.ctl_name = CTL_UNNUMBERED,
++		.procname = "fscache_uncache_page",
++		.data = &nfs_fscache_uncache_page,
++		.maxlen = sizeof(int),
++		.mode = 0644,
++		.proc_handler = &proc_dointvec,
++	},
++	{
++		.ctl_name = CTL_UNNUMBERED,
++		.procname = "fscache_to_pages",
++		.data = &nfs_fscache_to_pages,
++		.maxlen = sizeof(int),
++		.mode = 0644,
++		.proc_handler = &proc_dointvec_minmax,
++	},
++	{
++		.ctl_name = CTL_UNNUMBERED,
++		.procname = "fscache_from_pages",
++		.data = &nfs_fscache_from_pages,
++		.maxlen = sizeof(int),
++		.mode = 0644,
++		.proc_handler = &proc_dointvec,
++	},
++#endif
+ 	{ .ctl_name = 0 }
+ };
+ 
+diff --git a/fs/nfs/write.c b/fs/nfs/write.c
+index a3f3f04..cd8d972 100644
+--- a/fs/nfs/write.c
++++ b/fs/nfs/write.c
+@@ -63,6 +63,7 @@ #include <linux/smp_lock.h>
+ 
+ #include "delegation.h"
+ #include "iostat.h"
++#include "internal.h"
+ 
+ #define NFSDBG_FACILITY		NFSDBG_PAGECACHE
+ 
+@@ -163,6 +164,9 @@ static void nfs_grow_file(struct page *p
+ 		return;
+ 	nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);
+ 	i_size_write(inode, end);
++#ifdef FSCACHE_WRITE_SUPPORT
++	nfs_set_fscsize(NFS_SERVER(inode), NFS_I(inode), end);
++#endif
+ }
+ 
+ /* We can set the PG_uptodate flag if we see that a write request
+@@ -342,6 +346,9 @@ do_it:
+ 		err = -EBADF;
+ 		goto out;
+ 	}
++
++	nfs_writepage_to_fscache(inode, page);
++
+ 	lock_kernel();
+ 	if (!IS_SYNC(inode) && inode_referenced) {
+ 		err = nfs_writepage_async(ctx, inode, page, 0, offset);
+@@ -424,7 +431,7 @@ static int nfs_inode_add_request(struct 
+ 		if (nfs_have_delegation(inode, FMODE_WRITE))
+ 			nfsi->change_attr++;
+ 	}
+-	SetPagePrivate(req->wb_page);
++	SetPageNfsWriting(req->wb_page);
+ 	nfsi->npages++;
+ 	atomic_inc(&req->wb_count);
+ 	return 0;
+@@ -441,7 +448,7 @@ static void nfs_inode_remove_request(str
+ 	BUG_ON (!NFS_WBACK_BUSY(req));
+ 
+ 	spin_lock(&nfsi->req_lock);
+-	ClearPagePrivate(req->wb_page);
++	ClearPageNfsWriting(req->wb_page);
+ 	radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index);
+ 	nfsi->npages--;
+ 	if (!nfsi->npages) {
+diff --git a/include/linux/nfs4_mount.h b/include/linux/nfs4_mount.h
+index 26b4c83..15199cc 100644
+--- a/include/linux/nfs4_mount.h
++++ b/include/linux/nfs4_mount.h
+@@ -65,6 +65,7 @@ #define NFS4_MOUNT_INTR		0x0002	/* 1 */
+ #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
+ #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
+ #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
++#define NFS4_MOUNT_FSCACHE	0x4000	/* 1 */
+ #define NFS4_MOUNT_FLAGMASK	0xFFFF
+ 
+ #endif
+diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
+index b7b4371..71cf935 100644
+--- a/include/linux/nfs_fs.h
++++ b/include/linux/nfs_fs.h
+@@ -29,6 +29,7 @@ #include <linux/nfs_fs_sb.h>
+ 
+ #include <linux/rwsem.h>
+ #include <linux/mempool.h>
++#include <linux/fscache.h>
+ 
+ /*
+  * Enable debugging support for nfs client.
+@@ -180,6 +181,9 @@ #ifdef CONFIG_NFS_V4
+ 	int			 delegation_state;
+ 	struct rw_semaphore	rwsem;
+ #endif /* CONFIG_NFS_V4*/
++#ifdef CONFIG_NFS_FSCACHE
++	struct fscache_cookie	*fscache;
++#endif
+ 	struct inode		vfs_inode;
+ };
+ 
+@@ -582,6 +586,7 @@ #define NFSDBG_FILE		0x0040
+ #define NFSDBG_ROOT		0x0080
+ #define NFSDBG_CALLBACK		0x0100
+ #define NFSDBG_CLIENT		0x0200
++#define NFSDBG_FSCACHE		0x0400
+ #define NFSDBG_ALL		0xFFFF
+ 
+ #ifdef __KERNEL__
+diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
+index 6d0be0e..54221e0 100644
+--- a/include/linux/nfs_fs_sb.h
++++ b/include/linux/nfs_fs_sb.h
+@@ -3,6 +3,7 @@ #define _NFS_FS_SB
+ 
+ #include <linux/list.h>
+ #include <linux/backing-dev.h>
++#include <linux/fscache.h>
+ 
+ struct nfs_iostats;
+ 
+@@ -66,6 +67,10 @@ #ifdef CONFIG_NFS_V4
+ 	char			cl_ipaddr[16];
+ 	unsigned char		cl_id_uniquifier;
+ #endif
++
++#ifdef CONFIG_NFS_FSCACHE
++	struct fscache_cookie	*fscache;	/* client index cache cookie */
++#endif
+ };
+ 
+ /*
+diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
+index 659c754..278bb4e 100644
+--- a/include/linux/nfs_mount.h
++++ b/include/linux/nfs_mount.h
+@@ -61,6 +61,7 @@ #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 
+ #define NFS_MOUNT_NOACL		0x0800	/* 4 */
+ #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
+ #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
++#define NFS_MOUNT_FSCACHE	0x4000
+ #define NFS_MOUNT_FLAGMASK	0xFFFF
+ 
+ #endif
+

linux-2.6-filesystem-caching-for-afs-and-nfs.patch:
 b/Documentation/filesystems/caching/backend-api.txt |  357 ++++++
 b/Documentation/filesystems/caching/fscache.txt     |  151 ++
 b/Documentation/filesystems/caching/netfs-api.txt   |  752 ++++++++++++++
 b/fs/Kconfig                                        |   15 
 b/fs/Makefile                                       |    1 
 b/fs/afs/cell.c                                     |  109 +-
 b/fs/afs/cell.h                                     |   16 
 b/fs/afs/cmservice.c                                |    2 
 b/fs/afs/dir.c                                      |    5 
 b/fs/afs/file.c                                     |  246 +++-
 b/fs/afs/fsclient.c                                 |    4 
 b/fs/afs/inode.c                                    |   45 
 b/fs/afs/internal.h                                 |   25 
 b/fs/afs/main.c                                     |   24 
 b/fs/afs/mntpt.c                                    |   12 
 b/fs/afs/proc.c                                     |    1 
 b/fs/afs/server.c                                   |    3 
 b/fs/afs/vlocation.c                                |  179 ++-
 b/fs/afs/vnode.c                                    |  248 +++-
 b/fs/afs/vnode.h                                    |   10 
 b/fs/afs/volume.c                                   |   78 -
 b/fs/afs/volume.h                                   |   28 
 b/fs/ext2/dir.c                                     |    6 
 b/fs/ext3/inode.c                                   |   10 
 b/fs/freevxfs/vxfs_subr.c                           |    2 
 b/fs/fscache/Makefile                               |   11 
 b/fs/fscache/cookie.c                               | 1045 ++++++++++++++++++++
 b/fs/fscache/fscache-int.h                          |   93 +
 b/fs/fscache/fsdef.c                                |  110 ++
 b/fs/fscache/main.c                                 |  105 ++
 b/fs/fscache/page.c                                 |  537 ++++++++++
 b/fs/reiserfs/inode.c                               |   10 
 b/fs/ufs/dir.c                                      |    6 
 b/include/linux/fscache-cache.h                     |  243 ++++
 b/include/linux/fscache.h                           |  496 +++++++++
 b/include/linux/page-flags.h                        |   15 
 b/include/linux/pagemap.h                           |   11 
 b/mm/filemap.c                                      |   17 
 b/mm/migrate.c                                      |    4 
 b/mm/page_alloc.c                                   |    2 
 b/mm/readahead.c                                    |   25 
 fs/Kconfig                                          |    7 
 fs/afs/cache.h                                      |   27 
 fs/afs/dir.c                                        |   10 
 44 files changed, 4660 insertions(+), 443 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-filesystem-caching-for-afs-and-nfs.patch
Index: linux-2.6-filesystem-caching-for-afs-and-nfs.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-filesystem-caching-for-afs-and-nfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-filesystem-caching-for-afs-and-nfs.patch	20 Jul 2006 00:27:30 -0000	1.1
+++ linux-2.6-filesystem-caching-for-afs-and-nfs.patch	28 Jul 2006 21:41:06 -0000	1.2
@@ -1,6 +1,6 @@
-Date: Fri, 14 Jul 2006 16:51:20 +0100
+Date: Thu, 27 Jul 2006 19:53:35 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 20/28] FS-Cache: Provide a filesystem-specific sync'able page bit
+Subject: [RHEL5 PATCH 22/30] FS-Cache: Provide a filesystem-specific sync'able page bit
 
 The attached patch provides a filesystem-specific page bit that a filesystem
 can synchronise upon.  This can be used, for example, by a netfs to synchronise
@@ -28,11 +28,11 @@
  mm/page_alloc.c            |    2 +-
  11 files changed, 59 insertions(+), 29 deletions(-)
 
-Index: latest/fs/afs/dir.c
-===================================================================
---- latest.orig/fs/afs/dir.c
-+++ latest/fs/afs/dir.c
-@@ -155,11 +155,9 @@ static inline void afs_dir_check_page(st
+diff --git a/fs/afs/dir.c b/fs/afs/dir.c
+index 2fc9987..3b78e70 100644
+--- a/fs/afs/dir.c
++++ b/fs/afs/dir.c
+@@ -155,11 +155,9 @@ #endif
  		}
  	}
  
@@ -54,10 +54,10 @@
  		if (PageError(page))
  			goto fail;
  	}
-Index: latest/fs/ext2/dir.c
-===================================================================
---- latest.orig/fs/ext2/dir.c
-+++ latest/fs/ext2/dir.c
+diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
+index 92ea826..b0e7d9f 100644
+--- a/fs/ext2/dir.c
++++ b/fs/ext2/dir.c
 @@ -112,7 +112,7 @@ static void ext2_check_page(struct page 
  	if (offs != limit)
  		goto Eend;
@@ -85,10 +85,10 @@
  			ext2_check_page(page);
  		if (PageError(page))
  			goto fail;
-Index: latest/fs/ext3/inode.c
-===================================================================
---- latest.orig/fs/ext3/inode.c
-+++ latest/fs/ext3/inode.c
+diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
+index f804d5e..8073fc9 100644
+--- a/fs/ext3/inode.c
++++ b/fs/ext3/inode.c
 @@ -1527,12 +1527,12 @@ static int ext3_journalled_writepage(str
  		goto no_write;
  	}
@@ -131,10 +131,10 @@
  	return __set_page_dirty_nobuffers(page);
  }
  
-Index: latest/fs/freevxfs/vxfs_subr.c
-===================================================================
---- latest.orig/fs/freevxfs/vxfs_subr.c
-+++ latest/fs/freevxfs/vxfs_subr.c
+diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c
+index decac62..805bbb2 100644
+--- a/fs/freevxfs/vxfs_subr.c
++++ b/fs/freevxfs/vxfs_subr.c
 @@ -78,7 +78,7 @@ vxfs_get_page(struct address_space *mapp
  		kmap(pp);
  		if (!PageUptodate(pp))
@@ -144,11 +144,11 @@
  			/** vxfs_check_page(pp); **/
  		if (PageError(pp))
  			goto fail;
-Index: latest/fs/reiserfs/inode.c
-===================================================================
---- latest.orig/fs/reiserfs/inode.c
-+++ latest/fs/reiserfs/inode.c
-@@ -2347,7 +2347,7 @@ static int reiserfs_write_full_page(stru
+diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
+index 12dfdcf..df64f04 100644
+--- a/fs/reiserfs/inode.c
++++ b/fs/reiserfs/inode.c
+@@ -2351,7 +2351,7 @@ static int reiserfs_write_full_page(stru
  	struct buffer_head *head, *bh;
  	int partial = 0;
  	int nr = 0;
@@ -157,7 +157,7 @@
  	struct reiserfs_transaction_handle th;
  	struct super_block *s = inode->i_sb;
  	int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize;
-@@ -2416,7 +2416,7 @@ static int reiserfs_write_full_page(stru
+@@ -2420,7 +2420,7 @@ static int reiserfs_write_full_page(stru
  	 * blocks we're going to log
  	 */
  	if (checked) {
@@ -166,7 +166,7 @@
  		reiserfs_write_lock(s);
  		error = journal_begin(&th, s, bh_per_page + 1);
  		if (error) {
-@@ -2797,7 +2797,7 @@ static void reiserfs_invalidatepage(stru
+@@ -2801,7 +2801,7 @@ static void reiserfs_invalidatepage(stru
  	BUG_ON(!PageLocked(page));
  
  	if (offset == 0)
@@ -175,7 +175,7 @@
  
  	if (!page_has_buffers(page))
  		goto out;
-@@ -2838,7 +2838,7 @@ static int reiserfs_set_page_dirty(struc
+@@ -2842,7 +2842,7 @@ static int reiserfs_set_page_dirty(struc
  {
  	struct inode *inode = page->mapping->host;
  	if (reiserfs_file_data_log(inode)) {
@@ -184,7 +184,7 @@
  		return __set_page_dirty_nobuffers(page);
  	}
  	return __set_page_dirty_buffers(page);
-@@ -2861,7 +2861,7 @@ static int reiserfs_releasepage(struct p
+@@ -2865,7 +2865,7 @@ static int reiserfs_releasepage(struct p
  	struct buffer_head *bh;
  	int ret = 1;
  
@@ -193,10 +193,10 @@
  	spin_lock(&j->j_dirty_buffers_lock);
  	head = page_buffers(page);
  	bh = head;
-Index: latest/fs/ufs/dir.c
-===================================================================
---- latest.orig/fs/ufs/dir.c
-+++ latest/fs/ufs/dir.c
+diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
+index 7f0a0aa..e04327c 100644
+--- a/fs/ufs/dir.c
++++ b/fs/ufs/dir.c
 @@ -135,7 +135,7 @@ static void ufs_check_page(struct page *
  	if (offs != limit)
  		goto Eend;
@@ -224,11 +224,11 @@
  			ufs_check_page(page);
  		if (PageError(page))
  			goto fail;
-Index: latest/include/linux/page-flags.h
-===================================================================
---- latest.orig/include/linux/page-flags.h
-+++ latest/include/linux/page-flags.h
-@@ -71,7 +71,7 @@
+diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
+index 5748642..6e017b7 100644
+--- a/include/linux/page-flags.h
++++ b/include/linux/page-flags.h
+@@ -71,7 +71,7 @@ #define PG_lru			 5
  #define PG_active		 6
  #define PG_slab			 7	/* slab debug (Suparna wants this) */
  
@@ -237,7 +237,7 @@
  #define PG_arch_1		 9
  #define PG_reserved		10
  #define PG_private		11	/* Has something at ->private */
-@@ -161,10 +161,6 @@
+@@ -161,10 +161,6 @@ #else
  #define PageHighMem(page)	0 /* needed to optimize away at compile time */
  #endif
  
@@ -262,10 +262,10 @@
 +#define TestClearPageFsMisc(page)	test_and_clear_bit(PG_fs_misc, &(page)->flags)
 +
  #endif	/* PAGE_FLAGS_H */
-Index: latest/include/linux/pagemap.h
-===================================================================
---- latest.orig/include/linux/pagemap.h
-+++ latest/include/linux/pagemap.h
+diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
+index 0a2f5d2..82b2753 100644
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
 @@ -170,6 +170,17 @@ static inline void wait_on_page_writebac
  extern void end_page_writeback(struct page *page);
  
@@ -284,11 +284,11 @@
   * Fault a userspace page into pagetables.  Return non-zero on a fault.
   *
   * This assumes that two userspace pages are always sufficient.  That's
-Index: latest/mm/filemap.c
-===================================================================
---- latest.orig/mm/filemap.c
-+++ latest/mm/filemap.c
-@@ -584,6 +584,23 @@ void fastcall __lock_page(struct page *p
+diff --git a/mm/filemap.c b/mm/filemap.c
+index d087fc3..c71d8fd 100644
+--- a/mm/filemap.c
[...2598 lines suppressed...]
-Index: latest/fs/nfs/super.c
-===================================================================
---- latest.orig/fs/nfs/super.c
-+++ latest/fs/nfs/super.c
-@@ -286,6 +286,7 @@ static void nfs_show_mount_options(struc
- 		{ NFS_MOUNT_NOAC, ",noac", "" },
- 		{ NFS_MOUNT_NONLM, ",nolock", "" },
- 		{ NFS_MOUNT_NOACL, ",noacl", "" },
-+		{ NFS_MOUNT_FSCACHE, ",fsc", "" },
- 		{ 0, NULL, NULL }
- 	};
- 	const struct proc_nfs_info *nfs_infop;
-Index: latest/fs/nfs/sysctl.c
-===================================================================
---- latest.orig/fs/nfs/sysctl.c
-+++ latest/fs/nfs/sysctl.c
-@@ -14,6 +14,7 @@
- #include <linux/nfs_fs.h>
- 
- #include "callback.h"
-+#include "internal.h"
- 
- static const int nfs_set_port_min = 0;
- static const int nfs_set_port_max = 65535;
-@@ -55,6 +56,48 @@ static ctl_table nfs_cb_sysctls[] = {
- 		.proc_handler	= &proc_dointvec_jiffies,
- 		.strategy	= &sysctl_jiffies,
- 	},
-+#ifdef CONFIG_NFS_FSCACHE
-+	{
-+		.ctl_name = CTL_UNNUMBERED,
-+		.procname = "fscache_from_error",
-+		.data = &nfs_fscache_from_error,
-+		.maxlen = sizeof(int),
-+		.mode = 0644,
-+		.proc_handler = &proc_dointvec,
-+	},
-+	{
-+		.ctl_name = CTL_UNNUMBERED,
-+		.procname = "fscache_to_error",
-+		.data = &nfs_fscache_to_error,
-+		.maxlen = sizeof(int),
-+		.mode = 0644,
-+		.proc_handler = &proc_dointvec,
-+	},
-+	{
-+		.ctl_name = CTL_UNNUMBERED,
-+		.procname = "fscache_uncache_page",
-+		.data = &nfs_fscache_uncache_page,
-+		.maxlen = sizeof(int),
-+		.mode = 0644,
-+		.proc_handler = &proc_dointvec,
-+	},
-+	{
-+		.ctl_name = CTL_UNNUMBERED,
-+		.procname = "fscache_to_pages",
-+		.data = &nfs_fscache_to_pages,
-+		.maxlen = sizeof(int),
-+		.mode = 0644,
-+		.proc_handler = &proc_dointvec_minmax,
-+	},
-+	{
-+		.ctl_name = CTL_UNNUMBERED,
-+		.procname = "fscache_from_pages",
-+		.data = &nfs_fscache_from_pages,
-+		.maxlen = sizeof(int),
-+		.mode = 0644,
-+		.proc_handler = &proc_dointvec,
-+	},
-+#endif
- 	{ .ctl_name = 0 }
- };
- 
-Index: latest/fs/nfs/write.c
-===================================================================
---- latest.orig/fs/nfs/write.c
-+++ latest/fs/nfs/write.c
-@@ -63,6 +63,7 @@
- 
- #include "delegation.h"
- #include "iostat.h"
-+#include "internal.h"
- 
- #define NFSDBG_FACILITY		NFSDBG_PAGECACHE
- 
-@@ -163,6 +164,9 @@ static void nfs_grow_file(struct page *p
- 		return;
- 	nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);
- 	i_size_write(inode, end);
-+#ifdef FSCACHE_WRITE_SUPPORT
-+	nfs_set_fscsize(NFS_SERVER(inode), NFS_I(inode), end);
-+#endif
- }
- 
- /* We can set the PG_uptodate flag if we see that a write request
-@@ -342,6 +346,9 @@ do_it:
- 		err = -EBADF;
- 		goto out;
- 	}
-+
-+	nfs_writepage_to_fscache(inode, page);
-+
- 	lock_kernel();
- 	if (!IS_SYNC(inode) && inode_referenced) {
- 		err = nfs_writepage_async(ctx, inode, page, 0, offset);
-@@ -424,7 +431,7 @@ static int nfs_inode_add_request(struct 
- 		if (nfs_have_delegation(inode, FMODE_WRITE))
- 			nfsi->change_attr++;
- 	}
--	SetPagePrivate(req->wb_page);
-+	SetPageNfsWriting(req->wb_page);
- 	nfsi->npages++;
- 	atomic_inc(&req->wb_count);
- 	return 0;
-@@ -441,7 +448,7 @@ static void nfs_inode_remove_request(str
- 	BUG_ON (!NFS_WBACK_BUSY(req));
- 
- 	spin_lock(&nfsi->req_lock);
--	ClearPagePrivate(req->wb_page);
-+	ClearPageNfsWriting(req->wb_page);
- 	radix_tree_delete(&nfsi->nfs_page_tree, req->wb_index);
- 	nfsi->npages--;
- 	if (!nfsi->npages) {
-Index: latest/include/linux/nfs4_mount.h
-===================================================================
---- latest.orig/include/linux/nfs4_mount.h
-+++ latest/include/linux/nfs4_mount.h
-@@ -65,6 +65,7 @@ struct nfs4_mount_data {
- #define NFS4_MOUNT_NOCTO	0x0010	/* 1 */
- #define NFS4_MOUNT_NOAC		0x0020	/* 1 */
- #define NFS4_MOUNT_STRICTLOCK	0x1000	/* 1 */
-+#define NFS4_MOUNT_FSCACHE	0x4000	/* 1 */
- #define NFS4_MOUNT_FLAGMASK	0xFFFF
- 
- #endif
-Index: latest/include/linux/nfs_fs.h
-===================================================================
---- latest.orig/include/linux/nfs_fs.h
-+++ latest/include/linux/nfs_fs.h
-@@ -29,6 +29,7 @@
- 
- #include <linux/rwsem.h>
- #include <linux/mempool.h>
-+#include <linux/fscache.h>
- 
- /*
-  * Enable debugging support for nfs client.
-@@ -180,6 +181,9 @@ struct nfs_inode {
- 	int			 delegation_state;
- 	struct rw_semaphore	rwsem;
- #endif /* CONFIG_NFS_V4*/
-+#ifdef CONFIG_NFS_FSCACHE
-+	struct fscache_cookie	*fscache;
-+#endif
- 	struct inode		vfs_inode;
- };
- 
-@@ -582,6 +586,7 @@ extern void * nfs_root_data(void);
- #define NFSDBG_ROOT		0x0080
- #define NFSDBG_CALLBACK		0x0100
- #define NFSDBG_CLIENT		0x0200
-+#define NFSDBG_FSCACHE		0x0400
- #define NFSDBG_ALL		0xFFFF
- 
- #ifdef __KERNEL__
-Index: latest/include/linux/nfs_fs_sb.h
-===================================================================
---- latest.orig/include/linux/nfs_fs_sb.h
-+++ latest/include/linux/nfs_fs_sb.h
-@@ -3,6 +3,7 @@
- 
- #include <linux/list.h>
- #include <linux/backing-dev.h>
-+#include <linux/fscache.h>
- 
- struct nfs_iostats;
- 
-@@ -66,6 +67,10 @@ struct nfs_client {
- 	char			cl_ipaddr[16];
- 	unsigned char		cl_id_uniquifier;
- #endif
-+
-+#ifdef CONFIG_NFS_FSCACHE
-+	struct fscache_cookie	*fscache;	/* client index cache cookie */
-+#endif
- };
- 
- /*
-Index: latest/include/linux/nfs_mount.h
-===================================================================
---- latest.orig/include/linux/nfs_mount.h
-+++ latest/include/linux/nfs_mount.h
-@@ -61,6 +61,7 @@ struct nfs_mount_data {
- #define NFS_MOUNT_NOACL		0x0800	/* 4 */
- #define NFS_MOUNT_STRICTLOCK	0x1000	/* reserved for NFSv4 */
- #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
-+#define NFS_MOUNT_FSCACHE	0x4000
- #define NFS_MOUNT_FLAGMASK	0xFFFF
- 
- #endif



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:44:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:44:15 -0400
Subject: rpms/kernel/devel/configs config-powerpc64-kdump, 1.1,
	1.2 config-powerpc64-iseries-kdump, 1.1, 1.2
Message-ID: <200607282144.k6SLiF8q013449@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13403/configs

Modified Files:
	config-powerpc64-kdump config-powerpc64-iseries-kdump 
Log Message:
NUMA bug fixed upstream



Index: config-powerpc64-kdump
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-kdump,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-powerpc64-kdump	6 Jun 2006 04:35:48 -0000	1.1
+++ config-powerpc64-kdump	28 Jul 2006 21:44:09 -0000	1.2
@@ -1,4 +1,3 @@
-# CONFIG_NUMA is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000


Index: config-powerpc64-iseries-kdump
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries-kdump,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-powerpc64-iseries-kdump	14 Jul 2006 22:19:39 -0000	1.1
+++ config-powerpc64-iseries-kdump	28 Jul 2006 21:44:10 -0000	1.2
@@ -1,4 +1,3 @@
-# CONFIG_NUMA is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000



From fedora-cvs-commits at redhat.com  Fri Jul 28 21:56:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 17:56:12 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2472,1.2473
Message-ID: <200607282156.k6SLuCsR032085@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31949

Modified Files:
	kernel-2.6.spec 
Log Message:
just some bs to bump the rev # so make tag works again




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2472
retrieving revision 1.2473
diff -u -r1.2472 -r1.2473
--- kernel-2.6.spec	28 Jul 2006 20:11:24 -0000	1.2472
+++ kernel-2.6.spec	28 Jul 2006 21:56:09 -0000	1.2473
@@ -1663,6 +1663,10 @@
 %endif
 
 %changelog
+* Fri Jul 28 2006 Don Zickus <dzickus at redhat.com>
+- Refreshed NFS caching patches
+- tweaked some ppc64 kdump config options
+
 * Fri Jul 28 2006 Jon Masters <jcm at redhat.com>
 - Remove make-symsets and built-in-where as now handled by kabitool
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 22:07:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 18:07:23 -0400
Subject: rpms/anaconda/devel .cvsignore, 1.311, 1.312 anaconda.spec, 1.437,
	1.438 sources, 1.434, 1.435
Message-ID: <200607282207.k6SM7Nsg002642@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2609

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
- update to 11.1.0.73-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- .cvsignore	28 Jul 2006 03:53:57 -0000	1.311
+++ .cvsignore	28 Jul 2006 22:07:16 -0000	1.312
@@ -1 +1 @@
-anaconda-11.1.0.72.tar.bz2
+anaconda-11.1.0.73.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- anaconda.spec	28 Jul 2006 03:53:57 -0000	1.437
+++ anaconda.spec	28 Jul 2006 22:07:16 -0000	1.438
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 11.1.0.72
+Version: 11.1.0.73
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -24,7 +24,7 @@
 Requires: device-mapper >= 1.01.05-3
 Requires: dosfstools e2fsprogs
 %ifnarch s390 s390x
-Requires: python-pyblock >= 0.17-1
+Requires: python-pyblock >= 0.17-2
 Requires: libbdevid >= 5.1.2-1, libbdevid-python
 %endif
 %ifnarch s390 s390x ppc64
@@ -103,6 +103,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Jul 28 2006 Peter Jones <pjones at redhat.com> - 11.1.0.73-1
+- Revert DNS changes from yesterday (dcantrel)
+- Do the backtrace initialization after analyzing args (katzj)
+- Use rhpxl for all X startup tasks (clumens, #199437)
+- Create users under the rootpath (patch from Clark Williams)
+- Update to use newer dmraid libraries
+- Remove /nss usage (dcantrell)
+
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 11.1.0.72-1
 - Don't allow ipv6-only nfs installs (dcantrel)
 - Fix segfault with ksdevice= (pjones, #200451)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -r1.434 -r1.435
--- sources	28 Jul 2006 03:53:58 -0000	1.434
+++ sources	28 Jul 2006 22:07:16 -0000	1.435
@@ -1 +1 @@
-b4ff742f853b08979a7cc6ab1f775a14  anaconda-11.1.0.72.tar.bz2
+0c79a1e63733e5adb81a7fd9c482a2fc  anaconda-11.1.0.73.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Jul 28 22:25:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 18:25:54 -0400
Subject: rpms/frysk/devel frysk.spec,1.78,1.79
Message-ID: <200607282225.k6SMPsFM022290@cvs.devel.redhat.com>

Author: pmuldoon

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22209

Modified Files:
	frysk.spec 
Log Message:
* Fri Jul 28 2006 Phil Muldoon <pmuldoon at redhat.com> -  0.0.1.2006.07.25.rh1-3
- Add dogtail to BuildRequires




Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- frysk.spec	25 Jul 2006 15:10:32 -0000	1.78
+++ frysk.spec	28 Jul 2006 22:25:51 -0000	1.79
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.07.25.rh1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -25,6 +25,7 @@
 BuildRequires:	libgconf-java-devel
 BuildRequires:	libvte-java-devel >= 0.12.0
 BuildRequires:  vte-devel >= 0.12.1
+BuildRequires:  dogtail >=  0.5.1
 BuildRequires:  xmlto
 BuildRequires:  sharutils
 BuildRequires:	transfig >= 3.2.0 
@@ -98,6 +99,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Fri Jul 28 2006 Phil Muldoon <pmuldoon at redhat.com> -  0.0.1.2006.07.25.rh1-3
+- Add dogtail to BuildRequires 
+
 * Tue Jul 25 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.07.25.rh1-2
 - Add ftrace to the file list.
 



From fedora-cvs-commits at redhat.com  Fri Jul 28 23:28:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 19:28:31 -0400
Subject: rpms/binutils/devel
	binutils-2.17.50.0.3-x86-noautoarch-rh200330.patch, NONE,
	1.1 binutils.spec, 1.98, 1.99
Message-ID: <200607282328.k6SNSVAh004236@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4090

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.17.50.0.3-x86-noautoarch-rh200330.patch 
Log Message:
* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> 2.17.50.0.3-2
- do not infer x86 arch implicitly based on instruction in the input
(#200330)


binutils-2.17.50.0.3-x86-noautoarch-rh200330.patch:
 config/tc-i386.c                  |    3 -
 testsuite/gas/i386/nops-2-i386.d  |   58 ++++++++++++++++++++++++--------------
 testsuite/gas/i386/nops-2-merom.d |   52 ++++++++++++++++++++++++----------
 testsuite/gas/i386/nops-2.d       |   58 ++++++++++++++++++++++++--------------
 4 files changed, 111 insertions(+), 60 deletions(-)

--- NEW FILE binutils-2.17.50.0.3-x86-noautoarch-rh200330.patch ---
http://sourceware.org/ml/binutils/2006-07/msg00360.html

gas/

2006-07-28  H.J. Lu  <hongjiu.lu at intel.com>

	* config/tc-i386.c (md_assemble): Don't update
	cpu_arch_isa_flags.

gas/testsuite/

2006-07-28  H.J. Lu  <hongjiu.lu at intel.com>

	* gas/i386/nops-2-i386.d: Updated.
	* gas/i386/nops-2-merom.d: Likewise.
	* gas/i386/nops-2.d: Likewise.

--- gas/config/tc-i386.c.nops	2006-07-28 13:58:01.000000000 -0700
+++ gas/config/tc-i386.c	2006-07-28 14:54:08.000000000 -0700
@@ -1945,9 +1945,6 @@ md_assemble (line)
   if (i.rex != 0)
     add_prefix (REX_OPCODE | i.rex);
 
-  /* Record what ISA we have generated so far.  */
-  cpu_arch_isa_flags |= i.tm.cpu_flags;
-
   /* We are ready to output the insn.  */
   output_insn ();
 }
--- gas/testsuite/gas/i386/nops-2-i386.d.nops	2006-06-23 14:47:36.000000000 -0700
+++ gas/testsuite/gas/i386/nops-2-i386.d	2006-07-28 15:41:49.000000000 -0700
@@ -9,34 +9,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
-[	 ]*3:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*9:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
-[	 ]*18:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*11:[	 ]+eb 0d[	 ]+jmp[ 	]+20[ 	]+<nop14>
+[	 ]*13:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*14:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*15:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*16:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*17:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*18:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*19:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1a:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1b:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1c:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1d:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1e:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1f:[	 ]+90[	 ]+nop[ 	]*
 
 0+20 <nop14>:
 [	 ]*20:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
-[	 ]*29:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*22:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*29:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [	 ]*30:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*31:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*39:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*33:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*39:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [	 ]*40:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*41:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*42:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*4a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*44:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*4a:[	 ]+8d bf 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [	 ]*50:[	 ]+90[	 ]+nop[ 	]*
@@ -44,8 +56,8 @@ Disassembly of section .text:
 [	 ]*52:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*53:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*5a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*55:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*59:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [	 ]*60:[	 ]+90[	 ]+nop[ 	]*
@@ -54,7 +66,8 @@ Disassembly of section .text:
 [	 ]*63:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*64:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*66:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*69:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [	 ]*70:[	 ]+90[	 ]+nop[ 	]*
@@ -64,7 +77,8 @@ Disassembly of section .text:
 [	 ]*74:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*75:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*77:[	 ]+89 f6[	 ]+mov[ 	]+%esi,%esi
+[	 ]*79:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [	 ]*80:[	 ]+90[	 ]+nop[ 	]*
@@ -75,7 +89,8 @@ Disassembly of section .text:
 [	 ]*85:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*86:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [	 ]*90:[	 ]+90[	 ]+nop[ 	]*
@@ -87,7 +102,7 @@ Disassembly of section .text:
 [	 ]*96:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*97:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*99:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
@@ -100,7 +115,7 @@ Disassembly of section .text:
 [	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*aa:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
@@ -114,7 +129,8 @@ Disassembly of section .text:
 [	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
@@ -129,7 +145,7 @@ Disassembly of section .text:
 [	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*cc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
@@ -145,7 +161,7 @@ Disassembly of section .text:
 [	 ]*da:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*db:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
+[	 ]*dd:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [	 ]*e0:[	 ]+90[	 ]+nop[ 	]*
@@ -162,5 +178,5 @@ Disassembly of section .text:
 [	 ]*eb:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ec:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ed:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ee:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+[	 ]*ee:[	 ]+66 90[ 	]+xchg[ 	]+%ax,%ax
 #pass
--- gas/testsuite/gas/i386/nops-2-merom.d.nops	2006-06-23 14:47:36.000000000 -0700
+++ gas/testsuite/gas/i386/nops-2-merom.d	2006-07-28 15:42:36.000000000 -0700
@@ -9,29 +9,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
-[	 ]*3:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*11:[	 ]+eb 0d[	 ]+jmp[ 	]+20[ 	]+<nop14>
+[	 ]*13:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*14:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*15:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*16:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*17:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*18:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*19:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1a:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1b:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1c:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1d:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1e:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1f:[	 ]+90[	 ]+nop[ 	]*
 
 0+20 <nop14>:
 [	 ]*20:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*22:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*29:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [	 ]*30:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*31:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+66 66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*33:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*39:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [	 ]*40:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*41:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*42:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+66 66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*44:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*4a:[	 ]+8d bf 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [	 ]*50:[	 ]+90[	 ]+nop[ 	]*
@@ -39,7 +56,8 @@ Disassembly of section .text:
 [	 ]*52:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*53:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+66 66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*55:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*59:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [	 ]*60:[	 ]+90[	 ]+nop[ 	]*
@@ -48,7 +66,8 @@ Disassembly of section .text:
 [	 ]*63:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*64:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*66:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*69:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [	 ]*70:[	 ]+90[	 ]+nop[ 	]*
@@ -58,7 +77,8 @@ Disassembly of section .text:
 [	 ]*74:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*75:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*77:[	 ]+89 f6[	 ]+mov[ 	]+%esi,%esi
+[	 ]*79:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [	 ]*80:[	 ]+90[	 ]+nop[ 	]*
@@ -69,7 +89,8 @@ Disassembly of section .text:
 [	 ]*85:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*86:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [	 ]*90:[	 ]+90[	 ]+nop[ 	]*
@@ -81,7 +102,7 @@ Disassembly of section .text:
 [	 ]*96:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*97:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*99:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
@@ -94,7 +115,7 @@ Disassembly of section .text:
 [	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*aa:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
@@ -108,7 +129,8 @@ Disassembly of section .text:
 [	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
@@ -123,7 +145,7 @@ Disassembly of section .text:
 [	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*cc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
@@ -139,7 +161,7 @@ Disassembly of section .text:
 [	 ]*da:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*db:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
+[	 ]*dd:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [	 ]*e0:[	 ]+90[	 ]+nop[ 	]*
@@ -156,5 +178,5 @@ Disassembly of section .text:
 [	 ]*eb:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ec:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ed:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ee:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+[	 ]*ee:[	 ]+66 90[ 	]+xchg[ 	]+%ax,%ax
 #pass
--- gas/testsuite/gas/i386/nops-2.d.nops	2006-06-23 14:47:36.000000000 -0700
+++ gas/testsuite/gas/i386/nops-2.d	2006-07-28 15:37:28.000000000 -0700
@@ -8,34 +8,46 @@ Disassembly of section .text:
 
 0+ <nop>:
 [	 ]*0:[	 ]+0f 44 c0[	 ]+cmove[ 	]+%eax,%eax
-[	 ]*3:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*9:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*3:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*9:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+10 <nop15>:
 [	 ]*10:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*11:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
-[	 ]*18:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*11:[	 ]+eb 0d[	 ]+jmp[ 	]+20[ 	]+<nop14>
+[	 ]*13:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*14:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*15:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*16:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*17:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*18:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*19:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1a:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1b:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1c:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1d:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1e:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*1f:[	 ]+90[	 ]+nop[ 	]*
 
 0+20 <nop14>:
 [	 ]*20:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*21:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*22:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
-[	 ]*29:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*22:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*29:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+30 <nop13>:
 [	 ]*30:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*31:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*32:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*33:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*39:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*33:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*39:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+40 <nop12>:
 [	 ]*40:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*41:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*42:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*43:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*44:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*4a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*44:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*4a:[	 ]+8d bf 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+50 <nop11>:
 [	 ]*50:[	 ]+90[	 ]+nop[ 	]*
@@ -43,8 +55,8 @@ Disassembly of section .text:
 [	 ]*52:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*53:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*54:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*55:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
-[	 ]*5a:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*55:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*59:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+60 <nop10>:
 [	 ]*60:[	 ]+90[	 ]+nop[ 	]*
@@ -53,7 +65,8 @@ Disassembly of section .text:
 [	 ]*63:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*64:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*65:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*66:[	 ]+66 2e 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+%cs:0x0\(%eax,%eax,1\)
+[	 ]*66:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
+[	 ]*69:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+70 <nop9>:
 [	 ]*70:[	 ]+90[	 ]+nop[ 	]*
@@ -63,7 +76,8 @@ Disassembly of section .text:
 [	 ]*74:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*75:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*76:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*77:[	 ]+66 0f 1f 84 00 00 00 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*77:[	 ]+89 f6[	 ]+mov[ 	]+%esi,%esi
+[	 ]*79:[	 ]+8d bc 27 00 00 00 00[	 ]+lea[ 	]+0x0\(%edi\),%edi
 
 0+80 <nop8>:
 [	 ]*80:[	 ]+90[	 ]+nop[ 	]*
@@ -74,7 +88,8 @@ Disassembly of section .text:
 [	 ]*85:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*86:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*87:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*88:[	 ]+0f 1f 84 00 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*88:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*89:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+90 <nop7>:
 [	 ]*90:[	 ]+90[	 ]+nop[ 	]*
@@ -86,7 +101,7 @@ Disassembly of section .text:
 [	 ]*96:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*97:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*98:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*99:[	 ]+0f 1f 80 00 00 00 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*99:[	 ]+8d b4 26 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+a0 <nop6>:
 [	 ]*a0:[	 ]+90[	 ]+nop[ 	]*
@@ -99,7 +114,7 @@ Disassembly of section .text:
 [	 ]*a7:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*a9:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*aa:[	 ]+66 0f 1f 44 00 00[	 ]+nopw[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*aa:[	 ]+8d b6 00 00 00 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+b0 <nop5>:
 [	 ]*b0:[	 ]+90[	 ]+nop[ 	]*
@@ -113,7 +128,8 @@ Disassembly of section .text:
 [	 ]*b8:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*b9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ba:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*bb:[	 ]+0f 1f 44 00 00[	 ]+nopl[ 	]+0x0\(%eax,%eax,1\)
+[	 ]*bb:[	 ]+90[	 ]+nop[ 	]*
+[	 ]*bc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+c0 <nop4>:
 [	 ]*c0:[	 ]+90[	 ]+nop[ 	]*
@@ -128,7 +144,7 @@ Disassembly of section .text:
 [	 ]*c9:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ca:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*cb:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*cc:[	 ]+0f 1f 40 00[	 ]+nopl[ 	]+0x0\(%eax\)
+[	 ]*cc:[	 ]+8d 74 26 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+d0 <nop3>:
 [	 ]*d0:[	 ]+90[	 ]+nop[ 	]*
@@ -144,7 +160,7 @@ Disassembly of section .text:
 [	 ]*da:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*db:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*dc:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*dd:[	 ]+0f 1f 00[	 ]+nopl[ 	]+\(%eax\)
+[	 ]*dd:[	 ]+8d 76 00[	 ]+lea[ 	]+0x0\(%esi\),%esi
 
 0+e0 <nop2>:
 [	 ]*e0:[	 ]+90[	 ]+nop[ 	]*
@@ -161,5 +177,5 @@ Disassembly of section .text:
 [	 ]*eb:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ec:[	 ]+90[	 ]+nop[ 	]*
 [	 ]*ed:[	 ]+90[	 ]+nop[ 	]*
-[	 ]*ee:[	 ]+66 90[	 ]+xchg[ 	]+%ax,%ax
+[	 ]*ee:[	 ]+66 90[ 	]+xchg[ 	]+%ax,%ax
 #pass


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- binutils.spec	17 Jul 2006 16:08:31 -0000	1.98
+++ binutils.spec	28 Jul 2006 23:28:26 -0000	1.99
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.17.50.0.3
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -16,6 +16,7 @@
 Patch8: binutils-2.17.50.0.3-kept-section.patch
 Patch9: binutils-2.17.50.0.3-power6-insns.patch
 Patch10: binutils-2.17.50.0.3-opcodes-intl.patch
+Patch11: binutils-2.17.50.0.3-x86-noautoarch-rh200330.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -55,6 +56,8 @@
 %patch8 -p0 -b .kept-section~
 %patch9 -p0 -b .power6-insns~
 %patch10 -p0 -b .opcodes-intl~
+%patch11 -p0 -b .x86-noautoarch~
+
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -166,6 +169,10 @@
 %{_infodir}/*info*
 
 %changelog
+* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> 2.17.50.0.3-2
+- do not infer x86 arch implicitly based on instruction in the input
+(#200330)
+
 * Mon Jul 17 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-1
 - update to 2.17.50.0.3
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 02:03:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 22:03:50 -0400
Subject: rpms/libstdc++so7/FC-5 libstdc++-v3-so7-version.patch, 1.1,
	1.2 libstdc++7.spec, 1.9, 1.10
Message-ID: <200607290203.k6T23ndD001194@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/libstdc++so7/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv972

Modified Files:
	libstdc++-v3-so7-version.patch libstdc++7.spec 
Log Message:
- revert libstdcxx string implementation to rc (#197718)
- bump library version datestamp to 20060727


libstdc++-v3-so7-version.patch:
 config/abi/pre/gnu-versioned-namespace.ver |   50 ++++++++++++++---------------
 include/bits/c++config                     |   20 +++++------
 2 files changed, 35 insertions(+), 35 deletions(-)

Index: libstdc++-v3-so7-version.patch
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/FC-5/libstdc++-v3-so7-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libstdc++-v3-so7-version.patch	4 May 2006 11:07:49 -0000	1.1
+++ libstdc++-v3-so7-version.patch	29 Jul 2006 02:03:40 -0000	1.2
@@ -7,7 +7,7 @@
  # define _GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y) namespace X { namespace Y {
  # define _GLIBCXX_END_NESTED_NAMESPACE } }
 -# define _GLIBCXX_BEGIN_NAMESPACE(X) _GLIBCXX_BEGIN_NESTED_NAMESPACE(X, _7)
-+# define _GLIBCXX_BEGIN_NAMESPACE(X) _GLIBCXX_BEGIN_NESTED_NAMESPACE(X, _7_20060428)
++# define _GLIBCXX_BEGIN_NAMESPACE(X) _GLIBCXX_BEGIN_NESTED_NAMESPACE(X, _7_20060727)
  # define _GLIBCXX_END_NAMESPACE _GLIBCXX_END_NESTED_NAMESPACE
  #else
  # define _GLIBCXX_BEGIN_NAMESPACE(X) namespace X { 
@@ -17,8 +17,8 @@
  {
 -  namespace _7 { }
 -  using namespace _7 __attribute__ ((strong));
-+  namespace _7_20060428 { }
-+  using namespace _7_20060428 __attribute__ ((strong));
++  namespace _7_20060727 { }
++  using namespace _7_20060727 __attribute__ ((strong));
  }
  
  // In addition, other supported namespace configurations.
@@ -26,8 +26,8 @@
  { 
 -  namespace _7 { }
 -  using namespace _7 __attribute__ ((strong));
-+  namespace _7_20060428 { }
-+  using namespace _7_20060428 __attribute__ ((strong));
++  namespace _7_20060727 { }
++  using namespace _7_20060727 __attribute__ ((strong));
  }
  
  namespace std
@@ -36,8 +36,8 @@
    { 
 -    namespace _7 { }
 -    using namespace _7 __attribute__ ((strong));
-+    namespace _7_20060428 { }
-+    using namespace _7_20060428 __attribute__ ((strong));
++    namespace _7_20060727 { }
++    using namespace _7_20060727 __attribute__ ((strong));
    }
  }
  #endif
@@ -48,9 +48,9 @@
 -# define _GLIBCXX_STD _7
 -# define _GLIBCXX_EXT _7
 -# define _GLIBCXX_STD_MOVE std::_7
-+# define _GLIBCXX_STD _7_20060428
-+# define _GLIBCXX_EXT _7_20060428
-+# define _GLIBCXX_STD_MOVE std::_7_20060428
++# define _GLIBCXX_STD _7_20060727
++# define _GLIBCXX_EXT _7_20060727
++# define _GLIBCXX_STD_MOVE std::_7_20060727
  #else
  # define _GLIBCXX_STD std
  # define _GLIBCXX_EXT __gnu_cxx
@@ -63,7 +63,7 @@
      extern "C++"
      {
 -      std::_7::*;
-+      std::_7_20060428::*;
++      std::_7_20060727::*;
        std::*;
        __gnu_debug::_Safe_iterator_base*;
        __gnu_debug::_Safe_sequence_base*;
@@ -72,20 +72,20 @@
  
      # std::__convert_to_v
 -    _ZNSt2_714__convert_to_v*;
-+    _ZNSt11_7_2006042814__convert_to_v*;
++    _ZNSt11_7_2006072714__convert_to_v*;
  
      # std::__copy_streambufs and std::__copy_streambufs_eof
 -    _ZNSt2_717__copy_streambufsI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
 -    _ZNSt2_721__copy_streambufs_eofI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
-+    _ZNSt11_7_2006042817__copy_streambufsI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
-+    _ZNSt11_7_2006042821__copy_streambufs_eofI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
++    _ZNSt11_7_2006072717__copy_streambufsI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
++    _ZNSt11_7_2006072721__copy_streambufs_eofI[cw]NS_11char_traitsI[cw]EEEE[il]PNS_15basic_streambuf*;
  
      # __gnu_cxx::__atomic_add
      # __gnu_cxx::__exchange_and_add
 -    _ZN9__gnu_cxx2_712__atomic_addEPV[il][il];
 -    _ZN9__gnu_cxx2_718__exchange_and_addEPV[li][il];
-+    _ZN9__gnu_cxx11_7_2006042812__atomic_addEPV[il][il];
-+    _ZN9__gnu_cxx11_7_2006042818__exchange_and_addEPV[li][il];
++    _ZN9__gnu_cxx11_7_2006072712__atomic_addEPV[il][il];
++    _ZN9__gnu_cxx11_7_2006072718__exchange_and_addEPV[li][il];
  
      # __gnu_cxx::__pool
 -    _ZN9__gnu_cxx2_76__poolILb[01]EE13_M_initializeEv;
@@ -93,41 +93,41 @@
 -    _ZN9__gnu_cxx2_76__poolILb[01]EE16_M_reclaim_blockEPc[jm];
 -    _ZN9__gnu_cxx2_76__poolILb[01]EE10_M_destroyEv;
 -    _ZN9__gnu_cxx2_76__poolILb1EE16_M_get_thread_idEv;
-+    _ZN9__gnu_cxx11_7_200604286__poolILb[01]EE13_M_initializeEv;
-+    _ZN9__gnu_cxx11_7_200604286__poolILb[01]EE16_M_reserve_blockE[jm][jm];
-+    _ZN9__gnu_cxx11_7_200604286__poolILb[01]EE16_M_reclaim_blockEPc[jm];
-+    _ZN9__gnu_cxx11_7_200604286__poolILb[01]EE10_M_destroyEv;
-+    _ZN9__gnu_cxx11_7_200604286__poolILb1EE16_M_get_thread_idEv;
++    _ZN9__gnu_cxx11_7_200607276__poolILb[01]EE13_M_initializeEv;
++    _ZN9__gnu_cxx11_7_200607276__poolILb[01]EE16_M_reserve_blockE[jm][jm];
++    _ZN9__gnu_cxx11_7_200607276__poolILb[01]EE16_M_reclaim_blockEPc[jm];
++    _ZN9__gnu_cxx11_7_200607276__poolILb[01]EE10_M_destroyEv;
++    _ZN9__gnu_cxx11_7_200607276__poolILb1EE16_M_get_thread_idEv;
  
 -    _ZN9__gnu_cxx2_717__pool_alloc_base9_M_refillE[jm];    
 -    _ZN9__gnu_cxx2_717__pool_alloc_base16_M_get_free_listE[jm];
 -    _ZN9__gnu_cxx2_717__pool_alloc_base12_M_get_mutexEv;
-+    _ZN9__gnu_cxx11_7_2006042817__pool_alloc_base9_M_refillE[jm];    
-+    _ZN9__gnu_cxx11_7_2006042817__pool_alloc_base16_M_get_free_listE[jm];
-+    _ZN9__gnu_cxx11_7_2006042817__pool_alloc_base12_M_get_mutexEv;
++    _ZN9__gnu_cxx11_7_2006072717__pool_alloc_base9_M_refillE[jm];    
++    _ZN9__gnu_cxx11_7_2006072717__pool_alloc_base16_M_get_free_listE[jm];
++    _ZN9__gnu_cxx11_7_2006072717__pool_alloc_base12_M_get_mutexEv;
  
 -    _ZN9__gnu_cxx2_79free_list6_M_getE[jm];
 -    _ZN9__gnu_cxx2_79free_list8_M_clearEv;
-+    _ZN9__gnu_cxx11_7_200604289free_list6_M_getE[jm];
-+    _ZN9__gnu_cxx11_7_200604289free_list8_M_clearEv;
++    _ZN9__gnu_cxx11_7_200607279free_list6_M_getE[jm];
++    _ZN9__gnu_cxx11_7_200607279free_list8_M_clearEv;
  
 -    _ZN9__gnu_cxx2_711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
 -    _ZNK9__gnu_cxx2_711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
 -    _ZZN9__gnu_cxx2_711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZN9__gnu_cxx11_7_2006042811__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZNK9__gnu_cxx11_7_2006042811__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZZN9__gnu_cxx11_7_2006042811__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZN9__gnu_cxx11_7_2006072711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZNK9__gnu_cxx11_7_2006072711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZZN9__gnu_cxx11_7_2006072711__rc_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
      
 -    _ZN9__gnu_cxx2_712__sso_stringI[cw]NSt2_711char_traitsI[cw]EENS2_9allocatorI[cw]EEE10_M_destroyE[jm];
 -    _ZN9__gnu_cxx2_712__sso_stringI[cw]NSt2_711char_traitsI[cw]EENS2_9allocatorI[cw]EEEC*;
 -    _ZN9__gnu_cxx2_712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
 -    _ZNK9__gnu_cxx2_712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
 -    _ZZN9__gnu_cxx2_712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZN9__gnu_cxx11_7_2006042812__sso_stringI[cw]NSt11_7_2006042811char_traitsI[cw]EENS2_9allocatorI[cw]EEE10_M_destroyE[jm];
-+    _ZN9__gnu_cxx11_7_2006042812__sso_stringI[cw]NSt11_7_2006042811char_traitsI[cw]EENS2_9allocatorI[cw]EEEC*;
-+    _ZN9__gnu_cxx11_7_2006042812__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZNK9__gnu_cxx11_7_2006042812__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
-+    _ZZN9__gnu_cxx11_7_2006042812__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZN9__gnu_cxx11_7_2006072712__sso_stringI[cw]NSt11_7_2006072711char_traitsI[cw]EENS2_9allocatorI[cw]EEE10_M_destroyE[jm];
++    _ZN9__gnu_cxx11_7_2006072712__sso_stringI[cw]NSt11_7_2006072711char_traitsI[cw]EENS2_9allocatorI[cw]EEEC*;
++    _ZN9__gnu_cxx11_7_2006072712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZNK9__gnu_cxx11_7_2006072712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
++    _ZZN9__gnu_cxx11_7_2006072712__sso_stringI[cw]St11char_traitsI[cw]ESaI[cw]EE*;
  
    local:
      *;
@@ -136,7 +136,7 @@
  
      # __gnu_cxx::_verbose_terminate_handler()
 -    _ZN9__gnu_cxx2_727__verbose_terminate_handlerEv;
-+    _ZN9__gnu_cxx11_7_2006042827__verbose_terminate_handlerEv;
++    _ZN9__gnu_cxx11_7_2006072727__verbose_terminate_handlerEv;
  
    local:
      *;


Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/FC-5/libstdc++7.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libstdc++7.spec	26 May 2006 14:49:47 -0000	1.9
+++ libstdc++7.spec	29 Jul 2006 02:03:40 -0000	1.10
@@ -1,13 +1,14 @@
-%define datestamp 20060428
+%define snapdate 20060428
+%define datestamp 20060727
 
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.3.%{datestamp}.fc5.2
+Release: 0.3.%{snapdate}.fc5.3
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
-Source1: libstdc++-v3-so7-%{datestamp}.tar.bz2
+Source1: libstdc++-v3-so7-%{snapdate}.tar.bz2
 URL: http://gcc.gnu.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: binutils >= 2.16.91.0.5-1, gcc >= 4.1.0
@@ -58,7 +59,7 @@
 mkdir obj
 cd obj
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ../configure \
-  --enable-languages=c,c++ --disable-multilib %{gcc_target_platform}
+  --enable-languages=c,c++ --disable-multilib --enable-libstdcxx-string=rc %{gcc_target_platform}
 mkdir gcc
 cp -a ../copy_to_gcc/* gcc/
 gccdir=`cd $(gcc $RPM_OPT_FLAGS -print-file-name=include)/..; pwd`
@@ -184,12 +185,16 @@
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Thu Jul 27 2006 Jens Petersen <petersen at redhat.com>  4.2.0-0.3.20060428.fc5.3
+- revert libstdcxx string implementation to rc (#197718)
+- bump library version datestamp to 20060727
+
 * Fri May 26 2006 Jakub Jelinek <jakub at redhat.com> 4.2.0-0.3.20060428.fc5.2
 - don't require exactly gcc-c++ 4.1.0 and libstdc++-devel 4.1.0,
   4.1.x is sufficient
 
 * Tue May  9 2006 Jens Petersen <petersen at redhat.com>  4.2.0-0.3.20060428.fc5.1
-- fix ppc target in wrapper script
+- fix ppc target in wrapper script (#188446)
 
 * Fri Apr 28 2006  Benjamin Kosnik <bkoz at redhat.com> - 4.2.0-0.3.20060428.fc5
 - update sources and add libstdc++-v3-so7-version.patch



From fedora-cvs-commits at redhat.com  Sat Jul 29 02:54:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 22:54:37 -0400
Subject: rpms/openssl/devel openssl.spec,1.80,1.81
Message-ID: <200607290254.k6T2sbbK019905@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19893

Modified Files:
	openssl.spec 
Log Message:
* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> - 0.9.8b-4.1
- rebuild with new binutils (#200330)



Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- openssl.spec	21 Jul 2006 08:28:43 -0000	1.80
+++ openssl.spec	29 Jul 2006 02:54:33 -0000	1.81
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 4
+Release: 4.1
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -351,6 +351,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> - 0.9.8b-4.1
+- rebuild with new binutils (#200330)
+
 * Fri Jul 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-4
 - add a temporary workaround for sha512 test failure on s390 (#199604)
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 02:58:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 22:58:50 -0400
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1665,
	1.1666 linux-2.6-compile-fixes.patch, 1.10, 1.11
Message-ID: <200607290258.k6T2woLE019972@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19957

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
compile fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -r1.1665 -r1.1666
--- kernel-2.6.spec	28 Jul 2006 20:45:47 -0000	1.1665
+++ kernel-2.6.spec	29 Jul 2006 02:58:44 -0000	1.1666
@@ -719,7 +719,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:
 budget-av.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-compile-fixes.patch	9 Mar 2006 23:16:31 -0000	1.10
+++ linux-2.6-compile-fixes.patch	29 Jul 2006 02:58:45 -0000	1.11
@@ -0,0 +1,54 @@
+[PATCH 2.6.17.7] Fix budget-av compile failure
+
+From: Andrew de Quincey <adq_dvb at lidskialf.net>
+
+Currently I am doing lots of refactoring work in the dvb tree. This bugfix
+became necessary to fix 2.6.17 whilst I was in the middle of this work. 
+Unfortunately after I tested the original code for the patch, I generated 
+the diff against the wrong tree (I accidentally used a tree with part of 
+the refactoring code in it). This resulted in the reported compile errors 
+because that tree (a) was incomplete, and (b) used features which are 
+simply not in the mainline kernel yet.
+
+Many apologies for the error and problems this has caused. :(
+
+Signed-off-by: Andrew de Quincey <adq_dvb at lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
+
+diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
+--- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 14:53:19.000000000 +0100
++++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 15:25:32.000000000 +0100
+@@ -58,6 +58,7 @@
+ 	struct tasklet_struct ciintf_irq_tasklet;
+ 	int slot_status;
+ 	struct dvb_ca_en50221 ca;
++	u8 reinitialise_demod:1;
+ };
+ 
+ /* GPIO Connections:
+@@ -214,8 +215,9 @@
+ 	while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
+ 		msleep(100);
+ 
+-	/* reinitialise the frontend */
+-	dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
++	/* reinitialise the frontend if necessary */
++	if (budget_av->reinitialise_demod)
++		dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
+ 
+ 	if (timeout <= 0)
+ 	{
+@@ -1064,12 +1066,10 @@
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));
+-		if (fe) {
+-			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
+-		}
+ 		break;
+ 
+ 	case SUBID_DVBC_KNC1_PLUS:
++		budget_av->reinitialise_demod = 1;
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));



From fedora-cvs-commits at redhat.com  Sat Jul 29 03:50:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 28 Jul 2006 23:50:49 -0400
Subject: rpms/yelp/devel yelp.spec,1.70,1.71
Message-ID: <200607290350.k6T3onUN029972@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29865

Modified Files:
	yelp.spec 
Log Message:
fix file lists



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- yelp.spec	27 Jul 2006 16:27:13 -0000	1.70
+++ yelp.spec	29 Jul 2006 03:50:46 -0000	1.71
@@ -125,7 +125,6 @@
 %defattr(-,root,root)
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 %{_bindir}/*
-%{_libdir}/bonobo
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor
 %{_datadir}/yelp



From fedora-cvs-commits at redhat.com  Sat Jul 29 04:02:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 00:02:51 -0400
Subject: rpms/epiphany/devel .cvsignore, 1.42, 1.43 epiphany.spec, 1.109,
	1.110 sources, 1.43, 1.44
Message-ID: <200607290402.k6T42paN000953@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv913

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	18 Jul 2006 16:29:15 -0000	1.42
+++ .cvsignore	29 Jul 2006 04:02:46 -0000	1.43
@@ -1 +1 @@
-epiphany-2.15.1.tar.bz2
+epiphany-2.15.4.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- epiphany.spec	19 Jul 2006 20:00:12 -0000	1.109
+++ epiphany.spec	29 Jul 2006 04:02:46 -0000	1.110
@@ -1,6 +1,5 @@
-%define mozver 37:1.7.13
+%define firefox_ver 1.5.0.5
 %define desktop_file_utils_version 0.9
-%define mozilla_devel_ver 1.7
 %define glib2_devel_ver 2.10.1
 %define gtk2_devel_ver 2.9.0
 %define libbonoboui_devel_ver 2.1.1
@@ -9,13 +8,12 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.15.1
-Release: 2
+Version: 2.15.4
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
 Source0: %{name}-%{version}.tar.bz2
-Source1: po.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(post): scrollkeeper
@@ -24,13 +22,12 @@
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires: mozilla = %mozver
+Requires: firefox = %{firefox_ver}
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
 BuildRequires: glib2-devel >= %{glib2_devel_ver}
 BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
-BuildRequires: mozilla-devel >= %{mozilla_devel_ver}
-BuildRequires: mozilla
+BuildRequires: firefox-devel >= %{firefox_ver} 
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
 BuildRequires: libxml2-devel, libxslt-devel
 BuildRequires: libgnomeui-devel, libglade2-devel
@@ -81,8 +78,6 @@
 
 %patch0 -p1 -b .homepage
 
-tar xzf %{SOURCE1}
-
 %build
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager
@@ -164,6 +159,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.4-1
+- Update to 2.15.4
+- Rebuild against firefox-devel
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
 - Go back to 2.15.1, since gecko 1.8 is still missing
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	18 Jul 2006 17:53:18 -0000	1.43
+++ sources	29 Jul 2006 04:02:46 -0000	1.44
@@ -1,2 +1 @@
-1bc4bb644617ebf1aee3cd3e1604a54d  epiphany-2.15.1.tar.bz2
-1244f76760f1f6a5bc56ee1c39b5c91d  po.tar.gz
+1c0afcfed0340158b65ad720cc2b65e4  epiphany-2.15.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jul 29 04:14:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 00:14:16 -0400
Subject: rpms/devhelp/devel .cvsignore, 1.9, 1.10 devhelp.spec, 1.40,
	1.41 sources, 1.9, 1.10
Message-ID: <200607290414.k6T4EFvJ002954@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2860

Modified Files:
	.cvsignore devhelp.spec sources 
Log Message:
0.12



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Dec 2005 19:42:43 -0000	1.9
+++ .cvsignore	29 Jul 2006 04:14:08 -0000	1.10
@@ -1 +1 @@
-devhelp-0.11.tar.bz2
+devhelp-0.12.tar.bz2


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- devhelp.spec	12 Jul 2006 21:10:35 -0000	1.40
+++ devhelp.spec	29 Jul 2006 04:14:08 -0000	1.41
@@ -1,9 +1,9 @@
-%define mozver 37:1.7.13
+%define firefox_ver 1.5.0.5
 
 Summary:             API document browser
 Name:                devhelp
-Version:             0.11
-Release:             4
+Version:             0.12
+Release:             1
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -14,14 +14,14 @@
 Requires:            libgnomeui >= 2.2.0
 Requires:            gnome-vfs2 >= 2.2.0
 Requires:            libglade2 >= 2.2.0
-Requires:            mozilla = %mozver
+Requires:            firefox >= %(firefox_ver)
 BuildRequires:       desktop-file-utils >= 0.3
 
 BuildRequires:       gtk2-devel >= 2.2.0
 BuildRequires:       libgnomeui-devel >= 2.2.0
 BuildRequires:       gnome-vfs2-devel >= 2.2.0
 BuildRequires:       libglade2-devel >= 2.2.0
-BuildRequires:       mozilla-devel = %mozver
+BuildRequires:       firefox-devel >= %{firefox_ver}
 BuildRequires:       intltool
 BuildRequires:       gettext
 BuildRequires:       glib2-devel >= 2.9.5
@@ -100,6 +100,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 0.12-1
+- Update to 0.12
+- Rebuild against firefox
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11-4
 - rebuild
 - bump mozver


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Dec 2005 19:42:43 -0000	1.9
+++ sources	29 Jul 2006 04:14:09 -0000	1.10
@@ -1 +1 @@
-0f7cf58925a0e3ada507a59fe3fe93c8  devhelp-0.11.tar.bz2
+007e7bd4fb3e2e86b743944eca552460  devhelp-0.12.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Jul 29 04:16:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 00:16:09 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.41,1.42
Message-ID: <200607290416.k6T4G9rh003293@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3219

Modified Files:
	devhelp.spec 
Log Message:
0.12



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- devhelp.spec	29 Jul 2006 04:14:08 -0000	1.41
+++ devhelp.spec	29 Jul 2006 04:16:05 -0000	1.42
@@ -1,5 +1,3 @@
-%define firefox_ver 1.5.0.5
-
 Summary:             API document browser
 Name:                devhelp
 Version:             0.12
@@ -14,14 +12,14 @@
 Requires:            libgnomeui >= 2.2.0
 Requires:            gnome-vfs2 >= 2.2.0
 Requires:            libglade2 >= 2.2.0
-Requires:            firefox >= %(firefox_ver)
+Requires:            firefox >= 1.5.0.5
 BuildRequires:       desktop-file-utils >= 0.3
 
 BuildRequires:       gtk2-devel >= 2.2.0
 BuildRequires:       libgnomeui-devel >= 2.2.0
 BuildRequires:       gnome-vfs2-devel >= 2.2.0
 BuildRequires:       libglade2-devel >= 2.2.0
-BuildRequires:       firefox-devel >= %{firefox_ver}
+BuildRequires:       firefox-devel >= 1.5.0.5
 BuildRequires:       intltool
 BuildRequires:       gettext
 BuildRequires:       glib2-devel >= 2.9.5



From fedora-cvs-commits at redhat.com  Sat Jul 29 04:24:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 00:24:33 -0400
Subject: rpms/irqbalance/devel irqbalance-classes.patch, NONE,
	1.1 irqbalance.spec, 1.29, 1.30
Message-ID: <200607290424.k6T4OX7t019349@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19280

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-classes.patch 
Log Message:
add more classes

irqbalance-classes.patch:
 classify.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE irqbalance-classes.patch ---
--- irqbalance-1.12/irqbalance/classify.c~	2006-07-29 00:15:24.000000000 -0400
+++ irqbalance-1.12/irqbalance/classify.c	2006-07-29 00:20:43.000000000 -0400
@@ -57,6 +57,9 @@ char *storage_modules[] = {
 	"libata",
 	"ohci1394",
 	"sym53c8xx",
+	"ata_piix",
+	"sata",
+	"ahci",
 	0
 };
 
@@ -64,16 +67,20 @@ char *ethernet_modules[] = {
 	"eth",
 	"e100",
 	"eepro100",
-	"orinico_cs",
+	"orinoco_cs",
 	"wvlan_cs",
-	"3c5",	
+	"3c5",
 	"HiSax",
+	"ipw2",
+	"via_rhine",
+	"sis900",
 	0
 };
 
 char *gige_modules[] = {
 	"e1000",
 	"tg3",
+	"r8169",
 	0
 };
 


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- irqbalance.spec	15 Jul 2006 03:52:42 -0000	1.29
+++ irqbalance.spec	29 Jul 2006 04:24:27 -0000	1.30
@@ -12,6 +12,7 @@
 Prereq:		/sbin/chkconfig /sbin/service
 Patch1: irqbalance-pie.patch
 Patch2: irqbalance-norebalance-zeroints.patch
+Patch3: irqbalance-classes.patch
 ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
 Obsoletes:	kernel-utils
 
@@ -23,6 +24,7 @@
 %setup -q -c -a 0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +72,9 @@
 
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- identify a bunch more classes.
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com>
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 05:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 01:24:02 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2473,
	1.2474 linux-2.6-lockdep-fixes.patch, 1.12, 1.13
Message-ID: <200607290524.k6T5O2vg027209@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27082

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Log Message:
ipv6 lockdep fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2473
retrieving revision 1.2474
diff -u -r1.2473 -r1.2474
--- kernel-2.6.spec	28 Jul 2006 21:56:09 -0000	1.2473
+++ kernel-2.6.spec	29 Jul 2006 05:23:54 -0000	1.2474
@@ -1663,6 +1663,9 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- lockdep fix: ipv6
+
 * Fri Jul 28 2006 Don Zickus <dzickus at redhat.com>
 - Refreshed NFS caching patches
 - tweaked some ppc64 kdump config options

linux-2.6-lockdep-fixes.patch:
 b/include/net/ip6_route.h                     |   12 +-
 b/include/net/ipv6.h                          |    3 
 b/net/dccp/ipv6.c                             |    4 
 b/net/ipv6/af_inet6.c                         |    2 
 b/net/ipv6/inet6_connection_sock.c            |    2 
 b/net/ipv6/ip6_output.c                       |  120 +++++++++++++++++---------
 b/net/ipv6/tcp_ipv6.c                         |    4 
 b/net/ipv6/udp.c                              |    3 
 linux-2.6.17-mm6/include/net/sock.h           |   33 ++++++-
 linux-2.6.18-rc1/drivers/input/serio/libps2.c |    6 -
 linux-2.6.18-rc1/fs/inotify_user.c            |   20 +++-
 linux-2.6.18-rc1/include/linux/libps2.h       |   12 ++
 linux-2.6.18-rc1/net/socket.c                 |    8 +
 13 files changed, 169 insertions(+), 60 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-lockdep-fixes.patch	24 Jul 2006 22:22:50 -0000	1.12
+++ linux-2.6-lockdep-fixes.patch	29 Jul 2006 05:23:55 -0000	1.13
@@ -482,3 +482,391 @@
 Please read the FAQ at  http://www.tux.org/lkml/
 
 
+From davej  Sat Jul 29 00:35:14 2006
+Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1161468AbWG2Edz at vger.kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on 
+	nwo.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-101.8 required=5.0 tests=AWL,BAYES_00,
+	USER_IN_WHITELIST autolearn=ham version=3.1.3
+Envelope-to: davej at kernelslacker.org
+Delivery-date: Sat, 29 Jul 2006 05:34:29 +0100
+Received: from testure.choralone.org [194.9.77.134]
+	by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4)
+	for <davej at localhost> (single-drop); Sat, 29 Jul 2006 00:35:14 -0400 (EDT)
+Received: from vger.kernel.org ([209.132.176.167])
+	by testure.choralone.org with esmtp (Exim 4.62)
+	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S1161468AbWG2Edz at vger.kernel.org>)
+	id 1G6gWy-0002hG-HE
+	for davej at kernelslacker.org; Sat, 29 Jul 2006 05:34:29 +0100
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S1161468AbWG2Edz (ORCPT <rfc822;davej at kernelslacker.org>);
+	Sat, 29 Jul 2006 00:33:55 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1161464AbWG2Edz
+	(ORCPT <rfc822;linux-kernel-outgoing>);
+	Sat, 29 Jul 2006 00:33:55 -0400
+Received: from rhun.apana.org.au ([64.62.148.172]:63751 "EHLO
+	arnor.apana.org.au") by vger.kernel.org with ESMTP id S1161466AbWG2Edy
+	(ORCPT <rfc822;linux-kernel at vger.kernel.org>);
+	Sat, 29 Jul 2006 00:33:54 -0400
+Received: from gondolin.me.apana.org.au ([192.168.0.6])
+	by arnor.apana.org.au with esmtp (Exim 4.50 #1 (Debian))
+	id 1G6gWD-0007H2-SX; Sat, 29 Jul 2006 14:33:41 +1000
+Received: from herbert by gondolin.me.apana.org.au with local (Exim 3.36 #1 (Debian))
+	id 1G6gVx-0001px-00; Sat, 29 Jul 2006 14:33:25 +1000
+Date:	Sat, 29 Jul 2006 14:33:25 +1000
+To:	"David S. Miller" <davem at davemloft.net>,
+	YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>,
+	Matt Domsch <Matt_Domsch at dell.com>
+Cc:	linux-kernel at vger.kernel.org, netdev at vger.kernel.org
+Subject: [IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls
+Message-ID: <20060729043325.GA7035 at gondor.apana.org.au>
+References: <20060728194531.GA17744 at lists.us.dell.com>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <20060728194531.GA17744 at lists.us.dell.com>
+User-Agent: Mutt/1.5.9i
+From:	Herbert Xu <herbert at gondor.apana.org.au>
+Sender:	linux-kernel-owner at vger.kernel.org
+Precedence: bulk
+X-Mailing-List:	linux-kernel at vger.kernel.org
+Status: RO
+Content-Length: 10664
+Lines: 334
+
+On Fri, Jul 28, 2006 at 07:45:31PM +0000, Matt Domsch wrote:
+> Triggered on Fedora rawhide kernel-2.6.17-1.2462.fc6 x86_64 which is
+> based on 2.6.18rc2-git6.  IPv6 was in use at the time.
+> 
+> =================================
+> [ INFO: inconsistent lock state ]
+> ---------------------------------
+> inconsistent {softirq-on-W} -> {in-softirq-R} usage.
+> swapper/0 [HC0[0]:SC1[1]:HE1:SE0] takes:
+>  (&sk->sk_dst_lock){---?}, at: [<ffffffff80418ef3>]
+>  sk_dst_check+0x26/0x12b
+> {softirq-on-W} state was registered at:
+>   [<ffffffff802a874d>] lock_acquire+0x4a/0x69
+>   [<ffffffff802672a1>] _write_lock+0x24/0x31
+>   [<ffffffff8044a26b>] ip4_datagram_connect+0x2e1/0x350
+>   [<ffffffff80451214>] inet_dgram_connect+0x57/0x65
+>   [<ffffffff8041652a>] sys_connect+0x7d/0xa4
+>   [<ffffffff8025ff0d>] system_call+0x7d/0x83
+
+Thanks for the report.  This is actually a false positive because
+by these two paths can't intersect since one is a UDP while the other
+is TCP.
+
+However, here is a patch which should shut up the validator as well
+as removing unnecessary locking from most callers of ip6_dst_lookup.
+
+[IPV6]: Audit all ip6_dst_lookup/ip6_dst_store calls
+
+The current users of ip6_dst_lookup can be divided into two classes:
+
+1) The caller holds no locks and is in user-context (UDP).
+2) The caller does not want to lookup the dst cache at all.
+
+The second class covers everyone except UDP because most people do
+the cache lookup directly before calling ip6_dst_lookup.  This patch
+adds ip6_sk_dst_lookup for the first class.
+
+Similarly ip6_dst_store users can be divded into those that need to
+take the socket dst lock and those that don't.  This patch adds
+__ip6_dst_store for those (everyone except UDP/datagram) that don't
+need an extra lock.
+
+Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
+
+Cheers,
+-- 
+Visit Openswan at http://www.openswan.org/
+Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
+Home Page: http://gondor.apana.org.au/~herbert/
+PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
+--
+diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
+index ab29daf..96b0e66 100644
+--- a/include/net/ip6_route.h
++++ b/include/net/ip6_route.h
+@@ -139,16 +139,22 @@ extern rwlock_t rt6_lock;
+ /*
+  *	Store a destination cache entry in a socket
+  */
+-static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
+-				     struct in6_addr *daddr)
++static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
++				   struct in6_addr *daddr)
+ {
+ 	struct ipv6_pinfo *np = inet6_sk(sk);
+ 	struct rt6_info *rt = (struct rt6_info *) dst;
+ 
+-	write_lock(&sk->sk_dst_lock);
+ 	sk_setup_caps(sk, dst);
+ 	np->daddr_cache = daddr;
+ 	np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
++}
++
++static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
++				 struct in6_addr *daddr)
++{
++	write_lock(&sk->sk_dst_lock);
++	__ip6_dst_store(sk, dst, daddr);
+ 	write_unlock(&sk->sk_dst_lock);
+ }
+ 
+diff --git a/include/net/ipv6.h b/include/net/ipv6.h
+index a8fdf79..ece7e8a 100644
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -468,6 +468,9 @@ extern void			ip6_flush_pending_frames(s
+ extern int			ip6_dst_lookup(struct sock *sk,
+ 					       struct dst_entry **dst,
+ 					       struct flowi *fl);
++extern int			ip6_sk_dst_lookup(struct sock *sk,
++						  struct dst_entry **dst,
++						  struct flowi *fl);
+ 
+ /*
+  *	skb processing functions
+diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
+index 9f3d4d7..610c722 100644
+--- a/net/dccp/ipv6.c
++++ b/net/dccp/ipv6.c
+@@ -230,7 +230,7 @@ static int dccp_v6_connect(struct sock *
+ 	ipv6_addr_copy(&np->saddr, saddr);
+ 	inet->rcv_saddr = LOOPBACK4_IPV6;
+ 
+-	ip6_dst_store(sk, dst, NULL);
++	__ip6_dst_store(sk, dst, NULL);
+ 
+ 	icsk->icsk_ext_hdr_len = 0;
+ 	if (np->opt != NULL)
+@@ -863,7 +863,7 @@ static struct sock *dccp_v6_request_recv
+ 	 * comment in that function for the gory details. -acme
+ 	 */
+ 
+-	ip6_dst_store(newsk, dst, NULL);
++	__ip6_dst_store(newsk, dst, NULL);
+ 	newsk->sk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |
+ 						      NETIF_F_TSO);
+ 	newdp6 = (struct dccp6_sock *)newsk;
+diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
+index 5a0ba58..ac85e9c 100644
+--- a/net/ipv6/af_inet6.c
++++ b/net/ipv6/af_inet6.c
+@@ -658,7 +658,7 @@ int inet6_sk_rebuild_header(struct sock 
+ 			return err;
+ 		}
+ 
+-		ip6_dst_store(sk, dst, NULL);
++		__ip6_dst_store(sk, dst, NULL);
+ 	}
+ 
+ 	return 0;
+diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
+index 5c950cc..bf49107 100644
+--- a/net/ipv6/inet6_connection_sock.c
++++ b/net/ipv6/inet6_connection_sock.c
+@@ -185,7 +185,7 @@ int inet6_csk_xmit(struct sk_buff *skb, 
+ 			return err;
+ 		}
+ 
+-		ip6_dst_store(sk, dst, NULL);
++		__ip6_dst_store(sk, dst, NULL);
+ 	}
+ 
+ 	skb->dst = dst_clone(dst);
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 3bc74ce..5e74a37 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -723,48 +723,51 @@ fail:
+ 	return err;
+ }
+ 
+-int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
++static struct dst_entry *ip6_sk_dst_check(struct sock *sk,
++					  struct dst_entry *dst,
++					  struct flowi *fl)
+ {
+-	int err = 0;
++	struct ipv6_pinfo *np = inet6_sk(sk);
++	struct rt6_info *rt = (struct rt6_info *)dst;
+ 
+-	*dst = NULL;
+-	if (sk) {
+-		struct ipv6_pinfo *np = inet6_sk(sk);
+-	
+-		*dst = sk_dst_check(sk, np->dst_cookie);
+-		if (*dst) {
+-			struct rt6_info *rt = (struct rt6_info*)*dst;
+-	
+-			/* Yes, checking route validity in not connected
+-			 * case is not very simple. Take into account,
+-			 * that we do not support routing by source, TOS,
+-			 * and MSG_DONTROUTE 		--ANK (980726)
+-			 *
+-			 * 1. If route was host route, check that
+-			 *    cached destination is current.
+-			 *    If it is network route, we still may
+-			 *    check its validity using saved pointer
+-			 *    to the last used address: daddr_cache.
+-			 *    We do not want to save whole address now,
+-			 *    (because main consumer of this service
+-			 *    is tcp, which has not this problem),
+-			 *    so that the last trick works only on connected
+-			 *    sockets.
+-			 * 2. oif also should be the same.
+-			 */
+-			if (((rt->rt6i_dst.plen != 128 ||
+-			      !ipv6_addr_equal(&fl->fl6_dst,
+-					       &rt->rt6i_dst.addr))
+-			     && (np->daddr_cache == NULL ||
+-				 !ipv6_addr_equal(&fl->fl6_dst,
+-						  np->daddr_cache)))
+-			    || (fl->oif && fl->oif != (*dst)->dev->ifindex)) {
+-				dst_release(*dst);
+-				*dst = NULL;
+-			}
+-		}
++	if (!dst)
++		goto out;
++
++	/* Yes, checking route validity in not connected
++	 * case is not very simple. Take into account,
++	 * that we do not support routing by source, TOS,
++	 * and MSG_DONTROUTE 		--ANK (980726)
++	 *
++	 * 1. If route was host route, check that
++	 *    cached destination is current.
++	 *    If it is network route, we still may
++	 *    check its validity using saved pointer
++	 *    to the last used address: daddr_cache.
++	 *    We do not want to save whole address now,
++	 *    (because main consumer of this service
++	 *    is tcp, which has not this problem),
++	 *    so that the last trick works only on connected
++	 *    sockets.
++	 * 2. oif also should be the same.
++	 */
++	if (((rt->rt6i_dst.plen != 128 ||
++	      !ipv6_addr_equal(&fl->fl6_dst, &rt->rt6i_dst.addr))
++	     && (np->daddr_cache == NULL ||
++		 !ipv6_addr_equal(&fl->fl6_dst, np->daddr_cache)))
++	    || (fl->oif && fl->oif != dst->dev->ifindex)) {
++		dst_release(dst);
++		dst = NULL;
+ 	}
+ 
++out:
++	return dst;
++}
++
++static int ip6_dst_lookup_tail(struct sock *sk,
++			       struct dst_entry **dst, struct flowi *fl)
++{
++	int err;
++
+ 	if (*dst == NULL)
+ 		*dst = ip6_route_output(sk, fl);
+ 
+@@ -773,7 +776,6 @@ int ip6_dst_lookup(struct sock *sk, stru
+ 
+ 	if (ipv6_addr_any(&fl->fl6_src)) {
+ 		err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src);
+-
+ 		if (err)
+ 			goto out_err_release;
+ 	}
+@@ -786,8 +788,48 @@ out_err_release:
+ 	return err;
+ }
+ 
++/**
++ *	ip6_dst_lookup - perform route lookup on flow
++ *	@sk: socket which provides route info
++ *	@dst: pointer to dst_entry * for result
++ *	@fl: flow to lookup
++ *
++ *	This function performs a route lookup on the given flow.
++ *
++ *	It returns zero on success, or a standard errno code on error.
++ */
++int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
++{
++	*dst = NULL;
++	return ip6_dst_lookup_tail(sk, dst, fl);
++}
+ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
+ 
++/**
++ *	ip6_sk_dst_lookup - perform socket cached route lookup on flow
++ *	@sk: socket which provides the dst cache and route info
++ *	@dst: pointer to dst_entry * for result
++ *	@fl: flow to lookup
++ *
++ *	This function performs a route lookup on the given flow with the
++ *	possibility of using the cached route in the socket if it is valid.
++ *	It will take the socket dst lock when operating on the dst cache.
++ *	As a result, this function can only be used in process context.
++ *
++ *	It returns zero on success, or a standard errno code on error.
++ */
++int ip6_sk_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
++{
++	*dst = NULL;
++	if (sk) {
++		*dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
++		*dst = ip6_sk_dst_check(sk, *dst, fl);
++	}
++
++	return ip6_dst_lookup_tail(sk, dst, fl);
++}
++EXPORT_SYMBOL_GPL(ip6_sk_dst_lookup);
++
+ static inline int ip6_ufo_append_data(struct sock *sk,
+ 			int getfrag(void *from, char *to, int offset, int len,
+ 			int odd, struct sk_buff *skb),
+diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
+index 923989d..b76fd7f 100644
+--- a/net/ipv6/tcp_ipv6.c
++++ b/net/ipv6/tcp_ipv6.c
+@@ -270,7 +270,7 @@ static int tcp_v6_connect(struct sock *s
+ 	inet->rcv_saddr = LOOPBACK4_IPV6;
+ 
+ 	sk->sk_gso_type = SKB_GSO_TCPV6;
+-	ip6_dst_store(sk, dst, NULL);
++	__ip6_dst_store(sk, dst, NULL);
+ 
+ 	icsk->icsk_ext_hdr_len = 0;
+ 	if (np->opt)
+@@ -947,7 +947,7 @@ static struct sock * tcp_v6_syn_recv_soc
+ 	 */
+ 
+ 	sk->sk_gso_type = SKB_GSO_TCPV6;
+-	ip6_dst_store(newsk, dst, NULL);
++	__ip6_dst_store(newsk, dst, NULL);
+ 
+ 	newtcp6sk = (struct tcp6_sock *)newsk;
+ 	inet_sk(newsk)->pinet6 = &newtcp6sk->inet6;
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
+index ccc57f4..3d54f24 100644
+--- a/net/ipv6/udp.c
++++ b/net/ipv6/udp.c
+@@ -782,7 +782,7 @@ do_udp_sendmsg:
+ 		connected = 0;
+ 	}
+ 
+-	err = ip6_dst_lookup(sk, &dst, fl);
++	err = ip6_sk_dst_lookup(sk, &dst, fl);
+ 	if (err)
+ 		goto out;
+ 	if (final_p)
+-
+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/
+



From fedora-cvs-commits at redhat.com  Sat Jul 29 06:59:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 02:59:17 -0400
Subject: rpms/cpuspeed/devel cpuspeed.init, 1.12, 1.13 cpuspeed.spec, 1.39,
	1.40
Message-ID: <200607290659.k6T6xHCU005440@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5426

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
- Don't try to load acpi-cpufreq on non-ACPI machines. (#196446)



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpuspeed.init	26 Jul 2006 04:09:51 -0000	1.12
+++ cpuspeed.init	29 Jul 2006 06:59:15 -0000	1.13
@@ -27,8 +27,13 @@
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else
-				# use ACPI as a fallback
-				/sbin/modprobe acpi-cpufreq
+				if [ -d /proc/acpi ]; then
+					# use ACPI as a fallback
+					/sbin/modprobe acpi-cpufreq
+				else
+					# This is a no-ACPI machine. Just exit.
+					return 0
+				fi
 			fi
 		done
 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cpuspeed.spec	26 Jul 2006 04:09:51 -0000	1.39
+++ cpuspeed.spec	29 Jul 2006 06:59:15 -0000	1.40
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- Don't try to load acpi-cpufreq on non-ACPI machines. (#196446)
+
 * Wed Jul 26 2006 Dave Jones <davej at redhat.com>
 - Fix up retval & /var/lock/subsys/cpuspeed handling in initscript.
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 07:13:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 03:13:43 -0400
Subject: rpms/evolution/devel evolution-2.7.90-fix-crash-on-paste.patch, NONE,
	1.1 evolution.spec, 1.169, 1.170
Message-ID: <200607290713.k6T7Dhbu016704@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16629

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.7.90-fix-crash-on-paste.patch 
Log Message:
- Add patch for RH bug #167157.


evolution-2.7.90-fix-crash-on-paste.patch:
 e-calendar-view.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE evolution-2.7.90-fix-crash-on-paste.patch ---
--- evolution-2.7.90/calendar/gui/e-calendar-view.c.fix-crash-on-paste	2006-07-29 03:07:18.000000000 -0400
+++ evolution-2.7.90/calendar/gui/e-calendar-view.c	2006-07-29 03:07:49.000000000 -0400
@@ -376,10 +376,8 @@
 	/* FIXME Error handling */
 	uid = NULL;
 	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
-		if (uid) {
+		if (uid)
 			e_cal_component_set_uid (comp, uid);
-			g_free (uid);
-		}
 
 		if (itip_organizer_is_user (comp, client) &&
 		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- evolution.spec	27 Jul 2006 21:35:17 -0000	1.169
+++ evolution.spec	29 Jul 2006 07:13:40 -0000	1.170
@@ -48,7 +48,7 @@
 
 Name: evolution
 Version: 2.7.90
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -112,6 +112,9 @@
 # RH bug #178295 / Gnome.org bug #348638
 Patch29: evolution-2.7.90-deleting-preedit-buffer.patch
 
+# RH bug #167157 / Gnome.org bug #334464
+Patch30: evolution-2.7.90-fix-crash-on-paste.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -244,6 +247,7 @@
 %patch27 -p1 -b .replicated-cjk-input
 %patch28 -p1 -b .submit-bug-report
 %patch29 -p1 -b .deleting-preedit-buffer
+%patch30 -p1 -b .fix-crash-on-paste
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -634,6 +638,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Jul 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-4
+- Add patch for RH bug #167157.
+
 * Thu Jul 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-3
 - Add Requires for evolution-data-server >= 1.7.90
 - Add BuildRequires for evolution-data-server-devel >= 1.7.90



From fedora-cvs-commits at redhat.com  Sat Jul 29 07:21:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 03:21:27 -0400
Subject: rpms/evolution/FC-5 evolution-2.6.2-fix-crash-on-paste.patch, NONE,
	1.1 evolution.spec, 1.142, 1.143
Message-ID: <200607290721.k6T7LRYd001646@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1479

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.6.2-fix-crash-on-paste.patch 
Log Message:
- Add patch for RH bug #167157.


evolution-2.6.2-fix-crash-on-paste.patch:
 e-calendar-view.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE evolution-2.6.2-fix-crash-on-paste.patch ---
--- evolution-2.6.2/calendar/gui/e-calendar-view.c.fix-crash-on-paste	2006-07-29 03:16:34.000000000 -0400
+++ evolution-2.6.2/calendar/gui/e-calendar-view.c	2006-07-29 03:16:58.000000000 -0400
@@ -376,10 +376,8 @@
 	/* FIXME Error handling */
 	uid = NULL;
 	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
-		if (uid) {
+		if (uid)
 			e_cal_component_set_uid (comp, uid);
-			g_free (uid);
-		}
 
 		if (itip_organizer_is_user (comp, client) &&
 		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- evolution.spec	7 Jun 2006 21:39:17 -0000	1.142
+++ evolution.spec	29 Jul 2006 07:21:24 -0000	1.143
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.6
+Release: 1.fc5.7
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -102,6 +102,9 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
+# RH bug #167157 / Gnome.org bug #334464
+Patch810: evolution-2.6.2-fix-crash-on-paste.patch
+
 # Removed to placate the build system.  Feel free to try to re-add it, but,
 # wash your dog first.
 ExcludeArch: s390 s390x
@@ -250,6 +253,7 @@
 %patch806 -p1 -b .notification-cleanups
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch809 -p1 -b .prototypes
+%patch810 -p1 -b .fix-crash-on-paste
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -639,6 +643,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Jul 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.6.2-1.fc5.7
+- Add patch for RH bug #167157.
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.2-1.fc5.6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 07:32:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 03:32:13 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc2-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.499, 1.500 kernel-2.6.spec, 1.2474,
	1.2475 sources, 1.463, 1.464 upstream, 1.405,
	1.406 linux-2.6-futex-death-fix.patch, 1.2,
	NONE linux-2.6-pifutex-crash.patch, 1.1,
	NONE patch-2.6.18-rc2-git6.bz2.sign, 1.1, NONE
Message-ID: <200607290732.k6T7WDLT005253@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5169

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc2-git7.bz2.sign 
Removed Files:
	linux-2.6-futex-death-fix.patch linux-2.6-pifutex-crash.patch 
	patch-2.6.18-rc2-git6.bz2.sign 
Log Message:
git7


--- NEW FILE patch-2.6.18-rc2-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEywgnyGugalF9Dw4RArPuAJ4osKjrgbTjiGfSU9MeIcJ56kdkIACeJMVA
tzCGieoAwpsxAULTpm98894=
=WLAr
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- .cvsignore	27 Jul 2006 00:18:27 -0000	1.499
+++ .cvsignore	29 Jul 2006 07:32:10 -0000	1.500
@@ -4,4 +4,4 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
 xen-10730.tar.bz2
-patch-2.6.18-rc2-git6.bz2
+patch-2.6.18-rc2-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2474
retrieving revision 1.2475
diff -u -r1.2474 -r1.2475
--- kernel-2.6.spec	29 Jul 2006 05:23:54 -0000	1.2474
+++ kernel-2.6.spec	29 Jul 2006 07:32:11 -0000	1.2475
@@ -265,7 +265,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git6.bz2
+Patch2: patch-2.6.18-rc2-git7.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -406,7 +406,6 @@
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-radeon-backlight.patch
 Patch1640: linux-2.6-autofs-revalidate-lookup.patch
-Patch1650: linux-2.6-pifutex-crash.patch
 Patch1670: linux-2.6-softcursor-persistent-alloc.patch
 Patch1680: linux-2.6-usb-unusual-devices.patch
 Patch1700: linux-2.6-w1-hush-debug.patch
@@ -416,7 +415,6 @@
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-futex-death-fix.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -949,8 +947,6 @@
 %patch1630 -p1
 # Enable autofs4 to return fail for revalidate during lookup
 %patch1640 -p1
-# Fix PI Futex crash
-%patch1650 -p1
 # Use persistent allocation in softcursor
 %patch1670 -p1
 # Add some USB devices to the unusual quirk list.
@@ -969,8 +965,6 @@
 #%patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# fix robust PI-futexes to be properly unlocked on unexpected exit.
-%patch1780 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1665,6 +1659,7 @@
 %changelog
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - lockdep fix: ipv6
+- 2.6.18rc2-git7
 
 * Fri Jul 28 2006 Don Zickus <dzickus at redhat.com>
 - Refreshed NFS caching patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- sources	27 Jul 2006 00:18:27 -0000	1.463
+++ sources	29 Jul 2006 07:32:11 -0000	1.464
@@ -1,4 +1,4 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
-3b125d18adc57e55378e04393d4bbea6  patch-2.6.18-rc2-git6.bz2
+3fbf1904a9daa1b918e7b22212930233  patch-2.6.18-rc2-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- upstream	27 Jul 2006 00:18:27 -0000	1.405
+++ upstream	29 Jul 2006 07:32:11 -0000	1.406
@@ -1,3 +1,3 @@
 linux-2.6.17.tar.bz2
 patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git6.bz2
+patch-2.6.18-rc2-git7.bz2


--- linux-2.6-futex-death-fix.patch DELETED ---


--- linux-2.6-pifutex-crash.patch DELETED ---


--- patch-2.6.18-rc2-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 29 07:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 03:39:45 -0400
Subject: rpms/kernel/devel linux-2.6-console-suspend.patch,1.1,NONE
Message-ID: <200607290739.k6T7djlM006995@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6840

Removed Files:
	linux-2.6-console-suspend.patch 
Log Message:
dead patch


--- linux-2.6-console-suspend.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 29 08:32:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 04:32:47 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.42,
	1.43 selinux-policy.spec, 1.238, 1.239
Message-ID: <200607290832.k6T8Wlo8020470@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20407

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Sat Jul 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-15
- Fixes for xen


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    2 
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |    6 -
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    2 
 modules/system/locallogin.te       |    1 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    6 -
 modules/system/lvm.te              |    3 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |    8 -
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   40 +++---
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   14 +-
 91 files changed, 952 insertions(+), 247 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- policy-20060608.patch	28 Jul 2006 19:13:13 -0000	1.42
+++ policy-20060608.patch	29 Jul 2006 08:32:43 -0000	1.43
@@ -2784,7 +2784,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.3.3/policy/modules/system/xen.te
 --- nsaserefpolicy/policy/modules/system/xen.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-28 13:27:17.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/xen.te	2006-07-29 04:30:00.000000000 -0400
 @@ -70,6 +70,8 @@
  
  allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config net_raw };
@@ -2794,7 +2794,32 @@
  # internal communication is often done using fifo and unix sockets.
  allow xend_t self:fifo_file rw_file_perms;
  allow xend_t self:unix_stream_socket create_stream_socket_perms;
-@@ -171,7 +173,7 @@
+@@ -130,6 +132,7 @@
+ corenet_tcp_bind_soundd_port(xend_t)
+ corenet_sendrecv_xen_server_packets(xend_t)
+ corenet_sendrecv_soundd_server_packets(xend_t)
++corenet_tcp_bind_generic_port(xend_t)
+ 
+ dev_read_urand(xend_t)
+ dev_manage_xen(xend_t)
+@@ -144,13 +147,16 @@
+ files_read_kernel_img(xend_t)
+ files_manage_etc_runtime_files(xend_t)
+ files_etc_filetrans_etc_runtime(xend_t,file)
++files_read_usr_files(xend_t)
+ 
+ storage_raw_read_fixed_disk(xend_t)
+ 
+ term_dontaudit_getattr_all_user_ptys(xend_t)
+ term_dontaudit_use_generic_ptys(xend_t)
++term_use_ptmx(xend_t)
+ 
+ init_use_fds(xend_t)
++init_use_script_ptys(xend_t)
+ 
+ libs_use_ld_so(xend_t)
+ libs_use_shared_libs(xend_t)
+@@ -171,7 +177,7 @@
  netutils_domtrans(xend_t)
  
  optional_policy(`
@@ -2803,3 +2828,25 @@
  ')
  
  ########################################
+@@ -200,6 +206,7 @@
+ term_use_console(xenconsoled_t)
+ 
+ init_use_fds(xenconsoled_t)
++init_use_script_ptys(xenconsoled_t)
+ 
+ libs_use_ld_so(xenconsoled_t)
+ libs_use_shared_libs(xenconsoled_t)
+@@ -238,10 +245,11 @@
+ dev_filetrans_xen(xenstored_t)
+ dev_rw_xen(xenstored_t)
+ 
+-term_dontaudit_use_generic_ptys(xenstored_t)
+-term_dontaudit_use_console(xenconsoled_t)
++term_use_generic_ptys(xenstored_t)
++term_use_console(xenconsoled_t)
+ 
+ init_use_fds(xenstored_t)
++init_use_script_ptys(xenstored_t)
+ 
+ libs_use_ld_so(xenstored_t)
+ libs_use_shared_libs(xenstored_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- selinux-policy.spec	28 Jul 2006 19:13:13 -0000	1.238
+++ selinux-policy.spec	29 Jul 2006 08:32:43 -0000	1.239
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-15
+- Fixes for xen
+
 * Fri Jul 28 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-14
 - Allow setroubleshootd to send mail
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 12:58:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 08:58:11 -0400
Subject: rpms/openoffice.org/devel workspace.configure18.patch, NONE,
	1.1 openoffice.org.spec, 1.803, 1.804
Message-ID: <200607291258.k6TCwBpJ029937@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29877

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.configure18.patch 
Log Message:
add workspace.configure18.patch for firefox-devel

workspace.configure18.patch:
 tools/config_office/configure.in                |   30 +++++++++++++++---------
 tools/config_office/set_soenv.in                |    3 ++
 util/extensions/source/plugin/util/makefile.pmk |    2 -
 xml/xmlsecurity/util/makefile.mk                |    9 +++++++
 4 files changed, 32 insertions(+), 12 deletions(-)

--- NEW FILE workspace.configure18.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.169 tools/config_office/configure.in:1.166.2.18
--- tools/config_office/configure.in:1.169	Mon Jul 10 12:00:12 2006
+++ tools/config_office/configure.in	Sat Jul 15 12:27:33 2006
@@ -3170,29 +3187,36 @@
 dnl Check for system mozilla
 dnl ===================================================================
 AC_MSG_CHECKING([which mozilla to use])
-if test -n "$with_system_mozilla"; then
+if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_MOZILLA=YES
-    AC_MSG_CHECKING([whether to use Mozilla or Firefox])
+    AC_MSG_CHECKING([which Mozilla flavour to use])
     if test -n "$with_firefox" && test "$with_firefox" != "no"; then
-      moz_flavour=firefox
-     else
-      moz_flavour=mozilla
+      MOZ_FLAVOUR=firefox
+    elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+      MOZ_FLAVOUR=xulrunner
+    else
+      MOZ_FLAVOUR=mozilla
     fi
-    tmp=`echo $moz_flavour | $PERL -e 'print ucfirst(<STDIN>);'`
+    tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
     AC_MSG_RESULT($tmp)
 
-    PKG_CHECK_MODULES( MOZILLAXPCOM, $moz_flavour-xpcom )
+    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
 
     if $PKG_CONFIG --exists nspr ; then
       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+      NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
+      AC_SUBST(NSPR_LIB)
     else
-      PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
+      PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
     fi
 
     PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
     if test -z "$STANDALONENSS"; then
-        PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )
+        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
+    else
+        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+        AC_SUBST(NSS_LIB)
     fi
 
     save_CPPFLAGS="$CPPFLAGS"
@@ -3208,8 +3232,8 @@
     CPPFLAGS="$save_CPPFLAGS"
     LIBS="$save_LIBS"
 
-    MOZ_INC=`$PKG_CONFIG --variable=includedir $moz_flavour-xpcom`
-    MOZ_LIB=`$PKG_CONFIG --variable=libdir $moz_flavour-xpcom`
+    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
       AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
@@ -3325,6 +3349,7 @@
 
 fi
 AC_SUBST(SYSTEM_MOZILLA)
+AC_SUBST(MOZ_FLAVOUR)
 AC_SUBST(MOZ_INC)
 AC_SUBST(MOZ_LIB)
 AC_SUBST(MOZ_LIB_XPCOM)
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.107 tools/config_office/set_soenv.in:1.105.2.7
--- tools/config_office/set_soenv.in:1.107	Wed Jul  5 15:32:39 2006
+++ tools/config_office/set_soenv.in	Fri Jul 14 09:17:47 2006
@@ -1695,6 +1691,9 @@
 ToFile( "WITH_OPENLDAP",     "@WITH_OPENLDAP@",    "e" );
 ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
 ToFile( "SYSTEM_MOZILLA",    "@SYSTEM_MOZILLA@",   "e" );
+ToFile( "MOZ_FLAVOUR",       "@MOZ_FLAVOUR@",      "e" );
+ToFile( "NSPR_LIB",          "@NSPR_LIB@",         "e" );
+ToFile( "NSS_LIB",           "@NSS_LIB@",          "e" );
 ToFile( "MOZ_INC",           "@MOZ_INC@",          "e" );
 ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
 ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
Index: util/extensions/source/plugin/util/makefile.pmk
diff -u util/extensions/source/plugin/util/makefile.pmk:1.4 util/extensions/source/plugin/util/makefile.pmk:1.4.98.1
--- util/extensions/source/plugin/util/makefile.pmk:1.4	Wed Dec 21 03:14:30 2005
+++ util/extensions/source/plugin/util/makefile.pmk	Sun Jun 11 07:40:45 2006
@@ -41,6 +41,6 @@
 
 .IF "$(SYSTEM_MOZILLA)" == "YES"
 CFLAGS+=-DSYSTEM_MOZILLA
-PKGCONFIG_MODULES=mozilla-plugin
+PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin
 .INCLUDE : pkg_config.mk
 .ENDIF
Index: xml/xmlsecurity/util/makefile.mk
diff -u xml/xmlsecurity/util/makefile.mk:1.18 xml/xmlsecurity/util/makefile.mk:1.18.70.1
--- xml/xmlsecurity/util/makefile.mk:1.18	Fri Sep  9 10:46:21 2005
+++ xml/xmlsecurity/util/makefile.mk	Sun Jun 11 07:25:30 2006
@@ -108,6 +108,15 @@
 	$(CPPUHELPERLIB)	\
 	$(XMLOFFLIB)
 
+.IF "$(SYSTEM_MOZILLA)" == "YES"
+.IF "$(NSPR_LIB)" != ""
+SHL2STDLIBS += $(NSPR_LIB)
+.ENDIF
+.IF "$(NSS_LIB)" != ""
+SHL2STDLIBS += $(NSS_LIB)
+.ENDIF
+.ENDIF
+
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 SHL2STDLIBS+= $(MSCRYPTOLIBS)
 .ELSE


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- openoffice.org.spec	28 Jul 2006 16:14:51 -0000	1.803
+++ openoffice.org.spec	29 Jul 2006 12:58:08 -0000	1.804
@@ -126,6 +126,7 @@
 Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
 Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
 Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch63: workspace.configure18.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -919,6 +920,7 @@
 %patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
 %patch61 -p1 -b .ooo65081.sw.layout.patch
 %patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch63 -p1 -b .workspace.configure18.patch
 
 tar xzf %{SOURCE1}
 
@@ -3504,8 +3506,9 @@
 - drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
 - drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
 - require dejavu-lgc-fonts, Greek coverage problems begone
-- move to firefox-devel instead of mozilla-devel, --with-firefox
 - rh#200512# South African translations
+- move to firefox-devel instead of mozilla-devel, --with-firefox
+	+ add workspace.configure18.patch
 
 * Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN



From fedora-cvs-commits at redhat.com  Sat Jul 29 14:43:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 10:43:44 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.42,1.43
Message-ID: <200607291443.k6TEhirT007057@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7003

Modified Files:
	devhelp.spec 
Log Message:
fix file lists



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- devhelp.spec	29 Jul 2006 04:16:05 -0000	1.42
+++ devhelp.spec	29 Jul 2006 14:43:41 -0000	1.43
@@ -86,9 +86,6 @@
 
 %{_datadir}/applications/*.desktop
 %{_datadir}/devhelp
-%{_datadir}/pixmaps/*
-%{_datadir}/mime-info/devhelp.mime
-%{_datadir}/mime-info/devhelp.keys
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %files devel



From fedora-cvs-commits at redhat.com  Sat Jul 29 14:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 10:53:51 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.43,1.44
Message-ID: <200607291453.k6TErpcN002815@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2802

Modified Files:
	devhelp.spec 
Log Message:
fix file lists



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- devhelp.spec	29 Jul 2006 14:43:41 -0000	1.43
+++ devhelp.spec	29 Jul 2006 14:53:48 -0000	1.44
@@ -65,6 +65,8 @@
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 
+rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+
 %find_lang %name
 
 %clean
@@ -72,10 +74,17 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="devhelp.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null
+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
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -87,6 +96,9 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/devhelp
 %{_sysconfdir}/gconf/schemas/*.schemas
+%{_libdir}/gedit-2/plugins/devhelp
+%{_datadir}/icons/hicolor/48x48/apps/devhelp.png
+%{_datadir}/icons/hicolor/scalable/apps/devhelp.svg
 
 %files devel
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Sat Jul 29 15:04:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 11:04:44 -0400
Subject: rpms/devhelp/devel devhelp.spec,1.44,1.45
Message-ID: <200607291504.k6TF4iQW002983@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2970

Modified Files:
	devhelp.spec 
Log Message:
fix file lists



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- devhelp.spec	29 Jul 2006 14:53:48 -0000	1.44
+++ devhelp.spec	29 Jul 2006 15:04:41 -0000	1.45
@@ -96,10 +96,12 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/devhelp
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_libdir}/gedit-2/plugins/devhelp
 %{_datadir}/icons/hicolor/48x48/apps/devhelp.png
 %{_datadir}/icons/hicolor/scalable/apps/devhelp.svg
 
+%{_libdir}/gedit-2/plugins/devhelp
+%{_libdir}/gedit-2/plugins/devhelp.gedit-plugin
+
 %files devel
 %defattr(-,root,root)
 %{_prefix}/include/devhelp-1.0



From fedora-cvs-commits at redhat.com  Sat Jul 29 17:41:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 13:41:08 -0400
Subject: rpms/kernel/FC-4 linux-2.6-scsi-noisy-ioctl.patch, NONE,
	1.1 kernel-2.6.spec, 1.1666, 1.1667
Message-ID: <200607291741.k6THf85a018444@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18372

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-scsi-noisy-ioctl.patch 
Log Message:
* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
- Silence noisy SCSI ioctl. (#200638)


linux-2.6-scsi-noisy-ioctl.patch:
 scsi_ioctl.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE linux-2.6-scsi-noisy-ioctl.patch ---
--- linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c~	2006-07-29 13:38:07.000000000 -0400
+++ linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c	2006-07-29 13:38:52.000000000 -0400
@@ -110,11 +110,8 @@ static int ioctl_internal_command(struct
 				       sshdr.asc, sshdr.ascq);
 			break;
 		case NOT_READY:	/* This happens if there is no disc in drive */
-			if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) {
-				printk(KERN_INFO "Device not ready. Make sure"
-				       " there is a disc in the drive.\n");
+			if (sdev->removable)
 				break;
-			}
 		case UNIT_ATTENTION:
 			if (sdev->removable) {
 				sdev->changed = 1;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- kernel-2.6.spec	29 Jul 2006 02:58:44 -0000	1.1666
+++ kernel-2.6.spec	29 Jul 2006 17:41:05 -0000	1.1667
@@ -285,6 +285,7 @@
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
+Patch1104: linux-2.6-scsi-noisy-ioctl.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -598,6 +599,8 @@
 # iSCSI driver update that can be dropped when kernel is rebased
 # against a kernel that has the SCSI updates for 2.6.18
 %patch1103 -p1
+# Silence noisy SCSI ioctl.
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1076,6 +1079,9 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- Silence noisy SCSI ioctl. (#200638)
+
 * Fri Jul 28 2006 Dave Jones <davej at redhat.com> [2.6.17-1.2144_FC4]
 - 2.6.17.7
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 17:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 13:43:55 -0400
Subject: rpms/kernel/FC-5 linux-2.6-scsi-noisy-ioctl.patch, NONE,
	1.1 patch-2.6.17.7.bz2.sign, NONE, 1.1 .cvsignore, 1.410,
	1.411 kernel-2.6.spec, 1.2163, 1.2164 sources, 1.351,
	1.352 upstream, 1.320, 1.321 linux-2.6-powernow-k7-smp.patch,
	1.1, NONE patch-2.6.17.6.bz2.sign, 1.1, NONE
Message-ID: <200607291743.k6THhtov019521@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19489

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-scsi-noisy-ioctl.patch patch-2.6.17.7.bz2.sign 
Removed Files:
	linux-2.6-powernow-k7-smp.patch patch-2.6.17.6.bz2.sign 
Log Message:
* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
- Silence noisy SCSI ioctl. (#200638)


linux-2.6-scsi-noisy-ioctl.patch:
 scsi_ioctl.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE linux-2.6-scsi-noisy-ioctl.patch ---
--- linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c~	2006-07-29 13:38:07.000000000 -0400
+++ linux-2.6.17.noarch/drivers/scsi/scsi_ioctl.c	2006-07-29 13:38:52.000000000 -0400
@@ -110,11 +110,8 @@ static int ioctl_internal_command(struct
 				       sshdr.asc, sshdr.ascq);
 			break;
 		case NOT_READY:	/* This happens if there is no disc in drive */
-			if (sdev->removable && (cmd[0] != TEST_UNIT_READY)) {
-				printk(KERN_INFO "Device not ready. Make sure"
-				       " there is a disc in the drive.\n");
+			if (sdev->removable)
 				break;
-			}
 		case UNIT_ATTENTION:
 			if (sdev->removable) {
 				sdev->changed = 1;


--- NEW FILE patch-2.6.17.7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBExZPlyGugalF9Dw4RAnpEAJ9FQAEaJdFajC/Dg/ObCOB1lZfGOACaAqYS
Jwp3QExOrl/EazZt0O/b8jU=
=zeJg
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- .cvsignore	15 Jul 2006 19:57:53 -0000	1.410
+++ .cvsignore	29 Jul 2006 17:43:53 -0000	1.411
@@ -3,4 +3,4 @@
 kernel-2.6.17
 linux-2.6.17.tar.bz2
 xen-20060708.tar.bz2
-patch-2.6.17.6.bz2
+patch-2.6.17.7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2163
retrieving revision 1.2164
diff -u -r1.2163 -r1.2164
--- kernel-2.6.spec	27 Jul 2006 05:09:37 -0000	1.2163
+++ kernel-2.6.spec	29 Jul 2006 17:43:53 -0000	1.2164
@@ -231,7 +231,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.17.6.bz2
+Patch1: patch-2.6.17.7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -327,6 +327,7 @@
 # SCSI bits.
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1103: linux-2.6-iscsi-update-to-2-6-18-upstream.patch
+Patch1104: linux-2.6-scsi-noisy-ioctl.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -358,7 +359,6 @@
 Patch1750: linux-2.6-serial-resume.patch
 Patch1760: linux-2.6-suspend-slab-warnings.patch
 Patch1770: linux-2.6-optimise-spinlock-debug.patch
-Patch1780: linux-2.6-powernow-k7-smp.patch
 Patch1790: linux-2.6-console-suspend.patch
 
 # SELinux/audit patches.
@@ -864,6 +864,8 @@
 # iSCSI driver update that can be dropped when kernel is rebased
 # against a kernel that has the SCSI updates for 2.6.18
 %patch1103 -p1
+# Silence noisy SCSI ioctl.
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -922,8 +924,6 @@
 %patch1760 -p1
 # Speed up spinlock debug.
 %patch1770 -p1
-# Fix up powernow-k7 to work on SMP kernels.
-%patch1780 -p1
 # Console fixes for suspend/resume
 %patch1790 -p1
 
@@ -1550,6 +1550,12 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- Silence noisy SCSI ioctl. (#200638)
+
+* Fri Jul 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.17.7
+
 * Thu Jul 27 2006 Rik van Riel <riel at redhat.com>
 - reduce hypervisor stack use with -O2, this really fixes bug (#198932)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- sources	15 Jul 2006 19:57:53 -0000	1.351
+++ sources	29 Jul 2006 17:43:53 -0000	1.352
@@ -1,3 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
 5f0d888de4286f08e5661e81b95c69a8  xen-20060708.tar.bz2
-d8598f06ed1ce41b4ea51d9eb7ed4277  patch-2.6.17.6.bz2
+f2c255cdf482ba589151f5da03fed418  patch-2.6.17.7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- upstream	15 Jul 2006 19:57:53 -0000	1.320
+++ upstream	29 Jul 2006 17:43:53 -0000	1.321
@@ -1,2 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.17.6.bz2
+patch-2.6.17.7.bz2


--- linux-2.6-powernow-k7-smp.patch DELETED ---


--- patch-2.6.17.6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Jul 29 18:20:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 14:20:12 -0400
Subject: rpms/kernel/FC-5/configs config-generic,1.171,1.172
Message-ID: <200607291820.k6TIKCRu028031@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv27639/configs

Modified Files:
	config-generic 
Log Message:
rediff xen


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- config-generic	26 Jul 2006 03:01:18 -0000	1.171
+++ config-generic	29 Jul 2006 18:20:09 -0000	1.172
@@ -1995,6 +1995,7 @@
 CONFIG_SND_AU8830=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDSPM=m



From fedora-cvs-commits at redhat.com  Sat Jul 29 18:20:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 14:20:12 -0400
Subject: rpms/kernel/FC-5 linux-2.6-xen.patch,1.17,1.18
Message-ID: <200607291820.k6TIKCOS028021@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27639

Modified Files:
	linux-2.6-xen.patch 
Log Message:
rediff xen

linux-2.6-xen.patch:
 Documentation/networking/netdevices.txt             |    8 
 arch/i386/Kconfig                                   |   92 
 arch/i386/Kconfig.cpu                               |    2 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   22 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1167 ++++++++
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |   10 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  732 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        |  903 ++++++
 arch/i386/kernel/entry.S                            |   10 
 arch/i386/kernel/fixup.c                            |   86 
 arch/i386/kernel/head-xen.S                         |  181 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2751 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  306 ++
 arch/i386/kernel/irq.c                              |    4 
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  148 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  344 ++
 arch/i386/kernel/process-xen.c                      |  812 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  614 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |  102 
 arch/i386/kernel/time-xen.c                         | 1109 ++++++++
 arch/i386/kernel/traps-xen.c                        | 1136 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |   49 
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  734 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  453 +++
 arch/i386/mm/init-xen.c                             |  850 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  694 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  542 +++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   18 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  376 --
 arch/ia64/kernel/gate.lds.S                         |   96 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   61 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  784 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  883 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   24 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   60 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  726 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   19 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  198 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  753 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1141 ++++++++
 arch/x86_64/kernel/entry.S                          |    2 
 arch/x86_64/kernel/genapic-xen.c                    |  144 +
 arch/x86_64/kernel/genapic_xen.c                    |  162 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  159 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2232 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  163 +
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  791 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1710 ++++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  596 ++++
 arch/x86_64/kernel/smp.c                            |    4 
 arch/x86_64/kernel/traps-xen.c                      | 1035 +++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/x8664_ksyms-xen.c                |  155 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  690 +++++
 arch/x86_64/mm/init-xen.c                           | 1202 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c      |    6 
 drivers/media/dvb/dvb-core/dvb_net.c                |    4 
 drivers/net/8139cp.c                                |    2 
 drivers/net/bnx2.c                                  |    8 
 drivers/net/bonding/bond_main.c                     |    9 
 drivers/net/chelsio/sge.c                           |    4 
 drivers/net/e1000/e1000_main.c                      |   10 
 drivers/net/forcedeth.c                             |   26 
 drivers/net/hamradio/6pack.c                        |    8 
 drivers/net/hamradio/mkiss.c                        |    8 
 drivers/net/ifb.c                                   |   10 
 drivers/net/irda/vlsi_ir.c                          |    2 
 drivers/net/ixgb/ixgb_main.c                        |    4 
 drivers/net/loopback.c                              |    4 
 drivers/net/mv643xx_eth.c                           |    2 
 drivers/net/natsemi.c                               |    4 
 drivers/net/r8169.c                                 |    2 
 drivers/net/s2io.c                                  |   16 
 drivers/net/sky2.c                                  |    4 
 drivers/net/tg3.c                                   |    4 
 drivers/net/tulip/winbond-840.c                     |    9 
 drivers/net/typhoon.c                               |    2 
 drivers/net/via-velocity.c                          |   10 
 drivers/net/wireless/orinoco.c                      |    4 
 drivers/oprofile/buffer_sync.c                      |   70 
 drivers/oprofile/buffer_sync.h                      |    5 
 drivers/oprofile/cpu_buffer.c                       |   26 
 drivers/oprofile/cpu_buffer.h                       |   12 
 drivers/oprofile/event_buffer.h                     |    5 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  205 +
 drivers/pci/Kconfig                                 |    1 
 drivers/s390/net/qeth_eddp.c                        |   12 
 drivers/s390/net/qeth_main.c                        |    5 
 drivers/s390/net/qeth_tso.h                         |    2 
 drivers/serial/Kconfig                              |    1 
 drivers/video/Kconfig                               |    2 
 drivers/xen/Kconfig                                 |  248 +
 drivers/xen/Makefile                                |   16 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  182 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  640 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  853 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  433 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  458 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  314 ++
 drivers/xen/netback/loopback.c                      |  260 +
 drivers/xen/netback/netback.c                       | 1107 ++++++++
 drivers/xen/netback/xenbus.c                        |  404 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1599 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 +++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  281 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1107 ++++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  846 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/a.out.h                            |    2 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/elf.h                              |    7 
 include/asm-i386/fixmap.h                           |   13 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  154 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   81 
 include/asm-i386/mach-xen/asm/hw_irq.h              |   77 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  390 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 include/asm-i386/mach-xen/asm/mmu.h                 |   25 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  336 ++
 include/asm-i386/mach-xen/asm/param.h               |   24 
 include/asm-i386/mach-xen/asm/pci.h                 |  154 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  753 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   64 
 include/asm-i386/mach-xen/asm/smp.h                 |  104 
 include/asm-i386/mach-xen/asm/spinlock.h            |  200 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  578 ++++
 include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch_post.h         |  101 
 include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 include/asm-i386/page.h                             |    4 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  277 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/hw_irq.h                         |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   63 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  114 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  145 +
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  328 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  136 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   23 
 include/asm-x86_64/mach-xen/asm/pci.h               |  174 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  564 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  494 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  153 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  428 +++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/ethtool.h                             |    2 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/netdevice.h                           |   72 
 include/linux/oprofile.h                            |    9 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   53 
 include/net/pkt_sched.h                             |    7 
 include/net/protocol.h                              |    2 
 include/net/sock.h                                  |    4 
 include/net/tcp.h                                   |    6 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  420 +++
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  148 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   86 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  505 +++
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |   26 
 kernel/irq/spurious.c                               |    3 
 kernel/timer.c                                      |   16 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/atm/clip.c                                      |    8 
 net/bridge/br_device.c                              |    8 
 net/bridge/br_forward.c                             |    2 
 net/bridge/br_if.c                                  |   23 
 net/bridge/br_netfilter.c                           |    7 
 net/core/dev.c                                      |  284 +-
 net/core/dev_mcast.c                                |   28 
 net/core/ethtool.c                                  |   37 
 net/core/netpoll.c                                  |    9 
 net/core/pktgen.c                                   |    8 
 net/core/skbuff.c                                   |  181 +
 net/decnet/dn_nsp_in.c                              |    3 
 net/decnet/dn_route.c                               |    3 
 net/ipv4/af_inet.c                                  |   51 
 net/ipv4/ip_output.c                                |   18 
 net/ipv4/ipcomp.c                                   |   11 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    9 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |   12 
 net/ipv4/tcp.c                                      |   86 
 net/ipv4/tcp_input.c                                |    2 
 net/ipv4/tcp_output.c                               |   47 
 net/ipv4/xfrm4_output.c                             |   60 
 net/ipv6/addrconf.c                                 |    2 
 net/ipv6/ip6_output.c                               |    7 
 net/ipv6/ipcomp6.c                                  |   11 
 net/ipv6/xfrm6_output.c                             |   39 
 net/sched/sch_generic.c                             |   66 
 net/sched/sch_teql.c                                |    9 
 scripts/Makefile.xen                                |   14 
 459 files changed, 83291 insertions(+), 1260 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- linux-2.6-xen.patch	10 Jul 2006 13:27:04 -0000	1.17
+++ linux-2.6-xen.patch	29 Jul 2006 18:20:08 -0000	1.18
@@ -88030,7 +88030,7 @@
  /* Take action when hardware reception checksum errors are detected. */
  #ifdef CONFIG_BUG
  void netdev_rx_csum_fault(struct net_device *dev)
-@@ -1215,78 +1261,148 @@ static inline int illegal_highdma(struct
+@@ -1215,79 +1261,148 @@ static inline int illegal_highdma(struct
  #define illegal_highdma(dev, skb)	(0)
  #endif
  
@@ -88072,6 +88072,7 @@
 -	atomic_set(&ninfo->dataref, 1);
 -	ninfo->tso_size = skb_shinfo(skb)->tso_size;
 -	ninfo->tso_segs = skb_shinfo(skb)->tso_segs;
+-	ninfo->ufo_size = skb_shinfo(skb)->ufo_size;
 -	ninfo->nr_frags = 0;
 -	ninfo->frag_list = NULL;
 -
@@ -88684,7 +88685,7 @@
  	if (!skb)
  		goto out;
  
-@@ -235,16 +241,29 @@ struct sk_buff *alloc_skb_from_cache(kme
+@@ -235,17 +241,29 @@ struct sk_buff *alloc_skb_from_cache(kme
  	skb->data = data;
  	skb->tail = data;
  	skb->end  = data + size;
@@ -88702,6 +88703,7 @@
 -	skb_shinfo(skb)->nr_frags  = 0;
 -	skb_shinfo(skb)->tso_size = 0;
 -	skb_shinfo(skb)->tso_segs = 0;
+-	skb_shinfo(skb)->ufo_size = 0;
 -	skb_shinfo(skb)->frag_list = NULL;
 +	if (fclone) {
 +		struct sk_buff *child = skb + 1;
@@ -88731,12 +88733,13 @@
  	C(pkt_type);
  	C(ip_summed);
  	C(priority);
-@@ -527,8 +550,9 @@ static void copy_skb_header(struct sk_bu
+@@ -527,9 +550,9 @@ static void copy_skb_header(struct sk_bu
  	new->tc_index	= old->tc_index;
  #endif
  	atomic_set(&new->users, 1);
 -	skb_shinfo(new)->tso_size = skb_shinfo(old)->tso_size;
 -	skb_shinfo(new)->tso_segs = skb_shinfo(old)->tso_segs;
+-	skb_shinfo(new)->ufo_size = skb_shinfo(old)->ufo_size;
 +	skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
 +	skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
 +	skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type;



From fedora-cvs-commits at redhat.com  Sat Jul 29 18:34:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 14:34:55 -0400
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.156,1.157
Message-ID: <200607291834.k6TIYtiN032383@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32322

Modified Files:
	gnome-applets.spec 
Log Message:
fix requires



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- gnome-applets.spec	19 Jul 2006 18:56:04 -0000	1.156
+++ gnome-applets.spec	29 Jul 2006 18:34:53 -0000	1.157
@@ -30,7 +30,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.1.1
-Release:  	5
+Release:  	6
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -99,6 +99,7 @@
 
 # For invest-applet
 Requires: gnome-python2-applet
+Requires: gnome-python2-libegg
 
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
@@ -246,6 +247,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Jul 29 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1.1-6
+- Require gnome-python2-libegg for invest applet (#200640)
+
 * Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 1:2.15.1.1-5
 - Add BR for dbus-glib-devel
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 19:07:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 15:07:27 -0400
Subject: rpms/kernel/FC-5 linux-2.6-compile-fixes.patch,1.56,1.57
Message-ID: <200607291907.k6TJ7RPJ024891@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24870

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 budget-av.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-compile-fixes.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- linux-2.6-compile-fixes.patch	26 Feb 2006 18:59:58 -0000	1.56
+++ linux-2.6-compile-fixes.patch	29 Jul 2006 19:07:24 -0000	1.57
@@ -0,0 +1,54 @@
+[PATCH 2.6.17.7] Fix budget-av compile failure
+
+From: Andrew de Quincey <adq_dvb at lidskialf.net>
+
+Currently I am doing lots of refactoring work in the dvb tree. This bugfix
+became necessary to fix 2.6.17 whilst I was in the middle of this work. 
+Unfortunately after I tested the original code for the patch, I generated 
+the diff against the wrong tree (I accidentally used a tree with part of 
+the refactoring code in it). This resulted in the reported compile errors 
+because that tree (a) was incomplete, and (b) used features which are 
+simply not in the mainline kernel yet.
+
+Many apologies for the error and problems this has caused. :(
+
+Signed-off-by: Andrew de Quincey <adq_dvb at lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
+
+diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
+--- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 14:53:19.000000000 +0100
++++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 15:25:32.000000000 +0100
+@@ -58,6 +58,7 @@
+ 	struct tasklet_struct ciintf_irq_tasklet;
+ 	int slot_status;
+ 	struct dvb_ca_en50221 ca;
++	u8 reinitialise_demod:1;
+ };
+ 
+ /* GPIO Connections:
+@@ -214,8 +215,9 @@
+ 	while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
+ 		msleep(100);
+ 
+-	/* reinitialise the frontend */
+-	dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
++	/* reinitialise the frontend if necessary */
++	if (budget_av->reinitialise_demod)
++		dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
+ 
+ 	if (timeout <= 0)
+ 	{
+@@ -1064,12 +1066,10 @@
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));
+-		if (fe) {
+-			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
+-		}
+ 		break;
+ 
+ 	case SUBID_DVBC_KNC1_PLUS:
++		budget_av->reinitialise_demod = 1;
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));



From fedora-cvs-commits at redhat.com  Sat Jul 29 19:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 15:20:20 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.33,1.34
Message-ID: <200607291920.k6TJKKhj011510@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11431

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
Build for fc5 aiglx repo.


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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-ati.spec	27 Jul 2006 21:23:18 -0000	1.33
+++ xorg-x11-drv-ati.spec	29 Jul 2006 19:20:17 -0000	1.34
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   6%{?dist}
+Release:   5.fc5.aiglx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -90,6 +90,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sat Jul 29 2006 Kristian H??gsberg <krh at redhat.com> 6.6.1-5.fc5.aiglx
+- Build for fc5 aiglx repo.
+
 * Thu Jul 27 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-6.fc6
 - Updated radeon.xinf: comments, a handful of new devices.
 



From fedora-cvs-commits at redhat.com  Sat Jul 29 19:40:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 15:40:02 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.34,1.35
Message-ID: <200607291940.k6TJe2EH017461@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17433

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
Build for fc5 aiglx repo.


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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-ati.spec	29 Jul 2006 19:20:17 -0000	1.34
+++ xorg-x11-drv-ati.spec	29 Jul 2006 19:39:59 -0000	1.35
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   5.fc5.aiglx
+Release:   6.fc5.aiglx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -90,7 +90,7 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
-* Sat Jul 29 2006 Kristian H??gsberg <krh at redhat.com> 6.6.1-5.fc5.aiglx
+* Sat Jul 29 2006 Kristian H??gsberg <krh at redhat.com> 6.6.1-6.fc5.aiglx
 - Build for fc5 aiglx repo.
 
 * Thu Jul 27 2006 Adam Jackson <ajackson at redhat.com> 6.6.1-6.fc6



From fedora-cvs-commits at redhat.com  Sat Jul 29 19:44:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 15:44:13 -0400
Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2164,1.2165
Message-ID: <200607291944.k6TJiDlU018923@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18892

Modified Files:
	kernel-2.6.spec 
Log Message:
apply


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2164
retrieving revision 1.2165
diff -u -r1.2164 -r1.2165
--- kernel-2.6.spec	29 Jul 2006 17:43:53 -0000	1.2164
+++ kernel-2.6.spec	29 Jul 2006 19:44:10 -0000	1.2165
@@ -987,7 +987,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



From fedora-cvs-commits at redhat.com  Sat Jul 29 19:48:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 15:48:23 -0400
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.35,1.36
Message-ID: <200607291948.k6TJmN1u012795@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12782

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
Set release back to dist tag.


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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-drv-ati.spec	29 Jul 2006 19:39:59 -0000	1.35
+++ xorg-x11-drv-ati.spec	29 Jul 2006 19:48:21 -0000	1.36
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.6.1
-Release:   6.fc5.aiglx
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support



From fedora-cvs-commits at redhat.com  Sat Jul 29 20:03:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 16:03:09 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.804,1.805
Message-ID: <200607292003.k6TK393G012910@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12897

Modified Files:
	openoffice.org.spec 
Log Message:
those two have no help documentation


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -r1.804 -r1.805
--- openoffice.org.spec	29 Jul 2006 12:58:08 -0000	1.804
+++ openoffice.org.spec	29 Jul 2006 20:02:55 -0000	1.805
@@ -2335,8 +2335,8 @@
 %files langpack-ss_ZA
 %defattr(-,root,root)
 %dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ss
+%dir %{instdir}/program
+%dir %{instdir}/program/resource
 %{instdir}/program/resource/*680ss.res
 %dir %{instdir}/share
 %{instdir}/share/readme/LICENSE_ss*
@@ -2375,8 +2375,8 @@
 %files langpack-ve_ZA
 %defattr(-,root,root)
 %dir %{instdir}
-%dir %{instdir}/help
-%{instdir}/help/ve
+%dir %{instdir}/program
+%dir %{instdir}/program/resource
 %{instdir}/program/resource/*680ve.res
 %dir %{instdir}/share
 %{instdir}/share/readme/LICENSE_ve*



From fedora-cvs-commits at redhat.com  Sun Jul 30 01:43:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 29 Jul 2006 21:43:52 -0400
Subject: rpms/glibc/devel .cvsignore, 1.158, 1.159 glibc-fedora.patch, 1.162,
	1.163 glibc.spec, 1.249, 1.250 sources, 1.182, 1.183
Message-ID: <200607300143.k6U1hqZU024547@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24501/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-14 on branch devel from glibc-2.4.90-14.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- .cvsignore	11 Jul 2006 10:26:01 -0000	1.158
+++ .cvsignore	30 Jul 2006 01:43:48 -0000	1.159
@@ -1,2 +1,2 @@
-glibc-20060710T2206.tar.bz2
-glibc-fedora-20060710T2206.tar.bz2
+glibc-20060729T2255.tar.bz2
+glibc-fedora-20060729T2255.tar.bz2

glibc-fedora.patch:
 0 files changed

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.162 -r 1.163 glibc-fedora.patch
Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- glibc-fedora.patch	11 Jul 2006 10:26:01 -0000	1.162
+++ glibc-fedora.patch	30 Jul 2006 01:43:48 -0000	1.163
@@ -1,3360 +0,0 @@
---- glibc-20060710T2206/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060710T2206-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.
- 
-+2000-10-02  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all
-+	remaining xp_pad space.
-+
- 2000-10-02  Ulrich Drepper  <drepper at redhat.com>
- 
- 	* include/features.h [__USE_FILE_OFFSET && !__REDIRECT]: Define
-@@ -9280,6 +9285,12 @@
- 	syscall.
- 	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.
- 
-+2000-05-30  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* resolv/res_query.c (res_nsearch): Remove unused variable
-+	root_on_list. If dots >= statp->ndots and as is querydomain
-+	fails, keep searching.
-+
- 2000-05-30  Ulrich Drepper  <drepper at redhat.com>
- 
- 	* sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob): Loose __P.
-@@ -9480,6 +9491,11 @@
- 	* sysdeps/i386/fpu/bits/mathinline.h: Define expm1 inline only if
- 	__FAST_MATH__ is defined.
- 
-+2000-05-22  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Avoid using ?:
-+	with omitted middle operand.
-+
- 2000-05-22  Andreas Jaeger  <aj at suse.de>
- 
- 	* math/Makefile: Add -D__FAST_MATH__ to CFLAGS-test-ifloat.c,
-@@ -9720,6 +9736,11 @@
- 
- 2000-05-17  Jakub Jelinek  <jakub at redhat.com>
- 
-+	* inet/rcmd.c (rcmd_af): If *ahost cannot be resolved, include
-+	unresolved hostname in the message.
-+
-+2000-05-17  Jakub Jelinek  <jakub at redhat.com>
-+
- 	* 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-20060710T2206/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060710T2206-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.
- 
-+2001-01-10  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* malloc/memusage.c (me): If not SUID/SGID, allow creating new
-+	$MEMUSAGE_OUTPUT file.
-+	* sysdeps/generic/segfault.c (segfault.c): If not SUID/SGID, allow
-+	creating new $SEGFAULT_OUTPUT_NAME file.
-+
- 2001-01-10  H.J. Lu  <hjl at gnu.org>
- 
- 	* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.
-@@ -8130,6 +8137,11 @@
- 	* sysdeps/powerpc/soft-fp/Versions: Likewise.
- 	* sysdeps/sparc/sparc64/soft-fp/Versions: Likewise.
- 
-+2001-01-02  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* locale/setlocale.c (setlocale): Don't allocate/free category name
-+	unnecessarily.
-+
- 2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
- 
- 	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060710T2206/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060710T2206-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>
- 
-+	* posix/Makefile (generated: Add getconf.speclist.
-+	($(inst_libexecdir)/getconf): Use getconf.speclist instead of
-+	getconf output.
-+	($(objpfx)getconf.speclist): New rule.
-+	* posix/getconf.speclist.h: New file.
-+
-+2004-11-26  Jakub Jelinek  <jakub at redhat.com>
-+
- 	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.
- 
- 2004-11-26  Kaz Kojima  <kkojima at rr.iij4u.or.jp>
-@@ -1103,6 +1111,16 @@
- 	* sysdeps/generic/tempname.c (__path_search): Add missing argument
- 	TRY_TMPDIR.
- 
-+2004-11-02  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat
-+	GCC 3.4.x-RH >= 3.4.2-8.
-+	* libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For
-+	GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of
-+	__{,v}{,f}printf_chk.
-+	* debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not
-+	being able to recognize subobjects.
-+
- 2004-10-31  Mariusz Mazur <mmazur at kernel.pl>
- 
- 	* sysdeps/unix/sysv/linux/alpha/setregid.c: New file.
-@@ -1398,6 +1416,11 @@
- 	* posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno
- 	values.
- 
-+2004-10-20  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc
-+	is not mounted, return 1.
-+
- 2004-10-20  Roland McGrath  <roland at redhat.com>
- 
- 	* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also
-@@ -1443,6 +1466,11 @@
- 	* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...
- 	(__readonly_area): ... this.
- 
-+2004-10-19  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* include/features.h (__USE_FORTIFY_LEVEL): Enable even with
-+	Red Hat gcc4 4.0.0 and above.
-+
- 2004-10-18  Jakub Jelinek  <jakub at redhat.com>
- 
- 	* sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking
-@@ -3182,6 +3210,23 @@
- 	before return type.
- 	* locale/localename.c (__current_locale_name): Likewise.
- 
-+2004-08-31  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* elf/ldconfig.c (parse_conf): Add prefix argument, prepend it
-+	before arguments to add_dir and pass to parse_conf_include.
-+	(parse_conf_include): Add prefix argument, pass it down to
-+	parse_conf.
-+	(main): Call arch_startup.  Adjust parse_conf caller.
-+	Call add_arch_dirs.
-+	* sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.
-+	* sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.
-+	* sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,
-+	add_arch_dirs): Define.
-+	* sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend
-+	/emul/ia32-linux before the 32-bit ld.so pathname.
-+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.
-+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.
-+
- 2004-08-30  Roland McGrath  <roland at frob.com>
- 
- 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060710T2206/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20060710T2206-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
-@@ -171,6 +171,11 @@
- 	[BZ #2611]
- 	* stdio-common/renameat.c (renameat): Fix typo.
- 
-+2006-04-27  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* nscd/connections.c (sighup_handler): Only run prune_cache on
-+	enabled databases.
-+
- 2006-04-26  Roland McGrath  <roland at redhat.com>
- 
- 	* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
-@@ -1030,6 +1035,34 @@
- 	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
- 	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
- 
-+2006-03-04  Jakub Jelinek  <jakub at redhat.com>
-+	    Roland McGrath  <roland at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
-+	LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
-+	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
-+	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
-+	lll_robust_mutex_timedlock, lll_mutex_unlock,
-+	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
-+	Add _L_*_ symbols around the subsection.
-+	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
[...2969 lines suppressed...]
-       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-20060710T2206/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060710T2206-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"
- #define _PATH_UTMP	"/var/run/utmp"
--#define	_PATH_VI	"/usr/bin/vi"
-+#define	_PATH_VI	"/bin/vi"
- #define _PATH_WTMP	"/var/log/wtmp"
- 
- /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060710T2206/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060710T2206-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;
-   unsigned long int cmd;
-+  int retval;
- 
-   switch (optional_actions)
-     {
-@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
-   memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
- 	  __KERNEL_NCCS * sizeof (cc_t));
- 
--  return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
-+  retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
-+
-+  if (retval == 0 && cmd == TCSETS)
-+    {
-+      /* The Linux kernel has a bug which silently ignore the invalid
-+        c_cflag on pty. We have to check it here. */
-+      int save = errno;
-+      retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
-+      if (retval)
-+       {
-+         /* We cannot verify if the setting is ok. We don't return
-+            an error (?). */
-+         __set_errno (save);
-+         retval = 0;
-+       }
-+      else if ((termios_p->c_cflag & (PARENB | CREAD))
-+              != (k_termios.c_cflag & (PARENB | CREAD))
-+              || ((termios_p->c_cflag & CSIZE)
-+                  && ((termios_p->c_cflag & CSIZE)
-+                      != (k_termios.c_cflag & CSIZE))))
-+       {
-+         /* It looks like the Linux kernel silently changed the
-+            PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
-+            error. */
-+         __set_errno (EINVAL);
-+         retval = -1;
-+       }
-+    }
-+
-+  return retval;
- }
- libc_hidden_def (tcsetattr)
---- glibc-20060710T2206/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060710T2206-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.
-+   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.  */
-+
-+static inline int
-+is_ia64 (void)
-+{
-+  unsigned int fl1, fl2;
-+
-+  /* See if we can use cpuid.  */
-+  __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
-+           "pushl %0; popfl; pushfl; popl %0; popfl"
-+           : "=&r" (fl1), "=&r" (fl2)
-+           : "i" (0x00200000));
-+  if (((fl1 ^ fl2) & 0x00200000) == 0)
-+    return 0;
-+
-+  /* Host supports cpuid.  See if cpuid gives capabilities, try
-+     CPUID(0).  Preserve %ebx and %ecx; cpuid insn clobbers these, we
-+     don't need their CPUID values here, and %ebx may be the PIC
-+     register.  */
-+  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
-+           : "=a" (fl1) : "0" (0) : "edx", "cc");
-+  if (fl1 == 0)
-+    return 0;
-+
-+  /* Invoke CPUID(1), return %edx; caller can examine bits to
-+     determine what's supported.  */
-+  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
-+           : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
-+  return (fl2 & (1 << 30)) != 0;
-+}
-+
-+#define arch_startup(argc, argv) \
-+  do {									\
-+    /* On IA-64, try to execute 64-bit ldconfig if possible.		\
-+       This is because the badly designed /emul/ia32-linux hack		\
-+       will cause 32-bit ldconfig to do all sorts of weird things.  */	\
-+    if (is_ia64 ())							\
-+      execv ("/emul/ia32-linux/../../sbin/ldconfig",			\
-+	     (char *const *) argv);					\
-+  } while (0)
-+
-+#include_next <dl-cache.h>
---- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060710T2206-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)
- 
-+#define EMUL_HACK "/emul/ia32-linux"
-+
-+#define arch_startup(argc, argv) unlink (EMUL_HACK LD_SO_CACHE)
-+
-+#define add_arch_dirs(config_file) \
-+  do {							\
-+    int save_verbose = opt_verbose;			\
-+    opt_verbose = 0;					\
-+							\
-+    parse_conf (config_file, EMUL_HACK, true);		\
-+							\
-+    /* Always add the standard search paths.  */	\
-+    add_system_dir (EMUL_HACK SLIBDIR);			\
-+    if (strcmp (SLIBDIR, LIBDIR))			\
-+      add_system_dir (EMUL_HACK LIBDIR);		\
-+							\
-+    char emul_config_file[strlen (config_file)		\
-+			  + sizeof EMUL_HACK];		\
-+    strcpy (mempcpy (emul_config_file, EMUL_HACK,	\
-+		     strlen (EMUL_HACK)), config_file);	\
-+							\
-+    if (! access (emul_config_file, R_OK))		\
-+      parse_conf (emul_config_file, EMUL_HACK, true);	\
-+							\
-+    opt_verbose = save_verbose;				\
-+  } while (0)
-+
- #include_next <dl-cache.h>
---- glibc-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060710T2206-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-20060710T2206/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060710T2206-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-20060710T2206/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060710T2206-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.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- glibc.spec	11 Jul 2006 15:23:42 -0000	1.249
+++ glibc.spec	30 Jul 2006 01:43:49 -0000	1.250
@@ -1,9 +1,9 @@
-%define glibcdate 20060710T2206
+%define glibcdate 20060729T2255
 %define glibcname glibc
-%define glibcsrcdir glibc-20060710T2206
+%define glibcsrcdir glibc-20060729T2255
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 13
+%define glibcrelease 14
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1438,6 +1438,10 @@
 %endif
 
 %changelog
+* Sat Jul 29 2006 Roland McGrath <roland at redhat.com> - 2.4.90-14
+- fix missing destructor calls in dlclose (#197932)
+- PI mutex support
+
 * Tue Jul 10 2006 Jakub Jelinek <jakub at redhat.com> 2.4.90-13
 - DT_GNU_HASH support
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- sources	11 Jul 2006 10:26:01 -0000	1.182
+++ sources	30 Jul 2006 01:43:49 -0000	1.183
@@ -1,2 +1,2 @@
-d48cb02a9c07b6940feab23bf6ce72d5  glibc-20060710T2206.tar.bz2
-47e8329d9e086afac35c36375c91014d  glibc-fedora-20060710T2206.tar.bz2
+6151d47fcff30830962fc633ab3e5123  glibc-20060729T2255.tar.bz2
+5fea46a562f25b3da264af62e6fb94a8  glibc-fedora-20060729T2255.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Jul 30 04:08:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 00:08:06 -0400
Subject: rpms/firefox/devel .cvsignore, 1.27, 1.28 firefox-mozconfig, 1.7,
	1.8 firefox.spec, 1.137, 1.138
Message-ID: <200607300408.k6U486in028000@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27939

Modified Files:
	.cvsignore firefox-mozconfig firefox.spec 
Log Message:
pass --libdir to configure



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	27 Jul 2006 17:13:32 -0000	1.27
+++ .cvsignore	30 Jul 2006 04:08:01 -0000	1.28
@@ -1,2 +1,3 @@
 firefox-1.5.0.5-source.tar.bz2
 firefox-langpacks-1.5.0.5-20060726.tar.bz2
+firefox-mozconfig


Index: firefox-mozconfig
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- firefox-mozconfig	25 Jul 2006 04:09:33 -0000	1.7
+++ firefox-mozconfig	30 Jul 2006 04:08:01 -0000	1.8
@@ -1,6 +1,7 @@
 . $topsrcdir/browser/config/mozconfig
 
 ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- firefox.spec	28 Jul 2006 19:53:40 -0000	1.137
+++ firefox.spec	30 Jul 2006 04:08:01 -0000	1.138
@@ -11,7 +11,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.5
-Release:        7
+Release:        8
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -156,6 +156,7 @@
 
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
 export PREFIX='%{_prefix}'
+export LIBDIR='%{_libdir}'
 
 %ifarch ppc ppc64 s390 s390x
 %define moz_make_flags -j1
@@ -353,6 +354,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-8
+- Pass --libdir to configure
+
 * Fri Jul 28 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
 - Dereference links in %%install so the files get put in the
   right place.



From fedora-cvs-commits at redhat.com  Sun Jul 30 07:04:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 03:04:50 -0400
Subject: rpms/kernel/devel patch-2.6.18-rc3.bz2.sign, NONE, 1.1 .cvsignore,
	1.500, 1.501 kernel-2.6.spec, 1.2475, 1.2476 sources, 1.464,
	1.465 upstream, 1.406,
	1.407 linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch,
	1.1, NONE patch-2.6.18-rc2-git7.bz2.sign, 1.1,
	NONE patch-2.6.18-rc2.bz2.sign, 1.1, NONE
Message-ID: <200607300704.k6U74oMi014688@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14566

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.18-rc3.bz2.sign 
Removed Files:
	linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch 
	patch-2.6.18-rc2-git7.bz2.sign patch-2.6.18-rc2.bz2.sign 
Log Message:
rc3


--- NEW FILE patch-2.6.18-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEzFL8yGugalF9Dw4RAs+0AKCG9Vg/LTGpRBarjPtx29E63ifOzACeKKDV
4lMCY9lVVgFSqv8aw93yF1I=
=lr77
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- .cvsignore	29 Jul 2006 07:32:10 -0000	1.500
+++ .cvsignore	30 Jul 2006 07:04:45 -0000	1.501
@@ -2,6 +2,5 @@
 temp-*
 kernel-2.6.17
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc2.bz2
 xen-10730.tar.bz2
-patch-2.6.18-rc2-git7.bz2
+patch-2.6.18-rc3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2475
retrieving revision 1.2476
diff -u -r1.2475 -r1.2476
--- kernel-2.6.spec	29 Jul 2006 07:32:11 -0000	1.2475
+++ kernel-2.6.spec	30 Jul 2006 07:04:46 -0000	1.2476
@@ -264,8 +264,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.18-rc2.bz2
-Patch2: patch-2.6.18-rc2-git7.bz2
+Patch1: patch-2.6.18-rc3.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
@@ -283,7 +282,6 @@
 Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
-Patch210: linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch
 
 # 300 - 399   ppc(64)
 Patch305: linux-2.6-cell-mambo-drivers.patch
@@ -726,7 +724,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -760,8 +757,6 @@
 %patch208 -p1
 # fix opteron timer scaling
 %patch209 -p1
-# fix a calgary pci hang on numa
-%patch210 -p1
 
 #
 # PowerPC
@@ -1657,6 +1652,9 @@
 %endif
 
 %changelog
+* Sun Jul 30 2006 Dave Jones <davej at redhat.com>
+- 2.6.18rc3
+
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - lockdep fix: ipv6
 - 2.6.18rc2-git7


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -r1.464 -r1.465
--- sources	29 Jul 2006 07:32:11 -0000	1.464
+++ sources	30 Jul 2006 07:04:47 -0000	1.465
@@ -1,4 +1,3 @@
 37ddefe96625502161f075b9d907f21e  linux-2.6.17.tar.bz2
-f9dc5be24ecc701a2ee5ac5573119e4d  patch-2.6.18-rc2.bz2
 4ae2c95631b54820475437c206c3a4c2  xen-10730.tar.bz2
-3fbf1904a9daa1b918e7b22212930233  patch-2.6.18-rc2-git7.bz2
+ba31b754aaf80aa388858f86c34c4d01  patch-2.6.18-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- upstream	29 Jul 2006 07:32:11 -0000	1.406
+++ upstream	30 Jul 2006 07:04:47 -0000	1.407
@@ -1,3 +1,2 @@
 linux-2.6.17.tar.bz2
-patch-2.6.18-rc2.bz2
-patch-2.6.18-rc2-git7.bz2
+patch-2.6.18-rc3.bz2


--- linux-2.6-x86_64-calgary-x-watchdog-hangs-on-numa.patch DELETED ---


--- patch-2.6.18-rc2-git7.bz2.sign DELETED ---


--- patch-2.6.18-rc2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Jul 30 07:50:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 03:50:45 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.26,
	1.27 weak-modules, 1.1, 1.2
Message-ID: <200607300750.k6U7ojuX026035@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25933

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
replaced weak-modules



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- module-init-tools.spec	12 Jul 2006 07:23:34 -0000	1.26
+++ module-init-tools.spec	30 Jul 2006 07:50:42 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.1
+Release: 0.pre1.4.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
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.2
+- New weak-modules
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3-0.pre1.4.1
 - rebuild
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- weak-modules	14 Jun 2006 12:06:02 -0000	1.1
+++ weak-modules	30 Jul 2006 07:50:42 -0000	1.2
@@ -1,100 +1,41 @@
-#! /bin/bash
-
-# weak-modules - derived from weak-updates by Andreas Gruenbacher
-
-unset LANG LC_ALL LC_COLLATE
-
-# Check if MODULE is compatible with kernel release KREL.
-module_is_compatible() {
-    declare module=$1 krel=$2 module_krel=$(krel_of_module "$module")
-
-    if [ ! -e "$tmpdir/all-symvers-$krel-$module_krel" ]; then
-        # Symbols exported by the "new" kernel
-        if [ ! -e $tmpdir/symvers-$krel ]; then
-            if [ -e /boot/symvers-$krel.gz ]; then
-                zcat /boot/symvers-$krel.gz \
-                | sed -r -ne 's:^0x0*([0-9a-f]+\t[0-9a-zA-Z_]+)\t.*:\1:p'
-            fi > $tmpdir/symvers-$krel
-        fi
-
-        # Symbols that other add-on modules of the "old" kernel export
-        # (and that this module may require)
-        if [ ! -e "$tmpdir/extra-symvers-$module_krel" ]; then
-            if [ -e /lib/modules/$module_krel/extra ]; then
-                find /lib/modules/$module_krel/extra -name '*.ko' \
-                | xargs nm \
-                | sed -nre 's:^0*([0-9a-f]+) A __crc_(.*):\1 \2:p'
-            fi > $tmpdir/extra-symvers-$module_krel
-        fi
-
-        sort -u $tmpdir/symvers-$krel $tmpdir/extra-symvers-$module_krel \
-        > "$tmpdir/all-symvers-$krel-$module_krel"
-    fi
-
-    # If the module does not have modversions enabled, $tmpdir/modvers
-    # will be empty.
-    /sbin/modprobe --dump-modversions "$module" \
-    | sed -r -e 's:^0x0*([0-9a-f]+\t.*):\1:' \
-    | sort -u \
-    > $tmpdir/modvers
-
-    # Only include lines of the second file in the output that don't
-    # match lines in the first file. (The default separator is
-    # <space>, so we are matching the whole line.)
-    join -j 1 -v 2 $tmpdir/all-symvers-$krel-$module_krel \
-                   $tmpdir/modvers > $tmpdir/join
-
-    if [ ! -s $tmpdir/modvers ]; then
-        echo "Warning: Module ${module##*/} from kernel $module_krel has no" \
-             "modversions, so it cannot be reused for kernel $krel" >&2
-    elif [ -s $tmpdir/join ]; then
-        [ -n "$verbose" ] &&
-        echo "Module ${module##*/} from kernel $module_krel is not compatible" \
-             "with kernel $krel in symbols:" $(sed -e 's:.* ::' $tmpdir/join)
-    else
-        [ -n "$verbose" ] &&
-        echo "Module ${module##*/} from kernel $module_krel is compatible" \
-             "with kernel $krel"
-        return 0
-    fi
-    return 1
-}
-
-# Compute the kernel release of a module.
-krel_of_module() {
-    declare module=$1
-    /sbin/modinfo -F vermagic "$module" | awk '{print $1}'
-}
-
-# Read a list of modules from standard input, convert the filenames into
-# absolute names, and compute the kernel release of each module.
-read_modules_list() {
-    local IFS=$'\n'
-    modules=($(cat))
-
-    for ((n = 0; n < ${#modules[@]}; n++)); do
-        if [ ${modules[n]:0:1} != '/' ]; then
-            modules[n]="$PWD/${modules[n]}"
-        fi
-        if [ -f "${modules[n]}" ]; then
-            module_krels[n]=$(krel_of_module ${modules[n]})
-        else
-            # Try to extract the kernel release from the path
-            set -- "${modules[n]#/lib/modules/}"
-            module_krels[n]=${1%%/*}
-        fi
-    done
-}
-
-doit() {
-    [ -n "$verbose" ] && echo "$@"
-    [ -n "$dry_run" ] || "$@"
-}
-
-usage() {
-    echo "Usage: ${0##*/} [options] {--add-modules|--remove-modules}"
-    echo "${0##*/} [options] {--add-kernel|--remove-kernel} {kernel-release}"
-    cat <<'EOF'
+#!/usr/bin/python
+#
+# weak-modules - Red Hat kABI comparison tool
+#
+# Author: Jon Masters <jcm at redhat.com>
+#
+# When we add and remove kernels from the system, we need to ensure that we
+# keep the symbolic links in /lib/modules up to date. This script drives RPM
+# to find out which driver updates are compatible with installed kernels.
+#
+# This software may be freely redistributed under the terms of the GNU
+# General Public License (GPL).
+
+__author__ = "Jon Masters <jcm at redhat.com>"
+__version__ = "1.0"
+__date__ = "2006/07/30 08:00:00"
+__copyright__ = "Copyright (C) 2006 Red Hat, Inc"
+__license__ = "GPL"
+
+import commands
+import getopt
+import os
+import re
+import sha
+import string
+import sys
+
+true = 1
+false = 0
+
+dry_run = "no"
+verbose = "no"
+
+def usage():
+	"""Usage for weak-modules script"""
+	print "usage:\t" + sys.argv[0] + " [options] {--add-modules|--remove-modules}"
+	print "\t" + sys.argv[0] + " [options] {--add-kernel|--remove-kernel} {kernel-release}"
+	print """
 --add-modules
         Add a list of modules read from standard input. Create
         symlinks in compatible kernel's weak-updates/ directory.
@@ -107,201 +48,394 @@
 
 --add-kernel
         Add compatibility symlinks for all compatible modules to the
-        specified or running kernel.
+        specified kernel.
 
 --remove-kernel
-        Remove all compatibility symlinks for the specified or current
-        kernel.
+        Remove all compatibility symlinks for the specified kernel.
 
 --verbose
         Print the commands executed.
 
 -dry-run
         Do not create/remove any files.
-EOF
-    exit $1
-}
-
-[ -e /etc/sysconfig/kernel ] && source /etc/sysconfig/kernel
-
-unset ${!changed_modules_*} ${!changed_initrd_*}
-
-module_has_changed() {
-    declare module=$1 krel=$2
-
-    module=${module%.ko}
-    module=${module##*/}
-
-    eval "changed_modules_${krel//[^a-zA-Z0-9]/_}=$krel"
-    case " $INITRD_MODULES " in
-    *" $module "*)
-        eval "changed_initrd_${krel//[^a-zA-Z0-9]/_}=$krel"
-        ;;
-    esac
-}
-
-options=`getopt -o h --long help,add-modules,remove-modules \
-                     --long add-kernel,remove-kernel,dry-run,verbose -- "$@"`
-
-[ $? -eq 0 ] || usage 1
-
-eval set -- "$options"
-
-while :; do
-    case "$1" in
-    --add-modules)
-        add_modules=1
-        ;;
-    --remove-modules)
-        remove_modules=1
-        ;;
-    --add-kernel)
-        add_kernel=1
-        ;;
-    --remove-kernel)
-        remove_kernel=1
-        ;;
-    --dry-run)
-        dry_run=1
-        ;;
-    --verbose)
-        verbose=1
-        ;;
-    -h|--help)
-        usage 0
-        ;;
-    --)
-        shift
-        break
-        ;;
-    esac
-    shift
-done
-
-if [ "$add_modules$remove_modules$add_kernel$remove_kernel" != 1 ]; then
-    usage 1
-fi
-if [ -n "$add_kernel" -o -n "$remove_kernel" ]; then
-    [ $# -gt 1 ] && usage 1
-else
-    [ $# -ne 0 ] && usage 1
-fi
-
-tmpdir=$(mktemp -td ${0##*/}.XXXXXX)
-trap "rm -rf $tmpdir" EXIT
-trap "rm -rf $tmpdir" INT
-
-if [ -n "$add_modules" ]; then
-    read_modules_list || exit 1
-    if [ ${#modules[@]} -gt 0 ]; then
-        for krel in $(ls /lib/modules/); do
-            [ -e "/boot/symvers-$krel.gz" ] || continue
-            for ((n = 0; n < ${#modules[@]}; n++)); do
-                module="${modules[n]}"
-                module_krel="${module_krels[n]}"
-                case "$module" in
-                /lib/modules/$krel/*)
-                    continue ;;
-                esac
-                subpath="${module#/lib/modules/$module_krel/extra}"
-                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
-                if [ -r "$weak_module" ]; then
-                    weak_krel=$(krel_of_module "$weak_module")
-                    if [ "$weak_krel" != "$module_krel" ] &&
-                       [ "$(printf "%s\n" "$weak_krel" "$module_krel" \
-                            | /usr/lib/rpm/redhat/rpmsort | head -n 1)" = \
-                         "$module_krel" ]; then
-                        # Keep modules from more recent kernels.
-                        [ -n "$verbose" ] && echo \
-"Keeping module ${module##*/} from kernel $weak_krel for kernel $krel"
-                        continue
-                    fi
-                fi
-                if module_is_compatible $module $krel; then
-                    doit mkdir -p $(dirname $weak_module)
-                    doit ln -sf $module $weak_module
-                    module_has_changed $module $krel
-                fi
-            done
-        done
-    fi
-elif [ -n "$remove_modules" ]; then
-    read_modules_list || exit 1
-    if [ ${#modules[@]} -gt 0 ]; then
-        krels=($(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r))
-        for krel in "${krels[@]}"; do
-            [ -e "/boot/symvers-$krel.gz" ] || continue
-            for ((n = 0; n < ${#modules[@]}; n++)); do
-                module="${modules[n]}"
-                module_krel="${module_krels[n]}"
-                subpath="${module#/lib/modules/$module_krel/extra}"
-                weak_module="/lib/modules/$krel/weak-updates/${subpath#/}"
-		if [ "$module" == "`readlink $weak_module`" ]; then
-                    [ -n "$verbose" ] && echo \
-"Removing compatible module ${module##*/} from kernel $krel"
-                    doit rm -f "$weak_module"
-                    for krel2 in "${krels[@]}"; do
-                        [ -e "/boot/symvers-$krel2.gz" ] || continue
-                        module="/lib/modules/$krel2/extra/$subpath"
-                        [ -e "$module" ] || continue
-                        if module_is_compatible "$module" "$krel2"; then
-                            [ -n "$verbose" ] && echo \
-"Adding compatible module ${module##*/} from kernel $krel2 instead"
-                            doit ln -s "$module" "$weak_module"
-                            break
-                        fi
-                    done
-                    doit rmdir --parents --ignore-fail-on-non-empty \
-                               "$(dirname "$weak_module")"
-                    module_has_changed $module $krel
-                fi
-            done
-        done
-    fi
-elif [ -n "$add_kernel" ]; then
-    add_krel=${1:-$(uname -r)}
-    if [ ! -e "/boot/symvers-$add_krel.gz" ]; then
-        echo "Symvers dump file /boot/symvers-$add_krel.gz" \
-             "not found" >&2
-        exit 1
-    fi
-    for krel in $(ls /lib/modules/ | /usr/lib/rpm/redhat/rpmsort -r); do
-        [ "$add_krel" = "$krel" ] && continue
-        [ -d /lib/modules/$krel/extra ] || continue
-        for module in $(find /lib/modules/$krel/extra -name '*.ko'); do
-            subpath="${module#/lib/modules/$krel/extra}"
-            weak_module="/lib/modules/$add_krel/weak-updates/${subpath#/}"
-            [ -e "$weak_module" ] && continue
-            if module_is_compatible $module $add_krel; then
-                doit mkdir -p $(dirname $weak_module)
-                doit ln -sf $module $weak_module
-            fi
-        done
-    done
-elif [ -n "$remove_kernel" ]; then
-    remove_krel=${1:-$(uname -r)}
-    weak_modules="/lib/modules/$remove_krel/weak-updates"
-    doit rm -rf "$weak_modules"
-fi
-
-for krel in ${!changed_modules_*}; do
-    krel=${!krel}
-    [ -e "/boot/System.map-$krel" ] || continue
-    /sbin/depmod -ae -F /boot/System.map-$krel $krel
-done
-
-for krel in ${!changed_initrd_*}; do
-    krel=${!krel}
-    [ -e "/boot/System.map-$krel" ] || continue
-
-    image=
-    for x in vmlinuz image vmlinux linux bzImage; do
-        if [ -f "/boot/$x-$krel" ]; then
-            image="$x"
-            break
-        fi
-    done
-    if [ -n "$image" ]; then
-        /sbin/mkinitrd -k "/boot/$image-$krel" -i "/boot/initrd-$krel"
-    fi
-done
+"""
+
+def read_modules(modules):
+	"""Read a list of modules from standard input, convert the filenames
+	   into absolute names and compute the kernel release of each module."""
+
+	while true:
+		in_line = sys.stdin.readline()
+		if in_line == "":
+			break
+		if in_line == "\n":
+			continue
+		if in_line[0] != '/':
+			module=os.getcwd()+"/"+in_line[:-1]
+		else:
+			module=in_line[:-1]
+
+		# Check it the module exists, extract vermagic, otherwise try
+		# to pull the information out of the path component
+		if os.path.isfile(module):
+			minfo = os.popen("/sbin/modinfo -F vermagic " + module)
+			kver = (string.split(minfo.readline()))[0]
+		else:
+			p = re.compile('^.*/lib/modules/([^/]*).*$')
+			m = p.match(module)
+			if m:
+				kver=m.group(1)
+			else:
+				print "cannot extract kernel version!"
+				sys.exit(1)
+
+		# Store the module version in a dictionary.
+		modules[module] = {	"kver": kver,
+					"package": "",
+					"kabireq": []
+					}
+
+def module_kabideps(modules):
+	"""Calculate the kabideps for a set of modules"""
+
+	for module in modules:
+		pinfo = os.popen("rpm -q --whatprovides " + module)
+		in_line = pinfo.readline()
+		pinfo.close()
+		if in_line == "":
+			print "Cannot find installed package for module: " \
+				+ module
+			sys.exit(1)
+		package = (string.split(in_line))[0]
+
+		# Store the module package in a dictionary.
+		modules[module]["package"] = package
+
+		pinfo = os.popen("rpm -q --requires " + package)
+		p = re.compile('^kernel\(([^\)]*)\) = (.*)$')
+		while true:
+			in_line = (string.strip(pinfo.readline()))
+			if in_line == "":
+				break
+			m = p.match(in_line)
+			if m:
+				modules[module]["kabireq"].append(in_line)
+		pinfo.close()
+
+def kernel_kabideps(kernels):
+	"""For each installed kernel, determine the full set of kABI deps for
+	   that kernel and store in a giant dictionary hash."""
+
+	kinfo = os.popen("rpm -q kernel")
+	while true:
+		in_line = (string.strip(kinfo.readline()))
+		if in_line == "":
+			break
+		
+		kernel=in_line
+		kernelver=re.sub("kernel-","",in_line)
+
+		kdeps = os.popen("rpm -q --provides " + kernel)
+
+		p = re.compile('^kernel\(([^\)]*)\) = (.*)$')
+		while true:
+			in_line = (string.strip(kdeps.readline()))
+			if in_line == "":
+				break
+			m = p.match(in_line)
+			if m:
+				kabi=in_line
+				if kernels.has_key(kernelver):
+					kernels[kernelver].append([kabi])
+				else:
+					kernels[kernelver] = [[kabi]]
+
+		kdeps.close()
+	kinfo.close()
+
+	# debug
+	#for kernel in kernels:
+	#	print "kernel " + kernel + ":"
+	#	for i in range(0,len(kernels[kernel])):
+	#		for j in range(0,len(kernels[kernel][i])):
+	#			print "\t" + kernels[kernel][i][j]
+
+def check_compatibility(modules,kernels,compatibles):
+	"""For each module, check which kernels it is compatible with."""
+
+	for module in modules:
+		for kernel in kernels:
+
+			all_matched=1
+			for i in range(0,len(modules[module]["kabireq"])):
+				module_abi=modules[module]["kabireq"][i]
+				matched=0
+				# Check this kABI req against a kernel
+				for j in range(0,len(kernels[kernel])):
+					for k in range(0,len(kernels[kernel][j])):
+						kernel_abi=kernels[kernel][j][k]
+						if kernel_abi==module_abi:
+							matched=1
+				if matched==0:
+					all_matched=0
+
+			if all_matched:
+				# All kABI deps are good
+
+				if compatibles.has_key(kernel):
+					compatibles[kernel].append(module)
+				else:
+					compatibles[kernel] = [module]
+
+def run_depmod(kernel):
+	"""Run depmod against kernel."""
+
+	depmod_line="/sbin/depmod -ae -F " \
+		+"/boot/System.map-"+kernel \
+		+" "+kernel
+	if verbose == "yes":
+		print "depmod: " + depmod_line
+	os.system(depmod_line)
+
+def run_mkinitrd(kernel):
+	"""Run mkinitrd against kernel."""
+
+	mkinitrd_line = "/sbin/mkinitrd --allow-missing -f /boot/initrd-"\
+			+kernel+".img "+kernel
+
+	if verbose == "yes":
+		print "mkinitrd: " + mkinitrd_line
+	os.system(mkinitrd_line)
+
+def add_modules():
+	"""Read in a list of modules to add from std input. For each module,
+	   attempt to create links in compatible kernel directories."""
+
+	modules={}
+	kernels={}
+	compatibles={}
+
+	read_modules(modules)
+	module_kabideps(modules)
+	kernel_kabideps(kernels)
+	check_compatibility(modules,kernels,compatibles)
+
+	#debug
+	#if verbose == "yes":
+	#	print "**** Compatible kernels ****"
+	#	for kernel in compatibles:
+	#		print kernel + ":"
+	#		for module in range(0,len(compatibles[kernel])):
+	#			print "\t" + compatibles[kernel][module]
+
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
+	for kernel in compatibles:
+		for module in range(0,len(compatibles[kernel])):
+			modfile=compatibles[kernel][module]
+			m = p.match(modfile)
+			if not m:
+				print "Non-standard module location"
+				sys.exit(1)
+			mod_kern=m.group(1)
+			weak_dir="/lib/modules/" + kernel \
+				+ "/weak-updates/" + m.group(2)
+			weak_link=weak_dir+"/"+m.group(3)
+
+		if mod_kern != kernel:
+			# ignore the kernel that matches the module
+
+			if verbose == "yes":
+				print "create: " + weak_link
+
+			if dry_run == "no":
+				os.system("mkdir -p " + weak_dir)
+				os.system("ln -sf " + modfile + " " + weak_link)
+				run_depmod(kernel)
+				run_mkinitrd(kernel)
+
+def remove_modules():
+	"""Read in a list of modules to remove from std input. Remove these
+	   modules from all installed kernels"""
+
+	modules = {}
+	kernels = {}
+
+	read_modules(modules)
+	kernel_kabideps(kernels)
+
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
+	for module in modules:
+
+		m = p.match(module)
+		if not m:
+			print "Non-standard module locations"
+			sys.exit(1)
+		weak_link=m.group(2)+"/"+m.group(3)
+
+		for kernel in kernels:
+
+			weak_dir = "/lib/modules/" + kernel \
+				+ "/weak-updates/" + m.group(2)
+			weak_path = weak_dir +"/"+m.group(3)
+
+			if os.path.isfile(weak_path):
+				weak_modfile=os.readlink(weak_path)
+				if weak_modfile == module:
+					if verbose == "yes":
+						print "remove: " \
+							+ weak_path
+					if dry_run == "no":
+						os.system("rm -f " +weak_path)
+
+						os.system("rmdir " +weak_dir)
+						run_depmod(kernel)
+						run_mkinitrd(kernel)	
+
+def add_kernel(kernel):
+	"""Add the (specified) system kernel and create update links."""
+
+	modules = {}
+	kernels = {}
+	compatibles = {}
+
+	if kernel == "":
+		status,kernel = commands.getstatusoutput('uname -r')
+
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)\.ko$')
+	modfiles=os.popen("find /lib/modules")
+	while true:
+		in_line=(modfiles.readline())[:-1]
+		if in_line == "":
+			break
+		m = p.match(in_line)
+		if not m:
+			continue
+		module=in_line
+
+		# Check it the module exists, extract vermagic, otherwise try
+		# to pull the information out of the path component
+		if os.path.isfile(module):
+			minfo = os.popen("/sbin/modinfo -F vermagic " + module)
+			kver = (string.split(minfo.readline()))[0]
+			minfo.close()
+
+		# Store the module version in a dictionary.
+		modules[module] = {	"kver": kver,
+					"package": "",
+					"kabireq": []
+					}
+
+	modfiles.close()
+
+	module_kabideps(modules)
+	kernel_kabideps(kernels)
+	check_compatibility(modules,kernels,compatibles)
+
+	if not compatibles.has_key(kernel):
+		print "Cannot locate data on installed kernel!"
+		sys.exit(1)
+
+	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
+	for module in range(0,len(compatibles[kernel])):
+		modfile=compatibles[kernel][module]
+		m = p.match(modfile)
+		if not m:
+			print "Non-standard module location"
+			sys.exit(1)
+		mod_kern=m.group(1)
+		weak_dir="/lib/modules/" + kernel \
+			+ "/weak-updates/" + m.group(2)
+		weak_link=weak_dir+"/"+m.group(3)
+
+		if mod_kern != kernel:
+			# ignore the kernel that matches the module
+
+			if verbose == "yes":
+				print "create: " + weak_link
+				print "     -> " + modfile
+
+			if dry_run == "no":
+				os.system("mkdir -p " + weak_dir)
+				os.system("ln -sf " + modfile + " " + weak_link)
+				run_depmod(kernel)
+				run_mkinitrd(kernel)
+
+def remove_kernel(kernel):
+	"""Remove the given kernel from the system."""
+	
+	weakup_dir = "/lib/modules/" + kernel + "/weak-updates"
+	if not os.path.isdir(weakup_dir):
+		print "No weak updates directory found."
+		sys.exit(0)
+	weak_updates = os.popen("find " + weakup_dir + " -iname \"*.ko\"")
+
+	while true:
+		in_line = (weak_updates.readline())[:-1]
+		if in_line == "":
+			break
+		module=in_line
+		p = re.compile('^.*/lib/modules/(.*)/weak-updates/(.*)/(.*)$')
+		m = p.match(module)
+		if not m:
+			print "Non standard module location!"
+			sys.exit(1)
+		weak_dir = weakup_dir+"/"+m.group(2)
+
+		if verbose == "yes":
+			print "remove: " + module
+
+		if dry_run == "no":
+			os.system("rm -f " + module)
+			os.system("rmdir " + weak_dir)
+			run_depmod(kernel)
+			run_mkinitrd(kernel)
+	
+
+if __name__ == "__main__":
+
+	opts, args = getopt.getopt(sys.argv[1:], 'arh', [ 'add-modules', 'remove-modules', 'add-kernel=', 'remove-kernel=', 'dry-run', 'verbose', 'help' ])
+
+	do_add_modules=0
+	do_remove_modules=0
+	do_add_kernel=0
+	do_remove_kernel=0
+	kernel=""
+
+	for o, v in opts:
+		if o == '--add-modules' or o == '-a':
+			do_add_modules=1
+		if o == '--remove-modules' or o == 'r':
+			do_remove_modules=1
+		if o == '--add-kernel':
+			do_add_kernel=1
+			kernel=v
+		if o == '--remove-kernel':
+			do_remove_kernel=1
+			kernel=v
+		if o == '--dry-run':
+			dry_run="yes"
+		if o == '--verbose':
+			verbose="yes"
+		if o == '--help' or o == 'h':
+			usage()
+			sys.exit(0)
+
+	if do_add_modules==1:
+		add_modules()
+		sys.exit(0)
+
+	if do_remove_modules==1:
+		remove_modules()
+		sys.exit(0)
+
+	if do_add_kernel==1:
+		add_kernel(kernel)
+		sys.exit(0)
+
+	if do_remove_kernel==1:
+		remove_kernel(kernel)
+		sys.exit(0)
+
+	print "You didn't ask me to do anything! Here's some usage information!"
+	usage()
+	sys.exit(0)



From fedora-cvs-commits at redhat.com  Sun Jul 30 07:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 03:56:33 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.27,1.28
Message-ID: <200607300756.k6U7uXIM028273@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28163

Modified Files:
	module-init-tools.spec 
Log Message:
close a few open files in weak-updates



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- module-init-tools.spec	30 Jul 2006 07:50:42 -0000	1.27
+++ module-init-tools.spec	30 Jul 2006 07:56:31 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.2
+Release: 0.pre1.4.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
@@ -98,8 +98,8 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.2
-- New weak-modules
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.3
+- New weak-modules with fixes
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.3-0.pre1.4.1
 - rebuild



From fedora-cvs-commits at redhat.com  Sun Jul 30 08:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 04:11:08 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2476,1.2477
Message-ID: <200607300811.k6U8B8eD031756@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31696

Modified Files:
	kernel-2.6.spec 
Log Message:
Need to call weak-modules on kernel update



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2476
retrieving revision 1.2477
diff -u -r1.2476 -r1.2477
--- kernel-2.6.spec	30 Jul 2006 07:04:46 -0000	1.2476
+++ kernel-2.6.spec	30 Jul 2006 08:11:04 -0000	1.2477
@@ -184,7 +184,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 >= 8.11.1-1, mkinitrd >= 4.2.21-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.21-1, python
 
 Name: kernel
 Group: System Environment/Kernel
@@ -1426,6 +1426,7 @@
 fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}
 
 %post devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1438,6 +1439,7 @@
 %post smp
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp
 /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}smp
 
 %post smp-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1453,6 +1455,7 @@
 fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}PAE
 /sbin/new-kernel-pkg --package kernel-PAE --mkinitrd --depmod --install %{KVERREL}PAE
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}PAE
 
 %post PAE-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1470,6 +1473,7 @@
 	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}xen
 
 %post xen-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1482,6 +1486,7 @@
 %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
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --add-kernel %{KVERREL}kdump
 
 %post kdump-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -1493,18 +1498,23 @@
 
 %preun
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}
 
 %preun smp
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}smp
 
 %preun PAE
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}PAE
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}PAE
 
 %preun kdump
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}kdump
 
 %preun xen
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
+[ -f /sbin/weak-modules ] && /sbin/weak-modules --remove-kernel %{KVERREL}xen
 
 ###
 ### file lists
@@ -1652,6 +1662,9 @@
 %endif
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com>
+- Wasn't calling weak-modules properly.
+
 * Sun Jul 30 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3
 



From fedora-cvs-commits at redhat.com  Sun Jul 30 08:12:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 04:12:41 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.28,
	1.29 weak-modules, 1.2, 1.3
Message-ID: <200607300812.k6U8CfYY032276@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32187

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
don't call mkinitrd when removing a kernel



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- module-init-tools.spec	30 Jul 2006 07:56:31 -0000	1.28
+++ module-init-tools.spec	30 Jul 2006 08:12:37 -0000	1.29
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.3
+Release: 0.pre1.4.4
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.4
+- Don't call mkinitrd when removing a kernel.
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.3
 - New weak-modules with fixes
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- weak-modules	30 Jul 2006 07:50:42 -0000	1.2
+++ weak-modules	30 Jul 2006 08:12:39 -0000	1.3
@@ -388,7 +388,8 @@
 			os.system("rm -f " + module)
 			os.system("rmdir " + weak_dir)
 			run_depmod(kernel)
-			run_mkinitrd(kernel)
+			#kernel removed so no need to rerun mkinitrd
+			#run_mkinitrd(kernel)
 	
 
 if __name__ == "__main__":



From fedora-cvs-commits at redhat.com  Sun Jul 30 08:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 04:18:57 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2477,1.2478
Message-ID: <200607300818.k6U8Ivmq016800@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16656

Modified Files:
	kernel-2.6.spec 
Log Message:
why is kabitool not being used any more, randomly?



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2477
retrieving revision 1.2478
diff -u -r1.2477 -r1.2478
--- kernel-2.6.spec	30 Jul 2006 08:11:04 -0000	1.2477
+++ kernel-2.6.spec	30 Jul 2006 08:18:54 -0000	1.2478
@@ -1664,6 +1664,7 @@
 %changelog
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com>
 - Wasn't calling weak-modules properly.
+- kabitool not being picked up (weird).
 
 * Sun Jul 30 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3



From fedora-cvs-commits at redhat.com  Sun Jul 30 10:50:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 06:50:38 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.4, 1.5
Message-ID: <200607301050.k6UAocnm014871@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14837

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
Log Message:
OOo defaults to the IBM java locations for ppc

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 config_office/set_soenv.in                   |    7 +++----
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 5 files changed, 12 insertions(+), 9 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	28 Jul 2006 18:44:08 -0000	1.4
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	30 Jul 2006 10:50:33 -0000	1.5
@@ -54,3 +54,19 @@
            "/lib/libgcj.so.7",
            "/lib/libgcj.so.6"
  #endif
+--- openoffice.org.orig/config_office/set_soenv.in	2006-07-30 10:33:54.000000000 +0100
++++ openoffice.org/config_office/set_soenv.in	2006-07-30 10:35:32.000000000 +0100
+@@ -425,10 +425,9 @@
+       $CPU            = "P";
+       $CPUNAME        = "POWERPC";
+       $OUTPATH        = "unxlngppc";
+-# j2sdk is IBMJava2-ppc-142
+-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
++      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
++      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+    }
+    elsif ($platform =~ m/^s390/)
+    {  print "Setting Linux S/390 specific values... ";



From fedora-cvs-commits at redhat.com  Sun Jul 30 14:58:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 10:58:55 -0400
Subject: rpms/epiphany/devel epiphany.spec,1.110,1.111
Message-ID: <200607301458.k6UEwt1b012939@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12857

Modified Files:
	epiphany.spec 
Log Message:
rebuild against firefox



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- epiphany.spec	29 Jul 2006 04:02:46 -0000	1.110
+++ epiphany.spec	30 Jul 2006 14:58:53 -0000	1.111
@@ -54,7 +54,7 @@
 Summary: The files needed for developing extensions for the epiphany web browser
 Group: Development/Libraries
 Requires: epiphany = %{version}
-Requires: mozilla-devel >= %{mozilla_devel_ver}
+Requires: firefox-devel >= %{firefox_ver}
 Requires: glib2-devel >= %{glib2_devel_ver}
 Requires: gtk2-devel >= %{gtk2_devel_ver}
 Requires: scrollkeeper >= %{scrollkeeper_ver}



From fedora-cvs-commits at redhat.com  Sun Jul 30 18:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 14:04:04 -0400
Subject: rpms/file-roller/devel file-roller-2.15.1-recent.patch, NONE,
	1.1 file-roller-2.15.1-recent2.patch, NONE,
	1.1 file-roller.spec, 1.65, 1.66
Message-ID: <200607301804.k6UI44Ix011227@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11182

Modified Files:
	file-roller.spec 
Added Files:
	file-roller-2.15.1-recent.patch 
	file-roller-2.15.1-recent2.patch 
Log Message:
fix warnings


file-roller-2.15.1-recent.patch:
 window.c |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE file-roller-2.15.1-recent.patch ---
--- file-roller-2.15.1/src/window.c.recent	2006-07-30 13:46:21.000000000 -0400
+++ file-roller-2.15.1/src/window.c	2006-07-30 13:48:07.000000000 -0400
@@ -3472,16 +3472,6 @@
 			  "item_activated",
 			  G_CALLBACK (recent_chooser_item_activated_cb),
 			  window);
-
-	/* filter */
-
-	filter = gtk_recent_filter_new ();
-	gtk_recent_filter_set_name (filter, _("All archives"));
-	for (i = 0; open_type[i] != FR_FILE_TYPE_NULL; i++)
-		gtk_recent_filter_add_mime_type (filter, file_type_desc[open_type[i]].mime_type);
-
-	gtk_recent_chooser_add_filter (chooser, filter);
-	gtk_recent_chooser_set_filter (chooser, filter);
 }
 
 

file-roller-2.15.1-recent2.patch:
 window.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-roller-2.15.1-recent2.patch ---
--- file-roller-2.15.1/src/window.c.recent2	2006-07-30 14:02:04.000000000 -0400
+++ file-roller-2.15.1/src/window.c	2006-07-30 14:02:16.000000000 -0400
@@ -1116,7 +1116,7 @@
 
 	/* recents menu. */
 
-	set_sensitive (window, "RecentFilesMenu", ! running);
+	set_sensitive (window, "OpenRecentMenu", ! running);
 }
 
 


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- file-roller.spec	12 Jul 2006 19:40:43 -0000	1.65
+++ file-roller.spec	30 Jul 2006 18:04:00 -0000	1.66
@@ -11,12 +11,16 @@
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
 Version:	2.15.1
-Release: 	1
+Release: 	2
 
 License:	GPL
 Group:		Applications/Archiving
 URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 Source:		file-roller-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=349333
+Patch0:		file-roller-2.15.1-recent.patch
+# already fixed in upstream
+Patch1:		file-roller-2.15.1-recent2.patch
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -50,6 +54,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .recent
+%patch1 -p1 -b .recent2
 
 %build
 autoconf
@@ -120,7 +126,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
-* Wed Jul 12 2006 Matthisa Clasen <mclasen at redhat.com> - 2.15.1-1
+* Sun Jul 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-2
+- Avoid warnings from recent menu
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
 - Update to 2.15.1
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.3-4.1



From fedora-cvs-commits at redhat.com  Sun Jul 30 18:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 14:05:32 -0400
Subject: rpms/kernel/devel linux-2.6-xen.patch,1.46,1.47
Message-ID: <200607301805.k6UI5WF7011507@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11352

Modified Files:
	linux-2.6-xen.patch 
Log Message:
compile fix

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1169 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |  375 --
 arch/ia64/kernel/gate.lds.S                         |   95 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/patch.c                            |  197 -
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    1 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  795 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1156 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  568 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  124 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1121 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1605 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   11 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   50 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    2 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 409 files changed, 85166 insertions(+), 871 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- linux-2.6-xen.patch	27 Jul 2006 13:05:34 -0000	1.46
+++ linux-2.6-xen.patch	30 Jul 2006 18:05:14 -0000	1.47
@@ -12922,7 +12922,7 @@
 +/* Width of DMA addresses in the IO TLB. 31 bits is an aacraid limitation. */
 +#define IO_TLB_DMA_BITS 31
 +
-+static int swiotlb_force;
++int swiotlb_force;
 +static char *iotlb_virt_start;
 +static unsigned long iotlb_nslabs;
 +



From fedora-cvs-commits at redhat.com  Sun Jul 30 18:50:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 14:50:20 -0400
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.22,
	1.23 redhat-rpm-config.spec, 1.30, 1.31 sources, 1.22, 1.23
Message-ID: <200607301850.k6UIoKbw022810@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22658

Modified Files:
	.cvsignore redhat-rpm-config.spec sources 
Log Message:
Updated tests for kernel and kmods being built



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	15 Jun 2006 17:45:37 -0000	1.22
+++ .cvsignore	30 Jul 2006 18:50:18 -0000	1.23
@@ -1 +1 @@
-redhat-rpm-config-8.0.43.tar.gz
+redhat-rpm-config-8.0.44.tar.gz


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- redhat-rpm-config.spec	15 Jun 2006 17:39:35 -0000	1.30
+++ redhat-rpm-config.spec	30 Jul 2006 18:50:18 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.43
+Version: 8.0.44
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 8.0.44-1
+- Add a better check for a kernel vs. kmod.
+
 * Thu Jun 15 2006 Jon Masters <jcm at redhat.com> - 8.0.43-1
 - Workaround bug in find-requires/find-provides for kmods.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	15 Jun 2006 17:45:37 -0000	1.22
+++ sources	30 Jul 2006 18:50:18 -0000	1.23
@@ -1 +1 @@
-b4b4a4aaeb150a6727918761df0bc8f9  redhat-rpm-config-8.0.43.tar.gz
+d930d0d3a8efdfb293cb571921ced953  redhat-rpm-config-8.0.44.tar.gz



From fedora-cvs-commits at redhat.com  Sun Jul 30 18:59:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 14:59:12 -0400
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.23,
	1.24 redhat-rpm-config.spec, 1.31, 1.32 sources, 1.23, 1.24
Message-ID: <200607301859.k6UIxCIi026170@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26083

Modified Files:
	.cvsignore redhat-rpm-config.spec sources 
Log Message:
oops. inverted a test by mistake



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Jul 2006 18:50:18 -0000	1.23
+++ .cvsignore	30 Jul 2006 18:59:10 -0000	1.24
@@ -1 +1 @@
-redhat-rpm-config-8.0.44.tar.gz
+redhat-rpm-config-8.0.45.tar.gz


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- redhat-rpm-config.spec	30 Jul 2006 18:50:18 -0000	1.31
+++ redhat-rpm-config.spec	30 Jul 2006 18:59:10 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.44
+Version: 8.0.45
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 8.0.45-1
+- Fix inverted kernel test.
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 8.0.44-1
 - Add a better check for a kernel vs. kmod.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Jul 2006 18:50:18 -0000	1.23
+++ sources	30 Jul 2006 18:59:10 -0000	1.24
@@ -1 +1 @@
-d930d0d3a8efdfb293cb571921ced953  redhat-rpm-config-8.0.44.tar.gz
+0e8ca54ca16ed9bb0af8825f2f5bad26  redhat-rpm-config-8.0.45.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 01:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 21:44:56 -0400
Subject: rpms/pirut/devel .cvsignore, 1.29, 1.30 pirut.spec, 1.30,
	1.31 sources, 1.30, 1.31
Message-ID: <200607310144.k6V1iuUW028405@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28366/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-1.1.8-1 on branch devel from pirut-1.1.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	27 Jul 2006 21:21:21 -0000	1.29
+++ .cvsignore	31 Jul 2006 01:44:53 -0000	1.30
@@ -1 +1 @@
-pirut-1.1.7.tar.gz
+pirut-1.1.8.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pirut.spec	27 Jul 2006 21:21:21 -0000	1.30
+++ pirut.spec	31 Jul 2006 01:44:53 -0000	1.31
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 1.1.7
+Version: 1.1.8
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sun Jul 30 2006 Jeremy Katz <katzj at redhat.com> - 1.1.8-1
+- Fix traceback (clumens, #200515)
+
 * Thu Jul 27 2006 Jeremy Katz <katzj at redhat.com> - 1.1.7-1
 - Handle uncategorized groups better, especially for cdinstall-helper
 - Fix missing comma in rebootpkgs list (lmacken)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Jul 2006 21:21:21 -0000	1.30
+++ sources	31 Jul 2006 01:44:53 -0000	1.31
@@ -1 +1 @@
-fc7e17223768a4e81dc7c30096a22eb6  pirut-1.1.7.tar.gz
+f1e1460974b63f3a6541cebb7db927ae  pirut-1.1.8.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 01:45:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 21:45:13 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.29,
	1.30 weak-modules, 1.3, 1.4
Message-ID: <200607310145.k6V1jDMB028578@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28500

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
fixes



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- module-init-tools.spec	30 Jul 2006 08:12:37 -0000	1.29
+++ module-init-tools.spec	31 Jul 2006 01:45:11 -0000	1.30
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.4
+Release: 0.pre1.4.5
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,6 +98,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.5
+- Don't call depmod on removing a kernel.
+- Warn rather than exit if we can't process weak-updates on new kernel
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.4
 - Don't call mkinitrd when removing a kernel.
 


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- weak-modules	30 Jul 2006 08:12:39 -0000	1.3
+++ weak-modules	31 Jul 2006 01:45:11 -0000	1.4
@@ -332,8 +332,12 @@
 	check_compatibility(modules,kernels,compatibles)
 
 	if not compatibles.has_key(kernel):
-		print "Cannot locate data on installed kernel!"
-		sys.exit(1)
+		print "**** weak-modules did not process this kernel ****"
+		print "weak-updates links not updated for " + kernel
+		print "Please run /sbin/weak-modules --add-kernel `uname -r`"
+		print "in order to update kernel module compatibility links."
+		# Don't error this result because the above warning is enough.
+		sys.exit(0)
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)$')
 	for module in range(0,len(compatibles[kernel])):
@@ -387,9 +391,7 @@
 		if dry_run == "no":
 			os.system("rm -f " + module)
 			os.system("rmdir " + weak_dir)
-			run_depmod(kernel)
-			#kernel removed so no need to rerun mkinitrd
-			#run_mkinitrd(kernel)
+			#kernel removed so no need to rerun mkinitrd or depmod
 	
 
 if __name__ == "__main__":



From fedora-cvs-commits at redhat.com  Mon Jul 31 01:53:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 30 Jul 2006 21:53:32 -0400
Subject: rpms/module-init-tools/devel module-init-tools.spec, 1.30,
	1.31 weak-modules, 1.4, 1.5
Message-ID: <200607310153.k6V1rWJY013955@cvs.devel.redhat.com>

Author: jcm

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13806

Modified Files:
	module-init-tools.spec weak-modules 
Log Message:
handle duplicate module names in a temporary way. Make generic later on.



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- module-init-tools.spec	31 Jul 2006 01:45:11 -0000	1.30
+++ module-init-tools.spec	31 Jul 2006 01:53:30 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.3
-Release: 0.pre1.4.5
+Release: 0.pre1.4.6
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2
@@ -98,9 +98,10 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.5
+* Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.6
 - Don't call depmod on removing a kernel.
 - Warn rather than exit if we can't process weak-updates on new kernel
+- Handle duplicate modules by picking the latter version of the two.
 
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com> - 3.3-0.pre1.4.4
 - Don't call mkinitrd when removing a kernel.


Index: weak-modules
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/weak-modules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- weak-modules	31 Jul 2006 01:45:11 -0000	1.4
+++ weak-modules	31 Jul 2006 01:53:30 -0000	1.5
@@ -302,7 +302,12 @@
 		status,kernel = commands.getstatusoutput('uname -r')
 
 	p = re.compile('^.*/lib/modules/([^/]*)/extra/(.*)/(.*)\.ko$')
-	modfiles=os.popen("find /lib/modules")
+
+	# FIXME: at the moment, we sort the modules so that if two versions
+	# of a kmod are installed, we will end up linking the latter. In the
+	# end the module list should just be processed to prune out dups.
+
+	modfiles=os.popen("find /lib/modules | sort")
 	while true:
 		in_line=(modfiles.readline())[:-1]
 		if in_line == "":



From fedora-cvs-commits at redhat.com  Mon Jul 31 04:54:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 00:54:38 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.104,
	1.105
Message-ID: <200607310454.k6V4sctd005309@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5257

Modified Files:
	evolution-data-server.spec 
Log Message:
re build



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- evolution-data-server.spec	26 Jul 2006 14:09:36 -0000	1.104
+++ evolution-data-server.spec	31 Jul 2006 04:54:36 -0000	1.105
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.90.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -328,6 +328,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Sun Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.90.1-3
+- Rebuild
+
 * Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.90.1-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 05:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 01:28:34 -0400
Subject: rpms/scim-anthy/devel .cvsignore, 1.8, 1.9 scim-anthy.spec, 1.33,
	1.34 sources, 1.8,
	1.9 scim-anthy-1.0.0-pseudo-ascii-insert-space.patch, 1.1,
	NONE scim-anthy-1.0.0-pseudo-ascii.patch, 1.1, NONE
Message-ID: <200607310528.k6V5SYMo030182@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30152

Modified Files:
	.cvsignore scim-anthy.spec sources 
Removed Files:
	scim-anthy-1.0.0-pseudo-ascii-insert-space.patch 
	scim-anthy-1.0.0-pseudo-ascii.patch 
Log Message:
* Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
- New upstream release.
- scim-anthy-1.0.0-pseudo-ascii*.patch: merged into upstream.
  removed from srpm.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Mar 2006 10:04:53 -0000	1.8
+++ .cvsignore	31 Jul 2006 05:28:32 -0000	1.9
@@ -9,3 +9,4 @@
 scim-anthy-0.8.0.tar.gz
 scim-anthy-0.9.0.tar.gz
 scim-anthy-1.0.0.tar.gz
+scim-anthy-1.2.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- scim-anthy.spec	14 Jul 2006 12:32:55 -0000	1.33
+++ scim-anthy.spec	31 Jul 2006 05:28:32 -0000	1.34
@@ -1,8 +1,8 @@
 %define with_libstdc_preview 0
 
 Name:           scim-anthy
-Version:        1.0.0
-Release:	4%{?dist}
+Version:        1.2.0
+Release:	1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -14,8 +14,6 @@
 Buildrequires: libstdc++so7-devel
 %endif
 Patch1:		scim-anthy-helper-moduledir.patch
-Patch2:		scim-anthy-1.0.0-pseudo-ascii.patch
-Patch3:		scim-anthy-1.0.0-pseudo-ascii-insert-space.patch
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -28,8 +26,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-moduledir
-%patch2 -p1 -b .2-pseudo-ascii
-%patch3 -p0 -b .3-insert-space
 # patch1 touches src/Makefile.am
 aclocal
 automake
@@ -74,6 +70,11 @@
 
 
 %changelog
+* Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
+- New upstream release.
+- scim-anthy-1.0.0-pseudo-ascii*.patch: merged into upstream.
+  removed from srpm.
+
 * Fri Jul 14 2006 Akira TAGOH <tagohr at edhat.com> - 1.0.0-4
 - scim-anthy-1.0.0-pseudo-ascii.patch,
   scim-anthy-1.0.0-pseudo-ascii-insert-space.patch: applied to allow the ASCII


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Mar 2006 10:04:53 -0000	1.8
+++ sources	31 Jul 2006 05:28:32 -0000	1.9
@@ -1 +1 @@
-b0c452da1886ba36f47d9bd9f6ea7a10  scim-anthy-1.0.0.tar.gz
+ce8d4ff0c8e96413d343e2d80daba3ee  scim-anthy-1.2.0.tar.gz


--- scim-anthy-1.0.0-pseudo-ascii-insert-space.patch DELETED ---


--- scim-anthy-1.0.0-pseudo-ascii.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 31 05:32:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 01:32:26 -0400
Subject: rpms/scim-anthy/FC-5 scim-anthy.spec,1.29,1.30
Message-ID: <200607310532.k6V5WQuS031212@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-anthy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31182

Modified Files:
	scim-anthy.spec 
Log Message:
* Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
- New upstream release.


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/FC-5/scim-anthy.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- scim-anthy.spec	14 Jun 2006 03:37:51 -0000	1.29
+++ scim-anthy.spec	31 Jul 2006 05:32:24 -0000	1.30
@@ -1,15 +1,15 @@
 %define with_libstdc_preview 1 
 
 Name:           scim-anthy
-Version:        1.0.0
-Release:	1.fc5.1
+Version:        1.2.0
+Release:	1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
-BuildRequires:	anthy-devel >= 6700b-1 gettext-devel
+BuildRequires:	anthy-devel >= 6700b-1 gettext-devel automake libtool
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
+- New upstream release.
+
 * Wed Jun 14 2006 Jens Petersen <petersen at redhat.com>
 - update libstdc++so7 libtool tweak to handle gcc-4.1.x
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 05:33:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 01:33:06 -0400
Subject: rpms/scim-anthy/FC-5 .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200607310533.k6V5X6dR031337@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/scim-anthy/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31323

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Mar 2006 10:11:04 -0000	1.8
+++ .cvsignore	31 Jul 2006 05:33:04 -0000	1.9
@@ -9,3 +9,4 @@
 scim-anthy-0.8.0.tar.gz
 scim-anthy-0.9.0.tar.gz
 scim-anthy-1.0.0.tar.gz
+scim-anthy-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Mar 2006 10:11:05 -0000	1.8
+++ sources	31 Jul 2006 05:33:04 -0000	1.9
@@ -1 +1 @@
-b0c452da1886ba36f47d9bd9f6ea7a10  scim-anthy-1.0.0.tar.gz
+ce8d4ff0c8e96413d343e2d80daba3ee  scim-anthy-1.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 08:01:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 04:01:11 -0400
Subject: rpms/squid/devel squid-2.6.STABLE1-fd-config-updated.patch, NONE,
	1.1 squid-2.6.STABLE2-build.patch, NONE, 1.1 sources, 1.20,
	1.21 squid.spec, 1.68, 1.69 squid-2.6.STABLE1-20060725.patch,
	1.1, NONE squid-2.6.STABLE1-build.patch, 1.1,
	NONE squid-2.6.STABLE1-fd-config.patch, 1.1, NONE
Message-ID: <200607310801.k6V81Bh5001880@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1775

Modified Files:
	sources squid.spec 
Added Files:
	squid-2.6.STABLE1-fd-config-updated.patch 
	squid-2.6.STABLE2-build.patch 
Removed Files:
	squid-2.6.STABLE1-20060725.patch squid-2.6.STABLE1-build.patch 
	squid-2.6.STABLE1-fd-config.patch 
Log Message:
the latest stable upstream, reworked fd config patch

squid-2.6.STABLE1-fd-config-updated.patch:
 configure               |   28 ++++++++++++++++++++++++++++
 configure.in            |   10 ++++++++++
 include/autoconf.h.in   |    3 +++
 src/cf.data.pre         |   19 +++++++++++++++++++
 src/comm_epoll.c        |   15 +++++++++++++++
 src/comm_poll.c         |   26 ++++++++++++++++++++++----
 src/comm_select.c       |   26 ++++++++++++++++++++++++--
 src/comm_select_win32.c |   26 ++++++++++++++++++++++++--
 src/main.c              |   11 ++++++++---
 src/squid.h             |    4 ++++
 src/stat.c              |    2 +-
 src/structs.h           |    3 +++
 src/tools.c             |   15 +++++++++++++++
 13 files changed, 176 insertions(+), 12 deletions(-)

--- NEW FILE squid-2.6.STABLE1-fd-config-updated.patch ---
--- squid-2.6.STABLE1/configure.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/configure	2006-07-26 09:58:41.000000000 +0200
@@ -2970,6 +2970,34 @@
   AMDEP_FALSE=
 fi
 
+if false; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+# Check whether --enable-fd-config or --disable-fd-config was given.
+if test "${enable_fd_config+set}" = set; then
+  enableval="$enable_fd_config"
+   if test "$enableval" = "yes" ; then
+    echo "File descriptor config enabled"
+    cat >> confdefs.h <<\EOF
+#define FD_CONFIG 1
+EOF
+
+    
+
+if true; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+  fi
+
+fi
 
 
 
--- squid-2.6.STABLE1/include/autoconf.h.in.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/include/autoconf.h.in	2006-07-26 09:58:41.000000000 +0200
@@ -36,6 +36,9 @@
 /* Traffic management via "delay pools". */
 #undef DELAY_POOLS
 
+/* Filedesc managment */
+#undef FD_CONFIG
+
 /* Enable following X-Forwarded-For headers */
 #undef FOLLOW_X_FORWARDED_FOR
 
--- squid-2.6.STABLE1/configure.in.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/configure.in	2006-07-26 09:58:41.000000000 +0200
@@ -501,6 +501,16 @@
   fi
 ])
 
+AM_CONDITIONAL(USE_FD_CONFIG, false)
+AC_ARG_ENABLE(fd-config,
+[  --enable-fd-config    Enable filedesc config to configure maximal number of used filedescriptors],
+[ if test "$enableval" = "yes" ; then
+    echo "Filedesc config enabled"
+    AC_DEFINE(FD_CONFIG)
+    AM_CONDITIONAL(USE_FD_CONFIG, true)
+  fi
+])
+
 dnl This is a developer only option. Developers know how to set defines
 dnl
 dnl AC_ARG_ENABLE(mem-gen-trace,
--- squid-2.6.STABLE1/src/cf.data.pre.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/cf.data.pre	2006-07-26 10:05:54.000000000 +0200
@@ -5027,4 +5027,23 @@
 	or response to be rejected.
 DOC_END
 
+NAME: max_filedesc
+IFDEF: FD_CONFIG
+TYPE: int
+DEFAULT: 1024
+LOC: Config.max_filedesc
+DOC_START
+	The maximum number of open file descriptors.
+        
+	WARNING: Changes of this value isn't respected by reconfigure 
+	command. This value should be changed only if there isn't 
+	any active squid process.
+
+	NOTE: This option is only supported by system with poll()
+	or epoll(). You can set this value by --with-maxfd during 
+	compilation on system whith uses select().
+	
+	The maximum value for max_filedesc is set by --with-maxfd during
+	compilation.
+DOC_END
 EOF
--- squid-2.6.STABLE1/src/comm_poll.c.fd	2006-06-25 17:53:14.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_poll.c	2006-07-26 09:58:41.000000000 +0200
@@ -152,13 +152,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
@@ -286,9 +304,9 @@
 int
 comm_select(int msec)
 {
-    struct pollfd pfds[SQUID_MAXFD];
+    struct pollfd pfds[Squid_MaxFD];
 #if DELAY_POOLS
-    char slowfds[SQUID_MAXFD];
+    char slowfds[Squid_MaxFD];
 #endif
     int fd;
     unsigned int i;
--- squid-2.6.STABLE1/src/comm_epoll.c.fd	2006-06-27 15:09:43.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_epoll.c	2006-07-26 09:58:41.000000000 +0200
@@ -86,6 +86,21 @@
     safe_free(epoll_state);
 }
 
+#if DELAY_POOLS
+
+/* dummy functions... */
+void
+comm_slow_fd_init(int fd_num)
+{
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+}
+
+#endif
+
 void
 commSetEvents(int fd, int need_read, int need_write)
 {
--- squid-2.6.STABLE1/src/main.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/main.c	2006-07-26 09:58:41.000000000 +0200
@@ -601,6 +601,9 @@
 #if DELAY_POOLS
 	delayPoolsInit();
 #endif
+#if DELAY_POOLS
+	comm_slow_fd_init(Squid_MaxFD);
+#endif
 	fwdInit();
     }
 #if USE_WCCP
@@ -664,8 +667,6 @@
 #endif
 
     debug_log = stderr;
-    if (FD_SETSIZE < Squid_MaxFD)
-	Squid_MaxFD = FD_SETSIZE;
 
 #ifdef _SQUID_WIN32_
     if ((WIN32_init_err = WIN32_Subsystem_Init(&argc, &argv)))
@@ -748,6 +749,8 @@
     /* Make sure the OS allows core dumps if enabled in squid.conf */
     enableCoredumps();
 
+    setMaxFD();
+
 #if TEST_ACCESS
     comm_init();
     comm_select_init();
@@ -781,7 +784,6 @@
     }
     if (!opt_no_daemon)
 	watch_child(argv);
-    setMaxFD();
 
     /* init comm module */
     comm_init();
@@ -1086,6 +1088,9 @@
 #endif
     releaseServerSockets();
     commCloseAllSockets();
+#if DELAY_POOLS
+    comm_slow_fd_destroy();
+#endif
     authenticateShutdown();
 #if USE_UNLINKD
     unlinkdClose();
--- squid-2.6.STABLE1/src/structs.h.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/structs.h	2006-07-26 09:58:41.000000000 +0200
@@ -805,6 +805,9 @@
 #endif
     time_t refresh_stale_window;
     int umask;
+#if FD_CONFIG
+    int max_filedesc;
+#endif
 };
 
 struct _SquidConfig2 {
--- squid-2.6.STABLE1/src/tools.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/tools.c	2006-07-26 09:58:41.000000000 +0200
@@ -757,6 +757,21 @@
 void
 setMaxFD(void)
 {
+
+/* Set up number of used filedescriptors from config file */
+/* Override the default settings Squid_MaxFD = FD_SETSIZE */
+#if FD_CONFIG
+    Squid_MaxFD = Config.max_filedesc;
+
+    /* don't exceed limit which was set during compilation */
+    if(SQUID_MAXFD < Squid_MaxFD)
+	Squid_MaxFD = SQUID_MAXFD;
+#else
+    /* don't exceed FD_SETSIZE */
+    if(FD_SETSIZE < Squid_MaxFD)
+	Squid_MaxFD = FD_SETSIZE;
+#endif
+
 #if HAVE_SETRLIMIT
     /* try to use as many file descriptors as possible */
     /* System V uses RLIMIT_NOFILE and BSD uses RLIMIT_OFILE */
--- squid-2.6.STABLE1/src/comm_select_win32.c.fd	2006-06-11 19:06:25.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_select_win32.c	2006-07-26 09:58:41.000000000 +0200
@@ -34,6 +34,10 @@
 
 #include "squid.h"
 
+#if FD_CONFIG
+#error "Filedescriptor configuration isn't supported by this module!"
+#endif
+
 static int MAX_POLL_TIME = 1000;	/* see also comm_quick_poll_required() */
 
 /* STATIC */
@@ -144,13 +148,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
--- squid-2.6.STABLE1/src/comm_select.c.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_select.c	2006-07-26 09:58:41.000000000 +0200
@@ -38,6 +38,10 @@
 #include <sys/select.h>
 #endif
 
+#if FD_CONFIG
+#error "Filedescriptor configuration isn't supported by this module!"
+#endif
+
 static int MAX_POLL_TIME = 1000;	/* see also comm_quick_poll_required() */
 
 #ifndef        howmany
@@ -157,13 +161,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
--- squid-2.6.STABLE1/src/squid.h.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/squid.h	2006-07-26 09:58:41.000000000 +0200
@@ -409,6 +409,10 @@
 #include "cache_snmp.h"
 #endif
 
+#if !USE_POLL && !USE_EPOLL
+#undef FD_CONFIG
+#endif
+
 #include "hash.h"
 #include "rfc1035.h"
 
--- squid-2.6.STABLE1/src/stat.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/stat.c	2006-07-26 09:58:41.000000000 +0200
@@ -1031,7 +1031,7 @@
     statHistEnumInit(&C->comm_icp_incoming, INCOMING_ICP_MAX);
     statHistEnumInit(&C->comm_dns_incoming, INCOMING_DNS_MAX);
     statHistEnumInit(&C->comm_http_incoming, INCOMING_HTTP_MAX);
-    statHistIntInit(&C->select_fds_hist, 256);	/* was SQUID_MAXFD, but it is way too much. It is OK to crop this statistics */
+    statHistIntInit(&C->select_fds_hist, 256);	/* was Squid_MaxFD, but it is way too much. It is OK to crop this statistics */
 }
 
 /* add special cases here as they arrive */

squid-2.6.STABLE2-build.patch:
 errors/Makefile.in |   20 ++++++++++----------
 icons/Makefile.in  |    2 +-
 src/Makefile.in    |   22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE squid-2.6.STABLE2-build.patch ---
--- squid-2.6.STABLE2/errors/Makefile.in.build	2006-06-12 08:09:43.000000000 +0200
+++ squid-2.6.STABLE2/errors/Makefile.in	2006-07-31 09:38:42.000000000 +0200
@@ -221,8 +221,8 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-errordir = $(datadir)/errors
-DEFAULT_ERROR_DIR = $(errordir)
+errordir = $(pkgdatadir)/errors
+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
 INSTALL_LANGUAGES = @ERR_LANGUAGES@
 LANGUAGES = \
 		Azerbaijani \
@@ -413,17 +413,17 @@
 
 install-data-local:
 	@for l in $(INSTALL_LANGUAGES); do \
-		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
+		$(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
 		for f in $(srcdir)/$$l/ERR_*; do \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
 		done \
 	done
 
 uninstall-local:
 	@for l in $(INSTALL_LANGUAGES); do \
 		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	        	rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
 		done \
 	done
 
@@ -436,13 +436,13 @@
 #
 addlang: all
 	- at if test -d $(srcdir)/$(ADDLANG); then \
-	if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
+	if test -d $(errordir)/$(DESTLANG); then \
 	cd $(srcdir)/$(ADDLANG)/ ; \
 	for f in ERR_*; do \
-		if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
+		if test -f $(errordir)/$(DESTLANG)/$$f ; then \
 			echo "appending $(ADDLANG)/$$f"; \
-			echo "<HR>" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
-			cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
+			echo "<HR>" >> $(errordir)/$(DESTLANG)/$$f ; \
+			cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
 		fi; \
 	done; \
 	fi \
--- squid-2.6.STABLE2/icons/Makefile.in.build	2006-06-12 08:10:08.000000000 +0200
+++ squid-2.6.STABLE2/icons/Makefile.in	2006-07-31 09:38:42.000000000 +0200
@@ -258,7 +258,7 @@
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = 
--- squid-2.6.STABLE2/src/Makefile.in.build	2006-07-30 10:56:18.000000000 +0200
+++ squid-2.6.STABLE2/src/Makefile.in	2006-07-31 09:47:33.000000000 +0200
@@ -586,18 +586,18 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR = $(datadir)/icons
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
 DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
 
 # Don't automatically uninstall config files
@@ -842,20 +842,20 @@
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+	test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/squid"
 	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 
 uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Jul 2006 12:00:11 -0000	1.20
+++ sources	31 Jul 2006 08:01:04 -0000	1.21
@@ -1 +1 @@
-d6bb23a67b0475cca11d4af8d574d054  squid-2.6.STABLE1.tar.bz2
+838492f95de0964e31e633bfa07a0682  squid-2.6.STABLE2.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- squid.spec	25 Jul 2006 08:42:36 -0000	1.68
+++ squid.spec	31 Jul 2006 08:01:04 -0000	1.69
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.6.STABLE1
-Release: 3%{?dist}
+Version: 2.6.STABLE2
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -20,7 +20,6 @@
 
 # Upstream patches
 # the latest upstream CVS snapshot
-Patch100: squid-2.6.STABLE1-20060725.patch
 
 # External patches
 
@@ -29,10 +28,10 @@
 # will break upstream ones.
 Patch201: squid-2.5.STABLE11-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
-Patch203: squid-2.6.STABLE1-build.patch
+Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE12-smb-path.patch
-Patch206: squid-2.6.STABLE1-fd-config.patch
+Patch206: squid-2.6.STABLE1-fd-config-updated.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -55,8 +54,6 @@
 %prep
 %setup -q
 
-%patch100 -p1
-
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -101,6 +98,7 @@
    --enable-follow-x-forwarded-for \
    --enable-wccpv2 \
    --enable-fd-config \
+   --with-maxfd=16384 \
 
 
 
@@ -324,6 +322,10 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Jul 31 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE2-1
+- the latest stable upstream
+- reworked fd config patch
+
 * Wed Jul 25 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE1-3
 - the latest CVS upstream snapshot
 


--- squid-2.6.STABLE1-20060725.patch DELETED ---


--- squid-2.6.STABLE1-build.patch DELETED ---


--- squid-2.6.STABLE1-fd-config.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 31 08:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 04:10:59 -0400
Subject: rpms/postfix/devel .cvsignore, 1.20, 1.21 postfix.spec, 1.44,
	1.45 sources, 1.20, 1.21
Message-ID: <200607310810.k6V8Axm3004342@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4253

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
[tw]
- new version 2.3.2 with major upstream fixes:
  - corrupted queue file after a request to modify a short message header
  - panic after spurious Milter request when a client was rejected
  - maked the Milter more tolerant for redundant "data cleanup" requests
- applying pflogsumm-conn-delays-dsn-patch from postfix tree to pflogsumm




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	28 Jul 2006 08:54:35 -0000	1.20
+++ .cvsignore	31 Jul 2006 08:10:56 -0000	1.21
@@ -2,3 +2,4 @@
 postfix-2.2.10.tar.gz
 postfix-2.3.0.tar.gz
 postfix-2.3.1.tar.gz
+postfix-2.3.2.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- postfix.spec	28 Jul 2006 08:54:35 -0000	1.44
+++ postfix.spec	31 Jul 2006 08:10:56 -0000	1.45
@@ -42,7 +42,7 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.3.1
+Version: 2.3.2
 Release: 1
 Epoch: 2
 Group: System Environment/Daemons
@@ -137,6 +137,9 @@
 
 %if %{PFLOGSUMM}
 gzip -dc %{SOURCE53} | tar xf -
+pushd pflogsumm-%{pflogsumm_ver}
+patch -p0 < ../pflogsumm-conn-delays-dsn-patch
+popd
 %endif
 
 # pflogsumm subpackage
@@ -468,6 +471,13 @@
 
 
 %changelog
+* Mon Jul 31 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.2-1
+- new version 2.3.2 with major upstream fixes:
+  - corrupted queue file after a request to modify a short message header
+  - panic after spurious Milter request when a client was rejected
+  - maked the Milter more tolerant for redundant "data cleanup" requests
+- applying pflogsumm-conn-delays-dsn-patch from postfix tree to pflogsumm
+
 * Fri Jul 28 2006 Thomas Woerner <twoerner at redhat.com> 2:2.3.1-1
 - new version 2.3.1
 - fixes problems with TLS and Milter support


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	28 Jul 2006 08:54:35 -0000	1.20
+++ sources	31 Jul 2006 08:10:56 -0000	1.21
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-c4969321233186f6fc386a10b858c63b  postfix-2.3.1.tar.gz
+b1e482eea6a340041b8a637e62b15e3c  postfix-2.3.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 08:19:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 04:19:38 -0400
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch, NONE,
	1.1 openoffice.org.spec, 1.805, 1.806
Message-ID: <200607310819.k6V8JcG0022098@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22037

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch 
Log Message:
store openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch

openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch:
 psprint/inc/psprint/fontmanager.hxx       |    2 -
 psprint/source/fontmanager/fontconfig.cxx |   42 +++++++++++++++++++++++++++++-
 vcl/source/gdi/outdev3.cxx                |   28 ++++++++++----------
 3 files changed, 57 insertions(+), 15 deletions(-)

--- NEW FILE openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch ---
--- OOC680_m7/psprint/inc/psprint/fontmanager.hxx.foo	2006-07-31 05:54:21.000000000 +0100
+++ OOC680_m7/psprint/inc/psprint/fontmanager.hxx	2006-07-31 05:54:36.000000000 +0100
@@ -765,7 +765,7 @@
     bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
     FontConfigHints getFontConfigHints(const FastPrintFontInfo& rInfo, int nSize);
 
-    String Substitute(const std::vector<String> &rNames, const std::vector<sal_Unicode> &rGlyphs, 
+    String Substitute(const std::vector<String> &rNames, std::vector<sal_Unicode> &rGlyphs, 
         const ByteString &rLangAttrib, italic::type eItalic, weight::type eWeight, 
         width::type eWidth, pitch::type ePitch) const;
     bool hasFontconfig() const { return m_bFontconfigSuccess; }
--- OOC680_m7/psprint/source/fontmanager/fontconfig.cxx.foo	2006-07-31 05:45:23.000000000 +0100
+++ OOC680_m7/psprint/source/fontmanager/fontconfig.cxx	2006-07-31 05:54:08.000000000 +0100
@@ -97,9 +97,12 @@
     FcFontSet*		(*m_pFcFontSetCreate)();
     FcCharSet*                (*m_pFcCharSetCreate)();
     FcBool                    (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32);
+    FcBool          (*m_pFcCharSetHasChar)(FcCharSet *, FcChar32);
+    void            (*m_pFcCharSetDestroy)(FcCharSet*);
     void			(*m_pFcFontSetDestroy)(FcFontSet*);
     FcBool			(*m_pFcFontSetAdd)(FcFontSet*,FcPattern*);
     void            (*m_pFcPatternReference)(FcPattern*);
+    FcResult        (*m_pFcPatternGetCharSet)(const FcPattern*,const char*,int,FcCharSet**);
     FcResult		(*m_pFcPatternGetString)(const FcPattern*,const char*,int,FcChar8**);
     FcResult		(*m_pFcPatternGetInteger)(const FcPattern*,const char*,int,int*);
     FcResult		(*m_pFcPatternGetDouble)(const FcPattern*,const char*,int,double*);
@@ -169,6 +172,12 @@
     FcBool FcCharSetAddChar(FcCharSet *fcs, FcChar32 ucs4)
     { return m_pFcCharSetAddChar(fcs, ucs4); }
 
+    FcBool FcCharSetHasChar(FcCharSet *fcs, FcChar32 ucs4)
+    { return m_pFcCharSetHasChar(fcs, ucs4); }
+
+    void FcCharSetDestroy( FcCharSet* pSet )
+    { m_pFcCharSetDestroy( pSet );}
+
     void FcFontSetDestroy( FcFontSet* pSet )
     { m_pFcFontSetDestroy( pSet );}
 
@@ -178,6 +187,9 @@
     void FcPatternReference( FcPattern* pPattern )
     { m_pFcPatternReference( pPattern ); }
 
+    FcResult FcPatternGetCharSet( const FcPattern* pPattern, const char* object, int n, FcCharSet** s )
+    { return m_pFcPatternGetCharSet( pPattern, object, n, s ); }
+
     FcResult FcPatternGetString( const FcPattern* pPattern, const char* object, int n, FcChar8** s )
     { return m_pFcPatternGetString( pPattern, object, n, s ); }
 
@@ -263,12 +275,18 @@
         loadSymbol( "FcCharSetCreate" );
     m_pFcCharSetAddChar = (FcBool(*)(FcCharSet*, FcChar32))
         loadSymbol( "FcCharSetAddChar" );
+    m_pFcCharSetHasChar = (FcBool(*)(FcCharSet*, FcChar32))
+        loadSymbol( "FcCharSetHasChar" );
+    m_pFcCharSetDestroy = (void(*)(FcCharSet*))
+        loadSymbol( "FcCharSetDestroy" );
     m_pFcFontSetDestroy = (void(*)(FcFontSet*))
         loadSymbol( "FcFontSetDestroy" );
     m_pFcFontSetAdd = (FcBool(*)(FcFontSet*,FcPattern*))
         loadSymbol( "FcFontSetAdd" );
     m_pFcPatternReference = (void(*)(FcPattern*))
         loadSymbol( "FcPatternReference" );
+    m_pFcPatternGetCharSet = (FcResult(*)(const FcPattern*,const char*,int,FcCharSet**))
+        loadSymbol( "FcPatternGetCharSet" );
     m_pFcPatternGetString = (FcResult(*)(const FcPattern*,const char*,int,FcChar8**))
         loadSymbol( "FcPatternGetString" );
     m_pFcPatternGetInteger = (FcResult(*)(const FcPattern*,const char*,int,int*))
@@ -306,9 +324,12 @@
             m_pFcFontSetCreate				&&
             m_pFcCharSetCreate				&&
             m_pFcCharSetAddChar 			&&
+            m_pFcCharSetHasChar             &&
+            m_pFcCharSetDestroy             &&
             m_pFcFontSetDestroy				&&
             m_pFcFontSetAdd					&&
             m_pFcPatternReference           &&
+			m_pFcPatternGetCharSet			&&
             m_pFcPatternGetString			&&
             m_pFcPatternGetInteger			&&
             m_pFcPatternGetDouble			&&
@@ -675,7 +696,7 @@
 #endif
 }
 
-String PrintFontManager::Substitute(const std::vector<String> &rNames, const std::vector<sal_Unicode> &rGlyphs,
+String PrintFontManager::Substitute(const std::vector<String> &rNames, std::vector<sal_Unicode> &rGlyphs,
         const ByteString &rLangAttrib, italic::type eItalic, weight::type eWeight,
         width::type eWidth, pitch::type ePitch) const
 {
@@ -742,8 +763,27 @@
             FcResult eFileRes = rWrapper.FcPatternGetString( pSet->fonts[0], FC_FAMILY, 0, &family );
             if( eFileRes == FcResultMatch )
                 aName = String( (sal_Char*)family, RTL_TEXTENCODING_UTF8 );
+
+            if (!rGlyphs.empty() )
+            {
+		std::vector<sal_Unicode> aGlyphs;
+                if (rWrapper.FcPatternGetCharSet(pSet->fonts[0], FC_CHARSET, 0, &unicodes) == FcResultMatch)
+                {
+                    std::vector<sal_Unicode>::iterator aGlyphEnd = rGlyphs.end();
+                    for (std::vector<sal_Unicode>::iterator aGlyphIter = rGlyphs.begin();
+                        aGlyphIter != aGlyphEnd; ++aGlyphIter)
+                    {
+                            if (rWrapper.FcCharSetHasChar( unicodes, (FcChar32)*aGlyphIter ))
+				aGlyphs.push_back(*aGlyphIter);
+                    }
+                }
+		rGlyphs.swap(aGlyphs);
+            }
+
         }
     }
+	if (unicodes)
+		rWrapper.FcCharSetDestroy(unicodes);
     rWrapper.FcFontSetDestroy( pSet );
 #endif
     return aName;
--- OOC680_m7/vcl/source/gdi/outdev3.cxx.foo	2006-07-31 05:59:23.000000000 +0100
+++ OOC680_m7/vcl/source/gdi/outdev3.cxx	2006-07-31 06:08:45.000000000 +0100
@@ -2652,7 +2652,7 @@
 
 // -----------------------------------------------------------------------
 
-String GetFcSubstitute(const ImplFontSelectData &rFontSelData, sal_Unicode *pMissingGlyphs=0, int nMissingGlyphs=0)
+String GetFcSubstitute(const ImplFontSelectData &rFontSelData, std::vector<sal_Unicode> &rGlyphs)
 {
     std::vector<String> aNames;
     if( rFontSelData.GetFamilyName().Len() )
@@ -2667,10 +2667,6 @@
         while (nIndex != STRING_NOTFOUND);
     }
 
-    std::vector<sal_Unicode> aGlyphs;
-    for (int i=0; i < nMissingGlyphs; ++i)
-	aGlyphs.push_back(pMissingGlyphs[i]);
-
     ByteString aLangAttrib = MsLangId::convertLanguageToIsoByteString( rFontSelData.meLanguage );
 
     psp::italic::type eItalic = psp::italic::Unknown;
@@ -2737,7 +2733,7 @@
     }
 
     const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-    return rMgr.Substitute(aNames, aGlyphs, aLangAttrib, eItalic, eWeight, eWidth, ePitch);
+    return rMgr.Substitute(aNames, rGlyphs, aLangAttrib, eItalic, eWeight, eWidth, ePitch);
 }
 
 // -----------------------------------------------------------------------
@@ -2752,7 +2748,8 @@
         ||  0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) )
         return 0;
 
-    String aName(GetFcSubstitute(rFontSelData));
+    std::vector<sal_Unicode> aDummy;
+    String aName(GetFcSubstitute(rFontSelData, aDummy));
     if (!aName.Len())
         return 0;
 
@@ -3168,17 +3165,21 @@
         cached = true;
     }
 
+    std::vector<sal_Unicode> aGlyphs;
+    for (int i=0; i < nMissingUnicodes; ++i)
+        aGlyphs.push_back(pMissingUnicodes[i]);
+
     // Try cached fallbacks first
-    if ( !symbolFont && (nMissingUnicodes > 0) )
+    if ( !symbolFont && aGlyphs.empty() )
     {
-        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( pMissingUnicodes[0] );
+        aSelData.maSearchName = pOrigFontEntry->GetFallbackForUnicode( aGlyphs[0] );
         if ( aSelData.maSearchName.Len() )
             cached = true;
     }
 
     if ( !cached )
     {
-        String aName(GetFcSubstitute( aSelData, pMissingUnicodes, nMissingUnicodes ));
+        String aName(GetFcSubstitute( aSelData, aGlyphs ));
       if (aName.Len())
             aSelData.maSearchName = aName;
     }
@@ -3218,10 +3219,11 @@
     // Cache the fallback font for each of the missing Unicode chars
     if ( !symbolFont && aSelData.maSearchName.Len() )
     {
-        for ( int i = 0; i < nMissingUnicodes; i++ )
+        std::vector<sal_Unicode>::const_iterator aEnd = aGlyphs.end();
+        for (std::vector<sal_Unicode>::const_iterator aI = aGlyphs.begin(); aI != aEnd; ++aI)
         {
-            if ( ! pOrigFontEntry->GetFallbackForUnicode(pMissingUnicodes[i]).Len() )
-                pOrigFontEntry->AddFallbackForUnicode( pMissingUnicodes[i], aSelData.maSearchName );
+            if (!pOrigFontEntry->GetFallbackForUnicode(*aI).Len())
+                pOrigFontEntry->AddFallbackForUnicode(*aI, aSelData.maSearchName);
         }
     }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -r1.805 -r1.806
--- openoffice.org.spec	29 Jul 2006 20:02:55 -0000	1.805
+++ openoffice.org.spec	31 Jul 2006 08:19:33 -0000	1.806
@@ -127,6 +127,7 @@
 Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
 Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
 Patch63: workspace.configure18.patch
+Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -921,6 +922,7 @@
 %patch61 -p1 -b .ooo65081.sw.layout.patch
 %patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
 %patch63 -p1 -b .workspace.configure18.patch
+%patch64 -p1 -b .ooo54603.fontconfig.part2.patch
 
 tar xzf %{SOURCE1}
 
@@ -3496,6 +3498,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.8
+- add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
 - rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch



From fedora-cvs-commits at redhat.com  Mon Jul 31 08:33:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 04:33:06 -0400
Subject: rpms/glibc/devel .cvsignore, 1.159, 1.160 glibc-fedora.patch, 1.163,
	1.164 glibc.spec, 1.250, 1.251 sources, 1.183, 1.184
Message-ID: <200607310833.k6V8X6B9001420@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1392/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.4.90-15 on branch devel from glibc-2.4.90-15.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- .cvsignore	30 Jul 2006 01:43:48 -0000	1.159
+++ .cvsignore	31 Jul 2006 08:33:02 -0000	1.160
@@ -1,2 +1,2 @@
-glibc-20060729T2255.tar.bz2
-glibc-fedora-20060729T2255.tar.bz2
+glibc-20060731T0706.tar.bz2
+glibc-fedora-20060731T0706.tar.bz2

glibc-fedora.patch:
 ChangeLog.11                                                |   21 
 ChangeLog.12                                                |   12 
 ChangeLog.15                                                |   45 +
 ChangeLog.16                                                |  101 +++
 csu/elf-init.c                                              |   17 
 debug/tst-chk1.c                                            |    7 
 elf/ldconfig.c                                              |   25 
 elf/tst-stackguard1.c                                       |    8 
 iconv/iconvconfig.c                                         |   55 -
 include/bits/stdlib-ldbl.h                                  |    1 
 include/bits/wchar-ldbl.h                                   |    1 
 include/features.h                                          |    8 
 intl/locale.alias                                           |    2 
 libio/bits/stdio2.h                                         |   19 
 libio/stdio.h                                               |    2 
 locale/iso-4217.def                                         |   13 
 locale/programs/3level.h                                    |   36 +
 localedata/Makefile                                         |    1 
 localedata/SUPPORTED                                        |    6 
 localedata/locales/cy_GB                                    |    7 
 localedata/locales/en_GB                                    |    4 
 localedata/locales/no_NO                                    |   69 ++
 localedata/locales/zh_TW                                    |    6 
 malloc/mcheck.c                                             |   30 -
 malloc/mtrace.c                                             |   20 
 nis/nss                                                     |    2 
 nptl/ChangeLog                                              |   19 
 nptl/Makefile                                               |    8 
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S       |   61 +-
 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S |   45 +
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h            |  242 +++++---
 nptl/sysdeps/unix/sysv/linux/kernel-features.h              |    6 
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S          |   59 +-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h          |  294 +++++++---
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S    |   41 +
 nptl/tst-stackguard1.c                                      |    8 
 nscd/connections.c                                          |   18 
 nscd/nscd.c                                                 |    4 
 nscd/nscd.conf                                              |    4 
 nscd/nscd.init                                              |   19 
 posix/Makefile                                              |   19 
 posix/getconf.speclist.h                                    |   15 
 sysdeps/generic/dl-cache.h                                  |    8 
 sysdeps/i386/Makefile                                       |    8 
 sysdeps/ia64/Makefile                                       |    4 
 sysdeps/ia64/ia64libgcc.S                                   |  350 ------------
 sysdeps/ia64/libgcc-compat.c                                |   84 ++
 sysdeps/unix/nice.c                                         |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                         |   29 
 sysdeps/unix/sysv/linux/futimesat.c                         |   23 
 sysdeps/unix/sysv/linux/i386/dl-cache.h                     |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h                     |   27 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c                  |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h                  |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed                |    2 
 sysdeps/unix/sysv/linux/paths.h                             |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c                         |   32 +
 57 files changed, 1394 insertions(+), 631 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.163 -r 1.164 glibc-fedora.patch
Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- glibc-fedora.patch	30 Jul 2006 01:43:48 -0000	1.163
+++ glibc-fedora.patch	31 Jul 2006 08:33:02 -0000	1.164
@@ -0,0 +1,3360 @@
+--- glibc-20060731T0706/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060731T0706-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.
+ 
++2000-10-02  Jakub Jelinek  <jakub at redhat.com>
++
++	* sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all
++	remaining xp_pad space.
++
+ 2000-10-02  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* include/features.h [__USE_FILE_OFFSET && !__REDIRECT]: Define
+@@ -9280,6 +9285,12 @@
+ 	syscall.
+ 	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.
+ 
++2000-05-30  Jakub Jelinek  <jakub at redhat.com>
++
++	* resolv/res_query.c (res_nsearch): Remove unused variable
++	root_on_list. If dots >= statp->ndots and as is querydomain
++	fails, keep searching.
++
+ 2000-05-30  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob): Loose __P.
+@@ -9480,6 +9491,11 @@
+ 	* sysdeps/i386/fpu/bits/mathinline.h: Define expm1 inline only if
+ 	__FAST_MATH__ is defined.
+ 
++2000-05-22  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Avoid using ?:
++	with omitted middle operand.
++
+ 2000-05-22  Andreas Jaeger  <aj at suse.de>
+ 
+ 	* math/Makefile: Add -D__FAST_MATH__ to CFLAGS-test-ifloat.c,
+@@ -9720,6 +9736,11 @@
+ 
+ 2000-05-17  Jakub Jelinek  <jakub at redhat.com>
+ 
++	* inet/rcmd.c (rcmd_af): If *ahost cannot be resolved, include
++	unresolved hostname in the message.
++
++2000-05-17  Jakub Jelinek  <jakub at redhat.com>
++
+ 	* 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-20060731T0706/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060731T0706-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.
+ 
++2001-01-10  Jakub Jelinek  <jakub at redhat.com>
++
++	* malloc/memusage.c (me): If not SUID/SGID, allow creating new
++	$MEMUSAGE_OUTPUT file.
++	* sysdeps/generic/segfault.c (segfault.c): If not SUID/SGID, allow
++	creating new $SEGFAULT_OUTPUT_NAME file.
++
+ 2001-01-10  H.J. Lu  <hjl at gnu.org>
+ 
+ 	* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.
+@@ -8130,6 +8137,11 @@
+ 	* sysdeps/powerpc/soft-fp/Versions: Likewise.
+ 	* sysdeps/sparc/sparc64/soft-fp/Versions: Likewise.
+ 
++2001-01-02  Jakub Jelinek  <jakub at redhat.com>
++
++	* locale/setlocale.c (setlocale): Don't allocate/free category name
++	unnecessarily.
++
+ 2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
+ 
+ 	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
+--- glibc-20060731T0706/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060731T0706-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>
+ 
++	* posix/Makefile (generated: Add getconf.speclist.
++	($(inst_libexecdir)/getconf): Use getconf.speclist instead of
++	getconf output.
++	($(objpfx)getconf.speclist): New rule.
++	* posix/getconf.speclist.h: New file.
++
++2004-11-26  Jakub Jelinek  <jakub at redhat.com>
++
+ 	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.
+ 
+ 2004-11-26  Kaz Kojima  <kkojima at rr.iij4u.or.jp>
+@@ -1103,6 +1111,16 @@
+ 	* sysdeps/generic/tempname.c (__path_search): Add missing argument
+ 	TRY_TMPDIR.
+ 
++2004-11-02  Jakub Jelinek  <jakub at redhat.com>
++
++	* include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat
++	GCC 3.4.x-RH >= 3.4.2-8.
++	* libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For
++	GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of
++	__{,v}{,f}printf_chk.
++	* debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not
++	being able to recognize subobjects.
++
+ 2004-10-31  Mariusz Mazur <mmazur at kernel.pl>
+ 
+ 	* sysdeps/unix/sysv/linux/alpha/setregid.c: New file.
+@@ -1398,6 +1416,11 @@
+ 	* posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno
+ 	values.
+ 
++2004-10-20  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc
++	is not mounted, return 1.
++
+ 2004-10-20  Roland McGrath  <roland at redhat.com>
+ 
+ 	* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also
+@@ -1443,6 +1466,11 @@
+ 	* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...
+ 	(__readonly_area): ... this.
+ 
++2004-10-19  Jakub Jelinek  <jakub at redhat.com>
++
++	* include/features.h (__USE_FORTIFY_LEVEL): Enable even with
++	Red Hat gcc4 4.0.0 and above.
++
+ 2004-10-18  Jakub Jelinek  <jakub at redhat.com>
+ 
+ 	* sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking
+@@ -3182,6 +3210,23 @@
+ 	before return type.
+ 	* locale/localename.c (__current_locale_name): Likewise.
+ 
++2004-08-31  Jakub Jelinek  <jakub at redhat.com>
++
++	* elf/ldconfig.c (parse_conf): Add prefix argument, prepend it
++	before arguments to add_dir and pass to parse_conf_include.
++	(parse_conf_include): Add prefix argument, pass it down to
++	parse_conf.
++	(main): Call arch_startup.  Adjust parse_conf caller.
++	Call add_arch_dirs.
++	* sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.
++	* sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.
++	* sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,
++	add_arch_dirs): Define.
++	* sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend
++	/emul/ia32-linux before the 32-bit ld.so pathname.
++	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.
++	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.
++
+ 2004-08-30  Roland McGrath  <roland at frob.com>
+ 
+ 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
+--- glibc-20060731T0706/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20060731T0706-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+@@ -171,6 +171,11 @@
+ 	[BZ #2611]
+ 	* stdio-common/renameat.c (renameat): Fix typo.
+ 
++2006-04-27  Jakub Jelinek  <jakub at redhat.com>
++
++	* nscd/connections.c (sighup_handler): Only run prune_cache on
++	enabled databases.
++
+ 2006-04-26  Roland McGrath  <roland at redhat.com>
+ 
+ 	* Makeconfig (%.v.i rule): Don't use -DASSEMBLER.
+@@ -1030,6 +1035,34 @@
+ 	_SC_CPUTIME and _SC_THREAD_CPUTIME here.
+ 	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise.
+ 
++2006-03-04  Jakub Jelinek  <jakub at redhat.com>
++	    Roland McGrath  <roland at redhat.com>
++
++	* sysdeps/unix/sysv/linux/i386/lowlevellock.h
++	(LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END,
++	LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define.
++	(lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock,
++	lll_robust_mutex_cond_lock, lll_mutex_timedlock,
++	lll_robust_mutex_timedlock, lll_mutex_unlock,
++	lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them.
++	Add _L_*_ symbols around the subsection.
++	* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info.
[...2969 lines suppressed...]
+       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-20060731T0706/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060731T0706-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"
+ #define _PATH_UTMP	"/var/run/utmp"
+-#define	_PATH_VI	"/usr/bin/vi"
++#define	_PATH_VI	"/bin/vi"
+ #define _PATH_WTMP	"/var/log/wtmp"
+ 
+ /* Provide trailing slash, since mostly used for building pathnames. */
+--- glibc-20060731T0706/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060731T0706-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;
+   unsigned long int cmd;
++  int retval;
+ 
+   switch (optional_actions)
+     {
+@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
+   memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
+ 	  __KERNEL_NCCS * sizeof (cc_t));
+ 
+-  return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
++  retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
++
++  if (retval == 0 && cmd == TCSETS)
++    {
++      /* The Linux kernel has a bug which silently ignore the invalid
++        c_cflag on pty. We have to check it here. */
++      int save = errno;
++      retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
++      if (retval)
++       {
++         /* We cannot verify if the setting is ok. We don't return
++            an error (?). */
++         __set_errno (save);
++         retval = 0;
++       }
++      else if ((termios_p->c_cflag & (PARENB | CREAD))
++              != (k_termios.c_cflag & (PARENB | CREAD))
++              || ((termios_p->c_cflag & CSIZE)
++                  && ((termios_p->c_cflag & CSIZE)
++                      != (k_termios.c_cflag & CSIZE))))
++       {
++         /* It looks like the Linux kernel silently changed the
++            PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
++            error. */
++         __set_errno (EINVAL);
++         retval = -1;
++       }
++    }
++
++  return retval;
+ }
+ libc_hidden_def (tcsetattr)
+--- glibc-20060731T0706/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060731T0706-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.
++   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.  */
++
++static inline int
++is_ia64 (void)
++{
++  unsigned int fl1, fl2;
++
++  /* See if we can use cpuid.  */
++  __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
++           "pushl %0; popfl; pushfl; popl %0; popfl"
++           : "=&r" (fl1), "=&r" (fl2)
++           : "i" (0x00200000));
++  if (((fl1 ^ fl2) & 0x00200000) == 0)
++    return 0;
++
++  /* Host supports cpuid.  See if cpuid gives capabilities, try
++     CPUID(0).  Preserve %ebx and %ecx; cpuid insn clobbers these, we
++     don't need their CPUID values here, and %ebx may be the PIC
++     register.  */
++  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
++           : "=a" (fl1) : "0" (0) : "edx", "cc");
++  if (fl1 == 0)
++    return 0;
++
++  /* Invoke CPUID(1), return %edx; caller can examine bits to
++     determine what's supported.  */
++  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
++           : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
++  return (fl2 & (1 << 30)) != 0;
++}
++
++#define arch_startup(argc, argv) \
++  do {									\
++    /* On IA-64, try to execute 64-bit ldconfig if possible.		\
++       This is because the badly designed /emul/ia32-linux hack		\
++       will cause 32-bit ldconfig to do all sorts of weird things.  */	\
++    if (is_ia64 ())							\
++      execv ("/emul/ia32-linux/../../sbin/ldconfig",			\
++	     (char *const *) argv);					\
++  } while (0)
++
++#include_next <dl-cache.h>
+--- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060731T0706-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)
+ 
++#define EMUL_HACK "/emul/ia32-linux"
++
++#define arch_startup(argc, argv) unlink (EMUL_HACK LD_SO_CACHE)
++
++#define add_arch_dirs(config_file) \
++  do {							\
++    int save_verbose = opt_verbose;			\
++    opt_verbose = 0;					\
++							\
++    parse_conf (config_file, EMUL_HACK, true);		\
++							\
++    /* Always add the standard search paths.  */	\
++    add_system_dir (EMUL_HACK SLIBDIR);			\
++    if (strcmp (SLIBDIR, LIBDIR))			\
++      add_system_dir (EMUL_HACK LIBDIR);		\
++							\
++    char emul_config_file[strlen (config_file)		\
++			  + sizeof EMUL_HACK];		\
++    strcpy (mempcpy (emul_config_file, EMUL_HACK,	\
++		     strlen (EMUL_HACK)), config_file);	\
++							\
++    if (! access (emul_config_file, R_OK))		\
++      parse_conf (emul_config_file, EMUL_HACK, true);	\
++							\
++    opt_verbose = save_verbose;				\
++  } while (0)
++
+ #include_next <dl-cache.h>
+--- glibc-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060731T0706-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-20060731T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060731T0706-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-20060731T0706/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060731T0706-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.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- glibc.spec	30 Jul 2006 01:43:49 -0000	1.250
+++ glibc.spec	31 Jul 2006 08:33:03 -0000	1.251
@@ -1,9 +1,9 @@
-%define glibcdate 20060729T2255
+%define glibcdate 20060731T0706
 %define glibcname glibc
-%define glibcsrcdir glibc-20060729T2255
+%define glibcsrcdir glibc-20060731T0706
 %define glibc_release_tarballs 0
 %define glibcversion 2.4.90
-%define glibcrelease 14
+%define glibcrelease 15
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1438,7 +1438,7 @@
 %endif
 
 %changelog
-* Sat Jul 29 2006 Roland McGrath <roland at redhat.com> - 2.4.90-14
+* Mon Jul 31 2006 Roland McGrath <roland at redhat.com> 2.4.90-15
 - fix missing destructor calls in dlclose (#197932)
 - PI mutex support
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- sources	30 Jul 2006 01:43:49 -0000	1.183
+++ sources	31 Jul 2006 08:33:04 -0000	1.184
@@ -1,2 +1,2 @@
-6151d47fcff30830962fc633ab3e5123  glibc-20060729T2255.tar.bz2
-5fea46a562f25b3da264af62e6fb94a8  glibc-fedora-20060729T2255.tar.bz2
+e3123774ae5559c34158ee23ec49e081  glibc-20060731T0706.tar.bz2
+9fab186a74fa3cbed9803ca01af45d26  glibc-fedora-20060731T0706.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 31 09:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 05:42:28 -0400
Subject: rpms/epic/devel epic.spec,1.21,1.22
Message-ID: <200607310942.k6V9gS4F025381@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24744

Modified Files:
	epic.spec 
Log Message:
add buildrequires ncurses-devel



Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- epic.spec	12 Jul 2006 05:45:00 -0000	1.21
+++ epic.spec	31 Jul 2006 09:42:21 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 4.1
+Release: 5
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -18,7 +18,7 @@
 Patch1: epic4-2.2-fuzzTest.patch
 URL: http://www.epicsol.org/
 Buildroot: /var/tmp/%{name}-%{version}-%{release}
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel,ncurses-devel
 
 %description
 EPIC (Enhanced Programmable ircII Client) is an advanced ircII chat
@@ -81,6 +81,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Mon Jul 31 2006 Peter Vrabec <pvrabec at redhat.com> 2.2-5
+- add buildrequires ncurses-devel
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-4.1
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 10:03:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 06:03:35 -0400
Subject: rpms/epic/devel .cvsignore, 1.3, 1.4 epic.spec, 1.22, 1.23 sources,
	1.4, 1.5 epic4-2.2-fuzzTest.patch, 1.1, NONE
Message-ID: <200607311003.k6VA3ZHQ013908@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13865

Modified Files:
	.cvsignore epic.spec sources 
Removed Files:
	epic4-2.2-fuzzTest.patch 
Log Message:
upgrade to new bugfix release



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Dec 2005 20:22:38 -0000	1.3
+++ .cvsignore	31 Jul 2006 10:03:32 -0000	1.4
@@ -6,3 +6,4 @@
 sf-light-scheme.irc.gz
 sf-perry-scheme.irc.gz
 epic4-2.2.tar.bz2
+epic4-2.4.tar.bz2


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- epic.spec	31 Jul 2006 09:42:21 -0000	1.22
+++ epic.spec	31 Jul 2006 10:03:32 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
-Version: 2.2
-Release: 5
+Version: 2.4
+Release: 1
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -15,7 +15,6 @@
 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}
 BuildRequires: openssl-devel,ncurses-devel
@@ -30,7 +29,6 @@
 
 %setup -q -n epic4-%{version} -a 1
 %patch0 -p0 -b .default
-%patch1 -p1 -b .fuzzTest
 
 %build
 %configure
@@ -81,6 +79,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Mon Jul 31 2006 Peter Vrabec <pvrabec at redhat.com> 2.4-5
+- upgrade to new bugfix release
+
 * Mon Jul 31 2006 Peter Vrabec <pvrabec at redhat.com> 2.2-5
 - add buildrequires ncurses-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Dec 2005 23:47:41 -0000	1.4
+++ sources	31 Jul 2006 10:03:32 -0000	1.5
@@ -3,5 +3,5 @@
 dd75ad70b46b331b008d976880899233  sf-eggsandham-scheme.irc.gz
 3a7151f0b2913964eb5e38b6c1a2697d  sf-light-scheme.irc.gz
 90c9dc5fc9f372843f8a0732fba61eb1  sf-perry-scheme.irc.gz
-e4d5d799b43f3c7882e8e7616099d4fc  epic4-2.2.tar.bz2
 9888d1af465ca72bf9a02487264071a5  epic4-help-current.tar.gz
+19338b1246287b3ea2050d63d50a838b  epic4-2.4.tar.bz2


--- epic4-2.2-fuzzTest.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 31 10:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 06:08:25 -0400
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.806,1.807
Message-ID: <200607311008.k6VA8PWM015016@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14961

Modified Files:
	openoffice.org.spec 
Log Message:
openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -r1.806 -r1.807
--- openoffice.org.spec	31 Jul 2006 08:19:33 -0000	1.806
+++ openoffice.org.spec	31 Jul 2006 10:08:23 -0000	1.807
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -128,6 +128,7 @@
 Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
 Patch63: workspace.configure18.patch
 Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -923,6 +924,7 @@
 %patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
 %patch63 -p1 -b .workspace.configure18.patch
 %patch64 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch65 -p1 -b .ooo67976.svx.macroscrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3500,6 +3502,7 @@
 %changelog
 * Mon Jul 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.8
 - add openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+- rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
 
 * Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch



From fedora-cvs-commits at redhat.com  Mon Jul 31 13:57:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 09:57:26 -0400
Subject: rpms/fonts-indic/devel fonts-indic.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <200607311357.k6VDvQ0r027638@cvs.devel.redhat.com>

Author: dsantani

Update of /cvs/dist/rpms/fonts-indic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27603

Modified Files:
	fonts-indic.spec sources 
Log Message:
Bug Fixes in Hindi, Bengali, Punjabi langauges



Index: fonts-indic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fonts-indic.spec	19 Jul 2006 05:13:52 -0000	1.8
+++ fonts-indic.spec	31 Jul 2006 13:57:24 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:		fonts-indic
 Version:	2.0
-Release: 	1
+Release: 	2
 License:	GPL
 Group:		User Interface/X
 BuildArch:	noarch
@@ -256,6 +256,11 @@
 %{xfontdir}/telugu/*ttf
 
 %changelog
+* Mon Jul 31 2006 Darshan Santani <dsantani at redhat.com> - 2.0-2
+- Bug Fixes "Bengali" RH#179821,  RH#197216, RH#169110
+- Bug Fixes "Punjabi" RH #167592.
+- Bug Fixes "Hindi" RH#189334 
+
 * Wed Jul 19 2006 Leon Ho <llch at redhat.com> - 2.0-1
 - added 4 new indic fonts
 - added the glyphs u+0964 and u+0965 (Danda and Double Danda) in Bengali, Punjabi and Tamil (RH#183144)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jul 2006 05:13:52 -0000	1.6
+++ sources	31 Jul 2006 13:57:24 -0000	1.7
@@ -1,3 +1,3 @@
 3dd41a67df406480430fa954c76b44cb  fonts-indic-1.9.tar.gz
 6367531e48d531fbb175279fdbd2055a  fonts-indic-1.10.tar.gz
-7b99784822b0e0fd2cdb8d821f777820  fonts-indic-2.0.tar.gz
+d11aa6f1f189092af591b6bf3b90d96e  fonts-indic-2.0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 13:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 09:57:54 -0400
Subject: rpms/xorg-x11-drv-vesa/devel vesa-1.2.1-randr-crash.patch,NONE,1.1
Message-ID: <200607311357.k6VDvs59027698@cvs.devel.redhat.com>

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27652

Added Files:
	vesa-1.2.1-randr-crash.patch 
Log Message:
* Fri Jul 28 2006 Adam Jackson <ajackson at redhat.com> 1.2.1-2
- vesa-1.2.1-randr-crash.patch: Fix a RANDR crash.


vesa-1.2.1-randr-crash.patch:
 vesa.c |    8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE vesa-1.2.1-randr-crash.patch ---
--- xf86-video-vesa-1.2.1/src/vesa.c.randr-crash	2006-06-03 05:46:00.000000000 -0400
+++ xf86-video-vesa-1.2.1/src/vesa.c	2006-07-28 16:56:44.000000000 -0400
@@ -1020,15 +1020,9 @@
 VESASwitchMode(int scrnIndex, DisplayModePtr pMode, int flags)
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-    VESAPtr pVesa = VESAGetRec(pScrn);
     Bool ret;
 
-    if (pVesa->ModeSetClearScreen) 
-	pScrn->EnableDisableFBAccess(scrnIndex,FALSE);
-    ret = VESASetMode(xf86Screens[scrnIndex], pMode);
-    if (pVesa->ModeSetClearScreen) 
-	pScrn->EnableDisableFBAccess(scrnIndex,TRUE);
-    return ret;
+    return VESASetMode(pScrn, pMode);
 }
 
 /* Set a graphics mode */



From fedora-cvs-commits at redhat.com  Mon Jul 31 14:30:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 10:30:37 -0400
Subject: rpms/totem/devel totem.spec,1.67,1.68
Message-ID: <200607311430.k6VEUbtw027342@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27300

Modified Files:
	totem.spec 
Log Message:
rebuild against firefox



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- totem.spec	19 Jul 2006 16:49:47 -0000	1.67
+++ totem.spec	31 Jul 2006 14:30:31 -0000	1.68
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.5.4
-Release: 3
+Release: 4
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -31,7 +31,7 @@
 BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel
 BuildRequires: perl-XML-Parser
 BuildRequires: iso-codes-devel
-BuildRequires: mozilla-devel
+BuildRequires: firefox-devel
 BuildRequires: gnome-icon-theme
 BuildRequires: nautilus
 BuildRequires: libXtst-devel
@@ -163,6 +163,9 @@
 %{_libdir}/*so
 
 %changelog
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-4
+- Rebuild against firefox-devel
+
 * Wed Jul 19 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.4-3
 - Don't use deprecated dbus api
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 14:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 10:49:20 -0400
Subject: rpms/scim/FC-5 scim.spec,1.36,1.37
Message-ID: <200607311449.k6VEnKBW015222@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/scim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2712

Modified Files:
	scim.spec 
Log Message:
- rebuild against libstdc++so7 reverted to rc string implementation to fix
  hotkey config regression in scim-setup (#197718)



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- scim.spec	20 Jun 2006 12:17:33 -0000	1.36
+++ scim.spec	31 Jul 2006 14:49:18 -0000	1.37
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   9.7.fc5
+Release:   9.8%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -204,13 +204,17 @@
 
 
 %changelog
+* Mon Jul 31 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.8.fc5
+- rebuild against libstdc++so7 reverted to rc string implementation to fix
+  hotkey config regression in scim-setup (#197718)
+
 * Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.7.fc5
 - ignore update-gtk-immodules errors in %%post and %%postun
 
 * Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.6.fc5
 - update scim-libs prereq to gtk2 >= 2.8.19-1
 
-* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.4.fc5
+* Tue Jun 20 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-9.5.fc5
 - use _host not _target_platform for update-gtk-immodules in scripts (#195763)
 - make scim explicitly require scim-libs with same ver-rel
 - backport factory-menu-singlet-submenus-187027.patch to avoid having language



From fedora-cvs-commits at redhat.com  Mon Jul 31 14:55:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 10:55:14 -0400
Subject: rpms/kexec-tools/devel kexec-tools-1.101-et-dyn.patch, NONE,
	1.1 kexec-tools.spec, 1.36, 1.37
Message-ID: <200607311455.k6VEtEcJ017694@cvs.devel.redhat.com>

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17664

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.101-et-dyn.patch 
Log Message:
adding ET_DYN patch

kexec-tools-1.101-et-dyn.patch:
 kexec-elf-exec.c |   10 +++++++---
 kexec-elf.h      |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE kexec-tools-1.101-et-dyn.patch ---
--- kexec-tools-1.101/kexec/kexec-elf.h.orig	2006-07-31 10:41:57.000000000 -0400
+++ kexec-tools-1.101/kexec/kexec-elf.h	2006-07-31 10:42:09.000000000 -0400
@@ -89,7 +89,7 @@ extern int build_elf_info(const char *bu
 extern int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr);
 extern int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr);
 
-extern int elf_exec_load(const struct mem_ehdr *ehdr, struct kexec_info *info);
+extern int elf_exec_load(struct mem_ehdr *ehdr, struct kexec_info *info);
 extern int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info,
 	unsigned long min, unsigned long max, int end);
 
--- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig	2006-07-31 10:14:20.000000000 -0400
+++ kexec-tools-1.101/kexec/kexec-elf-exec.c	2006-07-31 10:18:25.000000000 -0400
@@ -47,7 +47,7 @@ int build_elf_exec_info(const char *buf,
 }
 
 
-int elf_exec_load(const struct mem_ehdr *ehdr, struct kexec_info *info)
+int elf_exec_load(struct mem_ehdr *ehdr, struct kexec_info *info)
 {
 	unsigned long base;
 	int result;
@@ -79,8 +79,8 @@ int elf_exec_load(const struct mem_ehdr 
 			}
 			start = phdr->p_paddr;
 			stop  = start + phdr->p_memsz;
-			if (start > first) {
-				start = first;
+			if (first > start) {
+				first = start;
 			}
 			if (last < stop) {
 				last = stop;
@@ -126,6 +126,10 @@ int elf_exec_load(const struct mem_ehdr 
 			phdr->p_data, size,
 			phdr->p_paddr + base, phdr->p_memsz);
 	}
+
+	/* Update entry point to reflect new load address*/
+	ehdr->e_entry += base;
+
 	result = 0;
  out:
 	return result;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kexec-tools.spec	27 Jul 2006 13:08:21 -0000	1.36
+++ kexec-tools.spec	31 Jul 2006 14:55:12 -0000	1.37
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 31%{dist}.1
+Release: 32%{dist}.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -50,6 +50,7 @@
 #
 Patch601: kexec-tools-1.101-Makefile.patch
 Patch602: kexec-tools-1.101-Makefile-kcp.patch
+Patch603: kexec-tools-1.101-et-dyn.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -69,6 +70,7 @@
 %patch501 -p1
 %patch601 -p1
 %patch602 -p1
+%patch603 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
@@ -127,11 +129,14 @@
 %doc TODO
 
 %changelog
+* Mon Jul 31 2006 Neil Horman <nhorman at redhat.com> - 1.101-32%{dist}.1
+- added et-dyn patch to allow loading of relocatable kernels
+
 * Thu Jul 27 2006 Neil Horman <nhorman at redhat.com> - 1.101-30%{dist}.1
--fixing up missing patch to kdump.init
+- fixing up missing patch to kdump.init
 
 * Wed Jul 19 2006 Neil Horman <nhorman at redhat.com> - 1.101-30%{dist}.1
--add kexec frontend (bz 197695)
+- add kexec frontend (bz 197695)
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.101-29%{dist}.1
 - rebuild



From fedora-cvs-commits at redhat.com  Mon Jul 31 15:21:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 11:21:17 -0400
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.105,
	1.106
Message-ID: <200607311521.k6VFLHXC007485@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7395

Modified Files:
	evolution-data-server.spec 
Log Message:
- add executable bits to libs 



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- evolution-data-server.spec	31 Jul 2006 04:54:36 -0000	1.105
+++ evolution-data-server.spec	31 Jul 2006 15:21:15 -0000	1.106
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.90.1
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -225,6 +225,9 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.a
 
+# give the libraries some executable bits 
+find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
+
 %find_lang %{name}-%{eds_base_version}
 
 %clean
@@ -328,6 +331,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Jul 31 2006 Ray Strode <rstrode at redhat.com> - 1.7.90.1-4
+- add executable bits to libs 
+
 * Sun Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.90.1-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 15:33:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 11:33:34 -0400
Subject: rpms/totem/devel totem-1.5.4-firefox.patch, NONE, 1.1 totem.spec,
	1.68, 1.69
Message-ID: <200607311533.k6VFXY1k011174@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11117

Modified Files:
	totem.spec 
Added Files:
	totem-1.5.4-firefox.patch 
Log Message:
fix include paths


totem-1.5.4-firefox.patch:
 totem-mozilla-plugin.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE totem-1.5.4-firefox.patch ---
--- totem-1.5.4/src/totem-mozilla-plugin.cpp.firefox	2006-07-31 11:22:38.000000000 -0400
+++ totem-1.5.4/src/totem-mozilla-plugin.cpp	2006-07-31 11:29:41.000000000 -0400
@@ -43,11 +43,11 @@
 #include "npapi.h"
 #include "npupp.h"
 
-#include <nsIDOMWindow.h>
-#include <nsIURI.h>
-#include <nsEmbedString.h>
-#include <nsIInterfaceRequestor.h>
-#include <nsIInterfaceRequestorUtils.h>
+#include <dom/nsIDOMWindow.h>
+#include <necko/nsIURI.h>
+#include <string/nsEmbedString.h>
+#include <xpcom/nsIInterfaceRequestor.h>
+#include <xpcom/nsIInterfaceRequestorUtils.h>
 #include <docshell/nsIWebNavigation.h>
 
 #define TOTEM_DEBUG 1


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- totem.spec	31 Jul 2006 14:30:31 -0000	1.68
+++ totem.spec	31 Jul 2006 15:33:31 -0000	1.69
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch1: totem-0.99.19-feature-help-removal.patch
 Patch2: totem-1.5.4-dbus-disconnect.patch
+Patch3: totem-1.5.4-firefox.patch
 
 Requires(post): GConf2
 Requires(post): desktop-file-utils
@@ -76,13 +77,20 @@
 %setup -q
 %patch1 -p1 -b .feature-help-removal
 %patch2 -p1 -b .dbus-disconnect
+%patch3 -p1 -b .firefox
 
 %build
 # try to work around a problem where gst-inspect does 
 # not find playbin the first time around
-/usr/bin/gst-inspect-0.10 --print-all
+/usr/bin/gst-inspect-0.10 --print-all > /dev/null
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla 
-%configure --enable-gstreamer --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv
+%configure 			\
+	--enable-gstreamer 	\
+	--disable-lirc 		\
+	--disable-vanity 	\
+	--enable-mozilla 	\
+	--enable-nautilus	\
+	--disable-nvtv
 
 #apparently someone forgot to autogen before disting 0.99.17 :)
 #perl -pi -e 's/gstvideowidget.h//g' src/Makefile



From fedora-cvs-commits at redhat.com  Mon Jul 31 15:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 11:44:27 -0400
Subject: rpms/compiz/devel compiz.spec,1.12,1.13
Message-ID: <200607311544.k6VFiRik014467@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14449

Modified Files:
	compiz.spec 
Log Message:
* Mon Jul 31 2006 Kristian H??gsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx
- Add libwnck requires.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compiz.spec	26 Jul 2006 23:21:22 -0000	1.12
+++ compiz.spec	31 Jul 2006 15:44:24 -0000	1.13
@@ -18,6 +18,7 @@
 
 Requires:	xorg-x11-server-Xorg >= 1.1.0-26
 Requires:	mesa-libGL >= 6.5-9
+Requires:	libwnck >= 2.15.4
 Requires:       system-logos
 
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
@@ -116,6 +117,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Mon Jul 31 2006 Kristian H??gsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx
+- Add libwnck requires.
+
 * Wed Jul 26 2006 Kristian H??gsberg <krh at redhat.com> - 0.0.13-0.11.20060721git.fc5.aiglx
 - Bump and build for fc5 AIGLX repo.
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 15:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 11:49:00 -0400
Subject: rpms/compiz/devel compiz.spec,1.13,1.14
Message-ID: <200607311549.k6VFn0Rc030897@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30868

Modified Files:
	compiz.spec 
Log Message:
* Mon Jul 31 2006 Kristian H??gsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx
- Add libwnck requires.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compiz.spec	31 Jul 2006 15:44:24 -0000	1.13
+++ compiz.spec	31 Jul 2006 15:48:57 -0000	1.14
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.11.%{snapshot}git.fc5.aiglx
+Release:        0.12.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)



From fedora-cvs-commits at redhat.com  Mon Jul 31 15:53:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 11:53:16 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.50,1.51
Message-ID: <200607311553.k6VFrGGh032541@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32476

Modified Files:
	gnome-python-extras.spec 
Log Message:
rebuild against firefox



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-python-extras.spec	13 Jul 2006 17:15:04 -0000	1.50
+++ gnome-python-extras.spec	31 Jul 2006 15:53:13 -0000	1.51
@@ -5,13 +5,13 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.9.0
 %define gtkhtml2_version 2.3.1
-%define mozilla_version 1.7.3
+%define firefox_version 1.5.0.5
 %define gtkspell_version 2.0.7
 
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.1
-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
@@ -27,7 +27,7 @@
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version}
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
-BuildRequires: mozilla-devel >= %{mozilla_version}
+BuildRequires: firefox-devel >= %{firefox_version}
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: libbonoboui-devel
@@ -71,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for interacting with gtkmozembed
 Group: Development/Languages
-Requires:  mozilla >= %{mozilla_version}
+Requires:  firefox >= %{firefox_version}
 
 %description -n gnome-python2-gtkmozembed
 This module contains a wrapper that allows the use of gtkmozembed
@@ -128,6 +128,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
+- Rebuild against firefox
+
 * Thu Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 16:06:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 12:06:28 -0400
Subject: rpms/gaim/devel gaim.spec,1.132,1.133
Message-ID: <200607311606.k6VG6S8K003299@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3190

Modified Files:
	gaim.spec 
Log Message:
rebuild against new libebook



Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gaim.spec	25 Jul 2006 16:57:43 -0000	1.132
+++ gaim.spec	31 Jul 2006 16:06:23 -0000	1.133
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.9.%{betaver}%{?dist}
+Release:	0.10.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -297,6 +297,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Mon Jul 31 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.10.beta3
+- rebuild for new libebook
+
 * Tue Jul 25 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.9.beta3
 - fix crash with certain UTF-8 names in buddy list (#199590)
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 16:58:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 12:58:41 -0400
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.162,
	1.163
Message-ID: <200607311658.k6VGwfoM001631@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-serv1573

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Jul 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_99rh
- Add new built-in security providers.




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.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- java-1.4.2-gcj-compat.spec	24 Jul 2006 13:13:02 -0000	1.162
+++ java-1.4.2-gcj-compat.spec	31 Jul 2006 16:58:38 -0000	1.163
@@ -15,7 +15,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_98rh
+%define release 	40jpp_99rh
 %define cname           java-%{javaver}-%{origin}
 
 %define	sdklnk		java-%{javaver}-%{origin}
@@ -192,6 +192,10 @@
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
 %if ! %{custom}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
 %endif
 
 # versionless symlinks
@@ -592,6 +596,10 @@
 # %{_jvmprivdir}/*
 %if ! %{custom}
 %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
+%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
+%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
+%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
+%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
 %endif
 %ifarch x86_64
 %{_jvmdir}/%{jredir}/lib/amd64
@@ -628,6 +636,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Jul 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_99rh
+- Add new built-in security providers.
+
 * Mon Jul 24 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_98rh
 - Import java-gcj-compat 1.0.61.
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 17:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 13:29:23 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2478,
	1.2479 linux-2.6-nfs-superblock-unmount-optimization.patch, 1.2, 1.3
Message-ID: <200607311729.k6VHTNPV026363@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26208

Modified Files:
	kernel-2.6.spec 
	linux-2.6-nfs-superblock-unmount-optimization.patch 
Log Message:
VFS: Destroy the dentries contributed by a superblock on unmounting [try #2]


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2478
retrieving revision 1.2479
diff -u -r1.2478 -r1.2479
--- kernel-2.6.spec	30 Jul 2006 08:18:54 -0000	1.2478
+++ kernel-2.6.spec	31 Jul 2006 17:29:21 -0000	1.2479
@@ -1662,6 +1662,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Dave Jones <davej at redhat.com>
+- VFS: Destroy the dentries contributed by a superblock on unmounting [try #2]
+
 * Sun Jul 30 2006 Jon Masters <jcm at redhat.com>
 - Wasn't calling weak-modules properly.
 - kabitool not being picked up (weird).

linux-2.6-nfs-superblock-unmount-optimization.patch:
 fs/autofs4/autofs_i.h  |    3 -
 fs/autofs4/init.c      |    2 
 fs/autofs4/inode.c     |   22 +-------
 fs/autofs4/waitq.c     |    1 
 fs/dcache.c            |  130 +++++++++++++++++++++++++++++++++++++++++++++++++
 fs/super.c             |   12 ++--
 include/linux/dcache.h |    1 
 7 files changed, 143 insertions(+), 28 deletions(-)

Index: linux-2.6-nfs-superblock-unmount-optimization.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-nfs-superblock-unmount-optimization.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-nfs-superblock-unmount-optimization.patch	28 Jul 2006 21:41:06 -0000	1.2
+++ linux-2.6-nfs-superblock-unmount-optimization.patch	31 Jul 2006 17:29:21 -0000	1.3
@@ -145,9 +145,29 @@
  
  static int autofs4_write(struct file *file, const void *addr, int bytes)
 
-Date: Thu, 27 Jul 2006 19:53:52 +0100
 From: David Howells <dhowells at redhat.com>
-Subject: [RHEL5 PATCH 30/30] VFS: Destroy the dentries contributed by a superblock on unmounting
+Subject: [FC6/RHEL5 PATCH 30/30] VFS: Destroy the dentries contributed by a superblock on unmounting [try #2]
+Date: Mon, 31 Jul 2006 16:11:48 +0100
+
+The attached patch removes a bad check from the dcache dismantling patch [BZ
+200645].
+
+I stuck the check in the dcache umount shrinker because it seemed like a good
+idea not to let iput() see an inode still on an inotify watch list.  However,
+this isn't actually a problem at that point, because the inode is pinned by
+the watcher, and won't go away when the dentry is destroyed.
+
+generic_shutdown_super() deals with such inodes afterwards by calling
+invalidate_inodes(), which calls inotify_unmount_inodes().
+
+This patch should replace the current dentry crunching patch.
+
+David
+
+
+VFS: Destroy the dentries contributed by a superblock on unmounting
+
+From: David Howells <dhowells at redhat.com>
 
 The attached patch destroys all the dentries attached to a superblock in one go
 by:
@@ -194,16 +214,16 @@
 Acked-by: Ian Kent <raven at themaw.net>
 ---
 
- fs/dcache.c            |  133 ++++++++++++++++++++++++++++++++++++++++++++++++
+ fs/dcache.c            |  130 ++++++++++++++++++++++++++++++++++++++++++++++++
  fs/super.c             |   12 ++--
  include/linux/dcache.h |    1 
- 3 files changed, 140 insertions(+), 6 deletions(-)
+ 3 files changed, 137 insertions(+), 6 deletions(-)
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 17b392a..780f014 100644
+index 17b392a..7579b87 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -547,6 +547,139 @@ repeat:
+@@ -547,6 +547,136 @@ repeat:
  }
  
  /*
@@ -282,9 +302,6 @@
 +
 +			inode = dentry->d_inode;
 +			if (inode) {
-+#ifdef CONFIG_INOTIFY
-+				BUG_ON(!list_empty(&inode->inotify_watches));
-+#endif
 +				dentry->d_inode = NULL;
 +				list_del_init(&dentry->d_alias);
 +				if (dentry->d_op && dentry->d_op->d_iput)



From fedora-cvs-commits at redhat.com  Mon Jul 31 18:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 14:27:23 -0400
Subject: rpms/esc/devel esc.spec,1.6,1.7
Message-ID: <200607311827.k6VIRN3K009286@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9237

Modified Files:
	esc.spec 
Log Message:
don't leak mozilla



Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc.spec	28 Jul 2006 15:21:24 -0000	1.6
+++ esc.spec	31 Jul 2006 18:27:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -26,6 +26,9 @@
 # Xulrunner won't compile on ppc64 right now.
 ExcludeArch: s390 s390x ppc64
 
+# We can't allow the internal xulrunner to leak out
+AutoProv: 0
+
 #%define __prelink_undo_cmd %{nil}
 %define escname %{name}-%{version}
 %define escdir %{_libdir}/%{escname}
@@ -156,6 +159,9 @@
 fi
 
 %changelog
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.0-3
+- Don't provide mozilla libraries
+
 * Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 1.0.0-2
 - remove bogus gtk+ requires (and some others that will
   be automatic)



From fedora-cvs-commits at redhat.com  Mon Jul 31 18:30:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 14:30:57 -0400
Subject: rpms/icon-naming-utils/FC-5 icon-naming-utils.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200607311830.k6VIUvTD010542@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10505

Modified Files:
	icon-naming-utils.spec sources 
Log Message:
0.7.3



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/FC-5/icon-naming-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- icon-naming-utils.spec	7 Feb 2006 04:17:04 -0000	1.2
+++ icon-naming-utils.spec	31 Jul 2006 18:30:52 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.6.7
+Version:        0.7.3
 Release:        1
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -47,6 +47,9 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.3-1
+- Update to 0.7.3
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.7-1
 - Update to 0.6.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Feb 2006 04:17:04 -0000	1.2
+++ sources	31 Jul 2006 18:30:52 -0000	1.3
@@ -1 +1 @@
-46443ee6ac3ee85b1a72b2abc55a770a  icon-naming-utils-0.6.7.tar.gz
+279563513efcb61f3af99358f061ae66  icon-naming-utils-0.7.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Jul 31 18:33:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 14:33:12 -0400
Subject: rpms/icon-naming-utils/FC-5 icon-naming-utils.spec,1.3,1.4
Message-ID: <200607311833.k6VIXC82011080@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv10970

Modified Files:
	icon-naming-utils.spec 
Log Message:
0.7.3



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/FC-5/icon-naming-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icon-naming-utils.spec	31 Jul 2006 18:30:52 -0000	1.3
+++ icon-naming-utils.spec	31 Jul 2006 18:33:08 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.7.3
+Version:        0.7.3%{?dist}
 Release:        1
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -47,7 +47,7 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
-* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.3-1
+* Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 0.7.3-1.fc5
 - Update to 0.7.3
 
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.7-1



From fedora-cvs-commits at redhat.com  Mon Jul 31 18:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 14:39:02 -0400
Subject: rpms/icon-naming-utils/FC-5 icon-naming-utils.spec,1.4,1.5
Message-ID: <200607311839.k6VId2OD012348@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12287

Modified Files:
	icon-naming-utils.spec 
Log Message:
0.7.3



Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/FC-5/icon-naming-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icon-naming-utils.spec	31 Jul 2006 18:33:08 -0000	1.4
+++ icon-naming-utils.spec	31 Jul 2006 18:39:00 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           icon-naming-utils
-Version:        0.7.3%{?dist}
-Release:        1
+Version:        0.7.3
+Release:        1%{?dist}
 Summary: 	A script to handle icon names in desktop icon themes
 
 Group:          Development/Tools/Other



From fedora-cvs-commits at redhat.com  Mon Jul 31 19:06:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 15:06:06 -0400
Subject: rpms/evolution/devel evolution-2.7.4-deleting-preedit-buffer.patch,
	NONE, 1.1 evolution-2.7.4-fix-crash-on-paste.patch, NONE,
	1.1 .cvsignore, 1.52, 1.53 evolution.spec, 1.170,
	1.171 sources, 1.52,
	1.53 evolution-2.7.90-deleting-preedit-buffer.patch, 1.1,
	NONE evolution-2.7.90-fix-crash-on-paste.patch, 1.1, NONE
Message-ID: <200607311906.k6VJ666R009408@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9377

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.7.4-deleting-preedit-buffer.patch 
	evolution-2.7.4-fix-crash-on-paste.patch 
Removed Files:
	evolution-2.7.90-deleting-preedit-buffer.patch 
	evolution-2.7.90-fix-crash-on-paste.patch 
Log Message:
- Add patch for RH bug #178295.
- Add patch for RH bug #167157.


evolution-2.7.4-deleting-preedit-buffer.patch:
 e-text.c |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

--- NEW FILE evolution-2.7.4-deleting-preedit-buffer.patch ---
--- evolution-2.7.90/widgets/text/e-text.c.deleting-preedit-buffer	2006-07-26 10:16:02.000000000 -0400
+++ evolution-2.7.90/widgets/text/e-text.c	2006-07-26 10:25:29.000000000 -0400
@@ -284,7 +284,7 @@
 	PangoAttrList *preedit_attrs = NULL;
 	gchar *preedit_string = NULL;
 	GString *tmp_string = g_string_new (NULL);
-	gint length = 0, cpos = 0, preedit_length = 0;
+        gint length = 0, cpos = 0;
 	gboolean new_attrs = FALSE;
 
 	if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context))
@@ -295,19 +295,15 @@
 
 	g_string_prepend_len (tmp_string, text->text,length); 
 
-	if (text->preedit_len)
-		gtk_im_context_get_preedit_string (text->im_context,
-					   &preedit_string, &preedit_attrs,
-					   NULL);
+        /* we came into this function only when text->preedit_len was not 0
+           so we can saftely fetch the preedit string */
+        gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL);
 
 	if (preedit_string && g_utf8_validate (preedit_string, -1, NULL))
-		text->preedit_len = preedit_length = strlen (preedit_string);
-	else
-		text->preedit_len  = preedit_length = 0;
-
-	cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;	
+        {
+                text->preedit_len = strlen (preedit_string);
+                cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
 
-	if (preedit_length) {
 		g_string_insert (tmp_string, cpos, preedit_string);
 
 		reset_layout_attrs (text);
@@ -320,15 +316,17 @@
 
 		pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len);
 
-		pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length);
+                pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len);
 
 		if (new_attrs) {
 			pango_layout_set_attributes (text->layout, attrs);
 			pango_attr_list_unref (attrs);
-		}
+                }
 
 		update_im_cursor_position (text);
 	}
+        else
+                text->preedit_len = 0;
 
 	if (preedit_string)
 		g_free (preedit_string);
@@ -385,9 +383,12 @@
 			pango_attr_list_insert_before (attrs, attr);
 		}
 	}
+
 	pango_layout_set_attributes (text->layout, attrs);
+	
 	if (attrs)
 		pango_attr_list_unref (attrs);
+	
 	calc_height (text);
 }
 
@@ -1510,9 +1511,14 @@
 		}
 	}
 
-
-	if (text->im_context_signals_registered)
-		insert_preedit_text (text);
+        /* Insert preedit text only when im_context signals are connected & text->preedit_len is not zero */
+        if (text->im_context_signals_registered && text->preedit_len)
+                insert_preedit_text (text);
+
+        /* Need to reset the layout to cleanly clear the preedit buffer
+         * when typing in CJK & using backspace on the preedit */
+        if(!text->preedit_len)
+                reset_layout (text);
 
 	if (!pango_layout_get_text (text->layout))
 		return;
@@ -2220,11 +2226,12 @@
 				 */
 
 				if (save_text && save_text->im_context) {
+                                        gtk_im_context_focus_out(save_text->im_context);
 					g_signal_handlers_disconnect_matched (save_text->im_context,
 									      G_SIGNAL_MATCH_DATA,
                                                                              0, 0, NULL,
                                                                              NULL, save_text);
-					save_text->im_context_signals_registered = FALSE;
+                                        save_text->im_context_signals_registered = FALSE;
 					reset_layout (save_text);
                                 }
 
@@ -2240,6 +2247,7 @@
 								  G_CALLBACK (e_text_delete_surrounding_cb), text);
 						text->im_context_signals_registered = TRUE;
 					}
+                                        gtk_im_context_focus_in(text->im_context);
 				}
 				start_editing (text);
 				text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */

evolution-2.7.4-fix-crash-on-paste.patch:
 e-calendar-view.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE evolution-2.7.4-fix-crash-on-paste.patch ---
--- evolution-2.7.90/calendar/gui/e-calendar-view.c.fix-crash-on-paste	2006-07-29 03:07:18.000000000 -0400
+++ evolution-2.7.90/calendar/gui/e-calendar-view.c	2006-07-29 03:07:49.000000000 -0400
@@ -376,10 +376,8 @@
 	/* FIXME Error handling */
 	uid = NULL;
 	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
-		if (uid) {
+		if (uid)
 			e_cal_component_set_uid (comp, uid);
-			g_free (uid);
-		}
 
 		if (itip_organizer_is_user (comp, client) &&
 		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	26 Jul 2006 11:20:17 -0000	1.52
+++ .cvsignore	31 Jul 2006 19:06:03 -0000	1.53
@@ -1 +1 @@
-evolution-2.7.90.tar.bz2
+evolution-2.7.4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- evolution.spec	29 Jul 2006 07:13:40 -0000	1.170
+++ evolution.spec	31 Jul 2006 19:06:03 -0000	1.171
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.7.90
+%define eds_version 1.5.92
 %define use_mozilla_nss 1
 %define evo_major 2.8
 %define libbonoboui_version 2.4.2
@@ -47,7 +47,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.90
+Version: 2.7.4
 Release: 4
 License: GPL
 Group: Applications/Productivity
@@ -91,7 +91,7 @@
 Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch22: evolution-2.6.0-prototypes.patch
 
-# Gnome.org bug #343331
+# Gnome.org #343331
 Patch23: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
@@ -110,10 +110,10 @@
 Patch28: evolution-2.7.3-submit-bug-report.patch
 
 # RH bug #178295 / Gnome.org bug #348638
-Patch29: evolution-2.7.90-deleting-preedit-buffer.patch
+Patch29: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # RH bug #167157 / Gnome.org bug #334464
-Patch30: evolution-2.7.90-fix-crash-on-paste.patch
+Patch30: evolution-2.7.4-fix-crash-on-paste.patch
 
 ### Dependencies ###
 
@@ -638,18 +638,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Sat Jul 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-4
-- Add patch for RH bug #167157.
-
-* Thu Jul 27 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-3
-- Add Requires for evolution-data-server >= 1.7.90
-- Add BuildRequires for evolution-data-server-devel >= 1.7.90
-
-* Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-2
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-4
 - Add patch for RH bug #178295.
-
-* Wed Jul 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.90-1
-- Update to 2.7.90
+- Add patch for RH bug #167157.
 
 * Tue Jul 18 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.4-3
 - Clean up spec file, renumber patches.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	26 Jul 2006 11:20:17 -0000	1.52
+++ sources	31 Jul 2006 19:06:03 -0000	1.53
@@ -1 +1 @@
-aae1aac8c521aef1aa9dbb1aed9a9f6e  evolution-2.7.90.tar.bz2
+5d9770b3d86953e8edcd36ec9f9b8852  evolution-2.7.4.tar.bz2


--- evolution-2.7.90-deleting-preedit-buffer.patch DELETED ---


--- evolution-2.7.90-fix-crash-on-paste.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Jul 31 19:48:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 15:48:59 -0400
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.7.4-with-libdb-fix.patch, 1.2,
	1.3 .cvsignore, 1.47, 1.48 evolution-data-server.spec, 1.106,
	1.107 sources, 1.47, 1.48
Message-ID: <200607311948.k6VJmxle011231@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10575

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-1.7.4-with-libdb-fix.patch 
Log Message:
- Revert to version 1.7.4 to prevent API/ABI breakage.
- Add back patch to make --with-libdb configure option work.


evolution-data-server-1.7.4-with-libdb-fix.patch:
 backends/groupwise/Makefile.am |    1 -
 libedata-book/Makefile.am      |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

Index: evolution-data-server-1.7.4-with-libdb-fix.patch
===================================================================
RCS file: evolution-data-server-1.7.4-with-libdb-fix.patch
diff -N evolution-data-server-1.7.4-with-libdb-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ evolution-data-server-1.7.4-with-libdb-fix.patch	31 Jul 2006 19:48:55 -0000	1.3
@@ -0,0 +1,22 @@
+--- evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am.with-libdb-fix	2006-07-19 12:40:29.000000000 -0400
++++ evolution-data-server-1.7.4/addressbook/libedata-book/Makefile.am	2006-07-19 12:40:53.000000000 -0400
+@@ -50,8 +50,7 @@
+ libedata_book_1_2_la_LIBADD =					\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
+ 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+-	$(top_builddir)/libdb/dist/libdb-4.1.la
++	$(top_builddir)/libedataserver/libedataserver-1.2.la
+ 
+ libedata_book_1_2_la_LDFLAGS = \
+ 	-version-info $(LIBEDATABOOK_CURRENT):$(LIBEDATABOOK_REVISION):$(LIBEDATABOOK_AGE) $(NO_UNDEFINED)
+--- evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am.with-libdb-fix	2006-07-19 12:40:11.000000000 -0400
++++ evolution-data-server-1.7.4/addressbook/backends/groupwise/Makefile.am	2006-07-19 12:40:53.000000000 -0400
+@@ -20,7 +20,6 @@
+ 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+ 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+-	$(top_builddir)/libdb/dist/libdb-4.1.la				\
+ 	$(EVOLUTION_ADDRESSBOOK_LIBS)					\
+ 	$(SOUP_LIBS)
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	26 Jul 2006 03:23:15 -0000	1.47
+++ .cvsignore	31 Jul 2006 19:48:55 -0000	1.48
@@ -1 +1 @@
-evolution-data-server-1.7.90.1.tar.bz2
+evolution-data-server-1.7.4.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- evolution-data-server.spec	31 Jul 2006 15:21:15 -0000	1.106
+++ evolution-data-server.spec	31 Jul 2006 19:48:55 -0000	1.107
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.90.1
-Release: 4
+Version: 1.7.4
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -43,8 +43,11 @@
 
 Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Gnome.org bug #344693
+Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+
 # Gnome.org bug #348725
-Patch17: evolution-data-server-1.7.90.1-missing-function-decl.patch
+#Patch18: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -128,7 +131,8 @@
 %patch14 -p0 -b .fix-uid-leak
 %patch15 -p0 -b .fix-comp-ref-leak
 %patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .missing-function-decl
+%patch17 -p1 -b .with-libdb-fix
+#%patch18 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -331,6 +335,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.4-3
+- Revert to version 1.7.4 to prevent API/ABI breakage.
+- Add back patch to make --with-libdb configure option work.
+
 * Mon Jul 31 2006 Ray Strode <rstrode at redhat.com> - 1.7.90.1-4
 - add executable bits to libs 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	26 Jul 2006 03:23:15 -0000	1.47
+++ sources	31 Jul 2006 19:48:55 -0000	1.48
@@ -1 +1 @@
-07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2
+b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:41:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:41:26 -0400
Subject: rpms/libsoup/FC-5 .cvsignore, 1.17, 1.18 libsoup.spec, 1.34,
	1.35 sources, 1.18, 1.19
Message-ID: <200607312041.k6VKfQbg014417@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/libsoup/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14383

Modified Files:
	.cvsignore libsoup.spec sources 
Log Message:
- Update to 2.2.96



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsoup/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	30 May 2006 17:57:37 -0000	1.17
+++ .cvsignore	31 Jul 2006 20:41:20 -0000	1.18
@@ -1 +1 @@
-libsoup-2.2.93.tar.bz2
+libsoup-2.2.96.tar.bz2


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/FC-5/libsoup.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libsoup.spec	30 May 2006 17:57:37 -0000	1.34
+++ libsoup.spec	31 Jul 2006 20:41:23 -0000	1.35
@@ -1,15 +1,27 @@
-Summary: Soup, an HTTP library implementation
+### Abstract ###
+
 Name: libsoup
-Version: 2.2.93
+Version: 2.2.96
 Release: 1.fc5.1
 License: LGPL
 Group: Development/Libraries
-Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
-URL:  ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
-
+Summary: Soup, an HTTP library implementation
+URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: glib2 >= 2.0, gnutls, libxml2
-BuildRequires: glib2-devel, pkgconfig, gnutls-devel, libxml2-devel
+Source: %{name}-%{version}.tar.bz2
+
+### Dependencies ###
+
+Requires: glib2 >= 2.0
+Requires: gnutls
+Requires: libxml2
+
+### Build Dependencies ###
+
+BuildRequires: glib2-devel
+BuildRequires: gnutls-devel
+BuildRequires: libxml2-devel
+BuildRequires: pkgconfig
 
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
@@ -26,7 +38,9 @@
 Summary: Header files for the Soup library
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: glib2-devel, gnutls-devel, libxml2-devel
+Requires: glib2-devel
+Requires: gnutls-devel
+Requires: libxml2-devel
 
 %description devel
 Libsoup is an HTTP library implementation in C. This package allows 
@@ -66,6 +80,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.96-1.fc5.1
+- Update to 2.2.96
+
 * Tue May 30 2006 Matthew Barnes <mbarnes at redhat.com> - 2.2.93-1.fc5.1
 - Update to 2.2.93
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsoup/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 May 2006 17:57:37 -0000	1.18
+++ sources	31 Jul 2006 20:41:23 -0000	1.19
@@ -1 +1 @@
-08f9c570a4331778da95c0bc317f6bf4  libsoup-2.2.93.tar.bz2
+2704961ca2b9597819f21b40d4a0e0aa  libsoup-2.2.96.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:41:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:41:55 -0400
Subject: rpms/pcsc-lite/devel pcsc-lite.spec,1.5,1.6
Message-ID: <200607312041.k6VKftWW014487@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/pcsc-lite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14434

Modified Files:
	pcsc-lite.spec 
Log Message:
- follow packaging guidelines for setting up init service
  (bug 200778)




Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/dist/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcsc-lite.spec	24 Jul 2006 22:04:27 -0000	1.5
+++ pcsc-lite.spec	31 Jul 2006 20:41:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.3.1
-Release:        5
+Release:        6
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -96,22 +96,18 @@
 
 
 %post
-if [ $1 -eq 1 ] ; then
-  /sbin/chkconfig --add pcscd
-  /sbin/chkconfig --level 345 pcscd on
-  %{_initrddir}/pcscd start 
-else
-  %{_initrddir}/pcscd try-restart  || :
-fi
+/sbin/chkconfig --add pcscd
 
 %preun
-if [ $1 -eq 0 ] ; then
-  %{_initrddir}/pcscd stop >/dev/null || :
+if [ $1 = 0 ] ; then
+  /sbin/service pcscd stop >/dev/null 2>&1 || :
   /sbin/chkconfig --del pcscd
 fi
 
 %postun
-[ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart  || :
+if [ "$1" -ge "1" ]; then
+  /sbin/service pcscd condrestart >/dev/null 2>&1 || :
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -150,6 +146,10 @@
 
 
 %changelog
+* Mon Jul 31 2006 Ray Strode <rstrode at redhat.com> - 1.3.1-6
+- follow packaging guidelines for setting up init service
+  (bug 200778)
+
 * Sun Jul 24 2006 Bob Relyea <rrelyea at redhat.com> - 1.3.1-5
 - start pcscd when pcsc-lite is installed
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:47:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:47:51 -0400
Subject: rpms/gtkhtml3/FC-5 .cvsignore, 1.33, 1.34 gtkhtml3.spec, 1.59,
	1.60 sources, 1.34, 1.35
Message-ID: <200607312047.k6VKlpYc025680@cvs.devel.redhat.com>

Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24891

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
- Update to 3.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	13 Mar 2006 16:54:41 -0000	1.33
+++ .cvsignore	31 Jul 2006 20:47:48 -0000	1.34
@@ -1 +1 @@
-gtkhtml-3.10.0.tar.bz2
+gtkhtml-3.10.3.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/gtkhtml3.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gtkhtml3.spec	11 Apr 2006 00:41:44 -0000	1.59
+++ gtkhtml3.spec	31 Jul 2006 20:47:48 -0000	1.60
@@ -1,25 +1,19 @@
+%define gnome_icon_theme_version 1.2.3
 %define gtkhtml_major 3.8
 %define libgnomeprint_version 2.7.1
-%define gnome_icon_theme_version 1.2.3
 
-Summary: gtkhtml library
+### Abstract ###
+
 Name: gtkhtml3
-Version: 3.10.1
+Version: 3.10.3
 Release: 1.fc5.1
 License: LGPL/GPL
 Group: System Environment/Libraries
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
+Summary: gtkhtml library
+Source: gtkhtml-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/gtkhtml-%{version}-root
-BuildRequires: libgnomeui-devel >= 2.0
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
-BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
-BuildRequires: libglade2-devel >= 2.0
-BuildRequires: gail-devel
-BuildRequires: libtool, gettext
-BuildRequires: intltool
-BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
-Requires: libgnomeprint22 >= %{libgnomeprint_version}
-Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
+
+### Patches ###
 
 # Partial band-aid for an editing crash (bug #129844)
 # http://bugzilla.ximian.com/show_bug.cgi?id=50052
@@ -29,6 +23,23 @@
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
 Patch4: gtkhtml-3.10.0-im-too-late.patch
 
+### Dependencies ###
+
+Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
+Requires: libgnomeprint22 >= %{libgnomeprint_version}
+
+### Build Dependencies ###
+
+BuildRequires: gail-devel
+BuildRequires: gettext
+BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
+BuildRequires: intltool
+BuildRequires: libglade2-devel >= 2.0
+BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
+BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libtool
+
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
 was originally based on KHTMLW, but is now being developed
@@ -98,6 +109,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> - 3.10.3-1.fc5.1
+- Update to 3.10.3
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 3.10.1-1.fc5.1
 - Update to 3.10.1
 - Update patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/FC-5/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	11 Apr 2006 00:41:44 -0000	1.34
+++ sources	31 Jul 2006 20:47:48 -0000	1.35
@@ -1 +1 @@
-f2b7ff386dae9fcc3b01c4116564722d  gtkhtml-3.10.1.tar.bz2
+90b1807db0ef0e5d69442e1f85610ec4  gtkhtml-3.10.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:48:16 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2480,
	1.2481 linux-2.6-gfs2-dlm.patch, 1.10,
	1.11 linux-2.6-gfs2-tux.patch, 1.1, 1.2
Message-ID: <200607312048.k6VKmGOV027072@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25484

Modified Files:
	kernel-2.6.spec linux-2.6-gfs2-dlm.patch 
	linux-2.6-gfs2-tux.patch 
Log Message:
Numerous GFS2/DLM fixes.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2480
retrieving revision 1.2481
diff -u -r1.2480 -r1.2481
--- kernel-2.6.spec	31 Jul 2006 20:13:51 -0000	1.2480
+++ kernel-2.6.spec	31 Jul 2006 20:48:11 -0000	1.2481
@@ -1662,6 +1662,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Dave Jones <davej at redhat.com>
+- Numerous GFS2/DLM fixes.
+
 * Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com>
 - new ahci suspend patch 
 

linux-2.6-gfs2-dlm.patch:
 CREDITS                            |    6 
 Documentation/filesystems/gfs2.txt |   43 
 MAINTAINERS                        |   18 
 fs/Kconfig                         |    2 
 fs/Makefile                        |    2 
 fs/configfs/item.c                 |    2 
 fs/dlm/Kconfig                     |   21 
 fs/dlm/Makefile                    |   19 
 fs/dlm/ast.c                       |  172 +
 fs/dlm/ast.h                       |   26 
 fs/dlm/config.c                    |  789 +++++++
 fs/dlm/config.h                    |   42 
 fs/dlm/debug_fs.c                  |  384 +++
 fs/dlm/dir.c                       |  423 ++++
 fs/dlm/dir.h                       |   30 
 fs/dlm/dlm_internal.h              |  539 +++++
 fs/dlm/lock.c                      | 3845 +++++++++++++++++++++++++++++++++++++
 fs/dlm/lock.h                      |   61 
 fs/dlm/lockspace.c                 |  705 ++++++
 fs/dlm/lockspace.h                 |   25 
 fs/dlm/lowcomms.c                  | 1238 +++++++++++
 fs/dlm/lowcomms.h                  |   26 
 fs/dlm/lvb_table.h                 |   18 
 fs/dlm/main.c                      |   97 
 fs/dlm/member.c                    |  312 +++
 fs/dlm/member.h                    |   24 
 fs/dlm/memory.c                    |  115 +
 fs/dlm/memory.h                    |   29 
 fs/dlm/midcomms.c                  |  140 +
 fs/dlm/midcomms.h                  |   21 
 fs/dlm/rcom.c                      |  457 ++++
 fs/dlm/rcom.h                      |   24 
 fs/dlm/recover.c                   |  776 +++++++
 fs/dlm/recover.h                   |   34 
 fs/dlm/recoverd.c                  |  285 ++
 fs/dlm/recoverd.h                  |   24 
 fs/dlm/requestqueue.c              |  184 +
 fs/dlm/requestqueue.h              |   22 
 fs/dlm/user.c                      |  785 +++++++
 fs/dlm/user.h                      |   16 
 fs/dlm/util.c                      |  161 +
 fs/dlm/util.h                      |   22 
 fs/gfs2/Kconfig                    |   44 
 fs/gfs2/Makefile                   |   10 
 fs/gfs2/acl.c                      |  313 +++
 fs/gfs2/acl.h                      |   37 
 fs/gfs2/bmap.c                     | 1236 +++++++++++
 fs/gfs2/bmap.h                     |   27 
 fs/gfs2/daemon.c                   |  196 +
 fs/gfs2/daemon.h                   |   19 
 fs/gfs2/dir.c                      | 1974 ++++++++++++++++++
 fs/gfs2/dir.h                      |   73 
 fs/gfs2/eaops.c                    |  230 ++
 fs/gfs2/eaops.h                    |   29 
 fs/gfs2/eattr.c                    | 1548 ++++++++++++++
 fs/gfs2/eattr.h                    |   97 
 fs/gfs2/format.h                   |   21 
 fs/gfs2/gfs2.h                     |   31 
 fs/gfs2/glock.c                    | 2279 +++++++++++++++++++++
 fs/gfs2/glock.h                    |  152 +
 fs/gfs2/glops.c                    |  564 +++++
 fs/gfs2/glops.h                    |   23 
 fs/gfs2/incore.h                   |  658 ++++++
 fs/gfs2/inode.c                    | 1344 ++++++++++++
 fs/gfs2/inode.h                    |   56 
 fs/gfs2/lm.c                       |  244 ++
 fs/gfs2/lm.h                       |   41 
 fs/gfs2/lm_interface.h             |  295 ++
 fs/gfs2/locking.c                  |  191 +
 fs/gfs2/locking/dlm/Makefile       |    3 
 fs/gfs2/locking/dlm/lock.c         |  541 +++++
 fs/gfs2/locking/dlm/lock_dlm.h     |  188 +
 fs/gfs2/locking/dlm/main.c         |   64 
 fs/gfs2/locking/dlm/mount.c        |  256 ++
 fs/gfs2/locking/dlm/plock.c        |  301 ++
 fs/gfs2/locking/dlm/sysfs.c        |  225 ++
 fs/gfs2/locking/dlm/thread.c       |  359 +++
 fs/gfs2/locking/nolock/Makefile    |    3 
 fs/gfs2/locking/nolock/main.c      |  259 ++
 fs/gfs2/log.c                      |  601 +++++
 fs/gfs2/log.h                      |   61 
 fs/gfs2/lops.c                     |  800 +++++++
 fs/gfs2/lops.h                     |   96 
 fs/gfs2/lvb.c                      |   45 
 fs/gfs2/lvb.h                      |   19 
 fs/gfs2/main.c                     |  127 +
 fs/gfs2/meta_io.c                  |  780 +++++++
 fs/gfs2/meta_io.h                  |   74 
 fs/gfs2/mount.c                    |  214 ++
 fs/gfs2/mount.h                    |   15 
 fs/gfs2/ondisk.c                   |  308 ++
 fs/gfs2/ops_address.c              |  778 +++++++
 fs/gfs2/ops_address.h              |   18 
 fs/gfs2/ops_dentry.c               |  123 +
 fs/gfs2/ops_dentry.h               |   15 
 fs/gfs2/ops_export.c               |  293 ++
 fs/gfs2/ops_export.h               |   19 
 fs/gfs2/ops_file.c                 |  812 +++++++
 fs/gfs2/ops_file.h                 |   20 
 fs/gfs2/ops_fstype.c               |  836 ++++++++
 fs/gfs2/ops_fstype.h               |   16 
 fs/gfs2/ops_inode.c                | 1165 +++++++++++
 fs/gfs2/ops_inode.h                |   18 
 fs/gfs2/ops_super.c                |  471 ++++
 fs/gfs2/ops_super.h                |   15 
 fs/gfs2/ops_vm.c                   |  194 +
 fs/gfs2/ops_vm.h                   |   16 
 fs/gfs2/quota.c                    | 1286 ++++++++++++
 fs/gfs2/quota.h                    |   32 
 fs/gfs2/recovery.c                 |  575 +++++
 fs/gfs2/recovery.h                 |   32 
 fs/gfs2/rgrp.c                     | 1528 ++++++++++++++
 fs/gfs2/rgrp.h                     |   62 
 fs/gfs2/super.c                    |  979 +++++++++
 fs/gfs2/super.h                    |   52 
 fs/gfs2/sys.c                      |  579 +++++
 fs/gfs2/sys.h                      |   24 
 fs/gfs2/trans.c                    |  184 +
 fs/gfs2/trans.h                    |   34 
 fs/gfs2/util.c                     |  245 ++
 fs/gfs2/util.h                     |  169 +
 include/linux/Kbuild               |   33 
 include/linux/dlm.h                |  302 ++
 include/linux/dlm_device.h         |   86 
 include/linux/fs.h                 |    3 
 include/linux/gfs2_ondisk.h        |  443 ++++
 include/linux/iflags.h             |  102 
 include/linux/kernel.h             |    1 
 include/linux/lock_dlm_plock.h     |   41 
 mm/filemap.c                       |    3 
 mm/readahead.c                     |    1 
 131 files changed, 40619 insertions(+), 21 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 linux-2.6-gfs2-dlm.patch
Index: linux-2.6-gfs2-dlm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-dlm.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-gfs2-dlm.patch	21 Jul 2006 20:26:59 -0000	1.10
+++ linux-2.6-gfs2-dlm.patch	31 Jul 2006 20:48:12 -0000	1.11
@@ -67,7 +67,7 @@
 +  mount.gfs2	to help mount(8) mount a filesystem
 +  mkfs.gfs2	to make a filesystem
 diff --git a/MAINTAINERS b/MAINTAINERS
-index e99028c..c67c3e3 100644
+index b2afc7a..e42e143 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -862,6 +862,16 @@ M:	jack at suse.cz
@@ -106,7 +106,7 @@
 index 3f00a9f..ddc7462 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -323,6 +323,7 @@ #
+@@ -323,6 +323,7 @@ config FS_POSIX_ACL
  	default n
  
  source "fs/xfs/Kconfig"
@@ -1256,10 +1256,10 @@
 +
 diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
 new file mode 100644
-index 0000000..49deca8
+index 0000000..8f471d9
 --- /dev/null
 +++ b/fs/dlm/debug_fs.c
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,384 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -1280,6 +1280,9 @@
 +
 +#include "dlm_internal.h"
 +
++#define DLM_DEBUG_BUF_LEN 4096
++static char debug_buf[DLM_DEBUG_BUF_LEN];
++static struct mutex debug_buf_lock;
 +
 +static struct dentry *dlm_root;
 +
@@ -1290,6 +1293,10 @@
 +	struct dlm_rsb *rsb;
 +};
 +
++/*
++ * dump all rsb's in the lockspace hash table
++ */
++
 +static char *print_lockmode(int mode)
 +{
 +	switch (mode) {
@@ -1338,7 +1345,7 @@
 +static int print_resource(struct dlm_rsb *res, struct seq_file *s)
 +{
 +	struct dlm_lkb *lkb;
-+	int i, lvblen = res->res_ls->ls_lvblen;
++	int i, lvblen = res->res_ls->ls_lvblen, recover_list, root_list;
 +
 +	seq_printf(s, "\nResource %p Name (len=%d) \"", res, res->res_length);
 +	for (i = 0; i < res->res_length; i++) {
@@ -1372,6 +1379,15 @@
 +		seq_printf(s, "\n");
 +	}
 +
++	root_list = !list_empty(&res->res_root_list);
++	recover_list = !list_empty(&res->res_recover_list);
++
++	if (root_list || recover_list) {
++		seq_printf(s, "Recovery: root %d recover %d flags %lx "
++			   "count %d\n", root_list, recover_list,
++			   res->res_flags, res->res_recover_locks_count);
++	}
++
 +	/* Print the locks attached to this resource */
 +	seq_printf(s, "Granted Queue\n");
 +	list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue)
@@ -1385,6 +1401,18 @@
 +	list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue)
 +		print_lock(s, lkb, res);
 +
++	if (list_empty(&res->res_lookup))
++		goto out;
++
++	seq_printf(s, "Lookup Queue\n");
++	list_for_each_entry(lkb, &res->res_lookup, lkb_rsb_lookup) {
++		seq_printf(s, "%08x %s", lkb->lkb_id,
++			   print_lockmode(lkb->lkb_rqmode));
++		if (lkb->lkb_wait_type)
++			seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
++		seq_printf(s, "\n");
++	}
++ out:
 +	return 0;
 +}
 +
@@ -1452,7 +1480,7 @@
 +	return ri;
 +}
 +
-+static void *seq_start(struct seq_file *file, loff_t *pos)
++static void *rsb_seq_start(struct seq_file *file, loff_t *pos)
 +{
 +	struct rsb_iter *ri;
 +	loff_t n = *pos;
@@ -1471,7 +1499,7 @@
 +	return ri;
 +}
 +
-+static void *seq_next(struct seq_file *file, void *iter_ptr, loff_t *pos)
++static void *rsb_seq_next(struct seq_file *file, void *iter_ptr, loff_t *pos)
 +{
 +	struct rsb_iter *ri = iter_ptr;
 +
@@ -1485,12 +1513,12 @@
 +	return ri;
 +}
 +
-+static void seq_stop(struct seq_file *file, void *iter_ptr)
++static void rsb_seq_stop(struct seq_file *file, void *iter_ptr)
 +{
 +	/* nothing for now */
 +}
 +
-+static int seq_show(struct seq_file *file, void *iter_ptr)
++static int rsb_seq_show(struct seq_file *file, void *iter_ptr)
 +{
 +	struct rsb_iter *ri = iter_ptr;
 +
@@ -1499,19 +1527,19 @@
 +	return 0;
 +}
 +
-+static struct seq_operations dlm_seq_ops = {
-+	.start = seq_start,
-+	.next  = seq_next,
-+	.stop  = seq_stop,
-+	.show  = seq_show,
++static struct seq_operations rsb_seq_ops = {
++	.start = rsb_seq_start,
++	.next  = rsb_seq_next,
++	.stop  = rsb_seq_stop,
++	.show  = rsb_seq_show,
 +};
 +
-+static int do_open(struct inode *inode, struct file *file)
++static int rsb_open(struct inode *inode, struct file *file)
 +{
 +	struct seq_file *seq;
 +	int ret;
 +
-+	ret = seq_open(file, &dlm_seq_ops);
++	ret = seq_open(file, &rsb_seq_ops);
 +	if (ret)
 +		return ret;
 +
@@ -1521,32 +1549,92 @@
 +	return 0;
 +}
 +
-+static struct file_operations dlm_fops = {
++static struct file_operations rsb_fops = {
 +	.owner   = THIS_MODULE,
-+	.open    = do_open,
++	.open    = rsb_open,
 +	.read    = seq_read,
 +	.llseek  = seq_lseek,
 +	.release = seq_release
 +};
 +
++/*
++ * dump lkb's on the ls_waiters list
++ */
++
++static int waiters_open(struct inode *inode, struct file *file)
++{
++	file->private_data = inode->u.generic_ip;
++	return 0;
++}
++
++static ssize_t waiters_read(struct file *file, char __user *userbuf,
++			    size_t count, loff_t *ppos)
++{
++	struct dlm_ls *ls = file->private_data;
++	struct dlm_lkb *lkb;
++	size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
++
++	mutex_lock(&debug_buf_lock);
++	mutex_lock(&ls->ls_waiters_mutex);
++	memset(debug_buf, 0, sizeof(debug_buf));
++
++	list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
[...1719 lines suppressed...]
 +		tmp = kcalloc(new_space, sizeof(struct gfs2_rgrpd *),
-+			      GFP_KERNEL | __GFP_NOFAIL);
++			      GFP_NOFS | __GFP_NOFAIL);
 +
 +		if (rlist->rl_rgd) {
 +			memcpy(tmp, rlist->rl_rgd,
@@ -38182,7 +37983,7 @@
 +	unsigned int x;
 +
 +	rlist->rl_ghs = kcalloc(rlist->rl_rgrps, sizeof(struct gfs2_holder),
-+				GFP_KERNEL | __GFP_NOFAIL);
++				GFP_NOFS | __GFP_NOFAIL);
 +	for (x = 0; x < rlist->rl_rgrps; x++)
 +		gfs2_holder_init(rlist->rl_rgd[x]->rd_gl,
 +				state, flags,
@@ -38278,10 +38079,10 @@
 +#endif /* __RGRP_DOT_H__ */
 diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
 new file mode 100644
-index 0000000..f2d2876
+index 0000000..3c318a9
 --- /dev/null
 +++ b/fs/gfs2/super.c
-@@ -0,0 +1,928 @@
+@@ -0,0 +1,979 @@
 +/*
 + * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
 + * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
@@ -38298,6 +38099,7 @@
 +#include <linux/buffer_head.h>
 +#include <linux/crc32.h>
 +#include <linux/gfs2_ondisk.h>
++#include <linux/bio.h>
 +
 +#include "gfs2.h"
 +#include "lm_interface.h"
@@ -38441,6 +38243,56 @@
 +	return 0;
 +}
 +
++
++static int end_bio_io_page(struct bio *bio, unsigned int bytes_done, int error)
++{
++	struct page *page = bio->bi_private;
++	if (bio->bi_size)
++		return 1;
++
++	if (!error)
++		SetPageUptodate(page);
++	else
++		printk(KERN_WARNING "gfs2: error %d reading superblock\n", error);
++	unlock_page(page);
++	return 0;
++}
++
++static struct page *gfs2_read_super(struct super_block *sb, sector_t sector)
++{
++	struct page *page;
++	struct bio *bio;
++
++	page = alloc_page(GFP_KERNEL);
++	if (unlikely(!page))
++		return NULL;
++
++	ClearPageUptodate(page);
++	ClearPageDirty(page);
++	lock_page(page);
++
++	bio = bio_alloc(GFP_KERNEL, 1);
++	if (unlikely(!bio)) {
++		__free_page(page);
++		return NULL;
++	}
++
++	bio->bi_sector = sector;
++	bio->bi_bdev = sb->s_bdev;
++	bio_add_page(bio, page, PAGE_SIZE, 0);
++
++	bio->bi_end_io = end_bio_io_page;
++	bio->bi_private = page;
++	submit_bio(READ_SYNC, bio);
++	wait_on_page_locked(page);
++	bio_put(bio);
++	if (!PageUptodate(page)) {
++		__free_page(page);
++		return NULL;
++	}
++	return page;
++}
++
 +/**
 + * gfs2_read_sb - Read super block
 + * @sdp: The GFS2 superblock
@@ -38451,23 +38303,23 @@
 +
 +int gfs2_read_sb(struct gfs2_sbd *sdp, struct gfs2_glock *gl, int silent)
 +{
-+	struct buffer_head *bh;
 +	uint32_t hash_blocks, ind_blocks, leaf_blocks;
 +	uint32_t tmp_blocks;
 +	unsigned int x;
 +	int error;
++	struct page *page;
++	char *sb;
 +
-+	error = gfs2_meta_read(gl, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift,
-+			       DIO_FORCE | DIO_START | DIO_WAIT, &bh);
-+	if (error) {
++	page = gfs2_read_super(sdp->sd_vfs, GFS2_SB_ADDR >> sdp->sd_fsb2bb_shift);
++	if (!page) {
 +		if (!silent)
 +			fs_err(sdp, "can't read superblock\n");
-+		return error;
++		return -EIO;
 +	}
-+
-+	gfs2_assert(sdp, sizeof(struct gfs2_sb) <= bh->b_size);
-+	gfs2_sb_in(&sdp->sd_sb, bh->b_data);
-+	brelse(bh);
++	sb = kmap(page);
++	gfs2_sb_in(&sdp->sd_sb, sb);
++	kunmap(page);
++	__free_page(page);
 +
 +	error = gfs2_check_sb(sdp, &sdp->sd_sb, silent);
 +	if (error)
@@ -38486,7 +38338,7 @@
 +	sdp->sd_hash_ptrs = sdp->sd_hash_bsize / sizeof(uint64_t);
 +	sdp->sd_qc_per_block = (sdp->sd_sb.sb_bsize -
 +				sizeof(struct gfs2_meta_header)) /
-+			       sizeof(struct gfs2_quota_change);
++			        sizeof(struct gfs2_quota_change);
 +
 +	/* Compute maximum reservation required to add a entry to a directory */
 +
@@ -41572,7 +41424,7 @@
 index 181c69c..06c2768 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -32,6 +32,7 @@ #define STACK_MAGIC	0xdeadbeef
+@@ -32,6 +32,7 @@ extern const char linux_banner[];
  
  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
  #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
@@ -41582,10 +41434,10 @@
  
 diff --git a/include/linux/lock_dlm_plock.h b/include/linux/lock_dlm_plock.h
 new file mode 100644
-index 0000000..007b07a
+index 0000000..fc34151
 --- /dev/null
 +++ b/include/linux/lock_dlm_plock.h
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +/*
 + * Copyright (C) 2005 Red Hat, Inc.  All rights reserved.
 + *
@@ -41600,7 +41452,7 @@
 +#define GDLM_PLOCK_MISC_NAME		"lock_dlm_plock"
 +
 +#define GDLM_PLOCK_VERSION_MAJOR	1
-+#define GDLM_PLOCK_VERSION_MINOR	0
++#define GDLM_PLOCK_VERSION_MINOR	1
 +#define GDLM_PLOCK_VERSION_PATCH	0
 +
 +enum {
@@ -41622,22 +41474,25 @@
 +	__u64 number;
 +	__u64 start;
 +	__u64 end;
++	__u64 owner;
 +};
 +
 +#endif
 +
 diff --git a/mm/filemap.c b/mm/filemap.c
-index d087fc3..b9c91ab 100644
+index b9a60c4..d9bbea1 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -1122,6 +1122,7 @@ success:
- 	desc->arg.buf += size;
- 	return size;
- }
-+EXPORT_SYMBOL_GPL(file_read_actor);
+@@ -1181,7 +1181,8 @@ __generic_file_aio_read(struct kiocb *io
+ 				*ppos = pos + retval;
+ 		}
+ 		file_accessed(filp);
+-		goto out;
++		if (retval != 0)
++			goto out;
+ 	}
  
- /**
-  * __generic_file_aio_read - generic filesystem read routine
+ 	retval = 0;
 diff --git a/mm/readahead.c b/mm/readahead.c
 index aa7ec42..1ba736a 100644
 --- a/mm/readahead.c

linux-2.6-gfs2-tux.patch:
 ops_file.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-gfs2-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gfs2-tux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-gfs2-tux.patch	9 Jun 2006 22:19:04 -0000	1.1
+++ linux-2.6-gfs2-tux.patch	31 Jul 2006 20:48:13 -0000	1.2
@@ -9,12 +9,3 @@
  	return desc.written ? desc.written : desc.error;
  }
  
-@@ -251,7 +251,7 @@ fallback_to_normal:
- 			if (desc.count == 0)
- 				continue;
- 			desc.error = 0;
--			do_generic_file_read(filp,ppos,&desc,file_read_actor);
-+			do_generic_file_read(filp,ppos,&desc,file_read_actor, 0);
- 			retval += desc.written;
- 			if (desc.error) {
- 				retval = retval ?: desc.error;



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:50:40 -0400
Subject: rpms/eclipse-cdt/devel eclipse-cdt-libhover-jar.patch, NONE,
	1.1 eclipse-cdt.spec, 1.50, 1.51
Message-ID: <200607312050.k6VKoeww031687@cvs.devel.redhat.com>

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31643

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-libhover-jar.patch 
Log Message:

* Mon Jul 31 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_10fc
- Fix bug with library hover help.




eclipse-cdt-libhover-jar.patch:
 LibHover.java |  168 ++++++++++++++--------------------------------------------
 1 files changed, 41 insertions(+), 127 deletions(-)

--- NEW FILE eclipse-cdt-libhover-jar.patch ---
--- com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java.fix	2006-07-31 15:56:12.000000000 -0400
+++ com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/LibHover.java	2006-07-31 15:56:31.000000000 -0400
@@ -15,43 +15,45 @@
 
 package com.redhat.eclipse.cdt.autotools.ui;
 
-import java.util.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import org.w3c.dom.*;
-
-import org.eclipse.core.runtime.*;
-import com.redhat.eclipse.cdt.autotools.AutotoolsPlugin;
-import org.eclipse.cdt.ui.ICHelpProvider;
-import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.ICHelpBook;
+import org.eclipse.cdt.ui.ICHelpProvider;
 import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
 import org.eclipse.cdt.ui.IFunctionSummary;
 import org.eclipse.cdt.ui.IRequiredInclude;
+import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Plugin;
 import org.eclipse.help.IHelpResource;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+
+import com.redhat.eclipse.cdt.autotools.AutotoolsPlugin;
 
 public class LibHover implements ICHelpProvider {
 	
     private static Plugin plugin;
-    private static String docsRootPath = null;
 
     // see comment in initialize()
     // private static String defaultSearchPath = null;
     
     private static Document document;
-    private static String oldpath = null;static final String  constructTypes[] ={
+    static final String  constructTypes[] ={
             "dtype",
 	        "enum",
 	        "function",
@@ -66,108 +68,39 @@ public class LibHover implements ICHelpP
 	    static final int typeIndex          = 4;
 	    static final int unionIndex         = 5;
 
-    private Document getDocument(String path, String name) {
-        Document doc = null;
-
-        String userHome = System.getProperty("user.home");
-        String userDir  = System.getProperty("user.dir");
-
-        if ((null == oldpath) || !oldpath.equals(path)) {
-            StringTokenizer dirs = new StringTokenizer(path, ":", false);
-
-            while((null == doc) && dirs.hasMoreTokens()) {
-                String dir =  dirs.nextToken();
-                if ((null != userHome) && dir.startsWith("~")) {
-                    dir = dir.replaceFirst("~", userHome);
-                }
-                else if ((null != userDir) && dir.startsWith(".")) {
-                    dir = dir.replaceFirst(".", userDir);
-                }
-                else if ((null != docsRootPath) && dir.startsWith("!")) {
-                    dir = dir.replaceFirst("!", docsRootPath);
-                }
-
-                if (!dir.endsWith("/")) dir = dir.concat("/");
-
-                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-                factory.setValidating(true);
-                try {
-                    DocumentBuilder builder = factory.newDocumentBuilder();
-//                    builder.setErrorHandler(new TextHoverErrorHandler());
-                    doc = builder.parse( new File(dir + name) );
-                }
-                catch (SAXParseException saxException) {
-                    doc = null;
-                }
-                catch (SAXException saxEx) {
-                    doc = null;
-                }
-                catch (ParserConfigurationException pce) {
-                    doc = null;
-                }
-                catch (IOException ioe) {
-                    doc = null;
-                }
-            }
-            oldpath = path;
-        }
-
-        return doc;
-    }
-    
-	public void buildDocPath(String root, String path) {
+     
+	public void getLibHoverDocs() {
 		if (null != plugin) {
-//			URL hoverdocsURL;
-//			URL homeURL = plugin.find(new Path("."));
 			Document doc = null;
 			try {
-//				homeURL = Platform.asLocalURL(homeURL);
-//				IPath topPath = (new Path(homeURL.getPath())).removeLastSegments(1);
-//				IPath homePath = topPath;
-//				if (null != root) homePath = homePath.append(root);
-//				if (null != path) homePath = homePath.append(path);
-//				homePath = homePath.addTrailingSeparator();
-//				docsRootPath = homePath.toOSString();
-
 				// see comment in initialize()
-				// document = getDocument(((null == defaultSearchPath) ? "!" : defaultSearchPath), "glibc.xml");
 				try {
-					Path p = new Path("libhoverdocs/glibc.xml");
+					// Use the FileLocator class to open the magic hover doc file
+					// in the plugin's jar.
+					Path p = new Path("libhoverdocs/glibc.xml"); //$NON-NLS-1$
 					InputStream docStream = FileLocator.openStream(AutotoolsPlugin.getDefault().getBundle(), p, false);
-					System.out.println("docStream created");
-//					Path x = new Path(hoverdocsURL.getPath());
-//					x.append("glibc.xml");
-//					System.out.println(x.toString());
-		               DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		                factory.setValidating(true);
-		                try {
-		                    DocumentBuilder builder = factory.newDocumentBuilder();
-//		                    builder.setErrorHandler(new TextHoverErrorHandler());
-		                    doc = builder.parse(docStream);
-		                    System.out.println("doc parsed successfully");
-		                }
-		                catch (SAXParseException saxException) {
-		                    doc = null;
-		                    System.out.println("SAXParseException");
-		                }
-		                catch (SAXException saxEx) {
-		                    doc = null;
-		                    System.out.println("SAXException");
-		                }
-		                catch (ParserConfigurationException pce) {
-		                    doc = null;
-		                    System.out.println("ParserConfigurationException");
-		                }
-		                catch (IOException ioe) {
-		                    doc = null;
-		                    System.out.println("IOException");
-		                }
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(true);
+					try {
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						doc = builder.parse(docStream);
+					}
+					catch (SAXParseException saxException) {
+						doc = null;
+					}
+					catch (SAXException saxEx) {
+						doc = null;
+					}
+					catch (ParserConfigurationException pce) {
+						doc = null;
+					}
+					catch (IOException ioe) {
+						doc = null;
+					}
 				} catch (MalformedURLException e) {
 					CUIPlugin.getDefault().log(e);
 				}
-
 				document = doc;
-//				document = getDocument("./libhoverdocs:~/libhoverdocs:/usr/share/eclipse/libhoverdocs:!", "glibc.xml");
 			}
 			catch (IOException ioe) {
 			}
@@ -176,26 +109,7 @@ public class LibHover implements ICHelpP
 	
 	public void initialize() {
 		plugin = (Plugin)AutotoolsPlugin.getDefault();
-
-		// the getAttribute() isn't working right -- it gets ghost attrs from somwhere rather than from the current fragment.xml --
-		// so to hell with it for the moment.
-		//
-		// String libhoverdocsroot = null;
-		// String libhoverdocspath = null;
-		// IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CUIPlugin.PLUGIN_ID,
-		//										   "CCompletionContributor"); //$NON-NLS-1$
-		// if (extensionPoint != null) {
-		// 	IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-		// 	for (int i = 0; i < elements.length; i++) {
-		// 		libhoverdocsroot  = elements[i].getAttribute("libhoverdocsroot");
-		// 		libhoverdocspath  = elements[i].getAttribute("libhoverdocspath");
-		//		defaultSearchPath = elements[i].getAttribute("defaultsearchpath");
-		//	}
-		// }
-		// buildDocPath(libhoverdocsroot,libhoverdocspath);
-		//
-		// use the following, pro-tem, instead
-		buildDocPath("com.redhat.eclipse.cdt.autotools", "libhoverdocs");
+		getLibHoverDocs();
 	}
 	
 	private class HelpBook implements ICHelpBook {


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- eclipse-cdt.spec	25 Jul 2006 16:31:02 -0000	1.50
+++ eclipse-cdt.spec	31 Jul 2006 20:50:37 -0000	1.51
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_9fc
+Release: 	1jpp_10fc
 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
@@ -50,6 +50,7 @@
 Patch3: %{name}-sdk-build-linux.patch
 Patch4: %{name}-no-tests.patch
 Patch5: %{name}-dynamic-scannerinfo-ext.patch
+Patch6: %{name}-libhover-jar.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -98,6 +99,7 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+%patch6 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -266,6 +268,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_10fc
+- Fix bug with library hover help.
+
 * Tue Jul 25 2006 Jeff Johnston  <jjohnstn at redhat.com> 3.1.0-1jpp_9fc
 - Remove redundant runtime packages from sdk.
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:54:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:54:13 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2481,
	1.2482 linux-2.6-xen.patch, 1.47, 1.48
Message-ID: <200607312054.k6VKsDDH000326@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32662

Modified Files:
	kernel-2.6.spec linux-2.6-xen.patch 
Log Message:
- Update xen patch to linux-2.6-xen-fedora cset 34801.
	* linux-2.6 cset 33175
	* no linux-2.6-xen updates.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2481
retrieving revision 1.2482
diff -u -r1.2481 -r1.2482
--- kernel-2.6.spec	31 Jul 2006 20:48:11 -0000	1.2481
+++ kernel-2.6.spec	31 Jul 2006 20:54:04 -0000	1.2482
@@ -1662,6 +1662,11 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Juan Quintela <quintela at redhat.com>
+- Update xen patch to linux-2.6-xen-fedora cset 34801.
+	* linux-2.6 cset 33175
+	* no linux-2.6-xen updates.
+
 * Mon Jul 31 2006 Dave Jones <davej at redhat.com>
 - Numerous GFS2/DLM fixes.
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   86 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    2 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1168 ++++++++
 arch/i386/kernel/alternative.c                      |    4 
 arch/i386/kernel/apic-xen.c                         |  160 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  740 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  197 +
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1188 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   93 
 arch/i386/kernel/head-xen.S                         |  180 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2772 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  324 ++
 arch/i386/kernel/ldt-xen.c                          |  269 +
 arch/i386/kernel/microcode-xen.c                    |  147 +
 arch/i386/kernel/mpparse-xen.c                      | 1186 ++++++++
 arch/i386/kernel/pci-dma-xen.c                      |  378 ++
 arch/i386/kernel/process-xen.c                      |  815 +++++
 arch/i386/kernel/quirks-xen.c                       |   48 
 arch/i386/kernel/setup-xen.c                        | 1827 +++++++++++++
 arch/i386/kernel/smp-xen.c                          |  624 ++++
 arch/i386/kernel/swiotlb.c                          |  672 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1103 +++++++
 arch/i386/kernel/traps-xen.c                        | 1182 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/setup.c                          |  154 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  770 +++++
 arch/i386/mm/highmem-xen.c                          |  133 
 arch/i386/mm/hypervisor.c                           |  458 +++
 arch/i386/mm/init-xen.c                             |  852 ++++++
 arch/i386/mm/ioremap-xen.c                          |  476 +++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  693 +++++
 arch/i386/mm/pgtable.c                              |   12 
 arch/i386/oprofile/Makefile                         |    4 
 arch/i386/oprofile/xenoprof.c                       |  555 ++++
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1204 ++++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   58 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   25 
 arch/ia64/kernel/entry.S                            |   32 
 arch/ia64/kernel/gate.S                             |    1 
 arch/ia64/kernel/gate.lds.S                         |    1 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   65 
 arch/ia64/kernel/irq_ia64.c                         |  208 +
 arch/ia64/kernel/pal.S                              |    5 
 arch/ia64/kernel/setup.c                            |   60 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/xen/Makefile                              |    8 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  353 ++
 arch/ia64/xen/hypervisor.c                          |  799 +++++
 arch/ia64/xen/util.c                                |  130 
 arch/ia64/xen/xenentry.S                            |  869 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2171 +++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  369 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   35 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   63 
 arch/x86_64/Kconfig.debug                           |    1 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   18 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  197 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/e820-xen.c                       |  752 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  304 ++
 arch/x86_64/kernel/entry-xen.S                      | 1209 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 +
 arch/x86_64/kernel/genapic_xen.c                    |  176 +
 arch/x86_64/kernel/head-xen.S                       |  176 +
 arch/x86_64/kernel/head64-xen.c                     |  161 +
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2263 ++++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq-xen.c                        |  198 +
 arch/x86_64/kernel/ldt-xen.c                        |  282 ++
 arch/x86_64/kernel/mpparse-xen.c                    | 1012 +++++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 arch/x86_64/kernel/process-xen.c                    |  793 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1640 +++++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  360 ++
 arch/x86_64/kernel/smp-xen.c                        |  600 ++++
 arch/x86_64/kernel/traps-xen.c                      | 1166 ++++++++
 arch/x86_64/kernel/vsyscall-xen.c                   |  239 +
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  723 +++++
 arch/x86_64/mm/init-xen.c                           | 1201 ++++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |    5 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  758 +++++
 drivers/char/tty_io.c                               |    7 
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    1 
 drivers/scsi/scsi_error.c                           |    1 
 drivers/scsi/scsi_priv.h                            |    1 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  260 +
 drivers/xen/Makefile                                |   17 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  608 ++++
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  569 ++++
 drivers/xen/blkback/common.h                        |  134 
 drivers/xen/blkback/interface.c                     |  177 +
 drivers/xen/blkback/vbd.c                           |  119 
 drivers/xen/blkback/xenbus.c                        |  460 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  841 ++++++
 drivers/xen/blkfront/block.h                        |  155 +
 drivers/xen/blkfront/vbd.c                          |  318 ++
 drivers/xen/blktap/Makefile                         |    3 
 drivers/xen/blktap/blktap.c                         | 1438 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  165 +
 drivers/xen/blktap/xenbus.c                         |  354 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  181 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  647 ++++
 drivers/xen/console/xencons_ring.c                  |  141 +
 drivers/xen/core/Makefile                           |   13 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  870 ++++++
 drivers/xen/core/features.c                         |   30 
 drivers/xen/core/gnttab.c                           |  442 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   60 
 drivers/xen/core/reboot.c                           |  364 ++
 drivers/xen/core/skbuff.c                           |  141 +
 drivers/xen/core/smpboot.c                          |  427 +++
 drivers/xen/core/xen_proc.c                         |   19 
 drivers/xen/core/xen_sysfs.c                        |  379 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  457 +++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  125 
 drivers/xen/netback/interface.c                     |  315 ++
 drivers/xen/netback/loopback.c                      |  261 +
 drivers/xen/netback/netback.c                       | 1122 ++++++++
 drivers/xen/netback/xenbus.c                        |  405 ++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 1606 +++++++++++
 drivers/xen/pciback/Makefile                        |   13 
 drivers/xen/pciback/conf_space.c                    |  403 ++
 drivers/xen/pciback/conf_space.h                    |  123 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  690 ++++
 drivers/xen/pciback/pciback.h                       |   91 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  454 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  272 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  294 ++
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 ++
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   85 
 drivers/xen/tpmback/interface.c                     |  177 +
 drivers/xen/tpmback/tpmback.c                       |  983 +++++++
 drivers/xen/tpmback/xenbus.c                        |  291 ++
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |   12 
 drivers/xen/xenbus/xenbus_backend_client.c          |  135 
 drivers/xen/xenbus/xenbus_client.c                  |  278 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  208 +
 drivers/xen/xenbus/xenbus_comms.h                   |   43 
 drivers/xen/xenbus/xenbus_dev.c                     |  245 +
 drivers/xen/xenbus/xenbus_probe.c                   | 1086 +++++++
 drivers/xen/xenbus/xenbus_xs.c                      |  843 ++++++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/fixmap.h                           |    4 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  164 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  152 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  156 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 +
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  372 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  226 +
 include/asm-i386/mach-xen/asm/io.h                  |  389 ++
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/mmu.h                 |   26 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  107 
 include/asm-i386/mach-xen/asm/page.h                |  337 ++
 include/asm-i386/mach-xen/asm/param.h               |   23 
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   88 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  197 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  509 +++
 include/asm-i386/mach-xen/asm/processor.h           |  741 +++++
 include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  117 
 include/asm-i386/mach-xen/asm/setup.h               |   79 
 include/asm-i386/mach-xen/asm/smp.h                 |  103 
 include/asm-i386/mach-xen/asm/spinlock.h            |  199 +
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  143 +
 include/asm-i386/mach-xen/asm/system.h              |  575 ++++
 include/asm-i386/mach-xen/asm/timer.h               |   70 
 include/asm-i386/mach-xen/asm/tlbflush.h            |  101 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    6 
 include/asm-i386/page.h                             |    2 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   72 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  533 +++
 include/asm-ia64/hypervisor.h                       |  207 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   34 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   31 
 include/asm-ia64/machvec.h                          |   15 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |  124 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    2 
 include/asm-ia64/privop.h                           |   59 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/synch_bitops.h                     |   63 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/xen/privop.h                       |  302 ++
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  208 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   64 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  113 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  206 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  137 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  372 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  327 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 include/asm-x86_64/mach-xen/asm/mmu.h               |   37 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  399 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   93 
 include/asm-x86_64/mach-xen/asm/page.h              |  327 ++
 include/asm-x86_64/mach-xen/asm/param.h             |   22 
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  226 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 include/asm-x86_64/mach-xen/asm/smp.h               |  150 +
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  346 ++
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  103 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   58 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/skbuff.h                              |   15 
 include/scsi/scsi_eh.h                              |    1 
 include/xen/balloon.h                               |   63 
 include/xen/cpu_hotplug.h                           |   44 
 include/xen/driver_util.h                           |   16 
 include/xen/evtchn.h                                |  114 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/acm.h                         |  188 +
 include/xen/interface/acm_ops.h                     |  103 
 include/xen/interface/arch-ia64.h                   |  433 +++
 include/xen/interface/arch-powerpc.h                |  119 
 include/xen/interface/arch-x86_32.h                 |  233 +
 include/xen/interface/arch-x86_64.h                 |  299 ++
 include/xen/interface/callback.h                    |   74 
 include/xen/interface/dom0_ops.h                    |  598 ++++
 include/xen/interface/event_channel.h               |  233 +
 include/xen/interface/features.h                    |   53 
 include/xen/interface/grant_table.h                 |  317 ++
 include/xen/interface/hvm/hvm_info_table.h          |   24 
 include/xen/interface/hvm/ioreq.h                   |   93 
 include/xen/interface/hvm/vmx_assist.h              |   98 
 include/xen/interface/io/blkif.h                    |   87 
 include/xen/interface/io/console.h                  |   33 
 include/xen/interface/io/netif.h                    |  157 +
 include/xen/interface/io/pciif.h                    |   55 
 include/xen/interface/io/ring.h                     |  273 +
 include/xen/interface/io/tpmif.h                    |   59 
 include/xen/interface/io/xenbus.h                   |   45 
 include/xen/interface/io/xs_wire.h                  |   97 
 include/xen/interface/memory.h                      |  243 +
 include/xen/interface/nmi.h                         |   60 
 include/xen/interface/physdev.h                     |  149 +
 include/xen/interface/sched.h                       |  103 
 include/xen/interface/sched_ctl.h                   |   69 
 include/xen/interface/trace.h                       |   87 
 include/xen/interface/vcpu.h                        |  121 
 include/xen/interface/version.h                     |   70 
 include/xen/interface/xen-compat.h                  |   47 
 include/xen/interface/xen.h                         |  507 +++
 include/xen/interface/xencomm.h                     |   37 
 include/xen/interface/xenoprof.h                    |  103 
 include/xen/pcifront.h                              |   39 
 include/xen/public/evtchn.h                         |   91 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   13 
 include/xen/xenbus.h                                |  299 ++
 include/xen/xencons.h                               |   14 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/timer.c                                      |   16 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    3 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  119 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/pktgen.c                                   |    2 
 net/core/skbuff.c                                   |   42 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    2 
 scripts/Makefile.xen                                |   14 
 407 files changed, 85185 insertions(+), 201 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- linux-2.6-xen.patch	30 Jul 2006 18:05:14 -0000	1.47
+++ linux-2.6-xen.patch	31 Jul 2006 20:54:04 -0000	1.48
@@ -12868,7 +12868,7 @@
 +
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/swiotlb.c linux-2.6-xen-fedora/arch/i386/kernel/swiotlb.c
 --- linux-2.6/arch/i386/kernel/swiotlb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/swiotlb.c	2006-07-18 03:27:59.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/swiotlb.c	2006-07-31 22:25:22.000000000 +0200
 @@ -0,0 +1,672 @@
 +/*
 + * Dynamic DMA mapping support.
@@ -13606,7 +13606,7 @@
  		memcpy(syscall_page,
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/time-xen.c linux-2.6-xen-fedora/arch/i386/kernel/time-xen.c
 --- linux-2.6/arch/i386/kernel/time-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/time-xen.c	2006-07-26 17:52:27.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/time-xen.c	2006-07-31 22:25:22.000000000 +0200
 @@ -0,0 +1,1103 @@
 +/*
 + *  linux/arch/i386/kernel/time.c
@@ -14198,7 +14198,7 @@
 +	   is just accounted to the spinlock function.
 +	   Better would be to write these functions in assembler again
 +	   and check exactly. */
-+	if (in_lock_functions(pc)) {
++	if (!user_mode_vm(regs) && in_lock_functions(pc)) {
 +		char *v = *(char **)regs->rsp;
 +		if ((v >= _stext && v <= _etext) ||
 +			(v >= _sinittext && v <= _einittext) ||
@@ -14207,7 +14207,7 @@
 +		return ((unsigned long *)regs->rsp)[1];
 +	}
 +#else
-+	if (in_lock_functions(pc))
++	if (!user_mode_vm(regs) && in_lock_functions(pc))
 +		return *(unsigned long *)(regs->ebp + 4);
 +#endif
 +
@@ -14712,9 +14712,9 @@
 +}
 +__initcall(xen_sysctl_init);
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/traps.c linux-2.6-xen-fedora/arch/i386/kernel/traps.c
---- linux-2.6/arch/i386/kernel/traps.c	2006-07-16 19:14:07.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/i386/kernel/traps.c	2006-07-22 20:37:35.000000000 +0200
-@@ -630,18 +630,11 @@ static void mem_parity_error(unsigned ch
+--- linux-2.6/arch/i386/kernel/traps.c	2006-07-31 12:23:37.000000000 +0200
++++ linux-2.6-xen-fedora/arch/i386/kernel/traps.c	2006-07-31 22:25:22.000000000 +0200
+@@ -641,18 +641,11 @@ static void mem_parity_error(unsigned ch
  
  static void io_check_error(unsigned char reason, struct pt_regs * regs)
  {
@@ -14736,8 +14736,8 @@
  static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/i386/kernel/traps-xen.c linux-2.6-xen-fedora/arch/i386/kernel/traps-xen.c
 --- linux-2.6/arch/i386/kernel/traps-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/i386/kernel/traps-xen.c	2006-07-22 20:37:35.000000000 +0200
-@@ -0,0 +1,1169 @@
++++ linux-2.6-xen-fedora/arch/i386/kernel/traps-xen.c	2006-07-31 22:25:22.000000000 +0200
+@@ -0,0 +1,1182 @@
 +/*
 + *  linux/arch/i386/traps.c
 + *
@@ -14933,10 +14933,21 @@
 +			if (unwind_init_blocked(&info, task) == 0)
 +				unw_ret = show_trace_unwind(&info, log_lvl);
 +		}
-+		if (unw_ret > 0) {
-+			if (call_trace > 0)
++		if (unw_ret > 0 && !arch_unw_user_mode(&info)) {
++#ifdef CONFIG_STACK_UNWIND
++			print_symbol("DWARF2 unwinder stuck at %s\n",
++				     UNW_PC(&info));
++			if (call_trace == 1) {
++				printk("Leftover inexact backtrace:\n");
++				if (UNW_SP(&info))
++					stack = (void *)UNW_SP(&info);
++			} else if (call_trace > 1)
 +				return;
-+			printk("%sLegacy call trace:\n", log_lvl);
++			else
++				printk("Full inexact backtrace again:\n");
++#else
++			printk("Inexact backtrace:\n");
++#endif
 +		}
 +	}
 +
@@ -15902,8 +15913,10 @@
 +		call_trace = -1;
 +	else if (strcmp(s, "both") == 0)
 +		call_trace = 0;
-+	else if (strcmp(s, "new") == 0)
++	else if (strcmp(s, "newfallback") == 0)
 +		call_trace = 1;
++	else if (strcmp(s, "new") == 2)
++		call_trace = 2;
 +	return 1;
 +}
 +__setup("call_trace=", call_trace_setup);
@@ -21845,482 +21858,26 @@
  	br.many b7
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/kernel/gate.lds.S linux-2.6-xen-fedora/arch/ia64/kernel/gate.lds.S
 --- linux-2.6/arch/ia64/kernel/gate.lds.S	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/ia64/kernel/gate.lds.S	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/*
-- * Linker script for gate DSO.  The gate pages are an ELF shared object prelinked to its
-- * virtual address, with only one read-only segment and one execute-only segment (both fit
-- * in one page).  This script controls its layout.
-- */
--
--
--#include <asm/system.h>
--
--SECTIONS
--{
--  . = GATE_ADDR + SIZEOF_HEADERS;
--
--  .hash				: { *(.hash) }				:readable
--  .dynsym			: { *(.dynsym) }
--  .dynstr			: { *(.dynstr) }
--  .gnu.version			: { *(.gnu.version) }
--  .gnu.version_d		: { *(.gnu.version_d) }
--  .gnu.version_r		: { *(.gnu.version_r) }
--  .dynamic			: { *(.dynamic) }			:readable :dynamic
--
--  /*
--   * This linker script is used both with -r and with -shared.  For the layouts to match,
--   * we need to skip more than enough space for the dynamic symbol table et al.  If this
--   * amount is insufficient, ld -shared will barf.  Just increase it here.
--   */
--  . = GATE_ADDR + 0x500;
--
--  .data.patch			: {
--				    __start_gate_mckinley_e9_patchlist = .;
--				    *(.data.patch.mckinley_e9)
--				    __end_gate_mckinley_e9_patchlist = .;
--
--				    __start_gate_vtop_patchlist = .;
--				    *(.data.patch.vtop)
--				    __end_gate_vtop_patchlist = .;
--
--				    __start_gate_fsyscall_patchlist = .;
--				    *(.data.patch.fsyscall_table)
--				    __end_gate_fsyscall_patchlist = .;
--
--				    __start_gate_brl_fsys_bubble_down_patchlist = .;
--				    *(.data.patch.brl_fsys_bubble_down)
--				    __end_gate_brl_fsys_bubble_down_patchlist = .;
--  }									:readable
--  .IA_64.unwind_info		: { *(.IA_64.unwind_info*) }
--  .IA_64.unwind			: { *(.IA_64.unwind*) }			:readable :unwind
--#ifdef HAVE_BUGGY_SEGREL
--  .text (GATE_ADDR + PAGE_SIZE)	: { *(.text) *(.text.*) }		:readable
--#else
--  . = ALIGN (PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1));
--  .text				: { *(.text) *(.text.*) }		:epc
--#endif
--
--  /DISCARD/			: {
--  	*(.got.plt) *(.got)
--	*(.data .data.* .gnu.linkonce.d.*)
--	*(.dynbss)
--	*(.bss .bss.* .gnu.linkonce.b.*)
--	*(__ex_table)
--	*(__mca_table)
--  }
--}
--
--/*
-- * We must supply the ELF program headers explicitly to get just one
-- * PT_LOAD segment, and set the flags explicitly to make segments read-only.
-- */
--PHDRS
--{
--  readable  PT_LOAD	FILEHDR	PHDRS	FLAGS(4);	/* PF_R */
--#ifndef HAVE_BUGGY_SEGREL
--  epc	    PT_LOAD	FILEHDR PHDRS	FLAGS(1);	/* PF_X */
--#endif
--  dynamic   PT_DYNAMIC			FLAGS(4);	/* PF_R */
--  unwind    0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */
--}
--
--/*
-- * This controls what symbols we export from the DSO.
-- */
--VERSION
--{
--  LINUX_2.5 {
--    global:
--	__kernel_syscall_via_break;
--	__kernel_syscall_via_epc;
--	__kernel_sigtramp;
--
--    local: *;
--  };
--}
--
--/* The ELF entry point can be used to set the AT_SYSINFO value.  */
--ENTRY(__kernel_syscall_via_epc)
++++ linux-2.6-xen-fedora/arch/ia64/kernel/gate.lds.S	2006-07-28 02:38:48.000000000 +0200
+@@ -4,6 +4,7 @@
+  * in one page).  This script controls its layout.
+  */
+ 
++#include <linux/config.h>
+ 
+ #include <asm/system.h>
+ 
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/kernel/gate.S linux-2.6-xen-fedora/arch/ia64/kernel/gate.S
 --- linux-2.6/arch/ia64/kernel/gate.S	2006-07-13 00:51:19.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/ia64/kernel/gate.S	1970-01-01 01:00:00.000000000 +0100
-@@ -1,375 +0,0 @@
--/*
-- * This file contains the code that gets mapped at the upper end of each task's text
-- * region.  For now, it contains the signal trampoline code only.
-- *
-- * Copyright (C) 1999-2003 Hewlett-Packard Co
-- * 	David Mosberger-Tang <davidm at hpl.hp.com>
-- */
--
--
--#include <asm/asmmacro.h>
--#include <asm/errno.h>
--#include <asm/asm-offsets.h>
--#include <asm/sigcontext.h>
--#include <asm/system.h>
--#include <asm/unistd.h>
--
--/*
-- * We can't easily refer to symbols inside the kernel.  To avoid full runtime relocation,
-- * complications with the linker (which likes to create PLT stubs for branches
-- * to targets outside the shared object) and to avoid multi-phase kernel builds, we
-- * simply create minimalistic "patch lists" in special ELF sections.
-- */
--	.section ".data.patch.fsyscall_table", "a"
--	.previous
--#define LOAD_FSYSCALL_TABLE(reg)			\
--[1:]	movl reg=0;					\
--	.xdata4 ".data.patch.fsyscall_table", 1b-.
--
--	.section ".data.patch.brl_fsys_bubble_down", "a"
--	.previous
--#define BRL_COND_FSYS_BUBBLE_DOWN(pr)			\
--[1:](pr)brl.cond.sptk 0;				\
--	.xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.
--
--GLOBAL_ENTRY(__kernel_syscall_via_break)
--	.prologue
--	.altrp b6
--	.body
--	/*
--	 * Note: for (fast) syscall restart to work, the break instruction must be
--	 *	 the first one in the bundle addressed by syscall_via_break.
--	 */
--{ .mib
--	break 0x100000
--	nop.i 0
--	br.ret.sptk.many b6
--}
--END(__kernel_syscall_via_break)
--
--/*
-- * On entry:
-- *	r11 = saved ar.pfs
-- *	r15 = system call #
-- *	b0  = saved return address
-- *	b6  = return address
-- * On exit:
-- *	r11 = saved ar.pfs
-- *	r15 = system call #
-- *	b0  = saved return address
-- *	all other "scratch" registers:	undefined
-- *	all "preserved" registers:	same as on entry
-- */
--
--GLOBAL_ENTRY(__kernel_syscall_via_epc)
--	.prologue
--	.altrp b6
--	.body
--{
--	/*
--	 * Note: the kernel cannot assume that the first two instructions in this
--	 * bundle get executed.  The remaining code must be safe even if
--	 * they do not get executed.
--	 */
--	adds r17=-1024,r15			// A
--	mov r10=0				// A    default to successful syscall execution
--	epc					// B	causes split-issue
--}
--	;;
--	rsm psr.be | psr.i			// M2 (5 cyc to srlz.d)
--	LOAD_FSYSCALL_TABLE(r14)		// X
--	;;
--	mov r16=IA64_KR(CURRENT)		// M2 (12 cyc)
--	shladd r18=r17,3,r14			// A
--	mov r19=NR_syscalls-1			// A
--	;;
--	lfetch [r18]				// M0|1
--	mov r29=psr				// M2 (12 cyc)
--	// If r17 is a NaT, p6 will be zero
--	cmp.geu p6,p7=r19,r17			// A    (sysnr > 0 && sysnr < 1024+NR_syscalls)?
--	;;
--	mov r21=ar.fpsr				// M2 (12 cyc)
--	tnat.nz p10,p9=r15			// I0
--	mov.i r26=ar.pfs			// I0 (would stall anyhow due to srlz.d...)
--	;;
--	srlz.d					// M0 (forces split-issue) ensure PSR.BE==0
--(p6)	ld8 r18=[r18]				// M0|1
--	nop.i 0
--	;;
--	nop.m 0
--(p6)	tbit.z.unc p8,p0=r18,0			// I0 (dual-issues with "mov b7=r18"!)
--	nop.i 0
--	;;
--(p8)	ssm psr.i
--(p6)	mov b7=r18				// I0
--(p8)	br.dptk.many b7				// B
--
--	mov r27=ar.rsc				// M2 (12 cyc)
--/*
-- * brl.cond doesn't work as intended because the linker would convert this branch
-- * into a branch to a PLT.  Perhaps there will be a way to avoid this with some
-- * future version of the linker.  In the meantime, we just use an indirect branch
-- * instead.
-- */
--#ifdef CONFIG_ITANIUM
--(p6)	add r14=-8,r14				// r14 <- addr of fsys_bubble_down entry
--	;;
--(p6)	ld8 r14=[r14]				// r14 <- fsys_bubble_down
--	;;
--(p6)	mov b7=r14
--(p6)	br.sptk.many b7
--#else
--	BRL_COND_FSYS_BUBBLE_DOWN(p6)
--#endif
--	ssm psr.i
--	mov r10=-1
--(p10)	mov r8=EINVAL
--(p9)	mov r8=ENOSYS
--	FSYS_RETURN
--END(__kernel_syscall_via_epc)
--
--#	define ARG0_OFF		(16 + IA64_SIGFRAME_ARG0_OFFSET)
--#	define ARG1_OFF		(16 + IA64_SIGFRAME_ARG1_OFFSET)
--#	define ARG2_OFF		(16 + IA64_SIGFRAME_ARG2_OFFSET)
--#	define SIGHANDLER_OFF	(16 + IA64_SIGFRAME_HANDLER_OFFSET)
--#	define SIGCONTEXT_OFF	(16 + IA64_SIGFRAME_SIGCONTEXT_OFFSET)
--
--#	define FLAGS_OFF	IA64_SIGCONTEXT_FLAGS_OFFSET
--#	define CFM_OFF		IA64_SIGCONTEXT_CFM_OFFSET
--#	define FR6_OFF		IA64_SIGCONTEXT_FR6_OFFSET
--#	define BSP_OFF		IA64_SIGCONTEXT_AR_BSP_OFFSET
--#	define RNAT_OFF		IA64_SIGCONTEXT_AR_RNAT_OFFSET
--#	define UNAT_OFF		IA64_SIGCONTEXT_AR_UNAT_OFFSET
--#	define FPSR_OFF		IA64_SIGCONTEXT_AR_FPSR_OFFSET
--#	define PR_OFF		IA64_SIGCONTEXT_PR_OFFSET
--#	define RP_OFF		IA64_SIGCONTEXT_IP_OFFSET
--#	define SP_OFF		IA64_SIGCONTEXT_R12_OFFSET
--#	define RBS_BASE_OFF	IA64_SIGCONTEXT_RBS_BASE_OFFSET
--#	define LOADRS_OFF	IA64_SIGCONTEXT_LOADRS_OFFSET
--#	define base0		r2
--#	define base1		r3
--	/*
--	 * When we get here, the memory stack looks like this:
--	 *
--	 *   +===============================+
--       	 *   |				     |
--       	 *   //	    struct sigframe          //
--       	 *   |				     |
--	 *   +-------------------------------+ <-- sp+16
--	 *   |      16 byte of scratch       |
--	 *   |            space              |
--	 *   +-------------------------------+ <-- sp
--	 *
--	 * The register stack looks _exactly_ the way it looked at the time the signal
--	 * occurred.  In other words, we're treading on a potential mine-field: each
--	 * incoming general register may be a NaT value (including sp, in which case the
--	 * process ends up dying with a SIGSEGV).
--	 *
--	 * The first thing need to do is a cover to get the registers onto the backing
--	 * store.  Once that is done, we invoke the signal handler which may modify some
--	 * of the machine state.  After returning from the signal handler, we return
--	 * control to the previous context by executing a sigreturn system call.  A signal
--	 * handler may call the rt_sigreturn() function to directly return to a given
--	 * sigcontext.  However, the user-level sigreturn() needs to do much more than
--	 * calling the rt_sigreturn() system call as it needs to unwind the stack to
--	 * restore preserved registers that may have been saved on the signal handler's
--	 * call stack.
--	 */
--
--#define SIGTRAMP_SAVES										\
--	.unwabi 3, 's';		/* mark this as a sigtramp handler (saves scratch regs) */	\
--	.unwabi @svr4, 's'; /* backwards compatibility with old unwinders (remove in v2.7) */	\
--	.savesp ar.unat, UNAT_OFF+SIGCONTEXT_OFF;						\
--	.savesp ar.fpsr, FPSR_OFF+SIGCONTEXT_OFF;						\
--	.savesp pr, PR_OFF+SIGCONTEXT_OFF;     							\
--	.savesp rp, RP_OFF+SIGCONTEXT_OFF;							\
--	.savesp ar.pfs, CFM_OFF+SIGCONTEXT_OFF;							\
--	.vframesp SP_OFF+SIGCONTEXT_OFF
--
--GLOBAL_ENTRY(__kernel_sigtramp)
--	// describe the state that is active when we get here:
--	.prologue
--	SIGTRAMP_SAVES
--	.body
--
--	.label_state 1
--
--	adds base0=SIGHANDLER_OFF,sp
--	adds base1=RBS_BASE_OFF+SIGCONTEXT_OFF,sp
--	br.call.sptk.many rp=1f
--1:
--	ld8 r17=[base0],(ARG0_OFF-SIGHANDLER_OFF)	// get pointer to signal handler's plabel
--	ld8 r15=[base1]					// get address of new RBS base (or NULL)
--	cover				// push args in interrupted frame onto backing store
--	;;
--	cmp.ne p1,p0=r15,r0		// do we need to switch rbs? (note: pr is saved by kernel)
--	mov.m r9=ar.bsp			// fetch ar.bsp
--	.spillsp.p p1, ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
--(p1)	br.cond.spnt setup_rbs		// yup -> (clobbers p8, r14-r16, and r18-r20)
--back_from_setup_rbs:
--	alloc r8=ar.pfs,0,0,3,0
--	ld8 out0=[base0],16		// load arg0 (signum)
--	adds base1=(ARG1_OFF-(RBS_BASE_OFF+SIGCONTEXT_OFF)),base1
--	;;
--	ld8 out1=[base1]		// load arg1 (siginfop)
--	ld8 r10=[r17],8			// get signal handler entry point
--	;;
--	ld8 out2=[base0]		// load arg2 (sigcontextp)
--	ld8 gp=[r17]			// get signal handler's global pointer
--	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
--	;;
--	.spillsp ar.bsp, BSP_OFF+SIGCONTEXT_OFF
--	st8 [base0]=r9			// save sc_ar_bsp
--	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
--	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
--	;;
--	stf.spill [base0]=f6,32
--	stf.spill [base1]=f7,32
--	;;
--	stf.spill [base0]=f8,32
--	stf.spill [base1]=f9,32
--	mov b6=r10
--	;;
--	stf.spill [base0]=f10,32
--	stf.spill [base1]=f11,32
--	;;
--	stf.spill [base0]=f12,32
--	stf.spill [base1]=f13,32
--	;;
--	stf.spill [base0]=f14,32
--	stf.spill [base1]=f15,32
--	br.call.sptk.many rp=b6			// call the signal handler
--.ret0:	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
--	;;
--	ld8 r15=[base0]				// fetch sc_ar_bsp
--	mov r14=ar.bsp
--	;;
--	cmp.ne p1,p0=r14,r15			// do we need to restore the rbs?
--(p1)	br.cond.spnt restore_rbs		// yup -> (clobbers r14-r18, f6 & f7)
--	;;
--back_from_restore_rbs:
--	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
--	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
--	;;
--	ldf.fill f6=[base0],32
--	ldf.fill f7=[base1],32
--	;;
--	ldf.fill f8=[base0],32
--	ldf.fill f9=[base1],32
--	;;
--	ldf.fill f10=[base0],32
--	ldf.fill f11=[base1],32
--	;;
--	ldf.fill f12=[base0],32
--	ldf.fill f13=[base1],32
--	;;
--	ldf.fill f14=[base0],32
--	ldf.fill f15=[base1],32
--	mov r15=__NR_rt_sigreturn
--	.restore sp				// pop .prologue
--	break __BREAK_SYSCALL
--
--	.prologue
--	SIGTRAMP_SAVES
--setup_rbs:
--	mov ar.rsc=0				// put RSE into enforced lazy mode
--	;;
--	.save ar.rnat, r19
--	mov r19=ar.rnat				// save RNaT before switching backing store area
--	adds r14=(RNAT_OFF+SIGCONTEXT_OFF),sp
--
--	mov r18=ar.bspstore
--	mov ar.bspstore=r15			// switch over to new register backing store area
--	;;
--
--	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
--	st8 [r14]=r19				// save sc_ar_rnat
--	.body
--	mov.m r16=ar.bsp			// sc_loadrs <- (new bsp - new bspstore) << 16
--	adds r14=(LOADRS_OFF+SIGCONTEXT_OFF),sp
--	;;
--	invala
--	sub r15=r16,r15
--	extr.u r20=r18,3,6
--	;;
--	mov ar.rsc=0xf				// set RSE into eager mode, pl 3
--	cmp.eq p8,p0=63,r20
--	shl r15=r15,16
--	;;
--	st8 [r14]=r15				// save sc_loadrs
--(p8)	st8 [r18]=r19		// if bspstore points at RNaT slot, store RNaT there now
--	.restore sp				// pop .prologue
--	br.cond.sptk back_from_setup_rbs
--
--	.prologue
--	SIGTRAMP_SAVES
--	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
--	.body
--restore_rbs:
--	// On input:
--	//	r14 = bsp1 (bsp at the time of return from signal handler)
--	//	r15 = bsp0 (bsp at the time the signal occurred)
--	//
--	// Here, we need to calculate bspstore0, the value that ar.bspstore needs
--	// to be set to, based on bsp0 and the size of the dirty partition on
--	// the alternate stack (sc_loadrs >> 16).  This can be done with the
--	// following algorithm:
--	//
--	//  bspstore0 = rse_skip_regs(bsp0, -rse_num_regs(bsp1 - (loadrs >> 19), bsp1));
--	//
--	// This is what the code below does.
--	//
--	alloc r2=ar.pfs,0,0,0,0			// alloc null frame
--	adds r16=(LOADRS_OFF+SIGCONTEXT_OFF),sp
--	adds r18=(RNAT_OFF+SIGCONTEXT_OFF),sp
--	;;
--	ld8 r17=[r16]
--	ld8 r16=[r18]			// get new rnat
--	extr.u r18=r15,3,6	// r18 <- rse_slot_num(bsp0)
--	;;
--	mov ar.rsc=r17			// put RSE into enforced lazy mode
--	shr.u r17=r17,16
--	;;
--	sub r14=r14,r17		// r14 (bspstore1) <- bsp1 - (sc_loadrs >> 16)
--	shr.u r17=r17,3		// r17 <- (sc_loadrs >> 19)
--	;;
--	loadrs			// restore dirty partition
--	extr.u r14=r14,3,6	// r14 <- rse_slot_num(bspstore1)
--	;;
--	add r14=r14,r17		// r14 <- rse_slot_num(bspstore1) + (sc_loadrs >> 19)
--	;;
--	shr.u r14=r14,6		// r14 <- (rse_slot_num(bspstore1) + (sc_loadrs >> 19))/0x40
--	;;
--	sub r14=r14,r17		// r14 <- -rse_num_regs(bspstore1, bsp1)
--	movl r17=0x8208208208208209
--	;;
--	add r18=r18,r14		// r18 (delta) <- rse_slot_num(bsp0) - rse_num_regs(bspstore1,bsp1)
--	setf.sig f7=r17
--	cmp.lt p7,p0=r14,r0	// p7 <- (r14 < 0)?
--	;;
--(p7)	adds r18=-62,r18	// delta -= 62
--	;;
--	setf.sig f6=r18
--	;;
--	xmpy.h f6=f6,f7
--	;;
--	getf.sig r17=f6
--	;;
--	add r17=r17,r18
--	shr r18=r18,63
--	;;
--	shr r17=r17,5
--	;;
--	sub r17=r17,r18		// r17 = delta/63
--	;;
--	add r17=r14,r17		// r17 <- delta/63 - rse_num_regs(bspstore1, bsp1)
--	;;
--	shladd r15=r17,3,r15	// r15 <- bsp0 + 8*(delta/63 - rse_num_regs(bspstore1, bsp1))
--	;;
--	mov ar.bspstore=r15			// switch back to old register backing store area
--	;;
--	mov ar.rnat=r16				// restore RNaT
--	mov ar.rsc=0xf				// (will be restored later on from sc_ar_rsc)
--	// invala not necessary as that will happen when returning to user-mode
--	br.cond.sptk back_from_restore_rbs
--END(__kernel_sigtramp)
++++ linux-2.6-xen-fedora/arch/ia64/kernel/gate.S	2006-07-28 02:38:48.000000000 +0200
+@@ -6,6 +6,7 @@
+  * 	David Mosberger-Tang <davidm at hpl.hp.com>
+  */
+ 
++#include <linux/config.h>
+ 
+ #include <asm/asmmacro.h>
+ #include <asm/errno.h>
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/kernel/head.S linux-2.6-xen-fedora/arch/ia64/kernel/head.S
 --- linux-2.6/arch/ia64/kernel/head.S	2006-07-13 00:51:19.000000000 +0200
 +++ linux-2.6-xen-fedora/arch/ia64/kernel/head.S	2006-07-22 20:37:35.000000000 +0200
@@ -22701,207 +22258,6 @@
  
  /*
   * Make a PAL call using the stacked registers calling convention.
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/kernel/patch.c linux-2.6-xen-fedora/arch/ia64/kernel/patch.c
---- linux-2.6/arch/ia64/kernel/patch.c	2006-07-13 00:51:20.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/ia64/kernel/patch.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,197 +0,0 @@
--/*
-- * Instruction-patching support.
-- *
-- * Copyright (C) 2003 Hewlett-Packard Co
-- *	David Mosberger-Tang <davidm at hpl.hp.com>
-- */
--#include <linux/init.h>
--#include <linux/string.h>
--
--#include <asm/patch.h>
--#include <asm/processor.h>
--#include <asm/sections.h>
--#include <asm/system.h>
--#include <asm/unistd.h>
--
--/*
-- * This was adapted from code written by Tony Luck:
-- *
-- * The 64-bit value in a "movl reg=value" is scattered between the two words of the bundle
-- * like this:
-- *
-- * 6  6         5         4         3         2         1
-- * 3210987654321098765432109876543210987654321098765432109876543210
-- * ABBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCDEEEEEFFFFFFFFFGGGGGGG
-- *
-- * CCCCCCCCCCCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-- * xxxxAFFFFFFFFFEEEEEDxGGGGGGGxxxxxxxxxxxxxBBBBBBBBBBBBBBBBBBBBBBB
-- */
--static u64
--get_imm64 (u64 insn_addr)
--{
--	u64 *p = (u64 *) (insn_addr & -16);	/* mask out slot number */
--
--	return ( (p[1] & 0x0800000000000000UL) << 4)  | /*A*/
--		((p[1] & 0x00000000007fffffUL) << 40) | /*B*/
--		((p[0] & 0xffffc00000000000UL) >> 24) | /*C*/
--		((p[1] & 0x0000100000000000UL) >> 23) | /*D*/
--		((p[1] & 0x0003e00000000000UL) >> 29) | /*E*/
--		((p[1] & 0x07fc000000000000UL) >> 43) | /*F*/
--		((p[1] & 0x000007f000000000UL) >> 36);  /*G*/
--}
--
--/* Patch instruction with "val" where "mask" has 1 bits. */
--void
--ia64_patch (u64 insn_addr, u64 mask, u64 val)
--{
--	u64 m0, m1, v0, v1, b0, b1, *b = (u64 *) (insn_addr & -16);
--#	define insn_mask ((1UL << 41) - 1)
--	unsigned long shift;
--
--	b0 = b[0]; b1 = b[1];
--	shift = 5 + 41 * (insn_addr % 16); /* 5 bits of template, then 3 x 41-bit instructions */
--	if (shift >= 64) {
--		m1 = mask << (shift - 64);
--		v1 = val << (shift - 64);
--	} else {
--		m0 = mask << shift; m1 = mask >> (64 - shift);
--		v0 = val  << shift; v1 = val >> (64 - shift);
--		b[0] = (b0 & ~m0) | (v0 & m0);
--	}
--	b[1] = (b1 & ~m1) | (v1 & m1);
--}
--
--void
--ia64_patch_imm64 (u64 insn_addr, u64 val)
--{
--	/* The assembler may generate offset pointing to either slot 1
--	   or slot 2 for a long (2-slot) instruction, occupying slots 1
--	   and 2.  */
--  	insn_addr &= -16UL;
--	ia64_patch(insn_addr + 2,
--		   0x01fffefe000UL, (  ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */
--				     | ((val & 0x0000000000200000UL) <<  0) /* bit 21 -> 21 */
--				     | ((val & 0x00000000001f0000UL) <<  6) /* bit 16 -> 22 */
--				     | ((val & 0x000000000000ff80UL) << 20) /* bit  7 -> 27 */
--				     | ((val & 0x000000000000007fUL) << 13) /* bit  0 -> 13 */));
--	ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22);
--}
--
--void
--ia64_patch_imm60 (u64 insn_addr, u64 val)
--{
--	/* The assembler may generate offset pointing to either slot 1
--	   or slot 2 for a long (2-slot) instruction, occupying slots 1
--	   and 2.  */
--  	insn_addr &= -16UL;
--	ia64_patch(insn_addr + 2,
--		   0x011ffffe000UL, (  ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */
--				     | ((val & 0x00000000000fffffUL) << 13) /* bit  0 -> 13 */));
--	ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18);
--}
--
--/*
-- * We need sometimes to load the physical address of a kernel
-- * object.  Often we can convert the virtual address to physical
-- * at execution time, but sometimes (either for performance reasons
-- * or during error recovery) we cannot to this.  Patch the marked
-- * bundles to load the physical address.
-- */
--void __init
--ia64_patch_vtop (unsigned long start, unsigned long end)
--{
--	s32 *offp = (s32 *) start;
--	u64 ip;
--
--	while (offp < (s32 *) end) {
--		ip = (u64) offp + *offp;
--
--		/* replace virtual address with corresponding physical address: */
--		ia64_patch_imm64(ip, ia64_tpa(get_imm64(ip)));
--		ia64_fc((void *) ip);
--		++offp;
--	}
--	ia64_sync_i();
--	ia64_srlz_i();
--}
--
--void __init
--ia64_patch_mckinley_e9 (unsigned long start, unsigned long end)
--{
--	static int first_time = 1;
--	int need_workaround;
--	s32 *offp = (s32 *) start;
--	u64 *wp;
--
--	need_workaround = (local_cpu_data->family == 0x1f && local_cpu_data->model == 0);
--
--	if (first_time) {
--		first_time = 0;
--		if (need_workaround)
--			printk(KERN_INFO "Leaving McKinley Errata 9 workaround enabled\n");
--		else
--			printk(KERN_INFO "McKinley Errata 9 workaround not needed; "
--			       "disabling it\n");
--	}
--	if (need_workaround)
--		return;
--
--	while (offp < (s32 *) end) {
--		wp = (u64 *) ia64_imva((char *) offp + *offp);
--		wp[0] = 0x0000000100000000UL; /* nop.m 0; nop.i 0; nop.i 0 */
--		wp[1] = 0x0004000000000200UL;
--		wp[2] = 0x0000000100000011UL; /* nop.m 0; nop.i 0; br.ret.sptk.many b6 */
--		wp[3] = 0x0084006880000200UL;
--		ia64_fc(wp); ia64_fc(wp + 2);
--		++offp;
--	}
--	ia64_sync_i();
--	ia64_srlz_i();
--}
--
--static void __init
--patch_fsyscall_table (unsigned long start, unsigned long end)
--{
--	extern unsigned long fsyscall_table[NR_syscalls];
--	s32 *offp = (s32 *) start;
--	u64 ip;
--
--	while (offp < (s32 *) end) {
--		ip = (u64) ia64_imva((char *) offp + *offp);
--		ia64_patch_imm64(ip, (u64) fsyscall_table);
--		ia64_fc((void *) ip);
--		++offp;
--	}
--	ia64_sync_i();
--	ia64_srlz_i();
--}
--
--static void __init
--patch_brl_fsys_bubble_down (unsigned long start, unsigned long end)
--{
--	extern char fsys_bubble_down[];
--	s32 *offp = (s32 *) start;
--	u64 ip;
--
--	while (offp < (s32 *) end) {
--		ip = (u64) offp + *offp;
--		ia64_patch_imm60((u64) ia64_imva((void *) ip),
--				 (u64) (fsys_bubble_down - (ip & -16)) / 16);
--		ia64_fc((void *) ip);
--		++offp;
--	}
--	ia64_sync_i();
--	ia64_srlz_i();
--}
--
--void __init
--ia64_patch_gate (void)
--{
--#	define START(name)	((unsigned long) __start_gate_##name##_patchlist)
--#	define END(name)	((unsigned long)__end_gate_##name##_patchlist)
--
--	patch_fsyscall_table(START(fsyscall), END(fsyscall));
--	patch_brl_fsys_bubble_down(START(brl_fsys_bubble_down), END(brl_fsys_bubble_down));
--	ia64_patch_vtop(START(vtop), END(vtop));
--	ia64_patch_mckinley_e9(START(mckinley_e9), END(mckinley_e9));
--}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/kernel/setup.c linux-2.6-xen-fedora/arch/ia64/kernel/setup.c
 --- linux-2.6/arch/ia64/kernel/setup.c	2006-07-13 00:51:20.000000000 +0200
 +++ linux-2.6-xen-fedora/arch/ia64/kernel/setup.c	2006-07-22 20:37:35.000000000 +0200
@@ -23059,12 +22415,14 @@
    echo '* compressed	- Build compressed kernel image'
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/mm/ioremap.c linux-2.6-xen-fedora/arch/ia64/mm/ioremap.c
 --- linux-2.6/arch/ia64/mm/ioremap.c	2006-07-13 00:51:20.000000000 +0200
-+++ linux-2.6-xen-fedora/arch/ia64/mm/ioremap.c	2006-07-18 03:28:00.000000000 +0200
-@@ -16,6 +16,7 @@
++++ linux-2.6-xen-fedora/arch/ia64/mm/ioremap.c	2006-07-28 02:38:48.000000000 +0200
+@@ -16,6 +16,9 @@
  static inline void __iomem *
  __ioremap (unsigned long offset, unsigned long size)
  {
++#ifdef CONFIG_XEN
 +	offset = HYPERVISOR_ioremap(offset, size);
++#endif
  	return (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);
  }
  
@@ -23433,8 +22791,8 @@
 +END(xen_send_ipi)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/ia64/xen/hypervisor.c linux-2.6-xen-fedora/arch/ia64/xen/hypervisor.c
 --- linux-2.6/arch/ia64/xen/hypervisor.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/ia64/xen/hypervisor.c	2006-07-18 03:28:00.000000000 +0200
-@@ -0,0 +1,795 @@
++++ linux-2.6-xen-fedora/arch/ia64/xen/hypervisor.c	2006-07-28 02:38:48.000000000 +0200
+@@ -0,0 +1,799 @@
 +/******************************************************************************
 + * include/asm-ia64/shadow.h
 + *
@@ -23472,6 +22830,7 @@
 +EXPORT_SYMBOL(HYPERVISOR_shared_info);
 +
 +start_info_t *xen_start_info;
++EXPORT_SYMBOL(xen_start_info);
 +
 +int running_on_xen;
 +EXPORT_SYMBOL(running_on_xen);
@@ -23528,6 +22887,7 @@
 +	}
 +	return ret;
 +}
++EXPORT_SYMBOL(ia64_xenmem_reservation_op);
 +
 +//XXX same as i386, x86_64 contiguous_bitmap_set(), contiguous_bitmap_clear()
 +// move those to lib/contiguous_bitmap?
@@ -23816,12 +23176,14 @@
 +
 +	return ____HYPERVISOR_grant_table_op(cmd, uop, count);
 +}
++EXPORT_SYMBOL(HYPERVISOR_grant_table_op);
 +
 +
 +///////////////////////////////////////////////////////////////////////////
 +// PageForeign(), SetPageForeign(), ClearPageForeign()
 +
 +struct address_space xen_ia64_foreign_dummy_mapping;
++EXPORT_SYMBOL(xen_ia64_foreign_dummy_mapping);
 +
 +///////////////////////////////////////////////////////////////////////////
 +// foreign mapping
@@ -27962,7 +27324,7 @@
  int is_remapped(void *virt)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/x86_64/ia32/ia32entry-xen.S linux-2.6-xen-fedora/arch/x86_64/ia32/ia32entry-xen.S
 --- linux-2.6/arch/x86_64/ia32/ia32entry-xen.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/x86_64/ia32/ia32entry-xen.S	2006-07-22 20:37:38.000000000 +0200
++++ linux-2.6-xen-fedora/arch/x86_64/ia32/ia32entry-xen.S	2006-07-31 22:25:22.000000000 +0200
 @@ -0,0 +1,743 @@
 +/*
 + * Compatibility mode system call entry point for x86-64. 
@@ -28087,7 +27449,7 @@
 +	pushq	%rax
 +	CFI_ADJUST_CFA_OFFSET 8
 +	cld
-+	SAVE_ARGS 0,0,1
++	SAVE_ARGS 0,0,0
 + 	/* no need to do an access_ok check here because rbp has been
 + 	   32bit zero extended */ 
 +1:	movl	(%rbp),%r9d
@@ -39748,8 +39110,8 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/arch/x86_64/kernel/traps-xen.c linux-2.6-xen-fedora/arch/x86_64/kernel/traps-xen.c
 --- linux-2.6/arch/x86_64/kernel/traps-xen.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/arch/x86_64/kernel/traps-xen.c	2006-07-22 20:37:38.000000000 +0200
-@@ -0,0 +1,1156 @@
++++ linux-2.6-xen-fedora/arch/x86_64/kernel/traps-xen.c	2006-07-31 22:25:22.000000000 +0200
+@@ -0,0 +1,1166 @@
 +/*
 + *  linux/arch/x86-64/traps.c
 + *
@@ -40007,7 +39369,6 @@
 +{
 +	const unsigned cpu = safe_smp_processor_id();
 +	unsigned long *irqstack_end = (unsigned long *)cpu_pda(cpu)->irqstackptr;
-+	int i = 11;
 +	unsigned used = 0;
 +
 +	printk("\nCall Trace:\n");
@@ -40028,11 +39389,20 @@
 +			if (unwind_init_blocked(&info, tsk) == 0)
 +				unw_ret = show_trace_unwind(&info, NULL);
 +		}
-+		if (unw_ret > 0) {
-+			if (call_trace > 0)
++		if (unw_ret > 0 && !arch_unw_user_mode(&info)) {
++#ifdef CONFIG_STACK_UNWIND
++			unsigned long rip = info.regs.rip;
++			print_symbol("DWARF2 unwinder stuck at %s\n", rip);
++			if (call_trace == 1) {
++				printk("Leftover inexact backtrace:\n");
++				stack = (unsigned long *)info.regs.rsp;
++			} else if (call_trace > 1)
 +				return;
-+			printk("Legacy call trace:");
-+			i = 18;
++			else
++				printk("Full inexact backtrace again:\n");
++#else
++			printk("Inexact backtrace:\n");
++#endif
 +		}
 +	}
 + 	/*
@@ -40901,8 +40271,10 @@
 +		call_trace = -1;
 +	else if (strcmp(s, "both") == 0)
 +		call_trace = 0;
-+	else if (strcmp(s, "new") == 0)
++	else if (strcmp(s, "newfallback") == 0)
 +		call_trace = 1;
++ 	else if (strcmp(s, "new") == 0)
++		call_trace = 2;
 +	return 1;
 +}
 +__setup("call_trace=", call_trace_setup);
@@ -46606,8 +45978,8 @@
 +obj-y += balloon.o
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/drivers/xen/blkback/blkback.c linux-2.6-xen-fedora/drivers/xen/blkback/blkback.c
 --- linux-2.6/drivers/xen/blkback/blkback.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/blkback/blkback.c	2006-07-18 03:28:20.000000000 +0200
-@@ -0,0 +1,568 @@
++++ linux-2.6-xen-fedora/drivers/xen/blkback/blkback.c	2006-07-28 02:38:48.000000000 +0200
+@@ -0,0 +1,569 @@
 +/******************************************************************************
 + * arch/xen/drivers/blkif/backend/main.c
 + * 
@@ -46650,6 +46022,7 @@
 +#include <linux/list.h>
 +#include <xen/balloon.h>
 +#include <asm/hypervisor.h>
++#include <asm/hypercall.h>
 +#include "common.h"
 +
 +/*
@@ -52721,7 +52094,7 @@
 +}
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/drivers/xen/core/evtchn.c linux-2.6-xen-fedora/drivers/xen/core/evtchn.c
 --- linux-2.6/drivers/xen/core/evtchn.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/core/evtchn.c	2006-07-22 20:37:52.000000000 +0200
++++ linux-2.6-xen-fedora/drivers/xen/core/evtchn.c	2006-07-28 02:38:48.000000000 +0200
 @@ -0,0 +1,870 @@
 +/******************************************************************************
 + * evtchn.c
@@ -53419,7 +52792,7 @@
 +	return !!(irq_status.flags & XENIRQSTAT_shared);
 +}
 +
-+void resend_irq_on_evtchn(struct hw_interrupt_type *h, unsigned int i)
++void resend_irq_on_evtchn(unsigned int i)
 +{
 +	int evtchn = evtchn_from_irq(i);
 +	shared_info_t *s = HYPERVISOR_shared_info;
@@ -56258,8 +55631,8 @@
 +obj-$(CONFIG_XEN_PCIDEV_FRONTEND)	+= pcifront/
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/drivers/xen/netback/common.h linux-2.6-xen-fedora/drivers/xen/netback/common.h
 --- linux-2.6/drivers/xen/netback/common.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/netback/common.h	2006-07-18 03:28:20.000000000 +0200
-@@ -0,0 +1,124 @@
++++ linux-2.6-xen-fedora/drivers/xen/netback/common.h	2006-07-28 02:38:48.000000000 +0200
+@@ -0,0 +1,125 @@
 +/******************************************************************************
 + * arch/xen/drivers/netif/backend/common.h
 + * 
@@ -56308,6 +55681,7 @@
 +#include <xen/interface/grant_table.h>
 +#include <xen/gnttab.h>
 +#include <xen/driver_util.h>
++#include <asm/hypercall.h>
 +
 +#define DPRINTK(_f, _a...)			\
 +	pr_debug("(file=%s, line=%d) " _f,	\
@@ -56979,8 +56353,8 @@
 +netloop-y := loopback.o
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/drivers/xen/netback/netback.c linux-2.6-xen-fedora/drivers/xen/netback/netback.c
 --- linux-2.6/drivers/xen/netback/netback.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/netback/netback.c	2006-07-18 03:28:20.000000000 +0200
-@@ -0,0 +1,1121 @@
++++ linux-2.6-xen-fedora/drivers/xen/netback/netback.c	2006-07-28 02:38:48.000000000 +0200
+@@ -0,0 +1,1122 @@
 +/******************************************************************************
 + * drivers/xen/netback/netback.c
 + * 
@@ -57020,6 +56394,7 @@
 +#include "common.h"
 +#include <xen/balloon.h>
 +#include <xen/interface/memory.h>
++#include <asm/page.h>
 +
 +/*#define NETBE_DEBUG_INTERRUPT*/
 +
@@ -58531,8 +57906,8 @@
 +xennet-objs := netfront.o
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/drivers/xen/netfront/netfront.c linux-2.6-xen-fedora/drivers/xen/netfront/netfront.c
 --- linux-2.6/drivers/xen/netfront/netfront.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/drivers/xen/netfront/netfront.c	2006-07-26 17:52:27.000000000 +0200
-@@ -0,0 +1,1605 @@
++++ linux-2.6-xen-fedora/drivers/xen/netfront/netfront.c	2006-07-28 02:38:48.000000000 +0200
+@@ -0,0 +1,1606 @@
 +/******************************************************************************
 + * Virtual network driver for conversing with remote driver backends.
 + *
@@ -58585,6 +57960,7 @@
 +#include <net/pkt_sched.h>
 +#include <net/arp.h>
 +#include <net/route.h>
++#include <asm/hypercall.h>
 +#include <asm/io.h>
 +#include <asm/uaccess.h>
 +#include <xen/evtchn.h>
@@ -74829,7 +74205,7 @@
  #endif /* _ASM_IA64_GCC_INTRIN_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/asm-ia64/hw_irq.h linux-2.6-xen-fedora/include/asm-ia64/hw_irq.h
 --- linux-2.6/include/asm-ia64/hw_irq.h	2006-07-13 00:51:36.000000000 +0200
-+++ linux-2.6-xen-fedora/include/asm-ia64/hw_irq.h	2006-07-22 20:37:54.000000000 +0200
++++ linux-2.6-xen-fedora/include/asm-ia64/hw_irq.h	2006-07-28 02:38:49.000000000 +0200
 @@ -15,7 +15,11 @@
  #include <asm/ptrace.h>
  #include <asm/smp.h>
@@ -74842,15 +74218,14 @@
  
  /*
   * 0 special
-@@ -99,6 +103,13 @@ extern void register_percpu_irq (ia64_ve
+@@ -99,6 +103,12 @@ extern void register_percpu_irq (ia64_ve
  
  static inline void ia64_resend_irq(unsigned int vector)
  {
 +#ifdef CONFIG_XEN
-+	extern void resend_irq_on_evtchn(struct hw_interrupt_type *h,
-+					 unsigned int i);
++	extern void resend_irq_on_evtchn(unsigned int i);
 +	if (is_running_on_xen())
-+		resend_irq_on_evtchn(h, vector);
++		resend_irq_on_evtchn(vector);
 +	else
 +#endif /* CONFIG_XEN */
  	platform_send_ipi(smp_processor_id(), vector, IA64_IPI_DM_INT, 0);
@@ -75732,7 +75107,7 @@
  #endif /* _ASM_IA64_INTEL_INTRIN_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/asm-ia64/io.h linux-2.6-xen-fedora/include/asm-ia64/io.h
 --- linux-2.6/include/asm-ia64/io.h	2006-07-13 00:51:36.000000000 +0200
-+++ linux-2.6-xen-fedora/include/asm-ia64/io.h	2006-07-22 20:37:54.000000000 +0200
++++ linux-2.6-xen-fedora/include/asm-ia64/io.h	2006-07-28 02:38:49.000000000 +0200
 @@ -66,9 +66,11 @@ extern unsigned int num_io_spaces;
  #define PIO_RESERVED		__IA64_UNCACHED_OFFSET
  #define HAVE_ARCH_PIO_SIZE
@@ -75787,35 +75162,6 @@
  
  # endif /* KERNEL */
  
-@@ -417,14 +451,26 @@ __writeq (unsigned long val, volatile vo
- # define outl_p		outl
- #endif
- 
--extern void __iomem * ioremap(unsigned long offset, unsigned long size);
--extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
-+/*
-+ * An "address" in IO memory space is not clearly either an integer or a pointer. We will
-+ * accept both, thus the casts.
-+ *
-+ * On ia-64, we access the physical I/O memory space through the uncached kernel region.
-+ */
-+static inline void __iomem *
-+ioremap (unsigned long offset, unsigned long size)
-+{
-+	offset = HYPERVISOR_ioremap(offset, size);
-+	return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset));
-+}
- 
- static inline void
- iounmap (volatile void __iomem *addr)
- {
- }
- 
-+#define ioremap_nocache(o,s)	ioremap(o,s)
-+
- /* Use normal IO mappings for DMI */
- #define dmi_ioremap ioremap
- #define dmi_iounmap(x,l) iounmap(x)
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/asm-ia64/iosapic.h linux-2.6-xen-fedora/include/asm-ia64/iosapic.h
 --- linux-2.6/include/asm-ia64/iosapic.h	2006-07-13 00:51:36.000000000 +0200
 +++ linux-2.6-xen-fedora/include/asm-ia64/iosapic.h	2006-07-18 03:28:26.000000000 +0200
@@ -79144,7 +78490,7 @@
 +#endif /* ASM_NMI_H */
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/asm-x86_64/mach-xen/asm/page.h linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/page.h
 --- linux-2.6/include/asm-x86_64/mach-xen/asm/page.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/page.h	2006-07-18 03:28:29.000000000 +0200
++++ linux-2.6-xen-fedora/include/asm-x86_64/mach-xen/asm/page.h	2006-07-31 22:25:24.000000000 +0200
 @@ -0,0 +1,327 @@
 +#ifndef _X86_64_PAGE_H
 +#define _X86_64_PAGE_H
@@ -79191,7 +78537,7 @@
 +#define EXCEPTION_STACK_ORDER 0
 +#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)
 +
-+#define DEBUG_STACK_ORDER EXCEPTION_STACK_ORDER
++#define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1)
 +#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)
 +
 +#define IRQSTACK_ORDER 2
@@ -82625,17 +81971,6 @@
  
  /**
   * Create a file of the given name as a child of the given root, with
-diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/linux/pfn.h linux-2.6-xen-fedora/include/linux/pfn.h
---- linux-2.6/include/linux/pfn.h	2006-07-13 00:51:40.000000000 +0200
-+++ linux-2.6-xen-fedora/include/linux/pfn.h	2006-07-22 21:51:19.000000000 +0200
-@@ -4,6 +4,6 @@
- #define PFN_ALIGN(x)	(((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
- #define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
- #define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
--#define PFN_PHYS(x)	((x) << PAGE_SHIFT)
-+#define PFN_PHYS(x)	((unsigned long long)(x) << PAGE_SHIFT)
- 
- #endif
 diff -urNp --exclude=TAGS --exclude='.hg*' linux-2.6/include/linux/skbuff.h linux-2.6-xen-fedora/include/linux/skbuff.h
 --- linux-2.6/include/linux/skbuff.h	2006-07-25 18:52:10.000000000 +0200
 +++ linux-2.6-xen-fedora/include/linux/skbuff.h	2006-07-26 17:11:05.000000000 +0200



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:55:13 -0400
Subject: rpms/kernel/devel/configs config-xen-x86_64,1.5,1.6
Message-ID: <200607312055.k6VKtDU8000674@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv625/configs

Modified Files:
	config-xen-x86_64 
Log Message:
Remove xen x86_64 8 cpu limit


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-xen-x86_64	19 Jul 2006 23:45:42 -0000	1.5
+++ config-xen-x86_64	31 Jul 2006 20:55:10 -0000	1.6
@@ -7,6 +7,4 @@
 
 CONFIG_GENERIC_CPU=y
 
-CONFIG_NR_CPUS=8
-
 # CONFIG_CALGARY_IOMMU is not set                                                               |extern int numa_setup(char *opt);



From fedora-cvs-commits at redhat.com  Mon Jul 31 20:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 16:55:13 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2482,1.2483
Message-ID: <200607312055.k6VKtDsk000667@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv625

Modified Files:
	kernel-2.6.spec 
Log Message:
Remove xen x86_64 8 cpu limit


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2482
retrieving revision 1.2483
diff -u -r1.2482 -r1.2483
--- kernel-2.6.spec	31 Jul 2006 20:54:04 -0000	1.2482
+++ kernel-2.6.spec	31 Jul 2006 20:55:10 -0000	1.2483
@@ -1666,6 +1666,7 @@
 - Update xen patch to linux-2.6-xen-fedora cset 34801.
 	* linux-2.6 cset 33175
 	* no linux-2.6-xen updates.
+- Remove xen x86_64 8 cpu limit.
 
 * Mon Jul 31 2006 Dave Jones <davej at redhat.com>
 - Numerous GFS2/DLM fixes.



From fedora-cvs-commits at redhat.com  Mon Jul 31 21:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 17:25:11 -0400
Subject: rpms/selinux-policy/devel policy-20060608.patch, 1.43,
	1.44 selinux-policy.spec, 1.239, 1.240
Message-ID: <200607312125.k6VLPBMN024085@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24051

Modified Files:
	policy-20060608.patch selinux-policy.spec 
Log Message:
* Mon Jul 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-16
- Fixes for Samba


policy-20060608.patch:
 global_booleans                    |    2 
 global_tunables                    |   89 ++++++++------
 mcs                                |    3 
 mls                                |    9 -
 modules/admin/bootloader.te        |    6 -
 modules/admin/consoletype.te       |   11 +
 modules/admin/firstboot.te         |    5 
 modules/admin/netutils.te          |   10 -
 modules/admin/prelink.te           |    1 
 modules/admin/rpm.fc               |    2 
 modules/admin/rpm.if               |    4 
 modules/admin/usermanage.te        |    2 
 modules/kernel/corenetwork.te.in   |    5 
 modules/kernel/devices.fc          |    3 
 modules/kernel/files.fc            |    1 
 modules/kernel/filesystem.if       |   21 +++
 modules/kernel/filesystem.te       |    2 
 modules/kernel/kernel.if           |   38 ++++++
 modules/kernel/selinux.if          |   18 ++-
 modules/kernel/selinux.te          |    4 
 modules/kernel/storage.fc          |    1 
 modules/services/amavis.te         |    7 +
 modules/services/apache.te         |    1 
 modules/services/automount.te      |    8 +
 modules/services/avahi.te          |    1 
 modules/services/bind.fc           |    3 
 modules/services/bluetooth.if      |   23 +++
 modules/services/bluetooth.te      |    7 +
 modules/services/clamav.fc         |    3 
 modules/services/clamav.if         |   22 +++
 modules/services/clamav.te         |   20 ---
 modules/services/cron.if           |   16 ++
 modules/services/cups.te           |    6 -
 modules/services/cyrus.te          |    5 
 modules/services/dovecot.fc        |    1 
 modules/services/dovecot.te        |   10 +
 modules/services/ftp.te            |    2 
 modules/services/hal.te            |   10 +
 modules/services/inetd.te          |   12 +-
 modules/services/ldap.fc           |    1 
 modules/services/ldap.if           |   21 +++
 modules/services/ldap.te           |    2 
 modules/services/lpd.if            |   20 +--
 modules/services/mailman.te        |   15 ++
 modules/services/nis.te            |    1 
 modules/services/nscd.if           |   20 +++
 modules/services/ntp.te            |    2 
 modules/services/openvpn.te        |    8 +
 modules/services/pegasus.if        |   31 +++++
 modules/services/pegasus.te        |    5 
 modules/services/postfix.te        |   13 ++
 modules/services/postgrey.fc       |    2 
 modules/services/postgrey.if       |   19 +++
 modules/services/postgrey.te       |   20 +++
 modules/services/procmail.te       |    5 
 modules/services/radius.fc         |    1 
 modules/services/radius.te         |    8 +
 modules/services/remotelogin.te    |    1 
 modules/services/samba.te          |    6 -
 modules/services/setroubleshoot.fc |   11 +
 modules/services/setroubleshoot.if |   24 ++++
 modules/services/setroubleshoot.te |  146 ++++++++++++++++++++++++
 modules/services/spamassassin.te   |    4 
 modules/services/squid.te          |    9 -
 modules/services/ssh.if            |    1 
 modules/services/tftp.te           |    1 
 modules/services/xfs.te            |    2 
 modules/services/xserver.if        |   22 +++
 modules/services/xserver.te        |    3 
 modules/services/zebra.te          |    7 +
 modules/system/authlogin.if        |    3 
 modules/system/authlogin.te        |    1 
 modules/system/fstools.fc          |    1 
 modules/system/getty.fc            |    1 
 modules/system/getty.te            |    3 
 modules/system/hostname.te         |   10 +
 modules/system/hotplug.te          |    2 
 modules/system/init.if             |    7 -
 modules/system/libraries.fc        |    4 
 modules/system/locallogin.te       |    1 
 modules/system/logging.fc          |    3 
 modules/system/logging.if          |    6 -
 modules/system/logging.te          |    9 +
 modules/system/lvm.te              |    3 
 modules/system/mount.te            |    2 
 modules/system/selinuxutil.te      |   29 ++++
 modules/system/setrans.te          |    5 
 modules/system/sysnetwork.te       |    1 
 modules/system/udev.te             |    4 
 modules/system/unconfined.fc       |    1 
 modules/system/unconfined.if       |    8 -
 modules/system/unconfined.te       |   13 +-
 modules/system/userdomain.if       |  221 ++++++++++++++++++++++++-------------
 modules/system/userdomain.te       |   50 +++-----
 modules/system/xen.if              |   38 ++++++
 modules/system/xen.te              |   14 +-
 96 files changed, 1000 insertions(+), 265 deletions(-)

Index: policy-20060608.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060608.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- policy-20060608.patch	29 Jul 2006 08:32:43 -0000	1.43
+++ policy-20060608.patch	31 Jul 2006 21:25:08 -0000	1.44
@@ -187,6 +187,30 @@
  
  mlsconstrain process { sigkill sigstop }
  	(( h1 dom h2 ) or ( t1 == mcskillall ));
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.3.3/policy/mls
+--- nsaserefpolicy/policy/mls	2006-07-14 17:04:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/mls	2006-07-31 17:12:14.000000000 -0400
+@@ -184,19 +184,12 @@
+ 	 ( t2 == mlstrustedobject ));
+ 
+ # the "single level" file "write" ops
+-mlsconstrain { file lnk_file fifo_file } { write create setattr relabelfrom append unlink link rename mounton }
++mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
+ 	(( l1 eq l2 ) or
+ 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+ 	 ( t1 == mlsfilewrite ) or
+ 	 ( t2 == mlstrustedobject ));
+ 
+-# the "ranged" file "write" ops
+-mlsconstrain { dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton }
+-	((( l1 dom l2 ) and ( l1 domby h2 )) or
+-	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
+-	 ( t1 == mlsfilewrite ) or
+-	 ( t2 == mlstrustedobject ));
+-
+ mlsconstrain dir { add_name remove_name reparent rmdir }
+ 	((( l1 dom l2 ) and ( l1 domby h2 )) or
+ 	 (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.3.3/policy/modules/admin/bootloader.te
 --- nsaserefpolicy/policy/modules/admin/bootloader.te	2006-07-14 17:04:46.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/admin/bootloader.te	2006-07-26 13:52:04.000000000 -0400
@@ -592,7 +616,7 @@
  /dev/p[fg][0-3]		-b	gen_context(system_u:object_r:removable_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-2.3.3/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2006-07-14 17:04:40.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-07-17 12:03:46.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/amavis.te	2006-07-31 09:31:51.000000000 -0400
 @@ -62,10 +62,12 @@
  allow amavis_t amavis_quarantine_t:dir create_dir_perms;
  
@@ -606,6 +630,22 @@
  
  # tmp files
  allow amavis_t amavis_tmp_t:file create_file_perms;
+@@ -116,6 +118,7 @@
+ # bind to incoming port
+ corenet_tcp_bind_amavisd_recv_port(amavis_t)
+ corenet_udp_bind_generic_port(amavis_t)
++corenet_tcp_connect_razor_port(amavis_t)
+ 
+ dev_read_rand(amavis_t)
+ dev_read_urand(amavis_t)
+@@ -180,3 +183,7 @@
+ 	spamassassin_exec(amavis_t)
+ 	spamassassin_exec_client(amavis_t)
+ ')
++
++optional_policy(`
++	postfix_read_config(amavis_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.3.3/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/apache.te	2006-07-27 12:31:07.000000000 -0400
@@ -855,6 +895,51 @@
  allow clamscan_t clamd_var_lib_t:dir r_dir_perms;
  
  kernel_read_kernel_sysctls(clamscan_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.3.3/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/cron.if	2006-07-31 17:09:13.000000000 -0400
+@@ -181,6 +181,7 @@
+ 	allow $1_crontab_t $2:fd use;
+ 	allow $1_crontab_t $2:fifo_file rw_file_perms;
+ 	allow $1_crontab_t $2:process sigchld;
++	allow $2 $1_crontab_t:process sigchld;
+ 
+ 	# crontab shows up in user ps
+ 	allow $2 $1_crontab_t:dir { search getattr read };
+@@ -194,14 +195,19 @@
+ 	# Allow crond to read those crontabs in cron spool.
+ 	allow crond_t $1_cron_spool_t:file create_file_perms;
+ 
++	allow $1_crontab_t tmp_t:dir rw_dir_perms;
++	allow $1_crontab_t $1_tmp_t:file create_file_perms;
++	type_transition $1_crontab_t tmp_t:file $1_tmp_t;
++
+ 	# dac_override is to create the file in the directory under /tmp
+-	allow $1_crontab_t self:capability { setuid setgid chown dac_override };
++	allow $1_crontab_t self:capability { fowner setuid setgid chown dac_override };
+ 	allow $1_crontab_t self:process signal_perms;
+ 
+ 	# create files in /var/spool/cron
+-	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
++	files_search_spool($1_crontab_t)
+ 	allow $1_crontab_t cron_spool_t:dir rw_dir_perms;
+-	type_transition $1_crontab_t $1_cron_spool_t:file $1_cron_spool_t;
++	allow $1_crontab_t $1_cron_spool_t:file create_file_perms;
++	type_transition $1_crontab_t cron_spool_t:file $1_cron_spool_t;
+ 
+ 	# crontab signals crond by updating the mtime on the spooldir
+ 	allow $1_crontab_t cron_spool_t:dir setattr;
+@@ -239,6 +245,10 @@
+ 	# Read user crontabs
+ 	userdom_read_user_home_content_files($1,$1_crontab_t)
+ 
++	optional_policy(`
++		nscd_socket_use($1_crontab_t)
++	')
++
+ 	tunable_policy(`fcron_crond', `
+ 		# fcron wants an instant update of a crontab change for the administrator
+ 		# also crontab does a security check for crontab -u
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.3.3/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/cups.te	2006-07-19 16:27:33.000000000 -0400
@@ -1321,7 +1406,7 @@
  hostname_exec(pegasus_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.3.3/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-07-17 12:13:57.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/postfix.te	2006-07-31 09:41:05.000000000 -0400
 @@ -160,7 +160,7 @@
  
  init_use_script_ptys(postfix_master_t)
@@ -1331,7 +1416,39 @@
  
  seutil_sigchld_newrole(postfix_master_t)
  # postfix does a "find" on startup for some reason - keep it quiet
-@@ -593,3 +593,7 @@
+@@ -250,6 +250,7 @@
+ allow postfix_cleanup_t postfix_spool_t:lnk_file create_lnk_perms;
+ 
+ allow postfix_cleanup_t postfix_spool_bounce_t:dir r_dir_perms;
++corecmd_exec_bin(postfix_cleanup_t)
+ 
+ ########################################
+ #
+@@ -293,6 +294,10 @@
+ 	procmail_domtrans(postfix_local_t)
+ ')
+ 
++optional_policy(`
++	clamav_search_lib(postfix_local_t)
++')
++
+ ########################################
+ #
+ # Postfix map local policy
+@@ -519,6 +524,7 @@
+ allow postfix_qmgr_t postfix_spool_bounce_t:dir { getattr read search };
+ allow postfix_qmgr_t postfix_spool_bounce_t:file { read getattr };
+ allow postfix_qmgr_t postfix_spool_bounce_t:lnk_file { getattr read };
++corecmd_exec_bin(postfix_qmgr_t)
+ 
+ ########################################
+ #
+@@ -589,7 +595,12 @@
+ # for OpenSSL certificates
+ files_read_usr_files(postfix_smtpd_t)
+ mta_read_aliases(postfix_smtpd_t)
++corecmd_exec_bin(postfix_smtpd_t)
+ 
  optional_policy(`
  	sasl_connect(postfix_smtpd_t)
  ')
@@ -1477,7 +1594,7 @@
  allow remote_login_t remote_login_tmp_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.3.3/policy/modules/services/samba.te
 --- nsaserefpolicy/policy/modules/services/samba.te	2006-07-14 17:04:41.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-07-17 12:16:42.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/samba.te	2006-07-31 10:38:02.000000000 -0400
 @@ -186,11 +186,12 @@
  allow smbd_t self:udp_socket create_socket_perms;
  allow smbd_t self:unix_dgram_socket { create_socket_perms sendto };
@@ -1488,7 +1605,7 @@
  allow smbd_t samba_etc_t:file { rw_file_perms setattr };
  
 -allow smbd_t samba_log_t:dir ra_dir_perms;
-+allow smbd_t samba_log_t:dir { ra_dir_perms setattr };
++allow smbd_t samba_log_t:dir { create ra_dir_perms setattr };
  dontaudit smbd_t samba_log_t:dir remove_name;
  allow smbd_t samba_log_t:file { create ra_file_perms };
  
@@ -1505,7 +1622,7 @@
  allow nmbd_t samba_etc_t:file { getattr read };
  
 -allow nmbd_t samba_log_t:dir ra_dir_perms;
-+allow nmbd_t samba_log_t:dir { ra_dir_perms setattr };
++allow nmbd_t samba_log_t:dir { create ra_dir_perms setattr };
  allow nmbd_t samba_log_t:file { create ra_file_perms };
  
  allow nmbd_t samba_var_t:dir rw_dir_perms;
@@ -1702,6 +1819,17 @@
 +	rpm_read_db(setroubleshoot_t)
 +	rpm_dontaudit_manage_db(setroubleshoot_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.3.3/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-07-14 17:04:41.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/services/spamassassin.te	2006-07-31 09:36:35.000000000 -0400
+@@ -194,3 +194,7 @@
+ optional_policy(`
+ 	udev_read_db(spamd_t)
+ ')
++
++optional_policy(`
++	postfix_read_config(spamd_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.3.3/policy/modules/services/squid.te
 --- nsaserefpolicy/policy/modules/services/squid.te	2006-07-14 17:04:41.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/services/squid.te	2006-07-28 09:12:30.000000000 -0400
@@ -1971,16 +2099,19 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.3.3/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-07-17 11:43:02.000000000 -0400
-@@ -198,7 +198,7 @@
++++ serefpolicy-2.3.3/policy/modules/system/libraries.fc	2006-07-30 18:14:44.000000000 -0400
+@@ -198,9 +198,9 @@
  # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame
  /usr/lib(64)?.*/libmpg123\.so		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libpostproc\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 -/usr/lib(64)?/libavformat-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
 +/usr/lib(64)?/libavformat.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libavcodec-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+-/usr/lib(64)?/libavutil-.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/libavutil.*\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?/libxvidcore\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/xine/plugins/.*\.so	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libgsm\.so.*		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.3.3/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/locallogin.te	2006-07-17 11:43:02.000000000 -0400
@@ -1992,6 +2123,16 @@
  
  allow local_login_t local_login_lock_t:file create_file_perms;
  files_lock_filetrans(local_login_t,local_login_lock_t,file)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.3.3/policy/modules/system/logging.fc
+--- nsaserefpolicy/policy/modules/system/logging.fc	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/logging.fc	2006-07-31 14:51:30.000000000 -0400
+@@ -38,3 +38,6 @@
+ /var/spool/postfix/pid	-d	gen_context(system_u:object_r:var_run_t,s0)
+ 
+ /var/tinydns/log/main(/.*)?	gen_context(system_u:object_r:var_log_t,s0)
++
++/var/run/auditd\.pid	--	gen_context(system_u:object_r:auditd_var_run_t,s0)
++/var/run/auditd_sock	-s	gen_context(system_u:object_r:auditd_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.3.3/policy/modules/system/logging.if
 --- nsaserefpolicy/policy/modules/system/logging.if	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/logging.if	2006-07-26 13:00:20.000000000 -0400
@@ -2031,8 +2172,20 @@
  #######################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.3.3/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-17 11:43:02.000000000 -0400
-@@ -140,7 +140,7 @@
++++ serefpolicy-2.3.3/policy/modules/system/logging.te	2006-07-31 14:50:13.000000000 -0400
+@@ -120,9 +120,10 @@
+ allow auditd_t auditd_log_t:lnk_file create_lnk_perms;
+ allow auditd_t var_log_t:dir search;
+ 
++allow auditd_t auditd_var_run_t:sock_file create_file_perms;
+ allow auditd_t auditd_var_run_t:file create_file_perms;
+ allow auditd_t auditd_var_run_t:dir rw_dir_perms;
+-files_pid_filetrans(auditd_t,auditd_var_run_t,file)
++files_pid_filetrans(auditd_t,auditd_var_run_t,{ file sock_file })
+ 
+ kernel_read_kernel_sysctls(auditd_t)
+ # Needs to be able to run dispatcher.  see /etc/audit/auditd.conf
+@@ -140,7 +141,7 @@
  # Probably want a transition, and a new auditd_helper app
  corecmd_exec_sbin(auditd_t)
  corecmd_exec_bin(auditd_t)
@@ -2041,7 +2194,7 @@
  
  domain_use_interactive_fds(auditd_t)
  
-@@ -176,6 +176,10 @@
+@@ -176,6 +177,10 @@
  ')
  
  optional_policy(`
@@ -2072,6 +2225,18 @@
  fs_read_tmpfs_symlinks(lvm_t)
  fs_dontaudit_read_removable_files(lvm_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.3.3/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-07-14 17:04:44.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/mount.te	2006-07-31 09:50:35.000000000 -0400
+@@ -97,6 +97,8 @@
+ 
+ sysnet_use_portmap(mount_t)
+ 
++selinux_get_enforce_mode(mount_t)
++
+ userdom_use_all_users_fds(mount_t)
+ 
+ ifdef(`distro_redhat',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.3.3/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-07-14 17:04:44.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/selinuxutil.te	2006-07-26 15:14:33.000000000 -0400
@@ -2219,7 +2384,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.3.3/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-20 14:48:42.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.if	2006-07-31 07:15:29.000000000 -0400
 @@ -20,6 +20,7 @@
  	# Use any Linux capability.
  	allow $1 self:capability *;
@@ -2244,7 +2409,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.3.3/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-07-14 17:04:44.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-17 11:43:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/unconfined.te	2006-07-31 07:16:25.000000000 -0400
 @@ -56,10 +56,6 @@
  	')
  
@@ -2267,6 +2432,16 @@
  		dmidecode_domtrans(unconfined_t)
  	')
  
+@@ -195,4 +195,9 @@
+ ifdef(`targeted_policy',`
+ 	allow unconfined_execmem_t self:process { execstack execmem };
+ 	unconfined_domain_noaudit(unconfined_execmem_t)
++	optional_policy(`
++		init_dbus_chat_script(unconfined_execmem_t)
++		dbus_stub(unconfined_execmem_t)
++		unconfined_dbus_chat(unconfined_execmem_t)
++	')
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.3.3/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/userdomain.if	2006-07-18 09:32:58.000000000 -0400
@@ -2645,7 +2820,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.3.3/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-07-14 17:04:43.000000000 -0400
-+++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-20 16:21:02.000000000 -0400
++++ serefpolicy-2.3.3/policy/modules/system/userdomain.te	2006-07-31 17:24:25.000000000 -0400
 @@ -56,14 +56,6 @@
  # Local policy
  #
@@ -2737,6 +2912,23 @@
  	', `
  		logging_manage_audit_log(sysadm_t)
  		logging_manage_audit_config(sysadm_t)
+@@ -443,11 +439,11 @@
+ 			selinux_set_parameters(secadm_t)
+ 
+ 			seutil_manage_bin_policy(secadm_t)
+-			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_semanage(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
+-			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
++			seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
++			seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t secadm_devpts_t })
+ 		', `
+ 			selinux_set_enforce_mode(sysadm_t)
+ 			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.if serefpolicy-2.3.3/policy/modules/system/xen.if
 --- nsaserefpolicy/policy/modules/system/xen.if	2006-07-14 17:04:43.000000000 -0400
 +++ serefpolicy-2.3.3/policy/modules/system/xen.if	2006-07-28 13:26:47.000000000 -0400


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- selinux-policy.spec	29 Jul 2006 08:32:43 -0000	1.239
+++ selinux-policy.spec	31 Jul 2006 21:25:08 -0000	1.240
@@ -16,7 +16,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.3.3
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -348,6 +348,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-16
+- Fixes for Samba
+
 * Sat Jul 29 2006 Dan Walsh <dwalsh at redhat.com> 2.3.3-15
 - Fixes for xen
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 21:31:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 17:31:35 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2483,
	1.2484 linux-2.6-compile-fixes.patch, 1.96, 1.97
Message-ID: <200607312131.k6VLVZLW026205@cvs.devel.redhat.com>

Author: dzickus

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26137

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
some RAID ia64 compile fixes




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2483
retrieving revision 1.2484
diff -u -r1.2483 -r1.2484
--- kernel-2.6.spec	31 Jul 2006 20:55:10 -0000	1.2483
+++ kernel-2.6.spec	31 Jul 2006 21:31:30 -0000	1.2484
@@ -1662,6 +1662,9 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Don Zickus <dzickus at redhat.com>
+- IA64 compile fixes
+
 * Mon Jul 31 2006 Juan Quintela <quintela at redhat.com>
 - Update xen patch to linux-2.6-xen-fedora cset 34801.
 	* linux-2.6 cset 33175

linux-2.6-compile-fixes.patch:
 arch/ia64/kernel/ia64_ksyms.c                     |    2 +-
 arch/ia64/lib/Makefile                            |    2 +-
 linux-2.6.17.noarch/Makefile                      |    4 ----
 linux-2.6.17.noarch/arch/ia64/kernel/ia64_ksyms.c |    1 +
 4 files changed, 3 insertions(+), 6 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.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- linux-2.6-compile-fixes.patch	27 Jul 2006 17:48:23 -0000	1.96
+++ linux-2.6-compile-fixes.patch	31 Jul 2006 21:31:31 -0000	1.97
@@ -22,3 +22,45 @@
  
  #define __KERNEL_SYSCALLS__
  #include <asm/unistd.h>
+Date: Mon, 31 Jul 2006 09:17:01 -0400
+From: Prarit Bhargava <prarit at redhat.com>
+Subject: [RHEL5/Fedora]: BZ 196903 Fix ia64 compile
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the 
+same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at hp.com>
+
+
+
+CONFIG_MD_RAID5 became CONFIG_MD_RAID456 in drivers/md/Kconfig.  Make the same
+change in arch/ia64
+
+Signed-off-by: Prarit Bhargava <prarit at redhat.com>
+Signed-off-by: Aron Griffis <aron at hp.com>
+
+--- linux-2.6.17.ia64.orig/arch/ia64/kernel/ia64_ksyms.c	2006-07-27 15:21:47.000000000 -0400
++++ linux-2.6.17.ia64/arch/ia64/kernel/ia64_ksyms.c	2006-07-31 09:02:06.000000000 -0400
+@@ -68,7 +68,7 @@ EXPORT_SYMBOL(__udivdi3);
+ EXPORT_SYMBOL(__moddi3);
+ EXPORT_SYMBOL(__umoddi3);
+ 
+-#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
++#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
+ extern void xor_ia64_2(void);
+ extern void xor_ia64_3(void);
+ extern void xor_ia64_4(void);
+--- linux-2.6.17.ia64.orig/arch/ia64/lib/Makefile	2006-07-27 09:20:01.000000000 -0400
++++ linux-2.6.17.ia64/arch/ia64/lib/Makefile	2006-07-31 09:02:41.000000000 -0400
+@@ -14,7 +14,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3
+ lib-$(CONFIG_ITANIUM)	+= copy_page.o copy_user.o memcpy.o
+ lib-$(CONFIG_MCKINLEY)	+= copy_page_mck.o memcpy_mck.o
+ lib-$(CONFIG_PERFMON)	+= carta_random.o
+-lib-$(CONFIG_MD_RAID5)	+= xor.o
++lib-$(CONFIG_MD_RAID456)	+= xor.o
+ 
+ AFLAGS___divdi3.o	=
+ AFLAGS___udivdi3.o	= -DUNSIGNED
+



From fedora-cvs-commits at redhat.com  Mon Jul 31 21:39:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 17:39:40 -0400
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.15,1.16
Message-ID: <200607312139.k6VLdeiv027705@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27683

Modified Files:
	gecko-sharp2.spec 
Log Message:
rebuild for firefox-devel


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gecko-sharp2.spec	12 Jul 2006 05:54:14 -0000	1.15
+++ gecko-sharp2.spec	31 Jul 2006 21:39:37 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        8.1
+Release:        9
 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 gtk2-devel mono-devel gtk-sharp2-gapi
+BuildRequires:  gtk-sharp2 firefox-devel gtk2-devel mono-devel gtk-sharp2-gapi
 Requires:       mozilla 
 
 # Mono only availible on these: (s390(x) disabled for now)
@@ -48,7 +48,10 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - sh: line 0: fg: no job control
+* Mon Jul 31 2006 Jesse Keating <jkeating at redhat.com> - 0.11-9
+- build against firefox-devel
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0.11-8.1
 - rebuild
 
 * Sat Jun 24 2006 Jesse Keating <jkeating at redhat.com> 0.11-8



From fedora-cvs-commits at redhat.com  Mon Jul 31 21:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 17:49:13 -0400
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.51,1.52
Message-ID: <200607312149.k6VLnDqj013299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13259

Modified Files:
	gnome-python-extras.spec 
Log Message:
rebuild for firefox-devel


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-python-extras.spec	31 Jul 2006 15:53:13 -0000	1.51
+++ gnome-python-extras.spec	31 Jul 2006 21:49:10 -0000	1.52
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.14.1
-Release: 3
+Release: 5
 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
@@ -128,6 +128,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Mon Jul 31 2006 Jesse Keating <jkeating at redhat.com> - 2.14.1-5
+- again
+
 * Mon Jul 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-3
 - Rebuild against firefox
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 22:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 18:12:22 -0400
Subject: rpms/kernel/devel
	linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch,
	1.1, 1.2
Message-ID: <200607312212.k6VMCM0M019381@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19331

Modified Files:
	linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch 
Log Message:
kernel-2.6.spec

linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch:
 arch/powerpc/platforms/cell/spufs/inode.c      |    2 -
 arch/s390/hypfs/inode.c                        |    6 ++--
 arch/s390/kernel/debug.c                       |    2 -
 block/blktrace.c                               |    2 -
 drivers/i2c/chips/tps65010.c                   |    2 -
 drivers/infiniband/hw/ipath/ipath_fs.c         |   12 ++++----
 drivers/infiniband/ulp/ipoib/ipoib_fs.c        |    4 +-
 drivers/misc/ibmasm/ibmasmfs.c                 |   16 +++++------
 drivers/net/irda/vlsi_ir.h                     |    2 -
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    2 -
 drivers/oprofile/oprofilefs.c                  |   10 +++----
 drivers/pci/hotplug/cpqphp_sysfs.c             |    2 -
 drivers/usb/core/devio.c                       |    2 -
 drivers/usb/core/inode.c                       |    6 ++--
 drivers/usb/gadget/inode.c                     |    6 ++--
 drivers/usb/host/isp116x-hcd.c                 |    2 -
 drivers/usb/host/uhci-debug.c                  |    2 -
 drivers/usb/mon/mon_stat.c                     |    2 -
 drivers/usb/mon/mon_text.c                     |    4 +-
 fs/autofs/inode.c                              |    2 -
 fs/autofs/symlink.c                            |    2 -
 fs/binfmt_misc.c                               |    8 ++---
 fs/debugfs/file.c                              |    4 +-
 fs/debugfs/inode.c                             |    4 +-
 fs/devpts/inode.c                              |    4 +-
 fs/dlm/debug_fs.c                              |    4 +-
 fs/freevxfs/vxfs.h                             |    2 -
 fs/freevxfs/vxfs_inode.c                       |    4 +-
 fs/fuse/control.c                              |    6 ++--
 fs/gfs2/inode.c                                |    2 -
 fs/gfs2/meta_io.c                              |    2 -
 fs/gfs2/ops_super.c                            |    6 ++--
 fs/inode.c                                     |    2 -
 fs/jffs/inode-v23.c                            |   34 ++++++++++++-------------
 fs/libfs.c                                     |    2 -
 fs/ocfs2/dlmglue.c                             |    2 -
 include/linux/fs.h                             |    4 --
 kernel/relay.c                                 |    2 -
 security/inode.c                               |    8 ++---
 39 files changed, 94 insertions(+), 96 deletions(-)

Index: linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch	12 Jul 2006 20:34:20 -0000	1.1
+++ linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch	31 Jul 2006 22:12:20 -0000	1.2
@@ -617,6 +617,14 @@
  
  	return 0;
  }
+@@ -301,6 +301,6 @@ static struct file_operations rsb_fops =
+ 
+ static int waiters_open(struct inode *inode, struct file *file)
+ {
+-	file->private_data = inode->u.generic_ip;
++	file->private_data = inode->i_private;
+ 	return 0;
+ }
 diff -puN fs/freevxfs/vxfs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private fs/freevxfs/vxfs.h
 --- a/fs/freevxfs/vxfs.h~inode_diet-replace-inodeugeneric_ip-with-inodei_private
 +++ a/fs/freevxfs/vxfs.h



From fedora-cvs-commits at redhat.com  Mon Jul 31 22:18:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 18:18:07 -0400
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.15,1.16
Message-ID: <200607312218.k6VMI7B5003822@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3791

Modified Files:
	libart_lgpl.spec 
Log Message:
- Fix typo in header name


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libart_lgpl.spec	27 Jul 2006 22:09:32 -0000	1.15
+++ libart_lgpl.spec	31 Jul 2006 22:18:05 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 3
+Release: 4
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: libart-multilib.patch
@@ -48,7 +48,7 @@
 %endif
 
 mv $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h \
-   $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h-%{wordsize}.h
+   $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config-%{wordsize}.h
 
 cat >$RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h <<EOF
 #ifndef LIBART_MULTILIB
@@ -90,6 +90,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Jul 31 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-4
+- Fix typo in header name
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.17-3
 - Fix multilib conflicts
 - Don't ship static libraries



From fedora-cvs-commits at redhat.com  Mon Jul 31 22:30:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 18:30:38 -0400
Subject: rpms/kernel/devel/configs config-xen-ia64,1.1,1.2
Message-ID: <200607312230.k6VMUchw016480@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv16467/configs

Modified Files:
	config-xen-ia64 
Log Message:
blktap b0rked on ia64-xen


Index: config-xen-ia64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-ia64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-ia64	22 Jul 2006 14:52:53 -0000	1.1
+++ config-xen-ia64	31 Jul 2006 22:30:35 -0000	1.2
@@ -18,3 +18,7 @@
 
 # internal #defines conflict with xen-ia64
 # CONFIG_FB_NEOMAGIC is not set
+
+# don't compile
+#  error: implicit declaration of function 'create_lookup_pte_addr'
+# CONFIG_XEN_BLKDEV_TAP is not set



From fedora-cvs-commits at redhat.com  Mon Jul 31 22:33:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 18:33:52 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2484,1.2485
Message-ID: <200607312233.k6VMXqGb016514@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16501

Modified Files:
	kernel-2.6.spec 
Log Message:
- disable blktap for xen-ia64 (don't compile).
- enable ia64-xen (it compiles, but still don't boot).



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2484
retrieving revision 1.2485
diff -u -r1.2484 -r1.2485
--- kernel-2.6.spec	31 Jul 2006 21:31:30 -0000	1.2484
+++ kernel-2.6.spec	31 Jul 2006 22:33:49 -0000	1.2485
@@ -65,8 +65,7 @@
 %endif
 
 # Xen only builds on i686, x86_64 and ia64 ...
-#%ifnarch i686 x86_64 ia64
-%ifnarch i686 x86_64
+%ifnarch i686 x86_64 ia64
 %define buildxen 0
 %endif
 
@@ -811,11 +810,9 @@
 #%patch951 -p1
 %patch950 -p1 -b .p.xen
 #
-# ... and back out all the ia64-specific sections, as they currently prevent
-# non-xen builds from working.
-# Now also with tpm
+# ... and back out all the tpm additions, they need fixing
 #
-for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \
     g=`dirname $f`/`basename $f .p.xen`; \
     mv "$f" "$g"; \
     if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
@@ -1662,6 +1659,13 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
+- disable blktap for xen-ia64 (don't compile).
+- enable ia64-xen (it compiles, but still don't boot).
+
+* Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
+- Fix dlm s/u.generic_ip/i_private/.
+
 * Mon Jul 31 2006 Don Zickus <dzickus at redhat.com>
 - IA64 compile fixes
 



From fedora-cvs-commits at redhat.com  Mon Jul 31 23:30:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 19:30:27 -0400
Subject: rpms/kernel/devel kernel-2.6.spec, 1.2485,
	1.2486 linux-2.6-utrace.patch, 1.10, 1.11
Message-ID: <200607312330.k6VNUR2M007661@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7570

Modified Files:
	kernel-2.6.spec linux-2.6-utrace.patch 
Log Message:
* Mon Jul 31 2006 Roland McGrath <roland at redhat.com>
- New utrace patch:
  - fix ptrace_do_wait deadlock (#200822, #200605)
  - arch cleanups




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2485
retrieving revision 1.2486
diff -u -r1.2485 -r1.2486
--- kernel-2.6.spec	31 Jul 2006 22:33:49 -0000	1.2485
+++ kernel-2.6.spec	31 Jul 2006 23:30:24 -0000	1.2486
@@ -1659,6 +1659,11 @@
 %endif
 
 %changelog
+* Mon Jul 31 2006 Roland McGrath <roland at redhat.com>
+- New utrace patch:
+  - fix ptrace_do_wait deadlock (#200822, #200605)
+  - arch cleanups
+
 * Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
 - disable blktap for xen-ia64 (don't compile).
 - enable ia64-xen (it compiles, but still don't boot).
@@ -1679,7 +1684,7 @@
 - Numerous GFS2/DLM fixes.
 
 * Mon Jul 31 2006 Jeremy Katz <katzj at redhat.com>
-- new ahci suspend patch 
+- new ahci suspend patch
 
 * Mon Jul 31 2006 Dave Jones <davej at redhat.com>
 - VFS: Destroy the dentries contributed by a superblock on unmounting [try #2]

linux-2.6-utrace.patch:
 Documentation/utrace.txt                |  455 +++++++++
 arch/alpha/kernel/asm-offsets.c         |    2 
 arch/alpha/kernel/entry.S               |    4 
 arch/arm/kernel/ptrace.c                |   36 
 arch/arm26/kernel/ptrace.c              |   32 
 arch/frv/kernel/ptrace.c                |   15 
 arch/i386/kernel/entry.S                |    7 
 arch/i386/kernel/i387.c                 |  143 +-
 arch/i386/kernel/process.c              |    3 
 arch/i386/kernel/ptrace.c               |  839 +++++++++--------
 arch/i386/kernel/signal.c               |   39 
 arch/i386/kernel/vm86.c                 |    7 
 arch/ia64/ia32/sys_ia32.c               |    2 
 arch/ia64/kernel/asm-offsets.c          |    2 
 arch/ia64/kernel/fsys.S                 |   16 
 arch/ia64/kernel/mca.c                  |    2 
 arch/ia64/kernel/ptrace.c               |   41 
 arch/mips/kernel/ptrace.c               |   21 
 arch/mips/kernel/sysirix.c              |    2 
 arch/powerpc/kernel/Makefile            |    4 
 arch/powerpc/kernel/asm-offsets.c       |    2 
 arch/powerpc/kernel/process.c           |    5 
 arch/powerpc/kernel/ptrace-common.h     |  161 ---
 arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
 arch/powerpc/kernel/ptrace32.c          |  436 --------
 arch/powerpc/kernel/signal_32.c         |   56 +
 arch/powerpc/kernel/signal_64.c         |    4 
 arch/powerpc/kernel/sys_ppc32.c         |    5 
 arch/powerpc/lib/sstep.c                |    3 
 arch/powerpc/platforms/cell/spufs/run.c |    2 
 arch/ppc/kernel/asm-offsets.c           |    2 
 arch/s390/kernel/compat_linux.c         |    3 
 arch/s390/kernel/compat_signal.c        |    5 
 arch/s390/kernel/process.c              |    3 
 arch/s390/kernel/ptrace.c               |  551 ++++++++++-
 arch/s390/kernel/signal.c               |    4 
 arch/s390/kernel/traps.c                |    6 
 arch/sparc64/kernel/entry.S             |    6 
 arch/sparc64/kernel/process.c           |    3 
 arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
 arch/sparc64/kernel/signal.c            |    2 
 arch/sparc64/kernel/signal32.c          |    2 
 arch/sparc64/kernel/sys_sparc32.c       |    3 
 arch/sparc64/kernel/systbls.S           |    4 
 arch/x86_64/ia32/fpu32.c                |   92 +
 arch/x86_64/ia32/ia32_aout.c            |    6 
 arch/x86_64/ia32/ia32_signal.c          |    8 
 arch/x86_64/ia32/ia32entry.S            |    2 
 arch/x86_64/ia32/ptrace32.c             |  688 +++++++++-----
 arch/x86_64/ia32/sys_ia32.c             |    5 
 arch/x86_64/kernel/process.c            |    5 
 arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
 arch/x86_64/kernel/signal.c             |   30 
 arch/x86_64/kernel/traps.c              |    8 
 arch/x86_64/mm/fault.c                  |    4 
 drivers/connector/cn_proc.c             |    4 
 fs/binfmt_aout.c                        |    6 
 fs/binfmt_elf.c                         |    6 
 fs/binfmt_elf_fdpic.c                   |    7 
 fs/binfmt_flat.c                        |    3 
 fs/binfmt_som.c                         |    2 
 fs/exec.c                               |   11 
 fs/proc/array.c                         |    7 
 fs/proc/base.c                          |   17 
 include/asm-i386/i387.h                 |   13 
 include/asm-i386/signal.h               |    4 
 include/asm-i386/thread_info.h          |    7 
 include/asm-i386/tracehook.h            |   74 +
 include/asm-powerpc/tracehook.h         |  303 ++++++
 include/asm-s390/tracehook.h            |  105 ++
 include/asm-sparc64/tracehook.h         |   44 
 include/asm-x86_64/fpu32.h              |    3 
 include/asm-x86_64/thread_info.h        |    2 
 include/asm-x86_64/tracehook.h          |  106 ++
 include/linux/init_task.h               |    3 
 include/linux/ptrace.h                  |   86 -
 include/linux/sched.h                   |   25 
 include/linux/tracehook.h               |  641 +++++++++++++
 include/linux/utrace.h                  |  471 +++++++++
 init/Kconfig                            |   29 
 kernel/Makefile                         |    1 
 kernel/exit.c                           |  259 +----
 kernel/fork.c                           |   60 -
 kernel/ptrace.c                         | 1562 +++++++++++++++++++++++++-------
 kernel/signal.c                         |  211 ----
 kernel/sys.c                            |    2 
 kernel/timer.c                          |    6 
 kernel/utrace.c                         | 1520 +++++++++++++++++++++++++++++++
 security/selinux/hooks.c                |    6 
 89 files changed, 8167 insertions(+), 3281 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 linux-2.6-utrace.patch
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-utrace.patch	27 Jul 2006 22:31:59 -0000	1.10
+++ linux-2.6-utrace.patch	31 Jul 2006 23:30:24 -0000	1.11
@@ -1,13 +1,13 @@
- Documentation/utrace.txt                |  451 +++++++++
+ Documentation/utrace.txt                |  455 +++++++++
  arch/alpha/kernel/asm-offsets.c         |    2 
  arch/alpha/kernel/entry.S               |    4 
  arch/arm/kernel/ptrace.c                |   36 -
  arch/arm26/kernel/ptrace.c              |   32 -
  arch/frv/kernel/ptrace.c                |   15 
  arch/i386/kernel/entry.S                |    7 
- arch/i386/kernel/i387.c                 |  143 ++-
+ arch/i386/kernel/i387.c                 |  143 +--
  arch/i386/kernel/process.c              |    3 
- arch/i386/kernel/ptrace.c               |  862 +++++++++--------
+ arch/i386/kernel/ptrace.c               |  839 +++++++++--------
  arch/i386/kernel/signal.c               |   39 -
  arch/i386/kernel/vm86.c                 |    7 
  arch/ia64/ia32/sys_ia32.c               |    2 
@@ -21,7 +21,7 @@
  arch/powerpc/kernel/asm-offsets.c       |    2 
  arch/powerpc/kernel/process.c           |    5 
  arch/powerpc/kernel/ptrace-common.h     |  161 ---
- arch/powerpc/kernel/ptrace.c            |  842 +++++++++--------
+ arch/powerpc/kernel/ptrace.c            |  785 +++++++---------
  arch/powerpc/kernel/ptrace32.c          |  436 ---------
  arch/powerpc/kernel/signal_32.c         |   56 +
  arch/powerpc/kernel/signal_64.c         |    4 
@@ -32,18 +32,24 @@
  arch/s390/kernel/compat_linux.c         |    3 
  arch/s390/kernel/compat_signal.c        |    5 
  arch/s390/kernel/process.c              |    3 
- arch/s390/kernel/ptrace.c               |  690 +++++++++++++-
+ arch/s390/kernel/ptrace.c               |  551 ++++++++++-
  arch/s390/kernel/signal.c               |    4 
  arch/s390/kernel/traps.c                |    6 
- arch/sparc64/kernel/ptrace.c            |   18 
+ arch/sparc64/kernel/entry.S             |    6 
+ arch/sparc64/kernel/process.c           |    3 
+ arch/sparc64/kernel/ptrace.c            |  650 +++++++++++--
+ arch/sparc64/kernel/signal.c            |    2 
+ arch/sparc64/kernel/signal32.c          |    2 
+ arch/sparc64/kernel/sys_sparc32.c       |    3 
+ arch/sparc64/kernel/systbls.S           |    4 
  arch/x86_64/ia32/fpu32.c                |   92 +-
  arch/x86_64/ia32/ia32_aout.c            |    6 
  arch/x86_64/ia32/ia32_signal.c          |    8 
  arch/x86_64/ia32/ia32entry.S            |    2 
- arch/x86_64/ia32/ptrace32.c             |  699 +++++++++-----
+ arch/x86_64/ia32/ptrace32.c             |  690 +++++++++-----
  arch/x86_64/ia32/sys_ia32.c             |    5 
  arch/x86_64/kernel/process.c            |    5 
- arch/x86_64/kernel/ptrace.c             |  632 ++++++++-----
+ arch/x86_64/kernel/ptrace.c             |  619 +++++++-----
  arch/x86_64/kernel/signal.c             |   30 -
  arch/x86_64/kernel/traps.c              |    8 
  arch/x86_64/mm/fault.c                  |    4 
@@ -59,34 +65,36 @@
  include/asm-i386/i387.h                 |   13 
  include/asm-i386/signal.h               |    4 
  include/asm-i386/thread_info.h          |    7 
- include/asm-i386/tracehook.h            |   73 +
- include/asm-powerpc/tracehook.h         |  302 ++++++
- include/asm-s390/tracehook.h            |  103 ++
+ include/asm-i386/tracehook.h            |   74 +
+ include/asm-powerpc/tracehook.h         |  303 ++++++
+ include/asm-s390/tracehook.h            |  105 ++
+ include/asm-sparc64/tracehook.h         |   44 +
  include/asm-x86_64/fpu32.h              |    3 
  include/asm-x86_64/thread_info.h        |    2 
- include/asm-x86_64/tracehook.h          |  105 ++
+ include/asm-x86_64/tracehook.h          |  106 ++
  include/linux/init_task.h               |    3 
  include/linux/ptrace.h                  |   86 +-
- include/linux/sched.h                   |   25 -
- include/linux/tracehook.h               |  566 +++++++++++
- include/linux/utrace.h                  |  471 ++++++++++
+ include/linux/sched.h                   |   25 
+ include/linux/tracehook.h               |  641 +++++++++++++
+ include/linux/utrace.h                  |  471 +++++++++
  init/Kconfig                            |   29 +
  kernel/Makefile                         |    1 
- kernel/exit.c                           |  251 +----
+ kernel/exit.c                           |  259 +----
  kernel/fork.c                           |   60 -
- kernel/ptrace.c                         | 1531 ++++++++++++++++++++++++-------
+ kernel/ptrace.c                         | 1562 ++++++++++++++++++++++++-------
  kernel/signal.c                         |  211 +---
  kernel/sys.c                            |    2 
  kernel/timer.c                          |    6 
- kernel/utrace.c                         | 1501 ++++++++++++++++++++++++++++++
+ kernel/utrace.c                         | 1520 ++++++++++++++++++++++++++++++
  security/selinux/hooks.c                |    6 
- 82 files changed, 7666 insertions(+), 3187 deletions(-)
+ 89 files changed, 8168 insertions(+), 3282 deletions(-)
  create mode 100644 Documentation/utrace.txt
  delete arch/powerpc/kernel/ptrace-common.h
  delete arch/powerpc/kernel/ptrace32.c
  create mode 100644 include/asm-i386/tracehook.h
  create mode 100644 include/asm-powerpc/tracehook.h
  create mode 100644 include/asm-s390/tracehook.h
+ create mode 100644 include/asm-sparc64/tracehook.h
  create mode 100644 include/asm-x86_64/tracehook.h
  create mode 100644 include/linux/tracehook.h
  create mode 100644 include/linux/utrace.h
@@ -94,7 +102,7 @@
 
 --- linux-2.6/include/asm-powerpc/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-powerpc/tracehook.h
-@@ -0,0 +1,302 @@
+@@ -0,0 +1,303 @@
 +/*
 + * Tracing hooks, PowerPC CPU support
 + */
@@ -109,6 +117,7 @@
 + * See linux/tracehook.h for the descriptions of what these need to do.
 + */
 +
++#define ARCH_HAS_SINGLE_STEP	(1)
 +
 +static inline void tracehook_enable_single_step(struct task_struct *task)
 +{
@@ -474,7 +483,7 @@
  
 --- linux-2.6/include/asm-i386/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-i386/tracehook.h
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,74 @@
 +/*
 + * Tracing hooks, i386 CPU support
 + */
@@ -489,6 +498,7 @@
 + * See linux/tracehook.h for the descriptions of what these need to do.
 + */
 +
++#define ARCH_HAS_SINGLE_STEP	(1)
 +
 +/* These two are defined in arch/i386/kernel/ptrace.c.  */
 +void tracehook_enable_single_step(struct task_struct *tsk);
@@ -550,7 +560,7 @@
 +#endif
 --- linux-2.6/include/asm-s390/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-s390/tracehook.h
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,105 @@
 +/*
 + * Tracing hooks, s390/s390x support.
 + */
@@ -565,6 +575,8 @@
 + * See linux/tracehook.h for the descriptions of what these need to do.
 + */
 +
++#define ARCH_HAS_SINGLE_STEP	(1)
++
 +/* These three are defined in arch/s390/kernel/ptrace.c.  */
 +void tracehook_enable_single_step(struct task_struct *tsk);
 +void tracehook_disable_single_step(struct task_struct *tsk);
@@ -684,7 +696,7 @@
  #define _TIF_WORK_MASK \
 --- linux-2.6/include/asm-x86_64/tracehook.h.utrace-ptrace-compat
 +++ linux-2.6/include/asm-x86_64/tracehook.h
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,106 @@
 +/*
 + * Tracing hooks, x86-64 CPU support
 + */
@@ -700,6 +712,7 @@
 + * See linux/tracehook.h for the descriptions of what these need to do.
 + */
 +
++#define ARCH_HAS_SINGLE_STEP	(1)
 +
 +/* These two are defined in arch/x86_64/kernel/ptrace.c.  */
 +void tracehook_enable_single_step(struct task_struct *tsk);
@@ -790,6 +803,53 @@
 +
 +
 +#endif
+--- linux-2.6/include/asm-sparc64/tracehook.h.utrace-ptrace-compat
++++ linux-2.6/include/asm-sparc64/tracehook.h
+@@ -0,0 +1,44 @@
++/*
++ * Tracing hooks, SPARC64 CPU support
++ */
++
++#ifndef _ASM_TRACEHOOK_H
++#define _ASM_TRACEHOOK_H	1
++
++
++#include <linux/sched.h>
++#include <asm/ptrace.h>
++
++/*
++ * See linux/tracehook.h for the descriptions of what these need to do.
[...3696 lines suppressed...]
++		if (ret == 0)
++			ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf,
++						   &fp, 0, -1);
  		if (ret)
  			return ret;
 -		if (copy_to_user(si, &ssi, sizeof(siginfo_t)))
-+		if (kbuf)
-+			memcpy(&u.buf[pos], kbuf, count);
-+		else if (__copy_from_user(&u.buf[pos], ubuf, count))
- 			return -EFAULT;
-+		kbuf = &u;
+-			return -EFAULT;
++		kbuf = &fp;
  	}
 -	ret = sys_ptrace(request, pid, addr, (unsigned long)si);
 -	if (ret)
@@ -12456,10 +13216,10 @@
 -	if (request == PTRACE_GETSIGINFO) {
 -		if (copy_from_user(&ssi, si, sizeof(siginfo_t)))
 +	else if (kbuf == NULL) {
-+		if (__copy_from_user(&u.fp, ubuf, sizeof u.fp))
++		if (__copy_from_user(&fp, ubuf, sizeof(fp)))
  			return -EFAULT;
 -		ret = copy_siginfo_to_user32(si32, &ssi);
-+		kbuf = &u;
++		kbuf = &fp;
  	}
 -	return ret;
 +
@@ -12470,14 +13230,39 @@
 +static int
 +ia32_fpxregs_active(struct task_struct *target,
 +		    const struct utrace_regset *regset)
++{
++	return tsk_used_math(target) ? regset->n : 0;
++}
++
++static int
++ia32_fpxregs_get(struct task_struct *target,
++		 const struct utrace_regset *regset,
++		 unsigned int pos, unsigned int count,
++		 void *kbuf, void __user *ubuf)
++{
++	if (tsk_used_math(target)) {
++		if (target == current)
++			unlazy_fpu(target);
++	}
++	else
++		init_fpu(target);
++
++	return utrace_regset_copyout(&pos, &count, &kbuf, &ubuf,
++				     &target->thread.i387.fxsave, 0, -1);
++}
++
++static int
++ia32_fpxregs_set(struct task_struct *target,
++		 const struct utrace_regset *regset,
++		 unsigned int pos, unsigned int count,
++		 const void *kbuf, const void __user *ubuf)
++
  {
 -	struct task_struct *child;
 -	struct pt_regs *childregs; 
 -	void __user *datap = compat_ptr(data);
--	int ret;
+ 	int ret;
 -	__u32 val;
-+	return tsk_used_math(target) ? regset->n : 0;
-+}
  
 -	switch (request) { 
 -	case PTRACE_TRACEME:
@@ -12489,23 +13274,20 @@
 -	case PTRACE_SYSCALL:
 -	case PTRACE_SETOPTIONS:
 -		return sys_ptrace(request, pid, addr, data); 
-+static int
-+ia32_fpxregs_get(struct task_struct *target,
-+		 const struct utrace_regset *regset,
-+		 unsigned int pos, unsigned int count,
-+		 void *kbuf, void __user *ubuf)
-+{
-+	void *tbuf = &target->thread.i387.fxsave;
- 
--	default:
--		return -EINVAL;
 +	if (tsk_used_math(target)) {
 +		if (target == current)
 +			unlazy_fpu(target);
 +	}
++	else if (pos == 0 && count == sizeof(struct i387_fxsave_struct))
++		set_stopped_child_used_math(target);
 +	else
 +		init_fpu(target);
  
+-	default:
+-		return -EINVAL;
++	ret = utrace_regset_copyin(&pos, &count, &kbuf, &ubuf,
++				   &target->thread.i387.fxsave, 0, -1);
+ 
 -	case PTRACE_PEEKTEXT:
 -	case PTRACE_PEEKDATA:
 -	case PTRACE_POKEDATA:
@@ -12545,10 +13327,7 @@
 -		else
 -			ret = put_user(val, (unsigned int __user *)datap); 
 -		break; 
-+	if (kbuf) {
-+		memcpy(kbuf, tbuf + pos, count);
-+		return 0;
-+	}
++	target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
  
 -	case PTRACE_POKEDATA:
 -	case PTRACE_POKETEXT:
@@ -12556,7 +13335,7 @@
 -		if (access_process_vm(child, addr, &data, sizeof(u32), 1)!=sizeof(u32))
 -			ret = -EIO; 
 -		break;
-+	return __copy_to_user(ubuf, tbuf + pos, count) ? -EFAULT : 0;
++	return ret;
 +}
  
 -	case PTRACE_PEEKUSR:
@@ -12565,33 +13344,24 @@
 -			ret = put_user(val, (__u32 __user *)datap);
 -		break;
 +static int
-+ia32_fpxregs_set(struct task_struct *target,
-+		 const struct utrace_regset *regset,
-+		 unsigned int pos, unsigned int count,
-+		 const void *kbuf, const void __user *ubuf)
++ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
++{
++	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
++		return 8;
++	return 0;
++}
  
 -	case PTRACE_POKEUSR:
 -		ret = putreg32(child, addr, data);
 -		break;
++static int
++ia32_dbregs_get(struct task_struct *target,
++		const struct utrace_regset *regset,
++		unsigned int pos, unsigned int count,
++		void *kbuf, void __user *ubuf)
 +{
-+	union {
-+		struct i387_fxsave_struct fp;
-+		char buf[sizeof(struct i387_fxsave_struct)];
-+	} *u = (void *) &target->thread.i387.fxsave;
-+
-+	if (tsk_used_math(target)) {
-+		if (target == current)
-+			unlazy_fpu(target);
-+	}
-+	else if (pos == 0 && count == sizeof(struct i387_fxsave_struct))
-+		set_stopped_child_used_math(target);
-+	else
-+		init_fpu(target);
-+
-+	if (kbuf)
-+		memcpy(&u->buf[pos], kbuf, count);
-+	else if (__copy_from_user(&u->buf[pos], ubuf, count))
-+		return -EFAULT;
++	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
++		u32 val;
  
 -	case PTRACE_GETREGS: { /* Get all gp regs from the child. */
 -		int i;
@@ -12604,28 +13374,6 @@
 -			getreg32(child, i, &val);
 -			ret |= __put_user(val,(u32 __user *)datap);
 -			datap += sizeof(u32);
-+	u->fp.mxcsr &= mxcsr_feature_mask;
-+
-+	return 0;
-+}
-+
-+static int
-+ia32_dbregs_active(struct task_struct *tsk, const struct utrace_regset *regset)
-+{
-+	if (tsk->thread.debugreg6 | tsk->thread.debugreg7)
-+		return 8;
-+	return 0;
-+}
-+
-+static int
-+ia32_dbregs_get(struct task_struct *target,
-+		const struct utrace_regset *regset,
-+		unsigned int pos, unsigned int count,
-+		void *kbuf, void __user *ubuf)
-+{
-+	for (pos >>= 2, count >>= 2; count > 0; --count, ++pos) {
-+		u32 val;
-+
 +		/*
 +		 * The hardware updates the status register on a debug trap,
 +		 * but do_debug (traps.c) saves it for us when that happens.



From fedora-cvs-commits at redhat.com  Mon Jul 31 23:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 31 Jul 2006 19:40:01 -0400
Subject: rpms/kernel/devel kernel-2.6.spec,1.2486,1.2487
Message-ID: <200607312340.k6VNe1wV009891@cvs.devel.redhat.com>

Author: roland

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9857

Modified Files:
	kernel-2.6.spec 
Log Message:
Bring Juan back from the future.  This log is in redblooded 'merican timezones.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2486
retrieving revision 1.2487
diff -u -r1.2486 -r1.2487
--- kernel-2.6.spec	31 Jul 2006 23:30:24 -0000	1.2486
+++ kernel-2.6.spec	31 Jul 2006 23:39:57 -0000	1.2487
@@ -1664,11 +1664,11 @@
   - fix ptrace_do_wait deadlock (#200822, #200605)
   - arch cleanups
 
-* Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
+* Mon Jul 31 2006 Juan Quintela <quintela at redhat.com>
 - disable blktap for xen-ia64 (don't compile).
 - enable ia64-xen (it compiles, but still don't boot).
 
-* Tue Aug  1 2006 Juan Quintela <quintela at redhat.com>
+* Mon Jul 31 2006 Juan Quintela <quintela at redhat.com>
 - Fix dlm s/u.generic_ip/i_private/.
 
 * Mon Jul 31 2006 Don Zickus <dzickus at redhat.com>